[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.uiasync.inc.php class.custom...
From: |
Sigurd Nes |
Subject: |
[Phpgroupware-cvs] property/inc class.uiasync.inc.php class.custom... |
Date: |
Mon, 26 Feb 2007 13:45:00 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Changes by: Sigurd Nes <sigurdne> 07/02/26 13:45:00
Modified files:
inc : class.uiasync.inc.php
class.custom_functions.inc.php
Log message:
fixes
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uiasync.inc.php?cvsroot=phpgroupware&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.custom_functions.inc.php?cvsroot=phpgroupware&r1=1.8&r2=1.9
Patches:
Index: class.uiasync.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uiasync.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- class.uiasync.inc.php 26 Jan 2007 14:53:47 -0000 1.17
+++ class.uiasync.inc.php 26 Feb 2007 13:45:00 -0000 1.18
@@ -24,7 +24,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage admin
- * @version $Id: class.uiasync.inc.php,v 1.17 2007/01/26 14:53:47
sigurdne Exp $
+ * @version $Id: class.uiasync.inc.php,v 1.18 2007/02/26 13:45:00
sigurdne Exp $
*/
/**
@@ -103,24 +103,23 @@
while (is_array($method_list) && list(,$method) =
each($method_list))
{
$data_set = unserialize($method['data']);
- $run_data = array('menuaction'=>
$method['name']);
+ $run_link_data = array();
+ $run_link_data['menuaction'] =
$method['name'];
+ $run_link_data['data'] =
urlencode($method['data']);
$method_data=array();
while (is_array($data_set) && list($key,$value)
= each($data_set))
{
-
$method_data[] = $key . '=' . $value;
- $run_data[$key] = $value;
}
-
$content[] = array
(
'id'
=> $method['id'],
'name'
=> $method['name'],
'first'
=> $method['descr'],
'data'
=> @implode (',',$method_data),
- 'link_run'
=> $GLOBALS['phpgw']->link('/index.php',$run_data),
+ 'link_run'
=> $GLOBALS['phpgw']->link('/index.php',$run_link_data),
'link_schedule'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uialarm.edit', 'method_id'=> $method['id'])),
'link_edit'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiasync.edit', 'id'=> $method['id'])),
'link_delete'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiasync.delete', 'id'=> $method['id'])),
Index: class.custom_functions.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.custom_functions.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- class.custom_functions.inc.php 26 Jan 2007 14:53:46 -0000 1.8
+++ class.custom_functions.inc.php 26 Feb 2007 13:45:00 -0000 1.9
@@ -24,7 +24,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage core
- * @version $Id: class.custom_functions.inc.php,v 1.8 2007/01/26
14:53:46 sigurdne Exp $
+ * @version $Id: class.custom_functions.inc.php,v 1.9 2007/02/26
13:45:00 sigurdne Exp $
*/
/**
@@ -67,11 +67,15 @@
}
else
{
- $function =
get_var('function',array('POST','GET'));
+ $data =
unserialize(urldecode(get_var('data',array('POST','GET'))));
+ if(!isset($data['function']))
+ {
+ $data['function'] =
get_var('function',array('POST','GET'));
+ }
}
-
include_once(PHPGW_SERVER_ROOT.'/'.'property'.'/inc/custom/' . $function .
'.php');
- $custom = new $function;
+
include_once(PHPGW_SERVER_ROOT.'/'.'property'.'/inc/custom/' .
$data['function'] . '.php');
+ $custom = new $data['function'];
$custom->pre_run($data);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc class.uiasync.inc.php class.custom...,
Sigurd Nes <=