Completed
Pull Request — 1.11.x (#1615)
by José
26:50
created
main/admin/settings.lib.php 1 patch
Spacing   +40 added lines, -40 removed lines patch added patch discarded remove patch
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
 
149 149
     // Plugins NOT installed
150 150
     echo Display::page_subheader(get_lang('Plugins'));
151
-    echo '<form class="form-horizontal" name="plugins" method="post" action="'.api_get_self().'?category='.Security::remove_XSS($_GET['category']).'&sec_token=' . $token . '">';
151
+    echo '<form class="form-horizontal" name="plugins" method="post" action="'.api_get_self().'?category='.Security::remove_XSS($_GET['category']).'&sec_token='.$token.'">';
152 152
     echo '<table class="data_table">';
153 153
     echo '<tr>';
154 154
     echo '<th width="20px">';
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
197 197
             if (file_exists(api_get_path(SYS_PLUGIN_PATH).$pluginName.'/readme.txt')) {
198 198
                 echo Display::url(
199 199
                     "<em class='fa fa-file-text-o'></em> readme.txt",
200
-                    api_get_path(WEB_PLUGIN_PATH) . $pluginName . "/readme.txt",
200
+                    api_get_path(WEB_PLUGIN_PATH).$pluginName."/readme.txt",
201 201
                     [
202 202
                         'class' => 'btn btn-default ajax',
203 203
                         'data-title' => $plugin_info['title'],
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
260 260
     $form->addElement('file', 'new_stylesheet', get_lang('UploadNewStylesheet'));
261 261
     $allowed_file_types = getAllowedFileTypes();
262 262
 
263
-    $form->addRule('new_stylesheet', get_lang('InvalidExtension') . ' (' . implode(',', $allowed_file_types) . ')',
263
+    $form->addRule('new_stylesheet', get_lang('InvalidExtension').' ('.implode(',', $allowed_file_types).')',
264 264
         'filetype', $allowed_file_types);
265 265
     $form->addRule('new_stylesheet', get_lang('ThisFieldIsRequired'), 'required');
266 266
     $form->addButtonUpload(get_lang('Upload'), 'stylesheet_upload');
@@ -347,7 +347,7 @@  discard block
 block discarded – undo
347 347
                     $show_name = ucwords(str_replace('_', ' ', $style_dir));
348 348
 
349 349
                     if ($is_style_changeable) {
350
-                        $list_of_names[$style_dir]  = $show_name;
350
+                        $list_of_names[$style_dir] = $show_name;
351 351
                     }
352 352
                     $counter++;
353 353
                 }
@@ -387,16 +387,16 @@  discard block
 block discarded – undo
387 387
         Display::return_message(sprintf(get_lang('TheLogoMustBeSizeXAndFormatY'), '250 x 70', 'PNG'), 'info')
388 388
     );
389 389
 
390
-    $dir = api_get_path(SYS_PUBLIC_PATH).'css/themes/' . $selected . '/images/';
391
-    $url = api_get_path(WEB_CSS_PATH).'themes/' . $selected . '/images/';
390
+    $dir = api_get_path(SYS_PUBLIC_PATH).'css/themes/'.$selected.'/images/';
391
+    $url = api_get_path(WEB_CSS_PATH).'themes/'.$selected.'/images/';
392 392
     $logoFileName = 'header-logo.png';
393
-    $newLogoFileName = 'header-logo-custom' . api_get_current_access_url_id() . '.png';
393
+    $newLogoFileName = 'header-logo-custom'.api_get_current_access_url_id().'.png';
394 394
     $webPlatformLogoPath = ChamiloApi::getWebPlatformLogoPath();
395 395
 
396 396
     if ($webPlatformLogoPath !== null) {
397 397
         $logoForm->addLabel(
398 398
             get_lang('CurrentLogo'),
399
-            '<img id="header-logo-custom" src="' . $webPlatformLogoPath . '?' . time() . '">'
399
+            '<img id="header-logo-custom" src="'.$webPlatformLogoPath.'?'.time().'">'
400 400
         );
401 401
     }
402 402
 
@@ -463,7 +463,7 @@  discard block
 block discarded – undo
463 463
             });
464 464
             </script>';
465 465
             echo Display::tabs(
466
-                array(get_lang('Update'),get_lang('UpdateLogo'), get_lang('UploadNewStylesheet')),
466
+                array(get_lang('Update'), get_lang('UpdateLogo'), get_lang('UploadNewStylesheet')),
467 467
                 array($form_change->return_form(), $logoForm->returnForm(), $form->returnForm())
468 468
             );
469 469
         } else {
@@ -628,7 +628,7 @@  discard block
 block discarded – undo
628 628
             if (!empty($areas_to_installed)) {
629 629
                 $plugin_obj->remove_all_regions($plugin);
630 630
                 foreach ($areas_to_installed as $region) {
631
-                    if (!empty($region) && $region != '-1' ) {
631
+                    if (!empty($region) && $region != '-1') {
632 632
                         $plugin_obj->add_to_region($plugin, $region);
633 633
                     }
634 634
                 }
@@ -739,14 +739,14 @@  discard block
 block discarded – undo
739 739
         $values = api_get_settings_options('search_show_unlinked_results');
740 740
 
741 741
         $group = formGenerateElementsGroup($form, $values, 'search_show_unlinked_results');
742
-        $form->addGroup($group, 'search_show_unlinked_results', array(get_lang('SearchShowUnlinkedResultsTitle'),get_lang('SearchShowUnlinkedResultsComment')), null, false);
742
+        $form->addGroup($group, 'search_show_unlinked_results', array(get_lang('SearchShowUnlinkedResultsTitle'), get_lang('SearchShowUnlinkedResultsComment')), null, false);
743 743
         $default_values['search_show_unlinked_results'] = api_get_setting('search_show_unlinked_results');
744 744
 
745 745
         $sf_values = array();
746 746
         foreach ($specific_fields as $sf) {
747 747
             $sf_values[$sf['code']] = $sf['name'];
748 748
         }
749
-        $url =  Display::div(Display::url(get_lang('AddSpecificSearchField'), 'specific_fields.php'), array('class'=>'sectioncomment'));
749
+        $url = Display::div(Display::url(get_lang('AddSpecificSearchField'), 'specific_fields.php'), array('class'=>'sectioncomment'));
750 750
         if (empty($sf_values)) {
751 751
             $form->addElement('label', [get_lang('SearchPrefilterPrefix'), $url]);
752 752
         } else {
@@ -841,7 +841,7 @@  discard block
 block discarded – undo
841 841
     if ($action != 'add') {
842 842
         echo '<div class="actions" style="margin-left: 1px;">';
843 843
         echo '<a href="settings.php?category=Templates&action=add">'.
844
-                Display::return_icon('new_template.png', get_lang('AddTemplate'),'',ICON_SIZE_MEDIUM).'</a>';
844
+                Display::return_icon('new_template.png', get_lang('AddTemplate'), '', ICON_SIZE_MEDIUM).'</a>';
845 845
         echo '</div>';
846 846
     }
847 847
 
@@ -962,8 +962,8 @@  discard block
 block discarded – undo
962 962
  * @since v1.8.6
963 963
  */
964 964
 function actionsFilter($id) {
965
-    $return = '<a href="settings.php?category=Templates&action=edit&id='.Security::remove_XSS($id).'">'.Display::return_icon('edit.png', get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>';
966
-    $return .= '<a href="settings.php?category=Templates&action=delete&id='.Security::remove_XSS($id).'" onClick="javascript:if(!confirm('."'".get_lang('ConfirmYourChoice')."'".')) return false;">'.Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>';
965
+    $return = '<a href="settings.php?category=Templates&action=edit&id='.Security::remove_XSS($id).'">'.Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>';
966
+    $return .= '<a href="settings.php?category=Templates&action=delete&id='.Security::remove_XSS($id).'" onClick="javascript:if(!confirm('."'".get_lang('ConfirmYourChoice')."'".')) return false;">'.Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>';
967 967
     return $return;
968 968
 }
969 969
 
@@ -1015,7 +1015,7 @@  discard block
 block discarded – undo
1015 1015
     $form->addElement('html_editor', 'template_text', get_lang('Text'), null, array('ToolbarSet' => 'AdminTemplates', 'Width' => '100%', 'Height' => '400'));
1016 1016
 
1017 1017
     // Setting the form elements: the form to upload an image to be used with the template.
1018
-    $form->addElement('file','template_image',get_lang('Image'),'');
1018
+    $form->addElement('file', 'template_image', get_lang('Image'), '');
1019 1019
 
1020 1020
     // Setting the form elements: a little bit information about the template image.
1021 1021
     $form->addElement('static', 'file_comment', '', get_lang('TemplateImageComment100x70'));
@@ -1039,10 +1039,10 @@  discard block
 block discarded – undo
1039 1039
         // Adding an extra field: a preview of the image that is currently used.
1040 1040
         if (!empty($row['image'])) {
1041 1041
             $form->addElement('static', 'template_image_preview', '',
1042
-                '<img src="' . api_get_path(WEB_APP_PATH) . 'home/default_platform_document/template_thumb/' . $row['image'] . '" alt="' . get_lang('TemplatePreview') . '"/>');
1042
+                '<img src="'.api_get_path(WEB_APP_PATH).'home/default_platform_document/template_thumb/'.$row['image'].'" alt="'.get_lang('TemplatePreview').'"/>');
1043 1043
         } else {
1044 1044
             $form->addElement('static', 'template_image_preview', '',
1045
-                '<img src="' . api_get_path(WEB_APP_PATH) . 'home/default_platform_document/template_thumb/noimage.gif" alt="' . get_lang('NoTemplatePreview') . '"/>');
1045
+                '<img src="'.api_get_path(WEB_APP_PATH).'home/default_platform_document/template_thumb/noimage.gif" alt="'.get_lang('NoTemplatePreview').'"/>');
1046 1046
         }
1047 1047
 
1048 1048
         // Setting the information of the template that we are editing.
@@ -1095,7 +1095,7 @@  discard block
 block discarded – undo
1095 1095
             // Store the information in the database (as insert or as update).
1096 1096
             $table_system_template = Database :: get_main_table('system_template');
1097 1097
             if ($_GET['action'] == 'add') {
1098
-                $content_template =  Security::remove_XSS($values['template_text'], COURSEMANAGERLOWSECURITY);
1098
+                $content_template = Security::remove_XSS($values['template_text'], COURSEMANAGERLOWSECURITY);
1099 1099
                 $params = [
1100 1100
                     'title' =>  $values['title'],
1101 1101
                     'content' => $content_template,
@@ -1105,7 +1105,7 @@  discard block
 block discarded – undo
1105 1105
 
1106 1106
                 // Display a feedback message.
1107 1107
                 Display::display_confirmation_message(get_lang('TemplateAdded'));
1108
-                echo '<a href="settings.php?category=Templates&action=add">'.Display::return_icon('new_template.png', get_lang('AddTemplate'),'',ICON_SIZE_MEDIUM).'</a>';
1108
+                echo '<a href="settings.php?category=Templates&action=add">'.Display::return_icon('new_template.png', get_lang('AddTemplate'), '', ICON_SIZE_MEDIUM).'</a>';
1109 1109
             } else {
1110 1110
                 $content_template = '<head>{CSS}<style type="text/css">.text{font-weight: normal;}</style></head><body>'.Database::escape_string($values['template_text']).'</body>';
1111 1111
                 $sql = "UPDATE $table_system_template set title = '".Database::escape_string($values['title'])."', content = '".$content_template."'";
@@ -1123,7 +1123,7 @@  discard block
 block discarded – undo
1123 1123
         displayTemplates();
1124 1124
     } else {
1125 1125
         $token = Security::get_token();
1126
-        $form->addElement('hidden','sec_token');
1126
+        $form->addElement('hidden', 'sec_token');
1127 1127
         $form->setConstants(array('sec_token' => $token));
1128 1128
         // Display the form.
1129 1129
         $form->display();
@@ -1258,13 +1258,13 @@  discard block
 block discarded – undo
1258 1258
                             $form->addElement(
1259 1259
                                 'html',
1260 1260
                                 '<div class="pull-right"><a class="share_this_setting" data_status = "0"  data_to_send = "'.$row['variable'].'" href="javascript:void(0);">'.
1261
-                                Display::return_icon('shared_setting.png', get_lang('ChangeSharedSetting') , null, ICON_SIZE_MEDIUM).'</a></div>'
1261
+                                Display::return_icon('shared_setting.png', get_lang('ChangeSharedSetting'), null, ICON_SIZE_MEDIUM).'</a></div>'
1262 1262
                             );
1263 1263
                         } else {
1264 1264
                             $form->addElement(
1265 1265
                                 'html',
1266 1266
                                 '<div class="pull-right"><a class="share_this_setting" data_status = "1" data_to_send = "'.$row['variable'].'" href="javascript:void(0);">'.
1267
-                                Display::return_icon('shared_setting_na.png', get_lang('ChangeSharedSetting'), null, ICON_SIZE_MEDIUM ).'</a></div>'
1267
+                                Display::return_icon('shared_setting_na.png', get_lang('ChangeSharedSetting'), null, ICON_SIZE_MEDIUM).'</a></div>'
1268 1268
                             );
1269 1269
                         }
1270 1270
                     } else {
@@ -1272,13 +1272,13 @@  discard block
 block discarded – undo
1272 1272
                             $form->addElement(
1273 1273
                                 'html',
1274 1274
                                 '<div class="pull-right">'.
1275
-                                Display::return_icon('shared_setting.png', get_lang('ChangeSharedSetting'), null, ICON_SIZE_MEDIUM ).'</div>'
1275
+                                Display::return_icon('shared_setting.png', get_lang('ChangeSharedSetting'), null, ICON_SIZE_MEDIUM).'</div>'
1276 1276
                             );
1277 1277
                         } else {
1278 1278
                             $form->addElement(
1279 1279
                                 'html',
1280 1280
                                 '<div class="pull-right">'.
1281
-                                Display::return_icon('shared_setting_na.png', get_lang('ChangeSharedSetting'), null, ICON_SIZE_MEDIUM ).'</div>'
1281
+                                Display::return_icon('shared_setting_na.png', get_lang('ChangeSharedSetting'), null, ICON_SIZE_MEDIUM).'</div>'
1282 1282
                             );
1283 1283
                         }
1284 1284
                     }
@@ -1330,7 +1330,7 @@  discard block
 block discarded – undo
1330 1330
                         array('maxlength' => '8')
1331 1331
                     );
1332 1332
                     $form->applyFilter($row['variable'], 'html_filter');
1333
-                    $default_values[$row['variable']] = round($row['selected_value']/1024/1024, 1);
1333
+                    $default_values[$row['variable']] = round($row['selected_value'] / 1024 / 1024, 1);
1334 1334
                 } elseif ($row['variable'] == 'account_valid_duration') {
1335 1335
                     $form->addElement(
1336 1336
                         'text',
@@ -1358,7 +1358,7 @@  discard block
 block discarded – undo
1358 1358
                         ),
1359 1359
                         $hideme
1360 1360
                     );
