Remove hardcoded references to core/classes

pydio · May 7, 2016 · 539497b · 539497b
1 parent 484fd30
commit 539497b
Show file tree

Hide file tree

Showing 25 changed files with 3 additions and 25 deletions.
diff --git a/core/src/core/classes/class.AJXP_Utils.php b/core/src/core/classes/class.AJXP_Utils.php
@@ -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);

diff --git a/core/src/core/tests/test.AJXPVersion.php b/core/src/core/tests/test.AJXPVersion.php
@@ -21,7 +21,6 @@
 namespace Pydio\Tests;
 
 defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
 
 /**
  * @package AjaXplorer

diff --git a/core/src/core/tests/test.Client.php b/core/src/core/tests/test.Client.php
@@ -21,7 +21,6 @@
 namespace Pydio\Tests;
 
 defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
 
 /**
  * @package Pydio

diff --git a/core/src/core/tests/test.PHPCLI.php b/core/src/core/tests/test.PHPCLI.php
@@ -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

diff --git a/core/src/core/tests/test.PHPDomXML.php b/core/src/core/tests/test.PHPDomXML.php
@@ -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

diff --git a/core/src/core/tests/test.PHPErrorLevel.php b/core/src/core/tests/test.PHPErrorLevel.php
@@ -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

diff --git a/core/src/core/tests/test.PHPExif.php b/core/src/core/tests/test.PHPExif.php
@@ -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

diff --git a/core/src/core/tests/test.PHPGDVersion.php b/core/src/core/tests/test.PHPGDVersion.php
@@ -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

diff --git a/core/src/core/tests/test.PHPLimits.php b/core/src/core/tests/test.PHPLimits.php
@@ -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

diff --git a/core/src/core/tests/test.PHPMCrypt.php b/core/src/core/tests/test.PHPMCrypt.php
@@ -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

diff --git a/core/src/core/tests/test.PHPOS.php b/core/src/core/tests/test.PHPOS.php
@@ -21,7 +21,6 @@
 namespace Pydio\Tests;
 
 defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
 
 /**
  * Check server OS

diff --git a/core/src/core/tests/test.PHPSession.php b/core/src/core/tests/test.PHPSession.php
@@ -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

diff --git a/core/src/core/tests/test.PHPVersion.php b/core/src/core/tests/test.PHPVersion.php
@@ -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

diff --git a/core/src/core/tests/test.PHP_APC.php b/core/src/core/tests/test.PHP_APC.php
@@ -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

diff --git a/core/src/core/tests/test.PHP_OB.php b/core/src/core/tests/test.PHP_OB.php
@@ -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

diff --git a/core/src/core/tests/test.PHP_file_uploads.php b/core/src/core/tests/test.PHP_file_uploads.php
@@ -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

diff --git a/core/src/core/tests/test.PHP_magic_quotes.php b/core/src/core/tests/test.PHP_magic_quotes.php
@@ -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

diff --git a/core/src/core/tests/test.SSLEncryption.php b/core/src/core/tests/test.SSLEncryption.php
@@ -21,7 +21,6 @@
 namespace Pydio\Tests;
 
 defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
 
 /**
  * Detect HTTPS protocol

diff --git a/core/src/core/tests/test.ServerEncoding.php b/core/src/core/tests/test.ServerEncoding.php
@@ -21,7 +21,6 @@
 namespace Pydio\Tests;
 
 defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
 
 /**
  * Test Server Encoding

diff --git a/core/src/core/tests/test.Upload.php b/core/src/core/tests/test.Upload.php
@@ -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

diff --git a/core/src/core/tests/test.UsersConfig.php b/core/src/core/tests/test.UsersConfig.php
@@ -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

diff --git a/core/src/core/tests/test.Writeability.php b/core/src/core/tests/test.Writeability.php
@@ -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

diff --git a/core/src/core/tests/test.Zlib.php b/core/src/core/tests/test.Zlib.php
@@ -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

diff --git a/core/src/dav.php b/core/src/dav.php
@@ -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");

diff --git a/core/src/plugins/action.share/class.ShareStore.php b/core/src/plugins/action.share/class.ShareStore.php
@@ -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");