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

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

define_language.php +35 -160 1.17 -> 1.18

includes/languages/english/define_language.php +11 -4 1.3 -> 1.4

includes/languages/german/define_language.php +12 -5 1.6 -> 1.7

includes/languages/espanol/define_language.php +11 -4 1.5 -> 1.6

templates/pages/define_language.php +77 added 1.1

/define_language_edit.php +55 added 1.1

+201 -173

2 added + 4 modified, total 6 files

updates to the new template structure / standards updates

----------

admin /admin

define_language.php 1.17 -> 1.18

diff -u -r1.17 -r1.18
--- define_language.php 2004/07/22 23:33:00 1.17
+++ define_language.php 2004/08/15 18:17:01 1.18
@@ -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,182 +14,57 @@

$selected_box = 'tools';

- if (!isset($HTTP_GET_VARS['lngdir'])) $HTTP_GET_VARS['lngdir'] = $language;

+ $action = (isset($_GET['action']) ? $_GET['action'] : '');

- $action = (isset($HTTP_GET_VARS['action']) ? $HTTP_GET_VARS['action'] : '');

+ $lng = (isset($_GET['lng']) ? $_GET['lng'] : $osC_Session->value('language'));

- if (tep_not_null($action)) {

+ $languages_array = array();
+ $languages = tep_get_languages();
+ $exists = false;
+ for ($i=0, $n=sizeof($languages); $i<$n; $i++) {
+ if ($languages[$i]['directory'] == $lng) {
+ $exists = true;
+ }
+
+ $languages_array[] = array('id' => $languages[$i]['directory'],
+ 'text' => $languages[$i]['name']);
+ }
+
+ if ($exists === false) {
+ if (isset($_GET['lng'])) {
+ tep_redirect(tep_href_link(FILENAME_DEFINE_LANGUAGE));
+ }
+ }
+
+ if (!empty($action)) {

switch ($action) {
case 'save':

- if (isset($HTTP_GET_VARS['lngdir']) && isset($HTTP_GET_VARS['filename'])) {
- if ($HTTP_GET_VARS['filename'] == $HTTP_GET_VARS['lngdir'] . '.php') {
- $file = DIR_FS_CATALOG_LANGUAGES . $HTTP_GET_VARS['filename'];
- } else {
- $file = DIR_FS_CATALOG_LANGUAGES . $HTTP_GET_VARS['lngdir'] . '/' . $HTTP_GET_VARS['filename'];

+ if (isset($_GET['file']) && !empty($_GET['file'])) {
+ $file = realpath(DIR_FS_CATALOG_LANGUAGES . $lng . '/' . $_GET['file']);
+
+ if (substr($file, 0, strlen(DIR_FS_CATALOG_LANGUAGES)) != DIR_FS_CATALOG_LANGUAGES) {
+ $file = false;

}

if (file_exists($file)) {

- if (file_exists('bak' . $file)) {
- @unlink('bak' . $file);
- }
-
- @rename($file, 'bak' . $file);
-

$new_file = fopen($file, 'w');

- $file_contents = stripslashes($HTTP_POST_VARS['file_contents']);

+ $file_contents = $_POST['contents'];

fwrite($new_file, $file_contents, strlen($file_contents));
fclose($new_file);
}

- tep_redirect(tep_href_link(FILENAME_DEFINE_LANGUAGE, 'lngdir=' . $HTTP_GET_VARS['lngdir']));

+
+ tep_redirect(tep_href_link(FILENAME_DEFINE_LANGUAGE, 'lng=' . $lng));

}
break;
}
}

-
- $languages_array = array();
- $languages = tep_get_languages();
- $lng_exists = false;
- for ($i=0, $n=sizeof($languages); $i<$n; $i++) {
- if ($languages[$i]['directory'] == $HTTP_GET_VARS['lngdir']) $lng_exists = true;

- $languages_array[] = array('id' => $languages[$i]['directory'],
- 'text' => $languages[$i]['name']);

+ switch ($action) {
+ case 'edit': $page_contents = 'define_language_edit.php'; break;
+ default: $page_contents = 'define_language.php';

}

- if (!$lng_exists) $HTTP_GET_VARS['lngdir'] = $language;
-?>
-<!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><?php echo tep_draw_form('lng', FILENAME_DEFINE_LANGUAGE, '', 'get'); ?>
- <td class="pageHeading"><?php echo HEADING_TITLE; ?></td>
- <td class="pageHeading" align="right"><?php echo tep_draw_separator('pixel_trans.gif', '1', HEADING_IMAGE_HEIGHT); ?></td>
- <td class="pageHeading" align="right"><?php echo tep_draw_pull_down_menu('lngdir', $languages_array, $HTTP_GET_VARS['lngdir'], 'onChange="this.form.submit();"'); ?></td>
- </form></tr>
- </table></td>
- </tr>
- <tr>
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
-<?php
- if (isset($HTTP_GET_VARS['lngdir']) && isset($HTTP_GET_VARS['filename'])) {
- if ($HTTP_GET_VARS['filename'] == $HTTP_GET_VARS['lngdir'] . '.php') {
- $file = DIR_FS_CATALOG_LANGUAGES . $HTTP_GET_VARS['filename'];
- } else {
- $file = DIR_FS_CATALOG_LANGUAGES . $HTTP_GET_VARS['lngdir'] . '/' . $HTTP_GET_VARS['filename'];
- }

+ require('templates/default.php');

- if (file_exists($file)) {
- $file_array = file($file);
- $contents = implode('', $file_array);
-
- $file_writeable = true;
- if (!is_writeable($file)) {
- $file_writeable = false;
- $messageStack->reset();
- $messageStack->add(sprintf(ERROR_FILE_NOT_WRITEABLE, $file), 'error');
- echo $messageStack->output();
- }
-
-?>
- <tr><?php echo tep_draw_form('language', FILENAME_DEFINE_LANGUAGE, 'lngdir=' . $HTTP_GET_VARS['lngdir'] . '&filename=' . $HTTP_GET_VARS['filename'] . '&action=save'); ?>
- <td><table border="0" cellspacing="0" cellpadding="2">
- <tr>
- <td class="main"><b><?php echo $HTTP_GET_VARS['filename']; ?></b></td>
- </tr>
- <tr>
- <td class="main"><?php echo tep_draw_textarea_field('file_contents', 'soft', '80', '20', $contents, (($file_writeable) ? '' : 'readonly')); ?></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '1', '10'); ?></td>
- </tr>
- <tr>
- <td align="right"><?php if ($file_writeable == true) { echo tep_image_submit('button_save.gif', IMAGE_SAVE) . '&nbsp;<a href="' . tep_href_link(FILENAME_DEFINE_LANGUAGE, 'lngdir=' . $HTTP_GET_VARS['lngdir']) . '">' . tep_image_button('button_cancel.gif', IMAGE_CANCEL) . '</a>'; } else { echo '<a href="' . tep_href_link(FILENAME_DEFINE_LANGUAGE, 'lngdir=' . $HTTP_GET_VARS['lngdir']) . '">' . tep_image_button('button_back.gif', IMAGE_BACK) . '</a>'; } ?></td>
- </tr>
- </table></td>
- </form></tr>
-<?php
- } else {
-?>
- <tr>
- <td class="main"><b><?php echo TEXT_FILE_DOES_NOT_EXIST; ?></b></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '1', '10'); ?></td>
- </tr>
- <tr>
- <td><?php echo '<a href="' . tep_href_link(FILENAME_DEFINE_LANGUAGE, 'lngdir=' . $HTTP_GET_VARS['lngdir']) . '">' . tep_image_button('button_back.gif', IMAGE_BACK) . '</a>'; ?></td>
- </tr>
-<?php
- }
- } else {
- $filename = $HTTP_GET_VARS['lngdir'] . '.php';
-?>
- <tr>
- <td><table width="100%" border="0" cellspacing="0" cellpadding="0">
- <tr>
- <td class="smallText"><a href="<?php echo tep_href_link(FILENAME_DEFINE_LANGUAGE, 'lngdir=' . $HTTP_GET_VARS['lngdir'] . '&filename=' . $filename); ?>"><b><?php echo $filename; ?></b></a></td>
-<?php
- $left = false;
- if ($dir = dir(DIR_FS_CATALOG_LANGUAGES . $HTTP_GET_VARS['lngdir'])) {
- $file_extension = substr($PHP_SELF, strrpos($PHP_SELF, '.'));
- while ($file = $dir->read()) {
- if (substr($file, strrpos($file, '.')) == $file_extension) {
- echo ' <td class="smallText"><a href="' . tep_href_link(FILENAME_DEFINE_LANGUAGE, 'lngdir=' . $HTTP_GET_VARS['lngdir'] . '&filename=' . $file) . '">' . $file . '</a></td>' . "\n";
- if (!$left) {
- echo ' </tr>' . "\n" .
- ' <tr>' . "\n";
- }
- $left = !$left;
- }
- }
- $dir->close();
- }
-?>
- </tr>
- </table></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '1', '10'); ?></td>
- </tr>
- <tr>
- <td align="right"><?php echo '<a href="' . tep_href_link(FILENAME_FILE_MANAGER, 'current_path=' . DIR_FS_CATALOG_LANGUAGES . $HTTP_GET_VARS['lngdir']) . '">' . tep_image_button('button_file_manager.gif', IMAGE_FILE_MANAGER) . '</a>'; ?></td>
- </tr>
-<?php
- }

+ require('includes/application_bottom.php');

?>

- </table></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'); ?>

----------

admin /admin /includes /languages /english

define_language.php 1.3 -> 1.4

diff -u -r1.3 -r1.4
--- define_language.php 2002/01/05 12:19:50 1.3
+++ define_language.php 2004/08/15 18:17:02 1.4
@@ -5,14 +5,21 @@

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', 'Define Language');

+ define('HEADING_TITLE', 'Define Language');

-define('TEXT_FILE_DOES_NOT_EXIST', 'File does not exist.');

+ define('TABLE_HEADING_FILES', 'Files');
+ define('TABLE_HEADING_FILE_SIZE', 'File Size');
+ define('TABLE_HEADING_WRITEABLE', 'Writeable');
+ define('TABLE_HEADING_LAST_MODIFIED', 'Last Modified');

-define('ERROR_FILE_NOT_WRITEABLE', 'Error: I can not write to this file. Please set the right user permissions on: %s');

+ define('TEXT_LANGUAGE_DIRECTORY', 'Language Directory:');
+
+ define('TEXT_FILE_DOES_NOT_EXIST', 'File does not exist.');
+
+ define('ERROR_FILE_NOT_WRITEABLE', 'Error: I can not write to this file. Please set the right user permissions on: %s');

?>

----------

admin /admin /includes /languages /german

define_language.php 1.6 -> 1.7

diff -u -r1.6 -r1.7
--- define_language.php 2002/01/17 11:41:26 1.6
+++ define_language.php 2004/08/15 18:17:03 1.7
@@ -5,14 +5,21 @@

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', 'Sprache definieren');

+ define('HEADING_TITLE', 'Sprache definieren');

-define('TEXT_FILE_DOES_NOT_EXIST', 'Datei nicht vorhanden.');

+ define('TABLE_HEADING_FILES', 'Dateien');
+ define('TABLE_HEADING_FILE_SIZE', 'Dateigr&ouml;&szlig;e');
+ define('TABLE_HEADING_WRITEABLE', 'Beschreibbar');
+ define('TABLE_HEADING_LAST_MODIFIED', 'Letzte &Auml;nderung');

-define('ERROR_FILE_NOT_WRITEABLE', 'Fehler: Die Datei ist schreibgesch&uuml;tzt. Bitte korrigieren Sie die Zugriffsrechte f&uuml;r: %s');
-?>

\ No newline at end of file

+ define('TEXT_LANGUAGE_DIRECTORY', 'Sprache Verzeichnis:');
+
+ define('TEXT_FILE_DOES_NOT_EXIST', 'Datei nicht vorhanden.');
+
+ define('ERROR_FILE_NOT_WRITEABLE', 'Fehler: Die Datei ist schreibgesch&uuml;tzt. Bitte korrigieren Sie die Zugriffsrechte f&uuml;r: %s');
+?>

----------

admin /admin /includes /languages /espanol

define_language.php 1.5 -> 1.6

diff -u -r1.5 -r1.6
--- define_language.php 2003/07/06 20:33:01 1.5
+++ define_language.php 2004/08/15 18:17:04 1.6
@@ -5,14 +5,21 @@

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', 'Editor de Idiomas');

+ define('HEADING_TITLE', 'Editor de Idiomas');

-define('TEXT_FILE_DOES_NOT_EXIST', 'No existe fichero.');

+ define('TABLE_HEADING_FILES', 'Files');
+ define('TABLE_HEADING_FILE_SIZE', 'File Size');
+ define('TABLE_HEADING_WRITEABLE', 'Writeable');
+ define('TABLE_HEADING_LAST_MODIFIED', 'Last Modified');

-define('ERROR_FILE_NOT_WRITEABLE', 'Error: No puedo escribir sobre este fichero. Asigne correctamente permisos a: %s');

+ define('TEXT_LANGUAGE_DIRECTORY', 'Language Directory:');
+
+ define('TEXT_FILE_DOES_NOT_EXIST', 'No existe fichero.');
+
+ define('ERROR_FILE_NOT_WRITEABLE', 'Error: No puedo escribir sobre este fichero. Asigne correctamente permisos a: %s');

?>

----------

admin /admin /templates /pages

define_language.php added at 1.1

diff -N define_language.php
--- /dev/null Sun Aug 15 20:16:57 2004
+++ /tmp/cvsAAA4oayx1 Sun Aug 15 20:17:04 2004
@@ -0,0 +1,77 @@

+<?php
+/*
+ $Id$
+
+ osCommerce, Open Source E-Commerce Solutions
+ http://www.oscommerce.com
+
+ Copyright (c) 2004 osCommerce
+
+ Released under the GNU General Public License
+*/
+
+ require('includes/classes/directory_listing.php');
+
+ $osC_DirectoryListing = new osC_DirectoryListing(DIR_FS_CATALOG_LANGUAGES . $lng);
+ $osC_DirectoryListing->setRecursive(true);
+ $osC_DirectoryListing->setAddDirectoryToFilename(true);
+ $osC_DirectoryListing->setCheckExtension('php');
+ $osC_DirectoryListing->setIncludeDirectories(false);
+ $osC_DirectoryListing->setExcludeEntries('CVS');
+ $files = $osC_DirectoryListing->getFiles();
+
+ array_unshift($files, array('name' => '../' . $lng . '.php', 'is_directory' => false));
+?>
+
+<table border="0" width="100%" cellspacing="0" cellpadding="2">
+ <tr>
+ <td><h1><?php echo HEADING_TITLE; ?></h1></td>
+ <td class="smallText" align="right">
+<?php
+ echo tep_draw_form('language', FILENAME_DEFINE_LANGUAGE, '', 'get') .
+ tep_draw_pull_down_menu('lng', $languages_array, $lng, 'onChange="this.form.submit();"') .
+ '</form>';
+?>
+ </td>
+ </tr>
+</table>
+
+<table border="0" width="100%" cellspacing="0" cellpadding="2" class="dataTable">
+ <thead>
+ <tr>
+ <th><?php echo TABLE_HEADING_FILES; ?></th>
+ <th><?php echo TABLE_HEADING_FILE_SIZE; ?></th>
+ <th><?php echo TABLE_HEADING_WRITEABLE; ?></th>
+ <th><?php echo TABLE_HEADING_LAST_MODIFIED; ?></th>
+ </tr>
+ </thead>
+ <tbody>
+<?php
+ $subdirectories = array();
+
+ for ($i=0, $n=sizeof($files); $i<$n; $i++) {
+ if (($files[$i]['name'] != '../' . $lng . '.php') && (strpos($files[$i]['name'], '/') !== false)) {
+ $subdirectories[] = $files[$i]['name'];
+ } else {
+ echo ' <tr onMouseOver="rowOverEffect(this);" onMouseOut="rowOutEffect(this);">' . "\n" .
+ ' <td><a href="' . tep_href_link(FILENAME_DEFINE_LANGUAGE, 'lng=' . $lng . '&file=' . $files[$i]['name'] . '&action=edit') . '">'. tep_image('templates/' . $template . '/images/icons/16x16/file.png', ICON_FILES, '16', '16') . '&nbsp;' . $files[$i]['name'] . '</a></td>' . "\n" .
+ ' <td align="right">' . number_format(filesize($osC_DirectoryListing->getDirectory() . '/' . $files[$i]['name'])) . '</td>' . "\n" .
+ ' <td align="center">' . tep_image('templates/' . $template . '/images/icons/' . (is_writable($osC_DirectoryListing->getDirectory() . '/' . $files[$i]['name']) ? 'checkbox_ticked.gif' : 'checkbox_crossed.gif')) . '</td>' . "\n" .
+ ' <td align="right">' . date('F d Y H:i:s', filemtime($osC_DirectoryListing->getDirectory() . '/' . $files[$i]['name'])) . '</td>' . "\n" .
+ ' </tr>' . "\n";
+ }
+ }
+
+ for ($i=0, $n=sizeof($subdirectories); $i<$n; $i++) {
+ echo ' <tr onMouseOver="rowOverEffect(this);" onMouseOut="rowOutEffect(this);">' . "\n" .
+ ' <td><a href="' . tep_href_link(FILENAME_DEFINE_LANGUAGE, 'lng=' . $lng . '&file=' . $subdirectories[$i] . '&action=edit') . '">'. tep_image('templates/' . $template . '/images/icons/16x16/file.png', ICON_FILES, '16', '16') . '&nbsp;' . $subdirectories[$i] . '</a></td>' . "\n" .
+ ' <td align="right">' . number_format(filesize($osC_DirectoryListing->getDirectory() . '/' . $subdirectories[$i])) . '</td>' . "\n" .
+ ' <td align="center">' . tep_image('templates/' . $template . '/images/icons/' . (is_writable($osC_DirectoryListing->getDirectory() . '/' . $subdirectories[$i]) ? 'checkbox_ticked.gif' : 'checkbox_crossed.gif')) . '</td>' . "\n" .
+ ' <td align="right">' . date('F d Y H:i:s', filemtime($osC_DirectoryListing->getDirectory() . '/' . $subdirectories[$i])) . '</td>' . "\n" .
+ ' </tr>' . "\n";
+ }
+?>
+ </tbody>
+</table>
+
+<p><?php echo TEXT_LANGUAGE_DIRECTORY . ' ' . $osC_DirectoryListing->getDirectory(); ?></p>

----------

admin /admin /templates /pages

define_language_edit.php added at 1.1

diff -N define_language_edit.php
--- /dev/null Sun Aug 15 20:16:57 2004
+++ /tmp/cvsAAAwqa4x1 Sun Aug 15 20:17:04 2004
@@ -0,0 +1,55 @@

+<?php
+/*
+ $Id$
+
+ osCommerce, Open Source E-Commerce Solutions
+ http://www.oscommerce.com
+
+ Copyright (c) 2004 osCommerce
+
+ Released under the GNU General Public License
+*/
+?>
+
+<h1><?php echo HEADING_TITLE; ?></h1>
+
+<?php
+ $file = realpath(DIR_FS_CATALOG_LANGUAGES . $lng . '/' . $_GET['file']);
+
+ if (substr($file, 0, strlen(DIR_FS_CATALOG_LANGUAGES)) != DIR_FS_CATALOG_LANGUAGES) {
+ $file = false;
+ }
+
+ if (file_exists($file)) {
+ $contents = file_get_contents($file);
+
+ $file_writeable = true;
+
+ if (is_writeable($file) !== true) {
+ $file_writeable = false;
+
+ $messageStack->reset();
+ $messageStack->add(sprintf(ERROR_FILE_NOT_WRITEABLE, $file), 'error');
+ echo $messageStack->output();
+ }
+?>
+
+<?php echo tep_draw_form('language', FILENAME_DEFINE_LANGUAGE, 'lng=' . $lng . '&file=' . $_GET['file'] . '&action=save'); ?>
+
+<p><b><?php echo realpath(DIR_FS_CATALOG_LANGUAGES . $lng . '/' . $_GET['file']); ?></b></p>
+
+<p><?php echo osc_draw_textarea_field('contents', $contents, '80', '20', 'off', 'style="width: 100%;"' . (($file_writeable) ? '' : ' readonly')); ?></p>
+
+<p align="right"><?php if ($file_writeable === true) { echo '<input type="submit" value="' . IMAGE_SAVE . '" class="operationButton">&nbsp;'; } echo '<input type="button" value="' . IMAGE_CANCEL . '" onClick="document.location.href=\'' . tep_href_link(FILENAME_DEFINE_LANGUAGE, 'lng=' . $lng) . '\';" class="operationButton">'; ?></p>
+
+<?php
+ } else {
+?>
+
+<p><?php echo TEXT_FILE_DOES_NOT_EXIST; ?></p>
+
+<p><?php echo '<input type="button" value="' . IMAGE_BACK . '" onClick="document.location.href=\'' . tep_href_link(FILENAME_DEFINE_LANGUAGE, 'lng=' . $lng) . '\';" class="operationButton">'; ?></p>
+
+<?php
+ }
+?>

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