1361
-                    $form->applyFilter($row['variable'],'html_filter');
1361
+                    $form->applyFilter($row['variable'], 'html_filter');
1362 1362
                     $default_values[$row['variable']] = $row['selected_value'];
1363 1363
                 }
1364 1364
                 break;
@@ -1369,7 +1369,7 @@  discard block
 block discarded – undo
1369 1369
                     if (file_exists($file)) {
1370 1370
                         $value = file_get_contents($file);
1371 1371
                     }
1372
-                    $form->addElement('textarea', $row['variable'], array(get_lang($row['title']), get_lang($row['comment'])) , array('rows'=>'10'), $hideme);
1372
+                    $form->addElement('textarea', $row['variable'], array(get_lang($row['title']), get_lang($row['comment'])), array('rows'=>'10'), $hideme);
1373 1373
                     $default_values[$row['variable']] = $value;
1374 1374
                 } elseif ($row['variable'] == 'footer_extra_content') {
1375 1375
                     $file = api_get_home_path().'footer_extra_content.txt';
@@ -1377,16 +1377,16 @@  discard block
 block discarded – undo
1377 1377
                     if (file_exists($file)) {
1378 1378
                         $value = file_get_contents($file);
1379 1379
                     }
1380
-                    $form->addElement('textarea', $row['variable'], array(get_lang($row['title']), get_lang($row['comment'])) , array('rows'=>'10'), $hideme);
1380
+                    $form->addElement('textarea', $row['variable'], array(get_lang($row['title']), get_lang($row['comment'])), array('rows'=>'10'), $hideme);
1381 1381
                     $default_values[$row['variable']] = $value;
1382 1382
                 } else {
1383
-                    $form->addElement('textarea', $row['variable'], array(get_lang($row['title']), get_lang($row['comment'])) , array('rows'=>'10'), $hideme);
1383
+                    $form->addElement('textarea', $row['variable'], array(get_lang($row['title']), get_lang($row['comment'])), array('rows'=>'10'), $hideme);
1384 1384
                     $default_values[$row['variable']] = $row['selected_value'];
1385 1385
                 }
