chamilo / chamilo-lms

main/tracking/course_access_details.php

Spacing +16 added lines, -16 removed lines

@@ -61,18 +61,18 @@ 
             $reqdate = time();
             //** dislayed period
             echo "<tr><td><b>";
-            switch($period) {
+            switch ($period) {
                 case "year" :
                     echo date(" Y", $reqdate);
                     break;
                 case "month" :
-                    echo $MonthsLong[date("n", $reqdate)-1].date(" Y", $reqdate);
+                    echo $MonthsLong[date("n", $reqdate) - 1].date(" Y", $reqdate);
                     break;
                 // default == day
                 default :
                     $period = "day";
                 case "day" :
-                    echo $DaysLong[date("w" , $reqdate)].date(" d " , $reqdate).$MonthsLong[date("n", $reqdate)-1].date(" Y" , $reqdate);
+                    echo $DaysLong[date("w", $reqdate)].date(" d ", $reqdate).$MonthsLong[date("n", $reqdate) - 1].date(" Y", $reqdate);
                     break;
             }
         echo "</b></tr></td>";
@@ -86,7 +86,7 @@ 
                 ".get_lang('DetailView')." :
         ";
 
-        switch($period) {
+        switch ($period) {
             case "year" :
                 //-- if period is "year" display can be by month, day or hour
                 echo "  [<a href='".api_get_self()."?period=$period&reqdate=$reqdate&displayType=month' class='specialLink'>".get_lang('PeriodMonth')."</a>]";
@@ -105,8 +105,8 @@ 
             case "year" :
                 // previous and next date must be evaluated
                 // 30 days should be a good approximation
-                $previousReqDate = mktime(1,1,1,1,1,date("Y",$reqdate)-1);
-                $nextReqDate = mktime(1,1,1,1,1,date("Y",$reqdate)+1);
+                $previousReqDate = mktime(1, 1, 1, 1, 1, date("Y", $reqdate) - 1);
+                $nextReqDate = mktime(1, 1, 1, 1, 1, date("Y", $reqdate) + 1);
                 echo   "
                     [<a href='".api_get_self()."?period=$period&reqdate=$previousReqDate&displayType=$displayType' class='specialLink'>".get_lang('PreviousYear')."</a>]
                     [<a href='".api_get_self()."?period=$period&reqdate=$nextReqDate&displayType=$displayType' class='specialLink'>".get_lang('NextYear')."</a>]
@@ -115,8 +115,8 @@ 
             case "month" :
                 // previous and next date must be evaluated
                 // 30 days should be a good approximation
-                $previousReqDate = mktime(1,1,1,date("m",$reqdate)-1,1,date("Y",$reqdate));
-                $nextReqDate = mktime(1,1,1,date("m",$reqdate)+1,1,date("Y",$reqdate));
+                $previousReqDate = mktime(1, 1, 1, date("m", $reqdate) - 1, 1, date("Y", $reqdate));
+                $nextReqDate = mktime(1, 1, 1, date("m", $reqdate) + 1, 1, date("Y", $reqdate));
                 echo   "
                     [<a href='".api_get_self()."?period=$period&reqdate=$previousReqDate&displayType=$displayType' class='specialLink'>".get_lang('PreviousMonth')."</a>]
                     [<a href='".api_get_self()."?period=$period&reqdate=$nextReqDate&displayType=$displayType' class='specialLink'>".get_lang('NextMonth')."</a>]
@@ -145,16 +145,16 @@ 
                 if ($displayType == "month") {
                     $sql .= "ORDER BY UNIX_TIMESTAMP( access_date)";
                     $month_array = StatsUtils::monthTab($sql);
-                    StatsUtils::makeHitsTable($month_array,get_lang('PeriodMonth'));
-                } elseif($displayType == "day") {
+                    StatsUtils::makeHitsTable($month_array, get_lang('PeriodMonth'));
+                } elseif ($displayType == "day") {
                     $sql .= "ORDER BY DAYOFYEAR( access_date)";
                     $days_array = StatsUtils::daysTab($sql);
-                    StatsUtils::makeHitsTable($days_array,get_lang('PeriodDay'));
+                    StatsUtils::makeHitsTable($days_array, get_lang('PeriodDay'));
                 } else {
                     // by hours by default
                     $sql .= "ORDER BY HOUR( access_date)";
                     $hours_array = StatsUtils::hoursTab($sql);
-                    StatsUtils::makeHitsTable($hours_array,get_lang('PeriodHour'));
+                    StatsUtils::makeHitsTable($hours_array, get_lang('PeriodHour'));
                 }
                 break;
             // all days
@@ -168,12 +168,12 @@ 
                 if ($displayType == "day") {
                     $sql .= "ORDER BY DAYOFYEAR( access_date)";
                     $days_array = StatsUtils::daysTab($sql);
-                    StatsUtils::makeHitsTable($days_array,get_lang('PeriodDay'));
+                    StatsUtils::makeHitsTable($days_array, get_lang('PeriodDay'));
                 } else {
                     // by hours by default
                     $sql .= "ORDER BY HOUR( access_date)";
                     $hours_array = StatsUtils::hoursTab($sql);
-                    StatsUtils:: makeHitsTable($hours_array,get_lang('PeriodHour'));
+                    StatsUtils:: makeHitsTable($hours_array, get_lang('PeriodHour'));
                 }
                 break;
             // all hours
@@ -186,8 +186,8 @@ 
                         AND c_id = $courseId
                         AND access_tool IS NULL
                         ORDER BY HOUR( access_date )";
-                $hours_array = StatsUtils::hoursTab($sql,$reqdate);
-                StatsUtils::makeHitsTable($hours_array,get_lang('PeriodHour'));
+                $hours_array = StatsUtils::hoursTab($sql, $reqdate);
+                StatsUtils::makeHitsTable($hours_array, get_lang('PeriodHour'));
                 break;
         }
     } else {

main/tracking/userLog.php

Spacing +27 added lines, -27 removed lines

@@ -35,8 +35,8 @@ 
 $interbreadcrumb[]= array ("url"=>"../group/group_space.php?gidReq=$_gid", "name"=> get_lang('BredCrumpGroupSpace'));
 */
 
-if(isset($uInfo)) {
-    $interbreadcrumb[]= array ('url'=>'../user/userInfo.php?uInfo='.Security::remove_XSS($uInfo), "name"=> api_ucfirst(get_lang('Users')));
+if (isset($uInfo)) {
+    $interbreadcrumb[] = array('url'=>'../user/userInfo.php?uInfo='.Security::remove_XSS($uInfo), "name"=> api_ucfirst(get_lang('Users')));
 }
 
 $nameTools = get_lang('ToolName');
@@ -54,7 +54,7 @@ 
 /*]]>*/
 </style>";
 
-Display::display_header($nameTools,"Tracking");
+Display::display_header($nameTools, "Tracking");
 
 /*	Constants and variables */
 
@@ -62,11 +62,11 @@ 
 $is_course_member = CourseManager::is_user_subscribed_in_real_or_linked_course($user_id, $courseId);
 
 // Database Table Definitions
-$TABLECOURSUSER	        	= Database::get_main_table(TABLE_MAIN_COURSE_USER);
-$TABLEUSER	        		= Database::get_main_table(TABLE_MAIN_USER);
-$tbl_session_course_user 	= Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
-$tbl_session 				= Database::get_main_table(TABLE_MAIN_SESSION);
-$TABLECOURSE_GROUPSUSER 	= Database::get_course_table(TABLE_GROUP_USER);
+$TABLECOURSUSER = Database::get_main_table(TABLE_MAIN_COURSE_USER);
+$TABLEUSER = Database::get_main_table(TABLE_MAIN_USER);
+$tbl_session_course_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
+$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
+$TABLECOURSE_GROUPSUSER = Database::get_course_table(TABLE_GROUP_USER);
 $now = api_get_utc_datetime();
 
 $sql = "SELECT 1
@@ -78,8 +78,8 @@ 
             OR (access_start_date='0000-00-00' AND access_end_date='0000-00-00'))
         WHERE session_id='".api_get_session_id()."' AND c_id = $courseId";
 //echo $sql;
-$result=Database::query($sql);
-if(!Database::num_rows($result)){
+$result = Database::query($sql);
+if (!Database::num_rows($result)) {
     $disabled = true;
 }
 
@@ -88,7 +88,7 @@ 
 $tbl_learnpath_view = Database::get_course_table(TABLE_LP_VIEW);
 $tbl_learnpath_item_view = Database::get_course_table(TABLE_LP_ITEM_VIEW);
 
-$documentPath=api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
+$documentPath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
 
 // The variables for the days and the months
 $DaysShort = api_get_week_days_short();
@@ -113,7 +113,7 @@ 
 <table width="100%" cellpadding="2" cellspacing="3" border="0">
 <?php
 // check if uid is tutor of this group
-if (( $is_allowedToTrack || $is_allowedToTrackEverybodyInCourse )) {
+if (($is_allowedToTrack || $is_allowedToTrackEverybodyInCourse)) {
     if (!$uInfo && !isset($uInfo)) {
         /*
         *		Display list of user of this group
@@ -137,7 +137,7 @@ 
         $step = 25; // number of student per page
         if ($userGroupNb > $step) {
             if (!isset($offset)) {
-                    $offset=0;
+                    $offset = 0;
             }
 
             $next     = $offset + $step;
@@ -190,13 +190,13 @@ 
         $list_users = getManyResults3Col($sql);
         echo "<table width='100%' cellpadding='2' cellspacing='1' border='0'>\n"
                     ."<tr align='center' valign='top' bgcolor='#E6E6E6'>\n"
-                    ."<td align='left'>",get_lang('UserName'),"</td>\n"
+                    ."<td align='left'>", get_lang('UserName'), "</td>\n"
                     ."</tr>\n";
         for ($i = 0; $i < sizeof($list_users); $i++) {
             echo    "<tr valign='top' align='center'>\n"
                     ."<td align='left'>"
-                    ."<a href='".api_get_self()."?uInfo=",$list_users[$i][0],"'>"
-                    .$list_users[$i][1]," ",$list_users[$i][2]
+                    ."<a href='".api_get_self()."?uInfo=", $list_users[$i][0], "'>"
+                    .$list_users[$i][1], " ", $list_users[$i][2]
                     ."</a>".
                     "</td>\n";
         }
@@ -253,7 +253,7 @@ 
             ";
 
             if (!isset($view)) {
-                $view ='0000000';
+                $view = '0000000';
             }
             //Logins
             TrackingUserLog::display_login_tracking_info($view, $uInfo, $courseId);
@@ -285,8 +285,8 @@ 
                 </tr>";
 
             $sql = "SELECT id, name FROM $tbl_learnpath_main";
-            $result=Database::query($sql);
-            $ar=Database::fetch_array($result);
+            $result = Database::query($sql);
+            $ar = Database::fetch_array($result);
 
             echo "<tr><td style='padding-left : 40px;padding-right : 40px;'>";
             echo "<table cellpadding='2' cellspacing='1' border='0' align='center'><tr>
@@ -303,14 +303,14 @@ 
                     if ($ar['id'] == $scormcontopen) {
                         //have to list the students here
                         $contentId = intval($ar['id']);
-                        $sql3 = "SELECT iv.status, iv.score, i.title, iv.total_time " .
-                                "FROM $tbl_learnpath_item i " .
-                                "INNER JOIN $tbl_learnpath_item_view iv ON i.id=iv.lp_item_id " .
-                                "INNER JOIN $tbl_learnpath_view v ON iv.lp_view_id=v.id " .
+                        $sql3 = "SELECT iv.status, iv.score, i.title, iv.total_time ".
+                                "FROM $tbl_learnpath_item i ".
+                                "INNER JOIN $tbl_learnpath_item_view iv ON i.id=iv.lp_item_id ".
+                                "INNER JOIN $tbl_learnpath_view v ON iv.lp_view_id=v.id ".
                                 "WHERE (v.user_id=".intval($uInfo)." and v.lp_id=$contentId)
                                 ORDER BY v.id, i.id";
-                        $result3=Database::query($sql3);
-                        $ar3=Database::fetch_array($result3);
+                        $result3 = Database::query($sql3);
+                        $ar3 = Database::fetch_array($result3);
                         if (is_array($ar3)) {
                             echo "<tr><td>&nbsp;&nbsp;&nbsp;</td>
                                    <td class='secLine'>
@@ -332,7 +332,7 @@ 
                                 echo "<tr><td>&nbsp;&nbsp;&nbsp;</td><td>";
                                 echo "$title</td><td align=right>{$ar3['status']}</td><td align=right>{$ar3['score']}</td><td align=right>$time</td>";
                                 echo "</tr>";
-                                $ar3=Database::fetch_array($result3);
+                                $ar3 = Database::fetch_array($result3);
                             }
                         } else {
                             echo "<tr>";
@@ -343,7 +343,7 @@ 
                     $ar = Database::fetch_array($result);
                 }
             } else {
-                $noscorm=true;
+                $noscorm = true;
             }
 
             if ($noscorm) {

main/portfolio/share.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
  * @license see /license.txt
  * @author Laurent Opprecht <laurent@opprecht.info> for the Univesity of Geneva
  */
-require_once __DIR__ . '/../inc/global.inc.php';
+require_once __DIR__.'/../inc/global.inc.php';
 
 $has_access = api_protect_course_script();
 if (!$has_access) {

main/install/index.php

Spacing +7 added lines, -7 removed lines

@@ -99,7 +99,7 @@ 
 \Patchwork\Utf8\Bootup::initAll();
 
 // Page encoding initialization.
-header('Content-Type: text/html; charset='. $charset);
+header('Content-Type: text/html; charset='.$charset);
 
 // Setting the error reporting levels.
 error_reporting(E_ALL);
@@ -203,7 +203,7 @@ 
     // This is the main configuration file of the system before the upgrade.
     // Old configuration file.
     // Don't change to include_once
-    $oldConfigPath = api_get_path(SYS_CODE_PATH) . 'inc/conf/configuration.php';
+    $oldConfigPath = api_get_path(SYS_CODE_PATH).'inc/conf/configuration.php';
     if (file_exists($oldConfigPath)) {
         include $oldConfigPath;
     }
@@ -331,7 +331,7 @@ 
             //Blocking step6 button
             $("#button_step6").click(function() {
                 $("#button_step6").hide();
-                $("#button_please_wait").html('<?php echo addslashes(get_lang('PleaseWait'));?>');
+                $("#button_please_wait").html('<?php echo addslashes(get_lang('PleaseWait')); ?>');
                 $("#button_please_wait").show();
                 $("#button_please_wait").attr('disabled', true);
                 $("#is_executable").attr("value",'step6');
@@ -429,7 +429,7 @@ 
 
 $instalation_type_label = '';
 if ($installType == 'new') {
-    $instalation_type_label  = get_lang('NewInstallation');
+    $instalation_type_label = get_lang('NewInstallation');
 } elseif ($installType == 'update') {
     $update_from_version = isset($update_from_version) ? $update_from_version : null;
     $instalation_type_label = get_lang('UpdateFromLMSVersion').(is_array($update_from_version) ? implode('|', $update_from_version) : '');
@@ -599,8 +599,8 @@ 
 
     <?php
     if ($installType == 'new') {
-        echo get_lang('AdminLogin') . ' : <strong>' . $loginForm . '</strong><br />';
-        echo get_lang('AdminPass') . ' : <strong>' . $passForm . '</strong><br /><br />'; /* TODO: Maybe this password should be hidden too? */
+        echo get_lang('AdminLogin').' : <strong>'.$loginForm.'</strong><br />';
+        echo get_lang('AdminPass').' : <strong>'.$passForm.'</strong><br /><br />'; /* TODO: Maybe this password should be hidden too? */
     }
 
     echo get_lang('AdminFirstName').' : '.$adminFirstName, '<br />', get_lang('AdminLastName').' : '.$adminLastName, '<br />';
@@ -755,7 +755,7 @@ 
                     error_log('Copy conf files');
 
                     foreach ($configurationFiles as $file) {
-                        if (file_exists(api_get_path(SYS_CODE_PATH) . 'inc/conf/'.$file)) {
+                        if (file_exists(api_get_path(SYS_CODE_PATH).'inc/conf/'.$file)) {
                             copy(
                                 api_get_path(SYS_CODE_PATH).'inc/conf/'.$file,
                                 api_get_path(CONFIGURATION_PATH).$file

main/install/install_files.inc.php

Spacing +16 added lines, -16 removed lines

@@ -17,7 +17,7 @@ 
 if (defined('SYSTEM_INSTALLATION')) {
 
     // Write the system config file
-    write_system_config_file(api_get_path(CONFIGURATION_PATH) . 'configuration.php');
+    write_system_config_file(api_get_path(CONFIGURATION_PATH).'configuration.php');
 
     // Write a distribution file with the config as a backup for the admin
     //write_system_config_file(api_get_path(CONFIGURATION_PATH) . 'configuration.dist.php');
@@ -27,33 +27,33 @@ 
 
     // Copy distribution files with renaming for being the actual system configuration files.
     copy(
-        api_get_path(CONFIGURATION_PATH) . 'add_course.conf.dist.php',
-        api_get_path(CONFIGURATION_PATH) . 'add_course.conf.php'
+        api_get_path(CONFIGURATION_PATH).'add_course.conf.dist.php',
+        api_get_path(CONFIGURATION_PATH).'add_course.conf.php'
     );
     copy(
-        api_get_path(CONFIGURATION_PATH) . 'course_info.conf.dist.php',
-        api_get_path(CONFIGURATION_PATH) . 'course_info.conf.php'
+        api_get_path(CONFIGURATION_PATH).'course_info.conf.dist.php',
+        api_get_path(CONFIGURATION_PATH).'course_info.conf.php'
     );
     copy(
-        api_get_path(CONFIGURATION_PATH) . 'mail.conf.dist.php',
-        api_get_path(CONFIGURATION_PATH) . 'mail.conf.php'
+        api_get_path(CONFIGURATION_PATH).'mail.conf.dist.php',
+        api_get_path(CONFIGURATION_PATH).'mail.conf.php'
     );
     copy(
-        api_get_path(CONFIGURATION_PATH) . 'profile.conf.dist.php',
-        api_get_path(CONFIGURATION_PATH) . 'profile.conf.php'
+        api_get_path(CONFIGURATION_PATH).'profile.conf.dist.php',
+        api_get_path(CONFIGURATION_PATH).'profile.conf.php'
     );
     copy(
-        api_get_path(CONFIGURATION_PATH) . 'events.conf.dist.php',
-        api_get_path(CONFIGURATION_PATH) . 'events.conf.php'
+        api_get_path(CONFIGURATION_PATH).'events.conf.dist.php',
+        api_get_path(CONFIGURATION_PATH).'events.conf.php'
     );
     copy(
-        api_get_path(CONFIGURATION_PATH) . 'auth.conf.dist.php',
-        api_get_path(CONFIGURATION_PATH) . 'auth.conf.php'
+        api_get_path(CONFIGURATION_PATH).'auth.conf.dist.php',
+        api_get_path(CONFIGURATION_PATH).'auth.conf.php'
     );
     copy(
-        api_get_path(CONFIGURATION_PATH) . 'portfolio.conf.dist.php',
-        api_get_path(CONFIGURATION_PATH) . 'portfolio.conf.php'
+        api_get_path(CONFIGURATION_PATH).'portfolio.conf.dist.php',
+        api_get_path(CONFIGURATION_PATH).'portfolio.conf.php'
     );
 } else {
-    echo 'You are not allowed here !' . __FILE__;
+    echo 'You are not allowed here !'.__FILE__;
 }

main/install/update-configuration.inc.php

Spacing +13 added lines, -13 removed lines

@@ -10,11 +10,11 @@ 
  */
 if (defined('SYSTEM_INSTALLATION')) {
 
-    error_log("Starting " . basename(__FILE__));
+    error_log("Starting ".basename(__FILE__));
     $perm = api_get_permissions_for_new_files();
 
-    $oldConfFile = api_get_path(SYS_CODE_PATH) . 'inc/conf/configuration.php';
-    $newConfFile = api_get_path(CONFIGURATION_PATH) . 'configuration.php';
+    $oldConfFile = api_get_path(SYS_CODE_PATH).'inc/conf/configuration.php';
+    $newConfFile = api_get_path(CONFIGURATION_PATH).'configuration.php';
 
     if (file_exists($oldConfFile)) {
         copy($oldConfFile, $newConfFile);
@@ -37,18 +37,18 @@ 
         $ignore = false;
         if (stripos($line, '$_configuration[\'system_version\']') !== false) {
             $found_version = true;
-            $line = '$_configuration[\'system_version\'] = \'' . $new_version . '\';' . "\r\n";
+            $line = '$_configuration[\'system_version\'] = \''.$new_version.'\';'."\r\n";
        } elseif (stripos($line, '$_configuration[\'system_stable\']') !== false) {
             $found_stable = true;
-            $line = '$_configuration[\'system_stable\'] = ' . ($new_version_stable ? 'true' : 'false') . ';' . "\r\n";
+            $line = '$_configuration[\'system_stable\'] = '.($new_version_stable ? 'true' : 'false').';'."\r\n";
         } elseif (stripos($line, '$_configuration[\'software_name\']') !== false) {
             $found_software_name = true;
-            $line = '$_configuration[\'software_name\'] = \'' . $software_name . '\';' . "\r\n";
+            $line = '$_configuration[\'software_name\'] = \''.$software_name.'\';'."\r\n";
         } elseif (stripos($line, '$_configuration[\'software_url\']') !== false) {
             $found_software_url = true;
-            $line = '$_configuration[\'software_url\'] = \'' . $software_url . '\';' . "\r\n";
+            $line = '$_configuration[\'software_url\'] = \''.$software_url.'\';'."\r\n";
         } elseif (stripos($line, '$userPasswordCrypted') !== false) {
-            $line = '$_configuration[\'password_encryption\'] = \'' .$userPasswordCrypted.'\';' . "\r\n";
+            $line = '$_configuration[\'password_encryption\'] = \''.$userPasswordCrypted.'\';'."\r\n";
         } elseif (stripos($line, '?>') !== false) {
             $ignore = true;
         }
@@ -58,21 +58,21 @@ 
     }
 
     if (!$found_version) {
-        fwrite($fh, '$_configuration[\'system_version\'] = \'' . $new_version . '\';' . "\r\n");
+        fwrite($fh, '$_configuration[\'system_version\'] = \''.$new_version.'\';'."\r\n");
     }
     if (!$found_stable) {
-        fwrite($fh, '$_configuration[\'system_stable\'] = ' . ($new_version_stable ? 'true' : 'false') . ';' . "\r\n");
+        fwrite($fh, '$_configuration[\'system_stable\'] = '.($new_version_stable ? 'true' : 'false').';'."\r\n");
     }
     if (!$found_software_name) {
-        fwrite($fh, '$_configuration[\'software_name\'] = \'' . $software_name . '\';' . "\r\n");
+        fwrite($fh, '$_configuration[\'software_name\'] = \''.$software_name.'\';'."\r\n");
     }
     if (!$found_software_url) {
-        fwrite($fh, '$_configuration[\'software_url\'] = \'' . $software_url . '\';' . "\r\n");
+        fwrite($fh, '$_configuration[\'software_url\'] = \''.$software_url.'\';'."\r\n");
     }
     fwrite($fh, '?>');
     fclose($fh);
 
     error_log("configuration.php file updated.");
 } else {
-    echo 'You are not allowed here !'. __FILE__;
+    echo 'You are not allowed here !'.__FILE__;
 }

main/install/update-files-1.9.0-1.10.0.inc.php

Spacing +5 added lines, -5 removed lines

@@ -13,7 +13,7 @@ 
  * current configuration file.
  * @package chamilo.install
  */
-error_log("Starting " . basename(__FILE__));
+error_log("Starting ".basename(__FILE__));
 
 global $debug;
 
@@ -142,12 +142,12 @@ 
 
     $list = scandir($langPath);
     foreach ($list as $entry) {
-        if (is_dir($langPath . $entry) &&
+        if (is_dir($langPath.$entry) &&
             in_array($entry, $officialLanguages)
         ) {
             foreach ($filesToDelete as $file) {
-                if (is_file($langPath . $entry . '/' . $file . '.inc.php')) {
-                    unlink($langPath . $entry . '/' . $file . '.inc.php');
+                if (is_file($langPath.$entry.'/'.$file.'.inc.php')) {
+                    unlink($langPath.$entry.'/'.$file.'.inc.php');
                 }
             }
         }
@@ -234,7 +234,7 @@ 
     @rrmdir(api_get_path(SYS_PATH).'archive');
 
 } else {
-    echo 'You are not allowed here !'. __FILE__;
+    echo 'You are not allowed here !'.__FILE__;
 }
 
 /**

main/install/install.lib.php

Spacing +56 added lines, -56 removed lines

@@ -396,7 +396,7 @@ 
     if (!is_array($result)) {
         $result = array();
         $exceptions = array('.', '..', 'CVS', '.svn');
-        $search       = array('_latin',   '_unicode',   '_corporate',   '_org'  , '_KM',   '_');
+        $search       = array('_latin', '_unicode', '_corporate', '_org', '_KM', '_');
         $replace_with = array(' (Latin)', ' (unicode)', ' (corporate)', ' (org)', ' (KM)', ' ');
         $dirname = api_get_path(SYS_LANG_PATH);
         $handle = opendir($dirname);
@@ -430,9 +430,9 @@ 
     if ($handle = opendir($directory)) {
         while (false !== ($file = readdir($handle))) {
             if ($file != "." && $file != "..") {
-                if (is_dir($directory. "/" . $file)) {
-                    $array_items = array_merge($array_items, my_directory_to_array($directory. '/' . $file));
-                    $file = $directory . "/" . $file;
+                if (is_dir($directory."/".$file)) {
+                    $array_items = array_merge($array_items, my_directory_to_array($directory.'/'.$file));
+                    $file = $directory."/".$file;
                     $array_items[] = preg_replace("/\/\//si", '/', $file);
                 }
             }
@@ -636,7 +636,7 @@ 
     <h2><?php get_lang('WelcomeToTheChamiloInstaller'); ?></h2>
     <div class="RequirementHeading">
         <h2><?php echo display_step_sequence(); ?>
-            <?php echo get_lang('InstallationLanguage');?>
+            <?php echo get_lang('InstallationLanguage'); ?>
         </h2>
         <p><?php echo get_lang('PleaseSelectInstallationProcessLanguage'); ?>:</p>
         <form id="lang_form" method="post" action="<?php echo api_get_self(); ?>">
@@ -709,7 +709,7 @@ 
     if (phpversion() < REQUIRED_PHP_VERSION) {
         echo '<strong><font color="red">'.get_lang('PHPVersionError').'</font></strong>';
     } else {
-        echo '<strong><font color="green">'.get_lang('PHPVersionOK'). ' '.phpversion().'</font></strong>';
+        echo '<strong><font color="green">'.get_lang('PHPVersionOK').' '.phpversion().'</font></strong>';
     }
     echo '</td>
             </tr>
@@ -881,7 +881,7 @@ 
             if ($file_course_test_was_created == true) {
                 break;
             }
-            $r = @touch($course_dir.'/test.php',$perm);
+            $r = @touch($course_dir.'/test.php', $perm);
             if ($r === true) {
                 $fil_perm_verified = $perm;
                 if (check_course_script_interpretation($course_dir, $course_attempt_name, 'test.php')) {
@@ -1137,7 +1137,7 @@ 
 function get_contact_registration_form()
 {
 
-    $html ='
+    $html = '
    <form class="form-horizontal">
     <div class="panel panel-default">
     <div class="panel-body">
@@ -1234,7 +1234,7 @@ 
             <div class="col-sm-9">
                 <div class="radio">
                     <label>
-                        <input type="radio" name="financial_decision" id="financial_decision1" value="1" checked /> ' . get_lang('Yes') . '
+                        <input type="radio" name="financial_decision" id="financial_decision1" value="1" checked /> ' . get_lang('Yes').'
                     </label>
                 </div>
                 <div class="radio">
@@ -1293,8 +1293,8 @@ 
             echo '<input type="hidden" name="'.$formFieldName.'" id="'.$formFieldName.'" value="'.api_htmlentities($parameterValue).'" />';
             echo api_htmlentities($parameterValue);
         } else {
-            echo '<div class="col-sm-5"><input type="' . $inputType . '" class="form-control" size="' . DATABASE_FORM_FIELD_DISPLAY_LENGTH . '" maxlength="' . $maxLength . '" name="' . $formFieldName . '" id="' . $formFieldName . '" value="' . api_htmlentities($parameterValue) . '" />' . "</div>";
-            echo '<div class="col-sm-3">' . $extra_notice . '</div>';
+            echo '<div class="col-sm-5"><input type="'.$inputType.'" class="form-control" size="'.DATABASE_FORM_FIELD_DISPLAY_LENGTH.'" maxlength="'.$maxLength.'" name="'.$formFieldName.'" id="'.$formFieldName.'" value="'.api_htmlentities($parameterValue).'" />'."</div>";
+            echo '<div class="col-sm-3">'.$extra_notice.'</div>';
         }
 
     }
@@ -1330,12 +1330,12 @@ 
         $dbNameForm = $_configuration['main_database'];
         $dbPortForm = isset($_configuration['db_port']) ? $_configuration['db_port'] : '';
 
-        echo '<div class="RequirementHeading"><h2>' . display_step_sequence() .get_lang('DBSetting') . '</h2></div>';
+        echo '<div class="RequirementHeading"><h2>'.display_step_sequence().get_lang('DBSetting').'</h2></div>';
         echo '<div class="RequirementContent">';
         echo get_lang('DBSettingUpgradeIntro');
         echo '</div>';
     } else {
-        echo '<div class="RequirementHeading"><h2>' . display_step_sequence() .get_lang('DBSetting') . '</h2></div>';
+        echo '<div class="RequirementHeading"><h2>'.display_step_sequence().get_lang('DBSetting').'</h2></div>';
         echo '<div class="RequirementContent">';
         echo get_lang('DBSettingIntro');
         echo '</div>';
@@ -1345,12 +1345,12 @@ 
         <div class="panel-body">
         <div class="form-group">
             <label class="col-sm-4"><?php echo get_lang('DBHost'); ?> </label>
-            <?php if ($installType == 'update'){ ?>
+            <?php if ($installType == 'update') { ?>
             <div class="col-sm-5">
                 <input type="hidden" name="dbHostForm" value="<?php echo htmlentities($dbHostForm); ?>" /><?php echo $dbHostForm; ?>
             </div>
             <div class="col-sm-3"></div>
-            <?php }else{ ?>
+            <?php } else { ?>
             <div class="col-sm-5">
                 <input type="text" class="form-control" size="25" maxlength="50" name="dbHostForm" value="<?php echo htmlentities($dbHostForm); ?>" />
             </div>
@@ -1359,12 +1359,12 @@ 
         </div>
         <div class="form-group">
             <label class="col-sm-4"><?php echo get_lang('DBPort'); ?> </label>
-            <?php if ($installType == 'update'){ ?>
+            <?php if ($installType == 'update') { ?>
             <div class="col-sm-5">
                 <input type="hidden" name="dbPortForm" value="<?php echo htmlentities($dbPortForm); ?>" /><?php echo $dbPortForm; ?>
             </div>
             <div class="col-sm-3"></div>
-            <?php }else{ ?>
+            <?php } else { ?>
             <div class="col-sm-5">
                 <input type="text" class="form-control" size="25" maxlength="50" name="dbPortForm" value="<?php echo htmlentities($dbPortForm); ?>" />
             </div>
@@ -1390,7 +1390,7 @@ 
             <?php
             //Database Name fix replace weird chars
             if ($installType != INSTALL_TYPE_UPDATE) {
-                $dbNameForm = str_replace(array('-','*', '$', ' ', '.'), '', $dbNameForm);
+                $dbNameForm = str_replace(array('-', '*', '$', ' ', '.'), '', $dbNameForm);
             }
 
             displayDatabaseParameter(
@@ -1489,7 +1489,7 @@ 
     if (!empty($title)) {
         $panelTitle = Display::div($title, array('class' => 'panel-heading'));
         $panelBody = Display::div($content, array('class' => 'panel-body'));
-        $panelParent = Display::div($panelTitle . $panelBody, array('id' => $id, 'class' => 'panel panel-'.$style));
+        $panelParent = Display::div($panelTitle.$panelBody, array('id' => $id, 'class' => 'panel panel-'.$style));
     } else {
         $panelBody = Display::div($html, array('class' => 'panel-body'));
         $panelParent = Display::div($panelBody, array('id' => $id, 'class' => 'panel panel-'.$style));
@@ -1514,9 +1514,9 @@ 
     $displayWhenUpdate = 'true'
 ) {
     $html = '<div class="form-group">';
-    $html .= '<label class="col-sm-6 control-label">' . $parameterName . '</label>';
+    $html .= '<label class="col-sm-6 control-label">'.$parameterName.'</label>';
     if ($installType == INSTALL_TYPE_UPDATE && $displayWhenUpdate) {
-        $html .= '<input type="hidden" name="' . $formFieldName . '" value="'. api_htmlentities($parameterValue, ENT_QUOTES). '" />' . $parameterValue;
+        $html .= '<input type="hidden" name="'.$formFieldName.'" value="'.api_htmlentities($parameterValue, ENT_QUOTES).'" />'.$parameterValue;
     } else {
         $html .= '<div class="col-sm-6"><input class="form-control" type="text" size="'.FORM_FIELD_DISPLAY_LENGTH.'" maxlength="'.MAX_FORM_FIELD_LENGTH.'" name="'.$formFieldName.'" value="'.api_htmlentities($parameterValue, ENT_QUOTES).'" />'."</div>";
     }
@@ -1563,7 +1563,7 @@ 
         $languageForm = $_SESSION['install_language'];
     }
     echo '<div class="RequirementHeading">';
-    echo "<h2>" . display_step_sequence() . get_lang("CfgSetting") . "</h2>";
+    echo "<h2>".display_step_sequence().get_lang("CfgSetting")."</h2>";
     echo '</div>';
 
     echo '<p>'.get_lang('ConfigSettingsInfo').' <strong>app/config/configuration.php</strong></p>';
@@ -1581,14 +1581,14 @@ 
 
     // Parameters 3 and 4: administrator's names
 
-    $html .=  display_configuration_parameter($installType, get_lang('AdminFirstName'), 'adminFirstName', $adminFirstName);
-    $html .=  display_configuration_parameter($installType, get_lang('AdminLastName'), 'adminLastName', $adminLastName);
+    $html .= display_configuration_parameter($installType, get_lang('AdminFirstName'), 'adminFirstName', $adminFirstName);
+    $html .= display_configuration_parameter($installType, get_lang('AdminLastName'), 'adminLastName', $adminLastName);
 
     //Parameter 3: administrator's email
-    $html .=  display_configuration_parameter($installType, get_lang('AdminEmail'), 'emailForm', $emailForm);
+    $html .= display_configuration_parameter($installType, get_lang('AdminEmail'), 'emailForm', $emailForm);
 
     //Parameter 6: administrator's telephone
-    $html .=  display_configuration_parameter($installType, get_lang('AdminPhone'), 'adminPhoneForm', $adminPhoneForm);
+    $html .= display_configuration_parameter($installType, get_lang('AdminPhone'), 'adminPhoneForm', $adminPhoneForm);
 
 
     echo panel($html, get_lang('Administrator'), 'administrator');
@@ -1607,12 +1607,12 @@ 
         $html .= display_language_selection_box('languageForm', $languageForm);
         $html .= '</div>';
     }
-    $html.= "</div>";
+    $html .= "</div>";
 
 
     //Second parameter: Chamilo URL
     $html .= '<div class="form-group">';
-    $html .= '<label class="col-sm-6 control-label">'.get_lang('ChamiloURL') .get_lang('ThisFieldIsRequired').'</label>';
+    $html .= '<label class="col-sm-6 control-label">'.get_lang('ChamiloURL').get_lang('ThisFieldIsRequired').'</label>';
 
 
 
@@ -1636,34 +1636,34 @@ 
 
 
     $html .= '<div class="form-group">
-            <label class="col-sm-6 control-label">' . get_lang("EncryptMethodUserPass") . '</label>
+            <label class="col-sm-6 control-label">' . get_lang("EncryptMethodUserPass").'</label>
         <div class="col-sm-6">';
     if ($installType == 'update') {
-        $html .= '<input type="hidden" name="encryptPassForm" value="'. $encryptPassForm .'" />'. $encryptPassForm;
+        $html .= '<input type="hidden" name="encryptPassForm" value="'.$encryptPassForm.'" />'.$encryptPassForm;
     } else {
 
         $html .= '<div class="checkbox">
                     <label>
-                        <input  type="radio" name="encryptPassForm" value="bcrypt" id="encryptPass1" '. ($encryptPassForm == 'bcrypt' ? 'checked="checked" ':'') .'/> bcrypt
+                        <input  type="radio" name="encryptPassForm" value="bcrypt" id="encryptPass1" '. ($encryptPassForm == 'bcrypt' ? 'checked="checked" ' : '').'/> bcrypt
                     </label>';
 
         $html .= '<label>
-                        <input  type="radio" name="encryptPassForm" value="sha1" id="encryptPass1" '. ($encryptPassForm == 'sha1' ? 'checked="checked" ':'') .'/> sha1
+                        <input  type="radio" name="encryptPassForm" value="sha1" id="encryptPass1" '. ($encryptPassForm == 'sha1' ? 'checked="checked" ' : '').'/> sha1
                     </label>';
 
         $html .= '<label>
-                        <input type="radio" name="encryptPassForm" value="md5" id="encryptPass0" '. ($encryptPassForm == 'md5' ? 'checked="checked" ':'') .'/> md5
+                        <input type="radio" name="encryptPassForm" value="md5" id="encryptPass0" '. ($encryptPassForm == 'md5' ? 'checked="checked" ' : '').'/> md5
                     </label>';
 
         $html .= '<label>
-                        <input type="radio" name="encryptPassForm" value="none" id="encryptPass2" '. ($encryptPassForm == 'none' ? 'checked="checked" ':'') .'/>'. get_lang('None').'
+                        <input type="radio" name="encryptPassForm" value="none" id="encryptPass2" '. ($encryptPassForm == 'none' ? 'checked="checked" ' : '').'/>'.get_lang('None').'
                     </label>';
         $html .= '</div>';
     }
     $html .= '</div></div>';
 
     $html .= '<div class="form-group">
-            <label class="col-sm-6 control-label">' . get_lang('AllowSelfReg') . '</label>
+            <label class="col-sm-6 control-label">' . get_lang('AllowSelfReg').'</label>
             <div class="col-sm-6">';
     if ($installType == 'update') {
         if ($allowSelfReg == 'true') {
@@ -1673,17 +1673,17 @@ 
         } else {
             $label = get_lang('AfterApproval');
         }
-        $html .= '<input type="hidden" name="allowSelfReg" value="'. $allowSelfReg .'" />'. $label;
+        $html .= '<input type="hidden" name="allowSelfReg" value="'.$allowSelfReg.'" />'.$label;
     } else {
         $html .= '<div class="control-group">';
         $html .= '<label class="checkbox-inline">
-                        <input type="radio" name="allowSelfReg" value="1" id="allowSelfReg1" '. ($allowSelfReg == 'true' ? 'checked="checked" ' : '') . ' /> '. get_lang('Yes') .'
+                        <input type="radio" name="allowSelfReg" value="1" id="allowSelfReg1" '. ($allowSelfReg == 'true' ? 'checked="checked" ' : '').' /> '.get_lang('Yes').'
                     </label>';
         $html .= '<label class="checkbox-inline">
-                        <input type="radio" name="allowSelfReg" value="0" id="allowSelfReg0" '. ($allowSelfReg == 'false' ? '' : 'checked="checked" ') .' /> '. get_lang('No') .'
+                        <input type="radio" name="allowSelfReg" value="0" id="allowSelfReg0" '. ($allowSelfReg == 'false' ? '' : 'checked="checked" ').' /> '.get_lang('No').'
                     </label>';
          $html .= '<label class="checkbox-inline">
-                    <input type="radio" name="allowSelfReg" value="0" id="allowSelfReg0" '. ($allowSelfReg == 'approval' ? '' : 'checked="checked" ') .' /> '. get_lang('AfterApproval') .'
+                    <input type="radio" name="allowSelfReg" value="0" id="allowSelfReg0" '. ($allowSelfReg == 'approval' ? '' : 'checked="checked" ').' /> '.get_lang('AfterApproval').'
                 </label>';
         $html .= '</div>';
     }
@@ -1691,7 +1691,7 @@ 
     $html .= '</div>';
 
     $html .= '<div class="form-group">';
-    $html .= '<label class="col-sm-6 control-label">'. get_lang('AllowSelfRegProf') .'</label>
+    $html .= '<label class="col-sm-6 control-label">'.get_lang('AllowSelfRegProf').'</label>
         <div class="col-sm-6">';
     if ($installType == 'update') {
         if ($allowSelfRegProf == 'true') {
@@ -1699,16 +1699,16 @@ 
         } else {
             $label = get_lang('No');
         }
-        $html .= '<input type="hidden" name="allowSelfRegProf" value="'. $allowSelfRegProf.'" />'. $label;
+        $html .= '<input type="hidden" name="allowSelfRegProf" value="'.$allowSelfRegProf.'" />'.$label;
     } else {
         $html .= '<div class="control-group">
                 <label class="checkbox-inline">
-                    <input type="radio" name="allowSelfRegProf" value="1" id="allowSelfRegProf1" '. ($allowSelfRegProf ? 'checked="checked" ' : '') .'/>
-                ' . get_lang('Yes') .'
+                    <input type="radio" name="allowSelfRegProf" value="1" id="allowSelfRegProf1" '. ($allowSelfRegProf ? 'checked="checked" ' : '').'/>
+                ' . get_lang('Yes').'
                 </label>';
         $html .= '<label class="checkbox-inline">
-                    <input type="radio" name="allowSelfRegProf" value="0" id="allowSelfRegProf0" '. ($allowSelfRegProf ? '' : 'checked="checked" ') .' />
-                   '. get_lang('No') .'
+                    <input type="radio" name="allowSelfRegProf" value="0" id="allowSelfRegProf0" '. ($allowSelfRegProf ? '' : 'checked="checked" ').' />
+                   '. get_lang('No').'
                 </label>';
         $html .= '</div>';
     }
@@ -1773,7 +1773,7 @@ 
         "Macedonia", "Madagascar", "Malawi", "Malaysia", "Maldives", "Mali", "Malta", "Marshall Islands", "Mauritania", "Mauritius", "Mexico", "Micronesia", "Moldova", "Monaco", "Mongolia", "Morocco", "Mozambique", "Myanmar",
         "Namibia", "Nauru", "Nepa", "Netherlands", "New Zealand", "Nicaragua", "Niger", "Nigeria", "Norway",
         "Oman",
-        "Pakistan", "Palau", "Panama", "Papua New Guinea", "Paraguay", "Peru", "Philippines", "Poland","Portugal",
+        "Pakistan", "Palau", "Panama", "Papua New Guinea", "Paraguay", "Peru", "Philippines", "Poland", "Portugal",
         "Qatar",
         "Romania", "Russia", "Rwanda",
         "Saint Kitts and Nevis", "Saint Lucia", "Saint Vincent", "Samoa", "San Marino", "Sao Tome and Principe", "Saudi Arabia", "Senegal", "Serbia and Montenegro", "Seychelles", "Sierra Leone", "Singapore", "Slovakia", "Slovenia", "Solomon Islands", "Somalia", "South Africa", "Spain", "Sri Lanka", "Sudan", "Suriname", "Swaziland", "Sweden", "Switzerland", "Syria",
@@ -1820,11 +1820,11 @@ 
     $permissions_for_new_directories = isset($_SESSION['permissions_for_new_directories']) ? $_SESSION['permissions_for_new_directories'] : 0770;
     $permissions_for_new_files = isset($_SESSION['permissions_for_new_files']) ? $_SESSION['permissions_for_new_files'] : 0660;
     // use decoct() to store as string
-    $sql = "UPDATE $table SET selected_value = '0" . decoct($permissions_for_new_directories) . "'
+    $sql = "UPDATE $table SET selected_value = '0".decoct($permissions_for_new_directories)."'
               WHERE variable  = 'permissions_for_new_directories'";
     Database::query($sql);
 
-    $sql = "UPDATE $table SET selected_value = '0" . decoct($permissions_for_new_files) . "' WHERE variable  = 'permissions_for_new_files'";
+    $sql = "UPDATE $table SET selected_value = '0".decoct($permissions_for_new_files)."' WHERE variable  = 'permissions_for_new_files'";
     Database::query($sql);
 
     if (isset($_SESSION['permissions_for_new_directories'])) {
@@ -1844,8 +1844,8 @@ 
 function compare_setting_values($current_value, $wanted_value)
 {
     $current_value_string = $current_value;
-    $current_value = (float)$current_value;
-    $wanted_value = (float)$wanted_value;
+    $current_value = (float) $current_value;
+    $wanted_value = (float) $wanted_value;
 
     if ($current_value >= $wanted_value) {
         return Display::label($current_value_string, 'success');
@@ -1896,7 +1896,7 @@ 
 
                     fwrite($fp, $out);
                     while (!feof($fp)) {
-                        $result = str_replace("\r\n", '',fgets($fp, 128));
+                        $result = str_replace("\r\n", '', fgets($fp, 128));
                         if (!empty($result) && $result == '123') {
                             $output = true;
                         }
@@ -1919,7 +1919,7 @@ 
                     curl_setopt($ch, CURLOPT_URL, $url);
                     //curl_setopt($ch, CURLOPT_TIMEOUT, 30);
                     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-                    $result = curl_exec ($ch);
+                    $result = curl_exec($ch);
                     if (!empty($result) && $result == '123') {
                         $output = true;
                     }
@@ -2679,12 +2679,12 @@ 
         $adminPhoneForm,
         '', //$picture_uri = '',
         PLATFORM_AUTH_SOURCE,
-        '',//$expirationDate,
+        '', //$expirationDate,
         1,
         0,
         null,
         '',
-        false,  //$send_mail = false,
+        false, //$send_mail = false,
         true //$isAdmin = false
     );
 
@@ -2706,7 +2706,7 @@ 
         0,
         null,
         '',
-        false,  //$send_mail = false,
+        false, //$send_mail = false,
         false //$isAdmin = false
     );
 
@@ -2772,7 +2772,7 @@ 
                 SET selected_value = '".$param->selected_value."'
                 WHERE variable = '".$param->variable."'";
         if (!empty($param->subkey)) {
-            $sql .= " AND subkey='" . $param->subkey . "'";
+            $sql .= " AND subkey='".$param->subkey."'";
         }
         Database::query($sql);
     }

main/link/link.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 
 // Including libraries
 require_once '../inc/global.inc.php';
-$current_course_tool  = TOOL_LINK;
+$current_course_tool = TOOL_LINK;
 
 $this_section = SECTION_COURSES;
 api_protect_course_script();