Completed
Push — 1.11.x ( 04eda1...44c218 )
by José
105:08 queued 67:27
created
main/inc/ajax/message.ajax.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -37,11 +37,11 @@  discard block
 block discarded – undo
37 37
             break;
38 38
         }
39 39
         $track_online_table      = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
40
-        $tbl_my_user		     = Database::get_main_table(TABLE_MAIN_USER);
40
+        $tbl_my_user = Database::get_main_table(TABLE_MAIN_USER);
41 41
         $tbl_my_user_friend      = Database::get_main_table(TABLE_MAIN_USER_REL_USER);
42
-        $tbl_user 			     = Database::get_main_table(TABLE_MAIN_USER);
42
+        $tbl_user = Database::get_main_table(TABLE_MAIN_USER);
43 43
         $tbl_access_url_rel_user = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
44
-        $search				     = Database::escape_string($_REQUEST['q']);
44
+        $search = Database::escape_string($_REQUEST['q']);
45 45
 
46 46
         $access_url_id           = api_get_multiple_access_url() == 'true' ? api_get_current_access_url_id() : 1;
47 47
         $user_id                 = api_get_user_id();
@@ -49,9 +49,9 @@  discard block
 block discarded – undo
49 49
 
50 50
         $likeCondition = " AND (firstname LIKE '%$search%' OR lastname LIKE '%$search%' OR email LIKE '%$search%') ";
51 51
 
52
-        if (api_get_setting('allow_social_tool')=='true' && api_get_setting('allow_message_tool') == 'true') {
52
+        if (api_get_setting('allow_social_tool') == 'true' && api_get_setting('allow_message_tool') == 'true') {
53 53
             // All users
54
-            if (api_get_setting('allow_send_message_to_all_platform_users') == 'true' || api_is_platform_admin() ) {
54
+            if (api_get_setting('allow_send_message_to_all_platform_users') == 'true' || api_is_platform_admin()) {
55 55
                 if ($access_url_id != 0) {
56 56
                     $sql = "SELECT DISTINCT u.user_id as id, u.firstname, u.lastname, u.email
57 57
                             FROM $tbl_user u LEFT JOIN $tbl_access_url_rel_user r ON u.user_id = r.user_id
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
                                 $likeCondition";
98 98
                 }
99 99
             }
100
-        } elseif (api_get_setting('allow_social_tool')=='false' && api_get_setting('allow_message_tool')=='true') {
100
+        } elseif (api_get_setting('allow_social_tool') == 'false' && api_get_setting('allow_message_tool') == 'true') {
101 101
             if (api_get_setting('allow_send_message_to_all_platform_users') == 'true') {
102 102
                 $sql = "SELECT DISTINCT u.user_id as id, u.firstname, u.lastname, u.email
103 103
                         FROM $tbl_user u LEFT JOIN $tbl_access_url_rel_user r ON u.user_id = r.user_id
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
                             $likeCondition ";
109 109
             } else {
110 110
                 $time_limit = api_get_setting('time_limit_whosonline');
111
-                $online_time = time() - $time_limit*60;
111
+                $online_time = time() - $time_limit * 60;
112 112
                 $limit_date	 = api_get_utc_datetime($online_time);
113 113
                 $sql = "SELECT SELECT DISTINCT u.user_id as id, u.firstname, u.lastname, u.email
114 114
                         FROM $tbl_my_user u INNER JOIN $track_online_table t
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
                         $likeCondition";
118 118
             }
119 119
         }
120
-        $sql .=' LIMIT 20';
120
+        $sql .= ' LIMIT 20';
121 121
         $result = Database::query($sql);
122 122
 
123 123
         $showEmail = api_get_setting('show_email_addresses');
Please login to merge, or discard this patch.
main/inc/ajax/admin.ajax.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -50,9 +50,9 @@  discard block
 block discarded – undo
50 50
             $url = api_remove_trailing_slash(preg_replace('/https?:\/\//i', '', $urlInfo['url']));
51 51
             $cleanUrl = str_replace('/', '-', $url);
52 52
 
53
-            $newUrlDir = api_get_path(SYS_APP_PATH) . "home/$cleanUrl/admin/";
53
+            $newUrlDir = api_get_path(SYS_APP_PATH)."home/$cleanUrl/admin/";
54 54
         } else {
55
-            $newUrlDir = api_get_path(SYS_APP_PATH) . "home/admin/";
55
+            $newUrlDir = api_get_path(SYS_APP_PATH)."home/admin/";
56 56
         }
57 57
 
58 58
         if (!file_exists($newUrlDir)) {
@@ -166,15 +166,15 @@  discard block
 block discarded – undo
166 166
             }
167 167
 
168 168
             if ($system_version != $version_info) {
169
-                $output = '<br /><span style="color:red">' . get_lang('YourVersionNotUpToDate') . '. '.get_lang('LatestVersionIs').' <b>Chamilo '.$version_info.'</b>. '.get_lang('YourVersionIs').' <b>Chamilo '.$system_version. '</b>. '.str_replace('http://www.chamilo.org', '<a href="http://www.chamilo.org">http://www.chamilo.org</a>', get_lang('PleaseVisitOurWebsite')).'</span>';
169
+                $output = '<br /><span style="color:red">'.get_lang('YourVersionNotUpToDate').'. '.get_lang('LatestVersionIs').' <b>Chamilo '.$version_info.'</b>. '.get_lang('YourVersionIs').' <b>Chamilo '.$system_version.'</b>. '.str_replace('http://www.chamilo.org', '<a href="http://www.chamilo.org">http://www.chamilo.org</a>', get_lang('PleaseVisitOurWebsite')).'</span>';
170 170
             } else {
171 171
                 $output = '<br /><span style="color:green">'.get_lang('VersionUpToDate').': Chamilo '.$version_info.'</span>';
172 172
             }
173 173
         } else {
174
-            $output = '<span style="color:red">' . get_lang('ImpossibleToContactVersionServerPleaseTryAgain') . '</span>';
174
+            $output = '<span style="color:red">'.get_lang('ImpossibleToContactVersionServerPleaseTryAgain').'</span>';
175 175
         }
176 176
     } else {
177
-        $output = '<span style="color:red">' . get_lang('AllowurlfopenIsSetToOff') . '</span>';
177
+        $output = '<span style="color:red">'.get_lang('AllowurlfopenIsSetToOff').'</span>';
178 178
     }
179 179
     return $output;
180 180
 }
@@ -197,17 +197,17 @@  discard block
 block discarded – undo
197 197
     $getdata_str = count($getdata) ? '?' : '';
198 198
 
199 199
     foreach ($getdata as $k => $v) {
200
-                $getdata_str .= urlencode($k) .'='. urlencode($v) . '&';
200
+                $getdata_str .= urlencode($k).'='.urlencode($v).'&';
201 201
     }
202 202
 
203 203
     $crlf = "\r\n";
204
-    $req = $verb .' '. $uri . $getdata_str .' HTTP/1.1' . $crlf;
205
-    $req .= 'Host: '. $ip . $crlf;
206
-    $req .= 'User-Agent: Mozilla/5.0 Firefox/3.6.12' . $crlf;
207
-    $req .= 'Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8' . $crlf;
208
-    $req .= 'Accept-Language: en-us,en;q=0.5' . $crlf;
209
-    $req .= 'Accept-Encoding: deflate' . $crlf;
210
-    $req .= 'Accept-Charset: utf-8;q=0.7,*;q=0.7' . $crlf;
204
+    $req = $verb.' '.$uri.$getdata_str.' HTTP/1.1'.$crlf;
205
+    $req .= 'Host: '.$ip.$crlf;
206
+    $req .= 'User-Agent: Mozilla/5.0 Firefox/3.6.12'.$crlf;
207
+    $req .= 'Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8'.$crlf;
208
+    $req .= 'Accept-Language: en-us,en;q=0.5'.$crlf;
209
+    $req .= 'Accept-Encoding: deflate'.$crlf;
210
+    $req .= 'Accept-Charset: utf-8;q=0.7,*;q=0.7'.$crlf;
211 211
 
