diff --git a/main/admin/configure_homepage.php b/main/admin/configure_homepage.php index 967a3913ea..b03068f1fb 100644 --- a/main/admin/configure_homepage.php +++ b/main/admin/configure_homepage.php @@ -1,4 +1,4 @@ -"; - HotPotGC($rootSys,1,1); + HotPotGC($_configuration['root_sys'],1,1); // functions - function HotPotGC($rootSys,$flag,$userID) - { // flag[0,1] - print or delete the HotPotatoes temp files (.t.html) - $documentPath = $rootSys."courses"; + function HotPotGC($root_sys,$flag,$userID) + { + // flag[0,1] - print or delete the HotPotatoes temp files (.t.html) + $documentPath = $root_sys."courses"; require_once(api_get_path(LIBRARY_PATH)."fileManage.lib.php"); HotPotGCt($documentPath,$flag,$userID); } diff --git a/main/exercice/Hpdownload.php b/main/exercice/Hpdownload.php index 232b79e938..c9978e332d 100644 --- a/main/exercice/Hpdownload.php +++ b/main/exercice/Hpdownload.php @@ -48,12 +48,12 @@ $filename=basename($doc_url); //event_download($doc_url); if (isset($_course['path'])) { -// $full_file_name=$rootSys."courses/".$_course['path'].'/document'.$doc_url; +// $full_file_name=$_configuration['root_sys']."courses/".$_course['path'].'/document'.$doc_url; $full_file_name = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'.$doc_url; } else { -//$full_file_name=$rootSys."courses/".$cid.'/document'.$doc_url; +//$full_file_name=$_configuration['root_sys']."courses/".$cid.'/document'.$doc_url; $full_file_name = api_get_path(SYS_COURSE_PATH).$cid.'/document'.$doc_url; } @@ -103,7 +103,7 @@ if($content_type == 'text/html') include (api_get_path(LIBRARY_PATH).'fileUpload.lib.php'); $directory_name = dirname($full_file_name); - $dir=str_replace(array('\\',$rootSys."courses/".$_course['path'].'/document'),array('/',''),$directory_name); + $dir=str_replace(array('\\',$_configuration['root_sys']."courses/".$_course['path'].'/document'),array('/',''),$directory_name); if($dir[strlen($dir)-1] != '/') { diff --git a/main/exercice/hotpotatoes.php b/main/exercice/hotpotatoes.php index d90eb41cf4..99dcfbb299 100644 --- a/main/exercice/hotpotatoes.php +++ b/main/exercice/hotpotatoes.php @@ -45,7 +45,7 @@ $is_allowedToEdit=(!empty($is_courseAdmin)?$is_courseAdmin:false); //$dbTable = '`'.$_course['dbNameGlu']."document`"; $dbTable = Database::get_course_table(DOCUMENT_TABLE); -$baseServDir = $rootSys; +$baseServDir = $_configuration['root_sys']; $baseServUrl = $urlAppend."/"; $document_sys_path = api_get_path(SYS_COURSE_PATH).$_course['path']."/document"; $uploadPath = "/HotPotatoes_files"; diff --git a/main/exercice/testheaderpage.php b/main/exercice/testheaderpage.php index 4328fd01d4..3f52b0240f 100644 --- a/main/exercice/testheaderpage.php +++ b/main/exercice/testheaderpage.php @@ -32,7 +32,7 @@ $langFile='exercice'; include('../inc/global.inc.php'); - require_once($rootSys.'main/exercice/hotpotatoes.lib.php'); + require_once($_configuration['root_sys'].'main/exercice/hotpotatoes.lib.php'); $documentPath= api_get_path(SYS_COURSE_PATH).$_course['path']."/document"; $title = GetQuizName($_GET['file'],$documentPath); if ($title =='') diff --git a/main/inc/lib/add_course.lib.inc.php b/main/inc/lib/add_course.lib.inc.php index c153e1c5cc..10c8e2697d 100644 --- a/main/inc/lib/add_course.lib.inc.php +++ b/main/inc/lib/add_course.lib.inc.php @@ -83,7 +83,7 @@ function create_course($wanted_code, $title, $tutor_name, $category_code, $cours */ function define_course_keys($wantedCode, $prefix4all = "", $prefix4baseName = "", $prefix4path = "", $addUniquePrefix = false, $useCodeInDepedentKeys = true) { - global $rootSys, $coursesRepositoryAppend, $prefixAntiNumber, $_configuration; + global $coursesRepositoryAppend, $prefixAntiNumber, $_configuration; $course_table = Database :: get_main_table(MAIN_COURSE_TABLE); @@ -174,7 +174,7 @@ function define_course_keys($wantedCode, $prefix4all = "", $prefix4baseName = "" $finalSuffix['CourseDb'] = substr('_'.md5(uniqid(rand())), 0, 4); } - if(file_exists($rootSys.$coursesRepositoryAppend.$keysCourseRepository)) + if(file_exists($_configuration['root_sys'].$coursesRepositoryAppend.$keysCourseRepository)) { $keysAreUnique = false; diff --git a/main/inc/lib/course.lib.php b/main/inc/lib/course.lib.php index fca4a1d4b1..b822e43195 100644 --- a/main/inc/lib/course.lib.php +++ b/main/inc/lib/course.lib.php @@ -164,7 +164,7 @@ $TABLECOURSDOMAIN = Database :: get_main_table(MAIN_CATEGORY_TABLE); $TABLEUSER = Database :: get_main_table(MAIN_USER_TABLE); $TABLECOURSUSER = Database :: get_main_table(MAIN_COURSE_USER_TABLE); $TABLEANNOUNCEMENTS = "announcement"; -$coursesRepositories = $rootSys; +$coursesRepositories = $_configuration['root_sys']; /* ============================================================================== diff --git a/main/inc/lib/debug.lib.inc.php b/main/inc/lib/debug.lib.inc.php index 0c70557864..172d1718e3 100644 --- a/main/inc/lib/debug.lib.inc.php +++ b/main/inc/lib/debug.lib.inc.php @@ -27,263 +27,24 @@ * * debug functions * -* All these function only display output only when debugClaro is on -* -* function echoSessionValue() -function debugIO($file="") -* * @package dokeos.library ============================================================================== */ /** - * function echoSessionValue() - * - * @desc print out content of session's variable - * - * @return - * @authot Christophe Gesché gesché@ipm.ucl.ac.be - * @deprecated Function not in use + * This function displays the contend of a variable, array or object in a nicely formatted way. * + * @param $variable a variable, array or object + * + * @author Patrick Cool , Ghent University */ -function echoSessionValue() +function debug($variable) { - $infoResult = ""; - - global $statuts, $statut, $status, $_configuration, $is_admin, $_GET, $_SESSION, $_POST; - - if (!isset ($is_admin) || !$is_admin) - { - exit ("pwet"); - } - - $infoResult .= " -
- phpInfo Dokeos - 
";
-	$infoResult .= "PHP Version : ".phpversion()."
-			nivo d'err : ".error_reporting(2039);
-	if (isset ($statuts))
-	{
-		$infoResult .= "
-					statut : ";
-		print_r($statuts);
-	}
-	if (isset ($statut))
-	{
-		$infoResult .= "
-					statut : ";
-		print_r($statut);
-	}
-	if (isset ($status))
-	{
-		$infoResult .= "
-					status : ";
-		print_r($status);
-	}
-
-	if (isset ($_configuration['db_host']) || isset ($_configuration['db_user']))
-	{
-		$infoResult .= "
-					mysql param :
-					 Serveur : ".$_configuration['db_host']."
-					 User    : ".$_configuration['db_user']."";
-	}
-	if (isset ($_SESSION))
-	{
-		$infoResult .= "
-					session : ";
-		print_r($_SESSION);
-	}
-	if (isset ($_POST))
-	{
-		$infoResult .= "
-					Post : ";
-		print_r($_POST);
-	}
-	if (isset ($_GET))
-	{
-		$infoResult .= "
-					GET : ";
-		print_r($_GET);
-	}
-
-	$infoResult .= "
-			Contantes : ";
-	print_r(get_defined_constants());
-	get_current_user();
-	$infoResult .= "
-			Fichiers inclus : ";
-	print_r(get_included_files());
-	$infoResult .= "
-			Magic quote gpc : ".get_magic_quotes_gpc()."
-			Magig quote runtime : ".get_magic_quotes_runtime()."
-			date de dernière modification de la page : ".date("j-m-Y", getlastmod());
-	/*
-	get_cfg_var -- Retourne la valeur d'une option de PHP
-	getenv -- Retourne la valeur de la variable d'environnement.
-	ini_alter -- Change la valeur d'une option de configuration
-	ini_get -- Lit la valeur d'une option de configuration.
-	ini_get_all -- Lit toutes les valeurs de configuration
-	ini_restore -- Restaure la valeur de l'option de configuration
-	ini_set -- Change la valeur d'une option de configuration
-	putenv -- Fixe la valeur d'une variable d'environnement.
-	set_magic_quotes_runtime --  Active/désactive l'option magic_quotes_runtime.
-	set_time_limit -- Fixe le temps maximum d'exécution d'un script.
-	*/
-	$infoResult .= "
-			Type d'interface utilisé entre le serveur web et PHP : ".php_sapi_name()."
-			informations OS : ".php_uname()."
-			Version courante du moteur Zend : ".zend_version()."
-			GID du propriétaire du script : ".getmygid()."
-			inode du script : ".getmyinode()."
-			numéro de processus courant : ".getmypid()."
-			UID du propriétaire du script actuel : ".getmyuid()."
-			niveau d'utilisation des ressources : ";
-	print_r(@ getrusage());
-
-	$infoResult .= "
-
-
- "; - if (PRINT_DEBUG_INFO) - echo $infoResult; - return $infoResult; + echo '
';
+	print_r($variable);
+	echo '
'; } -/** - * function debugIO($file="") - * - * @desc io file - * @return - * @author Christophe Gesché gesché@ipm.ucl.ac.be - * @deprecated Function not in use - */ - -function debugIO($file = "") -{ - GLOBAL $SERVER_SOFTWARE; - - $infoResult = " - [Script : ".$_SERVER['PHP_SELF']."] - [Server : ".$SERVER_SOFTWARE."] - [Php : ".phpversion()."] - [sys : ".php_uname()."] - [My uid : ".getmyuid()."] - [current_user : ".get_current_user()."] - [my gid : ".getmygid()."] - [my inode : ".getmyinode()."] - [my pid : ".getmypid()."] - [space : - free - : ".disk_free_space('..')." - - total - : ".disk_total_space('..')." - ]"; - - if ($file != "") - { - $infoResult .= "
".$file." - - [o:".fileowner($file)." g:".filegroup($file)." ".display_perms(fileperms($file))."]"; - if (is_dir($file)) - $infoResult .= "-Dir-"; - if (is_file($file)) - $infoResult .= "-File-"; - if (is_link($file)) - $infoResult .= "-Lnk-"; - if (is_executable($file)) - $infoResult .= "-X-"; - if (is_readable($file)) - $infoResult .= "-R-"; - if (is_writeable($file)) - $infoResult .= "-W-"; - } - - $file = "."; - $infoResult .= "
".$file." - - [o:".fileowner($file)." g:".filegroup($file)." ".display_perms(fileperms($file))."]"; - if (is_dir($file)) - $infoResult .= "-Dir-"; - if (is_file($file)) - $infoResult .= "-File-"; - if (is_link($file)) - echo "-Lnk-"; - if (is_executable($file)) - echo "-X-"; - if (is_readable($file)) - echo "-R-"; - if (is_writeable($file)) - echo "-W-"; - - $file = ".."; - echo "
".$file." - - [o:".fileowner($file)." g:".filegroup($file)." ".display_perms(fileperms($file))."]"; - if (is_dir($file)) - $infoResult .= "-Dir-"; - if (is_file($file)) - $infoResult .= "-File-"; - if (is_link($file)) - $infoResult .= "-Lnk-"; - if (is_executable($file)) - $infoResult .= "-X-"; - if (is_readable($file)) - $infoResult .= "-R-"; - if (is_writeable($file)) - $infoResult .= "-W-"; - - if (PRINT_DEBUG_INFO) - echo $infoResult; - return $infoResult; - -} -/** - * @deprecated Function only used in deprecated function debugIO - */ -function display_perms($mode) -{ - /* Determine Type */ - if ($mode & 0x1000) - $type = 'p'; /* FIFO pipe */ - else - if ($mode & 0x2000) - $type = 'c'; /* Character special */ - else - if ($mode & 0x4000) - $type = 'd'; /* Directory */ - else - if ($mode & 0x6000) - $type = 'b'; /* Block special */ - else - if ($mode & 0x8000) - $type = '-'; /* Regular */ - else - if ($mode & 0xA000) - $type = 'l'; /* Symbolic Link */ - else - if ($mode & 0xC000) - $type = 's'; /* Socket */ - else - $type = 'u'; /* UNKNOWN */ - - /* Determine permissions */ - $owner["read"] = ($mode & 00400) ? 'r' : '-'; - $owner["write"] = ($mode & 00200) ? 'w' : '-'; - $owner["execute"] = ($mode & 00100) ? 'x' : '-'; - $group["read"] = ($mode & 00040) ? 'r' : '-'; - $group["write"] = ($mode & 00020) ? 'w' : '-'; - $group["execute"] = ($mode & 00010) ? 'x' : '-'; - $world["read"] = ($mode & 00004) ? 'r' : '-'; - $world["write"] = ($mode & 00002) ? 'w' : '-'; - $world["execute"] = ($mode & 00001) ? 'x' : '-'; - - /* Adjust for SUID, SGID and sticky bit */ - if ($mode & 0x800) - $owner["execute"] = ($owner[execute] == 'x') ? 's' : 'S'; - if ($mode & 0x400) - $group["execute"] = ($group[execute] == 'x') ? 's' : 'S'; - if ($mode & 0x200) - $world["execute"] = ($world[execute] == 'x') ? 't' : 'T'; - - $strPerms = "t:".$type."o:".$owner[read].$owner[write].$owner[execute]."g:".$group[read].$group[write].$group[execute]."w:".$world[read].$world[write].$world[execute]; - return $strPerms; -} function printVar($var, $varName = "@") { @@ -305,116 +66,4 @@ function printVar($var, $varName = "@") echo "DEBUG is OFF"; } } -/** - * @deprecated Function not in use - */ -function printInit($selection = "*") -{ - GLOBAL $uidReset, $cidReset, $gidReset, $uidReq, $cidReq, $gidReq, $_user, $_cid, $_gid, $_user, $_course, $is_platformAdmin, $is_allowedCreateCourse, $is_courseMember, $is_courseAdmin, $is_allowed_in_course, $is_courseTutor, $_SESSION, $_claro_local_run; - - if ($_claro_local_run) - { - echo "local init ran"; - } - else - { - echo "local init never ran during this script"; - } - echo " - "; - if ($selection == "*" or strstr($selection, "u")) - { - echo ""; - } - if ($selection == "*" or strstr($selection, "c")) - { - echo ""; - } - if ($selection == "*" or strstr($selection, "g")) - { - echo ""; - } - echo ""; - if ($selection == "*" or (strstr($selection, "u") && strstr($selection, "c"))) - { - echo ""; - } - echo ""; - if ($selection == "*" or (strstr($selection, "u") && strstr($selection, "g"))) - { - - echo ""; - } - echo "
USER : - (uid): ".$uid." | - (_uid): ".$_user['user_id']." | - (session[_uid]): ".$_SESSION['_uid']." - 
-						reset = ".$uidReset." | req = ".$uidReq."

-						_user : ";
-		var_dump($_user);
-		echo "is_platformAdmin:";
-		var_dump($is_platformAdmin);
-		echo "is_allowedCreateCourse:";
-		var_dump($is_allowedCreateCourse);
-		echo "
COURSE :(_cid)".$_cid."
-						reset = ".$cidReset." | req = ".$cidReq."

-						";
-		echo "_course : ";
-		var_dump($_course);
-		echo "
GROUP :".$_gid."
-						reset = ".$gidReset." | req = ".$gidReq."

-						";
-		echo "
USER :".$_user['user_id']." in ".$_cid."
";
-		echo "_courseUser:";
-		var_dump($_courseUser);
-		echo "is_courseMember:";
-		var_dump($is_courseMember);
-		echo "is_courseAdmin:";
-		var_dump($is_courseAdmin);
-		echo "is_allowed_in_course:";
-		var_dump($is_allowed_in_course);
-		echo "is_courseTutor:";
-		var_dump($is_courseTutor);
-		echo "
USER :".$_user['user_id']." in ".$_gid."
";
-		echo "
"; -} -/** - * @deprecated Function not in use - */ -function printConfig() -{ - GLOBAL $_configuration, $dokeos_version, $urlAppend, $userPasswordCrypted, $userPasswordCrypted, $platformLanguage, $siteName, $clarolineRepositoryAppend, $coursesRepositoryAppend, $rootAdminAppend, $clarolineRepositoryWeb, $clarolineRepositorySys, $coursesRepositoryWeb, $coursesRepositorySys, $rootAdminSys, $rootAdminWeb; - echo ""; - echo " - - - - - - - - - - - - - - - - - - - - - - - - - - - - "; - echo "
Mysql
dbHost".$_configuration['db_host']."
dbLogin ".$_configuration['db_user']."
dbPass ".str_repeat("*", strlen($_configuration['db_password']))."
mainDbName ".$_configuration['main_database']."
clarolineVersion $dokeos_version
rootWeb".$_configuration['root_web']."
urlAppend $urlAppend
param for new and future features
userPasswordCrypted $userPasswordCrypted
platformLanguage $platformLanguage
siteName $siteName
rootWeb ".$_configuration['root_web']."
rootSys $rootSys
clarolineRepositoryAppend $clarolineRepositoryAppend
coursesRepositoryAppend $coursesRepositoryAppend
rootAdminAppend $rootAdminAppend
clarolineRepositoryWeb $clarolineRepositoryWeb
clarolineRepositorySys $clarolineRepositorySys
coursesRepositoryWeb $coursesRepositoryWeb
coursesRepositorySys $coursesRepositorySys
rootAdminSys $rootAdminSys
rootAdminWeb $rootAdminWeb
"; -} ?> \ No newline at end of file diff --git a/main/inc/lib/fckeditor/editor/plugins/ImageManager/config.inc.php b/main/inc/lib/fckeditor/editor/plugins/ImageManager/config.inc.php index 2aa955fceb..1fcebc97c1 100644 --- a/main/inc/lib/fckeditor/editor/plugins/ImageManager/config.inc.php +++ b/main/inc/lib/fckeditor/editor/plugins/ImageManager/config.inc.php @@ -30,7 +30,7 @@ require_once('../../../../../conf/configuration.php'); $IMConfig['base_url'] = $_configuration['root_web'].'main/img/gallery/'; //$IMConfig['base_dir'] = $_SERVER['DOCUMENT_ROOT'].$IMConfig['base_url']; -$IMConfig['base_dir'] = $rootSys.'main/img/gallery/'; +$IMConfig['base_dir'] = $_configuration['root_sys'].'main/img/gallery/'; $IMConfig['server_name'] = $_SERVER['SERVER_NAME']; /* diff --git a/main/inc/lib/fileManage.lib.php b/main/inc/lib/fileManage.lib.php index 76b475455d..a99368916a 100644 --- a/main/inc/lib/fileManage.lib.php +++ b/main/inc/lib/fileManage.lib.php @@ -1,4 +1,4 @@ - @@ -334,12 +336,13 @@ elseif ($smo == get_lang('Import')) $fp = fopen($thf, "rb"); fpassthru($fp); fclose($fp); } ' - . str_replace('$rootSys', api_get_path(SYS_PATH), + . str_replace($_configuration['root_sys'], api_get_path(SYS_PATH), str_replace('$scid', $scid, ' else { - $drs = "$rootSys"; $scormid = "$scid"; + $drs = "$rootSys"; + $scormid = "$scid"; require($drs. "main/metadata/playscormmdset.inc.php"); } ' )) . '?' . '>'; diff --git a/main/newscorm/resourcelinker.inc.php b/main/newscorm/resourcelinker.inc.php index e5ebef658d..bb952f5fea 100644 --- a/main/newscorm/resourcelinker.inc.php +++ b/main/newscorm/resourcelinker.inc.php @@ -366,7 +366,7 @@ function display_addedresource_link($type, $id, $style='') function display_addedresource_link_in_learnpath($type, $id, $completed, $id_in_path, $builder, $icon, $level = 0) { global $_course, $learnpath_id, $tbl_learnpath_item, $items; - global $_course, $curDirPath, $_configuration, $enableDocumentParsing, $_course, $_user, $_cid, $rootSys; + global $curDirPath, $_configuration, $enableDocumentParsing, $_course, $_user, $_cid; $tbl_lp_item = Database::get_course_table('lp_item'); $hyperlink_target_parameter = ''; //or e.g. 'target="_blank"' @@ -1164,7 +1164,7 @@ function display_addedresource_link_in_learnpath($type, $id, $completed, $id_in_ function get_addedresource_link_in_learnpath($type, $id, $id_in_path) { global $_course, $learnpath_id, $tbl_learnpath_item, $items; - global $curDirPath, $_configuration, $enableDocumentParsing, $_user, $_cid, $rootSys; + global $curDirPath, $_configuration, $enableDocumentParsing, $_user, $_cid; $tbl_lp_item = Database::get_course_table('lp_item'); $hyperlink_target_parameter = ""; //or e.g. target='_blank' diff --git a/main/newscorm/resourcelinker.php b/main/newscorm/resourcelinker.php index 522d06877d..9d6c0cd811 100644 --- a/main/newscorm/resourcelinker.php +++ b/main/newscorm/resourcelinker.php @@ -777,7 +777,7 @@ if ($content == "chapter") if ($content == "Document" OR (empty($content) AND (is_allowed_to_edit() OR in_array(TOOL_DOCUMENT,$active_modules))) AND !$_GET['showresources']) { // setting variables for file locations - $baseServDir = $rootSys; + $baseServDir = $_configuration['root_sys']; $courseDir = $_course['path']."/document"; $baseWorkDir = $baseServDir.$courseDir; // showing the link to move one folder up (when not in the root folder) diff --git a/main/online/online_links.php b/main/online/online_links.php index 96a87700e5..f5971543b4 100644 --- a/main/online/online_links.php +++ b/main/online/online_links.php @@ -1,4 +1,4 @@ -\n",