evolution-cms /
evolution
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 3 | 3 | die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly."); |
| 4 | 4 | } |
| 5 | 5 | if (!$modx->hasPermission('file_manager')) { |
@@ -9,15 +9,15 @@ discard block |
||
| 9 | 9 | $newToken = makeToken(); |
| 10 | 10 | |
| 11 | 11 | // settings |
| 12 | -$theme_image_path = $modx->config['site_manager_url'] . 'media/style/' . $modx->config['manager_theme'] . '/images/'; |
|
| 12 | +$theme_image_path = $modx->config['site_manager_url'].'media/style/'.$modx->config['manager_theme'].'/images/'; |
|
| 13 | 13 | $excludes = array( |
| 14 | 14 | '.', |
| 15 | 15 | '..', |
| 16 | 16 | '.svn' |
| 17 | 17 | ); |
| 18 | -$alias_suffix = (!empty($friendly_url_suffix)) ? ',' . ltrim($friendly_url_suffix, '.') : ''; |
|
| 19 | -$editablefiles = explode(',', 'txt,php,tpl,less,sass,shtml,html,htm,xml,js,css,pageCache,htaccess,json,ini' . $alias_suffix); |
|
| 20 | -$inlineviewablefiles = explode(',', 'txt,php,tpl,less,sass,html,htm,xml,js,css,pageCache,htaccess,json,ini' . $alias_suffix); |
|
| 18 | +$alias_suffix = (!empty($friendly_url_suffix)) ? ','.ltrim($friendly_url_suffix, '.') : ''; |
|
| 19 | +$editablefiles = explode(',', 'txt,php,tpl,less,sass,shtml,html,htm,xml,js,css,pageCache,htaccess,json,ini'.$alias_suffix); |
|
| 20 | +$inlineviewablefiles = explode(',', 'txt,php,tpl,less,sass,html,htm,xml,js,css,pageCache,htaccess,json,ini'.$alias_suffix); |
|
| 21 | 21 | $viewablefiles = explode(',', 'jpg,gif,png,ico'); |
| 22 | 22 | |
| 23 | 23 | $editablefiles = add_dot($editablefiles); |
@@ -30,31 +30,31 @@ discard block |
||
| 30 | 30 | { |
| 31 | 31 | */ |
| 32 | 32 | $protected_path[] = $modx->config['site_manager_path']; |
| 33 | -$protected_path[] = $modx->config['base_path'] . 'temp/backup'; |
|
| 34 | -$protected_path[] = $modx->config['base_path'] . 'assets/backup'; |
|
| 33 | +$protected_path[] = $modx->config['base_path'].'temp/backup'; |
|
| 34 | +$protected_path[] = $modx->config['base_path'].'assets/backup'; |
|
| 35 | 35 | |
| 36 | 36 | if (!$modx->hasPermission('save_plugin')) { |
| 37 | - $protected_path[] = $modx->config['base_path'] . 'assets/plugins'; |
|
| 37 | + $protected_path[] = $modx->config['base_path'].'assets/plugins'; |
|
| 38 | 38 | } |
| 39 | 39 | if (!$modx->hasPermission('save_snippet')) { |
| 40 | - $protected_path[] = $modx->config['base_path'] . 'assets/snippets'; |
|
| 40 | + $protected_path[] = $modx->config['base_path'].'assets/snippets'; |
|
| 41 | 41 | } |
| 42 | 42 | if (!$modx->hasPermission('save_template')) { |
| 43 | - $protected_path[] = $modx->config['base_path'] . 'assets/templates'; |
|
| 43 | + $protected_path[] = $modx->config['base_path'].'assets/templates'; |
|
| 44 | 44 | } |
| 45 | 45 | if (!$modx->hasPermission('save_module')) { |
| 46 | - $protected_path[] = $modx->config['base_path'] . 'assets/modules'; |
|
| 46 | + $protected_path[] = $modx->config['base_path'].'assets/modules'; |
|
| 47 | 47 | } |
| 48 | 48 | if (!$modx->hasPermission('empty_cache')) { |
| 49 | - $protected_path[] = $modx->config['base_path'] . 'assets/cache'; |
|
| 49 | + $protected_path[] = $modx->config['base_path'].'assets/cache'; |
|
| 50 | 50 | } |
| 51 | 51 | if (!$modx->hasPermission('import_static')) { |
| 52 | - $protected_path[] = $modx->config['base_path'] . 'temp/import'; |
|
| 53 | - $protected_path[] = $modx->config['base_path'] . 'assets/import'; |
|
| 52 | + $protected_path[] = $modx->config['base_path'].'temp/import'; |
|
| 53 | + $protected_path[] = $modx->config['base_path'].'assets/import'; |
|
| 54 | 54 | } |
| 55 | 55 | if (!$modx->hasPermission('export_static')) { |
| 56 | - $protected_path[] = $modx->config['base_path'] . 'temp/export'; |
|
| 57 | - $protected_path[] = $modx->config['base_path'] . 'assets/export'; |
|
| 56 | + $protected_path[] = $modx->config['base_path'].'temp/export'; |
|
| 57 | + $protected_path[] = $modx->config['base_path'].'assets/export'; |
|
| 58 | 58 | } |
| 59 | 59 | /* |
| 60 | 60 | } |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | { |
| 84 | 84 | $count = count($array); |
| 85 | 85 | for ($i = 0; $i < $count; $i++) { |
| 86 | - $array[$i] = '.' . strtolower(trim($array[$i])); // add a dot :) |
|
| 86 | + $array[$i] = '.'.strtolower(trim($array[$i])); // add a dot :) |
|
| 87 | 87 | } |
| 88 | 88 | return $array; |
| 89 | 89 | } |
@@ -108,15 +108,15 @@ discard block |
||
| 108 | 108 | $rw = realpath('../'); |
| 109 | 109 | $webstart_path = str_replace('\\', '/', str_replace($rw, '', $rf)); |
| 110 | 110 | if (substr($webstart_path, 0, 1) == '/') { |
| 111 | - $webstart_path = '..' . $webstart_path; |
|
| 111 | + $webstart_path = '..'.$webstart_path; |
|
| 112 | 112 | } else { |
| 113 | - $webstart_path = '../' . $webstart_path; |
|
| 113 | + $webstart_path = '../'.$webstart_path; |
|
| 114 | 114 | } |
| 115 | 115 | |
| 116 | 116 | ?> |
| 117 | 117 | <script type="text/javascript"> |
| 118 | 118 | |
| 119 | - var current_path = '<?= $startpath;?>'; |
|
| 119 | + var current_path = '<?= $startpath; ?>'; |
|
| 120 | 120 | |
| 121 | 121 | function viewfile (url) |
| 122 | 122 | { |
@@ -152,7 +152,7 @@ discard block |
||
| 152 | 152 | function unzipFile (file) |
| 153 | 153 | { |
| 154 | 154 | if (confirmUnzip()) { |
| 155 | - window.location.href = "index.php?a=31&mode=unzip&path=" + current_path + '/&file=' + file + "&token=<?= $newToken;?>"; |
|
| 155 | + window.location.href = "index.php?a=31&mode=unzip&path=" + current_path + '/&file=' + file + "&token=<?= $newToken; ?>"; |
|
| 156 | 156 | return false; |
| 157 | 157 | } |
| 158 | 158 | } |
@@ -174,7 +174,7 @@ discard block |
||
| 174 | 174 | function deleteFolder (folder, status) |
| 175 | 175 | { |
| 176 | 176 | if (confirmDeleteFolder(status)) { |
| 177 | - window.location.href = "index.php?a=31&mode=deletefolder&path=" + current_path + "&folderpath=" + current_path + '/' + folder + "&token=<?= $newToken;?>"; |
|
| 177 | + window.location.href = "index.php?a=31&mode=deletefolder&path=" + current_path + "&folderpath=" + current_path + '/' + folder + "&token=<?= $newToken; ?>"; |
|
| 178 | 178 | return false; |
| 179 | 179 | } |
| 180 | 180 | } |
@@ -182,7 +182,7 @@ discard block |
||
| 182 | 182 | function deleteFile (file) |
| 183 | 183 | { |
| 184 | 184 | if (confirmDelete()) { |
| 185 | - window.location.href = "index.php?a=31&mode=delete&path=" + current_path + '/' + file + "&token=<?= $newToken;?>"; |
|
| 185 | + window.location.href = "index.php?a=31&mode=delete&path=" + current_path + '/' + file + "&token=<?= $newToken; ?>"; |
|
| 186 | 186 | return false; |
| 187 | 187 | } |
| 188 | 188 | } |
@@ -191,7 +191,7 @@ discard block |
||
| 191 | 191 | { |
| 192 | 192 | var newFilename = prompt("<?= $_lang["files_dynamic_new_file_name"] ?>", file); |
| 193 | 193 | if (newFilename !== null && newFilename !== file) { |
| 194 | - window.location.href = "index.php?a=31&mode=duplicate&path=" + current_path + '/' + file + "&newFilename=" + newFilename + "&token=<?= $newToken;?>"; |
|
| 194 | + window.location.href = "index.php?a=31&mode=duplicate&path=" + current_path + '/' + file + "&newFilename=" + newFilename + "&token=<?= $newToken; ?>"; |
|
| 195 | 195 | } |
| 196 | 196 | } |
| 197 | 197 | |
@@ -199,7 +199,7 @@ discard block |
||
| 199 | 199 | { |
| 200 | 200 | var newDirname = prompt("<?= $_lang["files_dynamic_new_folder_name"] ?>", dir); |
| 201 | 201 | if (newDirname !== null && newDirname !== dir) { |
| 202 | - window.location.href = "index.php?a=31&mode=renameFolder&path=" + current_path + '&dirname=' + dir + "&newDirname=" + newDirname + "&token=<?= $newToken;?>"; |
|
| 202 | + window.location.href = "index.php?a=31&mode=renameFolder&path=" + current_path + '&dirname=' + dir + "&newDirname=" + newDirname + "&token=<?= $newToken; ?>"; |
|
| 203 | 203 | } |
| 204 | 204 | } |
| 205 | 205 | |
@@ -207,7 +207,7 @@ discard block |
||
| 207 | 207 | { |
| 208 | 208 | var newFilename = prompt("<?= $_lang["files_dynamic_new_file_name"] ?>", file); |
| 209 | 209 | if (newFilename !== null && newFilename !== file) { |
| 210 | - window.location.href = "index.php?a=31&mode=renameFile&path=" + current_path + '/' + file + "&newFilename=" + newFilename + "&token=<?= $newToken;?>"; |
|
| 210 | + window.location.href = "index.php?a=31&mode=renameFile&path=" + current_path + '/' + file + "&newFilename=" + newFilename + "&token=<?= $newToken; ?>"; |
|
| 211 | 211 | } |
| 212 | 212 | } |
| 213 | 213 | |
@@ -226,7 +226,7 @@ discard block |
||
| 226 | 226 | <?php endif ?> |
| 227 | 227 | <?php |
| 228 | 228 | if (isset($_GET['mode']) && $_GET['mode'] !== 'drill') { |
| 229 | - $href = 'a=31&path=' . urlencode($_REQUEST['path']); |
|
| 229 | + $href = 'a=31&path='.urlencode($_REQUEST['path']); |
|
| 230 | 230 | } else { |
| 231 | 231 | $href = 'a=2'; |
| 232 | 232 | } |
@@ -236,12 +236,12 @@ discard block |
||
| 236 | 236 | $tpl = '<a class="btn btn-secondary" href="[+href+]" onclick="return getFolderName(this);"><i class="[+image+]"></i><span>[+subject+]</span></a>'; |
| 237 | 237 | $ph['image'] = $_style['files_folder-open']; |
| 238 | 238 | $ph['subject'] = $_lang['add_folder']; |
| 239 | - $ph['href'] = 'index.php?a=31&mode=newfolder&path=' . urlencode($startpath) . '&name='; |
|
| 239 | + $ph['href'] = 'index.php?a=31&mode=newfolder&path='.urlencode($startpath).'&name='; |
|
| 240 | 240 | $_ = parsePlaceholder($tpl, $ph); |
| 241 | 241 | |
| 242 | - $tpl = '<a class="btn btn-secondary" href="[+href+]" onclick="return getFileName(this);"><i class="[+image+]"></i><span>' . $_lang['files.dynamic.php1'] . '</span></a>'; |
|
| 242 | + $tpl = '<a class="btn btn-secondary" href="[+href+]" onclick="return getFileName(this);"><i class="[+image+]"></i><span>'.$_lang['files.dynamic.php1'].'</span></a>'; |
|
| 243 | 243 | $ph['image'] = $_style['files_page_html']; |
| 244 | - $ph['href'] = 'index.php?a=31&mode=newfile&path=' . urlencode($startpath) . '&name='; |
|
| 244 | + $ph['href'] = 'index.php?a=31&mode=newfile&path='.urlencode($startpath).'&name='; |
|
| 245 | 245 | $_ .= parsePlaceholder($tpl, $ph); |
| 246 | 246 | echo $_; |
| 247 | 247 | } |
@@ -271,12 +271,12 @@ discard block |
||
| 271 | 271 | $ph = array(); |
| 272 | 272 | $ph['style_path'] = $theme_image_path; |
| 273 | 273 | // To Top Level with folder icon to the left |
| 274 | - if ($startpath == $filemanager_path || $startpath . '/' == $filemanager_path) { |
|
| 275 | - $ph['image'] = '' . $_style['files_top'] . ''; |
|
| 274 | + if ($startpath == $filemanager_path || $startpath.'/' == $filemanager_path) { |
|
| 275 | + $ph['image'] = ''.$_style['files_top'].''; |
|
| 276 | 276 | $ph['subject'] = '<span>Top</span>'; |
| 277 | 277 | } else { |
| 278 | - $ph['image'] = '' . $_style['files_top'] . ''; |
|
| 279 | - $ph['subject'] = '<a href="index.php?a=31&mode=drill&path=' . $filemanager_path . '">Top</a>/'; |
|
| 278 | + $ph['image'] = ''.$_style['files_top'].''; |
|
| 279 | + $ph['subject'] = '<a href="index.php?a=31&mode=drill&path='.$filemanager_path.'">Top</a>/'; |
|
| 280 | 280 | } |
| 281 | 281 | |
| 282 | 282 | echo parsePlaceholder($tpl, $ph); |
@@ -293,12 +293,12 @@ discard block |
||
| 293 | 293 | if (empty($v)) { |
| 294 | 294 | continue; |
| 295 | 295 | } |
| 296 | - $path .= rtrim($v, '/') . '/'; |
|
| 296 | + $path .= rtrim($v, '/').'/'; |
|
| 297 | 297 | if (1 < $count) { |
| 298 | - $href = 'index.php?a=31&mode=drill&path=' . urlencode($filemanager_path . $path); |
|
| 299 | - $pieces[$i] = '<a href="' . $href . '">' . trim($v, '/') . '</a>'; |
|
| 298 | + $href = 'index.php?a=31&mode=drill&path='.urlencode($filemanager_path.$path); |
|
| 299 | + $pieces[$i] = '<a href="'.$href.'">'.trim($v, '/').'</a>'; |
|
| 300 | 300 | } else { |
| 301 | - $pieces[$i] = '<span>' . trim($v, '/') . '</span>'; |
|
| 301 | + $pieces[$i] = '<span>'.trim($v, '/').'</span>'; |
|
| 302 | 302 | } |
| 303 | 303 | $count--; |
| 304 | 304 | } |
@@ -311,16 +311,16 @@ discard block |
||
| 311 | 311 | </div> |
| 312 | 312 | <?php |
| 313 | 313 | // check to see user isn't trying to move below the document_root |
| 314 | - if (substr(strtolower(str_replace('//', '/', $startpath . "/")), 0, $len) != strtolower(str_replace('//', '/', $filemanager_path . '/'))) { |
|
| 314 | + if (substr(strtolower(str_replace('//', '/', $startpath."/")), 0, $len) != strtolower(str_replace('//', '/', $filemanager_path.'/'))) { |
|
| 315 | 315 | $modx->webAlertAndQuit($_lang["files_access_denied"]); |
| 316 | 316 | } |
| 317 | 317 | |
| 318 | 318 | // Unzip .zip files - by Raymond |
| 319 | 319 | if ($enablefileunzip && $_REQUEST['mode'] == 'unzip' && is_writable($startpath)) { |
| 320 | - if (!$err = unzip(realpath("{$startpath}/" . $_REQUEST['file']), realpath($startpath))) { |
|
| 321 | - echo '<span class="warning"><b>' . $_lang['file_unzip_fail'] . ($err === 0 ? 'Missing zip library (php_zip.dll / zip.so)' : '') . '</b></span><br /><br />'; |
|
| 320 | + if (!$err = unzip(realpath("{$startpath}/".$_REQUEST['file']), realpath($startpath))) { |
|
| 321 | + echo '<span class="warning"><b>'.$_lang['file_unzip_fail'].($err === 0 ? 'Missing zip library (php_zip.dll / zip.so)' : '').'</b></span><br /><br />'; |
|
| 322 | 322 | } else { |
| 323 | - echo '<span class="success"><b>' . $_lang['file_unzip'] . '</b></span><br /><br />'; |
|
| 323 | + echo '<span class="success"><b>'.$_lang['file_unzip'].'</b></span><br /><br />'; |
|
| 324 | 324 | } |
| 325 | 325 | } |
| 326 | 326 | // End Unzip - Raymond |
@@ -332,9 +332,9 @@ discard block |
||
| 332 | 332 | if ($_REQUEST['mode'] == 'deletefolder') { |
| 333 | 333 | $folder = $_REQUEST['folderpath']; |
| 334 | 334 | if (!$token_check || !@rrmdir($folder)) { |
| 335 | - echo '<span class="warning"><b>' . $_lang['file_folder_not_deleted'] . '</b></span><br /><br />'; |
|
| 335 | + echo '<span class="warning"><b>'.$_lang['file_folder_not_deleted'].'</b></span><br /><br />'; |
|
| 336 | 336 | } else { |
| 337 | - echo '<span class="success"><b>' . $_lang['file_folder_deleted'] . '</b></span><br /><br />'; |
|
| 337 | + echo '<span class="success"><b>'.$_lang['file_folder_deleted'].'</b></span><br /><br />'; |
|
| 338 | 338 | } |
| 339 | 339 | } |
| 340 | 340 | |
@@ -345,10 +345,10 @@ discard block |
||
| 345 | 345 | if (!mkdirs("{$startpath}/{$foldername}", 0777)) { |
| 346 | 346 | echo '<span class="warning"><b>', $_lang['file_folder_not_created'], '</b></span><br /><br />'; |
| 347 | 347 | } else { |
| 348 | - if (!@chmod($startpath . '/' . $foldername, $newfolderaccessmode)) { |
|
| 349 | - echo '<span class="warning"><b>' . $_lang['file_folder_chmod_error'] . '</b></span><br /><br />'; |
|
| 348 | + if (!@chmod($startpath.'/'.$foldername, $newfolderaccessmode)) { |
|
| 349 | + echo '<span class="warning"><b>'.$_lang['file_folder_chmod_error'].'</b></span><br /><br />'; |
|
| 350 | 350 | } else { |
| 351 | - echo '<span class="success"><b>' . $_lang['file_folder_created'] . '</b></span><br /><br />'; |
|
| 351 | + echo '<span class="success"><b>'.$_lang['file_folder_created'].'</b></span><br /><br />'; |
|
| 352 | 352 | } |
| 353 | 353 | } |
| 354 | 354 | umask($old_umask); |
@@ -360,7 +360,7 @@ discard block |
||
| 360 | 360 | $filename = $modx->db->escape($filename); |
| 361 | 361 | |
| 362 | 362 | if (!checkExtension($filename)) { |
| 363 | - echo '<span class="warning"><b>' . $_lang['files_filetype_notok'] . '</b></span><br /><br />'; |
|
| 363 | + echo '<span class="warning"><b>'.$_lang['files_filetype_notok'].'</b></span><br /><br />'; |
|
| 364 | 364 | } elseif (preg_match('@(\\\\|\/|\:|\;|\,|\*|\?|\"|\<|\>|\||\?)@', $filename) !== 0) { |
| 365 | 365 | echo $_lang['files.dynamic.php3']; |
| 366 | 366 | } else { |
@@ -382,11 +382,11 @@ discard block |
||
| 382 | 382 | $newFilename = $modx->db->escape($newFilename); |
| 383 | 383 | |
| 384 | 384 | if (!checkExtension($newFilename)) { |
| 385 | - echo '<span class="warning"><b>' . $_lang['files_filetype_notok'] . '</b></span><br /><br />'; |
|
| 385 | + echo '<span class="warning"><b>'.$_lang['files_filetype_notok'].'</b></span><br /><br />'; |
|
| 386 | 386 | } elseif (preg_match('@(\\\\|\/|\:|\;|\,|\*|\?|\"|\<|\>|\||\?)@', $newFilename) !== 0) { |
| 387 | 387 | echo $_lang['files.dynamic.php3']; |
| 388 | 388 | } else { |
| 389 | - if (!copy($filename, MODX_BASE_PATH . $newFilename)) { |
|
| 389 | + if (!copy($filename, MODX_BASE_PATH.$newFilename)) { |
|
| 390 | 390 | echo $_lang['files.dynamic.php5']; |
| 391 | 391 | } |
| 392 | 392 | umask($old_umask); |
@@ -395,7 +395,7 @@ discard block |
||
| 395 | 395 | // Rename folder here |
| 396 | 396 | if ($_REQUEST['mode'] == 'renameFolder') { |
| 397 | 397 | $old_umask = umask(0); |
| 398 | - $dirname = $_REQUEST['path'] . '/' . $_REQUEST['dirname']; |
|
| 398 | + $dirname = $_REQUEST['path'].'/'.$_REQUEST['dirname']; |
|
| 399 | 399 | $dirname = $modx->db->escape($dirname); |
| 400 | 400 | $newDirname = str_replace(array( |
| 401 | 401 | '..\\', |
@@ -407,7 +407,7 @@ discard block |
||
| 407 | 407 | |
| 408 | 408 | if (preg_match('@(\\\\|\/|\:|\;|\,|\*|\?|\"|\<|\>|\||\?)@', $newDirname) !== 0) { |
| 409 | 409 | echo $_lang['files.dynamic.php3']; |
| 410 | - } else if (!rename($dirname, $_REQUEST['path'] . '/' . $newDirname)) { |
|
| 410 | + } else if (!rename($dirname, $_REQUEST['path'].'/'.$newDirname)) { |
|
| 411 | 411 | echo '<span class="warning"><b>', $_lang['file_folder_not_created'], '</b></span><br /><br />'; |
| 412 | 412 | } |
| 413 | 413 | umask($old_umask); |
@@ -427,11 +427,11 @@ discard block |
||
| 427 | 427 | $newFilename = $modx->db->escape($newFilename); |
| 428 | 428 | |
| 429 | 429 | if (!checkExtension($newFilename)) { |
| 430 | - echo '<span class="warning"><b>' . $_lang['files_filetype_notok'] . '</b></span><br /><br />'; |
|
| 430 | + echo '<span class="warning"><b>'.$_lang['files_filetype_notok'].'</b></span><br /><br />'; |
|
| 431 | 431 | } elseif (preg_match('@(\\\\|\/|\:|\;|\,|\*|\?|\"|\<|\>|\||\?)@', $newFilename) !== 0) { |
| 432 | 432 | echo $_lang['files.dynamic.php3']; |
| 433 | 433 | } else { |
| 434 | - if (!rename($filename, $path . '/' . $newFilename)) { |
|
| 434 | + if (!rename($filename, $path.'/'.$newFilename)) { |
|
| 435 | 435 | echo $_lang['files.dynamic.php5']; |
| 436 | 436 | } |
| 437 | 437 | umask($old_umask); |
@@ -464,7 +464,7 @@ discard block |
||
| 464 | 464 | ls($startpath); |
| 465 | 465 | echo "\n\n\n"; |
| 466 | 466 | if ($folders == 0 && $files == 0) { |
| 467 | - echo '<tr><td colspan="4"><i class="' . $_style['files_deleted_folder'] . ' FilesDeletedFolder"></i> <span style="color:#888;cursor:default;"> ' . $_lang['files_directory_is_empty'] . ' </span></td></tr>'; |
|
| 467 | + echo '<tr><td colspan="4"><i class="'.$_style['files_deleted_folder'].' FilesDeletedFolder"></i> <span style="color:#888;cursor:default;"> '.$_lang['files_directory_is_empty'].' </span></td></tr>'; |
|
| 468 | 468 | } |
| 469 | 469 | ?> |
| 470 | 470 | </table> |
@@ -473,10 +473,10 @@ discard block |
||
| 473 | 473 | <div class="container"> |
| 474 | 474 | <p> |
| 475 | 475 | <?php |
| 476 | - echo $_lang['files_directories'] . ': <b>' . $folders . '</b> '; |
|
| 477 | - echo $_lang['files_files'] . ': <b>' . $files . '</b> '; |
|
| 478 | - echo $_lang['files_data'] . ': <b><span dir="ltr">' . $modx->nicesize($filesizes) . '</span></b> '; |
|
| 479 | - echo $_lang['files_dirwritable'] . ' <b>' . (is_writable($startpath) == 1 ? $_lang['yes'] . '.' : $_lang['no']) . '.</b>' |
|
| 476 | + echo $_lang['files_directories'].': <b>'.$folders.'</b> '; |
|
| 477 | + echo $_lang['files_files'].': <b>'.$files.'</b> '; |
|
| 478 | + echo $_lang['files_data'].': <b><span dir="ltr">'.$modx->nicesize($filesizes).'</span></b> '; |
|
| 479 | + echo $_lang['files_dirwritable'].' <b>'.(is_writable($startpath) == 1 ? $_lang['yes'].'.' : $_lang['no']).'.</b>' |
|
| 480 | 480 | ?> |
| 481 | 481 | </p> |
| 482 | 482 | |
@@ -501,7 +501,7 @@ discard block |
||
| 501 | 501 | </form> |
| 502 | 502 | <?php |
| 503 | 503 | } else { |
| 504 | - echo "<p>" . $_lang['files_upload_inhibited_msg'] . "</p>"; |
|
| 504 | + echo "<p>".$_lang['files_upload_inhibited_msg']."</p>"; |
|
| 505 | 505 | } |
| 506 | 506 | ?> |
| 507 | 507 | <div id="imageviewer"></div> |
@@ -586,7 +586,7 @@ discard block |
||
| 586 | 586 | if ($file == $selFile) { |
| 587 | 587 | $icon = isset($icons[$mode]) ? $icons[$mode] : $icons['default']; |
| 588 | 588 | } |
| 589 | - return '<i class="' . $icon . ' FilesPage"></i>'; |
|
| 589 | + return '<i class="'.$icon.' FilesPage"></i>'; |
|
| 590 | 590 | } |
| 591 | 591 | |
| 592 | 592 | /** |
@@ -604,7 +604,7 @@ discard block |
||
| 604 | 604 | ); |
| 605 | 605 | if ($file == $selFile) { |
| 606 | 606 | $class = isset($classNames[$mode]) ? $classNames[$mode] : $classNames['default']; |
| 607 | - return ' class="' . $class . '"'; |
|
| 607 | + return ' class="'.$class.'"'; |
|
| 608 | 608 | } |
| 609 | 609 | return ''; |
| 610 | 610 | } |
@@ -618,7 +618,7 @@ discard block |
||
| 618 | 618 | global $excludes, $protected_path, $editablefiles, $inlineviewablefiles, $viewablefiles, $enablefileunzip, $enablefiledownload, $uploadablefiles, $folders, $files, $filesizes, $len, $dirs_array, $files_array, $webstart_path, $modx; |
| 619 | 619 | $dircounter = 0; |
| 620 | 620 | $filecounter = 0; |
| 621 | - $curpath = str_replace('//', '/', $curpath . '/'); |
|
| 621 | + $curpath = str_replace('//', '/', $curpath.'/'); |
|
| 622 | 622 | |
| 623 | 623 | if (!is_dir($curpath)) { |
| 624 | 624 | echo 'Invalid path "', $curpath, '"<br />'; |
@@ -628,7 +628,7 @@ discard block |
||
| 628 | 628 | |
| 629 | 629 | // first, get info |
| 630 | 630 | foreach ($dir as $file) { |
| 631 | - $newpath = $curpath . $file; |
|
| 631 | + $newpath = $curpath.$file; |
|
| 632 | 632 | if ($file === '..' || $file === '.') { |
| 633 | 633 | continue; |
| 634 | 634 | } |
@@ -638,7 +638,7 @@ discard block |
||
| 638 | 638 | if ($file === '..' || $file === '.') { |
| 639 | 639 | continue; |
| 640 | 640 | } elseif (!in_array($file, $excludes) && !in_array($newpath, $protected_path)) { |
| 641 | - $dirs_array[$dircounter]['text'] = '<i class="' . $_style['files_folder'] . ' FilesFolder"></i> <a href="index.php?a=31&mode=drill&path=' . urlencode($newpath) . '"><b>' . $file . '</b></a>'; |
|
| 641 | + $dirs_array[$dircounter]['text'] = '<i class="'.$_style['files_folder'].' FilesFolder"></i> <a href="index.php?a=31&mode=drill&path='.urlencode($newpath).'"><b>'.$file.'</b></a>'; |
|
| 642 | 642 | |
| 643 | 643 | $dfiles = scandir($newpath); |
| 644 | 644 | foreach ($dfiles as $i => $infile) { |
@@ -651,13 +651,13 @@ discard block |
||
| 651 | 651 | } |
| 652 | 652 | $file_exists = (0 < count($dfiles)) ? 'file_exists' : ''; |
| 653 | 653 | |
| 654 | - $dirs_array[$dircounter]['delete'] = is_writable($curpath) ? '<a href="javascript: deleteFolder(\'' . urlencode($file) . '\',\'' . $file_exists . '\');"><i class="' . $_style['files_delete'] . '" title="' . $_lang['file_delete_folder'] . '"></i></a>' : ''; |
|
| 654 | + $dirs_array[$dircounter]['delete'] = is_writable($curpath) ? '<a href="javascript: deleteFolder(\''.urlencode($file).'\',\''.$file_exists.'\');"><i class="'.$_style['files_delete'].'" title="'.$_lang['file_delete_folder'].'"></i></a>' : ''; |
|
| 655 | 655 | } else { |
| 656 | - $dirs_array[$dircounter]['text'] = '<span><i class="' . $_style['files_deleted_folder'] . ' FilesDeletedFolder"></i> ' . $file . '</span>'; |
|
| 657 | - $dirs_array[$dircounter]['delete'] = is_writable($curpath) ? '<span class="disabled"><i class="' . $_style['files_delete'] . '" title="' . $_lang['file_delete_folder'] . '"></i></span>' : ''; |
|
| 656 | + $dirs_array[$dircounter]['text'] = '<span><i class="'.$_style['files_deleted_folder'].' FilesDeletedFolder"></i> '.$file.'</span>'; |
|
| 657 | + $dirs_array[$dircounter]['delete'] = is_writable($curpath) ? '<span class="disabled"><i class="'.$_style['files_delete'].'" title="'.$_lang['file_delete_folder'].'"></i></span>' : ''; |
|
| 658 | 658 | } |
| 659 | 659 | |
| 660 | - $dirs_array[$dircounter]['rename'] = is_writable($curpath) ? '<a href="javascript:renameFolder(\'' . urlencode($file) . '\');"><i class="' . $_style['files_rename'] . '" title="' . $_lang['rename'] . '"></i></a> ' : ''; |
|
| 660 | + $dirs_array[$dircounter]['rename'] = is_writable($curpath) ? '<a href="javascript:renameFolder(\''.urlencode($file).'\');"><i class="'.$_style['files_rename'].'" title="'.$_lang['rename'].'"></i></a> ' : ''; |
|
| 661 | 661 | |
| 662 | 662 | // increment the counter |
| 663 | 663 | $dircounter++; |
@@ -665,14 +665,14 @@ discard block |
||
| 665 | 665 | $type = getExtension($newpath); |
| 666 | 666 | $files_array[$filecounter]['file'] = $newpath; |
| 667 | 667 | $files_array[$filecounter]['stats'] = lstat($newpath); |
| 668 | - $files_array[$filecounter]['text'] = determineIcon($newpath, $_REQUEST['path'], $_REQUEST['mode']) . ' ' . $file; |
|
| 669 | - $files_array[$filecounter]['view'] = (in_array($type, $viewablefiles)) ? '<a href="javascript:;" onclick="viewfile(\'' . $webstart_path . substr($newpath, $len, strlen($newpath)) . '\');"><i class="' . $_style['files_view'] . '" title="' . $_lang['files_viewfile'] . '"></i></a>' : (($enablefiledownload && in_array($type, $uploadablefiles)) ? '<a href="' . $webstart_path . implode('/', array_map('rawurlencode', explode('/', substr($newpath, $len, strlen($newpath))))) . '" style="cursor:pointer;"><i class="' . $_style['files_download'] . '" title="' . $_lang['file_download_file'] . '"></i></a>' : '<span class="disabled"><i class="' . $_style['files_view'] . '" title="' . $_lang['files_viewfile'] . '"></i></span>'); |
|
| 670 | - $files_array[$filecounter]['view'] = (in_array($type, $inlineviewablefiles)) ? '<a href="index.php?a=31&mode=view&path=' . urlencode($newpath) . '"><i class="' . $_style['files_view'] . '" title="' . $_lang['files_viewfile'] . '"></i></a>' : $files_array[$filecounter]['view']; |
|
| 671 | - $files_array[$filecounter]['unzip'] = ($enablefileunzip && $type == '.zip') ? '<a href="javascript:unzipFile(\'' . urlencode($file) . '\');"><i class="' . $_style['files_unzip'] . '" title="' . $_lang['file_download_unzip'] . '"></i></a>' : ''; |
|
| 672 | - $files_array[$filecounter]['edit'] = (in_array($type, $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '<a href="index.php?a=31&mode=edit&path=' . urlencode($newpath) . '#file_editfile"><i class="' . $_style['files_edit'] . '" title="' . $_lang['files_editfile'] . '"></i></a>' : '<span class="disabled"><i class="' . $_style['files_edit'] . '" title="' . $_lang['files_editfile'] . '"></i></span>'; |
|
| 673 | - $files_array[$filecounter]['duplicate'] = (in_array($type, $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '<a href="javascript:duplicateFile(\'' . urlencode($file) . '\');"><i class="' . $_style['files_duplicate'] . '" title="' . $_lang['duplicate'] . '"></i></a>' : '<span class="disabled"><i class="' . $_style['files_duplicate'] . '" align="absmiddle" title="' . $_lang['duplicate'] . '"></i></span>'; |
|
| 674 | - $files_array[$filecounter]['rename'] = (in_array($type, $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '<a href="javascript:renameFile(\'' . urlencode($file) . '\');"><i class="' . $_style['files_rename'] . '" align="absmiddle" title="' . $_lang['rename'] . '"></i></a>' : '<span class="disabled"><i class="' . $_style['files_rename'] . '" align="absmiddle" title="' . $_lang['rename'] . '"></i></span>'; |
|
| 675 | - $files_array[$filecounter]['delete'] = is_writable($curpath) && is_writable($newpath) ? '<a href="javascript:deleteFile(\'' . urlencode($file) . '\');"><i class="' . $_style['files_delete'] . '" title="' . $_lang['file_delete_file'] . '"></i></a>' : '<span class="disabled"><i class="' . $_style['files_delete'] . '" title="' . $_lang['file_delete_file'] . '"></i></span>'; |
|
| 668 | + $files_array[$filecounter]['text'] = determineIcon($newpath, $_REQUEST['path'], $_REQUEST['mode']).' '.$file; |
|
| 669 | + $files_array[$filecounter]['view'] = (in_array($type, $viewablefiles)) ? '<a href="javascript:;" onclick="viewfile(\''.$webstart_path.substr($newpath, $len, strlen($newpath)).'\');"><i class="'.$_style['files_view'].'" title="'.$_lang['files_viewfile'].'"></i></a>' : (($enablefiledownload && in_array($type, $uploadablefiles)) ? '<a href="'.$webstart_path.implode('/', array_map('rawurlencode', explode('/', substr($newpath, $len, strlen($newpath))))).'" style="cursor:pointer;"><i class="'.$_style['files_download'].'" title="'.$_lang['file_download_file'].'"></i></a>' : '<span class="disabled"><i class="'.$_style['files_view'].'" title="'.$_lang['files_viewfile'].'"></i></span>'); |
|
| 670 | + $files_array[$filecounter]['view'] = (in_array($type, $inlineviewablefiles)) ? '<a href="index.php?a=31&mode=view&path='.urlencode($newpath).'"><i class="'.$_style['files_view'].'" title="'.$_lang['files_viewfile'].'"></i></a>' : $files_array[$filecounter]['view']; |
|
| 671 | + $files_array[$filecounter]['unzip'] = ($enablefileunzip && $type == '.zip') ? '<a href="javascript:unzipFile(\''.urlencode($file).'\');"><i class="'.$_style['files_unzip'].'" title="'.$_lang['file_download_unzip'].'"></i></a>' : ''; |
|
| 672 | + $files_array[$filecounter]['edit'] = (in_array($type, $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '<a href="index.php?a=31&mode=edit&path='.urlencode($newpath).'#file_editfile"><i class="'.$_style['files_edit'].'" title="'.$_lang['files_editfile'].'"></i></a>' : '<span class="disabled"><i class="'.$_style['files_edit'].'" title="'.$_lang['files_editfile'].'"></i></span>'; |
|
| 673 | + $files_array[$filecounter]['duplicate'] = (in_array($type, $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '<a href="javascript:duplicateFile(\''.urlencode($file).'\');"><i class="'.$_style['files_duplicate'].'" title="'.$_lang['duplicate'].'"></i></a>' : '<span class="disabled"><i class="'.$_style['files_duplicate'].'" align="absmiddle" title="'.$_lang['duplicate'].'"></i></span>'; |
|
| 674 | + $files_array[$filecounter]['rename'] = (in_array($type, $editablefiles) && is_writable($curpath) && is_writable($newpath)) ? '<a href="javascript:renameFile(\''.urlencode($file).'\');"><i class="'.$_style['files_rename'].'" align="absmiddle" title="'.$_lang['rename'].'"></i></a>' : '<span class="disabled"><i class="'.$_style['files_rename'].'" align="absmiddle" title="'.$_lang['rename'].'"></i></span>'; |
|
| 675 | + $files_array[$filecounter]['delete'] = is_writable($curpath) && is_writable($newpath) ? '<a href="javascript:deleteFile(\''.urlencode($file).'\');"><i class="'.$_style['files_delete'].'" title="'.$_lang['file_delete_file'].'"></i></a>' : '<span class="disabled"><i class="'.$_style['files_delete'].'" title="'.$_lang['file_delete_file'].'"></i></span>'; |
|
| 676 | 676 | |
| 677 | 677 | // increment the counter |
| 678 | 678 | $filecounter++; |
@@ -685,9 +685,9 @@ discard block |
||
| 685 | 685 | for ($i = 0; $i < $folders; $i++) { |
| 686 | 686 | $filesizes += $dirs_array[$i]['stats']['7']; |
| 687 | 687 | echo '<tr>'; |
| 688 | - echo '<td>' . $dirs_array[$i]['text'] . '</td>'; |
|
| 689 | - echo '<td class="text-nowrap">' . $modx->toDateFormat($dirs_array[$i]['stats']['9']) . '</td>'; |
|
| 690 | - echo '<td class="text-right">' . $modx->nicesize($dirs_array[$i]['stats']['7']) . '</td>'; |
|
| 688 | + echo '<td>'.$dirs_array[$i]['text'].'</td>'; |
|
| 689 | + echo '<td class="text-nowrap">'.$modx->toDateFormat($dirs_array[$i]['stats']['9']).'</td>'; |
|
| 690 | + echo '<td class="text-right">'.$modx->nicesize($dirs_array[$i]['stats']['7']).'</td>'; |
|
| 691 | 691 | echo '<td class="actions text-right">'; |
| 692 | 692 | echo $dirs_array[$i]['rename']; |
| 693 | 693 | echo $dirs_array[$i]['delete']; |
@@ -700,10 +700,10 @@ discard block |
||
| 700 | 700 | sort($files_array); // sorting the array alphabetically (Thanks pxl8r!) |
| 701 | 701 | for ($i = 0; $i < $files; $i++) { |
| 702 | 702 | $filesizes += $files_array[$i]['stats']['7']; |
| 703 | - echo '<tr ' . markRow($files_array[$i]['file'], $_REQUEST['path'], $_REQUEST['mode']) . '>'; |
|
| 704 | - echo '<td>' . $files_array[$i]['text'] . '</td>'; |
|
| 705 | - echo '<td class="text-nowrap">' . $modx->toDateFormat($files_array[$i]['stats']['9']) . '</td>'; |
|
| 706 | - echo '<td class="text-right">' . $modx->nicesize($files_array[$i]['stats']['7']) . '</td>'; |
|
| 703 | + echo '<tr '.markRow($files_array[$i]['file'], $_REQUEST['path'], $_REQUEST['mode']).'>'; |
|
| 704 | + echo '<td>'.$files_array[$i]['text'].'</td>'; |
|
| 705 | + echo '<td class="text-nowrap">'.$modx->toDateFormat($files_array[$i]['stats']['9']).'</td>'; |
|
| 706 | + echo '<td class="text-right">'.$modx->nicesize($files_array[$i]['stats']['7']).'</td>'; |
|
| 707 | 707 | echo '<td class="actions text-right">'; |
| 708 | 708 | echo $files_array[$i]['unzip']; |
| 709 | 709 | echo $files_array[$i]['view']; |
@@ -840,17 +840,17 @@ discard block |
||
| 840 | 840 | $zip = zip_open($file); |
| 841 | 841 | if ($zip) { |
| 842 | 842 | $old_umask = umask(0); |
| 843 | - $path = rtrim($path, '/') . '/'; |
|
| 843 | + $path = rtrim($path, '/').'/'; |
|
| 844 | 844 | while ($zip_entry = zip_read($zip)) { |
| 845 | 845 | if (zip_entry_filesize($zip_entry) > 0) { |
| 846 | 846 | // str_replace must be used under windows to convert "/" into "\" |
| 847 | 847 | $zip_entry_name = zip_entry_name($zip_entry); |
| 848 | - $complete_path = $path . str_replace('\\', '/', dirname($zip_entry_name)); |
|
| 849 | - $complete_name = $path . str_replace('\\', '/', $zip_entry_name); |
|
| 848 | + $complete_path = $path.str_replace('\\', '/', dirname($zip_entry_name)); |
|
| 849 | + $complete_name = $path.str_replace('\\', '/', $zip_entry_name); |
|
| 850 | 850 | if (!file_exists($complete_path)) { |
| 851 | 851 | $tmp = ''; |
| 852 | 852 | foreach (explode('/', $complete_path) AS $k) { |
| 853 | - $tmp .= $k . '/'; |
|
| 853 | + $tmp .= $k.'/'; |
|
| 854 | 854 | if (!is_dir($tmp)) { |
| 855 | 855 | mkdir($tmp, 0777); |
| 856 | 856 | } |
@@ -875,7 +875,7 @@ discard block |
||
| 875 | 875 | */ |
| 876 | 876 | function rrmdir($dir) |
| 877 | 877 | { |
| 878 | - foreach (glob($dir . '/*') as $file) { |
|
| 878 | + foreach (glob($dir.'/*') as $file) { |
|
| 879 | 879 | if (is_dir($file)) { |
| 880 | 880 | rrmdir($file); |
| 881 | 881 | } else { |
@@ -894,7 +894,7 @@ discard block |
||
| 894 | 894 | $msg = ''; |
| 895 | 895 | foreach ($_FILES['userfile']['name'] as $i => $name) { |
| 896 | 896 | if (empty($_FILES['userfile']['tmp_name'][$i])) continue; |
| 897 | - $userfile= array(); |
|
| 897 | + $userfile = array(); |
|
| 898 | 898 | |
| 899 | 899 | $userfile['tmp_name'] = $_FILES['userfile']['tmp_name'][$i]; |
| 900 | 900 | $userfile['error'] = $_FILES['userfile']['error'][$i]; |
@@ -911,12 +911,12 @@ discard block |
||
| 911 | 911 | $userfile['type'] = $_FILES['userfile']['type'][$i]; |
| 912 | 912 | |
| 913 | 913 | // this seems to be an upload action. |
| 914 | - $path = $modx->config['site_url'] . substr($startpath, strlen($filemanager_path), strlen($startpath)); |
|
| 915 | - $path = rtrim($path, '/') . '/' . $userfile['name']; |
|
| 914 | + $path = $modx->config['site_url'].substr($startpath, strlen($filemanager_path), strlen($startpath)); |
|
| 915 | + $path = rtrim($path, '/').'/'.$userfile['name']; |
|
| 916 | 916 | $msg .= $path; |
| 917 | 917 | if ($userfile['error'] == 0) { |
| 918 | - $img = (strpos($userfile['type'], 'image') !== false) ? '<br /><img src="' . $path . '" height="75" />' : ''; |
|
| 919 | - $msg .= "<p>" . $_lang['files_file_type'] . $userfile['type'] . ", " . $modx->nicesize(filesize($userfile['tmp_name'])) . $img . '</p>'; |
|
| 918 | + $img = (strpos($userfile['type'], 'image') !== false) ? '<br /><img src="'.$path.'" height="75" />' : ''; |
|
| 919 | + $msg .= "<p>".$_lang['files_file_type'].$userfile['type'].", ".$modx->nicesize(filesize($userfile['tmp_name'])).$img.'</p>'; |
|
| 920 | 920 | } |
| 921 | 921 | |
| 922 | 922 | $userfilename = $userfile['tmp_name']; |
@@ -924,15 +924,15 @@ discard block |
||
| 924 | 924 | if (is_uploaded_file($userfilename)) { |
| 925 | 925 | // file is uploaded file, process it! |
| 926 | 926 | if (!checkExtension($userfile['name'])) { |
| 927 | - $msg .= '<p><span class="warning">' . $_lang['files_filetype_notok'] . '</span></p>'; |
|
| 927 | + $msg .= '<p><span class="warning">'.$_lang['files_filetype_notok'].'</span></p>'; |
|
| 928 | 928 | } else { |
| 929 | - if (@move_uploaded_file($userfile['tmp_name'], $_POST['path'] . '/' . $userfile['name'])) { |
|
| 929 | + if (@move_uploaded_file($userfile['tmp_name'], $_POST['path'].'/'.$userfile['name'])) { |
|
| 930 | 930 | // Ryan: Repair broken permissions issue with file manager |
| 931 | 931 | if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') { |
| 932 | - @chmod($_POST['path'] . "/" . $userfile['name'], $new_file_permissions); |
|
| 932 | + @chmod($_POST['path']."/".$userfile['name'], $new_file_permissions); |
|
| 933 | 933 | } |
| 934 | 934 | // Ryan: End |
| 935 | - $msg .= '<p><span class="success">' . $_lang['files_upload_ok'] . '</span></p><hr/>'; |
|
| 935 | + $msg .= '<p><span class="success">'.$_lang['files_upload_ok'].'</span></p><hr/>'; |
|
| 936 | 936 | |
| 937 | 937 | // invoke OnFileManagerUpload event |
| 938 | 938 | $modx->invokeEvent('OnFileManagerUpload', array( |
@@ -940,13 +940,13 @@ discard block |
||
| 940 | 940 | 'filename' => $userfile['name'] |
| 941 | 941 | )); |
| 942 | 942 | // Log the change |
| 943 | - logFileChange('upload', $_POST['path'] . '/' . $userfile['name']); |
|
| 943 | + logFileChange('upload', $_POST['path'].'/'.$userfile['name']); |
|
| 944 | 944 | } else { |
| 945 | - $msg .= '<p><span class="warning">' . $_lang['files_upload_copyfailed'] . '</span> ' . $_lang["files_upload_permissions_error"] . '</p>'; |
|
| 945 | + $msg .= '<p><span class="warning">'.$_lang['files_upload_copyfailed'].'</span> '.$_lang["files_upload_permissions_error"].'</p>'; |
|
| 946 | 946 | } |
| 947 | 947 | } |
| 948 | 948 | } else { |
| 949 | - $msg .= '<br /><span class="warning"><b>' . $_lang['files_upload_error'] . ':</b>'; |
|
| 949 | + $msg .= '<br /><span class="warning"><b>'.$_lang['files_upload_error'].':</b>'; |
|
| 950 | 950 | switch ($userfile['error']) { |
| 951 | 951 | case 0: //no error; possible file attack! |
| 952 | 952 | $msg .= $_lang['files_upload_error0']; |
@@ -970,7 +970,7 @@ discard block |
||
| 970 | 970 | $msg .= '</span><br />'; |
| 971 | 971 | } |
| 972 | 972 | } |
| 973 | - return $msg . '<br/>'; |
|
| 973 | + return $msg.'<br/>'; |
|
| 974 | 974 | } |
| 975 | 975 | |
| 976 | 976 | /** |
@@ -986,9 +986,9 @@ discard block |
||
| 986 | 986 | |
| 987 | 987 | // Write $content to our opened file. |
| 988 | 988 | if (file_put_contents($filename, $content) === false) { |
| 989 | - $msg .= '<span class="warning"><b>' . $_lang['file_not_saved'] . '</b></span><br /><br />'; |
|
| 989 | + $msg .= '<span class="warning"><b>'.$_lang['file_not_saved'].'</b></span><br /><br />'; |
|
| 990 | 990 | } else { |
| 991 | - $msg .= '<span class="success"><b>' . $_lang['file_saved'] . '</b></span><br /><br />'; |
|
| 991 | + $msg .= '<span class="success"><b>'.$_lang['file_saved'].'</b></span><br /><br />'; |
|
| 992 | 992 | $_REQUEST['mode'] = 'edit'; |
| 993 | 993 | } |
| 994 | 994 | // Log the change |
@@ -1007,9 +1007,9 @@ discard block |
||
| 1007 | 1007 | |
| 1008 | 1008 | $file = $_REQUEST['path']; |
| 1009 | 1009 | if (!$token_check || !@unlink($file)) { |
| 1010 | - $msg .= '<span class="warning"><b>' . $_lang['file_not_deleted'] . '</b></span><br /><br />'; |
|
| 1010 | + $msg .= '<span class="warning"><b>'.$_lang['file_not_deleted'].'</b></span><br /><br />'; |
|
| 1011 | 1011 | } else { |
| 1012 | - $msg .= '<span class="success"><b>' . $_lang['file_deleted'] . '</b></span><br /><br />'; |
|
| 1012 | + $msg .= '<span class="success"><b>'.$_lang['file_deleted'].'</b></span><br /><br />'; |
|
| 1013 | 1013 | } |
| 1014 | 1014 | |
| 1015 | 1015 | // Log the change |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 3 | 3 | exit(); |
| 4 | 4 | } |
| 5 | 5 | unset($_SESSION['itemname']); // clear this, because it's only set for logging purposes |
@@ -41,9 +41,9 @@ discard block |
||
| 41 | 41 | <?php |
| 42 | 42 | $rs = $modx->db->select('*', $modx->getFullTableName('site_templates')); |
| 43 | 43 | $option[] = '<option value="">No selected</option>'; |
| 44 | - $templateid = (isset($_REQUEST['templateid']) && $_REQUEST['templateid'] !== '') ? (int)$_REQUEST['templateid'] : ''; |
|
| 44 | + $templateid = (isset($_REQUEST['templateid']) && $_REQUEST['templateid'] !== '') ? (int) $_REQUEST['templateid'] : ''; |
|
| 45 | 45 | $selected = $templateid === 0 ? ' selected="selected"' : ''; |
| 46 | - $option[] = '<option value="0"' . $selected . '>(blank)</option>'; |
|
| 46 | + $option[] = '<option value="0"'.$selected.'>(blank)</option>'; |
|
| 47 | 47 | while ($row = $modx->db->getRow($rs)) { |
| 48 | 48 | $templatename = htmlspecialchars($row['templatename'], ENT_QUOTES, $modx->config['modx_charset']); |
| 49 | 49 | $selected = $row['id'] == $templateid ? ' selected="selected"' : ''; |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | $searchfields = htmlentities(trim($_POST['searchfields']), ENT_QUOTES, $modx_manager_charset); |
| 87 | 87 | $searchlongtitle = $modx->db->escape(trim($_REQUEST['searchfields'])); |
| 88 | 88 | $search_alias = $modx->db->escape(trim($_REQUEST['searchfields'])); |
| 89 | - $templateid = isset($_REQUEST['templateid']) && $_REQUEST['templateid'] !== '' ? (int)$_REQUEST['templateid'] : ''; |
|
| 89 | + $templateid = isset($_REQUEST['templateid']) && $_REQUEST['templateid'] !== '' ? (int) $_REQUEST['templateid'] : ''; |
|
| 90 | 90 | $searchcontent = $modx->db->escape($_REQUEST['content']); |
| 91 | 91 | |
| 92 | 92 | $fields = 'DISTINCT sc.id, contenttype, pagetitle, longtitle, description, introtext, menutitle, deleted, published, isfolder, type'; |
@@ -100,12 +100,12 @@ discard block |
||
| 100 | 100 | $friendly_url_suffix = $modx->config['friendly_url_suffix']; |
| 101 | 101 | $base_url = $modx->config['base_url']; |
| 102 | 102 | $site_url = $modx->config['site_url']; |
| 103 | - $url = preg_replace('@' . $friendly_url_suffix . '$@', '', $url); |
|
| 103 | + $url = preg_replace('@'.$friendly_url_suffix.'$@', '', $url); |
|
| 104 | 104 | if ($url[0] === '/') { |
| 105 | - $url = preg_replace('@^' . $base_url . '@', '', $url); |
|
| 105 | + $url = preg_replace('@^'.$base_url.'@', '', $url); |
|
| 106 | 106 | } |
| 107 | 107 | if (substr($url, 0, 4) === 'http') { |
| 108 | - $url = preg_replace('@^' . $site_url . '@', '', $url); |
|
| 108 | + $url = preg_replace('@^'.$site_url.'@', '', $url); |
|
| 109 | 109 | } |
| 110 | 110 | $idFromAlias = $modx->getIdFromAlias($url); |
| 111 | 111 | } |
@@ -118,18 +118,18 @@ discard block |
||
| 118 | 118 | $articul_query = "SELECT `contentid` FROM {$tbl_site_tmplvar_contentvalues} WHERE `value` LIKE '%{$searchfields}%'"; |
| 119 | 119 | $articul_result = $modx->db->query($articul_query); |
| 120 | 120 | $articul_id_array = $modx->db->makeArray($articul_result); |
| 121 | - if(count($articul_id_array)>0){ |
|
| 121 | + if (count($articul_id_array) > 0) { |
|
| 122 | 122 | $articul_id = ''; |
| 123 | 123 | $i = 1; |
| 124 | - foreach( $articul_id_array as $articul ) { |
|
| 125 | - $articul_id.=$articul['contentid']; |
|
| 126 | - if($i !== count($articul_id_array)){ |
|
| 127 | - $articul_id.=','; |
|
| 124 | + foreach ($articul_id_array as $articul) { |
|
| 125 | + $articul_id .= $articul['contentid']; |
|
| 126 | + if ($i !== count($articul_id_array)) { |
|
| 127 | + $articul_id .= ','; |
|
| 128 | 128 | } |
| 129 | 129 | $i++; |
| 130 | 130 | } |
| 131 | 131 | $articul_id_query = " OR sc.id IN ({$articul_id})"; |
| 132 | - }else{ |
|
| 132 | + } else { |
|
| 133 | 133 | $articul_id_query = ''; |
| 134 | 134 | } |
| 135 | 135 | /*end search by TV*/ |
@@ -137,7 +137,7 @@ discard block |
||
| 137 | 137 | if (ctype_digit($searchfields)) { |
| 138 | 138 | $sqladd .= "sc.id='{$searchfields}'"; |
| 139 | 139 | if (strlen($searchfields) > 3) { |
| 140 | - $sqladd .= $articul_id_query;//search by TV |
|
| 140 | + $sqladd .= $articul_id_query; //search by TV |
|
| 141 | 141 | $sqladd .= " OR sc.pagetitle LIKE '%{$searchfields}%'"; |
| 142 | 142 | } |
| 143 | 143 | } |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | $sqladd .= " OR sc.introtext LIKE '%{$searchlongtitle}%'"; |
| 158 | 158 | $sqladd .= " OR sc.menutitle LIKE '%{$searchlongtitle}%'"; |
| 159 | 159 | $sqladd .= " OR sc.alias LIKE '%{$search_alias}%'"; |
| 160 | - $sqladd .= $articul_id_query;//search by TV |
|
| 160 | + $sqladd .= $articul_id_query; //search by TV |
|
| 161 | 161 | $sqladd .= ")"; |
| 162 | 162 | } |
| 163 | 163 | } else if ($idFromAlias) { |
@@ -181,8 +181,8 @@ discard block |
||
| 181 | 181 | $docgrp = (isset($_SESSION['mgrDocgroups']) && is_array($_SESSION['mgrDocgroups'])) ? implode(',', $_SESSION['mgrDocgroups']) : ''; |
| 182 | 182 | $mgrRole = (isset ($_SESSION['mgrRole']) && $_SESSION['mgrRole'] == 1) ? 1 : 0; |
| 183 | 183 | $docgrp_cond = $docgrp ? " OR dg.document_group IN ({$docgrp})" : ''; |
| 184 | - $fields .= ', MAX(IF(1=' . $mgrRole . ' OR sc.privatemgr=0' . $docgrp_cond . ',1,0)) AS hasAccess'; |
|
| 185 | - $sqladd = '(' . $sqladd . ") AND (1={$mgrRole} OR sc.privatemgr=0" . (!$docgrp ? ')' : " OR dg.document_group IN ({$docgrp}))"); |
|
| 184 | + $fields .= ', MAX(IF(1='.$mgrRole.' OR sc.privatemgr=0'.$docgrp_cond.',1,0)) AS hasAccess'; |
|
| 185 | + $sqladd = '('.$sqladd.") AND (1={$mgrRole} OR sc.privatemgr=0".(!$docgrp ? ')' : " OR dg.document_group IN ({$docgrp}))"); |
|
| 186 | 186 | } |
| 187 | 187 | |
| 188 | 188 | if ($sqladd) { |
@@ -192,7 +192,7 @@ discard block |
||
| 192 | 192 | $where = $sqladd; |
| 193 | 193 | |
| 194 | 194 | if ($where) { |
| 195 | - $rs = $modx->db->select($fields, $tbl_site_content . ' AS sc LEFT JOIN ' . $tbldg . ' AS dg ON dg.document=sc.id', $where, 'sc.id'); |
|
| 195 | + $rs = $modx->db->select($fields, $tbl_site_content.' AS sc LEFT JOIN '.$tbldg.' AS dg ON dg.document=sc.id', $where, 'sc.id'); |
|
| 196 | 196 | $limit = $modx->db->getRecordCount($rs); |
| 197 | 197 | } else { |
| 198 | 198 | $limit = 0; |
@@ -211,7 +211,7 @@ discard block |
||
| 211 | 211 | if ($limit < 1) { |
| 212 | 212 | echo $_lang['search_empty']; |
| 213 | 213 | } else { |
| 214 | - printf('<p>' . $_lang['search_results_returned_msg'] . '</p>', $limit); |
|
| 214 | + printf('<p>'.$_lang['search_results_returned_msg'].'</p>', $limit); |
|
| 215 | 215 | ?> |
| 216 | 216 | <script type="text/javascript" src="media/script/tablesort.js"></script> |
| 217 | 217 | <table class="grid sortabletable sortable-onload-2 rowstyle-even" id="table-1"> |
@@ -271,14 +271,14 @@ discard block |
||
| 271 | 271 | if (function_exists('mb_strlen') && function_exists('mb_substr')) { |
| 272 | 272 | ?> |
| 273 | 273 | <td<?= $tdClass ?>> |
| 274 | - <a href="index.php?a=27&id=<?= $row['id'] ?>"><?= mb_strlen($row['pagetitle'], $modx_manager_charset) > 70 ? mb_substr($row['pagetitle'], 0, 70, $modx_manager_charset) . "..." : $row['pagetitle'] ?></a> |
|
| 274 | + <a href="index.php?a=27&id=<?= $row['id'] ?>"><?= mb_strlen($row['pagetitle'], $modx_manager_charset) > 70 ? mb_substr($row['pagetitle'], 0, 70, $modx_manager_charset)."..." : $row['pagetitle'] ?></a> |
|
| 275 | 275 | </td> |
| 276 | - <td<?= $tdClass ?>><?= mb_strlen($row['description'], $modx_manager_charset) > 70 ? mb_substr($row['description'], 0, 70, $modx_manager_charset) . "..." : $row['description'] ?></td> |
|
| 276 | + <td<?= $tdClass ?>><?= mb_strlen($row['description'], $modx_manager_charset) > 70 ? mb_substr($row['description'], 0, 70, $modx_manager_charset)."..." : $row['description'] ?></td> |
|
| 277 | 277 | <?php |
| 278 | 278 | } else { |
| 279 | 279 | ?> |
| 280 | - <td<?= $tdClass ?>><?= strlen($row['pagetitle']) > 20 ? substr($row['pagetitle'], 0, 20) . '...' : $row['pagetitle'] ?></td> |
|
| 281 | - <td<?= $tdClass ?>><?= strlen($row['description']) > 35 ? substr($row['description'], 0, 35) . '...' : $row['description'] ?></td> |
|
| 280 | + <td<?= $tdClass ?>><?= strlen($row['pagetitle']) > 20 ? substr($row['pagetitle'], 0, 20).'...' : $row['pagetitle'] ?></td> |
|
| 281 | + <td<?= $tdClass ?>><?= strlen($row['description']) > 35 ? substr($row['description'], 0, 35).'...' : $row['description'] ?></td> |
|
| 282 | 282 | <?php |
| 283 | 283 | } |
| 284 | 284 | ?> |
@@ -298,115 +298,115 @@ discard block |
||
| 298 | 298 | if ($modx->hasPermission('new_document') && $modx->hasPermission('edit_document') && $modx->hasPermission('save_document')) { |
| 299 | 299 | $docscounts = $modx->db->getRecordCount($rs); |
| 300 | 300 | if ($docscounts > 0) { |
| 301 | - $output .= '<li><b><i class="fa fa-sitemap"></i> ' . $_lang["manage_documents"] . ' (' . $docscounts . ')</b></li>'; |
|
| 301 | + $output .= '<li><b><i class="fa fa-sitemap"></i> '.$_lang["manage_documents"].' ('.$docscounts.')</b></li>'; |
|
| 302 | 302 | while ($row = $modx->db->getRow($rs)) { |
| 303 | - $output .= '<li' . addClassForItemList('', !$row['published'], $row['deleted']) . '><a href="index.php?a=27&id=' . $row['id'] . '" id="content_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['pagetitle'] . ' <small>(' . $row['id'] . ')</small>', $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>'; |
|
| 303 | + $output .= '<li'.addClassForItemList('', !$row['published'], $row['deleted']).'><a href="index.php?a=27&id='.$row['id'].'" id="content_'.$row['id'].'" target="main">'.highlightingCoincidence($row['pagetitle'].' <small>('.$row['id'].')</small>', $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>'; |
|
| 304 | 304 | } |
| 305 | 305 | } |
| 306 | 306 | } |
| 307 | 307 | |
| 308 | 308 | //templates |
| 309 | 309 | if ($modx->hasPermission('edit_template')) { |
| 310 | - $rs = $modx->db->select("id,templatename,locked", $modx->getFullTableName('site_templates'), "`id` like '%" . $searchfields . "%' |
|
| 311 | - OR `templatename` like '%" . $searchfields . "%' |
|
| 312 | - OR `description` like '%" . $searchfields . "%' |
|
| 313 | - OR `content` like '%" . $searchfields . "%'"); |
|
| 310 | + $rs = $modx->db->select("id,templatename,locked", $modx->getFullTableName('site_templates'), "`id` like '%".$searchfields."%' |
|
| 311 | + OR `templatename` like '%" . $searchfields."%' |
|
| 312 | + OR `description` like '%" . $searchfields."%' |
|
| 313 | + OR `content` like '%" . $searchfields."%'"); |
|
| 314 | 314 | $templatecounts = $modx->db->getRecordCount($rs); |
| 315 | 315 | if ($templatecounts > 0) { |
| 316 | - $output .= '<li><b><i class="fa fa-newspaper-o"></i> ' . $_lang["manage_templates"] . ' (' . $templatecounts . ')</b></li>'; |
|
| 316 | + $output .= '<li><b><i class="fa fa-newspaper-o"></i> '.$_lang["manage_templates"].' ('.$templatecounts.')</b></li>'; |
|
| 317 | 317 | while ($row = $modx->db->getRow($rs)) { |
| 318 | - $output .= '<li' . addClassForItemList($row['locked']) . '><a href="index.php?a=16&id=' . $row['id'] . '" id="templates_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['templatename'], $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>'; |
|
| 318 | + $output .= '<li'.addClassForItemList($row['locked']).'><a href="index.php?a=16&id='.$row['id'].'" id="templates_'.$row['id'].'" target="main">'.highlightingCoincidence($row['templatename'], $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>'; |
|
| 319 | 319 | } |
| 320 | 320 | } |
| 321 | 321 | } |
| 322 | 322 | |
| 323 | 323 | //tvs |
| 324 | 324 | if ($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) { |
| 325 | - $rs = $modx->db->select("id,name,locked", $modx->getFullTableName('site_tmplvars'), "`id` like '%" . $searchfields . "%' |
|
| 326 | - OR `name` like '%" . $searchfields . "%' |
|
| 327 | - OR `description` like '%" . $searchfields . "%' |
|
| 328 | - OR `type` like '%" . $searchfields . "%' |
|
| 329 | - OR `elements` like '%" . $searchfields . "%' |
|
| 330 | - OR `display` like '%" . $searchfields . "%' |
|
| 331 | - OR `display_params` like '%" . $searchfields . "%' |
|
| 332 | - OR `default_text` like '%" . $searchfields . "%'"); |
|
| 325 | + $rs = $modx->db->select("id,name,locked", $modx->getFullTableName('site_tmplvars'), "`id` like '%".$searchfields."%' |
|
| 326 | + OR `name` like '%" . $searchfields."%' |
|
| 327 | + OR `description` like '%" . $searchfields."%' |
|
| 328 | + OR `type` like '%" . $searchfields."%' |
|
| 329 | + OR `elements` like '%" . $searchfields."%' |
|
| 330 | + OR `display` like '%" . $searchfields."%' |
|
| 331 | + OR `display_params` like '%" . $searchfields."%' |
|
| 332 | + OR `default_text` like '%" . $searchfields."%'"); |
|
| 333 | 333 | $tvscounts = $modx->db->getRecordCount($rs); |
| 334 | 334 | if ($tvscounts > 0) { |
| 335 | - $output .= '<li><b><i class="fa fa-list-alt"></i> ' . $_lang["settings_templvars"] . ' (' . $tvscounts . ')</b></li>'; |
|
| 335 | + $output .= '<li><b><i class="fa fa-list-alt"></i> '.$_lang["settings_templvars"].' ('.$tvscounts.')</b></li>'; |
|
| 336 | 336 | while ($row = $modx->db->getRow($rs)) { |
| 337 | - $output .= '<li' . addClassForItemList($row['locked']) . '><a href="index.php?a=301&id=' . $row['id'] . '" id="tmplvars_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['name'], $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>'; |
|
| 337 | + $output .= '<li'.addClassForItemList($row['locked']).'><a href="index.php?a=301&id='.$row['id'].'" id="tmplvars_'.$row['id'].'" target="main">'.highlightingCoincidence($row['name'], $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>'; |
|
| 338 | 338 | } |
| 339 | 339 | } |
| 340 | 340 | } |
| 341 | 341 | |
| 342 | 342 | //Chunks |
| 343 | 343 | if ($modx->hasPermission('edit_chunk')) { |
| 344 | - $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_htmlsnippets'), "`id` like '%" . $searchfields . "%' |
|
| 345 | - OR `name` like '%" . $searchfields . "%' |
|
| 346 | - OR `description` like '%" . $searchfields . "%' |
|
| 347 | - OR `snippet` like '%" . $searchfields . "%'"); |
|
| 344 | + $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_htmlsnippets'), "`id` like '%".$searchfields."%' |
|
| 345 | + OR `name` like '%" . $searchfields."%' |
|
| 346 | + OR `description` like '%" . $searchfields."%' |
|
| 347 | + OR `snippet` like '%" . $searchfields."%'"); |
|
| 348 | 348 | $chunkscounts = $modx->db->getRecordCount($rs); |
| 349 | 349 | if ($chunkscounts > 0) { |
| 350 | - $output .= '<li><b><i class="fa fa-th-large"></i> ' . $_lang["manage_htmlsnippets"] . ' (' . $chunkscounts . ')</b></li>'; |
|
| 350 | + $output .= '<li><b><i class="fa fa-th-large"></i> '.$_lang["manage_htmlsnippets"].' ('.$chunkscounts.')</b></li>'; |
|
| 351 | 351 | while ($row = $modx->db->getRow($rs)) { |
| 352 | - $output .= '<li' . addClassForItemList($row['locked'], $row['disabled']) . '><a href="index.php?a=78&id=' . $row['id'] . '" id="htmlsnippets_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['name'], $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>'; |
|
| 352 | + $output .= '<li'.addClassForItemList($row['locked'], $row['disabled']).'><a href="index.php?a=78&id='.$row['id'].'" id="htmlsnippets_'.$row['id'].'" target="main">'.highlightingCoincidence($row['name'], $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>'; |
|
| 353 | 353 | } |
| 354 | 354 | } |
| 355 | 355 | } |
| 356 | 356 | |
| 357 | 357 | //Snippets |
| 358 | 358 | if ($modx->hasPermission('edit_snippet')) { |
| 359 | - $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_snippets'), "`id` like '%" . $searchfields . "%' |
|
| 360 | - OR `name` like '%" . $searchfields . "%' |
|
| 361 | - OR `description` like '%" . $searchfields . "%' |
|
| 362 | - OR `snippet` like '%" . $searchfields . "%' |
|
| 363 | - OR `properties` like '%" . $searchfields . "%' |
|
| 364 | - OR `moduleguid` like '%" . $searchfields . "%'"); |
|
| 359 | + $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_snippets'), "`id` like '%".$searchfields."%' |
|
| 360 | + OR `name` like '%" . $searchfields."%' |
|
| 361 | + OR `description` like '%" . $searchfields."%' |
|
| 362 | + OR `snippet` like '%" . $searchfields."%' |
|
| 363 | + OR `properties` like '%" . $searchfields."%' |
|
| 364 | + OR `moduleguid` like '%" . $searchfields."%'"); |
|
| 365 | 365 | $snippetscounts = $modx->db->getRecordCount($rs); |
| 366 | 366 | if ($snippetscounts > 0) { |
| 367 | - $output .= '<li><b><i class="fa fa-code"></i> ' . $_lang["manage_snippets"] . ' (' . $snippetscounts . ')</b></li>'; |
|
| 367 | + $output .= '<li><b><i class="fa fa-code"></i> '.$_lang["manage_snippets"].' ('.$snippetscounts.')</b></li>'; |
|
| 368 | 368 | while ($row = $modx->db->getRow($rs)) { |
| 369 | - $output .= '<li' . addClassForItemList($row['locked'], $row['disabled']) . '><a href="index.php?a=22&id=' . $row['id'] . '" id="snippets_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['name'], $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>'; |
|
| 369 | + $output .= '<li'.addClassForItemList($row['locked'], $row['disabled']).'><a href="index.php?a=22&id='.$row['id'].'" id="snippets_'.$row['id'].'" target="main">'.highlightingCoincidence($row['name'], $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>'; |
|
| 370 | 370 | } |
| 371 | 371 | } |
| 372 | 372 | } |
| 373 | 373 | |
| 374 | 374 | //plugins |
| 375 | 375 | if ($modx->hasPermission('edit_plugin')) { |
| 376 | - $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_plugins'), "`id` like '%" . $searchfields . "%' |
|
| 377 | - OR `name` like '%" . $searchfields . "%' |
|
| 378 | - OR `description` like '%" . $searchfields . "%' |
|
| 379 | - OR `plugincode` like '%" . $searchfields . "%' |
|
| 380 | - OR `properties` like '%" . $searchfields . "%' |
|
| 381 | - OR `moduleguid` like '%" . $searchfields . "%'"); |
|
| 376 | + $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_plugins'), "`id` like '%".$searchfields."%' |
|
| 377 | + OR `name` like '%" . $searchfields."%' |
|
| 378 | + OR `description` like '%" . $searchfields."%' |
|
| 379 | + OR `plugincode` like '%" . $searchfields."%' |
|
| 380 | + OR `properties` like '%" . $searchfields."%' |
|
| 381 | + OR `moduleguid` like '%" . $searchfields."%'"); |
|
| 382 | 382 | $pluginscounts = $modx->db->getRecordCount($rs); |
| 383 | 383 | if ($pluginscounts > 0) { |
| 384 | - $output .= '<li><b><i class="fa fa-plug"></i> ' . $_lang["manage_plugins"] . ' (' . $pluginscounts . ')</b></li>'; |
|
| 384 | + $output .= '<li><b><i class="fa fa-plug"></i> '.$_lang["manage_plugins"].' ('.$pluginscounts.')</b></li>'; |
|
| 385 | 385 | while ($row = $modx->db->getRow($rs)) { |
| 386 | - $output .= '<li' . addClassForItemList($row['locked'], $row['disabled']) . '><a href="index.php?a=102&id=' . $row['id'] . '" id="plugins_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['name'], $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>'; |
|
| 386 | + $output .= '<li'.addClassForItemList($row['locked'], $row['disabled']).'><a href="index.php?a=102&id='.$row['id'].'" id="plugins_'.$row['id'].'" target="main">'.highlightingCoincidence($row['name'], $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>'; |
|
| 387 | 387 | } |
| 388 | 388 | } |
| 389 | 389 | } |
| 390 | 390 | |
| 391 | 391 | //modules |
| 392 | 392 | if ($modx->hasPermission('edit_module')) { |
| 393 | - $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_modules'), "`id` like '%" . $searchfields . "%' |
|
| 394 | - OR `name` like '%" . $searchfields . "%' |
|
| 395 | - OR `description` like '%" . $searchfields . "%' |
|
| 396 | - OR `modulecode` like '%" . $searchfields . "%' |
|
| 397 | - OR `properties` like '%" . $searchfields . "%' |
|
| 398 | - OR `guid` like '%" . $searchfields . "%' |
|
| 399 | - OR `resourcefile` like '%" . $searchfields . "%'"); |
|
| 393 | + $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_modules'), "`id` like '%".$searchfields."%' |
|
| 394 | + OR `name` like '%" . $searchfields."%' |
|
| 395 | + OR `description` like '%" . $searchfields."%' |
|
| 396 | + OR `modulecode` like '%" . $searchfields."%' |
|
| 397 | + OR `properties` like '%" . $searchfields."%' |
|
| 398 | + OR `guid` like '%" . $searchfields."%' |
|
| 399 | + OR `resourcefile` like '%" . $searchfields."%'"); |
|
| 400 | 400 | $modulescounts = $modx->db->getRecordCount($rs); |
| 401 | 401 | if ($modulescounts > 0) { |
| 402 | - $output .= '<li><b><i class="fa fa-cogs"></i> ' . $_lang["modules"] . ' (' . $modulescounts . ')</b></li>'; |
|
| 402 | + $output .= '<li><b><i class="fa fa-cogs"></i> '.$_lang["modules"].' ('.$modulescounts.')</b></li>'; |
|
| 403 | 403 | while ($row = $modx->db->getRow($rs)) { |
| 404 | - $output .= '<li' . addClassForItemList($row['locked'], $row['disabled']) . '><a href="index.php?a=108&id=' . $row['id'] . '" id="modules_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['name'], $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>'; |
|
| 404 | + $output .= '<li'.addClassForItemList($row['locked'], $row['disabled']).'><a href="index.php?a=108&id='.$row['id'].'" id="modules_'.$row['id'].'" target="main">'.highlightingCoincidence($row['name'], $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>'; |
|
| 405 | 405 | } |
| 406 | 406 | } |
| 407 | 407 | } |
| 408 | 408 | |
| 409 | - echo $output ? '<div class="ajaxSearchResults"><ul>' . $output . '</ul></div>' : '1'; |
|
| 409 | + echo $output ? '<div class="ajaxSearchResults"><ul>'.$output.'</ul></div>' : '1'; |
|
| 410 | 410 | } |
| 411 | 411 | |
| 412 | 412 | ?> |
@@ -422,13 +422,13 @@ discard block |
||
| 422 | 422 | */ |
| 423 | 423 | function highlightingCoincidence($text, $search) |
| 424 | 424 | { |
| 425 | - $regexp = '!(' . str_replace(array( |
|
| 425 | + $regexp = '!('.str_replace(array( |
|
| 426 | 426 | '(', |
| 427 | 427 | ')' |
| 428 | 428 | ), array( |
| 429 | 429 | '\(', |
| 430 | 430 | '\)' |
| 431 | - ), trim($search)) . ')!isu'; |
|
| 431 | + ), trim($search)).')!isu'; |
|
| 432 | 432 | return preg_replace($regexp, '<span class="text-danger">$1</span>', $text); |
| 433 | 433 | } |
| 434 | 434 | |
@@ -451,7 +451,7 @@ discard block |
||
| 451 | 451 | $class .= ' deleted'; |
| 452 | 452 | } |
| 453 | 453 | if ($class) { |
| 454 | - $class = ' class="' . trim($class) . '"'; |
|
| 454 | + $class = ' class="'.trim($class).'"'; |
|
| 455 | 455 | } |
| 456 | 456 | return $class; |
| 457 | 457 | } |
@@ -20,37 +20,37 @@ discard block |
||
| 20 | 20 | $body_class = ''; |
| 21 | 21 | $theme_modes = array('', 'lightness', 'light', 'dark', 'darkness');
|
| 22 | 22 | if (!empty($theme_modes[$_COOKIE['MODX_themeMode']])) {
|
| 23 | - $body_class .= ' ' . $theme_modes[$_COOKIE['MODX_themeMode']]; |
|
| 23 | + $body_class .= ' '.$theme_modes[$_COOKIE['MODX_themeMode']]; |
|
| 24 | 24 | } elseif (!empty($theme_modes[$modx->config['manager_theme_mode']])) {
|
| 25 | - $body_class .= ' ' . $theme_modes[$modx->config['manager_theme_mode']]; |
|
| 25 | + $body_class .= ' '.$theme_modes[$modx->config['manager_theme_mode']]; |
|
| 26 | 26 | } |
| 27 | 27 | |
| 28 | -$css = 'media/style/' . $modx->config['manager_theme'] . '/style.css?v=' . $lastInstallTime; |
|
| 28 | +$css = 'media/style/'.$modx->config['manager_theme'].'/style.css?v='.$lastInstallTime; |
|
| 29 | 29 | |
| 30 | 30 | if ($modx->config['manager_theme'] == 'default') {
|
| 31 | - if (!file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css') |
|
| 32 | - && is_writable(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css')) {
|
|
| 33 | - require_once MODX_BASE_PATH . 'assets/lib/Formatter/CSSMinify.php'; |
|
| 31 | + if (!file_exists(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css') |
|
| 32 | + && is_writable(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css')) {
|
|
| 33 | + require_once MODX_BASE_PATH.'assets/lib/Formatter/CSSMinify.php'; |
|
| 34 | 34 | $minifier = new Formatter\CSSMinify(); |
| 35 | - $minifier->addFile(MODX_MANAGER_PATH . 'media/style/common/bootstrap/css/bootstrap.min.css'); |
|
| 36 | - $minifier->addFile(MODX_MANAGER_PATH . 'media/style/common/font-awesome/css/font-awesome.min.css'); |
|
| 37 | - $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/fonts.css'); |
|
| 38 | - $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/forms.css'); |
|
| 39 | - $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/mainmenu.css'); |
|
| 40 | - $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/tree.css'); |
|
| 41 | - $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/custom.css'); |
|
| 42 | - $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/tabpane.css'); |
|
| 43 | - $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/contextmenu.css'); |
|
| 44 | - $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/index.css'); |
|
| 45 | - $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/main.css'); |
|
| 35 | + $minifier->addFile(MODX_MANAGER_PATH.'media/style/common/bootstrap/css/bootstrap.min.css'); |
|
| 36 | + $minifier->addFile(MODX_MANAGER_PATH.'media/style/common/font-awesome/css/font-awesome.min.css'); |
|
| 37 | + $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/fonts.css'); |
|
| 38 | + $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/forms.css'); |
|
| 39 | + $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/mainmenu.css'); |
|
| 40 | + $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/tree.css'); |
|
| 41 | + $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/custom.css'); |
|
| 42 | + $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/tabpane.css'); |
|
| 43 | + $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/contextmenu.css'); |
|
| 44 | + $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/index.css'); |
|
| 45 | + $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/main.css'); |
|
| 46 | 46 | $css = $minifier->minify(); |
| 47 | 47 | file_put_contents( |
| 48 | - MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css', |
|
| 48 | + MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css', |
|
| 49 | 49 | $css |
| 50 | 50 | ); |
| 51 | 51 | } |
| 52 | - if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) {
|
|
| 53 | - $css = 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css?v=' . $lastInstallTime; |
|
| 52 | + if (file_exists(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css')) {
|
|
| 53 | + $css = 'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css?v='.$lastInstallTime; |
|
| 54 | 54 | } |
| 55 | 55 | } |
| 56 | 56 | |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | <meta http-equiv="X-UA-Compatible" content="IE=edge"/> |
| 66 | 66 | <link rel="stylesheet" type="text/css" href="<?= $css ?>"/> |
| 67 | 67 | <script type="text/javascript" src="media/script/tabpane.js"></script> |
| 68 | - <?= sprintf('<script type="text/javascript" src="%s"></script>' . "\n", $modx->config['mgr_jquery_path']) ?>
|
|
| 68 | + <?= sprintf('<script type="text/javascript" src="%s"></script>'."\n", $modx->config['mgr_jquery_path']) ?>
|
|
| 69 | 69 | <?php if ($modx->config['show_picker'] != "0") { ?>
|
| 70 | 70 | <script src="media/style/<?= $modx->config['manager_theme'] ?>/js/color.switcher.js" |
| 71 | 71 | type="text/javascript"></script> |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | <?php } ?> |
| 79 | 79 | |
| 80 | 80 | <!-- OnManagerMainFrameHeaderHTMLBlock --> |
| 81 | - <?= $onManagerMainFrameHeaderHTMLBlock . "\n" ?> |
|
| 81 | + <?= $onManagerMainFrameHeaderHTMLBlock."\n" ?> |
|
| 82 | 82 | |
| 83 | 83 | <script type="text/javascript"> |
| 84 | 84 | if (!evo) {
|
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | <script> |
| 108 | 108 | <?php |
| 109 | 109 | if (isset($_REQUEST['r']) && preg_match('@^[0-9]+$@', $_REQUEST['r'])) {
|
| 110 | - echo 'doRefresh(' . $_REQUEST['r'] . ");\n";
|
|
| 110 | + echo 'doRefresh('.$_REQUEST['r'].");\n";
|
|
| 111 | 111 | } |
| 112 | 112 | ?> |
| 113 | 113 | </script> |
@@ -18,13 +18,13 @@ discard block |
||
| 18 | 18 | } |
| 19 | 19 | |
| 20 | 20 | // andrazk 20070416 - if installer is running, destroy active sessions |
| 21 | -if (file_exists(MODX_BASE_PATH . 'assets/cache/installProc.inc.php')) { |
|
| 22 | - include_once(MODX_BASE_PATH . 'assets/cache/installProc.inc.php'); |
|
| 21 | +if (file_exists(MODX_BASE_PATH.'assets/cache/installProc.inc.php')) { |
|
| 22 | + include_once(MODX_BASE_PATH.'assets/cache/installProc.inc.php'); |
|
| 23 | 23 | if (isset($installStartTime)) { |
| 24 | 24 | if ((time() - $installStartTime) > 5 * 60) { // if install flag older than 5 minutes, discard |
| 25 | 25 | unset($installStartTime); |
| 26 | - @ chmod(MODX_BASE_PATH . 'assets/cache/installProc.inc.php', 0755); |
|
| 27 | - unlink(MODX_BASE_PATH . 'assets/cache/installProc.inc.php'); |
|
| 26 | + @ chmod(MODX_BASE_PATH.'assets/cache/installProc.inc.php', 0755); |
|
| 27 | + unlink(MODX_BASE_PATH.'assets/cache/installProc.inc.php'); |
|
| 28 | 28 | } else { |
| 29 | 29 | if ($_SERVER['REQUEST_METHOD'] != 'POST') { |
| 30 | 30 | if (isset($_COOKIE[session_name()])) { |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | // setcookie(session_name(), '', 0, MODX_BASE_URL); |
| 51 | 51 | } |
| 52 | 52 | header('HTTP/1.0 307 Redirect'); |
| 53 | - header('Location: ' . MODX_MANAGER_URL . 'index.php?installGoingOn=2'); |
|
| 53 | + header('Location: '.MODX_MANAGER_URL.'index.php?installGoingOn=2'); |
|
| 54 | 54 | } |
| 55 | 55 | } |
| 56 | 56 | } |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | // establish fallback to English default |
| 63 | 63 | include_once "lang/english.inc.php"; |
| 64 | 64 | // include localized overrides |
| 65 | - include_once "lang/" . $manager_language . ".inc.php"; |
|
| 65 | + include_once "lang/".$manager_language.".inc.php"; |
|
| 66 | 66 | } else { |
| 67 | 67 | include_once "lang/english.inc.php"; |
| 68 | 68 | } |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | $modx->setPlaceholder('modx_charset', $modx_manager_charset); |
| 71 | 71 | $modx->setPlaceholder('theme', $manager_theme); |
| 72 | 72 | $modx->setPlaceholder('favicon', |
| 73 | - (file_exists(MODX_BASE_PATH . 'favicon.ico') ? MODX_SITE_URL . 'favicon.ico' : 'media/style/' . $modx->config['manager_theme'] . '/images/favicon.ico')); |
|
| 73 | + (file_exists(MODX_BASE_PATH.'favicon.ico') ? MODX_SITE_URL . 'favicon.ico' : 'media/style/'.$modx->config['manager_theme'].'/images/favicon.ico')); |
|
| 74 | 74 | |
| 75 | 75 | // invoke OnManagerLoginFormPrerender event |
| 76 | 76 | $evtOut = $modx->invokeEvent('OnManagerLoginFormPrerender'); |
@@ -81,25 +81,25 @@ discard block |
||
| 81 | 81 | $modx->setPlaceholder('manager_path', MGR_DIR); |
| 82 | 82 | $modx->setPlaceholder('logo_slogan', $_lang["logo_slogan"]); |
| 83 | 83 | $modx->setPlaceholder('login_message', $_lang["login_message"]); |
| 84 | - $modx->setPlaceholder('manager_theme_url', MODX_MANAGER_URL . 'media/style/' . $modx->config['manager_theme'] . '/'); |
|
| 84 | + $modx->setPlaceholder('manager_theme_url', MODX_MANAGER_URL.'media/style/'.$modx->config['manager_theme'].'/'); |
|
| 85 | 85 | $modx->setPlaceholder('year', date('Y')); |
| 86 | 86 | |
| 87 | 87 | // set login logo image |
| 88 | - if ( !empty($modx->config['login_logo']) ) { |
|
| 89 | - $modx->setPlaceholder('login_logo', MODX_SITE_URL . $modx->config['login_logo']); |
|
| 88 | + if (!empty($modx->config['login_logo'])) { |
|
| 89 | + $modx->setPlaceholder('login_logo', MODX_SITE_URL.$modx->config['login_logo']); |
|
| 90 | 90 | } else { |
| 91 | - $modx->setPlaceholder('login_logo', MODX_MANAGER_URL . 'media/style/' . $modx->config['manager_theme'] . '/images/login/default/login-logo.png'); |
|
| 91 | + $modx->setPlaceholder('login_logo', MODX_MANAGER_URL.'media/style/'.$modx->config['manager_theme'].'/images/login/default/login-logo.png'); |
|
| 92 | 92 | } |
| 93 | 93 | |
| 94 | 94 | // set login background image |
| 95 | - if ( !empty($modx->config['login_bg']) ) { |
|
| 96 | - $modx->setPlaceholder('login_bg', MODX_SITE_URL . $modx->config['login_bg']); |
|
| 95 | + if (!empty($modx->config['login_bg'])) { |
|
| 96 | + $modx->setPlaceholder('login_bg', MODX_SITE_URL.$modx->config['login_bg']); |
|
| 97 | 97 | } else { |
| 98 | - $modx->setPlaceholder('login_bg', MODX_MANAGER_URL . 'media/style/' . $modx->config['manager_theme'] . '/images/login/default/login-background.jpg'); |
|
| 98 | + $modx->setPlaceholder('login_bg', MODX_MANAGER_URL.'media/style/'.$modx->config['manager_theme'].'/images/login/default/login-background.jpg'); |
|
| 99 | 99 | } |
| 100 | 100 | |
| 101 | 101 | // set form position css class |
| 102 | - $modx->setPlaceholder('login_form_position_class', 'loginbox-' . $modx->config['login_form_position']); |
|
| 102 | + $modx->setPlaceholder('login_form_position_class', 'loginbox-'.$modx->config['login_form_position']); |
|
| 103 | 103 | |
| 104 | 104 | switch ($modx->config['manager_theme_mode']) { |
| 105 | 105 | case '1': |
@@ -124,11 +124,11 @@ discard block |
||
| 124 | 124 | switch ($installGoingOn) { |
| 125 | 125 | case 1 : |
| 126 | 126 | $modx->setPlaceholder('login_message', |
| 127 | - "<p><span class=\"fail\">" . $_lang["login_cancelled_install_in_progress"] . "</p><p>" . $_lang["login_message"] . "</p>"); |
|
| 127 | + "<p><span class=\"fail\">".$_lang["login_cancelled_install_in_progress"]."</p><p>".$_lang["login_message"]."</p>"); |
|
| 128 | 128 | break; |
| 129 | 129 | case 2 : |
| 130 | 130 | $modx->setPlaceholder('login_message', |
| 131 | - "<p><span class=\"fail\">" . $_lang["login_cancelled_site_was_updated"] . "</p><p>" . $_lang["login_message"] . "</p>"); |
|
| 131 | + "<p><span class=\"fail\">".$_lang["login_cancelled_site_was_updated"]."</p><p>".$_lang["login_message"]."</p>"); |
|
| 132 | 132 | break; |
| 133 | 133 | } |
| 134 | 134 | } |
@@ -136,9 +136,9 @@ discard block |
||
| 136 | 136 | if ($modx->config['use_captcha'] == 1) { |
| 137 | 137 | $modx->setPlaceholder('login_captcha_message', $_lang["login_captcha_message"]); |
| 138 | 138 | $modx->setPlaceholder('captcha_image', |
| 139 | - '<a href="' . MODX_MANAGER_URL . '" class="loginCaptcha"><img id="captcha_image" src="' . MODX_MANAGER_URL . 'includes/veriword.php?rand=' . rand() . '" alt="' . $_lang["login_captcha_message"] . '" /></a>'); |
|
| 139 | + '<a href="'.MODX_MANAGER_URL.'" class="loginCaptcha"><img id="captcha_image" src="'.MODX_MANAGER_URL.'includes/veriword.php?rand='.rand().'" alt="'.$_lang["login_captcha_message"].'" /></a>'); |
|
| 140 | 140 | $modx->setPlaceholder('captcha_input', |
| 141 | - '<label>' . $_lang["captcha_code"] . '</label> <input type="text" name="captcha_code" tabindex="3" value="" />'); |
|
| 141 | + '<label>'.$_lang["captcha_code"].'</label> <input type="text" name="captcha_code" tabindex="3" value="" />'); |
|
| 142 | 142 | } |
| 143 | 143 | |
| 144 | 144 | // login info |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | |
| 157 | 157 | // invoke OnManagerLoginFormRender event |
| 158 | 158 | $evtOut = $modx->invokeEvent('OnManagerLoginFormRender'); |
| 159 | - $html = is_array($evtOut) ? '<div id="onManagerLoginFormRender">' . implode('', $evtOut) . '</div>' : ''; |
|
| 159 | + $html = is_array($evtOut) ? '<div id="onManagerLoginFormRender">'.implode('', $evtOut).'</div>' : ''; |
|
| 160 | 160 | $modx->setPlaceholder('OnManagerLoginFormRender', $html); |
| 161 | 161 | |
| 162 | 162 | // load template |
@@ -174,29 +174,29 @@ discard block |
||
| 174 | 174 | $login_tpl = file_get_contents($target); |
| 175 | 175 | } |
| 176 | 176 | } else { |
| 177 | - $theme_path = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/'; |
|
| 178 | - if (is_file($theme_path . 'style.php')) { |
|
| 179 | - include($theme_path . 'style.php'); |
|
| 177 | + $theme_path = MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/'; |
|
| 178 | + if (is_file($theme_path.'style.php')) { |
|
| 179 | + include($theme_path.'style.php'); |
|
| 180 | 180 | } |
| 181 | 181 | $chunk = $modx->getChunk($target); |
| 182 | 182 | if ($chunk !== false && !empty($chunk)) { |
| 183 | 183 | $login_tpl = $chunk; |
| 184 | - } elseif (is_file(MODX_BASE_PATH . $target)) { |
|
| 185 | - $target = MODX_BASE_PATH . $target; |
|
| 184 | + } elseif (is_file(MODX_BASE_PATH.$target)) { |
|
| 185 | + $target = MODX_BASE_PATH.$target; |
|
| 186 | 186 | $login_tpl = file_get_contents($target); |
| 187 | 187 | } elseif (is_file($target)) { |
| 188 | 188 | $login_tpl = file_get_contents($target); |
| 189 | - } elseif (is_file($theme_path . 'login.tpl')) { |
|
| 190 | - $target = $theme_path . 'login.tpl'; |
|
| 189 | + } elseif (is_file($theme_path.'login.tpl')) { |
|
| 190 | + $target = $theme_path.'login.tpl'; |
|
| 191 | 191 | $login_tpl = file_get_contents($target); |
| 192 | - } elseif (is_file($theme_path . 'templates/actions/login.tpl')) { |
|
| 193 | - $target = $theme_path . 'templates/actions/login.tpl'; |
|
| 192 | + } elseif (is_file($theme_path.'templates/actions/login.tpl')) { |
|
| 193 | + $target = $theme_path.'templates/actions/login.tpl'; |
|
| 194 | 194 | $login_tpl = file_get_contents($target); |
| 195 | - } elseif (is_file($theme_path . 'html/login.html')) { // ClipperCMS compatible |
|
| 196 | - $target = $theme_path . 'html/login.html'; |
|
| 195 | + } elseif (is_file($theme_path.'html/login.html')) { // ClipperCMS compatible |
|
| 196 | + $target = $theme_path.'html/login.html'; |
|
| 197 | 197 | $login_tpl = file_get_contents($target); |
| 198 | 198 | } else { |
| 199 | - $target = MODX_MANAGER_PATH . 'media/style/common/login.tpl'; |
|
| 199 | + $target = MODX_MANAGER_PATH.'media/style/common/login.tpl'; |
|
| 200 | 200 | $login_tpl = file_get_contents($target); |
| 201 | 201 | } |
| 202 | 202 | } |
@@ -216,17 +216,17 @@ discard block |
||
| 216 | 216 | $modx->updateValidatedUserSession(); |
| 217 | 217 | |
| 218 | 218 | // Update last action in table active_users |
| 219 | - $itemid = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : ''; |
|
| 219 | + $itemid = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : ''; |
|
| 220 | 220 | $lasthittime = time(); |
| 221 | - $action = isset($_REQUEST['a']) ? (int)$_REQUEST['a'] : 1; |
|
| 221 | + $action = isset($_REQUEST['a']) ? (int) $_REQUEST['a'] : 1; |
|
| 222 | 222 | |
| 223 | 223 | if ($action !== 1) { |
| 224 | - if ((int)$itemid <= 0) { |
|
| 224 | + if ((int) $itemid <= 0) { |
|
| 225 | 225 | $itemid = null; |
| 226 | 226 | } |
| 227 | 227 | $sql = sprintf("REPLACE INTO %s (sid, internalKey, username, lasthit, action, id) VALUES ('%s', %d, '%s', %d, '%s', %s)", |
| 228 | 228 | $modx->getFullTableName('active_users') // Table |
| 229 | - , session_id(), $modx->getLoginUserID(), $_SESSION['mgrShortname'], $lasthittime, (string)$action, |
|
| 229 | + , session_id(), $modx->getLoginUserID(), $_SESSION['mgrShortname'], $lasthittime, (string) $action, |
|
| 230 | 230 | $itemid == null ? var_export(null, true) : $itemid); |
| 231 | 231 | $modx->db->query($sql); |
| 232 | 232 | } |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
|
|
| 2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
|
|
| 3 | 3 | die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
|
| 4 | 4 | } |
| 5 | 5 | header("X-XSS-Protection: 0");
|
@@ -47,9 +47,9 @@ discard block |
||
| 47 | 47 | |
| 48 | 48 | $theme_modes = array('', 'lightness', 'light', 'dark', 'darkness');
|
| 49 | 49 | if (!empty($theme_modes[$_COOKIE['MODX_themeMode']])) {
|
| 50 | - $body_class .= ' ' . $theme_modes[$_COOKIE['MODX_themeMode']]; |
|
| 50 | + $body_class .= ' '.$theme_modes[$_COOKIE['MODX_themeMode']]; |
|
| 51 | 51 | } elseif (!empty($theme_modes[$modx->config['manager_theme_mode']])) {
|
| 52 | - $body_class .= ' ' . $theme_modes[$modx->config['manager_theme_mode']]; |
|
| 52 | + $body_class .= ' '.$theme_modes[$modx->config['manager_theme_mode']]; |
|
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | $navbar_position = $modx->config['manager_menu_position']; |
@@ -82,36 +82,36 @@ discard block |
||
| 82 | 82 | $user['which_browser'] = $modx->config['which_browser']; |
| 83 | 83 | } |
| 84 | 84 | |
| 85 | -$css = 'media/style/' . $modx->config['manager_theme'] . '/css/page.css?v=' . $lastInstallTime; |
|
| 85 | +$css = 'media/style/'.$modx->config['manager_theme'].'/css/page.css?v='.$lastInstallTime; |
|
| 86 | 86 | |
| 87 | 87 | if ($modx->config['manager_theme'] == 'default') {
|
| 88 | - if (!file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css') && is_writable(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css')) {
|
|
| 89 | - require_once MODX_BASE_PATH . 'assets/lib/Formatter/CSSMinify.php'; |
|
| 88 | + if (!file_exists(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css') && is_writable(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css')) {
|
|
| 89 | + require_once MODX_BASE_PATH.'assets/lib/Formatter/CSSMinify.php'; |
|
| 90 | 90 | $minifier = new Formatter\CSSMinify(); |
| 91 | - $minifier->addFile(MODX_MANAGER_PATH . 'media/style/common/bootstrap/css/bootstrap.min.css'); |
|
| 92 | - $minifier->addFile(MODX_MANAGER_PATH . 'media/style/common/font-awesome/css/font-awesome.min.css'); |
|
| 93 | - $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/fonts.css'); |
|
| 94 | - $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/forms.css'); |
|
| 95 | - $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/mainmenu.css'); |
|
| 96 | - $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/tree.css'); |
|
| 97 | - $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/custom.css'); |
|
| 98 | - $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/tabpane.css'); |
|
| 99 | - $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/contextmenu.css'); |
|
| 100 | - $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/index.css'); |
|
| 101 | - $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/main.css'); |
|
| 91 | + $minifier->addFile(MODX_MANAGER_PATH.'media/style/common/bootstrap/css/bootstrap.min.css'); |
|
| 92 | + $minifier->addFile(MODX_MANAGER_PATH.'media/style/common/font-awesome/css/font-awesome.min.css'); |
|
| 93 | + $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/fonts.css'); |
|
| 94 | + $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/forms.css'); |
|
| 95 | + $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/mainmenu.css'); |
|
| 96 | + $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/tree.css'); |
|
| 97 | + $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/custom.css'); |
|
| 98 | + $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/tabpane.css'); |
|
| 99 | + $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/contextmenu.css'); |
|
| 100 | + $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/index.css'); |
|
| 101 | + $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/main.css'); |
|
| 102 | 102 | $css = $minifier->minify(); |
| 103 | - file_put_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css', $css); |
|
| 103 | + file_put_contents(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css', $css); |
|
| 104 | 104 | } |
| 105 | - if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) {
|
|
| 106 | - $css = 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css?v=' . $lastInstallTime; |
|
| 105 | + if (file_exists(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css')) {
|
|
| 106 | + $css = 'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css?v='.$lastInstallTime; |
|
| 107 | 107 | } |
| 108 | 108 | } |
| 109 | 109 | |
| 110 | -$modx->config['global_tabs'] = (int)($modx->config['global_tabs'] && ($user['role'] == 1 || $modx->hasPermission('edit_template') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_plugin')));
|
|
| 110 | +$modx->config['global_tabs'] = (int) ($modx->config['global_tabs'] && ($user['role'] == 1 || $modx->hasPermission('edit_template') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_plugin')));
|
|
| 111 | 111 | |
| 112 | 112 | ?> |
| 113 | 113 | <!DOCTYPE html> |
| 114 | -<html <?= (isset($modx_textdir) && $modx_textdir ? 'dir="rtl" lang="' : 'lang="') . $mxla . '" xml:lang="' . $mxla . '"' ?>> |
|
| 114 | +<html <?= (isset($modx_textdir) && $modx_textdir ? 'dir="rtl" lang="' : 'lang="').$mxla.'" xml:lang="'.$mxla.'"' ?>> |
|
| 115 | 115 | <head> |
| 116 | 116 | <title><?= $site_name ?>- (EVO CMS Manager)</title> |
| 117 | 117 | <meta http-equiv="Content-Type" content="text/html; charset=<?= $modx_manager_charset ?>" /> |
@@ -142,21 +142,21 @@ discard block |
||
| 142 | 142 | MODX_SITE_URL: '<?= MODX_SITE_URL ?>', |
| 143 | 143 | MODX_MANAGER_URL: '<?= MODX_MANAGER_URL ?>', |
| 144 | 144 | user: {
|
| 145 | - role: <?= (int)$user['role'] ?>, |
|
| 145 | + role: <?= (int) $user['role'] ?>, |
|
| 146 | 146 | username: '<?= $user['username'] ?>' |
| 147 | 147 | }, |
| 148 | 148 | config: {
|
| 149 | 149 | mail_check_timeperiod: <?= $modx->config['mail_check_timeperiod'] ?>, |
| 150 | - menu_height: <?= (int)$menu_height ?>, |
|
| 151 | - tree_width: <?= (int)$tree_width ?>, |
|
| 152 | - tree_min_width: <?= (int)$tree_min_width ?>, |
|
| 153 | - session_timeout: <?= (int)$modx->config['session_timeout'] ?>, |
|
| 154 | - site_start: <?= (int)$modx->config['site_start'] ?>, |
|
| 155 | - tree_page_click: <?=(!empty($modx->config['tree_page_click']) ? (int)$modx->config['tree_page_click'] : 27) ?>, |
|
| 150 | + menu_height: <?= (int) $menu_height ?>, |
|
| 151 | + tree_width: <?= (int) $tree_width ?>, |
|
| 152 | + tree_min_width: <?= (int) $tree_min_width ?>, |
|
| 153 | + session_timeout: <?= (int) $modx->config['session_timeout'] ?>, |
|
| 154 | + site_start: <?= (int) $modx->config['site_start'] ?>, |
|
| 155 | + tree_page_click: <?=(!empty($modx->config['tree_page_click']) ? (int) $modx->config['tree_page_click'] : 27) ?>, |
|
| 156 | 156 | theme: '<?= $modx->config['manager_theme'] ?>', |
| 157 | 157 | theme_mode: '<?= $modx->config['manager_theme_mode'] ?>', |
| 158 | 158 | which_browser: '<?= $user['which_browser'] ?>', |
| 159 | - layout: <?= (int)$manager_layout ?>, |
|
| 159 | + layout: <?= (int) $manager_layout ?>, |
|
| 160 | 160 | textdir: '<?= $modx_textdir ?>', |
| 161 | 161 | global_tabs: <?= $modx->config['global_tabs'] ?> |
| 162 | 162 | |
@@ -241,11 +241,11 @@ discard block |
||
| 241 | 241 | delete a[b]; |
| 242 | 242 | }, |
| 243 | 243 | openedArray: [], |
| 244 | - lockedElementsTranslation: <?= json_encode($unlockTranslations, JSON_FORCE_OBJECT | JSON_UNESCAPED_UNICODE) . "\n" ?> |
|
| 244 | + lockedElementsTranslation: <?= json_encode($unlockTranslations, JSON_FORCE_OBJECT | JSON_UNESCAPED_UNICODE)."\n" ?> |
|
| 245 | 245 | }; |
| 246 | 246 | <?php |
| 247 | 247 | $opened = array_filter(array_map('intval', explode('|', $_SESSION['openedArray'])));
|
| 248 | - echo (empty($opened) ? '' : 'modx.openedArray[' . implode("] = 1;\n modx.openedArray[", $opened) . '] = 1;') . "\n";
|
|
| 248 | + echo (empty($opened) ? '' : 'modx.openedArray['.implode("] = 1;\n modx.openedArray[", $opened).'] = 1;')."\n";
|
|
| 249 | 249 | ?> |
| 250 | 250 | </script> |
| 251 | 251 | <script src="media/style/<?= $modx->config['manager_theme'] ?>/js/modx.min.js?v=<?= $lastInstallTime ?>"></script> |
@@ -327,7 +327,7 @@ discard block |
||
| 327 | 327 | <a href="javascript:;" class="dropdown-toggle" onclick="return false;"> |
| 328 | 328 | <span class="username"><?= $user['username'] ?></span> |
| 329 | 329 | <?php if ($user['photo']) { ?>
|
| 330 | - <span class="icon photo" style="background-image: url(<?= MODX_SITE_URL . $user['photo'] ?>);"></span> |
|
| 330 | + <span class="icon photo" style="background-image: url(<?= MODX_SITE_URL.$user['photo'] ?>);"></span> |
|
| 331 | 331 | <?php } else { ?>
|
| 332 | 332 | <span class="icon"><?= $_style['menu_user'] ?></span> |
| 333 | 333 | <?php } ?> |
@@ -354,7 +354,7 @@ discard block |
||
| 354 | 354 | $version = 'Evolution'; |
| 355 | 355 | ?> |
| 356 | 356 | <?php |
| 357 | - echo sprintf('<li><span class="dropdown-item" title="%s – %s" %s>' . $version . ' %s</span></li>', $site_name, $modx->getVersionData('full_appname'), $style, $modx->config['settings_version']);
|
|
| 357 | + echo sprintf('<li><span class="dropdown-item" title="%s – %s" %s>'.$version.' %s</span></li>', $site_name, $modx->getVersionData('full_appname'), $style, $modx->config['settings_version']);
|
|
| 358 | 358 | ?> |
| 359 | 359 | </ul> |
| 360 | 360 | </li> |
@@ -537,7 +537,7 @@ discard block |
||
| 537 | 537 | */ |
| 538 | 538 | function constructLink($action, $img, $text, $allowed) |
| 539 | 539 | {
|
| 540 | - if ((bool)$allowed) {
|
|
| 540 | + if ((bool) $allowed) {
|
|
| 541 | 541 | echo sprintf('<div class="menuLink" id="item%s" onclick="modx.tree.menuHandler(%s);">', $action, $action);
|
| 542 | 542 | echo sprintf('<i class="%s"></i> %s</div>', $img, $text);
|
| 543 | 543 | } |
@@ -548,7 +548,7 @@ discard block |
||
| 548 | 548 | <script type="text/javascript"> |
| 549 | 549 | |
| 550 | 550 | if (document.getElementById('treeMenu')) {
|
| 551 | - <?php if($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin')) { ?>
|
|
| 551 | + <?php if ($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin')) { ?>
|
|
| 552 | 552 | |
| 553 | 553 | document.getElementById('treeMenu_openelements').onclick = function(e) {
|
| 554 | 554 | e.preventDefault(); |
@@ -566,12 +566,12 @@ discard block |
||
| 566 | 566 | } |
| 567 | 567 | }; |
| 568 | 568 | <?php } ?> |
| 569 | - <?php if($use_browser && $modx->hasPermission('assets_images')) { ?>
|
|
| 569 | + <?php if ($use_browser && $modx->hasPermission('assets_images')) { ?>
|
|
| 570 | 570 | |
| 571 | 571 | document.getElementById('treeMenu_openimages').onclick = function(e) {
|
| 572 | 572 | e.preventDefault(); |
| 573 | 573 | if (modx.config.global_tabs && !e.shiftKey) {
|
| 574 | - modx.tabs({url: '<?= MODX_MANAGER_URL . 'media/browser/' . $which_browser . '/browse.php?filemanager=media/browser/' . $which_browser . '/browse.php&type=images' ?>', title: '<?= $_lang["images_management"] ?>'});
|
|
| 574 | + modx.tabs({url: '<?= MODX_MANAGER_URL.'media/browser/'.$which_browser.'/browse.php?filemanager=media/browser/'.$which_browser.'/browse.php&type=images' ?>', title: '<?= $_lang["images_management"] ?>'});
|
|
| 575 | 575 | } else {
|
| 576 | 576 | var randomNum = '<?= $_lang["files_files"] ?>'; |
| 577 | 577 | if (e.shiftKey) {
|
@@ -584,12 +584,12 @@ discard block |
||
| 584 | 584 | } |
| 585 | 585 | }; |
| 586 | 586 | <?php } ?> |
| 587 | - <?php if($use_browser && $modx->hasPermission('assets_files')) { ?>
|
|
| 587 | + <?php if ($use_browser && $modx->hasPermission('assets_files')) { ?>
|
|
| 588 | 588 | |
| 589 | 589 | document.getElementById('treeMenu_openfiles').onclick = function(e) {
|
| 590 | 590 | e.preventDefault(); |
| 591 | 591 | if (modx.config.global_tabs && !e.shiftKey) {
|
| 592 | - modx.tabs({url: '<?= MODX_MANAGER_URL . 'media/browser/' . $which_browser . '/browse.php?filemanager=media/browser/' . $which_browser . '/browse.php&type=files' ?>', title: '<?= $_lang["files_files"] ?>'});
|
|
| 592 | + modx.tabs({url: '<?= MODX_MANAGER_URL.'media/browser/'.$which_browser.'/browse.php?filemanager=media/browser/'.$which_browser.'/browse.php&type=files' ?>', title: '<?= $_lang["files_files"] ?>'});
|
|
| 593 | 593 | } else {
|
| 594 | 594 | var randomNum = '<?= $_lang["files_files"] ?>'; |
| 595 | 595 | if (e.shiftKey) {
|
@@ -643,7 +643,7 @@ discard block |
||
| 643 | 643 | |
| 644 | 644 | </div> |
| 645 | 645 | <?php if ($modx->config['show_picker'] != "0") {
|
| 646 | - include('media/style/' . $modx->config['manager_theme'] . '/color.switcher.php');
|
|
| 646 | + include('media/style/'.$modx->config['manager_theme'].'/color.switcher.php');
|
|
| 647 | 647 | } ?> |
| 648 | 648 | </body> |
| 649 | 649 | </html> |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | $sitemenu['site'] = array( |
| 22 | 22 | 'site', |
| 23 | 23 | 'main', |
| 24 | - '<i class="fa fa-tachometer"></i><span class="menu-item-text">' . $_lang['home'] . '</span>', |
|
| 24 | + '<i class="fa fa-tachometer"></i><span class="menu-item-text">'.$_lang['home'].'</span>', |
|
| 25 | 25 | 'index.php?a=2', |
| 26 | 26 | $_lang['home'], |
| 27 | 27 | '', |
@@ -32,11 +32,11 @@ discard block |
||
| 32 | 32 | 'active' |
| 33 | 33 | ); |
| 34 | 34 | |
| 35 | -if($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('file_manager')) {
|
|
| 35 | +if ($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('file_manager')) {
|
|
| 36 | 36 | $sitemenu['elements'] = array( |
| 37 | 37 | 'elements', |
| 38 | 38 | 'main', |
| 39 | - '<i class="fa fa-th"></i><span class="menu-item-text">' . $_lang['elements'] . '</span>', |
|
| 39 | + '<i class="fa fa-th"></i><span class="menu-item-text">'.$_lang['elements'].'</span>', |
|
| 40 | 40 | 'javascript:;', |
| 41 | 41 | $_lang['elements'], |
| 42 | 42 | ' return false;', |
@@ -48,11 +48,11 @@ discard block |
||
| 48 | 48 | ); |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | -if($modx->hasPermission('exec_module')) {
|
|
| 51 | +if ($modx->hasPermission('exec_module')) {
|
|
| 52 | 52 | $sitemenu['modules'] = array( |
| 53 | 53 | 'modules', |
| 54 | 54 | 'main', |
| 55 | - '<i class="'.$_style['icons_modules'] .'"></i><span class="menu-item-text">' . $_lang['modules'] . '</span>', |
|
| 55 | + '<i class="'.$_style['icons_modules'].'"></i><span class="menu-item-text">'.$_lang['modules'].'</span>', |
|
| 56 | 56 | 'javascript:;', |
| 57 | 57 | $_lang['modules'], |
| 58 | 58 | ' return false;', |
@@ -64,11 +64,11 @@ discard block |
||
| 64 | 64 | ); |
| 65 | 65 | } |
| 66 | 66 | |
| 67 | -if($modx->hasPermission('edit_user') || $modx->hasPermission('edit_web_user') || $modx->hasPermission('edit_role') || $modx->hasPermission('access_permissions') || $modx->hasPermission('web_access_permissions')) {
|
|
| 67 | +if ($modx->hasPermission('edit_user') || $modx->hasPermission('edit_web_user') || $modx->hasPermission('edit_role') || $modx->hasPermission('access_permissions') || $modx->hasPermission('web_access_permissions')) {
|
|
| 68 | 68 | $sitemenu['users'] = array( |
| 69 | 69 | 'users', |
| 70 | 70 | 'main', |
| 71 | - '<i class="fa fa-users"></i><span class="menu-item-text">' . $_lang['users'] . '</span>', |
|
| 71 | + '<i class="fa fa-users"></i><span class="menu-item-text">'.$_lang['users'].'</span>', |
|
| 72 | 72 | 'javascript:;', |
| 73 | 73 | $_lang['users'], |
| 74 | 74 | ' return false;', |
@@ -80,11 +80,11 @@ discard block |
||
| 80 | 80 | ); |
| 81 | 81 | } |
| 82 | 82 | |
| 83 | -if($modx->hasPermission('empty_cache') || $modx->hasPermission('bk_manager') || $modx->hasPermission('remove_locks') || $modx->hasPermission('import_static') || $modx->hasPermission('export_static')) {
|
|
| 83 | +if ($modx->hasPermission('empty_cache') || $modx->hasPermission('bk_manager') || $modx->hasPermission('remove_locks') || $modx->hasPermission('import_static') || $modx->hasPermission('export_static')) {
|
|
| 84 | 84 | $sitemenu['tools'] = array( |
| 85 | 85 | 'tools', |
| 86 | 86 | 'main', |
| 87 | - '<i class="fa fa-wrench"></i><span class="menu-item-text">' . $_lang['tools'] . '</span>', |
|
| 87 | + '<i class="fa fa-wrench"></i><span class="menu-item-text">'.$_lang['tools'].'</span>', |
|
| 88 | 88 | 'javascript:;', |
| 89 | 89 | $_lang['tools'], |
| 90 | 90 | ' return false;', |
@@ -97,12 +97,12 @@ discard block |
||
| 97 | 97 | } |
| 98 | 98 | |
| 99 | 99 | $tab = 0; |
| 100 | -if($modx->hasPermission('edit_template')) {
|
|
| 100 | +if ($modx->hasPermission('edit_template')) {
|
|
| 101 | 101 | $sitemenu['element_templates'] = array( |
| 102 | 102 | 'element_templates', |
| 103 | 103 | 'elements', |
| 104 | - '<i class="fa fa-newspaper-o"></i>' . $_lang['manage_templates'] . '<i class="fa fa-angle-right toggle"></i>', |
|
| 105 | - 'index.php?a=76&tab=' . $tab++, |
|
| 104 | + '<i class="fa fa-newspaper-o"></i>'.$_lang['manage_templates'].'<i class="fa fa-angle-right toggle"></i>', |
|
| 105 | + 'index.php?a=76&tab='.$tab++, |
|
| 106 | 106 | $_lang['manage_templates'], |
| 107 | 107 | '', |
| 108 | 108 | 'new_template,edit_template', |
@@ -112,12 +112,12 @@ discard block |
||
| 112 | 112 | 'dropdown-toggle' |
| 113 | 113 | ); |
| 114 | 114 | } |
| 115 | -if($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {
|
|
| 115 | +if ($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {
|
|
| 116 | 116 | $sitemenu['element_tplvars'] = array( |
| 117 | 117 | 'element_tplvars', |
| 118 | 118 | 'elements', |
| 119 | - '<i class="fa fa-list-alt"></i>' . $_lang['tmplvars'] . '<i class="fa fa-angle-right toggle"></i>', |
|
| 120 | - 'index.php?a=76&tab=' . $tab++, |
|
| 119 | + '<i class="fa fa-list-alt"></i>'.$_lang['tmplvars'].'<i class="fa fa-angle-right toggle"></i>', |
|
| 120 | + 'index.php?a=76&tab='.$tab++, |
|
| 121 | 121 | $_lang['tmplvars'], |
| 122 | 122 | '', |
| 123 | 123 | 'new_template,edit_template', |
@@ -127,12 +127,12 @@ discard block |
||
| 127 | 127 | 'dropdown-toggle' |
| 128 | 128 | ); |
| 129 | 129 | } |
| 130 | -if($modx->hasPermission('edit_chunk')) {
|
|
| 130 | +if ($modx->hasPermission('edit_chunk')) {
|
|
| 131 | 131 | $sitemenu['element_htmlsnippets'] = array( |
| 132 | 132 | 'element_htmlsnippets', |
| 133 | 133 | 'elements', |
| 134 | - '<i class="fa fa-th-large"></i>' . $_lang['manage_htmlsnippets'] . '<i class="fa fa-angle-right toggle"></i>', |
|
| 135 | - 'index.php?a=76&tab=' . $tab++, |
|
| 134 | + '<i class="fa fa-th-large"></i>'.$_lang['manage_htmlsnippets'].'<i class="fa fa-angle-right toggle"></i>', |
|
| 135 | + 'index.php?a=76&tab='.$tab++, |
|
| 136 | 136 | $_lang['manage_htmlsnippets'], |
| 137 | 137 | '', |
| 138 | 138 | 'new_chunk,edit_chunk', |
@@ -142,12 +142,12 @@ discard block |
||
| 142 | 142 | 'dropdown-toggle' |
| 143 | 143 | ); |
| 144 | 144 | } |
| 145 | -if($modx->hasPermission('edit_snippet')) {
|
|
| 145 | +if ($modx->hasPermission('edit_snippet')) {
|
|
| 146 | 146 | $sitemenu['element_snippets'] = array( |
| 147 | 147 | 'element_snippets', |
| 148 | 148 | 'elements', |
| 149 | - '<i class="fa fa-code"></i>' . $_lang['manage_snippets'] . '<i class="fa fa-angle-right toggle"></i>', |
|
| 150 | - 'index.php?a=76&tab=' . $tab++, |
|
| 149 | + '<i class="fa fa-code"></i>'.$_lang['manage_snippets'].'<i class="fa fa-angle-right toggle"></i>', |
|
| 150 | + 'index.php?a=76&tab='.$tab++, |
|
| 151 | 151 | $_lang['manage_snippets'], |
| 152 | 152 | '', |
| 153 | 153 | 'new_snippet,edit_snippet', |
@@ -157,12 +157,12 @@ discard block |
||
| 157 | 157 | 'dropdown-toggle' |
| 158 | 158 | ); |
| 159 | 159 | } |
| 160 | -if($modx->hasPermission('edit_plugin')) {
|
|
| 160 | +if ($modx->hasPermission('edit_plugin')) {
|
|
| 161 | 161 | $sitemenu['element_plugins'] = array( |
| 162 | 162 | 'element_plugins', |
| 163 | 163 | 'elements', |
| 164 | - '<i class="fa fa-plug"></i>' . $_lang['manage_plugins'] . '<i class="fa fa-angle-right toggle"></i>', |
|
| 165 | - 'index.php?a=76&tab=' . $tab++, |
|
| 164 | + '<i class="fa fa-plug"></i>'.$_lang['manage_plugins'].'<i class="fa fa-angle-right toggle"></i>', |
|
| 165 | + 'index.php?a=76&tab='.$tab++, |
|
| 166 | 166 | $_lang['manage_plugins'], |
| 167 | 167 | '', |
| 168 | 168 | 'new_plugin,edit_plugin', |
@@ -174,11 +174,11 @@ discard block |
||
| 174 | 174 | } |
| 175 | 175 | //$sitemenu['element_categories'] = array('element_categories','elements',$_lang['element_categories'],'index.php?a=76&tab=5',$_lang['element_categories'],'','new_template,edit_template,new_snippet,edit_snippet,new_chunk,edit_chunk,new_plugin,edit_plugin','main',1,60,'');
|
| 176 | 176 | |
| 177 | -if($modx->hasPermission('file_manager')) {
|
|
| 177 | +if ($modx->hasPermission('file_manager')) {
|
|
| 178 | 178 | $sitemenu['manage_files'] = array( |
| 179 | 179 | 'manage_files', |
| 180 | 180 | 'elements', |
| 181 | - '<i class="fa fa-folder-open-o"></i>' . $_lang['manage_files'], |
|
| 181 | + '<i class="fa fa-folder-open-o"></i>'.$_lang['manage_files'], |
|
| 182 | 182 | 'index.php?a=31', |
| 183 | 183 | $_lang['manage_files'], |
| 184 | 184 | '', |
@@ -189,11 +189,11 @@ discard block |
||
| 189 | 189 | '' |
| 190 | 190 | ); |
| 191 | 191 | } |
| 192 | -if($modx->hasPermission('category_manager')) {
|
|
| 192 | +if ($modx->hasPermission('category_manager')) {
|
|
| 193 | 193 | $sitemenu['manage_categories'] = array( |
| 194 | 194 | 'manage_categories', |
| 195 | 195 | 'elements', |
| 196 | - '<i class="fa fa-object-group"></i>' . $_lang['manage_categories'], |
|
| 196 | + '<i class="fa fa-object-group"></i>'.$_lang['manage_categories'], |
|
| 197 | 197 | 'index.php?a=120', |
| 198 | 198 | $_lang['manage_categories'], |
| 199 | 199 | '', |
@@ -206,11 +206,11 @@ discard block |
||
| 206 | 206 | } |
| 207 | 207 | |
| 208 | 208 | // Modules Menu Items |
| 209 | -if($modx->hasPermission('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('save_module')) {
|
|
| 209 | +if ($modx->hasPermission('new_module') || $modx->hasPermission('edit_module') || $modx->hasPermission('save_module')) {
|
|
| 210 | 210 | $sitemenu['new_module'] = array( |
| 211 | 211 | 'new_module', |
| 212 | 212 | 'modules', |
| 213 | - '<i class="'.$_style['icons_modules'] .'"></i>' . $_lang['module_management'], |
|
| 213 | + '<i class="'.$_style['icons_modules'].'"></i>'.$_lang['module_management'], |
|
| 214 | 214 | 'index.php?a=106', |
| 215 | 215 | $_lang['module_management'], |
| 216 | 216 | '', |
@@ -222,24 +222,24 @@ discard block |
||
| 222 | 222 | ); |
| 223 | 223 | } |
| 224 | 224 | |
| 225 | -if($modx->hasPermission('exec_module')) {
|
|
| 226 | - if($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {
|
|
| 225 | +if ($modx->hasPermission('exec_module')) {
|
|
| 226 | + if ($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {
|
|
| 227 | 227 | $rs = $modx->db->query('SELECT DISTINCT sm.id, sm.name, sm.icon, mg.member
|
| 228 | - FROM ' . $modx->getFullTableName('site_modules') . ' AS sm
|
|
| 229 | - LEFT JOIN ' . $modx->getFullTableName('site_module_access') . ' AS sma ON sma.module = sm.id
|
|
| 230 | - LEFT JOIN ' . $modx->getFullTableName('member_groups') . ' AS mg ON sma.usergroup = mg.user_group
|
|
| 231 | - WHERE (mg.member IS NULL OR mg.member = ' . $modx->getLoginUserID() . ') AND sm.disabled != 1 AND sm.locked != 1 |
|
| 228 | + FROM ' . $modx->getFullTableName('site_modules').' AS sm
|
|
| 229 | + LEFT JOIN ' . $modx->getFullTableName('site_module_access').' AS sma ON sma.module = sm.id
|
|
| 230 | + LEFT JOIN ' . $modx->getFullTableName('member_groups').' AS mg ON sma.usergroup = mg.user_group
|
|
| 231 | + WHERE (mg.member IS NULL OR mg.member = ' . $modx->getLoginUserID().') AND sm.disabled != 1 AND sm.locked != 1 |
|
| 232 | 232 | ORDER BY sm.name'); |
| 233 | 233 | } else {
|
| 234 | 234 | $rs = $modx->db->select('*', $modx->getFullTableName('site_modules'), 'disabled != 1', 'name');
|
| 235 | 235 | } |
| 236 | - if($modx->db->getRecordCount($rs)) {
|
|
| 236 | + if ($modx->db->getRecordCount($rs)) {
|
|
| 237 | 237 | while ($row = $modx->db->getRow($rs)) {
|
| 238 | - $sitemenu['module' . $row['id']] = array( |
|
| 239 | - 'module' . $row['id'], |
|
| 238 | + $sitemenu['module'.$row['id']] = array( |
|
| 239 | + 'module'.$row['id'], |
|
| 240 | 240 | 'modules', |
| 241 | - ($row['icon'] != '' ? '<i class="'.$row['icon'].'"></i>' : '<i class="'.$_style['icons_module'].'"></i>') . $row['name'], |
|
| 242 | - 'index.php?a=112&id=' . $row['id'], |
|
| 241 | + ($row['icon'] != '' ? '<i class="'.$row['icon'].'"></i>' : '<i class="'.$_style['icons_module'].'"></i>').$row['name'], |
|
| 242 | + 'index.php?a=112&id='.$row['id'], |
|
| 243 | 243 | $row['name'], |
| 244 | 244 | '', |
| 245 | 245 | '', |
@@ -254,11 +254,11 @@ discard block |
||
| 254 | 254 | |
| 255 | 255 | // security menu items (users) |
| 256 | 256 | |
| 257 | -if($modx->hasPermission('edit_user')) {
|
|
| 257 | +if ($modx->hasPermission('edit_user')) {
|
|
| 258 | 258 | $sitemenu['user_management_title'] = array( |
| 259 | 259 | 'user_management_title', |
| 260 | 260 | 'users', |
| 261 | - '<i class="fa fa fa-user"></i>' . $_lang['user_management_title'] . '<i class="fa fa-angle-right toggle"></i>', |
|
| 261 | + '<i class="fa fa fa-user"></i>'.$_lang['user_management_title'].'<i class="fa fa-angle-right toggle"></i>', |
|
| 262 | 262 | 'index.php?a=75', |
| 263 | 263 | $_lang['user_management_title'], |
| 264 | 264 | '', |
@@ -270,11 +270,11 @@ discard block |
||
| 270 | 270 | ); |
| 271 | 271 | } |
| 272 | 272 | |
| 273 | -if($modx->hasPermission('edit_web_user')) {
|
|
| 273 | +if ($modx->hasPermission('edit_web_user')) {
|
|
| 274 | 274 | $sitemenu['web_user_management_title'] = array( |
| 275 | 275 | 'web_user_management_title', |
| 276 | 276 | 'users', |
| 277 | - '<i class="fa fa-users"></i>' . $_lang['web_user_management_title'] . '<i class="fa fa-angle-right toggle"></i>', |
|
| 277 | + '<i class="fa fa-users"></i>'.$_lang['web_user_management_title'].'<i class="fa fa-angle-right toggle"></i>', |
|
| 278 | 278 | 'index.php?a=99', |
| 279 | 279 | $_lang['web_user_management_title'], |
| 280 | 280 | '', |
@@ -286,11 +286,11 @@ discard block |
||
| 286 | 286 | ); |
| 287 | 287 | } |
| 288 | 288 | |
| 289 | -if($modx->hasPermission('edit_role')) {
|
|
| 289 | +if ($modx->hasPermission('edit_role')) {
|
|
| 290 | 290 | $sitemenu['role_management_title'] = array( |
| 291 | 291 | 'role_management_title', |
| 292 | 292 | 'users', |
| 293 | - '<i class="fa fa-legal"></i>' . $_lang['role_management_title'], |
|
| 293 | + '<i class="fa fa-legal"></i>'.$_lang['role_management_title'], |
|
| 294 | 294 | 'index.php?a=86', |
| 295 | 295 | $_lang['role_management_title'], |
| 296 | 296 | '', |
@@ -302,11 +302,11 @@ discard block |
||
| 302 | 302 | ); |
| 303 | 303 | } |
| 304 | 304 | |
| 305 | -if($modx->hasPermission('access_permissions')) {
|
|
| 305 | +if ($modx->hasPermission('access_permissions')) {
|
|
| 306 | 306 | $sitemenu['manager_permissions'] = array( |
| 307 | 307 | 'manager_permissions', |
| 308 | 308 | 'users', |
| 309 | - '<i class="fa fa-male"></i>' . $_lang['manager_permissions'], |
|
| 309 | + '<i class="fa fa-male"></i>'.$_lang['manager_permissions'], |
|
| 310 | 310 | 'index.php?a=40', |
| 311 | 311 | $_lang['manager_permissions'], |
| 312 | 312 | '', |
@@ -318,11 +318,11 @@ discard block |
||
| 318 | 318 | ); |
| 319 | 319 | } |
| 320 | 320 | |
| 321 | -if($modx->hasPermission('web_access_permissions')) {
|
|
| 321 | +if ($modx->hasPermission('web_access_permissions')) {
|
|
| 322 | 322 | $sitemenu['web_permissions'] = array( |
| 323 | 323 | 'web_permissions', |
| 324 | 324 | 'users', |
| 325 | - '<i class="fa fa-universal-access"></i>' . $_lang['web_permissions'], |
|
| 325 | + '<i class="fa fa-universal-access"></i>'.$_lang['web_permissions'], |
|
| 326 | 326 | 'index.php?a=91', |
| 327 | 327 | $_lang['web_permissions'], |
| 328 | 328 | '', |
@@ -339,7 +339,7 @@ discard block |
||
| 339 | 339 | $sitemenu['refresh_site'] = array( |
| 340 | 340 | 'refresh_site', |
| 341 | 341 | 'tools', |
| 342 | - '<i class="fa fa-recycle"></i>' . $_lang['refresh_site'], |
|
| 342 | + '<i class="fa fa-recycle"></i>'.$_lang['refresh_site'], |
|
| 343 | 343 | 'index.php?a=26', |
| 344 | 344 | $_lang['refresh_site'], |
| 345 | 345 | '', |
@@ -353,7 +353,7 @@ discard block |
||
| 353 | 353 | 'a', // tag |
| 354 | 354 | 'javascript:;', // href |
| 355 | 355 | 'btn btn-secondary', // class or btn-success |
| 356 | - 'modx.popup({url:\'index.php?a=26\', title:\'' . $_lang['refresh_site'] . '\', icon: \'fa-recycle\', iframe: \'ajax\', selector: \'.tab-page>.container\', position: \'right top\', width: \'auto\', maxheight: \'50%\', wrap: \'body\' })', // onclick
|
|
| 356 | + 'modx.popup({url:\'index.php?a=26\', title:\''.$_lang['refresh_site'].'\', icon: \'fa-recycle\', iframe: \'ajax\', selector: \'.tab-page>.container\', position: \'right top\', width: \'auto\', maxheight: \'50%\', wrap: \'body\' })', // onclick
|
|
| 357 | 357 | $_lang['refresh_site'], // title |
| 358 | 358 | '<i class="fa fa-recycle"></i>' // innerHTML |
| 359 | 359 | ) |
@@ -363,7 +363,7 @@ discard block |
||
| 363 | 363 | $sitemenu['search'] = array( |
| 364 | 364 | 'search', |
| 365 | 365 | 'tools', |
| 366 | - '<i class="fa fa-search"></i>' . $_lang['search'], |
|
| 366 | + '<i class="fa fa-search"></i>'.$_lang['search'], |
|
| 367 | 367 | 'index.php?a=71', |
| 368 | 368 | $_lang['search'], |
| 369 | 369 | '', |
@@ -374,11 +374,11 @@ discard block |
||
| 374 | 374 | '' |
| 375 | 375 | ); |
| 376 | 376 | |
| 377 | -if($modx->hasPermission('bk_manager')) {
|
|
| 377 | +if ($modx->hasPermission('bk_manager')) {
|
|
| 378 | 378 | $sitemenu['bk_manager'] = array( |
| 379 | 379 | 'bk_manager', |
| 380 | 380 | 'tools', |
| 381 | - '<i class="fa fa-database"></i>' . $_lang['bk_manager'], |
|
| 381 | + '<i class="fa fa-database"></i>'.$_lang['bk_manager'], |
|
| 382 | 382 | 'index.php?a=93', |
| 383 | 383 | $_lang['bk_manager'], |
| 384 | 384 | '', |
@@ -390,11 +390,11 @@ discard block |
||
| 390 | 390 | ); |
| 391 | 391 | } |
| 392 | 392 | |
| 393 | -if($modx->hasPermission('remove_locks')) {
|
|
| 393 | +if ($modx->hasPermission('remove_locks')) {
|
|
| 394 | 394 | $sitemenu['remove_locks'] = array( |
| 395 | 395 | 'remove_locks', |
| 396 | 396 | 'tools', |
| 397 | - '<i class="fa fa-hourglass"></i>' . $_lang['remove_locks'], |
|
| 397 | + '<i class="fa fa-hourglass"></i>'.$_lang['remove_locks'], |
|
| 398 | 398 | 'javascript:modx.removeLocks();', |
| 399 | 399 | $_lang['remove_locks'], |
| 400 | 400 | '', |
@@ -406,11 +406,11 @@ discard block |
||
| 406 | 406 | ); |
| 407 | 407 | } |
| 408 | 408 | |
| 409 | -if($modx->hasPermission('import_static')) {
|
|
| 409 | +if ($modx->hasPermission('import_static')) {
|
|
| 410 | 410 | $sitemenu['import_site'] = array( |
| 411 | 411 | 'import_site', |
| 412 | 412 | 'tools', |
| 413 | - '<i class="fa fa-upload"></i>' . $_lang['import_site'], |
|
| 413 | + '<i class="fa fa-upload"></i>'.$_lang['import_site'], |
|
| 414 | 414 | 'index.php?a=95', |
| 415 | 415 | $_lang['import_site'], |
| 416 | 416 | '', |
@@ -422,11 +422,11 @@ discard block |
||
| 422 | 422 | ); |
| 423 | 423 | } |
| 424 | 424 | |
| 425 | -if($modx->hasPermission('export_static')) {
|
|
| 425 | +if ($modx->hasPermission('export_static')) {
|
|
| 426 | 426 | $sitemenu['export_site'] = array( |
| 427 | 427 | 'export_site', |
| 428 | 428 | 'tools', |
| 429 | - '<i class="fa fa-download"></i>' . $_lang['export_site'], |
|
| 429 | + '<i class="fa fa-download"></i>'.$_lang['export_site'], |
|
| 430 | 430 | 'index.php?a=83', |
| 431 | 431 | $_lang['export_site'], |
| 432 | 432 | '', |
@@ -439,20 +439,20 @@ discard block |
||
| 439 | 439 | } |
| 440 | 440 | |
| 441 | 441 | $menu = $modx->invokeEvent("OnManagerMenuPrerender", array('menu' => $sitemenu));
|
| 442 | -if(is_array($menu)) {
|
|
| 442 | +if (is_array($menu)) {
|
|
| 443 | 443 | $newmenu = array(); |
| 444 | - foreach($menu as $item){
|
|
| 445 | - if(is_array(unserialize($item))){
|
|
| 444 | + foreach ($menu as $item) {
|
|
| 445 | + if (is_array(unserialize($item))) {
|
|
| 446 | 446 | $newmenu = array_merge($newmenu, unserialize($item)); |
| 447 | 447 | } |
| 448 | 448 | } |
| 449 | - if(count($newmenu)> 0) $sitemenu = $newmenu; |
|
| 449 | + if (count($newmenu) > 0) $sitemenu = $newmenu; |
|
| 450 | 450 | } |
| 451 | 451 | |
| 452 | -if(file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php')) {
|
|
| 453 | - include_once(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php'); |
|
| 452 | +if (file_exists(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/includes/menu.class.inc.php')) {
|
|
| 453 | + include_once(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/includes/menu.class.inc.php'); |
|
| 454 | 454 | } else {
|
| 455 | - include_once(MODX_MANAGER_PATH . 'includes/menu.class.inc.php'); |
|
| 455 | + include_once(MODX_MANAGER_PATH.'includes/menu.class.inc.php'); |
|
| 456 | 456 | } |
| 457 | 457 | $menu = new EVOmenu(); |
| 458 | 458 | $menu->Build($sitemenu, array( |
@@ -13,8 +13,8 @@ discard block |
||
| 13 | 13 | <tr> |
| 14 | 14 | <th><?php echo $_lang['sitestatus_title'] ?><br><small>[(site_status)]</small></th> |
| 15 | 15 | <td> |
| 16 | - <?php echo wrap_label($_lang['online'], form_radio('site_status', 1));?><br />
|
|
| 17 | - <?php echo wrap_label($_lang['offline'], form_radio('site_status', 0));?>
|
|
| 16 | + <?php echo wrap_label($_lang['online'], form_radio('site_status', 1)); ?><br />
|
|
| 17 | + <?php echo wrap_label($_lang['offline'], form_radio('site_status', 0)); ?>
|
|
| 18 | 18 | </td> |
| 19 | 19 | </tr> |
| 20 | 20 | <tr> |
@@ -58,12 +58,12 @@ discard block |
||
| 58 | 58 | <br /> |
| 59 | 59 | <p><?php echo $_lang['update_settings_from_language']; ?></p> |
| 60 | 60 | <select name="reload_site_unavailable" id="reload_site_unavailable_select" onchange="confirmLangChange(this, 'siteunavailable_message_default', 'site_unavailable_message_textarea');"> |
| 61 | -<?php echo get_lang_options('siteunavailable_message_default');?>
|
|
| 61 | +<?php echo get_lang_options('siteunavailable_message_default'); ?>
|
|
| 62 | 62 | </select> |
| 63 | 63 | </th> |
| 64 | 64 | <td> <textarea name="site_unavailable_message" id="site_unavailable_message_textarea" style="width:100%; height: 120px;"><?php echo $site_unavailable_message_view; ?></textarea> |
| 65 | - <input type="hidden" name="siteunavailable_message_default" id="siteunavailable_message_default_hidden" value="<?php echo addslashes($_lang['siteunavailable_message_default']);?>" /> |
|
| 66 | - <div class="comment"><?php echo $_lang['siteunavailable_message'];?></div> |
|
| 65 | + <input type="hidden" name="siteunavailable_message_default" id="siteunavailable_message_default_hidden" value="<?php echo addslashes($_lang['siteunavailable_message_default']); ?>" /> |
|
| 66 | + <div class="comment"><?php echo $_lang['siteunavailable_message']; ?></div> |
|
| 67 | 67 | </td> |
| 68 | 68 | </tr> |
| 69 | 69 | <tr> |
@@ -78,17 +78,17 @@ discard block |
||
| 78 | 78 | 'c.category, t.templatename ASC' |
| 79 | 79 | ); |
| 80 | 80 | ?> |
| 81 | - <select name="default_template" class="inputBox" onchange="documentDirty=true;wrap=document.getElementById('template_reset_options_wrapper');if(this.options[this.selectedIndex].value != '<?php echo $default_template;?>'){wrap.style.display='block';}else{wrap.style.display='none';}" style="width:150px">
|
|
| 81 | + <select name="default_template" class="inputBox" onchange="documentDirty=true;wrap=document.getElementById('template_reset_options_wrapper');if(this.options[this.selectedIndex].value != '<?php echo $default_template; ?>'){wrap.style.display='block';}else{wrap.style.display='none';}" style="width:150px">
|
|
| 82 | 82 | <?php |
| 83 | 83 | |
| 84 | 84 | $currentCategory = ''; |
| 85 | 85 | while ($row = $modx->db->getRow($rs)) {
|
| 86 | 86 | $thisCategory = $row['category']; |
| 87 | - if($thisCategory == null) {
|
|
| 87 | + if ($thisCategory == null) {
|
|
| 88 | 88 | $thisCategory = $_lang['no_category']; |
| 89 | 89 | } |
| 90 | - if($thisCategory != $currentCategory) {
|
|
| 91 | - if($closeOptGroup) {
|
|
| 90 | + if ($thisCategory != $currentCategory) {
|
|
| 91 | + if ($closeOptGroup) {
|
|
| 92 | 92 | echo "\t\t\t\t\t</optgroup>\n"; |
| 93 | 93 | } |
| 94 | 94 | echo "\t\t\t\t\t<optgroup label=\"$thisCategory\">\n"; |
@@ -106,7 +106,7 @@ discard block |
||
| 106 | 106 | echo "\t\t\t\t\t".'<option value="'.$row['id'].'"'.$selectedtext.'>'.$row['templatename']."</option>\n"; |
| 107 | 107 | $currentCategory = $thisCategory; |
| 108 | 108 | } |
| 109 | - if($thisCategory != '') {
|
|
| 109 | + if ($thisCategory != '') {
|
|
| 110 | 110 | echo "\t\t\t\t\t</optgroup>\n"; |
| 111 | 111 | } |
| 112 | 112 | ?> |
@@ -114,19 +114,19 @@ discard block |
||
| 114 | 114 | <br /> |
| 115 | 115 | <div id="template_reset_options_wrapper" style="display:none;"> |
| 116 | 116 | <label><input type="radio" name="reset_template" value="1" /> <?php echo $_lang['template_reset_all']; ?></label><br /> |
| 117 | - <label><input type="radio" name="reset_template" value="2" /> <?php echo sprintf($_lang['template_reset_specific'],$oldTmpName); ?></label> |
|
| 117 | + <label><input type="radio" name="reset_template" value="2" /> <?php echo sprintf($_lang['template_reset_specific'], $oldTmpName); ?></label> |
|
| 118 | 118 | </div> |
| 119 | 119 | <input type="hidden" name="old_template" value="<?php echo $oldTmpId; ?>" /> |
| 120 | 120 | <div class="comment"><?php echo $_lang['defaulttemplate_message'] ?></div> |
| 121 | 121 | </td> |
| 122 | 122 | </tr> |
| 123 | 123 | <tr> |
| 124 | - <th><?php echo $_lang['defaulttemplate_logic_title'];?><br><small>[(auto_template_logic)]</small></th> |
|
| 124 | + <th><?php echo $_lang['defaulttemplate_logic_title']; ?><br><small>[(auto_template_logic)]</small></th> |
|
| 125 | 125 | <td> |
| 126 | - <p><?php echo $_lang['defaulttemplate_logic_general_message'];?></p> |
|
| 127 | - <label><input type="radio" name="auto_template_logic" value="system"<?php if($auto_template_logic == 'system') {echo " checked='checked'";}?>/> <?php echo $_lang['defaulttemplate_logic_system_message']; ?></label><br />
|
|
| 128 | - <label><input type="radio" name="auto_template_logic" value="parent"<?php if($auto_template_logic == 'parent') {echo " checked='checked'";}?>/> <?php echo $_lang['defaulttemplate_logic_parent_message']; ?></label><br />
|
|
| 129 | - <label><input type="radio" name="auto_template_logic" value="sibling"<?php if($auto_template_logic == 'sibling') {echo " checked='checked'";}?>/> <?php echo $_lang['defaulttemplate_logic_sibling_message']; ?></label><br />
|
|
| 126 | + <p><?php echo $_lang['defaulttemplate_logic_general_message']; ?></p> |
|
| 127 | + <label><input type="radio" name="auto_template_logic" value="system"<?php if ($auto_template_logic == 'system') {echo " checked='checked'"; }?>/> <?php echo $_lang['defaulttemplate_logic_system_message']; ?></label><br />
|
|
| 128 | + <label><input type="radio" name="auto_template_logic" value="parent"<?php if ($auto_template_logic == 'parent') {echo " checked='checked'"; }?>/> <?php echo $_lang['defaulttemplate_logic_parent_message']; ?></label><br />
|
|
| 129 | + <label><input type="radio" name="auto_template_logic" value="sibling"<?php if ($auto_template_logic == 'sibling') {echo " checked='checked'"; }?>/> <?php echo $_lang['defaulttemplate_logic_sibling_message']; ?></label><br />
|
|
| 130 | 130 | </td> |
| 131 | 131 | </tr> |
| 132 | 132 | <tr> |
@@ -138,22 +138,22 @@ discard block |
||
| 138 | 138 | $modx->db->select('id', '[+prefix+]site_plugins',
|
| 139 | 139 | "plugincode LIKE '%phx.parser.class.inc.php%OnParseDocument();%' AND disabled != 1") |
| 140 | 140 | ); |
| 141 | - if($count) {
|
|
| 141 | + if ($count) {
|
|
| 142 | 142 | $disabledFilters = 1; |
| 143 | 143 | echo '<b>'.$_lang['enable_filter_phx_warning'].'</b><br/>'; |
| 144 | 144 | } |
| 145 | 145 | else $disabledFilters = false; |
| 146 | 146 | ?> |
| 147 | - <?php echo wrap_label($_lang['yes'],form_radio('enable_filter', 1, '', $disabledFilters));?><br />
|
|
| 148 | - <?php echo wrap_label($_lang['no'], form_radio('enable_filter', 0, '', $disabledFilters));?>
|
|
| 147 | + <?php echo wrap_label($_lang['yes'], form_radio('enable_filter', 1, '', $disabledFilters)); ?><br />
|
|
| 148 | + <?php echo wrap_label($_lang['no'], form_radio('enable_filter', 0, '', $disabledFilters)); ?>
|
|
| 149 | 149 | <div class="comment"><?php echo $_lang['enable_filter_message']; ?></div> |
| 150 | 150 | </td> |
| 151 | 151 | </tr> |
| 152 | 152 | <tr> |
| 153 | 153 | <th><?php echo $_lang['enable_at_syntax_title'] ?><br><small>[(enable_at_syntax)]</small></th> |
| 154 | 154 | <td > |
| 155 | - <?php echo wrap_label($_lang['yes'],form_radio('enable_at_syntax', 1));?><br />
|
|
| 156 | - <?php echo wrap_label($_lang['no'], form_radio('enable_at_syntax', 0));?>
|
|
| 155 | + <?php echo wrap_label($_lang['yes'], form_radio('enable_at_syntax', 1)); ?><br />
|
|
| 156 | + <?php echo wrap_label($_lang['no'], form_radio('enable_at_syntax', 0)); ?>
|
|
| 157 | 157 | <div class="comment"> |
| 158 | 158 | <?php echo $_lang['enable_at_syntax_message']; ?> |
| 159 | 159 | <ul> |
@@ -167,8 +167,8 @@ discard block |
||
| 167 | 167 | <tr> |
| 168 | 168 | <th><?php echo $_lang['defaultpublish_title'] ?><br><small>[(publish_default)]</small></th> |
| 169 | 169 | <td> |
| 170 | - <?php echo wrap_label($_lang['yes'],form_radio('publish_default', 1));?><br />
|
|
| 171 | - <?php echo wrap_label($_lang['no'],form_radio('publish_default', 0));?>
|
|
| 170 | + <?php echo wrap_label($_lang['yes'], form_radio('publish_default', 1)); ?><br />
|
|
| 171 | + <?php echo wrap_label($_lang['no'], form_radio('publish_default', 0)); ?>
|
|
| 172 | 172 | <div class="comment"><?php echo $_lang['defaultpublish_message'] ?></div> |
| 173 | 173 | </td> |
| 174 | 174 | </tr> |
@@ -176,24 +176,24 @@ discard block |
||
| 176 | 176 | <tr> |
| 177 | 177 | <th><?php echo $_lang['defaultcache_title'] ?><br><small>[(cache_default)]</small></th> |
| 178 | 178 | <td> |
| 179 | - <?php echo wrap_label($_lang['yes'],form_radio('cache_default', 1));?><br />
|
|
| 180 | - <?php echo wrap_label($_lang['no'],form_radio('cache_default', 0));?>
|
|
| 179 | + <?php echo wrap_label($_lang['yes'], form_radio('cache_default', 1)); ?><br />
|
|
| 180 | + <?php echo wrap_label($_lang['no'], form_radio('cache_default', 0)); ?>
|
|
| 181 | 181 | <div class="comment"><?php echo $_lang['defaultcache_message'] ?></div> |
| 182 | 182 | </td> |
| 183 | 183 | </tr> |
| 184 | 184 | <tr> |
| 185 | 185 | <th><?php echo $_lang['defaultsearch_title'] ?><br><small>[(search_default)]</small></th> |
| 186 | 186 | <td> |
| 187 | - <?php echo wrap_label($_lang['yes'],form_radio('search_default', 1));?><br />
|
|
| 188 | - <?php echo wrap_label($_lang['no'],form_radio('search_default', 0));?>
|
|
| 187 | + <?php echo wrap_label($_lang['yes'], form_radio('search_default', 1)); ?><br />
|
|
| 188 | + <?php echo wrap_label($_lang['no'], form_radio('search_default', 0)); ?>
|
|
| 189 | 189 | <div class="comment"><?php echo $_lang['defaultsearch_message'] ?></div> |
| 190 | 190 | </td> |
| 191 | 191 | </tr> |
| 192 | 192 | <tr> |
| 193 | 193 | <th><?php echo $_lang['defaultmenuindex_title'] ?><br><small>[(auto_menuindex)]</small></th> |
| 194 | 194 | <td> |
| 195 | - <?php echo wrap_label($_lang['yes'],form_radio('auto_menuindex', 1));?><br />
|
|
| 196 | - <?php echo wrap_label($_lang['no'],form_radio('auto_menuindex', 0));?>
|
|
| 195 | + <?php echo wrap_label($_lang['yes'], form_radio('auto_menuindex', 1)); ?><br />
|
|
| 196 | + <?php echo wrap_label($_lang['no'], form_radio('auto_menuindex', 0)); ?>
|
|
| 197 | 197 | <div class="comment"><?php echo $_lang['defaultmenuindex_message'] ?></div> |
| 198 | 198 | </td> |
| 199 | 199 | </tr> |
@@ -203,8 +203,8 @@ discard block |
||
| 203 | 203 | <table border="0" cellspacing="0" cellpadding="0"><tr><td valign="top"> |
| 204 | 204 | <select name="lst_custom_contenttype" style="width:200px;height:100px;" size="5"> |
| 205 | 205 | <?php |
| 206 | - $ct = explode(",",$custom_contenttype);
|
|
| 207 | - for($i=0;$i<count($ct);$i++) {
|
|
| 206 | + $ct = explode(",", $custom_contenttype);
|
|
| 207 | + for ($i = 0; $i < count($ct); $i++) {
|
|
| 208 | 208 | echo "<option value=\"".$ct[$i]."\">".$ct[$i]."</option>"; |
| 209 | 209 | } |
| 210 | 210 | ?> |
@@ -218,14 +218,14 @@ discard block |
||
| 218 | 218 | <th><?php echo $_lang['docid_incrmnt_method_title'] ?><br><small>[(docid_incrmnt_method)]</small></th> |
| 219 | 219 | <td> |
| 220 | 220 | <label><input type="radio" name="docid_incrmnt_method" value="0" |
| 221 | - <?php echo ($docid_incrmnt_method=='0') ? 'checked="checked"' : "" ; ?> /> |
|
| 221 | + <?php echo ($docid_incrmnt_method == '0') ? 'checked="checked"' : ""; ?> /> |
|
| 222 | 222 | <?php echo $_lang['docid_incrmnt_method_0']?></label><br /> |
| 223 | 223 | |
| 224 | 224 | <label><input type="radio" name="docid_incrmnt_method" value="1" |
| 225 | - <?php echo ($docid_incrmnt_method=='1') ? 'checked="checked"' : "" ; ?> /> |
|
| 225 | + <?php echo ($docid_incrmnt_method == '1') ? 'checked="checked"' : ""; ?> /> |
|
| 226 | 226 | <?php echo $_lang['docid_incrmnt_method_1']?></label><br /> |
| 227 | 227 | <label><input type="radio" name="docid_incrmnt_method" value="2" |
| 228 | - <?php echo ($docid_incrmnt_method=='2') ? 'checked="checked"' : "" ; ?> /> |
|
| 228 | + <?php echo ($docid_incrmnt_method == '2') ? 'checked="checked"' : ""; ?> /> |
|
| 229 | 229 | <?php echo $_lang['docid_incrmnt_method_2']?></label><br /> |
| 230 | 230 | </td> |
| 231 | 231 | </tr> |
@@ -233,24 +233,24 @@ discard block |
||
| 233 | 233 | <tr> |
| 234 | 234 | <th><?php echo $_lang['enable_cache_title'] ?><br><small>[(enable_cache)]</small></th> |
| 235 | 235 | <td> |
| 236 | - <?php echo wrap_label($_lang['enabled'],form_radio('enable_cache', 1));?><br />
|
|
| 237 | - <?php echo wrap_label($_lang['disabled'], form_radio('enable_cache', 0));?><br />
|
|
| 238 | - <?php echo wrap_label($_lang['disabled_at_login'], form_radio('enable_cache', 2));?>
|
|
| 236 | + <?php echo wrap_label($_lang['enabled'], form_radio('enable_cache', 1)); ?><br />
|
|
| 237 | + <?php echo wrap_label($_lang['disabled'], form_radio('enable_cache', 0)); ?><br />
|
|
| 238 | + <?php echo wrap_label($_lang['disabled_at_login'], form_radio('enable_cache', 2)); ?>
|
|
| 239 | 239 | </td> |
| 240 | 240 | </tr> |
| 241 | 241 | |
| 242 | 242 | <tr> |
| 243 | 243 | <th><?php echo $_lang['cache_type_title'] ?><br><small>[(cache_type)]</small></th> |
| 244 | 244 | <td> |
| 245 | -<?php echo wrap_label($_lang['cache_type_1'],form_radio('cache_type', 1));?><br />
|
|
| 246 | -<?php echo wrap_label($_lang['cache_type_2'], form_radio('cache_type', 2));?>
|
|
| 245 | +<?php echo wrap_label($_lang['cache_type_1'], form_radio('cache_type', 1)); ?><br />
|
|
| 246 | +<?php echo wrap_label($_lang['cache_type_2'], form_radio('cache_type', 2)); ?>
|
|
| 247 | 247 | </td> |
| 248 | 248 | </tr> |
| 249 | 249 | <tr> |
| 250 | 250 | <th><?php echo $_lang['minifyphp_incache_title'] ?><br><small>[(minifyphp_incache)]</small></th> |
| 251 | 251 | <td> |
| 252 | -<?php echo wrap_label($_lang['enabled'],form_radio('minifyphp_incache', 1));?><br />
|
|
| 253 | -<?php echo wrap_label($_lang['disabled'], form_radio('minifyphp_incache', 0));?>
|
|
| 252 | +<?php echo wrap_label($_lang['enabled'], form_radio('minifyphp_incache', 1)); ?><br />
|
|
| 253 | +<?php echo wrap_label($_lang['disabled'], form_radio('minifyphp_incache', 0)); ?>
|
|
| 254 | 254 | <div class="comment"><?php echo $_lang['minifyphp_incache_message'] ?></div> |
| 255 | 255 | </td> |
| 256 | 256 | </tr> |
@@ -259,23 +259,23 @@ discard block |
||
| 259 | 259 | <th><?php echo $_lang['serveroffset_title'] ?><br><small>[(server_offset_time)]</small></th> |
| 260 | 260 | <td> <select name="server_offset_time" size="1" class="inputBox"> |
| 261 | 261 | <?php |
| 262 | - for($i=-24; $i<25; $i++) {
|
|
| 263 | - $seconds = $i*60*60; |
|
| 264 | - $selectedtext = $seconds==$server_offset_time ? "selected='selected'" : "" ; |
|
| 262 | + for ($i = -24; $i < 25; $i++) {
|
|
| 263 | + $seconds = $i * 60 * 60; |
|
| 264 | + $selectedtext = $seconds == $server_offset_time ? "selected='selected'" : ""; |
|
| 265 | 265 | ?> |
| 266 | 266 | <option value="<?php echo $seconds; ?>" <?php echo $selectedtext; ?>><?php echo $i; ?></option> |
| 267 | 267 | <?php |
| 268 | 268 | } |
| 269 | 269 | ?> |
| 270 | 270 | </select> |
| 271 | - <div class="comment"><?php printf($_lang['serveroffset_message'], strftime('%H:%M:%S', time()), strftime('%H:%M:%S', time()+$server_offset_time)); ?></div>
|
|
| 271 | + <div class="comment"><?php printf($_lang['serveroffset_message'], strftime('%H:%M:%S', time()), strftime('%H:%M:%S', time() + $server_offset_time)); ?></div>
|
|
| 272 | 272 | </td> |
| 273 | 273 | </tr> |
| 274 | 274 | <tr> |
| 275 | 275 | <th><?php echo $_lang['server_protocol_title'] ?><br><small>[(server_protocol)]</small></th> |
| 276 | 276 | <td> |
| 277 | - <?php echo wrap_label($_lang['server_protocol_http'],form_radio('server_protocol', 'http'));?><br />
|
|
| 278 | - <?php echo wrap_label($_lang['server_protocol_https'], form_radio('server_protocol', 'https'));?>
|
|
| 277 | + <?php echo wrap_label($_lang['server_protocol_http'], form_radio('server_protocol', 'http')); ?><br />
|
|
| 278 | + <?php echo wrap_label($_lang['server_protocol_https'], form_radio('server_protocol', 'https')); ?>
|
|
| 279 | 279 | <div class="comment"><?php echo $_lang['server_protocol_message'] ?></div> |
| 280 | 280 | </td> |
| 281 | 281 | </tr> |
@@ -288,8 +288,8 @@ discard block |
||
| 288 | 288 | <tr> |
| 289 | 289 | <th><?php echo $_lang['track_visitors_title'] ?><br><small>[(track_visitors)]</small></th> |
| 290 | 290 | <td> |
| 291 | - <?php echo wrap_label($_lang['yes'],form_radio('track_visitors', 1));?><br />
|
|
| 292 | - <?php echo wrap_label($_lang['no'],form_radio('track_visitors', 0));?>
|
|
| 291 | + <?php echo wrap_label($_lang['yes'], form_radio('track_visitors', 1)); ?><br />
|
|
| 292 | + <?php echo wrap_label($_lang['no'], form_radio('track_visitors', 0)); ?>
|
|
| 293 | 293 | <div class="comment"><?php echo $_lang['track_visitors_message'] ?></div> |
| 294 | 294 | </td> |
| 295 | 295 | </tr> |
@@ -301,7 +301,7 @@ discard block |
||
| 301 | 301 | <?php |
| 302 | 302 | // invoke OnSiteSettingsRender event |
| 303 | 303 | $evtOut = $modx->invokeEvent('OnSiteSettingsRender');
|
| 304 | - if(is_array($evtOut)) echo implode("",$evtOut);
|
|
| 304 | + if (is_array($evtOut)) echo implode("", $evtOut);
|
|
| 305 | 305 | ?> |
| 306 | 306 | </td> |
| 307 | 307 | </tr> |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | } |
| 57 | 57 | $themename = $file; |
| 58 | 58 | $selectedtext = $themename == $manager_theme ? "selected='selected'" : ""; |
| 59 | - echo "<option value='$themename' $selectedtext>" . ucwords(str_replace("_", " ", $themename)) . "</option>";
|
|
| 59 | + echo "<option value='$themename' $selectedtext>".ucwords(str_replace("_", " ", $themename))."</option>";
|
|
| 60 | 60 | } |
| 61 | 61 | } |
| 62 | 62 | $dir->close(); |
@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | function BrowseServer() {
|
| 125 | 125 | var w = screen.width * 0.7; |
| 126 | 126 | var h = screen.height * 0.7; |
| 127 | - OpenServerBrowser("<?php echo MODX_MANAGER_URL; ?>media/browser/<?php echo $which_browser;?>/browser.php?Type=images", w, h);
|
|
| 127 | + OpenServerBrowser("<?php echo MODX_MANAGER_URL; ?>media/browser/<?php echo $which_browser; ?>/browser.php?Type=images", w, h);
|
|
| 128 | 128 | } |
| 129 | 129 | |
| 130 | 130 | function SetUrl(url, width, height, alt) {
|
@@ -162,7 +162,7 @@ discard block |
||
| 162 | 162 | function BrowseServer() {
|
| 163 | 163 | var w = screen.width * 0.7; |
| 164 | 164 | var h = screen.height * 0.7; |
| 165 | - OpenServerBrowser("<?php echo MODX_MANAGER_URL; ?>media/browser/<?php echo $which_browser;?>/browser.php?Type=images", w, h);
|
|
| 165 | + OpenServerBrowser("<?php echo MODX_MANAGER_URL; ?>media/browser/<?php echo $which_browser; ?>/browser.php?Type=images", w, h);
|
|
| 166 | 166 | } |
| 167 | 167 | |
| 168 | 168 | function SetUrl(url, width, height, alt) {
|
@@ -180,9 +180,9 @@ discard block |
||
| 180 | 180 | <tr> |
| 181 | 181 | <th><?php echo $_lang['login_form_position_title'] ?><br><small>[(login_form_position)]</small></th> |
| 182 | 182 | <td> |
| 183 | - <?php echo wrap_label($_lang['login_form_position_left'],form_radio('login_form_position', 'left'));?><br />
|
|
| 184 | - <?php echo wrap_label($_lang['login_form_position_center'], form_radio('login_form_position', 'center'));?><br />
|
|
| 185 | - <?php echo wrap_label($_lang['login_form_position_right'], form_radio('login_form_position', 'right'));?>
|
|
| 183 | + <?php echo wrap_label($_lang['login_form_position_left'], form_radio('login_form_position', 'left')); ?><br />
|
|
| 184 | + <?php echo wrap_label($_lang['login_form_position_center'], form_radio('login_form_position', 'center')); ?><br />
|
|
| 185 | + <?php echo wrap_label($_lang['login_form_position_right'], form_radio('login_form_position', 'right')); ?>
|
|
| 186 | 186 | </td> |
| 187 | 187 | </tr> |
| 188 | 188 | <tr> |
@@ -194,8 +194,8 @@ discard block |
||
| 194 | 194 | <tr> |
| 195 | 195 | <th><?php echo $_lang['manager_menu_position_title'] ?><br><small>[(manager_menu_position)]</small></th> |
| 196 | 196 | <td> |
| 197 | - <?php echo wrap_label($_lang['manager_menu_position_top'],form_radio('manager_menu_position', 'top'));?><br />
|
|
| 198 | - <?php echo wrap_label($_lang['manager_menu_position_left'], form_radio('manager_menu_position', 'left'));?><br />
|
|
| 197 | + <?php echo wrap_label($_lang['manager_menu_position_top'], form_radio('manager_menu_position', 'top')); ?><br />
|
|
| 198 | + <?php echo wrap_label($_lang['manager_menu_position_left'], form_radio('manager_menu_position', 'left')); ?><br />
|
|
| 199 | 199 | </td> |
| 200 | 200 | </tr> |
| 201 | 201 | |
@@ -337,7 +337,7 @@ discard block |
||
| 337 | 337 | <td> |
| 338 | 338 | <select name="group_tvs" size="1" class="form-control"> |
| 339 | 339 | <?php |
| 340 | - $tpl = '<option value="[+value+]" [+selected+]>[+title+]</option>' . "\n"; |
|
| 340 | + $tpl = '<option value="[+value+]" [+selected+]>[+title+]</option>'."\n"; |
|
| 341 | 341 | $option = explode(',', $_lang['settings_group_tv_options']);
|
| 342 | 342 | $output = array(); |
| 343 | 343 | foreach ($option as $k => $v) {
|
@@ -410,7 +410,7 @@ discard block |
||
| 410 | 410 | <td> |
| 411 | 411 | <select name="resource_tree_node_name" size="1" class="inputBox"> |
| 412 | 412 | <?php |
| 413 | - $tpl = '<option value="[+value+]" [+selected+]>[*[+value+]*]</option>' . "\n"; |
|
| 413 | + $tpl = '<option value="[+value+]" [+selected+]>[*[+value+]*]</option>'."\n"; |
|
| 414 | 414 | $option = array('pagetitle', 'longtitle', 'menutitle', 'alias', 'createdon', 'editedon', 'publishedon');
|
| 415 | 415 | $output = array(); |
| 416 | 416 | foreach ($option as $v) {
|
@@ -496,8 +496,8 @@ discard block |
||
| 496 | 496 | $str = ''; |
| 497 | 497 | foreach ($datetime_format_list as $value) {
|
| 498 | 498 | $selectedtext = ($datetime_format == $value) ? ' selected' : ''; |
| 499 | - $str .= '<option value="' . $value . '"' . $selectedtext . '>'; |
|
| 500 | - $str .= $value . '</option>' . PHP_EOL; |
|
| 499 | + $str .= '<option value="'.$value.'"'.$selectedtext.'>'; |
|
| 500 | + $str .= $value.'</option>'.PHP_EOL; |
|
| 501 | 501 | } |
| 502 | 502 | echo $str; |
| 503 | 503 | ?> |
@@ -607,10 +607,10 @@ discard block |
||
| 607 | 607 | <select name="which_editor" onChange="documentDirty=true;"> |
| 608 | 608 | <?php |
| 609 | 609 | // invoke OnRichTextEditorRegister event |
| 610 | - echo "<option value='none'" . ($which_editor == 'none' ? " selected='selected'" : "") . ">" . $_lang['none'] . "</option>\n"; |
|
| 610 | + echo "<option value='none'".($which_editor == 'none' ? " selected='selected'" : "").">".$_lang['none']."</option>\n"; |
|
| 611 | 611 | if (is_array($evtOut)) {
|
| 612 | 612 | foreach ($evtOut as $editor) {
|
| 613 | - echo "<option value='$editor'" . ($which_editor == $editor ? " selected='selected'" : "") . ">$editor</option>\n"; |
|
| 613 | + echo "<option value='$editor'".($which_editor == $editor ? " selected='selected'" : "").">$editor</option>\n"; |
|
| 614 | 614 | } |
| 615 | 615 | } |
| 616 | 616 | ?> |
@@ -205,7 +205,7 @@ discard block |
||
| 205 | 205 | */ |
| 206 | 206 | function __call($method_name, $arguments) |
| 207 | 207 | { |
| 208 | - include_once(MODX_MANAGER_PATH . 'includes/extenders/deprecated.functions.inc.php'); |
|
| 208 | + include_once(MODX_MANAGER_PATH.'includes/extenders/deprecated.functions.inc.php'); |
|
| 209 | 209 | if (method_exists($this->old, $method_name)) { |
| 210 | 210 | $error_type = 1; |
| 211 | 211 | } else { |
@@ -223,12 +223,12 @@ discard block |
||
| 223 | 223 | $info = debug_backtrace(); |
| 224 | 224 | $m[] = $msg; |
| 225 | 225 | if (!empty($this->currentSnippet)) { |
| 226 | - $m[] = 'Snippet - ' . $this->currentSnippet; |
|
| 226 | + $m[] = 'Snippet - '.$this->currentSnippet; |
|
| 227 | 227 | } elseif (!empty($this->event->activePlugin)) { |
| 228 | - $m[] = 'Plugin - ' . $this->event->activePlugin; |
|
| 228 | + $m[] = 'Plugin - '.$this->event->activePlugin; |
|
| 229 | 229 | } |
| 230 | 230 | $m[] = $this->decoded_request_uri; |
| 231 | - $m[] = str_replace('\\', '/', $info[0]['file']) . '(line:' . $info[0]['line'] . ')'; |
|
| 231 | + $m[] = str_replace('\\', '/', $info[0]['file']).'(line:'.$info[0]['line'].')'; |
|
| 232 | 232 | $msg = implode('<br />', $m); |
| 233 | 233 | $this->logEvent(0, $error_type, $msg, $title); |
| 234 | 234 | } |
@@ -245,7 +245,7 @@ discard block |
||
| 245 | 245 | { |
| 246 | 246 | $flag = false; |
| 247 | 247 | if (is_scalar($connector) && !empty($connector) && isset($this->{$connector}) && $this->{$connector} instanceof DBAPI) { |
| 248 | - $flag = (bool)$this->{$connector}->conn; |
|
| 248 | + $flag = (bool) $this->{$connector}->conn; |
|
| 249 | 249 | } |
| 250 | 250 | return $flag; |
| 251 | 251 | } |
@@ -272,7 +272,7 @@ discard block |
||
| 272 | 272 | } |
| 273 | 273 | if (!$out && $flag) { |
| 274 | 274 | $extname = trim(str_replace(array('..', '/', '\\'), '', strtolower($extname))); |
| 275 | - $filename = MODX_MANAGER_PATH . "includes/extenders/ex_{$extname}.inc.php"; |
|
| 275 | + $filename = MODX_MANAGER_PATH."includes/extenders/ex_{$extname}.inc.php"; |
|
| 276 | 276 | $out = is_file($filename) ? include $filename : false; |
| 277 | 277 | } |
| 278 | 278 | if ($out && !in_array($extname, $this->extensions)) { |
@@ -289,7 +289,7 @@ discard block |
||
| 289 | 289 | public function getMicroTime() |
| 290 | 290 | { |
| 291 | 291 | list ($usec, $sec) = explode(' ', microtime()); |
| 292 | - return ((float)$usec + (float)$sec); |
|
| 292 | + return ((float) $usec + (float) $sec); |
|
| 293 | 293 | } |
| 294 | 294 | |
| 295 | 295 | /** |
@@ -313,7 +313,7 @@ discard block |
||
| 313 | 313 | // append the redirect count string to the url |
| 314 | 314 | $currentNumberOfRedirects = isset ($_REQUEST['err']) ? $_REQUEST['err'] : 0; |
| 315 | 315 | if ($currentNumberOfRedirects > 3) { |
| 316 | - $this->messageQuit('Redirection attempt failed - please ensure the document you\'re trying to redirect to exists. <p>Redirection URL: <i>' . $url . '</i></p>'); |
|
| 316 | + $this->messageQuit('Redirection attempt failed - please ensure the document you\'re trying to redirect to exists. <p>Redirection URL: <i>'.$url.'</i></p>'); |
|
| 317 | 317 | } else { |
| 318 | 318 | $currentNumberOfRedirects += 1; |
| 319 | 319 | if (strpos($url, "?") > 0) { |
@@ -324,9 +324,9 @@ discard block |
||
| 324 | 324 | } |
| 325 | 325 | } |
| 326 | 326 | if ($type == 'REDIRECT_REFRESH') { |
| 327 | - $header = 'Refresh: 0;URL=' . $url; |
|
| 327 | + $header = 'Refresh: 0;URL='.$url; |
|
| 328 | 328 | } elseif ($type == 'REDIRECT_META') { |
| 329 | - $header = '<META HTTP-EQUIV="Refresh" CONTENT="0; URL=' . $url . '" />'; |
|
| 329 | + $header = '<META HTTP-EQUIV="Refresh" CONTENT="0; URL='.$url.'" />'; |
|
| 330 | 330 | echo $header; |
| 331 | 331 | exit; |
| 332 | 332 | } elseif ($type == 'REDIRECT_HEADER' || empty ($type)) { |
@@ -334,10 +334,10 @@ discard block |
||
| 334 | 334 | global $base_url, $site_url; |
| 335 | 335 | if (substr($url, 0, strlen($base_url)) == $base_url) { |
| 336 | 336 | // append $site_url to make it work with Location: |
| 337 | - $url = $site_url . substr($url, strlen($base_url)); |
|
| 337 | + $url = $site_url.substr($url, strlen($base_url)); |
|
| 338 | 338 | } |
| 339 | 339 | if (strpos($url, "\n") === false) { |
| 340 | - $header = 'Location: ' . $url; |
|
| 340 | + $header = 'Location: '.$url; |
|
| 341 | 341 | } else { |
| 342 | 342 | $this->messageQuit('No newline allowed in redirect url.'); |
| 343 | 343 | } |
@@ -346,7 +346,7 @@ discard block |
||
| 346 | 346 | header($responseCode); |
| 347 | 347 | } |
| 348 | 348 | |
| 349 | - if(!empty($header)) { |
|
| 349 | + if (!empty($header)) { |
|
| 350 | 350 | header($header); |
| 351 | 351 | } |
| 352 | 352 | |
@@ -451,8 +451,8 @@ discard block |
||
| 451 | 451 | |
| 452 | 452 | private function recoverySiteCache() |
| 453 | 453 | { |
| 454 | - $site_cache_dir = MODX_BASE_PATH . $this->getCacheFolder(); |
|
| 455 | - $site_cache_path = $site_cache_dir . 'siteCache.idx.php'; |
|
| 454 | + $site_cache_dir = MODX_BASE_PATH.$this->getCacheFolder(); |
|
| 455 | + $site_cache_path = $site_cache_dir.'siteCache.idx.php'; |
|
| 456 | 456 | |
| 457 | 457 | if (is_file($site_cache_path)) { |
| 458 | 458 | include($site_cache_path); |
@@ -461,7 +461,7 @@ discard block |
||
| 461 | 461 | return; |
| 462 | 462 | } |
| 463 | 463 | |
| 464 | - include_once(MODX_MANAGER_PATH . 'processors/cache_sync.class.processor.php'); |
|
| 464 | + include_once(MODX_MANAGER_PATH.'processors/cache_sync.class.processor.php'); |
|
| 465 | 465 | $cache = new synccache(); |
| 466 | 466 | $cache->setCachepath($site_cache_dir); |
| 467 | 467 | $cache->setReport(false); |
@@ -513,8 +513,8 @@ discard block |
||
| 513 | 513 | $this->invokeEvent("OnBeforeManagerPageInit"); |
| 514 | 514 | } |
| 515 | 515 | |
| 516 | - if (isset ($_SESSION[$usrType . 'UsrConfigSet'])) { |
|
| 517 | - $usrSettings = &$_SESSION[$usrType . 'UsrConfigSet']; |
|
| 516 | + if (isset ($_SESSION[$usrType.'UsrConfigSet'])) { |
|
| 517 | + $usrSettings = &$_SESSION[$usrType.'UsrConfigSet']; |
|
| 518 | 518 | } else { |
| 519 | 519 | if ($usrType == 'web') { |
| 520 | 520 | $from = $tbl_web_user_settings; |
@@ -534,7 +534,7 @@ discard block |
||
| 534 | 534 | $usrSettings[$row['setting_name']] = $row['setting_value']; |
| 535 | 535 | } |
| 536 | 536 | if (isset ($usrType)) { |
| 537 | - $_SESSION[$usrType . 'UsrConfigSet'] = $usrSettings; |
|
| 537 | + $_SESSION[$usrType.'UsrConfigSet'] = $usrSettings; |
|
| 538 | 538 | } // store user settings in session |
| 539 | 539 | } |
| 540 | 540 | } |
@@ -679,10 +679,10 @@ discard block |
||
| 679 | 679 | $suf = $this->config['friendly_url_suffix']; |
| 680 | 680 | $pre = preg_quote($pre, '/'); |
| 681 | 681 | $suf = preg_quote($suf, '/'); |
| 682 | - if ($pre && preg_match('@^' . $pre . '(.*)$@', $q, $_)) { |
|
| 682 | + if ($pre && preg_match('@^'.$pre.'(.*)$@', $q, $_)) { |
|
| 683 | 683 | $q = $_[1]; |
| 684 | 684 | } |
| 685 | - if ($suf && preg_match('@(.*)' . $suf . '$@', $q, $_)) { |
|
| 685 | + if ($suf && preg_match('@(.*)'.$suf.'$@', $q, $_)) { |
|
| 686 | 686 | $q = $_[1]; |
| 687 | 687 | } |
| 688 | 688 | |
@@ -704,7 +704,7 @@ discard block |
||
| 704 | 704 | if (preg_match('@^[1-9][0-9]*$@', $q) && !isset($this->documentListing[$q])) { /* we got an ID returned, check to make sure it's not an alias */ |
| 705 | 705 | /* FS#476 and FS#308: check that id is valid in terms of virtualDir structure */ |
| 706 | 706 | if ($this->config['use_alias_path'] == 1) { |
| 707 | - if (($this->virtualDir != '' && !isset($this->documentListing[$this->virtualDir . '/' . $q]) || ($this->virtualDir == '' && !isset($this->documentListing[$q]))) && (($this->virtualDir != '' && isset($this->documentListing[$this->virtualDir]) && in_array($q, $this->getChildIds($this->documentListing[$this->virtualDir], 1))) || ($this->virtualDir == '' && in_array($q, $this->getChildIds(0, 1))))) { |
|
| 707 | + if (($this->virtualDir != '' && !isset($this->documentListing[$this->virtualDir.'/'.$q]) || ($this->virtualDir == '' && !isset($this->documentListing[$q]))) && (($this->virtualDir != '' && isset($this->documentListing[$this->virtualDir]) && in_array($q, $this->getChildIds($this->documentListing[$this->virtualDir], 1))) || ($this->virtualDir == '' && in_array($q, $this->getChildIds(0, 1))))) { |
|
| 708 | 708 | $this->documentMethod = 'id'; |
| 709 | 709 | return $q; |
| 710 | 710 | } else { /* not a valid id in terms of virtualDir, treat as alias */ |
@@ -738,7 +738,7 @@ discard block |
||
| 738 | 738 | */ |
| 739 | 739 | public function getHashFile($key) |
| 740 | 740 | { |
| 741 | - return $this->getCacheFolder() . "docid_" . $key . ".pageCache.php"; |
|
| 741 | + return $this->getCacheFolder()."docid_".$key.".pageCache.php"; |
|
| 742 | 742 | } |
| 743 | 743 | |
| 744 | 744 | /** |
@@ -749,9 +749,9 @@ discard block |
||
| 749 | 749 | $hash = $id; |
| 750 | 750 | $tmp = null; |
| 751 | 751 | $params = array(); |
| 752 | - if(!empty($this->systemCacheKey)){ |
|
| 752 | + if (!empty($this->systemCacheKey)) { |
|
| 753 | 753 | $hash = $this->systemCacheKey; |
| 754 | - }else { |
|
| 754 | + } else { |
|
| 755 | 755 | if (!empty($_GET)) { |
| 756 | 756 | // Sort GET parameters so that the order of parameters on the HTTP request don't affect the generated cache ID. |
| 757 | 757 | $params = $_GET; |
@@ -759,8 +759,8 @@ discard block |
||
| 759 | 759 | $hash .= '_'.md5(http_build_query($params)); |
| 760 | 760 | } |
| 761 | 761 | } |
| 762 | - $evtOut = $this->invokeEvent("OnMakePageCacheKey", array ("hash" => $hash, "id" => $id, 'params' => $params)); |
|
| 763 | - if (is_array($evtOut) && count($evtOut) > 0){ |
|
| 762 | + $evtOut = $this->invokeEvent("OnMakePageCacheKey", array("hash" => $hash, "id" => $id, 'params' => $params)); |
|
| 763 | + if (is_array($evtOut) && count($evtOut) > 0) { |
|
| 764 | 764 | $tmp = array_pop($evtOut); |
| 765 | 765 | } |
| 766 | 766 | return empty($tmp) ? $hash : $tmp; |
@@ -902,12 +902,12 @@ discard block |
||
| 902 | 902 | if ($js = $this->getRegisteredClientStartupScripts()) { |
| 903 | 903 | // change to just before closing </head> |
| 904 | 904 | // $this->documentContent = preg_replace("/(<head[^>]*>)/i", "\\1\n".$js, $this->documentContent); |
| 905 | - $this->documentOutput = preg_replace("/(<\/head>)/i", $js . "\n\\1", $this->documentOutput); |
|
| 905 | + $this->documentOutput = preg_replace("/(<\/head>)/i", $js."\n\\1", $this->documentOutput); |
|
| 906 | 906 | } |
| 907 | 907 | |
| 908 | 908 | // Insert jscripts & html block into template - template must have a </body> tag |
| 909 | 909 | if ($js = $this->getRegisteredClientScripts()) { |
| 910 | - $this->documentOutput = preg_replace("/(<\/body>)/i", $js . "\n\\1", $this->documentOutput); |
|
| 910 | + $this->documentOutput = preg_replace("/(<\/body>)/i", $js."\n\\1", $this->documentOutput); |
|
| 911 | 911 | } |
| 912 | 912 | // End fix by sirlancelot |
| 913 | 913 | |
@@ -918,7 +918,7 @@ discard block |
||
| 918 | 918 | // send out content-type and content-disposition headers |
| 919 | 919 | if (IN_PARSER_MODE == "true") { |
| 920 | 920 | $type = !empty ($this->contentTypes[$this->documentIdentifier]) ? $this->contentTypes[$this->documentIdentifier] : "text/html"; |
| 921 | - header('Content-Type: ' . $type . '; charset=' . $this->config['modx_charset']); |
|
| 921 | + header('Content-Type: '.$type.'; charset='.$this->config['modx_charset']); |
|
| 922 | 922 | // if (($this->documentIdentifier == $this->config['error_page']) || $redirect_error) |
| 923 | 923 | // header('HTTP/1.0 404 Not Found'); |
| 924 | 924 | if (!$this->checkPreview() && $this->documentObject['content_dispo'] == 1) { |
@@ -936,7 +936,7 @@ discard block |
||
| 936 | 936 | $name = preg_replace('|-+|', '-', $name); |
| 937 | 937 | $name = trim($name, '-'); |
| 938 | 938 | } |
| 939 | - $header = 'Content-Disposition: attachment; filename=' . $name; |
|
| 939 | + $header = 'Content-Disposition: attachment; filename='.$name; |
|
| 940 | 940 | header($header); |
| 941 | 941 | } |
| 942 | 942 | } |
@@ -944,7 +944,7 @@ discard block |
||
| 944 | 944 | |
| 945 | 945 | $stats = $this->getTimerStats($this->tstart); |
| 946 | 946 | |
| 947 | - $out =& $this->documentOutput; |
|
| 947 | + $out = & $this->documentOutput; |
|
| 948 | 948 | $out = str_replace("[^q^]", $stats['queries'], $out); |
| 949 | 949 | $out = str_replace("[^qt^]", $stats['queryTime'], $out); |
| 950 | 950 | $out = str_replace("[^p^]", $stats['phpTime'], $out); |
@@ -983,17 +983,17 @@ discard block |
||
| 983 | 983 | $sc .= sprintf("%s. %s (%s)<br>", $s, $sname, sprintf("%2.2f ms", $t)); // currentSnippet |
| 984 | 984 | $tt += $t; |
| 985 | 985 | } |
| 986 | - echo "<fieldset><legend><b>Snippets</b> (" . count($this->snippetsTime) . " / " . sprintf("%2.2f ms", $tt) . ")</legend>{$sc}</fieldset><br />"; |
|
| 986 | + echo "<fieldset><legend><b>Snippets</b> (".count($this->snippetsTime)." / ".sprintf("%2.2f ms", $tt).")</legend>{$sc}</fieldset><br />"; |
|
| 987 | 987 | echo $this->snippetsCode; |
| 988 | 988 | } |
| 989 | 989 | if ($this->dumpPlugins) { |
| 990 | 990 | $ps = ""; |
| 991 | 991 | $tt = 0; |
| 992 | 992 | foreach ($this->pluginsTime as $s => $t) { |
| 993 | - $ps .= "$s (" . sprintf("%2.2f ms", $t * 1000) . ")<br>"; |
|
| 993 | + $ps .= "$s (".sprintf("%2.2f ms", $t * 1000).")<br>"; |
|
| 994 | 994 | $tt += $t; |
| 995 | 995 | } |
| 996 | - echo "<fieldset><legend><b>Plugins</b> (" . count($this->pluginsTime) . " / " . sprintf("%2.2f ms", $tt * 1000) . ")</legend>{$ps}</fieldset><br />"; |
|
| 996 | + echo "<fieldset><legend><b>Plugins</b> (".count($this->pluginsTime)." / ".sprintf("%2.2f ms", $tt * 1000).")</legend>{$ps}</fieldset><br />"; |
|
| 997 | 997 | echo $this->pluginsCode; |
| 998 | 998 | } |
| 999 | 999 | |
@@ -1019,7 +1019,7 @@ discard block |
||
| 1019 | 1019 | $srcTags = explode(',', $tags); |
| 1020 | 1020 | $repTags = array(); |
| 1021 | 1021 | foreach ($srcTags as $tag) { |
| 1022 | - $repTags[] = '\\' . $tag[0] . '\\' . $tag[1]; |
|
| 1022 | + $repTags[] = '\\'.$tag[0].'\\'.$tag[1]; |
|
| 1023 | 1023 | } |
| 1024 | 1024 | return array($srcTags, $repTags); |
| 1025 | 1025 | } |
@@ -1041,7 +1041,7 @@ discard block |
||
| 1041 | 1041 | $stats['phpTime'] = sprintf("%2.4f s", $stats['phpTime']); |
| 1042 | 1042 | $stats['source'] = $this->documentGenerated == 1 ? "database" : "cache"; |
| 1043 | 1043 | $stats['queries'] = isset ($this->executedQueries) ? $this->executedQueries : 0; |
| 1044 | - $stats['phpMemory'] = (memory_get_peak_usage(true) / 1024 / 1024) . " mb"; |
|
| 1044 | + $stats['phpMemory'] = (memory_get_peak_usage(true) / 1024 / 1024)." mb"; |
|
| 1045 | 1045 | |
| 1046 | 1046 | return $stats; |
| 1047 | 1047 | } |
@@ -1074,7 +1074,7 @@ discard block |
||
| 1074 | 1074 | { |
| 1075 | 1075 | $cacheRefreshTime = 0; |
| 1076 | 1076 | $recent_update = 0; |
| 1077 | - @include(MODX_BASE_PATH . $this->getCacheFolder() . 'sitePublishing.idx.php'); |
|
| 1077 | + @include(MODX_BASE_PATH.$this->getCacheFolder().'sitePublishing.idx.php'); |
|
| 1078 | 1078 | $this->recentUpdate = $recent_update; |
| 1079 | 1079 | |
| 1080 | 1080 | $timeNow = $_SERVER['REQUEST_TIME'] + $this->config['server_offset_time']; |
@@ -1085,7 +1085,7 @@ discard block |
||
| 1085 | 1085 | // now, check for documents that need publishing |
| 1086 | 1086 | $field = array('published' => 1, 'publishedon' => $timeNow); |
| 1087 | 1087 | $where = "pub_date <= {$timeNow} AND pub_date!=0 AND published=0"; |
| 1088 | - $result_pub = $this->db->select( 'id', '[+prefix+]site_content', $where); |
|
| 1088 | + $result_pub = $this->db->select('id', '[+prefix+]site_content', $where); |
|
| 1089 | 1089 | $this->db->update($field, '[+prefix+]site_content', $where); |
| 1090 | 1090 | if ($this->db->getRecordCount($result_pub) >= 1) { //Event unPublished doc |
| 1091 | 1091 | while ($row_pub = $this->db->getRow($result_pub)) { |
@@ -1098,7 +1098,7 @@ discard block |
||
| 1098 | 1098 | // now, check for documents that need un-publishing |
| 1099 | 1099 | $field = array('published' => 0, 'publishedon' => 0); |
| 1100 | 1100 | $where = "unpub_date <= {$timeNow} AND unpub_date!=0 AND published=1"; |
| 1101 | - $result_unpub = $this->db->select( 'id', '[+prefix+]site_content', $where); |
|
| 1101 | + $result_unpub = $this->db->select('id', '[+prefix+]site_content', $where); |
|
| 1102 | 1102 | $this->db->update($field, '[+prefix+]site_content', $where); |
| 1103 | 1103 | if ($this->db->getRecordCount($result_unpub) >= 1) { //Event unPublished doc |
| 1104 | 1104 | while ($row_unpub = $this->db->getRow($result_unpub)) { |
@@ -1144,8 +1144,8 @@ discard block |
||
| 1144 | 1144 | } |
| 1145 | 1145 | |
| 1146 | 1146 | $docObjSerial = serialize($this->documentObject); |
| 1147 | - $cacheContent = $docObjSerial . "<!--__MODxCacheSpliter__-->" . $this->documentContent; |
|
| 1148 | - $page_cache_path = MODX_BASE_PATH . $this->getHashFile($this->cacheKey); |
|
| 1147 | + $cacheContent = $docObjSerial."<!--__MODxCacheSpliter__-->".$this->documentContent; |
|
| 1148 | + $page_cache_path = MODX_BASE_PATH.$this->getHashFile($this->cacheKey); |
|
| 1149 | 1149 | file_put_contents($page_cache_path, "<?php die('Unauthorized access.'); ?>$cacheContent"); |
| 1150 | 1150 | } |
| 1151 | 1151 | } |
@@ -1187,16 +1187,16 @@ discard block |
||
| 1187 | 1187 | return array(); |
| 1188 | 1188 | } |
| 1189 | 1189 | $spacer = md5('<<<EVO>>>'); |
| 1190 | - if($left==='{{' && strpos($content,';}}')!==false) $content = str_replace(';}}', sprintf(';}%s}', $spacer),$content); |
|
| 1191 | - if($left==='{{' && strpos($content,'{{}}')!==false) $content = str_replace('{{}}',sprintf('{%$1s{}%$1s}',$spacer),$content); |
|
| 1192 | - if($left==='[[' && strpos($content,']]]]')!==false) $content = str_replace(']]]]',sprintf(']]%s]]', $spacer),$content); |
|
| 1193 | - if($left==='[[' && strpos($content,']]]')!==false) $content = str_replace(']]]', sprintf(']%s]]', $spacer),$content); |
|
| 1190 | + if ($left === '{{' && strpos($content, ';}}') !== false) $content = str_replace(';}}', sprintf(';}%s}', $spacer), $content); |
|
| 1191 | + if ($left === '{{' && strpos($content, '{{}}') !== false) $content = str_replace('{{}}', sprintf('{%$1s{}%$1s}', $spacer), $content); |
|
| 1192 | + if ($left === '[[' && strpos($content, ']]]]') !== false) $content = str_replace(']]]]', sprintf(']]%s]]', $spacer), $content); |
|
| 1193 | + if ($left === '[[' && strpos($content, ']]]') !== false) $content = str_replace(']]]', sprintf(']%s]]', $spacer), $content); |
|
| 1194 | 1194 | |
| 1195 | 1195 | $pos['<![CDATA['] = strpos($content, '<![CDATA['); |
| 1196 | 1196 | $pos[']]>'] = strpos($content, ']]>'); |
| 1197 | 1197 | |
| 1198 | 1198 | if ($pos['<![CDATA['] !== false && $pos[']]>'] !== false) { |
| 1199 | - $content = substr($content, 0, $pos['<![CDATA[']) . substr($content, $pos[']]>'] + 3); |
|
| 1199 | + $content = substr($content, 0, $pos['<![CDATA[']).substr($content, $pos[']]>'] + 3); |
|
| 1200 | 1200 | } |
| 1201 | 1201 | |
| 1202 | 1202 | $lp = explode($left, $content); |
@@ -1260,8 +1260,8 @@ discard block |
||
| 1260 | 1260 | } |
| 1261 | 1261 | } |
| 1262 | 1262 | } |
| 1263 | - foreach($tags as $i=>$tag) { |
|
| 1264 | - if(strpos($tag,$spacer)!==false) $tags[$i] = str_replace($spacer, '', $tag); |
|
| 1263 | + foreach ($tags as $i=>$tag) { |
|
| 1264 | + if (strpos($tag, $spacer) !== false) $tags[$i] = str_replace($spacer, '', $tag); |
|
| 1265 | 1265 | } |
| 1266 | 1266 | return $tags; |
| 1267 | 1267 | } |
@@ -1301,7 +1301,7 @@ discard block |
||
| 1301 | 1301 | } |
| 1302 | 1302 | |
| 1303 | 1303 | foreach ($matches[1] as $i => $key) { |
| 1304 | - if(strpos($key,'[+')!==false) continue; // Allow chunk {{chunk?¶m=`xxx`}} with [*tv_name_[+param+]*] as content |
|
| 1304 | + if (strpos($key, '[+') !== false) continue; // Allow chunk {{chunk?¶m=`xxx`}} with [*tv_name_[+param+]*] as content |
|
| 1305 | 1305 | if (substr($key, 0, 1) == '#') { |
| 1306 | 1306 | $key = substr($key, 1); |
| 1307 | 1307 | } // remove # for QuickEdit format |
@@ -1321,8 +1321,8 @@ discard block |
||
| 1321 | 1321 | } |
| 1322 | 1322 | |
| 1323 | 1323 | if (is_array($value)) { |
| 1324 | - include_once(MODX_MANAGER_PATH . 'includes/tmplvars.format.inc.php'); |
|
| 1325 | - include_once(MODX_MANAGER_PATH . 'includes/tmplvars.commands.inc.php'); |
|
| 1324 | + include_once(MODX_MANAGER_PATH.'includes/tmplvars.format.inc.php'); |
|
| 1325 | + include_once(MODX_MANAGER_PATH.'includes/tmplvars.commands.inc.php'); |
|
| 1326 | 1326 | $value = getTVDisplayFormat($value[0], $value[1], $value[2], $value[3], $value[4]); |
| 1327 | 1327 | } |
| 1328 | 1328 | |
@@ -1333,8 +1333,8 @@ discard block |
||
| 1333 | 1333 | |
| 1334 | 1334 | if (strpos($content, $s) !== false) { |
| 1335 | 1335 | $content = str_replace($s, $value, $content); |
| 1336 | - } elseif($this->debug) { |
|
| 1337 | - $this->addLog('mergeDocumentContent parse error', $_SERVER['REQUEST_URI'] . $s, 2); |
|
| 1336 | + } elseif ($this->debug) { |
|
| 1337 | + $this->addLog('mergeDocumentContent parse error', $_SERVER['REQUEST_URI'].$s, 2); |
|
| 1338 | 1338 | } |
| 1339 | 1339 | } |
| 1340 | 1340 | |
@@ -1501,8 +1501,8 @@ discard block |
||
| 1501 | 1501 | $s = &$matches[0][$i]; |
| 1502 | 1502 | if (strpos($content, $s) !== false) { |
| 1503 | 1503 | $content = str_replace($s, $value, $content); |
| 1504 | - } elseif($this->debug) { |
|
| 1505 | - $this->addLog('mergeSettingsContent parse error', $_SERVER['REQUEST_URI'] . $s, 2); |
|
| 1504 | + } elseif ($this->debug) { |
|
| 1505 | + $this->addLog('mergeSettingsContent parse error', $_SERVER['REQUEST_URI'].$s, 2); |
|
| 1506 | 1506 | } |
| 1507 | 1507 | } |
| 1508 | 1508 | return $content; |
@@ -1555,7 +1555,7 @@ discard block |
||
| 1555 | 1555 | } |
| 1556 | 1556 | |
| 1557 | 1557 | $value = $this->parseText($value, $params); // parse local scope placeholers for ConditionalTags |
| 1558 | - $value = $this->mergePlaceholderContent($value, $params); // parse page global placeholers |
|
| 1558 | + $value = $this->mergePlaceholderContent($value, $params); // parse page global placeholers |
|
| 1559 | 1559 | if ($this->config['enable_at_syntax']) { |
| 1560 | 1560 | $value = $this->mergeConditionalTagsContent($value); |
| 1561 | 1561 | } |
@@ -1570,8 +1570,8 @@ discard block |
||
| 1570 | 1570 | $s = &$matches[0][$i]; |
| 1571 | 1571 | if (strpos($content, $s) !== false) { |
| 1572 | 1572 | $content = str_replace($s, $value, $content); |
| 1573 | - } elseif($this->debug) { |
|
| 1574 | - $this->addLog('mergeChunkContent parse error', $_SERVER['REQUEST_URI'] . $s, 2); |
|
| 1573 | + } elseif ($this->debug) { |
|
| 1574 | + $this->addLog('mergeChunkContent parse error', $_SERVER['REQUEST_URI'].$s, 2); |
|
| 1575 | 1575 | } |
| 1576 | 1576 | } |
| 1577 | 1577 | return $content; |
@@ -1629,8 +1629,8 @@ discard block |
||
| 1629 | 1629 | $s = &$matches[0][$i]; |
| 1630 | 1630 | if (strpos($content, $s) !== false) { |
| 1631 | 1631 | $content = str_replace($s, $value, $content); |
| 1632 | - } elseif($this->debug) { |
|
| 1633 | - $this->addLog('mergePlaceholderContent parse error', $_SERVER['REQUEST_URI'] . $s, 2); |
|
| 1632 | + } elseif ($this->debug) { |
|
| 1633 | + $this->addLog('mergePlaceholderContent parse error', $_SERVER['REQUEST_URI'].$s, 2); |
|
| 1634 | 1634 | } |
| 1635 | 1635 | } |
| 1636 | 1636 | return $content; |
@@ -1654,7 +1654,7 @@ discard block |
||
| 1654 | 1654 | return $content; |
| 1655 | 1655 | } |
| 1656 | 1656 | |
| 1657 | - $sp = '#' . md5('ConditionalTags' . $_SERVER['REQUEST_TIME']) . '#'; |
|
| 1657 | + $sp = '#'.md5('ConditionalTags'.$_SERVER['REQUEST_TIME']).'#'; |
|
| 1658 | 1658 | $content = str_replace(array('<?php', '<?=', '<?', '?>'), array("{$sp}b", "{$sp}p", "{$sp}s", "{$sp}e"), $content); |
| 1659 | 1659 | |
| 1660 | 1660 | $pieces = explode('<@IF:', $content); |
@@ -1665,7 +1665,7 @@ discard block |
||
| 1665 | 1665 | } |
| 1666 | 1666 | list($cmd, $text) = explode('>', $split, 2); |
| 1667 | 1667 | $cmd = str_replace("'", "\'", $cmd); |
| 1668 | - $content .= "<?php if(\$this->_parseCTagCMD('" . $cmd . "')): ?>"; |
|
| 1668 | + $content .= "<?php if(\$this->_parseCTagCMD('".$cmd."')): ?>"; |
|
| 1669 | 1669 | $content .= $text; |
| 1670 | 1670 | } |
| 1671 | 1671 | $pieces = explode('<@ELSEIF:', $content); |
@@ -1676,13 +1676,13 @@ discard block |
||
| 1676 | 1676 | } |
| 1677 | 1677 | list($cmd, $text) = explode('>', $split, 2); |
| 1678 | 1678 | $cmd = str_replace("'", "\'", $cmd); |
| 1679 | - $content .= "<?php elseif(\$this->_parseCTagCMD('" . $cmd . "')): ?>"; |
|
| 1679 | + $content .= "<?php elseif(\$this->_parseCTagCMD('".$cmd."')): ?>"; |
|
| 1680 | 1680 | $content .= $text; |
| 1681 | 1681 | } |
| 1682 | 1682 | |
| 1683 | 1683 | $content = str_replace(array('<@ELSE>', '<@ENDIF>'), array('<?php else:?>', '<?php endif;?>'), $content); |
| 1684 | 1684 | ob_start(); |
| 1685 | - $content = eval('?>' . $content); |
|
| 1685 | + $content = eval('?>'.$content); |
|
| 1686 | 1686 | $content = ob_get_clean(); |
| 1687 | 1687 | $content = str_replace(array("{$sp}b", "{$sp}p", "{$sp}s", "{$sp}e"), array('<?php', '<?=', '<?', '?>'), $content); |
| 1688 | 1688 | |
@@ -1807,7 +1807,7 @@ discard block |
||
| 1807 | 1807 | $matches = $this->getTagsFromContent($content, $left, $right); |
| 1808 | 1808 | if (!empty($matches)) { |
| 1809 | 1809 | foreach ($matches[0] as $i => $v) { |
| 1810 | - $addBreakMatches[$i] = $v . "\n"; |
|
| 1810 | + $addBreakMatches[$i] = $v."\n"; |
|
| 1811 | 1811 | } |
| 1812 | 1812 | $content = str_replace($addBreakMatches, '', $content); |
| 1813 | 1813 | if (strpos($content, $left) !== false) { |
@@ -1840,8 +1840,8 @@ discard block |
||
| 1840 | 1840 | $s = &$matches[0][$i]; |
| 1841 | 1841 | if (strpos($content, $s) !== false) { |
| 1842 | 1842 | $content = str_replace($s, $v, $content); |
| 1843 | - } elseif($this->debug) { |
|
| 1844 | - $this->addLog('ignoreCommentedTagsContent parse error', $_SERVER['REQUEST_URI'] . $s, 2); |
|
| 1843 | + } elseif ($this->debug) { |
|
| 1844 | + $this->addLog('ignoreCommentedTagsContent parse error', $_SERVER['REQUEST_URI'].$s, 2); |
|
| 1845 | 1845 | } |
| 1846 | 1846 | } |
| 1847 | 1847 | return $content; |
@@ -1905,7 +1905,7 @@ discard block |
||
| 1905 | 1905 | $msg = ($msg === false) ? 'ob_get_contents() error' : $msg; |
| 1906 | 1906 | $this->messageQuit('PHP Parse Error', '', true, $error_info['type'], $error_info['file'], 'Plugin', $error_info['message'], $error_info['line'], $msg); |
| 1907 | 1907 | if ($this->isBackend()) { |
| 1908 | - $this->event->alert('An error occurred while loading. Please see the event log for more information.<p>' . $msg . '</p>'); |
|
| 1908 | + $this->event->alert('An error occurred while loading. Please see the event log for more information.<p>'.$msg.'</p>'); |
|
| 1909 | 1909 | } |
| 1910 | 1910 | } |
| 1911 | 1911 | } else { |
@@ -1951,7 +1951,7 @@ discard block |
||
| 1951 | 1951 | $echo = ($echo === false) ? 'ob_get_contents() error' : $echo; |
| 1952 | 1952 | $this->messageQuit('PHP Parse Error', '', true, $error_info['type'], $error_info['file'], 'Snippet', $error_info['message'], $error_info['line'], $echo); |
| 1953 | 1953 | if ($this->isBackend()) { |
| 1954 | - $this->event->alert('An error occurred while loading. Please see the event log for more information<p>' . $echo . $return . '</p>'); |
|
| 1954 | + $this->event->alert('An error occurred while loading. Please see the event log for more information<p>'.$echo.$return.'</p>'); |
|
| 1955 | 1955 | } |
| 1956 | 1956 | } |
| 1957 | 1957 | } |
@@ -1959,7 +1959,7 @@ discard block |
||
| 1959 | 1959 | if (is_array($return) || is_object($return)) { |
| 1960 | 1960 | return $return; |
| 1961 | 1961 | } else { |
| 1962 | - return $echo . $return; |
|
| 1962 | + return $echo.$return; |
|
| 1963 | 1963 | } |
| 1964 | 1964 | } |
| 1965 | 1965 | |
@@ -1997,8 +1997,8 @@ discard block |
||
| 1997 | 1997 | } |
| 1998 | 1998 | if (strpos($content, $s) !== false) { |
| 1999 | 1999 | $content = str_replace($s, $value, $content); |
| 2000 | - } elseif($this->debug) { |
|
| 2001 | - $this->addLog('evalSnippetsSGVar parse error', $_SERVER['REQUEST_URI'] . $s, 2); |
|
| 2000 | + } elseif ($this->debug) { |
|
| 2001 | + $this->addLog('evalSnippetsSGVar parse error', $_SERVER['REQUEST_URI'].$s, 2); |
|
| 2002 | 2002 | } |
| 2003 | 2003 | continue; |
| 2004 | 2004 | } |
@@ -2009,8 +2009,8 @@ discard block |
||
| 2009 | 2009 | |
| 2010 | 2010 | if (strpos($content, $s) !== false) { |
| 2011 | 2011 | $content = str_replace($s, $value, $content); |
| 2012 | - } elseif($this->debug) { |
|
| 2013 | - $this->addLog('evalSnippets parse error', $_SERVER['REQUEST_URI'] . $s, 2); |
|
| 2012 | + } elseif ($this->debug) { |
|
| 2013 | + $this->addLog('evalSnippets parse error', $_SERVER['REQUEST_URI'].$s, 2); |
|
| 2014 | 2014 | } |
| 2015 | 2015 | } |
| 2016 | 2016 | |
@@ -2101,7 +2101,7 @@ discard block |
||
| 2101 | 2101 | $eventtime = sprintf('%2.2f ms', $eventtime * 1000); |
| 2102 | 2102 | $code = str_replace("\t", ' ', $this->htmlspecialchars($value)); |
| 2103 | 2103 | $piece = str_replace("\t", ' ', $this->htmlspecialchars($piece)); |
| 2104 | - $print_r_params = str_replace("\t", ' ', $this->htmlspecialchars('$modx->event->params = ' . print_r($params, true))); |
|
| 2104 | + $print_r_params = str_replace("\t", ' ', $this->htmlspecialchars('$modx->event->params = '.print_r($params, true))); |
|
| 2105 | 2105 | $this->snippetsCode .= sprintf('<fieldset style="margin:1em;"><legend><b>%s</b>(%s)</legend><pre style="white-space: pre-wrap;background-color:#fff;width:90%%;">[[%s]]</pre><pre style="white-space: pre-wrap;background-color:#fff;width:90%%;">%s</pre><pre style="white-space: pre-wrap;background-color:#fff;width:90%%;">%s</pre></fieldset>', $snippetObject['name'], $eventtime, $piece, $print_r_params, $code); |
| 2106 | 2106 | $this->snippetsTime[] = array('sname' => $key, 'time' => $eventtime); |
| 2107 | 2107 | } |
@@ -2345,7 +2345,7 @@ discard block |
||
| 2345 | 2345 | $rs = $this->db->select('name,snippet,properties', '[+prefix+]site_snippets', $where); |
| 2346 | 2346 | $count = $this->db->getRecordCount($rs); |
| 2347 | 2347 | if (1 < $count) { |
| 2348 | - exit('Error $modx->_getSnippetObject()' . $snip_name); |
|
| 2348 | + exit('Error $modx->_getSnippetObject()'.$snip_name); |
|
| 2349 | 2349 | } |
| 2350 | 2350 | if ($count) { |
| 2351 | 2351 | $row = $this->db->getRow($rs); |
@@ -2371,7 +2371,7 @@ discard block |
||
| 2371 | 2371 | public function toAlias($text) |
| 2372 | 2372 | { |
| 2373 | 2373 | $suff = $this->config['friendly_url_suffix']; |
| 2374 | - return str_replace(array('.xml' . $suff, '.rss' . $suff, '.js' . $suff, '.css' . $suff, '.txt' . $suff, '.json' . $suff, '.pdf' . $suff), array('.xml', '.rss', '.js', '.css', '.txt', '.json', '.pdf'), $text); |
|
| 2374 | + return str_replace(array('.xml'.$suff, '.rss'.$suff, '.js'.$suff, '.css'.$suff, '.txt'.$suff, '.json'.$suff, '.pdf'.$suff), array('.xml', '.rss', '.js', '.css', '.txt', '.json', '.pdf'), $text); |
|
| 2375 | 2375 | } |
| 2376 | 2376 | |
| 2377 | 2377 | /** |
@@ -2403,7 +2403,7 @@ discard block |
||
| 2403 | 2403 | $suff = '/'; |
| 2404 | 2404 | } |
| 2405 | 2405 | |
| 2406 | - $url = ($dir != '' ? $dir . '/' : '') . $pre . $alias . $suff; |
|
| 2406 | + $url = ($dir != '' ? $dir.'/' : '').$pre.$alias.$suff; |
|
| 2407 | 2407 | } |
| 2408 | 2408 | |
| 2409 | 2409 | $evtOut = $this->invokeEvent('OnMakeDocUrl', array( |
@@ -2440,7 +2440,7 @@ discard block |
||
| 2440 | 2440 | preg_match_all('!\[\~([0-9]+)\~\]!ise', $documentSource, $match); |
| 2441 | 2441 | $ids = implode(',', array_unique($match['1'])); |
| 2442 | 2442 | if ($ids) { |
| 2443 | - $res = $this->db->select("id,alias,isfolder,parent,alias_visible", $this->getFullTableName('site_content'), "id IN (" . $ids . ") AND isfolder = '0'"); |
|
| 2443 | + $res = $this->db->select("id,alias,isfolder,parent,alias_visible", $this->getFullTableName('site_content'), "id IN (".$ids.") AND isfolder = '0'"); |
|
| 2444 | 2444 | while ($row = $this->db->getRow($res)) { |
| 2445 | 2445 | if ($this->config['use_alias_path'] == '1' && $row['parent'] != 0) { |
| 2446 | 2446 | $parent = $row['parent']; |
@@ -2451,7 +2451,7 @@ discard block |
||
| 2451 | 2451 | $parent = $this->aliasListing[$parent]['parent']; |
| 2452 | 2452 | } |
| 2453 | 2453 | |
| 2454 | - $aliases[$row['id']] = $path . '/' . $row['alias']; |
|
| 2454 | + $aliases[$row['id']] = $path.'/'.$row['alias']; |
|
| 2455 | 2455 | } else { |
| 2456 | 2456 | $aliases[$row['id']] = $row['alias']; |
| 2457 | 2457 | } |
@@ -2463,7 +2463,7 @@ discard block |
||
| 2463 | 2463 | $isfriendly = ($this->config['friendly_alias_urls'] == 1 ? 1 : 0); |
| 2464 | 2464 | $pref = $this->config['friendly_url_prefix']; |
| 2465 | 2465 | $suff = $this->config['friendly_url_suffix']; |
| 2466 | - $documentSource = preg_replace_callback($in, function ($m) use ($aliases, $isfolder, $isfriendly, $pref, $suff) { |
|
| 2466 | + $documentSource = preg_replace_callback($in, function($m) use ($aliases, $isfolder, $isfriendly, $pref, $suff) { |
|
| 2467 | 2467 | global $modx; |
| 2468 | 2468 | $thealias = $aliases[$m[1]]; |
| 2469 | 2469 | $thefolder = $isfolder[$m[1]]; |
@@ -2479,7 +2479,7 @@ discard block |
||
| 2479 | 2479 | |
| 2480 | 2480 | } else { |
| 2481 | 2481 | $in = '!\[\~([0-9]+)\~\]!is'; |
| 2482 | - $out = "index.php?id=" . '\1'; |
|
| 2482 | + $out = "index.php?id=".'\1'; |
|
| 2483 | 2483 | $documentSource = preg_replace($in, $out, $documentSource); |
| 2484 | 2484 | } |
| 2485 | 2485 | |
@@ -2500,7 +2500,7 @@ discard block |
||
| 2500 | 2500 | $scheme = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 'https' : 'http'; |
| 2501 | 2501 | $len_base_url = strlen($this->config['base_url']); |
| 2502 | 2502 | |
| 2503 | - $url_path = $q;//LANG |
|
| 2503 | + $url_path = $q; //LANG |
|
| 2504 | 2504 | |
| 2505 | 2505 | if (substr($url_path, 0, $len_base_url) === $this->config['base_url']) { |
| 2506 | 2506 | $url_path = substr($url_path, $len_base_url); |
@@ -2512,7 +2512,7 @@ discard block |
||
| 2512 | 2512 | $strictURL = substr($strictURL, $len_base_url); |
| 2513 | 2513 | } |
| 2514 | 2514 | $http_host = $_SERVER['HTTP_HOST']; |
| 2515 | - $requestedURL = "{$scheme}://{$http_host}" . '/' . $q; //LANG |
|
| 2515 | + $requestedURL = "{$scheme}://{$http_host}".'/'.$q; //LANG |
|
| 2516 | 2516 | |
| 2517 | 2517 | $site_url = $this->config['site_url']; |
| 2518 | 2518 | $url_query_string = explode('?', $_SERVER['REQUEST_URI']); |
@@ -2530,7 +2530,7 @@ discard block |
||
| 2530 | 2530 | } |
| 2531 | 2531 | if ($this->config['base_url'] != $_SERVER['REQUEST_URI']) { |
| 2532 | 2532 | if (empty($_POST)) { |
| 2533 | - if (($this->config['base_url'] . '?' . $qstring) != $_SERVER['REQUEST_URI']) { |
|
| 2533 | + if (($this->config['base_url'].'?'.$qstring) != $_SERVER['REQUEST_URI']) { |
|
| 2534 | 2534 | $this->sendRedirect($url, 0, 'REDIRECT_HEADER', 'HTTP/1.0 301 Moved Permanently'); |
| 2535 | 2535 | exit(0); |
| 2536 | 2536 | } |
@@ -2589,7 +2589,7 @@ discard block |
||
| 2589 | 2589 | $docgrp = implode(",", $docgrp); |
| 2590 | 2590 | } |
| 2591 | 2591 | // get document |
| 2592 | - $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='" . $_SESSION['mgrRole'] . "' OR sc.privatemgr=0") . (!$docgrp ? "" : " OR dg.document_group IN ($docgrp)"); |
|
| 2592 | + $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='".$_SESSION['mgrRole']."' OR sc.privatemgr=0").(!$docgrp ? "" : " OR dg.document_group IN ($docgrp)"); |
|
| 2593 | 2593 | $rs = $this->db->select('sc.*', "{$tblsc} sc |
| 2594 | 2594 | LEFT JOIN {$tbldg} dg ON dg.document = sc.id", "sc.{$method} = '{$identifier}' AND ({$access})", "", 1); |
| 2595 | 2595 | if ($this->db->getRecordCount($rs) < 1) { |
@@ -2625,9 +2625,9 @@ discard block |
||
| 2625 | 2625 | } |
| 2626 | 2626 | if ($documentObject['template']) { |
| 2627 | 2627 | // load TVs and merge with document - Orig by Apodigm - Docvars |
| 2628 | - $rs = $this->db->select("tv.*, IF(tvc.value!='',tvc.value,tv.default_text) as value", $this->getFullTableName("site_tmplvars") . " tv |
|
| 2629 | - INNER JOIN " . $this->getFullTableName("site_tmplvar_templates") . " tvtpl ON tvtpl.tmplvarid = tv.id |
|
| 2630 | - LEFT JOIN " . $this->getFullTableName("site_tmplvar_contentvalues") . " tvc ON tvc.tmplvarid=tv.id AND tvc.contentid = '{$documentObject['id']}'", "tvtpl.templateid = '{$documentObject['template']}'"); |
|
| 2628 | + $rs = $this->db->select("tv.*, IF(tvc.value!='',tvc.value,tv.default_text) as value", $this->getFullTableName("site_tmplvars")." tv |
|
| 2629 | + INNER JOIN " . $this->getFullTableName("site_tmplvar_templates")." tvtpl ON tvtpl.tmplvarid = tv.id |
|
| 2630 | + LEFT JOIN " . $this->getFullTableName("site_tmplvar_contentvalues")." tvc ON tvc.tmplvarid=tv.id AND tvc.contentid = '{$documentObject['id']}'", "tvtpl.templateid = '{$documentObject['template']}'"); |
|
| 2631 | 2631 | $tmplvars = array(); |
| 2632 | 2632 | while ($row = $this->db->getRow($rs)) { |
| 2633 | 2633 | $tmplvars[$row['name']] = array( |
@@ -2673,7 +2673,7 @@ discard block |
||
| 2673 | 2673 | $st = md5($source); |
| 2674 | 2674 | } |
| 2675 | 2675 | if ($this->dumpSnippets == 1) { |
| 2676 | - $this->snippetsCode .= "<fieldset><legend><b style='color: #821517;'>PARSE PASS " . ($i + 1) . "</b></legend><p>The following snippets (if any) were parsed during this pass.</p>"; |
|
| 2676 | + $this->snippetsCode .= "<fieldset><legend><b style='color: #821517;'>PARSE PASS ".($i + 1)."</b></legend><p>The following snippets (if any) were parsed during this pass.</p>"; |
|
| 2677 | 2677 | } |
| 2678 | 2678 | |
| 2679 | 2679 | // invoke OnParseDocument event |
@@ -2715,7 +2715,7 @@ discard block |
||
| 2715 | 2715 | */ |
| 2716 | 2716 | public function executeParser() |
| 2717 | 2717 | { |
| 2718 | - if(MODX_CLI) { |
|
| 2718 | + if (MODX_CLI) { |
|
| 2719 | 2719 | throw new RuntimeException('Call DocumentParser::executeParser on CLI mode'); |
| 2720 | 2720 | } |
| 2721 | 2721 | |
@@ -2761,7 +2761,7 @@ discard block |
||
| 2761 | 2761 | |
| 2762 | 2762 | // Check use_alias_path and check if $this->virtualDir is set to anything, then parse the path |
| 2763 | 2763 | if ($this->config['use_alias_path'] == 1) { |
| 2764 | - $alias = (strlen($this->virtualDir) > 0 ? $this->virtualDir . '/' : '') . $this->documentIdentifier; |
|
| 2764 | + $alias = (strlen($this->virtualDir) > 0 ? $this->virtualDir.'/' : '').$this->documentIdentifier; |
|
| 2765 | 2765 | if (isset($this->documentListing[$alias])) { |
| 2766 | 2766 | $this->documentIdentifier = $this->documentListing[$alias]; |
| 2767 | 2767 | } else { |
@@ -2822,7 +2822,7 @@ discard block |
||
| 2822 | 2822 | } else { |
| 2823 | 2823 | $docAlias = $this->db->escape($this->documentIdentifier); |
| 2824 | 2824 | $rs = $this->db->select('id', $this->getFullTableName('site_content'), "deleted=0 and alias='{$docAlias}'"); |
| 2825 | - $this->documentIdentifier = (int)$this->db->getValue($rs); |
|
| 2825 | + $this->documentIdentifier = (int) $this->db->getValue($rs); |
|
| 2826 | 2826 | } |
| 2827 | 2827 | } |
| 2828 | 2828 | $this->documentMethod = 'id'; |
@@ -2879,7 +2879,7 @@ discard block |
||
| 2879 | 2879 | $_REQUEST[$n] = $_GET[$n] = $v; |
| 2880 | 2880 | } |
| 2881 | 2881 | } |
| 2882 | - $_SERVER['PHP_SELF'] = $this->config['base_url'] . $qp['path']; |
|
| 2882 | + $_SERVER['PHP_SELF'] = $this->config['base_url'].$qp['path']; |
|
| 2883 | 2883 | $this->q = $qp['path']; |
| 2884 | 2884 | return $qp['path']; |
| 2885 | 2885 | } |
@@ -2973,7 +2973,7 @@ discard block |
||
| 2973 | 2973 | $this->sendErrorPage(); |
| 2974 | 2974 | } else { |
| 2975 | 2975 | // Inculde the necessary files to check document permissions |
| 2976 | - include_once(MODX_MANAGER_PATH . 'processors/user_documents_permissions.class.php'); |
|
| 2976 | + include_once(MODX_MANAGER_PATH.'processors/user_documents_permissions.class.php'); |
|
| 2977 | 2977 | $udperms = new udperms(); |
| 2978 | 2978 | $udperms->user = $this->getLoginUserID(); |
| 2979 | 2979 | $udperms->document = $this->documentIdentifier; |
@@ -3027,7 +3027,7 @@ discard block |
||
| 3027 | 3027 | while ($id && $height--) { |
| 3028 | 3028 | $thisid = $id; |
| 3029 | 3029 | if ($this->config['aliaslistingfolder'] == 1) { |
| 3030 | - $id = isset($this->aliasListing[$id]['parent']) ? $this->aliasListing[$id]['parent'] : $this->db->getValue("SELECT `parent` FROM " . $this->getFullTableName("site_content") . " WHERE `id` = '{$id}' LIMIT 0,1"); |
|
| 3030 | + $id = isset($this->aliasListing[$id]['parent']) ? $this->aliasListing[$id]['parent'] : $this->db->getValue("SELECT `parent` FROM ".$this->getFullTableName("site_content")." WHERE `id` = '{$id}' LIMIT 0,1"); |
|
| 3031 | 3031 | if (!$id || $id == '0') { |
| 3032 | 3032 | break; |
| 3033 | 3033 | } |
@@ -3078,15 +3078,15 @@ discard block |
||
| 3078 | 3078 | |
| 3079 | 3079 | if ($this->config['aliaslistingfolder'] == 1) { |
| 3080 | 3080 | |
| 3081 | - $res = $this->db->select("id,alias,isfolder,parent", $this->getFullTableName('site_content'), "parent IN (" . $id . ") AND deleted = '0'"); |
|
| 3081 | + $res = $this->db->select("id,alias,isfolder,parent", $this->getFullTableName('site_content'), "parent IN (".$id.") AND deleted = '0'"); |
|
| 3082 | 3082 | $idx = array(); |
| 3083 | 3083 | while ($row = $this->db->getRow($res)) { |
| 3084 | 3084 | $pAlias = ''; |
| 3085 | 3085 | if (isset($this->aliasListing[$row['parent']])) { |
| 3086 | - $pAlias .= !empty($this->aliasListing[$row['parent']]['path']) ? $this->aliasListing[$row['parent']]['path'] . '/' : ''; |
|
| 3087 | - $pAlias .= !empty($this->aliasListing[$row['parent']]['alias']) ? $this->aliasListing[$row['parent']]['alias'] . '/' : ''; |
|
| 3086 | + $pAlias .= !empty($this->aliasListing[$row['parent']]['path']) ? $this->aliasListing[$row['parent']]['path'].'/' : ''; |
|
| 3087 | + $pAlias .= !empty($this->aliasListing[$row['parent']]['alias']) ? $this->aliasListing[$row['parent']]['alias'].'/' : ''; |
|
| 3088 | 3088 | }; |
| 3089 | - $children[$pAlias . $row['alias']] = $row['id']; |
|
| 3089 | + $children[$pAlias.$row['alias']] = $row['id']; |
|
| 3090 | 3090 | if ($row['isfolder'] == 1) { |
| 3091 | 3091 | $idx[] = $row['id']; |
| 3092 | 3092 | } |
@@ -3118,7 +3118,7 @@ discard block |
||
| 3118 | 3118 | $depth--; |
| 3119 | 3119 | |
| 3120 | 3120 | foreach ($documentMap_cache[$id] as $childId) { |
| 3121 | - $pkey = (strlen($this->aliasListing[$childId]['path']) ? "{$this->aliasListing[$childId]['path']}/" : '') . $this->aliasListing[$childId]['alias']; |
|
| 3121 | + $pkey = (strlen($this->aliasListing[$childId]['path']) ? "{$this->aliasListing[$childId]['path']}/" : '').$this->aliasListing[$childId]['alias']; |
|
| 3122 | 3122 | if (!strlen($pkey)) { |
| 3123 | 3123 | $pkey = "{$childId}"; |
| 3124 | 3124 | } |
@@ -3147,7 +3147,7 @@ discard block |
||
| 3147 | 3147 | if (substr(strtolower($url), 0, 11) == "javascript:") { |
| 3148 | 3148 | $fnc = substr($url, 11); |
| 3149 | 3149 | } elseif ($url) { |
| 3150 | - $fnc = "window.location.href='" . addslashes($url) . "';"; |
|
| 3150 | + $fnc = "window.location.href='".addslashes($url)."';"; |
|
| 3151 | 3151 | } else { |
| 3152 | 3152 | $fnc = "history.back(-1);"; |
| 3153 | 3153 | } |
@@ -3156,7 +3156,7 @@ discard block |
||
| 3156 | 3156 | <meta http-equiv=\"Content-Type\" content=\"text/html; charset={$modx_manager_charset};\"> |
| 3157 | 3157 | <script> |
| 3158 | 3158 | function __alertQuit() { |
| 3159 | - alert('" . addslashes($msg) . "'); |
|
| 3159 | + alert('".addslashes($msg)."'); |
|
| 3160 | 3160 | {$fnc} |
| 3161 | 3161 | } |
| 3162 | 3162 | window.setTimeout('__alertQuit();',100); |
@@ -3178,9 +3178,9 @@ discard block |
||
| 3178 | 3178 | $state = 0; |
| 3179 | 3179 | $pms = $_SESSION['mgrPermissions']; |
| 3180 | 3180 | if ($pms) { |
| 3181 | - $state = ((bool)$pms[$pm] === true); |
|
| 3181 | + $state = ((bool) $pms[$pm] === true); |
|
| 3182 | 3182 | } |
| 3183 | - return (int)$state; |
|
| 3183 | + return (int) $state; |
|
| 3184 | 3184 | } |
| 3185 | 3185 | |
| 3186 | 3186 | /** |
@@ -3193,8 +3193,8 @@ discard block |
||
| 3193 | 3193 | */ |
| 3194 | 3194 | public function elementIsLocked($type, $id, $includeThisUser = false) |
| 3195 | 3195 | { |
| 3196 | - $id = (int)$id; |
|
| 3197 | - $type = (int)$type; |
|
| 3196 | + $id = (int) $id; |
|
| 3197 | + $type = (int) $type; |
|
| 3198 | 3198 | if (!$type || !$id) { |
| 3199 | 3199 | return null; |
| 3200 | 3200 | } |
@@ -3244,7 +3244,7 @@ discard block |
||
| 3244 | 3244 | return $lockedElements; |
| 3245 | 3245 | } |
| 3246 | 3246 | |
| 3247 | - $type = (int)$type; |
|
| 3247 | + $type = (int) $type; |
|
| 3248 | 3248 | if (isset($lockedElements[$type])) { |
| 3249 | 3249 | return $lockedElements[$type]; |
| 3250 | 3250 | } else { |
@@ -3261,7 +3261,7 @@ discard block |
||
| 3261 | 3261 | $this->lockedElements = array(); |
| 3262 | 3262 | $this->cleanupExpiredLocks(); |
| 3263 | 3263 | |
| 3264 | - $rs = $this->db->select('sid,internalKey,elementType,elementId,lasthit,username', $this->getFullTableName('active_user_locks') . " ul |
|
| 3264 | + $rs = $this->db->select('sid,internalKey,elementType,elementId,lasthit,username', $this->getFullTableName('active_user_locks')." ul |
|
| 3265 | 3265 | LEFT JOIN {$this->getFullTableName('manager_users')} mu on ul.internalKey = mu.id"); |
| 3266 | 3266 | while ($row = $this->db->getRow($rs)) { |
| 3267 | 3267 | $this->lockedElements[$row['elementType']][$row['elementId']] = array( |
@@ -3284,7 +3284,7 @@ discard block |
||
| 3284 | 3284 | public function cleanupExpiredLocks() |
| 3285 | 3285 | { |
| 3286 | 3286 | // Clean-up active_user_sessions first |
| 3287 | - $timeout = (int)$this->config['session_timeout'] < 2 ? 120 : $this->config['session_timeout'] * 60; // session.js pings every 10min, updateMail() in mainMenu pings every minute, so 2min is minimum |
|
| 3287 | + $timeout = (int) $this->config['session_timeout'] < 2 ? 120 : $this->config['session_timeout'] * 60; // session.js pings every 10min, updateMail() in mainMenu pings every minute, so 2min is minimum |
|
| 3288 | 3288 | $validSessionTimeLimit = $this->time - $timeout; |
| 3289 | 3289 | $this->db->delete($this->getFullTableName('active_user_sessions'), "lasthit < {$validSessionTimeLimit}"); |
| 3290 | 3290 | |
@@ -3297,7 +3297,7 @@ discard block |
||
| 3297 | 3297 | foreach ($rs as $row) { |
| 3298 | 3298 | $userSids[] = $row['sid']; |
| 3299 | 3299 | } |
| 3300 | - $userSids = "'" . implode("','", $userSids) . "'"; |
|
| 3300 | + $userSids = "'".implode("','", $userSids)."'"; |
|
| 3301 | 3301 | $this->db->delete($this->getFullTableName('active_user_locks'), "sid NOT IN({$userSids})"); |
| 3302 | 3302 | } else { |
| 3303 | 3303 | $this->db->delete($this->getFullTableName('active_user_locks')); |
@@ -3381,8 +3381,8 @@ discard block |
||
| 3381 | 3381 | public function lockElement($type, $id) |
| 3382 | 3382 | { |
| 3383 | 3383 | $userId = $this->isBackend() && $_SESSION['mgrInternalKey'] ? $_SESSION['mgrInternalKey'] : 0; |
| 3384 | - $type = (int)$type; |
|
| 3385 | - $id = (int)$id; |
|
| 3384 | + $type = (int) $type; |
|
| 3385 | + $id = (int) $id; |
|
| 3386 | 3386 | if (!$type || !$id || !$userId) { |
| 3387 | 3387 | return false; |
| 3388 | 3388 | } |
@@ -3403,8 +3403,8 @@ discard block |
||
| 3403 | 3403 | public function unlockElement($type, $id, $includeAllUsers = false) |
| 3404 | 3404 | { |
| 3405 | 3405 | $userId = $this->isBackend() && $_SESSION['mgrInternalKey'] ? $_SESSION['mgrInternalKey'] : 0; |
| 3406 | - $type = (int)$type; |
|
| 3407 | - $id = (int)$id; |
|
| 3406 | + $type = (int) $type; |
|
| 3407 | + $id = (int) $id; |
|
| 3408 | 3408 | if (!$type || !$id) { |
| 3409 | 3409 | return false; |
| 3410 | 3410 | } |
@@ -3471,8 +3471,8 @@ discard block |
||
| 3471 | 3471 | } |
| 3472 | 3472 | |
| 3473 | 3473 | $usertype = $this->isFrontend() ? 1 : 0; |
| 3474 | - $evtid = (int)$evtid; |
|
| 3475 | - $type = (int)$type; |
|
| 3474 | + $evtid = (int) $evtid; |
|
| 3475 | + $type = (int) $type; |
|
| 3476 | 3476 | |
| 3477 | 3477 | // Types: 1 = information, 2 = warning, 3 = error |
| 3478 | 3478 | if ($type < 1) { |
@@ -3494,8 +3494,8 @@ discard block |
||
| 3494 | 3494 | if (isset($this->config['send_errormail']) && $this->config['send_errormail'] !== '0') { |
| 3495 | 3495 | if ($this->config['send_errormail'] <= $type) { |
| 3496 | 3496 | $this->sendmail(array( |
| 3497 | - 'subject' => 'MODX System Error on ' . $this->config['site_name'], |
|
| 3498 | - 'body' => 'Source: ' . $source . ' - The details of the error could be seen in the MODX system events log.', |
|
| 3497 | + 'subject' => 'MODX System Error on '.$this->config['site_name'], |
|
| 3498 | + 'body' => 'Source: '.$source.' - The details of the error could be seen in the MODX system events log.', |
|
| 3499 | 3499 | 'type' => 'text' |
| 3500 | 3500 | )); |
| 3501 | 3501 | } |
@@ -3543,7 +3543,7 @@ discard block |
||
| 3543 | 3543 | $p['fromname'] = $userinfo['username']; |
| 3544 | 3544 | } |
| 3545 | 3545 | if ($msg === '' && !isset($p['body'])) { |
| 3546 | - $p['body'] = $_SERVER['REQUEST_URI'] . "\n" . $_SERVER['HTTP_USER_AGENT'] . "\n" . $_SERVER['HTTP_REFERER']; |
|
| 3546 | + $p['body'] = $_SERVER['REQUEST_URI']."\n".$_SERVER['HTTP_USER_AGENT']."\n".$_SERVER['HTTP_REFERER']; |
|
| 3547 | 3547 | } elseif (is_string($msg) && 0 < strlen($msg)) { |
| 3548 | 3548 | $p['body'] = $msg; |
| 3549 | 3549 | } |
@@ -3583,8 +3583,8 @@ discard block |
||
| 3583 | 3583 | $files = array(); |
| 3584 | 3584 | } |
| 3585 | 3585 | foreach ($files as $f) { |
| 3586 | - if (file_exists(MODX_BASE_PATH . $f) && is_file(MODX_BASE_PATH . $f) && is_readable(MODX_BASE_PATH . $f)) { |
|
| 3587 | - $this->mail->AddAttachment(MODX_BASE_PATH . $f); |
|
| 3586 | + if (file_exists(MODX_BASE_PATH.$f) && is_file(MODX_BASE_PATH.$f) && is_readable(MODX_BASE_PATH.$f)) { |
|
| 3587 | + $this->mail->AddAttachment(MODX_BASE_PATH.$f); |
|
| 3588 | 3588 | } |
| 3589 | 3589 | } |
| 3590 | 3590 | $rs = $this->mail->send(); |
@@ -3629,7 +3629,7 @@ discard block |
||
| 3629 | 3629 | */ |
| 3630 | 3630 | public function isFrontend() |
| 3631 | 3631 | { |
| 3632 | - return ! $this->isBackend(); |
|
| 3632 | + return !$this->isBackend(); |
|
| 3633 | 3633 | } |
| 3634 | 3634 | |
| 3635 | 3635 | /** |
@@ -3654,14 +3654,14 @@ discard block |
||
| 3654 | 3654 | $tblsc = $this->getFullTableName("site_content"); |
| 3655 | 3655 | $tbldg = $this->getFullTableName("document_groups"); |
| 3656 | 3656 | // modify field names to use sc. table reference |
| 3657 | - $fields = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $fields)))); |
|
| 3658 | - $sort = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $sort)))); |
|
| 3657 | + $fields = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $fields)))); |
|
| 3658 | + $sort = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $sort)))); |
|
| 3659 | 3659 | // get document groups for current user |
| 3660 | 3660 | if ($docgrp = $this->getUserDocGroups()) { |
| 3661 | 3661 | $docgrp = implode(",", $docgrp); |
| 3662 | 3662 | } |
| 3663 | 3663 | // build query |
| 3664 | - $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='" . $_SESSION['mgrRole'] . "' OR sc.privatemgr=0") . (!$docgrp ? "" : " OR dg.document_group IN ($docgrp)"); |
|
| 3664 | + $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='".$_SESSION['mgrRole']."' OR sc.privatemgr=0").(!$docgrp ? "" : " OR dg.document_group IN ($docgrp)"); |
|
| 3665 | 3665 | $result = $this->db->select("DISTINCT {$fields}", "{$tblsc} sc |
| 3666 | 3666 | LEFT JOIN {$tbldg} dg on dg.document = sc.id", "sc.parent = '{$id}' AND ({$access}) GROUP BY sc.id", "{$sort} {$dir}"); |
| 3667 | 3667 | $resourceArray = $this->db->makeArray($result); |
@@ -3691,14 +3691,14 @@ discard block |
||
| 3691 | 3691 | $tbldg = $this->getFullTableName("document_groups"); |
| 3692 | 3692 | |
| 3693 | 3693 | // modify field names to use sc. table reference |
| 3694 | - $fields = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $fields)))); |
|
| 3695 | - $sort = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $sort)))); |
|
| 3694 | + $fields = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $fields)))); |
|
| 3695 | + $sort = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $sort)))); |
|
| 3696 | 3696 | // get document groups for current user |
| 3697 | 3697 | if ($docgrp = $this->getUserDocGroups()) { |
| 3698 | 3698 | $docgrp = implode(",", $docgrp); |
| 3699 | 3699 | } |
| 3700 | 3700 | // build query |
| 3701 | - $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='" . $_SESSION['mgrRole'] . "' OR sc.privatemgr=0") . (!$docgrp ? "" : " OR dg.document_group IN ($docgrp)"); |
|
| 3701 | + $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='".$_SESSION['mgrRole']."' OR sc.privatemgr=0").(!$docgrp ? "" : " OR dg.document_group IN ($docgrp)"); |
|
| 3702 | 3702 | $result = $this->db->select("DISTINCT {$fields}", "{$tblsc} sc |
| 3703 | 3703 | LEFT JOIN {$tbldg} dg on dg.document = sc.id", "sc.parent = '{$id}' AND sc.published=1 AND sc.deleted=0 AND ({$access}) GROUP BY sc.id", "{$sort} {$dir}"); |
| 3704 | 3704 | $resourceArray = $this->db->makeArray($result); |
@@ -3733,16 +3733,16 @@ discard block |
||
| 3733 | 3733 | return $this->tmpCache[__FUNCTION__][$cacheKey]; |
| 3734 | 3734 | } |
| 3735 | 3735 | |
| 3736 | - $published = ($published !== 'all') ? 'AND sc.published = ' . $published : ''; |
|
| 3737 | - $deleted = ($deleted !== 'all') ? 'AND sc.deleted = ' . $deleted : ''; |
|
| 3736 | + $published = ($published !== 'all') ? 'AND sc.published = '.$published : ''; |
|
| 3737 | + $deleted = ($deleted !== 'all') ? 'AND sc.deleted = '.$deleted : ''; |
|
| 3738 | 3738 | |
| 3739 | 3739 | if ($where != '') { |
| 3740 | - $where = 'AND ' . $where; |
|
| 3740 | + $where = 'AND '.$where; |
|
| 3741 | 3741 | } |
| 3742 | 3742 | |
| 3743 | 3743 | // modify field names to use sc. table reference |
| 3744 | - $fields = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $fields)))); |
|
| 3745 | - $sort = ($sort == '') ? '' : 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $sort)))); |
|
| 3744 | + $fields = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $fields)))); |
|
| 3745 | + $sort = ($sort == '') ? '' : 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $sort)))); |
|
| 3746 | 3746 | |
| 3747 | 3747 | // get document groups for current user |
| 3748 | 3748 | if ($docgrp = $this->getUserDocGroups()) { |
@@ -3750,7 +3750,7 @@ discard block |
||
| 3750 | 3750 | } |
| 3751 | 3751 | |
| 3752 | 3752 | // build query |
| 3753 | - $access = ($this->isFrontend() ? 'sc.privateweb=0' : '1="' . $_SESSION['mgrRole'] . '" OR sc.privatemgr=0') . (!$docgrp ? '' : ' OR dg.document_group IN (' . $docgrp . ')'); |
|
| 3753 | + $access = ($this->isFrontend() ? 'sc.privateweb=0' : '1="'.$_SESSION['mgrRole'].'" OR sc.privatemgr=0').(!$docgrp ? '' : ' OR dg.document_group IN ('.$docgrp.')'); |
|
| 3754 | 3754 | |
| 3755 | 3755 | $tblsc = $this->getFullTableName('site_content'); |
| 3756 | 3756 | $tbldg = $this->getFullTableName('document_groups'); |
@@ -3802,10 +3802,10 @@ discard block |
||
| 3802 | 3802 | return false; |
| 3803 | 3803 | } else { |
| 3804 | 3804 | // modify field names to use sc. table reference |
| 3805 | - $fields = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $fields)))); |
|
| 3806 | - $sort = ($sort == '') ? '' : 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $sort)))); |
|
| 3805 | + $fields = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $fields)))); |
|
| 3806 | + $sort = ($sort == '') ? '' : 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $sort)))); |
|
| 3807 | 3807 | if ($where != '') { |
| 3808 | - $where = 'AND ' . $where; |
|
| 3808 | + $where = 'AND '.$where; |
|
| 3809 | 3809 | } |
| 3810 | 3810 | |
| 3811 | 3811 | $published = ($published !== 'all') ? "AND sc.published = '{$published}'" : ''; |
@@ -3816,13 +3816,13 @@ discard block |
||
| 3816 | 3816 | $docgrp = implode(',', $docgrp); |
| 3817 | 3817 | } |
| 3818 | 3818 | |
| 3819 | - $access = ($this->isFrontend() ? 'sc.privateweb=0' : '1="' . $_SESSION['mgrRole'] . '" OR sc.privatemgr=0') . (!$docgrp ? '' : ' OR dg.document_group IN (' . $docgrp . ')'); |
|
| 3819 | + $access = ($this->isFrontend() ? 'sc.privateweb=0' : '1="'.$_SESSION['mgrRole'].'" OR sc.privatemgr=0').(!$docgrp ? '' : ' OR dg.document_group IN ('.$docgrp.')'); |
|
| 3820 | 3820 | |
| 3821 | 3821 | $tblsc = $this->getFullTableName('site_content'); |
| 3822 | 3822 | $tbldg = $this->getFullTableName('document_groups'); |
| 3823 | 3823 | |
| 3824 | 3824 | $result = $this->db->select("DISTINCT {$fields}", "{$tblsc} sc |
| 3825 | - LEFT JOIN {$tbldg} dg on dg.document = sc.id", "(sc.id IN (" . implode(',', $ids) . ") {$published} {$deleted} {$where}) AND ({$access}) GROUP BY sc.id", ($sort ? "{$sort} {$dir}" : ""), $limit); |
|
| 3825 | + LEFT JOIN {$tbldg} dg on dg.document = sc.id", "(sc.id IN (".implode(',', $ids).") {$published} {$deleted} {$where}) AND ({$access}) GROUP BY sc.id", ($sort ? "{$sort} {$dir}" : ""), $limit); |
|
| 3826 | 3826 | |
| 3827 | 3827 | $resourceArray = $this->db->makeArray($result); |
| 3828 | 3828 | |
@@ -3927,12 +3927,12 @@ discard block |
||
| 3927 | 3927 | $tbldg = $this->getFullTableName("document_groups"); |
| 3928 | 3928 | $activeSql = $active == 1 ? "AND sc.published=1 AND sc.deleted=0" : ""; |
| 3929 | 3929 | // modify field names to use sc. table reference |
| 3930 | - $fields = 'sc.' . implode(',sc.', array_filter(array_map('trim', explode(',', $fields)))); |
|
| 3930 | + $fields = 'sc.'.implode(',sc.', array_filter(array_map('trim', explode(',', $fields)))); |
|
| 3931 | 3931 | // get document groups for current user |
| 3932 | 3932 | if ($docgrp = $this->getUserDocGroups()) { |
| 3933 | 3933 | $docgrp = implode(",", $docgrp); |
| 3934 | 3934 | } |
| 3935 | - $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='" . $_SESSION['mgrRole'] . "' OR sc.privatemgr=0") . (!$docgrp ? "" : " OR dg.document_group IN ($docgrp)"); |
|
| 3935 | + $access = ($this->isFrontend() ? "sc.privateweb=0" : "1='".$_SESSION['mgrRole']."' OR sc.privatemgr=0").(!$docgrp ? "" : " OR dg.document_group IN ($docgrp)"); |
|
| 3936 | 3936 | $result = $this->db->select($fields, "{$tblsc} sc LEFT JOIN {$tbldg} dg on dg.document = sc.id", "(sc.id='{$pageid}' {$activeSql}) AND ({$access})", "", 1); |
| 3937 | 3937 | $pageInfo = $this->db->getRow($result); |
| 3938 | 3938 | |
@@ -3979,7 +3979,7 @@ discard block |
||
| 3979 | 3979 | { |
| 3980 | 3980 | if ($this->currentSnippet) { |
| 3981 | 3981 | $tbl = $this->getFullTableName("site_snippets"); |
| 3982 | - $rs = $this->db->select('id', $tbl, "name='" . $this->db->escape($this->currentSnippet) . "'", '', 1); |
|
| 3982 | + $rs = $this->db->select('id', $tbl, "name='".$this->db->escape($this->currentSnippet)."'", '', 1); |
|
| 3983 | 3983 | if ($snippetId = $this->db->getValue($rs)) { |
| 3984 | 3984 | return $snippetId; |
| 3985 | 3985 | } |
@@ -4006,23 +4006,23 @@ discard block |
||
| 4006 | 4006 | */ |
| 4007 | 4007 | public function clearCache($type = '', $report = false) |
| 4008 | 4008 | { |
| 4009 | - $cache_dir = MODX_BASE_PATH . $this->getCacheFolder(); |
|
| 4009 | + $cache_dir = MODX_BASE_PATH.$this->getCacheFolder(); |
|
| 4010 | 4010 | if (is_array($type)) { |
| 4011 | 4011 | foreach ($type as $_) { |
| 4012 | 4012 | $this->clearCache($_, $report); |
| 4013 | 4013 | } |
| 4014 | 4014 | } elseif ($type == 'full') { |
| 4015 | - include_once(MODX_MANAGER_PATH . 'processors/cache_sync.class.processor.php'); |
|
| 4015 | + include_once(MODX_MANAGER_PATH.'processors/cache_sync.class.processor.php'); |
|
| 4016 | 4016 | $sync = new synccache(); |
| 4017 | 4017 | $sync->setCachepath($cache_dir); |
| 4018 | 4018 | $sync->setReport($report); |
| 4019 | 4019 | $sync->emptyCache(); |
| 4020 | 4020 | } elseif (preg_match('@^[1-9][0-9]*$@', $type)) { |
| 4021 | 4021 | $key = ($this->config['cache_type'] == 2) ? $this->makePageCacheKey($type) : $type; |
| 4022 | - $file_name = "docid_" . $key . "_*.pageCache.php"; |
|
| 4023 | - $cache_path = $cache_dir . $file_name; |
|
| 4022 | + $file_name = "docid_".$key."_*.pageCache.php"; |
|
| 4023 | + $cache_path = $cache_dir.$file_name; |
|
| 4024 | 4024 | $files = glob($cache_path); |
| 4025 | - $files[] = $cache_dir . "docid_" . $key . ".pageCache.php"; |
|
| 4025 | + $files[] = $cache_dir."docid_".$key.".pageCache.php"; |
|
| 4026 | 4026 | foreach ($files as $file) { |
| 4027 | 4027 | if (!is_file($file)) { |
| 4028 | 4028 | continue; |
@@ -4030,7 +4030,7 @@ discard block |
||
| 4030 | 4030 | unlink($file); |
| 4031 | 4031 | } |
| 4032 | 4032 | } else { |
| 4033 | - $files = glob($cache_dir . '*'); |
|
| 4033 | + $files = glob($cache_dir.'*'); |
|
| 4034 | 4034 | foreach ($files as $file) { |
| 4035 | 4035 | $name = basename($file); |
| 4036 | 4036 | if (strpos($name, '.pageCache.php') === false) { |
@@ -4099,7 +4099,7 @@ discard block |
||
| 4099 | 4099 | $f_url_suffix = '/'; |
| 4100 | 4100 | } |
| 4101 | 4101 | |
| 4102 | - $alPath = !empty ($al['path']) ? $al['path'] . '/' : ''; |
|
| 4102 | + $alPath = !empty ($al['path']) ? $al['path'].'/' : ''; |
|
| 4103 | 4103 | |
| 4104 | 4104 | if ($al && $al['alias']) { |
| 4105 | 4105 | $alias = $al['alias']; |
@@ -4107,7 +4107,7 @@ discard block |
||
| 4107 | 4107 | |
| 4108 | 4108 | } |
| 4109 | 4109 | |
| 4110 | - $alias = $alPath . $f_url_prefix . $alias . $f_url_suffix; |
|
| 4110 | + $alias = $alPath.$f_url_prefix.$alias.$f_url_suffix; |
|
| 4111 | 4111 | $url = "{$alias}{$args}"; |
| 4112 | 4112 | } else { |
| 4113 | 4113 | $url = "index.php?id={$id}{$args}"; |
@@ -4126,7 +4126,7 @@ discard block |
||
| 4126 | 4126 | } |
| 4127 | 4127 | |
| 4128 | 4128 | //TODO: check to make sure that $site_url incudes the url :port (e.g. :8080) |
| 4129 | - $host = $scheme == 'full' ? $this->config['site_url'] : $scheme . '://' . $_SERVER['HTTP_HOST'] . $host; |
|
| 4129 | + $host = $scheme == 'full' ? $this->config['site_url'] : $scheme.'://'.$_SERVER['HTTP_HOST'].$host; |
|
| 4130 | 4130 | } |
| 4131 | 4131 | |
| 4132 | 4132 | //fix strictUrl by Bumkaka |
@@ -4135,9 +4135,9 @@ discard block |
||
| 4135 | 4135 | } |
| 4136 | 4136 | |
| 4137 | 4137 | if ($this->config['xhtml_urls']) { |
| 4138 | - $url = preg_replace("/&(?!amp;)/", "&", $host . $virtualDir . $url); |
|
| 4138 | + $url = preg_replace("/&(?!amp;)/", "&", $host.$virtualDir.$url); |
|
| 4139 | 4139 | } else { |
| 4140 | - $url = $host . $virtualDir . $url; |
|
| 4140 | + $url = $host.$virtualDir.$url; |
|
| 4141 | 4141 | } |
| 4142 | 4142 | |
| 4143 | 4143 | $evtOut = $this->invokeEvent('OnMakeDocUrl', array( |
@@ -4161,21 +4161,21 @@ discard block |
||
| 4161 | 4161 | if (isset($this->aliasListing[$id])) { |
| 4162 | 4162 | $out = $this->aliasListing[$id]; |
| 4163 | 4163 | } else { |
| 4164 | - $q = $this->db->query("SELECT id,alias,isfolder,parent FROM " . $this->getFullTableName("site_content") . " WHERE id=" . (int)$id); |
|
| 4164 | + $q = $this->db->query("SELECT id,alias,isfolder,parent FROM ".$this->getFullTableName("site_content")." WHERE id=".(int) $id); |
|
| 4165 | 4165 | if ($this->db->getRecordCount($q) == '1') { |
| 4166 | 4166 | $q = $this->db->getRow($q); |
| 4167 | 4167 | $this->aliasListing[$id] = array( |
| 4168 | - 'id' => (int)$q['id'], |
|
| 4168 | + 'id' => (int) $q['id'], |
|
| 4169 | 4169 | 'alias' => $q['alias'] == '' ? $q['id'] : $q['alias'], |
| 4170 | - 'parent' => (int)$q['parent'], |
|
| 4171 | - 'isfolder' => (int)$q['isfolder'], |
|
| 4170 | + 'parent' => (int) $q['parent'], |
|
| 4171 | + 'isfolder' => (int) $q['isfolder'], |
|
| 4172 | 4172 | ); |
| 4173 | 4173 | if ($this->aliasListing[$id]['parent'] > 0) { |
| 4174 | 4174 | //fix alias_path_usage |
| 4175 | 4175 | if ($this->config['use_alias_path'] == '1') { |
| 4176 | 4176 | //&& $tmp['path'] != '' - fix error slash with epty path |
| 4177 | 4177 | $tmp = $this->getAliasListing($this->aliasListing[$id]['parent']); |
| 4178 | - $this->aliasListing[$id]['path'] = $tmp['path'] . ($tmp['alias_visible'] ? (($tmp['parent'] > 0 && $tmp['path'] != '') ? '/' : '') . $tmp['alias'] : ''); |
|
| 4178 | + $this->aliasListing[$id]['path'] = $tmp['path'].($tmp['alias_visible'] ? (($tmp['parent'] > 0 && $tmp['path'] != '') ? '/' : '').$tmp['alias'] : ''); |
|
| 4179 | 4179 | } else { |
| 4180 | 4180 | $this->aliasListing[$id]['path'] = ''; |
| 4181 | 4181 | } |
@@ -4216,7 +4216,7 @@ discard block |
||
| 4216 | 4216 | $out = array(); |
| 4217 | 4217 | if (empty($this->version) || !is_array($this->version)) { |
| 4218 | 4218 | //include for compatibility modx version < 1.0.10 |
| 4219 | - include MODX_MANAGER_PATH . "includes/version.inc.php"; |
|
| 4219 | + include MODX_MANAGER_PATH."includes/version.inc.php"; |
|
| 4220 | 4220 | $this->version = array(); |
| 4221 | 4221 | $this->version['version'] = isset($modx_version) ? $modx_version : ''; |
| 4222 | 4222 | $this->version['branch'] = isset($modx_branch) ? $modx_branch : ''; |
@@ -4238,18 +4238,18 @@ discard block |
||
| 4238 | 4238 | { |
| 4239 | 4239 | if (isset ($this->snippetCache[$snippetName])) { |
| 4240 | 4240 | $snippet = $this->snippetCache[$snippetName]; |
| 4241 | - $properties = !empty($this->snippetCache[$snippetName . "Props"]) ? $this->snippetCache[$snippetName . "Props"] : ''; |
|
| 4241 | + $properties = !empty($this->snippetCache[$snippetName."Props"]) ? $this->snippetCache[$snippetName."Props"] : ''; |
|
| 4242 | 4242 | } else { // not in cache so let's check the db |
| 4243 | - $sql = "SELECT ss.`name`, ss.`snippet`, ss.`properties`, sm.properties as `sharedproperties` FROM " . $this->getFullTableName("site_snippets") . " as ss LEFT JOIN " . $this->getFullTableName('site_modules') . " as sm on sm.guid=ss.moduleguid WHERE ss.`name`='" . $this->db->escape($snippetName) . "' AND ss.disabled=0;"; |
|
| 4243 | + $sql = "SELECT ss.`name`, ss.`snippet`, ss.`properties`, sm.properties as `sharedproperties` FROM ".$this->getFullTableName("site_snippets")." as ss LEFT JOIN ".$this->getFullTableName('site_modules')." as sm on sm.guid=ss.moduleguid WHERE ss.`name`='".$this->db->escape($snippetName)."' AND ss.disabled=0;"; |
|
| 4244 | 4244 | $result = $this->db->query($sql); |
| 4245 | 4245 | if ($this->db->getRecordCount($result) == 1) { |
| 4246 | 4246 | $row = $this->db->getRow($result); |
| 4247 | 4247 | $snippet = $this->snippetCache[$snippetName] = $row['snippet']; |
| 4248 | 4248 | $mergedProperties = array_merge($this->parseProperties($row['properties']), $this->parseProperties($row['sharedproperties'])); |
| 4249 | - $properties = $this->snippetCache[$snippetName . "Props"] = json_encode($mergedProperties); |
|
| 4249 | + $properties = $this->snippetCache[$snippetName."Props"] = json_encode($mergedProperties); |
|
| 4250 | 4250 | } else { |
| 4251 | 4251 | $snippet = $this->snippetCache[$snippetName] = "return false;"; |
| 4252 | - $properties = $this->snippetCache[$snippetName . "Props"] = ''; |
|
| 4252 | + $properties = $this->snippetCache[$snippetName."Props"] = ''; |
|
| 4253 | 4253 | } |
| 4254 | 4254 | } |
| 4255 | 4255 | // load default params/properties |
@@ -4349,8 +4349,8 @@ discard block |
||
| 4349 | 4349 | } |
| 4350 | 4350 | if (strpos($tpl, $s) !== false) { |
| 4351 | 4351 | $tpl = str_replace($s, $value, $tpl); |
| 4352 | - } elseif($this->debug) { |
|
| 4353 | - $this->addLog('parseText parse error', $_SERVER['REQUEST_URI'] . $s, 2); |
|
| 4352 | + } elseif ($this->debug) { |
|
| 4353 | + $this->addLog('parseText parse error', $_SERVER['REQUEST_URI'].$s, 2); |
|
| 4354 | 4354 | } |
| 4355 | 4355 | } |
| 4356 | 4356 | |
@@ -4399,7 +4399,7 @@ discard block |
||
| 4399 | 4399 | case 'CODE': |
| 4400 | 4400 | break; |
| 4401 | 4401 | case 'FILE': |
| 4402 | - $template = file_get_contents(MODX_BASE_PATH . $template); |
|
| 4402 | + $template = file_get_contents(MODX_BASE_PATH.$template); |
|
| 4403 | 4403 | break; |
| 4404 | 4404 | case 'CHUNK': |
| 4405 | 4405 | $template = $this->getChunk($template); |
@@ -4432,7 +4432,7 @@ discard block |
||
| 4432 | 4432 | if ($mode !== 'formatOnly' && empty($timestamp)) { |
| 4433 | 4433 | return '-'; |
| 4434 | 4434 | } |
| 4435 | - $timestamp = (int)$timestamp; |
|
| 4435 | + $timestamp = (int) $timestamp; |
|
| 4436 | 4436 | |
| 4437 | 4437 | switch ($this->config['datetime_format']) { |
| 4438 | 4438 | case 'YYYY/mm/dd': |
@@ -4452,7 +4452,7 @@ discard block |
||
| 4452 | 4452 | } |
| 4453 | 4453 | |
| 4454 | 4454 | if (empty($mode)) { |
| 4455 | - $strTime = strftime($dateFormat . " %H:%M:%S", $timestamp); |
|
| 4455 | + $strTime = strftime($dateFormat." %H:%M:%S", $timestamp); |
|
| 4456 | 4456 | } elseif ($mode == 'dateOnly') { |
| 4457 | 4457 | $strTime = strftime($dateFormat, $timestamp); |
| 4458 | 4458 | } elseif ($mode == 'formatOnly') { |
@@ -4506,7 +4506,7 @@ discard block |
||
| 4506 | 4506 | $S = 0; |
| 4507 | 4507 | } |
| 4508 | 4508 | $timeStamp = mktime($H, $M, $S, $m, $d, $Y); |
| 4509 | - $timeStamp = (int)$timeStamp; |
|
| 4509 | + $timeStamp = (int) $timeStamp; |
|
| 4510 | 4510 | return $timeStamp; |
| 4511 | 4511 | } |
| 4512 | 4512 | |
@@ -4548,7 +4548,7 @@ discard block |
||
| 4548 | 4548 | if ($v === 'value') { |
| 4549 | 4549 | unset($_[$i]); |
| 4550 | 4550 | } else { |
| 4551 | - $_[$i] = 'tv.' . $v; |
|
| 4551 | + $_[$i] = 'tv.'.$v; |
|
| 4552 | 4552 | } |
| 4553 | 4553 | } |
| 4554 | 4554 | $fields = implode(',', $_); |
@@ -4557,12 +4557,12 @@ discard block |
||
| 4557 | 4557 | } |
| 4558 | 4558 | |
| 4559 | 4559 | if ($tvsort != '') { |
| 4560 | - $tvsort = 'tv.' . implode(',tv.', array_filter(array_map('trim', explode(',', $tvsort)))); |
|
| 4560 | + $tvsort = 'tv.'.implode(',tv.', array_filter(array_map('trim', explode(',', $tvsort)))); |
|
| 4561 | 4561 | } |
| 4562 | 4562 | if ($tvidnames == "*") { |
| 4563 | 4563 | $query = "tv.id<>0"; |
| 4564 | 4564 | } else { |
| 4565 | - $query = (is_numeric($tvidnames[0]) ? "tv.id" : "tv.name") . " IN ('" . implode("','", $tvidnames) . "')"; |
|
| 4565 | + $query = (is_numeric($tvidnames[0]) ? "tv.id" : "tv.name")." IN ('".implode("','", $tvidnames)."')"; |
|
| 4566 | 4566 | } |
| 4567 | 4567 | |
| 4568 | 4568 | $this->getUserDocGroups(); |
@@ -4706,7 +4706,7 @@ discard block |
||
| 4706 | 4706 | return $this->tmpCache[__FUNCTION__][$cacheKey]; |
| 4707 | 4707 | } |
| 4708 | 4708 | |
| 4709 | - if (($idnames != '*' && !is_array($idnames)) || empty($idnames) ) { |
|
| 4709 | + if (($idnames != '*' && !is_array($idnames)) || empty($idnames)) { |
|
| 4710 | 4710 | return false; |
| 4711 | 4711 | } else { |
| 4712 | 4712 | |
@@ -4724,23 +4724,23 @@ discard block |
||
| 4724 | 4724 | } |
| 4725 | 4725 | |
| 4726 | 4726 | // get user defined template variables |
| 4727 | - $fields = ($fields == '') ? 'tv.*' : 'tv.' . implode(',tv.', array_filter(array_map('trim', explode(',', $fields)))); |
|
| 4728 | - $sort = ($sort == '') ? '' : 'tv.' . implode(',tv.', array_filter(array_map('trim', explode(',', $sort)))); |
|
| 4727 | + $fields = ($fields == '') ? 'tv.*' : 'tv.'.implode(',tv.', array_filter(array_map('trim', explode(',', $fields)))); |
|
| 4728 | + $sort = ($sort == '') ? '' : 'tv.'.implode(',tv.', array_filter(array_map('trim', explode(',', $sort)))); |
|
| 4729 | 4729 | |
| 4730 | 4730 | if ($idnames == '*') { |
| 4731 | 4731 | $query = 'tv.id<>0'; |
| 4732 | 4732 | } else { |
| 4733 | - $query = (is_numeric($idnames[0]) ? 'tv.id' : 'tv.name') . " IN ('" . implode("','", $idnames) . "')"; |
|
| 4733 | + $query = (is_numeric($idnames[0]) ? 'tv.id' : 'tv.name')." IN ('".implode("','", $idnames)."')"; |
|
| 4734 | 4734 | } |
| 4735 | 4735 | |
| 4736 | - $rs = $this->db->select("{$fields}, IF(tvc.value != '', tvc.value, tv.default_text) as value", $this->getFullTableName('site_tmplvars') . " tv |
|
| 4737 | - INNER JOIN " . $this->getFullTableName('site_tmplvar_templates') . " tvtpl ON tvtpl.tmplvarid = tv.id |
|
| 4738 | - LEFT JOIN " . $this->getFullTableName('site_tmplvar_contentvalues') . " tvc ON tvc.tmplvarid=tv.id AND tvc.contentid = '{$docid}'", "{$query} AND tvtpl.templateid = '{$docRow['template']}'", ($sort ? "{$sort} {$dir}" : "")); |
|
| 4736 | + $rs = $this->db->select("{$fields}, IF(tvc.value != '', tvc.value, tv.default_text) as value", $this->getFullTableName('site_tmplvars')." tv |
|
| 4737 | + INNER JOIN " . $this->getFullTableName('site_tmplvar_templates')." tvtpl ON tvtpl.tmplvarid = tv.id |
|
| 4738 | + LEFT JOIN " . $this->getFullTableName('site_tmplvar_contentvalues')." tvc ON tvc.tmplvarid=tv.id AND tvc.contentid = '{$docid}'", "{$query} AND tvtpl.templateid = '{$docRow['template']}'", ($sort ? "{$sort} {$dir}" : "")); |
|
| 4739 | 4739 | |
| 4740 | 4740 | $result = $this->db->makeArray($rs); |
| 4741 | 4741 | |
| 4742 | 4742 | // get default/built-in template variables |
| 4743 | - if(is_array($docRow)){ |
|
| 4743 | + if (is_array($docRow)) { |
|
| 4744 | 4744 | ksort($docRow); |
| 4745 | 4745 | |
| 4746 | 4746 | foreach ($docRow as $key => $value) { |
@@ -4778,22 +4778,22 @@ discard block |
||
| 4778 | 4778 | */ |
| 4779 | 4779 | public function getTemplateVarOutput($idnames = array(), $docid = '', $published = 1, $sep = '') |
| 4780 | 4780 | { |
| 4781 | - if (is_array($idnames) && empty($idnames) ) { |
|
| 4781 | + if (is_array($idnames) && empty($idnames)) { |
|
| 4782 | 4782 | return false; |
| 4783 | 4783 | } else { |
| 4784 | 4784 | $output = array(); |
| 4785 | 4785 | $vars = ($idnames == '*' || is_array($idnames)) ? $idnames : array($idnames); |
| 4786 | 4786 | |
| 4787 | - $docid = (int)$docid > 0 ? (int)$docid : $this->documentIdentifier; |
|
| 4787 | + $docid = (int) $docid > 0 ? (int) $docid : $this->documentIdentifier; |
|
| 4788 | 4788 | // remove sort for speed |
| 4789 | 4789 | $result = $this->getTemplateVars($vars, '*', $docid, $published, '', ''); |
| 4790 | 4790 | |
| 4791 | 4791 | if ($result == false) { |
| 4792 | 4792 | return false; |
| 4793 | 4793 | } else { |
| 4794 | - $baspath = MODX_MANAGER_PATH . 'includes'; |
|
| 4795 | - include_once $baspath . '/tmplvars.format.inc.php'; |
|
| 4796 | - include_once $baspath . '/tmplvars.commands.inc.php'; |
|
| 4794 | + $baspath = MODX_MANAGER_PATH.'includes'; |
|
| 4795 | + include_once $baspath.'/tmplvars.format.inc.php'; |
|
| 4796 | + include_once $baspath.'/tmplvars.commands.inc.php'; |
|
| 4797 | 4797 | |
| 4798 | 4798 | for ($i = 0; $i < count($result); $i++) { |
| 4799 | 4799 | $row = $result[$i]; |
@@ -4818,7 +4818,7 @@ discard block |
||
| 4818 | 4818 | */ |
| 4819 | 4819 | public function getFullTableName($tbl) |
| 4820 | 4820 | { |
| 4821 | - return $this->db->config['dbase'] . ".`" . $this->db->config['table_prefix'] . $tbl . "`"; |
|
| 4821 | + return $this->db->config['dbase'].".`".$this->db->config['table_prefix'].$tbl."`"; |
|
| 4822 | 4822 | } |
| 4823 | 4823 | |
| 4824 | 4824 | /** |
@@ -4897,7 +4897,7 @@ discard block |
||
| 4897 | 4897 | public function getCachePath() |
| 4898 | 4898 | { |
| 4899 | 4899 | global $base_url; |
| 4900 | - $pth = $base_url . $this->getCacheFolder(); |
|
| 4900 | + $pth = $base_url.$this->getCacheFolder(); |
|
| 4901 | 4901 | return $pth; |
| 4902 | 4902 | } |
| 4903 | 4903 | |
@@ -4949,8 +4949,8 @@ discard block |
||
| 4949 | 4949 | $out = false; |
| 4950 | 4950 | |
| 4951 | 4951 | if (!empty($context)) { |
| 4952 | - if (is_scalar($context) && isset($_SESSION[$context . 'Validated'])) { |
|
| 4953 | - $out = $_SESSION[$context . 'InternalKey']; |
|
| 4952 | + if (is_scalar($context) && isset($_SESSION[$context.'Validated'])) { |
|
| 4953 | + $out = $_SESSION[$context.'InternalKey']; |
|
| 4954 | 4954 | } |
| 4955 | 4955 | } else { |
| 4956 | 4956 | switch (true) { |
@@ -4978,8 +4978,8 @@ discard block |
||
| 4978 | 4978 | $out = false; |
| 4979 | 4979 | |
| 4980 | 4980 | if (!empty($context)) { |
| 4981 | - if (is_scalar($context) && isset($_SESSION[$context . 'Validated'])) { |
|
| 4982 | - $out = $_SESSION[$context . 'Shortname']; |
|
| 4981 | + if (is_scalar($context) && isset($_SESSION[$context.'Validated'])) { |
|
| 4982 | + $out = $_SESSION[$context.'Shortname']; |
|
| 4983 | 4983 | } |
| 4984 | 4984 | } else { |
| 4985 | 4985 | switch (true) { |
@@ -5050,8 +5050,8 @@ discard block |
||
| 5050 | 5050 | */ |
| 5051 | 5051 | public function getWebUserInfo($uid) |
| 5052 | 5052 | { |
| 5053 | - $rs = $this->db->select('wu.username, wu.password, wua.*', $this->getFullTableName("web_users") . " wu |
|
| 5054 | - INNER JOIN " . $this->getFullTableName("web_user_attributes") . " wua ON wua.internalkey=wu.id", "wu.id='{$uid}'"); |
|
| 5053 | + $rs = $this->db->select('wu.username, wu.password, wua.*', $this->getFullTableName("web_users")." wu |
|
| 5054 | + INNER JOIN " . $this->getFullTableName("web_user_attributes")." wua ON wua.internalkey=wu.id", "wu.id='{$uid}'"); |
|
| 5055 | 5055 | if ($row = $this->db->getRow($rs)) { |
| 5056 | 5056 | if (!isset($row['usertype']) or !$row["usertype"]) { |
| 5057 | 5057 | $row["usertype"] = "web"; |
@@ -5087,7 +5087,7 @@ discard block |
||
| 5087 | 5087 | } else if (is_array($dg)) { |
| 5088 | 5088 | // resolve ids to names |
| 5089 | 5089 | $dgn = array(); |
| 5090 | - $ds = $this->db->select('name', $this->getFullTableName("documentgroup_names"), "id IN (" . implode(",", $dg) . ")"); |
|
| 5090 | + $ds = $this->db->select('name', $this->getFullTableName("documentgroup_names"), "id IN (".implode(",", $dg).")"); |
|
| 5091 | 5091 | while ($row = $this->db->getRow($ds)) { |
| 5092 | 5092 | $dgn[] = $row['name']; |
| 5093 | 5093 | } |
@@ -5115,7 +5115,7 @@ discard block |
||
| 5115 | 5115 | $rt = false; |
| 5116 | 5116 | if ($_SESSION["webValidated"] == 1) { |
| 5117 | 5117 | $tbl = $this->getFullTableName("web_users"); |
| 5118 | - $ds = $this->db->select('id, username, password', $tbl, "id='" . $this->getLoginUserID() . "'"); |
|
| 5118 | + $ds = $this->db->select('id, username, password', $tbl, "id='".$this->getLoginUserID()."'"); |
|
| 5119 | 5119 | if ($row = $this->db->getRow($ds)) { |
| 5120 | 5120 | if ($row["password"] == md5($oldPwd)) { |
| 5121 | 5121 | if (strlen($newPwd) < 6) { |
@@ -5125,7 +5125,7 @@ discard block |
||
| 5125 | 5125 | } else { |
| 5126 | 5126 | $this->db->update(array( |
| 5127 | 5127 | 'password' => $this->db->escape($newPwd), |
| 5128 | - ), $tbl, "id='" . $this->getLoginUserID() . "'"); |
|
| 5128 | + ), $tbl, "id='".$this->getLoginUserID()."'"); |
|
| 5129 | 5129 | // invoke OnWebChangePassword event |
| 5130 | 5130 | $this->invokeEvent("OnWebChangePassword", array( |
| 5131 | 5131 | "userid" => $row["id"], |
@@ -5156,8 +5156,8 @@ discard block |
||
| 5156 | 5156 | // check cache |
| 5157 | 5157 | $grpNames = isset ($_SESSION['webUserGroupNames']) ? $_SESSION['webUserGroupNames'] : false; |
| 5158 | 5158 | if (!is_array($grpNames)) { |
| 5159 | - $rs = $this->db->select('wgn.name', $this->getFullTableName("webgroup_names") . " wgn |
|
| 5160 | - INNER JOIN " . $this->getFullTableName("web_groups") . " wg ON wg.webgroup=wgn.id AND wg.webuser='" . $this->getLoginUserID() . "'"); |
|
| 5159 | + $rs = $this->db->select('wgn.name', $this->getFullTableName("webgroup_names")." wgn |
|
| 5160 | + INNER JOIN " . $this->getFullTableName("web_groups")." wg ON wg.webgroup=wgn.id AND wg.webuser='".$this->getLoginUserID()."'"); |
|
| 5161 | 5161 | $grpNames = $this->db->getColumn("name", $rs); |
| 5162 | 5162 | // save to cache |
| 5163 | 5163 | $_SESSION['webUserGroupNames'] = $grpNames; |
@@ -5190,7 +5190,7 @@ discard block |
||
| 5190 | 5190 | if (strpos(strtolower($src), "<style") !== false || strpos(strtolower($src), "<link") !== false) { |
| 5191 | 5191 | $this->sjscripts[$nextpos] = $src; |
| 5192 | 5192 | } else { |
| 5193 | - $this->sjscripts[$nextpos] = "\t" . '<link rel="stylesheet" type="text/css" href="' . $src . '" ' . ($media ? 'media="' . $media . '" ' : '') . '/>'; |
|
| 5193 | + $this->sjscripts[$nextpos] = "\t".'<link rel="stylesheet" type="text/css" href="'.$src.'" '.($media ? 'media="'.$media.'" ' : '').'/>'; |
|
| 5194 | 5194 | } |
| 5195 | 5195 | } |
| 5196 | 5196 | |
@@ -5269,7 +5269,7 @@ discard block |
||
| 5269 | 5269 | } |
| 5270 | 5270 | |
| 5271 | 5271 | if ($useThisVer && $plaintext != true && (strpos(strtolower($src), "<script") === false)) { |
| 5272 | - $src = "\t" . '<script type="text/javascript" src="' . $src . '"></script>'; |
|
| 5272 | + $src = "\t".'<script type="text/javascript" src="'.$src.'"></script>'; |
|
| 5273 | 5273 | } |
| 5274 | 5274 | if ($startup) { |
| 5275 | 5275 | $pos = isset($overwritepos) ? $overwritepos : max(array_merge(array(0), array_keys($this->sjscripts))) + 1; |
@@ -5416,7 +5416,7 @@ discard block |
||
| 5416 | 5416 | $eventtime = $this->getMicroTime() - $eventtime; |
| 5417 | 5417 | $this->pluginsCode .= sprintf('<fieldset><legend><b>%s / %s</b> (%2.2f ms)</legend>', $evtName, $pluginName, $eventtime * 1000); |
| 5418 | 5418 | foreach ($parameter as $k => $v) { |
| 5419 | - $this->pluginsCode .= "{$k} => " . print_r($v, true) . '<br>'; |
|
| 5419 | + $this->pluginsCode .= "{$k} => ".print_r($v, true).'<br>'; |
|
| 5420 | 5420 | } |
| 5421 | 5421 | $this->pluginsCode .= '</fieldset><br />'; |
| 5422 | 5422 | $this->pluginsTime["{$evtName} / {$pluginName}"] += $eventtime; |
@@ -5444,13 +5444,13 @@ discard block |
||
| 5444 | 5444 | $plugin = array(); |
| 5445 | 5445 | if (isset ($this->pluginCache[$pluginName])) { |
| 5446 | 5446 | $pluginCode = $this->pluginCache[$pluginName]; |
| 5447 | - $pluginProperties = isset($this->pluginCache[$pluginName . "Props"]) ? $this->pluginCache[$pluginName . "Props"] : ''; |
|
| 5447 | + $pluginProperties = isset($this->pluginCache[$pluginName."Props"]) ? $this->pluginCache[$pluginName."Props"] : ''; |
|
| 5448 | 5448 | } else { |
| 5449 | 5449 | $pluginName = $this->db->escape($pluginName); |
| 5450 | 5450 | $result = $this->db->select('name, plugincode, properties', $this->getFullTableName("site_plugins"), "name='{$pluginName}' AND disabled=0"); |
| 5451 | 5451 | if ($row = $this->db->getRow($result)) { |
| 5452 | 5452 | $pluginCode = $this->pluginCache[$row['name']] = $row['plugincode']; |
| 5453 | - $pluginProperties = $this->pluginCache[$row['name'] . "Props"] = $row['properties']; |
|
| 5453 | + $pluginProperties = $this->pluginCache[$row['name']."Props"] = $row['properties']; |
|
| 5454 | 5454 | } else { |
| 5455 | 5455 | $pluginCode = $this->pluginCache[$pluginName] = "return false;"; |
| 5456 | 5456 | $pluginProperties = ''; |
@@ -5557,7 +5557,7 @@ discard block |
||
| 5557 | 5557 | public function parseDocBlockFromFile($element_dir, $filename, $escapeValues = false) |
| 5558 | 5558 | { |
| 5559 | 5559 | $params = array(); |
| 5560 | - $fullpath = $element_dir . '/' . $filename; |
|
| 5560 | + $fullpath = $element_dir.'/'.$filename; |
|
| 5561 | 5561 | if (is_readable($fullpath)) { |
| 5562 | 5562 | $tpl = @fopen($fullpath, "r"); |
| 5563 | 5563 | if ($tpl) { |
@@ -5724,8 +5724,8 @@ discard block |
||
| 5724 | 5724 | $ph = array('site_url' => MODX_SITE_URL); |
| 5725 | 5725 | $regexUrl = "/((http|https|ftp|ftps)\:\/\/[^\/]+(\/[^\s]+[^,.?!:;\s])?)/"; |
| 5726 | 5726 | $regexEmail = '#([0-9a-z]([-_.]?[0-9a-z])*@[0-9a-z]([-.]?[0-9a-z])*\\.[a-wyz][a-z](fo|g|l|m|mes|o|op|pa|ro|seum|t|u|v|z)?)#i'; |
| 5727 | - $emailSubject = isset($parsed['name']) ? '?subject=' . $parsed['name'] : ''; |
|
| 5728 | - $emailSubject .= isset($parsed['version']) ? ' v' . $parsed['version'] : ''; |
|
| 5727 | + $emailSubject = isset($parsed['name']) ? '?subject='.$parsed['name'] : ''; |
|
| 5728 | + $emailSubject .= isset($parsed['version']) ? ' v'.$parsed['version'] : ''; |
|
| 5729 | 5729 | foreach ($parsed as $key => $val) { |
| 5730 | 5730 | if (is_array($val)) { |
| 5731 | 5731 | foreach ($val as $key2 => $val2) { |
@@ -5734,7 +5734,7 @@ discard block |
||
| 5734 | 5734 | $val2 = preg_replace($regexUrl, "<a href=\"{$url[0]}\" target=\"_blank\">{$url[0]}</a> ", $val2); |
| 5735 | 5735 | } |
| 5736 | 5736 | if (preg_match($regexEmail, $val2, $url)) { |
| 5737 | - $val2 = preg_replace($regexEmail, '<a href="mailto:\\1' . $emailSubject . '">\\1</a>', $val2); |
|
| 5737 | + $val2 = preg_replace($regexEmail, '<a href="mailto:\\1'.$emailSubject.'">\\1</a>', $val2); |
|
| 5738 | 5738 | } |
| 5739 | 5739 | $parsed[$key][$key2] = $val2; |
| 5740 | 5740 | } |
@@ -5744,7 +5744,7 @@ discard block |
||
| 5744 | 5744 | $val = preg_replace($regexUrl, "<a href=\"{$url[0]}\" target=\"_blank\">{$url[0]}</a> ", $val); |
| 5745 | 5745 | } |
| 5746 | 5746 | if (preg_match($regexEmail, $val, $url)) { |
| 5747 | - $val = preg_replace($regexEmail, '<a href="mailto:\\1' . $emailSubject . '">\\1</a>', $val); |
|
| 5747 | + $val = preg_replace($regexEmail, '<a href="mailto:\\1'.$emailSubject.'">\\1</a>', $val); |
|
| 5748 | 5748 | } |
| 5749 | 5749 | $parsed[$key] = $val; |
| 5750 | 5750 | } |
@@ -5758,32 +5758,32 @@ discard block |
||
| 5758 | 5758 | ); |
| 5759 | 5759 | |
| 5760 | 5760 | $nl = "\n"; |
| 5761 | - $list = isset($parsed['logo']) ? '<img src="' . $this->config['base_url'] . ltrim($parsed['logo'], "/") . '" style="float:right;max-width:100px;height:auto;" />' . $nl : ''; |
|
| 5762 | - $list .= '<p>' . $nl; |
|
| 5763 | - $list .= isset($parsed['name']) ? '<strong>' . $parsed['name'] . '</strong><br/>' . $nl : ''; |
|
| 5764 | - $list .= isset($parsed['description']) ? $parsed['description'] . $nl : ''; |
|
| 5765 | - $list .= '</p><br/>' . $nl; |
|
| 5766 | - $list .= isset($parsed['version']) ? '<p><strong>' . $_lang['version'] . ':</strong> ' . $parsed['version'] . '</p>' . $nl : ''; |
|
| 5767 | - $list .= isset($parsed['license']) ? '<p><strong>' . $_lang['license'] . ':</strong> ' . $parsed['license'] . '</p>' . $nl : ''; |
|
| 5768 | - $list .= isset($parsed['lastupdate']) ? '<p><strong>' . $_lang['last_update'] . ':</strong> ' . $parsed['lastupdate'] . '</p>' . $nl : ''; |
|
| 5769 | - $list .= '<br/>' . $nl; |
|
| 5761 | + $list = isset($parsed['logo']) ? '<img src="'.$this->config['base_url'].ltrim($parsed['logo'], "/").'" style="float:right;max-width:100px;height:auto;" />'.$nl : ''; |
|
| 5762 | + $list .= '<p>'.$nl; |
|
| 5763 | + $list .= isset($parsed['name']) ? '<strong>'.$parsed['name'].'</strong><br/>'.$nl : ''; |
|
| 5764 | + $list .= isset($parsed['description']) ? $parsed['description'].$nl : ''; |
|
| 5765 | + $list .= '</p><br/>'.$nl; |
|
| 5766 | + $list .= isset($parsed['version']) ? '<p><strong>'.$_lang['version'].':</strong> '.$parsed['version'].'</p>'.$nl : ''; |
|
| 5767 | + $list .= isset($parsed['license']) ? '<p><strong>'.$_lang['license'].':</strong> '.$parsed['license'].'</p>'.$nl : ''; |
|
| 5768 | + $list .= isset($parsed['lastupdate']) ? '<p><strong>'.$_lang['last_update'].':</strong> '.$parsed['lastupdate'].'</p>'.$nl : ''; |
|
| 5769 | + $list .= '<br/>'.$nl; |
|
| 5770 | 5770 | $first = true; |
| 5771 | 5771 | foreach ($arrayParams as $param => $label) { |
| 5772 | 5772 | if (isset($parsed[$param])) { |
| 5773 | 5773 | if ($first) { |
| 5774 | - $list .= '<p><strong>' . $_lang['references'] . '</strong></p>' . $nl; |
|
| 5775 | - $list .= '<ul class="docBlockList">' . $nl; |
|
| 5774 | + $list .= '<p><strong>'.$_lang['references'].'</strong></p>'.$nl; |
|
| 5775 | + $list .= '<ul class="docBlockList">'.$nl; |
|
| 5776 | 5776 | $first = false; |
| 5777 | 5777 | } |
| 5778 | - $list .= ' <li><strong>' . $label . '</strong>' . $nl; |
|
| 5779 | - $list .= ' <ul>' . $nl; |
|
| 5778 | + $list .= ' <li><strong>'.$label.'</strong>'.$nl; |
|
| 5779 | + $list .= ' <ul>'.$nl; |
|
| 5780 | 5780 | foreach ($parsed[$param] as $val) { |
| 5781 | - $list .= ' <li>' . $val . '</li>' . $nl; |
|
| 5781 | + $list .= ' <li>'.$val.'</li>'.$nl; |
|
| 5782 | 5782 | } |
| 5783 | - $list .= ' </ul></li>' . $nl; |
|
| 5783 | + $list .= ' </ul></li>'.$nl; |
|
| 5784 | 5784 | } |
| 5785 | 5785 | } |
| 5786 | - $list .= !$first ? '</ul>' . $nl : ''; |
|
| 5786 | + $list .= !$first ? '</ul>'.$nl : ''; |
|
| 5787 | 5787 | |
| 5788 | 5788 | return $list; |
| 5789 | 5789 | } |
@@ -5859,7 +5859,7 @@ discard block |
||
| 5859 | 5859 | */ |
| 5860 | 5860 | public function addSnippet($name, $phpCode) |
| 5861 | 5861 | { |
| 5862 | - $this->snippetCache['#' . $name] = $phpCode; |
|
| 5862 | + $this->snippetCache['#'.$name] = $phpCode; |
|
| 5863 | 5863 | } |
| 5864 | 5864 | |
| 5865 | 5865 | /** |
@@ -5868,7 +5868,7 @@ discard block |
||
| 5868 | 5868 | */ |
| 5869 | 5869 | public function addChunk($name, $text) |
| 5870 | 5870 | { |
| 5871 | - $this->chunkCache['#' . $name] = $text; |
|
| 5871 | + $this->chunkCache['#'.$name] = $text; |
|
| 5872 | 5872 | } |
| 5873 | 5873 | |
| 5874 | 5874 | /** |
@@ -5904,7 +5904,7 @@ discard block |
||
| 5904 | 5904 | } |
| 5905 | 5905 | |
| 5906 | 5906 | if (!$isSafe) { |
| 5907 | - $msg = $phpcode . "\n" . $this->currentSnippet . "\n" . print_r($_SERVER, true); |
|
| 5907 | + $msg = $phpcode."\n".$this->currentSnippet."\n".print_r($_SERVER, true); |
|
| 5908 | 5908 | $title = sprintf('Unknown eval was executed (%s)', $this->htmlspecialchars(substr(trim($phpcode), 0, 50))); |
| 5909 | 5909 | $this->messageQuit($title, '', true, '', '', 'Parser', $msg); |
| 5910 | 5910 | return; |
@@ -5918,7 +5918,7 @@ discard block |
||
| 5918 | 5918 | return 'array()'; |
| 5919 | 5919 | } |
| 5920 | 5920 | |
| 5921 | - $output = $echo . $return; |
|
| 5921 | + $output = $echo.$return; |
|
| 5922 | 5922 | modx_sanitize_gpc($output); |
| 5923 | 5923 | return $this->htmlspecialchars($output); // Maybe, all html tags are dangerous |
| 5924 | 5924 | } |
@@ -5936,8 +5936,8 @@ discard block |
||
| 5936 | 5936 | |
| 5937 | 5937 | $safe = explode(',', $safe_functions); |
| 5938 | 5938 | |
| 5939 | - $phpcode = rtrim($phpcode, ';') . ';'; |
|
| 5940 | - $tokens = token_get_all('<?php ' . $phpcode); |
|
| 5939 | + $phpcode = rtrim($phpcode, ';').';'; |
|
| 5940 | + $tokens = token_get_all('<?php '.$phpcode); |
|
| 5941 | 5941 | foreach ($tokens as $i => $token) { |
| 5942 | 5942 | if (!is_array($token)) { |
| 5943 | 5943 | continue; |
@@ -5973,7 +5973,7 @@ discard block |
||
| 5973 | 5973 | public function atBindFileContent($str = '') |
| 5974 | 5974 | { |
| 5975 | 5975 | |
| 5976 | - $search_path = array('assets/tvs/', 'assets/chunks/', 'assets/templates/', $this->config['rb_base_url'] . 'files/', ''); |
|
| 5976 | + $search_path = array('assets/tvs/', 'assets/chunks/', 'assets/templates/', $this->config['rb_base_url'].'files/', ''); |
|
| 5977 | 5977 | |
| 5978 | 5978 | if (stripos($str, '@FILE') !== 0) { |
| 5979 | 5979 | return $str; |
@@ -5996,7 +5996,7 @@ discard block |
||
| 5996 | 5996 | $errorMsg = sprintf("Could not retrieve string '%s'.", $str); |
| 5997 | 5997 | |
| 5998 | 5998 | foreach ($search_path as $path) { |
| 5999 | - $file_path = MODX_BASE_PATH . $path . $str; |
|
| 5999 | + $file_path = MODX_BASE_PATH.$path.$str; |
|
| 6000 | 6000 | if (strpos($file_path, MODX_MANAGER_PATH) === 0) { |
| 6001 | 6001 | return $errorMsg; |
| 6002 | 6002 | } elseif (is_file($file_path)) { |
@@ -6010,7 +6010,7 @@ discard block |
||
| 6010 | 6010 | return $errorMsg; |
| 6011 | 6011 | } |
| 6012 | 6012 | |
| 6013 | - $content = (string)file_get_contents($file_path); |
|
| 6013 | + $content = (string) file_get_contents($file_path); |
|
| 6014 | 6014 | if ($content === false) { |
| 6015 | 6015 | return $errorMsg; |
| 6016 | 6016 | } |
@@ -6123,22 +6123,22 @@ discard block |
||
| 6123 | 6123 | |
| 6124 | 6124 | $version = isset ($GLOBALS['modx_version']) ? $GLOBALS['modx_version'] : ''; |
| 6125 | 6125 | $release_date = isset ($GLOBALS['release_date']) ? $GLOBALS['release_date'] : ''; |
| 6126 | - $request_uri = "http://" . $_SERVER['HTTP_HOST'] . ($_SERVER["SERVER_PORT"] == 80 ? "" : (":" . $_SERVER["SERVER_PORT"])) . $_SERVER['REQUEST_URI']; |
|
| 6126 | + $request_uri = "http://".$_SERVER['HTTP_HOST'].($_SERVER["SERVER_PORT"] == 80 ? "" : (":".$_SERVER["SERVER_PORT"])).$_SERVER['REQUEST_URI']; |
|
| 6127 | 6127 | $request_uri = $this->htmlspecialchars($request_uri, ENT_QUOTES, $this->config['modx_charset']); |
| 6128 | 6128 | $ua = $this->htmlspecialchars($_SERVER['HTTP_USER_AGENT'], ENT_QUOTES, $this->config['modx_charset']); |
| 6129 | 6129 | $referer = $this->htmlspecialchars($_SERVER['HTTP_REFERER'], ENT_QUOTES, $this->config['modx_charset']); |
| 6130 | 6130 | if ($is_error) { |
| 6131 | 6131 | $str = '<h2 style="color:red">« Evo Parse Error »</h2>'; |
| 6132 | 6132 | if ($msg != 'PHP Parse Error') { |
| 6133 | - $str .= '<h3 style="color:red">' . $msg . '</h3>'; |
|
| 6133 | + $str .= '<h3 style="color:red">'.$msg.'</h3>'; |
|
| 6134 | 6134 | } |
| 6135 | 6135 | } else { |
| 6136 | 6136 | $str = '<h2 style="color:#003399">« Evo Debug/ stop message »</h2>'; |
| 6137 | - $str .= '<h3 style="color:#003399">' . $msg . '</h3>'; |
|
| 6137 | + $str .= '<h3 style="color:#003399">'.$msg.'</h3>'; |
|
| 6138 | 6138 | } |
| 6139 | 6139 | |
| 6140 | 6140 | if (!empty ($query)) { |
| 6141 | - $str .= '<div style="font-weight:bold;border:1px solid #ccc;padding:8px;color:#333;background-color:#ffffcd;margin-bottom:15px;">SQL > <span id="sqlHolder">' . $query . '</span></div>'; |
|
| 6141 | + $str .= '<div style="font-weight:bold;border:1px solid #ccc;padding:8px;color:#333;background-color:#ffffcd;margin-bottom:15px;">SQL > <span id="sqlHolder">'.$query.'</span></div>'; |
|
| 6142 | 6142 | } |
| 6143 | 6143 | |
| 6144 | 6144 | $errortype = array( |
@@ -6161,13 +6161,13 @@ discard block |
||
| 6161 | 6161 | |
| 6162 | 6162 | if (!empty($nr) || !empty($file)) { |
| 6163 | 6163 | if ($text != '') { |
| 6164 | - $str .= '<div style="font-weight:bold;border:1px solid #ccc;padding:8px;color:#333;background-color:#ffffcd;margin-bottom:15px;">Error : ' . $text . '</div>'; |
|
| 6164 | + $str .= '<div style="font-weight:bold;border:1px solid #ccc;padding:8px;color:#333;background-color:#ffffcd;margin-bottom:15px;">Error : '.$text.'</div>'; |
|
| 6165 | 6165 | } |
| 6166 | 6166 | if ($output != '') { |
| 6167 | - $str .= '<div style="font-weight:bold;border:1px solid #ccc;padding:8px;color:#333;background-color:#ffffcd;margin-bottom:15px;">' . $output . '</div>'; |
|
| 6167 | + $str .= '<div style="font-weight:bold;border:1px solid #ccc;padding:8px;color:#333;background-color:#ffffcd;margin-bottom:15px;">'.$output.'</div>'; |
|
| 6168 | 6168 | } |
| 6169 | 6169 | if ($nr !== '') { |
| 6170 | - $table[] = array('ErrorType[num]', $errortype [$nr] . "[" . $nr . "]"); |
|
| 6170 | + $table[] = array('ErrorType[num]', $errortype [$nr]."[".$nr."]"); |
|
| 6171 | 6171 | } |
| 6172 | 6172 | if ($file) { |
| 6173 | 6173 | $table[] = array('File', $file); |
@@ -6187,7 +6187,7 @@ discard block |
||
| 6187 | 6187 | } |
| 6188 | 6188 | |
| 6189 | 6189 | if (!empty($this->event->activePlugin)) { |
| 6190 | - $table[] = array('Current Plugin', $this->event->activePlugin . '(' . $this->event->name . ')'); |
|
| 6190 | + $table[] = array('Current Plugin', $this->event->activePlugin.'('.$this->event->name.')'); |
|
| 6191 | 6191 | } |
| 6192 | 6192 | |
| 6193 | 6193 | $str .= $MakeTable->create($table, array('Error information', '')); |
@@ -6197,17 +6197,17 @@ discard block |
||
| 6197 | 6197 | $table[] = array('REQUEST_URI', $request_uri); |
| 6198 | 6198 | |
| 6199 | 6199 | if ($this->manager->action) { |
| 6200 | - include_once(MODX_MANAGER_PATH . 'includes/actionlist.inc.php'); |
|
| 6200 | + include_once(MODX_MANAGER_PATH.'includes/actionlist.inc.php'); |
|
| 6201 | 6201 | global $action_list; |
| 6202 | 6202 | $actionName = (isset($action_list[$this->manager->action])) ? " - {$action_list[$this->manager->action]}" : ''; |
| 6203 | 6203 | |
| 6204 | - $table[] = array('Manager action', $this->manager->action . $actionName); |
|
| 6204 | + $table[] = array('Manager action', $this->manager->action.$actionName); |
|
| 6205 | 6205 | } |
| 6206 | 6206 | |
| 6207 | 6207 | if (preg_match('@^[0-9]+@', $this->documentIdentifier)) { |
| 6208 | 6208 | $resource = $this->getDocumentObject('id', $this->documentIdentifier); |
| 6209 | 6209 | $url = $this->makeUrl($this->documentIdentifier, '', '', 'full'); |
| 6210 | - $table[] = array('Resource', '[' . $this->documentIdentifier . '] <a href="' . $url . '" target="_blank">' . $resource['pagetitle'] . '</a>'); |
|
| 6210 | + $table[] = array('Resource', '['.$this->documentIdentifier.'] <a href="'.$url.'" target="_blank">'.$resource['pagetitle'].'</a>'); |
|
| 6211 | 6211 | } |
| 6212 | 6212 | $table[] = array('Referer', $referer); |
| 6213 | 6213 | $table[] = array('User Agent', $ua); |
@@ -6228,7 +6228,7 @@ discard block |
||
| 6228 | 6228 | |
| 6229 | 6229 | $mem = memory_get_peak_usage(true); |
| 6230 | 6230 | $total_mem = $mem - $this->mstart; |
| 6231 | - $total_mem = ($total_mem / 1024 / 1024) . ' mb'; |
|
| 6231 | + $total_mem = ($total_mem / 1024 / 1024).' mb'; |
|
| 6232 | 6232 | |
| 6233 | 6233 | $queryTime = $this->queryTime; |
| 6234 | 6234 | $phpTime = $totalTime - $queryTime; |
@@ -6249,18 +6249,18 @@ discard block |
||
| 6249 | 6249 | $str .= $this->get_backtrace(debug_backtrace()); |
| 6250 | 6250 | // Log error |
| 6251 | 6251 | if (!empty($this->currentSnippet)) { |
| 6252 | - $source = 'Snippet - ' . $this->currentSnippet; |
|
| 6252 | + $source = 'Snippet - '.$this->currentSnippet; |
|
| 6253 | 6253 | } elseif (!empty($this->event->activePlugin)) { |
| 6254 | - $source = 'Plugin - ' . $this->event->activePlugin; |
|
| 6254 | + $source = 'Plugin - '.$this->event->activePlugin; |
|
| 6255 | 6255 | } elseif ($source !== '') { |
| 6256 | - $source = 'Parser - ' . $source; |
|
| 6256 | + $source = 'Parser - '.$source; |
|
| 6257 | 6257 | } elseif ($query !== '') { |
| 6258 | 6258 | $source = 'SQL Query'; |
| 6259 | 6259 | } else { |
| 6260 | 6260 | $source = 'Parser'; |
| 6261 | 6261 | } |
| 6262 | 6262 | if ($msg) { |
| 6263 | - $source .= ' / ' . $msg; |
|
| 6263 | + $source .= ' / '.$msg; |
|
| 6264 | 6264 | } |
| 6265 | 6265 | if (isset($actionName) && !empty($actionName)) { |
| 6266 | 6266 | $source .= $actionName; |
@@ -6292,12 +6292,12 @@ discard block |
||
| 6292 | 6292 | |
| 6293 | 6293 | // Display error |
| 6294 | 6294 | if (isset($_SESSION['mgrValidated'])) { |
| 6295 | - echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"><html><head><title>EVO Content Manager ' . $version . ' » ' . $release_date . '</title> |
|
| 6295 | + echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"><html><head><title>EVO Content Manager '.$version.' » '.$release_date.'</title> |
|
| 6296 | 6296 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> |
| 6297 | - <link rel="stylesheet" type="text/css" href="' . $this->config['site_manager_url'] . 'media/style/' . $this->config['manager_theme'] . '/style.css" /> |
|
| 6297 | + <link rel="stylesheet" type="text/css" href="' . $this->config['site_manager_url'].'media/style/'.$this->config['manager_theme'].'/style.css" /> |
|
| 6298 | 6298 | <style type="text/css">body { padding:10px; } td {font:inherit;}</style> |
| 6299 | 6299 | </head><body> |
| 6300 | - ' . $str . '</body></html>'; |
|
| 6300 | + ' . $str.'</body></html>'; |
|
| 6301 | 6301 | |
| 6302 | 6302 | } else { |
| 6303 | 6303 | echo 'Error'; |
@@ -6335,7 +6335,7 @@ discard block |
||
| 6335 | 6335 | switch ($val['type']) { |
| 6336 | 6336 | case '->': |
| 6337 | 6337 | case '::': |
| 6338 | - $functionName = $val['function'] = $val['class'] . $val['type'] . $val['function']; |
|
| 6338 | + $functionName = $val['function'] = $val['class'].$val['type'].$val['function']; |
|
| 6339 | 6339 | break; |
| 6340 | 6340 | default: |
| 6341 | 6341 | $functionName = $val['function']; |
@@ -6345,7 +6345,7 @@ discard block |
||
| 6345 | 6345 | $args = array_pad(array(), $_, '$var'); |
| 6346 | 6346 | $args = implode(", ", $args); |
| 6347 | 6347 | $modx = &$this; |
| 6348 | - $args = preg_replace_callback('/\$var/', function () use ($modx, &$tmp, $val) { |
|
| 6348 | + $args = preg_replace_callback('/\$var/', function() use ($modx, &$tmp, $val) { |
|
| 6349 | 6349 | $arg = $val['args'][$tmp - 1]; |
| 6350 | 6350 | switch (true) { |
| 6351 | 6351 | case is_null($arg): { |
@@ -6357,7 +6357,7 @@ discard block |
||
| 6357 | 6357 | break; |
| 6358 | 6358 | } |
| 6359 | 6359 | case is_scalar($arg): { |
| 6360 | - $out = strlen($arg) > 20 ? 'string $var' . $tmp : ("'" . $this->htmlspecialchars(str_replace("'", "\\'", $arg)) . "'"); |
|
| 6360 | + $out = strlen($arg) > 20 ? 'string $var'.$tmp : ("'".$this->htmlspecialchars(str_replace("'", "\\'", $arg))."'"); |
|
| 6361 | 6361 | break; |
| 6362 | 6362 | } |
| 6363 | 6363 | case is_bool($arg): { |
@@ -6365,23 +6365,23 @@ discard block |
||
| 6365 | 6365 | break; |
| 6366 | 6366 | } |
| 6367 | 6367 | case is_array($arg): { |
| 6368 | - $out = 'array $var' . $tmp; |
|
| 6368 | + $out = 'array $var'.$tmp; |
|
| 6369 | 6369 | break; |
| 6370 | 6370 | } |
| 6371 | 6371 | case is_object($arg): { |
| 6372 | - $out = get_class($arg) . ' $var' . $tmp; |
|
| 6372 | + $out = get_class($arg).' $var'.$tmp; |
|
| 6373 | 6373 | break; |
| 6374 | 6374 | } |
| 6375 | 6375 | default: { |
| 6376 | - $out = '$var' . $tmp; |
|
| 6376 | + $out = '$var'.$tmp; |
|
| 6377 | 6377 | } |
| 6378 | 6378 | } |
| 6379 | 6379 | $tmp++; |
| 6380 | 6380 | return $out; |
| 6381 | 6381 | }, $args); |
| 6382 | 6382 | $line = array( |
| 6383 | - "<strong>" . $functionName . "</strong>(" . $args . ")", |
|
| 6384 | - $path . " on line " . $val['line'] |
|
| 6383 | + "<strong>".$functionName."</strong>(".$args.")", |
|
| 6384 | + $path." on line ".$val['line'] |
|
| 6385 | 6385 | ); |
| 6386 | 6386 | $table[] = array(implode("<br />", $line)); |
| 6387 | 6387 | } |
@@ -6422,7 +6422,7 @@ discard block |
||
| 6422 | 6422 | $alias = strip_tags($alias); // strip HTML |
| 6423 | 6423 | $alias = preg_replace('/[^\.A-Za-z0-9 _-]/', '', $alias); // strip non-alphanumeric characters |
| 6424 | 6424 | $alias = preg_replace('/\s+/', '-', $alias); // convert white-space to dash |
| 6425 | - $alias = preg_replace('/-+/', '-', $alias); // convert multiple dashes to one |
|
| 6425 | + $alias = preg_replace('/-+/', '-', $alias); // convert multiple dashes to one |
|
| 6426 | 6426 | $alias = trim($alias, '-'); // trim excess |
| 6427 | 6427 | return $alias; |
| 6428 | 6428 | } |
@@ -6438,7 +6438,7 @@ discard block |
||
| 6438 | 6438 | $precisions = count($sizes) - 1; |
| 6439 | 6439 | foreach ($sizes as $unit => $bytes) { |
| 6440 | 6440 | if ($size >= $bytes) { |
| 6441 | - return number_format($size / $bytes, $precisions) . ' ' . $unit; |
|
| 6441 | + return number_format($size / $bytes, $precisions).' '.$unit; |
|
| 6442 | 6442 | } |
| 6443 | 6443 | $precisions--; |
| 6444 | 6444 | } |
@@ -6542,10 +6542,10 @@ discard block |
||
| 6542 | 6542 | |
| 6543 | 6543 | if (strpos($str, MODX_MANAGER_PATH) === 0) { |
| 6544 | 6544 | return false; |
| 6545 | - } elseif (is_file(MODX_BASE_PATH . $str)) { |
|
| 6546 | - $file_path = MODX_BASE_PATH . $str; |
|
| 6547 | - } elseif (is_file(MODX_BASE_PATH . "{$tpl_dir}{$str}")) { |
|
| 6548 | - $file_path = MODX_BASE_PATH . $tpl_dir . $str; |
|
| 6545 | + } elseif (is_file(MODX_BASE_PATH.$str)) { |
|
| 6546 | + $file_path = MODX_BASE_PATH.$str; |
|
| 6547 | + } elseif (is_file(MODX_BASE_PATH."{$tpl_dir}{$str}")) { |
|
| 6548 | + $file_path = MODX_BASE_PATH.$tpl_dir.$str; |
|
| 6549 | 6549 | } else { |
| 6550 | 6550 | return false; |
| 6551 | 6551 | } |
@@ -6671,7 +6671,7 @@ discard block |
||
| 6671 | 6671 | $title = 'no title'; |
| 6672 | 6672 | } |
| 6673 | 6673 | if (is_array($msg)) { |
| 6674 | - $msg = '<pre>' . print_r($msg, true) . '</pre>'; |
|
| 6674 | + $msg = '<pre>'.print_r($msg, true).'</pre>'; |
|
| 6675 | 6675 | } elseif ($msg === '') { |
| 6676 | 6676 | $msg = $_SERVER['REQUEST_URI']; |
| 6677 | 6677 | } |
@@ -6716,7 +6716,7 @@ discard block |
||
| 6716 | 6716 | if (is_array($SystemAlertMsgQueque)) { |
| 6717 | 6717 | $title = ''; |
| 6718 | 6718 | if ($this->name && $this->activePlugin) { |
| 6719 | - $title = "<div><b>" . $this->activePlugin . "</b> - <span style='color:maroon;'>" . $this->name . "</span></div>"; |
|
| 6719 | + $title = "<div><b>".$this->activePlugin."</b> - <span style='color:maroon;'>".$this->name."</span></div>"; |
|
| 6720 | 6720 | } |
| 6721 | 6721 | $SystemAlertMsgQueque[] = "$title<div style='margin-left:10px;margin-top:3px;'>$msg</div>"; |
| 6722 | 6722 | } |
