[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] sms/inc class.sms.inc.php class.sosms.inc.php p...
From: |
Sigurd Nes |
Subject: |
[Phpgroupware-cvs] sms/inc class.sms.inc.php class.sosms.inc.php p... |
Date: |
Mon, 26 Feb 2007 22:21:08 +0000 |
CVSROOT: /sources/phpgroupware
Module name: sms
Changes by: Sigurd Nes <sigurdne> 07/02/26 22:21:07
Modified files:
inc : class.sms.inc.php class.sosms.inc.php
inc/plugin/gateway/gnokii: fn.php
Log message:
notice
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/sms/inc/class.sms.inc.php?cvsroot=phpgroupware&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/sms/inc/class.sosms.inc.php?cvsroot=phpgroupware&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/sms/inc/plugin/gateway/gnokii/fn.php?cvsroot=phpgroupware&r1=1.5&r2=1.6
Patches:
Index: class.sms.inc.php
===================================================================
RCS file: /sources/phpgroupware/sms/inc/class.sms.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- class.sms.inc.php 26 Feb 2007 13:41:48 -0000 1.22
+++ class.sms.inc.php 26 Feb 2007 22:21:07 -0000 1.23
@@ -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.sms.inc.php,v 1.22 2007/02/26 13:41:48 sigurdne
Exp $
+ * @version $Id: class.sms.inc.php,v 1.23 2007/02/26 22:21:07 sigurdne
Exp $
*/
/**
@@ -19,26 +19,26 @@
// _debug_array ($GLOBALS['phpgw_info']['sms_config']);
- $apps_path[base] = PHPGW_SERVER_ROOT . SEP . 'sms';
- $apps_path[libs] = "$apps_path[base]/lib";
- $apps_path[plug] = "$apps_path[base]/inc/plugin";
- $apps_path[inc] = "$apps_path[base]/inc";
+ $apps_path['base'] = PHPGW_SERVER_ROOT . SEP . 'sms';
+ $apps_path['libs'] = $apps_path['base'] . SEP . 'lib';
+ $apps_path['plug'] = $apps_path['base'] . SEP . 'inc' . SEP .
'plugin';
+ $apps_path['inc'] = $apps_path['base'] . SEP . 'inc';
// SMS command security parameter
- $feat_command_path[bin] = $apps_path[base]."/bin";
+ $feat_command_path['bin'] = $apps_path['base']."/bin";
$GLOBALS['phpgw_info']['sms_config']['common']['apps_path'] =
$apps_path;
$GLOBALS['phpgw_info']['sms_config']['common']['feat_command_path'] =
$feat_command_path;
- if(!$GLOBALS['phpgw_info']['sms_config']['common']['gateway_module'])
+
if(!isset($GLOBALS['phpgw_info']['sms_config']['common']['gateway_module']) ||
!$GLOBALS['phpgw_info']['sms_config']['common']['gateway_module'])
{
$path_to_sms = dirname(__FILE__);
include_once($path_to_sms . SEP . 'config.php');
}
- if (file_exists($apps_path[inc] . SEP . 'plugin' . SEP . 'gateway' .
SEP . $GLOBALS['phpgw_info']['sms_config']['common']['gateway_module'].
"/fn.php"))
+ if (file_exists($apps_path['inc'] . SEP . 'plugin' . SEP . 'gateway' .
SEP . $GLOBALS['phpgw_info']['sms_config']['common']['gateway_module'].
"/fn.php"))
{
- include_once($apps_path[inc] . SEP . 'plugin' . SEP . 'gateway'
. SEP. $GLOBALS['phpgw_info']['sms_config']['common']['gateway_module'].
"/fn.php");
+ include_once($apps_path['inc'] . SEP . 'plugin' . SEP .
'gateway' . SEP.
$GLOBALS['phpgw_info']['sms_config']['common']['gateway_module']. "/fn.php");
}
else
{
@@ -52,11 +52,11 @@
}
}
- class sms_
+ class sms_sms_
{
var $apps_path;
- function sms_()
+ function sms_sms_()
{
$this->apps_config =
$GLOBALS['phpgw_info']['sms_config']['common']['apps_config'];
$this->apps_path =
$GLOBALS['phpgw_info']['sms_config']['common']['apps_path'];
Index: class.sosms.inc.php
===================================================================
RCS file: /sources/phpgroupware/sms/inc/class.sosms.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- class.sosms.inc.php 27 Dec 2006 10:39:15 -0000 1.7
+++ class.sosms.inc.php 26 Feb 2007 22:21:07 -0000 1.8
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package hrm
* @subpackage place
- * @version $Id: class.sosms.inc.php,v 1.7 2006/12/27 10:39:15 sigurdne
Exp $
+ * @version $Id: class.sosms.inc.php,v 1.8 2007/02/26 22:21:07 sigurdne
Exp $
*/
/**
@@ -31,8 +31,8 @@
$this->db = clone($GLOBALS['phpgw']->db);
$this->db2 = clone($this->db);
- $this->left_join = $this->db->left_join;
- $this->join = $this->db->join;
+ $this->left_join = $this->bocommon->left_join;
+ $this->join = $this->bocommon->join;
$this->like = $this->db->like;
}
@@ -174,13 +174,12 @@
$public_user_list[] = $user;
}
reset($public_user_list);
- $filtermethod .= " $where ( $table.uid IN(" .
implode(',',$public_user_list) . "))";
+ $filtermethod = " $where ( $table.uid IN(" .
implode(',',$public_user_list) . "))";
$where= 'AND';
}
-
-
+ $querymethod = '';
if($query)
{
$query = ereg_replace("'",'',$query);
Index: plugin/gateway/gnokii/fn.php
===================================================================
RCS file: /sources/phpgroupware/sms/inc/plugin/gateway/gnokii/fn.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- plugin/gateway/gnokii/fn.php 27 Dec 2006 10:39:15 -0000 1.5
+++ plugin/gateway/gnokii/fn.php 26 Feb 2007 22:21:07 -0000 1.6
@@ -8,7 +8,7 @@
$this->db2 = clone($this->db);
$this->sms_sms_();
// $this->gnokii_param[name]=
$GLOBALS['phpgw_info']['sms_config']['common']['gateway_module'];
- $this->gnokii_param[path]=
$GLOBALS['phpgw_info']['sms_config']['gnokii']['gnokii_cfg'];
+ $this->gnokii_param['path']=
$GLOBALS['phpgw_info']['sms_config']['gnokii']['gnokii_cfg'];
}
function gw_customcmd()
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] sms/inc class.sms.inc.php class.sosms.inc.php p...,
Sigurd Nes <=