chamilo / chamilo-lms

main/course_description/add.php

Indentation +16 added lines, -16 removed lines

@@ -20,32 +20,32 @@ 
 $i=1;
 echo '<div class="actions" style="margin-bottom:30px">';
 echo '<a href="index.php?'.api_get_cidreq().'">'.
-	Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('ToolCourseDescription'),'',ICON_SIZE_MEDIUM).
-	'</a>';
+    Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('ToolCourseDescription'),'',ICON_SIZE_MEDIUM).
+    '</a>';
 ksort($categories);
 foreach ($categories as $id => $title) {
-	if ($i == ADD_BLOCK) {
-		echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.
-			Display::return_icon($default_description_icon[$id], $title, '',ICON_SIZE_MEDIUM).'</a>';
-		break;
-	} else {
-		echo '<a href="index.php?action=edit&'.api_get_cidreq().'&description_type='.$id.'">'.
-			Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
-		$i++;
-	}
+    if ($i == ADD_BLOCK) {
+        echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.
+            Display::return_icon($default_description_icon[$id], $title, '',ICON_SIZE_MEDIUM).'</a>';
+        break;
+    } else {
+        echo '<a href="index.php?action=edit&'.api_get_cidreq().'&description_type='.$id.'">'.
+            Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
+        $i++;
+    }
 }
 echo '</div>';
 
 // error messages
 if (isset($error) && intval($error) == 1) {
-	Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'), false);
+    Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'), false);
 }
 
 // default header title form
 $header = '';
 $description_type = intval($description_type);
 if ($description_type >= ADD_BLOCK) {
-	$header = $default_description_titles[ADD_BLOCK];
+    $header = $default_description_titles[ADD_BLOCK];
 }
 
 // display form
@@ -73,8 +73,8 @@ 
 
 // display default questions
 if (isset ($question[$description_type])) {
-	$message = '<strong>'.get_lang('QuestionPlan').'</strong><br />';
-	$message .= $question[$description_type];
-	Display::display_normal_message($message, false);
+    $message = '<strong>'.get_lang('QuestionPlan').'</strong><br />';
+    $message .= $question[$description_type];
+    Display::display_normal_message($message, false);
 }
 $form->display();

main/inc/lib/export.lib.inc.php

Indentation +8 added lines, -8 removed lines

@@ -115,13 +115,13 @@ 
     }
 
     /**
-    * Export tabular data to XML-file
-    * @param array  Simple array of data to put in XML
-    * @param string Name of file to be given to the user
-    * @param string Name of common tag to place each line in
-    * @param string Name of the root element. A root element should always be given.
-    * @param string Encoding in which the data is provided
-    */
+     * Export tabular data to XML-file
+     * @param array  Simple array of data to put in XML
+     * @param string Name of file to be given to the user
+     * @param string Name of common tag to place each line in
+     * @param string Name of the root element. A root element should always be given.
+     * @param string Encoding in which the data is provided
+     */
     public static function arrayToXml(
         $data,
         $filename = 'export',
@@ -200,7 +200,7 @@ 
         foreach ($data as $row) {
             $string .= "\n".str_repeat("\t",$level).'<'.$row['name'].'>';
             if (is_array($row['value'])) {
-            	$string .= self::_export_complex_table_xml_helper($row['value'],$level+1)."\n";
+                $string .= self::_export_complex_table_xml_helper($row['value'],$level+1)."\n";
                 $string .= str_repeat("\t",$level).'</'.$row['name'].'>';
             } else {
                 $string .= $row['value'];

main/inc/lib/add_many_session_to_category_functions.lib.php

Indentation +21 added lines, -21 removed lines

@@ -25,29 +25,29 @@
     function search_courses($needle,$type)
     {
         $tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION);
-		$xajax_response = new xajaxResponse();
-		$return = '';
-		if(!empty($needle) && !empty($type)) {
-			// xajax send utf8 datas... datas in db can be non-utf8 datas
-			$charset = api_get_system_encoding();
-			$needle = api_convert_encoding($needle, $charset, 'utf-8');
-			$needle = Database::escape_string($needle);
+        $xajax_response = new xajaxResponse();
+        $return = '';
+        if(!empty($needle) && !empty($type)) {
+            // xajax send utf8 datas... datas in db can be non-utf8 datas
+            $charset = api_get_system_encoding();
+            $needle = api_convert_encoding($needle, $charset, 'utf-8');
+            $needle = Database::escape_string($needle);
 
-			$sql = 'SELECT * FROM '.$tbl_session.' WHERE name LIKE "'.$needle.'%" ORDER BY id';
+            $sql = 'SELECT * FROM '.$tbl_session.' WHERE name LIKE "'.$needle.'%" ORDER BY id';
 
-			$rs = Database::query($sql);
-			$course_list = array();
+            $rs = Database::query($sql);
+            $course_list = array();
 
-			$return .= '<select id="origin" name="NoSessionCategoryList[]" multiple="multiple" size="20" style="width:340px;">';
-			while($course = Database :: fetch_array($rs)) {
-				$course_list[] = $course['id'];
-				$return .= '<option value="'.$course['id'].'" title="'.htmlspecialchars($course['name'],ENT_QUOTES).'">'.$course['name'].'</option>';
-			}
-			$return .= '</select>';
-			$xajax_response -> addAssign('ajax_list_courses_multiple','innerHTML',api_utf8_encode($return));
-		}
-		$_SESSION['course_list'] = $course_list;
+            $return .= '<select id="origin" name="NoSessionCategoryList[]" multiple="multiple" size="20" style="width:340px;">';
+            while($course = Database :: fetch_array($rs)) {
+                $course_list[] = $course['id'];
+                $return .= '<option value="'.$course['id'].'" title="'.htmlspecialchars($course['name'],ENT_QUOTES).'">'.$course['name'].'</option>';
+            }
+            $return .= '</select>';
+            $xajax_response -> addAssign('ajax_list_courses_multiple','innerHTML',api_utf8_encode($return));
+        }
+        $_SESSION['course_list'] = $course_list;
         
-		return $xajax_response;
-	}
+        return $xajax_response;
+    }
 }

