From 8f1b932a2b892e8bc76b221929d10ba5d90d86d4 Mon Sep 17 00:00:00 2001 From: AgelxNash Date: Mon, 12 Aug 2013 00:28:42 +0600 Subject: [PATCH 1/5] #10073 --- manager/includes/document.parser.class.inc.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/manager/includes/document.parser.class.inc.php b/manager/includes/document.parser.class.inc.php index 97ef7d0b5a..dd7d783e85 100755 --- a/manager/includes/document.parser.class.inc.php +++ b/manager/includes/document.parser.class.inc.php @@ -4,6 +4,9 @@ * Function: This class contains the main document parsing functions * */ +if (!defined('E_DEPRECATED')) define('E_DEPRECATED', 8192); +if (!defined('E_USER_DEPRECATED')) define('E_USER_DEPRECATED', 16384); + class DocumentParser { var $db; // db object var $event, $Event; // event object From b029959fc449b01420fd29896df3124684bb5c7e Mon Sep 17 00:00:00 2001 From: AgelxNash Date: Mon, 12 Aug 2013 01:02:52 +0600 Subject: [PATCH 2/5] #10074 --- manager/includes/document.parser.class.inc.php | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/manager/includes/document.parser.class.inc.php b/manager/includes/document.parser.class.inc.php index dd7d783e85..3efb0cb36e 100755 --- a/manager/includes/document.parser.class.inc.php +++ b/manager/includes/document.parser.class.inc.php @@ -2615,15 +2615,14 @@ function parseProperties($propertyString) { $parameter= array (); if (!empty ($propertyString)) { $tmpParams= explode("&", $propertyString); - for ($x= 0; $x < count($tmpParams); $x++) { + $count = count($tmpParams); + for ($x= 0; $x < $count; $x++) { if (strpos($tmpParams[$x], '=', 0)) { - $pTmp= explode("=", $tmpParams[$x]); - $pvTmp= explode(";", trim($pTmp[1])); - if ($pvTmp[1] == 'list' && $pvTmp[3] != "") - $parameter[trim($pTmp[0])]= $pvTmp[3]; //list default - else - if ($pvTmp[1] != 'list' && $pvTmp[2] != "") - $parameter[trim($pTmp[0])]= $pvTmp[2]; + $pTmp= explode("=", $tmpParams[$x], 2); + $pvTmp= explode(";", trim($pTmp[1]), 3); + $pvTmp[2] = isset($pvTvm[2]) ? $pvTmp[2] : null; + $pvTmp[3] = isset($pvTmp[3]) ? $pvTmp[3] : null; + $parameter[trim($pTmp[0])] = ($pvTmp[1] == 'list') ? $pvTmp[3] : $pvTmp[2]; } } } From 4b2057e1d356604b253b77811af46a37d9bf1248 Mon Sep 17 00:00:00 2001 From: AgelxNash Date: Mon, 12 Aug 2013 01:06:14 +0600 Subject: [PATCH 3/5] Undefined variable: usemm --- assets/plugins/qm/qm.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/plugins/qm/qm.inc.php b/assets/plugins/qm/qm.inc.php index e398a54425..f28b16db2c 100755 --- a/assets/plugins/qm/qm.inc.php +++ b/assets/plugins/qm/qm.inc.php @@ -24,7 +24,7 @@ function Qm(&$modx, $jqpath='', $loadmanagerjq='', $loadfrontendjq='', $noconfli $this->loadtb = $loadtb; $this->tbwidth = $tbwidth; $this->tbheight = $tbheight; - $this->usemm = $usemm; + $this->usemm = null; $this->hidefields = $hidefields; $this->hidetabs = $hidetabs; $this->hidesections = $hidesections; From 01a165a3d9805e9b0d126cc41e40af39fd0190b8 Mon Sep 17 00:00:00 2001 From: AgelxNash Date: Mon, 12 Aug 2013 02:34:00 +0600 Subject: [PATCH 4/5] #10075 --- manager/frames/1.php | 2 +- manager/frames/menu.php | 1 + manager/frames/nodes.php | 348 +++++++------- manager/frames/tree.php | 12 +- manager/includes/controls/contextmenu.php | 66 +-- manager/includes/controls/datagrid.class.php | 454 +++++++++--------- .../includes/document.parser.class.inc.php | 14 +- manager/includes/header.inc.php | 1 + manager/includes/log.class.inc.php | 4 +- manager/includes/paginate.inc.php | 146 +++--- manager/includes/sniff/phpSniff.class.php | 2 +- manager/index.php | 2 +- 12 files changed, 530 insertions(+), 522 deletions(-) diff --git a/manager/frames/1.php b/manager/frames/1.php index 05692303bf..ebadac3e69 100755 --- a/manager/frames/1.php +++ b/manager/frames/1.php @@ -10,7 +10,7 @@ if(!isset($modx->config['manager_tree_width'])) $modx->config['manager_tree_width'] = '260'; ?> -> +> <?php echo $site_name?> - (MODX CMS Manager) diff --git a/manager/frames/menu.php b/manager/frames/menu.php index 6dce737aab..5eac3dc52f 100644 --- a/manager/frames/menu.php +++ b/manager/frames/menu.php @@ -3,6 +3,7 @@ if (!array_key_exists('mail_check_timeperiod', $modx->config) || !is_numeric($modx->config['mail_check_timeperiod'])) { $modx->config['mail_check_timeperiod'] = 5; } +$modx_textdir = isset($modx_textdir) ? $modx_textdir : null; if ($manager_theme) $manager_theme .= '/'; $mxla = $modx_lang_attribute ? $modx_lang_attribute : 'en'; ?> diff --git a/manager/frames/nodes.php b/manager/frames/nodes.php index 8ec8d810ca..b3679386a7 100644 --- a/manager/frames/nodes.php +++ b/manager/frames/nodes.php @@ -6,116 +6,116 @@ */ if(IN_MANAGER_MODE!="true") die("INCLUDE_ORDERING_ERROR

