Completed
Push — 1.10.x ( 51aeba...107530 )
by Yannick
123:47 queued 78:53
created
main/install/update-configuration.inc.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -10,11 +10,11 @@  discard block
 block discarded – undo
10 10
  */
11 11
 if (defined('SYSTEM_INSTALLATION')) {
12 12
 
13
-    error_log("Starting " . basename(__FILE__));
13
+    error_log("Starting ".basename(__FILE__));
14 14
     $perm = api_get_permissions_for_new_files();
15 15
 
16
-    $oldConfFile = api_get_path(SYS_CODE_PATH) . 'inc/conf/configuration.php';
17
-    $newConfFile = api_get_path(CONFIGURATION_PATH) . 'configuration.php';
16
+    $oldConfFile = api_get_path(SYS_CODE_PATH).'inc/conf/configuration.php';
17
+    $newConfFile = api_get_path(CONFIGURATION_PATH).'configuration.php';
18 18
 
19 19
     if (file_exists($oldConfFile)) {
20 20
         copy($oldConfFile, $newConfFile);
@@ -37,18 +37,18 @@  discard block
 block discarded – undo
37 37
         $ignore = false;
38 38
         if (stripos($line, '$_configuration[\'system_version\']') !== false) {
39 39
             $found_version = true;
40
-            $line = '$_configuration[\'system_version\'] = \'' . $new_version . '\';' . "\r\n";
40
+            $line = '$_configuration[\'system_version\'] = \''.$new_version.'\';'."\r\n";
41 41
        } elseif (stripos($line, '$_configuration[\'system_stable\']') !== false) {
42 42
             $found_stable = true;
43
-            $line = '$_configuration[\'system_stable\'] = ' . ($new_version_stable ? 'true' : 'false') . ';' . "\r\n";
43
+            $line = '$_configuration[\'system_stable\'] = '.($new_version_stable ? 'true' : 'false').';'."\r\n";
44 44
         } elseif (stripos($line, '$_configuration[\'software_name\']') !== false) {
45 45
             $found_software_name = true;
46
-            $line = '$_configuration[\'software_name\'] = \'' . $software_name . '\';' . "\r\n";
46
+            $line = '$_configuration[\'software_name\'] = \''.$software_name.'\';'."\r\n";
47 47
         } elseif (stripos($line, '$_configuration[\'software_url\']') !== false) {
48 48
             $found_software_url = true;
49
-            $line = '$_configuration[\'software_url\'] = \'' . $software_url . '\';' . "\r\n";
49
+            $line = '$_configuration[\'software_url\'] = \''.$software_url.'\';'."\r\n";
50 50
         } elseif (stripos($line, '$userPasswordCrypted') !== false) {
51
-            $line = '$_configuration[\'password_encryption\'] = \'' .$userPasswordCrypted.'\';' . "\r\n";
51
+            $line = '$_configuration[\'password_encryption\'] = \''.$userPasswordCrypted.'\';'."\r\n";
52 52
         } elseif (stripos($line, '?>') !== false) {
53 53
             $ignore = true;
54 54
         }
@@ -58,21 +58,21 @@  discard block
 block discarded – undo
58 58
     }
59 59
 
60 60
     if (!$found_version) {
61
-        fwrite($fh, '$_configuration[\'system_version\'] = \'' . $new_version . '\';' . "\r\n");
61
+        fwrite($fh, '$_configuration[\'system_version\'] = \''.$new_version.'\';'."\r\n");
62 62
     }
63 63
     if (!$found_stable) {
64
-        fwrite($fh, '$_configuration[\'system_stable\'] = ' . ($new_version_stable ? 'true' : 'false') . ';' . "\r\n");
64
+        fwrite($fh, '$_configuration[\'system_stable\'] = '.($new_version_stable ? 'true' : 'false').';'."\r\n");
65 65
     }
66 66
     if (!$found_software_name) {
67
-        fwrite($fh, '$_configuration[\'software_name\'] = \'' . $software_name . '\';' . "\r\n");
67
+        fwrite($fh, '$_configuration[\'software_name\'] = \''.$software_name.'\';'."\r\n");
68 68
     }
69 69
     if (!$found_software_url) {
70
-        fwrite($fh, '$_configuration[\'software_url\'] = \'' . $software_url . '\';' . "\r\n");
70
+        fwrite($fh, '$_configuration[\'software_url\'] = \''.$software_url.'\';'."\r\n");
71 71
     }
72 72
     fwrite($fh, '?>');
73 73
     fclose($fh);
74 74
 
75 75
     error_log("configuration.php file updated.");
76 76
 } else {
77
-    echo 'You are not allowed here !'. __FILE__;
77
+    echo 'You are not allowed here !'.__FILE__;
78 78
 }
Please login to merge, or discard this patch.
main/install/update-files-1.9.0-1.10.0.inc.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
  * current configuration file.
14 14
  * @package chamilo.install
15 15
  */
16
-error_log("Starting " . basename(__FILE__));
16
+error_log("Starting ".basename(__FILE__));
17 17
 
18 18
 global $debug;
19 19
 
@@ -142,12 +142,12 @@  discard block
 block discarded – undo
142 142
 
143 143
     $list = scandir($langPath);