src/Chamilo/CoreBundle/Component/Editor/Editor.php

Indentation +1 added lines, -1 removed lines

@@ -137,7 +137,7 @@
                     array('\r', '\n', '\x3c', '\x3e', '\x26'),
                     addslashes($var)
                 ).'"';
-             case 'array':
+                case 'array':
                 // Arrays in JSON can't be associative. If the array is empty or if it
                 // has sequential whole number keys starting with 0, it's not associative
                 // so we can go ahead and convert it as an array.

main/inc/lib/banner.lib.php

Indentation +21 added lines, -21 removed lines

@@ -47,20 +47,20 @@ 
     $navigation['myprofile']['url'] = api_get_path(WEB_CODE_PATH).'auth/profile.php'.(!empty($_course['path']) ? '?coursePath='.$_course['path'].'&courseCode='.$_course['official_code'] : '' );
     $navigation['myprofile']['title'] = get_lang('ModifyProfile');
     $navigation['myprofile']['key'] = 'profile';
-	// Link to my agenda
+    // Link to my agenda
     $navigation['myagenda']['url'] = api_get_path(WEB_CODE_PATH).'calendar/agenda_js.php?type=personal';
     $navigation['myagenda']['title'] = get_lang('MyAgenda');
     $navigation['myagenda']['key'] = 'agenda';
 
-	// Gradebook
-	if (api_get_setting('gradebook_enable') == 'true') {
+    // Gradebook
+    if (api_get_setting('gradebook_enable') == 'true') {
         $navigation['mygradebook']['url'] = api_get_path(WEB_CODE_PATH).'gradebook/gradebook.php'.(!empty($_course['path']) ? '?coursePath='.$_course['path'].'&courseCode='.$_course['official_code'] : '' );
         $navigation['mygradebook']['title'] = get_lang('MyGradebook');
         $navigation['mygradebook']['key'] = 'gradebook';
-	}
+    }
 
