phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] [18596] get_var fix


From: Caeies
Subject: [Phpgroupware-cvs] [18596] get_var fix
Date: Wed, 04 Jun 2008 17:43:19 +0000

Revision: 18596
          
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=18596
Author:   Caeies
Date:     2008-06-04 17:43:18 +0000 (Wed, 04 Jun 2008)

Log Message:
-----------
get_var fix

Modified Paths:
--------------
    trunk/preferences/inc/class.uiadmin_acl.inc.php
    trunk/preferences/inc/class.uicategories.inc.php
    trunk/preferences/inc/class.uimapping.inc.php

Modified: trunk/preferences/inc/class.uiadmin_acl.inc.php
===================================================================
--- trunk/preferences/inc/class.uiadmin_acl.inc.php     2008-06-04 17:42:10 UTC 
(rev 18595)
+++ trunk/preferences/inc/class.uiadmin_acl.inc.php     2008-06-04 17:43:18 UTC 
(rev 18596)
@@ -89,9 +89,9 @@
                        
$GLOBALS['phpgw']->xslttpl->add_file(array('admin_acl','nextmatchs',
                                                                                
'search_field'));
 
-                       $values         = get_var('values',array('POST'));
-                       $r_processed    = get_var('processed',array('POST'));
-                       $set_permission = 
get_var('set_permission',array('POST'));
+                       $values         = phpgw::get_var('values', 'string', 
'POST');
+                       $r_processed    = phpgw::get_var('processed', 'string', 
'POST');
+                       $set_permission = 
phpgw::get_var('set_permission','stirng', 'POST');
 
                        if($set_permission)
                        {
@@ -283,10 +283,10 @@
                {
                        
$GLOBALS['phpgw']->xslttpl->add_file(array('admin_acl','nextmatchs','search_field'));
 
-                       $values                 = 
get_var('values',array('POST'));
-                       $r_processed    = get_var('processed',array('POST'));
+                       $values                 = phpgw::get_var('values', 
'string', 'POST');
+                       $r_processed    = phpgw::get_var('processed', 'string', 
'POST');
 
-                       $set_permission = 
get_var('set_permission',array('POST'));
+                       $set_permission =  phpgw::get_var('set_permission', 
'string', 'POST');
 
                        if($set_permission)
                        {

Modified: trunk/preferences/inc/class.uicategories.inc.php
===================================================================
--- trunk/preferences/inc/class.uicategories.inc.php    2008-06-04 17:42:10 UTC 
(rev 18595)
+++ trunk/preferences/inc/class.uicategories.inc.php    2008-06-04 17:43:18 UTC 
(rev 18596)
@@ -75,7 +75,7 @@
                 */
                function uicategories()
                {
-                       $cats_app                       = 
get_var('cats_app',array('GET','POST'));
+                       $cats_app                       = 
phpgw::get_var('cats_app');
 
                        $this->bo                       = 
CreateObject('preferences.bocategories',$cats_app);
                        $this->nextmatchs       = 
CreateObject('phpgwapi.nextmatchs');
@@ -149,10 +149,10 @@
                 */
                function index()
                {
-                       $cats_app    = get_var('cats_app',array('GET','POST'));
-                       $extra       = get_var('extra',array('GET','POST'));
-                       $global_cats = 
get_var('global_cats',array('GET','POST'));
-                       $cats_level  = 
get_var('cats_level',array('GET','POST'));
+                       $cats_app    = phpgw::get_var('cats_app');
+                       $extra       = phpgw::get_var('extra');
+                       $global_cats = phpgw::get_var('global_cats');
+                       $cats_level  = phpgw::get_var('cats_level');
 
                        $link_data = array
                        (
@@ -331,10 +331,10 @@
                 */
                function add()
                {
-                       $cats_app    = get_var('cats_app',array('GET','POST'));
-                       $extra       = get_var('extra',array('GET','POST'));
-                       $global_cats = 
get_var('global_cats',array('GET','POST'));
-                       $cats_level  = 
get_var('cats_level',array('GET','POST'));
+                       $cats_app    = phpgw::get_var('cats_app');
+                       $extra       = phpgw::get_var('extra');
+                       $global_cats = phpgw::get_var('global_cats');
+                       $cats_level  = phpgw::get_var('cats_level');
 
                        $link_data = array
                        (
@@ -350,12 +350,12 @@
                        $GLOBALS['phpgw']->common->phpgw_header();
                        echo parse_navbar();
 
-                       $new_parent      = isset($_POST['new_parent']) ? 
$_POST['new_parent'] : 0;
-                       $cat_parent      = isset($_GET['cat_parent']) ? 
$_GET['cat_parent'] : 0;
-                       $cat_name        = isset($_POST['cat_name']) ? 
$_POST['cat_name'] : '';
-                       $cat_description = isset($_POST['cat_description']) ? 
$_POST['cat_description'] : '';
-                       $cat_data        = isset($_POST['cat_data']) ? 
$_POST['cat_data'] : array();
-                       $cat_access      = isset($_POST['cat_access']) ? 
$_POST['cat_access'] : 'private';
+                       $new_parent      = phpgw::get_var('new_parent', 'int', 
'POST', 0);
+                       $cat_parent      = phpgw::get_var('cat_parent', 'int', 
'POST', 0);
+                       $cat_name        = phpgw::get_var('cat_name', 'string', 
'POST', '');
+                       $cat_description = phpgw::get_var('cat_description', 
'string', 'POST', '');
+                       $cat_data        = phpgw::get_var('cat_data', 'array', 
'POST', array());
+                       $cat_access      = phpgw::get_var('cat_access', 
'string', 'POST', 'private');
 
                        $GLOBALS['phpgw']->template->set_file(array('form' => 
'category_form.tpl'));
                        
$GLOBALS['phpgw']->template->set_block('form','data_row','row');
@@ -374,7 +374,7 @@
                                $global_cats = False;
                        }
 
-                       if ( isset($_POST['save']) && $_POST['save'])
+                       if (phpgw::get_var('save', 'bool', 'POST'))
                        {
                                $data = serialize($cat_data);
 
@@ -439,11 +439,11 @@
 
                function edit()
                {
-                       $cats_app    = get_var('cats_app',array('GET','POST'));
-                       $extra       = get_var('extra',array('GET','POST'));
-                       $global_cats = 
get_var('global_cats',array('GET','POST'));
-                       $cats_level  = 
get_var('cats_level',array('GET','POST'));
-                       $cat_id      = get_var('cat_id',array('GET','POST'));
+                       $cats_app    = phpgw::get_var('cats_app');
+                       $extra       = phpgw::get_var('extra');
+                       $global_cats = phpgw::get_var('global_cats');
+                       $cats_level  = phpgw::get_var('cats_level');
+                       $cat_id      = phpgw::get_var('cat_id','int');
 
                        $link_data = array
                        (
@@ -465,13 +465,13 @@
                        $GLOBALS['phpgw']->common->phpgw_header();
                        echo parse_navbar();
 
-                       $new_parent                     = $_POST['new_parent'];
-                       $cat_parent                     = $_POST['cat_parent'];
-                       $cat_name                       = $_POST['cat_name'];
-                       $cat_description        = $_POST['cat_description'];
-                       $cat_data                       = $_POST['cat_data'];
-                       $cat_access                     = $_POST['cat_access'];
-                       $old_parent                     = $_POST['old_parent'];
+                       $new_parent                     = 
phpgw::get_var('new_parent', 'string', 'POST');
+                       $cat_parent                     = 
phpgw::get_var('cat_parent', 'string', 'POST');
+                       $cat_name                       = 
phpgw::get_var('cat_name', 'string', 'POST');
+                       $cat_description                = 
phpgw::get_var('cat_description','string', 'POST');
+                       $cat_data                       = 
phpgw::get_var('cat_data','string', 'POST');
+                       $cat_access                     = 
phpgw::get_var('cat_access', 'string', 'POST');
+                       $old_parent                     = 
phpgw::get_var('old_parent', 'string', 'POST');
 
                        $GLOBALS['phpgw']->template->set_file(array('form' => 
'category_form.tpl'));
                        
$GLOBALS['phpgw']->template->set_block('form','data_row','row');
@@ -490,8 +490,8 @@
                        {
                                $global_cats = False;
                        }
-
-                       if ($_POST['save'])
+                       
+                       if (phpgw::get_var('save','bool', 'POST'))
                        {
                                $data = serialize($cat_data);
 
@@ -575,11 +575,11 @@
 
                function delete()
                {
-                       $cats_app    = get_var('cats_app',array('GET','POST'));
-                       $extra       = get_var('extra',array('GET','POST'));
-                       $global_cats = 
get_var('global_cats',array('GET','POST'));
-                       $cats_level  = 
get_var('cats_level',array('GET','POST'));
-                       $cat_id      = get_var('cat_id',array('GET','POST'));
+                       $cats_app    = phpgw::get_var('cats_app');
+                       $extra       = phpgw::get_var('extra');
+                       $global_cats = phpgw::get_var('global_cats');
+                       $cats_level  = phpgw::get_var('cats_level');
+                       $cat_id      = phpgw::get_var('cat_id', 'int');
 
                        $link_data = array
                        (
@@ -591,14 +591,14 @@
                                'cat_id'      => $cat_id
                        );
 
-                       if (!$cat_id || $_POST['cancel'])
+                       if (!$cat_id || 
phpgw::get_var('cancel','string','POST', ''))
                        {
                                
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
                        }
 
-                       if ($_POST['confirm'])
+                       if (phpgw::get_var('confirm','bool', 'POST'))
                        {
-                               if ($_POST['subs'])
+                               if (phpgw::get_var('subs','bool', 'POST'))
                                {
                                        $this->bo->delete($cat_id,True);
                                }

Modified: trunk/preferences/inc/class.uimapping.inc.php
===================================================================
--- trunk/preferences/inc/class.uimapping.inc.php       2008-06-04 17:42:10 UTC 
(rev 18595)
+++ trunk/preferences/inc/class.uimapping.inc.php       2008-06-04 17:43:18 UTC 
(rev 18596)
@@ -109,14 +109,14 @@
                                $app_data['table_row'][] = $item;
                        }
                        
-                       $app_data['msg'] = get_var('msg', 'GET', '');
+                       $app_data['msg'] = phpgw::get_var('msg', 'string', 
'GET', '');
 
-                       $action = get_var('action', 'GET', '');
+                       $action = phpgw::get_var('action', 'string', 'GET', '');
                        if ($action)
                        {
-                               $ext_user = get_var('ext_user', 'GET', '');
-                               $location = get_var('location', 'GET', '');
-                               $auth_type = get_var('auth_type', 'GET', '');
+                               $ext_user = phpgw::get_var('ext_user', 
'string', 'GET', '');
+                               $location = phpgw::get_var('location', 
'string', 'GET', '');
+                               $auth_type = phpgw::get_var('auth_type', 
'string', 'GET', '');
                                
                                if(isset($_SERVER['REMOTE_USER']) && ($ext_user 
== $_SERVER['REMOTE_USER']) &&  ($phpgw_map_location == $location) && 
($phpgw_map_authtype == $auth_type))
                                {






reply via email to

[Prev in Thread] Current Thread [Next in Thread]