holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

display upload failed (because post_max_size of webserver exceeded) message from etemplate, could be nicer but way better then before

Browse Source
This commit is contained in:
Ralf Becker 2010-02-05 03:34:17 +00:00
parent 6fb9ae3a6d
commit 936c636ffd
5 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addressbook/inc/class.addressbook_ui.inc.php
View File

@ -5,7 +5,7 @@
* @link www.egroupware.org * @link www.egroupware.org
* @author Cornelius Weiss <egw@von-und-zu-weiss.de> * @author Cornelius Weiss <egw@von-und-zu-weiss.de>
* @author Ralf Becker <RalfBecker-AT-outdoor-training.de> * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @copyright (c) 2005-9 by Ralf Becker <RalfBecker-AT-outdoor-training.de> * @copyright (c) 2005-10 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @copyright (c) 2005/6 by Cornelius Weiss <egw@von-und-zu-weiss.de> * @copyright (c) 2005/6 by Cornelius Weiss <egw@von-und-zu-weiss.de>
* @package addressbook * @package addressbook
* @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
@ -1354,6 +1354,8 @@ class addressbook_ui extends addressbook_bo
$content['created'] = $this->now_su; $content['created'] = $this->now_su;
unset($state); unset($state);
} }
if ($_GET['msg']) $content['msg'] = strip_tags($_GET['msg']); // dont allow HTML!
if($content && $_GET['makecp']) // copy the contact if($content && $_GET['makecp']) // copy the contact
{ {
$content['link_to']['to_id'] = 0; $content['link_to']['to_id'] = 0;

7
calendar/inc/class.calendar_uiforms.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-9 by RalfBecker-At-outdoor-training.de * @copyright (c) 2004-10 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$
*/ */
@ -27,6 +27,7 @@ class calendar_uiforms extends calendar_ui
var $public_functions = array( var $public_functions = array(
'freetimesearch' => True, 'freetimesearch' => True,
'edit' => true, 'edit' => true,
'process_edit' => true,
'export' => true, 'export' => true,
'import' => true, 'import' => true,
'cat_acl' => true, 'cat_acl' => true,
@ -165,6 +166,10 @@ class calendar_uiforms extends calendar_ui
*/ */
function process_edit($content) function process_edit($content)
{ {
if (!is_array($content)) // redirect from etemplate, if POST empty
{
return $this->edit(null,null,strip_tags($_GET['msg']));
}
$referer = !empty($content['referer']) ? $content['referer'] : '/index.php?menuaction='.$this->view_menuaction; $referer = !empty($content['referer']) ? $content['referer'] : '/index.php?menuaction='.$this->view_menuaction;
list($button) = @each($content['button']); list($button) = @each($content['button']);
if (!$button && $content['action']) $button = $content['action']; // action selectbox if (!$button && $content['action']) $button = $content['action']; // action selectbox

4
infolog/inc/class.infolog_ui.inc.php
View File

@ -5,7 +5,7 @@
* @link http://www.egroupware.org * @link http://www.egroupware.org
* @author Ralf Becker <RalfBecker-AT-outdoor-training.de> * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @package infolog * @package infolog
* @copyright (c) 2003-9 by Ralf Becker <RalfBecker-AT-outdoor-training.de> * @copyright (c) 2003-10 by Ralf Becker <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$
*/ */
@ -1023,6 +1023,8 @@ class infolog_ui
{ {
$content['info_cat'] = $this->prefs['cat_add_default']; $content['info_cat'] = $this->prefs['cat_add_default'];
} }
if ($_GET['msg']) $content['msg'] = strip_tags($_GET['msg']); // dont allow HTML!
switch($this->prefs['set_start']) switch($this->prefs['set_start'])
{ {
case 'date': default: $set_startdate = mktime(0,0,0,date('m',$this->bo->user_time_now),date('d',$this->bo->user_time_now),date('Y',$this->bo->user_time_now)); break; case 'date': default: $set_startdate = mktime(0,0,0,date('m',$this->bo->user_time_now),date('d',$this->bo->user_time_now),date('Y',$this->bo->user_time_now)); break;

2
resources/inc/class.ui_resources.inc.php
View File

@ -232,7 +232,7 @@ class ui_resources
'to_app' => 'resources' 'to_app' => 'resources'
); );
} }
if ($_GET['msg']) $content['msg'] = strip_tags($_GET['msg']);
} }
// some presetes // some presetes
$content['resource_picture'] = $this->bo->get_picture($content['res_id'],$content['picture_src'],$size=true); $content['resource_picture'] = $this->bo->get_picture($content['res_id'],$content['picture_src'],$size=true);

4
timesheet/inc/class.timesheet_ui.inc.php
View File

@ -5,7 +5,7 @@
* @link http://www.egroupware.org * @link http://www.egroupware.org
* @author Ralf Becker <RalfBecker-AT-outdoor-training.de> * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @package timesheet * @package timesheet
* @copyright (c) 2005-9 by Ralf Becker <RalfBecker-AT-outdoor-training.de> * @copyright (c) 2005-10 by Ralf Becker <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$
*/ */
@ -61,6 +61,8 @@ class timesheet_ui extends timesheet_bo
$etpl = new etemplate('timesheet.edit'); $etpl = new etemplate('timesheet.edit');
if (!is_array($content)) if (!is_array($content))
{ {
if ($_GET['msg']) $msg = strip_tags($_GET['msg']);
if ($view || (int)$_GET['ts_id']) if ($view || (int)$_GET['ts_id'])
{ {
if (!$this->read((int)$_GET['ts_id'])) if (!$this->read((int)$_GET['ts_id']))