-	// Reporting
-	if (api_is_allowed_to_create_course() || api_is_drh() || api_is_session_admin()) {
+    // Reporting
+    if (api_is_allowed_to_create_course() || api_is_drh() || api_is_session_admin()) {
         // Link to my space
         $navigation['session_my_space']['url'] = api_get_path(WEB_CODE_PATH).'mySpace/'.(api_is_drh()?'session.php':'');
         $navigation['session_my_space']['title'] = get_lang('MySpace');
@@ -84,21 +84,21 @@ 
         $navigation['session_my_progress']['key'] = 'my-progress';
     }
 
-	// Social
-	if (api_get_setting('allow_social_tool')=='true') {
+    // Social
+    if (api_get_setting('allow_social_tool')=='true') {
         $navigation['social']['url'] = api_get_path(WEB_CODE_PATH).'social/home.php';
         $navigation['social']['title'] = get_lang('SocialNetwork');
         $navigation['social']['key'] = 'social-network';
-	}
+    }
 
-	// Dashboard
-	if (api_is_platform_admin() || api_is_drh() || api_is_session_admin()) {
+    // Dashboard
+    if (api_is_platform_admin() || api_is_drh() || api_is_session_admin()) {
         $navigation['dashboard']['url'] = api_get_path(WEB_CODE_PATH).'dashboard/index.php';
         $navigation['dashboard']['title'] = get_lang('Dashboard');
         $navigation['dashboard']['key'] = 'dashboard';
-	}
+    }
 
-	// Reports
+    // Reports
     /*
 	if (api_is_platform_admin() || api_is_drh() || api_is_session_admin()) {
         $navigation['reports']['url'] = api_get_path(WEB_CODE_PATH).'reports/index.php';
@@ -121,14 +121,14 @@ 
     }
     // End Custom Tabs
 
-	// Platform administration
-	if (api_is_platform_admin(true)) {
+    // Platform administration
+    if (api_is_platform_admin(true)) {
         $navigation['platform_admin']['url'] = api_get_path(WEB_CODE_PATH).'admin/';
         $navigation['platform_admin']['title'] = get_lang('PlatformAdmin');
         $navigation['platform_admin']['key'] = 'admin';
-	}
+    }
 
-	return $navigation;
+    return $navigation;
 }
 
 /**
@@ -254,7 +254,7 @@ 
         if ($number &&
             (api_get_setting('showonline', 'world') == 'true' && !$user_id) ||
                 (api_get_setting('showonline', 'users') == 'true' && $user_id)
-           )
+            )
         {
                 $html .= '<li><a href="'.api_get_path(WEB_PATH).'whoisonline.php" target="_self" title="'.get_lang('UsersOnline').'" >'.
                             Display::return_icon('user.png', get_lang('UsersOnline'), array(), ICON_SIZE_TINY).' '.$number.'</a></li>';
@@ -265,7 +265,7 @@ 
             (is_array($_course) &&
                api_get_setting('showonline', 'course') == 'true' && isset($_course['sysCode'])
             )
-           )
+            )
         {
                 $html .= '<li><a href="'.api_get_path(WEB_PATH).'whoisonline.php?cidReq='.$_course['sysCode'].'" target="_self">'.
                         Display::return_icon('course.png', get_lang('UsersOnline').' '.get_lang('InThisCourse'), array(), ICON_SIZE_TINY).' '.$number_online_in_course.' </a></li>';
@@ -376,7 +376,7 @@ 
             }
         }
 
-		// Reports
+        // Reports
         if (!empty($possible_tabs['reports'])) {
             if (api_get_setting('show_tabs', 'reports') == 'true') {
                 if ((api_is_platform_admin() || api_is_drh() || api_is_session_admin()) && Rights::hasRight('show_tabs:reports')) {
@@ -623,7 +623,7 @@ 
         $navigation_item_my_courses['title'] = get_lang('MyCourses');
         $navigation_item_my_courses['url'] = api_get_path(WEB_PATH).'user_portal.php';
         $navigation[] = $navigation_item_my_courses;
-        */
+         */
         $navigation[] = $navigation_item;
     }
 

main/inc/lib/course.lib.php

Indentation +8 added lines, -8 removed lines

@@ -1320,10 +1320,10 @@ 
             }
 
             $sql .= ' FROM ' . Database::get_main_table(TABLE_MAIN_USER) . ' as user '
-                  . ' LEFT JOIN ' . Database::get_main_table(TABLE_MAIN_COURSE_USER) . ' as course_rel_user
+                    . ' LEFT JOIN ' . Database::get_main_table(TABLE_MAIN_COURSE_USER) . ' as course_rel_user
                         ON user.user_id = course_rel_user.user_id AND
                         course_rel_user.relation_type <> ' . COURSE_RELATION_TYPE_RRHH . '  '
-                  . " INNER JOIN $course_table course ON course_rel_user.c_id = course.id ";
+                    . " INNER JOIN $course_table course ON course_rel_user.c_id = course.id ";
 
             if (!empty($course_code)) {
                 $sql .= ' AND course_rel_user.c_id="' . $courseId . '"';
@@ -1665,7 +1665,7 @@ 
 
         // We get the coach for the given course in a given session.
         $sql = 'SELECT user_id FROM ' . Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER) .
