@@ -1,12 +1,12 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
| 3 | - die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly."); |
|
| 3 | + die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly."); |
|
| 4 | 4 | } |
| 5 | 5 | if(!$modx->hasPermission('edit_template') && $modx->manager->action == '301') { |
| 6 | - $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
| 6 | + $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
| 7 | 7 | } |
| 8 | 8 | if(!$modx->hasPermission('new_template') && $modx->manager->action == '300') { |
| 9 | - $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
| 9 | + $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
| 10 | 10 | } |
| 11 | 11 | |
| 12 | 12 | $id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : 0; |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | |
| 21 | 21 | // check to see the snippet editor isn't locked |
| 22 | 22 | if($lockedEl = $modx->elementIsLocked(2, $id)) { |
| 23 | - $modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['tmplvar'])); |
|
| 23 | + $modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['tmplvar'])); |
|
| 24 | 24 | } |
| 25 | 25 | // end check for lock |
| 26 | 26 | |
@@ -30,25 +30,25 @@ discard block |
||
| 30 | 30 | global $content; |
| 31 | 31 | $content = array(); |
| 32 | 32 | if(isset($_GET['id'])) { |
| 33 | - $rs = $modx->db->select('*', $tbl_site_tmplvars, "id='{$id}'"); |
|
| 34 | - $content = $modx->db->getRow($rs); |
|
| 35 | - if(!$content) { |
|
| 36 | - header("Location: " . MODX_SITE_URL . "index.php?id={$site_start}"); |
|
| 37 | - } |
|
| 38 | - |
|
| 39 | - $_SESSION['itemname'] = $content['caption']; |
|
| 40 | - if($content['locked'] == 1 && $modx->hasPermission('save_role') != 1) { |
|
| 41 | - $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
| 42 | - } |
|
| 33 | + $rs = $modx->db->select('*', $tbl_site_tmplvars, "id='{$id}'"); |
|
| 34 | + $content = $modx->db->getRow($rs); |
|
| 35 | + if(!$content) { |
|
| 36 | + header("Location: " . MODX_SITE_URL . "index.php?id={$site_start}"); |
|
| 37 | + } |
|
| 38 | + |
|
| 39 | + $_SESSION['itemname'] = $content['caption']; |
|
| 40 | + if($content['locked'] == 1 && $modx->hasPermission('save_role') != 1) { |
|
| 41 | + $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
| 42 | + } |
|
| 43 | 43 | } else if(isset($_REQUEST['itemname'])) { |
| 44 | - $content['name'] = $_REQUEST['itemname']; |
|
| 44 | + $content['name'] = $_REQUEST['itemname']; |
|
| 45 | 45 | } else { |
| 46 | - $_SESSION['itemname'] = $_lang["new_tmplvars"]; |
|
| 47 | - $content['category'] = intval($_REQUEST['catid']); |
|
| 46 | + $_SESSION['itemname'] = $_lang["new_tmplvars"]; |
|
| 47 | + $content['category'] = intval($_REQUEST['catid']); |
|
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | if($modx->manager->hasFormValues()) { |
| 51 | - $modx->manager->loadFormValues(); |
|
| 51 | + $modx->manager->loadFormValues(); |
|
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | $content = array_merge($content, $_POST); |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | $RTEditors = ''; |
| 63 | 63 | $evtOut = $modx->invokeEvent('OnRichTextEditorRegister', array('forfrontend' => 1)); |
| 64 | 64 | if(is_array($evtOut)) { |
| 65 | - $RTEditors = implode(',', $evtOut); |
|
| 65 | + $RTEditors = implode(',', $evtOut); |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | ?> |
@@ -277,12 +277,12 @@ discard block |
||
| 277 | 277 | |
| 278 | 278 | <form name="mutate" method="post" action="index.php" enctype="multipart/form-data"> |
| 279 | 279 | <?php |
| 280 | - // invoke OnTVFormPrerender event |
|
| 281 | - $evtOut = $modx->invokeEvent('OnTVFormPrerender', array('id' => $id)); |
|
| 282 | - if(is_array($evtOut)) { |
|
| 283 | - echo implode("", $evtOut); |
|
| 284 | - } |
|
| 285 | - ?> |
|
| 280 | + // invoke OnTVFormPrerender event |
|
| 281 | + $evtOut = $modx->invokeEvent('OnTVFormPrerender', array('id' => $id)); |
|
| 282 | + if(is_array($evtOut)) { |
|
| 283 | + echo implode("", $evtOut); |
|
| 284 | + } |
|
| 285 | + ?> |
|
| 286 | 286 | <input type="hidden" name="id" value="<?= $content['id'] ?>"> |
| 287 | 287 | <input type="hidden" name="a" value="302"> |
| 288 | 288 | <input type="hidden" name="or" value="<?= $origin ?>"> |
@@ -343,11 +343,11 @@ discard block |
||
| 343 | 343 | <select name="categoryid" class="form-control" onChange="documentDirty=true;"> |
| 344 | 344 | <option> </option> |
| 345 | 345 | <?php |
| 346 | - include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php'); |
|
| 347 | - foreach(getCategories() as $n => $v) { |
|
| 348 | - echo "<option value='" . $v['id'] . "'" . ($content["category"] == $v["id"] ? " selected='selected'" : "") . ">" . $modx->htmlspecialchars($v["category"]) . "</option>"; |
|
| 349 | - } |
|
| 350 | - ?> |
|
| 346 | + include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php'); |
|
| 347 | + foreach(getCategories() as $n => $v) { |
|
| 348 | + echo "<option value='" . $v['id'] . "'" . ($content["category"] == $v["id"] ? " selected='selected'" : "") . ">" . $modx->htmlspecialchars($v["category"]) . "</option>"; |
|
| 349 | + } |
|
| 350 | + ?> |
|
| 351 | 351 | </select> |
| 352 | 352 | </div> |
| 353 | 353 | </div> |
@@ -383,14 +383,14 @@ discard block |
||
| 383 | 383 | <optgroup label="Custom Type"> |
| 384 | 384 | <option value="custom_tv" <?= ($content['type'] == 'custom_tv' ? "selected='selected'" : "") ?>>Custom Input</option> |
| 385 | 385 | <?php |
| 386 | - $custom_tvs = scandir(MODX_BASE_PATH . 'assets/tvs'); |
|
| 387 | - foreach($custom_tvs as $ctv) { |
|
| 388 | - if(strpos($ctv, '.') !== 0 && $ctv != 'index.html') { |
|
| 389 | - $selected = ($content['type'] == 'custom_tv:' . $ctv ? "selected='selected'" : ""); |
|
| 390 | - echo '<option value="custom_tv:' . $ctv . '" ' . $selected . '>' . $ctv . '</option>'; |
|
| 391 | - } |
|
| 392 | - } |
|
| 393 | - ?> |
|
| 386 | + $custom_tvs = scandir(MODX_BASE_PATH . 'assets/tvs'); |
|
| 387 | + foreach($custom_tvs as $ctv) { |
|
| 388 | + if(strpos($ctv, '.') !== 0 && $ctv != 'index.html') { |
|
| 389 | + $selected = ($content['type'] == 'custom_tv:' . $ctv ? "selected='selected'" : ""); |
|
| 390 | + echo '<option value="custom_tv:' . $ctv . '" ' . $selected . '>' . $ctv . '</option>'; |
|
| 391 | + } |
|
| 392 | + } |
|
| 393 | + ?> |
|
| 394 | 394 | </optgroup> |
| 395 | 395 | </select> |
| 396 | 396 | </div> |
@@ -455,63 +455,63 @@ discard block |
||
| 455 | 455 | <a class="btn btn-secondary btn-sm" href="javascript:;" onClick="check_toggle(); return false;"><?= $_lang['check_toggle'] ?></a> |
| 456 | 456 | </div> |
| 457 | 457 | <?php |
| 458 | - $rs = $modx->db->select(sprintf("tpl.id AS id, templatename, tpl.description AS tpldescription, tpl.locked AS tpllocked, tpl.selectable AS selectable, tmplvarid, if(isnull(cat.category),'%s',cat.category) AS category, cat.id AS catid", $_lang['no_category']), sprintf("%s as tpl |
|
| 458 | + $rs = $modx->db->select(sprintf("tpl.id AS id, templatename, tpl.description AS tpldescription, tpl.locked AS tpllocked, tpl.selectable AS selectable, tmplvarid, if(isnull(cat.category),'%s',cat.category) AS category, cat.id AS catid", $_lang['no_category']), sprintf("%s as tpl |
|
| 459 | 459 | LEFT JOIN %s as stt ON stt.templateid=tpl.id AND stt.tmplvarid='%s' |
| 460 | 460 | LEFT JOIN %s as cat ON tpl.category=cat.id", $modx->getFullTableName('site_templates'), $modx->getFullTableName('site_tmplvar_templates'), $id, $modx->getFullTableName('categories')), '', "category, templatename"); |
| 461 | 461 | |
| 462 | - $tplList = '<ul>'; |
|
| 463 | - $preCat = ''; |
|
| 464 | - $insideUl = 0; |
|
| 465 | - while($row = $modx->db->getRow($rs)) { |
|
| 466 | - $row['category'] = stripslashes($row['category']); //pixelchutes |
|
| 467 | - if($preCat !== $row['category']) { |
|
| 468 | - $tplList .= $insideUl ? '</ul>' : ''; |
|
| 469 | - $tplList .= '<li><strong>' . $row['category'] . ($row['catid'] != '' ? ' <small>(' . $row['catid'] . ')</small>' : '') . '</strong><ul>'; |
|
| 470 | - $insideUl = 1; |
|
| 471 | - } |
|
| 472 | - |
|
| 473 | - if($modx->manager->action == '300' && $modx->config['default_template'] == $row['id']) { |
|
| 474 | - $checked = true; |
|
| 475 | - } elseif(isset($_GET['tpl']) && $_GET['tpl'] == $row['id']) { |
|
| 476 | - $checked = true; |
|
| 477 | - } elseif($id == 0 && is_array($_POST['template'])) { |
|
| 478 | - $checked = in_array($row['id'], $_POST['template']); |
|
| 479 | - } else { |
|
| 480 | - $checked = $row['tmplvarid']; |
|
| 481 | - } |
|
| 482 | - $selectable = !$row['selectable'] ? ' class="disabled"' : ''; |
|
| 483 | - $checked = $checked ? ' checked="checked"' : ''; |
|
| 484 | - $tplId = ' <small>(' . $row['id'] . ')</small>'; |
|
| 485 | - $desc = !empty($row['tpldescription']) ? ' - ' . $row['tpldescription'] : ''; |
|
| 486 | - |
|
| 487 | - $tplInfo = array(); |
|
| 488 | - if($row['tpllocked']) { |
|
| 489 | - $tplInfo[] = $_lang['locked']; |
|
| 490 | - } |
|
| 491 | - if($row['id'] == $modx->config['default_template']) { |
|
| 492 | - $tplInfo[] = $_lang['defaulttemplate_title']; |
|
| 493 | - } |
|
| 494 | - $tplInfo = !empty($tplInfo) ? ' <em>(' . join(', ', $tplInfo) . ')</em>' : ''; |
|
| 495 | - |
|
| 496 | - $tplList .= sprintf('<li><label%s><input name="template[]" value="%s" type="checkbox" %s onchange="documentDirty=true;"> %s%s%s%s</label></li>', $selectable, $row['id'], $checked, $row['templatename'], $tplId, $desc, $tplInfo); |
|
| 497 | - $tplList .= '</li>'; |
|
| 498 | - |
|
| 499 | - $preCat = $row['category']; |
|
| 500 | - } |
|
| 501 | - $tplList .= $insideUl ? '</ul>' : ''; |
|
| 502 | - $tplList .= '</ul>'; |
|
| 503 | - echo $tplList; |
|
| 504 | - |
|
| 505 | - ?> |
|
| 462 | + $tplList = '<ul>'; |
|
| 463 | + $preCat = ''; |
|
| 464 | + $insideUl = 0; |
|
| 465 | + while($row = $modx->db->getRow($rs)) { |
|
| 466 | + $row['category'] = stripslashes($row['category']); //pixelchutes |
|
| 467 | + if($preCat !== $row['category']) { |
|
| 468 | + $tplList .= $insideUl ? '</ul>' : ''; |
|
| 469 | + $tplList .= '<li><strong>' . $row['category'] . ($row['catid'] != '' ? ' <small>(' . $row['catid'] . ')</small>' : '') . '</strong><ul>'; |
|
| 470 | + $insideUl = 1; |
|
| 471 | + } |
|
| 472 | + |
|
| 473 | + if($modx->manager->action == '300' && $modx->config['default_template'] == $row['id']) { |
|
| 474 | + $checked = true; |
|
| 475 | + } elseif(isset($_GET['tpl']) && $_GET['tpl'] == $row['id']) { |
|
| 476 | + $checked = true; |
|
| 477 | + } elseif($id == 0 && is_array($_POST['template'])) { |
|
| 478 | + $checked = in_array($row['id'], $_POST['template']); |
|
| 479 | + } else { |
|
| 480 | + $checked = $row['tmplvarid']; |
|
| 481 | + } |
|
| 482 | + $selectable = !$row['selectable'] ? ' class="disabled"' : ''; |
|
| 483 | + $checked = $checked ? ' checked="checked"' : ''; |
|
| 484 | + $tplId = ' <small>(' . $row['id'] . ')</small>'; |
|
| 485 | + $desc = !empty($row['tpldescription']) ? ' - ' . $row['tpldescription'] : ''; |
|
| 486 | + |
|
| 487 | + $tplInfo = array(); |
|
| 488 | + if($row['tpllocked']) { |
|
| 489 | + $tplInfo[] = $_lang['locked']; |
|
| 490 | + } |
|
| 491 | + if($row['id'] == $modx->config['default_template']) { |
|
| 492 | + $tplInfo[] = $_lang['defaulttemplate_title']; |
|
| 493 | + } |
|
| 494 | + $tplInfo = !empty($tplInfo) ? ' <em>(' . join(', ', $tplInfo) . ')</em>' : ''; |
|
| 495 | + |
|
| 496 | + $tplList .= sprintf('<li><label%s><input name="template[]" value="%s" type="checkbox" %s onchange="documentDirty=true;"> %s%s%s%s</label></li>', $selectable, $row['id'], $checked, $row['templatename'], $tplId, $desc, $tplInfo); |
|
| 497 | + $tplList .= '</li>'; |
|
| 498 | + |
|
| 499 | + $preCat = $row['category']; |
|
| 500 | + } |
|
| 501 | + $tplList .= $insideUl ? '</ul>' : ''; |
|
| 502 | + $tplList .= '</ul>'; |
|
| 503 | + echo $tplList; |
|
| 504 | + |
|
| 505 | + ?> |
|
| 506 | 506 | |
| 507 | 507 | <!-- Access Permissions --> |
| 508 | 508 | <?php |
| 509 | - if($use_udperms == 1) { |
|
| 510 | - // fetch permissions for the variable |
|
| 511 | - $rs = $modx->db->select('documentgroup', $modx->getFullTableName('site_tmplvar_access'), "tmplvarid='{$id}'"); |
|
| 512 | - $groupsarray = $modx->db->getColumn('documentgroup', $rs); |
|
| 509 | + if($use_udperms == 1) { |
|
| 510 | + // fetch permissions for the variable |
|
| 511 | + $rs = $modx->db->select('documentgroup', $modx->getFullTableName('site_tmplvar_access'), "tmplvarid='{$id}'"); |
|
| 512 | + $groupsarray = $modx->db->getColumn('documentgroup', $rs); |
|
| 513 | 513 | |
| 514 | - ?> |
|
| 514 | + ?> |
|
| 515 | 515 | <?php if($modx->hasPermission('access_permissions')) { ?> |
| 516 | 516 | <script type="text/javascript"> |
| 517 | 517 | function makePublic(b) { |
@@ -539,29 +539,29 @@ discard block |
||
| 539 | 539 | <!--<b><?php /*echo $_lang['access_permissions']; */ ?></b>--> |
| 540 | 540 | <p><?= $_lang['tmplvar_access_msg'] ?></p> |
| 541 | 541 | <?php |
| 542 | - $chk = ''; |
|
| 543 | - $rs = $modx->db->select('name, id', $tbl_documentgroup_names); |
|
| 544 | - if(empty($groupsarray) && is_array($_POST['docgroups']) && empty($_POST['id'])) { |
|
| 545 | - $groupsarray = $_POST['docgroups']; |
|
| 546 | - } |
|
| 547 | - while($row = $modx->db->getRow($rs)) { |
|
| 548 | - $checked = in_array($row['id'], $groupsarray); |
|
| 549 | - if($modx->hasPermission('access_permissions')) { |
|
| 550 | - if($checked) { |
|
| 551 | - $notPublic = true; |
|
| 552 | - } |
|
| 553 | - $chks .= "<li><label><input type='checkbox' name='docgroups[]' value='" . $row['id'] . "' " . ($checked ? "checked='checked'" : '') . " onclick=\"makePublic(false)\" /> " . $row['name'] . "</label></li>"; |
|
| 554 | - } else { |
|
| 555 | - if($checked) { |
|
| 556 | - echo "<input type='hidden' name='docgroups[]' value='" . $row['id'] . "' />"; |
|
| 557 | - } |
|
| 558 | - } |
|
| 559 | - } |
|
| 560 | - if($modx->hasPermission('access_permissions')) { |
|
| 561 | - $chks = "<li><label><input type='checkbox' name='chkalldocs' " . (!$notPublic ? "checked='checked'" : '') . " onclick=\"makePublic(true)\" /> <span class='warning'>" . $_lang['all_doc_groups'] . "</span></label></li>" . $chks; |
|
| 562 | - } |
|
| 563 | - echo '<ul>' . $chks . '</ul>'; |
|
| 564 | - ?> |
|
| 542 | + $chk = ''; |
|
| 543 | + $rs = $modx->db->select('name, id', $tbl_documentgroup_names); |
|
| 544 | + if(empty($groupsarray) && is_array($_POST['docgroups']) && empty($_POST['id'])) { |
|
| 545 | + $groupsarray = $_POST['docgroups']; |
|
| 546 | + } |
|
| 547 | + while($row = $modx->db->getRow($rs)) { |
|
| 548 | + $checked = in_array($row['id'], $groupsarray); |
|
| 549 | + if($modx->hasPermission('access_permissions')) { |
|
| 550 | + if($checked) { |
|
| 551 | + $notPublic = true; |
|
| 552 | + } |
|
| 553 | + $chks .= "<li><label><input type='checkbox' name='docgroups[]' value='" . $row['id'] . "' " . ($checked ? "checked='checked'" : '') . " onclick=\"makePublic(false)\" /> " . $row['name'] . "</label></li>"; |
|
| 554 | + } else { |
|
| 555 | + if($checked) { |
|
| 556 | + echo "<input type='hidden' name='docgroups[]' value='" . $row['id'] . "' />"; |
|
| 557 | + } |
|
| 558 | + } |
|
| 559 | + } |
|
| 560 | + if($modx->hasPermission('access_permissions')) { |
|
| 561 | + $chks = "<li><label><input type='checkbox' name='chkalldocs' " . (!$notPublic ? "checked='checked'" : '') . " onclick=\"makePublic(true)\" /> <span class='warning'>" . $_lang['all_doc_groups'] . "</span></label></li>" . $chks; |
|
| 562 | + } |
|
| 563 | + echo '<ul>' . $chks . '</ul>'; |
|
| 564 | + ?> |
|
| 565 | 565 | <?php } ?> |
| 566 | 566 | <?php } ?> |
| 567 | 567 | |
@@ -571,12 +571,12 @@ discard block |
||
| 571 | 571 | <input type="submit" name="save" style="display:none"> |
| 572 | 572 | |
| 573 | 573 | <?php |
| 574 | - // invoke OnTVFormRender event |
|
| 575 | - $evtOut = $modx->invokeEvent('OnTVFormRender', array('id' => $id)); |
|
| 576 | - if(is_array($evtOut)) { |
|
| 577 | - echo implode('', $evtOut); |
|
| 578 | - } |
|
| 579 | - ?> |
|
| 574 | + // invoke OnTVFormRender event |
|
| 575 | + $evtOut = $modx->invokeEvent('OnTVFormRender', array('id' => $id)); |
|
| 576 | + if(is_array($evtOut)) { |
|
| 577 | + echo implode('', $evtOut); |
|
| 578 | + } |
|
| 579 | + ?> |
|
| 580 | 580 | </div> |
| 581 | 581 | </form> |
| 582 | 582 | <script type="text/javascript">setTimeout('showParameters()', 10);</script> |
@@ -1,11 +1,11 @@ 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_template') && $modx->manager->action == '301') { |
|
| 5 | +if (!$modx->hasPermission('edit_template') && $modx->manager->action == '301') { |
|
| 6 | 6 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
| 7 | 7 | } |
| 8 | -if(!$modx->hasPermission('new_template') && $modx->manager->action == '300') { |
|
| 8 | +if (!$modx->hasPermission('new_template') && $modx->manager->action == '300') { |
|
| 9 | 9 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
| 10 | 10 | } |
| 11 | 11 | |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | $tbl_documentgroup_names = $modx->getFullTableName('documentgroup_names'); |
| 20 | 20 | |
| 21 | 21 | // check to see the snippet editor isn't locked |
| 22 | -if($lockedEl = $modx->elementIsLocked(2, $id)) { |
|
| 22 | +if ($lockedEl = $modx->elementIsLocked(2, $id)) { |
|
| 23 | 23 | $modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['tmplvar'])); |
| 24 | 24 | } |
| 25 | 25 | // end check for lock |
@@ -29,25 +29,25 @@ discard block |
||
| 29 | 29 | |
| 30 | 30 | global $content; |
| 31 | 31 | $content = array(); |
| 32 | -if(isset($_GET['id'])) { |
|
| 32 | +if (isset($_GET['id'])) { |
|
| 33 | 33 | $rs = $modx->db->select('*', $tbl_site_tmplvars, "id='{$id}'"); |
| 34 | 34 | $content = $modx->db->getRow($rs); |
| 35 | - if(!$content) { |
|
| 36 | - header("Location: " . MODX_SITE_URL . "index.php?id={$site_start}"); |
|
| 35 | + if (!$content) { |
|
| 36 | + header("Location: ".MODX_SITE_URL."index.php?id={$site_start}"); |
|
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | $_SESSION['itemname'] = $content['caption']; |
| 40 | - if($content['locked'] == 1 && $modx->hasPermission('save_role') != 1) { |
|
| 40 | + if ($content['locked'] == 1 && $modx->hasPermission('save_role') != 1) { |
|
| 41 | 41 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
| 42 | 42 | } |
| 43 | -} else if(isset($_REQUEST['itemname'])) { |
|
| 43 | +} else if (isset($_REQUEST['itemname'])) { |
|
| 44 | 44 | $content['name'] = $_REQUEST['itemname']; |
| 45 | 45 | } else { |
| 46 | 46 | $_SESSION['itemname'] = $_lang["new_tmplvars"]; |
| 47 | 47 | $content['category'] = intval($_REQUEST['catid']); |
| 48 | 48 | } |
| 49 | 49 | |
| 50 | -if($modx->manager->hasFormValues()) { |
|
| 50 | +if ($modx->manager->hasFormValues()) { |
|
| 51 | 51 | $modx->manager->loadFormValues(); |
| 52 | 52 | } |
| 53 | 53 | |
@@ -56,12 +56,12 @@ discard block |
||
| 56 | 56 | // Add lock-element JS-Script |
| 57 | 57 | $lockElementId = $id; |
| 58 | 58 | $lockElementType = 2; |
| 59 | -require_once(MODX_MANAGER_PATH . 'includes/active_user_locks.inc.php'); |
|
| 59 | +require_once(MODX_MANAGER_PATH.'includes/active_user_locks.inc.php'); |
|
| 60 | 60 | |
| 61 | 61 | // get available RichText Editors |
| 62 | 62 | $RTEditors = ''; |
| 63 | 63 | $evtOut = $modx->invokeEvent('OnRichTextEditorRegister', array('forfrontend' => 1)); |
| 64 | -if(is_array($evtOut)) { |
|
| 64 | +if (is_array($evtOut)) { |
|
| 65 | 65 | $RTEditors = implode(',', $evtOut); |
| 66 | 66 | } |
| 67 | 67 | |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | }, |
| 108 | 108 | cancel: function() { |
| 109 | 109 | documentDirty = false; |
| 110 | - document.location.href = 'index.php?a=<?= $origin ?><?=($originId != NULL ? '&id=' . $originId : '') ?>'; |
|
| 110 | + document.location.href = 'index.php?a=<?= $origin ?><?=($originId != NULL ? '&id='.$originId : '') ?>'; |
|
| 111 | 111 | } |
| 112 | 112 | }; |
| 113 | 113 | |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | <?php |
| 280 | 280 | // invoke OnTVFormPrerender event |
| 281 | 281 | $evtOut = $modx->invokeEvent('OnTVFormPrerender', array('id' => $id)); |
| 282 | - if(is_array($evtOut)) { |
|
| 282 | + if (is_array($evtOut)) { |
|
| 283 | 283 | echo implode("", $evtOut); |
| 284 | 284 | } |
| 285 | 285 | ?> |
@@ -291,7 +291,7 @@ discard block |
||
| 291 | 291 | <input type="hidden" name="params" value="<?= $modx->htmlspecialchars($content['display_params']) ?>"> |
| 292 | 292 | |
| 293 | 293 | <h1> |
| 294 | - <i class="fa fa-list-alt"></i><?= ($content['name'] ? $content['name'] . '<small>(' . $content['id'] . ')</small>' : $_lang['new_tmplvars']) ?><i class="fa fa-question-circle help"></i> |
|
| 294 | + <i class="fa fa-list-alt"></i><?= ($content['name'] ? $content['name'].'<small>('.$content['id'].')</small>' : $_lang['new_tmplvars']) ?><i class="fa fa-question-circle help"></i> |
|
| 295 | 295 | </h1> |
| 296 | 296 | |
| 297 | 297 | <?= $_style['actionbuttons']['dynamic']['element'] ?> |
@@ -314,8 +314,8 @@ discard block |
||
| 314 | 314 | <div class="col-md-9 col-lg-10"> |
| 315 | 315 | <div class="form-control-name clearfix"> |
| 316 | 316 | <input name="name" type="text" maxlength="50" value="<?= $modx->htmlspecialchars($content['name']) ?>" class="form-control form-control-lg" onchange="documentDirty=true;" /> |
| 317 | - <?php if($modx->hasPermission('save_role')): ?> |
|
| 318 | - <label class="custom-control" title="<?= $_lang['lock_tmplvars'] . "\n" . $_lang['lock_tmplvars_msg'] ?>" tooltip> |
|
| 317 | + <?php if ($modx->hasPermission('save_role')): ?> |
|
| 318 | + <label class="custom-control" title="<?= $_lang['lock_tmplvars']."\n".$_lang['lock_tmplvars_msg'] ?>" tooltip> |
|
| 319 | 319 | <input name="locked" type="checkbox"<?= ($content['locked'] == 1 ? ' checked="checked"' : '') ?> /> |
| 320 | 320 | <i class="fa fa-lock"></i> |
| 321 | 321 | </label> |
@@ -343,9 +343,9 @@ discard block |
||
| 343 | 343 | <select name="categoryid" class="form-control" onChange="documentDirty=true;"> |
| 344 | 344 | <option> </option> |
| 345 | 345 | <?php |
| 346 | - include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php'); |
|
| 347 | - foreach(getCategories() as $n => $v) { |
|
| 348 | - echo "<option value='" . $v['id'] . "'" . ($content["category"] == $v["id"] ? " selected='selected'" : "") . ">" . $modx->htmlspecialchars($v["category"]) . "</option>"; |
|
| 346 | + include_once(MODX_MANAGER_PATH.'includes/categories.inc.php'); |
|
| 347 | + foreach (getCategories() as $n => $v) { |
|
| 348 | + echo "<option value='".$v['id']."'".($content["category"] == $v["id"] ? " selected='selected'" : "").">".$modx->htmlspecialchars($v["category"])."</option>"; |
|
| 349 | 349 | } |
| 350 | 350 | ?> |
| 351 | 351 | </select> |
@@ -383,11 +383,11 @@ discard block |
||
| 383 | 383 | <optgroup label="Custom Type"> |
| 384 | 384 | <option value="custom_tv" <?= ($content['type'] == 'custom_tv' ? "selected='selected'" : "") ?>>Custom Input</option> |
| 385 | 385 | <?php |
| 386 | - $custom_tvs = scandir(MODX_BASE_PATH . 'assets/tvs'); |
|
| 387 | - foreach($custom_tvs as $ctv) { |
|
| 388 | - if(strpos($ctv, '.') !== 0 && $ctv != 'index.html') { |
|
| 389 | - $selected = ($content['type'] == 'custom_tv:' . $ctv ? "selected='selected'" : ""); |
|
| 390 | - echo '<option value="custom_tv:' . $ctv . '" ' . $selected . '>' . $ctv . '</option>'; |
|
| 386 | + $custom_tvs = scandir(MODX_BASE_PATH.'assets/tvs'); |
|
| 387 | + foreach ($custom_tvs as $ctv) { |
|
| 388 | + if (strpos($ctv, '.') !== 0 && $ctv != 'index.html') { |
|
| 389 | + $selected = ($content['type'] == 'custom_tv:'.$ctv ? "selected='selected'" : ""); |
|
| 390 | + echo '<option value="custom_tv:'.$ctv.'" '.$selected.'>'.$ctv.'</option>'; |
|
| 391 | 391 | } |
| 392 | 392 | } |
| 393 | 393 | ?> |
@@ -462,36 +462,36 @@ discard block |
||
| 462 | 462 | $tplList = '<ul>'; |
| 463 | 463 | $preCat = ''; |
| 464 | 464 | $insideUl = 0; |
| 465 | - while($row = $modx->db->getRow($rs)) { |
|
| 465 | + while ($row = $modx->db->getRow($rs)) { |
|
| 466 | 466 | $row['category'] = stripslashes($row['category']); //pixelchutes |
| 467 | - if($preCat !== $row['category']) { |
|
| 467 | + if ($preCat !== $row['category']) { |
|
| 468 | 468 | $tplList .= $insideUl ? '</ul>' : ''; |
| 469 | - $tplList .= '<li><strong>' . $row['category'] . ($row['catid'] != '' ? ' <small>(' . $row['catid'] . ')</small>' : '') . '</strong><ul>'; |
|
| 469 | + $tplList .= '<li><strong>'.$row['category'].($row['catid'] != '' ? ' <small>('.$row['catid'].')</small>' : '').'</strong><ul>'; |
|
| 470 | 470 | $insideUl = 1; |
| 471 | 471 | } |
| 472 | 472 | |
| 473 | - if($modx->manager->action == '300' && $modx->config['default_template'] == $row['id']) { |
|
| 473 | + if ($modx->manager->action == '300' && $modx->config['default_template'] == $row['id']) { |
|
| 474 | 474 | $checked = true; |
| 475 | - } elseif(isset($_GET['tpl']) && $_GET['tpl'] == $row['id']) { |
|
| 475 | + } elseif (isset($_GET['tpl']) && $_GET['tpl'] == $row['id']) { |
|
| 476 | 476 | $checked = true; |
| 477 | - } elseif($id == 0 && is_array($_POST['template'])) { |
|
| 477 | + } elseif ($id == 0 && is_array($_POST['template'])) { |
|
| 478 | 478 | $checked = in_array($row['id'], $_POST['template']); |
| 479 | 479 | } else { |
| 480 | 480 | $checked = $row['tmplvarid']; |
| 481 | 481 | } |
| 482 | 482 | $selectable = !$row['selectable'] ? ' class="disabled"' : ''; |
| 483 | 483 | $checked = $checked ? ' checked="checked"' : ''; |
| 484 | - $tplId = ' <small>(' . $row['id'] . ')</small>'; |
|
| 485 | - $desc = !empty($row['tpldescription']) ? ' - ' . $row['tpldescription'] : ''; |
|
| 484 | + $tplId = ' <small>('.$row['id'].')</small>'; |
|
| 485 | + $desc = !empty($row['tpldescription']) ? ' - '.$row['tpldescription'] : ''; |
|
| 486 | 486 | |
| 487 | 487 | $tplInfo = array(); |
| 488 | - if($row['tpllocked']) { |
|
| 488 | + if ($row['tpllocked']) { |
|
| 489 | 489 | $tplInfo[] = $_lang['locked']; |
| 490 | 490 | } |
| 491 | - if($row['id'] == $modx->config['default_template']) { |
|
| 491 | + if ($row['id'] == $modx->config['default_template']) { |
|
| 492 | 492 | $tplInfo[] = $_lang['defaulttemplate_title']; |
| 493 | 493 | } |
| 494 | - $tplInfo = !empty($tplInfo) ? ' <em>(' . join(', ', $tplInfo) . ')</em>' : ''; |
|
| 494 | + $tplInfo = !empty($tplInfo) ? ' <em>('.join(', ', $tplInfo).')</em>' : ''; |
|
| 495 | 495 | |
| 496 | 496 | $tplList .= sprintf('<li><label%s><input name="template[]" value="%s" type="checkbox" %s onchange="documentDirty=true;"> %s%s%s%s</label></li>', $selectable, $row['id'], $checked, $row['templatename'], $tplId, $desc, $tplInfo); |
| 497 | 497 | $tplList .= '</li>'; |
@@ -506,13 +506,13 @@ discard block |
||
| 506 | 506 | |
| 507 | 507 | <!-- Access Permissions --> |
| 508 | 508 | <?php |
| 509 | - if($use_udperms == 1) { |
|
| 509 | + if ($use_udperms == 1) { |
|
| 510 | 510 | // fetch permissions for the variable |
| 511 | 511 | $rs = $modx->db->select('documentgroup', $modx->getFullTableName('site_tmplvar_access'), "tmplvarid='{$id}'"); |
| 512 | 512 | $groupsarray = $modx->db->getColumn('documentgroup', $rs); |
| 513 | 513 | |
| 514 | 514 | ?> |
| 515 | - <?php if($modx->hasPermission('access_permissions')) { ?> |
|
| 515 | + <?php if ($modx->hasPermission('access_permissions')) { ?> |
|
| 516 | 516 | <script type="text/javascript"> |
| 517 | 517 | function makePublic(b) { |
| 518 | 518 | var notPublic = false; |
@@ -541,26 +541,26 @@ discard block |
||
| 541 | 541 | <?php |
| 542 | 542 | $chk = ''; |
| 543 | 543 | $rs = $modx->db->select('name, id', $tbl_documentgroup_names); |
| 544 | - if(empty($groupsarray) && is_array($_POST['docgroups']) && empty($_POST['id'])) { |
|
| 544 | + if (empty($groupsarray) && is_array($_POST['docgroups']) && empty($_POST['id'])) { |
|
| 545 | 545 | $groupsarray = $_POST['docgroups']; |
| 546 | 546 | } |
| 547 | - while($row = $modx->db->getRow($rs)) { |
|
| 547 | + while ($row = $modx->db->getRow($rs)) { |
|
| 548 | 548 | $checked = in_array($row['id'], $groupsarray); |
| 549 | - if($modx->hasPermission('access_permissions')) { |
|
| 550 | - if($checked) { |
|
| 549 | + if ($modx->hasPermission('access_permissions')) { |
|
| 550 | + if ($checked) { |
|
| 551 | 551 | $notPublic = true; |
| 552 | 552 | } |
| 553 | - $chks .= "<li><label><input type='checkbox' name='docgroups[]' value='" . $row['id'] . "' " . ($checked ? "checked='checked'" : '') . " onclick=\"makePublic(false)\" /> " . $row['name'] . "</label></li>"; |
|
| 553 | + $chks .= "<li><label><input type='checkbox' name='docgroups[]' value='".$row['id']."' ".($checked ? "checked='checked'" : '')." onclick=\"makePublic(false)\" /> ".$row['name']."</label></li>"; |
|
| 554 | 554 | } else { |
| 555 | - if($checked) { |
|
| 556 | - echo "<input type='hidden' name='docgroups[]' value='" . $row['id'] . "' />"; |
|
| 555 | + if ($checked) { |
|
| 556 | + echo "<input type='hidden' name='docgroups[]' value='".$row['id']."' />"; |
|
| 557 | 557 | } |
| 558 | 558 | } |
| 559 | 559 | } |
| 560 | - if($modx->hasPermission('access_permissions')) { |
|
| 561 | - $chks = "<li><label><input type='checkbox' name='chkalldocs' " . (!$notPublic ? "checked='checked'" : '') . " onclick=\"makePublic(true)\" /> <span class='warning'>" . $_lang['all_doc_groups'] . "</span></label></li>" . $chks; |
|
| 560 | + if ($modx->hasPermission('access_permissions')) { |
|
| 561 | + $chks = "<li><label><input type='checkbox' name='chkalldocs' ".(!$notPublic ? "checked='checked'" : '')." onclick=\"makePublic(true)\" /> <span class='warning'>".$_lang['all_doc_groups']."</span></label></li>".$chks; |
|
| 562 | 562 | } |
| 563 | - echo '<ul>' . $chks . '</ul>'; |
|
| 563 | + echo '<ul>'.$chks.'</ul>'; |
|
| 564 | 564 | ?> |
| 565 | 565 | <?php } ?> |
| 566 | 566 | <?php } ?> |
@@ -573,7 +573,7 @@ discard block |
||
| 573 | 573 | <?php |
| 574 | 574 | // invoke OnTVFormRender event |
| 575 | 575 | $evtOut = $modx->invokeEvent('OnTVFormRender', array('id' => $id)); |
| 576 | - if(is_array($evtOut)) { |
|
| 576 | + if (is_array($evtOut)) { |
|
| 577 | 577 | echo implode('', $evtOut); |
| 578 | 578 | } |
| 579 | 579 | ?> |
@@ -1,9 +1,9 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
| 3 | - die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly."); |
|
| 3 | + die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly."); |
|
| 4 | 4 | } |
| 5 | 5 | if(!$modx->hasPermission('edit_web_user')) { |
| 6 | - $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
| 6 | + $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
| 7 | 7 | } |
| 8 | 8 | |
| 9 | 9 | // initialize page view state - the $_PAGE object |
@@ -11,12 +11,12 @@ discard block |
||
| 11 | 11 | |
| 12 | 12 | // get and save search string |
| 13 | 13 | if($_REQUEST['op'] == 'reset') { |
| 14 | - $query = ''; |
|
| 15 | - $_PAGE['vs']['search'] = ''; |
|
| 14 | + $query = ''; |
|
| 15 | + $_PAGE['vs']['search'] = ''; |
|
| 16 | 16 | } else { |
| 17 | - $query = isset($_REQUEST['search']) ? $_REQUEST['search'] : $_PAGE['vs']['search']; |
|
| 18 | - $sqlQuery = $modx->db->escape($query); |
|
| 19 | - $_PAGE['vs']['search'] = $query; |
|
| 17 | + $query = isset($_REQUEST['search']) ? $_REQUEST['search'] : $_PAGE['vs']['search']; |
|
| 18 | + $sqlQuery = $modx->db->escape($query); |
|
| 19 | + $_PAGE['vs']['search'] = $query; |
|
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | // get & save listmode |
@@ -120,29 +120,29 @@ discard block |
||
| 120 | 120 | <div class="row"> |
| 121 | 121 | <div class="table-responsive"> |
| 122 | 122 | <?php |
| 123 | - $ds = $modx->db->select("wu.id, wu.username, wua.fullname, wua.email, ELT(wua.gender, '{$_lang['user_male']}', '{$_lang['user_female']}', '{$_lang['user_other']}') AS gender, IF(wua.blocked,'{$_lang['yes']}','-') as 'blocked'", $modx->getFullTableName("web_users") . " wu |
|
| 123 | + $ds = $modx->db->select("wu.id, wu.username, wua.fullname, wua.email, ELT(wua.gender, '{$_lang['user_male']}', '{$_lang['user_female']}', '{$_lang['user_other']}') AS gender, IF(wua.blocked,'{$_lang['yes']}','-') as 'blocked'", $modx->getFullTableName("web_users") . " wu |
|
| 124 | 124 | INNER JOIN " . $modx->getFullTableName("web_user_attributes") . " wua ON wua.internalKey=wu.id", ($sqlQuery ? "(wu.username LIKE '{$sqlQuery}%') OR (wua.fullname LIKE '%{$sqlQuery}%') OR (wua.email LIKE '%{$sqlQuery}%')" : ""), 'username'); |
| 125 | - include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php"; |
|
| 126 | - $grd = new DataGrid('', $ds, $number_of_results); // set page size to 0 t show all items |
|
| 127 | - $grd->noRecordMsg = $_lang["no_records_found"]; |
|
| 128 | - $grd->cssClass = "table data"; |
|
| 129 | - $grd->columnHeaderClass = "tableHeader"; |
|
| 130 | - $grd->itemClass = "tableItem"; |
|
| 131 | - $grd->altItemClass = "tableAltItem"; |
|
| 132 | - $grd->fields = "id,username,fullname,email,gender,blocked"; |
|
| 133 | - $grd->columns = $_lang["icon"] . " ," . $_lang["name"] . " ," . $_lang["user_full_name"] . " ," . $_lang["email"] . " ," . $_lang["user_gender"] . " ," . $_lang["user_block"]; |
|
| 134 | - $grd->colWidths = "1%,,,,1%,1%"; |
|
| 135 | - $grd->colAligns = "center,,,,center,right' nowrap='nowrap"; |
|
| 136 | - $grd->colTypes = "template:<a class='gridRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='" . $_lang["click_to_context"] . "'><i class='" . $_style["icons_user"] . "'></i></a>||template:<a href='index.php?a=88&id=[+id+]' title='" . $_lang["click_to_edit_title"] . "'>[+value+]</a>"; |
|
| 137 | - if($listmode == '1') { |
|
| 138 | - $grd->pageSize = 0; |
|
| 139 | - } |
|
| 140 | - if($_REQUEST['op'] == 'reset') { |
|
| 141 | - $grd->pageNumber = 1; |
|
| 142 | - } |
|
| 143 | - // render grid |
|
| 144 | - echo $grd->render(); |
|
| 145 | - ?> |
|
| 125 | + include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php"; |
|
| 126 | + $grd = new DataGrid('', $ds, $number_of_results); // set page size to 0 t show all items |
|
| 127 | + $grd->noRecordMsg = $_lang["no_records_found"]; |
|
| 128 | + $grd->cssClass = "table data"; |
|
| 129 | + $grd->columnHeaderClass = "tableHeader"; |
|
| 130 | + $grd->itemClass = "tableItem"; |
|
| 131 | + $grd->altItemClass = "tableAltItem"; |
|
| 132 | + $grd->fields = "id,username,fullname,email,gender,blocked"; |
|
| 133 | + $grd->columns = $_lang["icon"] . " ," . $_lang["name"] . " ," . $_lang["user_full_name"] . " ," . $_lang["email"] . " ," . $_lang["user_gender"] . " ," . $_lang["user_block"]; |
|
| 134 | + $grd->colWidths = "1%,,,,1%,1%"; |
|
| 135 | + $grd->colAligns = "center,,,,center,right' nowrap='nowrap"; |
|
| 136 | + $grd->colTypes = "template:<a class='gridRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='" . $_lang["click_to_context"] . "'><i class='" . $_style["icons_user"] . "'></i></a>||template:<a href='index.php?a=88&id=[+id+]' title='" . $_lang["click_to_edit_title"] . "'>[+value+]</a>"; |
|
| 137 | + if($listmode == '1') { |
|
| 138 | + $grd->pageSize = 0; |
|
| 139 | + } |
|
| 140 | + if($_REQUEST['op'] == 'reset') { |
|
| 141 | + $grd->pageNumber = 1; |
|
| 142 | + } |
|
| 143 | + // render grid |
|
| 144 | + echo $grd->render(); |
|
| 145 | + ?> |
|
| 146 | 146 | </div> |
| 147 | 147 | </div> |
| 148 | 148 | </div> |
@@ -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_web_user')) { |
|
| 5 | +if (!$modx->hasPermission('edit_web_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)); |
@@ -120,9 +120,9 @@ discard block |
||
| 120 | 120 | <div class="row"> |
| 121 | 121 | <div class="table-responsive"> |
| 122 | 122 | <?php |
| 123 | - $ds = $modx->db->select("wu.id, wu.username, wua.fullname, wua.email, ELT(wua.gender, '{$_lang['user_male']}', '{$_lang['user_female']}', '{$_lang['user_other']}') AS gender, IF(wua.blocked,'{$_lang['yes']}','-') as 'blocked'", $modx->getFullTableName("web_users") . " wu |
|
| 124 | - INNER JOIN " . $modx->getFullTableName("web_user_attributes") . " wua ON wua.internalKey=wu.id", ($sqlQuery ? "(wu.username LIKE '{$sqlQuery}%') OR (wua.fullname LIKE '%{$sqlQuery}%') OR (wua.email LIKE '%{$sqlQuery}%')" : ""), 'username'); |
|
| 125 | - include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php"; |
|
| 123 | + $ds = $modx->db->select("wu.id, wu.username, wua.fullname, wua.email, ELT(wua.gender, '{$_lang['user_male']}', '{$_lang['user_female']}', '{$_lang['user_other']}') AS gender, IF(wua.blocked,'{$_lang['yes']}','-') as 'blocked'", $modx->getFullTableName("web_users")." wu |
|
| 124 | + INNER JOIN " . $modx->getFullTableName("web_user_attributes")." wua ON wua.internalKey=wu.id", ($sqlQuery ? "(wu.username LIKE '{$sqlQuery}%') OR (wua.fullname LIKE '%{$sqlQuery}%') OR (wua.email LIKE '%{$sqlQuery}%')" : ""), 'username'); |
|
| 125 | + include_once MODX_MANAGER_PATH."includes/controls/datagrid.class.php"; |
|
| 126 | 126 | $grd = new DataGrid('', $ds, $number_of_results); // set page size to 0 t show all items |
| 127 | 127 | $grd->noRecordMsg = $_lang["no_records_found"]; |
| 128 | 128 | $grd->cssClass = "table data"; |
@@ -130,14 +130,14 @@ discard block |
||
| 130 | 130 | $grd->itemClass = "tableItem"; |
| 131 | 131 | $grd->altItemClass = "tableAltItem"; |
| 132 | 132 | $grd->fields = "id,username,fullname,email,gender,blocked"; |
| 133 | - $grd->columns = $_lang["icon"] . " ," . $_lang["name"] . " ," . $_lang["user_full_name"] . " ," . $_lang["email"] . " ," . $_lang["user_gender"] . " ," . $_lang["user_block"]; |
|
| 133 | + $grd->columns = $_lang["icon"]." ,".$_lang["name"]." ,".$_lang["user_full_name"]." ,".$_lang["email"]." ,".$_lang["user_gender"]." ,".$_lang["user_block"]; |
|
| 134 | 134 | $grd->colWidths = "1%,,,,1%,1%"; |
| 135 | 135 | $grd->colAligns = "center,,,,center,right' nowrap='nowrap"; |
| 136 | - $grd->colTypes = "template:<a class='gridRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='" . $_lang["click_to_context"] . "'><i class='" . $_style["icons_user"] . "'></i></a>||template:<a href='index.php?a=88&id=[+id+]' title='" . $_lang["click_to_edit_title"] . "'>[+value+]</a>"; |
|
| 137 | - if($listmode == '1') { |
|
| 136 | + $grd->colTypes = "template:<a class='gridRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='".$_lang["click_to_context"]."'><i class='".$_style["icons_user"]."'></i></a>||template:<a href='index.php?a=88&id=[+id+]' title='".$_lang["click_to_edit_title"]."'>[+value+]</a>"; |
|
| 137 | + if ($listmode == '1') { |
|
| 138 | 138 | $grd->pageSize = 0; |
| 139 | 139 | } |
| 140 | - if($_REQUEST['op'] == 'reset') { |
|
| 140 | + if ($_REQUEST['op'] == 'reset') { |
|
| 141 | 141 | $grd->pageNumber = 1; |
| 142 | 142 | } |
| 143 | 143 | // render grid |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 3 | 3 | die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly."); |
| 4 | 4 | } |
| 5 | 5 | |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | // Add lock-element JS-Script |
| 57 | 57 | $lockElementId = $id; |
| 58 | 58 | $lockElementType = 5; |
| 59 | -require_once(MODX_MANAGER_PATH . 'includes/active_user_locks.inc.php'); |
|
| 59 | +require_once(MODX_MANAGER_PATH.'includes/active_user_locks.inc.php'); |
|
| 60 | 60 | |
| 61 | 61 | function bold($cond = false) |
| 62 | 62 | { |
@@ -478,7 +478,7 @@ discard block |
||
| 478 | 478 | <input type="hidden" name="mode" value="<?= $modx->manager->action ?>"> |
| 479 | 479 | |
| 480 | 480 | <h1> |
| 481 | - <i class="fa fa-plug"></i><?= ($content['name'] ? $content['name'] . '<small>(' . $content['id'] . ')</small>' : $_lang['new_plugin']) ?><i class="fa fa-question-circle help"></i> |
|
| 481 | + <i class="fa fa-plug"></i><?= ($content['name'] ? $content['name'].'<small>('.$content['id'].')</small>' : $_lang['new_plugin']) ?><i class="fa fa-question-circle help"></i> |
|
| 482 | 482 | </h1> |
| 483 | 483 | |
| 484 | 484 | <?= $_style['actionbuttons']['dynamic']['element'] ?> |
@@ -504,7 +504,7 @@ discard block |
||
| 504 | 504 | <div class="form-control-name clearfix"> |
| 505 | 505 | <input name="name" type="text" maxlength="100" value="<?= $modx->htmlspecialchars($content['name']) ?>" class="form-control form-control-lg" onchange="documentDirty=true;" /> |
| 506 | 506 | <?php if ($modx->hasPermission('save_role')): ?> |
| 507 | - <label class="custom-control" title="<?= $_lang['lock_plugin'] . "\n" . $_lang['lock_plugin_msg'] ?>" tooltip> |
|
| 507 | + <label class="custom-control" title="<?= $_lang['lock_plugin']."\n".$_lang['lock_plugin_msg'] ?>" tooltip> |
|
| 508 | 508 | <input name="locked" type="checkbox" value="on"<?= ($content['locked'] == 1 ? ' checked="checked"' : '') ?> /> |
| 509 | 509 | <i class="fa fa-lock"></i> |
| 510 | 510 | </label> |
@@ -528,9 +528,9 @@ discard block |
||
| 528 | 528 | <select name="categoryid" class="form-control" onchange="documentDirty=true;"> |
| 529 | 529 | <option> </option> |
| 530 | 530 | <?php |
| 531 | - include_once(MODX_MANAGER_PATH . 'includes/categories.inc.php'); |
|
| 531 | + include_once(MODX_MANAGER_PATH.'includes/categories.inc.php'); |
|
| 532 | 532 | foreach (getCategories() as $n => $v) { |
| 533 | - echo '<option value="' . $v['id'] . '"' . ($content["category"] == $v["id"] ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($v["category"]) . "</option>"; |
|
| 533 | + echo '<option value="'.$v['id'].'"'.($content["category"] == $v["id"] ? ' selected="selected"' : '').'>'.$modx->htmlspecialchars($v["category"])."</option>"; |
|
| 534 | 534 | } |
| 535 | 535 | ?> |
| 536 | 536 | </select> |
@@ -546,7 +546,7 @@ discard block |
||
| 546 | 546 | <?php if ($modx->hasPermission('save_role')): ?> |
| 547 | 547 | <div class="form-group"> |
| 548 | 548 | <div class="form-row"> |
| 549 | - <label><input name="disabled" type="checkbox" value="on"<?= ($content['disabled'] == 1 ? ' checked="checked"' : '') ?> /> <?= ($content['disabled'] == 1 ? "<span class='text-danger'>" . $_lang['plugin_disabled'] . "</span>" : $_lang['plugin_disabled']) ?></label> |
|
| 549 | + <label><input name="disabled" type="checkbox" value="on"<?= ($content['disabled'] == 1 ? ' checked="checked"' : '') ?> /> <?= ($content['disabled'] == 1 ? "<span class='text-danger'>".$_lang['plugin_disabled']."</span>" : $_lang['plugin_disabled']) ?></label> |
|
| 550 | 550 | </div> |
| 551 | 551 | <div class="form-row"> |
| 552 | 552 | <label> |
@@ -593,11 +593,11 @@ discard block |
||
| 593 | 593 | <select name="moduleguid" class="form-control" onchange="documentDirty=true;"> |
| 594 | 594 | <option> </option> |
| 595 | 595 | <?php |
| 596 | - $ds = $modx->db->select('sm.id,sm.name,sm.guid', $modx->getFullTableName("site_modules") . " sm |
|
| 597 | - INNER JOIN " . $modx->getFullTableName("site_module_depobj") . " smd ON smd.module=sm.id AND smd.type=30 |
|
| 598 | - INNER JOIN " . $modx->getFullTableName("site_plugins") . " sp ON sp.id=smd.resource", "smd.resource='{$id}' AND sm.enable_sharedparams='1'", 'sm.name'); |
|
| 596 | + $ds = $modx->db->select('sm.id,sm.name,sm.guid', $modx->getFullTableName("site_modules")." sm |
|
| 597 | + INNER JOIN " . $modx->getFullTableName("site_module_depobj")." smd ON smd.module=sm.id AND smd.type=30 |
|
| 598 | + INNER JOIN " . $modx->getFullTableName("site_plugins")." sp ON sp.id=smd.resource", "smd.resource='{$id}' AND sm.enable_sharedparams='1'", 'sm.name'); |
|
| 599 | 599 | while ($row = $modx->db->getRow($ds)) { |
| 600 | - echo "<option value='" . $row['guid'] . "'" . ($content["moduleguid"] == $row["guid"] ? " selected='selected'" : "") . ">" . $modx->htmlspecialchars($row["name"]) . "</option>"; |
|
| 600 | + echo "<option value='".$row['guid']."'".($content["moduleguid"] == $row["guid"] ? " selected='selected'" : "").">".$modx->htmlspecialchars($row["name"])."</option>"; |
|
| 601 | 601 | } |
| 602 | 602 | ?> |
| 603 | 603 | </select> |
@@ -658,7 +658,7 @@ discard block |
||
| 658 | 658 | echoEventRows($evtnames); |
| 659 | 659 | } |
| 660 | 660 | echo '<hr class="clear">'; |
| 661 | - echo '<div class="form-group"><b>' . $services[$srv - 1] . '</b></div>'; |
|
| 661 | + echo '<div class="form-group"><b>'.$services[$srv - 1].'</b></div>'; |
|
| 662 | 662 | } |
| 663 | 663 | // display group name |
| 664 | 664 | if ($grp != $row['groupname']) { |
@@ -667,9 +667,9 @@ discard block |
||
| 667 | 667 | echoEventRows($evtnames); |
| 668 | 668 | } |
| 669 | 669 | echo '<hr class="clear">'; |
| 670 | - echo '<div class="form-group"><b>' . $row['groupname'] . '</b></div>'; |
|
| 670 | + echo '<div class="form-group"><b>'.$row['groupname'].'</b></div>'; |
|
| 671 | 671 | } |
| 672 | - $evtnames[] = '<input name="sysevents[]" id="' . $row['name'] . '" type="checkbox" ' . (in_array($row['id'], $evts) ? ' checked="checked" ' : '') . 'class="inputBox" value="' . $row['id'] . '" /> <label for="' . $row['name'] . '" ' . bold(in_array($row['id'], $evts)) . '> ' . $row['name'] . '</label>' . "\n"; |
|
| 672 | + $evtnames[] = '<input name="sysevents[]" id="'.$row['name'].'" type="checkbox" '.(in_array($row['id'], $evts) ? ' checked="checked" ' : '').'class="inputBox" value="'.$row['id'].'" /> <label for="'.$row['name'].'" '.bold(in_array($row['id'], $evts)).'> '.$row['name'].'</label>'."\n"; |
|
| 673 | 673 | if (count($evtnames) == 2) { |
| 674 | 674 | echoEventRows($evtnames); |
| 675 | 675 | } |
@@ -681,7 +681,7 @@ discard block |
||
| 681 | 681 | |
| 682 | 682 | function echoEventRows(&$evtnames) |
| 683 | 683 | { |
| 684 | - echo '<div class="row form-row"><div class="col-sm-6 col-md-4 col-lg-3">' . implode('</div><div class="col-sm-6 col-md-4 col-lg-3">', $evtnames) . '</div></div>'; |
|
| 684 | + echo '<div class="row form-row"><div class="col-sm-6 col-md-4 col-lg-3">'.implode('</div><div class="col-sm-6 col-md-4 col-lg-3">', $evtnames).'</div></div>'; |
|
| 685 | 685 | $evtnames = array(); |
| 686 | 686 | } |
| 687 | 687 | |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
|
|
| 2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
|
|
| 3 | 3 | die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
|
| 4 | 4 | } |
| 5 | 5 | if (!$modx->hasPermission('logs')) {
|
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | $logs_user = record_sort(array_unique_multi($logs, 'internalKey'), 'username'); |
| 66 | 66 | foreach ($logs_user as $row) {
|
| 67 | 67 | $selectedtext = $row['internalKey'] == $_REQUEST['searchuser'] ? ' selected="selected"' : ''; |
| 68 | - echo "\t\t" . '<option value="' . $row['internalKey'] . '"' . $selectedtext . '>' . $row['username'] . "</option>\n"; |
|
| 68 | + echo "\t\t".'<option value="'.$row['internalKey'].'"'.$selectedtext.'>'.$row['username']."</option>\n"; |
|
| 69 | 69 | } |
| 70 | 70 | ?> |
| 71 | 71 | </select> |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | continue; |
| 87 | 87 | } |
| 88 | 88 | $selectedtext = $row['action'] == $_REQUEST['action'] ? ' selected="selected"' : ''; |
| 89 | - echo "\t\t" . '<option value="' . $row['action'] . '"' . $selectedtext . '>' . $row['action'] . ' - ' . $action . "</option>\n"; |
|
| 89 | + echo "\t\t".'<option value="'.$row['action'].'"'.$selectedtext.'>'.$row['action'].' - '.$action."</option>\n"; |
|
| 90 | 90 | } |
| 91 | 91 | ?> |
| 92 | 92 | </select> |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | $logs_items = record_sort(array_unique_multi($logs, 'itemid'), 'itemid'); |
| 103 | 103 | foreach ($logs_items as $row) {
|
| 104 | 104 | $selectedtext = $row['itemid'] == $_REQUEST['itemid'] ? ' selected="selected"' : ''; |
| 105 | - echo "\t\t" . '<option value="' . $row['itemid'] . '"' . $selectedtext . '>' . $row['itemid'] . "</option>\n"; |
|
| 105 | + echo "\t\t".'<option value="'.$row['itemid'].'"'.$selectedtext.'>'.$row['itemid']."</option>\n"; |
|
| 106 | 106 | } |
| 107 | 107 | ?> |
| 108 | 108 | </select> |
@@ -118,7 +118,7 @@ discard block |
||
| 118 | 118 | $logs_names = record_sort(array_unique_multi($logs, 'itemname'), 'itemname'); |
| 119 | 119 | foreach ($logs_names as $row) {
|
| 120 | 120 | $selectedtext = $row['itemname'] == $_REQUEST['itemname'] ? ' selected="selected"' : ''; |
| 121 | - echo "\t\t" . '<option value="' . $row['itemname'] . '"' . $selectedtext . '>' . $row['itemname'] . "</option>\n"; |
|
| 121 | + echo "\t\t".'<option value="'.$row['itemname'].'"'.$selectedtext.'>'.$row['itemname']."</option>\n"; |
|
| 122 | 122 | } |
| 123 | 123 | ?> |
| 124 | 124 | </select> |
@@ -176,26 +176,26 @@ discard block |
||
| 176 | 176 | // get the selections the user made. |
| 177 | 177 | $sqladd = array(); |
| 178 | 178 | if ($_REQUEST['searchuser'] != 0) {
|
| 179 | - $sqladd[] = "internalKey='" . intval($_REQUEST['searchuser']) . "'"; |
|
| 179 | + $sqladd[] = "internalKey='".intval($_REQUEST['searchuser'])."'"; |
|
| 180 | 180 | } |
| 181 | 181 | if ($_REQUEST['action'] != 0) {
|
| 182 | - $sqladd[] = "action=" . intval($_REQUEST['action']); |
|
| 182 | + $sqladd[] = "action=".intval($_REQUEST['action']); |
|
| 183 | 183 | } |
| 184 | 184 | if ($_REQUEST['itemid'] != 0 || $_REQUEST['itemid'] == "-") {
|
| 185 | - $sqladd[] = "itemid='" . $_REQUEST['itemid'] . "'"; |
|
| 185 | + $sqladd[] = "itemid='".$_REQUEST['itemid']."'"; |
|
| 186 | 186 | } |
| 187 | 187 | if ($_REQUEST['itemname'] != '0') {
|
| 188 | - $sqladd[] = "itemname='" . $modx->db->escape($_REQUEST['itemname']) . "'"; |
|
| 188 | + $sqladd[] = "itemname='".$modx->db->escape($_REQUEST['itemname'])."'"; |
|
| 189 | 189 | } |
| 190 | 190 | if ($_REQUEST['message'] != "") {
|
| 191 | - $sqladd[] = "message LIKE '%" . $modx->db->escape($_REQUEST['message']) . "%'"; |
|
| 191 | + $sqladd[] = "message LIKE '%".$modx->db->escape($_REQUEST['message'])."%'"; |
|
| 192 | 192 | } |
| 193 | 193 | // date stuff |
| 194 | 194 | if ($_REQUEST['datefrom'] != "") {
|
| 195 | - $sqladd[] = "timestamp>" . $modx->toTimeStamp($_REQUEST['datefrom']); |
|
| 195 | + $sqladd[] = "timestamp>".$modx->toTimeStamp($_REQUEST['datefrom']); |
|
| 196 | 196 | } |
| 197 | 197 | if ($_REQUEST['dateto'] != "") {
|
| 198 | - $sqladd[] = "timestamp<" . $modx->toTimeStamp($_REQUEST['dateto']); |
|
| 198 | + $sqladd[] = "timestamp<".$modx->toTimeStamp($_REQUEST['dateto']); |
|
| 199 | 199 | } |
| 200 | 200 | |
| 201 | 201 | // If current position is not set, set it to zero |
@@ -208,7 +208,7 @@ discard block |
||
| 208 | 208 | // Number of result to display on the page, will be in the LIMIT of the sql query also |
| 209 | 209 | $int_num_result = is_numeric($_REQUEST['nrresults']) ? $_REQUEST['nrresults'] : $number_of_logs; |
| 210 | 210 | |
| 211 | - $extargv = "&a=13&searchuser=" . $_REQUEST['searchuser'] . "&action=" . $_REQUEST['action'] . "&itemid=" . $_REQUEST['itemid'] . "&itemname=" . $_REQUEST['itemname'] . "&message=" . $_REQUEST['message'] . "&dateto=" . $_REQUEST['dateto'] . "&datefrom=" . $_REQUEST['datefrom'] . "&nrresults=" . $int_num_result . "&log_submit=" . $_REQUEST['log_submit']; // extra argv here (could be anything depending on your page) |
|
| 211 | + $extargv = "&a=13&searchuser=".$_REQUEST['searchuser']."&action=".$_REQUEST['action']."&itemid=".$_REQUEST['itemid']."&itemname=".$_REQUEST['itemname']."&message=".$_REQUEST['message']."&dateto=".$_REQUEST['dateto']."&datefrom=".$_REQUEST['datefrom']."&nrresults=".$int_num_result."&log_submit=".$_REQUEST['log_submit']; // extra argv here (could be anything depending on your page) |
|
| 212 | 212 | |
| 213 | 213 | // build the sql |
| 214 | 214 | $limit = $num_rows = $modx->db->getValue($modx->db->select('COUNT(*)', $modx->getFullTableName('manager_log'), (!empty($sqladd) ? implode(' AND ', $sqladd) : '')));
|
@@ -216,9 +216,9 @@ discard block |
||
| 216 | 216 | $rs = $modx->db->select('*', $modx->getFullTableName('manager_log'), (!empty($sqladd) ? implode(' AND ', $sqladd) : ''), 'timestamp DESC, id DESC', "{$int_cur_position}, {$int_num_result}");
|
| 217 | 217 | |
| 218 | 218 | if ($limit < 1) {
|
| 219 | - echo '<p>' . $_lang["mgrlog_emptysrch"] . '</p>'; |
|
| 219 | + echo '<p>'.$_lang["mgrlog_emptysrch"].'</p>'; |
|
| 220 | 220 | } else {
|
| 221 | - echo '<p>' . $_lang["mgrlog_sortinst"] . '</p>'; |
|
| 221 | + echo '<p>'.$_lang["mgrlog_sortinst"].'</p>'; |
|
| 222 | 222 | |
| 223 | 223 | include_once "paginate.inc.php"; |
| 224 | 224 | // New instance of the Paging class, you can modify the color and the width of the html table |
@@ -230,11 +230,11 @@ discard block |
||
| 230 | 230 | $current_row = $int_cur_position / $int_num_result; |
| 231 | 231 | |
| 232 | 232 | // Display the result as you like... |
| 233 | - print "<p>" . $_lang["paging_showing"] . " " . $array_paging['lower']; |
|
| 234 | - print " " . $_lang["paging_to"] . " " . $array_paging['upper']; |
|
| 235 | - print " (" . $array_paging['total'] . " " . $_lang["paging_total"] . ")<br />";
|
|
| 236 | - $paging = $array_paging['first_link'] . $_lang["paging_first"] . (isset($array_paging['first_link']) ? "</a> " : " "); |
|
| 237 | - $paging .= $array_paging['previous_link'] . $_lang["paging_prev"] . (isset($array_paging['previous_link']) ? "</a> " : " "); |
|
| 233 | + print "<p>".$_lang["paging_showing"]." ".$array_paging['lower']; |
|
| 234 | + print " ".$_lang["paging_to"]." ".$array_paging['upper']; |
|
| 235 | + print " (".$array_paging['total']." ".$_lang["paging_total"].")<br />";
|
|
| 236 | + $paging = $array_paging['first_link'].$_lang["paging_first"].(isset($array_paging['first_link']) ? "</a> " : " "); |
|
| 237 | + $paging .= $array_paging['previous_link'].$_lang["paging_prev"].(isset($array_paging['previous_link']) ? "</a> " : " "); |
|
| 238 | 238 | $pagesfound = sizeof($array_row_paging); |
| 239 | 239 | if ($pagesfound > 6) {
|
| 240 | 240 | $paging .= $array_row_paging[$current_row - 2]; // ." "; |
@@ -244,11 +244,11 @@ discard block |
||
| 244 | 244 | $paging .= $array_row_paging[$current_row + 2]; // ." "; |
| 245 | 245 | } else {
|
| 246 | 246 | for ($i = 0; $i < $pagesfound; $i++) {
|
| 247 | - $paging .= $array_row_paging[$i] . " "; |
|
| 247 | + $paging .= $array_row_paging[$i]." "; |
|
| 248 | 248 | } |
| 249 | 249 | } |
| 250 | - $paging .= $array_paging['next_link'] . $_lang["paging_next"] . (isset($array_paging['next_link']) ? "</a> " : " ") . " "; |
|
| 251 | - $paging .= $array_paging['last_link'] . $_lang["paging_last"] . (isset($array_paging['last_link']) ? "</a> " : " ") . " "; |
|
| 250 | + $paging .= $array_paging['next_link'].$_lang["paging_next"].(isset($array_paging['next_link']) ? "</a> " : " ")." "; |
|
| 251 | + $paging .= $array_paging['last_link'].$_lang["paging_last"].(isset($array_paging['last_link']) ? "</a> " : " ")." "; |
|
| 252 | 252 | // The above exemple print somethings like: |
| 253 | 253 | // Results 1 to 20 of 597 <<< 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 >>> |
| 254 | 254 | // Of course you can now play with array_row_paging in order to print |
@@ -282,16 +282,16 @@ discard block |
||
| 282 | 282 | if (!preg_match("/^[0-9]+$/", $logentry['itemid'])) {
|
| 283 | 283 | $item = '<div style="text-align:center;">-</div>'; |
| 284 | 284 | } elseif ($logentry['action'] == 3 || $logentry['action'] == 27 || $logentry['action'] == 5) {
|
| 285 | - $item = '<a href="index.php?a=3&id=' . $logentry['itemid'] . '">' . $logentry['itemname'] . '</a>'; |
|
| 285 | + $item = '<a href="index.php?a=3&id='.$logentry['itemid'].'">'.$logentry['itemname'].'</a>'; |
|
| 286 | 286 | } else {
|
| 287 | 287 | $item = $logentry['itemname']; |
| 288 | 288 | } |
| 289 | 289 | //index.php?a=13&searchuser=' . $logentry['internalKey'] . '&action=' . $logentry['action'] . '&itemname=' . $logentry['itemname'] . '&log_submit=true' |
| 290 | - $user_drill = 'index.php?a=13&searchuser=' . $logentry['internalKey'] . '&itemname=0&log_submit=true'; |
|
| 290 | + $user_drill = 'index.php?a=13&searchuser='.$logentry['internalKey'].'&itemname=0&log_submit=true'; |
|
| 291 | 291 | ?> |
| 292 | 292 | <tr> |
| 293 | - <td><?= '<a href="' . $user_drill . '">' . $logentry['username'] . '</a>' ?></td> |
|
| 294 | - <td class="text-nowrap"><?= '[' . $logentry['action'] . '] ' . $logentry['message'] ?></td> |
|
| 293 | + <td><?= '<a href="'.$user_drill.'">'.$logentry['username'].'</a>' ?></td> |
|
| 294 | + <td class="text-nowrap"><?= '['.$logentry['action'].'] '.$logentry['message'] ?></td> |
|
| 295 | 295 | <td class="text-xs-right"><?= $logentry['itemid'] ?></td> |
| 296 | 296 | <td><?= $item ?></td> |
| 297 | 297 | <td class="text-nowrap"><?= $modx->toDateFormat($logentry['timestamp'] + $server_offset_time) ?></td> |
@@ -1,22 +1,22 @@ 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('logs')) {
|
|
| 5 | +if (!$modx->hasPermission('logs')) { |
|
| 6 | 6 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
| 7 | 7 | } |
| 8 | 8 | |
| 9 | -function array_unique_multi($array, $checkKey) |
|
| 10 | -{
|
|
| 9 | +function array_unique_multi($array, $checkKey) |
|
| 10 | +{ |
|
| 11 | 11 | // Use the builtin if we're not a multi-dimensional array |
| 12 | - if (!is_array(current($array)) || empty($checkKey)) {
|
|
| 12 | + if (!is_array(current($array)) || empty($checkKey)) { |
|
| 13 | 13 | return array_unique($array); |
| 14 | 14 | } |
| 15 | 15 | |
| 16 | 16 | $ret = array(); |
| 17 | 17 | $checkValues = array(); // contains the unique key Values |
| 18 | - foreach ($array as $key => $current) {
|
|
| 19 | - if (in_array($current[$checkKey], $checkValues)) {
|
|
| 18 | + foreach ($array as $key => $current) { |
|
| 19 | + if (in_array($current[$checkKey], $checkValues)) { |
|
| 20 | 20 | continue; |
| 21 | 21 | } // duplicate |
| 22 | 22 | |
@@ -26,17 +26,17 @@ discard block |
||
| 26 | 26 | return $ret; |
| 27 | 27 | } |
| 28 | 28 | |
| 29 | -function record_sort($array, $key) |
|
| 30 | -{
|
|
| 29 | +function record_sort($array, $key) |
|
| 30 | +{ |
|
| 31 | 31 | $hash = array(); |
| 32 | - foreach ($array as $k => $v) {
|
|
| 32 | + foreach ($array as $k => $v) { |
|
| 33 | 33 | $hash[$k] = $v[$key]; |
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | natsort($hash); |
| 37 | 37 | |
| 38 | 38 | $records = array(); |
| 39 | - foreach ($hash as $k => $row) {
|
|
| 39 | + foreach ($hash as $k => $row) { |
|
| 40 | 40 | $records[$k] = $array[$k]; |
| 41 | 41 | } |
| 42 | 42 | |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | <?php |
| 64 | 64 | // get all users currently in the log |
| 65 | 65 | $logs_user = record_sort(array_unique_multi($logs, 'internalKey'), 'username'); |
| 66 | - foreach ($logs_user as $row) {
|
|
| 66 | + foreach ($logs_user as $row) { |
|
| 67 | 67 | $selectedtext = $row['internalKey'] == $_REQUEST['searchuser'] ? ' selected="selected"' : ''; |
| 68 | 68 | echo "\t\t" . '<option value="' . $row['internalKey'] . '"' . $selectedtext . '>' . $row['username'] . "</option>\n"; |
| 69 | 69 | } |
@@ -80,9 +80,9 @@ discard block |
||
| 80 | 80 | // get all available actions in the log |
| 81 | 81 | include_once "actionlist.inc.php"; |
| 82 | 82 | $logs_actions = record_sort(array_unique_multi($logs, 'action'), 'action'); |
| 83 | - foreach ($logs_actions as $row) {
|
|
| 83 | + foreach ($logs_actions as $row) { |
|
| 84 | 84 | $action = getAction($row['action']); |
| 85 | - if ($action == 'Idle') {
|
|
| 85 | + if ($action == 'Idle') { |
|
| 86 | 86 | continue; |
| 87 | 87 | } |
| 88 | 88 | $selectedtext = $row['action'] == $_REQUEST['action'] ? ' selected="selected"' : ''; |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | <?php |
| 101 | 101 | // get all itemid currently in logging |
| 102 | 102 | $logs_items = record_sort(array_unique_multi($logs, 'itemid'), 'itemid'); |
| 103 | - foreach ($logs_items as $row) {
|
|
| 103 | + foreach ($logs_items as $row) { |
|
| 104 | 104 | $selectedtext = $row['itemid'] == $_REQUEST['itemid'] ? ' selected="selected"' : ''; |
| 105 | 105 | echo "\t\t" . '<option value="' . $row['itemid'] . '"' . $selectedtext . '>' . $row['itemid'] . "</option>\n"; |
| 106 | 106 | } |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | <?php |
| 117 | 117 | // get all itemname currently in logging |
| 118 | 118 | $logs_names = record_sort(array_unique_multi($logs, 'itemname'), 'itemname'); |
| 119 | - foreach ($logs_names as $row) {
|
|
| 119 | + foreach ($logs_names as $row) { |
|
| 120 | 120 | $selectedtext = $row['itemname'] == $_REQUEST['itemname'] ? ' selected="selected"' : ''; |
| 121 | 121 | echo "\t\t" . '<option value="' . $row['itemname'] . '"' . $selectedtext . '>' . $row['itemname'] . "</option>\n"; |
| 122 | 122 | } |
@@ -172,36 +172,36 @@ discard block |
||
| 172 | 172 | <div class="container container-body"> |
| 173 | 173 | |
| 174 | 174 | <?php |
| 175 | -if (isset($_REQUEST['log_submit'])) {
|
|
| 175 | +if (isset($_REQUEST['log_submit'])) { |
|
| 176 | 176 | // get the selections the user made. |
| 177 | 177 | $sqladd = array(); |
| 178 | - if ($_REQUEST['searchuser'] != 0) {
|
|
| 178 | + if ($_REQUEST['searchuser'] != 0) { |
|
| 179 | 179 | $sqladd[] = "internalKey='" . intval($_REQUEST['searchuser']) . "'"; |
| 180 | 180 | } |
| 181 | - if ($_REQUEST['action'] != 0) {
|
|
| 181 | + if ($_REQUEST['action'] != 0) { |
|
| 182 | 182 | $sqladd[] = "action=" . intval($_REQUEST['action']); |
| 183 | 183 | } |
| 184 | - if ($_REQUEST['itemid'] != 0 || $_REQUEST['itemid'] == "-") {
|
|
| 184 | + if ($_REQUEST['itemid'] != 0 || $_REQUEST['itemid'] == "-") { |
|
| 185 | 185 | $sqladd[] = "itemid='" . $_REQUEST['itemid'] . "'"; |
| 186 | 186 | } |
| 187 | - if ($_REQUEST['itemname'] != '0') {
|
|
| 187 | + if ($_REQUEST['itemname'] != '0') { |
|
| 188 | 188 | $sqladd[] = "itemname='" . $modx->db->escape($_REQUEST['itemname']) . "'"; |
| 189 | 189 | } |
| 190 | - if ($_REQUEST['message'] != "") {
|
|
| 190 | + if ($_REQUEST['message'] != "") { |
|
| 191 | 191 | $sqladd[] = "message LIKE '%" . $modx->db->escape($_REQUEST['message']) . "%'"; |
| 192 | 192 | } |
| 193 | 193 | // date stuff |
| 194 | - if ($_REQUEST['datefrom'] != "") {
|
|
| 194 | + if ($_REQUEST['datefrom'] != "") { |
|
| 195 | 195 | $sqladd[] = "timestamp>" . $modx->toTimeStamp($_REQUEST['datefrom']); |
| 196 | 196 | } |
| 197 | - if ($_REQUEST['dateto'] != "") {
|
|
| 197 | + if ($_REQUEST['dateto'] != "") { |
|
| 198 | 198 | $sqladd[] = "timestamp<" . $modx->toTimeStamp($_REQUEST['dateto']); |
| 199 | 199 | } |
| 200 | 200 | |
| 201 | 201 | // If current position is not set, set it to zero |
| 202 | - if (!isset($_REQUEST['int_cur_position']) || $_REQUEST['int_cur_position'] == 0) {
|
|
| 202 | + if (!isset($_REQUEST['int_cur_position']) || $_REQUEST['int_cur_position'] == 0) { |
|
| 203 | 203 | $int_cur_position = 0; |
| 204 | - } else {
|
|
| 204 | + } else { |
|
| 205 | 205 | $int_cur_position = $_REQUEST['int_cur_position']; |
| 206 | 206 | } |
| 207 | 207 | |
@@ -215,9 +215,9 @@ discard block |
||
| 215 | 215 | |
| 216 | 216 | $rs = $modx->db->select('*', $modx->getFullTableName('manager_log'), (!empty($sqladd) ? implode(' AND ', $sqladd) : ''), 'timestamp DESC, id DESC', "{$int_cur_position}, {$int_num_result}");
|
| 217 | 217 | |
| 218 | -if ($limit < 1) {
|
|
| 218 | +if ($limit < 1) { |
|
| 219 | 219 | echo '<p>' . $_lang["mgrlog_emptysrch"] . '</p>'; |
| 220 | -} else {
|
|
| 220 | +} else { |
|
| 221 | 221 | echo '<p>' . $_lang["mgrlog_sortinst"] . '</p>'; |
| 222 | 222 | |
| 223 | 223 | include_once "paginate.inc.php"; |
@@ -236,14 +236,14 @@ discard block |
||
| 236 | 236 | $paging = $array_paging['first_link'] . $_lang["paging_first"] . (isset($array_paging['first_link']) ? "</a> " : " "); |
| 237 | 237 | $paging .= $array_paging['previous_link'] . $_lang["paging_prev"] . (isset($array_paging['previous_link']) ? "</a> " : " "); |
| 238 | 238 | $pagesfound = sizeof($array_row_paging); |
| 239 | - if ($pagesfound > 6) {
|
|
| 239 | + if ($pagesfound > 6) { |
|
| 240 | 240 | $paging .= $array_row_paging[$current_row - 2]; // ." "; |
| 241 | 241 | $paging .= $array_row_paging[$current_row - 1]; // ." "; |
| 242 | 242 | $paging .= $array_row_paging[$current_row]; // ." "; |
| 243 | 243 | $paging .= $array_row_paging[$current_row + 1]; // ." "; |
| 244 | 244 | $paging .= $array_row_paging[$current_row + 2]; // ." "; |
| 245 | - } else {
|
|
| 246 | - for ($i = 0; $i < $pagesfound; $i++) {
|
|
| 245 | + } else { |
|
| 246 | + for ($i = 0; $i < $pagesfound; $i++) { |
|
| 247 | 247 | $paging .= $array_row_paging[$i] . " "; |
| 248 | 248 | } |
| 249 | 249 | } |
@@ -278,12 +278,12 @@ discard block |
||
| 278 | 278 | // grab the entire log file... |
| 279 | 279 | $logentries = array(); |
| 280 | 280 | $i = 0; |
| 281 | - while ($logentry = $modx->db->getRow($rs)) {
|
|
| 282 | - if (!preg_match("/^[0-9]+$/", $logentry['itemid'])) {
|
|
| 281 | + while ($logentry = $modx->db->getRow($rs)) { |
|
| 282 | + if (!preg_match("/^[0-9]+$/", $logentry['itemid'])) { |
|
| 283 | 283 | $item = '<div style="text-align:center;">-</div>'; |
| 284 | - } elseif ($logentry['action'] == 3 || $logentry['action'] == 27 || $logentry['action'] == 5) {
|
|
| 284 | + } elseif ($logentry['action'] == 3 || $logentry['action'] == 27 || $logentry['action'] == 5) { |
|
| 285 | 285 | $item = '<a href="index.php?a=3&id=' . $logentry['itemid'] . '">' . $logentry['itemname'] . '</a>'; |
| 286 | - } else {
|
|
| 286 | + } else { |
|
| 287 | 287 | $item = $logentry['itemname']; |
| 288 | 288 | } |
| 289 | 289 | //index.php?a=13&searchuser=' . $logentry['internalKey'] . '&action=' . $logentry['action'] . '&itemname=' . $logentry['itemname'] . '&log_submit=true' |
@@ -318,6 +318,6 @@ discard block |
||
| 318 | 318 | // @see index.php @ 915 |
| 319 | 319 | global $action; |
| 320 | 320 | $action = 1; |
| 321 | -} else {
|
|
| 321 | +} else { |
|
| 322 | 322 | echo $_lang["mgrlog_noquery"]; |
| 323 | 323 | } |
@@ -1,9 +1,9 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
| 3 | - die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly."); |
|
| 3 | + die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly."); |
|
| 4 | 4 | } |
| 5 | 5 | if(!$modx->hasPermission('export_static')) { |
| 6 | - $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
| 6 | + $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
| 7 | 7 | } |
| 8 | 8 | |
| 9 | 9 | // figure out the base of the server, so we know where to get the documents in order to export them |
@@ -35,11 +35,11 @@ discard block |
||
| 35 | 35 | |
| 36 | 36 | <div class="container container-body"> |
| 37 | 37 | <?php |
| 38 | - if(isset($_POST['export'])) { |
|
| 39 | - $rs = include_once(MODX_MANAGER_PATH . 'processors/export_site.processor.php'); |
|
| 40 | - echo $rs; |
|
| 41 | - } else { |
|
| 42 | - ?> |
|
| 38 | + if(isset($_POST['export'])) { |
|
| 39 | + $rs = include_once(MODX_MANAGER_PATH . 'processors/export_site.processor.php'); |
|
| 40 | + echo $rs; |
|
| 41 | + } else { |
|
| 42 | + ?> |
|
| 43 | 43 | <form action="index.php" method="post" name="exportFrm"> |
| 44 | 44 | <input type="hidden" name="export" value="export" /> |
| 45 | 45 | <input type="hidden" name="a" value="83" /> |
@@ -81,8 +81,8 @@ discard block |
||
| 81 | 81 | </script> |
| 82 | 82 | </form> |
| 83 | 83 | <?php |
| 84 | - } |
|
| 85 | - ?> |
|
| 84 | + } |
|
| 85 | + ?> |
|
| 86 | 86 | </div> |
| 87 | 87 | </div> |
| 88 | 88 | |
@@ -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('export_static')) { |
|
| 5 | +if (!$modx->hasPermission('export_static')) { |
|
| 6 | 6 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
| 7 | 7 | } |
| 8 | 8 | |
@@ -35,8 +35,8 @@ discard block |
||
| 35 | 35 | |
| 36 | 36 | <div class="container container-body"> |
| 37 | 37 | <?php |
| 38 | - if(isset($_POST['export'])) { |
|
| 39 | - $rs = include_once(MODX_MANAGER_PATH . 'processors/export_site.processor.php'); |
|
| 38 | + if (isset($_POST['export'])) { |
|
| 39 | + $rs = include_once(MODX_MANAGER_PATH.'processors/export_site.processor.php'); |
|
| 40 | 40 | echo $rs; |
| 41 | 41 | } else { |
| 42 | 42 | ?> |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | <a href="javascript:;" class="btn btn-primary" onclick="document.exportFrm.submit();jQuery(this).hide();"><i class="<?= $_style["actions_save"] ?>"></i> <?= $_lang["export_site_start"] ?></a> |
| 77 | 77 | <script> |
| 78 | 78 | jQuery('#exportButton a').click(function() { |
| 79 | - jQuery(this).parent().html('<?= $_style['ajax_loader'];?>'); |
|
| 79 | + jQuery(this).parent().html('<?= $_style['ajax_loader']; ?>'); |
|
| 80 | 80 | }); |
| 81 | 81 | </script> |
| 82 | 82 | </form> |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 3 | 3 | die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly."); |
| 4 | 4 | } |
| 5 | 5 | if (!$modx->hasPermission('messages')) { |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | <div class="container container-body" id="lyr3"> |
| 17 | 17 | <b><?= $_lang['messages_read_message'] ?></b> |
| 18 | 18 | <?php |
| 19 | - $rs = $modx->db->select('*', $modx->getFullTableName('user_messages'), "id='" . (int)$_REQUEST['id'] . "'"); |
|
| 19 | + $rs = $modx->db->select('*', $modx->getFullTableName('user_messages'), "id='".(int) $_REQUEST['id']."'"); |
|
| 20 | 20 | $message = $modx->db->getRow($rs); |
| 21 | 21 | if (!$message) { |
| 22 | 22 | echo "Wrong number of messages returned!"; |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | <p><b><?= $_lang['messages_inbox'] ?></b></p> |
| 88 | 88 | <?php |
| 89 | 89 | // Get number of rows |
| 90 | - $rs = $modx->db->select('count(id)', $modx->getFullTableName('user_messages'), "recipient=" . $modx->getLoginUserID() . ""); |
|
| 90 | + $rs = $modx->db->select('count(id)', $modx->getFullTableName('user_messages'), "recipient=".$modx->getLoginUserID().""); |
|
| 91 | 91 | $num_rows = $modx->db->getValue($rs); |
| 92 | 92 | |
| 93 | 93 | // ============================================================== |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | if (!isset($_REQUEST['int_cur_position']) || $_REQUEST['int_cur_position'] == 0) { |
| 101 | 101 | $int_cur_position = 0; |
| 102 | 102 | } else { |
| 103 | - $int_cur_position = (int)$_REQUEST['int_cur_position']; |
|
| 103 | + $int_cur_position = (int) $_REQUEST['int_cur_position']; |
|
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | // Number of result to display on the page, will be in the LIMIT of the sql query also |
@@ -117,21 +117,21 @@ discard block |
||
| 117 | 117 | $array_row_paging = $p->getPagingRowArray(); |
| 118 | 118 | |
| 119 | 119 | // Display the result as you like... |
| 120 | - $pager .= $_lang['showing'] . " " . $array_paging['lower']; |
|
| 121 | - $pager .= " " . $_lang['to'] . " " . $array_paging['upper']; |
|
| 122 | - $pager .= " (" . $array_paging['total'] . " " . $_lang['total'] . ")"; |
|
| 123 | - $pager .= "<br />" . $array_paging['previous_link'] . "<<" . (isset($array_paging['previous_link']) ? "</a> " : " "); |
|
| 120 | + $pager .= $_lang['showing']." ".$array_paging['lower']; |
|
| 121 | + $pager .= " ".$_lang['to']." ".$array_paging['upper']; |
|
| 122 | + $pager .= " (".$array_paging['total']." ".$_lang['total'].")"; |
|
| 123 | + $pager .= "<br />".$array_paging['previous_link']."<<".(isset($array_paging['previous_link']) ? "</a> " : " "); |
|
| 124 | 124 | for ($i = 0; $i < sizeof($array_row_paging); $i++) { |
| 125 | - $pager .= $array_row_paging[$i] . " "; |
|
| 125 | + $pager .= $array_row_paging[$i]." "; |
|
| 126 | 126 | } |
| 127 | - $pager .= $array_paging['next_link'] . ">>" . (isset($array_paging['next_link']) ? "</a>" : ""); |
|
| 127 | + $pager .= $array_paging['next_link'].">>".(isset($array_paging['next_link']) ? "</a>" : ""); |
|
| 128 | 128 | |
| 129 | 129 | // The above exemple print somethings like: |
| 130 | 130 | // Results 1 to 20 of 597 <<< 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 >>> |
| 131 | 131 | // Of course you can now play with array_row_paging in order to print |
| 132 | 132 | // only the results you would like... |
| 133 | 133 | |
| 134 | - $rs = $modx->db->select('*', $modx->getFullTableName('user_messages'), "recipient=" . $modx->getLoginUserID() . "", 'postdate DESC', "{$int_cur_position}, {$int_num_result}"); |
|
| 134 | + $rs = $modx->db->select('*', $modx->getFullTableName('user_messages'), "recipient=".$modx->getLoginUserID()."", 'postdate DESC', "{$int_cur_position}, {$int_num_result}"); |
|
| 135 | 135 | $limit = $modx->db->getRecordCount($rs); |
| 136 | 136 | if ($limit < 1) { |
| 137 | 137 | echo $_lang['messages_no_messages']; |
@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | <p><b><?= $_lang['messages_compose'] ?></b></p> |
| 190 | 190 | <?php |
| 191 | 191 | if (($_REQUEST['m'] == 'rp' || $_REQUEST['m'] == 'f') && isset($_REQUEST['id'])) { |
| 192 | - $rs = $modx->db->select('*', $modx->getFullTableName('user_messages'), "id='" . $_REQUEST['id'] . "'"); |
|
| 192 | + $rs = $modx->db->select('*', $modx->getFullTableName('user_messages'), "id='".$_REQUEST['id']."'"); |
|
| 193 | 193 | $message = $modx->db->getRow($rs); |
| 194 | 194 | if (!$message) { |
| 195 | 195 | echo "Wrong number of messages returned!"; |
@@ -208,7 +208,7 @@ discard block |
||
| 208 | 208 | } |
| 209 | 209 | $subjecttext = $_REQUEST['m'] == 'rp' ? "Re: " : "Fwd: "; |
| 210 | 210 | $subjecttext .= $message['subject']; |
| 211 | - $messagetext = "\n\n\n-----\n" . $_lang['messages_from'] . ": $sendername\n" . $_lang['messages_sent'] . ": " . $modx->toDateFormat($message['postdate'] + $server_offset_time) . "\n" . $_lang['messages_subject'] . ": " . $message['subject'] . "\n\n" . $message['message']; |
|
| 211 | + $messagetext = "\n\n\n-----\n".$_lang['messages_from'].": $sendername\n".$_lang['messages_sent'].": ".$modx->toDateFormat($message['postdate'] + $server_offset_time)."\n".$_lang['messages_subject'].": ".$message['subject']."\n\n".$message['message']; |
|
| 212 | 212 | if ($_REQUEST['m'] == 'rp') { |
| 213 | 213 | $recipientindex = $message['sender']; |
| 214 | 214 | } |
@@ -295,9 +295,9 @@ discard block |
||
| 295 | 295 | |
| 296 | 296 | <?php |
| 297 | 297 | // count messages again, as any action on the messages page may have altered the message count |
| 298 | -$rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('user_messages'), "recipient=" . $modx->getLoginUserID() . " and messageread=0"); |
|
| 298 | +$rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('user_messages'), "recipient=".$modx->getLoginUserID()." and messageread=0"); |
|
| 299 | 299 | $_SESSION['nrnewmessages'] = $modx->db->getValue($rs); |
| 300 | -$rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('user_messages'), "recipient=" . $modx->getLoginUserID() . ""); |
|
| 300 | +$rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('user_messages'), "recipient=".$modx->getLoginUserID().""); |
|
| 301 | 301 | $_SESSION['nrtotalmessages'] = $modx->db->getValue($rs); |
| 302 | 302 | $messagesallowed = $modx->hasPermission('messages'); |
| 303 | 303 | ?> |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 3 | 3 | die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly."); |
| 4 | 4 | } |
| 5 | 5 | if (!$modx->hasPermission('save_template')) { |
@@ -15,7 +15,7 @@ discard block |
||
| 15 | 15 | $updateMsg = ''; |
| 16 | 16 | |
| 17 | 17 | if (isset($_POST['listSubmitted'])) { |
| 18 | - $updateMsg .= '<span class="text-success" id="updated">' . $_lang['sort_updated'] . '</span>'; |
|
| 18 | + $updateMsg .= '<span class="text-success" id="updated">'.$_lang['sort_updated'].'</span>'; |
|
| 19 | 19 | foreach ($_POST as $listName => $listValue) { |
| 20 | 20 | if ($listName == 'listSubmitted' || $listName == 'reset') { |
| 21 | 21 | continue; |
@@ -40,11 +40,11 @@ discard block |
||
| 40 | 40 | $sortableList = '<div class="clearfix"><ul id="sortlist" class="sortableList">'; |
| 41 | 41 | while ($row = $modx->db->getRow($rs)) { |
| 42 | 42 | $caption = $row['caption'] != '' ? $row['caption'] : $row['name']; |
| 43 | - $sortableList .= '<li id="item_' . $row['id'] . '"><i class="fa fa-list-alt"></i> ' . $caption . ' <small class="protectedNode" style="float:right">[*' . $row['name'] . '*]</small></li>'; |
|
| 43 | + $sortableList .= '<li id="item_'.$row['id'].'"><i class="fa fa-list-alt"></i> '.$caption.' <small class="protectedNode" style="float:right">[*'.$row['name'].'*]</small></li>'; |
|
| 44 | 44 | } |
| 45 | 45 | $sortableList .= '</ul></div>'; |
| 46 | 46 | } else { |
| 47 | - $updateMsg = '<p class="text-danger">' . $_lang['tmplvars_novars'] . '</p>'; |
|
| 47 | + $updateMsg = '<p class="text-danger">'.$_lang['tmplvars_novars'].'</p>'; |
|
| 48 | 48 | } |
| 49 | 49 | ?> |
| 50 | 50 | |
@@ -1,21 +1,21 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
| 3 | - die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly."); |
|
| 3 | + die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly."); |
|
| 4 | 4 | } |
| 5 | 5 | |
| 6 | 6 | switch((int) $modx->manager->action) { |
| 7 | - case 35: |
|
| 8 | - if(!$modx->hasPermission('edit_role')) { |
|
| 9 | - $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
| 10 | - } |
|
| 11 | - break; |
|
| 12 | - case 38: |
|
| 13 | - if(!$modx->hasPermission('new_role')) { |
|
| 14 | - $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
| 15 | - } |
|
| 16 | - break; |
|
| 17 | - default: |
|
| 18 | - $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
| 7 | + case 35: |
|
| 8 | + if(!$modx->hasPermission('edit_role')) { |
|
| 9 | + $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
| 10 | + } |
|
| 11 | + break; |
|
| 12 | + case 38: |
|
| 13 | + if(!$modx->hasPermission('new_role')) { |
|
| 14 | + $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
| 15 | + } |
|
| 16 | + break; |
|
| 17 | + default: |
|
| 18 | + $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
|
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | $role = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : 0; |
@@ -24,7 +24,7 @@ discard block |
||
| 24 | 24 | |
| 25 | 25 | // check to see the snippet editor isn't locked |
| 26 | 26 | if($lockedEl = $modx->elementIsLocked(8, $role)) { |
| 27 | - $modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['role'])); |
|
| 27 | + $modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['role'])); |
|
| 28 | 28 | } |
| 29 | 29 | // end check for lock |
| 30 | 30 | |
@@ -32,15 +32,15 @@ discard block |
||
| 32 | 32 | $modx->lockElement(8, $role); |
| 33 | 33 | |
| 34 | 34 | if($modx->manager->action == '35') { |
| 35 | - $rs = $modx->db->select('*', $tbl_user_roles, "id='{$role}'"); |
|
| 36 | - $roledata = $modx->db->getRow($rs); |
|
| 37 | - if(!$roledata) { |
|
| 38 | - $modx->webAlertAndQuit("No role returned!"); |
|
| 39 | - } |
|
| 40 | - $_SESSION['itemname'] = $roledata['name']; |
|
| 35 | + $rs = $modx->db->select('*', $tbl_user_roles, "id='{$role}'"); |
|
| 36 | + $roledata = $modx->db->getRow($rs); |
|
| 37 | + if(!$roledata) { |
|
| 38 | + $modx->webAlertAndQuit("No role returned!"); |
|
| 39 | + } |
|
| 40 | + $_SESSION['itemname'] = $roledata['name']; |
|
| 41 | 41 | } else { |
| 42 | - $roledata = 0; |
|
| 43 | - $_SESSION['itemname'] = $_lang["new_role"]; |
|
| 42 | + $roledata = 0; |
|
| 43 | + $_SESSION['itemname'] = $_lang["new_role"]; |
|
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | // Add lock-element JS-Script |
@@ -107,63 +107,63 @@ discard block |
||
| 107 | 107 | <div class="form-group"> |
| 108 | 108 | <h3><?= $_lang['page_data_general'] ?></h3> |
| 109 | 109 | <?php |
| 110 | - echo render_form('frames', $_lang['role_frames'], 'disabled'); |
|
| 111 | - echo render_form('home', $_lang['role_home'], 'disabled'); |
|
| 112 | - echo render_form('messages', $_lang['role_messages']); |
|
| 113 | - echo render_form('logout', $_lang['role_logout'], 'disabled'); |
|
| 114 | - echo render_form('help', $_lang['role_help']); |
|
| 115 | - echo render_form('action_ok', $_lang['role_actionok'], 'disabled'); |
|
| 116 | - echo render_form('error_dialog', $_lang['role_errors'], 'disabled'); |
|
| 117 | - echo render_form('about', $_lang['role_about'], 'disabled'); |
|
| 118 | - echo render_form('credits', $_lang['role_credits'], 'disabled'); |
|
| 119 | - echo render_form('change_password', $_lang['role_change_password']); |
|
| 120 | - echo render_form('save_password', $_lang['role_save_password']); |
|
| 121 | - ?> |
|
| 110 | + echo render_form('frames', $_lang['role_frames'], 'disabled'); |
|
| 111 | + echo render_form('home', $_lang['role_home'], 'disabled'); |
|
| 112 | + echo render_form('messages', $_lang['role_messages']); |
|
| 113 | + echo render_form('logout', $_lang['role_logout'], 'disabled'); |
|
| 114 | + echo render_form('help', $_lang['role_help']); |
|
| 115 | + echo render_form('action_ok', $_lang['role_actionok'], 'disabled'); |
|
| 116 | + echo render_form('error_dialog', $_lang['role_errors'], 'disabled'); |
|
| 117 | + echo render_form('about', $_lang['role_about'], 'disabled'); |
|
| 118 | + echo render_form('credits', $_lang['role_credits'], 'disabled'); |
|
| 119 | + echo render_form('change_password', $_lang['role_change_password']); |
|
| 120 | + echo render_form('save_password', $_lang['role_save_password']); |
|
| 121 | + ?> |
|
| 122 | 122 | </div> |
| 123 | 123 | </div> |
| 124 | 124 | <div class="col-sm-6 col-lg-3"> |
| 125 | 125 | <div class="form-group"> |
| 126 | 126 | <h3><?= $_lang['role_content_management'] ?></h3> |
| 127 | 127 | <?php |
| 128 | - echo render_form('view_document', $_lang['role_view_docdata'], 'disabled'); |
|
| 129 | - echo render_form('new_document', $_lang['role_create_doc']); |
|
| 130 | - echo render_form('edit_document', $_lang['role_edit_doc']); |
|
| 131 | - echo render_form('change_resourcetype', $_lang['role_change_resourcetype']); |
|
| 132 | - echo render_form('save_document', $_lang['role_save_doc']); |
|
| 133 | - echo render_form('publish_document', $_lang['role_publish_doc']); |
|
| 134 | - echo render_form('delete_document', $_lang['role_delete_doc']); |
|
| 135 | - echo render_form('empty_trash', $_lang['role_empty_trash']); |
|
| 136 | - echo render_form('empty_cache', $_lang['role_cache_refresh']); |
|
| 137 | - echo render_form('view_unpublished', $_lang['role_view_unpublished']); |
|
| 138 | - ?> |
|
| 128 | + echo render_form('view_document', $_lang['role_view_docdata'], 'disabled'); |
|
| 129 | + echo render_form('new_document', $_lang['role_create_doc']); |
|
| 130 | + echo render_form('edit_document', $_lang['role_edit_doc']); |
|
| 131 | + echo render_form('change_resourcetype', $_lang['role_change_resourcetype']); |
|
| 132 | + echo render_form('save_document', $_lang['role_save_doc']); |
|
| 133 | + echo render_form('publish_document', $_lang['role_publish_doc']); |
|
| 134 | + echo render_form('delete_document', $_lang['role_delete_doc']); |
|
| 135 | + echo render_form('empty_trash', $_lang['role_empty_trash']); |
|
| 136 | + echo render_form('empty_cache', $_lang['role_cache_refresh']); |
|
| 137 | + echo render_form('view_unpublished', $_lang['role_view_unpublished']); |
|
| 138 | + ?> |
|
| 139 | 139 | </div> |
| 140 | 140 | </div> |
| 141 | 141 | <div class="col-sm-6 col-lg-3 form-group"> |
| 142 | 142 | <div class="form-group"> |
| 143 | 143 | <h3><?= $_lang['role_file_management'] ?></h3> |
| 144 | 144 | <?php |
| 145 | - echo render_form('file_manager', $_lang['role_file_manager']); |
|
| 146 | - echo render_form('assets_files', $_lang['role_assets_files']); |
|
| 147 | - echo render_form('assets_images', $_lang['role_assets_images']); |
|
| 148 | - ?> |
|
| 145 | + echo render_form('file_manager', $_lang['role_file_manager']); |
|
| 146 | + echo render_form('assets_files', $_lang['role_assets_files']); |
|
| 147 | + echo render_form('assets_images', $_lang['role_assets_images']); |
|
| 148 | + ?> |
|
| 149 | 149 | </div> |
| 150 | 150 | <div class="form-group"> |
| 151 | 151 | <h3><?= $_lang['category_management'] ?></h3> |
| 152 | 152 | <?php |
| 153 | - echo render_form('category_manager', $_lang['role_category_manager']); |
|
| 154 | - ?> |
|
| 153 | + echo render_form('category_manager', $_lang['role_category_manager']); |
|
| 154 | + ?> |
|
| 155 | 155 | </div> |
| 156 | 156 | </div> |
| 157 | 157 | <div class="col-sm-6 col-lg-3"> |
| 158 | 158 | <div class="form-group"> |
| 159 | 159 | <h3><?= $_lang['role_module_management'] ?></h3> |
| 160 | 160 | <?php |
| 161 | - echo render_form('new_module', $_lang['role_new_module']); |
|
| 162 | - echo render_form('edit_module', $_lang['role_edit_module']); |
|
| 163 | - echo render_form('save_module', $_lang['role_save_module']); |
|
| 164 | - echo render_form('delete_module', $_lang['role_delete_module']); |
|
| 165 | - echo render_form('exec_module', $_lang['role_run_module']); |
|
| 166 | - ?> |
|
| 161 | + echo render_form('new_module', $_lang['role_new_module']); |
|
| 162 | + echo render_form('edit_module', $_lang['role_edit_module']); |
|
| 163 | + echo render_form('save_module', $_lang['role_save_module']); |
|
| 164 | + echo render_form('delete_module', $_lang['role_delete_module']); |
|
| 165 | + echo render_form('exec_module', $_lang['role_run_module']); |
|
| 166 | + ?> |
|
| 167 | 167 | </div> |
| 168 | 168 | </div> |
| 169 | 169 | </div> |
@@ -173,44 +173,44 @@ discard block |
||
| 173 | 173 | <div class="form-group"> |
| 174 | 174 | <h3><?= $_lang['role_template_management'] ?></h3> |
| 175 | 175 | <?php |
| 176 | - echo render_form('new_template', $_lang['role_create_template']); |
|
| 177 | - echo render_form('edit_template', $_lang['role_edit_template']); |
|
| 178 | - echo render_form('save_template', $_lang['role_save_template']); |
|
| 179 | - echo render_form('delete_template', $_lang['role_delete_template']); |
|
| 180 | - ?> |
|
| 176 | + echo render_form('new_template', $_lang['role_create_template']); |
|
| 177 | + echo render_form('edit_template', $_lang['role_edit_template']); |
|
| 178 | + echo render_form('save_template', $_lang['role_save_template']); |
|
| 179 | + echo render_form('delete_template', $_lang['role_delete_template']); |
|
| 180 | + ?> |
|
| 181 | 181 | </div> |
| 182 | 182 | </div> |
| 183 | 183 | <div class="col-sm-6 col-lg-3"> |
| 184 | 184 | <div class="form-group"> |
| 185 | 185 | <h3><?= $_lang['role_snippet_management'] ?></h3> |
| 186 | 186 | <?php |
| 187 | - echo render_form('new_snippet', $_lang['role_create_snippet']); |
|
| 188 | - echo render_form('edit_snippet', $_lang['role_edit_snippet']); |
|
| 189 | - echo render_form('save_snippet', $_lang['role_save_snippet']); |
|
| 190 | - echo render_form('delete_snippet', $_lang['role_delete_snippet']); |
|
| 191 | - ?> |
|
| 187 | + echo render_form('new_snippet', $_lang['role_create_snippet']); |
|
| 188 | + echo render_form('edit_snippet', $_lang['role_edit_snippet']); |
|
| 189 | + echo render_form('save_snippet', $_lang['role_save_snippet']); |
|
| 190 | + echo render_form('delete_snippet', $_lang['role_delete_snippet']); |
|
| 191 | + ?> |
|
| 192 | 192 | </div> |
| 193 | 193 | </div> |
| 194 | 194 | <div class="col-sm-6 col-lg-3"> |
| 195 | 195 | <div class="form-group"> |
| 196 | 196 | <h3><?= $_lang['role_chunk_management'] ?></h3> |
| 197 | 197 | <?php |
| 198 | - echo render_form('new_chunk', $_lang['role_create_chunk']); |
|
| 199 | - echo render_form('edit_chunk', $_lang['role_edit_chunk']); |
|
| 200 | - echo render_form('save_chunk', $_lang['role_save_chunk']); |
|
| 201 | - echo render_form('delete_chunk', $_lang['role_delete_chunk']); |
|
| 202 | - ?> |
|
| 198 | + echo render_form('new_chunk', $_lang['role_create_chunk']); |
|
| 199 | + echo render_form('edit_chunk', $_lang['role_edit_chunk']); |
|
| 200 | + echo render_form('save_chunk', $_lang['role_save_chunk']); |
|
| 201 | + echo render_form('delete_chunk', $_lang['role_delete_chunk']); |
|
| 202 | + ?> |
|
| 203 | 203 | </div> |
| 204 | 204 | </div> |
| 205 | 205 | <div class="col-sm-6 col-lg-3"> |
| 206 | 206 | <div class="form-group"> |
| 207 | 207 | <h3><?= $_lang['role_plugin_management'] ?></h3> |
| 208 | 208 | <?php |
| 209 | - echo render_form('new_plugin', $_lang['role_create_plugin']); |
|
| 210 | - echo render_form('edit_plugin', $_lang['role_edit_plugin']); |
|
| 211 | - echo render_form('save_plugin', $_lang['role_save_plugin']); |
|
| 212 | - echo render_form('delete_plugin', $_lang['role_delete_plugin']); |
|
| 213 | - ?> |
|
| 209 | + echo render_form('new_plugin', $_lang['role_create_plugin']); |
|
| 210 | + echo render_form('edit_plugin', $_lang['role_edit_plugin']); |
|
| 211 | + echo render_form('save_plugin', $_lang['role_save_plugin']); |
|
| 212 | + echo render_form('delete_plugin', $_lang['role_delete_plugin']); |
|
| 213 | + ?> |
|
| 214 | 214 | </div> |
| 215 | 215 | </div> |
| 216 | 216 | </div> |
@@ -220,42 +220,42 @@ discard block |
||
| 220 | 220 | <div class="form-group"> |
| 221 | 221 | <h3><?= $_lang['role_user_management'] ?></h3> |
| 222 | 222 | <?php |
| 223 | - echo render_form('new_user', $_lang['role_new_user']); |
|
| 224 | - echo render_form('edit_user', $_lang['role_edit_user']); |
|
| 225 | - echo render_form('save_user', $_lang['role_save_user']); |
|
| 226 | - echo render_form('delete_user', $_lang['role_delete_user']); |
|
| 227 | - ?> |
|
| 223 | + echo render_form('new_user', $_lang['role_new_user']); |
|
| 224 | + echo render_form('edit_user', $_lang['role_edit_user']); |
|
| 225 | + echo render_form('save_user', $_lang['role_save_user']); |
|
| 226 | + echo render_form('delete_user', $_lang['role_delete_user']); |
|
| 227 | + ?> |
|
| 228 | 228 | </div> |
| 229 | 229 | </div> |
| 230 | 230 | <div class="col-sm-6 col-lg-3"> |
| 231 | 231 | <div class="form-group"> |
| 232 | 232 | <h3><?= $_lang['role_web_user_management'] ?></h3> |
| 233 | 233 | <?php |
| 234 | - echo render_form('new_web_user', $_lang['role_new_web_user']); |
|
| 235 | - echo render_form('edit_web_user', $_lang['role_edit_web_user']); |
|
| 236 | - echo render_form('save_web_user', $_lang['role_save_web_user']); |
|
| 237 | - echo render_form('delete_web_user', $_lang['role_delete_web_user']); |
|
| 238 | - ?> |
|
| 234 | + echo render_form('new_web_user', $_lang['role_new_web_user']); |
|
| 235 | + echo render_form('edit_web_user', $_lang['role_edit_web_user']); |
|
| 236 | + echo render_form('save_web_user', $_lang['role_save_web_user']); |
|
| 237 | + echo render_form('delete_web_user', $_lang['role_delete_web_user']); |
|
| 238 | + ?> |
|
| 239 | 239 | </div> |
| 240 | 240 | </div> |
| 241 | 241 | <div class="col-sm-6 col-lg-3"> |
| 242 | 242 | <div class="form-group"> |
| 243 | 243 | <h3><?= $_lang['role_udperms'] ?></h3> |
| 244 | 244 | <?php |
| 245 | - echo render_form('access_permissions', $_lang['role_access_persmissions']); |
|
| 246 | - echo render_form('web_access_permissions', $_lang['role_web_access_persmissions']); |
|
| 247 | - ?> |
|
| 245 | + echo render_form('access_permissions', $_lang['role_access_persmissions']); |
|
| 246 | + echo render_form('web_access_permissions', $_lang['role_web_access_persmissions']); |
|
| 247 | + ?> |
|
| 248 | 248 | </div> |
| 249 | 249 | </div> |
| 250 | 250 | <div class="col-sm-6 col-lg-3"> |
| 251 | 251 | <div class="form-group"> |
| 252 | 252 | <h3><?= $_lang['role_role_management'] ?></h3> |
| 253 | 253 | <?php |
| 254 | - echo render_form('new_role', $_lang['role_new_role']); |
|
| 255 | - echo render_form('edit_role', $_lang['role_edit_role']); |
|
| 256 | - echo render_form('save_role', $_lang['role_save_role']); |
|
| 257 | - echo render_form('delete_role', $_lang['role_delete_role']); |
|
| 258 | - ?> |
|
| 254 | + echo render_form('new_role', $_lang['role_new_role']); |
|
| 255 | + echo render_form('edit_role', $_lang['role_edit_role']); |
|
| 256 | + echo render_form('save_role', $_lang['role_save_role']); |
|
| 257 | + echo render_form('delete_role', $_lang['role_delete_role']); |
|
| 258 | + ?> |
|
| 259 | 259 | </div> |
| 260 | 260 | </div> |
| 261 | 261 | </div> |
@@ -265,23 +265,23 @@ discard block |
||
| 265 | 265 | <div class="form-group"> |
| 266 | 266 | <h3><?= $_lang['role_eventlog_management'] ?></h3> |
| 267 | 267 | <?php |
| 268 | - echo render_form('view_eventlog', $_lang['role_view_eventlog']); |
|
| 269 | - echo render_form('delete_eventlog', $_lang['role_delete_eventlog']); |
|
| 270 | - ?> |
|
| 268 | + echo render_form('view_eventlog', $_lang['role_view_eventlog']); |
|
| 269 | + echo render_form('delete_eventlog', $_lang['role_delete_eventlog']); |
|
| 270 | + ?> |
|
| 271 | 271 | </div> |
| 272 | 272 | </div> |
| 273 | 273 | <div class="col-sm-6 col-lg-3"> |
| 274 | 274 | <div class="form-group"> |
| 275 | 275 | <h3><?= $_lang['role_config_management'] ?></h3> |
| 276 | 276 | <?php |
| 277 | - echo render_form('logs', $_lang['role_view_logs']); |
|
| 278 | - echo render_form('settings', $_lang['role_edit_settings']); |
|
| 279 | - echo render_form('bk_manager', $_lang['role_bk_manager']); |
|
| 280 | - echo render_form('import_static', $_lang['role_import_static']); |
|
| 281 | - echo render_form('export_static', $_lang['role_export_static']); |
|
| 282 | - echo render_form('remove_locks', $_lang['role_remove_locks']); |
|
| 283 | - echo render_form('display_locks', $_lang['role_display_locks']); |
|
| 284 | - ?> |
|
| 277 | + echo render_form('logs', $_lang['role_view_logs']); |
|
| 278 | + echo render_form('settings', $_lang['role_edit_settings']); |
|
| 279 | + echo render_form('bk_manager', $_lang['role_bk_manager']); |
|
| 280 | + echo render_form('import_static', $_lang['role_import_static']); |
|
| 281 | + echo render_form('export_static', $_lang['role_export_static']); |
|
| 282 | + echo render_form('remove_locks', $_lang['role_remove_locks']); |
|
| 283 | + echo render_form('display_locks', $_lang['role_display_locks']); |
|
| 284 | + ?> |
|
| 285 | 285 | </div> |
| 286 | 286 | </div> |
| 287 | 287 | </div> |
@@ -294,32 +294,32 @@ discard block |
||
| 294 | 294 | |
| 295 | 295 | <?php |
| 296 | 296 | function render_form($name, $label, $status = '') { |
| 297 | - global $modx, $roledata; |
|
| 297 | + global $modx, $roledata; |
|
| 298 | 298 | |
| 299 | - $tpl = '<label class="d-block" for="[+name+]check"> |
|
| 299 | + $tpl = '<label class="d-block" for="[+name+]check"> |
|
| 300 | 300 | <input name="[+name+]check" id="[+name+]check" class="click" type="checkbox" onchange="changestate(document.userform.[+name+])" [+checked+] [+status+]> |
| 301 | 301 | <input type="hidden" class="[+set+]" name="[+name+]" value="[+value+]"> |
| 302 | 302 | [+label+] |
| 303 | 303 | </label>'; |
| 304 | 304 | |
| 305 | - $checked = ($roledata[$name] == 1) ? 'checked' : ''; |
|
| 306 | - $value = ($roledata[$name] == 1) ? 1 : 0; |
|
| 307 | - if($status == 'disabled') { |
|
| 308 | - $checked = 'checked'; |
|
| 309 | - $value = 1; |
|
| 310 | - $set = 'fix'; |
|
| 311 | - } else { |
|
| 312 | - $set = 'set'; |
|
| 313 | - } |
|
| 305 | + $checked = ($roledata[$name] == 1) ? 'checked' : ''; |
|
| 306 | + $value = ($roledata[$name] == 1) ? 1 : 0; |
|
| 307 | + if($status == 'disabled') { |
|
| 308 | + $checked = 'checked'; |
|
| 309 | + $value = 1; |
|
| 310 | + $set = 'fix'; |
|
| 311 | + } else { |
|
| 312 | + $set = 'set'; |
|
| 313 | + } |
|
| 314 | 314 | |
| 315 | - $ph = array( |
|
| 316 | - 'name' => $name, |
|
| 317 | - 'checked' => $checked, |
|
| 318 | - 'status' => $status, |
|
| 319 | - 'value' => $value, |
|
| 320 | - 'label' => $label, |
|
| 321 | - 'set' => $set |
|
| 322 | - ); |
|
| 315 | + $ph = array( |
|
| 316 | + 'name' => $name, |
|
| 317 | + 'checked' => $checked, |
|
| 318 | + 'status' => $status, |
|
| 319 | + 'value' => $value, |
|
| 320 | + 'label' => $label, |
|
| 321 | + 'set' => $set |
|
| 322 | + ); |
|
| 323 | 323 | |
| 324 | - return $modx->parseText($tpl, $ph); |
|
| 324 | + return $modx->parseText($tpl, $ph); |
|
| 325 | 325 | } |
@@ -1,16 +1,16 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 2 | +if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) { |
|
| 3 | 3 | die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly."); |
| 4 | 4 | } |
| 5 | 5 | |
| 6 | -switch((int) $modx->manager->action) { |
|
| 6 | +switch ((int) $modx->manager->action) { |
|
| 7 | 7 | case 35: |
| 8 | - if(!$modx->hasPermission('edit_role')) { |
|
| 8 | + if (!$modx->hasPermission('edit_role')) { |
|
| 9 | 9 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
| 10 | 10 | } |
| 11 | 11 | break; |
| 12 | 12 | case 38: |
| 13 | - if(!$modx->hasPermission('new_role')) { |
|
| 13 | + if (!$modx->hasPermission('new_role')) { |
|
| 14 | 14 | $modx->webAlertAndQuit($_lang["error_no_privileges"]); |
| 15 | 15 | } |
| 16 | 16 | break; |
@@ -23,7 +23,7 @@ discard block |
||
| 23 | 23 | $tbl_user_roles = $modx->getFullTableName('user_roles'); |
| 24 | 24 | |
| 25 | 25 | // check to see the snippet editor isn't locked |
| 26 | -if($lockedEl = $modx->elementIsLocked(8, $role)) { |
|
| 26 | +if ($lockedEl = $modx->elementIsLocked(8, $role)) { |
|
| 27 | 27 | $modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['role'])); |
| 28 | 28 | } |
| 29 | 29 | // end check for lock |
@@ -31,10 +31,10 @@ discard block |
||
| 31 | 31 | // Lock snippet for other users to edit |
| 32 | 32 | $modx->lockElement(8, $role); |
| 33 | 33 | |
| 34 | -if($modx->manager->action == '35') { |
|
| 34 | +if ($modx->manager->action == '35') { |
|
| 35 | 35 | $rs = $modx->db->select('*', $tbl_user_roles, "id='{$role}'"); |
| 36 | 36 | $roledata = $modx->db->getRow($rs); |
| 37 | - if(!$roledata) { |
|
| 37 | + if (!$roledata) { |
|
| 38 | 38 | $modx->webAlertAndQuit("No role returned!"); |
| 39 | 39 | } |
| 40 | 40 | $_SESSION['itemname'] = $roledata['name']; |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | // Add lock-element JS-Script |
| 47 | 47 | $lockElementId = $role; |
| 48 | 48 | $lockElementType = 8; |
| 49 | -require_once(MODX_MANAGER_PATH . 'includes/active_user_locks.inc.php'); |
|
| 49 | +require_once(MODX_MANAGER_PATH.'includes/active_user_locks.inc.php'); |
|
| 50 | 50 | ?> |
| 51 | 51 | <script type="text/javascript"> |
| 52 | 52 | function changestate(element) { |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | <input type="hidden" name="id" value="<?= $_GET['id'] ?>"> |
| 83 | 83 | |
| 84 | 84 | <h1> |
| 85 | - <i class="fa fa-legal"></i><?= ($roledata['name'] ? $roledata['name'] . '<small>(' . $roledata['id'] . ')</small>' : $_lang['role_title']) ?> |
|
| 85 | + <i class="fa fa-legal"></i><?= ($roledata['name'] ? $roledata['name'].'<small>('.$roledata['id'].')</small>' : $_lang['role_title']) ?> |
|
| 86 | 86 | </h1> |
| 87 | 87 | |
| 88 | 88 | <?= $_style['actionbuttons']['dynamic']['savedelete'] ?> |
@@ -293,7 +293,7 @@ discard block |
||
| 293 | 293 | </form> |
| 294 | 294 | |
| 295 | 295 | <?php |
| 296 | -function render_form($name, $label, $status = '') { |
|
| 296 | +function render_form($name, $label, $status = ''){ |
|
| 297 | 297 | global $modx, $roledata; |
| 298 | 298 | |
| 299 | 299 | $tpl = '<label class="d-block" for="[+name+]check"> |
@@ -304,7 +304,7 @@ discard block |
||
| 304 | 304 | |
| 305 | 305 | $checked = ($roledata[$name] == 1) ? 'checked' : ''; |
| 306 | 306 | $value = ($roledata[$name] == 1) ? 1 : 0; |
| 307 | - if($status == 'disabled') { |
|
| 307 | + if ($status == 'disabled') { |
|
| 308 | 308 | $checked = 'checked'; |
| 309 | 309 | $value = 1; |
| 310 | 310 | $set = 'fix'; |
@@ -1,5 +1,5 @@ |
||
| 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 | ?> |