@@ -1,16 +1,16 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | /** This file is part of KCFinder project |
| 4 | - * |
|
| 5 | - * @desc Upload calling script |
|
| 6 | - * @package KCFinder |
|
| 7 | - * @version 2.54 |
|
| 8 | - * @author Pavel Tzonkov <[email protected]> |
|
| 9 | - * @copyright 2010-2014 KCFinder Project |
|
| 10 | - * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 |
|
| 11 | - * @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2 |
|
| 12 | - * @link http://kcfinder.sunhater.com |
|
| 13 | - */ |
|
| 4 | + * |
|
| 5 | + * @desc Upload calling script |
|
| 6 | + * @package KCFinder |
|
| 7 | + * @version 2.54 |
|
| 8 | + * @author Pavel Tzonkov <[email protected]> |
|
| 9 | + * @copyright 2010-2014 KCFinder Project |
|
| 10 | + * @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2 |
|
| 11 | + * @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2 |
|
| 12 | + * @link http://kcfinder.sunhater.com |
|
| 13 | + */ |
|
| 14 | 14 | |
| 15 | 15 | require "core/autoload.php"; |
| 16 | 16 | $uploader = new uploader($modx); |
@@ -11,12 +11,12 @@ discard block |
||
| 11 | 11 | $style_path = 'media/style/' . $modx->config['manager_theme'] . '/images/'; |
| 12 | 12 | $modx->config['mgr_date_picker_path'] = 'media/calendar/datepicker.inc.php'; |
| 13 | 13 | if(!$modx->config['lang_code']) {
|
| 14 | - global $modx_lang_attribute; |
|
| 15 | - $modx->config['lang_code'] = !$modx_lang_attribute ? 'en' : $modx_lang_attribute; |
|
| 14 | + global $modx_lang_attribute; |
|
| 15 | + $modx->config['lang_code'] = !$modx_lang_attribute ? 'en' : $modx_lang_attribute; |
|
| 16 | 16 | } |
| 17 | 17 | |
| 18 | 18 | if($_GET['a'] == 2) {
|
| 19 | - include_once('welcome.php');
|
|
| 19 | + include_once('welcome.php');
|
|
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | // Favicon |
@@ -274,66 +274,66 @@ discard block |
||
| 274 | 274 | $addnew = 0; |
| 275 | 275 | $run = 0; |
| 276 | 276 | switch($action) {
|
| 277 | - case '3': |
|
| 278 | - case '4': |
|
| 279 | - case '27': |
|
| 280 | - case '72': |
|
| 281 | - if($modx->hasPermission('new_document')) {
|
|
| 282 | - $addnew = 1; |
|
| 283 | - } |
|
| 284 | - break; |
|
| 285 | - case '16': |
|
| 286 | - case '19': |
|
| 287 | - if($modx->hasPermission('new_template')) {
|
|
| 288 | - $addnew = 1; |
|
| 289 | - } |
|
| 290 | - break; |
|
| 291 | - case '300': |
|
| 292 | - case '301': |
|
| 293 | - if($modx->hasPermission('new_snippet') && $modx->hasPermission('new_chunk') && $modx->hasPermission('new_plugin')) {
|
|
| 294 | - $addnew = 1; |
|
| 295 | - } |
|
| 296 | - break; |
|
| 297 | - case '77': |
|
| 298 | - case '78': |
|
| 299 | - if($modx->hasPermission('new_chunk')) {
|
|
| 300 | - $addnew = 1; |
|
| 301 | - } |
|
| 302 | - break; |
|
| 303 | - case '22': |
|
| 304 | - case '23': |
|
| 305 | - if($modx->hasPermission('new_snippet')) {
|
|
| 306 | - $addnew = 1; |
|
| 307 | - } |
|
| 308 | - break; |
|
| 309 | - case '101': |
|
| 310 | - case '102': |
|
| 311 | - if($modx->hasPermission('new_plugin')) {
|
|
| 312 | - $addnew = 1; |
|
| 313 | - } |
|
| 314 | - break; |
|
| 315 | - case '106': |
|
| 316 | - case '107': |
|
| 317 | - case '108': |
|
| 318 | - if($modx->hasPermission('new_module')) {
|
|
| 319 | - $addnew = 1; |
|
| 320 | - } |
|
| 321 | - if($modx->hasPermission('exec_module')) {
|
|
| 322 | - $run = 1; |
|
| 323 | - } |
|
| 324 | - break; |
|
| 325 | - case '88': |
|
| 326 | - if($modx->hasPermission('new_web_user')) {
|
|
| 327 | - $addnew = 1; |
|
| 328 | - } |
|
| 329 | - break; |
|
| 277 | + case '3': |
|
| 278 | + case '4': |
|
| 279 | + case '27': |
|
| 280 | + case '72': |
|
| 281 | + if($modx->hasPermission('new_document')) {
|
|
| 282 | + $addnew = 1; |
|
| 283 | + } |
|
| 284 | + break; |
|
| 285 | + case '16': |
|
| 286 | + case '19': |
|
| 287 | + if($modx->hasPermission('new_template')) {
|
|
| 288 | + $addnew = 1; |
|
| 289 | + } |
|
| 290 | + break; |
|
| 291 | + case '300': |
|
| 292 | + case '301': |
|
| 293 | + if($modx->hasPermission('new_snippet') && $modx->hasPermission('new_chunk') && $modx->hasPermission('new_plugin')) {
|
|
| 294 | + $addnew = 1; |
|
| 295 | + } |
|
| 296 | + break; |
|
| 297 | + case '77': |
|
| 298 | + case '78': |
|
| 299 | + if($modx->hasPermission('new_chunk')) {
|
|
| 300 | + $addnew = 1; |
|
| 301 | + } |
|
| 302 | + break; |
|
| 303 | + case '22': |
|
| 304 | + case '23': |
|
| 305 | + if($modx->hasPermission('new_snippet')) {
|
|
| 306 | + $addnew = 1; |
|
| 307 | + } |
|
| 308 | + break; |
|
| 309 | + case '101': |
|
| 310 | + case '102': |
|
| 311 | + if($modx->hasPermission('new_plugin')) {
|
|
| 312 | + $addnew = 1; |
|
| 313 | + } |
|
| 314 | + break; |
|
| 315 | + case '106': |
|
| 316 | + case '107': |
|
| 317 | + case '108': |
|
| 318 | + if($modx->hasPermission('new_module')) {
|
|
| 319 | + $addnew = 1; |
|
| 320 | + } |
|
| 321 | + if($modx->hasPermission('exec_module')) {
|
|
| 322 | + $run = 1; |
|
| 323 | + } |
|
| 324 | + break; |
|
| 325 | + case '88': |
|
| 326 | + if($modx->hasPermission('new_web_user')) {
|
|
| 327 | + $addnew = 1; |
|
| 328 | + } |
|
| 329 | + break; |
|
| 330 | 330 | } |
| 331 | 331 | |
| 332 | 332 | $disabled = ($action == '19' || $action == '300' || $action == '77' || $action == '23' || $action == '101' || $action == '4' || $action == '72' || $action == '87' || $action == '11' || $action == '107' || $action == '38') ? ' disabled' : ''; |
| 333 | 333 | |
| 334 | 334 | $_style['actionbuttons'] = array( |
| 335 | - 'dynamic' => array( |
|
| 336 | - 'document' => '<div id="actions"> |
|
| 335 | + 'dynamic' => array( |
|
| 336 | + 'document' => '<div id="actions"> |
|
| 337 | 337 | <div class="btn-group"> |
| 338 | 338 | <div class="btn-group"> |
| 339 | 339 | <a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.save();"> |
@@ -348,7 +348,7 @@ discard block |
||
| 348 | 348 | <option id="stay3" value="" ' . ($stay == '' ? ' selected="selected"' : '') . '>' . $_lang['close'] . '</option> |
| 349 | 349 | </select> |
| 350 | 350 | </div>' . |
| 351 | - ($addnew ? ' |
|
| 351 | + ($addnew ? ' |
|
| 352 | 352 | <a id="Button6" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.duplicate();"> |
| 353 | 353 | <i class="' . $_style["actions_duplicate"] . '"></i><span>' . $_lang['duplicate'] . '</span> |
| 354 | 354 | </a> |
@@ -364,7 +364,7 @@ discard block |
||
| 364 | 364 | </a> |
| 365 | 365 | </div> |
| 366 | 366 | </div>', |
| 367 | - 'user' => '<div id="actions"> |
|
| 367 | + 'user' => '<div id="actions"> |
|
| 368 | 368 | <div class="btn-group"> |
| 369 | 369 | <div class="btn-group"> |
| 370 | 370 | <a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.save();"> |
@@ -387,7 +387,7 @@ discard block |
||
| 387 | 387 | </a> |
| 388 | 388 | </div> |
| 389 | 389 | </div>', |
| 390 | - 'element' => '<div id="actions"> |
|
| 390 | + 'element' => '<div id="actions"> |
|
| 391 | 391 | <div class="btn-group"> |
| 392 | 392 | <div class="btn-group"> |
| 393 | 393 | <a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.save();"> |
@@ -420,21 +420,21 @@ discard block |
||
| 420 | 420 | ' : '') . ' |
| 421 | 421 | </div> |
| 422 | 422 | </div>', |
| 423 | - 'newmodule' => ($addnew ? '<div id="actions"> |
|
| 423 | + 'newmodule' => ($addnew ? '<div id="actions"> |
|
| 424 | 424 | <div class="btn-group"> |
| 425 | 425 | <a id="newModule" class="btn btn-secondary" href="javascript:;" onclick="actions.new();"> |
| 426 | 426 | <i class="' . $_style["actions_new"] . '"></i><span>' . $_lang['new_module'] . '</span> |
| 427 | 427 | </a> |
| 428 | 428 | </div> |
| 429 | 429 | </div>' : ''), |
| 430 | - 'close' => '<div id="actions"> |
|
| 430 | + 'close' => '<div id="actions"> |
|
| 431 | 431 | <div class="btn-group"> |
| 432 | 432 | <a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.close();"> |
| 433 | 433 | <i class="' . $_style["actions_close"] . '"></i><span>' . $_lang['close'] . '</span> |
| 434 | 434 | </a> |
| 435 | 435 | </div> |
| 436 | 436 | </div>', |
| 437 | - 'save' => '<div id="actions"> |
|
| 437 | + 'save' => '<div id="actions"> |
|
| 438 | 438 | <div class="btn-group"> |
| 439 | 439 | <a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.save();"> |
| 440 | 440 | <i class="' . $_style["actions_save"] . '"></i><span>' . $_lang['save'] . '</span> |
@@ -444,7 +444,7 @@ discard block |
||
| 444 | 444 | </a> |
| 445 | 445 | </div> |
| 446 | 446 | </div>', |
| 447 | - 'savedelete' => '<div id="actions"> |
|
| 447 | + 'savedelete' => '<div id="actions"> |
|
| 448 | 448 | <div class="btn-group"> |
| 449 | 449 | <a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.save();"> |
| 450 | 450 | <i class="' . $_style["actions_save"] . '"></i><span>' . $_lang['save'] . '</span> |
@@ -457,14 +457,14 @@ discard block |
||
| 457 | 457 | </a> |
| 458 | 458 | </div> |
| 459 | 459 | </div>', |
| 460 | - 'cancel' => '<div id="actions"> |
|
| 460 | + 'cancel' => '<div id="actions"> |
|
| 461 | 461 | <div class="btn-group"> |
| 462 | 462 | <a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();"> |
| 463 | 463 | <i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span> |
| 464 | 464 | </a> |
| 465 | 465 | </div> |
| 466 | 466 | </div>', |
| 467 | - 'canceldelete' => '<div id="actions"> |
|
| 467 | + 'canceldelete' => '<div id="actions"> |
|
| 468 | 468 | <div class="btn-group"> |
| 469 | 469 | <a id="Button3" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.delete();"> |
| 470 | 470 | <i class="' . $_style["actions_delete"] . '"></i><span>' . $_lang['delete'] . '</span> |
@@ -474,11 +474,11 @@ discard block |
||
| 474 | 474 | </a> |
| 475 | 475 | </div> |
| 476 | 476 | </div>', |
| 477 | - ), |
|
| 478 | - 'static' => array( |
|
| 479 | - 'document' => '<div id="actions"> |
|
| 477 | + ), |
|
| 478 | + 'static' => array( |
|
| 479 | + 'document' => '<div id="actions"> |
|
| 480 | 480 | <div class="btn-group">' . |
| 481 | - ($addnew ? ' |
|
| 481 | + ($addnew ? ' |
|
| 482 | 482 | <a class="btn btn-secondary" href="javascript:;" onclick="actions.new();"> |
| 483 | 483 | <i class="' . $_style["icons_new_document"] . '"></i><span>' . $_lang['create_resource_here'] . '</span> |
| 484 | 484 | </a> |
@@ -503,12 +503,12 @@ discard block |
||
| 503 | 503 | </a> |
| 504 | 504 | </div> |
| 505 | 505 | </div>', |
| 506 | - 'cancel' => '<div id="actions"> |
|
| 506 | + 'cancel' => '<div id="actions"> |
|
| 507 | 507 | <div class="btn-group"> |
| 508 | 508 | <a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();"> |
| 509 | 509 | <i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span> |
| 510 | 510 | </a> |
| 511 | 511 | </div> |
| 512 | 512 | </div>', |
| 513 | - ) |
|
| 513 | + ) |
|
| 514 | 514 | ); |
@@ -166,7 +166,7 @@ |
||
| 166 | 166 | $resp = _fetch_remote_file( $url, $request_headers ); |
| 167 | 167 | |
| 168 | 168 | if (isset($resp) and $resp) { |
| 169 | - if ($resp->status == '304' ) { |
|
| 169 | + if ($resp->status == '304' ) { |
|
| 170 | 170 | // we have the most current copy |
| 171 | 171 | if ( MAGPIE_DEBUG > 1) { |
| 172 | 172 | debug("Got 304 for $url"); |
@@ -1,30 +1,30 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | - /** |
|
| 4 | - * System Alert Message Queue Display file |
|
| 5 | - * Written By Raymond Irving, April, 2005 |
|
| 6 | - * |
|
| 7 | - * Used to display system alert messages inside the browser |
|
| 8 | - * |
|
| 9 | - */ |
|
| 3 | + /** |
|
| 4 | + * System Alert Message Queue Display file |
|
| 5 | + * Written By Raymond Irving, April, 2005 |
|
| 6 | + * |
|
| 7 | + * Used to display system alert messages inside the browser |
|
| 8 | + * |
|
| 9 | + */ |
|
| 10 | 10 | |
| 11 | - require_once(dirname(__FILE__).'/protect.inc.php'); |
|
| 11 | + require_once(dirname(__FILE__).'/protect.inc.php'); |
|
| 12 | 12 | |
| 13 | - $sysMsgs = ""; |
|
| 14 | - $limit = count($SystemAlertMsgQueque); |
|
| 15 | - for($i=0;$i<$limit;$i++) { |
|
| 16 | - $sysMsgs .= $SystemAlertMsgQueque[$i]."<hr sys/>"; |
|
| 17 | - } |
|
| 18 | - // reset message queque |
|
| 19 | - unset($_SESSION['SystemAlertMsgQueque']); |
|
| 20 | - $_SESSION['SystemAlertMsgQueque'] = array(); |
|
| 21 | - $SystemAlertMsgQueque = &$_SESSION['SystemAlertMsgQueque']; |
|
| 13 | + $sysMsgs = ""; |
|
| 14 | + $limit = count($SystemAlertMsgQueque); |
|
| 15 | + for($i=0;$i<$limit;$i++) { |
|
| 16 | + $sysMsgs .= $SystemAlertMsgQueque[$i]."<hr sys/>"; |
|
| 17 | + } |
|
| 18 | + // reset message queque |
|
| 19 | + unset($_SESSION['SystemAlertMsgQueque']); |
|
| 20 | + $_SESSION['SystemAlertMsgQueque'] = array(); |
|
| 21 | + $SystemAlertMsgQueque = &$_SESSION['SystemAlertMsgQueque']; |
|
| 22 | 22 | |
| 23 | - if($sysMsgs!="") { |
|
| 23 | + if($sysMsgs!="") { |
|
| 24 | 24 | ?> |
| 25 | 25 | |
| 26 | 26 | <?php // fetch the styles |
| 27 | - echo '<link rel="stylesheet" type="text/css" href="'.MODX_MANAGER_URL.'media/style/'.$manager_theme.'/style.css'.'" />'; |
|
| 27 | + echo '<link rel="stylesheet" type="text/css" href="'.MODX_MANAGER_URL.'media/style/'.$manager_theme.'/style.css'.'" />'; |
|
| 28 | 28 | ?> |
| 29 | 29 | <script type="text/javascript"> |
| 30 | 30 | // <![CDATA[ |
@@ -42,5 +42,5 @@ discard block |
||
| 42 | 42 | // ]]> |
| 43 | 43 | </script> |
| 44 | 44 | <?php |
| 45 | - } |
|
| 45 | + } |
|
| 46 | 46 | ?> |
| 47 | 47 | \ No newline at end of file |
@@ -3,7 +3,7 @@ discard block |
||
| 3 | 3 | |
| 4 | 4 | // show debug information |
| 5 | 5 | if(isset($enable_debug) && $enable_debug==true) { |
| 6 | - ?> |
|
| 6 | + ?> |
|
| 7 | 7 | <script language="javascript"> |
| 8 | 8 | //document.onload = removeDebug(); |
| 9 | 9 | |
@@ -33,8 +33,8 @@ discard block |
||
| 33 | 33 | } |
| 34 | 34 | </style> |
| 35 | 35 | <?php |
| 36 | - $mtime = microtime(); $mtime = explode(" ",$mtime); $mtime = $mtime[1] + $mtime[0]; $tend = $mtime; $totaltime = ($tend - $tstart); |
|
| 37 | - ?> |
|
| 36 | + $mtime = microtime(); $mtime = explode(" ",$mtime); $mtime = $mtime[1] + $mtime[0]; $tend = $mtime; $totaltime = ($tend - $tstart); |
|
| 37 | + ?> |
|
| 38 | 38 | <div class='debug' id='debug' name='debug' onClick="removeDebugDiv();"> |
| 39 | 39 | <table border="0" cellspacing="0" cellpadding="0"> |
| 40 | 40 | <tr> |
@@ -19,60 +19,60 @@ |
||
| 19 | 19 | </head><body> |
| 20 | 20 | "; |
| 21 | 21 | if($is_error) { |
| 22 | - $parsedMessageString .= "<h3 style='color:red;background:#e0e0e0;padding:2px;'> MODX Parse Error </h3> |
|
| 22 | + $parsedMessageString .= "<h3 style='color:red;background:#e0e0e0;padding:2px;'> MODX Parse Error </h3> |
|
| 23 | 23 | <table border='0' cellpadding='1' cellspacing='0'> |
| 24 | 24 | <tr><td colspan='3'>MODX encountered the following error while attempting to parse the requested resource:</td></tr> |
| 25 | 25 | <tr><td colspan='3'><b style='color:red;'>« $msg »</b></td></tr>"; |
| 26 | 26 | } else { |
| 27 | - $parsedMessageString .= "<h3 style='color:#003399; background:#eeeeee;padding:2px;'> MODX Debug/ stop message </h3> |
|
| 27 | + $parsedMessageString .= "<h3 style='color:#003399; background:#eeeeee;padding:2px;'> MODX Debug/ stop message </h3> |
|
| 28 | 28 | <table border='0' cellpadding='1' cellspacing='0'> |
| 29 | 29 | <tr><td colspan='3'>The MODX parser recieved the following debug/ stop message:</td></tr> |
| 30 | 30 | <tr><td colspan='3'><b style='color:#003399;'>« $msg »</b></td></tr>"; |
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | if(!empty($query)) { |
| 34 | - $parsedMessageString .= "<tr><td colspan='3'><hr size='1' width='98%' style='color:#e0e0e0'/><b style='color:#999;font-size: 9px;border-left:1px solid #c0c0c0; margin-left:10px;'> SQL: <span id='sqlHolder'>$query</span></b><hr size='1' width='98%' style='color:#e0e0e0'/> |
|
| 34 | + $parsedMessageString .= "<tr><td colspan='3'><hr size='1' width='98%' style='color:#e0e0e0'/><b style='color:#999;font-size: 9px;border-left:1px solid #c0c0c0; margin-left:10px;'> SQL: <span id='sqlHolder'>$query</span></b><hr size='1' width='98%' style='color:#e0e0e0'/> |
|
| 35 | 35 | <a href='javascript:copyToClip();' style='color:#821517;font-size: 9px; text-decoration: none'>[Copy SQL to ClipBoard]</a><textarea id='holdtext' style='display:none;'></textarea></td></tr>"; |
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | if($text!='') { |
| 39 | 39 | |
| 40 | - $errortype = array ( |
|
| 41 | - E_ERROR => "Error", |
|
| 42 | - E_WARNING => "Warning", |
|
| 43 | - E_PARSE => "Parsing Error", |
|
| 44 | - E_NOTICE => "Notice", |
|
| 45 | - E_CORE_ERROR => "Core Error", |
|
| 46 | - E_CORE_WARNING => "Core Warning", |
|
| 47 | - E_COMPILE_ERROR => "Compile Error", |
|
| 48 | - E_COMPILE_WARNING => "Compile Warning", |
|
| 49 | - E_USER_ERROR => "User Error", |
|
| 50 | - E_USER_WARNING => "User Warning", |
|
| 51 | - E_USER_NOTICE => "User Notice", |
|
| 52 | - ); |
|
| 40 | + $errortype = array ( |
|
| 41 | + E_ERROR => "Error", |
|
| 42 | + E_WARNING => "Warning", |
|
| 43 | + E_PARSE => "Parsing Error", |
|
| 44 | + E_NOTICE => "Notice", |
|
| 45 | + E_CORE_ERROR => "Core Error", |
|
| 46 | + E_CORE_WARNING => "Core Warning", |
|
| 47 | + E_COMPILE_ERROR => "Compile Error", |
|
| 48 | + E_COMPILE_WARNING => "Compile Warning", |
|
| 49 | + E_USER_ERROR => "User Error", |
|
| 50 | + E_USER_WARNING => "User Warning", |
|
| 51 | + E_USER_NOTICE => "User Notice", |
|
| 52 | + ); |
|
| 53 | 53 | |
| 54 | - $parsedMessageString .= "<tr><td> </td></tr><tr><td colspan='3'><b>PHP error debug</b></td></tr>"; |
|
| 54 | + $parsedMessageString .= "<tr><td> </td></tr><tr><td colspan='3'><b>PHP error debug</b></td></tr>"; |
|
| 55 | 55 | |
| 56 | - $parsedMessageString .= "<tr><td valign='top'> Error: </td>"; |
|
| 57 | - $parsedMessageString .= "<td colspan='2'>$text</td><td> </td>"; |
|
| 58 | - $parsedMessageString .= "</tr>"; |
|
| 56 | + $parsedMessageString .= "<tr><td valign='top'> Error: </td>"; |
|
| 57 | + $parsedMessageString .= "<td colspan='2'>$text</td><td> </td>"; |
|
| 58 | + $parsedMessageString .= "</tr>"; |
|
| 59 | 59 | |
| 60 | - $parsedMessageString .= "<tr><td valign='top'> Error type/ Nr.: </td>"; |
|
| 61 | - $parsedMessageString .= "<td colspan='2'>".$errortype[$nr]." - $nr</b></td><td> </td>"; |
|
| 62 | - $parsedMessageString .= "</tr>"; |
|
| 60 | + $parsedMessageString .= "<tr><td valign='top'> Error type/ Nr.: </td>"; |
|
| 61 | + $parsedMessageString .= "<td colspan='2'>".$errortype[$nr]." - $nr</b></td><td> </td>"; |
|
| 62 | + $parsedMessageString .= "</tr>"; |
|
| 63 | 63 | |
| 64 | - $parsedMessageString .= "<tr><td> File: </td>"; |
|
| 65 | - $parsedMessageString .= "<td colspan='2'>$file</td><td> </td>"; |
|
| 66 | - $parsedMessageString .= "</tr>"; |
|
| 64 | + $parsedMessageString .= "<tr><td> File: </td>"; |
|
| 65 | + $parsedMessageString .= "<td colspan='2'>$file</td><td> </td>"; |
|
| 66 | + $parsedMessageString .= "</tr>"; |
|
| 67 | 67 | |
| 68 | - $parsedMessageString .= "<tr><td> Line: </td>"; |
|
| 69 | - $parsedMessageString .= "<td colspan='2'>$line</td><td> </td>"; |
|
| 70 | - $parsedMessageString .= "</tr>"; |
|
| 71 | - if($source!='') { |
|
| 72 | - $parsedMessageString .= "<tr><td valign='top'> Line $line source: </td>"; |
|
| 73 | - $parsedMessageString .= "<td colspan='2'>$source</td><td> </td>"; |
|
| 74 | - $parsedMessageString .= "</tr>"; |
|
| 75 | - } |
|
| 68 | + $parsedMessageString .= "<tr><td> Line: </td>"; |
|
| 69 | + $parsedMessageString .= "<td colspan='2'>$line</td><td> </td>"; |
|
| 70 | + $parsedMessageString .= "</tr>"; |
|
| 71 | + if($source!='') { |
|
| 72 | + $parsedMessageString .= "<tr><td valign='top'> Line $line source: </td>"; |
|
| 73 | + $parsedMessageString .= "<td colspan='2'>$source</td><td> </td>"; |
|
| 74 | + $parsedMessageString .= "</tr>"; |
|
| 75 | + } |
|
| 76 | 76 | } |
| 77 | 77 | |
| 78 | 78 | $parsedMessageString .= "<tr><td> </td></tr><tr><td colspan='3'><b>Parser timing</b></td></tr>"; |
@@ -598,7 +598,7 @@ discard block |
||
| 598 | 598 | else $opt = true; |
| 599 | 599 | } |
| 600 | 600 | elseif(isset($modx->config['mce_element_format'])&&$modx->config['mce_element_format']==='html') |
| 601 | - $opt = false; |
|
| 601 | + $opt = false; |
|
| 602 | 602 | else $opt = true; |
| 603 | 603 | return nl2br($value,$opt); |
| 604 | 604 | case 'ltrim': |
@@ -1022,7 +1022,7 @@ discard block |
||
| 1022 | 1022 | { |
| 1023 | 1023 | $bt = $content; |
| 1024 | 1024 | if(strpos($content,'[*')!==false && $modx->documentIdentifier) |
| 1025 | - $content = $modx->mergeDocumentContent($content); |
|
| 1025 | + $content = $modx->mergeDocumentContent($content); |
|
| 1026 | 1026 | if(strpos($content,'[(')!==false) $content = $modx->mergeSettingsContent($content); |
| 1027 | 1027 | if(strpos($content,'{{')!==false) $content = $modx->mergeChunkContent($content); |
| 1028 | 1028 | if(strpos($content,'[!')!==false) $content = str_replace(array('[!','!]'),array('[[',']]'),$content); |
@@ -248,9 +248,9 @@ |
||
| 248 | 248 | echo '<span class="notok">' . $_lang['failed'] . '</span></b>' . $_lang['table_prefix_not_exist'] . '</p>'; |
| 249 | 249 | $errors++; |
| 250 | 250 | echo '<p>' . $_lang['table_prefix_not_exist_note'] . '</p>'; |
| 251 | - } else { |
|
| 251 | + } else { |
|
| 252 | 252 | echo '<span class="ok">' . $_lang['ok'] . '</span></p>'; |
| 253 | - } |
|
| 253 | + } |
|
| 254 | 254 | } |
| 255 | 255 | |
| 256 | 256 | // check mysql version |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | |
| 23 | 23 | // load template |
| 24 | 24 | if(!isset($modx->config['manager_lockout_tpl']) || empty($modx->config['manager_lockout_tpl'])) { |
| 25 | - $modx->config['manager_lockout_tpl'] = MODX_MANAGER_PATH . 'media/style/common/manager.lockout.tpl'; |
|
| 25 | + $modx->config['manager_lockout_tpl'] = MODX_MANAGER_PATH . 'media/style/common/manager.lockout.tpl'; |
|
| 26 | 26 | } |
| 27 | 27 | |
| 28 | 28 | $target = $modx->config['manager_lockout_tpl']; |
@@ -30,40 +30,40 @@ discard block |
||
| 30 | 30 | $target = $modx->mergeSettingsContent($target); |
| 31 | 31 | |
| 32 | 32 | if(substr($target,0,1)==='@') { |
| 33 | - if(substr($target,0,6)==='@CHUNK') { |
|
| 34 | - $target = trim(substr($target,7)); |
|
| 35 | - $lockout_tpl = $modx->getChunk($target); |
|
| 36 | - } |
|
| 37 | - elseif(substr($target,0,5)==='@FILE') { |
|
| 38 | - $target = trim(substr($target,6)); |
|
| 39 | - $lockout_tpl = file_get_contents($target); |
|
| 40 | - } |
|
| 41 | - } else { |
|
| 42 | - $chunk = $modx->getChunk($target); |
|
| 43 | - if($chunk!==false && !empty($chunk)) { |
|
| 44 | - $lockout_tpl = $chunk; |
|
| 45 | - } |
|
| 46 | - elseif(is_file(MODX_BASE_PATH . $target)) { |
|
| 47 | - $target = MODX_BASE_PATH . $target; |
|
| 48 | - $lockout_tpl = file_get_contents($target); |
|
| 49 | - } |
|
| 50 | - elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl')) { |
|
| 51 | - $target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl'; |
|
| 52 | - $lockout_tpl = file_get_contents($target); |
|
| 53 | - } |
|
| 54 | - elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl')) { |
|
| 55 | - $target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl'; |
|
| 56 | - $login_tpl = file_get_contents($target); |
|
| 57 | - } |
|
| 58 | - elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html')) { // ClipperCMS compatible |
|
| 59 | - $target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html'; |
|
| 60 | - $lockout_tpl = file_get_contents($target); |
|
| 61 | - } |
|
| 62 | - else { |
|
| 63 | - $target = MODX_MANAGER_PATH . 'media/style/common/manager.lockout.tpl'; |
|
| 64 | - $lockout_tpl = file_get_contents($target); |
|
| 65 | - } |
|
| 66 | - } |
|
| 33 | + if(substr($target,0,6)==='@CHUNK') { |
|
| 34 | + $target = trim(substr($target,7)); |
|
| 35 | + $lockout_tpl = $modx->getChunk($target); |
|
| 36 | + } |
|
| 37 | + elseif(substr($target,0,5)==='@FILE') { |
|
| 38 | + $target = trim(substr($target,6)); |
|
| 39 | + $lockout_tpl = file_get_contents($target); |
|
| 40 | + } |
|
| 41 | + } else { |
|
| 42 | + $chunk = $modx->getChunk($target); |
|
| 43 | + if($chunk!==false && !empty($chunk)) { |
|
| 44 | + $lockout_tpl = $chunk; |
|
| 45 | + } |
|
| 46 | + elseif(is_file(MODX_BASE_PATH . $target)) { |
|
| 47 | + $target = MODX_BASE_PATH . $target; |
|
| 48 | + $lockout_tpl = file_get_contents($target); |
|
| 49 | + } |
|
| 50 | + elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl')) { |
|
| 51 | + $target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/manager.lockout.tpl'; |
|
| 52 | + $lockout_tpl = file_get_contents($target); |
|
| 53 | + } |
|
| 54 | + elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl')) { |
|
| 55 | + $target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/templates/actions/manager.lockout.tpl'; |
|
| 56 | + $login_tpl = file_get_contents($target); |
|
| 57 | + } |
|
| 58 | + elseif(is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html')) { // ClipperCMS compatible |
|
| 59 | + $target = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/manager.lockout.html'; |
|
| 60 | + $lockout_tpl = file_get_contents($target); |
|
| 61 | + } |
|
| 62 | + else { |
|
| 63 | + $target = MODX_MANAGER_PATH . 'media/style/common/manager.lockout.tpl'; |
|
| 64 | + $lockout_tpl = file_get_contents($target); |
|
| 65 | + } |
|
| 66 | + } |
|
| 67 | 67 | |
| 68 | 68 | // merge placeholders |
| 69 | 69 | $lockout_tpl = $modx->mergePlaceholderContent($lockout_tpl); |