-               ' WHERE session_id ="' . $session_id . '" AND c_id="' . $courseId . '" AND status = 2';
+                ' WHERE session_id ="' . $session_id . '" AND c_id="' . $courseId . '" AND status = 2';
         $rs = Database::query($sql);
         while ($user = Database::fetch_array($rs)) {
             $user_info = api_get_user_info($user['user_id']);
@@ -3374,13 +3374,13 @@ 
                         $params['edit_actions'] .= api_get_path(WEB_CODE_PATH) . 'course_info/infocours.php?cidReq=' . $course['code'];
                         if ($load_dirs) {
                             $params['document'] = '<a id="document_preview_' . $course_info['real_id'] . '_0" class="document_preview btn btn-default btn-sm" href="javascript:void(0);">'
-                               . Display::returnFontAwesomeIcon('folder-open') . '</a>';
+                                . Display::returnFontAwesomeIcon('folder-open') . '</a>';
                             $params['document'] .= Display::div('', ['id' => 'document_result_' . $course_info['real_id'] . '_0', 'class' => 'document_preview_container']);
                         }
                     }else{
                         if ($course_info['visibility'] != COURSE_VISIBILITY_CLOSED && $load_dirs) {
                             $params['document'] = '<a id="document_preview_' . $course_info['real_id'] . '_0" class="document_preview btn btn-default btn-sm" href="javascript:void(0);">'
-                               . Display::returnFontAwesomeIcon('folder-open') . '</a>';
+                                . Display::returnFontAwesomeIcon('folder-open') . '</a>';
                             $params['document'] .= Display::div('', ['id' => 'document_result_' . $course_info['real_id'] . '_0', 'class' => 'document_preview_container']);
                         }
                     }
@@ -3563,7 +3563,7 @@ 
                 $params['edit_actions'] .= api_get_path(WEB_CODE_PATH) . 'course_info/infocours.php?cidReq=' . $course['code'];
                 if($load_dirs){
                     $params['document'] = '<a id="document_preview_' . $course_info['real_id'] . '_0" class="document_preview btn btn-default btn-sm" href="javascript:void(0);">'
-                               . Display::returnFontAwesomeIcon('folder-open') . '</a>';
+                                . Display::returnFontAwesomeIcon('folder-open') . '</a>';
                     $params['document'] .= Display::div('', array('id' => 'document_result_' . $course_info['real_id'] . '_0', 'class' => 'document_preview_container'));
                 }
             }
@@ -3701,7 +3701,7 @@ 
                 $params['edit_actions'] .= api_get_path(WEB_CODE_PATH) . 'course_info/infocours.php?cidReq=' . $course['code'];
                 if($load_dirs){
                     $params['document'] = '<a id="document_preview_' . $course_info['real_id'] . '_0" class="document_preview btn btn-default btn-sm" href="javascript:void(0);">'
-                               . Display::returnFontAwesomeIcon('folder-open') . '</a>';
+                                . Display::returnFontAwesomeIcon('folder-open') . '</a>';
                     $params['document'] .= Display::div('', array('id' => 'document_result_' . $course_info['real_id'] . '_0', 'class' => 'document_preview_container'));
                 }
             }
@@ -4010,7 +4010,7 @@ 
         }
 
         $session_title .= isset($course['special_course']) ? ' ' .
-                          Display::return_icon('klipper.png', get_lang('CourseAutoRegister')) : '';
+                            Display::return_icon('klipper.png', get_lang('CourseAutoRegister')) : '';
 
         $params['title'] = $session_title;
         $params['extra'] = '';

main/inc/lib/security.lib.php

Indentation +11 added lines, -11 removed lines

