evolution-cms /
evolution
@@ -1,8 +1,8 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 3 | 3 | die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly."); |
| 4 | 4 | } |
| 5 | -if(!$modx->hasPermission('edit_user')) { |
|
| 5 | +if (!$modx->hasPermission('edit_user')) { |
|
| 6 | 6 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
| 7 | 7 | } |
| 8 | 8 | |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | <?php |
| 21 | 21 | $rs = $modx->db->select('name, id, description', $modx->getFullTableName('user_roles'), '', 'name'); |
| 22 | 22 | $limit = $modx->db->getRecordCount($rs); |
| 23 | - if($limit < 1) { |
|
| 23 | + if ($limit < 1) { |
|
| 24 | 24 | ?> |
| 25 | 25 | <p><?= $_lang["no_records_found"] ?></p> |
| 26 | 26 | <?php |
@@ -37,8 +37,8 @@ discard block |
||
| 37 | 37 | </thead> |
| 38 | 38 | <tbody> |
| 39 | 39 | <?php |
| 40 | - while($row = $modx->db->getRow($rs)) { |
|
| 41 | - if($row['id'] == 1) { |
|
| 40 | + while ($row = $modx->db->getRow($rs)) { |
|
| 41 | + if ($row['id'] == 1) { |
|
| 42 | 42 | ?> |
| 43 | 43 | <tr class="text-muted disabled"> |
| 44 | 44 | <td><b><?= $row['name'] ?></b></td> |
@@ -1,9 +1,9 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 3 | 3 | die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly."); |
| 4 | 4 | } |
| 5 | 5 | |
| 6 | -if(!$modx->hasPermission('category_manager')) { |
|
| 6 | +if (!$modx->hasPermission('category_manager')) { |
|
| 7 | 7 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
| 8 | 8 | } |
| 9 | 9 | |
@@ -15,32 +15,32 @@ discard block |
||
| 15 | 15 | 'native_language' => 'de', |
| 16 | 16 | 'name' => 'Categories Manager', |
| 17 | 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, |
|
| 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 | 23 | 'request_key' => 'module_categories_manager', |
| 24 | 24 | 'messages' => array() |
| 25 | 25 | ); |
| 26 | 26 | |
| 27 | -require_once $_module_params['inc_dir'] . 'Module_Categories_Manager.php'; |
|
| 27 | +require_once $_module_params['inc_dir'].'Module_Categories_Manager.php'; |
|
| 28 | 28 | $cm = new Module_Categories_Manager(); |
| 29 | 29 | |
| 30 | 30 | // assign module_params to internal params |
| 31 | -foreach( $_module_params as $param => $value ) |
|
| 31 | +foreach ($_module_params as $param => $value) |
|
| 32 | 32 | { |
| 33 | - $cm->set( $param, $value ); |
|
| 33 | + $cm->set($param, $value); |
|
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | // catch the request actions |
| 37 | -include_once $cm->get('inc_dir') . 'request_trigger.inc.php'; |
|
| 37 | +include_once $cm->get('inc_dir').'request_trigger.inc.php'; |
|
| 38 | 38 | |
| 39 | -if( !$categories = $cm->getCategories() ) |
|
| 39 | +if (!$categories = $cm->getCategories()) |
|
| 40 | 40 | { |
| 41 | - setcookie('webfxtab_manage-categories-pane', 0 ); |
|
| 42 | - $cm->addMessage( $cm->txt('Currently no categories available... JUST ADD A NEW ONE!'), 'global' ); |
|
| 41 | + setcookie('webfxtab_manage-categories-pane', 0); |
|
| 42 | + $cm->addMessage($cm->txt('Currently no categories available... JUST ADD A NEW ONE!'), 'global'); |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | -$cm->renderView('main', $categories ); |
|
| 45 | +$cm->renderView('main', $categories); |
|
| 46 | 46 | return; |
@@ -1,35 +1,35 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 3 | 3 | die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly."); |
| 4 | 4 | } |
| 5 | 5 | |
| 6 | 6 | /********************/ |
| 7 | -$sd = isset($_REQUEST['dir']) ? '&dir=' . $_REQUEST['dir'] : '&dir=DESC'; |
|
| 8 | -$sb = isset($_REQUEST['sort']) ? '&sort=' . $_REQUEST['sort'] : '&sort=createdon'; |
|
| 9 | -$pg = isset($_REQUEST['page']) ? '&page=' . (int) $_REQUEST['page'] : ''; |
|
| 10 | -$add_path = $sd . $sb . $pg; |
|
| 7 | +$sd = isset($_REQUEST['dir']) ? '&dir='.$_REQUEST['dir'] : '&dir=DESC'; |
|
| 8 | +$sb = isset($_REQUEST['sort']) ? '&sort='.$_REQUEST['sort'] : '&sort=createdon'; |
|
| 9 | +$pg = isset($_REQUEST['page']) ? '&page='.(int) $_REQUEST['page'] : ''; |
|
| 10 | +$add_path = $sd.$sb.$pg; |
|
| 11 | 11 | /*******************/ |
| 12 | 12 | |
| 13 | 13 | // check permissions |
| 14 | -switch($modx->manager->action) { |
|
| 14 | +switch ($modx->manager->action) { |
|
| 15 | 15 | case 27: |
| 16 | - if(!$modx->hasPermission('edit_document')) { |
|
| 16 | + if (!$modx->hasPermission('edit_document')) { |
|
| 17 | 17 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
| 18 | 18 | } |
| 19 | 19 | break; |
| 20 | 20 | case 85: |
| 21 | 21 | case 72: |
| 22 | 22 | case 4: |
| 23 | - if(!$modx->hasPermission('new_document')) { |
|
| 23 | + if (!$modx->hasPermission('new_document')) { |
|
| 24 | 24 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
| 25 | - } elseif(isset($_REQUEST['pid']) && $_REQUEST['pid'] != '0') { |
|
| 25 | + } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '0') { |
|
| 26 | 26 | // check user has permissions for parent |
| 27 | - include_once(MODX_MANAGER_PATH . 'processors/user_documents_permissions.class.php'); |
|
| 27 | + include_once(MODX_MANAGER_PATH.'processors/user_documents_permissions.class.php'); |
|
| 28 | 28 | $udperms = new udperms(); |
| 29 | 29 | $udperms->user = $modx->getLoginUserID(); |
| 30 | 30 | $udperms->document = empty($_REQUEST['pid']) ? 0 : $_REQUEST['pid']; |
| 31 | 31 | $udperms->role = $_SESSION['mgrRole']; |
| 32 | - if(!$udperms->checkPermissions()) { |
|
| 32 | + if (!$udperms->checkPermissions()) { |
|
| 33 | 33 | $modx->webAlertAndQuit($_lang["access_permission_denied"]); |
| 34 | 34 | } |
| 35 | 35 | } |
@@ -53,22 +53,22 @@ discard block |
||
| 53 | 53 | $tbl_site_tmplvar_templates = $modx->getFullTableName('site_tmplvar_templates'); |
| 54 | 54 | $tbl_site_tmplvars = $modx->getFullTableName('site_tmplvars'); |
| 55 | 55 | |
| 56 | -if($modx->manager->action == 27) { |
|
| 56 | +if ($modx->manager->action == 27) { |
|
| 57 | 57 | //editing an existing document |
| 58 | 58 | // check permissions on the document |
| 59 | - include_once(MODX_MANAGER_PATH . 'processors/user_documents_permissions.class.php'); |
|
| 59 | + include_once(MODX_MANAGER_PATH.'processors/user_documents_permissions.class.php'); |
|
| 60 | 60 | $udperms = new udperms(); |
| 61 | 61 | $udperms->user = $modx->getLoginUserID(); |
| 62 | 62 | $udperms->document = $id; |
| 63 | 63 | $udperms->role = $_SESSION['mgrRole']; |
| 64 | 64 | |
| 65 | - if(!$udperms->checkPermissions()) { |
|
| 65 | + if (!$udperms->checkPermissions()) { |
|
| 66 | 66 | $modx->webAlertAndQuit($_lang["access_permission_denied"]); |
| 67 | 67 | } |
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | // check to see if resource isn't locked |
| 71 | -if($lockedEl = $modx->elementIsLocked(7, $id)) { |
|
| 71 | +if ($lockedEl = $modx->elementIsLocked(7, $id)) { |
|
| 72 | 72 | $modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['resource'])); |
| 73 | 73 | } |
| 74 | 74 | // end check for lock |
@@ -77,27 +77,27 @@ discard block |
||
| 77 | 77 | $modx->lockElement(7, $id); |
| 78 | 78 | |
| 79 | 79 | // get document groups for current user |
| 80 | -if($_SESSION['mgrDocgroups']) { |
|
| 80 | +if ($_SESSION['mgrDocgroups']) { |
|
| 81 | 81 | $docgrp = implode(',', $_SESSION['mgrDocgroups']); |
| 82 | 82 | } |
| 83 | 83 | |
| 84 | -if(!empty ($id)) { |
|
| 84 | +if (!empty ($id)) { |
|
| 85 | 85 | $access = sprintf("1='%s' OR sc.privatemgr=0", $_SESSION['mgrRole']); |
| 86 | - if($docgrp) { |
|
| 86 | + if ($docgrp) { |
|
| 87 | 87 | $access .= " OR dg.document_group IN ({$docgrp})"; |
| 88 | 88 | } |
| 89 | 89 | $rs = $modx->db->select('sc.*', "{$tbl_site_content} AS sc LEFT JOIN {$tbl_document_groups} AS dg ON dg.document=sc.id", "sc.id='{$id}' AND ({$access})"); |
| 90 | 90 | $content = array(); |
| 91 | 91 | $content = $modx->db->getRow($rs); |
| 92 | 92 | $modx->documentObject = &$content; |
| 93 | - if(!$content) { |
|
| 93 | + if (!$content) { |
|
| 94 | 94 | $modx->webAlertAndQuit($_lang["access_permission_denied"]); |
| 95 | 95 | } |
| 96 | 96 | $_SESSION['itemname'] = $content['pagetitle']; |
| 97 | 97 | } else { |
| 98 | 98 | $content = array(); |
| 99 | 99 | |
| 100 | - if(isset($_REQUEST['newtemplate'])) { |
|
| 100 | + if (isset($_REQUEST['newtemplate'])) { |
|
| 101 | 101 | $content['template'] = $_REQUEST['newtemplate']; |
| 102 | 102 | } else { |
| 103 | 103 | $content['template'] = getDefaultTemplate(); |
@@ -108,22 +108,22 @@ discard block |
||
| 108 | 108 | |
| 109 | 109 | // restore saved form |
| 110 | 110 | $formRestored = $modx->manager->loadFormValues(); |
| 111 | -if(isset($_REQUEST['newtemplate'])) { |
|
| 111 | +if (isset($_REQUEST['newtemplate'])) { |
|
| 112 | 112 | $formRestored = true; |
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | // retain form values if template was changed |
| 116 | 116 | // edited to convert pub_date and unpub_date |
| 117 | 117 | // sottwell 02-09-2006 |
| 118 | -if($formRestored == true) { |
|
| 118 | +if ($formRestored == true) { |
|
| 119 | 119 | $content = array_merge($content, $_POST); |
| 120 | 120 | $content['content'] = $_POST['ta']; |
| 121 | - if(empty ($content['pub_date'])) { |
|
| 121 | + if (empty ($content['pub_date'])) { |
|
| 122 | 122 | unset ($content['pub_date']); |
| 123 | 123 | } else { |
| 124 | 124 | $content['pub_date'] = $modx->toTimeStamp($content['pub_date']); |
| 125 | 125 | } |
| 126 | - if(empty ($content['unpub_date'])) { |
|
| 126 | + if (empty ($content['unpub_date'])) { |
|
| 127 | 127 | unset ($content['unpub_date']); |
| 128 | 128 | } else { |
| 129 | 129 | $content['unpub_date'] = $modx->toTimeStamp($content['unpub_date']); |
@@ -131,11 +131,11 @@ discard block |
||
| 131 | 131 | } |
| 132 | 132 | |
| 133 | 133 | // increase menu index if this is a new document |
| 134 | -if(!isset ($_REQUEST['id'])) { |
|
| 135 | - if(!isset ($modx->config['auto_menuindex'])) { |
|
| 134 | +if (!isset ($_REQUEST['id'])) { |
|
| 135 | + if (!isset ($modx->config['auto_menuindex'])) { |
|
| 136 | 136 | $modx->config['auto_menuindex'] = 1; |
| 137 | 137 | } |
| 138 | - if($modx->config['auto_menuindex']) { |
|
| 138 | + if ($modx->config['auto_menuindex']) { |
|
| 139 | 139 | $pid = intval($_REQUEST['pid']); |
| 140 | 140 | $rs = $modx->db->select('count(*)', $tbl_site_content, "parent='{$pid}'"); |
| 141 | 141 | $content['menuindex'] = $modx->db->getValue($rs); |
@@ -144,14 +144,14 @@ discard block |
||
| 144 | 144 | } |
| 145 | 145 | } |
| 146 | 146 | |
| 147 | -if(isset ($_POST['which_editor'])) { |
|
| 147 | +if (isset ($_POST['which_editor'])) { |
|
| 148 | 148 | $modx->config['which_editor'] = $_POST['which_editor']; |
| 149 | 149 | } |
| 150 | 150 | |
| 151 | 151 | // Add lock-element JS-Script |
| 152 | 152 | $lockElementId = $id; |
| 153 | 153 | $lockElementType = 7; |
| 154 | -require_once(MODX_MANAGER_PATH . 'includes/active_user_locks.inc.php'); |
|
| 154 | +require_once(MODX_MANAGER_PATH.'includes/active_user_locks.inc.php'); |
|
| 155 | 155 | ?> |
| 156 | 156 | <script type="text/javascript"> |
| 157 | 157 | /* <![CDATA[ */ |
@@ -181,7 +181,7 @@ discard block |
||
| 181 | 181 | }, |
| 182 | 182 | cancel: function() { |
| 183 | 183 | documentDirty = false; |
| 184 | - document.location.href = 'index.php?<?=($id == 0 ? 'a=2' : 'a=3&r=1&id=' . $id . $add_path) ?>'; |
|
| 184 | + document.location.href = 'index.php?<?=($id == 0 ? 'a=2' : 'a=3&r=1&id='.$id.$add_path) ?>'; |
|
| 185 | 185 | }, |
| 186 | 186 | duplicate: function() { |
| 187 | 187 | if(confirm("<?= $_lang['confirm_resource_duplicate']?>") === true) { |
@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | } |
| 190 | 190 | }, |
| 191 | 191 | view: function() { |
| 192 | - window.open('<?= ($modx->config['friendly_urls'] == '1') ? $modx->makeUrl($id) : $modx->config['site_url'] . 'index.php?id=' . $id ?>', 'previeWin'); |
|
| 192 | + window.open('<?= ($modx->config['friendly_urls'] == '1') ? $modx->makeUrl($id) : $modx->config['site_url'].'index.php?id='.$id ?>', 'previeWin'); |
|
| 193 | 193 | } |
| 194 | 194 | }; |
| 195 | 195 | |
@@ -551,7 +551,7 @@ discard block |
||
| 551 | 551 | 'template' => $content['template'] |
| 552 | 552 | )); |
| 553 | 553 | |
| 554 | - if(is_array($evtOut)) { |
|
| 554 | + if (is_array($evtOut)) { |
|
| 555 | 555 | echo implode('', $evtOut); |
| 556 | 556 | } |
| 557 | 557 | |
@@ -575,8 +575,8 @@ discard block |
||
| 575 | 575 | <fieldset id="create_edit"> |
| 576 | 576 | |
| 577 | 577 | <h1> |
| 578 | - <i class="fa fa-pencil-square-o"></i><?php if(isset($_REQUEST['id'])) { |
|
| 579 | - echo iconv_substr($content['pagetitle'], 0, 50, $modx->config['modx_charset']) . (iconv_strlen($content['pagetitle'], $modx->config['modx_charset']) > 50 ? '...' : '') . '<small>(' . $_REQUEST['id'] . ')</small>'; |
|
| 578 | + <i class="fa fa-pencil-square-o"></i><?php if (isset($_REQUEST['id'])) { |
|
| 579 | + echo iconv_substr($content['pagetitle'], 0, 50, $modx->config['modx_charset']).(iconv_strlen($content['pagetitle'], $modx->config['modx_charset']) > 50 ? '...' : '').'<small>('.$_REQUEST['id'].')</small>'; |
|
| 580 | 580 | } else { |
| 581 | 581 | if ($modx->manager->action == '4') { |
| 582 | 582 | echo $_lang['add_resource']; |
@@ -592,36 +592,36 @@ discard block |
||
| 592 | 592 | |
| 593 | 593 | <?php |
| 594 | 594 | // breadcrumbs |
| 595 | - if($modx->config['use_breadcrumbs']) { |
|
| 595 | + if ($modx->config['use_breadcrumbs']) { |
|
| 596 | 596 | $temp = array(); |
| 597 | 597 | $title = isset($content['pagetitle']) ? $content['pagetitle'] : $_lang['create_resource_title']; |
| 598 | 598 | |
| 599 | - if(isset($_REQUEST['id']) && $content['parent'] != 0) { |
|
| 599 | + if (isset($_REQUEST['id']) && $content['parent'] != 0) { |
|
| 600 | 600 | $bID = (int) $_REQUEST['id']; |
| 601 | 601 | $temp = $modx->getParentIds($bID); |
| 602 | - } else if(isset($_REQUEST['pid'])) { |
|
| 602 | + } else if (isset($_REQUEST['pid'])) { |
|
| 603 | 603 | $bID = (int) $_REQUEST['pid']; |
| 604 | 604 | $temp = $modx->getParentIds($bID); |
| 605 | 605 | array_unshift($temp, $bID); |
| 606 | 606 | } |
| 607 | 607 | |
| 608 | - if($temp) { |
|
| 608 | + if ($temp) { |
|
| 609 | 609 | $parents = implode(',', $temp); |
| 610 | 610 | |
| 611 | - if(!empty($parents)) { |
|
| 611 | + if (!empty($parents)) { |
|
| 612 | 612 | $where = "FIND_IN_SET(id,'{$parents}') DESC"; |
| 613 | 613 | $rs = $modx->db->select('id, pagetitle', $tbl_site_content, "id IN ({$parents})", $where); |
| 614 | - while($row = $modx->db->getRow($rs)) { |
|
| 614 | + while ($row = $modx->db->getRow($rs)) { |
|
| 615 | 615 | $out .= '<li class="breadcrumbs__li"> |
| 616 | - <a href="index.php?a=27&id=' . $row['id'] . '" class="breadcrumbs__a">' . htmlspecialchars($row['pagetitle'], ENT_QUOTES, $modx->config['modx_charset']) . '</a> |
|
| 616 | + <a href="index.php?a=27&id=' . $row['id'].'" class="breadcrumbs__a">'.htmlspecialchars($row['pagetitle'], ENT_QUOTES, $modx->config['modx_charset']).'</a> |
|
| 617 | 617 | <span class="breadcrumbs__sep">></span> |
| 618 | 618 | </li>'; |
| 619 | 619 | } |
| 620 | 620 | } |
| 621 | 621 | } |
| 622 | 622 | |
| 623 | - $out .= '<li class="breadcrumbs__li breadcrumbs__li_current">' . $title . '</li>'; |
|
| 624 | - echo '<ul class="breadcrumbs">' . $out . '</ul>'; |
|
| 623 | + $out .= '<li class="breadcrumbs__li breadcrumbs__li_current">'.$title.'</li>'; |
|
| 624 | + echo '<ul class="breadcrumbs">'.$out.'</ul>'; |
|
| 625 | 625 | } |
| 626 | 626 | ?> |
| 627 | 627 | |
@@ -638,7 +638,7 @@ discard block |
||
| 638 | 638 | $evtOut = $modx->invokeEvent('OnDocFormTemplateRender', array( |
| 639 | 639 | 'id' => $id |
| 640 | 640 | )); |
| 641 | - if(is_array($evtOut)) { |
|
| 641 | + if (is_array($evtOut)) { |
|
| 642 | 642 | echo implode('', $evtOut); |
| 643 | 643 | } else { |
| 644 | 644 | ?> |
@@ -694,7 +694,7 @@ discard block |
||
| 694 | 694 | </td> |
| 695 | 695 | </tr> |
| 696 | 696 | |
| 697 | - <?php if($content['type'] == 'reference' || $modx->manager->action == '72') { // Web Link specific ?> |
|
| 697 | + <?php if ($content['type'] == 'reference' || $modx->manager->action == '72') { // Web Link specific ?> |
|
| 698 | 698 | |
| 699 | 699 | <tr> |
| 700 | 700 | <td><span class="warning"><?= $_lang['weblink'] ?></span> |
@@ -730,17 +730,17 @@ discard block |
||
| 730 | 730 | $from = "{$tbl_site_templates} AS t LEFT JOIN {$tbl_categories} AS c ON t.category = c.id"; |
| 731 | 731 | $rs = $modx->db->select($field, $from, '', 'c.category, t.templatename ASC'); |
| 732 | 732 | $currentCategory = ''; |
| 733 | - while($row = $modx->db->getRow($rs)) { |
|
| 734 | - if($row['selectable'] != 1 && $row['id'] != $content['template']) { |
|
| 733 | + while ($row = $modx->db->getRow($rs)) { |
|
| 734 | + if ($row['selectable'] != 1 && $row['id'] != $content['template']) { |
|
| 735 | 735 | continue; |
| 736 | 736 | }; |
| 737 | 737 | // Skip if not selectable but show if selected! |
| 738 | 738 | $thisCategory = $row['category']; |
| 739 | - if($thisCategory == null) { |
|
| 739 | + if ($thisCategory == null) { |
|
| 740 | 740 | $thisCategory = $_lang["no_category"]; |
| 741 | 741 | } |
| 742 | - if($thisCategory != $currentCategory) { |
|
| 743 | - if($closeOptGroup) { |
|
| 742 | + if ($thisCategory != $currentCategory) { |
|
| 743 | + if ($closeOptGroup) { |
|
| 744 | 744 | echo "\t\t\t\t\t</optgroup>\n"; |
| 745 | 745 | } |
| 746 | 746 | echo "\t\t\t\t\t<optgroup label=\"$thisCategory\">\n"; |
@@ -749,10 +749,10 @@ discard block |
||
| 749 | 749 | |
| 750 | 750 | $selectedtext = ($row['id'] == $content['template']) ? ' selected="selected"' : ''; |
| 751 | 751 | |
| 752 | - echo "\t\t\t\t\t" . '<option value="' . $row['id'] . '"' . $selectedtext . '>' . $row['templatename'] . "</option>\n"; |
|
| 752 | + echo "\t\t\t\t\t".'<option value="'.$row['id'].'"'.$selectedtext.'>'.$row['templatename']."</option>\n"; |
|
| 753 | 753 | $currentCategory = $thisCategory; |
| 754 | 754 | } |
| 755 | - if($thisCategory != '') { |
|
| 755 | + if ($thisCategory != '') { |
|
| 756 | 756 | echo "\t\t\t\t\t</optgroup>\n"; |
| 757 | 757 | } |
| 758 | 758 | ?> |
@@ -796,20 +796,20 @@ discard block |
||
| 796 | 796 | <td valign="top"> |
| 797 | 797 | <?php |
| 798 | 798 | $parentlookup = false; |
| 799 | - if(isset ($_REQUEST['id'])) { |
|
| 800 | - if($content['parent'] == 0) { |
|
| 799 | + if (isset ($_REQUEST['id'])) { |
|
| 800 | + if ($content['parent'] == 0) { |
|
| 801 | 801 | $parentname = $site_name; |
| 802 | 802 | } else { |
| 803 | 803 | $parentlookup = $content['parent']; |
| 804 | 804 | } |
| 805 | - } elseif(isset ($_REQUEST['pid'])) { |
|
| 806 | - if($_REQUEST['pid'] == 0) { |
|
| 805 | + } elseif (isset ($_REQUEST['pid'])) { |
|
| 806 | + if ($_REQUEST['pid'] == 0) { |
|
| 807 | 807 | $parentname = $site_name; |
| 808 | 808 | } else { |
| 809 | 809 | $parentlookup = $_REQUEST['pid']; |
| 810 | 810 | } |
| 811 | - } elseif(isset($_POST['parent'])) { |
|
| 812 | - if($_POST['parent'] == 0) { |
|
| 811 | + } elseif (isset($_POST['parent'])) { |
|
| 812 | + if ($_POST['parent'] == 0) { |
|
| 813 | 813 | $parentname = $site_name; |
| 814 | 814 | } else { |
| 815 | 815 | $parentlookup = $_POST['parent']; |
@@ -818,10 +818,10 @@ discard block |
||
| 818 | 818 | $parentname = $site_name; |
| 819 | 819 | $content['parent'] = 0; |
| 820 | 820 | } |
| 821 | - if($parentlookup !== false && is_numeric($parentlookup)) { |
|
| 821 | + if ($parentlookup !== false && is_numeric($parentlookup)) { |
|
| 822 | 822 | $rs = $modx->db->select('pagetitle', $tbl_site_content, "id='{$parentlookup}'"); |
| 823 | 823 | $parentname = $modx->db->getValue($rs); |
| 824 | - if(!$parentname) { |
|
| 824 | + if (!$parentname) { |
|
| 825 | 825 | $modx->webAlertAndQuit($_lang["error_no_parent"]); |
| 826 | 826 | } |
| 827 | 827 | } |
@@ -863,7 +863,7 @@ discard block |
||
| 863 | 863 | }*/ |
| 864 | 864 | ?> |
| 865 | 865 | |
| 866 | - <?php if($content['type'] == 'document' || $modx->manager->action == '4') { ?> |
|
| 866 | + <?php if ($content['type'] == 'document' || $modx->manager->action == '4') { ?> |
|
| 867 | 867 | <tr> |
| 868 | 868 | <td colspan="2"> |
| 869 | 869 | <hr> |
@@ -876,8 +876,8 @@ discard block |
||
| 876 | 876 | <?php |
| 877 | 877 | // invoke OnRichTextEditorRegister event |
| 878 | 878 | $evtOut = $modx->invokeEvent("OnRichTextEditorRegister"); |
| 879 | - if(is_array($evtOut)) { |
|
| 880 | - for($i = 0; $i < count($evtOut); $i++) { |
|
| 879 | + if (is_array($evtOut)) { |
|
| 880 | + for ($i = 0; $i < count($evtOut); $i++) { |
|
| 881 | 881 | $editor = $evtOut[$i]; |
| 882 | 882 | echo "\t\t\t", '<option value="', $editor, '"', ($modx->config['which_editor'] == $editor ? ' selected="selected"' : ''), '>', $editor, "</option>\n"; |
| 883 | 883 | } |
@@ -888,7 +888,7 @@ discard block |
||
| 888 | 888 | </div> |
| 889 | 889 | <div id="content_body"> |
| 890 | 890 | <?php |
| 891 | - if(($content['richtext'] == 1 || $modx->manager->action == '4') && $use_editor == 1) { |
|
| 891 | + if (($content['richtext'] == 1 || $modx->manager->action == '4') && $use_editor == 1) { |
|
| 892 | 892 | $htmlContent = $content['content']; |
| 893 | 893 | ?> |
| 894 | 894 | <div class="section-editor clearfix"> |
@@ -901,7 +901,7 @@ discard block |
||
| 901 | 901 | $richtexteditorIds[$modx->config['which_editor']][] = 'ta'; |
| 902 | 902 | $richtexteditorOptions[$modx->config['which_editor']]['ta'] = ''; |
| 903 | 903 | } else { |
| 904 | - echo "\t" . '<div><textarea class="phptextarea" id="ta" name="ta" rows="20" wrap="soft" onchange="documentDirty=true;">', $modx->htmlspecialchars($content['content']), '</textarea></div>' . "\n"; |
|
| 904 | + echo "\t".'<div><textarea class="phptextarea" id="ta" name="ta" rows="20" wrap="soft" onchange="documentDirty=true;">', $modx->htmlspecialchars($content['content']), '</textarea></div>'."\n"; |
|
| 905 | 905 | } |
| 906 | 906 | ?> |
| 907 | 907 | </div> |
@@ -917,7 +917,7 @@ discard block |
||
| 917 | 917 | |
| 918 | 918 | if (($content['type'] == 'document' || $modx->manager->action == '4') || ($content['type'] == 'reference' || $modx->manager->action == 72)) { |
| 919 | 919 | $template = $default_template; |
| 920 | - $group_tvs = empty($modx->config['group_tvs']) ? 0 : (int)$modx->config['group_tvs']; |
|
| 920 | + $group_tvs = empty($modx->config['group_tvs']) ? 0 : (int) $modx->config['group_tvs']; |
|
| 921 | 921 | if (isset ($_REQUEST['newtemplate'])) { |
| 922 | 922 | $template = $_REQUEST['newtemplate']; |
| 923 | 923 | } else { |
@@ -945,10 +945,10 @@ discard block |
||
| 945 | 945 | ); |
| 946 | 946 | $sort = 'tvtpl.rank,tv.rank, tv.id'; |
| 947 | 947 | if ($group_tvs) { |
| 948 | - $field .= ', IFNULL(tv.category,0) as category_id, IFNULL(cat.category,"' . $_lang['no_category'] . '") AS category, IFNULL(cat.rank,0) AS category_rank'; |
|
| 948 | + $field .= ', IFNULL(tv.category,0) as category_id, IFNULL(cat.category,"'.$_lang['no_category'].'") AS category, IFNULL(cat.rank,0) AS category_rank'; |
|
| 949 | 949 | $from .= ' |
| 950 | - LEFT JOIN ' . $tbl_categories . ' AS cat ON cat.id=tv.category'; |
|
| 951 | - $sort = 'cat.rank,cat.id,' . $sort; |
|
| 950 | + LEFT JOIN ' . $tbl_categories.' AS cat ON cat.id=tv.category'; |
|
| 951 | + $sort = 'cat.rank,cat.id,'.$sort; |
|
| 952 | 952 | } |
| 953 | 953 | $where = vsprintf("tvtpl.templateid='%s' AND (1='%s' OR ISNULL(tva.documentgroup) %s)", $vs); |
| 954 | 954 | $rs = $modx->db->select($field, $from, $where, $sort); |
@@ -957,37 +957,37 @@ discard block |
||
| 957 | 957 | <!-- Template Variables -->' . "\n"; |
| 958 | 958 | if (!$group_tvs) { |
| 959 | 959 | $templateVariables .= ' |
| 960 | - <div class="sectionHeader" id="tv_header">' . $_lang['settings_templvars'] . '</div> |
|
| 960 | + <div class="sectionHeader" id="tv_header">' . $_lang['settings_templvars'].'</div> |
|
| 961 | 961 | <div class="sectionBody tmplvars"> |
| 962 | 962 | <table>'; |
| 963 | 963 | } else if ($group_tvs == 2) { |
| 964 | 964 | $templateVariables .= ' |
| 965 | 965 | <div class="tab-section"> |
| 966 | - <div class="tab-header" id="tv_header">' . $_lang['settings_templvars'] . '</div> |
|
| 966 | + <div class="tab-header" id="tv_header">' . $_lang['settings_templvars'].'</div> |
|
| 967 | 967 | <div class="tab-pane" id="paneTemplateVariables"> |
| 968 | 968 | <script type="text/javascript"> |
| 969 | - tpTemplateVariables = new WebFXTabPane(document.getElementById(\'paneTemplateVariables\'), ' . ($modx->config['remember_last_tab'] == 1 ? 'true' : 'false') . '); |
|
| 969 | + tpTemplateVariables = new WebFXTabPane(document.getElementById(\'paneTemplateVariables\'), ' . ($modx->config['remember_last_tab'] == 1 ? 'true' : 'false').'); |
|
| 970 | 970 | </script>'; |
| 971 | 971 | } else if ($group_tvs == 3) { |
| 972 | 972 | $templateVariables .= ' |
| 973 | 973 | <div id="templateVariables" class="tab-page tmplvars"> |
| 974 | - <h2 class="tab">' . $_lang['settings_templvars'] . '</h2> |
|
| 974 | + <h2 class="tab">' . $_lang['settings_templvars'].'</h2> |
|
| 975 | 975 | <script type="text/javascript">tpSettings.addTabPage(document.getElementById(\'templateVariables\'));</script>'; |
| 976 | 976 | } else if ($group_tvs == 4) { |
| 977 | 977 | $templateVariables .= ' |
| 978 | 978 | <div id="templateVariables" class="tab-page tmplvars"> |
| 979 | - <h2 class="tab">' . $_lang['settings_templvars'] . '</h2> |
|
| 979 | + <h2 class="tab">' . $_lang['settings_templvars'].'</h2> |
|
| 980 | 980 | <script type="text/javascript">tpSettings.addTabPage(document.getElementById(\'templateVariables\'));</script> |
| 981 | 981 | |
| 982 | 982 | <div class="tab-pane" id="paneTemplateVariables"> |
| 983 | 983 | <script type="text/javascript"> |
| 984 | - tpTemplateVariables = new WebFXTabPane(document.getElementById(\'paneTemplateVariables\'), ' . ($modx->config['remember_last_tab'] == 1 ? 'true' : 'false') . '); |
|
| 984 | + tpTemplateVariables = new WebFXTabPane(document.getElementById(\'paneTemplateVariables\'), ' . ($modx->config['remember_last_tab'] == 1 ? 'true' : 'false').'); |
|
| 985 | 985 | </script>'; |
| 986 | 986 | } |
| 987 | 987 | |
| 988 | 988 | $tvsArray = $modx->db->makeArray($rs, 'name'); |
| 989 | - require_once(MODX_MANAGER_PATH . 'includes/tmplvars.inc.php'); |
|
| 990 | - require_once(MODX_MANAGER_PATH . 'includes/tmplvars.commands.inc.php'); |
|
| 989 | + require_once(MODX_MANAGER_PATH.'includes/tmplvars.inc.php'); |
|
| 990 | + require_once(MODX_MANAGER_PATH.'includes/tmplvars.commands.inc.php'); |
|
| 991 | 991 | $i = 0; |
| 992 | 992 | $tab = ''; |
| 993 | 993 | foreach ($tvsArray as $row) { |
@@ -995,8 +995,8 @@ discard block |
||
| 995 | 995 | if ($group_tvs == 1 || $group_tvs == 3) { |
| 996 | 996 | if ($i === 0) { |
| 997 | 997 | $templateVariables .= ' |
| 998 | - <div class="tab-section" id="tabTV_' . $row['category_id'] . '"> |
|
| 999 | - <div class="tab-header">' . $row['category'] . '</div> |
|
| 998 | + <div class="tab-section" id="tabTV_' . $row['category_id'].'"> |
|
| 999 | + <div class="tab-header">' . $row['category'].'</div> |
|
| 1000 | 1000 | <div class="tab-body tmplvars"> |
| 1001 | 1001 | <table>' . "\n"; |
| 1002 | 1002 | } else { |
@@ -1005,17 +1005,17 @@ discard block |
||
| 1005 | 1005 | </div> |
| 1006 | 1006 | </div> |
| 1007 | 1007 | |
| 1008 | - <div class="tab-section" id="tabTV_' . $row['category_id'] . '"> |
|
| 1009 | - <div class="tab-header">' . $row['category'] . '</div> |
|
| 1008 | + <div class="tab-section" id="tabTV_' . $row['category_id'].'"> |
|
| 1009 | + <div class="tab-header">' . $row['category'].'</div> |
|
| 1010 | 1010 | <div class="tab-body tmplvars"> |
| 1011 | 1011 | <table>'; |
| 1012 | 1012 | } |
| 1013 | 1013 | } else if ($group_tvs == 2 || $group_tvs == 4) { |
| 1014 | 1014 | if ($i === 0) { |
| 1015 | 1015 | $templateVariables .= ' |
| 1016 | - <div id="tabTV_' . $row['category_id'] . '" class="tab-page tmplvars"> |
|
| 1017 | - <h2 class="tab">' . $row['category'] . '</h2> |
|
| 1018 | - <script type="text/javascript">tpTemplateVariables.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'] . '\'));</script> |
|
| 1016 | + <div id="tabTV_' . $row['category_id'].'" class="tab-page tmplvars"> |
|
| 1017 | + <h2 class="tab">' . $row['category'].'</h2> |
|
| 1018 | + <script type="text/javascript">tpTemplateVariables.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'].'\'));</script> |
|
| 1019 | 1019 | |
| 1020 | 1020 | <div class="tab-body tmplvars"> |
| 1021 | 1021 | <table>'; |
@@ -1025,9 +1025,9 @@ discard block |
||
| 1025 | 1025 | </div> |
| 1026 | 1026 | </div> |
| 1027 | 1027 | |
| 1028 | - <div id="tabTV_' . $row['category_id'] . '" class="tab-page tmplvars"> |
|
| 1029 | - <h2 class="tab">' . $row['category'] . '</h2> |
|
| 1030 | - <script type="text/javascript">tpTemplateVariables.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'] . '\'));</script> |
|
| 1028 | + <div id="tabTV_' . $row['category_id'].'" class="tab-page tmplvars"> |
|
| 1029 | + <h2 class="tab">' . $row['category'].'</h2> |
|
| 1030 | + <script type="text/javascript">tpTemplateVariables.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'].'\'));</script> |
|
| 1031 | 1031 | |
| 1032 | 1032 | <div class="tab-body tmplvars"> |
| 1033 | 1033 | <table>'; |
@@ -1035,18 +1035,18 @@ discard block |
||
| 1035 | 1035 | } else if ($group_tvs == 5) { |
| 1036 | 1036 | if ($i === 0) { |
| 1037 | 1037 | $templateVariables .= ' |
| 1038 | - <div id="tabTV_' . $row['category_id'] . '" class="tab-page tmplvars"> |
|
| 1039 | - <h2 class="tab">' . $row['category'] . '</h2> |
|
| 1040 | - <script type="text/javascript">tpSettings.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'] . '\'));</script> |
|
| 1038 | + <div id="tabTV_' . $row['category_id'].'" class="tab-page tmplvars"> |
|
| 1039 | + <h2 class="tab">' . $row['category'].'</h2> |
|
| 1040 | + <script type="text/javascript">tpSettings.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'].'\'));</script> |
|
| 1041 | 1041 | <table>'; |
| 1042 | 1042 | } else { |
| 1043 | 1043 | $templateVariables .= ' |
| 1044 | 1044 | </table> |
| 1045 | 1045 | </div> |
| 1046 | 1046 | |
| 1047 | - <div id="tabTV_' . $row['category_id'] . '" class="tab-page tmplvars"> |
|
| 1048 | - <h2 class="tab">' . $row['category'] . '</h2> |
|
| 1049 | - <script type="text/javascript">tpSettings.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'] . '\'));</script> |
|
| 1047 | + <div id="tabTV_' . $row['category_id'].'" class="tab-page tmplvars"> |
|
| 1048 | + <h2 class="tab">' . $row['category'].'</h2> |
|
| 1049 | + <script type="text/javascript">tpSettings.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'].'\'));</script> |
|
| 1050 | 1050 | |
| 1051 | 1051 | <table>'; |
| 1052 | 1052 | } |
@@ -1064,8 +1064,8 @@ discard block |
||
| 1064 | 1064 | $editor = isset($tvOptions['editor']) ? $tvOptions['editor'] : $modx->config['which_editor']; |
| 1065 | 1065 | }; |
| 1066 | 1066 | // Add richtext editor to the list |
| 1067 | - $richtexteditorIds[$editor][] = "tv" . $row['id']; |
|
| 1068 | - $richtexteditorOptions[$editor]["tv" . $row['id']] = $tvOptions; |
|
| 1067 | + $richtexteditorIds[$editor][] = "tv".$row['id']; |
|
| 1068 | + $richtexteditorOptions[$editor]["tv".$row['id']] = $tvOptions; |
|
| 1069 | 1069 | } |
| 1070 | 1070 | // splitter |
| 1071 | 1071 | if ($group_tvs) { |
@@ -1079,24 +1079,24 @@ discard block |
||
| 1079 | 1079 | } |
| 1080 | 1080 | |
| 1081 | 1081 | // post back value |
| 1082 | - if (array_key_exists('tv' . $row['id'], $_POST)) { |
|
| 1083 | - if (is_array($_POST['tv' . $row['id']])) { |
|
| 1084 | - $tvPBV = implode('||', $_POST['tv' . $row['id']]); |
|
| 1082 | + if (array_key_exists('tv'.$row['id'], $_POST)) { |
|
| 1083 | + if (is_array($_POST['tv'.$row['id']])) { |
|
| 1084 | + $tvPBV = implode('||', $_POST['tv'.$row['id']]); |
|
| 1085 | 1085 | } else { |
| 1086 | - $tvPBV = $_POST['tv' . $row['id']]; |
|
| 1086 | + $tvPBV = $_POST['tv'.$row['id']]; |
|
| 1087 | 1087 | } |
| 1088 | 1088 | } else { |
| 1089 | 1089 | $tvPBV = $row['value']; |
| 1090 | 1090 | } |
| 1091 | 1091 | |
| 1092 | - $tvDescription = (!empty($row['description'])) ? '<br /><span class="comment">' . $row['description'] . '</span>' : ''; |
|
| 1093 | - $tvInherited = (substr($tvPBV, 0, 8) == '@INHERIT') ? '<br /><span class="comment inherited">(' . $_lang['tmplvars_inherited'] . ')</span>' : ''; |
|
| 1094 | - $tvName = $modx->hasPermission('edit_template') ? '<br/><small class="protectedNode">[*' . $row['name'] . '*]</small>' : ''; |
|
| 1092 | + $tvDescription = (!empty($row['description'])) ? '<br /><span class="comment">'.$row['description'].'</span>' : ''; |
|
| 1093 | + $tvInherited = (substr($tvPBV, 0, 8) == '@INHERIT') ? '<br /><span class="comment inherited">('.$_lang['tmplvars_inherited'].')</span>' : ''; |
|
| 1094 | + $tvName = $modx->hasPermission('edit_template') ? '<br/><small class="protectedNode">[*'.$row['name'].'*]</small>' : ''; |
|
| 1095 | 1095 | |
| 1096 | 1096 | $templateVariables .= ' |
| 1097 | 1097 | <tr> |
| 1098 | - <td><span class="warning">' . $row['caption'] . $tvName . '</span>' . $tvDescription . $tvInherited . '</td> |
|
| 1099 | - <td><div style="position:relative;' . ($row['type'] == 'date' ? '' : '') . '">' . renderFormElement($row['type'], $row['id'], $row['default_text'], $row['elements'], $tvPBV, '', $row, $tvsArray) . '</div></td> |
|
| 1098 | + <td><span class="warning">' . $row['caption'].$tvName.'</span>'.$tvDescription.$tvInherited.'</td> |
|
| 1099 | + <td><div style="position:relative;' . ($row['type'] == 'date' ? '' : '').'">'.renderFormElement($row['type'], $row['id'], $row['default_text'], $row['elements'], $tvPBV, '', $row, $tvsArray).'</div></td> |
|
| 1100 | 1100 | </tr>'; |
| 1101 | 1101 | |
| 1102 | 1102 | $tab = $row['category_id']; |
@@ -1190,7 +1190,7 @@ discard block |
||
| 1190 | 1190 | |
| 1191 | 1191 | <?php |
| 1192 | 1192 | |
| 1193 | - if($_SESSION['mgrRole'] == 1 || $modx->manager->action != '27' || $_SESSION['mgrInternalKey'] == $content['createdby'] || $modx->hasPermission('change_resourcetype')) { |
|
| 1193 | + if ($_SESSION['mgrRole'] == 1 || $modx->manager->action != '27' || $_SESSION['mgrInternalKey'] == $content['createdby'] || $modx->hasPermission('change_resourcetype')) { |
|
| 1194 | 1194 | ?> |
| 1195 | 1195 | <tr> |
| 1196 | 1196 | <td> |
@@ -1213,13 +1213,13 @@ discard block |
||
| 1213 | 1213 | <td> |
| 1214 | 1214 | <select name="contentType" class="inputBox" onchange="documentDirty=true;"> |
| 1215 | 1215 | <?php |
| 1216 | - if(!$content['contentType']) { |
|
| 1216 | + if (!$content['contentType']) { |
|
| 1217 | 1217 | $content['contentType'] = 'text/html'; |
| 1218 | 1218 | } |
| 1219 | 1219 | $custom_contenttype = (isset ($custom_contenttype) ? $custom_contenttype : "text/html,text/plain,text/xml"); |
| 1220 | 1220 | $ct = explode(",", $custom_contenttype); |
| 1221 | - for($i = 0; $i < count($ct); $i++) { |
|
| 1222 | - echo "\t\t\t\t\t" . '<option value="' . $ct[$i] . '"' . ($content['contentType'] == $ct[$i] ? ' selected="selected"' : '') . '>' . $ct[$i] . "</option>\n"; |
|
| 1221 | + for ($i = 0; $i < count($ct); $i++) { |
|
| 1222 | + echo "\t\t\t\t\t".'<option value="'.$ct[$i].'"'.($content['contentType'] == $ct[$i] ? ' selected="selected"' : '').'>'.$ct[$i]."</option>\n"; |
|
| 1223 | 1223 | } |
| 1224 | 1224 | ?> |
| 1225 | 1225 | </select> |
@@ -1245,7 +1245,7 @@ discard block |
||
| 1245 | 1245 | </tr> |
| 1246 | 1246 | <?php |
| 1247 | 1247 | } else { |
| 1248 | - if($content['type'] != 'reference' && $modx->manager->action != '72') { |
|
| 1248 | + if ($content['type'] != 'reference' && $modx->manager->action != '72') { |
|
| 1249 | 1249 | // non-admin managers creating or editing a document resource |
| 1250 | 1250 | ?> |
| 1251 | 1251 | <input type="hidden" name="contentType" value="<?= (isset($content['contentType']) ? $content['contentType'] : "text/html") ?>" /> |
@@ -1345,15 +1345,15 @@ discard block |
||
| 1345 | 1345 | <?php |
| 1346 | 1346 | /******************************* |
| 1347 | 1347 | * Document Access Permissions */ |
| 1348 | - if($use_udperms == 1) { |
|
| 1348 | + if ($use_udperms == 1) { |
|
| 1349 | 1349 | $groupsarray = array(); |
| 1350 | 1350 | $sql = ''; |
| 1351 | 1351 | |
| 1352 | 1352 | $documentId = ($modx->manager->action == '27' ? $id : (!empty($_REQUEST['pid']) ? $_REQUEST['pid'] : $content['parent'])); |
| 1353 | - if($documentId > 0) { |
|
| 1353 | + if ($documentId > 0) { |
|
| 1354 | 1354 | // Load up, the permissions from the parent (if new document) or existing document |
| 1355 | 1355 | $rs = $modx->db->select('id, document_group', $tbl_document_groups, "document='{$documentId}'"); |
| 1356 | - while($currentgroup = $modx->db->getRow($rs)) $groupsarray[] = $currentgroup['document_group'] . ',' . $currentgroup['id']; |
|
| 1356 | + while ($currentgroup = $modx->db->getRow($rs)) $groupsarray[] = $currentgroup['document_group'].','.$currentgroup['id']; |
|
| 1357 | 1357 | |
| 1358 | 1358 | // Load up the current permissions and names |
| 1359 | 1359 | $vs = array( |
@@ -1369,7 +1369,7 @@ discard block |
||
| 1369 | 1369 | } |
| 1370 | 1370 | |
| 1371 | 1371 | // retain selected doc groups between post |
| 1372 | - if(isset($_POST['docgroups'])) { |
|
| 1372 | + if (isset($_POST['docgroups'])) { |
|
| 1373 | 1373 | $groupsarray = array_merge($groupsarray, $_POST['docgroups']); |
| 1374 | 1374 | } |
| 1375 | 1375 | |
@@ -1388,26 +1388,26 @@ discard block |
||
| 1388 | 1388 | $permissions_no = 0; // count permissions the current mgr user doesn't have |
| 1389 | 1389 | |
| 1390 | 1390 | // Loop through the permissions list |
| 1391 | - while($row = $modx->db->getRow($rs)) { |
|
| 1391 | + while ($row = $modx->db->getRow($rs)) { |
|
| 1392 | 1392 | |
| 1393 | 1393 | // Create an inputValue pair (group ID and group link (if it exists)) |
| 1394 | - $inputValue = $row['id'] . ',' . ($row['link_id'] ? $row['link_id'] : 'new'); |
|
| 1395 | - $inputId = 'group-' . $row['id']; |
|
| 1394 | + $inputValue = $row['id'].','.($row['link_id'] ? $row['link_id'] : 'new'); |
|
| 1395 | + $inputId = 'group-'.$row['id']; |
|
| 1396 | 1396 | |
| 1397 | 1397 | $checked = in_array($inputValue, $groupsarray); |
| 1398 | - if($checked) { |
|
| 1398 | + if ($checked) { |
|
| 1399 | 1399 | $notPublic = true; |
| 1400 | 1400 | } // Mark as private access (either web or manager) |
| 1401 | 1401 | |
| 1402 | 1402 | // Skip the access permission if the user doesn't have access... |
| 1403 | - if((!$isManager && $row['private_memgroup'] == '1') || (!$isWeb && $row['private_webgroup'] == '1')) { |
|
| 1403 | + if ((!$isManager && $row['private_memgroup'] == '1') || (!$isWeb && $row['private_webgroup'] == '1')) { |
|
| 1404 | 1404 | continue; |
| 1405 | 1405 | } |
| 1406 | 1406 | |
| 1407 | 1407 | // Setup attributes for this Input box |
| 1408 | 1408 | $inputAttributes['id'] = $inputId; |
| 1409 | 1409 | $inputAttributes['value'] = $inputValue; |
| 1410 | - if($checked) { |
|
| 1410 | + if ($checked) { |
|
| 1411 | 1411 | $inputAttributes['checked'] = 'checked'; |
| 1412 | 1412 | } else { |
| 1413 | 1413 | unset($inputAttributes['checked']); |
@@ -1415,10 +1415,10 @@ discard block |
||
| 1415 | 1415 | |
| 1416 | 1416 | // Create attribute string list |
| 1417 | 1417 | $inputString = array(); |
| 1418 | - foreach($inputAttributes as $k => $v) $inputString[] = $k . '="' . $v . '"'; |
|
| 1418 | + foreach ($inputAttributes as $k => $v) $inputString[] = $k.'="'.$v.'"'; |
|
| 1419 | 1419 | |
| 1420 | 1420 | // Make the <input> HTML |
| 1421 | - $inputHTML = '<input ' . implode(' ', $inputString) . ' />'; |
|
| 1421 | + $inputHTML = '<input '.implode(' ', $inputString).' />'; |
|
| 1422 | 1422 | |
| 1423 | 1423 | // does user have this permission? |
| 1424 | 1424 | $from = "{$tbl_membergroup_access} AS mga, {$tbl_member_groups} AS mg"; |
@@ -1429,23 +1429,23 @@ discard block |
||
| 1429 | 1429 | $where = vsprintf("mga.membergroup=mg.user_group AND mga.documentgroup=%s AND mg.member=%s", $vs); |
| 1430 | 1430 | $rsp = $modx->db->select('COUNT(mg.id)', $from, $where); |
| 1431 | 1431 | $count = $modx->db->getValue($rsp); |
| 1432 | - if($count > 0) { |
|
| 1432 | + if ($count > 0) { |
|
| 1433 | 1433 | ++$permissions_yes; |
| 1434 | 1434 | } else { |
| 1435 | 1435 | ++$permissions_no; |
| 1436 | 1436 | } |
| 1437 | - $permissions[] = "\t\t" . '<li>' . $inputHTML . '<label for="' . $inputId . '">' . $row['name'] . '</label></li>'; |
|
| 1437 | + $permissions[] = "\t\t".'<li>'.$inputHTML.'<label for="'.$inputId.'">'.$row['name'].'</label></li>'; |
|
| 1438 | 1438 | } |
| 1439 | 1439 | // if mgr user doesn't have access to any of the displayable permissions, forget about them and make doc public |
| 1440 | - if($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0)) { |
|
| 1440 | + if ($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0)) { |
|
| 1441 | 1441 | $permissions = array(); |
| 1442 | 1442 | } |
| 1443 | 1443 | |
| 1444 | 1444 | // See if the Access Permissions section is worth displaying... |
| 1445 | - if(!empty($permissions)) { |
|
| 1445 | + if (!empty($permissions)) { |
|
| 1446 | 1446 | // Add the "All Document Groups" item if we have rights in both contexts |
| 1447 | - if($isManager && $isWeb) { |
|
| 1448 | - 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>'); |
|
| 1447 | + if ($isManager && $isWeb) { |
|
| 1448 | + 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>'); |
|
| 1449 | 1449 | } |
| 1450 | 1450 | // Output the permissions list... |
| 1451 | 1451 | ?> |
@@ -1478,12 +1478,12 @@ discard block |
||
| 1478 | 1478 | </script> |
| 1479 | 1479 | <p><?= $_lang['access_permissions_docs_message'] ?></p> |
| 1480 | 1480 | <ul> |
| 1481 | - <?= implode("\n", $permissions) . "\n" ?> |
|
| 1481 | + <?= implode("\n", $permissions)."\n" ?> |
|
| 1482 | 1482 | </ul> |
| 1483 | 1483 | </div><!--div class="tab-page" id="tabAccess"--> |
| 1484 | 1484 | <?php |
| 1485 | 1485 | } // !empty($permissions) |
| 1486 | - elseif($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0) && ($_SESSION['mgrPermissions']['access_permissions'] == 1 || $_SESSION['mgrPermissions']['web_access_permissions'] == 1)) { |
|
| 1486 | + elseif ($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0) && ($_SESSION['mgrPermissions']['access_permissions'] == 1 || $_SESSION['mgrPermissions']['web_access_permissions'] == 1)) { |
|
| 1487 | 1487 | ?> |
| 1488 | 1488 | <p><?= $_lang["access_permissions_docs_collision"] ?></p> |
| 1489 | 1489 | <?php |
@@ -1503,7 +1503,7 @@ discard block |
||
| 1503 | 1503 | 'template' => $content['template'] |
| 1504 | 1504 | )); |
| 1505 | 1505 | |
| 1506 | - if(is_array($evtOut)) { |
|
| 1506 | + if (is_array($evtOut)) { |
|
| 1507 | 1507 | echo implode('', $evtOut); |
| 1508 | 1508 | } |
| 1509 | 1509 | ?> |
@@ -1516,52 +1516,52 @@ discard block |
||
| 1516 | 1516 | storeCurTemplate(); |
| 1517 | 1517 | </script> |
| 1518 | 1518 | <?php |
| 1519 | -if(($content['richtext'] == 1 || $modx->manager->action == '4' || $modx->manager->action == '72') && $use_editor == 1) { |
|
| 1520 | - if(is_array($richtexteditorIds)) { |
|
| 1521 | - foreach($richtexteditorIds as $editor => $elements) { |
|
| 1519 | +if (($content['richtext'] == 1 || $modx->manager->action == '4' || $modx->manager->action == '72') && $use_editor == 1) { |
|
| 1520 | + if (is_array($richtexteditorIds)) { |
|
| 1521 | + foreach ($richtexteditorIds as $editor => $elements) { |
|
| 1522 | 1522 | // invoke OnRichTextEditorInit event |
| 1523 | 1523 | $evtOut = $modx->invokeEvent('OnRichTextEditorInit', array( |
| 1524 | 1524 | 'editor' => $editor, |
| 1525 | 1525 | 'elements' => $elements, |
| 1526 | 1526 | 'options' => $richtexteditorOptions[$editor] |
| 1527 | 1527 | )); |
| 1528 | - if(is_array($evtOut)) { |
|
| 1528 | + if (is_array($evtOut)) { |
|
| 1529 | 1529 | echo implode('', $evtOut); |
| 1530 | 1530 | } |
| 1531 | 1531 | } |
| 1532 | 1532 | } |
| 1533 | 1533 | } |
| 1534 | 1534 | |
| 1535 | -function getDefaultTemplate() { |
|
| 1535 | +function getDefaultTemplate(){ |
|
| 1536 | 1536 | global $modx; |
| 1537 | 1537 | |
| 1538 | - switch($modx->config['auto_template_logic']) { |
|
| 1538 | + switch ($modx->config['auto_template_logic']) { |
|
| 1539 | 1539 | case 'sibling': |
| 1540 | - if(!isset($_GET['pid']) || empty($_GET['pid'])) { |
|
| 1540 | + if (!isset($_GET['pid']) || empty($_GET['pid'])) { |
|
| 1541 | 1541 | $site_start = $modx->config['site_start']; |
| 1542 | 1542 | $where = "sc.isfolder=0 AND sc.id!='{$site_start}'"; |
| 1543 | 1543 | $sibl = $modx->getDocumentChildren($_REQUEST['pid'], 1, 0, 'template', $where, 'menuindex', 'ASC', 1); |
| 1544 | - if(isset($sibl[0]['template']) && $sibl[0]['template'] !== '') { |
|
| 1544 | + if (isset($sibl[0]['template']) && $sibl[0]['template'] !== '') { |
|
| 1545 | 1545 | $default_template = $sibl[0]['template']; |
| 1546 | 1546 | } |
| 1547 | 1547 | } else { |
| 1548 | 1548 | $sibl = $modx->getDocumentChildren($_REQUEST['pid'], 1, 0, 'template', 'isfolder=0', 'menuindex', 'ASC', 1); |
| 1549 | - if(isset($sibl[0]['template']) && $sibl[0]['template'] !== '') { |
|
| 1549 | + if (isset($sibl[0]['template']) && $sibl[0]['template'] !== '') { |
|
| 1550 | 1550 | $default_template = $sibl[0]['template']; |
| 1551 | 1551 | } else { |
| 1552 | 1552 | $sibl = $modx->getDocumentChildren($_REQUEST['pid'], 0, 0, 'template', 'isfolder=0', 'menuindex', 'ASC', 1); |
| 1553 | - if(isset($sibl[0]['template']) && $sibl[0]['template'] !== '') { |
|
| 1553 | + if (isset($sibl[0]['template']) && $sibl[0]['template'] !== '') { |
|
| 1554 | 1554 | $default_template = $sibl[0]['template']; |
| 1555 | 1555 | } |
| 1556 | 1556 | } |
| 1557 | 1557 | } |
| 1558 | - if(isset($default_template)) { |
|
| 1558 | + if (isset($default_template)) { |
|
| 1559 | 1559 | break; |
| 1560 | 1560 | } // If $default_template could not be determined, fall back / through to "parent"-mode |
| 1561 | 1561 | case 'parent': |
| 1562 | - if(isset($_REQUEST['pid']) && !empty($_REQUEST['pid'])) { |
|
| 1562 | + if (isset($_REQUEST['pid']) && !empty($_REQUEST['pid'])) { |
|
| 1563 | 1563 | $parent = $modx->getPageInfo($_REQUEST['pid'], 0, 'template'); |
| 1564 | - if(isset($parent['template'])) { |
|
| 1564 | + if (isset($parent['template'])) { |
|
| 1565 | 1565 | $default_template = $parent['template']; |
| 1566 | 1566 | } |
| 1567 | 1567 | } |
@@ -1570,7 +1570,7 @@ discard block |
||
| 1570 | 1570 | default: // default_template is already set |
| 1571 | 1571 | $default_template = $modx->config['default_template']; |
| 1572 | 1572 | } |
| 1573 | - if(!isset($default_template)) { |
|
| 1573 | + if (!isset($default_template)) { |
|
| 1574 | 1574 | $default_template = $modx->config['default_template']; |
| 1575 | 1575 | } // default_template is already set |
| 1576 | 1576 | |
@@ -1,8 +1,8 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 3 | 3 | die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly."); |
| 4 | 4 | } |
| 5 | -if(!$modx->hasPermission('edit_user')) { |
|
| 5 | +if (!$modx->hasPermission('edit_user')) { |
|
| 6 | 6 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
| 7 | 7 | } |
| 8 | 8 | |
@@ -10,7 +10,7 @@ discard block |
||
| 10 | 10 | $modx->manager->initPageViewState(); |
| 11 | 11 | |
| 12 | 12 | // get and save search string |
| 13 | -if($_REQUEST['op'] == 'reset') { |
|
| 13 | +if ($_REQUEST['op'] == 'reset') { |
|
| 14 | 14 | $query = ''; |
| 15 | 15 | $_PAGE['vs']['search'] = ''; |
| 16 | 16 | } else { |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | |
| 26 | 26 | |
| 27 | 27 | // context menu |
| 28 | -include_once MODX_MANAGER_PATH . "includes/controls/contextmenu.php"; |
|
| 28 | +include_once MODX_MANAGER_PATH."includes/controls/contextmenu.php"; |
|
| 29 | 29 | $cm = new ContextMenu("cntxm", 150); |
| 30 | 30 | $cm->addItem($_lang["edit"], "js:menuAction(1)", $_style["actions_edit"], (!$modx->hasPermission('edit_user') ? 1 : 0)); |
| 31 | 31 | $cm->addItem($_lang["delete"], "js:menuAction(2)", $_style["actions_delete"], (!$modx->hasPermission('delete_user') ? 1 : 0)); |
@@ -121,16 +121,16 @@ discard block |
||
| 121 | 121 | <div class="table-responsive"> |
| 122 | 122 | <?php |
| 123 | 123 | $where = ""; |
| 124 | - if(!$modx->hasPermission('save_role')) { |
|
| 125 | - $where .= (empty($where) ? "" : " AND ") . "mua.role != 1"; |
|
| 124 | + if (!$modx->hasPermission('save_role')) { |
|
| 125 | + $where .= (empty($where) ? "" : " AND ")."mua.role != 1"; |
|
| 126 | 126 | } |
| 127 | - if(!empty($sqlQuery)) { |
|
| 128 | - $where .= (empty($where) ? "" : " AND ") . "((mu.username LIKE '{$sqlQuery}%') OR (mua.fullname LIKE '%{$sqlQuery}%') OR (mua.email LIKE '{$sqlQuery}%'))"; |
|
| 127 | + if (!empty($sqlQuery)) { |
|
| 128 | + $where .= (empty($where) ? "" : " AND ")."((mu.username LIKE '{$sqlQuery}%') OR (mua.fullname LIKE '%{$sqlQuery}%') OR (mua.email LIKE '{$sqlQuery}%'))"; |
|
| 129 | 129 | } |
| 130 | - $ds = $modx->db->select("mu.id, mu.username, rname.name AS role, mua.fullname, mua.email, ELT(mua.gender, '{$_lang['user_male']}', '{$_lang['user_female']}', '{$_lang['user_other']}') AS gender, IF(mua.blocked,'{$_lang['yes']}','-') as blocked, mua.thislogin", $modx->getFullTableName('manager_users') . " AS mu |
|
| 131 | - INNER JOIN " . $modx->getFullTableName('user_attributes') . " AS mua ON mua.internalKey=mu.id |
|
| 132 | - LEFT JOIN " . $modx->getFullTableName('user_roles') . " AS rname ON mua.role=rname.id", $where, 'mua.blocked ASC, mua.thislogin DESC'); |
|
| 133 | - include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php"; |
|
| 130 | + $ds = $modx->db->select("mu.id, mu.username, rname.name AS role, mua.fullname, mua.email, ELT(mua.gender, '{$_lang['user_male']}', '{$_lang['user_female']}', '{$_lang['user_other']}') AS gender, IF(mua.blocked,'{$_lang['yes']}','-') as blocked, mua.thislogin", $modx->getFullTableName('manager_users')." AS mu |
|
| 131 | + INNER JOIN " . $modx->getFullTableName('user_attributes')." AS mua ON mua.internalKey=mu.id |
|
| 132 | + LEFT JOIN " . $modx->getFullTableName('user_roles')." AS rname ON mua.role=rname.id", $where, 'mua.blocked ASC, mua.thislogin DESC'); |
|
| 133 | + include_once MODX_MANAGER_PATH."includes/controls/datagrid.class.php"; |
|
| 134 | 134 | $grd = new DataGrid('', $ds, $modx->config['number_of_results']); // set page size to 0 t show all items |
| 135 | 135 | $grd->noRecordMsg = $_lang["no_records_found"]; |
| 136 | 136 | $grd->cssClass = "table data"; |
@@ -151,19 +151,19 @@ discard block |
||
| 151 | 151 | $grd->colWidths = "1%,,,,,,1%,1%"; |
| 152 | 152 | $grd->colAligns = "center,,,,,center,center,right' nowrap='nowrap"; |
| 153 | 153 | $grd->colTypes = implode('||', array( |
| 154 | - 'template:<a class="gridRowIcon" href="javascript:;" onclick="return showContentMenu([+id+],event);" title="' . $_lang['click_to_context'] . '"><i class="' . $_style['icons_user'] . '"></i></a>', |
|
| 155 | - 'template:<a href="index.php?a=12&id=[+id+]" title="' . $_lang['click_to_edit_title'] . '">[+value+]</a>', |
|
| 154 | + 'template:<a class="gridRowIcon" href="javascript:;" onclick="return showContentMenu([+id+],event);" title="'.$_lang['click_to_context'].'"><i class="'.$_style['icons_user'].'"></i></a>', |
|
| 155 | + 'template:<a href="index.php?a=12&id=[+id+]" title="'.$_lang['click_to_edit_title'].'">[+value+]</a>', |
|
| 156 | 156 | 'template:[+fullname+]', |
| 157 | 157 | 'template:[+role+]', |
| 158 | 158 | 'template:[+email+]', |
| 159 | 159 | 'template:[+gender+]', |
| 160 | 160 | 'template:[+blocked+]', |
| 161 | - 'date: ' . $modx->toDateFormat('[+thislogin+]', 'formatOnly') . ' %H:%M' |
|
| 161 | + 'date: '.$modx->toDateFormat('[+thislogin+]', 'formatOnly').' %H:%M' |
|
| 162 | 162 | )); |
| 163 | - if($listmode == '1') { |
|
| 163 | + if ($listmode == '1') { |
|
| 164 | 164 | $grd->pageSize = 0; |
| 165 | 165 | } |
| 166 | - if($_REQUEST['op'] == 'reset') { |
|
| 166 | + if ($_REQUEST['op'] == 'reset') { |
|
| 167 | 167 | $grd->pageNumber = 1; |
| 168 | 168 | } |
| 169 | 169 | // render grid |
@@ -1,15 +1,15 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 3 | 3 | die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly."); |
| 4 | 4 | } |
| 5 | 5 | |
| 6 | -if(isset($_REQUEST['id'])) { |
|
| 6 | +if (isset($_REQUEST['id'])) { |
|
| 7 | 7 | $id = (int) $_REQUEST['id']; |
| 8 | 8 | } else { |
| 9 | 9 | $id = 0; |
| 10 | 10 | } |
| 11 | 11 | |
| 12 | -if(isset($_GET['opened'])) { |
|
| 12 | +if (isset($_GET['opened'])) { |
|
| 13 | 13 | $_SESSION['openedArray'] = $_GET['opened']; |
| 14 | 14 | } |
| 15 | 15 | |
@@ -22,16 +22,16 @@ discard block |
||
| 22 | 22 | $tbl_site_templates = $modx->getFullTableName('site_templates'); |
| 23 | 23 | |
| 24 | 24 | // Get access permissions |
| 25 | -if($_SESSION['mgrDocgroups']) { |
|
| 25 | +if ($_SESSION['mgrDocgroups']) { |
|
| 26 | 26 | $docgrp = implode(",", $_SESSION['mgrDocgroups']); |
| 27 | 27 | } |
| 28 | -$access = "1='" . $_SESSION['mgrRole'] . "' OR sc.privatemgr=0" . (!$docgrp ? "" : " OR dg.document_group IN ($docgrp)"); |
|
| 28 | +$access = "1='".$_SESSION['mgrRole']."' OR sc.privatemgr=0".(!$docgrp ? "" : " OR dg.document_group IN ($docgrp)"); |
|
| 29 | 29 | |
| 30 | 30 | // |
| 31 | -if($_SESSION['tree_show_only_folders']) { |
|
| 32 | - $parent = $id ? ($modx->db->getValue("SELECT parent FROM " . $tbl_site_content . " WHERE id=$id LIMIT 1")) : 0; |
|
| 33 | - $isfolder = $modx->db->getValue("SELECT isfolder FROM " . $tbl_site_content . " WHERE id=$id LIMIT 1"); |
|
| 34 | - if(!$isfolder && $parent != 0) { |
|
| 31 | +if ($_SESSION['tree_show_only_folders']) { |
|
| 32 | + $parent = $id ? ($modx->db->getValue("SELECT parent FROM ".$tbl_site_content." WHERE id=$id LIMIT 1")) : 0; |
|
| 33 | + $isfolder = $modx->db->getValue("SELECT isfolder FROM ".$tbl_site_content." WHERE id=$id LIMIT 1"); |
|
| 34 | + if (!$isfolder && $parent != 0) { |
|
| 35 | 35 | $id = $_REQUEST['id'] = $parent; |
| 36 | 36 | } |
| 37 | 37 | } |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | $rs = $modx->db->select('DISTINCT sc.*', "{$tbl_site_content} AS sc |
| 41 | 41 | LEFT JOIN {$tbl_document_groups} AS dg ON dg.document = sc.id", "sc.id ='{$id}' AND ({$access})"); |
| 42 | 42 | $content = $modx->db->getRow($rs); |
| 43 | -if(!$content) { |
|
| 43 | +if (!$content) { |
|
| 44 | 44 | $modx->webAlertAndQuit($_lang["access_permission_denied"]); |
| 45 | 45 | } |
| 46 | 46 | |
@@ -84,11 +84,11 @@ discard block |
||
| 84 | 84 | ); |
| 85 | 85 | $filter_sort = ''; |
| 86 | 86 | $filter_dir = ''; |
| 87 | -if($numRecords > 0) { |
|
| 88 | - $filter_sort = '<select size="1" name="sort" class="form-control form-control-sm" onchange="document.location=\'index.php?a=3&id=' . $id . '&dir=' . $dir . '&sort=\'+this.options[this.selectedIndex].value">' . '<option value="createdon"' . (($sort == 'createdon') ? ' selected' : '') . '>' . $_lang['createdon'] . '</option>' . '<option value="pub_date"' . (($sort == 'pub_date') ? ' selected' : '') . '>' . $_lang["page_data_publishdate"] . '</option>' . '<option value="pagetitle"' . (($sort == 'pagetitle') ? ' selected' : '') . '>' . $_lang['pagetitle'] . '</option>' . '<option value="menuindex"' . (($sort == 'menuindex') ? ' selected' : '') . '>' . $_lang['resource_opt_menu_index'] . '</option>' . //******** resource_opt_is_published - // |
|
| 89 | - '<option value="published"' . (($sort == 'published') ? ' selected' : '') . '>' . $_lang['resource_opt_is_published'] . '</option>' . //********// |
|
| 87 | +if ($numRecords > 0) { |
|
| 88 | + $filter_sort = '<select size="1" name="sort" class="form-control form-control-sm" onchange="document.location=\'index.php?a=3&id='.$id.'&dir='.$dir.'&sort=\'+this.options[this.selectedIndex].value">'.'<option value="createdon"'.(($sort == 'createdon') ? ' selected' : '').'>'.$_lang['createdon'].'</option>'.'<option value="pub_date"'.(($sort == 'pub_date') ? ' selected' : '').'>'.$_lang["page_data_publishdate"].'</option>'.'<option value="pagetitle"'.(($sort == 'pagetitle') ? ' selected' : '').'>'.$_lang['pagetitle'].'</option>'.'<option value="menuindex"'.(($sort == 'menuindex') ? ' selected' : '').'>'.$_lang['resource_opt_menu_index'].'</option>'.//******** resource_opt_is_published - // |
|
| 89 | + '<option value="published"'.(($sort == 'published') ? ' selected' : '').'>'.$_lang['resource_opt_is_published'].'</option>'.//********// |
|
| 90 | 90 | '</select>'; |
| 91 | - $filter_dir = '<select size="1" name="dir" class="form-control form-control-sm" onchange="document.location=\'index.php?a=3&id=' . $id . '&sort=' . $sort . '&dir=\'+this.options[this.selectedIndex].value">' . '<option value="DESC"' . (($dir == 'DESC') ? ' selected' : '') . '>' . $_lang['sort_desc'] . '</option>' . '<option value="ASC"' . (($dir == 'ASC') ? ' selected' : '') . '>' . $_lang['sort_asc'] . '</option>' . '</select>'; |
|
| 91 | + $filter_dir = '<select size="1" name="dir" class="form-control form-control-sm" onchange="document.location=\'index.php?a=3&id='.$id.'&sort='.$sort.'&dir=\'+this.options[this.selectedIndex].value">'.'<option value="DESC"'.(($dir == 'DESC') ? ' selected' : '').'>'.$_lang['sort_desc'].'</option>'.'<option value="ASC"'.(($dir == 'ASC') ? ' selected' : '').'>'.$_lang['sort_asc'].'</option>'.'</select>'; |
|
| 92 | 92 | $resource = $modx->db->makeArray($rs); |
| 93 | 93 | |
| 94 | 94 | // CSS style for table |
@@ -132,10 +132,10 @@ discard block |
||
| 132 | 132 | ); |
| 133 | 133 | $modx->table->setColumnWidths($tbWidth); |
| 134 | 134 | |
| 135 | - $sd = isset($_REQUEST['dir']) ? '&dir=' . $_REQUEST['dir'] : '&dir=DESC'; |
|
| 136 | - $sb = isset($_REQUEST['sort']) ? '&sort=' . $_REQUEST['sort'] : '&sort=createdon'; |
|
| 137 | - $pg = isset($_REQUEST['page']) ? '&page=' . (int) $_REQUEST['page'] : ''; |
|
| 138 | - $add_path = $sd . $sb . $pg; |
|
| 135 | + $sd = isset($_REQUEST['dir']) ? '&dir='.$_REQUEST['dir'] : '&dir=DESC'; |
|
| 136 | + $sb = isset($_REQUEST['sort']) ? '&sort='.$_REQUEST['sort'] : '&sort=createdon'; |
|
| 137 | + $pg = isset($_REQUEST['page']) ? '&page='.(int) $_REQUEST['page'] : ''; |
|
| 138 | + $add_path = $sd.$sb.$pg; |
|
| 139 | 139 | |
| 140 | 140 | $icons = array( |
| 141 | 141 | 'text/html' => $_style['tree_page_html'], |
@@ -153,9 +153,9 @@ discard block |
||
| 153 | 153 | ); |
| 154 | 154 | |
| 155 | 155 | $listDocs = array(); |
| 156 | - foreach($resource as $k => $children) { |
|
| 156 | + foreach ($resource as $k => $children) { |
|
| 157 | 157 | |
| 158 | - switch($children['id']) { |
|
| 158 | + switch ($children['id']) { |
|
| 159 | 159 | case $modx->config['site_start'] : |
| 160 | 160 | $icon = $_style['tree_page_home']; |
| 161 | 161 | break; |
@@ -169,10 +169,10 @@ discard block |
||
| 169 | 169 | $icon = $_style['tree_page_info']; |
| 170 | 170 | break; |
| 171 | 171 | default: |
| 172 | - if($children['isfolder']) { |
|
| 172 | + if ($children['isfolder']) { |
|
| 173 | 173 | $icon = $_style['tree_folder_new']; |
| 174 | 174 | } else { |
| 175 | - if(isset($icons[$children['contentType']])) { |
|
| 175 | + if (isset($icons[$children['contentType']])) { |
|
| 176 | 176 | $icon = $icons[$children['contentType']]; |
| 177 | 177 | } else { |
| 178 | 178 | $icon = $_style['tree_page']; |
@@ -187,32 +187,32 @@ discard block |
||
| 187 | 187 | $class = ($children['deleted'] ? 'text-danger text-decoration-through' : (!$children['published'] ? ' font-italic text-muted' : ' publish')); |
| 188 | 188 | //$class .= ($children['hidemenu'] ? ' text-muted' : ' text-primary'); |
| 189 | 189 | //$class .= ($children['isfolder'] ? ' font-weight-bold' : ''); |
| 190 | - if($modx->hasPermission('edit_document')) { |
|
| 191 | - $title = '<span class="doc-item' . $private . '">' . $icon . '<a href="index.php?a=27&id=' . $children['id'] . $add_path . '">' . '<span class="' . $class . '">' . $children['pagetitle'] . '</span></a></span>'; |
|
| 190 | + if ($modx->hasPermission('edit_document')) { |
|
| 191 | + $title = '<span class="doc-item'.$private.'">'.$icon.'<a href="index.php?a=27&id='.$children['id'].$add_path.'">'.'<span class="'.$class.'">'.$children['pagetitle'].'</span></a></span>'; |
|
| 192 | 192 | } else { |
| 193 | - $title = '<span class="doc-item' . $private . '">' . $icon . '<span class="' . $class . '">' . $children['pagetitle'] . '</span></span>'; |
|
| 193 | + $title = '<span class="doc-item'.$private.'">'.$icon.'<span class="'.$class.'">'.$children['pagetitle'].'</span></span>'; |
|
| 194 | 194 | } |
| 195 | 195 | |
| 196 | - $icon_pub_unpub = (!$children['published']) ? '<a href="index.php?a=61&id=' . $children['id'] . $add_path . '" title="' . $_lang["publish_resource"] . '"><i class="' . $_style["icons_publish_document"] . '"></i></a>' : '<a href="index.php?a=62&id=' . $children['id'] . $add_path . '" title="' . $_lang["unpublish_resource"] . '"><i class="' . $_style["icons_unpublish_resource"] . '" ></i></a>'; |
|
| 196 | + $icon_pub_unpub = (!$children['published']) ? '<a href="index.php?a=61&id='.$children['id'].$add_path.'" title="'.$_lang["publish_resource"].'"><i class="'.$_style["icons_publish_document"].'"></i></a>' : '<a href="index.php?a=62&id='.$children['id'].$add_path.'" title="'.$_lang["unpublish_resource"].'"><i class="'.$_style["icons_unpublish_resource"].'" ></i></a>'; |
|
| 197 | 197 | |
| 198 | - $icon_del_undel = (!$children['deleted']) ? '<a onclick="return confirm(\'' . $_lang["confirm_delete_resource"] . '\')" href="index.php?a=6&id=' . $children['id'] . $add_path . '" title="' . $_lang['delete_resource'] . '"><i class="' . $_style["icons_delete_resource"] . '"></i></a>' : '<a onclick="return confirm(\'' . $_lang["confirm_undelete"] . '\')" href="index.php?a=63&id=' . $children['id'] . $add_path . '" title="' . $_lang['undelete_resource'] . '"><i class="' . $_style["icons_undelete_resource"] . '"></i></a>'; |
|
| 198 | + $icon_del_undel = (!$children['deleted']) ? '<a onclick="return confirm(\''.$_lang["confirm_delete_resource"].'\')" href="index.php?a=6&id='.$children['id'].$add_path.'" title="'.$_lang['delete_resource'].'"><i class="'.$_style["icons_delete_resource"].'"></i></a>' : '<a onclick="return confirm(\''.$_lang["confirm_undelete"].'\')" href="index.php?a=63&id='.$children['id'].$add_path.'" title="'.$_lang['undelete_resource'].'"><i class="'.$_style["icons_undelete_resource"].'"></i></a>'; |
|
| 199 | 199 | |
| 200 | 200 | $listDocs[] = array( |
| 201 | - 'docid' => '<div class="text-right">' . $children['id'] . '</div>', |
|
| 201 | + 'docid' => '<div class="text-right">'.$children['id'].'</div>', |
|
| 202 | 202 | 'title' => $title, |
| 203 | - 'createdon' => '<div class="text-right">' . ($modx->toDateFormat($children['createdon'] + $server_offset_time, 'dateOnly')) . '</div>', |
|
| 204 | - 'pub_date' => '<div class="text-right">' . ($children['pub_date'] ? ($modx->toDateFormat($children['pub_date'] + $server_offset_time, 'dateOnly')) : '') . '</div>', |
|
| 205 | - 'status' => '<div class="text-nowrap">' . ($children['published'] == 0 ? '<span class="unpublishedDoc">' . $_lang['page_data_unpublished'] . '</span>' : '<span class="publishedDoc">' . $_lang['page_data_published'] . '</span>') . '</div>', |
|
| 206 | - 'edit' => '<div class="actions text-center text-nowrap">' . ($modx->hasPermission('edit_document') ? '<a href="index.php?a=27&id=' . $children['id'] . $add_path . '" title="' . $_lang['edit'] . '"><i class="' . $_style["icons_edit_resource"] . '"></i></a><a href="index.php?a=51&id=' . $children['id'] . $add_path . '" title="' . $_lang['move'] . '"><i |
|
| 207 | - class="' . $_style["icons_move_document"] . '"></i></a>' . $icon_pub_unpub : '') . ($modx->hasPermission('delete_document') ? $icon_del_undel : '') . '</div>' |
|
| 203 | + 'createdon' => '<div class="text-right">'.($modx->toDateFormat($children['createdon'] + $server_offset_time, 'dateOnly')).'</div>', |
|
| 204 | + 'pub_date' => '<div class="text-right">'.($children['pub_date'] ? ($modx->toDateFormat($children['pub_date'] + $server_offset_time, 'dateOnly')) : '').'</div>', |
|
| 205 | + 'status' => '<div class="text-nowrap">'.($children['published'] == 0 ? '<span class="unpublishedDoc">'.$_lang['page_data_unpublished'].'</span>' : '<span class="publishedDoc">'.$_lang['page_data_published'].'</span>').'</div>', |
|
| 206 | + 'edit' => '<div class="actions text-center text-nowrap">'.($modx->hasPermission('edit_document') ? '<a href="index.php?a=27&id='.$children['id'].$add_path.'" title="'.$_lang['edit'].'"><i class="'.$_style["icons_edit_resource"].'"></i></a><a href="index.php?a=51&id='.$children['id'].$add_path.'" title="'.$_lang['move'].'"><i |
|
| 207 | + class="' . $_style["icons_move_document"].'"></i></a>'.$icon_pub_unpub : '').($modx->hasPermission('delete_document') ? $icon_del_undel : '').'</div>' |
|
| 208 | 208 | ); |
| 209 | 209 | } |
| 210 | 210 | |
| 211 | - $modx->table->createPagingNavigation($numRecords, 'a=3&id=' . $content['id'] . '&dir=' . $dir . '&sort=' . $sort); |
|
| 212 | - $children_output = $modx->table->create($listDocs, $listTableHeader, 'index.php?a=3&id=' . $content['id']); |
|
| 211 | + $modx->table->createPagingNavigation($numRecords, 'a=3&id='.$content['id'].'&dir='.$dir.'&sort='.$sort); |
|
| 212 | + $children_output = $modx->table->create($listDocs, $listTableHeader, 'index.php?a=3&id='.$content['id']); |
|
| 213 | 213 | } else { |
| 214 | 214 | // No Child documents |
| 215 | - $children_output = '<div class="container"><p>' . $_lang['resources_in_container_no'] . '</p></div>'; |
|
| 215 | + $children_output = '<div class="container"><p>'.$_lang['resources_in_container_no'].'</p></div>'; |
|
| 216 | 216 | } |
| 217 | 217 | ?> |
| 218 | 218 | <script type="text/javascript"> |
@@ -238,7 +238,7 @@ discard block |
||
| 238 | 238 | }, |
| 239 | 239 | cancel: function() { |
| 240 | 240 | documentDirty = false; |
| 241 | - document.location.href = 'index.php?<?=($id == 0 ? 'a=2' : 'a=3&r=1&id=' . $id . $add_path) ?>'; |
|
| 241 | + document.location.href = 'index.php?<?=($id == 0 ? 'a=2' : 'a=3&r=1&id='.$id.$add_path) ?>'; |
|
| 242 | 242 | }, |
| 243 | 243 | move: function() { |
| 244 | 244 | document.location.href = "index.php?id=<?= $_REQUEST['id'] ?>&a=51"; |
@@ -249,7 +249,7 @@ discard block |
||
| 249 | 249 | } |
| 250 | 250 | }, |
| 251 | 251 | view: function() { |
| 252 | - window.open('<?= ($modx->config['friendly_urls'] == '1') ? $modx->makeUrl($id) : $modx->config['site_url'] . 'index.php?id=' . $id ?>', 'previeWin'); |
|
| 252 | + window.open('<?= ($modx->config['friendly_urls'] == '1') ? $modx->makeUrl($id) : $modx->config['site_url'].'index.php?id='.$id ?>', 'previeWin'); |
|
| 253 | 253 | } |
| 254 | 254 | }; |
| 255 | 255 | |
@@ -257,7 +257,7 @@ discard block |
||
| 257 | 257 | <script type="text/javascript" src="media/script/tablesort.js"></script> |
| 258 | 258 | |
| 259 | 259 | <h1> |
| 260 | - <i class="fa fa-info"></i><?= iconv_substr($content['pagetitle'], 0, 50, $modx->config['modx_charset']) . (iconv_strlen($content['pagetitle'], $modx->config['modx_charset']) > 50 ? '...' : '') . ' <small>(' . $_REQUEST['id'] . ')</small>' ?> |
|
| 260 | + <i class="fa fa-info"></i><?= iconv_substr($content['pagetitle'], 0, 50, $modx->config['modx_charset']).(iconv_strlen($content['pagetitle'], $modx->config['modx_charset']) > 50 ? '...' : '').' <small>('.$_REQUEST['id'].')</small>' ?> |
|
| 261 | 261 | </h1> |
| 262 | 262 | |
| 263 | 263 | <?= $_style['actionbuttons']['static']['document'] ?> |
@@ -284,16 +284,16 @@ discard block |
||
| 284 | 284 | <tr> |
| 285 | 285 | <td width="200" valign="top"><?= $_lang['long_title'] ?>:</td> |
| 286 | 286 | <td> |
| 287 | - <small><?= $content['longtitle'] != '' ? $content['longtitle'] : "(<i>" . $_lang['not_set'] . "</i>)" ?></small> |
|
| 287 | + <small><?= $content['longtitle'] != '' ? $content['longtitle'] : "(<i>".$_lang['not_set']."</i>)" ?></small> |
|
| 288 | 288 | </td> |
| 289 | 289 | </tr> |
| 290 | 290 | <tr> |
| 291 | 291 | <td valign="top"><?= $_lang['resource_description'] ?>:</td> |
| 292 | - <td><?= $content['description'] != '' ? $content['description'] : "(<i>" . $_lang['not_set'] . "</i>)" ?></td> |
|
| 292 | + <td><?= $content['description'] != '' ? $content['description'] : "(<i>".$_lang['not_set']."</i>)" ?></td> |
|
| 293 | 293 | </tr> |
| 294 | 294 | <tr> |
| 295 | 295 | <td valign="top"><?= $_lang['resource_summary'] ?>:</td> |
| 296 | - <td><?= $content['introtext'] != '' ? $content['introtext'] : "(<i>" . $_lang['not_set'] . "</i>)" ?></td> |
|
| 296 | + <td><?= $content['introtext'] != '' ? $content['introtext'] : "(<i>".$_lang['not_set']."</i>)" ?></td> |
|
| 297 | 297 | </tr> |
| 298 | 298 | <tr> |
| 299 | 299 | <td valign="top"><?= $_lang['type'] ?>:</td> |
@@ -301,7 +301,7 @@ discard block |
||
| 301 | 301 | </tr> |
| 302 | 302 | <tr> |
| 303 | 303 | <td valign="top"><?= $_lang['resource_alias'] ?>:</td> |
| 304 | - <td><?= $content['alias'] != '' ? $content['alias'] : "(<i>" . $_lang['not_set'] . "</i>)" ?></td> |
|
| 304 | + <td><?= $content['alias'] != '' ? $content['alias'] : "(<i>".$_lang['not_set']."</i>)" ?></td> |
|
| 305 | 305 | </tr> |
| 306 | 306 | <tr> |
| 307 | 307 | <td colspan="2"> </td> |
@@ -314,7 +314,7 @@ discard block |
||
| 314 | 314 | <td><?= $modx->toDateFormat($content['createdon'] + $server_offset_time) ?> (<b><?= $createdbyname ?></b>) |
| 315 | 315 | </td> |
| 316 | 316 | </tr> |
| 317 | - <?php if($editedbyname != '') { ?> |
|
| 317 | + <?php if ($editedbyname != '') { ?> |
|
| 318 | 318 | <tr> |
| 319 | 319 | <td><?= $_lang['page_data_edited'] ?>:</td> |
| 320 | 320 | <td><?= $modx->toDateFormat($content['editedon'] + $server_offset_time) ?> (<b><?= $editedbyname ?></b>) |
@@ -329,15 +329,15 @@ discard block |
||
| 329 | 329 | </tr> |
| 330 | 330 | <tr> |
| 331 | 331 | <td><?= $_lang['page_data_status'] ?>:</td> |
| 332 | - <td><?= $content['published'] == 0 ? '<span class="unpublishedDoc">' . $_lang['page_data_unpublished'] . '</span>' : '<span class="publisheddoc">' . $_lang['page_data_published'] . '</span>' ?></td> |
|
| 332 | + <td><?= $content['published'] == 0 ? '<span class="unpublishedDoc">'.$_lang['page_data_unpublished'].'</span>' : '<span class="publisheddoc">'.$_lang['page_data_published'].'</span>' ?></td> |
|
| 333 | 333 | </tr> |
| 334 | 334 | <tr> |
| 335 | 335 | <td><?= $_lang['page_data_publishdate'] ?>:</td> |
| 336 | - <td><?= $content['pub_date'] == 0 ? "(<i>" . $_lang['not_set'] . "</i>)" : $modx->toDateFormat($content['pub_date']) ?></td> |
|
| 336 | + <td><?= $content['pub_date'] == 0 ? "(<i>".$_lang['not_set']."</i>)" : $modx->toDateFormat($content['pub_date']) ?></td> |
|
| 337 | 337 | </tr> |
| 338 | 338 | <tr> |
| 339 | 339 | <td><?= $_lang['page_data_unpublishdate'] ?>:</td> |
| 340 | - <td><?= $content['unpub_date'] == 0 ? "(<i>" . $_lang['not_set'] . "</i>)" : $modx->toDateFormat($content['unpub_date']) ?></td> |
|
| 340 | + <td><?= $content['unpub_date'] == 0 ? "(<i>".$_lang['not_set']."</i>)" : $modx->toDateFormat($content['unpub_date']) ?></td> |
|
| 341 | 341 | </tr> |
| 342 | 342 | <tr> |
| 343 | 343 | <td><?= $_lang['page_data_cacheable'] ?>:</td> |
@@ -357,11 +357,11 @@ discard block |
||
| 357 | 357 | </tr> |
| 358 | 358 | <tr> |
| 359 | 359 | <td><?= $_lang['page_data_web_access'] ?>:</td> |
| 360 | - <td><?= $content['privateweb'] == 0 ? $_lang['public'] : '<b style="color: #821517">' . $_lang['private'] . '</b> ' . $_style["icons_secured"] ?></td> |
|
| 360 | + <td><?= $content['privateweb'] == 0 ? $_lang['public'] : '<b style="color: #821517">'.$_lang['private'].'</b> '.$_style["icons_secured"] ?></td> |
|
| 361 | 361 | </tr> |
| 362 | 362 | <tr> |
| 363 | 363 | <td><?= $_lang['page_data_mgr_access'] ?>:</td> |
| 364 | - <td><?= $content['privatemgr'] == 0 ? $_lang['public'] : '<b style="color: #821517">' . $_lang['private'] . '</b> ' . $_style["icons_secured"] ?></td> |
|
| 364 | + <td><?= $content['privatemgr'] == 0 ? $_lang['public'] : '<b style="color: #821517">'.$_lang['private'].'</b> '.$_style["icons_secured"] ?></td> |
|
| 365 | 365 | </tr> |
| 366 | 366 | <tr> |
| 367 | 367 | <td colspan="2"> </td> |
@@ -391,13 +391,13 @@ discard block |
||
| 391 | 391 | <script type="text/javascript">docSettings.addTabPage(document.getElementById("tabChildren"));</script> |
| 392 | 392 | <div class="container container-body"> |
| 393 | 393 | <div class="form-group clearfix"> |
| 394 | - <?php if($numRecords > 0) : ?> |
|
| 394 | + <?php if ($numRecords > 0) : ?> |
|
| 395 | 395 | <div class="float-xs-left"> |
| 396 | - <span class="publishedDoc"><?= $numRecords . ' ' . $_lang['resources_in_container'] ?> (<strong><?= $content['pagetitle'] ?></strong>)</span> |
|
| 396 | + <span class="publishedDoc"><?= $numRecords.' '.$_lang['resources_in_container'] ?> (<strong><?= $content['pagetitle'] ?></strong>)</span> |
|
| 397 | 397 | </div> |
| 398 | 398 | <?php endif; ?> |
| 399 | 399 | <div class="float-xs-right"> |
| 400 | - <?= $filter_sort . ' ' . $filter_dir ?> |
|
| 400 | + <?= $filter_sort.' '.$filter_dir ?> |
|
| 401 | 401 | </div> |
| 402 | 402 | |
| 403 | 403 | </div> |
@@ -407,23 +407,23 @@ discard block |
||
| 407 | 407 | </div> |
| 408 | 408 | </div><!-- end tab-page --> |
| 409 | 409 | |
| 410 | - <?php if($modx->config['cache_type'] != 2) { ?> |
|
| 410 | + <?php if ($modx->config['cache_type'] != 2) { ?> |
|
| 411 | 411 | <!-- Page Source --> |
| 412 | 412 | <div class="tab-page" id="tabSource"> |
| 413 | 413 | <h2 class="tab"><?= $_lang['page_data_source'] ?></h2> |
| 414 | 414 | <script type="text/javascript">docSettings.addTabPage(document.getElementById("tabSource"));</script> |
| 415 | 415 | <?php |
| 416 | 416 | $buffer = ""; |
| 417 | - $filename = $modx->config['base_path'] . "assets/cache/docid_" . $id . ".pageCache.php"; |
|
| 417 | + $filename = $modx->config['base_path']."assets/cache/docid_".$id.".pageCache.php"; |
|
| 418 | 418 | $handle = @fopen($filename, "r"); |
| 419 | - if(!$handle) { |
|
| 420 | - $buffer = '<div class="container container-body">' . $_lang['page_data_notcached'] . '</div>'; |
|
| 419 | + if (!$handle) { |
|
| 420 | + $buffer = '<div class="container container-body">'.$_lang['page_data_notcached'].'</div>'; |
|
| 421 | 421 | } else { |
| 422 | - while(!feof($handle)) { |
|
| 422 | + while (!feof($handle)) { |
|
| 423 | 423 | $buffer .= fgets($handle, 4096); |
| 424 | 424 | } |
| 425 | 425 | fclose($handle); |
| 426 | - $buffer = '<div class="navbar navbar-editor">' . $_lang['page_data_cached'] . '</div><div class="section-editor clearfix"><textarea rows="20" wrap="soft">' . $modx->htmlspecialchars($buffer) . "</textarea></div>\n"; |
|
| 426 | + $buffer = '<div class="navbar navbar-editor">'.$_lang['page_data_cached'].'</div><div class="section-editor clearfix"><textarea rows="20" wrap="soft">'.$modx->htmlspecialchars($buffer)."</textarea></div>\n"; |
|
| 427 | 427 | } |
| 428 | 428 | echo $buffer; |
| 429 | 429 | ?> |
@@ -433,12 +433,12 @@ discard block |
||
| 433 | 433 | </div><!-- end documentPane --> |
| 434 | 434 | |
| 435 | 435 | <?php |
| 436 | -if(isset($_GET['tab']) && is_numeric($_GET['tab'])) { |
|
| 437 | - echo '<script type="text/javascript"> docSettings.setSelectedIndex( ' . $_GET['tab'] . ' );</script>'; |
|
| 436 | +if (isset($_GET['tab']) && is_numeric($_GET['tab'])) { |
|
| 437 | + echo '<script type="text/javascript"> docSettings.setSelectedIndex( '.$_GET['tab'].' );</script>'; |
|
| 438 | 438 | } |
| 439 | 439 | ?> |
| 440 | 440 | |
| 441 | -<?php if($show_preview == 1) { ?> |
|
| 441 | +<?php if ($show_preview == 1) { ?> |
|
| 442 | 442 | <div class="sectionHeader"><?= $_lang['preview'] ?></div> |
| 443 | 443 | <div class="sectionBody" id="lyr2"> |
| 444 | 444 | <iframe src="<?= MODX_SITE_URL ?>index.php?id=<?= $id ?>&z=manprev" frameborder="0" border="0" id="previewIframe"></iframe> |
@@ -1,17 +1,17 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 3 | 3 | die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly."); |
| 4 | 4 | } |
| 5 | 5 | |
| 6 | -if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/functions.inc.php')) { |
|
| 7 | - include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/functions.inc.php'); |
|
| 6 | +if (file_exists(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/functions.inc.php')) { |
|
| 7 | + include_once(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/functions.inc.php'); |
|
| 8 | 8 | } else { |
| 9 | - include_once(MODX_MANAGER_PATH . 'actions/resources/functions.inc.php'); |
|
| 9 | + include_once(MODX_MANAGER_PATH.'actions/resources/functions.inc.php'); |
|
| 10 | 10 | } |
| 11 | -if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/mgrResources.class.php')) { |
|
| 12 | - include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/mgrResources.class.php'); |
|
| 11 | +if (file_exists(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/mgrResources.class.php')) { |
|
| 12 | + include_once(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/mgrResources.class.php'); |
|
| 13 | 13 | } else { |
| 14 | - include_once(MODX_MANAGER_PATH . 'actions/resources/mgrResources.class.php'); |
|
| 14 | + include_once(MODX_MANAGER_PATH.'actions/resources/mgrResources.class.php'); |
|
| 15 | 15 | } |
| 16 | 16 | |
| 17 | 17 | $resources = new mgrResources(); |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | 'type7' => $_lang["lock_element_type_7"], |
| 29 | 29 | 'type8' => $_lang["lock_element_type_8"] |
| 30 | 30 | ); |
| 31 | -foreach($unlockTranslations as $key => $value) $unlockTranslations[$key] = iconv($modx->config["modx_charset"], "utf-8", $value); |
|
| 31 | +foreach ($unlockTranslations as $key => $value) $unlockTranslations[$key] = iconv($modx->config["modx_charset"], "utf-8", $value); |
|
| 32 | 32 | |
| 33 | 33 | // Prepare lang-strings for mgrResAction() |
| 34 | 34 | $mraTranslations = array( |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | 'confirm_delete_plugin' => $_lang["confirm_delete_plugin"], |
| 45 | 45 | 'confirm_delete_module' => $_lang["confirm_delete_module"], |
| 46 | 46 | ); |
| 47 | -foreach($mraTranslations as $key => $value) $mraTranslations[$key] = iconv($modx->config["modx_charset"], "utf-8", $value); |
|
| 47 | +foreach ($mraTranslations as $key => $value) $mraTranslations[$key] = iconv($modx->config["modx_charset"], "utf-8", $value); |
|
| 48 | 48 | ?> |
| 49 | 49 | <script>var trans = <?php echo json_encode($unlockTranslations); ?>;</script> |
| 50 | 50 | <script>var mraTrans = <?php echo json_encode($mraTranslations); ?>;</script> |
@@ -65,45 +65,45 @@ discard block |
||
| 65 | 65 | </script> |
| 66 | 66 | |
| 67 | 67 | <?php |
| 68 | - if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab1_templates.inc.php')) { |
|
| 69 | - include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab1_templates.inc.php'); |
|
| 68 | + if (file_exists(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab1_templates.inc.php')) { |
|
| 69 | + include_once(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab1_templates.inc.php'); |
|
| 70 | 70 | } else { |
| 71 | - include_once(MODX_MANAGER_PATH . '/actions/resources/tab1_templates.inc.php'); |
|
| 71 | + include_once(MODX_MANAGER_PATH.'/actions/resources/tab1_templates.inc.php'); |
|
| 72 | 72 | } |
| 73 | 73 | |
| 74 | - if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab2_templatevars.inc.php')) { |
|
| 75 | - include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab2_templatevars.inc.php'); |
|
| 74 | + if (file_exists(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab2_templatevars.inc.php')) { |
|
| 75 | + include_once(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab2_templatevars.inc.php'); |
|
| 76 | 76 | } else { |
| 77 | - include_once(MODX_MANAGER_PATH . '/actions/resources/tab2_templatevars.inc.php'); |
|
| 77 | + include_once(MODX_MANAGER_PATH.'/actions/resources/tab2_templatevars.inc.php'); |
|
| 78 | 78 | } |
| 79 | 79 | |
| 80 | - if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab3_chunks.inc.php')) { |
|
| 81 | - include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab3_chunks.inc.php'); |
|
| 80 | + if (file_exists(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab3_chunks.inc.php')) { |
|
| 81 | + include_once(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab3_chunks.inc.php'); |
|
| 82 | 82 | } else { |
| 83 | - include_once(MODX_MANAGER_PATH . '/actions/resources/tab3_chunks.inc.php'); |
|
| 83 | + include_once(MODX_MANAGER_PATH.'/actions/resources/tab3_chunks.inc.php'); |
|
| 84 | 84 | } |
| 85 | 85 | |
| 86 | - if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab4_snippets.inc.php')) { |
|
| 87 | - include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab4_snippets.inc.php'); |
|
| 86 | + if (file_exists(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab4_snippets.inc.php')) { |
|
| 87 | + include_once(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab4_snippets.inc.php'); |
|
| 88 | 88 | } else { |
| 89 | - include_once(MODX_MANAGER_PATH . '/actions/resources/tab4_snippets.inc.php'); |
|
| 89 | + include_once(MODX_MANAGER_PATH.'/actions/resources/tab4_snippets.inc.php'); |
|
| 90 | 90 | } |
| 91 | 91 | |
| 92 | - if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab5_plugins.inc.php')) { |
|
| 93 | - include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab5_plugins.inc.php'); |
|
| 92 | + if (file_exists(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab5_plugins.inc.php')) { |
|
| 93 | + include_once(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab5_plugins.inc.php'); |
|
| 94 | 94 | } else { |
| 95 | - include_once(MODX_MANAGER_PATH . '/actions/resources/tab5_plugins.inc.php'); |
|
| 95 | + include_once(MODX_MANAGER_PATH.'/actions/resources/tab5_plugins.inc.php'); |
|
| 96 | 96 | } |
| 97 | 97 | |
| 98 | - if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab6_categoryview.inc.php')) { |
|
| 99 | - include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab6_categoryview.inc.php'); |
|
| 98 | + if (file_exists(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab6_categoryview.inc.php')) { |
|
| 99 | + include_once(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab6_categoryview.inc.php'); |
|
| 100 | 100 | } else { |
| 101 | - include_once(MODX_MANAGER_PATH . '/actions/resources/tab6_categoryview.inc.php'); |
|
| 101 | + include_once(MODX_MANAGER_PATH.'/actions/resources/tab6_categoryview.inc.php'); |
|
| 102 | 102 | } |
| 103 | 103 | |
| 104 | 104 | |
| 105 | - if(is_numeric($_GET['tab'])) { |
|
| 106 | - echo '<script type="text/javascript"> tpResources.setSelectedIndex( ' . $_GET['tab'] . ' );</script>'; |
|
| 105 | + if (is_numeric($_GET['tab'])) { |
|
| 106 | + echo '<script type="text/javascript"> tpResources.setSelectedIndex( '.$_GET['tab'].' );</script>'; |
|
| 107 | 107 | } |
| 108 | 108 | ?> |
| 109 | 109 | </div> |
@@ -1,8 +1,8 @@ |
||
| 1 | 1 | <?php |
| 2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
|
|
| 2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
|
|
| 3 | 3 | die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
|
| 4 | 4 | } |
| 5 | -if(!$modx->hasPermission('change_password')) {
|
|
| 5 | +if (!$modx->hasPermission('change_password')) {
|
|
| 6 | 6 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
| 7 | 7 | } |
| 8 | 8 | ?> |
@@ -1,16 +1,16 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
|
|
| 2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
|
|
| 3 | 3 | die("<b>INCLUDE_ORDERING_ERROR</b><br />Please use the EVO Content Manager instead of accessing this file directly.");
|
| 4 | 4 | } |
| 5 | -if(!$modx->hasPermission('settings')) {
|
|
| 5 | +if (!$modx->hasPermission('settings')) {
|
|
| 6 | 6 | $modx->webAlertAndQuit($_lang['error_no_privileges']); |
| 7 | 7 | } |
| 8 | 8 | |
| 9 | -include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/functions.inc.php'); |
|
| 9 | +include_once(MODX_MANAGER_PATH.'actions/mutate_settings/functions.inc.php'); |
|
| 10 | 10 | |
| 11 | 11 | // check to see the edit settings page isn't locked |
| 12 | -$rs = $modx->db->select('username', $modx->getFullTableName('active_users'), "action=17 AND internalKey!='" . $modx->getLoginUserID() . "'");
|
|
| 13 | -if($username = $modx->db->getValue($rs)) {
|
|
| 12 | +$rs = $modx->db->select('username', $modx->getFullTableName('active_users'), "action=17 AND internalKey!='".$modx->getLoginUserID()."'");
|
|
| 13 | +if ($username = $modx->db->getValue($rs)) {
|
|
| 14 | 14 | $modx->webAlertAndQuit(sprintf($_lang['lock_settings_msg'], $username)); |
| 15 | 15 | } |
| 16 | 16 | // end check for lock |
@@ -18,21 +18,21 @@ discard block |
||
| 18 | 18 | // reload system settings from the database. |
| 19 | 19 | // this will prevent user-defined settings from being saved as system setting |
| 20 | 20 | $settings = array(); |
| 21 | -include_once(MODX_MANAGER_PATH . 'includes/default_config.php'); |
|
| 21 | +include_once(MODX_MANAGER_PATH.'includes/default_config.php'); |
|
| 22 | 22 | $rs = $modx->db->select('setting_name, setting_value', '[+prefix+]system_settings');
|
| 23 | -while($row = $modx->db->getRow($rs)) {
|
|
| 23 | +while ($row = $modx->db->getRow($rs)) {
|
|
| 24 | 24 | $settings[$row['setting_name']] = $row['setting_value']; |
| 25 | 25 | } |
| 26 | -$settings['filemanager_path'] = preg_replace('@^' . preg_quote(MODX_BASE_PATH) . '@', '[(base_path)]', $settings['filemanager_path']);
|
|
| 27 | -$settings['rb_base_dir'] = preg_replace('@^' . preg_quote(MODX_BASE_PATH) . '@', '[(base_path)]', $settings['rb_base_dir']);
|
|
| 26 | +$settings['filemanager_path'] = preg_replace('@^'.preg_quote(MODX_BASE_PATH).'@', '[(base_path)]', $settings['filemanager_path']);
|
|
| 27 | +$settings['rb_base_dir'] = preg_replace('@^'.preg_quote(MODX_BASE_PATH).'@', '[(base_path)]', $settings['rb_base_dir']);
|
|
| 28 | 28 | |
| 29 | 29 | extract($settings, EXTR_OVERWRITE); |
| 30 | 30 | |
| 31 | 31 | // load languages and keys |
| 32 | 32 | $lang_keys = array(); |
| 33 | 33 | $dir = dir('includes/lang');
|
| 34 | -while($file = $dir->read()) {
|
|
| 35 | - if(strpos($file, '.inc.php') > 0) {
|
|
| 34 | +while ($file = $dir->read()) {
|
|
| 35 | + if (strpos($file, '.inc.php') > 0) {
|
|
| 36 | 36 | $endpos = strpos($file, '.'); |
| 37 | 37 | $languagename = substr($file, 0, $endpos); |
| 38 | 38 | $lang_keys[$languagename] = get_lang_keys($file); |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | <input type="hidden" name="site_id" value="<?php echo $site_id; ?>" /> |
| 70 | 70 | <input type="hidden" name="settings_version" value="<?php echo $modx->getVersionData('version'); ?>" />
|
| 71 | 71 | <!-- this field is used to check site settings have been entered/ updated after install or upgrade --> |
| 72 | - <?php if(!isset($settings_version) || $settings_version != $modx->getVersionData('version')) { ?>
|
|
| 72 | + <?php if (!isset($settings_version) || $settings_version != $modx->getVersionData('version')) { ?>
|
|
| 73 | 73 | <div class='sectionBody'><p class='element-edit-message-tab alert alert-warning'><?php echo $_lang['settings_after_install']; ?></p></div> |
| 74 | 74 | <?php } ?> |
| 75 | 75 | <div class="tab-pane" id="settingsPane"> |
@@ -78,13 +78,13 @@ discard block |
||
| 78 | 78 | </script> |
| 79 | 79 | |
| 80 | 80 | <?php |
| 81 | - include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab1_site_settings.inc.php'); |
|
| 82 | - include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab2_furl_settings.inc.php'); |
|
| 83 | - include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab3_user_settings.inc.php'); |
|
| 84 | - include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab4_manager_settings.inc.php'); |
|
| 85 | - include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab5_security_settings.inc.php'); |
|
| 86 | - include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab6_filemanager_settings.inc.php'); |
|
| 87 | - include_once(MODX_MANAGER_PATH . 'actions/mutate_settings/tab7_filebrowser_settings.inc.php'); |
|
| 81 | + include_once(MODX_MANAGER_PATH.'actions/mutate_settings/tab1_site_settings.inc.php'); |
|
| 82 | + include_once(MODX_MANAGER_PATH.'actions/mutate_settings/tab2_furl_settings.inc.php'); |
|
| 83 | + include_once(MODX_MANAGER_PATH.'actions/mutate_settings/tab3_user_settings.inc.php'); |
|
| 84 | + include_once(MODX_MANAGER_PATH.'actions/mutate_settings/tab4_manager_settings.inc.php'); |
|
| 85 | + include_once(MODX_MANAGER_PATH.'actions/mutate_settings/tab5_security_settings.inc.php'); |
|
| 86 | + include_once(MODX_MANAGER_PATH.'actions/mutate_settings/tab6_filemanager_settings.inc.php'); |
|
| 87 | + include_once(MODX_MANAGER_PATH.'actions/mutate_settings/tab7_filebrowser_settings.inc.php'); |
|
| 88 | 88 | ?> |
| 89 | 89 | </div> |
| 90 | 90 | </div> |
@@ -131,6 +131,6 @@ discard block |
||
| 131 | 131 | }); |
| 132 | 132 | </script> |
| 133 | 133 | <?php |
| 134 | -if(is_numeric($_GET['tab'])) {
|
|
| 135 | - echo '<script type="text/javascript">tpSettings.setSelectedIndex( ' . $_GET['tab'] . ' );</script>'; |
|
| 134 | +if (is_numeric($_GET['tab'])) {
|
|
| 135 | + echo '<script type="text/javascript">tpSettings.setSelectedIndex( '.$_GET['tab'].' );</script>'; |
|
| 136 | 136 | } |
@@ -1,8 +1,8 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 3 | 3 | die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly."); |
| 4 | 4 | } |
| 5 | -if(!$modx->hasPermission('access_permissions')) { |
|
| 5 | +if (!$modx->hasPermission('access_permissions')) { |
|
| 6 | 6 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
| 7 | 7 | } |
| 8 | 8 | |
@@ -17,23 +17,23 @@ discard block |
||
| 17 | 17 | |
| 18 | 18 | // find all document groups, for the select :) |
| 19 | 19 | $rs = $modx->db->select('*', $tbl_documentgroup_names, '', 'name'); |
| 20 | -if($modx->db->getRecordCount($rs) < 1) { |
|
| 20 | +if ($modx->db->getRecordCount($rs) < 1) { |
|
| 21 | 21 | $docgroupselector = '[no groups to add]'; |
| 22 | 22 | } else { |
| 23 | - $docgroupselector = '<select name="docgroup">' . "\n"; |
|
| 24 | - while($row = $modx->db->getRow($rs)) { |
|
| 25 | - $docgroupselector .= "\t" . '<option value="' . $row['id'] . '">' . $row['name'] . "</option>\n"; |
|
| 23 | + $docgroupselector = '<select name="docgroup">'."\n"; |
|
| 24 | + while ($row = $modx->db->getRow($rs)) { |
|
| 25 | + $docgroupselector .= "\t".'<option value="'.$row['id'].'">'.$row['name']."</option>\n"; |
|
| 26 | 26 | } |
| 27 | 27 | $docgroupselector .= "</select>\n"; |
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | $rs = $modx->db->select('*', $tbl_membergroup_names, '', 'name'); |
| 31 | -if($modx->db->getRecordCount($rs) < 1) { |
|
| 31 | +if ($modx->db->getRecordCount($rs) < 1) { |
|
| 32 | 32 | $usrgroupselector = '[no user groups]'; |
| 33 | 33 | } else { |
| 34 | - $usrgroupselector = '<select name="usergroup">' . "\n"; |
|
| 35 | - while($row = $modx->db->getRow($rs)) { |
|
| 36 | - $usrgroupselector .= "\t" . '<option value="' . $row['id'] . '">' . $row['name'] . "</option>\n"; |
|
| 34 | + $usrgroupselector = '<select name="usergroup">'."\n"; |
|
| 35 | + while ($row = $modx->db->getRow($rs)) { |
|
| 36 | + $usrgroupselector .= "\t".'<option value="'.$row['id'].'">'.$row['name']."</option>\n"; |
|
| 37 | 37 | } |
| 38 | 38 | $usrgroupselector .= "</select>\n"; |
| 39 | 39 | } |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | <div class="alert alert-info"><?= $_lang['access_permissions_introtext'] ?></div> |
| 70 | 70 | </div> |
| 71 | 71 | |
| 72 | -<div class="container"><?= ($use_udperms != 1 ? '<div class="alert alert-danger">' . $_lang['access_permissions_off'] . '</div>' : '') ?></div> |
|
| 72 | +<div class="container"><?= ($use_udperms != 1 ? '<div class="alert alert-danger">'.$_lang['access_permissions_off'].'</div>' : '') ?></div> |
|
| 73 | 73 | |
| 74 | 74 | <div class="tab-pane" id="uapPane"> |
| 75 | 75 | <script type="text/javascript"> |
@@ -96,10 +96,10 @@ discard block |
||
| 96 | 96 | </form> |
| 97 | 97 | </div> |
| 98 | 98 | <?php |
| 99 | - $rs = $modx->db->select('groupnames.*, users.id AS user_id, users.username user_name', $tbl_membergroup_names . ' AS groupnames |
|
| 100 | - LEFT JOIN ' . $tbl_member_groups . ' AS groups ON groups.user_group = groupnames.id |
|
| 101 | - LEFT JOIN ' . $tbl_manager_users . ' AS users ON users.id = groups.member', '', 'groupnames.name, user_name'); |
|
| 102 | - if($modx->db->getRecordCount($rs) < 1) { |
|
| 99 | + $rs = $modx->db->select('groupnames.*, users.id AS user_id, users.username user_name', $tbl_membergroup_names.' AS groupnames |
|
| 100 | + LEFT JOIN ' . $tbl_member_groups.' AS groups ON groups.user_group = groupnames.id |
|
| 101 | + LEFT JOIN ' . $tbl_manager_users.' AS users ON users.id = groups.member', '', 'groupnames.name, user_name'); |
|
| 102 | + if ($modx->db->getRecordCount($rs) < 1) { |
|
| 103 | 103 | ?> |
| 104 | 104 | <div class="text-danger"><?= $_lang['no_groups_found'] ?></div> |
| 105 | 105 | <?php |
@@ -108,9 +108,9 @@ discard block |
||
| 108 | 108 | <div class="form-group"> |
| 109 | 109 | <?php |
| 110 | 110 | $pid = ''; |
| 111 | - while($row = $modx->db->getRow($rs)) { |
|
| 112 | - if($pid != $row['id']) { |
|
| 113 | - if($pid != '') { |
|
| 111 | + while ($row = $modx->db->getRow($rs)) { |
|
| 112 | + if ($pid != $row['id']) { |
|
| 113 | + if ($pid != '') { |
|
| 114 | 114 | echo '</div><div class="form-group">'; |
| 115 | 115 | } |
| 116 | 116 | ?> |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | <?= $_lang['access_permissions_users_in_group'] ?> |
| 130 | 130 | <?php |
| 131 | 131 | } |
| 132 | - if(!$row['user_id']) { |
|
| 132 | + if (!$row['user_id']) { |
|
| 133 | 133 | ?> |
| 134 | 134 | <i><?= $_lang['access_permissions_no_users_in_group'] ?></i> |
| 135 | 135 | <?php |
@@ -167,10 +167,10 @@ discard block |
||
| 167 | 167 | </form> |
| 168 | 168 | </div> |
| 169 | 169 | <?php |
| 170 | - $rs = $modx->db->select('dgnames.id, dgnames.name, sc.id AS doc_id, sc.pagetitle AS doc_title', $tbl_documentgroup_names . ' AS dgnames |
|
| 171 | - LEFT JOIN ' . $tbl_document_groups . ' AS dg ON dg.document_group = dgnames.id |
|
| 172 | - LEFT JOIN ' . $tbl_site_content . ' AS sc ON sc.id = dg.document', '', 'dgnames.name, sc.id'); |
|
| 173 | - if($modx->db->getRecordCount($rs) < 1) { |
|
| 170 | + $rs = $modx->db->select('dgnames.id, dgnames.name, sc.id AS doc_id, sc.pagetitle AS doc_title', $tbl_documentgroup_names.' AS dgnames |
|
| 171 | + LEFT JOIN ' . $tbl_document_groups.' AS dg ON dg.document_group = dgnames.id |
|
| 172 | + LEFT JOIN ' . $tbl_site_content.' AS sc ON sc.id = dg.document', '', 'dgnames.name, sc.id'); |
|
| 173 | + if ($modx->db->getRecordCount($rs) < 1) { |
|
| 174 | 174 | ?> |
| 175 | 175 | <div class="text-danger"><?= $_lang['no_groups_found'] ?></div> |
| 176 | 176 | <?php |
@@ -179,9 +179,9 @@ discard block |
||
| 179 | 179 | <div class="form-group"> |
| 180 | 180 | <?php |
| 181 | 181 | $pid = ''; |
| 182 | - while($row = $modx->db->getRow($rs)) { |
|
| 183 | - if($pid != $row['id']) { |
|
| 184 | - if($pid != '') { |
|
| 182 | + while ($row = $modx->db->getRow($rs)) { |
|
| 183 | + if ($pid != $row['id']) { |
|
| 184 | + if ($pid != '') { |
|
| 185 | 185 | echo '</div><div class="form-group">'; |
| 186 | 186 | } |
| 187 | 187 | ?> |
@@ -200,7 +200,7 @@ discard block |
||
| 200 | 200 | <?= $_lang['access_permissions_resources_in_group'] ?> |
| 201 | 201 | <?php |
| 202 | 202 | } |
| 203 | - if(!$row['doc_id']) { |
|
| 203 | + if (!$row['doc_id']) { |
|
| 204 | 204 | ?> |
| 205 | 205 | <i><?= $_lang['access_permissions_no_resources_in_group'] ?></i> |
| 206 | 206 | <?php |
@@ -226,10 +226,10 @@ discard block |
||
| 226 | 226 | <p class="element-edit-message-tab alert alert-warning"><?= $_lang['access_permissions_links_tab'] ?></p> |
| 227 | 227 | <?php |
| 228 | 228 | // User/Document Group Links |
| 229 | - $rs = $modx->db->select('groupnames.*, groupacc.id AS link_id, dgnames.id AS dg_id, dgnames.name AS dg_name', $tbl_membergroup_names . ' AS groupnames |
|
| 230 | - LEFT JOIN ' . $tbl_membergroup_access . ' AS groupacc ON groupacc.membergroup = groupnames.id |
|
| 231 | - LEFT JOIN ' . $tbl_documentgroup_names . ' AS dgnames ON dgnames.id = groupacc.documentgroup', '', 'name, dg_name'); |
|
| 232 | - if($modx->db->getRecordCount($rs) < 1) { |
|
| 229 | + $rs = $modx->db->select('groupnames.*, groupacc.id AS link_id, dgnames.id AS dg_id, dgnames.name AS dg_name', $tbl_membergroup_names.' AS groupnames |
|
| 230 | + LEFT JOIN ' . $tbl_membergroup_access.' AS groupacc ON groupacc.membergroup = groupnames.id |
|
| 231 | + LEFT JOIN ' . $tbl_documentgroup_names.' AS dgnames ON dgnames.id = groupacc.documentgroup', '', 'name, dg_name'); |
|
| 232 | + if ($modx->db->getRecordCount($rs) < 1) { |
|
| 233 | 233 | ?> |
| 234 | 234 | <div class="text-danger"><?= $_lang['no_groups_found'] ?></div> |
| 235 | 235 | <?php |
@@ -251,23 +251,23 @@ discard block |
||
| 251 | 251 | <ul> |
| 252 | 252 | <?php |
| 253 | 253 | $pid = ''; |
| 254 | - while($row = $modx->db->getRow($rs)) { |
|
| 255 | - if($row['id'] != $pid) { |
|
| 256 | - if($pid != '') { |
|
| 254 | + while ($row = $modx->db->getRow($rs)) { |
|
| 255 | + if ($row['id'] != $pid) { |
|
| 256 | + if ($pid != '') { |
|
| 257 | 257 | echo '</ul></li>'; |
| 258 | 258 | } // close previous one |
| 259 | 259 | ?> |
| 260 | 260 | <li><b><?= $row['name'] ?></b></li> |
| 261 | 261 | <?php |
| 262 | - if(!$row['dg_id']) { |
|
| 263 | - echo '<i>' . $_lang['no_groups_found'] . '</i></li>'; |
|
| 262 | + if (!$row['dg_id']) { |
|
| 263 | + echo '<i>'.$_lang['no_groups_found'].'</i></li>'; |
|
| 264 | 264 | $pid = ''; |
| 265 | 265 | continue; |
| 266 | 266 | } else { |
| 267 | 267 | echo '<ul>'; |
| 268 | 268 | } |
| 269 | 269 | } |
| 270 | - if(!$row['dg_id']) { |
|
| 270 | + if (!$row['dg_id']) { |
|
| 271 | 271 | continue; |
| 272 | 272 | } |
| 273 | 273 | ?> |
