[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: setup applications.php,1.14,1.15 index.php,1.103
|
From: |
Mark A Peters <address@hidden> |
|
Subject: |
[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 |
|
Date: |
Mon, 18 Feb 2002 11:18:36 -0500 |
Update of /cvsroot/phpgroupware/setup
In directory subversions:/tmp/cvs-serv8080/setup
Modified Files:
applications.php index.php lang.php schematoy.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: applications.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/applications.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** applications.php 18 Feb 2002 13:42:08 -0000 1.14
--- applications.php 18 Feb 2002 16:18:34 -0000 1.15
***************
*** 110,114 ****
@ksort($setup_info);
! if ($HTTP_POST_VARS['cancel'])
{
Header("Location: index.php");
--- 110,114 ----
@ksort($setup_info);
! if(@$HTTP_POST_VARS['cancel'])
{
Header("Location: index.php");
***************
*** 116,120 ****
}
! if ($HTTP_POST_VARS['submit'])
{
$phpgw_setup->show_header(lang('Application
Management'),False,'config',$ConfigDomain . '(' .
$phpgw_domain[$ConfigDomain]['db_type'] . ')');
--- 116,120 ----
}
! if(@$HTTP_POST_VARS['submit'])
{
$phpgw_setup->show_header(lang('Application
Management'),False,'config',$ConfigDomain . '(' .
$phpgw_domain[$ConfigDomain]['db_type'] . ')');
***************
*** 221,225 ****
}
! if($HTTP_GET_VARS['detail'])
{
$detail = $HTTP_GET_VARS['detail'];
--- 221,225 ----
}
! if(@$HTTP_GET_VARS['detail'])
{
$detail = $HTTP_GET_VARS['detail'];
***************
*** 259,263 ****
exit;
}
! elseif ($HTTP_GET_VARS['resolve'])
{
$resolve = $HTTP_GET_VARS['resolve'];
--- 259,263 ----
exit;
}
! elseif (@$HTTP_GET_VARS['resolve'])
{
$resolve = $HTTP_GET_VARS['resolve'];
***************
*** 367,373 ****
@reset ($setup_info);
while (list ($key, $value) = each ($setup_info))
{
! if($value['name'])
{
if ($i)
--- 367,374 ----
@reset ($setup_info);
+ $i = 0;
while (list ($key, $value) = each ($setup_info))
{
! if(@$value['name'])
{
if ($i)
***************
*** 380,384 ****
}
$setup_tpl->set_var('apptitle',$value['title']);
!
$setup_tpl->set_var('currentver',$value['currentver']);
$setup_tpl->set_var('version',$value['version']);
$setup_tpl->set_var('bg_color',$bgcolor[$i]);
--- 381,385 ----
}
$setup_tpl->set_var('apptitle',$value['title']);
!
$setup_tpl->set_var('currentver',@$value['currentver']);
$setup_tpl->set_var('version',$value['version']);
$setup_tpl->set_var('bg_color',$bgcolor[$i]);
***************
*** 425,429 ****
$setup_tpl->set_var('instimg','incomplete.gif');
$setup_tpl->set_var('instalt',lang('Not Completed'));
! if (!$value['currentver'])
{
if ($value['tables'] &&
$phpgw_setup->check_app_tables($value['name'],True))
--- 426,430 ----
$setup_tpl->set_var('instimg','incomplete.gif');
$setup_tpl->set_var('instalt',lang('Not Completed'));
! if (address@hidden'currentver'])
{
if ($value['tables'] &&
$phpgw_setup->check_app_tables($value['name'],True))
Index: index.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/index.php,v
retrieving revision 1.103
retrieving revision 1.104
diff -C2 -r1.103 -r1.104
*** index.php 16 Feb 2002 13:48:41 -0000 1.103
--- index.php 18 Feb 2002 16:18:34 -0000 1.104
***************
*** 17,21 ****
page explaining what to do from there (ie, create there own account)
*/
! $DEBUG = False;
$GLOBALS['phpgw_info'] = array();
--- 17,21 ----
page explaining what to do from there (ie, create there own account)
*/
! $GLOBALS['DEBUG'] = False;
$GLOBALS['phpgw_info'] = array();
***************
*** 83,87 ****
$setup_info = $phpgw_setup->get_db_versions($setup_info);
$GLOBALS['phpgw_info']['setup']['stage']['db'] =
$phpgw_setup->check_db();
! if($DEBUG)
{
_debug_array($setup_info);
--- 83,87 ----
$setup_info = $phpgw_setup->get_db_versions($setup_info);
$GLOBALS['phpgw_info']['setup']['stage']['db'] =
$phpgw_setup->check_db();
! if($GLOBALS['DEBUG'])
{
_debug_array($setup_info);
***************
*** 89,93 ****
}
! if ($DEBUG) { echo 'Stage: ' .
$GLOBALS['phpgw_info']['setup']['stage']['db']; }
// begin DEBUG code
//$GLOBALS['phpgw_info']['setup']['stage']['db'] = 0;
--- 89,93 ----
}
! if ($GLOBALS['DEBUG']) { echo 'Stage: ' .
$GLOBALS['phpgw_info']['setup']['stage']['db']; }
// begin DEBUG code
//$GLOBALS['phpgw_info']['setup']['stage']['db'] = 0;
***************
*** 244,254 ****
/* process all apps and langs(last
param True), excluding apps with the no_mass_update flag set. */
$setup_info =
$phpgw_setup->upgrade_exclude($setup_info);
! $setup_info =
$phpgw_setup->process_pass($setup_info,'new',$DEBUG,True);
! $included = True;
include('lang.php');
$GLOBALS['phpgw_info']['setup']['currentver']['phpgwapi'] = 'oldversion';
break;
case 'oldversion':
! $setup_info =
$phpgw_setup->process_pass($setup_info,'upgrade',$DEBUG);
$GLOBALS['phpgw_info']['setup']['currentver']['phpgwapi'] = 'oldversion';
break;
--- 244,254 ----
/* process all apps and langs(last
param True), excluding apps with the no_mass_update flag set. */
$setup_info =
$phpgw_setup->upgrade_exclude($setup_info);
! $setup_info =
$phpgw_setup->process_pass($setup_info,'new',$GLOBALS['DEBUG'],True);
! $GLOBALS['included'] = True;
include('lang.php');
$GLOBALS['phpgw_info']['setup']['currentver']['phpgwapi'] = 'oldversion';
break;
case 'oldversion':
! $setup_info =
$phpgw_setup->process_pass($setup_info,'upgrade',$GLOBALS['DEBUG']);
$GLOBALS['phpgw_info']['setup']['currentver']['phpgwapi'] = 'oldversion';
break;
Index: lang.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/lang.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** lang.php 17 Feb 2002 19:35:44 -0000 1.32
--- lang.php 18 Feb 2002 16:18:34 -0000 1.33
***************
*** 13,17 ****
$phpgw_info = array();
! if (!$included)
{
$GLOBALS['phpgw_info']['flags'] = array(
--- 13,17 ----
$phpgw_info = array();
! if (address@hidden'included'])
{
$GLOBALS['phpgw_info']['flags'] = array(
***************
*** 33,36 ****
--- 33,39 ----
include(PHPGW_API_INC.'/class.common.inc.php');
$common = new common;
+
+ $newinstall = False;
+
// this is not used
//$sep = $common->filesystem_separator();
***************
*** 43,48 ****
}
! $setup_info = $phpgw_setup->get_versions();
! $setup_info = $phpgw_setup->get_db_versions($setup_info);
if($phpgw_setup->alessthanb($setup_info['phpgwapi']['currentver'],
'0.9.15.002'))
--- 46,51 ----
}
! $setup_info_temp = $phpgw_setup->get_versions();
! $setup_info = $phpgw_setup->get_db_versions($setup_info_temp);
if($phpgw_setup->alessthanb($setup_info['phpgwapi']['currentver'],
'0.9.15.002'))
***************
*** 57,61 ****
}
! if ($HTTP_POST_VARS['submit'])
{
$lang_selected = $HTTP_POST_VARS['lang_selected'];
--- 60,64 ----
}
! if (@$HTTP_POST_VARS['submit'])
{
$lang_selected = $HTTP_POST_VARS['lang_selected'];
***************
*** 66,70 ****
if ($upgrademethod == 'dumpold')
{
! $phpgw_setup->db->query("DELETE FROM
lang",__LINE__,__FILE__);
//echo '<br>Test: dumpold';
}
--- 69,73 ----
if ($upgrademethod == 'dumpold')
{
! $phpgw_setup->db->query('DELETE FROM
'.$langtbl,__LINE__,__FILE__);
//echo '<br>Test: dumpold';
}
***************
*** 131,136 ****
if($message_id
&& $content)
{
! // echo
"<br>adding - insert into $langtbl values
('$message_id','$app_name','$phpgw_setup->db_lang','$content')";
!
$phpgw_setup->db->query("INSERT into $langtbl VALUES
('$message_id','$app_name','$phpgw_setup->db_lang','$content')",__LINE__,__FILE__);
}
}
--- 134,139 ----
if($message_id
&& $content)
{
! // echo
"<br>adding - insert into $langtbl(message_id,app_name,lang,content) values
('$message_id','$app_name','$phpgw_setup->db_lang','$content')";
!
$phpgw_setup->db->query("INSERT into $langtbl(message_id,app_name,lang,content)
VALUES
('$message_id','$app_name','$phpgw_setup->db_lang','$content')",__LINE__,__FILE__);
}
}
***************
*** 142,146 ****
}
! if(!$included)
{
Header('Location: index.php');
--- 145,149 ----
}
! if(address@hidden'included'])
{
Header('Location: index.php');
***************
*** 150,154 ****
else
{
! if ($HTTP_POST_VARS['cancel'])
{
Header('Location: index.php');
--- 153,157 ----
else
{
! if (@$HTTP_POST_VARS['cancel'])
{
Header('Location: index.php');
***************
*** 156,160 ****
}
! if (!$included)
{
$tpl_root = $phpgw_setup->setup_tpl_dir('setup');
--- 159,163 ----
}
! if (address@hidden'included'])
{
$tpl_root = $phpgw_setup->setup_tpl_dir('setup');
***************
*** 177,187 ****
$select_box_desc = lang('Select which languages you
would like to use');
! $select_box = '';
$phpgw_setup->db->query("select lang_id,lang_name from
$langstbl where available='Yes'");
while ($phpgw_setup->db->next_record())
{
! $select_box_langs =
! $select_box_langs
! .'<option value="' .
$phpgw_setup->db->f('lang_id') . '">'
. $phpgw_setup->db->f('lang_name') .
'</option>'
."\n";
--- 180,189 ----
$select_box_desc = lang('Select which languages you
would like to use');
! $select_box_langs = '';
$phpgw_setup->db->query("select lang_id,lang_name from
$langstbl where available='Yes'");
while ($phpgw_setup->db->next_record())
{
! $select_box_langs .=
! '<option value="' .
$phpgw_setup->db->f('lang_id') . '">'
. $phpgw_setup->db->f('lang_name') .
'</option>'
."\n";
Index: schematoy.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/schematoy.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** schematoy.php 18 Dec 2001 02:25:55 -0000 1.6
--- schematoy.php 18 Feb 2002 16:18:34 -0000 1.7
***************
*** 12,16 ****
/* $Id$ */
! $DEBUG = True;
$phpgw_info = array();
--- 12,16 ----
/* $Id$ */
! $GLOBALS['DEBUG'] = True;
$phpgw_info = array();
***************
*** 128,132 ****
// Drop newest tables
$terror[$appname]['tables'] =
$GLOBALS['setup_info'][$appname]['tables'];
!
$GLOBALS['phpgw_setup']->process_droptables($terror,$DEBUG);
$terror[$appname]['tables'] = array();
--- 128,132 ----
// Drop newest tables
$terror[$appname]['tables'] =
$GLOBALS['setup_info'][$appname]['tables'];
!
$GLOBALS['phpgw_setup']->process_droptables($terror,$GLOBALS['DEBUG']);
$terror[$appname]['tables'] = array();
***************
*** 146,156 ****
echo '<br>Processing ' .
$terror[$appname]['name'] . ' to ' . $version[$appname];
! $terror =
$GLOBALS['phpgw_setup']->process_droptables($terror,$DEBUG);
$GLOBALS['phpgw_setup']->deregister_app($terror[$appname]['name']);
! $terror =
$GLOBALS['phpgw_setup']->process_baseline($terror,$DEBUG);
! $terror =
$GLOBALS['phpgw_setup']->process_test_data($terror,$DEBUG);
! $terror =
$GLOBALS['phpgw_setup']->process_upgrade($terror,$DEBUG);
}
else
--- 146,156 ----
echo '<br>Processing ' .
$terror[$appname]['name'] . ' to ' . $version[$appname];
! $terror =
$GLOBALS['phpgw_setup']->process_droptables($terror,$GLOBALS['DEBUG']);
$GLOBALS['phpgw_setup']->deregister_app($terror[$appname]['name']);
! $terror =
$GLOBALS['phpgw_setup']->process_baseline($terror,$GLOBALS['DEBUG']);
! $terror =
$GLOBALS['phpgw_setup']->process_test_data($terror,$GLOBALS['DEBUG']);
! $terror =
$GLOBALS['phpgw_setup']->process_upgrade($terror,$GLOBALS['DEBUG']);
}
else
| [Prev in Thread] |
Current Thread |
[Next in 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,
Mark A Peters <address@hidden> <=
- Prev by Date:
[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
- Next by Date:
[Phpgroupware-cvs] CVS: calendar/inc class.boicalendar.inc.php,1.16,1.17
- Previous by 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
- Next by thread:
[Phpgroupware-cvs] CVS: calendar/inc class.boicalendar.inc.php,1.16,1.17
- Index(es):