From e456fea01798e160ddd41b778c132afad96bb8ee Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Sun, 6 Nov 2011 23:53:44 -0500 Subject: [PATCH] Removed deprecated variable from all files --- main/inc/lib/banner.lib.php | 1 - main/inc/lib/display.lib.php | 4 ++-- main/inc/lib/template.lib.php | 2 +- main/install/configuration.dist.php | 7 +------ main/user/user_add.php | 10 +--------- tests/main/inc/banner.inc.test.php | 2 +- tests/main/inc/banner.lib.test.php | 2 +- tests/main/inc/lib/display.lib.test.php | 2 +- user_portal.php | 3 +-- 9 files changed, 9 insertions(+), 24 deletions(-) mode change 100755 => 100644 main/user/user_add.php diff --git a/main/inc/lib/banner.lib.php b/main/inc/lib/banner.lib.php index 5a96b88e46..cd24a771a1 100644 --- a/main/inc/lib/banner.lib.php +++ b/main/inc/lib/banner.lib.php @@ -104,7 +104,6 @@ function get_tabs() { // Platform administration if (api_is_platform_admin(true)) { - //$navigation['platform_admin']['url'] = $rootAdminWeb; $navigation['platform_admin']['url'] = api_get_path(WEB_CODE_PATH).'admin/'; $navigation['platform_admin']['title'] = get_lang('PlatformAdmin'); } diff --git a/main/inc/lib/display.lib.php b/main/inc/lib/display.lib.php index 7729732300..8ea0a7f471 100644 --- a/main/inc/lib/display.lib.php +++ b/main/inc/lib/display.lib.php @@ -425,7 +425,7 @@ class Display { public static function display_header($tool_name ='', $help = null) { $nameTools = $tool_name; global $_plugins, $lp_theme_css, $mycoursetheme, $user_theme, $platform_theme; - global $httpHeadXtra, $htmlHeadXtra, $htmlIncHeadXtra, $_course, $_user, $text_dir, $plugins, $_user, $rootAdminWeb, $_cid, $interbreadcrumb, $charset, $language_file, $noPHP_SELF; + global $httpHeadXtra, $htmlHeadXtra, $htmlIncHeadXtra, $_course, $_user, $text_dir, $plugins, $_user, $_cid, $interbreadcrumb, $charset, $language_file, $noPHP_SELF; global $menu_navigation; global $htmlCSSXtra; require api_get_path(INCLUDE_PATH).'header.inc.php'; @@ -436,7 +436,7 @@ class Display { */ public static function display_reduced_header () { global $_plugins, $lp_theme_css, $mycoursetheme, $user_theme, $platform_theme; - global $httpHeadXtra, $htmlHeadXtra, $htmlIncHeadXtra, $_course, $_user, $text_dir, $plugins, $_user, $rootAdminWeb, $_cid, $interbreadcrumb, $charset, $language_file, $noPHP_SELF, $language_interface; + global $httpHeadXtra, $htmlHeadXtra, $htmlIncHeadXtra, $_course, $_user, $text_dir, $plugins, $_user, $_cid, $interbreadcrumb, $charset, $language_file, $noPHP_SELF, $language_interface; global $menu_navigation; require api_get_path(INCLUDE_PATH).'reduced_header.inc.php'; } diff --git a/main/inc/lib/template.lib.php b/main/inc/lib/template.lib.php index 998ae19928..198623c4a1 100644 --- a/main/inc/lib/template.lib.php +++ b/main/inc/lib/template.lib.php @@ -129,7 +129,7 @@ class Template extends Smarty { $nameTools = $this->title; global $_plugins, $lp_theme_css, $mycoursetheme, $user_theme, $platform_theme; global $httpHeadXtra, $htmlHeadXtra, $_course, $_user, $text_dir, $plugins, $_user, - $rootAdminWeb, $_cid, $interbreadcrumb, $charset, $language_file, $noPHP_SELF; + $_cid, $interbreadcrumb, $charset, $language_file, $noPHP_SELF; global $menu_navigation; global $_configuration, $show_learn_path; diff --git a/main/install/configuration.dist.php b/main/install/configuration.dist.php index 0fd15fcc36..cb6761061f 100644 --- a/main/install/configuration.dist.php +++ b/main/install/configuration.dist.php @@ -80,12 +80,7 @@ $_configuration['course_folder'] = "courses/"; // @todo this shouldn't be here. // Directory of the admin-area -$rootAdminAppend = "admin/"; - -// Do not change the following values -// @todo should be moved to api_get_path -$rootAdminSys = $clarolineRepositorySys.$rootAdminAppend; -$rootAdminWeb = $clarolineRepositoryWeb.$rootAdminAppend; +$_configuration['admin_append_path'] = "admin/"; // directory to store archived courses $archiveDirName = "archive"; diff --git a/main/user/user_add.php b/main/user/user_add.php old mode 100755 new mode 100644 index b5803ecd41..f253cd6264 --- a/main/user/user_add.php +++ b/main/user/user_add.php @@ -360,13 +360,5 @@ else IMPORT XML/CSV USER LIST ==========================*/ -if($is_platformAdmin) -{ - echo "".get_lang('UserMany').""; -} // if is_platformAdmin -else -{ - echo "

".get_lang('IfYouWantToAddManyUsers')."

"; -} - +echo "

".get_lang('IfYouWantToAddManyUsers')."

"; Display::display_footer(); diff --git a/tests/main/inc/banner.inc.test.php b/tests/main/inc/banner.inc.test.php index da9557dff1..d5429243c3 100755 --- a/tests/main/inc/banner.inc.test.php +++ b/tests/main/inc/banner.inc.test.php @@ -6,7 +6,7 @@ class TestBanner extends UnitTestCase{ $this->UnitTestCase('Banners library - main/inc/banner.inc.test.php'); } public function testGetTabs(){ - global $_course, $rootAdminWeb, $_user; + global $_course, $_user; ob_start(); require_once(api_get_path(SYS_CODE_PATH).'inc/banner.inc.php'); ob_end_clean(); diff --git a/tests/main/inc/banner.lib.test.php b/tests/main/inc/banner.lib.test.php index f0a95a9fd4..8b5870aef3 100755 --- a/tests/main/inc/banner.lib.test.php +++ b/tests/main/inc/banner.lib.test.php @@ -7,7 +7,7 @@ class TestBanner extends UnitTestCase{ } public function testGetTabs(){ - global $_course, $rootAdminWeb, $_user; + global $_course, $_user; $res = get_tabs(); $this->assertTrue(is_array($res)); $this->assertTrue($res); diff --git a/tests/main/inc/lib/display.lib.test.php b/tests/main/inc/lib/display.lib.test.php index f114c3cd21..256bcfb7ed 100755 --- a/tests/main/inc/lib/display.lib.test.php +++ b/tests/main/inc/lib/display.lib.test.php @@ -122,7 +122,7 @@ class TestDisplay extends UnitTestCase { // [/var/www/chamilo/main/inc/reduced_header.inc.php line 30] - exception /* public function testdisplay_reduced_header() { global $_plugins,$lp_theme_css,$mycoursetheme,$user_theme,$platform_theme; - global $httpHeadXtra, $htmlHeadXtra, $htmlIncHeadXtra, $_course, $_user, $text_dir, $plugins, $_user, $rootAdminWeb, $_cid, $interbreadcrumb, $charset, $language_file, $noPHP_SELF, $language_interface; + global $httpHeadXtra, $htmlHeadXtra, $htmlIncHeadXtra, $_course, $_user, $text_dir, $plugins, $_user, $_cid, $interbreadcrumb, $charset, $language_file, $noPHP_SELF, $language_interface; global $menu_navigation; ob_start(); $res=Display::display_reduced_header(); diff --git a/user_portal.php b/user_portal.php index b7cefe5001..0ced6655aa 100644 --- a/user_portal.php +++ b/user_portal.php @@ -13,7 +13,6 @@ * @todo Shouldn't the SCRIPTVAL_ and CONFVAL_ constant be moved to the config page? Has anybody any idea what the are used for? * If these are really configuration settings then we can add those to the dokeos config settings. * @todo move display_courses and some other functions to a more appripriate place course.lib.php or user.lib.php - * @todo use api_get_path instead of $rootAdminWeb * @todo check for duplication of functions with index.php (user_portal.php is orginally a copy of index.php) * @todo display_digest, shouldn't this be removed and be made into an extension? */ @@ -244,4 +243,4 @@ if (api_is_platform_admin() || api_is_drh()) { $controller->tpl->display_two_col_template(); // Deleting the session_id. -api_session_unregister('session_id'); \ No newline at end of file +api_session_unregister('session_id');