chamilo / chamilo-lms

main/admin/dashboard_add_users_to_user.php

Indentation +19 added lines, -19 removed lines

@@ -54,7 +54,7 @@ 
 
 $add_type = 'multiple';
 if (isset($_GET['add_type']) && $_GET['add_type']!='') {
-	$add_type = Security::remove_XSS($_REQUEST['add_type']);
+    $add_type = Security::remove_XSS($_REQUEST['add_type']);
 }
 
 if (!api_is_platform_admin()) {
@@ -120,8 +120,8 @@ 
             ";
         }
 
-		$rs	= Database::query($sql);
-		$xajax_response->addAssign('ajax_list_users_multiple','innerHTML',api_utf8_encode($return));
+        $rs	= Database::query($sql);
+        $xajax_response->addAssign('ajax_list_users_multiple','innerHTML',api_utf8_encode($return));
 
         if ($type == 'single') {
             $tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
@@ -160,7 +160,7 @@ 
                     $return .= '...<br />';
                 }
             }
-           $xajax_response->addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return));
+            $xajax_response->addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return));
         } else {
             $return .= '<select id="origin" class="form-control" name="NoAssignedUsersList[]" multiple="multiple" size="15" ">';
             while($user = Database :: fetch_array($rs)) {
@@ -170,8 +170,8 @@ 
             $return .= '</select>';
             $xajax_response->addAssign('ajax_list_users_multiple', 'innerHTML', api_utf8_encode($return));
         }
-	}
-	return $xajax_response;
+    }
+    return $xajax_response;
 }
 
 $xajax->processRequests();
@@ -284,7 +284,7 @@ 
 
 $msg = '';
 if (isset($_POST['formSent']) && intval($_POST['formSent']) == 1) {
-	$user_list = $_POST['UsersList'];
+    $user_list = $_POST['UsersList'];
 
     switch ($userStatus) {
         case DRH:
@@ -349,13 +349,13 @@ 
 $assigned_users_id = array_keys($assigned_users_to_hrm);
 $without_assigned_users = '';
 if (count($assigned_users_id) > 0) {
-	$without_assigned_users = " user.user_id NOT IN(".implode(',',$assigned_users_id).") AND ";
+    $without_assigned_users = " user.user_id NOT IN(".implode(',',$assigned_users_id).") AND ";
 }
 
 $search_user = '';
 if (!empty($firstLetterUser)) {
-	$needle = Database::escape_string($firstLetterUser);
-	$search_user ="AND ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%'";
+    $needle = Database::escape_string($firstLetterUser);
+    $search_user ="AND ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%'";
 }
 
 $sqlConditions = null;
@@ -375,7 +375,7 @@ 
 }
 
 if (api_is_multiple_url_enabled()) {
-	$sql = "SELECT user.user_id, username, lastname, firstname
+    $sql = "SELECT user.user_id, username, lastname, firstname
 	        FROM $tbl_user user  LEFT JOIN $tbl_access_url_rel_user au ON (au.user_id = user.user_id)
 			WHERE
                 $without_assigned_users
@@ -385,7 +385,7 @@ 
                 $sqlConditions
             ORDER BY firstname";
 } else {
-	$sql = "SELECT user_id, username, lastname, firstname
+    $sql = "SELECT user_id, username, lastname, firstname
 	        FROM $tbl_user user
 			WHERE
 			    $without_assigned_users
@@ -401,7 +401,7 @@ 
 <input type="hidden" name="formSent" value="1" />
 <?php
 if(!empty($msg)) {
-	Display::display_normal_message($msg); //main API
+    Display::display_normal_message($msg); //main API
 }
 ?>
 
@@ -454,26 +454,26 @@ 
             </div>
             
           <?php
-          }
-          ?>
+            }
+            ?>
             <div class="separate-action">
                 <?php
-		echo '<button class="btn btn-success" type="button" value="" onclick="valide()" >'.$tool_name.'</button>';
+        echo '<button class="btn btn-success" type="button" value="" onclick="valide()" >'.$tool_name.'</button>';
             ?>
             </div>
         </div>
     </div>
     <div class="col-md-4">
         <?php
-	if (UserManager::is_admin($user_id)) {
-		echo get_lang('AssignedUsersListToPlatformAdministrator');
+    if (UserManager::is_admin($user_id)) {
+        echo get_lang('AssignedUsersListToPlatformAdministrator');
             } else if ($user_info['status'] == SESSIONADMIN) {
                     echo get_lang('AssignedUsersListToSessionsAdministrator');
             } else if ($user_info['status'] == STUDENT_BOSS) {
                     echo get_lang('AssignedUsersListToStudentBoss');
             } else {
                     echo get_lang('AssignedUsersListToHumanResourcesManager');
-	}
+    }
         ?>
         <div class="form-group">
             <div class="col-sm-12">

Spacing +33 added lines, -33 removed lines

@@ -24,7 +24,7 @@ 
 
 // setting breadcrumbs
 $interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
-$interbreadcrumb[] = array('url' => 'user_list.php','name' => get_lang('UserList'));
+$interbreadcrumb[] = array('url' => 'user_list.php', 'name' => get_lang('UserList'));
 
 // Database Table Definitions
 $tbl_user = Database::get_main_table(TABLE_MAIN_USER);
@@ -44,17 +44,17 @@ 
 $isAdmin = UserManager::is_admin($user_id);
 if ($isAdmin) {
     $userStatus = PLATFORM_ADMIN;
-    $tool_name= get_lang('AssignUsersToPlatformAdministrator');
+    $tool_name = get_lang('AssignUsersToPlatformAdministrator');
 } else if ($user_info['status'] == SESSIONADMIN) {
-    $tool_name= get_lang('AssignUsersToSessionsAdministrator');
-} else if  ($user_info['status'] == STUDENT_BOSS) {
-    $tool_name= get_lang('AssignUsersToBoss');
+    $tool_name = get_lang('AssignUsersToSessionsAdministrator');
+} else if ($user_info['status'] == STUDENT_BOSS) {
+    $tool_name = get_lang('AssignUsersToBoss');
 } else {
-    $tool_name= get_lang('AssignUsersToHumanResourcesManager');
+    $tool_name = get_lang('AssignUsersToHumanResourcesManager');
 }
 
 $add_type = 'multiple';
