Menu
▾
▴
oscss-commit
|
From: <os...@us...> - 2011-11-26 22:04:41
|
Revision: 3915
http://oscss.svn.sourceforge.net/oscss/?rev=3915&view=rev
Author: oscim
Date: 2011-11-26 22:04:33 +0000 (Sat, 26 Nov 2011)
Log Message:
-----------
nombreuse petite correction de coquille html, ou php suite evolution du core
mise a jour de l'affichage des flag (on/off) dans les listing, traitement des image via css et utilisation du modeles xml du template courant .
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/customerUtility.php
trunk/catalog/admin/includes/languages/fr_FR/fr_FR.php
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/cronjob.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/currencies.txt
trunk/catalog/admin/includes/modules/pages/attributes.php
trunk/catalog/admin/includes/modules/pages/backup.php
trunk/catalog/admin/includes/modules/pages/categories.php
trunk/catalog/admin/includes/modules/pages/cms_content.php
trunk/catalog/admin/includes/modules/pages/cronjob.php
trunk/catalog/admin/includes/modules/pages/currencies.php
trunk/catalog/admin/includes/modules/pages/customers.php
trunk/catalog/admin/includes/modules/pages/held_orders.php
trunk/catalog/admin/includes/modules/pages/orders.php
trunk/catalog/admin/includes/modules/pages/products.php
trunk/catalog/admin/includes/template/oscss/stylesheet-1.css
trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql
Modified: trunk/catalog/admin/includes/classes/customerUtility.php
===================================================================
--- trunk/catalog/admin/includes/classes/customerUtility.php 2011-11-26 14:31:54 UTC (rev 3914)
+++ trunk/catalog/admin/includes/classes/customerUtility.php 2011-11-26 22:04:33 UTC (rev 3915)
@@ -169,9 +169,14 @@
if(!tep_db_num_rows($customers)) return;
+
$customers_values = tep_db_fetch_array($customers);
+ $languages = tep_get_languages($customers_values['customers_language']);
- $nom=$customers_values['customers_firstname'] . ' ' . $customers_values['customers_lastname'];
+ foreach($languages as $row)
+ $lg = $row;
+
+ $nom= /*tep_image(DIR_WS_CATALOG_LANGUAGES . $lg['directory'] . '/images/' . $lg['image'], $lg['name']) .' ' . */$customers_values['customers_firstname'] . ' ' . $customers_values['customers_lastname'];
$action= '<a href="'.tep_mailto($customers_values['customers_email_address'],$origin).'">'.tep_image(DIR_WS_ICONS.'icon_custom_mail.png',TXT_MINIF_EMAIL).'</a> '
.'<a href="'.tep_href_link(FILENAME_CUSTOMERS,'cID=' . $customers_id. '&origin='.urlencode($origin) ).'&action=edit">'.tep_image(DIR_WS_ICONS.'icon_custom_edit.png',TXT_MINIF_DETAIL).'</a> '
.'<a href="'.tep_href_link(FILENAME_STATS,'module=stats_customers').'">'.tep_image(DIR_WS_ICONS.'icon_stats.png',TXT_MINIF_STATS_BUY).'</a> '
Modified: trunk/catalog/admin/includes/languages/fr_FR/fr_FR.php
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/fr_FR.php 2011-11-26 14:31:54 UTC (rev 3914)
+++ trunk/catalog/admin/includes/languages/fr_FR/fr_FR.php 2011-11-26 22:04:33 UTC (rev 3915)
@@ -29,6 +29,7 @@
define('DATE_FORMAT_SHORT', '%d/%m/%Y'); // this is used for tep_strftime()
define('DATE_FORMAT_LONG', '%A %d %B %Y'); // this is used for tep_strftime()
define('DATE_FORMAT', 'd/m/Y'); // this is used for date()
+define('PHP_DATE_TIME_FORMAT', 'd/m/Y H:i:s'); // this is used for date()
define('DATE_TIME_FORMAT'," ".DATE_FORMAT_SHORT . " %H:%M:%S" );
////
@@ -313,6 +314,7 @@
define('FIRST',"Premier" );
define('PREVIOUS',"Dernier" );
+
// CIP ADD AUTO -- NOT TOUCH LINE
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/pages/cronjob.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/pages/cronjob.txt 2011-11-26 14:31:54 UTC (rev 3914)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/cronjob.txt 2011-11-26 22:04:33 UTC (rev 3915)
@@ -3,8 +3,8 @@
@licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 23/03/11, 14:45
+ @version 2.1.1
+ @date 26/11/11, 21:43
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -56,9 +56,6 @@
$lang['txt detail usage']="Les taches programmées vous permette d'automatiser certaines actions . Celle ci sont complement centralisé dans cette gestion.<br /><br />
-Les taches programmées vous permette d'automatiser certaines actions . Celle ci sont complement centralisé dans cette gestion.<br /><br />
-Les taches programmées vous permette d'automatiser certaines actions . Celle ci sont complement centralisé dans cette gestion.<br /><br />
-Les taches programmées vous permette d'automatiser certaines actions . Celle ci sont complement centralisé dans cette gestion.<br /><br />
<pre>".tep_get_http().DIR_WS_ADMIN."cronfile.php</pre>" ;
/* Module Name */
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/pages/currencies.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/pages/currencies.txt 2011-11-26 14:31:54 UTC (rev 3914)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/currencies.txt 2011-11-26 22:04:33 UTC (rev 3915)
@@ -1,9 +1,10 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.0.9
- @date 30/08/10, 21:39
+ @version 2.1.1
+ @date 26/11/11, 22:00
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -29,7 +30,7 @@
$lang['text info heading new currency']="Nouvelle devise" ;
$lang['text info heading edit currency']="Éditer la devise" ;
$lang['text info heading delete currency']="Supprimer la devise" ;
-$lang['text info set as default']=" ".EXT_SET_DEFAULT . " (Requiert une mise à jour manuelle de la valeur de la devise)" ;
+$lang['text info set as default']=" Definir comme valeur par defaut. (Requiert que vous utilisez la valeur 1.00 et lancer une mise à jour des devises)" ;
$lang['text info currency updated']="Le taux de change pour %s (%s) a été mis à jour avec succès par l'intermédiaire de %s." ;
$lang['error remove default currency']="Erreur : La devise par défaut ne peut être supprimé. Merci de choisir une autre devise par défaut et de réessayer." ;
$lang['error currency invalid']="Erreur : Le taux de change pour %s (%s) n'a pas été mis à jour par l'intermédiaire de %s. S'agit-t'il d'un code devise valide ?" ;
Modified: trunk/catalog/admin/includes/modules/pages/attributes.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/attributes.php 2011-11-26 14:31:54 UTC (rev 3914)
+++ trunk/catalog/admin/includes/modules/pages/attributes.php 2011-11-26 22:04:33 UTC (rev 3915)
@@ -4,7 +4,7 @@
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 01/11/11, 09:50
+ @date 26/11/11, 21:49
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class attributes
@@ -314,29 +314,59 @@
'</span>';
}
- //! flag optionnel
+
+ /**
+ @brief return format html for row flag optionnel
+ @param $product array restuts row
+ @return string html
+ */
private static function get_item_optionnel($item){
- if ($item['products_options_condition'] == '1') {
- return tep_image(DIR_WS_ICONS . 'icon_status_green.gif', IMAGE_ICON_STATUS_GREEN) . ' <a href="' . tep_href_link(attributes::FILENAME ,'action=setcond&flag=0&poID=' . $item['products_options_id'] ) . '">' . tep_image(DIR_WS_ICONS . 'icon_status_red_light.gif', IMAGE_ICON_STATUS_RED_LIGHT) . '</a>';
- } else {
- return '<a href="' . tep_href_link(attributes::FILENAME ,'action=setcond&flag=1&poID=' . $item['products_options_id'] ) . '">' . tep_image(DIR_WS_ICONS . 'icon_status_green_light.gif', IMAGE_ICON_STATUS_GREEN_LIGHT) . '</a> ' . tep_image(DIR_WS_ICONS . 'icon_status_red.gif', IMAGE_ICON_STATUS_RED);
- }
+ $exclude=array('action','cID','forceajax','type','class','function','funct', 'mod');
+ $query_s='action=setcond&cID=' . $item['products_options_id'].'&flag=';
+
+ return '<a href="' . tep_href_link(self::FILENAME, tep_get_all_get_params($exclude).$query_s.(($item['products_options_condition'] == '1')? '0' : '1') ) . '">'.
+ sprintf(
+ CsrtAction::getFormat('row_flag'),
+ (int)$item['products_options_condition'],
+ ( ($item['products_options_condition'] == '1')? IMAGE_ICON_STATUS_GREEN : IMAGE_ICON_STATUS_RED)
+ ).
+ '</a>';
}
- //! flag track stock
+
+ /**
+ @brief return format html for row stock
+ @param $product array restuts row
+ @return string html
+ */
private static function get_item_stock($item){
- if ($item['products_options_track_stock'] == '1') {
- return tep_image(DIR_WS_ICONS . 'icon_status_green.gif', IMAGE_ICON_STATUS_GREEN) . ' <a href="' . tep_href_link(attributes::FILENAME,'action=setstock&flag=0&poID=' . $item['products_options_id'] ) . '">' . tep_image(DIR_WS_ICONS . 'icon_status_red_light.gif', IMAGE_ICON_STATUS_RED_LIGHT) . '</a>';
- } else {
- return '<a href="' . tep_href_link(attributes::FILENAME, 'action=setstock&flag=1&poID=' . $item['products_options_id'] ) . '">' . tep_image(DIR_WS_ICONS . 'icon_status_green_light.gif', IMAGE_ICON_STATUS_GREEN_LIGHT) . '</a> ' . tep_image(DIR_WS_ICONS . 'icon_status_red.gif', IMAGE_ICON_STATUS_RED);
- }
+ $exclude=array('action','cID','forceajax','type','class','function','funct', 'mod');
+ $query_s='action=setstock&cID=' . $item['products_options_id'].'&flag=';
+
+ return '<a href="' . tep_href_link(self::FILENAME, tep_get_all_get_params($exclude).$query_s.(($item['products_options_track_stock'] == '1')? '0' : '1') ) . '">'.
+ sprintf(
+ CsrtAction::getFormat('row_flag'),
+ (int)$item['products_options_track_stock'],
+ ( ($item['products_options_track_stock'] == '1')? IMAGE_ICON_STATUS_GREEN : IMAGE_ICON_STATUS_RED)
+ ).
+ '</a>';
}
- //! flag image
+
+ /**
+ @brief return format html for row image
+ @param $product array restuts row
+ @return string html
+ */
private static function get_item_images($item){
- if ($item['products_options_images_enabled'] == '1') {
- return tep_image(DIR_WS_ICONS . 'icon_status_green.gif', IMAGE_ICON_STATUS_GREEN) . ' <a href="' . tep_href_link(attributes::FILENAME, 'action=setimg&flag=0&poID=' . $item['products_options_id'] ) . '">' . tep_image(DIR_WS_ICONS . 'icon_status_red_light.gif', IMAGE_ICON_STATUS_RED_LIGHT) . '</a>';
- } else {
- return '<a href="' . tep_href_link(attributes::FILENAME, 'action=setimg&flag=1&poID=' . $item['products_options_id'] ) . '">' . tep_image(DIR_WS_ICONS . 'icon_status_green_light.gif', IMAGE_ICON_STATUS_GREEN_LIGHT) . '</a> ' . tep_image(DIR_WS_ICONS . 'icon_status_red.gif', IMAGE_ICON_STATUS_RED);
- }
+ $exclude=array('action','cID','forceajax','type','class','function','funct', 'mod');
+ $query_s='action=setimg&cID=' . $item['products_options_id'].'&flag=';
+
+ return '<a href="' . tep_href_link(self::FILENAME, tep_get_all_get_params($exclude).$query_s.(($item['products_options_images_enabled'] == '1')? '0' : '1') ) . '">'.
+ sprintf(
+ CsrtAction::getFormat('row_flag'),
+ (int)$item['products_options_images_enabled'],
+ ( ($item['products_options_images_enabled'] == '1')? IMAGE_ICON_STATUS_GREEN : IMAGE_ICON_STATUS_RED)
+ ).
+ '</a>';
}
private static function emptyResult(){
Modified: trunk/catalog/admin/includes/modules/pages/backup.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/backup.php 2011-11-26 14:31:54 UTC (rev 3914)
+++ trunk/catalog/admin/includes/modules/pages/backup.php 2011-11-26 22:04:33 UTC (rev 3915)
@@ -3,8 +3,8 @@
@licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 05/06/11, 18:10
+ @version 2.1.1
+ @date 26/11/11, 21:49
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class backup
@@ -357,25 +357,8 @@
}
-// public static function get_right_bar()
-// {
-// // case 'detail':
-// // if (isset($buInfo) && is_object($buInfo)) {
-// // $heading[] = array('text' => $buInfo->date );
-// //
-// // $contents[] = array('class' => 'button_nav', 'text' => '<a class="button" href="' . tep_href_link(self::FILENAME, 'file=' . $buInfo->file . '&action=restore') . '">' .__('image restore') . '</a> <a class="button" href="' . tep_href_link(self::FILENAME, 'file=' . $buInfo->file . '&action=delete') . '">' . IMAGE_DELETE . '</a>');
-// // $contents[] = array('text' => __('text info date').' '. $buInfo->date);
-// // $contents[] = array('text' => __('text info size') .' '. $buInfo->size);
-// // $contents[] = array('text' => __('text info compression') .' '. $buInfo->compression);
-// // }
-// // break;
-// }
-
-
-
-
public static function tep_get_list($page=1,$rowbyp=10,$sOrder='',$sWhere='',$options=''){
global $query_numrows;
Modified: trunk/catalog/admin/includes/modules/pages/categories.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/categories.php 2011-11-26 14:31:54 UTC (rev 3914)
+++ trunk/catalog/admin/includes/modules/pages/categories.php 2011-11-26 22:04:33 UTC (rev 3915)
@@ -425,18 +425,41 @@
);
}
+
+ /**
+ @brief return format html for row status
+ @param $product array restuts row
+ @return string html
+ */
private static function get_status_categories($categories){
- if ($categories['categories_status'] == '1')
- return tep_image(DIR_WS_ICONS . 'icon_status_green.gif', IMAGE_ICON_STATUS_GREEN) . ' <a href="' . tep_href_link(categories::FILENAME, 'action=setflag&flag=0&cID=' . $categories['categories_id'] . '&cPath=' . self::$cPath) . '">' . tep_image(DIR_WS_ICONS . 'icon_status_red_light.gif', IMAGE_ICON_STATUS_RED_LIGHT) . '</a>';
- else
- return '<a href="' . tep_href_link(categories::FILENAME, 'action=setflag&flag=1&cID=' . $categories['categories_id'] . '&cPath=' . self::$cPath) . '">' . tep_image(DIR_WS_ICONS . 'icon_status_green_light.gif', IMAGE_ICON_STATUS_GREEN_LIGHT) . '</a> ' . tep_image(DIR_WS_ICONS . 'icon_status_red.gif', IMAGE_ICON_STATUS_RED);
+ $exclude=array('action','cID','forceajax','type','class','function','funct', 'mod');
+ $query_s='action=setflag&cID=' . $categories['categories_id'].'&flag=';
+
+ return '<a href="' . tep_href_link(self::FILENAME, tep_get_all_get_params($exclude).$query_s.(($categories['categories_status'] == '1')? '0' : '1') ) . '">'.
+ sprintf(
+ CsrtAction::getFormat('row_flag'),
+ (int)$categories['categories_status'],
+ ( ($categories['categories_status'] == '1')? IMAGE_ICON_STATUS_GREEN : IMAGE_ICON_STATUS_RED)
+ ).
+ '</a>';
}
+ /**
+ @brief return format html for row hidden
+ @param $product array restuts row
+ @return string html
+ */
private static function get_status_menu($categories){
- if ($categories['categories_hidden'] == '1')
- return tep_image(DIR_WS_ICONS . 'icon_status_green.gif', IMAGE_ICON_STATUS_GREEN) . ' <a href="' . tep_href_link(self::FILENAME, 'action=viewflag&flag=0&cID=' . $categories['categories_id'] . '&cPath=' . self::$cPath) . '" title="'.__('view in menu').'">' . tep_image(DIR_WS_ICONS . 'icon_status_red_light.gif', IMAGE_ICON_STATUS_RED_LIGHT) . '</a>';
- else
- return '<a href="' . tep_href_link(self::FILENAME, 'action=viewflag&flag=1&cID=' . $categories['categories_id'] . '&cPath=' . self::$cPath) . '" title="'.__('view in menu').'">' . tep_image(DIR_WS_ICONS . 'icon_status_green_light.gif', IMAGE_ICON_STATUS_GREEN_LIGHT) . '</a> ' . tep_image(DIR_WS_ICONS . 'icon_status_red.gif', IMAGE_ICON_STATUS_RED);
+ $exclude=array('action','cID','forceajax','type','class','function','funct', 'mod');
+ $query_s='action=viewflag&cID=' . $categories['categories_id'].'&flag=';
+
+ return '<a href="' . tep_href_link(self::FILENAME, tep_get_all_get_params($exclude).$query_s.(($categories['categories_hidden'] == '1')? '0' : '1') ) . '">'.
+ sprintf(
+ CsrtAction::getFormat('row_flag'),
+ (int)$categories['categories_hidden'],
+ ( ($categories['categories_hidden'] == '1')? IMAGE_ICON_STATUS_GREEN : IMAGE_ICON_STATUS_RED)
+ ).
+ '</a>';
}
public static function tep_get_modele(){
Modified: trunk/catalog/admin/includes/modules/pages/cms_content.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/cms_content.php 2011-11-26 14:31:54 UTC (rev 3914)
+++ trunk/catalog/admin/includes/modules/pages/cms_content.php 2011-11-26 22:04:33 UTC (rev 3915)
@@ -280,8 +280,16 @@
@param $content array
*/
private static function get_item_status($content){
- if($content['content_status'] == '1') return tep_image(DIR_WS_ICONS . 'icon_status_green.gif', IMAGE_ICON_STATUS_GREEN) . ' <a href="' . tep_href_link(self::FILENAME, 'action=setflag&flag=0&cID=' . $content['content_id']) . '">' . tep_image(DIR_WS_ICONS . 'icon_status_red_light.gif', IMAGE_ICON_STATUS_RED_LIGHT) . '</a>';
- else return '<a href="' . tep_href_link(self::FILENAME, 'action=setflag&flag=1&cID=' . $content['content_id']) . '">' . tep_image(DIR_WS_ICONS . 'icon_status_green_light.gif', IMAGE_ICON_STATUS_GREEN_LIGHT) . '</a> ' . tep_image(DIR_WS_ICONS . 'icon_status_red.gif', IMAGE_ICON_STATUS_RED) ;
+ $exclude=array('action','cID','forceajax','type','class','function','funct', 'mod');
+ $query_s='action=setflag&cID=' . $content['content_id'].'&flag=';
+
+ return '<a href="' . tep_href_link(self::FILENAME, tep_get_all_get_params($exclude).$query_s.(($content['content_status'] == '1')? '0' : '1') ) . '">'.
+ sprintf(
+ CsrtAction::getFormat('row_flag'),
+ (int)$content['content_status'],
+ ( ($content['content_status'] == '1')? IMAGE_ICON_STATUS_GREEN : IMAGE_ICON_STATUS_RED)
+ ).
+ '</a>';
}
/**
@@ -290,8 +298,17 @@
@param $content array
*/
private static function get_item_content_hidden($content){
- if($content['content_hidden'] == '1') return tep_image(DIR_WS_ICONS . 'icon_status_green.gif', IMAGE_ICON_STATUS_GREEN) . ' <a href="' . tep_href_link(self::FILENAME, 'action=viewflag&flag=0&cID=' . $content['content_id']) . '">' . tep_image(DIR_WS_ICONS . 'icon_status_red_light.gif', IMAGE_ICON_STATUS_RED_LIGHT) . '</a>';
- else return '<a href="' . tep_href_link(self::FILENAME, 'action=viewflag&flag=1&cID=' . $content['content_id']) . '">' . tep_image(DIR_WS_ICONS . 'icon_status_green_light.gif', IMAGE_ICON_STATUS_GREEN_LIGHT) . '</a> ' . tep_image(DIR_WS_ICONS . 'icon_status_red.gif', IMAGE_ICON_STATUS_RED) ;
+
+ $exclude=array('action','cID','forceajax','type','class','function','funct', 'mod');
+ $query_s='action=viewflag&cID=' . $content['content_id'].'&flag=';
+
+ return '<a href="' . tep_href_link(self::FILENAME, tep_get_all_get_params($exclude).$query_s.(($content['content_hidden'] == '1')? '0' : '1') ) . '">'.
+ sprintf(
+ CsrtAction::getFormat('row_flag'),
+ (int)$content['content_hidden'],
+ ( ($content['content_hidden'] == '1')? IMAGE_ICON_STATUS_GREEN : IMAGE_ICON_STATUS_RED)
+ ).
+ '</a>';
}
/**
Modified: trunk/catalog/admin/includes/modules/pages/cronjob.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/cronjob.php 2011-11-26 14:31:54 UTC (rev 3914)
+++ trunk/catalog/admin/includes/modules/pages/cronjob.php 2011-11-26 22:04:33 UTC (rev 3915)
@@ -3,8 +3,8 @@
@licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 22/03/11, 21:28
+ @version 2.1.1
+ @date 26/11/11, 21:45
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class cronjob
@@ -284,12 +284,23 @@
}
+ /**
+ @brief return format html for row status
+ @param $product array restuts row
+ @return string html
+ */
private static function get_item_status($array){
- if ($array['status'] == '1')
- return tep_image(DIR_WS_ICONS . 'icon_status_green.gif', IMAGE_ICON_STATUS_GREEN) . ' <a href="' . tep_href_link(self::FILENAME, 'action=setflag&flag=0&cID=' .$array['id']) . '">' . tep_image(DIR_WS_ICONS . 'icon_status_red_light.gif', IMAGE_ICON_STATUS_RED_LIGHT) . '</a>';
- else
- return '<a href="' . tep_href_link(self::FILENAME, 'action=setflag&flag=1&cID=' . $array['id'] ) . '">' . tep_image(DIR_WS_ICONS . 'icon_status_green_light.gif', IMAGE_ICON_STATUS_GREEN_LIGHT) . '</a> ' . tep_image(DIR_WS_ICONS . 'icon_status_red.gif', IMAGE_ICON_STATUS_RED);
+ $exclude=array('action','cID','forceajax','type','class','function','funct', 'mod');
+ $query_s='action=setflag&cID=' . $array['id'].'&flag=';
+ return '<a href="' . tep_href_link(self::FILENAME, tep_get_all_get_params($exclude).$query_s.(($array['status'] == '1')? '0' : '1') ) . '">'.
+ sprintf(
+ CsrtAction::getFormat('row_flag'),
+ (int)$array['status'],
+ ( ($array['status'] == '1')? IMAGE_ICON_STATUS_GREEN : IMAGE_ICON_STATUS_RED)
+ ).
+ '</a>';
+
}
/**
Modified: trunk/catalog/admin/includes/modules/pages/currencies.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/currencies.php 2011-11-26 14:31:54 UTC (rev 3914)
+++ trunk/catalog/admin/includes/modules/pages/currencies.php 2011-11-26 22:04:33 UTC (rev 3915)
@@ -11,6 +11,13 @@
@brief This class manipulate devise (add/up/delete)
*/
+// Define how do we update currency exchange rates
+// Possible values are 'oanda' 'xe' or ''
+ define('CURRENCY_SERVER_PRIMARY', 'oanda');
+ define('CURRENCY_SERVER_BACKUP', 'xe');
+
+
+
class currencies
implements ExtModPage, InterfacedTJsonS, InterfaceModule {
Modified: trunk/catalog/admin/includes/modules/pages/customers.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/customers.php 2011-11-26 14:31:54 UTC (rev 3914)
+++ trunk/catalog/admin/includes/modules/pages/customers.php 2011-11-26 22:04:33 UTC (rev 3915)
@@ -407,6 +407,11 @@
);
}
+ /**
+ @brief return format html for row
+ @param $product array restuts row
+ @return string html
+ */
private static function get_status_da($customers){
return sprintf(
CsrtAction::getFormat('row_etat'),
@@ -415,6 +420,11 @@
);
}
+ /**
+ @brief return format html for row status
+ @param $product array restuts row
+ @return string html
+ */
private static function get_status_c($customers){
$exclude=array('action','cID','forceajax','type','class','function','funct', 'mod');
$query_s='action=setflag&cID=' . $customers['customers_id'].'&flag=';
Modified: trunk/catalog/admin/includes/modules/pages/held_orders.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/held_orders.php 2011-11-26 14:31:54 UTC (rev 3914)
+++ trunk/catalog/admin/includes/modules/pages/held_orders.php 2011-11-26 22:04:33 UTC (rev 3915)
@@ -3,8 +3,8 @@
@licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 07/06/11, 22:17
+ @version 2.1.1
+ @date 26/11/11, 22:33
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class held_orders
@@ -252,7 +252,7 @@
return sprintf(
CsrtAction::getFormat('row_action'),
'' ,
- sprintf(CsrtAction::getLink('row_action_right', __('image recup help order'), 'recup_order'), '', tep_href_link(self::FILENAME, 'oID=' . $orders['oID'] . '&action=new_product') ,'' ).
+ sprintf(CsrtAction::getLink('row_action_right', __('image recup help order'), 'recup_order'), 'fancy', tep_href_link(self::FILENAME, 'oID=' . $orders['oID'] . '&action=recup_order') ,'' ).
sprintf(CsrtAction::getLink('row_action_right', IMAGE_DELETE, 'delete'), 'fancy', tep_href_link(self::FILENAME, 'oID=' . $orders['oID'] . '&action=delete') ,'' )
);
}
Modified: trunk/catalog/admin/includes/modules/pages/orders.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/orders.php 2011-11-26 14:31:54 UTC (rev 3914)
+++ trunk/catalog/admin/includes/modules/pages/orders.php 2011-11-26 22:04:33 UTC (rev 3915)
@@ -173,6 +173,12 @@
}
+
+
+ global $oscss;
+ $oscss->_add_ext(BO_WISIWYG_SELECTED,'editeur/');
+ echo $oscss->_call(BO_WISIWYG_SELECTED,'_top','comments','800','400');
+
return true;
}
@@ -344,7 +350,12 @@
}
public function get_header(){
- if (self::$action == 'edit'): ?>
+ if (self::$action == 'edit'):
+
+
+
+
+ ?>
<script type="text/javascript"><!--
function disabled(inputs){$(inputs).css.display='none';}
function activ(inputs){$(inputs).css.display='inline';}
Modified: trunk/catalog/admin/includes/modules/pages/products.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/products.php 2011-11-26 14:31:54 UTC (rev 3914)
+++ trunk/catalog/admin/includes/modules/pages/products.php 2011-11-26 22:04:33 UTC (rev 3915)
@@ -556,14 +556,22 @@
);
}
+ /**
+ @brief return format html for row status
+ @param $product array restuts row product
+ @return string html
+ */
private static function get_status_product($products){
$exclude=array('action','pID','forceajax','type','class','function','funct', 'mod');
$query_s='action=setflag&pID=' . $products['products_id'].'&flag=';
- if ($products['products_status'] == '1')
- return tep_image(DIR_WS_ICONS . 'icon_status_green.gif', IMAGE_ICON_STATUS_GREEN) . ' <a href="' . tep_href_link(self::FILENAME, tep_get_all_get_params($exclude).$query_s.'0' ) . '">' . tep_image(DIR_WS_ICONS . 'icon_status_red_light.gif', IMAGE_ICON_STATUS_RED_LIGHT) . '</a>';
- else
- return '<a href="' . tep_href_link(self::FILENAME, tep_get_all_get_params($exclude).$query_s.'1') . '">' . tep_image(DIR_WS_ICONS . 'icon_status_green_light.gif', IMAGE_ICON_STATUS_GREEN_LIGHT) . '</a> ' . tep_image(DIR_WS_ICONS . 'icon_status_red.gif', IMAGE_ICON_STATUS_RED);
+ return '<a href="' . tep_href_link(self::FILENAME, tep_get_all_get_params($exclude).$query_s.(($products['products_status'] == '1')? '0' : '1') ) . '">'.
+ sprintf(
+ CsrtAction::getFormat('row_flag'),
+ (int)$products['products_status'],
+ ( ($products['products_status'] == '1')? IMAGE_ICON_STATUS_GREEN : IMAGE_ICON_STATUS_RED)
+ ).
+ '</a>';
}
private static function emptyResult(){
Modified: trunk/catalog/admin/includes/template/oscss/stylesheet-1.css
===================================================================
--- trunk/catalog/admin/includes/template/oscss/stylesheet-1.css 2011-11-26 14:31:54 UTC (rev 3914)
+++ trunk/catalog/admin/includes/template/oscss/stylesheet-1.css 2011-11-26 22:04:33 UTC (rev 3915)
@@ -254,7 +254,7 @@
#user ul#MenuExts li a {color:white;}
#user ul#MenuExts li a:hover{color:gray;}
#user li { position:relative; float:left;}
- #user a { display:block; padding-top:4px; color:#000; text-decoration:none; text-shadow:0 1px 0 #fff; height:18px; text-align:center; font:normal 11px Verdana, Arial, sans-serif; }
+ #user a { display:block; padding-top:4px; color:#000; text-decoration:none; text-shadow:none; height:18px; text-align:center; font:normal 11px Verdana, Arial, sans-serif; }
/* Switcher */
p.themeSwitcher { float:right; margin:0; padding:2px 1em 0 0; text-align:right; width:250px; }
p.themeSwitcher select { vertical-align:middle; font-size:0.9em; width:100px; }
Modified: trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql 2011-11-26 14:31:54 UTC (rev 3914)
+++ trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql 2011-11-26 22:04:33 UTC (rev 3915)
@@ -239,6 +239,7 @@
-- 17 General Backoffice
insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('BO_FILEBROSWER_SERVER_USE_S', 'BO_FILEBROSWER_SERVER_USE', 'tinybrowser', 'BO_FILEBROSWER_SERVER_USE_L', '17', '0', NOW(), NOW(), NULL, NULL, '1');
insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('BO_WISIWYG_SELECTED_S', 'BO_WISIWYG_SELECTED', 'tiny_mce', 'BO_WISIWYG_SELECTED_L', '17', '0', NOW(), NOW(), NULL...
[truncated message content] |
|
From: <os...@us...> - 2011-12-01 21:08:13
|
Revision: 3919
http://oscss.svn.sourceforge.net/oscss/?rev=3919&view=rev
Author: oscim
Date: 2011-12-01 21:08:06 +0000 (Thu, 01 Dec 2011)
Log Message:
-----------
suite correction gestion affichage public et seo
suite normalisation des clef passe en GET
Modified Paths:
--------------
trunk/catalog/common/classes/seo_url.php
trunk/catalog/document.php
trunk/catalog/includes/application_top.php
trunk/catalog/includes/classes/drivers/data/categorie.php
trunk/catalog/includes/classes/page.php
trunk/catalog/includes/filenames.php
trunk/catalog/index.php
trunk/catalog/install/includes/modele/configure.txt
trunk/catalog/install/includes/modele/htaccess.txt
Modified: trunk/catalog/common/classes/seo_url.php
===================================================================
--- trunk/catalog/common/classes/seo_url.php 2011-12-01 17:48:57 UTC (rev 3918)
+++ trunk/catalog/common/classes/seo_url.php 2011-12-01 21:08:06 UTC (rev 3919)
@@ -26,17 +26,17 @@
* $cache is the per page data array that contains all of the previously stripped titles
@var array
*/
- var $cache;
+ public $cache;
/**
* $languages_id contains the language_id for this instance
@var integer
*/
- var $languages_id;
+ public $languages_id;
/**
* $attributes array contains all the required settings for class
@var array
*/
- var $attributes;
+ public $attributes;
/**
* $base_url is the NONSSL URL for site
@var string
@@ -51,73 +51,73 @@
* $performance array contains evaluation metric data
@var array
*/
- var $performance;
+ public $performance;
/**
* $timestamp simply holds the temp variable for time calculations
@var float
*/
- var $timestamp;
+ public $timestamp;
/**
* $reg_anchors holds the anchors used by the .htaccess rewrites
@var array
*/
- var $reg_anchors;
+ public $reg_anchors;
/**
* $cache_query is the resource_id used for database cache logic
@var resource
*/
- var $cache_query;
+ public $cache_query;
/**
* $cache_file is the basename of the cache database entry
@var string
*/
- var $cache_file;
+ public $cache_file;
/**
* $data array contains all records retrieved from database cache
@var array
*/
- var $data;
+ public $data;
/**
* $need_redirect determines whether the URL needs to be redirected
@var boolean
*/
- var $need_redirect;
+ public $need_redirect;
/**
* $is_seopage holds value as to whether page is in allowed SEO pages
@var boolean
*/
- var $is_seopage;
+ public $is_seopage;
/**
* $uri contains the $_SERVER['REQUEST_URI'] value
@var string
*/
- var $uri;
+ public $uri;
/**
* $real_uri contains the $_SERVER['SCRIPT_NAME'] . '?' . $_SERVER['QUERY_STRING'] value
@var string
*/
- var $real_uri;
+ public $real_uri;
/**
* $uri_parsed contains the parsed uri value array
@var array
*/
- var $uri_parsed;
+ public $uri_parsed;
/**
* $path_info contains the getenv('PATH_INFO') value
@var string
*/
- var $path_info;
+ public $path_info;
/**
* $DB is the database object
@var object
*/
- var $DB;
+ public $DB;
/**
* $header_tag element for page
@var object
*/
- var $header_tag;
+ public $header_tag;
/**
* $header_tag activ
@var bool
@@ -178,6 +178,7 @@
FILENAME_SPECIALS,
FILENAME_BEST_SELLERS,
FILENAME_SITEMAP,
+ FILENAME_HOME,
FILENAME_TEMPLATE,
FILENAME_CONTACT_US,
FILENAME_SHOPPING_CART
@@ -220,13 +221,13 @@
// respecter l'ordre
$this->reg_anchors= array(
- 'pID' => 'pi',
+ 'pID' => 'pi',
'products_id' => 'p',
- 'cPath' => 'c',
- 'manufacturers_id' => 'm',
+ 'cPath' => 'c',
+ 'manufacturers_id' => 'm',
'content' => 't',
'divers' => 'd',
- 'lID' => 'l',
+ 'lID' => 'l',
'customers_id' => 'u',
'type_object' => 'to',
);
@@ -251,27 +252,27 @@
$this->performance = array('NUMBER_URLS_GENERATED' => 0,
- 'NUMBER_QUERIES' => 0,
- 'CACHE_QUERY_SAVINGS' => 0,
- 'NUMBER_STANDARD_URLS_GENERATED' => 0,
- 'TOTAL_CACHED_PER_PAGE_RECORDS' => 0,
- 'TOTAL_TIME' => 0,
- 'TIME_PER_URL' => 0,
- 'QUERIES' => array()
+ 'NUMBER_QUERIES' => 0,
+ 'CACHE_QUERY_SAVINGS' => 0,
+ 'NUMBER_STANDARD_URLS_GENERATED' => 0,
+ 'TOTAL_CACHED_PER_PAGE_RECORDS' => 0,
+ 'TOTAL_TIME' => 0,
+ 'TIME_PER_URL' => 0,
+ 'QUERIES' => array()
);
//ojp generate_link_cache
if (_test_bool(self::$USE_SEO_CACHE_GLOBAL)){
- $this->cache_file = 'seo_urls_v2_';
- $this->cache_gc();
+ $this->cache_file = 'seo_urls_v2_';
+ $this->cache_gc();
- if ( _test_bool(self::$USE_SEO_CACHE_PRODUCTS )) $this->generate_products_cache();
- if ( _test_bool(self::$USE_SEO_CACHE_CATEGORIES)) $this->generate_categories_cache();
- // if ( _test_bool($this->attributes['USE_SEO_CACHE_MANUFACTURERS'] ) ) $this->generate_manufacturers_cache();
- // if ( _test_bool($this->attributes['USE_SEO_CACHE_ARTICLES'] ) && defined('TABLE_ARTICLES_DESCRIPTION'))
- // $this->generate_articles_cache();
- if ( _test_bool(self::$USE_SEO_CACHE_TOPICS) && defined('TABLE_CONTENT_DESCRIPTION')) $this->generate_topics_cache();
- $this->generate_divers_cache();
- if ( _test_bool(self::$USE_SEO_CACHE_LINKS) ) $this->generate_links_cache();
+ if ( _test_bool(self::$USE_SEO_CACHE_PRODUCTS )) $this->generate_products_cache();
+ if ( _test_bool(self::$USE_SEO_CACHE_CATEGORIES)) $this->generate_categories_cache();
+ // if ( _test_bool($this->attributes['USE_SEO_CACHE_MANUFACTURERS'] ) ) $this->generate_manufacturers_cache();
+ // if ( _test_bool($this->attributes['USE_SEO_CACHE_ARTICLES'] ) && defined('TABLE_ARTICLES_DESCRIPTION'))
+ // $this->generate_articles_cache();
+ if ( _test_bool(self::$USE_SEO_CACHE_TOPICS) && defined('TABLE_CONTENT_DESCRIPTION')) $this->generate_topics_cache();
+ $this->generate_divers_cache();
+ if ( _test_bool(self::$USE_SEO_CACHE_LINKS) ) $this->generate_links_cache();
}
@@ -294,11 +295,14 @@
*\brief Base tag defaut
*/
$sql = "select head_title_tag , head_desc_tag, head_keywords_tag from " . TABLE_FULL_TAG . " ft, " . TABLE_FULL_TAG_DESCRIPTION . " ftd where ft.tag_id=ftd.tag_id and ft.page_type='generic' and ft.page_id = 'generic' and ftd.language_id = '" . (int)$this->languages_id. "' Limit 1";
+
$query=$this->DB->query( $sql );
$res=$query->fetchAssoc();
define('HEAD_TITLE_TAG_ALL', $res['head_title_tag']);
define('HEAD_DESC_TAG_ALL', $res['head_desc_tag']);
define('HEAD_KEY_TAG_ALL', $res['head_keywords_tag']);
+
+
}
public static function getInstance($languages_id='') {
@@ -363,7 +367,9 @@
$link = $connection == 'NONSSL' ? self::$base_url : self::$base_url_ssl;
$separator = '?';
self::$htexe = true;
- $this->parse_parameters($page, $parameters ,$connection , $separator, true);
+
+ $this->parse_parameters($page, $parameters ,$connection , $separator);
+
self::$htexe = false;
}
@@ -457,65 +463,79 @@
* @param $separator string NOTE: passed by reference
* @return string
*/
- private function parse_parameters($page, $params ,$connection , &$separator){
+ protected function parse_parameters($page, $params ,$connection , &$separator){
$params=str_replace('&','&',$params);
- $p = @explode('&', $params);
+ if(!empty($params))
+ $p = @explode('&', $params);
+ else
+ $p = array();
+
krsort($p);
$container = array();
- // preparation array key/value
- foreach ($p as $index => $valuepair)
- if(!empty($valuepair) || $index !=0) {
- $p2 = @explode('=', $valuepair);
+ // preparation array key/value
+ foreach ($p as $index => $valuepair)
+ if(!empty($valuepair) || $index !=0) {
+ $p2 = @explode('=', $valuepair);
- $p3[$p2[0]]=$p2[1];
- }
+ $p3[$p2[0]]=$p2[1];
+ }
+
$check=array_keys($this->reg_anchors);
- if(isset($p3))
+ if(isset($p3)){
foreach ($p3 as $key => $value){
$url='';
- switch ($key){
- case (in_array($key, $check)):
- $Rkey=$this->reg_anchors[$key];
- $function = 'GetName_'.$Rkey;
- if(method_exists($this,$function)) {
- $url = $this->make_url($page, $this->$function($value), $key, $value, $separator);
+ switch ($key){
+ case (in_array($key, $check)):
- // $url = $this->make_url($page, $this->get_product_name($p2[1]), $p2[0], $p2[1], $separator);
- $this->ValidateName($url, $Rkey, $value, $connection, $separator);
- }
- break;
+ $Rkey=$this->reg_anchors[$key];
+ $function = 'GetName_'.$Rkey;
+ if(method_exists($this,$function)) {
+ $url = $this->make_url($page, $this->$function($value), $key, $value, $separator);
+ // $url = $this->make_url($page, $this->get_product_name($p2[1]), $p2[0], $p2[1], $separator);
+ $this->ValidateName($url, $Rkey, $value, $connection, $separator);
+ }
+ break;
- default:
- $container[$key] = @$value;
- switch(true){
- case ($page == '' || $page ==FILENAME_DEFAULT):
- $id=AbstractHeader_tags::get_prio_cms('home');
- //! home by cms
- if(is_int($id)) {
- $url = $this->make_url($page, $this->get_topic_name($id), "content", $id, $separator);
- $this->ValidateName($url, "t", $id, $connection, $separator);
- }
- //! home by page content
- else {
- $url = ''; // $this->make_url('home', $this->get_divers_name('home'), 'divers', 'home', $separator);
- //$this->ValidateName($url, "d", 'home', $connection, $separator);
- }
- break;
default:
- if(is_array($p2)) $container[$key] = $value;
- break;
- }
- }
+ $container[$key] = @$value;
+
+ switch(true){
+ case ($page == '' || $page ==FILENAME_DEFAULT):
+ $id=AbstractHeader_tags::get_prio_cms('home');
+ //! home by cms
+ if(is_int($id)) {
+ $url = $this->make_url($page, $this->get_topic_name($id), "content", $id, $separator);
+ $this->ValidateName($url, "t", $id, $connection, $separator);
+ }
+ //! home by page content
+ else {
+ $url = ''; // $this->make_url('home', $this->get_divers_name('home'), 'divers', 'home', $separator);
+ //$this->ValidateName($url, "d", 'home', $connection, $separator);
+ }
+ break;
+ default:
+ if(is_array($p2)) $container[$key] = $value;
+ break;
+ }
+ }
+
}
+ }
+// else
+// var_dump($page);
+// elseif(count($p) ==0 ) {
+// // if()
+//
+// }
$url = isset($url) ? $url : $page;
@@ -603,9 +623,13 @@
* @param $pID integer
* @return string Stripped anchor text
*/
- private function GetName_d($pID){
+ protected function GetName_d($pID){
// private function get_divers_name($pID){
+// var_dump(self::$htexe);
+// exit;
+// var_dump($pID);
+// var_dump(self::$htexe);
switch(true){
case (_test_bool(self::$USE_SEO_CACHE_GLOBAL) && isset($this->cache['DIVERS'][$pID])):
$this->performance['CACHE_QUERY_SAVINGS']++;
@@ -617,7 +641,7 @@
break;
default:
$this->performance['NUMBER_QUERIES']++;
- $sql = "select head_title_tag as tName, head_desc_tag, head_keywords_tag from " . TABLE_FULL_TAG . " ft, " . TABLE_FULL_TAG_DESCRIPTION . " ftd where ft.tag_id=ftd.tag_id and ft.page_type='page' and ft.page_id = '" . basename($pID). "' and ftd.language_id = '" . (int)$this->languages_id. "' Limit 1";
+ $sql = "select head_title_tag as tName, head_desc_tag, head_keywords_tag from " . TABLE_FULL_TAG . " ft, " . TABLE_FULL_TAG_DESCRIPTION . " ftd where ft.tag_id=ftd.tag_id and ft.page_type='page' and ft.page_id = '" . basename($pID). "' and ftd.language_id = '" . (int)$this->languages_id. "' Limit 1";
$query=$this->DB->query( $sql );
if ($query->__get('numRows')>0) $result =$query->fetchAssoc();
else $result['tName'] = $this->strip($pID);
@@ -742,10 +766,32 @@
* @return array
*/
private function generate_products_cache(){
- $res=$this->DB->query( "select ft.page_id as ID , head_title_tag as tName, head_desc_tag, head_keywords_tag from " . TABLE_FULL_TAG . " ft, " . TABLE_FULL_TAG_DESCRIPTION . " ftd where ft.tag_id=ftd.tag_id and ft.page_type='product' and ftd.language_id = '" . (int)$this->languages_id. "'" );
- while ($result =$res->fetchAssoc()){
- $this->get_cache_id($result['ID'],$result,'PRODUCTS');
- }
+
+// $this->is_cached($this->cache_file . 'products', $is_cached, $is_expired);
+//
+//
+// if ( !$is_cached || $is_expired ) {
+ $prod_cache = array();
+ $res=$this->DB->query( "select ft.page_id as ID , head_title_tag as tName, head_desc_tag, head_keywords_tag from " . TABLE_FULL_TAG . " ft, " . TABLE_FULL_TAG_DESCRIPTION . " ftd where ft.tag_id=ftd.tag_id and ft.page_type='product' and ftd.language_id = '" . (int)$this->languages_id. "'" );
+
+ while ($result =$res->fetchAssoc()){
+ $this->get_cache_id($result['ID'],$result,'PRODUCTS');
+
+// $define = 'define(\'PRODUCT_NAME_' . $result['ID'] . '\', \'' . $this->strip( $result['tName']) . '\');';
+// $prod_cache .= $define . "\n";
+// eval("$define");
+// $prod_cache[$result['ID']] = $result;
+// $this->cache['PRODUCTS']
+ }
+
+// $this->save_cache($this->cache_file . 'products', $prod_cache, 'ARRAY', 1 , 1);
+// }
+// else {
+//
+// $this->get_cache($this->cache_file . 'products');
+// // var_dump($is_cached , $is_expired );
+// // exit;
+// }
}
/**
@@ -1195,10 +1241,10 @@
$cache_check = ( $is_cached ? 'true' : 'false' );
switch ( $cache_check ) {
case 'true':
- $this->DB->DBPerform(TABLE_SEO_CACHE, $sql_data_array, 'update', "cache_id='".md5($name)."'");
+ tep_db_perform(TABLE_SEO_CACHE, $sql_data_array, 'update', "cache_id='".md5($name)."'");
break;
case 'false':
- $this->DB->DBPerform(TABLE_SEO_CACHE, $sql_data_array, 'insert');
+ tep_db_perform(TABLE_SEO_CACHE, $sql_data_array, 'insert');
break;
default:
}
@@ -1252,7 +1298,7 @@
}
}
unset($cache_data);
- $this->DB->Free($this->cache_query);
+ $this->cache_query->Free($this->cache_query);
switch (true) {
case ($num_rows == 1):
if ($global){
@@ -1345,14 +1391,18 @@
@param $is_expired boolean NOTE: passed by reference
*/
private function is_cached($name, &$is_cached, &$is_expired){ // NOTE: $is_cached and $is_expired is passed by reference !!
- $this->cache_query = $this->DB->query("SELECT cache_expires FROM ". TABLE_SEO_CACHE." WHERE cache_id='".md5($name)."' AND cache_language_id='".(int)$this->languages_id."' LIMIT 1");
+
+ $this->cache_query = $this->DB->query($s="SELECT cache_expires FROM ". TABLE_SEO_CACHE." WHERE cache_id='".md5($name)."' AND cache_language_id='".(int)$this->languages_id."' LIMIT 1");
+
+// var_dump($s);
+
$is_cached = ( $this->cache_query->__get('NumRows') > 0 ? true : false );
if ($is_cached){
$check = $this->cache_query->fetchAssoc($this->cache_query);
$is_expired = ( $check['cache_expires'] <= date("Y-m-d H:i:s") ? true : false );
unset($check);
}
- $this->DB->Free($this->cache_query);
+ $this->cache_query->free($this->cache_query);
}
/**
@@ -1375,7 +1425,8 @@
$this->need_redirect();
$this->check_seo_page();
- if ( $this->need_redirect && $this->is_seopage && self::$USE_SEO_REDIRECT == 'true') $this->do_redirect();
+ if ( $this->need_redirect && $this->is_seopage && self::$USE_SEO_REDIRECT == 'true')
+ $this->do_redirect();
}
/**
@@ -1433,7 +1484,7 @@
@author Bobby Easland
*/
private function do_redirect(){
-var_dump(__FUNCTION__);
+// var_dump(__FUNCTION__);
$rs=str_replace('&','&',$this->uri_parsed['query']);
$p = @explode('&', $rs);
Modified: trunk/catalog/document.php
===================================================================
--- trunk/catalog/document.php 2011-12-01 17:48:57 UTC (rev 3918)
+++ trunk/catalog/document.php 2011-12-01 21:08:06 UTC (rev 3919)
@@ -27,9 +27,8 @@
$width=((isset($_REQUEST['w']) && (int)$_REQUEST['w'] > 0)? (int)$_REQUEST['w'] : '');
$height=((isset($_REQUEST['h']) && (int)$_REQUEST['h'] > 0)? (int)$_REQUEST['h'] : '');
- $img=((isset($_REQUEST['i']) && strlen((string)$_REQUEST['i']) > 0)? tep_sanitize_request($_REQUEST['i']) : '');
+ $img=((isset($_REQUEST['i']) && strlen((string)$_REQUEST['i']) > 0) ? tep_sanitize_request($_REQUEST['i']) : '' );
-
$get=image_ratio::get_image(DIR_WS_IMAGES.$img,'',$width,$height);
if($ext='jpg')$ext='jpeg';
Modified: trunk/catalog/includes/application_top.php
===================================================================
--- trunk/catalog/includes/application_top.php 2011-12-01 17:48:57 UTC (rev 3918)
+++ trunk/catalog/includes/application_top.php 2011-12-01 21:08:06 UTC (rev 3919)
@@ -367,9 +367,10 @@
$page->add_var_page('current_category_id',$current_category_id);
$page->add_var_page('cPath',$cPath);
$page->add_var_page('cPath_array',@$cPath_array);
- /// include start the breadcrumb trail
- $breadcrumb=$page->new_class('breadcrumb');
+
+
+
$page->pre_init();
/// initialize the message stack for output messages
@@ -377,13 +378,7 @@
/// set the template
$template = $page->ret_template();
+// $breadcrumb=$page->ret_o
-/// add category names to the breadcrumb trail
- if (isset($cPath_array)) {
- for ($i=0, $n=sizeof($cPath_array); $i<$n; $i++) {
- if( ($categories=categorie::get_item((int)$cPath_array[$i])) !=false) $page->breadcrumb->add($categories->categories_name, tep_href_link(FILENAME_DEFAULT, 'cPath=' . implode('_', array_slice($cPath_array, 0, ($i+1)))));
- else break;
- }
- }
?>
\ No newline at end of file
Modified: trunk/catalog/includes/classes/drivers/data/categorie.php
===================================================================
--- trunk/catalog/includes/classes/drivers/data/categorie.php 2011-12-01 17:48:57 UTC (rev 3918)
+++ trunk/catalog/includes/classes/drivers/data/categorie.php 2011-12-01 21:08:06 UTC (rev 3919)
@@ -3,8 +3,8 @@
\licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
\portion code Copyright (c) 2002 osCommerce
\package osCSS-2 <www http://www.oscss.org>
- \version 2.1.0
- \date 29/11/10, 11:33
+ \version 2.1.1
+ \date 29/11/11, 11:33
\author oscim <mail aur...@os...> <www http://www.oscim.fr>
\encode UTF-8
Modified: trunk/catalog/includes/classes/page.php
===================================================================
--- trunk/catalog/includes/classes/page.php 2011-12-01 17:48:57 UTC (rev 3918)
+++ trunk/catalog/includes/classes/page.php 2011-12-01 21:08:06 UTC (rev 3919)
@@ -393,21 +393,23 @@
/**
* \fn CurrentPageInit()
- * \brief Methode for detremine tag html page and title
+ * \brief Methode for determine current html page meta and title
* \param $path string pathname or null
* \return none
*/
protected function CurrentPageInit($path=''){
global $languages_id;
- $here = (!empty($path)? $path : substr($_SERVER['SCRIPT_NAME'],strlen(DIR_WS_CATALOG) ) ) ;
+ $here = (!empty($path)? $path : substr($_SERVER['REQUEST_URI'],strlen(DIR_WS_CATALOG) ) ) ;
/**
Gestion des tag, title et key
*/
if (_cst_bool('SEO_ENABLED')){
$seo_urls=seo_url::getInstance($languages_id);
+
$seo_urls->header_tags($here, $_SERVER['QUERY_STRING']);
+
$the_title= $seo_urls->header_tag['title'];
$the_desc= $seo_urls->header_tag['desc'];
$the_key_words= $seo_urls->header_tag['keywords'];
@@ -429,10 +431,7 @@
* \note fonction qui doit être appelé dans le application_top
*/
public function pre_init(){
- $this->CurrentPageInit();
- $this->breadcrumb->add(HEADER_TITLE_TOP, tep_get_httpdir() );
- $this->breadcrumb->add(HEADER_TITLE_CATALOG, tep_href_link(FILENAME_DEFAULT));
// set the template
$this->page['template'] = page::oscss_get_template();
@@ -456,6 +455,13 @@
$this->CurrentPageInit($p_content);
+ /// include start the breadcrumb trail
+ $page->new_class('breadcrumb');
+ /// initialise beradcumb
+ $this->breadcrumb->add(HEADER_TITLE_TOP, tep_get_httpdir() );
+ $this->breadcrumb->add(HEADER_TITLE_CATALOG, tep_href_link(FILENAME_DEFAULT));
+
+
/* Init class gestion js */
$this->new_class('javascript');
@@ -472,6 +478,14 @@
$res=$aca->check_action('',@$_GET['action']);
+ /// add category names to the breadcrumb trail
+ if (isset($this->page['var']['cPath_array'])) {
+ for ($i=0, $n=sizeof($this->page['var']['cPath_array']); $i<$n; $i++) {
+ if( ($categories=categorie::get_item((int)$this->page['var']['cPath_array'][$i])) !=false)
+ $this->breadcrumb->add($categories->categories_name, tep_href_link(FILENAME_DEFAULT, 'cPath=' . implode('_', array_slice($this->page['var']['cPath_array'], 0, ($i+1)))));
+ else break;
+ }
+ }
}
Modified: trunk/catalog/includes/filenames.php
===================================================================
--- trunk/catalog/includes/filenames.php 2011-12-01 17:48:57 UTC (rev 3918)
+++ trunk/catalog/includes/filenames.php 2011-12-01 21:08:06 UTC (rev 3919)
@@ -3,8 +3,8 @@
@licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 12/02/11, 15:02
+ @version 2.1.1
+ @date 01/11/11, 15:02
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -72,4 +72,21 @@
/* One Page Checkout - BEGIN */
define('FILENAME_CHECKOUT', 'checkout.php');
/* One Page Checkout - END */
+
+ /**
+ @var File for register user
+ Add name for contraint login in table_file_modules.php
+ */
+ $FileRegistered=array(
+ FILENAME_ACCOUNT,
+ FILENAME_ADDRESS_BOOK,
+ FILENAME_ADDRESS_BOOK_PROCESS,
+ FILENAME_CHECKOUT_PAYMENT_ADDRESS,
+ FILENAME_CHECKOUT_PAYMENT,
+ FILENAME_CHECKOUT_SHIPPING,
+ FILENAME_CHECKOUT_CONFIRMATION,
+ FILENAME_CHECKOUT_SHIPPING_ADDRESS,
+ FILENAME_LOGIN,
+ FILENAME_PASSWORD_FORGOTTEN
+ );
?>
\ No newline at end of file
Modified: trunk/catalog/index.php
===================================================================
--- trunk/catalog/index.php 2011-12-01 17:48:57 UTC (rev 3918)
+++ trunk/catalog/index.php 2011-12-01 21:08:06 UTC (rev 3919)
@@ -66,7 +66,7 @@
}
elseif ($category_depth == 'top') {
-// var_dump($page_content);
+
/**
* \section Page Customer public
*/
@@ -94,10 +94,10 @@
Or form
OR module aca action and exec
*/
- elseif( (isset($_GET['_ID']) && $_GET['_ID'] !='home.php') || isset($_GET['content']) || isset($_GET['aca_mod']) ){
+ elseif( (isset($_GET['d']) && $_GET['d'] !='home.php') || isset($_GET['content']) || isset($_GET['aca_mod']) ){
- $p=(string)tep_db_prepare_input(basename($_GET['_ID']));
+ $p=(string)tep_db_prepare_input(basename($_GET['d']));
$page->init($p,$language);
@@ -142,9 +142,10 @@
/** HOME */
else {
+
$page->init('home.php',$language);
- $page->force_content('home.php');
+// $page->force_content('home.php');
}
unset($category_cfils,$category_pfils,$category_parent);
Modified: trunk/catalog/install/includes/modele/configure.txt
===================================================================
--- trunk/catalog/install/includes/modele/configure.txt 2011-12-01 17:48:57 UTC (rev 3918)
+++ trunk/catalog/install/includes/modele/configure.txt 2011-12-01 21:08:06 UTC (rev 3919)
@@ -100,20 +100,4 @@
*/
$SecuKey='%SECURE_KEY%';
-
- /**
- @var File for register user
- Add name for contraint login in table_file_modules.php
- */
- $FileRegistered=array(
- FILENAME_ACCOUNT,
- FILENAME_ADDRESS_BOOK,
- FILENAME_ADDRESS_BOOK_PROCESS,
- FILENAME_CHECKOUT_PAYMENT_ADDRESS,
- FILENAME_CHECKOUT_PAYMENT,
- FILENAME_CHECKOUT_SHIPPING,
- FILENAME_CHECKOUT_CONFIRMATION,
- FILENAME_CHECKOUT_SHIPPING_ADDRESS,
- FILENAME_LOGIN,
- FILENAME_PASSWORD_FORGOTTEN
- );
\ No newline at end of file
+ ?>
\ No newline at end of file
Modified: trunk/catalog/install/includes/modele/htaccess.txt
===================================================================
--- trunk/catalog/install/includes/modele/htaccess.txt 2011-12-01 17:48:57 UTC (rev 3918)
+++ trunk/catalog/install/includes/modele/htaccess.txt 2011-12-01 21:08:06 UTC (rev 3919)
@@ -120,8 +120,13 @@
## Home Et index Ou Home = index
## Force Unique Home page
- RewriteRule ^(home.php)(.*)$ %WS_DOCUMENT_ROOT%?%{QUERY_STRING} [R=301]
- RewriteRule ^(.*)(index.html)$ %WS_DOCUMENT_ROOT%?%{QUERY_STRING} [R=301]
+ RewriteRule ^(home.php)(.*)$ /www/dev/oscss/2.1.1/01/trunk/catalog/ [R=301]
+ RewriteRule ^(d/index/index-home.html)$ /www/dev/oscss/2.1.1/01/trunk/catalog/ [R=301]
+
+ RewriteCond %{QUERY_STRING} =''
+ RewriteRule ^(index)\.(php|html)$ /www/dev/oscss/2.1.1/01/trunk/catalog/ [R=301]
+
+
## Home page & index page; two distinct page
# RewriteRule ^(home.(php|html)) %WS_DOCUMENT_ROOT%index.php?_ID=home.php [L,QSA]
# RewriteRule ^()$ %WS_DOCUMENT_ROOT%index.php?_ID=home.php [L,QSA]
@@ -162,12 +167,12 @@
## CMS content page
RewriteRule ^t/(.*)/(.*).html$ index.php?content=$1%{QUERY_STRING} [L]
## Divers page
- RewriteRule ^d/(.*)/(.*).html$ index.php?_ID=$1.php&%{QUERY_STRING} [L]
+ RewriteRule ^d/(.*)/(.*).html$ index.php?d=$1.php&%{QUERY_STRING} [L]
## Public members page
RewriteRule ^u/(.*)/(.*).html$ index.php?customers_id=$1&%{QUERY_STRING} [L]
# RewriteRule ^b/(.*)/(.*).html$ index.php?content=$1&%{QUERY_STRING} [L]
-# RewriteRule ^pr/(.*)/(.*).html$ index.php?_ID=listing_reviews.php&products_id=$1&%{QUERY_STRING} [L]
+# RewriteRule ^pr/(.*)/(.*).html$ index.php?d=listing_reviews.php&products_id=$1&%{QUERY_STRING} [L]
# RewriteRule ^i/(.*)/(.*).html$ information.php?info_id=$1&%{QUERY_STRING} [L]
# RewriteRule ^l/(.*)/(.*).html$ $1.php?lID=$1&%{QUERY_STRING} [L]
@@ -180,7 +185,7 @@
# RewriteRule ^(.*)-pi-(.*).html$ popup_image.php?pID=$2&%{QUERY_STRING}
# RewriteRule ^(.*)-t-(.*).html$ index.php?content=$2&%{QUERY_STRING}
# # RewriteRule ^(.*)-pr-(.*).html$ product_reviews.php?products_id=$2&%{QUERY_STRING}
-# RewriteRule ^(.*)-pr-(.*).html$ index.php?_ID=listing_reviews.php&products_id=$2&%{QUERY_STRING}
+# RewriteRule ^(.*)-pr-(.*).html$ index.php?d=listing_reviews.php&products_id=$2&%{QUERY_STRING}
# # RewriteRule ^(.*)-pri-(.*).html$ product_reviews_info.php?products_id=$2&%{QUERY_STRING}
# RewriteRule ^(.*)-i-(.*).html$ information.php?info_id=$2&%{QUERY_STRING}
# RewriteRule ^(.*)-d-(.*).html$ $2.php?divers=$2&%{QUERY_STRING}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-12-03 17:17:47
|
Revision: 3920
http://oscss.svn.sourceforge.net/oscss/?rev=3920&view=rev
Author: oscim
Date: 2011-12-03 17:17:41 +0000 (Sat, 03 Dec 2011)
Log Message:
-----------
correction suite
Modified Paths:
--------------
trunk/catalog/includes/classes/page.php
trunk/catalog/index.php
Modified: trunk/catalog/includes/classes/page.php
===================================================================
--- trunk/catalog/includes/classes/page.php 2011-12-01 21:08:06 UTC (rev 3919)
+++ trunk/catalog/includes/classes/page.php 2011-12-03 17:17:41 UTC (rev 3920)
@@ -4,7 +4,7 @@
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 17/10/11, 10:44
+ @date 06/12/11, 10:44
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
\class page
@@ -456,7 +456,7 @@
$this->CurrentPageInit($p_content);
/// include start the breadcrumb trail
- $page->new_class('breadcrumb');
+ $this->new_class('breadcrumb');
/// initialise beradcumb
$this->breadcrumb->add(HEADER_TITLE_TOP, tep_get_httpdir() );
$this->breadcrumb->add(HEADER_TITLE_CATALOG, tep_href_link(FILENAME_DEFAULT));
Modified: trunk/catalog/index.php
===================================================================
--- trunk/catalog/index.php 2011-12-01 21:08:06 UTC (rev 3919)
+++ trunk/catalog/index.php 2011-12-03 17:17:41 UTC (rev 3920)
@@ -44,25 +44,26 @@
* \section Page Error
*/
if(isset($_GET['ServerError'])){
- switch((int)$_GET['ServerError']){
- case 404:
- $page->init('404.php',$language);
- $page_content = $page->force_content('404.php');
- break;
+ switch((int)$_GET['ServerError']){
+ case 404:
+ $page->init('404.php',$language);
+ $breadcrumb=$page->return_object('breadcrumb');
+ $page_content = $page->force_content('404.php');
+ break;
- default:
- /**
- @remarks Alert and log
- */
- //! gestionnaire d'erreur
- $errorHandler = osC_ErrorHandler::start();
- // fichier de log d'erreur http
- $errorHandler->attachFileWriter(DIR_FS_ROOT_DOCS.'public/logs/server-http.log');
- trigger_error(sprintf(__FILE__.'::'.__LINE__.' Error type %s : SERVER: %s', (int)$_GET['ServerError'], print_r($_SERVER, true) ) , E_USER_ERROR);
+ default:
+ /**
+ @remarks Alert and log
+ */
+ //! gestionnaire d'erreur
+ $errorHandler = osC_ErrorHandler::start();
+ // fichier de log d'erreur http
+ $errorHandler->attachFileWriter(DIR_FS_ROOT_DOCS.'public/logs/server-http.log');
+ trigger_error(sprintf(__FILE__.'::'.__LINE__.' Error type %s : SERVER: %s', (int)$_GET['ServerError'], print_r($_SERVER, true) ) , E_USER_ERROR);
- header("HTTP/1.0 301 Moved Permanently");
- tep_redirect(tep_href_link(''));
- }
+ header("HTTP/1.0 301 Moved Permanently");
+ tep_redirect(tep_href_link(''));
+ }
}
elseif ($category_depth == 'top') {
@@ -72,6 +73,7 @@
*/
if (isset($_GET['customers_id']) ) {
$page->init('customers.php',$language);
+ $breadcrumb=$page->return_object('breadcrumb');
$aca_account=$account=$page->new_class('account',$customer_id);
$account=$page->_call('customer','the_customer');
@@ -100,43 +102,44 @@
$p=(string)tep_db_prepare_input(basename($_GET['d']));
$page->init($p,$language);
+ $breadcrumb=$page->return_object('breadcrumb');
- switch ($p){
- case 'form.php':
- case 'contact.php':
- $pp=substr($p, 0, -strlen($page->ext));
- $page->new_class($pp);
- $page->force_content($pp.'_'.$page->_call($pp,'the_form').$page->ext);
- if (isset($_GET['action'])) $page->_call($pp,'action');
- break;
- default:
- if (isset($_GET['content']) && !is_numeric($_GET['content'])){
- $pp=(int)tep_db_prepare_input($_GET['content']);
- $page->new_class($pp);
- $page->force_content('page'.$page->ext);
- $page->force_gabarit('content');
- $page->_call($pp,'page');
- }
- /** Module aca */
- elseif (isset($_GET['aca_mod']) && !is_numeric($_GET['aca_mod']) && isset($_GET['aca_type']) && isset($_GET['aca_action'])){
- $module=(string)tep_db_prepare_input($_GET['aca_mod']);
- $type=(string)tep_db_prepare_input($_GET['aca_type']);
- $aca=$page->new_class($type);
- $aca_module=$page->_call($type,'ret_modules');
- /* cf content/page.php */
- $page->force_content('page'.$page->ext);
+ switch ($p){
+ case 'form.php':
+ case 'contact.php':
+ $pp=substr($p, 0, -strlen($page->ext));
+ $page->new_class($pp);
+ $page->force_content($pp.'_'.$page->_call($pp,'the_form').$page->ext);
+ if (isset($_GET['action'])) $page->_call($pp,'action');
+ break;
+ default:
+ if (isset($_GET['content']) && !is_numeric($_GET['content'])){
+ $pp=(int)tep_db_prepare_input($_GET['content']);
+ $page->new_class($pp);
+ $page->force_content('page'.$page->ext);
+ $page->force_gabarit('content');
+ $page->_call($pp,'page');
+ }
+ /** Module aca */
+ elseif (isset($_GET['aca_mod']) && !is_numeric($_GET['aca_mod']) && isset($_GET['aca_type']) && isset($_GET['aca_action'])){
+ $module=(string)tep_db_prepare_input($_GET['aca_mod']);
+ $type=(string)tep_db_prepare_input($_GET['aca_type']);
+ $aca=$page->new_class($type);
+ $aca_module=$page->_call($type,'ret_modules');
+ /* cf content/page.php */
+ $page->force_content('page'.$page->ext);
- if (isset($_GET['action']) ) {
- $action=(string)tep_db_prepare_input($_GET['action']);
- if ($aca_module[$module]->check_action($action) ) {
- /** Exe == true */
- $aca_module[$module]->after_check_action($action);
-// tep_redirect(tep_href_link(FILENAME_PRODUCT_INFO, tep_get_all_get_params(array('action'))));
- }
- }
+ if (isset($_GET['action']) ) {
+ $action=(string)tep_db_prepare_input($_GET['action']);
+ if ($aca_module[$module]->check_action($action) ) {
+ /** Exe == true */
+ $aca_module[$module]->after_check_action($action);
+ // tep_redirect(tep_href_link(FILENAME_PRODUCT_INFO, tep_get_all_get_params(array('action'))));
+ }
+ }
+ }
}
- }
}
@@ -144,6 +147,7 @@
else {
$page->init('home.php',$language);
+ $breadcrumb=$page->return_object('breadcrumb');
// $page->force_content('home.php');
}
@@ -199,6 +203,7 @@
*/
if (/*$category_depth == 'products' &&*/ isset($_GET['products_id']) ) {
$page->init('product_info.php',$language);
+ $breadcrumb=$page->return_object('breadcrumb');
/** init aca module */
$aca_product=$page->new_class('product',true);
@@ -247,6 +252,7 @@
*/
elseif(isset($_GET['content']) && ( is_int($_GET['content']) || is_numeric($_GET['content'])) ){
$page->init('content.php',$language);
+ $breadcrumb=$page->return_object('breadcrumb');
$page_content = $page->force_content('content.php');
}
@@ -267,29 +273,30 @@
*/
elseif (in_array($category_depth,array( 'products', 'pages', 'nested')) ) {
- $page->init(basename(__FILE__),$language);
+ $page->init(basename(__FILE__),$language);
+ $breadcrumb=$page->return_object('breadcrumb');
- $listing=listing::getInstance();
- $listing->_reset();
- $listing_split = $listing->listing(@$_GET['type_object'],$category_depth);
+ $listing=listing::getInstance();
+ $listing->_reset();
+ $listing_split = $listing->listing(@$_GET['type_object'],$category_depth);
- /// get the categorie name and put it on the header
- if (isset($_GET['manufacturers_id'])) {
- $man=$DB->query("select * from " . TABLE_MANUFACTURERS . " m where m.manufacturers_id = '" . (int)$_GET['manufacturers_id'] . "' ");
- $manuf= $man->fetchAssoc();
- tep_db_free_result($man);
- $image = $manuf['manufacturers_image'];
- $page->breadcrumb->add($manuf['manufacturers_name'], tep_href_link(FILENAME_DEFAULT, 'manufacturers_id=' . $_GET['manufacturers_id']));
- $page->add_var_page('manufacturers',$manuf);
- }
+ /// get the categorie name and put it on the header
+ if (isset($_GET['manufacturers_id'])) {
+ $man=$DB->query("select * from " . TABLE_MANUFACTURERS . " m where m.manufacturers_id = '" . (int)$_GET['manufacturers_id'] . "' ");
+ $manuf= $man->fetchAssoc();
+ tep_db_free_result($man);
+ $image = $manuf['manufacturers_image'];
+ $page->breadcrumb->add($manuf['manufacturers_name'], tep_href_link(FILENAME_DEFAULT, 'manufacturers_id=' . $_GET['manufacturers_id']));
+ $page->add_var_page('manufacturers',$manuf);
+ }
- $listing_query = $DB->query($listing_split->sql_query);
- $page_content = $page->force_content('index_listing.php');
+ $listing_query = $DB->query($listing_split->sql_query);
+ $page_content = $page->force_content('index_listing.php');
}
else
$page->init(basename(__FILE__),$language);
-
+ $breadcrumb=$page->return_object('breadcrumb');
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-12-03 22:31:36
|
Revision: 3922
http://oscss.svn.sourceforge.net/oscss/?rev=3922&view=rev
Author: oscim
Date: 2011-12-03 22:31:28 +0000 (Sat, 03 Dec 2011)
Log Message:
-----------
correction alignement css
Correction coquille
Modified Paths:
--------------
trunk/catalog/admin/includes/gabarit/products/display_view.edit.gab
trunk/catalog/admin/includes/template/oscss/stylesheet-1.css
trunk/catalog/install/includes/modele/configure.txt
Modified: trunk/catalog/admin/includes/gabarit/products/display_view.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/products/display_view.edit.gab 2011-12-03 18:59:45 UTC (rev 3921)
+++ trunk/catalog/admin/includes/gabarit/products/display_view.edit.gab 2011-12-03 22:31:28 UTC (rev 3922)
@@ -50,19 +50,19 @@
<ul>
<?php if(products::CheckClassProduct('CLASS_DATE_AVAIBLE')): ?>
<li class="block_input">
- <label for="products_date_available"><?php echo __('text products date available'); ?></label>
+ <label class="inline" for="products_date_available"><?php echo __('text products date available'); ?></label>
<?php echo tep_draw_input_field('products_date_available', '', tep_not_null(products::$pInfo->products_date_available) ? tep_date_short(products::$pInfo->products_date_available) : '', ' maxlength="10" size="10"') . tep_draw_hidden_field('bt_products_date_available') . ' ' . __('text products date format'); ?>
</li>
<?php endif; ?>
<?php if(products::CheckClassProduct('CLASS_MODELE')): ?>
<li class="block_input">
- <label for="products_model"><?php echo __('text products model'); ?></label>
+ <label class="inline" for="products_model"><?php echo __('text products model'); ?></label>
<?php echo tep_draw_input_field('products_model','', products::$pInfo->products_model); ?>
</li>
<?php endif; ?>
<?php if(products::CheckClassProduct('CLASS_SORTORDER')): ?>
<li class="block_input">
- <label for="products_ordered"><?php echo __('text products ordered'); ?></label>
+ <label class="inline" for="products_ordered"><?php echo __('text products ordered'); ?></label>
<?php echo tep_draw_input_field('products_ordered','', products::$pInfo->products_ordered); ?>
</li>
<?php endif; ?>
@@ -76,7 +76,7 @@
<?php if(products::CheckClassProduct('CLASS_WEIGHT')): ?>
<li class="block_input">
- <label for="products_weight"><?php echo __('text products weight'); ?></label>
+ <label class="inline" for="products_weight"><?php echo __('text products weight'); ?></label>
<?php echo tep_draw_input_field('products_weight','', products::$pInfo->products_weight).' '.UNIT_WEIGHT_NAME; ?>
</li>
<?php endif; ?>
@@ -89,15 +89,15 @@
<ul>
<li style="clear:both"></li>
<li class="block_input">
- <label for="products_tax_class_id"><?php echo __('text products tax class'); ?></label>
+ <label class="inline" for="products_tax_class_id"><?php echo __('text products tax class'); ?></label>
<?php echo tep_draw_pull_down_menu('products_tax_class_id', products::$tax_class_array, products::$pInfo->products_tax_class_id, 'onchange="updateGross()"').'<span class="required">*</span>'; ?><br />
</li>
<li class="block_input">
- <label for="products_price"><?php echo __('text products price net'); ?></label>
+ <label class="inline" for="products_price"><?php echo __('text products price net'); ?></label>
<?php echo tep_draw_input_field('products_price','', products::$pInfo->products_price, 'onkeyup="updateGross()"').'<span class="required">*</span>'; ?>
</li>
<li class="block_input">
- <label for="products_price_gross"><?php echo __('text products price gross'); ?></label>
+ <label class="inline" for="products_price_gross"><?php echo __('text products price gross'); ?></label>
<?php echo tep_draw_input_field('products_price_gross','', products::$pInfo->products_price, 'onkeyup="updateNet()"'); ?>
</li>
@@ -136,7 +136,7 @@
<ul>
<?php foreach (products::$pInfo->products_sppc as $sppcGpId => $sppcInfos): ?>
<li class="block_input">
- <label for="<?php echo 'sppcprice_' . $sppcGpId; ?>"><?php
+ <label class="inline" for="<?php echo 'sppcprice_' . $sppcGpId; ?>"><?php
echo tep_draw_checkbox_field('sppcoption[' . $sppcGpId . ']', '', 'sppcoption[' . $sppcGpId . ']',$sppcInfos['sppcprice']!=''?1:0) . ' ' . $sppcInfos['sppcname']; ?>
</label><?php
echo tep_draw_input_field('sppcprice[' . $sppcGpId . ']','', $sppcInfos['sppcprice']); ?>
@@ -151,7 +151,7 @@
</li>
<li class="block_input">
- <label for="products_price_gross"><?php echo __('text products final price'); ?></label>
+ <label class="inline" for="products_price_gross"><?php echo __('text products final price'); ?></label>
<?php echo tep_draw_input_field('products_price_final','', products::$pInfo->products_price, 'disabled="disabled"'); ?>
</li>
@@ -166,15 +166,17 @@
<?php if( _cst_bool('STOCK_CHECK') && products::CheckClassProduct('CLASS_STOCK')): /** Si Class de stock defini, les prix sont pris en charge par un onglet */ ?>
<fieldset class="block_field">
<legend><?php echo __('text legend stock'); ?></legend>
- <label><?php echo __('table heading stock'); ?></label>
- <?php echo tep_draw_pull_down_menu('track_stock', products::$track_stock , products::$pInfo->track_stock); ?>
- <br />
- <?php if(products::$product_investigation['has_tracked_options'] or products::$product_investigation['stock_entries_count'] > 0) :?>
- <a class="button fancyView iframe" href="<?php echo tep_href_link(FILENAME_STOCK, 'product_id=' . products::$pInfo->products_id.'&origin='.tep_href_link(products::FILENAME))?>"><?php echo __('txt stock') ?></a>
- <?php elseif(products::$pInfo->track_stock==1): ?>
- <label for="products_quantity"><?php echo __('text products quantity'); ?></label>
- <?php echo tep_draw_input_field('products_quantity','', products::$pInfo->products_quantity) ; ?><br />
- <?php endif; ?>
+ <div class="block_input">
+ <label class="inline"><?php echo __('table heading stock'); ?></label>
+ <?php echo tep_draw_pull_down_menu('track_stock', products::$track_stock , products::$pInfo->track_stock); ?>
+ <br style="clear:both;" />
+ <?php if(products::$product_investigation['has_tracked_options'] or products::$product_investigation['stock_entries_count'] > 0) :?>
+ <a class="button fancyView iframe" href="<?php echo tep_href_link(FILENAME_STOCK, 'product_id=' . products::$pInfo->products_id.'&origin='.tep_href_link(products::FILENAME))?>"><?php echo __('txt stock') ?></a>
+ <?php elseif(products::$pInfo->track_stock==1): ?>
+ <label class="inline" for="products_quantity"><?php echo __('text products quantity'); ?></label>
+ <?php echo tep_draw_input_field('products_quantity','', products::$pInfo->products_quantity) ; ?><br />
+ <?php endif; ?>
+ </div>
</fieldset>
<?php endif; ?>
Modified: trunk/catalog/admin/includes/template/oscss/stylesheet-1.css
===================================================================
--- trunk/catalog/admin/includes/template/oscss/stylesheet-1.css 2011-12-03 18:59:45 UTC (rev 3921)
+++ trunk/catalog/admin/includes/template/oscss/stylesheet-1.css 2011-12-03 22:31:28 UTC (rev 3922)
@@ -1,76 +1,77 @@
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.0.9
- @date 23/06/10, 17:42
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
+ @ licence GPL 2005-2010 The osCSS developers *- osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 23/06/10, 17:42
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ */
body { background:#faf9f7 url(img/1/body.jpg) repeat-x; color:#000; margin:0; padding:0; font: normal 11px Verdana, Arial, sans-serif; }
html { height: 100%;}
/* prepend */
- * {margin:0;padding:0}
- a:link,
- a:visited {text-decoration: underline; color:#000;}
- a:hover { text-decoration: none; }
- img { border-width:0 ; margin:0; padding:0; }
- h1 { font-size: 2em ; padding:1em; }
- h1 img {border-width:0 ; margin:0; padding:0;}
- h2 { font-size: 1.2em ;text-shadow:0 1px 0 #fff;}
- h3 { font-size: 1.2em ;text-shadow:0 1px 0 #fff;color:#666;}
- h4 { font-size: 1em ;text-shadow:0 1px 0 #fff;}
- h5 { font-size: 1em ;text-shadow:0 1px 0 #fff;}
- p {padding:1em;}
- ul {list-style:none;}
- #central li {padding-left:0;cursor:pointer;margin:0.1em 0;}
- th { text-shadow:0 1px 0 #fff;-moz-border-radius:6px; -webkit-border-radius:6px; margin:2px 1px; text-align: left; padding: 0 5px;line-height:30px;}
+* {margin:0;padding:0}
+a :link, *
+a:visited {text-decoration: underline; color:#000;}
+a:hover { text-decoration: none; }
+img { border-width:0 ; margin:0; padding:0; }
+h1 { font-size: 2em ; padding:1em; }
+h1 img {border-width:0 ; margin:0; padding:0;}
+h2 { font-size: 1.2em ;text-shadow:0 1px 0 #fff;}
+h3 { font-size: 1.2em ;text-shadow:0 1px 0 #fff;color:#666;}
+h4 { font-size: 1em ;text-shadow:0 1px 0 #fff;}
+h5 { font-size: 1em ;text-shadow:0 1px 0 #fff;}
+p {padding:1em;}
+ul {list-style:none;}
+#central li {padding-left:0;cursor:pointer;margin:0.1em 0;}
+th { text-shadow:0 1px 0 #fff;-moz-border-radius:6px; -webkit-border-radius:6px; margin:2px 1px; text-align: left; padding: 0 5px;line-height:30px;}
/* form defintion generale */
- #form_bt { width: 80%; margin: 1em 2em;}
- input.radioInput {width:30px;}
- fieldset { margin: 1em 2em; padding:1em; border:none; }
- fieldset p { margin: 1em 0 0 0; }
- fieldset input[type="text"] { min-width:65%; display:inline-block;}
- fieldset label { width: 70%; line-height: 18px; margin-right: 10px; display:inline-block; text-align: right; padding: 0 0 2px 0;}
- fieldset ul { list-style:none;}
- ul.form_radio_inline{display:inline-block;}
- .spacer {clear:both;}
- .noselected{}
- .selected{background:#f0d4bf;}
+#form_bt { width: 80%; margin: 1em 2em;}
+input.radioInput {width:30px;}
+fieldset { margin: 1em 2em; padding:1em; border:none; }
+fieldset p { margin: 1em 0 0 0; }
+fieldset select,
+fieldset input[type="text"] { min-width:65%; display:inline-block;}
+fieldset label { width: 70%; line-height: 18px; margin-right: 10px; display:inline-block; text-align: right; padding: 0 0 2px 0;}
+fieldset ul { list-style:none;}
+ul.form_radio_inline{display:inline-block;}
+.spacer {clear:both;}
+.noselected{}
+.selected{background:#f0d4bf;}
/* general class */
- .error{ color:red; }
- .info{ color:blue;}
- div.info{ color:black;padding:10px 2px; border:2px solid #3A3B35; -moz-border-radius:6px; -webkit-border-radius:6px; background:#73756A;}
- .alert{ color:#ae0405; }
- .fright{ float:right; }
- .fleft {float:left; }
- .tleft{text-align:left}
- .tright{text-align:right}
- .tcenter{text-align:center}
- .inline { display:inline-block; }
- .inline * { display:inline-block; }
- .nobr {white-space:nowrap;}
- #central form {padding:0.5em 1em;}
- .w_100 {width:99%;}
- .w_90 {width:89%;}
- .w_80 {width:79%;}
- .w_70 {width:69%;}
- .w_60 {width:59%;}
- .w_50 {width:49%;}
- .w_40 {width:39%;}
- .w_30 {width:29%;}
- .padd_w {padding-left:10px; padding-right:10px;}
- .padd_h {padding-top:10px; padding-bottom:10px;}
+.error{ color:red; }
+.info{ color:blue;}
+div.info{ color:black;padding:10px 2px; border:2px solid #3A3B35; -moz-border-radius:6px; -webkit-border-radius:6px; background:#73756A;}
+.alert{ color:#ae0405; }
+.fright{ float:right; }
+.fleft {float:left; }
+.tleft{text-align:left}
+.tright{text-align:right}
+.tcenter{text-align:center}
+.inline { display:inline-block; }
+.inline * { display:inline-block; }
+.nobr {white-space:nowrap;}
+#central form {padding:0.5em 1em;}
+.w_100 {width:99%;}
+.w_90 {width:89%;}
+.w_80 {width:79%;}
+.w_70 {width:69%;}
+.w_60 {width:59%;}
+.w_50 {width:49%;}
+.w_40 {width:39%;}
+.w_30 {width:29%;}
+.padd_w {padding-left:10px; padding-right:10px;}
+.padd_h {padding-top:10px; padding-bottom:10px;}
/* buttons */
- .button,
- select.button,
- input[type=submit].button,
- input[type=button].button,
- button.button,
- a.button{
+.button,
+select.button,
+input[type=submit].button,
+input[type=button].button,
+button.button,
+a.button{
display: inline-block;
font-family:Arial;
white-space:nowrap;
@@ -86,432 +87,432 @@
-webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.5);
margin:8px 20px;
text-shadow: none;
- }
- input[type=image].button {
+}
+input[type=image].button {
float:left;
height:18px;
width:18px;
- }
+}
- input.button,
- button.button{font-size:11px; background:#ccc;padding:2px 5px; }
+input.button,
+button.button{font-size:11px; background:#ccc;padding:2px 5px; }
- a.button{ background:#eee; padding:2px 5px; margin:10px 20px ;text-decoration:none;height:18px; line-height:18px;}
- a.button:hover{background:#797979; color:white;text-decoration:none; }
+a.button{ background:#eee; padding:2px 5px; margin:10px 20px ;text-decoration:none;height:18px; line-height:18px;}
+a.button:hover{background:#797979; color:white;text-decoration:none; }
- a.button,
- select.button,
- input.button,
- button.button {background:#df1217 url(img/1/button.jpg) left top repeat-x;}
+a.button,
+select.button,
+input.button,
+button.button {background:#df1217 url(img/1/button.jpg) left top repeat-x;}
- a.button.ActionYes,
- input.button.ActionYes,
- input[type=image].button.ActionYes,
- input[type=submit].button.ActionYes,
- button.button.ActionYes {background:#ccc url(img/1/button-submit.jpg) left top repeat-x;}
+a.button.ActionYes,
+input.button.ActionYes,
+input[type=image].button.ActionYes,
+input[type=submit].button.ActionYes,
+button.button.ActionYes {background:#ccc url(img/1/button-submit.jpg) left top repeat-x;}
- a.button.ActionBack,
- input[type=image].button.ActionBack,
- button.button.ActionBack {background:#ccc url(img/1/button-back.jpg) left top repeat-x;}
+a.button.ActionBack,
+input[type=image].button.ActionBack,
+button.button.ActionBack {background:#ccc url(img/1/button-back.jpg) left top repeat-x;}
- input:hover.button,
- button:hover.button{background:#797979;color:white;}
+input:hover.button,
+button:hover.button{background:#797979;color:white;}
- a:hover.button,
- input:hover.button,
- button:hover.button {background:#ccc url(img/1/button.jpg) left -40px repeat-x; opacity:0.6;}
+a:hover.button,
+input:hover.button,
+button:hover.button {background:#ccc url(img/1/button.jpg) left -40px repeat-x; opacity:0.6;}
- a:hover.button.ActionYes,
- input:hover.button.ActionYes,
- button:hover.button.ActionYes {background:#ccc url(img/1/button-submit.jpg) left -40px repeat-x; color:black;}
+a:hover.button.ActionYes,
+input:hover.button.ActionYes,
+button:hover.button.ActionYes {background:#ccc url(img/1/button-submit.jpg) left -40px repeat-x; color:black;}
- a.button.ActionBack,
- input.button.ActionBack,
- button.button.ActionBack {background:#ccc url(img/1/button-back.jpg) left -40px repeat-x;}
+a.button.ActionBack,
+input.button.ActionBack,
+button.button.ActionBack {background:#ccc url(img/1/button-back.jpg) left -40px repeat-x;}
- input[type=image].button,
- a.buttonimg img{ opacity:1;}
+input[type=image].button,
+a.buttonimg img{ opacity:1;}
- input[type=image]:hover.button ,
- a:hover.buttonimg img,
- a.buttonimg img:hover{ opacity:0.6;}
+input[type=image]:hover.button ,
+a:hover.buttonimg img,
+a.buttonimg img:hover{ opacity:0.6;}
- /* Spe buttons broswer img */
- a.button.browser {height:28px;}
- a.button img {vertical-align:middle;margin:0.3em 0.3em 0 0;}
- .row_action a.button {margin:0;}
+/* Spe buttons broswer img */
+a.button.browser {height:28px;}
+a.button img {vertical-align:middle;margin:0.3em 0.3em 0 0;}
+.row_action a.button {margin:0;}
/* --- message box --- */
- .messageBox { font-family: Verdana, Arial, sans-serif; font-size: 10px; padding:0;}
- .messageStack{ font-family: Verdana, Arial, sans-serif;}
- .messageStack li{padding:2px 0;}
- .messageStackError,
- .messageStackWarning { background:#fbe3e1;}
- .messageStackSuccess { background:transparent url(img/1/menu_bg_success.jpg) left top repeat-x; }
- .messageStackNotice { background:transparent url(img/1/menu_bg_success.jpg) left top repeat-x;}
+.messageBox { font-family: Verdana, Arial, sans-serif; font-size: 10px; padding:0;}
+.messageStack{ font-family: Verdana, Arial, sans-serif;}
+.messageStack li{padding:2px 0;}
+.messageStackError,
+.messageStackWarning { background:#fbe3e1;}
+.messageStackSuccess { background:transparent url(img/1/menu_bg_success.jpg) left top repeat-x; }
+.messageStackNotice { background:transparent url(img/1/menu_bg_success.jpg) left top repeat-x;}
/* Onglet */
- .tabPage { position: relative; top: 0; z-index: 0; }
+.tabPage { position: relative; top: 0; z-index: 0; }
/* Class apercu ligne au survol */
- .dataTableRow{background-color: #F0F1F1;height:3em;}
- .dataTableRow:hover,
- .dataTableBase tr:hover,
- .dataTable tr:hover{ background-color: #E6FF99; cursor: pointer; }
- .dataTableRow.Selected,
- .dataTableBase tr.Selected ,
- .dataTable tr.Selected { background-color: #fff;border-bottom:1px solid #ccc;}
- .dataTableRow td.hierac_enfant {padding-left:0.7em;}
+.dataTableRow{background-color: #F0F1F1;height:3em;}
+.dataTableRow:hover,
+.dataTableBase tr:hover,
+.dataTable tr:hover{ background-color: #E6FF99; cursor: pointer; }
+.dataTableRow.Selected,
+.dataTableBase tr.Selected ,
+.dataTable tr.Selected { background-color: #fff;border-bottom:1px solid #ccc;}
+.dataTableRow td.hierac_enfant {padding-left:0.7em;}
/* class qui rend element enfant visible au survol de l'element parent*/
- .view.fils {display:none}
- .dataTableBase tr:hover .view.fils,
- .dataTable tr:hover .view.fils,
- .dataTableRow.Selected .view.fils,
- .view.parent:hover .view.fils{display:block;height:18px}
+.view.fils {display:none}
+.dataTableBase tr:hover .view.fils,
+.dataTable tr:hover .view.fils,
+.dataTableRow.Selected .view.fils,
+.view.parent:hover .view.fils{display:block;height:18px}
- .dataTable a.button,
- .dataTable input[type=submit].button,
- .dataTable input[type=image].button,
- .dataTable button.button {margin:0;}
+.dataTable a.button,
+.dataTable input[type=submit].button,
+.dataTable input[type=image].button,
+.dataTable button.button {margin:0;}
/* sort by*/
- .sort_by { clear:both;display:block; text-align:center; width:100%}
- .sort_by .Selected { border-bottom:2px solid red;}
+.sort_by { clear:both;display:block; text-align:center; width:100%}
+.sort_by .Selected { border-bottom:2px solid red;}
/* Bouton bas page*/
- .button_nav{clear:both;}
- .button_nav form{float:right; width:100px;}
- .button_nav form p {margin:0;padding:0;}
+.button_nav{clear:both;}
+.button_nav form{float:right; width:100px;}
+.button_nav form p {margin:0;padding:0;}
/* */
- #row_by_page_select option {display:block;}
+#row_by_page_select option {display:block;}
/* Structure */
- #glob {background:transparent url(img/1/black.jpg) repeat-x ; width:100%; background-attachment:fixed; z-index:10; height:100%;}
- #center { margin: 0 auto; position: relative; min-width:900px;width:90%;max-width:1200px; }
- #header {background:black; min-width:900px;width:90%;max-width:1200px; margin:0 0; position:fixed; z-index:10;}
+#glob {background:transparent url(img/1/black.jpg) repeat-x ; width:100%; background-attachment:fixed; z-index:10; height:100%;}
+#center { margin: 0 auto; position: relative; min-width:900px;width:90%;max-width:1200px; }
+#header {background:black; min-width:900px;width:90%;max-width:1200px; margin:0 0; position:fixed; z-index:10;}
- #central { position:relative; padding:10px 5px; top:73px;border-left: 1px solid black;
- border-right: 1px solid black;border-bottom: 1px solid black;background:white; }
- #central div.box_uniq { width:99%; float:left; }
- #central div.box_left { width:60%; float:left; }
+#central { position:relative; padding:10px 5px; top:73px;border-left: 1px solid black;
+border-right: 1px solid black;border-bottom: 1px solid black;background:white; }
+#central div.box_uniq { width:99%; float:left; }
+#central div.box_left { width:60%; float:left; }
- #central div.box_right {border:1px solid #ACAAAC; width:39%; float:right; background:#f1f1f1; background-color: #ffffff;-moz-border-radius:6px; -webkit-border-radius: 6px;}
- .configuration #central div.box_right { right:0; width:39%; }
- .configuration #central div.box_right ul{ list-style:none; }
- #bas { margin-top:8em; clear:both; height:25px; background:black;color:white;}
- div#footer { background:#303030; clear:both;width:100%; text-align:center;color:white;}
+#central div.box_right {border:1px solid #ACAAAC; width:39%; float:right; background:#f1f1f1; background-color: #ffffff;-moz-border-radius:6px; -webkit-border-radius: 6px;}
+.configuration #central div.box_right { right:0; width:39%; }
+.configuration #central div.box_right ul{ list-style:none; }
+#bas { margin-top:8em; clear:both; height:25px; background:black;color:white;}
+div#footer { background:#303030; clear:both;width:100%; text-align:center;color:white;}
/* menu Fonctionnement tiroir */
- #menutitre, #menutitre ul { padding:0; margin:0; list-style:none;}
- #menutitre li { position:relative; float:left; padding: 0 5px; background:transparent url(img/1/bg-nav.jpg) repeat-x ; height:25px;}
- #menutitre li ul { list-style:none; position:absolute; top:25px; left:0; display:none; z-index:10; }
- #menutitre ul li { float:none; width:200px; background:#303030 ;}
- #menutitre ul.ssmenu li a{color:#9C9A9B;text-shadow: none;}
- #menutitre li:hover ul { display:block; }
- #menutitre a { display:block; padding-top:4px;padding-left: 20px; color:white; text-decoration:none; height:18px; text-align:center; font:normal 11px Verdana, Arial, sans-serif; }
- #menutitre .disabled, #menutitre .disabled:hover { display:none;}
- #menutitre .disabled ul li a,
- #menutitre .disabled ul li a:hover { display:none; }
- #menutitre a:hover { color:#000; text-decoration:none; }
- #menutitre a.active { text-decoration:none; }
- #menutitre .ssmenu { margin:0 1px 1px 0; background:#ccc; text-decoration:none; white-space:nowrap; border-left:1px solid #747474;}
- #menutitre li ul.ssmenu li ul.ssmenu,
- #menutitre li ul.ssmenu li ul.ssmenu li ul.ssmenu{list-style:none; position:absolute; top:-1px; left:180px; display:none; z-index:15; }
- #menutitre li ul.ssmenu li:hover ul.ssmenu,
- #menutitre li ul.ssmenu li ul.ssmenu li:hover ul.ssmenu{ display:block }
- #menutitre .ssmenu a { color:#000; padding:2px 0px 2px 26px; text-decoration:none; line-height:20px; border:none; width:154px; text-align:left; }
- #menutitre .ssmenu a:hover { background-color:#999; color:#fff;text-shadow: 0 1px 0 #000; text-decoration:none; }
- div.menuSeparator { padding:2px 10px; display:block; background:#888; border-bottom:1px solid #ccc; font-size:12px; color:#FFF; line-height:14px; clear:both; }
- #ssmenu a { float:left; padding:5px 10px; margin:0;font-size:10px;background:#797979;color:white;text-shadow: 0 1px 0 #000;border-right:1px solid #444;}
- #ssmenu a:hover { float:left; padding:5px 10px ; margin:0;font-size:10px;background:#eee;color:#000;text-shadow: 0 1px 0 #fff;-moz-box-shadow: 0 1px 3px rgba(0,0,0,0.5);-webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.5);}
- #menu_theme * {display:block;}
+#menutitre, #menutitre ul { padding:0; margin:0; list-style:none;}
+#menutitre li { position:relative; float:left; padding: 0 5px; background:transparent url(img/1/bg-nav.jpg) repeat-x ; height:25px;}
+#menutitre li ul { list-style:none; position:absolute; top:25px; left:0; display:none; z-index:10; }
+#menutitre ul li { float:none; width:200px; background:#303030 ;}
+#menutitre ul.ssmenu li a{color:#9C9A9B;text-shadow: none;}
+#menutitre li:hover ul { display:block; }
+#menutitre a { display:block; padding-top:4px;padding-left: 20px; color:white; text-decoration:none; height:18px; text-align:center; font:normal 11px Verdana, Arial, sans-serif; }
+#menutitre .disabled, #menutitre .disabled:hover { display:none;}
+#menutitre .disabled ul li a,
+#menutitre .disabled ul li a:hover { display:none; }
+#menutitre a:hover { color:#000; text-decoration:none; }
+#menutitre a.active { text-decoration:none; }
+#menutitre .ssmenu { margin:0 1px 1px 0; background:#ccc; text-decoration:none; white-space:nowrap; border-left:1px solid #747474;}
+#menutitre li ul.ssmenu li ul.ssmenu,
+#menutitre li ul.ssmenu li ul.ssmenu li ul.ssmenu{list-style:none; position:absolute; top:-1px; left:180px; display:none; z-index:15; }
+#menutitre li ul.ssmenu li:hover ul.ssmenu,
+#menutitre li ul.ssmenu li ul.ssmenu li:hover ul.ssmenu{ display:block }
+#menutitre .ssmenu a { color:#000; padding:2px 0px 2px 26px; text-decoration:none; line-height:20px; border:none; width:154px; text-align:left; }
+#menutitre .ssmenu a:hover { background-color:#999; color:#fff;text-shadow: 0 1px 0 #000; text-decoration:none; }
+div.menuSeparator { padding:2px 10px; display:block; background:#888; border-bottom:1px solid #ccc; font-size:12px; color:#FFF; line-height:14px; clear:both; }
+#ssmenu a { float:left; padding:5px 10px; margin:0;font-size:10px;background:#797979;color:white;text-shadow: 0 1px 0 #000;border-right:1px solid #444;}
+#ssmenu a:hover { float:left; padding:5px 10px ; margin:0;font-size:10px;background:#eee;color:#000;text-shadow: 0 1px 0 #fff;-moz-box-shadow: 0 1px 3px rgba(0,0,0,0.5);-webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.5);}
+#menu_theme * {display:block;}
- /* sous menu en widget */
- #central #SsMenuConfig #ssmenu {background:none;}
- #SsMenuConfig #ssmenu a { background: none repeat scroll 0 0 #797979; border-right: 1px solid #444444; clear: both; color: white; font-size: 10px; margin: 0 0 1px 25px; padding: 5px 10px; text-shadow: 0 1px 0 #000000; width: 40%;}
- #SsMenuConfig #ssmenu a:hover { float:left; padding:5px 10px ; margin:0;font-size:10px;background:#eee;color:#000;text-shadow: 0 1px 0 #fff;-moz-box-shadow: 0 1px 3px rgba(0,0,0,0.5);-webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.5);}
+/* sous menu en widget */
+#central #SsMenuConfig #ssmenu {background:none;}
+#SsMenuConfig #ssmenu a { background: none repeat scroll 0 0 #797979; border-right: 1px solid #444444; clear: both; color: white; font-size: 10px; margin: 0 0 1px 25px; padding: 5px 10px; text-shadow: 0 1px 0 #000000; width: 40%;}
+#SsMenuConfig #ssmenu a:hover { float:left; padding:5px 10px ; margin:0;font-size:10px;background:#eee;color:#000;text-shadow: 0 1px 0 #fff;-moz-box-shadow: 0 1px 3px rgba(0,0,0,0.5);-webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.5);}
/* Habillage */
- /* header */
- #headInfos {display:inline-block; height:25px; margin:0; padding:0;width:100%; color:white;}
- #headInfos h1 {display:inline; margin:0 2px; padding:0; line-height:25px;}
- #headInfos h2 {display:inline; line-height:25px; color:white; vertical-align:top;}
- #headInfos a,
- #headInfos span{padding-right:1em; color:white; text-decoration:none; line-height:25px; vertical-align:top;float:right;}
- #headInfos a:hover{text-decoration:underline;}
- #menubar{ background:transparent ; height:25px; border-top: 1px solid #fff;}
- #menubar li.account {padding-right:8px;}
- /* user bar */
- #user { background:transparent ;border-top: 1px solid #fff; padding-right:10px; height:25px;}
- #user ul#MenuExts li { background:transparent url(img/1/bg_header.jpg) repeat-x ;padding:0 8px;}
- #user ul#MenuExts li a {color:white;}
- #user ul#MenuExts li a:hover{color:gray;}
- #user li { position:relative; float:left;}
- #user a { display:block; padding-top:4px; color:#000; text-decoration:none; text-shadow:none; height:18px; text-align:center; font:normal 11px Verdana, Arial, sans-serif; }
- /* Switcher */
- p.themeSwitcher { float:right; margin:0; padding:2px 1em 0 0; text-align:right; width:250px; }
- p.themeSwitcher select { vertical-align:middle; font-size:0.9em; width:100px; }
- /* Bookmark */
- #menubookmark p.themeSwitcher select option,
- #menurecently p.themeSwitcher select#recently_viewed option {display:block;}
+/* header */
+#headInfos {display:inline-block; height:25px; margin:0; padding:0;width:100%; color:white;}
+#headInfos h1 {display:inline; margin:0 2px; padding:0; line-height:25px;}
+#headInfos h2 {display:inline; line-height:25px; color:white; vertical-align:top;}
+#headInfos a,
+#headInfos span{padding-right:1em; color:white; text-decoration:none; line-height:25px; vertical-align:top;float:right;}
+#headInfos a:hover{text-decoration:underline;}
+#menubar{ background:transparent ; height:25px; border-top: 1px solid #fff;}
+#menubar li.account {padding-right:8px;}
+/* user bar */
+#user { background:transparent ;border-top: 1px solid #fff; padding-right:10px; height:25px;}
+#user ul#MenuExts li { background:transparent url(img/1/bg_header.jpg) repeat-x ;padding:0 8px;}
+#user ul#MenuExts li a {color:white;}
+#user ul#MenuExts li a:hover{color:gray;}
+#user li { position:relative; float:left;}
+#user a { display:block; padding-top:4px; color:#000; text-decoration:none; text-shadow:none; height:18px; text-align:center; font:normal 11px Verdana, Arial, sans-serif; }
+/* Switcher */
+p.themeSwitcher { float:right; margin:0; padding:2px 1em 0 0; text-align:right; width:250px; }
+p.themeSwitcher select { vertical-align:middle; font-size:0.9em; width:100px; }
+/* Bookmark */
+#menubookmark p.themeSwitcher select option,
+#menurecently p.themeSwitcher select#recently_viewed option {display:block;}
- /* content */
- #central h3{ font-size:15px; font-weight:bold; margin:0 0 10px; padding:0 5px 10px 3px; clear:both; }
- #central h4{font-w...
[truncated message content] |
|
From: <os...@us...> - 2011-12-04 10:10:16
|
Revision: 3923
http://oscss.svn.sourceforge.net/oscss/?rev=3923&view=rev
Author: oscim
Date: 2011-12-04 10:10:09 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
[BO] correction coquille svnupdate, et force utilisation get_svn_core de generale.php
[FO] deport des functions de control de passord dans des ficheir externe, et refonte des functions en module
Ajout d'une class de centralisation et d'un selecteu dans le configure pour determiner le type de mots de passe utilis?\195?\169
Modified Paths:
--------------
trunk/catalog/admin/includes/functions/general.php
trunk/catalog/admin/includes/modules/generic/SvnUpdate.php
trunk/catalog/includes/appli_top_Test.php
trunk/catalog/includes/application_top.php
trunk/catalog/includes/classes/core_page/customer.php
trunk/catalog/install/includes/modele/configure.txt
trunk/catalog/password_forgotten.php
Added Paths:
-----------
trunk/catalog/common/classes/PasswordUtility.php
trunk/catalog/common/modules/
trunk/catalog/common/modules/core/
trunk/catalog/common/modules/core/password/
trunk/catalog/common/modules/core/password/Pass_Classic.php
Modified: trunk/catalog/admin/includes/functions/general.php
===================================================================
--- trunk/catalog/admin/includes/functions/general.php 2011-12-03 22:31:28 UTC (rev 3922)
+++ trunk/catalog/admin/includes/functions/general.php 2011-12-04 10:10:09 UTC (rev 3923)
@@ -566,7 +566,7 @@
$SimpleParser = simplexml_load_file($file);
if($name=='all')
- return (string)$SimpleParser;
+ return $SimpleParser;
elseif(!isset($SimpleParser->$name))
die(__('Erreur récuperation tag '.$name)) ;
else
Modified: trunk/catalog/admin/includes/modules/generic/SvnUpdate.php
===================================================================
--- trunk/catalog/admin/includes/modules/generic/SvnUpdate.php 2011-12-03 22:31:28 UTC (rev 3922)
+++ trunk/catalog/admin/includes/modules/generic/SvnUpdate.php 2011-12-04 10:10:09 UTC (rev 3923)
@@ -31,13 +31,13 @@
const REDIRECT = FILENAME_PACKAGE;
/// version module
- var $version='2.1.0';
+ public $version='2.1.0';
public static $code;
- var $title;
- var $description;
- var $sort_order;
- var $enabled;
+ public $title;
+ public $description;
+ public $sort_order;
+ public $enabled;
/**
*/
@@ -64,7 +64,7 @@
$svnupdate=0;
if(!tep_session_is_registered('svnupdate')) {
- $info = $this->get_info_core(DIR_FS_CATALOG.self::$FILEPATH_SVN_CORE, 'all');
+ $info = get_info_core(DIR_FS_CATALOG.self::$FILEPATH_SVN_CORE, 'all');
self::$actu_rev= (int)$info->svn;
self::$URL_OSCSS_ORG_TRAC = $info->urloscssorgtrac;
@@ -104,7 +104,7 @@
@author oscim <mail os...@os...> <www http://www.oscim.fr>
*/
public function draw_form(){
- if((int)self::$actu_rev==0) self::$actu_rev=$this->get_info_core(DIR_FS_CATALOG.self::$FILEPATH_SVN_CORE);
+ if((int)self::$actu_rev==0) self::$actu_rev=get_info_core(DIR_FS_CATALOG.self::$FILEPATH_SVN_CORE);
if((int)self::$current_rev==0) self::$current_rev=$this->get_current_rev(self::$URL_OSCSS_GET_REV);
if(isset($_POST['ACTU_REV']))$S=$this->exe_update($_POST['ACTU_REV'],$_POST['CURENT_REV']);
@@ -123,21 +123,7 @@
else $dest .= $str;
}
- /**
- Recuperation des element de svn basé sur le fichier oscss.version.xml
- @package oscss-2 <www http://www.oscss.org>
- @date 15/05/10, 16:19
- @author oscim <mail os...@os...> <www http://www.oscim.fr>
- */
- private function get_info_core($file,$name='svn'){
- global $messageStack;
- if(!file_exists($file)) return $messageStack->add( __("Erreur récupération fichier"), 'error' );
- $SimpleParser = @simplexml_load_file($file);
- if(!isset($SimpleParser->$name)) $messageStack->add( __("Erreur récupération n° révision courant"), 'error' );
- else return $SimpleParser->$name;
- }
-
/**
Recup current version svn, basé sur ViewVC fournis pas Sourceforge , vieVC 1.0.5
@author oscim <mail os...@os...> <www http://www.oscim.fr>
@@ -213,7 +199,7 @@
private function new_version_xml($curent_rev, $corre_rev){
- $SimpleParser = $this->get_info_core(DIR_FS_CATALOG.self::$FILEPATH_SVN_CORE, 'all');
+ $SimpleParser = get_info_core(DIR_FS_CATALOG.self::$FILEPATH_SVN_CORE, 'all');
$SimpleParser->svn = (int)$curent_rev;
Added: trunk/catalog/common/classes/PasswordUtility.php
===================================================================
--- trunk/catalog/common/classes/PasswordUtility.php (rev 0)
+++ trunk/catalog/common/classes/PasswordUtility.php 2011-12-04 10:10:09 UTC (rev 3923)
@@ -0,0 +1,88 @@
+<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 06/12/11, 16:16
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class PasswordUtility
+ @brief This class is manager call for methode in check or generate password proteced
+*/
+
+class PasswordUtility {
+ /**
+ @var path childs module
+ */
+ const PATH_CHILDS_MOD = 'modules/core/password/';
+ /**
+ @var Prefix file in childs module
+ */
+ const PREFIX_FILE_CHILDS_MOD = 'Pass_';
+ /**
+ @var ressource Id current instance
+ */
+ protected static $_instance;
+ /**
+ @var object Childs mod instance
+ */
+ protected static $ChildMod = false;
+
+
+ /**
+ @brief constructor
+ */
+ protected function __construct(){
+ global $conf;
+
+ if(self::$ChildMod !=false) return ;
+
+ $file = self::PREFIX_FILE_CHILDS_MOD.$conf->modPassword;
+
+ if(!file_exists(DIR_WS_COMMON.self::PATH_CHILDS_MOD.$file))
+ throw new Exception('Not found file password module');
+
+ $current = $conf->modPassword;
+ require_once(DIR_WS_COMMON.self::PATH_CHILDS_MOD.$file);
+
+ self::$ChildMod = new $current();
+ }
+
+ /**
+ @brief call current class
+ */
+ public static function getInstance(){
+ if(self::$_instance == null)
+ self::$_instance = new self();
+
+ return self::$_instance;
+ }
+
+ /**
+ @brief Force reset current instance class
+ */
+ public static function resetInstance(){
+ self::$_instance = null;
+ return self::getInstance();
+ }
+
+
+ /**
+ @brief This funstion validates a plain text password with an encrpyted password
+ @page login.php(public)
+ */
+ public function validate_password($plain, $encrypted){
+ return self::$ChildMod->validate_password($plain, $encrypted);
+ }
+
+ /**
+ @brief This function makes a new password from a plaintext password.
+ @page create_account.php|password_forgotent.php(public)
+ */
+ public function encrypt_password($plain){
+ return self::$ChildMod->encrypt_password($plain);
+ }
+
+}
+?>
Added: trunk/catalog/common/modules/core/password/Pass_Classic.php
===================================================================
--- trunk/catalog/common/modules/core/password/Pass_Classic.php (rev 0)
+++ trunk/catalog/common/modules/core/password/Pass_Classic.php 2011-12-04 10:10:09 UTC (rev 3923)
@@ -0,0 +1,44 @@
+<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 08/12/11, 16:16
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class Classic
+*/
+
+class Classic {
+
+ /**
+ @brief This funstion validates a plain text password with an encrpyted password
+ */
+ protected function validate_password($plain, $encrypted) {
+ if (tep_not_null($plain) && tep_not_null($encrypted)) {
+ // split apart the hash / salt
+ $stack = explode(':', $encrypted);
+ if (sizeof($stack) != 2) return false;
+ if (md5($stack[1] . $plain) == $stack[0]) return true;
+ }
+ return false;
+ }
+
+ /**
+ @brief This function makes a new password from a plaintext password.
+ */
+ protected function encrypt_password($plain) {
+ $password = '';
+
+ for ($i=0; $i<10; $i++)
+ $password .= tep_rand();
+
+ $salt = substr(md5($password), 0, 2);
+ $password = md5($salt . $plain) . ':' . $salt;
+ return $password;
+ }
+
+}
+
+?>
\ No newline at end of file
Modified: trunk/catalog/includes/appli_top_Test.php
===================================================================
--- trunk/catalog/includes/appli_top_Test.php 2011-12-03 22:31:28 UTC (rev 3922)
+++ trunk/catalog/includes/appli_top_Test.php 2011-12-04 10:10:09 UTC (rev 3923)
@@ -50,6 +50,10 @@
error_reporting(0);
}
error_reporting(E_ALL);
+
+ // force config in object, by stdclass
+ $conf = (object)$conf;
+
/// attribut produits ameliorer
define('UPLOAD_PREFIX', 'upload_');
define('TEXT_PREFIX', 'txt_');
Modified: trunk/catalog/includes/application_top.php
===================================================================
--- trunk/catalog/includes/application_top.php 2011-12-03 22:31:28 UTC (rev 3922)
+++ trunk/catalog/includes/application_top.php 2011-12-04 10:10:09 UTC (rev 3923)
@@ -40,6 +40,10 @@
error_reporting(0);
}
+
+ // force config in object, by stdclass
+ $conf = (object)$conf;
+
/// attribut produits ameliorer
define('UPLOAD_PREFIX', 'upload_');
define('TEXT_PREFIX', 'txt_');
Modified: trunk/catalog/includes/classes/core_page/customer.php
===================================================================
--- trunk/catalog/includes/classes/core_page/customer.php 2011-12-03 22:31:28 UTC (rev 3922)
+++ trunk/catalog/includes/classes/core_page/customer.php 2011-12-04 10:10:09 UTC (rev 3923)
@@ -39,7 +39,6 @@
protected function __construct($customer_id=''){
if(!empty($customer_id)) $this->the_customer($customer_id);
- if(!function_exists('tep_validate_password')) require_once(DIR_WS_FUNCTIONS.'password_funcs.php');
return $this->customer;
}
@@ -167,10 +166,7 @@
$check_customer_query = $DB->query("select customers_id,customers_password from " . TABLE_CUSTOMERS . " where customers_email_address = '" . tep_db_input($email_address) . "' ");
$check_customer = $check_customer_query->fetchAssoc();
- /// include the password crypto functions
- if(!function_exists('tep_validate_password')) require(DIR_WS_FUNCTIONS . 'password_funcs.php');
-
- return (!tep_validate_password($password, $check_customer['customers_password'])? false : (int)$check_customer['customers_id'] ) ;
+ return (!PasswordUtility::validate_password($password, $check_customer['customers_password'])? false : (int)$check_customer['customers_id'] ) ;
}
@@ -191,7 +187,7 @@
$resul=array_merge($pass,$resul);
/// include the password crypto functions
- require_once(DIR_WS_FUNCTIONS . 'password_funcs.php');
+// require_once(DIR_WS_FUNCTIONS . 'password_funcs.php');
if (_cst_bool('CUSTOMER_FORCE_UCWORDS')) {
$resul['lastname']=ucwords($resul['lastname']);
@@ -209,7 +205,7 @@
'customers_telephone' => $resul['telephone'],
'customers_fax' => $resul['fax'],
'customers_newsletter' => $resul['newsletter'],
- 'customers_password' => tep_encrypt_password($resul['password']),
+ 'customers_password' =>PasswordUtility::encrypt_password($resul['password']),
'customers_group_ra'=> $check_customer['customers_group_id'],
'customers_language'=> $this->languages_id,
'customers_status'=> (_cst_bool('ACCOUNT_FORCE_ACTIV_MAIL')? 2 : 1)
@@ -433,7 +429,7 @@
$_confirmation = tep_db_prepare_input($_post['password_confirmation']);
if ($this->checkPasswordProcess($_current, $_new, $_confirmation) ) {
- tep_db_query("update " . TABLE_CUSTOMERS . " set customers_password = '" . tep_encrypt_password($_new) . "' where customers_id = '" . $this->customer_id . "'");
+ tep_db_query("update " . TABLE_CUSTOMERS . " set customers_password = '" . PasswordUtility::encrypt_password($_new) . "' where customers_id = '" . $this->customer_id . "'");
tep_db_query("update " . TABLE_CUSTOMERS_INFO . " set customers_info_date_account_last_modified = now() where customers_info_id = '" . $this->customer_id . "'");
@@ -676,7 +672,7 @@
$check_customer_query = tep_db_query("select customers_password from " . TABLE_CUSTOMERS . " where customers_id = '" . $this->customer_id . "'");
$check_customer = tep_db_fetch_array($check_customer_query);
- if (tep_validate_password($current, $check_customer['customers_password'])) {
+ if (PasswordUtility::validate_password($current, $check_customer['customers_password'])) {
self::PassmessageStack('account', SUCCESS_PASSWORD_UPDATED, 'success');
return true;
}
Modified: trunk/catalog/install/includes/modele/configure.txt
===================================================================
--- trunk/catalog/install/includes/modele/configure.txt 2011-12-03 22:31:28 UTC (rev 3922)
+++ trunk/catalog/install/includes/modele/configure.txt 2011-12-04 10:10:09 UTC (rev 3923)
@@ -1,101 +1,110 @@
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @package oscss-2 <www http://www.oscss.org>
- @version %CURRENT_VERSION%
- @date %CREATE_DATE%
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
+ @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @package oscss-2 <www http://www.oscss.org>
+ @version %CURRENT_VERSION%
+ @date %CREATE_DATE%
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
*/
- /**
- * \brief as active / inactive cache and error return
- * @var boolean default:false
- */
- define('OSCSS_DEBUG', true);
- /**
- * \brief as active view query in error requet sql
- * @var boolean default:false
- */
- define('OSCSS_SHOW_QUERIES', true);
- /**
- * \brief as active / incative garbage collector error
- * @var boolean default: true
- */
- define('OSCSS_GARBAGE_ERROR', true);
+ /**
+ * \brief as active / inactive cache and error return
+ * @var boolean default:false
+ */
+ define('OSCSS_DEBUG', true);
+ /**
+ * \brief as active view query in error requet sql
+ * @var boolean default:false
+ */
+ define('OSCSS_SHOW_QUERIES', true);
+ /**
+ * \brief as active / incative garbage collector error
+ * @var boolean default: true
+ */
+ define('OSCSS_GARBAGE_ERROR', true);
-// Define the webserver and path parameters
-// * DIR_FS_* = Filesystem directories (local/physical)
-// * DIR_WS_* = Webserver directories (virtual/URL)
+ // Define the webserver and path parameters
+ // * DIR_FS_* = Filesystem directories (local/physical)
+ // * DIR_WS_* = Webserver directories (virtual/URL)
- define('HTTP_SERVER', '%HTTP_SERVER%'); // eg, http://localhost - should not be empty for productive servers
- define('HTTPS_SERVER', '%HTTPS_SERVER%'); // eg, https://localhost - should not be empty for productive servers
- define('ENABLE_SSL', %ENABLE_SSL%); // secure webserver for checkout procedure?
- define('HTTP_COOKIE_DOMAIN', '%HTTP_COOKIE_DOMAIN%');
- define('HTTPS_COOKIE_DOMAIN', '%HTTPS_COOKIE_DOMAIN%');
- define('HTTP_COOKIE_PATH', '%HTTP_COOKIE_PATH%');
- define('HTTPS_COOKIE_PATH', '%HTTPS_COOKIE_PATH%');
- define('DIR_WS_HTTP_CATALOG', '%HTTP_CATALOG%');
- define('DIR_WS_HTTPS_CATALOG', '%HTTP_CATALOG%');
+ define('HTTP_SERVER', '%HTTP_SERVER%'); // eg, http://localhost - should not be empty for productive servers
+ define('HTTPS_SERVER', '%HTTPS_SERVER%'); // eg, https://localhost - should not be empty for productive servers
+ define('ENABLE_SSL', %ENABLE_SSL%); // secure webserver for checkout procedure?
+ define('HTTP_COOKIE_DOMAIN', '%HTTP_COOKIE_DOMAIN%');
+ define('HTTPS_COOKIE_DOMAIN', '%HTTPS_COOKIE_DOMAIN%');
+ define('HTTP_COOKIE_PATH', '%HTTP_COOKIE_PATH%');
+ define('HTTPS_COOKIE_PATH', '%HTTPS_COOKIE_PATH%');
+ define('DIR_WS_HTTP_CATALOG', '%HTTP_CATALOG%');
+ define('DIR_WS_HTTPS_CATALOG', '%HTTP_CATALOG%');
- define('DIR_CLASSES', 'classes/');
- define('DIR_FUNCTIONS', 'functions/');
- define('DIR_FONTS', 'fonts/');
- define('DIR_MODELES', 'modeles/');
+ define('DIR_CLASSES', 'classes/');
+ define('DIR_FUNCTIONS', 'functions/');
+ define('DIR_FONTS', 'fonts/');
+ define('DIR_MODELES', 'modeles/');
- define('DIR_WS_IMAGES', 'images/');
- define('DIR_WS_ICONS', DIR_WS_IMAGES . 'icons/');
- define('DIR_WS_INCLUDES', 'includes/');
- define('DIR_WS_BOXES', DIR_WS_INCLUDES . 'boxes/');
- define('DIR_WS_FUNCTIONS', DIR_WS_INCLUDES . DIR_FUNCTIONS);
- define('DIR_WS_CLASSES', DIR_WS_INCLUDES . DIR_CLASSES);
- define('DIR_WS_MODULES', DIR_WS_INCLUDES . 'modules/');
- define('DIR_WS_LANGUAGES', DIR_WS_INCLUDES . 'languages/');
- define('DIR_WS_TRIGGERS', DIR_WS_INCLUDES . 'triggers/');
- define('DIR_WS_DOWNLOAD_PUBLIC', 'pub/');
+ define('DIR_WS_IMAGES', 'images/');
+ define('DIR_WS_ICONS', DIR_WS_IMAGES . 'icons/');
+ define('DIR_WS_INCLUDES', 'includes/');
+ define('DIR_WS_BOXES', DIR_WS_INCLUDES . 'boxes/');
+ define('DIR_WS_FUNCTIONS', DIR_WS_INCLUDES . DIR_FUNCTIONS);
+ define('DIR_WS_CLASSES', DIR_WS_INCLUDES . DIR_CLASSES);
+ define('DIR_WS_MODULES', DIR_WS_INCLUDES . 'modules/');
+ define('DIR_WS_LANGUAGES', DIR_WS_INCLUDES . 'languages/');
+ define('DIR_WS_TRIGGERS', DIR_WS_INCLUDES . 'triggers/');
+ define('DIR_WS_DOWNLOAD_PUBLIC', 'pub/');
- define('DIR_FS_CATALOG', '%FS_DOCUMENT_ROOT%');
- define('DIR_FS_ROOT_DOCS', '%FS_ROOT_DOCS%');
+ define('DIR_FS_CATALOG', '%FS_DOCUMENT_ROOT%');
+ define('DIR_FS_ROOT_DOCS', '%FS_ROOT_DOCS%');
- define('DIR_FS_CATALOG_IMAGES', DIR_FS_CATALOG . 'images/');
- define('DIR_FS_CATALOG_MODULES', DIR_FS_CATALOG . 'includes/modules/');
- define('DIR_FS_CATALOG_LANGUAGES', DIR_FS_CATALOG . 'includes/languages/');
- define('DIR_FS_CATALOG_TEMPLATE', DIR_FS_CATALOG . 'templates/');
+ define('DIR_FS_CATALOG_IMAGES', DIR_FS_CATALOG . 'images/');
+ define('DIR_FS_CATALOG_MODULES', DIR_FS_CATALOG . 'includes/modules/');
+ define('DIR_FS_CATALOG_LANGUAGES', DIR_FS_CATALOG . 'includes/languages/');
+ define('DIR_FS_CATALOG_TEMPLATE', DIR_FS_CATALOG . 'templates/');
-// public docs
- define('DIR_FS_DOWNLOAD', DIR_FS_CATALOG . 'download/');
- define('DIR_FS_DOWNLOAD_PUBLIC', DIR_FS_CATALOG . 'pub/');
+ // public docs
+ define('DIR_FS_DOWNLOAD', DIR_FS_CATALOG . 'download/');
+ define('DIR_FS_DOWNLOAD_PUBLIC', DIR_FS_CATALOG . 'pub/');
-// Documents
- define('DIR_FS_SESSIONS', DIR_FS_ROOT_DOCS . 'public/sessions/');
- define('DIR_FS_WORK', DIR_FS_ROOT_DOCS . 'public/oscss_data/');
+ // Documents
+ define('DIR_FS_SESSIONS', DIR_FS_ROOT_DOCS . 'public/sessions/');
+ define('DIR_FS_WORK', DIR_FS_ROOT_DOCS . 'public/oscss_data/');
-// Template System files
- define('DIR_FS_TEMPLATES', DIR_FS_CATALOG . 'templates/');
- define('DIR_WS_TEMPLATES', 'templates/');
+ // Template System files
+ define('DIR_FS_TEMPLATES', DIR_FS_CATALOG . 'templates/');
+ define('DIR_WS_TEMPLATES', 'templates/');
-// Common
- define('DIR_WS_COMMON', 'common/');
- define('DIR_WS_COMMON_FUNCTIONS', DIR_WS_COMMON . DIR_FUNCTIONS);
- define('DIR_WS_COMMON_FONTS', DIR_WS_COMMON . DIR_FONTS);
- define('DIR_WS_COMMON_CLASSES', DIR_WS_COMMON . DIR_CLASSES);
- define('DIR_WS_COMMON_IMAGES', DIR_WS_TEMPLATES . 'layout/');
+ // Common
+ define('DIR_WS_COMMON', 'common/');
+ define('DIR_WS_COMMON_FUNCTIONS', DIR_WS_COMMON . DIR_FUNCTIONS);
+ define('DIR_WS_COMMON_FONTS', DIR_WS_COMMON . DIR_FONTS);
+ define('DIR_WS_COMMON_CLASSES', DIR_WS_COMMON . DIR_CLASSES);
+ define('DIR_WS_COMMON_IMAGES', DIR_WS_TEMPLATES . 'layout/');
-// define our database connection
- define('DB_CONNECTOR', '%DBMOTOR%');
- define('DB_MOTOR', '%DBMOTOR%');
- define('DB_MOTOR_TYPE', '%DBMOTOR_TYPE%');
- define('DB_PORT', '%DBMOTOR_PORT%');
- define('DB_CHARSET', '%DBMOTOR_CHARSET%');
- define('DB_SERVER', '%DB_SERVER%'); // eg, localhost - should not be empty for productive servers
- define('DB_SERVER_USERNAME', '%DB_SERVER_USERNAME%');
- define('DB_SERVER_PASSWORD', '%DB_SERVER_PASSWORD%');
- define('DB_DATABASE', '%DB_DATABASE%');
- define('DB_TABLE_PREFIX', '%DB_TABLE_PREFIX%');
- define('USE_PCONNECT', '%USE_PCONNECT%'); // use persisstent connections?
- define('STORE_SESSIONS', '%STORE_SESSIONS%'); // leave empty '' for default handler or set to 'mysql'
+ // define our database connection
+ define('DB_CONNECTOR', '%DBMOTOR%');
+ define('DB_MOTOR', '%DBMOTOR%');
+ define('DB_MOTOR_TYPE', '%DBMOTOR_TYPE%');
+ define('DB_PORT', '%DBMOTOR_PORT%');
+ define('DB_CHARSET', '%DBMOTOR_CHARSET%');
+ define('DB_SERVER', '%DB_SERVER%'); // eg, localhost - should not be empty for productive servers
+ define('DB_SERVER_USERNAME', '%DB_SERVER_USERNAME%');
+ define('DB_SERVER_PASSWORD', '%DB_SERVER_PASSWORD%');
+ define('DB_DATABASE', '%DB_DATABASE%');
+ define('DB_TABLE_PREFIX', '%DB_TABLE_PREFIX%');
+ define('USE_PCONNECT', '%USE_PCONNECT%'); // use persisstent connections?
+ define('STORE_SESSIONS', '%STORE_SESSIONS%'); // leave empty '' for default handler or set to 'mysql'
- /**
- @var Security key
- @brief use by offline mode
- */
- $SecuKey='%SECURE_KEY%';
+ /**
+ @var Security key
+ @brief use by offline mode
+ */
+ $SecuKey='%SECURE_KEY%';
+
+ /**
+ @ var Define class use for encrypt pa*ssword
+ Value possible:
+ - Classic normal in oscommerce mode
+ - Md5 special for acces by other mode
+ - Sha1 new mode
+ */
+ $conf['ModPassword'] = 'Classic';
Modified: trunk/catalog/password_forgotten.php
===================================================================
--- trunk/catalog/password_forgotten.php 2011-12-03 22:31:28 UTC (rev 3922)
+++ trunk/catalog/password_forgotten.php 2011-12-04 10:10:09 UTC (rev 3923)
@@ -29,14 +29,11 @@
$u=$cust->the_customer($customers_id);
$user=$cust->detail_long_cust();
- /// include the password crypto functions
- require_once(DIR_WS_FUNCTIONS . 'password_funcs.php');
-
/**
* TODO: Utiliser class page.customer.php
*/
$user['password']=$new_password = tep_create_random_value(ENTRY_PASSWORD_MIN_LENGTH);
- $crypted_password = tep_encrypt_password($new_password);
+ $crypted_password = PasswordUtility::encrypt_password($new_password);
$DB->query("update " . TABLE_CUSTOMERS . " set customers_password = '" . tep_db_input($crypted_password) . "' where customers_id = '" . (int)$user['customers_id'] . "'");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-12-04 10:38:32
|
Revision: 3924
http://oscss.svn.sourceforge.net/oscss/?rev=3924&view=rev
Author: oscim
Date: 2011-12-04 10:38:26 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
Suite report des module de hash de mdp
correction coquille PasswordUtility
Suppression lib function dans le frontoffice
Modified Paths:
--------------
trunk/catalog/common/classes/PasswordUtility.php
Added Paths:
-----------
trunk/catalog/common/modules/core/password/Pass_Md5.php
trunk/catalog/common/modules/core/password/Pass_Sha1.php
Removed Paths:
-------------
trunk/catalog/includes/functions/password_funcs.php
Modified: trunk/catalog/common/classes/PasswordUtility.php
===================================================================
--- trunk/catalog/common/classes/PasswordUtility.php 2011-12-04 10:10:09 UTC (rev 3923)
+++ trunk/catalog/common/classes/PasswordUtility.php 2011-12-04 10:38:26 UTC (rev 3924)
@@ -38,12 +38,12 @@
if(self::$ChildMod !=false) return ;
- $file = self::PREFIX_FILE_CHILDS_MOD.$conf->modPassword;
+ $file = self::PREFIX_FILE_CHILDS_MOD.$conf->ModPassword.'.php';
if(!file_exists(DIR_WS_COMMON.self::PATH_CHILDS_MOD.$file))
throw new Exception('Not found file password module');
- $current = $conf->modPassword;
+ $current = $conf->ModPassword;
require_once(DIR_WS_COMMON.self::PATH_CHILDS_MOD.$file);
self::$ChildMod = new $current();
@@ -73,6 +73,7 @@
@page login.php(public)
*/
public function validate_password($plain, $encrypted){
+ self::getInstance();
return self::$ChildMod->validate_password($plain, $encrypted);
}
@@ -81,6 +82,7 @@
@page create_account.php|password_forgotent.php(public)
*/
public function encrypt_password($plain){
+ self::getInstance();
return self::$ChildMod->encrypt_password($plain);
}
Added: trunk/catalog/common/modules/core/password/Pass_Md5.php
===================================================================
--- trunk/catalog/common/modules/core/password/Pass_Md5.php (rev 0)
+++ trunk/catalog/common/modules/core/password/Pass_Md5.php 2011-12-04 10:38:26 UTC (rev 3924)
@@ -0,0 +1,35 @@
+<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 08/12/11, 16:16
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class Md5
+*/
+
+class Md5 {
+
+ /**
+ @brief This funstion validates a plain text password with an encrpyted password
+ */
+ public function validate_password($plain, $encrypted) {
+ if (tep_not_null($plain) && tep_not_null($encrypted)) {
+ if (md5($plain) == $encrypted ) return true;
+ }
+ return false;
+ }
+
+ /**
+ @brief This function makes a new password from a plaintext password.
+ */
+ public function encrypt_password($plain) {
+ $password = md5( $plain) ;
+ return $password;
+ }
+
+}
+
+?>
\ No newline at end of file
Added: trunk/catalog/common/modules/core/password/Pass_Sha1.php
===================================================================
--- trunk/catalog/common/modules/core/password/Pass_Sha1.php (rev 0)
+++ trunk/catalog/common/modules/core/password/Pass_Sha1.php 2011-12-04 10:38:26 UTC (rev 3924)
@@ -0,0 +1,35 @@
+<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 08/12/11, 16:16
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class Sha1
+*/
+
+class Sha1 {
+
+ /**
+ @brief This funstion validates a plain text password with an encrpyted password
+ */
+ public function validate_password($plain, $encrypted) {
+ if (tep_not_null($plain) && tep_not_null($encrypted)) {
+ if (sha1($plain) == $encrypted ) return true;
+ }
+ return false;
+ }
+
+ /**
+ @brief This function makes a new password from a plaintext password.
+ */
+ public function encrypt_password($plain) {
+ $password = sha1( $plain) ;
+ return $password;
+ }
+
+}
+
+?>
\ No newline at end of file
Deleted: trunk/catalog/includes/functions/password_funcs.php
===================================================================
--- trunk/catalog/includes/functions/password_funcs.php 2011-12-04 10:10:09 UTC (rev 3923)
+++ trunk/catalog/includes/functions/password_funcs.php 2011-12-04 10:38:26 UTC (rev 3924)
@@ -1,38 +0,0 @@
-<?php
-/**
-
- @package oscss-Codev <www http://www.oscss.org>
- @version Rc-3
- @date 22/12/09 16:24
- @author oscim - <mail aur...@os...> <www http://www.oscim.fr>
-*/
-
-/**
- This funstion validates a plain text password with an encrpyted password
- @page login.php
-*/
- function tep_validate_password($plain, $encrypted) {
- if (tep_not_null($plain) && tep_not_null($encrypted)) {
- // split apart the hash / salt
- $stack = explode(':', $encrypted);
- if (sizeof($stack) != 2) return false;
- if (md5($stack[1] . $plain) == $stack[0]) return true;
- }
- return false;
- }
-
-/**
- This function makes a new password from a plaintext password.
- @page create_account.php|password_forgotent.php
-*/
- function tep_encrypt_password($plain) {
- $password = '';
-
- for ($i=0; $i<10; $i++)
- $password .= tep_rand();
-
- $salt = substr(md5($password), 0, 2);
- $password = md5($salt . $plain) . ':' . $salt;
- return $password;
- }
-?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <j4...@us...> - 2011-12-04 15:02:24
|
Revision: 3931
http://oscss.svn.sourceforge.net/oscss/?rev=3931&view=rev
Author: j4k
Date: 2011-12-04 15:02:18 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
Coquille orthographe
Modified Paths:
--------------
trunk/catalog/admin/includes/languages/fr_FR/modules/generic/CheckCore.txt
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/languages/fr_FR.txt
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/generic/CheckCore.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/generic/CheckCore.txt 2011-12-04 14:26:16 UTC (rev 3930)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/generic/CheckCore.txt 2011-12-04 15:02:18 UTC (rev 3931)
@@ -15,7 +15,7 @@
/// text button menu
$lang['CheckCore view alerts']="Controle" ;
/// line warning alert and link for detail
-$lang['CheckCore warning, check files or folders %s']="Attention, revoir les droit d'accés à certain fichiers ou dossiers <a href=\"%s\"> voir le detail </a> " ;
+$lang['CheckCore warning, check files or folders %s']="Attention, revoir les droit d'accés à certain fichiers ou dossiers <a href=\"%s\"> voir le détail </a> " ;
///
$lang['CheckCore heading title']="Controles" ;
/// test
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/languages/fr_FR.txt
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/languages/fr_FR.txt 2011-12-04 14:26:16 UTC (rev 3930)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/languages/fr_FR.txt 2011-12-04 15:02:18 UTC (rev 3931)
@@ -46,7 +46,7 @@
$lang['text article deja dans vos favoris']= 'Cet article est déjà dans vos favoris';
$lang['add to cart']= 'Mettre dans le panier';
$lang['add to wishlist']= 'Ajouter aux favoris';
-$lang['view more']= 'Voir le detail';
+$lang['view more']= 'Voir le détail';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-12-05 13:42:13
|
Revision: 3937
http://oscss.svn.sourceforge.net/oscss/?rev=3937&view=rev
Author: oscim
Date: 2011-12-05 13:42:03 +0000 (Mon, 05 Dec 2011)
Log Message:
-----------
suite amelioration du nouveau template public
Modified Paths:
--------------
trunk/catalog/includes/languages/fr_FR/modules/order_total/ot_tax.txt
trunk/catalog/includes/modules/order_total/ot_tax.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/product_info.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/shopping_cart.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css
Added Paths:
-----------
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/triggers/
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/triggers/cart_totaux.inc
Modified: trunk/catalog/includes/languages/fr_FR/modules/order_total/ot_tax.txt
===================================================================
--- trunk/catalog/includes/languages/fr_FR/modules/order_total/ot_tax.txt 2011-12-05 12:32:42 UTC (rev 3936)
+++ trunk/catalog/includes/languages/fr_FR/modules/order_total/ot_tax.txt 2011-12-05 13:42:03 UTC (rev 3937)
@@ -10,4 +10,5 @@
*/
$lang['module order total tax title']="TVA" ;
$lang['module order total tax description']="Commande TVA" ;
+$lang['ot_tax tot cart taxe']="Total taxes" ;
?>
\ No newline at end of file
Modified: trunk/catalog/includes/modules/order_total/ot_tax.php
===================================================================
--- trunk/catalog/includes/modules/order_total/ot_tax.php 2011-12-05 12:32:42 UTC (rev 3936)
+++ trunk/catalog/includes/modules/order_total/ot_tax.php 2011-12-05 13:42:03 UTC (rev 3937)
@@ -3,8 +3,8 @@
@licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 09/01/11, 12:43
+ @version 2.1.1
+ @date 05/12/11, 12:43
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -19,8 +19,9 @@
$this->description = __('module order total tax description');
$this->sort_order = (defined('MODULE_ORDER_TOTAL_TAX_SORT_ORDER')) ? MODULE_ORDER_TOTAL_TAX_SORT_ORDER : 4 ;
$this->enabled = true;
-
+ $this->shopping_cart=true; // active mode process
$this->output = array();
+ $this->pre_output = array();
}
public function process() {
@@ -37,6 +38,30 @@
}
}
+ /**
+ @remarks shopping_cart
+ */
+ public function show_list_total() {
+ global $currencies, $cart;
+
+ $value=0;
+ foreach($cart->get_products() as $row){
+ $value += ($row['total_line_ttc'] - $row['total_line'] );
+ }
+
+ if ($value > 0) {
+ $this->pre_output = new objectInfo(
+ array(
+ 'text'=>__('ot_tax tot cart taxe'),
+ 'value' => $value)
+ );
+ }
+
+
+ return $this->pre_output;
+ }
+
+
public function check() {
if (!isset($this->_check)) {
$check_query = tep_db_query("select configuration_value from " . TABLE_CONFIGURATION . " where configuration_key = 'MODULE_ORDER_TOTAL_TAX_SORT_ORDER'");
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css 2011-12-05 12:32:42 UTC (rev 3936)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css 2011-12-05 13:42:03 UTC (rev 3937)
@@ -1,313 +1,365 @@
/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
- @subpackage Template 2cShopHtml5Oscim
- @package osCSS-2 <www http://www.oscss.org>
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
+ @ licence GPL 2005-2011 The osC*S*S developers - osCSS Open Source E-commerce
+ @subpackage Template 2cShopHtml5Oscim
+ @package osCSS-2 <www http://www.oscss.org>
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ */
/* standard body */
- body {
+body {
font: 14px/20px "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif;
- background: #ff8300;
- }
+ background: #eee;
+}
/* standard alignments */
- img { border: none; }
- .center { text-align: center; }
+img { border: none; }
+.center { text-align: center; }
/* Hx tags */
- h1 {
+h1 {
color: #FFF;
font-size: 28px;
- }
+}
- h2 {
+h2 {
font-size: 24px;
- }
+}
- h3 {
+h3 {
font-size: 18px;
- }
- ul {list-style:none;}
- fieldest,form,fieldset.ListFilterType,fieldset.manufacturerFilter {border:0;font-size:0.9em;padding:0.5em}
- del {font-size:0.6em;}
-
- .messageStack {
- color: #FFF;
- background-color: #f18f7e;
-/* curved border radius */
- -webkit-border-radius: 5px;
- -webkit-border-radius: 5px;
- }
-
+}
+ul {list-style:none;}
+fieldest,form,fieldset.ListFilterType,fieldset.manufacturerFilter {border:0;font-size:0.9em;padding:0.5em}
+del {font-size:0.6em;}
- div.CguView {
+.messageStack {
+ color: #FFF;
+ background-color: #f18f7e;
+ /* curved border radius */
+ -webkit-border-radius: 5px;
+ -webkit-border-radius: 5px;
+}
+
+
+div.CguView {
text-align: justify;
border:1px solid black;
background:white;
- }
+}
- a {text-decoration:none; color:#0E9FC0; font-weight:bold;font-size:1.2em;}
+a {text-decoration:none; color:#0E9FC0; font-weight:bold;font-size:1.2em;}
/* content and sidebar layout */
#content {
- background-color: #fff;
-
-/* curved border radius */
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
+ background:#fff url(images/bg_content.jpg) no-repeat top right;
+ /* curved border radius */
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
}
/* article */
.product header p, .blogPost header p a {
- font-size: 14px;
- font-style: italic;
- color: #777;
- }
+ font-size: 14px;
+ font-style: italic;
+ color: #777;
+}
.product p a {
- color: #0e9fc0;
- }
+ color: #0e9fc0;
+}
.product p a:hover {
- color: #000;
- }
+ color: #000;
+}
.product header p a:hover {
- text-decoration: none;
- color: #000;
- }
+ text-decoration: none;
+ color: #000;
+}
article h1/*,
.product h2,
.product h1*/ {
- background-color: #B4E3EC;
-/* curved border radius */
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- }
+ background:transparent url(images/bg_header.jpg) no-repeat top left;
+ /* curved border radius */
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+}
/* sidebar */
aside section {
- background-color: #fff;
+ background-color: #fff;
- /* curved border radius */
- -webkit-border-radius: 5px;
- -webkit-border-radius: 5px;
+ /* curved border radius */
+ -webkit-border-radius: 5px;
+ -webkit-border-radius: 5px;
}
aside section ul {
- list-style: square;
- color: #0e9fc0;
- }
+ list-style: square;
+ color: #0e9fc0;
+}
aside section ul li {
- border-bottom: 1px #0e9fc0 dotted;
- }
+ border-bottom: 1px #0e9fc0 dotted;
+}
aside section ul li a {
- text-decoration: none;
- color: #000;
- font-size: 16px;
- font-variant: small-caps;
- }
+ text-decoration: none;
+ color: #000;
+ font-size: 16px;
+ font-variant: small-caps;
+}
aside section ul li a:hover {
- text-decoration: underline;
- }
+ text-decoration: underline;
+}
aside section header h3 {
- background: url("../images/introbkg.png") repeat-x scroll bottom right #778899;
- color:#fff;
-/* curved border radius */
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- }
+ background: url("../images/introbkg.png") repeat-x scroll bottom right #778899;
+ color:#fff;
+ /* curved border radius */
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+}
aside section div.inner-boxe{
- text-align:center;
+ text-align:center;
}
/* columns */
+.module h4.title {font-size: 1.5em;font-weight:bold;margin:1.2em;color:#0E9FC0;}
+
.module ul {
- list-style: none;
+ list-style: none;
}
.module .outerblock {
- font-size: 1em;
- background: #dee;
-/* curved border radius */
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- }
+ font-size: 1em;
+ background: #dee;
+ /* curved border radius */
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+}
.module .innerblock {
- font-size: 1em;
+ font-size: 1em;
- text-align:center;
-/* curved border radius */
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
+ text-align:center;
+ /* curved border radius */
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
}
.module .innerblock img {
- border: none;
+ border: none;
}
.module .innerblock a {
- color: #0e9fc0;
+ color: #0e9fc0;
}
.module .innerblock h2 {
- font-size: 16px;
+ font-size: 16px;
}
.module .innerblock .innerblock-more{
- text-align:left;
+ text-align:left;
}
+
+.module .innerblock .innerblock-more a.details{
+ color:#fff;
+ background:#0E9FC0;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+}
+
+.module .innerblock .innerblock-more a.details:hover{
+ color:#0E9FC0;
+ background:#fff;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+}
+
+
+
+
+.boxe { -moz-border-radius: 5px;-webkit-border-radius: 5px}
+
/* end of column configuration */
article.product.single figure p{
- text-align:center;
+ text-align:center;
}
article.product.single figure ul{
- list-style:none;
+ list-style:none;
}
+#headingCatImg { background: url("images/bg_product.png") 0px 0px no-repeat;}
+.innerblock { background: url("images/bg_product_list.png") 0px 0px no-repeat;}
+
+
+/* -- panier -- */
+
+.invoice {background: url("images/bg_product.png") 0px 0px no-repeat;}
+.cart-header {background:#eee;border:1px solid #fff;}
+.cart-line {border:1px solid #eee;}
+.cart-line input{border:1px solid #eee;font-weight:bold;}
+.cart-line .puht {font-weight:bold;font-size:0.8em;}
+.cart-line .totttc {font-weight:bold;font-size:1.2em;}
+#TotCart{list-style:none;background: url("images/bg_soustotal.png") top right no-repeat; -moz-border-radius: 5px; -webkit-border-radius: 5px;}
+#TotCart li span.value{font-size:1.5em;text-align:right;}
+#TotCart li span.text{font-size:0.8em;color:#888;}
+
+/* panier short */
+#shopping_cart_shortBox {font-size:0.5em;}
+
+#Box-shopping_cart_short h3 {font-size:12px;}
+#Box-shopping_cart_short span {font-size:12px;}
+#Box-shopping_cart_short ul,
+#Box-shopping_cart_short ul li ul {list-style:none;}
+#Box-shopping_cart_short ul li ul,
+#Box-shopping_cart_short ul li,
+ul.cart{font-size:12px;font-weight:bold;color:#000;}
+#Box-shopping_cart_short ul li span,
+ul.cart li{font-size:10px;font-weight:bold;}
+ul.cart a,.cart_details a {color:#000;font-size:10px;}
+
+
/* Section habillage Top.css */
- /*header {
- }*/
+/*header {
+ } */ * *
- #logo p,
- #logo h1 {
- color: #FFF;
- font-size: 28px;
- }
+ #logo p,
+ #logo h1 {
+ color: #FFF;
+ font-size: 28px;
+ }
- /* #top_bar {
- }*/
+ /* #top_bar {
+ } */ * *
nav {
- background: url("../images/navbg.png") no-repeat top right #000;
- /* curved border radius */
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
+ background: url("../images/navbg.png") no-repeat top right #000;
+ /* curved border radius */
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
}
- nav ul {
- list-style: none;
- }
+ nav ul {
+ list-style: none;
+ }
- nav ul li a {
- font-size: 16px;
- font-weight: bold;
- line-height: 44px;
- text-align: center;
- text-decoration: none;
- color: #b4e3ec;
- }
+ nav ul li a {
+ font-size: 16px;
+ font-weight: bold;
+ line-height: 44px;
+ text-align: center;
+ text-decoration: none;
+ color: #b4e3ec;
+ }
- nav ul li a:hover {
- color: #fff;
- }
+ nav ul li a:hover {
+ color: #fff;
+ }
- nav ul li.selected a {
- color: #fff;
- }
+ nav ul li.selected a {
+ color: #fff;
+ }
div#top_bar {
- -moz-border-radius: 0px 0px 10px 10px;
- background: url("../images/navbg.png") repeat scroll 0 0 transparent;
+ -moz-border-radius: 0px 0px 10px 10px;
+ background: url("../images/navbg.png") repeat scroll 0 0 transparent;
}
section#intro {
- background: #778899 url("../images/introbkg.png") repeat-x;
+ background: #778899 url("../images/introbkg.png") repeat-x;
- /* background size */
- -webkit-background-size: 100%;
- -o-background-size: 100%;
- -khtml-background-size: 100%;
+ /* background size */
+ -webkit-background-size: 100%;
+ -o-background-size: 100%;
+ -khtml-background-size: 100%;
- /* curved border radius */
- -webkit-border-radius: 5px;
- -webkit-border-radius: 5px;
+ /* curved border radius */
+ -webkit-border-radius: 5px;
+ -webkit-border-radius: 5px;
}
- #intro h1,
- #intro h2 {
- font-weight: normal;
- color: #333;
- }
+ #intro h1,
+ #intro h2 {
+ font-weight: normal;
+ color: #333;
+ }
- #intro p {
- color: #5D4A3D;
- }
+ #intro p {
+ color: #5D4A3D;
+ }
-/* Footer habillage section*/
-/* footer */
-footer {
- background: #778899 url("../images/footer.png") repeat-x;
- color: #fff;
+ /* Footer habillage section*/
+ /* footer */
+ footer {
+ background: #778899 url("../images/footer.png") repeat-x;
+ color: #fff;
- /* curved border radius */
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- }
+ /* curved border radius */
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ }
-footer p {
- text-align: right;
- font-size: 11px;
- }
+ footer p {
+ text-align: right;
+ font-size: 11px;
+ }
-footer a {
- color: #999;
- }
+ footer a {
+ color: #999;
+ }
-footer a:hover {
- color: #FFF;
- text-decoration: none;
- }
+ footer a:hover {
+ color: #FFF;
+ text-decoration: none;
+ }
-footer div.right_footer { text-align:right;}
+ footer div.right_footer { text-align:right;}
-footer div.center_footer{
-text-align:left;font-size:0.8em;
-}
-footer a {text-decoration: none;}
\ No newline at end of file
+ footer div.center_footer{
+ text-align:left;font-size:0.8em;
+ }
+ footer a {text-decoration: none;}
\ No newline at end of file
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/product_info.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/product_info.php 2011-12-05 12:32:42 UTC (rev 3936)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/product_info.php 2011-12-05 13:42:03 UTC (rev 3937)
@@ -64,7 +64,7 @@
<li>
<?php /*if ( ($replace=$page->prop_ctrl('products_image', $img)) !=false) echo $replace($product_info);
else {*/ ?>
- <?php echo '<a class="lightbox" rel="lightbox" href="' . tep_image(DIR_WS_IMAGES . $img, $product_info['products_name'], $page->_conf_value('POPUP_IMAGE_WIDTH'), $page->_conf_value('POPUP_IMAGE_HEIGHT'), "", true) . '" onmouseover="change_image_master(\'' . tep_image(DIR_WS_IMAGES . $img, $product_info['products_name'], $page->_conf_value('HEADING_IMAGE_WIDTH'),$page->_conf_value('HEADING_IMAGE_HEIGHT') ,"", true) . '\',\'' . tep_image(DIR_WS_IMAGES . $img, $product_info['products_name'],$page->_conf_value('POPUP_IMAGE_WIDTH'), $page->_conf_value('POPUP_IMAGE_HEIGHT'), "", true) . '\')" rel="example_group">' . tep_image(DIR_WS_IMAGES . $img, $product_info['products_name'], $page->_conf_value('STACK_IMAGE_WIDTH'), $page->_conf_value('STACK_IMAGE_HEIGHT')) . '</a>'; ?>
+ <?php echo '<a class="lightbox" rel="lightbox-view" href="' . tep_image(DIR_WS_IMAGES . $img, $product_info['products_name'], $page->_conf_value('POPUP_IMAGE_WIDTH'), $page->_conf_value('POPUP_IMAGE_HEIGHT'), "", true) . '" onmouseover="change_image_master(\'' . tep_image(DIR_WS_IMAGES . $img, $product_info['products_name'], $page->_conf_value('HEADING_IMAGE_WIDTH'),$page->_conf_value('HEADING_IMAGE_HEIGHT') ,"", true) . '\',\'' . tep_image(DIR_WS_IMAGES . $img, $product_info['products_name'],$page->_conf_value('POPUP_IMAGE_WIDTH'), $page->_conf_value('POPUP_IMAGE_HEIGHT'), "", true) . '\')" rel="example_group">' . tep_image(DIR_WS_IMAGES . $img, $product_info['products_name'], $page->_conf_value('STACK_IMAGE_WIDTH'), $page->_conf_value('STACK_IMAGE_HEIGHT')) . '</a>'; ?>
<?php /*}*/ ?>
</li>
<?php endforeach; ?>
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/shopping_cart.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/shopping_cart.php 2011-12-05 12:32:42 UTC (rev 3936)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/shopping_cart.php 2011-12-05 13:42:03 UTC (rev 3937)
@@ -1,11 +1,10 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @subpackage 2cShopHtml5Oscim
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.1
- @date 20/10/11, 11:14
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @date 16/09/10, 21:54
@encode UTF-8
*/
$page->add_var_page('SMALL_IMAGE_WIDTH_CART', '30');
@@ -78,12 +77,12 @@
<div class="SubTotal">
<ul id="TotCart">
<?php foreach($cart->show_list_total() as $i=>$tot): ?>
- <li><?php printf('<span>%s </span> %s' ,$tot->text, $currencies->format($tot->value)); ?></li>
+ <li><?php printf('<span>%s </span><span class="value"> %s </span>' ,$tot->text, $currencies->format($tot->value)); ?></li>
<?php endforeach; ?>
<?php if($cart->get_content_type() !='virtual'): ?>
<li id="ajaxcartWeight" class="cartWeight">
- <?php echo '<span>' . SUB_TITLE_WEIGHT_TOTAL .'</span>' . $cart->show_weight().' '.UNIT_WEIGHT_NAME; ?>
+ <?php echo '<span class="text">' . SUB_TITLE_WEIGHT_TOTAL .'</span><span class="value">' . $cart->show_weight().' '.UNIT_WEIGHT_NAME.'</span>'; ?>
</li>
<?php endif; ?>
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/triggers/cart_totaux.inc
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/triggers/cart_totaux.inc (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/triggers/cart_totaux.inc 2011-12-05 13:42:03 UTC (rev 3937)
@@ -0,0 +1,26 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @subpackage 2cShopHtml5Oscim
+ @package osCSS-2 <www http://www.oscss.org>
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @date 16/09/10, 21:54
+ @encode UTF-8
+*/
+
+
+ global $cart;
+
+ if (is_object($cart) && $cart->count_contents() > 0) {
+
+ foreach($cart->show_list_total() as $i=>$tot) {
+ $det .= '<li>'. sprintf('<span>%s </span> <span class="value">%s</span>' ,$tot->text, $currencies->format($tot->value)) .'</li>' ;
+ }
+
+ $det .= '<li><span class="text">'.__('box shopping cart weight').'</span> <span class="value">'.$cart->show_weight().' '.UNIT_WEIGHT_NAME.'</span></li>'."\n";
+ }
+
+
+ echo $det;
+
+?>
\ No newline at end of file
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css 2011-12-05 12:32:42 UTC (rev 3936)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css 2011-12-05 13:42:03 UTC (rev 3937)
@@ -1,36 +1,40 @@
/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
- @subpackage Template 2cShopHtml5Oscim
- @package osCSS-2 <www http://www.oscss.org>
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
+ @ licence GPL 2005-2011 The o**sCSS developers - osCSS Open Source E-commerce
+ @subpackage Template 2cShopHtml5Oscim
+ @package osCSS-2 <www http://www.oscss.org>
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ */
@import url("Css/BottomTop.css");
@import url("Css/Sitemap.css");
+/**
+ * Le fichier habillage doit contenir l'ensemble des elements de style , couleur , mise en forme
+ * La totalite des contenu de type structure (position des boite et structuration du flux) doit ce situer dans ce fichier
+ */
@import url("Css/habillage.css");
/**
- Style commun et permanent.
- Ce fichier est appelé dans le tiny du backoffice
+ S tyle commun et permanent. **
+ Ce fichier est appelé dans le tiny du backoffice
-*/
+ */
/* supp du fond sur iframe pour block wisiwing */
- body.mceContentBody ,
- iframe#wysiwygmessage{ background:#f0f0ee; clear:both; width:650px; }
- body.mceContentBody .gabarit{border: 1px solid black; background:white; margin:5px 0;}
- /* Gabarit pour edition */
- .central {float:left; width:100%; }
- .colonne_gd{ width:330px;}
- .colonne_small{ width:200px;}
- .col_equal { width:270px;}
- .fright{ float:right; }
- .fleft{float:left;}
+body.mceContentBody ,
+iframe#wysiwygmessage{ background:#f0f0ee; clear:both; width:650px; }
+body.mceContentBody .gabarit{border: 1px solid black; background:white; margin:5px 0;}
+/* Gabarit pour edition */
+.central {float:left; width:100%; }
+.colonne_gd{ width:330px;}
+.colonne_small{ width:200px;}
+.col_equal { width:270px;}
+.fright{ float:right; }
+.fleft{float:left;}
- .tcenter {text-align:center}
- .tright {text-align:right}
+.tcenter {text-align:center}
+.tright {text-align:right}
@@ -47,19 +51,19 @@
/* Block debugg public template */
- #develop{
- opacity:0.4;
- filter:alpha(opacity=40); /* For IE8 and earlier */
- color:black;
- line-height:17px;
- background:white none repeat scroll 0 0
- ; border:1px solid black;
- padding:1em;
- position:fixed;
- right:0;
- top:0;
- }
- #develop p {padding:0; margin:0;}
+#develop{
+ opacity:0.4;
+ filter:alpha(opacity=40); /* For IE8 and earlier */
+ color:black;
+ line-height:17px;
+ background:white none repeat scroll 0 0
+ ; border:1px solid black;
+ padding:1em;
+ position:fixed;
+ right:0;
+ top:0;
+}
+#develop p {padding:0; margin:0;}
@@ -85,69 +89,67 @@
/* Squelette & dim */
/* reset */
- * { margin: 0; padding: 0; }
- br.clear {height:0; width:0;}
+* { margin: 0; padding: 0; }
+b r.clear {height:0; width:0;}**
/* render html5 elements as block */
- header,
- footer,
- section,
- aside,
- nav,
- article,
- nl{ display: block; }
-
+header,
+footer,
+section,
+aside,
+nav,
+article,
+nl{ display: block; }
+
/* standard body */
- body {
- margin: 0 auto;
- width: 960px;
- font: 14px/20px "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif;
- background: #eee;
- }
+body {
+ margin: 0 auto;
+ width: 960px;
+}
- table { width:100%}
+table { width:100%}
- ul{padding-left:20px;}
+ul{padding-left:20px;}
/* standard alignments */
- .alignleft { float: left; }
+.alignleft { float: left; }
- img { border: none; }
- img.alignleft { margin: 5px 10px 0 0; }
- .alignright { float: right; }
- img.alignright { margin: 5px 0 0 10px; }
- .center { text-align: center; }
+img { border: none; }
+img.alignleft { margin: 5px 10px 0 0; }
+.alignright { float: right; }
+img.alignright { margin: 5px 0 0 10px; }
+.center { text-align: center; }
/* Standard width*/
- #main_container {width:960px;}
+#main_container {width:960px;}
- .messageStack *{list-style:none; margin:0; padding:0;}
- .messageStack {margin:5px 0; padding:0;}
- .messageStack li{padding:5px 12px;}
+.messageStack *{list-style:none; margin:0; padding:0;}
+.messageStack {margin:5px 0; padding:0;}
+.messageStack li{padding:5px 12px;}
- div.CguView {
+div.CguView {
width:100%;
overflow:auto;
height:150px;
- }
+}
/* Hx tags */
h1 {
- padding: 20px 0;
- }
+ padding: 20px 0;
+}
h2 {
- padding: 20px 0;
- }
+ padding: 20px 0;
+}
h3 {
- padding: 10px 0;
- }
+ padding: 10px 0;
+}
p {
- padding-bottom: 20px;
- }
+ padding-bottom: 20px;
+}
@@ -161,25 +163,25 @@
#content {
- float: right;
- width: 71.3%;
- margin:10px 0 10px 0;
- padding:5px 12px 0 12px;
- background:#fff url(images/bg_content.jpg) no-repeat top right;
+ float: right;
+ width: 71.3%;
+ margin:10px 0 10px 0;
+ padding:5px 12px 0 12px;
+
}
aside {
- float: left;
- width: 26%;
- margin:0;
- padding:0;
- }
+ float: left;
+ width: 26%;
+ margin:0;
+ padding:0;
+}
/* article */
article {
- clear:both;
- }
+ clear:both;
+}
.textMain p {padding:0.5em;font-size:0.9em;}
@@ -187,128 +189,119 @@
article h1/*,
.product h2,
.product h1*/ {
- padding-left: 10px;
- margin-top: 10px;
- background:url(images/bg_header.jpg) no-repeat top left;
- }
+ padding-left: 10px;
+ margin-top: 10px;
+}
article h1/*,
.product h1,
.regular h2*/ {
- padding-left: 10px;
- margin-top: 12px;
- }
+ padding-left: 10px;
+ margin-top: 12px;
+}
-.module h4.title {font-size: 1.5em;font-weight:bold;margin:1.2em;color:#0E9FC0;}
/* sidebar */
aside section {
- margin: 10px 12px 0 0;
- padding: 10px 15px;
+ margin: 10px 12px 0 0;
+ padding: 10px 15px;
}
aside section ul {
- margin-left: 12px;
- padding-left: 12px;
- }
+ margin-left: 12px;
+ padding-left: 12px;
+}
aside section ul li {
- padding-top: 10px;
- padding-bottom: 22px;
- }
+ padding-top: 10px;
+ padding-bottom: 22px;
+}
aside section ul li a {
- display: block;
- }
+ display: block;
+}
aside section header h3 {
- padding-left: 10px;
- margin: 10px 0px;
- }
+ padding-left: 10px;
+ margin: 10px 0px;
+}
/* columns */
article div.module {
-clear:both;
+ clear:both;
}
.module ul {
- width: 110%;
- padding: 0;
- margin: 0;
+ width: 110%;
+ padding: 0;
+ margin: 0;
}
.module ul li {
- display: inline;
- float: left;
- margin: 0 17px 12px 0;
- padding: 0;
- width: 216px;
+ display: inline;
+ float: left;
+ margin: 0 17px 12px 0;
+ padding: 0;
+ width: 216px;
}
.module .outerblock {
- height: 255px;
- padding: 12px;
- width: 90%;
- }
+ height: 255px;
+ padding: 12px;
+ width: 90%;
+}
.module .innerblock {
- height: 220px;
- padding: 12px;
+ height: 220px;
+ padding: 12px;
}
.module .innerblock p {
- padding-bottom:0.2em;
+ padding-bottom:0.2em;
}
.module .innerblock p.title{
- height:41px;
+ height:41px;
}
.module .innerblock p.title a{
- text-decoration: none;
- font-size: 1.3em;
+ text-decoration: none;
+ font-size: 1.3em;
}
.module .innerblock p.img{
- height:100px;
+ height:100px;
}
.module .innerblock .innerblock-more{
- height:35px;
+ height:35px;
}
.module .innerblock .innerblock-more *{
-float:left;
-padding:5px 0 0 5px;
+ float:left;
+ padding:5px 0 0 5px;
}
.module .innerblock .innerblock-more a.details{
- display:inline-block;
- margin-top:15px;
- padding:3px 12px;
- float:right;
- color:#fff;
- background:#0E9FC0;
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
+ display:inline-block;
+ margin-top:15px;
+ padding:3px 12px;
+ float:right;
}
.module .innerblock .innerblock-more a.details:hover{
- display:inline-block;
- margin-top:15px;
- padding:3px 12px;
- float:right;
- color:#0E9FC0;
- background:#fff;
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
+ display:inline-block;
+ margin-top:15px;
+ padding:3px 12px;
+ float:right;
}
.module .splitnav{clear:both;}
+
/* end of column configuration */
-.boxe { -moz-border-radius: 5px;-webkit-border-radius: 5px}
+
article.product.single figure{
display: block;
float: left;
@@ -318,15 +311,15 @@
.module {padding-top:1em;}
article.product.single figure ul{
- display:inline;
+ display:inline;
}
article.product.single figure ul li{
- float:left;
- margin:5px 5px;
+ float:left;
+ margin:5px 5px;
}
-#headingCatImg { background: url("images/bg_product.png") 0px 0px no-repeat;height:220px;}
-.innerblock { background: url("images/bg_product_list.png") 0px 0px no-repeat;height:220px;}
+#headingCatImg {height:220px;}
+.innerblock { height:220px;}
#productImagelistMini{ height:70px;}
.tax_symbol {font-size:0.4em;}
@@ -341,29 +334,25 @@
.prod_box_big {padding:2em;}
/* -- panier -- */
-.invoice {background: url("images/bg_product.png") 0px 0px no-repeat;}
-.cart-header {background:#eee;padding:0.5em;border:1px solid #fff;}
-.cart-line {padding:0.5em;border:1px solid #eee;}
-.cart-line input{padding:0.5em;border:1px solid #eee;font-weight:bold;}
-.cart-line .puht {font-weight:bold;font-size:0.8em;}
-.cart-line .totttc {font-weight:bold;font-size:1.2em;}
-#TotCart{list-style:none;float:right;background: url("images/bg_soustotal.png") top right no-repeat; padding:2em; -moz-border-radius: 5px; -webkit-border-radius: 5px;height:50px;}
-#TotCart li {font-size:1.5em;}
-#TotCart li span,#TotCart li#ajaxcartWeight {font-size:0.8em;color:#888;}
-.block {clear:both;;margin-top:100px;}
+.cart-header {padding:0.5em;}
+.cart-line {padding:0.5em;}
+.cart-line input{padding:0.5em;}
+#TotCart{float:right; padding:2em 0 ; height:50px;}
+#TotCart li span.value...
[truncated message content] |
|
From: <os...@us...> - 2011-12-10 14:38:17
|
Revision: 3944
http://oscss.svn.sourceforge.net/oscss/?rev=3944&view=rev
Author: oscim
Date: 2011-12-10 14:38:11 +0000 (Sat, 10 Dec 2011)
Log Message:
-----------
FS#906
Modified Paths:
--------------
trunk/catalog/admin/includes/filenames.php
trunk/catalog/includes/filenames.php
Modified: trunk/catalog/admin/includes/filenames.php
===================================================================
--- trunk/catalog/admin/includes/filenames.php 2011-12-10 14:34:28 UTC (rev 3943)
+++ trunk/catalog/admin/includes/filenames.php 2011-12-10 14:38:11 UTC (rev 3944)
@@ -79,6 +79,7 @@
define('FILENAME_CONTACT_US', 'contact.php');
define('FILENAME_SHOPPING_CART', 'shopping_cart.php');
define('FILENAME_TEMPLATE', 'template.php');
+define('FILENAME_HOME', 'home.php');
// define the filenames used in the project
?>
\ No newline at end of file
Modified: trunk/catalog/includes/filenames.php
===================================================================
--- trunk/catalog/includes/filenames.php 2011-12-10 14:34:28 UTC (rev 3943)
+++ trunk/catalog/includes/filenames.php 2011-12-10 14:38:11 UTC (rev 3944)
@@ -38,6 +38,7 @@
define('FILENAME_DEFAULT', 'index.php');
define('FILENAME_DOWNLOAD', 'download.php');
define('FILENAME_INFO_SHOPPING_CART', 'info_shopping_cart.php');
+ define('FILENAME_HOME', 'home.php');
define('FILENAME_LOGIN', 'login.php');
define('FILENAME_LOGOFF', 'logoff.php');
define('FILENAME_PASSWORD_FORGOTTEN', 'password_forgotten.php');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-12-10 17:47:34
|
Revision: 3945
http://oscss.svn.sourceforge.net/oscss/?rev=3945&view=rev
Author: oscim
Date: 2011-12-10 17:47:26 +0000 (Sat, 10 Dec 2011)
Log Message:
-----------
correction coquille et gestion seo home
Correction coquille dans les drivers de templates
Correction erreur path dans save path session
mise a niveau template
Modified Paths:
--------------
trunk/catalog/admin/includes/functions/sessions.php
trunk/catalog/common/classes/seo_url.php
trunk/catalog/includes/classes/drivers/page/GabaritTemplate.php
trunk/catalog/includes/classes/drivers/page/GabaritTemplateSql.php
trunk/catalog/includes/classes/page.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/header.php
trunk/catalog/install/data/templates/appareil_photo/electronix/header.php
Modified: trunk/catalog/admin/includes/functions/sessions.php
===================================================================
--- trunk/catalog/admin/includes/functions/sessions.php 2011-12-10 14:38:11 UTC (rev 3944)
+++ trunk/catalog/admin/includes/functions/sessions.php 2011-12-10 17:47:26 UTC (rev 3945)
@@ -3,8 +3,8 @@
@licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 19/12/10, 19:49
+ @version 2.1.1
+ @date 10/12/11, 19:49
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -204,14 +204,21 @@
/**
-
- @author oscim - OscssTeam
- @note save session in file
+ @brief save session in file
+ @param $path string path folder for save file session
*/
function tep_session_save_path($path = DIR_FS_SESSIONS) {
- if (STORE_SESSIONS == 'mysql') return false;
- if (!empty($path)) return session_save_path($path);
- else return session_save_path();
+ if (STORE_SESSIONS == 'mysql')
+ return false;
+
+ /// force path not end "/"
+ if (substr($path,-1) =='/')
+ $path = substr($path,0,-1);
+
+ if (!empty($path))
+ return session_save_path($path);
+ else
+ return session_save_path();
}
Modified: trunk/catalog/common/classes/seo_url.php
===================================================================
--- trunk/catalog/common/classes/seo_url.php 2011-12-10 14:38:11 UTC (rev 3944)
+++ trunk/catalog/common/classes/seo_url.php 2011-12-10 17:47:26 UTC (rev 3945)
@@ -168,21 +168,21 @@
//ojp FILENAME_LINKS
$seo_pages=array(
- FILENAME_DEFAULT,
- FILENAME_POPUP_IMAGE,
- FILENAME_PRODUCT_INFO,
- FILENAME_CONTENT,
- FILENAME_ADVANCED_SEARCH,
- FILENAME_PRODUCTS_NEW,
- FILENAME_SMALL_PRICE,
- FILENAME_SPECIALS,
- FILENAME_BEST_SELLERS,
- FILENAME_SITEMAP,
- FILENAME_HOME,
- FILENAME_TEMPLATE,
- FILENAME_CONTACT_US,
- FILENAME_SHOPPING_CART
- );
+ FILENAME_DEFAULT,
+ FILENAME_POPUP_IMAGE,
+ FILENAME_PRODUCT_INFO,
+ FILENAME_CONTENT,
+ FILENAME_ADVANCED_SEARCH,
+ FILENAME_PRODUCTS_NEW,
+ FILENAME_SMALL_PRICE,
+ FILENAME_SPECIALS,
+ FILENAME_BEST_SELLERS,
+ FILENAME_SITEMAP,
+// FILENAME_HOME,
+ FILENAME_TEMPLATE,
+ FILENAME_CONTACT_US,
+ FILENAME_SHOPPING_CART
+ );
if ( defined('FILENAME_LINKS') ) $seo_pages[] = FILENAME_LINKS;
@@ -221,16 +221,16 @@
// respecter l'ordre
$this->reg_anchors= array(
- 'pID' => 'pi',
- 'products_id' => 'p',
- 'cPath' => 'c',
- 'manufacturers_id' => 'm',
- 'content' => 't',
- 'divers' => 'd',
- 'lID' => 'l',
- 'customers_id' => 'u',
- 'type_object' => 'to',
- );
+ 'pID' => 'pi',
+ 'products_id' => 'p',
+ 'cPath' => 'c',
+ 'manufacturers_id' => 'm',
+ 'content' => 't',
+ 'divers' => 'd',
+ 'lID' => 'l',
+ 'customers_id' => 'u',
+ 'type_object' => 'to',
+ );
@@ -241,9 +241,9 @@
%3$s => title
%4$s => ext
*/
- $this->reg_mask['no-rewrite'] = '%1$s=%2$s';
- $this->reg_mask['Rewrite'] = '%2$s-%1$s-%3$s.%4$s';
- $this->reg_mask['Rewrite-mode2'] = '%1$s/%2$s/%3$s.%4$s';
+ $this->reg_mask['no-rewrite'] = '%1$s=%2$s';
+ $this->reg_mask['Rewrite'] = '%2$s-%1$s-%3$s.%4$s';
+ $this->reg_mask['Rewrite-mode2'] = '%1$s/%2$s/%3$s.%4$s';
/// ext apres reecriture
$this->reg_ext['no-rewrite']='html';
@@ -252,27 +252,27 @@
$this->performance = array('NUMBER_URLS_GENERATED' => 0,
- 'NUMBER_QUERIES' => 0,
- 'CACHE_QUERY_SAVINGS' => 0,
- 'NUMBER_STANDARD_URLS_GENERATED' => 0,
- 'TOTAL_CACHED_PER_PAGE_RECORDS' => 0,
- 'TOTAL_TIME' => 0,
- 'TIME_PER_URL' => 0,
- 'QUERIES' => array()
- );
+ 'NUMBER_QUERIES' => 0,
+ 'CACHE_QUERY_SAVINGS' => 0,
+ 'NUMBER_STANDARD_URLS_GENERATED' => 0,
+ 'TOTAL_CACHED_PER_PAGE_RECORDS' => 0,
+ 'TOTAL_TIME' => 0,
+ 'TIME_PER_URL' => 0,
+ 'QUERIES' => array()
+ );
//ojp generate_link_cache
if (_test_bool(self::$USE_SEO_CACHE_GLOBAL)){
- $this->cache_file = 'seo_urls_v2_';
- $this->cache_gc();
+ $this->cache_file = 'seo_urls_v2_';
+ $this->cache_gc();
- if ( _test_bool(self::$USE_SEO_CACHE_PRODUCTS )) $this->generate_products_cache();
- if ( _test_bool(self::$USE_SEO_CACHE_CATEGORIES)) $this->generate_categories_cache();
+ if ( _test_bool(self::$USE_SEO_CACHE_PRODUCTS )) $this->generate_products_cache();
+ if ( _test_bool(self::$USE_SEO_CACHE_CATEGORIES)) $this->generate_categories_cache();
// if ( _test_bool($this->attributes['USE_SEO_CACHE_MANUFACTURERS'] ) ) $this->generate_manufacturers_cache();
// if ( _test_bool($this->attributes['USE_SEO_CACHE_ARTICLES'] ) && defined('TABLE_ARTICLES_DESCRIPTION'))
// $this->generate_articles_cache();
- if ( _test_bool(self::$USE_SEO_CACHE_TOPICS) && defined('TABLE_CONTENT_DESCRIPTION')) $this->generate_topics_cache();
- $this->generate_divers_cache();
- if ( _test_bool(self::$USE_SEO_CACHE_LINKS) ) $this->generate_links_cache();
+ if ( _test_bool(self::$USE_SEO_CACHE_TOPICS) && defined('TABLE_CONTENT_DESCRIPTION')) $this->generate_topics_cache();
+ $this->generate_divers_cache();
+ if ( _test_bool(self::$USE_SEO_CACHE_LINKS) ) $this->generate_links_cache();
}
@@ -345,13 +345,13 @@
$this->performance['TOTAL_TIME'] += $time;
switch($this->attributes['SEO_URLS_USE_W3C_VALID']){
case ('true'):
- if (!isset($_SESSION['customer_id']) && _cst_bool('ENABLE_PAGE_CACHE') && class_exists('page_cache')) return $link;
- else {
- return htmlentities($link);
- }
+ if (!isset($_SESSION['customer_id']) && _cst_bool('ENABLE_PAGE_CACHE') && class_exists('page_cache')) return $link;
+ else {
+ return htmlentities($link);
+ }
break;
case ('false'):
- return $link;
+ return $link;
break;
}
}
@@ -423,16 +423,16 @@
switch(true){
case (!isset($_SESSION['customer_id']) && _cst_bool('ENABLE_PAGE_CACHE') && class_exists('page_cache')):
- $page_cache = true;
- $return = $link . $separator . '<osCsid>';
+ $page_cache = true;
+ $return = $link . $separator . '<osCsid>';
break;
case (isset($_sid) && ( !$kill_sid )): ///// SID-KILLER ( change ) /// ORG: case (isset($_sid)):
- $page_cache = false;
- $return = $link . $separator . tep_output_string($_sid);
+ $page_cache = false;
+ $return = $link . $separator . tep_output_string($_sid);
break;
default:
- $page_cache = false;
- $return = $link;
+ $page_cache = false;
+ $return = $link;
break;
}
$this->performance['NUMBER_STANDARD_URLS_GENERATED']++;
@@ -444,10 +444,10 @@
switch(true){
case (_test_bool($this->attributes['SEO_URLS_USE_W3C_VALID']) && !$page_cache):
- return htmlentities(str_replace('&','&',$return));
+ return htmlentities(str_replace('&','&',$return));
break;
default:
- return str_replace('&','&',$return);
+ return str_replace('&','&',$return);
break;
}
}
@@ -466,83 +466,77 @@
protected function parse_parameters($page, $params ,$connection , &$separator){
$params=str_replace('&','&',$params);
if(!empty($params))
- $p = @explode('&', $params);
+ $p = @explode('&', $params);
else
- $p = array();
+ $p=$p3 = array();
krsort($p);
$container = array();
- // preparation array key/value
- foreach ($p as $index => $valuepair)
- if(!empty($valuepair) || $index !=0) {
- $p2 = @explode('=', $valuepair);
+ // preparation array key/value
+ foreach ($p as $index => $valuepair)
+ if(!empty($valuepair) || $index !=0) {
+ $p2 = @explode('=', $valuepair);
- $p3[$p2[0]]=$p2[1];
+ $p3[$p2[0]]=$p2[1];
- }
+ }
$check=array_keys($this->reg_anchors);
- if(isset($p3)){
- foreach ($p3 as $key => $value){
- $url='';
+ if(count($p3)==0)
+ if($page ==FILENAME_HOME)
+ $p3['home'] = 'home';
- switch ($key){
- case (in_array($key, $check)):
- $Rkey=$this->reg_anchors[$key];
- $function = 'GetName_'.$Rkey;
+ foreach ($p3 as $key => $value){
+ $url='';
- if(method_exists($this,$function)) {
- $url = $this->make_url($page, $this->$function($value), $key, $value, $separator);
+ switch ($key){
+ case (in_array($key, $check)):
- // $url = $this->make_url($page, $this->get_product_name($p2[1]), $p2[0], $p2[1], $separator);
- $this->ValidateName($url, $Rkey, $value, $connection, $separator);
- }
- break;
+ $Rkey=$this->reg_anchors[$key];
+ $function = 'GetName_'.$Rkey;
+ if(method_exists($this,$function)) {
+ $url = $this->make_url($page, $this->$function($value), $key, $value, $separator);
+ $this->ValidateName($url, $Rkey, $value, $connection, $separator);
+ }
+ break;
- default:
+ default:
+ $container[$key] = @$value;
- $container[$key] = @$value;
+ switch(true){
+ case ( $page == FILENAME_HOME):
+ $id=AbstractHeader_tags::get_prio_cms('home');
+ //! home by cms
+ if(is_int($id)) {
+ $url = $this->make_url($page, $this->GetName_t($id), "content", $id, $separator);
+ $this->ValidateName($url, "t", $id, $connection, $separator);
+ }
+ //! home by page content
+ else {
+// $url = ''; //
+ $url = $this->make_url('home', $this->GetName_d('home'), 'divers', 'home', $separator);
+ $this->ValidateName($url, "d", 'home', $connection, $separator);
+ }
+ break;
+ default:
+ if(is_array($p2)) $container[$key] = $value;
+ break;
+ }
+ }
- switch(true){
- case ($page == '' || $page ==FILENAME_DEFAULT):
- $id=AbstractHeader_tags::get_prio_cms('home');
- //! home by cms
- if(is_int($id)) {
- $url = $this->make_url($page, $this->get_topic_name($id), "content", $id, $separator);
- $this->ValidateName($url, "t", $id, $connection, $separator);
- }
- //! home by page content
- else {
- $url = ''; // $this->make_url('home', $this->get_divers_name('home'), 'divers', 'home', $separator);
- //$this->ValidateName($url, "d", 'home', $connection, $separator);
- }
- break;
- default:
- if(is_array($p2)) $container[$key] = $value;
- break;
- }
- }
-
}
- }
-// else
-// var_dump($page);
-// elseif(count($p) ==0 ) {
-// // if()
-//
-// }
$url = isset($url) ? $url : $page;
if ( sizeof($container) > 0 ){
if ( $imploded_params = $this->implode_assoc($container) ){
- $url .= $separator . $this->output_string( $imploded_params );
- $separator = '&';
+ $url .= $separator . $this->output_string( $imploded_params );
+ $separator = '&';
}
}
@@ -568,12 +562,12 @@
$key = $this->reg_anchors[$anchor_type];
return sprintf(
- $this->reg_mask[self::$SEO_REWRITE_TYPE],
- $key,
- $id,
- $string,
- self::$extention
- );
+ $this->reg_mask[self::$SEO_REWRITE_TYPE],
+ $key,
+ $id,
+ $string,
+ self::$extention
+ );
}
@@ -600,8 +594,8 @@
if (!empty(self::$origUrl) && $id === $realID && self::$origUrl !== $url){ //ID's match but not the text
$url = self::$base_url . $url;
$link = $this->add_sid($url, true, $connection, $separator); //build the correct link with SID
- //header("HTTP/1.0 301 Moved Permanently"); //let the SE's know to not use this link
- //header("Location: $link"); //redirect to the real page
+ //header("HTTP/1.0 301 Moved Permanently"); //let the SE's know to not use this link
+ //header("Location: $link"); //redirect to the real page
}
}
}
@@ -632,26 +626,26 @@
// var_dump(self::$htexe);
switch(true){
case (_test_bool(self::$USE_SEO_CACHE_GLOBAL) && isset($this->cache['DIVERS'][$pID])):
- $this->performance['CACHE_QUERY_SAVINGS']++;
- $result = $this->get_cache_id($pID,'','DIVERS');
+ $this->performance['CACHE_QUERY_SAVINGS']++;
+ $result = $this->get_cache_id($pID,'','DIVERS');
// var_dump(self::$htexe,$result);
- $return = (isset($result['tName'])? $this->strip($result['tName']): $this->strip($pID));
- if(self::$htexe)
- $this->transph_header_tag($result);
+ $return = (isset($result['tName'])? $this->strip($result['tName']): $this->strip($pID));
+ if(self::$htexe)
+ $this->transph_header_tag($result);
break;
default:
- $this->performance['NUMBER_QUERIES']++;
- $sql = "select head_title_tag as tName, head_desc_tag, head_keywords_tag from " . TABLE_FULL_TAG . " ft, " . TABLE_FULL_TAG_DESCRIPTION . " ftd where ft.tag_id=ftd.tag_id and ft.page_type='page' and ft.page_id = '" . basename($pID). "' and ftd.language_id = '" . (int)$this->languages_id. "' Limit 1";
- $query=$this->DB->query( $sql );
- if ($query->__get('numRows')>0) $result =$query->fetchAssoc();
- else $result['tName'] = $this->strip($pID);
- $this->get_cache_id($pID,'','DIVERS');
- $this->performance['QUERIES']['DIVERS'][] = $sql;
+ $this->performance['NUMBER_QUERIES']++;
+ $sql = "select head_title_tag as tName, head_desc_tag, head_keywords_tag from " . TABLE_FULL_TAG . " ft, " . TABLE_FULL_TAG_DESCRIPTION . " ftd where ft.tag_id=ftd.tag_id and ft.page_type='page' and ft.page_id = '" . basename($pID). "' and ftd.language_id = '" . (int)$this->languages_id. "' Limit 1";
+ $query=$this->DB->query( $sql );
+ if ($query->__get('numRows')>0) $result =$query->fetchAssoc();
+ else $result['tName'] = $this->strip($pID);
+ $this->get_cache_id($pID,'','DIVERS');
+ $this->performance['QUERIES']['DIVERS'][] = $sql;
- if(self::$htexe)
- $this->transph_header_tag($result);
- $return = $result['tName'];
- break;
+ if(self::$htexe)
+ $this->transph_header_tag($result);
+ $return = $result['tName'];
+ break;
}
return $return;
}
@@ -678,21 +672,21 @@
// private function get_links_name($pID){
switch(true){
case (_test_bool(self::$USE_SEO_CACHE_GLOBAL) && isset($this->cache['LINKS'][$pID]) ):
- $this->performance['CACHE_QUERY_SAVINGS']++;
- $result = $this->get_cache_id($pID,'','LINKS');
- $return = (isset($result['tName'])? $this->strip($result['tName']): $this->strip($pID));
+ $this->performance['CACHE_QUERY_SAVINGS']++;
+ $result = $this->get_cache_id($pID,'','LINKS');
+ $return = (isset($result['tName'])? $this->strip($result['tName']): $this->strip($pID));
if(self::$htexe) $this->transph_header_tag($result);
break;
default:
- $this->performance['NUMBER_QUERIES']++;
- $query=$this->DB->query( "select nav_name as tName, l.nav_link_id as ID from " . TABLE_NAVIGATION_LINKS . " l, " . TABLE_NAVIGATION_LINKS_DESCRIPTION . " ld where l.nav_link_id=ld.nav_link_id l.nav_link_id = '" . $pID. "' and ld.language_id = '" . (int)$this->languages_id. "' Limit 1" );
- if ($query->__get('numRows')>0) $result =$query->fetchAssoc();
- else $result['tName'] = $this->strip($pID);
- $this->get_cache_id($pID,'','LINKS');
- $this->performance['QUERIES']['LINKS'][] = $query;
+ $this->performance['NUMBER_QUERIES']++;
+ $query=$this->DB->query( "select nav_name as tName, l.nav_link_id as ID from " . TABLE_NAVIGATION_LINKS . " l, " . TABLE_NAVIGATION_LINKS_DESCRIPTION . " ld where l.nav_link_id=ld.nav_link_id l.nav_link_id = '" . $pID. "' and ld.language_id = '" . (int)$this->languages_id. "' Limit 1" );
+ if ($query->__get('numRows')>0) $result =$query->fetchAssoc();
+ else $result['tName'] = $this->strip($pID);
+ $this->get_cache_id($pID,'','LINKS');
+ $this->performance['QUERIES']['LINKS'][] = $query;
if(self::$htexe) $this->transph_header_tag($result);
- $return = $result['tName'];
- break;
+ $return = $result['tName'];
+ break;
}
return $return;
}
@@ -728,35 +722,35 @@
// private function get_product_name($pID){
switch(true){
case (_test_bool(self::$USE_SEO_CACHE_GLOBAL) && isset($this->cache['PRODUCTS'][$pID]) ):
- $this->performance['CACHE_QUERY_SAVINGS']++;
- $result = $this->get_cache_id($pID,'','PRODUCTS');
- $return = (isset($result['tName'])? $this->strip($result['tName']): '');
+ $this->performance['CACHE_QUERY_SAVINGS']++;
+ $result = $this->get_cache_id($pID,'','PRODUCTS');
+ $return = (isset($result['tName'])? $this->strip($result['tName']): '');
if(self::$htexe) $this->transph_header_tag($result);
break;
default:
- $this->performance['NUMBER_QUERIES']++;
- switch(true){
- case (_test_bool($this->attributes['SEO_ADD_CAT_PARENT'])):
- $rsql = $this->DB->query("SELECT products_name as tName, categories_name as cName FROM ".TABLE_PRODUCTS_DESCRIPTION." p LEFT JOIN ".TABLE_PRODUCTS_TO_CATEGORIES." cd2 ON p.products_id=cd2.products_id JOIN ".TABLE_CATEGORIES_DESCRIPTION." cd ON cd.categories_id = cd2.categories_id AND cd.language_id='".(int)$this->languages_id."' WHERE p.products_id='".(int)$pID."' AND p.language_id='".(int)$this->languages_id."' LIMIT 1");
- $result = $rsql->fetchAssoc();
- $cName = $result['cName'];
+ $this->performance['NUMBER_QUERIES']++;
+ switch(true){
+ case (_test_bool($this->attributes['SEO_ADD_CAT_PARENT'])):
+ $rsql = $this->DB->query("SELECT products_name as tName, categories_name as cName FROM ".TABLE_PRODUCTS_DESCRIPTION." p LEFT JOIN ".TABLE_PRODUCTS_TO_CATEGORIES." cd2 ON p.products_id=cd2.products_id JOIN ".TABLE_CATEGORIES_DESCRIPTION." cd ON cd.categories_id = cd2.categories_id AND cd.language_id='".(int)$this->languages_id."' WHERE p.products_id='".(int)$pID."' AND p.language_id='".(int)$this->languages_id."' LIMIT 1");
+ $result = $rsql->fetchAssoc();
+ $cName = $result['cName'];
- $result['tName']=$result['cName'].'/'.$result['tName'];
- break;
- default:
- $rsql = $this->DB->query("SELECT products_name as tName FROM ".TABLE_PRODUCTS_DESCRIPTION." WHERE products_id='".(int)$pID."' AND language_id='".(int)$this->languages_id."' LIMIT 1");
- $result = $rsql->fetchAssoc();
- $cName = $result['tName'];
- break;
- }
- /*if(!defined('TABLE_FULL_TAG'))*/
- // else $sql = "select head_title_tag as tName, head_desc_tag, head_keywords_tag from " . TABLE_FULL_TAG . " ft, " . TABLE_FULL_TAG_DESCRIPTION . " ftd where ft.tag_id=ftd.tag_id and ft.page_type='product' and ft.page_id = '" . (int)$pID. "' and ftd.language_id = '" . (int)$this->languages_id. "' Limit 1";
-// $result = $this->DB->FetchArray( $this->DB->Query( $sql ) );
- $this->get_cache_id($pID,$result,'PRODUCTS');
- $this->performance['QUERIES']['PRODUCTS'][] = $rsql;
+ $result['tName']=$result['cName'].'/'.$result['tName'];
+ break;
+ default:
+ $rsql = $this->DB->query("SELECT products_name as tName FROM ".TABLE_PRODUCTS_DESCRIPTION." WHERE products_id='".(int)$pID."' AND language_id='".(int)$this->languages_id."' LIMIT 1");
+ $result = $rsql->fetchAssoc();
+ $cName = $result['tName'];
+ break;
+ }
+ /*if(!defined('TABLE_FULL_TAG'))*/
+ // else $sql = "select head_title_tag as tName, head_desc_tag, head_keywords_tag from " . TABLE_FULL_TAG . " ft, " . TABLE_FULL_TAG_DESCRIPTION . " ftd where ft.tag_id=ftd.tag_id and ft.page_type='product' and ft.page_id = '" . (int)$pID. "' and ftd.language_id = '" . (int)$this->languages_id. "' Limit 1";
+// $result = $this->DB->FetchArray( $this->DB->Query( $sql ) );
+ $this->get_cache_id($pID,$result,'PRODUCTS');
+ $this->performance['QUERIES']['PRODUCTS'][] = $rsql;
if(self::$htexe) $this->transph_header_tag($result);
- $return = $this->strip( $result['tName'] );
- break;
+ $return = $this->strip( $result['tName'] );
+ break;
}
return $return;
}
@@ -771,24 +765,24 @@
//
//
// if ( !$is_cached || $is_expired ) {
- $prod_cache = array();
- $res=$this->DB->query( "select ft.page_id as ID , head_title_tag as tName, head_desc_tag, head_keywords_tag from " . TABLE_FULL_TAG . " ft, " . TABLE_FULL_TAG_DESCRIPTION . " ftd where ft.tag_id=ftd.tag_id and ft.page_type='product' and ftd.language_id = '" . (int)$this->languages_id. "'" );
+ $prod_cache = array();
+ $res=$this->DB->query( "select ft.page_id as ID , head_title_tag as tName, head_desc_tag, head_keywords_tag from " . TABLE_FULL_TAG . " ft, " . TABLE_FULL_TAG_DESCRIPTION . " ftd where ft.tag_id=ftd.tag_id and ft.page_type='product' and ftd.language_id = '" . (int)$this->languages_id. "'" );
- while ($result =$res->fetchAssoc()){
- $this->get_cache_id($result['ID'],$result,'PRODUCTS');
+ while ($result =$res->fetchAssoc()){
+ $this->get_cache_id($result['ID'],$result,'PRODUCTS');
-// $define = 'define(\'PRODUCT_NAME_' . $result['ID'] . '\', \'' . $this->strip( $result['tName']) . '\');';
-// $prod_cache .= $define . "\n";
+// $define = 'define(\'PRODUCT_NAME_' . $result['ID'] . '\', \'' . $this->strip( $result['tName']) . '\');';
+// $prod_cache .= $define . "\n";
// eval("$define");
-// $prod_cache[$result['ID']] = $result;
+// $prod_cache[$result['ID']] = $result;
// $this->cache['PRODUCTS']
- }
+ }
-// $this->save_cache($this->cache_file . 'products', $prod_cache, 'ARRAY', 1 , 1);
+// $this->save_cache($this->cache_file . 'products', $prod_cache, 'ARRAY', 1 , 1);
// }
// else {
//
-// $this->get_cache($this->cache_file . 'products');
+// $this->get_cache($this->cache_file . 'products');
// // var_dump($is_cached , $is_expired );
// // exit;
// }
@@ -807,37 +801,37 @@
$ID=(is_numeric($ID) ?$ID : $this->get_full_cPath($cID, $single_cID));
switch(true){
case (_test_bool(self::$USE_SEO_CACHE_GLOBAL) && isset($this->cache['CATEGORIES'][$ID]) ):
- $this->performance['CACHE_QUERY_SAVINGS']++;
- $result = $this->get_cache_id($ID,'','CATEGORIES');;
- $return = (isset($result['tName'])? $this->strip($result['tName']): '');
+ $this->performance['CACHE_QUERY_SAVINGS']++;
+ $result = $this->get_cache_id($ID,'','CATEGORIES');;
+ $return = (isset($result['tName'])? $this->strip($result['tName']): '');
if(self::$htexe) $this->transph_header_tag($result);
break;
default:
- $this->performance['NUMBER_QUERIES']++;
- switch(true){
- case (_test_bool($this->attributes['SEO_ADD_CAT_PARENT'])):
- $rsql = $this->DB->query("SELECT c.categories_id as ID, c.parent_id, cd.categories_name as tName, cd2.categories_name as pName
- FROM ".TABLE_CATEGORIES." c
- JOIN ".TABLE_CATEGORIES_DESCRIPTION." cd
- ON c.categories_id = cd.categories_id AND cd.language_id='".(int)$this->languages_id."'
- LEFT JOIN ".TABLE_CATEGORIES_DESCRIPTION." cd2
- ON c.parent_id=cd2.categories_id AND cd2.language_id='".(int)$this->languages_id."'
- WHERE c.categories_id='".(int)$ID."'
- LIMIT 1");
- $result = $rsql->fetchAssoc();
- $result['tName']=$cName = $this->not_null($result['pName']) ? $this->strip($result['pName'] . ' ' . $result['tName']) : $this->strip($result['tName']);
- break;
- default:
- $rsql = $this->DB->query("SELECT categories_id as ID, categories_name as tName FROM ".TABLE_CATEGORIES_DESCRIPTION." WHERE categories_id='".(int)$ID."' AND language_id='".(int)$this->languages_id."' LIMIT 1");
- $result = $rsql->fetchAssoc();
- $cName = $result['tName'];
- break;
- $this->performance['QUERIES']['CATEGORIES'][] = $rsql;
- }
- $cName = $this->strip($cName);
- $this->get_cache_id($ID,$result,'CATEGORIES');
+ $this->performance['NUMBER_QUERIES']++;
+ switch(true){
+ case (_test_bool($this->attributes['SEO_ADD_CAT_PARENT'])):
+ $rsql = $this->DB->query("SELECT c.categories_id as ID, c.parent_id, cd.categories_name as tName, cd2.categories_name as pName
+ FROM ".TABLE_CATEGORIES." c
+ JOIN ".TABLE_CATEGORIES_DESCRIPTION." cd
+ ON c.categories_id = cd.categories_id AND cd.language_id='".(int)$this->languages_id."'
+ LEFT JOIN ".TABLE_CATEGORIES_DESCRIPTION." cd2
+ ON c.parent_id=cd2.categories_id AND cd2.language_id='".(int)$this->languages_id."'
+ WHERE c.categories_id='".(int)$ID."'
+ LIMIT 1");
+ $result = $rsql->fetchAssoc();
+ $result['tName']=$cName = $this->not_null($result['pName']) ? $this->strip($result['pName'] . ' ' . $result['tName']) : $this->strip($result['tName']);
+ break;
+ default:
+ $rsql = $this->DB->query("SELECT categories_id as ID, categories_name as tName FROM ".TABLE_CATEGORIES_DESCRIPTION." WHERE categories_id='".(int)$ID."' AND language_id='".(int)$this->languages_id."' LIMIT 1");
+ $result = $rsql->fetchAssoc();
+ $cName = $result['tName'];
+ break;
+ $this->performance['QUERIES']['CATEGORIES'][] = $rsql;
+ }
+ $cName = $this->strip($cName);
+ $this->get_cache_id($ID,$result,'CATEGORIES');
if(self::$htexe) $this->transph_header_tag($result);
- $return = $cName;
+ $return = $cName;
break;
}
return $return;
@@ -867,20 +861,20 @@
private function GetName_m($mID){
switch(true){
case (_test_bool(self::$USE_SEO_CACHE_GLOBAL) && isset($this->cache['MANUFACTURERS'][$mID])):
- $this->performance['CACHE_QUERY_SAVINGS']++;
- $result = $this->cache['MANUFACTURERS'][$mID];
- $return = (isset($result['tName'])? $result['tName']: '');
+ $this->performance['CACHE_QUERY_SAVINGS']++;
+ $result = $this->cache['MANUFACTURERS'][$mID];
+ $return = (isset($result['tName'])? $result['tName']: '');
if(self::$htexe) $this->transph_header_tag($result);
break;
default:
- $this->performance['NUMBER_QUERIES']++;
- $rsql = $this->DB->query("SELECT manufacturers_name as tName FROM ".TABLE_MANUFACTURERS." WHERE manufacturers_id='".(int)$mID."' LIMIT 1");
- $result = $rsql->fetchAssoc(); // $this->DB->FetchArray( $this->DB->Query( $sql ) );
- $mName = $this->strip( $result['tName'] );
- $this->cache['MANUFACTURERS'][$mID] = $result;
- $this->performance['QUERIES']['MANUFACTURERS'][] = $rsql;
+ $this->performance['NUMBER_QUERIES']++;
+ $rsql = $this->DB->query("SELECT manufacturers_name as tName FROM ".TABLE_MANUFACTURERS." WHERE manufacturers_id='".(int)$mID."' LIMIT 1");
+ $result = $rsql->fetchAssoc(); // $this->DB->FetchArray( $this->DB->Query( $sql ) );
+ $mName = $this->strip( $result['tName'] );
+ $this->cache['MANUFACTURERS'][$mID] = $result;
+ $this->performance['QUERIES']['MANUFACTURERS'][] = $rsql;
if(self::$htexe) $this->transph_header_tag($result);
- $return = $mName;
+ $return = $mName;
break;
}
return $return;
@@ -898,23 +892,23 @@
// private function get_topic_name($tID){
switch(true){
case (_test_bool(self::$USE_SEO_CACHE_GLOBAL) && isset($this->cache['TOPICS'][$tID]) ):
- $this->performance['CACHE_QUERY_SAVINGS']++;
- $result = $this->cache['TOPICS'][$tID];
- $return = (isset($result['tName'])? $this->strip($result['tName']): '');
+ $this->performance['CACHE_QUERY_SAVINGS']++;
+ $result = $this->cache['TOPICS'][$tID];
+ $return = (isset($result['tName'])? $this->strip($result['tName']): '');
if(self::$htexe) $this->transph_header_tag($result);
- break;
+ break;
default:
- $this->performance['NUMBER_QUERIES']++;
- $sql = "select content_title as tName from " . TABLE_CONTENT . " c, " . TABLE_CONTENT_DESCRIPTION . " cd where c.content_status = '1' and c.content_id=cd.content_id and c.content_id='".(int)$tID."' and cd.language_id='".(int)$this->languages_id."' Limit 1";
- $rsql=$this->DB->query($sql);
-// else $sql = "select head_title_tag as tName, head_desc_tag, head_keywords_tag from " . TABLE_FULL_TAG . " ft, " . TABLE_FULL_TAG_DESCRIPTION . " ftd where ft.tag_id=ftd.tag_id and ft.page_type='content' and ft.page_id = '" . (int)$tID. "' and ftd.language_id = '" . (int)$this->languages_id. "' Limit 1";
- $result = $rsql->fetchAssoc(); //$this->DB->FetchArray( $this->DB->query( $sql ) );
- $tName = $this->strip( $result['tName'] );
- $this->cache['ARTICLES'][$tID] = $result;
- $this->performance['QUERIES']['TOPICS'][] = $sql;
+ $this->performance['NUMBER_QUERIES']++;
+ $sql = "select content_title as tName from " . TABLE_CONTENT . " c, " . TABLE_CONTENT_DESCRIPTION . " cd where c.content_status = '1'...
[truncated message content] |
|
From: <os...@us...> - 2011-12-10 18:19:54
|
Revision: 3946
http://oscss.svn.sourceforge.net/oscss/?rev=3946&view=rev
Author: oscim
Date: 2011-12-10 18:19:46 +0000 (Sat, 10 Dec 2011)
Log Message:
-----------
FS#903
correction coquille et mise a jour fonctionnel passport_forgotten de l'admin
Modified Paths:
--------------
trunk/catalog/account.php
trunk/catalog/admin/includes/content/admin_members.top.inc
trunk/catalog/admin/includes/exts/login/oscss.php
trunk/catalog/admin/includes/modules/pages/adminAccount.php
trunk/catalog/admin/includes/modules/pages/adminUsers.php
trunk/catalog/admin/login.php
trunk/catalog/admin/password_forgotten.php
trunk/catalog/install/includes/modele/admin_configure.txt
trunk/catalog/install/includes/modele/configure.txt
Removed Paths:
-------------
trunk/catalog/admin/includes/functions/password_funcs.php
Modified: trunk/catalog/account.php
===================================================================
--- trunk/catalog/account.php 2011-12-10 17:47:26 UTC (rev 3945)
+++ trunk/catalog/account.php 2011-12-10 18:19:46 UTC (rev 3946)
@@ -11,7 +11,7 @@
* \brief Fichier execution php compte client
*
* \section process
- * Prend en charge les modules de type \b account \b, leur affichage et execution \n\n
+ * Prend en charge les modules de type \b account \b, leur affichage et execution \n\n
* Ce fichier assure la liaison avec les affichages principaux du compte utilisateur public, gestion des adresses, des information, mot de passe et inscription newsletter.\n\n
* Les fichier content/account_.. sont affichés par ce fichier
*
@@ -30,10 +30,10 @@
$get_action=(isset($_GET['action']) ? tep_sanitize_string($_GET['action']) : '');
switch($get_action){
- /**
- * \internal execution edition user
- * Assure l'enregsitrement des données user
- */
+ /**
+ * \internal execution edition user
+ * Assure l'enregsitrement des données user
+ */
case 'edit':
$page->force_content('account_edit.php');
if (isset($_POST['action']) && ($_POST['action'] == 'process'))
@@ -60,7 +60,7 @@
if (isset($_POST['action']) && ($_POST['action'] == 'process'))
if(!$page->_call('customer','userUpdatepassword', $_POST)) tep_redirect(tep_href_link(FILENAME_ACCOUNT, 'action=password', 'SSL'));
- else tep_redirect(tep_href_link(FILENAME_ACCOUNT, '', 'SSL'));
+ else tep_redirect(tep_href_link(FILENAME_ACCOUNT, '', 'SSL'));
break;
/**
* \internal password_forgottent
@@ -71,46 +71,44 @@
$page->force_content('account_newsletters.php');
if (isset($_GET['action']) && ($_GET['action'] == 'process')) {
- $email_address = tep_db_prepare_input($_POST['email_address']);
+ $email_address = tep_db_prepare_input($_POST['email_address']);
- $check_customer_query = $DB->query("select customers_firstname, customers_lastname, customers_password, customers_id from " . TABLE_CUSTOMERS . " where customers_email_address = '" . tep_db_input($email_address) . "'");
- if ($check_customer_query->__get('NumRows')>0) {
+ $check_customer_query = $DB->query("select customers_firstname, customers_lastname, customers_password, customers_id from " . TABLE_CUSTOMERS . " where customers_email_address = '" . tep_db_input($email_address) . "'");
+ if ($check_customer_query->__get('NumRows')>0) {
- /// include the password crypto functions
- require_once(DIR_WS_FUNCTIONS . 'password_funcs.php');
- $check_customer = $check_customer_query->fetchAssoc();
+ $check_customer = $check_customer_query->fetchAssoc();
- /**
- * TODO: Utiliser class page.customer.php
- */
- $new_password = tep_create_random_value(ENTRY_PASSWORD_MIN_LENGTH);
- $crypted_password = tep_encrypt_password($new_password);
+ /**
+ * TODO: Utiliser class page.customer.php
+ */
+ $new_password = tep_create_random_value(ENTRY_PASSWORD_MIN_LENGTH);
+ $crypted_password = PasswordUtility::encrypt_password($new_password);
- $DB->query("update " . TABLE_CUSTOMERS . " set customers_password = '" . tep_db_input($crypted_password) . "' where customers_id = '" . (int)$check_customer['customers_id'] . "'");
+ $DB->query("update " . TABLE_CUSTOMERS . " set customers_password = '" . tep_db_input($crypted_password) . "' where customers_id = '" . (int)$check_customer['customers_id'] . "'");
- if(!$page->_call('customer','userUpdatepassword', $_POST)){
- tep_mail($check_customer['customers_firstname'] . ' ' . $check_customer['customers_lastname'], $email_address, EMAIL_PASSWORD_REMINDER_SUBJECT, sprintf(EMAIL_PASSWORD_REMINDER_BODY, $new_password), STORE_OWNER, STORE_OWNER_EMAIL_ADDRESS);
- $page->messageStack->add_session('login', SUCCESS_PASSWORD_SENT, 'success');
- }
+ if(!$page->_call('customer','userUpdatepassword', $_POST)){
+ tep_mail($check_customer['customers_firstname'] . ' ' . $check_customer['customers_lastname'], $email_address, EMAIL_PASSWORD_REMINDER_SUBJECT, sprintf(EMAIL_PASSWORD_REMINDER_BODY, $new_password), STORE_OWNER, STORE_OWNER_EMAIL_ADDRESS);
+ $page->messageStack->add_session('login', SUCCESS_PASSWORD_SENT, 'success');
+ }
- /**
- * TODO: rendre modificable via admin/ var de conf la redirection apres enregisrement new user
- */
- tep_redirect(tep_href_link(FILENAME_LOGIN, '', 'SSL'));
+ /**
+ * TODO: rendre modificable via admin/ var de conf la redirection apres enregisrement new user
+ */
+ tep_redirect(tep_href_link(FILENAME_LOGIN, '', 'SSL'));
- } else {
- $page->messageStack->add('password_forgotten', TEXT_NO_EMAIL_ADDRESS_FOUND);
- }
+ } else {
+ $page->messageStack->add('password_forgotten', TEXT_NO_EMAIL_ADDRESS_FOUND);
+ }
}
/* Arrivé via admin */
elseif (isset($_GET['cID']) && is_numeric($_GET['cID'])){
- $cID = tep_db_prepare_input($_GET['cID']);
- $check_customer_query=$DB->query = tep_db_query("select customers_email_address from " . TABLE_CUSTOMERS . " where customers_id = '" . tep_db_input($cID) . "'");
- if ($check_customer_query__get('NumRows')>0) {
- $check_customer = $check_customer_query->fetchAssoc();
- $email_address=$check_customer['customers_email_address'];
- }
+ $cID = tep_db_prepare_input($_GET['cID']);
+ $check_customer_query=$DB->query = tep_db_query("select customers_email_address from " . TABLE_CUSTOMERS . " where customers_id = '" . tep_db_input($cID) . "'");
+ if ($check_customer_query__get('NumRows')>0) {
+ $check_customer = $check_customer_query->fetchAssoc();
+ $email_address=$check_customer['customers_email_address'];
+ }
}
@@ -155,7 +153,7 @@
/// control id command eet id order
if ($customer_info['customers_id'] != $customer_id)
- tep_redirect(tep_href_link(FILENAME_ACCOUNT, 'action=history', 'SSL'));
+ tep_redirect(tep_href_link(FILENAME_ACCOUNT, 'action=history', 'SSL'));
$DF = new DatasFiles;
@@ -163,57 +161,57 @@
/// Generat Pdf
if(_cst_bool('USE_LOCAL_GENERAT_PDF')) {
- $time0 = time();
- require(DIR_WS_CLASSES . 'order.php');
- $order = new order((int)$_GET['order_id']);
+ $time0 = time();
+ require(DIR_WS_CLASSES . 'order.php');
+ $order = new order((int)$_GET['order_id']);
- osCSS_pdf::getInstance();
- $pageloop = "1";
+ osCSS_pdf::getInstance();
+ $pageloop = "1";
- $get_customer_comments = (isset($_POST['show_comments']))? ' and h.orders_status_id = ' . DEFAULT_ORDERS_STATUS_ID : '' ;
- $pull_w_status =(isset($_POST['pull_status']))? " and o.orders_status = ". $_POST['pull_status']:'';
+ $get_customer_comments = (isset($_POST['show_comments']))? ' and h.orders_status_id = ' . DEFAULT_ORDERS_STATUS_ID : '' ;
+ $pull_w_status =(isset($_POST['pull_status']))? " and o.orders_status = ". $_POST['pull_status']:'';
- $orders_query = tep_db_query("select o.orders_id,o.orders_status,h.comments,MIN(h.date_added) from " . TABLE_ORDERS . " o, " . TABLE_ORDERS_STATUS_HISTORY . " h where o.orders_id in (" . tep_db_input($_GET['order_id']) . ") and h.orders_id = o.orders_id" . $pull_w_status . $get_customer_comments . ' group by o.orders_id');
+ $orders_query = tep_db_query("select o.orders_id,o.orders_status,h.comments,MIN(h.date_added) from " . TABLE_ORDERS . " o, " . TABLE_ORDERS_STATUS_HISTORY . " h where o.orders_id in (" . tep_db_input($_GET['order_id']) . ") and h.orders_id = o.orders_id" . $pull_w_status . $get_customer_comments . ' group by o.orders_id');
- if (!tep_db_num_rows($orders_query) > 0) message_handler('FAILED_TO_OPEN');
- $orders = tep_db_fetch_array($orders_query);
+ if (!tep_db_num_rows($orders_query) > 0) message_handler('FAILED_TO_OPEN');
+ $orders = tep_db_fetch_array($orders_query);
- $type=($orders['orders_status']==DEFAULT_ORDERS_STATUS_COMPLETED)?'invoice' : 'packingslip';
+ $type=($orders['orders_status']==DEFAULT_ORDERS_STATUS_COMPLETED)?'invoice' : 'packingslip';
- $pdf=osCSS_pdf::OutputInit($type);
+ $pdf=osCSS_pdf::OutputInit($type);
- $order = new order($_GET['order_id']);
- include(osCSS_pdf::getPathModele());
+ $order = new order($_GET['order_id']);
+ include(osCSS_pdf::getPathModele());
- $time1 = time();
- if ($time1 >= $time0 + 30) {
- $time0 = $time1;
- header('X-bpPing: Pong');
- }
+ $time1 = time();
+ if ($time1 >= $time0 + 30) {
+ $time0 = $time1;
+ header('X-bpPing: Pong');
+ }
- $file=$DF->GetDoc(osCSS_pdf::GetPdfType(),$orders['orders_id']);
+ $file=$DF->GetDoc(osCSS_pdf::GetPdfType(),$orders['orders_id']);
- $pdf=osCSS_pdf::OutputEnd($type);
+ $pdf=osCSS_pdf::OutputEnd($type);
- }
+ }
- /// Load file pdf
- else {
+ /// Load file pdf
+ else {
- $type=($customer_info['orders_status']==DEFAULT_ORDERS_STATUS_COMPLETED)?'invoice' : 'packingslip';
+ $type=($customer_info['orders_status']==DEFAULT_ORDERS_STATUS_COMPLETED)?'invoice' : 'packingslip';
- if(( $filepath=$DF->GetDoc('packingslip', $_GET['order_id'])) && file_exists($filepath)){
+ if(( $filepath=$DF->GetDoc('packingslip', $_GET['order_id'])) && file_exists($filepath)){
- tep_redirect('document.php?mod=packingslip&id='.$_GET['order_id'] );
- }
+ tep_redirect('document.php?mod=packingslip&id='.$_GET['order_id'] );
+ }
- if(( $filepath=$DF->GetDoc('invoices', $_GET['order_id'])) && file_exists($filepath)){
- tep_redirect('document.php?mod=invoice&id='.$_GET['order_id'] );
- }
+ if(( $filepath=$DF->GetDoc('invoices', $_GET['order_id'])) && file_exists($filepath)){
+ tep_redirect('document.php?mod=invoice&id='.$_GET['order_id'] );
+ }
- }
+ }
Modified: trunk/catalog/admin/includes/content/admin_members.top.inc
===================================================================
--- trunk/catalog/admin/includes/content/admin_members.top.inc 2011-12-10 17:47:26 UTC (rev 3945)
+++ trunk/catalog/admin/includes/content/admin_members.top.inc 2011-12-10 18:19:46 UTC (rev 3946)
@@ -1,11 +1,12 @@
<?php
/**
- @licence GPL 2005-2009 The osCSS developers - osCSS Open Source E-commerce
- @package oscss-2 <www http://www.oscss.org>
- @version Rc-3
- @date 08/04/10, 22:41
+ @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 10/12/11, 17:28
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
+ @encode UTF-8
*/
function status_flag($cond,$get,$ancre=''){
@@ -47,7 +48,7 @@
'admin_firstname' => tep_db_prepare_input($_POST['admin_firstname']),
'admin_lastname' => tep_db_prepare_input($_POST['admin_lastname']),
'admin_email_address' => tep_db_prepare_input($_POST['admin_email_address']),
- 'admin_password' => tep_encrypt_password($makePassword),
+ 'admin_password' => PasswordUtility::encrypt_password($makePassword),
'admin_created' => 'now()');
tep_db_perform(TABLE_ADMIN, $sql_data_array);
@@ -232,53 +233,53 @@
tep_redirect(tep_href_link(FILENAME_ADMIN_MEMBERS, 'gPath=' . $_GET['gPath'] .'&action=define_group'));
break;
- default:
- if (isset($_GET['gPath'])) $titre_h3=HEADING_TITLE;
- elseif (isset($_GET['gID'])){
- $titre_h3=HEADING_TITLE_GRP;
+ default:
+ if (isset($_GET['gPath'])) $titre_h3=HEADING_TITLE;
+ elseif (isset($_GET['gID'])){
+ $titre_h3=HEADING_TITLE_GRP;
- $db_groups_query = tep_db_query("select * from " . TABLE_ADMIN_GROUPS . " order by admin_groups_id");
- $list_g=array();
- $add_groups_prepare = '\'0\'' ;
- $del_groups_prepare = '\'0\'' ;
- $count_groups = 0;
- while ($groups = tep_db_fetch_array($db_groups_query)) {
- $add_groups_prepare .= ',\'' . $groups['admin_groups_id'] . '\'' ;
- $count_groups++;
- $class_s="";
- if (((!$_GET['gID']) || ($_GET['gID'] == $groups['admin_groups_id']) || ($_GET['gID'] == 'groups')) && (!isset($gInfo)) ) {
- $gInfo = new objectInfo($groups);
+ $db_groups_query = tep_db_query("select * from " . TABLE_ADMIN_GROUPS . " order by admin_groups_id");
+ $list_g=array();
+ $add_groups_prepare = '\'0\'' ;
+ $del_groups_prepare = '\'0\'' ;
+ $count_groups = 0;
+ while ($groups = tep_db_fetch_array($db_groups_query)) {
+ $add_groups_prepare .= ',\'' . $groups['admin_groups_id'] . '\'' ;
+ $count_groups++;
+ $class_s="";
+ if (((!$_GET['gID']) || ($_GET['gID'] == $groups['admin_groups_id']) || ($_GET['gID'] == 'groups')) && (!isset($gInfo)) ) {
+ $gInfo = new objectInfo($groups);
-// if ((is_object($gInfo)) && ($groups['admin_groups_id'] == $gInfo->admin_groups_id) ) $class_s=" Selected";
- }
- $list_g[]=$groups;
- }
+// if ((is_object($gInfo)) && ($groups['admin_groups_id'] == $gInfo->admin_groups_id) ) $class_s=" Selected";
+ }
+ $list_g[]=$groups;
+ }
- }else {
- $titre_h3=HEADING_TITLE_MEMBERS;
+ }else {
+ $titre_h3=HEADING_TITLE_MEMBERS;
- $db_admin_query_raw = "select * from " . TABLE_ADMIN . " order by ".((isset($_GET['sort_by'])) ? $_GET['sort_by'] : 'admin_firstname ');
- $db_admin_split = new splitPageResults($page, MAX_DISPLAY_SEARCH_RESULTS, $db_admin_query_raw, $db_admin_query_numrows);
- $db_admin_query = tep_db_query($db_admin_query_raw);
- $list_m=array();
- while ($admin = tep_db_fetch_array($db_admin_query)) {
- if ($admin['admin_groups_id']==0) $admin['admin_groups_id']=1;
- $admin_group_query = tep_db_query("select admin_groups_name from " . TABLE_ADMIN_GROUPS . " where admin_groups_id = '" . $admin['admin_groups_id'] . "' " );
- $class_s="";
- $admin_group = tep_db_fetch_array ($admin_group_query);
+ $db_admin_query_raw = "select * from " . TABLE_ADMIN . " order by ".((isset($_GET['sort_by'])) ? $_GET['sort_by'] : 'admin_firstname ');
+ $db_admin_split = new splitPageResults($page, MAX_DISPLAY_SEARCH_RESULTS, $db_admin_query_raw, $db_admin_query_numrows);
+ $db_admin_query = tep_db_query($db_admin_query_raw);
+ $list_m=array();
+ while ($admin = tep_db_fetch_array($db_admin_query)) {
+ if ($admin['admin_groups_id']==0) $admin['admin_groups_id']=1;
+ $admin_group_query = tep_db_query("select admin_groups_name from " . TABLE_ADMIN_GROUPS . " where admin_groups_id = '" . $admin['admin_groups_id'] . "' " );
+ $class_s="";
+ $admin_group = tep_db_fetch_array ($admin_group_query);
- $admin=array_merge($admin, $admin_group);
- if (((!isset($_GET['mID'])) || ($_GET['mID'] == $admin['admin_id'])) && (!isset($mInfo)) ) {
- $mInfo = new objectInfo($admin);
- }
-// if ( (is_object($mInfo)) && ($admin['admin_id'] == $mInfo->admin_id) ) $class_s=" Selected";
+ $admin=array_merge($admin, $admin_group);
+ if (((!isset($_GET['mID'])) || ($_GET['mID'] == $admin['admin_id'])) && (!isset($mInfo)) ) {
+ $mInfo = new objectInfo($admin);
+ }
+// if ( (is_object($mInfo)) && ($admin['admin_id'] == $mInfo->admin_id) ) $class_s=" Selected";
- $list_m[]=$admin;
+ $list_m[]=$admin;
- }
+ }
- }
+ }
}
Modified: trunk/catalog/admin/includes/exts/login/oscss.php
===================================================================
--- trunk/catalog/admin/includes/exts/login/oscss.php 2011-12-10 17:47:26 UTC (rev 3945)
+++ trunk/catalog/admin/includes/exts/login/oscss.php 2011-12-10 18:19:46 UTC (rev 3946)
@@ -3,38 +3,38 @@
@licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 03/01/11, 17:28
+ @version 2.1.1
+ @date 10/12/11, 17:28
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@file
@brief base functions and class fro login by methode
-
- Cette fonction assure l'identification par la methode intégres a oscss.
+
+ Cette fonction assure l'identification par la methode intégres a oscss.
*/
class oscss {
-
+
function __construct(){
-
+
}
-
+
/**
* \fn draw()
- * \brief call html
+ * \brief call html
*/
public function draw(){
return tep_get_include_contents('login.'.__CLASS__);
}
-
+
/**
* \fn check()
- * \brief call check exe
+ * \brief call check exe
*/
public function check(){
- return $this->check_exe();
+ return $this->check_exe();
}
-
+
/**
* \fn check()
* \brief test and retrun bool
@@ -42,34 +42,32 @@
* @param $_POST['email_address'] string
* @param $_POST['password'] string
*/
- protected function check_exe(){
- $DB=Database::getInstance();
-
- include(DIR_WS_FUNCTIONS . 'password_funcs.php');
-
- $email_address = tep_db_prepare_input($_POST['email_address']);
- $password = tep_db_prepare_input($_POST['password']);
-
- // Check if email exists
- $check_admin_query = $DB->query("select admin_id as login_id, admin_password as login_password from " . TABLE_ADMIN . " where admin_email_address = '" . tep_db_input($email_address) . "'");
- if (!$check_admin_query->__get('numRows')) {
- return false;
- } else {
-
- $check_admin = $check_admin_query->fetchAssoc();
- // Check that password is good
- if (!tep_validate_password($password, $check_admin['login_password'])) return false;
- else {
- login_ident::$lID=$check_admin['login_id'];
-
- if (tep_session_is_registered('password_forgotten')) {
- tep_session_unregister('password_forgotten');
- }
- return true;
- }
-
- }
- return false;
- }
+ protected function check_exe(){
+ $DB=Database::getInstance();
+
+ $email_address = tep_db_prepare_input($_POST['email_address']);
+ $password = tep_db_prepare_input($_POST['password']);
+
+ // Check if email exists
+ $check_admin_query = $DB->query("select admin_id as login_id, admin_password as login_password from " . TABLE_ADMIN . " where admin_email_address = '" . tep_db_input($email_address) . "'");
+ if (!$check_admin_query->__get('numRows')) {
+ return false;
+ } else {
+
+ $check_admin = $check_admin_query->fetchAssoc();
+ // Check that password is good
+ if (!PasswordUtility::validate_password($password, $check_admin['login_password'])) return false;
+ else {
+ login_ident::$lID=$check_admin['login_id'];
+
+ if (tep_session_is_registered('password_forgotten')) {
+ tep_session_unregister('password_forgotten');
+ }
+ return true;
+ }
+
+ }
+ return false;
+ }
}
?>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/functions/password_funcs.php
===================================================================
--- trunk/catalog/admin/includes/functions/password_funcs.php 2011-12-10 17:47:26 UTC (rev 3945)
+++ trunk/catalog/admin/includes/functions/password_funcs.php 2011-12-10 18:19:46 UTC (rev 3946)
@@ -1,45 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 19/12/10, 19:49
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-
-////
-// This funstion validates a plain text password with an
-// encrpyted password
- function tep_validate_password($plain, $encrypted) {
- if (tep_not_null($plain) && tep_not_null($encrypted)) {
-// split apart the hash / salt
- $stack = explode(':', $encrypted);
-
- if (sizeof($stack) != 2) return false;
-
- if (md5($stack[1] . $plain) == $stack[0]) {
- return true;
- }
- }
-
- return false;
- }
-
-////
-// This function makes a new password from a plaintext password.
- function tep_encrypt_password($plain) {
- $password = '';
-
- for ($i=0; $i<10; $i++) {
- $password .= tep_rand();
- }
-
- $salt = substr(md5($password), 0, 2);
-
- $password = md5($salt . $plain) . ':' . $salt;
-
- return $password;
- }
-?>
Modified: trunk/catalog/admin/includes/modules/pages/adminAccount.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/adminAccount.php 2011-12-10 17:47:26 UTC (rev 3945)
+++ trunk/catalog/admin/includes/modules/pages/adminAccount.php 2011-12-10 18:19:46 UTC (rev 3946)
@@ -1,10 +1,10 @@
<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 13/06/11, 18:20
+ @version 2.1.1
+ @date 10/12/11, 17:28
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class adminAccount
@@ -69,7 +69,7 @@
$check_pass = $check_pass_query->fetchAssoc();
// Check that password is good
- if (!tep_validate_password($_POST['password_confirmation'], $check_pass['confirm_password'])) {
+ if (!PasswordUtility::validate_password($_POST['password_confirmation'], $check_pass['confirm_password'])) {
tep_redirect(tep_href_link(self::FILENAME, 'action=check_account&error=password'));
} else {
//$confirm = 'confirm_account';
@@ -90,7 +90,7 @@
$pass1= tep_db_prepare_input($_POST['password_confirmation']);
if(strcmp($pass0,$pass1)==0){
- $DB->query("update " . TABLE_ADMIN . " set admin_password='".tep_encrypt_password($pass0)."' where admin_id = '" . $_POST['id_info'] . "'");
+ $DB->query("update " . TABLE_ADMIN . " set admin_password='".PasswordUtility::encrypt_password($pass0)."' where admin_id = '" . $_POST['id_info'] . "'");
$_query = $DB->query("select * from " . TABLE_ADMIN . " where admin_id = '" . $_POST['id_info'] . "'");
$res = $_query->fetchAssoc();
Modified: trunk/catalog/admin/includes/modules/pages/adminUsers.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/adminUsers.php 2011-12-10 17:47:26 UTC (rev 3945)
+++ trunk/catalog/admin/includes/modules/pages/adminUsers.php 2011-12-10 18:19:46 UTC (rev 3946)
@@ -1,10 +1,10 @@
<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 02/10/11, 22:43
+ @date 10/12/11, 17:28
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class adminUsers
@@ -45,8 +45,6 @@
*/
public function __construct() {
self::$code=__CLASS__;
-
- include_once(DIR_WS_FUNCTIONS.'password_funcs.php');
}
public function check_action($actions){
@@ -63,128 +61,128 @@
}
if (in_array($_POST['admin_email_address'], $stored_email)) {
- tep_redirect(tep_href_link(self::FILENAME, 'error=email&action=new_member'));
+ tep_redirect(tep_href_link(self::FILENAME, 'error=email&action=new_member'));
}
- else {
- /// generated random password
- $makePassword = self::randomize();
+ else {
+ /// generated random password
+ $makePassword = self::randomize();
- /// array map for sql save
- $_data_array = array('groups_id' => tep_db_prepare_input($_POST['admin_groups_id']),
- 'firstname' => tep_db_prepare_input($_POST['admin_firstname']),
- 'lastname' => tep_db_prepare_input($_POST['admin_lastname']),
- 'email_address' => tep_db_prepare_input($_POST['admin_email_address']),
- 'password' => tep_encrypt_password($makePassword),
- );
- /// db exec
- $_id=sqladminuser::create($_data_array);
+ /// array map for sql save
+ $_data_array = array('groups_id' => tep_db_prepare_input($_POST['admin_groups_id']),
+ 'firstname' => tep_db_prepare_input($_POST['admin_firstname']),
+ 'lastname' => tep_db_prepare_input($_POST['admin_lastname']),
+ 'email_address' => tep_db_prepare_input($_POST['admin_email_address']),
+ 'password' => PasswordUtility::encrypt_password($makePassword),
+ );
+ /// db exec
+ $_id=sqladminuser::create($_data_array);
- /// return mail and display for result db exec
- if($_id <= 0)
- $messageStack->add_session(__('error in process for save user'), 'error');
- else {
+ /// return mail and display for result db exec
+ if($_id <= 0)
+ $messageStack->add_session(__('error in process for save user'), 'error');
+ else {
- $messageStack->add_session(sprintf(__('process for save user %s ok'), $_id ), 'success');
+ $messageStack->add_session(sprintf(__('process for save user %s ok'), $_id ), 'success');
- $myarray = array(
- 'email_use_html'=>_cst_bool('EMAIL_USE_HTML'),
- 'links'=>HTTP_SERVER . DIR_WS_ADMIN,
- 'admin_firstname'=>tep_db_prepare_input($_POST['admin_firstname']),
- 'admin_email_address'=>$_POST['admin_email_address'],
- 'hiddenPassword'=>$makePassword,
- 'message'=>''
- );
+ $myarray = array(
+ 'email_use_html'=>_cst_bool('EMAIL_USE_HTML'),
+ 'links'=>HTTP_SERVER . DIR_WS_ADMIN,
+ 'admin_firstname'=>tep_db_prepare_input($_POST['admin_firstname']),
+ 'admin_email_address'=>$_POST['admin_email_address'],
+ 'hiddenPassword'=>$makePassword,
+ 'message'=>''
+ );
- $message_final=tep_post_prepare_email('admin_members_new.tpl',$language,$myarray);
+ $message_final=tep_post_prepare_email('admin_members_new.tpl',$language,$myarray);
- //! envoi a l'user
- if( ! tep_mail(tep_db_prepare_input($_POST['admin_firstname']) , $_POST['admin_email_address'],__('subject email text subject create account'), $message_final, STORE_OWNER, STORE_OWNER_EMAIL_ADDRESS) )
- $messageStack->add_session(sprintf(__('error in process send mail for %s'), tep_db_prepare_input($_POST['admin_firstname']) .' '. tep_db_prepare_input($_POST['admin_email_address']) ), 'error');
- else
- $messageStack->add_session(sprintf(__('send mail for %s ok'), tep_db_prepare_input($_POST['admin_firstname']) .' '. tep_db_prepare_input($_POST['admin_email_address']) ), 'success');
+ //! envoi a l'user
+ if( ! tep_mail(tep_db_prepare_input($_POST['admin_firstname']) , $_POST['admin_email_address'],__('subject email text subject create account'), $message_final, STORE_OWNER, STORE_OWNER_EMAIL_ADDRESS) )
+ $messageStack->add_session(sprintf(__('error in process send mail for %s'), tep_db_prepare_input($_POST['admin_firstname']) .' '. tep_db_prepare_input($_POST['admin_email_address']) ), 'error');
+ else
+ $messageStack->add_session(sprintf(__('send mail for %s ok'), tep_db_prepare_input($_POST['admin_firstname']) .' '. tep_db_prepare_input($_POST['admin_email_address']) ), 'success');
- //! copy owner shop
- if(! tep_mail(STORE_OWNER, STORE_OWNER_EMAIL_ADDRESS,__('subject copy creat new compte for admin'), $message_final))
- $messageStack->add_session(sprintf(__('error in process send mail for %s'), STORE_OWNER .' '. STORE_OWNER_EMAIL_ADDRESS ), 'error');
- else
- $messageStack->add_session(sprintf(__('send mail for %s ok'), STORE_OWNER .' '. STORE_OWNER_EMAIL_ADDRESS ), 'success');
- }
+ //! copy owner shop
+ if(! tep_mail(STORE_OWNER, STORE_OWNER_EMAIL_ADDRESS,__('subject copy creat new compte for admin'), $message_final))
+ $messageStack->add_session(sprintf(__('error in process send mail for %s'), STORE_OWNER .' '. STORE_OWNER_EMAIL_ADDRESS ), 'error');
+ else
+ $messageStack->add_session(sprintf(__('send mail for %s ok'), STORE_O...
[truncated message content] |
|
From: <os...@us...> - 2011-12-10 18:37:46
|
Revision: 3947
http://oscss.svn.sourceforge.net/oscss/?rev=3947&view=rev
Author: oscim
Date: 2011-12-10 18:37:40 +0000 (Sat, 10 Dec 2011)
Log Message:
-----------
FS#903 cloture
Modified Paths:
--------------
trunk/catalog/admin/includes/exts/login/oscss.php
trunk/catalog/common/classes/PasswordUtility.php
trunk/catalog/common/modules/core/password/Pass_Classic.php
trunk/catalog/common/modules/core/password/Pass_Md5.php
trunk/catalog/common/modules/core/password/Pass_Sha1.php
Modified: trunk/catalog/admin/includes/exts/login/oscss.php
===================================================================
--- trunk/catalog/admin/includes/exts/login/oscss.php 2011-12-10 18:19:46 UTC (rev 3946)
+++ trunk/catalog/admin/includes/exts/login/oscss.php 2011-12-10 18:37:40 UTC (rev 3947)
@@ -43,6 +43,7 @@
* @param $_POST['password'] string
*/
protected function check_exe(){
+ global $conf;
$DB=Database::getInstance();
$email_address = tep_db_prepare_input($_POST['email_address']);
Modified: trunk/catalog/common/classes/PasswordUtility.php
===================================================================
--- trunk/catalog/common/classes/PasswordUtility.php 2011-12-10 18:19:46 UTC (rev 3946)
+++ trunk/catalog/common/classes/PasswordUtility.php 2011-12-10 18:37:40 UTC (rev 3947)
@@ -13,54 +13,54 @@
class PasswordUtility {
/**
- @var path childs module
+ @var path childs module
*/
const PATH_CHILDS_MOD = 'modules/core/password/';
/**
- @var Prefix file in childs module
+ @var Prefix file in childs module
*/
const PREFIX_FILE_CHILDS_MOD = 'Pass_';
/**
- @var ressource Id current instance
+ @var ressource Id current instance
*/
protected static $_instance;
/**
- @var object Childs mod instance
+ @var object Childs mod instance
*/
protected static $ChildMod = false;
/**
- @brief constructor
+ @brief constructor
*/
protected function __construct(){
- global $conf;
+ global $conf;
- if(self::$ChildMod !=false) return ;
+ if(self::$ChildMod !=false) return ;
- $file = self::PREFIX_FILE_CHILDS_MOD.$conf->ModPassword.'.php';
+ $file = self::PREFIX_FILE_CHILDS_MOD.$conf->ModPassword.'.php';
- if(!file_exists(DIR_WS_COMMON.self::PATH_CHILDS_MOD.$file))
- throw new Exception('Not found file password module');
+ if(!file_exists(DIR_FS_CATALOG.DIR_WS_COMMON.self::PATH_CHILDS_MOD.$file))
+ throw new Exception('Not found file password module');
- $current = $conf->ModPassword;
- require_once(DIR_WS_COMMON.self::PATH_CHILDS_MOD.$file);
+ $current = $conf->ModPassword;
+ require_once(DIR_FS_CATALOG.DIR_WS_COMMON.self::PATH_CHILDS_MOD.$file);
- self::$ChildMod = new $current();
+ self::$ChildMod = new $current();
}
/**
- @brief call current class
+ @brief call current class
*/
public static function getInstance(){
- if(self::$_instance == null)
- self::$_instance = new self();
+ if(self::$_instance == null)
+ self::$_instance = new self();
- return self::$_instance;
+ return self::$_instance;
}
/**
- @brief Force reset current instance class
+ @brief Force reset current instance class
*/
public static function resetInstance(){
self::$_instance = null;
@@ -69,21 +69,21 @@
/**
- @brief This funstion validates a plain text password with an encrpyted password
- @page login.php(public)
+ @brief This funstion validates a plain text password with an encrpyted password
+ @page login.php(public)
*/
public function validate_password($plain, $encrypted){
- self::getInstance();
- return self::$ChildMod->validate_password($plain, $encrypted);
+ self::getInstance();
+ return self::$ChildMod->validate_password($plain, $encrypted);
}
/**
- @brief This function makes a new password from a plaintext password.
- @page create_account.php|password_forgotent.php(public)
+ @brief This function makes a new password from a plaintext password.
+ @page create_account.php|password_forgotent.php(public)
*/
public function encrypt_password($plain){
- self::getInstance();
- return self::$ChildMod->encrypt_password($plain);
+ self::getInstance();
+ return self::$ChildMod->encrypt_password($plain);
}
}
Modified: trunk/catalog/common/modules/core/password/Pass_Classic.php
===================================================================
--- trunk/catalog/common/modules/core/password/Pass_Classic.php 2011-12-10 18:19:46 UTC (rev 3946)
+++ trunk/catalog/common/modules/core/password/Pass_Classic.php 2011-12-10 18:37:40 UTC (rev 3947)
@@ -13,30 +13,30 @@
class Classic {
/**
- @brief This funstion validates a plain text password with an encrpyted password
+ @brief This funstion validates a plain text password with an encrpyted password
*/
- protected function validate_password($plain, $encrypted) {
- if (tep_not_null($plain) && tep_not_null($encrypted)) {
- // split apart the hash / salt
- $stack = explode(':', $encrypted);
- if (sizeof($stack) != 2) return false;
- if (md5($stack[1] . $plain) == $stack[0]) return true;
- }
- return false;
+ public function validate_password($plain, $encrypted) {
+ if (tep_not_null($plain) && tep_not_null($encrypted)) {
+ // split apart the hash / salt
+ $stack = explode(':', $encrypted);
+ if (sizeof($stack) != 2) return false;
+ if (md5($stack[1] . $plain) == $stack[0]) return true;
+ }
+ return false;
}
/**
- @brief This function makes a new password from a plaintext password.
+ @brief This function makes a new password from a plaintext password.
*/
- protected function encrypt_password($plain) {
- $password = '';
+ public function encrypt_password($plain) {
+ $password = '';
- for ($i=0; $i<10; $i++)
- $password .= tep_rand();
+ for ($i=0; $i<10; $i++)
+ $password .= tep_rand();
- $salt = substr(md5($password), 0, 2);
- $password = md5($salt . $plain) . ':' . $salt;
- return $password;
+ $salt = substr(md5($password), 0, 2);
+ $password = md5($salt . $plain) . ':' . $salt;
+ return $password;
}
}
Modified: trunk/catalog/common/modules/core/password/Pass_Md5.php
===================================================================
--- trunk/catalog/common/modules/core/password/Pass_Md5.php 2011-12-10 18:19:46 UTC (rev 3946)
+++ trunk/catalog/common/modules/core/password/Pass_Md5.php 2011-12-10 18:37:40 UTC (rev 3947)
@@ -13,21 +13,21 @@
class Md5 {
/**
- @brief This funstion validates a plain text password with an encrpyted password
+ @brief This funstion validates a plain text password with an encrpyted password
*/
public function validate_password($plain, $encrypted) {
- if (tep_not_null($plain) && tep_not_null($encrypted)) {
- if (md5($plain) == $encrypted ) return true;
- }
- return false;
+ if (tep_not_null($plain) && tep_not_null($encrypted)) {
+ if (md5($plain) == $encrypted ) return true;
+ }
+ return false;
}
/**
- @brief This function makes a new password from a plaintext password.
+ @brief This function makes a new password from a plaintext password.
*/
public function encrypt_password($plain) {
- $password = md5( $plain) ;
- return $password;
+ $password = md5( $plain) ;
+ return $password;
}
}
Modified: trunk/catalog/common/modules/core/password/Pass_Sha1.php
===================================================================
--- trunk/catalog/common/modules/core/password/Pass_Sha1.php 2011-12-10 18:19:46 UTC (rev 3946)
+++ trunk/catalog/common/modules/core/password/Pass_Sha1.php 2011-12-10 18:37:40 UTC (rev 3947)
@@ -13,21 +13,21 @@
class Sha1 {
/**
- @brief This funstion validates a plain text password with an encrpyted password
+ @brief This funstion validates a plain text password with an encrpyted password
*/
public function validate_password($plain, $encrypted) {
- if (tep_not_null($plain) && tep_not_null($encrypted)) {
- if (sha1($plain) == $encrypted ) return true;
- }
- return false;
+ if (tep_not_null($plain) && tep_not_null($encrypted)) {
+ if (sha1($plain) == $encrypted ) return true;
+ }
+ return false;
}
/**
- @brief This function makes a new password from a plaintext password.
+ @brief This function makes a new password from a plaintext password.
*/
public function encrypt_password($plain) {
- $password = sha1( $plain) ;
- return $password;
+ $password = sha1( $plain) ;
+ return $password;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-12-13 09:00:39
|
Revision: 3949
http://oscss.svn.sourceforge.net/oscss/?rev=3949&view=rev
Author: oscim
Date: 2011-12-13 09:00:27 +0000 (Tue, 13 Dec 2011)
Log Message:
-----------
FS#916
Amelioration mode de maintenance, et descativation des option de maintenance lors usage normal
Modified Paths:
--------------
trunk/catalog/admin/includes/gabarit/configuration/my_boutique.listing.gab
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/my_boutique.txt
trunk/catalog/includes/application_top.php
trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql
Modified: trunk/catalog/admin/includes/gabarit/configuration/my_boutique.listing.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/my_boutique.listing.gab 2011-12-11 19:09:42 UTC (rev 3948)
+++ trunk/catalog/admin/includes/gabarit/configuration/my_boutique.listing.gab 2011-12-13 09:00:27 UTC (rev 3949)
@@ -28,10 +28,10 @@
<?php /** */ $row = my_boutique::$list['STORE_NAME']; ?>
<legend title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></legend>
<div class="block_input">
- <label><?php if (tep_not_null($row->description))echo __($row->description); ?></label>
- <p>
- <?php echo $row->value_field ; ?>
- </p>
+ <label><?php if (tep_not_null($row->description))echo __($row->description); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
</div>
</fieldset>
@@ -39,20 +39,20 @@
<fieldset class="block_field">
<legend><?php echo __('my_boutique legend prop') ?></legend>
<div class="block_input">
- <?php /** */ $row = my_boutique::$list['STORE_OWNER']; ?>
- <div class="fleft w_50">
- <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
- <p>
- <?php echo $row->value_field ; ?>
- </p>
- </div>
- <?php /** */ $row = my_boutique::$list['STORE_OWNER_EMAIL_ADDRESS']; ?>
- <div class="fleft w_50">
- <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
- <p>
- <?php echo $row->value_field ; ?>
- </p>
- </div>
+ <?php /** */ $row = my_boutique::$list['STORE_OWNER']; ?>
+ <div class="fleft w_50">
+ <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ <?php /** */ $row = my_boutique::$list['STORE_OWNER_EMAIL_ADDRESS']; ?>
+ <div class="fleft w_50">
+ <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
</div>
</fieldset>
@@ -61,20 +61,20 @@
<fieldset class="block_field">
<legend><?php echo __('my_boutique legend localisation') ?></legend>
<div class="block_input">
- <?php /** */ $row = my_boutique::$list['STORE_COUNTRY']; ?>
- <div class="fleft w_50">
- <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
- <p>
- <?php echo $row->value_field ; ?>
- </p>
- </div>
- <?php /** */ $row = my_boutique::$list['STORE_ZONE']; ?>
- <div class="fleft w_50">
- <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
- <p>
- <?php echo $row->value_field ; ?>
- </p>
- </div>
+ <?php /** */ $row = my_boutique::$list['STORE_COUNTRY']; ?>
+ <div class="fleft w_50">
+ <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ <?php /** */ $row = my_boutique::$list['STORE_ZONE']; ?>
+ <div class="fleft w_50">
+ <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
</div>
</fieldset>
@@ -82,79 +82,95 @@
<fieldset class="block_field">
<legend><?php echo __('my_boutique legend logo') ?></legend>
<div class="block_input">
- <?php /** */ $row = my_boutique::$list['STORE_LOGO']; ?>
- <div class="fleft w_50">
- <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
- <p>
- <?php echo $row->value_field ; ?>
- </p>
- </div>
- <?php /** */ $row = my_boutique::$list['STORE_LOGO_PRINT']; ?>
- <div class="fleft w_50">
- <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
- <p>
- <?php echo $row->value_field ; ?>
- </p>
- </div>
+ <?php /** */ $row = my_boutique::$list['STORE_LOGO']; ?>
+ <div class="fleft w_50">
+ <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ <?php /** */ $row = my_boutique::$list['STORE_LOGO_PRINT']; ?>
+ <div class="fleft w_50">
+ <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
</div>
</fieldset>
<fieldset class="block_field">
<legend><?php echo __('my_boutique legend legales') ?></legend>
<div class="block_input">
- <?php /** */ $row = my_boutique::$list['STORE_NAME_ADDRESS']; ?>
- <div class="fleft w_50">
- <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
- <p>
- <?php echo $row->value_field ; ?>
- </p>
- </div>
- <?php /** */ $row = my_boutique::$list['STORE_LEGAL_INFO']; ?>
- <div class="fleft w_50">
- <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
- <p>
- <?php echo $row->value_field ; ?>
- </p>
- </div>
+ <?php /** */ $row = my_boutique::$list['STORE_NAME_ADDRESS']; ?>
+ <div class="fleft w_50">
+ <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ <?php /** */ $row = my_boutique::$list['STORE_LEGAL_INFO']; ?>
+ <div class="fleft w_50">
+ <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
</div>
</fieldset>
<fieldset class="block_field">
<legend><?php echo __('my_boutique legend maintenance') ?></legend>
<div class="block_input">
- <?php /** */ $row = my_boutique::$list['STORE_OFFLINE']; ?>
- <div class="fleft w_50">
- <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
- <p>
- <?php echo $row->value_field ; ?>
- </p>
- </div>
- <?php /** */ $row = my_boutique::$list['STORE_OFFLINE_TXT']; ?>
- <div class="fleft w_50">
- <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
- <p>
- <?php echo $row->value_field ; ?>
- </p>
- </div>
+ <?php /** */ $row = my_boutique::$list['STORE_OFFLINE']; ?>
+<!-- <div class="fleft w_50"> -->
+ <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+<!-- </div> -->
</div>
+
+
+ <?php if(_test_bool(my_boutique::$list['STORE_OFFLINE']->value)): ?>
+ <div class="block_input">
+
+ <?php /** */ $row = my_boutique::$list['STORE_OFFLINE_MODE']; ?>
+ <div class="fleft w_50">
+ <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+
+ <?php /** */ $row = my_boutique::$list['STORE_OFFLINE_TXT']; ?>
+ <div class="fleft w_50">
+ <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </div>
+ <?php endif; ?>
+
</fieldset>
<fieldset class="block_field">
<legend class="block_field-title"><?php echo __('my_boutique legend other') ?></legend>
<ul class="block_input">
- <?php foreach(my_boutique::$list as $row)
- if(!in_array($row->key,array('STORE_NAME','STORE_OWNER','STORE_OWNER_EMAIL_ADDRESS','STORE_COUNTRY','STORE_ZONE','STORE_LOGO','STORE_LOGO_PRINT','STORE_OFFLINE','STORE_OFFLINE_TXT','STORE_NAME_ADDRESS','STORE_LEGAL_INFO')) ) { ?>
- <li id="nav_<?php echo $row->key ?>"><h5 title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></h5>
+ <?php foreach(my_boutique::$list as $row)
+ if(!in_array($row->key,array('STORE_NAME', 'STORE_OWNER', 'STORE_OWNER_EMAIL_ADDRESS', 'STORE_COUNTRY', 'STORE_ZONE', 'STORE_LOGO','STORE_LOGO_PRINT','STORE_OFFLINE', 'STORE_OFFLINE_TXT', 'STORE_OFFLINE_MODE', 'STORE_NAME_ADDRESS', 'STORE_LEGAL_INFO')) ) { ?>
+ <li id="nav_<?php echo $row->key ?>"><h5 title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></h5>
- <div class="block_input tirroir">
- <label><?php echo __($row->description); ?></label>
- <p>
- <?php echo $row->value_field ; ?>
- </p>
- </div>
- </li>
- <?php } ?>
+ <div class="block_input tirroir">
+ <label><?php echo __($row->description); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </li>
+ <?php } ?>
</ul>
</fieldset>
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/my_boutique.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/my_boutique.txt 2011-12-11 19:09:42 UTC (rev 3948)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/my_boutique.txt 2011-12-13 09:00:27 UTC (rev 3949)
@@ -53,10 +53,13 @@
$lang['SEND_EXTRA_ORDER_EMAILS_TO_L']="Envoie une copie de la commande aux adresses spécifiées. Celles-ci doivent être dans le format :<br />Nom 1 ‹email@address1›, Nom 2 ‹email@address2›" ;
$lang['STORE_NAME_ADDRESS_S']="Nom, adresse, pays et tél. de la boutique" ;
$lang['STORE_NAME_ADDRESS_L']="Nom, adresse, pays et téléphone de la boutique utilisés dans les impressions de documents et l'affichage en ligne." ;
+$lang['STORE_LEGAL_INFO_S']="Informations légales " ;
+$lang['STORE_LEGAL_INFO_L']="texte affiché en pied de page des imprimés pdf" ;
+
$lang['STORE_OFFLINE_S']="Mode maintenance" ;
$lang['STORE_OFFLINE_L']="Bloquer l'affichage public pour mettre à jour ou intervenir sur votre boutique " ;
-$lang['STORE_OFFLINE_TXT_S']="Texte mode maintenance " ;
-$lang['STORE_OFFLINE_TXT_L']="texte affiché lorsque votre boutique est en maintenance " ;
-$lang['STORE_LEGAL_INFO_S']="Informations légales " ;
-$lang['STORE_LEGAL_INFO_L']="texte affiché en pied de page des imprimés pdf" ;
+$lang['STORE_OFFLINE_MODE_S']="Mode de fonctionnement de l'affichage en maintenance" ;
+$lang['STORE_OFFLINE_MODE_L']="Vous pouvez soit bloquer l'affichage du site, soit effectué un redirection vers un fichier html " ;
+$lang['STORE_OFFLINE_TXT_S']="Texte ou nom du fichier" ;
+$lang['STORE_OFFLINE_TXT_L']="texte affiché si mode 'block' , ou nom du fichier si mode 'redirect' " ;
?>
\ No newline at end of file
Modified: trunk/catalog/includes/application_top.php
===================================================================
--- trunk/catalog/includes/application_top.php 2011-12-11 19:09:42 UTC (rev 3948)
+++ trunk/catalog/includes/application_top.php 2011-12-13 09:00:27 UTC (rev 3949)
@@ -211,16 +211,31 @@
}
-//! Mise en offligne
+
+ //! Mise en offligne
if (_cst_bool('STORE_OFFLINE')) {
+
+ /// Call specific config
+ $res=$DB->query("SELECT configuration_key AS cfgKey, configuration_value AS cfgValue FROM " . TABLE_CONFIGURATION ." where configuration_type = 4 AND configuration_key LIKE 'STORE_OFFLINE%' ");
+ while($configuration = $res->fetchAssoc())
+ define(strtoupper($configuration['cfgKey']), $configuration['cfgValue']);
+
if ( ( !isset($_GET['admin']) || $_GET['admin'] !=md5($SecuKey)) && ( !isset($_COOKIE['osCOFFLINEID']) || $_COOKIE['osCOFFLINEID'] !=md5($SecuKey)) ) {
- echo '<p style="text-align:center">'.STORE_OFFLINE_TXT.'</p>';
+
+ if(STORE_OFFLINE_MODE == 'block')
+ echo '<p style="text-align:center">'.STORE_OFFLINE_TXT.'</p>';
+
+ elseif(STORE_OFFLINE_MODE == 'redirect')
+ header("Location: ".DIR_WS_CATALOG.STORE_OFFLINE_TXT ,TRUE,307);
+
exit;
}
else {
tep_session_register('aauth');
$aauth = 'yes';
setcookie('osCOFFLINEID', md5($SecuKey) , time()+31536000);
+ // force redirect by not GET
+ if(isset($_GET['admin']) )header("Location: /");
}
}
Modified: trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql 2011-12-11 19:09:42 UTC (rev 3948)
+++ trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql 2011-12-13 09:00:27 UTC (rev 3949)
@@ -48,7 +48,8 @@
-- insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('Afficher les prix avec taxe', 'DISPLAY_PRICE_WITH_TAX', 'true', 'Afficher les prix taxes incluses (true) ou ajouter la taxe à la fin (false).', '1', '21', NULL, NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),');
insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added,set_function) values ('STORE_OFFLINE_S', 'STORE_OFFLINE', 'false', 'STORE_OFFLINE_L', '1', '30', NULL, NOW(),'tep_cfg_select_option(array(\'true\', \'false\'),');
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added) values ('STORE_OFFLINE_TXT_S', 'STORE_OFFLINE_TXT', '', 'STORE_OFFLINE_TXT_L', '1', '31', NULL, NOW());
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, configuration_type) values ('STORE_OFFLINE_TXT_S', 'STORE_OFFLINE_TXT', '', 'STORE_OFFLINE_TXT_L', '1', '31', NULL, NOW(), 4);
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, configuration_type, set_function) values ('STORE_OFFLINE_MODE_S', 'STORE_OFFLINE_MODE', '', 'STORE_OFFLINE_MODE_L', '1', '31', NULL, NOW(), 4, 'tep_cfg_select_option(array(\'block\', \'redirect\'),');
-- 2 unite
insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added) values ('TAX_DECIMAL_PLACES_S', 'TAX_DECIMAL_PLACES', '0', 'TAX_DECIMAL_PLACES_L', '2', '20', NULL, NOW());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-12-13 10:17:56
|
Revision: 3950
http://oscss.svn.sourceforge.net/oscss/?rev=3950&view=rev
Author: oscim
Date: 2011-12-13 10:17:50 +0000 (Tue, 13 Dec 2011)
Log Message:
-----------
correction coquille css template
Correctin coquille gestion des groupes et element de session lors connection customers
Modified Paths:
--------------
trunk/catalog/includes/classes/core_page/customer.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.css
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css
Modified: trunk/catalog/includes/classes/core_page/customer.php
===================================================================
--- trunk/catalog/includes/classes/core_page/customer.php 2011-12-13 09:00:27 UTC (rev 3949)
+++ trunk/catalog/includes/classes/core_page/customer.php 2011-12-13 10:17:50 UTC (rev 3950)
@@ -948,11 +948,11 @@
if (_cst_bool('ACCOUNT_STATE'))
$_SESSION['customer_zone_id']=$customer_zone_id = $check_country['entry_zone_id'];
- $check_customer_group_tax = tep_db_query($sql="select customers_group_show_tax, customers_group_tax_exempt, group_specific_taxes_exempt, group_discount from " . TABLE_CUSTOMERS_GROUPS . " where customers_group_id = '" .(int)$sppc_customer_group_id . "'");
+ $check_customer_group_tax = tep_db_query($sql="select * from " . TABLE_CUSTOMERS_GROUPS . " where customers_group_id = '" .(int)$sppc_customer_group_id . "'");
$customer_group_tax = tep_db_fetch_array($check_customer_group_tax);
/// Grp confirmed
- if($customers_group_ra ===1) {
+ if($customers_group_ra >0) {
$_SESSION['sppc_customer_group_show_tax']=$sppc_customer_group_show_tax = (int)$customer_group_tax['customers_group_show_tax'];
$_SESSION['sppc_customer_group_tax_exempt']=$sppc_customer_group_tax_exempt = (int)$customer_group_tax['customers_group_tax_exempt'];
/*$_SESSION['group_specific_taxes_exempt']=*/$group_specific_taxes_exempt = $customer_group_tax['group_specific_taxes_exempt'];
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.css
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.css 2011-12-13 09:00:27 UTC (rev 3949)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/BottomTop.css 2011-12-13 10:17:50 UTC (rev 3950)
@@ -139,6 +139,8 @@
height:60px;
margin-bottom: 10px;
padding:1.5em;
+ position: relative;
+ top: 12px;
}
footer p {
@@ -150,9 +152,8 @@
footer div.center_footer {margin:0; padding:0; width:33%%; float:left; display:block; height:100%; }
footer div.right_footer a{font-size: 1.2em; color:#fff; padding:1.2em; }
footer div.right_footer a:hover{font-size: 1.2em; color:#B4E3EC; padding:1.2em; }
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css 2011-12-13 09:00:27 UTC (rev 3949)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css 2011-12-13 10:17:50 UTC (rev 3950)
@@ -332,12 +332,12 @@
#price_master {font-weight:bold;font-size:2em;}
.price {font-size:1.4em;font-weight:bold;}
- .CartQty{ width:15px;}
+ form input[type=text].CartQty{ width:15px;}
#productDescription p { padding:2em;color: #555;font-size: 0.8em;}
#productImage {height:200px;}
- .prod_box_big {padding:2em;}
+ article.product.single .prod_box_big {padding:2em; clear:both;}
/* -- panier -- */
.cart-header {padding:0.5em;}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-12-15 19:51:31
|
Revision: 3956
http://oscss.svn.sourceforge.net/oscss/?rev=3956&view=rev
Author: oscim
Date: 2011-12-15 19:51:25 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
FS#923
Appli top qjout redirection suite changement de langue pour supprimer GET dans l'url
Modified Paths:
--------------
trunk/catalog/includes/application_top.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/box.cart.short.gab
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css
Modified: trunk/catalog/includes/application_top.php
===================================================================
--- trunk/catalog/includes/application_top.php 2011-12-15 08:30:39 UTC (rev 3955)
+++ trunk/catalog/includes/application_top.php 2011-12-15 19:51:25 UTC (rev 3956)
@@ -310,6 +310,10 @@
$language = $lng->language['directory'];
$languages_id = $lng->language['id'];
+
+ /// force redirect for no view GET vars
+ if (isset($_GET['language']))
+ tep_redirect(tep_href_link());
}
$page->add_var_page('language',$language);
$page->add_var_page('languages_id',$languages_id);
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php 2011-12-15 08:30:39 UTC (rev 3955)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php 2011-12-15 19:51:25 UTC (rev 3956)
@@ -114,7 +114,7 @@
case 'home':
- $this->oscss_boxes->_add('shopping_cart_short', 'header' ,array('cache'=>false));
+// $this->oscss_boxes->_add('shopping_cart_short', 'header' ,array('cache'=>false));
$this->oscss_boxes->_add('whats_new', 'sidebar', array('cache'=>false));
$this->oscss_boxes->_add('specials', 'sidebar', array('cache'=>false));
@@ -131,24 +131,24 @@
break;
case 'account':
- $this->oscss_boxes->_add('shopping_cart', 'sidebar' ,array('cache'=>false,'sort'=>40));
+// $this->oscss_boxes->_add('shopping_cart', 'sidebar' ,array('cache'=>false,'sort'=>40));
$this->oscss_boxes->_add('specials', 'sidebar', array('cache'=>false));
break;
case 'content':
- $this->oscss_boxes->_add('shopping_cart_short', 'header' ,array('cache'=>false));
+// $this->oscss_boxes->_add('shopping_cart_short', 'header' ,array('cache'=>false));
$this->oscss_boxes->_add('categories', 'sidebar');
break;
case 'product':
- $this->oscss_boxes->_add('shopping_cart_short', 'header' ,array('cache'=>false));
+// $this->oscss_boxes->_add('shopping_cart_short', 'header' ,array('cache'=>false));
$this->oscss_boxes->_add('categories', 'sidebar');
$this->oscss_boxes->_add('manufacturer_info', 'sidebar');
$this->oscss_boxes->_add('specials', 'sidebar', array('cache'=>false));
break;
case 'listing':
- $this->oscss_boxes->_add('shopping_cart_short', 'header' ,array('cache'=>false));
+// $this->oscss_boxes->_add('shopping_cart_short', 'header' ,array('cache'=>false));
$this->oscss_boxes->_add('categories', 'sidebar');
$this->oscss_boxes->_add('manufacturers', 'sidebar');
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/box.cart.short.gab
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/box.cart.short.gab 2011-12-15 08:30:39 UTC (rev 3955)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/box.cart.short.gab 2011-12-15 19:51:25 UTC (rev 3956)
@@ -17,13 +17,9 @@
<li>
<a href="<?php echo tep_href_link(FILENAME_SHOPPING_CART) ?>"><?php echo $total_nb_products_with_qty .' '.( ( $total_nb_products_with_qty == '1' )? __('box shopping cart products nb') : __('box shopping cart products nbs') ) ?></a>
</li>
- </ul>
- <span class="border_cart"></span>
- <ul>
<?php foreach($cart->show_list_total() as $i=>$tot): ?>
<li><span><?php echo $tot->text; ?></span> <?php echo htmlentities($currencies->format($tot->value)) ; ?><li>
<?php endforeach; ?>
- <li><?php echo __('box shopping cart weight').' '.$cart->show_weight().' '.UNIT_WEIGHT_NAME ?></a></li>
<li><a href="<?php echo tep_href_link(FILENAME_CHECKOUT_SHIPPING) ?>" ><?php echo __('Commander') ?></a></li>
</ul>
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css 2011-12-15 08:30:39 UTC (rev 3955)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css 2011-12-15 19:51:25 UTC (rev 3956)
@@ -1,9 +1,9 @@
/**
- @ licence GPL 2005-2011 The o**sCSS developers - osCSS Open Source E-commerce
- @subpackage Template 2cShopHtml5Oscim
- @package osCSS-2 <www http://www.oscss.org>
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
+ * @ licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ * @subpackage Template 2cShopHtml5Oscim
+ * @package osCSS-2 <www http://www.oscss.org>
+ * @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ * @encode UTF-8
*/
@import url("Css/BottomTop.css");
@@ -15,9 +15,8 @@
@import url("Css/habillage.css");
/**
- S tyle commun et permanent. **
- Ce fichier est appelé dans le tiny du backoffice
-
+ * S tyle commun et permanent. **
+ * Ce fichier est appelé dans le tiny du backoffice
*/
@@ -52,16 +51,16 @@
/* Block debugg public template */
#develop{
- opacity:0.4;
- filter:alpha(opacity=40); /* For IE8 and earlier */
- color:black;
- line-height:17px;
- background:white none repeat scroll 0 0
- ; border:1px solid black;
- padding:1em;
- position:fixed;
- right:0;
- top:0;
+ opacity:0.4;
+ filter:alpha(opacity=40); /* For IE8 and earlier */
+ color:black;
+ line-height:17px;
+ background:white none repeat scroll 0 0
+ ; border:1px solid black;
+ padding:1em;
+ position:fixed;
+ right:0;
+ top:0;
}
#develop p {padding:0; margin:0;}
@@ -90,7 +89,7 @@
/* reset */
* { margin: 0; padding: 0; }
-b r.clear {height:0; width:0;}**
+b r.clear {height:0; width:0;}** *
/* render html5 elements as block */
header,
footer,
@@ -102,8 +101,8 @@
/* standard body */
body {
- margin: 0 auto;
- width: 960px;
+ margin: 0 auto;
+ width: 960px;
}
table { width:100%}
@@ -126,9 +125,9 @@
.messageStack li{padding:5px 12px;}
div.CguView {
- width:100%;
- overflow:auto;
- height:150px;
+ width:100%;
+ overflow:auto;
+ height:150px;
}
@@ -136,229 +135,233 @@
h1 {
- padding: 20px 0;
+ padding: 20px 0;
}
h2 {
- padding: 20px 0;
+ padding: 20px 0;
}
h3 {
- padding: 10px 0;
+ padding: 10px 0;
}
p {
- padding-bottom: 20px;
+ padding-bottom: 20px;
}
form p{width:100%;display:block; float:left;}
form label {width:35%; display:block; float:left;padding:0 1em;}
form span.inputvalue{display:block; float:left;white-space: nowrap;}
form select,
-form input[type=checkbox] ,
-form input[type=radio] ,
-form input[type=password] ,
-form input[type=text] {width:250px;}
+ form input[type=checkbox] ,
+ form input[type=radio] ,
+ form input[type=password] ,
+ form input[type=text] {width:250px;}
- /* content and sidebar layout */
+ /* content and sidebar layout */
- #main-tpl {clear:both;}
+ #main-tpl {clear:both;}
- #content {
- float: right;
- width: 71.3%;
- margin:10px 0 10px 0;
- padding:5px 12px 0 12px;
+ #content {
+ float: right;
+ width: 71.3%;
+ margin:10px 0 10px 0;
+ padding:5px 12px 0 12px;
- }
+ }
- aside {
- float: left;
- width: 26%;
- margin:0;
- padding:0;
- }
+ aside {
+ float: left;
+ width: 26%;
+ margin:0;
+ padding:0;
+ }
- /* article */
+ /* article */
- article {
- clear:both;
- }
+ article {
+ clear:both;
+ }
- .textMain p {padding:0.5em;font-size:0.9em;}
+ .textMain p {padding:0.5em;font-size:0.9em;}
- article h1/*,
- .product h2,
- .product h1*/ {
- padding-left: 10px;
- margin-top: 10px;
- }
+ article h1/*,
+ .product h2,
+ .product h1*/ {
+ padding-left: 10px;
+ margin-top: 10px;
+ }
- article h1/*,
- .product h1,
- .regular h2*/ {
- padding-left: 10px;
- margin-top: 12px;
- }
+ article h1/*,
+ .product h1,
+ .regular h2*/ {
+ padding-left: 10px;
+ margin-top: 12px;
+ }
- /* sidebar */
- aside section {
- margin: 10px 12px 0 0;
- padding: 10px 15px;
- }
+ /* sidebar */
+ aside section {
+ margin: 10px 12px 0 0;
+ padding: 10px 15px;
+ }
- aside section ul {
- margin-left: 12px;
- padding-left: 12px;
- }
+ aside section ul {
+ margin-left: 12px;
+ padding-left: 12px;
+ }
- aside section ul li {
- padding-top: 10px;
- padding-bottom: 22px;
- }
+ aside section ul li {
+ padding-top: 10px;
+ padding-bottom: 22px;
+ }
- aside section ul li a {
- display: block;
- }
+ aside section ul li a {
+ display: block;
+ }
- aside section header h3 {
- padding-left: 10px;
- margin: 10px 0px;
- }
+ aside section header h3 {
+ padding-left: 10px;
+ margin: 10px 0px;
+ }
- /* columns */
+ /* columns */
- article div.module {
- clear:both;
- }
+ article div.module {
+ clear:both;
+ }
- .module ul {
- width: 110%;
- padding: 0;
- margin: 0;
- }
+ .module ul {
+ width: 110%;
+ padding: 0;
+ margin: 0;
+ }
- .module ul li {
- display: inline;
- float: left;
- margin: 0 17px 12px 0;
- padding: 0;
- width: 216px;
- }
+ .module ul li {
+ display: inline;
+ float: left;
+ margin: 0 17px 12px 0;
+ padding: 0;
+ width: 216px;
+ }
- .module .outerblock {
- height: 255px;
- padding: 12px;
- width: 90%;
- }
+ .module .outerblock {
+ height: 255px;
+ padding: 12px;
+ width: 90%;
+ }
- .module .innerblock {
- height: 220px;
- padding: 12px;
- }
+ .module .innerblock {
+ height: 220px;
+ padding: 12px;
+ }
- .module .innerblock p {
- padding-bottom:0.2em;
- }
+ .module .innerblock p {
+ padding-bottom:0.2em;
+ }
- .module .innerblock p.title{
- height:41px;
- }
- .module .innerblock p.title a{
- text-decoration: none;
- font-size: 1.3em;
- }
- .module .innerblock p.img{
- height:100px;
- }
+ .module .innerblock p.title{
+ height:41px;
+ }
+ .module .innerblock p.title a{
+ text-decoration: none;
+ font-size: 1.3em;
+ }
+ .module .innerblock p.img{
+ height:100px;
+ }
- .module .innerblock .innerblock-more{
- height:35px;
- }
- .module .innerblock .innerblock-more *{
- float:left;
- padding:5px 0 0 5px;
- }
- .module .innerblock .innerblock-more a.details{
- display:inline-block;
- margin-top:15px;
- padding:3px 12px;
- float:right;
- }
- .module .innerblock .innerblock-more a.details:hover{
- display:inline-block;
- margin-top:15px;
- padding:3px 12px;
- float:right;
- }
+ .module .innerblock .innerblock-more{
+ height:35px;
+ }
+ .module .innerblock .innerblock-more *{
+ float:left;
+ padding:5px 0 0 5px;
+ }
+ .module .innerblock .innerblock-more a.details{
+ display:inline-block;
+ margin-top:15px;
+ padding:3px 12px;
+ float:right;
+ }
+ .module .innerblock .innerblock-more a.details:hover{
+ display:inline-block;
+ margin-top:15px;
+ padding:3px 12px;
+ float:right;
+ }
- .module .splitnav{clear:both;}
+ .module .splitnav{clear:both;}
- /* end of column configuration */
+ /* end of column configuration */
- article.product.single figure{
- display: block;
- float: left;
- width: 50%;
- }
- #productInfo {padding:2em;}
- .module {padding-top:1em;}
+ article.product.single figure{
+ display: block;
+ float: left;
+ width: 50%;
+ }
+ #productInfo {padding:2em;}
+ .module {padding-top:1em;}
- article.product.single figure ul{
- display:inline;
- }
- article.product.single figure ul li{
- float:left;
- margin:5px 5px;
- }
+ article.product.single figure ul{
+ display:inline;
+ }
+ article.product.single figure ul li{
+ float:left;
+ margin:5px 5px;
+ }
- #headingCatImg {height:220px;}
- .innerblock { height:220px;}
- #productImagelistMini{ height:70px;}
+ #headingCatImg {height:220px;}
+ .innerblock { height:220px;}
+ #productImagelistMini{ height:70px;}
- .tax_symbol {font-size:0.4em;}
+ .tax_symbol {font-size:0.4em;}
- #price_master {font-weight:bold;font-size:2em;}
- .price {font-size:1.4em;font-weight:bold;}
- form input[type=text].CartQty{ width:15px;}
+ #price_master {font-weight:bold;font-size:2em;}
+ .price {font-size:1.4em;font-weight:bold;}
+ form input[type=text]#products_quantity{ width:25px;}
- #productDescription p { padding:2em;color: #555;font-size: 0.8em;}
- #productImage {height:200px;}
- article.product.single .prod_box_big {padding:2em; clear:both;}
- /* -- panier -- */
+ #productDescription p { padding:2em;color: #555;font-size: 0.8em;}
+ #productImage {height:200px;}
- .cart-header {padding:0.5em;}
- .cart-line {padding:0.5em;}
- .cart-line input{padding:0.5em;}
- #TotCart{float:right; padding:2em 0 ; height:50px;}
- #TotCart li span.value{display:inline-block;width:150px;}
- #TotCart li span.text{display:inline-block;width:100px;}
- .block {clear:both;margin-top:100px;}
- a.link {padding: 2em; }
+ article.product.single .prod_box_big {padding:2em; clear:both;}
+ /* -- panier -- */
- /* panier short */
- #shopping_cart_shortBox {position:absolute;height:100px;top:45px;width:400px;}
+ .cart-header {padding:0.5em;}
+ .cart-line {padding:0.5em;}
+ .cart-line input{padding:0.5em;}
+ #TotCart{float:right; padding:2em 0 ; height:50px;}
+ #TotCart li span.value{display:inline-block;width:150px;}
+ #TotCart li span.text{display:inline-block;width:100px;}
+ .block {clear:both;margin-top:100px;}
+ a.link {padding: 2em; }
+ form input[type=text].CartQty{ width:25px;}
- #Box-shopping_cart_short h3 {padding:0;margin-bottom:10px;}
- #Box-shopping_cart_short span {padding:0;margin-bottom:10px;padding:0 2em;}
- #Box-shopping_cart_short *,.cart_details * {float:left;padding-left:0.5em;}
- #Box-shopping_cart_short ul,#Box-shopping_cart_short ul li ul {list-style:none;}
- #Box-shopping_cart_short ul li ul,#Box-shopping_cart_short ul li,ul.cart{float:left;}
+ /* panier short */
+ #shopping_cart_shortBox {position:absolute;height:100px;top:45px;width:400px;}
+ #Box-shopping_cart_short h3 {padding:0;margin-bottom:10px;}
+ #Box-shopping_cart_short span {padding:0;margin-bottom:10px;padding:0 2em;}
+ #Box-shopping_cart_short *,
+ .cart_details * {float:left;padding-left:0.5em;}
+ #Box-shopping_cart_short ul,
+ #Box-shopping_cart_short ul li ul {float:none;list-style:none;}
+ /* #Box-shopping_cart_short ul li ul,#Box-shopping_cart_short ul li,ul.cart{float:left;} */
- /*box header*/
- #Box-currencies {display:none;}
\ No newline at end of file
+ /*box header*/
+
+ #Box-currencies {display:none;}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-12-16 08:58:51
|
Revision: 3958
http://oscss.svn.sourceforge.net/oscss/?rev=3958&view=rev
Author: oscim
Date: 2011-12-16 08:58:40 +0000 (Fri, 16 Dec 2011)
Log Message:
-----------
coquille
Ajout activation history dans les template public fourni
Modified Paths:
--------------
trunk/catalog/admin/includes/gabarit/orders/display_view.edit.gab
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/configuration.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/account_history_info.php
trunk/catalog/install/data/templates/appareil_photo/electronix/cfg/configuration.php
Modified: trunk/catalog/admin/includes/gabarit/orders/display_view.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/orders/display_view.edit.gab 2011-12-16 08:40:20 UTC (rev 3957)
+++ trunk/catalog/admin/includes/gabarit/orders/display_view.edit.gab 2011-12-16 08:58:40 UTC (rev 3958)
@@ -251,7 +251,7 @@
<td class="tcenter"><?php echo orders::$order->lasthistory['date_added']; ?></td>
<td class="tcenter"><?php echo orders::$order->lasthistory['customer_notified']; ?></td>
<td class="tcenter" style="width:40px; background:<?php echo orders::$order->lasthistory['color'] ?> url('includes/template/<?php echo $current_theme ?>/img/<?php echo $_SESSION['login_groups_id'] ?>/bg_graph.png') bottom left repeat-y;"><?php echo orders::$order->lasthistory['orders_status']; ?></td>
- <td><?php echo orders::$order->lasthistory['comments']; ?></td>
+ <td><?php echo unhtmlentities(orders::$order->lasthistory['comments']); ?></td>
</tr>
<?php endif; ?>
</tbody>
@@ -409,7 +409,7 @@
<td><?php echo $item['date_added']; ?></td>
<td class="tcenter"><?php echo $item['customer_notified']; ?></td>
<td class="tcenter" style="width:40px; background:<?php echo orders::$order->lasthistory['color'] ?> url('includes/template/<?php echo $current_theme ?>/img/<?php echo $_SESSION['login_groups_id'] ?>/bg_graph.png') bottom left repeat-y;"><?php echo $item['orders_status']; ?></td>
- <td><?php echo $item['comments']; ?></td>
+ <td><?php echo unhtmlentities($item['comments']); ?></td>
</tr>
<?php endforeach; ?>
</tbody>
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/configuration.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/configuration.php 2011-12-16 08:40:20 UTC (rev 3957)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/configuration.php 2011-12-16 08:58:40 UTC (rev 3958)
@@ -58,6 +58,8 @@
addConfigModule('MODULE_ACAPRO_INSTALLED_BO', 'header_tags.php');
addConfigModule('MODULE_ACCOUNT_INSTALLED', 'address_book.php');
addConfigModule('MODULE_ACCOUNT_INSTALLED', 'account_extra.php');
+addConfigModule('MODULE_ACCOUNT_INSTALLED', 'history.php');
+addConfigModule('MODULE_ACCOUNT_INSTALLED_BO', 'history.php');
addConfigModule('MODULE_ACCOUNT_INSTALLED_BO', 'address_book.php');
addConfigModule('MODULE_ACCOUNT_INSTALLED_BO', 'sppc_cust_force.php');
addConfigModule('MODULE_GENERIC_INSTALLED', 'banner.php');
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/account_history_info.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/account_history_info.php 2011-12-16 08:40:20 UTC (rev 3957)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/account_history_info.php 2011-12-16 08:58:40 UTC (rev 3958)
@@ -100,7 +100,7 @@
echo '<tr>' . "\n" .
'<td>' . tep_date_short($statuses['date_added']) . '</td>' . "\n" .
'<td>' . $statuses['status_name'] . '</td>' . "\n" .
- '<td>' . (empty($statuses['comments']) ? ' ' : nl2br(tep_output_string_protected($statuses['comments']))) . '</td>' . "\n" .
+ '<td>' . (empty($statuses['comments']) ? ' ' : unhtmlentities(tep_output_string_protected($statuses['comments']))) . '</td>' . "\n" .
'</tr>' . "\n" ;
}
Modified: trunk/catalog/install/data/templates/appareil_photo/electronix/cfg/configuration.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/electronix/cfg/configuration.php 2011-12-16 08:40:20 UTC (rev 3957)
+++ trunk/catalog/install/data/templates/appareil_photo/electronix/cfg/configuration.php 2011-12-16 08:58:40 UTC (rev 3958)
@@ -58,6 +58,8 @@
addConfigModule('MODULE_ACAPRO_INSTALLED_BO', 'header_tags.php');
addConfigModule('MODULE_ACCOUNT_INSTALLED', 'address_book.php');
addConfigModule('MODULE_ACCOUNT_INSTALLED', 'account_extra.php');
+addConfigModule('MODULE_ACCOUNT_INSTALLED', 'history.php');
+addConfigModule('MODULE_ACCOUNT_INSTALLED_BO', 'history.php');
addConfigModule('MODULE_ACCOUNT_INSTALLED_BO', 'address_book.php');
addConfigModule('MODULE_ACCOUNT_INSTALLED_BO', 'sppc_cust_force.php');
addConfigModule('MODULE_GENERIC_INSTALLED', 'banner.php');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-12-16 22:28:52
|
Revision: 3960
http://oscss.svn.sourceforge.net/oscss/?rev=3960&view=rev
Author: oscim
Date: 2011-12-16 22:28:46 +0000 (Fri, 16 Dec 2011)
Log Message:
-----------
FS#896
Modified Paths:
--------------
trunk/catalog/index.php
Removed Paths:
-------------
trunk/catalog/form.php
Deleted: trunk/catalog/form.php
===================================================================
--- trunk/catalog/form.php 2011-12-16 08:59:37 UTC (rev 3959)
+++ trunk/catalog/form.php 2011-12-16 22:28:46 UTC (rev 3960)
@@ -1,15 +0,0 @@
-<?php
-/* $Id template.php ,v 2.0 27.08.2009 00:10:28 oscim Exp $
-+-----------------------------------------------------------------------+
-| osCSS Open Source E-commerce |
-+-----------------------------------------------------------------------+
-| Copyright (c) 2005-2009 The osCSS developers |
-| |
-| http://www.oscss.org |
-| |
-| Portions Copyright (c) 2003-2009 osCommerce |
-+-----------------------------------------------------------------------+
- */
-$_ID=basename(__FILE__);
-require("content.php");
-?>
\ No newline at end of file
Modified: trunk/catalog/index.php
===================================================================
--- trunk/catalog/index.php 2011-12-16 08:59:37 UTC (rev 3959)
+++ trunk/catalog/index.php 2011-12-16 22:28:46 UTC (rev 3960)
@@ -105,7 +105,7 @@
$breadcrumb=$page->return_object('breadcrumb');
switch ($p){
- case 'form.php':
+// case 'form.php':
case 'contact.php':
$pp=substr($p, 0, -strlen($page->ext));
$page->new_class($pp);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-12-16 23:00:36
|
Revision: 3961
http://oscss.svn.sourceforge.net/oscss/?rev=3961&view=rev
Author: oscim
Date: 2011-12-16 23:00:29 +0000 (Fri, 16 Dec 2011)
Log Message:
-----------
Correction liens vers les modification associ?\195?\169 au deplacements de oscss.version .xml
Modified Paths:
--------------
trunk/catalog/admin/includes/appli_top_Test.php
trunk/catalog/admin/includes/application_top.php
trunk/catalog/admin/includes/exts/package/tags/requirements.php
trunk/catalog/admin/includes/modules/generic/SvnUpdate.php
trunk/catalog/admin/login.php
trunk/catalog/includes/appli_top_Test.php
trunk/catalog/includes/application_top.php
trunk/catalog/install/includes/content/core.update.php
Added Paths:
-----------
trunk/catalog/Documents/oscss.version.xml
Removed Paths:
-------------
trunk/catalog/common/oscss.version.xml
Copied: trunk/catalog/Documents/oscss.version.xml (from rev 3948, trunk/catalog/common/oscss.version.xml)
===================================================================
--- trunk/catalog/Documents/oscss.version.xml (rev 0)
+++ trunk/catalog/Documents/oscss.version.xml 2011-12-16 23:00:29 UTC (rev 3961)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<core>
+ <version>2.1.1 (dev)</version>
+ <svn>3885</svn>
+ <level>stable</level>
+ <template_admin>oscss</template_admin>
+
+ <urloscssorgtrac>http://sourceforge.net/apps/trac/oscss/changeset/?format=zip&new=SVN_REV_MAX&old=SVN_REV&new_path=trunk%2Fcatalog&old_path=trunk%2Fcatalog</urloscssorgtrac>
+ <urloscssgetrev>http://oscss.svn.sourceforge.net/viewvc/oscss?view=revision</urloscssgetrev>
+ <pathsvnbranche>trunk/catalog/</pathsvnbranche>
+</core>
Modified: trunk/catalog/admin/includes/appli_top_Test.php
===================================================================
--- trunk/catalog/admin/includes/appli_top_Test.php 2011-12-16 22:28:46 UTC (rev 3960)
+++ trunk/catalog/admin/includes/appli_top_Test.php 2011-12-16 23:00:29 UTC (rev 3961)
@@ -79,7 +79,7 @@
define(strtoupper($configuration['cfgKey']), $configuration['cfgValue']);
/// define the project version
- define('PROJECT_VERSION', get_info_core(DIR_FS_CATALOG. DIR_WS_COMMON.'oscss.version.xml','version').' - svn '.get_info_core(DIR_FS_CATALOG. DIR_WS_COMMON.'oscss.version.xml','svn'));
+ define('PROJECT_VERSION', get_info_core(DIR_FS_ROOT_DOCS.'oscss.version.xml','version').' - svn '.get_info_core(DIR_FS_ROOT_DOCS.'oscss.version.xml','svn'));
/// include list of project class and lib permanente
include($rpa.DIR_WS_INCLUDES . 'inc_base_lib.php');
Modified: trunk/catalog/admin/includes/application_top.php
===================================================================
--- trunk/catalog/admin/includes/application_top.php 2011-12-16 22:28:46 UTC (rev 3960)
+++ trunk/catalog/admin/includes/application_top.php 2011-12-16 23:00:29 UTC (rev 3961)
@@ -76,7 +76,7 @@
}
/// define the project version
- define('PROJECT_VERSION', get_info_core(DIR_FS_CATALOG. DIR_WS_COMMON.'oscss.version.xml','version').' - svn '.get_info_core(DIR_FS_CATALOG. DIR_WS_COMMON.'oscss.version.xml','svn'));
+ define('PROJECT_VERSION', get_info_core( DIR_FS_ROOT_DOCS.'oscss.version.xml','version').' - svn '.get_info_core( DIR_FS_ROOT_DOCS.'oscss.version.xml','svn'));
/// include list of project class and lib permanente
include($rpa.DIR_WS_INCLUDES . 'inc_base_lib.php');
@@ -200,7 +200,7 @@
///this is for admin themes
if (!isset($_GET['menu_theme']) && isset($_COOKIE['menu_theme'])) $current_theme = tep_sanitize_string($_COOKIE['menu_theme']) ;
else {
- $current_theme = (isset($_GET['menu_theme']) ? tep_sanitize_string($_GET['menu_theme']) : get_info_core(DIR_FS_CATALOG. DIR_WS_COMMON.'oscss.version.xml','template_admin'));
+ $current_theme = (isset($_GET['menu_theme']) ? tep_sanitize_string($_GET['menu_theme']) : get_info_core(DIR_FS_ROOT_DOCS.'oscss.version.xml','template_admin'));
setcookie('menu_theme', $current_theme , time()+31536000);
}
Modified: trunk/catalog/admin/includes/exts/package/tags/requirements.php
===================================================================
--- trunk/catalog/admin/includes/exts/package/tags/requirements.php 2011-12-16 22:28:46 UTC (rev 3960)
+++ trunk/catalog/admin/includes/exts/package/tags/requirements.php 2011-12-16 23:00:29 UTC (rev 3961)
@@ -78,7 +78,7 @@
$contraint=new objectInfo($contraint);
//! control version noyau
if (strtoupper($contraint->name ) ==='CORE') {
- if( ($contraint->version !=NULL) && !version_compare($contraint->version, get_info_core(DIR_FS_CATALOG. DIR_WS_COMMON.'oscss.version.xml','version'),'>=') ){
+ if( ($contraint->version !=NULL) && !version_compare($contraint->version, get_info_core(DIR_FS_ROOT_DOCS.'oscss.version.xml','version'),'>=') ){
CIP::InProcess(__("REQUIRE osCSS equal or superior ::").(int)$contraint->version ,'tag_xml-['.$id.']'. $this->tag_name.'->permissions_check_for_install()','block');
return false;
}
Modified: trunk/catalog/admin/includes/modules/generic/SvnUpdate.php
===================================================================
--- trunk/catalog/admin/includes/modules/generic/SvnUpdate.php 2011-12-16 22:28:46 UTC (rev 3960)
+++ trunk/catalog/admin/includes/modules/generic/SvnUpdate.php 2011-12-16 23:00:29 UTC (rev 3961)
@@ -25,7 +25,7 @@
public static $URL_OSCSS_ORG_TRAC = 'http://sourceforge.net/apps/trac/oscss/changeset/?format=zip&new=SVN_REV_MAX&old=SVN_REV&new_path=trunk%2Fcatalog&old_path=trunk%2Fcatalog';
public static $URL_OSCSS_GET_REV = 'http://oscss.svn.sourceforge.net/viewvc/oscss?view=revision';
public static $PATH_SVN_BRANCHE = 'trunk/catalog/';
- public static $FILEPATH_SVN_CORE = 'common/oscss.version.xml';
+ public static $FILEPATH_SVN_CORE = 'Documents/oscss.version.xml';
//! page de redirection apres exec
const REDIRECT = FILENAME_PACKAGE;
Modified: trunk/catalog/admin/login.php
===================================================================
--- trunk/catalog/admin/login.php 2011-12-16 22:28:46 UTC (rev 3960)
+++ trunk/catalog/admin/login.php 2011-12-16 23:00:29 UTC (rev 3961)
@@ -164,7 +164,7 @@
if (!isset($_GET['menu_theme']) && isset($_COOKIE['menu_theme']) )
$current_theme = $_COOKIE['menu_theme'] ;
else
- $current_theme = get_info_core(DIR_FS_CATALOG. DIR_WS_COMMON.'oscss.version.xml','template_admin');
+ $current_theme = get_info_core(DIR_FS_ROOT_DOCS.'oscss.version.xml','template_admin');
//! rep courant template
Deleted: trunk/catalog/common/oscss.version.xml
===================================================================
--- trunk/catalog/common/oscss.version.xml 2011-12-16 22:28:46 UTC (rev 3960)
+++ trunk/catalog/common/oscss.version.xml 2011-12-16 23:00:29 UTC (rev 3961)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<core>
- <version>2.1.1 (dev)</version>
- <svn>3885</svn>
- <level>stable</level>
- <template_admin>oscss</template_admin>
-
- <urloscssorgtrac>http://sourceforge.net/apps/trac/oscss/changeset/?format=zip&new=SVN_REV_MAX&old=SVN_REV&new_path=trunk%2Fcatalog&old_path=trunk%2Fcatalog</urloscssorgtrac>
- <urloscssgetrev>http://oscss.svn.sourceforge.net/viewvc/oscss?view=revision</urloscssgetrev>
- <pathsvnbranche>trunk/catalog/</pathsvnbranche>
-</core>
Modified: trunk/catalog/includes/appli_top_Test.php
===================================================================
--- trunk/catalog/includes/appli_top_Test.php 2011-12-16 22:28:46 UTC (rev 3960)
+++ trunk/catalog/includes/appli_top_Test.php 2011-12-16 23:00:29 UTC (rev 3961)
@@ -107,7 +107,7 @@
}
/// define the project version
- define('PROJECT_VERSION', get_info_core(DIR_WS_COMMON.'oscss.version.xml','version').' - svn '.get_info_core(DIR_WS_COMMON.'oscss.version.xml','svn'));
+ define('PROJECT_VERSION', get_info_core(DIR_FS_ROOT_DOCS.'oscss.version.xml','version').' - svn '.get_info_core(DIR_FS_ROOT_DOCS.'oscss.version.xml','svn'));
/// if gzip_compression is enabled, start to buffer the output
Modified: trunk/catalog/includes/application_top.php
===================================================================
--- trunk/catalog/includes/application_top.php 2011-12-16 22:28:46 UTC (rev 3960)
+++ trunk/catalog/includes/application_top.php 2011-12-16 23:00:29 UTC (rev 3961)
@@ -102,7 +102,7 @@
}
/// define the project version
- define('PROJECT_VERSION', get_info_core(DIR_WS_COMMON.'oscss.version.xml','version').' - svn '.get_info_core(DIR_WS_COMMON.'oscss.version.xml','svn'));
+ define('PROJECT_VERSION', get_info_core(DIR_FS_ROOT_DOCS.'oscss.version.xml','version').' - svn '.get_info_core(DIR_FS_ROOT_DOCS.'oscss.version.xml','svn'));
/// if gzip_compression is enabled, start to buffer the output
Modified: trunk/catalog/install/includes/content/core.update.php
===================================================================
--- trunk/catalog/install/includes/content/core.update.php 2011-12-16 22:28:46 UTC (rev 3960)
+++ trunk/catalog/install/includes/content/core.update.php 2011-12-16 23:00:29 UTC (rev 3961)
@@ -4,7 +4,7 @@
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 09/10/11, 17:43
+ @date 16/12/11, 17:43
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class update
@@ -16,7 +16,7 @@
define('URL_OSCSS_GET_REV', 'http://oscss.svn.sourceforge.net/viewvc/oscss?view=revision');
define('PATH_SVN_BRANCHE', 'trunk/catalog/');
-define('FILEPATH_SVN_CORE', 'common/oscss.version.xml');
+define('FILEPATH_SVN_CORE', 'Documents/oscss.version.xml');
class update extends core {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-12-16 23:01:47
|
Revision: 3962
http://oscss.svn.sourceforge.net/oscss/?rev=3962&view=rev
Author: oscim
Date: 2011-12-16 23:01:41 +0000 (Fri, 16 Dec 2011)
Log Message:
-----------
FS#927
Removed Paths:
-------------
trunk/catalog/admin/includes/configure.sample.php
trunk/catalog/includes/configure.sample.php
Deleted: trunk/catalog/admin/includes/configure.sample.php
===================================================================
--- trunk/catalog/admin/includes/configure.sample.php 2011-12-16 23:00:29 UTC (rev 3961)
+++ trunk/catalog/admin/includes/configure.sample.php 2011-12-16 23:01:41 UTC (rev 3962)
@@ -1,99 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 28/12/10, 09:58
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-
- /**
- * \brief as active / inactive cache and error return
- * @var boolean default:false
- */
- define('OSCSS_DEBUG', true);
- /**
- * \brief as active view query in error requet sql
- * @var boolean default:false
- */
- define('OSCSS_SHOW_QUERIES', true);
- /**
- * \brief as active / incative garbage collector error
- * @var boolean default:true
- */
- define('OSCSS_GARBAGE_ERROR', true);
-
-// Define the webserver and path parameters
-// * DIR_FS_* = Filesystem directories (local/physical)
-// * DIR_WS_* = Webserver directories (virtual/URL)
- define('HTTP_SERVER', 'http://myurl'); // eg, http://localhost - should not be empty for productive servers
- define('HTTP_CATALOG_SERVER', 'http://myurl');
- define('HTTPS_CATALOG_SERVER', '');
- define('ENABLE_SSL', false);
- define('ENABLE_SSL_CATALOG', 'false'); // secure webserver for catalog module
- define('DIR_FS_DOCUMENT_ROOT', 'xxx/'); // where the pages are located on the server
- define('DIR_WS_ADMIN', '/xxx/admin/'); // absolute path required
- define('DIR_FS_ADMIN', '/xxx/admin/'); // absolute pate required
- define('DIR_WS_CATALOG', '/xxx/'); // absolute path required
- define('DIR_FS_CATALOG', '/xxx/'); // absolute path required
- define('DIR_CLASSES', 'classes/');
- define('DIR_FUNCTIONS', 'functions/');
- define('DIR_FONTS', 'fonts/');
- define('DIR_WS_IMAGES', 'images/');
- define('DIR_WS_ICONS', DIR_WS_IMAGES . 'icons/');
- define('DIR_WS_CATALOG_IMAGES', DIR_WS_CATALOG . 'images/');
- define('DIR_WS_INCLUDES', 'includes/');
- define('DIR_WS_BOXES', DIR_WS_INCLUDES . 'boxes/');
- define('DIR_WS_DOWNLOAD', DIR_WS_INCLUDES . 'download/');
- define('DIR_WS_FUNCTIONS', DIR_WS_INCLUDES . DIR_FUNCTIONS);
- define('DIR_WS_CLASSES', DIR_WS_INCLUDES . DIR_CLASSES);
- define('DIR_WS_MODULES', DIR_WS_INCLUDES . 'modules/');
- define('DIR_WS_LIB', DIR_WS_INCLUDES . 'lib/');
- define('DIR_WS_PLUGINS', DIR_WS_INCLUDES . 'plugins/');
- define('DIR_WS_FONTS', DIR_WS_INCLUDES . DIR_FONTS);
- define('DIR_WS_JS', DIR_WS_INCLUDES . 'javascript/');
- define('DIR_WS_WIDGET', DIR_WS_INCLUDES . 'widget/');
- define('DIR_WS_LANGUAGES', DIR_WS_INCLUDES . 'languages/');
- define('DIR_WS_CATALOG_LANGUAGES', DIR_WS_CATALOG . 'includes/languages/');
- define('DIR_FS_CATALOG_LANGUAGES', DIR_FS_CATALOG . 'includes/languages/');
- define('DIR_FS_CATALOG_IMAGES', DIR_FS_CATALOG . 'images/');
- define('DIR_FS_CATALOG_MODULES', DIR_FS_CATALOG . 'includes/modules/');
- define('DIR_FS_BACKUP', DIR_FS_ADMIN . 'backups/');
- define('DIR_FS_WORK', '/xxx/oscss_data/');
- define('DIR_FS_SESSIONS', DIR_FS_ADMIN . 'sessions/');
-
-// Template System files
- define('DIR_FS_TEMPLATES', DIR_FS_CATALOG . 'templates/');
- define('DIR_WS_TEMPLATES', DIR_WS_CATALOG . 'templates/');
- define('DIR_WS_CATALOG_DOWNLOAD', DIR_WS_CATALOG . 'download/');
-
-// Common
- define('DIR_WS_COMMON', 'common/');
- define('DIR_WS_COMMON_FUNCTIONS', DIR_WS_COMMON . DIR_FUNCTIONS);
- define('DIR_WS_COMMON_FONTS', DIR_WS_COMMON . DIR_FONTS);
- define('DIR_WS_COMMON_CLASSES', DIR_WS_COMMON . DIR_CLASSES);
- define('DIR_WS_COMMON_IMAGES', DIR_WS_TEMPLATES . 'layout/');
-
-// define our database connection
- define('DB_CONNECTOR', 'mysql');
- define('DB_PORT', '3306');
- define('DB_CHARSET', 'utf8');
- define('DB_SERVER', 'localhost'); // eg, localhost - should not be empty for productive servers
- define('DB_SERVER_USERNAME', 'xxxxxxxx');
- define('DB_SERVER_PASSWORD', 'xxxxxxxx');
- define('DB_DATABASE', 'xxxxxxxx');
- define('DB_TABLE_PREFIX', 'osc_');
- define('USE_PCONNECT', 'false'); // use persisstent connections?
- define('STORE_SESSIONS', 'mysql'); // leave empty '' for default handler or set to 'mysql'
-
-
-
- /**
- * @brief method login active, separate by ;. the method is call in sort
- * @example $conf['login']='oscss;openid';
- * @var $conf['login'] string
- */
- $conf['login']='oscss;';
-?>
\ No newline at end of file
Deleted: trunk/catalog/includes/configure.sample.php
===================================================================
--- trunk/catalog/includes/configure.sample.php 2011-12-16 23:00:29 UTC (rev 3961)
+++ trunk/catalog/includes/configure.sample.php 2011-12-16 23:01:41 UTC (rev 3962)
@@ -1,79 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 12/02/11, 15:02
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-
- /**
- * \brief as active / inactive cache and error return
- * @var boolean default:false
- */
- define('OSCSS_DEBUG', true);
- /**
- * \brief as active view query in error requet sql
- * @var boolean default:false
- */
- define('OSCSS_SHOW_QUERIES', false);
- /**
- * \brief as active / incative garbage collector error
- * @var boolean default:true
- */
- define('OSCSS_GARBAGE_ERROR', true);
-
-// Define the webserver and path parameters
-// * DIR_FS_* = Filesystem directories (local/physical)
-// * DIR_WS_* = Webserver directories (virtual/URL)
- define('HTTP_SERVER', 'http://monsite.com'); // eg, http://localhost - should not be empty for productive servers
- define('HTTPS_SERVER', ''); // eg, https://localhost - should not be empty for productive servers
- define('ENABLE_SSL', false); // secure webserver for checkout procedure?
- define('HTTP_COOKIE_DOMAIN', '');
- define('HTTPS_COOKIE_DOMAIN', '');
- define('HTTP_COOKIE_PATH', '');
- define('HTTPS_COOKIE_PATH', '');
- define('DIR_WS_HTTP_CATALOG', '');
- define('DIR_WS_HTTPS_CATALOG', '');
- define('DIR_WS_IMAGES', 'images/');
- define('DIR_WS_ICONS', DIR_WS_IMAGES . 'icons/');
- define('DIR_WS_INCLUDES', 'includes/');
- define('DIR_WS_BOXES', DIR_WS_INCLUDES . 'boxes/');
- define('DIR_WS_FUNCTIONS', DIR_WS_INCLUDES . 'functions/');
- define('DIR_WS_CLASSES', DIR_WS_INCLUDES . 'classes/');
- define('DIR_WS_MODULES', DIR_WS_INCLUDES . 'modules/');
- define('DIR_WS_LANGUAGES', DIR_WS_INCLUDES . 'languages/');
-
- define('DIR_WS_DOWNLOAD_PUBLIC', 'pub/');
- define('DIR_FS_CATALOG', '');
- define('DIR_FS_WORK', DIR_FS_CATALOG . 'oscss_data/');
- define('DIR_FS_DOWNLOAD', DIR_FS_CATALOG . 'download/');
- define('DIR_FS_DOWNLOAD_PUBLIC', DIR_FS_CATALOG . 'pub/');
-
-
-// Template System files
- define('DIR_FS_TEMPLATES', DIR_FS_CATALOG . 'templates/');
- define('DIR_WS_TEMPLATES', 'templates/');
- define('DIR_WS_COMMON_IMAGES', DIR_WS_TEMPLATES . 'layout/');
-
-// Common
- define('DIR_WS_COMMON', 'common/');
- define('DIR_WS_COMMON_FUNCTIONS', DIR_WS_COMMON . DIR_FUNCTIONS);
- define('DIR_WS_COMMON_FONTS', DIR_WS_COMMON . DIR_FONTS);
- define('DIR_WS_COMMON_CLASSES', DIR_WS_COMMON . DIR_CLASSES);
- define('DIR_WS_COMMON_IMAGES', DIR_WS_TEMPLATES . 'layout/');
-
-// define our database connection
- define('DB_CONNECTOR', 'mysql');
- define('DB_PORT', '3306');
- define('DB_CHARSET', 'utf8');
- define('DB_SERVER', ''); // eg, localhost - should not be empty for productive servers
- define('DB_SERVER_USERNAME', '');
- define('DB_SERVER_PASSWORD', '');
- define('DB_DATABASE', 'base_name');
- define('DB_TABLE_PREFIX', 'osc_');
- define('USE_PCONNECT', 'true'); // use persistent connections?
- define('STORE_SESSIONS', 'mysql'); // leave empty '' for default handler or set to 'mysql'
-?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-12-16 23:42:45
|
Revision: 3963
http://oscss.svn.sourceforge.net/oscss/?rev=3963&view=rev
Author: oscim
Date: 2011-12-16 23:42:38 +0000 (Fri, 16 Dec 2011)
Log Message:
-----------
FS#882
Ajout d'un fichier d'aide dans les dossier du template public pour aider ?\195?\160 la prise en main de certain elements
Modified Paths:
--------------
trunk/catalog/includes/gabarit/history.display_view.gab
trunk/catalog/includes/modules/account/history.php
Added Paths:
-----------
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/Help.txt
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/Help.txt
Modified: trunk/catalog/includes/gabarit/history.display_view.gab
===================================================================
--- trunk/catalog/includes/gabarit/history.display_view.gab 2011-12-16 23:01:41 UTC (rev 3962)
+++ trunk/catalog/includes/gabarit/history.display_view.gab 2011-12-16 23:42:38 UTC (rev 3963)
@@ -4,7 +4,7 @@
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 01/11/11, 21:42
+ @date 16/12/11, 21:42
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@brief This listing orders for module account/history
@@ -42,11 +42,14 @@
<?php echo __('history small image button view'); ?>
</a>
</span>
- <span class="linkPdf">
- <a class="linkPdf" href="<?php echo $row->linkPdf ?>">
- <?php echo __('history pdf link') ?>
- </a>
- </span>
+ <?php if($row->linkPdf !=false): ?>
+ <!-- pdf link -->
+ <span class="linkPdf">
+ <a class="linkPdf" href="<?php echo $row->linkPdf ?>">
+ <?php echo __('history pdf link') ?>
+ </a>
+ </span>
+ <?php endif ?>
</dd>
</dl>
<?php endforeach; ?>
Modified: trunk/catalog/includes/modules/account/history.php
===================================================================
--- trunk/catalog/includes/modules/account/history.php 2011-12-16 23:01:41 UTC (rev 3962)
+++ trunk/catalog/includes/modules/account/history.php 2011-12-16 23:42:38 UTC (rev 3963)
@@ -4,7 +4,7 @@
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 01/11/11, 21:42
+ @date 16/12/11, 21:42
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*\class history
@@ -104,8 +104,16 @@
$n->destinataire = $order_type.' '.$order_name;
// $n->linkView = tep_href_link(FILENAME_ACCOUNT, 'aca_mod='.$this->code.'&aca_type='.$this->type.'&aca_action=display_info&oID='. (int)$row['orders_id'], 'SSL');
$n->linkView = tep_href_link(FILENAME_ACCOUNT, 'action=history_info&order_id=' . (int)$row['orders_id'], 'SSL');
- $n->linkPdf = tep_href_link(FILENAME_ACCOUNT, 'action=pdf&order_id=' . (int)$row['orders_id'], 'SSL');
+ /**
+ @remarks Adjust link pdf if Exist. Use config process
+ Link exist if file pdf exists.
+ */
+ if(( $filepath=$datadocs->GetDoc('packingslip',(int)$row['orders_id'])) && file_exists($filepath))
+ $n->linkPdf = tep_href_link(FILENAME_ACCOUNT, 'action=pdf&order_id=' . (int)$row['orders_id'], 'SSL');
+ else
+ $n->linkPdf = false ;
+
$result[strtotime($row['date_purchased'])]=$n;
}
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/Help.txt
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/Help.txt (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/Help.txt 2011-12-16 23:42:38 UTC (rev 3963)
@@ -0,0 +1,42 @@
+
+[fr]
+
+Les fichiers declaré dans ce repertoire sont specifique à ce theme.
+Ils remplacent les fichers portant le mếme nom est déclarés dans le dossier catalog/includes/content/
+
+Si vous devez modifié un fichiers contenu dans le dossier catalog/includes/content/, copier le préalablement dans ce dossier et ne modifié que ce nouveau fichier
+Vous préserverer ainsi l'intégrité du core, et faciliterai le suivi et la mise à jour de votre moteur
+
+[en]
+
+Declared the files in this directory are specific to this theme.
+They replace the files to the same name is declared in the file catalog/includes/gabarit/
+
+If you modified a file in the file catalog/includes/gabarit/, copy the first on this issue and only changes the new file
+You Preservers and the integrity of the core, and to facilitate monitoring and updating of your engine
+
+[de]
+
+Erklärt die Dateien in diesem Verzeichnis sind spezifisch für dieses Thema.
+Sie ersetzen die Dateien mit dem gleichen Namen in der Datei Katalog catalog/includes/gabarit/
+
+Wenn Sie eine Datei modifiziert die Datei catalog/includes/gabarit/ Kopieren die erste zu diesem Thema und ändert nur die neue Datei
+Sie Bewahrer und die Integrität des Kerns, und zur Erleichterung der Überwachung und Aktualisierung Ihres Motors
+
+[es]
+
+Declaró los archivos de este directorio son específicas de este tema.
+Que reemplazar los archivos con el mismo nombre se declara en el catálogo del catalog/includes/gabarit/
+
+Si ha modificado un archivo en el catálogo del catalog/includes/gabarit/, copie el primero sobre este tema y sólo cambia el nuevo archivo
+Que conservadores y la integridad del núcleo y facilitar el seguimiento y la actualización de su motor
+
+
+[tu]
+
+Bu dizindeki dosyaları bu temaya özgü ilan etti.
+Bunlar aynı adı dosyaları değiştirmek dosya katalog catalog/includes/gabarit/
+
+Dosyayı katalogda bir dosya üzerinde catalog/includes/gabarit/, bu konuda ilk kopya ve sadece yeni dosya değişiklikleri
+Bu preservers ve çekirdek bütünlüğünü ve kolaylaştırmak için izleme ve motor güncellenmesi
+
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/Help.txt
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/Help.txt (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/Help.txt 2011-12-16 23:42:38 UTC (rev 3963)
@@ -0,0 +1,42 @@
+
+[fr]
+
+Les fichiers declaré dans ce repertoire sont specifique à ce theme.
+Ils remplacent les fichers portant le mếme nom est déclarés dans le dossier catalog/includes/gabarit/
+
+Si vous devez modifié un fichiers contenu dans le dossier catalog/includes/gabarit/, copier le préalablement dans ce dossier et ne modifié que ce nouveau fichier
+Vous préserverer ainsi l'intégrité du core, et faciliterai le suivi et la mise à jour de votre moteur
+
+[en]
+
+Declared the files in this directory are specific to this theme.
+They replace the files to the same name is declared in the file catalog/includes/gabarit/
+
+If you modified a file in the file catalog/includes/gabarit/, copy the first on this issue and only changes the new file
+You Preservers and the integrity of the core, and to facilitate monitoring and updating of your engine
+
+[de]
+
+Erklärt die Dateien in diesem Verzeichnis sind spezifisch für dieses Thema.
+Sie ersetzen die Dateien mit dem gleichen Namen in der Datei Katalog catalog/includes/gabarit//
+
+Wenn Sie eine Datei modifiziert die Datei catalog/includes/gabarit/ Kopieren die erste zu diesem Thema und ändert nur die neue Datei
+Sie Bewahrer und die Integrität des Kerns, und zur Erleichterung der Überwachung und Aktualisierung Ihres Motors
+
+[es]
+
+Declaró los archivos de este directorio son específicas de este tema.
+Que reemplazar los archivos con el mismo nombre se declara en el catálogo del catalog/includes/gabarit/
+
+Si ha modificado un archivo en el catálogo del catalog/includes/gabarit/, copie el primero sobre este tema y sólo cambia el nuevo archivo
+Que conservadores y la integridad del núcleo y facilitar el seguimiento y la actualización de su motor
+
+
+[tu]
+
+Bu dizindeki dosyaları bu temaya özgü ilan etti.
+Bunlar aynı adı dosyaları değiştirmek dosya katalog catalog/includes/gabarit/
+
+Dosyayı katalogda bir dosya üzerinde catalog/includes/gabarit/, bu konuda ilk kopya ve sadece yeni dosya değişiklikleri
+Bu preservers ve çekirdek bütünlüğünü ve kolaylaştırmak için izleme ve motor güncellenmesi
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-12-17 16:41:35
|
Revision: 3968
http://oscss.svn.sourceforge.net/oscss/?rev=3968&view=rev
Author: oscim
Date: 2011-12-17 16:41:28 +0000 (Sat, 17 Dec 2011)
Log Message:
-----------
FS#935
correction coquille lecture d'une page cms appartenant a plusieur categories
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/drivers/sqlcontent.php
trunk/catalog/includes/classes/drivers/data/content.php
trunk/catalog/index.php
Modified: trunk/catalog/admin/includes/classes/drivers/sqlcontent.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlcontent.php 2011-12-17 11:17:04 UTC (rev 3967)
+++ trunk/catalog/admin/includes/classes/drivers/sqlcontent.php 2011-12-17 16:41:28 UTC (rev 3968)
@@ -4,10 +4,10 @@
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 22/09/11, 20:11
+ @date 17/12/11, 20:11
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
- @class manage link table products
+ @class sqlcontent
*/
@@ -186,17 +186,18 @@
// $sql .="AND pd.language_id = '".(int)tep_db_input($option['language_id'])."' ";
// }
- if(isset($option['catid'])){
- $languages_id = (int)$option['catid'];
- $sql .="AND c2c.categories_id = '".(int)tep_db_input($option['catid'])."' ";
- }
+// if(isset($option['catid'])){
+// $languages_id = (int)$option['catid'];
+// $sql .="AND c2c.categories_id = '".(int)tep_db_input($option['catid'])."' ";
+// }
$sql =substr($sql,3);
+ $res = $DB->query($sql="select c.content_id, content_name, date_added, last_modified, content_status from " . TABLE_CONTENT . " c WHERE ".$sql);
- $res = $DB->query($sql="select c.content_id, content_name, date_added, last_modified, content_status from " . TABLE_CONTENT . " c LEFT JOIN " . TABLE_CONTENT_TO_CATEGORIES . " c2c on(c.content_id=c2c.content_id) WHERE ".$sql); //c.content_id = '" . (int)$ID . "' ");
+
$num = $res->__get('numRows');
if($num == 1)
Modified: trunk/catalog/includes/classes/drivers/data/content.php
===================================================================
--- trunk/catalog/includes/classes/drivers/data/content.php 2011-12-17 11:17:04 UTC (rev 3967)
+++ trunk/catalog/includes/classes/drivers/data/content.php 2011-12-17 16:41:28 UTC (rev 3968)
@@ -177,7 +177,7 @@
while ($content = $content_query->fetchAssoc()) {
if (!in_array($content['name'],$exclude)) {
$res=$content;
- $res['href']=tep_href_link(FILENAME_CONTENT,'content=' . $content['id'] . '&language=' . $display_lang['code']);
+ $res['href']=tep_href_link(FILENAME_CONTENT,'content=' . $content['id'] );
$res['key']=$content['name'];
$res['original']=$content['text'];
$res['images']=array();
Modified: trunk/catalog/index.php
===================================================================
--- trunk/catalog/index.php 2011-12-17 11:17:04 UTC (rev 3967)
+++ trunk/catalog/index.php 2011-12-17 16:41:28 UTC (rev 3968)
@@ -99,7 +99,7 @@
elseif( (isset($_GET['d']) && $_GET['d'] !='home.php') || isset($_GET['content']) || isset($_GET['aca_mod']) ){
- $p=(string)tep_db_prepare_input(basename($_GET['d']));
+ $p=(string)tep_db_prepare_input(basename($_GET['d']));
$page->init($p,$language);
$breadcrumb=$page->return_object('breadcrumb');
@@ -107,21 +107,25 @@
switch ($p){
// case 'form.php':
case 'contact.php':
- $pp=substr($p, 0, -strlen($page->ext));
- $page->new_class($pp);
- $page->force_content($pp.'_'.$page->_call($pp,'the_form').$page->ext);
- if (isset($_GET['action'])) $page->_call($pp,'action');
- break;
- default:
- if (isset($_GET['content']) && !is_numeric($_GET['content'])){
- $pp=(int)tep_db_prepare_input($_GET['content']);
- $page->new_class($pp);
- $page->force_content('page'.$page->ext);
- $page->force_gabarit('content');
- $page->_call($pp,'page');
- }
+ $pp=substr($p, 0, -strlen($page->ext));
+ $page->new_class($pp);
+ $page->force_content($pp.'_'.$page->_call($pp,'the_form').$page->ext);
+ if (isset($_GET['action'])) $page->_call($pp,'action');
+ break;
+ default:
+// if (isset($_GET['content']) && !is_numeric($_GET['content'])){
+// $pp=(int)tep_db_prepare_input($_GET['content']);
+// $page->new_class($pp);
+// $page->force_content('page'.$page->ext);
+// $page->force_gabarit('content');
+//
+// $breadcrumb->add($product_info['title'], tep_href_link($pp));
+//
+// $page->_call($pp,'page');
+// }
/** Module aca */
- elseif (isset($_GET['aca_mod']) && !is_numeric($_GET['aca_mod']) && isset($_GET['aca_type']) && isset($_GET['aca_action'])){
+ /*elseif*/
+ if (isset($_GET['aca_mod']) && !is_numeric($_GET['aca_mod']) && isset($_GET['aca_type']) && isset($_GET['aca_action'])){
$module=(string)tep_db_prepare_input($_GET['aca_mod']);
$type=(string)tep_db_prepare_input($_GET['aca_type']);
$aca=$page->new_class($type);
@@ -130,15 +134,21 @@
$page->force_content('page'.$page->ext);
if (isset($_GET['action']) ) {
- $action=(string)tep_db_prepare_input($_GET['action']);
- if ($aca_module[$module]->check_action($action) ) {
- /** Exe == true */
- $aca_module[$module]->after_check_action($action);
- // tep_redirect(tep_href_link(FILENAME_PRODUCT_INFO, tep_get_all_get_params(array('action'))));
- }
- }
+ $action=(string)tep_db_prepare_input($_GET['action']);
+ if ($aca_module[$module]->check_action($action) ) {
+ /** Exe == true */
+ $aca_module[$module]->after_check_action($action);
+ // tep_redirect(tep_href_link(FILENAME_PRODUCT_INFO, tep_get_all_get_params(array('action'))));
+ }
+ }
}
+ else {
+ if(defined('NAVBAR_TITLE'))
+ $breadcrumb->add(NAVBAR_TITLE, tep_href_link($p));
+ }
+
+
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-12-17 16:46:49
|
Revision: 3969
http://oscss.svn.sourceforge.net/oscss/?rev=3969&view=rev
Author: oscim
Date: 2011-12-17 16:46:41 +0000 (Sat, 17 Dec 2011)
Log Message:
-----------
Amelioration seo (suite / ajout cpath url et conservation chemin )
Amelioration htaccess plus restrictif + prise en charge cpath dans les url produit et page
Modified Paths:
--------------
trunk/catalog/common/classes/seo_url.php
trunk/catalog/install/includes/modele/htaccess.txt
Added Paths:
-----------
trunk/catalog/admin/includes/template/defaut/logoff.php
trunk/catalog/admin/includes/template/defaut/password_forgotten.php
Added: trunk/catalog/admin/includes/template/defaut/logoff.php
===================================================================
--- trunk/catalog/admin/includes/template/defaut/logoff.php (rev 0)
+++ trunk/catalog/admin/includes/template/defaut/logoff.php 2011-12-17 16:46:41 UTC (rev 3969)
@@ -0,0 +1,31 @@
+<?php
+/**
+ @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 17/12/11, 15:38
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" <?php echo HTML_PARAMS; ?> >
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>" />
+ <link rel="stylesheet" type="text/css" href="<?php echo $DIR_WS_TEMPLATE; ?>login-panel.css" media="all"/>
+ <title><?php echo LOGOFF_TITLE; ?></title>
+
+</head>
+<body>
+ <div id="page">
+ <h1>osCSS Admin</h1>
+ <div id="content">
+ <h3>osCSS Admin</h3>
+ <h2><?php echo LOGOFF_HEADING_TITLE; ?></h2>
+ <?php echo LOGOFF_TEXT_MAIN; ?><?php echo '<a class="button" href="' . tep_href_link(FILENAME_LOGIN, '', 'SSL') . '">' . IMAGE_BACK . '</a>'; ?>
+ </div>
+
+ </div>
+</body>
+</html>
\ No newline at end of file
Added: trunk/catalog/admin/includes/template/defaut/password_forgotten.php
===================================================================
--- trunk/catalog/admin/includes/template/defaut/password_forgotten.php (rev 0)
+++ trunk/catalog/admin/includes/template/defaut/password_forgotten.php 2011-12-17 16:46:41 UTC (rev 3969)
@@ -0,0 +1,73 @@
+<?php
+/**
+ @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 17/12/11, 15:38
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" <?php echo HTML_PARAMS; ?> >
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>" />
+ <link rel="stylesheet" type="text/css" href="<?php echo DIR_WS_TEMPLATE; ?>login-panel.css" media="all"/>
+ <title><?php echo TITLE; ?></title>
+</head>
+<body>
+<div id="page">
+ <h1>osCSS</h1>
+<div id="content">
+ <?php echo tep_draw_form('login', FILENAME_PASSWORD_FORGOTTEN, 'action=process'); ?>
+<h2><?php echo HEADING_PASSWORD_FORGOTTEN; ?></h2>
+
+
+
+ <?php
+ if (isset($_GET['login']) && $_GET['login'] == 'success') {
+ $success_message = TEXT_FORGOTTEN_SUCCESS;
+ } elseif (isset($_GET['login']) && $_GET['login'] == 'fail') {
+ $info_message = TEXT_FORGOTTEN_ERROR;
+ }
+ if (tep_session_is_registered('password_forgotten')) {
+ ?>
+ <p>
+ <?php echo TEXT_FORGOTTEN_FAIL; ?>
+ <br />
+ <?php echo '<a class="button" href="' . tep_href_link(FILENAME_LOGIN, '' , 'SSL') . '">' . IMAGE_BACK . '</a>'; ?>
+ </p>
+
+ <?php } elseif (isset($success_message)) { ?>
+ <p>
+ <?php echo $success_message; ?>
+ <br />
+ <?php echo '<a class="button" href="' . tep_href_link(FILENAME_LOGIN, '' , 'SSL') . '">' . IMAGE_BACK . '</a>'; ?>
+ </p>
+ <?php
+ } else {
+ if (isset($info_message)) {
+ ?>
+ <div class="alert">
+ <p><?php echo $info_message; ?><?php echo tep_draw_hidden_field('log_times', '', $log_times); ?></p>
+ </div>
+ <?php } ?>
+ <p>
+ <label for="firstname"><?php echo ENTRY_FIRSTNAME; ?></label><br />
+ <?php echo tep_draw_input_field('firstname'); ?>
+ </p>
+ <p>
+ <label for="email_address"><?php echo ENTRY_EMAIL_ADDRESS; ?></label><br />
+ <?php echo tep_draw_input_field('email_address'); ?>
+ </p>
+
+ <div class="button_nav"><?php echo '<a class="button" href="' . tep_href_link(FILENAME_LOGIN, '' , 'SSL') . '">' . IMAGE_BACK . '</a> ' . tep_image_submit('button_confirm.gif', IMAGE_BUTTON_LOGIN); ?>
+ </div>
+ <?php } ?>
+ </form>
+ </div>
+</div>
+
+</body>
+</html>
\ No newline at end of file
Modified: trunk/catalog/common/classes/seo_url.php
===================================================================
--- trunk/catalog/common/classes/seo_url.php 2011-12-17 16:41:28 UTC (rev 3968)
+++ trunk/catalog/common/classes/seo_url.php 2011-12-17 16:46:41 UTC (rev 3969)
@@ -168,21 +168,21 @@
//ojp FILENAME_LINKS
$seo_pages=array(
- FILENAME_DEFAULT,
- FILENAME_POPUP_IMAGE,
- FILENAME_PRODUCT_INFO,
- FILENAME_CONTENT,
- FILENAME_ADVANCED_SEARCH,
- FILENAME_PRODUCTS_NEW,
- FILENAME_SMALL_PRICE,
- FILENAME_SPECIALS,
- FILENAME_BEST_SELLERS,
- FILENAME_SITEMAP,
-// FILENAME_HOME,
- FILENAME_TEMPLATE,
- FILENAME_CONTACT_US,
- FILENAME_SHOPPING_CART
- );
+ FILENAME_DEFAULT,
+ FILENAME_POPUP_IMAGE,
+ FILENAME_PRODUCT_INFO,
+ FILENAME_CONTENT,
+ FILENAME_ADVANCED_SEARCH,
+ FILENAME_PRODUCTS_NEW,
+ FILENAME_SMALL_PRICE,
+ FILENAME_SPECIALS,
+ FILENAME_BEST_SELLERS,
+ FILENAME_SITEMAP,
+// FILENAME_HOME,
+ FILENAME_TEMPLATE,
+ FILENAME_CONTACT_US,
+ FILENAME_SHOPPING_CART
+ );
if ( defined('FILENAME_LINKS') ) $seo_pages[] = FILENAME_LINKS;
@@ -190,14 +190,14 @@
'SESSION_STARTED' => $session_started,
'SID' => $SID,
- 'SEO_ADD_CPATH_TO_PRODUCT_URLS' => defined('SEO_ADD_CPATH_TO_PRODUCT_URLS') ? SEO_ADD_CPATH_TO_PRODUCT_URLS : 'false',
- 'SEO_ADD_CAT_PARENT' => defined('SEO_ADD_CAT_PARENT') ? SEO_ADD_CAT_PARENT : 'true',
- 'SEO_URLS_USE_W3C_VALID' => defined('SEO_URLS_USE_W3C_VALID') ? SEO_URLS_USE_W3C_VALID : 'true',
-// 'USE_SEO_CACHE_MANUFACTURERS' => defined('USE_SEO_CACHE_MANUFACTURERS') ? USE_SEO_CACHE_MANUFACTURERS : 'false',
+ 'SEO_ADD_CPATH_TO_URLS' => _cst_bool('SEO_ADD_CPATH_TO_PRODUCT_URLS') ? SEO_ADD_CPATH_TO_PRODUCT_URLS : 'false',
+ 'SEO_ADD_CAT_PARENT' => _cst_bool('SEO_ADD_CAT_PARENT') ? SEO_ADD_CAT_PARENT : 'true',
+ 'SEO_URLS_USE_W3C_VALID' => _cst_bool('SEO_URLS_USE_W3C_VALID') ? SEO_URLS_USE_W3C_VALID : 'true',
+// 'USE_SEO_CACHE_MANUFACTURERS' => _cst_bool('USE_SEO_CACHE_MANUFACTURERS') ? USE_SEO_CACHE_MANUFACTURERS : 'false',
- 'SEO_URLS_FILTER_SHORT_WORDS' => defined('SEO_URLS_FILTER_SHORT_WORDS') ? SEO_URLS_FILTER_SHORT_WORDS : 'false',
+ 'SEO_URLS_FILTER_SHORT_WORDS' => _cst_bool('SEO_URLS_FILTER_SHORT_WORDS') ? SEO_URLS_FILTER_SHORT_WORDS : 'false',
'SEO_CHAR_CONVERT_SET' => defined('SEO_CHAR_CONVERT_SET') ? $this->expand(SEO_CHAR_CONVERT_SET) : 'false',
- 'SEO_REMOVE_ALL_SPEC_CHARS' => defined('SEO_REMOVE_ALL_SPEC_CHARS') ? SEO_REMOVE_ALL_SPEC_CHARS : 'false',
+ 'SEO_REMOVE_ALL_SPEC_CHARS' => _cst_bool('SEO_REMOVE_ALL_SPEC_CHARS') ? SEO_REMOVE_ALL_SPEC_CHARS : 'false',
'SEO_PAGES' => $seo_pages,
);
@@ -210,10 +210,18 @@
self::$USE_SEO_CACHE_GLOBAL=defined('USE_SEO_CACHE_GLOBAL') ? USE_SEO_CACHE_GLOBAL : 'false';
self::$USE_SEO_CACHE_LINKS=defined('USE_SEO_CACHE_LINKS') ? USE_SEO_CACHE_LINKS : 'false';
- self::$USE_SEO_CACHE_PRODUCTS=defined('USE_SEO_CACHE_PRODUCTS') ? USE_SEO_CACHE_PRODUCTS : 'false';
+
+ if( _cst_bool('SEO_ADD_CPATH_TO_PRODUCT_URLS') )
+ self::$USE_SEO_CACHE_PRODUCTS=defined('USE_SEO_CACHE_PRODUCTS') ? USE_SEO_CACHE_PRODUCTS : 'false';
+ else
+ self::$USE_SEO_CACHE_PRODUCTS = 'false';
+
self::$USE_SEO_CACHE_CATEGORIES=defined('USE_SEO_CACHE_CATEGORIES') ? USE_SEO_CACHE_CATEGORIES : 'false';
- self::$USE_SEO_CACHE_TOPICS=defined('USE_SEO_CACHE_TOPICS') ? USE_SEO_CACHE_TOPICS : 'false';
+ if( _cst_bool('SEO_ADD_CPATH_TO_PRODUCT_URLS') )
+ self::$USE_SEO_CACHE_TOPICS=defined('USE_SEO_CACHE_TOPICS') ? USE_SEO_CACHE_TOPICS : 'false';
+ else
+ self::$USE_SEO_CACHE_TOPICS = 'false';
$this->cache = array();
$this->timestamp = 0;
@@ -221,16 +229,16 @@
// respecter l'ordre
$this->reg_anchors= array(
- 'pID' => 'pi',
- 'products_id' => 'p',
- 'cPath' => 'c',
- 'manufacturers_id' => 'm',
- 'content' => 't',
- 'divers' => 'd',
- 'lID' => 'l',
- 'customers_id' => 'u',
- 'type_object' => 'to',
- );
+ 'pID' => 'pi',
+ 'products_id' => 'p',
+ 'cPath' => 'c',
+ 'manufacturers_id' => 'm',
+ 'content' => 't',
+ 'divers' => 'd',
+ 'lID' => 'l',
+ 'customers_id' => 'u',
+ 'type_object' => 'to',
+ );
@@ -241,9 +249,9 @@
%3$s => title
%4$s => ext
*/
- $this->reg_mask['no-rewrite'] = '%1$s=%2$s';
- $this->reg_mask['Rewrite'] = '%2$s-%1$s-%3$s.%4$s';
- $this->reg_mask['Rewrite-mode2'] = '%1$s/%2$s/%3$s.%4$s';
+ $this->reg_mask['no-rewrite'] = '%1$s=%2$s';
+ $this->reg_mask['Rewrite'] = '%2$s-%1$s-%3$s.%4$s';
+ $this->reg_mask['Rewrite-mode2'] = '%1$s/%2$s/%3$s.%4$s';
/// ext apres reecriture
$this->reg_ext['no-rewrite']='html';
@@ -252,35 +260,37 @@
$this->performance = array('NUMBER_URLS_GENERATED' => 0,
- 'NUMBER_QUERIES' => 0,
- 'CACHE_QUERY_SAVINGS' => 0,
- 'NUMBER_STANDARD_URLS_GENERATED' => 0,
- 'TOTAL_CACHED_PER_PAGE_RECORDS' => 0,
- 'TOTAL_TIME' => 0,
- 'TIME_PER_URL' => 0,
- 'QUERIES' => array()
- );
+ 'NUMBER_QUERIES' => 0,
+ 'CACHE_QUERY_SAVINGS' => 0,
+ 'NUMBER_STANDARD_URLS_GENERATED' => 0,
+ 'TOTAL_CACHED_PER_PAGE_RECORDS' => 0,
+ 'TOTAL_TIME' => 0,
+ 'TIME_PER_URL' => 0,
+ 'QUERIES' => array()
+ );
//ojp generate_link_cache
if (_test_bool(self::$USE_SEO_CACHE_GLOBAL)){
- $this->cache_file = 'seo_urls_v2_';
- $this->cache_gc();
+ $this->cache_file = 'seo_urls_v2_';
+ $this->cache_gc();
- if ( _test_bool(self::$USE_SEO_CACHE_PRODUCTS )) $this->generate_products_cache();
- if ( _test_bool(self::$USE_SEO_CACHE_CATEGORIES)) $this->generate_categories_cache();
+ if ( _test_bool(self::$USE_SEO_CACHE_PRODUCTS )) $this->generate_products_cache();
+ if ( _test_bool(self::$USE_SEO_CACHE_CATEGORIES)) $this->generate_categories_cache();
// if ( _test_bool($this->attributes['USE_SEO_CACHE_MANUFACTURERS'] ) ) $this->generate_manufacturers_cache();
// if ( _test_bool($this->attributes['USE_SEO_CACHE_ARTICLES'] ) && defined('TABLE_ARTICLES_DESCRIPTION'))
// $this->generate_articles_cache();
- if ( _test_bool(self::$USE_SEO_CACHE_TOPICS) && defined('TABLE_CONTENT_DESCRIPTION')) $this->generate_topics_cache();
- $this->generate_divers_cache();
- if ( _test_bool(self::$USE_SEO_CACHE_LINKS) ) $this->generate_links_cache();
+ if ( _test_bool(self::$USE_SEO_CACHE_TOPICS) && defined('TABLE_CONTENT_DESCRIPTION')) $this->generate_topics_cache();
+ $this->generate_divers_cache();
+ if ( _test_bool(self::$USE_SEO_CACHE_LINKS) ) $this->generate_links_cache();
}
+/**
+ TODO A revoir
+*/
+// if (_test_bool( self::$USE_SEO_REDIRECT)) $this->check_redirect();
- if (_test_bool( self::$USE_SEO_REDIRECT)) $this->check_redirect();
-
/**
* \brief Prepa static var
*/
@@ -345,13 +355,13 @@
$this->performance['TOTAL_TIME'] += $time;
switch($this->attributes['SEO_URLS_USE_W3C_VALID']){
case ('true'):
- if (!isset($_SESSION['customer_id']) && _cst_bool('ENABLE_PAGE_CACHE') && class_exists('page_cache')) return $link;
- else {
- return htmlentities($link);
- }
+ if (!isset($_SESSION['customer_id']) && _cst_bool('ENABLE_PAGE_CACHE') && class_exists('page_cache')) return $link;
+ else {
+ return htmlentities($link);
+ }
break;
case ('false'):
- return $link;
+ return $link;
break;
}
}
@@ -423,16 +433,16 @@
switch(true){
case (!isset($_SESSION['customer_id']) && _cst_bool('ENABLE_PAGE_CACHE') && class_exists('page_cache')):
- $page_cache = true;
- $return = $link . $separator . '<osCsid>';
+ $page_cache = true;
+ $return = $link . $separator . '<osCsid>';
break;
case (isset($_sid) && ( !$kill_sid )): ///// SID-KILLER ( change ) /// ORG: case (isset($_sid)):
- $page_cache = false;
- $return = $link . $separator . tep_output_string($_sid);
+ $page_cache = false;
+ $return = $link . $separator . tep_output_string($_sid);
break;
default:
- $page_cache = false;
- $return = $link;
+ $page_cache = false;
+ $return = $link;
break;
}
$this->performance['NUMBER_STANDARD_URLS_GENERATED']++;
@@ -444,10 +454,10 @@
switch(true){
case (_test_bool($this->attributes['SEO_URLS_USE_W3C_VALID']) && !$page_cache):
- return htmlentities(str_replace('&','&',$return));
+ return htmlentities(str_replace('&','&',$return));
break;
default:
- return str_replace('&','&',$return);
+ return str_replace('&','&',$return);
break;
}
}
@@ -466,27 +476,27 @@
protected function parse_parameters($page, $params ,$connection , &$separator){
$params=str_replace('&','&',$params);
if(!empty($params))
- $p = @explode('&', $params);
+ $p = @explode('&', $params);
else
- $p=$p3 = array();
+ $p=$p3 = array();
krsort($p);
$container = array();
- // preparation array key/value
- foreach ($p as $index => $valuepair)
- if(!empty($valuepair) || $index !=0) {
- $p2 = @explode('=', $valuepair);
+ // preparation array key/value
+ foreach ($p as $index => $valuepair)
+ if(!empty($valuepair) || $index !=0) {
+ $p2 = @explode('=', $valuepair);
- $p3[$p2[0]]=$p2[1];
+ $p3[$p2[0]]=$p2[1];
- }
+ }
$check=array_keys($this->reg_anchors);
if(count($p3)==0)
- if($page ==FILENAME_HOME)
- $p3['home'] = 'home';
+ if($page ==FILENAME_HOME)
+ $p3['home'] = 'home';
foreach ($p3 as $key => $value){
@@ -518,7 +528,7 @@
}
//! home by page content
else {
-// $url = ''; //
+// $url = ''; //
$url = $this->make_url('home', $this->GetName_d('home'), 'divers', 'home', $separator);
$this->ValidateName($url, "d", 'home', $connection, $separator);
}
@@ -553,21 +563,27 @@
@param $id integer
@param $separator string NOTE: passed by reference
@return string
+
+ TODO: REvoir la gestion du rajout de l'info du cpath
+
*/
- private function make_url($page, $string, $anchor_type, $id, &$separator){
+ private function make_url($page, $string, $anchor_type, $id, $separator){
if(self::$SEO_REWRITE_TYPE =='no-rewrite')
$key = $anchor_type;
else
$key = $this->reg_anchors[$anchor_type];
+ if( _test_bool($this->attributes['SEO_ADD_CPATH_TO_URLS']) && !in_array($anchor_type, array('cPath' , 'divers')) )
+ $cpath = (isset($_GET['cPath'])? $this->reg_anchors['cPath'].'-'. tep_sanitize_request($_GET['cPath']) .'-': '');
+
return sprintf(
- $this->reg_mask[self::$SEO_REWRITE_TYPE],
- $key,
- $id,
- $string,
- self::$extention
- );
+ $this->reg_mask[self::$SEO_REWRITE_TYPE],
+ $key,
+ $id,
+ $cpath.$string,
+ self::$extention
+ );
}
@@ -594,8 +610,8 @@
if (!empty(self::$origUrl) && $id === $realID && self::$origUrl !== $url){ //ID's match but not the text
$url = self::$base_url . $url;
$link = $this->add_sid($url, true, $connection, $separator); //build the correct link with SID
- //header("HTTP/1.0 301 Moved Permanently"); //let the SE's know to not use this link
- //header("Location: $link"); //redirect to the real page
+ //header("HTTP/1.0 301 Moved Permanently"); //let the SE's know to not use this link
+ //header("Location: $link"); //redirect to the real page
}
}
}
@@ -626,26 +642,26 @@
// var_dump(self::$htexe);
switch(true){
case (_test_bool(self::$USE_SEO_CACHE_GLOBAL) && isset($this->cache['DIVERS'][$pID])):
- $this->performance['CACHE_QUERY_SAVINGS']++;
- $result = $this->get_cache_id($pID,'','DIVERS');
+ $this->performance['CACHE_QUERY_SAVINGS']++;
+ $result = $this->get_cache_id($pID,'','DIVERS');
// var_dump(self::$htexe,$result);
- $return = (isset($result['tName'])? $this->strip($result['tName']): $this->strip($pID));
- if(self::$htexe)
- $this->transph_header_tag($result);
+ $return = (isset($result['tName'])? $this->strip($result['tName']): $this->strip($pID));
+ if(self::$htexe)
+ $this->transph_header_tag($result);
break;
default:
- $this->performance['NUMBER_QUERIES']++;
- $sql = "select head_title_tag as tName, head_desc_tag, head_keywords_tag from " . TABLE_FULL_TAG . " ft, " . TABLE_FULL_TAG_DESCRIPTION . " ftd where ft.tag_id=ftd.tag_id and ft.page_type='page' and ft.page_id = '" . basename($pID). "' and ftd.language_id = '" . (int)$this->languages_id. "' Limit 1";
- $query=$this->DB->query( $sql );
- if ($query->__get('numRows')>0) $result =$query->fetchAssoc();
- else $result['tName'] = $this->strip($pID);
- $this->get_cache_id($pID,'','DIVERS');
- $this->performance['QUERIES']['DIVERS'][] = $sql;
+ $this->performance['NUMBER_QUERIES']++;
+ $sql = "select head_title_tag as tName, head_desc_tag, head_keywords_tag from " . TABLE_FULL_TAG . " ft, " . TABLE_FULL_TAG_DESCRIPTION . " ftd where ft.tag_id=ftd.tag_id and ft.page_type='page' and ft.page_id = '" . basename($pID). "' and ftd.language_id = '" . (int)$this->languages_id. "' Limit 1";
+ $query=$this->DB->query( $sql );
+ if ($query->__get('numRows')>0) $result =$query->fetchAssoc();
+ else $result['tName'] = $this->strip($pID);
+ $this->get_cache_id($pID,'','DIVERS');
+ $this->performance['QUERIES']['DIVERS'][] = $sql;
- if(self::$htexe)
- $this->transph_header_tag($result);
- $return = $result['tName'];
- break;
+ if(self::$htexe)
+ $this->transph_header_tag($result);
+ $return = $result['tName'];
+ break;
}
return $return;
}
@@ -672,21 +688,21 @@
// private function get_links_name($pID){
switch(true){
case (_test_bool(self::$USE_SEO_CACHE_GLOBAL) && isset($this->cache['LINKS'][$pID]) ):
- $this->performance['CACHE_QUERY_SAVINGS']++;
- $result = $this->get_cache_id($pID,'','LINKS');
- $return = (isset($result['tName'])? $this->strip($result['tName']): $this->strip($pID));
+ $this->performance['CACHE_QUERY_SAVINGS']++;
+ $result = $this->get_cache_id($pID,'','LINKS');
+ $return = (isset($result['tName'])? $this->strip($result['tName']): $this->strip($pID));
if(self::$htexe) $this->transph_header_tag($result);
break;
default:
- $this->performance['NUMBER_QUERIES']++;
- $query=$this->DB->query( "select nav_name as tName, l.nav_link_id as ID from " . TABLE_NAVIGATION_LINKS . " l, " . TABLE_NAVIGATION_LINKS_DESCRIPTION . " ld where l.nav_link_id=ld.nav_link_id l.nav_link_id = '" . $pID. "' and ld.language_id = '" . (int)$this->languages_id. "' Limit 1" );
- if ($query->__get('numRows')>0) $result =$query->fetchAssoc();
- else $result['tName'] = $this->strip($pID);
- $this->get_cache_id($pID,'','LINKS');
- $this->performance['QUERIES']['LINKS'][] = $query;
+ $this->performance['NUMBER_QUERIES']++;
+ $query=$this->DB->query( "select nav_name as tName, l.nav_link_id as ID from " . TABLE_NAVIGATION_LINKS . " l, " . TABLE_NAVIGATION_LINKS_DESCRIPTION . " ld where l.nav_link_id=ld.nav_link_id l.nav_link_id = '" . $pID. "' and ld.language_id = '" . (int)$this->languages_id. "' Limit 1" );
+ if ($query->__get('numRows')>0) $result =$query->fetchAssoc();
+ else $result['tName'] = $this->strip($pID);
+ $this->get_cache_id($pID,'','LINKS');
+ $this->performance['QUERIES']['LINKS'][] = $query;
if(self::$htexe) $this->transph_header_tag($result);
- $return = $result['tName'];
- break;
+ $return = $result['tName'];
+ break;
}
return $return;
}
@@ -721,36 +737,38 @@
private function GetName_p($pID){
// private function get_product_name($pID){
switch(true){
- case (_test_bool(self::$USE_SEO_CACHE_GLOBAL) && isset($this->cache['PRODUCTS'][$pID]) ):
- $this->performance['CACHE_QUERY_SAVINGS']++;
- $result = $this->get_cache_id($pID,'','PRODUCTS');
- $return = (isset($result['tName'])? $this->strip($result['tName']): '');
- if(self::$htexe) $this->transph_header_tag($result);
- break;
+// case (_test_bool(self::$USE_SEO_CACHE_GLOBAL) && isset($this->cache['PRODUCTS'][$pID]) ):
+// $this->performance['CACHE_QUERY_SAVINGS']++;
+// $result = $this->get_cache_id($pID,'','PRODUCTS');
+// $return = (isset($result['tName'])? $this->strip($result['tName']): '');
+// if(self::$htexe) $this->transph_header_tag($result);
+// break;
default:
- $this->performance['NUMBER_QUERIES']++;
- switch(true){
- case (_test_bool($this->attributes['SEO_ADD_CAT_PARENT'])):
- $rsql = $this->DB->query("SELECT products_name as tName, categories_name as cName FROM ".TABLE_PRODUCTS_DESCRIPTION." p LEFT JOIN ".TABLE_PRODUCTS_TO_CATEGORIES." cd2 ON p.products_id=cd2.products_id JOIN ".TABLE_CATEGORIES_DESCRIPTION." cd ON cd.categories_id = cd2.categories_id AND cd.language_id='".(int)$this->languages_id."' WHERE p.products_id='".(int)$pID."' AND p.language_id='".(int)$this->languages_id."' LIMIT 1");
- $result = $rsql->fetchAssoc();
- $cName = $result['cName'];
+ $this->performance['NUMBER_QUERIES']++;
+ switch(true){
+ case (_test_bool($this->attributes['SEO_ADD_CAT_PARENT'])):
- $result['tName']=$result['cName'].'/'.$result['tName'];
- break;
- default:
- $rsql = $this->DB->query("SELECT products_name as tName FROM ".TABLE_PRODUCTS_DESCRIPTION." WHERE products_id='".(int)$pID."' AND language_id='".(int)$this->languages_id."' LIMIT 1");
- $result = $rsql->fetchAssoc();
- $cName = $result['tName'];
- break;
- }
- /*if(!defined('TABLE_FULL_TAG'))*/
- // else $sql = "select head_title_tag as tName, head_desc_tag, head_keywords_tag from " . TABLE_FULL_TAG . " ft, " . TABLE_FULL_TAG_DESCRIPTION . " ftd where ft.tag_id=ftd.tag_id and ft.page_type='product' and ft.page_id = '" . (int)$pID. "' and ftd.language_id = '" . (int)$this->languages_id. "' Limit 1";
-// $result = $this->DB->FetchArray( $this->DB->Query( $sql ) );
- $this->get_cache_id($pID,$result,'PRODUCTS');
- $this->performance['QUERIES']['PRODUCTS'][] = $rsql;
+
+ $rsql = $this->DB->query("SELECT products_name as tName, categories_name as cName FROM ".TABLE_PRODUCTS_DESCRIPTION." p LEFT JOIN ".TABLE_PRODUCTS_TO_CATEGORIES." cd2 ON p.products_id=cd2.products_id JOIN ".TABLE_CATEGORIES_DESCRIPTION." cd ON cd.categories_id = cd2.categories_id AND cd.language_id='".(int)$this->languages_id."' WHERE p.products_id='".(int)$pID."' AND p.language_id='".(int)$this->languages_id."' LIMIT 1");
+ $result = $rsql->fetchAssoc();
+ $cName = $result['cName'];
+
+ $result['tName']=$result['cName'].'-'.$result['tName'];
+ break;
+ default:
+ $rsql = $this->DB->query("SELECT products_name as tName FROM ".TABLE_PRODUCTS_DESCRIPTION." WHERE products_id='".(int)$pID."' AND language_id='".(int)$this->languages_id."' LIMIT 1");
+ $result = $rsql->fetchAssoc();
+ $cName = $result['tName'];
+ break;
+ }
+ /*if(!defined('TABLE_FULL_TAG'))*/
+ // else $sql = "select head_title_tag as tName, head_desc_tag, head_keywords_tag from " . TABLE_FULL_TAG . " ft, " . TABLE_FULL_TAG_DESCRIPTION . " ftd where ft.tag_id=ftd.tag_id and ft.page_type='product' and ft.page_id = '" . (int)$pID. "' and ftd.language_id = '" . (int)$this->languages_id. "' Limit 1";
+// $result = $this->DB->FetchArray( $this->DB->Query( $sql ) );
+ $this->get_cache_id($pID,$result,'PRODUCTS');
+ $this->performance['QUERIES']['PRODUCTS'][] = $rsql;
if(self::$htexe) $this->transph_header_tag($result);
- $return = $this->strip( $result['tName'] );
- break;
+ $return = $this->strip( $result['tName'] );
+ break;
}
return $return;
}
@@ -761,31 +779,41 @@
*/
private function generate_products_cache(){
-// $this->is_cached($this->cache_file . 'products', $is_cached, $is_expired);
-//
-//
-// if ( !$is_cached || $is_expired ) {
- $prod_cache = array();
- $res=$this->DB->query( "select ft.page_id as ID , head_title_tag as tName, head_desc_tag, head_keywords_tag from " . TABLE_FULL_TAG . " ft, " . TABLE_FULL_TAG_DESCRIPTION . " ftd where ft.tag_id=ftd.tag_id and ft.page_type='product' and ftd.language_id = '" . (int)$this->languages_id. "'" );
+ // var_dump($this->attributes['SEO_ADD_CAT_PARENT']);
- while ($result =$res->fetchAssoc()){
- $this->get_cache_id($result['ID'],$result,'PRODUCTS');
+ // $this->is_cached($this->cache_file . 'products', $is_cached, $is_expired);
+ //
+ //
+ // if ( !$is_cached || $is_expired ) {
+ $prod_cache = array();
+ // $res=$this->DB->query( "select ft.page_id as ID , head_title_tag as tName, head_desc_tag, head_keywords_tag from " . TABLE_FULL_TAG . " ft, " . TABLE_FULL_TAG_DESCRIPTION . " ftd where ft.tag_id=ftd.tag_id and ft.page_type='product' and ftd.language_id = '" . (int)$this->languages_id. "'" );
-// $define = 'define(\'PRODUCT_NAME_' . $result['ID'] . '\', \'' . $this->strip( $result['tName']) . '\');';
-// $prod_cache .= $define . "\n";
-// eval("$define");
-// $prod_cache[$result['ID']] = $result;
-// $this->cache['PRODUCTS']
- }
+ if(! _test_bool($this->attributes['SEO_ADD_CAT_PARENT']) )
+ // $res=$this->DB->query( "select ft.page_id as ID , head_title_tag as tName, head_desc_tag, head_keywords_tag, head_url as url from " . TABLE_FULL_TAG . " ft, " . TABLE_FULL_TAG_DESCRIPTION . " ftd where ft.tag_id=ftd.tag_id and ft.page_type='product' and ftd.language_id = '" . (int)$this->languages_id. "'" );
+ $res=$this->DB->query( "select ft.page_id as ID , head_title_tag as tName, head_desc_tag, head_keywords_tag from " . TABLE_FULL_TAG . " ft, " . TABLE_FULL_TAG_DESCRIPTION . " ftd where ft.tag_id=ftd.tag_id and ft.page_type='product' and ftd.language_id = '" . (int)$this->languages_id. "'" );
-// $this->save_cache($this->cache_file . 'products', $prod_cache, 'ARRAY', 1 , 1);
-// }
-// else {
-//
-// $this->get_cache($this->cache_file . 'products');
-// // var_dump($is_cached , $is_expired );
-// // exit;
-// }
+ else
+ // $res=$this->DB->query( $sql="select ft.page_id as ID , head_title_tag as tName, head_desc_tag, head_keywords_tag, head_url as url, cd.categories_cpath from " . TABLE_FULL_TAG . " ft LEFT JOIN ".TABLE_PRODUCTS_TO_CATEGORIES." cd2 ON page_id=cd2.products_id JOIN ".TABLE_CATEGORIES." cd ON cd.categories_id = cd2.categories_id , " . TABLE_FULL_TAG_DESCRIPTION . " ftd where ft.tag_id=ftd.tag_id and ft.page_type='product' and ftd.language_id = '" . (int)$this->languages_id. "'" );
+ $res=$this->DB->query( $sql="SELECT DISTINCT ft.page_id as ID , head_title_tag as tName, head_desc_tag, head_keywords_tag, cd.categories_cpath from " . TABLE_FULL_TAG . " ft LEFT JOIN ".TABLE_PRODUCTS_TO_CATEGORIES." cd2 ON page_id=cd2.products_id JOIN ".TABLE_CATEGORIES." cd ON cd.categories_id = cd2.categories_id , " . TABLE_FULL_TAG_DESCRIPTION . " ftd where ft.tag_id=ftd.tag_id and ft.page_type='product' and ftd.language_id = '" . (int)$this->languages_id. "' GROUP BY ID" );
+ // var_dump($sql);
+
+ while ($result =$res->fetchAssoc()){
+
+ $path = '';
+
+ if(isset($result['categories_cpath']) && !empty($result['categories_cpath'])) {
+ $list = explode('_',$result['categories_cpath']);
+
+ foreach($list as $row )
+ $path .= $this->GetName_c($row).'-';
+ }
+
+ $result['path']= $path . ((isset($result['url']) && !empty($result['url']) )? $result['url'] : $result['tName']) ;
+
+ $this->get_cache_id($result['ID'],$result,'PRODUCTS');
+
+ }
+
}
/**
@@ -801,37 +829,37 @@
$ID=(is_numeric($ID) ?$ID : $this->get_full_cPath($cID, $single_cID));
switch(true){
case (_test_bool(self::$USE_SEO_CACHE_GLOBAL) && isset($this->cache['CATEGORIES'][$ID]) ):
- $this->performance['CACHE_QUERY_SAVINGS']++;
- $result = $this->get_cache_id($ID,'','CATEGORIES');;
- $return = (isset($result['tName'])? $this->strip($result['tName']): '');
+ $this->performance['CACHE_QUERY_SAVINGS']++;
+ $result = $this->get_cache_id($ID,'','CATEGORIES');;
+ $return = (isset($result['tName'])? $this->strip($result['tName']): '');
if(self::$htexe) $this->transph_header_tag($result);
break;
default:
- $this->performance['NUMBER_QUERIES']++;
- switch(true){
- case (_te...
[truncated message content] |
|
From: <os...@us...> - 2011-12-17 17:02:40
|
Revision: 3970
http://oscss.svn.sourceforge.net/oscss/?rev=3970&view=rev
Author: oscim
Date: 2011-12-17 17:02:33 +0000 (Sat, 17 Dec 2011)
Log Message:
-----------
FS#822
suppression des modele de _htaccess devenu obsolete
Modified Paths:
--------------
trunk/catalog/common/classes/seo_url.php
trunk/catalog/includes/filenames.php
Removed Paths:
-------------
trunk/catalog/_.htaccess
trunk/catalog/admin/_.htaccess
Deleted: trunk/catalog/_.htaccess
===================================================================
--- trunk/catalog/_.htaccess 2011-12-17 16:46:41 UTC (rev 3969)
+++ trunk/catalog/_.htaccess 2011-12-17 17:02:33 UTC (rev 3970)
@@ -1,99 +0,0 @@
-# $Id: .htaccess,v 2.0 10.08.2009 18:50:00 oscim Exp $
-# <Directory "/usr/local/apache/htdocs">
-# AllowOverride Options
-# </Directory>
-# The following makes adjustments to the SSL protocol for Internet
-# Explorer browsers
-# <IfModule mod_setenvif.c>
-# <IfDefine SSL>
-# SetEnvIf User-Agent ".*MSIE.*" \
-# nokeepalive ssl-unclean-shutdown \
-# downgrade-1.0 force-response-1.0
-# </IfDefine>
-# </IfModule>
-# Fix certain PHP values
-
-<ifModule mod_expires.c>
- ExpiresActive On
- ExpiresDefault "access plus 1 seconds"
- ExpiresByType text/html "access plus 1 seconds"
- ExpiresByType image/gif "access plus 2592000 seconds"
- ExpiresByType image/jpeg "access plus 2592000 seconds"
- ExpiresByType image/png "access plus 2592000 seconds"
- ExpiresByType text/css "access plus 604800 seconds"
- ExpiresByType text/javascript "access plus 216000 seconds"
- ExpiresByType application/x-javascript "access plus 216000 seconds"
-</ifModule>
-
-<ifModule mod_headers.c>
- <filesMatch "\\.(ico|pdf|flv|jpg|jpeg|png|gif|swf)$">
- Header set Cache-Control "max-age=2592000, public"
- </filesMatch>
- <filesMatch "\\.(css)$">
- Header set Cache-Control "max-age=604800, public"
- </filesMatch>
- <filesMatch "\\.(js)$">
- Header set Cache-Control "max-age=216000, private"
- </filesMatch>
- <filesMatch "\\.(xml|txt)$">
- Header set Cache-Control "max-age=216000, public, must-revalidate"
- </filesMatch>
- <filesMatch "\\.(html|htm|php)$">
- Header set Cache-Control "max-age=1, private, must-revalidate"
- </filesMatch>
-</ifModule>
-
-<IfModule mod_deflate.c>
- AddOutputFilterByType DEFLATE text/css application/javascript application/x-javascript
-</IfModule>
-
-AddDefaultCharset UTF-8
-# FIX
-<IfModule mod_php5.c>
- php_flag register_long_arrays Off
-</IfModule>
-<IfModule mod_rewrite.c>
- RewriteEngine on
- RewriteBase /b2.0.6/
-
- # DEB Sans rewrite, placer des fichier du même nom a la racine
- RewriteRule ^conditions.php$ content.php?_ID=conditions.php&%{QUERY_STRING}
- RewriteRule ^contact.php$ content.php?_ID=contact.php&%{QUERY_STRING}
- RewriteRule ^cookie_usage.php$ content.php?_ID=cookie_usage.php&%{QUERY_STRING}
- RewriteRule ^info_shopping_cart.php$ content.php?_ID=info_shopping_cart.php&%{QUERY_STRING}
- RewriteRule ^tell_a_friend.php$ content.php?_ID=tell_a_friend.php&%{QUERY_STRING}
- RewriteRule ^featured_products.php$ content.php?_ID=featured_products.php&%{QUERY_STRING}
- RewriteRule ^template.php$ content.php?_ID=template.php&%{QUERY_STRING}
- RewriteRule ^privacy.php$ content.php?_ID=privacy.php&%{QUERY_STRING}
- RewriteRule ^listing_best_sellers.php$ content.php?_ID=listing_best_sellers.php&%{QUERY_STRING}
- RewriteRule ^listing_products_new.php$ content.php?_ID=listing_products_new.php&%{QUERY_STRING}
- RewriteRule ^listing_small_price.php$ content.php?_ID=listing_small_price.php&%{QUERY_STRING}
- RewriteRule ^listing_specials.php$ content.php?_ID=listing_specials.php&%{QUERY_STRING}
- RewriteRule ^search_help.php$ content.php?_ID=search_help.php&%{QUERY_STRING}
- RewriteRule ^ssl_check.php$ content.php?_ID=ssl_check.php&%{QUERY_STRING}
- RewriteRule ^shopping_cart.php(.{0,})$ content.php?_ID=shopping_cart.php&%{QUERY_STRING}
- RewriteRule ^shipping.php(.{0,})$ content.php?_ID=shipping.php&%{QUERY_STRING}
- RewriteRule ^sitemap.php$ content.php?_ID=sitemap.php&%{QUERY_STRING}
- RewriteRule ^remove_cart.php$ content.php?_ID=remove_cart.php&%{QUERY_STRING}
- RewriteRule ^product_reviews.php$ content.php?_ID=listing_reviews.php&%{QUERY_STRING}
- RewriteRule ^product_info.php$ index.php?products_id=$2&%{QUERY_STRING}
- RewriteRule ^home.php?(.*)$ index.php?content=$1&%{QUERY_STRING}
- RewriteRule ^account_([a-z_]*).php$ account.php?action=$1&%{QUERY_STRING}
- RewriteRule ^address_([a-z_]*).php$ account.php?aca_mod=address_book&aca_type=account&aca_action=display_view&%{QUERY_STRING}
- # FIN Sans rewrite, placer des fichier du même nom a la racine
- # Prise en charge des appels vers les video
- # RewriteRule ^playlist:([0-9]*)::type:([a-z]*)::pID:([0-9]*)::ext:.flv$ counter.php?action_type=$2&action_class=portfolio&method=counter_media&ppID=$1&products_id=$3 [L]
- # RewriteRule ^playlist:([0-9]*)::type:([a-z]*)::pID:([0-9]*)::ext:.mp3 counter.php?action_type=$2&action_class=portfolio&method=counter_media&ppID=$1&products_id=$3 [L]
- RewriteRule ^(.*)-p-(.*).html$ index.php?products_id=$2&%{QUERY_STRING}
- RewriteRule ^(.*)-c-(.*).html$ index.php?cPath=$2&%{QUERY_STRING}
- RewriteRule ^(.*)-b-(.*).html$ content.php?content=$2&%{QUERY_STRING}
- RewriteRule ^(.*)-m-(.*).html$ index.php?manufacturers_id=$2&%{QUERY_STRING}
- RewriteRule ^(.*)-pi-(.*).html$ popup_image.php?pID=$2&%{QUERY_STRING}
- RewriteRule ^(.*)-t-(.*).html$ content.php?content=$2&%{QUERY_STRING}
- # RewriteRule ^(.*)-pr-(.*).html$ product_reviews.php?products_id=$2&%{QUERY_STRING}
- RewriteRule ^(.*)-pr-(.*).html$ content.php?_ID=listing_reviews.php&products_id=$2&%{QUERY_STRING}
- # RewriteRule ^(.*)-pri-(.*).html$ product_reviews_info.php?products_id=$2&%{QUERY_STRING}
- RewriteRule ^(.*)-i-(.*).html$ information.php?info_id=$2&%{QUERY_STRING}
-
- RewriteRule ^(.*)-d-(.*).html$ $2.php?divers=$2&%{QUERY_STRING}
-</IfModule>
Deleted: trunk/catalog/admin/_.htaccess
===================================================================
--- trunk/catalog/admin/_.htaccess 2011-12-17 16:46:41 UTC (rev 3969)
+++ trunk/catalog/admin/_.htaccess 2011-12-17 17:02:33 UTC (rev 3970)
@@ -1,86 +0,0 @@
-# $Id: .htaccess,v 2.0 10.08.2009 18:50:00 oscim Exp $
-#
-# This is used with Apache WebServers
-# For this to work, you must include the parameter 'Options' to
-# the AllowOverride configuration
-#
-# 'All' with also work. (This configuration is in the
-# apache/conf/httpd.conf file)
-
-# The following makes adjustments to the SSL protocol for Internet
-# Explorer browsers
-
-# <IfModule mod_setenvif.c>
-# <IfDefine SSL>
-# SetEnvIf User-Agent ".*MSIE.*" \
-# nokeepalive ssl-unclean-shutdown \
-# downgrade-1.0 force-response-1.0
-# </IfDefine>
-# </IfModule>
-
-# Fix certain PHP values
-
-
-AddDefaultCharset UTF-8
-
-<ifModule mod_expires.c>
- ExpiresActive On
- ExpiresDefault "access plus 1 seconds"
- ExpiresByType text/html "access plus 1 seconds"
- ExpiresByType image/gif "access plus 2592000 seconds"
- ExpiresByType image/jpeg "access plus 2592000 seconds"
- ExpiresByType image/png "access plus 2592000 seconds"
- ExpiresByType text/css "access plus 604800 seconds"
- ExpiresByType text/javascript "access plus 216000 seconds"
- ExpiresByType application/x-javascript "access plus 216000 seconds"
-</ifModule>
-
-<ifModule mod_headers.c>
- <filesMatch "\\.(ico|pdf|flv|jpg|jpeg|png|gif|swf)$">
- Header set Cache-Control "max-age=2592000, public"
- </filesMatch>
- <filesMatch "\\.(css)$">
- Header set Cache-Control "max-age=604800, public"
- </filesMatch>
- <filesMatch "\\.(js)$">
- Header set Cache-Control "max-age=216000, private"
- </filesMatch>
- <filesMatch "\\.(xml|txt)$">
- Header set Cache-Control "max-age=216000, public, must-revalidate"
- </filesMatch>
- <filesMatch "\\.(html|htm|php)$">
- Header set Cache-Control "max-age=1, private, must-revalidate"
- </filesMatch>
-</ifModule>
-
-<IfModule mod_deflate.c>
- AddOutputFilterByType DEFLATE text/css application/javascript application/x-javascript
-</IfModule>
-
-# FIX
-<IfModule mod_php5.c>
- php_flag register_long_arrays On
-</IfModule>
-
-<IfModule mod_rewrite.c>
- RewriteEngine on
- RewriteBase /admin
-
- RewriteRule ^$ index.php?page_admin=index [L]
- RewriteRule ^rss.php rss.php?%{QUERY_STRING} [L]
-
- RewriteRule ^attributeManager/attributeManager/(.*)$ attributeManager/$1 [L]
- RewriteRule ^(attributeManager/.*)$ $1 [L]
- RewriteRule (.*plugins/.*)$ $1 [L]
- RewriteRule (.*editeur/.*)$ $1 [L]
- RewriteRule (.*template/.*)$ $1 [L]
- RewriteRule (.*images/.*)$ $1 [L]
- RewriteRule (.*includes/.*)$ $1 [L]
- RewriteRule (.*\.css)$ $1[L]
- RewriteRule (.*logoff\.ph.*)$ $1 [L]
- RewriteRule (.*login\.ph.*)$ $1 [L]
- RewriteRule (.*password_forgotten\.ph.*)$ $1 [L]
- RewriteRule (.*popup_image\.ph.*)$ $1 [L]
- RewriteRule (.*login\.ph.*)$ $1 [L]
- RewriteRule ([0-9A-Za-z_&=-]*)(.php)?(.*)$ index.php?page_admin=$1&%{QUERY_STRING} [L]
-</IfModule>
\ No newline at end of file
Modified: trunk/catalog/common/classes/seo_url.php
===================================================================
--- trunk/catalog/common/classes/seo_url.php 2011-12-17 16:46:41 UTC (rev 3969)
+++ trunk/catalog/common/classes/seo_url.php 2011-12-17 17:02:33 UTC (rev 3970)
@@ -154,7 +154,7 @@
* @param $languages_id integer
*/
private function __construct($languages_id){
- global $session_started, $SID;
+ global $session_started, $SID,$seo_pages;
$this->DB= Database::getInstance();
@@ -166,24 +166,7 @@
/// liaison header_tag
$this->header_tag=array();
-//ojp FILENAME_LINKS
- $seo_pages=array(
- FILENAME_DEFAULT,
- FILENAME_POPUP_IMAGE,
- FILENAME_PRODUCT_INFO,
- FILENAME_CONTENT,
- FILENAME_ADVANCED_SEARCH,
- FILENAME_PRODUCTS_NEW,
- FILENAME_SMALL_PRICE,
- FILENAME_SPECIALS,
- FILENAME_BEST_SELLERS,
- FILENAME_SITEMAP,
-// FILENAME_HOME,
- FILENAME_TEMPLATE,
- FILENAME_CONTACT_US,
- FILENAME_SHOPPING_CART
- );
- if ( defined('FILENAME_LINKS') ) $seo_pages[] = FILENAME_LINKS;
+ $seo_pages[] = FILENAME_DEFAULT;
$this->attributes = array(
Modified: trunk/catalog/includes/filenames.php
===================================================================
--- trunk/catalog/includes/filenames.php 2011-12-17 16:46:41 UTC (rev 3969)
+++ trunk/catalog/includes/filenames.php 2011-12-17 17:02:33 UTC (rev 3970)
@@ -8,6 +8,9 @@
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
+
+ define('FILENAME_DEFAULT', 'index.php');
+
// define the filenames used in the project
define('FILENAME_AJAX', 'ajax_exe.php');
define('FILENAME_ACCOUNT', 'account.php');
@@ -31,11 +34,11 @@
define('FILENAME_CHECKOUT_SUCCESS', 'checkout_success.php');
define('FILENAME_CONTACT_US', 'contact.php');
- define('FILENAME_CONTENT', 'content.php');
+
define('FILENAME_COOKIE_USAGE', 'cookie_usage.php');
define('FILENAME_CREATE_ACCOUNT', 'create_account.php');
define('FILENAME_CREATE_ACCOUNT_SUCCESS', 'create_account_success.php');
- define('FILENAME_DEFAULT', 'index.php');
+
define('FILENAME_DOWNLOAD', 'download.php');
define('FILENAME_INFO_SHOPPING_CART', 'info_shopping_cart.php');
define('FILENAME_HOME', 'home.php');
@@ -45,7 +48,6 @@
define('FILENAME_POPUP_IMAGE', 'popup_image.php');
define('FILENAME_PRINT_CATALOG', 'print_catalog.php');
- define('FILENAME_PRODUCT_INFO', 'product_info.php');
define('FILENAME_PRODUCT_LISTING', 'product_listing.php');
define('FILENAME_NEW_PRODUCTS', 'new_products.php');
@@ -54,11 +56,10 @@
define('FILENAME_SEARCH_HELP', 'search_help.php');
define('FILENAME_SHIPPING', 'shipping.php');
- define('FILENAME_SHOPPING_CART', 'shopping_cart.php');
+
define('FILENAME_SPECIALS', 'listing_specials.php');
define('FILENAME_SSL_CHECK', 'ssl_check.php');
define('FILENAME_TELL_A_FRIEND', 'tell_a_friend.php');
-
define('TEMPLATE_FILE', 'template.php');
define('FILENAME_UPCOMING_PRODUCTS', 'upcoming_products.php');
define('FILENAME_SMALL_PRICE', 'listing_small_price.php');
@@ -72,8 +73,13 @@
/* One Page Checkout - BEGIN */
define('FILENAME_CHECKOUT', 'checkout.php');
-/* One Page Checkout - END */
+ /* Retrocompatibilite */
+ define('FILENAME_CONTENT', FILENAME_DEFAULT);
+ define('FILENAME_PRODUCT_INFO', FILENAME_DEFAULT);
+ define('FILENAME_SHOPPING_CART', FILENAME_DEFAULT);
+
+
/**
@var File for register user
Add name for contraint login in table_file_modules.php
@@ -90,4 +96,26 @@
FILENAME_LOGIN,
FILENAME_PASSWORD_FORGOTTEN
);
+
+ /**
+ @var File for register SEO
+ Add name for seo url in table_file_modules.php
+ */
+
+ $seo_pages=array(
+ FILENAME_DEFAULT,
+ FILENAME_POPUP_IMAGE,
+// FILENAME_PRODUCT_INFO,
+// FILENAME_CONTENT,
+ FILENAME_ADVANCED_SEARCH,
+ FILENAME_PRODUCTS_NEW,
+ FILENAME_SMALL_PRICE,
+ FILENAME_SPECIALS,
+ FILENAME_BEST_SELLERS,
+ FILENAME_SITEMAP,
+// FILENAME_HOME,
+ FILENAME_TEMPLATE,
+ FILENAME_CONTACT_US,
+ FILENAME_SHOPPING_CART
+ );
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-12-18 11:35:22
|
Revision: 3971
http://oscss.svn.sourceforge.net/oscss/?rev=3971&view=rev
Author: oscim
Date: 2011-12-18 11:35:15 +0000 (Sun, 18 Dec 2011)
Log Message:
-----------
FS#929
report usage light html for row status in newslettersModeles listing page
Modified Paths:
--------------
trunk/catalog/admin/includes/modules/pages/newslettersModeles.php
trunk/catalog/includes/classes/core_page/develop.php
trunk/catalog/includes/functions/general.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css
trunk/catalog/install/data/templates/appareil_photo/electronix/sample.css
Modified: trunk/catalog/admin/includes/modules/pages/newslettersModeles.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/newslettersModeles.php 2011-12-17 17:02:33 UTC (rev 3970)
+++ trunk/catalog/admin/includes/modules/pages/newslettersModeles.php 2011-12-18 11:35:15 UTC (rev 3971)
@@ -3,8 +3,8 @@
@licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 20/03/11, 20:48
+ @version 2.1.1
+ @date 17/12/11, 20:48
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class newslettersModeles
@@ -219,11 +219,16 @@
private static function get_item_status($newslettersModeles){
- if ($newslettersModeles['status'] == '1')
- return tep_image(DIR_WS_ICONS . 'icon_status_green.gif', IMAGE_ICON_STATUS_GREEN) . ' <a href="' . tep_href_link(self::FILENAME, 'action=setflag&flag=0&nID=' .$newslettersModeles['nmodele_id']) . '">' . tep_image(DIR_WS_ICONS . 'icon_status_red_light.gif', IMAGE_ICON_STATUS_RED_LIGHT) . '</a>';
- else
- return '<a href="' . tep_href_link(self::FILENAME, 'action=setflag&flag=1&nID=' . $newslettersModeles['nmodele_id'] ) . '">' . tep_image(DIR_WS_ICONS . 'icon_status_green_light.gif', IMAGE_ICON_STATUS_GREEN_LIGHT) . '</a> ' . tep_image(DIR_WS_ICONS . 'icon_status_red.gif', IMAGE_ICON_STATUS_RED);
+ $exclude=array('action','nID','forceajax','type','class','function','funct', 'mod');
+ $query_s='action=setflag&nID=' . $newslettersModeles['nmodele_id'].'&flag=';
+ return '<a href="' . tep_href_link(self::FILENAME, tep_get_all_get_params($exclude).$query_s.(($newslettersModeles['status'] == '1')? '0' : '1') ) . '">'.
+ sprintf(
+ CsrtAction::getFormat('row_flag'),
+ (int)$newslettersModeles['status'],
+ ( ($newslettersModeles['status'] == '1')? IMAGE_ICON_STATUS_GREEN : IMAGE_ICON_STATUS_RED)
+ ).
+ '</a>';
}
Modified: trunk/catalog/includes/classes/core_page/develop.php
===================================================================
--- trunk/catalog/includes/classes/core_page/develop.php 2011-12-17 17:02:33 UTC (rev 3970)
+++ trunk/catalog/includes/classes/core_page/develop.php 2011-12-18 11:35:15 UTC (rev 3971)
@@ -19,52 +19,115 @@
public function draw_block(){
error_reporting(0);
global $page;
- $li='';
+
+
+ /// list All mod no type
reset($page->page['modules']);
+ $li='This list load module no type in current page'.
+ '<ul>';
while($r=each($page->page['modules'])){
if($r['key'] !='list' && $r['key'] !='sort'){
-// ;
while($b=each($r['value'])){
$tab=$page->oscss_modules->_return($b['key']);
- $li .='<a href="#" title="'
- ."\n".'-- class de boite:'.$r['key']
- ."\n".'-- name: '.$tab['name']
- ."\n".'-- path: '.$tab['path']
- ."\n".'-- dir_lang: '.$tab['dir_lang']
- .'">(i)</a> '.$tab['name_clean'].' '
- ."<br /><span></span>";
+ $li .='<li><h5>'.$tab['name_clean'].' </h5> '
+ .'<ul>'
+ .'<li>-- class de boite:'.$r['key'] . '</li>'
+ .'<li>-- name: '.$tab['name'] . '</li>'
+ .'<li>-- path: '.$tab['path'] . '</li>'
+ .'<li>-- dir_lang: '.$tab['dir_lang'] . '</li>'
+ .'</ul>'
+ ."</li>";
}
}
}
+ $li.='</ul>';
- $p_li='';
+
+ /// list all plugins
+ $p_li='This list load plugins in current page'.
+ '<ul>';
reset($page->page['plugins']);
if(isset($page->page['plugins']['actif']) && is_array($page->page['plugins']['actif']))
while($r=each($page->page['plugins']['actif'])){
- $p_li .=$r['value'].', '."<br /><span></span>";
+ $p_li .='<li><h5>'.$r['value'].'</h5>'
+ .'</li>';
}
- $c_li='';
+ $p_li.='';
+ /// list all boxes
reset($page->page['boxes']);
+ $c_li='This list load boxes in current page'.
+ '<ul>';
while($r=each($page->page['boxes'])){
$b=each($r['value']);
- $c_li .='<a href="#" title="'
- ."\n".'-- class de boite:'.$r['key']
- .'">(i)</a> '.$b['key'].' <a href="#" title="'.'">(i)</a>'."<br /><span></span>";
+ $c_li .='<li><h5>'.$b['key'].'</h5>'
+ .'<ul>'
+ .'<li>-- class de boite:'.$r['key'].'</li>'
+ .'</ul></li>';
}
- print '<div id="develop">'.
- '<h4>obj page <a href="#" title="Pour desactiver ce mode, editer le fichier header.php de votre theme est commenté la ligne :: $this->add_var_page(\'develop\',\'true\'); ">(i)</a></h4>'.
- '<p><span>language:</span> '.$page->page['language'].'</p>'.
- '<p><span>type:</span> '.$page->page['type'].'</p>'.
- '<p><span>Script : <a href="#" title="page racine">(i)</a></span> '.$page->page['script'].'</p>'.
- '<p><span>Content: <a href="#" title="le contenu principal de la page ne cours">(i)</a></span> <a href="#" title="'.@$page->page['path_content'].'">(i)</a>'.@$page->page['content'].'</p>'.
- '<p><span>Module:</span> '.$li.'</p>'.
- '<p><span>Boxes <a href="#" title="'._('boite(s) chargée(s)').'">(i)</a>:</span> '.$c_li.'</p>'.
- '<p><span>Plugin (std):</span> '.$p_li.'</p>'.
- '<p><span>Gabarit:</span> '. $page->page['gabarit'].'</p>'.
- '<p><span>template: </span>'.$page->page['template'].'</p>';
+ $c_li.='</ul>';
+
+ /// list all plugins
+ $gabartis_li='This list load all gabarits files (.gab) in current page'.
+ '<ul>';
+ reset($page->page['file_gabarits']);
+ if(isset($page->page['file_gabarits']))
+ foreach($page->page['file_gabarits'] as $value){
+ $gabartis_li .='<li><h5>'.$value.'</h5>'
+ .'</li>';
+ }
+ $gabartis_li.='';
+
+
+ print '<div id="develop" class="develop">'.
+ '<h4>obj page <a href="#" title="For close this info edit cfg/init.php and comment this line :: $this->add_var_page(\'develop\',\'true\'); ">(i)</a></h4>'.
+ '<p><span style="font-weight:bold;">Theme: </span>'.$page->page['template'].'</p>'.
+ '<p><span style="font-weight:bold;">Language:</span> '.$page->page['language'].'</p>'.
+ '<p><span style="font-weight:bold;">Type:</span> '.$page->page['type'].'</p>'.
+ '<p><span style="font-weight:bold;">Script : <a href="#" title="page racine">(i)</a></span> '.$page->page['script'].'</p>'.
+ '<p><span style="font-weight:bold;">Content: <a href="#" title="le contenu principal de la page ne cours">(i)</a></span> <a href="#" title="'.@$page->page['path_content'].'">(i)</a>'.@$page->page['content'].'</p>'.
+ '<p><span style="font-weight:bold;">Gabarit:</span> '. $page->page['gabarit'].'</p>'.
+
+ '<p><span style="font-weight:bold;">Module No type:</span> <a href="#" onclick="ViewData(\'ModNoType\');return false; " > View </a> </p>'.
+ '<p><span style="font-weight:bold;">Boxes <a href="#" title="'._('boite(s) chargée(s)').'">(i)</a>:</span><a href="#" onclick="ViewData(\'BoxAll\'); return false;" > View </a></p>'.
+ '<p><span style="font-weight:bold;">Plugin (std):</span><a href="#" onclick="ViewData(\'Plugins\');return false; " > View </a></p>'.
+ '<p><span style="font-weight:bold;">Gabarit file .gab :</span><a href="#" onclick="ViewData(\'Gabartis\');return false; " > View </a></p>'.
+ ''
+ ;
// print '<p><span>Erreur(s): </span><a href="#retour_erreur">'.$page->page->messageStack->size('error').'</a></p>';
print '</div>';
+
+ print '<div id="view-box" class="develop">'.
+ ' <div id="DevTopbar">Develop Box infos <a href="#" onclick="CloseBoxDev(); return false;">X</a></div>'.
+ ' <div id="ModNoType" class="TextDevelop">'.$li .'</div>'.
+ ' <div id="BoxAll" class="TextDevelop">'.$c_li .'</div>'.
+ ' <div id="Plugins" class="TextDevelop">'.$p_li .'</div>'.
+ ' <div id="Gabartis" class="TextDevelop">'.$gabartis_li .'</div>'.
+ '</div>';
+
+
+ ?>
+<script type="text/javascript">
+ $().ready(function() {
+ $("#view-box, div.TextDevelop").hide();
+ });
+
+ function ViewData(type) {
+ var newtype ="#"+type;
+
+ $("div.TextDevelop").hide();
+ $("#view-box").show();
+ $(newtype).show();
+
+
+ }
+
+ function CloseBoxDev(){
+ $("#view-box").hide();
+ }
+
+</script>
+ <?php
}
}
?>
\ No newline at end of file
Modified: trunk/catalog/includes/functions/general.php
===================================================================
--- trunk/catalog/includes/functions/general.php 2011-12-17 17:02:33 UTC (rev 3970)
+++ trunk/catalog/includes/functions/general.php 2011-12-18 11:35:15 UTC (rev 3971)
@@ -1047,7 +1047,17 @@
include $file;
$contents = ob_get_contents();
ob_end_clean();
- return $contents;
+
+ if($page->GetVar('develop') == true) {
+
+ $page->page['file_gabarits'][] = $file;
+
+ return '<!-- DEVELOP DEB '.$file.' -->'."\n".
+ $contents.
+ "\n".'<!-- DEVELOP END '.$file.' -->';
+ }
+ else
+ return $contents;
}
return false;
}
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css 2011-12-17 17:02:33 UTC (rev 3970)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css 2011-12-18 11:35:15 UTC (rev 3971)
@@ -49,7 +49,7 @@
-/* Block debugg public template */
+/* DEB Block debugg public template */
#develop{
opacity:0.4;
filter:alpha(opacity=40); /* For IE8 and earlier */
@@ -64,7 +64,19 @@
}
#develop p {padding:0; margin:0;}
+#view-box {
+ position:absolute;
+ top:25%;
+ left:25%;
+ width:50%;
+ height:50%;
+ background:white;
+ border:2px solid black;
+}
+#view-box #DevTopbar {width:100%; height:25px; background:black; color:white;}
+#view-box #DevTopbar a{text-align:right; font-size:20px; color:white; float: right;}
+/* END Block debugg public template */
@@ -82,6 +94,8 @@
+
+
/* --------------------- Css theme ---------------------*/
Modified: trunk/catalog/install/data/templates/appareil_photo/electronix/sample.css
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/electronix/sample.css 2011-12-17 17:02:33 UTC (rev 3970)
+++ trunk/catalog/install/data/templates/appareil_photo/electronix/sample.css 2011-12-18 11:35:15 UTC (rev 3971)
@@ -794,5 +794,31 @@
-/* Block debugg template */
-#develop{background:white none repeat scroll 0 0; border:1px solid black; padding:1em; position:fixed; right:0; top:0;}
\ No newline at end of file
+/* DEB Block debugg public template */
+#develop{
+ opacity:0.4;
+ filter:alpha(opacity=40); /* For IE8 and earlier */
+ color:black;
+ line-height:17px;
+ background:white none repeat scroll 0 0
+ ; border:1px solid black;
+ padding:1em;
+ position:fixed;
+ right:0;
+ top:0;
+}
+#develop p {padding:0; margin:0;}
+
+#view-box {
+ position:absolute;
+ top:25%;
+ left:25%;
+ width:50%;
+ height:50%;
+ background:white;
+ border:2px solid black;
+}
+#view-box #DevTopbar {width:100%; height:25px; background:black; color:white;}
+#view-box #DevTopbar a{text-align:right; font-size:20px; color:white; float: right;}
+
+/* END Block debugg public template */
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-12-18 18:03:46
|
Revision: 3972
http://oscss.svn.sourceforge.net/oscss/?rev=3972&view=rev
Author: oscim
Date: 2011-12-18 18:03:39 +0000 (Sun, 18 Dec 2011)
Log Message:
-----------
Nombreuse correction d'erreur de notice php
Optimisation du code php du template 2cShopHtml5, et diminution du nombre d'appel au fonction tep_href_link, precalcul?\195?\169 par les driver de data
correction coquille logique sur index
modification de la recuperation des elements de meta keywords, title , description
developpement et amelioration du block frontend de dev
Report de l'ensemble jaavscript / css du block develop dans la class du m?\195?\170me nom, et suppression de leur reference dans les theme public
Ajustement de class pour recuperation des elements dans la class de develop
Modified Paths:
--------------
trunk/catalog/common/classes/seo_url.php
trunk/catalog/includes/application_bottom.php
trunk/catalog/includes/classes/core_page/develop.php
trunk/catalog/includes/classes/drivers/data/categorie.php
trunk/catalog/includes/classes/drivers/data/content.php
trunk/catalog/includes/classes/drivers/data/product.php
trunk/catalog/includes/classes/drivers/page/GabaritTemplate.php
trunk/catalog/includes/classes/messageStack.php
trunk/catalog/includes/classes/osC_ErrorHandler.php
trunk/catalog/includes/classes/page.php
trunk/catalog/includes/functions/general.php
trunk/catalog/index.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/header.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/module.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/product_info.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/template.php
trunk/catalog/install/data/templates/appareil_photo/electronix/sample.css
Modified: trunk/catalog/common/classes/seo_url.php
===================================================================
--- trunk/catalog/common/classes/seo_url.php 2011-12-18 11:35:15 UTC (rev 3971)
+++ trunk/catalog/common/classes/seo_url.php 2011-12-18 18:03:39 UTC (rev 3972)
@@ -559,6 +559,8 @@
if( _test_bool($this->attributes['SEO_ADD_CPATH_TO_URLS']) && !in_array($anchor_type, array('cPath' , 'divers')) )
$cpath = (isset($_GET['cPath'])? $this->reg_anchors['cPath'].'-'. tep_sanitize_request($_GET['cPath']) .'-': '');
+ else
+ $cpath = '';
return sprintf(
$this->reg_mask[self::$SEO_REWRITE_TYPE],
Modified: trunk/catalog/includes/application_bottom.php
===================================================================
--- trunk/catalog/includes/application_bottom.php 2011-12-18 11:35:15 UTC (rev 3971)
+++ trunk/catalog/includes/application_bottom.php 2011-12-18 18:03:39 UTC (rev 3972)
@@ -42,7 +42,7 @@
}
if(OSCSS_GARBAGE_ERROR == true) {
- if(OSCSS_DEBUG==true && $mock->is_count()) echo $mock->show();
+// if(OSCSS_DEBUG==true && $mock->is_count()) echo $mock->show();
//! close Handler
osC_ErrorHandler::stop();
Modified: trunk/catalog/includes/classes/core_page/develop.php
===================================================================
--- trunk/catalog/includes/classes/core_page/develop.php 2011-12-18 11:35:15 UTC (rev 3971)
+++ trunk/catalog/includes/classes/core_page/develop.php 2011-12-18 18:03:39 UTC (rev 3972)
@@ -18,7 +18,7 @@
public function draw_block(){
error_reporting(0);
- global $page;
+ global $page,$mock;
/// list All mod no type
@@ -76,37 +76,121 @@
$gabartis_li .='<li><h5>'.$value.'</h5>'
.'</li>';
}
- $gabartis_li.='';
+ $gabartis_li.='</ul>';
+ $phperrors ='This list php errors in current page. this errors is not visible and is for debugg solution'.
+ '<table>';
+ if(OSCSS_GARBAGE_ERROR == true)
+ if(OSCSS_DEBUG==true && $mock->is_count()){
+ foreach($mock->Get() as $k=>$value){
+ $phperrors .='<tr><td>'.$k.'</td><td>'.$value.''.'</td></tr>';
+ }
+ }
+ $phperrors.='</table>';
+
+ $MenuBox ='<ul>'.
+'<li><a href="#" onclick="ViewData(\'NormalInfo\');return false; " > Normal Info </a></li>'.
+'<li><a href="#" onclick="ViewData(\'ModNoType\');return false; " > Module No type </a></li>'.
+'<li><a href="#" onclick="ViewData(\'BoxAll\');return false; " > Boxes </a></li>'.
+'<li><a href="#" onclick="ViewData(\'Gabartis\');return false; " > Files (.gab) </a></li>'.
+'<li><a href="#" onclick="ViewData(\'Plugins\');return false; " > Plugins </a></li>'.
+'<li><a href="#" onclick="ViewData(\'Errors\');return false; " > Errors </a></li>'.
+'<li><a href="#" onclick="ViewData(\'CoreAlert\');return false; " > Core Alerts </a></li>'.
+'</ul>';
+
+$InfoBox .=''
+ . '<p><span style="font-weight:bold;">Current language :</span> '.$page->page['language'].'</p>'
+ .'<p><span style="font-weight:bold;">Current type page :</span> '.$page->page['type'].'</p>'
+ .'<p><span style="font-weight:bold;">Current type classes page :</span> '.$page->page['class'].'</p>'
+.'';
+
+
print '<div id="develop" class="develop">'.
- '<h4>obj page <a href="#" title="For close this info edit cfg/init.php and comment this line :: $this->add_var_page(\'develop\',\'true\'); ">(i)</a></h4>'.
+ '<h4>Frontend Develop Menu - <a href="#" onclick="ViewData(\'Help\');return false; " title="view detail">(help)</a></h4>'.
+ '<p> <a href="#" onclick="ViewData(\'NormalInfo\');return false; " title="view detail"> Box Dev Info </a> '.
+ ( ( ($val = $mock->is_count()) >0 )? '<a style="color:red" href="#" onclick="ViewData(\'Errors\');return false; " title="View Error"> php ('.$val.') </a>' : '' ).
+ '</p>'.
'<p><span style="font-weight:bold;">Theme: </span>'.$page->page['template'].'</p>'.
- '<p><span style="font-weight:bold;">Language:</span> '.$page->page['language'].'</p>'.
- '<p><span style="font-weight:bold;">Type:</span> '.$page->page['type'].'</p>'.
'<p><span style="font-weight:bold;">Script : <a href="#" title="page racine">(i)</a></span> '.$page->page['script'].'</p>'.
'<p><span style="font-weight:bold;">Content: <a href="#" title="le contenu principal de la page ne cours">(i)</a></span> <a href="#" title="'.@$page->page['path_content'].'">(i)</a>'.@$page->page['content'].'</p>'.
'<p><span style="font-weight:bold;">Gabarit:</span> '. $page->page['gabarit'].'</p>'.
- '<p><span style="font-weight:bold;">Module No type:</span> <a href="#" onclick="ViewData(\'ModNoType\');return false; " > View </a> </p>'.
- '<p><span style="font-weight:bold;">Boxes <a href="#" title="'._('boite(s) chargée(s)').'">(i)</a>:</span><a href="#" onclick="ViewData(\'BoxAll\'); return false;" > View </a></p>'.
- '<p><span style="font-weight:bold;">Plugin (std):</span><a href="#" onclick="ViewData(\'Plugins\');return false; " > View </a></p>'.
- '<p><span style="font-weight:bold;">Gabarit file .gab :</span><a href="#" onclick="ViewData(\'Gabartis\');return false; " > View </a></p>'.
- ''
+''
;
-// print '<p><span>Erreur(s): </span><a href="#retour_erreur">'.$page->page->messageStack->size('error').'</a></p>';
print '</div>';
+
+ /// box block use js for draw
print '<div id="view-box" class="develop">'.
- ' <div id="DevTopbar">Develop Box infos <a href="#" onclick="CloseBoxDev(); return false;">X</a></div>'.
+ ' <div id="DevTopbar" class="DevBar">Develop Box infos <a href="#" onclick="CloseBoxDev(); return false;">X</a></div>'.
+ ' <div id="DevBottombar" class="DevBar">'.$MenuBox .'</div>'.
+
+ ' <div id="NormalInfo" class="TextDevelop">'.$InfoBox.'</div>'.
' <div id="ModNoType" class="TextDevelop">'.$li .'</div>'.
' <div id="BoxAll" class="TextDevelop">'.$c_li .'</div>'.
' <div id="Plugins" class="TextDevelop">'.$p_li .'</div>'.
' <div id="Gabartis" class="TextDevelop">'.$gabartis_li .'</div>'.
+
+ ' <div id="CoreAlert" class="TextDevelop"> This list message not called and generated by core '.$page->messageStack->_draw() .'</div>'.
+ ' <div id="Errors" class="TextDevelop">'.$phperrors .'</div>'.
+
+ ' <div id="Help" class="TextDevelop">
+<h5>Help this block develop</h5>
+<p> If you\'r closed this block (and block menu in left window),
+go in file and edit cfg/init.php <br />
+
+search and replace "true" by "false"
+<pre>$this->add_var_page(\'develop\',\'false\');</pre>
+<br />
+
+</p>
+ </div>'.
'</div>';
?>
+<style type="text/css">
+
+/* DEB Block debugg public template */
+ #develop{
+ opacity:0.4;
+ filter:alpha(opacity=40); /* For IE8 and earlier */
+ color:black;
+ line-height:17px;
+ background:white none repeat scroll 0 0
+ ; border:1px solid black;
+ padding:1em;
+ position:fixed;
+ right:0;
+ top:0;
+ }
+ #develop p {padding:0; margin:0;}
+
+ #view-box {
+ position:absolute;
+ top:25%;
+ left:25%;
+ width:50%;
+ height:50%;
+ background:white;
+ border:2px solid black;
+ }
+ #view-box .DevBar {width:100%; height:25px; text-align:center; background:black; color:white;}
+ #view-box .DevBar ul *{display:inline-block;}
+ #view-box #DevTopbar a{text-align:right; font-size:20px; color:white; float: right;padding:2px 5px;}
+ #view-box #DevTopbar a:hover {color:gray;}
+
+ #view-box #DevBottombar {position:relative; bottom:0; }
+ #view-box #DevBottombar ul li {padding:2px 5px; border-left: 1px solid white}
+ #view-box #DevBottombar a {color:white;}
+ #view-box #DevBottombar a:hover {color:gray;}
+ #view-box .TextDevelop {padding:1em;overflow:auto;}
+/* END Block debugg public template */
+
+</style>
+
+
<script type="text/javascript">
$().ready(function() {
$("#view-box, div.TextDevelop").hide();
@@ -115,6 +199,7 @@
function ViewData(type) {
var newtype ="#"+type;
+ $("div#develop").css('opacity', 1); // = 1;
$("div.TextDevelop").hide();
$("#view-box").show();
$(newtype).show();
@@ -124,6 +209,7 @@
function CloseBoxDev(){
$("#view-box").hide();
+ $("div#develop").css('opacity', '0.4');
}
</script>
Modified: trunk/catalog/includes/classes/drivers/data/categorie.php
===================================================================
--- trunk/catalog/includes/classes/drivers/data/categorie.php 2011-12-18 11:35:15 UTC (rev 3971)
+++ trunk/catalog/includes/classes/drivers/data/categorie.php 2011-12-18 18:03:39 UTC (rev 3972)
@@ -164,7 +164,7 @@
if(count(self::$cache)>0 && in_array($content['categories_id'],self::$cache) ) $tabl[$content['categories_id']]=self::$object_data[$content['categories_id']];
elseif (!in_array($content['categories_name'],$exclude)) {
$res=$content;
- $res['href']=tep_href_link(FILENAME_PRODUCT_INFO,'categories_id=' . $content['categories_id'] . '&language=' . $display_lang['code']);
+ $res['href']=tep_href_link(FILENAME_PRODUCT_INFO,'categories_id=' . $content['categories_id'] );
$res['key']=$content['categories_id'];
$res['id']=$content['categories_id'];
$res['title']=$content['categories_name'];
@@ -268,8 +268,8 @@
if (tep_not_null($current_category_id)) {
- $cPath_array = array();
- self::get_parent_categories(&$cPath_array, $current_category_id) ;
+// $cPath_array = array();
+ $cPath_array = self::get_parent_categories($cPath_array, $current_category_id) ;
$cPath_array[] = $current_category_id;
$cPath_new = implode('_', $cPath_array);
}
@@ -361,20 +361,23 @@
* \brief Recursively go through the categories and retreive all parent categories IDs
// TABLES: categories
*/
- public static function get_parent_categories(&$categories, $categories_id) {
+ public static function get_parent_categories($categories, $categories_id) {
- if(!isset(self::$object_data[$categories_id]->parent_array)) {
- $db_list=self::get_query((int)$categories_id);
- foreach($db_list as $cats) {
- if ($cats->parent_id == 0) return true;
- $categories[sizeof($categories)] = $cats->parent_id;
- if ($cats->parent_id != $categories_id) {
- self::get_parent_categories($categories, $cats->parent_id);
- }
- }
-// self::$object_data[$categories_id]->parent_array=$categories;
- } else $categories=self::$object_data[$categories_id]->parent_array;
+ if(!isset(self::$object_data[$categories_id]->parent_array)) {
+ $db_list=self::get_query((int)$categories_id);
+ foreach($db_list as $cats) {
+ if ($cats->parent_id == 0) return true;
+ $categories[sizeof($categories)] = $cats->parent_id;
+ if ($cats->parent_id != $categories_id) {
+ $categories = self::get_parent_categories($categories, $cats->parent_id);
+ }
+ }
+ // self::$object_data[$categories_id]->parent_array=$categories;
+ }
+ else
+ $categories=self::$object_data[$categories_id]->parent_array;
+ return $categories;
// $parent_categories_query = tep_db_query("select parent_id from " . TABLE_CATEGORIES . " where categories_id = '" . (int)$categories_id . "' ");
// while ($parent_categories = tep_db_fetch_array($parent_categories_query)) {
Modified: trunk/catalog/includes/classes/drivers/data/content.php
===================================================================
--- trunk/catalog/includes/classes/drivers/data/content.php 2011-12-18 11:35:15 UTC (rev 3971)
+++ trunk/catalog/includes/classes/drivers/data/content.php 2011-12-18 18:03:39 UTC (rev 3972)
@@ -177,7 +177,7 @@
while ($content = $content_query->fetchAssoc()) {
if (!in_array($content['name'],$exclude)) {
$res=$content;
- $res['href']=tep_href_link(FILENAME_CONTENT,'content=' . $content['id'] );
+ $res['href']=tep_href_link(FILENAME_CONTENT,'content=' . $content['id']);
$res['key']=$content['name'];
$res['original']=$content['text'];
$res['images']=array();
@@ -368,8 +368,8 @@
if (tep_db_num_rows($category_query)) {
$category = tep_db_fetch_array($category_query);
- $categories = array();
- tep_get_parent_categories($categories, $category['categories_id']);
+// $categories = array();
+ $categories = tep_get_parent_categories($categories, $category['categories_id']);
$categories = array_reverse($categories);
Modified: trunk/catalog/includes/classes/drivers/data/product.php
===================================================================
--- trunk/catalog/includes/classes/drivers/data/product.php 2011-12-18 11:35:15 UTC (rev 3971)
+++ trunk/catalog/includes/classes/drivers/data/product.php 2011-12-18 18:03:39 UTC (rev 3972)
@@ -252,7 +252,7 @@
while ($content = $content_query->fetchAssoc()) {
if (!in_array($content['products_name'],$exclude)) {
$product=$content;
- $product['href']=tep_href_link(FILENAME_PRODUCT_INFO,'products_id=' . $content['products_id'] . '&language=' . $display_lang['code']);
+ $product['href']=tep_href_link(FILENAME_PRODUCT_INFO,'products_id=' . $content['products_id'] );
$product['key']=$content['products_id'];
$product['id']=$content['products_id'];
$product['title']=(tep_not_null($content['products_model'])?$content['products_model']:$content['products_name']);
@@ -428,8 +428,8 @@
$cPath = '';
if((int)$products_id ==0 )return false;
if( ($category=self::get_item($products_id)) == false) return false;
- $categories = array();
- tep_get_parent_categories($categories, $category->categories_id);
+// $categories = array();
+ $categories =tep_get_parent_categories($categories, $category->categories_id);
$categories = array_reverse($categories);
$cPath = implode('_', $categories);
Modified: trunk/catalog/includes/classes/drivers/page/GabaritTemplate.php
===================================================================
--- trunk/catalog/includes/classes/drivers/page/GabaritTemplate.php 2011-12-18 11:35:15 UTC (rev 3971)
+++ trunk/catalog/includes/classes/drivers/page/GabaritTemplate.php 2011-12-18 18:03:39 UTC (rev 3972)
@@ -51,11 +51,11 @@
case 'listing_cat':
if (!tep_not_null($page->page['var']['cPath'])) $suffixe='error';
else {
- if(strpos($page->page['var']['cPath'],'_')!=false)
- $suffixe='c_'.substr($page->page['var']['cPath'], 0, strpos($page->page['var']['cPath'],'_')).'.childs';
- else
- $suffixe='c_'.$page->page['var']['cPath'];
- }
+ if(strpos($page->page['var']['cPath'],'_')!=false)
+ $suffixe='c_'.substr($page->page['var']['cPath'], 0, strpos($page->page['var']['cPath'],'_')).'.childs';
+ else
+ $suffixe='c_'.$page->page['var']['cPath'];
+ }
break;
}
$p_red=substr($page->page['content'],0,-4);
@@ -181,11 +181,6 @@
protected static function GetHeader($path='header'){
global $page;
- $the_title = $page->page['the_title'];
- $the_desc = $page->page['the_desc'];
- $the_key_words = $page->page['the_key_words'];
-
-
return $page->getPathTemplate().$path.'.php';
}
Modified: trunk/catalog/includes/classes/messageStack.php
===================================================================
--- trunk/catalog/includes/classes/messageStack.php 2011-12-18 11:35:15 UTC (rev 3971)
+++ trunk/catalog/includes/classes/messageStack.php 2011-12-18 18:03:39 UTC (rev 3972)
@@ -3,8 +3,8 @@
\licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
\portion code Copyright (c) 2002 osCommerce
\package osCSS-2 <www http://www.oscss.org>
- \version 2.1.0
- \date 29/11/10, 11:33
+ \version 2.1.1
+ \date 17/12/10, 11:33
\author oscim <mail aur...@os...> <www http://www.oscim.fr>
\encode UTF-8
\class messageStack
@@ -70,12 +70,12 @@
}
/**
- Sortie des erreur
+ @brief Sortie des erreur
*/
private function output($class) {
$output = '<ul>';
for ($i=0, $n=sizeof($this->messages); $i<$n; $i++) {
- if ($this->messages[$i]['class'] == $class) {
+ if ( (tep_not_null($class) && $this->messages[$i]['class'] == $class) || $class =='' ){
$output .='<li '.$this->messages[$i]['params'].' >'. $this->messages[$i]['text'] .'</li>'."\n";
}
}
@@ -84,7 +84,7 @@
}
/**
- Sortie des erreur inline
+ @brief Sortie des erreur inline
*/
private function output_inline($class, $markup) {
for ($i=0, $n=sizeof($this->messages); $i<$n; $i++) {
@@ -111,22 +111,22 @@
}
/**
- Alias public
+ @brief Alias public
*/
public function _add($class, $message, $type='error'){
return $this->add($class, $message, $type);
}
/**
- Draw erreur
+ @brief Draw erreur
*/
public function _draw($type){
- if ($this->size($type) > 0)
- echo '<div id="retour_erreur" class="messageStack">'. $this->output($type) . '</div>';
+ if ($this->size($type) > 0)
+ echo '<div id="retour_erreur" class="messageStack">'. $this->output($type) . '</div>';
}
/**
- Draw erreur inline
+ @brief Draw erreur inline
*/
public function _draw_inline($type, $markup=''){
if (empty($markup)) {$markup = 'span';}
@@ -135,7 +135,7 @@
}
/**
- Draw number error
+ @brief Draw number error
*/
public function _draw_nbr($type){
print $this->size($type);
Modified: trunk/catalog/includes/classes/osC_ErrorHandler.php
===================================================================
--- trunk/catalog/includes/classes/osC_ErrorHandler.php 2011-12-18 11:35:15 UTC (rev 3971)
+++ trunk/catalog/includes/classes/osC_ErrorHandler.php 2011-12-18 18:03:39 UTC (rev 3972)
@@ -3,8 +3,8 @@
\licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
\portion code Copyright (c) 2002 osCommerce
\package osCSS-2 <www http://www.oscss.org>
- \version 2.1.0
- \date 29/11/10, 11:33
+ \version 2.1.1
+ \date 17/12/11, 11:33
\author oscim <mail aur...@os...> <www http://www.oscim.fr>
\encode UTF-8
\file osC_ErrorHandler.php
@@ -212,6 +212,9 @@
public function is_count() {
return ((count($this->_messages)>0)?true:false);
}
+ public function Get() {
+ return $this->_messages;
+ }
public function show() {
return print_r($this->_messages, true);
}
Modified: trunk/catalog/includes/classes/page.php
===================================================================
--- trunk/catalog/includes/classes/page.php 2011-12-18 11:35:15 UTC (rev 3971)
+++ trunk/catalog/includes/classes/page.php 2011-12-18 18:03:39 UTC (rev 3972)
@@ -419,9 +419,10 @@
$the_title='';
}
- $this->page['the_title']=(tep_not_null($the_title)? $the_title : (tep_not_null($this->title)? $this->title: STORE_NAME));
- $this->page['the_desc']=$the_desc;
- $this->page['the_key_words']=$the_key_words;
+ /// meta tags content for html balise
+ $this->page['meta']['title']=(tep_not_null($the_title)? $the_title : (tep_not_null($this->title)? $this->title: STORE_NAME));
+ $this->page['meta']['description']=$the_desc;
+ $this->page['meta']['keywords']=$the_key_words;
}
@@ -758,8 +759,16 @@
/**
\fn the_title()
\brief Nom de la page
+ \note obsolete / retro-compatibilite utliser GetHtmlMeta()
*/
public function the_title(){ return $this->page['the_title'] ; }
+ /**
+ \fn GetHtmlMeta($type)
+ \brief Call meta tags
+ */
+ public function GetHtmlMeta($type = 'title'){
+ return (in_array($type, $this->page['meta'])) ? $this->page['meta'][$type] : false ;;
+ }
/**
\fn the_script()
Modified: trunk/catalog/includes/functions/general.php
===================================================================
--- trunk/catalog/includes/functions/general.php 2011-12-18 11:35:15 UTC (rev 3971)
+++ trunk/catalog/includes/functions/general.php 2011-12-18 18:03:39 UTC (rev 3972)
@@ -1118,7 +1118,7 @@
function tep_get_path($current_category_id = '',$value=false) {return categorie::get_path($current_category_id,$value); }
function tep_count_products_in_category($category_id, $include_inactive = false){return categorie::get_count_products_in_category($category_id, $include_inactive = false); }
function tep_has_category_subcategories($category_id){return categorie::get_has_category_subcategories($category_id); }
-function tep_get_parent_categories(&$categories, $categories_id) { return categorie::get_parent_categories($categories, $categories_id); }
+function tep_get_parent_categories($categories, $categories_id) { return categorie::get_parent_categories($categories, $categories_id); }
function tep_get_subcategories(&$subcategories_array, $parent_id = 0) { return categorie::get_subcategories($subcategories_array, $parent_id); }
function tep_get_categories($categories_array = '', $parent_id = '0', $indent = '') { return categorie::get_categories($categories_array , $parent_id, $indent); }
Modified: trunk/catalog/index.php
===================================================================
--- trunk/catalog/index.php 2011-12-18 11:35:15 UTC (rev 3971)
+++ trunk/catalog/index.php 2011-12-18 18:03:39 UTC (rev 3972)
@@ -138,7 +138,7 @@
if ($aca_module[$module]->check_action($action) ) {
/** Exe == true */
$aca_module[$module]->after_check_action($action);
- // tep_redirect(tep_href_link(FILENAME_PRODUCT_INFO, tep_get_all_get_params(array('action'))));
+ // tep_redirect(tep_href_link('product_info.php', tep_get_all_get_params(array('action'))));
}
}
@@ -222,7 +222,7 @@
$action=(string)tep_db_prepare_input($_GET['action']);
if ($aca_product->check_action('',$action) ) {
$aca_product->after_check_action('',$action);
- tep_redirect(tep_href_link(FILENAME_PRODUCT_INFO, tep_get_all_get_params(array('action'))));
+ tep_redirect(tep_href_link('product_info.php', tep_get_all_get_params(array('action'))));
}
}
@@ -232,7 +232,7 @@
$page->add_var_page('product_info',$product_info);
$page->title=$product_info['title'];
- $breadcrumb->add($product_info['title'], tep_href_link(FILENAME_PRODUCT_INFO, 'products_id=' . (int)$_GET['products_id'].'&cPath=' . $cPath . ''));
+ $breadcrumb->add($product_info['title'], tep_href_link('product_info.php', 'products_id=' . (int)$_GET['products_id'].'&cPath=' . $cPath . ''));
/**
Incremente nbr de vus du produits
@@ -253,7 +253,7 @@
$recently_viewed = (int)$_GET['products_id'] . ';' . $recently_viewed ;
}
$page->product->pile_img[]=$product_info['products_image'];
- $page_content = $page->force_content(FILENAME_PRODUCT_INFO);
+ $page_content = $page->force_content('product_info.php');
}
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/header.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/header.php 2011-12-18 11:35:15 UTC (rev 3971)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/header.php 2011-12-18 18:03:39 UTC (rev 3972)
@@ -35,12 +35,13 @@
*/
?>
+<!-- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -->
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" <?php echo HTML_PARAMS; ?> >
<head>
- <title><?php echo $page->the_title(); ?></title>
- <meta name="description" content="<?php echo $the_desc ?>" />
- <meta name="keywords" content="<?php echo $the_key_words ?>" />
+ <title><?php echo $page->GetHtmlMeta(); ?></title>
+ <meta name="description" content="<?php echo $page->GetHtmlMeta('description'); ?>" />
+ <meta name="keywords" content="<?php echo $page->GetHtmlMeta('keywords'); ?>" />
<meta http-equiv="content-type" content="text/html; charset=<?php echo CHARSET; ?>" />
<meta name="author" content="oscim"/>
<meta name="reply-to" content="<?php echo HEAD_REPLY_TAG_ALL ?>" />
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/module.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/module.php 2011-12-18 11:35:15 UTC (rev 3971)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/module.php 2011-12-18 18:03:39 UTC (rev 3972)
@@ -48,11 +48,11 @@
<section class="outerblock">
<div class="innerblock">
<?php if ($page->_draw_in_page('PRODUCT_LIST_NAME')) { ?>
- <p class="title product"><?php echo '<a href="' . tep_href_link(FILENAME_PRODUCT_INFO, 'products_id=' . $ele->products_id) . '" title="header=['.$ele->products_name.'] body=[ ] fade=[on]">' . $ele->products_name . '</a>' ;?></p>
+ <p class="title product"><?php echo '<a href="' . $ele->href . '" title="header=['.$ele->products_name.'] body=[ ] fade=[on]">' . $ele->products_name . '</a>' ;?></p>
<?php } ?>
<?php if ($page->_draw_in_page('PRODUCT_LIST_IMAGE')) { ?>
- <p class="img product"><?php echo '<a href="' . tep_href_link(FILENAME_PRODUCT_INFO, 'products_id=' . $ele->products_id) . '" title="header=['.$ele->products_name.'] body=[ ] fade=[on]" >' . tep_image(DIR_WS_IMAGES . @$ele->products_image, $ele->products_name, $page->_conf_value('SMALL_IMAGE_WIDTH'), $page->_conf_value('SMALL_IMAGE_HEIGHT')) . '</a>' ; ?></p>
+ <p class="img product"><?php echo '<a href="' . $ele->href . '" title="header=['.$ele->products_name.'] body=[ ] fade=[on]" >' . tep_image(DIR_WS_IMAGES . @$ele->products_image, $ele->products_name, $page->_conf_value('SMALL_IMAGE_WIDTH'), $page->_conf_value('SMALL_IMAGE_HEIGHT')) . '</a>' ; ?></p>
<?php } ?>
<?php if (tep_not_null($ele->products_price) && $page->_draw_in_page('PRODUCT_LIST_PRICE')) { ?>
@@ -67,7 +67,7 @@
<?php /** @remarks If buy possible and attribute , force choose attribute */ ?>
<?php if (_test_bool($ele->action['buy'] ) && count(product_attribut_info($ele->products_id)) != 0): ?>
- <p><a class="submitBt" href="<?php echo tep_href_link(FILENAME_PRODUCT_INFO,'products_id='.$ele->products_id)?>" ><img border="0" class="left_bt" title="" alt="" src="<?php echo $page->getPathTemplate() ?>images/carticon.png"></a></p>
+ <p><a class="submitBt" href="<?php echo $ele->href ?>" ><img border="0" class="left_bt" title="" alt="" src="<?php echo $page->getPathTemplate() ?>images/carticon.png"></a></p>
<?php /** @remarks If buy possible and attribute */ ?>
@@ -82,7 +82,7 @@
<?php } ?>
- <a class="details prod" href="<?php echo tep_href_link(FILENAME_PRODUCT_INFO, 'products_id=' . $ele->products_id) ?>" title="header=[<?php echo __('view more') ?>] body=[ ] fade=[on]"><?php echo __('more') ?></a>
+ <a class="details prod" href="<?php echo $ele->href ?>" title="header=[<?php echo __('view more') ?>] body=[ ] fade=[on]"><?php echo __('more') ?></a>
</div>
</div>
</section>
@@ -90,7 +90,7 @@
<?php elseif(isset($ele->content_id)) : /** POSTS */ ?>
<dl class="listing contents <?php echo $page->page_content_clean() ?>">
<dt class="listing_s">
- <a id="<?php echo $ele->content_id; ?>" href="<?php echo tep_href_link(FILENAME_CONTENT,'content='.$ele->content_id) ; ?>" ><?php echo $ele->content_title ?></a>
+ <a id="<?php echo $ele->content_id; ?>" href="<?php echo $ele->href ; ?>" ><?php echo $ele->content_title ?></a>
</dt>
</dl>
@@ -99,10 +99,10 @@
<section class="outerblock">
<div class="innerblock">
<p class="title categorie">
- <a href="<?php echo tep_href_link(FILENAME_DEFAULT, 'cPath='.$ele->cPath) ?>"> <?php echo $ele->categories_name ;?></a>
+ <a href="<?php echo $ele->href ?>"> <?php echo $ele->categories_name ;?></a>
</p>
<p class="img categorie">
- <?php echo '<a href="' . tep_href_link(FILENAME_DEFAULT, 'cPath='.$ele->cPath) . '">' . tep_image(DIR_WS_IMAGES . $ele->categories_image, $ele->categories_name, $page->_conf_value('SUBCATEGORY_IMAGE_WIDTH'), $page->_conf_value('SUBCATEGORY_IMAGE_HEIGHT')) . '<br />' . $ele->categories_name . '</a>' ;?>
+ <?php echo '<a href="' . $ele->href. '">' . tep_ima...
[truncated message content] |
Thanks for helping keep SourceForge clean.
X