chamilo / chamilo-lms

main/inc/ajax/course_home.ajax.php

Braces +9 added lines, -6 removed lines

@@ -121,8 +121,9 @@ 
             $new_session_list = UserManager::get_personal_session_course_list(api_get_user_id());
             $my_session_list  = array();
             foreach($new_session_list as $item) {
-                if (!empty($item['id_session']))
-                    $my_session_list[] = $item['id_session'];
+                if (!empty($item['id_session'])) {
+                                    $my_session_list[] = $item['id_session'];
+                }
             }
             if (!in_array($session_id, $my_session_list)) {
             	break;
@@ -254,8 +255,9 @@ 
             $new_session_list = UserManager::get_personal_session_course_list(api_get_user_id());
             $my_session_list  = array();
             foreach($new_session_list as $item) {
-                if (!empty($item['id_session']))
-                    $my_session_list[] = $item['id_session'];
+                if (!empty($item['id_session'])) {
+                                    $my_session_list[] = $item['id_session'];
+                }
             }
             if (!in_array($session_id, $my_session_list)) {
                 break;
@@ -384,8 +386,9 @@ 
             $new_session_list = UserManager::get_personal_session_course_list(api_get_user_id());
             $my_session_list  = array();
             foreach($new_session_list as $item) {
-                if (!empty($item['id_session']))
-                    $my_session_list[] = $item['id_session'];
+                if (!empty($item['id_session'])) {
+                                    $my_session_list[] = $item['id_session'];
+                }
             }
             if (!in_array($session_id, $my_session_list)) {
                 break;

Indentation +21 added lines, -21 removed lines

@@ -63,12 +63,12 @@ 
             echo json_encode($response_data);
         }
         break;
-	case 'show_course_information' :
-		require_once '../global.inc.php';
+    case 'show_course_information' :
+        require_once '../global.inc.php';
 
-		// Get the name of the database course.
-		$tbl_course_description = Database::get_course_table(TABLE_COURSE_DESCRIPTION);
-		$course_info = api_get_course_info($_GET['code']);
+        // Get the name of the database course.
+        $tbl_course_description = Database::get_course_table(TABLE_COURSE_DESCRIPTION);
+        $course_info = api_get_course_info($_GET['code']);
 
         if (
             api_get_setting('course_catalog_hide_private') === 'true' &&
@@ -78,24 +78,24 @@ 
             break;
         }
 
-		$sql = "SELECT * FROM $tbl_course_description
+        $sql = "SELECT * FROM $tbl_course_description
 		        WHERE c_id = ".$course_info['real_id']." AND session_id = 0
 		        ORDER BY id";
-		$result = Database::query($sql);
-		if (Database::num_rows($result) > 0 ) {
-		    while ($description = Database::fetch_object($result)) {
-			    $descriptions[$description->id] = $description;
-		    }
+        $result = Database::query($sql);
+        if (Database::num_rows($result) > 0 ) {
+            while ($description = Database::fetch_object($result)) {
+                $descriptions[$description->id] = $description;
+            }
             // Function that displays the details of the course description in html.
-		    echo CourseManager::get_details_course_description_html(
+            echo CourseManager::get_details_course_description_html(
                 $descriptions,
                 api_get_system_encoding(),
                 false
             );
-		} else {
-		    echo get_lang('NoDescription');
-		}
-	    break;
+        } else {
+            echo get_lang('NoDescription');
+        }
+        break;
     case 'session_courses_lp_default':
         /**
          * @todo this functions need to belong to a class or a special
@@ -110,7 +110,7 @@ 
         $sidx  = isset($_REQUEST['sidx']) && !empty($_REQUEST['sidx']) ? $_REQUEST['sidx'] : 'id';
         $sord  = $_REQUEST['sord'];    //asc or desc
         if (!in_array($sord, array('asc','desc'))) {
-        	$sord = 'desc';
+            $sord = 'desc';
         }
         $session_id  = intval($_REQUEST['session_id']);
         $course_id   = intval($_REQUEST['course_id']);
@@ -124,7 +124,7 @@ 
                     $my_session_list[] = $item['id_session'];
             }
             if (!in_array($session_id, $my_session_list)) {
-            	break;
+                break;
             }
         }
 
@@ -445,7 +445,7 @@ 
                     $date = '-';
                 }
 
-                 //Checking LP publicated and expired_on dates
+                    //Checking LP publicated and expired_on dates
                 if (!empty($lp_item['publicated_on']) && $lp_item['publicated_on'] != '0000-00-00 00:00:00') {
                     if ($now < api_strtotime($lp_item['publicated_on'], 'UTC')) {
                         continue;
@@ -499,7 +499,7 @@ 
 
         echo json_encode($response);
         break;
-	default:
-		echo '';
+    default:
+        echo '';
 }
 exit;

Spacing +52 added lines, -52 removed lines

@@ -30,7 +30,7 @@ 
                     null,
                     true
                 );
-                $na_image   = str_replace('.png', '_na.png', $tool_image);
+                $na_image = str_replace('.png', '_na.png', $tool_image);
             }
 
             if (isset($tool_info['custom_icon']) && !empty($tool_info['custom_icon'])) {
@@ -38,20 +38,20 @@ 
                 $na_image = CourseHome::getCustomWebIconPath().CourseHome::getDisableIcon($tool_info['custom_icon']);
             }
 
-            $requested_image = ($tool_visibility == 0 ) ? $tool_image : $na_image;
-            $requested_class = ($tool_visibility == 0 ) ? 'visible' : 'invisible';
-            $requested_message = ($tool_visibility == 0 ) ? 'is_active' : 'is_inactive';
-            $requested_view = ($tool_visibility == 0 ) ? 'visible.png' : 'invisible.png';
-            $requested_visible = ($tool_visibility == 0 ) ? 1 : 0;
+            $requested_image = ($tool_visibility == 0) ? $tool_image : $na_image;
+            $requested_class = ($tool_visibility == 0) ? 'visible' : 'invisible';
+            $requested_message = ($tool_visibility == 0) ? 'is_active' : 'is_inactive';
+            $requested_view = ($tool_visibility == 0) ? 'visible.png' : 'invisible.png';
+            $requested_visible = ($tool_visibility == 0) ? 1 : 0;
 
-            $requested_view = ($tool_visibility == 0 ) ? 'visible.png' : 'invisible.png';
-            $requested_visible = ($tool_visibility == 0 ) ? 1 : 0;
+            $requested_view = ($tool_visibility == 0) ? 'visible.png' : 'invisible.png';
+            $requested_visible = ($tool_visibility == 0) ? 1 : 0;
 
             // HIDE AND REACTIVATE TOOL
             if ($_GET["id"] == strval(intval($_GET["id"]))) {
                 $sql = "UPDATE $tool_table SET
                         visibility = $requested_visible
-                        WHERE c_id = $course_id AND id='" . intval($_GET['id']) . "'";
+                        WHERE c_id = $course_id AND id='".intval($_GET['id'])."'";
                 Database::query($sql);
             }
             $response_data = array(
@@ -82,7 +82,7 @@ 
 		        WHERE c_id = ".$course_info['real_id']." AND session_id = 0
 		        ORDER BY id";
 		$result = Database::query($sql);
-		if (Database::num_rows($result) > 0 ) {
+		if (Database::num_rows($result) > 0) {
 		    while ($description = Database::fetch_object($result)) {
 			    $descriptions[$description->id] = $description;
 		    }
@@ -104,12 +104,12 @@ 
 
         require_once '../global.inc.php';
         $now = time();
-        $page  = intval($_REQUEST['page']);     //page
-        $limit = intval($_REQUEST['rows']);     // quantity of rows
+        $page  = intval($_REQUEST['page']); //page
+        $limit = intval($_REQUEST['rows']); // quantity of rows
         //index to filter
         $sidx  = isset($_REQUEST['sidx']) && !empty($_REQUEST['sidx']) ? $_REQUEST['sidx'] : 'id';
-        $sord  = $_REQUEST['sord'];    //asc or desc
-        if (!in_array($sord, array('asc','desc'))) {
+        $sord  = $_REQUEST['sord']; //asc or desc
+        if (!in_array($sord, array('asc', 'desc'))) {
         	$sord = 'desc';
         }
         $session_id  = intval($_REQUEST['session_id']);
@@ -119,7 +119,7 @@ 
         if (!api_is_platform_admin()) {
             $new_session_list = UserManager::get_personal_session_course_list(api_get_user_id());
             $my_session_list  = array();
-            foreach($new_session_list as $item) {
+            foreach ($new_session_list as $item) {
                 if (!empty($item['id_session']))
                     $my_session_list[] = $item['id_session'];
             }
@@ -128,7 +128,7 @@ 
             }
         }
 
-        $start = $limit*$page - $limit;
+        $start = $limit * $page - $limit;
         $course_list = SessionManager::get_course_list_by_session_id($session_id);
         $count = 0;
         $temp = array();
@@ -140,7 +140,7 @@ 
             $item['title'] = Display::url($item['title'], $course_url, array('target' => SESSION_LINK_TARGET));
 
             foreach ($flat_list as $lp_id => $lp_item) {
-                $temp[$count]['id']= $lp_id;
+                $temp[$count]['id'] = $lp_id;
 
                 $lp = new learnpath($item['code'], $lp_id, api_get_user_id());
                 if ($lp->progress_db == 100) {
@@ -203,27 +203,27 @@ 
         }
         $temp = msort($temp, $sidx, $sord);
 
-        $i =0;
+        $i = 0;
         $response = new stdClass();
-        foreach($temp as $key=>$row) {
+        foreach ($temp as $key=>$row) {
             $row = $row['cell'];
             if (!empty($row)) {
-                if ($key >= $start  && $key < ($start + $limit)) {
-                    $response->rows[$i]['id']= $key;
-                    $response->rows[$i]['cell']=array($row[0], $row[1], $row[2]);
+                if ($key >= $start && $key < ($start + $limit)) {
+                    $response->rows[$i]['id'] = $key;
+                    $response->rows[$i]['cell'] = array($row[0], $row[1], $row[2]);
                     $i++;
                 }
             }
         }
 
-        if($count > 0 && $limit > 0) {
-            $total_pages = ceil($count/$limit);
+        if ($count > 0 && $limit > 0) {
+            $total_pages = ceil($count / $limit);
         } else {
             $total_pages = 0;
         }
-        $response->total    = $total_pages;
+        $response->total = $total_pages;
         if ($page > $total_pages) {
-            $response->page= $total_pages;
+            $response->page = $total_pages;
         } else {
             $response->page = $page;
         }
@@ -234,13 +234,13 @@ 
         require_once '../global.inc.php';
         $now = time();
 
-        $page  = intval($_REQUEST['page']);     //page
-        $limit = intval($_REQUEST['rows']);     // quantity of rows
+        $page  = intval($_REQUEST['page']); //page
+        $limit = intval($_REQUEST['rows']); // quantity of rows
         $sidx  = isset($_REQUEST['sidx']) && !empty($_REQUEST['sidx']) ? $_REQUEST['sidx'] : 'course';
         $sidx = str_replace(array('week desc,', ' '), '', $sidx);
 
-        $sord  = $_REQUEST['sord'];    //asc or desc
-        if (!in_array($sord, array('asc','desc'))) {
+        $sord  = $_REQUEST['sord']; //asc or desc
+        if (!in_array($sord, array('asc', 'desc'))) {
             $sord = 'desc';
         }
 
@@ -251,7 +251,7 @@ 
         if (!api_is_platform_admin()) {
             $new_session_list = UserManager::get_personal_session_course_list(api_get_user_id());
             $my_session_list  = array();
-            foreach($new_session_list as $item) {
+            foreach ($new_session_list as $item) {
                 if (!empty($item['id_session']))
                     $my_session_list[] = $item['id_session'];
             }
@@ -260,7 +260,7 @@ 
             }
         }
 
-        $start = $limit*$page - $limit;
+        $start = $limit * $page - $limit;
         $course_list = SessionManager::get_course_list_by_session_id($session_id);
 
         $count = 0;
@@ -272,7 +272,7 @@ 
                 }
             }
 
-            $list = new LearnpathList(api_get_user_id(),$item['code'], $session_id, 'publicated_on DESC');
+            $list = new LearnpathList(api_get_user_id(), $item['code'], $session_id, 'publicated_on DESC');
             $flat_list = $list->get_flat_list();
             $lps[$item['code']] = $flat_list;
             $item['title'] = Display::url(
@@ -282,7 +282,7 @@ 
             );
 
             foreach ($flat_list as $lp_id => $lp_item) {
-                $temp[$count]['id']= $lp_id;
+                $temp[$count]['id'] = $lp_id;
                 $lp_url = api_get_path(WEB_CODE_PATH).'newscorm/lp_controller.php?cidReq='.$item['code'].'&id_session='.$session_id.'&lp_id='.$lp_id.'&action=view';
 
                 $last_date = Tracking::get_last_connection_date_on_the_course(
@@ -345,20 +345,20 @@ 
         }
 
         $response = new stdClass();
-        $i =0;
-        foreach($temp as $key=>$row) {
+        $i = 0;
+        foreach ($temp as $key=>$row) {
             $row = $row['cell'];
             if (!empty($row)) {
-                if ($key >= $start  && $key < ($start + $limit)) {
-                    $response->rows[$i]['id']= $key;
-                    $response->rows[$i]['cell']=array($row[0], $row[1], $row[2],$row[3]);
+                if ($key >= $start && $key < ($start + $limit)) {
+                    $response->rows[$i]['id'] = $key;
+                    $response->rows[$i]['cell'] = array($row[0], $row[1], $row[2], $row[3]);
                     $i++;
                 }
             }
         }
 
         if ($count > 0 && $limit > 0) {
-            $total_pages = ceil($count/$limit);
+            $total_pages = ceil($count / $limit);
         } else {
             $total_pages = 0;
         }
@@ -374,12 +374,12 @@ 
     case 'session_courses_lp_by_course':
         require_once '../global.inc.php';
         $now = time();
-        $page  = intval($_REQUEST['page']);     //page
-        $limit = intval($_REQUEST['rows']);     // quantity of rows
+        $page  = intval($_REQUEST['page']); //page
+        $limit = intval($_REQUEST['rows']); // quantity of rows
         $sidx = isset($_REQUEST['sidx']) && !empty($_REQUEST['sidx']) ? $_REQUEST['sidx'] : 'id';
         $sidx = str_replace(array('course asc,', ' '), '', $sidx);
 
-        $sord = $_REQUEST['sord'];    //asc or desc
+        $sord = $_REQUEST['sord']; //asc or desc
         if (!in_array($sord, array('asc', 'desc'))) {
             $sord = 'desc';
         }
@@ -390,7 +390,7 @@ 
         if (!api_is_platform_admin()) {
             $new_session_list = UserManager::get_personal_session_course_list(api_get_user_id());
             $my_session_list  = array();
-            foreach($new_session_list as $item) {
+            foreach ($new_session_list as $item) {
                 if (!empty($item['id_session']))
                     $my_session_list[] = $item['id_session'];
             }
@@ -399,7 +399,7 @@ 
             }
         }
 
-        $start = $limit*$page - $limit;
+        $start = $limit * $page - $limit;
         $course_list = SessionManager::get_course_list_by_session_id($session_id);
         $count = 0;
 
@@ -410,15 +410,15 @@ 
                 }
             }
 
-            $list = new LearnpathList(api_get_user_id(),$item['code'],$session_id);
+            $list = new LearnpathList(api_get_user_id(), $item['code'], $session_id);
             $flat_list = $list->get_flat_list();
             $lps[$item['code']] = $flat_list;
             $item['title'] = Display::url(
                 $item['title'],
                 api_get_path(WEB_COURSE_PATH).$item['directory'].'/?id_session='.$session_id, array('target'=>SESSION_LINK_TARGET)
             );
-            foreach($flat_list as $lp_id => $lp_item) {
-                $temp[$count]['id']= $lp_id;
+            foreach ($flat_list as $lp_id => $lp_item) {
+                $temp[$count]['id'] = $lp_id;
                 $lp_url = api_get_path(WEB_CODE_PATH).'newscorm/lp_controller.php?cidReq='.$item['code'].'&id_session='.$session_id.'&lp_id='.$lp_id.'&action=view';
                 $last_date = Tracking::get_last_connection_date_on_the_course(
                     api_get_user_id(),
@@ -472,13 +472,13 @@ 
         $temp = msort($temp, $sidx, $sord);
 
         $response = new stdClass();
-        $i =0;
+        $i = 0;
         foreach ($temp as $key=>$row) {
             $row = $row['cell'];
             if (!empty($row)) {
-                if ($key >= $start  && $key < ($start + $limit)) {
-                    $response->rows[$i]['id']= $key;
-                    $response->rows[$i]['cell']=array($row[0], $row[1], $row[2]);
+                if ($key >= $start && $key < ($start + $limit)) {
+                    $response->rows[$i]['id'] = $key;
+                    $response->rows[$i]['cell'] = array($row[0], $row[1], $row[2]);
                     $i++;
                 }
             }

main/inc/ajax/chat.ajax.php

Switch Indentation +49 added lines, -49 removed lines

@@ -55,56 +55,56 @@
 }
 
 switch ($action) {
-    case 'chatheartbeat':
-        $chat->heartbeat();
-        break;
-    case 'closechat':
-        $chat->close();
-        break;
-    case 'sendchat':
-        $chat->send(api_get_user_id(), $to_user_id, $message);
-        break;
-    case 'startchatsession':
-        $chat->startSession();
-        break;
-    case 'set_status':
-        $status = isset($_REQUEST['status']) ? intval($_REQUEST['status']) : 0;
-        $chat->setUserStatus($status);
-        break;
-    case 'create_room':
-        $room = VideoChat::getChatRoomByUsers(api_get_user_id(), $to_user_id);
-
-        if ($room === false) {
-            $createdRoom = VideoChat::createRoom(api_get_user_id(), $to_user_id);
-
-            if ($createdRoom === false) {
-                echo Display::return_message(get_lang('ChatRoomNotCreated'), 'error');
-                break;
+        case 'chatheartbeat':
+            $chat->heartbeat();
+            break;
+        case 'closechat':
+            $chat->close();
+            break;
+        case 'sendchat':
+            $chat->send(api_get_user_id(), $to_user_id, $message);
+            break;
+        case 'startchatsession':
+            $chat->startSession();
+            break;
+        case 'set_status':
+            $status = isset($_REQUEST['status']) ? intval($_REQUEST['status']) : 0;
+            $chat->setUserStatus($status);
+            break;
+        case 'create_room':
+            $room = VideoChat::getChatRoomByUsers(api_get_user_id(), $to_user_id);
+
+            if ($room === false) {
+                $createdRoom = VideoChat::createRoom(api_get_user_id(), $to_user_id);
+
+                if ($createdRoom === false) {
+                    echo Display::return_message(get_lang('ChatRoomNotCreated'), 'error');
+                    break;
+                }
+
+                $room = VideoChat::getChatRoomByUsers(api_get_user_id(), $to_user_id);
             }
 
-            $room = VideoChat::getChatRoomByUsers(api_get_user_id(), $to_user_id);
-        }
-
-        $videoChatUrl = api_get_path(WEB_LIBRARY_JS_PATH) . "chat/video.php?room={$room['id']}";
-        $videoChatLink = Display::url(
-            Display::returnFontAwesomeIcon('video-camera') . get_lang('StartVideoChat'),
-            $videoChatUrl
-        );
-
-        $chat->send(
-            api_get_user_id(),
-            $to_user_id,
-            $videoChatLink,
-            false,
-            false
-        );
-
-        echo Display::tag('p', $videoChatLink, ['class' => 'lead']);
-        break;
-    case 'notify_not_support':
-        $chat->send(api_get_user_id(), $to_user_id, get_lang('TheXUserBrowserDoesNotSupportWebRTC'));
-        break;
-    default:
-        echo '';
+            $videoChatUrl = api_get_path(WEB_LIBRARY_JS_PATH) . "chat/video.php?room={$room['id']}";
+            $videoChatLink = Display::url(
+                Display::returnFontAwesomeIcon('video-camera') . get_lang('StartVideoChat'),
+                $videoChatUrl
+            );
+
+            $chat->send(
+                api_get_user_id(),
+                $to_user_id,
+                $videoChatLink,
+                false,
+                false
+            );
+
+            echo Display::tag('p', $videoChatLink, ['class' => 'lead']);
+            break;
+        case 'notify_not_support':
+            $chat->send(api_get_user_id(), $to_user_id, get_lang('TheXUserBrowserDoesNotSupportWebRTC'));
+            break;
+        default:
+            echo '';
 }
 exit;

Spacing +5 added lines, -5 removed lines

@@ -5,7 +5,7 @@ 
  * Responses to AJAX calls
  */
 
-$_dont_save_user_course_access  = true;
+$_dont_save_user_course_access = true;
 
 require_once '../global.inc.php';
 
@@ -34,7 +34,7 @@ 
 }
 
 $to_user_id = isset($_REQUEST['to']) ? $_REQUEST['to'] : null;
-$message	= isset($_REQUEST['message']) ? $_REQUEST['message'] : null;
+$message = isset($_REQUEST['message']) ? $_REQUEST['message'] : null;
 
 if (!isset($_SESSION['chatHistory'])) {
     $_SESSION['chatHistory'] = array();
@@ -45,7 +45,7 @@ 
 }
 
 $chat = new Chat();
-if (chat::disableChat()){
+if (chat::disableChat()) {
     exit;
 }
 if ($chat->is_chat_blocked_by_exercises()) {
@@ -85,9 +85,9 @@ 
             $room = VideoChat::getChatRoomByUsers(api_get_user_id(), $to_user_id);
         }
 
-        $videoChatUrl = api_get_path(WEB_LIBRARY_JS_PATH) . "chat/video.php?room={$room['id']}";
+        $videoChatUrl = api_get_path(WEB_LIBRARY_JS_PATH)."chat/video.php?room={$room['id']}";
         $videoChatLink = Display::url(
-            Display::returnFontAwesomeIcon('video-camera') . get_lang('StartVideoChat'),
+            Display::returnFontAwesomeIcon('video-camera').get_lang('StartVideoChat'),
             $videoChatUrl
         );
 

main/inc/ajax/myspace.ajax.php

Spacing +3 added lines, -3 removed lines

@@ -58,9 +58,9 @@
             $db['is_empty'] = false;
             $db['result'] = convert_to_string($sql_result);
             $rst = get_stats($user_id, $course_code, $start_date, $end_date);
-            $foo_stats = '<strong>' . get_lang('Total') . ': </strong>' . $rst['total'] . '<br />';
-            $foo_stats .= '<strong>' . get_lang('Average') . ': </strong>' . $rst['avg'] . '<br />';
-            $foo_stats .= '<strong>' . get_lang('Quantity') . ' : </strong>' . $rst['times'] . '<br />';
+            $foo_stats = '<strong>'.get_lang('Total').': </strong>'.$rst['total'].'<br />';
+            $foo_stats .= '<strong>'.get_lang('Average').': </strong>'.$rst['avg'].'<br />';
+            $foo_stats .= '<strong>'.get_lang('Quantity').' : </strong>'.$rst['times'].'<br />';
             $db['stats'] = $foo_stats;
             $db['graph_result'] = grapher($sql_result, $start_date, $end_date, $type);
         } else {

main/inc/ajax/user_manager.ajax.php

Spacing +7 added lines, -7 removed lines

@@ -58,7 +58,7 @@ 
                 <div class="row">
                     <div class="col-sm-10 col-sm-offset-2">
                         <a class="btn btn-primary" id="send_message_link">
-                            <em class="fa fa-envelope"></em> ' . get_lang('Send') . '
+                            <em class="fa fa-envelope"></em> ' . get_lang('Send').'
                         </a>
                     </div>
                 </div>
@@ -112,7 +112,7 @@ 
 
             if (!empty($user_id)) {
                 $user_table = Database :: get_main_table(TABLE_MAIN_USER);
-                $sql="UPDATE $user_table SET active='".$status."' WHERE user_id='".$user_id."'";
+                $sql = "UPDATE $user_table SET active='".$status."' WHERE user_id='".$user_id."'";
                 $result = Database::query($sql);
 
                 //Send and email if account is active
@@ -122,13 +122,13 @@ 
                     $emailsubject = '['.api_get_setting('siteName').'] '.get_lang('YourReg').' '.api_get_setting('siteName');
                     $email_admin = api_get_setting('emailAdministrator');
                     $sender_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS);
-                    $emailbody=get_lang('Dear')." ".stripslashes($recipient_name).",\n\n";
+                    $emailbody = get_lang('Dear')." ".stripslashes($recipient_name).",\n\n";
 
-                    $emailbody.=sprintf(get_lang('YourAccountOnXHasJustBeenApprovedByOneOfOurAdministrators'), api_get_setting('siteName'))."\n";
-                    $emailbody.=sprintf(get_lang('YouCanNowLoginAtXUsingTheLoginAndThePasswordYouHaveProvided'), api_get_path(WEB_PATH)).",\n\n";
-                    $emailbody.=get_lang('HaveFun')."\n\n";
+                    $emailbody .= sprintf(get_lang('YourAccountOnXHasJustBeenApprovedByOneOfOurAdministrators'), api_get_setting('siteName'))."\n";
+                    $emailbody .= sprintf(get_lang('YouCanNowLoginAtXUsingTheLoginAndThePasswordYouHaveProvided'), api_get_path(WEB_PATH)).",\n\n";
+                    $emailbody .= get_lang('HaveFun')."\n\n";
                     //$emailbody.=get_lang('Problem'). "\n\n". get_lang('SignatureFormula');
-                    $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');
+                    $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');
 
                     $additionalParameters = array(
                         'smsType' => SmsPlugin::ACCOUNT_APPROVED_CONNECT,

main/inc/ajax/thematic.ajax.php

Indentation +74 added lines, -74 removed lines

@@ -11,8 +11,8 @@ 
 $thematic = new Thematic();
 
 switch ($action) {
-	case 'save_thematic_plan':
-		/*$title_list         = $_REQUEST['title'];
+    case 'save_thematic_plan':
+        /*$title_list         = $_REQUEST['title'];
 		$description_list   = $_REQUEST['desc'];
 		//$description_list   = $_REQUEST['description'];
 		$description_type   = $_REQUEST['description_type'];
@@ -25,13 +25,13 @@ 
 		$thematic_plan_data = $thematic->get_thematic_plan_data();
 		$return = $thematic->get_thematic_plan_div($thematic_plan_data);
 		echo $return[$_REQUEST['thematic_id']];*/
-		break;
-	case 'save_thematic_advance':
-		if (!api_is_allowed_to_edit(null, true)) {
-			echo '';
-			exit;
-		}
-		/*
+        break;
+    case 'save_thematic_advance':
+        if (!api_is_allowed_to_edit(null, true)) {
+            echo '';
+            exit;
+        }
+        /*
         if (($_REQUEST['start_date_type'] == 1 && empty($_REQUEST['start_date_by_attendance'])) || (!empty($_REQUEST['duration_in_hours']) && !is_numeric($_REQUEST['duration_in_hours'])) ) {
             if ($_REQUEST['start_date_type'] == 1 && empty($_REQUEST['start_date_by_attendance'])) {
                 $start_date_error = true;
@@ -79,80 +79,80 @@ 
         $thematic_advance_data = $thematic->get_thematic_advance_list(null, null, true);
         $return = $thematic->get_thematic_advance_div($thematic_advance_data);
         echo $return[$_REQUEST['thematic_id']][$_REQUEST['thematic_advance_id']];*/
-		break;
-	case 'get_datetime_by_attendance':
-		$attendance_id       = intval($_REQUEST['attendance_id']);
-		$thematic_advance_id = intval($_REQUEST['thematic_advance_id']);
+        break;
+    case 'get_datetime_by_attendance':
+        $attendance_id       = intval($_REQUEST['attendance_id']);
+        $thematic_advance_id = intval($_REQUEST['thematic_advance_id']);
 
-		$label = '';
-		$input_select = '';
-		if (!empty($attendance_id)) {
-			$attendance = new Attendance();
-			$thematic   = new Thematic();
-			$thematic_list = $thematic->get_thematic_list();
+        $label = '';
+        $input_select = '';
+        if (!empty($attendance_id)) {
+            $attendance = new Attendance();
+            $thematic   = new Thematic();
+            $thematic_list = $thematic->get_thematic_list();
 
-			$my_list = $thematic_list_temp = array();
-			foreach ($thematic_list as $item) {
-				$my_list = $thematic->get_thematic_advance_by_thematic_id($item['id']);
-				$thematic_list_temp = array_merge($my_list, $thematic_list_temp);
-			}
-			$new_thematic_list = array();
+            $my_list = $thematic_list_temp = array();
+            foreach ($thematic_list as $item) {
+                $my_list = $thematic->get_thematic_advance_by_thematic_id($item['id']);
+                $thematic_list_temp = array_merge($my_list, $thematic_list_temp);
+            }
+            $new_thematic_list = array();
 
-			foreach($thematic_list_temp as $item) {
-				if (!empty($item['attendance_id']) ) {
-					$new_thematic_list[$item['id']] = array('attendance_id' =>$item['attendance_id'], 'start_date'=>$item['start_date']);
-				}
-			}
+            foreach($thematic_list_temp as $item) {
+                if (!empty($item['attendance_id']) ) {
+                    $new_thematic_list[$item['id']] = array('attendance_id' =>$item['attendance_id'], 'start_date'=>$item['start_date']);
+                }
+            }
 
-			$attendance_calendar = $attendance->get_attendance_calendar($attendance_id);
+            $attendance_calendar = $attendance->get_attendance_calendar($attendance_id);
 
-			$label = get_lang('StartDate');
-			if (!empty($attendance_calendar)) {
-				$input_select .= '<select id="start_date_select_calendar" name="start_date_by_attendance" size="5">';
-				foreach ($attendance_calendar as $calendar) {
-					$selected = null;
-					$insert = true;
-					//checking if was already taken
-					foreach ($new_thematic_list as $key => $thematic_item) {
-						//if ($calendar['db_date_time'] == $thematic_item['start_date'] && $calendar['attendance_id'] == $thematic_item['attendance_id'] ) {
-						if ($calendar['db_date_time'] == $thematic_item['start_date'] ) {
-							$insert = false;
-							if ($thematic_advance_id == $key) {
-								$insert = true;
-								$selected = 'selected';
-							}
-							break;
-						}
-					}
-					if ($insert == true) {
-						$input_select .= '<option '.$selected.' value="'.$calendar['date_time'].'">'.$calendar['date_time'].'</option>';
-					}
-				}
-				$input_select .= '</select>';
-			} else {
-				$input_select .= '<em>'.get_lang('ThereAreNoRegisteredDatetimeYet').'</em>';
-			}
-		}
-		?>
+            $label = get_lang('StartDate');
+            if (!empty($attendance_calendar)) {
+                $input_select .= '<select id="start_date_select_calendar" name="start_date_by_attendance" size="5">';
+                foreach ($attendance_calendar as $calendar) {
+                    $selected = null;
+                    $insert = true;
+                    //checking if was already taken
+                    foreach ($new_thematic_list as $key => $thematic_item) {
+                        //if ($calendar['db_date_time'] == $thematic_item['start_date'] && $calendar['attendance_id'] == $thematic_item['attendance_id'] ) {
+                        if ($calendar['db_date_time'] == $thematic_item['start_date'] ) {
+                            $insert = false;
+                            if ($thematic_advance_id == $key) {
+                                $insert = true;
+                                $selected = 'selected';
+                            }
+                            break;
+                        }
+                    }
+                    if ($insert == true) {
+                        $input_select .= '<option '.$selected.' value="'.$calendar['date_time'].'">'.$calendar['date_time'].'</option>';
+                    }
+                }
+                $input_select .= '</select>';
+            } else {
+                $input_select .= '<em>'.get_lang('ThereAreNoRegisteredDatetimeYet').'</em>';
+            }
+        }
+        ?>
 		<div class="form-group">
 			<label class="col-sm-2 control-label"><?php echo $label ?></label>
 			<div class="col-sm-10"><?php echo $input_select ?></div>
 		</div>
 		<?php
-		break;
-	case 'update_done_thematic_advance':
-		$thematic_advance_id = intval($_GET['thematic_advance_id']);
-		$total_average = 0;
-		if (!empty($thematic_advance_id)) {
-			$thematic = new Thematic();
-			$affected_rows  = $thematic->update_done_thematic_advances($thematic_advance_id);
-			//if ($affected_rows) {
-			$total_average  = $thematic->get_total_average_of_thematic_advances(api_get_course_id(), api_get_session_id());
-			//}
-		}
-		echo $total_average;
-		break;
-	default:
-		echo '';
+        break;
+    case 'update_done_thematic_advance':
+        $thematic_advance_id = intval($_GET['thematic_advance_id']);
+        $total_average = 0;
+        if (!empty($thematic_advance_id)) {
+            $thematic = new Thematic();
+            $affected_rows  = $thematic->update_done_thematic_advances($thematic_advance_id);
+            //if ($affected_rows) {
+            $total_average  = $thematic->get_total_average_of_thematic_advances(api_get_course_id(), api_get_session_id());
+            //}
+        }
+        echo $total_average;
+        break;
+    default:
+        echo '';
 }
 exit;

Spacing +3 added lines, -3 removed lines

@@ -98,8 +98,8 @@ 
 			}
 			$new_thematic_list = array();
 
-			foreach($thematic_list_temp as $item) {
-				if (!empty($item['attendance_id']) ) {
+			foreach ($thematic_list_temp as $item) {
+				if (!empty($item['attendance_id'])) {
 					$new_thematic_list[$item['id']] = array('attendance_id' =>$item['attendance_id'], 'start_date'=>$item['start_date']);
 				}
 			}
@@ -115,7 +115,7 @@ 
 					//checking if was already taken
 					foreach ($new_thematic_list as $key => $thematic_item) {
 						//if ($calendar['db_date_time'] == $thematic_item['start_date'] && $calendar['attendance_id'] == $thematic_item['attendance_id'] ) {
-						if ($calendar['db_date_time'] == $thematic_item['start_date'] ) {
+						if ($calendar['db_date_time'] == $thematic_item['start_date']) {
 							$insert = false;
 							if ($thematic_advance_id == $key) {
 								$insert = true;

main/inc/ajax/model.ajax.php

Indentation +2 added lines, -2 removed lines

@@ -731,7 +731,7 @@ 
         }
 
         break;
-	case 'get_user_skill_ranking':
+    case 'get_user_skill_ranking':
         $columns = array('photo', 'firstname', 'lastname', 'skills_acquired', 'currently_learning', 'rank');
         $result = $skill->get_user_list_skill_ranking($start, $limit, $sidx, $sord, $whereCondition);
         $result = msort($result, 'skills_acquired', 'asc');
@@ -1281,7 +1281,7 @@ 
 
             if (!empty($item['certif_min_score']) && !empty($item['document_id'])) {
                 $item['certificates'] = Display::return_icon('accept.png', get_lang('WithCertificate'), array(), ICON_SIZE_SMALL);
-                 $item['has_certificates'] = '1';
+                    $item['has_certificates'] = '1';
             } else {
                 $item['certificates'] = Display::return_icon('warning.png', get_lang('NoCertificate'), array(), ICON_SIZE_SMALL);
                 $item['has_certificates'] = '0';

Spacing +43 added lines, -43 removed lines

@@ -11,8 +11,8 @@ 
 $action = $_GET['a'];
 $page = intval($_REQUEST['page']); //page
 $limit = intval($_REQUEST['rows']); //quantity of rows
-$sidx = $_REQUEST['sidx'];         //index (field) to filter
-$sord = $_REQUEST['sord'];         //asc or desc
+$sidx = $_REQUEST['sidx']; //index (field) to filter
+$sord = $_REQUEST['sord']; //asc or desc
 
 if (strpos(strtolower($sidx), 'asc') !== false) {
     $sidx = str_replace(array('asc', ','), '', $sidx);
@@ -24,7 +24,7 @@ 
     $sord = 'desc';
 }
 
-if (!in_array($sord, array('asc','desc'))) {
+if (!in_array($sord, array('asc', 'desc'))) {
     $sord = 'desc';
 }
 
@@ -64,19 +64,19 @@ 
 function getWhereClause($col, $oper, $val)
 {
     $ops = array(
-        'eq' => '=',        //equal
-        'ne' => '<>',       //not equal
-        'lt' => '<',        //less than
-        'le' => '<=',       //less than or equal
-        'gt' => '>',        //greater than
-        'ge' => '>=',       //greater than or equal
-        'bw' => 'LIKE',     //begins with
+        'eq' => '=', //equal
+        'ne' => '<>', //not equal
+        'lt' => '<', //less than
+        'le' => '<=', //less than or equal
+        'gt' => '>', //greater than
+        'ge' => '>=', //greater than or equal
+        'bw' => 'LIKE', //begins with
         'bn' => 'NOT LIKE', //doesn't begin with
-        'in' => 'LIKE',     //is in
+        'in' => 'LIKE', //is in
         'ni' => 'NOT LIKE', //is not in
-        'ew' => 'LIKE',     //ends with
+        'ew' => 'LIKE', //ends with
         'en' => 'NOT LIKE', //doesn't end with
-        'cn' => 'LIKE',     //contains
+        'cn' => 'LIKE', //contains
         'nc' => 'NOT LIKE'  //doesn't contain
     );
 
@@ -100,10 +100,10 @@ 
 
 // If there is no search request sent by jqgrid, $where should be empty
 $whereCondition = null;
-$operation = isset($_REQUEST['oper'])  ? $_REQUEST['oper']  : false;
-$exportFormat = isset($_REQUEST['export_format'])  ? $_REQUEST['export_format']  : 'csv';
-$searchField = isset($_REQUEST['searchField'])  ? $_REQUEST['searchField']  : false;
-$searchOperator = isset($_REQUEST['searchOper'])   ? $_REQUEST['searchOper']   : false;
+$operation = isset($_REQUEST['oper']) ? $_REQUEST['oper'] : false;
+$exportFormat = isset($_REQUEST['export_format']) ? $_REQUEST['export_format'] : 'csv';
+$searchField = isset($_REQUEST['searchField']) ? $_REQUEST['searchField'] : false;
+$searchOperator = isset($_REQUEST['searchOper']) ? $_REQUEST['searchOper'] : false;
 $searchString = isset($_REQUEST['searchString']) ? $_REQUEST['searchString'] : false;
 $search = isset($_REQUEST['_search']) ? $_REQUEST['_search'] : false;
 $forceSearch = isset($_REQUEST['_force_search']) ? $_REQUEST['_force_search'] : false;
@@ -167,7 +167,7 @@ 
             foreach ($filters->rules as $key => $rule) {
                 $whereCondition .= getWhereClause($rule->field, $rule->op, $rule->data);
 
-                if ($counter < count($filters->rules) -1) {
+                if ($counter < count($filters->rules) - 1) {
                     $whereCondition .= $filters->groupOp;
                 }
                 $counter++;
@@ -201,7 +201,7 @@ 
 
         $sessionId = isset($_GET['session_id']) ? intval($_GET['session_id']) : 0;
         $courseCodeList = array();
-        $userIdList  = array();
+        $userIdList = array();
         $sessionIdList = [];
         $searchByGroups = false;
         if (api_is_drh()) {
@@ -554,7 +554,7 @@ 
 $total_pages = 0;
 if ($count > 0) {
     if (!empty($limit)) {
-        $total_pages = ceil((float)$count/(float)$limit);
+        $total_pages = ceil((float) $count / (float) $limit);
     }
 }
 if ($page > $total_pages) {
@@ -806,7 +806,7 @@ 
         $result = getWorkListStudent($start, $limit, $sidx, $sord, $whereCondition);
         break;
     case 'get_work_user_list_all':
-        if (isset($_GET['type'])  && $_GET['type'] == 'simple') {
+        if (isset($_GET['type']) && $_GET['type'] == 'simple') {
             $columns = array(
                 //'type',
                 'firstname',
@@ -833,18 +833,18 @@ 
         $result = get_work_user_list($start, $limit, $sidx, $sord, $work_id, $whereCondition);
         break;
     case 'get_work_user_list_others':
-        if (isset($_GET['type'])  && $_GET['type'] == 'simple') {
+        if (isset($_GET['type']) && $_GET['type'] == 'simple') {
             $columns = array(
-                'type', 'firstname', 'lastname',  'title', 'qualification', 'sent_date', 'qualificator_id', 'actions'
+                'type', 'firstname', 'lastname', 'title', 'qualification', 'sent_date', 'qualificator_id', 'actions'
             );
         } else {
-            $columns = array('type', 'firstname', 'lastname',  'title', 'sent_date', 'actions');
+            $columns = array('type', 'firstname', 'lastname', 'title', 'sent_date', 'actions');
         }
         $whereCondition .= " AND u.user_id <> ".api_get_user_id();
         $result = get_work_user_list($start, $limit, $sidx, $sord, $work_id, $whereCondition);
         break;
     case 'get_work_user_list':
-        if (isset($_GET['type'])  && $_GET['type'] == 'simple') {
+        if (isset($_GET['type']) && $_GET['type'] == 'simple') {
             $columns = array(
                 'type', 'title', 'qualification', 'sent_date', 'qualificator_id', 'actions'
             );
@@ -872,10 +872,10 @@ 
     case 'get_exercise_results':
         $course = api_get_course_info();
         // Used inside ExerciseLib::get_exam_results_data()
-        $documentPath = api_get_path(SYS_COURSE_PATH) . $course['path'] . "/document";
+        $documentPath = api_get_path(SYS_COURSE_PATH).$course['path']."/document";
         if ($is_allowedToEdit || api_is_student_boss()) {
             $columns = array(
-                'firstname', 'lastname', 'username', 'group_name', 'exe_duration', 'start_date', 'exe_date', 'score',  'user_ip', 'status', 'lp', 'actions'
+                'firstname', 'lastname', 'username', 'group_name', 'exe_duration', 'start_date', 'exe_date', 'score', 'user_ip', 'status', 'lp', 'actions'
             );
             $officialCodeInList = api_get_setting('show_official_code_exercise_result_list');
             if ($officialCodeInList === 'true') {
@@ -886,11 +886,11 @@ 
         break;
     case 'get_hotpotatoes_exercise_results':
         $course = api_get_course_info();
-        $documentPath = api_get_path(SYS_COURSE_PATH) . $course['path'] . "/document";
+        $documentPath = api_get_path(SYS_COURSE_PATH).$course['path']."/document";
         if (api_is_allowed_to_edit()) {
-            $columns = array('firstname', 'lastname', 'username', 'group_name', 'exe_date',  'score', 'actions');
+            $columns = array('firstname', 'lastname', 'username', 'group_name', 'exe_date', 'score', 'actions');
         } else {
-            $columns = array('exe_date',  'score', 'actions');
+            $columns = array('exe_date', 'score', 'actions');
         }
         $result = ExerciseLib::get_exam_results_hotpotatoes_data($start, $limit, $sidx, $sord, $hotpot_path, $whereCondition);
         break;
@@ -916,12 +916,12 @@ 
         break;
     case 'get_hotpotatoes_exercise_results':
         $course = api_get_course_info();
-        $documentPath = api_get_path(SYS_COURSE_PATH) . $course['path'] . "/document";
+        $documentPath = api_get_path(SYS_COURSE_PATH).$course['path']."/document";
 
         if (api_is_allowed_to_edit(null, true) || api_is_drh()) {
-            $columns = array('firstname', 'lastname', 'username', 'group_name', 'exe_date',  'score', 'actions');
+            $columns = array('firstname', 'lastname', 'username', 'group_name', 'exe_date', 'score', 'actions');
         } else {
-            $columns = array('exe_date',  'score', 'actions');
+            $columns = array('exe_date', 'score', 'actions');
         }
         $result = ExerciseLib::get_exam_results_hotpotatoes_data($start, $limit, $sidx, $sord, $hotpot_path, $whereCondition);
         break;
@@ -950,7 +950,7 @@ 
             );
         }
 
-        $columns =  array(
+        $columns = array(
             'name',
             'date',
             'course_per_session',
@@ -986,11 +986,11 @@ 
                 $detailButtons = [];
                 $detailButtons[] = Display::url(
                     Display::return_icon('works.png', get_lang('WorksReport')),
-                    api_get_path(WEB_CODE_PATH) . 'mySpace/works_in_session_report.php?session=' . $session['id']
+                    api_get_path(WEB_CODE_PATH).'mySpace/works_in_session_report.php?session='.$session['id']
                 );
                 $detailButtons[] = Display::url(
                     Display::return_icon('2rightarrow.png'),
-                    api_get_path(WEB_CODE_PATH) . 'mySpace/course.php?session_id=' . $session['id']
+                    api_get_path(WEB_CODE_PATH).'mySpace/course.php?session_id='.$session['id']
                 );
 
                 $result[] = array(
@@ -1306,7 +1306,7 @@ 
         $result = $new_result;
         break;
     case 'get_gradebooks':
-        $columns = array('name', 'certificates','skills', 'actions', 'has_certificates');
+        $columns = array('name', 'certificates', 'skills', 'actions', 'has_certificates');
         if (!in_array($sidx, $columns)) {
             $sidx = 'name';
         }
@@ -1476,7 +1476,7 @@ 
                     if (!empty($exercises[$cnt - 4]['title'])) {
                         $title = ucwords(strtolower(trim($exercises[$cnt - 4]['title'])));
                     }
-                    $columns[] = 'exer' . $i;
+                    $columns[] = 'exer'.$i;
                     $column_names[] = $title;
                     $i++;
                     break;
@@ -1509,7 +1509,7 @@ 
             $sessionInfo = SessionManager::fetch($listUserSess[$user['user_id']]['id_session']);
             $result[$i]['session'] = $sessionInfo['name'];
             $result[$i]['username'] = $user['username'];
-            $result[$i]['name'] = $user['lastname'] . " " . $user['firstname'];
+            $result[$i]['name'] = $user['lastname']." ".$user['firstname'];
             $j = 1;
             $finalScore = 0;
             foreach ($quizIds as $quizID) {
@@ -1517,7 +1517,7 @@ 
                 if (!empty($arrGrade [$user['user_id']][$quizID]) || $arrGrade [$user['user_id']][$quizID] == 0) {
                     $finalScore += $grade = $arrGrade [$user['user_id']][$quizID];
                 }
-                $result[$i]['exer' . $j] = $grade;
+                $result[$i]['exer'.$j] = $grade;
                 $j++;
             }
 
@@ -1689,9 +1689,9 @@ 
         foreach ($result as $row) {
             // if results tab give not id, set id to $i otherwise id="null" for all <tr> of the jqgrid - ref #4235
             if (!isset($row['id']) || isset($row['id']) && $row['id'] == '') {
-                $response->rows[$i]['id']= $i;
+                $response->rows[$i]['id'] = $i;
             } else {
-                $response->rows[$i]['id']= $row['id'];
+                $response->rows[$i]['id'] = $row['id'];
             }
             $array = array();
             foreach ($columns as $col) {
@@ -1701,7 +1701,7 @@ 
                     $array[] = isset($row[$col]) ? Security::remove_XSS($row[$col]) : '';
                 }
             }
-            $response->rows[$i]['cell']=$array;
+            $response->rows[$i]['cell'] = $array;
             $i++;
         }
     }

main/inc/local.inc.php

Indentation +1 added lines, -1 removed lines

@@ -758,7 +758,7 @@
     //    $gidReset = true;
 } // end else
 
- // Now check for anonymous user mode
+    // Now check for anonymous user mode
 if (isset($use_anonymous) && $use_anonymous) {
     //if anonymous mode is set, then try to set the current user as anonymous
     //if he doesn't have a login yet

Spacing +21 added lines, -21 removed lines

@@ -130,7 +130,7 @@ 
     $_user['status']  = $uData['status'];
     Session::write('_user', $_user);
     Session::erase('conditional_login');
-    $uidReset=true;
+    $uidReset = true;
     Event::event_login($_user['user_id']);
 }
 
@@ -212,7 +212,7 @@ 
 
             //is necessary verify check
             if ($legal_type == 1) {
-                if ((isset($_POST['legal_accept']) && $_POST['legal_accept']=='1')) {
+                if ((isset($_POST['legal_accept']) && $_POST['legal_accept'] == '1')) {
                     $legal_option = true;
                 } else {
                     $legal_option = false;
@@ -221,7 +221,7 @@ 
 
             //no is check option
             if ($legal_type == 0) {
-                $legal_option=true;
+                $legal_option = true;
             }
 
             if (isset($_POST['legal_accept_type']) && $legal_option === true) {
@@ -514,7 +514,7 @@ 
                  * Process external authentication
                  * on the basis of the given login name
                  */
-                $loginFailed = true;  // Default initialisation. It could
+                $loginFailed = true; // Default initialisation. It could
                 // change after the external authentication
                 $key = $uData['auth_source']; //'ldap','shibboleth'...
                 /* >>>>>>>> External authentication modules <<<<<<<<< */
@@ -533,7 +533,7 @@ 
             }
         } else {
             // login failed, Database::num_rows($result) <= 0
-            $loginFailed = true;  // Default initialisation. It could
+            $loginFailed = true; // Default initialisation. It could
             // change after the external authentication
 
             /*
@@ -559,7 +559,7 @@ 
                         include_once($thisAuthSource['newUser']);
                     } else {
                         error_log(
-                            'Chamilo Authentication external file' .
+                            'Chamilo Authentication external file'.
                             ' could not be found - this might prevent your system from using'.
                             ' the authentication process in the user creation process',
                             0
@@ -668,7 +668,7 @@ 
             online_logout(null, false);
             $osso->logout(); //redirects and exits
         }
-    } elseif (api_get_setting('openid_authentication')=='true') {
+    } elseif (api_get_setting('openid_authentication') == 'true') {
         if (!empty($_POST['openid_url'])) {
             include api_get_path(SYS_CODE_PATH).'auth/openid/login.php';
             openid_begin(trim($_POST['openid_url']), api_get_path(WEB_PATH).'index.php');
@@ -681,7 +681,7 @@ 
             if ($res['status'] == 'success') {
                 $id1 = Database::escape_string($res['openid.identity']);
                 //have another id with or without the final '/'
-                $id2 = (substr($id1, -1, 1)=='/'?substr($id1, 0, -1):$id1.'/');
+                $id2 = (substr($id1, -1, 1) == '/' ? substr($id1, 0, -1) : $id1.'/');
                 //lookup the user in the main database
                 $user_table = Database::get_main_table(TABLE_MAIN_USER);
                 $sql = "SELECT user_id, username, password, auth_source, active, expiration_date
@@ -690,14 +690,14 @@ 
                         OR openid = '$id2' ";
                 $result = Database::query($sql);
                 if ($result !== false) {
-                    if (Database::num_rows($result)>0) {
+                    if (Database::num_rows($result) > 0) {
                         $uData = Database::fetch_array($result);
 
                         if ($uData['auth_source'] == PLATFORM_AUTH_SOURCE) {
                             //the authentification of this user is managed by Chamilo itself
 
                             // check if the account is active (not locked)
-                            if ($uData['active']=='1') {
+                            if ($uData['active'] == '1') {
                                 // check if the expiration date has not been reached
                                 if ($uData['expiration_date'] > date('Y-m-d H:i:s')
                                     || empty($uData['expiration_date'])
@@ -775,7 +775,7 @@ 
     (isset($_SESSION['_cid']) && $cidReq != $_SESSION['_cid']))
 ) {
     $cidReset = true;
-    $gidReset = true;    // As groups depend from courses, group id is reset
+    $gidReset = true; // As groups depend from courses, group id is reset
 }
 
 /* USER INIT */
@@ -925,8 +925,8 @@ 
             $tbl_session_course_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
 
             if (!empty($_GET['id_session'])) {
-                $sql = 'SELECT name FROM '.$tbl_session . '
-                        WHERE id="'.intval($_GET['id_session']) . '"';
+                $sql = 'SELECT name FROM '.$tbl_session.'
+                        WHERE id="'.intval($_GET['id_session']).'"';
                 $rs = Database::query($sql);
                 if (Database::num_rows($rs)) {
                     list($_SESSION['session_name']) = Database::fetch_array(
@@ -1016,7 +1016,7 @@ 
         // Moreover, if we want to track a course with another session it can be usefull
         if (!empty($_GET['id_session']) && is_numeric($_GET['id_session'])) {
             $tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
-            $sql = 'SELECT name FROM '.$tbl_session . ' WHERE id="'.intval($_GET['id_session']). '"';
+            $sql = 'SELECT name FROM '.$tbl_session.' WHERE id="'.intval($_GET['id_session']).'"';
             $rs = Database::query($sql);
             if (Database::num_rows($rs)) {
                 list($_SESSION['session_name']) = Database::fetch_array($rs);
@@ -1097,8 +1097,8 @@ 
         if (Database::num_rows($result) > 0) { // this  user have a recorded state for this course
             $cuData = Database::fetch_array($result, 'ASSOC');
 
-            $is_courseAdmin = (bool)($cuData['status'] == 1);
-            $is_courseTutor = (bool)($cuData['is_tutor'] == 1);
+            $is_courseAdmin = (bool) ($cuData['status'] == 1);
+            $is_courseTutor = (bool) ($cuData['is_tutor'] == 1);
             $is_courseMember = true;
         }
 
@@ -1109,7 +1109,7 @@ 
                 // This user has no status related to this course
                 // The user is subscribed in a session? The user is a Session coach a Session admin ?
 
-                $tbl_session  = Database :: get_main_table(TABLE_MAIN_SESSION);
+                $tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION);
                 $tbl_session_course = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE);
                 $tbl_session_course_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
 
@@ -1222,7 +1222,7 @@ 
 
             //If I'm the admin platform i'm a teacher of the course
             if ($is_platformAdmin) {
-                $is_courseAdmin     = true;
+                $is_courseAdmin = true;
             }
         }
     } else { // keys missing => not anymore in the course - user relation
@@ -1380,12 +1380,12 @@ 
     ($logging_in && exist_firstpage_parameter())
 ) {
     $redirectCourseDir = api_get_firstpage_parameter();
-    api_delete_firstpage_parameter();    // delete the cookie
+    api_delete_firstpage_parameter(); // delete the cookie
 
     if (!isset($_SESSION['request_uri'])) {
         if (CourseManager::get_course_id_from_path($redirectCourseDir)) {
             $_SESSION['noredirection'] = false;
-            $_SESSION['request_uri'] = api_get_path(WEB_COURSE_PATH) . $redirectCourseDir . '/';
+            $_SESSION['request_uri'] = api_get_path(WEB_COURSE_PATH).$redirectCourseDir.'/';
         }
     }
 } elseif (api_user_is_login() && exist_firstpage_parameter()) {
@@ -1393,7 +1393,7 @@ 
     api_delete_firstpage_parameter(); // delete the cookie
     if (CourseManager::get_course_id_from_path($redirectCourseDir)) {
         $_SESSION['noredirection'] = false;
-        $_SESSION['request_uri'] = api_get_path(WEB_COURSE_PATH) . $redirectCourseDir . '/';
+        $_SESSION['request_uri'] = api_get_path(WEB_COURSE_PATH).$redirectCourseDir.'/';
     }
 }
 

main/inc/lib/AnnouncementEmail.php

Spacing +1 added lines, -1 removed lines

@@ -196,7 +196,7 @@
      *
      * @return array
      */
-    public function sender($key = '',  $userId = '')
+    public function sender($key = '', $userId = '')
     {
         $_user = api_get_user_info($userId);
 

main/inc/lib/custom_pages.class.php

Spacing +7 added lines, -7 removed lines

@@ -35,7 +35,7 @@ 
      */
     public static function path($name = '')
     {
-        return api_get_path(SYS_PATH) . 'custompages/' . $name;
+        return api_get_path(SYS_PATH).'custompages/'.$name;
     }
 
     /**
@@ -50,12 +50,12 @@ 
             return false;
         }
 
-        $file = self::path($page_name . '.php');
+        $file = self::path($page_name.'.php');
         if (file_exists($file)) {
             include($file);
             exit;
         } else {
-            error_log('CustomPages::displayPage : could not read file ' . $file);
+            error_log('CustomPages::displayPage : could not read file '.$file);
         }
     }
 
@@ -69,14 +69,14 @@ 
     public static function getURLImages($url_id = null)
     {
         if (is_null($url_id)) {
-            $url = 'http://' . $_SERVER['HTTP_HOST'] . '/';
+            $url = 'http://'.$_SERVER['HTTP_HOST'].'/';
             $url_id = UrlManager::get_url_id($url);
         }
-        $url_images_dir = api_get_path(SYS_PATH) . 'custompages/url-images/';
+        $url_images_dir = api_get_path(SYS_PATH).'custompages/url-images/';
         $images = array();
         for ($img_id = 1; $img_id <= 3; $img_id++) {
-            if (file_exists($url_images_dir . $url_id . '_url_image_' . $img_id . '.png')) {
-                $images[] = api_get_path(WEB_PATH) . 'custompages/url-images/' . $url_id . '_url_image_' . $img_id . '.png';
+            if (file_exists($url_images_dir.$url_id.'_url_image_'.$img_id.'.png')) {
+                $images[] = api_get_path(WEB_PATH).'custompages/url-images/'.$url_id.'_url_image_'.$img_id.'.png';
             }
         }