extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 00:54:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

"bugfixes for sidebox menu under prefs or admin:

Browse Source 
- do NOT process the $_REQUEST vars
- if user changes selectboxes, go to default calendar view"
This commit is contained in:
Ralf Becker 2009-04-20 15:44:24 +00:00
parent 2d438c6dc5
commit 9e3c1df37a
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
calendar/inc/class.calendar_ui.inc.php
View File

@ -5,7 +5,7 @@
* @link http://www.egroupware.org * @link http://www.egroupware.org
* @package calendar * @package calendar
* @author Ralf Becker <RalfBecker-AT-outdoor-training.de> * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @copyright (c) 2004-8 by RalfBecker-At-outdoor-training.de * @copyright (c) 2004-9 by RalfBecker-At-outdoor-training.de
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @version $Id$ * @version $Id$
*/ */
@ -258,10 +258,10 @@ class calendar_ui
{ {
$states = unserialize($this->bo->cal_prefs['saved_states']); $states = unserialize($this->bo->cal_prefs['saved_states']);
} }
// only look at _REQUEST, if we are in the calendar (prefs and admin show our sidebox menu too!)
if (is_null($set_states)) if (is_null($set_states))
{ {
$set_states = $_REQUEST; $set_states = substr($_GET['menuaction'],0,9) == 'calendar.' ? $_REQUEST : array();
} }
if (!$states['date'] && $states['year'] && $states['month'] && $states['day']) if (!$states['date'] && $states['year'] && $states['month'] && $states['day'])
{ {
@ -336,7 +336,7 @@ class calendar_ui
$states['view'] = $this->view = 'planner'; $states['view'] = $this->view = 'planner';
} }
// set the actual view as return_to // set the actual view as return_to
if ($_GET['menuaction'] && $_GET['menuaction']) if (isset($_GET['menuaction']))
{ {
list($app,$class,$func) = explode('.',$_GET['menuaction']); list($app,$class,$func) = explode('.',$_GET['menuaction']);
if ($func == 'index') if ($func == 'index')
@ -455,7 +455,7 @@ class calendar_ui
{ {
if ($baseurl) // we append the value to the baseurl if ($baseurl) // we append the value to the baseurl
{ {
$baseurl .= strpos($baseurl,'?') === False ? '?' : '&'; if (substr($baseurl,-1) != '=') $baseurl .= strpos($baseurl,'?') === False ? '?' : '&';
$onchange="location='$baseurl'+this.value;"; $onchange="location='$baseurl'+this.value;";
} }
else // we add $name=value to the actual location else // we add $name=value to the actual location
@ -681,15 +681,21 @@ class calendar_ui
$link['week'],lang('show this week'),$link['month'],lang('show this month')); $link['week'],lang('show this week'),$link['month'],lang('show this month'));
$file[++$n] = array('text' => $jscalendar,'no_lang' => True,'link' => False,'icon' => False); $file[++$n] = array('text' => $jscalendar,'no_lang' => True,'link' => False,'icon' => False);
// set a baseurl for selectboxes, if we are not running inside calendar (eg. prefs or admin)
if (substr($_GET['menuaction'],0,9) != 'calendar.')
{
$baseurl = egw::link('/index.php',array('menuaction'=>'calendar.calendar_uiviews.index'));
}
// Category Selection // Category Selection
$file[++$n] = $this->_select_box('Category','cat_id', $file[++$n] = $this->_select_box('Category','cat_id',
'<option value="0">'.lang('All categories').'</option>'. '<option value="0">'.lang('All categories').'</option>'.
$this->cats->formatted_list('select','all',$this->cat_id,'True')); $this->cats->formatted_list('select','all',$this->cat_id,'True'),$baseurl ? $baseurl.'&cat_id=' : '');
// Filter all or hideprivate // Filter all or hideprivate
$file[] = $this->_select_box('Filter','filter', $file[] = $this->_select_box('Filter','filter',
'<option value="all"'.($this->filter=='all'?' selected="selected"':'').'>'.lang('No filter').'</option>'."\n". '<option value="all"'.($this->filter=='all'?' selected="selected"':'').'>'.lang('No filter').'</option>'."\n".
'<option value="hideprivate"'.($this->filter=='hideprivate'?' selected="selected"':'').'>'.lang('Hide private infos').'</option>'."\n"); '<option value="hideprivate"'.($this->filter=='hideprivate'?' selected="selected"':'').'>'.lang('Hide private infos').'</option>'."\n",
$baseurl ? $baseurl.'&filter=' : '');
// Calendarselection: User or Group // Calendarselection: User or Group
if(count($this->bo->grants) > 0 && $this->accountsel->account_selection != 'none') if(count($this->bo->grants) > 0 && $this->accountsel->account_selection != 'none')