[Fmsystem-commits] [8617] sms: config orgNr

[Sigurd Nes]

Revision: 8617
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8617
Author:   sigurdne
Date:     2012-01-19 11:54:32 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
sms: config orgNr

Modified Paths:
--------------
    trunk/sms/inc/plugin/gateway/bergen_kommune/get.php
    trunk/sms/inc/plugin/gateway/bergen_kommune/send.php
    trunk/sms/setup/tables_update.inc.php

Modified: trunk/sms/inc/plugin/gateway/bergen_kommune/get.php
===================================================================
--- trunk/sms/inc/plugin/gateway/bergen_kommune/get.php 2012-01-19 11:20:21 UTC 
(rev 8616)
+++ trunk/sms/inc/plugin/gateway/bergen_kommune/get.php 2012-01-19 11:54:32 UTC 
(rev 8617)
@@ -15,20 +15,8 @@
 
                function gw_set_incoming_action()
                {
-                       $kodeord = 'Bgok';
-                       $orgnr = '975621375';//BBB
-                       $orgnr = 'IKT Drift';//BBB
-
-                       $result = array();
-                       $sms_msg = utf8_decode($sms_msg);
-                       
-                       $sms_to = ltrim($sms_to, '+');
-                       
-                       if( strlen($sms_to) < 9)
-                       {
-                               $sms_to = "47{$sms_to}";
-                       }
-
+                       $kodeord = 'BBB';
+       
                        require_once 'SmsService.php';
 
                        $options=array();

Modified: trunk/sms/inc/plugin/gateway/bergen_kommune/send.php
===================================================================
--- trunk/sms/inc/plugin/gateway/bergen_kommune/send.php        2012-01-19 
11:20:21 UTC (rev 8616)
+++ trunk/sms/inc/plugin/gateway/bergen_kommune/send.php        2012-01-19 
11:54:32 UTC (rev 8617)
@@ -8,10 +8,9 @@
                        $this->sms_param = 
$GLOBALS['phpgw_info']['sms_config']['bergen_kommune'];
                }
 
-               function 
gw_send_sms($mobile_sender,$sms_sender,$sms_to,$sms_msg,$gp_code="",$uid="",$smslog_id="",$flash=false)
+               function 
gw_send_sms($mobile_sender,$sms_sender,$sms_to,$sms_msg,$gp_code="",$uid="",$smslog_id="",$flash=false,$orgnr='')
                {
-                       $orgnr = '975621375';//BBB
-                       $orgnr = 'IKT Drift';//BBB
+                       $orgnr = $orgnr ? $orgnr : $this->sms_param['orgnr'];
 
                        $result = array();
                        $sms_msg = utf8_decode($sms_msg);

Modified: trunk/sms/setup/tables_update.inc.php
===================================================================
--- trunk/sms/setup/tables_update.inc.php       2012-01-19 11:20:21 UTC (rev 
8616)
+++ trunk/sms/setup/tables_update.inc.php       2012-01-19 11:54:32 UTC (rev 
8617)
@@ -438,7 +438,6 @@
 
                $custom_config  = 
CreateObject('admin.soconfig',$GLOBALS['phpgw']->locations->get_id('sms', 
'run'));
 
-               // common
                $receipt_section_bergen = $custom_config->add_section(array
                        (
                                'name' => 'bergen_kommune',
@@ -494,8 +493,15 @@
                                'descr'                 => 'proxy_port'
                        )
                );
+               $receipt = $custom_config->add_attrib(array
+                       (
+                               'section_id'    => 
$receipt_section_bergen['section_id'],
+                               'input_type'    => 'text',
+                               'name'                  => 'orgnr',
+                               'descr'                 => 'orgnr'
+                       )
+               );
 
-
                
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_sms_tblsmsoutgoing','external_id',
                        array
                        (