Changeset:
9826c34b02e0
https://sourceforge.net/p/mrbs/hg-code/ci/9826c34b02e03665549f8e1b4f7e608c809f4f48
Author:
Campbell Morrison <[email protected]>
Date:
Fri Oct 02 09:22:18 2015 +0100
Log message:
Fixed various problems with pathnames when being called from js/* files (ie one
level down)
diffstat:
web/Crypt/Blowfish.php | 7 ++++---
web/Crypt/Blowfish/CBC.php | 2 +-
web/Crypt/Blowfish/ECB.php | 2 +-
web/Crypt/Blowfish/MCrypt.php | 2 +-
web/Crypt/Blowfish/PHP.php | 4 ++--
web/session/session_cookie.inc | 2 +-
6 files changed, 10 insertions(+), 9 deletions(-)
diffs (97 lines):
diff -r 73652a5bd9ee -r 9826c34b02e0 web/Crypt/Blowfish.php
--- a/web/Crypt/Blowfish.php Thu Oct 01 17:19:16 2015 +0100
+++ b/web/Crypt/Blowfish.php Fri Oct 02 09:22:18 2015 +0100
@@ -21,7 +21,8 @@
/**
* Required PEAR package(s)
*/
-require_once 'PEAR.php';
+
+require_once dirname(__FILE__) . '/../PEAR.php';
/**
* Engine choice constants
@@ -184,12 +185,12 @@
case CRYPT_BLOWFISH_PHP:
$mode = strtoupper($mode);
$class = 'Crypt_Blowfish_' . $mode;
- include_once 'Crypt/Blowfish/' . $mode . '.php';
+ include_once 'Blowfish/' . $mode . '.php';
$crypt = new $class(null);
break;
case CRYPT_BLOWFISH_MCRYPT:
- include_once 'Crypt/Blowfish/MCrypt.php';
+ include_once 'Blowfish/MCrypt.php';
$crypt = new Crypt_Blowfish_MCrypt(null, $mode);
break;
}
diff -r 73652a5bd9ee -r 9826c34b02e0 web/Crypt/Blowfish/CBC.php
--- a/web/Crypt/Blowfish/CBC.php Thu Oct 01 17:19:16 2015 +0100
+++ b/web/Crypt/Blowfish/CBC.php Fri Oct 02 09:22:18 2015 +0100
@@ -20,7 +20,7 @@
/**
* Required parent class
*/
-require_once 'Crypt/Blowfish/PHP.php';
+require_once __DIR__ . '/PHP.php';
/**
* Example
diff -r 73652a5bd9ee -r 9826c34b02e0 web/Crypt/Blowfish/ECB.php
--- a/web/Crypt/Blowfish/ECB.php Thu Oct 01 17:19:16 2015 +0100
+++ b/web/Crypt/Blowfish/ECB.php Fri Oct 02 09:22:18 2015 +0100
@@ -20,7 +20,7 @@
/**
* Required parent class
*/
-require_once 'Crypt/Blowfish/PHP.php';
+require_once __DIR__ . '/PHP.php';
/**
* Example
diff -r 73652a5bd9ee -r 9826c34b02e0 web/Crypt/Blowfish/MCrypt.php
--- a/web/Crypt/Blowfish/MCrypt.php Thu Oct 01 17:19:16 2015 +0100
+++ b/web/Crypt/Blowfish/MCrypt.php Fri Oct 02 09:22:18 2015 +0100
@@ -20,7 +20,7 @@
/**
* Include base class
*/
-require_once 'Crypt/Blowfish.php';
+require_once __DIR__ . '/../Blowfish.php';
/**
* Example using the factory method in CBC mode and forcing using
diff -r 73652a5bd9ee -r 9826c34b02e0 web/Crypt/Blowfish/PHP.php
--- a/web/Crypt/Blowfish/PHP.php Thu Oct 01 17:19:16 2015 +0100
+++ b/web/Crypt/Blowfish/PHP.php Fri Oct 02 09:22:18 2015 +0100
@@ -24,7 +24,7 @@
/**
* Include base class
*/
-require_once 'Crypt/Blowfish.php';
+require_once __DIR__ . '/../Blowfish.php';
/**
* Common class for PHP-only implementations
@@ -100,7 +100,7 @@
*/
function _init()
{
- require_once 'Crypt/Blowfish/DefaultKey.php';
+ require_once __DIR__ . '/DefaultKey.php';
$defaults = new Crypt_Blowfish_DefaultKey();
$this->_P = $defaults->P;
$this->_S = $defaults->S;
diff -r 73652a5bd9ee -r 9826c34b02e0 web/session/session_cookie.inc
--- a/web/session/session_cookie.inc Thu Oct 01 17:19:16 2015 +0100
+++ b/web/session/session_cookie.inc Fri Oct 02 09:22:18 2015 +0100
@@ -21,7 +21,7 @@
// $Id$
// Bring in Blowfish class
-require_once(dirname(__FILE__).'/../Crypt/Blowfish.php');
+require_once dirname(__FILE__) . '/../Crypt/Blowfish.php';
$blowfish = new Crypt_Blowfish($auth['session_cookie']['secret']);
------------------------------------------------------------------------------
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
