[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] sms inc/class.uiautoreply.inc.php inc/class.uib...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] sms inc/class.uiautoreply.inc.php inc/class.uib... |
|
Date: |
Sat, 16 Sep 2006 14:05:03 +0000 |
CVSROOT: /sources/phpgroupware
Module name: sms
Changes by: Sigurd Nes <sigurdne> 06/09/16 14:05:03
Modified files:
inc : class.uiautoreply.inc.php class.uiboard.inc.php
class.uicommand.inc.php class.uicustom.inc.php
class.uipoll.inc.php
setup : default_records.inc.php tables_update.inc.php
Log message:
link
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/sms/inc/class.uiautoreply.inc.php?cvsroot=phpgroupware&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/sms/inc/class.uiboard.inc.php?cvsroot=phpgroupware&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/sms/inc/class.uicommand.inc.php?cvsroot=phpgroupware&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/sms/inc/class.uicustom.inc.php?cvsroot=phpgroupware&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/sms/inc/class.uipoll.inc.php?cvsroot=phpgroupware&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/sms/setup/default_records.inc.php?cvsroot=phpgroupware&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/sms/setup/tables_update.inc.php?cvsroot=phpgroupware&r1=1.8&r2=1.9
Patches:
Index: inc/class.uiautoreply.inc.php
===================================================================
RCS file: /sources/phpgroupware/sms/inc/class.uiautoreply.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- inc/class.uiautoreply.inc.php 18 Jun 2006 14:49:41 -0000 1.3
+++ inc/class.uiautoreply.inc.php 16 Sep 2006 14:05:03 -0000 1.4
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package sms
* @subpackage autoreply
- * @version $Id: class.uiautoreply.inc.php,v 1.3 2006/06/18 14:49:41
sigurdne Exp $
+ * @version $Id: class.uiautoreply.inc.php,v 1.4 2006/09/16 14:05:03
sigurdne Exp $
*/
/**
@@ -31,10 +31,8 @@
'delete_scenario' => true
);
-
function uiautoreply()
{
-
$this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
$this->nextmatchs =
CreateObject('phpgwapi.nextmatchs');
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
@@ -92,7 +90,7 @@
if($this->bocommon->check_perms($entry['grants'], PHPGW_ACL_DELETE))
{
- $link_delete =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiautoreply.delete&autoreply_id='
. $entry['id']);
+ $link_delete =
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uiautoreply.delete', 'autoreply_id'=> $entry['id']));
$text_delete =
lang('delete');
$lang_delete_text = lang('delete
the autoreply code');
}
@@ -101,9 +99,9 @@
(
'code'
=> $entry['code'],
'user'
=> $GLOBALS['phpgw']->accounts->id2name($entry['uid']),
- 'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiautoreply.manage&autoreply_id='
. $entry['id']),
+ 'link_edit'
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uiautoreply.manage', 'autoreply_id'=> $entry['id'])),
'link_delete'
=> $link_delete,
-// 'link_view'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiautoreply.view&autoreply_id='
. $entry['id']),
+// 'link_view'
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uiautoreply.view&', 'autoreply_id'=> $entry['id'])),
// 'lang_view_config_text'
=> lang('view the config'),
'lang_edit_config_text'
=> lang('manage the autoreply code'),
// 'text_view'
=> lang('view'),
@@ -127,8 +125,8 @@
'var' => 'autoreply_code',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uiautoreply.index',
-
'query' =>$this->query,
-
'cat_id' =>$this->cat_id,
+
'query' => $this->query,
+
'cat_id' => $this->cat_id,
'allrows' => $this->allrows)
)),
'lang_code' => lang('code'),
@@ -150,11 +148,11 @@
$link_data = array
(
'menuaction' =>
$this->currentapp.'.uiautoreply.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
);
// if($this->acl->check($this->acl_location,
PHPGW_ACL_ADD))
@@ -163,7 +161,7 @@
(
'lang_add' => lang('add'),
'lang_add_statustext' => lang('add a
autoreply'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiautoreply.add'),
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uiautoreply.add')),
);
}
@@ -196,67 +194,6 @@
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list' => $data));
$this->save_sessiondata();
-
-
-
-//---------------------
-
-/* $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('SMS').' - '.lang('List/Manage/Delete SMS autoreplies');
- $GLOBALS['phpgw']->common->phpgw_header();
-
- echo parse_navbar();
-
- $err = urldecode(get_var('err',array('POST','GET')));
-
- if ($err)
- {
- $content = "<p><font color=red>$err</font><p>";
- }
-
- $add_data = array('menuaction' =>
$this->currentapp.'.uiautoreply.add');
- $add_url =
$GLOBALS['phpgw']->link('/index.php',$add_data);
-
- $content .= "
- <p>
- <a href=\"$add_url\">[ Add SMS autoreply ]</a>
- <p>
- ";
- if (!$this->acl->check('run', PHPGW_ACL_READ,'admin'))
- {
- $query_user_only = "WHERE uid='" . $this->account
."'";
- }
-
- $sql = "SELECT * FROM phpgw_sms_featAutoreply
$query_user_only ORDER BY autoreply_code";
- $this->db->query($sql,__LINE__,__FILE__);
-
-
- while ($this->db->next_record())
- {
- $owner =
$GLOBALS['phpgw']->accounts->id2name($this->db->f('uid'));
-
- $content .= "[<a href=" .
$GLOBALS['phpgw']->link('/index.php','menuaction=sms.uiautoreply.manage&autoreply_id='
. $this->db->f('autoreply_id')) . ">m</a>] ";
- $content .= "[<a href=" .
$GLOBALS['phpgw']->link('/index.php','menuaction=sms.uiautoreply.delete&autoreply_id='
. $this->db->f('autoreply_id')) . ">x</a>] ";
- $content .= " <b>Code:</b> " .
$this->db->f('autoreply_code') . " <b>User:</b> $owner<br><br>";
- }
-
-
- $content .= "
- <p>
- <a href=\"$add_url\">[ Add SMS autoreply ]</a>
- ";
-
- $done_data = array(
- 'menuaction' =>
$this->currentapp.'.uiconfig.index');
-
- $done_url =
$GLOBALS['phpgw']->link('/index.php',$done_data);
-
- $content .= "
- <p><li>
- <a href=\"$done_url\">Back</a>
- <p>
- ";
- echo $content;
-*/
}
function add()
@@ -748,8 +685,8 @@
$list_of_param .=
$this->db->f("autoreply_scenario_param$i")." ";
}
- $content .= "[<a href=" .
$GLOBALS['phpgw']->link('/index.php','menuaction=sms.uiautoreply.edit_scenario&autoreply_id='
. $this->db->f('autoreply_id') . '&autoreply_scenario_id='
.$this->db->f('autoreply_scenario_id')) . ">e</a>] ";
- $content .= "[<a href=" .
$GLOBALS['phpgw']->link('/index.php','menuaction=sms.uiautoreply.delete_scenario&autoreply_id='
. $this->db->f('autoreply_id') . '&autoreply_scenario_id=' .
$this->db->f('autoreply_scenario_id')) . ">x</a>] ";
+ $content .= "[<a href=" .
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'sms.uiautoreply.edit_scenario', 'autoreply_id'=> $this->db->f('autoreply_id'),
'autoreply_scenario_id'=> $this->db->f('autoreply_scenario_id'))) . ">e</a>] ";
+ $content .= "[<a href=" .
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'sms.uiautoreply.delete_scenario', 'autoreply_id'=>
$this->db->f('autoreply_id'), 'autoreply_scenario_id'=>
$this->db->f('autoreply_scenario_id'))) . ">x</a>] ";
$content .= " <b>Param:</b>
".$list_of_param." <br><b>Return:</b>
".$this->db->f('autoreply_scenario_result')." <b>User:</b>
$owner<br><br>";
}
$content .= "
@@ -831,7 +768,7 @@
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
- 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiautoreply.delete&autoreply_id='
. $autoreply_id),
+ 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uiautoreply.delete', 'autoreply_id'=> $autoreply_id)),
'lang_confirm_msg' => lang('do you
really want to delete this entry'),
'lang_yes' =>
lang('yes'),
'lang_yes_statustext' => lang('Delete the
entry'),
@@ -901,7 +838,7 @@
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
- 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiautoreply.delete_scenario&autoreply_id='
. $autoreply_id . '&autoreply_scenario_id=' . $autoreply_scenario_id),
+ 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uiautoreply.delete_scenario', 'autoreply_id'=>
$autoreply_id, 'autoreply_scenario_id'=> $autoreply_scenario_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.uiboard.inc.php
===================================================================
RCS file: /sources/phpgroupware/sms/inc/class.uiboard.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- inc/class.uiboard.inc.php 18 Jun 2006 14:49:41 -0000 1.3
+++ inc/class.uiboard.inc.php 16 Sep 2006 14:05:03 -0000 1.4
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package sms
* @subpackage board
- * @version $Id: class.uiboard.inc.php,v 1.3 2006/06/18 14:49:41
sigurdne Exp $
+ * @version $Id: class.uiboard.inc.php,v 1.4 2006/09/16 14:05:03
sigurdne Exp $
*/
/**
@@ -96,9 +96,9 @@
while ($this->db->next_record())
{
$owner =
$GLOBALS['phpgw']->accounts->id2name($this->db->f('uid'));
- $content .= "[<a href=" .
$GLOBALS['phpgw']->link('/index.php','menuaction=sms.uiboard.view&board_id=' .
$this->db->f('board_id')) . ">v</a>] ";
- $content .= "[<a href=" .
$GLOBALS['phpgw']->link('/index.php','menuaction=sms.uiboard.edit&board_id=' .
$this->db->f('board_id')) . ">e</a>] ";
- $content .= "[<a href=" .
$GLOBALS['phpgw']->link('/index.php','menuaction=sms.uiboard.delete&board_id='
. $this->db->f('board_id')) . ">x</a>] ";
+ $content .= "[<a href=" .
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=> 'sms.uiboard.view',
'board_id'=> $this->db->f('board_id'))) . ">v</a>] ";
+ $content .= "[<a href=" .
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=> 'sms.uiboard.edit',
'board_id'=> $this->db->f('board_id'))) . ">e</a>] ";
+ $content .= "[<a href=" .
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
'sms.uiboard.delete', 'board_id'=> $this->db->f('board_id'))) . ">x</a>] ";
$content .= "<b>Code:</b> " .
$this->db->f('board_code') . " <b>Forward:</b> " .
stripslashes($this->db->f('board_forward_email')) . " <b>User:</b>
$owner<br>";
}
@@ -501,7 +501,7 @@
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
- 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiboard.delete&board_id='
. $board_id),
+ 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uiboard.delete', 'board_id'=> $board_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.uicommand.inc.php
===================================================================
RCS file: /sources/phpgroupware/sms/inc/class.uicommand.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- inc/class.uicommand.inc.php 21 Jun 2006 08:01:37 -0000 1.4
+++ inc/class.uicommand.inc.php 16 Sep 2006 14:05:03 -0000 1.5
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package sms
* @subpackage command
- * @version $Id: class.uicommand.inc.php,v 1.4 2006/06/21 08:01:37
sigurdne Exp $
+ * @version $Id: class.uicommand.inc.php,v 1.5 2006/09/16 14:05:03
sigurdne Exp $
*/
/**
@@ -89,7 +89,7 @@
if($this->bocommon->check_perms($entry['grants'], PHPGW_ACL_DELETE))
{
- $link_delete =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uicommand.delete&command_id='
. $entry['id']);
+ $link_delete =
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uicommand.delete', 'command_id'=> $entry['id']));
$text_delete =
lang('delete');
$lang_delete_text = lang('delete
the command code');
}
@@ -99,9 +99,9 @@
'code'
=> $entry['code'],
'exec'
=> $entry['exec'],
'user'
=> $GLOBALS['phpgw']->accounts->id2name($entry['uid']),
- 'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uicommand.edit_command&command_id='
. $entry['id']),
+ 'link_edit'
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uicommand.edit_command', 'command_id'=> $entry['id'])),
'link_delete'
=> $link_delete,
-// 'link_view'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uicommand.view&command_id='
. $entry['id']),
+// 'link_view'
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uicommand.view', 'command_id'=> $entry['id'])),
// 'lang_view_config_text'
=> lang('view the config'),
'lang_edit_config_text'
=> lang('manage the command code'),
// 'text_view'
=> lang('view'),
@@ -125,8 +125,8 @@
'var' => 'command_code',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uicommand.index',
-
'query' =>$this->query,
-
'cat_id' =>$this->cat_id,
+
'query' => $this->query,
+
'cat_id' => $this->cat_id,
'allrows' => $this->allrows)
)),
'lang_code' => lang('code'),
@@ -149,11 +149,11 @@
$link_data = array
(
'menuaction' =>
$this->currentapp.'.uicommand.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
);
// if($this->acl->check($this->acl_location,
PHPGW_ACL_ADD))
@@ -162,7 +162,7 @@
(
'lang_add' => lang('add'),
'lang_add_statustext' => lang('add a
command'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uicommand.edit_command'),
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uicommand.edit_command')),
);
}
@@ -270,13 +270,13 @@
if ($values['save'])
{
$GLOBALS['phpgw']->session->appsession('session_data','sms_command_receipt',$receipt);
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uicommand.index&command_id='
. $command_id);
+
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction'=>
$this->currentapp.'.uicommand.index', 'command_id'=> $command_id));
}
}
}
else
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uicommand.index&command_id='
. $command_id);
+
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction'=>
$this->currentapp.'.uicommand.index', 'command_id'=> $command_id));
}
}
@@ -367,7 +367,7 @@
if($this->bocommon->check_perms($entry['grants'], PHPGW_ACL_DELETE))
{
- $link_delete =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uicommand.delete&command_id='
. $entry['id']);
+ $link_delete =
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uicommand.delete', 'command_id'=> $entry['id']));
$text_delete =
lang('delete');
$lang_delete_text = lang('delete
the command code');
}
@@ -409,8 +409,8 @@
'var' => 'sms_sender',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uicommand.log',
-
'query' =>$this->query,
-
'cat_id' =>$this->cat_id,
+
'query' => $this->query,
+
'cat_id' => $this->cat_id,
'allrows' => $this->allrows)
)),
@@ -420,8 +420,8 @@
'var' => 'command_log_id',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uicommand.log',
-
'query' =>$this->query,
-
'cat_id' =>$this->cat_id,
+
'query' => $this->query,
+
'cat_id' => $this->cat_id,
'allrows' => $this->allrows)
)),
@@ -445,11 +445,11 @@
$link_data = array
(
'menuaction' =>
$this->currentapp.'.uicommand.log',
- '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
);
$msgbox_data = $this->bocommon->msgbox_data($receipt);
@@ -544,7 +544,7 @@
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
- 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uicommand.delete&command_id='
. $command_id),
+ 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uicommand.delete', 'command_id'=> $command_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.uicustom.inc.php
===================================================================
RCS file: /sources/phpgroupware/sms/inc/class.uicustom.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- inc/class.uicustom.inc.php 18 Jun 2006 14:49:41 -0000 1.3
+++ inc/class.uicustom.inc.php 16 Sep 2006 14:05:03 -0000 1.4
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package sms
* @subpackage custom
- * @version $Id: class.uicustom.inc.php,v 1.3 2006/06/18 14:49:41
sigurdne Exp $
+ * @version $Id: class.uicustom.inc.php,v 1.4 2006/09/16 14:05:03
sigurdne Exp $
*/
/**
@@ -95,8 +95,8 @@
while ($this->db->next_record())
{
$owner =
$GLOBALS['phpgw']->accounts->id2name($this->db->f('uid'));
- $content .= "[<a href=" .
$GLOBALS['phpgw']->link('/index.php','menuaction=sms.uicustom.edit&custom_id='
. $this->db->f('custom_id')) . ">e</a>] ";
- $content .= "[<a href=" .
$GLOBALS['phpgw']->link('/index.php','menuaction=sms.uicustom.delete&custom_id='
. $this->db->f('custom_id')) . ">x</a>] ";
+ $content .= "[<a href=" .
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=> 'sms.uicustom.edit'
, 'custom_id'=> $this->db->f('custom_id'))) . ">e</a>] ";
+ $content .= "[<a href=" .
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
'sms.uicustom.delete', 'custom_id'=> $this->db->f('custom_id'))) . ">x</a>] ";
$content .= "<b>Code:</b> " .
$this->db->f('custom_code') . " <b>User:</b>
$owner<br><b>URL:</b><br>" . stripslashes($this->db->f('custom_url')) .
"<br><br>";
}
@@ -413,7 +413,7 @@
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
- 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uicustom.delete&custom_id='
. $custom_id),
+ 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uicustom.delete', 'custom_id'=> $custom_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.uipoll.inc.php
===================================================================
RCS file: /sources/phpgroupware/sms/inc/class.uipoll.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- inc/class.uipoll.inc.php 18 Jun 2006 14:49:41 -0000 1.2
+++ inc/class.uipoll.inc.php 16 Sep 2006 14:05:03 -0000 1.3
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package sms
* @subpackage polls
- * @version $Id: class.uipoll.inc.php,v 1.2 2006/06/18 14:49:41 sigurdne
Exp $
+ * @version $Id: class.uipoll.inc.php,v 1.3 2006/09/16 14:05:03 sigurdne
Exp $
*/
/**
@@ -44,7 +44,7 @@
$this->sms =
CreateObject($this->currentapp.'.sms');
$this->acl =
CreateObject('phpgwapi.acl');
$this->acl_location = '.poll';
- $this->menu->sub
=$this->acl_location;
+ $this->menu->sub =
$this->acl_location;
$this->start =
$this->bo->start;
$this->query =
$this->bo->query;
$this->sort =
$this->bo->sort;
@@ -94,7 +94,7 @@
{
if($this->bocommon->check_perms($entry['grants'], PHPGW_ACL_DELETE))
{
- $link_delete =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipoll.delete&poll_id='
. $entry['id']);
+ $link_delete =
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uipoll.delete', 'poll_id'=> $entry['id']));
$text_delete =
lang('delete');
$lang_delete_text = lang('delete
the poll code');
}
@@ -114,9 +114,9 @@
'title'
=> $entry['title'],
'status'
=> $status,
'user'
=> $GLOBALS['phpgw']->accounts->id2name($entry['uid']),
- 'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipoll.edit&poll_id='
. $entry['id']),
+ 'link_edit'
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uipoll.edit', 'poll_id'=> $entry['id'])),
'link_delete'
=> $link_delete,
- 'link_view'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipoll.view&poll_id='
. $entry['id']),
+ 'link_view'
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uipoll.view', 'poll_id'=> $entry['id'])),
'lang_view_config_text'
=> lang('view the config'),
'lang_edit_config_text'
=> lang('manage the poll code'),
'text_view'
=> lang('view'),
@@ -140,8 +140,8 @@
'var' => 'poll_code',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uipoll.index',
-
'query' =>$this->query,
-
'cat_id' =>$this->cat_id,
+
'query' => $this->query,
+
'cat_id' => $this->cat_id,
'allrows' => $this->allrows)
)),
'lang_code' => lang('code'),
@@ -165,11 +165,11 @@
$link_data = array
(
'menuaction' =>
$this->currentapp.'.uipoll.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
);
// if($this->acl->check($this->acl_location,
PHPGW_ACL_ADD))
@@ -178,7 +178,7 @@
(
'lang_add' => lang('add'),
'lang_add_statustext' => lang('add a
poll'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipoll.add'),
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uipoll.add')),
);
}
@@ -316,7 +316,8 @@
$error_string = "You must fill all fields!";
}
- $add_data = array(
+ $add_data = array
+ (
'menuaction' => $this->currentapp.'.uipoll.'
. $target,
'err' => urlencode($error_string)
);
@@ -488,13 +489,15 @@
$choice_id = $this->db->f('choice_id');
$choice_code = $this->db->f('choice_code');
$choice_title = $this->db->f('choice_title');
- $content .= "[<a href=" .
$GLOBALS['phpgw']->link('/index.php',"menuaction=sms.uipoll.delete_choice&poll_id=$poll_id&choice_id=$choice_id")
. ">x</a>] ";
+ $content .= "[<a href=" .
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'sms.uipoll.delete_choice', 'poll_id'=> $poll_id, 'choice_id'=> $choice_id)) .
">x</a>] ";
$content .= "<b>Code:</b> $choice_code
<b>Title:</b> $choice_title<br>";
}
- $add_data = array('menuaction' =>
$this->currentapp.'.uipoll.add_choice',
+ $add_data = array(
+ 'menuaction' =>
$this->currentapp.'.uipoll.add_choice',
'poll_id' => $poll_id,
);
+
$add_url =
$GLOBALS['phpgw']->link('/index.php',$add_data);
@@ -765,7 +768,7 @@
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
- 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipoll.delete&poll_id='
. $poll_id),
+ 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uipoll.delete', 'poll_id'=> $poll_id)),
'lang_confirm_msg' => lang('do you
really want to delete this entry'),
'lang_yes' =>
lang('yes'),
'lang_yes_statustext' => lang('Delete the
entry'),
@@ -837,7 +840,7 @@
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
- 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipoll.delete_choice&poll_id='
. $poll_id . '&choice_id=' . $choice_id),
+ 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uipoll.delete_choice', 'poll_id'=> $poll_id, 'choice_id'=>
$choice_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: setup/default_records.inc.php
===================================================================
RCS file: /sources/phpgroupware/sms/setup/default_records.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- setup/default_records.inc.php 31 May 2006 12:42:46 -0000 1.8
+++ setup/default_records.inc.php 16 Sep 2006 14:05:03 -0000 1.9
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package sms
* @subpackage setup
- * @version $Id: default_records.inc.php,v 1.8 2006/05/31 12:42:46
sigurdne Exp $
+ * @version $Id: default_records.inc.php,v 1.9 2006/09/16 14:05:03
sigurdne Exp $
*/
@@ -22,6 +22,11 @@
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_acl_location
(appname,id, descr) VALUES ('sms', '.', 'Top')");
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_acl_location
(appname,id, descr, allow_grant) VALUES ('sms', '.inbox', 'InBox',1)");
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_acl_location
(appname,id, descr, allow_grant) VALUES ('sms', '.outbox', 'OutBox',1)");
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_acl_location
(appname,id, descr) VALUES ('sms', '.autoreply', 'Autoreply')");
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_acl_location
(appname,id, descr) VALUES ('sms', '.board', 'Board')");
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_acl_location
(appname,id, descr) VALUES ('sms', '.command', 'Command')");
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_acl_location
(appname,id, descr) VALUES ('sms', '.custom', 'Custom')");
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_acl_location
(appname,id, descr) VALUES ('sms', '.poll', 'Poll')");
// -- start config
Index: setup/tables_update.inc.php
===================================================================
RCS file: /sources/phpgroupware/sms/setup/tables_update.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- setup/tables_update.inc.php 18 Jun 2006 14:49:41 -0000 1.8
+++ setup/tables_update.inc.php 16 Sep 2006 14:05:03 -0000 1.9
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package sms
* @subpackage setup
- * @version $Id: tables_update.inc.php,v 1.8 2006/06/18 14:49:41
sigurdne Exp $
+ * @version $Id: tables_update.inc.php,v 1.9 2006/09/16 14:05:03
sigurdne Exp $
*/
/**
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] sms inc/class.uiautoreply.inc.php inc/class.uib...,
Sigurd Nes <=