[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: setup/inc class.setup.inc.php,1.22,1.23 class.se
|
From: |
Mark A Peters <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: setup/inc class.setup.inc.php,1.22,1.23 class.setup_detection.inc.php,1.13,1.14 class.setup_lang.inc.php,1.8,1.9 class.setup_process.inc.php,1.11,1.12 |
|
Date: |
Mon, 18 Feb 2002 11:18:36 -0500 |
Update of /cvsroot/phpgroupware/setup/inc
In directory subversions:/tmp/cvs-serv8080/setup/inc
Modified Files:
class.setup.inc.php class.setup_detection.inc.php
class.setup_lang.inc.php class.setup_process.inc.php
Log Message:
Some major cleanups. Should reduce warnings by 75%. This will speed things up
if the admin is logging php errors/warnings.
Index: class.setup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/inc/class.setup.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** class.setup.inc.php 17 Feb 2002 20:23:26 -0000 1.22
--- class.setup.inc.php 18 Feb 2002 16:18:34 -0000 1.23
***************
*** 327,331 ****
}
! if($GLOBALS['DEBUG'])
{
echo '<br>app_registered(): checking ' .
$appname . ', table: ' . $appstbl;
--- 327,331 ----
}
! if(@$GLOBALS['DEBUG'])
{
echo '<br>app_registered(): checking ' .
$appname . ', table: ' . $appstbl;
***************
*** 337,341 ****
if ($this->db->f(0))
{
! if($GLOBALS['DEBUG'])
{
echo '... app previously registered.';
--- 337,341 ----
if ($this->db->f(0))
{
! if(@$GLOBALS['DEBUG'])
{
echo '... app previously registered.';
***************
*** 343,347 ****
return True;
}
! if($GLOBALS['DEBUG'])
{
echo '... app not registered';
--- 343,347 ----
return True;
}
! if(@$GLOBALS['DEBUG'])
{
echo '... app not registered';
***************
*** 611,614 ****
--- 611,618 ----
$newb = ereg_replace('pre','.',$b);
$testa = explode('.',$newa);
+ if(@$testa[1] == '')
+ {
+ $testa[1] = 0;
+ }
if(@$testa[3] == '')
{
***************
*** 616,619 ****
--- 620,627 ----
}
$testb = explode('.',$newb);
+ if(@$testb[1] == '')
+ {
+ $testb[1] = 0;
+ }
if(@$testb[3] == '')
{
***************
*** 697,703 ****
}
$testb = explode('.',$newb);
! if($testa[3] == '')
{
! $testa[3] = 0;
}
$less = 0;
--- 705,711 ----
}
$testb = explode('.',$newb);
! if($testb[3] == '')
{
! $testb[3] = 0;
}
$less = 0;
Index: class.setup_detection.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/inc/class.setup_detection.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** class.setup_detection.inc.php 17 Feb 2002 20:20:09 -0000 1.13
--- class.setup_detection.inc.php 18 Feb 2002 16:18:34 -0000 1.14
***************
*** 59,63 ****
if ($newapps)
{
! $this->db->query('select * from
phpgw_applications');
while (@$this->db->next_record())
{
--- 59,63 ----
if ($newapps)
{
! $this->db->query('select * from
phpgw_applications',__LINE__,__FILE__);
while (@$this->db->next_record())
{
***************
*** 66,80 ****
}
/* This is to catch old setup installs
that did not have phpgwapi listed as an app */
! if
(!$setup_info['phpgwapi']['currentver'])
{
- $tmp =
$setup_info['phpgwapi']['version']; /* save the file version */
$setup_info['phpgwapi']['currentver'] = $setup_info['admin']['currentver'];
$setup_info['phpgwapi']['version'] = $setup_info['admin']['currentver'];
$setup_info['phpgwapi']['enabled'] = $setup_info['admin']['enabled'];
//
_debug_array($setup_info['phpgwapi']);exit;
$GLOBALS['setup_info'] =
$setup_info;
$this->register_app('phpgwapi');
-
$setup_info['phpgwapi']['version'] = $tmp; /* restore the file version */
}
}
elseif ($oldapps)
--- 66,86 ----
}
/* This is to catch old setup installs
that did not have phpgwapi listed as an app */
! $tmp =
$setup_info['phpgwapi']['version']; /* save the file version */
! if
(address@hidden'phpgwapi']['currentver'])
{
$setup_info['phpgwapi']['currentver'] = $setup_info['admin']['currentver'];
$setup_info['phpgwapi']['version'] = $setup_info['admin']['currentver'];
$setup_info['phpgwapi']['enabled'] = $setup_info['admin']['enabled'];
//
_debug_array($setup_info['phpgwapi']);exit;
+ // There seems to be a problem here. If ['phpgwapi']['currentver'] is set,
+ // The GLOBALS never gets set.
$GLOBALS['setup_info'] =
$setup_info;
$this->register_app('phpgwapi');
}
+ else
+ {
+ $GLOBALS['setup_info'] =
$setup_info;
+ }
+ $setup_info['phpgwapi']['version'] =
$tmp; /* restore the file version */
}
elseif ($oldapps)
***************
*** 112,127 ****
//echo
'<br>'.$setup_info[$key]['name'].'STATUS: '.$setup_info[$key]['status'];
/* Only set this if it has not already failed
to upgrade - Milosch */
! if (!( ($setup_info[$key]['status'] == 'F') ||
($setup_info[$key]['status'] == 'C') ))
{
//if ($setup_info[$key]['currentver'] >
$setup_info[$key]['version'])
! if
($this->amorethanb($setup_info[$key]['currentver'],$setup_info[$key]['version']))
{
$setup_info[$key]['status'] =
'V';
}
! elseif ($setup_info[$key]['currentver']
== $setup_info[$key]['version'])
{
$setup_info[$key]['status'] =
'C';
}
! elseif
($this->alessthanb($setup_info[$key]['currentver'],$setup_info[$key]['version']))
{
$setup_info[$key]['status'] =
'U';
--- 118,133 ----
//echo
'<br>'.$setup_info[$key]['name'].'STATUS: '.$setup_info[$key]['status'];
/* Only set this if it has not already failed
to upgrade - Milosch */
! if (!( (@$setup_info[$key]['status'] == 'F') ||
(@$setup_info[$key]['status'] == 'C') ))
{
//if ($setup_info[$key]['currentver'] >
$setup_info[$key]['version'])
! if
($this->amorethanb($setup_info[$key]['currentver'],@$setup_info[$key]['version']))
{
$setup_info[$key]['status'] =
'V';
}
! elseif
(@$setup_info[$key]['currentver'] == @$setup_info[$key]['version'])
{
$setup_info[$key]['status'] =
'C';
}
! elseif
($this->alessthanb(@$setup_info[$key]['currentver'],@$setup_info[$key]['version']))
{
$setup_info[$key]['status'] =
'U';
***************
*** 246,250 ****
// _debug_array($setup_info);
! if (isset($setup_info['phpgwapi']['currentver']))
{
$setup_info =
$this->get_db_versions($setup_info);
--- 252,256 ----
// _debug_array($setup_info);
! if (!isset($setup_info['phpgwapi']['currentver']))
{
$setup_info =
$this->get_db_versions($setup_info);
***************
*** 369,375 ****
function check_app_tables($appname,$any=False)
{
$setup_info = $GLOBALS['setup_info'];
! if($setup_info[$appname]['tables'])
{
/* Make a copy, else we send some callers into
an infinite loop */
--- 375,382 ----
function check_app_tables($appname,$any=False)
{
+ $none = 0;
$setup_info = $GLOBALS['setup_info'];
! if(@$setup_info[$appname]['tables'])
{
/* Make a copy, else we send some callers into
an infinite loop */
***************
*** 383,390 ****
while(list($key,$val) =
@each($copy[$appname]['tables']))
{
! if ($GLOBALS['DEBUG']) { echo
'<br>check_app_tables(): Checking: ' . $appname . ',table: ' . $val; }
if(!$this->isinarray($val,$tables))
{
! if ($GLOBALS['DEBUG']) { echo
'<br>check_app_tables(): ' . $val . ' missing!'; }
if (!$any)
{
--- 390,403 ----
while(list($key,$val) =
@each($copy[$appname]['tables']))
{
! if ($GLOBALS['DEBUG'])
! {
! echo '<br>check_app_tables():
Checking: ' . $appname . ',table: ' . $val;
! }
if(!$this->isinarray($val,$tables))
{
! if ($GLOBALS['DEBUG'])
! {
! echo
'<br>check_app_tables(): ' . $val . ' missing!';
! }
if (!$any)
{
***************
*** 400,404 ****
if ($any)
{
! if ($GLOBALS['DEBUG'])
{ echo '<br>check_app_tables(): Some tables installed'; }
return True;
}
--- 413,420 ----
if ($any)
{
! if ($GLOBALS['DEBUG'])
! {
! echo
'<br>check_app_tables(): Some tables installed';
! }
return True;
}
***************
*** 408,417 ****
if ($none && $any)
{
! if ($GLOBALS['DEBUG']) { echo
'<br>check_app_tables(): No tables installed'; }
return False;
}
else
{
! if ($GLOBALS['DEBUG']) { echo
'<br>check_app_tables(): All tables installed'; }
return True;
}
--- 424,439 ----
if ($none && $any)
{
! if ($GLOBALS['DEBUG'])
! {
! echo '<br>check_app_tables(): No tables
installed';
! }
return False;
}
else
{
! if ($GLOBALS['DEBUG'])
! {
! echo '<br>check_app_tables(): All
tables installed';
! }
return True;
}
Index: class.setup_lang.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/inc/class.setup_lang.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.setup_lang.inc.php 17 Feb 2002 19:31:50 -0000 1.8
--- class.setup_lang.inc.php 18 Feb 2002 16:18:34 -0000 1.9
***************
*** 38,42 ****
$ConfigLang =
@$GLOBALS['HTTP_COOKIE_VARS']['ConfigLang'] ?
@$GLOBALS['HTTP_COOKIE_VARS']['ConfigLang'] :
@$GLOBALS['HTTP_POST_VARS']['ConfigLang'];
!
if($this->alessthanb($GLOBALS['setup_info']['phpgwapi']['currentver'],
'0.9.15.002'))
{
$this->langtbl = 'lang';
--- 38,42 ----
$ConfigLang =
@$GLOBALS['HTTP_COOKIE_VARS']['ConfigLang'] ?
@$GLOBALS['HTTP_COOKIE_VARS']['ConfigLang'] :
@$GLOBALS['HTTP_POST_VARS']['ConfigLang'];
!
if($this->alessthanb(@$GLOBALS['setup_info']['phpgwapi']['currentver'],
'0.9.15.002'))
{
$this->langtbl = 'lang';
Index: class.setup_process.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/inc/class.setup_process.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** class.setup_process.inc.php 17 Feb 2002 20:20:09 -0000 1.11
--- class.setup_process.inc.php 18 Feb 2002 16:18:34 -0000 1.12
***************
*** 737,741 ****
@abstract commit above processing to the db
*/
! function post_process($tables,$DEBUG)
{
if (!$tables)
--- 737,741 ----
@abstract commit above processing to the db
*/
! function post_process($tables,$DEBUG=False)
{
if (!$tables)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: setup/inc class.setup.inc.php,1.22,1.23 class.setup_detection.inc.php,1.13,1.14 class.setup_lang.inc.php,1.8,1.9 class.setup_process.inc.php,1.11,1.12,
Mark A Peters <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: etemplate/doc etemplate.html,1.2,1.3
- Next by Date:
[Phpgroupware-cvs] CVS: setup applications.php,1.14,1.15 index.php,1.103,1.104 lang.php,1.32,1.33 schematoy.php,1.6,1.7
- Previous by thread:
[Phpgroupware-cvs] CVS: etemplate/doc etemplate.html,1.2,1.3
- Next by thread:
[Phpgroupware-cvs] CVS: setup applications.php,1.14,1.15 index.php,1.103,1.104 lang.php,1.32,1.33 schematoy.php,1.6,1.7
- Index(es):