diff -aruN --binary 18/administrator/components/com_admin/admin.admin.html.php 20/administrator/components/com_admin/admin.admin.html.php
--- 18/administrator/components/com_admin/admin.admin.html.php 2010-04-23 13:40:10.000000000 +0200
+++ 20/administrator/components/com_admin/admin.admin.html.php 2010-07-18 05:15:44.000000000 +0200
@@ -1,6 +1,6 @@
:
-
+
diff -aruN --binary 18/administrator/components/com_banners/config.xml 20/administrator/components/com_banners/config.xml
--- 18/administrator/components/com_banners/config.xml 2009-05-29 14:51:00.000000000 +0200
+++ 20/administrator/components/com_banners/config.xml 2010-07-18 05:15:44.000000000 +0200
@@ -1,14 +1,14 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff -aruN --binary 18/administrator/components/com_banners/controllers/banner.php 20/administrator/components/com_banners/controllers/banner.php
--- 18/administrator/components/com_banners/controllers/banner.php 2010-05-28 03:28:54.000000000 +0200
+++ 20/administrator/components/com_banners/controllers/banner.php 2010-07-18 05:15:44.000000000 +0200
@@ -1,6 +1,6 @@
|
-
+
get ('id'), $row->checked_out ) ) {
- echo $row->name;
+ echo htmlspecialchars($row->name);
} else {
?>
- name; ?>
+ name); ?>
|
- client_name;?>
+ client_name);?>
|
- category_name;?>
+ category_name);?>
|
diff -aruN --binary 18/administrator/components/com_banners/views/client.php 20/administrator/components/com_banners/views/client.php
--- 18/administrator/components/com_banners/views/client.php 2010-05-28 03:28:54.000000000 +0200
+++ 20/administrator/components/com_banners/views/client.php 2010-07-18 05:15:44.000000000 +0200
@@ -1,6 +1,6 @@
name;
} else {
?>
-
+
- name; ?>
+ name); ?>
0) {
$table = 'content';
@@ -193,6 +203,7 @@
$content_add = ' , z.title AS section_name';
$content_join = ' LEFT JOIN #__sections AS z ON z.id = c.section';
$where = ' WHERE c.section NOT LIKE "%com_%"';
+
if ($filter_order == 'c.ordering'){
$order = ' ORDER BY z.title, c.ordering '. $filter_order_Dir;
} else {
@@ -424,7 +435,7 @@
// Initialize variables
$db =& JFactory::getDBO();
- $menu = JRequest::getCmd( 'menu', 'mainmenu', 'post' );
+ $menu = JRequest::getVar( 'menu', 'mainmenu', 'post', 'menutype' );
$menuid = JRequest::getVar( 'menuid', 0, 'post', 'int' );
$redirect = JRequest::getCmd( 'redirect', '', 'post' );
$oldtitle = JRequest::getString( 'oldtitle', '', 'post' );
@@ -489,11 +500,14 @@
switch ( JRequest::getCmd('task') )
{
case 'go2menu':
- $mainframe->redirect( 'index.php?option=com_menus&menutype='. $menu );
+ $mainframe->redirect('index.php?option=com_menus&menutype=' . $menu);
break;
case 'go2menuitem':
- $mainframe->redirect( 'index.php?option=com_menus&menutype='. $menu .'&task=edit&id='. $menuid );
+ $mainframe->redirect(
+ 'index.php?option=com_menus&menutype=' . $menu
+ . '&task=edit&id='. $menuid
+ );
break;
case 'apply':
diff -aruN --binary 18/administrator/components/com_contact/admin.contact.html.php 20/administrator/components/com_contact/admin.contact.html.php
--- 18/administrator/components/com_contact/admin.contact.html.php 2010-05-28 03:28:54.000000000 +0200
+++ 20/administrator/components/com_contact/admin.contact.html.php 2010-07-18 05:15:44.000000000 +0200
@@ -1,6 +1,6 @@
get ('id'), $row->checked_out )) :
- echo $row->name;
+ echo htmlspecialchars($row->name);
else :
?>
-
+
- name; ?>
+ name); ?>
diff -aruN --binary 18/administrator/components/com_contact/admin.contact.php 20/administrator/components/com_contact/admin.contact.php
--- 18/administrator/components/com_contact/admin.contact.php 2010-05-28 03:28:54.000000000 +0200
+++ 20/administrator/components/com_contact/admin.contact.php 2010-07-18 05:15:44.000000000 +0200
@@ -1,6 +1,6 @@
= 0";
$where[] = 'c.state != -2';
- if (!$filter_order) {
+ // ensure we have a valid value for filter_order
+ if (!in_array($filter_order, array('c.title', 'c.state', 'frontpage', 'c.ordering', 'groupname',
+ 'section_name', 'cc.title', 'author', 'c.created', 'c.hits', 'c.id')))
+ {
$filter_order = 'section_name';
+
}
+
if ($filter_order == 'c.ordering') {
$order = ' ORDER BY section_name, cc.title, c.ordering '. $filter_order_Dir;
} else {
@@ -203,142 +208,6 @@
}
/**
- * Shows a list of archived articles
- * @param int The section id
- */
- function viewArchive()
- {
- global $mainframe;
-
- // Initialize variables
- $db =& JFactory::getDBO();
-
- $sectionid = JRequest::getVar( 'sectionid', 0, '', 'int' );
- $option = JRequest::getCmd( 'option' );
-
- $filter_order = $mainframe->getUserStateFromRequest("$option.$sectionid.viewarchive.filter_order", 'filter_order', 'sectname', 'cmd');
- $filter_order_Dir = $mainframe->getUserStateFromRequest("$option.$sectionid.viewarchive.filter_order_Dir", 'filter_order_Dir', '', 'word');
- $catid = $mainframe->getUserStateFromRequest("$option.$sectionid.viewarchive.catid", 'catid', 0, 'int');
- $limit = $mainframe->getUserStateFromRequest('global.list.limit', 'limit', $mainframe->getCfg('list_limit'), 'int');
- $limitstart = $mainframe->getUserStateFromRequest("$option.$sectionid.viewarchive.limitstart", 'limitstart', 0, 'int');
- $filter_authorid = $mainframe->getUserStateFromRequest("$option.$sectionid.viewarchive.filter_authorid", 'filter_authorid', 0, 'int');
- $filter_sectionid = $mainframe->getUserStateFromRequest("$option.$sectionid.viewarchive.filter_sectionid", 'filter_sectionid', 0, 'int');
- $search = $mainframe->getUserStateFromRequest("$option.$sectionid.viewarchive.search", 'search', '', 'string');
- if (strpos($search, '"') !== false) {
- $search = str_replace(array('=', '<'), '', $search);
- }
- $search = JString::strtolower($search);
- $redirect = $sectionid;
-
- // A section id of zero means view all articles [all sections]
- if ($sectionid == 0)
- {
- $where = array ('c.state = -1', 'c.catid = cc.id', 'cc.section = s.id', 's.scope = "content"');
- $filter = ' , #__sections AS s WHERE s.id = c.section';
- $all = 1;
- }
- else
- {
- //We are viewing a specific section
- $where = array ('c.state = -1', 'c.catid = cc.id', 'cc.section = s.id', 's.scope = "content"', 'c.sectionid= '.(int) $sectionid);
- $filter = ' WHERE section = '.$db->Quote($sectionid);
- $all = NULL;
- }
-
- // Section filter
- if ($filter_sectionid > 0)
- {
- $where[] = 'c.sectionid = ' . (int) $filter_sectionid;
- }
- // Author filter
- if ($filter_authorid > 0)
- {
- $where[] = 'c.created_by = ' . (int) $filter_authorid;
- }
- // Category filter
- if ($catid > 0)
- {
- $where[] = 'c.catid = ' . (int) $catid;
- }
- // Keyword filter
- if ($search)
- {
- $where[] = 'LOWER( c.title ) LIKE '.$db->Quote( '%'.$db->getEscaped( $search, true ).'%', false );
- }
-
- // TODO: Sanitise $filter_order
- $filter_order_Dir = ($filter_order_Dir == 'ASC' ? 'ASC' : 'DESC');
- $orderby = ' ORDER BY '. $filter_order .' '. $filter_order_Dir .', sectname, cc.name, c.ordering';
- $where = (count($where) ? ' WHERE '.implode(' AND ', $where) : '');
-
- // get the total number of records
- $query = 'SELECT COUNT(*)' .
- ' FROM #__content AS c' .
- ' LEFT JOIN #__categories AS cc ON cc.id = c.catid' .
- ' LEFT JOIN #__sections AS s ON s.id = c.sectionid' .
- $where;
- $db->setQuery($query);
- $total = $db->loadResult();
-
- jimport('joomla.html.pagination');
- $pagination = new JPagination($total, $limitstart, $limit);
-
- $query = 'SELECT c.*, g.name AS groupname, cc.name, v.name AS author, s.title AS sectname' .
- ' FROM #__content AS c' .
- ' LEFT JOIN #__categories AS cc ON cc.id = c.catid' .
- ' LEFT JOIN #__sections AS s ON s.id = c.sectionid' .
- ' LEFT JOIN #__groups AS g ON g.id = c.access' .
- ' LEFT JOIN #__users AS v ON v.id = c.created_by' .
- $where .
- $orderby;
- $db->setQuery($query, $pagination->limitstart, $pagination->limit);
- $rows = $db->loadObjectList();
-
- // If there is a database query error, throw a HTTP 500 and exit
- if ($db->getErrorNum())
- {
- JError::raiseError( 500, $db->stderr() );
- return false;
- }
-
- // get list of categories for dropdown filter
- $query = 'SELECT c.id AS value, c.title AS text' .
- ' FROM #__categories AS c' .
- $filter .
- ' ORDER BY c.ordering';
- $lists['catid'] = ContentHelper::filterCategory($query, $catid);
-
- // get list of sections for dropdown filter
- $javascript = 'onchange="document.adminForm.submit();"';
- $lists['sectionid'] = JAdminMenus::SelectSection('filter_sectionid', $filter_sectionid, $javascript);
-
- $section = & JTable::getInstance('section');
- $section->load($sectionid);
-
- // get list of Authors for dropdown filter
- $query = 'SELECT c.created_by, u.name' .
- ' FROM #__content AS c' .
- ' INNER JOIN #__sections AS s ON s.id = c.sectionid' .
- ' LEFT JOIN #__users AS u ON u.id = c.created_by' .
- ' WHERE c.state = -1' .
- ' GROUP BY u.name' .
- ' ORDER BY u.name';
- $db->setQuery($query);
- $authors[] = JHTML::_('select.option', '0', '- '.JText::_('Select Author').' -', 'created_by', 'name');
- $authors = array_merge($authors, $db->loadObjectList());
- $lists['authorid'] = JHTML::_('select.genericlist', $authors, 'filter_authorid', 'class="inputbox" size="1" onchange="document.adminForm.submit( );"', 'created_by', 'name', $filter_authorid);
-
- // table ordering
- $lists['order_Dir'] = $filter_order_Dir;
- $lists['order'] = $filter_order;
-
- // search filter
- $lists['search'] = $search;
-
- ContentView::showArchive($rows, $section, $lists, $pagination, $option, $all, $redirect);
- }
-
- /**
* Compiles information to add or edit the record
*
* @param database A database connector object
@@ -604,7 +473,7 @@
$task = JRequest::getCmd( 'task' );
$sectionid = JRequest::getVar( 'sectionid', 0, '', 'int' );
$redirect = JRequest::getVar( 'redirect', $sectionid, 'post', 'int' );
- $menu = JRequest::getVar( 'menu', 'mainmenu', 'post', 'cmd' );
+ $menu = JRequest::getVar( 'menu', 'mainmenu', 'post', 'menutype' );
$menuid = JRequest::getVar( 'menuid', 0, 'post', 'int' );
$nullDate = $db->getNullDate();
@@ -763,11 +632,14 @@
switch ($task)
{
case 'go2menu' :
- $mainframe->redirect('index.php?option=com_menus&menutype='.$menu);
+ $mainframe->redirect('index.php?option=com_menus&menutype=' . $menu);
break;
case 'go2menuitem' :
- $mainframe->redirect('index.php?option=com_menus&menutype='.$menu.'&task=edit&id='.$menuid);
+ $mainframe->redirect(
+ 'index.php?option=com_menus&menutype=' . $menu
+ . '&task=edit&id=' . $menuid
+ );
break;
case 'menulink' :
diff -aruN --binary 18/administrator/components/com_content/helper.php 20/administrator/components/com_content/helper.php
--- 18/administrator/components/com_content/helper.php 2010-04-23 13:40:10.000000000 +0200
+++ 20/administrator/components/com_content/helper.php 2010-07-18 05:15:44.000000000 +0200
@@ -1,6 +1,6 @@
get( 'gid' );
+
+ $filterGroups = $config->get( 'filter_groups' );
+
+ // convert to array if one group selected
+ if ( (!is_array($filterGroups) && (int) $filterGroups > 0) ) {
+ $filterGroups = array($filterGroups);
+ }
+
+ if (is_array($filterGroups) && in_array( $gid, $filterGroups ))
+ {
+ $filterType = $config->get( 'filter_type' );
+ $filterTags = preg_split( '#[,\s]+#', trim( $config->get( 'filter_tags' ) ) );
+ $filterAttrs = preg_split( '#[,\s]+#', trim( $config->get( 'filter_attritbutes' ) ) );
+ switch ($filterType)
+ {
+ case 'NH':
+ $filter = new JFilterInput();
+ break;
+ case 'WL':
+ $filter = new JFilterInput( $filterTags, $filterAttrs, 0, 0, 0); // turn off xss auto clean
+ break;
+ case 'BL':
+ default:
+ $filter = new JFilterInput( $filterTags, $filterAttrs, 1, 1 );
+ break;
+ }
+ $text = $filter->clean( $text );
+ } elseif(empty($filterGroups) && $gid != '25') { // no default filtering for super admin (gid=25)
+ $filter = new JFilterInput( array(), array(), 1, 1 );
+ $text = $filter->clean( $text );
+ }
+ return $text;
+ }
+
+
+
+ /**
* Function to reset Hit count of an article
*
*/
diff -aruN --binary 18/administrator/components/com_cpanel/admin.cpanel.php 20/administrator/components/com_cpanel/admin.cpanel.php
--- 18/administrator/components/com_cpanel/admin.cpanel.php 2010-04-23 13:40:10.000000000 +0200
+++ 20/administrator/components/com_cpanel/admin.cpanel.php 2010-07-18 05:15:44.000000000 +0200
@@ -1,6 +1,6 @@
getUserState('com_cpanel.mtupgrade.checked')) {
+
+ // If it is not enabled, let's check to see if it is even installed.
+ $db = &JFactory::getDBO();
+ $db->setQuery(
+ 'SELECT id' .
+ ' FROM #__plugins' .
+ ' WHERE folder = "system"' .
+ ' AND element = "mtupgrade"'
+ );
+ $exists = (bool) $db->loadResult();
+
+ // If it is not installed, install it as disabled and raise a notice.
+ if (!$exists) {
+ $plg = & JTable::getInstance('plugin');
+ $plg->name = 'System - Mootools Upgrade';
+ $plg->ordering = 0;
+ $plg->folder = 'system';
+ $plg->iscore = 0;
+ $plg->access = 0;
+ $plg->client_id = 0;
+ $plg->element = 'mtupgrade';
+ $plg->published = 0;
+
+ // If unable to store the plugin, raise a notice.
+ if (!$plg->store()) {
+ JError::raiseNotice(500, $plg->getError() /*JText::sprintf('Unable to auto-install the Mootools Upgrade plugin.', $plg->getError())*/);
+ }
+ // Show a message stating that the plugin is now available.
+ else {
+ //$app->enqueueMessage(JText::_('Mootools Upgrade plugin available.'));
+ }
+ }
+
+ // Set the mtupgrade plugin checked flag for the session.
+ $app->setUserState('com_cpanel.mtupgrade.checked', true);
+ }
+
+
+ }
+
//set the component specific template file in the request
JRequest::setVar('tmpl', 'cpanel');
HTML_cpanel::display();
diff -aruN --binary 18/administrator/components/com_frontpage/admin.frontpage.php 20/administrator/components/com_frontpage/admin.frontpage.php
--- 18/administrator/components/com_frontpage/admin.frontpage.php 2010-05-28 03:28:54.000000000 +0200
+++ 20/administrator/components/com_frontpage/admin.frontpage.php 2010-07-18 05:15:44.000000000 +0200
@@ -1,6 +1,6 @@
_menutype = "&menutype=".$menutype;
+ $this->_menutype = "&menutype=" . JFilterInput::clean($menutype, 'menutype');
} else {
$this->_menutype = null;
}
@@ -115,12 +115,20 @@
$this->_output .= "\n";
// Print the url
- if ($this->_current->hasChildren()) {
- $this->_output .= "";
- } else {
- $this->_output .= "";
- }
-
+ $this->_output .= ''
+ ;
+
// Recurse through children if they exist
while ($this->_current->hasChildren())
{
diff -aruN --binary 18/administrator/components/com_menus/config.xml 20/administrator/components/com_menus/config.xml
--- 18/administrator/components/com_menus/config.xml 2009-05-29 14:50:56.000000000 +0200
+++ 20/administrator/components/com_menus/config.xml 2010-07-18 05:15:44.000000000 +0200
@@ -1,6 +1,6 @@
-
-
+
+
diff -aruN --binary 18/administrator/components/com_menus/controller.php 20/administrator/components/com_menus/controller.php
--- 18/administrator/components/com_menus/controller.php 2010-04-23 13:40:10.000000000 +0200
+++ 20/administrator/components/com_menus/controller.php 2010-07-18 05:15:44.000000000 +0200
@@ -1,6 +1,6 @@
getItem();
switch ( $this->_task ) {
case 'apply':
- $this->setRedirect( 'index.php?option=com_menus&menutype='.$item->menutype.'&task=edit&cid[]='.$item->id.'' , $msg );
+ $this->setRedirect(
+ 'index.php?option=com_menus&menutype=' . $item->menutype
+ . '&task=edit&cid[]=' . $item->id,
+ $msg
+ );
break;
case 'save':
default:
- $this->setRedirect( 'index.php?option=com_menus&task=view&menutype='.$item->menutype, $msg );
+ $this->setRedirect(
+ 'index.php?option=com_menus&task=view&menutype=' . $item->menutype,
+ $msg
+ );
break;
}
}
@@ -112,12 +119,12 @@
JRequest::checkToken() or jexit( 'Invalid Token' );
- $menutype = $mainframe->getUserStateFromRequest( 'com_menus.menutype', 'menutype', 'mainmenu', 'string' );
+ $menutype = $mainframe->getUserStateFromRequest( 'com_menus.menutype', 'menutype', 'mainmenu', 'menutype' );
$model = $this->getModel('item');
$model->checkin();
- $this->setRedirect( 'index.php?option=com_menus&task=view&menutype='.$menutype);
+ $this->setRedirect('index.php?option=com_menus&task=view&menutype=' . $menutype);
}
/**
@@ -150,7 +157,7 @@
JRequest::checkToken() or jexit( 'Invalid Token' );
// Get some variables from the request
- $menu = JRequest::getString( 'menu', '', 'post');
+ $menu = JRequest::getVar('menu', '', 'post', 'menutype');
$cid = JRequest::getVar( 'cid', array(), 'post', 'array' );
JArrayHelper::toInteger($cid);
@@ -169,7 +176,7 @@
} else {
$msg = $model->getError();
}
- $this->setRedirect( 'index.php?option=com_menus&task=view&menutype='.$menu, $msg );
+ $this->setRedirect('index.php?option=com_menus&task=view&menutype=' . $menu, $msg);
}
/**
@@ -194,7 +201,7 @@
JRequest::checkToken() or jexit( 'Invalid Token' );
// Get some variables from the request
- $menu = JRequest::getVar( 'menu', '', 'post', 'string' );
+ $menu = JRequest::getVar( 'menu', '', 'post', 'menutype' );
$cid = JRequest::getVar( 'cid', array(), 'post', 'array' );
JArrayHelper::toInteger($cid);
@@ -213,7 +220,7 @@
} else {
$msg = $model->getError();
}
- $this->setRedirect( 'index.php?option=com_menus&task=view&menutype='.$menu, $msg );
+ $this->setRedirect('index.php?option=com_menus&task=view&menutype=' . $menu, $msg);
}
/**
@@ -225,7 +232,7 @@
JRequest::checkToken() or jexit( 'Invalid Token' );
// Get some variables from the request
- $menu = JRequest::getVar( 'menutype', '', 'post', 'string' );
+ $menutype = JRequest::getVar('menutype', '', 'post', 'menutype');
$cid = JRequest::getVar( 'cid', array(), 'post', 'array' );
JArrayHelper::toInteger($cid);
@@ -235,7 +242,7 @@
} else {
$msg = $model->getError();
}
- $this->setRedirect( 'index.php?option=com_menus&task=view&menutype='.$menu, $msg );
+ $this->setRedirect('index.php?option=com_menus&task=view&menutype=' . $menutype, $msg);
}
/**
@@ -247,7 +254,7 @@
JRequest::checkToken() or jexit( 'Invalid Token' );
// Get some variables from the request
- $menu = JRequest::getVar( 'menutype', '', 'post', 'string' );
+ $menutype = JRequest::getVar('menutype', '', 'post', 'menutype');
$cid = JRequest::getVar( 'cid', array(), 'post', 'array' );
JArrayHelper::toInteger($cid);
@@ -257,7 +264,7 @@
} else {
$msg = $model->getError();
}
- $this->setRedirect( 'index.php?option=com_menus&task=view&menutype='.$menu, $msg );
+ $this->setRedirect('index.php?option=com_menus&task=view&menutype=' . $menutype, $msg);
}
/**
@@ -268,14 +275,17 @@
// Check for request forgeries
JRequest::checkToken() or jexit( 'Invalid Token' );
- $menu = JRequest::getVar( 'menutype', '', 'post', 'string' );
+ $menutype = JRequest::getVar('menutype', '', 'post', 'menutype');
$cid = JRequest::getVar( 'cid', array(), 'post', 'array' );
JArrayHelper::toInteger($cid);
if (isset($cid[0]) && $cid[0]) {
$id = $cid[0];
} else {
- $this->setRedirect( 'index.php?option=com_menus&task=view&menutype='.$menu, JText::_('No Items Selected') );
+ $this->setRedirect(
+ 'index.php?option=com_menus&task=view&menutype=' . $menutype,
+ JText::_('No Items Selected')
+ );
return false;
}
@@ -285,7 +295,7 @@
} else {
$msg = $model->getError();
}
- $this->setRedirect( 'index.php?option=com_menus&task=view&menutype='.$menu, $msg );
+ $this->setRedirect('index.php?option=com_menus&task=view&menutype=' . $menutype, $msg);
}
/**
@@ -296,14 +306,17 @@
// Check for request forgeries
JRequest::checkToken() or jexit( 'Invalid Token' );
- $menu = JRequest::getVar( 'menutype', '', 'post', 'string' );
+ $menutype = JRequest::getVar('menutype', '', 'post', 'menutype');
$cid = JRequest::getVar( 'cid', array(), 'post', 'array' );
JArrayHelper::toInteger($cid);
if (isset($cid[0]) && $cid[0]) {
$id = $cid[0];
} else {
- $this->setRedirect( 'index.php?option=com_menus&task=view&menutype='.$menu, JText::_('No Items Selected') );
+ $this->setRedirect(
+ 'index.php?option=com_menus&task=view&menutype=' . $menutype,
+ JText::_('No Items Selected')
+ );
return false;
}
@@ -313,7 +326,7 @@
} else {
$msg = $model->getError();
}
- $this->setRedirect( 'index.php?option=com_menus&task=view&menutype='.$menu, $msg );
+ $this->setRedirect('index.php?option=com_menus&task=view&menutype=' . $menutype, $msg);
}
/**
@@ -324,17 +337,17 @@
// Check for request forgeries
JRequest::checkToken() or jexit( 'Invalid Token' );
- $menu = JRequest::getVar( 'menutype', '', 'post', 'string' );
+ $menutype = JRequest::getVar('menutype', '', 'post', 'menutype');
$cid = JRequest::getVar( 'cid', array(), 'post', 'array' );
JArrayHelper::toInteger($cid);
$model =& $this->getModel( 'List' );
- if ($model->setOrder($cid, $menu)) {
+ if ($model->setOrder($cid, $menutype)) {
$msg = JText::_( 'New ordering saved' );
} else {
$msg = $model->getError();
}
- $this->setRedirect( 'index.php?option=com_menus&task=view&menutype='.$menu, $msg );
+ $this->setRedirect('index.php?option=com_menus&task=view&menutype='. $menutype, $msg);
}
/**
@@ -346,7 +359,7 @@
JRequest::checkToken() or jexit( 'Invalid Token' );
// Get some variables from the request
- $menu = JRequest::getVar( 'menutype', '', 'post', 'string' );
+ $menutype = JRequest::getVar('menutype', '', 'post', 'menutype');
$cid = JRequest::getVar( 'cid', array(), 'post', 'array' );
JArrayHelper::toInteger($cid);
@@ -356,7 +369,7 @@
} else {
$msg = $model->getError();
}
- $this->setRedirect( 'index.php?option=com_menus&task=view&menutype='.$menu, $msg );
+ $this->setRedirect('index.php?option=com_menus&task=view&menutype=' . $menutype, $msg);
}
/**
@@ -368,7 +381,7 @@
JRequest::checkToken() or jexit( 'Invalid Token' );
// Get some variables from the request
- $menu = JRequest::getVar( 'menutype', '', 'post', 'string' );
+ $menutype = JRequest::getVar('menutype', '', 'post', 'menutype');
$cid = JRequest::getVar( 'cid', array(), 'post', 'array' );
JArrayHelper::toInteger($cid);
@@ -378,7 +391,7 @@
} else {
$msg = $model->getError();
}
- $this->setRedirect( 'index.php?option=com_menus&task=view&menutype='.$menu, $msg );
+ $this->setRedirect('index.php?option=com_menus&task=view&menutype=' . $menutype, $msg);
}
/**
@@ -390,7 +403,7 @@
JRequest::checkToken() or jexit( 'Invalid Token' );
// Get some variables from the request
- $menu = JRequest::getVar( 'menutype', '', 'post', 'string' );
+ $menutype = JRequest::getVar('menutype', '', 'post', 'menutype');
$cid = JRequest::getVar( 'cid', array(), 'post', 'array' );
JArrayHelper::toInteger($cid);
@@ -400,7 +413,7 @@
} else {
$msg = $model->getError();
}
- $this->setRedirect( 'index.php?option=com_menus&task=view&menutype='.$menu, $msg );
+ $this->setRedirect('index.php?option=com_menus&task=view&menutype=' . $menutype, $msg);
}
/**
@@ -412,21 +425,27 @@
JRequest::checkToken() or jexit( 'Invalid Token' );
// Get some variables from the request
- $menu = JRequest::getVar( 'menutype', '', 'post', 'string' );
+ $menutype = JRequest::getVar('menutype', '', 'post', 'menutype');
$cid = JRequest::getVar( 'cid', array(), 'post', 'array' );
JArrayHelper::toInteger($cid);
if (isset($cid[0]) && $cid[0]) {
$id = $cid[0];
} else {
- $this->setRedirect( 'index.php?option=com_menus&task=view&menutype='.$menu, JText::_('No Items Selected') );
+ $this->setRedirect(
+ 'index.php?option=com_menus&task=view&menutype=' . $menutype,
+ JText::_('No Items Selected')
+ );
return false;
}
$item =& JTable::getInstance( 'menu' );
$item->load($id);
if(!$item->get('published')) {
- $this->setRedirect( 'index.php?option=com_menus&task=view&menutype='.$menu, JText::_('The Default Menu Item Must Be Published') );
+ $this->setRedirect(
+ 'index.php?option=com_menus&task=view&menutype=' . $menutype,
+ JText::_('The Default Menu Item Must Be Published')
+ );
return false;
}
@@ -436,7 +455,10 @@
} else {
$msg = $model->getError();
}
- $this->setRedirect( 'index.php?option=com_menus&task=view&menutype='.$menu, $msg );
+ $this->setRedirect(
+ 'index.php?option=com_menus&task=view&menutype=' . $menutype,
+ $msg
+ );
}
function remove()
@@ -445,12 +467,15 @@
JRequest::checkToken() or jexit( 'Invalid Token' );
// Get some variables from the request
- $menu = JRequest::getVar( 'menutype', '', 'post', 'string' );
+ $menutype = JRequest::getVar('menutype', '', 'post', 'menutype');
$cid = JRequest::getVar( 'cid', array(), 'post', 'array' );
JArrayHelper::toInteger($cid);
if (!count($cid)) {
- $this->setRedirect( 'index.php?option=com_menus&task=view&menutype='.$menu, JText::_('No Items Selected') );
+ $this->setRedirect(
+ 'index.php?option=com_menus&task=view&menutype=' . $menutype,
+ JText::_('No Items Selected')
+ );
return false;
}
@@ -460,7 +485,10 @@
} else {
$msg = $model->getError();
}
- $this->setRedirect( 'index.php?option=com_menus&task=view&menutype='.$menu, $msg );
+ $this->setRedirect(
+ 'index.php?option=com_menus&task=view&menutype=' . $menutype,
+ $msg
+ );
}
/**
@@ -693,7 +721,7 @@
$db =& JFactory::getDBO();
$type = JRequest::getVar( 'type', '', 'post', 'string' );
- $menu_name = JRequest::getVar( 'menu_name', 'New Menu', 'post', 'string' );
+ $menu_name = JRequest::getVar( 'menu_name', 'New Menu', 'post', 'menutype' );
$module_name = JRequest::getVar( 'module_name', 'New Module', 'post', 'string' );
// check for unique menutype for new menu copy
diff -aruN --binary 18/administrator/components/com_menus/models/item.php 20/administrator/components/com_menus/models/item.php
--- 18/administrator/components/com_menus/models/item.php 2010-04-23 13:40:10.000000000 +0200
+++ 20/administrator/components/com_menus/models/item.php 2010-07-18 05:15:44.000000000 +0200
@@ -1,6 +1,6 @@
menutype = $menu_type;
+ if ($menutype = JRequest::getVar('menutype', '', '', 'menutype')) {
+ $table->menutype = $menutype;
}
switch ($table->type)
@@ -144,7 +144,7 @@
{
$item = &$this->getItem();
$return['option'] = JRequest::getCmd('expand');
- $menutype = JRequest::getString('menutype');
+ $menutype = JRequest::getVar('menutype', '', '', 'menutype');
if ($return['option'])
{
diff -aruN --binary 18/administrator/components/com_menus/models/list.php 20/administrator/components/com_menus/models/list.php
--- 18/administrator/components/com_menus/models/list.php 2010-05-28 03:28:54.000000000 +0200
+++ 20/administrator/components/com_menus/models/list.php 2010-07-18 05:15:44.000000000 +0200
@@ -1,6 +1,6 @@
getDBO();
- $menutype = $mainframe->getUserStateFromRequest( "com_menus.menutype", 'menutype', 'mainmenu', 'string' );
+ $menutype = $mainframe->getUserStateFromRequest( 'com_menus.menutype', 'menutype', 'mainmenu', 'menutype' );
$filter_order = $mainframe->getUserStateFromRequest( 'com_menus.'.$menutype.'.filter_order', 'filter_order', 'm.ordering', 'cmd' );
$filter_order_Dir = $mainframe->getUserStateFromRequest( 'com_menus.'.$menutype.'.filter_order_Dir', 'filter_order_Dir', 'ASC', 'word' );
$filter_state = $mainframe->getUserStateFromRequest( 'com_menus.'.$menutype.'.filter_state', 'filter_state', '', 'word' );
@@ -76,6 +76,11 @@
}
}
+ // ensure $filter_order has a good value
+ if (!in_array($filter_order, array('m.name', 'm.published', 'm.ordering', 'groupname', 'm.type', 'm.id'))) {
+ $filter_order = 'm.ordering';
+ }
+
// just in case filter_order get's messed up
if ($filter_order) {
$orderby = ' ORDER BY '.$filter_order .' '. $filter_order_Dir .', m.parent, m.ordering';
diff -aruN --binary 18/administrator/components/com_menus/models/menutype.php 20/administrator/components/com_menus/models/menutype.php
--- 18/administrator/components/com_menus/models/menutype.php 2010-04-23 13:40:10.000000000 +0200
+++ 20/administrator/components/com_menus/models/menutype.php 2010-07-18 05:15:44.000000000 +0200
@@ -1,6 +1,6 @@
getTable();
if ($table->menutype == '') {
- $table->menutype = JRequest::getString('menutype');
+ $table->menutype = JRequest::getVar('menutype', '', '', 'menutype');
}
$db = &$this->getDBO();
diff -aruN --binary 18/administrator/components/com_menus/views/item/tmpl/form.php 20/administrator/components/com_menus/views/item/tmpl/form.php
--- 18/administrator/components/com_menus/views/item/tmpl/form.php 2009-11-04 19:51:18.000000000 +0100
+++ 20/administrator/components/com_menus/views/item/tmpl/form.php 2010-07-18 05:15:44.000000000 +0200
@@ -56,7 +56,7 @@
-
name; ?>
diff -aruN --binary 18/administrator/components/com_menus/views/item/tmpl/type.php 20/administrator/components/com_menus/views/item/tmpl/type.php
--- 18/administrator/components/com_menus/views/item/tmpl/type.php 2009-05-29 14:50:56.000000000 +0200
+++ 20/administrator/components/com_menus/views/item/tmpl/type.php 2010-07-18 05:15:44.000000000 +0200
@@ -1,4 +1,11 @@
-
+item->menutype)
+ . '&cid[]=' . $this->item->id
+;
+?>
|