chamilo / chamilo-lms

main/auth/sso/sso_server_test.php

Braces +6 added lines, -3 removed lines

@@ -84,15 +84,18 @@
     //echo do something to logout
 }
 
-function validate_user($user, $pass) {
+function validate_user($user, $pass)
+{
     return true;
 }
-function filter_xss($val) {
+function filter_xss($val)
+{
     //do some cleaning
     return $val;
 }
 
-function chamilo_sso_protocol() {
+function chamilo_sso_protocol()
+{
     //get the sso_protocol from chamilo using webservices
     return 'http://';
 }

main/auth/ldap/newUser.php

Braces +1 added lines, -2 removed lines

@@ -19,8 +19,7 @@
 
 $ldap_login_success = ldap_login($login, $password);
 
-if ($ldap_login_success)
-{
+if ($ldap_login_success) {
 	//error_log('Found user '.$login.' on LDAP server',0);
 	/*
 		In here, we know that

main/auth/gotocourse.php

Braces +4 added lines, -4 removed lines

@@ -14,7 +14,7 @@ 
 require_once __DIR__.'/../inc/global.inc.php';

 require_once api_get_path(SYS_PATH).'main/auth/cas/authcas.php';

 $msg = null;

-if (isset($_GET['firstpage'])) {

+if (isset($_GET['firstpage'])) {
     $firstpage = $_GET['firstpage'];

 

     // if course is public, go to course without auth

@@ -41,7 +41,7 @@ 
     );

     $form->addButtonNext(get_lang('LoginEnter'), 'submitAuth');

     // see same text in main_api.lib.php function api_not_allowed

-    if (api_is_cas_activated()) {

+    if (api_is_cas_activated()) {
         $msg .= Display::return_message(sprintf(get_lang('YouHaveAnInstitutionalAccount'), api_get_setting("Institution")), '', false);

         $msg .= Display::div("<br/><a href='".get_cas_direct_URL(api_get_course_id())."'>".getCASLogoHTML()." ".sprintf(get_lang('LoginWithYourAccount'), api_get_setting("Institution"))."</a><br/><br/>", array('align'=>'center'));

         $msg .= Display::return_message(get_lang('YouDontHaveAnInstitutionAccount'));

@@ -52,7 +52,7 @@ 
     $msg .= '<div class="well_login">';

     $msg .= $form->return_form();

     $msg .= '</div>';

-    if (api_is_cas_activated()) {

+    if (api_is_cas_activated()) {
         $msg .= "</div>";

     }

     $msg .= '<hr/><p style="text-align:center"><a href="'.api_get_path(WEB_PATH).'">'.get_lang('ReturnToCourseHomepage').'</a></p>';

@@ -60,7 +60,7 @@ 
     $tpl->assign('content', '<h4>'.get_lang('LoginToGoToThisCourse').'</h4>'.$msg);

     $tpl->display_one_col_template();

 

-} else {

+} else {
     api_delete_firstpage_parameter();

     header('Location: '.api_get_path(WEB_PATH).'index.php');

     exit;

main/lp/storageapi.php

Braces +30 added lines, -20 removed lines

@@ -45,8 +45,9 @@ 
         }
         break;
     case "stackgetall":
-        if (storage_can_set($_REQUEST['svuser']))
-            print storage_stack_getall($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
+        if (storage_can_set($_REQUEST['svuser'])) {
+                    print storage_stack_getall($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
+        }
         break;
     case "getposition":
         print storage_get_position($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey'], $_REQUEST['svasc']);
@@ -63,7 +64,8 @@ 
         // Do nothing
 }
 
-function storage_can_set($sv_user) {
+function storage_can_set($sv_user)
+{
     // platform admin can change any user's stored values, other users can only change their own values
     $allowed = ((api_is_platform_admin()) || ($sv_user == api_get_user_id()));
     if (!$allowed) {
@@ -72,7 +74,8 @@ 
     return $allowed;
 }
 
-function storage_get($sv_user, $sv_course, $sv_sco, $sv_key) {
+function storage_get($sv_user, $sv_course, $sv_sco, $sv_key)
+{
     $sql = "select sv_value
         from ".Database::get_main_table(TABLE_TRACK_STORED_VALUES)."
         where user_id= '$sv_user'
@@ -87,13 +90,13 @@ 
         } else {
             return $row['sv_value'];
         }
-    }
-    else {
+    } else {
         return null;
     }
 }
 
-function storage_get_leaders($sv_user, $sv_course, $sv_sco, $sv_key, $sv_asc, $sv_length) {
+function storage_get_leaders($sv_user, $sv_course, $sv_sco, $sv_key, $sv_asc, $sv_length)
+{
 
     // get leaders
     $sql_leaders = "select u.user_id, firstname, lastname, email, username, sv_value as value
@@ -127,7 +130,8 @@ 
     return json_encode($result);
 }
 
-function storage_get_position($sv_user, $sv_course, $sv_sco, $sv_key, $sv_asc, $sv_length) {
+function storage_get_position($sv_user, $sv_course, $sv_sco, $sv_key, $sv_asc, $sv_length)
+{
     $sql = "select count(list.user_id) as position
         from ".Database::get_main_table(TABLE_TRACK_STORED_VALUES)." search,
             ".Database::get_main_table(TABLE_TRACK_STORED_VALUES)." list
@@ -144,13 +148,13 @@ 
     if (Database::num_rows($res) > 0) {
         $row = Database::fetch_assoc($res);
         return $row['position'];
-    }
-    else {
+    } else {
         return null;
     }
 }
 
-function storage_set($sv_user, $sv_course, $sv_sco, $sv_key, $sv_value) {
+function storage_set($sv_user, $sv_course, $sv_sco, $sv_key, $sv_value)
+{
     $sv_value = Database::escape_string($sv_value);
     $sql = "replace into ".Database::get_main_table(TABLE_TRACK_STORED_VALUES)."
         (user_id, sco_id, course_id, sv_key, sv_value)
@@ -160,7 +164,8 @@ 
     return Database::affected_rows($res);
 }
 
-function storage_getall($sv_user, $sv_course, $sv_sco) {
+function storage_getall($sv_user, $sv_course, $sv_sco)
+{
     $sql = "select sv_key, sv_value
         from ".Database::get_main_table(TABLE_TRACK_STORED_VALUES)."
         where user_id= '$sv_user'
@@ -177,7 +182,8 @@ 
     return json_encode($data);
 }
 
-function storage_stack_push($sv_user, $sv_course, $sv_sco, $sv_key, $sv_value) {
+function storage_stack_push($sv_user, $sv_course, $sv_sco, $sv_key, $sv_value)
+{
     $sv_value = Database::escape_string($sv_value);
     Database::query("start transaction");
     $sqlorder = "select ifnull((select max(stack_order)
@@ -198,14 +204,14 @@ 
     if ($resorder && $resinsert) {
         Database::query("commit");
         return 1;
-    }
-    else {
+    } else {
         Database::query("rollback");
         return 0;
     }
 }
 
-function storage_stack_pop($sv_user, $sv_course, $sv_sco, $sv_key) {
+function storage_stack_pop($sv_user, $sv_course, $sv_sco, $sv_key)
+{
     Database::query("start transaction");
     $sqlselect = "select sv_value, stack_order
         from ".Database::get_main_table(TABLE_TRACK_STORED_VALUES_STACK)."
@@ -239,7 +245,8 @@ 
     }
 }
 
-function storage_stack_length($sv_user, $sv_course, $sv_sco, $sv_key) {
+function storage_stack_length($sv_user, $sv_course, $sv_sco, $sv_key)
+{
     $sql = "select count(*) as length
         from ".Database::get_main_table(TABLE_TRACK_STORED_VALUES_STACK)."
         where user_id= '$sv_user'
@@ -251,7 +258,8 @@ 
     return $row['length'];
 }
 
-function storage_stack_clear($sv_user, $sv_course, $sv_sco, $sv_key) {
+function storage_stack_clear($sv_user, $sv_course, $sv_sco, $sv_key)
+{
     $sql = "delete
         from ".Database::get_main_table(TABLE_TRACK_STORED_VALUES_STACK)."
         where user_id= '$sv_user'
@@ -262,7 +270,8 @@ 
     return Database::num_rows($res);
 }
 
-function storage_stack_getall($sv_user, $sv_course, $sv_sco, $sv_key) {
+function storage_stack_getall($sv_user, $sv_course, $sv_sco, $sv_key)
+{
     $sql = "select stack_order as stack_order, sv_value as value
         from ".Database::get_main_table(TABLE_TRACK_STORED_VALUES_STACK)."
         where user_id= '$sv_user'
@@ -280,7 +289,8 @@ 
     return json_encode($results);
 }
 
-function storage_get_all_users() {
+function storage_get_all_users()
+{
     $sql = "select user_id, username, firstname, lastname
         from ".Database::get_main_table(TABLE_MAIN_USER)."
         order by user_id asc";

main/lp/learnpathItem.class.php

Braces +9 added lines, -6 removed lines

@@ -752,7 +752,8 @@ 
     public function get_lesson_mode()
     {
         $mode = 'normal';
-        if ($this->get_prevent_reinit() != 0) { // If prevent_reinit == 0
+        if ($this->get_prevent_reinit() != 0) {
+// If prevent_reinit == 0
             $my_status = $this->get_status();
             if ($my_status != $this->possible_status[0]
                     && $my_status != $this->possible_status[1]) {
@@ -2044,11 +2045,13 @@ 
         $restart = 1;
         $mystatus = $this->get_status(true);
         if ($this->get_prevent_reinit() > 0
-        ) { // If prevent_reinit == 1 (or more)
+        ) {
+// If prevent_reinit == 1 (or more)
             // If status is not attempted or incomplete, authorize retaking (of the same) anyway. Otherwise:
             if ($mystatus != $this->possible_status[0] && $mystatus != $this->possible_status[1]) {
                 $restart = -1;
-            } else { //status incompleted or not attempted
+            } else {
+//status incompleted or not attempted
                 $restart = 0;
             }
         } else {
@@ -2989,7 +2992,8 @@ 
                     // Do nothing, just let the local attributes be used.
                 }
             }
-        } else { // If not SCO, such messages should not be expected.
+        } else {
+// If not SCO, such messages should not be expected.
             $type = strtolower($this->type);
             switch ($type) {
                 case 'asset':
@@ -3429,8 +3433,7 @@ 
         }
         if ($scorm_time == '0'
                 and ($this->type != 'sco')
-                and $this->current_start_time != 0)
-        {
+                and $this->current_start_time != 0) {
             $my_time = time() - $this->current_start_time;
             if ($my_time > 0) {
                 $this->update_time($my_time);

main/lp/lp_controller.php

Braces +75 added lines, -30 removed lines

@@ -14,7 +14,9 @@ 
 $use_anonymous = true;
 
 $debug = 0;
-if ($debug > 0) error_log('New LP -+- Entered lp_controller.php -+- (action: '.$_REQUEST['action'].')', 0);
+if ($debug > 0) {
+    error_log('New LP -+- Entered lp_controller.php -+- (action: '.$_REQUEST['action'].')', 0);
+}
 
 // Language files that needs to be included.
 if (isset($_GET['action'])) {
@@ -210,10 +212,14 @@ 
     // If refresh is set, we regenerate the oLP object from the database (kind of flush).
     Session::erase('refresh');
     $myrefresh = 1;
-    if ($debug > 0) error_log('New LP - Refresh asked', 0);
-}
+    if ($debug > 0) {
+        error_log('New LP - Refresh asked', 0);
+    }
+    }
 
-if ($debug > 0) error_log('New LP - Passed refresh check', 0);
+if ($debug > 0) {
+    error_log('New LP - Passed refresh check', 0);
+}
 
 if (!empty($_REQUEST['dialog_box'])) {
     $dialog_box = stripslashes(urldecode($_REQUEST['dialog_box']));
@@ -223,17 +229,23 @@ 
 $lp_found = false;
 
 if (isset($_SESSION['lpobject'])) {
-    if ($debug > 0) error_log('New LP - SESSION[lpobject] is defined', 0);
+    if ($debug > 0) {
+        error_log('New LP - SESSION[lpobject] is defined', 0);
+    }
     $oLP = unserialize($_SESSION['lpobject']);
     if (isset($oLP) && is_object($oLP)) {
-        if ($debug > 0) error_log('New LP - oLP is object', 0);
+        if ($debug > 0) {
+            error_log('New LP - oLP is object', 0);
+        }
         if ($myrefresh == 1 ||
             empty($oLP->cc) ||
             $oLP->cc != api_get_course_id() ||
             $oLP->lp_view_session_id != $session_id ||
             $oLP->scorm_debug == '1'
         ) {
-            if ($debug > 0) error_log('New LP - Course has changed, discard lp object', 0);
+            if ($debug > 0) {
+                error_log('New LP - Course has changed, discard lp object', 0);
+            }
             if ($myrefresh == 1) { $myrefresh_id = $oLP->get_id(); }
             $oLP = null;
             Session::erase('oLP');
@@ -247,13 +259,19 @@ 
 
 $course_id = api_get_course_int_id();
 
-if ($debug>0) error_log('New LP - Passed data remains check', 0);
+if ($debug>0) {
+    error_log('New LP - Passed data remains check', 0);
+}
 
 if (!$lp_found || (!empty($_REQUEST['lp_id']) && $_SESSION['oLP']->get_id() != $_REQUEST['lp_id'])) {
-    if ($debug > 0) error_log('New LP - oLP is not object, has changed or refresh been asked, getting new', 0);
+    if ($debug > 0) {
+        error_log('New LP - oLP is not object, has changed or refresh been asked, getting new', 0);
+    }
     // Regenerate a new lp object? Not always as some pages don't need the object (like upload?)
     if (!empty($_REQUEST['lp_id']) || !empty($myrefresh_id)) {
-        if ($debug > 0) error_log('New LP - lp_id is defined', 0);
+        if ($debug > 0) {
+            error_log('New LP - lp_id is defined', 0);
+        }
         // Select the lp in the database and check which type it is (scorm/dokeos/aicc) to generate the
         // right object.
         if (!empty($_REQUEST['lp_id'])) {
@@ -265,16 +283,22 @@ 
         $lp_table = Database::get_course_table(TABLE_LP_MAIN);
         if (is_numeric($lp_id)) {
             $sel = "SELECT lp_type FROM $lp_table WHERE c_id = $course_id AND id = $lp_id";
-            if ($debug > 0) error_log('New LP - querying '.$sel, 0);
+            if ($debug > 0) {
+                error_log('New LP - querying '.$sel, 0);
+            }
             $res = Database::query($sel);
 
             if (Database::num_rows($res)) {
                 $row = Database::fetch_array($res);
                 $type = $row['lp_type'];
-                if ($debug > 0) error_log('New LP - found row - type '.$type. ' - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
+                if ($debug > 0) {
+                    error_log('New LP - found row - type '.$type. ' - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
+                }
                 switch ($type) {
                     case 1:
-                        if ($debug > 0) error_log('New LP - found row - type dokeos - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
+                        if ($debug > 0) {
+                            error_log('New LP - found row - type dokeos - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
+                        }
 
                         $oLP = new learnpath(api_get_course_id(), $lp_id, api_get_user_id());
                         if ($oLP !== false) {
@@ -284,7 +308,9 @@ 
                         }
                         break;
                     case 2:
-                        if ($debug > 0) error_log('New LP - found row - type scorm - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
+                        if ($debug > 0) {
+                            error_log('New LP - found row - type scorm - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
+                        }
                         $oLP = new scorm(api_get_course_id(), $lp_id, api_get_user_id());
                         if ($oLP !== false) {
                             $lp_found = true;
@@ -293,7 +319,9 @@ 
                         }
                         break;
                     case 3:
-                        if ($debug > 0) error_log('New LP - found row - type aicc - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
+                        if ($debug > 0) {
+                            error_log('New LP - found row - type aicc - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
+                        }
                         $oLP = new aicc(api_get_course_id(), $lp_id, api_get_user_id());
                         if ($oLP !== false) {
                             $lp_found = true;
@@ -302,7 +330,9 @@ 
                         }
                         break;
                     default:
-                        if ($debug > 0) error_log('New LP - found row - type other - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
+                        if ($debug > 0) {
+                            error_log('New LP - found row - type other - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0);
+                        }
                         $oLP = new learnpath(api_get_course_id(), $lp_id, api_get_user_id());
                         if ($oLP !== false) {
                             $lp_found = true;
@@ -313,17 +343,23 @@ 
                 }
             }
         } else {
-            if ($debug > 0) error_log('New LP - Request[lp_id] is not numeric', 0);
+            if ($debug > 0) {
+                error_log('New LP - Request[lp_id] is not numeric', 0);
+            }
         }
     } else {
-        if ($debug > 0) error_log('New LP - Request[lp_id] and refresh_id were empty', 0);
+        if ($debug > 0) {
+            error_log('New LP - Request[lp_id] and refresh_id were empty', 0);
+        }
     }
     if ($lp_found) {
         $_SESSION['oLP'] = $oLP;
     }
 }
 
-if ($debug > 0) error_log('New LP - Passed oLP creation check', 0);
+if ($debug > 0) {
+    error_log('New LP - Passed oLP creation check', 0);
+}
 
 $is_allowed_to_edit = api_is_allowed_to_edit(false, true, false, false);
 
@@ -607,15 +643,15 @@ 
         }
         break;
     case 'auto_launch':
-        if (api_get_course_setting('enable_lp_auto_launch') == 1) { //Redirect to a specific LP
+        if (api_get_course_setting('enable_lp_auto_launch') == 1) {
+//Redirect to a specific LP
             if (!$is_allowed_to_edit) {
                 api_not_allowed(true);
             }
             if (!$lp_found) {
                 error_log('New LP - No learnpath given for set_autolaunch', 0);
                 require 'lp_list.php';
-            }
-            else {
+            } else {
                 $_SESSION['oLP']->set_autolaunch($_GET['lp_id'], $_GET['status']);
                 require 'lp_list.php';
                 exit;
@@ -1128,16 +1164,24 @@ 
         }
         break;
     case 'content':
-        if ($debug > 0) error_log('New LP - Item id is '.intval($_GET['item_id']), 0);
+        if ($debug > 0) {
+            error_log('New LP - Item id is '.intval($_GET['item_id']), 0);
+        }
         if (!$lp_found) {
             error_log('New LP - No learnpath given for content', 0);
             require 'lp_list.php';
         } else {
-            if ($debug > 0) error_log('New LP - save_last()', 0);
+            if ($debug > 0) {
+                error_log('New LP - save_last()', 0);
+            }
             $_SESSION['oLP']->save_last();
-            if ($debug > 0) error_log('New LP - set_current_item()', 0);
+            if ($debug > 0) {
+                error_log('New LP - set_current_item()', 0);
+            }
             $_SESSION['oLP']->set_current_item($_GET['item_id']);
-            if ($debug > 0) error_log('New LP - start_current_item()', 0);
+            if ($debug > 0) {
+                error_log('New LP - start_current_item()', 0);
+            }
             $_SESSION['oLP']->start_current_item();
             require 'lp_content.php';
         }
@@ -1253,8 +1297,7 @@ 
         require 'lp_message.php';
         break;
     case 'return_to_course_homepage':
-        if (!$lp_found) { error_log('New LP - No learnpath given for stats', 0); require 'lp_list.php'; }
-        else {
+        if (!$lp_found) { error_log('New LP - No learnpath given for stats', 0); require 'lp_list.php'; } else {
             $_SESSION['oLP']->save_current();
             $_SESSION['oLP']->save_last();
             $url = api_get_path(WEB_COURSE_PATH).api_get_course_path().'/index.php?id_session='.api_get_session_id();
@@ -1442,8 +1485,10 @@ 
 
 if (!empty($_SESSION['oLP'])) {
     $_SESSION['lpobject'] = serialize($_SESSION['oLP']);
-    if ($debug > 0) error_log('New LP - lpobject is serialized in session', 0);
-}
+    if ($debug > 0) {
+        error_log('New LP - lpobject is serialized in session', 0);
+    }
+    }
 
 if (!empty($redirectTo)) {
     header("Location: $redirectTo");

main/lp/lp_build.php

Braces +2 added lines, -1 removed lines

@@ -141,7 +141,8 @@
 echo '</div>';
 
 
-function show_block($link, $title, $subtitle, $icon) {
+function show_block($link, $title, $subtitle, $icon)
+{
     $html = '<li class="col-md-4">';
     $html .=  '<div class="thumbnail">';
     $html .=  '<a href="'.$link.'" title="'.$title.'">';

main/lp/lp_ajax_save_objectives.php

Braces +2 added lines, -2 removed lines

@@ -29,8 +29,8 @@
     }
     $mylp = learnpath::getLpFromSession(api_get_course_id(), $lp_id, $user_id);
     $mylpi =& $mylp->items[$item_id];
-    if (is_array($objectives) && count($objectives)>0){
-        foreach ($objectives as $index=>$objective){
+    if (is_array($objectives) && count($objectives)>0) {
+        foreach ($objectives as $index=>$objective) {
             $mylpi->add_objective($index,$objectives[$index]);
         }
         $mylpi->write_objectives_to_db();

main/lp/lp_ajax_save_item.php

Braces +4 added lines, -2 removed lines

@@ -55,7 +55,8 @@ 
     $lmsFinish = 0,
     $userNavigatesAway = 0,
     $statusSignalReceived = 0
-) {
+)
+{
     //global $debug;
     $debug = 0;
     $return = null;
@@ -477,7 +478,8 @@ 
     if (is_array($_REQUEST['interact'])) {
         foreach ($_REQUEST['interact'] as $idx => $interac) {
             $interactions[$idx] = preg_split('/,/', substr($interac, 1, -1));
-            if (!isset($interactions[$idx][7])) { // Make sure there are 7 elements.
+            if (!isset($interactions[$idx][7])) {
+// Make sure there are 7 elements.
                 $interactions[$idx][7] = '';
             }
         }