@@ -304,9 +304,9 @@ 
      */
     public static function remove_XSS($var, $user_status = null, $filter_terms = false)
     {
-    	if ($filter_terms) {
-    		$var = self::filter_terms($var);
-    	}
+        if ($filter_terms) {
+            $var = self::filter_terms($var);
+        }
 
         if (empty($user_status)) {
             if (api_is_anonymous()) {
@@ -401,7 +401,7 @@ 
      */
     public static function filter_terms($text)
     {
-    	static $bad_terms = array();
+        static $bad_terms = array();
 
         if (empty($bad_terms)) {
             $list = api_get_setting('filter_terms');
@@ -422,14 +422,14 @@ 
             }
         }
 
-    	$replace = '***';
-    	if (!empty($bad_terms)) {
-    		// Fast way
-    		$new_text = str_ireplace($bad_terms, $replace, $text, $count);
-    		$text = $new_text;
-    	}
+        $replace = '***';
+        if (!empty($bad_terms)) {
+            // Fast way
+            $new_text = str_ireplace($bad_terms, $replace, $text, $count);
+            $text = $new_text;
+        }
         
-		return $text;
+        return $text;
     }
 
 

main/inc/lib/online.inc.php

Indentation +120 added lines, -120 removed lines

@@ -165,10 +165,10 @@ 
  */
 function LoginDelete($user_id)
 {
-	$online_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
+    $online_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
     $user_id = intval($user_id);
-	$query = "DELETE FROM " . $online_table . " WHERE login_user_id = $user_id";
-	Database::query($query);
+    $query = "DELETE FROM " . $online_table . " WHERE login_user_id = $user_id";
+    Database::query($query);
 }
 
 /**
@@ -177,17 +177,17 @@ 
  */
 function user_is_online($user_id)
 {
-	$track_online_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
-	$table_user = Database::get_main_table(TABLE_MAIN_USER);
+    $track_online_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
+    $table_user = Database::get_main_table(TABLE_MAIN_USER);
 
-	$access_url_id = api_get_current_access_url_id();
-	$time_limit = api_get_setting('time_limit_whosonline');
+    $access_url_id = api_get_current_access_url_id();
+    $time_limit = api_get_setting('time_limit_whosonline');
 
     $online_time = time() - $time_limit*60;
     $limit_date = api_get_utc_datetime($online_time);
     $user_id = intval($user_id);
 
-	$query = " SELECT login_user_id,login_date
+    $query = " SELECT login_user_id,login_date
                FROM $track_online_table track
                INNER JOIN $table_user u ON (u.id=track.login_user_id)
                WHERE
@@ -196,13 +196,13 @@ 
                     u.id =  $user_id
                LIMIT 1 ";
 
-	$result = Database::query($query);
-	if (Database::num_rows($result)) {
+    $result = Database::query($query);
+    if (Database::num_rows($result)) {
 
-		return true;
-	}
+        return true;
+    }
 
-	return false;
+    return false;
 
 }
 /**
@@ -238,13 +238,13 @@ 
 
     $online_time = time() - $time_limit * 60;
     $current_date = api_get_utc_datetime($online_time);
-	$track_online_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
-	$friend_user_table = Database::get_main_table(TABLE_MAIN_USER_REL_USER);
-	$table_user	= Database::get_main_table(TABLE_MAIN_USER);
+    $track_online_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
+    $friend_user_table = Database::get_main_table(TABLE_MAIN_USER_REL_USER);
+    $table_user	= Database::get_main_table(TABLE_MAIN_USER);
 
-	if ($friends) {
-		// 	who friends from social network is online
-		$query = "SELECT DISTINCT login_user_id, login_date
+    if ($friends) {
+        // 	who friends from social network is online
+        $query = "SELECT DISTINCT login_user_id, login_date
 				  FROM $track_online_table INNER JOIN $friend_user_table
 				  ON (friend_user_id = login_user_id)
 				  WHERE
@@ -254,21 +254,21 @@ 
                     user_id = '".api_get_user_id()."'
                   ORDER BY $column $direction
                   LIMIT $from, $number_of_items";
-	} else {
-		$query = "SELECT DISTINCT login_user_id, login_date
+    } else {
+        $query = "SELECT DISTINCT login_user_id, login_date
                     FROM ".$track_online_table ." e
 		            INNER JOIN ".$table_user ." u ON (u.id = e.login_user_id)
                   WHERE u.status != ".ANONYMOUS." AND login_date >= '".$current_date."'
                   ORDER BY $column $direction
                   LIMIT $from, $number_of_items";
-	}
-
-	if (api_get_multiple_access_url()) {
-		$access_url_id = api_get_current_access_url_id();
-		if ($access_url_id != -1) {
-			if ($friends) {
-				// 	friends from social network is online
-				$query = "SELECT distinct login_user_id, login_date
+    }
+
+    if (api_get_multiple_access_url()) {
+        $access_url_id = api_get_current_access_url_id();
+        if ($access_url_id != -1) {
+            if ($friends) {
+                // 	friends from social network is online
+                $query = "SELECT distinct login_user_id, login_date
 							FROM $track_online_table track INNER JOIN $friend_user_table
 							ON (friend_user_id = login_user_id)
 							WHERE   track.access_url_id =  $access_url_id AND
@@ -277,9 +277,9 @@ 
                                     relation_type='".USER_RELATION_TYPE_FRIEND."'
                             ORDER BY $column $direction
                             LIMIT $from, $number_of_items";
-			} else {
-				// all users online
-				$query = "SELECT login_user_id, login_date
+            } else {
+                // all users online
+                $query = "SELECT login_user_id, login_date
 						  FROM ".$track_online_table ." track
                           INNER JOIN ".$table_user ." u
                           ON (u.id=track.login_user_id)
@@ -287,26 +287,26 @@ 
                                 login_date >= '".$current_date."'
                           ORDER BY $column $direction
                           LIMIT $from, $number_of_items";
-			}
-		}
-	}
+            }
+        }
+    }
 
-	//This query will show all registered users. Only for dev purposes.
-	/*$query = "SELECT DISTINCT u.id as login_user_id, login_date FROM ".$track_online_table ."  e , $table_user u
+    //This query will show all registered users. Only for dev purposes.
+    /*$query = "SELECT DISTINCT u.id as login_user_id, login_date FROM ".$track_online_table ."  e , $table_user u
             GROUP by u.id
             ORDER BY $column $direction
             LIMIT $from, $number_of_items";*/
 
-	$result = Database::query($query);
-	if ($result) {
-		$users_online = array();
-		while (list($login_user_id, $login_date) = Database::fetch_row($result)) {
+    $result = Database::query($query);
+    if ($result) {
+        $users_online = array();
+        while (list($login_user_id, $login_date) = Database::fetch_row($result)) {
             $users_online[] = $login_user_id;
-		}
-		return $users_online;
-	} else {
-		return false;
-	}
+        }
+        return $users_online;
+    } else {
+        return false;
+    }
 }
 
 function who_is_online_count($time_limit = null, $friends = false)
@@ -316,15 +316,15 @@ 
     } else {
         $time_limit = intval($time_limit);
     }
