[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] sms index.php inc/class.menu.inc.php inc/class....
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] sms index.php inc/class.menu.inc.php inc/class.... |
|
Date: |
Fri, 15 Sep 2006 13:28:09 +0000 |
CVSROOT: /sources/phpgroupware
Module name: sms
Changes by: Sigurd Nes <sigurdne> 06/09/15 13:28:09
Modified files:
. : index.php
inc : class.menu.inc.php class.uiconfig.inc.php
class.uisms.inc.php
Log message:
link
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/sms/index.php?cvsroot=phpgroupware&r1=1.1.1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/sms/inc/class.menu.inc.php?cvsroot=phpgroupware&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/sms/inc/class.uiconfig.inc.php?cvsroot=phpgroupware&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/sms/inc/class.uisms.inc.php?cvsroot=phpgroupware&r1=1.13&r2=1.14
Patches:
Index: index.php
===================================================================
RCS file: /sources/phpgroupware/sms/index.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -b -r1.1.1.1 -r1.2
--- index.php 15 May 2006 10:29:22 -0000 1.1.1.1
+++ index.php 15 Sep 2006 13:28:09 -0000 1.2
@@ -1,43 +1,8 @@
<?php
- /**
- * phpGroupWare - HRM: a human resource competence management system.
- *
- * @author Sigurd Nes <address@hidden>
- * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
- * @package hrm
- * @version $Id: index.php,v 1.1.1.1 2006/05/15 10:29:22 sigurdne Exp $
- */
-
- /**
- * Start page
- *
- * This script will check if there is defined a startpage in the users
- * preferences - and then forward the user to this page
- */
-
- $currentapp='sms';
-
-
- $GLOBALS['phpgw_info']['flags'] = array(
- 'noheader' => True,
- 'nonavbar' => True,
- 'currentapp' => $currentapp
- );
-
+ /**
* phpGroupWare - HRM: a human resource competence management system.
*
* @author Sigurd Nes <address@hidden>
* @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package hrm
* @version $Id: index.php,v 1.2 2006/09/15 13:28:09 sigurdne Exp $
*/
+ /**
* Start page
*
* This script will check if there is defined a startpage in the users
* preferences - and then forward the user to this page
*/
+ $currentapp='sms';
$GLOBALS['phpgw_info']['flags'] = array(
'noheader' => True,
'nonavbar' => True,
'currentapp' => $currentapp
);
include('../header.inc.php');
-
$start_page=$GLOBALS['phpgw_info']['user']['preferences'][$currentapp]['default_start_page'];
-
- if ($start_page)
- {
-
$start_page='menuaction='.$currentapp.'.ui'.$start_page.'.index';
- }
- else
- {
- $start_page='menuaction='.$currentapp.'.uisms.index';
- }
-
+ if ($start_page)
{
$start_page = array('menuaction'=>
$currentapp.'.ui'.$start_page.'.index');
}
else
{
$start_page = array('menuaction'=> $currentapp.'.uisms.index');
}
$GLOBALS['phpgw']->redirect_link('/index.php',$start_page);
-?>
Index: inc/class.menu.inc.php
===================================================================
RCS file: /sources/phpgroupware/sms/inc/class.menu.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- inc/class.menu.inc.php 21 Jun 2006 11:37:31 -0000 1.11
+++ inc/class.menu.inc.php 15 Sep 2006 13:28:09 -0000 1.12
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package sms
* @subpackage core
- * @version $Id: class.menu.inc.php,v 1.11 2006/06/21 11:37:31 sigurdne
Exp $
+ * @version $Id: class.menu.inc.php,v 1.12 2006/09/15 13:28:09 sigurdne
Exp $
*/
/**
@@ -44,7 +44,7 @@
{
$menu['module'][$i]['this']=True;
}
- $menu['module'][$i]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uisms.index');
+ $menu['module'][$i]['link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uisms.index'));
$menu['module'][$i]['name'] = lang('Inbox');
$menu['module'][$i]['statustext'] = lang('Inbox');
$i++;
@@ -53,7 +53,7 @@
{
$menu['module'][$i]['this']=True;
}
- $menu['module'][$i]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uisms.outbox');
+ $menu['module'][$i]['link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uisms.outbox'));
$menu['module'][$i]['name'] =
lang('outbox');
$menu['module'][$i]['statustext'] =
lang('outbox');
$i++;
@@ -63,7 +63,7 @@
{
$menu['module'][$i]['this']=True;
}
- $menu['module'][$i]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiautoreply.index');
+ $menu['module'][$i]['link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uiautoreply.index'));
$menu['module'][$i]['name'] =
lang('autoreply');
$menu['module'][$i]['statustext'] =
lang('autoreply');
$i++;
@@ -71,7 +71,7 @@
{
$menu['module'][$i]['this']=True;
}
- $menu['module'][$i]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiboard.index');
+ $menu['module'][$i]['link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uiboard.index'));
$menu['module'][$i]['name'] =
lang('boards');
$menu['module'][$i]['statustext'] =
lang('boards');
$i++;
@@ -79,7 +79,7 @@
{
$menu['module'][$i]['this']=True;
}
- $menu['module'][$i]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uicommand.index');
+ $menu['module'][$i]['link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uicommand.index'));
$menu['module'][$i]['name'] =
lang('commands');
$menu['module'][$i]['statustext'] =
lang('commands');
$i++;
@@ -87,7 +87,7 @@
{
$menu['module'][$i]['this']=True;
}
- $menu['module'][$i]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uicustom.index');
+ $menu['module'][$i]['link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uicustom.index'));
$menu['module'][$i]['name'] =
lang('customs');
$menu['module'][$i]['statustext'] =
lang('customs');
$i++;
@@ -95,7 +95,7 @@
{
$menu['module'][$i]['this']=True;
}
- $menu['module'][$i]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uipoll.index');
+ $menu['module'][$i]['link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uipoll.index'));
$menu['module'][$i]['name'] =
lang('polls');
$menu['module'][$i]['statustext'] =
lang('polls');
$i++;
@@ -105,7 +105,7 @@
{
$menu['module'][$i]['this']=True;
}
- $menu['module'][$i]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiconfig.index');
+ $menu['module'][$i]['link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uiconfig.index'));
$menu['module'][$i]['name'] =
lang('config');
$menu['module'][$i]['statustext'] =
lang('config');
$i++;
@@ -117,7 +117,7 @@
{
$menu['sub_menu'][$j]['this']=True;
}
- $menu['sub_menu'][$j]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiconfig.index');
+ $menu['sub_menu'][$j]['link']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uiconfig.index'));
$menu['sub_menu'][$j]['name']
= lang('config');
$menu['sub_menu'][$j]['statustext']
= lang('config');
$j++;
@@ -126,7 +126,7 @@
{
$menu['sub_menu'][$j]['this']=True;
}
- $menu['sub_menu'][$j]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiconfig.daemon_manual');
+ $menu['sub_menu'][$j]['link']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uiconfig.daemon_manual'));
$menu['sub_menu'][$j]['name']
= lang('Daemon manual refresh');
$menu['sub_menu'][$j]['statustext']
= lang('Daemon manual refresh');
$j++;
@@ -139,7 +139,7 @@
{
$menu['sub_menu'][$j]['this']=True;
}
- $menu['sub_menu'][$j]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uicommand.index');
+ $menu['sub_menu'][$j]['link']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uicommand.index'));
$menu['sub_menu'][$j]['name']
= lang('commands');
$menu['sub_menu'][$j]['statustext']
= lang('commands');
$j++;
@@ -148,7 +148,7 @@
{
$menu['sub_menu'][$j]['this']=True;
}
- $menu['sub_menu'][$j]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uicommand.log');
+ $menu['sub_menu'][$j]['link']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uicommand.log'));
$menu['sub_menu'][$j]['name']
= lang('log');
$menu['sub_menu'][$j]['statustext']
= lang('log');
$j++;
Index: inc/class.uiconfig.inc.php
===================================================================
RCS file: /sources/phpgroupware/sms/inc/class.uiconfig.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- inc/class.uiconfig.inc.php 22 Jun 2006 07:01:43 -0000 1.6
+++ inc/class.uiconfig.inc.php 15 Sep 2006 13:28:09 -0000 1.7
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package sms
* @subpackage config
- * @version $Id: class.uiconfig.inc.php,v 1.6 2006/06/22 07:01:43
sigurdne Exp $
+ * @version $Id: class.uiconfig.inc.php,v 1.7 2006/09/15 13:28:09
sigurdne Exp $
*/
/**
@@ -95,10 +95,10 @@
$content[] = array
(
'name'
=> $entry['name'],
- 'link_attribute'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiconfig.list_attrib&type_id='
. $entry['id']),
- 'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiconfig.edit_type&type_id='
. $entry['id']),
- 'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiconfig.delete_type&type_id='
. $entry['id']),
- 'link_view'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiconfig.view_type&type_id='
. $entry['id']),
+ 'link_attribute'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiconfig.list_attrib', 'type_id'=> $entry['id'])),
+ 'link_edit'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiconfig.edit_type', 'type_id'=> $entry['id'])),
+ 'link_delete'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiconfig.delete_type', 'type_id'=> $entry['id'])),
+ 'link_view'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiconfig.view_type', 'type_id'=> $entry['id'])),
'lang_view_config_text'
=> lang('view the config'),
'lang_edit_config_text'
=> lang('edit the config'),
'text_view'
=> lang('view'),
@@ -121,8 +121,8 @@
'var' => 'name',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uiconfig.index',
-
'query' =>$this->query,
-
'cat_id' =>$this->cat_id,
+
'query' => $this->query,
+
'cat_id' => $this->cat_id,
'allrows' => $this->allrows)
)),
'lang_name' => lang('name'),
@@ -144,18 +144,18 @@
$link_data = array
(
'menuaction' =>
$this->currentapp.'.uiconfig.index',
- 'sort'
=>$this->sort,
- 'order'
=>$this->order,
- 'cat_id'
=>$this->cat_id,
- 'filter'
=>$this->filter,
- 'query'
=>$this->query
+ 'sort' => $this->sort,
+ 'order' => $this->order,
+ 'cat_id' => $this->cat_id,
+ 'filter' => $this->filter,
+ 'query' => $this->query
);
$table_add[] = array
(
'lang_add' => lang('add'),
'lang_add_statustext' => lang('add a type'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiconfig.edit_type'),
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiconfig.edit_type')),
);
$msgbox_data = $this->bocommon->msgbox_data($receipt);
@@ -182,7 +182,6 @@
);
$appname =
lang('config');
-;
$function_msg =
lang('list type');
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
@@ -229,13 +228,13 @@
if ($values['save'])
{
$GLOBALS['phpgw']->session->appsession('session_data','sms_c_type_receipt',$receipt);
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiconfig.index&type_id='
. $type_id);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uiconfig.index', 'type_id'=> $type_id));
}
}
}
else
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiconfig.index&type_id='
. $type_id);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uiconfig.index', 'type_id'=> $type_id));
}
}
@@ -322,7 +321,7 @@
'lang_id' => lang('Type
ID'),
'lang_name' => lang('name'),
'lang_descr' =>
lang('descr'),
- 'form_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiconfig.index'),
+ 'form_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiconfig.index')),
'lang_cancel' =>
lang('cancel'),
'value_id' => $type_id,
);
@@ -348,7 +347,7 @@
if(!$type_id)
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiconfig.index');
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uiconfig.index'));
}
$GLOBALS['phpgw']->xslttpl->add_file(array('config','nextmatchs','menu',
@@ -367,9 +366,9 @@
$content[] = array
(
'name'
=> $entry['name'],
- 'link_value'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiconfig.edit_value&type_id='
. $type_id . '&attrib_id=' . $entry['id'] . '&id=' . $entry['value_id']),
- 'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiconfig.edit_attrib&type_id='
. $entry['type_id'] . '&attrib_id=' . $entry['id']),
- 'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiconfig.delete_attrib&type_id='
. $entry['type_id'] . '&attrib_id=' . $entry['id']),
+ 'link_value'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiconfig.edit_value', 'type_id'=> $type_id, 'attrib_id'=>
$entry['id'], 'id'=> $entry['value_id'])),
+ 'link_edit'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiconfig.edit_attrib', 'type_id'=> $entry['type_id'],
'attrib_id'=> $entry['id'])),
+ 'link_delete'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiconfig.delete_attrib', 'type_id'=> $entry['type_id'],
'attrib_id'=> $entry['id'])),
'lang_edit_config_text'
=> lang('edit the config'),
'text_edit'
=> lang('edit'),
'text_delete'
=> lang('delete'),
@@ -390,8 +389,8 @@
'var' => 'name',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uiconfig.index',
-
'query' =>$this->query,
-
'cat_id' =>$this->cat_id,
+
'query' => $this->query,
+
'cat_id' => $this->cat_id,
'allrows' => $this->allrows)
)),
'lang_name' => lang('name'),
@@ -414,19 +413,19 @@
$link_data = array
(
'menuaction' =>
$this->currentapp.'.uiconfig.list_attrib',
- 'sort'
=>$this->sort,
- 'order'
=>$this->order,
- 'cat_id'
=>$this->cat_id,
- 'filter'
=>$this->filter,
- 'query'
=>$this->query,
- 'type_id'
=>$type_id
+ 'sort' => $this->sort,
+ 'order' => $this->order,
+ 'cat_id' => $this->cat_id,
+ 'filter' => $this->filter,
+ 'query' => $this->query,
+ 'type_id' => $type_id
);
$table_add[] = array
(
'lang_add' => lang('add'),
'lang_add_statustext' => lang('add a value'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiconfig.edit_attrib&type_id='
. $type_id),
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiconfig.edit_attrib', 'type_id'=> $type_id)),
);
$msgbox_data = $this->bocommon->msgbox_data($receipt);
@@ -455,7 +454,6 @@
);
$appname =
lang('config');
-;
$function_msg =
lang('list attribute');
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
@@ -505,13 +503,13 @@
if ($values['save'])
{
$GLOBALS['phpgw']->session->appsession('session_data','sms_c_attrib_receipt',$receipt);
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiconfig.list_attrib&type_id='
. $type_id);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uiconfig.list_attrib', 'type_id'=> $type_id));
}
}
}
else
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiconfig.list_attrib&type_id='
. $type_id);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uiconfig.list_attrib', 'type_id'=> $type_id));
}
}
@@ -560,7 +558,7 @@
'lang_input_type' => lang('input
type'),
'input_type_list' =>
$this->bo->select_input_type_list($values['input_type']),
'lang_no_input_type' => lang('no
input type'),
- 'lang_lang_input_type_status_text'=>
lang('input type'),
+ 'lang_lang_input_type_status_text' =>
lang('input type'),
'lang_choice' =>
lang('Choice'),
'lang_new_value' =>
lang('New value'),
@@ -569,7 +567,7 @@
'value_choice' =>
$values['choice'],
'lang_delete_value' =>
lang('Delete value'),
'lang_value' =>
lang('value'),
- 'lang_delete_choice_statustext'=> lang('Delete
this value from the list of multiple choice'),
+ 'lang_delete_choice_statustext' =>
lang('Delete this value from the list of multiple choice'),
'msgbox_data' =>
$GLOBALS['phpgw']->common->msgbox($msgbox_data),
'form_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
@@ -607,7 +605,7 @@
if(!$type_id && !$attrib_id)
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiconfig.index');
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uiconfig.index'));
}
$GLOBALS['phpgw']->xslttpl->add_file(array('config','nextmatchs','menu',
@@ -626,9 +624,9 @@
$content[] = array
(
'value'
=> $entry['value'],
- 'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiconfig.edit_value&type_id='
. $entry['type_id'] . '&attrib_id=' . $entry['attrib_id'] . '&id=' .
$entry['id']),
- 'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiconfig.delete_value&type_id='
. $entry['type_id'] . '&attrib_id=' . $entry['attrib_id'] . '&id=' .
$entry['id']),
- 'link_view'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiconfig.view_value&type_id='
. $entry['type_id'] . '&attrib_id=' . $entry['attrib_id'] . '&id=' .
$entry['id']),
+ 'link_edit'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiconfig.edit_value', 'type_id'=> $entry['type_id'],
'attrib_id'=> $entry['attrib_id'], 'id'=> $entry['id'])),
+ 'link_delete'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiconfig.delete_value', 'type_id'=> $entry['type_id'],
'attrib_id'=> $entry['attrib_id'], 'id'=> $entry['id'])),
+ 'link_view'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiconfig.view_value', 'type_id'=> $entry['type_id'],
'attrib_id'=> $entry['attrib_id'], 'id'=> $entry['id'])),
'lang_view_config_text'
=> lang('view the config'),
'lang_edit_config_text'
=> lang('edit the config'),
'text_view'
=> lang('view'),
@@ -651,8 +649,8 @@
'var' => 'value',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uiconfig.index',
-
'query' =>$this->query,
-
'cat_id' =>$this->cat_id,
+
'query' => $this->query,
+
'cat_id' => $this->cat_id,
'allrows' => $this->allrows)
)),
'lang_value' => lang('value'),
@@ -677,13 +675,13 @@
$link_data = array
(
'menuaction' =>
$this->currentapp.'.uiconfig.list_value',
- 'sort'
=>$this->sort,
- 'order'
=>$this->order,
- 'cat_id'
=>$this->cat_id,
- 'filter'
=>$this->filter,
- 'query'
=>$this->query,
- 'type_id'
=>$type_id,
- 'attrib_id'
=>$attrib_id
+ 'sort' => $this->sort,
+ 'order' => $this->order,
+ 'cat_id' => $this->cat_id,
+ 'filter' => $this->filter,
+ 'query' => $this->query,
+ 'type_id' => $type_id,
+ 'attrib_id' => $attrib_id
);
if(!$content)
@@ -692,7 +690,7 @@
(
'lang_add' => lang('add'),
'lang_add_statustext' => lang('add a
value'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiconfig.edit_value&type_id='
. $type_id . '&attrib_id=' . $attrib_id),
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiconfig.edit_value', 'type_id'=> $type_id, 'attrib_id'=>
$attrib_id)),
);
}
@@ -700,7 +698,7 @@
$data = array
(
- 'link_type'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiconfig.list_attrib&type_id='
. $type_id),
+ 'link_type'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiconfig.list_attrib', 'type_id'=> $type_id)),
'lang_type'
=> lang('type'),
'value_type_name'
=> $type['name'],
'lang_attrib'
=> lang('attribute'),
@@ -778,13 +776,13 @@
if ($values['save'])
{
$GLOBALS['phpgw']->session->appsession('session_data','sms_c_attrib_receipt',$receipt);
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiconfig.list_attrib&type_id='
. $type_id . '&attrib_id=' . $attrib_id);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uiconfig.list_attrib', 'type_id'=> $type_id, 'attrib_id'=>
$attrib_id));
}
}
}
else
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiconfig.list_attrib&type_id='
. $type_id . '&attrib_id=' . $attrib_id);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uiconfig.list_attrib', 'type_id'=> $type_id, 'attrib_id'=>
$attrib_id));
}
}
@@ -834,7 +832,7 @@
'lang_value' =>
lang('value'),
'choice_list' => $choice_list,
'lang_no_value' => lang('no value'),
- 'lang_value_status_text'=> lang('select value'),
+ 'lang_value_status_text' => lang('select
value'),
'msgbox_data' =>
$GLOBALS['phpgw']->common->msgbox($msgbox_data),
'form_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
@@ -888,7 +886,7 @@
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
- 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiconfig.delete_type&type_id='
. $type_id),
+ 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiconfig.delete_type', 'type_id'=> $type_id)),
'lang_confirm_msg' => lang('do you
really want to delete this entry'),
'lang_yes' =>
lang('yes'),
'lang_yes_statustext' => lang('Delete the
entry'),
@@ -934,7 +932,7 @@
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
- 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiconfig.delete_type&type_id='
. $type_id . '&attrib_id=' . $attrib_id),
+ 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiconfig.delete_type','type_id'=> $type_id, 'attrib_id'=>
$attrib_id)),
'lang_confirm_msg' => lang('do you
really want to delete this entry'),
'lang_yes' =>
lang('yes'),
'lang_yes_statustext' => lang('Delete the
entry'),
@@ -983,7 +981,7 @@
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
- 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiconfig.delete_type&type_id='
. $type_id . '&attrib_id=' . $attrib_id . '&id=' . $id),
+ 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiconfig.delete_type', 'type_id'=> $type_id, 'attrib_id'=>
$attrib_id, 'id'=> $id)),
'lang_confirm_msg' => lang('do you
really want to delete this entry'),
'lang_yes' => lang('yes'),
'lang_yes_statustext' => lang('Delete
the entry'),
Index: inc/class.uisms.inc.php
===================================================================
RCS file: /sources/phpgroupware/sms/inc/class.uisms.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- inc/class.uisms.inc.php 20 Jun 2006 07:40:30 -0000 1.13
+++ inc/class.uisms.inc.php 15 Sep 2006 13:28:09 -0000 1.14
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package sms
* @subpackage sms
- * @version $Id: class.uisms.inc.php,v 1.13 2006/06/20 07:40:30 sigurdne
Exp $
+ * @version $Id: class.uisms.inc.php,v 1.14 2006/09/15 13:28:09 sigurdne
Exp $
*/
/**
@@ -100,14 +100,14 @@
{
if($this->bocommon->check_perms($entry['grants'], PHPGW_ACL_DELETE))
{
- $link_delete =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uisms.delete_in&id='
. $entry['id']);
+ $link_delete =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uisms.delete_in', 'id'=> $entry['id']));
$text_delete =
lang('delete');
$lang_delete_sms_text = lang('delete
the sms from inbox');
}
if($add_right)
{
- $link_answer =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uisms.send&p_num='
. $entry['sender']);
+ $link_answer =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uisms.send' ,'p_num'=> $entry['sender']));
$text_answer =
lang('answer');
$lang_answer_sms_text = lang('answer
this sms');
}
@@ -165,7 +165,7 @@
'lang_id' => lang('id'),
'lang_user' => lang('user'),
'lang_sender' => lang('sender'),
- 'lang_entry_time'=> lang('time'),
+ 'lang_entry_time' => lang('time'),
'lang_message' => lang('message'),
'lang_answer' => lang('answer'),
);
@@ -182,11 +182,11 @@
$link_data = array
(
'menuaction' =>
$this->currentapp.'.uisms.index',
- 'sort'
=>$this->sort,
- 'order'
=>$this->order,
- 'cat_id'
=>$this->cat_id,
- 'filter'
=>$this->filter,
- 'query'
=>$this->query
+ 'sort' => $this->sort,
+ 'order' => $this->order,
+ 'cat_id' => $this->cat_id,
+ 'filter' => $this->filter,
+ 'query' => $this->query
);
@@ -197,10 +197,10 @@
(
'lang_send' =>
lang('Send text SMS'),
'lang_send_statustext' =>
lang('send single'),
- 'send_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uisms.send&from=index'),
+ 'send_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uisms.send', 'from'=>'index')),
'lang_send_group' =>
lang('Send broadcast SMS'),
'lang_send_group_statustext' =>
lang('send group'),
- 'send_group_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uisms.send_group&from=index'),
+ 'send_group_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uisms.send_group', 'from'=>'index')),
);
}
@@ -262,7 +262,7 @@
{
if($this->bocommon->check_perms($entry['grants'], PHPGW_ACL_DELETE))
{
- $link_delete =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uisms.delete_out&id='
. $entry['id']);
+ $link_delete =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uisms.delete_out', 'id'=> $entry['id']));
$text_delete =
lang('delete');
$lang_delete_sms_text = lang('delete
the sms from outbox');
}
@@ -298,15 +298,15 @@
'var' => 'p_datetime',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uisms.outbox',
-
'query' =>$this->query,
-
'cat_id' =>$this->cat_id,
+
'query' => $this->query,
+
'cat_id' => $this->cat_id,
'allrows' => $this->allrows)
)),
'lang_delete' => lang('delete'),
'lang_id' => lang('id'),
'lang_user' => lang('user'),
'lang_group' => lang('group'),
- 'lang_entry_time'=> lang('time'),
+ 'lang_entry_time' => lang('time'),
'lang_status' => lang('status'),
'lang_receiver' => lang('receiver'),
'lang_message' => lang('message'),
@@ -324,11 +324,11 @@
$link_data = array
(
'menuaction' =>
$this->currentapp.'.uisms.outbox',
- 'sort'
=>$this->sort,
- 'order'
=>$this->order,
- 'cat_id'
=>$this->cat_id,
- 'filter'
=>$this->filter,
- 'query'
=>$this->query
+ 'sort' => $this->sort,
+ 'order' => $this->order,
+ 'cat_id' => $this->cat_id,
+ 'filter' => $this->filter,
+ 'query' => $this->query
);
@@ -338,10 +338,10 @@
(
'lang_send' =>
lang('Send text SMS'),
'lang_send_statustext' =>
lang('send single'),
- 'send_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uisms.send&from=outbox'),
+ 'send_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uisms.send', 'from'=>'outbox')),
'lang_send_group' =>
lang('Send broadcast SMS'),
'lang_send_group_statustext' =>
lang('send group'),
- 'send_group_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uisms.send_group&from=outbox'),
+ 'send_group_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uisms.send_group', 'from'=>'outbox')),
);
}
@@ -427,13 +427,13 @@
if ($values['save'])
{
$GLOBALS['phpgw']->session->appsession('session_data','sms_send_receipt',$receipt);
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uisms.'
. $from);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uisms.' . $from));
}
}
}
else
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uisms.'
. $from);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uisms.' . $from));
}
}
@@ -564,7 +564,7 @@
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
- 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uisms.delete_in&id='
. $id),
+ 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uisms.delete_in', 'id'=> $id)),
'lang_confirm_msg' => lang('do you
really want to delete this entry'),
'lang_yes' => lang('yes'),
'lang_yes_statustext' => lang('Delete
the entry'),
@@ -608,7 +608,7 @@
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
- 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uisms.delete_out&id='
. $id),
+ 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uisms.delete_out', 'id'=> $id)),
'lang_confirm_msg' => lang('do you
really want to delete this entry'),
'lang_yes' => lang('yes'),
'lang_yes_statustext' => lang('Delete
the entry'),
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] sms index.php inc/class.menu.inc.php inc/class....,
Sigurd Nes <=