evolution-cms /
evolution
@@ -36,16 +36,16 @@ discard block |
||
| 36 | 36 | $action = "", |
| 37 | 37 | $itemid = "", |
| 38 | 38 | $itemname = "" |
| 39 | - ) { |
|
| 39 | + ){ |
|
| 40 | 40 | $modx = evolutionCMS(); |
| 41 | 41 | $this->entry['msg'] = $msg; // writes testmessage to the object |
| 42 | - $this->entry['action'] = empty($action) ? $modx->manager->action : $action; // writes the action to the object |
|
| 42 | + $this->entry['action'] = empty($action) ? $modx->manager->action : $action; // writes the action to the object |
|
| 43 | 43 | |
| 44 | 44 | // User Credentials |
| 45 | 45 | $this->entry['internalKey'] = $internalKey == "" ? $modx->getLoginUserID() : $internalKey; |
| 46 | 46 | $this->entry['username'] = $username == "" ? $modx->getLoginUserName() : $username; |
| 47 | 47 | |
| 48 | - $this->entry['itemId'] = (empty($itemid) && isset($_REQUEST['id'])) ? (int)$_REQUEST['id'] : $itemid; // writes the id to the object |
|
| 48 | + $this->entry['itemId'] = (empty($itemid) && isset($_REQUEST['id'])) ? (int) $_REQUEST['id'] : $itemid; // writes the id to the object |
|
| 49 | 49 | if ($this->entry['itemId'] == 0) { |
| 50 | 50 | $this->entry['itemId'] = "-"; |
| 51 | 51 | } // to stop items having id 0 |
@@ -96,20 +96,20 @@ discard block |
||
| 96 | 96 | |
| 97 | 97 | $insert_id = $modx->db->insert($fields, $tbl_manager_log); |
| 98 | 98 | if (!$insert_id) { |
| 99 | - $modx->messageQuit("Logging error: couldn't save log to table! Error code: " . $modx->db->getLastError()); |
|
| 99 | + $modx->messageQuit("Logging error: couldn't save log to table! Error code: ".$modx->db->getLastError()); |
|
| 100 | 100 | } else { |
| 101 | - $limit = (isset($modx->config['manager_log_limit'])) ? (int)$modx->config['manager_log_limit'] : 3000; |
|
| 102 | - $trim = (isset($modx->config['manager_log_trim'])) ? (int)$modx->config['manager_log_trim'] : 100; |
|
| 101 | + $limit = (isset($modx->config['manager_log_limit'])) ? (int) $modx->config['manager_log_limit'] : 3000; |
|
| 102 | + $trim = (isset($modx->config['manager_log_trim'])) ? (int) $modx->config['manager_log_trim'] : 100; |
|
| 103 | 103 | if (($insert_id % $trim) === 0) { |
| 104 | 104 | $modx->rotate_log('manager_log', $limit, $trim); |
| 105 | 105 | } |
| 106 | 106 | } |
| 107 | 107 | } |
| 108 | 108 | |
| 109 | - private function getUserIP() { |
|
| 110 | - if( array_key_exists('HTTP_X_FORWARDED_FOR', $_SERVER) && !empty($_SERVER['HTTP_X_FORWARDED_FOR']) ) { |
|
| 111 | - if (strpos($_SERVER['HTTP_X_FORWARDED_FOR'], ',')>0) { |
|
| 112 | - $addr = explode(",",$_SERVER['HTTP_X_FORWARDED_FOR']); |
|
| 109 | + private function getUserIP(){ |
|
| 110 | + if (array_key_exists('HTTP_X_FORWARDED_FOR', $_SERVER) && !empty($_SERVER['HTTP_X_FORWARDED_FOR'])) { |
|
| 111 | + if (strpos($_SERVER['HTTP_X_FORWARDED_FOR'], ',') > 0) { |
|
| 112 | + $addr = explode(",", $_SERVER['HTTP_X_FORWARDED_FOR']); |
|
| 113 | 113 | return trim($addr[0]); |
| 114 | 114 | } else { |
| 115 | 115 | return $_SERVER['HTTP_X_FORWARDED_FOR']; |
@@ -11,9 +11,9 @@ discard block |
||
| 11 | 11 | use PHPMailer\PHPMailer\PHPMailer; |
| 12 | 12 | use PHPMailer\PHPMailer\Exception as PHPMailerException; |
| 13 | 13 | |
| 14 | -require MODX_MANAGER_PATH . 'includes/controls/phpmailer/Exception.php'; |
|
| 15 | -require MODX_MANAGER_PATH . 'includes/controls/phpmailer/PHPMailer.php'; |
|
| 16 | -require MODX_MANAGER_PATH . 'includes/controls/phpmailer/SMTP.php'; |
|
| 14 | +require MODX_MANAGER_PATH.'includes/controls/phpmailer/Exception.php'; |
|
| 15 | +require MODX_MANAGER_PATH.'includes/controls/phpmailer/PHPMailer.php'; |
|
| 16 | +require MODX_MANAGER_PATH.'includes/controls/phpmailer/SMTP.php'; |
|
| 17 | 17 | |
| 18 | 18 | /** |
| 19 | 19 | * Class MODxMailer |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | public function init(DocumentParser $modx) |
| 47 | 47 | { |
| 48 | 48 | $this->modx = $modx; |
| 49 | - $this->PluginDir = MODX_MANAGER_PATH . 'includes/controls/phpmailer/'; |
|
| 49 | + $this->PluginDir = MODX_MANAGER_PATH.'includes/controls/phpmailer/'; |
|
| 50 | 50 | |
| 51 | 51 | switch ($modx->config['email_method']) { |
| 52 | 52 | case 'smtp': |
@@ -112,7 +112,7 @@ discard block |
||
| 112 | 112 | mb_language($this->mb_language); |
| 113 | 113 | mb_internal_encoding($modx->config['modx_charset']); |
| 114 | 114 | } |
| 115 | - $exconf = MODX_MANAGER_PATH . 'includes/controls/phpmailer/config.inc.php'; |
|
| 115 | + $exconf = MODX_MANAGER_PATH.'includes/controls/phpmailer/config.inc.php'; |
|
| 116 | 116 | if (is_file($exconf)) { |
| 117 | 117 | include($exconf); |
| 118 | 118 | } |
@@ -180,12 +180,12 @@ discard block |
||
| 180 | 180 | } |
| 181 | 181 | |
| 182 | 182 | if ($this->modx->debug) { |
| 183 | - $debug_info = 'CharSet = ' . $this->CharSet . "\n"; |
|
| 184 | - $debug_info .= 'Encoding = ' . $this->Encoding . "\n"; |
|
| 185 | - $debug_info .= 'mb_language = ' . $this->mb_language . "\n"; |
|
| 186 | - $debug_info .= 'encode_header_method = ' . $this->encode_header_method . "\n"; |
|
| 183 | + $debug_info = 'CharSet = '.$this->CharSet."\n"; |
|
| 184 | + $debug_info .= 'Encoding = '.$this->Encoding."\n"; |
|
| 185 | + $debug_info .= 'mb_language = '.$this->mb_language."\n"; |
|
| 186 | + $debug_info .= 'encode_header_method = '.$this->encode_header_method."\n"; |
|
| 187 | 187 | $debug_info .= "send_mode = {$mode}\n"; |
| 188 | - $debug_info .= 'Subject = ' . $this->Subject . "\n"; |
|
| 188 | + $debug_info .= 'Subject = '.$this->Subject."\n"; |
|
| 189 | 189 | $log = "<pre>{$debug_info}\n{$header}\n{$org_body}</pre>"; |
| 190 | 190 | $this->modx->logEvent(1, 1, $log, 'MODxMailer debug information'); |
| 191 | 191 | |
@@ -251,7 +251,7 @@ discard block |
||
| 251 | 251 | ini_set('sendmail_from', $old_from); |
| 252 | 252 | } |
| 253 | 253 | if (!$rt) { |
| 254 | - $msg = $this->Lang('instantiate') . "<br />\n"; |
|
| 254 | + $msg = $this->Lang('instantiate')."<br />\n"; |
|
| 255 | 255 | $msg .= "{$this->Subject}<br />\n"; |
| 256 | 256 | $msg .= "{$this->FromName}<{$this->From}><br />\n"; |
| 257 | 257 | $msg .= mb_convert_encoding($body, $this->modx->config['modx_charset'], $this->CharSet); |
@@ -273,7 +273,7 @@ discard block |
||
| 273 | 273 | $classDump = call_user_func('get_object_vars', $this); |
| 274 | 274 | unset($classDump['modx']); |
| 275 | 275 | $this->modx->config['send_errormail'] = '0'; |
| 276 | - $this->modx->logEvent(0, 3, $msg . '<pre>' . print_r($classDump, true) . '</pre>', 'phpmailer'); |
|
| 276 | + $this->modx->logEvent(0, 3, $msg.'<pre>'.print_r($classDump, true).'</pre>', 'phpmailer'); |
|
| 277 | 277 | |
| 278 | 278 | return parent::SetError($msg); |
| 279 | 279 | } |
@@ -19,11 +19,11 @@ discard block |
||
| 19 | 19 | $modx->loadExtension("ManagerAPI");
|
| 20 | 20 | |
| 21 | 21 | $_lang = array(); |
| 22 | -include_once MODX_MANAGER_PATH . '/includes/lang/english.inc.php'; |
|
| 22 | +include_once MODX_MANAGER_PATH.'/includes/lang/english.inc.php'; |
|
| 23 | 23 | if ($modx->config['manager_language'] != 'english') {
|
| 24 | - include_once MODX_MANAGER_PATH . '/includes/lang/' . $modx->config['manager_language'] . '.inc.php'; |
|
| 24 | + include_once MODX_MANAGER_PATH.'/includes/lang/'.$modx->config['manager_language'].'.inc.php'; |
|
| 25 | 25 | } |
| 26 | -include_once MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/style.php'; |
|
| 26 | +include_once MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/style.php'; |
|
| 27 | 27 | |
| 28 | 28 | $action = isset($_REQUEST['a']) ? $_REQUEST['a'] : ''; |
| 29 | 29 | $frame = isset($_REQUEST['f']) ? $_REQUEST['f'] : ''; |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | |
| 41 | 41 | switch ($frame) {
|
| 42 | 42 | case 'nodes': |
| 43 | - include_once MODX_MANAGER_PATH . '/frames/nodes.php'; |
|
| 43 | + include_once MODX_MANAGER_PATH.'/frames/nodes.php'; |
|
| 44 | 44 | |
| 45 | 45 | break; |
| 46 | 46 | } |
@@ -58,21 +58,21 @@ discard block |
||
| 58 | 58 | $sql = ''; |
| 59 | 59 | $a = ''; |
| 60 | 60 | $filter = !empty($_REQUEST['filter']) && is_scalar($_REQUEST['filter']) ? addcslashes(trim($_REQUEST['filter']), '%*_') : ''; |
| 61 | - $sqlLike = $filter ? 'WHERE t1.name LIKE "' . $modx->db->escape($filter) . '%"' : ''; |
|
| 62 | - $sqlLimit = $sqlLike ? '' : 'LIMIT ' . $limit; |
|
| 61 | + $sqlLike = $filter ? 'WHERE t1.name LIKE "'.$modx->db->escape($filter).'%"' : ''; |
|
| 62 | + $sqlLimit = $sqlLike ? '' : 'LIMIT '.$limit; |
|
| 63 | 63 | |
| 64 | 64 | switch ($elements) {
|
| 65 | 65 | case 'element_templates': |
| 66 | 66 | $a = 16; |
| 67 | - $sqlLike = $filter ? 'WHERE t1.templatename LIKE "' . $modx->db->escape($filter) . '%"' : ''; |
|
| 67 | + $sqlLike = $filter ? 'WHERE t1.templatename LIKE "'.$modx->db->escape($filter).'%"' : ''; |
|
| 68 | 68 | $sql = $modx->db->query('SELECT t1.*, t1.templatename AS name
|
| 69 | - FROM ' . $modx->getFullTableName('site_templates') . ' AS t1
|
|
| 70 | - ' . $sqlLike . ' |
|
| 69 | + FROM ' . $modx->getFullTableName('site_templates').' AS t1
|
|
| 70 | + ' . $sqlLike.' |
|
| 71 | 71 | ORDER BY t1.templatename ASC |
| 72 | 72 | ' . $sqlLimit); |
| 73 | 73 | |
| 74 | 74 | if ($modx->hasPermission('new_template')) {
|
| 75 | - $output .= '<li><a id="a_19" href="index.php?a=19" target="main"><i class="fa fa-plus"></i>' . $_lang['new_template'] . '</a></li>'; |
|
| 75 | + $output .= '<li><a id="a_19" href="index.php?a=19" target="main"><i class="fa fa-plus"></i>'.$_lang['new_template'].'</a></li>'; |
|
| 76 | 76 | } |
| 77 | 77 | |
| 78 | 78 | break; |
@@ -80,15 +80,15 @@ discard block |
||
| 80 | 80 | case 'element_tplvars': |
| 81 | 81 | $a = 301; |
| 82 | 82 | $sql = $modx->db->query('SELECT t1.id,t1.name,t1.locked, IF(MIN(t2.tmplvarid),0,1) AS disabled
|
| 83 | - FROM ' . $modx->getFullTableName('site_tmplvars') . ' AS t1
|
|
| 84 | - LEFT JOIN ' . $modx->getFullTableName('site_tmplvar_templates') . ' AS t2 ON t1.id=t2.tmplvarid
|
|
| 85 | - ' . $sqlLike . ' |
|
| 83 | + FROM ' . $modx->getFullTableName('site_tmplvars').' AS t1
|
|
| 84 | + LEFT JOIN ' . $modx->getFullTableName('site_tmplvar_templates').' AS t2 ON t1.id=t2.tmplvarid
|
|
| 85 | + ' . $sqlLike.' |
|
| 86 | 86 | GROUP BY t1.id |
| 87 | 87 | ORDER BY t1.name ASC |
| 88 | 88 | ' . $sqlLimit); |
| 89 | 89 | |
| 90 | 90 | if ($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {
|
| 91 | - $output .= '<li><a id="a_300" href="index.php?a=300" target="main"><i class="fa fa-plus"></i>' . $_lang['new_tmplvars'] . '</a></li>'; |
|
| 91 | + $output .= '<li><a id="a_300" href="index.php?a=300" target="main"><i class="fa fa-plus"></i>'.$_lang['new_tmplvars'].'</a></li>'; |
|
| 92 | 92 | } |
| 93 | 93 | |
| 94 | 94 | break; |
@@ -96,13 +96,13 @@ discard block |
||
| 96 | 96 | case 'element_htmlsnippets': |
| 97 | 97 | $a = 78; |
| 98 | 98 | $sql = $modx->db->query('SELECT t1.*
|
| 99 | - FROM ' . $modx->getFullTableName('site_htmlsnippets') . ' AS t1
|
|
| 100 | - ' . $sqlLike . ' |
|
| 99 | + FROM ' . $modx->getFullTableName('site_htmlsnippets').' AS t1
|
|
| 100 | + ' . $sqlLike.' |
|
| 101 | 101 | ORDER BY t1.name ASC |
| 102 | 102 | ' . $sqlLimit); |
| 103 | 103 | |
| 104 | 104 | if ($modx->hasPermission('new_chunk')) {
|
| 105 | - $output .= '<li><a id="a_77" href="index.php?a=77" target="main"><i class="fa fa-plus"></i>' . $_lang['new_htmlsnippet'] . '</a></li>'; |
|
| 105 | + $output .= '<li><a id="a_77" href="index.php?a=77" target="main"><i class="fa fa-plus"></i>'.$_lang['new_htmlsnippet'].'</a></li>'; |
|
| 106 | 106 | } |
| 107 | 107 | |
| 108 | 108 | break; |
@@ -110,13 +110,13 @@ discard block |
||
| 110 | 110 | case 'element_snippets': |
| 111 | 111 | $a = 22; |
| 112 | 112 | $sql = $modx->db->query('SELECT t1.*
|
| 113 | - FROM ' . $modx->getFullTableName('site_snippets') . ' AS t1
|
|
| 114 | - ' . $sqlLike . ' |
|
| 113 | + FROM ' . $modx->getFullTableName('site_snippets').' AS t1
|
|
| 114 | + ' . $sqlLike.' |
|
| 115 | 115 | ORDER BY t1.name ASC |
| 116 | 116 | ' . $sqlLimit); |
| 117 | 117 | |
| 118 | 118 | if ($modx->hasPermission('new_snippet')) {
|
| 119 | - $output .= '<li><a id="a_23" href="index.php?a=23" target="main"><i class="fa fa-plus"></i>' . $_lang['new_snippet'] . '</a></li>'; |
|
| 119 | + $output .= '<li><a id="a_23" href="index.php?a=23" target="main"><i class="fa fa-plus"></i>'.$_lang['new_snippet'].'</a></li>'; |
|
| 120 | 120 | } |
| 121 | 121 | |
| 122 | 122 | break; |
@@ -124,13 +124,13 @@ discard block |
||
| 124 | 124 | case 'element_plugins': |
| 125 | 125 | $a = 102; |
| 126 | 126 | $sql = $modx->db->query('SELECT t1.*
|
| 127 | - FROM ' . $modx->getFullTableName('site_plugins') . ' AS t1
|
|
| 128 | - ' . $sqlLike . ' |
|
| 127 | + FROM ' . $modx->getFullTableName('site_plugins').' AS t1
|
|
| 128 | + ' . $sqlLike.' |
|
| 129 | 129 | ORDER BY t1.name ASC |
| 130 | 130 | ' . $sqlLimit); |
| 131 | 131 | |
| 132 | 132 | if ($modx->hasPermission('new_plugin')) {
|
| 133 | - $output .= '<li><a id="a_101" href="index.php?a=101" target="main"><i class="fa fa-plus"></i>' . $_lang['new_plugin'] . '</a></li>'; |
|
| 133 | + $output .= '<li><a id="a_101" href="index.php?a=101" target="main"><i class="fa fa-plus"></i>'.$_lang['new_plugin'].'</a></li>'; |
|
| 134 | 134 | } |
| 135 | 135 | |
| 136 | 136 | break; |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | continue; |
| 146 | 146 | } |
| 147 | 147 | |
| 148 | - $items .= '<li class="item ' . ($row['disabled'] ? 'disabled' : '') . ($row['locked'] ? ' locked' : '') . '"><a id="a_' . $a . '__id_' . $row['id'] . '" href="index.php?a=' . $a . '&id=' . $row['id'] . '" target="main" data-parent-id="a_76__elements_' . $elements . '">' . $row['name'] . ' <small>(' . $row['id'] . ')</small></a></li>' . "\n";
|
|
| 148 | + $items .= '<li class="item '.($row['disabled'] ? 'disabled' : '').($row['locked'] ? ' locked' : '').'"><a id="a_'.$a.'__id_'.$row['id'].'" href="index.php?a='.$a.'&id='.$row['id'].'" target="main" data-parent-id="a_76__elements_'.$elements.'">'.$row['name'].' <small>('.$row['id'].')</small></a></li>'."\n";
|
|
| 149 | 149 | } |
| 150 | 150 | } |
| 151 | 151 | |
@@ -166,18 +166,18 @@ discard block |
||
| 166 | 166 | $output = ''; |
| 167 | 167 | $items = ''; |
| 168 | 168 | $filter = !empty($_REQUEST['filter']) && is_scalar($_REQUEST['filter']) ? addcslashes(trim($_REQUEST['filter']), '\%*_') : ''; |
| 169 | - $sqlLike = $filter ? 'WHERE t1.username LIKE "' . $modx->db->escape($filter) . '%"' : ''; |
|
| 170 | - $sqlLimit = $sqlLike ? '' : 'LIMIT ' . $limit; |
|
| 169 | + $sqlLike = $filter ? 'WHERE t1.username LIKE "'.$modx->db->escape($filter).'%"' : ''; |
|
| 170 | + $sqlLimit = $sqlLike ? '' : 'LIMIT '.$limit; |
|
| 171 | 171 | |
| 172 | 172 | $sql = $modx->db->query('SELECT t1.*, t1.username AS name, t2.blocked
|
| 173 | - FROM ' . $modx->getFullTableName('manager_users') . ' AS t1
|
|
| 174 | - LEFT JOIN ' . $modx->getFullTableName('user_attributes') . ' AS t2 ON t1.id=t2.internalKey
|
|
| 175 | - ' . $sqlLike . ' |
|
| 173 | + FROM ' . $modx->getFullTableName('manager_users').' AS t1
|
|
| 174 | + LEFT JOIN ' . $modx->getFullTableName('user_attributes').' AS t2 ON t1.id=t2.internalKey
|
|
| 175 | + ' . $sqlLike.' |
|
| 176 | 176 | ORDER BY t1.username ASC |
| 177 | 177 | ' . $sqlLimit); |
| 178 | 178 | |
| 179 | 179 | if ($modx->hasPermission('new_user')) {
|
| 180 | - $output .= '<li><a id="a_11" href="index.php?a=11" target="main"><i class="fa fa-plus"></i>' . $_lang['new_user'] . '</a></li>'; |
|
| 180 | + $output .= '<li><a id="a_11" href="index.php?a=11" target="main"><i class="fa fa-plus"></i>'.$_lang['new_user'].'</a></li>'; |
|
| 181 | 181 | } |
| 182 | 182 | |
| 183 | 183 | if ($count = $modx->db->getRecordCount($sql)) {
|
@@ -185,7 +185,7 @@ discard block |
||
| 185 | 185 | $output .= '<li class="item-input"><input type="text" name="filter" class="dropdown-item form-control form-control-sm" autocomplete="off" /></li>'; |
| 186 | 186 | } |
| 187 | 187 | while ($row = $modx->db->getRow($sql)) {
|
| 188 | - $items .= '<li class="item ' . ($row['blocked'] ? 'disabled' : '') . '"><a id="a_' . $a . '__id_' . $row['id'] . '" href="index.php?a=' . $a . '&id=' . $row['id'] . '" target="main">' . $row['name'] . ' <small>(' . $row['id'] . ')</small></a></li>';
|
|
| 188 | + $items .= '<li class="item '.($row['blocked'] ? 'disabled' : '').'"><a id="a_'.$a.'__id_'.$row['id'].'" href="index.php?a='.$a.'&id='.$row['id'].'" target="main">'.$row['name'].' <small>('.$row['id'].')</small></a></li>';
|
|
| 189 | 189 | } |
| 190 | 190 | } |
| 191 | 191 | |
@@ -205,18 +205,18 @@ discard block |
||
| 205 | 205 | $output = ''; |
| 206 | 206 | $items = ''; |
| 207 | 207 | $filter = !empty($_REQUEST['filter']) && is_scalar($_REQUEST['filter']) ? addcslashes(trim($_REQUEST['filter']), '\%*_') : ''; |
| 208 | - $sqlLike = $filter ? 'WHERE t1.username LIKE "' . $modx->db->escape($filter) . '%"' : ''; |
|
| 209 | - $sqlLimit = $sqlLike ? '' : 'LIMIT ' . $limit; |
|
| 208 | + $sqlLike = $filter ? 'WHERE t1.username LIKE "'.$modx->db->escape($filter).'%"' : ''; |
|
| 209 | + $sqlLimit = $sqlLike ? '' : 'LIMIT '.$limit; |
|
| 210 | 210 | |
| 211 | 211 | $sql = $modx->db->query('SELECT t1.*, t1.username AS name, t2.blocked
|
| 212 | - FROM ' . $modx->getFullTableName('web_users') . ' AS t1
|
|
| 213 | - LEFT JOIN ' . $modx->getFullTableName('web_user_attributes') . ' AS t2 ON t1.id=t2.internalKey
|
|
| 214 | - ' . $sqlLike . ' |
|
| 212 | + FROM ' . $modx->getFullTableName('web_users').' AS t1
|
|
| 213 | + LEFT JOIN ' . $modx->getFullTableName('web_user_attributes').' AS t2 ON t1.id=t2.internalKey
|
|
| 214 | + ' . $sqlLike.' |
|
| 215 | 215 | ORDER BY t1.username ASC |
| 216 | 216 | ' . $sqlLimit); |
| 217 | 217 | |
| 218 | 218 | if ($modx->hasPermission('new_web_user')) {
|
| 219 | - $output .= '<li><a id="a_87" href="index.php?a=87" target="main"><i class="fa fa-plus"></i>' . $_lang['new_web_user'] . '</a></li>'; |
|
| 219 | + $output .= '<li><a id="a_87" href="index.php?a=87" target="main"><i class="fa fa-plus"></i>'.$_lang['new_web_user'].'</a></li>'; |
|
| 220 | 220 | } |
| 221 | 221 | |
| 222 | 222 | if ($count = $modx->db->getRecordCount($sql)) {
|
@@ -224,7 +224,7 @@ discard block |
||
| 224 | 224 | $output .= '<li class="item-input"><input type="text" name="filter" class="dropdown-item form-control form-control-sm" autocomplete="off" /></li>'; |
| 225 | 225 | } |
| 226 | 226 | while ($row = $modx->db->getRow($sql)) {
|
| 227 | - $items .= '<li class="item ' . ($row['blocked'] ? 'disabled' : '') . '"><a id="a_' . $a . '__id_' . $row['id'] . '" href="index.php?a=' . $a . '&id=' . $row['id'] . '" target="main">' . $row['name'] . ' <small>(' . $row['id'] . ')</small></a></li>';
|
|
| 227 | + $items .= '<li class="item '.($row['blocked'] ? 'disabled' : '').'"><a id="a_'.$a.'__id_'.$row['id'].'" href="index.php?a='.$a.'&id='.$row['id'].'" target="main">'.$row['name'].' <small>('.$row['id'].')</small></a></li>';
|
|
| 228 | 228 | } |
| 229 | 229 | } |
| 230 | 230 | |
@@ -250,35 +250,35 @@ discard block |
||
| 250 | 250 | case 'SnippetNoCache': {
|
| 251 | 251 | |
| 252 | 252 | $sql = $modx->db->query('SELECT *
|
| 253 | - FROM ' . $modx->getFullTableName('site_snippets') . '
|
|
| 254 | - WHERE name="' . $name . '" |
|
| 253 | + FROM ' . $modx->getFullTableName('site_snippets').'
|
|
| 254 | + WHERE name="' . $name.'" |
|
| 255 | 255 | LIMIT 1'); |
| 256 | 256 | |
| 257 | 257 | if ($modx->db->getRecordCount($sql)) {
|
| 258 | 258 | $row = $modx->db->getRow($sql); |
| 259 | 259 | $contextmenu = array( |
| 260 | 260 | 'header' => array( |
| 261 | - 'innerHTML' => '<i class="fa fa-code"></i> ' . $row['name'] |
|
| 261 | + 'innerHTML' => '<i class="fa fa-code"></i> '.$row['name'] |
|
| 262 | 262 | ), |
| 263 | 263 | 'item' => array( |
| 264 | - 'innerHTML' => '<i class="fa fa-pencil-square-o"></i> ' . $_lang['edit'], |
|
| 265 | - 'url' => "index.php?a=22&id=" . $row['id'] |
|
| 264 | + 'innerHTML' => '<i class="fa fa-pencil-square-o"></i> '.$_lang['edit'], |
|
| 265 | + 'url' => "index.php?a=22&id=".$row['id'] |
|
| 266 | 266 | ) |
| 267 | 267 | ); |
| 268 | 268 | if (!empty($row['description'])) {
|
| 269 | 269 | $contextmenu['seperator'] = ''; |
| 270 | 270 | $contextmenu['description'] = array( |
| 271 | - 'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description'] |
|
| 271 | + 'innerHTML' => '<i class="fa fa-info"></i> '.$row['description'] |
|
| 272 | 272 | ); |
| 273 | 273 | } |
| 274 | 274 | } else {
|
| 275 | 275 | $contextmenu = array( |
| 276 | 276 | 'header' => array( |
| 277 | - 'innerHTML' => '<i class="fa fa-code"></i> ' . $name |
|
| 277 | + 'innerHTML' => '<i class="fa fa-code"></i> '.$name |
|
| 278 | 278 | ), |
| 279 | 279 | 'item' => array( |
| 280 | - 'innerHTML' => '<i class="fa fa-plus"></i> ' . $_lang['new_snippet'], |
|
| 281 | - 'url' => "index.php?a=23&itemname=" . $name |
|
| 280 | + 'innerHTML' => '<i class="fa fa-plus"></i> '.$_lang['new_snippet'], |
|
| 281 | + 'url' => "index.php?a=23&itemname=".$name |
|
| 282 | 282 | ) |
| 283 | 283 | ); |
| 284 | 284 | } |
@@ -288,35 +288,35 @@ discard block |
||
| 288 | 288 | case 'Chunk' : {
|
| 289 | 289 | |
| 290 | 290 | $sql = $modx->db->query('SELECT *
|
| 291 | - FROM ' . $modx->getFullTableName('site_htmlsnippets') . '
|
|
| 292 | - WHERE name="' . $name . '" |
|
| 291 | + FROM ' . $modx->getFullTableName('site_htmlsnippets').'
|
|
| 292 | + WHERE name="' . $name.'" |
|
| 293 | 293 | LIMIT 1'); |
| 294 | 294 | |
| 295 | 295 | if ($modx->db->getRecordCount($sql)) {
|
| 296 | 296 | $row = $modx->db->getRow($sql); |
| 297 | 297 | $contextmenu = array( |
| 298 | 298 | 'header' => array( |
| 299 | - 'innerHTML' => '<i class="fa fa-th-large"></i> ' . $row['name'] |
|
| 299 | + 'innerHTML' => '<i class="fa fa-th-large"></i> '.$row['name'] |
|
| 300 | 300 | ), |
| 301 | 301 | 'item' => array( |
| 302 | - 'innerHTML' => '<i class="fa fa-pencil-square-o"></i> ' . $_lang['edit'], |
|
| 303 | - 'url' => "index.php?a=78&id=" . $row['id'] |
|
| 302 | + 'innerHTML' => '<i class="fa fa-pencil-square-o"></i> '.$_lang['edit'], |
|
| 303 | + 'url' => "index.php?a=78&id=".$row['id'] |
|
| 304 | 304 | ) |
| 305 | 305 | ); |
| 306 | 306 | if (!empty($row['description'])) {
|
| 307 | 307 | $contextmenu['seperator'] = ''; |
| 308 | 308 | $contextmenu['description'] = array( |
| 309 | - 'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description'] |
|
| 309 | + 'innerHTML' => '<i class="fa fa-info"></i> '.$row['description'] |
|
| 310 | 310 | ); |
| 311 | 311 | } |
| 312 | 312 | } else {
|
| 313 | 313 | $contextmenu = array( |
| 314 | 314 | 'header' => array( |
| 315 | - 'innerHTML' => '<i class="fa fa-th-large"></i> ' . $name |
|
| 315 | + 'innerHTML' => '<i class="fa fa-th-large"></i> '.$name |
|
| 316 | 316 | ), |
| 317 | 317 | 'item' => array( |
| 318 | - 'innerHTML' => '<i class="fa fa-plus"></i> ' . $_lang['new_htmlsnippet'], |
|
| 319 | - 'url' => "index.php?a=77&itemname=" . $name |
|
| 318 | + 'innerHTML' => '<i class="fa fa-plus"></i> '.$_lang['new_htmlsnippet'], |
|
| 319 | + 'url' => "index.php?a=77&itemname=".$name |
|
| 320 | 320 | ) |
| 321 | 321 | ); |
| 322 | 322 | } |
@@ -325,8 +325,8 @@ discard block |
||
| 325 | 325 | } |
| 326 | 326 | case 'AttributeValue': {
|
| 327 | 327 | $sql = $modx->db->query('SELECT *
|
| 328 | - FROM ' . $modx->getFullTableName('site_htmlsnippets') . '
|
|
| 329 | - WHERE name="' . $name . '" |
|
| 328 | + FROM ' . $modx->getFullTableName('site_htmlsnippets').'
|
|
| 329 | + WHERE name="' . $name.'" |
|
| 330 | 330 | LIMIT 1'); |
| 331 | 331 | |
| 332 | 332 | if ($modx->db->getRecordCount($sql)) {
|
@@ -336,52 +336,52 @@ discard block |
||
| 336 | 336 | 'innerText' => $row['name'] |
| 337 | 337 | ), |
| 338 | 338 | 'item' => array( |
| 339 | - 'innerHTML' => '<i class="fa fa-pencil-square-o"></i> ' . $_lang['edit'], |
|
| 340 | - 'url' => "index.php?a=78&id=" . $row['id'] |
|
| 339 | + 'innerHTML' => '<i class="fa fa-pencil-square-o"></i> '.$_lang['edit'], |
|
| 340 | + 'url' => "index.php?a=78&id=".$row['id'] |
|
| 341 | 341 | ) |
| 342 | 342 | ); |
| 343 | 343 | if (!empty($row['description'])) {
|
| 344 | 344 | $contextmenu['seperator'] = ''; |
| 345 | 345 | $contextmenu['description'] = array( |
| 346 | - 'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description'] |
|
| 346 | + 'innerHTML' => '<i class="fa fa-info"></i> '.$row['description'] |
|
| 347 | 347 | ); |
| 348 | 348 | } |
| 349 | 349 | } else {
|
| 350 | 350 | |
| 351 | 351 | $sql = $modx->db->query('SELECT *
|
| 352 | - FROM ' . $modx->getFullTableName('site_snippets') . '
|
|
| 353 | - WHERE name="' . $name . '" |
|
| 352 | + FROM ' . $modx->getFullTableName('site_snippets').'
|
|
| 353 | + WHERE name="' . $name.'" |
|
| 354 | 354 | LIMIT 1'); |
| 355 | 355 | |
| 356 | 356 | if ($modx->db->getRecordCount($sql)) {
|
| 357 | 357 | $row = $modx->db->getRow($sql); |
| 358 | 358 | $contextmenu = array( |
| 359 | 359 | 'header' => array( |
| 360 | - 'innerHTML' => '<i class="fa fa-code"></i> ' . $row['name'] |
|
| 360 | + 'innerHTML' => '<i class="fa fa-code"></i> '.$row['name'] |
|
| 361 | 361 | ), |
| 362 | 362 | 'item' => array( |
| 363 | - 'innerHTML' => '<i class="fa fa-pencil-square-o"></i> ' . $_lang['edit'], |
|
| 364 | - 'url' => "index.php?a=22&id=" . $row['id'] |
|
| 363 | + 'innerHTML' => '<i class="fa fa-pencil-square-o"></i> '.$_lang['edit'], |
|
| 364 | + 'url' => "index.php?a=22&id=".$row['id'] |
|
| 365 | 365 | ) |
| 366 | 366 | ); |
| 367 | 367 | if (!empty($row['description'])) {
|
| 368 | 368 | $contextmenu['seperator'] = ''; |
| 369 | 369 | $contextmenu['description'] = array( |
| 370 | - 'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description'] |
|
| 370 | + 'innerHTML' => '<i class="fa fa-info"></i> '.$row['description'] |
|
| 371 | 371 | ); |
| 372 | 372 | } |
| 373 | 373 | } else {
|
| 374 | 374 | $contextmenu = array( |
| 375 | 375 | 'header' => array( |
| 376 | - 'innerHTML' => '<i class="fa fa-code"></i> ' . $name |
|
| 376 | + 'innerHTML' => '<i class="fa fa-code"></i> '.$name |
|
| 377 | 377 | ), |
| 378 | 378 | 'item' => array( |
| 379 | - 'innerHTML' => '<i class="fa fa-plus"></i> ' . $_lang['new_htmlsnippet'], |
|
| 380 | - 'url' => "index.php?a=77&itemname=" . $name |
|
| 379 | + 'innerHTML' => '<i class="fa fa-plus"></i> '.$_lang['new_htmlsnippet'], |
|
| 380 | + 'url' => "index.php?a=77&itemname=".$name |
|
| 381 | 381 | ), |
| 382 | 382 | 'item2' => array( |
| 383 | - 'innerHTML' => '<i class="fa fa-plus"></i> ' . $_lang['new_snippet'], |
|
| 384 | - 'url' => "index.php?a=23&itemname=" . $name |
|
| 383 | + 'innerHTML' => '<i class="fa fa-plus"></i> '.$_lang['new_snippet'], |
|
| 384 | + 'url' => "index.php?a=23&itemname=".$name |
|
| 385 | 385 | ) |
| 386 | 386 | ); |
| 387 | 387 | } |
@@ -437,35 +437,35 @@ discard block |
||
| 437 | 437 | } |
| 438 | 438 | |
| 439 | 439 | $sql = $modx->db->query('SELECT *
|
| 440 | - FROM ' . $modx->getFullTableName('site_tmplvars') . '
|
|
| 441 | - WHERE name="' . $name . '" |
|
| 440 | + FROM ' . $modx->getFullTableName('site_tmplvars').'
|
|
| 441 | + WHERE name="' . $name.'" |
|
| 442 | 442 | LIMIT 1'); |
| 443 | 443 | |
| 444 | 444 | if ($modx->db->getRecordCount($sql)) {
|
| 445 | 445 | $row = $modx->db->getRow($sql); |
| 446 | 446 | $contextmenu = array( |
| 447 | 447 | 'header' => array( |
| 448 | - 'innerHTML' => '<i class="fa fa-list-alt"></i> ' . $row['name'] |
|
| 448 | + 'innerHTML' => '<i class="fa fa-list-alt"></i> '.$row['name'] |
|
| 449 | 449 | ), |
| 450 | 450 | 'item' => array( |
| 451 | - 'innerHTML' => '<i class="fa fa-pencil-square-o"></i> ' . $_lang['edit'], |
|
| 452 | - 'url' => "index.php?a=301&id=" . $row['id'] |
|
| 451 | + 'innerHTML' => '<i class="fa fa-pencil-square-o"></i> '.$_lang['edit'], |
|
| 452 | + 'url' => "index.php?a=301&id=".$row['id'] |
|
| 453 | 453 | ) |
| 454 | 454 | ); |
| 455 | 455 | if (!empty($row['description'])) {
|
| 456 | 456 | $contextmenu['seperator'] = ''; |
| 457 | 457 | $contextmenu['description'] = array( |
| 458 | - 'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description'] |
|
| 458 | + 'innerHTML' => '<i class="fa fa-info"></i> '.$row['description'] |
|
| 459 | 459 | ); |
| 460 | 460 | } |
| 461 | 461 | } else {
|
| 462 | 462 | $contextmenu = array( |
| 463 | 463 | 'header' => array( |
| 464 | - 'innerHTML' => '<i class="fa fa-list-alt"></i> ' . $name |
|
| 464 | + 'innerHTML' => '<i class="fa fa-list-alt"></i> '.$name |
|
| 465 | 465 | ), |
| 466 | 466 | 'item' => array( |
| 467 | - 'innerHTML' => '<i class="fa fa-plus"></i> ' . $_lang['new_tmplvars'], |
|
| 468 | - 'url' => "index.php?a=300&itemname=" . $name |
|
| 467 | + 'innerHTML' => '<i class="fa fa-plus"></i> '.$_lang['new_tmplvars'], |
|
| 468 | + 'url' => "index.php?a=300&itemname=".$name |
|
| 469 | 469 | ) |
| 470 | 470 | ); |
| 471 | 471 | } |
@@ -484,15 +484,15 @@ discard block |
||
| 484 | 484 | $json = array(); |
| 485 | 485 | |
| 486 | 486 | if ($modx->hasPermission('new_document') && $modx->hasPermission('edit_document') && $modx->hasPermission('save_document')) {
|
| 487 | - $id = !empty($_REQUEST['id']) ? (int)$_REQUEST['id'] : ''; |
|
| 488 | - $parent = isset($_REQUEST['parent']) ? (int)$_REQUEST['parent'] : 0; |
|
| 487 | + $id = !empty($_REQUEST['id']) ? (int) $_REQUEST['id'] : ''; |
|
| 488 | + $parent = isset($_REQUEST['parent']) ? (int) $_REQUEST['parent'] : 0; |
|
| 489 | 489 | $menuindex = isset($_REQUEST['menuindex']) && is_scalar($_REQUEST['menuindex']) ? $_REQUEST['menuindex'] : 0; |
| 490 | 490 | |
| 491 | 491 | // set parent |
| 492 | 492 | if ($id && $parent >= 0) {
|
| 493 | 493 | |
| 494 | 494 | // find older parent |
| 495 | - $parentOld = $modx->db->getValue($modx->db->select('parent', $modx->getFullTableName('site_content'), 'id=' . $id));
|
|
| 495 | + $parentOld = $modx->db->getValue($modx->db->select('parent', $modx->getFullTableName('site_content'), 'id='.$id));
|
|
| 496 | 496 | |
| 497 | 497 | $eventOut = $modx->invokeEvent('onBeforeMoveDocument', [
|
| 498 | 498 | 'id_document' => $id, |
@@ -513,7 +513,7 @@ discard block |
||
| 513 | 513 | if (empty($json['errors'])) {
|
| 514 | 514 | // check privileges user for move docs |
| 515 | 515 | if (!empty($modx->config['tree_show_protected']) && $role != 1) {
|
| 516 | - $sql = $modx->db->select('*', $modx->getFullTableName('document_groups'), 'document IN(' . $id . ',' . $parent . ',' . $parentOld . ')');
|
|
| 516 | + $sql = $modx->db->select('*', $modx->getFullTableName('document_groups'), 'document IN('.$id.','.$parent.','.$parentOld.')');
|
|
| 517 | 517 | if ($modx->db->getRecordCount($sql)) {
|
| 518 | 518 | $document_groups = array(); |
| 519 | 519 | while ($row = $modx->db->getRow($sql)) {
|
@@ -538,22 +538,22 @@ discard block |
||
| 538 | 538 | // set new parent |
| 539 | 539 | $modx->db->update(array( |
| 540 | 540 | 'parent' => $parent |
| 541 | - ), $modx->getFullTableName('site_content'), 'id=' . $id);
|
|
| 541 | + ), $modx->getFullTableName('site_content'), 'id='.$id);
|
|
| 542 | 542 | // set parent isfolder = 1 |
| 543 | 543 | $modx->db->update(array( |
| 544 | 544 | 'isfolder' => 1 |
| 545 | - ), $modx->getFullTableName('site_content'), 'id=' . $parent);
|
|
| 545 | + ), $modx->getFullTableName('site_content'), 'id='.$parent);
|
|
| 546 | 546 | |
| 547 | 547 | if ($parent != $parentOld) {
|
| 548 | 548 | // check children docs and set parent isfolder |
| 549 | - if ($modx->db->getRecordCount($modx->db->select('id', $modx->getFullTableName('site_content'), 'parent=' . $parentOld))) {
|
|
| 549 | + if ($modx->db->getRecordCount($modx->db->select('id', $modx->getFullTableName('site_content'), 'parent='.$parentOld))) {
|
|
| 550 | 550 | $modx->db->update(array( |
| 551 | 551 | 'isfolder' => 1 |
| 552 | - ), $modx->getFullTableName('site_content'), 'id=' . $parentOld);
|
|
| 552 | + ), $modx->getFullTableName('site_content'), 'id='.$parentOld);
|
|
| 553 | 553 | } else {
|
| 554 | 554 | $modx->db->update(array( |
| 555 | 555 | 'isfolder' => 0 |
| 556 | - ), $modx->getFullTableName('site_content'), 'id=' . $parentOld);
|
|
| 556 | + ), $modx->getFullTableName('site_content'), 'id='.$parentOld);
|
|
| 557 | 557 | } |
| 558 | 558 | } |
| 559 | 559 | |
@@ -561,7 +561,7 @@ discard block |
||
| 561 | 561 | if (!empty($menuindex)) {
|
| 562 | 562 | $menuindex = explode(',', $menuindex);
|
| 563 | 563 | foreach ($menuindex as $key => $value) {
|
| 564 | - $modx->db->query('UPDATE ' . $modx->getFullTableName('site_content') . ' SET menuindex=' . $key . ' WHERE id=' . $value);
|
|
| 564 | + $modx->db->query('UPDATE '.$modx->getFullTableName('site_content').' SET menuindex='.$key.' WHERE id='.$value);
|
|
| 565 | 565 | } |
| 566 | 566 | } else {
|
| 567 | 567 | // TODO: max(*) menuindex |
@@ -590,19 +590,19 @@ discard block |
||
| 590 | 590 | } |
| 591 | 591 | |
| 592 | 592 | case 'getLockedElements': {
|
| 593 | - $type = isset($_REQUEST['type']) ? (int)$_REQUEST['type'] : 0; |
|
| 594 | - $id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0; |
|
| 593 | + $type = isset($_REQUEST['type']) ? (int) $_REQUEST['type'] : 0; |
|
| 594 | + $id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0; |
|
| 595 | 595 | |
| 596 | 596 | $output = !!$modx->elementIsLocked($type, $id, true); |
| 597 | 597 | |
| 598 | 598 | if (!$output) {
|
| 599 | 599 | $docgrp = (isset($_SESSION['mgrDocgroups']) && is_array($_SESSION['mgrDocgroups'])) ? implode(',', $_SESSION['mgrDocgroups']) : '';
|
| 600 | - $docgrp_cond = $docgrp ? ' OR dg.document_group IN (' . $docgrp . ')' : '';
|
|
| 600 | + $docgrp_cond = $docgrp ? ' OR dg.document_group IN ('.$docgrp.')' : '';
|
|
| 601 | 601 | $sql = ' |
| 602 | - SELECT MAX(IF(1=' . $role . ' OR sc.privatemgr=0' . $docgrp_cond . ', 0, 1)) AS locked |
|
| 603 | - FROM ' . $modx->getFullTableName('site_content') . ' AS sc
|
|
| 604 | - LEFT JOIN ' . $modx->getFullTableName('document_groups') . ' dg ON dg.document=sc.id
|
|
| 605 | - WHERE sc.id=' . $id . ' GROUP BY sc.id'; |
|
| 602 | + SELECT MAX(IF(1=' . $role.' OR sc.privatemgr=0'.$docgrp_cond.', 0, 1)) AS locked |
|
| 603 | + FROM ' . $modx->getFullTableName('site_content').' AS sc
|
|
| 604 | + LEFT JOIN ' . $modx->getFullTableName('document_groups').' dg ON dg.document=sc.id
|
|
| 605 | + WHERE sc.id=' . $id.' GROUP BY sc.id'; |
|
| 606 | 606 | $sql = $modx->db->query($sql); |
| 607 | 607 | if ($modx->db->getRecordCount($sql)) {
|
| 608 | 608 | $row = $modx->db->getRow($sql); |
@@ -6,8 +6,8 @@ discard block |
||
| 6 | 6 | <tr> |
| 7 | 7 | <td nowrap class="warning"><?php echo $_lang['udperms_title'] ?><br><small>[(use_udperms)]</small></td> |
| 8 | 8 | <td> |
| 9 | - <?php echo wrap_label($_lang['yes'],form_radio('use_udperms', 1, 'id="udPermsOn"'));?><br />
|
|
| 10 | - <?php echo wrap_label($_lang['no'], form_radio('use_udperms', 0, 'id="udPermsOff"'));?>
|
|
| 9 | + <?php echo wrap_label($_lang['yes'], form_radio('use_udperms', 1, 'id="udPermsOn"')); ?><br />
|
|
| 10 | + <?php echo wrap_label($_lang['no'], form_radio('use_udperms', 0, 'id="udPermsOff"')); ?>
|
|
| 11 | 11 | </td> |
| 12 | 12 | </tr> |
| 13 | 13 | <tr> |
@@ -17,16 +17,16 @@ discard block |
||
| 17 | 17 | <tr> |
| 18 | 18 | <td colspan="2"><div class="split"></div></td> |
| 19 | 19 | </tr> |
| 20 | - <tr class="udPerms" <?php echo showHide($use_udperms==1);?>> |
|
| 20 | + <tr class="udPerms" <?php echo showHide($use_udperms == 1); ?>> |
|
| 21 | 21 | <td nowrap class="warning"><?php echo $_lang['udperms_allowroot_title'] ?><br><small>[(udperms_allowroot)]</small></td> |
| 22 | 22 | <td> |
| 23 | - <label><input type="radio" name="udperms_allowroot" value="1" <?php echo $udperms_allowroot=='1' ? 'checked="checked"' : "" ; ?> /> |
|
| 23 | + <label><input type="radio" name="udperms_allowroot" value="1" <?php echo $udperms_allowroot == '1' ? 'checked="checked"' : ""; ?> /> |
|
| 24 | 24 | <?php echo $_lang['yes']?></label><br /> |
| 25 | - <label><input type="radio" name="udperms_allowroot" value="0" <?php echo $udperms_allowroot=='0' ? 'checked="checked"' : "" ; ?> /> |
|
| 25 | + <label><input type="radio" name="udperms_allowroot" value="0" <?php echo $udperms_allowroot == '0' ? 'checked="checked"' : ""; ?> /> |
|
| 26 | 26 | <?php echo $_lang['no']?></label> |
| 27 | 27 | </td> |
| 28 | 28 | </tr> |
| 29 | - <tr class="udPerms" <?php echo showHide($use_udperms==1);?>> |
|
| 29 | + <tr class="udPerms" <?php echo showHide($use_udperms == 1); ?>> |
|
| 30 | 30 | <td width="200"> </td> |
| 31 | 31 | <td class="comment"><?php echo $_lang['udperms_allowroot_message'] ?></td> |
| 32 | 32 | </tr> |
@@ -37,9 +37,9 @@ discard block |
||
| 37 | 37 | <tr> |
| 38 | 38 | <td nowrap class="warning"><?php echo $_lang['email_sender_method'] ?><br><small>[(email_sender_method)]</small></td> |
| 39 | 39 | <td> |
| 40 | - <label><input type="radio" name="email_sender_method" value="1" <?php echo $email_sender_method=='1' ? 'checked="checked"' : "" ; ?> /> |
|
| 40 | + <label><input type="radio" name="email_sender_method" value="1" <?php echo $email_sender_method == '1' ? 'checked="checked"' : ""; ?> /> |
|
| 41 | 41 | <?php echo $_lang['auto']?></label><br /> |
| 42 | - <label><input type="radio" name="email_sender_method" value="0" <?php echo $email_sender_method=='0' ? 'checked="checked"' : "" ; ?> /> |
|
| 42 | + <label><input type="radio" name="email_sender_method" value="0" <?php echo $email_sender_method == '0' ? 'checked="checked"' : ""; ?> /> |
|
| 43 | 43 | <?php echo $_lang['use_emailsender']?></label> |
| 44 | 44 | </td> |
| 45 | 45 | </tr> |
@@ -55,10 +55,10 @@ discard block |
||
| 55 | 55 | <tr> |
| 56 | 56 | <td nowrap class="warning"><?php echo $_lang['email_method_title'] ?><br><small>[(email_method)]</small></td> |
| 57 | 57 | <td> |
| 58 | - <?php echo wrap_label($_lang['email_method_mail'],form_radio('email_method','mail','id="useMail"'));?><br />
|
|
| 59 | - <?php echo wrap_label($_lang['email_method_smtp'],form_radio('email_method','smtp','id="useSmtp"'));?>
|
|
| 60 | - <div class="smtpRow" <?php echo showHide($email_method=='smtp');?>> |
|
| 61 | - <?php include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/snippet_smtp.inc.php'); ?> |
|
| 58 | + <?php echo wrap_label($_lang['email_method_mail'], form_radio('email_method', 'mail', 'id="useMail"')); ?><br />
|
|
| 59 | + <?php echo wrap_label($_lang['email_method_smtp'], form_radio('email_method', 'smtp', 'id="useSmtp"')); ?>
|
|
| 60 | + <div class="smtpRow" <?php echo showHide($email_method == 'smtp'); ?>> |
|
| 61 | + <?php include_once(MODX_MANAGER_PATH.'actions/mutate_settings/snippet_smtp.inc.php'); ?> |
|
| 62 | 62 | </div> |
| 63 | 63 | </td> |
| 64 | 64 | </tr> |
@@ -70,11 +70,11 @@ discard block |
||
| 70 | 70 | <br /> |
| 71 | 71 | <p><?php echo $_lang['update_settings_from_language']; ?></p> |
| 72 | 72 | <select name="reload_emailsubject" id="reload_emailsubject_select" onchange="confirmLangChange(this, 'emailsubject_default', 'emailsubject_field');"> |
| 73 | -<?php echo get_lang_options('emailsubject_default');?>
|
|
| 73 | +<?php echo get_lang_options('emailsubject_default'); ?>
|
|
| 74 | 74 | </select> |
| 75 | 75 | </td> |
| 76 | 76 | <td ><input id="emailsubject_field" name="emailsubject" onchange="documentDirty=true;" type="text" maxlength="255" style="width: 250px;" value="<?php echo $emailsubject; ?>" /> |
| 77 | - <input type="hidden" name="emailsubject_default" id="emailsubject_default_hidden" value="<?php echo addslashes($_lang['emailsubject_default']);?>" /> |
|
| 77 | + <input type="hidden" name="emailsubject_default" id="emailsubject_default_hidden" value="<?php echo addslashes($_lang['emailsubject_default']); ?>" /> |
|
| 78 | 78 | </td> |
| 79 | 79 | </tr> |
| 80 | 80 | <tr> |
@@ -89,11 +89,11 @@ discard block |
||
| 89 | 89 | <br /> |
| 90 | 90 | <p><?php echo $_lang['update_settings_from_language']; ?></p> |
| 91 | 91 | <select name="reload_signupemail_message" id="reload_signupemail_message_select" onchange="confirmLangChange(this, 'system_email_signup', 'signupemail_message_textarea');"> |
| 92 | -<?php echo get_lang_options('system_email_signup');?>
|
|
| 92 | +<?php echo get_lang_options('system_email_signup'); ?>
|
|
| 93 | 93 | </select> |
| 94 | 94 | </td> |
| 95 | 95 | <td> <textarea id="signupemail_message_textarea" name="signupemail_message" style="width:100%; height: 120px;"><?php echo $signupemail_message; ?></textarea> |
| 96 | - <input type="hidden" name="system_email_signup_default" id="system_email_signup_hidden" value="<?php echo addslashes($_lang['system_email_signup']);?>" /> |
|
| 96 | + <input type="hidden" name="system_email_signup_default" id="system_email_signup_hidden" value="<?php echo addslashes($_lang['system_email_signup']); ?>" /> |
|
| 97 | 97 | </td> |
| 98 | 98 | </tr> |
| 99 | 99 | <tr> |
@@ -108,11 +108,11 @@ discard block |
||
| 108 | 108 | <br /> |
| 109 | 109 | <p><?php echo $_lang['update_settings_from_language']; ?></p> |
| 110 | 110 | <select name="reload_websignupemail_message" id="reload_websignupemail_message_select" onchange="confirmLangChange(this, 'system_email_websignup', 'websignupemail_message_textarea');"> |
| 111 | -<?php echo get_lang_options('system_email_websignup');?>
|
|
| 111 | +<?php echo get_lang_options('system_email_websignup'); ?>
|
|
| 112 | 112 | </select> |
| 113 | 113 | </td> |
| 114 | 114 | <td> <textarea id="websignupemail_message_textarea" name="websignupemail_message" style="width:100%; height: 120px;"><?php echo $websignupemail_message; ?></textarea> |
| 115 | - <input type="hidden" name="system_email_websignup_default" id="system_email_websignup_hidden" value="<?php echo addslashes($_lang['system_email_websignup']);?>" /> |
|
| 115 | + <input type="hidden" name="system_email_websignup_default" id="system_email_websignup_hidden" value="<?php echo addslashes($_lang['system_email_websignup']); ?>" /> |
|
| 116 | 116 | </td> |
| 117 | 117 | </tr> |
| 118 | 118 | <tr> |
@@ -127,11 +127,11 @@ discard block |
||
| 127 | 127 | <br /> |
| 128 | 128 | <p><?php echo $_lang['update_settings_from_language']; ?></p> |
| 129 | 129 | <select name="reload_system_email_webreminder_message" id="reload_system_email_webreminder_select" onchange="confirmLangChange(this, 'system_email_webreminder', 'system_email_webreminder_textarea');"> |
| 130 | -<?php echo get_lang_options('system_email_webreminder');?>
|
|
| 130 | +<?php echo get_lang_options('system_email_webreminder'); ?>
|
|
| 131 | 131 | </select> |
| 132 | 132 | </td> |
| 133 | 133 | <td> <textarea id="system_email_webreminder_textarea" name="webpwdreminder_message" style="width:100%; height: 120px;"><?php echo $webpwdreminder_message; ?></textarea> |
| 134 | - <input type="hidden" name="system_email_webreminder_default" id="system_email_webreminder_hidden" value="<?php echo addslashes($_lang['system_email_webreminder']);?>" /> |
|
| 134 | + <input type="hidden" name="system_email_webreminder_default" id="system_email_webreminder_hidden" value="<?php echo addslashes($_lang['system_email_webreminder']); ?>" /> |
|
| 135 | 135 | </td> |
| 136 | 136 | </tr> |
| 137 | 137 | <tr> |
@@ -144,8 +144,8 @@ discard block |
||
| 144 | 144 | <tr> |
| 145 | 145 | <td nowrap class="warning" valign="top"><?php echo $_lang['allow_multiple_emails_title'] ?><br><small>[(allow_multiple_emails)]</small></td> |
| 146 | 146 | <td> |
| 147 | - <?php echo wrap_label($_lang['yes'],form_radio('allow_multiple_emails','1'));?><br />
|
|
| 148 | - <?php echo wrap_label($_lang['no'], form_radio('allow_multiple_emails','0'));?>
|
|
| 147 | + <?php echo wrap_label($_lang['yes'], form_radio('allow_multiple_emails', '1')); ?><br />
|
|
| 148 | + <?php echo wrap_label($_lang['no'], form_radio('allow_multiple_emails', '0')); ?>
|
|
| 149 | 149 | </td> |
| 150 | 150 | </tr> |
| 151 | 151 | <tr> |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | <?php |
| 158 | 158 | // invoke OnUserSettingsRender event |
| 159 | 159 | $evtOut = $modx->invokeEvent('OnUserSettingsRender');
|
| 160 | - if(is_array($evtOut)) echo implode("",$evtOut);
|
|
| 160 | + if (is_array($evtOut)) echo implode("", $evtOut);
|
|
| 161 | 161 | ?> |
| 162 | 162 | </td> |
| 163 | 163 | </tr> |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | $MODX_SITE_HOSTNAMES = MODX_SITE_HOSTNAMES; // Fix for PHP 5.4 |
| 3 | - if(empty($valid_hostnames) && empty($MODX_SITE_HOSTNAMES)) {
|
|
| 3 | + if (empty($valid_hostnames) && empty($MODX_SITE_HOSTNAMES)) {
|
|
| 4 | 4 | $valid_hostnames = $_SERVER['HTTP_HOST']; |
| 5 | 5 | } else {
|
| 6 | 6 | $valid_hostnames = $MODX_SITE_HOSTNAMES; |
@@ -15,10 +15,10 @@ discard block |
||
| 15 | 15 | <tr> |
| 16 | 16 | <th><?php echo $_lang['allow_eval_title']; ?><br><small>[(allow_eval)]</small></th> |
| 17 | 17 | <td> |
| 18 | -<?php echo wrap_label($_lang['allow_eval_with_scan'] , form_radio('allow_eval','with_scan'));?><br />
|
|
| 19 | -<?php echo wrap_label($_lang['allow_eval_with_scan_at_post'] , form_radio('allow_eval','with_scan_at_post'));?><br />
|
|
| 20 | -<?php echo wrap_label($_lang['allow_eval_everytime_eval'] , form_radio('allow_eval','everytime_eval'));?><br />
|
|
| 21 | -<?php echo wrap_label($_lang['allow_eval_dont_eval'] , form_radio('allow_eval','dont_eval'));?>
|
|
| 18 | +<?php echo wrap_label($_lang['allow_eval_with_scan'], form_radio('allow_eval', 'with_scan')); ?><br />
|
|
| 19 | +<?php echo wrap_label($_lang['allow_eval_with_scan_at_post'], form_radio('allow_eval', 'with_scan_at_post')); ?><br />
|
|
| 20 | +<?php echo wrap_label($_lang['allow_eval_everytime_eval'], form_radio('allow_eval', 'everytime_eval')); ?><br />
|
|
| 21 | +<?php echo wrap_label($_lang['allow_eval_dont_eval'], form_radio('allow_eval', 'dont_eval')); ?>
|
|
| 22 | 22 | <div class="comment"> |
| 23 | 23 | <?php echo $_lang['allow_eval_msg'] ?> |
| 24 | 24 | </div> |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | <tr> |
| 44 | 44 | <th><?php echo $_lang['check_files_onlogin_title'] ?><br><small>[(check_files_onlogin)]</small></th> |
| 45 | 45 | <td> |
| 46 | - <textarea name="check_files_onlogin"><?php echo $check_files_onlogin;?></textarea><br /> |
|
| 46 | + <textarea name="check_files_onlogin"><?php echo $check_files_onlogin; ?></textarea><br /> |
|
| 47 | 47 | |
| 48 | 48 | </td> |
| 49 | 49 | </tr> |
@@ -53,8 +53,8 @@ discard block |
||
| 53 | 53 | <tr> |
| 54 | 54 | <td nowrap class="warning"><?php echo $_lang['validate_referer_title'] ?><br><small>[(validate_referer)]</small></td> |
| 55 | 55 | <td> |
| 56 | - <?php echo wrap_label($_lang['yes'],form_radio('validate_referer', 1));?><br />
|
|
| 57 | - <?php echo wrap_label($_lang['no'], form_radio('validate_referer', 0));?>
|
|
| 56 | + <?php echo wrap_label($_lang['yes'], form_radio('validate_referer', 1)); ?><br />
|
|
| 57 | + <?php echo wrap_label($_lang['no'], form_radio('validate_referer', 0)); ?>
|
|
| 58 | 58 | </td> |
| 59 | 59 | </tr> |
| 60 | 60 | <tr> |
@@ -89,25 +89,25 @@ discard block |
||
| 89 | 89 | <tr> |
| 90 | 90 | <th><?php echo $_lang['a17_error_reporting_title']; ?><br><small>[(error_reporting)]</small></th> |
| 91 | 91 | <td> |
| 92 | -<?php echo wrap_label($_lang['a17_error_reporting_opt0'], form_radio('error_reporting','0'));?><br />
|
|
| 93 | -<?php echo wrap_label($_lang['a17_error_reporting_opt1'], form_radio('error_reporting','1'));?><br />
|
|
| 94 | -<?php echo wrap_label($_lang['a17_error_reporting_opt2'], form_radio('error_reporting','2'));?><br />
|
|
| 95 | -<?php echo wrap_label($_lang['a17_error_reporting_opt99'],form_radio('error_reporting','99'));?>
|
|
| 92 | +<?php echo wrap_label($_lang['a17_error_reporting_opt0'], form_radio('error_reporting', '0')); ?><br />
|
|
| 93 | +<?php echo wrap_label($_lang['a17_error_reporting_opt1'], form_radio('error_reporting', '1')); ?><br />
|
|
| 94 | +<?php echo wrap_label($_lang['a17_error_reporting_opt2'], form_radio('error_reporting', '2')); ?><br />
|
|
| 95 | +<?php echo wrap_label($_lang['a17_error_reporting_opt99'], form_radio('error_reporting', '99')); ?>
|
|
| 96 | 96 | </td> |
| 97 | 97 | </tr> |
| 98 | 98 | <tr> |
| 99 | 99 | <td width="200"> </td> |
| 100 | - <td class="comment"> <?php echo $_lang['a17_error_reporting_msg'];?></td> |
|
| 100 | + <td class="comment"> <?php echo $_lang['a17_error_reporting_msg']; ?></td> |
|
| 101 | 101 | </tr> |
| 102 | 102 | <tr><td colspan="2"><div class="split"></div></td></tr> |
| 103 | 103 | <tr> |
| 104 | 104 | <th><?php echo $_lang['mutate_settings.dynamic.php6']; ?><br><small>[(send_errormail)]</small></th> |
| 105 | 105 | <td> |
| 106 | -<?php echo wrap_label($_lang['mutate_settings.dynamic.php7'],form_radio('send_errormail','0'));?><br />
|
|
| 107 | -<?php echo wrap_label('error',form_radio('send_errormail','3'));?><br />
|
|
| 108 | -<?php echo wrap_label('error + warning',form_radio('send_errormail','2'));?><br />
|
|
| 109 | -<?php echo wrap_label('error + warning + information',form_radio('send_errormail','1'));?><br />
|
|
| 110 | -<?php echo parseText($_lang['mutate_settings.dynamic.php8'],array('emailsender'=>$modx->config['emailsender']));?></td>
|
|
| 106 | +<?php echo wrap_label($_lang['mutate_settings.dynamic.php7'], form_radio('send_errormail', '0')); ?><br />
|
|
| 107 | +<?php echo wrap_label('error', form_radio('send_errormail', '3')); ?><br />
|
|
| 108 | +<?php echo wrap_label('error + warning', form_radio('send_errormail', '2')); ?><br />
|
|
| 109 | +<?php echo wrap_label('error + warning + information', form_radio('send_errormail', '1')); ?><br />
|
|
| 110 | +<?php echo parseText($_lang['mutate_settings.dynamic.php8'], array('emailsender'=>$modx->config['emailsender'])); ?></td>
|
|
| 111 | 111 | </tr> |
| 112 | 112 | <tr> |
| 113 | 113 | <td colspan="2"><div class="split"></div></td> |
@@ -115,8 +115,8 @@ discard block |
||
| 115 | 115 | <tr> |
| 116 | 116 | <th><?php echo $_lang['enable_bindings_title'] ?><br><small>[(enable_bindings)]</small></th> |
| 117 | 117 | <td> |
| 118 | -<?php echo wrap_label($_lang['yes'],form_radio('enable_bindings','1'));?><br />
|
|
| 119 | -<?php echo wrap_label($_lang['no'], form_radio('enable_bindings','0'));?>
|
|
| 118 | +<?php echo wrap_label($_lang['yes'], form_radio('enable_bindings', '1')); ?><br />
|
|
| 119 | +<?php echo wrap_label($_lang['no'], form_radio('enable_bindings', '0')); ?>
|
|
| 120 | 120 | |
| 121 | 121 | </td> |
| 122 | 122 | </tr> |
@@ -157,20 +157,20 @@ discard block |
||
| 157 | 157 | <th><?php echo $_lang['pwd_hash_algo_title'] ?><br><small>[(pwd_hash_algo)]</small></th> |
| 158 | 158 | <td> |
| 159 | 159 | <?php |
| 160 | -if(empty($pwd_hash_algo)) $phm['sel']['UNCRYPT'] = 1; |
|
| 161 | -$phm['e']['BLOWFISH_Y'] = $modx->manager->checkHashAlgorithm('BLOWFISH_Y') ? 0:1;
|
|
| 162 | -$phm['e']['BLOWFISH_A'] = $modx->manager->checkHashAlgorithm('BLOWFISH_A') ? 0:1;
|
|
| 163 | -$phm['e']['SHA512'] = $modx->manager->checkHashAlgorithm('SHA512') ? 0:1;
|
|
| 164 | -$phm['e']['SHA256'] = $modx->manager->checkHashAlgorithm('SHA256') ? 0:1;
|
|
| 165 | -$phm['e']['MD5'] = $modx->manager->checkHashAlgorithm('MD5') ? 0:1;
|
|
| 166 | -$phm['e']['UNCRYPT'] = $modx->manager->checkHashAlgorithm('UNCRYPT') ? 0:1;
|
|
| 160 | +if (empty($pwd_hash_algo)) $phm['sel']['UNCRYPT'] = 1; |
|
| 161 | +$phm['e']['BLOWFISH_Y'] = $modx->manager->checkHashAlgorithm('BLOWFISH_Y') ? 0 : 1;
|
|
| 162 | +$phm['e']['BLOWFISH_A'] = $modx->manager->checkHashAlgorithm('BLOWFISH_A') ? 0 : 1;
|
|
| 163 | +$phm['e']['SHA512'] = $modx->manager->checkHashAlgorithm('SHA512') ? 0 : 1;
|
|
| 164 | +$phm['e']['SHA256'] = $modx->manager->checkHashAlgorithm('SHA256') ? 0 : 1;
|
|
| 165 | +$phm['e']['MD5'] = $modx->manager->checkHashAlgorithm('MD5') ? 0 : 1;
|
|
| 166 | +$phm['e']['UNCRYPT'] = $modx->manager->checkHashAlgorithm('UNCRYPT') ? 0 : 1;
|
|
| 167 | 167 | ?> |
| 168 | -<?php echo wrap_label('CRYPT_BLOWFISH_Y (salt & stretch)',form_radio('pwd_hash_algo','BLOWFISH_Y', '', $phm['e']['BLOWFISH_Y']));?><br />
|
|
| 169 | -<?php echo wrap_label('CRYPT_BLOWFISH_A (salt & stretch)',form_radio('pwd_hash_algo','BLOWFISH_A', '', $phm['e']['BLOWFISH_A']));?><br />
|
|
| 170 | -<?php echo wrap_label('CRYPT_SHA512 (salt & stretch)' ,form_radio('pwd_hash_algo','SHA512' , '', $phm['e']['SHA512']));?><br />
|
|
| 171 | -<?php echo wrap_label('CRYPT_SHA256 (salt & stretch)' ,form_radio('pwd_hash_algo','SHA256' , '', $phm['e']['SHA256']));?><br />
|
|
| 172 | -<?php echo wrap_label('CRYPT_MD5 (salt & stretch)' ,form_radio('pwd_hash_algo','MD5' , '', $phm['e']['MD5']));?><br />
|
|
| 173 | -<?php echo wrap_label('UNCRYPT(32 chars salt + SHA-1 hash)' ,form_radio('pwd_hash_algo','UNCRYPT' , '', $phm['e']['UNCRYPT']));?>
|
|
| 168 | +<?php echo wrap_label('CRYPT_BLOWFISH_Y (salt & stretch)', form_radio('pwd_hash_algo', 'BLOWFISH_Y', '', $phm['e']['BLOWFISH_Y'])); ?><br />
|
|
| 169 | +<?php echo wrap_label('CRYPT_BLOWFISH_A (salt & stretch)', form_radio('pwd_hash_algo', 'BLOWFISH_A', '', $phm['e']['BLOWFISH_A'])); ?><br />
|
|
| 170 | +<?php echo wrap_label('CRYPT_SHA512 (salt & stretch)', form_radio('pwd_hash_algo', 'SHA512', '', $phm['e']['SHA512'])); ?><br />
|
|
| 171 | +<?php echo wrap_label('CRYPT_SHA256 (salt & stretch)', form_radio('pwd_hash_algo', 'SHA256', '', $phm['e']['SHA256'])); ?><br />
|
|
| 172 | +<?php echo wrap_label('CRYPT_MD5 (salt & stretch)', form_radio('pwd_hash_algo', 'MD5', '', $phm['e']['MD5'])); ?><br />
|
|
| 173 | +<?php echo wrap_label('UNCRYPT(32 chars salt + SHA-1 hash)', form_radio('pwd_hash_algo', 'UNCRYPT', '', $phm['e']['UNCRYPT'])); ?>
|
|
| 174 | 174 | </td> |
| 175 | 175 | </tr> |
| 176 | 176 | <tr> |
@@ -186,13 +186,13 @@ discard block |
||
| 186 | 186 | ?> |
| 187 | 187 | <?php |
| 188 | 188 | $gdAvailable = extension_loaded('gd');
|
| 189 | -if(!$gdAvailable) $use_captcha = 0; |
|
| 189 | +if (!$gdAvailable) $use_captcha = 0; |
|
| 190 | 190 | ?> |
| 191 | 191 | <tr> |
| 192 | 192 | <td nowrap class="warning"><?php echo $_lang['captcha_title'] ?><br><small>[(use_captcha)]</small></td> |
| 193 | - <td> <label><input type="radio" id="captchaOn" name="use_captcha" value="1" <?php echo ($use_captcha==1) ? 'checked="checked"' : "" ; echo (!$gdAvailable)? ' readonly="readonly"' : ''; ?> /> |
|
| 193 | + <td> <label><input type="radio" id="captchaOn" name="use_captcha" value="1" <?php echo ($use_captcha == 1) ? 'checked="checked"' : ""; echo (!$gdAvailable) ? ' readonly="readonly"' : ''; ?> /> |
|
| 194 | 194 | <?php echo $_lang['yes']?></label><br /> |
| 195 | - <label><input type="radio" id="captchaOff" name="use_captcha" value="0" <?php echo ($use_captcha==0) ? 'checked="checked"' : "" ; echo (!$gdAvailable)? ' readonly="readonly"' : '';?> /> |
|
| 195 | + <label><input type="radio" id="captchaOff" name="use_captcha" value="0" <?php echo ($use_captcha == 0) ? 'checked="checked"' : ""; echo (!$gdAvailable) ? ' readonly="readonly"' : ''; ?> /> |
|
| 196 | 196 | <?php echo $_lang['no']?></label> </td> |
| 197 | 197 | </tr> |
| 198 | 198 | <tr> |
@@ -202,23 +202,23 @@ discard block |
||
| 202 | 202 | <tr> |
| 203 | 203 | <td colspan="2"><div class="split"></div></td> |
| 204 | 204 | </tr> |
| 205 | - <tr class="captchaRow" <?php echo showHide($use_captcha==1);?>> |
|
| 205 | + <tr class="captchaRow" <?php echo showHide($use_captcha == 1); ?>> |
|
| 206 | 206 | <td nowrap class="warning"><?php echo $_lang['captcha_words_title'] ?><br><small>[(captcha_words)]</small> |
| 207 | 207 | <br /> |
| 208 | 208 | <p><?php echo $_lang['update_settings_from_language']; ?></p> |
| 209 | 209 | <select name="reload_captcha_words" id="reload_captcha_words_select" onchange="confirmLangChange(this, 'captcha_words_default', 'captcha_words_input');"> |
| 210 | -<?php echo get_lang_options('captcha_words_default');?>
|
|
| 210 | +<?php echo get_lang_options('captcha_words_default'); ?>
|
|
| 211 | 211 | </select> |
| 212 | 212 | </td> |
| 213 | 213 | <td><input type="text" id="captcha_words_input" name="captcha_words" style="width:250px" value="<?php echo $captcha_words; ?>" /> |
| 214 | - <input type="hidden" name="captcha_words_default" id="captcha_words_default_hidden" value="<?php echo addslashes($_lang['captcha_words_default']);?>" /> |
|
| 214 | + <input type="hidden" name="captcha_words_default" id="captcha_words_default_hidden" value="<?php echo addslashes($_lang['captcha_words_default']); ?>" /> |
|
| 215 | 215 | </td> |
| 216 | 216 | </tr> |
| 217 | - <tr class="captchaRow" <?php echo showHide($use_captcha==1);?>> |
|
| 217 | + <tr class="captchaRow" <?php echo showHide($use_captcha == 1); ?>> |
|
| 218 | 218 | <td width="200"> </td> |
| 219 | 219 | <td class="comment"><?php echo $_lang['captcha_words_message'] ?></td> |
| 220 | 220 | </tr> |
| 221 | - <tr class="captchaRow" <?php echo showHide($use_captcha==1);?>> |
|
| 221 | + <tr class="captchaRow" <?php echo showHide($use_captcha == 1); ?>> |
|
| 222 | 222 | <td colspan="2"><div class="split"></div></td> |
| 223 | 223 | </tr> |
| 224 | 224 | <tr> |
@@ -226,7 +226,7 @@ discard block |
||
| 226 | 226 | <?php |
| 227 | 227 | // invoke OnMiscSettingsRender event |
| 228 | 228 | $evtOut = $modx->invokeEvent('OnSecuritySettingsRender');
|
| 229 | - if(is_array($evtOut)) echo implode("",$evtOut);
|
|
| 229 | + if (is_array($evtOut)) echo implode("", $evtOut);
|
|
| 230 | 230 | ?> |
| 231 | 231 | </td> |
| 232 | 232 | </tr> |
@@ -113,7 +113,7 @@ |
||
| 113 | 113 | <?php |
| 114 | 114 | // invoke OnMiscSettingsRender event |
| 115 | 115 | $evtOut = $modx->invokeEvent('OnFileManagerSettingsRender');
|
| 116 | - if(is_array($evtOut)) echo implode("",$evtOut);
|
|
| 116 | + if (is_array($evtOut)) echo implode("", $evtOut);
|
|
| 117 | 117 | ?> |
| 118 | 118 | </td> |
| 119 | 119 | </tr> |
@@ -1,35 +1,35 @@ 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 | 6 | /********************/ |
| 7 | -$sd = isset($_REQUEST['dir']) ? '&dir=' . $_REQUEST['dir'] : '&dir=DESC'; |
|
| 8 | -$sb = isset($_REQUEST['sort']) ? '&sort=' . $_REQUEST['sort'] : '&sort=createdon'; |
|
| 9 | -$pg = isset($_REQUEST['page']) ? '&page=' . (int) $_REQUEST['page'] : ''; |
|
| 10 | -$add_path = $sd . $sb . $pg; |
|
| 7 | +$sd = isset($_REQUEST['dir']) ? '&dir='.$_REQUEST['dir'] : '&dir=DESC'; |
|
| 8 | +$sb = isset($_REQUEST['sort']) ? '&sort='.$_REQUEST['sort'] : '&sort=createdon'; |
|
| 9 | +$pg = isset($_REQUEST['page']) ? '&page='.(int) $_REQUEST['page'] : ''; |
|
| 10 | +$add_path = $sd.$sb.$pg; |
|
| 11 | 11 | /*******************/ |
| 12 | 12 | |
| 13 | 13 | // check permissions |
| 14 | -switch($modx->manager->action) { |
|
| 14 | +switch ($modx->manager->action) { |
|
| 15 | 15 | case 27: |
| 16 | - if(!$modx->hasPermission('edit_document')) { |
|
| 16 | + if (!$modx->hasPermission('edit_document')) { |
|
| 17 | 17 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
| 18 | 18 | } |
| 19 | 19 | break; |
| 20 | 20 | case 85: |
| 21 | 21 | case 72: |
| 22 | 22 | case 4: |
| 23 | - if(!$modx->hasPermission('new_document')) { |
|
| 23 | + if (!$modx->hasPermission('new_document')) { |
|
| 24 | 24 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
| 25 | - } elseif(isset($_REQUEST['pid']) && $_REQUEST['pid'] != '0') { |
|
| 25 | + } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '0') { |
|
| 26 | 26 | // check user has permissions for parent |
| 27 | - include_once(MODX_MANAGER_PATH . 'processors/user_documents_permissions.class.php'); |
|
| 27 | + include_once(MODX_MANAGER_PATH.'processors/user_documents_permissions.class.php'); |
|
| 28 | 28 | $udperms = new udperms(); |
| 29 | 29 | $udperms->user = $modx->getLoginUserID(); |
| 30 | 30 | $udperms->document = empty($_REQUEST['pid']) ? 0 : $_REQUEST['pid']; |
| 31 | 31 | $udperms->role = $_SESSION['mgrRole']; |
| 32 | - if(!$udperms->checkPermissions()) { |
|
| 32 | + if (!$udperms->checkPermissions()) { |
|
| 33 | 33 | $modx->webAlertAndQuit($_lang["access_permission_denied"]); |
| 34 | 34 | } |
| 35 | 35 | } |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
| 39 | 39 | } |
| 40 | 40 | |
| 41 | -$id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0; |
|
| 41 | +$id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0; |
|
| 42 | 42 | |
| 43 | 43 | // Get table names (alphabetical) |
| 44 | 44 | $tbl_categories = $modx->getFullTableName('categories'); |
@@ -53,22 +53,22 @@ discard block |
||
| 53 | 53 | $tbl_site_tmplvar_templates = $modx->getFullTableName('site_tmplvar_templates'); |
| 54 | 54 | $tbl_site_tmplvars = $modx->getFullTableName('site_tmplvars'); |
| 55 | 55 | |
| 56 | -if($modx->manager->action == 27) { |
|
| 56 | +if ($modx->manager->action == 27) { |
|
| 57 | 57 | //editing an existing document |
| 58 | 58 | // check permissions on the document |
| 59 | - include_once(MODX_MANAGER_PATH . 'processors/user_documents_permissions.class.php'); |
|
| 59 | + include_once(MODX_MANAGER_PATH.'processors/user_documents_permissions.class.php'); |
|
| 60 | 60 | $udperms = new udperms(); |
| 61 | 61 | $udperms->user = $modx->getLoginUserID(); |
| 62 | 62 | $udperms->document = $id; |
| 63 | 63 | $udperms->role = $_SESSION['mgrRole']; |
| 64 | 64 | |
| 65 | - if(!$udperms->checkPermissions()) { |
|
| 65 | + if (!$udperms->checkPermissions()) { |
|
| 66 | 66 | $modx->webAlertAndQuit($_lang["access_permission_denied"]); |
| 67 | 67 | } |
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | // check to see if resource isn't locked |
| 71 | -if($lockedEl = $modx->elementIsLocked(7, $id)) { |
|
| 71 | +if ($lockedEl = $modx->elementIsLocked(7, $id)) { |
|
| 72 | 72 | $modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['resource'])); |
| 73 | 73 | } |
| 74 | 74 | // end check for lock |
@@ -77,27 +77,27 @@ discard block |
||
| 77 | 77 | $modx->lockElement(7, $id); |
| 78 | 78 | |
| 79 | 79 | // get document groups for current user |
| 80 | -if($_SESSION['mgrDocgroups']) { |
|
| 80 | +if ($_SESSION['mgrDocgroups']) { |
|
| 81 | 81 | $docgrp = implode(',', $_SESSION['mgrDocgroups']); |
| 82 | 82 | } |
| 83 | 83 | |
| 84 | -if(!empty ($id)) { |
|
| 84 | +if (!empty ($id)) { |
|
| 85 | 85 | $access = sprintf("1='%s' OR sc.privatemgr=0", $_SESSION['mgrRole']); |
| 86 | - if($docgrp) { |
|
| 86 | + if ($docgrp) { |
|
| 87 | 87 | $access .= " OR dg.document_group IN ({$docgrp})"; |
| 88 | 88 | } |
| 89 | 89 | $rs = $modx->db->select('sc.*', "{$tbl_site_content} AS sc LEFT JOIN {$tbl_document_groups} AS dg ON dg.document=sc.id", "sc.id='{$id}' AND ({$access})"); |
| 90 | 90 | $content = array(); |
| 91 | 91 | $content = $modx->db->getRow($rs); |
| 92 | 92 | $modx->documentObject = &$content; |
| 93 | - if(!$content) { |
|
| 93 | + if (!$content) { |
|
| 94 | 94 | $modx->webAlertAndQuit($_lang["access_permission_denied"]); |
| 95 | 95 | } |
| 96 | 96 | $_SESSION['itemname'] = $content['pagetitle']; |
| 97 | 97 | } else { |
| 98 | 98 | $content = array(); |
| 99 | 99 | |
| 100 | - if(isset($_REQUEST['newtemplate'])) { |
|
| 100 | + if (isset($_REQUEST['newtemplate'])) { |
|
| 101 | 101 | $content['template'] = $_REQUEST['newtemplate']; |
| 102 | 102 | } else { |
| 103 | 103 | $content['template'] = getDefaultTemplate(); |
@@ -108,22 +108,22 @@ discard block |
||
| 108 | 108 | |
| 109 | 109 | // restore saved form |
| 110 | 110 | $formRestored = $modx->manager->loadFormValues(); |
| 111 | -if(isset($_REQUEST['newtemplate'])) { |
|
| 111 | +if (isset($_REQUEST['newtemplate'])) { |
|
| 112 | 112 | $formRestored = true; |
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | // retain form values if template was changed |
| 116 | 116 | // edited to convert pub_date and unpub_date |
| 117 | 117 | // sottwell 02-09-2006 |
| 118 | -if($formRestored == true) { |
|
| 118 | +if ($formRestored == true) { |
|
| 119 | 119 | $content = array_merge($content, $_POST); |
| 120 | 120 | $content['content'] = $_POST['ta']; |
| 121 | - if(empty ($content['pub_date'])) { |
|
| 121 | + if (empty ($content['pub_date'])) { |
|
| 122 | 122 | unset ($content['pub_date']); |
| 123 | 123 | } else { |
| 124 | 124 | $content['pub_date'] = $modx->toTimeStamp($content['pub_date']); |
| 125 | 125 | } |
| 126 | - if(empty ($content['unpub_date'])) { |
|
| 126 | + if (empty ($content['unpub_date'])) { |
|
| 127 | 127 | unset ($content['unpub_date']); |
| 128 | 128 | } else { |
| 129 | 129 | $content['unpub_date'] = $modx->toTimeStamp($content['unpub_date']); |
@@ -131,12 +131,12 @@ discard block |
||
| 131 | 131 | } |
| 132 | 132 | |
| 133 | 133 | // increase menu index if this is a new document |
| 134 | -if(!isset ($_REQUEST['id'])) { |
|
| 135 | - if(!isset ($modx->config['auto_menuindex'])) { |
|
| 134 | +if (!isset ($_REQUEST['id'])) { |
|
| 135 | + if (!isset ($modx->config['auto_menuindex'])) { |
|
| 136 | 136 | $modx->config['auto_menuindex'] = 1; |
| 137 | 137 | } |
| 138 | - if($modx->config['auto_menuindex']) { |
|
| 139 | - $pid = (int)$_REQUEST['pid']; |
|
| 138 | + if ($modx->config['auto_menuindex']) { |
|
| 139 | + $pid = (int) $_REQUEST['pid']; |
|
| 140 | 140 | $rs = $modx->db->select('count(*)', $tbl_site_content, "parent='{$pid}'"); |
| 141 | 141 | $content['menuindex'] = $modx->db->getValue($rs); |
| 142 | 142 | } else { |
@@ -144,14 +144,14 @@ discard block |
||
| 144 | 144 | } |
| 145 | 145 | } |
| 146 | 146 | |
| 147 | -if(isset ($_POST['which_editor'])) { |
|
| 147 | +if (isset ($_POST['which_editor'])) { |
|
| 148 | 148 | $modx->config['which_editor'] = $_POST['which_editor']; |
| 149 | 149 | } |
| 150 | 150 | |
| 151 | 151 | // Add lock-element JS-Script |
| 152 | 152 | $lockElementId = $id; |
| 153 | 153 | $lockElementType = 7; |
| 154 | -require_once(MODX_MANAGER_PATH . 'includes/active_user_locks.inc.php'); |
|
| 154 | +require_once(MODX_MANAGER_PATH.'includes/active_user_locks.inc.php'); |
|
| 155 | 155 | ?> |
| 156 | 156 | <script type="text/javascript"> |
| 157 | 157 | /* <![CDATA[ */ |
@@ -181,7 +181,7 @@ discard block |
||
| 181 | 181 | }, |
| 182 | 182 | cancel: function() { |
| 183 | 183 | documentDirty = false; |
| 184 | - document.location.href = 'index.php?<?=($id == 0 ? 'a=2' : 'a=3&r=1&id=' . $id . $add_path) ?>'; |
|
| 184 | + document.location.href = 'index.php?<?=($id == 0 ? 'a=2' : 'a=3&r=1&id='.$id.$add_path) ?>'; |
|
| 185 | 185 | }, |
| 186 | 186 | duplicate: function() { |
| 187 | 187 | if(confirm("<?= $_lang['confirm_resource_duplicate']?>") === true) { |
@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | } |
| 190 | 190 | }, |
| 191 | 191 | view: function() { |
| 192 | - window.open('<?= ($modx->config['friendly_urls'] == '1') ? $modx->makeUrl($id) : $modx->config['site_url'] . 'index.php?id=' . $id ?>', 'previeWin'); |
|
| 192 | + window.open('<?= ($modx->config['friendly_urls'] == '1') ? $modx->makeUrl($id) : $modx->config['site_url'].'index.php?id='.$id ?>', 'previeWin'); |
|
| 193 | 193 | } |
| 194 | 194 | }; |
| 195 | 195 | |
@@ -551,7 +551,7 @@ discard block |
||
| 551 | 551 | 'template' => $content['template'] |
| 552 | 552 | )); |
| 553 | 553 | |
| 554 | - if(is_array($evtOut)) { |
|
| 554 | + if (is_array($evtOut)) { |
|
| 555 | 555 | echo implode('', $evtOut); |
| 556 | 556 | } |
| 557 | 557 | |
@@ -575,8 +575,8 @@ discard block |
||
| 575 | 575 | <fieldset id="create_edit"> |
| 576 | 576 | |
| 577 | 577 | <h1> |
| 578 | - <i class="fa fa-pencil-square-o"></i><?php if(isset($_REQUEST['id'])) { |
|
| 579 | - echo iconv_substr($content['pagetitle'], 0, 50, $modx->config['modx_charset']) . (iconv_strlen($content['pagetitle'], $modx->config['modx_charset']) > 50 ? '...' : '') . '<small>(' . $_REQUEST['id'] . ')</small>'; |
|
| 578 | + <i class="fa fa-pencil-square-o"></i><?php if (isset($_REQUEST['id'])) { |
|
| 579 | + echo iconv_substr($content['pagetitle'], 0, 50, $modx->config['modx_charset']).(iconv_strlen($content['pagetitle'], $modx->config['modx_charset']) > 50 ? '...' : '').'<small>('.$_REQUEST['id'].')</small>'; |
|
| 580 | 580 | } else { |
| 581 | 581 | if ($modx->manager->action == '4') { |
| 582 | 582 | echo $_lang['add_resource']; |
@@ -592,36 +592,36 @@ discard block |
||
| 592 | 592 | |
| 593 | 593 | <?php |
| 594 | 594 | // breadcrumbs |
| 595 | - if($modx->config['use_breadcrumbs']) { |
|
| 595 | + if ($modx->config['use_breadcrumbs']) { |
|
| 596 | 596 | $temp = array(); |
| 597 | 597 | $title = isset($content['pagetitle']) ? $content['pagetitle'] : $_lang['create_resource_title']; |
| 598 | 598 | |
| 599 | - if(isset($_REQUEST['id']) && $content['parent'] != 0) { |
|
| 599 | + if (isset($_REQUEST['id']) && $content['parent'] != 0) { |
|
| 600 | 600 | $bID = (int) $_REQUEST['id']; |
| 601 | 601 | $temp = $modx->getParentIds($bID); |
| 602 | - } else if(isset($_REQUEST['pid'])) { |
|
| 602 | + } else if (isset($_REQUEST['pid'])) { |
|
| 603 | 603 | $bID = (int) $_REQUEST['pid']; |
| 604 | 604 | $temp = $modx->getParentIds($bID); |
| 605 | 605 | array_unshift($temp, $bID); |
| 606 | 606 | } |
| 607 | 607 | |
| 608 | - if($temp) { |
|
| 608 | + if ($temp) { |
|
| 609 | 609 | $parents = implode(',', $temp); |
| 610 | 610 | |
| 611 | - if(!empty($parents)) { |
|
| 611 | + if (!empty($parents)) { |
|
| 612 | 612 | $where = "FIND_IN_SET(id,'{$parents}') DESC"; |
| 613 | 613 | $rs = $modx->db->select('id, pagetitle', $tbl_site_content, "id IN ({$parents})", $where); |
| 614 | - while($row = $modx->db->getRow($rs)) { |
|
| 614 | + while ($row = $modx->db->getRow($rs)) { |
|
| 615 | 615 | $out .= '<li class="breadcrumbs__li"> |
| 616 | - <a href="index.php?a=27&id=' . $row['id'] . '" class="breadcrumbs__a">' . htmlspecialchars($row['pagetitle'], ENT_QUOTES, $modx->config['modx_charset']) . '</a> |
|
| 616 | + <a href="index.php?a=27&id=' . $row['id'].'" class="breadcrumbs__a">'.htmlspecialchars($row['pagetitle'], ENT_QUOTES, $modx->config['modx_charset']).'</a> |
|
| 617 | 617 | <span class="breadcrumbs__sep">></span> |
| 618 | 618 | </li>'; |
| 619 | 619 | } |
| 620 | 620 | } |
| 621 | 621 | } |
| 622 | 622 | |
| 623 | - $out .= '<li class="breadcrumbs__li breadcrumbs__li_current">' . $title . '</li>'; |
|
| 624 | - echo '<ul class="breadcrumbs">' . $out . '</ul>'; |
|
| 623 | + $out .= '<li class="breadcrumbs__li breadcrumbs__li_current">'.$title.'</li>'; |
|
| 624 | + echo '<ul class="breadcrumbs">'.$out.'</ul>'; |
|
| 625 | 625 | } |
| 626 | 626 | ?> |
| 627 | 627 | |
@@ -638,7 +638,7 @@ discard block |
||
| 638 | 638 | $evtOut = $modx->invokeEvent('OnDocFormTemplateRender', array( |
| 639 | 639 | 'id' => $id |
| 640 | 640 | )); |
| 641 | - if(is_array($evtOut)) { |
|
| 641 | + if (is_array($evtOut)) { |
|
| 642 | 642 | echo implode('', $evtOut); |
| 643 | 643 | } else { |
| 644 | 644 | ?> |
@@ -694,7 +694,7 @@ discard block |
||
| 694 | 694 | </td> |
| 695 | 695 | </tr> |
| 696 | 696 | |
| 697 | - <?php if($content['type'] == 'reference' || $modx->manager->action == '72') { // Web Link specific ?> |
|
| 697 | + <?php if ($content['type'] == 'reference' || $modx->manager->action == '72') { // Web Link specific ?> |
|
| 698 | 698 | |
| 699 | 699 | <tr> |
| 700 | 700 | <td><span class="warning"><?= $_lang['weblink'] ?></span> |
@@ -730,17 +730,17 @@ discard block |
||
| 730 | 730 | $from = "{$tbl_site_templates} AS t LEFT JOIN {$tbl_categories} AS c ON t.category = c.id"; |
| 731 | 731 | $rs = $modx->db->select($field, $from, '', 'c.category, t.templatename ASC'); |
| 732 | 732 | $currentCategory = ''; |
| 733 | - while($row = $modx->db->getRow($rs)) { |
|
| 734 | - if($row['selectable'] != 1 && $row['id'] != $content['template']) { |
|
| 733 | + while ($row = $modx->db->getRow($rs)) { |
|
| 734 | + if ($row['selectable'] != 1 && $row['id'] != $content['template']) { |
|
| 735 | 735 | continue; |
| 736 | 736 | }; |
| 737 | 737 | // Skip if not selectable but show if selected! |
| 738 | 738 | $thisCategory = $row['category']; |
| 739 | - if($thisCategory == null) { |
|
| 739 | + if ($thisCategory == null) { |
|
| 740 | 740 | $thisCategory = $_lang["no_category"]; |
| 741 | 741 | } |
| 742 | - if($thisCategory != $currentCategory) { |
|
| 743 | - if($closeOptGroup) { |
|
| 742 | + if ($thisCategory != $currentCategory) { |
|
| 743 | + if ($closeOptGroup) { |
|
| 744 | 744 | echo "\t\t\t\t\t</optgroup>\n"; |
| 745 | 745 | } |
| 746 | 746 | echo "\t\t\t\t\t<optgroup label=\"$thisCategory\">\n"; |
@@ -749,10 +749,10 @@ discard block |
||
| 749 | 749 | |
| 750 | 750 | $selectedtext = ($row['id'] == $content['template']) ? ' selected="selected"' : ''; |
| 751 | 751 | |
| 752 | - echo "\t\t\t\t\t" . '<option value="' . $row['id'] . '"' . $selectedtext . '>' . $row['templatename'] . "</option>\n"; |
|
| 752 | + echo "\t\t\t\t\t".'<option value="'.$row['id'].'"'.$selectedtext.'>'.$row['templatename']."</option>\n"; |
|
| 753 | 753 | $currentCategory = $thisCategory; |
| 754 | 754 | } |
| 755 | - if($thisCategory != '') { |
|
| 755 | + if ($thisCategory != '') { |
|
| 756 | 756 | echo "\t\t\t\t\t</optgroup>\n"; |
| 757 | 757 | } |
| 758 | 758 | ?> |
@@ -796,20 +796,20 @@ discard block |
||
| 796 | 796 | <td valign="top"> |
| 797 | 797 | <?php |
| 798 | 798 | $parentlookup = false; |
| 799 | - if(isset ($_REQUEST['id'])) { |
|
| 800 | - if($content['parent'] == 0) { |
|
| 799 | + if (isset ($_REQUEST['id'])) { |
|
| 800 | + if ($content['parent'] == 0) { |
|
| 801 | 801 | $parentname = $site_name; |
| 802 | 802 | } else { |
| 803 | 803 | $parentlookup = $content['parent']; |
| 804 | 804 | } |
| 805 | - } elseif(isset ($_REQUEST['pid'])) { |
|
| 806 | - if($_REQUEST['pid'] == 0) { |
|
| 805 | + } elseif (isset ($_REQUEST['pid'])) { |
|
| 806 | + if ($_REQUEST['pid'] == 0) { |
|
| 807 | 807 | $parentname = $site_name; |
| 808 | 808 | } else { |
| 809 | 809 | $parentlookup = $_REQUEST['pid']; |
| 810 | 810 | } |
| 811 | - } elseif(isset($_POST['parent'])) { |
|
| 812 | - if($_POST['parent'] == 0) { |
|
| 811 | + } elseif (isset($_POST['parent'])) { |
|
| 812 | + if ($_POST['parent'] == 0) { |
|
| 813 | 813 | $parentname = $site_name; |
| 814 | 814 | } else { |
| 815 | 815 | $parentlookup = $_POST['parent']; |
@@ -818,10 +818,10 @@ discard block |
||
| 818 | 818 | $parentname = $site_name; |
| 819 | 819 | $content['parent'] = 0; |
| 820 | 820 | } |
| 821 | - if($parentlookup !== false && is_numeric($parentlookup)) { |
|
| 821 | + if ($parentlookup !== false && is_numeric($parentlookup)) { |
|
| 822 | 822 | $rs = $modx->db->select('pagetitle', $tbl_site_content, "id='{$parentlookup}'"); |
| 823 | 823 | $parentname = $modx->db->getValue($rs); |
| 824 | - if(!$parentname) { |
|
| 824 | + if (!$parentname) { |
|
| 825 | 825 | $modx->webAlertAndQuit($_lang["error_no_parent"]); |
| 826 | 826 | } |
| 827 | 827 | } |
@@ -863,7 +863,7 @@ discard block |
||
| 863 | 863 | }*/ |
| 864 | 864 | ?> |
| 865 | 865 | |
| 866 | - <?php if($content['type'] == 'document' || $modx->manager->action == '4') { ?> |
|
| 866 | + <?php if ($content['type'] == 'document' || $modx->manager->action == '4') { ?> |
|
| 867 | 867 | <tr> |
| 868 | 868 | <td colspan="2"> |
| 869 | 869 | <hr> |
@@ -876,8 +876,8 @@ discard block |
||
| 876 | 876 | <?php |
| 877 | 877 | // invoke OnRichTextEditorRegister event |
| 878 | 878 | $evtOut = $modx->invokeEvent("OnRichTextEditorRegister"); |
| 879 | - if(is_array($evtOut)) { |
|
| 880 | - for($i = 0; $i < count($evtOut); $i++) { |
|
| 879 | + if (is_array($evtOut)) { |
|
| 880 | + for ($i = 0; $i < count($evtOut); $i++) { |
|
| 881 | 881 | $editor = $evtOut[$i]; |
| 882 | 882 | echo "\t\t\t", '<option value="', $editor, '"', ($modx->config['which_editor'] == $editor ? ' selected="selected"' : ''), '>', $editor, "</option>\n"; |
| 883 | 883 | } |
@@ -888,7 +888,7 @@ discard block |
||
| 888 | 888 | </div> |
| 889 | 889 | <div id="content_body"> |
| 890 | 890 | <?php |
| 891 | - if(($content['richtext'] == 1 || $modx->manager->action == '4') && $use_editor == 1) { |
|
| 891 | + if (($content['richtext'] == 1 || $modx->manager->action == '4') && $use_editor == 1) { |
|
| 892 | 892 | $htmlContent = $content['content']; |
| 893 | 893 | ?> |
| 894 | 894 | <div class="section-editor clearfix"> |
@@ -901,7 +901,7 @@ discard block |
||
| 901 | 901 | $richtexteditorIds[$modx->config['which_editor']][] = 'ta'; |
| 902 | 902 | $richtexteditorOptions[$modx->config['which_editor']]['ta'] = ''; |
| 903 | 903 | } else { |
| 904 | - echo "\t" . '<div><textarea class="phptextarea" id="ta" name="ta" rows="20" wrap="soft" onchange="documentDirty=true;">', $modx->htmlspecialchars($content['content']), '</textarea></div>' . "\n"; |
|
| 904 | + echo "\t".'<div><textarea class="phptextarea" id="ta" name="ta" rows="20" wrap="soft" onchange="documentDirty=true;">', $modx->htmlspecialchars($content['content']), '</textarea></div>'."\n"; |
|
| 905 | 905 | } |
| 906 | 906 | ?> |
| 907 | 907 | </div> |
@@ -917,7 +917,7 @@ discard block |
||
| 917 | 917 | |
| 918 | 918 | if (($content['type'] == 'document' || $modx->manager->action == '4') || ($content['type'] == 'reference' || $modx->manager->action == 72)) { |
| 919 | 919 | $template = $default_template; |
| 920 | - $group_tvs = empty($modx->config['group_tvs']) ? 0 : (int)$modx->config['group_tvs']; |
|
| 920 | + $group_tvs = empty($modx->config['group_tvs']) ? 0 : (int) $modx->config['group_tvs']; |
|
| 921 | 921 | if (isset ($_REQUEST['newtemplate'])) { |
| 922 | 922 | $template = $_REQUEST['newtemplate']; |
| 923 | 923 | } else { |
@@ -945,17 +945,17 @@ discard block |
||
| 945 | 945 | ); |
| 946 | 946 | $sort = 'tvtpl.rank,tv.rank, tv.id'; |
| 947 | 947 | if ($group_tvs) { |
| 948 | - $field .= ', IFNULL(tv.category,0) as category_id, IFNULL(cat.category,"' . $_lang['no_category'] . '") AS category, IFNULL(cat.rank,0) AS category_rank'; |
|
| 948 | + $field .= ', IFNULL(tv.category,0) as category_id, IFNULL(cat.category,"'.$_lang['no_category'].'") AS category, IFNULL(cat.rank,0) AS category_rank'; |
|
| 949 | 949 | $from .= ' |
| 950 | - LEFT JOIN ' . $tbl_categories . ' AS cat ON cat.id=tv.category'; |
|
| 951 | - $sort = 'cat.rank,cat.id,' . $sort; |
|
| 950 | + LEFT JOIN ' . $tbl_categories.' AS cat ON cat.id=tv.category'; |
|
| 951 | + $sort = 'cat.rank,cat.id,'.$sort; |
|
| 952 | 952 | } |
| 953 | 953 | $where = vsprintf("tvtpl.templateid='%s' AND (1='%s' OR ISNULL(tva.documentgroup) %s)", $vs); |
| 954 | 954 | $rs = $modx->db->select($field, $from, $where, $sort); |
| 955 | 955 | if ($modx->db->getRecordCount($rs)) { |
| 956 | 956 | $tvsArray = $modx->db->makeArray($rs, 'name'); |
| 957 | - require_once(MODX_MANAGER_PATH . 'includes/tmplvars.inc.php'); |
|
| 958 | - require_once(MODX_MANAGER_PATH . 'includes/tmplvars.commands.inc.php'); |
|
| 957 | + require_once(MODX_MANAGER_PATH.'includes/tmplvars.inc.php'); |
|
| 958 | + require_once(MODX_MANAGER_PATH.'includes/tmplvars.commands.inc.php'); |
|
| 959 | 959 | |
| 960 | 960 | $templateVariablesOutput = ''; |
| 961 | 961 | $templateVariablesGeneral = ''; |
@@ -969,8 +969,8 @@ discard block |
||
| 969 | 969 | if ($group_tvs == 1 || $group_tvs == 3) { |
| 970 | 970 | if ($i === 0) { |
| 971 | 971 | $templateVariablesOutput .= ' |
| 972 | - <div class="tab-section" id="tabTV_' . $row['category_id'] . '"> |
|
| 973 | - <div class="tab-header">' . $row['category'] . '</div> |
|
| 972 | + <div class="tab-section" id="tabTV_' . $row['category_id'].'"> |
|
| 973 | + <div class="tab-header">' . $row['category'].'</div> |
|
| 974 | 974 | <div class="tab-body tmplvars"> |
| 975 | 975 | <table>' . "\n"; |
| 976 | 976 | } else { |
@@ -979,17 +979,17 @@ discard block |
||
| 979 | 979 | </div> |
| 980 | 980 | </div> |
| 981 | 981 | |
| 982 | - <div class="tab-section" id="tabTV_' . $row['category_id'] . '"> |
|
| 983 | - <div class="tab-header">' . $row['category'] . '</div> |
|
| 982 | + <div class="tab-section" id="tabTV_' . $row['category_id'].'"> |
|
| 983 | + <div class="tab-header">' . $row['category'].'</div> |
|
| 984 | 984 | <div class="tab-body tmplvars"> |
| 985 | 985 | <table>'; |
| 986 | 986 | } |
| 987 | 987 | } else if ($group_tvs == 2 || $group_tvs == 4) { |
| 988 | 988 | if ($i === 0) { |
| 989 | 989 | $templateVariablesOutput .= ' |
| 990 | - <div id="tabTV_' . $row['category_id'] . '" class="tab-page tmplvars"> |
|
| 991 | - <h2 class="tab">' . $row['category'] . '</h2> |
|
| 992 | - <script type="text/javascript">tpTemplateVariables.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'] . '\'));</script> |
|
| 990 | + <div id="tabTV_' . $row['category_id'].'" class="tab-page tmplvars"> |
|
| 991 | + <h2 class="tab">' . $row['category'].'</h2> |
|
| 992 | + <script type="text/javascript">tpTemplateVariables.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'].'\'));</script> |
|
| 993 | 993 | |
| 994 | 994 | <div class="tab-body tmplvars"> |
| 995 | 995 | <table>'; |
@@ -999,9 +999,9 @@ discard block |
||
| 999 | 999 | </div> |
| 1000 | 1000 | </div> |
| 1001 | 1001 | |
| 1002 | - <div id="tabTV_' . $row['category_id'] . '" class="tab-page tmplvars"> |
|
| 1003 | - <h2 class="tab">' . $row['category'] . '</h2> |
|
| 1004 | - <script type="text/javascript">tpTemplateVariables.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'] . '\'));</script> |
|
| 1002 | + <div id="tabTV_' . $row['category_id'].'" class="tab-page tmplvars"> |
|
| 1003 | + <h2 class="tab">' . $row['category'].'</h2> |
|
| 1004 | + <script type="text/javascript">tpTemplateVariables.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'].'\'));</script> |
|
| 1005 | 1005 | |
| 1006 | 1006 | <div class="tab-body tmplvars"> |
| 1007 | 1007 | <table>'; |
@@ -1009,18 +1009,18 @@ discard block |
||
| 1009 | 1009 | } else if ($group_tvs == 5) { |
| 1010 | 1010 | if ($i === 0) { |
| 1011 | 1011 | $templateVariablesOutput .= ' |
| 1012 | - <div id="tabTV_' . $row['category_id'] . '" class="tab-page tmplvars"> |
|
| 1013 | - <h2 class="tab">' . $row['category'] . '</h2> |
|
| 1014 | - <script type="text/javascript">tpSettings.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'] . '\'));</script> |
|
| 1012 | + <div id="tabTV_' . $row['category_id'].'" class="tab-page tmplvars"> |
|
| 1013 | + <h2 class="tab">' . $row['category'].'</h2> |
|
| 1014 | + <script type="text/javascript">tpSettings.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'].'\'));</script> |
|
| 1015 | 1015 | <table>'; |
| 1016 | 1016 | } else { |
| 1017 | 1017 | $templateVariablesOutput .= ' |
| 1018 | 1018 | </table> |
| 1019 | 1019 | </div> |
| 1020 | 1020 | |
| 1021 | - <div id="tabTV_' . $row['category_id'] . '" class="tab-page tmplvars"> |
|
| 1022 | - <h2 class="tab">' . $row['category'] . '</h2> |
|
| 1023 | - <script type="text/javascript">tpSettings.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'] . '\'));</script> |
|
| 1021 | + <div id="tabTV_' . $row['category_id'].'" class="tab-page tmplvars"> |
|
| 1022 | + <h2 class="tab">' . $row['category'].'</h2> |
|
| 1023 | + <script type="text/javascript">tpSettings.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'].'\'));</script> |
|
| 1024 | 1024 | |
| 1025 | 1025 | <table>'; |
| 1026 | 1026 | } |
@@ -1040,8 +1040,8 @@ discard block |
||
| 1040 | 1040 | $editor = isset($tvOptions['editor']) ? $tvOptions['editor'] : $modx->config['which_editor']; |
| 1041 | 1041 | }; |
| 1042 | 1042 | // Add richtext editor to the list |
| 1043 | - $richtexteditorIds[$editor][] = "tv" . $row['id']; |
|
| 1044 | - $richtexteditorOptions[$editor]["tv" . $row['id']] = $tvOptions; |
|
| 1043 | + $richtexteditorIds[$editor][] = "tv".$row['id']; |
|
| 1044 | + $richtexteditorOptions[$editor]["tv".$row['id']] = $tvOptions; |
|
| 1045 | 1045 | } |
| 1046 | 1046 | |
| 1047 | 1047 | $templateVariablesTmp = ''; |
@@ -1058,24 +1058,24 @@ discard block |
||
| 1058 | 1058 | } |
| 1059 | 1059 | |
| 1060 | 1060 | // post back value |
| 1061 | - if (array_key_exists('tv' . $row['id'], $_POST)) { |
|
| 1062 | - if (is_array($_POST['tv' . $row['id']])) { |
|
| 1063 | - $tvPBV = implode('||', $_POST['tv' . $row['id']]); |
|
| 1061 | + if (array_key_exists('tv'.$row['id'], $_POST)) { |
|
| 1062 | + if (is_array($_POST['tv'.$row['id']])) { |
|
| 1063 | + $tvPBV = implode('||', $_POST['tv'.$row['id']]); |
|
| 1064 | 1064 | } else { |
| 1065 | - $tvPBV = $_POST['tv' . $row['id']]; |
|
| 1065 | + $tvPBV = $_POST['tv'.$row['id']]; |
|
| 1066 | 1066 | } |
| 1067 | 1067 | } else { |
| 1068 | 1068 | $tvPBV = $row['value']; |
| 1069 | 1069 | } |
| 1070 | 1070 | |
| 1071 | - $tvDescription = (!empty($row['description'])) ? '<br /><span class="comment">' . $row['description'] . '</span>' : ''; |
|
| 1072 | - $tvInherited = (substr($tvPBV, 0, 8) == '@INHERIT') ? '<br /><span class="comment inherited">(' . $_lang['tmplvars_inherited'] . ')</span>' : ''; |
|
| 1073 | - $tvName = $modx->hasPermission('edit_template') ? '<br/><small class="protectedNode">[*' . $row['name'] . '*]</small>' : ''; |
|
| 1071 | + $tvDescription = (!empty($row['description'])) ? '<br /><span class="comment">'.$row['description'].'</span>' : ''; |
|
| 1072 | + $tvInherited = (substr($tvPBV, 0, 8) == '@INHERIT') ? '<br /><span class="comment inherited">('.$_lang['tmplvars_inherited'].')</span>' : ''; |
|
| 1073 | + $tvName = $modx->hasPermission('edit_template') ? '<br/><small class="protectedNode">[*'.$row['name'].'*]</small>' : ''; |
|
| 1074 | 1074 | |
| 1075 | 1075 | $templateVariablesTmp .= ' |
| 1076 | 1076 | <tr> |
| 1077 | - <td><span class="warning">' . $row['caption'] . $tvName . '</span>' . $tvDescription . $tvInherited . '</td> |
|
| 1078 | - <td><div style="position:relative;' . ($row['type'] == 'date' ? '' : '') . '">' . renderFormElement($row['type'], $row['id'], $row['default_text'], $row['elements'], $tvPBV, '', $row, $tvsArray) . '</div></td> |
|
| 1077 | + <td><span class="warning">' . $row['caption'].$tvName.'</span>'.$tvDescription.$tvInherited.'</td> |
|
| 1078 | + <td><div style="position:relative;' . ($row['type'] == 'date' ? '' : '').'">'.renderFormElement($row['type'], $row['id'], $row['default_text'], $row['elements'], $tvPBV, '', $row, $tvsArray).'</div></td> |
|
| 1079 | 1079 | </tr>'; |
| 1080 | 1080 | |
| 1081 | 1081 | if ($group_tvs && $row['category_id'] == 0) { |
@@ -1089,38 +1089,38 @@ discard block |
||
| 1089 | 1089 | } |
| 1090 | 1090 | |
| 1091 | 1091 | if ($templateVariablesGeneral) { |
| 1092 | - echo '<table id="tabTV_0" class="tmplvars"><tbody>' . $templateVariablesGeneral . '</tbody></table>'; |
|
| 1092 | + echo '<table id="tabTV_0" class="tmplvars"><tbody>'.$templateVariablesGeneral.'</tbody></table>'; |
|
| 1093 | 1093 | } |
| 1094 | 1094 | |
| 1095 | 1095 | $templateVariables .= ' |
| 1096 | 1096 | <!-- Template Variables -->' . "\n"; |
| 1097 | 1097 | if (!$group_tvs) { |
| 1098 | 1098 | $templateVariables .= ' |
| 1099 | - <div class="sectionHeader" id="tv_header">' . $_lang['settings_templvars'] . '</div> |
|
| 1099 | + <div class="sectionHeader" id="tv_header">' . $_lang['settings_templvars'].'</div> |
|
| 1100 | 1100 | <div class="sectionBody tmplvars"> |
| 1101 | 1101 | <table>'; |
| 1102 | 1102 | } else if ($group_tvs == 2) { |
| 1103 | 1103 | $templateVariables .= ' |
| 1104 | 1104 | <div class="tab-section"> |
| 1105 | - <div class="tab-header" id="tv_header">' . $_lang['settings_templvars'] . '</div> |
|
| 1105 | + <div class="tab-header" id="tv_header">' . $_lang['settings_templvars'].'</div> |
|
| 1106 | 1106 | <div class="tab-pane" id="paneTemplateVariables"> |
| 1107 | 1107 | <script type="text/javascript"> |
| 1108 | - tpTemplateVariables = new WebFXTabPane(document.getElementById(\'paneTemplateVariables\'), ' . ($modx->config['remember_last_tab'] == 1 ? 'true' : 'false') . '); |
|
| 1108 | + tpTemplateVariables = new WebFXTabPane(document.getElementById(\'paneTemplateVariables\'), ' . ($modx->config['remember_last_tab'] == 1 ? 'true' : 'false').'); |
|
| 1109 | 1109 | </script>'; |
| 1110 | 1110 | } else if ($group_tvs == 3) { |
| 1111 | 1111 | $templateVariables .= ' |
| 1112 | 1112 | <div id="templateVariables" class="tab-page tmplvars"> |
| 1113 | - <h2 class="tab">' . $_lang['settings_templvars'] . '</h2> |
|
| 1113 | + <h2 class="tab">' . $_lang['settings_templvars'].'</h2> |
|
| 1114 | 1114 | <script type="text/javascript">tpSettings.addTabPage(document.getElementById(\'templateVariables\'));</script>'; |
| 1115 | 1115 | } else if ($group_tvs == 4) { |
| 1116 | 1116 | $templateVariables .= ' |
| 1117 | 1117 | <div id="templateVariables" class="tab-page tmplvars"> |
| 1118 | - <h2 class="tab">' . $_lang['settings_templvars'] . '</h2> |
|
| 1118 | + <h2 class="tab">' . $_lang['settings_templvars'].'</h2> |
|
| 1119 | 1119 | <script type="text/javascript">tpSettings.addTabPage(document.getElementById(\'templateVariables\'));</script> |
| 1120 | 1120 | |
| 1121 | 1121 | <div class="tab-pane" id="paneTemplateVariables"> |
| 1122 | 1122 | <script type="text/javascript"> |
| 1123 | - tpTemplateVariables = new WebFXTabPane(document.getElementById(\'paneTemplateVariables\'), ' . ($modx->config['remember_last_tab'] == 1 ? 'true' : 'false') . '); |
|
| 1123 | + tpTemplateVariables = new WebFXTabPane(document.getElementById(\'paneTemplateVariables\'), ' . ($modx->config['remember_last_tab'] == 1 ? 'true' : 'false').'); |
|
| 1124 | 1124 | </script>'; |
| 1125 | 1125 | } |
| 1126 | 1126 | $templateVariables .= $templateVariablesOutput; |
@@ -1212,7 +1212,7 @@ discard block |
||
| 1212 | 1212 | |
| 1213 | 1213 | <?php |
| 1214 | 1214 | |
| 1215 | - if($_SESSION['mgrRole'] == 1 || $modx->manager->action != '27' || $_SESSION['mgrInternalKey'] == $content['createdby'] || $modx->hasPermission('change_resourcetype')) { |
|
| 1215 | + if ($_SESSION['mgrRole'] == 1 || $modx->manager->action != '27' || $_SESSION['mgrInternalKey'] == $content['createdby'] || $modx->hasPermission('change_resourcetype')) { |
|
| 1216 | 1216 | ?> |
| 1217 | 1217 | <tr> |
| 1218 | 1218 | <td> |
@@ -1235,13 +1235,13 @@ discard block |
||
| 1235 | 1235 | <td> |
| 1236 | 1236 | <select name="contentType" class="inputBox" onchange="documentDirty=true;"> |
| 1237 | 1237 | <?php |
| 1238 | - if(!$content['contentType']) { |
|
| 1238 | + if (!$content['contentType']) { |
|
| 1239 | 1239 | $content['contentType'] = 'text/html'; |
| 1240 | 1240 | } |
| 1241 | 1241 | $custom_contenttype = (isset ($custom_contenttype) ? $custom_contenttype : "text/html,text/plain,text/xml"); |
| 1242 | 1242 | $ct = explode(",", $custom_contenttype); |
| 1243 | - for($i = 0; $i < count($ct); $i++) { |
|
| 1244 | - echo "\t\t\t\t\t" . '<option value="' . $ct[$i] . '"' . ($content['contentType'] == $ct[$i] ? ' selected="selected"' : '') . '>' . $ct[$i] . "</option>\n"; |
|
| 1243 | + for ($i = 0; $i < count($ct); $i++) { |
|
| 1244 | + echo "\t\t\t\t\t".'<option value="'.$ct[$i].'"'.($content['contentType'] == $ct[$i] ? ' selected="selected"' : '').'>'.$ct[$i]."</option>\n"; |
|
| 1245 | 1245 | } |
| 1246 | 1246 | ?> |
| 1247 | 1247 | </select> |
@@ -1267,7 +1267,7 @@ discard block |
||
| 1267 | 1267 | </tr> |
| 1268 | 1268 | <?php |
| 1269 | 1269 | } else { |
| 1270 | - if($content['type'] != 'reference' && $modx->manager->action != '72') { |
|
| 1270 | + if ($content['type'] != 'reference' && $modx->manager->action != '72') { |
|
| 1271 | 1271 | // non-admin managers creating or editing a document resource |
| 1272 | 1272 | ?> |
| 1273 | 1273 | <input type="hidden" name="contentType" value="<?= (isset($content['contentType']) ? $content['contentType'] : "text/html") ?>" /> |
@@ -1367,15 +1367,15 @@ discard block |
||
| 1367 | 1367 | <?php |
| 1368 | 1368 | /******************************* |
| 1369 | 1369 | * Document Access Permissions */ |
| 1370 | - if($use_udperms == 1) { |
|
| 1370 | + if ($use_udperms == 1) { |
|
| 1371 | 1371 | $groupsarray = array(); |
| 1372 | 1372 | $sql = ''; |
| 1373 | 1373 | |
| 1374 | 1374 | $documentId = ($modx->manager->action == '27' ? $id : (!empty($_REQUEST['pid']) ? $_REQUEST['pid'] : $content['parent'])); |
| 1375 | - if($documentId > 0) { |
|
| 1375 | + if ($documentId > 0) { |
|
| 1376 | 1376 | // Load up, the permissions from the parent (if new document) or existing document |
| 1377 | 1377 | $rs = $modx->db->select('id, document_group', $tbl_document_groups, "document='{$documentId}'"); |
| 1378 | - while($currentgroup = $modx->db->getRow($rs)) $groupsarray[] = $currentgroup['document_group'] . ',' . $currentgroup['id']; |
|
| 1378 | + while ($currentgroup = $modx->db->getRow($rs)) $groupsarray[] = $currentgroup['document_group'].','.$currentgroup['id']; |
|
| 1379 | 1379 | |
| 1380 | 1380 | // Load up the current permissions and names |
| 1381 | 1381 | $vs = array( |
@@ -1391,7 +1391,7 @@ discard block |
||
| 1391 | 1391 | } |
| 1392 | 1392 | |
| 1393 | 1393 | // retain selected doc groups between post |
| 1394 | - if(isset($_POST['docgroups'])) { |
|
| 1394 | + if (isset($_POST['docgroups'])) { |
|
| 1395 | 1395 | $groupsarray = array_merge($groupsarray, $_POST['docgroups']); |
| 1396 | 1396 | } |
| 1397 | 1397 | |
@@ -1410,26 +1410,26 @@ discard block |
||
| 1410 | 1410 | $permissions_no = 0; // count permissions the current mgr user doesn't have |
| 1411 | 1411 | |
| 1412 | 1412 | // Loop through the permissions list |
| 1413 | - while($row = $modx->db->getRow($rs)) { |
|
| 1413 | + while ($row = $modx->db->getRow($rs)) { |
|
| 1414 | 1414 | |
| 1415 | 1415 | // Create an inputValue pair (group ID and group link (if it exists)) |
| 1416 | - $inputValue = $row['id'] . ',' . ($row['link_id'] ? $row['link_id'] : 'new'); |
|
| 1417 | - $inputId = 'group-' . $row['id']; |
|
| 1416 | + $inputValue = $row['id'].','.($row['link_id'] ? $row['link_id'] : 'new'); |
|
| 1417 | + $inputId = 'group-'.$row['id']; |
|
| 1418 | 1418 | |
| 1419 | 1419 | $checked = in_array($inputValue, $groupsarray); |
| 1420 | - if($checked) { |
|
| 1420 | + if ($checked) { |
|
| 1421 | 1421 | $notPublic = true; |
| 1422 | 1422 | } // Mark as private access (either web or manager) |
| 1423 | 1423 | |
| 1424 | 1424 | // Skip the access permission if the user doesn't have access... |
| 1425 | - if((!$isManager && $row['private_memgroup'] == '1') || (!$isWeb && $row['private_webgroup'] == '1')) { |
|
| 1425 | + if ((!$isManager && $row['private_memgroup'] == '1') || (!$isWeb && $row['private_webgroup'] == '1')) { |
|
| 1426 | 1426 | continue; |
| 1427 | 1427 | } |
| 1428 | 1428 | |
| 1429 | 1429 | // Setup attributes for this Input box |
| 1430 | 1430 | $inputAttributes['id'] = $inputId; |
| 1431 | 1431 | $inputAttributes['value'] = $inputValue; |
| 1432 | - if($checked) { |
|
| 1432 | + if ($checked) { |
|
| 1433 | 1433 | $inputAttributes['checked'] = 'checked'; |
| 1434 | 1434 | } else { |
| 1435 | 1435 | unset($inputAttributes['checked']); |
@@ -1437,10 +1437,10 @@ discard block |
||
| 1437 | 1437 | |
| 1438 | 1438 | // Create attribute string list |
| 1439 | 1439 | $inputString = array(); |
| 1440 | - foreach($inputAttributes as $k => $v) $inputString[] = $k . '="' . $v . '"'; |
|
| 1440 | + foreach ($inputAttributes as $k => $v) $inputString[] = $k.'="'.$v.'"'; |
|
| 1441 | 1441 | |
| 1442 | 1442 | // Make the <input> HTML |
| 1443 | - $inputHTML = '<input ' . implode(' ', $inputString) . ' />'; |
|
| 1443 | + $inputHTML = '<input '.implode(' ', $inputString).' />'; |
|
| 1444 | 1444 | |
| 1445 | 1445 | // does user have this permission? |
| 1446 | 1446 | $from = "{$tbl_membergroup_access} AS mga, {$tbl_member_groups} AS mg"; |
@@ -1451,23 +1451,23 @@ discard block |
||
| 1451 | 1451 | $where = vsprintf("mga.membergroup=mg.user_group AND mga.documentgroup=%s AND mg.member=%s", $vs); |
| 1452 | 1452 | $rsp = $modx->db->select('COUNT(mg.id)', $from, $where); |
| 1453 | 1453 | $count = $modx->db->getValue($rsp); |
| 1454 | - if($count > 0) { |
|
| 1454 | + if ($count > 0) { |
|
| 1455 | 1455 | ++$permissions_yes; |
| 1456 | 1456 | } else { |
| 1457 | 1457 | ++$permissions_no; |
| 1458 | 1458 | } |
| 1459 | - $permissions[] = "\t\t" . '<li>' . $inputHTML . '<label for="' . $inputId . '">' . $row['name'] . '</label></li>'; |
|
| 1459 | + $permissions[] = "\t\t".'<li>'.$inputHTML.'<label for="'.$inputId.'">'.$row['name'].'</label></li>'; |
|
| 1460 | 1460 | } |
| 1461 | 1461 | // if mgr user doesn't have access to any of the displayable permissions, forget about them and make doc public |
| 1462 | - if($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0)) { |
|
| 1462 | + if ($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0)) { |
|
| 1463 | 1463 | $permissions = array(); |
| 1464 | 1464 | } |
| 1465 | 1465 | |
| 1466 | 1466 | // See if the Access Permissions section is worth displaying... |
| 1467 | - if(!empty($permissions)) { |
|
| 1467 | + if (!empty($permissions)) { |
|
| 1468 | 1468 | // Add the "All Document Groups" item if we have rights in both contexts |
| 1469 | - if($isManager && $isWeb) { |
|
| 1470 | - array_unshift($permissions, "\t\t" . '<li><input type="checkbox" class="checkbox" name="chkalldocs" id="groupall"' . (!$notPublic ? ' checked="checked"' : '') . ' onclick="makePublic(true);" /><label for="groupall" class="warning">' . $_lang['all_doc_groups'] . '</label></li>'); |
|
| 1469 | + if ($isManager && $isWeb) { |
|
| 1470 | + array_unshift($permissions, "\t\t".'<li><input type="checkbox" class="checkbox" name="chkalldocs" id="groupall"'.(!$notPublic ? ' checked="checked"' : '').' onclick="makePublic(true);" /><label for="groupall" class="warning">'.$_lang['all_doc_groups'].'</label></li>'); |
|
| 1471 | 1471 | } |
| 1472 | 1472 | // Output the permissions list... |
| 1473 | 1473 | ?> |
@@ -1500,12 +1500,12 @@ discard block |
||
| 1500 | 1500 | </script> |
| 1501 | 1501 | <p><?= $_lang['access_permissions_docs_message'] ?></p> |
| 1502 | 1502 | <ul> |
| 1503 | - <?= implode("\n", $permissions) . "\n" ?> |
|
| 1503 | + <?= implode("\n", $permissions)."\n" ?> |
|
| 1504 | 1504 | </ul> |
| 1505 | 1505 | </div><!--div class="tab-page" id="tabAccess"--> |
| 1506 | 1506 | <?php |
| 1507 | 1507 | } // !empty($permissions) |
| 1508 | - elseif($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0) && ($_SESSION['mgrPermissions']['access_permissions'] == 1 || $_SESSION['mgrPermissions']['web_access_permissions'] == 1)) { |
|
| 1508 | + elseif ($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0) && ($_SESSION['mgrPermissions']['access_permissions'] == 1 || $_SESSION['mgrPermissions']['web_access_permissions'] == 1)) { |
|
| 1509 | 1509 | ?> |
| 1510 | 1510 | <p><?= $_lang["access_permissions_docs_collision"] ?></p> |
| 1511 | 1511 | <?php |
@@ -1525,7 +1525,7 @@ discard block |
||
| 1525 | 1525 | 'template' => $content['template'] |
| 1526 | 1526 | )); |
| 1527 | 1527 | |
| 1528 | - if(is_array($evtOut)) { |
|
| 1528 | + if (is_array($evtOut)) { |
|
| 1529 | 1529 | echo implode('', $evtOut); |
| 1530 | 1530 | } |
| 1531 | 1531 | ?> |
@@ -1538,16 +1538,16 @@ discard block |
||
| 1538 | 1538 | storeCurTemplate(); |
| 1539 | 1539 | </script> |
| 1540 | 1540 | <?php |
| 1541 | -if(($content['richtext'] == 1 || $modx->manager->action == '4' || $modx->manager->action == '72') && $use_editor == 1) { |
|
| 1542 | - if(is_array($richtexteditorIds)) { |
|
| 1543 | - foreach($richtexteditorIds as $editor => $elements) { |
|
| 1541 | +if (($content['richtext'] == 1 || $modx->manager->action == '4' || $modx->manager->action == '72') && $use_editor == 1) { |
|
| 1542 | + if (is_array($richtexteditorIds)) { |
|
| 1543 | + foreach ($richtexteditorIds as $editor => $elements) { |
|
| 1544 | 1544 | // invoke OnRichTextEditorInit event |
| 1545 | 1545 | $evtOut = $modx->invokeEvent('OnRichTextEditorInit', array( |
| 1546 | 1546 | 'editor' => $editor, |
| 1547 | 1547 | 'elements' => $elements, |
| 1548 | 1548 | 'options' => $richtexteditorOptions[$editor] |
| 1549 | 1549 | )); |
| 1550 | - if(is_array($evtOut)) { |
|
| 1550 | + if (is_array($evtOut)) { |
|
| 1551 | 1551 | echo implode('', $evtOut); |
| 1552 | 1552 | } |
| 1553 | 1553 | } |
@@ -1557,37 +1557,37 @@ discard block |
||
| 1557 | 1557 | /** |
| 1558 | 1558 | * @return string |
| 1559 | 1559 | */ |
| 1560 | -function getDefaultTemplate() { |
|
| 1560 | +function getDefaultTemplate(){ |
|
| 1561 | 1561 | $modx = evolutionCMS(); |
| 1562 | 1562 | |
| 1563 | 1563 | $default_template = ''; |
| 1564 | - switch($modx->config['auto_template_logic']) { |
|
| 1564 | + switch ($modx->config['auto_template_logic']) { |
|
| 1565 | 1565 | case 'sibling': |
| 1566 | - if(!isset($_GET['pid']) || empty($_GET['pid'])) { |
|
| 1566 | + if (!isset($_GET['pid']) || empty($_GET['pid'])) { |
|
| 1567 | 1567 | $site_start = $modx->config['site_start']; |
| 1568 | 1568 | $where = "sc.isfolder=0 AND sc.id!='{$site_start}'"; |
| 1569 | 1569 | $sibl = $modx->getDocumentChildren($_REQUEST['pid'], 1, 0, 'template', $where, 'menuindex', 'ASC', 1); |
| 1570 | - if(isset($sibl[0]['template']) && $sibl[0]['template'] !== '') { |
|
| 1570 | + if (isset($sibl[0]['template']) && $sibl[0]['template'] !== '') { |
|
| 1571 | 1571 | $default_template = $sibl[0]['template']; |
| 1572 | 1572 | } |
| 1573 | 1573 | } else { |
| 1574 | 1574 | $sibl = $modx->getDocumentChildren($_REQUEST['pid'], 1, 0, 'template', 'isfolder=0', 'menuindex', 'ASC', 1); |
| 1575 | - if(isset($sibl[0]['template']) && $sibl[0]['template'] !== '') { |
|
| 1575 | + if (isset($sibl[0]['template']) && $sibl[0]['template'] !== '') { |
|
| 1576 | 1576 | $default_template = $sibl[0]['template']; |
| 1577 | 1577 | } else { |
| 1578 | 1578 | $sibl = $modx->getDocumentChildren($_REQUEST['pid'], 0, 0, 'template', 'isfolder=0', 'menuindex', 'ASC', 1); |
| 1579 | - if(isset($sibl[0]['template']) && $sibl[0]['template'] !== '') { |
|
| 1579 | + if (isset($sibl[0]['template']) && $sibl[0]['template'] !== '') { |
|
| 1580 | 1580 | $default_template = $sibl[0]['template']; |
| 1581 | 1581 | } |
| 1582 | 1582 | } |
| 1583 | 1583 | } |
| 1584 | - if(isset($default_template)) { |
|
| 1584 | + if (isset($default_template)) { |
|
| 1585 | 1585 | break; |
| 1586 | 1586 | } // If $default_template could not be determined, fall back / through to "parent"-mode |
| 1587 | 1587 | case 'parent': |
| 1588 | - if(isset($_REQUEST['pid']) && !empty($_REQUEST['pid'])) { |
|
| 1588 | + if (isset($_REQUEST['pid']) && !empty($_REQUEST['pid'])) { |
|
| 1589 | 1589 | $parent = $modx->getPageInfo($_REQUEST['pid'], 0, 'template'); |
| 1590 | - if(isset($parent['template'])) { |
|
| 1590 | + if (isset($parent['template'])) { |
|
| 1591 | 1591 | $default_template = $parent['template']; |
| 1592 | 1592 | } |
| 1593 | 1593 | } |
@@ -1,46 +1,46 @@ 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('settings')) { |
|
| 5 | +if (!$modx->hasPermission('settings')) { |
|
| 6 | 6 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
| 7 | 7 | } |
| 8 | 8 | $data = $_POST; |
| 9 | 9 | // lose the POST now, gets rid of quirky issue with Safari 3 - see FS#972 |
| 10 | 10 | unset($_POST); |
| 11 | 11 | |
| 12 | -if($data['friendly_urls']==='1' && strpos($_SERVER['SERVER_SOFTWARE'],'IIS')===false) |
|
| 12 | +if ($data['friendly_urls'] === '1' && strpos($_SERVER['SERVER_SOFTWARE'], 'IIS') === false) |
|
| 13 | 13 | { |
| 14 | - $htaccess = $modx->config['base_path'] . '.htaccess'; |
|
| 15 | - $sample_htaccess = $modx->config['base_path'] . 'ht.access'; |
|
| 16 | - $dir = '/' . trim($modx->config['base_url'],'/'); |
|
| 17 | - if(is_file($htaccess)) |
|
| 14 | + $htaccess = $modx->config['base_path'].'.htaccess'; |
|
| 15 | + $sample_htaccess = $modx->config['base_path'].'ht.access'; |
|
| 16 | + $dir = '/'.trim($modx->config['base_url'], '/'); |
|
| 17 | + if (is_file($htaccess)) |
|
| 18 | 18 | { |
| 19 | 19 | $_ = file_get_contents($htaccess); |
| 20 | - if(strpos($_,'RewriteBase')===false) |
|
| 20 | + if (strpos($_, 'RewriteBase') === false) |
|
| 21 | 21 | { |
| 22 | 22 | $warnings[] = $_lang["settings_friendlyurls_alert2"]; |
| 23 | 23 | } |
| 24 | - elseif(is_writable($htaccess)) |
|
| 24 | + elseif (is_writable($htaccess)) |
|
| 25 | 25 | { |
| 26 | - $_ = preg_replace('@RewriteBase.+@',"RewriteBase {$dir}", $_); |
|
| 27 | - if(!@file_put_contents($htaccess,$_)) |
|
| 26 | + $_ = preg_replace('@RewriteBase.+@', "RewriteBase {$dir}", $_); |
|
| 27 | + if (!@file_put_contents($htaccess, $_)) |
|
| 28 | 28 | { |
| 29 | 29 | $warnings[] = $_lang["settings_friendlyurls_alert2"]; |
| 30 | 30 | } |
| 31 | 31 | } |
| 32 | 32 | } |
| 33 | - elseif(is_file($sample_htaccess)) |
|
| 33 | + elseif (is_file($sample_htaccess)) |
|
| 34 | 34 | { |
| 35 | - if(!@rename($sample_htaccess,$htaccess)) |
|
| 35 | + if (!@rename($sample_htaccess, $htaccess)) |
|
| 36 | 36 | { |
| 37 | 37 | $warnings[] = $_lang["settings_friendlyurls_alert"]; |
| 38 | 38 | } |
| 39 | - elseif($modx->config['base_url']!=='/') |
|
| 39 | + elseif ($modx->config['base_url'] !== '/') |
|
| 40 | 40 | { |
| 41 | 41 | $_ = file_get_contents($htaccess); |
| 42 | - $_ = preg_replace('@RewriteBase.+@',"RewriteBase {$dir}", $_); |
|
| 43 | - if(!@file_put_contents($htaccess,$_)) |
|
| 42 | + $_ = preg_replace('@RewriteBase.+@', "RewriteBase {$dir}", $_); |
|
| 43 | + if (!@file_put_contents($htaccess, $_)) |
|
| 44 | 44 | { |
| 45 | 45 | $warnings[] = $_lang["settings_friendlyurls_alert2"]; |
| 46 | 46 | } |
@@ -48,17 +48,17 @@ discard block |
||
| 48 | 48 | } |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | -if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) { |
|
| 52 | - unlink(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css'); |
|
| 51 | +if (file_exists(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css')) { |
|
| 52 | + unlink(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css'); |
|
| 53 | 53 | } |
| 54 | 54 | |
| 55 | -$data['filemanager_path'] = str_replace('[(base_path)]',MODX_BASE_PATH,$data['filemanager_path']); |
|
| 56 | -$data['rb_base_dir'] = str_replace('[(base_path)]',MODX_BASE_PATH,$data['rb_base_dir']); |
|
| 55 | +$data['filemanager_path'] = str_replace('[(base_path)]', MODX_BASE_PATH, $data['filemanager_path']); |
|
| 56 | +$data['rb_base_dir'] = str_replace('[(base_path)]', MODX_BASE_PATH, $data['rb_base_dir']); |
|
| 57 | 57 | |
| 58 | 58 | if (isset($data) && count($data) > 0) { |
| 59 | - if(isset($data['manager_language'])) { |
|
| 60 | - $lang_path = MODX_MANAGER_PATH . 'includes/lang/' . $data['manager_language'] . '.inc.php'; |
|
| 61 | - if(is_file($lang_path)) { |
|
| 59 | + if (isset($data['manager_language'])) { |
|
| 60 | + $lang_path = MODX_MANAGER_PATH.'includes/lang/'.$data['manager_language'].'.inc.php'; |
|
| 61 | + if (is_file($lang_path)) { |
|
| 62 | 62 | include($lang_path); |
| 63 | 63 | global $modx_lang_attribute; |
| 64 | 64 | $data['lang_code'] = !$modx_lang_attribute ? 'en' : $modx_lang_attribute; |
@@ -66,15 +66,15 @@ discard block |
||
| 66 | 66 | } |
| 67 | 67 | $savethese = array(); |
| 68 | 68 | $data['sys_files_checksum'] = $modx->manager->getSystemChecksum($data['check_files_onlogin']); |
| 69 | - $data['mail_check_timeperiod'] = (int)$data['mail_check_timeperiod'] < 60 ? 60 : $data['mail_check_timeperiod']; // updateMail() in mainMenu no faster than every minute |
|
| 69 | + $data['mail_check_timeperiod'] = (int) $data['mail_check_timeperiod'] < 60 ? 60 : $data['mail_check_timeperiod']; // updateMail() in mainMenu no faster than every minute |
|
| 70 | 70 | foreach ($data as $k => $v) { |
| 71 | 71 | switch ($k) { |
| 72 | 72 | case 'site_name': |
| 73 | 73 | $v = htmlspecialchars($v); |
| 74 | 74 | break; |
| 75 | 75 | case 'settings_version':{ |
| 76 | - if($modx->getVersionData('version')!=$data['settings_version']){ |
|
| 77 | - $modx->logEvent(17,2,'<pre>'.var_export($data['settings_version'],true).'</pre>','fake settings_version'); |
|
| 76 | + if ($modx->getVersionData('version') != $data['settings_version']) { |
|
| 77 | + $modx->logEvent(17, 2, '<pre>'.var_export($data['settings_version'], true).'</pre>', 'fake settings_version'); |
|
| 78 | 78 | $v = $modx->getVersionData('version'); |
| 79 | 79 | } |
| 80 | 80 | break; |
@@ -95,21 +95,21 @@ discard block |
||
| 95 | 95 | case 'rb_base_url': |
| 96 | 96 | case 'filemanager_path': |
| 97 | 97 | $v = trim($v); |
| 98 | - $v = rtrim($v,'/') . '/'; |
|
| 98 | + $v = rtrim($v, '/').'/'; |
|
| 99 | 99 | break; |
| 100 | 100 | case 'manager_language': |
| 101 | - $langDir = realpath(MODX_MANAGER_PATH . 'includes/lang'); |
|
| 102 | - $langFile = realpath(MODX_MANAGER_PATH . 'includes/lang/' . $v . '.inc.php'); |
|
| 101 | + $langDir = realpath(MODX_MANAGER_PATH.'includes/lang'); |
|
| 102 | + $langFile = realpath(MODX_MANAGER_PATH.'includes/lang/'.$v.'.inc.php'); |
|
| 103 | 103 | $langFileDir = dirname($langFile); |
| 104 | - if($langDir !== $langFileDir || !file_exists($langFile)) { |
|
| 104 | + if ($langDir !== $langFileDir || !file_exists($langFile)) { |
|
| 105 | 105 | $v = 'english'; |
| 106 | 106 | } |
| 107 | 107 | break; |
| 108 | 108 | case 'smtppw': |
| 109 | 109 | if ($v !== '********************' && $v !== '') { |
| 110 | 110 | $v = trim($v); |
| 111 | - $v = base64_encode($v) . substr(str_shuffle('abcdefghjkmnpqrstuvxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789'), 0, 7); |
|
| 112 | - $v = str_replace('=','%',$v); |
|
| 111 | + $v = base64_encode($v).substr(str_shuffle('abcdefghjkmnpqrstuvxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789'), 0, 7); |
|
| 112 | + $v = str_replace('=', '%', $v); |
|
| 113 | 113 | } elseif ($v === '********************') { |
| 114 | 114 | $k = ''; |
| 115 | 115 | } |
@@ -118,14 +118,14 @@ discard block |
||
| 118 | 118 | $v = str_replace(array(' ,', ', '), ',', $v); |
| 119 | 119 | if ($v !== ',') { |
| 120 | 120 | $v = ($v != 'MODX_SITE_HOSTNAMES') ? $v : ''; |
| 121 | - $configString = '<?php' . "\n" . 'define(\'MODX_SITE_HOSTNAMES\', \'' . $v . '\');' . "\n"; |
|
| 122 | - @file_put_contents(MODX_BASE_PATH . 'assets/cache/siteHostnames.php', $configString); |
|
| 121 | + $configString = '<?php'."\n".'define(\'MODX_SITE_HOSTNAMES\', \''.$v.'\');'."\n"; |
|
| 122 | + @file_put_contents(MODX_BASE_PATH.'assets/cache/siteHostnames.php', $configString); |
|
| 123 | 123 | } |
| 124 | 124 | $k = ''; |
| 125 | 125 | break; |
| 126 | 126 | case 'session_timeout': |
| 127 | 127 | $mail_check_timeperiod = $data['mail_check_timeperiod']; |
| 128 | - $v = (int)$v < ($data['mail_check_timeperiod']/60+1) ? ($data['mail_check_timeperiod']/60+1) : $v; // updateMail() in mainMenu pings as per mail_check_timeperiod, so +1min is minimum |
|
| 128 | + $v = (int) $v < ($data['mail_check_timeperiod'] / 60 + 1) ? ($data['mail_check_timeperiod'] / 60 + 1) : $v; // updateMail() in mainMenu pings as per mail_check_timeperiod, so +1min is minimum |
|
| 129 | 129 | break; |
| 130 | 130 | default: |
| 131 | 131 | break; |
@@ -134,7 +134,7 @@ discard block |
||
| 134 | 134 | |
| 135 | 135 | $modx->config[$k] = $v; |
| 136 | 136 | |
| 137 | - if(!empty($k)) $savethese[] = '(\''.$modx->db->escape($k).'\', \''.$modx->db->escape($v).'\')'; |
|
| 137 | + if (!empty($k)) $savethese[] = '(\''.$modx->db->escape($k).'\', \''.$modx->db->escape($v).'\')'; |
|
| 138 | 138 | } |
| 139 | 139 | |
| 140 | 140 | // Run a single query to save all the values |
@@ -144,16 +144,16 @@ discard block |
||
| 144 | 144 | |
| 145 | 145 | // Reset Template Pages |
| 146 | 146 | if (isset($data['reset_template'])) { |
| 147 | - $newtemplate = (int)$data['default_template']; |
|
| 148 | - $oldtemplate = (int)$data['old_template']; |
|
| 147 | + $newtemplate = (int) $data['default_template']; |
|
| 148 | + $oldtemplate = (int) $data['old_template']; |
|
| 149 | 149 | $tbl = $modx->getFullTableName('site_content'); |
| 150 | 150 | $reset = $data['reset_template']; |
| 151 | - if($reset==1) $modx->db->update(array('template' => $newtemplate), $tbl, "type='document'"); |
|
| 152 | - else if($reset==2) $modx->db->update(array('template' => $newtemplate), $tbl, "template='{$oldtemplate}'"); |
|
| 151 | + if ($reset == 1) $modx->db->update(array('template' => $newtemplate), $tbl, "type='document'"); |
|
| 152 | + else if ($reset == 2) $modx->db->update(array('template' => $newtemplate), $tbl, "template='{$oldtemplate}'"); |
|
| 153 | 153 | } |
| 154 | 154 | |
| 155 | 155 | // empty cache |
| 156 | 156 | $modx->clearCache('full'); |
| 157 | 157 | } |
| 158 | -$header="Location: index.php?a=7&r=10"; |
|
| 158 | +$header = "Location: index.php?a=7&r=10"; |
|
| 159 | 159 | header($header); |
@@ -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(); |
@@ -580,12 +580,12 @@ discard block |
||
| 580 | 580 | <td><select name="which_browser" class="inputBox" onChange="documentDirty=true;"> |
| 581 | 581 | <?php |
| 582 | 582 | $selected = 'default' == $usersettings['which_browser'] || !$usersettings['which_browser'] ? ' selected="selected"' : ''; |
| 583 | - echo '<option value="default"' . $selected . '>' . $_lang['option_default'] . "</option>\n"; |
|
| 584 | - foreach(glob("media/browser/*", GLOB_ONLYDIR) as $dir) { |
|
| 583 | + echo '<option value="default"'.$selected.'>'.$_lang['option_default']."</option>\n"; |
|
| 584 | + foreach (glob("media/browser/*", GLOB_ONLYDIR) as $dir) { |
|
| 585 | 585 | $dir = str_replace('\\', '/', $dir); |
| 586 | 586 | $browser_name = substr($dir, strrpos($dir, '/') + 1); |
| 587 | 587 | $selected = $browser_name == $usersettings['which_browser'] ? ' selected="selected"' : ''; |
| 588 | - echo '<option value="' . $browser_name . '"' . $selected . '>' . "{$browser_name}</option>\n"; |
|
| 588 | + echo '<option value="'.$browser_name.'"'.$selected.'>'."{$browser_name}</option>\n"; |
|
| 589 | 589 | } |
| 590 | 590 | ?> |
| 591 | 591 | </select></td> |
@@ -612,7 +612,7 @@ discard block |
||
| 612 | 612 | </tr> |
| 613 | 613 | <tr> |
| 614 | 614 | <td> </td> |
| 615 | - <td class='comment'><?php echo $_lang["uploadable_images_message"] . $_lang["user_upload_message"] ?></td> |
|
| 615 | + <td class='comment'><?php echo $_lang["uploadable_images_message"].$_lang["user_upload_message"] ?></td> |
|
| 616 | 616 | </tr> |
| 617 | 617 | <tr> |
| 618 | 618 | <th><?php echo $_lang["uploadable_media_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_media_message"] . $_lang["user_upload_message"] ?></td> |
|
| 627 | + <td class='comment'><?php echo $_lang["uploadable_media_message"].$_lang["user_upload_message"] ?></td> |
|
| 628 | 628 | </tr> |
| 629 | 629 | <tr> |
| 630 | 630 | <th><?php echo $_lang["uploadable_flash_title"] ?></th> |
@@ -636,7 +636,7 @@ discard block |
||
| 636 | 636 | </tr> |
| 637 | 637 | <tr> |
| 638 | 638 | <td> </td> |
| 639 | - <td class='comment'><?php echo $_lang["uploadable_flash_message"] . $_lang["user_upload_message"] ?></td> |
|
| 639 | + <td class='comment'><?php echo $_lang["uploadable_flash_message"].$_lang["user_upload_message"] ?></td> |
|
| 640 | 640 | </tr> |
| 641 | 641 | <tr> |
| 642 | 642 | <th><?php echo $_lang["uploadable_files_title"] ?></th> |
@@ -648,7 +648,7 @@ discard block |
||
| 648 | 648 | </tr> |
| 649 | 649 | <tr> |
| 650 | 650 | <td> </td> |
| 651 | - <td class='comment'><?php echo $_lang["uploadable_files_message"] . $_lang["user_upload_message"] ?></td> |
|
| 651 | + <td class='comment'><?php echo $_lang["uploadable_files_message"].$_lang["user_upload_message"] ?></td> |
|
| 652 | 652 | </tr> |
| 653 | 653 | <tr class='row2'> |
| 654 | 654 | <th><?php echo $_lang["upload_maxsize_title"] ?></th> |
@@ -667,11 +667,11 @@ discard block |
||
| 667 | 667 | $edt = isset ($usersettings["which_editor"]) ? $usersettings["which_editor"] : ''; |
| 668 | 668 | // invoke OnRichTextEditorRegister event |
| 669 | 669 | $evtOut = $modx->invokeEvent("OnRichTextEditorRegister"); |
| 670 | - echo "<option value='none'" . ($edt == 'none' ? " selected='selected'" : "") . ">" . $_lang["none"] . "</option>\n"; |
|
| 671 | - if(is_array($evtOut)) { |
|
| 672 | - for($i = 0; $i < count($evtOut); $i++) { |
|
| 670 | + echo "<option value='none'".($edt == 'none' ? " selected='selected'" : "").">".$_lang["none"]."</option>\n"; |
|
| 671 | + if (is_array($evtOut)) { |
|
| 672 | + for ($i = 0; $i < count($evtOut); $i++) { |
|
| 673 | 673 | $editor = $evtOut[$i]; |
| 674 | - echo "<option value='$editor'" . ($edt == $editor ? " selected='selected'" : "") . ">$editor</option>\n"; |
|
| 674 | + echo "<option value='$editor'".($edt == $editor ? " selected='selected'" : "").">$editor</option>\n"; |
|
| 675 | 675 | } |
| 676 | 676 | } |
| 677 | 677 | ?> |
@@ -709,7 +709,7 @@ discard block |
||
| 709 | 709 | <?php |
| 710 | 710 | // invoke OnInterfaceSettingsRender event |
| 711 | 711 | $evtOut = $modx->invokeEvent("OnInterfaceSettingsRender"); |
| 712 | - if(is_array($evtOut)) { |
|
| 712 | + if (is_array($evtOut)) { |
|
| 713 | 713 | echo implode("", $evtOut); |
| 714 | 714 | } |
| 715 | 715 | ?> |
@@ -736,7 +736,7 @@ discard block |
||
| 736 | 736 | function BrowseServer() { |
| 737 | 737 | var w = screen.width * 0.7; |
| 738 | 738 | var h = screen.height * 0.7; |
| 739 | - OpenServerBrowser("<?php echo MODX_MANAGER_URL; ?>media/browser/<?php echo $which_browser;?>/browser.php?Type=images", w, h); |
|
| 739 | + OpenServerBrowser("<?php echo MODX_MANAGER_URL; ?>media/browser/<?php echo $which_browser; ?>/browser.php?Type=images", w, h); |
|
| 740 | 740 | } |
| 741 | 741 | |
| 742 | 742 | function SetUrl(url, width, height, alt) { |
@@ -759,17 +759,17 @@ discard block |
||
| 759 | 759 | </tr> |
| 760 | 760 | </table> |
| 761 | 761 | </div> |
| 762 | - <?php if($use_udperms == 1) { |
|
| 762 | + <?php if ($use_udperms == 1) { |
|
| 763 | 763 | |
| 764 | 764 | $groupsarray = array(); |
| 765 | 765 | |
| 766 | - if($modx->manager->action == '12') { // only do this bit if the user is being edited |
|
| 766 | + if ($modx->manager->action == '12') { // only do this bit if the user is being edited |
|
| 767 | 767 | $rs = $modx->db->select('user_group', $modx->getFullTableName('member_groups'), "member='{$user}'"); |
| 768 | 768 | $groupsarray = $modx->db->getColumn('user_group', $rs); |
| 769 | 769 | } |
| 770 | 770 | // retain selected doc groups between post |
| 771 | - if(is_array($_POST['user_groups'])) { |
|
| 772 | - foreach($_POST['user_groups'] as $n => $v) $groupsarray[] = $v; |
|
| 771 | + if (is_array($_POST['user_groups'])) { |
|
| 772 | + foreach ($_POST['user_groups'] as $n => $v) $groupsarray[] = $v; |
|
| 773 | 773 | } |
| 774 | 774 | ?> |
| 775 | 775 | <div class="tab-page" id="tabAccess"> |
@@ -778,8 +778,8 @@ discard block |
||
| 778 | 778 | <p><?php echo $_lang['access_permissions_user_message'] ?></p> |
| 779 | 779 | <?php |
| 780 | 780 | $rs = $modx->db->select('name, id', $modx->getFullTableName('membergroup_names'), '', 'name'); |
| 781 | - while($row = $modx->db->getRow($rs)) { |
|
| 782 | - echo "<label><input type='checkbox' name='user_groups[]' value='" . $row['id'] . "'" . (in_array($row['id'], $groupsarray) ? " checked='checked'" : "") . " />" . $row['name'] . "</label><br />"; |
|
| 781 | + while ($row = $modx->db->getRow($rs)) { |
|
| 782 | + echo "<label><input type='checkbox' name='user_groups[]' value='".$row['id']."'".(in_array($row['id'], $groupsarray) ? " checked='checked'" : "")." />".$row['name']."</label><br />"; |
|
| 783 | 783 | } |
| 784 | 784 | } |
| 785 | 785 | ?> |
@@ -792,7 +792,7 @@ discard block |
||
| 792 | 792 | $evtOut = $modx->invokeEvent("OnUserFormRender", array( |
| 793 | 793 | "id" => $user |
| 794 | 794 | )); |
| 795 | - if(is_array($evtOut)) { |
|
| 795 | + if (is_array($evtOut)) { |
|
| 796 | 796 | echo implode("", $evtOut); |
| 797 | 797 | } |
| 798 | 798 | ?> |