-	$track_online_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
-	$friend_user_table = Database::get_main_table(TABLE_MAIN_USER_REL_USER);
-	$table_user = Database::get_main_table(TABLE_MAIN_USER);
-	$online_time = time() - $time_limit * 60;
-	$current_date = api_get_utc_datetime($online_time);
-
-	if ($friends) {
-		// 	who friends from social network is online
-		$query = "SELECT DISTINCT count(login_user_id) as count
+    $track_online_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
+    $friend_user_table = Database::get_main_table(TABLE_MAIN_USER_REL_USER);
+    $table_user = Database::get_main_table(TABLE_MAIN_USER);
+    $online_time = time() - $time_limit * 60;
+    $current_date = api_get_utc_datetime($online_time);
+
+    if ($friends) {
+        // 	who friends from social network is online
+        $query = "SELECT DISTINCT count(login_user_id) as count
 				  FROM $track_online_table INNER JOIN $friend_user_table
                   ON (friend_user_id = login_user_id)
 				  WHERE
@@ -332,20 +332,20 @@ 
 				        friend_user_id <> '".api_get_user_id()."' AND
 				        relation_type='".USER_RELATION_TYPE_FRIEND."' AND
 				        user_id = '".api_get_user_id()."' ";
-	} else {
-		// All users online
-		$query = "SELECT count(login_id) as count
+    } else {
+        // All users online
+        $query = "SELECT count(login_id) as count
                   FROM $track_online_table track INNER JOIN $table_user u
                   ON (u.id=track.login_user_id)
                   WHERE u.status != ".ANONYMOUS." AND login_date >= '$current_date'  ";
-	}
-
-	if (api_get_multiple_access_url()) {
-		$access_url_id = api_get_current_access_url_id();
-		if ($access_url_id != -1) {
-			if ($friends) {
-				// 	friends from social network is online
-				$query = "SELECT DISTINCT count(login_user_id) as count
+    }
+
+    if (api_get_multiple_access_url()) {
+        $access_url_id = api_get_current_access_url_id();
+        if ($access_url_id != -1) {
+            if ($friends) {
+                // 	friends from social network is online
+                $query = "SELECT DISTINCT count(login_user_id) as count
 							FROM $track_online_table track
 							INNER JOIN $friend_user_table ON (friend_user_id = login_user_id)
 							WHERE
@@ -353,29 +353,29 @@ 
 							    login_date >= '".$current_date."' AND
 							    friend_user_id <> '".api_get_user_id()."' AND
 							    relation_type='".USER_RELATION_TYPE_FRIEND."'  ";
-			} else {
-				// all users online
-				$query = "SELECT count(login_id) as count FROM $track_online_table  track
+            } else {
+                // all users online
+                $query = "SELECT count(login_id) as count FROM $track_online_table  track
                           INNER JOIN $table_user u ON (u.id=track.login_user_id)
 						  WHERE
 						    u.status != ".ANONYMOUS." AND
 						    track.access_url_id =  $access_url_id AND
 						    login_date >= '$current_date' ";
-			}
-		}
-	}
+            }
+        }
+    }
 
     // Dev purposes show all users online
     /*$table_user = Database::get_main_table(TABLE_MAIN_USER);
     $query = "SELECT count(*)  as count FROM ".$table_user;*/
 
