[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] api class.account_mgr.php, 1.1.2.26, 1.1.2.27 class.a
|
From: |
Joseph Engo <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] api class.account_mgr.php, 1.1.2.26, 1.1.2.27 class.admin.php, 1.1.2.13, 1.1.2.14 class.phpgw.php, 1.1.1.1.2.36, 1.1.1.1.2.37 class.prefs.php, 1.1.1.1.2.8, 1.1.1.1.2.9 class.xmltool.php, 1.1.1.1.2.6, 1.1.1.1.2.7 core_functions.inc.php, 1.1.1.1.2.13, 1.1.1.1.2.14 |
|
Date: |
Wed, 19 Nov 2003 20:44:30 +0000 |
Update of /cvsroot/phpgroupware/api
In directory subversions:/tmp/cvs-serv17722/api
Modified Files:
Tag: proposal-branch
class.account_mgr.php class.admin.php class.phpgw.php
class.prefs.php class.xmltool.php core_functions.inc.php
Log Message:
- Fixed some mis-spellings of ##REQUIRED##
- Temp work around for PHP running out of memory due to an infinite loop in
phpgw->finish() ... the op history parameter adding section is screawed up.
Its commented out for right now.
- Few other small changes, I can't remeber what it was
Index: class.phpgw.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/class.phpgw.php,v
retrieving revision 1.1.1.1.2.36
retrieving revision 1.1.1.1.2.37
diff -C2 -d -r1.1.1.1.2.36 -r1.1.1.1.2.37
*** class.phpgw.php 18 Nov 2003 15:53:55 -0000 1.1.1.1.2.36
--- class.phpgw.php 19 Nov 2003 20:44:27 -0000 1.1.1.1.2.37
***************
*** 272,284 ****
$args = new safe_args();
// Yes, I know its spelled wrong, but its like that due
to bug in safe_args (jengo)
! $args->set('title', '##REQUIRD##', 'string');
! $args->set('item_title','##REQUIRD##', 'string');
! $args->set('item_op','##REQUIRD##', 'string');
$args = $args->get(func_get_args(),__LINE__,__FILE__);
$this->app_menus[$args['title']][] = array(
'title' => lang($args['item_title']),
'op' => $args['item_op']
);
}
--- 272,305 ----
$args = new safe_args();
// Yes, I know its spelled wrong, but its like that due
to bug in safe_args (jengo)
! $args->set('title', '##REQUIRED##', 'string');
! $args->set('item_title','##REQUIRED##', 'string');
! $args->set('item_op','##REQUIRED##', 'string');
! $args->set('dont_add_current_op',False,'bool');
$args = $args->get(func_get_args(),__LINE__,__FILE__);
+ if ($args['dont_add_current_op'])
+ {
+ if ($pos = strpos($args['item_op'],'&'))
+ {
+ if (substr($args['item_op'],0,$pos) ==
$GLOBALS['phpgw_data']['api']['op'])
+ {
+ return False;
+ }
+ }
+ else
+ {
+ if ($GLOBALS['phpgw_data']['api']['op']
== $args['item_op'])
+ {
+ return False;
+ }
+ }
+ }
+
$this->app_menus[$args['title']][] = array(
'title' => lang($args['item_title']),
'op' => $args['item_op']
);
+
+ return True;
}
***************
*** 390,396 ****
}
! foreach
($GLOBALS['docs'][$appname]['classes'][$appname . '_' .
$classname]['functions'][$method]['params'] as $key => $params)
{
! $data[$key] =
get_var($key,'any',$params['type'],$params['default']);
}
--- 411,422 ----
}
! if
(is_array($GLOBALS['docs'][$appname]['classes'][$appname . '_' .
$classname]['functions'][$method]['params']))
{
! /*
! foreach
($GLOBALS['docs'][$appname]['classes'][$appname . '_' .
$classname]['functions'][$method]['params'] as $key => $params)
! {
! $data[$key] =
get_var($key,'any',$params['type'],$params['default']);
! }
! */
}
Index: class.xmltool.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/class.xmltool.php,v
retrieving revision 1.1.1.1.2.6
retrieving revision 1.1.1.1.2.7
diff -C2 -d -r1.1.1.1.2.6 -r1.1.1.1.2.7
*** class.xmltool.php 3 Nov 2003 17:31:21 -0000 1.1.1.1.2.6
--- class.xmltool.php 19 Nov 2003 20:44:27 -0000 1.1.1.1.2.7
***************
*** 131,139 ****
break;
case 'node':
! if(!is_array($this->data))
{
! $this->data = Array();
$this->data_type = 'node';
}
if (is_object($node_object))
{
--- 131,140 ----
break;
case 'node':
! if (! is_array($this->data))
{
! $this->data = array();
$this->data_type = 'node';
}
+
if (is_object($node_object))
{
Index: class.admin.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/Attic/class.admin.php,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -C2 -d -r1.1.2.13 -r1.1.2.14
*** class.admin.php 18 Nov 2003 15:53:55 -0000 1.1.2.13
--- class.admin.php 19 Nov 2003 20:44:27 -0000 1.1.2.14
***************
*** 133,136 ****
--- 133,137 ----
$sessions =
$GLOBALS['phpgw']->session->read_all_sessions(0);
+
$total = count($sessions);
for ($i=0; $i<$total; $i++)
Index: class.prefs.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/class.prefs.php,v
retrieving revision 1.1.1.1.2.8
retrieving revision 1.1.1.1.2.9
diff -C2 -d -r1.1.1.1.2.8 -r1.1.1.1.2.9
*** class.prefs.php 3 Nov 2003 10:52:38 -0000 1.1.1.1.2.8
--- class.prefs.php 19 Nov 2003 20:44:27 -0000 1.1.1.1.2.9
***************
*** 31,35 ****
var $account_id;
var $loaded_api = False;
!
function api_prefs()
{
--- 31,35 ----
var $account_id;
var $loaded_api = False;
!
function api_prefs()
{
***************
*** 50,54 ****
// stub so its gets cache'd. No cleanup needed.
}
!
function post_serialize()
{
--- 50,54 ----
// stub so its gets cache'd. No cleanup needed.
}
!
function post_serialize()
{
Index: class.account_mgr.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/Attic/class.account_mgr.php,v
retrieving revision 1.1.2.26
retrieving revision 1.1.2.27
diff -C2 -d -r1.1.2.26 -r1.1.2.27
*** class.account_mgr.php 18 Nov 2003 15:53:54 -0000 1.1.2.26
--- class.account_mgr.php 19 Nov 2003 20:44:26 -0000 1.1.2.27
***************
*** 121,127 ****
$args = $args->get(func_get_args(),__LINE__,__FILE__);
! $GLOBALS['phpgw']->add_appmenu('Maintain user','Edit
this user','api.account_mgr.edit&account_id=' . $args['account_id']);
! $GLOBALS['phpgw']->add_appmenu('Maintain user','Delete
this user','api.account_mgr.delete&account_id=' . $args['account_id']);
! $GLOBALS['phpgw']->add_appmenu('Maintain user','View
login history','api.account_mgr.login_history&account_id=' .
$args['account_id']);
}
--- 121,128 ----
$args = $args->get(func_get_args(),__LINE__,__FILE__);
! $GLOBALS['phpgw']->add_appmenu('Maintain user','View
this user','api.account_mgr.view&account_id=' . $args['account_id'],True);
! $GLOBALS['phpgw']->add_appmenu('Maintain user','Edit
this user','api.account_mgr.edit&account_id=' . $args['account_id'],True);
! $GLOBALS['phpgw']->add_appmenu('Maintain user','Delete
this user','api.account_mgr.delete&account_id=' . $args['account_id'],True);
! $GLOBALS['phpgw']->add_appmenu('Maintain user','View
login history','api.account_mgr.login_history&account_id=' .
$args['account_id'],True);
}
Index: core_functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/core_functions.inc.php,v
retrieving revision 1.1.1.1.2.13
retrieving revision 1.1.1.1.2.14
diff -C2 -d -r1.1.1.1.2.13 -r1.1.1.1.2.14
*** core_functions.inc.php 17 Nov 2003 23:39:06 -0000 1.1.1.1.2.13
--- core_functions.inc.php 19 Nov 2003 20:44:27 -0000 1.1.1.1.2.14
***************
*** 408,412 ****
{
$num = count($var);
! for ($i = 0; $i < $num; $i++)
{
$newvar[$this->ref[$i]] = $var[$i];
--- 408,412 ----
{
$num = count($var);
! for ($i = 0; $i < $num; $i++)
{
$newvar[$this->ref[$i]] = $var[$i];
***************
*** 414,418 ****
return $newvar;
}
!
function get($recieved,$line,$file)
{
--- 414,418 ----
return $newvar;
}
!
function get($recieved,$line,$file)
{
***************
*** 431,435 ****
break;
}
!
if(!is_array($recieved[0]))
{
--- 431,435 ----
break;
}
!
if(!is_array($recieved[0]))
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] api class.account_mgr.php, 1.1.2.26, 1.1.2.27 class.admin.php, 1.1.2.13, 1.1.2.14 class.phpgw.php, 1.1.1.1.2.36, 1.1.1.1.2.37 class.prefs.php, 1.1.1.1.2.8, 1.1.1.1.2.9 class.xmltool.php, 1.1.1.1.2.6, 1.1.1.1.2.7 core_functions.inc.php, 1.1.1.1.2.13, 1.1.1.1.2.14,
Joseph Engo <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] property/inc class.uiproject.inc.php, 1.58, 1.59 class.sotts.inc.php, 1.38, 1.39 class.uiwo_hour.inc.php, 1.42, 1.43 class.sowo_hour.inc.php, 1.20, 1.21 class.soproject.inc.php, 1.49, 1.50 class.bowo_hour.inc.php, 1.13, 1.14 class.solocation.inc.php, 1.36, 1.37 class.boentity.inc.php, 1.9, 1.10
- Next by Date:
[Phpgroupware-cvs] api/skins/default account_mgr.xsl, 1.1.2.19, 1.1.2.20
- Previous by thread:
[Phpgroupware-cvs] property/inc class.uiproject.inc.php, 1.58, 1.59 class.sotts.inc.php, 1.38, 1.39 class.uiwo_hour.inc.php, 1.42, 1.43 class.sowo_hour.inc.php, 1.20, 1.21 class.soproject.inc.php, 1.49, 1.50 class.bowo_hour.inc.php, 1.13, 1.14 class.solocation.inc.php, 1.36, 1.37 class.boentity.inc.php, 1.9, 1.10
- Next by thread:
[Phpgroupware-cvs] api/skins/default account_mgr.xsl, 1.1.2.19, 1.1.2.20
- Index(es):