[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] setup applications.php index.php templates/base...
|
From: |
Dave Hall |
|
Subject: |
[Phpgroupware-cvs] setup applications.php index.php templates/base... |
|
Date: |
Tue, 03 Oct 2006 02:55:42 +0000 |
CVSROOT: /cvsroot/phpgroupware
Module name: setup
Changes by: Dave Hall <skwashd> 06/10/03 02:55:42
Modified files:
. : applications.php index.php
templates/base : applications.tpl
Removed files:
templates/base/images: check.png completed.png dep.png
incomplete.png table.png
Log message:
get setup working properly again, more notices, more fixes, slight
improvement to applications and setup main
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/setup/applications.php?cvsroot=phpgroupware&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/setup/index.php?cvsroot=phpgroupware&r1=1.123&r2=1.124
http://cvs.savannah.gnu.org/viewcvs/setup/templates/base/applications.tpl?cvsroot=phpgroupware&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/setup/templates/base/images/check.png?cvsroot=phpgroupware&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/setup/templates/base/images/completed.png?cvsroot=phpgroupware&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/setup/templates/base/images/dep.png?cvsroot=phpgroupware&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/setup/templates/base/images/incomplete.png?cvsroot=phpgroupware&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/setup/templates/base/images/table.png?cvsroot=phpgroupware&r1=1.1&r2=0
Patches:
Index: applications.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/applications.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- applications.php 2 Oct 2006 09:59:28 -0000 1.31
+++ applications.php 3 Oct 2006 02:55:41 -0000 1.32
@@ -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: applications.php,v 1.31 2006/10/02 09:59:28 skwashd Exp
$
+ * @version $Id: applications.php,v 1.32 2006/10/03 02:55:41 skwashd Exp
$
*/
$DEBUG = (isset($_POST['debug']) && $_POST['debug']) ||
(isset($_GET['debug']) && $_GET['debug']);
@@ -122,10 +122,10 @@
//var_dump($setup_info);exit;
$setup_info =
$GLOBALS['phpgw_setup']->detection->check_depends($setup_info);
//var_dump($setup_info);exit;
- @ksort($setup_info);
+ ksort($setup_info);
- if(@get_var('submit',Array('POST')))
+ if(get_var('submit',Array('POST')))
{
$GLOBALS['phpgw_setup']->html->show_header(lang('Application
Management'),False,'config',$ConfigDomain . '(' .
$phpgw_domain[$ConfigDomain]['db_type'] . ')');
$setup_tpl->set_var('description',lang('App
install/remove/upgrade') . ':');
@@ -243,7 +243,7 @@
$detail = get_var('detail',Array('GET'));
$resolve = get_var('resolve',Array('GET'));
- if(@$detail)
+ if($detail)
{
@ksort($setup_info[$detail]);
$setup_tpl->set_var('description','<a
href="applications.php?debug='.$DEBUG.'">' . lang('Go back') . '</a>');
@@ -287,7 +287,7 @@
$setup_tpl->pparse('out','footer');
exit;
}
- elseif (@$resolve)
+ elseif ($resolve)
{
$version = get_var('version',Array('GET'));
$notables = get_var('notables',Array('GET'));
@@ -376,7 +376,7 @@
$setup_tpl->pparse('out','footer');
exit;
}
- elseif(@get_var('globals', array('GET')))
+ elseif(get_var('globals', array('GET')))
{
$setup_tpl->set_var('description','<a
href="applications.php?debug='.$DEBUG.'">' . lang('Go back') . '</a>');
$setup_tpl->pparse('out','header');
@@ -413,7 +413,7 @@
$setup_tpl->set_var('app_remove',lang('Remove'));
$setup_tpl->set_var('app_upgrade',lang('Upgrade'));
$setup_tpl->set_var('app_resolve',lang('Resolve'));
- $setup_tpl->set_var('check','check.png');
+ $setup_tpl->set_var('check','stock_form-checkbox.png');
$setup_tpl->set_var('install_all',lang('Install All'));
$setup_tpl->set_var('upgrade_all',lang('Upgrade All'));
$setup_tpl->set_var('remove_all',lang('Remove All'));
@@ -431,7 +431,7 @@
$i = ++$i % 2;
$value['title'] = !isset($value['title']) ||
!strlen($value['title']) ? str_replace('*', '', lang($value['name'])) :
$value['title'];
$setup_tpl->set_var('apptitle',$value['title']);
-
$setup_tpl->set_var('currentver',@$value['currentver']);
+ $setup_tpl->set_var('currentver',
isset($value['currentver']) ? $value['currentver'] : '');
$setup_tpl->set_var('version',$value['version']);
$setup_tpl->set_var('bg_color',$bgcolor[$i]);
@@ -443,18 +443,18 @@
if
(!$GLOBALS['phpgw_setup']->detection->check_app_tables($value['name']))
{
// App installed and
enabled, but some tables are missing
-
$setup_tpl->set_var('instimg','table.png');
+
$setup_tpl->set_var('instimg','stock_database.png');
$setup_tpl->set_var('bg_color','row_err_table');
$setup_tpl->set_var('instalt',lang('Not Completed'));
-
$setup_tpl->set_var('resolution','<a href="applications.php?resolve=' .
$value['name'] . '&badinstall=True">' . lang('Potential Problem') . '</a>');
+
$setup_tpl->set_var('resolution','<a href="applications.php?resolve=' .
$value['name'] . '&badinstall=True">' . lang('Potential Problem') . '</a>');
$status =
lang('Requires reinstall or manual repair') . ' - ' . $value['status'];
}
else
{
-
$setup_tpl->set_var('instimg','completed.png');
+
$setup_tpl->set_var('instimg','stock_yes.png');
$setup_tpl->set_var('instalt', lang('%1 status - %2', $value['title'],
lang('Completed')));
$setup_tpl->set_var('install',' ');
- if($value['enable'])
+ if($value['enabled'])
{
$setup_tpl->set_var('resolution','');
$status =
lang('OK') . ' - ' . $value['status'];
@@ -476,13 +476,14 @@
}
break;
case 'U':
-
$setup_tpl->set_var('instimg','incomplete.png');
+
$setup_tpl->set_var('instimg','package-generic.png');
$setup_tpl->set_var('instalt',lang('Not Completed'));
if (
!isset($value['currentver']) || !$value['currentver'] )
{
if (
isset($value['tables']) && is_array($value['tables']) &&
$GLOBALS['phpgw_setup']->detection->check_app_tables($value['name'],True))
{
// Some tables
missing
+
$setup_tpl->set_var('instimg','stock_database.png');
$setup_tpl->set_var('remove','<input type="checkbox" name="remove[' .
$value['name'] . ']" />');
$setup_tpl->set_var('resolution','<a href="applications.php?resolve=' .
$value['name'] . '&badinstall=True">' . lang('Potential Problem') . '</a>');
$status =
lang('Requires reinstall or manual repair') . ' - ' . $value['status'];
@@ -510,7 +511,7 @@
}
break;
case 'V':
-
$setup_tpl->set_var('instimg','incomplete.png');
+
$setup_tpl->set_var('instimg','package-generic.png');
$setup_tpl->set_var('instalt',lang('Not Completed'));
$setup_tpl->set_var('install',' ');
$setup_tpl->set_var('remove','<input type="checkbox" name="remove[' .
$value['name'] . ']">');
@@ -522,7 +523,7 @@
$setup_tpl->set_var('bg_color','FFCCCC');
$depstring =
parsedep($value['depends']);
$depstring .= ')';
-
$setup_tpl->set_var('instimg','dep.png');
+ $setup_tpl->set_var('instimg',
'stock_no.png');
$setup_tpl->set_var('instalt',lang('Dependency Failure'));
$setup_tpl->set_var('install',' ');
$setup_tpl->set_var('remove',' ');
@@ -534,7 +535,7 @@
$setup_tpl->set_var('bg_color','FFCCFF');
$depstring =
parsedep($value['depends']);
$depstring .= ')';
-
$setup_tpl->set_var('instimg','dep.png');
+ $setup_tpl->set_var('instimg',
'stock_no.png');
$setup_tpl->set_var('instalt',lang('Post-install Dependency Failure'));
$setup_tpl->set_var('install',' ');
$setup_tpl->set_var('remove',' ');
@@ -543,7 +544,7 @@
$status = lang('Post-install
Dependency Failure') . ':' . $depstring . $value['status'];
break;
default:
-
$setup_tpl->set_var('instimg','incomplete.png');
+
$setup_tpl->set_var('instimg','package-generic.png');
$setup_tpl->set_var('instalt',lang('Not Completed'));
$setup_tpl->set_var('install',' ');
$setup_tpl->set_var('remove',' ');
Index: index.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/index.php,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -b -r1.123 -r1.124
--- index.php 1 Oct 2006 13:45:34 -0000 1.123
+++ index.php 3 Oct 2006 02:55:41 -0000 1.124
@@ -5,7 +5,7 @@
* @copyright Portions 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: index.php,v 1.123 2006/10/01 13:45:34 skwashd Exp $
+ * @version $Id: index.php,v 1.124 2006/10/03 02:55:41 skwashd Exp $
*/
/*
@@ -100,7 +100,10 @@
//$action = 'Upgrade';
// end DEBUG code
- switch(@get_var('action',Array('POST', 'GET')))
+ $subtitle = '';
+ $submsg = '';
+ $subaction = '';
+ switch(get_var('action',Array('POST', 'GET')))
{
case 'Uninstall all applications':
$subtitle = lang('Deleting Tables');
@@ -138,16 +141,16 @@
$GLOBALS['phpgw_info']['setup']['stage']['db'] = 6;
break;
}
- $setup_tpl->set_var('subtitle',@$subtitle);
- $setup_tpl->set_var('submsg',@$submsg);
- $setup_tpl->set_var('subaction',@$subaction);
+ $setup_tpl->set_var('subtitle', $subtitle);
+ $setup_tpl->set_var('submsg', $submsg);
+ $setup_tpl->set_var('subaction', $subaction);
// Old PHP
- if ( !function_exists('sha1') )
+ if ( version_compare('4.3.0', phpversion()) === 1 )
{
$GLOBALS['phpgw_setup']->html->show_header($GLOBALS['phpgw_info']['setup']['header_msg'],True);
$GLOBALS['phpgw_setup']->html->show_alert_msg('Error',
- lang('You appear to be using PHP earlier than 4.3.0.
phpGroupWare now requires 4.3.0 or later') );
+ lang('You appear to be using PHP %1. phpGroupWare now
requires PHP 4.3.0 or later', phpversion()) );
$GLOBALS['phpgw_setup']->html->show_footer();
exit;
}
@@ -156,8 +159,9 @@
//$GLOBALS['phpgw_setup']->app_status();
$GLOBALS['phpgw_info']['server']['app_images'] =
'templates/base/images';
- $incomplete = $GLOBALS['phpgw_info']['server']['app_images'] .
'/incomplete.png';
- $completed = $GLOBALS['phpgw_info']['server']['app_images'] .
'/completed.png';
+ $GLOBALS['phpgw_info']['server']['api_images'] =
'../phpgwapi/templates/base/images';
+ $incomplete =
"{$GLOBALS['phpgw_info']['server']['api_images']}/stock_no.png";
+ $completed =
"{$GLOBALS['phpgw_info']['server']['api_images']}/stock_yes.png";
$setup_tpl->set_var('img_incomplete', $incomplete);
$setup_tpl->set_var('img_completed', $completed);
@@ -443,7 +447,7 @@
// $GLOBALS['phpgw_info']['setup']['stage']['apps'] =
$GLOBALS['phpgw_setup']->check_apps();
if ( !isset($GLOBALS['phpgw_info']['setup']['stage']['db']) )
{
- $GLOBALS['phpgw_info']['setup']['stage']['db'] = 0;
+ $GLOBALS['phpgw_info']['setup']['stage']['db'] = null;
}
switch($GLOBALS['phpgw_info']['setup']['stage']['db'])
Index: templates/base/applications.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/setup/templates/base/applications.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- templates/base/applications.tpl 6 Aug 2006 10:03:24 -0000 1.3
+++ templates/base/applications.tpl 3 Oct 2006 02:55:41 -0000 1.4
@@ -18,6 +18,12 @@
}
}
</script>
+<style type="text/css">
+ img
+ {
+ border: 0;
+ }
+</style>
<br>
<div align="center">
@@ -48,21 +54,21 @@
<tr class="row_on">
<td colspan="5"> </td>
<td align="center">
- <a href="javascript:check_all('install')"><img
src="templates/base/images/{check}" border="0" height="16" width="21"
alt="{install_all}"></a>
+ <a href="javascript:check_all('install')"><img
src="../phpgwapi/templates/base/images/{check}" title="{install_all}"
alt="{install_all}"></a>
</td>
<td align="center">
- <a href="javascript:check_all('upgrade')"><img
src="templates/base/images/{check}" border="0" height="16" width="21"
alt="{upgrade_all}"></a>
+ <a href="javascript:check_all('upgrade')"><img
src="../phpgwapi/templates/base/images/{check}" title="{upgrade_all}"
alt="{upgrade_all}"></a>
</td>
<td> </td>
<td align="center">
- <a href="javascript:check_all('remove')"><img
src="templates/base/images/{check}" border="0" height="16" width="21"
alt="{remove_all}"></a>
+ <a href="javascript:check_all('remove')"><img
src="../phpgwapi/templates/base/images/{check}" title="{remove_all}"
alt="{remove_all}"></a>
</td>
</tr>
<!-- END app_header -->
<!-- BEGIN apps -->
<tr class="{bg_color}">
- <td><a href="applications.php?detail={appname}"><img
src="templates/base/images/{instimg}" alt="{instalt}" title="{instalt}"
border="0"></a></td>
+ <td><a href="applications.php?detail={appname}"><img
src="../phpgwapi/templates/base/images/{instimg}" alt="{instalt}"
title="{instalt}" border="0"></a></td>
<td>{appinfo} </td>
<td>{apptitle} </td>
<td>{currentver} </td>
@@ -113,14 +119,14 @@
<tr class="{bg_color}">
<td colspan="5">{debug} {lang_debug}</td>
<td align="center">
- <a href="javascript:check_all('install')"><img
src="templates/base/images/{check}" border="0" height="16" width="21"
alt="{install_all}"></a>
+ <a href="javascript:check_all('install')"><img
src="../phpgwapi/templates/base/images/{check}" title="{install_all}"
alt="{install_all}"></a>
</td>
<td align="center">
- <a href="javascript:check_all('upgrade')"><img
src="templates/base/images/{check}" border="0" height="16" width="21"
alt="{upgrade_all}"></a>
+ <a href="javascript:check_all('upgrade')"><img
src="../phpgwapi/templates/base/images/{check}" title="{upgrade_all}"
alt="{upgrade_all}"></a>
</td>
<td> </td>
<td align="center">
- <a href="javascript:check_all('remove')"><img
src="templates/base/images/{check}" border="0" height="16" width="21"
alt="{remove_all}"></a>
+ <a href="javascript:check_all('remove')"><img
src="../phpgwapi/templates/base/images/{check}" title="{remove_all}"
alt="{remove_all}"></a>
</td>
</tr>
</table>
Index: templates/base/images/check.png
===================================================================
RCS file: templates/base/images/check.png
diff -N templates/base/images/check.png
Binary files /tmp/cvsbDapaW and /dev/null differ
Index: templates/base/images/completed.png
===================================================================
RCS file: templates/base/images/completed.png
diff -N templates/base/images/completed.png
Binary files /tmp/cvseKL5FW and /dev/null differ
Index: templates/base/images/dep.png
===================================================================
RCS file: templates/base/images/dep.png
diff -N templates/base/images/dep.png
Binary files /tmp/cvsPiwxLZ and /dev/null differ
Index: templates/base/images/incomplete.png
===================================================================
RCS file: templates/base/images/incomplete.png
diff -N templates/base/images/incomplete.png
Binary files /tmp/cvsQ26DG0 and /dev/null differ
Index: templates/base/images/table.png
===================================================================
RCS file: templates/base/images/table.png
diff -N templates/base/images/table.png
Binary files /tmp/cvsxSFOYY and /dev/null differ
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] setup applications.php index.php templates/base...,
Dave Hall <=