瀏覽代碼

Use api_is_multiple_url_enabled()

Julio Montoya 10 年之前
父節點
當前提交
93103703db

+ 3 - 4
main/admin/career_dashboard.php

@@ -1,12 +1,11 @@
 <?php
 /* For licensing terms, see /license.txt */
+
 /**
  * Careers dashboard
  * @package chamilo.admin.career
  */
-/**
- * Code
- */
+
 $cidReset = true;
 require_once '../inc/global.inc.php';
 $libpath = api_get_path(LIBRARY_PATH);
@@ -22,7 +21,7 @@ $htmlHeadXtra[] = api_get_jqgrid_js();
 $interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
 $interbreadcrumb[]=array('url' => 'career_dashboard.php','name' => get_lang('CareersAndPromotions'));
 
-Display :: display_header($nameTools);
+Display :: display_header(null);
 
 $form = new FormValidator('filter_form','GET', api_get_self());
 

+ 2 - 4
main/admin/dashboard_add_courses_to_user.php

@@ -10,8 +10,6 @@ $cidReset = true;
 
 require_once '../inc/global.inc.php';
 
-global $_configuration;
-
 $xajax = new xajax();
 $xajax->registerFunction('search_courses');
 
@@ -56,7 +54,7 @@ if (!api_is_platform_admin()) {
 
 function search_courses($needle, $type)
 {
-    global $_configuration, $tbl_course, $tbl_course_rel_access_url,$user_id;
+    global $tbl_course, $tbl_course_rel_access_url,$user_id;
 
     $xajax_response = new xajaxResponse();
     $return = '';
@@ -76,7 +74,7 @@ function search_courses($needle, $type)
             $without_assigned_courses = " AND c.code NOT IN(".implode(',',$assigned_courses_code).")";
         }
 
-        if ($_configuration['multiple_access_urls']) {
+        if (api_is_multiple_url_enabled()) {
             $sql = "SELECT c.code, c.title FROM $tbl_course c
 					LEFT JOIN $tbl_course_rel_access_url a ON (a.c_id = c.id)
                 	WHERE

+ 2 - 3
main/admin/dashboard_add_sessions_to_user.php

@@ -9,7 +9,6 @@
 $cidReset = true;
 
 require_once '../inc/global.inc.php';
-global $_configuration;
 
 // create an ajax object
 $xajax = new xajax();
@@ -57,7 +56,7 @@ if (!api_is_platform_admin() && !api_is_session_admin()) {
 
 function search_sessions($needle, $type)
 {
-    global $_configuration, $tbl_session_rel_access_url, $tbl_session, $user_id;
+    global $tbl_session_rel_access_url, $tbl_session, $user_id;
 
     $xajax_response = new xajaxResponse();
     $return = '';
@@ -74,7 +73,7 @@ function search_sessions($needle, $type)
             $without_assigned_sessions = " AND s.id NOT IN(".implode(',', $assigned_sessions_id).")";
         }
 
-        if ($_configuration['multiple_access_urls']) {
+        if (api_is_multiple_url_enabled()) {
             $sql 	= " SELECT s.id, s.name FROM $tbl_session s
                         LEFT JOIN $tbl_session_rel_access_url a ON (s.id = a.session_id)
                         WHERE  s.name LIKE '$needle%' $without_assigned_sessions AND access_url_id = ".api_get_current_access_url_id()."";

+ 1 - 3
main/admin/session_import.php

@@ -37,7 +37,6 @@ set_time_limit(0);
 $purification_option_for_usernames = false;
 $inserted_in_course = array();
 
-global $_configuration;
 $warn = null;
 if (isset($_POST['formSent']) && $_POST['formSent']) {
     if (isset($_FILES['import_file']['tmp_name']) &&
@@ -285,8 +284,7 @@ if (isset($_POST['formSent']) && $_POST['formSent']) {
                         }
 
                         // Associate the session with access_url.
-                        global $_configuration;
-                        if ($_configuration['multiple_access_urls']) {
+                        if (api_is_multiple_url_enabled()) {
                             $access_url_id = api_get_current_access_url_id();
                             UrlManager::add_session_to_url($session_id, $access_url_id);
                         } else {

+ 7 - 5
main/admin/user_move_stats.php

@@ -5,6 +5,7 @@
  * User move script (to move between courses and sessions)
  * @package chamilo.admin
  */
+
 $cidReset = true;
 require_once '../inc/global.inc.php';
 $this_section=SECTION_PLATFORM_ADMIN;
@@ -581,15 +582,16 @@ $htmlHeadXtra[] = '<script type="text/javascript">
  </script>';
 
 function get_courses_list_by_user_id_based_in_exercises($user_id) {
-    $TABLETRACK_EXERCICES       = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
+    $TABLETRACK_EXERCICES = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
     $user_id = intval($user_id);
     $sql = "SELECT DISTINCT exe_user_id, c_id, session_id
-            FROM $TABLETRACK_EXERCICES WHERE exe_user_id = $user_id
+            FROM $TABLETRACK_EXERCICES
+            WHERE exe_user_id = $user_id
             ORDER by exe_user_id, c_id ASC";
 
     $res = Database::query($sql);
     $course_list = array();
-    while($row = Database::fetch_array($res,'ASSOC')) {
+    while ($row = Database::fetch_array($res,'ASSOC')) {
         $course_list []= $row;
     }
     return $course_list;
@@ -641,7 +643,7 @@ foreach ($session_list as $session_data) {
 $combinations = array();
 
 if (!empty($user_list)) {
-    foreach ($user_list  as $user) {
+    foreach ($user_list as $user) {
         $user_id = $user['user_id'];
         $name = $user['firstname'].' '.$user['lastname'];
         $course_list_registered = CourseManager::get_courses_list_by_user_id(
@@ -658,7 +660,7 @@ if (!empty($user_list)) {
             // Recover the code for historical reasons. If it can be proven
             // that the code can be safely replaced by c_id in the following
             // PHP code, feel free to do so
-            $courseInfo = api_get_course_info_by_id($course_reg['c_id']);
+            $courseInfo = api_get_course_info_by_id($course_reg['real_id']);
             $course_reg['code'] = $courseInfo['code'];
             $new_course_list[] = $course_reg['code'].'_'.$course_reg['session_id'];
         }

+ 5 - 5
main/inc/lib/login.lib.php

@@ -28,10 +28,9 @@ class Login
      */
     public static function get_user_account_list($user, $reset = false, $by_username = false)
     {
-        global $_configuration;
         $portal_url = api_get_path(WEB_PATH);
 
-        if ($_configuration['multiple_access_urls']) {
+        if (api_is_multiple_url_enabled()) {
             $access_url_id = api_get_current_access_url_id();
             if ($access_url_id != -1) {
                 $url = api_get_access_url($access_url_id);
@@ -82,8 +81,9 @@ class Login
      * @param int $user
      * @author Olivier Cauberghe <olivier.cauberghe@UGent.be>, Ghent University
      */
-    public static function send_password_to_user($user, $by_username = false) {
-        global $_configuration;
+    public static function send_password_to_user($user, $by_username = false)
+    {
+
         $email_subject = "[" . api_get_setting('siteName') . "] " . get_lang('LoginRequest'); // SUBJECT
 
         if ($by_username) { // Show only for lost password
@@ -95,7 +95,7 @@ class Login
         }
 
         $portal_url = api_get_path(WEB_PATH);
-        if ($_configuration['multiple_access_urls']) {
+        if (api_is_multiple_url_enabled()) {
             $access_url_id = api_get_current_access_url_id();
             if ($access_url_id != -1) {
                 $url = api_get_access_url($access_url_id);

+ 4 - 6
main/inc/lib/system_announcements.lib.php

@@ -57,7 +57,7 @@ class SystemAnnouncementManager
         }
 		global $_configuration;
 		$current_access_url_id = 1;
-		if ($_configuration['multiple_access_urls']) {
+		if (api_is_multiple_url_enabled()) {
 			$current_access_url_id = api_get_current_access_url_id();
 		}
 		$sql .= " AND access_url_id = '$current_access_url_id' ";
@@ -251,7 +251,7 @@ class SystemAnnouncementManager
 
  		global $_configuration;
 		$current_access_url_id = 1;
-		if ($_configuration['multiple_access_urls']) {
+		if (api_is_multiple_url_enabled()) {
 			$current_access_url_id = api_get_current_access_url_id();
 		}
 		$sql .= " AND access_url_id = '$current_access_url_id' ";
@@ -277,9 +277,8 @@ class SystemAnnouncementManager
 		$now = api_get_utc_datetime();
 		$sql = "SELECT *, IF( '$now'  >= date_start AND '$now' <= date_end, '1', '0') AS visible FROM $db_table";
 
-		global $_configuration;
 		$current_access_url_id = 1;
-		if ($_configuration['multiple_access_urls']) {
+		if (api_is_multiple_url_enabled()) {
 			$current_access_url_id = api_get_current_access_url_id();
 		}
 		$sql .= " WHERE access_url_id = '$current_access_url_id' ";
@@ -357,9 +356,8 @@ class SystemAnnouncementManager
 
 		$langsql = is_null($lang) ? 'NULL' : "'".Database::escape_string($lang)."'";
 
-		global $_configuration;
 		$current_access_url_id = 1;
-		if ($_configuration['multiple_access_urls']) {
+		if (api_is_multiple_url_enabled()) {
 			$current_access_url_id = api_get_current_access_url_id();
 		}
 

+ 1 - 1
main/inc/lib/template.lib.php

@@ -760,7 +760,7 @@ class Template
 
         $favico = '<link rel="shortcut icon" href="'.api_get_path(WEB_PATH).'favicon.ico" type="image/x-icon" />';
 
-        if (isset($_configuration['multiple_access_urls']) && $_configuration['multiple_access_urls']) {
+        if (api_is_multiple_url_enabled()) {
             $access_url_id = api_get_current_access_url_id();
             if ($access_url_id != -1) {
                 $url_info  = api_get_access_url($access_url_id);

+ 1 - 3
main/inc/lib/userportal.lib.php

@@ -1,8 +1,6 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-use \ChamiloSession as Session;
-
 /**
  * Class IndexManager
  */
@@ -417,7 +415,7 @@ class IndexManager
 
         // Showing only the courses of the current access_url_id.
         global $_configuration;
-        if ($_configuration['multiple_access_urls']) {
+        if (api_is_multiple_url_enabled()) {
             $url_access_id = api_get_current_access_url_id();
             if ($url_access_id != -1) {
                 $tbl_url_rel_course = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);

+ 1 - 1
main/mySpace/user_add.php

@@ -320,7 +320,7 @@ if ($form->validate()) {
 			//$emailto = '"'.api_get_person_name($firstname, $lastname, null, PERSON_NAME_EMAIL_ADDRESS).'" <'.$email.'>';
 			$emailsubject = '['.api_get_setting('siteName').'] '.get_lang('YourReg').' '.api_get_setting('siteName');
 			$portal_url = $_configuration['root_web'];
-			if ($_configuration['multiple_access_urls']) {
+			if (api_is_multiple_url_enabled()) {
 				$access_url_id = api_get_current_access_url_id();
 				if ($access_url_id != -1) {
 					$url = api_get_access_url($access_url_id);

+ 3 - 3
main/webservices/registration.soap.php

@@ -331,7 +331,7 @@ function WSCreateUsers($params) {
         if ($result) {
             //echo "id returned";
             $return = Database::insert_id();
-            if ($_configuration['multiple_access_urls']) {
+            if (api_is_multiple_url_enabled()) {
                 if (api_get_current_access_url_id() != -1) {
                     UrlManager::add_user_to_url($return, api_get_current_access_url_id());
                 } else {
@@ -536,7 +536,7 @@ function WSCreateUser($params) {
     if ($result) {
         //echo "id returned";
         $return = Database::insert_id();
-        if ($_configuration['multiple_access_urls']) {
+        if (api_is_multiple_url_enabled()) {
             if (api_get_current_access_url_id() != -1) {
                 UrlManager::add_user_to_url($return, api_get_current_access_url_id());
             } else {
@@ -827,7 +827,7 @@ function WSCreateUsersPasswordCrypted($params) {
         if ($result) {
             //echo "id returned";
             $return = Database::insert_id();
-            if ($_configuration['multiple_access_urls']) {
+            if (api_is_multiple_url_enabled()) {
                 if (api_get_current_access_url_id() != -1) {
                     UrlManager::add_user_to_url($return, api_get_current_access_url_id());
                 } else {