Permalink
Browse files

Remove hardcoded references to core/classes

  • Loading branch information...
1 parent 484fd30 commit 539497bb90552bf352d5118562c30a91622d2837 @cdujeu cdujeu committed May 7, 2016
@@ -965,7 +965,7 @@ public static function extractHooksToDoc()
} else {
$existingHooks = array();
}
- $allPhpFiles1 = self::glob_recursive(AJXP_INSTALL_PATH."/core/classes/*.php");
+ $allPhpFiles1 = self::glob_recursive(AJXP_BIN_FOLDER."/*.php");
$allPhpFiles2= self::glob_recursive(AJXP_INSTALL_PATH."/plugins/*.php");
$allPhpFiles3= self::glob_recursive(AJXP_INSTALL_PATH."/conf/*.php");
$allPhpFiles = array_merge(array_merge($allPhpFiles1, $allPhpFiles2), $allPhpFiles3);
@@ -21,7 +21,6 @@
namespace Pydio\Tests;
defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
/**
* @package AjaXplorer
@@ -21,7 +21,6 @@
namespace Pydio\Tests;
defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
/**
* @package Pydio
@@ -24,7 +24,6 @@
use Pydio\Core\UnixProcess;
defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
/**
* Check current PHP Version
@@ -21,7 +21,6 @@
namespace Pydio\Tests;
defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
/**
* Check that DOMXml is enabled
@@ -21,7 +21,6 @@
namespace Pydio\Tests;
defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
/**
* Check current php error level
@@ -21,7 +21,6 @@
namespace Pydio\Tests;
defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
/**
* Check that Exif extension is enabled
@@ -21,7 +21,6 @@
namespace Pydio\Tests;
defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
/**
* Check whether GD is installed or not
@@ -21,7 +21,6 @@
namespace Pydio\Tests;
defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
/**
* Gather various php configurations that will limit the application
@@ -21,7 +21,6 @@
namespace Pydio\Tests;
defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
/**
* Check whether mcrypt is enabled
@@ -21,7 +21,6 @@
namespace Pydio\Tests;
defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
/**
* Check server OS
@@ -21,7 +21,6 @@
namespace Pydio\Tests;
defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
/**
* Check php session writeability
@@ -21,7 +21,6 @@
namespace Pydio\Tests;
defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
/**
* Check current PHP Version
@@ -21,7 +21,6 @@
namespace Pydio\Tests;
defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
/**
* Check that DOMXml is enabled
@@ -21,7 +21,6 @@
namespace Pydio\Tests;
defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
/**
* Check that output buffering is enabled
@@ -21,7 +21,6 @@
namespace Pydio\Tests;
defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
/**
* Check that file uploads is enabled
@@ -21,7 +21,6 @@
namespace Pydio\Tests;
defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
/**
* Check whether mcrypt is enabled
@@ -21,7 +21,6 @@
namespace Pydio\Tests;
defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
/**
* Detect HTTPS protocol
@@ -21,7 +21,6 @@
namespace Pydio\Tests;
defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
/**
* Test Server Encoding
@@ -23,7 +23,6 @@
use Pydio\Conf\Core\ConfService;
defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
/**
* Test upload tmp dir
@@ -24,7 +24,6 @@
use Pydio\Conf\Core\ConfService;
defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
/**
* Gather the users configuration
@@ -23,7 +23,6 @@
use Pydio\Core\AJXP_VarsFilter;
defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
/**
* Check the various plugins folders writeability
@@ -21,7 +21,6 @@
namespace Pydio\Tests;
defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
/**
* Check that Zlib is enabled
View
@@ -59,7 +59,7 @@ function AJXP_Sabre_autoload($className)
-include 'core/classes/sabredav/lib/Sabre/autoload.php';
+include AJXP_BIN_FOLDER.'/sabredav/lib/Sabre/autoload.php';
if (ConfService::getCoreConf("WEBDAV_BASEHOST") != "") {
$baseURL = ConfService::getCoreConf("WEBDAV_BASEHOST");
@@ -77,7 +77,7 @@ private function createGenericLoader(){
if(!is_file($this->downloadFolder."/share.php")){
$loader_content = '<'.'?'.'php
define("AJXP_EXEC", true);
- require_once("'.str_replace("\\", "/", AJXP_INSTALL_PATH).'/core/classes/class.AJXP_Utils.php");
+ require_once("'.str_replace("\\", "/", AJXP_INSTALL_PATH).'/'.AJXP_BIN_FOLDER_REL.'/class.AJXP_Utils.php");
$hash = Pydio\Core\AJXP_Utils::securePath(Pydio\Core\AJXP_Utils::sanitize($_GET["hash"], AJXP_SANITIZE_ALPHANUM));
if(file_exists($hash.".php")){
require_once($hash.".php");

0 comments on commit 539497b

Please sign in to comment.