[Phpgroupware-cvs] sms ./init.php inc/config.php

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    sms
Branch:         
Changes by:     Sigurd Nes <address@hidden>     06/05/26 11:57:36

Modified files:
        .              : init.php 
        inc            : config.php 

Log message:
        no message

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/sms/init.php.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/sms/inc/config.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: sms/inc/config.php
diff -u sms/inc/config.php:1.2 sms/inc/config.php:1.3
--- sms/inc/config.php:1.2      Thu May 25 19:47:10 2006
+++ sms/inc/config.php  Fri May 26 11:57:36 2006
@@ -16,9 +16,9 @@
        //$GLOBALS['phpgw_info']['sms_config']['email_service'] = 
$config->config_data['email_service'];
        //$GLOBALS['phpgw_info']['sms_config']['email_footer'] = 
$config->config_data['email_footer'];
        //$GLOBALS['phpgw_info']['sms_config']['datetime_now'] = $datetime_now;
-       $GLOBALS['phpgw_info']['sms_config']['gateway_module'] = 
$config->config_data['common']['gateway_module'];
-       $GLOBALS['phpgw_info']['sms_config']['gateway_number'] = 
$config->config_data['common']['gateway_number'];
+       //$GLOBALS['phpgw_info']['sms_config']['gateway_module'] = 
$config->config_data['common']['gateway_module'];
+       //$GLOBALS['phpgw_info']['sms_config']['gateway_number'] = 
$config->config_data['common']['gateway_number'];
        //$GLOBALS['phpgw_info']['sms_config']['email_footer'] = 
$config->config_data['email_footer'];
-       $GLOBALS['phpgw_info']['sms_config']['gnokii_cfg'] = 
$config->config_data['gnokii_cfg'];
+       //$GLOBALS['phpgw_info']['sms_config']['gnokii_cfg'] = 
$config->config_data['gnokii_cfg'];
 
 ?>
Index: sms/init.php
diff -u sms/init.php:1.3 sms/init.php:1.4
--- sms/init.php:1.3    Tue May 16 19:45:49 2006
+++ sms/init.php        Fri May 26 11:57:36 2006
@@ -1,11 +1,5 @@
 <?php
 
-       // set global variable
-       $nd = "<font color=red>(*)</font>";
-
-       // very important, do not try to remove it or change it
-       define ("_SECURE_","1");
-
        $path_to_phpgroupware = dirname(__FILE__) . '/..';      // need to be 
adapted if this script is moved somewhere else
        $_GET['domain'] = isset($_SERVER['argv'][1]) ? $_SERVER['argv'][1] : 
'default';
 
@@ -18,17 +12,10 @@
        $db_type = $GLOBALS['phpgw_domain'][$_GET['domain']]['db_type'];
        $GLOBALS['phpgw_info']['server']['sessions_type'] = 'db';
        include(PHPGW_API_INC.'/functions.inc.php');
-
-       // SMTP sendmail
-       define("_SMTP_RELM_","");
-       define("_SMTP_USER_","");
-       define("_SMTP_PASS_","");
-       define("_SMTP_HOST_","localhost");
-       define("_SMTP_PORT_","25");
        
        // more configuration
        $apps_config['multilogin']      = 1; // 0 for single session login; 1 
for multi session login
-       $GLOBALS['phpgw_info']['sms_config']['apps_config'] = $apps_config;
+       $GLOBALS['phpgw_info']['sms_config']['common']['apps_config'] = 
$apps_config;
 
        include_once($path_to_phpgroupware . SEP . 'sms' . SEP . 'inc' . SEP . 
'config.php');