212 212
     $req .= $crlf;
213 213
 
Please login to merge, or discard this patch.
main/inc/ajax/exercise.ajax.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -488,7 +488,7 @@
 block discarded – undo
488 488
                     $remind_list
489 489
                 );
490 490
 
491
-                 // Destruction of the Question object
491
+                    // Destruction of the Question object
492 492
                 unset($objQuestionTmp);
493 493
                 if ($debug) {
494 494
                     error_log(" -- end question -- ");
Please login to merge, or discard this patch.
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -30,10 +30,10 @@  discard block
 block discarded – undo
30 30
         $exercise_id = intval($_GET['exercise_id']);
31 31
         $page = intval($_REQUEST['page']); //page
32 32
         $limit = intval($_REQUEST['rows']); //quantity of rows
33
-        $sidx = $_REQUEST['sidx'];         //index to filter
34
-        $sord = $_REQUEST['sord'];         //asc or desc
33
+        $sidx = $_REQUEST['sidx']; //index to filter
34
+        $sord = $_REQUEST['sord']; //asc or desc
35 35
 
36
-        if (!in_array($sord, array('asc','desc'))) {
36
+        if (!in_array($sord, array('asc', 'desc'))) {
37 37
             $sord = 'desc';
38 38
         }
39 39
         // get index row - i.e. user click to sort $sord = $_GET['sord'];
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
         $total_pages = 0;
63 63
         if ($count > 0) {
64 64
             if (!empty($limit)) {
65
-                $total_pages = ceil($count/$limit);
65
+                $total_pages = ceil($count / $limit);
66 66
             }
67 67
         }
68 68
 
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
         $response->page = $page;
125 125
         $response->total = $total_pages;
126 126
         $response->records = $count;
127
-        $i=0;
127
+        $i = 0;
128 128
 
129 129
         if (!empty($results)) {
130 130
             foreach ($results as $row) {
@@ -138,22 +138,22 @@  discard block
 block discarded – undo
138 138
                             GROUP by question_id
139 139
                         ) as count_table";
140 140
                 $result_count = Database::query($sql);
141
-                $count_questions = Database::fetch_array($result_count,'ASSOC');
141
+                $count_questions = Database::fetch_array($result_count, 'ASSOC');
142 142
                 $count_questions = $count_questions['count_question_id'];
143 143
 
144 144
                 $row['count_questions'] = $count_questions;
145 145
 
146 146
                 $response->rows[$i]['id'] = $row['exe_id'];
147
-                $remaining = strtotime($row['start_date'])+($oExe->expired_time*60) - strtotime(api_get_utc_datetime(time()));
148
-                $h = floor($remaining/3600);
149
-                $m = floor(($remaining - ($h*3600))/60);
150
-                $s = ($remaining - ($h*3600) - ($m*60));
147
+                $remaining = strtotime($row['start_date']) + ($oExe->expired_time * 60) - strtotime(api_get_utc_datetime(time()));
148
+                $h = floor($remaining / 3600);
149
+                $m = floor(($remaining - ($h * 3600)) / 60);
150
+                $s = ($remaining - ($h * 3600) - ($m * 60));
151 151
                 $array = array(
152 152
                     $row['firstname'],
153 153
                     $row['lastname'],
154
-                    api_format_date($row['start_date'], DATE_TIME_FORMAT_LONG).' ['.($h>0?$h.':':'').sprintf("%02d",$m).':'.sprintf("%02d",$s).']',
154
+                    api_format_date($row['start_date'], DATE_TIME_FORMAT_LONG).' ['.($h > 0 ? $h.':' : '').sprintf("%02d", $m).':'.sprintf("%02d", $s).']',
155 155
                     $row['count_questions'],
156
-                    round($row['score']*100).'%'
156
+                    round($row['score'] * 100).'%'
157 157
                 );
158 158
                 $response->rows[$i]['cell'] = $array;
159 159
                 $i++;
@@ -209,7 +209,7 @@  discard block
 block discarded – undo
209 209
         break;
210 210
     case 'add_question_to_reminder':
211 211
         /** @var Exercise $objExercise */
212
-        $objExercise  = $_SESSION['objExercise'];
212
+        $objExercise = $_SESSION['objExercise'];
213 213
         if (empty($objExercise)) {
214 214
             echo 0;
215 215
             exit;
@@ -362,8 +362,8 @@  discard block
 block discarded – undo
362 362
                 $objQuestionTmp = Question::read($my_question_id, $course_id);
363 363
 
364 364
                 // Getting free choice data.
365
-                if ($objQuestionTmp->type  == FREE_ANSWER && $type == 'all') {
366
-                    $my_choice = isset($_REQUEST['free_choice'][$my_question_id]) && !empty($_REQUEST['free_choice'][$my_question_id]) ? $_REQUEST['free_choice'][$my_question_id]: null;
365
+                if ($objQuestionTmp->type == FREE_ANSWER && $type == 'all') {
366
+                    $my_choice = isset($_REQUEST['free_choice'][$my_question_id]) && !empty($_REQUEST['free_choice'][$my_question_id]) ? $_REQUEST['free_choice'][$my_question_id] : null;
367 367
                 }
368 368
 
369 369
                 if ($type == 'all') {
@@ -407,7 +407,7 @@  discard block
 block discarded – undo
407 407
                         $session_id,
408 408
                         $my_question_id
409 409
                     );
410
-                    if ($objQuestionTmp->type  == HOT_SPOT) {
410
+                    if ($objQuestionTmp->type == HOT_SPOT) {
411 411
                         Event::delete_attempt_hotspot(
412 412
                             $exe_id,
413 413
                             api_get_user_id(),
Please login to merge, or discard this patch.
main/inc/ajax/course.ajax.php 2 patches
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -258,13 +258,13 @@
 block discarded – undo
258 258
                 ), 'first');
259 259
 
260 260
                 $coachName = api_get_person_name($userResult['firstname'], $userResult['lastname']);
261
-           }
261
+            }
262 262
 
263
-           $courses[] = array(
264
-               'id' => $courseId,
265
-               'name' => $course['title'],
266
-               'coachName' => $coachName,
267
-           );
263
+            $courses[] = array(
264
+                'id' => $courseId,
265
+                'name' => $course['title'],
266
+                'coachName' => $coachName,
267
+            );
268 268
         }
269 269
 
270 270
         echo json_encode($courses);
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
                         0, //howMany
75 75
                         1, //$orderby = 1
76 76
                         'ASC',
77
-                        -1,  //visibility
77
+                        -1, //visibility
78 78
                         $_GET['q'],
79 79
                         null, //$urlId
80 80
                         true //AlsoSearchCode
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 
97 97
                 if (!empty($course['category_code'])) {
98 98
                     $parents = CourseCategory::getParentsToString($course['category_code']);
99
-                    $title = $parents . $course['title'];
99
+                    $title = $parents.$course['title'];
100 100
                 }
101 101
 
102 102
                 $results['items'][] = array(
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
                     INNER JOIN $session_course_user r ON u.user_id = r.user_id
177 177
                     WHERE session_id = %d AND c_id =  '%s'
178 178
                     AND (u.firstname LIKE '%s' OR u.username LIKE '%s' OR u.lastname LIKE '%s')";
179
-            $needle = '%' . $_GET['q'] . '%';
179
+            $needle = '%'.$_GET['q'].'%';
180 180
             $sql_query = sprintf($sql, $_GET['session_id'], $course['real_id'], $needle, $needle, $needle);
181 181
 
182 182
             $result = Database::query($sql_query);
@@ -195,11 +195,11 @@  discard block
 block discarded – undo
195 195
     case 'search_exercise_by_course':
196 196
         if (api_is_platform_admin()) {
197 197
             $course = api_get_course_info_by_id($_GET['course_id']);
198
-            $session_id = (!empty($_GET['session_id'])) ?  intval($_GET['session_id']) : 0 ;
198
+            $session_id = (!empty($_GET['session_id'])) ? intval($_GET['session_id']) : 0;
199 199
             $exercises = ExerciseLib::get_all_exercises($course, $session_id, false, $_GET['q'], true, 3);
200 200
 
201 201
             foreach ($exercises as $exercise) {
202
-                $data[] = array('id' => $exercise['id'], 'text' => html_entity_decode($exercise['title']) );
202
+                $data[] = array('id' => $exercise['id'], 'text' => html_entity_decode($exercise['title']));
203 203
             }
204 204
             if (!empty($data)) {
205 205
                 $data[] = array('id' => 'T', 'text' => 'TODOS');
@@ -224,11 +224,11 @@  discard block
 block discarded – undo
224 224
                 $sql,
225 225
                 intval($_GET['course_id']),
226 226
                 intval($_GET['session_id']),
227
-                '%' . Database::escape_string($_GET['q']).'%'
227
+                '%'.Database::escape_string($_GET['q']).'%'
228 228
             );
229 229
             $result = Database::query($sql_query);
230 230
             while ($survey = Database::fetch_assoc($result)) {
231
-                $survey['title'] .= ($survey['anonymous'] == 1) ? ' (' . get_lang('Anonymous') . ')' : '';
231
+                $survey['title'] .= ($survey['anonymous'] == 1) ? ' ('.get_lang('Anonymous').')' : '';
232 232
                 $data[] = array(
233 233
                     'id' => $survey['id'],
234 234
                     'text' => strip_tags(html_entity_decode($survey['title']))
Please login to merge, or discard this patch.
main/inc/ajax/course_home.ajax.php 3 patches
Braces   +9 added lines, -6 removed lines patch added patch discarded remove patch
@@ -121,8 +121,9 @@  discard block
 block discarded – undo
121 121
             $new_session_list = UserManager::get_personal_session_course_list(api_get_user_id());
122 122
             $my_session_list  = array();
123 123
             foreach($new_session_list as $item) {
124
-                if (!empty($item['id_session']))
125
-                    $my_session_list[] = $item['id_session'];
124
+                if (!empty($item['id_session'])) {
125
+                                    $my_session_list[] = $item['id_session'];
126
+                }
126 127
             }
127 128
             if (!in_array($session_id, $my_session_list)) {
128 129
             	break;
@@ -254,8 +255,9 @@  discard block
 block discarded – undo
254 255
             $new_session_list = UserManager::get_personal_session_course_list(api_get_user_id());
255 256
             $my_session_list  = array();
256 257
             foreach($new_session_list as $item) {
257
-                if (!empty($item['id_session']))
258
-                    $my_session_list[] = $item['id_session'];
258
+                if (!empty($item['id_session'])) {
259
+                                    $my_session_list[] = $item['id_session'];
260
+                }
259 261
             }
260 262
             if (!in_array($session_id, $my_session_list)) {
261 263
                 break;
@@ -384,8 +386,9 @@  discard block
 block discarded – undo
384 386
             $new_session_list = UserManager::get_personal_session_course_list(api_get_user_id());
385 387
             $my_session_list  = array();
386 388
             foreach($new_session_list as $item) {
387
-                if (!empty($item['id_session']))
388
-                    $my_session_list[] = $item['id_session'];
389
+                if (!empty($item['id_session'])) {
390
+                                    $my_session_list[] = $item['id_session'];
391
+                }
389 392
             }
390 393
             if (!in_array($session_id, $my_session_list)) {
391 394
                 break;
Please login to merge, or discard this patch.
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -63,12 +63,12 @@  discard block
 block discarded – undo
63 63
             echo json_encode($response_data);
64 64
         }
65 65
         break;
66
-	case 'show_course_information' :
67
-		require_once '../global.inc.php';
66
+    case 'show_course_information' :
67
+        require_once '../global.inc.php';
68 68
 
69
-		// Get the name of the database course.
70
-		$tbl_course_description = Database::get_course_table(TABLE_COURSE_DESCRIPTION);
71
-		$course_info = api_get_course_info($_GET['code']);
69
+        // Get the name of the database course.
70
+        $tbl_course_description = Database::get_course_table(TABLE_COURSE_DESCRIPTION);
71
+        $course_info = api_get_course_info($_GET['code']);
72 72
 
73 73
         if (
74 74
             api_get_setting('course_catalog_hide_private') === 'true' &&
@@ -78,24 +78,24 @@  discard block
 block discarded – undo
78 78
             break;
79 79
         }
80 80
 
81
-		$sql = "SELECT * FROM $tbl_course_description
81
+        $sql = "SELECT * FROM $tbl_course_description
82 82
 		        WHERE c_id = ".$course_info['real_id']." AND session_id = 0
83 83
 		        ORDER BY id";
84
-		$result = Database::query($sql);
85
-		if (Database::num_rows($result) > 0 ) {
86
-		    while ($description = Database::fetch_object($result)) {
87
-			    $descriptions[$description->id] = $description;
88
-		    }
84
+        $result = Database::query($sql);
85
+        if (Database::num_rows($result) > 0 ) {
86
+            while ($description = Database::fetch_object($result)) {
87
+                $descriptions[$description->id] = $description;
88
+            }
89 89
             // Function that displays the details of the course description in html.
90
-		    echo CourseManager::get_details_course_description_html(
90
+            echo CourseManager::get_details_course_description_html(
91 91
                 $descriptions,
92 92
                 api_get_system_encoding(),
93 93
                 false
94 94
             );
95
-		} else {
96
-		    echo get_lang('NoDescription');
97
-		}
98
-	    break;
95
+        } else {
96
+            echo get_lang('NoDescription');
97
+        }
98
+        break;
99 99
     case 'session_courses_lp_default':
100 100
         /**
101 101
          * @todo this functions need to belong to a class or a special
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
         $sidx  = isset($_REQUEST['sidx']) && !empty($_REQUEST['sidx']) ? $_REQUEST['sidx'] : 'id';
111 111
         $sord  = $_REQUEST['sord'];    //asc or desc
112 112
         if (!in_array($sord, array('asc','desc'))) {
113
-        	$sord = 'desc';
113
+            $sord = 'desc';
114 114
         }
115 115
         $session_id  = intval($_REQUEST['session_id']);
116 116
         $course_id   = intval($_REQUEST['course_id']);
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
                     $my_session_list[] = $item['id_session'];
125 125
             }
126 126
             if (!in_array($session_id, $my_session_list)) {
127
-            	break;
127
+                break;
128 128
             }
129 129
         }
130 130
 
@@ -445,7 +445,7 @@  discard block
 block discarded – undo
445 445
                     $date = '-';
446 446
                 }
447 447
 
448
-                 //Checking LP publicated and expired_on dates
448
+                    //Checking LP publicated and expired_on dates
449 449
                 if (!empty($lp_item['publicated_on']) && $lp_item['publicated_on'] != '0000-00-00 00:00:00') {
450 450
                     if ($now < api_strtotime($lp_item['publicated_on'], 'UTC')) {
451 451
                         continue;
@@ -499,7 +499,7 @@  discard block
 block discarded – undo
499 499
 
500 500
         echo json_encode($response);
501 501
         break;
502
-	default:
503
-		echo '';
502
+    default:
503
+        echo '';
504 504
 }
505 505
 exit;
Please login to merge, or discard this patch.
Spacing   +55 added lines, -55 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
                     null,
31 31
                     true
32 32
                 );
33
-                $na_image   = str_replace('.png', '_na.png', $tool_image);
33
+                $na_image = str_replace('.png', '_na.png', $tool_image);
34 34
             }
35 35
 
36 36
             if (isset($tool_info['custom_icon']) && !empty($tool_info['custom_icon'])) {
@@ -38,20 +38,20 @@  discard block
 block discarded – undo
38 38
                 $na_image = CourseHome::getCustomWebIconPath().CourseHome::getDisableIcon($tool_info['custom_icon']);
39 39
             }
40 40
 
41
-            $requested_image = ($tool_visibility == 0 ) ? $tool_image : $na_image;
42
-            $requested_class = ($tool_visibility == 0 ) ? 'visible' : 'invisible';
43
-            $requested_message = ($tool_visibility == 0 ) ? 'is_active' : 'is_inactive';
44
-            $requested_view = ($tool_visibility == 0 ) ? 'visible.png' : 'invisible.png';
45
-            $requested_visible = ($tool_visibility == 0 ) ? 1 : 0;
41
+            $requested_image = ($tool_visibility == 0) ? $tool_image : $na_image;
42
+            $requested_class = ($tool_visibility == 0) ? 'visible' : 'invisible';
43
+            $requested_message = ($tool_visibility == 0) ? 'is_active' : 'is_inactive';
44
+            $requested_view = ($tool_visibility == 0) ? 'visible.png' : 'invisible.png';
45
+            $requested_visible = ($tool_visibility == 0) ? 1 : 0;
46 46
 
47
-            $requested_view = ($tool_visibility == 0 ) ? 'visible.png' : 'invisible.png';
48
-            $requested_visible = ($tool_visibility == 0 ) ? 1 : 0;
47
+            $requested_view = ($tool_visibility == 0) ? 'visible.png' : 'invisible.png';
48
+            $requested_visible = ($tool_visibility == 0) ? 1 : 0;
49 49
 
50 50
             // HIDE AND REACTIVATE TOOL
51 51
             if ($_GET["id"] == strval(intval($_GET["id"]))) {
52 52
                 $sql = "UPDATE $tool_table SET
53 53
                         visibility = $requested_visible
54
-                        WHERE c_id = $course_id AND id='" . intval($_GET['id']) . "'";
54
+                        WHERE c_id = $course_id AND id='".intval($_GET['id'])."'";
55 55
                 Database::query($sql);
56 56
             }
57 57
             $response_data = array(
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
 		        WHERE c_id = ".$course_info['real_id']." AND session_id = 0
83 83
 		        ORDER BY id";
84 84
 		$result = Database::query($sql);
85
-		if (Database::num_rows($result) > 0 ) {
85
+		if (Database::num_rows($result) > 0) {
86 86
 		    while ($description = Database::fetch_object($result)) {
87 87
 			    $descriptions[$description->id] = $description;
88 88
 		    }
@@ -104,12 +104,12 @@  discard block
 block discarded – undo
104 104
 
105 105
         require_once '../global.inc.php';
106 106
         $now = time();
107
-        $page  = intval($_REQUEST['page']);     //page
108
-        $limit = intval($_REQUEST['rows']);     // quantity of rows
107
+        $page  = intval($_REQUEST['page']); //page
108
+        $limit = intval($_REQUEST['rows']); // quantity of rows
109 109
         //index to filter
110 110
         $sidx  = isset($_REQUEST['sidx']) && !empty($_REQUEST['sidx']) ? $_REQUEST['sidx'] : 'id';
111
-        $sord  = $_REQUEST['sord'];    //asc or desc
112
-        if (!in_array($sord, array('asc','desc'))) {
111
+        $sord  = $_REQUEST['sord']; //asc or desc
112
+        if (!in_array($sord, array('asc', 'desc'))) {
113 113
         	$sord = 'desc';
114 114
         }
115 115
         $session_id  = intval($_REQUEST['session_id']);
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
         if (!api_is_platform_admin()) {
120 120
             $new_session_list = UserManager::get_personal_session_course_list(api_get_user_id());
121 121
             $my_session_list  = array();
122
-            foreach($new_session_list as $item) {
122
+            foreach ($new_session_list as $item) {
123 123
                 if (!empty($item['id_session']))
124 124
                     $my_session_list[] = $item['id_session'];
125 125
             }
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
             }
129 129
         }
130 130
 
131
-        $start = $limit*$page - $limit;
131
+        $start = $limit * $page - $limit;
132 132
         $course_list = SessionManager::get_course_list_by_session_id($session_id);
133 133
         $count = 0;
134 134
         $temp = array();
@@ -140,14 +140,14 @@  discard block
 block discarded – undo
140 140
             $item['title'] = Display::url($item['title'], $course_url, array('target' => SESSION_LINK_TARGET));
141 141
 
142 142
             foreach ($flat_list as $lp_id => $lp_item) {
143
-                $temp[$count]['id']= $lp_id;
143
+                $temp[$count]['id'] = $lp_id;
144 144
 
145 145
                 $lp = new learnpath($item['code'], $lp_id, api_get_user_id());
146 146
                 if ($lp->progress_db == 100) {
147 147
                     continue;
148 148
                 }
149 149
 
150
-                $lp_url = api_get_path(WEB_CODE_PATH) . 'lp/lp_controller.php?cidReq='.$item['code'].'&id_session='.$session_id.'&lp_id='.$lp_id.'&action=view';
150
+                $lp_url = api_get_path(WEB_CODE_PATH).'lp/lp_controller.php?cidReq='.$item['code'].'&id_session='.$session_id.'&lp_id='.$lp_id.'&action=view';
151 151
 
152 152
                 $last_date = Tracking::get_last_connection_date_on_the_course(
153 153
                     api_get_user_id(),
@@ -203,27 +203,27 @@  discard block
 block discarded – undo
203 203
         }
204 204
         $temp = msort($temp, $sidx, $sord);
205 205
 
206
-        $i =0;
206
+        $i = 0;
207 207
         $response = new stdClass();
208
-        foreach($temp as $key=>$row) {
208
+        foreach ($temp as $key=>$row) {
209 209
             $row = $row['cell'];
210 210
             if (!empty($row)) {
211
-                if ($key >= $start  && $key < ($start + $limit)) {
212
-                    $response->rows[$i]['id']= $key;
213
-                    $response->rows[$i]['cell']=array($row[0], $row[1], $row[2]);
211
+                if ($key >= $start && $key < ($start + $limit)) {
212
+                    $response->rows[$i]['id'] = $key;
213
+                    $response->rows[$i]['cell'] = array($row[0], $row[1], $row[2]);
214 214
                     $i++;
215 215
                 }
216 216
             }
217 217
         }
218 218
 
219
-        if($count > 0 && $limit > 0) {
220
-            $total_pages = ceil($count/$limit);
219
+        if ($count > 0 && $limit > 0) {
220
+            $total_pages = ceil($count / $limit);
221 221
         } else {
222 222
             $total_pages = 0;
223 223
         }
224
-        $response->total    = $total_pages;
224
+        $response->total = $total_pages;
225 225
         if ($page > $total_pages) {
226
-            $response->page= $total_pages;
226
+            $response->page = $total_pages;
227 227
         } else {
228 228
             $response->page = $page;
229 229
         }
@@ -234,13 +234,13 @@  discard block
 block discarded – undo
234 234
         require_once '../global.inc.php';
235 235
         $now = time();
236 236
 
237
-        $page  = intval($_REQUEST['page']);     //page
238
-        $limit = intval($_REQUEST['rows']);     // quantity of rows
237
+        $page  = intval($_REQUEST['page']); //page
238
+        $limit = intval($_REQUEST['rows']); // quantity of rows
239 239
         $sidx  = isset($_REQUEST['sidx']) && !empty($_REQUEST['sidx']) ? $_REQUEST['sidx'] : 'course';
240 240
         $sidx = str_replace(array('week desc,', ' '), '', $sidx);
241 241
 
242
-        $sord  = $_REQUEST['sord'];    //asc or desc
243
-        if (!in_array($sord, array('asc','desc'))) {
242
+        $sord  = $_REQUEST['sord']; //asc or desc
243
+        if (!in_array($sord, array('asc', 'desc'))) {
244 244
             $sord = 'desc';
245 245
         }
246 246
 
@@ -251,7 +251,7 @@  discard block
 block discarded – undo
251 251
         if (!api_is_platform_admin()) {
252 252
             $new_session_list = UserManager::get_personal_session_course_list(api_get_user_id());
253 253
             $my_session_list  = array();
254
-            foreach($new_session_list as $item) {
254
+            foreach ($new_session_list as $item) {
255 255
                 if (!empty($item['id_session']))
256 256
                     $my_session_list[] = $item['id_session'];
257 257
             }
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
260 260
             }
261 261
         }
262 262
 
263
-        $start = $limit*$page - $limit;
263
+        $start = $limit * $page - $limit;
264 264
         $course_list = SessionManager::get_course_list_by_session_id($session_id);
265 265
 
266 266
         $count = 0;
@@ -272,7 +272,7 @@  discard block
 block discarded – undo
272 272
                 }
273 273
             }
274 274
 
275
-            $list = new LearnpathList(api_get_user_id(),$item['code'], $session_id, 'publicated_on DESC');
275
+            $list = new LearnpathList(api_get_user_id(), $item['code'], $session_id, 'publicated_on DESC');
276 276
             $flat_list = $list->get_flat_list();
277 277
             $lps[$item['code']] = $flat_list;
278 278
             $item['title'] = Display::url(
@@ -282,8 +282,8 @@  discard block
 block discarded – undo
282 282
             );
283 283
 
284 284
             foreach ($flat_list as $lp_id => $lp_item) {
285
-                $temp[$count]['id']= $lp_id;
286
-                $lp_url = api_get_path(WEB_CODE_PATH) . 'lp/lp_controller.php?cidReq='.$item['code'].'&id_session='.$session_id.'&lp_id='.$lp_id.'&action=view';
285
+                $temp[$count]['id'] = $lp_id;
286
+                $lp_url = api_get_path(WEB_CODE_PATH).'lp/lp_controller.php?cidReq='.$item['code'].'&id_session='.$session_id.'&lp_id='.$lp_id.'&action=view';
287 287
 
288 288
                 $last_date = Tracking::get_last_connection_date_on_the_course(
289 289
                     api_get_user_id(),
@@ -345,20 +345,20 @@  discard block
 block discarded – undo
345 345
         }
346 346
 
347 347
         $response = new stdClass();
348
-        $i =0;
349
-        foreach($temp as $key=>$row) {
348
+        $i = 0;
349
+        foreach ($temp as $key=>$row) {
350 350
             $row = $row['cell'];
351 351
             if (!empty($row)) {
352
-                if ($key >= $start  && $key < ($start + $limit)) {
353
-                    $response->rows[$i]['id']= $key;
354
-                    $response->rows[$i]['cell']=array($row[0], $row[1], $row[2],$row[3]);
352
+                if ($key >= $start && $key < ($start + $limit)) {
353
+                    $response->rows[$i]['id'] = $key;
354
+                    $response->rows[$i]['cell'] = array($row[0], $row[1], $row[2], $row[3]);
355 355
                     $i++;
356 356
                 }
357 357
             }
358 358
         }
359 359
 
360 360
         if ($count > 0 && $limit > 0) {
361
-            $total_pages = ceil($count/$limit);
361
+            $total_pages = ceil($count / $limit);
362 362
         } else {
363 363
             $total_pages = 0;
364 364
         }
@@ -374,12 +374,12 @@  discard block
 block discarded – undo
374 374
     case 'session_courses_lp_by_course':
375 375
         require_once '../global.inc.php';
376 376
         $now = time();
377
-        $page  = intval($_REQUEST['page']);     //page
378
-        $limit = intval($_REQUEST['rows']);     // quantity of rows
377
+        $page  = intval($_REQUEST['page']); //page
378
+        $limit = intval($_REQUEST['rows']); // quantity of rows
379 379
         $sidx = isset($_REQUEST['sidx']) && !empty($_REQUEST['sidx']) ? $_REQUEST['sidx'] : 'id';
380 380
         $sidx = str_replace(array('course asc,', ' '), '', $sidx);
381 381
 
382
-        $sord = $_REQUEST['sord'];    //asc or desc
382
+        $sord = $_REQUEST['sord']; //asc or desc
383 383
         if (!in_array($sord, array('asc', 'desc'))) {
384 384
             $sord = 'desc';
385 385
         }
@@ -390,7 +390,7 @@  discard block
 block discarded – undo
390 390
         if (!api_is_platform_admin()) {
391 391
             $new_session_list = UserManager::get_personal_session_course_list(api_get_user_id());
392 392
             $my_session_list  = array();
393
-            foreach($new_session_list as $item) {
393
+            foreach ($new_session_list as $item) {
394 394
                 if (!empty($item['id_session']))
395 395
                     $my_session_list[] = $item['id_session'];
396 396
             }
@@ -399,7 +399,7 @@  discard block
 block discarded – undo
399 399
             }
400 400
         }
401 401
 
402
-        $start = $limit*$page - $limit;
402
+        $start = $limit * $page - $limit;
403 403
         $course_list = SessionManager::get_course_list_by_session_id($session_id);
404 404
         $count = 0;
405 405
 
@@ -410,16 +410,16 @@  discard block
 block discarded – undo
410 410
                 }
411 411
             }
412 412
 
413
-            $list = new LearnpathList(api_get_user_id(),$item['code'],$session_id);
413
+            $list = new LearnpathList(api_get_user_id(), $item['code'], $session_id);
414 414
             $flat_list = $list->get_flat_list();
415 415
             $lps[$item['code']] = $flat_list;
416 416
             $item['title'] = Display::url(
417 417
                 $item['title'],
418 418
                 api_get_path(WEB_COURSE_PATH).$item['directory'].'/?id_session='.$session_id, array('target'=>SESSION_LINK_TARGET)
419 419
             );
420
-            foreach($flat_list as $lp_id => $lp_item) {
421
-                $temp[$count]['id']= $lp_id;
422
-                $lp_url = api_get_path(WEB_CODE_PATH) . 'lp/lp_controller.php?cidReq='.$item['code'].'&id_session='.$session_id.'&lp_id='.$lp_id.'&action=view';
420
+            foreach ($flat_list as $lp_id => $lp_item) {
421
+                $temp[$count]['id'] = $lp_id;
422
+                $lp_url = api_get_path(WEB_CODE_PATH).'lp/lp_controller.php?cidReq='.$item['code'].'&id_session='.$session_id.'&lp_id='.$lp_id.'&action=view';
423 423
                 $last_date = Tracking::get_last_connection_date_on_the_course(
424 424
                     api_get_user_id(),
425 425
                     $item,
@@ -472,13 +472,13 @@  discard block
 block discarded – undo
472 472
         $temp = msort($temp, $sidx, $sord);
473 473
 
474 474
         $response = new stdClass();
475
-        $i =0;
475
+        $i = 0;
476 476
         foreach ($temp as $key=>$row) {
477 477
             $row = $row['cell'];
478 478
             if (!empty($row)) {
479
-                if ($key >= $start  && $key < ($start + $limit)) {
480
-                    $response->rows[$i]['id']= $key;
481
-                    $response->rows[$i]['cell']=array($row[0], $row[1], $row[2]);
479
+                if ($key >= $start && $key < ($start + $limit)) {
480
+                    $response->rows[$i]['id'] = $key;
481
+                    $response->rows[$i]['cell'] = array($row[0], $row[1], $row[2]);
482 482
                     $i++;
483 483
                 }
484 484
             }
Please login to merge, or discard this patch.
main/inc/ajax/chat.ajax.php 2 patches
Switch Indentation   +49 added lines, -49 removed lines patch added patch discarded remove patch
@@ -55,56 +55,56 @@
 block discarded – undo
55 55
 }
56 56
 
57 57
 switch ($action) {
58
-    case 'chatheartbeat':
59
-        $chat->heartbeat();
60
-        break;
61
-    case 'closechat':
62
-        $chat->close();
63
-        break;
64
-    case 'sendchat':
65
-        $chat->send(api_get_user_id(), $to_user_id, $message);
66
-        break;
67
-    case 'startchatsession':
68
-        $chat->startSession();
69
-        break;
70
-    case 'set_status':
71
-        $status = isset($_REQUEST['status']) ? intval($_REQUEST['status']) : 0;
72
-        $chat->setUserStatus($status);
73
-        break;
74
-    case 'create_room':
75
-        $room = VideoChat::getChatRoomByUsers(api_get_user_id(), $to_user_id);
76
-
77
-        if ($room === false) {
78
-            $createdRoom = VideoChat::createRoom(api_get_user_id(), $to_user_id);
79
-
80
-            if ($createdRoom === false) {
81
-                echo Display::return_message(get_lang('ChatRoomNotCreated'), 'error');
82
-                break;
58
+        case 'chatheartbeat':
59
+            $chat->heartbeat();
60
+            break;
61
+        case 'closechat':
62
+            $chat->close();
63
+            break;
64
+        case 'sendchat':
65
+            $chat->send(api_get_user_id(), $to_user_id, $message);
66
+            break;
67
+        case 'startchatsession':
68
+            $chat->startSession();
69
+            break;
70
+        case 'set_status':
71
+            $status = isset($_REQUEST['status']) ? intval($_REQUEST['status']) : 0;
72
+            $chat->setUserStatus($status);
73
+            break;
74
+        case 'create_room':
75
+            $room = VideoChat::getChatRoomByUsers(api_get_user_id(), $to_user_id);
76
+
77
+            if ($room === false) {
78
+                $createdRoom = VideoChat::createRoom(api_get_user_id(), $to_user_id);
79
+
80
+                if ($createdRoom === false) {
81
+                    echo Display::return_message(get_lang('ChatRoomNotCreated'), 'error');
82
+                    break;
83
+                }
84
+
85
+                $room = VideoChat::getChatRoomByUsers(api_get_user_id(), $to_user_id);
83 86
             }
84 87
 
85
-            $room = VideoChat::getChatRoomByUsers(api_get_user_id(), $to_user_id);
86
-        }
87
-
88
-        $videoChatUrl = api_get_path(WEB_LIBRARY_JS_PATH) . "chat/video.php?room={$room['id']}";
89
-        $videoChatLink = Display::url(
90
-            Display::returnFontAwesomeIcon('video-camera') . get_lang('StartVideoChat'),
91
-            $videoChatUrl
92
-        );
93
-
94
-        $chat->send(
95
-            api_get_user_id(),
96
-            $to_user_id,
97
-            $videoChatLink,
98
-            false,
99
-            false
100
-        );
101
-
102
-        echo Display::tag('p', $videoChatLink, ['class' => 'lead']);
103
-        break;
104
-    case 'notify_not_support':
105
-        $chat->send(api_get_user_id(), $to_user_id, get_lang('TheXUserBrowserDoesNotSupportWebRTC'));
106
-        break;
107
-    default:
108
-        echo '';
88
+            $videoChatUrl = api_get_path(WEB_LIBRARY_JS_PATH) . "chat/video.php?room={$room['id']}";
89
+            $videoChatLink = Display::url(
90
+                Display::returnFontAwesomeIcon('video-camera') . get_lang('StartVideoChat'),
91
+                $videoChatUrl
92
+            );
93
+
94
+            $chat->send(
95
+                api_get_user_id(),
96
+                $to_user_id,
97
+                $videoChatLink,
98
+                false,
99
+                false
100
+            );
101
+
102
+            echo Display::tag('p', $videoChatLink, ['class' => 'lead']);
103
+            break;
104
+        case 'notify_not_support':
105
+            $chat->send(api_get_user_id(), $to_user_id, get_lang('TheXUserBrowserDoesNotSupportWebRTC'));
106
+            break;
107
+        default:
108
+            echo '';
109 109
 }
110 110
 exit;
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@  discard block
 block discarded – undo
5 5
  * Responses to AJAX calls
6 6
  */
7 7
 
8
-$_dont_save_user_course_access  = true;
8
+$_dont_save_user_course_access = true;
9 9
 
10 10
 require_once '../global.inc.php';
11 11
 
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 }
35 35
 
36 36
 $to_user_id = isset($_REQUEST['to']) ? $_REQUEST['to'] : null;
37
-$message	= isset($_REQUEST['message']) ? $_REQUEST['message'] : null;
37
+$message = isset($_REQUEST['message']) ? $_REQUEST['message'] : null;
38 38
 
39 39
 if (!isset($_SESSION['chatHistory'])) {
40 40
     $_SESSION['chatHistory'] = array();
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 }
46 46
 
47 47
 $chat = new Chat();
48
-if (chat::disableChat()){
48
+if (chat::disableChat()) {
49 49
     exit;
50 50
 }
51 51
 if ($chat->is_chat_blocked_by_exercises()) {
@@ -85,9 +85,9 @@  discard block
 block discarded – undo
85 85
             $room = VideoChat::getChatRoomByUsers(api_get_user_id(), $to_user_id);
86 86
         }
87 87
 
88
-        $videoChatUrl = api_get_path(WEB_LIBRARY_JS_PATH) . "chat/video.php?room={$room['id']}";
88
+        $videoChatUrl = api_get_path(WEB_LIBRARY_JS_PATH)."chat/video.php?room={$room['id']}";
89 89
         $videoChatLink = Display::url(
90
-            Display::returnFontAwesomeIcon('video-camera') . get_lang('StartVideoChat'),
90
+            Display::returnFontAwesomeIcon('video-camera').get_lang('StartVideoChat'),
91 91
             $videoChatUrl
92 92
         );
93 93
 
Please login to merge, or discard this patch.
main/inc/ajax/myspace.ajax.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -58,9 +58,9 @@
 block discarded – undo
58 58
             $db['is_empty'] = false;
59 59
             $db['result'] = convert_to_string($sql_result);
60 60
             $rst = get_stats($user_id, $course_code, $start_date, $end_date);
61
-            $foo_stats = '<strong>' . get_lang('Total') . ': </strong>' . $rst['total'] . '<br />';
62
-            $foo_stats .= '<strong>' . get_lang('Average') . ': </strong>' . $rst['avg'] . '<br />';
63
-            $foo_stats .= '<strong>' . get_lang('Quantity') . ' : </strong>' . $rst['times'] . '<br />';
61
+            $foo_stats = '<strong>'.get_lang('Total').': </strong>'.$rst['total'].'<br />';
62
+            $foo_stats .= '<strong>'.get_lang('Average').': </strong>'.$rst['avg'].'<br />';
63
+            $foo_stats .= '<strong>'.get_lang('Quantity').' : </strong>'.$rst['times'].'<br />';
64 64
             $db['stats'] = $foo_stats;
65 65
             $db['graph_result'] = grapher($sql_result, $start_date, $end_date, $type);
66 66
         } else {
Please login to merge, or discard this patch.
main/inc/ajax/user_manager.ajax.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
                 <div class="row">
59 59
                     <div class="col-sm-10 col-sm-offset-2">
60 60
                         <a class="btn btn-primary" id="send_message_link">
61
-                            <em class="fa fa-envelope"></em> ' . get_lang('Send') . '
61
+                            <em class="fa fa-envelope"></em> ' . get_lang('Send').'
62 62
                         </a>
63 63
                     </div>
64 64
                 </div>
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
 
113 113
             if (!empty($user_id)) {
114 114
                 $user_table = Database :: get_main_table(TABLE_MAIN_USER);
115
-                $sql="UPDATE $user_table SET active='".$status."' WHERE user_id='".$user_id."'";
115
+                $sql = "UPDATE $user_table SET active='".$status."' WHERE user_id='".$user_id."'";
116 116
                 $result = Database::query($sql);
117 117
 
118 118
                 //Send and email if account is active
@@ -122,13 +122,13 @@  discard block
 block discarded – undo
122 122
                     $emailsubject = '['.api_get_setting('siteName').'] '.get_lang('YourReg').' '.api_get_setting('siteName');
123 123
                     $email_admin = api_get_setting('emailAdministrator');
124 124
                     $sender_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS);
125
-                    $emailbody=get_lang('Dear')." ".stripslashes($recipient_name).",\n\n";
125
+                    $emailbody = get_lang('Dear')." ".stripslashes($recipient_name).",\n\n";
126 126
 
127
-                    $emailbody.=sprintf(get_lang('YourAccountOnXHasJustBeenApprovedByOneOfOurAdministrators'), api_get_setting('siteName'))."\n";
128
-                    $emailbody.=sprintf(get_lang('YouCanNowLoginAtXUsingTheLoginAndThePasswordYouHaveProvided'), api_get_path(WEB_PATH)).",\n\n";
129
-                    $emailbody.=get_lang('HaveFun')."\n\n";
127
+                    $emailbody .= sprintf(get_lang('YourAccountOnXHasJustBeenApprovedByOneOfOurAdministrators'), api_get_setting('siteName'))."\n";
128
+                    $emailbody .= sprintf(get_lang('YouCanNowLoginAtXUsingTheLoginAndThePasswordYouHaveProvided'), api_get_path(WEB_PATH)).",\n\n";
129
+                    $emailbody .= get_lang('HaveFun')."\n\n";
130 130
                     //$emailbody.=get_lang('Problem'). "\n\n". get_lang('SignatureFormula');
131
-                    $emailbody.=api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'))."\n". get_lang('Manager'). " ".api_get_setting('siteName')."\nT. ".api_get_setting('administratorTelephone')."\n" .get_lang('Email') ." : ".api_get_setting('emailAdministrator');
131
+                    $emailbody .= api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'))."\n".get_lang('Manager')." ".api_get_setting('siteName')."\nT. ".api_get_setting('administratorTelephone')."\n".get_lang('Email')." : ".api_get_setting('emailAdministrator');
132 132
 
133 133
                     $additionalParameters = array(
134 134
                         'smsType' => SmsPlugin::ACCOUNT_APPROVED_CONNECT,
Please login to merge, or discard this patch.
main/inc/ajax/thematic.ajax.php 2 patches
Indentation   +74 added lines, -74 removed lines patch added patch discarded remove patch
@@ -11,8 +11,8 @@  discard block
 block discarded – undo
11 11
 $thematic = new Thematic();
12 12
 
13 13
 switch ($action) {
14
-	case 'save_thematic_plan':
15
-		/*$title_list         = $_REQUEST['title'];
14
+    case 'save_thematic_plan':
15
+        /*$title_list         = $_REQUEST['title'];
16 16
 		$description_list   = $_REQUEST['desc'];
17 17
 		//$description_list   = $_REQUEST['description'];
18 18
 		$description_type   = $_REQUEST['description_type'];
@@ -25,13 +25,13 @@  discard block
 block discarded – undo
25 25
 		$thematic_plan_data = $thematic->get_thematic_plan_data();
26 26
 		$return = $thematic->get_thematic_plan_div($thematic_plan_data);
27 27
 		echo $return[$_REQUEST['thematic_id']];*/
28
-		break;
29
-	case 'save_thematic_advance':
30
-		if (!api_is_allowed_to_edit(null, true)) {
31
-			echo '';
32
-			exit;
33
-		}
34
-		/*
28
+        break;
29
+    case 'save_thematic_advance':
30
+        if (!api_is_allowed_to_edit(null, true)) {
31
+            echo '';
32
+            exit;
33
+        }
34
+        /*
35 35
         if (($_REQUEST['start_date_type'] == 1 && empty($_REQUEST['start_date_by_attendance'])) || (!empty($_REQUEST['duration_in_hours']) && !is_numeric($_REQUEST['duration_in_hours'])) ) {
36 36
             if ($_REQUEST['start_date_type'] == 1 && empty($_REQUEST['start_date_by_attendance'])) {
37 37
                 $start_date_error = true;
@@ -79,80 +79,80 @@  discard block
 block discarded – undo
79 79
         $thematic_advance_data = $thematic->get_thematic_advance_list(null, null, true);
80 80
         $return = $thematic->get_thematic_advance_div($thematic_advance_data);
81 81
         echo $return[$_REQUEST['thematic_id']][$_REQUEST['thematic_advance_id']];*/
82
-		break;
83
-	case 'get_datetime_by_attendance':
84
-		$attendance_id       = intval($_REQUEST['attendance_id']);
85
-		$thematic_advance_id = intval($_REQUEST['thematic_advance_id']);
82
+        break;
83
+    case 'get_datetime_by_attendance':
84
+        $attendance_id       = intval($_REQUEST['attendance_id']);
85
+        $thematic_advance_id = intval($_REQUEST['thematic_advance_id']);
86 86
 
87
-		$label = '';
88
-		$input_select = '';
89
-		if (!empty($attendance_id)) {
90
-			$attendance = new Attendance();
91
-			$thematic   = new Thematic();
92
-			$thematic_list = $thematic->get_thematic_list();
87
+        $label = '';
88
+        $input_select = '';
89
+        if (!empty($attendance_id)) {
90
+            $attendance = new Attendance();
91
+            $thematic   = new Thematic();
92
+            $thematic_list = $thematic->get_thematic_list();
93 93
 
94
-			$my_list = $thematic_list_temp = array();
95
-			foreach ($thematic_list as $item) {
96
-				$my_list = $thematic->get_thematic_advance_by_thematic_id($item['id']);
97
-				$thematic_list_temp = array_merge($my_list, $thematic_list_temp);
98
-			}
99
-			$new_thematic_list = array();
94
+            $my_list = $thematic_list_temp = array();
95
+            foreach ($thematic_list as $item) {
96
+                $my_list = $thematic->get_thematic_advance_by_thematic_id($item['id']);
97
+                $thematic_list_temp = array_merge($my_list, $thematic_list_temp);
98
+            }
99
+            $new_thematic_list = array();
100 100
 
101
-			foreach($thematic_list_temp as $item) {
102
-				if (!empty($item['attendance_id']) ) {
103
-					$new_thematic_list[$item['id']] = array('attendance_id' =>$item['attendance_id'], 'start_date'=>$item['start_date']);
104
-				}
105
-			}
101
+            foreach($thematic_list_temp as $item) {
102
+                if (!empty($item['attendance_id']) ) {
103
+                    $new_thematic_list[$item['id']] = array('attendance_id' =>$item['attendance_id'], 'start_date'=>$item['start_date']);
104
+                }
105
+            }
106 106
 
107
-			$attendance_calendar = $attendance->get_attendance_calendar($attendance_id);
107
+            $attendance_calendar = $attendance->get_attendance_calendar($attendance_id);
108 108
 
109
-			$label = get_lang('StartDate');
110
-			if (!empty($attendance_calendar)) {
111
-				$input_select .= '<select id="start_date_select_calendar" name="start_date_by_attendance" size="5">';
112
-				foreach ($attendance_calendar as $calendar) {
113
-					$selected = null;
114
-					$insert = true;
115
-					//checking if was already taken
116
-					foreach ($new_thematic_list as $key => $thematic_item) {
117
-						//if ($calendar['db_date_time'] == $thematic_item['start_date'] && $calendar['attendance_id'] == $thematic_item['attendance_id'] ) {
118
-						if ($calendar['db_date_time'] == $thematic_item['start_date'] ) {
119
-							$insert = false;
120
-							if ($thematic_advance_id == $key) {
121
-								$insert = true;
122
-								$selected = 'selected';
123
-							}
124
-							break;
125
-						}
126
-					}
127
-					if ($insert == true) {
128
-						$input_select .= '<option '.$selected.' value="'.$calendar['date_time'].'">'.$calendar['date_time'].'</option>';
129
-					}
130
-				}
131
-				$input_select .= '</select>';
132
-			} else {
133
-				$input_select .= '<em>'.get_lang('ThereAreNoRegisteredDatetimeYet').'</em>';
134
-			}
135
-		}
136
-		?>
109
+            $label = get_lang('StartDate');
110
+            if (!empty($attendance_calendar)) {
111
+                $input_select .= '<select id="start_date_select_calendar" name="start_date_by_attendance" size="5">';
112
+                foreach ($attendance_calendar as $calendar) {
113
+                    $selected = null;
114
+                    $insert = true;
115
+                    //checking if was already taken
116
+                    foreach ($new_thematic_list as $key => $thematic_item) {
117
+                        //if ($calendar['db_date_time'] == $thematic_item['start_date'] && $calendar['attendance_id'] == $thematic_item['attendance_id'] ) {
118
+                        if ($calendar['db_date_time'] == $thematic_item['start_date'] ) {
119
+                            $insert = false;
120
+                            if ($thematic_advance_id == $key) {
121
+                                $insert = true;
122
+                                $selected = 'selected';
123
+                            }
124
+                            break;
125
+                        }
126
+                    }
127
+                    if ($insert == true) {
128
+                        $input_select .= '<option '.$selected.' value="'.$calendar['date_time'].'">'.$calendar['date_time'].'</option>';
129
+                    }
130
+                }
131
+                $input_select .= '</select>';
132
+            } else {
133
+                $input_select .= '<em>'.get_lang('ThereAreNoRegisteredDatetimeYet').'</em>';
134
+            }
135
+        }
136
+        ?>
137 137
 		<div class="form-group">
138 138
 			<label class="col-sm-2 control-label"><?php echo $label ?></label>
139 139
 			<div class="col-sm-10"><?php echo $input_select ?></div>
140 140
 		</div>
141 141
 		<?php
142
-		break;
143
-	case 'update_done_thematic_advance':
144
-		$thematic_advance_id = intval($_GET['thematic_advance_id']);
145
-		$total_average = 0;
146
-		if (!empty($thematic_advance_id)) {
147
-			$thematic = new Thematic();
148
-			$affected_rows  = $thematic->update_done_thematic_advances($thematic_advance_id);
149
-			//if ($affected_rows) {
150
-			$total_average  = $thematic->get_total_average_of_thematic_advances(api_get_course_id(), api_get_session_id());
151
-			//}
152
-		}
153
-		echo $total_average;
154
-		break;
155
-	default:
156
-		echo '';
142
+        break;
143
+    case 'update_done_thematic_advance':
144
+        $thematic_advance_id = intval($_GET['thematic_advance_id']);
145
+        $total_average = 0;
146
+        if (!empty($thematic_advance_id)) {
147
+            $thematic = new Thematic();
148
+            $affected_rows  = $thematic->update_done_thematic_advances($thematic_advance_id);
149
+            //if ($affected_rows) {
150
+            $total_average  = $thematic->get_total_average_of_thematic_advances(api_get_course_id(), api_get_session_id());
151
+            //}
152
+        }
153
+        echo $total_average;
154
+        break;
155
+    default:
156
+        echo '';
157 157
 }
158 158
 exit;
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -98,8 +98,8 @@  discard block
 block discarded – undo
98 98
 			}
99 99
 			$new_thematic_list = array();
100 100
 
101
-			foreach($thematic_list_temp as $item) {
102
-				if (!empty($item['attendance_id']) ) {
101
+			foreach ($thematic_list_temp as $item) {
102
+				if (!empty($item['attendance_id'])) {
103 103
 					$new_thematic_list[$item['id']] = array('attendance_id' =>$item['attendance_id'], 'start_date'=>$item['start_date']);
104 104
 				}
105 105
 			}
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
 					//checking if was already taken
116 116
 					foreach ($new_thematic_list as $key => $thematic_item) {
117 117
 						//if ($calendar['db_date_time'] == $thematic_item['start_date'] && $calendar['attendance_id'] == $thematic_item['attendance_id'] ) {
118
-						if ($calendar['db_date_time'] == $thematic_item['start_date'] ) {
118
+						if ($calendar['db_date_time'] == $thematic_item['start_date']) {
119 119
 							$insert = false;
120 120
 							if ($thematic_advance_id == $key) {
121 121
 								$insert = true;
Please login to merge, or discard this patch.