-if (isset($_GET['add_type']) && $_GET['add_type']!='') {
+if (isset($_GET['add_type']) && $_GET['add_type'] != '') {
 	$add_type = Security::remove_XSS($_REQUEST['add_type']);
 }
 
@@ -64,7 +64,7 @@ 
 
 function search_users($needle, $type)
 {
-    global $tbl_access_url_rel_user,  $tbl_user, $user_anonymous, $current_user_id, $user_id, $userStatus;
+    global $tbl_access_url_rel_user, $tbl_user, $user_anonymous, $current_user_id, $user_id, $userStatus;
 
     $xajax_response = new xajaxResponse();
     $return = '';
@@ -102,7 +102,7 @@ 
                     LEFT JOIN $tbl_access_url_rel_user au ON (au.user_id = user.user_id)
                     WHERE
                         ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%' AND
-                        status NOT IN(".DRH.", ".SESSIONADMIN.", " . STUDENT_BOSS . ") AND
+                        status NOT IN(".DRH.", ".SESSIONADMIN.", ".STUDENT_BOSS.") AND
                         user.user_id NOT IN ($user_anonymous, $current_user_id, $user_id)
                         $without_assigned_users AND
                         access_url_id = ".api_get_current_access_url_id()."
@@ -114,15 +114,15 @@ 
                     FROM $tbl_user user
                     WHERE
                         ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%' AND
-                        status NOT IN(".DRH.", ".SESSIONADMIN.", " . STUDENT_BOSS . ") AND
+                        status NOT IN(".DRH.", ".SESSIONADMIN.", ".STUDENT_BOSS.") AND
                         user_id NOT IN ($user_anonymous, $current_user_id, $user_id)
                     $without_assigned_users
                     $order_clause
             ";
         }
 
-		$rs	= Database::query($sql);
-		$xajax_response->addAssign('ajax_list_users_multiple','innerHTML',api_utf8_encode($return));
+		$rs = Database::query($sql);
+		$xajax_response->addAssign('ajax_list_users_multiple', 'innerHTML', api_utf8_encode($return));
 
         if ($type == 'single') {
             $tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
@@ -141,10 +141,10 @@ 
 
             switch ($userStatus) {
                 case DRH:
-                    $sql .= " user.status <> 6 AND user.status <> " . DRH;
+                    $sql .= " user.status <> 6 AND user.status <> ".DRH;
                     break;
                 case STUDENT_BOSS:
-                    $sql .= " user.status <> 6 AND user.status <> " . STUDENT_BOSS;
+                    $sql .= " user.status <> 6 AND user.status <> ".STUDENT_BOSS;
                     break;
             }
 
@@ -161,12 +161,12 @@ 
                     $return .= '...<br />';
                 }
             }
-           $xajax_response->addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return));
+           $xajax_response->addAssign('ajax_list_users_single', 'innerHTML', api_utf8_encode($return));
         } else {
             $return .= '<select id="origin" class="form-control" name="NoAssignedUsersList[]" multiple="multiple" size="15" ">';
-            while($user = Database :: fetch_array($rs)) {
+            while ($user = Database :: fetch_array($rs)) {
                 $person_name = api_get_person_name($user['firstname'], $user['lastname']);
-                $return .= '<option value="'.$user['user_id'].'" title="'.htmlspecialchars($person_name,ENT_QUOTES).'">'.$person_name.' ('.$user['username'].')</option>';
+                $return .= '<option value="'.$user['user_id'].'" title="'.htmlspecialchars($person_name, ENT_QUOTES).'">'.$person_name.' ('.$user['username'].')</option>';
             }
             $return .= '</select>';
             $xajax_response->addAssign('ajax_list_users_multiple', 'innerHTML', api_utf8_encode($return));
@@ -243,7 +243,7 @@ 
 }
 </script>';
 
-$formSent=0;
+$formSent = 0;
 $errorMsg = '';
 $UserList = array();
 
@@ -258,7 +258,7 @@ 
 
 $searchForm = new FormValidator('search', 'get', api_get_self().'?user='.$user_id);
 $searchForm->addHeader(get_lang('AdvancedSearch'));
-$renderer =& $searchForm->defaultRenderer();
+$renderer = & $searchForm->defaultRenderer();
 
 $searchForm->addElement('hidden', 'user', $user_id);
 foreach ($filters as $param) {
@@ -300,7 +300,7 @@ 
             $affected_rows = 0;
     }
 
-    if ($affected_rows)	{
+    if ($affected_rows) {
         $msg = get_lang('AssignedUsersHaveBeenUpdatedSuccessfully');
     }
 }
@@ -312,18 +312,18 @@ 
 $actionsLeft = '';
 if ($userStatus != STUDENT_BOSS) {
     $actionsLeft = Display::url(
-        Display::return_icon('course-add.png', get_lang('AssignCourses'), null, ICON_SIZE_MEDIUM ),
+        Display::return_icon('course-add.png', get_lang('AssignCourses'), null, ICON_SIZE_MEDIUM),
         "dashboard_add_courses_to_user.php?user=$user_id"
     );
 
     $actionsLeft .= Display::url(
-        Display::return_icon('session-add.png', get_lang('AssignSessions'), null, ICON_SIZE_MEDIUM ) ,
+        Display::return_icon('session-add.png', get_lang('AssignSessions'), null, ICON_SIZE_MEDIUM),
         "dashboard_add_sessions_to_user.php?user=$user_id"
     );
 }
 
 $actionsRight = Display::url(
-    '<em class="fa fa-search"></em> ' . get_lang('AdvancedSearch'),
+    '<em class="fa fa-search"></em> '.get_lang('AdvancedSearch'),
     '#',
     array('class' => 'btn btn-default advanced_options', 'id' => 'advanced_search')
 );
@@ -360,13 +360,13 @@ 
 $assigned_users_id = array_keys($assigned_users_to_hrm);
 $without_assigned_users = '';
 if (count($assigned_users_id) > 0) {
-	$without_assigned_users = " user.user_id NOT IN(".implode(',',$assigned_users_id).") AND ";
+	$without_assigned_users = " user.user_id NOT IN(".implode(',', $assigned_users_id).") AND ";
 }
 
 $search_user = '';
 if (!empty($firstLetterUser)) {
 	$needle = Database::escape_string($firstLetterUser);
-	$search_user ="AND ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%'";
+	$search_user = "AND ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%'";
 }
 
 $sqlConditions = null;
@@ -406,12 +406,12 @@ 
 			    $sqlConditions
             ORDER BY firstname ";
 }
-$result	= Database::query($sql);
+$result = Database::query($sql);
 ?>
-<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?user=<?php echo $user_id ?>" class="form-horizontal" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>
+<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?user=<?php echo $user_id ?>" class="form-horizontal" <?php if ($ajax_search) {echo ' onsubmit="valide();"'; }?>>
 <input type="hidden" name="formSent" value="1" />
 <?php
