evolution-cms /
evolution
@@ -1,5 +1,5 @@ |
||
| 1 | 1 | <?php |
| 2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 3 | 3 | die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly."); |
| 4 | 4 | } |
| 5 | 5 | ?> |
@@ -3,7 +3,7 @@ discard block |
||
| 3 | 3 | // MySQL Dump Parser |
| 4 | 4 | // SNUFFKIN/ Alex 2004 |
| 5 | 5 | |
| 6 | -class SqlParser { |
|
| 6 | +class SqlParser{ |
|
| 7 | 7 | public $host; |
| 8 | 8 | public $dbname; |
| 9 | 9 | public $prefix; |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | public $ignoreDuplicateErrors; |
| 29 | 29 | public $autoTemplateLogic; |
| 30 | 30 | |
| 31 | - public function __construct($host, $user, $password, $db, $prefix='modx_', $adminname, $adminemail, $adminpass, $connection_charset= 'utf8', $managerlanguage='english', $connection_method = 'SET CHARACTER SET', $auto_template_logic = 'parent') { |
|
| 31 | + public function __construct($host, $user, $password, $db, $prefix = 'modx_', $adminname, $adminemail, $adminpass, $connection_charset = 'utf8', $managerlanguage = 'english', $connection_method = 'SET CHARACTER SET', $auto_template_logic = 'parent'){ |
|
| 32 | 32 | $this->host = $host; |
| 33 | 33 | $this->dbname = $db; |
| 34 | 34 | $this->prefix = $prefix; |
@@ -44,28 +44,28 @@ discard block |
||
| 44 | 44 | $this->autoTemplateLogic = $auto_template_logic; |
| 45 | 45 | } |
| 46 | 46 | |
| 47 | - public function connect() { |
|
| 47 | + public function connect(){ |
|
| 48 | 48 | $this->conn = mysqli_connect($this->host, $this->user, $this->password); |
| 49 | 49 | mysqli_select_db($this->conn, $this->dbname); |
| 50 | 50 | if (function_exists('mysqli_set_charset')) mysqli_set_charset($this->conn, $this->connection_charset); |
| 51 | 51 | |
| 52 | 52 | $this->dbVersion = 3.23; // assume version 3.23 |
| 53 | - if(function_exists("mysqli_get_server_info")) { |
|
| 53 | + if (function_exists("mysqli_get_server_info")) { |
|
| 54 | 54 | $ver = mysqli_get_server_info($this->conn); |
| 55 | - $this->dbMODx = version_compare($ver,"4.0.2"); |
|
| 55 | + $this->dbMODx = version_compare($ver, "4.0.2"); |
|
| 56 | 56 | $this->dbVersion = (float) $ver; // Typecasting (float) instead of floatval() [PHP < 4.2] |
| 57 | 57 | } |
| 58 | 58 | |
| 59 | - mysqli_query($this->conn,"{$this->connection_method} {$this->connection_charset}"); |
|
| 59 | + mysqli_query($this->conn, "{$this->connection_method} {$this->connection_charset}"); |
|
| 60 | 60 | } |
| 61 | 61 | |
| 62 | - public function process($filename) { |
|
| 62 | + public function process($filename){ |
|
| 63 | 63 | global $custom_placeholders; |
| 64 | 64 | |
| 65 | 65 | // check to make sure file exists |
| 66 | 66 | if (!file_exists($filename)) { |
| 67 | 67 | $this->mysqlErrors[] = array("error" => "File '$filename' not found"); |
| 68 | - $this->installFailed = true ; |
|
| 68 | + $this->installFailed = true; |
|
| 69 | 69 | return false; |
| 70 | 70 | } |
| 71 | 71 | |
@@ -82,10 +82,10 @@ discard block |
||
| 82 | 82 | // check if in upgrade mode |
| 83 | 83 | if ($this->mode === 'upd') { |
| 84 | 84 | // remove non-upgradeable parts |
| 85 | - $s = strpos($idata,'non-upgrade-able[['); |
|
| 86 | - $e = strpos($idata,']]non-upgrade-able') + 17; |
|
| 87 | - if($s && $e) { |
|
| 88 | - $idata = str_replace(substr($idata, $s,$e-$s),' Removed non upgradeable items', $idata); |
|
| 85 | + $s = strpos($idata, 'non-upgrade-able[['); |
|
| 86 | + $e = strpos($idata, ']]non-upgrade-able') + 17; |
|
| 87 | + if ($s && $e) { |
|
| 88 | + $idata = str_replace(substr($idata, $s, $e - $s), ' Removed non upgradeable items', $idata); |
|
| 89 | 89 | } |
| 90 | 90 | } |
| 91 | 91 | |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | /*$idata = str_replace('{VERSION}', $modx_version, $idata);*/ |
| 103 | 103 | |
| 104 | 104 | // Replace custom placeholders |
| 105 | - foreach($custom_placeholders as $key=>$val) { |
|
| 105 | + foreach ($custom_placeholders as $key=>$val) { |
|
| 106 | 106 | if (strpos($idata, '{'.$key.'}') !== false) { |
| 107 | 107 | $idata = str_replace('{'.$key.'}', $val, $idata); |
| 108 | 108 | } |
@@ -111,14 +111,14 @@ discard block |
||
| 111 | 111 | $sql_array = explode("\n\n", $idata); |
| 112 | 112 | |
| 113 | 113 | $num = 0; |
| 114 | - foreach($sql_array as $sql_entry) { |
|
| 114 | + foreach ($sql_array as $sql_entry) { |
|
| 115 | 115 | $sql_do = trim($sql_entry, "\r\n; "); |
| 116 | 116 | |
| 117 | 117 | if (preg_match('/^\#/', $sql_do)) continue; |
| 118 | 118 | |
| 119 | 119 | // strip out comments and \n for mysql 3.x |
| 120 | - if ($this->dbVersion <4.0) { |
|
| 121 | - $sql_do = preg_replace("~COMMENT.*[^']?'.*[^']?'~","",$sql_do); |
|
| 120 | + if ($this->dbVersion < 4.0) { |
|
| 121 | + $sql_do = preg_replace("~COMMENT.*[^']?'.*[^']?'~", "", $sql_do); |
|
| 122 | 122 | $sql_do = str_replace('\r', "", $sql_do); |
| 123 | 123 | $sql_do = str_replace('\n', "", $sql_do); |
| 124 | 124 | } |
@@ -126,10 +126,10 @@ discard block |
||
| 126 | 126 | |
| 127 | 127 | $num = $num + 1; |
| 128 | 128 | if ($sql_do) mysqli_query($this->conn, $sql_do); |
| 129 | - if(mysqli_error($this->conn)) { |
|
| 129 | + if (mysqli_error($this->conn)) { |
|
| 130 | 130 | // Ignore duplicate and drop errors - Raymond |
| 131 | - if ($this->ignoreDuplicateErrors){ |
|
| 132 | - if (mysqli_errno($this->conn) == 1060 || mysqli_errno($this->conn) == 1061 || mysqli_errno($this->conn) == 1062 ||mysqli_errno($this->conn) == 1091) continue; |
|
| 131 | + if ($this->ignoreDuplicateErrors) { |
|
| 132 | + if (mysqli_errno($this->conn) == 1060 || mysqli_errno($this->conn) == 1061 || mysqli_errno($this->conn) == 1062 || mysqli_errno($this->conn) == 1091) continue; |
|
| 133 | 133 | } |
| 134 | 134 | // End Ignore duplicate |
| 135 | 135 | $this->mysqlErrors[] = array("error" => mysqli_error($this->conn), "sql" => $sql_do); |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | } |
| 139 | 139 | } |
| 140 | 140 | |
| 141 | - public function close() { |
|
| 141 | + public function close(){ |
|
| 142 | 142 | mysqli_close($this->conn); |
| 143 | 143 | } |
| 144 | 144 | } |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 3 | 3 | die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly."); |
| 4 | 4 | } |
| 5 | 5 | if (!$modx->hasPermission('bk_manager')) { |
@@ -9,10 +9,10 @@ discard block |
||
| 9 | 9 | $dbase = trim($dbase, '`'); |
| 10 | 10 | |
| 11 | 11 | if (!isset($modx->config['snapshot_path'])) { |
| 12 | - if (is_dir(MODX_BASE_PATH . 'temp/backup/')) { |
|
| 13 | - $modx->config['snapshot_path'] = MODX_BASE_PATH . 'temp/backup/'; |
|
| 12 | + if (is_dir(MODX_BASE_PATH.'temp/backup/')) { |
|
| 13 | + $modx->config['snapshot_path'] = MODX_BASE_PATH.'temp/backup/'; |
|
| 14 | 14 | } else { |
| 15 | - $modx->config['snapshot_path'] = MODX_BASE_PATH . 'assets/backup/'; |
|
| 15 | + $modx->config['snapshot_path'] = MODX_BASE_PATH.'assets/backup/'; |
|
| 16 | 16 | } |
| 17 | 17 | } |
| 18 | 18 | |
@@ -23,7 +23,7 @@ discard block |
||
| 23 | 23 | if ($mode == 'restore1') { |
| 24 | 24 | if (isset($_POST['textarea']) && !empty($_POST['textarea'])) { |
| 25 | 25 | $source = trim($_POST['textarea']); |
| 26 | - $_SESSION['textarea'] = $source . "\n"; |
|
| 26 | + $_SESSION['textarea'] = $source."\n"; |
|
| 27 | 27 | } else { |
| 28 | 28 | $source = file_get_contents($_FILES['sqlfile']['tmp_name']); |
| 29 | 29 | } |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | header('Location: index.php?r=9&a=93'); |
| 32 | 32 | exit; |
| 33 | 33 | } elseif ($mode == 'restore2') { |
| 34 | - $path = $modx->config['snapshot_path'] . $_POST['filename']; |
|
| 34 | + $path = $modx->config['snapshot_path'].$_POST['filename']; |
|
| 35 | 35 | if (file_exists($path)) { |
| 36 | 36 | $source = file_get_contents($path); |
| 37 | 37 | import_sql($source); |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | if (!is_writable(rtrim($modx->config['snapshot_path'], '/'))) { |
| 78 | 78 | $modx->webAlertAndQuit(parsePlaceholder($_lang["bkmgr_alert_mkdir"], array('snapshot_path' => $modx->config['snapshot_path']))); |
| 79 | 79 | } |
| 80 | - $sql = "SHOW TABLE STATUS FROM `{$dbase}` LIKE '" . $modx->db->escape($modx->db->config['table_prefix']) . "%'"; |
|
| 80 | + $sql = "SHOW TABLE STATUS FROM `{$dbase}` LIKE '".$modx->db->escape($modx->db->config['table_prefix'])."%'"; |
|
| 81 | 81 | $rs = $modx->db->query($sql); |
| 82 | 82 | $tables = $modx->db->getColumn('Name', $rs); |
| 83 | 83 | $today = date('Y-m-d_H-i-s'); |
@@ -109,18 +109,18 @@ discard block |
||
| 109 | 109 | $modx->webAlertAndQuit('Unable to Backup Database'); |
| 110 | 110 | } |
| 111 | 111 | } else { |
| 112 | - include_once MODX_MANAGER_PATH . "includes/header.inc.php"; // start normal header |
|
| 112 | + include_once MODX_MANAGER_PATH."includes/header.inc.php"; // start normal header |
|
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | if (isset($_SESSION['result_msg']) && $_SESSION['result_msg'] != '') { |
| 116 | 116 | switch ($_SESSION['result_msg']) { |
| 117 | 117 | case 'import_ok': |
| 118 | - $ph['result_msg_import'] = '<div class="alert alert-success">' . $_lang["bkmgr_import_ok"] . '</div>'; |
|
| 119 | - $ph['result_msg_snapshot'] = '<div class="alert alert-success">' . $_lang["bkmgr_import_ok"] . '</div>'; |
|
| 118 | + $ph['result_msg_import'] = '<div class="alert alert-success">'.$_lang["bkmgr_import_ok"].'</div>'; |
|
| 119 | + $ph['result_msg_snapshot'] = '<div class="alert alert-success">'.$_lang["bkmgr_import_ok"].'</div>'; |
|
| 120 | 120 | break; |
| 121 | 121 | case 'snapshot_ok': |
| 122 | 122 | $ph['result_msg_import'] = ''; |
| 123 | - $ph['result_msg_snapshot'] = '<div class="alert alert-success">' . $_lang["bkmgr_snapshot_ok"] . '</div>'; |
|
| 123 | + $ph['result_msg_snapshot'] = '<div class="alert alert-success">'.$_lang["bkmgr_snapshot_ok"].'</div>'; |
|
| 124 | 124 | break; |
| 125 | 125 | } |
| 126 | 126 | $_SESSION['result_msg'] = ''; |
@@ -179,7 +179,7 @@ discard block |
||
| 179 | 179 | f.style.display = 'none'; |
| 180 | 180 | } |
| 181 | 181 | } |
| 182 | - <?= (isset($_REQUEST['r']) ? " doRefresh(" . $_REQUEST['r'] . ");" : "") ?> |
|
| 182 | + <?= (isset($_REQUEST['r']) ? " doRefresh(".$_REQUEST['r'].");" : "") ?> |
|
| 183 | 183 | |
| 184 | 184 | </script> |
| 185 | 185 | |
@@ -223,7 +223,7 @@ discard block |
||
| 223 | 223 | </thead> |
| 224 | 224 | <tbody> |
| 225 | 225 | <?php |
| 226 | - $sql = "SHOW TABLE STATUS FROM `{$dbase}` LIKE '" . $modx->db->escape($modx->db->config['table_prefix']) . "%'"; |
|
| 226 | + $sql = "SHOW TABLE STATUS FROM `{$dbase}` LIKE '".$modx->db->escape($modx->db->config['table_prefix'])."%'"; |
|
| 227 | 227 | $rs = $modx->db->query($sql); |
| 228 | 228 | $i = 0; |
| 229 | 229 | while ($db_status = $modx->db->getRow($rs)) { |
@@ -233,29 +233,29 @@ discard block |
||
| 233 | 233 | $table_string = ''; |
| 234 | 234 | } |
| 235 | 235 | |
| 236 | - echo '<tr>' . "\n" . '<td><label class="form-check form-check-label"><input type="checkbox" name="chk[]" class="form-check-input" value="' . $db_status['Name'] . '"' . (strstr($table_string, $db_status['Name']) === false ? '' : ' checked="checked"') . ' /><b class="text-primary">' . $db_status['Name'] . '</b></label></td>' . "\n"; |
|
| 237 | - echo '<td class="text-xs-center">' . (!empty($db_status['Comment']) ? '<i class="' . $_style['actions_help'] . '" data-tooltip="' . $db_status['Comment'] . '"></i>' : '') . '</td>' . "\n"; |
|
| 238 | - echo '<td class="text-xs-right">' . $db_status['Rows'] . '</td>' . "\n"; |
|
| 239 | - echo '<td class="text-xs-right">' . $db_status['Collation'] . '</td>' . "\n"; |
|
| 236 | + echo '<tr>'."\n".'<td><label class="form-check form-check-label"><input type="checkbox" name="chk[]" class="form-check-input" value="'.$db_status['Name'].'"'.(strstr($table_string, $db_status['Name']) === false ? '' : ' checked="checked"').' /><b class="text-primary">'.$db_status['Name'].'</b></label></td>'."\n"; |
|
| 237 | + echo '<td class="text-xs-center">'.(!empty($db_status['Comment']) ? '<i class="'.$_style['actions_help'].'" data-tooltip="'.$db_status['Comment'].'"></i>' : '').'</td>'."\n"; |
|
| 238 | + echo '<td class="text-xs-right">'.$db_status['Rows'].'</td>'."\n"; |
|
| 239 | + echo '<td class="text-xs-right">'.$db_status['Collation'].'</td>'."\n"; |
|
| 240 | 240 | |
| 241 | 241 | // Enable record deletion for certain tables (TRUNCATE TABLE) if they're not already empty |
| 242 | 242 | $truncateable = array( |
| 243 | - $modx->db->config['table_prefix'] . 'event_log', |
|
| 244 | - $modx->db->config['table_prefix'] . 'manager_log', |
|
| 243 | + $modx->db->config['table_prefix'].'event_log', |
|
| 244 | + $modx->db->config['table_prefix'].'manager_log', |
|
| 245 | 245 | ); |
| 246 | 246 | if ($modx->hasPermission('settings') && in_array($db_status['Name'], $truncateable) && $db_status['Rows'] > 0) { |
| 247 | - echo '<td class="text-xs-right"><a class="text-danger" href="index.php?a=54&mode=' . $action . '&u=' . $db_status['Name'] . '" title="' . $_lang['truncate_table'] . '">' . $modx->nicesize($db_status['Data_length'] + $db_status['Data_free']) . '</a>' . '</td>' . "\n"; |
|
| 247 | + echo '<td class="text-xs-right"><a class="text-danger" href="index.php?a=54&mode='.$action.'&u='.$db_status['Name'].'" title="'.$_lang['truncate_table'].'">'.$modx->nicesize($db_status['Data_length'] + $db_status['Data_free']).'</a>'.'</td>'."\n"; |
|
| 248 | 248 | } else { |
| 249 | - echo '<td class="text-xs-right">' . $modx->nicesize($db_status['Data_length'] + $db_status['Data_free']) . '</td>' . "\n"; |
|
| 249 | + echo '<td class="text-xs-right">'.$modx->nicesize($db_status['Data_length'] + $db_status['Data_free']).'</td>'."\n"; |
|
| 250 | 250 | } |
| 251 | 251 | |
| 252 | 252 | if ($modx->hasPermission('settings')) { |
| 253 | - echo '<td class="text-xs-right">' . ($db_status['Data_free'] > 0 ? '<a class="text-danger" href="index.php?a=54&mode=' . $action . '&t=' . $db_status['Name'] . '" title="' . $_lang['optimize_table'] . '">' . $modx->nicesize($db_status['Data_free']) . '</a>' : '-') . '</td>' . "\n"; |
|
| 253 | + echo '<td class="text-xs-right">'.($db_status['Data_free'] > 0 ? '<a class="text-danger" href="index.php?a=54&mode='.$action.'&t='.$db_status['Name'].'" title="'.$_lang['optimize_table'].'">'.$modx->nicesize($db_status['Data_free']).'</a>' : '-').'</td>'."\n"; |
|
| 254 | 254 | } else { |
| 255 | - echo '<td class="text-xs-right">' . ($db_status['Data_free'] > 0 ? $modx->nicesize($db_status['Data_free']) : '-') . '</td>' . "\n"; |
|
| 255 | + echo '<td class="text-xs-right">'.($db_status['Data_free'] > 0 ? $modx->nicesize($db_status['Data_free']) : '-').'</td>'."\n"; |
|
| 256 | 256 | } |
| 257 | 257 | |
| 258 | - echo '<td class="text-xs-right">' . $modx->nicesize($db_status['Data_length'] - $db_status['Data_free']) . '</td>' . "\n" . '<td class="text-xs-right">' . $modx->nicesize($db_status['Index_length']) . '</td>' . "\n" . '<td class="text-xs-right">' . $modx->nicesize($db_status['Index_length'] + $db_status['Data_length'] + $db_status['Data_free']) . '</td>' . "\n" . "</tr>"; |
|
| 258 | + echo '<td class="text-xs-right">'.$modx->nicesize($db_status['Data_length'] - $db_status['Data_free']).'</td>'."\n".'<td class="text-xs-right">'.$modx->nicesize($db_status['Index_length']).'</td>'."\n".'<td class="text-xs-right">'.$modx->nicesize($db_status['Index_length'] + $db_status['Data_length'] + $db_status['Data_free']).'</td>'."\n"."</tr>"; |
|
| 259 | 259 | |
| 260 | 260 | $total = $total + $db_status['Index_length'] + $db_status['Data_length']; |
| 261 | 261 | $totaloverhead = $totaloverhead + $db_status['Data_free']; |
@@ -266,9 +266,9 @@ discard block |
||
| 266 | 266 | <tr> |
| 267 | 267 | <td class="text-xs-right"><?= $_lang['database_table_totals'] ?></td> |
| 268 | 268 | <td colspan="4"> </td> |
| 269 | - <td class="text-xs-right"><?= $totaloverhead > 0 ? '<b class="text-danger">' . $modx->nicesize($totaloverhead) . '</b><br />(' . number_format($totaloverhead) . ' B)' : '-' ?></td> |
|
| 269 | + <td class="text-xs-right"><?= $totaloverhead > 0 ? '<b class="text-danger">'.$modx->nicesize($totaloverhead).'</b><br />('.number_format($totaloverhead).' B)' : '-' ?></td> |
|
| 270 | 270 | <td colspan="2"> </td> |
| 271 | - <td class="text-xs-right"><?= "<b>" . $modx->nicesize($total) . "</b><br />(" . number_format($total) . " B)" ?></td> |
|
| 271 | + <td class="text-xs-right"><?= "<b>".$modx->nicesize($total)."</b><br />(".number_format($total)." B)" ?></td> |
|
| 272 | 272 | </tr> |
| 273 | 273 | </tfoot> |
| 274 | 274 | </table> |
@@ -319,7 +319,7 @@ discard block |
||
| 319 | 319 | foreach ($last_result['0'] as $k => $v) { |
| 320 | 320 | $title[] = $k; |
| 321 | 321 | } |
| 322 | - $result = '<thead><tr><th>' . implode('</th><th>', $title) . '</th></tr></thead>'; |
|
| 322 | + $result = '<thead><tr><th>'.implode('</th><th>', $title).'</th></tr></thead>'; |
|
| 323 | 323 | $result .= '<tbody>'; |
| 324 | 324 | foreach ($last_result as $row) { |
| 325 | 325 | $result_value = array(); |
@@ -327,11 +327,11 @@ discard block |
||
| 327 | 327 | foreach ($row as $k => $v) { |
| 328 | 328 | $result_value[] = $v; |
| 329 | 329 | } |
| 330 | - $result .= '<tr><td>' . implode('</td><td>', $result_value) . '</td></tr>'; |
|
| 330 | + $result .= '<tr><td>'.implode('</td><td>', $result_value).'</td></tr>'; |
|
| 331 | 331 | } |
| 332 | 332 | } |
| 333 | 333 | $result .= '</tbody>'; |
| 334 | - $result = '<table class="table data">' . $result . '</table>'; |
|
| 334 | + $result = '<table class="table data">'.$result.'</table>'; |
|
| 335 | 335 | } |
| 336 | 336 | } |
| 337 | 337 | |
@@ -433,7 +433,7 @@ discard block |
||
| 433 | 433 | while ($count < 11) { |
| 434 | 434 | $line = fgets($file); |
| 435 | 435 | foreach ($detailFields as $label) { |
| 436 | - $fileLabel = '# ' . $label; |
|
| 436 | + $fileLabel = '# '.$label; |
|
| 437 | 437 | if (strpos($line, $fileLabel) !== false) { |
| 438 | 438 | $details[$label] = htmlentities(trim(str_replace(array( |
| 439 | 439 | $fileLabel, |
@@ -446,10 +446,10 @@ discard block |
||
| 446 | 446 | }; |
| 447 | 447 | fclose($file); |
| 448 | 448 | |
| 449 | - $tooltip = "Generation Time: " . $details["Generation Time"] . "\n"; |
|
| 450 | - $tooltip .= "Server version: " . $details["Server version"] . "\n"; |
|
| 451 | - $tooltip .= "PHP Version: " . $details["PHP Version"] . "\n"; |
|
| 452 | - $tooltip .= "Host: " . $details["Host"] . "\n"; |
|
| 449 | + $tooltip = "Generation Time: ".$details["Generation Time"]."\n"; |
|
| 450 | + $tooltip .= "Server version: ".$details["Server version"]."\n"; |
|
| 451 | + $tooltip .= "PHP Version: ".$details["PHP Version"]."\n"; |
|
| 452 | + $tooltip .= "Host: ".$details["Host"]."\n"; |
|
| 453 | 453 | ?> |
| 454 | 454 | <tr> |
| 455 | 455 | <td><?= $filename ?></td> |
@@ -481,7 +481,7 @@ discard block |
||
| 481 | 481 | <?php |
| 482 | 482 | |
| 483 | 483 | if (is_numeric($_GET['tab'])) { |
| 484 | - echo '<script type="text/javascript">tpDBM.setSelectedIndex( ' . $_GET['tab'] . ' );</script>'; |
|
| 484 | + echo '<script type="text/javascript">tpDBM.setSelectedIndex( '.$_GET['tab'].' );</script>'; |
|
| 485 | 485 | } |
| 486 | 486 | |
| 487 | 487 | include_once "footer.inc.php"; // send footer |
@@ -535,7 +535,7 @@ discard block |
||
| 535 | 535 | |
| 536 | 536 | // Set line feed |
| 537 | 537 | $lf = "\n"; |
| 538 | - $tempfile_path = $modx->config['base_path'] . 'assets/backup/temp.php'; |
|
| 538 | + $tempfile_path = $modx->config['base_path'].'assets/backup/temp.php'; |
|
| 539 | 539 | |
| 540 | 540 | $result = $modx->db->query('SHOW TABLES'); |
| 541 | 541 | $tables = $this->result2Array(0, $result); |
@@ -548,15 +548,15 @@ discard block |
||
| 548 | 548 | |
| 549 | 549 | // Set header |
| 550 | 550 | $output = "#{$lf}"; |
| 551 | - $output .= "# " . addslashes($modx->config['site_name']) . " Database Dump{$lf}"; |
|
| 551 | + $output .= "# ".addslashes($modx->config['site_name'])." Database Dump{$lf}"; |
|
| 552 | 552 | $output .= "# MODX Version:{$version['version']}{$lf}"; |
| 553 | 553 | $output .= "# {$lf}"; |
| 554 | 554 | $output .= "# Host: {$this->database_server}{$lf}"; |
| 555 | - $output .= "# Generation Time: " . $modx->toDateFormat(time()) . $lf; |
|
| 556 | - $output .= "# Server version: " . $modx->db->getVersion() . $lf; |
|
| 557 | - $output .= "# PHP Version: " . phpversion() . $lf; |
|
| 555 | + $output .= "# Generation Time: ".$modx->toDateFormat(time()).$lf; |
|
| 556 | + $output .= "# Server version: ".$modx->db->getVersion().$lf; |
|
| 557 | + $output .= "# PHP Version: ".phpversion().$lf; |
|
| 558 | 558 | $output .= "# Database: `{$this->dbname}`{$lf}"; |
| 559 | - $output .= "# Description: " . trim($_REQUEST['backup_title']) . "{$lf}"; |
|
| 559 | + $output .= "# Description: ".trim($_REQUEST['backup_title'])."{$lf}"; |
|
| 560 | 560 | $output .= "#"; |
| 561 | 561 | file_put_contents($tempfile_path, $output, FILE_APPEND | LOCK_EX); |
| 562 | 562 | $output = ''; |
@@ -575,7 +575,7 @@ discard block |
||
| 575 | 575 | } |
| 576 | 576 | } |
| 577 | 577 | if ($callBack === 'snapshot') { |
| 578 | - if (!preg_match('@^' . $modx->db->config['table_prefix'] . '@', $tblval)) { |
|
| 578 | + if (!preg_match('@^'.$modx->db->config['table_prefix'].'@', $tblval)) { |
|
| 579 | 579 | continue; |
| 580 | 580 | } |
| 581 | 581 | } |
@@ -597,7 +597,7 @@ discard block |
||
| 597 | 597 | $insertdump = $lf; |
| 598 | 598 | $insertdump .= "INSERT INTO `{$tblval}` VALUES ("; |
| 599 | 599 | $arr = $this->object2Array($row); |
| 600 | - if( ! is_array($arr)) $arr = array(); |
|
| 600 | + if (!is_array($arr)) $arr = array(); |
|
| 601 | 601 | foreach ($arr as $key => $value) { |
| 602 | 602 | if (is_null($value)) { |
| 603 | 603 | $value = 'NULL'; |
@@ -610,9 +610,9 @@ discard block |
||
| 610 | 610 | ), '\\n', $value); |
| 611 | 611 | $value = "'{$value}'"; |
| 612 | 612 | } |
| 613 | - $insertdump .= $value . ','; |
|
| 613 | + $insertdump .= $value.','; |
|
| 614 | 614 | } |
| 615 | - $output .= rtrim($insertdump, ',') . ");\n"; |
|
| 615 | + $output .= rtrim($insertdump, ',').");\n"; |
|
| 616 | 616 | if (1048576 < strlen($output)) { |
| 617 | 617 | file_put_contents($tempfile_path, $output, FILE_APPEND | LOCK_EX); |
| 618 | 618 | $output = ''; |
@@ -1,11 +1,11 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -$installMode = isset($_POST['installmode']) ? (int)$_POST['installmode'] : 0; |
|
| 2 | +$installMode = isset($_POST['installmode']) ? (int) $_POST['installmode'] : 0; |
|
| 3 | 3 | |
| 4 | 4 | // Determine upgradeability |
| 5 | -$upgradeable= 0; |
|
| 5 | +$upgradeable = 0; |
|
| 6 | 6 | if ($installMode === 0) { |
| 7 | - $database_name= ''; |
|
| 8 | - $database_server= 'localhost'; |
|
| 7 | + $database_name = ''; |
|
| 8 | + $database_server = 'localhost'; |
|
| 9 | 9 | $table_prefix = base_convert(rand(10, 20), 10, 36).substr(str_shuffle('0123456789abcdefghijklmnopqrstuvwxyz'), rand(0, 33), 3).'_'; |
| 10 | 10 | } else { |
| 11 | 11 | $database_name = ''; |
@@ -17,13 +17,13 @@ discard block |
||
| 17 | 17 | if ($dbase) { |
| 18 | 18 | $database_name = trim($dbase, '`'); |
| 19 | 19 | if (!$conn = mysqli_connect($database_server, $database_user, $database_password)) |
| 20 | - $upgradeable = (isset($_POST['installmode']) && $_POST['installmode']=='new') ? 0 : 2; |
|
| 21 | - elseif (! mysqli_select_db($conn, trim($dbase, '`'))) |
|
| 22 | - $upgradeable = (isset($_POST['installmode']) && $_POST['installmode']=='new') ? 0 : 2; |
|
| 20 | + $upgradeable = (isset($_POST['installmode']) && $_POST['installmode'] == 'new') ? 0 : 2; |
|
| 21 | + elseif (!mysqli_select_db($conn, trim($dbase, '`'))) |
|
| 22 | + $upgradeable = (isset($_POST['installmode']) && $_POST['installmode'] == 'new') ? 0 : 2; |
|
| 23 | 23 | else |
| 24 | 24 | $upgradeable = 1; |
| 25 | 25 | } |
| 26 | - else $upgradable= 2; |
|
| 26 | + else $upgradable = 2; |
|
| 27 | 27 | } |
| 28 | 28 | } |
| 29 | 29 | |
@@ -49,28 +49,28 @@ discard block |
||
| 49 | 49 | $database_connection_method = 'SET CHARACTER SET'; |
| 50 | 50 | } |
| 51 | 51 | |
| 52 | -$ph['database_name'] = isset($_POST['database_name']) ? $_POST['database_name']: $database_name; |
|
| 53 | -$ph['tableprefix'] = isset($_POST['tableprefix']) ? $_POST['tableprefix']: $table_prefix; |
|
| 52 | +$ph['database_name'] = isset($_POST['database_name']) ? $_POST['database_name'] : $database_name; |
|
| 53 | +$ph['tableprefix'] = isset($_POST['tableprefix']) ? $_POST['tableprefix'] : $table_prefix; |
|
| 54 | 54 | $ph['selected_set_character_set'] = isset($database_connection_method) && $database_connection_method == 'SET CHARACTER SET' ? 'selected' : ''; |
| 55 | 55 | $ph['selected_set_names'] = isset($database_connection_method) && $database_connection_method == 'SET NAMES' ? 'selected' : ''; |
| 56 | 56 | $ph['show#connection_method'] = (($installMode == 0) || ($installMode == 2)) ? 'block' : 'none'; |
| 57 | -$ph['database_collation'] = isset($_POST['database_collation']) ? $_POST['database_collation']: $database_collation; |
|
| 58 | -$ph['show#AUH'] = ($installMode == 0) ? 'block':'none'; |
|
| 59 | -$ph['cmsadmin'] = isset($_POST['cmsadmin']) ? $_POST['cmsadmin']:'admin'; |
|
| 60 | -$ph['cmsadminemail'] = isset($_POST['cmsadminemail']) ? $_POST['cmsadminemail']:""; |
|
| 61 | -$ph['cmspassword'] = isset($_POST['cmspassword']) ? $_POST['cmspassword']:""; |
|
| 62 | -$ph['cmspasswordconfirm'] = isset($_POST['cmspasswordconfirm']) ? $_POST['cmspasswordconfirm']:""; |
|
| 57 | +$ph['database_collation'] = isset($_POST['database_collation']) ? $_POST['database_collation'] : $database_collation; |
|
| 58 | +$ph['show#AUH'] = ($installMode == 0) ? 'block' : 'none'; |
|
| 59 | +$ph['cmsadmin'] = isset($_POST['cmsadmin']) ? $_POST['cmsadmin'] : 'admin'; |
|
| 60 | +$ph['cmsadminemail'] = isset($_POST['cmsadminemail']) ? $_POST['cmsadminemail'] : ""; |
|
| 61 | +$ph['cmspassword'] = isset($_POST['cmspassword']) ? $_POST['cmspassword'] : ""; |
|
| 62 | +$ph['cmspasswordconfirm'] = isset($_POST['cmspasswordconfirm']) ? $_POST['cmspasswordconfirm'] : ""; |
|
| 63 | 63 | $ph['managerLangs'] = getLangs($install_language); |
| 64 | 64 | $ph['install_language'] = $install_language; |
| 65 | 65 | $ph['installMode'] = $installMode; |
| 66 | -$ph['checkedChkagree'] = isset($_POST['chkagree']) ? 'checked':""; |
|
| 66 | +$ph['checkedChkagree'] = isset($_POST['chkagree']) ? 'checked' : ""; |
|
| 67 | 67 | $ph['database_connection_method'] = isset($database_connection_method) ? $database_connection_method : ''; |
| 68 | -$ph['databasehost'] = isset($_POST['databasehost']) ? $_POST['databasehost']: $database_server; |
|
| 69 | -$ph['databaseloginname'] = isset($_SESSION['databaseloginname']) ? $_SESSION['databaseloginname']: ''; |
|
| 70 | -$ph['databaseloginpassword'] = isset($_SESSION['databaseloginpassword']) ? $_SESSION['databaseloginpassword']: ""; |
|
| 68 | +$ph['databasehost'] = isset($_POST['databasehost']) ? $_POST['databasehost'] : $database_server; |
|
| 69 | +$ph['databaseloginname'] = isset($_SESSION['databaseloginname']) ? $_SESSION['databaseloginname'] : ''; |
|
| 70 | +$ph['databaseloginpassword'] = isset($_SESSION['databaseloginpassword']) ? $_SESSION['databaseloginpassword'] : ""; |
|
| 71 | 71 | $ph['MGR_DIR'] = MGR_DIR; |
| 72 | 72 | |
| 73 | 73 | $content = file_get_contents('./actions/tpl_connection.html'); |
| 74 | -$content = parse($content, $_lang, '[%','%]'); |
|
| 74 | +$content = parse($content, $_lang, '[%', '%]'); |
|
| 75 | 75 | $content = parse($content, $ph); |
| 76 | 76 | echo $content; |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
|
|
| 2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
|
|
| 3 | 3 | die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
|
| 4 | 4 | } |
| 5 | 5 | if (!$modx->hasPermission('logs')) {
|
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | $logs_user = record_sort(array_unique_multi($logs, 'internalKey'), 'username'); |
| 66 | 66 | foreach ($logs_user as $row) {
|
| 67 | 67 | $selectedtext = $row['internalKey'] == $_REQUEST['searchuser'] ? ' selected="selected"' : ''; |
| 68 | - echo "\t\t" . '<option value="' . $row['internalKey'] . '"' . $selectedtext . '>' . $row['username'] . "</option>\n"; |
|
| 68 | + echo "\t\t".'<option value="'.$row['internalKey'].'"'.$selectedtext.'>'.$row['username']."</option>\n"; |
|
| 69 | 69 | } |
| 70 | 70 | ?> |
| 71 | 71 | </select> |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | continue; |
| 87 | 87 | } |
| 88 | 88 | $selectedtext = $row['action'] == $_REQUEST['action'] ? ' selected="selected"' : ''; |
| 89 | - echo "\t\t" . '<option value="' . $row['action'] . '"' . $selectedtext . '>' . $row['action'] . ' - ' . $action . "</option>\n"; |
|
| 89 | + echo "\t\t".'<option value="'.$row['action'].'"'.$selectedtext.'>'.$row['action'].' - '.$action."</option>\n"; |
|
| 90 | 90 | } |
| 91 | 91 | ?> |
| 92 | 92 | </select> |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | $logs_items = record_sort(array_unique_multi($logs, 'itemid'), 'itemid'); |
| 103 | 103 | foreach ($logs_items as $row) {
|
| 104 | 104 | $selectedtext = $row['itemid'] == $_REQUEST['itemid'] ? ' selected="selected"' : ''; |
| 105 | - echo "\t\t" . '<option value="' . $row['itemid'] . '"' . $selectedtext . '>' . $row['itemid'] . "</option>\n"; |
|
| 105 | + echo "\t\t".'<option value="'.$row['itemid'].'"'.$selectedtext.'>'.$row['itemid']."</option>\n"; |
|
| 106 | 106 | } |
| 107 | 107 | ?> |
| 108 | 108 | </select> |
@@ -118,7 +118,7 @@ discard block |
||
| 118 | 118 | $logs_names = record_sort(array_unique_multi($logs, 'itemname'), 'itemname'); |
| 119 | 119 | foreach ($logs_names as $row) {
|
| 120 | 120 | $selectedtext = $row['itemname'] == $_REQUEST['itemname'] ? ' selected="selected"' : ''; |
| 121 | - echo "\t\t" . '<option value="' . $row['itemname'] . '"' . $selectedtext . '>' . $row['itemname'] . "</option>\n"; |
|
| 121 | + echo "\t\t".'<option value="'.$row['itemname'].'"'.$selectedtext.'>'.$row['itemname']."</option>\n"; |
|
| 122 | 122 | } |
| 123 | 123 | ?> |
| 124 | 124 | </select> |
@@ -176,26 +176,26 @@ discard block |
||
| 176 | 176 | // get the selections the user made. |
| 177 | 177 | $sqladd = array(); |
| 178 | 178 | if ($_REQUEST['searchuser'] != 0) {
|
| 179 | - $sqladd[] = "internalKey='" . (int)$_REQUEST['searchuser'] . "'"; |
|
| 179 | + $sqladd[] = "internalKey='".(int) $_REQUEST['searchuser']."'"; |
|
| 180 | 180 | } |
| 181 | 181 | if ($_REQUEST['action'] != 0) {
|
| 182 | - $sqladd[] = "action=" . (int)$_REQUEST['action']; |
|
| 182 | + $sqladd[] = "action=".(int) $_REQUEST['action']; |
|
| 183 | 183 | } |
| 184 | 184 | if ($_REQUEST['itemid'] != 0 || $_REQUEST['itemid'] == "-") {
|
| 185 | - $sqladd[] = "itemid='" . $_REQUEST['itemid'] . "'"; |
|
| 185 | + $sqladd[] = "itemid='".$_REQUEST['itemid']."'"; |
|
| 186 | 186 | } |
| 187 | 187 | if ($_REQUEST['itemname'] != '0') {
|
| 188 | - $sqladd[] = "itemname='" . $modx->db->escape($_REQUEST['itemname']) . "'"; |
|
| 188 | + $sqladd[] = "itemname='".$modx->db->escape($_REQUEST['itemname'])."'"; |
|
| 189 | 189 | } |
| 190 | 190 | if ($_REQUEST['message'] != "") {
|
| 191 | - $sqladd[] = "message LIKE '%" . $modx->db->escape($_REQUEST['message']) . "%'"; |
|
| 191 | + $sqladd[] = "message LIKE '%".$modx->db->escape($_REQUEST['message'])."%'"; |
|
| 192 | 192 | } |
| 193 | 193 | // date stuff |
| 194 | 194 | if ($_REQUEST['datefrom'] != "") {
|
| 195 | - $sqladd[] = "timestamp>" . $modx->toTimeStamp($_REQUEST['datefrom']); |
|
| 195 | + $sqladd[] = "timestamp>".$modx->toTimeStamp($_REQUEST['datefrom']); |
|
| 196 | 196 | } |
| 197 | 197 | if ($_REQUEST['dateto'] != "") {
|
| 198 | - $sqladd[] = "timestamp<" . $modx->toTimeStamp($_REQUEST['dateto']); |
|
| 198 | + $sqladd[] = "timestamp<".$modx->toTimeStamp($_REQUEST['dateto']); |
|
| 199 | 199 | } |
| 200 | 200 | |
| 201 | 201 | // If current position is not set, set it to zero |
@@ -208,7 +208,7 @@ discard block |
||
| 208 | 208 | // Number of result to display on the page, will be in the LIMIT of the sql query also |
| 209 | 209 | $int_num_result = is_numeric($_REQUEST['nrresults']) ? $_REQUEST['nrresults'] : $number_of_logs; |
| 210 | 210 | |
| 211 | - $extargv = "&a=13&searchuser=" . $_REQUEST['searchuser'] . "&action=" . $_REQUEST['action'] . "&itemid=" . $_REQUEST['itemid'] . "&itemname=" . $_REQUEST['itemname'] . "&message=" . $_REQUEST['message'] . "&dateto=" . $_REQUEST['dateto'] . "&datefrom=" . $_REQUEST['datefrom'] . "&nrresults=" . $int_num_result . "&log_submit=" . $_REQUEST['log_submit']; // extra argv here (could be anything depending on your page) |
|
| 211 | + $extargv = "&a=13&searchuser=".$_REQUEST['searchuser']."&action=".$_REQUEST['action']."&itemid=".$_REQUEST['itemid']."&itemname=".$_REQUEST['itemname']."&message=".$_REQUEST['message']."&dateto=".$_REQUEST['dateto']."&datefrom=".$_REQUEST['datefrom']."&nrresults=".$int_num_result."&log_submit=".$_REQUEST['log_submit']; // extra argv here (could be anything depending on your page) |
|
| 212 | 212 | |
| 213 | 213 | // build the sql |
| 214 | 214 | $limit = $num_rows = $modx->db->getValue($modx->db->select('COUNT(*)', $modx->getFullTableName('manager_log'), (!empty($sqladd) ? implode(' AND ', $sqladd) : '')));
|
@@ -216,9 +216,9 @@ discard block |
||
| 216 | 216 | $rs = $modx->db->select('*', $modx->getFullTableName('manager_log'), (!empty($sqladd) ? implode(' AND ', $sqladd) : ''), 'timestamp DESC, id DESC', "{$int_cur_position}, {$int_num_result}");
|
| 217 | 217 | |
| 218 | 218 | if ($limit < 1) {
|
| 219 | - echo '<p>' . $_lang["mgrlog_emptysrch"] . '</p>'; |
|
| 219 | + echo '<p>'.$_lang["mgrlog_emptysrch"].'</p>'; |
|
| 220 | 220 | } else {
|
| 221 | - echo '<p>' . $_lang["mgrlog_sortinst"] . '</p>'; |
|
| 221 | + echo '<p>'.$_lang["mgrlog_sortinst"].'</p>'; |
|
| 222 | 222 | |
| 223 | 223 | include_once "paginate.inc.php"; |
| 224 | 224 | // New instance of the Paging class, you can modify the color and the width of the html table |
@@ -230,11 +230,11 @@ discard block |
||
| 230 | 230 | $current_row = $int_cur_position / $int_num_result; |
| 231 | 231 | |
| 232 | 232 | // Display the result as you like... |
| 233 | - print "<p>" . $_lang["paging_showing"] . " " . $array_paging['lower']; |
|
| 234 | - print " " . $_lang["paging_to"] . " " . $array_paging['upper']; |
|
| 235 | - print " (" . $array_paging['total'] . " " . $_lang["paging_total"] . ")<br />";
|
|
| 236 | - $paging = $array_paging['first_link'] . $_lang["paging_first"] . (isset($array_paging['first_link']) ? "</a> " : " "); |
|
| 237 | - $paging .= $array_paging['previous_link'] . $_lang["paging_prev"] . (isset($array_paging['previous_link']) ? "</a> " : " "); |
|
| 233 | + print "<p>".$_lang["paging_showing"]." ".$array_paging['lower']; |
|
| 234 | + print " ".$_lang["paging_to"]." ".$array_paging['upper']; |
|
| 235 | + print " (".$array_paging['total']." ".$_lang["paging_total"].")<br />";
|
|
| 236 | + $paging = $array_paging['first_link'].$_lang["paging_first"].(isset($array_paging['first_link']) ? "</a> " : " "); |
|
| 237 | + $paging .= $array_paging['previous_link'].$_lang["paging_prev"].(isset($array_paging['previous_link']) ? "</a> " : " "); |
|
| 238 | 238 | $pagesfound = sizeof($array_row_paging); |
| 239 | 239 | if ($pagesfound > 6) {
|
| 240 | 240 | $paging .= $array_row_paging[$current_row - 2]; // ." "; |
@@ -244,11 +244,11 @@ discard block |
||
| 244 | 244 | $paging .= $array_row_paging[$current_row + 2]; // ." "; |
| 245 | 245 | } else {
|
| 246 | 246 | for ($i = 0; $i < $pagesfound; $i++) {
|
| 247 | - $paging .= $array_row_paging[$i] . " "; |
|
| 247 | + $paging .= $array_row_paging[$i]." "; |
|
| 248 | 248 | } |
| 249 | 249 | } |
| 250 | - $paging .= $array_paging['next_link'] . $_lang["paging_next"] . (isset($array_paging['next_link']) ? "</a> " : " ") . " "; |
|
| 251 | - $paging .= $array_paging['last_link'] . $_lang["paging_last"] . (isset($array_paging['last_link']) ? "</a> " : " ") . " "; |
|
| 250 | + $paging .= $array_paging['next_link'].$_lang["paging_next"].(isset($array_paging['next_link']) ? "</a> " : " ")." "; |
|
| 251 | + $paging .= $array_paging['last_link'].$_lang["paging_last"].(isset($array_paging['last_link']) ? "</a> " : " ")." "; |
|
| 252 | 252 | // The above exemple print somethings like: |
| 253 | 253 | // Results 1 to 20 of 597 <<< 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 >>> |
| 254 | 254 | // Of course you can now play with array_row_paging in order to print |
@@ -282,16 +282,16 @@ discard block |
||
| 282 | 282 | if (!preg_match("/^[0-9]+$/", $logentry['itemid'])) {
|
| 283 | 283 | $item = '<div style="text-align:center;">-</div>'; |
| 284 | 284 | } elseif ($logentry['action'] == 3 || $logentry['action'] == 27 || $logentry['action'] == 5) {
|
| 285 | - $item = '<a href="index.php?a=3&id=' . $logentry['itemid'] . '">' . $logentry['itemname'] . '</a>'; |
|
| 285 | + $item = '<a href="index.php?a=3&id='.$logentry['itemid'].'">'.$logentry['itemname'].'</a>'; |
|
| 286 | 286 | } else {
|
| 287 | 287 | $item = $logentry['itemname']; |
| 288 | 288 | } |
| 289 | 289 | //index.php?a=13&searchuser=' . $logentry['internalKey'] . '&action=' . $logentry['action'] . '&itemname=' . $logentry['itemname'] . '&log_submit=true' |
| 290 | - $user_drill = 'index.php?a=13&searchuser=' . $logentry['internalKey'] . '&itemname=0&log_submit=true'; |
|
| 290 | + $user_drill = 'index.php?a=13&searchuser='.$logentry['internalKey'].'&itemname=0&log_submit=true'; |
|
| 291 | 291 | ?> |
| 292 | 292 | <tr> |
| 293 | - <td><?= '<a href="' . $user_drill . '">' . $logentry['username'] . '</a>' ?></td> |
|
| 294 | - <td class="text-nowrap"><?= '[' . $logentry['action'] . '] ' . $logentry['message'] ?></td> |
|
| 293 | + <td><?= '<a href="'.$user_drill.'">'.$logentry['username'].'</a>' ?></td> |
|
| 294 | + <td class="text-nowrap"><?= '['.$logentry['action'].'] '.$logentry['message'] ?></td> |
|
| 295 | 295 | <td class="text-xs-right"><?= $logentry['itemid'] ?></td> |
| 296 | 296 | <td><?= $item ?></td> |
| 297 | 297 | <td class="text-nowrap"><?= $modx->toDateFormat($logentry['timestamp'] + $server_offset_time) ?></td> |
@@ -1,17 +1,17 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 3 | 3 | die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly."); |
| 4 | 4 | } |
| 5 | -if(!$modx->hasPermission('view_eventlog')) { |
|
| 5 | +if (!$modx->hasPermission('view_eventlog')) { |
|
| 6 | 6 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
| 7 | 7 | } |
| 8 | 8 | |
| 9 | 9 | // get id |
| 10 | -$id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0; |
|
| 10 | +$id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0; |
|
| 11 | 11 | |
| 12 | -$ds = $modx->db->select('el.*, IFNULL(wu.username,mu.username) as username', $modx->getFullTableName("event_log") . " el |
|
| 13 | - LEFT JOIN " . $modx->getFullTableName("manager_users") . " mu ON mu.id=el.user AND el.usertype=0 |
|
| 14 | - LEFT JOIN " . $modx->getFullTableName("web_users") . " wu ON wu.id=el.user AND el.usertype=1", "el.id='{$id}'"); |
|
| 12 | +$ds = $modx->db->select('el.*, IFNULL(wu.username,mu.username) as username', $modx->getFullTableName("event_log")." el |
|
| 13 | + LEFT JOIN " . $modx->getFullTableName("manager_users")." mu ON mu.id=el.user AND el.usertype=0 |
|
| 14 | + LEFT JOIN " . $modx->getFullTableName("web_users")." wu ON wu.id=el.user AND el.usertype=1", "el.id='{$id}'"); |
|
| 15 | 15 | $content = $modx->db->getRow($ds); |
| 16 | 16 | |
| 17 | 17 | ?> |
@@ -42,18 +42,18 @@ discard block |
||
| 42 | 42 | <div class="container container-body"> |
| 43 | 43 | <?php |
| 44 | 44 | $date = $modx->toDateFormat($content["createdon"]); |
| 45 | - if($content["type"] == 1) { |
|
| 46 | - $icon = $_style['actions_info'] . ' text-info'; |
|
| 45 | + if ($content["type"] == 1) { |
|
| 46 | + $icon = $_style['actions_info'].' text-info'; |
|
| 47 | 47 | $msgtype = $_lang["information"]; |
| 48 | - } else if($content["type"] == 2) { |
|
| 49 | - $icon = $_style['actions_triangle'] . ' text-warning'; |
|
| 48 | + } else if ($content["type"] == 2) { |
|
| 49 | + $icon = $_style['actions_triangle'].' text-warning'; |
|
| 50 | 50 | $msgtype = $_lang["warning"]; |
| 51 | - } else if($content["type"] == 3) { |
|
| 52 | - $icon = $_style['actions_error'] . ' text-danger'; |
|
| 51 | + } else if ($content["type"] == 3) { |
|
| 52 | + $icon = $_style['actions_error'].' text-danger'; |
|
| 53 | 53 | $msgtype = $_lang["error"]; |
| 54 | 54 | } |
| 55 | 55 | ?> |
| 56 | - <p><b><?= $content['source'] . " - " . $_lang['eventlog_viewer'] ?></b></p> |
|
| 56 | + <p><b><?= $content['source']." - ".$_lang['eventlog_viewer'] ?></b></p> |
|
| 57 | 57 | <p> |
| 58 | 58 | <i class="<?= $icon ?>"></i> <?= $msgtype ?> |
| 59 | 59 | </p> |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 3 | 3 | die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly."); |
| 4 | 4 | } |
| 5 | 5 | |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
| 19 | 19 | } |
| 20 | 20 | |
| 21 | -$id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0; |
|
| 21 | +$id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0; |
|
| 22 | 22 | |
| 23 | 23 | // Get table names (alphabetical) |
| 24 | 24 | $tbl_site_htmlsnippets = $modx->getFullTableName('site_htmlsnippets'); |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | $content['name'] = $_REQUEST['itemname']; |
| 48 | 48 | } else { |
| 49 | 49 | $_SESSION['itemname'] = $_lang["new_htmlsnippet"]; |
| 50 | - $content['category'] = (int)$_REQUEST['catid']; |
|
| 50 | + $content['category'] = (int) $_REQUEST['catid']; |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | if ($modx->manager->hasFormValues()) { |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | // Add lock-element JS-Script |
| 66 | 66 | $lockElementId = $id; |
| 67 | 67 | $lockElementType = 3; |
| 68 | -require_once(MODX_MANAGER_PATH . 'includes/active_user_locks.inc.php'); |
|
| 68 | +require_once(MODX_MANAGER_PATH.'includes/active_user_locks.inc.php'); |
|
| 69 | 69 | |
| 70 | 70 | // Print RTE Javascript function |
| 71 | 71 | ?> |
@@ -136,7 +136,7 @@ discard block |
||
| 136 | 136 | <input type="hidden" name="mode" value="<?= $modx->manager->action ?>" /> |
| 137 | 137 | |
| 138 | 138 | <h1> |
| 139 | - <i class="fa fa-th-large"></i><?= ($content['name'] ? $content['name'] . '<small>(' . $content['id'] . ')</small>' : $_lang['new_htmlsnippet']) ?><i class="fa fa-question-circle help"></i> |
|
| 139 | + <i class="fa fa-th-large"></i><?= ($content['name'] ? $content['name'].'<small>('.$content['id'].')</small>' : $_lang['new_htmlsnippet']) ?><i class="fa fa-question-circle help"></i> |
|
| 140 | 140 | </h1> |
| 141 | 141 | |
| 142 | 142 | <?= $_style['actionbuttons']['dynamic']['element'] ?> |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | <div class="form-control-name clearfix"> |
| 161 | 161 | <input name="name" type="text" maxlength="100" value="<?= $modx->htmlspecialchars($content['name']) ?>" class="form-control form-control-lg" onchange="documentDirty=true;" /> |
| 162 | 162 | <?php if ($modx->hasPermission('save_role')): ?> |
| 163 | - <label class="custom-control" title="<?= $_lang['lock_htmlsnippet'] . "\n" . $_lang['lock_htmlsnippet_msg'] ?>" tooltip> |
|
| 163 | + <label class="custom-control" title="<?= $_lang['lock_htmlsnippet']."\n".$_lang['lock_htmlsnippet_msg'] ?>" tooltip> |
|
| 164 | 164 | <input name="locked" type="checkbox" value="on"<?= ($content['locked'] == 1 || $content['locked'] == 'on' ? ' checked="checked"' : '') ?> /> |
| 165 | 165 | <i class="fa fa-lock"></i> |
| 166 | 166 | </label> |
@@ -184,9 +184,9 @@ discard block |
||
| 184 | 184 | <select name="categoryid" class="form-control" onchange="documentDirty=true;"> |
| 185 | 185 | <option> </option> |
| 186 | 186 | <?php |
| 187 | - include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php'); |
|
| 187 | + include_once(MODX_MANAGER_PATH.'includes/categories.inc.php'); |
|
| 188 | 188 | foreach (getCategories() as $n => $v) { |
| 189 | - echo "\t\t\t\t" . '<option value="' . $v['id'] . '"' . ($content['category'] == $v['id'] || (empty($content['category']) && $_POST['categoryid'] == $v['id']) ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($v['category']) . "</option>\n"; |
|
| 189 | + echo "\t\t\t\t".'<option value="'.$v['id'].'"'.($content['category'] == $v['id'] || (empty($content['category']) && $_POST['categoryid'] == $v['id']) ? ' selected="selected"' : '').'>'.$modx->htmlspecialchars($v['category'])."</option>\n"; |
|
| 190 | 190 | } |
| 191 | 191 | ?> |
| 192 | 192 | </select> |
@@ -200,7 +200,7 @@ discard block |
||
| 200 | 200 | </div> |
| 201 | 201 | <?php if ($_SESSION['mgrRole'] == 1): ?> |
| 202 | 202 | <div class="form-row"> |
| 203 | - <label><input name="disabled" type="checkbox" value="on"<?= ($content['disabled'] == 1 ? ' checked="checked"' : '') ?> /> <?= ($content['disabled'] == 1 ? "<span class='text-danger'>" . $_lang['disabled'] . "</span>" : $_lang['disabled']) ?></label> |
|
| 203 | + <label><input name="disabled" type="checkbox" value="on"<?= ($content['disabled'] == 1 ? ' checked="checked"' : '') ?> /> <?= ($content['disabled'] == 1 ? "<span class='text-danger'>".$_lang['disabled']."</span>" : $_lang['disabled']) ?></label> |
|
| 204 | 204 | </div> |
| 205 | 205 | <?php endif; ?> |
| 206 | 206 | </div> |
@@ -216,7 +216,7 @@ discard block |
||
| 216 | 216 | $evtOut = $modx->invokeEvent('OnRichTextEditorRegister'); |
| 217 | 217 | if (is_array($evtOut)) { |
| 218 | 218 | foreach ($evtOut as $i => $editor) { |
| 219 | - echo "\t" . '<option value="' . $editor . '"' . ($which_editor == $editor ? ' selected="selected"' : '') . '>' . $editor . "</option>\n"; |
|
| 219 | + echo "\t".'<option value="'.$editor.'"'.($which_editor == $editor ? ' selected="selected"' : '').'>'.$editor."</option>\n"; |
|
| 220 | 220 | } |
| 221 | 221 | } |
| 222 | 222 | ?> |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 3 | 3 | die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly."); |
| 4 | 4 | } |
| 5 | 5 | if (!$modx->hasPermission('save_document')) { |
@@ -7,13 +7,13 @@ discard block |
||
| 7 | 7 | } |
| 8 | 8 | |
| 9 | 9 | if (isset($_REQUEST['id'])) { |
| 10 | - $id = (int)$_REQUEST['id']; |
|
| 10 | + $id = (int) $_REQUEST['id']; |
|
| 11 | 11 | } else { |
| 12 | 12 | $modx->webAlertAndQuit($_lang["error_no_id"]); |
| 13 | 13 | } |
| 14 | 14 | |
| 15 | 15 | // check permissions on the document |
| 16 | -include_once MODX_MANAGER_PATH . "processors/user_documents_permissions.class.php"; |
|
| 16 | +include_once MODX_MANAGER_PATH."processors/user_documents_permissions.class.php"; |
|
| 17 | 17 | $udperms = new udperms(); |
| 18 | 18 | $udperms->user = $modx->getLoginUserID(); |
| 19 | 19 | $udperms->document = $id; |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | }, |
| 40 | 40 | cancel: function() { |
| 41 | 41 | documentDirty = false; |
| 42 | - <?= ($id == 0 ? 'document.location.href="index.php?a=2";' : 'document.location.href="index.php?a=3&id=' . $id . '";') ?> |
|
| 42 | + <?= ($id == 0 ? 'document.location.href="index.php?a=2";' : 'document.location.href="index.php?a=3&id='.$id.'";') ?> |
|
| 43 | 43 | } |
| 44 | 44 | }; |
| 45 | 45 | |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | </script> |
| 81 | 81 | |
| 82 | 82 | <h1> |
| 83 | - <i class="fa fa-arrows"></i><?= ($pagetitle ? $pagetitle . '<small>(' . $id . ')</small>' : $_lang['move_resource_title']) ?> |
|
| 83 | + <i class="fa fa-arrows"></i><?= ($pagetitle ? $pagetitle.'<small>('.$id.')</small>' : $_lang['move_resource_title']) ?> |
|
| 84 | 84 | </h1> |
| 85 | 85 | |
| 86 | 86 | <?= $_style['actionbuttons']['dynamic']['save'] ?> |
@@ -1,16 +1,16 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
|
|
| 2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
|
|
| 3 | 3 | die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
|
| 4 | 4 | } |
| 5 | 5 | |
| 6 | -switch($modx->manager->action) {
|
|
| 6 | +switch ($modx->manager->action) {
|
|
| 7 | 7 | case 12: |
| 8 | - if(!$modx->hasPermission('edit_user')) {
|
|
| 8 | + if (!$modx->hasPermission('edit_user')) {
|
|
| 9 | 9 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
| 10 | 10 | } |
| 11 | 11 | break; |
| 12 | 12 | case 11: |
| 13 | - if(!$modx->hasPermission('new_user')) {
|
|
| 13 | + if (!$modx->hasPermission('new_user')) {
|
|
| 14 | 14 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
| 15 | 15 | } |
| 16 | 16 | break; |
@@ -18,20 +18,20 @@ discard block |
||
| 18 | 18 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
| 19 | 19 | } |
| 20 | 20 | |
| 21 | -$user = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0; |
|
| 21 | +$user = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0; |
|
| 22 | 22 | |
| 23 | 23 | // check to see the snippet editor isn't locked |
| 24 | -$rs = $modx->db->select('username', $modx->getFullTableName('active_users'), "action=12 AND id='{$user}' AND internalKey!='" . $modx->getLoginUserID() . "'");
|
|
| 25 | -if($username = $modx->db->getValue($rs)) {
|
|
| 24 | +$rs = $modx->db->select('username', $modx->getFullTableName('active_users'), "action=12 AND id='{$user}' AND internalKey!='".$modx->getLoginUserID()."'");
|
|
| 25 | +if ($username = $modx->db->getValue($rs)) {
|
|
| 26 | 26 | $modx->webAlertAndQuit(sprintf($_lang["lock_msg"], $username, "user")); |
| 27 | 27 | } |
| 28 | 28 | // end check for lock |
| 29 | 29 | |
| 30 | -if($modx->manager->action == '12') {
|
|
| 30 | +if ($modx->manager->action == '12') {
|
|
| 31 | 31 | // get user attribute |
| 32 | 32 | $rs = $modx->db->select('*', $modx->getFullTableName('user_attributes'), "internalKey = '{$user}'");
|
| 33 | 33 | $userdata = $modx->db->getRow($rs); |
| 34 | - if(!$userdata) {
|
|
| 34 | + if (!$userdata) {
|
|
| 35 | 35 | $modx->webAlertAndQuit("No user returned!");
|
| 36 | 36 | } |
| 37 | 37 | |
@@ -39,10 +39,10 @@ discard block |
||
| 39 | 39 | // get user settings |
| 40 | 40 | $rs = $modx->db->select('*', $modx->getFullTableName('user_settings'), "user = '{$user}'");
|
| 41 | 41 | $usersettings = array(); |
| 42 | - while($row = $modx->db->getRow($rs)) $usersettings[$row['setting_name']] = $row['setting_value']; |
|
| 42 | + while ($row = $modx->db->getRow($rs)) $usersettings[$row['setting_name']] = $row['setting_value']; |
|
| 43 | 43 | // manually extract so that user display settings are not overwritten |
| 44 | - foreach($usersettings as $k => $v) {
|
|
| 45 | - if($k != 'manager_language' && $k != 'manager_theme') {
|
|
| 44 | + foreach ($usersettings as $k => $v) {
|
|
| 45 | + if ($k != 'manager_language' && $k != 'manager_theme') {
|
|
| 46 | 46 | ${$k} = $v;
|
| 47 | 47 | } |
| 48 | 48 | } |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | // get user name |
| 51 | 51 | $rs = $modx->db->select('*', $modx->getFullTableName('manager_users'), "id = '{$user}'");
|
| 52 | 52 | $usernamedata = $modx->db->getRow($rs); |
| 53 | - if(!$usernamedata) {
|
|
| 53 | + if (!$usernamedata) {
|
|
| 54 | 54 | $modx->webAlertAndQuit("No user returned while getting username!");
|
| 55 | 55 | } |
| 56 | 56 | $_SESSION['itemname'] = $usernamedata['username']; |
@@ -62,14 +62,14 @@ discard block |
||
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | // avoid doubling htmlspecialchars (already encoded in DB) |
| 65 | -foreach($userdata as $key => $val) {
|
|
| 65 | +foreach ($userdata as $key => $val) {
|
|
| 66 | 66 | $userdata[$key] = html_entity_decode($val, ENT_NOQUOTES, $modx->config['modx_charset']); |
| 67 | 67 | }; |
| 68 | 68 | $usernamedata['username'] = html_entity_decode($usernamedata['username'], ENT_NOQUOTES, $modx->config['modx_charset']); |
| 69 | 69 | |
| 70 | 70 | // restore saved form |
| 71 | 71 | $formRestored = false; |
| 72 | -if($modx->manager->hasFormValues()) {
|
|
| 72 | +if ($modx->manager->hasFormValues()) {
|
|
| 73 | 73 | $modx->manager->loadFormValues(); |
| 74 | 74 | // restore post values |
| 75 | 75 | $userdata = array_merge($userdata, $_POST); |
@@ -84,13 +84,13 @@ discard block |
||
| 84 | 84 | // include the country list language file |
| 85 | 85 | $_country_lang = array(); |
| 86 | 86 | include_once "lang/country/english_country.inc.php"; |
| 87 | -if($manager_language != "english" && file_exists($modx->config['site_manager_path'] . "includes/lang/country/" . $manager_language . "_country.inc.php")) {
|
|
| 88 | - include_once "lang/country/" . $manager_language . "_country.inc.php"; |
|
| 87 | +if ($manager_language != "english" && file_exists($modx->config['site_manager_path']."includes/lang/country/".$manager_language."_country.inc.php")) {
|
|
| 88 | + include_once "lang/country/".$manager_language."_country.inc.php"; |
|
| 89 | 89 | } |
| 90 | 90 | asort($_country_lang); |
| 91 | 91 | |
| 92 | 92 | $displayStyle = ($_SESSION['browser'] === 'modern') ? 'table-row' : 'block'; |
| 93 | -if($which_browser == 'default') {
|
|
| 93 | +if ($which_browser == 'default') {
|
|
| 94 | 94 | $which_browser = $modx->configGlobal['which_browser'] ? $modx->configGlobal['which_browser'] : $modx->config['which_browser']; |
| 95 | 95 | } |
| 96 | 96 | ?> |
@@ -182,7 +182,7 @@ discard block |
||
| 182 | 182 | document.userform.save.click(); |
| 183 | 183 | }, |
| 184 | 184 | delete: function() {
|
| 185 | - <?php if($_GET['id'] == $modx->getLoginUserID()) { ?>
|
|
| 185 | + <?php if ($_GET['id'] == $modx->getLoginUserID()) { ?>
|
|
| 186 | 186 | alert("<?php echo $_lang['alert_delete_self']; ?>");
|
| 187 | 187 | <?php } else { ?>
|
| 188 | 188 | if(confirm("<?php echo $_lang['confirm_delete_user']; ?>") === true) {
|
@@ -205,7 +205,7 @@ discard block |
||
| 205 | 205 | $evtOut = $modx->invokeEvent("OnUserFormPrerender", array(
|
| 206 | 206 | "id" => $user |
| 207 | 207 | )); |
| 208 | - if(is_array($evtOut)) {
|
|
| 208 | + if (is_array($evtOut)) {
|
|
| 209 | 209 | echo implode("", $evtOut);
|
| 210 | 210 | } |
| 211 | 211 | ?> |
@@ -214,7 +214,7 @@ discard block |
||
| 214 | 214 | <input type="hidden" name="blockedmode" value="<?php echo ($userdata['blocked'] == 1 || ($userdata['blockeduntil'] > time() && $userdata['blockeduntil'] != 0) || ($userdata['blockedafter'] < time() && $userdata['blockedafter'] != 0) || $userdata['failedlogins'] > 3) ? "1" : "0" ?>" /> |
| 215 | 215 | |
| 216 | 216 | <h1> |
| 217 | - <i class="fa fa fa-user"></i><?= ($usernamedata['username'] ? $usernamedata['username'] . '<small>(' . $usernamedata['id'] . ')</small>' : $_lang['user_title']) ?>
|
|
| 217 | + <i class="fa fa fa-user"></i><?= ($usernamedata['username'] ? $usernamedata['username'].'<small>('.$usernamedata['id'].')</small>' : $_lang['user_title']) ?>
|
|
| 218 | 218 | </h1> |
| 219 | 219 | |
| 220 | 220 | <?php echo $_style['actionbuttons']['dynamic']['user'] ?> |
@@ -232,13 +232,13 @@ discard block |
||
| 232 | 232 | <table border="0" cellspacing="0" cellpadding="3" class="table table--edit table--editUser"> |
| 233 | 233 | <tr> |
| 234 | 234 | <td colspan="3"><span id="blocked" class="warning"> |
| 235 | - <?php if($userdata['blocked'] == 1 || ($userdata['blockeduntil'] > time() && $userdata['blockeduntil'] != 0) || $userdata['failedlogins'] > 3) { ?>
|
|
| 235 | + <?php if ($userdata['blocked'] == 1 || ($userdata['blockeduntil'] > time() && $userdata['blockeduntil'] != 0) || $userdata['failedlogins'] > 3) { ?>
|
|
| 236 | 236 | <?php echo $_lang['user_is_blocked']; ?> |
| 237 | 237 | <?php } ?> |
| 238 | 238 | </span> |
| 239 | 239 | <br /></td> |
| 240 | 240 | </tr> |
| 241 | - <?php if(!empty($userdata['id'])) { ?>
|
|
| 241 | + <?php if (!empty($userdata['id'])) { ?>
|
|
| 242 | 242 | <tr id="showname" style="display: <?php echo ($modx->manager->action == '12' && (!isset($usernamedata['oldusername']) || $usernamedata['oldusername'] == $usernamedata['username'])) ? $displayStyle : 'none'; ?> "> |
| 243 | 243 | <td colspan="3"><i class="<?php echo $_style["icons_user"] ?>"></i> <b><?php echo $modx->htmlspecialchars(!empty($usernamedata['oldusername']) ? $usernamedata['oldusername'] : $usernamedata['username']); ?></b> - <span class="comment"><a href="javascript:;" onClick="changeName();return false;"><?php echo $_lang["change_name"]; ?></a></span> |
| 244 | 244 | <input type="hidden" name="oldusername" value="<?php echo $modx->htmlspecialchars(!empty($usernamedata['oldusername']) ? $usernamedata['oldusername'] : $usernamedata['username']); ?>" /> |
@@ -251,7 +251,7 @@ discard block |
||
| 251 | 251 | <td><input type="text" name="newusername" class="inputBox" value="<?php echo $modx->htmlspecialchars($usernamedata['username']); ?>" onChange='documentDirty=true;' maxlength="100" /></td> |
| 252 | 252 | </tr> |
| 253 | 253 | <tr> |
| 254 | - <th><?php echo $modx->manager->action == '11' ? $_lang['password'] . ":" : $_lang['change_password_new'] . ":"; ?></th> |
|
| 254 | + <th><?php echo $modx->manager->action == '11' ? $_lang['password'].":" : $_lang['change_password_new'].":"; ?></th> |
|
| 255 | 255 | <td> </td> |
| 256 | 256 | <td><input name="newpasswordcheck" type="checkbox" onClick="changestate(document.userform.newpassword);changePasswordState(document.userform.newpassword);"<?php echo $modx->manager->action == "11" ? " checked disabled" : ""; ?>> |
| 257 | 257 | <input type="hidden" name="newpassword" value="<?php echo $modx->manager->action == "11" ? 1 : 0; ?>" onChange="documentDirty=true;" /> |
@@ -305,8 +305,8 @@ discard block |
||
| 305 | 305 | ?> |
| 306 | 306 | <select name="role" class="inputBox" onChange='documentDirty=true;' style="width:300px"> |
| 307 | 307 | <?php |
| 308 | - while($row = $modx->db->getRow($rs)) {
|
|
| 309 | - if($modx->manager->action == '11') {
|
|
| 308 | + while ($row = $modx->db->getRow($rs)) {
|
|
| 309 | + if ($modx->manager->action == '11') {
|
|
| 310 | 310 | $selectedtext = $row['id'] == '1' ? ' selected="selected"' : ''; |
| 311 | 311 | } else {
|
| 312 | 312 | $selectedtext = $row['id'] == $userdata['role'] ? "selected='selected'" : ''; |
@@ -360,8 +360,8 @@ discard block |
||
| 360 | 360 | <?php $chosenCountry = isset($_POST['country']) ? $_POST['country'] : $userdata['country']; ?> |
| 361 | 361 | <option value="" <?php (!isset($chosenCountry) ? ' selected' : '') ?> > </option> |
| 362 | 362 | <?php |
| 363 | - foreach($_country_lang as $key => $country) {
|
|
| 364 | - echo "<option value=\"$key\"" . (isset($chosenCountry) && $chosenCountry == $key ? ' selected' : '') . ">$country</option>"; |
|
| 363 | + foreach ($_country_lang as $key => $country) {
|
|
| 364 | + echo "<option value=\"$key\"".(isset($chosenCountry) && $chosenCountry == $key ? ' selected' : '').">$country</option>"; |
|
| 365 | 365 | } |
| 366 | 366 | ?> |
| 367 | 367 | </select></td> |
@@ -387,7 +387,7 @@ discard block |
||
| 387 | 387 | <td> </td> |
| 388 | 388 | <td><textarea type="text" name="comment" class="inputBox" rows="5" onChange="documentDirty=true;"><?php echo $modx->htmlspecialchars($userdata['comment']); ?></textarea></td> |
| 389 | 389 | </tr> |
| 390 | - <?php if($modx->manager->action == '12') { ?>
|
|
| 390 | + <?php if ($modx->manager->action == '12') { ?>
|
|
| 391 | 391 | <tr> |
| 392 | 392 | <th><?php echo $_lang['user_logincount']; ?>:</th> |
| 393 | 393 | <td> </td> |
@@ -424,7 +424,7 @@ discard block |
||
| 424 | 424 | </tr> |
| 425 | 425 | <?php } ?> |
| 426 | 426 | </table> |
| 427 | - <?php if($_GET['id'] == $modx->getLoginUserID()) { ?>
|
|
| 427 | + <?php if ($_GET['id'] == $modx->getLoginUserID()) { ?>
|
|
| 428 | 428 | <p><?php echo $_lang['user_edit_self_msg']; ?></p> |
| 429 | 429 | <?php } ?> |
| 430 | 430 | </div> |
@@ -441,8 +441,8 @@ discard block |
||
| 441 | 441 | <?php |
| 442 | 442 | $activelang = !empty($usersettings['manager_language']) ? $usersettings['manager_language'] : ''; |
| 443 | 443 | $dir = dir("includes/lang");
|
| 444 | - while($file = $dir->read()) {
|
|
| 445 | - if(strpos($file, ".inc.php") > 0) {
|
|
| 444 | + while ($file = $dir->read()) {
|
|
| 445 | + if (strpos($file, ".inc.php") > 0) {
|
|
| 446 | 446 | $endpos = strpos($file, "."); |
| 447 | 447 | $languagename = substr($file, 0, $endpos); |
| 448 | 448 | $selectedtext = $languagename == $activelang ? "selected='selected'" : ""; |
@@ -529,17 +529,17 @@ discard block |
||
| 529 | 529 | <option value=""></option> |
| 530 | 530 | <?php |
| 531 | 531 | $dir = dir("media/style/");
|
| 532 | - while($file = $dir->read()) {
|
|
| 533 | - if($file != "." && $file != ".." && is_dir("media/style/$file") && substr($file, 0, 1) != '.') {
|
|
| 532 | + while ($file = $dir->read()) {
|
|
| 533 | + if ($file != "." && $file != ".." && is_dir("media/style/$file") && substr($file, 0, 1) != '.') {
|
|
| 534 | 534 | $themename = $file; |
| 535 | - if($themename === 'common') {
|
|
| 535 | + if ($themename === 'common') {
|
|
| 536 | 536 | continue; |
| 537 | 537 | } |
| 538 | - $attr = 'value="' . $themename . '" '; |
|
| 539 | - if(isset($usersettings['manager_theme']) && $themename == $usersettings['manager_theme']) {
|
|
| 538 | + $attr = 'value="'.$themename.'" '; |
|
| 539 | + if (isset($usersettings['manager_theme']) && $themename == $usersettings['manager_theme']) {
|
|
| 540 | 540 | $attr .= 'selected="selected" '; |
| 541 | 541 | } |
| 542 | - echo "\t\t<option " . rtrim($attr) . '>' . ucwords(str_replace("_", " ", $themename)) . "</option>\n";
|
|
| 542 | + echo "\t\t<option ".rtrim($attr).'>'.ucwords(str_replace("_", " ", $themename))."</option>\n";
|
|
| 543 | 543 | } |
| 544 | 544 | } |
| 545 | 545 | $dir->close(); |
@@ -556,12 +556,12 @@ discard block |
||
| 556 | 556 | <td><select name="which_browser" class="inputBox" onChange="documentDirty=true;"> |
| 557 | 557 | <?php |
| 558 | 558 | $selected = 'default' == $usersettings['which_browser'] || !$usersettings['which_browser'] ? ' selected="selected"' : ''; |
| 559 | - echo '<option value="default"' . $selected . '>' . $_lang['option_default'] . "</option>\n"; |
|
| 560 | - foreach(glob("media/browser/*", GLOB_ONLYDIR) as $dir) {
|
|
| 559 | + echo '<option value="default"'.$selected.'>'.$_lang['option_default']."</option>\n"; |
|
| 560 | + foreach (glob("media/browser/*", GLOB_ONLYDIR) as $dir) {
|
|
| 561 | 561 | $dir = str_replace('\\', '/', $dir);
|
| 562 | 562 | $browser_name = substr($dir, strrpos($dir, '/') + 1); |
| 563 | 563 | $selected = $browser_name == $usersettings['which_browser'] ? ' selected="selected"' : ''; |
| 564 | - echo '<option value="' . $browser_name . '"' . $selected . '>' . "{$browser_name}</option>\n";
|
|
| 564 | + echo '<option value="'.$browser_name.'"'.$selected.'>'."{$browser_name}</option>\n";
|
|
| 565 | 565 | } |
| 566 | 566 | ?> |
| 567 | 567 | </select></td> |
@@ -588,7 +588,7 @@ discard block |
||
| 588 | 588 | </tr> |
| 589 | 589 | <tr> |
| 590 | 590 | <td> </td> |
| 591 | - <td class='comment'><?php echo $_lang["uploadable_images_message"] . $_lang["user_upload_message"] ?></td> |
|
| 591 | + <td class='comment'><?php echo $_lang["uploadable_images_message"].$_lang["user_upload_message"] ?></td> |
|
| 592 | 592 | </tr> |
| 593 | 593 | <tr> |
| 594 | 594 | <th><?php echo $_lang["uploadable_media_title"] ?></th> |
@@ -600,7 +600,7 @@ discard block |
||
| 600 | 600 | </tr> |
| 601 | 601 | <tr> |
| 602 | 602 | <td> </td> |
| 603 | - <td class='comment'><?php echo $_lang["uploadable_media_message"] . $_lang["user_upload_message"] ?></td> |
|
| 603 | + <td class='comment'><?php echo $_lang["uploadable_media_message"].$_lang["user_upload_message"] ?></td> |
|
| 604 | 604 | </tr> |
| 605 | 605 | <tr> |
| 606 | 606 | <th><?php echo $_lang["uploadable_flash_title"] ?></th> |
@@ -612,7 +612,7 @@ discard block |
||
| 612 | 612 | </tr> |
| 613 | 613 | <tr> |
| 614 | 614 | <td> </td> |
| 615 | - <td class='comment'><?php echo $_lang["uploadable_flash_message"] . $_lang["user_upload_message"] ?></td> |
|
| 615 | + <td class='comment'><?php echo $_lang["uploadable_flash_message"].$_lang["user_upload_message"] ?></td> |
|
| 616 | 616 | </tr> |
| 617 | 617 | <tr> |
| 618 | 618 | <th><?php echo $_lang["uploadable_files_title"] ?></th> |
@@ -624,7 +624,7 @@ discard block |
||
| 624 | 624 | </tr> |
| 625 | 625 | <tr> |
| 626 | 626 | <td> </td> |
| 627 | - <td class='comment'><?php echo $_lang["uploadable_files_message"] . $_lang["user_upload_message"] ?></td> |
|
| 627 | + <td class='comment'><?php echo $_lang["uploadable_files_message"].$_lang["user_upload_message"] ?></td> |
|
| 628 | 628 | </tr> |
| 629 | 629 | <tr class='row2'> |
| 630 | 630 | <th><?php echo $_lang["upload_maxsize_title"] ?></th> |
@@ -643,11 +643,11 @@ discard block |
||
| 643 | 643 | $edt = isset ($usersettings["which_editor"]) ? $usersettings["which_editor"] : ''; |
| 644 | 644 | // invoke OnRichTextEditorRegister event |
| 645 | 645 | $evtOut = $modx->invokeEvent("OnRichTextEditorRegister");
|
| 646 | - echo "<option value='none'" . ($edt == 'none' ? " selected='selected'" : "") . ">" . $_lang["none"] . "</option>\n"; |
|
| 647 | - if(is_array($evtOut)) {
|
|
| 648 | - for($i = 0; $i < count($evtOut); $i++) {
|
|
| 646 | + echo "<option value='none'".($edt == 'none' ? " selected='selected'" : "").">".$_lang["none"]."</option>\n"; |
|
| 647 | + if (is_array($evtOut)) {
|
|
| 648 | + for ($i = 0; $i < count($evtOut); $i++) {
|
|
| 649 | 649 | $editor = $evtOut[$i]; |
| 650 | - echo "<option value='$editor'" . ($edt == $editor ? " selected='selected'" : "") . ">$editor</option>\n"; |
|
| 650 | + echo "<option value='$editor'".($edt == $editor ? " selected='selected'" : "").">$editor</option>\n"; |
|
| 651 | 651 | } |
| 652 | 652 | } |
| 653 | 653 | ?> |
@@ -685,7 +685,7 @@ discard block |
||
| 685 | 685 | <?php |
| 686 | 686 | // invoke OnInterfaceSettingsRender event |
| 687 | 687 | $evtOut = $modx->invokeEvent("OnInterfaceSettingsRender");
|
| 688 | - if(is_array($evtOut)) {
|
|
| 688 | + if (is_array($evtOut)) {
|
|
| 689 | 689 | echo implode("", $evtOut);
|
| 690 | 690 | } |
| 691 | 691 | ?> |
@@ -712,7 +712,7 @@ discard block |
||
| 712 | 712 | function BrowseServer() {
|
| 713 | 713 | var w = screen.width * 0.7; |
| 714 | 714 | var h = screen.height * 0.7; |
| 715 | - OpenServerBrowser("<?php echo MODX_MANAGER_URL; ?>media/browser/<?php echo $which_browser;?>/browser.php?Type=images", w, h);
|
|
| 715 | + OpenServerBrowser("<?php echo MODX_MANAGER_URL; ?>media/browser/<?php echo $which_browser; ?>/browser.php?Type=images", w, h);
|
|
| 716 | 716 | } |
| 717 | 717 | |
| 718 | 718 | function SetUrl(url, width, height, alt) {
|
@@ -735,17 +735,17 @@ discard block |
||
| 735 | 735 | </tr> |
| 736 | 736 | </table> |
| 737 | 737 | </div> |
| 738 | - <?php if($use_udperms == 1) {
|
|
| 738 | + <?php if ($use_udperms == 1) {
|
|
| 739 | 739 | |
| 740 | 740 | $groupsarray = array(); |
| 741 | 741 | |
| 742 | - if($modx->manager->action == '12') { // only do this bit if the user is being edited
|
|
| 742 | + if ($modx->manager->action == '12') { // only do this bit if the user is being edited
|
|
| 743 | 743 | $rs = $modx->db->select('user_group', $modx->getFullTableName('member_groups'), "member='{$user}'");
|
| 744 | 744 | $groupsarray = $modx->db->getColumn('user_group', $rs);
|
| 745 | 745 | } |
| 746 | 746 | // retain selected doc groups between post |
| 747 | - if(is_array($_POST['user_groups'])) {
|
|
| 748 | - foreach($_POST['user_groups'] as $n => $v) $groupsarray[] = $v; |
|
| 747 | + if (is_array($_POST['user_groups'])) {
|
|
| 748 | + foreach ($_POST['user_groups'] as $n => $v) $groupsarray[] = $v; |
|
| 749 | 749 | } |
| 750 | 750 | ?> |
| 751 | 751 | <div class="tab-page" id="tabAccess"> |
@@ -754,8 +754,8 @@ discard block |
||
| 754 | 754 | <p><?php echo $_lang['access_permissions_user_message'] ?></p> |
| 755 | 755 | <?php |
| 756 | 756 | $rs = $modx->db->select('name, id', $modx->getFullTableName('membergroup_names'), '', 'name');
|
| 757 | - while($row = $modx->db->getRow($rs)) {
|
|
| 758 | - echo "<label><input type='checkbox' name='user_groups[]' value='" . $row['id'] . "'" . (in_array($row['id'], $groupsarray) ? " checked='checked'" : "") . " />" . $row['name'] . "</label><br />"; |
|
| 757 | + while ($row = $modx->db->getRow($rs)) {
|
|
| 758 | + echo "<label><input type='checkbox' name='user_groups[]' value='".$row['id']."'".(in_array($row['id'], $groupsarray) ? " checked='checked'" : "")." />".$row['name']."</label><br />"; |
|
| 759 | 759 | } |
| 760 | 760 | } |
| 761 | 761 | ?> |
@@ -768,7 +768,7 @@ discard block |
||
| 768 | 768 | $evtOut = $modx->invokeEvent("OnUserFormRender", array(
|
| 769 | 769 | "id" => $user |
| 770 | 770 | )); |
| 771 | - if(is_array($evtOut)) {
|
|
| 771 | + if (is_array($evtOut)) {
|
|
| 772 | 772 | echo implode("", $evtOut);
|
| 773 | 773 | } |
| 774 | 774 | ?> |