144 144
     foreach ($list as $entry) {
145
-        if (is_dir($langPath . $entry) &&
145
+        if (is_dir($langPath.$entry) &&
146 146
             in_array($entry, $officialLanguages)
147 147
         ) {
148 148
             foreach ($filesToDelete as $file) {
149
-                if (is_file($langPath . $entry . '/' . $file . '.inc.php')) {
150
-                    unlink($langPath . $entry . '/' . $file . '.inc.php');
149
+                if (is_file($langPath.$entry.'/'.$file.'.inc.php')) {
150
+                    unlink($langPath.$entry.'/'.$file.'.inc.php');
151 151
                 }
152 152
             }
153 153
         }
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
234 234
     @rrmdir(api_get_path(SYS_PATH).'archive');
235 235
 
236 236
 } else {
237
-    echo 'You are not allowed here !'. __FILE__;
237
+    echo 'You are not allowed here !'.__FILE__;
238 238
 }
239 239
 
240 240
 /**
Please login to merge, or discard this patch.
main/install/install.lib.php 1 patch
Spacing   +56 added lines, -56 removed lines patch added patch discarded remove patch
@@ -396,7 +396,7 @@  discard block
 block discarded – undo
396 396
     if (!is_array($result)) {
397 397
         $result = array();
398 398
         $exceptions = array('.', '..', 'CVS', '.svn');
399
-        $search       = array('_latin',   '_unicode',   '_corporate',   '_org'  , '_KM',   '_');
399
+        $search       = array('_latin', '_unicode', '_corporate', '_org', '_KM', '_');
400 400
         $replace_with = array(' (Latin)', ' (unicode)', ' (corporate)', ' (org)', ' (KM)', ' ');
401 401
         $dirname = api_get_path(SYS_LANG_PATH);
402 402
         $handle = opendir($dirname);
@@ -430,9 +430,9 @@  discard block
 block discarded – undo
430 430
     if ($handle = opendir($directory)) {
431 431
         while (false !== ($file = readdir($handle))) {
432 432
             if ($file != "." && $file != "..") {
433
-                if (is_dir($directory. "/" . $file)) {
434
-                    $array_items = array_merge($array_items, my_directory_to_array($directory. '/' . $file));
435
-                    $file = $directory . "/" . $file;
433
+                if (is_dir($directory."/".$file)) {
434
+                    $array_items = array_merge($array_items, my_directory_to_array($directory.'/'.$file));
435
+                    $file = $directory."/".$file;
436 436
                     $array_items[] = preg_replace("/\/\//si", '/', $file);
437 437
                 }
438 438
             }
@@ -636,7 +636,7 @@  discard block
 block discarded – undo
636 636
     <h2><?php get_lang('WelcomeToTheChamiloInstaller'); ?></h2>
637 637
     <div class="RequirementHeading">
638 638
         <h2><?php echo display_step_sequence(); ?>
639
-            <?php echo get_lang('InstallationLanguage');?>
639
+            <?php echo get_lang('InstallationLanguage'); ?>
640 640
         </h2>
641 641
         <p><?php echo get_lang('PleaseSelectInstallationProcessLanguage'); ?>:</p>
642 642
         <form id="lang_form" method="post" action="<?php echo api_get_self(); ?>">
@@ -709,7 +709,7 @@  discard block
 block discarded – undo
709 709
     if (phpversion() < REQUIRED_PHP_VERSION) {
710 710
         echo '<strong><font color="red">'.get_lang('PHPVersionError').'</font></strong>';
711 711
     } else {
712
-        echo '<strong><font color="green">'.get_lang('PHPVersionOK'). ' '.phpversion().'</font></strong>';
712
+        echo '<strong><font color="green">'.get_lang('PHPVersionOK').' '.phpversion().'</font></strong>';
713 713
     }
714 714
     echo '</td>
715 715
             </tr>
@@ -881,7 +881,7 @@  discard block
 block discarded – undo
881 881
             if ($file_course_test_was_created == true) {
882 882
                 break;
883 883
             }
884
-            $r = @touch($course_dir.'/test.php',$perm);
884
+            $r = @touch($course_dir.'/test.php', $perm);
885 885
             if ($r === true) {
886 886
                 $fil_perm_verified = $perm;
887 887
                 if (check_course_script_interpretation($course_dir, $course_attempt_name, 'test.php')) {
@@ -1137,7 +1137,7 @@  discard block
 block discarded – undo
1137 1137
 function get_contact_registration_form()
1138 1138
 {
1139 1139
 
1140
-    $html ='
1140
+    $html = '
1141 1141
    <form class="form-horizontal">
1142 1142
     <div class="panel panel-default">
1143 1143
     <div class="panel-body">
@@ -1234,7 +1234,7 @@  discard block
 block discarded – undo
1234 1234
             <div class="col-sm-9">
1235 1235
                 <div class="radio">
1236 1236
                     <label>
1237
-                        <input type="radio" name="financial_decision" id="financial_decision1" value="1" checked /> ' . get_lang('Yes') . '
1237
+                        <input type="radio" name="financial_decision" id="financial_decision1" value="1" checked /> ' . get_lang('Yes').'
1238 1238
                     </label>
1239 1239
                 </div>
1240 1240
                 <div class="radio">
@@ -1293,8 +1293,8 @@  discard block
 block discarded – undo
1293 1293
             echo '<input type="hidden" name="'.$formFieldName.'" id="'.$formFieldName.'" value="'.api_htmlentities($parameterValue).'" />';
1294 1294
             echo api_htmlentities($parameterValue);
1295 1295
         } else {
1296
-            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>";
1297
-            echo '<div class="col-sm-3">' . $extra_notice . '</div>';
1296
+            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>";
1297
+            echo '<div class="col-sm-3">'.$extra_notice.'</div>';
1298 1298
         }
1299 1299
 
1300 1300
     }
@@ -1330,12 +1330,12 @@  discard block
 block discarded – undo
1330 1330
         $dbNameForm = $_configuration['main_database'];
1331 1331
         $dbPortForm = isset($_configuration['db_port']) ? $_configuration['db_port'] : '';
1332 1332
 
1333
-        echo '<div class="RequirementHeading"><h2>' . display_step_sequence() .get_lang('DBSetting') . '</h2></div>';
1333
+        echo '<div class="RequirementHeading"><h2>'.display_step_sequence().get_lang('DBSetting').'</h2></div>';
1334 1334
         echo '<div class="RequirementContent">';
1335 1335
         echo get_lang('DBSettingUpgradeIntro');
1336 1336
         echo '</div>';
1337 1337
     } else {
1338
-        echo '<div class="RequirementHeading"><h2>' . display_step_sequence() .get_lang('DBSetting') . '</h2></div>';
1338
+        echo '<div class="RequirementHeading"><h2>'.display_step_sequence().get_lang('DBSetting').'</h2></div>';
1339 1339
         echo '<div class="RequirementContent">';
1340 1340
         echo get_lang('DBSettingIntro');
1341 1341
         echo '</div>';
@@ -1345,12 +1345,12 @@  discard block
 block discarded – undo
1345 1345
         <div class="panel-body">
1346 1346
         <div class="form-group">
1347 1347
             <label class="col-sm-4"><?php echo get_lang('DBHost'); ?> </label>
1348
-            <?php if ($installType == 'update'){ ?>
1348
+            <?php if ($installType == 'update') { ?>
1349 1349
             <div class="col-sm-5">
1350 1350
                 <input type="hidden" name="dbHostForm" value="<?php echo htmlentities($dbHostForm); ?>" /><?php echo $dbHostForm; ?>
1351 1351
             </div>
1352 1352
             <div class="col-sm-3"></div>
1353
-            <?php }else{ ?>
1353
+            <?php } else { ?>
1354 1354
             <div class="col-sm-5">
1355 1355
                 <input type="text" class="form-control" size="25" maxlength="50" name="dbHostForm" value="<?php echo htmlentities($dbHostForm); ?>" />
1356 1356
             </div>
@@ -1359,12 +1359,12 @@  discard block
 block discarded – undo
1359 1359
         </div>
1360 1360
         <div class="form-group">
1361 1361
             <label class="col-sm-4"><?php echo get_lang('DBPort'); ?> </label>
1362
-            <?php if ($installType == 'update'){ ?>
1362
+            <?php if ($installType == 'update') { ?>
1363 1363
             <div class="col-sm-5">
1364 1364
                 <input type="hidden" name="dbPortForm" value="<?php echo htmlentities($dbPortForm); ?>" /><?php echo $dbPortForm; ?>
1365 1365
             </div>
1366 1366
             <div class="col-sm-3"></div>
1367
-            <?php }else{ ?>
1367
+            <?php } else { ?>
1368 1368
             <div class="col-sm-5">
1369 1369
                 <input type="text" class="form-control" size="25" maxlength="50" name="dbPortForm" value="<?php echo htmlentities($dbPortForm); ?>" />
1370 1370
             </div>
@@ -1390,7 +1390,7 @@  discard block
 block discarded – undo
1390 1390
             <?php
1391 1391
             //Database Name fix replace weird chars
1392 1392
             if ($installType != INSTALL_TYPE_UPDATE) {
1393
-                $dbNameForm = str_replace(array('-','*', '$', ' ', '.'), '', $dbNameForm);
1393
+                $dbNameForm = str_replace(array('-', '*', '$', ' ', '.'), '', $dbNameForm);
1394 1394
             }
1395 1395
 
1396 1396
             displayDatabaseParameter(
@@ -1489,7 +1489,7 @@  discard block
 block discarded – undo
1489 1489
     if (!empty($title)) {
1490 1490
         $panelTitle = Display::div($title, array('class' => 'panel-heading'));
1491 1491
         $panelBody = Display::div($content, array('class' => 'panel-body'));
1492
-        $panelParent = Display::div($panelTitle . $panelBody, array('id' => $id, 'class' => 'panel panel-'.$style));
1492
+        $panelParent = Display::div($panelTitle.$panelBody, array('id' => $id, 'class' => 'panel panel-'.$style));
1493 1493
     } else {
1494 1494
         $panelBody = Display::div($html, array('class' => 'panel-body'));
1495 1495
         $panelParent = Display::div($panelBody, array('id' => $id, 'class' => 'panel panel-'.$style));
@@ -1514,9 +1514,9 @@  discard block
 block discarded – undo
1514 1514
     $displayWhenUpdate = 'true'
1515 1515
 ) {
1516 1516
     $html = '<div class="form-group">';
1517
-    $html .= '<label class="col-sm-6 control-label">' . $parameterName . '</label>';
1517
+    $html .= '<label class="col-sm-6 control-label">'.$parameterName.'</label>';
1518 1518
     if ($installType == INSTALL_TYPE_UPDATE && $displayWhenUpdate) {
1519
-        $html .= '<input type="hidden" name="' . $formFieldName . '" value="'. api_htmlentities($parameterValue, ENT_QUOTES). '" />' . $parameterValue;
1519
+        $html .= '<input type="hidden" name="'.$formFieldName.'" value="'.api_htmlentities($parameterValue, ENT_QUOTES).'" />'.$parameterValue;
1520 1520
     } else {
1521 1521
         $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>";
1522 1522
     }
@@ -1563,7 +1563,7 @@  discard block
 block discarded – undo
1563 1563
         $languageForm = $_SESSION['install_language'];
1564 1564
     }
1565 1565
     echo '<div class="RequirementHeading">';
1566
-    echo "<h2>" . display_step_sequence() . get_lang("CfgSetting") . "</h2>";
1566
+    echo "<h2>".display_step_sequence().get_lang("CfgSetting")."</h2>";
1567 1567
     echo '</div>';
1568 1568
 
1569 1569
     echo '<p>'.get_lang('ConfigSettingsInfo').' <strong>app/config/configuration.php</strong></p>';
@@ -1581,14 +1581,14 @@  discard block
 block discarded – undo
1581 1581
 
1582 1582
     // Parameters 3 and 4: administrator's names
1583 1583
 
1584
-    $html .=  display_configuration_parameter($installType, get_lang('AdminFirstName'), 'adminFirstName', $adminFirstName);
1585
-    $html .=  display_configuration_parameter($installType, get_lang('AdminLastName'), 'adminLastName', $adminLastName);
1584
+    $html .= display_configuration_parameter($installType, get_lang('AdminFirstName'), 'adminFirstName', $adminFirstName);
1585
+    $html .= display_configuration_parameter($installType, get_lang('AdminLastName'), 'adminLastName', $adminLastName);
1586 1586
 
1587 1587
     //Parameter 3: administrator's email
1588
-    $html .=  display_configuration_parameter($installType, get_lang('AdminEmail'), 'emailForm', $emailForm);
1588
+    $html .= display_configuration_parameter($installType, get_lang('AdminEmail'), 'emailForm', $emailForm);
1589 1589
 
1590 1590
     //Parameter 6: administrator's telephone
1591
-    $html .=  display_configuration_parameter($installType, get_lang('AdminPhone'), 'adminPhoneForm', $adminPhoneForm);
1591
+    $html .= display_configuration_parameter($installType, get_lang('AdminPhone'), 'adminPhoneForm', $adminPhoneForm);
1592 1592
 
1593 1593
 
1594 1594
     echo panel($html, get_lang('Administrator'), 'administrator');
@@ -1607,12 +1607,12 @@  discard block
 block discarded – undo
1607 1607
         $html .= display_language_selection_box('languageForm', $languageForm);
1608 1608
         $html .= '</div>';
1609 1609
     }
1610
-    $html.= "</div>";
1610
+    $html .= "</div>";
1611 1611
 
1612 1612
 
1613 1613
     //Second parameter: Chamilo URL
1614 1614
     $html .= '<div class="form-group">';
1615
-    $html .= '<label class="col-sm-6 control-label">'.get_lang('ChamiloURL') .get_lang('ThisFieldIsRequired').'</label>';
1615
+    $html .= '<label class="col-sm-6 control-label">'.get_lang('ChamiloURL').get_lang('ThisFieldIsRequired').'</label>';
1616 1616
 
1617 1617
 
1618 1618
 
@@ -1636,34 +1636,34 @@  discard block
 block discarded – undo
1636 1636
 
1637 1637
 
1638 1638
     $html .= '<div class="form-group">
1639
-            <label class="col-sm-6 control-label">' . get_lang("EncryptMethodUserPass") . '</label>
1639
+            <label class="col-sm-6 control-label">' . get_lang("EncryptMethodUserPass").'</label>
1640 1640
         <div class="col-sm-6">';
1641 1641
     if ($installType == 'update') {
1642
-        $html .= '<input type="hidden" name="encryptPassForm" value="'. $encryptPassForm .'" />'. $encryptPassForm;
1642
+        $html .= '<input type="hidden" name="encryptPassForm" value="'.$encryptPassForm.'" />'.$encryptPassForm;
1643 1643
     } else {
1644 1644
 
1645 1645
         $html .= '<div class="checkbox">
1646 1646
                     <label>
1647
-                        <input  type="radio" name="encryptPassForm" value="bcrypt" id="encryptPass1" '. ($encryptPassForm == 'bcrypt' ? 'checked="checked" ':'') .'/> bcrypt
1647
+                        <input  type="radio" name="encryptPassForm" value="bcrypt" id="encryptPass1" '. ($encryptPassForm == 'bcrypt' ? 'checked="checked" ' : '').'/> bcrypt
1648 1648
                     </label>';
1649 1649
 
1650 1650
         $html .= '<label>
1651
-                        <input  type="radio" name="encryptPassForm" value="sha1" id="encryptPass1" '. ($encryptPassForm == 'sha1' ? 'checked="checked" ':'') .'/> sha1
1651
+                        <input  type="radio" name="encryptPassForm" value="sha1" id="encryptPass1" '. ($encryptPassForm == 'sha1' ? 'checked="checked" ' : '').'/> sha1
1652 1652
                     </label>';
1653 1653
 
1654 1654
         $html .= '<label>
1655
-                        <input type="radio" name="encryptPassForm" value="md5" id="encryptPass0" '. ($encryptPassForm == 'md5' ? 'checked="checked" ':'') .'/> md5
1655
+                        <input type="radio" name="encryptPassForm" value="md5" id="encryptPass0" '. ($encryptPassForm == 'md5' ? 'checked="checked" ' : '').'/> md5
1656 1656
                     </label>';
1657 1657
 
1658 1658
         $html .= '<label>
1659
-                        <input type="radio" name="encryptPassForm" value="none" id="encryptPass2" '. ($encryptPassForm == 'none' ? 'checked="checked" ':'') .'/>'. get_lang('None').'
1659
+                        <input type="radio" name="encryptPassForm" value="none" id="encryptPass2" '. ($encryptPassForm == 'none' ? 'checked="checked" ' : '').'/>'.get_lang('None').'
1660 1660
                     </label>';
1661 1661
         $html .= '</div>';
1662 1662
     }
1663 1663
     $html .= '</div></div>';
1664 1664
 
1665 1665
     $html .= '<div class="form-group">
1666
-            <label class="col-sm-6 control-label">' . get_lang('AllowSelfReg') . '</label>
1666
+            <label class="col-sm-6 control-label">' . get_lang('AllowSelfReg').'</label>
1667 1667
             <div class="col-sm-6">';
1668 1668
     if ($installType == 'update') {
1669 1669
         if ($allowSelfReg == 'true') {
@@ -1673,17 +1673,17 @@  discard block
 block discarded – undo
1673 1673
         } else {
1674 1674
             $label = get_lang('AfterApproval');
1675 1675
         }
1676
-        $html .= '<input type="hidden" name="allowSelfReg" value="'. $allowSelfReg .'" />'. $label;
1676
+        $html .= '<input type="hidden" name="allowSelfReg" value="'.$allowSelfReg.'" />'.$label;
1677 1677
     } else {
1678 1678
         $html .= '<div class="control-group">';
1679 1679
         $html .= '<label class="checkbox-inline">
1680
-                        <input type="radio" name="allowSelfReg" value="1" id="allowSelfReg1" '. ($allowSelfReg == 'true' ? 'checked="checked" ' : '') . ' /> '. get_lang('Yes') .'
1680
+                        <input type="radio" name="allowSelfReg" value="1" id="allowSelfReg1" '. ($allowSelfReg == 'true' ? 'checked="checked" ' : '').' /> '.get_lang('Yes').'
1681 1681
                     </label>';
1682 1682
         $html .= '<label class="checkbox-inline">
1683
-                        <input type="radio" name="allowSelfReg" value="0" id="allowSelfReg0" '. ($allowSelfReg == 'false' ? '' : 'checked="checked" ') .' /> '. get_lang('No') .'
1683
+                        <input type="radio" name="allowSelfReg" value="0" id="allowSelfReg0" '. ($allowSelfReg == 'false' ? '' : 'checked="checked" ').' /> '.get_lang('No').'
1684 1684
                     </label>';
1685 1685
          $html .= '<label class="checkbox-inline">
1686
-                    <input type="radio" name="allowSelfReg" value="0" id="allowSelfReg0" '. ($allowSelfReg == 'approval' ? '' : 'checked="checked" ') .' /> '. get_lang('AfterApproval') .'
1686
+                    <input type="radio" name="allowSelfReg" value="0" id="allowSelfReg0" '. ($allowSelfReg == 'approval' ? '' : 'checked="checked" ').' /> '.get_lang('AfterApproval').'
1687 1687
                 </label>';
1688 1688
         $html .= '</div>';
1689 1689
     }
@@ -1691,7 +1691,7 @@  discard block
 block discarded – undo
1691 1691
     $html .= '</div>';
1692 1692
 
1693 1693
     $html .= '<div class="form-group">';
1694
-    $html .= '<label class="col-sm-6 control-label">'. get_lang('AllowSelfRegProf') .'</label>
1694
+    $html .= '<label class="col-sm-6 control-label">'.get_lang('AllowSelfRegProf').'</label>
1695 1695
         <div class="col-sm-6">';
1696 1696
     if ($installType == 'update') {
1697 1697
         if ($allowSelfRegProf == 'true') {
@@ -1699,16 +1699,16 @@  discard block
 block discarded – undo
1699 1699
         } else {
1700 1700
             $label = get_lang('No');
1701 1701
         }
1702
-        $html .= '<input type="hidden" name="allowSelfRegProf" value="'. $allowSelfRegProf.'" />'. $label;
1702
+        $html .= '<input type="hidden" name="allowSelfRegProf" value="'.$allowSelfRegProf.'" />'.$label;
1703 1703
     } else {
1704 1704
         $html .= '<div class="control-group">
1705 1705
                 <label class="checkbox-inline">
1706
-                    <input type="radio" name="allowSelfRegProf" value="1" id="allowSelfRegProf1" '. ($allowSelfRegProf ? 'checked="checked" ' : '') .'/>
1707
-                ' . get_lang('Yes') .'
1706
+                    <input type="radio" name="allowSelfRegProf" value="1" id="allowSelfRegProf1" '. ($allowSelfRegProf ? 'checked="checked" ' : '').'/>
1707
+                ' . get_lang('Yes').'
1708 1708
                 </label>';
1709 1709
         $html .= '<label class="checkbox-inline">
1710
-                    <input type="radio" name="allowSelfRegProf" value="0" id="allowSelfRegProf0" '. ($allowSelfRegProf ? '' : 'checked="checked" ') .' />
1711
-                   '. get_lang('No') .'
1710
+                    <input type="radio" name="allowSelfRegProf" value="0" id="allowSelfRegProf0" '. ($allowSelfRegProf ? '' : 'checked="checked" ').' />
1711
+                   '. get_lang('No').'
1712 1712
                 </label>';
1713 1713
         $html .= '</div>';
1714 1714
     }
@@ -1773,7 +1773,7 @@  discard block
 block discarded – undo
1773 1773
         "Macedonia", "Madagascar", "Malawi", "Malaysia", "Maldives", "Mali", "Malta", "Marshall Islands", "Mauritania", "Mauritius", "Mexico", "Micronesia", "Moldova", "Monaco", "Mongolia", "Morocco", "Mozambique", "Myanmar",
1774 1774
         "Namibia", "Nauru", "Nepa", "Netherlands", "New Zealand", "Nicaragua", "Niger", "Nigeria", "Norway",
1775 1775
         "Oman",
1776
-        "Pakistan", "Palau", "Panama", "Papua New Guinea", "Paraguay", "Peru", "Philippines", "Poland","Portugal",
1776
+        "Pakistan", "Palau", "Panama", "Papua New Guinea", "Paraguay", "Peru", "Philippines", "Poland", "Portugal",
1777 1777
         "Qatar",
1778 1778
         "Romania", "Russia", "Rwanda",
1779 1779
         "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 @@  discard block
 block discarded – undo
1820 1820
     $permissions_for_new_directories = isset($_SESSION['permissions_for_new_directories']) ? $_SESSION['permissions_for_new_directories'] : 0770;
1821 1821
     $permissions_for_new_files = isset($_SESSION['permissions_for_new_files']) ? $_SESSION['permissions_for_new_files'] : 0660;
1822 1822
     // use decoct() to store as string
1823
-    $sql = "UPDATE $table SET selected_value = '0" . decoct($permissions_for_new_directories) . "'
1823
+    $sql = "UPDATE $table SET selected_value = '0".decoct($permissions_for_new_directories)."'
1824 1824
               WHERE variable  = 'permissions_for_new_directories'";
1825 1825
     Database::query($sql);
1826 1826
 
1827
-    $sql = "UPDATE $table SET selected_value = '0" . decoct($permissions_for_new_files) . "' WHERE variable  = 'permissions_for_new_files'";
1827
+    $sql = "UPDATE $table SET selected_value = '0".decoct($permissions_for_new_files)."' WHERE variable  = 'permissions_for_new_files'";
1828 1828
     Database::query($sql);
1829 1829
 
1830 1830
     if (isset($_SESSION['permissions_for_new_directories'])) {
@@ -1844,8 +1844,8 @@  discard block
 block discarded – undo
1844 1844
 function compare_setting_values($current_value, $wanted_value)
1845 1845
 {
1846 1846
     $current_value_string = $current_value;
1847
-    $current_value = (float)$current_value;
1848
-    $wanted_value = (float)$wanted_value;
1847
+    $current_value = (float) $current_value;
1848
+    $wanted_value = (float) $wanted_value;
1849 1849
 
1850 1850
     if ($current_value >= $wanted_value) {
1851 1851
         return Display::label($current_value_string, 'success');
@@ -1896,7 +1896,7 @@  discard block
 block discarded – undo
1896 1896
 
1897 1897
                     fwrite($fp, $out);
1898 1898
                     while (!feof($fp)) {
1899
-                        $result = str_replace("\r\n", '',fgets($fp, 128));
1899
+                        $result = str_replace("\r\n", '', fgets($fp, 128));
1900 1900
                         if (!empty($result) && $result == '123') {
1901 1901
                             $output = true;
1902 1902
                         }
@@ -1919,7 +1919,7 @@  discard block
 block discarded – undo
1919 1919
                     curl_setopt($ch, CURLOPT_URL, $url);
1920 1920
                     //curl_setopt($ch, CURLOPT_TIMEOUT, 30);
1921 1921
                     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
1922
-                    $result = curl_exec ($ch);
1922
+                    $result = curl_exec($ch);
1923 1923
                     if (!empty($result) && $result == '123') {
1924 1924
                         $output = true;
1925 1925
                     }
@@ -2679,12 +2679,12 @@  discard block
 block discarded – undo
2679 2679
         $adminPhoneForm,
2680 2680
         '', //$picture_uri = '',
2681 2681
         PLATFORM_AUTH_SOURCE,
2682
-        '',//$expirationDate,
2682
+        '', //$expirationDate,
2683 2683
         1,
2684 2684
         0,
2685 2685
         null,
2686 2686
         '',
2687
-        false,  //$send_mail = false,
2687
+        false, //$send_mail = false,
2688 2688
         true //$isAdmin = false
2689 2689
     );
2690 2690
 
@@ -2706,7 +2706,7 @@  discard block
 block discarded – undo
2706 2706
         0,
2707 2707
         null,
2708 2708
         '',
2709
-        false,  //$send_mail = false,
2709
+        false, //$send_mail = false,
2710 2710
         false //$isAdmin = false
2711 2711
     );
2712 2712
 
@@ -2772,7 +2772,7 @@  discard block
 block discarded – undo
2772 2772
                 SET selected_value = '".$param->selected_value."'
2773 2773
                 WHERE variable = '".$param->variable."'";
2774 2774
         if (!empty($param->subkey)) {
2775
-            $sql .= " AND subkey='" . $param->subkey . "'";
2775
+            $sql .= " AND subkey='".$param->subkey."'";
2776 2776
         }
2777 2777
         Database::query($sql);
2778 2778
     }
Please login to merge, or discard this patch.
main/link/link.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@
 block discarded – undo
21 21
 
22 22
 // Including libraries
23 23
 require_once '../inc/global.inc.php';
24
-$current_course_tool  = TOOL_LINK;
24
+$current_course_tool = TOOL_LINK;
25 25
 
26 26
 $this_section = SECTION_COURSES;
27 27
 api_protect_course_script();
Please login to merge, or discard this patch.
main/link/link_goto.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -25,8 +25,8 @@
 block discarded – undo
25 25
 // Launch event
26 26
 Event::event_link($linkId);
27 27
 
28
-header("Cache-Control: no-store, no-cache, must-revalidate");   // HTTP/1.1
28
+header("Cache-Control: no-store, no-cache, must-revalidate"); // HTTP/1.1
29 29
 header("Cache-Control: post-check=0, pre-check=0", false);
30
-header("Pragma: no-cache");                                     // HTTP/1.0
30
+header("Pragma: no-cache"); // HTTP/1.0
31 31
 header("Location: $linkUrl");
32 32
 exit;
Please login to merge, or discard this patch.
main/course_description/listing.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -11,24 +11,24 @@  discard block
 block discarded – undo
11 11
 api_protect_course_script(true);
12 12
 
13 13
 // display actions menu
14
-if (api_is_allowed_to_edit(null,true)) {
14
+if (api_is_allowed_to_edit(null, true)) {
15 15
     $categories = array();
16 16
     foreach ($default_description_titles as $id => $title) {
17 17
         $categories[$id] = $title;
18 18
     }
19 19
     $categories[ADD_BLOCK] = get_lang('NewBloc');
20 20
 
21
-	$i=1;
21
+	$i = 1;
22 22
 	echo '<div class="actions" style="margin-bottom:30px">';
23 23
 	ksort($categories);
24 24
 	foreach ($categories as $id => $title) {
25
-		if ($i==ADD_BLOCK) {
25
+		if ($i == ADD_BLOCK) {
26 26
 			echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.
27
-                Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
27
+                Display::return_icon($default_description_icon[$id], $title, '', ICON_SIZE_MEDIUM).'</a>';
28 28
 			break;
29 29
 		} else {
30 30
 			echo '<a href="index.php?action=edit&'.api_get_cidreq().'&description_type='.$id.'">'.
31
-                Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
31
+                Display::return_icon($default_description_icon[$id], $title, '', ICON_SIZE_MEDIUM).'</a>';
32 32
 			$i++;
33 33
 		}
34 34
 	}
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
             <tr>
44 44
                 <td><h3>'.get_lang('ThematicAdvanceHistory').'</h3></td>
45 45
                 <td align="right"><a href="index.php?action=listing">'.
46
-                Display::return_icon('info.png',get_lang('BackToCourseDesriptionList'), array('style'=>'vertical-align:middle;'),ICON_SIZE_SMALL).' '.get_lang('BackToCourseDesriptionList').'</a></td></tr></table></div>';
46
+                Display::return_icon('info.png', get_lang('BackToCourseDesriptionList'), array('style'=>'vertical-align:middle;'), ICON_SIZE_SMALL).' '.get_lang('BackToCourseDesriptionList').'</a></td></tr></table></div>';
47 47
 }
48 48
 
49 49
 $user_info = api_get_user_info();
@@ -52,21 +52,21 @@  discard block
 block discarded – undo
52 52
 	foreach ($descriptions as $id => $description) {
53 53
         if (!empty($description)) {
54 54
             $actions = '';
55
-            if (api_is_allowed_to_edit(null,true) && !$history) {
55
+            if (api_is_allowed_to_edit(null, true) && !$history) {
56 56
                 if (api_get_session_id() == $description['session_id']) {
57 57
                     $description['title'] = $description['title'].' '.api_get_session_image(api_get_session_id(), $user_info['status']);
58 58
 
59 59
                     // delete
60
-                    $actions .= '<a href="'.api_get_self().'?id='.$description['id'].'&cidReq='.api_get_course_id().'&id_session='.$description['session_id'].'&action=delete&description_type='.$description['description_type'].'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,api_get_system_encoding())).'\')) return false;">';
61
-                    $actions .= Display::return_icon('delete.png', get_lang('Delete'), array('style' => 'vertical-align:middle;float:right;'),ICON_SIZE_SMALL);
60
+                    $actions .= '<a href="'.api_get_self().'?id='.$description['id'].'&cidReq='.api_get_course_id().'&id_session='.$description['session_id'].'&action=delete&description_type='.$description['description_type'].'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, api_get_system_encoding())).'\')) return false;">';
61
+                    $actions .= Display::return_icon('delete.png', get_lang('Delete'), array('style' => 'vertical-align:middle;float:right;'), ICON_SIZE_SMALL);
62 62
                     $actions .= '</a> ';
63 63
 
64 64
                     // edit
65 65
                     $actions .= '<a href="'.api_get_self().'?id='.$description['id'].'&cidReq='.api_get_course_id().'&id_session='.$description['session_id'].'&action=edit&description_type='.$description['description_type'].'">';
66
-                    $actions .= Display::return_icon('edit.png', get_lang('Edit'), array('style' => 'vertical-align:middle;float:right; padding-right:4px;'),ICON_SIZE_SMALL);
66
+                    $actions .= Display::return_icon('edit.png', get_lang('Edit'), array('style' => 'vertical-align:middle;float:right; padding-right:4px;'), ICON_SIZE_SMALL);
67 67
                     $actions .= '</a> ';
68 68
                 } else {
69
-                    $actions .= Display::return_icon('edit_na.png', get_lang('EditionNotAvailableFromSession'), array('style' => 'vertical-align:middle;float:right;'),ICON_SIZE_SMALL);
69
+                    $actions .= Display::return_icon('edit_na.png', get_lang('EditionNotAvailableFromSession'), array('style' => 'vertical-align:middle;float:right;'), ICON_SIZE_SMALL);
70 70
                 }
71 71
             }
72 72
             echo Display::panel(
Please login to merge, or discard this patch.
main/course_description/edit.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -34,21 +34,21 @@  discard block
 block discarded – undo
34 34
 }
35 35
 $categories[ADD_BLOCK] = get_lang('NewBloc');
36 36
 
37
-$i=1;
37
+$i = 1;
38 38
 echo '<div class="actions" style="margin-bottom:30px">';
39 39
 echo '<a href="index.php?'.api_get_cidreq().'">'.
40
-		Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('ToolCourseDescription'),'',ICON_SIZE_MEDIUM).
40
+		Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('ToolCourseDescription'), '', ICON_SIZE_MEDIUM).
41 41
 	'</a>';
42 42
 
43 43
 ksort($categories);
44 44
 foreach ($categories as $id => $title) {
45
-	if ($i==ADD_BLOCK) {
45
+	if ($i == ADD_BLOCK) {
46 46
 		echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.
47
-			Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
47
+			Display::return_icon($default_description_icon[$id], $title, '', ICON_SIZE_MEDIUM).'</a>';
48 48
 		break;
49 49
 	} else {
50 50
 		echo '<a href="index.php?action=edit&'.api_get_cidreq().'&description_type='.$id.'">'.
51
-			Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
51
+			Display::return_icon($default_description_icon[$id], $title, '', ICON_SIZE_MEDIUM).'</a>';
52 52
 		$i++;
53 53
 	}
54 54
 }
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 
57 57
 // error messages
58 58
 if (isset($error) && intval($error) == 1) {
59
-	Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'),false);
59
+	Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'), false);
60 60
 }
61 61
 
62 62
 // default header title form
@@ -73,12 +73,12 @@  discard block
 block discarded – undo
73 73
 	'index.php?action=edit&id='.$original_id.'&description_type='.$description_type.'&'.api_get_cidreq()
74 74
 );
75 75
 
76
-$form->addElement('header','',$header);
76
+$form->addElement('header', '', $header);
77 77
 $form->addElement('hidden', 'id', $original_id);
78
-$form->addElement('hidden', 'description_type',$description_type);
79
-$form->addElement('hidden', 'sec_token',$token);
78
+$form->addElement('hidden', 'description_type', $description_type);
79
+$form->addElement('hidden', 'sec_token', $token);
80 80
 $form->addText('title', get_lang('Title'), true, array('size'=>'50'));
81
-$form->applyFilter('title','html_filter');
81
+$form->applyFilter('title', 'html_filter');
82 82
 $form->addHtmlEditor(
83 83
 	'contentDescription',
84 84
 	get_lang('Content'),
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
     $default['title'] = Security::remove_XSS($description_title);
98 98
 }
99 99
 if (!empty($description_content)) {
100
-    $default['contentDescription'] = Security::remove_XSS($description_content,COURSEMANAGERLOWSECURITY);
100
+    $default['contentDescription'] = Security::remove_XSS($description_content, COURSEMANAGERLOWSECURITY);
101 101
 }
102 102
 $default['description_type'] = $description_type;
103 103
 
Please login to merge, or discard this patch.
main/user/resume_session.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
 
12 12
 // setting the section (for the tabs)
13 13
 $this_section = SECTION_PLATFORM_ADMIN;
14
-$id_session = (int)$_GET['id_session'];
14
+$id_session = (int) $_GET['id_session'];
15 15
 SessionManager::protect_teacher_session_edit($id_session);
16 16
 
17 17
 $tool_name = get_lang('SessionOverview');
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
     $rs = Database::query($sql);
60 60
     $session_category = '';
61 61
 
62
-    if (Database::num_rows($rs)>0) {
62
+    if (Database::num_rows($rs) > 0) {
63 63
     	$rows_session_category = Database::store_result($rs);
64 64
     	$rows_session_category = $rows_session_category[0];
65 65
     	$session_category = $rows_session_category['name'];
@@ -83,25 +83,25 @@  discard block
 block discarded – undo
83 83
             break;
84 84
         case 'delete':
85 85
             $idChecked = $_GET['idChecked'];
86
-            if(is_array($idChecked)) {
86
+            if (is_array($idChecked)) {
87 87
                 $my_temp = array();
88
-                foreach ($idChecked as $id){
88
+                foreach ($idChecked as $id) {
89 89
                     $courseInfo = api_get_course_info($id);
90
-                    $my_temp[]= $courseInfo['real_id'];// forcing the escape_string
90
+                    $my_temp[] = $courseInfo['real_id']; // forcing the escape_string
91 91
                 }
92 92
                 $idChecked = $my_temp;
93 93
                 $idChecked = "'".implode("','", $idChecked)."'";
94 94
 
95 95
                 $result = Database::query("DELETE FROM $tbl_session_rel_course WHERE session_id='$id_session' AND c_id IN($idChecked)");
96
-                $nbr_affected_rows=Database::affected_rows($result);
96
+                $nbr_affected_rows = Database::affected_rows($result);
97 97
 
98 98
                 Database::query("DELETE FROM $tbl_session_rel_course_rel_user WHERE session_id='$id_session' AND c_id IN($idChecked)");
99 99
                 Database::query("UPDATE $tbl_session SET nbr_courses=nbr_courses-$nbr_affected_rows WHERE id='$id_session'");
100 100
             }
101 101
 
102
-            if (!empty($_GET['class'])){
102
+            if (!empty($_GET['class'])) {
103 103
                 $result = Database::query("DELETE FROM $tbl_session_rel_class WHERE session_id='$id_session' AND class_id=".intval($_GET['class']));
104
-                $nbr_affected_rows=Database::affected_rows($result);
104
+                $nbr_affected_rows = Database::affected_rows($result);
105 105
                 Database::query("UPDATE $tbl_session SET nbr_classes=nbr_classes-$nbr_affected_rows WHERE id='$id_session'");
106 106
             }
107 107
 
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
                 Database::query("UPDATE $tbl_session SET nbr_users=nbr_users-$nbr_affected_rows WHERE id='$id_session'");
112 112
 
113 113
                 $result = Database::query("DELETE FROM $tbl_session_rel_course_rel_user WHERE session_id ='$id_session' AND user_id=".intval($_GET['user']));
114
-                $nbr_affected_rows=Database::affected_rows($result);
114
+                $nbr_affected_rows = Database::affected_rows($result);
115 115
 
116 116
                 Database::query("UPDATE $tbl_session_rel_course SET nbr_users=nbr_users-$nbr_affected_rows WHERE session_id ='$id_session'");
117 117
             }
@@ -137,28 +137,28 @@  discard block
 block discarded – undo
137 137
     	<td><?php echo get_lang('GeneralCoach'); ?> :</td>
138 138
     	<td><?php echo api_get_person_name($session['firstname'], $session['lastname']).' ('.$session['username'].')' ?></td>
139 139
     </tr>
140
-    <?php if(!empty($session_category)) { ?>
140
+    <?php if (!empty($session_category)) { ?>
141 141
     <tr>
142 142
     	<td><?php echo get_lang('SessionCategory') ?></td>
143
-    	<td><?php echo $session_category;  ?></td>
143
+    	<td><?php echo $session_category; ?></td>
144 144
     </tr>
145 145
     <?php } ?>
146 146
     <tr>
147 147
     	<td><?php echo get_lang('Date'); ?> :</td>
148 148
     	<td>
149 149
     	<?php
150
-    		if ($session['access_start_date'] == '00-00-0000' && $session['access_end_date']== '00-00-0000' ) {
150
+    		if ($session['access_start_date'] == '00-00-0000' && $session['access_end_date'] == '00-00-0000') {
151 151
     		    echo get_lang('NoTimeLimits');
152 152
             }
153 153
     		else {
154 154
                 if ($session['access_start_date'] != '00-00-0000') {
155 155
                 	//$session['date_start'] = Display::tag('i', get_lang('NoTimeLimits'));
156
-                    $session['access_start_date'] =  get_lang('From').' '.$session['access_start_date'];
156
+                    $session['access_start_date'] = get_lang('From').' '.$session['access_start_date'];
157 157
                 } else {
158 158
                 	$session['access_start_date'] = '';
159 159
                 }
160 160
                 if ($session['access_end_date'] == '00-00-0000') {
161
-                    $session['access_end_date'] ='';
161
+                    $session['access_end_date'] = '';
162 162
                 } else {
163 163
                 	$session['access_end_date'] = get_lang('Until').' '.$session['access_end_date'];
164 164
                 }
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
     		<?php echo api_ucfirst(get_lang('SessionVisibility')) ?> :
190 190
     	</td>
191 191
     	<td>
192
-    		<?php if ($session['visibility']==1) echo get_lang('ReadOnly'); elseif($session['visibility']==2) echo get_lang('Visible');elseif($session['visibility']==3) echo api_ucfirst(get_lang('Invisible'))  ?>
192
+    		<?php if ($session['visibility'] == 1) echo get_lang('ReadOnly'); elseif ($session['visibility'] == 2) echo get_lang('Visible'); elseif ($session['visibility'] == 3) echo api_ucfirst(get_lang('Invisible'))  ?>
193 193
     	</td>
194 194
     </tr>
195 195
     <?php
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
201 201
         echo '</td>';
202 202
         echo '<td>';
203 203
         $url_list = UrlManager::get_access_url_from_session($id_session);
204
-        foreach($url_list as $url_data) {
204
+        foreach ($url_list as $url_data) {
205 205
             echo $url_data['url'].'<br />';
206 206
         }
207 207
         echo '</td></tr>';
@@ -231,8 +231,8 @@  discard block
 block discarded – undo
231 231
     			WHERE c.id = sc.c_id
232 232
     			AND	session_id='$id_session'
233 233
     			ORDER BY title";
234
-    	$result=Database::query($sql);
235
-    	$courses=Database::store_result($result);
234
+    	$result = Database::query($sql);
235
+    	$courses = Database::store_result($result);
236 236
     	foreach ($courses as $course) {
237 237
     		//select the number of users
238 238
 
@@ -245,7 +245,7 @@  discard block
 block discarded – undo
245 245
                         srcru.session_id = '".intval($id_session)."'";
246 246
 
247 247
     		$rs = Database::query($sql);
248
-    		$course['nbr_users'] = Database::result($rs,0,0);
248
+    		$course['nbr_users'] = Database::result($rs, 0, 0);
249 249
 
250 250
     		// Get coachs of the courses in session
251 251
 
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
271 271
     		}
272 272
 
273 273
     		if (count($coachs) > 0) {
274
-    			$coach = implode('<br />',$coachs);
274
+    			$coach = implode('<br />', $coachs);
275 275
     		} else {
276 276
     			$coach = get_lang('None');
277 277
     		}
@@ -281,7 +281,7 @@  discard block
 block discarded – undo
281 281
             // name of the course, that appeared in the default $interbreadcrumb
282 282
     		echo '
283 283
     		<tr>
284
-    			<td>'.Display::url($course['title'].' ('.$course['visual_code'].')', api_get_path(WEB_COURSE_PATH).$course['code'].'/?id_session='.$id_session),'</td>
284
+    			<td>'.Display::url($course['title'].' ('.$course['visual_code'].')', api_get_path(WEB_COURSE_PATH).$course['code'].'/?id_session='.$id_session), '</td>
285 285
     			<td>'.$coach.'</td>
286 286
     			<td>'.$course['nbr_users'].'</td>
287 287
 
@@ -306,7 +306,7 @@  discard block
 block discarded – undo
306 306
         </tr>
307 307
     <?php
308 308
 
309
-    if ($session['nbr_users']==0) {
309
+    if ($session['nbr_users'] == 0) {
310 310
     	echo '<tr>
311 311
     			<td colspan="2">'.get_lang('NoUsersForThisSession').'</td>
312 312
     		</tr>';
@@ -337,7 +337,7 @@  discard block
 block discarded – undo
337 337
             $user_link = '';
338 338
             if (!empty($user['user_id'])) {
339 339
                 $user_link = '<a href="'.api_get_path(WEB_CODE_PATH).'admin/user_information.php?user_id='.intval($user['user_id']).'">'.
340
-                    api_htmlentities(api_get_person_name($user['firstname'], $user['lastname']),ENT_QUOTES,$charset).' ('.$user['username'].')</a>';
340
+                    api_htmlentities(api_get_person_name($user['firstname'], $user['lastname']), ENT_QUOTES, $charset).' ('.$user['username'].')</a>';
341 341
             }
342 342
 
343 343
             $link_to_add_user_in_url = '';
Please login to merge, or discard this patch.
main/user/add_users_to_session.php 1 patch
Spacing   +45 added lines, -45 removed lines patch added patch discarded remove patch
@@ -22,12 +22,12 @@  discard block
 block discarded – undo
22 22
 
23 23
 // setting breadcrumbs
24 24
 if (api_is_platform_admin()) {
25
-    $interbreadcrumb[] = array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
26
-    $interbreadcrumb[] = array('url' => 'session_list.php','name' => get_lang('SessionList'));
27
-    $interbreadcrumb[] = array('url' => "resume_session.php?id_session=".$id_session,"name" => get_lang('SessionOverview'));
25
+    $interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
26
+    $interbreadcrumb[] = array('url' => 'session_list.php', 'name' => get_lang('SessionList'));
27
+    $interbreadcrumb[] = array('url' => "resume_session.php?id_session=".$id_session, "name" => get_lang('SessionOverview'));
28 28
 }
29 29
 $allowTutors = api_get_setting('allow_tutors_to_assign_students_to_session');
30
-if($allowTutors == 'true') {
30
+if ($allowTutors == 'true') {
31 31
     // Database Table Definitions
32 32
     $tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
33 33
     $tbl_course = Database::get_main_table(TABLE_MAIN_COURSE);
@@ -38,19 +38,19 @@  discard block
 block discarded – undo
38 38
     $tool_name = get_lang('SubscribeUsersToSession');
39 39
     $add_type = 'unique';
40 40
 
41
-    if (isset($_REQUEST['add_type']) && $_REQUEST['add_type']!='') {
41
+    if (isset($_REQUEST['add_type']) && $_REQUEST['add_type'] != '') {
42 42
         $add_type = Security::remove_XSS($_REQUEST['add_type']);
43 43
     }
44 44
 
45 45
     $page = isset($_GET['page']) ? Security::remove_XSS($_GET['page']) : null;
46 46
 
47 47
     // Checking for extra field with filter on
48
-    $extra_field_list= UserManager::get_extra_fields();
48
+    $extra_field_list = UserManager::get_extra_fields();
49 49
     $new_field_list = array();
50 50
     if (is_array($extra_field_list)) {
51 51
     	foreach ($extra_field_list as $extra_field) {
52 52
     		//if is enabled to filter and is a "<select>" field type
53
-    		if ($extra_field[8]==1 && $extra_field[2]==4 ) {
53
+    		if ($extra_field[8] == 1 && $extra_field[2] == 4) {
54 54
                 $new_field_list[] = array(
55 55
                     'name' => $extra_field[3],
56 56
                     'variable' => $extra_field[1],
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
     	if (!empty($needle) && !empty($type)) {
74 74
 
75 75
             //normal behaviour
76
-            if ($type == 'any_session' && $needle == 'false')  {
76
+            if ($type == 'any_session' && $needle == 'false') {
77 77
                 $type = 'multiple';
78 78
                 $needle = '';
79 79
             }
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
     		$cond_user_id = '';
88 88
 
89 89
             //Only for single & multiple
90
-            if (in_array($type, array('single','multiple'))) {
90
+            if (in_array($type, array('single', 'multiple'))) {
91 91
         		if (!empty($id_session)) {
92 92
         		    $id_session = intval($id_session);
93 93
         			// check id_user from session_rel_user table
@@ -97,11 +97,11 @@  discard block
 block discarded – undo
97 97
         			$user_ids = array();
98 98
         			if (Database::num_rows($res) > 0) {
99 99
         				while ($row = Database::fetch_row($res)) {
100
-        					$user_ids[] = (int)$row[0];
100
+        					$user_ids[] = (int) $row[0];
101 101
         				}
102 102
         			}
103 103
         			if (count($user_ids) > 0) {
104
-        				$cond_user_id = ' AND user.user_id NOT IN('.implode(",",$user_ids).')';
104
+        				$cond_user_id = ' AND user.user_id NOT IN('.implode(",", $user_ids).')';
105 105
         			}
106 106
         		}
107 107
             }
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
                     break;
138 138
     		}
139 139
     		if (api_is_multiple_url_enabled()) {
140
-    			$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
140
+    			$tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
141 141
     			$access_url_id = api_get_current_access_url_id();
142 142
     			if ($access_url_id != -1) {
143 143
                     switch ($type) {
@@ -182,11 +182,11 @@  discard block
 block discarded – undo
182 182
     		}
183 183
 
184 184
     		$rs = Database::query($sql);
185
-            $i=0;
185
+            $i = 0;
186 186
     		if ($type == 'single') {
187 187
     			while ($user = Database :: fetch_array($rs)) {
188 188
     	            $i++;
189
-    	            if ($i<=10) {
189
+    	            if ($i <= 10) {
190 190
                 		$person_name = api_get_person_name($user['firstname'], $user['lastname']);
191 191
     					$return .= '<a href="javascript: void(0);" onclick="javascript: add_user_to_session(\''.$user['user_id'].'\',\''.$person_name.' ('.$user['username'].')'.'\')">'.$person_name.' ('.$user['username'].')</a><br />';
192 192
     	            } else {
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
     	            }
195 195
     			}
196 196
 
197
-    			$xajax_response -> addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return));
197
+    			$xajax_response -> addAssign('ajax_list_users_single', 'innerHTML', api_utf8_encode($return));
198 198
     		} else {
199 199
     			global $nosessionUsersList;
200 200
     			$return .= '<select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" style="width:360px;">';
@@ -203,7 +203,7 @@  discard block
 block discarded – undo
203 203
     	            $return .= '<option value="'.$user['user_id'].'">'.$person_name.' ('.$user['username'].')</option>';
204 204
     			}
205 205
     			$return .= '</select>';
206
-    			$xajax_response -> addAssign('ajax_list_users_multiple','innerHTML',api_utf8_encode($return));
206
+    			$xajax_response -> addAssign('ajax_list_users_multiple', 'innerHTML', api_utf8_encode($return));
207 207
     		}
208 208
     	}
209 209
     	return $xajax_response;
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
260 260
     </script>';
261 261
 
262 262
     $form_sent = 0;
263
-    $errorMsg = $firstLetterUser = $firstLetterSession='';
263
+    $errorMsg = $firstLetterUser = $firstLetterSession = '';
264 264
     $UserList = $SessionList = array();
265 265
     $sessions = array();
266 266
     $noPHP_SELF = true;
@@ -272,7 +272,7 @@  discard block
 block discarded – undo
272 272
         $UserList = $_POST['sessionUsersList'];
273 273
 
274 274
         if (!is_array($UserList)) {
275
-            $UserList=array();
275
+            $UserList = array();
276 276
         }
277 277
 
278 278
         if ($form_sent == 1) {
@@ -300,7 +300,7 @@  discard block
 block discarded – undo
300 300
                 WHERE u.status<>".DRH." AND u.status<>6 $order_clause";
301 301
 
302 302
         if (api_is_multiple_url_enabled()) {
303
-            $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
303
+            $tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
304 304
             $access_url_id = api_get_current_access_url_id();
305 305
             if ($access_url_id != -1) {
306 306
                 $sql = "SELECT u.user_id, lastname, firstname, username, session_id
@@ -316,19 +316,19 @@  discard block
 block discarded – undo
316 316
         $result = Database::query($sql);
317 317
         $users = Database::store_result($result);
318 318
         foreach ($users as $user) {
319
-            $sessionUsersList[$user['user_id']] = $user ;
319
+            $sessionUsersList[$user['user_id']] = $user;
320 320
         }
321 321
         unset($users); //clean to free memory
322 322
     } else {
323 323
         //Filter by Extra Fields
324 324
         $use_extra_fields = false;
325 325
         if (is_array($extra_field_list)) {
326
-            if (is_array($new_field_list) && count($new_field_list)>0 ) {
327
-                $result_list=array();
326
+            if (is_array($new_field_list) && count($new_field_list) > 0) {
327
+                $result_list = array();
328 328
                 foreach ($new_field_list as $new_field) {
329 329
                     $varname = 'field_'.$new_field['variable'];
330 330
                     if (UserManager::is_extra_field_available($new_field['variable'])) {
331
-                        if (isset($_POST[$varname]) && $_POST[$varname]!='0') {
331
+                        if (isset($_POST[$varname]) && $_POST[$varname] != '0') {
332 332
                             $use_extra_fields = true;
333 333
                             $extra_field_result[] = UserManager::get_extra_user_data_by_value(
334 334
                                 $new_field['variable'],
@@ -342,9 +342,9 @@  discard block
 block discarded – undo
342 342
 
343 343
         if ($use_extra_fields) {
344 344
             $final_result = array();
345
-           	if (count($extra_field_result)>1) {
346
-    	    for($i=0;$i<count($extra_field_result)-1;$i++) {
347
-                    if (is_array($extra_field_result[$i+1])) {
345
+           	if (count($extra_field_result) > 1) {
346
+    	    for ($i = 0; $i < count($extra_field_result) - 1; $i++) {
347
+                    if (is_array($extra_field_result[$i + 1])) {
348 348
                         $final_result = array_intersect(
349 349
                             $extra_field_result[$i],
350 350
                             $extra_field_result[$i + 1]
@@ -355,17 +355,17 @@  discard block
 block discarded – undo
355 355
                 $final_result = $extra_field_result[0];
356 356
             }
357 357
 
358
-            $where_filter ='';
358
+            $where_filter = '';
359 359
             if (api_is_multiple_url_enabled()) {
360
-                if (is_array($final_result) && count($final_result)>0) {
361
-                    $where_filter = " AND u.user_id IN  ('".implode("','",$final_result)."') ";
360
+                if (is_array($final_result) && count($final_result) > 0) {
361
+                    $where_filter = " AND u.user_id IN  ('".implode("','", $final_result)."') ";
362 362
                 } else {
363 363
                     //no results
364 364
                     $where_filter = " AND u.user_id  = -1";
365 365
                 }
366 366
             } else {
367
-                if (is_array($final_result) && count($final_result)>0) {
368
-                    $where_filter = " WHERE u.user_id IN  ('".implode("','",$final_result)."') ";
367
+                if (is_array($final_result) && count($final_result) > 0) {
368
+                    $where_filter = " WHERE u.user_id IN  ('".implode("','", $final_result)."') ";
369 369
                 } else {
370 370
                     //no results
371 371
                     $where_filter = " WHERE u.user_id  = -1";
@@ -394,7 +394,7 @@  discard block
 block discarded – undo
394 394
                     $order_clause";
395 395
         }
396 396
         if (api_is_multiple_url_enabled()) {
397
-            $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
397
+            $tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
398 398
             $access_url_id = api_get_current_access_url_id();
399 399
             if ($access_url_id != -1) {
400 400
                 $sql = "SELECT  u.user_id, lastname, firstname, username, session_id
@@ -411,7 +411,7 @@  discard block
 block discarded – undo
411 411
         }
412 412
 
413 413
         $result = Database::query($sql);
414
-        $users = Database::store_result($result,'ASSOC');
414
+        $users = Database::store_result($result, 'ASSOC');
415 415
 
416 416
         foreach ($users as $uid => $user) {
417 417
             if ($user['session_id'] != $id_session) {
@@ -426,7 +426,7 @@  discard block
 block discarded – undo
426 426
         unset($users); //clean to free memory
427 427
 
428 428
         //filling the correct users in list
429
-        $sql="SELECT  user_id, lastname, firstname, username, session_id
429
+        $sql = "SELECT  user_id, lastname, firstname, username, session_id
430 430
               FROM $tbl_user u
431 431
               LEFT JOIN $tbl_session_rel_user
432 432
               ON
@@ -436,10 +436,10 @@  discard block
 block discarded – undo
436 436
               WHERE u.status<>".DRH." AND u.status<>6 $order_clause";
437 437
 
438 438
         if (api_is_multiple_url_enabled()) {
439
-            $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
439
+            $tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
440 440
             $access_url_id = api_get_current_access_url_id();
441 441
             if ($access_url_id != -1) {
442
-                $sql="SELECT  u.user_id, lastname, firstname, username, session_id
442
+                $sql = "SELECT  u.user_id, lastname, firstname, username, session_id
443 443
                     FROM $tbl_user u
444 444
                     LEFT JOIN $tbl_session_rel_user
445 445
                     ON
@@ -452,11 +452,11 @@  discard block
 block discarded – undo
452 452
             }
453 453
         }
454 454
         $result = Database::query($sql);
455
-        $users = Database::store_result($result,'ASSOC');
455
+        $users = Database::store_result($result, 'ASSOC');
456 456
         foreach ($users as $uid => $user) {
457 457
             if ($user['session_id'] == $id_session) {
458 458
                 $sessionUsersList[$user['user_id']] = $user;
459
-                if (array_key_exists($user['user_id'],$nosessionUsersList)) {
459
+                if (array_key_exists($user['user_id'], $nosessionUsersList)) {
460 460
                     unset($nosessionUsersList[$user['user_id']]);
461 461
                 }
462 462
             }
@@ -472,25 +472,25 @@  discard block
 block discarded – undo
472 472
     	$link_add_type_unique = Display::return_icon('single.gif').get_lang('SessionAddTypeUnique');
473 473
     	$link_add_type_multiple = '<a href="'.api_get_self().'?id_session='.$id_session.'&amp;add='.Security::remove_XSS($_GET['add']).'&amp;add_type=multiple">'.Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple').'</a>';
474 474
     }
475
-    	$link_add_group = '<a href="usergroups.php">'.Display::return_icon('multiple.gif',get_lang('RegistrationByUsersGroups')).get_lang('RegistrationByUsersGroups').'</a>';
475
+    	$link_add_group = '<a href="usergroups.php">'.Display::return_icon('multiple.gif', get_lang('RegistrationByUsersGroups')).get_lang('RegistrationByUsersGroups').'</a>';
476 476
     ?>
477 477
     <div class="actions">
478 478
     	<?php echo $link_add_type_unique ?>&nbsp;|&nbsp;<?php echo $link_add_type_multiple ?>&nbsp;|&nbsp;<?php echo $link_add_group; ?>
479 479
     </div>
480
-    <form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?page=<?php echo $page; ?>&id_session=<?php echo $id_session; ?><?php if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>
480
+    <form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?page=<?php echo $page; ?>&id_session=<?php echo $id_session; ?><?php if (!empty($_GET['add'])) echo '&add=true'; ?>" style="margin:0px;" <?php if ($ajax_search) {echo ' onsubmit="valide();"'; }?>>
481 481
     <?php echo '<legend>'.$tool_name.' ('.$session_info['name'].') </legend>'; ?>
482 482
     <?php
483 483
     if ($add_type == 'multiple') {
484 484
     	if (is_array($extra_field_list)) {
485
-    		if (is_array($new_field_list) && count($new_field_list)>0 ) {
485
+    		if (is_array($new_field_list) && count($new_field_list) > 0) {
486 486
     			echo '<h3>'.get_lang('FilterUsers').'</h3>';
487 487
     			foreach ($new_field_list as $new_field) {
488 488
     				echo $new_field['name'];
489 489
     				$varname = 'field_'.$new_field['variable'];
490 490
     				echo '&nbsp;<select name="'.$varname.'">';
491 491
     				echo '<option value="0">--'.get_lang('Select').'--</option>';
492
-    				foreach	($new_field['data'] as $option) {
493
-    					$checked='';
492
+    				foreach ($new_field['data'] as $option) {
493
+    					$checked = '';
494 494
     					if (isset($_POST[$varname])) {
495 495
     						if ($_POST[$varname] == $option[1]) {
496 496
     							$checked = 'selected="true"';
@@ -545,7 +545,7 @@  discard block
 block discarded – undo
545 545
                   <?php
546 546
                   foreach ($nosessionUsersList as $uid => $enreg) {
547 547
                   ?>
548
-                      <option value="<?php echo $uid; ?>" <?php if(in_array($uid,$UserList)) echo 'selected="selected"'; ?>><?php echo api_get_person_name($enreg['fn'], $enreg['ln']).' ('.$enreg['un'].')'; ?></option>
548
+                      <option value="<?php echo $uid; ?>" <?php if (in_array($uid, $UserList)) echo 'selected="selected"'; ?>><?php echo api_get_person_name($enreg['fn'], $enreg['ln']).' ('.$enreg['un'].')'; ?></option>
549 549
                   <?php
550 550
                   }
551 551
                   ?>
@@ -597,7 +597,7 @@  discard block
 block discarded – undo
597 597
             </div>
598 598
             <select id="destination_users" name="sessionUsersList[]" multiple="multiple" size="15" class="span5">
599 599
             <?php
600
-            foreach($sessionUsersList as $enreg) {
600
+            foreach ($sessionUsersList as $enreg) {
601 601
             ?>
602 602
                 <option value="<?php echo $enreg['user_id']; ?>"><?php echo api_get_person_name($enreg['firstname'], $enreg['lastname']).' ('.$enreg['username'].')'; ?></option>
603 603
             <?php
Please login to merge, or discard this patch.