[Phpgroupware-cvs] setup config.php lang.php inc/functions.inc.php

[Caeies]

CVSROOT:        /sources/phpgroupware
Module name:    setup
Changes by:     Caeies <Caeies> 06/09/29 10:21:10

Modified files:
        .              : config.php lang.php 
        inc            : functions.inc.php 

Log message:
        fix little things for setup :)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/setup/config.php?cvsroot=phpgroupware&r1=1.88&r2=1.89
http://cvs.savannah.gnu.org/viewcvs/setup/lang.php?cvsroot=phpgroupware&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/setup/inc/functions.inc.php?cvsroot=phpgroupware&r1=1.54&r2=1.55

Patches:
Index: config.php
===================================================================
RCS file: /sources/phpgroupware/setup/config.php,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -b -r1.88 -r1.89
--- config.php  3 Sep 2006 15:27:44 -0000       1.88
+++ config.php  29 Sep 2006 10:21:10 -0000      1.89
@@ -5,7 +5,7 @@
        * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
        * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
        * @package setup
-       * @version $Id: config.php,v 1.88 2006/09/03 15:27:44 Caeies Exp $
+       * @version $Id: config.php,v 1.89 2006/09/29 10:21:10 Caeies Exp $
        */
 
        if ( isset($_POST['cancel']) && $_POST['cancel'] )
@@ -218,37 +218,6 @@
        $setup_tpl->pparse('out','T_config_pre_script');
        // Now parse each of the templates we want to show here
        
-       /**
-        * phpGroupWare class
-       * @package setup
-        */
-       class phpgw
-       {
-               /**
-                * Common
-                * @var object
-                */
-               var $common;
-               
-               /**
-                * Accounts
-                * @var object
-                */
-               var $accounts;
-               
-               /**
-                * Applications
-                * @var object
-                */
-               var $applications;
-               
-               /**
-                * Database
-                * @var object
-                */
-               var $db;
-       }
-       $GLOBALS['phpgw'] = new phpgw;
        $GLOBALS['phpgw']->common = CreateObject('phpgwapi.common');
        $GLOBALS['phpgw']->db     =& $GLOBALS['phpgw_setup']->db;
 

Index: lang.php
===================================================================
RCS file: /sources/phpgroupware/setup/lang.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- lang.php    4 Jul 2006 13:08:38 -0000       1.52
+++ lang.php    29 Sep 2006 10:21:10 -0000      1.53
@@ -5,7 +5,7 @@
        * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
        * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
        * @package setup
-       * @version $Id: lang.php,v 1.52 2006/07/04 13:08:38 sigurdne Exp $
+       * @version $Id: lang.php,v 1.53 2006/09/29 10:21:10 Caeies Exp $
        */
 
        $phpgw_info = array();
@@ -117,6 +117,15 @@
                                                        foreach($lines as $line)
                                                        {
                                                                
list($message_id,$app_name,,$content) = explode("\t",$line);
+                                                               /* XXX Caeies 
Get incalid lang files ... 
+                                                               
if(empty($content))
+                                                               {
+                                                                       
_debug_array('Invalid lang line : '.$line);
+                                                                       
_debug_array('content 1 : -'.$message_id.'-');
+                                                                       
_debug_array('content 2 : -'.$app_name.'-');
+                                                                       
_debug_array('content 3 : -'.$content.'-');
+                                                               }
+                                                               */
                                                                $message_id = 
$GLOBALS['phpgw_setup']->db->db_addslashes(substr(chop($message_id),0,MAX_MESSAGE_ID_LENGTH));
                                                                $app_name = 
$GLOBALS['phpgw_setup']->db->db_addslashes(chop($app_name));
                                                                $content = 
$GLOBALS['phpgw_setup']->db->db_addslashes(chop($content));

Index: inc/functions.inc.php
===================================================================
RCS file: /sources/phpgroupware/setup/inc/functions.inc.php,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- inc/functions.inc.php       25 Sep 2006 02:03:47 -0000      1.54
+++ inc/functions.inc.php       29 Sep 2006 10:21:10 -0000      1.55
@@ -15,7 +15,7 @@
   *  option) any later version.                                              *
   \**************************************************************************/
 
-  /* $Id: functions.inc.php,v 1.54 2006/09/25 02:03:47 skwashd Exp $ */
+  /* $Id: functions.inc.php,v 1.55 2006/09/29 10:21:10 Caeies Exp $ */
 
        // PHP5 compat fix
        if (version_compare(phpversion(), '5.0') < 0)
@@ -58,6 +58,7 @@
                && is_file(PHPGW_INCLUDE_ROOT . SEP . 'phpgwapi' .  SEP . 'inc' 
. SEP . 'common_functions.inc.php') )
        {
                require_once(PHPGW_INCLUDE_ROOT . SEP . 'phpgwapi' .  SEP . 
'inc' . SEP . 'common_functions.inc.php');
+               $GLOBALS['phpgw'] = createObject('phpgwapi.phpgw');
                require_once(PHPGW_INCLUDE_ROOT . SEP . 'phpgwapi' . SEP . 
'inc' . SEP . 'log_functions.inc.php');
        }
        else