1386 1386
                 break;
1387 1387
             case 'radio':
1388 1388
                 $values = api_get_settings_options($row['variable']);
1389
-                $group = array ();
1389
+                $group = array();
1390 1390
                 if (is_array($values)) {
1391 1391
                     foreach ($values as $key => $value) {
1392 1392
                         $element = &$form->createElement(
@@ -1417,7 +1417,7 @@  discard block
 block discarded – undo
1417 1417
                         WHERE variable='".$row['variable']."' AND access_url =  1";
1418 1418
 
1419 1419
                 $result = Database::query($sql);
1420
-                $group = array ();
1420
+                $group = array();
1421 1421
                 while ($rowkeys = Database::fetch_array($result)) {
1422 1422
                     // Profile tab option should be hidden when the social tool is enabled.
1423 1423
                     if (api_get_setting('allow_social_tool') == 'true') {
@@ -1474,7 +1474,7 @@  discard block
 block discarded – undo
1474 1474
                 break;
1475 1475
             case 'link':
1476 1476
                 $form->addElement('static', null, array(get_lang($row['title']), get_lang($row['comment'])),
1477
-                    get_lang('CurrentValue') . ' : ' . $row['selected_value'], $hideme);
1477
+                    get_lang('CurrentValue').' : '.$row['selected_value'], $hideme);
1478 1478
                 break;
1479 1479
             case 'select':
1480 1480
                 /*
@@ -1506,7 +1506,7 @@  discard block
 block discarded – undo
1506 1506
                     $row['variable'],
1507 1507
                     [get_lang($row['title']), get_lang($row['comment'])],
1508 1508
                     $courseSelectOptions,
1509
-                    ['url' => api_get_path(WEB_AJAX_PATH) . 'course.ajax.php?a=search_course']
1509
+                    ['url' => api_get_path(WEB_AJAX_PATH).'course.ajax.php?a=search_course']
1510 1510
                 );
1511 1511
                 $default_values[$row['variable']] = $row['selected_value'];
1512 1512
                 break;
@@ -1514,10 +1514,10 @@  discard block
 block discarded – undo
1514 1514
 
1515 1515
         switch ($row['variable']) {
1516 1516
             case 'pdf_export_watermark_enable':
1517
-                $url =  PDF::get_watermark(null);
1517
+                $url = PDF::get_watermark(null);
1518 1518
 
1519 1519
                 if ($url != false) {
1520
-                    $delete_url = '<a href="?delete_watermark">'.get_lang('DelImage').' '.Display::return_icon('delete.png',get_lang('DelImage')).'</a>';
1520
+                    $delete_url = '<a href="?delete_watermark">'.get_lang('DelImage').' '.Display::return_icon('delete.png', get_lang('DelImage')).'</a>';
1521 1521
                     $form->addElement('html', '<div style="max-height:100px; max-width:100px; margin-left:162px; margin-bottom:10px; clear:both;"><img src="'.$url.'" style="margin-bottom:10px;" />'.$delete_url.'</div>');
1522 1522
                 }
1523 1523
 
@@ -1671,7 +1671,7 @@  discard block
 block discarded – undo
1671 1671
     if (api_is_windows_os() == false) {
1672 1672
         $list_of_programs = array('pdftotext', 'ps2pdf', 'catdoc', 'html2text', 'unrtf', 'catppt', 'xls2csv');
1673 1673
 
1674
-        foreach($list_of_programs as $program) {
1674
+        foreach ($list_of_programs as $program) {
1675 1675
             $output = [];
1676 1676
             $ret_val = null;
1677 1677
             exec("which $program", $output, $ret_val);
@@ -1684,7 +1684,7 @@  discard block
 block discarded – undo
1684 1684
             if (!empty($output[0])) {
1685 1685
                 $icon = Display::return_icon('bullet_green.png', get_lang('Installed'));
1686 1686
             }
1687
-            $data2[]= array($program, $output[0], $icon);
1687
+            $data2[] = array($program, $output[0], $icon);
1688 1688
         }
1689 1689
         echo Display::tag('h3', get_lang('ProgramsNeededToConvertFiles'));
1690 1690
         $table = new SortableTableFromArray($data2);
@@ -1710,9 +1710,9 @@  discard block
 block discarded – undo
1710 1710
     if (is_dir($dir)) {
1711 1711
         $zip = new PclZip($arch);
1712 1712
         // Remove path prefix except the style name and put file on disk
1713
-        $zip->create($dir, PCLZIP_OPT_REMOVE_PATH, substr($dir,0,-strlen($style)));
1713
+        $zip->create($dir, PCLZIP_OPT_REMOVE_PATH, substr($dir, 0, -strlen($style)));
1714 1714
         //@TODO: use more generic script to download.
1715
-        $str = '<a class="btn btn-primary btn-large" href="' . api_get_path(WEB_CODE_PATH) . 'course_info/download.php?archive=' . str_replace(api_get_path(SYS_ARCHIVE_PATH), '', $arch) . '">'.get_lang('ClickHereToDownloadTheFile').'</a>';
1715
+        $str = '<a class="btn btn-primary btn-large" href="'.api_get_path(WEB_CODE_PATH).'course_info/download.php?archive='.str_replace(api_get_path(SYS_ARCHIVE_PATH), '', $arch).'">'.get_lang('ClickHereToDownloadTheFile').'</a>';
1716 1716
         Display::display_normal_message($str, false);
1717 1717
     } else {
1718 1718
         Display::addFlash(Display::return_message(get_lang('FileNotFound'), 'warning'));
Please login to merge, or discard this patch.