[Phpgroupware-cvs] api/class.admin.php, 1.1.2.23

[nomail]

Update of /api
Modified Files:
        Branch: proposal-branch
          class.admin.php

date: 2004/04/16 20:59:48;  author: seek3r;  state: Exp;  lines: +15 -15

Log Message:
bringing savannah cvs back up to date with what we were doing on our private 
cvs server. We will not be doing dev from this cvs tree
=====================================================================
No syntax errors detected in -
=====================================================================
Index: api/class.admin.php
diff -u api/class.admin.php:1.1.2.22 api/class.admin.php:1.1.2.23
--- api/class.admin.php:1.1.2.22        Wed Jan  7 06:47:04 2004
+++ api/class.admin.php Fri Apr 16 20:59:48 2004
@@ -37,7 +37,7 @@
                'title'        => 'View session data',
                'abstract'     => 'Debug function to show data stored in a 
session',
                'params'       => array(
-                       'vsid' => array('type' => 'string', 'default' => 
'##REQUIRED##', 'desc' => 'Session ID you want to view')
+                       'vsid' => array('type' => 'string', 'default' => 
REQUIRED, 'desc' => 'Session ID you want to view')
                )
 
        );
@@ -84,8 +84,8 @@
                function view_session_data()
                {
                        $args = new safe_args();
-                       $args->set('vsid','##REQUIRED##','string');
-                       $args = $args->get(func_get_args(),__LINE__,__FILE__);
+                       $args->set('vsid',REQUIRED,'string');
+                       $args = $args->get(func_get_args());
 
                        $GLOBALS['phpgw']->add_xsl('api.admin');
                        $GLOBALS['phpgw_xml_apinode']->add_node('View session 
data','title');
@@ -94,12 +94,12 @@
                        // If you want to see this data, comment out the 
follow.  I did this becuase at times this data was really way too big
                        // and looked like total shit in the browser. (jengo)
                        $data['serialized_classes'] = array('removed due to 
size');
-
+                       /*
                        ob_start();
                        print_r($data);
                        $result_data = ob_get_contents();
                        ob_end_clean();
-
+                       */
                        $result = array(
                                'session_data' => $result_data,
                                'action_type'  => 'view_session_data'
@@ -110,19 +110,19 @@
                function kill_session()
                {
                        $args = new safe_args();
-                       $args->set('ksid','##REQUIRED##','string');
-                       $args->set('answer', '##NOVAR##', 'any');
-                       $args = $args->get(func_get_args(),__LINE__,__FILE__);
+                       $args->set('ksid',REQUIRED,'string');
+                       $args->set('answer', NOVAR, 'any');
+                       $args = $args->get(func_get_args());
 
                        $GLOBALS['phpgw']->add_xsl('api.admin');
 
                        if ($args['ksid'] == 
$GLOBALS['phpgw']->session->get_true_sid())
                        {
-                               $GLOBALS['msgbox']->add(lang('You can not 
delete your own session'),__LINE__,__FILE__, 'warning');
+                               $GLOBALS['msgbox']->add(lang('You can not 
delete your own session'), 'warning');
                                return;
                        }
 
-                       if ($args['answer'] == '##NOVAR##')
+                       if ($args['answer'] == NOVAR)
                        {
                                $GLOBALS['phpgw']->add_xsl('api.widgets');
                                $result['dialog'] = array(
@@ -143,11 +143,11 @@
                        {
                                if 
($GLOBALS['phpgw']->session->delete($args['ksid']))
                                {
-                                       $GLOBALS['msgbox']->add(lang('Session 
has been deleted'),__LINE__,__FILE__, 'notice');
+                                       $GLOBALS['msgbox']->add(lang('Session 
has been deleted'), 'notice');
                                }
                                else
                                {
-                                       $GLOBALS['msgbox']->add(lang('There was 
a problem deleting this session'),__LINE__,__FILE__, 'notice');
+                                       $GLOBALS['msgbox']->add(lang('There was 
a problem deleting this session'), 'notice');
                                }
                        }
 
@@ -158,7 +158,7 @@
                {
                        $args = new safe_args();
                        $args->set('start',0,'int');
-                       $args = $args->get(func_get_args(),__LINE__,__FILE__);
+                       $args = $args->get(func_get_args());
 
                        $GLOBALS['phpgw']->add_xsl('api.admin');
                        $GLOBALS['phpgw_xml_apinode']->add_node('Current 
Users','title');