moved ilExplorer to Services/UIComponent, ilIniFile and ilErrorHandli…

…ng to Services/Init and ilValidator to Services/Repository git-svn-id: http://svn.ilias.de/svn/ilias/trunk@33491 21b2c9ec-7c21-0410-8b45-9bfb8ed2bfc5
ILIAS-eLearning · Mar 2, 2012 · a5651fc · a5651fc
1 parent 5126475
commit a5651fc
Show file tree

Hide file tree

Showing 57 changed files with 64 additions and 69 deletions.
diff --git a/Modules/LearningModule/classes/class.ilIntLinkRepItemExplorer.php b/Modules/LearningModule/classes/class.ilIntLinkRepItemExplorer.php
@@ -30,7 +30,7 @@
 * @ingroup ModulesIliasLearningModule
 */
 
-include_once("classes/class.ilExplorer.php");
+include_once("./Services/UIComponent/Explorer/classes/class.ilExplorer.php");
 
 class ilIntLinkRepItemExplorer extends ilExplorer
 {

diff --git a/Modules/LearningModule/classes/class.ilLMExplorer.php b/Modules/LearningModule/classes/class.ilLMExplorer.php
@@ -10,7 +10,7 @@
 * @ingroup ModulesIliasLearningModule
 */
 
-require_once("./classes/class.ilExplorer.php");
+require_once("./Services/UIComponent/Explorer/classes/class.ilExplorer.php");
 
 class ilLMExplorer extends ilExplorer
 {

diff --git a/Modules/LearningModule/classes/class.ilLMMenuObjectSelector.php b/Modules/LearningModule/classes/class.ilLMMenuObjectSelector.php
@@ -21,7 +21,7 @@
 	+-----------------------------------------------------------------------------+
 */
 
-require_once("classes/class.ilExplorer.php");
+require_once("./Services/UIComponent/Explorer/classes/class.ilExplorer.php");
 
 /**
 * LM Menu Object Selector

diff --git a/Modules/LearningModule/classes/class.ilLMPresentationGUI.php b/Modules/LearningModule/classes/class.ilLMPresentationGUI.php
@@ -46,12 +46,6 @@ function ilLMPresentationGUI()
 		$this->ctrl->saveParameter($this, array("ref_id"));
 		$this->lm_set = new ilSetting("lm");
 
-#		include_once './classes/class.ilSearch.php';
-
-#		if(!ilSearch::_checkParentConditions($_GET['ref_id']))
-#		{
-#			$ilias->error_obj->raiseError($lng->txt('access_denied'),$ilias->error_obj->WARNING);
-#		}
 		// Todo: check lm id
 		$type = $this->ilias->obj_factory->getTypeByRefId($_GET["ref_id"]);
 

diff --git a/Modules/MediaPool/classes/class.ilMediaPoolExplorer.php b/Modules/MediaPool/classes/class.ilMediaPoolExplorer.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (c) 1998-2009 ILIAS open source, Extended GPL, see docs/LICENSE */
 
-require_once("classes/class.ilExplorer.php");
+require_once("./Services/UIComponent/Explorer/classes/class.ilExplorer.php");
 
 /*
 * Explorer for Media Pools

diff --git a/Modules/Scorm2004/classes/class.ilGlossarySelectorGUI.php b/Modules/Scorm2004/classes/class.ilGlossarySelectorGUI.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (c) 1998-2009 ILIAS open source, Extended GPL, see docs/LICENSE */
 
-include_once("./classes/class.ilExplorer.php");
+include_once("./Services/UIComponent/Explorer/classes/class.ilExplorer.php");
 
 /**
 * Select file for being added into file lists

diff --git a/Modules/Scorm2004/classes/class.ilSCORM2004EditorExplorer.php b/Modules/Scorm2004/classes/class.ilSCORM2004EditorExplorer.php
@@ -29,7 +29,7 @@
 *
 * @ingroup ModulesScormAicc
 */
-require_once("./classes/class.ilExplorer.php");
+require_once("./Services/UIComponent/Explorer/classes/class.ilExplorer.php");
 class ilScorm2004EditorExplorer extends ilExplorer
 {
 	/**

diff --git a/Modules/Scorm2004/classes/updateADLTree.php b/Modules/Scorm2004/classes/updateADLTree.php
@@ -1,5 +1,8 @@
 <?php
 
+// please contact alex.killing (at) gmx.de
+die("Deprecated.");
+
 /*
 	+-----------------------------------------------------------------------------+
 	| ILIAS open source                                                           |
@@ -42,7 +45,7 @@
 */
 
 	require_once("adlparser/SeqTreeBuilder.php");
-	require_once("../../../classes/class.ilIniFile.php");
+	require_once("../../../Services/Init/classes/class.ilIniFile.php");
 
 	//find all folders containing data
 	//initIliasIniFile()

diff --git a/Modules/ScormAicc/classes/AICC/class.ilAICCExplorer.php b/Modules/ScormAicc/classes/AICC/class.ilAICCExplorer.php
@@ -29,7 +29,7 @@
 * @ingroup ModulesScormAicc
 */
 
-require_once("classes/class.ilExplorer.php");
+require_once("./Services/UIComponent/Explorer/classes/class.ilExplorer.php");
 require_once("./Modules/ScormAicc/classes/AICC/class.ilAICCTree.php");
 require_once("./Modules/ScormAicc/classes/SCORM/class.ilSCORMExplorer.php");
 

diff --git a/Modules/ScormAicc/classes/HACP/class.ilHACPExplorer.php b/Modules/ScormAicc/classes/HACP/class.ilHACPExplorer.php
@@ -22,7 +22,7 @@
 	+-----------------------------------------------------------------------------+
 */
 
-require_once("classes/class.ilExplorer.php");
+require_once("./Services/UIComponent/Explorer/classes/class.ilExplorer.php");
 require_once("./Modules/ScormAicc/classes/AICC/class.ilAICCTree.php");
 require_once("./Modules/ScormAicc/classes/AICC/class.ilAICCExplorer.php");
 

diff --git a/Modules/ScormAicc/classes/SCORM/class.ilSCORMExplorer.php b/Modules/ScormAicc/classes/SCORM/class.ilSCORMExplorer.php
@@ -30,7 +30,7 @@
 * @ingroup ModulesScormAicc
 */
 
-require_once("classes/class.ilExplorer.php");
+require_once("./Services/UIComponent/Explorer/classes/class.ilExplorer.php");
 require_once("./Modules/ScormAicc/classes/SCORM/class.ilSCORMTree.php");
 
 class ilSCORMExplorer extends ilExplorer

diff --git a/Modules/ScormAicc/classes/class.ilSAHSPresentationGUI.php b/Modules/ScormAicc/classes/class.ilSAHSPresentationGUI.php
@@ -80,8 +80,6 @@ function &executeCommand()
 			exit();
 		}
 
-		include_once './classes/class.ilSearch.php';
-
 		$next_class = $this->ctrl->getNextClass($this);
 		$cmd = $this->ctrl->getCmd();
 

diff --git a/Modules/SurveyQuestionPool/classes/class.ilMaterialExplorer.php b/Modules/SurveyQuestionPool/classes/class.ilMaterialExplorer.php
@@ -30,7 +30,7 @@
 * @ingroup ModulesSurveyQuestionPool
 */
 
-include_once("./classes/class.ilExplorer.php");
+include_once("./Services/UIComponent/Explorer/classes/class.ilExplorer.php");
 
 class ilMaterialExplorer extends ilExplorer
 {

diff --git a/Modules/SystemFolder/classes/class.ilObjSystemFolderGUI.php b/Modules/SystemFolder/classes/class.ilObjSystemFolderGUI.php
@@ -1138,7 +1138,7 @@ function checkObject()
 		else
 		{
 //echo "4";
-			include_once "classes/class.ilValidator.php";
+			include_once "./Services/Repository/classes/class.ilValidator.php";
 			$validator = new ilValidator();
 			$hasScanLog = $validator->hasScanLog();
 
@@ -1269,7 +1269,7 @@ private function saveCheckParamsObject()
 
 	private function writeCheckParams()
 	{
-		include_once "classes/class.ilValidator.php";
+		include_once "./Services/Repository/classes/class.ilValidator.php";
 		$validator = new ilValidator();
 		$modes = $validator->getPossibleModes();
 
@@ -1538,7 +1538,7 @@ function startValidator($a_mode,$a_log)
 		}
 
 		$logging = ($a_log) ? true : false;
-		include_once "classes/class.ilValidator.php";
+		include_once "./Services/Repository/classes/class.ilValidator.php";
 		$validator = new ilValidator($logging);
 		$validator->setMode("all",false);
 
@@ -1574,7 +1574,7 @@ function startValidator($a_mode,$a_log)
 
 	function viewScanLog()
 	{
-		include_once "classes/class.ilValidator.php";
+		include_once "./Services/Repository/classes/class.ilValidator.php";
 		$validator = new IlValidator();
 		$scan_log =& $validator->readScanLog();
 

diff --git a/Modules/TestQuestionPool/classes/class.ilSolutionExplorer.php b/Modules/TestQuestionPool/classes/class.ilSolutionExplorer.php
@@ -30,7 +30,7 @@
 * @ingroup ModulesTestQuestionPool
 */
 
-include_once "./classes/class.ilExplorer.php";
+include_once "./Services/UIComponent/Explorer/classes/class.ilExplorer.php";
 include_once "./Modules/Test/classes/inc.AssessmentConstants.php";
 
 class ilSolutionExplorer extends ilExplorer

diff --git a/Modules/WorkspaceFolder/classes/class.ilWorkspaceFolderExplorer.php b/Modules/WorkspaceFolder/classes/class.ilWorkspaceFolderExplorer.php
@@ -29,7 +29,7 @@
 *
 */
 
-include_once("classes/class.ilExplorer.php");
+include_once("./Services/UIComponent/Explorer/classes/class.ilExplorer.php");
 include_once("Services/PersonalWorkspace/classes/class.ilWorkspaceTree.php");
 
 class ilWorkspaceFolderExplorer extends ilExplorer

diff --git a/Services/AccessControl/classes/class.ilConditionSelector.php b/Services/AccessControl/classes/class.ilConditionSelector.php
@@ -9,7 +9,7 @@
 *
 */
 
-require_once("classes/class.ilExplorer.php");
+require_once("./Services/UIComponent/Explorer/classes/class.ilExplorer.php");
 include_once './Services/Repository/classes/class.ilRepositoryExplorer.php';
 
 class ilConditionSelector extends ilRepositoryExplorer

diff --git a/Services/AccessControl/classes/class.ilRoleDesktopItemSelector.php b/Services/AccessControl/classes/class.ilRoleDesktopItemSelector.php
@@ -9,7 +9,7 @@
 *
 */
 
-require_once("classes/class.ilExplorer.php");
+require_once("./Services/UIComponent/Explorer/classes/class.ilExplorer.php");
 
 
 class ilRoleDesktopItemSelector extends ilExplorer

diff --git a/Services/Administration/classes/class.ilAdministrationExplorer.php b/Services/Administration/classes/class.ilAdministrationExplorer.php
@@ -9,7 +9,7 @@
 *
 */
 
-require_once("classes/class.ilExplorer.php");
+require_once("./Services/UIComponent/Explorer/classes/class.ilExplorer.php");
 
 class ilAdministrationExplorer extends ilExplorer
 {

diff --git a/Services/Authentication/classes/class.ilBaseAuthentication.php b/Services/Authentication/classes/class.ilBaseAuthentication.php
@@ -243,7 +243,7 @@ function logout()
 
 	function __buildDSN()
 	{
-		include_once './classes/class.ilIniFile.php';
+		include_once './Services/Init/classes/class.ilIniFile.php';
 
 		// get ilias ini file
 		$this->ilias_ini =& new ilIniFile('./ilias.ini.php');
@@ -310,7 +310,7 @@ function __setSessionSaveHandler()
 	{
 		require_once "./Services/Authentication/classes/class.ilSessionDBHandler.php";
 		include_once "./Services/Utilities/classes/class.ilUtil.php";
-		include_once './classes/class.ilErrorHandling.php';
+		include_once './Services/Init/classes/class.ilErrorHandling.php';
 		include_once './Services/Database/classes/class.ilDB.php';
 
 		$this->db->connect();

diff --git a/Services/COPage/classes/class.ilFileSelectorGUI.php b/Services/COPage/classes/class.ilFileSelectorGUI.php
@@ -11,7 +11,7 @@
 * @ingroup ServicesCOPage
 */
 
-include_once("./classes/class.ilExplorer.php");
+include_once("./Services/UIComponent/Explorer/classes/class.ilExplorer.php");
 class ilFileSelectorGUI extends ilExplorer
 {
 	/**

diff --git a/Services/COPage/classes/class.ilPoolSelectorGUI.php b/Services/COPage/classes/class.ilPoolSelectorGUI.php
@@ -10,7 +10,7 @@
 * @ingroup ServicesCOPage
 */
 
-include_once("./classes/class.ilExplorer.php");
+include_once("./Services/UIComponent/Explorer/classes/class.ilExplorer.php");
 class ilPoolSelectorGUI extends ilExplorer
 {
 	var $content_gui = "ilpcmediaobjectgui";

diff --git a/Services/ContainerReference/classes/class.ilContainerSelectionExplorer.php b/Services/ContainerReference/classes/class.ilContainerSelectionExplorer.php
@@ -21,7 +21,7 @@
 	+-----------------------------------------------------------------------------+
 */
 
-include_once('./classes/class.ilExplorer.php');
+include_once('./Services/UIComponent/Explorer/classes/class.ilExplorer.php');
 
 /** 
 * 

diff --git a/Services/CopyWizard/classes/class.ilCopyWizardExplorer.php b/Services/CopyWizard/classes/class.ilCopyWizardExplorer.php
@@ -21,7 +21,7 @@
 	+-----------------------------------------------------------------------------+
 */
 
-include_once('classes/class.ilExplorer.php');
+include_once('./Services/UIComponent/Explorer/classes/class.ilExplorer.php');
 
 /** 
 * 

diff --git a/classes/class.ilErrorHandling.php → ...es/Init/classes/class.ilErrorHandling.php b/classes/class.ilErrorHandling.php → ...es/Init/classes/class.ilErrorHandling.php
diff --git a/classes/class.ilIniFile.php → Services/Init/classes/class.ilIniFile.php b/classes/class.ilIniFile.php → Services/Init/classes/class.ilIniFile.php
diff --git a/Services/Init/classes/class.ilInitialisation.php b/Services/Init/classes/class.ilInitialisation.php
@@ -113,7 +113,7 @@ protected static function includePhp5Compliance()
 	 */
 	protected static function initIliasIniFile()
 	{		
-		require_once("classes/class.ilIniFile.php");
+		require_once("./Services/Init/classes/class.ilIniFile.php");
 		$ilIliasIniFile = new ilIniFile("./ilias.ini.php");				
 		$ilIliasIniFile->read();
 		self::initGlobal('ilIliasIniFile', $ilIliasIniFile);
@@ -306,7 +306,7 @@ protected static function initClientIniFile()
 		$ini_file = "./".ILIAS_WEB_DIR."/".CLIENT_ID."/client.ini.php";
 
 		// get settings from ini file
-		require_once("classes/class.ilIniFile.php");
+		require_once("./Services/Init/classes/class.ilIniFile.php");
 		$ilClientIniFile = new ilIniFile($ini_file);		
 		$ilClientIniFile->read();
 
@@ -916,7 +916,7 @@ protected static function initCore()
 
 		// error handler 
 		self::initGlobal("ilErr", "ilErrorHandling", 
-			"classes/class.ilErrorHandling.php");
+			"./Services/Init/classes/class.ilErrorHandling.php");
 		$ilErr->setErrorHandling(PEAR_ERROR_CALLBACK, array($ilErr, 'errorHandler'));		
 
 		// :TODO: obsolete?

diff --git a/Services/IntLink/classes/class.ilLinkTargetObjectExplorer.php b/Services/IntLink/classes/class.ilLinkTargetObjectExplorer.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (c) 1998-2011 ILIAS open source, Extended GPL, see docs/LICENSE */
 
-include_once("classes/class.ilExplorer.php");
+include_once("./Services/UIComponent/Explorer/classes/class.ilExplorer.php");
 
 /**
  * Internal Link: Repository Item Selector Explorer

diff --git a/Services/LoadTest/scripts/run_loadtest b/Services/LoadTest/scripts/run_loadtest
@@ -31,7 +31,7 @@
 	// get db
 	echo "Connecting to DB. Host: ".$db_host.", Name: ".$db_name.
 		", User: ".$db_user.", Password: ".(trim($db_pw) != "" ? "Y" : "N").".\n";
-	include_once("./classes/class.ilErrorHandling.php");
+	include_once("./Services/Init/classes/class.ilErrorHandling.php");
 	include_once("./Services/Database/classes/class.ilDBWrapperFactory.php");
 	$ilDB = ilDBWrapperFactory::getWrapper("mysql");
 	$ilDB->setDbUser($db_user);

diff --git a/Services/Mail/classes/class.ilMailExplorer.php b/Services/Mail/classes/class.ilMailExplorer.php
@@ -30,7 +30,7 @@
 * @version $Id$
 * 
 */
-require_once("classes/class.ilExplorer.php");
+require_once("./Services/UIComponent/Explorer/classes/class.ilExplorer.php");
 
 class ilMailExplorer extends ilExplorer
 {

diff --git a/Services/Payment/classes/class.ilObjectSelector.php b/Services/Payment/classes/class.ilObjectSelector.php
@@ -10,7 +10,7 @@
 * @package core
 */
 
-require_once("classes/class.ilExplorer.php");
+require_once("./Services/UIComponent/Explorer/classes/class.ilExplorer.php");
 
 class ilObjectSelector extends ilExplorer
 {

diff --git a/Services/Payment/classes/class.ilPaymentObjectSelector.php b/Services/Payment/classes/class.ilPaymentObjectSelector.php
@@ -10,7 +10,7 @@
 * @package core
 */
 
-require_once("classes/class.ilExplorer.php");
+require_once("./Services/UIComponent/Explorer/classes/class.ilExplorer.php");
 require_once './Services/Payment/classes/class.ilPaymentObject.php';
 
 

diff --git a/Services/Payment/classes/class.ilShopExplorer.php b/Services/Payment/classes/class.ilShopExplorer.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (c) 1998-2010 ILIAS open source, Extended GPL, see docs/LICENSE */
 
-require_once("./classes/class.ilExplorer.php");
+require_once("./Services/UIComponent/Explorer/classes/class.ilExplorer.php");
 #include_once ("./Services/Repository/classes/class.ilRepositoryExplorer.php");
 include_once './Services/Payment/classes/class.ilPaymentObject.php';
 

diff --git a/Services/Payment/classes/class.ilShopRepositoryExplorer.php b/Services/Payment/classes/class.ilShopRepositoryExplorer.php
@@ -2,7 +2,7 @@
 
 /* Copyright (c) 1998-2010 ILIAS open source, Extended GPL, see docs/LICENSE */
 
-require_once './classes/class.ilExplorer.php';
+require_once './Services/UIComponent/Explorer/classes/class.ilExplorer.php';
 
 /*
 */

diff --git a/Services/PersonalDesktop/classes/class.ilBookmarkExplorer.php b/Services/PersonalDesktop/classes/class.ilBookmarkExplorer.php
@@ -30,7 +30,7 @@
 *
 */
 
-require_once("classes/class.ilExplorer.php");
+require_once("./Services/UIComponent/Explorer/classes/class.ilExplorer.php");
 
 class ilBookmarkExplorer extends ilExplorer
 {

diff --git a/Services/RTE/tiny_mce/plugins/ibrowser/config.php b/Services/RTE/tiny_mce/plugins/ibrowser/config.php
@@ -21,7 +21,7 @@
 	+-----------------------------------------------------------------------------+
 */
 
-include "../../../../../classes/class.ilIniFile.php";
+include "../../../../../Services/Init/classes/class.ilIniFile.php";
 $file = "../../../../../ilias.ini.php";
 $ini = new ilIniFile($file);
 $ini->read();

diff --git a/Services/RTE/tiny_mce/plugins/ilimgupload/imgupload.php b/Services/RTE/tiny_mce/plugins/ilimgupload/imgupload.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (c) 1998-2010 ILIAS open source, Extended GPL, see docs/LICENSE */
 
-include_once "../../../../../classes/class.ilIniFile.php";
+include_once "../../../../../Services/Init/classes/class.ilIniFile.php";
 $file = "../../../../../ilias.ini.php";
 $ini = new ilIniFile($file);
 $ini->read();

diff --git a/Services/RTE/tiny_mce/plugins/latex/latex.php b/Services/RTE/tiny_mce/plugins/latex/latex.php
@@ -22,7 +22,7 @@
 */
 
 include_once "HTML/Template/ITX.php";
-include "../../../../../classes/class.ilIniFile.php";
+include "../../../../../Services/Init/classes/class.ilIniFile.php";
 $file = "../../../../../ilias.ini.php";
 $ini = new ilIniFile($file);
 $ini->read();

diff --git a/Services/RTE/tiny_mce_3_4_7/plugins/ibrowser/config.php b/Services/RTE/tiny_mce_3_4_7/plugins/ibrowser/config.php
@@ -21,7 +21,7 @@
 	+-----------------------------------------------------------------------------+
 */
 
-include "../../../../../classes/class.ilIniFile.php";
+include "../../../../../Services/Init/classes/class.ilIniFile.php";
 $file = "../../../../../ilias.ini.php";
 $ini = new ilIniFile($file);
 $ini->read();