-if(!empty($msg)) {
+if (!empty($msg)) {
 	Display::display_normal_message($msg); //main API
 }
 ?>
@@ -426,7 +426,7 @@ 
                     <select id="origin" class="form-control" name="NoAssignedUsersList[]" multiple="multiple" size="15">
                         <?php   while ($enreg = Database::fetch_array($result)) {
                                 $person_name = api_get_person_name($enreg['firstname'], $enreg['lastname']); ?>
-                                  <option value="<?php echo $enreg['user_id']; ?>" <?php echo 'title="'.htmlspecialchars($person_name,ENT_QUOTES).'"';?>>
+                                  <option value="<?php echo $enreg['user_id']; ?>" <?php echo 'title="'.htmlspecialchars($person_name, ENT_QUOTES).'"'; ?>>
                             <?php echo $person_name.' ('.$enreg['username'].')'; ?>
                         </option>
                         <?php } ?>
@@ -439,8 +439,8 @@ 
     </div>
     <div class="col-md-4">
         <div class="code-course">
-            <?php if($add_type == 'multiple') { ?>
-                <p><?php echo get_lang('FirstLetterUser');?></p>
+            <?php if ($add_type == 'multiple') { ?>
+                <p><?php echo get_lang('FirstLetterUser'); ?></p>
                 <select class="selectpicker show-tick form-control" name="firstLetterUser" onchange = "xajax_search_users(this.value,'multiple')">
                     <option value="%">--</option>
                     <?php echo Display::get_alphabet_options($firstLetterUser); ?>
@@ -492,10 +492,10 @@ 
                 <select id='destination' class="form-control" name="UsersList[]" multiple="multiple" size="15" >
                     <?php
                     if (is_array($assigned_users_to_hrm)) {
-                            foreach($assigned_users_to_hrm as $enreg) {
+                            foreach ($assigned_users_to_hrm as $enreg) {
                                     $person_name = api_get_person_name($enreg['firstname'], $enreg['lastname']);
                     ?>
-                            <option value="<?php echo $enreg['user_id']; ?>" <?php echo 'title="'.htmlspecialchars($person_name,ENT_QUOTES).'"'; ?>>
+                            <option value="<?php echo $enreg['user_id']; ?>" <?php echo 'title="'.htmlspecialchars($person_name, ENT_QUOTES).'"'; ?>>
                         <?php echo $person_name.' ('.$enreg['username'].')'; ?>
                     </option>
                     <?php }

main/admin/sub_language.php

Braces +3 added lines, -2 removed lines

@@ -200,8 +200,9 @@
 					continue;
 				}
 
-				if (is_array($variable_value))
-					echo $lang_file;
+				if (is_array($variable_value)) {
+									echo $lang_file;
+				}
 				$founded = false;
 				if ($search_in_english && $search_in_variable) {
 					// searching the item in the parent tool

Spacing +44 added lines, -44 removed lines

@@ -11,7 +11,7 @@ 
 $this_section = SECTION_PLATFORM_ADMIN;
 
 api_protect_admin_script();
-$htmlHeadXtra[] ='<script>
+$htmlHeadXtra[] = '<script>
  $(document).ready(function() {
 	$(".save").click(function() {
 		var button_name=$(this).attr("name");
@@ -36,20 +36,20 @@ 
 				    \'new_language\': is_new_language,
 				    \'variable_language\': is_variable_language,
 				    \'file_id\': file_id,
-				    \'id\': ' . intval($_REQUEST['id']) . ',
-                    \'sub\': ' . intval($_REQUEST['sub_language_id']) . ',
-                    \'sub_language_id\': ' . intval($_REQUEST['sub_language_id']) . '
+				    \'id\': ' . intval($_REQUEST['id']).',
+                    \'sub\': ' . intval($_REQUEST['sub_language_id']).',
+                    \'sub_language_id\': ' . intval($_REQUEST['sub_language_id']).'
 				},
 				success: function(datos) {
 					if (datos == "1") {
-						$("#div_message_information_id").html(\'' . Display::return_message(get_lang('TheNewWordHasBeenAdded'), 'success') . '\');
+						$("#div_message_information_id").html(\'' . Display::return_message(get_lang('TheNewWordHasBeenAdded'), 'success').'\');
 					} else {
 						$("#div_message_information_id").html("<div class=\"alert alert-warning\">" + datos +"</div>");
 					}
 				}
 			});
 		} else {
-			$("#div_message_information_id").html(\'' . Display::return_message(get_lang('FormHasErrorsPleaseComplete'), 'error') . '\');
+			$("#div_message_information_id").html(\'' . Display::return_message(get_lang('FormHasErrorsPleaseComplete'), 'error').'\');
 		}
 	});
 });
@@ -60,14 +60,14 @@ 
 // setting the name of the tool
 $tool_name = get_lang('CreateSubLanguage');
 // setting breadcrumbs
-$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
-$interbreadcrumb[] = array ('url' => 'languages.php', 'name' => get_lang('PlatformLanguages'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'languages.php', 'name' => get_lang('PlatformLanguages'));
 
 $sublanguage_folder_error = false;
 
-if (isset($_GET['id']) && $_GET['id']==strval(intval($_GET['id']))) {
-	$language_name              = SubLanguageManager::get_name_of_language_by_id ($_GET['id']);
-	$sub_language_name          = SubLanguageManager::get_name_of_language_by_id ($_GET['sub_language_id']);
+if (isset($_GET['id']) && $_GET['id'] == strval(intval($_GET['id']))) {
+	$language_name              = SubLanguageManager::get_name_of_language_by_id($_GET['id']);
+	$sub_language_name          = SubLanguageManager::get_name_of_language_by_id($_GET['sub_language_id']);
 	$all_data_of_language       = SubLanguageManager::get_all_information_of_language($_GET['id']);
 	$all_data_of_sublanguage    = SubLanguageManager::get_all_information_of_language($_GET['sub_language_id']);
 	$sub_language_file          = api_get_path(SYS_LANG_PATH).$all_data_of_sublanguage['dokeos_folder'];
@@ -75,20 +75,20 @@ 
 	if (!file_exists($sub_language_file) || !is_writable($sub_language_file)) {
 		$sublanguage_folder_error = $sub_language_file.' '.get_lang('IsNotWritable');
 	}
-	if (SubLanguageManager::check_if_exist_language_by_id($_GET['id'])===true) {
+	if (SubLanguageManager::check_if_exist_language_by_id($_GET['id']) === true) {
 		$language_id_exist = true;
 	} else {
 		$language_id_exist = false;
 	}
 } else {
-	$language_name='';
-	$language_id_exist=false;
+	$language_name = '';
+	$language_id_exist = false;
 }
 
 $intro = sprintf(get_lang('RegisterTermsOfSubLanguageForX'), strtolower($sub_language_name));
 $path_folder = api_get_path(SYS_LANG_PATH).$all_data_of_language['dokeos_folder'];
 
-if (!is_dir($path_folder) || strlen($all_data_of_language['dokeos_folder'])==0) {
+if (!is_dir($path_folder) || strlen($all_data_of_language['dokeos_folder']) == 0) {
 	api_not_allowed(true);
 }
 
@@ -109,16 +109,16 @@ 
 
 
 $txt_search_word = (!empty($_REQUEST['txt_search_word']) ? Security::remove_XSS($_REQUEST['txt_search_word']) : '');
-$html ='<div style="float:left" class="actions">';
-$html.='<form style="float:left"  id="Searchlanguage" name="Searchlanguage" method="GET" action="sub_language.php">';
-$html.='&nbsp;'.get_lang('OriginalName').'&nbsp; :&nbsp;';
+$html = '<div style="float:left" class="actions">';
+$html .= '<form style="float:left"  id="Searchlanguage" name="Searchlanguage" method="GET" action="sub_language.php">';
+$html .= '&nbsp;'.get_lang('OriginalName').'&nbsp; :&nbsp;';
 
-$html.='<input name="id" type="hidden"  id="id" value="'.Security::remove_XSS($_REQUEST['id']).'" />';
-$html.='<input name="sub_language_id" type="hidden"  id="id" value="'.Security::remove_XSS($_REQUEST['sub_language_id']).'" />';
-$html.='<input name="txt_search_word" type="text" size="50"  id="txt_search_word" value="'.$txt_search_word.'" />';
-$html.="&nbsp;".'<button name="SubmitSearchLanguage" class="search" type="submit">'.get_lang('Search').'</button>';
-$html.='</form>';
-$html.='</div>';
+$html .= '<input name="id" type="hidden"  id="id" value="'.Security::remove_XSS($_REQUEST['id']).'" />';
+$html .= '<input name="sub_language_id" type="hidden"  id="id" value="'.Security::remove_XSS($_REQUEST['sub_language_id']).'" />';
+$html .= '<input name="txt_search_word" type="text" size="50"  id="txt_search_word" value="'.$txt_search_word.'" />';
+$html .= "&nbsp;".'<button name="SubmitSearchLanguage" class="search" type="submit">'.get_lang('Search').'</button>';
+$html .= '</form>';
+$html .= '</div>';
 echo $html;
 echo '<br /><br /><br />';
 if (!empty($sublanguage_folder_error)) {
@@ -154,7 +154,7 @@ 
 	$language_files_to_load_keys = array_flip($language_files_to_load);
 	$array_to_search = $parent_language_array;
 	$list_info = array();
-	$term='/'.Security::remove_XSS(trim($_REQUEST['txt_search_word'])).'/i';
+	$term = '/'.Security::remove_XSS(trim($_REQUEST['txt_search_word'])).'/i';
 	//@todo optimize this foreach
 	foreach ($language_files_to_load as $lang_file) {
 		//searching in parent language of the sub language
@@ -167,7 +167,7 @@ 
 				}
 				$founded = false;
 				// searching the item in the parent tool
-				if (preg_match($term,$parent_variable_value)!==0) {
+				if (preg_match($term, $parent_variable_value) !== 0) {
 					$founded = true;
 				}
 				if ($founded) {
@@ -183,11 +183,11 @@ 
 						$size =4;
 					}*/
 
-					$obj_text='<textarea rows="10" cols="40" name="txt|'.$parent_name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$parent_name_variable.'" >'.$sub_language_name_variable.'</textarea>';
-					$obj_button='<button class="save" type="button" name="btn|'.$parent_name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$parent_name_variable.'"  />'.get_lang('Save').'</button>';
+					$obj_text = '<textarea rows="10" cols="40" name="txt|'.$parent_name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$parent_name_variable.'" >'.$sub_language_name_variable.'</textarea>';
+					$obj_button = '<button class="save" type="button" name="btn|'.$parent_name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$parent_name_variable.'"  />'.get_lang('Save').'</button>';
 
 					$list_info[] = array(
-						$lang_file . '.inc.php',
+						$lang_file.'.inc.php',
 						$parent_name_variable,
 						$english_name_variable,
 						$parent_variable_value,
@@ -211,16 +211,16 @@ 
 				$founded = false;
 				if ($search_in_english && $search_in_variable) {
 					// searching the item in the parent tool
-					if (preg_match($term,$variable_value)!==0 || preg_match($term,$name_variable)!==0 ) {
+					if (preg_match($term, $variable_value) !== 0 || preg_match($term, $name_variable) !== 0) {
 						$founded = true;
 					}
 				} else {
 					if ($search_in_english) {
-						if (preg_match($term,$variable_value)!==0) {
+						if (preg_match($term, $variable_value) !== 0) {
 							$founded = true;
 						}
 					} else {
-						if (preg_match($term,$name_variable)!==0) {
+						if (preg_match($term, $name_variable) !== 0) {
 							$founded = true;
 						}
 					}
@@ -237,16 +237,16 @@ 
 						$parent_variable_value = $parent_language_array[$lang_file][$name_variable];
 					}
 					//config buttons
-					$obj_text='<textarea rows="10" cols="40" name="txt|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$name_variable.'" >'.
+					$obj_text = '<textarea rows="10" cols="40" name="txt|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$name_variable.'" >'.
 						$sub_language_name_variable.'
 						</textarea>';
-					$obj_button='<button class="save" type="button" name="btn|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$name_variable.'"  />'.get_lang('Save').'</button>';
+					$obj_button = '<button class="save" type="button" name="btn|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$name_variable.'"  />'.get_lang('Save').'</button>';
 
 					//loading variable from the english array
 					$english_name_variable = $english_language_array[$lang_file][$name_variable];
 
 					$list_info[] = array(
-						$lang_file . '.inc.php',
+						$lang_file.'.inc.php',
 						$name_variable,
 						$english_name_variable,
 						$parent_variable_value,
@@ -271,7 +271,7 @@ 
 
 				$founded = false;
 				// searching the item in the parent tool
-				if (preg_match($term,$variable_value)!==0) {
+				if (preg_match($term, $variable_value) !== 0) {
 					$founded = true;
 				}
 				if ($founded) {
@@ -279,15 +279,15 @@ 
 					$sub_language_name_variable = $sub_language_array[$lang_file][$name_variable];
 					$parent_variable_value = $parent_language_array[$lang_file][$name_variable];
 					//config buttons
-					$obj_text='<textarea rows="10" cols="40" name="txt|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$name_variable.'" >'.$sub_language_name_variable.'</textarea>';
-					$obj_button='<button class="save" type="button" name="btn|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$name_variable.'"  />'.get_lang('Save').'</button>';
+					$obj_text = '<textarea rows="10" cols="40" name="txt|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$name_variable.'" >'.$sub_language_name_variable.'</textarea>';
+					$obj_button = '<button class="save" type="button" name="btn|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$name_variable.'"  />'.get_lang('Save').'</button>';
 
 					//loading variable from the english array
 					$english_name_variable = $english_language_array[$lang_file][$name_variable];
-					$list_info[]=array($lang_file.'.inc.php',
+					$list_info[] = array($lang_file.'.inc.php',
 						$name_variable,
 						$english_name_variable,
-						$parent_variable_value,$obj_text,$obj_button);
+						$parent_variable_value, $obj_text, $obj_button);
 				}
 			}
 		}
@@ -301,7 +301,7 @@ 
 $list_info = array();
 if (isset($_REQUEST['txt_search_word'])) {
 	//@todo fix to accept a char with 1 char
-	if (strlen(trim($_REQUEST['txt_search_word']))>2) {
+	if (strlen(trim($_REQUEST['txt_search_word'])) > 2) {
 		$list_info = search_language_term(
 			$_REQUEST['txt_search_word'],
 			true,
@@ -317,14 +317,14 @@ 
 	'sub_language_id' => intval($_GET['sub_language_id']),
 	'txt_search_word' => $txt_search_word
 );
-$table = new SortableTableFromArrayConfig($list_info, 1,20,'data_info');
+$table = new SortableTableFromArrayConfig($list_info, 1, 20, 'data_info');
 $table->set_additional_parameters($parameters);
 $table->set_header(0, get_lang('LanguageFile'));
 $table->set_header(1, get_lang('LanguageVariable'));
 $table->set_header(2, get_lang('EnglishName'));
 $table->set_header(3, get_lang('OriginalName'));
-$table->set_header(4, get_lang('Translation'),false);
-$table->set_header(5, get_lang('Action'),false);
+$table->set_header(4, get_lang('Translation'), false);
+$table->set_header(5, get_lang('Action'), false);
 $table->display();
 
 Display :: display_footer();

Indentation +164 added lines, -164 removed lines

@@ -66,30 +66,30 @@ 
 $sublanguage_folder_error = false;
 
 if (isset($_GET['id']) && $_GET['id']==strval(intval($_GET['id']))) {
-	$language_name              = SubLanguageManager::get_name_of_language_by_id ($_GET['id']);
-	$sub_language_name          = SubLanguageManager::get_name_of_language_by_id ($_GET['sub_language_id']);
-	$all_data_of_language       = SubLanguageManager::get_all_information_of_language($_GET['id']);
-	$all_data_of_sublanguage    = SubLanguageManager::get_all_information_of_language($_GET['sub_language_id']);
-	$sub_language_file          = api_get_path(SYS_LANG_PATH).$all_data_of_sublanguage['dokeos_folder'];
+    $language_name              = SubLanguageManager::get_name_of_language_by_id ($_GET['id']);
+    $sub_language_name          = SubLanguageManager::get_name_of_language_by_id ($_GET['sub_language_id']);
+    $all_data_of_language       = SubLanguageManager::get_all_information_of_language($_GET['id']);
+    $all_data_of_sublanguage    = SubLanguageManager::get_all_information_of_language($_GET['sub_language_id']);
+    $sub_language_file          = api_get_path(SYS_LANG_PATH).$all_data_of_sublanguage['dokeos_folder'];
 
-	if (!file_exists($sub_language_file) || !is_writable($sub_language_file)) {
-		$sublanguage_folder_error = $sub_language_file.' '.get_lang('IsNotWritable');
-	}
-	if (SubLanguageManager::check_if_exist_language_by_id($_GET['id'])===true) {
-		$language_id_exist = true;
-	} else {
-		$language_id_exist = false;
-	}
+    if (!file_exists($sub_language_file) || !is_writable($sub_language_file)) {
+        $sublanguage_folder_error = $sub_language_file.' '.get_lang('IsNotWritable');
+    }
+    if (SubLanguageManager::check_if_exist_language_by_id($_GET['id'])===true) {
+        $language_id_exist = true;
+    } else {
+        $language_id_exist = false;
+    }
 } else {
-	$language_name='';
-	$language_id_exist=false;
+    $language_name='';
+    $language_id_exist=false;
 }
 
 $intro = sprintf(get_lang('RegisterTermsOfSubLanguageForX'), strtolower($sub_language_name));
 $path_folder = api_get_path(SYS_LANG_PATH).$all_data_of_language['dokeos_folder'];
 
 if (!is_dir($path_folder) || strlen($all_data_of_language['dokeos_folder'])==0) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 Display :: display_header($language_name);
@@ -114,7 +114,7 @@ 
 echo $html;
 echo '<br /><br /><br />';
 if (!empty($sublanguage_folder_error)) {
-	Display::display_warning_message($sublanguage_folder_error);
+    Display::display_warning_message($sublanguage_folder_error);
 }
 echo '<div id="div_message_information_id">&nbsp;</div>';
 
@@ -128,186 +128,186 @@ 
  * @return array
  */
 function search_language_term(
-	$term,
-	$search_in_variable = true,
-	$search_in_english = true,
-	$search_in_parent = true,
-	$search_in_sub_language = true
+    $term,
+    $search_in_variable = true,
+    $search_in_english = true,
+    $search_in_parent = true,
+    $search_in_sub_language = true
 ) {
-	//These the $_REQUEST['id'] and the $_REQUEST['sub_language_id'] variables are process in global.inc.php (LOAD LANGUAGE FILES SECTION)
-	/*
+    //These the $_REQUEST['id'] and the $_REQUEST['sub_language_id'] variables are process in global.inc.php (LOAD LANGUAGE FILES SECTION)
+    /*
 		These 4 arrays are set in global.inc.php with the condition that will be load from sub_language.php or sub_language_ajax.inc.php
 		$english_language_array
 		$parent_language_array
 		$sub_language_array
 		$language_files_to_load
 	*/
-	global $language_files_to_load, $sub_language_array, $english_language_array, $parent_language_array;
-	$language_files_to_load_keys = array_flip($language_files_to_load);
-	$array_to_search = $parent_language_array;
-	$list_info = array();
-	$term='/'.Security::remove_XSS(trim($_REQUEST['txt_search_word'])).'/i';
-	//@todo optimize this foreach
-	foreach ($language_files_to_load as $lang_file) {
-		//searching in parent language of the sub language
-		if ($search_in_parent) {
-			$variables = $parent_language_array[$lang_file];
-			foreach ($variables as $parent_name_variable =>$parent_variable_value) {
-				//arrays are avoided
-				if (is_array($parent_variable_value)) {
-					continue;
-				}
-				$founded = false;
-				// searching the item in the parent tool
-				if (preg_match($term,$parent_variable_value)!==0) {
-					$founded = true;
-				}
-				if ($founded) {
-					//loading variable from the english array
-					$sub_language_name_variable = $sub_language_array[$lang_file][$parent_name_variable];
-					//loading variable from the english array
-					$english_name_variable = $english_language_array[$lang_file][$parent_name_variable];
+    global $language_files_to_load, $sub_language_array, $english_language_array, $parent_language_array;
+    $language_files_to_load_keys = array_flip($language_files_to_load);
+    $array_to_search = $parent_language_array;
+    $list_info = array();
+    $term='/'.Security::remove_XSS(trim($_REQUEST['txt_search_word'])).'/i';
+    //@todo optimize this foreach
+    foreach ($language_files_to_load as $lang_file) {
+        //searching in parent language of the sub language
+        if ($search_in_parent) {
+            $variables = $parent_language_array[$lang_file];
+            foreach ($variables as $parent_name_variable =>$parent_variable_value) {
+                //arrays are avoided
+                if (is_array($parent_variable_value)) {
+                    continue;
+                }
+                $founded = false;
+                // searching the item in the parent tool
+                if (preg_match($term,$parent_variable_value)!==0) {
+                    $founded = true;
+                }
+                if ($founded) {
+                    //loading variable from the english array
+                    $sub_language_name_variable = $sub_language_array[$lang_file][$parent_name_variable];
+                    //loading variable from the english array
+                    $english_name_variable = $english_language_array[$lang_file][$parent_name_variable];
 
-					//config buttons
-					/*if (strlen($english_name_variable)>1500) {
+                    //config buttons
+                    /*if (strlen($english_name_variable)>1500) {
 						$size =20;
 					} else {
 						$size =4;
 					}*/
 
-					$obj_text='<textarea rows="10" cols="40" name="txt|'.$parent_name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$parent_name_variable.'" >'.$sub_language_name_variable.'</textarea>';
-					$obj_button='<button class="save" type="button" name="btn|'.$parent_name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$parent_name_variable.'"  />'.get_lang('Save').'</button>';
+                    $obj_text='<textarea rows="10" cols="40" name="txt|'.$parent_name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$parent_name_variable.'" >'.$sub_language_name_variable.'</textarea>';
+                    $obj_button='<button class="save" type="button" name="btn|'.$parent_name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$parent_name_variable.'"  />'.get_lang('Save').'</button>';
 
-					$list_info[] = array(
-						$lang_file . '.inc.php',
-						$parent_name_variable,
-						$english_name_variable,
-						$parent_variable_value,
-						$obj_text,
-						$obj_button
-					);
-				}
-			}
-		}
+                    $list_info[] = array(
+                        $lang_file . '.inc.php',
+                        $parent_name_variable,
+                        $english_name_variable,
+                        $parent_variable_value,
+                        $obj_text,
+                        $obj_button
+                    );
+                }
+            }
+        }
 
-		//search in english
-		if ($search_in_english || $search_in_variable) {
-			$variables = $english_language_array[$lang_file];
-			foreach ($variables as $name_variable =>$variable_value) {
-				if (is_array($variable_value)) {
-					continue;
-				}
+        //search in english
+        if ($search_in_english || $search_in_variable) {
+            $variables = $english_language_array[$lang_file];
+            foreach ($variables as $name_variable =>$variable_value) {
+                if (is_array($variable_value)) {
+                    continue;
+                }
 
-				if (is_array($variable_value))
-					echo $lang_file;
-				$founded = false;
-				if ($search_in_english && $search_in_variable) {
-					// searching the item in the parent tool
-					if (preg_match($term,$variable_value)!==0 || preg_match($term,$name_variable)!==0 ) {
-						$founded = true;
-					}
-				} else {
-					if ($search_in_english) {
-						if (preg_match($term,$variable_value)!==0) {
-							$founded = true;
-						}
-					} else {
-						if (preg_match($term,$name_variable)!==0) {
-							$founded = true;
-						}
-					}
-				}
+                if (is_array($variable_value))
+                    echo $lang_file;
+                $founded = false;
+                if ($search_in_english && $search_in_variable) {
+                    // searching the item in the parent tool
+                    if (preg_match($term,$variable_value)!==0 || preg_match($term,$name_variable)!==0 ) {
+                        $founded = true;
+                    }
+                } else {
+                    if ($search_in_english) {
+                        if (preg_match($term,$variable_value)!==0) {
+                            $founded = true;
+                        }
+                    } else {
+                        if (preg_match($term,$name_variable)!==0) {
+                            $founded = true;
+                        }
+                    }
+                }
 
-				if ($founded) {
-					//loading variable from the english array
-					$sub_language_name_variable = null;
-					if (isset($sub_language_array[$lang_file][$name_variable])) {
-						$sub_language_name_variable = $sub_language_array[$lang_file][$name_variable];
-					}
-					$parent_variable_value = null;
-					if (isset($parent_language_array[$lang_file][$name_variable])) {
-						$parent_variable_value = $parent_language_array[$lang_file][$name_variable];
-					}
-					//config buttons
-					$obj_text='<textarea rows="10" cols="40" name="txt|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$name_variable.'" >'.
-						$sub_language_name_variable.'
+                if ($founded) {
+                    //loading variable from the english array
+                    $sub_language_name_variable = null;
+                    if (isset($sub_language_array[$lang_file][$name_variable])) {
+                        $sub_language_name_variable = $sub_language_array[$lang_file][$name_variable];
+                    }
+                    $parent_variable_value = null;
+                    if (isset($parent_language_array[$lang_file][$name_variable])) {
+                        $parent_variable_value = $parent_language_array[$lang_file][$name_variable];
+                    }
+                    //config buttons
+                    $obj_text='<textarea rows="10" cols="40" name="txt|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$name_variable.'" >'.
+                        $sub_language_name_variable.'
 						</textarea>';
-					$obj_button='<button class="save" type="button" name="btn|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$name_variable.'"  />'.get_lang('Save').'</button>';
+                    $obj_button='<button class="save" type="button" name="btn|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$name_variable.'"  />'.get_lang('Save').'</button>';
 
-					//loading variable from the english array
-					$english_name_variable = $english_language_array[$lang_file][$name_variable];
+                    //loading variable from the english array
+                    $english_name_variable = $english_language_array[$lang_file][$name_variable];
 
-					$list_info[] = array(
-						$lang_file . '.inc.php',
-						$name_variable,
-						$english_name_variable,
-						$parent_variable_value,
-						$obj_text,
-						$obj_button
-					);
-				}
-			}
-		}
+                    $list_info[] = array(
+                        $lang_file . '.inc.php',
+                        $name_variable,
+                        $english_name_variable,
+                        $parent_variable_value,
+                        $obj_text,
+                        $obj_button
+                    );
+                }
+            }
+        }
 
-		// Search in sub language
-		if ($search_in_sub_language) {
-			$variables = $sub_language_array[$lang_file];
-			foreach ($variables as $name_variable =>$variable_value) {
-				if (is_array($parent_variable_value)) {
-					continue;
-				}
+        // Search in sub language
+        if ($search_in_sub_language) {
+            $variables = $sub_language_array[$lang_file];
+            foreach ($variables as $name_variable =>$variable_value) {
+                if (is_array($parent_variable_value)) {
+                    continue;
+                }
 
-				if (is_array($variable_value)) {
-					continue;
-				}
+                if (is_array($variable_value)) {
+                    continue;
+                }
 
-				$founded = false;
-				// searching the item in the parent tool
-				if (preg_match($term,$variable_value)!==0) {
-					$founded = true;
-				}
-				if ($founded) {
-					//loading variable from the english array
-					$sub_language_name_variable = $sub_language_array[$lang_file][$name_variable];
-					$parent_variable_value = $parent_language_array[$lang_file][$name_variable];
-					//config buttons
-					$obj_text='<textarea rows="10" cols="40" name="txt|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$name_variable.'" >'.$sub_language_name_variable.'</textarea>';
-					$obj_button='<button class="save" type="button" name="btn|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$name_variable.'"  />'.get_lang('Save').'</button>';
+                $founded = false;
+                // searching the item in the parent tool
+                if (preg_match($term,$variable_value)!==0) {
+                    $founded = true;
+                }
+                if ($founded) {
+                    //loading variable from the english array
+                    $sub_language_name_variable = $sub_language_array[$lang_file][$name_variable];
+                    $parent_variable_value = $parent_language_array[$lang_file][$name_variable];
+                    //config buttons
+                    $obj_text='<textarea rows="10" cols="40" name="txt|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$name_variable.'" >'.$sub_language_name_variable.'</textarea>';
+                    $obj_button='<button class="save" type="button" name="btn|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$name_variable.'"  />'.get_lang('Save').'</button>';
 
-					//loading variable from the english array
-					$english_name_variable = $english_language_array[$lang_file][$name_variable];
-					$list_info[]=array($lang_file.'.inc.php',
-						$name_variable,
-						$english_name_variable,
-						$parent_variable_value,$obj_text,$obj_button);
-				}
-			}
-		}
-	}
+                    //loading variable from the english array
+                    $english_name_variable = $english_language_array[$lang_file][$name_variable];
+                    $list_info[]=array($lang_file.'.inc.php',
+                        $name_variable,
+                        $english_name_variable,
+                        $parent_variable_value,$obj_text,$obj_button);
+                }
+            }
+        }
+    }
 
-	$list_info = array_unique_dimensional($list_info);
-	return $list_info;
+    $list_info = array_unique_dimensional($list_info);
+    return $list_info;
 }
 
 // Allow see data in sort table
 $list_info = array();
 if (isset($_REQUEST['txt_search_word'])) {
-	//@todo fix to accept a char with 1 char
-	if (strlen(trim($_REQUEST['txt_search_word']))>2) {
-		$list_info = search_language_term(
-			$_REQUEST['txt_search_word'],
-			true,
-			true,
-			true,
-			true
-		);
-	}
+    //@todo fix to accept a char with 1 char
+    if (strlen(trim($_REQUEST['txt_search_word']))>2) {
+        $list_info = search_language_term(
+            $_REQUEST['txt_search_word'],
+            true,
+            true,
+            true,
+            true
+        );
+    }
 }
 
 $parameters = array(
-	'id' => intval($_GET['id']),
-	'sub_language_id' => intval($_GET['sub_language_id']),
-	'txt_search_word' => $txt_search_word
+    'id' => intval($_GET['id']),
+    'sub_language_id' => intval($_GET['sub_language_id']),
+    'txt_search_word' => $txt_search_word
 );
 $table = new SortableTableFromArrayConfig($list_info, 1,20,'data_info');
 $table->set_additional_parameters($parameters);

main/admin/extra_fields.php

Spacing +19 added lines, -19 removed lines

@@ -36,7 +36,7 @@ 
 $obj->setupBreadcrumb($interbreadcrumb, $action);
 
 //jqgrid will use this URL to do the selects
-$url = api_get_path(WEB_AJAX_PATH) . 'model.ajax.php?a=get_extra_fields&type=' . $extraFieldType;
+$url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_extra_fields&type='.$extraFieldType;
 
 //The order is important you need to check the the $column variable in the model.ajax.php file
 $columns = $obj->getJqgridColumnNames();
@@ -64,43 +64,43 @@ 
         array(),
         $action_links,
         true
-    ). '
+    ).'
 
     $("#field_type").on("change", function() {
         id = $(this).val();
         switch(id) {
             case "1":
-                $("#example").html("' . addslashes(Display::return_icon('userfield_text.png')) . '");
+                $("#example").html("' . addslashes(Display::return_icon('userfield_text.png')).'");
                 break;
             case "2":
-                $("#example").html("' . addslashes(Display::return_icon('userfield_text_area.png')) . '");
+                $("#example").html("' . addslashes(Display::return_icon('userfield_text_area.png')).'");
                 break;
             case "3":
-                $("#example").html("' . addslashes(Display::return_icon('add_user_field_howto.png')) . '");
+                $("#example").html("' . addslashes(Display::return_icon('add_user_field_howto.png')).'");
                 break;
             case "4":
-                $("#example").html("' . addslashes(Display::return_icon('userfield_drop_down.png')) . '");
+                $("#example").html("' . addslashes(Display::return_icon('userfield_drop_down.png')).'");
                 break;
             case "5":
-                $("#example").html("' . addslashes(Display::return_icon('userfield_multidropdown.png')) . '");
+                $("#example").html("' . addslashes(Display::return_icon('userfield_multidropdown.png')).'");
                 break;
             case "6":
-                $("#example").html("' . addslashes(Display::return_icon('userfield_data.png')) . '");
+                $("#example").html("' . addslashes(Display::return_icon('userfield_data.png')).'");
                 break;
             case "7":
-                $("#example").html("' . addslashes(Display::return_icon('userfield_date_time.png')) . '");
+                $("#example").html("' . addslashes(Display::return_icon('userfield_date_time.png')).'");
                 break;
             case "8":
-                $("#example").html("' . addslashes(Display::return_icon('userfield_doubleselect.png')) . '");
+                $("#example").html("' . addslashes(Display::return_icon('userfield_doubleselect.png')).'");
                 break;
             case "9":
-                $("#example").html("' . addslashes(Display::return_icon('userfield_divider.png')) . '");
+                $("#example").html("' . addslashes(Display::return_icon('userfield_divider.png')).'");
                 break;
             case "10":
-                $("#example").html("' . addslashes(Display::return_icon('userfield_user_tag.png')) . '");
+                $("#example").html("' . addslashes(Display::return_icon('userfield_user_tag.png')).'");
                 break;
             case "11":
-                $("#example").html("' . addslashes(Display::return_icon('userfield_data.png')) . '");
+                $("#example").html("' . addslashes(Display::return_icon('userfield_data.png')).'");
                 break;
         }
     });
@@ -119,7 +119,7 @@ 
         ) {
             api_not_allowed();
         }
-        $url = api_get_self() . '?type=' . $obj->type . '&action=' . Security::remove_XSS($_GET['action']);
+        $url = api_get_self().'?type='.$obj->type.'&action='.Security::remove_XSS($_GET['action']);
         $form = $obj->return_form($url, 'add');
 
         // The validation or display
@@ -135,8 +135,8 @@ 
             $obj->display();
         } else {
             echo '<div class="actions">';
-            echo '<a href="' . api_get_self() . '?type=' . $obj->type . '">' .
-            Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM) . '</a>';
+            echo '<a href="'.api_get_self().'?type='.$obj->type.'">'.
+            Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM).'</a>';
             echo '</div>';
             $form->addElement('hidden', 'sec_token');
             $form->setConstants(array('sec_token' => $token));
@@ -145,7 +145,7 @@ 
         break;
     case 'edit':
         // Action handling: Editing
-        $url = api_get_self() . '?type=' . $obj->type . '&action=' . Security::remove_XSS($_GET['action']) . '&id=' . intval($_GET['id']);
+        $url = api_get_self().'?type='.$obj->type.'&action='.Security::remove_XSS($_GET['action']).'&id='.intval($_GET['id']);
         $form = $obj->return_form($url, 'edit');
 
         // The validation or display
@@ -159,8 +159,8 @@ 
             $obj->display();
         } else {
             echo '<div class="actions">';
-            echo '<a href="' . api_get_self() . '?type=' . $obj->type . '">' .
-            Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM) . '</a>';
+            echo '<a href="'.api_get_self().'?type='.$obj->type.'">'.
+            Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM).'</a>';
             echo '</div>';
             $form->addElement('hidden', 'sec_token');
             $form->setConstants(array('sec_token' => $token));

main/admin/course_create_content.php

Spacing +3 added lines, -3 removed lines

@@ -7,16 +7,16 @@
  * @package chamilo.admin
  */
 include ('../inc/global.inc.php');
-$this_section=SECTION_PLATFORM_ADMIN;
+$this_section = SECTION_PLATFORM_ADMIN;
 
 api_protect_admin_script();
 $tool_name = get_lang('DummyCourseCreator');
-$interbreadcrumb[] = array ("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
 Display::display_header($tool_name);
 //api_display_tool_title($tool_name);
 if (api_get_setting('server_type') != 'test') {
 	echo get_lang('DummyCourseOnlyOnTestServer');
-} elseif( isset($_POST['action'])) {
+} elseif (isset($_POST['action'])) {
 	require_once('../coursecopy/classes/DummyCourseCreator.class.php');
 	$dcc = new DummyCourseCreator();
 	$dcc->create_dummy_course($_POST['course_code']);

Indentation +7 added lines, -7 removed lines

@@ -15,15 +15,15 @@
 Display::display_header($tool_name);
 //api_display_tool_title($tool_name);
 if (api_get_setting('server_type') != 'test') {
-	echo get_lang('DummyCourseOnlyOnTestServer');
+    echo get_lang('DummyCourseOnlyOnTestServer');
 } elseif( isset($_POST['action'])) {
-	require_once('../coursecopy/classes/DummyCourseCreator.class.php');
-	$dcc = new DummyCourseCreator();
-	$dcc->create_dummy_course($_POST['course_code']);
-	echo get_lang('Done');
+    require_once('../coursecopy/classes/DummyCourseCreator.class.php');
+    $dcc = new DummyCourseCreator();
+    $dcc->create_dummy_course($_POST['course_code']);
+    echo get_lang('Done');
 } else {
-	echo get_lang('DummyCourseDescription');
-	echo '<form method="post"><input type="hidden" name="course_code" value="'.Security::remove_XSS($_GET['course_code']).'"/><input type="submit" name="action" value="'.get_lang('Ok').'"/></form>';
+    echo get_lang('DummyCourseDescription');
+    echo '<form method="post"><input type="hidden" name="course_code" value="'.Security::remove_XSS($_GET['course_code']).'"/><input type="submit" name="action" value="'.get_lang('Ok').'"/></form>';
 }
 
 Display::display_footer();

main/admin/statistics.php

Spacing +2 added lines, -2 removed lines

@@ -5,13 +5,13 @@
 *   @package chamilo.admin
 */
 
-$cidReset=true;
+$cidReset = true;
 require_once '../inc/global.inc.php';
 $this_section = SECTION_PLATFORM_ADMIN;
 
 api_protect_admin_script();
 
-$interbreadcrumb[]=array('url' => 'index.php',"name" => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'index.php', "name" => get_lang('PlatformAdmin'));
 $tool_name = get_lang('Statistics');
 Display::display_header($tool_name);
 Display::display_footer();

main/admin/settings.php

Spacing +3 added lines, -3 removed lines

@@ -59,7 +59,7 @@ 
     Display::addFlash(Display::return_message(get_lang('FileDeleted')));
 }
 
-if (isset($_GET['action']) &&  $_GET['action'] == 'delete_grading') {
+if (isset($_GET['action']) && $_GET['action'] == 'delete_grading') {
     $id = intval($_GET['id']);
     api_delete_setting_option($id);
 }
@@ -122,7 +122,7 @@ 
         }
     }
 
-    if (isset($category) && $category== 'search_setting') {
+    if (isset($category) && $category == 'search_setting') {
         if (!empty($_REQUEST['search_field'])) {
             $settings = search_setting($_REQUEST['search_field']);
         }
@@ -220,7 +220,7 @@ 
         // Set true for allow_message_tool variable if social tool is actived
         foreach ($convert_byte_to_mega_list as $item) {
             if (isset($values[$item])) {
-                $values[$item] = round($values[$item]*1024*1024);
+                $values[$item] = round($values[$item] * 1024 * 1024);
             }
         }
 

main/admin/career_dashboard.php

Spacing +13 added lines, -13 removed lines

@@ -18,12 +18,12 @@ 
 $htmlHeadXtra[] = api_get_jqgrid_js();
 
 // setting breadcrumbs
-$interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
-$interbreadcrumb[]=array('url' => 'career_dashboard.php','name' => get_lang('CareersAndPromotions'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'career_dashboard.php', 'name' => get_lang('CareersAndPromotions'));
 
 Display :: display_header(null);
 
-$form = new FormValidator('filter_form','GET', api_get_self());
+$form = new FormValidator('filter_form', 'GET', api_get_self());
 
 $career = new Career();
 
@@ -54,11 +54,11 @@ 
 // action links
 echo '<div class="actions" style="margin-bottom:20px">';
     echo  '<a href="../admin/index.php">'.
-            Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('PlatformAdmin'),'',ICON_SIZE_MEDIUM).'</a>';
+            Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('PlatformAdmin'), '', ICON_SIZE_MEDIUM).'</a>';
     echo '<a href="careers.php">'.
-            Display::return_icon('career.png',get_lang('Careers'),'',ICON_SIZE_MEDIUM).'</a>';
+            Display::return_icon('career.png', get_lang('Careers'), '', ICON_SIZE_MEDIUM).'</a>';
     echo '<a href="promotions.php">'.
-            Display::return_icon('promotion.png',get_lang('Promotions'),'',ICON_SIZE_MEDIUM).'</a>';
+            Display::return_icon('promotion.png', get_lang('Promotions'), '', ICON_SIZE_MEDIUM).'</a>';
 echo '</div>';
 
 $form->display();
@@ -119,22 +119,22 @@ 
     foreach ($career_array as $career_id => $data) {
         $career = $data['name'];
         $promotions = $data['promotions'];
-        $career = Display::url($career, 'careers.php?action=edit&id=' . $career_id);
+        $career = Display::url($career, 'careers.php?action=edit&id='.$career_id);
         $career = Display::tag('h4', $career);
-        echo '<tr><td style="background-color:#ECF0F1" colspan="3">' . $career . '</td></tr>';
+        echo '<tr><td style="background-color:#ECF0F1" colspan="3">'.$career.'</td></tr>';
         if (!empty($promotions)) {
             foreach ($promotions as $promotion_id => $promotion) {
                 $promotion_name = $promotion['name'];
-                $promotion_url = Display::url($promotion_name, 'promotions.php?action=edit&id=' . $promotion_id);
+                $promotion_url = Display::url($promotion_name, 'promotions.php?action=edit&id='.$promotion_id);
                 $sessions = $promotion['sessions'];
                 echo '<tr>';
                 $count = count($sessions);
                 $rowspan = '';
                 if (!empty($count)) {
                     $count++;
-                    $rowspan = 'rowspan="' . $count . '"';
+                    $rowspan = 'rowspan="'.$count.'"';
                 }
-                echo '<td ' . $rowspan . '>';
+                echo '<td '.$rowspan.'>';
                 echo Display::tag('h5', $promotion_url);
                 echo '</td>';
                 echo '</tr>';
@@ -144,7 +144,7 @@ 
                         $course_list = $session['courses'];
 
                         $url = Display::url($session['data']['name'],
-                            '../session/resume_session.php?id_session=' . $session['data']['id']);
+                            '../session/resume_session.php?id_session='.$session['data']['id']);
                         echo '<tr>';
                         //Session name
                         echo Display::tag('td', $url);
@@ -157,7 +157,7 @@ 
 
                                 $url = Display::url(
                                     $course['title'],
-                                    api_get_path(WEB_COURSE_PATH) . $course['directory'] . '/index.php?id_session=' . $session['data']['id']
+                                    api_get_path(WEB_COURSE_PATH).$course['directory'].'/index.php?id_session='.$session['data']['id']
                                 );
                                 echo Display::tag('td', $url);
                                 echo '</tr>';

main/admin/access_url_check_user_session.php

Spacing +6 added lines, -6 removed lines

@@ -15,18 +15,18 @@ 
 
 $tool_name = get_lang('SessionOverview');
 
-$interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
-$interbreadcrumb[]=array('url' => 'session_list.php','name' => get_lang('SessionList'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'session_list.php', 'name' => get_lang('SessionList'));
 
 // Database Table Definitions
-$tbl_user							= Database::get_main_table(TABLE_MAIN_USER);
-$tbl_session_rel_user				= Database::get_main_table(TABLE_MAIN_SESSION_USER);
+$tbl_user = Database::get_main_table(TABLE_MAIN_USER);
+$tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
 $table_access_url_user              = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
 $url_id                             = api_get_current_access_url_id();
 
 $action = $_GET['action'];
 
-switch($action) {
+switch ($action) {
     case 'add_user_to_url':
         $user_id = $_REQUEST['user_id'];
         $result = UrlManager::add_user_to_url($user_id, $url_id);
@@ -58,7 +58,7 @@ 
 }
 
 
-foreach($session_list  as $session_item) {
+foreach ($session_list  as $session_item) {
     $session_id = $session_item['id'];
     $html .= '<h3>'.$session_item['name'].'</h3>';
 

main/admin/course_import.php

Spacing +4 added lines, -4 removed lines

@@ -12,13 +12,13 @@
  */
 function validate_data($courses)
 {
-    $errors = array ();
-    $coursecodes = array ();
+    $errors = array();
+    $coursecodes = array();
     foreach ($courses as $index => $course) {
-        $course['line'] = $index +1;
+        $course['line'] = $index + 1;
 
         // 1. Check whether mandatory fields are set.
-        $mandatory_fields = array ('Code', 'Title', 'CourseCategory');
+        $mandatory_fields = array('Code', 'Title', 'CourseCategory');
         foreach ($mandatory_fields as $field) {
             if (!isset($course[$field]) || strlen($course[$field]) == 0) {
                 $course['error'] = get_lang($field.'Mandatory');

Doc Comments +1 added lines, -1 removed lines

@@ -151,7 +151,7 @@
 /**
  * Read the CSV-file
  * @param string $file Path to the CSV-file
- * @return array All course-information read from the file
+ * @return Ddeboer\DataImport\Reader\CsvReader All course-information read from the file
  */
 function parse_csv_data($file)
 {