@@ -745,7 +745,7 @@ discard block |
||
| 745 | 745 | if(!function_exists('removeLastPath')) { |
| 746 | 746 | /** |
| 747 | 747 | * @param string $string |
| 748 | - * @return bool|string |
|
| 748 | + * @return string|false |
|
| 749 | 749 | */ |
| 750 | 750 | function removeLastPath($string) |
| 751 | 751 | { |
@@ -763,7 +763,7 @@ discard block |
||
| 763 | 763 | if(!function_exists('getExtension')) { |
| 764 | 764 | /** |
| 765 | 765 | * @param string $string |
| 766 | - * @return bool|string |
|
| 766 | + * @return string|false |
|
| 767 | 767 | */ |
| 768 | 768 | function getExtension($string) |
| 769 | 769 | { |
@@ -357,7 +357,7 @@ |
||
| 357 | 357 | if(!function_exists('getFileContent')) { |
| 358 | 358 | /** |
| 359 | 359 | * @param string $filepath |
| 360 | - * @return bool|string |
|
| 360 | + * @return null|string |
|
| 361 | 361 | */ |
| 362 | 362 | function getFileContent($filepath) |
| 363 | 363 | { |
@@ -1,17 +1,17 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
| 3 | - die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly."); |
|
| 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('import_static')) { |
| 6 | - $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
| 6 | + $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
| 7 | 7 | } |
| 8 | 8 | |
| 9 | 9 | // Files to upload |
| 10 | 10 | $allowedfiles = array( |
| 11 | - 'html', |
|
| 12 | - 'htm', |
|
| 13 | - 'shtml', |
|
| 14 | - 'xml' |
|
| 11 | + 'html', |
|
| 12 | + 'htm', |
|
| 13 | + 'shtml', |
|
| 14 | + 'xml' |
|
| 15 | 15 | ); |
| 16 | 16 | ?> |
| 17 | 17 | <script language="javascript"> |
@@ -43,9 +43,9 @@ discard block |
||
| 43 | 43 | <div class="tab-page"> |
| 44 | 44 | <div class="container container-body"> |
| 45 | 45 | <?php |
| 46 | - if(!isset($_POST['import'])) { |
|
| 47 | - echo "<div class=\"element-edit-message\">" . $_lang['import_site_message'] . "</div>"; |
|
| 48 | - ?> |
|
| 46 | + if(!isset($_POST['import'])) { |
|
| 47 | + echo "<div class=\"element-edit-message\">" . $_lang['import_site_message'] . "</div>"; |
|
| 48 | + ?> |
|
| 49 | 49 | <form action="index.php" method="post" name="importFrm"> |
| 50 | 50 | <input type="hidden" name="import" value="import" /> |
| 51 | 51 | <input type="hidden" name="a" value="95" /> |
@@ -85,18 +85,18 @@ discard block |
||
| 85 | 85 | <a href="javascript:;" class="btn btn-primary" onclick="window.importFrm.submit();"><i class="<?= $_style["actions_save"] ?>"></i> <?= $_lang["import_site_start"] ?></a> |
| 86 | 86 | </form> |
| 87 | 87 | <?php |
| 88 | - } else { |
|
| 89 | - run(); |
|
| 90 | - $modx->clearCache('full'); |
|
| 91 | - ?> |
|
| 88 | + } else { |
|
| 89 | + run(); |
|
| 90 | + $modx->clearCache('full'); |
|
| 91 | + ?> |
|
| 92 | 92 | <a href="javascript:;" class="btn btn-primary" onclick="window.location.href='index.php?a=2';"><i class="<?= $_style["actions_close"] ?>"></i> <?= $_lang["close"] ?></a> |
| 93 | 93 | <script type="text/javascript"> |
| 94 | 94 | top.mainMenu.reloadtree(); |
| 95 | 95 | parent.tree.ca = 'open'; |
| 96 | 96 | </script> |
| 97 | 97 | <?php |
| 98 | - } |
|
| 99 | - ?> |
|
| 98 | + } |
|
| 99 | + ?> |
|
| 100 | 100 | </div> |
| 101 | 101 | </div> |
| 102 | 102 | |
@@ -216,9 +216,9 @@ discard block |
||
| 216 | 216 | $field['menuindex'] = 1; |
| 217 | 217 | $find = false; |
| 218 | 218 | foreach (array( |
| 219 | - 'index.html', |
|
| 220 | - 'index.htm' |
|
| 221 | - ) as $filename) { |
|
| 219 | + 'index.html', |
|
| 220 | + 'index.htm' |
|
| 221 | + ) as $filename) { |
|
| 222 | 222 | $filepath = $filedir . $alias . '/' . $filename; |
| 223 | 223 | if ($find === false && file_exists($filepath)) { |
| 224 | 224 | $file = getFileContent($filepath); |
@@ -268,6 +268,7 @@ discard block |
||
| 268 | 268 | /** |
| 269 | 269 | * @name: delete |
| 270 | 270 | * |
| 271 | + * @param string $from |
|
| 271 | 272 | */ |
| 272 | 273 | public function delete($from, $where = '', $orderby = '', $limit = '') |
| 273 | 274 | { |
@@ -414,6 +415,9 @@ discard block |
||
| 414 | 415 | } |
| 415 | 416 | } |
| 416 | 417 | |
| 418 | + /** |
|
| 419 | + * @param string $table |
|
| 420 | + */ |
|
| 417 | 421 | public function save($fields, $table, $where = '') |
| 418 | 422 | { |
| 419 | 423 | |
@@ -444,6 +448,7 @@ discard block |
||
| 444 | 448 | /** |
| 445 | 449 | * @name: freeResult |
| 446 | 450 | * |
| 451 | + * @param mysqli_result $rs |
|
| 447 | 452 | */ |
| 448 | 453 | public function freeResult($rs) |
| 449 | 454 | { |
@@ -554,6 +559,7 @@ discard block |
||
| 554 | 559 | * @name: getColumn |
| 555 | 560 | * @desc: returns an array of the values found on colun $name |
| 556 | 561 | * @param: $dsq - dataset or query string |
| 562 | + * @param string $name |
|
| 557 | 563 | */ |
| 558 | 564 | public function getColumn($name, $dsq) |
| 559 | 565 | { |
@@ -720,6 +726,9 @@ discard block |
||
| 720 | 726 | return $result; |
| 721 | 727 | } |
| 722 | 728 | |
| 729 | + /** |
|
| 730 | + * @param string $table_name |
|
| 731 | + */ |
|
| 723 | 732 | public function optimize($table_name) |
| 724 | 733 | { |
| 725 | 734 | $rs = $this->query("OPTIMIZE TABLE {$table_name}"); |
@@ -730,6 +739,9 @@ discard block |
||
| 730 | 739 | return $rs; |
| 731 | 740 | } |
| 732 | 741 | |
| 742 | + /** |
|
| 743 | + * @param string $table_name |
|
| 744 | + */ |
|
| 733 | 745 | public function truncate($table_name) |
| 734 | 746 | { |
| 735 | 747 | $rs = $this->query("TRUNCATE {$table_name}"); |
@@ -172,7 +172,7 @@ discard block |
||
| 172 | 172 | * |
| 173 | 173 | * @param string $param |
| 174 | 174 | * @param array $tvsArray |
| 175 | - * @return mixed |
|
| 175 | + * @return string |
|
| 176 | 176 | */ |
| 177 | 177 | function parseTvValues($param, $tvsArray) |
| 178 | 178 | { |
@@ -566,7 +566,7 @@ discard block |
||
| 566 | 566 | /** |
| 567 | 567 | * returns an array if a delimiter is present. returns array is a recordset is present |
| 568 | 568 | * |
| 569 | - * @param $src |
|
| 569 | + * @param string $src |
|
| 570 | 570 | * @param string $delim |
| 571 | 571 | * @param string $type |
| 572 | 572 | * @param bool $columns |
@@ -1022,7 +1022,7 @@ discard block |
||
| 1022 | 1022 | |
| 1023 | 1023 | if (! function_exists('ParseIntputOptions')) { |
| 1024 | 1024 | /** |
| 1025 | - * @param string|array|mysqli_result $v |
|
| 1025 | + * @param string $v |
|
| 1026 | 1026 | * @return array |
| 1027 | 1027 | */ |
| 1028 | 1028 | function ParseIntputOptions($v) |
@@ -266,7 +266,7 @@ discard block |
||
| 266 | 266 | * MODX_MANAGER_PATH."includes/extenders/ex_{$extname}.inc.php" |
| 267 | 267 | * $extname - extension name in lowercase |
| 268 | 268 | * |
| 269 | - * @param $extname |
|
| 269 | + * @param string $extname |
|
| 270 | 270 | * @param bool $reload |
| 271 | 271 | * @return bool |
| 272 | 272 | */ |
@@ -309,7 +309,7 @@ discard block |
||
| 309 | 309 | * @param int $count_attempts |
| 310 | 310 | * @param string $type $type |
| 311 | 311 | * @param string $responseCode |
| 312 | - * @return bool|null |
|
| 312 | + * @return false|null |
|
| 313 | 313 | * @global string $base_url |
| 314 | 314 | * @global string $site_url |
| 315 | 315 | */ |
@@ -1010,7 +1010,7 @@ discard block |
||
| 1010 | 1010 | } |
| 1011 | 1011 | |
| 1012 | 1012 | /** |
| 1013 | - * @param $contents |
|
| 1013 | + * @param string $contents |
|
| 1014 | 1014 | * @return mixed |
| 1015 | 1015 | */ |
| 1016 | 1016 | public function RecoveryEscapedTags($contents) |
@@ -1034,7 +1034,7 @@ discard block |
||
| 1034 | 1034 | } |
| 1035 | 1035 | |
| 1036 | 1036 | /** |
| 1037 | - * @param $tstart |
|
| 1037 | + * @param double $tstart |
|
| 1038 | 1038 | * @return array |
| 1039 | 1039 | */ |
| 1040 | 1040 | public function getTimerStats($tstart) |
@@ -1800,7 +1800,7 @@ discard block |
||
| 1800 | 1800 | |
| 1801 | 1801 | /** |
| 1802 | 1802 | * Remove Comment-Tags from output like <!--@- Comment -@--> |
| 1803 | - * @param $content |
|
| 1803 | + * @param string $content |
|
| 1804 | 1804 | * @param string $left |
| 1805 | 1805 | * @param string $right |
| 1806 | 1806 | * @return mixed |
@@ -1973,7 +1973,7 @@ discard block |
||
| 1973 | 1973 | /** |
| 1974 | 1974 | * Run snippets as per the tags in $documentSource and replace the tags with the returned values. |
| 1975 | 1975 | * |
| 1976 | - * @param $content |
|
| 1976 | + * @param string $content |
|
| 1977 | 1977 | * @return string |
| 1978 | 1978 | * @internal param string $documentSource |
| 1979 | 1979 | */ |
@@ -3008,7 +3008,7 @@ discard block |
||
| 3008 | 3008 | |
| 3009 | 3009 | /** |
| 3010 | 3010 | * @param $templateID |
| 3011 | - * @return mixed |
|
| 3011 | + * @return string |
|
| 3012 | 3012 | */ |
| 3013 | 3013 | public function _getTemplateCodeFromDB($templateID) |
| 3014 | 3014 | { |
@@ -3051,7 +3051,7 @@ discard block |
||
| 3051 | 3051 | /** |
| 3052 | 3052 | * @param $id |
| 3053 | 3053 | * @param int $top |
| 3054 | - * @return mixed |
|
| 3054 | + * @return string |
|
| 3055 | 3055 | */ |
| 3056 | 3056 | public function getUltimateParentId($id, $top = 0) |
| 3057 | 3057 | { |
@@ -3391,7 +3391,7 @@ discard block |
||
| 3391 | 3391 | * |
| 3392 | 3392 | * @param int $type Types: 1=template, 2=tv, 3=chunk, 4=snippet, 5=plugin, 6=module, 7=resource, 8=role |
| 3393 | 3393 | * @param int $id Element- / Resource-id |
| 3394 | - * @return bool |
|
| 3394 | + * @return false|null |
|
| 3395 | 3395 | */ |
| 3396 | 3396 | public function lockElement($type, $id) |
| 3397 | 3397 | { |
@@ -3413,7 +3413,7 @@ discard block |
||
| 3413 | 3413 | * @param int $type Types: 1=template, 2=tv, 3=chunk, 4=snippet, 5=plugin, 6=module, 7=resource, 8=role |
| 3414 | 3414 | * @param int $id Element- / Resource-id |
| 3415 | 3415 | * @param bool $includeAllUsers true = Deletes not only own user-locks |
| 3416 | - * @return bool |
|
| 3416 | + * @return false|null |
|
| 3417 | 3417 | */ |
| 3418 | 3418 | public function unlockElement($type, $id, $includeAllUsers = false) |
| 3419 | 3419 | { |
@@ -3927,7 +3927,7 @@ discard block |
||
| 3927 | 3927 | * Default: 1 |
| 3928 | 3928 | * @param string $fields List of fields |
| 3929 | 3929 | * Default: id, pagetitle, description, alias |
| 3930 | - * @return boolean|array |
|
| 3930 | + * @return string |
|
| 3931 | 3931 | */ |
| 3932 | 3932 | public function getPageInfo($pageid = -1, $active = 1, $fields = 'id, pagetitle, description, alias') |
| 3933 | 3933 | { |
@@ -4019,7 +4019,7 @@ discard block |
||
| 4019 | 4019 | * |
| 4020 | 4020 | * @param string $type |
| 4021 | 4021 | * @param bool $report |
| 4022 | - * @return bool |
|
| 4022 | + * @return boolean|null |
|
| 4023 | 4023 | */ |
| 4024 | 4024 | public function clearCache($type = '', $report = false) |
| 4025 | 4025 | { |
@@ -4385,7 +4385,7 @@ discard block |
||
| 4385 | 4385 | * - Placeholders prefix. Default: '{'. |
| 4386 | 4386 | * @param string $suffix {string} |
| 4387 | 4387 | * - Placeholders suffix. Default: '}'. |
| 4388 | - * @return bool|mixed|string {string; false} - Parsed chunk or false if $chunkArr is not array. |
|
| 4388 | + * @return false|string {string; false} - Parsed chunk or false if $chunkArr is not array. |
|
| 4389 | 4389 | * - Parsed chunk or false if $chunkArr is not array. |
| 4390 | 4390 | */ |
| 4391 | 4391 | public function parseChunk($chunkName, $chunkArr, $prefix = '{', $suffix = '}') |
@@ -5357,7 +5357,7 @@ discard block |
||
| 5357 | 5357 | * Remove event listener - only for use within the current execution cycle |
| 5358 | 5358 | * |
| 5359 | 5359 | * @param string $evtName |
| 5360 | - * @return boolean |
|
| 5360 | + * @return false|null |
|
| 5361 | 5361 | */ |
| 5362 | 5362 | public function removeEventListener($evtName) |
| 5363 | 5363 | { |
@@ -5381,7 +5381,7 @@ discard block |
||
| 5381 | 5381 | * |
| 5382 | 5382 | * @param string $evtName |
| 5383 | 5383 | * @param array $extParams Parameters available to plugins. Each array key will be the PHP variable name, and the array value will be the variable value. |
| 5384 | - * @return boolean|array |
|
| 5384 | + * @return false|null |
|
| 5385 | 5385 | */ |
| 5386 | 5386 | public function invokeEvent($evtName, $extParams = array()) |
| 5387 | 5387 | { |
@@ -5976,7 +5976,7 @@ discard block |
||
| 5976 | 5976 | |
| 5977 | 5977 | /** |
| 5978 | 5978 | * @param string $str |
| 5979 | - * @return bool|mixed|string |
|
| 5979 | + * @return string |
|
| 5980 | 5980 | */ |
| 5981 | 5981 | public function atBindFileContent($str = '') |
| 5982 | 5982 | { |
@@ -6027,8 +6027,8 @@ discard block |
||
| 6027 | 6027 | } |
| 6028 | 6028 | |
| 6029 | 6029 | /** |
| 6030 | - * @param $str |
|
| 6031 | - * @return bool|string |
|
| 6030 | + * @param string $str |
|
| 6031 | + * @return false|string |
|
| 6032 | 6032 | */ |
| 6033 | 6033 | public function getExtFromFilename($str) |
| 6034 | 6034 | { |
@@ -6056,7 +6056,7 @@ discard block |
||
| 6056 | 6056 | * @param string $text Error message |
| 6057 | 6057 | * @param string $file File where the error was detected |
| 6058 | 6058 | * @param string $line Line number within $file |
| 6059 | - * @return boolean |
|
| 6059 | + * @return boolean|null |
|
| 6060 | 6060 | */ |
| 6061 | 6061 | public function phpError($nr, $text, $file, $line) |
| 6062 | 6062 | { |
@@ -6108,7 +6108,7 @@ discard block |
||
| 6108 | 6108 | * @param string $text |
| 6109 | 6109 | * @param string $line |
| 6110 | 6110 | * @param string $output |
| 6111 | - * @return bool |
|
| 6111 | + * @return null|boolean |
|
| 6112 | 6112 | */ |
| 6113 | 6113 | public function messageQuit($msg = 'unspecified error', $query = '', $is_error = true, $nr = '', $file = '', $source = '', $text = '', $line = '', $output = '') |
| 6114 | 6114 | { |
@@ -6523,7 +6523,7 @@ discard block |
||
| 6523 | 6523 | |
| 6524 | 6524 | /** |
| 6525 | 6525 | * @param string $str |
| 6526 | - * @return bool|mixed|string |
|
| 6526 | + * @return string |
|
| 6527 | 6527 | */ |
| 6528 | 6528 | public function atBindInclude($str = '') |
| 6529 | 6529 | { |
@@ -6574,7 +6574,7 @@ discard block |
||
| 6574 | 6574 | * @param $str |
| 6575 | 6575 | * @param int $flags |
| 6576 | 6576 | * @param string $encode |
| 6577 | - * @return mixed |
|
| 6577 | + * @return string |
|
| 6578 | 6578 | */ |
| 6579 | 6579 | public function htmlspecialchars($str, $flags = ENT_COMPAT, $encode = '') |
| 6580 | 6580 | { |
@@ -6583,7 +6583,7 @@ discard block |
||
| 6583 | 6583 | } |
| 6584 | 6584 | |
| 6585 | 6585 | /** |
| 6586 | - * @param $string |
|
| 6586 | + * @param string $string |
|
| 6587 | 6587 | * @param bool $returnData |
| 6588 | 6588 | * @return bool|mixed |
| 6589 | 6589 | */ |
@@ -63,7 +63,7 @@ |
||
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | /** |
| 66 | - * @return mixed |
|
| 66 | + * @return string |
|
| 67 | 67 | */ |
| 68 | 68 | public function getOutput() |
| 69 | 69 | { |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
| 3 | - die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly."); |
|
| 3 | + die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly."); |
|
| 4 | 4 | } |
| 5 | 5 | |
| 6 | 6 | /********************/ |
@@ -12,29 +12,29 @@ discard block |
||
| 12 | 12 | |
| 13 | 13 | // check permissions |
| 14 | 14 | switch($modx->manager->action) { |
| 15 | - case 27: |
|
| 16 | - if(!$modx->hasPermission('edit_document')) { |
|
| 17 | - $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
| 18 | - } |
|
| 19 | - break; |
|
| 20 | - case 85: |
|
| 21 | - case 72: |
|
| 22 | - case 4: |
|
| 23 | - if(!$modx->hasPermission('new_document')) { |
|
| 24 | - $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
| 25 | - } elseif(isset($_REQUEST['pid']) && $_REQUEST['pid'] != '0') { |
|
| 26 | - // check user has permissions for parent |
|
| 27 | - $udperms = new EvolutionCMS\Legacy\Permissions(); |
|
| 28 | - $udperms->user = $modx->getLoginUserID(); |
|
| 29 | - $udperms->document = empty($_REQUEST['pid']) ? 0 : $_REQUEST['pid']; |
|
| 30 | - $udperms->role = $_SESSION['mgrRole']; |
|
| 31 | - if(!$udperms->checkPermissions()) { |
|
| 32 | - $modx->webAlertAndQuit($_lang["access_permission_denied"]); |
|
| 33 | - } |
|
| 34 | - } |
|
| 35 | - break; |
|
| 36 | - default: |
|
| 37 | - $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
| 15 | + case 27: |
|
| 16 | + if(!$modx->hasPermission('edit_document')) { |
|
| 17 | + $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
| 18 | + } |
|
| 19 | + break; |
|
| 20 | + case 85: |
|
| 21 | + case 72: |
|
| 22 | + case 4: |
|
| 23 | + if(!$modx->hasPermission('new_document')) { |
|
| 24 | + $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
| 25 | + } elseif(isset($_REQUEST['pid']) && $_REQUEST['pid'] != '0') { |
|
| 26 | + // check user has permissions for parent |
|
| 27 | + $udperms = new EvolutionCMS\Legacy\Permissions(); |
|
| 28 | + $udperms->user = $modx->getLoginUserID(); |
|
| 29 | + $udperms->document = empty($_REQUEST['pid']) ? 0 : $_REQUEST['pid']; |
|
| 30 | + $udperms->role = $_SESSION['mgrRole']; |
|
| 31 | + if(!$udperms->checkPermissions()) { |
|
| 32 | + $modx->webAlertAndQuit($_lang["access_permission_denied"]); |
|
| 33 | + } |
|
| 34 | + } |
|
| 35 | + break; |
|
| 36 | + default: |
|
| 37 | + $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | $id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0; |
@@ -53,21 +53,21 @@ discard block |
||
| 53 | 53 | $tbl_site_tmplvars = $modx->getFullTableName('site_tmplvars'); |
| 54 | 54 | |
| 55 | 55 | if($modx->manager->action == 27) { |
| 56 | - //editing an existing document |
|
| 57 | - // check permissions on the document |
|
| 58 | - $udperms = new EvolutionCMS\Legacy\Permissions(); |
|
| 59 | - $udperms->user = $modx->getLoginUserID(); |
|
| 60 | - $udperms->document = $id; |
|
| 61 | - $udperms->role = $_SESSION['mgrRole']; |
|
| 62 | - |
|
| 63 | - if(!$udperms->checkPermissions()) { |
|
| 64 | - $modx->webAlertAndQuit($_lang["access_permission_denied"]); |
|
| 65 | - } |
|
| 56 | + //editing an existing document |
|
| 57 | + // check permissions on the document |
|
| 58 | + $udperms = new EvolutionCMS\Legacy\Permissions(); |
|
| 59 | + $udperms->user = $modx->getLoginUserID(); |
|
| 60 | + $udperms->document = $id; |
|
| 61 | + $udperms->role = $_SESSION['mgrRole']; |
|
| 62 | + |
|
| 63 | + if(!$udperms->checkPermissions()) { |
|
| 64 | + $modx->webAlertAndQuit($_lang["access_permission_denied"]); |
|
| 65 | + } |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | // check to see if resource isn't locked |
| 69 | 69 | if($lockedEl = $modx->elementIsLocked(7, $id)) { |
| 70 | - $modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['resource'])); |
|
| 70 | + $modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['resource'])); |
|
| 71 | 71 | } |
| 72 | 72 | // end check for lock |
| 73 | 73 | |
@@ -76,74 +76,74 @@ discard block |
||
| 76 | 76 | |
| 77 | 77 | // get document groups for current user |
| 78 | 78 | if($_SESSION['mgrDocgroups']) { |
| 79 | - $docgrp = implode(',', $_SESSION['mgrDocgroups']); |
|
| 79 | + $docgrp = implode(',', $_SESSION['mgrDocgroups']); |
|
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | if(!empty ($id)) { |
| 83 | - $access = sprintf("1='%s' OR sc.privatemgr=0", $_SESSION['mgrRole']); |
|
| 84 | - if($docgrp) { |
|
| 85 | - $access .= " OR dg.document_group IN ({$docgrp})"; |
|
| 86 | - } |
|
| 87 | - $rs = $modx->db->select('sc.*', "{$tbl_site_content} AS sc LEFT JOIN {$tbl_document_groups} AS dg ON dg.document=sc.id", "sc.id='{$id}' AND ({$access})"); |
|
| 88 | - $content = array(); |
|
| 89 | - $content = $modx->db->getRow($rs); |
|
| 90 | - $modx->documentObject = &$content; |
|
| 91 | - if(!$content) { |
|
| 92 | - $modx->webAlertAndQuit($_lang["access_permission_denied"]); |
|
| 93 | - } |
|
| 94 | - $_SESSION['itemname'] = $content['pagetitle']; |
|
| 83 | + $access = sprintf("1='%s' OR sc.privatemgr=0", $_SESSION['mgrRole']); |
|
| 84 | + if($docgrp) { |
|
| 85 | + $access .= " OR dg.document_group IN ({$docgrp})"; |
|
| 86 | + } |
|
| 87 | + $rs = $modx->db->select('sc.*', "{$tbl_site_content} AS sc LEFT JOIN {$tbl_document_groups} AS dg ON dg.document=sc.id", "sc.id='{$id}' AND ({$access})"); |
|
| 88 | + $content = array(); |
|
| 89 | + $content = $modx->db->getRow($rs); |
|
| 90 | + $modx->documentObject = &$content; |
|
| 91 | + if(!$content) { |
|
| 92 | + $modx->webAlertAndQuit($_lang["access_permission_denied"]); |
|
| 93 | + } |
|
| 94 | + $_SESSION['itemname'] = $content['pagetitle']; |
|
| 95 | 95 | } else { |
| 96 | - $content = array(); |
|
| 96 | + $content = array(); |
|
| 97 | 97 | |
| 98 | - if(isset($_REQUEST['newtemplate'])) { |
|
| 99 | - $content['template'] = $_REQUEST['newtemplate']; |
|
| 100 | - } else { |
|
| 101 | - $content['template'] = getDefaultTemplate(); |
|
| 102 | - } |
|
| 98 | + if(isset($_REQUEST['newtemplate'])) { |
|
| 99 | + $content['template'] = $_REQUEST['newtemplate']; |
|
| 100 | + } else { |
|
| 101 | + $content['template'] = getDefaultTemplate(); |
|
| 102 | + } |
|
| 103 | 103 | |
| 104 | - $_SESSION['itemname'] = $_lang["new_resource"]; |
|
| 104 | + $_SESSION['itemname'] = $_lang["new_resource"]; |
|
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | // restore saved form |
| 108 | 108 | $formRestored = $modx->manager->loadFormValues(); |
| 109 | 109 | if(isset($_REQUEST['newtemplate'])) { |
| 110 | - $formRestored = true; |
|
| 110 | + $formRestored = true; |
|
| 111 | 111 | } |
| 112 | 112 | |
| 113 | 113 | // retain form values if template was changed |
| 114 | 114 | // edited to convert pub_date and unpub_date |
| 115 | 115 | // sottwell 02-09-2006 |
| 116 | 116 | if($formRestored == true) { |
| 117 | - $content = array_merge($content, $_POST); |
|
| 118 | - $content['content'] = $_POST['ta']; |
|
| 119 | - if(empty ($content['pub_date'])) { |
|
| 120 | - unset ($content['pub_date']); |
|
| 121 | - } else { |
|
| 122 | - $content['pub_date'] = $modx->toTimeStamp($content['pub_date']); |
|
| 123 | - } |
|
| 124 | - if(empty ($content['unpub_date'])) { |
|
| 125 | - unset ($content['unpub_date']); |
|
| 126 | - } else { |
|
| 127 | - $content['unpub_date'] = $modx->toTimeStamp($content['unpub_date']); |
|
| 128 | - } |
|
| 117 | + $content = array_merge($content, $_POST); |
|
| 118 | + $content['content'] = $_POST['ta']; |
|
| 119 | + if(empty ($content['pub_date'])) { |
|
| 120 | + unset ($content['pub_date']); |
|
| 121 | + } else { |
|
| 122 | + $content['pub_date'] = $modx->toTimeStamp($content['pub_date']); |
|
| 123 | + } |
|
| 124 | + if(empty ($content['unpub_date'])) { |
|
| 125 | + unset ($content['unpub_date']); |
|
| 126 | + } else { |
|
| 127 | + $content['unpub_date'] = $modx->toTimeStamp($content['unpub_date']); |
|
| 128 | + } |
|
| 129 | 129 | } |
| 130 | 130 | |
| 131 | 131 | // increase menu index if this is a new document |
| 132 | 132 | if(!isset ($_REQUEST['id'])) { |
| 133 | - if(!isset ($modx->config['auto_menuindex'])) { |
|
| 134 | - $modx->config['auto_menuindex'] = 1; |
|
| 135 | - } |
|
| 136 | - if($modx->config['auto_menuindex']) { |
|
| 137 | - $pid = (int)$_REQUEST['pid']; |
|
| 138 | - $rs = $modx->db->select('count(*)', $tbl_site_content, "parent='{$pid}'"); |
|
| 139 | - $content['menuindex'] = $modx->db->getValue($rs); |
|
| 140 | - } else { |
|
| 141 | - $content['menuindex'] = 0; |
|
| 142 | - } |
|
| 133 | + if(!isset ($modx->config['auto_menuindex'])) { |
|
| 134 | + $modx->config['auto_menuindex'] = 1; |
|
| 135 | + } |
|
| 136 | + if($modx->config['auto_menuindex']) { |
|
| 137 | + $pid = (int)$_REQUEST['pid']; |
|
| 138 | + $rs = $modx->db->select('count(*)', $tbl_site_content, "parent='{$pid}'"); |
|
| 139 | + $content['menuindex'] = $modx->db->getValue($rs); |
|
| 140 | + } else { |
|
| 141 | + $content['menuindex'] = 0; |
|
| 142 | + } |
|
| 143 | 143 | } |
| 144 | 144 | |
| 145 | 145 | if(isset ($_POST['which_editor'])) { |
| 146 | - $modx->config['which_editor'] = $_POST['which_editor']; |
|
| 146 | + $modx->config['which_editor'] = $_POST['which_editor']; |
|
| 147 | 147 | } |
| 148 | 148 | |
| 149 | 149 | // Add lock-element JS-Script |
@@ -543,23 +543,23 @@ discard block |
||
| 543 | 543 | |
| 544 | 544 | <form name="mutate" id="mutate" class="content" method="post" enctype="multipart/form-data" action="index.php" onsubmit="documentDirty=false;"> |
| 545 | 545 | <?php |
| 546 | - // invoke OnDocFormPrerender event |
|
| 547 | - $evtOut = $modx->invokeEvent('OnDocFormPrerender', array( |
|
| 548 | - 'id' => $id, |
|
| 549 | - 'template' => $content['template'] |
|
| 550 | - )); |
|
| 551 | - |
|
| 552 | - if(is_array($evtOut)) { |
|
| 553 | - echo implode('', $evtOut); |
|
| 554 | - } |
|
| 546 | + // invoke OnDocFormPrerender event |
|
| 547 | + $evtOut = $modx->invokeEvent('OnDocFormPrerender', array( |
|
| 548 | + 'id' => $id, |
|
| 549 | + 'template' => $content['template'] |
|
| 550 | + )); |
|
| 551 | + |
|
| 552 | + if(is_array($evtOut)) { |
|
| 553 | + echo implode('', $evtOut); |
|
| 554 | + } |
|
| 555 | 555 | |
| 556 | - /*************************/ |
|
| 557 | - $dir = isset($_REQUEST['dir']) ? $_REQUEST['dir'] : ''; |
|
| 558 | - $sort = isset($_REQUEST['sort']) ? $_REQUEST['sort'] : 'createdon'; |
|
| 559 | - $page = isset($_REQUEST['page']) ? (int) $_REQUEST['page'] : ''; |
|
| 560 | - /*************************/ |
|
| 556 | + /*************************/ |
|
| 557 | + $dir = isset($_REQUEST['dir']) ? $_REQUEST['dir'] : ''; |
|
| 558 | + $sort = isset($_REQUEST['sort']) ? $_REQUEST['sort'] : 'createdon'; |
|
| 559 | + $page = isset($_REQUEST['page']) ? (int) $_REQUEST['page'] : ''; |
|
| 560 | + /*************************/ |
|
| 561 | 561 | |
| 562 | - ?> |
|
| 562 | + ?> |
|
| 563 | 563 | <input type="hidden" name="a" value="5" /> |
| 564 | 564 | <input type="hidden" name="id" value="<?= $content['id'] ?>" /> |
| 565 | 565 | <input type="hidden" name="mode" value="<?= $modx->manager->action ?>" /> |
@@ -574,54 +574,54 @@ discard block |
||
| 574 | 574 | |
| 575 | 575 | <h1> |
| 576 | 576 | <i class="fa fa-pencil-square-o"></i><?php if(isset($_REQUEST['id'])) { |
| 577 | - echo iconv_substr($content['pagetitle'], 0, 50, $modx->config['modx_charset']) . (iconv_strlen($content['pagetitle'], $modx->config['modx_charset']) > 50 ? '...' : '') . '<small>(' . $_REQUEST['id'] . ')</small>'; |
|
| 578 | - } else { |
|
| 579 | - if ($modx->manager->action == '4') { |
|
| 577 | + echo iconv_substr($content['pagetitle'], 0, 50, $modx->config['modx_charset']) . (iconv_strlen($content['pagetitle'], $modx->config['modx_charset']) > 50 ? '...' : '') . '<small>(' . $_REQUEST['id'] . ')</small>'; |
|
| 578 | + } else { |
|
| 579 | + if ($modx->manager->action == '4') { |
|
| 580 | 580 | echo $_lang['add_resource']; |
| 581 | 581 | } else if ($modx->manager->action == '72') { |
| 582 | 582 | echo $_lang['add_weblink']; |
| 583 | 583 | } else { |
| 584 | 584 | echo $_lang['create_resource_title']; |
| 585 | 585 | } |
| 586 | - } ?> |
|
| 586 | + } ?> |
|
| 587 | 587 | </h1> |
| 588 | 588 | |
| 589 | 589 | <?= $_style['actionbuttons']['dynamic']['document'] ?> |
| 590 | 590 | |
| 591 | 591 | <?php |
| 592 | - // breadcrumbs |
|
| 593 | - if($modx->config['use_breadcrumbs']) { |
|
| 594 | - $temp = array(); |
|
| 595 | - $title = isset($content['pagetitle']) ? $content['pagetitle'] : $_lang['create_resource_title']; |
|
| 596 | - |
|
| 597 | - if(isset($_REQUEST['id']) && $content['parent'] != 0) { |
|
| 598 | - $bID = (int) $_REQUEST['id']; |
|
| 599 | - $temp = $modx->getParentIds($bID); |
|
| 600 | - } else if(isset($_REQUEST['pid'])) { |
|
| 601 | - $bID = (int) $_REQUEST['pid']; |
|
| 602 | - $temp = $modx->getParentIds($bID); |
|
| 603 | - array_unshift($temp, $bID); |
|
| 604 | - } |
|
| 592 | + // breadcrumbs |
|
| 593 | + if($modx->config['use_breadcrumbs']) { |
|
| 594 | + $temp = array(); |
|
| 595 | + $title = isset($content['pagetitle']) ? $content['pagetitle'] : $_lang['create_resource_title']; |
|
| 596 | + |
|
| 597 | + if(isset($_REQUEST['id']) && $content['parent'] != 0) { |
|
| 598 | + $bID = (int) $_REQUEST['id']; |
|
| 599 | + $temp = $modx->getParentIds($bID); |
|
| 600 | + } else if(isset($_REQUEST['pid'])) { |
|
| 601 | + $bID = (int) $_REQUEST['pid']; |
|
| 602 | + $temp = $modx->getParentIds($bID); |
|
| 603 | + array_unshift($temp, $bID); |
|
| 604 | + } |
|
| 605 | 605 | |
| 606 | - if($temp) { |
|
| 607 | - $parents = implode(',', $temp); |
|
| 606 | + if($temp) { |
|
| 607 | + $parents = implode(',', $temp); |
|
| 608 | 608 | |
| 609 | - if(!empty($parents)) { |
|
| 610 | - $where = "FIND_IN_SET(id,'{$parents}') DESC"; |
|
| 611 | - $rs = $modx->db->select('id, pagetitle', $tbl_site_content, "id IN ({$parents})", $where); |
|
| 612 | - while($row = $modx->db->getRow($rs)) { |
|
| 613 | - $out .= '<li class="breadcrumbs__li"> |
|
| 609 | + if(!empty($parents)) { |
|
| 610 | + $where = "FIND_IN_SET(id,'{$parents}') DESC"; |
|
| 611 | + $rs = $modx->db->select('id, pagetitle', $tbl_site_content, "id IN ({$parents})", $where); |
|
| 612 | + while($row = $modx->db->getRow($rs)) { |
|
| 613 | + $out .= '<li class="breadcrumbs__li"> |
|
| 614 | 614 | <a href="index.php?a=27&id=' . $row['id'] . '" class="breadcrumbs__a">' . htmlspecialchars($row['pagetitle'], ENT_QUOTES, $modx->config['modx_charset']) . '</a> |
| 615 | 615 | <span class="breadcrumbs__sep">></span> |
| 616 | 616 | </li>'; |
| 617 | - } |
|
| 618 | - } |
|
| 619 | - } |
|
| 617 | + } |
|
| 618 | + } |
|
| 619 | + } |
|
| 620 | 620 | |
| 621 | - $out .= '<li class="breadcrumbs__li breadcrumbs__li_current">' . $title . '</li>'; |
|
| 622 | - echo '<ul class="breadcrumbs">' . $out . '</ul>'; |
|
| 623 | - } |
|
| 624 | - ?> |
|
| 621 | + $out .= '<li class="breadcrumbs__li breadcrumbs__li_current">' . $title . '</li>'; |
|
| 622 | + echo '<ul class="breadcrumbs">' . $out . '</ul>'; |
|
| 623 | + } |
|
| 624 | + ?> |
|
| 625 | 625 | |
| 626 | 626 | <!-- start main wrapper --> |
| 627 | 627 | <div class="sectionBody"> |
@@ -633,13 +633,13 @@ discard block |
||
| 633 | 633 | |
| 634 | 634 | <!-- General --> |
| 635 | 635 | <?php |
| 636 | - $evtOut = $modx->invokeEvent('OnDocFormTemplateRender', array( |
|
| 637 | - 'id' => $id |
|
| 638 | - )); |
|
| 639 | - if(is_array($evtOut)) { |
|
| 640 | - echo implode('', $evtOut); |
|
| 641 | - } else { |
|
| 642 | - ?> |
|
| 636 | + $evtOut = $modx->invokeEvent('OnDocFormTemplateRender', array( |
|
| 637 | + 'id' => $id |
|
| 638 | + )); |
|
| 639 | + if(is_array($evtOut)) { |
|
| 640 | + echo implode('', $evtOut); |
|
| 641 | + } else { |
|
| 642 | + ?> |
|
| 643 | 643 | <div class="tab-page" id="tabGeneral"> |
| 644 | 644 | <h2 class="tab"><?= $_lang['settings_general'] ?></h2> |
| 645 | 645 | <script type="text/javascript">tpSettings.addTabPage(document.getElementById("tabGeneral"));</script> |
@@ -724,36 +724,36 @@ discard block |
||
| 724 | 724 | <select id="template" name="template" class="inputBox" onchange="templateWarning();"> |
| 725 | 725 | <option value="0">(blank)</option> |
| 726 | 726 | <?php |
| 727 | - $field = "t.templatename, t.selectable, t.id, c.category"; |
|
| 728 | - $from = "{$tbl_site_templates} AS t LEFT JOIN {$tbl_categories} AS c ON t.category = c.id"; |
|
| 729 | - $rs = $modx->db->select($field, $from, '', 'c.category, t.templatename ASC'); |
|
| 730 | - $currentCategory = ''; |
|
| 731 | - while($row = $modx->db->getRow($rs)) { |
|
| 732 | - if($row['selectable'] != 1 && $row['id'] != $content['template']) { |
|
| 733 | - continue; |
|
| 734 | - }; |
|
| 735 | - // Skip if not selectable but show if selected! |
|
| 736 | - $thisCategory = $row['category']; |
|
| 737 | - if($thisCategory == null) { |
|
| 738 | - $thisCategory = $_lang["no_category"]; |
|
| 739 | - } |
|
| 740 | - if($thisCategory != $currentCategory) { |
|
| 741 | - if($closeOptGroup) { |
|
| 742 | - echo "\t\t\t\t\t</optgroup>\n"; |
|
| 743 | - } |
|
| 744 | - echo "\t\t\t\t\t<optgroup label=\"$thisCategory\">\n"; |
|
| 745 | - $closeOptGroup = true; |
|
| 746 | - } |
|
| 727 | + $field = "t.templatename, t.selectable, t.id, c.category"; |
|
| 728 | + $from = "{$tbl_site_templates} AS t LEFT JOIN {$tbl_categories} AS c ON t.category = c.id"; |
|
| 729 | + $rs = $modx->db->select($field, $from, '', 'c.category, t.templatename ASC'); |
|
| 730 | + $currentCategory = ''; |
|
| 731 | + while($row = $modx->db->getRow($rs)) { |
|
| 732 | + if($row['selectable'] != 1 && $row['id'] != $content['template']) { |
|
| 733 | + continue; |
|
| 734 | + }; |
|
| 735 | + // Skip if not selectable but show if selected! |
|
| 736 | + $thisCategory = $row['category']; |
|
| 737 | + if($thisCategory == null) { |
|
| 738 | + $thisCategory = $_lang["no_category"]; |
|
| 739 | + } |
|
| 740 | + if($thisCategory != $currentCategory) { |
|
| 741 | + if($closeOptGroup) { |
|
| 742 | + echo "\t\t\t\t\t</optgroup>\n"; |
|
| 743 | + } |
|
| 744 | + echo "\t\t\t\t\t<optgroup label=\"$thisCategory\">\n"; |
|
| 745 | + $closeOptGroup = true; |
|
| 746 | + } |
|
| 747 | 747 | |
| 748 | - $selectedtext = ($row['id'] == $content['template']) ? ' selected="selected"' : ''; |
|
| 748 | + $selectedtext = ($row['id'] == $content['template']) ? ' selected="selected"' : ''; |
|
| 749 | 749 | |
| 750 | - echo "\t\t\t\t\t" . '<option value="' . $row['id'] . '"' . $selectedtext . '>' . $row['templatename'] . "</option>\n"; |
|
| 751 | - $currentCategory = $thisCategory; |
|
| 752 | - } |
|
| 753 | - if($thisCategory != '') { |
|
| 754 | - echo "\t\t\t\t\t</optgroup>\n"; |
|
| 755 | - } |
|
| 756 | - ?> |
|
| 750 | + echo "\t\t\t\t\t" . '<option value="' . $row['id'] . '"' . $selectedtext . '>' . $row['templatename'] . "</option>\n"; |
|
| 751 | + $currentCategory = $thisCategory; |
|
| 752 | + } |
|
| 753 | + if($thisCategory != '') { |
|
| 754 | + echo "\t\t\t\t\t</optgroup>\n"; |
|
| 755 | + } |
|
| 756 | + ?> |
|
| 757 | 757 | </select> |
| 758 | 758 | </td> |
| 759 | 759 | </tr> |
@@ -793,37 +793,37 @@ discard block |
||
| 793 | 793 | </td> |
| 794 | 794 | <td valign="top"> |
| 795 | 795 | <?php |
| 796 | - $parentlookup = false; |
|
| 797 | - if(isset ($_REQUEST['id'])) { |
|
| 798 | - if($content['parent'] == 0) { |
|
| 799 | - $parentname = $site_name; |
|
| 800 | - } else { |
|
| 801 | - $parentlookup = $content['parent']; |
|
| 802 | - } |
|
| 803 | - } elseif(isset ($_REQUEST['pid'])) { |
|
| 804 | - if($_REQUEST['pid'] == 0) { |
|
| 805 | - $parentname = $site_name; |
|
| 806 | - } else { |
|
| 807 | - $parentlookup = $_REQUEST['pid']; |
|
| 808 | - } |
|
| 809 | - } elseif(isset($_POST['parent'])) { |
|
| 810 | - if($_POST['parent'] == 0) { |
|
| 811 | - $parentname = $site_name; |
|
| 812 | - } else { |
|
| 813 | - $parentlookup = $_POST['parent']; |
|
| 814 | - } |
|
| 815 | - } else { |
|
| 816 | - $parentname = $site_name; |
|
| 817 | - $content['parent'] = 0; |
|
| 818 | - } |
|
| 819 | - if($parentlookup !== false && is_numeric($parentlookup)) { |
|
| 820 | - $rs = $modx->db->select('pagetitle', $tbl_site_content, "id='{$parentlookup}'"); |
|
| 821 | - $parentname = $modx->db->getValue($rs); |
|
| 822 | - if(!$parentname) { |
|
| 823 | - $modx->webAlertAndQuit($_lang["error_no_parent"]); |
|
| 824 | - } |
|
| 825 | - } |
|
| 826 | - ?> |
|
| 796 | + $parentlookup = false; |
|
| 797 | + if(isset ($_REQUEST['id'])) { |
|
| 798 | + if($content['parent'] == 0) { |
|
| 799 | + $parentname = $site_name; |
|
| 800 | + } else { |
|
| 801 | + $parentlookup = $content['parent']; |
|
| 802 | + } |
|
| 803 | + } elseif(isset ($_REQUEST['pid'])) { |
|
| 804 | + if($_REQUEST['pid'] == 0) { |
|
| 805 | + $parentname = $site_name; |
|
| 806 | + } else { |
|
| 807 | + $parentlookup = $_REQUEST['pid']; |
|
| 808 | + } |
|
| 809 | + } elseif(isset($_POST['parent'])) { |
|
| 810 | + if($_POST['parent'] == 0) { |
|
| 811 | + $parentname = $site_name; |
|
| 812 | + } else { |
|
| 813 | + $parentlookup = $_POST['parent']; |
|
| 814 | + } |
|
| 815 | + } else { |
|
| 816 | + $parentname = $site_name; |
|
| 817 | + $content['parent'] = 0; |
|
| 818 | + } |
|
| 819 | + if($parentlookup !== false && is_numeric($parentlookup)) { |
|
| 820 | + $rs = $modx->db->select('pagetitle', $tbl_site_content, "id='{$parentlookup}'"); |
|
| 821 | + $parentname = $modx->db->getValue($rs); |
|
| 822 | + if(!$parentname) { |
|
| 823 | + $modx->webAlertAndQuit($_lang["error_no_parent"]); |
|
| 824 | + } |
|
| 825 | + } |
|
| 826 | + ?> |
|
| 827 | 827 | <i id="plock" class="<?= $_style["actions_folder"] ?>" onclick="enableParentSelection(!allowParentSelection);"></i> |
| 828 | 828 | <b><span id="parentName"><?= (isset($_REQUEST['pid']) ? $_REQUEST['pid'] : $content['parent']) ?> (<?= $parentname ?>)</span></b> |
| 829 | 829 | <input type="hidden" name="parent" value="<?= (isset($_REQUEST['pid']) ? $_REQUEST['pid'] : $content['parent']) ?>" onchange="documentDirty=true;" /> |
@@ -831,7 +831,7 @@ discard block |
||
| 831 | 831 | </tr> |
| 832 | 832 | <tr></tr> |
| 833 | 833 | <?php |
| 834 | - /* |
|
| 834 | + /* |
|
| 835 | 835 | if($content['type'] == 'reference' || $modx->manager->action == '72') { |
| 836 | 836 | ?> |
| 837 | 837 | <tr> |
@@ -859,7 +859,7 @@ discard block |
||
| 859 | 859 | </tr> |
| 860 | 860 | <?php |
| 861 | 861 | }*/ |
| 862 | - ?> |
|
| 862 | + ?> |
|
| 863 | 863 | |
| 864 | 864 | <?php if($content['type'] == 'document' || $modx->manager->action == '4') { ?> |
| 865 | 865 | <tr> |
@@ -872,36 +872,36 @@ discard block |
||
| 872 | 872 | <select id="which_editor" class="form-control form-control-sm" size="1" name="which_editor" onchange="changeRTE();"> |
| 873 | 873 | <option value="none"><?= $_lang['none'] ?></option> |
| 874 | 874 | <?php |
| 875 | - // invoke OnRichTextEditorRegister event |
|
| 876 | - $evtOut = $modx->invokeEvent("OnRichTextEditorRegister"); |
|
| 877 | - if(is_array($evtOut)) { |
|
| 878 | - for($i = 0; $i < count($evtOut); $i++) { |
|
| 879 | - $editor = $evtOut[$i]; |
|
| 880 | - echo "\t\t\t", '<option value="', $editor, '"', ($modx->config['which_editor'] == $editor ? ' selected="selected"' : ''), '>', $editor, "</option>\n"; |
|
| 881 | - } |
|
| 882 | - } |
|
| 883 | - ?> |
|
| 875 | + // invoke OnRichTextEditorRegister event |
|
| 876 | + $evtOut = $modx->invokeEvent("OnRichTextEditorRegister"); |
|
| 877 | + if(is_array($evtOut)) { |
|
| 878 | + for($i = 0; $i < count($evtOut); $i++) { |
|
| 879 | + $editor = $evtOut[$i]; |
|
| 880 | + echo "\t\t\t", '<option value="', $editor, '"', ($modx->config['which_editor'] == $editor ? ' selected="selected"' : ''), '>', $editor, "</option>\n"; |
|
| 881 | + } |
|
| 882 | + } |
|
| 883 | + ?> |
|
| 884 | 884 | </select> |
| 885 | 885 | </label> |
| 886 | 886 | </div> |
| 887 | 887 | <div id="content_body"> |
| 888 | 888 | <?php |
| 889 | - if(($content['richtext'] == 1 || $modx->manager->action == '4') && $use_editor == 1) { |
|
| 890 | - $htmlContent = $content['content']; |
|
| 891 | - ?> |
|
| 889 | + if(($content['richtext'] == 1 || $modx->manager->action == '4') && $use_editor == 1) { |
|
| 890 | + $htmlContent = $content['content']; |
|
| 891 | + ?> |
|
| 892 | 892 | <div class="section-editor clearfix"> |
| 893 | 893 | <textarea id="ta" name="ta" onchange="documentDirty=true;"><?= $modx->htmlspecialchars($htmlContent) ?></textarea> |
| 894 | 894 | </div> |
| 895 | 895 | <?php |
| 896 | - // Richtext-[*content*] |
|
| 897 | - $richtexteditorIds = array(); |
|
| 898 | - $richtexteditorOptions = array(); |
|
| 899 | - $richtexteditorIds[$modx->config['which_editor']][] = 'ta'; |
|
| 900 | - $richtexteditorOptions[$modx->config['which_editor']]['ta'] = ''; |
|
| 901 | - } else { |
|
| 902 | - echo "\t" . '<div><textarea class="phptextarea" id="ta" name="ta" rows="20" wrap="soft" onchange="documentDirty=true;">', $modx->htmlspecialchars($content['content']), '</textarea></div>' . "\n"; |
|
| 903 | - } |
|
| 904 | - ?> |
|
| 896 | + // Richtext-[*content*] |
|
| 897 | + $richtexteditorIds = array(); |
|
| 898 | + $richtexteditorOptions = array(); |
|
| 899 | + $richtexteditorIds[$modx->config['which_editor']][] = 'ta'; |
|
| 900 | + $richtexteditorOptions[$modx->config['which_editor']]['ta'] = ''; |
|
| 901 | + } else { |
|
| 902 | + echo "\t" . '<div><textarea class="phptextarea" id="ta" name="ta" rows="20" wrap="soft" onchange="documentDirty=true;">', $modx->htmlspecialchars($content['content']), '</textarea></div>' . "\n"; |
|
| 903 | + } |
|
| 904 | + ?> |
|
| 905 | 905 | </div> |
| 906 | 906 | </td> |
| 907 | 907 | </tr> |
@@ -1207,8 +1207,8 @@ discard block |
||
| 1207 | 1207 | |
| 1208 | 1208 | <?php |
| 1209 | 1209 | |
| 1210 | - if($_SESSION['mgrRole'] == 1 || $modx->manager->action != '27' || $_SESSION['mgrInternalKey'] == $content['createdby'] || $modx->hasPermission('change_resourcetype')) { |
|
| 1211 | - ?> |
|
| 1210 | + if($_SESSION['mgrRole'] == 1 || $modx->manager->action != '27' || $_SESSION['mgrInternalKey'] == $content['createdby'] || $modx->hasPermission('change_resourcetype')) { |
|
| 1211 | + ?> |
|
| 1212 | 1212 | <tr> |
| 1213 | 1213 | <td> |
| 1214 | 1214 | <span class="warning"><?= $_lang['resource_type'] ?></span> |
@@ -1230,15 +1230,15 @@ discard block |
||
| 1230 | 1230 | <td> |
| 1231 | 1231 | <select name="contentType" class="inputBox" onchange="documentDirty=true;"> |
| 1232 | 1232 | <?php |
| 1233 | - if(!$content['contentType']) { |
|
| 1234 | - $content['contentType'] = 'text/html'; |
|
| 1235 | - } |
|
| 1236 | - $custom_contenttype = (isset ($custom_contenttype) ? $custom_contenttype : "text/html,text/plain,text/xml"); |
|
| 1237 | - $ct = explode(",", $custom_contenttype); |
|
| 1238 | - for($i = 0; $i < count($ct); $i++) { |
|
| 1239 | - echo "\t\t\t\t\t" . '<option value="' . $ct[$i] . '"' . ($content['contentType'] == $ct[$i] ? ' selected="selected"' : '') . '>' . $ct[$i] . "</option>\n"; |
|
| 1240 | - } |
|
| 1241 | - ?> |
|
| 1233 | + if(!$content['contentType']) { |
|
| 1234 | + $content['contentType'] = 'text/html'; |
|
| 1235 | + } |
|
| 1236 | + $custom_contenttype = (isset ($custom_contenttype) ? $custom_contenttype : "text/html,text/plain,text/xml"); |
|
| 1237 | + $ct = explode(",", $custom_contenttype); |
|
| 1238 | + for($i = 0; $i < count($ct); $i++) { |
|
| 1239 | + echo "\t\t\t\t\t" . '<option value="' . $ct[$i] . '"' . ($content['contentType'] == $ct[$i] ? ' selected="selected"' : '') . '>' . $ct[$i] . "</option>\n"; |
|
| 1240 | + } |
|
| 1241 | + ?> |
|
| 1242 | 1242 | </select> |
| 1243 | 1243 | </td> |
| 1244 | 1244 | </tr> |
@@ -1261,23 +1261,23 @@ discard block |
||
| 1261 | 1261 | </td> |
| 1262 | 1262 | </tr> |
| 1263 | 1263 | <?php |
| 1264 | - } else { |
|
| 1265 | - if($content['type'] != 'reference' && $modx->manager->action != '72') { |
|
| 1266 | - // non-admin managers creating or editing a document resource |
|
| 1267 | - ?> |
|
| 1264 | + } else { |
|
| 1265 | + if($content['type'] != 'reference' && $modx->manager->action != '72') { |
|
| 1266 | + // non-admin managers creating or editing a document resource |
|
| 1267 | + ?> |
|
| 1268 | 1268 | <input type="hidden" name="contentType" value="<?= (isset($content['contentType']) ? $content['contentType'] : "text/html") ?>" /> |
| 1269 | 1269 | <input type="hidden" name="type" value="document" /> |
| 1270 | 1270 | <input type="hidden" name="content_dispo" value="<?= (isset($content['content_dispo']) ? $content['content_dispo'] : '0') ?>" /> |
| 1271 | 1271 | <?php |
| 1272 | - } else { |
|
| 1273 | - // non-admin managers creating or editing a reference (weblink) resource |
|
| 1274 | - ?> |
|
| 1272 | + } else { |
|
| 1273 | + // non-admin managers creating or editing a reference (weblink) resource |
|
| 1274 | + ?> |
|
| 1275 | 1275 | <input type="hidden" name="type" value="reference" /> |
| 1276 | 1276 | <input type="hidden" name="contentType" value="text/html" /> |
| 1277 | 1277 | <?php |
| 1278 | - } |
|
| 1279 | - }//if mgrRole |
|
| 1280 | - ?> |
|
| 1278 | + } |
|
| 1279 | + }//if mgrRole |
|
| 1280 | + ?> |
|
| 1281 | 1281 | |
| 1282 | 1282 | <tr> |
| 1283 | 1283 | <td> |
@@ -1360,112 +1360,112 @@ discard block |
||
| 1360 | 1360 | ?> |
| 1361 | 1361 | |
| 1362 | 1362 | <?php |
| 1363 | - /******************************* |
|
| 1363 | + /******************************* |
|
| 1364 | 1364 | * Document Access Permissions */ |
| 1365 | - if($use_udperms == 1) { |
|
| 1366 | - $groupsarray = array(); |
|
| 1367 | - $sql = ''; |
|
| 1368 | - |
|
| 1369 | - $documentId = ($modx->manager->action == '27' ? $id : (!empty($_REQUEST['pid']) ? $_REQUEST['pid'] : $content['parent'])); |
|
| 1370 | - if($documentId > 0) { |
|
| 1371 | - // Load up, the permissions from the parent (if new document) or existing document |
|
| 1372 | - $rs = $modx->db->select('id, document_group', $tbl_document_groups, "document='{$documentId}'"); |
|
| 1373 | - while($currentgroup = $modx->db->getRow($rs)) $groupsarray[] = $currentgroup['document_group'] . ',' . $currentgroup['id']; |
|
| 1374 | - |
|
| 1375 | - // Load up the current permissions and names |
|
| 1376 | - $vs = array( |
|
| 1377 | - $tbl_document_group_names, |
|
| 1378 | - $tbl_document_groups, |
|
| 1379 | - $documentId |
|
| 1380 | - ); |
|
| 1381 | - $from = vsprintf("%s AS dgn LEFT JOIN %s AS groups ON groups.document_group=dgn.id AND groups.document='%s'", $vs); |
|
| 1382 | - $rs = $modx->db->select('dgn.*, groups.id AS link_id', $from, '', 'name'); |
|
| 1383 | - } else { |
|
| 1384 | - // Just load up the names, we're starting clean |
|
| 1385 | - $rs = $modx->db->select('*, NULL AS link_id', $tbl_document_group_names, '', 'name'); |
|
| 1386 | - } |
|
| 1365 | + if($use_udperms == 1) { |
|
| 1366 | + $groupsarray = array(); |
|
| 1367 | + $sql = ''; |
|
| 1368 | + |
|
| 1369 | + $documentId = ($modx->manager->action == '27' ? $id : (!empty($_REQUEST['pid']) ? $_REQUEST['pid'] : $content['parent'])); |
|
| 1370 | + if($documentId > 0) { |
|
| 1371 | + // Load up, the permissions from the parent (if new document) or existing document |
|
| 1372 | + $rs = $modx->db->select('id, document_group', $tbl_document_groups, "document='{$documentId}'"); |
|
| 1373 | + while($currentgroup = $modx->db->getRow($rs)) $groupsarray[] = $currentgroup['document_group'] . ',' . $currentgroup['id']; |
|
| 1374 | + |
|
| 1375 | + // Load up the current permissions and names |
|
| 1376 | + $vs = array( |
|
| 1377 | + $tbl_document_group_names, |
|
| 1378 | + $tbl_document_groups, |
|
| 1379 | + $documentId |
|
| 1380 | + ); |
|
| 1381 | + $from = vsprintf("%s AS dgn LEFT JOIN %s AS groups ON groups.document_group=dgn.id AND groups.document='%s'", $vs); |
|
| 1382 | + $rs = $modx->db->select('dgn.*, groups.id AS link_id', $from, '', 'name'); |
|
| 1383 | + } else { |
|
| 1384 | + // Just load up the names, we're starting clean |
|
| 1385 | + $rs = $modx->db->select('*, NULL AS link_id', $tbl_document_group_names, '', 'name'); |
|
| 1386 | + } |
|
| 1387 | 1387 | |
| 1388 | - // retain selected doc groups between post |
|
| 1389 | - if(isset($_POST['docgroups'])) { |
|
| 1390 | - $groupsarray = array_merge($groupsarray, $_POST['docgroups']); |
|
| 1391 | - } |
|
| 1388 | + // retain selected doc groups between post |
|
| 1389 | + if(isset($_POST['docgroups'])) { |
|
| 1390 | + $groupsarray = array_merge($groupsarray, $_POST['docgroups']); |
|
| 1391 | + } |
|
| 1392 | 1392 | |
| 1393 | - $isManager = $modx->hasPermission('access_permissions'); |
|
| 1394 | - $isWeb = $modx->hasPermission('web_access_permissions'); |
|
| 1395 | - |
|
| 1396 | - // Setup Basic attributes for each Input box |
|
| 1397 | - $inputAttributes = array( |
|
| 1398 | - 'type' => 'checkbox', |
|
| 1399 | - 'class' => 'checkbox', |
|
| 1400 | - 'name' => 'docgroups[]', |
|
| 1401 | - 'onclick' => 'makePublic(false);', |
|
| 1402 | - ); |
|
| 1403 | - $permissions = array(); // New Permissions array list (this contains the HTML) |
|
| 1404 | - $permissions_yes = 0; // count permissions the current mgr user has |
|
| 1405 | - $permissions_no = 0; // count permissions the current mgr user doesn't have |
|
| 1406 | - |
|
| 1407 | - // Loop through the permissions list |
|
| 1408 | - while($row = $modx->db->getRow($rs)) { |
|
| 1409 | - |
|
| 1410 | - // Create an inputValue pair (group ID and group link (if it exists)) |
|
| 1411 | - $inputValue = $row['id'] . ',' . ($row['link_id'] ? $row['link_id'] : 'new'); |
|
| 1412 | - $inputId = 'group-' . $row['id']; |
|
| 1413 | - |
|
| 1414 | - $checked = in_array($inputValue, $groupsarray); |
|
| 1415 | - if($checked) { |
|
| 1416 | - $notPublic = true; |
|
| 1417 | - } // Mark as private access (either web or manager) |
|
| 1418 | - |
|
| 1419 | - // Skip the access permission if the user doesn't have access... |
|
| 1420 | - if((!$isManager && $row['private_memgroup'] == '1') || (!$isWeb && $row['private_webgroup'] == '1')) { |
|
| 1421 | - continue; |
|
| 1422 | - } |
|
| 1423 | - |
|
| 1424 | - // Setup attributes for this Input box |
|
| 1425 | - $inputAttributes['id'] = $inputId; |
|
| 1426 | - $inputAttributes['value'] = $inputValue; |
|
| 1427 | - if($checked) { |
|
| 1428 | - $inputAttributes['checked'] = 'checked'; |
|
| 1429 | - } else { |
|
| 1430 | - unset($inputAttributes['checked']); |
|
| 1431 | - } |
|
| 1432 | - |
|
| 1433 | - // Create attribute string list |
|
| 1434 | - $inputString = array(); |
|
| 1435 | - foreach($inputAttributes as $k => $v) $inputString[] = $k . '="' . $v . '"'; |
|
| 1436 | - |
|
| 1437 | - // Make the <input> HTML |
|
| 1438 | - $inputHTML = '<input ' . implode(' ', $inputString) . ' />'; |
|
| 1439 | - |
|
| 1440 | - // does user have this permission? |
|
| 1441 | - $from = "{$tbl_membergroup_access} AS mga, {$tbl_member_groups} AS mg"; |
|
| 1442 | - $vs = array( |
|
| 1443 | - $row['id'], |
|
| 1444 | - $_SESSION['mgrInternalKey'] |
|
| 1445 | - ); |
|
| 1446 | - $where = vsprintf("mga.membergroup=mg.user_group AND mga.documentgroup=%s AND mg.member=%s", $vs); |
|
| 1447 | - $rsp = $modx->db->select('COUNT(mg.id)', $from, $where); |
|
| 1448 | - $count = $modx->db->getValue($rsp); |
|
| 1449 | - if($count > 0) { |
|
| 1450 | - ++$permissions_yes; |
|
| 1451 | - } else { |
|
| 1452 | - ++$permissions_no; |
|
| 1453 | - } |
|
| 1454 | - $permissions[] = "\t\t" . '<li>' . $inputHTML . '<label for="' . $inputId . '">' . $row['name'] . '</label></li>'; |
|
| 1455 | - } |
|
| 1456 | - // if mgr user doesn't have access to any of the displayable permissions, forget about them and make doc public |
|
| 1457 | - if($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0)) { |
|
| 1458 | - $permissions = array(); |
|
| 1459 | - } |
|
| 1393 | + $isManager = $modx->hasPermission('access_permissions'); |
|
| 1394 | + $isWeb = $modx->hasPermission('web_access_permissions'); |
|
| 1395 | + |
|
| 1396 | + // Setup Basic attributes for each Input box |
|
| 1397 | + $inputAttributes = array( |
|
| 1398 | + 'type' => 'checkbox', |
|
| 1399 | + 'class' => 'checkbox', |
|
| 1400 | + 'name' => 'docgroups[]', |
|
| 1401 | + 'onclick' => 'makePublic(false);', |
|
| 1402 | + ); |
|
| 1403 | + $permissions = array(); // New Permissions array list (this contains the HTML) |
|
| 1404 | + $permissions_yes = 0; // count permissions the current mgr user has |
|
| 1405 | + $permissions_no = 0; // count permissions the current mgr user doesn't have |
|
| 1406 | + |
|
| 1407 | + // Loop through the permissions list |
|
| 1408 | + while($row = $modx->db->getRow($rs)) { |
|
| 1409 | + |
|
| 1410 | + // Create an inputValue pair (group ID and group link (if it exists)) |
|
| 1411 | + $inputValue = $row['id'] . ',' . ($row['link_id'] ? $row['link_id'] : 'new'); |
|
| 1412 | + $inputId = 'group-' . $row['id']; |
|
| 1413 | + |
|
| 1414 | + $checked = in_array($inputValue, $groupsarray); |
|
| 1415 | + if($checked) { |
|
| 1416 | + $notPublic = true; |
|
| 1417 | + } // Mark as private access (either web or manager) |
|
| 1418 | + |
|
| 1419 | + // Skip the access permission if the user doesn't have access... |
|
| 1420 | + if((!$isManager && $row['private_memgroup'] == '1') || (!$isWeb && $row['private_webgroup'] == '1')) { |
|
| 1421 | + continue; |
|
| 1422 | + } |
|
| 1423 | + |
|
| 1424 | + // Setup attributes for this Input box |
|
| 1425 | + $inputAttributes['id'] = $inputId; |
|
| 1426 | + $inputAttributes['value'] = $inputValue; |
|
| 1427 | + if($checked) { |
|
| 1428 | + $inputAttributes['checked'] = 'checked'; |
|
| 1429 | + } else { |
|
| 1430 | + unset($inputAttributes['checked']); |
|
| 1431 | + } |
|
| 1460 | 1432 | |
| 1461 | - // See if the Access Permissions section is worth displaying... |
|
| 1462 | - if(!empty($permissions)) { |
|
| 1463 | - // Add the "All Document Groups" item if we have rights in both contexts |
|
| 1464 | - if($isManager && $isWeb) { |
|
| 1465 | - array_unshift($permissions, "\t\t" . '<li><input type="checkbox" class="checkbox" name="chkalldocs" id="groupall"' . (!$notPublic ? ' checked="checked"' : '') . ' onclick="makePublic(true);" /><label for="groupall" class="warning">' . $_lang['all_doc_groups'] . '</label></li>'); |
|
| 1466 | - } |
|
| 1467 | - // Output the permissions list... |
|
| 1468 | - ?> |
|
| 1433 | + // Create attribute string list |
|
| 1434 | + $inputString = array(); |
|
| 1435 | + foreach($inputAttributes as $k => $v) $inputString[] = $k . '="' . $v . '"'; |
|
| 1436 | + |
|
| 1437 | + // Make the <input> HTML |
|
| 1438 | + $inputHTML = '<input ' . implode(' ', $inputString) . ' />'; |
|
| 1439 | + |
|
| 1440 | + // does user have this permission? |
|
| 1441 | + $from = "{$tbl_membergroup_access} AS mga, {$tbl_member_groups} AS mg"; |
|
| 1442 | + $vs = array( |
|
| 1443 | + $row['id'], |
|
| 1444 | + $_SESSION['mgrInternalKey'] |
|
| 1445 | + ); |
|
| 1446 | + $where = vsprintf("mga.membergroup=mg.user_group AND mga.documentgroup=%s AND mg.member=%s", $vs); |
|
| 1447 | + $rsp = $modx->db->select('COUNT(mg.id)', $from, $where); |
|
| 1448 | + $count = $modx->db->getValue($rsp); |
|
| 1449 | + if($count > 0) { |
|
| 1450 | + ++$permissions_yes; |
|
| 1451 | + } else { |
|
| 1452 | + ++$permissions_no; |
|
| 1453 | + } |
|
| 1454 | + $permissions[] = "\t\t" . '<li>' . $inputHTML . '<label for="' . $inputId . '">' . $row['name'] . '</label></li>'; |
|
| 1455 | + } |
|
| 1456 | + // if mgr user doesn't have access to any of the displayable permissions, forget about them and make doc public |
|
| 1457 | + if($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0)) { |
|
| 1458 | + $permissions = array(); |
|
| 1459 | + } |
|
| 1460 | + |
|
| 1461 | + // See if the Access Permissions section is worth displaying... |
|
| 1462 | + if(!empty($permissions)) { |
|
| 1463 | + // Add the "All Document Groups" item if we have rights in both contexts |
|
| 1464 | + if($isManager && $isWeb) { |
|
| 1465 | + array_unshift($permissions, "\t\t" . '<li><input type="checkbox" class="checkbox" name="chkalldocs" id="groupall"' . (!$notPublic ? ' checked="checked"' : '') . ' onclick="makePublic(true);" /><label for="groupall" class="warning">' . $_lang['all_doc_groups'] . '</label></li>'); |
|
| 1466 | + } |
|
| 1467 | + // Output the permissions list... |
|
| 1468 | + ?> |
|
| 1469 | 1469 | <!-- Access Permissions --> |
| 1470 | 1470 | <div class="tab-page" id="tabAccess"> |
| 1471 | 1471 | <h2 class="tab" id="tab_access_header"><?= $_lang['access_permissions'] ?></h2> |
@@ -1499,31 +1499,31 @@ discard block |
||
| 1499 | 1499 | </ul> |
| 1500 | 1500 | </div><!--div class="tab-page" id="tabAccess"--> |
| 1501 | 1501 | <?php |
| 1502 | - } // !empty($permissions) |
|
| 1503 | - elseif($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0) && ($_SESSION['mgrPermissions']['access_permissions'] == 1 || $_SESSION['mgrPermissions']['web_access_permissions'] == 1)) { |
|
| 1504 | - ?> |
|
| 1502 | + } // !empty($permissions) |
|
| 1503 | + elseif($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0) && ($_SESSION['mgrPermissions']['access_permissions'] == 1 || $_SESSION['mgrPermissions']['web_access_permissions'] == 1)) { |
|
| 1504 | + ?> |
|
| 1505 | 1505 | <p><?= $_lang["access_permissions_docs_collision"] ?></p> |
| 1506 | 1506 | <?php |
| 1507 | 1507 | |
| 1508 | - } |
|
| 1509 | - } |
|
| 1510 | - /* End Document Access Permissions * |
|
| 1508 | + } |
|
| 1509 | + } |
|
| 1510 | + /* End Document Access Permissions * |
|
| 1511 | 1511 | ***********************************/ |
| 1512 | - ?> |
|
| 1512 | + ?> |
|
| 1513 | 1513 | |
| 1514 | 1514 | <input type="submit" name="save" style="display:none" /> |
| 1515 | 1515 | <?php |
| 1516 | 1516 | |
| 1517 | - // invoke OnDocFormRender event |
|
| 1518 | - $evtOut = $modx->invokeEvent('OnDocFormRender', array( |
|
| 1519 | - 'id' => $id, |
|
| 1520 | - 'template' => $content['template'] |
|
| 1521 | - )); |
|
| 1517 | + // invoke OnDocFormRender event |
|
| 1518 | + $evtOut = $modx->invokeEvent('OnDocFormRender', array( |
|
| 1519 | + 'id' => $id, |
|
| 1520 | + 'template' => $content['template'] |
|
| 1521 | + )); |
|
| 1522 | 1522 | |
| 1523 | - if(is_array($evtOut)) { |
|
| 1524 | - echo implode('', $evtOut); |
|
| 1525 | - } |
|
| 1526 | - ?> |
|
| 1523 | + if(is_array($evtOut)) { |
|
| 1524 | + echo implode('', $evtOut); |
|
| 1525 | + } |
|
| 1526 | + ?> |
|
| 1527 | 1527 | </div><!--div class="tab-pane" id="documentPane"--> |
| 1528 | 1528 | </div><!--div class="sectionBody"--> |
| 1529 | 1529 | </fieldset> |
@@ -1534,19 +1534,19 @@ discard block |
||
| 1534 | 1534 | </script> |
| 1535 | 1535 | <?php |
| 1536 | 1536 | if(($content['richtext'] == 1 || $modx->manager->action == '4' || $modx->manager->action == '72') && $use_editor == 1) { |
| 1537 | - if(is_array($richtexteditorIds)) { |
|
| 1538 | - foreach($richtexteditorIds as $editor => $elements) { |
|
| 1539 | - // invoke OnRichTextEditorInit event |
|
| 1540 | - $evtOut = $modx->invokeEvent('OnRichTextEditorInit', array( |
|
| 1541 | - 'editor' => $editor, |
|
| 1542 | - 'elements' => $elements, |
|
| 1543 | - 'options' => $richtexteditorOptions[$editor] |
|
| 1544 | - )); |
|
| 1545 | - if(is_array($evtOut)) { |
|
| 1546 | - echo implode('', $evtOut); |
|
| 1547 | - } |
|
| 1548 | - } |
|
| 1549 | - } |
|
| 1537 | + if(is_array($richtexteditorIds)) { |
|
| 1538 | + foreach($richtexteditorIds as $editor => $elements) { |
|
| 1539 | + // invoke OnRichTextEditorInit event |
|
| 1540 | + $evtOut = $modx->invokeEvent('OnRichTextEditorInit', array( |
|
| 1541 | + 'editor' => $editor, |
|
| 1542 | + 'elements' => $elements, |
|
| 1543 | + 'options' => $richtexteditorOptions[$editor] |
|
| 1544 | + )); |
|
| 1545 | + if(is_array($evtOut)) { |
|
| 1546 | + echo implode('', $evtOut); |
|
| 1547 | + } |
|
| 1548 | + } |
|
| 1549 | + } |
|
| 1550 | 1550 | } |
| 1551 | 1551 | |
| 1552 | 1552 | if(!function_exists('getDefaultTemplate')) { |
@@ -4,24 +4,24 @@ discard block |
||
| 4 | 4 | } |
| 5 | 5 | |
| 6 | 6 | if(!$modx->hasPermission('category_manager')) { |
| 7 | - $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
| 7 | + $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
| 8 | 8 | } |
| 9 | 9 | |
| 10 | 10 | $_module_params = array( |
| 11 | - 'module_version' => '1.0.0', |
|
| 12 | - 'module_params' => '', |
|
| 13 | - 'module_id' => $_GET['id'], |
|
| 14 | - 'package_name' => 'Module_Categories_Manager', |
|
| 15 | - 'native_language' => 'de', |
|
| 16 | - 'name' => 'Categories Manager', |
|
| 17 | - 'dirname' => $site_manager_url, |
|
| 18 | - 'url' => 'index.php?a=120&id=' . $_GET['id'], |
|
| 19 | - 'path' => realpath( dirname(__FILE__) ) . DIRECTORY_SEPARATOR . 'category_mgr' . DIRECTORY_SEPARATOR, |
|
| 20 | - 'inc_dir' => realpath( dirname(__FILE__) ) . DIRECTORY_SEPARATOR . 'category_mgr' . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR, |
|
| 21 | - 'languages_dir' => realpath( dirname(__FILE__) ) . DIRECTORY_SEPARATOR . 'category_mgr' . DIRECTORY_SEPARATOR . 'lang' . DIRECTORY_SEPARATOR, |
|
| 22 | - 'views_dir' => realpath( dirname(__FILE__) ) . DIRECTORY_SEPARATOR . 'category_mgr' . DIRECTORY_SEPARATOR . 'skin' . DIRECTORY_SEPARATOR, |
|
| 23 | - 'request_key' => 'module_categories_manager', |
|
| 24 | - 'messages' => array() |
|
| 11 | + 'module_version' => '1.0.0', |
|
| 12 | + 'module_params' => '', |
|
| 13 | + 'module_id' => $_GET['id'], |
|
| 14 | + 'package_name' => 'Module_Categories_Manager', |
|
| 15 | + 'native_language' => 'de', |
|
| 16 | + 'name' => 'Categories Manager', |
|
| 17 | + 'dirname' => $site_manager_url, |
|
| 18 | + 'url' => 'index.php?a=120&id=' . $_GET['id'], |
|
| 19 | + 'path' => realpath( dirname(__FILE__) ) . DIRECTORY_SEPARATOR . 'category_mgr' . DIRECTORY_SEPARATOR, |
|
| 20 | + 'inc_dir' => realpath( dirname(__FILE__) ) . DIRECTORY_SEPARATOR . 'category_mgr' . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR, |
|
| 21 | + 'languages_dir' => realpath( dirname(__FILE__) ) . DIRECTORY_SEPARATOR . 'category_mgr' . DIRECTORY_SEPARATOR . 'lang' . DIRECTORY_SEPARATOR, |
|
| 22 | + 'views_dir' => realpath( dirname(__FILE__) ) . DIRECTORY_SEPARATOR . 'category_mgr' . DIRECTORY_SEPARATOR . 'skin' . DIRECTORY_SEPARATOR, |
|
| 23 | + 'request_key' => 'module_categories_manager', |
|
| 24 | + 'messages' => array() |
|
| 25 | 25 | ); |
| 26 | 26 | |
| 27 | 27 | $cm = new EvolutionCMS\Legacy\ModuleCategoriesManager(); |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | // assign module_params to internal params |
| 30 | 30 | foreach( $_module_params as $param => $value ) |
| 31 | 31 | { |
| 32 | - $cm->set( $param, $value ); |
|
| 32 | + $cm->set( $param, $value ); |
|
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | // catch the request actions |
@@ -37,8 +37,8 @@ discard block |
||
| 37 | 37 | |
| 38 | 38 | if( !$categories = $cm->getCategories() ) |
| 39 | 39 | { |
| 40 | - setcookie('webfxtab_manage-categories-pane', 0 ); |
|
| 41 | - $cm->addMessage( $cm->txt('Currently no categories available... JUST ADD A NEW ONE!'), 'global' ); |
|
| 40 | + setcookie('webfxtab_manage-categories-pane', 0 ); |
|
| 41 | + $cm->addMessage( $cm->txt('Currently no categories available... JUST ADD A NEW ONE!'), 'global' ); |
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | $cm->renderView('main', $categories ); |
@@ -1,14 +1,14 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
|
| 3 | - die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
|
|
| 3 | + die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
|
|
| 4 | 4 | } |
| 5 | 5 | |
| 6 | 6 | $tpl = array( |
| 7 | - 'viewForm' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_viewForm.tpl'), |
|
| 8 | - 'panelGroup' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelGroup.tpl'), |
|
| 9 | - 'panelHeading' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelHeading.tpl'), |
|
| 10 | - 'panelCollapse' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelCollapse.tpl'), |
|
| 11 | - 'elementsRow' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_elementsRow.tpl') |
|
| 7 | + 'viewForm' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_viewForm.tpl'), |
|
| 8 | + 'panelGroup' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelGroup.tpl'), |
|
| 9 | + 'panelHeading' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelHeading.tpl'), |
|
| 10 | + 'panelCollapse' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_panelCollapse.tpl'), |
|
| 11 | + 'elementsRow' => file_get_contents(MODX_MANAGER_PATH . 'actions/resources/tpl_elementsRow.tpl') |
|
| 12 | 12 | ); |
| 13 | 13 | |
| 14 | 14 | if(!function_exists('parsePh')) {
|