[TEP-COMMIT] [CVS admin] update to the new template structure / standards updates

hpdl-OfajU3CKLf1/[email protected] 15 Aug 2004 22:59:27 -0000
Newsgroups gmane.comp.web.oscommerce.cvs
Message-ID <[email protected]> 
Commit in admin/admin on MAIN

server_info.php +19 -121 1.7 -> 1.8

includes/languages/english/server_info.php +14 -12 1.1 -> 1.2

includes/languages/espanol/server_info.php +14 -12 1.3 -> 1.4

includes/languages/german/server_info.php +15 -13 1.4 -> 1.5

templates/pages/server_info.php +62 added 1.1

+124 -158

1 added + 4 modified, total 5 files

update to the new template structure / standards updates

----------

admin /admin

server_info.php 1.7 -> 1.8

diff -u -r1.7 -r1.8
--- server_info.php 2004/07/22 23:33:00 1.7
+++ server_info.php 2004/08/15 22:59:24 1.8
@@ -5,7 +5,7 @@

osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com

- Copyright (c) 2003 osCommerce

+ Copyright (c) 2004 osCommerce

Released under the GNU General Public License
*/

@@ -14,125 +14,23 @@

$selected_box = 'tools';

- $system = tep_get_system_information();
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<title><?php echo TITLE; ?></title>
-<link rel="stylesheet" type="text/css" href="includes/stylesheet.css">
-</head>
-<body marginwidth="0" marginheight="0" topmargin="0" bottommargin="0" leftmargin="0" rightmargin="0" bgcolor="#FFFFFF">
-<!-- header //-->
-<?php require(DIR_WS_INCLUDES . 'header.php'); ?>
-<!-- header_eof //-->
-
-<!-- body //-->
-<table border="0" width="100%" cellspacing="2" cellpadding="2">
- <tr>
- <td width="<?php echo BOX_WIDTH; ?>" valign="top"><table border="0" width="<?php echo BOX_WIDTH; ?>" cellspacing="1" cellpadding="1" class="columnLeft">
-<!-- left_navigation //-->
-<?php require(DIR_WS_INCLUDES . 'column_left.php'); ?>
-<!-- left_navigation_eof //-->
- </table></td>
-<!-- body_text //-->
- <td width="100%" valign="top"><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td><table border="0" width="100%" cellspacing="0" cellpadding="0">
- <tr>
- <td class="pageHeading"><?php echo HEADING_TITLE; ?></td>
- <td class="pageHeading" align="right"><?php echo tep_draw_separator('pixel_trans.gif', HEADING_IMAGE_WIDTH, HEADING_IMAGE_HEIGHT); ?></td>
- </tr>
- </table></td>
- </tr>
- <tr>
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td><table border="0" cellspacing="0" cellpadding="3">
- <tr>
- <td class="smallText"><b><?php echo TITLE_SERVER_HOST; ?></b></td>
- <td class="smallText"><?php echo $system['host'] . ' (' . $system['ip'] . ')'; ?></td>
- <td class="smallText">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<b><?php echo TITLE_DATABASE_HOST; ?></b></td>
- <td class="smallText"><?php echo $system['db_server'] . ' (' . $system['db_ip'] . ')'; ?></td>
- </tr>
- <tr>
- <td class="smallText"><b><?php echo TITLE_SERVER_OS; ?></b></td>
- <td class="smallText"><?php echo $system['system'] . ' ' . $system['kernel']; ?></td>
- <td class="smallText">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<b><?php echo TITLE_DATABASE; ?></b></td>
- <td class="smallText"><?php echo $system['db_version']; ?></td>
- </tr>
- <tr>
- <td class="smallText"><b><?php echo TITLE_SERVER_DATE; ?></b></td>
- <td class="smallText"><?php echo $system['date']; ?></td>
- <td class="smallText">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<b><?php echo TITLE_DATABASE_DATE; ?></b></td>
- <td class="smallText"><?php echo $system['db_date']; ?></td>
- </tr>
- <tr>
- <td class="smallText"><b><?php echo TITLE_SERVER_UP_TIME; ?></b></td>
- <td colspan="3" class="smallText"><?php echo $system['uptime']; ?></td>
- </tr>
- <tr>
- <td colspan="4"><?php echo tep_draw_separator('pixel_trans.gif', '1', '5'); ?></td>
- </tr>
- <tr>
- <td class="smallText"><b><?php echo TITLE_HTTP_SERVER; ?></b></td>
- <td colspan="3" class="smallText"><?php echo $system['http_server']; ?></td>
- </tr>
- <tr>
- <td class="smallText"><b><?php echo TITLE_PHP_VERSION; ?></b></td>
- <td colspan="3" class="smallText"><?php echo $system['php'] . ' (' . TITLE_ZEND_VERSION . ' ' . $system['zend'] . ')'; ?></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '1', '10'); ?></td>
- </tr>
- <tr>
- <td>
-<?php
- if (function_exists('ob_start')) {
-?>
-<style type="text/css">
-body, td, th {font-family: sans-serif; font-size: 10px;}
-.p {text-align: left;}
-.e {background-color: #ccccff; font-weight: bold;}
-.h {background-color: #9999cc; font-weight: bold;}
-.v {background-color: #cccccc;}
-i {color: #666666;}
-hr {display: none;}
-</style>
-<?php
- ob_start();
- phpinfo();
- $phpinfo = ob_get_contents();
- ob_end_clean();
-
- $phpinfo = str_replace('border: 1px', '', $phpinfo);
- ereg('<body>(.*)</body>', $phpinfo, $regs);
- echo '<table border="1" cellpadding="3" width="600" style="border: 0px; border-color: #000000;">' .
- ' <tr><td><a href="http://www.oscommerce.com"><img border="0" src="images/oscommerce.gif" alt=" osCommerce " /></a><h1 class="p"> ' . PROJECT_VERSION . '</h1></td>' .
- ' </tr>' .
- '</table>';
- echo $regs[1];
- } else {
- phpinfo();

+ $imageOsCommerce = 'R0lGODlhzAAyAPcAACoqKqioqNfX8yQkJJPYoEdExO/v75aWlsnJycnJ7uX06XjNhvj4+LXYuZ2dnZmZmTo6OoqKiqSkpHp6egkJCUnDWkHCU8rp0fHx8fPz83XRgtM7OsLCwnBwcGpp0YbTkbKysqrUroJ60VNTU6TcsKysrOrq6sbaxuDg4JCmydRDQ/rp6aGhoZdamq2t5dtoaFvFaqWj5tdydfHx+ltYypOL2DW5S0S9V/P79WZmZpvbqJ7dqXumsBEREePj4+rq+Obm5l5eXnNTruN7eZHanPj4/WxsbJGRkeTk5Oi1t37UimzOeszMzFC1bGlpaW5lzNtcXLa2ttzc3DU1NUVFRcbGxtTU1NHR0XnShlrJat3w4YLUjsTjydra2uiZmfXX19DQ0H6DxIrVmZbbofTGxPO+u+3t7bOz6BgYGM8lJVTFZTIyMkBAQE5OTrLhu3V1daPfrOLi9sTExGHLcI2Njbi4uKSc5WrNeUC6VGJiYtfX17S0tLu7u4eptYWF2XHQf7y8vGbMdG2zj1lZWV7KbdjY2B0dHY2M3XNqy0lJSdLl04fWk4GBgWNdyb+/v87Ozpya30bCV3l51ozXmH1y0oaGhlHCYlBNx23Pe2XMc313z6ngsoDLimnJevv7/lLBZeOGhmjNdmDGb6mn5q+vr7nkw/r8+1PGYlbHZv/9/dAuLmzLfZaW3j3AT4vYltVMTGDGcl7AdeFzcf////7+/t/f3/f39/z8/Ojo6Pv7++np6fX19f39/fr6+vT09Pb29t7e3m/Pff3+/f/+/9aAif/i23l22fz9/fDz8MHB68/r1tnn2svhzG9v09
dRUdrv3uSAfu/19dqZmbe36PD58piW35+d18eIouHm4fXx8YqTXuTQ339mu2temfr19VJzqlZIu//+/vf2/P7///7//ua4wJ3Jt+Xo5U3EXVjIaKWQyoWNzqCg4snuz0M9v1+4fo[...]
+
+ $action = (isset($_GET['action']) ? $_GET['action'] : '');
+
+ switch ($action) {
+ case 'imageOsCommerce':
+ header('Content-Type: image/gif');
+ echo base64_decode($imageOsCommerce);
+ exit; break;
+ case 'phpInfo':
+ phpinfo();
+ exit; break;

}

+
+ $page_contents = 'server_info.php';
+
+ require('templates/default.php');
+
+ require('includes/application_bottom.php');

?>

- </td>
- </tr>
- </table></td>
-<!-- body_text_eof //-->
- </tr>
-</table>
-<!-- body_eof //-->
-
-<!-- footer //-->
-<?php require(DIR_WS_INCLUDES . 'footer.php'); ?>
-<!-- footer_eof //-->
-<br>
-</body>
-</html>
-<?php require(DIR_WS_INCLUDES . 'application_bottom.php'); ?>

[Note: Some over-long lines of diff output only partialy shown]

----------

admin /admin /includes /languages /english

server_info.php 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- server_info.php 2002/01/05 10:06:08 1.1
+++ server_info.php 2004/08/15 22:59:25 1.2
@@ -5,21 +5,23 @@

osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com

- Copyright (c) 2002 osCommerce

+ Copyright (c) 2004 osCommerce

Released under the GNU General Public License
*/

-define('HEADING_TITLE', 'Server Information');

+ define('HEADING_TITLE', 'Server Information');

-define('TITLE_SERVER_HOST', 'Server Host:');
-define('TITLE_SERVER_OS', 'Server OS:');
-define('TITLE_SERVER_DATE', 'Server Date:');
-define('TITLE_SERVER_UP_TIME', 'Server Up Time:');
-define('TITLE_HTTP_SERVER', 'HTTP Server:');
-define('TITLE_PHP_VERSION', 'PHP Version:');
-define('TITLE_ZEND_VERSION', 'Zend:');
-define('TITLE_DATABASE_HOST', 'Database Host:');
-define('TITLE_DATABASE', 'Database:');
-define('TITLE_DATABASE_DATE', 'Datebase Date:');

+ define('TITLE_SERVER_HOST', 'Server Host:');
+ define('TITLE_SERVER_OS', 'Server OS:');
+ define('TITLE_SERVER_DATE', 'Server Date:');
+ define('TITLE_SERVER_UP_TIME', 'Server Up Time:');
+ define('TITLE_HTTP_SERVER', 'HTTP Server:');
+ define('TITLE_PHP_VERSION', 'PHP Version:');
+ define('TITLE_ZEND_VERSION', 'Zend:');
+ define('TITLE_DATABASE_HOST', 'Database Host:');
+ define('TITLE_DATABASE', 'Database:');
+ define('TITLE_DATABASE_DATE', 'Datebase Date:');
+
+ define('TEXT_MORE_INFORMATION', 'more info');

?>

----------

admin /admin /includes /languages /espanol

server_info.php 1.3 -> 1.4

diff -u -r1.3 -r1.4
--- server_info.php 2003/07/06 20:33:01 1.3
+++ server_info.php 2004/08/15 22:59:25 1.4
@@ -5,21 +5,23 @@

osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com

- Copyright (c) 2003 osCommerce

+ Copyright (c) 2004 osCommerce

Released under the GNU General Public License
*/

-define('HEADING_TITLE', 'Informaci&oacute;n del Servidor');

+ define('HEADING_TITLE', 'Informaci&oacute;n del Servidor');

-define('TITLE_SERVER_HOST', 'Nombre del Servidor:');
-define('TITLE_SERVER_OS', 'Sistema Operativo del Servidor:');
-define('TITLE_SERVER_DATE', 'Fecha en el Servidor:');
-define('TITLE_SERVER_UP_TIME', 'Encendido desde:');
-define('TITLE_HTTP_SERVER', 'Servidor HTTP:');
-define('TITLE_PHP_VERSION', 'Version PHP:');
-define('TITLE_ZEND_VERSION', 'Zend:');
-define('TITLE_DATABASE_HOST', 'Servidor de Base de Datos:');
-define('TITLE_DATABASE', 'Base de Datos:');
-define('TITLE_DATABASE_DATE', 'Fecha de la Base de Datos:');

+ define('TITLE_SERVER_HOST', 'Nombre del Servidor:');
+ define('TITLE_SERVER_OS', 'Sistema Operativo del Servidor:');
+ define('TITLE_SERVER_DATE', 'Fecha en el Servidor:');
+ define('TITLE_SERVER_UP_TIME', 'Encendido desde:');
+ define('TITLE_HTTP_SERVER', 'Servidor HTTP:');
+ define('TITLE_PHP_VERSION', 'Version PHP:');
+ define('TITLE_ZEND_VERSION', 'Zend:');
+ define('TITLE_DATABASE_HOST', 'Servidor de Base de Datos:');
+ define('TITLE_DATABASE', 'Base de Datos:');
+ define('TITLE_DATABASE_DATE', 'Fecha de la Base de Datos:');
+
+ define('TEXT_MORE_INFORMATION', 'more info');

?>

----------

admin /admin /includes /languages /german

server_info.php 1.4 -> 1.5

diff -u -r1.4 -r1.5
--- server_info.php 2002/03/30 15:06:44 1.4
+++ server_info.php 2004/08/15 22:59:25 1.5
@@ -5,21 +5,23 @@

osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com

- Copyright (c) 2002 osCommerce

+ Copyright (c) 2004 osCommerce

Released under the GNU General Public License
*/

-define('HEADING_TITLE', 'Server Information');

+ define('HEADING_TITLE', 'Server Information');

-define('TITLE_SERVER_HOST', 'Server Host:');
-define('TITLE_SERVER_OS', 'Server OS:');
-define('TITLE_SERVER_DATE', 'Server Datum:');
-define('TITLE_SERVER_UP_TIME', 'Server Up Time:');
-define('TITLE_HTTP_SERVER', 'HTTP Server:');
-define('TITLE_PHP_VERSION', 'PHP Version:');
-define('TITLE_ZEND_VERSION', 'Zend:');
-define('TITLE_DATABASE_HOST', 'Datenbank Host:');
-define('TITLE_DATABASE', 'Datenbank:');
-define('TITLE_DATABASE_DATE', 'Datenbank Datum:');
-?>

\ No newline at end of file

+ define('TITLE_SERVER_HOST', 'Server Host:');
+ define('TITLE_SERVER_OS', 'Server OS:');
+ define('TITLE_SERVER_DATE', 'Server Datum:');
+ define('TITLE_SERVER_UP_TIME', 'Server Up Time:');
+ define('TITLE_HTTP_SERVER', 'HTTP Server:');
+ define('TITLE_PHP_VERSION', 'PHP Version:');
+ define('TITLE_ZEND_VERSION', 'Zend:');
+ define('TITLE_DATABASE_HOST', 'Datenbank Host:');
+ define('TITLE_DATABASE', 'Datenbank:');
+ define('TITLE_DATABASE_DATE', 'Datenbank Datum:');
+
+ define('TEXT_MORE_INFORMATION', 'mehr info');
+?>

----------

admin /admin /templates /pages

server_info.php added at 1.1

diff -N server_info.php
--- /dev/null Mon Aug 16 00:59:25 2004
+++ /tmp/cvsAAAZwayll Mon Aug 16 00:59:26 2004
@@ -0,0 +1,62 @@

+<?php
+/*
+ $Id$
+
+ osCommerce, Open Source E-Commerce Solutions
+ http://www.oscommerce.com
+
+ Copyright (c) 2004 osCommerce
+
+ Released under the GNU General Public License
+*/
+
+ $system = tep_get_system_information();
+?>
+
+<h1><?php echo HEADING_TITLE; ?></h1>
+
+<table border="0" width="100%" cellspacing="0" cellpadding="3">
+ <tr>
+ <td class="smallText"><b><?php echo TITLE_SERVER_HOST; ?></b></td>
+ <td class="smallText"><?php echo $system['host'] . ' (' . $system['ip'] . ')'; ?></td>
+ <td class="smallText"><b><?php echo TITLE_DATABASE_HOST; ?></b></td>
+ <td class="smallText"><?php echo $system['db_server'] . ' (' . $system['db_ip'] . ')'; ?></td>
+ </tr>
+ <tr>
+ <td class="smallText"><b><?php echo TITLE_SERVER_OS; ?></b></td>
+ <td class="smallText"><?php echo $system['system'] . ' ' . $system['kernel']; ?></td>
+ <td class="smallText"><b><?php echo TITLE_DATABASE; ?></b></td>
+ <td class="smallText"><?php echo $system['db_version']; ?></td>
+ </tr>
+ <tr>
+ <td class="smallText"><b><?php echo TITLE_SERVER_DATE; ?></b></td>
+ <td class="smallText"><?php echo $system['date']; ?></td>
+ <td class="smallText"><b><?php echo TITLE_DATABASE_DATE; ?></b></td>
+ <td class="smallText"><?php echo $system['db_date']; ?></td>
+ </tr>
+ <tr>
+ <td colspan="4"><?php echo tep_draw_separator('pixel_trans.gif', '1', '5'); ?></td>
+ </tr>
+ <tr>
+ <td class="smallText"><b><?php echo TITLE_SERVER_UP_TIME; ?></b></td>
+ <td colspan="3" class="smallText"><?php echo $system['uptime']; ?></td>
+ </tr>
+ <tr>
+ <td colspan="4"><?php echo tep_draw_separator('pixel_trans.gif', '1', '5'); ?></td>
+ </tr>
+ <tr>
+ <td class="smallText"><b><?php echo TITLE_HTTP_SERVER; ?></b></td>
+ <td class="smallText"><?php echo $system['http_server']; ?></td>
+ <td class="smallText"><b><?php echo TITLE_PHP_VERSION; ?></b></td>
+ <td class="smallText"><?php echo 'PHP: ' . $system['php'] . ' / ' . TITLE_ZEND_VERSION . ' ' . $system['zend'] . ' (<a href="' . tep_href_link(FILENAME_SERVER_INFO, 'action=phpInfo') . '" target="_blank">' . TEXT_MORE_INFORMATION . '</a>)'; ?></td>
+ </tr>
+</table>
+
+<br>
+
+<table border="0" width="100%" cellspacing="0" cellpadding="3" style="border: 1px #000000 solid;">
+ <tr>
+ <td class="smallText"><b><?php echo PROJECT_VERSION; ?></b></td>
+ <td class="smallText" align="right"><a href="http://www.oscommerce.com" target="_blank"><?php echo tep_image(tep_href_link(FILENAME_SERVER_INFO, 'action=imageOsCommerce'), 'osCommerce'); ?></a></td>
+ </tr>
+</table>

CVSspam 0.2.9

-------------------------------------------------------
SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media
100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285