diff --git a/assets/modules/docmanager/tv.ajax.php b/assets/modules/docmanager/tv.ajax.php
index bf3d2f7dbd..ae6da012e3 100755
--- a/assets/modules/docmanager/tv.ajax.php
+++ b/assets/modules/docmanager/tv.ajax.php
@@ -150,7 +150,7 @@ function renderFormElement($field_type, $field_id, $default_text, $field_element
if (strlen($itemvalue) == 0) {
$itemvalue = $item;
}
- $field_html .= '' . $item . ' ' . $item . ' '.$_lang['locked'].'
- '.$_lang['lock_msg'].'
- ';
+ '.$_lang['lock_msg'].'
+ ';
}
-
+
// Normal form
else {
// Image preview
@@ -259,18 +259,18 @@ function Run() {
$imagePreview = '
';
}
$amp = ($this->modx->config['friendly_urls'] == 1) ? '?' : '&';
- $output .= '
+ $output .= '
'.$editorHtml.'
';
}
}
-
+
// Page output: close modal box and refresh parent frame
- else $output .= '';
-
+ else $output .= '';
+
// Page output: footer
$output .= '
- ';
+ ';
}
-
+
else {
- $output = 'Error: Access denied.';
+ $output = 'Error: Access denied.';
}
}
-
+
// QM+ with toolbar
else {
if(isset($_SESSION['mgrValidated']) && $_REQUEST['z'] != 'manprev') {
-
+
// If logout break here
if(isset($_REQUEST['logout'])) {
$this->Logout();
break;
}
-
+
$userID = $_SESSION['mgrInternalKey'];
-
+
// Add ID
$controls .= 'ID: '.$docID.'
'.$_lang['edit_resource'].'
';
-
+
// Check if user has manager access to current document
$access = $this->checkAccess();
-
- // Does user have permissions to edit document
+
+ // Does user have permissions to edit document
if($access) $controls .= $editButton;
-
- if ($this->addbutton == 'true' && $access) {
+
+ if ($this->addbutton == 'true' && $access) {
// Add button
$addButton = '
'.$_lang['create_resource_here'].'
';
-
+
// Does user have permissions to add document
- if($this->modx->hasPermission('new_document')) $controls .= $addButton;
- }
-
+ if($this->modx->hasPermission('new_document')) $controls .= $addButton;
+ }
+
// Custom add buttons if not empty and enough permissions
- if ($this->custombutton != '') {
-
+ if ($this->custombutton != '') {
+
// Replace [*id*] with current doc id
- $this->custombutton = str_replace("[*id*]", $docID, $this->custombutton);
-
+ $this->custombutton = str_replace("[*id*]", $docID, $this->custombutton);
+
// Handle [~id~] links
$this->custombutton = $this->modx->rewriteUrls($this->custombutton);
-
+
$buttons = explode("||", $this->custombutton); // Buttons are divided by "||"
-
+
// Custom buttons class index
$i = 0;
-
+
// Parse buttons
foreach($buttons as $key => $field) {
$i++;
-
+
$field = substr($field, 1, -1); // Trim "'" from beginning and from end
$buttonParams = explode("','", $field); // Button params are divided by "','"
-
+
$buttonTitle = $buttonParams[0];
$buttonAction = $buttonParams[1]; // Contains URL if this is not add button
$buttonParentId = $buttonParams[2]; // Is empty is this is not add button
$buttonTplId = $buttonParams[3];
-
+
// Button visible for all
if ($buttonParams[4] == '') {
$showButton = TRUE;
@@ -410,12 +410,12 @@ function Run() {
// Button is visible for specific user roles
else {
$showButton = FALSE;
-
+
// Get user roles the button is visible for
$buttonRoles = explode(",", $buttonParams[4]); // Roles are divided by ','
-
+
// Check if user role is found
- foreach($buttonRoles as $key => $field) {
+ foreach($buttonRoles as $key => $field) {
if ($field == $_SESSION['mgrRole']) {
$showButton = TRUE;
}
@@ -433,30 +433,30 @@ function Run() {
';
break;
-
+
case 'link':
$customButton = '
'.$buttonTitle.'
- ';
+ ';
break;
-
+
case 'modal':
$customButton = '
'.$buttonTitle.'
- ';
+ ';
break;
}
- $controls .= $customButton;
- }
- }
- }
-
+ $controls .= $customButton;
+ }
+ }
+ }
+
+
-
// Logout button
$logout = $this->modx->config['site_manager_url'].'index.php?a=8&quickmanager=logout&logoutid='.$docID;
$logoutButton = '
@@ -464,34 +464,34 @@ function Run() {
'.$_lang['logout'].'
-
+
-
+
'.$username.'
-
+
]*>)~i', '\1' . $editor, $output);
-
+
// Search and create edit buttons in to the content
if ($this->editbuttons == 'true' && $access) {
$output = preg_replace('//', '$2 $3 '.$caption.' Redirection URL: ' . $url . '
');
- } else {
- $currentNumberOfRedirects += 1;
- if (strpos($url, "?") > 0) {
- $url .= "&err=$currentNumberOfRedirects";
- } else {
- $url .= "?err=$currentNumberOfRedirects";
- }
+ $this->messageQuit(
+ "Redirection attempt failed - please ensure the document you're trying to redirect to exist. Redirection URL: " . $url . '
'
+ );
+ exit;
}
+ $url .= sprintf(
+ '%serr=%s',
+ strpos($url, '?') > 0 ? '?' : '&',
+ ($currentNumberOfRedirects + 1)
+ );
}
- if ($type == 'REDIRECT_REFRESH') {
- $header = 'Refresh: 0;URL=' . $url;
- } elseif ($type == 'REDIRECT_META') {
- $header = '>>');
if($left==='{{' && strpos($content,';}}')!==false) $content = str_replace(';}}', sprintf(';}%s}', $spacer),$content);
@@ -1249,7 +1253,7 @@ public function _getTagsFromContent($content, $left = '[+', $right = '+]')
}
$lp = explode($left, $content);
- $piece = array();
+ $piece = [];
foreach ($lp as $lc => $lv) {
if ($lc !== 0) {
$piece[] = $left;
@@ -1269,7 +1273,7 @@ public function _getTagsFromContent($content, $left = '[+', $right = '+]')
$lc = 0;
$rc = 0;
$fetch = '';
- $tags = array();
+ $tags = [];
foreach ($piece as $v) {
if ($v === $left) {
if (0 < $lc) {
@@ -2166,7 +2170,7 @@ private function _get_snip_result($piece)
public function getParamsFromString($string = '')
{
if (empty($string)) {
- return array();
+ return [];
}
if (strpos($string, '&_PHX_INTERNAL_') !== false) {
@@ -2181,7 +2185,7 @@ public function getParamsFromString($string = '')
$_tmp = $string;
$_tmp = ltrim($_tmp, '?&');
- $temp_params = array();
+ $temp_params = [];
$key = '';
$value = null;
while ($_tmp !== '') {
@@ -2480,7 +2484,7 @@ public function rewriteUrls($documentSource)
{
// rewrite the urls
if ($this->config['friendly_urls'] == 1) {
- $aliases = array();
+ $aliases = [];
if (is_array($this->documentListing)) {
foreach ($this->documentListing as $path => $docid) { // This is big Loop on large site!
$aliases[$docid] = $path;
@@ -2690,7 +2694,7 @@ public function getDocumentObject($method, $identifier, $isPrepareResponse = fal
$rs = $this->db->select("tv.*, IF(tvc.value!='',tvc.value,tv.default_text) as value", $this->getFullTableName("site_tmplvars") . " tv
INNER JOIN " . $this->getFullTableName("site_tmplvar_templates") . " tvtpl ON tvtpl.tmplvarid = tv.id
LEFT JOIN " . $this->getFullTableName("site_tmplvar_contentvalues") . " tvc ON tvc.tmplvarid=tv.id AND tvc.contentid = '{$documentObject['id']}'", "tvtpl.templateid = '{$documentObject['template']}'");
- $tmplvars = array();
+ $tmplvars = [];
while ($row = $this->db->getRow($rs)) {
$tmplvars[$row['name']] = array(
$row['name'],
@@ -3084,7 +3088,7 @@ public function _getTemplateCodeFromDB($templateID)
*/
public function getParentIds($id, $height = 10)
{
- $parents = array();
+ $parents = [];
while ($id && $height--) {
$thisid = $id;
if ($this->config['aliaslistingfolder'] == 1 || (isset($this->config['full_aliaslisting']) && $this->config['full_aliaslisting'] == 1)) {
@@ -3129,7 +3133,7 @@ public function getUltimateParentId($id, $top = 0)
* @param array $children Optional array of docids to merge with the result.
* @return array Contains the document Listing (tree) like the sitemap
*/
- public function getChildIds($id, $depth = 10, $children = array())
+ public function getChildIds($id, $depth = 10, $children = [])
{
$cacheKey = md5(print_r(func_get_args(), true));
@@ -3140,7 +3144,7 @@ public function getChildIds($id, $depth = 10, $children = array())
if ($this->config['aliaslistingfolder'] == 1 || (isset($this->config['full_aliaslisting']) && $this->config['full_aliaslisting'] == 1)) {
$res = $this->db->select("id,alias,isfolder,parent", $this->getFullTableName('site_content'), "parent IN (" . $id . ") AND deleted = '0'");
- $idx = array();
+ $idx = [];
while ($row = $this->db->getRow($res)) {
$pAlias = '';
if (isset($this->aliasListing[$row['parent']])) {
@@ -3165,7 +3169,7 @@ public function getChildIds($id, $depth = 10, $children = array())
} else {
// Initialise a static array to index parents->children
- static $documentMap_cache = array();
+ static $documentMap_cache = [];
if (!count($documentMap_cache)) {
foreach ($this->documentMap as $document) {
foreach ($document as $p => $c) {
@@ -3329,7 +3333,7 @@ public function getLockedElements($type = 0, $minimumDetails = false)
$lockedElements = $this->lockedElements;
} else {
// Minimum details for HTML / Ajax-requests
- $lockedElements = array();
+ $lockedElements = [];
foreach ($this->lockedElements as $elType => $elements) {
foreach ($elements as $elId => $el) {
$lockedElements[$elType][$elId] = array(
@@ -3349,7 +3353,7 @@ public function getLockedElements($type = 0, $minimumDetails = false)
if (isset($lockedElements[$type])) {
return $lockedElements[$type];
} else {
- return array();
+ return [];
}
}
@@ -3359,7 +3363,7 @@ public function getLockedElements($type = 0, $minimumDetails = false)
public function buildLockedElementsCache()
{
if (is_null($this->lockedElements)) {
- $this->lockedElements = array();
+ $this->lockedElements = [];
$this->cleanupExpiredLocks();
$rs = $this->db->select('sid,internalKey,elementType,elementId,lasthit,username', $this->getFullTableName('active_user_locks') . " ul
@@ -3394,7 +3398,7 @@ public function cleanupExpiredLocks()
$count = $this->db->getRecordCount($rs);
if ($count) {
$rs = $this->db->makeArray($rs);
- $userSids = array();
+ $userSids = [];
foreach ($rs as $row) {
$userSids[] = $row['sid'];
}
@@ -3414,7 +3418,7 @@ public function cleanupMultipleActiveUsers()
$timeout = 20 * 60; // Delete multiple user-sessions after 20min
$validSessionTimeLimit = $this->time - $timeout;
- $activeUserSids = array();
+ $activeUserSids = [];
$rs = $this->db->select('sid', $this->getFullTableName('active_user_sessions'));
$count = $this->db->getRecordCount($rs);
if ($count) {
@@ -3427,7 +3431,7 @@ public function cleanupMultipleActiveUsers()
$rs = $this->db->select("sid,internalKey,lasthit", "{$this->getFullTableName('active_users')}", "", "lasthit DESC");
if ($this->db->getRecordCount($rs)) {
$rs = $this->db->makeArray($rs);
- $internalKeyCount = array();
+ $internalKeyCount = [];
$deleteSids = '';
foreach ($rs as $row) {
if (!isset($internalKeyCount[$row['internalKey']])) {
@@ -3619,7 +3623,7 @@ public function logEvent($evtid, $type, $msg, $source = 'Parser')
* @param array $files
* @return mixed
*/
- public function sendmail($params = array(), $msg = '', $files = array())
+ public function sendmail($params = [], $msg = '', $files = [])
{
if (isset($params) && is_string($params)) {
if (strpos($params, '=') === false) {
@@ -3693,7 +3697,7 @@ public function sendmail($params = array(), $msg = '', $files = array())
$this->mail->IsHTML(false);
}
if (!is_array($files)) {
- $files = array();
+ $files = [];
}
foreach ($files as $f) {
if (file_exists(MODX_BASE_PATH . $f) && is_file(MODX_BASE_PATH . $f) && is_readable(MODX_BASE_PATH . $f)) {
@@ -3895,7 +3899,7 @@ public function getDocumentChildren($parentid = 0, $published = 1, $deleted = 0,
*
* @return {array; false} - Result array with documents, or false.
*/
- public function getDocuments($ids = array(), $published = 1, $deleted = 0, $fields = '*', $where = '', $sort = 'menuindex', $dir = 'ASC', $limit = '')
+ public function getDocuments($ids = [], $published = 1, $deleted = 0, $fields = '*', $where = '', $sort = 'menuindex', $dir = 'ASC', $limit = '')
{
$cacheKey = md5(print_r(func_get_args(), true));
@@ -4331,11 +4335,11 @@ public function getConfig($name = '')
public function getVersionData($data = null)
{
- $out = array();
+ $out = [];
if (empty($this->version) || !is_array($this->version)) {
//include for compatibility modx version < 1.0.10
include MODX_MANAGER_PATH . "includes/version.inc.php";
- $this->version = array();
+ $this->version = [];
$this->version['version'] = isset($modx_version) ? $modx_version : '';
$this->version['branch'] = isset($modx_branch) ? $modx_branch : '';
$this->version['release_date'] = isset($modx_release_date) ? $modx_release_date : '';
@@ -4352,7 +4356,7 @@ public function getVersionData($data = null)
* @param array $params Default: Empty array
* @return string
*/
- public function runSnippet($snippetName, $params = array())
+ public function runSnippet($snippetName, $params = [])
{
if (isset ($this->snippetCache[$snippetName])) {
$snippet = $this->snippetCache[$snippetName];
@@ -4427,7 +4431,7 @@ public function getChunk($chunkName)
* @internal param $suffix {string} - Placeholders suffix. Default: '+]'. - Placeholders suffix. Default: '+]'.
*
*/
- public function parseText($tpl = '', $ph = array(), $left = '[+', $right = '+]', $execModifier = true)
+ public function parseText($tpl = '', $ph = [], $left = '[+', $right = '+]', $execModifier = true)
{
if (empty($ph) || empty($tpl)) {
return $tpl;
@@ -4671,13 +4675,13 @@ public function toTimeStamp($str)
* Default: ASC
* @return array|bool
*/
- public function getDocumentChildrenTVars($parentid = 0, $tvidnames = array(), $published = 1, $docsort = "menuindex", $docsortdir = "ASC", $tvfields = "*", $tvsort = "rank", $tvsortdir = "ASC")
+ public function getDocumentChildrenTVars($parentid = 0, $tvidnames = [], $published = 1, $docsort = "menuindex", $docsortdir = "ASC", $tvfields = "*", $tvsort = "rank", $tvsortdir = "ASC")
{
$docs = $this->getDocumentChildren($parentid, $published, 0, '*', '', $docsort, $docsortdir);
if (!$docs) {
return false;
} else {
- $result = array();
+ $result = [];
// get user defined template variables
if ($tvfields) {
$_ = array_filter(array_map('trim', explode(',', $tvfields)));
@@ -4737,7 +4741,7 @@ public function getDocumentChildrenTVars($parentid = 0, $tvidnames = array(), $p
* @param int $parentid {integer}
* - Id of parent document. Default: 0 (site root).
* @param array $tvidnames {array; '*'}
- * - Which TVs to fetch. In the form expected by getTemplateVarOutput(). Default: array().
+ * - Which TVs to fetch. In the form expected by getTemplateVarOutput(). Default: [].
* @param int $published {0; 1; 'all'}
* - Document publication status. Once the parameter equals 'all', the result will be returned regardless of whether the ducuments are published or they are not. Default: 1.
* @param string $sortBy {string}
@@ -4751,14 +4755,14 @@ public function getDocumentChildrenTVars($parentid = 0, $tvidnames = array(), $p
* @return array {array; false} - Result array, or false.
* - Result array, or false.
*/
- public function getDocumentChildrenTVarOutput($parentid = 0, $tvidnames = array(), $published = 1, $sortBy = 'menuindex', $sortDir = 'ASC', $where = '', $resultKey = 'id')
+ public function getDocumentChildrenTVarOutput($parentid = 0, $tvidnames = [], $published = 1, $sortBy = 'menuindex', $sortDir = 'ASC', $where = '', $resultKey = 'id')
{
$docs = $this->getDocumentChildren($parentid, $published, 0, 'id', $where, $sortBy, $sortDir);
if (!$docs) {
return false;
} else {
- $result = array();
+ $result = [];
$unsetResultKey = false;
@@ -4836,7 +4840,7 @@ public function getTemplateVar($idname = "", $fields = "*", $docid = "", $publis
*
* @return array|bool Result array, or false.
*/
- public function getTemplateVars($idnames = array(), $fields = '*', $docid = '', $published = 1, $sort = 'rank', $dir = 'ASC')
+ public function getTemplateVars($idnames = [], $fields = '*', $docid = '', $published = 1, $sort = 'rank', $dir = 'ASC')
{
$cacheKey = md5(print_r(func_get_args(), true));
if (isset($this->tmpCache[__FUNCTION__][$cacheKey])) {
@@ -4927,12 +4931,12 @@ public function getTemplateVars($idnames = array(), $fields = '*', $docid = '',
* @return array {array; false} - Result array, or false.
* - Result array, or false.
*/
- public function getTemplateVarOutput($idnames = array(), $docid = '', $published = 1, $sep = '')
+ public function getTemplateVarOutput($idnames = [], $docid = '', $published = 1, $sep = '')
{
if (is_array($idnames) && empty($idnames) ) {
return false;
} else {
- $output = array();
+ $output = [];
$vars = ($idnames == '*' || is_array($idnames)) ? $idnames : array($idnames);
$docid = (int)$docid > 0 ? (int)$docid : $this->documentIdentifier;
@@ -5237,7 +5241,7 @@ public function getUserDocGroups($resolveIds = false)
return $dgn;
} else if (is_array($dg)) {
// resolve ids to names
- $dgn = array();
+ $dgn = [];
$ds = $this->db->select('name', $this->getFullTableName("documentgroup_names"), "id IN (" . implode(",", $dg) . ")");
while ($row = $this->db->getRow($ds)) {
$dgn[] = $row['name'];
@@ -5299,7 +5303,7 @@ public function changeWebUserPassword($oldPwd, $newPwd)
* @param array $groupNames
* @return boolean
*/
- public function isMemberOfWebGroup($groupNames = array())
+ public function isMemberOfWebGroup($groupNames = [])
{
if (!is_array($groupNames)) {
return false;
@@ -5377,7 +5381,7 @@ public function regClientScript($src, $options = array('name' => '', 'version' =
{
$options = array('name' => $options);
} else {
- $options = array();
+ $options = [];
}
}
$name = isset($options['name']) ? strtolower($options['name']) : '';
@@ -5487,7 +5491,7 @@ public function addEventListener($evtName, $pluginName)
return false;
}
if (!array_key_exists($evtName, $this->pluginEvent)) {
- $this->pluginEvent[$evtName] = array();
+ $this->pluginEvent[$evtName] = [];
}
return array_push($this->pluginEvent[$evtName], $pluginName); // return array count
}
@@ -5512,7 +5516,7 @@ public function removeEventListener($evtName)
public function removeAllEventListener()
{
unset ($this->pluginEvent);
- $this->pluginEvent = array();
+ $this->pluginEvent = [];
}
/**
@@ -5522,7 +5526,7 @@ public function removeAllEventListener()
* @param array $extParams Parameters available to plugins. Each array key will be the PHP variable name, and the array value will be the variable value.
* @return boolean|array
*/
- public function invokeEvent($evtName, $extParams = array())
+ public function invokeEvent($evtName, $extParams = [])
{
if (!$evtName) {
return false;
@@ -5557,7 +5561,7 @@ public function invokeEvent($evtName, $extParams = array())
// load default params/properties
$parameter = $this->parseProperties($pluginProperties);
if (!is_array($parameter)) {
- $parameter = array();
+ $parameter = [];
}
if (!empty($extParams)) {
$parameter = array_merge($parameter, $extParams);
@@ -5608,7 +5612,7 @@ public function invokeEvent($evtName, $extParams = array())
*/
public function getPluginCode($pluginName)
{
- $plugin = array();
+ $plugin = [];
if (isset ($this->pluginCache[$pluginName])) {
$pluginCode = $this->pluginCache[$pluginName];
$pluginProperties = isset($this->pluginCache[$pluginName . "Props"]) ? $this->pluginCache[$pluginName . "Props"] : '';
@@ -5642,7 +5646,7 @@ public function parseProperties($propertyString, $elementName = null, $elementTy
$propertyString = trim($propertyString);
$propertyString = str_replace('{}', '', $propertyString);
$propertyString = str_replace('} {', ',', $propertyString);
- $property = array();
+ $property = [];
if (!empty($propertyString) && $propertyString != '{}') {
$jsonFormat = $this->isJson($propertyString, true);
// old format
@@ -5719,7 +5723,7 @@ public function parseProperties($propertyString, $elementName = null, $elementTy
*/
public function parseDocBlockFromFile($element_dir, $filename, $escapeValues = false)
{
- $params = array();
+ $params = [];
$fullpath = $element_dir . '/' . $filename;
if (is_readable($fullpath)) {
$tpl = @fopen($fullpath, "r");
@@ -5749,7 +5753,7 @@ public function parseDocBlockFromFile($element_dir, $filename, $escapeValues = f
if (!empty($param)) {
if (in_array($param, $arrayParams)) {
if (!isset($params[$param])) {
- $params[$param] = array();
+ $params[$param] = [];
}
$params[$param][] = $escapeValues ? $this->db->escape($val) : $val;
} else {
@@ -5772,7 +5776,7 @@ public function parseDocBlockFromFile($element_dir, $filename, $escapeValues = f
*/
public function parseDocBlockFromString($string, $escapeValues = false)
{
- $params = array();
+ $params = [];
if (!empty($string)) {
$string = str_replace('\r\n', '\n', $string);
$exp = explode('\n', $string);
@@ -5799,7 +5803,7 @@ public function parseDocBlockFromString($string, $escapeValues = false)
if (!empty($param)) {
if (in_array($param, $arrayParams)) {
if (!isset($params[$param])) {
- $params[$param] = array();
+ $params[$param] = [];
}
$params[$param][] = $escapeValues ? $this->db->escape($val) : $val;
} else {
@@ -6078,7 +6082,7 @@ public function safeEval($phpcode = '', $evalmode = '', $safe_functions = '')
$echo = ob_get_clean();
if (is_array($return)) {
- return 'array()';
+ return '[]';
}
$output = $echo . $return;
@@ -6302,7 +6306,7 @@ public function messageQuit($msg = 'unspecified error', $query = '', $is_error =
$MakeTable->setRowAlternateClass('gridAltItem');
$MakeTable->setColumnWidths(array('100px'));
- $table = array();
+ $table = [];
$version = isset ($GLOBALS['modx_version']) ? $GLOBALS['modx_version'] : '';
$release_date = isset ($GLOBALS['release_date']) ? $GLOBALS['release_date'] : '';
@@ -6376,7 +6380,7 @@ public function messageQuit($msg = 'unspecified error', $query = '', $is_error =
$str .= $MakeTable->create($table, array('Error information', ''));
$str .= "' . $item . ' ' . $item . '