-	$result = Database::query($query);
-	if (Database::num_rows($result) > 0) {
-		$row = Database::fetch_array($result);
-		return $row['count'];
-	} else {
-		return false;
-	}
+    $result = Database::query($query);
+    if (Database::num_rows($result) > 0) {
+        $row = Database::fetch_array($result);
+        return $row['count'];
+    } else {
+        return false;
+    }
 }
 
 
@@ -388,7 +388,7 @@ 
 */
 function who_is_online_in_this_course($from, $number_of_items, $uid, $time_limit, $course_code)
 {
-	if (empty($course_code)) return false;
+    if (empty($course_code)) return false;
 
     if (empty($time_limit)) {
         $time_limit = api_get_setting('time_limit_whosonline');
@@ -401,55 +401,55 @@ 
     $track_online_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
     $course_code = Database::escape_string($course_code);
     $courseInfo = api_get_course_info($course_code);
-	$courseId = $courseInfo['real_id'];
+    $courseId = $courseInfo['real_id'];
 
     $from = intval($from);
     $number_of_items = intval($number_of_items);
 
-	$query = "SELECT login_user_id, login_date FROM $track_online_table
+    $query = "SELECT login_user_id, login_date FROM $track_online_table
               WHERE login_user_id <> 2 AND c_id = $courseId AND login_date >= '$current_date'
               LIMIT $from, $number_of_items ";
 
-	$result = Database::query($query);
-	if ($result) {
-		$users_online = array();
+    $result = Database::query($query);
+    if ($result) {
+        $users_online = array();
 
-		while(list($login_user_id, $login_date) = Database::fetch_row($result)) {
+        while(list($login_user_id, $login_date) = Database::fetch_row($result)) {
             $users_online[] = $login_user_id;
-		}
-		return $users_online;
-	} else {
-		return false;
-	}
+        }
+        return $users_online;
+    } else {
+        return false;
+    }
 }
 
 function who_is_online_in_this_course_count($uid, $time_limit, $coursecode=null)
 {
-	if (empty($coursecode)) {
-		return false;
-	}
-	$track_online_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
-	$coursecode = Database::escape_string($coursecode);
-	$time_limit = Database::escape_string($time_limit);
+    if (empty($coursecode)) {
+        return false;
+    }
+    $track_online_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
+    $coursecode = Database::escape_string($coursecode);
+    $time_limit = Database::escape_string($time_limit);
 
     $online_time = time() - $time_limit * 60;
     $current_date = api_get_utc_datetime($online_time);
-	$courseId = api_get_course_int_id($coursecode);
+    $courseId = api_get_course_int_id($coursecode);
 
-	if (empty($courseId)) {
-		return false;
-	}
+    if (empty($courseId)) {
+        return false;
+    }
 
-	$query = "SELECT count(login_user_id) as count
+    $query = "SELECT count(login_user_id) as count
               FROM $track_online_table
               WHERE login_user_id <> 2 AND c_id = $courseId AND login_date >= '$current_date' ";
-	$result = Database::query($query);
-	if (Database::num_rows($result) > 0) {
-		$row = Database::fetch_array($result);
-		return $row['count'];
-	} else {
-		return false;
-	}
+    $result = Database::query($query);
+    if (Database::num_rows($result) > 0) {
+        $row = Database::fetch_array($result);
+        return $row['count'];
+    } else {
+        return false;
+    }
 }
 
 /**
@@ -459,15 +459,15 @@ 
  * @deprecated user api_get_user_info($user_id)
  */
 function GetFullUserName($uid) {
-	$uid = (int) $uid;
-	$uid = intval($uid);
-	$user_table = Database::get_main_table(TABLE_MAIN_USER);
-	$query = "SELECT firstname, lastname FROM ".$user_table." WHERE id=$uid";
-	$result = @Database::query($query);
-	if (count($result)>0) {
-		while(list($firstname,$lastname)= Database::fetch_array($result)) {
-			$str = str_replace(' ', '&nbsp;', api_get_person_name($firstname, $lastname));
-			return $str;
-		}
-	}
+    $uid = (int) $uid;
+    $uid = intval($uid);
+    $user_table = Database::get_main_table(TABLE_MAIN_USER);
+    $query = "SELECT firstname, lastname FROM ".$user_table." WHERE id=$uid";
+    $result = @Database::query($query);
+    if (count($result)>0) {
+        while(list($firstname,$lastname)= Database::fetch_array($result)) {
+            $str = str_replace(' ', '&nbsp;', api_get_person_name($firstname, $lastname));
+            return $str;
+        }
+    }
 }

main/inc/lib/internationalization.lib.php

Indentation +25 added lines, -26 removed lines

@@ -95,13 +95,13 @@ 
     if (isset($_configuration['language_measure_frequency']) &&
         $_configuration['language_measure_frequency'] == 1
     ) {
-      require_once api_get_path(SYS_CODE_PATH).'/cron/lang/langstats.class.php';
-      global $langstats;
-      $langstats->add_use($variable,'');
+        require_once api_get_path(SYS_CODE_PATH).'/cron/lang/langstats.class.php';
+        global $langstats;
+        $langstats->add_use($variable,'');
     }
 
     if (!isset($used_lang_vars)) {
-    	$used_lang_vars = array();
+        $used_lang_vars = array();
     }
 
     // Caching results from some API functions, for speed.
@@ -291,7 +291,7 @@ 
     static $text_direction = array();
 
     if (empty($language)) {
-    	$language = api_get_interface_language();
+        $language = api_get_interface_language();
     }
     if (!isset($text_direction[$language])) {
         $text_direction[$language] = in_array(api_purify_language_id($language),
@@ -528,24 +528,24 @@ 
             case DATE_FORMAT_ONLY_DAYNAME:
                 $date_format = get_lang('dateFormatOnlyDayName', '', $language);
                 if (INTL_INSTALLED) {
-        			$datetype = IntlDateFormatter::SHORT;
-        			$timetype = IntlDateFormatter::NONE;
-        		}
+                    $datetype = IntlDateFormatter::SHORT;
+                    $timetype = IntlDateFormatter::NONE;
+                }
                 break;
             case DATE_FORMAT_NUMBER_NO_YEAR:
                 $date_format = get_lang('dateFormatShortNumberNoYear', '', $language);
-        		if (INTL_INSTALLED) {
-        			$datetype = IntlDateFormatter::SHORT;
-        			$timetype = IntlDateFormatter::NONE;
-        		}
+                if (INTL_INSTALLED) {
+                    $datetype = IntlDateFormatter::SHORT;
+                    $timetype = IntlDateFormatter::NONE;
+                }
+                break;
+            case DATE_FORMAT_NUMBER:
+                $date_format = get_lang('dateFormatShortNumber', '', $language);
+                if (INTL_INSTALLED) {
+                    $datetype = IntlDateFormatter::SHORT;
+                    $timetype = IntlDateFormatter::NONE;
+                }
                 break;
-        	case DATE_FORMAT_NUMBER:
-        		$date_format = get_lang('dateFormatShortNumber', '', $language);
-        		if (INTL_INSTALLED) {
-        			$datetype = IntlDateFormatter::SHORT;
-        			$timetype = IntlDateFormatter::NONE;
-        		}
-        		break;
             case TIME_NO_SEC_FORMAT:
                 $date_format = get_lang('timeNoSecFormat', '', $language);
                 if (INTL_INSTALLED) {
@@ -581,14 +581,14 @@ 
                     $timetype = IntlDateFormatter::SHORT;
                 }
                 break;
-			case DATE_TIME_FORMAT_SHORT:
+            case DATE_TIME_FORMAT_SHORT:
                 $date_format = get_lang('dateTimeFormatShort', '', $language);
                 if (INTL_INSTALLED) {
                     $datetype = IntlDateFormatter::FULL;
                     $timetype = IntlDateFormatter::SHORT;
                 }
                 break;
-			case DATE_TIME_FORMAT_SHORT_TIME_FIRST:
+            case DATE_TIME_FORMAT_SHORT_TIME_FIRST:
                 $date_format = get_lang('dateTimeFormatShortTimeFirst', '', $language);
                 if (INTL_INSTALLED) {
                     $datetype = IntlDateFormatter::FULL;
@@ -1700,7 +1700,6 @@ 
 
 /**
  * Return true a date is valid
-
  * @param string $date example: 2014-06-30 13:05:05
  * @param string $format example: "Y-m-d H:i:s"
  *
@@ -1969,15 +1968,15 @@ 
 function apiGetHumanDateTime($date, $showTime = true, $humanForm = false) {
     if ($showTime) {
         if ($humanForm) {
-           return $date->format('j M Y H:i:s');
+            return $date->format('j M Y H:i:s');
         } else {
-           return $date->format('Y-m-d H:i:s');
+            return $date->format('Y-m-d H:i:s');
         }
     } else {
         if ($humanForm) {
-           return $date->format('j M Y');
+            return $date->format('j M Y');
         } else {
-           return $date->format('Y-m-d');
+            return $date->format('Y-m-d');
         }
     }
 }