Completed
Push — 1.10.x ( c82817...6a93c3 )
by Yannick
202:42 queued 149:59
created
main/admin/skill_list.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
 }
21 21
 
22 22
 $action = isset($_GET['action']) ? $_GET['action'] : 'list';
23
-$skillId = isset($_GET['id']) ? intval($_GET['id']): 0;
23
+$skillId = isset($_GET['id']) ? intval($_GET['id']) : 0;
24 24
 
25 25
 $entityManager = Database::getManager();
26 26
 
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
             );
56 56
         }
57 57
 
58
-        header('Location: ' . api_get_self());
58
+        header('Location: '.api_get_self());
59 59
         exit;
60 60
         break;
61 61
     case 'disable':
@@ -108,33 +108,33 @@  discard block
 block discarded – undo
108 108
             );
109 109
         }
110 110
 
111
-        header('Location: ' . api_get_self());
111
+        header('Location: '.api_get_self());
112 112
         exit;
113 113
         break;
114 114
     case 'list':
115 115
         //no break
116 116
     default:
117
-        $interbreadcrumb[] = array ("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
117
+        $interbreadcrumb[] = array("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
118 118
 
119 119
         $message = Session::has('message') ? Session::read('message') : null;
120 120
 
121 121
         $toolbar = Display::toolbarButton(
122 122
             get_lang('CreateSkill'),
123
-            api_get_path(WEB_CODE_PATH) . 'admin/skill_create.php',
123
+            api_get_path(WEB_CODE_PATH).'admin/skill_create.php',
124 124
             'plus',
125 125
             'success',
126 126
             ['title' => get_lang('CreateSkill')]
127 127
         );
128 128
         $toolbar .= Display::toolbarButton(
129 129
             get_lang('SkillsWheel'),
130
-            api_get_path(WEB_CODE_PATH) . 'admin/skills_wheel.php',
130
+            api_get_path(WEB_CODE_PATH).'admin/skills_wheel.php',
131 131
             'bullseye',
132 132
             'primary',
133 133
             ['title' => get_lang('CreateSkill')]
134 134
         );
135 135
         $toolbar .= Display::toolbarButton(
136 136
             get_lang('BadgesManagement'),
137
-            api_get_path(WEB_CODE_PATH) . 'admin/skill_badge_list.php',
137
+            api_get_path(WEB_CODE_PATH).'admin/skill_badge_list.php',
138 138
             'shield',
139 139
             'warning',
140 140
             ['title' => get_lang('BadgesManagement')]
Please login to merge, or discard this patch.
main/admin/inactive_user_list.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -24,10 +24,10 @@
 block discarded – undo
24 24
 Display :: display_header($tool_name, "");
25 25
 
26 26
 //On sélectionne les user élèves
27
-$sql = "SELECT user_id FROM ".$table_user." user WHERE user.status= '5' ORDER by lastname " ;
27
+$sql = "SELECT user_id FROM ".$table_user." user WHERE user.status= '5' ORDER by lastname ";
28 28
 $result = Database::query($sql);
29 29
 
30
-while($row = Database::fetch_array($result)) {
30
+while ($row = Database::fetch_array($result)) {
31 31
     $user_id = $row['user_id'];
32 32
     //  pour chaque élève, on trouve la dernière connexion
33 33
     //$last_connection_date = UserManager:: delete_inactive_student($user_id, 2, true);
Please login to merge, or discard this patch.
main/admin/usergroup_user_import.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 
26 26
         foreach ($mandatory_fields as $field) {
27 27
             if (!isset($user_class[$field]) || strlen($user_class[$field]) == 0) {
28
-                $user_class['error'] = get_lang($field . 'Mandatory');
28
+                $user_class['error'] = get_lang($field.'Mandatory');
29 29
                 $errors[] = $user_class;
30 30
             }
31 31
         }
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
                 // 2.1.1 Check whether code exists in DB
38 38
                 $exists = $usergroup->usergroup_exists($user_class['ClassName']);
39 39
                 if (!$exists) {
40
-                    $user_class['error'] = get_lang('CodeDoesNotExists') . ': ' . $user_class['ClassName'];
40
+                    $user_class['error'] = get_lang('CodeDoesNotExists').': '.$user_class['ClassName'];
41 41
                     $errors[] = $user_class;
42 42
                 } else {
43 43
                     $classcodes[$user_class['CourseCode']] = 1;
@@ -49,14 +49,14 @@  discard block
 block discarded – undo
49 49
         if (!UserManager::is_username_empty($user_class['UserName'])) {
50 50
             // 3.1. Check whether username is too long.
51 51
             if (UserManager::is_username_too_long($user_class['UserName'])) {
52
-                $user_class['error'] = get_lang('UserNameTooLong') . ': ' . $user_class['UserName'];
52
+                $user_class['error'] = get_lang('UserNameTooLong').': '.$user_class['UserName'];
53 53
                 $errors[] = $user_class;
54 54
             }
55 55
 
56 56
             $username = UserManager::purify_username($user_class['UserName'], $purification_option_for_usernames);
57 57
             // 3.2. Check whether username exists.
58 58
             if (UserManager::is_username_available($username)) {
59
-                $user_class['error'] = get_lang('UnknownUser') . ': ' . $username;
59
+                $user_class['error'] = get_lang('UnknownUser').': '.$username;
60 60
                 $errors[] = $user_class;
61 61
             }
62 62
         }
@@ -105,8 +105,8 @@  discard block
 block discarded – undo
105 105
             $class_name = $user_data['class_name'];
106 106
             $user_list_name = $user_data['user_list_name'];
107 107
             $usergroup->subscribe_users_to_usergroup($class_id, $user_list, $deleteUsersNotInList);
108
-            $message .= Display::return_message(get_lang('Class') . ': ' . $class_name . '<br />', 'normal', false);
109
-            $message .= Display::return_message(get_lang('Users') . ': ' . implode(', ', $user_list_name));
108
+            $message .= Display::return_message(get_lang('Class').': '.$class_name.'<br />', 'normal', false);
109
+            $message .= Display::return_message(get_lang('Users').': '.implode(', ', $user_list_name));
110 110
         }
111 111
     }
112 112
     return $message;
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 $this_section = SECTION_PLATFORM_ADMIN;
129 129
 api_protect_admin_script(true);
130 130
 
131
-$tool_name = get_lang('AddUsersToAClass') . ' CSV';
131
+$tool_name = get_lang('AddUsersToAClass').' CSV';
132 132
 
133 133
 $interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
134 134
 $interbreadcrumb[] = array('url' => 'usergroups.php', 'name' => get_lang('Classes'));
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
 if (count($errors) != 0) {
165 165
     $error_message = "\n";
166 166
     foreach ($errors as $index => $error_class_user) {
167
-        $error_message .= get_lang('Line') . ' ' . $error_class_user['line'] . ': ' . $error_class_user['error'] . '</b>';
167
+        $error_message .= get_lang('Line').' '.$error_class_user['line'].': '.$error_class_user['error'].'</b>';
168 168
         $error_message .= "<br />";
169 169
     }
170 170
     $error_message .= "\n";
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
 }
173 173
 $form->display();
174 174
 ?>
175
-<p><?php echo get_lang('CSVMustLookLike') . ' (' . get_lang('MandatoryFields') . ')'; ?> :</p>
175
+<p><?php echo get_lang('CSVMustLookLike').' ('.get_lang('MandatoryFields').')'; ?> :</p>
176 176
 <pre>
177 177
 <b>UserName</b>;<b>ClassName</b>
178 178
 jdoe;class01
Please login to merge, or discard this patch.
main/admin/event_type.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -45,9 +45,9 @@  discard block
 block discarded – undo
45 45
 
46 46
 $languages = api_get_languages();
47 47
 
48
-$ajaxPath = api_get_path(WEB_CODE_PATH) . 'inc/ajax/events.ajax.php';
48
+$ajaxPath = api_get_path(WEB_CODE_PATH).'inc/ajax/events.ajax.php';
49 49
 
50
-$action_array = array(array('url' =>'event_controller.php?action=listing' , 'content' => Display::return_icon('view_text.png', get_lang('ListView'), array(), ICON_SIZE_MEDIUM)));
50
+$action_array = array(array('url' =>'event_controller.php?action=listing', 'content' => Display::return_icon('view_text.png', get_lang('ListView'), array(), ICON_SIZE_MEDIUM)));
51 51
 
52 52
 $key_lang = get_lang('YouHaveSomeUnsavedChanges');
53 53
 $users = UserManager::get_user_list(array(), array('firstname'));
@@ -311,7 +311,7 @@  discard block
 block discarded – undo
311 311
         <select class="col-md-6" multiple="1" id="eventList" onchange="confirmMessage(this.name); return false;" name="eventList">
312 312
         <?php
313 313
         foreach ($event_config as $key => $config) {
314
-            echo '<option value="' . $key . '">' . $config['name_lang_var'] . '</option>';
314
+            echo '<option value="'.$key.'">'.$config['name_lang_var'].'</option>';
315 315
         }
316 316
         ?>
317 317
         </select>
Please login to merge, or discard this patch.
main/admin/class_list.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -35,10 +35,10 @@  discard block
 block discarded – undo
35 35
 function get_class_data($from, $number_of_items, $column, $direction = 'ASC') {
36 36
     $tbl_class_user = Database::get_main_table(TABLE_MAIN_CLASS_USER);
37 37
     $tbl_class = Database :: get_main_table(TABLE_MAIN_CLASS);
38
-    $from 				= intval($from);
39
-    $number_of_items 	= intval($number_of_items);
38
+    $from = intval($from);
39
+    $number_of_items = intval($number_of_items);
40 40
     $column 			= intval($column);
41
-    $direction 			= ($direction == 'ASC'?'ASC':'DESC');
41
+    $direction = ($direction == 'ASC' ? 'ASC' : 'DESC');
42 42
 
43 43
     $sql = "SELECT 	id AS col0, name AS col1, COUNT(user_id) AS col2, id AS col3
44 44
         FROM $tbl_class
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
     }
49 49
     $sql .= " GROUP BY id,name ORDER BY col$column $direction LIMIT $from,$number_of_items";
50 50
     $res = Database::query($sql);
51
-    $classes = array ();
51
+    $classes = array();
52 52
     while ($class = Database::fetch_row($res)) {
53 53
         $classes[] = $class;
54 54
     }
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 }
69 69
 
70 70
 $tool_name = get_lang('ClassList');
71
-$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
71
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
72 72
 
73 73
 if (isset($_POST['action'])) {
74 74
     switch ($_POST['action']) {
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
 
100 100
 // Create a search-box
101 101
 $form = new FormValidator('search_simple', 'get', '', '', null, false);
102
-$renderer =& $form->defaultRenderer();
102
+$renderer = & $form->defaultRenderer();
103 103
 $renderer->setCustomElementTemplate('<span>{element}</span> ');
104 104
 $form->addElement('text', 'keyword', get_lang('Keyword'));
105 105
 $form->addElement('button', 'submit', get_lang('Search'));
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
 $table->set_header(2, get_lang('NumberOfUsers'));
114 114
 $table->set_header(3, '', false);
115 115
 $table->set_column_filter(3, 'modify_filter');
116
-$table->set_form_actions(array ('delete_classes' => get_lang('DeleteSelectedClasses')), 'class');
116
+$table->set_form_actions(array('delete_classes' => get_lang('DeleteSelectedClasses')), 'class');
117 117
 
118 118
 $content .= $table->return_table();
119 119
 
Please login to merge, or discard this patch.
main/admin/class_information.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -18,8 +18,8 @@  discard block
 block discarded – undo
18 18
     api_not_allowed();
19 19
 }
20 20
 
21
-$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
22
-$interbreadcrumb[] = array ('url' => 'class_list.php', 'name' => get_lang('AdminClasses'));
21
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
22
+$interbreadcrumb[] = array('url' => 'class_list.php', 'name' => get_lang('AdminClasses'));
23 23
 
24 24
 $class_id = $_GET['id'];
25 25
 $class = ClassManager::get_class_info($class_id);
@@ -35,21 +35,21 @@  discard block
 block discarded – undo
35 35
 $users = ClassManager::get_users($class_id);
36 36
 if (count($users) > 0) {
37 37
     $is_western_name_order = api_is_western_name_order();
38
-    $table_header[] = array (get_lang('OfficialCode'), true);
38
+    $table_header[] = array(get_lang('OfficialCode'), true);
39 39
     if ($is_western_name_order) {
40
-        $table_header[] = array (get_lang('FirstName'), true);
41
-        $table_header[] = array (get_lang('LastName'), true);
40
+        $table_header[] = array(get_lang('FirstName'), true);
41
+        $table_header[] = array(get_lang('LastName'), true);
42 42
     } else {
43
-        $table_header[] = array (get_lang('LastName'), true);
44
-        $table_header[] = array (get_lang('FirstName'), true);
43
+        $table_header[] = array(get_lang('LastName'), true);
44
+        $table_header[] = array(get_lang('FirstName'), true);
45 45
     }
46
-    $table_header[] = array (get_lang('Email'), true);
47
-    $table_header[] = array (get_lang('Status'), true);
48
-    $table_header[] = array ('', false);
46
+    $table_header[] = array(get_lang('Email'), true);
47
+    $table_header[] = array(get_lang('Status'), true);
48
+    $table_header[] = array('', false);
49 49
     $data = array();
50
-    foreach($users as $index => $user) {
50
+    foreach ($users as $index => $user) {
51 51
         $username = api_htmlentities(sprintf(get_lang('LoginX'), $user['username']), ENT_QUOTES);
52
-        $row = array ();
52
+        $row = array();
53 53
         $row[] = $user['official_code'];
54 54
         if ($is_western_name_order) {
55 55
             $row[] = $user['firstname'];
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
         $row[] = '<a href="user_information.php?user_id='.$user['user_id'].'">'.Display::return_icon('synthese_view.gif', get_lang('Info')).'</a>';
64 64
         $data[] = $row;
65 65
     }
66
-    Display::display_sortable_table($table_header,$data,array(),array(),array('id'=>$_GET['id']));
66
+    Display::display_sortable_table($table_header, $data, array(), array(), array('id'=>$_GET['id']));
67 67
 } else {
68 68
     echo get_lang('NoUsersInClass');
69 69
 }
@@ -73,22 +73,22 @@  discard block
 block discarded – undo
73 73
  */
74 74
 $courses = ClassManager::get_courses($class_id);
75 75
 if (count($courses) > 0) {
76
-    $header[] = array (get_lang('Code'), true);
77
-    $header[] = array (get_lang('Title'), true);
78
-    $header[] = array ('', false);
79
-    $data = array ();
80
-    foreach( $courses as $index => $course) {
81
-        $row = array ();
76
+    $header[] = array(get_lang('Code'), true);
77
+    $header[] = array(get_lang('Title'), true);
78
+    $header[] = array('', false);
79
+    $data = array();
80
+    foreach ($courses as $index => $course) {
81
+        $row = array();
82 82
         $row[] = $course['visual_code'];
83 83
         $row[] = $course['title'];
84 84
         $row[] = '<a href="course_information.php?code='.$course['code'].'">'.Display::return_icon('info_small.gif', get_lang('Delete')).'</a>'.
85
-                    '<a href="'.api_get_path(WEB_COURSE_PATH).$course['directory'].'">'.Display::return_icon('course_home.gif', get_lang('CourseHome')).'</a>' .
85
+                    '<a href="'.api_get_path(WEB_COURSE_PATH).$course['directory'].'">'.Display::return_icon('course_home.gif', get_lang('CourseHome')).'</a>'.
86 86
                     '<a href="course_edit.php?course_code='.$course['code'].'">'.Display::return_icon('edit.gif', get_lang('Edit')).'</a>';
87 87
         $data[] = $row;
88 88
     }
89 89
     echo '<p><b>'.get_lang('Courses').'</b></p>';
90 90
     echo '<blockquote>';
91
-    Display :: display_sortable_table($header, $data, array (), array (), array('id'=>$_GET['id']));
91
+    Display :: display_sortable_table($header, $data, array(), array(), array('id'=>$_GET['id']));
92 92
     echo '</blockquote>';
93 93
 } else {
94 94
     echo '<p>'.get_lang('NoCoursesForThisClass').'</p>';
Please login to merge, or discard this patch.
main/admin/sub_language.php 1 patch
Spacing   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
 $this_section = SECTION_PLATFORM_ADMIN;
12 12
 
13 13
 api_protect_admin_script();
14
-$htmlHeadXtra[] ='<script type="text/javascript">
14
+$htmlHeadXtra[] = '<script type="text/javascript">
15 15
  $(document).ready(function() {
16 16
 	$(".save").click(function() {
17 17
 		button_name=$(this).attr("name");
@@ -53,14 +53,14 @@  discard block
 block discarded – undo
53 53
 // setting the name of the tool
54 54
 $tool_name = get_lang('CreateSubLanguage');
55 55
 // setting breadcrumbs
56
-$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
57
-$interbreadcrumb[] = array ('url' => 'languages.php', 'name' => get_lang('PlatformLanguages'));
56
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
57
+$interbreadcrumb[] = array('url' => 'languages.php', 'name' => get_lang('PlatformLanguages'));
58 58
 
59 59
 $sublanguage_folder_error = false;
60 60
 
61
-if (isset($_GET['id']) && $_GET['id']==strval(intval($_GET['id']))) {
62
-	$language_name              = SubLanguageManager::get_name_of_language_by_id ($_GET['id']);
63
-	$sub_language_name          = SubLanguageManager::get_name_of_language_by_id ($_GET['sub_language_id']);
61
+if (isset($_GET['id']) && $_GET['id'] == strval(intval($_GET['id']))) {
62
+	$language_name              = SubLanguageManager::get_name_of_language_by_id($_GET['id']);
63
+	$sub_language_name          = SubLanguageManager::get_name_of_language_by_id($_GET['sub_language_id']);
64 64
 	$all_data_of_language       = SubLanguageManager::get_all_information_of_language($_GET['id']);
65 65
 	$all_data_of_sublanguage    = SubLanguageManager::get_all_information_of_language($_GET['sub_language_id']);
66 66
 	$sub_language_file          = api_get_path(SYS_LANG_PATH).$all_data_of_sublanguage['dokeos_folder'];
@@ -68,20 +68,20 @@  discard block
 block discarded – undo
68 68
 	if (!file_exists($sub_language_file) || !is_writable($sub_language_file)) {
69 69
 		$sublanguage_folder_error = $sub_language_file.' '.get_lang('IsNotWritable');
70 70
 	}
71
-	if (SubLanguageManager::check_if_exist_language_by_id($_GET['id'])===true) {
71
+	if (SubLanguageManager::check_if_exist_language_by_id($_GET['id']) === true) {
72 72
 		$language_id_exist = true;
73 73
 	} else {
74 74
 		$language_id_exist = false;
75 75
 	}
76 76
 } else {
77
-	$language_name='';
78
-	$language_id_exist=false;
77
+	$language_name = '';
78
+	$language_id_exist = false;
79 79
 }
80 80
 
81 81
 $intro = sprintf(get_lang('RegisterTermsOfSubLanguageForX'), strtolower($sub_language_name));
82 82
 $path_folder = api_get_path(SYS_LANG_PATH).$all_data_of_language['dokeos_folder'];
83 83
 
84
-if (!is_dir($path_folder) || strlen($all_data_of_language['dokeos_folder'])==0) {
84
+if (!is_dir($path_folder) || strlen($all_data_of_language['dokeos_folder']) == 0) {
85 85
 	api_not_allowed(true);
86 86
 }
87 87
 
@@ -102,16 +102,16 @@  discard block
 block discarded – undo
102 102
 
103 103
 
104 104
 $txt_search_word = (!empty($_REQUEST['txt_search_word']) ? Security::remove_XSS($_REQUEST['txt_search_word']) : '');
105
-$html ='<div style="float:left" class="actions">';
106
-$html.='<form style="float:left"  id="Searchlanguage" name="Searchlanguage" method="GET" action="sub_language.php">';
107
-$html.='&nbsp;'.get_lang('OriginalName').'&nbsp; :&nbsp;';
105
+$html = '<div style="float:left" class="actions">';
106
+$html .= '<form style="float:left"  id="Searchlanguage" name="Searchlanguage" method="GET" action="sub_language.php">';
107
+$html .= '&nbsp;'.get_lang('OriginalName').'&nbsp; :&nbsp;';
108 108
 
109
-$html.='<input name="id" type="hidden"  id="id" value="'.Security::remove_XSS($_REQUEST['id']).'" />';
110
-$html.='<input name="sub_language_id" type="hidden"  id="id" value="'.Security::remove_XSS($_REQUEST['sub_language_id']).'" />';
111
-$html.='<input name="txt_search_word" type="text" size="50"  id="txt_search_word" value="'.$txt_search_word.'" />';
112
-$html.="&nbsp;".'<button name="SubmitSearchLanguage" class="search" type="submit">'.get_lang('Search').'</button>';
113
-$html.='</form>';
114
-$html.='</div>';
109
+$html .= '<input name="id" type="hidden"  id="id" value="'.Security::remove_XSS($_REQUEST['id']).'" />';
110
+$html .= '<input name="sub_language_id" type="hidden"  id="id" value="'.Security::remove_XSS($_REQUEST['sub_language_id']).'" />';
111
+$html .= '<input name="txt_search_word" type="text" size="50"  id="txt_search_word" value="'.$txt_search_word.'" />';
112
+$html .= "&nbsp;".'<button name="SubmitSearchLanguage" class="search" type="submit">'.get_lang('Search').'</button>';
113
+$html .= '</form>';
114
+$html .= '</div>';
115 115
 echo $html;
116 116
 echo '<br /><br /><br />';
117 117
 if (!empty($sublanguage_folder_error)) {
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
 	$language_files_to_load_keys = array_flip($language_files_to_load);
149 149
 	$array_to_search = $parent_language_array;
150 150
 	$list_info = array();
151
-	$term='/'.Security::remove_XSS(trim($_REQUEST['txt_search_word'])).'/i';
151
+	$term = '/'.Security::remove_XSS(trim($_REQUEST['txt_search_word'])).'/i';
152 152
 	//@todo optimize this foreach
153 153
 	foreach ($language_files_to_load as $lang_file) {
154 154
 		//searching in parent language of the sub language
@@ -161,7 +161,7 @@  discard block
 block discarded – undo
161 161
 				}
162 162
 				$founded = false;
163 163
 				// searching the item in the parent tool
164
-				if (preg_match($term,$parent_variable_value)!==0) {
164
+				if (preg_match($term, $parent_variable_value) !== 0) {
165 165
 					$founded = true;
166 166
 				}
167 167
 				if ($founded) {
@@ -177,11 +177,11 @@  discard block
 block discarded – undo
177 177
 						$size =4;
178 178
 					}*/
179 179
 
180
-					$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>';
181
-					$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>';
180
+					$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>';
181
+					$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>';
182 182
 
183 183
 					$list_info[] = array(
184
-						$lang_file . '.inc.php',
184
+						$lang_file.'.inc.php',
185 185
 						$parent_name_variable,
186 186
 						$english_name_variable,
187 187
 						$parent_variable_value,
@@ -205,16 +205,16 @@  discard block
 block discarded – undo
205 205
 				$founded = false;
206 206
 				if ($search_in_english && $search_in_variable) {
207 207
 					// searching the item in the parent tool
208
-					if (preg_match($term,$variable_value)!==0 || preg_match($term,$name_variable)!==0 ) {
208
+					if (preg_match($term, $variable_value) !== 0 || preg_match($term, $name_variable) !== 0) {
209 209
 						$founded = true;
210 210
 					}
211 211
 				} else {
212 212
 					if ($search_in_english) {
213
-						if (preg_match($term,$variable_value)!==0) {
213
+						if (preg_match($term, $variable_value) !== 0) {
214 214
 							$founded = true;
215 215
 						}
216 216
 					} else {
217
-						if (preg_match($term,$name_variable)!==0) {
217
+						if (preg_match($term, $name_variable) !== 0) {
218 218
 							$founded = true;
219 219
 						}
220 220
 					}
@@ -231,16 +231,16 @@  discard block
 block discarded – undo
231 231
 						$parent_variable_value = $parent_language_array[$lang_file][$name_variable];
232 232
 					}
233 233
 					//config buttons
234
-					$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.'" >'.
234
+					$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.'" >'.
235 235
 						$sub_language_name_variable.'
236 236
 						</textarea>';
237
-					$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>';
237
+					$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>';
238 238
 
239 239
 					//loading variable from the english array
240 240
 					$english_name_variable = $english_language_array[$lang_file][$name_variable];
241 241
 
242 242
 					$list_info[] = array(
243
-						$lang_file . '.inc.php',
243
+						$lang_file.'.inc.php',
244 244
 						$name_variable,
245 245
 						$english_name_variable,
246 246
 						$parent_variable_value,
@@ -261,7 +261,7 @@  discard block
 block discarded – undo
261 261
 
262 262
 				$founded = false;
263 263
 				// searching the item in the parent tool
264
-				if (preg_match($term,$variable_value)!==0) {
264
+				if (preg_match($term, $variable_value) !== 0) {
265 265
 					$founded = true;
266 266
 				}
267 267
 				if ($founded) {
@@ -269,15 +269,15 @@  discard block
 block discarded – undo
269 269
 					$sub_language_name_variable = $sub_language_array[$lang_file][$name_variable];
270 270
 					$parent_variable_value = $parent_language_array[$lang_file][$name_variable];
271 271
 					//config buttons
272
-					$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>';
273
-					$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>';
272
+					$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>';
273
+					$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>';
274 274
 
275 275
 					//loading variable from the english array
276 276
 					$english_name_variable = $english_language_array[$lang_file][$name_variable];
277
-					$list_info[]=array($lang_file.'.inc.php',
277
+					$list_info[] = array($lang_file.'.inc.php',
278 278
 						$name_variable,
279 279
 						$english_name_variable,
280
-						$parent_variable_value,$obj_text,$obj_button);
280
+						$parent_variable_value, $obj_text, $obj_button);
281 281
 				}
282 282
 			}
283 283
 		}
@@ -291,7 +291,7 @@  discard block
 block discarded – undo
291 291
 $list_info = array();
292 292
 if (isset($_REQUEST['txt_search_word'])) {
293 293
 	//@todo fix to accept a char with 1 char
294
-	if (strlen(trim($_REQUEST['txt_search_word']))>2) {
294
+	if (strlen(trim($_REQUEST['txt_search_word'])) > 2) {
295 295
 		$list_info = search_language_term(
296 296
 			$_REQUEST['txt_search_word'],
297 297
 			true,
@@ -307,14 +307,14 @@  discard block
 block discarded – undo
307 307
 	'sub_language_id' => intval($_GET['sub_language_id']),
308 308
 	'txt_search_word' => $txt_search_word
309 309
 );
310
-$table = new SortableTableFromArrayConfig($list_info, 1,20,'data_info');
310
+$table = new SortableTableFromArrayConfig($list_info, 1, 20, 'data_info');
311 311
 $table->set_additional_parameters($parameters);
312 312
 $table->set_header(0, get_lang('LanguageFile'));
313 313
 $table->set_header(1, get_lang('LanguageVariable'));
314 314
 $table->set_header(2, get_lang('EnglishName'));
315 315
 $table->set_header(3, get_lang('OriginalName'));
316
-$table->set_header(4, get_lang('SubLanguage'),false);
317
-$table->set_header(5, get_lang('Edit'),false);
316
+$table->set_header(4, get_lang('SubLanguage'), false);
317
+$table->set_header(5, get_lang('Edit'), false);
318 318
 $table->display();
319 319
 
320 320
 Display :: display_footer();
Please login to merge, or discard this patch.
main/admin/extra_fields.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 $obj->setupBreadcrumb($interbreadcrumb, $action);
37 37
 
38 38
 //jqgrid will use this URL to do the selects
39
-$url = api_get_path(WEB_AJAX_PATH) . 'model.ajax.php?a=get_extra_fields&type=' . $extraFieldType;
39
+$url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_extra_fields&type='.$extraFieldType;
40 40
 
41 41
 //The order is important you need to check the the $column variable in the model.ajax.php file
42 42
 $columns = $obj->getJqgridColumnNames();
@@ -64,43 +64,43 @@  discard block
 block discarded – undo
64 64
         array(),
65 65
         $action_links,
66 66
         true
67
-    ). '
67
+    ).'
68 68
 
69 69
     $("#field_type").on("change", function() {
70 70
         id = $(this).val();
71 71
         switch(id) {
72 72
             case "1":
73
-                $("#example").html("' . addslashes(Display::return_icon('userfield_text.png')) . '");
73
+                $("#example").html("' . addslashes(Display::return_icon('userfield_text.png')).'");
74 74
                 break;
75 75
             case "2":
76
-                $("#example").html("' . addslashes(Display::return_icon('userfield_text_area.png')) . '");
76
+                $("#example").html("' . addslashes(Display::return_icon('userfield_text_area.png')).'");
77 77
                 break;
78 78
             case "3":
79
-                $("#example").html("' . addslashes(Display::return_icon('add_user_field_howto.png')) . '");
79
+                $("#example").html("' . addslashes(Display::return_icon('add_user_field_howto.png')).'");
80 80
                 break;
81 81
             case "4":
82
-                $("#example").html("' . addslashes(Display::return_icon('userfield_drop_down.png')) . '");
82
+                $("#example").html("' . addslashes(Display::return_icon('userfield_drop_down.png')).'");
83 83
                 break;
84 84
             case "5":
85
-                $("#example").html("' . addslashes(Display::return_icon('userfield_multidropdown.png')) . '");
85
+                $("#example").html("' . addslashes(Display::return_icon('userfield_multidropdown.png')).'");
86 86
                 break;
87 87
             case "6":
88
-                $("#example").html("' . addslashes(Display::return_icon('userfield_data.png')) . '");
88
+                $("#example").html("' . addslashes(Display::return_icon('userfield_data.png')).'");
89 89
                 break;
90 90
             case "7":
91
-                $("#example").html("' . addslashes(Display::return_icon('userfield_date_time.png')) . '");
91
+                $("#example").html("' . addslashes(Display::return_icon('userfield_date_time.png')).'");
92 92
                 break;
93 93
             case "8":
94
-                $("#example").html("' . addslashes(Display::return_icon('userfield_doubleselect.png')) . '");
94
+                $("#example").html("' . addslashes(Display::return_icon('userfield_doubleselect.png')).'");
95 95
                 break;
96 96
             case "9":
97
-                $("#example").html("' . addslashes(Display::return_icon('userfield_divider.png')) . '");
97
+                $("#example").html("' . addslashes(Display::return_icon('userfield_divider.png')).'");
98 98
                 break;
99 99
             case "10":
100
-                $("#example").html("' . addslashes(Display::return_icon('userfield_user_tag.png')) . '");
100
+                $("#example").html("' . addslashes(Display::return_icon('userfield_user_tag.png')).'");
101 101
                 break;
102 102
             case "11":
103
-                $("#example").html("' . addslashes(Display::return_icon('userfield_data.png')) . '");
103
+                $("#example").html("' . addslashes(Display::return_icon('userfield_data.png')).'");
104 104
                 break;
105 105
         }
106 106
     });
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
         ) {
120 120
             api_not_allowed();
121 121
         }
122
-        $url = api_get_self() . '?type=' . $obj->type . '&action=' . Security::remove_XSS($_GET['action']);
122
+        $url = api_get_self().'?type='.$obj->type.'&action='.Security::remove_XSS($_GET['action']);
123 123
         $form = $obj->return_form($url, 'add');
124 124
 
125 125
         // The validation or display
@@ -135,8 +135,8 @@  discard block
 block discarded – undo
135 135
             $obj->display();
136 136
         } else {
137 137
             echo '<div class="actions">';
138
-            echo '<a href="' . api_get_self() . '?type=' . $obj->type . '">' .
139
-            Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM) . '</a>';
138
+            echo '<a href="'.api_get_self().'?type='.$obj->type.'">'.
139
+            Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM).'</a>';
140 140
             echo '</div>';
141 141
             $form->addElement('hidden', 'sec_token');
142 142
             $form->setConstants(array('sec_token' => $token));
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
         break;
146 146
     case 'edit':
147 147
         // Action handling: Editing
148
-        $url = api_get_self() . '?type=' . $obj->type . '&action=' . Security::remove_XSS($_GET['action']) . '&id=' . intval($_GET['id']);
148
+        $url = api_get_self().'?type='.$obj->type.'&action='.Security::remove_XSS($_GET['action']).'&id='.intval($_GET['id']);
149 149
         $form = $obj->return_form($url, 'edit');
150 150
 
151 151
         // The validation or display
@@ -159,8 +159,8 @@  discard block
 block discarded – undo
159 159
             $obj->display();
160 160
         } else {
161 161
             echo '<div class="actions">';
162
-            echo '<a href="' . api_get_self() . '?type=' . $obj->type . '">' .
163
-            Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM) . '</a>';
162
+            echo '<a href="'.api_get_self().'?type='.$obj->type.'">'.
163
+            Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM).'</a>';
164 164
             echo '</div>';
165 165
             $form->addElement('hidden', 'sec_token');
166 166
             $form->setConstants(array('sec_token' => $token));
Please login to merge, or discard this patch.
main/admin/user_add.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -42,8 +42,8 @@  discard block
 block discarded – undo
42 42
     });
43 43
     </script>';
44 44
 }
45
-$htmlHeadXtra[] = '<link  href="'. api_get_path(WEB_PATH) .'web/assets/cropper/dist/cropper.min.css" rel="stylesheet">';
46
-$htmlHeadXtra[] = '<script src="'. api_get_path(WEB_PATH) .'web/assets/cropper/dist/cropper.min.js"></script>';
45
+$htmlHeadXtra[] = '<link  href="'.api_get_path(WEB_PATH).'web/assets/cropper/dist/cropper.min.css" rel="stylesheet">';
46
+$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_PATH).'web/assets/cropper/dist/cropper.min.js"></script>';
47 47
 $htmlHeadXtra[] = '<script>
48 48
 $(document).ready(function() {
49 49
     var $image = $("#previewImage");
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
183 183
 }
184 184
 
185 185
 if (api_get_setting('login_is_email') == 'true') {
186
-    $form->addRule('email', sprintf(get_lang('UsernameMaxXCharacters'), (string)USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH);
186
+    $form->addRule('email', sprintf(get_lang('UsernameMaxXCharacters'), (string) USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH);
187 187
     $form->addRule('email', get_lang('UserTaken'), 'username_available');
188 188
 }
189 189
 
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
191 191
 $form->addElement('text', 'phone', get_lang('PhoneNumber'));
192 192
 // Picture
193 193
 $form->addElement('file', 'picture', get_lang('AddImage'), array('id' => 'picture', 'class' => 'picture-form'));
194
-$allowed_picture_types = array ('jpg', 'jpeg', 'png', 'gif');
194
+$allowed_picture_types = array('jpg', 'jpeg', 'png', 'gif');
195 195
 
196 196
 $form->addHtml(''
197 197
             . '<div class="form-group">'
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
 if (api_get_setting('login_is_email') != 'true') {
215 215
     $form->addElement('text', 'username', get_lang('LoginName'), array('id'=> 'username', 'maxlength' => USERNAME_MAX_LENGTH, 'autocomplete' => 'off'));
216 216
     $form->addRule('username', get_lang('ThisFieldIsRequired'), 'required');
217
-    $form->addRule('username', sprintf(get_lang('UsernameMaxXCharacters'), (string)USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH);
217
+    $form->addRule('username', sprintf(get_lang('UsernameMaxXCharacters'), (string) USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH);
218 218
     $form->addRule('username', get_lang('OnlyLettersAndNumbersAllowed'), 'username');
219 219
     $form->addRule('username', get_lang('UserTaken'), 'username_available');
220 220
 }
@@ -301,7 +301,7 @@  discard block
 block discarded – undo
301 301
 );
302 302
 
303 303
 //drh list (display only if student)
304
-$display = isset($_POST['status']) && $_POST['status'] == STUDENT  || !isset($_POST['status']) ? 'block' : 'none';
304
+$display = isset($_POST['status']) && $_POST['status'] == STUDENT || !isset($_POST['status']) ? 'block' : 'none';
305 305
 
306 306
 //@todo remove the drh list here. This code is unused
307 307
 $form->addElement('html', '<div id="drh_list" style="display:'.$display.';">');
@@ -335,7 +335,7 @@  discard block
 block discarded – undo
335 335
 $form->addGroup($group, 'mail', get_lang('SendMailToNewUser'), '&nbsp;');
336 336
 // Expiration Date
337 337
 $form->addElement('radio', 'radio_expiration_date', get_lang('ExpirationDate'), get_lang('NeverExpires'), 0);
338
-$group = array ();
338
+$group = array();
339 339
 $group[] = $form->createElement('radio', 'radio_expiration_date', null, get_lang('Enabled'), 1);
340 340
 $group[] = $form->createElement(
341 341
     'DateTimePicker',
@@ -356,7 +356,7 @@  discard block
 block discarded – undo
356 356
 $jquery_ready_content = $returnParams['jquery_ready_content'];
357 357
 
358 358
 // the $jquery_ready_content variable collects all functions that will be load in the $(document).ready javascript function
359
-$htmlHeadXtra[] ='<script>
359
+$htmlHeadXtra[] = '<script>
360 360
 $(document).ready(function(){
361 361
 	'.$jquery_ready_content.'
362 362
 });
@@ -458,7 +458,7 @@  discard block
 block discarded – undo
458 458
 			//If any error ocurred during user creation, print it (api_failureList
459 459
 			// stores values as separate words, so rework it
460 460
 			$message = '';
461
-			$message_bits = explode(' ',api_get_last_failure());
461
+			$message_bits = explode(' ', api_get_last_failure());
462 462
 			foreach ($message_bits as $bit) {
463 463
 				$message .= ucfirst($bit);
464 464
 			}
@@ -516,7 +516,7 @@  discard block
 block discarded – undo
516 516
 	$form->setConstants(array('sec_token' => $token));
517 517
 }
518 518
 
519
-if (!empty($message)){
519
+if (!empty($message)) {
520 520
 	$message = Display::return_message(stripslashes($message));
521 521
 }
522 522
 $content = $form->returnForm();
Please login to merge, or discard this patch.