Please use the MODx Content Manager instead of accessing this file directly."); - // save folderstate - if (isset($_GET['opened'])) $_SESSION['openedArray'] = $_GET['opened']; - if (isset($_GET['savestateonly'])) { - echo 'send some data'; //?? - exit; +// save folderstate +if (isset($_GET['opened'])) $_SESSION['openedArray'] = $_GET['opened']; +if (isset($_GET['savestateonly'])) { + echo 'send some data'; //?? + exit; +} + +$indent = $_GET['indent']; +$parent = $_GET['parent']; +$expandAll = $_GET['expandAll']; +$output = ""; +$theme = $manager_theme ? "$manager_theme/":""; + +// setup sorting +if(isset($_REQUEST['tree_sortby'])) { + $_SESSION['tree_sortby'] = $_REQUEST['tree_sortby']; +} +if(isset($_REQUEST['tree_sortdir'])) { + $_SESSION['tree_sortdir'] = $_REQUEST['tree_sortdir']; +} + +// icons by content type + +$icons = array( + 'application/rss+xml' => $_style["tree_page_rss"], + 'application/pdf' => $_style["tree_page_pdf"], + 'application/vnd.ms-word' => $_style["tree_page_word"], + 'application/vnd.ms-excel' => $_style["tree_page_excel"], + 'text/css' => $_style["tree_page_css"], + 'text/html' => $_style["tree_page_html"], + 'text/plain' => $_style["tree_page"], + 'text/xml' => $_style["tree_page_xml"], + 'text/javascript' => $_style["tree_page_js"], + 'image/gif' => isset($_style["tree_page_gif"]) ? $_style["tree_page_gif"] : $_style["tree_page"], + 'image/jpg' => isset($_style["tree_page_jpg"]) ? $_style["tree_page_jpg"] : $_style["tree_page"], + 'image/png' => isset($_style["tree_page_png"]) ? $_style["tree_page_png"] : $_style["tree_page"] +); +$iconsPrivate = array( + 'application/rss+xml' => $_style["tree_page_rss_secure"], + 'application/pdf' => $_style["tree_page_pdf_secure"], + 'application/vnd.ms-word' => $_style["tree_page_word_secure"], + 'application/vnd.ms-excel' => $_style["tree_page_excel_secure"], + 'text/css' => $_style["tree_page_css_secure"], + 'text/html' => $_style["tree_page_html_secure"], + 'text/plain' => $_style["tree_page_secure"], + 'text/xml' => $_style["tree_page_xml_secure"], + 'text/javascript' => $_style["tree_page_js_secure"], + 'image/gif' => isset($_style["tree_page_gif_secure"]) ? $_style["tree_page_gif_secure"] : $_style["tree_page_secure"], + 'image/jpg' => isset($_style["tree_page_jpg_secure"]) ? $_style["tree_page_jpg_secure"] : $_style["tree_page_secure"], + 'image/png' => isset($_style["tree_page_png_secure"]) ? $_style["tree_page_png_secure"] : $_style["tree_page_secure"] +); + +if (isset($_SESSION['openedArray'])) { + $opened = explode("|", $_SESSION['openedArray']); +} else { + $opened = array(); +} +$opened2 = array(); +$closed2 = array(); + +makeHTML($indent,$parent,$expandAll,$theme); +echo $output; + +// check for deleted documents on reload +if ($expandAll==2) { + $sql = "SELECT COUNT(*) FROM $dbase.`".$table_prefix."site_content` WHERE deleted=1"; + $rs = mysql_query($sql); + $row = mysql_fetch_row($rs); + $count = $row[0]; + if ($count>0) echo ''; // add a special element to let system now that the bin is full +} + +function makeHTML($indent,$parent,$expandAll,$theme) { + global $modx; + global $icons, $iconsPrivate, $theme, $_style; + global $modxDBConn, $output, $dbase, $table_prefix, $_lang, $opened, $opened2, $closed2; //added global vars + + $pad = "     "; + + // setup spacer + $spacer = ""; + for ($i = 1; $i <= $indent; $i++){ + $spacer .= "     "; } - $indent = $_GET['indent']; - $parent = $_GET['parent']; - $expandAll = $_GET['expandAll']; - $output = ""; - $theme = $manager_theme ? "$manager_theme/":""; - - // setup sorting - if(isset($_REQUEST['tree_sortby'])) { - $_SESSION['tree_sortby'] = $_REQUEST['tree_sortby']; - } - if(isset($_REQUEST['tree_sortdir'])) { - $_SESSION['tree_sortdir'] = $_REQUEST['tree_sortdir']; + if (!isset($_SESSION['tree_sortby']) && !isset($_SESSION['tree_sortdir'])) { + // This is the first startup, set default sort order + $_SESSION['tree_sortby'] = 'menuindex'; + $_SESSION['tree_sortdir'] = 'ASC'; } - - // icons by content type - - $icons = array( - 'application/rss+xml' => $_style["tree_page_rss"], - 'application/pdf' => $_style["tree_page_pdf"], - 'application/vnd.ms-word' => $_style["tree_page_word"], - 'application/vnd.ms-excel' => $_style["tree_page_excel"], - 'text/css' => $_style["tree_page_css"], - 'text/html' => $_style["tree_page_html"], - 'text/plain' => $_style["tree_page"], - 'text/xml' => $_style["tree_page_xml"], - 'text/javascript' => $_style["tree_page_js"], - 'image/gif' => $_style["tree_page_gif"], - 'image/jpg' => $_style["tree_page_jpg"], - 'image/png' => $_style["tree_page_png"] - ); - $iconsPrivate = array( - 'application/rss+xml' => $_style["tree_page_rss_secure"], - 'application/pdf' => $_style["tree_page_pdf_secure"], - 'application/vnd.ms-word' => $_style["tree_page_word_secure"], - 'application/vnd.ms-excel' => $_style["tree_page_excel_secure"], - 'text/css' => $_style["tree_page_css_secure"], - 'text/html' => $_style["tree_page_html_secure"], - 'text/plain' => $_style["tree_page_secure"], - 'text/xml' => $_style["tree_page_xml_secure"], - 'text/javascript' => $_style["tree_page_js_secure"], - 'image/gif' => $_style["tree_page_gif_secure"], - 'image/jpg' => $_style["tree_page_jpg_secure"], - 'image/png' => $_style["tree_page_png_secure"] - ); - - if (isset($_SESSION['openedArray'])) { - $opened = explode("|", $_SESSION['openedArray']); - } else { - $opened = array(); + $orderby = $_SESSION['tree_sortby']." ".$_SESSION['tree_sortdir']; + + // Folder sorting gets special setup ;) Add menuindex and pagetitle + if($_SESSION['tree_sortby'] == 'isfolder') $orderby .= ", menuindex ASC, pagetitle"; + + $tblsc = $dbase.".`".$table_prefix."site_content`"; + $tbldg = $dbase.".`".$table_prefix."document_groups`"; + $tbldgn = $dbase.".`".$table_prefix."documentgroup_names`"; + // get document groups for current user + $docgrp = (isset($_SESSION['mgrDocgroups']) && is_array($_SESSION['mgrDocgroups'])) ? implode(",",$_SESSION['mgrDocgroups']) : ''; + $showProtected= false; + if (isset ($modx->config['tree_show_protected'])) { + $showProtected= (boolean) $modx->config['tree_show_protected']; } - $opened2 = array(); - $closed2 = array(); - - makeHTML($indent,$parent,$expandAll,$theme); - echo $output; - - // check for deleted documents on reload - if ($expandAll==2) { - $sql = "SELECT COUNT(*) FROM $dbase.`".$table_prefix."site_content` WHERE deleted=1"; - $rs = mysql_query($sql); - $row = mysql_fetch_row($rs); - $count = $row[0]; - if ($count>0) echo ''; // add a special element to let system now that the bin is full + $mgrRole= (isset ($_SESSION['mgrRole']) && (string) $_SESSION['mgrRole']==='1') ? '1' : '0'; + if ($showProtected == false) { + $access = "AND (1={$mgrRole} OR sc.privatemgr=0". + (!$docgrp ? ")":" OR dg.document_group IN ({$docgrp}))"); } - - function makeHTML($indent,$parent,$expandAll,$theme) { - global $modx; - global $icons, $iconsPrivate, $theme, $_style; - global $modxDBConn, $output, $dbase, $table_prefix, $_lang, $opened, $opened2, $closed2; //added global vars - - $pad = "     "; - - // setup spacer - $spacer = ""; - for ($i = 1; $i <= $indent; $i++){ - $spacer .= "     "; - } - - if (!isset($_SESSION['tree_sortby']) && !isset($_SESSION['tree_sortdir'])) { - // This is the first startup, set default sort order - $_SESSION['tree_sortby'] = 'menuindex'; - $_SESSION['tree_sortdir'] = 'ASC'; - } - $orderby = $_SESSION['tree_sortby']." ".$_SESSION['tree_sortdir']; - - // Folder sorting gets special setup ;) Add menuindex and pagetitle - if($_SESSION['tree_sortby'] == 'isfolder') $orderby .= ", menuindex ASC, pagetitle"; - - $tblsc = $dbase.".`".$table_prefix."site_content`"; - $tbldg = $dbase.".`".$table_prefix."document_groups`"; - $tbldgn = $dbase.".`".$table_prefix."documentgroup_names`"; - // get document groups for current user - if($_SESSION['mgrDocgroups']) $docgrp = implode(",",$_SESSION['mgrDocgroups']); - $showProtected= false; - if (isset ($modx->config['tree_show_protected'])) { - $showProtected= (boolean) $modx->config['tree_show_protected']; - } - $mgrRole= (isset ($_SESSION['mgrRole']) && (string) $_SESSION['mgrRole']==='1') ? '1' : '0'; - if ($showProtected == false) { - $access = "AND (1={$mgrRole} OR sc.privatemgr=0". - (!$docgrp ? ")":" OR dg.document_group IN ({$docgrp}))"); - } - $sql = "SELECT DISTINCT sc.id, pagetitle, parent, isfolder, published, deleted, type, menuindex, hidemenu, alias, contentType, privateweb, privatemgr, + $sql = "SELECT DISTINCT sc.id, pagetitle, parent, isfolder, published, deleted, type, menuindex, hidemenu, alias, contentType, privateweb, privatemgr, MAX(IF(1={$mgrRole} OR sc.privatemgr=0" . (!$docgrp ? "":" OR dg.document_group IN ({$docgrp})") . ", 1, 0)) AS has_access FROM {$tblsc} AS sc LEFT JOIN {$tbldg} dg on dg.document = sc.id @@ -123,85 +123,85 @@ function makeHTML($indent,$parent,$expandAll,$theme) { $access GROUP BY sc.id ORDER BY {$orderby}"; - $result = mysql_query($sql, $modxDBConn); - if(mysql_num_rows($result)==0) { - $output .= '
'.$spacer.$pad.' '.$_lang['empty_folder'].'
'; - } + $result = mysql_query($sql, $modxDBConn); + if(mysql_num_rows($result)==0) { + $output .= '
'.$spacer.$pad.' '.$_lang['empty_folder'].'
'; + } - // Make sure to pass in the $modx_textdir variable to the node builder - global $modx_textdir; - - while(list($id,$pagetitle,$parent,$isfolder,$published,$deleted,$type,$menuindex,$hidemenu,$alias,$contenttype,$privateweb,$privatemgr,$hasAccess) = mysql_fetch_row($result)) - { - $pagetitle = htmlspecialchars(str_replace(array("\r\n", "\n", "\r"), '', $pagetitle)); - $protectedClass = $hasAccess==0 ? ' protectedNode' : ''; - $pagetitleDisplay = $published==0 ? "$pagetitle" : ($hidemenu==1 ? "$pagetitle":"$pagetitle"); - $pagetitleDisplay = $deleted==1 ? "$pagetitle" : $pagetitleDisplay; - $weblinkDisplay = $type=="reference" ? ' ' : '' ; - $pageIdDisplay = '('.($modx_textdir ? '‏':'').$id.')'; - $url = $modx->makeUrl($id); - - $alt = !empty($alias) ? $_lang['alias'].": ".$alias : $_lang['alias'].": -"; - $alt.= " ".$_lang['resource_opt_menu_index'].": ".$menuindex; - $alt.= " ".$_lang['resource_opt_show_menu'].": ".($hidemenu==1 ? $_lang['no']:$_lang['yes']); - $alt.= " ".$_lang['page_data_web_access'].": ".($privateweb ? $_lang['private']:$_lang['public']); - $alt.= " ".$_lang['page_data_mgr_access'].": ".($privatemgr ? $_lang['private']:$_lang['public']); - - if (!$isfolder) { - $icon = ($privateweb||$privatemgr) ? $_style["tree_page_secure"] : $_style["tree_page"]; - - if ($privateweb||$privatemgr) { - if (isset($iconsPrivate[$contenttype])) { - $icon = $iconsPrivate[$contenttype]; - } - } else { - if (isset($icons[$contenttype])) { - $icon = $icons[$contenttype]; - } + // Make sure to pass in the $modx_textdir variable to the node builder + global $modx_textdir; + + while(list($id,$pagetitle,$parent,$isfolder,$published,$deleted,$type,$menuindex,$hidemenu,$alias,$contenttype,$privateweb,$privatemgr,$hasAccess) = mysql_fetch_row($result)) + { + $pagetitle = htmlspecialchars(str_replace(array("\r\n", "\n", "\r"), '', $pagetitle)); + $protectedClass = $hasAccess==0 ? ' protectedNode' : ''; + $pagetitleDisplay = $published==0 ? "$pagetitle" : ($hidemenu==1 ? "$pagetitle":"$pagetitle"); + $pagetitleDisplay = $deleted==1 ? "$pagetitle" : $pagetitleDisplay; + $weblinkDisplay = $type=="reference" ? ' ' : '' ; + $pageIdDisplay = '('.($modx_textdir ? '‏':'').$id.')'; + $url = $modx->makeUrl($id); + + $alt = !empty($alias) ? $_lang['alias'].": ".$alias : $_lang['alias'].": -"; + $alt.= " ".$_lang['resource_opt_menu_index'].": ".$menuindex; + $alt.= " ".$_lang['resource_opt_show_menu'].": ".($hidemenu==1 ? $_lang['no']:$_lang['yes']); + $alt.= " ".$_lang['page_data_web_access'].": ".($privateweb ? $_lang['private']:$_lang['public']); + $alt.= " ".$_lang['page_data_mgr_access'].": ".($privatemgr ? $_lang['private']:$_lang['public']); + + if (!$isfolder) { + $icon = ($privateweb||$privatemgr) ? $_style["tree_page_secure"] : $_style["tree_page"]; + + if ($privateweb||$privatemgr) { + if (isset($iconsPrivate[$contenttype])) { + $icon = $iconsPrivate[$contenttype]; + } + } else { + if (isset($icons[$contenttype])) { + $icon = $icons[$contenttype]; + } + } + if($id == $modx->config['site_start']) $icon = $_style["tree_page_home"]; + elseif($id == $modx->config['error_page']) $icon = $_style["tree_page_404"]; + elseif($id == $modx->config['site_unavailable_page']) $icon = $_style["tree_page_hourglass"]; + elseif($id == $modx->config['unauthorized_page']) $icon = $_style["tree_page_info"]; + $output .= '
'.$spacer.$pad.' '; + $output .= ''.$pagetitleDisplay.$weblinkDisplay.' '.$pageIdDisplay.'
'; + } + else { + // expandAll: two type for partial expansion + if ($expandAll ==1 || ($expandAll == 2 && in_array($id, $opened))) + { + if ($expandAll == 1) { + array_push($opened2, $id); } if($id == $modx->config['site_start']) $icon = $_style["tree_page_home"]; elseif($id == $modx->config['error_page']) $icon = $_style["tree_page_404"]; elseif($id == $modx->config['site_unavailable_page']) $icon = $_style["tree_page_hourglass"]; elseif($id == $modx->config['unauthorized_page']) $icon = $_style["tree_page_info"]; - $output .= '
'.$spacer.$pad.' '; - $output .= ''.$pagetitleDisplay.$weblinkDisplay.' '.$pageIdDisplay.'
'; + $output .= '
'.$spacer.'  '; + $output .= ''.$pagetitleDisplay.$weblinkDisplay.' '.$pageIdDisplay.'
'; + makeHTML($indent+1,$id,$expandAll,$theme); + $output .= '
'; } else { - // expandAll: two type for partial expansion - if ($expandAll ==1 || ($expandAll == 2 && in_array($id, $opened))) - { - if ($expandAll == 1) { - array_push($opened2, $id); - } - if($id == $modx->config['site_start']) $icon = $_style["tree_page_home"]; - elseif($id == $modx->config['error_page']) $icon = $_style["tree_page_404"]; - elseif($id == $modx->config['site_unavailable_page']) $icon = $_style["tree_page_hourglass"]; - elseif($id == $modx->config['unauthorized_page']) $icon = $_style["tree_page_info"]; - $output .= '
'.$spacer.'  '; - $output .= ''.$pagetitleDisplay.$weblinkDisplay.' '.$pageIdDisplay.'
'; - makeHTML($indent+1,$id,$expandAll,$theme); - $output .= '
'; - } - else { - $output .= '
'.$spacer.'  '; - $output .= ''.$pagetitleDisplay.$weblinkDisplay.' '.$pageIdDisplay.'
'; - array_push($closed2, $id); - } + $output .= '
'.$spacer.'  '; + $output .= ''.$pagetitleDisplay.$weblinkDisplay.' '.$pageIdDisplay.'
'; + array_push($closed2, $id); } - // store vars in Javascript - if ($expandAll == 1) { - echo ' '; - } elseif ($expandAll == 0) { - echo ' '; + } + // store vars in Javascript + if ($expandAll == 1) { + echo ' '; + } elseif ($expandAll == 0) { + echo ' '; } } +} ?> \ No newline at end of file diff --git a/manager/frames/tree.php b/manager/frames/tree.php index 50dd3f60c5..ad74b63a50 100755 --- a/manager/frames/tree.php +++ b/manager/frames/tree.php @@ -1,7 +1,7 @@ INCLUDE_ORDERING_ERROR

Please use the MODx Content Manager instead of accessing this file directly."); $theme = $manager_theme ? "$manager_theme/":""; - + $modx_textdir = isset($modx_textdir) ? $modx_textdir : null; function constructLink($action, $img, $text, $allowed) { if($allowed==1) { ?>
@@ -33,15 +33,15 @@ function constructLink($action, $img, $text, $allowed) { var i = new Image(18,18); i.src=""; i = new Image(18,18); - i.src=""; + i.src=""; i = new Image(18,18); - i.src=""; + i.src=""; i = new Image(18,18); - i.src=""; + i.src=""; i = new Image(18,18); - i.src=""; + i.src=""; i = new Image(18,18); - i.src=""; + i.src=""; var rpcNode = null; diff --git a/manager/includes/controls/contextmenu.php b/manager/includes/controls/contextmenu.php index ed496e2c74..18911cf604 100644 --- a/manager/includes/controls/contextmenu.php +++ b/manager/includes/controls/contextmenu.php @@ -4,50 +4,50 @@ $ContextMenuCnt = 0; class ContextMenu { + var $id; + function ContextMenu($id='',$width=120,$visible=false) { + global $ContextMenuCnt; + $ContextMenuCnt++; + $this->html = ""; + $this->visible = $visible ? $visible:false; + $this->width = is_numeric($width) ? intval($width):120; + $this->id = $id ? $id:"cntxMnu".$ContextMenuCnt; // set id + } - function ContextMenu($id='',$width=120,$visible=false) { - global $ContextMenuCnt; - $ContextMenuCnt++; - $this->html = ""; - $this->visible = $visible ? $visible:false; - $this->width = is_numeric($width) ? intval($width):120; - $this->id = id ? $id:"cntxMnu".$ContextMenuCnt; // set id - } - - function addItem($text,$action="",$img="",$disabled=0){ - global $base_url, $manager_theme; - if(!$img) $img = $base_url.$_style['tx']; - if(substr($action,0,3)=="js:") $action = substr($action,3); - else if(substr($action,0,3)=="hl:") $action = "window.location.href='".substr($action,3)."'"; - else $action = "window.location.href='".$action."'"; - $action=" onmouseover=\"this.className='cntxMnuItemOver';\" onmouseout=\"this.className='cntxMnuItem';\" onclick=\"$action; hideCntxMenu('".$this->id."');\""; - if ($disabled) $action=""; - $this->html .= " + function addItem($text,$action="",$img="",$disabled=0){ + global $base_url, $manager_theme; + if(!$img) $img = $base_url.$_style['tx']; + if(substr($action,0,3)=="js:") $action = substr($action,3); + else if(substr($action,0,3)=="hl:") $action = "window.location.href='".substr($action,3)."'"; + else $action = "window.location.href='".$action."'"; + $action=" onmouseover=\"this.className='cntxMnuItemOver';\" onmouseout=\"this.className='cntxMnuItem';\" onclick=\"$action; hideCntxMenu('".$this->id."');\""; + if ($disabled) $action=""; + $this->html .= "
 $text
"; - } + } - function addSeparator(){ - $this->html .= " + function addSeparator(){ + $this->html .= "
"; - } + } - function render() { - global $modx; - global $ContextMenuScript; + function render() { + global $modx; + global $ContextMenuScript; - $html = $ContextMenuScript. - "
".$this->html."
"; - $ContextMenuScript = ""; // reset css - return $html; - } + $html = $ContextMenuScript. + "
".$this->html."
"; + $ContextMenuScript = ""; // reset css + return $html; + } - function getClientScriptObject(){ - return "getCntxMenu('".$this->id."')"; - } + function getClientScriptObject(){ + return "getCntxMenu('".$this->id."')"; + } } $ContextMenuScript = <<id = $this->id ? $id:"dg".$__DataGridCnt; - - // set datasource - $this->ds = $ds; - - // set pager - $this->pageSize = $pageSize; - $this->pageNumber = $pageNumber; // by setting pager to -1 will cause pager to load it's last page number - $this->pagerLocation = 'top-right'; - } - - function setDataSource($ds){ - $this->ds = $ds; - } - - function RenderRowFnc($n,$row){ - if ($this->_alt==0) {$Style = $this->_itemStyle;$Class = $this->_itemClass;$this->_alt=1;} - else {$Style = $this->_altItemStyle;$Class = $this->_altItemClass; $this->_alt=0;} - $o = ""; - for($c=0;$c<$this->_colcount;$c++){ - $colStyle = $Style; - $fld=trim($this->_fieldnames[$c]); - $width=$this->_colwidths[$c]; - $align=$this->_colaligns[$c]; - $color=$this->_colcolors[$c]; - $type=$this->_coltypes[$c]; - $nowrap=$this->_colwraps[$c]; - $value = $row[($this->_isDataset && $fld ? $fld:$c)]; - if($color && $Style) $colStyle = substr($colStyle,0,-1).";background-color:$color;'"; - $value = $this->formatColumnValue($row,$value,$type,$align); - $o.="$value"; - } - $o.="\n"; - return $o; - } - - // format column values - function formatColumnValue($row,$value,$type,&$align){ - if(strpos($type,":")!==false) list($type,$type_format) = explode(":",$type,2); - switch (strtolower($type)) { - case "integer": - if($align=="") $align="right"; - $value = number_format($value); - break; - - case "float": - if($align=="") $align="right"; - if(!$type_format) $type_format = 2; - $value = number_format($value,$type_format); - break; - - case "currency": - if($align=="") $align="right"; - if(!$type_format) $type_format = 2; - $value = "$".number_format($value,$type_format); - break; - - case "date": - if($align=="") $align="right"; - if(!is_numeric($value)) $value = strtotime($value); - if(!$type_format) $type_format = "%A %d, %B %Y"; - $value = strftime($type_format,$value); - break; - - case "boolean": - if ($align=='') $align="center"; - $value = number_format($value); - if ($value) { - $value = '•'; - } else { - $value = ' '; - } - break; - - case "template": - // replace [+value+] first - $value = str_replace("[+value+]",$value,$type_format); - // replace other [+fields+] - if(strpos($value,"[+")!==false) foreach($row as $k=>$v){ - $value = str_replace("[+$k+]",$v,$value); - } - break; - - } - return $value; - } - - function render(){ - - $columnHeaderStyle = ($this->columnHeaderStyle)? "style='".$this->columnHeaderStyle."'":''; - $columnHeaderClass = ($this->columnHeaderClass)? "class='".$this->columnHeaderClass."'":""; - $cssStyle = ($this->cssStyle)? "style='".$this->cssStyle."'":''; - $cssClass = ($this->cssClass)? "class='".$this->cssClass."'":''; - - $pagerClass = ($this->pagerClass)? "class='".$this->pagerClass."'":''; - $pagerStyle = ($this->pagerStyle)? "style='".$this->pagerStyle."'":"style='background-color:#ffffff;'"; - - $this->_itemStyle = ($this->itemStyle)? "style='".$this->itemStyle."'":''; - $this->_itemClass = ($this->itemClass)? "class='".$this->itemClass."'":''; - $this->_altItemStyle= ($this->altItemStyle)? "style='".$this->altItemStyle."'":''; - $this->_altItemClass= ($this->altItemClass)? "class='".$this->altItemClass."'":''; - - $this->_alt = 0; - $this->_total = 0; - - $this->_isDataset = is_resource($this->ds); // if not dataset then treat as array - - if(!$cssStyle && !$cssClass) $cssStyle = "style='width:100%;border:1px solid silver;font-family:verdana,arial; font-size:11px;'"; - if(!$columnHeaderStyle && !$columnHeaderClass) $columnHeaderStyle = "style='color:black;background-color:silver'"; - if(!$this->_itemStyle && !$this->_itemClass) $this->_itemStyle = "style='color:black;'"; - if(!$this->_altItemStyle && !$this->_altItemClass) $this->_altItemStyle = "style='color:black;background-color:#eeeeee'"; - - if($this->_isDataset && !$this->columns) { - $cols = mysql_num_fields($this->ds); - for($i=0;$i<$cols;$i++) - $this->columns.= ($i ? ",":"").mysql_field_name($this->ds,$i); - } - - // start grid - $tblStart = ""; - $tblEnd = "
"; - - // build column header - $this->_colnames = explode((strstr($this->columns,"||")!==false ? "||":","),$this->columns); - $this->_colwidths = explode((strstr($this->colWidths,"||")!==false ? "||":","),$this->colWidths); - $this->_colaligns = explode((strstr($this->colAligns,"||")!==false ? "||":","),$this->colAligns); - $this->_colwraps = explode((strstr($this->colWraps,"||")!==false ? "||":","),$this->colWraps); - $this->_colcolors = explode((strstr($this->colColors,"||")!==false ? "||":","),$this->colColors); - $this->_coltypes = explode((strstr($this->colTypes,"||")!==false ? "||":","),$this->colTypes); - $this->_colcount = count($this->_colnames); - if(!$this->_isDataset) { - $this->ds = explode((strstr($this->ds,"||")!==false ? "||":","),$this->ds); - $this->ds = array_chunk($this->ds, $this->_colcount); - } - $tblColHdr =""; - for($c=0;$c<$this->_colcount;$c++){ - $name=$this->_colnames[$c]; - $width=$this->_colwidths[$c]; - $tblColHdr.="$name"; - } - $tblColHdr.="\n"; - - // build rows - $rowcount = $this->_isDataset ? mysql_num_rows($this->ds):count($this->ds); - $this->_fieldnames = explode(",",$this->fields); - if($rowcount==0) $tblRows.= "_itemStyle." ".$this->_itemClass." colspan='".$this->_colcount."'>".$this->noRecordMsg."\n"; - else { - // render grid items - if($this->pageSize<=0) { - for($r=0;$r<$rowcount;$r++){ - $row = $this->_isDataset ? mysql_fetch_assoc($this->ds):$this->ds[$r]; - $tblRows.= $this->RenderRowFnc($r+1,$row); - } - } - else { - if(!$this->pager) { - include_once dirname(__FILE__)."/datasetpager.class.php"; - $this->pager = new DataSetPager($this->id,$this->ds,$this->pageSize,$this->pageNumber); - $this->pager->setRenderRowFnc($this); // pass this object - $this->pager->cssStyle = $pagerStyle; - $this->pager->cssClass = $pagerClass; - } - else { - $this->pager->pageSize = $this->pageSize; - $this->pager->pageNumber= $this->pageNumber; - } - - $this->pager->render(); - $tblRows = $this->pager->getRenderedRows(); - $tblPager = $this->pager->getRenderedPager(); - } - } - - // setup header,pager and footer - $o = $tblStart; - $ptop = (substr($this->pagerLocation,0,3)=="top")||(substr($this->pagerLocation,0,4)=="both"); - $pbot = (substr($this->pagerLocation,0,3)=="bot")||(substr($this->pagerLocation,0,4)=="both"); - if($this->header) $o.="".$this->header.""; - if($tblPager && $ptop) $o.="".$tblPager." "; - $o.=$tblColHdr.$tblRows; - if($tblPager && $pbot) $o.="".$tblPager." "; - if($this->footer) $o.="".$this->footer.""; - $o.= $tblEnd; - return $o; - } + var $ds; // datasource + var $id; + var $pageSize; // pager settings + var $pageNumber; + var $pager; + var $pagerLocation; // top-right, top-left, bottom-left, bottom-right, both-left, both-right + + var $cssStyle; + var $cssClass; + + var $columnHeaderStyle; + var $columnHeaderClass; + var $itemStyle; + var $itemClass; + var $altItemStyle; + var $altItemClass; + + var $fields; + var $columns; + var $colWidths; + var $colAligns; + var $colWraps; + var $colColors; + var $colTypes; // coltype1, coltype2, etc or coltype1:format1, e.g. date:%Y %m + // data type: integer,float,currency,date + + var $header; + var $footer; + var $cellPadding; + var $cellSpacing; + + var $rowAlign; // vertical alignment: top, middle, bottom + var $rowIdField; + + var $pagerStyle; + var $pagerClass; + var $noRecordMsg = "No records found."; + + function DataGrid($id,$ds,$pageSize=20,$pageNumber=-1) { + global $__DataGridCnt; + + // set id + $__DataGridCnt++; + $this->id = $this->id ? $id:"dg".$__DataGridCnt; + + // set datasource + $this->ds = $ds; + + // set pager + $this->pageSize = $pageSize; + $this->pageNumber = $pageNumber; // by setting pager to -1 will cause pager to load it's last page number + $this->pagerLocation = 'top-right'; + } + + function setDataSource($ds){ + $this->ds = $ds; + } + + function RenderRowFnc($n,$row){ + if ($this->_alt==0) {$Style = $this->_itemStyle;$Class = $this->_itemClass;$this->_alt=1;} + else {$Style = $this->_altItemStyle;$Class = $this->_altItemClass; $this->_alt=0;} + $o = ""; + for($c=0;$c<$this->_colcount;$c++){ + $colStyle = $Style; + $fld=trim($this->_fieldnames[$c]); + $width=isset($this->_colwidths[$c]) ? $this->_colwidths[$c] : null; + $align=isset($this->_colaligns[$c]) ? $this->_colaligns[$c] : null; + $color=isset($this->_colcolors[$c]) ? $this->_colcolors[$c] : null; + $type= isset($this->_coltypes[$c]) ? $this->_coltypes[$c] : null; + $nowrap=isset($this->_colwraps[$c]) ? $this->_colwraps[$c] : null; + $value = $row[($this->_isDataset && $fld ? $fld:$c)]; + if($color && $Style) $colStyle = substr($colStyle,0,-1).";background-color:$color;'"; + $value = $this->formatColumnValue($row,$value,$type,$align); + $o.="$value"; + } + $o.="\n"; + return $o; + } + + // format column values + function formatColumnValue($row,$value,$type,&$align){ + if(strpos($type,":")!==false) list($type,$type_format) = explode(":",$type,2); + switch (strtolower($type)) { + case "integer": + if($align=="") $align="right"; + $value = number_format($value); + break; + + case "float": + if($align=="") $align="right"; + if(!$type_format) $type_format = 2; + $value = number_format($value,$type_format); + break; + + case "currency": + if($align=="") $align="right"; + if(!$type_format) $type_format = 2; + $value = "$".number_format($value,$type_format); + break; + + case "date": + if($align=="") $align="right"; + if(!is_numeric($value)) $value = strtotime($value); + if(!$type_format) $type_format = "%A %d, %B %Y"; + $value = strftime($type_format,$value); + break; + + case "boolean": + if ($align=='') $align="center"; + $value = number_format($value); + if ($value) { + $value = '•'; + } else { + $value = ' '; + } + break; + + case "template": + // replace [+value+] first + $value = str_replace("[+value+]",$value,$type_format); + // replace other [+fields+] + if(strpos($value,"[+")!==false) foreach($row as $k=>$v){ + $value = str_replace("[+$k+]",$v,$value); + } + break; + + } + return $value; + } + + function render(){ + + $columnHeaderStyle = ($this->columnHeaderStyle)? "style='".$this->columnHeaderStyle."'":''; + $columnHeaderClass = ($this->columnHeaderClass)? "class='".$this->columnHeaderClass."'":""; + $cssStyle = ($this->cssStyle)? "style='".$this->cssStyle."'":''; + $cssClass = ($this->cssClass)? "class='".$this->cssClass."'":''; + + $pagerClass = ($this->pagerClass)? "class='".$this->pagerClass."'":''; + $pagerStyle = ($this->pagerStyle)? "style='".$this->pagerStyle."'":"style='background-color:#ffffff;'"; + + $this->_itemStyle = ($this->itemStyle)? "style='".$this->itemStyle."'":''; + $this->_itemClass = ($this->itemClass)? "class='".$this->itemClass."'":''; + $this->_altItemStyle= ($this->altItemStyle)? "style='".$this->altItemStyle."'":''; + $this->_altItemClass= ($this->altItemClass)? "class='".$this->altItemClass."'":''; + + $this->_alt = 0; + $this->_total = 0; + + $this->_isDataset = is_resource($this->ds); // if not dataset then treat as array + + if(!$cssStyle && !$cssClass) $cssStyle = "style='width:100%;border:1px solid silver;font-family:verdana,arial; font-size:11px;'"; + if(!$columnHeaderStyle && !$columnHeaderClass) $columnHeaderStyle = "style='color:black;background-color:silver'"; + if(!$this->_itemStyle && !$this->_itemClass) $this->_itemStyle = "style='color:black;'"; + if(!$this->_altItemStyle && !$this->_altItemClass) $this->_altItemStyle = "style='color:black;background-color:#eeeeee'"; + + if($this->_isDataset && !$this->columns) { + $cols = mysql_num_fields($this->ds); + for($i=0;$i<$cols;$i++) + $this->columns.= ($i ? ",":"").mysql_field_name($this->ds,$i); + } + + // start grid + $tblStart = ""; + $tblEnd = "
"; + + // build column header + $this->_colnames = explode((strstr($this->columns,"||")!==false ? "||":","),$this->columns); + $this->_colwidths = explode((strstr($this->colWidths,"||")!==false ? "||":","),$this->colWidths); + $this->_colaligns = explode((strstr($this->colAligns,"||")!==false ? "||":","),$this->colAligns); + $this->_colwraps = explode((strstr($this->colWraps,"||")!==false ? "||":","),$this->colWraps); + $this->_colcolors = explode((strstr($this->colColors,"||")!==false ? "||":","),$this->colColors); + $this->_coltypes = explode((strstr($this->colTypes,"||")!==false ? "||":","),$this->colTypes); + $this->_colcount = count($this->_colnames); + if(!$this->_isDataset) { + $this->ds = explode((strstr($this->ds,"||")!==false ? "||":","),$this->ds); + $this->ds = array_chunk($this->ds, $this->_colcount); + } + $tblColHdr =""; + for($c=0;$c<$this->_colcount;$c++){ + $name=$this->_colnames[$c]; + $width=$this->_colwidths[$c]; + $tblColHdr.="$name"; + } + $tblColHdr.="\n"; + + // build rows + $rowcount = $this->_isDataset ? mysql_num_rows($this->ds):count($this->ds); + $this->_fieldnames = explode(",",$this->fields); + if($rowcount==0) $tblRows.= "_itemStyle." ".$this->_itemClass." colspan='".$this->_colcount."'>".$this->noRecordMsg."\n"; + else { + // render grid items + if($this->pageSize<=0) { + for($r=0;$r<$rowcount;$r++){ + $row = $this->_isDataset ? mysql_fetch_assoc($this->ds):$this->ds[$r]; + $tblRows.= $this->RenderRowFnc($r+1,$row); + } + } + else { + if(!$this->pager) { + include_once dirname(__FILE__)."/datasetpager.class.php"; + $this->pager = new DataSetPager($this->id,$this->ds,$this->pageSize,$this->pageNumber); + $this->pager->setRenderRowFnc($this); // pass this object + $this->pager->cssStyle = $pagerStyle; + $this->pager->cssClass = $pagerClass; + } + else { + $this->pager->pageSize = $this->pageSize; + $this->pager->pageNumber= $this->pageNumber; + } + + $this->pager->render(); + $tblRows = $this->pager->getRenderedRows(); + $tblPager = $this->pager->getRenderedPager(); + } + } + + // setup header,pager and footer + $o = $tblStart; + $ptop = (substr($this->pagerLocation,0,3)=="top")||(substr($this->pagerLocation,0,4)=="both"); + $pbot = (substr($this->pagerLocation,0,3)=="bot")||(substr($this->pagerLocation,0,4)=="both"); + if($this->header) $o.="".$this->header.""; + if($tblPager && $ptop) $o.="".$tblPager." "; + $o.=$tblColHdr.$tblRows; + if($tblPager && $pbot) $o.="".$tblPager." "; + if($this->footer) $o.="".$this->footer.""; + $o.= $tblEnd; + return $o; + } } ?> \ No newline at end of file diff --git a/manager/includes/document.parser.class.inc.php b/manager/includes/document.parser.class.inc.php index 3efb0cb36e..18abf6228d 100755 --- a/manager/includes/document.parser.class.inc.php +++ b/manager/includes/document.parser.class.inc.php @@ -676,6 +676,7 @@ function postProcess() { } function mergeDocumentMETATags($template) { + $metas = null; if ($this->documentObject['haskeywords'] == 1) { // insert keywords $keywords = $this->getKeywords(); @@ -808,6 +809,7 @@ function evalPlugin($pluginCode, $params) { else $error_type = 3; if(1<$this->config['error_reporting'] || 2<$error_type) { extract($error_info); + $text = isset($text) ? $text : ''; if($msg===false) $msg = 'ob_get_contents() error'; $result = $this->messageQuit('PHP Parse Error', '', true, $type, $file, 'Plugin', $text, $line, $msg); if ($this->isBackend()) { @@ -839,6 +841,7 @@ function evalSnippet($snippet, $params) { if(1<$this->config['error_reporting'] || 2<$error_type) { extract($error_info); + $text = isset($text) ? $text : ''; if($msg===false) $msg = 'ob_get_contents() error'; $result = $this->messageQuit('PHP Parse Error', '', true, $type, $file, 'Snippet', $text, $line, $msg); if ($this->isBackend()) @@ -1910,7 +1913,7 @@ function runSnippet($snippetName, $params= array ()) { } function getChunk($chunkName) { - $t= $this->chunkCache[$chunkName]; + $t= isset($this->chunkCache[$chunkName]) ? $this->chunkCache[$chunkName] : null; return $t; } @@ -2162,7 +2165,7 @@ function getFullTableName($tbl) { # return placeholder value function getPlaceholder($name) { - return $this->placeholders[$name]; + return isset($this->placeholders[$name]) ? $this->placeholders[$name] : null; } # sets a value for a placeholder @@ -2295,7 +2298,7 @@ function getUserInfo($uid) { $limit= mysql_num_rows($rs); if ($limit == 1) { $row= $this->db->getRow($rs); - if (!$row["usertype"]) + if (!isset($row["usertype"])) $row["usertype"]= "manager"; return $row; } @@ -2313,7 +2316,7 @@ function getWebUserInfo($uid) { $limit= mysql_num_rows($rs); if ($limit == 1) { $row= $this->db->getRow($rs); - if (!$row["usertype"]) + if (!isset($row["usertype"])) $row["usertype"]= "web"; return $row; } @@ -2580,7 +2583,7 @@ function invokeEvent($evtName, $extParams= array ()) { // get plugin code if (isset ($this->pluginCache[$pluginName])) { $pluginCode= $this->pluginCache[$pluginName]; - $pluginProperties= $this->pluginCache[$pluginName . "Props"]; + $pluginProperties= isset($this->pluginCache[$pluginName . "Props"]) ? $this->pluginCache[$pluginName . "Props"] : ''; } else { $sql= "SELECT `name`, `plugincode`, `properties` FROM " . $this->getFullTableName("site_plugins") . " WHERE `name`='" . $pluginName . "' AND `disabled`=0;"; $result= $this->db->query($sql); @@ -3055,6 +3058,7 @@ function get_backtrace($backtrace) { elseif(substr($val['function'],0,8)==='phpError') break; $path = str_replace('\\','/',$val['file']); if(strpos($path,MODX_BASE_PATH)===0) $path = substr($path,strlen(MODX_BASE_PATH)); + $val['type'] = isset($val['type']) ? $val['type'] : null; switch($val['type']) { case '->': diff --git a/manager/includes/header.inc.php b/manager/includes/header.inc.php index a9eb81b9e9..25e9d3717c 100755 --- a/manager/includes/header.inc.php +++ b/manager/includes/header.inc.php @@ -4,6 +4,7 @@ // invoke OnManagerRegClientStartupHTMLBlock event $evtOut = $modx->invokeEvent('OnManagerMainFrameHeaderHTMLBlock'); +$modx_textdir = isset($modx_textdir) ? $modx_textdir : null; $onManagerMainFrameHeaderHTMLBlock = is_array($evtOut) ? implode("\n", $evtOut) : ''; ?> entry['internalKey'] = $internalKey == "" ? $modx->getLoginUserID() : $internalKey; $this->entry['username'] = $username == "" ? $modx->getLoginUserName() : $username; - $this->entry['itemId'] = empty($itemid) ? (int) $_REQUEST['id'] : $itemid; // writes the id to the object + $this->entry['itemId'] = (empty($itemid) && isset($_REQUEST['id'])) ? (int)$_REQUEST['id'] : $itemid; // writes the id to the object if($this->entry['itemId'] == 0) $this->entry['itemId'] = "-"; // to stop items having id 0 - $this->entry['itemName'] = $itemname == "" ? $_SESSION['itemname'] : $itemname; // writes the id to the object + $this->entry['itemName'] = ($itemname == "" && isset($_SESSION['itemname']))? $_SESSION['itemname'] : $itemname; // writes the id to the object if($this->entry['itemName'] == "") $this->entry['itemName'] = "-"; // to stop item name being empty $this->writeToLog(); diff --git a/manager/includes/paginate.inc.php b/manager/includes/paginate.inc.php index f6817fbccd..a6f7f27309 100755 --- a/manager/includes/paginate.inc.php +++ b/manager/includes/paginate.inc.php @@ -29,84 +29,84 @@ // * Function openTable() and closeTable() removed. // ===================================================== class Paging { - - var $int_num_result; // Number of result to show per page (decided by user) - var $int_nbr_row; // Total number of items (SQL count from db) - var $int_cur_position;// Current position in recordset - var $str_ext_argv; // Extra argv of query string - - // ------------------------------------------------------------------------ Constructor - // - function Paging( $int_nbr_row, $int_cur_position, $int_num_result, $str_ext_argv = "" ){ - $this->int_nbr_row = $int_nbr_row; - $this->int_num_result = $int_num_result; - $this->int_cur_position = $int_cur_position; - $this->str_ext_argv = urldecode( $str_ext_argv ); - } // End constructor - // ------------------------------------------------------------------- getNumberOfPage() - // This function returns the total number of page to display. - function getNumberOfPage(){ - $int_nbr_page = $this->int_nbr_row / $this->int_num_result; - return $int_nbr_page; - } // end function - - // -------------------------------------------------------------------- getCurrentPage() - // This function returns the current page number. - function getCurrentPage(){ - $int_cur_page = ( $this->int_cur_position * $this->getNumberOfPage() ) / $this->int_nbr_row; - return number_format( $int_cur_page, 0 ); - } // end function - - // ----------------------------------------------------------------------- getPagingArray() - // This function print the paging to the screen. - // This function returns an array: - // $array_paging['lower'] lower limit of where we are in result set - // $array_paging['upper'] upper limit of where we are in result set - // $array_paging['total'] total number of result - // $array_paging['previous_link'] href tag for previous link - // $array_paging['next_link'] href tag for next link - function getPagingArray(){ - global $PHP_SELF; + var $int_num_result; // Number of result to show per page (decided by user) + var $int_nbr_row; // Total number of items (SQL count from db) + var $int_cur_position;// Current position in recordset + var $str_ext_argv; // Extra argv of query string - $array_paging['lower'] = ( $this->int_cur_position + 1 ); + // ------------------------------------------------------------------------ Constructor + // + function Paging( $int_nbr_row, $int_cur_position, $int_num_result, $str_ext_argv = "" ){ + $this->int_nbr_row = $int_nbr_row; + $this->int_num_result = $int_num_result; + $this->int_cur_position = $int_cur_position; + $this->str_ext_argv = urldecode( $str_ext_argv ); + } // End constructor - if( $this->int_cur_position + $this->int_num_result >= $this->int_nbr_row ){ - $array_paging['upper'] = $this->int_nbr_row; - }else{ - $array_paging['upper'] = ( $this->int_cur_position + $this->int_num_result ); - } - - $array_paging['total'] = $this->int_nbr_row; + // ------------------------------------------------------------------- getNumberOfPage() + // This function returns the total number of page to display. + function getNumberOfPage(){ + $int_nbr_page = $this->int_nbr_row / $this->int_num_result; + return $int_nbr_page; + } // end function - if ( $this->int_cur_position != 0 ){ - $array_paging['first_link'] = "str_ext_argv."\">"; - $array_paging['previous_link'] = "int_cur_position - $this->int_num_result ).$this->str_ext_argv ."\">"; - } - - if( ( $this->int_nbr_row - $this->int_cur_position ) > $this->int_num_result ){ - $int_new_position = $this->int_cur_position + $this->int_num_result; - $array_paging['last_link'] = "int_nbr_row.$this->str_ext_argv."\">"; - $array_paging['next_link'] = "str_ext_argv ."\">"; - } - return $array_paging; - } // end function + // -------------------------------------------------------------------- getCurrentPage() + // This function returns the current page number. + function getCurrentPage(){ + $int_cur_page = ( $this->int_cur_position * $this->getNumberOfPage() ) / $this->int_nbr_row; + return number_format( $int_cur_page, 0 ); + } // end function - // ----------------------------------------------------------------------- getPagingRowArray() - // This function returns an array of string (href link with the page number) - function getPagingRowArray(){ - global $PHP_SELF; + // ----------------------------------------------------------------------- getPagingArray() + // This function print the paging to the screen. + // This function returns an array: + // $array_paging['lower'] lower limit of where we are in result set + // $array_paging['upper'] upper limit of where we are in result set + // $array_paging['total'] total number of result + // $array_paging['previous_link'] href tag for previous link + // $array_paging['next_link'] href tag for next link + function getPagingArray(){ + global $PHP_SELF; - for( $i=0; $i<$this->getNumberOfPage(); $i++ ){ - // if current page, do not make a link - if( $i == $this->getCurrentPage() ){ - $array_all_page[$i] = "". ($i+1) ." "; - }else{ - $int_new_position = ( $i * $this->int_num_result ); - $array_all_page[$i] = "str_ext_argv\">". ($i+1) ." "; - } - } - return $array_all_page; - } // end function + $array_paging['lower'] = ( $this->int_cur_position + 1 ); + + if( $this->int_cur_position + $this->int_num_result >= $this->int_nbr_row ){ + $array_paging['upper'] = $this->int_nbr_row; + }else{ + $array_paging['upper'] = ( $this->int_cur_position + $this->int_num_result ); + } + + $array_paging['total'] = $this->int_nbr_row; + + if ( $this->int_cur_position != 0 ){ + $array_paging['first_link'] = "str_ext_argv."\">"; + $array_paging['previous_link'] = "int_cur_position - $this->int_num_result ).$this->str_ext_argv ."\">"; + } + + if( ( $this->int_nbr_row - $this->int_cur_position ) > $this->int_num_result ){ + $int_new_position = $this->int_cur_position + $this->int_num_result; + $array_paging['last_link'] = "int_nbr_row.$this->str_ext_argv."\">"; + $array_paging['next_link'] = "str_ext_argv ."\">"; + } + return $array_paging; + } // end function + + // ----------------------------------------------------------------------- getPagingRowArray() + // This function returns an array of string (href link with the page number) + function getPagingRowArray(){ + global $PHP_SELF; + $array_all_page = array(); + for( $i=0; $i<$this->getNumberOfPage(); $i++ ){ + // if current page, do not make a link + if( $i == $this->getCurrentPage() ){ + $array_all_page[$i] = "". ($i+1) ." "; + }else{ + $int_new_position = ( $i * $this->int_num_result ); + $array_all_page[$i] = "str_ext_argv\">". ($i+1) ." "; + } + } + return $array_all_page; + } // end function }; // End Class ?> \ No newline at end of file diff --git a/manager/includes/sniff/phpSniff.class.php b/manager/includes/sniff/phpSniff.class.php index 48f9c0d25d..9a3cc767e3 100755 --- a/manager/includes/sniff/phpSniff.class.php +++ b/manager/includes/sniff/phpSniff.class.php @@ -19,7 +19,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *******************************************************************************/ -require_once($modx->config['base_path'] . 'manager/includes/sniff/phpSniff.core.php'); +require_once(dirname(__FILE__).'/phpSniff.core.php'); //=============================================================== // the following defines are used to create the short diff --git a/manager/index.php b/manager/index.php index b862526148..e8a0ba8f94 100755 --- a/manager/index.php +++ b/manager/index.php @@ -202,7 +202,7 @@ // so we dump the error, thereby stopping the script. } else { - $action= (int) $_REQUEST['a']; + $action= isset($_REQUEST['a']) ? (int) $_REQUEST['a'] : null; } if (isset($_POST['updateMsgCount']) && $modx->hasPermission('messages')) { From e69762d1f1861a68dcc89be4e2fe63e8198a5a35 Mon Sep 17 00:00:00 2001 From: AgelxNash Date: Mon, 12 Aug 2013 02:41:32 +0600 Subject: [PATCH 5/5] #10018 --- manager/actions/messages.static.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manager/actions/messages.static.php b/manager/actions/messages.static.php index 7afd11239c..ceb9f340a9 100644 --- a/manager/actions/messages.static.php +++ b/manager/actions/messages.static.php @@ -10,7 +10,7 @@