@@ -20,7 +20,7 @@ |
||
| 20 | 20 | <form name="install" id="install_form" action="index.php?action=options" method="post"> |
| 21 | 21 | <?php |
| 22 | 22 | if ($errors == 0) { |
| 23 | - // check if install folder is removeable |
|
| 23 | + // check if install folder is removeable |
|
| 24 | 24 | if (is_writable("../install")) { ?> |
| 25 | 25 | <span id="removeinstall" style="float:left;cursor:pointer;color:#505050;line-height:18px;" onclick="var chk=document.install.rminstaller; if(chk) chk.checked=!chk.checked;"><input type="checkbox" name="rminstaller" onclick="event.cancelBubble=true;" <?php echo (empty ($errors) ? 'checked="checked"' : '') ?> style="cursor:default;" /><?php echo $_lang['remove_install_folder_auto'] ?></span> |
| 26 | 26 | <?php |
@@ -8,10 +8,10 @@ |
||
| 8 | 8 | $self = 'install/connection.databasetest.php'; |
| 9 | 9 | $base_path = str_replace($self,'',str_replace('\\','/', __FILE__)); |
| 10 | 10 | if (is_file("{$base_path}assets/cache/siteManager.php")) { |
| 11 | - include_once("{$base_path}assets/cache/siteManager.php"); |
|
| 11 | + include_once("{$base_path}assets/cache/siteManager.php"); |
|
| 12 | 12 | } |
| 13 | 13 | if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) { |
| 14 | - define('MGR_DIR','manager'); |
|
| 14 | + define('MGR_DIR','manager'); |
|
| 15 | 15 | } |
| 16 | 16 | require_once("lang.php"); |
| 17 | 17 | |
@@ -18,8 +18,7 @@ discard block |
||
| 18 | 18 | $output = $_lang["status_checking_database"]; |
| 19 | 19 | if (!$conn = mysqli_connect($host, $uid, $pwd)) { |
| 20 | 20 | $output .= '<span id="database_fail" style="color:#FF0000;">'.$_lang['status_failed'].'</span>'; |
| 21 | -} |
|
| 22 | -else { |
|
| 21 | +} else { |
|
| 23 | 22 | $database_name = mysqli_real_escape_string($conn, $_POST['database_name']); |
| 24 | 23 | $database_name = str_replace("`", "", $database_name); |
| 25 | 24 | $tableprefix = mysqli_real_escape_string($conn, $_POST['tableprefix']); |
@@ -31,20 +30,16 @@ discard block |
||
| 31 | 30 | $database_charset = substr($database_collation, 0, strpos($database_collation, '_')); |
| 32 | 31 | $query = "CREATE DATABASE `".$database_name."` CHARACTER SET ".$database_charset." COLLATE ".$database_collation.";"; |
| 33 | 32 | |
| 34 | - if (! mysqli_query($conn, $query)){ |
|
| 33 | + if (! mysqli_query($conn, $query)) { |
|
| 35 | 34 | $output .= '<span id="database_fail" style="color:#FF0000;">'.$_lang['status_failed_could_not_create_database'].'</span>'; |
| 36 | - } |
|
| 37 | - else { |
|
| 35 | + } else { |
|
| 38 | 36 | $output .= '<span id="database_pass" style="color:#80c000;">'.$_lang['status_passed_database_created'].'</span>'; |
| 39 | 37 | } |
| 40 | - } |
|
| 41 | - elseif (($installMode == 0) && (mysqli_query($conn, "SELECT COUNT(*) FROM {$database_name}.`{$tableprefix}site_content`"))) { |
|
| 38 | + } elseif (($installMode == 0) && (mysqli_query($conn, "SELECT COUNT(*) FROM {$database_name}.`{$tableprefix}site_content`"))) { |
|
| 42 | 39 | $output .= '<span id="database_fail" style="color:#FF0000;">'.$_lang['status_failed_table_prefix_already_in_use'].'</span>'; |
| 43 | - } |
|
| 44 | - elseif (($database_connection_method != 'SET NAMES') && ($rs = mysqli_query($conn, "show variables like 'collation_database'")) && ($row = mysqli_fetch_row($rs)) && ($row[1] != $database_collation)) { |
|
| 40 | + } elseif (($database_connection_method != 'SET NAMES') && ($rs = mysqli_query($conn, "show variables like 'collation_database'")) && ($row = mysqli_fetch_row($rs)) && ($row[1] != $database_collation)) { |
|
| 45 | 41 | $output .= '<span id="database_fail" style="color:#FF0000;">'.sprintf($_lang['status_failed_database_collation_does_not_match'], $row[1]).'</span>'; |
| 46 | - } |
|
| 47 | - else { |
|
| 42 | + } else { |
|
| 48 | 43 | $output .= '<span id="database_pass" style="color:#80c000;">'.$_lang['status_passed'].'</span>'; |
| 49 | 44 | } |
| 50 | 45 | } |
@@ -16,10 +16,10 @@ |
||
| 16 | 16 | error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED); |
| 17 | 17 | |
| 18 | 18 | if (is_file("{$base_path}assets/cache/siteManager.php")) { |
| 19 | - include_once("{$base_path}assets/cache/siteManager.php"); |
|
| 19 | + include_once("{$base_path}assets/cache/siteManager.php"); |
|
| 20 | 20 | } |
| 21 | 21 | if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) { |
| 22 | - define('MGR_DIR', 'manager'); |
|
| 22 | + define('MGR_DIR', 'manager'); |
|
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | |
@@ -49,9 +49,9 @@ discard block |
||
| 49 | 49 | <select name="manager_theme" size="1" class="inputBox" onChange="documentDirty=true; document.forms['settings'].theme_refresher.value = Date.parse(new Date());"> |
| 50 | 50 | <?php |
| 51 | 51 | $dir = dir("media/style/");
|
| 52 | - while ($file = $dir->read()) {
|
|
| 53 | - if ($file != "." && $file != ".." && is_dir("media/style/$file") && substr($file, 0, 1) != '.') {
|
|
| 54 | - if ($file === 'common') {
|
|
| 52 | + while ($file = $dir->read()) { |
|
| 53 | + if ($file != "." && $file != ".." && is_dir("media/style/$file") && substr($file, 0, 1) != '.') { |
|
| 54 | + if ($file === 'common') { |
|
| 55 | 55 | continue; |
| 56 | 56 | } |
| 57 | 57 | $themename = $file; |
@@ -209,7 +209,7 @@ discard block |
||
| 209 | 209 | $tpl = '<option value="[+value+]" [+selected+]>[+title+]</option>' . "\n"; |
| 210 | 210 | $option = explode(',', $_lang['settings_group_tv_options']);
|
| 211 | 211 | $output = array(); |
| 212 | - foreach ($option as $k => $v) {
|
|
| 212 | + foreach ($option as $k => $v) { |
|
| 213 | 213 | $selected = ($k == $group_tvs) ? 'selected' : ''; |
| 214 | 214 | $s = array('[+value+]', '[+selected+]', '[+title+]');
|
| 215 | 215 | $r = array($k, $selected, $v); |
@@ -282,7 +282,7 @@ discard block |
||
| 282 | 282 | $tpl = '<option value="[+value+]" [+selected+]>[*[+value+]*]</option>' . "\n"; |
| 283 | 283 | $option = array('pagetitle', 'longtitle', 'menutitle', 'alias', 'createdon', 'editedon', 'publishedon');
|
| 284 | 284 | $output = array(); |
| 285 | - foreach ($option as $v) {
|
|
| 285 | + foreach ($option as $v) { |
|
| 286 | 286 | $selected = ($v == $resource_tree_node_name) ? 'selected' : ''; |
| 287 | 287 | $s = array('[+value+]', '[+selected+]');
|
| 288 | 288 | $r = array($v, $selected); |
@@ -363,7 +363,7 @@ discard block |
||
| 363 | 363 | <?php |
| 364 | 364 | $datetime_format_list = array('dd-mm-YYYY', 'mm/dd/YYYY', 'YYYY/mm/dd');
|
| 365 | 365 | $str = ''; |
| 366 | - foreach ($datetime_format_list as $value) {
|
|
| 366 | + foreach ($datetime_format_list as $value) { |
|
| 367 | 367 | $selectedtext = ($datetime_format == $value) ? ' selected' : ''; |
| 368 | 368 | $str .= '<option value="' . $value . '"' . $selectedtext . '>'; |
| 369 | 369 | $str .= $value . '</option>' . PHP_EOL; |
@@ -445,7 +445,7 @@ discard block |
||
| 445 | 445 | <?php |
| 446 | 446 | // invoke OnRichTextEditorRegister event |
| 447 | 447 | $evtOut = $modx->invokeEvent('OnRichTextEditorRegister');
|
| 448 | - if (!is_array($evtOut)) {
|
|
| 448 | + if (!is_array($evtOut)) { |
|
| 449 | 449 | $evtOut = array(); |
| 450 | 450 | $use_editor = 0; |
| 451 | 451 | } |
@@ -477,8 +477,8 @@ discard block |
||
| 477 | 477 | <?php |
| 478 | 478 | // invoke OnRichTextEditorRegister event |
| 479 | 479 | echo "<option value='none'" . ($which_editor == 'none' ? " selected='selected'" : "") . ">" . $_lang['none'] . "</option>\n"; |
| 480 | - if (is_array($evtOut)) {
|
|
| 481 | - foreach ($evtOut as $editor) {
|
|
| 480 | + if (is_array($evtOut)) { |
|
| 481 | + foreach ($evtOut as $editor) { |
|
| 482 | 482 | echo "<option value='$editor'" . ($which_editor == $editor ? " selected='selected'" : "") . ">$editor</option>\n"; |
| 483 | 483 | } |
| 484 | 484 | } |
@@ -534,7 +534,7 @@ discard block |
||
| 534 | 534 | <?php |
| 535 | 535 | // invoke OnInterfaceSettingsRender event |
| 536 | 536 | $evtOut = $modx->invokeEvent('OnInterfaceSettingsRender');
|
| 537 | - if (is_array($evtOut)) {
|
|
| 537 | + if (is_array($evtOut)) { |
|
| 538 | 538 | echo implode("", $evtOut);
|
| 539 | 539 | } |
| 540 | 540 | ?> |
@@ -1,11 +1,11 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | /** Portugues Brasil localization file for KCFinder |
| 4 | - * author: Alexandre Benegas Ferreira |
|
| 5 | - * country: Brasil |
|
| 6 | - * company website: www.hostcataratas.com.br |
|
| 7 | - * e-mail: [email protected] |
|
| 8 | - */ |
|
| 4 | + * author: Alexandre Benegas Ferreira |
|
| 5 | + * country: Brasil |
|
| 6 | + * company website: www.hostcataratas.com.br |
|
| 7 | + * e-mail: [email protected] |
|
| 8 | + */ |
|
| 9 | 9 | |
| 10 | 10 | $lang = array( |
| 11 | 11 | |
@@ -1,8 +1,8 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | /** German localization file for KCFinder |
| 4 | - * author: Tim Wahrendorff <[email protected]> |
|
| 5 | - */ |
|
| 4 | + * author: Tim Wahrendorff <[email protected]> |
|
| 5 | + */ |
|
| 6 | 6 | |
| 7 | 7 | $lang = array( |
| 8 | 8 | |
@@ -1,13 +1,13 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | /** This file is part of KCFinder project |
| 4 | - * |
|
| 5 | - * @desc Japanese localization |
|
| 6 | - * @package KCFinder |
|
| 7 | - * @author yama [email protected] |
|
| 8 | - * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 |
|
| 9 | - * @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2 |
|
| 10 | - */ |
|
| 4 | + * |
|
| 5 | + * @desc Japanese localization |
|
| 6 | + * @package KCFinder |
|
| 7 | + * @author yama [email protected] |
|
| 8 | + * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 |
|
| 9 | + * @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2 |
|
| 10 | + */ |
|
| 11 | 11 | |
| 12 | 12 | $lang = array( |
| 13 | 13 | |
@@ -1,9 +1,9 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | /** French localization file for KCFinder |
| 4 | - * author: Damien Barrère |
|
| 5 | - * update: Samuel Jobard |
|
| 6 | - */ |
|
| 4 | + * author: Damien Barrère |
|
| 5 | + * update: Samuel Jobard |
|
| 6 | + */ |
|
| 7 | 7 | |
| 8 | 8 | $lang = array( |
| 9 | 9 | |
@@ -1,8 +1,8 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | /** Hebrew localization file for KCFinder |
| 4 | - * Sig: 1f4f9aee887c97f618c19a82040a4dad |
|
| 5 | - */ |
|
| 4 | + * Sig: 1f4f9aee887c97f618c19a82040a4dad |
|
| 5 | + */ |
|
| 6 | 6 | |
| 7 | 7 | $lang = array( |
| 8 | 8 | |