Menu
▾
▴
oscss-commit
|
From: <os...@us...> - 2011-09-02 08:25:19
|
Revision: 3798
http://oscss.svn.sourceforge.net/oscss/?rev=3798&view=rev
Author: oscim
Date: 2011-09-02 08:25:08 +0000 (Fri, 02 Sep 2011)
Log Message:
-----------
Nettoyage de sfichier de langue, normalisation de l'usage des simple et ou double quote
Modified Paths:
--------------
branches/2.1.0/catalog/includes/languages/fr_FR/404.php
branches/2.1.0/catalog/includes/languages/fr_FR/account.php
branches/2.1.0/catalog/includes/languages/fr_FR/advanced_search.php
branches/2.1.0/catalog/includes/languages/fr_FR/boxes/best_sellers.txt
branches/2.1.0/catalog/includes/languages/fr_FR/boxes/categories.txt
branches/2.1.0/catalog/includes/languages/fr_FR/boxes/categories_dropdown.txt
branches/2.1.0/catalog/includes/languages/fr_FR/boxes/categories_tab_menu.txt
branches/2.1.0/catalog/includes/languages/fr_FR/boxes/checkout_progressbar.txt
branches/2.1.0/catalog/includes/languages/fr_FR/boxes/cms_last_post.txt
branches/2.1.0/catalog/includes/languages/fr_FR/boxes/currencies.txt
branches/2.1.0/catalog/includes/languages/fr_FR/boxes/languages.txt
branches/2.1.0/catalog/includes/languages/fr_FR/boxes/login_box.txt
branches/2.1.0/catalog/includes/languages/fr_FR/boxes/manufacturer_info.txt
branches/2.1.0/catalog/includes/languages/fr_FR/boxes/manufacturers.txt
branches/2.1.0/catalog/includes/languages/fr_FR/boxes/order_history.txt
branches/2.1.0/catalog/includes/languages/fr_FR/boxes/recently_viewed.txt
branches/2.1.0/catalog/includes/languages/fr_FR/boxes/search.txt
branches/2.1.0/catalog/includes/languages/fr_FR/boxes/search_suggest.txt
branches/2.1.0/catalog/includes/languages/fr_FR/boxes/selections.txt
branches/2.1.0/catalog/includes/languages/fr_FR/boxes/shopping_cart.txt
branches/2.1.0/catalog/includes/languages/fr_FR/boxes/shopping_cart_short.txt
branches/2.1.0/catalog/includes/languages/fr_FR/boxes/shopping_cart_short_ajax.txt
branches/2.1.0/catalog/includes/languages/fr_FR/boxes/specials.txt
branches/2.1.0/catalog/includes/languages/fr_FR/boxes/tell_a_friend.txt
branches/2.1.0/catalog/includes/languages/fr_FR/boxes/very_viewed.txt
branches/2.1.0/catalog/includes/languages/fr_FR/boxes/whats_new.txt
branches/2.1.0/catalog/includes/languages/fr_FR/checkout_confirmation.php
branches/2.1.0/catalog/includes/languages/fr_FR/checkout_payment.php
branches/2.1.0/catalog/includes/languages/fr_FR/checkout_payment_address.php
branches/2.1.0/catalog/includes/languages/fr_FR/checkout_process.php
branches/2.1.0/catalog/includes/languages/fr_FR/checkout_shipping.php
branches/2.1.0/catalog/includes/languages/fr_FR/checkout_shipping_address.php
branches/2.1.0/catalog/includes/languages/fr_FR/checkout_success.php
branches/2.1.0/catalog/includes/languages/fr_FR/contact.php
branches/2.1.0/catalog/includes/languages/fr_FR/contact_us.php
branches/2.1.0/catalog/includes/languages/fr_FR/cookie_usage.php
branches/2.1.0/catalog/includes/languages/fr_FR/create_account.php
branches/2.1.0/catalog/includes/languages/fr_FR/create_account_success.php
branches/2.1.0/catalog/includes/languages/fr_FR/customers.php
branches/2.1.0/catalog/includes/languages/fr_FR/featured_products.php
branches/2.1.0/catalog/includes/languages/fr_FR/fr_FR.php
branches/2.1.0/catalog/includes/languages/fr_FR/home.php
branches/2.1.0/catalog/includes/languages/fr_FR/index.php
branches/2.1.0/catalog/includes/languages/fr_FR/info_shopping_cart.php
branches/2.1.0/catalog/includes/languages/fr_FR/listing_best_sellers.php
branches/2.1.0/catalog/includes/languages/fr_FR/listing_products_new.php
branches/2.1.0/catalog/includes/languages/fr_FR/listing_small_price.php
branches/2.1.0/catalog/includes/languages/fr_FR/listing_specials.php
branches/2.1.0/catalog/includes/languages/fr_FR/login.php
branches/2.1.0/catalog/includes/languages/fr_FR/logoff.php
branches/2.1.0/catalog/includes/languages/fr_FR/modules/account/address_book.txt
branches/2.1.0/catalog/includes/languages/fr_FR/modules/also_purchased_products.php
branches/2.1.0/catalog/includes/languages/fr_FR/modules/new_products.txt
branches/2.1.0/catalog/includes/languages/fr_FR/modules/order_total/ot_shipping.php
branches/2.1.0/catalog/includes/languages/fr_FR/modules/order_total/ot_subtotal.txt
branches/2.1.0/catalog/includes/languages/fr_FR/modules/order_total/ot_tax.txt
branches/2.1.0/catalog/includes/languages/fr_FR/modules/order_total/ot_total.txt
branches/2.1.0/catalog/includes/languages/fr_FR/modules/payment/cod.php
branches/2.1.0/catalog/includes/languages/fr_FR/modules/payment/moneyorder.txt
branches/2.1.0/catalog/includes/languages/fr_FR/modules/products/desc_base.txt
branches/2.1.0/catalog/includes/languages/fr_FR/modules/shipping/flat.txt
branches/2.1.0/catalog/includes/languages/fr_FR/modules/shipping/item.txt
branches/2.1.0/catalog/includes/languages/fr_FR/modules/shipping/mzmt.txt
branches/2.1.0/catalog/includes/languages/fr_FR/modules/shipping/spu.txt
branches/2.1.0/catalog/includes/languages/fr_FR/modules/template_email/checkout_process.txt
branches/2.1.0/catalog/includes/languages/fr_FR/modules/template_email/create_account.txt
branches/2.1.0/catalog/includes/languages/fr_FR/modules/template_email/create_account_confirm.txt
branches/2.1.0/catalog/includes/languages/fr_FR/modules/template_email/defaut.txt
branches/2.1.0/catalog/includes/languages/fr_FR/modules/template_email/orders.txt
branches/2.1.0/catalog/includes/languages/fr_FR/modules/template_email/password_forgotten.txt
branches/2.1.0/catalog/includes/languages/fr_FR/modules/upcoming_products.txt
branches/2.1.0/catalog/includes/languages/fr_FR/new_sent_email_confirm.php
branches/2.1.0/catalog/includes/languages/fr_FR/password_forgotten.php
branches/2.1.0/catalog/includes/languages/fr_FR/product_info.php
branches/2.1.0/catalog/includes/languages/fr_FR/rss/categories.php
branches/2.1.0/catalog/includes/languages/fr_FR/rss/child_cat.php
branches/2.1.0/catalog/includes/languages/fr_FR/rss/feeds.php
branches/2.1.0/catalog/includes/languages/fr_FR/rss/manufacturers.php
branches/2.1.0/catalog/includes/languages/fr_FR/rss/specials.php
branches/2.1.0/catalog/includes/languages/fr_FR/rss.php
branches/2.1.0/catalog/includes/languages/fr_FR/search_help.php
branches/2.1.0/catalog/includes/languages/fr_FR/shopping_cart.php
branches/2.1.0/catalog/includes/languages/fr_FR/sitemap.php
branches/2.1.0/catalog/includes/languages/fr_FR/ssl_check.php
branches/2.1.0/catalog/includes/languages/fr_FR/tell_a_friend.php
trunk/catalog/admin/includes/application_top.php
trunk/catalog/admin/includes/modules/pages/currencies.php
trunk/catalog/includes/boxes/categories.php
trunk/catalog/includes/boxes/whats_new.php
trunk/catalog/includes/classes/page.customer.php
trunk/catalog/includes/content/listing_products_new.php
trunk/catalog/includes/languages/fr_FR/404.php
trunk/catalog/includes/languages/fr_FR/account.php
trunk/catalog/includes/languages/fr_FR/advanced_search.php
trunk/catalog/includes/languages/fr_FR/boxes/best_sellers.txt
trunk/catalog/includes/languages/fr_FR/boxes/categories.txt
trunk/catalog/includes/languages/fr_FR/boxes/categories_dropdown.txt
trunk/catalog/includes/languages/fr_FR/boxes/categories_tab_menu.txt
trunk/catalog/includes/languages/fr_FR/boxes/checkout_progressbar.txt
trunk/catalog/includes/languages/fr_FR/boxes/cms_last_post.txt
trunk/catalog/includes/languages/fr_FR/boxes/currencies.txt
trunk/catalog/includes/languages/fr_FR/boxes/languages.txt
trunk/catalog/includes/languages/fr_FR/boxes/login_box.txt
trunk/catalog/includes/languages/fr_FR/boxes/manufacturer_info.txt
trunk/catalog/includes/languages/fr_FR/boxes/manufacturers.txt
trunk/catalog/includes/languages/fr_FR/boxes/order_history.txt
trunk/catalog/includes/languages/fr_FR/boxes/recently_viewed.txt
trunk/catalog/includes/languages/fr_FR/boxes/search.txt
trunk/catalog/includes/languages/fr_FR/boxes/search_suggest.txt
trunk/catalog/includes/languages/fr_FR/boxes/selections.txt
trunk/catalog/includes/languages/fr_FR/boxes/shopping_cart.txt
trunk/catalog/includes/languages/fr_FR/boxes/shopping_cart_short.txt
trunk/catalog/includes/languages/fr_FR/boxes/shopping_cart_short_ajax.txt
trunk/catalog/includes/languages/fr_FR/boxes/specials.txt
trunk/catalog/includes/languages/fr_FR/boxes/tell_a_friend.txt
trunk/catalog/includes/languages/fr_FR/boxes/very_viewed.txt
trunk/catalog/includes/languages/fr_FR/boxes/whats_new.txt
trunk/catalog/includes/languages/fr_FR/checkout_confirmation.php
trunk/catalog/includes/languages/fr_FR/checkout_payment.php
trunk/catalog/includes/languages/fr_FR/checkout_payment_address.php
trunk/catalog/includes/languages/fr_FR/checkout_process.php
trunk/catalog/includes/languages/fr_FR/checkout_shipping.php
trunk/catalog/includes/languages/fr_FR/checkout_shipping_address.php
trunk/catalog/includes/languages/fr_FR/checkout_success.php
trunk/catalog/includes/languages/fr_FR/contact.php
trunk/catalog/includes/languages/fr_FR/contact_us.php
trunk/catalog/includes/languages/fr_FR/cookie_usage.php
trunk/catalog/includes/languages/fr_FR/create_account.php
trunk/catalog/includes/languages/fr_FR/create_account_success.php
trunk/catalog/includes/languages/fr_FR/customers.php
trunk/catalog/includes/languages/fr_FR/featured_products.php
trunk/catalog/includes/languages/fr_FR/fr_FR.php
trunk/catalog/includes/languages/fr_FR/home.php
trunk/catalog/includes/languages/fr_FR/index.php
trunk/catalog/includes/languages/fr_FR/info_shopping_cart.php
trunk/catalog/includes/languages/fr_FR/listing_best_sellers.php
trunk/catalog/includes/languages/fr_FR/listing_products_new.php
trunk/catalog/includes/languages/fr_FR/listing_small_price.php
trunk/catalog/includes/languages/fr_FR/listing_specials.php
trunk/catalog/includes/languages/fr_FR/login.php
trunk/catalog/includes/languages/fr_FR/logoff.php
trunk/catalog/includes/languages/fr_FR/modules/account/address_book.txt
trunk/catalog/includes/languages/fr_FR/modules/also_purchased_products.php
trunk/catalog/includes/languages/fr_FR/modules/new_products.txt
trunk/catalog/includes/languages/fr_FR/modules/order_total/ot_shipping.php
trunk/catalog/includes/languages/fr_FR/modules/order_total/ot_subtotal.txt
trunk/catalog/includes/languages/fr_FR/modules/order_total/ot_tax.txt
trunk/catalog/includes/languages/fr_FR/modules/order_total/ot_total.txt
trunk/catalog/includes/languages/fr_FR/modules/payment/cod.php
trunk/catalog/includes/languages/fr_FR/modules/payment/moneyorder.txt
trunk/catalog/includes/languages/fr_FR/modules/products/desc_base.txt
trunk/catalog/includes/languages/fr_FR/modules/shipping/flat.txt
trunk/catalog/includes/languages/fr_FR/modules/shipping/item.txt
trunk/catalog/includes/languages/fr_FR/modules/shipping/mzmt.txt
trunk/catalog/includes/languages/fr_FR/modules/shipping/spu.txt
trunk/catalog/includes/languages/fr_FR/modules/template_email/checkout_process.txt
trunk/catalog/includes/languages/fr_FR/modules/template_email/create_account.txt
trunk/catalog/includes/languages/fr_FR/modules/template_email/create_account_confirm.txt
trunk/catalog/includes/languages/fr_FR/modules/template_email/defaut.txt
trunk/catalog/includes/languages/fr_FR/modules/template_email/orders.txt
trunk/catalog/includes/languages/fr_FR/modules/template_email/password_forgotten.txt
trunk/catalog/includes/languages/fr_FR/modules/upcoming_products.txt
trunk/catalog/includes/languages/fr_FR/new_sent_email_confirm.php
trunk/catalog/includes/languages/fr_FR/password_forgotten.php
trunk/catalog/includes/languages/fr_FR/product_info.php
trunk/catalog/includes/languages/fr_FR/rss/categories.php
trunk/catalog/includes/languages/fr_FR/rss/child_cat.php
trunk/catalog/includes/languages/fr_FR/rss/feeds.php
trunk/catalog/includes/languages/fr_FR/rss/manufacturers.php
trunk/catalog/includes/languages/fr_FR/rss/specials.php
trunk/catalog/includes/languages/fr_FR/rss.php
trunk/catalog/includes/languages/fr_FR/search_help.php
trunk/catalog/includes/languages/fr_FR/shopping_cart.php
trunk/catalog/includes/languages/fr_FR/sitemap.php
trunk/catalog/includes/languages/fr_FR/ssl_check.php
trunk/catalog/includes/languages/fr_FR/tell_a_friend.php
trunk/catalog/includes/modules/new_products.php
Modified: branches/2.1.0/catalog/includes/languages/fr_FR/404.php
===================================================================
--- branches/2.1.0/catalog/includes/languages/fr_FR/404.php 2011-08-24 13:56:49 UTC (rev 3797)
+++ branches/2.1.0/catalog/includes/languages/fr_FR/404.php 2011-09-02 08:25:08 UTC (rev 3798)
@@ -7,8 +7,10 @@
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
-define('HEADING_TITLE', 'Non trouvé');
-define('TEXT_MAIN', 'Le produits, la page ou la categorie que vous cherchez est introuvable. ');
+define('HEADING_TITLE',"Non trouvé" );
+define('TEXT_MAIN',"Le produits, la page ou
+ la categorie que vous cherchez est introuvable. " );
+
?>
\ No newline at end of file
Modified: branches/2.1.0/catalog/includes/languages/fr_FR/account.php
===================================================================
--- branches/2.1.0/catalog/includes/languages/fr_FR/account.php 2011-08-24 13:56:49 UTC (rev 3797)
+++ branches/2.1.0/catalog/includes/languages/fr_FR/account.php 2011-09-02 08:25:08 UTC (rev 3798)
@@ -7,127 +7,79 @@
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
-define('NAVBAR_TITLE', 'Mon compte');
-define('NAVBAR_TITLE_2', 'Éditer le compte');
-define('NAVBAR_TITLE_3', 'Historique');
-define('NAVBAR_TITLE_4', 'Souscriptions aux bulletins d\'information');
-define('NAVBAR_TITLE_5', 'Changer mon mot de passe');
-define('NAVBAR_TITLE_6', 'Historique');
+define('NAVBAR_TITLE',"Mon compte" );
+define('NAVBAR_TITLE_2',"Éditer le compte" );
+define('NAVBAR_TITLE_3',"Historique" );
+define('NAVBAR_TITLE_4',"Souscriptions aux bulletins d'information" );
+define('NAVBAR_TITLE_5',"Changer mon mot de passe" );
+define('NAVBAR_TITLE_6',"Historique" );
-define('HEADING_TITLE', 'Information sur mon compte');
-define('HEADING_TITLE_3', 'Historique de mes commandes');
-define('HEADING_TITLE_4', 'Souscriptions aux bulletins d\'information');
-define('HEADING_TITLE_5', 'Mon mot de passe');
-define('HEADING_TITLE_6', 'Information commande');
-define('HEADING_TITLE_7', 'Mes coordonnées');
+define('HEADING_TITLE',"Information sur mon compte" );
+define('HEADING_TITLE_3',"Historique de mes commandes" );
+define('HEADING_TITLE_4',"Souscriptions aux bulletins d'information" );
+define('HEADING_TITLE_5',"Mon mot de passe" );
+define('HEADING_TITLE_6',"Information commande" );
+define('HEADING_TITLE_7',"Mes coordonnées" );
-define('MY_ACCOUNT_CHOOSE_LANGUAGES', 'Choix de votre langue');
-define('OVERVIEW_TITLE', 'Aperçu général');
-define('OVERVIEW_SHOW_ALL_ORDERS', 'Afficher toutes mes commandes');
-define('OVERVIEW_PREVIOUS_ORDERS', 'Commandes précédentes');
-define('MY_ACCOUNT_TITLE', 'Mon compte');
-define('MY_ACCOUNT_INFORMATION', 'Afficher ou modifier les informations de mon compte.');
-define('MY_ACCOUNT_PASSWORD', 'Modifier le mot de passe de mon compte.');
-define('MY_ORDERS_TITLE', 'Mes commandes');
-define('MY_ORDERS_VIEW', 'Afficher les commandes que j\'ai effectué.');
-define('EMAIL_NOTIFICATIONS_TITLE', 'Notifications par e-mail');
-define('EMAIL_NOTIFICATIONS_NEWSLETTERS', 'S\'abonner ou se désabonner des bulletins d\'information.');
-define('EMAIL_NOTIFICATIONS_PRODUCTS', 'Afficher ou modifier ma liste de notification de produit.');
-define('SUCCESS_ACCOUNT_UPDATED', 'Mise à jour effectuée');
-define('CATEGORY_EXTRA_FIELDS', 'Champs complémentaires');
-define('TEXT_LOGOFF', 'Se deconnecter');
+define('MY_ACCOUNT_CHOOSE_LANGUAGES',"Choix de votre langue" );
+define('OVERVIEW_TITLE',"Aperçu général" );
+define('OVERVIEW_SHOW_ALL_ORDERS',"Afficher toutes mes commandes" );
+define('OVERVIEW_PREVIOUS_ORDERS',"Commandes précédentes" );
+define('MY_ACCOUNT_TITLE',"Mon compte" );
+define('MY_ACCOUNT_INFORMATION',"Afficher ou modifier les informations de mon compte." );
+define('MY_ACCOUNT_PASSWORD',"Modifier le mot de passe de mon compte." );
+define('MY_ORDERS_TITLE',"Mes commandes" );
+define('MY_ORDERS_VIEW',"Afficher les commandes que j'ai effectué." );
+define('EMAIL_NOTIFICATIONS_TITLE',"Notifications par e-mail" );
+define('EMAIL_NOTIFICATIONS_NEWSLETTERS',"S'abonner ou se désabonner des bulletins d'information." );
+define('EMAIL_NOTIFICATIONS_PRODUCTS',"Afficher ou modifier ma liste de notification de produit." );
+define('SUCCESS_ACCOUNT_UPDATED',"Mise à jour effectuée" );
+define('CATEGORY_EXTRA_FIELDS',"Champs complémentaires" );
+define('TEXT_LOGOFF',"Se deconnecter" );
/* Extra */
-define('ENTRY_EXTRA_FIELDS_LENG_ERROR', 'Ce champ %s doit comporter %s caractères');
-define('ENTRY_EXTRA_FIELDS_REQUIRED_ERROR', 'Ce champ %s est obligatoire');
+define('ENTRY_EXTRA_FIELDS_LENG_ERROR',"Ce champ %s doit comporter %s caractères" );
+define('ENTRY_EXTRA_FIELDS_REQUIRED_ERROR',"Ce champ %s est obligatoire" );
/* Accoutn history */
-define('SHOPPING_CART_ACTIF', 'Panier en attente ');
-define('TEXT_ORDER_NUMBER', 'Numéro de commande : ');
-define('TEXT_ORDER_STATUS', 'Statut de la commande : ');
-define('TEXT_ORDER_DATE', 'Date de la commande : ');
-define('TEXT_ORDER_SHIPPED_TO', 'Expédiée à : ');
-define('TEXT_ORDER_BILLED_TO', 'Facturée à : ');
-define('TEXT_ORDER_PRODUCTS', 'Produits : ');
-define('TEXT_ORDER_COST', 'Coût de la commande : ');
-define('TEXT_VIEW_ORDER', 'Afficher la commande');
-define('TEXT_NO_PURCHASES', "Vous n'avez pas encore acheté de produits");
+define('SHOPPING_CART_ACTIF',"Panier en attente " );
+define('TEXT_ORDER_NUMBER',"Numéro de commande : " );
+define('TEXT_ORDER_STATUS',"Statut de la commande : " );
+define('TEXT_ORDER_DATE',"Date de la commande : " );
+define('TEXT_ORDER_SHIPPED_TO',"Expédiée à : " );
+define('TEXT_ORDER_BILLED_TO',"Facturée à : " );
+define('TEXT_ORDER_PRODUCTS',"Produits : " );
+define('TEXT_ORDER_COST',"Coût de la commande : " );
+define('TEXT_VIEW_ORDER',"Afficher la commande" );
+define('TEXT_NO_PURCHASES',"Vous n'avez pas encore acheté de produits" );
/* Newsletter */
-define('MY_NEWSLETTERS_TITLE', 'Mes souscriptions aux bulletins d\'information');
-define('MY_NEWSLETTERS_GENERAL_NEWSLETTER', 'Bulletins d\'information générale');
-define('MY_NEWSLETTERS_GENERAL_NEWSLETTER_DESCRIPTION', 'Y compris les actualités du magasin, les nouveaux produits, les offres spéciales, et les autres annonces promotionnelles.');
-define('MY_NEWSLETTERS_GENERAL_P_NOTOFICATIONS', 'Information sur un produit(s) (que vous séléctionnez)');
-define('MY_NEWSLETTERS_GENERAL_P_NOTIFICATION_DESCRIPTION', 'Toutes les notification faites sur les produits, dont vous avez demandé à être tenu informé');
-define('SUCCESS_NEWSLETTER_UPDATED', 'Vos abonnements aux bulletins d\'information ont été mis à jour avec succès.');
+define('MY_NEWSLETTERS_TITLE',"Mes souscriptions aux bulletins d'information" );
+define('MY_NEWSLETTERS_GENERAL_NEWSLETTER',"Bulletins d'information générale" );
+define('MY_NEWSLETTERS_GENERAL_NEWSLETTER_DESCRIPTION',"Y compris les actualités du magasin, les nouveaux produits, les offres spéciales, et les autres annonces promotionnelles." );
+define('MY_NEWSLETTERS_GENERAL_P_NOTOFICATIONS',"Information sur un produit(s) (que vous séléctionnez)" );
+define('MY_NEWSLETTERS_GENERAL_P_NOTIFICATION_DESCRIPTION',"Toutes les notification faites sur les produits, dont vous avez demandé à être tenu informé" );
+define('SUCCESS_NEWSLETTER_UPDATED',"Vos abonnements aux bulletins d'information ont été mis à jour avec succès." );
/* Change password*/
-define('MY_PASSWORD_TITLE', 'Mon mot de passe');
-define('SUCCESS_PASSWORD_UPDATED', 'Votre mot de passe a été mis à jour avec succès.');
-define('ERROR_CURRENT_PASSWORD_NOT_MATCHING', 'Votre mot de passe courant doit être différent du mot de passe actuellement enregistré sur notre site. Veuillez réessayer.');
+define('MY_PASSWORD_TITLE',"Mon mot de passe" );
+define('SUCCESS_PASSWORD_UPDATED',"Votre mot de passe a été mis à jour avec succès." );
+define('ERROR_CURRENT_PASSWORD_NOT_MATCHING',"Votre mot de passe courant doit être différent du mot de passe actuellement enregistré sur notre site. Veuillez réessayer." );
/* History info */
-define('HEADING_ORDER_NUMBER', 'Commande #%s');
-define('HEADING_ORDER_DATE', 'Date de la commande : ');
-define('HEADING_DELIVERY_ADDRESS', 'Adresse de livraison');
-define('HEADING_SHIPPING_METHOD', 'Méthode d\'expédition ');
-define('HEADING_PRODUCTS', 'Produits');
-define('HEADING_PRODUCTS_QTY', 'Qt');
-define('HEADING_PRODUCTS_PRICE', 'Prix');
-define('HEADING_PRODUCTS_PRICE_U', 'Prix UHT');
-define('HEADING_PRODUCTS_TOT_HT', 'Total HT');
-define('HEADING_PRODUCTS_TOT_TTC', 'Total TCC');
-define('HEADING_TAX', 'Taxe');
-define('HEADING_TOTAL', 'Total');
-define('HEADING_BILLING_INFORMATION', 'Information de facturation');
-define('HEADING_BILLING_ADDRESS', 'Adresse de facturation');
-define('HEADING_PAYMENT_METHOD', 'Méthode de paiement ');
-define('HEADING_ORDER_HISTORY', 'Historique de la commande');
-define('HEADING_COMMENT', 'Commentaires');
-define('TEXT_NO_COMMENTS_AVAILABLE', 'Aucuns commentaires disponibles.');
-
-
-define('HEADING_HISTORY_DATE', 'Date');
-define('HEADING_HISTORY_STATUS', 'Statut');
-define('HEADING_HISTORY_COMMENT', 'Commentaire');
-define('TEXT_RETURN_PRODUCT','<br />[Retourner]');
-define('TEXT_RMA', '<br />Retour');
-
-/* Download */
-define('TABLE_HEADING_DOWNLOAD_DATE', 'Liens expirés : ');
-define('TABLE_HEADING_DOWNLOAD_COUNT', ' Téléchargements restants');
-define('HEADING_DOWNLOAD', 'Liens de téléchargement');
-define('FOOTER_DOWNLOAD', 'Liens de téléchargement %s');
-
-/* pdf */
-define('PRINT_INVOICE_HEADING', 'Facture');
-define('PRINT_INVOICE_TEXT', 'Merci de votre commande sur <a href="'.HTTP_SERVER.DIR_WS_CATALOG.'">'.STORE_NAME.'</a>');
-define('PRINT_INVOICE', 'Facture');
-define('PRINT_INVOICE_ORDERNR', 'Facture n° : ');
-define('PRINT_INVOICE_DATE', 'Date de commande : ');
-
-define('PRINT_PACKINGSLIP_HEADING', 'Bon de Commande');
-define('PRINT_PACKINGSLIP_TEXT', 'Merci de votre commande sur');
-define('PRINT_PACKINGSLIPE_TITLE', 'Commande n° :');
-define('PRINT_PACKINGSLIP', 'Commande');
-define('PRINT_PACKINGSLIP_ORDERNR', 'Bon de Commande n° :');
-define('PRINT_PACKINGSLIP_DATE', 'Date de commande: ');
-define('TABLE_HEADING_COMMENTS', 'Commentaires');
-define('TABLE_HEADING_PRODUCTS_MODEL', 'Modèle');
-define('TABLE_HEADING_PRODUCTS', 'Produits');
-define('TABLE_HEADING_TAX', 'Taxe en %');
-define('TABLE_HEADING_TOTAL', 'Total');
-define('TABLE_HEADING_PRICE_EXCLUDING_TAX', 'PU (HT)');
-define('TABLE_HEADING_PRICE_INCLUDING_TAX', 'PU (TTC)');
-define('TABLE_HEADING_TOTAL_EXCLUDING_TAX', 'Total (HT)');
-define('TABLE_HEADING_TOTAL_INCLUDING_TAX', 'Total (TTC)');
-define('ENTRY_SOLD_TO', 'VENDU A :');
-define('ENTRY_SHIP_TO', 'LIVRE A :');
-define('ENTRY_PAYMENT_METHOD', 'Méthode de paiement :');
-define('ENTRY_PAYMENT_TYPE', 'Credit Card:');
-define('PAYMENT_TYPE', 'Credit Card');
-define('ENTRY_CC_OWNER', 'Credit Card Owner:');
-define('ENTRY_CC_NUMBER', 'Credit Card Number:');
-define('ENTRY_CC_EXP', 'Expiration Date:');
-define('ENTRY_SUB_TOTAL', 'Sous-Total :');
-?>
\ No newline at end of file
+define('HEADING_ORDER_NUMBER',"Commande #%s" );
+define('HEADING_ORDER_DATE',"Date de la commande : " );
+define('HEADING_DELIVERY_ADDRESS',"Adresse de livraison" );
+define('HEADING_SHIPPING_METHOD',"Méthode d'expédition " );
+define('HEADING_PRODUCTS',"Produits" );
+define('HEADING_PRODUCTS_QTY',"Qt" );
+define('HEADING_PRODUCTS_PRICE',"Prix" );
+define('HEADING_PRODUCTS_PRICE_U',"Prix UHT" );
+define('HEADING_PRODUCTS_TOT_HT',"Total HT" );
+define('HEADING_PRODUCTS_TOT_TTC',"Total TCC" );
+define('HEADING_TAX',"Taxe" );
+define('HEADING_TOTAL',"Total" );
+define('HEADING_BILLING_INFORMATION',"Information de facturation" );
+define('HEADING_BILLING_ADDRESS',"Adresse de facturation" );
+define('HEADING_PAYMENT_METHOD',"Méthode de paiement " );
+define('HEADING_ORDER_HISTORY',"Historique de la commande" );
Modified: branches/2.1.0/catalog/includes/languages/fr_FR/advanced_search.php
===================================================================
--- branches/2.1.0/catalog/includes/languages/fr_FR/advanced_search.php 2011-08-24 13:56:49 UTC (rev 3797)
+++ branches/2.1.0/catalog/includes/languages/fr_FR/advanced_search.php 2011-09-02 08:25:08 UTC (rev 3798)
@@ -7,35 +7,35 @@
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
-define('NAVBAR_TITLE_1', 'Recherche avancée');
-define('NAVBAR_TITLE_2', 'Résultats de recherche');
-define('HEADING_TITLE_1', 'Recherche avancée');
-define('HEADING_TITLE_2', 'Produits répondant aux critères de recherche');
-define('HEADING_SEARCH_CRITERIA', 'Critères de recherche');
-define('ENTRY_KEYWORDS', 'Mots clés');
-define('ENTRY_CATEGORIES', 'Catégories:');
-define('ENTRY_INCLUDE_SUBCATEGORIES', 'Inclure les sous-catégories');
-define('ENTRY_MANUFACTURERS', 'Fabricants :');
-define('ENTRY_PRICE_FROM', 'Prix à partir de :');
-define('ENTRY_PRICE_TO', 'Prix jusqu\'à :');
-define('ENTRY_DATE_FROM', 'Depuis la date :');
-define('ENTRY_DATE_TO', 'Jusqu\'à la date :');
-define('TEXT_SEARCH_HELP_LINK', 'Aide à la recherche [?]');
-define('TEXT_ALL_CATEGORIES', 'Toutes catégories');
-define('TEXT_ALL_MANUFACTURERS', 'Tous fabricants');
+define('NAVBAR_TITLE_1',"Recherche avancée" );
+define('NAVBAR_TITLE_2',"Résultats de recherche" );
+define('HEADING_TITLE_1',"Recherche avancée" );
+define('HEADING_TITLE_2',"Produits répondant aux critères de recherche" );
+define('HEADING_SEARCH_CRITERIA',"Critères de recherche" );
+define('ENTRY_KEYWORDS',"Mots clés" );
+define('ENTRY_CATEGORIES',"Catégories:" );
+define('ENTRY_INCLUDE_SUBCATEGORIES',"Inclure les sous-catégories" );
+define('ENTRY_MANUFACTURERS',"Fabricants :" );
+define('ENTRY_PRICE_FROM',"Prix à partir de :" );
+define('ENTRY_PRICE_TO',"Prix jusqu'à :" );
+define('ENTRY_DATE_FROM',"Depuis la date :" );
+define('ENTRY_DATE_TO',"Jusqu'à la date :" );
+define('TEXT_SEARCH_HELP_LINK',"Aide à la recherche [?]" );
+define('TEXT_ALL_CATEGORIES',"Toutes catégories" );
+define('TEXT_ALL_MANUFACTURERS',"Tous fabricants" );
-define('TEXT_CLOSE_WINDOW', '<span class="underline">Fermer la fenêtre</span> [x]');
-define('TABLE_HEADING_BUY_NOW', 'Acheter maintenant');
-define('TABLE_HEADING_PRODUCTS', 'Nom du produit :');
-define('TEXT_NO_PRODUCTS', 'Il n\'y a aucun produit correspondant à vos critères de recherche.');
-define('ERROR_AT_LEAST_ONE_INPUT', 'Au moins un critère de recherche doit être rempli.');
-define('ERROR_INVALID_FROM_DATE', 'La date du champ <span class="underline">Depuis la date</span> n\'est pas valide.');
-define('ERROR_INVALID_TO_DATE', 'La date du champ <span class="underline">Jusqu\'à la date</span> n\'est pas valide.');
-define('ERROR_TO_DATE_LESS_THAN_FROM_DATE', 'La date du champ <span class="underline">Jusqu\'à la date</span> doit être supérieure ou égale à la date du champ <span class="underline">Depuis la date</span>');
-define('ERROR_PRICE_FROM_MUST_BE_NUM', 'Le prix du champ <span class="underline">Prix à partir de</span> ne doit contenir que des chiffres.');
-define('ERROR_PRICE_TO_MUST_BE_NUM', 'Le prix du champ <span class="underline">Prix jusqu\'à</span> ne doit contenir que des chiffres.');
-define('ERROR_PRICE_TO_LESS_THAN_PRICE_FROM', 'Le prix du champ <span class="underline">Prix jusqu\'à</span> doit être supérieure ou égale au prix du champ <span class="underline">Prix à partir de</span>.');
-define('ERROR_INVALID_KEYWORDS', 'Mots-clés invalides.');
+define('TEXT_CLOSE_WINDOW',"<span class=\"underline\">Fermer la fenêtre</span> [x]" );
+define('TABLE_HEADING_BUY_NOW',"Acheter maintenant" );
+define('TABLE_HEADING_PRODUCTS',"Nom du produit :" );
+define('TEXT_NO_PRODUCTS',"Il n'y a aucun produit correspondant à vos critères de recherche." );
+define('ERROR_AT_LEAST_ONE_INPUT',"Au moins un critère de recherche doit être rempli." );
+define('ERROR_INVALID_FROM_DATE',"La date du champ <span class=\"underline\">Depuis la date</span> n'est pas valide." );
+define('ERROR_INVALID_TO_DATE',"La date du champ <span class=\"underline\">Jusqu'à la date</span> n'est pas valide." );
+define('ERROR_TO_DATE_LESS_THAN_FROM_DATE',"La date du champ <span class=\"underline\">Jusqu'à la date</span> doit être supérieure ou égale à la date du champ <span class=\"underline\">Depuis la date</span>" );
+define('ERROR_PRICE_FROM_MUST_BE_NUM',"Le prix du champ <span class=\"underline\">Prix à partir de</span> ne doit contenir que des chiffres." );
+define('ERROR_PRICE_TO_MUST_BE_NUM',"Le prix du champ <span class=\"underline\">Prix jusqu'à</span> ne doit contenir que des chiffres." );
+define('ERROR_PRICE_TO_LESS_THAN_PRICE_FROM',"Le prix du champ <span class=\"underline\">Prix jusqu'à</span> doit être supérieure ou égale au prix du champ <span class=\"underline\">Prix à partir de</span>." );
+define('ERROR_INVALID_KEYWORDS',"Mots-clés invalides." );
-define('TEXT_SEARCH_HELP', 'Vous pouvez séparer les mots clés par les opérateurs logiques AND et OR. Par exemple, vous pouvez entrer <span class="underline">Microsoft AND souris</span>. Cette recherche vous affichera les résultats qui répondent simultanément aux deux critères. Toutefois, si vous tapez <span class="underline">souris OR clavier</span>, seront listés les articles qui ont au moins l\'un des deux mots dans les champs sélectionnés. Si aucun opérateur n\'est précisé, la recherche s\'effectuera avec l\'opérateur AND.<br /><br />Vous pouvez également faire une recherche sur une chaîne en l\'encadrant de guillemets. Par exemple, une recherche sur <span class="underline">"ordinateur portable"</span> vous af...
[truncated message content] |
|
From: <os...@us...> - 2011-09-08 21:59:08
|
Revision: 3803
http://oscss.svn.sourceforge.net/oscss/?rev=3803&view=rev
Author: oscim
Date: 2011-09-08 21:59:01 +0000 (Thu, 08 Sep 2011)
Log Message:
-----------
correction diverse,
Evolition et nettoyage fichier de langue , suite
Amelioration gestion des image, avec utilisation de driver pour la fabrication des thumb
Ajout d'un driver pour creer des mini carr?\195?\169
Ajout d'une boxe tags, pour exploiter les tags
Modified Paths:
--------------
trunk/catalog/admin/includes/exts/package/tags/addfilename.php
trunk/catalog/admin/includes/exts/package/tags/addlangdef.php
trunk/catalog/admin/includes/exts/package/tags/modifytable.class.php
trunk/catalog/admin/includes/languages/fr_FR/admin_members.php
trunk/catalog/admin/includes/languages/fr_FR/boxes/07_catalog.php
trunk/catalog/admin/includes/languages/fr_FR/fr_FR.php
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/adminAccount.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/backup.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/currencies.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/products.txt
trunk/catalog/common/classes/image_ratio.php
trunk/catalog/includes/classes/AbstractAcaModule.php
trunk/catalog/includes/languages/fr_FR/fr_FR.php
trunk/catalog/install/includes/language/fr_FR/oscss_config.txt
Added Paths:
-----------
trunk/catalog/common/classes/imgratio_drivers/
trunk/catalog/common/classes/imgratio_drivers/Carre.php
trunk/catalog/includes/boxes/tags.php
trunk/catalog/includes/gabarit/box.tags.gab
trunk/catalog/includes/languages/fr_FR/boxes/tags.txt
Modified: trunk/catalog/admin/includes/exts/package/tags/addfilename.php
===================================================================
--- trunk/catalog/admin/includes/exts/package/tags/addfilename.php 2011-09-08 21:50:34 UTC (rev 3802)
+++ trunk/catalog/admin/includes/exts/package/tags/addfilename.php 2011-09-08 21:59:01 UTC (rev 3803)
@@ -1,8 +1,14 @@
<?php
-/*
-Class Tc_createtable operates with createtable-tag from install.xml.
-Made by Imrich Scindler
-Released under GPL
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @portion
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 06/09/11, 14:16
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @author original by Imrich Scindler
+ @encode UTF-8
*/
class Tc_addfilename
@@ -43,12 +49,13 @@
}
- public function permissions_check_for_install() { parent::$error=false; return true; }
- public function conflicts_check_for_install() {parent::$error=false; return true; }
- public function permissions_check_for_remove() { parent::$error=false; return true; }
- public function conflicts_check_for_remove() {parent::$error=false; return true; }
+ public function permissions_check_for_install() {return true; }
+ public function conflicts_check_for_install() { return true; }
+ public function permissions_check_for_remove() { return true; }
+ public function conflicts_check_for_remove() { return true; }
+
function do_install() {
$tblrowsa = "";
$tblrows = "";
Modified: trunk/catalog/admin/includes/exts/package/tags/addlangdef.php
===================================================================
--- trunk/catalog/admin/includes/exts/package/tags/addlangdef.php 2011-09-08 21:50:34 UTC (rev 3802)
+++ trunk/catalog/admin/includes/exts/package/tags/addlangdef.php 2011-09-08 21:59:01 UTC (rev 3803)
@@ -1,9 +1,14 @@
<?php
-
-/*
-Class Tc_createtable operates with createtable-tag from install.xml.
-Made by Imrich Scindler
-Released under GPL
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @portion
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 06/09/11, 14:16
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @author original by Imrich Scindler
+ @encode UTF-8
*/
class Tc_addlangdef
Modified: trunk/catalog/admin/includes/exts/package/tags/modifytable.class.php
===================================================================
--- trunk/catalog/admin/includes/exts/package/tags/modifytable.class.php 2011-09-08 21:50:34 UTC (rev 3802)
+++ trunk/catalog/admin/includes/exts/package/tags/modifytable.class.php 2011-09-08 21:59:01 UTC (rev 3803)
@@ -1,11 +1,18 @@
<?php
-/*
-Class Tc_createtable operates with createtable-tag from install.xml.
-Made by Imrich Scindler
-Released under GPL
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @portion
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 06/09/11, 14:16
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @author original by Imrich Scindler
+ @encode UTF-8
*/
-class Tc_modifytable extends ContribInstallerBaseTag {
+class Tc_modifytable
+ extends ContribInstallerBaseTag {
var $tag_name='modifytable';
// Class Constructor
function Tc_modifytable($contrib='', $id='', $xml_data='', $dep='') {
Modified: trunk/catalog/admin/includes/languages/fr_FR/admin_members.php
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/admin_members.php 2011-09-08 21:50:34 UTC (rev 3802)
+++ trunk/catalog/admin/includes/languages/fr_FR/admin_members.php 2011-09-08 21:59:01 UTC (rev 3803)
@@ -29,7 +29,7 @@
define('TABLE_HEADING_GROUPS_CATEGORIES',"Permission de catégories" );
define('TEXT_INFO_HEADING_DEFAULT',"Gestion du membre" );
define('TEXT_INFO_HEADING_DELETE',"Effacement de permission " );
-define('TEXT_INFO_HEADING_EDIT',"Éditer la Catégorie / " );
+define('TEXT_INFO_HEADING_EDIT',"Éditer" );
define('TEXT_INFO_HEADING_NEW',"Nouveau membre d'Admin " );
define('TEXT_INFO_DEFAULT_INTRO',"Membre du groupe " );
define('TEXT_INFO_DELETE_INTRO',"Supprimer <nobr><strong>%s</strong></nobr> des <nobr>membres de l'administration ?</nobr>" );
@@ -44,33 +44,3 @@
define('TEXT_INFO_CREATED',"Date de création : " );
define('TEXT_INFO_MODIFIED',"Date de modification : " );
define('TEXT_INFO_LOGDATE',"Dernier accès : " );
-define('TEXT_INFO_LOGNUM',"Nombre d'accès : " );
-define('TEXT_INFO_GROUP',"Niveau du groupe : " );
-define('TEXT_INFO_ERROR',"<span style=\"color:red\">L'adresse Email est déjà utilisée ! Essayez avec une autre adresse.</span>" );
-define('TEXT_INFO_HEADING_DEFAULT_GROUPS',"Gestion du groupe" );
-define('TEXT_INFO_HEADING_DELETE_GROUPS',"Supprimer un groupe" );
-define('TEXT_INFO_DEFAULT_GROUPS_INTRO',"<strong>NOTE :</strong><ul><li><strong>Éditer :</strong> Éditer le nom du groupe.</li><li><strong>Effacer :</strong> Supprimer un groupe.</li><li><strong>Permission :</strong> Définir les accès d'un groupe.</li></ul>" );
-define('TEXT_INFO_DELETE_GROUPS_INTRO',"<span style=\"color:red\">ATTENTION :</span> la suppression de ce groupe supprimera également les membres. Êtes vous sûr de vouloir supprimer le groupe <nobr><strong>%s</strong> ?</nobr>" );
-define('TEXT_INFO_DELETE_GROUPS_INTRO_NOT',"Vous ne pouvez pas supprimer ce groupe !" );
-define('TEXT_INFO_GROUPS_INTRO',"Donner un nom pour le groupe" );
-define('TEXT_INFO_HEADING_EDIT_GROUP',"Nom du groupe" );
-define('TEXT_INFO_EDIT_GROUP_INTRO',"Vous pouvez renommer le nom du groupe. <span class=\"alert\"><br />ATTENTION :</span> le nom doit comporter au minimum <strong>6 lettres.</strong>" );
-define('TEXT_INFO_HEADING_GROUPS',"Nouveau groupe" );
-define('TEXT_INFO_GROUPS_NAME'," <strong>Nom du groupe :</strong>" );
-define('TEXT_INFO_GROUPS_NAME_FALSE',"<span class=\"error\">ERREUR : Le nom du groupe doit contenir plus de 5 caractère !</span>" );
-define('TEXT_INFO_GROUPS_NAME_USED',"<span class=\"error\">ERREUR : Le nom du groupe est déjà utilisé !</span>" );
-define('TEXT_INFO_GROUPS_LEVEL',"Niveau du groupe : " );
-define('TEXT_INFO_GROUPS_BOXES',"<strong>Permission des boîtes :</strong><br /> Donner les accès dans les boîtes." );
-define('TEXT_INFO_GROUPS_BOXES_INCLUDE',"Inclure les dossiers : " );
-define('TEXT_INFO_HEADING_DEFINE',"Définir les groupes" );
-define('TEXT_INFO_DEFINE_INTRO_BLOCK',"<strong>Groupe %s :</strong><br /><br />Vous ne pouvez pas changer la permission de(s) dossier(s) pour ce groupe.<br /><br />" );
-define('TEXT_INFO_DEFINE_INTRO',"<strong>Groupe %s :</strong><br /><br /><li>Changez la permission pour ce groupe en choisissant les boîtes et les dossiers.</li><br /><br /><li>Cliquer sur <strong>sauver</strong> apres modification.</li><br /><br />" );
-define('TEXT_NOTE_DEFINE_GRP',"Cet espace est destiné à régler les autorisations d'accès au page, si vous souhaitez ajouter des éléments dans les menu, reportez vous à : Admin menu " );
-
-define('JS_ALERT_FIRSTNAME',"Requis : Prénom " );
-define('JS_ALERT_LASTNAME',"Requis : Nom " );
-define('JS_ALERT_EMAIL',"Requis : Adresse Email " );
-define('JS_ALERT_EMAIL_FORMAT',"Email non valide ! " );
-define('JS_ALERT_EMAIL_USED'," Adresse Email déjà utilisée ! " );
-define('JS_ALERT_LEVEL'," Requis : Un niveau de groupe " );
-?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/languages/fr_FR/boxes/07_catalog.php
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/boxes/07_catalog.php 2011-09-08 21:50:34 UTC (rev 3802)
+++ trunk/catalog/admin/includes/languages/fr_FR/boxes/07_catalog.php 2011-09-08 21:59:01 UTC (rev 3803)
@@ -11,7 +11,7 @@
define('BOX_HEADING_CONF_CATALOG',"Catalogue" );
define('BOX_CATALOG_PRODUCTS',"Produits" );
-define('BOX_CATALOG_PRODUCT_ADD',"Nouveau Produit" );
-define('BOX_CATALOG_PRODUCTS_EXPECTED',"Produits en attente" );
-define('BOX_CATALOG_ATTIBUTES',"Attributs" );
+define('BOX_CATALOG_PRODUCT_ADD',"Ajouter Produit" );
+define('BOX_CATALOG_PRODUCTS_EXPECTED',"Produit(s) en attente" );
+define('BOX_CATALOG_ATTIBUTES',"Attribut(s)" );
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/languages/fr_FR/fr_FR.php
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/fr_FR.php 2011-09-08 21:50:34 UTC (rev 3802)
+++ trunk/catalog/admin/includes/languages/fr_FR/fr_FR.php 2011-09-08 21:59:01 UTC (rev 3803)
@@ -25,6 +25,9 @@
// on FreeBSD 4.0 I use 'en_US.UTF-8'
// this may not work under win32 environments..
setlocale(LC_TIME, 'fr_FR.UTF-8');
+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('DATE_TIME_FORMAT'," ".DATE_FORMAT_SHORT . " %H:%M:%S" );
////
@@ -90,7 +93,7 @@
define('CHARSET',"utf-8" );
// page title
-define('TITLE',"TORE_NAM" );
+define('TITLE'," ".STORE_NAME." " );
// Class to select and format correct product price
define('TAX_SYMBOL',"TTC" );
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/pages/adminAccount.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/pages/adminAccount.txt 2011-09-08 21:50:34 UTC (rev 3802)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/adminAccount.txt 2011-09-08 21:59:01 UTC (rev 3803)
@@ -55,7 +55,7 @@
$lang['text info intro confirm password error']="<span class=\"error\"><strong>Erreur :</strong> mot de passe faux !</span>" ;
$lang['text info intro default']="Cliquez sur le bouton <strong>éditer</strong> pour modifier votre compte.<br />" ;
$lang['text info intro default first time']="<strong>Avertissement :</strong><br />Bonjour <strong>%s</strong>, vous venez ici pour la première fois. Nous vous recommandons de changer votre mot de passe !<br />" ;
-$lang['text info intro default first']="<strong>Avertissement :</strong><br />Bonjour <strong>%s</strong>, nous vous recommandons de changer votre Email (<span class="alert">admin@localhost</span>) et votre mot de passe !<br />" ;
+$lang['text info intro default first']="<strong>Avertissement :</strong><br />Bonjour <strong>%s</strong>, nous vous recommandons de changer votre Email (<span class=\"alert\">admin@localhost</span>) et votre mot de passe !<br />" ;
$lang['text info intro edit process']="Tous les champs sont exigés." ;
$lang['text info intro new password']="Entrez votre nouveau mot de passe" ;
$lang['new password update']="Nouveau mot de passe enregistré" ;
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/pages/backup.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/pages/backup.txt 2011-09-08 21:50:34 UTC (rev 3802)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/backup.txt 2011-09-08 21:59:01 UTC (rev 3803)
@@ -57,7 +57,7 @@
$lang['error backup directory does not exist']="Erreur : Le répertoire de sauvegarde n\'existe pas. Merci de le préciser dans le fichier configure.php (cf DIR_FS_BACKUP)" ;
-$lang['error backup directory not writeable']="Erreur : Impossible d'écrire dans le répertoire de sauvegarde : ".DIR_FS_BACKUP. " ";
+$lang['error backup directory not writeable']="Erreur : Impossible d'écrire dans le répertoire de sauvegarde : ".DIR_FS_BACKUP. " " ;
$lang['error download link not acceptable']="Erreur : Lien de téléchargement non disponible." ;
$lang['success last restore cleared']="Succès : La date de dernière restauration est modifiée." ;
$lang['success database saved']="Succès : La base de données a été sauvé." ;
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/pages/currencies.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/pages/currencies.txt 2011-09-08 21:50:34 UTC (rev 3802)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/currencies.txt 2011-09-08 21:59:01 UTC (rev 3803)
@@ -29,7 +29,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']=" ".EXT_SET_DEFAULT . " (Requiert une mise à jour manuelle de la valeur de la devise)" ;
$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/languages/fr_FR/modules/pages/products.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/pages/products.txt 2011-09-08 21:50:34 UTC (rev 3802)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/products.txt 2011-09-08 21:59:01 UTC (rev 3803)
@@ -75,7 +75,6 @@
$lang['text products date format']="<small>(jj/mm/aaaa)</small>" ;
$lang['text product available']="Actif " ;
$lang['text product not available']="Désactivé" ;
-$lang['text products manufacturer']="Fabricant :" ;
$lang['text products name']="" ;
$lang['text products description']="Description :" ;
$lang['text products quantity']="Quantité :" ;
Modified: trunk/catalog/common/classes/image_ratio.php
===================================================================
--- trunk/catalog/common/classes/image_ratio.php 2011-09-08 21:50:34 UTC (rev 3802)
+++ trunk/catalog/common/classes/image_ratio.php 2011-09-08 21:59:01 UTC (rev 3803)
@@ -3,9 +3,9 @@
@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 27/03/11, 22:35
- @author oscim <mail aur...@os...> <www http://www.oscim.fr> -Ayatus
+ @version 2.1.1
+ @date 08/09/11, 23:53
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class image_ratio
*/
@@ -33,8 +33,12 @@
/**
@var object param environnement exec
*/
- private static $env;
+ protected static $env;
/**
+ @var
+ */
+ protected static $Modele=null;
+ /**
PHP 5 Constructor
*/
private function __construct() {
@@ -79,6 +83,13 @@
// print_r(self::$CacheImage);
// }
+ public static function SetModele($modele){
+ require_once(DIR_WS_COMMON_CLASSES.'imgratio_drivers/'.$modele.'.php');
+ self::$Modele=new $modele ;
+ return $modele;
+ }
+
+
/**
@fn tep_image($src, $alt = '', $width = '', $height = '', $parameters = '',$mode=false)
@brief The HTML image wrapper function
@@ -105,12 +116,16 @@
$height = $theImg['height'];
if(is_bool($mode) && $mode){
+ self::$Modele=null;
if (self::$env->inadmin)return tep_output_string($src);
return tep_output_string(tep_get_httpdir().$src);
}
else {
/// if cache return
- if( isset(self::$CacheImage[self::$key][self::$keydim]['img']) ) return self::$CacheImage[self::$key][self::$keydim]['img'];
+ if( isset(self::$CacheImage[self::$key][self::$keydim]['img']) ){
+ self::$Modele=null;
+ return self::$CacheImage[self::$key][self::$keydim]['img'];
+ }
else {
$image = '<img src="' . (!self::$env->inadmin ? tep_output_string(tep_get_httpdir().$src) : tep_output_string($src)) . '" alt="' . tep_output_string($alt) . '" ';
if($mode !='simple') $image .= 'width="' . $theImg['width'] . '" height="' . $theImg['height'] . '"';
@@ -118,6 +133,7 @@
if (tep_not_null($parameters)) $image .= ' ' . $parameters;
$image .= ' />';
+ self::$Modele=null;
return self::$CacheImage[self::$key][self::$keydim]['img']= $image;
}
}
@@ -138,12 +154,18 @@
if(!isset(self::$CacheImage[self::$key]['conf']['original'])) return self::$CacheImage[self::$key]['conf']['error'];
else $src=self::$CacheImage[self::$key]['conf']['original'];
- return self::constructImg($src, $alt , $width , $height );
+
+ $res=self::constructImg($src, $alt , $width , $height );
+ self::$Modele=null;
+ return $res;
}
+
+
private static function initCurrent($src,$width,$height){
- self::$key = md5($src);
- self::$keydim=md5($width . $height);
+// var_dump(());
+ self::$key = md5($src.get_class(self::$Modele));
+ self::$keydim=md5($width . $height.get_class(self::$Modele));
self::checkImg($src);
}
@@ -163,13 +185,19 @@
$imgd = self::$CacheImage[self::$key]['conf']['getimagesize'];
- $image_size = self::aspectratio($imgd[0], $imgd[1], $width, $height);
+ if(self::$Modele !=null && method_exists(self::$Modele,'aspectratio' ))
+ $image_size=call_user_func(array(self::$Modele, 'aspectratio'), $imgd[0], $imgd[1], $width, $height);
+ else $image_size = self::aspectratio($imgd[0], $imgd[1], $width, $height);
$width = $image_size["width"];
$height = $image_size["height"];
if (self::$env->img_create && $width !=$imgd[0] && $height != $imgd[1]) {
- $src=self::thumbfile($src, $width, $height, $imgd[0], $imgd[1], $imgd[2]);
+
+ if(self::$Modele !=null && method_exists(self::$Modele,'thumbfile' ))
+ $src=$image_size=call_user_func(array(self::$Modele, 'thumbfile'), $src, $width, $height, $imgd[0], $imgd[1], $imgd[2]);
+ else $src=self::thumbfile($src, $width, $height, $imgd[0], $imgd[1], $imgd[2]);
+
self::$CacheImage[self::$key][self::$keydim]['thumbfile']='true';
}
else{
@@ -249,7 +277,6 @@
@return array (width,height)
*/
private static function aspectratio ($width_src , $height_src , $max_width = '', $max_height = ''){
-// error_reporting(E_ALL);
!empty ($max_width) && preg_match ('/^[0-9]{1,}$/', $max_width, $regs) && $max_width <= $width_src
? true
@@ -282,8 +309,10 @@
private static function thumbfile ($image, $width, $height, $width_src, $height_scr, $format){
- $thumb = $width.'x'.$height.'_'.basename($image).'_'.md5($image).'.'.((self::$types[$format]=="jpeg") ? "jpg" : self::$types[$format]);
+ $getclass=(self::$Modele !=null)?get_class(self::$Modele).'_': '';
+ $thumb = $width.'x'.$height.'_'.$getclass.basename($image).'_'.md5($image).'.'.((self::$types[$format]=="jpeg") ? "jpg" : self::$types[$format]);
+
$thumbfile = substr($image,0, strpos($image, DIR_WS_IMAGES) ) . self::$env->cachedir . $thumb;
if(isset(self::$CacheImage[self::$key][self::$keydim]['thumbfile_cache'])) $iscached = (bool) self::$CacheImage[self::$key][self::$keydim]['thumbfile_cache'];
@@ -300,7 +329,11 @@
if (!$iscached) $makethumb = ($width_src > $width || $height_scr > $height) ? true : false;
else $makethumb = false;
- if ($makethumb) $image=self::thumbgd($image, $width, $height, $width_src, $height_scr, self::$types[$format], $thumbfile);
+ if ($makethumb){
+ if(self::$Modele !=null && method_exists(self::$Modele,'thumbgd' ))
+ $image=call_user_func(array(self::$Modele, 'thumbgd'), $image, $width, $height, $width_src, $height_scr, self::$types[$format], $thumbfile );
+ else $image=self::thumbgd($image, $width, $height, $width_src, $height_scr, self::$types[$format], $thumbfile);
+ }
else{
$img=($iscached) ? $thumbfile : $image;
$image = self::CleanPathReturn($img);
Added: trunk/catalog/common/classes/imgratio_drivers/Carre.php
===================================================================
--- trunk/catalog/common/classes/imgratio_drivers/Carre.php (rev 0)
+++ trunk/catalog/common/classes/imgratio_drivers/Carre.php 2011-09-08 21:59:01 UTC (rev 3803)
@@ -0,0 +1,143 @@
+<?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/09/11, 23:47
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class Carre
+ @brief Convert image in carré and thumb
+
+ @example
+ For use, place prev call img in gabarit html
+ This call is unique, and this next call img, this class not charged
+ image_ratio::SetModele('Carre');
+
+*/
+
+class Carre
+ extends image_ratio
+ {
+
+
+
+ /**
+ @fn self::aspectratio ($width_src , $height_src , $max_width = '', $max_height = '')
+ @brief Redimensionnement des images en conservant leurs proportions
+ @author Ayatus
+ @param $width_src string path.src img
+ @param $height_src float/empty max width en px
+ @param $max_width float/empty max height en px
+ @param $max_height float/empty max height en px
+ @return array (width,height)
+ */
+ static function aspectratio ($width_src , $height_src , $max_width = '', $max_height = ''){
+
+ !empty ($max_width) && preg_match ('/^[0-9]{1,}$/', $max_width, $regs) && $max_width <= $width_src
+ ? true
+ : $max_width = $width_src;
+ !empty ($max_height) && preg_match ('/^[0-9]{1,}$/', $max_height, $regs) && $max_height <= $height_src
+ ? true
+ : $max_height = $height_src;
+ $width=$max_width;
+ $height=$max_height;
+ $width_a=$max_height * $width_src / $height_src;
+ $height_a=$max_width * $height_src / $width_src;
+
+ if ($max_width == $max_height){
+ if ($width_src < $height_src){
+ $width=ceil($max_width * $width_src / $height_src);
+ $height=$max_width;
+ }
+ elseif ($width_src > $height_src) $height=ceil($height_a);
+ elseif ($width_src == $height_src) $height=$max_width;
+ }
+ elseif (($height_a) > $max_height) $width=ceil($width_a);
+ elseif (($width_a) > $max_width) $height=ceil($height_a);
+ elseif ($width_src == $height_src){
+ if ($max_width > $max_height) $width=$max_height;
+ elseif ($max_width < $max_height) $height=$max_width;
+ }
+
+ if($height<=$width)
+ $_th=$width;
+ else if($height>=$width)
+ $_th=$height;
+ else
+ $_th=$width;
+
+ return array("width"=>$_th,"height"=>$_th);
+ }
+
+
+ /**
+ @brief Force une image carré ,
+ */
+ static function thumbgd ($image, $width, $height, $width_src, $height_scr, $format, $thumbfile){
+
+ if($height>=$width)
+ $_th=$width;
+ else if($height<=$width)
+ $_th=$height;
+ else
+ $_th=$width;
+
+
+ //on determine un carré avec la plus petite largeur
+ if($width_src >= $height_scr){$dim=$height_scr; $sens="0";}
+ elseif($width_src <= $height_scr){$dim=$width_src; $sens="1";}
+ else{$dim=$width_src;}
+
+ // var_dump($sens);
+ //on determine le point de depart x,y
+ if($sens == "1")
+ {
+ $point_x_ref=(float)($width_src/2)-($dim/2);
+ $point_y_ref=(float)"0";
+ }
+ // if($horizontale == "1")
+ else
+ {
+ $point_x_ref=(float)"0";
+ $point_y_ref=(float)($height_scr/2)-($dim/2);
+ }
+
+
+ $image = call_user_func("imagecreatefrom".$format, $image);
+ $thumb = imagecreatetruecolor ($width, $height);
+ imagealphablending($thumb, false);
+ imagesavealpha($thumb, true);
+ imagefill($thumb, 0, 0, imagecolorallocatealpha($thumb, 0, 0, 0, 127));
+
+ imagecopyresampled ($thumb, $image,0 , 0 , $point_x_ref ,$point_y_ref, $_th, $_th, $dim, $dim);
+
+ if ($format == "jpeg") call_user_func("image".$format, $thumb, $thumbfile, self::$env->jpegquality);
+ else call_user_func("image".$format, $thumb, $thumbfile);
+ imagedestroy ($image);
+ imagedestroy ($thumb);
+
+ return $thumbfile;
+ }
+
+
+// protected static function thumbimagick ($image, $width, $height, $format, $thumbfile){
+// // error_reporting(E_ALL);
+// if (self::$env->Imagick && self::$env->safemod ) {
+// $thumb = new Imagick($image);
+// foreach ($thumb as $frame) {
+// $frame->thumbnailImage($width, $height);
+// $frame->setImagePage($width, $height, 0, 0);
+// }
+// if ($format == "jpeg") {
+// $thumb->setImageCompression(imagick::COMPRESSION_JPEG);
+// $thumb->setImageCompressionQuality(self::$env->jpegquality);
+// }
+// $thumb->writeImages($thumbfile, true);
+// }
+//
+// return $thumbfile;
+// }
+}
+?>
\ No newline at end of file
Added: trunk/catalog/includes/boxes/tags.php
===================================================================
--- trunk/catalog/includes/boxes/tags.php (rev 0)
+++ trunk/catalog/includes/boxes/tags.php 2011-09-08 21:59:01 UTC (rev 3803)
@@ -0,0 +1,19 @@
+<?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.1
+ @date 07/09/11, 09:03
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+ if(isset($_GET['products_id']) || isset($_GET['content']) || isset($_GET['cPath'])):
+ // include cloud generator
+ include_once(DIR_WS_FUNCTIONS.'generate.php');
+
+ $array=array('title'=>__('text tags'),'content'=>tep_output_string_protected(tep_get_include_contents('box.tags'),false,true));
+ endif;
+
+?>
\ No newline at end of file
Modified: trunk/catalog/includes/classes/AbstractAcaModule.php
===================================================================
--- trunk/catalog/includes/classes/AbstractAcaModule.php 2011-09-08 21:50:34 UTC (rev 3802)
+++ trunk/catalog/includes/classes/AbstractAcaModule.php 2011-09-08 21:59:01 UTC (rev 3803)
@@ -17,7 +17,7 @@
\brief class d'appel des module aca
*/
class AbstractAcaModule
- extends page{
+ /*extends page*/{
/**
* \fn initialise_type($cst, $folder_base)
@@ -41,8 +41,8 @@
$folder .= '/' . $class;
}
if (!empty($class)) {
- if(($path=parent::fix_file(DIR_WS_INCLUDES .'languages/'. $language . '/modules/'. $folder.'/' . $file,true)) !=false) $page->pile_file_lang($path);
- if(!class_exists($class) && ( ($pathclass=parent::fix_file(DIR_WS_MODULES . $folder.'/' . $file)) != false ) )include($pathclass);
+ if(($path=page::fix_file(DIR_WS_INCLUDES .'languages/'. $language . '/modules/'. $folder.'/' . $file,true)) !=false) $page->pile_file_lang($path);
+ if(!class_exists($class) && ( ($pathclass=page::fix_file(DIR_WS_MODULES . $folder.'/' . $file)) != false ) )include($pathclass);
if(!class_exists($class)) trigger_error(sprintf(__CLASS__.' Could not load class %s', $class), E_USER_ERROR);
else $list_mod[]=$class;
}
Added: trunk/catalog/includes/gabarit/box.tags.gab
===================================================================
--- trunk/catalog/includes/gabarit/box.tags.gab (rev 0)
+++ trunk/catalog/includes/gabarit/box.tags.gab 2011-09-08 21:59:01 UTC (rev 3803)
@@ -0,0 +1,15 @@
+<?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.1
+ @date 07/09/11, 09:03
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+global $page;
+?>
+<div>
+ <?php echo generateCloud(array('products'=>@$_GET['products_id'],'cPath'=>@$_GET['cPath'],'content'=>@$_GET['content'])); ?>
+</div>
\ No newline at end of file
Added: trunk/catalog/includes/languages/fr_FR/boxes/tags.txt
===================================================================
--- trunk/catalog/includes/languages/fr_FR/boxes/tags.txt (rev 0)
+++ trunk/catalog/includes/languages/fr_FR/boxes/tags.txt 2011-09-08 21:59:01 UTC (rev 3803)
@@ -0,0 +1,13 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Co...
[truncated message content] |
|
From: <os...@us...> - 2011-09-09 14:00:01
|
Revision: 3804
http://oscss.svn.sourceforge.net/oscss/?rev=3804&view=rev
Author: oscim
Date: 2011-09-09 13:59:55 +0000 (Fri, 09 Sep 2011)
Log Message:
-----------
correction coquille
Modified Paths:
--------------
trunk/catalog/admin/includes/gabarit/orders/display_view.edit.gab
trunk/catalog/includes/classes/checkout_process.php
Modified: trunk/catalog/admin/includes/gabarit/orders/display_view.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/orders/display_view.edit.gab 2011-09-08 21:59:01 UTC (rev 3803)
+++ trunk/catalog/admin/includes/gabarit/orders/display_view.edit.gab 2011-09-09 13:59:55 UTC (rev 3804)
@@ -101,7 +101,7 @@
</td>
<?php endif; ?>
<td class="tleft"><a href="javascript: updateProduct('<?php echo orders::$oID ?> ', '<?php orders::$order->products[$i]['id'] ?> ', 'products_quantity', 'update', '', ' <?php echo orders::$order->products[$i]['qty'] ?> ');"><?php echo orders::$order->products[$i]['qty'] . ' x' ?></a></td>
- <td class="tleft"><?php echo orders::$order->products[$i]['name'].tep_draw_attribute_products(orders::$order,$i).' ' ?></td>
+ <td class="tleft"><span class="fleft"><?php echo orders::$order->products[$i]['name'] ?></span> <?php echo tep_draw_attribute_products(orders::$order,$i).' ' ?></td>
<td class="tcenter"><?php echo orders::$order->products[$i]['model'] ?></td>
<td class="tcenter"><?php echo tep_display_tax_value(orders::$order->products[$i]['tax']) . '%' ?></td>
<td class="tcenter"><?php echo $price->format(orders::$order->products[$i]['final_price'], true, orders::$order->info['currency'], orders::$order->info['currency_value']) ?></td>
Modified: trunk/catalog/includes/classes/checkout_process.php
===================================================================
--- trunk/catalog/includes/classes/checkout_process.php 2011-09-08 21:59:01 UTC (rev 3803)
+++ trunk/catalog/includes/classes/checkout_process.php 2011-09-09 13:59:55 UTC (rev 3804)
@@ -712,11 +712,9 @@
'products_tax' => tep_db_input($order->products[$i]['tax']),
'products_quantity' => (int)$order->products[$i]['qty'],
'products_stock_attributes' => tep_db_input($products_stock_attributes) );
- tep_db_perform(self::$tables['PRODUCTS'], $sql_data_array);
+ $res2=tep_db_perform(self::$tables['PRODUCTS'], $sql_data_array);
+ $order_products_id = tep_db_insert_id($res2);
- $cs_s=tep_db_query("select orders_products_id from " . self::$tables['PRODUCTS'] . " where orders_id='".(int)$this->the_order_id."' and products_id='".tep_get_prid($order->products[$i]['id'])."' and final_price='".tep_db_input($order->products[$i]['final_price'])."' order by orders_products_id DESC LIMIT 1 ");
- $cs=tep_db_fetch_array($cs_s);
- $order_products_id=$cs['orders_products_id'];
return $order_products_id;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-09-12 09:24:35
|
Revision: 3805
http://oscss.svn.sourceforge.net/oscss/?rev=3805&view=rev
Author: oscim
Date: 2011-09-12 09:24:28 +0000 (Mon, 12 Sep 2011)
Log Message:
-----------
correction des langues , suite + adjust link page content
Fixe error driver data
Fixe error driver image_ratio
Modified Paths:
--------------
trunk/catalog/admin/includes/modules/pages/currencies.php
trunk/catalog/common/classes/image_ratio.php
trunk/catalog/common/classes/imgratio_drivers/Carre.php
trunk/catalog/create_account.php
trunk/catalog/includes/classes/driver.content.php
trunk/catalog/includes/classes/page.contact.php
trunk/catalog/includes/content/checkout_payment.php
trunk/catalog/includes/content/checkout_success.php
trunk/catalog/includes/content/home.php
trunk/catalog/includes/languages/fr_FR/checkout_payment.php
trunk/catalog/includes/languages/fr_FR/checkout_success.php
trunk/catalog/includes/languages/fr_FR/contact_us.php
trunk/catalog/includes/languages/fr_FR/create_account.php
trunk/catalog/includes/languages/fr_FR/create_account_success.php
trunk/catalog/includes/languages/fr_FR/home.php
trunk/catalog/includes/languages/fr_FR/password_forgotten.php
trunk/catalog/install/includes/content/core.configuration.php
trunk/catalog/password_forgotten.php
Added Paths:
-----------
trunk/catalog/includes/modules/listing_manufacturer_products.php
Modified: trunk/catalog/admin/includes/modules/pages/currencies.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/currencies.php 2011-09-09 13:59:55 UTC (rev 3804)
+++ trunk/catalog/admin/includes/modules/pages/currencies.php 2011-09-12 09:24:28 UTC (rev 3805)
@@ -4,13 +4,13 @@
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 29/08/11, 11:37
+ @date 11/09/11, 10:45
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class currencies
+ @brief This class manipulate devise (add/up/delete)
*/
-
class currencies
implements ExtModPage, InterfacedTJsonS, InterfaceModule {
@@ -29,17 +29,13 @@
//! active datatable in ajax, precise les GET necessaire
define('JSONSTATMENT', 'mod=page&type='.self::$code.(isset($_GET['cID'])?'&cID='.$_GET['cID'] : '' ) );
-
-
- // Define how do we update currency exchange rates
- // Possible values are 'oanda' 'xe' or ''
- define('CURRENCY_SERVER_PRIMARY', 'oanda');
- define('CURRENCY_SERVER_BACKUP', 'xe');
}
public function check_action($actions){
global $messageStack;
+// $messageStack
+
self::$action=$actions;
switch (self::$action) {
@@ -48,8 +44,13 @@
if (isset($_GET['cID'])) $currency_id = tep_db_prepare_input((int)$_GET['cID']);
$title = tep_db_prepare_input($_POST['title']);
$code = tep_db_prepare_input($_POST['code']);
- $symbol_left = tep_db_prepare_input($_POST['symbol_left']);
- $symbol_right = tep_db_prepare_input($_POST['symbol_right']);
+
+/**
+ TODO traiter charste avec config
+*/
+ $symbol_right = htmlentities(tep_db_prepare_input($_POST['symbol_right']),ENT_NOQUOTES,'UTF-8');
+ $symbol_left = htmlentities(tep_db_prepare_input($_POST['symbol_left']),ENT_NOQUOTES,'UTF-8');
+
$decimal_point = tep_db_prepare_input($_POST['decimal_point']);
$thousands_point = tep_db_prepare_input($_POST['thousands_point']);
$decimal_places = tep_db_prepare_input($_POST['decimal_places']);
@@ -57,8 +58,8 @@
$sql_data_array = array('title' => $title,
'code' => $code,
- 'symbol_left' => htmlentities($symbol_left),
- 'symbol_right' => htmlentities($symbol_right),
+ 'symbol_left' => $symbol_left,
+ 'symbol_right' => $symbol_right,
'decimal_point' => $decimal_point,
'thousands_point' => $thousands_point,
'decimal_places' => $decimal_places,
@@ -96,34 +97,29 @@
$currency_query = tep_db_query("select currencies_id, code, title from " . TABLE_CURRENCIES);
while ($currency = tep_db_fetch_array($currency_query)) {
+ $quote_function = 'quote_' . CURRENCY_SERVER_PRIMARY . '_currency';
+ $rate = $quote_function($currency['code']);
- /// no updated default currency, default currency value = 1.00
- if($currency['code'] != DEFAULT_CURRENCY){
- $quote_function = 'quote_' . CURRENCY_SERVER_PRIMARY . '_currency';
- $rate = $quote_function($currency['code']);
+ if (empty($rate) && (tep_not_null(CURRENCY_SERVER_BACKUP))) {
+ $messageStack->add_session(sprintf(__('warning primary server failed'), CURRENCY_SERVER_PRIMARY, $currency['title'], $currency['code']), 'warning');
- if (empty($rate) && (tep_not_null(CURRENCY_SERVER_BACKUP))) {
- $messageStack->add_session(sprintf(__('warning primary server failed'), CURRENCY_SERVER_PRIMARY, $currency['title'], $currency['code']), 'warning');
+ $quote_function = 'quote_' . CURRENCY_SERVER_BACKUP . '_currency';
+ $rate = $quote_function($currency['code']);
- $quote_function = 'quote_' . CURRENCY_SERVER_BACKUP . '_currency';
- $rate = $quote_function($currency['code']);
+ $server_used = CURRENCY_SERVER_BACKUP;
+ }
- $server_used = CURRENCY_SERVER_BACKUP;
- }
+ if (tep_not_null($rate)) {
+ tep_db_query("update " . TABLE_CURRENCIES . " set value = '" . $rate . "', last_updated = now() where currencies_id = '" . (int)$currency['currencies_id'] . "'");
- if (tep_not_null($rate)) {
- tep_db_query("update " . TABLE_CURRENCIES . " set value = '" . $rate . "', last_updated = now() where currencies_id = '" . (int)$currency['currencies_id'] . "'");
-
- $messageStack->add_session(sprintf(__('text info currency updated'), $currency['title'], $currency['code'], $server_used), 'success');
- } else {
- $messageStack->add_session(sprintf(__('error currency invalid'), $currency['title'], $currency['code'], $server_used), 'error');
- }
-
- }
+ $messageStack->add_session(sprintf(__('text info currency updated'), $currency['title'], $currency['code'], $server_used), 'success');
+ } else {
+ $messageStack->add_session(sprintf(__('error currency invalid'), $currency['title'], $currency['code'], $server_used), 'error');
+ }
}
tep_redirect(tep_href_link(self::FILENAME, 'cID=' . $_GET['cID']));
- break;
+ break;
case 'delete':
$currencies_id = tep_db_prepare_input($_GET['cID']);
@@ -192,8 +188,8 @@
$contents[] = array('class' => 'block_input','text' => __('text info edit intro'));
$contents[] = array('class' => 'block_input','text' => __('text info currency title') . tep_draw_input_field('title','', $cInfo->title));
$contents[] = array('class' => 'block_input','text' => __('text info currency code') . tep_draw_input_field('code','', $cInfo->code));
- $contents[] = array('class' => 'block_input','text' => __('text info currency symbol left') . tep_draw_input_field('symbol_left','', $cInfo->symbol_left));
- $contents[] = array('class' => 'block_input','text' => __('text info currency symbol right') . tep_draw_input_field('symbol_right','', $cInfo->symbol_right));
+ $contents[] = array('class' => 'block_input','text' => __('text info currency symbol left') . tep_draw_input_field('symbol_left','', html_entity_decode($cInfo->symbol_left,ENT_NOQUOTES,'UTF-8')));
+ $contents[] = array('class' => 'block_input','text' => __('text info currency symbol right') . tep_draw_input_field('symbol_right','', html_entity_decode($cInfo->symbol_right,ENT_NOQUOTES,'UTF-8') ));
$contents[] = array('class' => 'block_input','text' => __('text info currency decimal point') . tep_draw_input_field('decimal_point','', $cInfo->decimal_point));
$contents[] = array('class' => 'block_input','text' => __('text info currency thousands point') . tep_draw_input_field('thousands_point','', $cInfo->thousands_point));
$contents[] = array('class' => 'block_input','text' => __('text info currency decimal places') . tep_draw_input_field('decimal_places','', $cInfo->decimal_places));
Modified: trunk/catalog/common/classes/image_ratio.php
===================================================================
--- trunk/catalog/common/classes/image_ratio.php 2011-09-09 13:59:55 UTC (rev 3804)
+++ trunk/catalog/common/classes/image_ratio.php 2011-09-12 09:24:28 UTC (rev 3805)
@@ -186,7 +186,7 @@
$imgd = self::$CacheImage[self::$key]['conf']['getimagesize'];
if(self::$Modele !=null && method_exists(self::$Modele,'aspectratio' ))
- $image_size=call_user_func(array(self::$Modele, 'aspectratio'), $imgd[0], $imgd[1], $width, $height);
+ $image_size=call_user_func(array(get_class(self::$Modele), 'aspectratio'), $imgd[0], $imgd[1], $width, $height);
else $image_size = self::aspectratio($imgd[0], $imgd[1], $width, $height);
$width = $image_size["width"];
@@ -195,7 +195,7 @@
if (self::$env->img_create && $width !=$imgd[0] && $height != $imgd[1]) {
if(self::$Modele !=null && method_exists(self::$Modele,'thumbfile' ))
- $src=$image_size=call_user_func(array(self::$Modele, 'thumbfile'), $src, $width, $height, $imgd[0], $imgd[1], $imgd[2]);
+ $src=$image_size=call_user_func(array(get_class(self::$Modele), 'thumbfile'), $src, $width, $height, $imgd[0], $imgd[1], $imgd[2]);
else $src=self::thumbfile($src, $width, $height, $imgd[0], $imgd[1], $imgd[2]);
self::$CacheImage[self::$key][self::$keydim]['thumbfile']='true';
@@ -329,16 +329,17 @@
if (!$iscached) $makethumb = ($width_src > $width || $height_scr > $height) ? true : false;
else $makethumb = false;
+$makethumb = true;
if ($makethumb){
if(self::$Modele !=null && method_exists(self::$Modele,'thumbgd' ))
- $image=call_user_func(array(self::$Modele, 'thumbgd'), $image, $width, $height, $width_src, $height_scr, self::$types[$format], $thumbfile );
+ $image=call_user_func(array(get_class(self::$Modele), 'thumbgd'), $image, $width, $height, $width_src, $height_scr, self::$types[$format], $thumbfile );
else $image=self::thumbgd($image, $width, $height, $width_src, $height_scr, self::$types[$format], $thumbfile);
}
else{
$img=($iscached) ? $thumbfile : $image;
$image = self::CleanPathReturn($img);
}
-
+// var_dump($image);
return $image;
}
Modified: trunk/catalog/common/classes/imgratio_drivers/Carre.php
===================================================================
--- trunk/catalog/common/classes/imgratio_drivers/Carre.php 2011-09-09 13:59:55 UTC (rev 3804)
+++ trunk/catalog/common/classes/imgratio_drivers/Carre.php 2011-09-12 09:24:28 UTC (rev 3805)
@@ -21,8 +21,9 @@
extends image_ratio
{
+ function __construct(){
+ }
-
/**
@fn self::aspectratio ($width_src , $height_src , $max_width = '', $max_height = '')
@brief Redimensionnement des images en conservant leurs proportions
@@ -75,7 +76,7 @@
/**
@brief Force une image carré ,
*/
- static function thumbgd ($image, $width, $height, $width_src, $height_scr, $format, $thumbfile){
+ public static function thumbgd ($image, $width, $height, $width_src, $height_scr, $format, $thumbfile){
if($height>=$width)
$_th=$width;
@@ -90,18 +91,15 @@
elseif($width_src <= $height_scr){$dim=$width_src; $sens="1";}
else{$dim=$width_src;}
- // var_dump($sens);
//on determine le point de depart x,y
- if($sens == "1")
- {
- $point_x_ref=(float)($width_src/2)-($dim/2);
- $point_y_ref=(float)"0";
+ if($sens == "1"){
+ $point_x_ref=(float)($width_src/2)-($dim/2);
+ $point_y_ref=(float)"0";
}
// if($horizontale == "1")
- else
- {
- $point_x_ref=(float)"0";
- $point_y_ref=(float)($height_scr/2)-($dim/2);
+ else{
+ $point_x_ref=(float)"0";
+ $point_y_ref=(float)($height_scr/2)-($dim/2);
}
Modified: trunk/catalog/create_account.php
===================================================================
--- trunk/catalog/create_account.php 2011-09-09 13:59:55 UTC (rev 3804)
+++ trunk/catalog/create_account.php 2011-09-12 09:24:28 UTC (rev 3805)
@@ -1,12 +1,12 @@
<?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 31/10/10, 22:59
- *\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
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 09/09/11, 22:33
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
*\file
*\brief display form creat account and manage confirmed account by email
* depend class customer
@@ -58,7 +58,7 @@
$message_final=tep_post_prepare_email('create_account.tpl',$language,$myarray);
}
- tep_mail($user->firstname . ' ' . $user->lastname, $user->email_address, EMAIL_SUBJECT, $message_final, STORE_OWNER, EMAIL_FROM);
+ tep_mail($user->firstname . ' ' . $user->lastname, $user->email_address, sprintf(EMAIL_SUBJECT, STORE_NAME) , $message_final, STORE_OWNER, EMAIL_FROM);
$myarray = array(
@@ -127,7 +127,7 @@
$message_final=tep_post_prepare_email('create_account_confirm.tpl',$language,$myarray);
- tep_mail($user['customers_firstname'] . ' ' . $user['customers_lastname'], $email_address, EMAIL_SUBJECT, $message_final, STORE_OWNER, EMAIL_FROM);
+ tep_mail($user['customers_firstname'] . ' ' . $user['customers_lastname'], $email_address, sprintf(EMAIL_SUBJECT_CONFIRM, STORE_NAME), $message_final, STORE_OWNER, EMAIL_FROM);
$page->messageStack->add_session('create_account', TEXT_NEW_SENT_EMAIL, 'success');
Modified: trunk/catalog/includes/classes/driver.content.php
===================================================================
--- trunk/catalog/includes/classes/driver.content.php 2011-09-09 13:59:55 UTC (rev 3804)
+++ trunk/catalog/includes/classes/driver.content.php 2011-09-12 09:24:28 UTC (rev 3805)
@@ -1,10 +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.1.0
- @date 19/11/10, 18:04
+ @version 2.1.1
+ @date 09/09/11, 23:26
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@file driver.content.php
@@ -182,7 +182,6 @@
Extract img et complete cache avec img extraites
*/
private static function extract_img($id,$content,$pattern){
- $pattern = "#<img.+[^>]/>#i";
preg_match_all($pattern, $content, $images);
//! mise en cache
self::$array_data[$id]->images=$images ;
@@ -199,6 +198,21 @@
$sortie=(isset(self::$opt['img']) && !_test_bool(self::$opt['img']))? preg_replace($pattern, '', $content) : $content;
$sortie=(isset(self::$opt['more']) && _test_bool(self::$opt['more']))? substr($sortie, 0, strpos($sortie,'<!-- pagebreak -->')) : $sortie;
+
+ /// process replace in text the var config in constante
+ $pattern = "/%_.*_%/i";
+ preg_match_all($pattern, $sortie, $replace,PREG_OFFSET_CAPTURE);
+ foreach($replace as $item){
+ if(isset($item[0][0])){
+ $i= (string)$item[0][0];
+ if($i =='') break;
+ $re = substr( $i, 2 , strlen($i)-4) ;
+ if($re !='' && tep_cst_define($re) !=false){
+ $sortie = preg_replace("/%_".$re."_%/",tep_cst_define($re) , $sortie );
+ }
+ }
+ }
+
return $sortie;
}
Modified: trunk/catalog/includes/classes/page.contact.php
===================================================================
--- trunk/catalog/includes/classes/page.contact.php 2011-09-09 13:59:55 UTC (rev 3804)
+++ trunk/catalog/includes/classes/page.contact.php 2011-09-12 09:24:28 UTC (rev 3805)
@@ -99,12 +99,12 @@
$myarray = array(
'from'=>$name,
'from_email'=>$email_address,
- 'subject'=>EMAIL_SUBJECT,
+ 'subject'=>sprintf(EMAIL_SUBJECT, STORE_NAME),
'email_use_html'=>_cst_bool('EMAIL_USE_HTML'),
'message'=>$name.' '.$email_address.'<br />'.$enquiry,
);
- notification::notif('contact_us',EMAIL_SUBJECT,$myarray,$data);
+ notification::notif('contact_us',sprintf(EMAIL_SUBJECT, STORE_NAME),$myarray,$data);
tep_redirect(tep_href_link(FILENAME_CONTACT_US, 'action=success'));
Modified: trunk/catalog/includes/content/checkout_payment.php
===================================================================
--- trunk/catalog/includes/content/checkout_payment.php 2011-09-09 13:59:55 UTC (rev 3804)
+++ trunk/catalog/includes/content/checkout_payment.php 2011-09-12 09:24:28 UTC (rev 3805)
@@ -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/01/11, 16:28
+ @version 2.1.1
+ @date 09/09/11, 22:30
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -107,7 +107,7 @@
<fieldset>
<legend><?php echo CHECKOUT_CGV ;?></legend>
- <label for="conditions"><?php echo TEXT_CONDITIONS ;?></label>
+ <label for="conditions"><?php printf(TEXT_CONDITIONS , tep_href_link(FILENAME_CONDITIONS, 'origin=checkout_payment') );?></label>
<input name="conditions" id="conditions" type="checkbox" <?php echo isset($_GET['consult_conditions']) ? 'checked="checked"' : '' ;?> />
</fieldset>
Modified: trunk/catalog/includes/content/checkout_success.php
===================================================================
--- trunk/catalog/includes/content/checkout_success.php 2011-09-09 13:59:55 UTC (rev 3804)
+++ trunk/catalog/includes/content/checkout_success.php 2011-09-12 09:24:28 UTC (rev 3805)
@@ -1,10 +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.1.0
- @date 18/11/10, 21:53
+ @version 2.1.1
+ @date 09/09/11, 22:30
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -17,7 +17,10 @@
<div><?php echo TEXT_SUCCESS; ?></div>
- <div><?php echo TEXT_SEE_ORDERS . '<br /><br />' . TEXT_CONTACT_STORE_OWNER ;?></div>
+ <div><?php printf(TEXT_SEE_ORDERS , tep_href_link(FILENAME_ACCOUNT, '', 'SSL'), tep_href_link(FILENAME_ACCOUNT_HISTORY, '', 'SSL') ) ?>
+ <br /><br />
+ <?php printf(TEXT_CONTACT_STORE_OWNER , tep_href_link(FILENAME_CONTACT_US) ) ;?>
+ </div>
<h3><?php echo TEXT_THANKS_FOR_SHOPPING; ?></h3>
Modified: trunk/catalog/includes/content/home.php
===================================================================
--- trunk/catalog/includes/content/home.php 2011-09-09 13:59:55 UTC (rev 3804)
+++ trunk/catalog/includes/content/home.php 2011-09-12 09:24:28 UTC (rev 3805)
@@ -1,10 +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.1.0
- @date 16/09/10, 21:55
+ @version 2.1.1
+ @date 09/09/11, 22:25
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -14,7 +14,7 @@
<h2 class="content title <?php echo $language ;?>"><?php echo HEADING_TITLE; ?></h2>
<p class="customerGreeting"><?php echo tep_customer_greeting(); ?></p>
- <div class="textMain"><?php echo TEXT_MAIN ; ?></div>
+ <div class="textMain"><?php printf(TEXT_MAIN, PROJECT_VERSION ) ; ?></div>
<div class="banner_main">
<?php $page->oscss_modules->_add(FILENAME_NEW_PRODUCTS,'center'); ?>
</div>
Modified: trunk/catalog/includes/languages/fr_FR/checkout_payment.php
===================================================================
--- trunk/catalog/includes/languages/fr_FR/checkout_payment.php 2011-09-09 13:59:55 UTC (rev 3804)
+++ trunk/catalog/includes/languages/fr_FR/checkout_payment.php 2011-09-12 09:24:28 UTC (rev 3805)
@@ -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.1.0
- @date 07/06/10, 14:47
+ @version 2.1.1
+ @date 09/09/11, 22:30
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -21,6 +22,6 @@
define('TITLE_CONTINUE_CHECKOUT_PROCEDURE',"Continuer la procédure de commande" );
define('TEXT_CONTINUE_CHECKOUT_PROCEDURE',"Confirmer cette commande." );
define('CHECKOUT_CGV',"Conditions générales de vente" );
-define('TEXT_CONDITIONS',"J'ai lu et accepté les <a href=\"" . tep_href_link(FILENAME_CONDITIONS, 'origin=checkout_payment') . "\" class=\"conditions\"> Conditions générales de vente ! </a>" );
+define('TEXT_CONDITIONS',"J'ai lu et accepté les <a href=\"%s\" class=\"conditions\"> Conditions générales de vente ! </a>" );
define('JS_ERROR_NO_CHECK_CONDITION',"* Pour continuer votre commande la case conditions générales de vente doit être cochée !" );
?>
\ No newline at end of file
Modified: trunk/catalog/includes/languages/fr_FR/checkout_success.php
===================================================================
--- trunk/catalog/includes/languages/fr_FR/checkout_success.php 2011-09-09 13:59:55 UTC (rev 3804)
+++ trunk/catalog/includes/languages/fr_FR/checkout_success.php 2011-09-12 09:24:28 UTC (rev 3805)
@@ -1,20 +1,21 @@
<?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.1.0
- @date 07/06/10, 14:47
+ @version 2.1.1
+ @date 09/09/11, 22:30
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
+
define('NAVBAR_TITLE_1',"Commande" );
define('NAVBAR_TITLE_2',"Succès" );
define('HEADING_TITLE',"Votre commande vient d'être prise en compte !" );
define('TEXT_SUCCESS',"Votre commande vient d'être prise en compte avec succès ! Elle sera traitée dans les 2 à 5 jours. Vous recevrez un email de confirmation" );
-// define('TEXT_NOTIFY_PRODUCTS', 'Veuillez m'informer des mises à jour des produits que j'ai choisis ci-dessous :');
-define('TEXT_SEE_ORDERS',"Vous pouvez voir l'historique de votre commande en allant à la page <a href=\"" . tep_href_link(FILENAME_ACCOUNT, '', 'SSL') . "\">'Mon compte'</a> et en cliquant sur <a href=\"" . tep_href_link(FILENAME_ACCOUNT_HISTORY, '', 'SSL') . "\">'Historique'</a>." );
-define('TEXT_CONTACT_STORE_OWNER',"Veuillez poser toutes les questions directement au <a href=\"" . tep_href_link(FILENAME_CONTACT_US) . "\">service commercial</a>." );
+define('TEXT_SEE_ORDERS',"Vous pouvez voir l'historique de votre commande en allant à la page <a href=\"%s\">'Mon compte'</a> et en cliquant sur <a href=\"%s\">'Historique'</a>." );
+define('TEXT_CONTACT_STORE_OWNER',"Veuillez poser toutes les questions directement au <a href=\"%s\">service commercial</a>." );
define('TEXT_THANKS_FOR_SHOPPING',"Merci d'avoir acheter sur notre boutique !" );
define('TABLE_HEADING_COMMENTS',"Écrivez un commentaire pour la commande passée;" );
define('TABLE_HEADING_DOWNLOAD_DATE',"date d'expiration : " );
Modified: trunk/catalog/includes/languages/fr_FR/contact_us.php
===================================================================
--- trunk/catalog/includes/languages/fr_FR/contact_us.php 2011-09-09 13:59:55 UTC (rev 3804)
+++ trunk/catalog/includes/languages/fr_FR/contact_us.php 2011-09-12 09:24:28 UTC (rev 3805)
@@ -1,16 +1,17 @@
<?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.1.0
- @date 07/06/10, 14:47
+ @version 2.1.1
+ @date 09/09/11, 22:33
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
define('HEADING_TITLE',"Contactez-nous" );
define('NAVBAR_TITLE',"Contactez-nous" );
define('PAGE_CONTACT_US_SUCCESS',"Votre requête a été envoyée avec succès au propriétaire du site." );
-define('EMAIL_SUBJECT',"Requête de " . STORE_NAME . " " );
+define('EMAIL_SUBJECT',"Requête de %s " );
define('ENTRY_NAME',"Nom et Prénom :" );
define('ENTRY_EMAIL',"Adresse e-mail :" );
define('PAGE_CONTACT_US',"Préambule formulaire de contact, pour cibler les demandes" );
Modified: trunk/catalog/includes/languages/fr_FR/create_account.php
===================================================================
--- trunk/catalog/includes/languages/fr_FR/create_account.php 2011-09-09 13:59:55 UTC (rev 3804)
+++ trunk/catalog/includes/languages/fr_FR/create_account.php 2011-09-12 09:24:28 UTC (rev 3805)
@@ -3,16 +3,16 @@
@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 24/01/11, 09:52
+ @version 2.1.1
+ @date 09/09/11, 22:38
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
define('NAVBAR_TITLE',"Créer un compte" );
define('HEADING_TITLE',"Information de mon compte" );
define('TEXT_ORIGIN_LOGIN',"<strong class=\"notice\">REMARQUE :</strong> Si vous avez déjà un compte chez nous, veuillez vous connecter à la page <a href=\"%s\">d'ouverture de session</a>." );
-define('EMAIL_SUBJECT',"Bienvenue sur " . STORE_NAME . " ");
-define('EMAIL_SUBJECT_CONFIRM',"Compte à confirmé sur " . STORE_NAME." ");
+define('EMAIL_SUBJECT',"Bienvenue sur %s ");
+define('EMAIL_SUBJECT_CONFIRM',"Compte à confirmé sur %s ");
define('EMAIL_GREET_MR',"Cher M. %s,\n" );
define('EMAIL_GREET_MS',"Chère M<sup>me</sup> %s,\n" );
define('EMAIL_GREET_ML',"Chère M<sup>lle</sup> %s,\n" );
Modified: trunk/catalog/includes/languages/fr_FR/create_account_success.php
===================================================================
--- trunk/catalog/includes/languages/fr_FR/create_account_success.php 2011-09-09 13:59:55 UTC (rev 3804)
+++ trunk/catalog/includes/languages/fr_FR/create_account_success.php 2011-09-12 09:24:28 UTC (rev 3805)
@@ -3,15 +3,15 @@
@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 24/01/11, 09:52
+ @version 2.1.1
+ @date 09/09/11, 22:38
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
define('NAVBAR_TITLE',"Créer un compte" );
define('HEADING_TITLE',"Information de mon compte" );
define('TEXT_ORIGIN_LOGIN',"<strong class=\"notice\">REMARQUE :</strong> Si vous avez déjà un compte chez nous, veuillez vous connecter à la page <a href=\"%s\">d'ouverture de session</a>." );
-define('EMAIL_SUBJECT',"Bienvenue sur " . STORE_NAME . " ");
+define('EMAIL_SUBJECT',"Bienvenue sur %s ");
define('EMAIL_GREET_MR',"Cher M. %s,\n" );
define('EMAIL_GREET_MS',"Chère M<sup>me</sup> %s,\n" );
define('EMAIL_GREET_ML',"Chère M<sup>lle</sup> %s,\n" );
Modified: trunk/catalog/includes/languages/fr_FR/home.php
===================================================================
--- trunk/catalog/includes/languages/fr_FR/home.php 2011-09-09 13:59:55 UTC (rev 3804)
+++ trunk/catalog/includes/languages/fr_FR/home.php 2011-09-12 09:24:28 UTC (rev 3805)
@@ -1,13 +1,14 @@
<?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.1.0
- @date 07/06/10, 14:47
+ @version 2.1.1
+ @date 09/09/11, 22:25
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
define('HEADING_TITLE',"Bienvenue" );
-define('TEXT_MAIN',"<p>Ceci est une installation par défaut du projet osCSS, les produits affichés le sont dans un but démonstratif, <strong>aucun produit acheté ne sera livré ni facturé au client.</strong></p><p>Toutes informations vues sur ces produits doivent être traitées comme fictives. </p><p>Si vous souhaitez télécharger la solution qui propulse cette boutique, ou contribuer au projet osCSS, rendez-vous sur le <a href=\"http://forums.oscss.org\">forum osCSS</a>. </p><p>Cette boutique est propulsée par osCSS <strong>\' . PROJECT_VERSION . \'</strong>.</p>" );
+define('TEXT_MAIN',"<p>Ceci est une installation par défaut du projet osCSS, les produits affichés le sont dans un but démonstratif, <strong>aucun produit acheté ne sera livré ni facturé au client.</strong></p><p>Toutes informations vues sur ces produits doivent être traitées comme fictives. </p><p>Si vous souhaitez télécharger la solution qui propulse cette boutique, ou contribuer au projet osCSS, rendez-vous sur le <a href=\"http://forums.oscss.org\">forum osCSS</a>. </p><p>Cette boutique est propulsée par osCSS <strong>%s</strong>.</p>" );
?>
\ No newline at end of file
Modified: trunk/catalog/includes/languages/fr_FR/password_forgotten.php
========================...
[truncated message content] |
|
From: <os...@us...> - 2011-09-13 14:27:26
|
Revision: 3807
http://oscss.svn.sourceforge.net/oscss/?rev=3807&view=rev
Author: oscim
Date: 2011-09-13 14:27:15 +0000 (Tue, 13 Sep 2011)
Log Message:
-----------
Ajustement suite
Modified Paths:
--------------
trunk/catalog/admin/includes/appli_top_Test.php
trunk/catalog/includes/appli_top_Test.php
trunk/catalog/includes/application_top.php
trunk/catalog/includes/functions/initialize.php
Added Paths:
-----------
trunk/catalog/includes/classes/drivers/page/data/
Modified: trunk/catalog/admin/includes/appli_top_Test.php
===================================================================
--- trunk/catalog/admin/includes/appli_top_Test.php 2011-09-13 13:41:22 UTC (rev 3806)
+++ trunk/catalog/admin/includes/appli_top_Test.php 2011-09-13 14:27:15 UTC (rev 3807)
@@ -1,12 +1,12 @@
<?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 04/07/11, 10:14
- \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
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 13/09/11, 16:16
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
\file
\dir admin/includes/
\brief is init file oscss core backoffice for test by phpUnit.
@@ -14,13 +14,8 @@
the file not load in normal load pages in backoffice
*/
-//!This displays executed queries in error message NOT recommanded in a production environment!
- define('OSCSS_DEBUG', true);
- define('OSCSS_SHOW_QUERIES', true);
- define('OSCSS_GARBAGE_ERROR', false);
-
//! Start the clock for the page parse time log
define('PAGE_PARSE_START_TIME', microtime());
@@ -56,10 +51,10 @@
include(DIR_FS_ADMIN.DIR_WS_CLASSES . 'navigationHistory.php');
include(DIR_FS_ADMIN.DIR_WS_CLASSES . 'objectInfo.php');
include(DIR_FS_ADMIN.DIR_WS_CLASSES . 'emailUtility.php');
- include(DIR_FS_CATALOG.DIR_WS_COMMON_CLASSES. 'email.php');
- include(DIR_FS_CATALOG.DIR_WS_COMMON_CLASSES . 'mime.php');
- include(DIR_FS_CATALOG.DIR_WS_COMMON_CLASSES . 'Template.php');
+ include(DIR_FS_CATALOG.DIR_WS_COMMON_CLASSES. 'PHPMailer.php');
+
+
//! var init
$page_admin=(isset($_GET['page_admin']) || !empty($_GET['page_admin']) ) ? tep_sanitize_string($_GET['page_admin']) : 'index';
$action = (isset($_GET['action'])) ? tep_sanitize_string($_GET['action']) : '';
Modified: trunk/catalog/includes/appli_top_Test.php
===================================================================
--- trunk/catalog/includes/appli_top_Test.php 2011-09-13 13:41:22 UTC (rev 3806)
+++ trunk/catalog/includes/appli_top_Test.php 2011-09-13 14:27:15 UTC (rev 3807)
@@ -19,26 +19,8 @@
/// start the timer for the page parse time log
define('PAGE_PARSE_START_TIME', microtime());
-//!This displays executed queries in error message NOT recommanded in a production environment!
- /**
- * \brief as active / inactive cache and error return
- * @var boolean
- */
- define('OSCSS_DEBUG', true);
- /**
- * \brief as active view query in error requet sql
- * @var boolean
- */
- define('OSCSS_SHOW_QUERIES', true);
- /**
- * \brief as active / incative garbage collector error
- * @var boolean
- */
- define('OSCSS_GARBAGE_ERROR', false);
-// define('MODULE_ORDER_TOTAL_DISCOUNT_COUPON_DEBUG', true);
-
/// Set the local configuration parameters - mainly for developers
if (file_exists('includes/local/configure.php')) include('includes/local/configure.php');
elseif (!file_exists('includes/configure.php')) {
Modified: trunk/catalog/includes/application_top.php
===================================================================
--- trunk/catalog/includes/application_top.php 2011-09-13 13:41:22 UTC (rev 3806)
+++ trunk/catalog/includes/application_top.php 2011-09-13 14:27:15 UTC (rev 3807)
@@ -85,7 +85,7 @@
autoload::getInstance();
autoload::addPath(DIR_FS_TEMPLATES.TEMPLATE_NAME.'/'.DIR_WS_CLASSES .'%s.php',4);
autoload::addPath(DIR_FS_TEMPLATES.TEMPLATE_NAME.'/'.DIR_WS_CLASSES .'page.%s.php',4);
- autoload::addPath(DIR_FS_TEMPLATES.TEMPLATE_NAME.'/'.DIR_WS_CLASSES .'driver.%s.php',4);
+ autoload::addPath(DIR_FS_TEMPLATES.TEMPLATE_NAME.'/'.DIR_WS_CLASSES .'drivers/data/%s.php',4);
/// include list of project class and lib permanente
include(DIR_WS_INCLUDES . 'inc_base_lib.php');
Modified: trunk/catalog/includes/functions/initialize.php
===================================================================
--- trunk/catalog/includes/functions/initialize.php 2011-09-13 13:41:22 UTC (rev 3806)
+++ trunk/catalog/includes/functions/initialize.php 2011-09-13 14:27:15 UTC (rev 3807)
@@ -27,7 +27,7 @@
private function __construct(){
self::addPath(DIR_FS_CATALOG.DIR_WS_CLASSES .'%s.php');// standard
self::addPath(DIR_FS_CATALOG.DIR_WS_CLASSES .'page.%s.php'); // page contructeur
- self::addPath(DIR_FS_CATALOG.DIR_WS_CLASSES .'driver.%s.php'); // data ressource type
+ self::addPath(DIR_FS_CATALOG.DIR_WS_CLASSES .'drivers/data/%s.php'); // data ressource type
self::addPath(DIR_FS_CATALOG.DIR_WS_CLASSES .'osCSS.%s.php');
self::addPath(DIR_FS_CATALOG.DIR_WS_COMMON_CLASSES .'%s.php');// Common
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-09-15 06:56:02
|
Revision: 3810
http://oscss.svn.sourceforge.net/oscss/?rev=3810&view=rev
Author: oscim
Date: 2011-09-15 06:55:55 +0000 (Thu, 15 Sep 2011)
Log Message:
-----------
deport de la function tep_extraxt_querystring ds general
Correction et amelioration du module listing, qui supporte le passage d'option lors de la preparation de la requete sql
correction de coquille sur les langue
Ajout d'une option permettant de faire disparaitre la precision Ht/TTC
Mise a niveau de l'install
renomage fichier passage 2.1.0 a 2.1.1
Modified Paths:
--------------
trunk/catalog/admin/includes/languages/fr_FR/modules/newsletters/new_products.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/newsletters/newsletter.txt
trunk/catalog/admin/includes/modules/newsletters/newsletter.php
trunk/catalog/common/classes/price.php
trunk/catalog/includes/application_top.php
trunk/catalog/includes/classes/AbstractAcaModule.php
trunk/catalog/includes/classes/core_page/listing.php
trunk/catalog/includes/functions/general.php
trunk/catalog/includes/functions/initialize.php
trunk/catalog/includes/functions/template.php
trunk/catalog/includes/inc_base_lib.php
trunk/catalog/index.php
trunk/catalog/install/oscss_config.sql
Added Paths:
-----------
trunk/catalog/install/includes/upgrade/2.1.0-2.1.1.sql
Removed Paths:
-------------
trunk/catalog/install/includes/upgrade/2.1.0-update.sql
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/newsletters/new_products.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/newsletters/new_products.txt 2011-09-14 08:02:37 UTC (rev 3809)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/newsletters/new_products.txt 2011-09-15 06:55:55 UTC (rev 3810)
@@ -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 26/03/11, 23:17
+ @version 2.1.1
+ @date 14/09/11, 15:17
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -21,5 +21,5 @@
/* Email */
-$lang['text view online <a href="%s" >click here</a>']='text view online <a href="%s" >click here</a>" ;
+$lang['text view online <a href="%s" >click here</a>']="Si vous ne visualizez pas correctement cet email <a href=\"%s\" >cliquez ici, version en ligne</a>";
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/newsletters/newsletter.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/newsletters/newsletter.txt 2011-09-14 08:02:37 UTC (rev 3809)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/newsletters/newsletter.txt 2011-09-15 06:55:55 UTC (rev 3810)
@@ -3,10 +3,10 @@
@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 26/03/11, 23:17
+ @version 2.1.1
+ @date 14/09/11, 15:17
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
-$lang['text view online <a href="%s" >click here</a>']='text view online <a href="%s" >click here</a>" ;
+$lang['text view online <a href="%s" >click here</a>']="Si vous ne visualizez pas correctement cet email <a href=\"%s\" >cliquez ici, version en ligne</a>";
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/modules/newsletters/newsletter.php
===================================================================
--- trunk/catalog/admin/includes/modules/newsletters/newsletter.php 2011-09-14 08:02:37 UTC (rev 3809)
+++ trunk/catalog/admin/includes/modules/newsletters/newsletter.php 2011-09-15 06:55:55 UTC (rev 3810)
@@ -90,7 +90,7 @@
$formail=substr($formail,0,-1);
- $mail_query = $DB->query($sql="select s.customers_id as id, s.customers_firstname as firstname, s.customers_lastname as lastname , s.customers_email_address as email , ci.customers_info_date_account_created as created, ci.customers_info_date_of_last_logon, customers_shopping_points as points from " . TABLE_CUSTOMERS . " s ," . TABLE_CUSTOMERS_INFO. " ci where s.customers_id=customers_info_id and s.customers_newsletter = '1' AND s.customers_id=customers_info_id and s.customers_email_address IN (".$formail.") ");
+ $mail_query = $DB->query($sql="select s.customers_id as id, s.customers_firstname as firstname, s.customers_lastname as lastname , s.customers_email_address as email , ci.customers_info_date_account_created as created, ci.customers_info_date_of_last_logon, customers_shopping_points as points from " . TABLE_CUSTOMERS . " s ," . TABLE_CUSTOMERS_INFO. " ci where s.customers_id=customers_info_id AND s.customers_id=customers_info_id and s.customers_email_address IN (".$formail.") ");
}
/// mode normal , send
Modified: trunk/catalog/common/classes/price.php
===================================================================
--- trunk/catalog/common/classes/price.php 2011-09-14 08:02:37 UTC (rev 3809)
+++ trunk/catalog/common/classes/price.php 2011-09-15 06:55:55 UTC (rev 3810)
@@ -196,8 +196,10 @@
private function display_tax_symbol($style='html') {
$tax_symbol = ' ';
- if (self::is_SPPC_show_tax()) $tax_symbol .= TAX_SYMBOL;
- else $tax_symbol .= NOTAX_SYMBOL;
+ if(_cst_bool('NO_DISPLAY_SYMBOL_TAXE') ==false){
+ if (self::is_SPPC_show_tax()) $tax_symbol .= TAX_SYMBOL;
+ else $tax_symbol .= NOTAX_SYMBOL;
+ }
if ($style=='html')
return '<span class="tax_symbol">'.$tax_symbol.'</span>';
Modified: trunk/catalog/includes/application_top.php
===================================================================
--- trunk/catalog/includes/application_top.php 2011-09-14 08:02:37 UTC (rev 3809)
+++ trunk/catalog/includes/application_top.php 2011-09-15 06:55:55 UTC (rev 3810)
@@ -84,8 +84,9 @@
/// ajout chemin template dans autoload class
autoload::getInstance();
autoload::addPath(DIR_FS_TEMPLATES.TEMPLATE_NAME.'/'.DIR_WS_CLASSES .'%s.php',4);
- autoload::addPath(DIR_FS_TEMPLATES.TEMPLATE_NAME.'/'.DIR_WS_CLASSES .'core_page/.%s.php',4);
- autoload::addPath(DIR_FS_TEMPLATES.TEMPLATE_NAME.'/'.DIR_WS_CLASSES .'core_page/overlay/.%s.php',4);
+ autoload::addPath(DIR_FS_TEMPLATES.TEMPLATE_NAME.'/'.DIR_WS_CLASSES .'core_page/%s.php',4);
+ autoload::addPath(DIR_FS_TEMPLATES.TEMPLATE_NAME.'/'.DIR_WS_CLASSES .'core_page/overlay/%s.php',4);
+ autoload::addPath(DIR_FS_TEMPLATES.TEMPLATE_NAME.'/'.DIR_WS_CLASSES .'drivers/page/%s.php',4);
autoload::addPath(DIR_FS_TEMPLATES.TEMPLATE_NAME.'/'.DIR_WS_CLASSES .'drivers/data/%s.php',4);
/// include list of project class and lib permanente
Modified: trunk/catalog/includes/classes/AbstractAcaModule.php
===================================================================
--- trunk/catalog/includes/classes/AbstractAcaModule.php 2011-09-14 08:02:37 UTC (rev 3809)
+++ trunk/catalog/includes/classes/AbstractAcaModule.php 2011-09-15 06:55:55 UTC (rev 3810)
@@ -228,4 +228,159 @@
}
+
+
+
+class AcaFactory
+ extends AbstractAcaModule
+ implements InterfaceAcaGene{
+
+ //! @p object
+ protected static $_instance;
+
+ /**
+ @fn __construct()
+ @brief Charge les module aca specifique au porduits
+ @param $key string la clef
+ @param $const string , le nom de la constante, si nommage non generic
+ */
+ protected function __construct($key, $const='') {
+ global $language, $page, $lang;
+
+ // if $const is empty, use generic name based on value in $key
+ if(empty($const)) $const = strtoupper('MODULE_'.$key.'_INSTALLED');
+
+ $this->name=$key;
+ $this->generics_id='';
+ $this->image_handler='';
+ $this->modules=array();
+
+ foreach(parent::initialise_type($const,$key) as $class){
+ $cl[$class]=new $class ();
+ $list_mod[$class] = $cl[$class]->sort_order;
+ asort($list_mod);
+ foreach($list_mod as $class=>$s){
+ $this->modules[$class] =$cl[$class];
+ }
+ unset($cl);unset($list_mod);
+ }
+
+
+ return self::$_instance;
+ }
+
+ public static function factory($class)
+ {
+ if (class_exists($class))
+ {
+ if(isset(self::$instance) && self::$instance instanceof $class) {
+ return self::$instance;
+ }
+ self::$instance = new $class;
+ return self::$instance;
+
+ } else {
+ throw new Exception('Classe introuvable.');
+ }
+ }
+
+
+ /**
+ * \fn getInstance($full=false)
+ * @param $full
+ */
+ public static function getInstance($key, $const='') {
+ if(self::$_instance == null) self::$_instance = new self($key, $const);
+
+// var_dump(get_class(self::$_instance));
+// var_dump(get_class());
+ return self::$_instance;
+ }
+
+ /**
+ * \fn resetInstance()
+ */
+ public static function resetInstance($key, $const=''){
+ self::$_instance = null;
+ return self::getInstance($key, $const);
+ }
+
+
+ /**
+ * \fn display_view($pID,$class='')
+ * \brief
+ Affiche module elemennt html
+
+ Block principal d'affichage, liste ou vue des élément. Block principal de page
+
+ * @param $pID int le Id du produits
+ * @param $class string le nom de la class appelé, ou vide pour toutes les class enfants
+ */
+ public function display_view($pID,$class=''){
+ global $page;
+ if (!empty($class)) {
+ if (isset($this->modules[$class]) && $this->modules[$class]->enabled and (method_exists($class, 'display_view' ))){
+ $this->modules[$class]->load_db_values($pID);
+ return $this->modules[$class]->display_view($pID);
+ }
+ } else {
+ $c='';
+ if(isset($this->modules) && is_array($this->modules))
+ foreach ($this->modules as $key=>$module) {
+ if (($module->enabled) and (method_exists($module, 'display_view' ))) {
+ $this->modules[$key]->load_db_values($pID);
+ $c .=$this->modules[$key]->display_view($pID);
+ }
+ }
+ return $c;
+ }
+ }
+
+
+
+ /**
+ * \fn display_view_min($cID,$class='')
+ * \brief Affiche module display_view mini
+ * @param $pID int le Id du produits
+ * @param $class string le nom de la class appelé, ou vide pour toutes les class enfants
+ */
+ public function display_view_min($cID,$class=''){
+ global $page;
+ if (!empty($class)) {
+ if (isset($this->modules[$class]) && $this->modules[$class]->enabled and (method_exists($class, 'display_view_min' ))){
+ $this->modules[$class]->load_db_values($cID);
+ return $this->modules[$class]->display_view_min($cID);
+ }
+ } else {
+ $c='';
+ foreach ($this->modules as $key=>$module) {
+ if (($module->enabled) and (method_exists($module, 'display_view_min' ))) {
+ $this->modules[$key]->load_db_values($cID);
+ $c .=$this->modules[$key]->display_view_min($cID);
+ }
+ }
+ return $c;
+ }
+ }
+
+
+ /**
+ * \fn display_titre($cID,$format='$s')
+ * \brief Affiche bock titre client notifié
+ * @param $cID int
+ * @param $format string for sprintf
+ */
+ public function display_titre($cID,$format='$s'){
+ $c='';
+ foreach ($this->modules as $key=>$module) {
+ if (($module->enabled) and (method_exists($module, 'display_titre' ))) {
+ $this->modules[$key]->load_db_values($cID);
+ $c .=$this->modules[$key]->display_titre($format);
+ }
+ }
+ return $c;
+ }
+
+
+}
?>
\ No newline at end of file
Modified: trunk/catalog/includes/classes/core_page/listing.php
===================================================================
--- trunk/catalog/includes/classes/core_page/listing.php 2011-09-14 08:02:37 UTC (rev 3809)
+++ trunk/catalog/includes/classes/core_page/listing.php 2011-09-15 06:55:55 UTC (rev 3810)
@@ -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 31/03/11, 20:12
+ @version 2.1.1
+ @date 14/09/11, 20:23
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@Class listing
@@ -105,15 +105,20 @@
self::$sql_sort='';
}
- static public function listing($type_object,$category_depth){
+ /**
+ @brief Public fonciton d'appel du listing
+ @param $getstring param string sous forme de chaine (abc=a&id=2)
+ */
+ static public function listing($type_object,$category_depth,$getstring=''){
global $page;
if($category_depth=='nested')self::$type_object= 'nested';
elseif((isset($type_object) && $type_object=='products') || $category_depth=='products') self::$type_object= 'products';
elseif((isset($type_object) && $type_object=='pages') || $category_depth=='pages') self::$type_object= 'pages';
+ $get=tep_extrac_querystring($getstring);
- $listing_sql=self::query();
+ $listing_sql=self::query($get);
$listing_sql .=self::Exeorderby().self::$limit;
@@ -134,9 +139,15 @@
}
- static private function query(){
+ /**
+ @brief constructeur de la requete sql
+ @param $get array()
+ */
+ static private function query($get=array()){
global $languages_id, $current_category_id;
+ $Get = ((is_array($get) && count($get)> 0 )? $get : $_GET );
+
//! cat courante
$cID=(self::$category_id ===false)? $current_category_id : self::$category_id;
@@ -148,12 +159,12 @@
LEFT JOIN " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c on p2c.products_id= p.products_id
WHERE pd.language_id = '" . (int)$languages_id . "' ";
- if (isset($_GET['manufacturers_id']) && isset($_GET['filter_id']) && tep_not_null($_GET['filter_id']))
- $listing_sql .=" and manufacturers_id = '" . (int)$_GET['manufacturers_id'] . "' and p2c.categories_id = '" . (int)$_GET['filter_id'] . "' ";
- elseif (isset($_GET['filter_id']) && tep_not_null($_GET['filter_id']))
- $listing_sql .=" and manufacturers_id = '" . (int)$_GET['filter_id'] . "'";
- elseif (isset($_GET['manufacturers_id']))
- $listing_sql .=" and manufacturers_id = '" . (int)$_GET['manufacturers_id'] . "'";
+ if (isset($Get['manufacturers_id']) && isset($Get['filter_id']) && tep_not_null($Get['filter_id']))
+ $listing_sql .=" and manufacturers_id = '" . (int)$Get['manufacturers_id'] . "' and p2c.categories_id = '" . (int)$Get['filter_id'] . "' ";
+ elseif (isset($Get['filter_id']) && tep_not_null($Get['filter_id']))
+ $listing_sql .=" and manufacturers_id = '" . (int)$Get['filter_id'] . "'";
+ elseif (isset($Get['manufacturers_id']))
+ $listing_sql .=" and manufacturers_id = '" . (int)$Get['manufacturers_id'] . "'";
elseif (!empty($cID))
$listing_sql .=" and p2c.categories_id = '" . (int)$cID . "'";
Modified: trunk/catalog/includes/functions/general.php
===================================================================
--- trunk/catalog/includes/functions/general.php 2011-09-14 08:02:37 UTC (rev 3809)
+++ trunk/catalog/includes/functions/general.php 2011-09-15 06:55:55 UTC (rev 3810)
@@ -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 29/01/11, 14:26
+ @version 2.1.1
+ @date 14/09/11, 20:33
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*\file general.php
@@ -1025,6 +1025,25 @@
}
+/**
+ * \fn tep_extrac_querystring($query='')
+ * \brief Extraction chaine en tableau
+ * @param $query string type Query_string
+ * @return array key=>value
+*/
+function tep_extrac_querystring($query=''){
+ $s=(!empty($query))?$query : $_SERVER['QUERY_STRING'];
+
+ $r=explode('&',$s);
+ foreach($r as $e){
+ $i=strpos($e,'=');
+ $f[substr($e,0,$i)]=substr($e,($i+1));
+ }
+ return $f;
+}
+
+
+
/** Alias */
function tep_get_countries_with_iso_codes($countries_id) { return tep_get_countries($countries_id, true); }
function tep_get_country_name($country_id) { $country_array = tep_get_countries($country_id); return $country_array['countries_name']; }
Modified: trunk/catalog/includes/functions/initialize.php
===================================================================
--- trunk/catalog/includes/functions/initialize.php 2011-09-14 08:02:37 UTC (rev 3809)
+++ trunk/catalog/includes/functions/initialize.php 2011-09-15 06:55:55 UTC (rev 3810)
@@ -28,6 +28,7 @@
self::addPath(DIR_FS_CATALOG.DIR_WS_CLASSES .'%s.php');// standard
self::addPath(DIR_FS_CATALOG.DIR_WS_CLASSES .'core_page/%s.php'); // page contructeur
self::addPath(DIR_FS_CATALOG.DIR_WS_CLASSES .'core_page/overlay/%s.php'); // page contructeur ressource surcouche template
+ self::addPath(DIR_FS_CATALOG.DIR_WS_CLASSES .'drivers/page/%s.php'); // data ressource type
self::addPath(DIR_FS_CATALOG.DIR_WS_CLASSES .'drivers/data/%s.php'); // data ressource type
self::addPath(DIR_FS_CATALOG.DIR_WS_CLASSES .'osCSS.%s.php');
self::addPath(DIR_FS_CATALOG.DIR_WS_COMMON_CLASSES .'%s.php');// Common
Modified: trunk/catalog/includes/functions/template.php
===================================================================
--- trunk/catalog/includes/functions/template.php 2011-09-14 08:02:37 UTC (rev 3809)
+++ trunk/catalog/includes/functions/template.php 2011-09-15 06:55:55 UTC (rev 3810)
@@ -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/01/11, 22:42
+ @version 2.1.1
+ @date 14/09/11, 20:33
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@@ -14,24 +14,8 @@
*/
-/**
- * \fn tep_extrac_querystring($query='')
- * \brief Extraction chaine en tableau
- * @param $query string type Query_string
- * @return array key=>value
-*/
-function tep_extrac_querystring($query=''){
- $s=(!empty($query))?$query : $_SERVER['QUERY_STRING'];
- $r=explode('&',$s);
- foreach($r as $e){
- $i=strpos($e,'=');
- $f[substr($e,0,$i)]=substr($e,($i+1));
- }
- return $f;
-}
-
/**
* \fn tep_build_tree($tree, $categories_string='',$entry, $last_member = false, $level = 0, $path = '')
* \brief Specific boxes categories_dropdown
@@ -196,9 +180,8 @@
* @return string module->content
*/
function the_description($mod='desc_base'){
- global $module;
- if(!isset($module[$mod])) return;
- $ele=$module[$mod]->display_view($_GET['products_id']);
- return unhtmlentities($ele[0]->content);
+ global $modules;
+ if(!isset($modules[$mod])) return;
+ return unhtmlentities($modules[$mod][0]->content);
}
?>
\ No newline at end of file
Modified: trunk/catalog/includes/inc_base_lib.php
===================================================================
--- trunk/catalog/includes/inc_base_lib.php 2011-09-14 08:02:37 UTC (rev 3809)
+++ trunk/catalog/includes/inc_base_lib.php 2011-09-15 06:55:55 UTC (rev 3810)
@@ -35,7 +35,7 @@
if( ($path=autoload::getPath('driver.content')) && $path != false) $file[]=$path;
if( ($path=autoload::getPath('page')) && $path != false) $file[]=$path;
- if( ($path=autoload::getPath('drivers/page/'.PUBLIC_DRIVERS_PAGE)) && $path != false) $file[]=$path;
+// if( ($path=autoload::getPath('drivers/page/'.PUBLIC_DRIVERS_PAGE)) && $path != false) $file[]=$path;
if( ($path=autoload::getPath('customer')) && $path != false) $file[]=$path;
if( ($path=autoload::getPath('oscss_plugins')) && $path != false) $file[]=$path;
if( ($path=autoload::getPath('oscss_modules')) && $path != false) $file[]=$path;
Modified: trunk/catalog/index.php
===================================================================
--- trunk/catalog/index.php 2011-09-14 08:02:37 UTC (rev 3809)
+++ trunk/catalog/index.php 2011-09-15 06:55:55 UTC (rev 3810)
@@ -191,9 +191,10 @@
$listing_query = $DB->query($listing_split->sql_query);
$page_content = $page->force_content('index_listing.php');
- }
+ }
+ else
+ $page->init(basename(__FILE__),$language);
-
}
Copied: trunk/catalog/install/includes/upgrade/2.1.0-2.1.1.sql (from rev 3797, trunk/catalog/install/includes/upgrade/2.1.0-update.sql)
===================================================================
--- trunk/catalog/install/includes/upgrade/2.1.0-2.1.1.sql (rev 0)
+++ trunk/catalog/install/includes/upgrade/2.1.0-2.1.1.sql 2011-09-15 06:55:55 UTC (rev 3810)
@@ -0,0 +1,93 @@
+#+###################################-+
+#| osCSS Open Source E-commerce |
+#+###################################-+
+#| Copyright (c) 2005-2010 The osCSS developers |
+#| |
+#| http://www.oscss.org |
+#| http://www.oscim.net |
+#| Portions Copyright (c) 2003 osCommerce |
+#+###################################-+
+#| This source file is subject to version 2.0 of the GPL license, |
+#| available at the following url: |
+#| http://www.oscss.org/license/2_0.txt. |
+#+###################################-+
+
+# NOTE: * Please make any modifications to this file by hand!
+# * DO NOT use a mysqldump created file for new changes!
+# * Please take note of the table structure, and use this
+# structure as a standard for future modifications!
+# * Any tables you add here should be added in admin/backup.php
+# and in catalog/install/includes/functions/database.php
+# * Comments should be like these, full line comments.
+# (don't use inline comments)
+
+
+
+
+
+if not exists (select * from osc_configuration where configuration_key = 'CFG_CLASS_VIRTUAL_TYPE_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 ('CFG_CLASS_VIRTUAL_TYPE_1_S', 'CFG_CLASS_VIRTUAL_TYPE_1', '', 'CFG_CLASS_VIRTUAL_TYPE_L', '0', '0', NOW(), NOW(),NULL, 'tep_cfg_text_auto(', 1);
+
+if not exists (select * from osc_configuration where configuration_key = 'CFG_CLASS_VIRTUAL_TYPE_2' )
+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 ('CFG_CLASS_VIRTUAL_TYPE_2_S', 'CFG_CLASS_VIRTUAL_TYPE_2', '', 'CFG_CLASS_VIRTUAL_TYPE_L', '0', '0', NOW(), NOW(),NULL, 'tep_cfg_text_auto(', 1);
+
+if not exists (select * from osc_configuration where configuration_key = 'CFG_CLASS_VIRTUAL_TYPE_3' )
+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 ('CFG_CLASS_VIRTUAL_TYPE_3_S', 'CFG_CLASS_VIRTUAL_TYPE_3', '', 'CFG_CLASS_VIRTUAL_TYPE_L', '0', '0', NOW(), NOW(),NULL, 'tep_cfg_text_auto(', 1);
+
+if not exists (select * from osc_configuration where configuration_key = 'CFG_CLASS_VIRTUAL_TYPE_4' )
+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 ('CFG_CLASS_VIRTUAL_TYPE_4_S', 'CFG_CLASS_VIRTUAL_TYPE_4', '', 'CFG_CLASS_VIRTUAL_TYPE_L', '0', '0', NOW(), NOW(),NULL, 'tep_cfg_text_auto(', 1);
+
+if not exists (select * from osc_configuration where configuration_key = 'TYPE_VIRTUAL_PRODUCTS' )
+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 ('TYPE_VIRTUAL_PRODUCTS_S', 'TYPE_VIRTUAL_PRODUCTS', '', 'TYPE_VIRTUAL_PRODUCTS_L', '0', '0', NOW(), NOW(),NULL, NULL, 2);
+
+if not exists (select * from osc_configuration where configuration_key = 'STOCK_MARK_PRODUCT_NO_STOCK' )
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, configuration_type) values ('STOCK_MARK_PRODUCT_NO_STOCK_S', 'STOCK_MARK_PRODUCT_NO_STOCK', '*cmd*', 'STOCK_MARK_PRODUCT_NO_STOCK_L', '9', '4', NOW(), NOW(), 3);
+
+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 ('CUSTOMER_FORCE_UCWORDS_S', 'CUSTOMER_FORCE_UCWORDS', '6', 'CUSTOMER_FORCE_UCWORDS_L', '28', '20', NULL, NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),','3');
+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 ('CUSTOMER_FORCE_STRTOUPPER_S', 'CUSTOMER_FORCE_STRTOUPPER', '10', 'CUSTOMER_FORCE_STRTOUPPER_L', '28', '21', NULL, NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),','3');
+
+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 ('CUSTOMER_CITY_FORCE_STRTOUPPER_S', 'CUSTOMER_CITY_FORCE_STRTOUPPER', '10', 'CUSTOMER_CITY_FORCE_STRTOUPPER_L', '28', '21', NULL, NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),','3');
+
+delete from osc_configuration where configuration_key='PRODINFO_ATTRIBUTE_PLUGIN' limit 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 ('PUBLIC_PAGE_TYPE_S', 'PUBLIC_PAGE_TYPE', 'listing,product,account,home,content', 'PUBLIC_PAGE_TYPE_L', '0', '0', NOW(), NOW(),NULL, NULL, 2);
+
+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 ('PUBLIC_DRIVERS_PAGE_S', 'PUBLIC_DRIVERS_PAGE', 'GabaritTemplate', 'PUBLIC_DRIVERS_PAGE_L', '0', '0', NOW(), NOW(),NULL, NULL, 2);
+
+
+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 ('NO_DISPLAY_SYMBOL_TAXE_S', 'NO_DISPLAY_SYMBOL_TAXE', 'GabaritTemplate', 'NO_DISPLAY_SYMBOL_TAXE_L', '0', '0', NOW(), NOW(),NULL, NULL, 2);
+
+
+
+ALTER TABLE osc_orders ADD holding_origin_id INT( 11 ) NOT NULL ;
+
+ALTER TABLE osc_holding_orders_products ADD products_stock_attributes VARCHAR( 255 ) NULL AFTER products_quantity ;
+
+ALTER TABLE osc_orders ADD class_payment VARCHAR( 30 ) NOT NULL AFTER holding_origin_id ,
+ADD class_shipping VARCHAR( 30 ) NOT NULL AFTER class_payment ;
+
+ALTER TABLE osc_products CHANGE vendors_id track_stock INT( 1 ) NOT NULL DEFAULT 1;
+
+ALTER TABLE osc_customers ADD COLUMN customers_language int(10) NOT NULL DEFAULT '1';
+ALTER TABLE osc_customers ADD COLUMN customers_status int(1) NOT NULL DEFAULT '1';
+
+ALTER TABLE osc_customers_groups ADD group_discount DECIMAL( 5, 2 ) NOT NULL DEFAULT '0.00';
+
+ALTER TABLE osc_geo_zones ADD geo_zone_type TINYINT( 1 ) NOT NULL DEFAULT '1' AFTER geo_zone_id ;
+
+if not exists (select * from osc_status where status_name = 'VAT' )
+INSERT INTO osc_status VALUES (1, 'geo_zone_type', 1, 'VAT','');
+
+if not exists (select * from osc_status where status_name = 'SHIPPING' )
+INSERT INTO osc_status VALUES (2, 'geo_zone_type', 1, 'SHIPPING','');
+
+ALTER TABLE osc_newsletters ADD COLUMN newsletters_language int(11) NOT NULL default '1';
+
+drop table if exists osc_categories_extra;
+CREATE TABLE IF NOT EXISTS osc_categories_extra (
+ categories_id int(11) NOT NULL,
+ cat_key varchar(150) NOT NULL,
+ cat_value varchar(250) NOT NULL,
+ UNIQUE KEY categories_id (categories_id,cat_key)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
\ No newline at end of file
Deleted: trunk/catalog/install/includes/upgrade/2.1.0-update.sql
===================================================================
--- trunk/catalog/install/includes/upgrade/2.1.0-update.sql 2011-09-14 08:02:37 UTC (rev 3809)
+++ trunk/catalog/install/includes/upgrade/2.1.0-update.sql 2011-09-15 06:55:55 UTC (rev 3810)
@@ -1,90 +0,0 @@
-#+###################################-+
-#| osCSS Open Source E-commerce |
-#+###################################-+
-#| Copyright (c) 2005-2010 The osCSS developers |
-#| |
-#| http://www.oscss.org |
-#| http://www.oscim.net |
-#| Portions Copyright (c) 2003 osCommerce |
-#+###################################-+
-#| This source file is subject to version 2.0 of the GPL license, |
-#| available at the following url: |
-#| http://www.oscss.org/license/2_0.txt. |
-#+###################################-+
-
-# NOTE: * Please make any modifications to t...
[truncated message content] |
|
From: <os...@us...> - 2011-09-17 08:06:15
|
Revision: 3811
http://oscss.svn.sourceforge.net/oscss/?rev=3811&view=rev
Author: oscim
Date: 2011-09-17 08:06:08 +0000 (Sat, 17 Sep 2011)
Log Message:
-----------
Ajout gestion des watermark sur les images
Ajout option de configuration et element de langue correspondants
Modified Paths:
--------------
trunk/catalog/common/classes/image_ratio.php
trunk/catalog/common/classes/imgratio_drivers/Carre.php
trunk/catalog/install/includes/language/en_EN/oscss_config.txt
trunk/catalog/install/includes/language/fr_FR/oscss_config.txt
trunk/catalog/install/oscss_config.sql
Modified: trunk/catalog/common/classes/image_ratio.php
===================================================================
--- trunk/catalog/common/classes/image_ratio.php 2011-09-15 06:55:55 UTC (rev 3810)
+++ trunk/catalog/common/classes/image_ratio.php 2011-09-17 08:06:08 UTC (rev 3811)
@@ -39,6 +39,17 @@
*/
protected static $Modele=null;
/**
+ @var Active/inactive watermark in image. Default: null
+ */
+ protected static $Watermark=null;
+ /**
+ @var Active/inactive force makethumb
+ */
+ protected static $MakeThumb=false;
+
+
+
+ /**
PHP 5 Constructor
*/
private function __construct() {
@@ -66,6 +77,10 @@
self::$env->img_required=(bool)_cst_bool('IMAGE_REQUIRED');
self::$env->img_create=(bool)function_exists('imagecreatetruecolor');
+
+
+ putenv('GDFONTPATH=' . DIR_FS_CATALOG.DIR_WS_COMMON.'fonts/');
+
}
public static function getInstance() {
@@ -78,11 +93,28 @@
return self::getInstance();
}
+ /**
+ @brief Add / block text in image
-// public static function debug(){
-// print_r(self::$CacheImage);
-// }
+ */
+ public static function SetWatermark($etat=true){
+ self::$Watermark = ($etat == true) ? true : false ;
+ }
+ /**
+ @brief Add / block text in image
+
+ */
+ public static function SetMakeThumb($etat=true){
+ self::$MakeThumb = ($etat == true) ? true : false ;
+ }
+
+ /**
+ @brief Force driver modele
+ self::Modele is object driver
+ @param string name driver
+ @return string name;
+ */
public static function SetModele($modele){
require_once(DIR_WS_COMMON_CLASSES.'imgratio_drivers/'.$modele.'.php');
self::$Modele=new $modele ;
@@ -162,61 +194,142 @@
- private static function initCurrent($src,$width,$height){
-// var_dump(());
- self::$key = md5($src.get_class(self::$Modele));
- self::$keydim=md5($width . $height.get_class(self::$Modele));
- self::checkImg($src);
- }
+
+
+
+
+
/**
- @brief constructor thumbail
- @param $src string
- @param $key string cache key for img
- @param $alt string
- @param $width/$height numeric
- @param $parameters string
- @param $mode bool/string (true=url, false=normal, simple= sans width et height)
+ @brief public call and centralize choose process for add watermak
+ @param $thumb ressource image
+ @param $ht_src hauteur image
+ @param $type (text/image)
*/
- private static function constructImg($src, $alt = '', $width = '', $height = ''){
+ protected static function addWatermark($thumb,$height,$type='text'){
- if(isset(self::$CacheImage[self::$key][self::$keydim]) ) return self::$CacheImage[self::$key][self::$keydim];
+ if(self::$Watermark == false)
+ return $thumb;
- $imgd = self::$CacheImage[self::$key]['conf']['getimagesize'];
+ /**
+ Active watermark text in thumb
+ */
+ switch($type){
+ case 'text':
+ if(tep_cst_define('WATERMARK_IMAGE_PROTECT') ) {
+ if(self::$Modele !=null && method_exists(self::$Modele,'watermarkImage' ))
+ $src=$image_size=call_user_func(array(get_class(self::$Modele), 'watermarkImage'), $thumb,WATERMARK_IMAGE_PROTECT, $height);
+ else
+ $thumb = self::watermarkImage($thumb,WATERMARK_IMAGE_PROTECT, $height);
+ }
+ break;
+ }
- if(self::$Modele !=null && method_exists(self::$Modele,'aspectratio' ))
- $image_size=call_user_func(array(get_class(self::$Modele), 'aspectratio'), $imgd[0], $imgd[1], $width, $height);
- else $image_size = self::aspectratio($imgd[0], $imgd[1], $width, $height);
+ return $thumb;
+ }
- $width = $image_size["width"];
- $height = $image_size["height"];
+ /**
+ @fn self::aspectratio ($width_src , $height_src , $max_width = '', $max_height = '')
+ @brief Redimensionnement des images en conservant leurs proportions
+ @author Ayatus
+ @param $width_src string path.src img
+ @param $height_src float/empty max width en px
+ @param $max_width float/empty max height en px
+ @param $max_height float/empty max height en px
+ @return array (width,height)
+ */
+ protected static function aspectratio ($width_src , $height_src , $max_width = '', $max_height = ''){
- if (self::$env->img_create && $width !=$imgd[0] && $height != $imgd[1]) {
+ !empty ($max_width) && preg_match ('/^[0-9]{1,}$/', $max_width, $regs) && $max_width <= $width_src
+ ? true
+ : $max_width = $width_src;
+ !empty ($max_height) && preg_match ('/^[0-9]{1,}$/', $max_height, $regs) && $max_height <= $height_src
+ ? true
+ : $max_height = $height_src;
+ $width=$max_width;
+ $height=$max_height;
+ $width_a=$max_height * $width_src / $height_src;
+ $height_a=$max_width * $height_src / $width_src;
- if(self::$Modele !=null && method_exists(self::$Modele,'thumbfile' ))
- $src=$image_size=call_user_func(array(get_class(self::$Modele), 'thumbfile'), $src, $width, $height, $imgd[0], $imgd[1], $imgd[2]);
- else $src=self::thumbfile($src, $width, $height, $imgd[0], $imgd[1], $imgd[2]);
-
- self::$CacheImage[self::$key][self::$keydim]['thumbfile']='true';
+ if ($max_width == $max_height){
+ if ($width_src < $height_src){
+ $width=ceil($max_width * $width_src / $height_src);
+ $height=$max_width;
+ }
+ elseif ($width_src > $height_src) $height=ceil($height_a);
+ elseif ($width_src == $height_src) $height=$max_width;
}
- else{
- $src=self::CleanPathReturn($src);
- self::$CacheImage[self::$key][self::$keydim]['thumbfile']='false';
+ elseif (($height_a) > $max_height) $width=ceil($width_a);
+ elseif (($width_a) > $max_width) $height=ceil($height_a);
+ elseif ($width_src == $height_src){
+ if ($max_width > $max_height) $width=$max_height;
+ elseif ($max_width < $max_height) $height=$max_width;
}
+ return array("width"=>$width,"height"=>$height);
+ }
- self::$CacheImage[self::$key][self::$keydim]['src']=$src;
- self::$CacheImage[self::$key][self::$keydim]['alt']=$alt;
- self::$CacheImage[self::$key][self::$keydim]['width']=$width;
- self::$CacheImage[self::$key][self::$keydim]['height']=$height;
- self::$CacheImage[self::$key][self::$keydim]['mime']=$imgd['mime'];
+ /**
+ @author by Christian Lamine, FlashDreams OHG http://www.flashdreams.de/
+ Modified by http://www.team-noehring.de
+ Modified by http://www.tse.at
+ Modified by la...@iw...
+ Traduction Fr : cynic- pour OsCss
+ Modified by oscim for oscss debug + php script
+ Modified by Ayatus
+ @version Thumbnail-Script v1.3
+ Generating thumbnails 'on-the-fly' with PHP
+ @note
+ This script may be freely used, distribute
+ and modified without any charge as long as
+ this copyright information is included
+ Any commercial selling of this script is forbidden.
+ */
+ protected static function thumbgd ($image, $width, $height, $width_src, $height_scr, $format, $thumbfile){
+// error_reporting(E_ALL);
+ $image = call_user_func("imagecreatefrom".$format, $image);
+ $thumb = imagecreatetruecolor ($width, $height);
+ imagealphablending($thumb, false);
+ imagesavealpha($thumb, true);
+ imagefill($thumb, 0, 0, imagecolorallocatealpha($thumb, 0, 0, 0, 127));
+ imagecopyresampled ($thumb, $image, 0, 0, 0, 0, $width, $height, $width_src, $height_scr);
+ $thumb=self::addWatermark($thumb,$height);
- return self::$CacheImage[self::$key][self::$keydim];
+
+ if ($format == "jpeg") call_user_func("image".$format, $thumb, $thumbfile, self::$env->jpegquality);
+ else call_user_func("image".$format, $thumb, $thumbfile);
+ imagedestroy ($image);
+ imagedestroy ($thumb);
+
+ return $thumbfile;
}
+ protected static function thumbimagick ($image, $width, $height, $format, $thumbfile){
+// error_reporting(E_ALL);
+ if (self::$env->Imagick && self::$env->safemod ) {
+ $thumb = new Imagick($image);
+ foreach ($thumb as $frame) {
+ $frame->thumbnailImage($width, $height);
+ $frame->setImagePage($width, $height, 0, 0);
+ }
+ if ($format == "jpeg") {
+ $thumb->setImageCompression(imagick::COMPRESSION_JPEG);
+ $thumb->setImageCompressionQuality(self::$env->jpegquality);
+ }
+ $thumb->writeImages($thumbfile, true);
+ }
+
+ return $thumbfile;
+ }
+
+
+
+
+
+
/**
@fn checkImg($src)
@brief check if image exists and format image is ok
@@ -266,47 +379,63 @@
else self::$CacheImage[self::$key]['conf']['original'] = $src_dir;
}
+
+ private static function initCurrent($src,$width,$height){
+// var_dump(());
+ self::$key = md5($src.get_class(self::$Modele));
+ self::$keydim=md5($width . $height.get_class(self::$Modele));
+
+ self::checkImg($src);
+ }
+
/**
- @fn self::aspectratio ($width_src , $height_src , $max_width = '', $max_height = '')
- @brief Redimensionnement des images en conservant leurs proportions
- @author Ayatus
- @param $width_src string path.src img
- @param $height_src float/empty max width en px
- @param $max_width float/empty max height en px
- @param $max_height float/empty max height en px
- @return array (width,height)
+ @brief constructor thumbail
+ @param $src string
+ @param $key string cache key for img
+ @param $alt string
+ @param $width/$height numeric
+ @param $parameters string
+ @param $mode bool/string (true=url, false=normal, simple= sans width et height)
*/
- private static function aspectratio ($width_src , $height_src , $max_width = '', $max_height = ''){
+ private static function constructImg($src, $alt = '', $width = '', $height = ''){
- !empty ($max_width) && preg_match ('/^[0-9]{1,}$/', $max_width, $regs) && $max_width <= $width_src
- ? true
- : $max_width = $width_src;
- !empty ($max_height) && preg_match ('/^[0-9]{1,}$/', $max_height, $regs) && $max_height <= $height_src
- ? true
- : $max_height = $height_src;
- $width=$max_width;
- $height=$max_height;
- $width_a=$max_height * $width_src / $height_src;
- $height_a=$max_width * $height_src / $width_src;
+ if(isset(self::$CacheImage[self::$key][self::$keydim]) ) return self::$CacheImage[self::$key][self::$keydim];
- if ($max_width == $max_height){
- if ($width_src < $height_src){
- $width=ceil($max_width * $width_src / $height_src);
- $height=$max_width;
- }
- elseif ($width_src > $height_src) $height=ceil($height_a);
- elseif ($width_src == $height_src) $height=$max_width;
+ $imgd = self::$CacheImage[self::$key]['conf']['getimagesize'];
+
+ if(self::$Modele !=null && method_exists(self::$Modele,'aspectratio' ))
+ $image_size=call_user_func(array(get_class(self::$Modele), 'aspectratio'), $imgd[0], $imgd[1], $width, $height);
+ else $image_size = self::aspectratio($imgd[0], $imgd[1], $width, $height);
+
+ $width = $image_size["width"];
+ $height = $image_size["height"];
+
+ if (self::$env->img_create && $width !=$imgd[0] && $height != $imgd[1]) {
+
+ if(self::$Modele !=null && method_exists(self::$Modele,'thumbfile' ))
+ $src=$image_size=call_user_func(array(get_class(self::$Modele), 'thumbfile'), $src, $width, $height, $imgd[0], $imgd[1], $imgd[2]);
+ else $src=self::thumbfile($src, $width, $height, $imgd[0], $imgd[1], $imgd[2]);
+
+ self::$CacheImage[self::$key][self::$keydim]['thumbfile']='true';
}
- elseif (($height_a) > $max_height) $width=ceil($width_a);
- elseif (($width_a) > $max_width) $height=ceil($height_a);
- elseif ($width_src == $height_src){
- if ($max_width > $max_height) $width=$max_height;
- elseif ($max_width < $max_height) $height=$max_width;
+ else{
+ $src=self::CleanPathReturn($src);
+ self::$CacheImage[self::$key][self::$keydim]['thumbfile']='false';
}
- return array("width"=>$width,"height"=>$height);
+
+ self::$CacheImage[self::$key][self::$keydim]['src']=$src;
+ self::$CacheImage[self::$key][self::$keydim]['alt']=$alt;
+ self::$CacheImage[self::$key][self::$keydim]['width']=$width;
+ self::$CacheImage[self::$key][self::$keydim]['height']=$height;
+ self::$CacheImage[self::$key][self::$keydim]['mime']=$imgd['mime'];
+
+
+ return self::$CacheImage[self::$key][self::$keydim];
}
+ /**
+ */
private static function thumbfile ($image, $width, $height, $width_src, $height_scr, $format){
$getclass=(self::$Modele !=null)?get_class(self::$Modele).'_': '';
@@ -326,10 +455,13 @@
self::$CacheImage[self::$key][self::$keydim]['thumbfile_cache'] = $iscached;
}
- if (!$iscached) $makethumb = ($width_src > $width || $height_scr > $height) ? true : false;
- else $makethumb = false;
+ if(self::$MakeThumb == false){
+ if (!$iscached) $makethumb = ($width_src > $width || $height_scr > $height) ? true : false;
+ else $makethumb = false;
+ }
+ else
+ $makethumb = true;
-
if ($makethumb){
if(self::$Modele !=null && method_exists(self::$Modele,'thumbgd' ))
$image=call_user_func(array(get_class(self::$Modele), 'thumbgd'), $image, $width, $height, $width_src, $height_scr, self::$types[$format], $thumbfile );
@@ -343,8 +475,6 @@
return $image;
}
-
-
/**
@brief Clean pathname prev return
@param string pathname
@@ -378,55 +508,50 @@
}
/**
- @author by Christian Lamine, FlashDreams OHG http://www.flashdreams.de/
- Modified by http://www.team-noehring.de
- Modified by http://www.tse.at
- Modified by la...@iw...
- Traduction Fr : cynic- pour OsCss
- Modified by oscim for oscss debug + php script
- Modified by Ayatus
- @version Thumbnail-Script v1.3
- Generating thumbnails 'on-the-fly' with PHP
- @note
- This script may be freely used, distribute
- and modified without any charge as long as
- this copyright information is included
- Any commercial selling of this script is forbidden.
+ @brief Add Watemerak in image thumb
+ @param $thumb ressource image
+ @param $WaterMarkText texte à ajouté
+ @param $ht_src hauteur image
+ @param $repeat nbr de repetition
+ @return ressource image
+
+ @note use
*/
- private static function thumbgd ($image, $width, $height, $width_src, $height_scr, $format, $thumbfile){
-// error_reporting(E_ALL);
- $image = call_user_func("imagecreatefrom".$format, $image);
- $thumb = imagecreatetruecolor ($width, $height);
- imagealphablending($thumb, false);
- imagesavealpha($thumb, true);
- imagefill($thumb, 0, 0, imagecolorallocatealpha($thumb, 0, 0, 0, 127));
- imagecopyresampled ($thumb, $image, 0, 0, 0, 0, $width, $height, $width_src, $height_scr);
+ private static function watermarkImage($thumb,$WaterMarkText, $ht_src, $repeat=50){
- if ($format == "jpeg") call_user_func("image".$format, $thumb, $thumbfile, self::$env->jpegquality);
- else call_user_func("image".$format, $thumb, $thumbfile);
- imagedestroy ($image);
- imagedestroy ($thumb);
+// $black = imagecolorallocate($thumb, 0, 0, 0);
+ $grey0 = imagecolorallocate($thumb, 128, 128, 128);
+ $grey = imagecolorallocate($thumb, 211, 211, 211);
+ $font = 'arial.ttf';
+ $font_size = 12;
+ $max =($ht_src/$font_size);
- return $thumbfile;
- }
+ $text = '';
+ for($i=0; $i<5; $i++) {
+ $text .=$WaterMarkText.' ';
+ }
- private static function thumbimagick ($image, $width, $height, $format, $thumbfile){
-// error_reporting(E_ALL);
- if (self::$env->Imagick && self::$env->safemod ) {
- $thumb = new Imagick($image);
- foreach ($thumb as $frame) {
- $frame->thumbnailImage($width, $height);
- $frame->setImagePage($width, $height, 0, 0);
- }
- if ($format == "jpeg") {
- $thumb->setImageCompression(imagick::COMPRESSION_JPEG);
- $thumb->setImageCompressionQuality(self::$env->jpegquality);
- }
- $thumb->writeImages($thumbfile, true);
+ for($i=0; $i<$max; $i++) {
+ imagettftext($thumb, $font_size,
+ 45 , // angle
+ 10+1, // position x
+ (($font_size * $i * 8) + 2), // position y
+ $grey0,
+ $font,
+ $text
+ );
+ imagettftext($thumb, $font_size,
+ 45 , // angle
+ 10, // position x
+ (($font_size * $i * 8) + 0), // position y
+ $grey,
+ $font,
+ $text
+ );
}
- return $thumbfile;
+ return $thumb;
}
}
Modified: trunk/catalog/common/classes/imgratio_drivers/Carre.php
===================================================================
--- trunk/catalog/common/classes/imgratio_drivers/Carre.php 2011-09-15 06:55:55 UTC (rev 3810)
+++ trunk/catalog/common/classes/imgratio_drivers/Carre.php 2011-09-17 08:06:08 UTC (rev 3811)
@@ -76,7 +76,7 @@
/**
@brief Force une image carré ,
*/
- public static function thumbgd ($image, $width, $height, $width_src, $height_scr, $format, $thumbfile){
+ static function thumbgd ($image, $width, $height, $width_src, $height_scr, $format, $thumbfile){
if($height>=$width)
$_th=$width;
@@ -111,6 +111,8 @@
imagecopyresampled ($thumb, $image,0 , 0 , $point_x_ref ,$point_y_ref, $_th, $_th, $dim, $dim);
+ $thumb=parent::addWatermark($thumb,$height);
+
if ($format == "jpeg") call_user_func("image".$format, $thumb, $thumbfile, self::$env->jpegquality);
else call_user_func("image".$format, $thumb, $thumbfile);
imagedestroy ($image);
@@ -120,22 +122,20 @@
}
-// protected static function thumbimagick ($image, $width, $height, $format, $thumbfile){
-// // error_reporting(E_ALL);
-// if (self::$env->Imagick && self::$env->safemod ) {
-// $thumb = new Imagick($image);
-// foreach ($thumb as $frame) {
-// $frame->thumbnailImage($width, $height);
-// $frame->setImagePage($width, $height, 0, 0);
-// }
-// if ($format == "jpeg") {
-// $thumb->setImageCompression(imagick::COMPRESSION_JPEG);
-// $thumb->setImageCompressionQuality(self::$env->jpegquality);
-// }
-// $thumb->writeImages($thumbfile, true);
-// }
-//
-// return $thumbfile;
+
+ /**
+ @brief Add Watemerak in image thumb
+ @param $thumb ressource image
+ @param $WaterMarkText texte à ajouté
+ @param $ht_src hauteur image
+ @param $repeat nbr de repetition
+ @return ressource image
+ */
+// public static function watermarkImage($thumb,$WaterMarkText, $ht_src, $repeat=50){
+// return $thumb;
// }
+
+
+
}
?>
\ No newline at end of file
Modified: trunk/catalog/install/includes/language/en_EN/oscss_config.txt
===================================================================
--- trunk/catalog/install/includes/language/en_EN/oscss_config.txt 2011-09-15 06:55:55 UTC (rev 3810)
+++ trunk/catalog/install/includes/language/en_EN/oscss_config.txt 2011-09-17 08:06:08 UTC (rev 3811)
@@ -105,7 +105,10 @@
$lg['IMAGE_REQUIRED_L']= 'Allow the display of broken links on the images (for development).';
$lg['IMAGE_NONEXISTENT_S']= 'Substitution Image not found';
$lg['IMAGE_NONEXISTENT_L']= 'Image that replaces the image not found';
+$lg['WATERMARK_IMAGE_PROTECT_S']="watermak in image" ;
+$lg['WATERMARK_IMAGE_PROTECT_L']="text for watermark image" ;
+
/// 6 module option
$lg['DEFAULT_CURRENCY_S']= 'Devise par défaut';
$lg['DEFAULT_CURRENCY_L']= 'Devise par défaut.';
Modified: trunk/catalog/install/includes/language/fr_FR/oscss_config.txt
===================================================================
--- trunk/catalog/install/includes/language/fr_FR/oscss_config.txt 2011-09-15 06:55:55 UTC (rev 3810)
+++ trunk/catalog/install/includes/language/fr_FR/oscss_config.txt 2011-09-17 08:06:08 UTC (rev 3811)
@@ -105,6 +105,8 @@
$lg['IMAGE_REQUIRED_L']="Permettre l'affichage des liens brisés sur les images (pour le développement)." ;
$lg['IMAGE_NONEXISTENT_S']="Substitution image introuvable" ;
$lg['IMAGE_NONEXISTENT_L']="Image qui vient remplacer l'image non trouvée" ;
+$lg['WATERMARK_IMAGE_PROTECT_S']="Ajoute de filigrame sur les images" ;
+$lg['WATERMARK_IMAGE_PROTECT_L']="preciser le texte à ajouter sur les images" ;
/// 6 module option
$lg['DEFAULT_CURRENCY_S']="Devise par défaut" ;
Modified: trunk/catalog/install/oscss_config.sql
===================================================================
--- trunk/catalog/install/oscss_config.sql 2011-09-15 06:55:55 UTC (rev 3810)
+++ trunk/catalog/install/oscss_config.sql 2011-09-17 08:06:08 UTC (rev 3811)
@@ -192,6 +192,10 @@
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 ('PUBLIC_DRIVERS_PAGE_S', 'PUBLIC_DRIVERS_PAGE', 'GabaritTemplate', 'PUBLIC_DRIVERS_PAGE_L', '0', '0', NOW(), NOW(),NULL, NULL, 2);
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 ('NO_DISPLAY_SYMBOL_TAXE_S', 'NO_DISPLAY_SYMBOL_TAXE', 'GabaritTemplate', 'NO_DISPLAY_SYMBOL_TAXE_L', '0', '0', NOW(), NOW(),NULL, NULL, 2);
+
+
+
+
## 1 store
insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, configuration_type) values ('ORDERS_NUMBER_PREFIX_S', 'ORDERS_NUMBER_PREFIX', 'ym-5', 'ORDERS_NUMBER_PREFIX_L', '1', '0', NULL, NOW(), '2');
insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added) values ('STORE_NAME_S', 'STORE_NAME', 'osCSS Demo Shop', 'STORE_NAME_L', '1', '1', NULL, NOW());
@@ -231,7 +235,11 @@
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 ('JPEG_QUALITY_S', 'JPEG_QUALITY', '95', 'JPEG_QUALITY_L', '4', '11', NULL, NOW(), NULL, 'tep_cfg_pull_down_num_list(80,100,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) values ('IMAGE_REQUIRED_S', 'IMAGE_REQUIRED', 'false', 'IMAGE_REQUIRED_L', '4', '12', 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, use_function, set_function) values ('IMAGE_NONEXISTENT_S', 'IMAGE_NONEXISTENT', 'oscss_logo.png', 'IMAGE_NONEXISTENT_L', '4', '13', NOW(), NOW(), NULL, 'tep_cfg_choose_img(');
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, ) values ('WATERMARK_IMAGE_PROTECT_S', 'WATERMARK_IMAGE_PROTECT', '', 'WATERMARK_IMAGE_PROTECT_L', '4', '13', NOW(), NOW(), NULL);
+
+
+
## 6 module option
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 ('DEFAULT_ORDERS_STATUS_ID_S', 'DEFAULT_ORDERS_STATUS_ID', '1', 'DEFAULT_ORDERS_STATUS_ID_L', '6', '2', NULL, NOW(), NULL, NULL);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-09-19 11:37:01
|
Revision: 3812
http://oscss.svn.sourceforge.net/oscss/?rev=3812&view=rev
Author: oscim
Date: 2011-09-19 11:36:54 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
correction coquille
Add class for manage path for docs
Modified Paths:
--------------
trunk/catalog/install/oscss_config.sql
Added Paths:
-----------
trunk/catalog/common/classes/DatasFiles.php
Added: trunk/catalog/common/classes/DatasFiles.php
===================================================================
--- trunk/catalog/common/classes/DatasFiles.php (rev 0)
+++ trunk/catalog/common/classes/DatasFiles.php 2011-09-19 11:36:54 UTC (rev 3812)
@@ -0,0 +1,147 @@
+<?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.1
+ @date 19/09/11, 11:40
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class DatasFiles
+ @brief Class d'organisation des fichiers par type et id
+ @example usage
+ $DaFi=new DatasFiles;
+ DatasFiles->GetPathid('orders', '25655');
+ @note
+ Arboresnace des document sur osCSS
+
+ - data/docs
+ + type
+ - orders
+ - invoices
+ - delivery
+ - others
+
+ Repartition des fichier dans un sous arboresance identique pour chaque type
+ La determination du chemin ce fait en fonction de l'id. les 2 derniers chiffre sotn repartis comme suit
+ ex client 23659 >> path / 9/5/23659
+
+ - data/docs/type
+ + num
+ - 0
+ - 0
+ - 1
+ - ..
+ - 9
+ - 1
+ - ...
+ - 9
+*/
+
+
+
+Class DatasFiles{
+
+
+ static public $DataDoc = 'docs/';
+
+
+
+ function __construct(){
+ self::$DataDoc = DIR_FS_ROOT_DOCS . self::$DataDoc ;
+ }
+
+
+ /**
+ @brief creat base tree structure for type folder (orders, invoices )
+ */
+ /*private*/ static function InitFolder($folder){
+
+ $path_base = self::$DataDoc . $folder .'/';
+
+ if(!file_exists($path_base) || !is_dir($path_base))
+ mkdir($path_base);
+
+ else return $path_base;
+
+ for($i=0; $i<=9; $i++){
+ $path = $path_base . $i . '/';
+ if(!file_exists($path) || !is_dir($path))
+ mkdir($path);
+
+ for($j=0; $j<=9; $j++){
+ $path = $path_base . $i . '/' . $j .'/';
+ if(!file_exists($path) || !is_dir($path))
+ mkdir($path);
+
+ }
+ }
+
+ return $path_base;
+ }
+
+
+ /**
+ @brief convert id for leng min 3
+ */
+ static function ConvertId($id){
+ if(strlen($id) < 4)
+ $id=sprintf("%04d" ,(int)$id );
+
+ return $id;
+ }
+
+ /**
+ @brief construct and return path for id
+ */
+ static function PathForId($id){
+
+ $Id=self::ConvertId($id);
+
+ $path='';
+
+ $l = strlen($Id);
+
+ $path .= substr($Id,($l-1),1).'/' .substr($Id,($l-2),1).'/' . $Id.'/';
+
+ return $path;
+ }
+
+
+
+
+ /**
+ @brief public call function init for type and id
+ @param id customer id
+ @param $type type docs (invoice, orders, ...)
+ @return path for type & id
+ */
+ public function GetPathid($type, $id){
+ $pathid=self::PathForId($id);
+
+ $path = self::InitFolder($type);
+
+ if(!file_exists($path.$pathid))
+ mkdir($path.$pathid);
+
+ return $path.$pathid;
+ }
+
+
+
+}
+
+
+define('DIR_FS_ROOT_DOCS' , dirname(__FILE__).'/Datas/');
+$CustDaFi=new DatasFiles;
+
+
+
+
+
+for($i=11000 ; $i<12000 ; $i++ ){
+ DatasFiles::InitPathid('test3', $i);
+}
+
+
+?>
Modified: trunk/catalog/install/oscss_config.sql
===================================================================
--- trunk/catalog/install/oscss_config.sql 2011-09-17 08:06:08 UTC (rev 3811)
+++ trunk/catalog/install/oscss_config.sql 2011-09-19 11:36:54 UTC (rev 3812)
@@ -235,11 +235,10 @@
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 ('JPEG_QUALITY_S', 'JPEG_QUALITY', '95', 'JPEG_QUALITY_L', '4', '11', NULL, NOW(), NULL, 'tep_cfg_pull_down_num_list(80,100,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) values ('IMAGE_REQUIRED_S', 'IMAGE_REQUIRED', 'false', 'IMAGE_REQUIRED_L', '4', '12', 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, use_function, set_function) values ('IMAGE_NONEXISTENT_S', 'IMAGE_NONEXISTENT', 'oscss_logo.png', 'IMAGE_NONEXISTENT_L', '4', '13', NOW(), NOW(), NULL, 'tep_cfg_choose_img(');
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, ) values ('WATERMARK_IMAGE_PROTECT_S', 'WATERMARK_IMAGE_PROTECT', '', 'WATERMARK_IMAGE_PROTECT_L', '4', '13', NOW(), NOW(), NULL);
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added ) values ('WATERMARK_IMAGE_PROTECT_S', 'WATERMARK_IMAGE_PROTECT', '', 'WATERMARK_IMAGE_PROTECT_L', '4', '13', NOW(), NOW());
-
## 6 module option
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 ('DEFAULT_ORDERS_STATUS_ID_S', 'DEFAULT_ORDERS_STATUS_ID', '1', 'DEFAULT_ORDERS_STATUS_ID_L', '6', '2', NULL, NOW(), NULL, NULL);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-09-14 08:02:50
|
Revision: 3809
http://oscss.svn.sourceforge.net/oscss/?rev=3809&view=rev
Author: oscim
Date: 2011-09-14 08:02:37 +0000 (Wed, 14 Sep 2011)
Log Message:
-----------
correction coquille et reorganisation partiel des class du FO
Modified Paths:
--------------
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/categories.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/newsletters.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/products.txt
trunk/catalog/admin/includes/modules/pages/categories.php
trunk/catalog/admin/includes/modules/pages/products.php
trunk/catalog/common/classes/image_ratio.php
trunk/catalog/includes/application_top.php
trunk/catalog/includes/functions/initialize.php
trunk/catalog/includes/inc_base_lib.php
Added Paths:
-----------
trunk/catalog/includes/classes/core_page/
trunk/catalog/includes/classes/core_page/account.php
trunk/catalog/includes/classes/core_page/contact.php
trunk/catalog/includes/classes/core_page/customer.php
trunk/catalog/includes/classes/core_page/customer_and_coupon.php
trunk/catalog/includes/classes/core_page/develop.php
trunk/catalog/includes/classes/core_page/generic.php
trunk/catalog/includes/classes/core_page/home.php
trunk/catalog/includes/classes/core_page/javascript.php
trunk/catalog/includes/classes/core_page/listing.php
trunk/catalog/includes/classes/core_page/overlay/
trunk/catalog/includes/classes/core_page/overlay/oscss_boxes.php
trunk/catalog/includes/classes/core_page/overlay/oscss_modules.php
trunk/catalog/includes/classes/core_page/overlay/oscss_plugins.php
Removed Paths:
-------------
trunk/catalog/includes/classes/page.account.php
trunk/catalog/includes/classes/page.contact.php
trunk/catalog/includes/classes/page.customer.php
trunk/catalog/includes/classes/page.customer_and_coupon.php
trunk/catalog/includes/classes/page.develop.php
trunk/catalog/includes/classes/page.generic.php
trunk/catalog/includes/classes/page.home.php
trunk/catalog/includes/classes/page.javascript.php
trunk/catalog/includes/classes/page.listing.php
trunk/catalog/includes/classes/page.oscss_boxes.php
trunk/catalog/includes/classes/page.oscss_modules.php
trunk/catalog/includes/classes/page.oscss_plugins.php
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/pages/categories.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/pages/categories.txt 2011-09-13 16:28:06 UTC (rev 3808)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/categories.txt 2011-09-14 08:02:37 UTC (rev 3809)
@@ -1,9 +1,10 @@
<?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 23/03/11, 14:49
+ @version 2.1.1
+ @date 13/09/11, 17:30
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -58,8 +59,8 @@
$lang['text delete image cat']="Aucune image" ;
$lang['text how to copy']="Méthode de copie :" ;
$lang['view in menu']="Voir dans le menu" ;
-$lang['error catalog image directory not writeable']="Erreur : Impossible d\'écrire dans le répertoire images : " . DIR_FS_CATALOG_IMAGE. " " ;
-$lang['error catalog image directory does not exist']="Erreur : Le répertoire d\'images n\'existe pas : " . DIR_FS_CATALOG_IMAGE. " " ;
+$lang['error catalog image directory not writeable %s']="Erreur : Impossible d'écrire dans le répertoire d'images : %s " ;
+$lang['error catalog image directory does not exist %s']="Erreur : Le répertoire d'images n'existe pas : %s " ;
$lang['error cannot move category to parent']="Erreur : La catégorie ne peut pas être déplacée dans la sous-catégorie." ;
$lang['image preview public']="Prévisualiser page public" ;
$lang['image view public']="Voir page public" ;
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/pages/newsletters.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/pages/newsletters.txt 2011-09-13 16:28:06 UTC (rev 3808)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/newsletters.txt 2011-09-14 08:02:37 UTC (rev 3809)
@@ -10,3 +10,86 @@
*/
$lang['heading title']="Gestionnaire de bulletin d'informations" ;
$lang['text info heading delete newsletters']="Suppression du bulletin d'informations" ;
+
+/* Listing */
+$lang['table heading newsletters']="Bulletin d informations";
+$lang['table heading size']="Taille";
+$lang['table heading module']="Module";
+$lang['table heading sent']="Envoyée";
+$lang['table heading status']="Statut";
+$lang['table heading action']="Action";
+$lang['table heading nbr send']="Envoi";
+$lang['text newsletter format']="Format de l'Email";
+$lang['text newsletter module titre']="Type d'envoi";
+$lang['text newsletter module']="Module :";
+$lang['text newsletter module help']="Ce choix vous permet de définir le type de communication souhaité, un bulletin d'information d'ordre générale (newsletter), ou la communication sur un ou plusieurs produits ciblés (products notifications)";
+$lang['text newsletter title']="Sujet du bulletin d'informations : ";
+$lang['text newsletter title help']="Le sujet du mail";
+$lang['text newsletter content']="Contenu : ";
+$lang['text newsletter content help']="Vous pouvez utiliser les formats html ou texte. Si la boutique est réglée pour des Email au format texte, alors le contenu sera converti, si vous placez des images, assurez vous qu'elles soient accessibles d'internet";
+$lang['text newsletter date added']="Date d'ajout : ";
+$lang['text newsletter date sent']="Date d'envoi : ";
+$lang['text info delete intro']="Êtes-vous sûr de vouloir supprimer ce bulletin d'informations ?";
+$lang['text please wait']="Merci de patienter .. envois en cours ..<br /><br />Merci de ne pas interrompre ce traitement !";
+$lang['text finished sending emails']="Fini.. courrier électronique envoyé !";
+$lang['error newsletter title']="Erreur : Titre du bulletin d'informations requis";
+$lang['error newsletter module']="Erreur : Module bulletin d'informations requis";
+$lang['error remove unlocked newsletter']="Erreur : Merci de fermer le bulletin d'informations avant de le supprimer.";
+$lang['error edit unlocked newsletter']="Erreur : Merci de fermer le bulletin d'informations avant de l'éditer.";
+$lang['error send unlocked newsletter']="Erreur : Merci de fermer le bulletin d'informations avant de l'envoyer.";
+
+
+/* inline */
+$lang['text info number send number count']="nbr envoyé / nbr d'envoi :";
+$lang['text inline newsletter opened']="nbr ouvert / nbr d'envoi :";
+$lang['text inline newsletter click']="nbr click / nbr d'envoi :";
+$lang['text inline newsletter view_online']="nbr ouvert en ligne / nbr ouvert :";
+$lang['text inline newsletter moyn opened']="Moyenne ouverture :";
+$lang['text inline newsletter moyn click']="Moyenne de click :";
+$lang['text inline newsletter moyn view_online']="Moyenne ouvert en ligne :";
+
+/* Edit */
+$lang['text newsletter replace']="Remplacement ";
+$lang['text newsletter replace in mail']="Vous pouver utiliser les mot clefs ci-dessous, ils seront remplacés par leur valeur";
+$lang['type tag text user']="les tags associé aux clients";
+$lang['tag text [GENDER]']="Le genre , (Mr/Mme)";
+$lang['tag text [LASTNAME]']="Le prenom";
+$lang['tag text [POSTNAME]']="Le nom";
+$lang['tag text [DATE_CREATED]']="date de creation du compte";
+$lang['tag text [LAST_LOGON]']="derniere connexion";
+$lang['tag text [FIDELITY_POINTS]']="Les points de cet uitlisateur";
+
+
+/* Preview */
+$lang['text info preview newsletters']="Aperçu du bulletin";
+
+
+/* Send */
+$lang['text info send newsletters']="Aperçu ";
+$lang['text titre info']="Resumé";
+$lang['text count customers']="nbr envoyé(s)/nbr d'envoi ";
+$lang['text bulletin numb']="Numéro:";
+$lang['text module']="Module: ";
+$lang['text titre mail']="Sujet: ";
+$lang['text titre view']="Aperçu du contenu : ";
+
+/* Sendtest */
+$lang['heading newsletter sendtest email']="Email(s) de test ";
+$lang['txt sendtest email']="Email séparé par des virgules. Les emails doivent représenter des Emails valides dans la table des clients";
+
+
+$lang['image new newsletter']="Créer un bulletin";
+$lang['image send']="Envoyer";
+$lang['image send test']="Envoi de test";
+$lang['image cancel']="retour";
+$lang['text info number send number count ']="Nombre d'envoi / nombre à envoyé";
+
+$lang['text template']="Choix du gabarit";
+$lang['text tpl aucun']="aucun";
+$lang['err txt email off']="Le service est désactivé dans la configuration de votre boutique";
+$lang['err txt email txt strict']="Le service d'Email au format html est désactivé, tous les Emails seront envoyés au format texte";
+
+
+/* Generic in mail */
+$lang['text view online %s']="Si vous ne visualisez pas correctement cet Email <a href=\"%s\" >Cliquez ici</a>";
+?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/pages/products.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/pages/products.txt 2011-09-13 16:28:06 UTC (rev 3808)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/products.txt 2011-09-14 08:02:37 UTC (rev 3809)
@@ -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 04/04/11, 09:32
+ @version 2.1.1
+ @date 13/09/11, 17:30
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -94,8 +94,8 @@
$lang['text copy as link']="Lien du produit" ;
$lang['text copy as duplicate']="Dupliquer le produit" ;
$lang['error cannot link to same category']="Erreur : Impossible de lier des produits dans la même catégorie." ;
-$lang['error catalog image directory not writeable']="Erreur : Impossible d'écrire dans le répertoire d'images : " . DIR_FS_CATALOG_IMAGE." " ;
-$lang['error catalog image directory does not exist']="Erreur : Le répertoire d'images n'existe pas : " . DIR_FS_CATALOG_IMAGE." " ;
+$lang['error catalog image directory not writeable %s']="Erreur : Impossible d'écrire dans le répertoire d'images : %s " ;
+$lang['error catalog image directory does not exist %s']="Erreur : Le répertoire d'images n'existe pas : %s " ;
$lang['error cannot move category to parent']="Erreur : La catégorie ne peut être déplacé dans la sous-catégorie." ;
$lang['image preview public']="Prévisualiser la page public" ;
Modified: trunk/catalog/admin/includes/modules/pages/categories.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/categories.php 2011-09-13 16:28:06 UTC (rev 3808)
+++ trunk/catalog/admin/includes/modules/pages/categories.php 2011-09-14 08:02:37 UTC (rev 3809)
@@ -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 04/07/11, 10:14
+ @version 2.1.1
+ @date 13/09/11, 17:42
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@brief manage category and module aca for cat
@@ -106,9 +106,9 @@
// check if the catalog image directory exists
global $messageStack;
if (is_dir(DIR_FS_CATALOG_IMAGES)) {
- if (!is_writeable(DIR_FS_CATALOG_IMAGES)) $messageStack->add(__('error catalog image directory not writeable'), 'error');
+ if (!is_writeable(DIR_FS_CATALOG_IMAGES)) $messageStack->add(sprintf(__('error catalog image directory not writeable %s'), DIR_FS_CATALOG_IMAGES ), 'error');
}
- else $messageStack->add(__('error catalog image directory does not exist'), 'error');
+ else $messageStack->add(__(sprintf('error catalog image directory does not exist %s'), DIR_FS_CATALOG_IMAGES ), 'error');
self::$languages = tep_get_languages();
}
Modified: trunk/catalog/admin/includes/modules/pages/products.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/products.php 2011-09-13 16:28:06 UTC (rev 3808)
+++ trunk/catalog/admin/includes/modules/pages/products.php 2011-09-14 08:02:37 UTC (rev 3809)
@@ -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 04/04/11, 09:32
+ @version 2.1.1
+ @date 13/09/11, 17:30
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -117,9 +117,9 @@
// check if the catalog image directory exists
global $messageStack;
if (is_dir(DIR_FS_CATALOG_IMAGES)) {
- if (!is_writeable(DIR_FS_CATALOG_IMAGES)) $messageStack->add(__('error catalog image directory not writeable'), 'error');
+ if (!is_writeable(DIR_FS_CATALOG_IMAGES)) $messageStack->add(sprintf(__('error catalog image directory not writeable %s'), DIR_FS_CATALOG_IMAGES ), 'error');
}
- else $messageStack->add(__('error catalog image directory does not exist'), 'error');
+ else $messageStack->add(__(sprintf('error catalog image directory does not exist %s'), DIR_FS_CATALOG_IMAGES ), 'error');
self::$languages = tep_get_languages();
}
Modified: trunk/catalog/common/classes/image_ratio.php
===================================================================
--- trunk/catalog/common/classes/image_ratio.php 2011-09-13 16:28:06 UTC (rev 3808)
+++ trunk/catalog/common/classes/image_ratio.php 2011-09-14 08:02:37 UTC (rev 3809)
@@ -329,7 +329,7 @@
if (!$iscached) $makethumb = ($width_src > $width || $height_scr > $height) ? true : false;
else $makethumb = false;
-$makethumb = true;
+
if ($makethumb){
if(self::$Modele !=null && method_exists(self::$Modele,'thumbgd' ))
$image=call_user_func(array(get_class(self::$Modele), 'thumbgd'), $image, $width, $height, $width_src, $height_scr, self::$types[$format], $thumbfile );
@@ -339,7 +339,7 @@
$img=($iscached) ? $thumbfile : $image;
$image = self::CleanPathReturn($img);
}
-// var_dump($image);
+
return $image;
}
Modified: trunk/catalog/includes/application_top.php
===================================================================
--- trunk/catalog/includes/application_top.php 2011-09-13 16:28:06 UTC (rev 3808)
+++ trunk/catalog/includes/application_top.php 2011-09-14 08:02:37 UTC (rev 3809)
@@ -84,7 +84,8 @@
/// ajout chemin template dans autoload class
autoload::getInstance();
autoload::addPath(DIR_FS_TEMPLATES.TEMPLATE_NAME.'/'.DIR_WS_CLASSES .'%s.php',4);
- autoload::addPath(DIR_FS_TEMPLATES.TEMPLATE_NAME.'/'.DIR_WS_CLASSES .'page.%s.php',4);
+ autoload::addPath(DIR_FS_TEMPLATES.TEMPLATE_NAME.'/'.DIR_WS_CLASSES .'core_page/.%s.php',4);
+ autoload::addPath(DIR_FS_TEMPLATES.TEMPLATE_NAME.'/'.DIR_WS_CLASSES .'core_page/overlay/.%s.php',4);
autoload::addPath(DIR_FS_TEMPLATES.TEMPLATE_NAME.'/'.DIR_WS_CLASSES .'drivers/data/%s.php',4);
/// include list of project class and lib permanente
Copied: trunk/catalog/includes/classes/core_page/account.php (from rev 3797, trunk/catalog/includes/classes/page.account.php)
===================================================================
--- trunk/catalog/includes/classes/core_page/account.php (rev 0)
+++ trunk/catalog/includes/classes/core_page/account.php 2011-09-14 08:02:37 UTC (rev 3809)
@@ -0,0 +1,192 @@
+<?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 05/11/10, 11:24
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+/**
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ \class AbstractProduct
+ \brief
+ Force mise en forme via class absctarction des class de produits
+*/
+abstract class AbstractAccount {
+ // Force la classe étendue à définir cette méthode
+ abstract protected function display_view($ID='');
+ abstract protected function load_db_values($ID);
+ abstract protected function get_header($action='');
+ // méthode commune
+// public function printOut() { }
+}
+
+/**
+ * \class account
+ * \brief
+ Class de la gestion de compte des customers les page account.php
+ Prend en charge des extension de type aca
+*/
+class account
+ extends AbstractAcaModule
+ implements InterfaceAcaGene {
+
+ protected static $_instance;
+
+ /**
+ */
+ protected function __construct() {
+ global $language, $page, $lang;
+
+ $this->name='account';
+ $this->products_id='';
+ $this->modules=array();
+
+ foreach(parent::initialise_type('MODULE_ACCOUNT_INSTALLED','account') as $class){
+ $cl[$class]=new $class ();
+ $list_mod[$class] = $cl[$class]->sort_order;
+ asort($list_mod);
+ foreach($list_mod as $class=>$s){
+ $this->modules[$class] =$cl[$class];
+ }
+ unset($cl);unset($list_mod);
+ }
+ }
+
+ public static function getInstance() {
+ if(self::$_instance == null) self::$_instance = new self();
+ return self::$_instance;
+ }
+
+ public static function resetInstance(){
+ self::$_instance = null;
+ return self::getInstance();
+ }
+
+
+ public function get_header($class='',$action=''){
+ global $page;
+ if (!empty($class)) {
+ if (isset($this->modules[$class]) && $this->modules[$class]->enabled and (method_exists($class, 'get_header' ))){
+ return $this->modules[$class]->get_header($action);
+ }
+ } else {
+ $c=array();
+ foreach ($this->modules as $key=>$module) {
+ if (($module->enabled) and (method_exists($module, 'get_header' ))) {
+ $c[]=$module->get_header($action);
+ }
+ }
+ return $c;
+ }
+ }
+
+ /**
+ * \fn display_view($cID,$class='')
+ * \brief Affiche module elemennt html
+
+ cheche methode draw_html_xxx pour les sous modules et class enfants
+ \li @a int cID le Id du customers
+ \li @a string class le nom de la class appelé, ou vide pour toutes les class enfants
+ */
+ public function display_view($cID,$class=''){
+ global $page;
+ if (!empty($class)) {
+ if (isset($this->modules[$class]) && $this->modules[$class]->enabled and (method_exists($class, 'display_view' ))){
+ $this->modules[$class]->load_db_values($cID);
+ return $this->modules[$class]->display_view($cID);
+ }
+ } else {
+ $c=array();
+ foreach ($this->modules as $key=>$module) {
+ if (($module->enabled) and (method_exists($module, 'display_view' ))) {
+ $this->modules[$key]->load_db_values($cID);
+ $c[]=$this->modules[$key]->display_view($cID);
+ }
+ }
+ return $c;
+ }
+ }
+
+ /**
+ * \fn display_view_min($cID,$class='')
+ * \brief Affiche module display_view mini
+ \li @a int cID le Id du customers
+ \li @a string class le nom de la class appelé, ou vide pour toutes les class enfants
+ */
+ public function display_view_min($cID,$class=''){
+ global $page;
+ if (!empty($class)) {
+ if (isset($this->modules[$class]) && $this->modules[$class]->enabled and (method_exists($module, 'display_view_min' ))){
+ $this->modules[$class]->load_db_values($cID);
+ return $this->modules[$class]->display_view_min($cID);
+ }
+ } else {
+ $c='';
+ foreach ($this->modules as $key=>$module) {
+ if (($module->enabled) and (method_exists($module, 'display_view_min' ))) {
+ $this->modules[$key]->load_db_values($cID);
+ $c .=$this->modules[$key]->display_view_min($cID);
+ }
+ }
+ return $c;
+ }
+ }
+
+
+
+
+/**
+ * \section Specifique Module
+ * */
+
+
+ /**
+ * \fn display_view_public($cID,$class='')
+ * \brief Affiche module display_view public
+ Les information membre public
+ * @param $cID int le Id du customers
+ * @param $class string class le nom de la class appelé, ou vide pour toutes les class enfants
+ * @return string
+ */
+ public function display_view_public($cID,$class=''){
+ global $page;
+ if (!empty($class)) {
+ if (isset($this->modules[$class]) && $this->modules[$class]->enabled and (method_exists($module, 'display_view_public' ))){
+ $this->modules[$class]->load_db_values($cID);
+ return $this->modules[$class]->display_view_public($cID);
+ }
+ } else {
+ $c='';
+ foreach ($this->modules as $key=>$module) {
+ if (($module->enabled) and (method_exists($module, 'display_view_public' ))) {
+ $this->modules[$key]->load_db_values($cID);
+ $c .=$this->modules[$key]->display_view_public($cID);
+ }
+ }
+ return $c;
+ }
+ }
+
+ /**
+ * \fn display_view_button_action($cID)
+ * \brief Affiche Un bouton ou form d'action dans etxte ou tableau (rma in history_info)
+ \li @a int cID le Id du customers
+ */
+ public function display_view_button_action($cID){
+ global $page;
+ $c='';
+ foreach ($this->modules as $key=>$module) {
+ if (($module->enabled) and (method_exists($module, 'display_view_button_action' ))) {
+ $this->modules[$key]->load_db_values($cID);
+ $c .=$this->modules[$key]->display_view_button_action($cID);
+ }
+ }
+ return $c;
+ }
+
+}
+?>
\ No newline at end of file
Copied: trunk/catalog/includes/classes/core_page/contact.php (from rev 3805, trunk/catalog/includes/classes/page.contact.php)
===================================================================
--- trunk/catalog/includes/classes/core_page/contact.php (rev 0)
+++ trunk/catalog/includes/classes/core_page/contact.php 2011-09-14 08:02:37 UTC (rev 3809)
@@ -0,0 +1,127 @@
+<?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.0
+ @date 12/02/11, 16:11
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class contact
+ @brief Class des envoi de mail vers un destinataire. envoi interne
+
+ LE formulaire utilisé doit être contenu dans le repertoire content ET tre nommé contact_(self::$suffixe)
+ @example usage : contact->the_form();
+
+*/
+class contact {
+
+ /**
+ @var $suffixe string for call form
+ The form is contact_ $suffixe
+ */
+ protected static $suffixe;
+
+ function __construct(){
+ global $page;
+ if (isset($_GET['products_id'])&& is_numeric($_GET['products_id'])) self::$suffixe='product';
+ else self::$suffixe='us';
+
+ $this->init();
+ }
+
+
+ public function init(){
+
+ switch(self::$suffixe) {
+ case 'product':
+ $this->params_form='products_id='.$_GET['products_id'];
+ break;
+ default:
+ $this->t_user['email']=STORE_OWNER_EMAIL_ADDRESS;
+ $this->t_user['name']=STORE_OWNER;
+
+ $this->params_form='';
+ }
+ }
+
+ /**
+ @fn the_form()
+ @brief call form , return suffixe
+ */
+ public function the_form(){
+ return self::$suffixe;
+ }
+
+ /**
+ Retour du formulaire à chargée
+ */
+ public function the_params(){
+ return $this->params_form;
+ }
+
+ /**
+ @fn action()
+ @brief exe action form
+ */
+ public function action(){
+ global $page;
+
+
+ switch(self::$suffixe) {
+ default:
+ if (isset($_GET['action']) && ($_GET['action'] == 'send')) {
+
+ $enquiry = tep_db_prepare_input($_POST['enquiry']);
+ $data='';
+
+ if (!tep_session_is_registered('customer_id')) {
+ $name = tep_db_prepare_input($_POST['name']);
+ $email_address = tep_db_prepare_input($_POST['email']);
+
+ $enquiry = $name.' '.$email_address." <br><br> ".$enquiry;
+
+ $data .='&user='.$name.'&user_email='.$email_address;
+ }
+ /// user connected, use detail user
+ else {
+ $cust=customer::getInstance();
+ $user=$cust->the_customer($_SESSION['customer_id']);
+ $user=new objectInfo($user);
+ $name = $user->customers_lastname.' '.$user->customers_firstname;
+ $email_address=$user->customers_email_address;
+ $data .='&customers_id='.$user->customers_id;
+ }
+
+
+ if (tep_validate_email($email_address) && !empty($name) ) {
+
+ $myarray = array(
+ 'from'=>$name,
+ 'from_email'=>$email_address,
+ 'subject'=>sprintf(EMAIL_SUBJECT, STORE_NAME),
+ 'email_use_html'=>_cst_bool('EMAIL_USE_HTML'),
+ 'message'=>$name.' '.$email_address.'<br />'.$enquiry,
+ );
+
+ notification::notif('contact_us',sprintf(EMAIL_SUBJECT, STORE_NAME),$myarray,$data);
+
+
+ tep_redirect(tep_href_link(FILENAME_CONTACT_US, 'action=success'));
+ }
+ elseif(empty($name) ) {
+ $error = true;
+
+ $page->messageStack->add('contact', ENTRY_NAME_CHECK_ERROR);
+ }
+ else {
+ $error = true;
+
+ $page->messageStack->add('contact', ENTRY_EMAIL_ADDRESS_CHECK_ERROR);
+ }
+ }
+ }
+ }
+}
+
+?>
\ No newline at end of file
Copied: trunk/catalog/includes/classes/core_page/customer.php (from rev 3798, trunk/catalog/includes/classes/page.customer.php)
===================================================================
--- trunk/catalog/includes/classes/core_page/customer.php (rev 0)
+++ trunk/catalog/includes/classes/core_page/customer.php 2011-09-14 08:02:37 UTC (rev 3809)
@@ -0,0 +1,1101 @@
+<?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.0
+ @date 29/01/11, 10:55
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @Class customer
+ gestion public des clients|membre
+ Traitement db select|insert|update du compte membre
+ Fonction native du noyau deporté dans cette class
+*/
+
+class customer {
+
+ /**
+ @var l'id du customer chargée
+ */
+ public $customer_id;
+ /**
+ @var tableau detail customers
+ */
+ public $customer;
+
+ /**
+ @var $methodeMessage string name methode / for methode call in messageStack class
+ */
+ protected static $methodeMessage='add_session';
+
+ protected static $_instance;
+
+ /**
+ Constructeur
+ @param
+ @a int id customer
+ */
+ 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;
+ }
+
+ /**
+ * \fn getInstance
+ * @param $customer_id int | null
+ */
+ public static function getInstance($customer_id='') {
+ if(self::$_instance == null) self::$_instance = new self($customer_id);
+ return self::$_instance;
+ }
+
+ /**
+ * \fn resetInstance()
+ */
+ public static function resetInstance(){
+ self::$_instance = null;
+ return self::getInstance();
+ }
+
+
+ /**
+ * \brief fetch user data
+ * @param $customer_id integer
+ * @return array
+ */
+ public function the_customer($customer_id=''){
+ global $page;
+ if(!is_numeric($customer_id)) return $this->customer;
+
+ $this->languages_id=$page->the_var('languages_id');
+ $this->customer_id=(int)$customer_id;
+ $this->detail_cust();
+
+ return $this->customer;
+ }
+
+ /**
+ * \fn detail_cust()
+ * \brief Reconstruit le detail d'un customer
+ * Prend en Charge la gestion des extra_fields
+ * @return array
+ */
+ private function detail_cust(){
+ $account_query = tep_db_query("select customers_id, customers_gender, customers_firstname, customers_lastname, customers_dob, customers_email_address, customers_telephone, customers_fax, customers_newsletter,customers_default_address_id, c.customers_group_id, c.customers_group_ra, c.customers_payment_allowed, c.customers_shipment_allowed, c.customers_order_total_allowed, c.customers_specific_taxes_exempt , customers_status, customers_shopping_points from " . TABLE_CUSTOMERS . " c where customers_id = '" . $this->customer_id . "'");
+ $account = tep_db_fetch_array($account_query);
+
+ $value_query = tep_db_query("select fields_name,fields_key, value from " . TABLE_EXTRA_FIELDS . " ce, " . TABLE_CUSTOMERS_TO_EXTRA_FIELDS . " cef, " . TABLE_EXTRA_FIELDS_INFO . " cei where cef.customers_id= '" . $this->customer_id . "' and cei.fields_id=ce.fields_id and cef.fields_id= cei.fields_id and languages_id='".$this->languages_id."' and ce.fields_admin !=1 " );
+
+ while ($t=tep_db_fetch_array($value_query) )
+ $account[(!empty($t['fields_key'])? $t['fields_key']: $t['fields_name'])]=$t['value'];
+
+ $this->customer=$account;
+ }
+
+ /**
+ * \fn add_var_customer($key, $value)
+ * \brief add data in array current user
+ * @param $key string
+ * @param $value string
+ * @return non
+ */
+ public function add_var_customer($key, $value){
+ $this->customer[$key]=$value;
+ }
+
+ /**
+ * \fn detail_long_cust()
+ * \brief full data user
+ * @return array
+ */
+ public function detail_long_cust(){
+ $account_query = tep_db_query("select * from " . TABLE_CUSTOMERS_INFO . " where customers_info_id = '" . $this->customer_id . "'");
+ $account = tep_db_fetch_array($account_query);
+ return $this->customer=array_merge((array)$this->customer,(array)$account);
+ }
+
+
+ /**
+ * \fn userNotifiUpdate($_post)
+ * \brief Assure enregsitrement action=newseltters
+ * @param $_post array
+ */...
[truncated message content] |
|
From: <os...@us...> - 2011-09-22 20:59:20
|
Revision: 3813
http://oscss.svn.sourceforge.net/oscss/?rev=3813&view=rev
Author: oscim
Date: 2011-09-22 20:59:12 +0000 (Thu, 22 Sep 2011)
Log Message:
-----------
correction ratio carr?\195?\169 et gestionnaire d'image
Ajout variable de configuration
Renommage du module de configuration du template et ajustement
AJout d'un widget de recap de la configuration
Correction coquille de notice
Ajout de driver dans le Backoffice , et d'un module pour manipuler sql table configuration
Modified Paths:
--------------
trunk/catalog/admin/includes/boxes/04_tools.php
trunk/catalog/admin/includes/class.interfaces.php
trunk/catalog/admin/includes/classes/configUtility.php
trunk/catalog/admin/includes/content/configuration.central.inc
trunk/catalog/admin/includes/content/configuration.top.inc
trunk/catalog/admin/includes/data/dashboard.xml
trunk/catalog/admin/includes/functions/general.php
trunk/catalog/admin/includes/widget/currencies_update_server.php
trunk/catalog/common/classes/image_ratio.php
trunk/catalog/common/classes/imgratio_drivers/Carre.php
trunk/catalog/install/includes/language/fr_FR/oscss_config.txt
trunk/catalog/install/oscss_config.sql
Added Paths:
-----------
trunk/catalog/admin/includes/classes/drivers/
trunk/catalog/admin/includes/classes/drivers/sqlconfiguration.php
trunk/catalog/admin/includes/gabarit/configuration/
trunk/catalog/admin/includes/gabarit/configuration/modtemplate.listing.gab
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modtemplate.txt
trunk/catalog/admin/includes/languages/fr_FR/widget/brief_config.txt
trunk/catalog/admin/includes/modules/configuration/modtemplate.php
trunk/catalog/admin/includes/widget/brief_config.php
Removed Paths:
-------------
trunk/catalog/admin/includes/gabarit/cfg_29.listing.gab
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_29.txt
trunk/catalog/admin/includes/modules/configuration/cfg_29.php
Modified: trunk/catalog/admin/includes/boxes/04_tools.php
===================================================================
--- trunk/catalog/admin/includes/boxes/04_tools.php 2011-09-19 11:36:54 UTC (rev 3812)
+++ trunk/catalog/admin/includes/boxes/04_tools.php 2011-09-22 20:59:12 UTC (rev 3813)
@@ -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, 08:54
+ @version 2.1.1
+ @date 22/09/11, 22:06
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -19,8 +19,10 @@
$tabl_link[]= array(FILENAME_GOOGLE_SITEMAP, 'BOX_TOOLS_GOOGLE_SITEMAP', 'ggmap',@$img['ggmap']);
$tabl_link[]= array(FILENAME_FULL_TAG, 'BOX_TOOLS_HEADER_TAG', 'headertag',@$img['headertag']);
- $tabl_link[]= array(FILENAME_BATCH_PRINT, 'BOX_TOOLS_BATCH_CENTER', 'batch_print',@$img['batch_print']);
+ if(_cst_bool('USE_LOCAL_GENERAT_PDF'))
+ $tabl_link[]= array(FILENAME_BATCH_PRINT, 'BOX_TOOLS_BATCH_CENTER', 'batch_print',@$img['batch_print']);
+
$tabl_link[608]= array('ss_menu', 'BOX_TOOLS_SYSTEM', 'system',@$img['system']);
$tabl_link[608][4][]= array(FILENAME_BACKUP, 'BOX_TOOLS_BACKUP', 'database',@$img['database']);
$tabl_link[608][4][]= array(FILENAME_CONFIGURATION.'?gID=37', 'BOX_TOOLS_CACHE', 'cache');
Modified: trunk/catalog/admin/includes/class.interfaces.php
===================================================================
--- trunk/catalog/admin/includes/class.interfaces.php 2011-09-19 11:36:54 UTC (rev 3812)
+++ trunk/catalog/admin/includes/class.interfaces.php 2011-09-22 20:59:12 UTC (rev 3813)
@@ -172,7 +172,19 @@
public function tep_get_list($page=1,$rowbyp=10,$sOrder='',$sWhere='',$options='');
}
+
/**
+ Interface use in class/drivers/sqlxxxxx.php
+ Manipule data in table
+*/
+Interface ModSqlDataDriver {
+ public static function create($option);
+ public static function update($option);
+ public static function fetch($option);
+ public static function delete($option);
+}
+
+/**
Just define class for use module public configuration
*/
class AbstractAccount {}
Modified: trunk/catalog/admin/includes/classes/configUtility.php
===================================================================
--- trunk/catalog/admin/includes/classes/configUtility.php 2011-09-19 11:36:54 UTC (rev 3812)
+++ trunk/catalog/admin/includes/classes/configUtility.php 2011-09-22 20:59:12 UTC (rev 3813)
@@ -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 28/06/11, 09:55
+ @version 2.1.1
+ @date 22/09/11, 09:55
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@brief class librairie for config action
@@ -86,6 +86,7 @@
$keys= call_user_func(array($class_method[0], $class_method[1]), $value, $key);
}
else {
+ if(strpos($_function,')') === false) $_function.='(';
eval('$keys = ' . $_function . "'" . $value . "', '" . $key . "');");
}
return $keys;
Added: trunk/catalog/admin/includes/classes/drivers/sqlconfiguration.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlconfiguration.php (rev 0)
+++ trunk/catalog/admin/includes/classes/drivers/sqlconfiguration.php 2011-09-22 20:59:12 UTC (rev 3813)
@@ -0,0 +1,189 @@
+<?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 22/09/11, 20:11
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class manage link table configuration
+*/
+
+
+
+
+class sqlconfiguration
+ implements ModSqlDataDriver{
+
+
+ /**
+ @brief create new ligne in table configuration
+ */
+ public static function create($option){
+
+ if(!isset($option['key'])) return 'key';
+
+ if(isset($option['id'])) $sql_data_array['configuration_id'] = $option['id'];
+ if(isset($option['title'])) $sql_data_array['configuration_title'] = $option['title'];
+ $sql_data_array['configuration_key'] = $option['key'];
+ if(isset($option['value'])) $sql_data_array['configuration_value'] = $option['value'];
+ if(isset($option['description'])) $sql_data_array['configuration_description'] = $option['description'];
+ if(isset($option['group_id'])) $sql_data_array['configuration_group_id'] = $option['group_id'];
+ if(isset($option['sort_order'])) $sql_data_array['sort_order'] = $option['sort_order'];
+ if(isset($option['modified'])) $sql_data_array['last_modified'] = $option['modified'];
+ $sql_data_array['date_added'] = (isset($option['added'])) ? $option['added'] : date('Y-m-d H:i:s');
+ if(isset($option['use'])) $sql_data_array['use'] = $option['use'];
+ if(isset($option['set'])) $sql_data_array['set'] = $option['set'];
+ $sql_data_array['configuration_type'] = (isset($option['type'])) ? $option['type'] : 2;
+
+ $res=tep_db_perform(TABLE_CONFIGURATION, $sql_data_array);
+
+ if(!$res)
+ return $res;
+ else
+ return $res->__get('insertId');
+ }
+
+ /**
+ @brief update ligne in table configuration
+ */
+ public static function update($option){
+
+ if(!isset($option['key']) && !isset($option['id'])) return 'key or id';
+
+ $where ='';
+ if(isset($option['id'])) $where .="AND configuration_id = '".(int)$option['id']."' ";
+ if(isset($option['key'])) $where .="AND configuration_key = '".$option['key']."' ";
+
+ if(isset($option['title'])) $sql_data_array['configuration_title'] = $option['title'];
+ if(isset($option['value'])) $sql_data_array['configuration_value'] = $option['value'];
+ if(isset($option['description'])) $sql_data_array['configuration_description'] = $option['description'];
+ if(isset($option['group_id'])) $sql_data_array['configuration_group_id'] = $option['group_id'];
+ if(isset($option['sort_order'])) $sql_data_array['sort_order'] = $option['sort_order'];
+ $sql_data_array['last_modified'] = (isset($option['modified'])) ? $option['modified'] : date('Y-m-d H:i:s');
+ if(isset($option['use'])) $sql_data_array['use'] = $option['use'];
+ if(isset($option['set'])) $sql_data_array['set'] = $option['set'];
+ $sql_data_array['configuration_type'] = (isset($option['type'])) ? $option['type'] : 2;
+
+
+
+
+
+ $res=tep_db_perform(TABLE_CONFIGURATION, $sql_data_array, 'update' , substr($where,3) );
+
+ return $res;
+ }
+
+ /**
+ @brief load ligne in table configuration
+ @param option array
+ id => row id int (configuration_id)
+ key => string key (configuration_key)
+ group_id => group_id int (configuration_group_id)
+
+ @return
+
+ object(stdClass)[13]
+ public 'id' => string '1' (length=1)
+ public 'title' => string 'Nom du template par défaut' (length=27)
+ public 'key' => string 'TEMPLATE_NAME' (length=13)
+ public 'value' => string 'electronix' (length=10)
+ public 'description' => string 'Nom du template par défaut.' (length=28)
+ public 'group_id' => string '0' (length=1)
+ public 'sort_order' => string '0' (length=1)
+ public 'modified' => string '2011-09-18 16:22:11' (length=19)
+ public 'added' => string '2011-09-18 16:22:11' (length=19)
+ public 'use' => null
+ public 'set' => null
+ public 'type' => string '2' (length=1)
+
+ OR
+ array(
+ object(stdClass)[13]
+ ...
+ object(stdClass)[13]
+ ..
+ )
+
+ */
+ public static function fetch($option){
+ $DB=Database::getInstance();
+
+ $sql ="";
+ if(isset($option['id'])) $sql .="AND configuration_id = '".(int)tep_db_input($option['id'])."' ";
+ if(isset($option['key'])) $sql .="AND configuration_key = '".(string)tep_db_input($option['key'])."' ";
+ if(isset($option['group_id'])) $sql .="AND configuration_group_id = '".(int)(string)tep_db_input($option['group_id'])."' ";
+
+ $sql ="SELECT * FROM ".TABLE_CONFIGURATION." WHERE ".substr($sql,3);
+
+ $res=$DB->query($sql);
+
+ $num = $res->__get('numRows');
+
+ if($num == 1){
+ $result=$res->fetchAssoc();
+ return self::CleanKey($result);
+ }
+ elseif($num > 1){
+ $array=array();
+
+ foreach($res->fetchAllAssoc() as $lg)
+ $array[]= self::CleanKey($lg);
+
+ return $array;
+ }
+
+ return false;
+ }
+
+ /**
+ @brief delete row
+ */
+ public static function delete($option){
+ $DB=Database::getInstance();
+
+ $sql ="";
+ if(isset($option['id'])) $sql .="AND configuration_id = '".(int)tep_db_input($option['id'])."' ";
+ if(isset($option['key'])) $sql .="AND configuration_key = '".(string)tep_db_input($option['key'])."' ";
+ if(isset($option['group_id'])) $sql .="AND configuration_group_id = '".(int)(string)tep_db_input($option['group_id'])."' ";
+
+ if(strlen($sql)==0)
+ return false;
+
+ $sql ="DELETE FROM ".TABLE_CONFIGURATION." WHERE ".substr($sql,3);
+
+ $res=$DB->query($sql);
+
+ return $res;
+ }
+
+ /**
+ @fn CleanKey()
+ @brief Clean string name key
+ */
+ private static function CleanKey($array){
+
+ $object= new stdclass();
+
+ foreach($array as $key=>$value){
+ if( strpos($key,'configuration_') ===0)
+ $key=substr($key,14);
+ elseif(strpos($key,'_function') >0)
+ $key=str_replace('_function','',$key);
+ elseif(strpos($key,'date_') ===0)
+ $key=str_replace('date_','',$key);
+ elseif(strpos($key,'last_') ===0)
+ $key=str_replace('last_','',$key);
+
+
+ $object->$key = $value;
+ }
+
+ return $object;
+ }
+
+}
+
+
+?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/content/configuration.central.inc
===================================================================
--- trunk/catalog/admin/includes/content/configuration.central.inc 2011-09-19 11:36:54 UTC (rev 3812)
+++ trunk/catalog/admin/includes/content/configuration.central.inc 2011-09-22 20:59:12 UTC (rev 3813)
@@ -1,9 +1,10 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @package oscss-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 12/12/10, 12:52
+ @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 22/09/11, 22:00
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@brief content for pages configuration
@@ -29,11 +30,11 @@
<?php echo tep_draw_form('configuration', FILENAME_CONFIGURATION, 'gparentID=' . $gparentID.'&gID=' . $gID . '&action=save_mutli') ?>
<div class="box_left">
<ul class="block_form">
- <?php foreach($list_edit as $configuration) { ?>
- <li id="nav_<?php echo $configuration['configuration_key'] ?>"><h5 title="<?php echo '('.$configuration['configuration_key'].' - ' . $configuration['set_function'] . ')'; ?>"><?php echo $configuration['configuration_title']. tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></h5>
+ <?php foreach($list_edit as $row) { ?>
+ <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>
- <p class="block_input tirroir"><?php if (tep_not_null($configuration['configuration_description']))echo $configuration['configuration_description']; ?><br />
- <?php echo $configuration['value_field'] ; ?></p>
+ <p class="block_input tirroir"><?php if (tep_not_null($row->description))echo $row->description; ?><br />
+ <?php echo $row->value_field ; ?></p>
</li>
<?php } ?>
</ul>
Modified: trunk/catalog/admin/includes/content/configuration.top.inc
===================================================================
--- trunk/catalog/admin/includes/content/configuration.top.inc 2011-09-19 11:36:54 UTC (rev 3812)
+++ trunk/catalog/admin/includes/content/configuration.top.inc 2011-09-22 20:59:12 UTC (rev 3813)
@@ -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/04/11, 10:44
+ @version 2.1.1
+ @date 22/09/11, 22:00
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@brief generic page for configuration in confuguration_table
@@ -19,7 +19,25 @@
$gparentID = (isset($_GET['gparentID'])) ? $_GET['gparentID'] : 0;
- $class='cfg_'.$gID;
+ /**
+ @remarks Adjust name child module
+ Old : cfg_21 >> 21 == configuration_group_id
+ New : template >> [cg_]template == configuration_group_key
+ */
+ if(strlen($gID)>3)
+ $class='cfg_'.$gID;
+ else {
+ $_query = tep_db_query("SELECT configuration_group_key AS childmodule FROM " . TABLE_CONFIGURATION_GROUP . " WHERE configuration_group_id = '" . (int)$gID . "' ORDER BY sort_order");
+ $conf = tep_db_fetch_array($_query);
+
+ $class=strtolower($conf['childmodule']);
+
+ if(substr($class,0,3) =='cg_') $class = substr($class,3);
+ }
+
+ /**
+ @remarks Call child modules configuration in /modules/configuration folder
+ */
if(file_exists(DIR_WS_MODULES.'configuration/'.$class.'.php') && !class_exists($class)) {
require(DIR_WS_MODULES.'configuration/'.$class.'.php');
// module key precis
@@ -28,51 +46,78 @@
$cfg =new $class();
}
+
if(isset($mID) && class_exists($class)) $cfg->draw_action();
else
switch ($action) {
+
+ /**
+ @brief save unique ligne
+ */
case 'save':
$configuration_value = tep_db_prepare_input($_POST['configuration_value']);
$cID = tep_db_prepare_input($_GET['cID']);
- if(!tep_db_query("update " . TABLE_CONFIGURATION . " set configuration_value = '" . tep_db_input($configuration_value) . "', last_modified = now() where configuration_id = '" . (int)$cID . "'"))
- $messageStack->add(SAVE_CONFIG_OK, 'success');
- else $messageStack->add(SAVE_CONFIG_NOT_OK, 'error');
+ if( ($res=sqlconfiguration::update(array('key'=>(int)$cID , 'value'=>tep_db_input($configuration_value) ))) == false)
+ $messageStack->add(SAVE_CONFIG_OK, 'success');
+ else
+ $messageStack->add(SAVE_CONFIG_NOT_OK, 'error');
tep_redirect(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $gparentID.'&gID=' . $_GET['gID'] . '&cID=' . $cID));
break;
+
+ /**
+ @brief save page groupe
+ */
case 'save_mutli':
if(tep_not_null($gID) ){
- $configuration_query = tep_db_query("select configuration_key,configuration_id, configuration_title, configuration_description,configuration_value, use_function,set_function from " . TABLE_CONFIGURATION . " where configuration_group_id = '" . (int)$gID . "' order by sort_order");
- while ($configuration = tep_db_fetch_array($configuration_query)) {
- if(isset($_POST['configuration'][$configuration['configuration_key']])) {
- $configuration_value = tep_db_prepare_input($_POST['configuration'][$configuration['configuration_key']]);
- if( (tep_db_query($sql="update " . TABLE_CONFIGURATION . " set configuration_value = '" . tep_db_input($configuration_value) . "', last_modified = now() where configuration_key = '" . $configuration['configuration_key']. "'")) !=false) $erreur[]=true;
- else $erreur[]=false;
+
+ $list=sqlconfiguration::fetch(array('group_id'=> (int)$gID));
+ foreach($list as $row) {
+
+ if(isset($_POST['configuration'][$row->key])) {
+ $configuration_value = tep_db_prepare_input($_POST['configuration'][$row->key]);
+
+ if( ($res=sqlconfiguration::update(array('key'=>$row->key , 'value'=>tep_db_input($configuration_value) ))) == false)$erreur[]=false;
+ else $erreur[]=true;
+
}
+
}
if(!in_array(false,$erreur)) $messageStack->add_session(SAVE_CONFIG_OK, 'success');
else $messageStack->add_session(SAVE_CONFIG_NOT_OK, 'error');
+
}
+
tep_redirect(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $gparentID.'&gID=' . $_GET['gID'] . '&cID=' . $cID));
break;
+
+
case 'save_grp':
$new_grp_id = tep_db_prepare_input($_POST['new_grp_id']);
$cID = tep_db_prepare_input($_GET['cID']);
- if(tep_db_query("update " . TABLE_CONFIGURATION . " set configuration_group_id = '" . tep_db_input($new_grp_id) . "', last_modified = now() where configuration_id = '" . (int)$cID . "'") !=false)
- $messageStack->add_session(SAVE_CONFIG_OK, 'success');
- else $messageStack->add_session(SAVE_CONFIG_NOT_OK, 'error');
+ if( ($res=sqlconfiguration::update(array('id'=>(int)$cID , 'group_id'=>tep_db_input($new_grp_id) ))) == false)
+ $messageStack->add_session(SAVE_CONFIG_NOT_OK, 'error');
+ else
+ $messageStack->add_session(SAVE_CONFIG_OK, 'success');
+
tep_redirect(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $gparentID.'&gID=' . $new_grp_id . '&cID=' . $cID));
- break;
+ break;
+
+
case 'delete_confirm':
- if(tep_db_query("DELETE FROM " . TABLE_CONFIGURATION . " where configuration_id = '" . (int)$cID . "'") !=false)
- $messageStack->add_session(SAVE_CONFIG_OK, 'success');
- else $messageStack->add_session(SAVE_CONFIG_NOT_OK, 'error');
+ if( ($res=sqlconfiguration::delete(array('id'=>(int)$cID ))) == false)
+ $messageStack->add_session(SAVE_CONFIG_NOT_OK, 'error');
+ else
+ $messageStack->add_session(SAVE_CONFIG_OK, 'success');
+
tep_redirect(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $gparentID.'&gID=' . $gparentID ));
break;
+
+
default:
$list_edit=array();
@@ -80,15 +125,22 @@
$cfg->load_db_values();
}elseif(tep_not_null($gID) && is_numeric($gID) ){
$configuration_query = tep_db_query("select configuration_key,configuration_id, configuration_title, configuration_description,configuration_value, use_function,set_function from " . TABLE_CONFIGURATION . " where configuration_group_id = '" . (int)$gID . "' order by sort_order");
- while ($configuration = tep_db_fetch_array($configuration_query)) {
- $cfgValue =configUtility::CallExecConfigLine($configuration['use_function'], $configuration['configuration_key'], $configuration['configuration_value']);
- if ($configuration['set_function']) eval($s[]='$value_field = ' . $configuration['set_function'] . '"' . htmlspecialchars($configuration['configuration_value']) . '","'.$configuration['configuration_key'].'");');
- else $value_field = tep_draw_input_field('configuration['.$configuration['configuration_key'].']', '',$configuration['configuration_value']);
- $configuration['cfgValue']=$cfgValue;
- $configuration['value_field']=$value_field;
- $list_edit[]=$configuration;
- }
+ $list=sqlconfiguration::fetch(array('group_id'=> (int)$gID));
+
+ foreach($list as $row) {
+
+ $cfgValue =configUtility::CallExecConfigLine($row->use, $row->key, $row->value);
+
+ if ($row->set) eval($s[]='$value_field = ' . $row->set . '"' . htmlspecialchars($row->value) . '","'.$row->key.'");');
+ else $value_field = tep_draw_input_field('configuration['.$row->key.']', '',$row->value);
+
+ $conf = $row;
+ $row->cfgValue=$cfgValue;
+ $row->value_field=$value_field;
+
+ $list_edit[]=$conf;
+ }
}
}
Modified: trunk/catalog/admin/includes/data/dashboard.xml
===================================================================
--- trunk/catalog/admin/includes/data/dashboard.xml 2011-09-19 11:36:54 UTC (rev 3812)
+++ trunk/catalog/admin/includes/data/dashboard.xml 2011-09-22 20:59:12 UTC (rev 3813)
@@ -79,7 +79,7 @@
<configuration>
<left>
-<!-- <widget>homeStock</widget>-->
+ <widget>brief_config</widget>
</left>
<right>
<widget>info_connexion</widget>
Modified: trunk/catalog/admin/includes/functions/general.php
===================================================================
--- trunk/catalog/admin/includes/functions/general.php 2011-09-19 11:36:54 UTC (rev 3812)
+++ trunk/catalog/admin/includes/functions/general.php 2011-09-22 20:59:12 UTC (rev 3813)
@@ -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 17/10/10, 17:52
+ @version 2.1.1
+ @date 22/09/11, 20:11
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -22,6 +22,11 @@
include_once(DIR_FS_ADMIN.DIR_WS_CLASSES . $strClassName . '.php');
return;
}
+ // drivers
+ if (file_exists(DIR_FS_ADMIN.DIR_WS_CLASSES .'drivers/'. $strClassName . '.php')) {
+ include_once(DIR_FS_ADMIN.DIR_WS_CLASSES .'drivers/'. $strClassName . '.php');
+ return;
+ }
if (file_exists(DIR_FS_ADMIN.DIR_WS_CLASSES . 'osCSS_'.$strClassName . '.php')) {
include_once(DIR_FS_ADMIN.DIR_WS_CLASSES . 'osCSS_'.$strClassName . '.php');
return;
Deleted: trunk/catalog/admin/includes/gabarit/cfg_29.listing.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/cfg_29.listing.gab 2011-09-19 11:36:54 UTC (rev 3812)
+++ trunk/catalog/admin/includes/gabarit/cfg_29.listing.gab 2011-09-22 20:59:12 UTC (rev 3813)
@@ -1,41 +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.0.9
- @date 22/06/10, 18:12
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-?>
-<h3><?php echo __('template public') ?></h3>
-<div id="ssmenu">
- <?php echo tep_ssmenu_configuration($_GET['gparentID']) ?>
-</div>
-<table class="dataTable">
- <thead>
- <tr>
- <th class="tcenter"><?php echo __('table heading name') ?></th>
- <th class="tcenter"><?php echo __('table heading version') ?></th>
- <th class="tcenter"><?php echo __('table heading author') ?></th>
- <th class="tcenter"><?php echo __('table heading desc') ?></th>
- <th class="tcenter"><?php echo __('table heading preview') ?></th>
- <th><?php echo TABLE_HEADING_ACTION ?></th>
- </tr>
- </thead>
- <tbody>
-
- <?php foreach (cfg_29::$list as $theme): ?>
- <tr>
- <td class="tcenter"><?php echo $theme->id ?></td>
- <td class="tcenter"><?php echo $theme->version ?></td>
- <td class="tcenter"><?php echo $theme->author ?></td>
- <td class="tcenter"><?php echo $theme->desc ?></td>
- <td class="tcenter"><?php echo unhtmlentities($theme->picture) ?></td>
- <td><?php echo unhtmlentities($theme->statut) ?></td>
- </tr>
- <?php endforeach; ?>
-
- </tbody>
-</table>
\ No newline at end of file
Copied: trunk/catalog/admin/includes/gabarit/configuration/modtemplate.listing.gab (from rev 3810, trunk/catalog/admin/includes/gabarit/cfg_29.listing.gab)
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/modtemplate.listing.gab (rev 0)
+++ trunk/catalog/admin/includes/gabarit/configuration/modtemplate.listing.gab 2011-09-22 20:59:12 UTC (rev 3813)
@@ -0,0 +1,41 @@
+<?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.1
+ @date 22/09/11, 20:05
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+?>
+<h3><?php echo __('template public') ?></h3>
+<div id="ssmenu">
+ <?php echo tep_ssmenu_configuration($_GET['gparentID']) ?>
+</div>
+<table class="dataTable">
+ <thead>
+ <tr>
+ <th class="tcenter"><?php echo __('table heading name') ?></th>
+ <th class="tcenter"><?php echo __('table heading version') ?></th>
+ <th class="tcenter"><?php echo __('table heading author') ?></th>
+ <th class="tcenter"><?php echo __('table heading desc') ?></th>
+ <th class="tcenter"><?php echo __('table heading preview') ?></th>
+ <th><?php echo TABLE_HEADING_ACTION ?></th>
+ </tr>
+ </thead>
+ <tbody>
+
+ <?php foreach (modtemplate::$list as $theme): ?>
+ <tr>
+ <td class="tcenter"><?php echo $theme->id ?></td>
+ <td class="tcenter"><?php echo $theme->version ?></td>
+ <td class="tcenter"><?php echo $theme->author ?></td>
+ <td class="tcenter"><?php echo $theme->desc ?></td>
+ <td class="tcenter"><?php echo unhtmlentities($theme->picture) ?></td>
+ <td><?php echo unhtmlentities($theme->statut) ?></td>
+ </tr>
+ <?php endforeach; ?>
+
+ </tbody>
+</table>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_29.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_29.txt 2011-09-19 11:36:54 UTC (rev 3812)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_29.txt 2011-09-22 20:59:12 UTC (rev 3813)
@@ -1,30 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @package oscss-2 <www http://www.oscss.org>
- @version 2.0.9h
- @date 06/06/10, 12:12
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
- $lang['template public']="Gestionnaire de templates" ;
-//$lang['heading options title']= 'Options du template';
- $lang['table heading name']="Nom" ;
- $lang['table heading version']="Version" ;
- $lang['table heading author']="Auteur" ;
- $lang['table heading desc']="Description" ;
- $lang['table heading preview']="Aperçu" ;
-//$lang['text current']= 'Active';
- $lang['text no preview']="Pas d\'aperçu" ;
- $lang['text option']="Certains templates vous donnent la possibilité de configurer automatiquement la table configuration, ainsi le contenu de votre boutique sera calibré en fonction du template (dimension des images, groupe de bannière)." ;
- $lang['text no option']="Pas d\'option pour ce template" ;
- $lang['text option success']="Configuration effectuée avec succès" ;
-//$lang['text option run']= 'Lancer le paramétrage';
-//$lang['fieldset datas']= 'Informations';
-//$lang['error not matching']= 'Le nom du répertoire et le nom du template sont différents !!';
-//$lang['error no xml files']= 'Impossible de trouver le fichier de description XML !!';
- $lang['error files doesnt exist']="Le fichier template.php est introuvable !!" ;
- $lang['succes new template activated']="Nouveau template activé !!" ;
- $lang['configuration automatique']="Configuration automatique" ;
- $lang['plugins du theme']="Plugins du thème" ;
-?>
\ No newline at end of file
Copied: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modtemplate.txt (from rev 3810, trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_29.txt)
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modtemplate.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modtemplate.txt 2011-09-22 20:59:12 UTC (rev 3813)
@@ -0,0 +1,31 @@
+<?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.1
+ @date 22/09/11, 20:05
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+$lang['template public']="Gestionnaire de templates" ;
+//$lang['heading options title']= 'Options du template';
+$lang['table heading name']="Nom" ;
+$lang['table heading version']="Version" ;
+$lang['table heading author']="Auteur" ;
+$lang['table heading desc']="Description" ;
+$lang['table heading preview']="Aperçu" ;
+//$lang['text current']= 'Activ...
[truncated message content] |
|
From: <os...@us...> - 2011-09-23 07:19:04
|
Revision: 3814
http://oscss.svn.sourceforge.net/oscss/?rev=3814&view=rev
Author: oscim
Date: 2011-09-23 07:18:58 +0000 (Fri, 23 Sep 2011)
Log Message:
-----------
correction pour la prise en charge fichier documents
Ajustement install et htaccess
Modified Paths:
--------------
trunk/catalog/admin/includes/boxes/00_hidden.php
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/categories.txt
trunk/catalog/common/classes/DatasFiles.php
trunk/catalog/common/classes/osCSS_pdf.php
trunk/catalog/install/includes/content/core.configuration.php
Added Paths:
-----------
trunk/catalog/admin/document.php
Added: trunk/catalog/admin/document.php
===================================================================
--- trunk/catalog/admin/document.php (rev 0)
+++ trunk/catalog/admin/document.php 2011-09-23 07:18:58 UTC (rev 3814)
@@ -0,0 +1,48 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 22/09/11, 16:26
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+require('includes/application_top.php');
+
+
+
+switch($_REQUEST['mod']){
+ case 'packingslip':
+ if(( $filepath=DatasFiles::GetDoc('packingslip', $_REQUEST['id'])) && file_exists(DIR_FS_ROOT_DOCS.$filepath)) {
+ //We send to a browser
+ header('Content-Type: application/pdf');
+ // header('Content-Length: '.strlen($this->buffer));
+ header('Content-Disposition: inline; filename="'.basename($filepath).'"');
+ header('Cache-Control: private, max-age=0, must-revalidate');
+ header('Pragma: public');
+ ini_set('zlib.output_compression','0');
+
+ readfile(DIR_FS_ROOT_DOCS.$filepath);
+ }
+ break;
+
+ case 'invoice':
+ if(( $filepath=DatasFiles::GetDoc('invoices', $_REQUEST['id'])) && file_exists(DIR_FS_ROOT_DOCS.$filepath)) {
+ //We send to a browser
+ header('Content-Type: application/pdf');
+ // header('Content-Length: '.strlen($this->buffer));
+ header('Content-Disposition: inline; filename="'.basename($filepath).'"');
+ header('Cache-Control: private, max-age=0, must-revalidate');
+ header('Pragma: public');
+ ini_set('zlib.output_compression','0');
+
+ readfile(DIR_FS_ROOT_DOCS.$filepath);
+ }
+ break;
+
+}
+
+
+
+
+?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/boxes/00_hidden.php
===================================================================
--- trunk/catalog/admin/includes/boxes/00_hidden.php 2011-09-22 20:59:12 UTC (rev 3813)
+++ trunk/catalog/admin/includes/boxes/00_hidden.php 2011-09-23 07:18:58 UTC (rev 3814)
@@ -23,8 +23,8 @@
$tabl_link[]= array('rss.php', '', '');
$tabl_link[]= array(FILENAME_PACKAGE, '', '');
$tabl_link[]= array(FILENAME_ADMIN_MEMBERS, '', '');
+ $tabl_link[]= array('document.php', '', '');
-
/* tinybroswer */
$tabl_link[]= array('editeur/tiny_mce/plugins/tinybrowser/tinybrowser.php', '', '');
$tabl_link[]= array('tinybrowser.php', '', '');
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/pages/categories.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/pages/categories.txt 2011-09-22 20:59:12 UTC (rev 3813)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/categories.txt 2011-09-23 07:18:58 UTC (rev 3814)
@@ -22,7 +22,7 @@
$lang['text subcategories']="Sous-catégories :" ;
$lang['txt cat all']="Catégorie parent" ;
$lang['text edit categories description']="Description " ;
-$lang['text date added']="Date d\'ajout :" ;
+$lang['text date added']="Date d'ajout :" ;
$lang['text last modified']="Dernière modification :" ;
$lang['text no child categories or products']="Merci de créer une nouvelle catégorie ou un produit dans ce niveau." ;
$lang['not dispo prev save']="Enregistrer votre produits pour accéder à ces options" ;
@@ -54,7 +54,7 @@
$lang['text products']="Produits : " ;
$lang['text cms']="Page : " ;
$lang['tab products data']="Caractéristiques" ;
-$lang['text choose img']="Choix de l\'image '" ;
+$lang['text choose img']="Choix de l'image " ;
$lang['empty category']="Catégorie vide" ;
$lang['text delete image cat']="Aucune image" ;
$lang['text how to copy']="Méthode de copie :" ;
Modified: trunk/catalog/common/classes/DatasFiles.php
===================================================================
--- trunk/catalog/common/classes/DatasFiles.php 2011-09-22 20:59:12 UTC (rev 3813)
+++ trunk/catalog/common/classes/DatasFiles.php 2011-09-23 07:18:58 UTC (rev 3814)
@@ -84,7 +84,7 @@
/**
@brief convert id for leng min 3
*/
- static function ConvertId($id){
+ public static function ConvertId($id){
if(strlen($id) < 4)
$id=sprintf("%04d" ,(int)$id );
@@ -129,19 +129,47 @@
-}
+ public static function GetDoc($type,$id){
+ $Id=self::ConvertId($id);
+ $pathid=self::PathForId($id);
+ $path = self::InitFolder($type);
+ switch($type){
+ case 'orders':
+ case 'order':
+ $prefix = 'CO';
+ $folder = 'orders';
+ $ext = '.pdf';
+ break;
+ case 'packingslip':
+ $prefix = 'BC';
+ $folder = 'packingslip';
+ $ext = '.pdf';
+ break;
+ case 'invoices':
+ case 'invoice':
+ $prefix = 'FA';
+ $folder = 'invoices';
+ $ext = '.pdf';
+ break;
+ }
-define('DIR_FS_ROOT_DOCS' , dirname(__FILE__).'/Datas/');
-$CustDaFi=new DatasFiles;
+ return $path.$pathid.$prefix.'-'.$Id.$ext;
+ }
+}
+// define('DIR_FS_ROOT_DOCS' , dirname(__FILE__).'/Datas/');
+// $CustDaFi=new DatasFiles;
+//
+//
+//
+//
+//
+// for($i=11000 ; $i<12000 ; $i++ ){
+// DatasFiles::InitPathid('test3', $i);
+// }
-for($i=11000 ; $i<12000 ; $i++ ){
- DatasFiles::InitPathid('test3', $i);
-}
-
-
?>
Modified: trunk/catalog/common/classes/osCSS_pdf.php
===================================================================
--- trunk/catalog/common/classes/osCSS_pdf.php 2011-09-22 20:59:12 UTC (rev 3813)
+++ trunk/catalog/common/classes/osCSS_pdf.php 2011-09-23 07:18:58 UTC (rev 3814)
@@ -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 13/03/11, 08:54
+ @version 2.1.1
+ @date 19/09/11, 20:11
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class osCSS_pdf
@@ -42,9 +42,6 @@
require_once(DIR_FS_CATALOG.DIR_WS_COMMON_FUNCTIONS.'pdf_output.php');
define('LOGO_SHOP_FOR_PRINT',HTTP_SERVER.str_replace('//','/',STORE_LOGO_PRINT));
-
-// tep_image(LOGO_SHOP_FOR_PRINT,'',150,150);
-
}
@@ -100,12 +97,25 @@
return self::$numPage;
}
+ public static function SaveEnd($name){
+ $pdf_code = self::$pdf->output($name, 'F');
+ return $pdf_code;
+ }
+
public static function OutputEnd(){
$pdf_code = self::$pdf->output();
exit;
}
/**
+ @brief return type pdf data
+ */
+ public static function GetPdfType(){
+ return self::$type;
+ }
+
+
+ /**
@fn getPathModele()
@brief return path module pdf
*/
Modified: trunk/catalog/install/includes/content/core.configuration.php
===================================================================
--- trunk/catalog/install/includes/content/core.configuration.php 2011-09-22 20:59:12 UTC (rev 3813)
+++ trunk/catalog/install/includes/content/core.configuration.php 2011-09-23 07:18:58 UTC (rev 3814)
@@ -352,6 +352,7 @@
' RewriteRule (.*logoff\.ph.*)$ $1 [L]' . "\n" .
' RewriteRule (.*login\.ph.*)$ $1 [L]' . "\n" .
+ ' RewriteRule (.*document\.ph.*)$ $1 [L]' . "\n" .
' RewriteRule (.*password_forgotten\.ph.*)$ $1 [L]' . "\n" .
' RewriteRule (.*popup_image\.ph.*)$ $1 [L]' . "\n" .
' RewriteRule (.*login\.ph.*)$ $1 [L]' . "\n" .
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-09-24 09:27:48
|
Revision: 3815
http://oscss.svn.sourceforge.net/oscss/?rev=3815&view=rev
Author: oscim
Date: 2011-09-24 09:27:38 +0000 (Sat, 24 Sep 2011)
Log Message:
-----------
Correction coquille page configuration BO
Suppression utilisation vue sql
Ajustement suppression des vue, sur class listing public
Suppresisn table vendor inutile
Suppression table product_type , et ajout d'une colonne dans la table product
Fragmentation des fichier sql d'install, en fichier unique par table , et ou insert
Changement du engine de mysql MyIsam vers innodb
Ajout de clef de contrainte externe (specifique innodb) pour meilleur unicit?\195?\169 des donn?\195?\169e en base ,
innodb doit rester optionnel (choix install) Et non conversion d'une base d?\195?\169j?\195?\160 existante
Modified Paths:
--------------
trunk/catalog/admin/includes/content/configuration.top.inc
trunk/catalog/admin/includes/modules/pages/products.php
trunk/catalog/includes/classes/core_page/listing.php
trunk/catalog/install/includes/application.php
trunk/catalog/install/includes/classes/core.php
trunk/catalog/install/includes/content/core.installdb.php
trunk/catalog/install/includes/functions/database.php
Added Paths:
-----------
trunk/catalog/install/includes/sql/
trunk/catalog/install/includes/sql/mysql/
trunk/catalog/install/includes/sql/mysql/data/
trunk/catalog/install/includes/sql/mysql/data/20_osc_address_format.sql
trunk/catalog/install/includes/sql/mysql/data/20_osc_countries.sql
trunk/catalog/install/includes/sql/mysql/data/20_osc_currencies.sql
trunk/catalog/install/includes/sql/mysql/data/20_osc_languages.sql
trunk/catalog/install/includes/sql/mysql/data/20_osc_status.sql
trunk/catalog/install/includes/sql/mysql/data/20_osc_zones.sql
trunk/catalog/install/includes/sql/mysql/data/40_osc_admin.sql
trunk/catalog/install/includes/sql/mysql/data/40_osc_admin_groups.sql
trunk/catalog/install/includes/sql/mysql/data/40_osc_categories.sql
trunk/catalog/install/includes/sql/mysql/data/40_osc_content.sql
trunk/catalog/install/includes/sql/mysql/data/40_osc_full_tag.sql
trunk/catalog/install/includes/sql/mysql/data/40_osc_navigation_links.sql
trunk/catalog/install/includes/sql/mysql/data/91_osc_admin_files.sql
trunk/catalog/install/includes/sql/mysql/data/91_osc_categories_description.sql
trunk/catalog/install/includes/sql/mysql/data/91_osc_cip.sql
trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql
trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration_group.sql
trunk/catalog/install/includes/sql/mysql/data/91_osc_content_description.sql
trunk/catalog/install/includes/sql/mysql/data/91_osc_cronjob.sql
trunk/catalog/install/includes/sql/mysql/data/91_osc_customers_groups.sql
trunk/catalog/install/includes/sql/mysql/data/91_osc_full_tag_description.sql
trunk/catalog/install/includes/sql/mysql/data/91_osc_geo_zones.sql
trunk/catalog/install/includes/sql/mysql/data/91_osc_navigation_links_description.sql
trunk/catalog/install/includes/sql/mysql/data/91_osc_tax_class.sql
trunk/catalog/install/includes/sql/mysql/data/91_osc_tax_rates.sql
trunk/catalog/install/includes/sql/mysql/data/91_osc_zones_to_geo_zones.sql
trunk/catalog/install/includes/sql/mysql/data/92_osc_content_to_categories.sql
trunk/catalog/install/includes/sql/mysql/tables/
trunk/catalog/install/includes/sql/mysql/tables/osc_address_book.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_address_format.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_admin.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_admin_files.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_admin_groups.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_admin_notification.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_categories.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_categories_description.key.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_categories_description.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_categories_extra.key.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_categories_extra.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_checknotif.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_cip.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_cip_depend.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_configuration.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_configuration_group.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_configuration_text.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_content.key.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_content.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_content_description.key.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_content_description.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_content_to_categories.key.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_content_to_categories.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_countries.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_cronjob.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_currencies.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_customers.key.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_customers.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_customers_basket.key.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_customers_basket.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_customers_basket_attributes.key.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_customers_basket_attributes.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_customers_groups.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_customers_info.key.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_customers_info.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_customers_to_extra_fields.key.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_customers_to_extra_fields.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_extra_field_labels.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_extra_field_values.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_extra_fields.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_extra_fields_info.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_full_tag.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_full_tag_description.key.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_full_tag_description.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_geo_zones.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_holding_orders.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_holding_orders_products.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_holding_orders_products_attributes.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_holding_orders_products_download.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_holding_orders_status_history.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_holding_orders_total.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_languages.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_manufacturers.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_manufacturers_info.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_navigation_links.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_navigation_links_description.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_newsletters.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_newsletters_modeles.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_newsletters_sent.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_orders.key.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_orders.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_orders_products.key.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_orders_products.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_orders_products_attributes.key.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_orders_products_attributes.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_orders_products_download.key.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_orders_products_download.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_orders_status_history.key.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_orders_status_history.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_orders_total.key.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_orders_total.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_am_attributes_to_templates.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_am_templates.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_attributes.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_attributes_download.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_attributes_groups.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_description.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_extra_fields.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_extra_fields_labels.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_extra_fields_values.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_groups.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_options.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_options_values.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_options_values_to_products_options.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_stock.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_to_categories.key.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_to_categories.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_to_products_extra_fields.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_scart.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_seo_cache.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_sessions.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_specials.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_status.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_tax_class.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_tax_rates.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_whos_online.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_zones.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_zones_to_geo_zones.sql
Removed Paths:
-------------
trunk/catalog/install/oscss.sql
trunk/catalog/install/oscss_config.sql
Modified: trunk/catalog/admin/includes/content/configuration.top.inc
===================================================================
--- trunk/catalog/admin/includes/content/configuration.top.inc 2011-09-23 07:18:58 UTC (rev 3814)
+++ trunk/catalog/admin/includes/content/configuration.top.inc 2011-09-24 09:27:38 UTC (rev 3815)
@@ -24,7 +24,7 @@
Old : cfg_21 >> 21 == configuration_group_id
New : template >> [cg_]template == configuration_group_key
*/
- if(strlen($gID)>3)
+ if(strlen($gID)<3)
$class='cfg_'.$gID;
else {
$_query = tep_db_query("SELECT configuration_group_key AS childmodule FROM " . TABLE_CONFIGURATION_GROUP . " WHERE configuration_group_id = '" . (int)$gID . "' ORDER BY sort_order");
Modified: trunk/catalog/admin/includes/modules/pages/products.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/products.php 2011-09-23 07:18:58 UTC (rev 3814)
+++ trunk/catalog/admin/includes/modules/pages/products.php 2011-09-24 09:27:38 UTC (rev 3815)
@@ -4,7 +4,7 @@
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 13/09/11, 17:30
+ @date 24/09/11, 11:07
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -196,7 +196,6 @@
if ($product_categories['total'] == '0') {
tep_remove_product($product_id);
- $DB->query("delete from " . TABLE_PRODUCTS_VIRTUAL . " where productsID = '" . (int)$product_id . "'");
}
}
@@ -210,7 +209,9 @@
case 'insert_product_base':
$typeID = (int)tep_db_prepare_input($_POST['products_virtual_type_id']);
- $sql_data_array = array('products_quantity' => 0,
+ $sql_data_array = array(
+ 'products_type' => $typeID,
+ 'products_quantity' => 0,
'products_price' => 0,
'products_date_added' => 'now()',
'manufacturers_id' => '',
@@ -221,11 +222,6 @@
- if ($typeID == 1) // being changed to Physical, so delete it from the Virtual Products table
- $DB->query("delete from " . TABLE_PRODUCTS_VIRTUAL . " where productsID = '" . (int)$products_id . "'");
- else // update by replacement
- $DB->query("replace into " . TABLE_PRODUCTS_VIRTUAL . "(productsID, typeID) values ('" . (int)$products_id . "', '" . $typeID . "')");
-
$DB->query("insert into " . TABLE_PRODUCTS_TO_CATEGORIES . " (products_id, categories_id) values ('" . (int)$products_id . "', '".ORPHELIN_COLLECTOR."')");
@@ -361,22 +357,13 @@
$messageStack->add_session(ERROR_CANNOT_LINK_TO_SAME_CATEGORY, 'error');
}
} elseif ($_POST['copy_as'] == 'duplicate') {
- $qu=$DB->query("SELECT typeID FROM " . TABLE_PRODUCTS_VIRTUAL . " WHERE productsID='".$products_id."' ");
- if(tep_db_num_rows($qu)){
- $virt=$qu->fetchAssoc();
- $typeID=$virt['typeID'];
- }
- else $typeID=false;
-
- $product_query = $DB->query("select products_quantity, products_model, products_image, products_price, products_date_available, products_weight, products_tax_class_id, manufacturers_id from " . TABLE_PRODUCTS . " where products_id = '" . (int)$products_id . "'");
+ $product_query = $DB->query("select products_type, products_quantity, products_model, products_image, products_price, products_date_available, products_weight, products_tax_class_id, manufacturers_id from " . TABLE_PRODUCTS . " where products_id = '" . (int)$products_id . "'");
$product = $product_query->fetchAssoc();
- $resobj=$DB->query("insert into " . TABLE_PRODUCTS . " (products_quantity, products_model,products_image, products_price, products_date_added, products_date_available, products_weight, products_status, products_tax_class_id, manufacturers_id) values ('" . tep_db_input($product['products_quantity']) . "', '" . tep_db_input($product['products_model']) . "', '" . tep_db_input($product['products_image']) . "', '" . tep_db_input($product['products_price']) . "', now(), " . (empty($product['products_date_available']) ? "null" : "'" . tep_db_input($product['products_date_available']) . "'") . ", '" . tep_db_input($product['products_weight']) . "', '0', '" . (int)$product['products_tax_class_id'] . "', '" . (int)$product['manufacturers_id'] . "')");
+ $resobj=$DB->query("insert into " . TABLE_PRODUCTS . " (products_type, products_quantity, products_model,products_image, products_price, products_date_added, products_date_available, products_weight, products_status, products_tax_class_id, manufacturers_id) values ('" . tep_db_input($product['products_type']) . "','" . tep_db_input($product['products_quantity']) . "', '" . tep_db_input($product['products_model']) . "', '" . tep_db_input($product['products_image']) . "', '" . tep_db_input($product['products_price']) . "', now(), " . (empty($product['products_date_available']) ? "null" : "'" . tep_db_input($product['products_date_available']) . "'") . ", '" . tep_db_input($product['products_weight']) . "', '0', '" . (int)$product['products_tax_class_id'] . "', '" . (int)$product['manufacturers_id'] . "')");
$dup_products_id = tep_db_insert_id($resobj);
- if($typeID !=false)
- $DB->query("insert into " . TABLE_PRODUCTS_VIRTUAL . "(productsID, typeID) values ('" . (int)$dup_products_id . "', '" . (int)$typeID . "')");
$description_query = $DB->query("select language_id, products_name, products_description, products_url from " . TABLE_PRODUCTS_DESCRIPTION . " where products_id = '" . (int)$products_id . "'");
while ($description =$description_query->fetchAssoc()) {
@@ -600,7 +587,7 @@
global $languages_id;
$DB=Database::getInstance();
- $product_query = $DB->query("select pd.products_name, pd.products_description, pd.products_url, p.products_id, p.products_quantity, p.products_model, p.products_image, p.products_price, p.products_weight, p.track_stock, p.products_date_added, p.products_last_modified, products_date_available, p.products_status, p.products_tax_class_id, p.manufacturers_id,p.products_ordered from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd where p.products_id = '" . (int)$ID . "' and p.products_id = pd.products_id and pd.language_id = '" . (int)$languages_id . "'");
+ $product_query = $DB->query("select pd.products_name, pd.products_description, pd.products_url, p.products_id, p.products_quantity,p.products_type as products_virtual_typeID, p.products_model, p.products_image, p.products_price, p.products_weight, p.track_stock, p.products_date_added, p.products_last_modified, products_date_available, p.products_status, p.products_tax_class_id, p.manufacturers_id,p.products_ordered from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd where p.products_id = '" . (int)$ID . "' and p.products_id = pd.products_id and pd.language_id = '" . (int)$languages_id . "'");
$product = tep_db_fetch_array($product_query);
tep_db_free_result($product_query);
@@ -609,15 +596,6 @@
$product['categories']=$cat_list;
tep_db_free_result($cat_query);
- $sql = "select * from ".TABLE_PRODUCTS_VIRTUAL." where productsID=".(int)$ID;
- $result = $DB->query($sql);
- if (tep_db_num_rows($result) > 0) { // this product is in the virtual table
- $virtual = tep_db_fetch_array($result);
- $product['products_virtual_typeID']= $virtual['typeID'];
- }
- else $product['products_virtual_typeID']= 1;
- tep_db_free_result($result);
-
$product['products_date_available']=(tep_not_null($product['products_date_available'])? tep_date_short($product['products_date_available']) : '');
// <!-- BOF Separate Pricing Per Customer -->
@@ -754,9 +732,8 @@
}
}
- $products_query = "select distinct p.products_id, p.products_image, pv.typeID , p.products_model,pd.products_name, p.products_quantity, p.products_price, p.products_status from " . TABLE_PRODUCTS . " p LEFT JOIN ".TABLE_PRODUCTS_VIRTUAL." pv on(p.products_id = pv.productsID) LEFT JOIN ".TABLE_STATUS." s on(pv.typeID = s.status_id and s.status_type='products_virtual_types' and s.language_id='" . (int)$languages_id . "') , " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c ".$add_tbl." where p.products_id = pd.products_id and pd.language_id = '" . (int)$languages_id . "' and p.products_id = p2c.products_id ".$cat." ".$avenir." ".$sta." ".$sWhere." order by ".((!empty($sOrder)) ? $sOrder : 'pd.products_name ASC');
+ $products_query = "select distinct p.products_id, p.products_image, p.products_type as typeID , p.products_model,pd.products_name, p.products_quantity, p.products_price, p.products_status from " . TABLE_PRODUCTS . " p LEFT JOIN ".TABLE_STATUS." s on(p.products_type = s.status_id and s.status_type='products_virtual_types' and s.language_id='" . (int)$languages_id . "') , " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c ".$add_tbl." where p.products_id = pd.products_id and pd.language_id = '" . (int)$languages_id . "' and p.products_id = p2c.products_id ".$cat." ".$avenir." ".$sta." ".$sWhere." order by ".((!empty($sOrder)) ? $sOrder : 'pd.products_name ASC');
-
$query_numrows= tep_db_num_rows($DB->query($products_query));
$products_split = new splitPageResults($page, $rowbyp, $products_query,$query_numrows);
@@ -764,7 +741,7 @@
$pq=$DB->query($products_query);
while ($products = tep_db_fetch_array($pq)) {
- $products['pv.typeID']=(!empty($products['typeID'])? $products['typeID']: '0');
+// $products['pv.typeID']=(!empty($products['typeID'])? $products['typeID']: '0');
$products['products_image']=(!empty($products['products_image']))
? tep_info_image($products['products_image'], $products['products_name'], TEMP_BO_SMALL_IMAGE_WIDTH, TEMP_BO_SMALL_IMAGE_HEIGHT)
: tep_info_image(IMAGE_NONEXISTENT, $products['products_name'], TEMP_BO_SMALL_IMAGE_WIDTH, TEMP_BO_SMALL_IMAGE_HEIGHT) ;
@@ -919,11 +896,11 @@
*/
private function load_type_product(){
if(!isset($_GET['pID'])) return ;
- $sql = "select * from ".TABLE_PRODUCTS_VIRTUAL." where productsID=".(int)$_GET['pID'];
+ $sql = "select * from ".TABLE_PRODUCTS." where products_id=".(int)$_GET['pID'];
$result = tep_db_query($sql);
if (tep_db_num_rows($result) > 0) { // this product is in the virtual table
$virtual = tep_db_fetch_array($result);
- $this->type_flag= $virtual['typeID'];
+ $this->type_flag= $virtual['products_type'];
}
else $this->type_flag=1;
tep_db_free_result($result);
Modified: trunk/catalog/includes/classes/core_page/listing.php
===================================================================
--- trunk/catalog/includes/classes/core_page/listing.php 2011-09-23 07:18:58 UTC (rev 3814)
+++ trunk/catalog/includes/classes/core_page/listing.php 2011-09-24 09:27:38 UTC (rev 3815)
@@ -154,7 +154,7 @@
//! We show them all and all type (page, products,link )
switch (self::$type_object){
case 'products':
- $listing_sql = " select DISTINCT p.*, pd.products_name from ".TABLE_V_PRODUCTS." p
+ $listing_sql = " select DISTINCT p.*, pd.products_name from ".TABLE_PRODUCTS." p
LEFT JOIN " . TABLE_PRODUCTS_DESCRIPTION . " pd on pd.products_id = p.products_id
LEFT JOIN " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c on p2c.products_id= p.products_id
WHERE pd.language_id = '" . (int)$languages_id . "' ";
@@ -179,7 +179,7 @@
case 'nested':
global $list;
- $listing_sql = "select DISTINCT p.*, pd.products_name from ".TABLE_V_PRODUCTS." p, " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c, " . TABLE_CATEGORIES . " c WHERE c.categories_id=p2c.categories_id and c.categories_status='1' AND pd.products_id = p.products_id and pd.language_id = '" . (int)$languages_id . "' and p.products_id = p2c.products_id ".(tep_not_null($list)? " AND p2c.categories_id IN (" . $list . ")" : '');
+ $listing_sql = "select DISTINCT p.*, pd.products_name from ".TABLE_PRODUCTS." p, " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c, " . TABLE_CATEGORIES . " c WHERE c.categories_id=p2c.categories_id and c.categories_status='1' AND pd.products_id = p.products_id and pd.language_id = '" . (int)$languages_id . "' and p.products_id = p2c.products_id ".(tep_not_null($list)? " AND p2c.categories_id IN (" . $list . ")" : '');
self::orderby('c.sort_order ');
break;
Modified: trunk/catalog/install/includes/application.php
===================================================================
--- trunk/catalog/install/includes/application.php 2011-09-23 07:18:58 UTC (rev 3814)
+++ trunk/catalog/install/includes/application.php 2011-09-24 09:27:38 UTC (rev 3815)
@@ -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 24/03/11, 09:55
+ @version 2.1.1
+ @date 24/09/11, 11:09
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -14,6 +14,8 @@
define('WS_LANGUAGE', 'includes/language/');
define('CHARSET', 'UTF-8');
+ define('DRIVER_SQL', 'mysql');
+
require('includes/functions/general.php');
require('includes/functions/database.php');
require('includes/functions/html_output.php');
Modified: trunk/catalog/install/includes/classes/core.php
===================================================================
--- trunk/catalog/install/includes/classes/core.php 2011-09-23 07:18:58 UTC (rev 3814)
+++ trunk/catalog/install/includes/classes/core.php 2011-09-24 09:27:38 UTC (rev 3815)
@@ -1,15 +1,14 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @package oscss-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 03/01/11, 09:32
+ @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 24/09/11, 11:09
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@modified Ayatus <www http://www.ayatus.org>
@encode UTF-8
*/
-error_reporting(E_ALL);
-
Class core {
/**
Pile de message
@@ -254,7 +253,10 @@
}
}
closedir($fichier);
- ksort($res);
+
+ if(count($orderby) == 0)asort($res);
+ else ksort($res);
+
return $res;
}
Modified: trunk/catalog/install/includes/content/core.installdb.php
===================================================================
--- trunk/catalog/install/includes/content/core.installdb.php 2011-09-23 07:18:58 UTC (rev 3814)
+++ trunk/catalog/install/includes/content/core.installdb.php 2011-09-24 09:27:38 UTC (rev 3815)
@@ -1,11 +1,11 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @package oscss-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 09/11/10, 09:10
+ @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 24/09/11, 11:10
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @author Ayatus <www http://www.ayatus.org>
@encode UTF-8
*/
@@ -24,14 +24,31 @@
osc_db_connect($this->db['DB_SERVER'], $this->db['DB_SERVER_USERNAME'], $this->db['DB_SERVER_PASSWORD']);
osc_db_select_db($this->db['DB_DATABASE']);
$db_error = false;
- $sql_file = $this->fs_document_root . 'install/oscss.sql';
osc_set_time_limit(0);
- osc_db_install($this->db['DB_DATABASE'], $sql_file, $this->db['DB_TABLE_PREFIX']);
+ // creation des tables
+ foreach(core::browse_rep($this->fs_document_root . 'install/includes/sql/mysql/tables/') as $file){
+ if(strpos($file['file'] , '.key')===false){
+ osc_db_upgrade($this->db['DB_DATABASE'], $this->fs_document_root . 'install/includes/sql/mysql/tables/'.$file['file'] , $this->db['DB_TABLE_PREFIX']);
+ }
+ }
+ // add key
+ foreach(core::browse_rep($this->fs_document_root . 'install/includes/sql/mysql/tables/') as $file){
+ if(strpos($file['file'] , '.key') > 0){
+ osc_db_upgrade($this->db['DB_DATABASE'], $this->fs_document_root . 'install/includes/sql/mysql/tables/'.$file['file'] , $this->db['DB_TABLE_PREFIX']);
+ }
+ }
+
+ // add data config
if ( ($db_error == false) ) {
- $sql_file = $this->fs_document_root . 'install/oscss_config.sql';
- osc_db_install($this->db['DB_DATABASE'], $sql_file, $this->db['DB_TABLE_PREFIX']);
+
+ foreach(core::browse_rep($this->fs_document_root . 'install/includes/sql/mysql/data/') as $file){
+// echo $file['file'].'<br>';
+ osc_db_install($this->db['DB_DATABASE'], $this->fs_document_root . 'install/includes/sql/mysql/data/'.$file['file'] , $this->db['DB_TABLE_PREFIX']);
+ }
+
+
}
if ($db_error != false) $this->PileMessage('error', core::l10n("Un problème à eu lieu durant la phase d'installation de la base de données" ) ) ;
Modified: trunk/catalog/install/includes/functions/database.php
===================================================================
--- trunk/catalog/install/includes/functions/database.php 2011-09-23 07:18:58 UTC (rev 3814)
+++ trunk/catalog/install/includes/functions/database.php 2011-09-24 09:27:38 UTC (rev 3815)
@@ -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 16/07/11, 10:54
+ @version 2.1.1
+ @date 24/09/11, 11:10
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -319,6 +319,7 @@
}
}
+
for ($i=0; $i<=sizeof($sql_queries); $i++) {
if(is_array($lg) && isset($sql_queries[$i])) osc_db_query(str_replace(array_keys($lg),array_map('addslashes',$lg),$sql_queries[$i]));
elseif(isset($sql_queries[$i])) osc_db_query($sql_queries[$i]);
@@ -336,8 +337,8 @@
$db_error = false;
$lg=false;
-// osc_db_select_db($database);
+
if (!$db_error) {
// if (!get_cfg_var('safe_mode')) {
@@ -435,9 +436,9 @@
for ($i=0; $i<=sizeof($sql_queries); $i++) {
if(isset($sql_queries[$i])){
- echo $sql_queries[$i];
+// echo $sql_queries[$i];
osc_db_query_noblock($sql_queries[$i]);
- echo '<br />';
+// echo '<br />';
}
}
} else {
Added: trunk/catalog/install/includes/sql/mysql/data/20_osc_address_format.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/data/20_osc_address_format.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/data/20_osc_address_format.sql 2011-09-24 09:...
[truncated message content] |
|
From: <os...@us...> - 2011-09-24 19:20:52
|
Revision: 3816
http://oscss.svn.sourceforge.net/oscss/?rev=3816&view=rev
Author: oscim
Date: 2011-09-24 19:20:45 +0000 (Sat, 24 Sep 2011)
Log Message:
-----------
Ajout de contrainte de table dans l'install
correction appels Sql sur les vues
Correction coquille appel , et blocquage enresgitrement du count et last_logon d'un customers, lors d'un connexion "incarner" de l'admin
Modified Paths:
--------------
trunk/catalog/includes/classes/core_page/customer.php
trunk/catalog/includes/content/account.php
trunk/catalog/includes/content/account_history.php
trunk/catalog/includes/content/account_history_info.php
trunk/catalog/install/data/templates/appareil_photo/electronix/includes/content/account.php
trunk/catalog/install/data/templates/appareil_photo/electronix/includes/content/account_history.php
trunk/catalog/install/data/templates/appareil_photo/electronix/includes/content/account_history_info.php
trunk/catalog/install/data/templates/appareil_photo/electronix/includes/content/home.php
trunk/catalog/install/includes/sql/mysql/tables/osc_orders.key.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_seo_cache.sql
Added Paths:
-----------
trunk/catalog/install/includes/sql/mysql/tables/osc_scart.key.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_seo_cache.key.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_specials.key.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_status.key.sql
Modified: trunk/catalog/includes/classes/core_page/customer.php
===================================================================
--- trunk/catalog/includes/classes/core_page/customer.php 2011-09-24 09:27:38 UTC (rev 3815)
+++ trunk/catalog/includes/classes/core_page/customer.php 2011-09-24 19:20:45 UTC (rev 3816)
@@ -928,8 +928,9 @@
@fn initSession($user)
@brief Session creat / restore for current user
@param $user object | array
+ @param logon adjust date logon
*/
- static public function initSession($user){
+ static public function initSession($user, $logon = true){
global $cart;
$DB=Database::getInstance();
@@ -979,14 +980,16 @@
// add in session last logon
$cu=self::$_instance;
$cu->detail_long_cust();
- $_SESSION['last_logon'] = $cu->customer['customers_info_date_of_last_logon'];
+ if($logon)
+ $_SESSION['last_logon'] = $cu->customer['customers_info_date_of_last_logon'];
// restore cart contents
$cart->restore_contents();
// update logon user
- $DB->query("UPDATE " . TABLE_CUSTOMERS_INFO . " SET customers_info_date_of_last_logon=NOW() , customers_info_number_of_logons = customers_info_number_of_logons + 1 WHERE customers_info_id ='".(int)$customer_id."' ");
+ if($logon)
+ $DB->query("UPDATE " . TABLE_CUSTOMERS_INFO . " SET customers_info_date_of_last_logon=NOW() , customers_info_number_of_logons = customers_info_number_of_logons + 1 WHERE customers_info_id ='".(int)$customer_id."' ");
}
/**
Modified: trunk/catalog/includes/content/account.php
===================================================================
--- trunk/catalog/includes/content/account.php 2011-09-24 09:27:38 UTC (rev 3815)
+++ trunk/catalog/includes/content/account.php 2011-09-24 19:20:45 UTC (rev 3816)
@@ -1,17 +1,17 @@
<?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.1.0
- @date 16/09/10, 21:53
+ @version 2.1.1
+ @date 24/09/11, 19:13
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
$module=$page->_call('account','ret_modules');
$i=0;
- $orders_query = tep_db_query("select o.orders_id,o.orders_prefix, o.date_purchased, o.delivery_name, o.delivery_country, o.billing_name, o.billing_country, ot.text as order_total, s.orders_status_name from " . TABLE_ORDERS . " o, " . TABLE_ORDERS_TOTAL . " ot, " . TABLE_V_ORDERS_STATUS . " s where o.customers_id = '" . (int)$customer_id . "' and o.orders_id = ot.orders_id and ot.class = 'ot_total' and o.orders_status = s.orders_status_id and s.language_id = '" . (int)$languages_id . "' order by orders_id desc limit 1");
+ $orders_query = tep_db_query("select o.orders_id,o.orders_prefix, o.date_purchased, o.delivery_name, o.delivery_country, o.billing_name, o.billing_country, ot.text as order_total, s.status_name as orders_status_name from " . TABLE_ORDERS . " o, " . TABLE_ORDERS_TOTAL . " ot, " . TABLE_STATUS . " s where o.customers_id = '" . (int)$customer_id . "' and o.orders_id = ot.orders_id and ot.class = 'ot_total' and o.orders_status = s.status_id and s.language_id = '" . (int)$languages_id . "' AND status_type='orders' ORDER BY orders_id desc limit 1");
?>
<div id="account">
Modified: trunk/catalog/includes/content/account_history.php
===================================================================
--- trunk/catalog/includes/content/account_history.php 2011-09-24 09:27:38 UTC (rev 3815)
+++ trunk/catalog/includes/content/account_history.php 2011-09-24 19:20:45 UTC (rev 3816)
@@ -4,7 +4,7 @@
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.0
- @date 16/09/10, 21:52
+ @date 16/12/10, 21:52
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -17,7 +17,7 @@
$orders_total = tep_count_customer_orders();
if ($orders_total > 0) {
- $history_query_raw = "select o.orders_id,o.orders_prefix, o.date_purchased, o.delivery_name, o.billing_name, ot.text as order_total,o.orders_status, s.orders_status_name from " . TABLE_ORDERS . " o, " . TABLE_ORDERS_TOTAL . " ot, " . TABLE_V_ORDERS_STATUS . " s where o.customers_id = '" . (int)$customer_id . "' and o.orders_id = ot.orders_id and ot.class = 'ot_total' and o.orders_status = s.orders_status_id and s.language_id = '" . (int)$languages_id . "' order by orders_id DESC";
+ $history_query_raw = "select o.orders_id,o.orders_prefix, o.date_purchased, o.delivery_name, o.billing_name, ot.text as order_total,o.orders_status, s.status_name as orders_status_name from " . TABLE_ORDERS . " o, " . TABLE_ORDERS_TOTAL . " ot, " . TABLE_STATUS . " s where o.customers_id = '" . (int)$customer_id . "' and o.orders_id = ot.orders_id and ot.class = 'ot_total' and o.orders_status = s.status_id AND status_type='orders' AND s.language_id = '" . (int)$languages_id . "' order by orders_id DESC";
$history_split = new splitPageResults($history_query_raw, MAX_DISPLAY_ORDER_HISTORY);
$history_query = tep_db_query($history_split->sql_query);
Modified: trunk/catalog/includes/content/account_history_info.php
===================================================================
--- trunk/catalog/includes/content/account_history_info.php 2011-09-24 09:27:38 UTC (rev 3815)
+++ trunk/catalog/includes/content/account_history_info.php 2011-09-24 19:20:45 UTC (rev 3816)
@@ -1,10 +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.1.0
- @date 16/09/10, 21:52
+ @version 2.1.1
+ @date 24/09/11, 19:13
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -91,11 +91,11 @@
</thead>
<tbody>
<?php
- $statuses_query = tep_db_query("select os.orders_status_name, osh.date_added, osh.comments from " . TABLE_V_ORDERS_STATUS . " os, " . TABLE_ORDERS_STATUS_HISTORY . " osh where osh.orders_id = '" . (int)$_GET['order_id'] . "' and osh.orders_status_id = os.orders_status_id and os.language_id = '" . (int)$languages_id . "' order by osh.date_added");
+ $statuses_query = tep_db_query("select os.status_name, osh.date_added, osh.comments from " . TABLE_STATUS . " os, " . TABLE_ORDERS_STATUS_HISTORY . " osh where osh.orders_id = '" . (int)$_GET['order_id'] . "' and osh.orders_status_id = os.status_id AND status_type='orders' AND os.language_id = '" . (int)$languages_id . "' order by osh.date_added");
while ($statuses = tep_db_fetch_array($statuses_query)) {
echo '<tr>' . "\n" .
'<td>' . tep_date_short($statuses['date_added']) . '</td>' . "\n" .
- '<td>' . $statuses['orders_status_name'] . '</td>' . "\n" .
+ '<td>' . $statuses['status_name'] . '</td>' . "\n" .
'<td>' . (empty($statuses['comments']) ? ' ' : nl2br(tep_output_string_protected($statuses['comments']))) . '</td>' . "\n" .
'</tr>' . "\n" ;
Modified: trunk/catalog/install/data/templates/appareil_photo/electronix/includes/content/account.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/electronix/includes/content/account.php 2011-09-24 09:27:38 UTC (rev 3815)
+++ trunk/catalog/install/data/templates/appareil_photo/electronix/includes/content/account.php 2011-09-24 19:20:45 UTC (rev 3816)
@@ -1,16 +1,16 @@
<?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.1.0
- @date 15/12/10, 21:53
+ @version 2.1.1
+ @date 24/09/11, 19:13
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
$module=$page->_call('account','ret_modules');
$i=0;
- $orders_query = tep_db_query("select o.orders_id,o.orders_prefix, o.date_purchased, o.delivery_name, o.delivery_country, o.billing_name, o.billing_country, ot.text as order_total, s.orders_status_name from " . TABLE_ORDERS . " o, " . TABLE_ORDERS_TOTAL . " ot, " . TABLE_V_ORDERS_STATUS . " s where o.customers_id = '" . (int)$customer_id . "' and o.orders_id = ot.orders_id and ot.class = 'ot_total' and o.orders_status = s.orders_status_id and s.language_id = '" . (int)$languages_id . "' order by orders_id desc limit 1");
+ $orders_query = tep_db_query("select o.orders_id,o.orders_prefix, o.date_purchased, o.delivery_name, o.delivery_country, o.billing_name, o.billing_country, ot.text as order_total, s.status_name as orders_status_name from " . TABLE_ORDERS . " o, " . TABLE_ORDERS_TOTAL . " ot, " . TABLE_STATUS . " s where o.customers_id = '" . (int)$customer_id . "' and o.orders_id = ot.orders_id and ot.class = 'ot_total' and o.orders_status = s.status_id and s.language_id = '" . (int)$languages_id . "' AND status_type='orders' ORDER BY orders_id desc limit 1");
?>
<div id="account">
Modified: trunk/catalog/install/data/templates/appareil_photo/electronix/includes/content/account_history.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/electronix/includes/content/account_history.php 2011-09-24 09:27:38 UTC (rev 3815)
+++ trunk/catalog/install/data/templates/appareil_photo/electronix/includes/content/account_history.php 2011-09-24 19:20:45 UTC (rev 3816)
@@ -20,7 +20,7 @@
$orders_total = tep_count_customer_orders();
if ($orders_total > 0) {
- $history_query_raw = "select o.orders_id,o.orders_prefix, o.date_purchased, o.delivery_name, o.billing_name, ot.text as order_total,o.orders_status, s.orders_status_name from " . TABLE_ORDERS . " o, " . TABLE_ORDERS_TOTAL . " ot, " . TABLE_V_ORDERS_STATUS . " s where o.customers_id = '" . (int)$customer_id . "' and o.orders_id = ot.orders_id and ot.class = 'ot_total' and o.orders_status = s.orders_status_id and s.language_id = '" . (int)$languages_id . "' order by orders_id DESC";
+ $history_query_raw = "select o.orders_id,o.orders_prefix, o.date_purchased, o.delivery_name, o.billing_name, ot.text as order_total,o.orders_status, s.status_name as orders_status_name from " . TABLE_ORDERS . " o, " . TABLE_ORDERS_TOTAL . " ot, " . TABLE_STATUS . " s where o.customers_id = '" . (int)$customer_id . "' and o.orders_id = ot.orders_id and ot.class = 'ot_total' and o.orders_status = s.status_id AND status_type='orders' AND s.language_id = '" . (int)$languages_id . "' order by orders_id DESC";
$history_split = new splitPageResults($history_query_raw, MAX_DISPLAY_ORDER_HISTORY);
$history_query = tep_db_query($history_split->sql_query);
Modified: trunk/catalog/install/data/templates/appareil_photo/electronix/includes/content/account_history_info.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/electronix/includes/content/account_history_info.php 2011-09-24 09:27:38 UTC (rev 3815)
+++ trunk/catalog/install/data/templates/appareil_photo/electronix/includes/content/account_history_info.php 2011-09-24 19:20:45 UTC (rev 3816)
@@ -1,10 +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.1.0
- @date 18/11/10, 21:52
+ @version 2.1.1
+ @date 24/09/11, 19:13
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -105,11 +105,11 @@
</thead>
<tbody>
<?php
- $statuses_query = tep_db_query("select os.orders_status_name, osh.date_added, osh.comments from " . TABLE_V_ORDERS_STATUS . " os, " . TABLE_ORDERS_STATUS_HISTORY . " osh where osh.orders_id = '" . (int)$_GET['order_id'] . "' and osh.orders_status_id = os.orders_status_id and os.language_id = '" . (int)$languages_id . "' order by osh.date_added");
+ $statuses_query = tep_db_query("select os.status_name, osh.date_added, osh.comments from " . TABLE_STATUS . " os, " . TABLE_ORDERS_STATUS_HISTORY . " osh where osh.orders_id = '" . (int)$_GET['order_id'] . "' and osh.orders_status_id = os.status_id AND status_type='orders' AND os.language_id = '" . (int)$languages_id . "' order by osh.date_added");
while ($statuses = tep_db_fetch_array($statuses_query)) {
echo '<tr>' . "\n" .
'<td>' . tep_date_short($statuses['date_added']) . '</td>' . "\n" .
- '<td>' . $statuses['orders_status_name'] . '</td>' . "\n" .
+ '<td>' . $statuses['status_name'] . '</td>' . "\n" .
'<td>' . (empty($statuses['comments']) ? ' ' : nl2br(tep_output_string_protected($statuses['comments']))) . '</td>' . "\n" .
'</tr>' . "\n" ;
Modified: trunk/catalog/install/data/templates/appareil_photo/electronix/includes/content/home.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/electronix/includes/content/home.php 2011-09-24 09:27:38 UTC (rev 3815)
+++ trunk/catalog/install/data/templates/appareil_photo/electronix/includes/content/home.php 2011-09-24 19:20:45 UTC (rev 3816)
@@ -1,10 +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.1.0
- @date 16/09/10, 21:55
+ @version 2.1.1
+ @date 24/09/11, 19:21
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -16,7 +16,7 @@
<div class="top_prod_box_big"></div>
<div class="center_prod_box_big">
<p class="customerGreeting"><?php echo tep_customer_greeting(); ?></p>
- <div class="textMain"><?php echo TEXT_MAIN ; ?></div>
+ <div class="textMain"><?php printf(TEXT_MAIN, PROJECT_VERSION ; ?></div>
</div>
<div class="bottom_prod_box_big"></div>
</div>
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_orders.key.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_orders.key.sql 2011-09-24 09:27:38 UTC (rev 3815)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_orders.key.sql 2011-09-24 19:20:45 UTC (rev 3816)
@@ -1,5 +1,26 @@
+#+#######################################################################+
+#| osCSS Open Source E-commerce |
+#+#######################################################################+
+#| Copyright (c) 2005-2011 The osCSS developers |
+#| |
+#| http://www.oscss.org |
+#| Portions Copyright (c) 2003 osCommerce |
+#+#######################################################################+
+#| This source file is subject to version 2.0 of the GPL license, |
+#| available at the following url: |
+#| http://www.oscss.org/license/2_0.txt. |
+#+#######################################################################+
+# NOTE: * Please make any modifications to this file by hand!
+# * DO NOT use a mysqldump created file for new changes!
+# * Please take note of the table structure, and use this
+# structure as a standard for future modifications!
+# * Any tables you add here should be added in admin/backup.php
+# and in catalog/install/includes/functions/database.php
+# * Comments should be like these, full line comments.
+# (don't use inline comments '--', but use #)
+
ALTER TABLE osc_orders ADD INDEX idx_orders_cid (customers_id);
ALTER TABLE osc_orders ADD CONSTRAINT fk_orders_cid FOREIGN KEY (customers_id) REFERENCES osc_customers (customers_id);
Added: trunk/catalog/install/includes/sql/mysql/tables/osc_scart.key.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_scart.key.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_scart.key.sql 2011-09-24 19:20:45 UTC (rev 3816)
@@ -0,0 +1,28 @@
+#+#######################################################################+
+#| osCSS Open Source E-commerce |
+#+#######################################################################+
+#| Copyright (c) 2005-2011 The osCSS developers |
+#| |
+#| http://www.oscss.org |
+#| Portions Copyright (c) 2003 osCommerce |
+#+#######################################################################+
+#| This source file is subject to version 2.0 of the GPL license, |
+#| available at the following url: |
+#| http://www.oscss.org/license/2_0.txt. |
+#+#######################################################################+
+
+# NOTE: * Please make any modifications to this file by hand!
+# * DO NOT use a mysqldump created file for new changes!
+# * Please take note of the table structure, and use this
+# structure as a standard for future modifications!
+# * Any tables you add here should be added in admin/backup.php
+# and in catalog/install/includes/functions/database.php
+# * Comments should be like these, full line comments.
+# (don't use inline comments '--', but use #)
+
+
+
+ALTER TABLE osc_scart ADD INDEX idx_scart_cid (customers_id);
+ALTER TABLE osc_scart ADD CONSTRAINT fk_scart_cid FOREIGN KEY (customers_id) REFERENCES osc_customers (customers_id);
+
+COMMIT;
\ No newline at end of file
Added: trunk/catalog/install/includes/sql/mysql/tables/osc_seo_cache.key.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_seo_cache.key.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_seo_cache.key.sql 2011-09-24 19:20:45 UTC (rev 3816)
@@ -0,0 +1,28 @@
+#+#######################################################################+
+#| osCSS Open Source E-commerce |
+#+#######################################################################+
+#| Copyright (c) 2005-2011 The osCSS developers |
+#| |
+#| http://www.oscss.org |
+#| Portions Copyright (c) 2003 osCommerce |
+#+#######################################################################+
+#| This source file is subject to version 2.0 of the GPL license, |
+#| available at the following url: |
+#| http://www.oscss.org/license/2_0.txt. |
+#+#######################################################################+
+
+# NOTE: * Please make any modifications to this file by hand!
+# * DO NOT use a mysqldump created file for new changes!
+# * Please take note of the table structure, and use this
+# structure as a standard for future modifications!
+# * Any tables you add here should be added in admin/backup.php
+# and in catalog/install/includes/functions/database.php
+# * Comments should be like these, full line comments.
+# (don't use inline comments '--', but use #)
+
+
+
+ALTER TABLE osc_seo_cache ADD INDEX idx_seo_lg (cache_language_id);
+ALTER TABLE osc_seo_cache ADD CONSTRAINT fk_seo_lg FOREIGN KEY (cache_language_id) REFERENCES osc_languages (languages_id);
+
+COMMIT;
\ No newline at end of file
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_seo_cache.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_seo_cache.sql 2011-09-24 09:27:38 UTC (rev 3815)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_seo_cache.sql 2011-09-24 19:20:45 UTC (rev 3816)
@@ -1,3 +1,27 @@
+#+#######################################################################+
+#| osCSS Open Source E-commerce |
+#+#######################################################################+
+#| Copyright (c) 2005-2011 The osCSS developers |
+#| |
+#| http://www.oscss.org |
+#| Portions Copyright (c) 2003 osCommerce |
+#+#######################################################################+
+#| This source file is subject to version 2.0 of the GPL license, |
+#| available at the following url: |
+#| http://www.oscss.org/license/2_0.txt. |
+#+#######################################################################+
+
+# NOTE: * Please make any modifications to this file by hand!
+# * DO NOT use a mysqldump created file for new changes!
+# * Please take note of the table structure, and use this
+# structure as a standard for future modifications!
+# * Any tables you add here should be added in admin/backup.php
+# and in catalog/install/includes/functions/database.php
+# * Comments should be like these, full line comments.
+# (don't use inline comments '--', but use #)
+
+
+
SET storage_engine=innodb;
drop table if exists osc_seo_cache;
@@ -3,5 +27,5 @@
create table osc_seo_cache (
cache_id char(32) not null ,
- cache_language_id int(3) default '1' not null ,
+ cache_language_id int(11) default '1' not null ,
cache_name varchar(255) not null ,
cache_data mediumtext not null ,
Added: trunk/catalog/install/includes/sql/mysql/tables/osc_specials.key.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_specials.key.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_specials.key.sql 2011-09-24 19:20:45 UTC (rev 3816)
@@ -0,0 +1,28 @@
+#+#######################################################################+
+#| osCSS Open Source E-commerce |
+#+#######################################################################+
+#| Copyright (c) 2005-2011 The osCSS developers |
+#| |
+#| http://www.oscss.org |
+#| Portions Copyright (c) 2003 osCommerce |
+#+#######################################################################+
+#| This source file is subject to version 2.0 of the GPL license, |
+#| available at the following url: |
+#| http://www.oscss.org/license/2_0.txt. |
+#+#######################################################################+
+
+# NOTE: * Please make any modifications to this file by hand!
+# * DO NOT use a mysqldump created file for new changes!
+# * Please take note of the table structure, and use this
+# structure as a standard for future modifications!
+# * Any tables you add here should be added in admin/backup.php
+# and in catalog/install/includes/functions/database.php
+# * Comments should be like these, full line comments.
+# (don't use inline comments '--', but use #)
+
+
+ALTER TABLE osc_specials ADD INDEX idx_specials_pid (products_id );
+ALTER TABLE osc_specials ADD CONSTRAINT fk_specials_pid FOREIGN KEY (products_id ) REFERENCES osc_products (products_id );
+
+
+COMMIT;
\ No newline at end of file
Added: trunk/catalog/install/includes/sql/mysql/tables/osc_status.key.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_status.key.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_status.key.sql 2011-09-24 19:20:45 UTC (rev 3816)
@@ -0,0 +1,28 @@
+#+#######################################################################+
+#| osCSS Open Source E-commerce |
+#+#######################################################################+
+#| Copyright (c) 2005-2011 The osCSS developers |
+#| |
+#| http://www.oscss.org |
+#| Portions Copyright (c) 2003 osCommerce |
+#+#######################################################################+
+#| This source file is subject to version 2.0 of the GPL license, |
+#| available at the following url: |
+#| http://www.oscss.org/license/2_0.txt. |
+#+#######################################################################+
+
+# NOTE: * Please make any modifications to this file by hand!
+# * DO NOT use a mysqldump created file for new changes!
+# * Please take note of the table structure, and use this
+# structure as a standard for future modifications!
+# * Any tables you add here should be added in admin/backup.php
+# and in catalog/install/includes/functions/database.php
+# * Comments should be like these, full line comments.
+# (don't use inline comments '--', but use #)
+
+
+ALTER TABLE osc_status ADD INDEX idx_status_lg (language_id);
+ALTER TABLE osc_status ADD CONSTRAINT fk_status_lg FOREIGN KEY (language_id) REFERENCES osc_languages (languages_id);
+
+
+COMMIT;
\ 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-09-24 20:54:48
|
Revision: 3817
http://oscss.svn.sourceforge.net/oscss/?rev=3817&view=rev
Author: oscim
Date: 2011-09-24 20:54:41 +0000 (Sat, 24 Sep 2011)
Log Message:
-----------
report dans le front office de la desactivation du moteur de generation pdf, et liaison vers les fichie deja existant.
Ajout d'unfichie document pour la prise en charge de l'ouverture des pdf
Ajout d'un dossier document, destin?\195?\169e a recevoir tous les dossier avec acces en ecriture
modification del'install en ce sens
Modified Paths:
--------------
trunk/catalog/account.php
trunk/catalog/admin/includes/modules/pages/batch_print.php
trunk/catalog/common/classes/DatasFiles.php
trunk/catalog/install/includes/content/core.base.php
trunk/catalog/install/includes/content/core.configuration.php
trunk/catalog/login.php
Added Paths:
-----------
trunk/catalog/document.php
Modified: trunk/catalog/account.php
===================================================================
--- trunk/catalog/account.php 2011-09-24 19:20:45 UTC (rev 3816)
+++ trunk/catalog/account.php 2011-09-24 20:54:41 UTC (rev 3817)
@@ -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 13/03/11, 09:19
+ @version 2.1.1
+ @date 24/09/11, 22:46
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
* \file
@@ -158,39 +158,71 @@
$customer_info_query = tep_db_query("select customers_id, orders_status from " . TABLE_ORDERS . " where orders_id = '". (int)$_GET['order_id'] . "'");
$customer_info = tep_db_fetch_array($customer_info_query);
// $orders_status = $customer_info['orders_status'];
- if ($customer_info['customers_id'] != $customer_id) tep_redirect(tep_href_link(FILENAME_ACCOUNT, 'action=history', 'SSL'));
- $time0 = time();
- require(DIR_WS_CLASSES . 'order.php');
- $order = new order((int)$_GET['order_id']);
+ /// control id command eet id order
+ if ($customer_info['customers_id'] != $customer_id)
+ tep_redirect(tep_href_link(FILENAME_ACCOUNT, 'action=history', 'SSL'));
+
+ $DF = new DatasFiles;
+
+
+ /// Generat Pdf
+ if(_cst_bool('USE_LOCAL_GENERAT_PDF')) {
+ $time0 = time();
+ require(DIR_WS_CLASSES . 'order.php');
+ $order = new order((int)$_GET['order_id']);
+
osCSS_pdf::getInstance();
+ $pageloop = "1";
- $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);
- $order = new order($_GET['order_id']);
+ $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']);
+
$pdf=osCSS_pdf::OutputEnd($type);
+
+ }
+
+ /// Load file pdf
+ else {
+
+ $type=($customer_info['orders_status']==DEFAULT_ORDERS_STATUS_COMPLETED)?'invoice' : 'packingslip';
+
+ if(( $filepath=$DF->GetDoc('packingslip', $_GET['order_id'])) && file_exists($filepath)){
+
+ 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'] );
+ }
+
+
+ }
+
+
+
break;
/**
* \section execution modukle aca complementaire
Modified: trunk/catalog/admin/includes/modules/pages/batch_print.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/batch_print.php 2011-09-24 19:20:45 UTC (rev 3816)
+++ trunk/catalog/admin/includes/modules/pages/batch_print.php 2011-09-24 20:54:41 UTC (rev 3817)
@@ -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 13/03/11, 09:12
+ @version 2.1.1
+ @date 24/09/11, 21:53
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class batch_print
@@ -99,14 +99,16 @@
}
$pdf=osCSS_pdf::OutputInit($type);
+ $DF = new DatasFiles;
+
$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']) && tep_not_null($_POST['pull_status']))? " and o.orders_status = ". $_POST['pull_status']:'';
// if there is a invoice number use first order query otherwise use second date style order query
- if ($invoicenumbers != '') $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($invoicenumbers) . ") and h.orders_id = o.orders_id" . $pull_w_status . $get_customer_comments . ' group by o.orders_id');
- else $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.date_purchased between '" . tep_db_input($startdate) . "' and '" . tep_db_input($enddate) . " 23:59:59' and h.orders_id = o.orders_id" . $pull_w_status . $get_customer_comments . ' group by o.orders_id');
+ if ($invoicenumbers != '') $orders_query = tep_db_query("select o.orders_id,o.customers_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($invoicenumbers) . ") and h.orders_id = o.orders_id" . $pull_w_status . $get_customer_comments . ' group by o.orders_id');
+ else $orders_query = tep_db_query("select o.orders_id,o.customers_id,o.orders_status,h.comments,MIN(h.date_added) from " . TABLE_ORDERS . " o, " . TABLE_ORDERS_STATUS_HISTORY . " h where o.date_purchased between '" . tep_db_input($startdate) . "' and '" . tep_db_input($enddate) . " 23:59:59' 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');
@@ -122,9 +124,18 @@
$time0 = $time1;
header('X-bpPing: Pong');
}
+
+ $file=$DF->GetDoc(osCSS_pdf::GetPdfType(),$orders['orders_id']);
+
+ if(file_exists($file))
+ unlink($file);
+
+ $pdf=osCSS_pdf::SaveEnd($file);
}
- $pdf=osCSS_pdf::OutputEnd($type);
+ /// @remarks draw and exit;
+ $pdf=osCSS_pdf::OutputEnd();
+//
/* Succes */
// $messageStack->add_session('A PDF of ' . $num . ' record(s) was successful! <a href="'.$fname.'" target="_blank"><b>Click here</b></a> to download the order file.', 'info');
Modified: trunk/catalog/common/classes/DatasFiles.php
===================================================================
--- trunk/catalog/common/classes/DatasFiles.php 2011-09-24 19:20:45 UTC (rev 3816)
+++ trunk/catalog/common/classes/DatasFiles.php 2011-09-24 20:54:41 UTC (rev 3817)
@@ -1,7 +1,6 @@
<?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.1
@date 19/09/11, 11:40
@@ -55,7 +54,7 @@
/**
@brief creat base tree structure for type folder (orders, invoices )
*/
- /*private*/ static function InitFolder($folder){
+ private static function InitFolder($folder){
$path_base = self::$DataDoc . $folder .'/';
@@ -92,6 +91,90 @@
}
/**
+ @brief convert type string in integer
+ @return int
+ */
+ public static function ConvertType($type){
+ switch($type){
+ case 'client':
+ case 'customer':
+ case 'customers':
+ return 40;
+ break;
+
+
+ case 'category':
+ case 'categorie':
+ case 'categories':
+ return 30;
+ break;
+
+ case 'product':
+ case 'products':
+ return 20;
+ break;
+
+ // pdf orders
+ case 'commande':
+ case 'orders':
+ case 'order':
+ return 10;
+ break;
+
+ case 'packingslip':
+ return 11;
+ break;
+
+ case 'factures':
+ case 'facture':
+ case 'invoices':
+ case 'invoice':
+ return 12;
+ break;
+ }
+ return 0;
+ }
+
+ /**
+ @brief convert type integer in string
+ @return int
+ */
+ public static function SpecificType($type_int){
+ $obj = new stdClass;
+ switch($type_int){
+ case 20:
+ $obj->prefix = '';
+ $obj->format = '%s';
+ $obj->folder = 'products';
+ $obj->ext = '';// fichier image
+ break;
+
+ case 10:
+ $obj->prefix = 'CO';
+ $obj->format = '%s-%s.%s';
+ $obj->folder = 'orders';
+ $obj->ext = 'pdf';
+ break;
+ case 11:
+ $obj->prefix = 'BC';
+ $obj->format = '%s-%s.%s';
+ $obj->folder = 'packingslip';
+ $obj->ext = 'pdf';
+ break;
+ case 12:
+ $obj->prefix = 'FA';
+ $obj->format = '%s-%s.%s';
+ $obj->folder = 'invoices';
+ $obj->ext = 'pdf';
+ break;
+ }
+
+ return $obj;
+
+ }
+
+
+ /**
@brief construct and return path for id
*/
static function PathForId($id){
@@ -119,7 +202,9 @@
public function GetPathid($type, $id){
$pathid=self::PathForId($id);
- $path = self::InitFolder($type);
+// $typeint = ;
+ $type=self::SpecificType(self::ConvertType($type));
+ $path = self::InitFolder($type->folder);
if(!file_exists($path.$pathid))
mkdir($path.$pathid);
@@ -128,48 +213,30 @@
}
-
- public static function GetDoc($type,$id){
+ /**
+ @brief
+ @param $type string
+ @param $id integer
+ */
+ public /*static*/ function GetDoc($type,$id){
$Id=self::ConvertId($id);
$pathid=self::PathForId($id);
- $path = self::InitFolder($type);
- switch($type){
- case 'orders':
- case 'order':
- $prefix = 'CO';
- $folder = 'orders';
- $ext = '.pdf';
- break;
- case 'packingslip':
- $prefix = 'BC';
- $folder = 'packingslip';
- $ext = '.pdf';
- break;
- case 'invoices':
- case 'invoice':
- $prefix = 'FA';
- $folder = 'invoices';
- $ext = '.pdf';
- break;
- }
- return $path.$pathid.$prefix.'-'.$Id.$ext;
+ $typeint = self::ConvertType($type);
+
+ $typeobj=self::SpecificType($typeint);
+// var_dump($path.$pathid.sprintf($type->format, $type->prefix,$Id,$type->ext));
+ $path = self::InitFolder($typeobj->folder);
+ self::GetPathid($type, $id);
+
+ return $path.$pathid.sprintf($typeobj->format, $typeobj->prefix,$Id,$typeobj->ext);
}
-}
-// define('DIR_FS_ROOT_DOCS' , dirname(__FILE__).'/Datas/');
-// $CustDaFi=new DatasFiles;
-//
-//
-//
-//
-//
-// for($i=11000 ; $i<12000 ; $i++ ){
-// DatasFiles::InitPathid('test3', $i);
-// }
+}
+
?>
Added: trunk/catalog/document.php
===================================================================
--- trunk/catalog/document.php (rev 0)
+++ trunk/catalog/document.php 2011-09-24 20:54:41 UTC (rev 3817)
@@ -0,0 +1,45 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 22/09/11, 16:26
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+require('includes/application_top.php');
+
+ $page->init(basename(__FILE__),$language);
+
+
+
+
+switch($_REQUEST['mod']){
+
+ case 'invoice':
+ case 'packingslip':
+
+ //! force login
+ if (!tep_session_is_registered('customer_first_name') || !tep_session_is_registered('customer_id'))
+ tep_redirect(FILENAME_DEFAULT);
+
+ if(( $filepath=DatasFiles::GetDoc('packingslip', $_REQUEST['id'])) && file_exists(DIR_FS_ROOT_DOCS.$filepath)) {
+ //We send to a browser
+ header('Content-Type: application/pdf');
+ // header('Content-Length: '.strlen($this->buffer));
+ header('Content-Disposition: inline; filename="'.basename($filepath).'"');
+ header('Cache-Control: private, max-age=0, must-revalidate');
+ header('Pragma: public');
+ ini_set('zlib.output_compression','0');
+
+ readfile(DIR_FS_ROOT_DOCS.$filepath);
+ }
+ break;
+
+
+}
+
+
+
+
+?>
\ No newline at end of file
Modified: trunk/catalog/install/includes/content/core.base.php
===================================================================
--- trunk/catalog/install/includes/content/core.base.php 2011-09-24 19:20:45 UTC (rev 3816)
+++ trunk/catalog/install/includes/content/core.base.php 2011-09-24 20:54:41 UTC (rev 3817)
@@ -21,6 +21,14 @@
'conf_admin'=>'admin/includes/configure.php',
// 'conf_db_admin'=>'admin/includes/database_tables.php',
// 'conf_f_admin'=>'admin/includes/filenames.php',
+
+ 'root_doc'=>'Documents/',
+// 'root_doc'=>'Documents/',
+// 'root_doc_oscss_data'=>'Documents/oscss_data/',
+ 'root_doc_sessions'=>'Documents/sessions/',
+// 'root_doc_sessions'=>'Documents/admin/sessions/',
+
+
'htacces_admin'=>'admin/.htaccess',
'admin_back'=>'admin/backups/',
'admin_cip'=>'admin/contributions/',
@@ -48,7 +56,7 @@
'mod_s'=>'includes/modules/shipping/',
'oscss_data'=>'oscss_data/',
'pub'=>'pub/',
- 'sessions'=>'sessions/',
+// 'sessions'=>'sessions/',
'templates'=>'templates/'
);
Modified: trunk/catalog/install/includes/content/core.configuration.php
===================================================================
--- trunk/catalog/install/includes/content/core.configuration.php 2011-09-24 19:20:45 UTC (rev 3816)
+++ trunk/catalog/install/includes/content/core.configuration.php 2011-09-24 20:54:41 UTC (rev 3817)
@@ -100,6 +100,7 @@
'' . "\n" .
' define(\'DIR_WS_DOWNLOAD_PUBLIC\', \'pub/\');' . "\n" .
' define(\'DIR_FS_CATALOG\', \'' . $this->fs_document_root . '\');' . "\n" .
+ ' define(\'DIR_FS_ROOT_DOCS\', \'' . $this->fs_document_root . 'Documents/\');' . "\n" .
' define(\'DIR_FS_CATALOG_IMAGES\', DIR_FS_CATALOG . \'images/\');' . "\n" .
' define(\'DIR_FS_CATALOG_MODULES\', DIR_FS_CATALOG . \'includes/modules/\');' . "\n" .
' define(\'DIR_FS_CATALOG_LANGUAGES\', DIR_FS_CATALOG . \'includes/languages/\');' . "\n" .
@@ -107,7 +108,7 @@
' define(\'DIR_FS_WORK\', \'' . $http_work_directory . '\');' . "\n" .
' define(\'DIR_FS_DOWNLOAD\', DIR_FS_CATALOG . \'download/\');' . "\n" .
' define(\'DIR_FS_DOWNLOAD_PUBLIC\', DIR_FS_CATALOG . \'pub/\');' . "\n" .
- ' define(\'DIR_FS_SESSIONS\', DIR_FS_CATALOG . \'sessions/\');' . "\n" .
+ ' define(\'DIR_FS_SESSIONS\', DIR_FS_ROOT_DOCS . \'sessions/\');' . "\n" .
'' . "\n" .
'// Template System files' . "\n" .
@@ -187,6 +188,7 @@
' define(\'DIR_WS_HTTP_CATALOG\',DIR_WS_CATALOG);// compatibilité SEO' . "\n" .
' define(\'DIR_WS_HTTPS_CATALOG\', \'' . $https_catalog . '\');' . "\n" .
' define(\'DIR_FS_CATALOG\', \'' . $this->fs_document_root . '\'); // absolute path required' . "\n" .
+ ' define(\'DIR_FS_ROOT_DOCS\', \'' . $this->fs_document_root . 'Documents/\');' . "\n" .
' define(\'DIR_CLASSES\', \'classes/\');' . "\n" .
' define(\'DIR_FUNCTIONS\', \'functions/\');' . "\n" .
' define(\'DIR_FONTS\', \'fonts/\');' . "\n" .
@@ -618,8 +620,8 @@
Config base
*/
osc_db_query($sql="update ".$this->db['DB_TABLE_PREFIX']."admin set admin_email_address='".$_POST['EMAIL_ADMIN']."' where admin_id='1'" );
- osc_db_query($sql="update ".$this->db['DB_TABLE_PREFIX']."configuration set configuration_value='".$_POST['STORE_NAME']."' where configuration_key='STORE_OWNER_EMAIL_ADDRESS'" );
- osc_db_query($sql="update ".$this->db['DB_TABLE_PREFIX']."configuration set configuration_value='".$_POST['STORE_NAME']."' where configuration_key='EMAIL_FROM'" );
+ osc_db_query($sql="update ".$this->db['DB_TABLE_PREFIX']."configuration set configuration_value='".$_POST['STORE_OWNER_EMAIL_ADDRESS']."' where configuration_key='STORE_OWNER_EMAIL_ADDRESS'" );
+ osc_db_query($sql="update ".$this->db['DB_TABLE_PREFIX']."configuration set configuration_value='".$_POST['EMAIL_FROM']."' where configuration_key='EMAIL_FROM'" );
osc_db_query($sql="update ".$this->db['DB_TABLE_PREFIX']."configuration set configuration_value='".$_POST['STORE_NAME']."' where configuration_key='STORE_NAME'" );
Modified: trunk/catalog/login.php
===================================================================
--- trunk/catalog/login.php 2011-09-24 19:20:45 UTC (rev 3816)
+++ trunk/catalog/login.php 2011-09-24 20:54:41 UTC (rev 3817)
@@ -1,13 +1,12 @@
<?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 18/10/10, 22:44
- *\author oscim <mail aur...@os...> <www http://www.oscim.fr>
- *\encode UTF-8
- *\file
+ @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 24/09/11, 21:44
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
*\brief Page de login
*/
require('includes/application_top.php');
@@ -17,15 +16,22 @@
$error = false;
if (tep_session_is_registered('customer_id')) tep_redirect(tep_href_link(FILENAME_ACCOUNT, '', 'SSL'));
+ /**
+ @brief if going by admin
+ */
if (isset($_GET['osCAdminDirect']) && isset($_GET['id']) && ((string)$_GET['osCAdminDirect'] == md5($SecuKey.date('d')) )) {
$id = tep_db_prepare_input($_GET['id']);
$cust=customer::getInstance();
$customers_id=$cust->search('customers_id', $id);
$user=$cust->the_customer($customers_id);
- customer::initSession($user);
+ /// call session and block count logon
+ customer::initSession($user, false);
tep_redirect(tep_href_link(FILENAME_ACCOUNT, '', 'SSL'));
}
+ /**
+ @brief Normal process
+ */
elseif (isset($_GET['action']) && ($_GET['action'] == 'process')) {
$email_address = tep_db_prepare_input($_POST['email_address']);
@@ -75,7 +81,7 @@
$page->post_init();
/**
- * \remarck
+ * @remark
* Control js validate forms for creat customers
*/
$page->javascript->add_framework("ext/jquery/jquery.min.js");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-09-28 15:32:53
|
Revision: 3819
http://oscss.svn.sourceforge.net/oscss/?rev=3819&view=rev
Author: oscim
Date: 2011-09-28 15:32:44 +0000 (Wed, 28 Sep 2011)
Log Message:
-----------
suite evolution nommage des module de configuration
rennomage du moduld e configuration de gestion des status
mise a niveau sql de l'install
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/drivers/sqlconfiguration.php
trunk/catalog/admin/includes/classes/drivers/sqlproduct.php
trunk/catalog/admin/includes/content/configuration.central.inc
trunk/catalog/admin/includes/content/configuration.top.inc
trunk/catalog/admin/includes/modules/pages/products.php
trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration_group.sql
Added Paths:
-----------
trunk/catalog/admin/includes/gabarit/configuration/modstatus.listing.gab
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modstatus.txt
trunk/catalog/admin/includes/modules/configuration/modstatus.php
Removed Paths:
-------------
trunk/catalog/admin/includes/gabarit/cfg_30.listing.gab
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_30.txt
trunk/catalog/admin/includes/modules/configuration/cfg_30.php
Modified: trunk/catalog/admin/includes/classes/drivers/sqlconfiguration.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlconfiguration.php 2011-09-26 20:07:13 UTC (rev 3818)
+++ trunk/catalog/admin/includes/classes/drivers/sqlconfiguration.php 2011-09-28 15:32:44 UTC (rev 3819)
@@ -86,17 +86,6 @@
object(stdClass)[13]
public 'id' => string '1' (length=1)
- public 'title' => string 'Nom du template par défaut' (length=27)
- public 'key' => string 'TEMPLATE_NAME' (length=13)
- public 'value' => string 'electronix' (length=10)
- public 'description' => string 'Nom du template par défaut.' (length=28)
- public 'group_id' => string '0' (length=1)
- public 'sort_order' => string '0' (length=1)
- public 'modified' => string '2011-09-18 16:22:11' (length=19)
- public 'added' => string '2011-09-18 16:22:11' (length=19)
- public 'use' => null
- public 'set' => null
- public 'type' => string '2' (length=1)
OR
array(
Modified: trunk/catalog/admin/includes/classes/drivers/sqlproduct.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlproduct.php 2011-09-26 20:07:13 UTC (rev 3818)
+++ trunk/catalog/admin/includes/classes/drivers/sqlproduct.php 2011-09-28 15:32:44 UTC (rev 3819)
@@ -98,63 +98,64 @@
$post['products_id'] = $products_id;
-// if(isset($option['title'])) $sql_data_array['configuration_title'] = $option['title'];
-// if(isset($option['value'])) $sql_data_array['configuration_value'] = $option['value'];
-// if(isset($option['description'])) $sql_data_array['configuration_description'] = $option['description'];
-// if(isset($option['group_id'])) $sql_data_array['configuration_group_id'] = $option['group_id'];
-// if(isset($option['sort_order'])) $sql_data_array['sort_order'] = $option['sort_order'];
-// $sql_data_array['last_modified'] = (isset($option['modified'])) ? $option['modified'] : date('Y-m-d H:i:s');
-// if(isset($option['use'])) $sql_data_array['use'] = $option['use'];
-// if(isset($option['set'])) $sql_data_array['set'] = $option['set'];
-// $sql_data_array['configuration_type'] = (isset($option['type'])) ? $option['type'] : 2;
+ $sql_data_array = $option['sqlarray'];
+ /// Call ACA module put post var
+ self::$modules->load_post_values($post);
+
if ($action == 'insert_product') {
- // ACA START INSERT PRODUCT TABLE
- self::$modules->load_post_values($post);
-
$sql_data_array = array_merge($sql_data_array, self::$modules->get_insert_table_products ());
tep_db_perform(TABLE_PRODUCTS, $sql_data_array);
- } elseif ($action == 'update_product') {
+ }
+ elseif ($action == 'update_product') {
$sql_data_array['products_last_modified'] ='now()';
- // ACA START UPDATE PRODUCT TABLE
- self::$modules->load_post_values($post);
$sql_data_array = array_merge($sql_data_array, self::$modules->get_update_table_products ());
tep_db_perform(TABLE_PRODUCTS, $sql_data_array, 'update', "products_id = '" . (int)$products_id . "'");
}
- $DB->query("delete from " . TABLE_PRODUCTS_TO_CATEGORIES . " where products_id='" . (int)$products_id . "' ");
- if(!isset($post['categories']) || !is_array($post['categories'])) $DB->query("insert into " . TABLE_PRODUCTS_TO_CATEGORIES . " (products_id, categories_id) values ('" . (int)$products_id . "', '1')");
- else
+
+ /// Clean link product to categorie and save new link
+ $DB->query("delete from " . TABLE_PRODUCTS_TO_CATEGORIES . " where products_id='" . (int)$products_id . "' ");
+
+ if(!isset($post['categories']) || !is_array($post['categories']))
+ $DB->query("insert into " . TABLE_PRODUCTS_TO_CATEGORIES . " (products_id, categories_id) values ('" . (int)$products_id . "', '1')");
+ else
foreach($post['categories'] as $value)
$DB->query("insert into " . TABLE_PRODUCTS_TO_CATEGORIES . " (products_id, categories_id) values ('" . (int)$products_id . "', '" . (int)$value. "')");
- // BOF Separate Pricing Per Customer
- $customers_group_query = $DB->query("select customers_group_id, customers_group_name from " . TABLE_CUSTOMERS_GROUPS . " where customers_group_id != '0' order by customers_group_id");
- while ($customers_group = tep_db_fetch_array($customers_group_query)) // Gets all of the customers groups
- {
- $attributes_query = $DB->query("select customers_group_price from " . TABLE_PRODUCTS_GROUPS . " where products_id = '" . $products_id . "' and customers_group_id = '" . $customers_group['customers_group_id'] . "'");
- $attributes = tep_db_fetch_array($attributes_query);
- if (tep_db_num_rows($attributes_query) > 0) {
- if (isset($post['sppcoption'][$customers_group['customers_group_id']]) && isset($post['sppcprice'][$customers_group['customers_group_id']]) && $post['sppcprice'][$customers_group['customers_group_id']]!= '') { // this is checking if the check box is checked and the price is not null
- if ( $_POST['sppcprice'][$customers_group['customers_group_id']] != $attributes['customers_group_price'])
- $DB->query("update " . TABLE_PRODUCTS_GROUPS . " set customers_group_price = '" . $post['sppcprice'][$customers_group['customers_group_id']] . "' where customers_group_id = '" . $customers_group['customers_group_id'] . "' and products_id = '" . $products_id . "'");
- }
- else
- $DB->query("delete from " . TABLE_PRODUCTS_GROUPS . " where customers_group_id = '" . $customers_group['customers_group_id'] . "' and products_id = '" . $products_id . "'");
+
+
+ /// Separate Pricing Per Customer
+ $customers_group_query = $DB->query("select customers_group_id, customers_group_name from " . TABLE_CUSTOMERS_GROUPS . " where customers_group_id != '0' order by customers_group_id");
+ // Gets all of the customers groups
+ while ($customers_group = tep_db_fetch_array($customers_group_query)){
+
+ $attributes_query = $DB->query("select customers_group_price from " . TABLE_PRODUCTS_GROUPS . " where products_id = '" . $products_id . "' and customers_group_id = '" . $customers_group['customers_group_id'] . "'");
+ $attributes = tep_db_fetch_array($attributes_query);
+
+ if (tep_db_num_rows($attributes_query) > 0) {
+ if (isset($post['sppcoption'][$customers_group['customers_group_id']]) && isset($post['sppcprice'][$customers_group['customers_group_id']]) && $post['sppcprice'][$customers_group['customers_group_id']]!= '') {
+ // this is checking if the check box is checked and the price is not null
+ if ( $_POST['sppcprice'][$customers_group['customers_group_id']] != $attributes['customers_group_price'])
+ $DB->query("update " . TABLE_PRODUCTS_GROUPS . " set customers_group_price = '" . $post['sppcprice'][$customers_group['customers_group_id']] . "' where customers_group_id = '" . $customers_group['customers_group_id'] . "' and products_id = '" . $products_id . "'");
}
- elseif (isset($_POST['sppcoption'][$customers_group['customers_group_id']]) && isset($post['sppcprice'][$customers_group['customers_group_id']]) && $post['sppcprice'][$customers_group['customers_group_id']] != '')
- $DB->query("insert into " . TABLE_PRODUCTS_GROUPS . " (products_id, customers_group_id, customers_group_price) values ('" . $products_id . "', '" . $customers_group['customers_group_id'] . "', '" . $post['sppcprice'][$customers_group['customers_group_id']] . "')");
+ else
+ $DB->query("delete from " . TABLE_PRODUCTS_GROUPS . " where customers_group_id = '" . $customers_group['customers_group_id'] . "' and products_id = '" . $products_id . "'");
}
- // EOF Separate Pricing Per Customer
+ elseif (isset($_POST['sppcoption'][$customers_group['customers_group_id']]) && isset($post['sppcprice'][$customers_group['customers_group_id']]) && $post['sppcprice'][$customers_group['customers_group_id']] != '')
+ $DB->query("insert into " . TABLE_PRODUCTS_GROUPS . " (products_id, customers_group_id, customers_group_price) values ('" . $products_id . "', '" . $customers_group['customers_group_id'] . "', '" . $post['sppcprice'][$customers_group['customers_group_id']] . "')");
+ }
+ /// mutli-languages process
for ($i=0, $n=sizeof($list_languages); $i<$n; $i++) {
+
$language_id = $list_languages[$i]['id'];
$sql_data_array = array('products_name' => tep_db_prepare_input($post['products_name'][$language_id]) );
@@ -175,10 +176,9 @@
tep_db_perform(TABLE_PRODUCTS_DESCRIPTION, $sql_data_array, 'update', " products_id = '" . (int)$products_id . "' and language_id = '" . (int)$language_id . "' ");
}
-
-
}
+ /// Call ACA module afetr update
self::$modules->after_update ($products_id);
Modified: trunk/catalog/admin/includes/content/configuration.central.inc
===================================================================
--- trunk/catalog/admin/includes/content/configuration.central.inc 2011-09-26 20:07:13 UTC (rev 3818)
+++ trunk/catalog/admin/includes/content/configuration.central.inc 2011-09-28 15:32:44 UTC (rev 3819)
@@ -15,11 +15,11 @@
<br style="clear:both" />
<!-- body_text //-->
-<?php if(isset($mID) ){ ?>
+<?php if( isset($mID) ): ?>
<?php echo $cfg->draw(); ?>
-<?php }elseif($action=='' && tep_not_null($gID) && is_numeric($gID) ){ ?>
+<?php elseif($action=='' && tep_not_null($gID) && is_numeric($gID) ): ?>
<h3><?php echo tep_cst_menu_conf($cfg_group['configuration_group_title']); ?></h3>
<h4><?php echo tep_cst_menu_conf('TITLE_'.$cfg_group['configuration_group_title']); ?></h4>
@@ -48,6 +48,6 @@
</ul>
</div>
</form>
-<?php } ?>
+<?php endif; ?>
<!-- body_text_eof //-->
<!-- body_eof //-->
\ No newline at end of file
Modified: trunk/catalog/admin/includes/content/configuration.top.inc
===================================================================
--- trunk/catalog/admin/includes/content/configuration.top.inc 2011-09-26 20:07:13 UTC (rev 3818)
+++ trunk/catalog/admin/includes/content/configuration.top.inc 2011-09-28 15:32:44 UTC (rev 3819)
@@ -24,13 +24,14 @@
Old : cfg_21 >> 21 == configuration_group_id
New : template >> [cg_]template == configuration_group_key
*/
- if(strlen($gID)<3)
- $class='cfg_'.$gID;
+
+ if(file_exists(DIR_WS_MODULES.'configuration/cfg_'.$gID.'.php'))
+ $class='cfg_'.$gID;
else {
$_query = tep_db_query("SELECT configuration_group_key AS childmodule FROM " . TABLE_CONFIGURATION_GROUP . " WHERE configuration_group_id = '" . (int)$gID . "' ORDER BY sort_order");
$conf = tep_db_fetch_array($_query);
- $class=strtolower($conf['childmodule']);
+ $class= trim(strtolower($conf['childmodule']));
if(substr($class,0,3) =='cg_') $class = substr($class,3);
}
@@ -38,6 +39,7 @@
/**
@remarks Call child modules configuration in /modules/configuration folder
*/
+
if(file_exists(DIR_WS_MODULES.'configuration/'.$class.'.php') && !class_exists($class)) {
require(DIR_WS_MODULES.'configuration/'.$class.'.php');
// module key precis
Deleted: trunk/catalog/admin/includes/gabarit/cfg_30.listing.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/cfg_30.listing.gab 2011-09-26 20:07:13 UTC (rev 3818)
+++ trunk/catalog/admin/includes/gabarit/cfg_30.listing.gab 2011-09-28 15:32:44 UTC (rev 3819)
@@ -1,57 +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 17/12/10, 18:12
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
- @brief gabarit html in page configuration for status listing
-*/
-global $current_theme;
-?>
- <div id="ssmenu">
- <?php echo tep_ssmenu_configuration($_GET['gparentID']) ?>
- </div>
-<br />
-<div class="box_uniq">
-
-<h3><?php echo __('edition de status') ?></h3>
- <?php echo cfg_30::menu_mod();?>
- <div class="box_left">
-
-
- <table class="dataTable">
- <thead>
- <tr>
- <th class="tcenter"><?php echo __('table heading status / type') ?></th>
- <th class="tcenter"><?php echo __('table heading couleurs') ?></th>
- <th class="tcenter"><?php echo __('table heading action') ?></th>
- </tr>
- </thead>
- <tbody>
-
- <?php foreach (cfg_30::$list as $item): ?>
- <tr>
- <td class="tleft"><?php echo $item->status_name ?></td>
- <td class="tcenter" style="width:40px; background:<?php echo $item->status_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->status_color ?></td>
- <td class="row_action">
- <span class="view fils fleft">
- <?php echo '<a class="buttonimg" href="' . tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','sID')). 'sID=' .$item->status_id. '&action=edit') . '">' . tep_image(DIR_WS_ICONS . 'icon_edit.png',IMAGE_EDIT ). '</a> <a class="buttonimg" href="' . tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','sID')). 'sID=' . $item->status_id . '&action=delete') . '">' . tep_image(DIR_WS_ICONS . 'icon_delete.png',IMAGE_DELETE).'</a>'; ?>
- </span>
- <span class="fright">
- <?php if ($item->status_id == @$_GET['sID']) { echo tep_image(DIR_WS_ICONS . 'icon_arrow_right.gif', ''); }
- else { echo '<a href="' . tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','sID')). 'sID=' . $item->status_id) . '">' . tep_image(DIR_WS_ICONS . 'icon_info.gif', IMAGE_ICON_INFO) . '</a>'; } ?>
- </span>
- </td>
- </tr>
- <?php endforeach; ?>
-
- </tbody>
- </table>
- </div>
- <div class="box_right">
- <?php echo cfg_30::draw_right_columm() ?>
- </div>
-</div>
\ No newline at end of file
Copied: trunk/catalog/admin/includes/gabarit/configuration/modstatus.listing.gab (from rev 3810, trunk/catalog/admin/includes/gabarit/cfg_30.listing.gab)
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/modstatus.listing.gab (rev 0)
+++ trunk/catalog/admin/includes/gabarit/configuration/modstatus.listing.gab 2011-09-28 15:32:44 UTC (rev 3819)
@@ -0,0 +1,57 @@
+<?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.1
+ @date 27/09/11, 18:21
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @brief gabarit html in page configuration for status listing
+*/
+global $current_theme;
+?>
+ <div id="ssmenu">
+ <?php echo tep_ssmenu_configuration($_GET['gparentID']) ?>
+ </div>
+<br />
+<div class="box_uniq">
+
+<h3><?php echo __('edition de status') ?></h3>
+ <?php echo modstatus::menu_mod();?>
+ <div class="box_left">
+
+
+ <table class="dataTable">
+ <thead>
+ <tr>
+ <th class="tcenter"><?php echo __('table heading status / type') ?></th>
+ <th class="tcenter"><?php echo __('table heading couleurs') ?></th>
+ <th class="tcenter"><?php echo __('table heading action') ?></th>
+ </tr>
+ </thead>
+ <tbody>
+
+ <?php foreach (modstatus::$list as $item): ?>
+ <tr>
+ <td class="tleft"><?php echo $item->status_name ?></td>
+ <td class="tcenter" style="width:40px; background:<?php echo $item->status_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->status_color ?></td>
+ <td class="row_action">
+ <span class="view fils fleft">
+ <?php echo '<a class="buttonimg" href="' . tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','sID')). 'sID=' .$item->status_id. '&action=edit') . '">' . tep_image(DIR_WS_ICONS . 'icon_edit.png',IMAGE_EDIT ). '</a> <a class="buttonimg" href="' . tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','sID')). 'sID=' . $item->status_id . '&action=delete') . '">' . tep_image(DIR_WS_ICONS . 'icon_delete.png',IMAGE_DELETE).'</a>'; ?>
+ </span>
+ <span class="fright">
+ <?php if ($item->status_id == @$_GET['sID']) { echo tep_image(DIR_WS_ICONS . 'icon_arrow_right.gif', ''); }
+ else { echo '<a href="' . tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','sID')). 'sID=' . $item->status_id) . '">' . tep_image(DIR_WS_ICONS . 'icon_info.gif', IMAGE_ICON_INFO) . '</a>'; } ?>
+ </span>
+ </td>
+ </tr>
+ <?php endforeach; ?>
+
+ </tbody>
+ </table>
+ </div>
+ <div class="box_right">
+ <?php echo modstatus::draw_right_columm() ?>
+ </div>
+</div>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_30.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_30.txt 2011-09-26 20:07:13 UTC (rev 3818)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_30.txt 2011-09-28 15:32:44 UTC (rev 3819)
@@ -1,39 +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 08/11/10, 14:48
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-$lang['heading title']="Édition de status" ;
-$lang['table heading status / type']="Statut" ;
-$lang['table heading couleurs']="Couleur" ;
-$lang['table heading action']="Action" ;
-$lang['text info orders status color']="Couleur du statut : " ;
-$lang['text info orders status name']="Statut des commandes :" ;
-$lang['text set default created']="Statut d'une commande créee" ;
-$lang['text set default completed']="Statut d'une commande livrée" ;
-$lang['text default completed']="complété" ;
-$lang['text set default annulate']="Statut d'une commande annulée" ;
-$lang['text default annulate']="Annulé" ;
-$lang['text info insert intro']="Merci de compléter cette nouvelle commande avec ses données liées" ;
-$lang['text info delete intro']="Êtes-vous sûr de vouloir supprimer ce statut de commande ?" ;
-$lang['text info heading new orders status']="Nouveau statut de commande" ;
-$lang['text info heading edit orders status']="Éditer le statut de commande" ;
-$lang['text info heading delete orders status']="Supprimer le statut de commande" ;
-$lang['error remove default order status']="Erreur : Le statut par défaut ne peut pas être supprimé. Merci de choisir un autre statut par défaut et de réessayer" ;
-$lang['error status used in orders']="Erreur : Ce statut de commande est actuellement utilisé." ;
-$lang['error status used in history']="Erreur : Ce statut de commande est déjà utilisé dans l'historique de commande." ;
-
-$lang['ajoute un status']="ajoute un status" ;
-$lang['utiliser comme status par default']="utiliser comme status par défaut" ;
-$lang['utiliser comme status termine']="utiliser comme status terminé" ;
-$lang['utiliser comme status annule']="utiliser comme status annulé" ;
-$lang['list status / type']="liste status/type" ;
-$lang['couleurs']="Couleurs" ;
-$lang['action']="Action" ;
-
-?>
\ No newline at end of file
Copied: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modstatus.txt (from rev 3810, trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_30.txt)
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modstatus.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modstatus.txt 2011-09-28 15:32:44 UTC (rev 3819)
@@ -0,0 +1,48 @@
+<?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.1
+ @date 27/09/11, 18:29
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+$lang['heading title']="Édition de status" ;
+$lang['table heading status / type']="Statut" ;
+$lang['table heading couleurs']="Couleur" ;
+$lang['table heading action']="Action" ;
+$lang['text info orders status color']="Couleur du statut : " ;
+$lang['text info orders status name']="Statut des commandes :" ;
+$lang['text set default created']="Statut d'une commande créee" ;
+$lang['text set default completed']="Statut d'une commande livrée" ;
+$lang['text default completed']="complété" ;
+$lang['text set default annulate']="Statut d'une commande annulée" ;
+$lang['text default annulate']="Annulé" ;
+$lang['text info insert intro']="Merci de compléter cette nouvelle commande avec ses données liées" ;
+$lang['text info delete intro']="Êtes-vous sûr de vouloir supprimer ce statut de commande ?" ;
+$lang['text info heading new orders status']="Nouveau statut de commande" ;
+$lang['text info heading edit orders status']="Éditer le statut de commande" ;
+$lang['text info heading delete orders status']="Supprimer le statut de commande" ;
+$lang['error remove default order status']="Erreur : Le statut par défaut ne peut pas être supprimé. Merci de choisir un autre statut par défaut et de réessayer" ;
+$lang['error status used in orders']="Erreur : Ce statut de commande est actuellement utilisé." ;
+$lang['error status used in history']="Erreur : Ce statut de commande est déjà utilisé dans l'historique de commande." ;
+
+$lang['ajoute un status']="ajoute un status" ;
+$lang['utiliser comme status par default']="utiliser comme status par défaut" ;
+$lang['utiliser comme status termine']="utiliser comme status terminé" ;
+$lang['utiliser comme status annule']="utiliser comme status annulé" ;
+$lang['list status / type']="liste status/type" ;
+$lang['couleurs']="Couleurs" ;
+$lang['action']="Action" ;
+$lang['add status']="Ajouter type" ;
+
+
+$lang['liste return_reasons']="SAV Motif" ;
+$lang['liste returns']="SAV" ;
+$lang['liste refund_method']="SAV Methode" ;
+$lang['liste products_virtual_types']="Type produit" ;
+$lang['liste orders']="Commande" ;
+$lang['liste geo_zone_type']="Zone" ;
+$lang['liste attribute_optiontype']="Attribut" ;
+?>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/modules/configuration/cfg_30.php
===================================================================
--- trunk/catalog/admin/includes/modules/configuration/cfg_30.php 2011-09-26 20:07:13 UTC (rev 3818)
+++ trunk/catalog/admin/includes/modules/configuration/cfg_30.php 2011-09-28 15:32:44 UTC (rev 3819)
@@ -1,482 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @package oscss-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 18/12/10, 13:08
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
- @class cfg_30
- @brief Manage All status in table status, for all status type
-*/
-
-
-Class cfg_30 /*implements ext_configuration*/{
-
- /**
- @var array liste des type de status dispo
- */
- public static $list_types;
- /**
- @var array list status en cours
- */
- public static $list;
- /**
- @var array list type avec option suppl
- */
- public static $type_advanced;
- /**
- @var object
- */
- public static $oInfo;
- /**
- @var string recup GET action
- */
- public static $action;
- /**
- @var Array private
- default_id
- default_completed
- default_annulate
- */
- public static $config;
-
- /**
- */
- protected static $remove_status;
-
- /**
- */
- function __construct(){
- $this->code='cfg_30';
- global $messageStack, $language, $oscss;
-
- $oscss->pile_file_lang(DIR_FS_ADMIN.DIR_WS_LANGUAGES.$language.'/modules/configuration/'.$this->code.'.txt');
-
- self::$oInfo=array();
-
- //! Type
- self::$config=$this->config( (isset($_GET['type'])? $_GET['type'] : 'orders' ) );
-
-
- self::$list_types=$this->load_db_type('');
- // Title
-// $this->titleh3=__('Edition de status',__CLASS__);
-
- //! les type ayant besoin de constante de config complementaire
- self::$type_advanced=array('orders','returns');
-
-
- }
-
-/** PRIVATE METHODE */
-
- /**
- @fn config($type)
- @brief Charge la configuration
- @param type string (orders, returns, reason,...)
- */
- private function config($type){
- $TYPE=strtoupper($type);
- return array( 'type'=>$type,
- 'default_id'=>(defined('DEFAULT_'.$TYPE.'_STATUS_ID')? (int)constant('DEFAULT_'.$TYPE.'_STATUS_ID') : 1),
- 'default_completed'=>(defined('DEFAULT_'.$TYPE.'_STATUS_COMPLETED')? (int)constant('DEFAULT_'.$TYPE.'_STATUS_COMPLETED') : 1),
- 'default_annulate'=>(defined('DEFAULT_'.$TYPE.'_STATUS_ANNULATE')? (int)constant('DEFAULT_'.$TYPE.'_STATUS_ANNULATE') : 1),
- 'cst_default_id'=>'DEFAULT_'.$TYPE.'_STATUS_ID',
- 'cst_default_completed'=>'DEFAULT_'.$TYPE.'_STATUS_COMPLETED',
- 'cst_default_annulate'=>'DEFAULT_'.$TYPE.'_STATUS_ANNULATE',
- );
- }
-
-
-
-
- /**
- @fn update_advanced()
- @brief Add/update les constantes associé au status
- Lisaison talle configuration
- */
- private function update_advanced(){
- if (isset($_POST['default']) && ($_POST['default'] == 'on'))
- tep_db_query("update " . TABLE_CONFIGURATION . " set configuration_value = '" . tep_db_input($list_status_id) . "' where configuration_key = '".self::$config['cst_default_id']."'");
- if (isset($_POST['default_completed']) && ($_POST['default_completed'] == 'on'))
- tep_db_query("update " . TABLE_CONFIGURATION . " set configuration_value = '" . tep_db_input($list_status_id) . "' where configuration_key = '".self::$config['cst_default_completed']."'");
- if (isset($_POST['default_annulate']) && ($_POST['default_annulate'] == 'on'))
- tep_db_query("update " . TABLE_CONFIGURATION . " set configuration_value = '" . tep_db_input($list_status_id) . "' where configuration_key = '".self::$config['cst_default_annulate']."'");
- }
-
- /**
- @fn form_advanced($action)
- @brief From update adanvced
- */
- private static function form_advanced($action){
- $contents=array();
- if ($action=='add' || ($action=='edit' && self::$config['default_id'] != self::$oInfo->status_id) ) $contents[] = array('class' => 'block_input','text' => tep_draw_checkbox_field('default') .' '. __('utiliser comme status par default', __CLASS__));
- if ($action=='add' || ($action=='edit' && self::$config['default_completed'] != self::$oInfo->status_id) ) $contents[] = array('class' => 'block_input','text' => tep_draw_checkbox_field('default_completed') .' '. __('utiliser comme status termine', __CLASS__));
- if ($action=='add' || ($action=='edit' && self::$config['default_annulate'] != self::$oInfo->status_id) ) $contents[] = array('class' => 'block_input','text' => tep_draw_checkbox_field('default_annulate') .' '. __('utiliser comme status annule', __CLASS__));
- return $contents;
- }
-
-
-
-
-
- /**
- @fn _draw_list_type($list)
- @brief Gestion list de status type
- */
- static private function _draw_list_type($list){
- global $current_theme;
- $sor=''.
- '<tr>'."\n".
- '<th>'.__('Liste de status / type',__CLASS__).'</th>'."\n".
- '</tr>'."\n".
- '</thead>'."\n".
- '<tbody>'."\n";
- foreach ($list as $theme) {
- $sor .= '<tr class="view parent dataTableRow '.(($theme->status_id==@$_GET['sID'])?'Selected' :'').'">'."\n".
- '<td>'.$theme->status_name.'</td>'."\n".
- '<td class="row_action">'.
- '<span class="view fils ">';
- $sor .='</span>'.
- '</td>'."\n".
- '</tr>'."\n";
- }
- return $sor;
- }
-
-
-/** PUBLIC STATIC METHODE */
-
-
- /**
- MEnu specifique pour ce module
-
- */
- public static function menu_mod(){
- $s ='<div class="button_nav">'."\n".
-// '<a class="button" href="'.tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','sID')).'action=addtype').'">'. tep_image(DIR_WS_ICONS.'icon_add_new.png' , __('Add status type',__CLASS__)).__('Add status type',__CLASS__).'</a>'."\n".
- '<a class="button" href="'.tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','sID')).'action=add').'">'. tep_image(DIR_WS_ICONS.'icon_add_new.png' , __('Add status ',__CLASS__)).__('Add status ',__CLASS__).'</a>'."\n";
- foreach (self::$list_types as $type)
- $s .='<a class="button" href="'.tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','sID')).'action=list&type='.$type->name).'">'.__('Liste '.$type->name,__CLASS__).'</a>'."\n";
- $s .='</div>';
- return $s;
- }
-
-
- /**
- @fn add_language($new_lg)
- @brief Add langue pour tous les status
- U...
[truncated message content] |
|
From: <os...@us...> - 2011-10-08 14:03:23
|
Revision: 3826
http://oscss.svn.sourceforge.net/oscss/?rev=3826&view=rev
Author: oscim
Date: 2011-10-08 14:03:15 +0000 (Sat, 08 Oct 2011)
Log Message:
-----------
Finition ajustement sqlcategorie
Nettoyage module categorie page
Amelioration edition des cats
Ajustement css
Correction mineurs cms_content lang
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/categorieUtility.php
trunk/catalog/admin/includes/classes/drivers/sqlcategorie.php
trunk/catalog/admin/includes/gabarit/categories/display_view.edit.gab
trunk/catalog/admin/includes/gabarit/cms_content/display_view.edit.gab
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/cms_content.txt
trunk/catalog/admin/includes/modules/account/account_extra.php
trunk/catalog/admin/includes/modules/pages/categories.php
trunk/catalog/admin/includes/modules/pages/cms_content.php
trunk/catalog/admin/includes/template/oscss/jquery-ui-1.css
trunk/catalog/admin/includes/template/oscss/stylesheet-1.css
trunk/catalog/checkout_payment_address.php
Modified: trunk/catalog/admin/includes/classes/categorieUtility.php
===================================================================
--- trunk/catalog/admin/includes/classes/categorieUtility.php 2011-10-03 12:51:47 UTC (rev 3825)
+++ trunk/catalog/admin/includes/classes/categorieUtility.php 2011-10-08 14:03:15 UTC (rev 3826)
@@ -27,7 +27,7 @@
$niv=($incre ==false)? 0 : $incre++ ;
$search = (isset($_GET['search'])) ? "and cd.categories_name like '%" .tep_db_prepare_input($_GET['search']). "%' " : '' ;
- $categories_query = tep_db_query("select c.categories_id, cd.categories_name, c.categories_image, c.parent_id, c.sort_order, c.date_added, c.last_modified,c.categories_status,c.categories_hidden, cd.categories_description, cd.categories_head_keywords_tag from " . TABLE_CATEGORIES . " c, " . TABLE_CATEGORIES_DESCRIPTION . " cd where c.parent_id = '" . (int)(empty($current_ID)?$current_category_id:$current_ID ) . "' and c.categories_id = cd.categories_id and cd.language_id = '" . (int)$languages_id . "' ".$search." order by c.parent_id ASC , c.sort_order ASC, cd.categories_name ASC");
+ $categories_query = tep_db_query("select c.categories_id, cd.categories_name, c.categories_image, c.parent_id, c.sort_order, c.date_added, c.last_modified,c.categories_status,c.categories_hidden, cd.categories_description, cd.categories_head_keywords_tag from " . TABLE_CATEGORIES . " c, " . TABLE_CATEGORIES_DESCRIPTION . " cd where c.parent_id = '" . (int)(($current_ID >=0)?$current_ID :$current_category_id) . "' and c.categories_id = cd.categories_id and cd.language_id = '" . (int)$languages_id . "' ".$search." order by c.parent_id ASC , c.sort_order ASC, cd.categories_name ASC");
while ($categories = tep_db_fetch_array($categories_query)){
$nbr=self::childs_in_category_count($categories['categories_id']);
Modified: trunk/catalog/admin/includes/classes/drivers/sqlcategorie.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlcategorie.php 2011-10-03 12:51:47 UTC (rev 3825)
+++ trunk/catalog/admin/includes/classes/drivers/sqlcategorie.php 2011-10-08 14:03:15 UTC (rev 3826)
@@ -11,15 +11,26 @@
*/
-
-
class sqlcategorie
implements ModSqlDataDriver{
-
+ /**
+ @var object childs module class
+ */
public static $modules;
-
+ /**
+ @var current ressource class
+ */
protected static $_instance;
+ /**
+ @var string error detail
+ */
+ public static $error = false;
+ /**
+ @brief constructor
+ no direct call, but is auto call by static public method
+ This method init Childs modules class
+ */
protected function __construct(){
/**
TODO : remplacer le nom de constante par un MODULE_CATEGORIES_INSTALLED_BO
@@ -28,7 +39,10 @@
self::$modules->set_image_handler();
}
-
+ /**
+ @brief for call construct class in singletown
+ @return current instance
+ */
public static function getInstance() {
if(self::$_instance == null) self::$_instance = new self();
return self::$_instance;
@@ -37,61 +51,141 @@
/**
- @brief create new ligne in table configuration
+ @brief create new record
+ @param $option array
+ @return (bool)false Or (Int) id create
*/
public static function create($option){
+
self::getInstance();
- if(!isset($option['key'])) return 'key';
- if(isset($option['id'])) $sql_data_array['configuration_id'] = $option['id'];
- if(isset($option['title'])) $sql_data_array['configuration_title'] = $option['title'];
- $sql_data_array['configuration_key'] = $option['key'];
- if(isset($option['value'])) $sql_data_array['configuration_value'] = $option['value'];
- if(isset($option['description'])) $sql_data_array['configuration_description'] = $option['description'];
- if(isset($option['group_id'])) $sql_data_array['configuration_group_id'] = $option['group_id'];
- if(isset($option['sort_order'])) $sql_data_array['sort_order'] = $option['sort_order'];
- if(isset($option['modified'])) $sql_data_array['last_modified'] = $option['modified'];
- $sql_data_array['date_added'] = (isset($option['added'])) ? $option['added'] : date('Y-m-d H:i:s');
- if(isset($option['use'])) $sql_data_array['use'] = $option['use'];
- if(isset($option['set'])) $sql_data_array['set'] = $option['set'];
- $sql_data_array['configuration_type'] = (isset($option['type'])) ? $option['type'] : 2;
+ if( ! isset($option['id']) )
+ self::$error = __('no id');
+ else
+ $id = (int)$option['id'];
- $res=tep_db_perform(TABLE_CONFIGURATION, $sql_data_array);
+ if( ! isset($option['post']) )
+ self::$error = __('no post');
+ else
+ $post = $option['post'];
+ $list_languages=tep_get_languages();
+
+ $sql_data_array['date_added'] = 'now()';
+ $sql_data_array['sort_order'] = (!empty($post['sort_order'])) ? tep_db_prepare_input((int)$post['sort_order']) : 0 ;
+ $sql_data_array['parent_id'] = (!empty($sql_data_array['parent_id'])) ? tep_db_prepare_input((int)$sql_data_array['parent_id']) : 0 ;
+ $sql_data_array['categories_status'] = (!empty($post['categories_status'])) ? tep_db_prepare_input((int)$post['categories_status']) : 0 ;
+ $sql_data_array['categories_hidden'] = (!empty($post['categories_hidden'])) ? tep_db_prepare_input((int)$post['categories_hidden']) : 0 ;
+
+ // Put post value
+ self::$modules->load_post_values($post);
+
+ self::$modules->get_insert_table_categories($sql_data_array,'');
+
+ $res=tep_db_perform(TABLE_CATEGORIES, $sql_data_array);
+
if(!$res)
return $res;
else
+ $categories_id = $res->__get('insertId');
+
+
+ $categories_name_array = $_POST['categories_name'];
+ $categories_desc_array = $_POST['categories_description'];
+
+
+ for ($i=0, $n=sizeof($list_languages); $i<$n; $i++) {
+ $language_id = $list_languages[$i]['id'];
+ $sql_data_array = array('categories_name' => tep_db_prepare_input($categories_name_array[$language_id]),
+ 'categories_description'=>tep_db_prepare_input($categories_desc_array[$language_id]));
+
+ $insert_sql_data = array('categories_id' => $categories_id,
+ 'language_id' => $list_languages[$i]['id']);
+ $sql_data_array = array_merge($sql_data_array, $insert_sql_data);
+ $sql_data_array = array_merge($sql_data_array,self::$modules->get_insert_table_categories_description (array(),$list_languages[$i]['id']));
+
+ tep_db_perform(TABLE_CATEGORIES_DESCRIPTION, $sql_data_array);
+ }
+
+
+ /// Child module, Call After Update process
+ self::$modules->after_update($id);
+
+
+ if(!$res)
+ return $res;
+ else
return $res->__get('insertId');
}
+
/**
- @brief update ligne in table configuration
+ @brief update record
*/
public static function update($option){
+
self::getInstance();
- if(!isset($option['key']) && !isset($option['id'])) return 'key or id';
- $where ='';
- if(isset($option['id'])) $where .="AND configuration_id = '".(int)$option['id']."' ";
- if(isset($option['key'])) $where .="AND configuration_key = '".$option['key']."' ";
+ if( ! isset($option['id']) )
+ self::$error = __('no id');
+ else
+ $id = (int)$option['id'];
- if(isset($option['title'])) $sql_data_array['configuration_title'] = $option['title'];
- if(isset($option['value'])) $sql_data_array['configuration_value'] = $option['value'];
- if(isset($option['description'])) $sql_data_array['configuration_description'] = $option['description'];
- if(isset($option['group_id'])) $sql_data_array['configuration_group_id'] = $option['group_id'];
- if(isset($option['sort_order'])) $sql_data_array['sort_order'] = $option['sort_order'];
- $sql_data_array['last_modified'] = (isset($option['modified'])) ? $option['modified'] : date('Y-m-d H:i:s');
- if(isset($option['use'])) $sql_data_array['use'] = $option['use'];
- if(isset($option['set'])) $sql_data_array['set'] = $option['set'];
- $sql_data_array['configuration_type'] = (isset($option['type'])) ? $option['type'] : 2;
+ if( ! isset($option['post']) )
+ self::$error = __('no post');
+ else
+ $post = $option['post'];
+ $list_languages=tep_get_languages();
+ $sql_data_array = $option['sqlarray'];
+ $sql_data_array['last_modified'] = 'now()';
+ $sql_data_array['sort_order'] = (!empty($post['sort_order'])) ? tep_db_prepare_input((int)$post['sort_order']) : 0 ;
+ $sql_data_array['parent_id'] = (!empty($sql_data_array['parent_id'])) ? tep_db_prepare_input((int)$sql_data_array['parent_id']) : 0 ;
+ $sql_data_array['categories_status'] = (!empty($post['categories_status'])) ? tep_db_prepare_input((int)$post['categories_status']) : 0 ;
+ $sql_data_array['categories_hidden'] = (!empty($post['categories_hidden'])) ? tep_db_prepare_input((int)$post['categories_hidden']) : 0 ;
- $res=tep_db_perform(TABLE_CONFIGURATION, $sql_data_array, 'update' , substr($where,3) );
+ // Put post value
+ self::$modules->load_post_values($post);
- return $res;
+ $sql_data_array=array_merge($sql_data_array, (array) self::$modules->get_update_table_categories($sql_data_array) );
+
+
+ tep_db_perform(TABLE_CATEGORIES, $sql_data_array, 'update', "categories_id = '" . $id . "'");
+
+ $categories_name_array = $post['categories_name'];
+ $categories_desc_array = $post['categories_description'];
+
+
+ for ($i=0, $n=sizeof($list_languages); $i<$n; $i++) {
+
+ $language_id = (int)$list_languages[$i]['id'];
+ $sql_data_array = array('categories_name' => tep_db_prepare_input($categories_name_array[$language_id]),
+ 'categories_description'=>tep_db_prepare_input($categories_desc_array[$language_id]));
+
+ $tabl=self::$modules->get_update_table_categories_description ($list_languages[$i]['id']);
+ $sql_data_array = array_merge($sql_data_array, $tabl);
+
+ tep_db_perform(TABLE_CATEGORIES_DESCRIPTION, $sql_data_array, 'update', "categories_id = '" . $id . "' and language_id = '" . $language_id . "'");
+
+ }
+
+// if ( !empty($_FILES['categories_image']['tmp_name']) ) {
+// $categories_image = new upload('categories_image', DIR_FS_CATALOG_IMAGES);
+// tep_db_query("update " . TABLE_CATEGORIES . " set categories_image = '" . tep_db_input($categories_image->filename) . "' where categories_id = '" . (int)$categories_id . "'");
+// }
+
+
+ /// Child module, Call After Update process
+ self::$modules->after_update($id);
+
+
+ if(self::$error !=false)
+ return false;
+ else
+ return true;
}
/**
@@ -120,38 +214,68 @@
$DB=Database::getInstance();
$sql ="";
- if(isset($option['id'])) $sql .="AND configuration_id = '".(int)tep_db_input($option['id'])."' ";
-// if(isset($option['key'])) $sql .="AND configuration_key = '".(string)tep_db_input($option['key'])."' ";
-// if(isset($option['group_id'])) $sql .="AND configuration_group_id = '".(int)(string)tep_db_input($option['group_id'])."' ";
+ if( ! isset($option['id']) )
+ self::$error = __('no id');
+ else{
+ $ID = $option['id'];
+ }
-// $sql ="SELECT * FROM ".TABLE_CONFIGURATION." WHERE ".substr($sql,3);
+ if( ! isset($option['language_id']) )
+ self::$error = __('no language_id');
+ else
+ $languages_id = $option['language_id'];
-// $res=$DB->query($sql);
-// $num = $res->__get('numRows');
+ $sql ="SELECT * FROM " . TABLE_CATEGORIES . " c WHERE c.categories_id = '" . (int)$ID . "' "; //.substr($sql,3);
- $check_q = $DB->query("select * from " . TABLE_CATEGORIES_DESCRIPTION . " cd where categories_id = '" .(int) $ID . "' and language_id='".(int)$languages_id."' ");
+ $res=$DB->query($sql);
+ $num = $res->__get('numRows');
- $category_child = array( 'products_count' => categorieUtility::products_in_category_count($ID),
- 'cms_count' => categorieUtility::cms_in_category_count($ID),
- 'childs_count'=>categorieUtility::childs_in_category_count($ID),
- 'cPath'=>categorieUtility::get_generated_category_path_ids($ID)
- );
- return new objectInfo(array_merge($check_q->fetchAssoc(),$category_child));
+ if($num == 1){
+ $result = $res->fetchAssoc();
- if($num == 1){
- $result=$res->fetchAssoc();
+ $check_q = $DB->query($sql="select * from " . TABLE_CATEGORIES_DESCRIPTION . " cd where categories_id = '" .(int) $ID . "'");
+
+ foreach($check_q->fetchAllAssoc() as $catlg){
+ $result['categories_name'][$catlg['language_id']] = $catlg['categories_name'];
+ $result['categories_description'][$catlg['language_id']] = $catlg['categories_description'];
+ }
+ $result['products_count'] = categorieUtility::products_in_category_count($ID);
+ $result['cms_count'] =categorieUtility::cms_in_category_count($ID);
+ $result['childs_count'] =categorieUtility::childs_in_category_count($ID);
+ $result['cPath'] = categorieUtility::get_generated_category_path_ids($ID);
+
+ /// Childs module load
+ self::$modules->load_db_values($ID);
+
return ((!$shortkey)? $result : self::CleanKey($result));
}
elseif($num > 1){
$array=array();
- foreach($res->fetchAllAssoc() as $result)
+ foreach($res->fetchAllAssoc() as $result){
+
+ $check_q = $DB->query($sql="select * from " . TABLE_CATEGORIES_DESCRIPTION . " cd where categories_id = '" .(int) $ID . "'");
+
+ foreach($check_q->fetchAllAssoc() as $catlg){
+ $result['categories_name'][$catlg['language_id']] = $catlg['categories_name'];
+ $result['categories_description'][$catlg['language_id']] = $catlg['categories_description'];
+ }
+ $result['products_count'] = categorieUtility::products_in_category_count($ID);
+ $result['cms_count'] =categorieUtility::cms_in_category_count($ID);
+ $result['childs_count'] =categorieUtility::childs_in_category_count($ID);
+ $result['cPath'] = categorieUtility::get_generated_category_path_ids($ID);
+
+ /// Childs module load
+ self::$modules->load_db_values($ID);
+
$array[]= ((!$shortkey)? $result : self::CleanKey($result));
+ }
return $array;
}
+
return false;
}
@@ -183,10 +307,11 @@
// ACA START DELETE CATEGORY
self::$modules->delete($categories[$i]['id']);
-
+ // child tables cats
$DB->query("delete from " . TABLE_CATEGORIES_DESCRIPTION . " where categories_id = '" . (int)$_id . "'");
$DB->query("delete from " . TABLE_CATEGORIES_EXTRA . " where categories_id = '" . (int)$_id . "'");
+ // master table cats
$DB->query("delete from " . TABLE_CATEGORIES . " where categories_id = '" . (int)$_id . "'");
@@ -226,8 +351,100 @@
+ /**
+ @brief
+ @return array empty
+ */
+ public static function Specimen(){
+ $list_languages=tep_get_languages();
+
+ $par = array(
+ 'parent_id'=>0,
+ 'sort_order'=>0,
+ 'categories_id'=>null,
+ 'categories_image'=>DIR_WS_CATALOG_IMAGES.IMAGE_NONEXISTENT,
+ 'categories_status'=>null,
+ 'categories_hidden'=>null,
+ );
+ for ($i=0, $n=sizeof($list_languages); $i<$n; $i++) {
+ $par['categories_name'][$list_languages[$i]['id']] = '';
+ $par['categories_description'][$list_languages[$i]['id']] = '';
+ }
+
+ return self::CleanKey($par);
+ }
+
+
+
/**
+ @brief Check image cat and add or /delete
+ Adjust process, return path img if ok
+ @param $cat_image string path img input
+ @param $no_img (null or string "on") chekbox no image
+ @return (string) path or empty
+ */
+ public static function AddImage($cat_image='', $no_img=''){
+
+ if (tep_not_null($cat_image) && ($cat_image != 'none')){
+ if( strpos($cat_image,DIR_WS_CATALOG_IMAGES) >=0 )
+ $cat_image = tep_db_prepare_input(substr($cat_image, strlen( DIR_WS_CATALOG_IMAGES) ) );
+ else
+ $cat_image = tep_db_prepare_input($cat_image);
+ }
+
+ $cat_image =(empty($cat_image) || ($no_img=='' && $cat_image=='on') ) ? '' : tep_db_prepare_input($cat_image) ;
+
+ return $cat_image;
+ }
+
+
+ /**
+ @fn MaintenanceTables()
+ @brief clean and maintient link table and data
+ */
+ public static function Maintenance(){
+ self::UpdateCheckLoop();
+
+ self::UpdateCheckLoopByPair();
+ }
+
+
+
+
+ /**
+ @fn UpdateCheckLoop()
+ @brief Check parent_id / rowid and block loop context
+ */
+ private static function UpdateCheckLoop(){
+ $DB=Database::getInstance();
+ $_query = $DB->query($s="SELECT categories_id as id, parent_id FROM " . TABLE_CATEGORIES . " WHERE categories_id = parent_id ");
+
+ foreach($_query->fetchAllAssoc() as $loop)
+ $DB->query("UPDATE " . TABLE_CATEGORIES . " SET parent_id = '0' WHERE categories_id = '" . (int)$loop['id'] . "' ");
+ }
+
+ /**
+ @fn UpdateCheckLoopByPair()
+ @brief Check Pair parent_id / rowid and block loop context
+ */
+ private static function UpdateCheckLoopByPair(){
+ $DB=Database::getInstance();
+ $_query = $DB->query($s="SELECT categories_id as id, parent_id FROM " . TABLE_CATEGORIES . " ORDER BY parent_id ");
+
+ foreach($_query->fetchAllAssoc() as $loop)
+ $cat[$loop['id']] = $loop['parent_id'];
+
+
+ foreach($cat as $k => $v)
+ if($cat[(int)$v] == $k){
+ $DB->query("UPDATE " . TABLE_CATEGORIES . " SET parent_id = ".ORPHELIN_COLLECTOR." WHERE categories_id = '" . (int)$k . "' ");
+ $DB->query("UPDATE " . TABLE_CATEGORIES . " SET parent_id = ".ORPHELIN_COLLECTOR." WHERE categories_id = '" . (int)$v . "' ");
+ }
+ }
+
+
+ /**
@fn CleanKey()
@brief Clean string name key
*/
Modified: trunk/catalog/admin/includes/gabarit/categories/display_view.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/categories/display_view.edit.gab 2011-10-03 12:51:47 UTC (rev 3825)
+++ trunk/catalog/admin/includes/gabarit/categories/display_view.edit.gab 2011-10-08 14:03:15 UTC (rev 3826)
@@ -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/02/11, 19:18
+ @version 2.1.1
+ @date 07/10/11, 23:13
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -12,6 +12,7 @@
?>
<h3><?php echo __('text info heading edit category'); ?></h3>
+
<div class="box_uniq block_form">
<?php echo tep_draw_form('categories', categories::FILENAME, 'action='.((categories::$action == 'new')?'insert' : 'update').'&cPath=' . categories::$cPath, 'post', 'enctype="multipart/form-data"') ?>
@@ -30,21 +31,17 @@
</ul>
<div id="tabs-1" class="tabPage">
- <p>
- <?php echo __('text edit intro') ?>
- </p>
+
<p class="block_input">
- <?php echo tep_draw_pull_down_menu('cPath', array_merge(array(array('id'=>'', 'text'=> __('txt cat all'))),tep_get_category_tree(0,'',@$_GET['cID'])), categories::$cInfo->parent_id);
- if(categories::$action == 'edit') echo tep_draw_hidden_field('categories_id', '', categories::$cInfo->categories_id); ?>
- </p>
- <p class="block_input">
<Label><?php echo __('text edit sort order') ?></label>
<?php echo tep_draw_input_field('sort_order', '', categories::$cInfo->sort_order, 'size="2"') ?>
+
+ <?php /** Hidden Inputs */ if(categories::$action == 'edit') echo tep_draw_hidden_field('categories_id', '', categories::$cInfo->categories_id); ?>
+
</p>
<p class="block_input">
<div class="tabs_lang">
- <?php /* categories::$languages = tep_get_languages(); */?>
<ul>
<?php for ($i=0, $n=sizeof(categories::$languages); $i<$n; $i++) { ?>
<li><a href="#fieldset_<?php echo $i ?>"><?php echo tep_image(DIR_WS_CATALOG_LANGUAGES . categories::$languages[$i]['directory'] . '/images/' . categories::$languages[$i]['image'], categories::$languages[$i]['name']); ?></a></li>
@@ -100,6 +97,23 @@
<label><?php echo __('text categories hidden'); ?></label>
<?php echo tep_draw_radio_field('categories_hidden', 'categories_hidden_1', '1', (((bool)categories::$cInfo->categories_hidden)?true:false),'','class="radio"') . __('text categories not hidden') .' '. tep_draw_radio_field('categories_hidden', 'categories_hidden_0', '0', ((!(bool)categories::$cInfo->categories_hidden)?true:false),'','class="radio"') . __('text categories hidden'); ?>
</dt>
+
+ <dd class="block_input w_90 CategoryView ">
+ <label for="products_date_available"><?php echo __('txt categories'); ?></label>
+ <ul id="cat_list_in_edit" class="ChooseSelect">
+ <li class="<?php echo (((int)categories::$cInfo->parent_id == '0')? 'selected' : 'noselected') ?>"><?php echo tep_draw_radio_field('cPath','cat_0', '0', ((int)categories::$cInfo->parent_id == '0') ).' '.__('text categorie racine') ?></li>
+ <?php foreach(get_cat_list(0) as $v)
+ if(categories::$cInfo->categories_id != $v['categories_id']){
+ $etat = ((categories::$cInfo->parent_id > 0 && categories::$cInfo->parent_id == $v['categories_id']) ? true :false );
+ echo '<li class="'.(($etat)? 'selected' : 'noselected').'">'.
+ tep_decal(($v['niveau']+1)).
+ ' '. tep_draw_radio_field('cPath','cat_'.$v['categories_id'], (string)$v['categories_id'],(bool)$etat).
+ ' '.$v['categories_name'].
+ '</li>';
+ } ?>
+ </ul>
+ </dd>
+
<dt class="button_nav block_input" style="width:95%;">
<?php
echo tep_image_submit('', IMAGE_UPDATE) . tep_image_submit('', IMAGE_UPDATE_AND_CLOSE,' name="up_and_close"' );
Modified: trunk/catalog/admin/includes/gabarit/cms_content/display_view.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/cms_content/display_view.edit.gab 2011-10-03 12:51:47 UTC (rev 3825)
+++ trunk/catalog/admin/includes/gabarit/cms_content/display_view.edit.gab 2011-10-08 14:03:15 UTC (rev 3826)
@@ -56,7 +56,7 @@
<div class="edit box_right w_30">
<dl>
<dt class="block_input w_90">
- <label for="content_name"><?php echo __('entry content'); ?></label>
+ <label for="content_name" title="<?php echo __('entry content help'); ?>"><?php echo __('entry content').tep_image(DIR_WS_ICONS .'icon_help.gif') ?></label>
<?php echo tep_draw_input_field('content_name', '', cms_content::$cInfo->content_name) . tep_draw_hidden_field('p_format','','HTML'); ?>
</dt>
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/pages/cms_content.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/pages/cms_content.txt 2011-10-03 12:51:47 UTC (rev 3825)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/cms_content.txt 2011-10-08 14:03:15 UTC (rev 3826)
@@ -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 24/05/11, 23:25
+ @version 2.1.1
+ @date 08/10/11, 11:13
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -17,7 +17,8 @@
$lang['table heading c title']="Titre" ;
$lang['table heading last modified']="Dernière modification" ;
$lang['table heading action']="Action" ;
-$lang['entry content']="Nom de la page" ;
+$lang['entry content']="Clef : " ;
+$lang['entry content help']="La clef permet l'appel de cette page, elle ce doit d'être unique. Pour appeler plusieurs page, il est possible d'utiliser une racine de clef commune " ;
$lang['text info delete content intro']="Êtes-vous sûr de vouloir supprimer ce contenu ?" ;
$lang['text info date added']="Date d'ajout :" ;
$lang['text info last modified']="Dernière modification :" ;
Modified: trunk/catalog/admin/includes/modules/account/account_extra.php
===================================================================
--- trunk/catalog/admin/includes/modules/account/account_extra.php 2011-10-03 12:51:47 UTC (rev 3825)
+++ trunk/catalog/admin/includes/modules/account/account_extra.php 2011-10-08 14:03:15 UTC (rev 3826)
@@ -34,7 +34,7 @@
self::$cInfo = new objectInfo(array());
- require_once(DIR_WS_FUNCTIONS.'lib.extra_fields.php');
+// require_once(DIR_WS_FUNCTIONS.'lib.extra_fields.php');
}
public function check_action($actions){
Modified: trunk/catalog/admin/includes/modules/pages/categories.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/categories.php 2011-10-03 12:51:47 UTC (rev 3825)
+++ trunk/catalog/admin/includes/modules/pages/categories.php 2011-10-08 14:03:15 UTC (rev 3826)
@@ -92,8 +92,6 @@
//! detail item in ajax
define('AJAXSTATMENTDETAIL', 'mod=page&type='.self::$code);
- // Use factory class aca
- //self::$modules=new categoriesACA();
/**
TODO : remplacer le nom de constante par un MODULE_CATEGORIES_INSTALLED_BO
*/
@@ -117,7 +115,7 @@
public function check_action($actionss){
global $languages_id, $oscss,$messageStack;
-// self::$action=$actionss;
+
$DB=Database::getInstance();
self::$actions['action'] = self::$action;
@@ -132,9 +130,22 @@
self::$DiversInfo['current_category_id']=((isset($_GET['cPath'])&& !empty($_GET['cPath'])) ? tep_db_prepare_input($_GET['cPath']) : 0);
- if ( empty(self::$actions['action_class']) ) {
+// if ( empty(self::$actions['action_class']) ) {
+ /**
+ A module has asked to privately take care of this action, check if class and method exist and run it.
+ */
+ if (!empty(self::$actions['action_method']) && method_exists(self::$modules->modules[self::$actions['action_class']],self::$actions['action_method'] )){
+ $metho=self::$actions['action_method'];
+ self::$box = new box;
+ self::$box=self::$modules->modules[self::$actions['action_class']]->$metho(self::$box,(int)$_GET['cID']);
+ }
- if ( preg_match("/(insert|update|setflag)/i", self::$action) ) tep_reset_cache_data_seo_urls('reset');
+ else {
+
+ /// specific SEO cache
+ if ( preg_match("/(insert|update|setflag)/i", self::$action) )
+ tep_reset_cache_data_seo_urls('reset');
+
switch (self::$action) {
case 'setflag':
if ( ($_GET['flag'] == '0') || ($_GET['flag'] == '1') ) {
@@ -174,85 +185,34 @@
if (isset($_POST['categories_id'])) $categories_id = tep_db_prepare_input((int)$_POST['categories_id']);
- if (isset($_POST['categories_image']) && tep_not_null($_POST['categories_image']) && ($_POST['categories_image'] != 'none')){
- if( strpos($_POST['categories_image'],DIR_WS_CATALOG_IMAGES) >=0 )
- $_POST['categories_image'] = tep_db_prepare_input(substr($_POST['categories_image'], strlen( DIR_WS_CATALOG_IMAGES) ) );
- else
- $_POST['categories_image'] = tep_db_prepare_input($_POST['categories_image']);
- }
- $sort_order = (isset($_POST['sort_order'])) ? tep_db_prepare_input((int)$_POST['sort_order']) : 0 ;
- self::$current_category_id = (isset($_POST['cPath'])) ? tep_db_prepare_input($_POST['cPath']) : 0 ;
- $categories_status = (isset($_POST['categories_status'])) ? tep_db_prepare_input((int)$_POST['categories_status']) : 0 ;
- $categories_hidden = (isset($_POST['categories_hidden'])) ? tep_db_prepare_input((int)$_POST['categories_hidden']) : 0 ;
- $categories_image = (!isset($_POST['categories_image']) || (!isset($_POST['categories_image_no']) && $_POST['categories_image']=='on') ) ? '' : tep_db_prepare_input($_POST['categories_image']) ;
+ $params['sqlarray'] = array('sort_order' => (isset($_POST['sort_order'])) ? tep_db_prepare_input((int)$_POST['sort_order']) : 0 ,
+ 'parent_id' => tep_db_prepare_input((int)@$_POST['cPath']),
+ 'categories_status' => (isset($_POST['categories_status'])) ? tep_db_prepare_input((int)$_POST['categories_status']) : 0,
+ 'categories_hidden' => (isset($_POST['categories_hidden'])) ? tep_db_prepare_input((int)$_POST['categories_hidden']) : 0 ,
+ 'categories_image'=>sqlcategorie::AddImage(@$_POST['categories_image'], @$_POST['categories_image_no'])
+ );
- $sql_data_array = array('sort_order' => $sort_order,
- 'parent_id' => self::$current_category_id,
- 'categories_status' => $categories_status,
- 'categories_hidden' => $categories_hidden,
- 'categories_image'=>$categories_image
- );
+ $params['id']=$categories_id;
+ $params['action']=self::$action;
+ $params['post']=$_POST;
+ $params['language_id']= $languages_id;
+ $params['cPath']=(isset($_POST['cPath'])) ? tep_db_prepare_input($_POST['cPath']) : 0;
- if (self::$action == 'insert') {
- $insert_sql_data = array('date_added' => 'now()');
- $sql_data_array = array_merge($sql_data_array, $insert_sql_data);
- self::$modules->load_post_values ($_POST);
- self::$modules->get_insert_table_categories($sql_data_array,'');
+ if (self::$action == 'insert')
+ $res = sqlcategorie::create($params);
+ elseif (self::$action == 'update')
+ $res = sqlcategorie::update($params);
- $r...
[truncated message content] |
|
From: <os...@us...> - 2011-10-09 08:47:40
|
Revision: 3827
http://oscss.svn.sourceforge.net/oscss/?rev=3827&view=rev
Author: oscim
Date: 2011-10-09 08:47:33 +0000 (Sun, 09 Oct 2011)
Log Message:
-----------
modification nommage table admin
Ajout table pour gerer les acl
mise a iveau des fichier datatables
Modified Paths:
--------------
trunk/catalog/admin/includes/database_tables.php
trunk/catalog/includes/database_tables.php
Added Paths:
-----------
trunk/catalog/install/includes/sql/mysql/tables/osc_admin_m_files.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_admin_m_files_to_right.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_admin_users.sql
Removed Paths:
-------------
trunk/catalog/install/includes/sql/mysql/tables/osc_admin.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_admin_files.sql
Modified: trunk/catalog/admin/includes/database_tables.php
===================================================================
--- trunk/catalog/admin/includes/database_tables.php 2011-10-08 14:03:15 UTC (rev 3826)
+++ trunk/catalog/admin/includes/database_tables.php 2011-10-09 08:47:33 UTC (rev 3827)
@@ -3,17 +3,19 @@
@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 11/02/11, 09:48
+ @version 2.1.1
+ @date 09/10/11, 10:46
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
//Admin begin
- define('TABLE_ADMIN', DB_TABLE_PREFIX . 'admin');
- define('TABLE_ADMIN_FILES', DB_TABLE_PREFIX . 'admin_files');
+ define('TABLE_ADMIN', DB_TABLE_PREFIX . 'admin_users');
define('TABLE_ADMIN_GROUPS', DB_TABLE_PREFIX . 'admin_groups');
define('TABLE_ADMIN_NOTIFICATION', DB_TABLE_PREFIX.'admin_notification');
+
+ define('TABLE_ADMIN_FILES', DB_TABLE_PREFIX . 'admin_m_files');
+ define('TABLE_ADMIN_FILES2RIGHT', DB_TABLE_PREFIX . 'admin_m_files_to_right');
//Admin end
// define the database table names used in the project
Modified: trunk/catalog/includes/database_tables.php
===================================================================
--- trunk/catalog/includes/database_tables.php 2011-10-08 14:03:15 UTC (rev 3826)
+++ trunk/catalog/includes/database_tables.php 2011-10-09 08:47:33 UTC (rev 3827)
@@ -3,15 +3,15 @@
@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 09/10/11, 10:46
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
define('TABLE_ADMIN_NOTIFICATION', DB_TABLE_PREFIX.'admin_notification');
define('TABLE_NOTIFICATION', DB_TABLE_PREFIX.'checknotif');
- define('TABLE_ADMIN', DB_TABLE_PREFIX . 'admin');
+ define('TABLE_ADMIN', DB_TABLE_PREFIX . 'admin_users');
// define the database table names used in the project
define('TABLE_ADDRESS_BOOK', DB_TABLE_PREFIX . 'address_book');
Deleted: trunk/catalog/install/includes/sql/mysql/tables/osc_admin.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_admin.sql 2011-10-08 14:03:15 UTC (rev 3826)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_admin.sql 2011-10-09 08:47:33 UTC (rev 3827)
@@ -1,19 +0,0 @@
-SET storage_engine=innodb;
-
-DROP TABLE IF EXISTS osc_admin;
-CREATE TABLE osc_admin (
- admin_id int(11) not null auto_increment,
- admin_groups_id int(11) ,
- admin_firstname varchar(32) not null ,
- admin_lastname varchar(32) ,
- admin_email_address varchar(96) not null ,
- admin_password varchar(40) not null ,
- admin_created datetime ,
- admin_modified datetime default '1000-01-01 00:00:00' not null ,
- admin_logdate datetime ,
- admin_lognum int(11) default '0' not null ,
- url_openid varchar(150) null,
- PRIMARY KEY (admin_id),
- UNIQUE admin_email_address (admin_email_address)
-) DEFAULT CHARSET=utf8;
-COMMIT;
\ No newline at end of file
Deleted: trunk/catalog/install/includes/sql/mysql/tables/osc_admin_files.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_admin_files.sql 2011-10-08 14:03:15 UTC (rev 3826)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_admin_files.sql 2011-10-09 08:47:33 UTC (rev 3827)
@@ -1,15 +0,0 @@
-SET storage_engine=innodb;
-
-drop table if exists osc_admin_files;
-CREATE TABLE osc_admin_files (
- admin_files_id int(11) NOT NULL auto_increment,
- admin_files_name varchar(128) NOT NULL COMMENT 'fichier, avec get',
- admin_files_is_boxes tinyint(1) NOT NULL default '0' COMMENT '1 si est une boîte',
- admin_files_to_boxes tinyint(1) NOT NULL default '0' COMMENT 'precise le num de la boîte parent',
- admin_groups_id set('1','2','3','4','5') NOT NULL default '1',
- PRIMARY KEY (admin_files_id),
- UNIQUE KEY admin_files_name (admin_files_name,admin_files_is_boxes,admin_files_to_boxes)
-) DEFAULT CHARSET=utf8;
-
-
-COMMIT;
\ No newline at end of file
Copied: trunk/catalog/install/includes/sql/mysql/tables/osc_admin_m_files.sql (from rev 3815, trunk/catalog/install/includes/sql/mysql/tables/osc_admin_files.sql)
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_admin_m_files.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_admin_m_files.sql 2011-10-09 08:47:33 UTC (rev 3827)
@@ -0,0 +1,15 @@
+SET storage_engine=innodb;
+
+drop table if exists osc_admin_m_files;
+CREATE TABLE osc_admin_m_files (
+ admin_files_id int(11) NOT NULL auto_increment,
+ admin_files_name varchar(128) NOT NULL COMMENT 'fichier, avec get',
+ admin_files_is_boxes tinyint(1) NOT NULL default '0' COMMENT '1 si est une boîte',
+ admin_files_to_boxes tinyint(1) NOT NULL default '0' COMMENT 'precise le num de la boîte parent',
+ admin_groups_id set('1','2','3','4','5') NOT NULL default '1',
+ PRIMARY KEY (admin_files_id),
+ UNIQUE KEY admin_m_files_name (admin_files_name,admin_files_is_boxes,admin_files_to_boxes)
+) DEFAULT CHARSET=utf8;
+
+
+COMMIT;
\ No newline at end of file
Added: trunk/catalog/install/includes/sql/mysql/tables/osc_admin_m_files_to_right.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_admin_m_files_to_right.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_admin_m_files_to_right.sql 2011-10-09 08:47:33 UTC (rev 3827)
@@ -0,0 +1,10 @@
+SET storage_engine=innodb;
+
+DROP TABLE IF EXISTS osc_admin_m_files_to_right;
+CREATE TABLE osc_admin_m_files_to_right (
+ files_id int(11) ,
+ type_id int(1) default '0',
+ id_ref int(11) ,
+ UNIQUE filesgroup (files_id,type_id,id_ref)
+);
+COMMIT;
\ No newline at end of file
Copied: trunk/catalog/install/includes/sql/mysql/tables/osc_admin_users.sql (from rev 3815, trunk/catalog/install/includes/sql/mysql/tables/osc_admin.sql)
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_admin_users.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_admin_users.sql 2011-10-09 08:47:33 UTC (rev 3827)
@@ -0,0 +1,19 @@
+SET storage_engine=innodb;
+
+DROP TABLE IF EXISTS osc_admin_users;
+CREATE TABLE osc_admin_users (
+ admin_id int(11) not null auto_increment,
+ admin_groups_id int(11) ,
+ admin_firstname varchar(32) not null ,
+ admin_lastname varchar(32) ,
+ admin_email_address varchar(96) not null ,
+ admin_password varchar(40) not null ,
+ admin_created datetime ,
+ admin_modified datetime default '1000-01-01 00:00:00' not null ,
+ admin_logdate datetime ,
+ admin_lognum int(11) default '0' not null ,
+ url_openid varchar(150) null,
+ PRIMARY KEY (admin_id),
+ UNIQUE admin_email_address (admin_email_address)
+) DEFAULT CHARSET=utf8;
+COMMIT;
\ 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-10-10 20:46:33
|
Revision: 3828
http://oscss.svn.sourceforge.net/oscss/?rev=3828&view=rev
Author: oscim
Date: 2011-10-10 20:46:26 +0000 (Mon, 10 Oct 2011)
Log Message:
-----------
Suite modification pour utilisation des dirvers de base de donn?\195?\169e lors de l'installation
Evolution des class Database et driver, refonte partielle function database de l'installateur
Ajustement des class content de l'installateur
Ajout d'option permettant un choix avance sur la db port, type moteur, type engine
Modified Paths:
--------------
trunk/catalog/common/classes/Database.php
trunk/catalog/common/drivers/DB_Mysql.php
trunk/catalog/includes/classes/drivers/data/content.php
trunk/catalog/includes/classes/page.php
trunk/catalog/install/includes/content/core.installdb.php
trunk/catalog/install/includes/content/core.modes.php
trunk/catalog/install/includes/content/core.update.php
trunk/catalog/install/includes/functions/database.php
trunk/catalog/install/includes/functions/general.php
trunk/catalog/install/templates/main_page/stylesheet.css
Modified: trunk/catalog/common/classes/Database.php
===================================================================
--- trunk/catalog/common/classes/Database.php 2011-10-09 08:47:33 UTC (rev 3827)
+++ trunk/catalog/common/classes/Database.php 2011-10-10 20:46:26 UTC (rev 3828)
@@ -45,7 +45,6 @@
-
/**
* Current object instance (Singleton)
* @var object
@@ -75,15 +74,15 @@
- protected function __construct() {
- $this->connect();
+ protected function __construct($db_select=true) {
+ $this->connect($db_select);
if (!is_resource($this->resConnection) && !is_object($this->resConnection))
throw new Exception(sprintf('Could not connect to database (%s)', $this->error));
}
- public static function getInstance() {
+ public static function getInstance($db_select=true) {
if(self::$_instance == null) {
$strClass = 'DB_' . ucfirst(strtolower(self::CONNECTOR));
$strFile = sprintf('%s'.DIR_WS_COMMON.'drivers/%s.php', DIR_FS_CATALOG, $strClass);
@@ -92,7 +91,8 @@
include_once($strFile);
define('DB_DRIVER', $strClass);
- self::$_instance = new $strClass();
+ self::$_instance = new $strClass($db_select);
+
}
return self::$_instance;
}
@@ -250,7 +250,8 @@
/**
* Abstract database driver methods
*/
- abstract protected function connect();
+ abstract protected function connect($db=true);
+ abstract /*protected */function db_select($db=false);
abstract protected function disconnect();
abstract protected function get_error();
abstract protected function begin_transaction();
Modified: trunk/catalog/common/drivers/DB_Mysql.php
===================================================================
--- trunk/catalog/common/drivers/DB_Mysql.php 2011-10-09 08:47:33 UTC (rev 3827)
+++ trunk/catalog/common/drivers/DB_Mysql.php 2011-10-10 20:46:26 UTC (rev 3828)
@@ -34,7 +34,7 @@
/**
* Connect to database server and select database
*/
- protected function connect() {
+ protected function connect($db=true) {
$strHost = parent::HOST;
if (parent::PORT) $strHost .= ':' . parent::PORT;
@@ -46,12 +46,21 @@
{
@mysql_query("SET sql_mode=''", $this->resConnection);
@mysql_query("SET NAMES " . parent::CHARSET, $this->resConnection);
- @mysql_select_db(parent::DB, $this->resConnection);
+ if($db)
+ $this->db_select();
}
}
/**
+ Select from database
+ */
+ /*protected*/ function db_select($db=false) {
+ return @mysql_select_db( ((!$db)?parent::DB: $db ), $this->resConnection);
+ }
+
+
+ /**
Disconnect from database
*/
protected function disconnect() {
Modified: trunk/catalog/includes/classes/drivers/data/content.php
===================================================================
--- trunk/catalog/includes/classes/drivers/data/content.php 2011-10-09 08:47:33 UTC (rev 3827)
+++ trunk/catalog/includes/classes/drivers/data/content.php 2011-10-10 20:46:26 UTC (rev 3828)
@@ -33,6 +33,7 @@
protected static function start_module(){
$pdm=contentModule::getInstance();
self::$modules=$pdm->ret_modules();
+ return $pdm;
}
public static function getInstance($full=false) {
@@ -45,15 +46,52 @@
return self::getInstance();
}
+
/**
- Module configuration
+ Data function
*/
+ /**
+ * \fn ret_modules()
+ * \brief Retour tableau des modules type products actif
+ * @return plusieurs modules via array(object)
+ */
public function ret_modules(){ self::start_module(); return self::$modules;}
+ /**
+ * \fn check_action($class='',$actions='')
+ * \brief execute la capture des actions par les modlues
+ * @param $class string
+ * @param $actions array
+ */
+ public function check_action($class='',$actions=''){ $pdm=self::start_module(); return $pdm->check_action($class,$actions);}
+ /**
+ * \fn get_header($class='',$actions='')
+ * \brief traitement block header des module
+ * Display block header modules
+ * @param $class string
+ * @param $actions array
+ */
+// public function get_header($class='',$actions=''){ $pdm=self::start_module(); return $pdm->get_header($class,$actions);}
+ /**
+ * \fn after_check_action($class='',$actions='')
+ * \brief after_check_action
+ * @param $class string
+ * @param $actions array
+ */
+ public function after_check_action($class='',$actions=''){ $pdm=self::start_module(); return $pdm->after_check_action($class,$actions);}
+ /**
+ * \fn display_view($pID,$class='',$exclude=array())
+ * \brief after_check_action
+ * @param $pID int
+ * @param $class string
+ * @param $exclude array
+ */
+ public function display_view($ID,$class='',$exclude=array()){$pdm=self::start_module(); return $pdm->display_view($ID,$class,$exclude);}
/**
Data function
*/
+
public static function get_query($id='',$search='',$exclude='',$option=array()){ global $languages_id; return contentData::get_query($id,$search,$exclude,$option); }
public static function get_item($id){ return contentData::get_item($id); }
public static function get_content_cat($id){ return contentData::get_content_cat($id); }
@@ -395,6 +433,11 @@
extends AbstractAcaModule
implements InterfaceAcaGene {
+ /**
+ @var string Les modules actif
+ */
+ public $modules;
+
protected static $_instance;
/**
@@ -404,7 +447,7 @@
$this->name=__CLASS__;
$this->modules=array();
$list_mod=array();
- foreach(parent::initialise_type('MODULE_CONTENT_INSTALLED',$this->name) as $class){
+ foreach(parent::initialise_type('MODULE_CONTENT_INSTALLED','content') as $class){
$cl[$class]=new $class ();
$list_mod[$class] = $cl[$class]->sort_order;
}
@@ -427,7 +470,33 @@
return self::getInstance();
}
- public function display_view($ID,$class=''){return array();}
+ /**
+ * \fn display_view($pID,$class='',$exclude=array() )
+ @brief Affiche module elemennt html
+ Block principal d'affichage, liste ou vue des élément. Block principal de page
+ @param $pID int le Id du produits
+ @param $class string le nom de la class appelé, ou vide pour toutes les class enfants
+ @param $exclude array
+ */
+ public function display_view($pID,$class='',$exclude=array() ){
+ global $page;
+ if (!empty($class)) {
+ if (isset($this->modules[$class]) && $this->modules[$class]->enabled and (method_exists($class, 'display_view' ))){
+ $this->modules[$class]->load_db_values($pID);
+ return $this->modules[$class]->display_view($pID);
+ }
+ } else {
+ $c=array();
+ if(isset($this->modules) && is_array($this->modules))
+ foreach ($this->modules as $key=>$module) {
+ if ( !in_array($key,$exclude) && ($module->enabled) and (method_exists($module, 'display_view' ))) {
+ $this->modules[$key]->load_db_values($pID);
+ $c[$key]=$this->modules[$key]->display_view($pID);
+ }
+ }
+ return $c;
+ }
+ }
/**
Affiche module display_view mini
Modified: trunk/catalog/includes/classes/page.php
===================================================================
--- trunk/catalog/includes/classes/page.php 2011-10-09 08:47:33 UTC (rev 3827)
+++ trunk/catalog/includes/classes/page.php 2011-10-10 20:46:26 UTC (rev 3828)
@@ -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 17/07/11, 11:12
+ @version 2.1.1
+ @date 10/10/11, 22:04
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
\class page
@@ -434,6 +434,9 @@
// $this->new_class($this->the_type(),true);
$ACA = $this->return_object($this->the_type());
}
+
+ if (isset($_REQUEST['action']))
+ $ACA->check_action('',$_REQUEST['action']);
}
//! Init du theme
$this->oscss_get_gabarit_template();
Modified: trunk/catalog/install/includes/content/core.installdb.php
===================================================================
--- trunk/catalog/install/includes/content/core.installdb.php 2011-10-09 08:47:33 UTC (rev 3827)
+++ trunk/catalog/install/includes/content/core.installdb.php 2011-10-10 20:46:26 UTC (rev 3828)
@@ -81,6 +81,9 @@
$this->get_db_conf();
osc_db_connect($this->db['DB_SERVER'], $this->db['DB_SERVER_USERNAME'], $this->db['DB_SERVER_PASSWORD']);
osc_db_select_db($this->db['DB_DATABASE']);
+
+
+
/* Mise a jour db et config diverse */
osc_db_query($sql="update ".$this->db['DB_TABLE_PREFIX']."configuration set configuration_value='".$this->fs_document_root.$this->ws_admin_rand."/sessions/page_parse_time.log' where configuration_key='STORE_PAGE_PARSE_TIME_LOG'" );
osc_db_query($sql="update ".$this->db['DB_TABLE_PREFIX']."configuration set configuration_value='".substr(DC_LOADER_LANG,0,2)."' where configuration_key='DEFAULT_LANGUAGE'" );
Modified: trunk/catalog/install/includes/content/core.modes.php
===================================================================
--- trunk/catalog/install/includes/content/core.modes.php 2011-10-09 08:47:33 UTC (rev 3827)
+++ trunk/catalog/install/includes/content/core.modes.php 2011-10-10 20:46:26 UTC (rev 3828)
@@ -168,14 +168,68 @@
.'</p>'."\n";
- echo '<h2>'.core::l10n("Serveur").'</h2>'."\n";
+ echo '<h2>'.core::l10n("Serveur").'</h2>'."\n";
echo '<p class="smallDesc">'."\n"
.'<label>'.core::l10n('Activer les connections SSL:').'</label>'."\n"
.osc_draw_checkbox_field('ENABLE_SSL', '', ( (isset($_POST['ENABLE_SSL'])&& $_POST['ENABLE_SSL'] == 'true')? true : false) )."\n"
.core::draw_help('httpSSL', core::l10n('Activer les connections sécurisé SSL (HTTPS) (exige un certificat installé sur le serveur web).')/*, core::l10n('Activer les connections SSL:')*/)."\n"
.'</p>'."\n";
- echo "<p>".osc_draw_hidden_field('go_test', '', true)."</p>\n";
+
+ echo '<h2>'.core::l10n("Avance").'</h2>'."\n";
+
+
+ echo '<p class="smallDesc">'."\n"
+ .'<label>'.core::l10n('Type de base de donnée').'</label>'."\n"
+ .'<select name="DBMOTOR" >'."\n"
+ .'<option value="Mysql" '.($language_code == DC_LOADER_LANG ? 'selected="selected"' : '').'>Mysql</option>'."\n"
+ .'<option value="Mysqli" '.($language_code == DC_LOADER_LANG ? 'selected="selected"' : '').'>Mysqli</option>'."\n"
+ .'</select>'."\n"
+ .core::draw_help('httpSSL', core::l10n('Le type de base de donnée'))."\n"
+ .'</p>'."\n";
+
+ echo '<p class="smallDesc">'."\n"
+ .'<label>'.core::l10n('Base de donnée encodage').'</label>'."\n"
+ .'<select name="DBMOTOR_CHARSET" >'."\n"
+ .'<option value="utf8" '.($language_code == DC_LOADER_LANG ? 'selected="selected"' : '').'>utf-8</option>'."\n"
+ .'<option value="latin1" '.($language_code == DC_LOADER_LANG ? 'selected="selected"' : '').'>latin1</option>'."\n"
+ .'</select>'."\n"
+ .core::draw_help('httpSSL', core::l10n('L\'encodage de la base de donnée'))."\n"
+ .'</p>'."\n";
+
+ echo '<p class="smallDesc">'."\n"
+ .'<label>'.core::l10n('Le port de la base de donnée').'</label>'."\n"
+ .osc_draw_input_field('DBMOTOR_PORT', '',( isset($_POST['DBMOTOR_PORT'])? $_POST['DBMOTOR_PORT'] : '3306'))."\n"
+ .core::draw_help('httpSSL', core::l10n(' Post du serveur de base de donnée mysql(3306), ')/*, core::l10n('Activer les connections SSL:')*/)."\n"
+ .'</p>'."\n";
+
+ echo '<p class="smallDesc">'."\n"
+ .'<label>'.core::l10n('Type de moteur dans la base de donnée').'</label>'."\n"
+ .'<select name="DBMOTOR_TYPE" >'."\n"
+ .'<option value="MyISAM" '.($language_code == DC_LOADER_LANG ? 'selected="selected"' : '').'>MyISAM</option>'."\n"
+ .'<option value="InnoDB" '.($language_code == DC_LOADER_LANG ? 'selected="selected"' : '').'>InnoDB</option>'."\n"
+ .'</select>'."\n"
+ .core::draw_help('httpSSL', core::l10n('Preferer le moteur innodb pour les base volumineuse, uniquement lors d\'une nouvelle installation. le moteur ne peut être converti apres installation'))."\n"
+ .'</p>'."\n";
+
+
+ echo '<p class="smallDesc">'."\n"
+ .'<label>'.core::l10n('Choix de l\'arboresance des dossiers inscriptibles').'</label>'."\n"
+ .'<ul>'
+ .'<li>'
+ .osc_draw_radio_field('ARBORESANCE', '1', ( (!isset($_POST['ARBORESANCE']) || $_POST['ARBORESANCE'] == '1')? true : false) )."\n" . core::l10n('Classique')
+ .core::draw_help('httpSSL', core::l10n('Un dossier contient l\'ensemble des donnée de l\'application')/*, core::l10n('Activer les connections SSL:')*/)."\n"
+ .'</li>'
+ .'<li>'
+ .osc_draw_radio_field('ARBORESANCE', '2', ( (isset($_POST['ARBORESANCE'])&& $_POST['ARBORESANCE'] == '2')? true : false) )."\n" . core::l10n('Vhost')
+ .core::draw_help('httpSSL', core::l10n('Le dossier des données et document est placé au dessus du dossier de l\'application. modificatio du vhost ou acces au dossier superieur')/*, core::l10n('Activer les connections SSL:')*/)."\n"
+ .'</li>'
+ .'</ul>'
+ .'</p>'."\n";
+
+
+
+ echo "<p>".osc_draw_hidden_field('go_test', '', true)."</p>\n";
echo $this->draw_button();
echo '</form>'."\n";
@@ -260,11 +314,15 @@
$db['DB_SERVER_PASSWORD'] = trim(stripslashes($_POST['DB_SERVER_PASSWORD']));
$db['DB_DATABASE'] = trim(stripslashes($_POST['DB_DATABASE']));
$db['DB_TABLE_PREFIX'] = trim(stripslashes($_POST['DB_TABLE_PREFIX']));
+ $db['DBMOTOR'] = trim(stripslashes($_POST['DBMOTOR']));
+ $db['DBMOTOR_CHARSET'] = strtolower(trim(stripslashes($_POST['DBMOTOR_CHARSET'])));
+ $db['DBMOTOR_PORT'] = trim(stripslashes($_POST['DBMOTOR_PORT']));
+ $db['DBMOTOR_TYPE'] = strtolower(trim(stripslashes($_POST['DBMOTOR_TYPE'])));
+osc_db_connect($db['DBMOTOR'], $db['DBMOTOR_PORT'],$db['DBMOTOR_CHARSET'], $db['DB_SERVER'], $db['DB_SERVER_USERNAME'], $db['DB_SERVER_PASSWORD'],$db['DB_DATABASE'], strtolower( $db['DBMOTOR_TYPE']) );
+// if ( osc_db_connect($db['DBMOTOR'], $db['DBMOTOR_PORT'], $db['DBMOTOR_PORT'], $db['DBMOTOR_TYPE'],$db['DBMOTOR_CHARSET'], $db['DB_SERVER'], $db['DB_SERVER_USERNAME'], $db['DB_SERVER_PASSWORD']) != false) {
-
- if ( osc_db_connect($db['DB_SERVER'], $db['DB_SERVER_USERNAME'], $db['DB_SERVER_PASSWORD']) != false) {
- if(!osc_db_select_db($db['DB_DATABASE'])){
+ if(!osc_db_select_db()){
$this->PileMessage('alert', core::l10n("Test de connexion à la base de données échoué. ") );
if(osc_db_test_create_db_permission($db['DB_DATABASE']) ==true){
@@ -276,12 +334,15 @@
$this->PileMessage('alert', core::l10n("la création de la base de donnée à echoué, creer la base manuellement puis poursuivez l'installation") );
}
}
- }
- else{
- $lp_error=false;
- $this->PileMessage('alert', core::l10n("le couple utilisateur login/password n'est pas correct") );
- }
+ else
+ $db_error= false;
+// }
+// else{
+// $lp_error=false;
+// $this->PileMessage('alert', core::l10n("le couple utilisateur login/password n'est pas correct") );
+// }
+
/** Test si db oscss deja existante, si c'est le cas, force mode upgrade db */
if ($db_error === false) {
$final=array();
Modified: trunk/catalog/install/includes/content/core.update.php
===================================================================
--- trunk/catalog/install/includes/content/core.update.php 2011-10-09 08:47:33 UTC (rev 3827)
+++ trunk/catalog/install/includes/content/core.update.php 2011-10-10 20:46:26 UTC (rev 3828)
@@ -1,11 +1,11 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @package oscss-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 03/01/11, 09:20
+ @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 09/10/11, 17:43
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @modified Ayatus <www http://www.ayatus.org>
@encode UTF-8
@class update
Prise en charge recup version courante svn / par rapport revision enregitré
@@ -15,7 +15,7 @@
define('URL_OSCSS_ORG_TRAC', 'http://sourceforge.net/apps/trac/oscss/changeset/?format=zip&new=SVN_REV_MAX&old=SVN_REV&new_path=branches%2F2.1.0%2Fcatalog&old_path=branches%2F2.1.0%2Fcatalog');
define('URL_OSCSS_GET_REV', 'http://oscss.svn.sourceforge.net/viewvc/oscss?view=revision');
-define('PATH_SVN_BRANCHE', 'branches/2.1.0/catalog/');
+define('PATH_SVN_BRANCHE', 'trunk/catalog/');
define('FILEPATH_SVN_CORE', 'common/oscss.version.xml');
class update extends core {
Modified: trunk/catalog/install/includes/functions/database.php
===================================================================
--- trunk/catalog/install/includes/functions/database.php 2011-10-09 08:47:33 UTC (rev 3827)
+++ trunk/catalog/install/includes/functions/database.php 2011-10-10 20:46:26 UTC (rev 3828)
@@ -9,42 +9,67 @@
@encode UTF-8
*/
- function osc_db_connect($server, $username, $password, $link = 'db_link') {
- global $link, $db_error;
- $db_error = false;
+ function osc_db_connect($motor, $port, $charset, $server, $username, $password, $database,$type) {
+ define('HTTP_SERVER',true);
- if (!$server) {
- $db_error = 'No Server selected.';
- return false;
- }
+ define('DIR_WS_COMMON','');
+ define('DIR_FS_CATALOG',substr(dirname(__FILE__),0,strpos(dirname(__FILE__),'install/includes/functions') ).'/common/');
- $link = @mysql_connect($server, $username, $password) or $db_error = mysql_error();
- @mysql_query("SET NAMES 'utf8' " , $link);
- return $link;
+ // define our database connection
+ define('DB_CONNECTOR', $motor);
+ define('DB_PORT', $port);
+ define('DB_TYPE', $type);
+ define('DB_CHARSET', $charset);
+ define('DB_SERVER', $server); // eg, localhost - should not be empty for productive servers
+ define('DB_SERVER_USERNAME', $username);
+ define('DB_SERVER_PASSWORD', $password);
+
+// define('DB_TABLE_PREFIX', 'osc_');
+ define('USE_PCONNECT', 'false'); // use persisstent connections?
+
+ define('DB_DATABASE', $database);
+
+
+ include_once('../common/classes/Database.php');
+
+
+ $DB=Database::getInstance(false);
+
}
- function osc_db_select_db($database) {
- return mysql_select_db($database);
+
+
+
+ function osc_db_select_db($database='') {
+
+ $DB=Database::getInstance();
+
+
+ if(!empty($database))
+ return $DB->db_select($database);
+ else
+ return $DB->db_select();
}
+
function osc_db_close($link = 'db_link') {
global $link;
return mysql_close($link);
}
- function osc_db_query($query, $link = 'db_link') {
- global $link;
+ function osc_db_query($query/*, $link = 'db_link'*/) {
+// global $link;
- $res= mysql_query($query, $link) or oscss_db_error($query, mysql_errno(), mysql_error());
- return $res;
+// $res= mysql_query($query, $link) or oscss_db_error($query, mysql_errno(), mysql_error());
+ $DB=Database::getInstance();
+ return $DB->query($query);
}
- function osc_db_query_noblock($query, $link = 'db_link') {
- global $link;
-// error_reporting()
- if( ($res=mysql_query($query, $link)) ==false) echo '<br /><strong>Database reported:</strong> '.htmlspecialchars(mysql_error()).'<br /><strong>Failed query:</strong> '.htmlspecialchars($query)."<br />\n";
+ function osc_db_query_noblock($query/*, $link = 'db_link'*/) {
+ $DB=Database::getInstance();
+ if( ($res=$DB->query($query)) ==false) echo '<br /><strong>Database reported:</strong> '.htmlspecialchars(mysql_error()).'<br /><strong>Failed query:</strong> '.htmlspecialchars($query)."<br />\n";
else return $res;
}
@@ -52,20 +77,24 @@
/**
Alias
*/
- function tep_db_query($query, $link = 'db_link') {
+ function tep_db_query($query/*, $link = 'db_link'*/) {
global $link;
return osc_db_query($query, $link);
}
- function tep_db_fetch_array($db_query){
- return mysql_fetch_array($db_query, MYSQL_ASSOC);
- }
- function tep_db_num_rows($db_query) {
- return mysql_num_rows($db_query);
- }
+
+ function tep_db_fetch_array($rId) { return $rId->fetchAssoc(); }
+ function osc_db_fetch_array($db_query){return tep_db_fetch_array($db_query); };
+
+
+
+ function tep_db_num_rows($rId) { return $rId->__get('numRows');}
+ function osc_db_num_rows($db_query) { return tep_db_num_rows($db_query); }
+
+
function tep_db_prepare_input($string) {
if (is_string($string)) {
return trim(stripslashes($string));
@@ -80,15 +109,12 @@
}
}
-function tep_db_insert_id() {
- global $link;
- return mysql_insert_id($link);
-}
+function tep_db_insert_id($rId) { return $rId->__get('insertId'); }
+function osc_db_insert_id($rId) { return tep_db_insert_id($rId); }
-function tep_db_input($string, $link = 'link') {
- global $link;
- return mysql_real_escape_string($string, $link);
-}
+function tep_db_input($string) { $DB=Database::getInstance(); return $DB->db_input($string); }
+
+
function oscss_db_error($query, $errno, $error) {
?>
@@ -122,21 +148,13 @@
die;
}
- function osc_db_fetch_array($db_query) {
- return mysql_fetch_array($db_query);
- }
- function osc_db_num_rows($db_query) {
- return mysql_num_rows($db_query);
- }
+
function osc_db_data_seek($db_query, $row_number) {
return mysql_data_seek($db_query, $row_number);
}
- function osc_db_insert_id() {
- return mysql_insert_id();
- }
function osc_db_free_result($db_query) {
return mysql_free_result($db_query);
@@ -145,40 +163,45 @@
function osc_db_test_create_db_permission($database) {
global $db_error;
+ $DB=Database::getInstance();
+// return $DB->query($query);
$db_created = false;
$db_error = false;
-
+// echo 'test';
if (!$database) {
$db_error = 'No Database selected.';
return false;
}
-
+// echo 'db ok';
if (!$db_error) {
if (!osc_db_select_db($database)) {
$db_created = true;
-
- if (!osc_db_query('create database ' . $database)) {
- $db_error = mysql_error();
+// echo 'create';
+ if ( ($r=$DB->query('create database ' . $database)) && !$r ) {
+// $db_error = $r;
}
} else {
- $db_error = mysql_error();
+// $db_error = mysql_error();
}
if (!$db_error) {
if (osc_db_select_db($database)) {
- if (osc_db_query('create table temp ( temp_id int(5) )')) {
- if (!osc_db_query('drop table temp')) {
- $db_error = mysql_error();
+ if ($DB->query('create table temp ( temp_id int(5) )')) {
+ if (!$DB->query('drop table temp')) {
+// $db_error = mysql_error();
}
} else {
- $db_error = mysql_error();
+// $db_error = mysql_error();
}
} else {
- $db_error = mysql_error();
+// $db_error = mysql_error();
}
}
}
+// var_dump($db_error);
+//
+// exit;
if (!$db_error) return true;
else return false;
Modified: trunk/catalog/install/includes/functions/general.php
===================================================================
--- trunk/catalog/install/includes/functions/general.php 2011-10-09 08:47:33 UTC (rev 3827)
+++ trunk/catalog/install/includes/functions/general.php 2011-10-10 20:46:26 UTC (rev 3828)
@@ -190,4 +190,41 @@
return isset($lang[$str]) ? $lang[$str] : $str;
}
+
+
+/**
+ @author oscim - OscssTeam
+ @param string/boolean defini par une constante!
+ @return boolean true/false
+*/
+function _cst_bool($text){
+ if(!tep_not_null($text)) return false;
+ $value=tep_cst_define($text);
+ if( (is_string($value) && strtoupper($value)=='TRUE')||( is_bool($value) && $value==TRUE) ) return true;
+ elseif( (is_string($value) && (strtoupper($value)=='FALSE')) || ( is_bool($value) && $value==FALSE) ) return false;
+ return false;
+}
+
+/**
+ @package oscss-major
+ @author oscim - OscssTeam
+ @param string/boolean
+ @return boolean true/false
+*/
+function _test_bool($value){
+ if(!tep_not_null($value)) return false;
+ if( (is_string($value) && (strtoupper($value)=='TRUE' || $value=='1' ) )||( is_bool($value) && ($value==TRUE || $value==1) ) || (is_numeric($value) && $value=1) ) return true;
+ elseif( (is_string($value) && (strtoupper($value)=='FALSE')) || ( is_bool($value) && $value==FALSE) ) return false;
+ return false;
+}
+
+/**
+ @author oscim - OscssTeam
+ @version 1.0
+ Test si une constante est defini , si celle-ci existe, renvoi sa valeur, sinon return (string)'false'
+*/
+function tep_cst_define($text){
+ if(defined(strtoupper($text))) return constant(strtoupper($text));
+ else return 'false';
+}
?>
\ No newline at end of file
Modified: trunk/catalog/install/templates/main_page/stylesheet.css
===================================================================
--- trunk/catalog/install/templates/main_page/stylesheet.css 2011-10-09 08:47:33 UTC (rev 3827)
+++ trunk/catalog/install/templates/main_page/stylesheet.css 2011-10-10 20:46:26 UTC (rev 3828)
@@ -28,10 +28,13 @@
form, fieldset {margin:0 0 1em; padding:0; border:none;}
label {margin-right:1em;}
input, button, select {font-size:12px;}
-input[type=text], input[type=password] {width:30%;}
+input[type=text], input[type=password] {width:45%;}
input[type=radio] {margin: .3em 1em;}
img {border:none;}
+
+#install label {display:inline-block; width:35%; }
+
/* ---Template--- */
#template {
background-color:white;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-10-12 12:48:22
|
Revision: 3829
http://oscss.svn.sourceforge.net/oscss/?rev=3829&view=rev
Author: oscim
Date: 2011-10-12 12:48:13 +0000 (Wed, 12 Oct 2011)
Log Message:
-----------
Suite evolution install pour la prise encharge des driver sql des l'install
Mise au point gestion des param avanc?\195?\169 lors de l'installation vis a vis de la db support innodb/mysiam
Mise a jour fichier des creation de tables de l'installateur
Correction coquille /class/drivers/data/
Suppression reference vers old tables product_virtual
Modified Paths:
--------------
trunk/catalog/common/classes/shoppingCart.php
trunk/catalog/common/drivers/DB_Mysql.php
trunk/catalog/includes/application_top.php
trunk/catalog/includes/classes/drivers/data/categorie.php
trunk/catalog/includes/classes/drivers/data/product.php
trunk/catalog/install/data/templates/appareil_photo/electronix/includes/content/home.php
trunk/catalog/install/includes/classes/core.php
trunk/catalog/install/includes/content/core.configuration.php
trunk/catalog/install/includes/content/core.installdb.php
trunk/catalog/install/includes/content/core.modes.php
trunk/catalog/install/includes/content/core.template_sample.php
trunk/catalog/install/includes/functions/database.php
trunk/catalog/install/includes/sql/mysql/tables/osc_address_book.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_address_format.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_admin_groups.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_admin_m_files.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_admin_m_files_to_right.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_admin_notification.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_admin_users.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_categories.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_categories_description.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_categories_extra.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_checknotif.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_cip.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_cip_depend.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_configuration.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_configuration_group.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_configuration_text.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_content.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_content_description.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_content_to_categories.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_countries.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_cronjob.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_currencies.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_customers.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_customers_basket.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_customers_basket_attributes.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_customers_groups.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_customers_info.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_customers_to_extra_fields.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_extra_field_labels.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_extra_field_values.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_extra_fields.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_extra_fields_info.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_full_tag.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_full_tag_description.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_geo_zones.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_holding_orders.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_holding_orders_products.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_holding_orders_products_attributes.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_holding_orders_products_download.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_holding_orders_status_history.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_holding_orders_total.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_languages.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_manufacturers.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_manufacturers_info.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_navigation_links.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_navigation_links_description.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_newsletters.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_newsletters_modeles.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_newsletters_sent.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_orders.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_orders_products.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_orders_products_attributes.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_orders_products_download.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_orders_status_history.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_orders_total.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_am_attributes_to_templates.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_am_templates.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_attributes.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_attributes_download.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_attributes_groups.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_description.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_extra_fields.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_extra_fields_labels.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_extra_fields_values.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_groups.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_options.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_options_values.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_options_values_to_products_options.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_stock.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_to_categories.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_to_products_extra_fields.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_scart.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_seo_cache.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_sessions.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_specials.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_status.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_tax_class.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_tax_rates.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_whos_online.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_zones.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_zones_to_geo_zones.sql
Added Paths:
-----------
trunk/catalog/common/drivers/DB_Mysqli.php
Modified: trunk/catalog/common/classes/shoppingCart.php
===================================================================
--- trunk/catalog/common/classes/shoppingCart.php 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/common/classes/shoppingCart.php 2011-10-12 12:48:13 UTC (rev 3829)
@@ -1,13 +1,12 @@
<?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.0
- *\date 28/11/10, 22:44
- *\author oscim <mail aur...@os...> <www http://www.oscim.fr>
- *\encode UTF-8
- *\file
+ @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 12/10/11, 13:42
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
*\dir common/classes/
*\class shoppingCart
*/
@@ -403,11 +402,11 @@
if ($this->count_contents() > 0) {
reset($this->contents);
while (list($products_id, ) = each($this->contents)) {
- $virtual_products_result = tep_db_query("select * from ".TABLE_PRODUCTS_VIRTUAL." where productsID=".(int)$products_id);
+ $virtual_products_result = tep_db_query("select products_type from ".TABLE_PRODUCTS." where products_id=".(int)$products_id);
if (tep_db_num_rows($virtual_products_result) > 0) {
$res=tep_db_fetch_array($virtual_products_result);
- $array_content_type[] = (in_array($res['typeID'], explode(';',TYPE_VIRTUAL_PRODUCTS)))? 'virtual' : 'physical';
+ $array_content_type[] = (in_array($res['products_type'], explode(';',TYPE_VIRTUAL_PRODUCTS)))? 'virtual' : 'physical';
}
else $array_content_type[] = 'physical';
}
Modified: trunk/catalog/common/drivers/DB_Mysql.php
===================================================================
--- trunk/catalog/common/drivers/DB_Mysql.php 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/common/drivers/DB_Mysql.php 2011-10-12 12:48:13 UTC (rev 3829)
@@ -1,16 +1,43 @@
<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
/**
- @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 13/06/10, 11:26
+ @version 2.1.1
+ @date 12/10/11, 14:42
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
+/**
+ * TYPOlight Open Source CMS
+ * Copyright (C) 2005-2010 Leo Feyer
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program. If not, please visit the Free
+ * Software Foundation website at <http://www.gnu.org/licenses/>.
+ *
+ * PHP version 5
+ * @copyright Leo Feyer 2005-2010
+ * @author Leo Feyer <http://www.typolight.org>
+ * @license LGPL
+ * @filesource
+ */
+
+
+
class DB_Mysql extends database{
/**
@@ -47,20 +74,12 @@
@mysql_query("SET sql_mode=''", $this->resConnection);
@mysql_query("SET NAMES " . parent::CHARSET, $this->resConnection);
if($db)
- $this->db_select();
+ $this->set_database(parent::DB);
}
}
/**
- Select from database
- */
- /*protected*/ function db_select($db=false) {
- return @mysql_select_db( ((!$db)?parent::DB: $db ), $this->resConnection);
- }
-
-
- /**
Disconnect from database
*/
protected function disconnect() {
@@ -108,7 +127,7 @@
foreach ($arrFields as $k=>$v)
{
$arrChunks = preg_split('/(\([^\)]+\))/', $v['Type'], -1, PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY);
-// print_r($arrChunks);
+
$arrReturn[$k]['name'] = $v['Field'];
$arrReturn[$k]['type'] = $arrChunks[0];
Added: trunk/catalog/common/drivers/DB_Mysqli.php
===================================================================
--- trunk/catalog/common/drivers/DB_Mysqli.php (rev 0)
+++ trunk/catalog/common/drivers/DB_Mysqli.php 2011-10-12 12:48:13 UTC (rev 3829)
@@ -0,0 +1,398 @@
+<?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 12/10/11, 14:42
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+
+/**
+ * TYPOlight Open Source CMS
+ * Copyright (C) 2005-2010 Leo Feyer
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program. If not, please visit the Free
+ * Software Foundation website at <http://www.gnu.org/licenses/>.
+ *
+ * PHP version 5
+ * @copyright Leo Feyer 2005-2010
+ * @author Leo Feyer <http://www.typolight.org>
+ * @license LGPL
+ * @filesource
+ */
+
+
+
+/**
+ * Class DB_Mysqlii
+ *
+ * Driver class for MySQLi databases.
+ * @copyright Leo Feyer 2005-2010
+ * @author Leo Feyer <http://www.typolight.org>
+ * @package Driver
+ */
+class DB_Mysqli extends Database
+{
+
+ /**
+ * List tables query
+ * @var string
+ */
+ protected $strListTables = "SHOW TABLES FROM `%s`";
+
+ /**
+ * List fields query
+ * @var string
+ */
+ protected $strListFields = "SHOW COLUMNS FROM `%s`";
+
+
+ /**
+ * Connect to database server and select database
+ */
+ protected function connect($db=true)
+ {
+ @$this->resConnection = new mysqli($GLOBALS['TL_CONFIG']['dbHost'], $GLOBALS['TL_CONFIG']['dbUser'], $GLOBALS['TL_CONFIG']['dbPass'], $GLOBALS['TL_CONFIG']['dbDatabase'], $GLOBALS['TL_CONFIG']['dbPort']);
+ @$this->resConnection->set_charset($GLOBALS['TL_CONFIG']['dbCharset']);
+ }
+
+
+ /**
+ * Disconnect from database
+ */
+ protected function disconnect()
+ {
+ @$this->resConnection->close();
+ }
+
+
+ /**
+ * Return the last error message
+ * @return string
+ */
+ protected function get_error()
+ {
+ return @$this->resConnection->error;
+ }
+
+
+ /**
+ * Return a standardized array with field information
+ *
+ * Standardized format:
+ * - name: field name (e.g. my_field)
+ * - type: field type (e.g. "int" or "number")
+ * - length: field length (e.g. 20)
+ * - precision: precision of a float number (e.g. 5)
+ * - null: NULL or NOT NULL
+ * - default: default value (e.g. "default_value")
+ * - attributes: attributes (e.g. "unsigned")
+ * - index: PRIMARY, UNIQUE or INDEX
+ * - extra: extra information (e.g. auto_increment)
+ * @param string
+ * @return string
+ * @todo Support all kind of keys (e.g. FULLTEXT or FOREIGN).
+ */
+ protected function list_fields($strTable)
+ {
+ $arrReturn = array();
+ $arrFields = $this->execute(sprintf($this->strListFields, $strTable))->fetchAllAssoc();
+
+ foreach ($arrFields as $k=>$v)
+ {
+ $arrChunks = preg_split('/(\([^\)]+\))/', $v['Type'], -1, PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY);
+
+ $arrReturn[$k]['name'] = $v['Field'];
+ $arrReturn[$k]['type'] = $arrChunks[0];
+
+ if (strlen($arrChunks[1]))
+ {
+ $arrChunks[1] = str_replace(array('(', ')'), array('', ''), $arrChunks[1]);
+ $arrSubChunks = explode(',', $arrChunks[1]);
+
+ $arrReturn[$k]['length'] = trim($arrSubChunks[0]);
+
+ if (strlen($arrSubChunks[1]))
+ {
+ $arrReturn[$k]['precision'] = trim($arrSubChunks[1]);
+ }
+ }
+
+ if (strlen($arrChunks[2]))
+ {
+ $arrReturn[$k]['attributes'] = trim($arrChunks[2]);
+ }
+
+ if (strlen($v['Key']))
+ {
+ switch ($v['Key'])
+ {
+ case 'PRI':
+ $arrReturn[$k]['index'] = 'PRIMARY';
+ break;
+
+ case 'UNI':
+ $arrReturn[$k]['index'] = 'UNIQUE';
+ break;
+
+ default:
+ $arrReturn[$k]['index'] = 'KEY';
+ break;
+ }
+ }
+
+ $arrReturn[$k]['null'] = ($v['Null'] == 'YES') ? 'NULL' : 'NOT NULL';
+ $arrReturn[$k]['default'] = $v['Default'];
+ $arrReturn[$k]['extra'] = $v['Extra'];
+ }
+
+ return $arrReturn;
+ }
+
+
+ /**
+ * Change the current database
+ * @param string
+ * @return boolean
+ */
+ protected function set_database($strDatabase)
+ {
+ @$this->resConnection = new mysqli($GLOBALS['TL_CONFIG']['dbHost'], $GLOBALS['TL_CONFIG']['dbUser'], $GLOBALS['TL_CONFIG']['dbPass'], $strDatabase, $GLOBALS['TL_CONFIG']['dbPort']);
+ }
+
+
+ /**
+ * Begin a transaction
+ */
+ protected function begin_transaction()
+ {
+ @$this->resConnection->query("SET AUTOCOMMIT=0");
+ @$this->resConnection->query("BEGIN");
+ }
+
+
+ /**
+ * Commit a transaction
+ */
+ protected function commit_transaction()
+ {
+ @$this->resConnection->query("COMMIT");
+ @$this->resConnection->query("SET AUTOCOMMIT=1");
+ }
+
+
+ /**
+ * Rollback a transaction
+ */
+ protected function rollback_transaction()
+ {
+ @$this->resConnection->query("ROLLBACK");
+ @$this->resConnection->query("SET AUTOCOMMIT=1");
+ }
+
+ /**
+ Alias retro-compatibilité
+ */
+ public function db_input($strString)
+ {
+ return $this->resConnection->real_escape_string($strString) ;
+ }
+}
+
+
+/**
+ * Class DB_Mysqli_Statement
+ *
+ * Driver class for MySQLi databases.
+ * @copyright Leo Feyer 2005-2010
+ * @author Leo Feyer <http://www.typolight.org>
+ * @package Driver
+ */
+class DB_Mysqli_Statement extends Database_Statement
+{
+
+ /**
+ * Prepare a query and return it
+ * @param string
+ */
+ protected function prepare_query($strQuery)
+ {
+ return $strQuery;
+ }
+
+
+ /**
+ * Escape a string
+ * @param string
+ * @return string
+ */
+ protected function string_escape($strString)
+ {
+ return "'" . $this->resConnection->real_escape_string($strString) . "'";
+ }
+
+
+ /**
+ * Limit the current query
+ * @param int
+ * @param int
+ */
+ protected function limit_query($intRows, $intOffset)
+ {
+ $strType = strtoupper(preg_replace('/\s+.*$/is', '', trim($this->strQuery)));
+
+ switch ($strType)
+ {
+ case 'SELECT':
+ $this->strQuery .= sprintf(' LIMIT %d,%d', $intOffset, $intRows);
+ break;
+
+ default:
+ $this->strQuery .= sprintf(' LIMIT %d', $intRows);
+ break;
+ }
+ }
+
+
+ /**
+ * Execute the current query
+ * @return resource
+ */
+ protected function execute_query()
+ {
+ return @$this->resConnection->query($this->strQuery);
+ }
+
+
+ /**
+ * Return the last error message
+ * @return string
+ */
+ protected function get_error()
+ {
+
+ oscss_db_error($this->strQuery, 0, @$this->resConnection->error);
+// return @$this->resConnection->error;
+ }
+
+
+ /**
+ * Return the number of affected rows
+ * @return int
+ */
+ protected function affected_rows()
+ {
+ return @$this->resConnection->affected_rows;
+ }
+
+
+ /**
+ * Return the last insert ID
+ * @return int
+ */
+ protected function insert_id()
+ {
+ return @$this->resConnection->insert_id;
+ }
+
+
+ /**
+ * Explain the current query
+ * @return array
+ */
+ protected function explain_query()
+ {
+ return @$this->resConnection->query('EXPLAIN ' . $this->strQuery)->fetch_assoc();
+ }
+}
+
+
+/**
+ * Class DB_Mysqli_Result
+ *
+ * Driver class for MySQLi databases.
+ * @copyright Leo Feyer 2005-2010
+ * @author Leo Feyer <http://www.typolight.org>
+ * @package Driver
+ */
+class DB_Mysqli_Result extends Database_Result
+{
+
+ /**
+ * Fetch the current row as enumerated array
+ * @return array
+ */
+ protected function fetch_row()
+ {
+ return @$this->resResult->fetch_row();
+ }
+
+
+ /**
+ * Fetch the current row as associative array
+ * @return array
+ */
+ protected function fetch_assoc()
+ {
+ return @$this->resResult->fetch_assoc();
+ }
+
+
+ /**
+ * Return the number of rows of the current result
+ * @return int
+ */
+ protected function num_rows()
+ {
+ return @$this->resResult->num_rows;
+ }
+
+
+ /**
+ * Return the number of fields of the current result
+ * @return int
+ */
+ protected function num_fields()
+ {
+ return @$this->resResult->field_countmysql;
+ }
+
+
+ /**
+ * Get column information
+ * @param int
+ * @return object
+ */
+ protected function fetch_field($intOffset)
+ {
+ return @$this->resResult->fetch_field_direct($intOffset);
+ }
+
+
+ /**
+ * Free the current result
+ */
+ public function free()
+ {
+ if (is_object($this->resResult))
+ {
+ @$this->resResult->free();
+ }
+ }
+}
+
+?>
\ No newline at end of file
Modified: trunk/catalog/includes/application_top.php
===================================================================
--- trunk/catalog/includes/application_top.php 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/includes/application_top.php 2011-10-12 12:48:13 UTC (rev 3829)
@@ -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 12/10/11, 13:43
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*\file application_top.php
@@ -93,7 +93,7 @@
include(DIR_WS_INCLUDES . 'inc_base_lib.php');
if(OSCSS_GARBAGE_ERROR == true){
- if (_cst_bool('STORE_PAGE_PARSE_STOCK_ERROR')) $errorHandler->attachFileWriter('sessions/err-php.log');
+ if (_cst_bool('STORE_PAGE_PARSE_STOCK_ERROR')) $errorHandler->attachFileWriter(DIR_FS_ROOT_DOCS.'public_err-php.log');
if (_cst_bool('STORE_PAGE_PARSE_EMAIL_OWNER')) $errorHandler->attachMailWriter(STORE_OWNER_EMAIL_ADDRESS);
}
Modified: trunk/catalog/includes/classes/drivers/data/categorie.php
===================================================================
--- trunk/catalog/includes/classes/drivers/data/categorie.php 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/includes/classes/drivers/data/categorie.php 2011-10-12 12:48:13 UTC (rev 3829)
@@ -264,39 +264,20 @@
* @param $value bool si false, sortie string "cPath=1_3" si true, sortie string "1_3"
*/
public static function get_path($current_category_id = '',$value=false) {
- global $cPath_array;
+ global $cPath_array;
- if (tep_not_null($current_category_id)) {
- $cp_size = sizeof($cPath_array);
- if ($cp_size == 0) {
- $cPath_new = $current_category_id;
- } else {
- $cPath_new = '';
- $last_category_query = tep_db_query("select parent_id from " . TABLE_CATEGORIES . " where categories_id = '" . (int)$cPath_array[($cp_size-1)] . "'");
- $last_category = tep_db_fetch_array($last_category_query);
+ if (tep_not_null($current_category_id)) {
- $current_category_query = tep_db_query("select parent_id from " . TABLE_CATEGORIES . " where categories_id = '" . (int)$current_category_id . "'");
- $current_category = tep_db_fetch_array($current_category_query);
+ $cPath_array = array();
+ self::get_parent_categories(&$cPath_array, $current_category_id) ;
+ $cPath_array[] = $current_category_id;
+ $cPath_new = implode('_', $cPath_array);
+ }
+ elseif(isset($cPath_array) && is_array($cPath_array)){
+ $cPath_new = implode('_', $cPath_array);
+ }
- if ($last_category['parent_id'] == $current_category['parent_id']) {
- for ($i=0; $i<($cp_size-1); $i++) {
- $cPath_new .= '_' . $cPath_array[$i];
- }
- } else {
- for ($i=0; $i<$cp_size; $i++) {
- $cPath_new .= '_' . $cPath_array[$i];
- }
- }
- $cPath_new .= '_' . $current_category_id;
- if (substr($cPath_new, 0, 1) == '_') {
- $cPath_new = substr($cPath_new, 1);
- }
- }
- } else {
- $cPath_new = implode('_', $cPath_array);
- }
-
if ($value) return 'cPath=' . $cPath_new;
else return $cPath_new;
}
Modified: trunk/catalog/includes/classes/drivers/data/product.php
===================================================================
--- trunk/catalog/includes/classes/drivers/data/product.php 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/includes/classes/drivers/data/product.php 2011-10-12 12:48:13 UTC (rev 3829)
@@ -1,12 +1,12 @@
<?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 15/12/10, 11:33
- \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
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 12/10/11, 13:40
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
Prise en charge des product
@@ -302,8 +302,8 @@
*/
protected static function cstr_query($orderby='', $limit='', $option=''){
- $query="SELECT distinct p.products_id, pd.products_name, pd.products_description, p.products_model, p.products_quantity, p.products_image, pd.products_url, p.products_price,p.track_stock, p.products_tax_class_id, p.products_date_added, p.products_date_available, p.manufacturers_id, pd.products_viewed, p2c.categories_id, p.products_weight, IF(pv.typeID, pv.typeID, 1) as type
- FROM " . TABLE_PRODUCTS . " p left join ".TABLE_PRODUCTS_VIRTUAL." pv on p.products_id = pv.productsID , " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c, " . TABLE_CATEGORIES . " c
+ $query="SELECT distinct p.products_id, pd.products_name, pd.products_description, p.products_model, p.products_quantity, p.products_image, pd.products_url, p.products_price,p.track_stock, p.products_tax_class_id, p.products_date_added, p.products_date_available, p.manufacturers_id, pd.products_viewed, p2c.categories_id, p.products_weight, products_type as type
+ FROM " . TABLE_PRODUCTS . " p , " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c, " . TABLE_CATEGORIES . " c
WHERE p.products_status = '1' and pd.products_id = p.products_id and pd.language_id = '" . self::$lg_id . "' and p2c.products_id=p.products_id and c.categories_id=p2c.categories_id and c.categories_status='1' " ;
$query .=self::$where_query;
@@ -787,11 +787,11 @@
if(isset(productData::$array_data[(int)$_GET['products_id']]) ) return productData::$array_data[(int)$_GET['products_id']];
- $sql = "select * from ".TABLE_PRODUCTS_VIRTUAL." where productsID=".(int)$_GET['products_id'];
+ $sql = "select products_type from ".TABLE_PRODUCTS." where products_id=".(int)$_GET['products_id'];
$result = tep_db_query($sql);
if (tep_db_num_rows($result) > 0) { // this product is in the virtual table
$virtual = tep_db_fetch_array($result);
- $this->type_flag= $virtual['typeID'];
+ $this->type_flag= $virtual['products_type'];
}
else $this->type_flag=1;
productData::$array_data[(int)$_GET['products_id']] = $this->type_flag;
Modified: trunk/catalog/install/data/templates/appareil_photo/electronix/includes/content/home.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/electronix/includes/content/home.php 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/install/data/templates/appareil_photo/electronix/includes/content/home.php 2011-10-12 12:48:13 UTC (rev 3829)
@@ -16,7 +16,7 @@
<div class="top_prod_box_big"></div>
<div class="center_prod_box_big">
<p class="customerGreeting"><?php echo tep_customer_greeting(); ?></p>
- <div class="textMain"><?php printf(TEXT_MAIN, PROJECT_VERSION ; ?></div>
+ <div class="textMain"><?php printf(TEXT_MAIN, PROJECT_VERSION ) ; ?></div>
</div>
<div class="bottom_prod_box_big"></div>
</div>
Modified: trunk/catalog/install/includes/classes/core.php
===================================================================
--- trunk/catalog/install/includes/classes/core.php 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/install/includes/classes/core.php 2011-10-12 12:48:13 UTC (rev 3829)
@@ -153,6 +153,10 @@
$this->db['DB_SERVER_PASSWORD'] = trim(stripslashes($_POST['DB_SERVER_PASSWORD']));
$this->db['DB_DATABASE'] = trim(stripslashes($_POST['DB_DATABASE']));
$this->db['DB_TABLE_PREFIX'] = trim($_POST['DB_TABLE_PREFIX']);
+ $this->db['DBMOTOR'] = trim(stripslashes($_POST['DBMOTOR']));
+ $this->db['DBMOTOR_CHARSET'] = trim(stripslashes($_POST['DBMOTOR_CHARSET']));
+ $this->db['DBMOTOR_PORT'] = trim(stripslashes($_POST['DBMOTOR_PORT']));
+ $this->db['DBMOTOR_TYPE'] = trim($_POST['DBMOTOR_TYPE']);
}
/**
Modified: trunk/catalog/install/includes/content/core.configuration.php
===================================================================
--- trunk/catalog/install/includes/content/core.configuration.php 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/install/includes/content/core.configuration.php 2011-10-12 12:48:13 UTC (rev 3829)
@@ -561,7 +561,8 @@
*/
private function tep_call_function($function, $parameter, $object = '') {
$this->get_db_conf();
- osc_db_connect($this->db['DB_SERVER'], $this->db['DB_SERVER_USERNAME'], $this->db['DB_SERVER_PASSWORD']);
+ osc_db_connect($this->db['DBMOTOR'], $this->db['DBMOTOR_PORT'],$this->db['DBMOTOR_CHARSET'],$this->db['DB_SERVER'], $this->db['DB_SERVER_USERNAME'], $this->db['DB_SERVER_PASSWORD'],strtolower( $this->db['DBMOTOR_TYPE']) );
+
osc_db_select_db($thi...
[truncated message content] |
|
From: <os...@us...> - 2011-10-18 08:40:30
|
Revision: 3831
http://oscss.svn.sourceforge.net/oscss/?rev=3831&view=rev
Author: oscim
Date: 2011-10-18 08:40:21 +0000 (Tue, 18 Oct 2011)
Log Message:
-----------
correction coquille
amelioration souplesse gestion
Ajout methode class page, alias de function duplication des the_var par GetVar
Ajout var pour transmission element interne au template
Modified Paths:
--------------
trunk/catalog/common/classes/language.php
trunk/catalog/includes/classes/breadcrumb.php
trunk/catalog/includes/classes/core_page/customer.php
trunk/catalog/includes/classes/drivers/data/content.php
trunk/catalog/includes/classes/drivers/page/GabaritTemplate.php
trunk/catalog/includes/classes/page.php
trunk/catalog/password_forgotten.php
Added Paths:
-----------
trunk/catalog/install/includes/sql/mysql/data/40_osc_admin_users.sql
trunk/catalog/install/includes/sql/mysql/data/91_osc_admin_m_files.sql
Removed Paths:
-------------
trunk/catalog/install/includes/sql/mysql/data/40_osc_admin.sql
trunk/catalog/install/includes/sql/mysql/data/91_osc_admin_files.sql
Modified: trunk/catalog/common/classes/language.php
===================================================================
--- trunk/catalog/common/classes/language.php 2011-10-15 08:25:28 UTC (rev 3830)
+++ trunk/catalog/common/classes/language.php 2011-10-18 08:40:21 UTC (rev 3831)
@@ -3,12 +3,14 @@
@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
+ @version 2.1.1
@date 03/03/11, 15:51
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class language
@brief load langue
+ @note
+ 18/09/2011 Add compatibility OSCSS_ALTERNATE
*/
class language {
@@ -173,6 +175,7 @@
private static function check_langue($directory,$public){
$base=(!$public)? DIR_FS_ADMIN : DIR_FS_CATALOG ;
if(is_dir($base.DIR_WS_LANGUAGES.$directory)) return true;
+ elseif(tep_cst_define('OSCSS_ALTERNATE') == true && is_dir(CORE_PATH.DIR_WS_LANGUAGES.$directory)) return true;
return false;
}
}
Modified: trunk/catalog/includes/classes/breadcrumb.php
===================================================================
--- trunk/catalog/includes/classes/breadcrumb.php 2011-10-15 08:25:28 UTC (rev 3830)
+++ trunk/catalog/includes/classes/breadcrumb.php 2011-10-18 08:40:21 UTC (rev 3831)
@@ -1,12 +1,12 @@
<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
/**
- *\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/11/10, 08:18
- *\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
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 13/10/11, 22:54
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
*\ingroup FrontClass
*\file breadcrumb.php
*\class breadcrumb
@@ -16,27 +16,32 @@
*/
class breadcrumb{
/**
- *
+ *
* @var $_trail array
*/
protected $_trail;
/**
- *
+ @brief reset all, or row for id
*/
- function breadcrumb() {
- $this->reset();
+ function reset($id=0) {
+ if($id>0) {
+ $id = $id-1;
+ unset($this->_trail[$id]);
+ sort($this->_trail);
+ }
+ elseif($id==0) $this->_trail = array();
}
/**
- *
+ *
*/
function reset() {
$this->_trail = array();
}
/**
- *
+ *
* @param $title
* @param $link
*/
@@ -45,7 +50,7 @@
}
/**
- *
+ *
* @param $separator
* @return string
*/
Modified: trunk/catalog/includes/classes/core_page/customer.php
===================================================================
--- trunk/catalog/includes/classes/core_page/customer.php 2011-10-15 08:25:28 UTC (rev 3830)
+++ trunk/catalog/includes/classes/core_page/customer.php 2011-10-18 08:40:21 UTC (rev 3831)
@@ -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 29/01/11, 10:55
+ @version 2.1.1
+ @date 17/10/11, 11:03
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@Class customer
@@ -931,7 +931,7 @@
@param logon adjust date logon
*/
static public function initSession($user, $logon = true){
- global $cart;
+ global $cart,$customer_id;
$DB=Database::getInstance();
if (_cst_bool('SESSION_RECREATE')) tep_session_recreate();
Modified: trunk/catalog/includes/classes/drivers/data/content.php
===================================================================
--- trunk/catalog/includes/classes/drivers/data/content.php 2011-10-15 08:25:28 UTC (rev 3830)
+++ trunk/catalog/includes/classes/drivers/data/content.php 2011-10-18 08:40:21 UTC (rev 3831)
@@ -93,7 +93,7 @@
*/
public static function get_query($id='',$search='',$exclude='',$option=array()){ global $languages_id; return contentData::get_query($id,$search,$exclude,$option); }
- public static function get_item($id){ return contentData::get_item($id); }
+ public static function get_item($id,$option=array()){ return contentData::get_item($id,$option); }
public static function get_content_cat($id){ return contentData::get_content_cat($id); }
public static function get_content_path($id){ return contentData::get_content_path($id); }
public static function get_content_in_cat($current_category_id=0, $exclude=''){ return contentData::get_content_in_cat($current_category_id=0, $exclude=''); }
@@ -142,7 +142,10 @@
$DB=Database::getInstance();
self::$obj_language = $DB->query("select code from " . TABLE_LANGUAGES . " where languages_id='" .self::$lg_id . "'");
- if(!empty($option) && is_array($option)) self::$opt=$option;
+ if(!empty($option) && is_array($option)) {
+ self::$opt=$option;
+ self::$cache=array();
+ }
}
@@ -205,7 +208,7 @@
Requeteur
*/
protected static function cstr_query($orderby='', $limit='', $option=''){
- $query="SELECT content_title AS title, c.content_id AS id, c.content_name AS name, content_text AS text
+ $query="SELECT content_title AS title, c.content_id AS id, c.content_name AS name, content_text AS text, c.date_added as date_added
FROM " . TABLE_CONTENT_DESCRIPTION . " cd, " . TABLE_CONTENT . " c, " . TABLE_CONTENT_TO_CATEGORIES . " ctc, " . TABLE_CATEGORIES . " cat
WHERE cat.categories_id=ctc.categories_id and cat.categories_status='1' AND c.content_status = '1' AND c.content_id = ctc.content_id AND cd.content_id = ctc.content_id AND cd.language_id = '" . self::$lg_id . "' " ;
@@ -235,8 +238,10 @@
self::extract_img($id,$content,$pattern);
$sortie=(isset(self::$opt['img']) && !_test_bool(self::$opt['img']))? preg_replace($pattern, '', $content) : $content;
- $sortie=(isset(self::$opt['more']) && _test_bool(self::$opt['more']))? substr($sortie, 0, strpos($sortie,'<!-- pagebreak -->')) : $sortie;
-
+ if(isset(self::$opt['more']) && _test_bool(self::$opt['more'])){
+ if(strpos($sortie,'<!-- pagebreak -->') > 0)
+ $sortie = substr($sortie, 0, strpos($sortie,'<!-- pagebreak -->'));
+ }
/// process replace in text the var config in constante
$pattern = "/%_.*_%/i";
preg_match_all($pattern, $sortie, $replace,PREG_OFFSET_CAPTURE);
@@ -315,9 +320,10 @@
/**
Alias unique ID
*/
- public static function get_item($id){
- $db_list=self::get_query($id);
+ public static function get_item($id,$option=array()){
+ $db_list=self::get_query($id,'','',$option);
+
if(is_numeric($id) && isset($db_list[(int)$id])){
return $db_list[$id];
}else{
Modified: trunk/catalog/includes/classes/drivers/page/GabaritTemplate.php
===================================================================
--- trunk/catalog/includes/classes/drivers/page/GabaritTemplate.php 2011-10-15 08:25:28 UTC (rev 3830)
+++ trunk/catalog/includes/classes/drivers/page/GabaritTemplate.php 2011-10-18 08:40:21 UTC (rev 3831)
@@ -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 17/07/11, 10:15
+ @version 2.1.1
+ @date 17/10/11, 10:44
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class GabaritTemplate
@@ -169,18 +169,18 @@
\fn GabaritTemplate::GetFooter()
\brief choose file for include
*/
- protected static function GetFooter(){
+ protected static function GetFooter($path='footer'){
global $page;
- return $page->getPathTemplate().'footer.php';
+ return $page->getPathTemplate().$path.'.php';
}
/**
\fn GabaritTemplate::GetFooter()
\brief choose file for include
*/
- protected static function GetHeader(){
+ protected static function GetHeader($path='header'){
global $page;
- return $page->getPathTemplate().'header.php';
+ return $page->getPathTemplate().$path.'.php';
}
/**
@@ -197,11 +197,11 @@
\brief choose file for include
@param $bar string bar le nom du fichier a inclure (par defaut sidebar) sans extension
*/
- protected static function GetSidebar($bar='sidebar'){
+ protected static function GetSidebar($path='sidebar'){
// report des var d'enviroennement
global $page;
- return $page->getPathTemplate().$bar.'.php';
+ return $page->getPathTemplate().$path.'.php';
}
}
?>
\ No newline at end of file
Modified: trunk/catalog/includes/classes/page.php
===================================================================
--- trunk/catalog/includes/classes/page.php 2011-10-15 08:25:28 UTC (rev 3830)
+++ trunk/catalog/includes/classes/page.php 2011-10-18 08:40:21 UTC (rev 3831)
@@ -4,7 +4,7 @@
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 10/10/11, 22:04
+ @date 17/10/11, 10:44
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
\class page
@@ -26,58 +26,61 @@
@var generic var for call constructeur
*/
public $page;
-
+ /**
+ @var
+ */
public $oscss_boxes;
-
/**
- \brief public Contient les propriete des element devant être remplacé dans les pages
+ @var public Contient les propriete des element devant être remplacé dans les pages
*/
public $propriete = array();
-
+ /**
+ @var
+ */
public $currencies;
/**
- \brief Title intermediarire
+ @var Title intermediarire
*/
public $title;
-
/**
- \brief Array file lang (.txt)
-
+ @var Array file lang (.txt)
*/
private $PileFileLang=array();
/**
- Array file exist cache
-
+ @var Array file exist cache
*/
private static $PileFile=array();
/**
- \brief Array cache global
-
+ @var Array cache global
*/
protected static $GlobalCache=array();
/**
- @p object cache global
-
+ @var object cache global
*/
private static $objCache;
/**
- @p bool admin liaison base
-
+ @var bool admin liaison base
*/
private static $CookieAdmin;
/**
- @a string res md5 url en cours
- public
+ @var string res md5 url en cours
*/
public static $keyCacheName;
/**
- @a bool recalcul mode
- public
+ @var $CacheCalcul public bool recalcul mode
*/
public static $CacheCalcul;
-
+ /**
+ @var $load_theme for specific usage in template, and transport var in template file
+ */
+ protected static $load_theme;
+ /**
+ @var
+ */
private $file_registered;
-
+ /**
+ @var
+ */
protected static $_instance;
@@ -306,6 +309,7 @@
}
+
/**
@brief function d'inititalisation du theme public, via mecanisme drivers
Cette fonction charge le init du theme lors de l'appel au gabarit du template.
@@ -321,19 +325,21 @@
$current_category_id=$this->ret_var_page('current_category_id');
$languages_id=$this->ret_var_page('languages_id');
+ $load = self::$load_theme ;
+
$init_theme=call_user_func(array(PUBLIC_DRIVERS_PAGE,'GetInit'));
if(self::TestFile($init_theme)) include($init_theme);
+ self::$load_theme = $load;
}
-
-
/**
- * \fn draw_file_header()
- * \brief Seul les variables global (GET,POST,etc) et l'object this sont accessible dans les fichiers appelé par cette fcuntion
+ @fn draw_file_header()
+ @brief Seul les variables global (GET,POST,etc) et l'object this sont accessible dans les fichiers appelé par cette fcuntion
Fonction appelé dans le header des themes
+ @param $StringGet
*/
- private function draw_file_header(){
+ private function draw_file_header($StringGet=''){
$page=$this;
$language=$this->page['language'];
@@ -342,6 +348,9 @@
$current_category_id=$this->ret_var_page('current_category_id');
$languages_id=$this->ret_var_page('languages_id');
+ $load = self::$load_theme;
+ foreach( tep_extrac_querystring($StringGet) as $k =>$v)
+ $load->$k = $v;
/* chargement des js en sortie*/
$this->javascript->cstr_header();
@@ -369,6 +378,10 @@
*/
$file=DIR_WS_INCLUDES.'js/'.$this->page_content_clean().'.js.php';
if( ($file=self::fix_file($file)) && $file !=false ) tep_include_file($file);
+
+
+
+ self::$load_theme = $load;
}
@@ -478,6 +491,11 @@
//! Class permanente
$this->new_class('oscss_modules');
$this->new_class('oscss_boxes');
+
+
+ // init local object specific theme
+ self::$load_theme = new stdClass;
+ return self::$load_theme;
}
/**
@@ -659,9 +677,7 @@
@return string path template/name/template.php
*/
public function path_gabarit(){
- /// load init Theme
$this->LoadInitTheme();
- /// retrun path string
return $this->getPathTemplate().$this->page['gabarit'];
}
@@ -701,12 +717,14 @@
@return value/false
*/
public function the_var($key){ return $this->ret_var_page($key); }
+ public function GetVar($key){ return $this->ret_var_page($key); }
/**
@fn the_template()
\brief Nom du template
*/
public function the_template(){ return $this->page['template']; }
+ public function GetTemplate(){ return $this->page['template']; }
/**
@fn the_content($court=false)
@@ -726,8 +744,15 @@
\brief retourne le type de page
*/
public function the_type(){ return (isset($this->page['type'])? $this->page['type'] : 'none') ; }
+ public function GetPageType(){ return (isset($this->page['type'])? $this->page['type'] : 'none') ; }
/**
+ @fn GetThemeLoad()
+ \brief retrun load_theme object
+ */
+ public function GetThemeLoad(){ return self::$load_theme; }
+
+ /**
@fn the_typeClass()
\brief retourne le type class de page
*/
@@ -815,10 +840,11 @@
/**
- \fn tep_get_header()
- \brief draw header
+ @fn tep_get_header()
+ @brief draw header
+ @param $opt transmis au fichier header du template
*/
- public function tep_get_header(){
+ public function tep_get_header($bar='header'){
//! report des var d'enviroennement
global $lang;
@@ -829,6 +855,11 @@
$current_category_id=$this->ret_var_page('current_category_id');
$languages_id=$this->ret_var_page('languages_id');
+ $load = self::$load_theme;
+// foreach( tep_extrac_querystring($StringGet) as $k =>$v)
+// $load->$k = $v;
+
+
/**
\brief Langue specifique au template
\note specifique text __()
@@ -892,10 +923,18 @@
}
$this->page['the_title']=(tep_not_null($the_title)? $the_title : (tep_not_null($this->title)? $this->title: STORE_NAME));
- $file=call_user_func(array(PUBLIC_DRIVERS_PAGE,'GetHeader'));
+
+
+
+ $file=call_user_func(array(PUBLIC_DRIVERS_PAGE,'GetHeader'),$bar);
if(self::TestFile($file)) include($file);
+ // report file in liste
+ $load->lists_file[__FUNCTION__][] = $bar;
+
+ self::$load_theme = $load;
/**
+ @remarks specific menu admin for front loggued admin
*/
if(self::$CookieAdmin)
echo '<div class="osCSS_Admin" style="position:absolute; right:20px; top:0;">'.
@@ -911,6 +950,7 @@
@param $bar string bar le nom du fichier a inclure (par defaut sidebar) sans extension
*/
public function tep_get_sidebar($bar='sidebar'){
+
// report des var d'enviroennement
$page=$this;
$language=$this->page['language'];
@@ -921,16 +961,27 @@
$currencies=$page->currencies;
$request_type=$page->ret_var_page('request_type');
+ $load = self::$load_theme;
+
$file=call_user_func(array(PUBLIC_DRIVERS_PAGE,'GetSidebar'),$bar);
if(self::TestFile($file)) require_once($file);
+
+ // report file in liste
+ $load->lists_file[__FUNCTION__][] = $bar;
+
+ self::$load_theme = $load;
}
/**
\fn tep_get_footer()
\brief draw footer
*/
- public function tep_get_footer(){
+ public function tep_get_footer($bar='footer'){
$page=$this;
+
+ $load = self::$load_theme;
+
+
if ($this->page['var']['develop']=='true') $this->develop();
$plugins=$this->the_var('plugins');
@@ -949,8 +1000,10 @@
$this->javascript->add_multi($fct());
}
}
- $file=call_user_func(array(PUBLIC_DRIVERS_PAGE,'GetFooter'));
+ $file=call_user_func(array(PUBLIC_DRIVERS_PAGE,'GetFooter'),$bar);
if(self::TestFile($file)) require_once($file);
+
+ self::$load_theme = $load;
}
Deleted: trunk/catalog/install/includes/sql/mysql/data/40_osc_admin.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/data/40_osc_admin.sql 2011-10-15 08:25:28 UTC (rev 3830)
+++ trunk/catalog/install/includes/sql/mysql/data/40_osc_admin.sql 2011-10-18 08:40:21 UTC (rev 3831)
@@ -1,25 +0,0 @@
-#+#######################################################################+
-#| osCSS Open Source E-commerce |
-#+#######################################################################+
-#| Copyright (c) 2005-2011 The osCSS developers |
-#| |
-#| http://www.oscss.org |
-#| Portions Copyright (c) 2003 osCommerce |
-#+#######################################################################+
-#| This source file is subject to version 2.0 of the GPL license, |
-#| available at the following url: |
-#| http://www.oscss.org/license/2_0.txt. |
-#+#######################################################################+
-
-# NOTE: * Please make any modifications to this file by hand!
-# * DO NOT use a mysqldump created file for new changes!
-# * Please take note of the table structure, and use this
-# structure as a standard for future modifications!
-# * Any tables you add here should be added in admin/backup.php
-# and in catalog/install/includes/functions/database.php
-# * Comments should be like these, full line comments.
-# (don't use inline comments '--', but use #)
-
-
-insert into osc_admin (admin_id, admin_groups_id, admin_firstname, admin_lastname, admin_email_address, admin_password, admin_created, admin_modified, admin_logdate, admin_lognum) values ('1', '1', 'AdminFirstname', 'AdminLastname', 'admin@localhost', '351683ea4e19efe34874b501fdbf9792:9b', NOW(), '1000-01-01 00:00:00', NOW(), '0');
-
Added: trunk/catalog/install/includes/sql/mysql/data/40_osc_admin_users.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/data/40_osc_admin_users.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/data/40_osc_admin_users.sql 2011-10-18 08:40:21 UTC (rev 3831)
@@ -0,0 +1,25 @@
+#+#######################################################################+
+#| osCSS Open Source E-commerce |
+#+#######################################################################+
+#| Copyright (c) 2005-2011 The osCSS developers |
+#| |
+#| http://www.oscss.org |
+#| Portions Copyright (c) 2003 osCommerce |
+#+#######################################################################+
+#| This source file is subject to version 2.0 of the GPL license, |
+#| available at the following url: |
+#| http://www.oscss.org/license/2_0.txt. |
+#+#######################################################################+
+
+# NOTE: * Please make any modifications to this file by hand!
+# * DO NOT use a mysqldump created file for new changes!
+# * Please take note of the table structure, and use this
+# structure as a standard for future modifications!
+# * Any tables you add here should be added in admin/backup.php
+# and in catalog/install/includes/functions/database.php
+# * Comments should be like these, full line comments.
+# (don't use inline comments '--', but use #)
+
+
+insert into osc_admin_users (admin_id, admin_groups_id, admin_firstname, admin_lastname, admin_email_address, admin_password, admin_created, admin_modified, admin_logdate, admin_lognum) values ('1', '1', 'AdminFirstname', 'AdminLastname', 'admin@localhost', '351683ea4e19efe34874b501fdbf9792:9b', NOW(), '1000-01-01 00:00:00', NOW(), '0');
+
Deleted: trunk/catalog/install/includes/sql/mysql/data/91_osc_admin_files.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/data/91_osc_admin_files.sql 2011-10-15 08:25:28 UTC (rev 3830)
+++ trunk/catalog/install/includes/sql/mysql/data/91_osc_admin_files.sql 2011-10-18 08:40:21 UTC (rev 3831)
@@ -1,134 +0,0 @@
-#+#######################################################################+
-#| osCSS Open Source E-commerce |
-#+#######################################################################+
-#| Copyright (c) 2005-2011 The osCSS developers |
-#| |
-#| http://www.oscss.org |
-#| Portions Copyright (c) 2003 osCommerce |
-#+#######################################################################+
-#| This source file is subject to version 2.0 of the GPL license, |
-#| available at the following url: |
-#| http://www.oscss.org/license/2_0.txt. |
-#+#######################################################################+
-
-# NOTE: * Please make any modifications to this file by hand!
-# * DO NOT use a mysqldump created file for new changes!
-# * Please take note of the table structure, and use this
-# structure as a standard for future modifications!
-# * Any tables you add here should be added in admin/backup.php
-# and in catalog/install/includes/functions/database.php
-# * Comments should be like these, full line comments.
-# (don't use inline comments '--', but use #)
-
-
-
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (1, 'configuration.php', 1, 0, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (2, 'catalog.php', 1, 0, '1,2');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (3, 'customers.php', 1, 0, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (4, 'modules.php', 1, 0, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (6, 'tools.php', 1, 0, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (5, 'parameters.php', 1, 0, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (7, 'administrator.php', 1, 0, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (8, 'cms.php', 1, 0, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (9, 'hidden.php', 1, 0, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (10, 'commercial.php', 1, 0, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (11, 'return_product.php', 0, 1, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (12, 'returns_invoice.php', 0, 1, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (13, 'returns_packingslip.php', 0, 1, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (14, 'attributeManager.php', 0, 1, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (15, 'products_cross.php', 0, 1, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (16, 'graphs_stats.php', 0, 1, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (17, 'ajax.php', 0, 1, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (18, 'qtprodoctor.php', 0, 1, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (19, 'sitemonitor.php', 0, 1, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (20, 'coupons_exclusions.php', 0, 1, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (21, 'stock.php', 0, 1, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (22, 'sitemaps.php', 0, 1, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (23, 'aca_portfolio.php', 0, 1, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (24, 'sales_stats.php', 0, 1, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (25, 'aca.php', 0, 1, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (26, 'mail.php', 0, 1, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (27, 'rss.php', 0, 1, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (28, 'tinybrowser.php', 0, 1, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (29, 'package.php', 0, 1, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (30, 'admin_members.php', 0, 1, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (31, 'config_110.php', 0, 8, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (32, 'configuration.php?gparentID=110&gID=25', 0, 4, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (33, 'configuration.php?gparentID=110&gID=31', 0, 4, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (34, 'configuration.php?gparentID=110&gID=1', 0, 4, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (35, 'configuration.php?gparentID=110&gID=2', 0, 4, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (36, 'configuration.php?gparentID=110&gID=28', 0, 4, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (37, 'configuration.php?gparentID=110&gID=30', 0, 4, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_...
[truncated message content] |
|
From: <os...@us...> - 2011-10-20 20:50:31
|
Revision: 3836
http://oscss.svn.sourceforge.net/oscss/?rev=3836&view=rev
Author: oscim
Date: 2011-10-20 20:50:22 +0000 (Thu, 20 Oct 2011)
Log Message:
-----------
Nombreuse petite correction
nettoyage diverse , suite centralisation a travers les drivers sql du BO. (Ajout de class en cours de dev)
Refonte du js du panier en ajax, et amelioration calcul ligne et totaux globaux
Ajout de la vue des frais de ports dans le panier
Suite ajout element manquant du template
Suppression du core des lib.xx functions appartenant ?\195?\160 la gestion des bannieres, report dans le modules correspondants
Modified Paths:
--------------
trunk/catalog/admin/includes/database_tables.php
trunk/catalog/admin/includes/functions/general.php
trunk/catalog/admin/includes/functions/lib.orders.php
trunk/catalog/admin/includes/gabarit/header_tags.listing.gab
trunk/catalog/admin/includes/languages/fr_FR/modules/aca_header_tags.txt
trunk/catalog/admin/includes/languages/fr_FR/widget/brief_config.txt
trunk/catalog/admin/includes/modules/pages/orders.php
trunk/catalog/admin/includes/widget/brief_config.php
trunk/catalog/ajax_exe.php
trunk/catalog/common/classes/price.php
trunk/catalog/common/classes/shoppingCart.php
trunk/catalog/includes/classes/page.php
trunk/catalog/includes/content/shopping_cart.php
trunk/catalog/includes/js/shopping_cart.js.php
trunk/catalog/includes/languages/fr_FR/shopping_cart.php
trunk/catalog/includes/modules/order_total/ot_shipping.php
trunk/catalog/index.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/shopping_cart.php
trunk/catalog/install/includes/content/core.configuration.php
Added Paths:
-----------
trunk/catalog/admin/includes/classes/drivers/sqladminmenu.php
trunk/catalog/admin/includes/classes/drivers/sqlimage.php
trunk/catalog/admin/includes/classes/drivers/sqlorder.php
trunk/catalog/includes/languages/fr_FR/triggers/
trunk/catalog/includes/languages/fr_FR/triggers/cart_totaux.txt
trunk/catalog/includes/triggers/cart_line.inc
trunk/catalog/includes/triggers/cart_totaux.inc
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/generic/lazyload/includes_header.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/generic/lazyload/lib/
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/generic/slider/images/
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/generic/slider/inc/
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/generic/slider/includes_header.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/product/slimbox/inc/
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/product/slimbox/includes_header.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/product/uicoretabs/includes_header.php
Removed Paths:
-------------
trunk/catalog/admin/includes/functions/lib.banner_manager.php
trunk/catalog/admin/includes/functions/lib.banner_statistics.php
trunk/catalog/content.php
trunk/catalog/includes/triggers/shopping_cart.inc
Added: trunk/catalog/admin/includes/classes/drivers/sqladminmenu.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqladminmenu.php (rev 0)
+++ trunk/catalog/admin/includes/classes/drivers/sqladminmenu.php 2011-10-20 20:50:22 UTC (rev 3836)
@@ -0,0 +1,251 @@
+<?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 22/09/11, 20:11
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class sqladminmenu
+ @brief Manage delete/update/insert in table admin groupe
+
+TODO :
+
+ EN cours de dev
+
+
+CREATE TABLE IF NOT EXISTS `osc_admin_m_menu` (
+ `rowid` int(11) NOT NULL AUTO_INCREMENT,
+ `admin_url` varchar(128) NOT NULL COMMENT 'fichier, avec get',
+ `sort_order` int(11) NOT NULL,
+ `parent_id` int(11) NOT NULL,
+ PRIMARY KEY (`rowid`),
+ UNIQUE KEY `admin_files_name` (`admin_url`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=115 ;
+
+-- --------------------------------------------------------
+
+--
+-- Structure de la table `osc_admin_m_menu_description`
+--
+
+CREATE TABLE IF NOT EXISTS `osc_admin_m_menu_description` (
+ `rowid` int(11) NOT NULL,
+ `language_id` int(11) NOT NULL,
+ `title` varchar(250) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+-- --------------------------------------------------------
+
+--
+-- Structure de la table `osc_admin_m_menu_to_right`
+--
+
+CREATE TABLE IF NOT EXISTS `osc_admin_m_menu_to_right` (
+ `menu_id` int(11) DEFAULT NULL,
+ `type_id` int(1) NOT NULL COMMENT '0 group / 1 user',
+ `id_ref` int(11) DEFAULT NULL,
+ UNIQUE KEY `menuusergroup` (`menu_id`,`type_id`,`id_ref`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+*/
+
+
+
+
+class sqladminmenu
+ implements ModSqlDataDriver{
+ /**
+ @var object childs module class
+ */
+ public static $modules;
+ /**
+ @var current ressource class
+ */
+ protected static $_instance;
+ /**
+ @var string error detail
+ */
+ public static $error = false;
+
+ /**
+ @brief constructor
+ no direct call, but is auto call by static public method
+ This method init Childs modules class
+ */
+ protected function __construct(){
+ self::$modules=new AcaFactory('adminuser'/*,'MODULE_ACACAT_INSTALLED_BO'*/);
+ }
+
+ /**
+ @brief for call construct class in singletown
+ @return current instance
+ */
+ public static function getInstance() {
+ if(self::$_instance == null) self::$_instance = new self();
+ return self::$_instance;
+ }
+
+ /**
+ @brief create new ligne in table configuration
+ */
+ public static function create($option){
+ self::getInstance();
+
+ if(isset($option['admin_url'])) $sql_data_array['admin_url'] = $option['admin_url'];
+ if(isset($option['sort_order'])) $sql_data_array['sort_order'] = $option['sort_order'];
+ if(isset($option['parent_id'])) $sql_data_array['parent_id'] = $option['parent_id'];
+
+ $res=tep_db_perform(TABLE_ADMIN_MENU, $sql_data_array);
+
+ if(!$res)
+ return $res;
+ else
+ return $res->__get('insertId');
+ }
+
+ /**
+ @brief update ligne in table configuration
+ */
+ public static function update($option){
+ self::getInstance();
+
+ if(!isset($option['id']) ){
+ self::$error= 'no id';
+ return false;
+ }else
+ $id = (int)$option['id'];
+
+ if(isset($option['rowid'])) $sql_data_array['rowid'] = $id;
+ if(isset($option['admin_url'])) $sql_data_array['admin_url'] = $option['admin_url'];
+ if(isset($option['sort_order'])) $sql_data_array['sort_order'] = $option['sort_order'];
+ if(isset($option['parent_id'])) $sql_data_array['parent_id'] = $option['parent_id'];
+
+
+ $res=tep_db_perform(TABLE_ADMIN_MENU, $sql_data_array, 'update' , substr($where,3) );
+
+ return $res;
+ }
+
+
+
+ /**
+ @brief load ligne in table configuration
+ @param option array
+ id => row id int (configuration_id)
+ key => string key (configuration_key)
+ group_id => group_id int (configuration_group_id)
+ @param $shortkey use cleankey for return short key
+ @return
+
+ object(stdClass)[13]
+ public 'id' => string '1' (length=1)
+
+ OR
+ array(
+ object(stdClass)[13]
+ ...
+ object(stdClass)[13]
+ ..
+ )
+
+ */
+ public static function fetch($option,$shortkey=false){
+ self::getInstance();
+ $DB=Database::getInstance();
+
+ $sql ="";
+ if(isset($option['id'])) $sql .="AND admin_id = '".(int)tep_db_input($option['id'])."' ";
+ if(isset($option['group_id'])) $sql .="AND a.admin_groups_id = '".(int)(string)tep_db_input($option['group_id'])."' ";
+
+
+
+ $sql="SELECT * FROM " . TABLE_ADMIN_MENU . " a ".
+ " LEFT JOIN " . TABLE_ADMIN_MENU_GROUPS . " g ON (a.admin_groups_id=g.admin_groups_id) ".
+ " WHERE ".substr($sql,3);
+
+ $res=$DB->query($sql);
+
+ $num = $res->__get('numRows');
+
+ if($num == 1){
+ $result=$res->fetchAssoc();
+ return ((!$shortkey)? $result : self::CleanKey($result));
+ }
+ elseif($num > 1){
+ $array=array();
+
+ foreach($res->fetchAllAssoc() as $result)
+ $array[]= ((!$shortkey)? $result : self::CleanKey($result));
+
+ return $array;
+ }
+
+ return false;
+ }
+
+ /**
+ @brief delete row
+ */
+ public static function delete($option){
+ self::getInstance();
+ $DB=Database::getInstance();
+
+ if(isset($option['id']))
+ $_id = (int)tep_db_input($option['id']) ;
+ else
+ return false;
+
+
+ // ACA START DELETE
+ self::$modules->delete($_id);
+
+
+// $DB->query("delete from " . TABLE_ADMIN_MENU_NOTIFICATION . " where rowid = '" . (int)$_id . "' AND notif_type = '1' ");
+
+ $DB->query("delete from " . TABLE_ADMIN_MENU . " where rowid = '" . (int)$_id . "'");
+
+
+ return true;
+ }
+
+
+ /**
+ @brief
+ @return array product empty
+ */
+ public static function Specimen(){
+ $par = array('rowid' => '',
+ 'admin_url' => '',
+ 'sort_order' => '',
+ 'parent_id' => '',
+ );
+
+ return self::CleanKey($par);
+ }
+
+
+ /**
+ @fn CleanKey()
+ @brief Clean string name key
+ */
+ private static function CleanKey($array){
+ self::getInstance();
+ $object= new stdclass();
+
+ foreach($array as $key=>$value){
+ if( strpos($key,'admin_') ===0)
+ $key=substr($key,6);
+
+
+ $object->$key = $value;
+ }
+
+ return $object;
+ }
+
+}
+
+
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/classes/drivers/sqlimage.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlimage.php (rev 0)
+++ trunk/catalog/admin/includes/classes/drivers/sqlimage.php 2011-10-20 20:50:22 UTC (rev 3836)
@@ -0,0 +1,229 @@
+<?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 22/09/11, 20:11
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class manage link table configuration
+
+
+
+TODO :
+
+ EN cours de dev
+
+
+CREATE TABLE IF NOT EXISTS `osc_images` (
+ `rowid` int(11) NOT NULL,
+ `path` varchar(250) NOT NULL,
+ `file` varchar(100) NOT NULL,
+ `date_added` datetime NOT NULL,
+ `last_modified` datetime NOT NULL,
+ PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT ;
+
+
+
+CREATE TABLE IF NOT EXISTS `osc_images_used` (
+ `rowid` int(11) NOT NULL,
+ `width` float NOT NULL,
+ `height` float NOT NULL,
+ `watermark` varchar(100) NOT NULL
+) ENGINE=InnoDB DEFAULT ;
+
+*/
+
+
+
+
+class sqlimage
+ implements ModSqlDataDriver{
+
+ public static $modules;
+
+ protected static $_instance;
+
+ protected function __construct(){
+ self::$modules=new AcaFactory('adminuser'/*,'MODULE_ACACAT_INSTALLED_BO'*/);
+// self::$modules->set_image_handler();
+ }
+
+
+ public static function getInstance() {
+ if(self::$_instance == null) self::$_instance = new self();
+ return self::$_instance;
+ }
+
+
+ /**
+ @brief create new ligne in table configuration
+ */
+ public static function create($option){
+ self::getInstance();
+
+ if(!isset($option['path']))
+ return 'path';
+ if(!isset($option['file']))
+ return 'file';
+
+ $sql_data_array['path'] = 'now()';
+ $sql_data_array['file'] = 'now()';
+ $sql_data_array['date_added'] = 'now()';
+
+ $res=tep_db_perform(TABLE_IMAGES, $sql_data_array);
+
+ if(!$res)
+ return $res;
+ else
+ return $res->__get('insertId');
+ }
+
+ /**
+ @brief update ligne in table configuration
+ */
+ public static function update($option){
+ self::getInstance();
+
+ if(!isset($option['path']))
+ return 'path';
+ if(!isset($option['file']))
+ return 'file';
+ $where ='';
+ if(isset($option['id'])) $where .="AND rowid = '".(int)$option['id']."' ";
+
+
+
+ $sql_data_array['path'] = 'now()';
+ $sql_data_array['file'] = 'now()';
+ $sql_data_array['last_modified'] = 'now()';
+ $res=tep_db_perform(TABLE_IMAGES, $sql_data_array, 'update' , substr($where,3) );
+
+ return $res;
+ }
+
+ /**
+ @brief load ligne in table configuration
+ @param option array
+ id => row id int (configuration_id)
+ key => string key (configuration_key)
+ group_id => group_id int (configuration_group_id)
+ @param $shortkey use cleankey for return short key
+ @return
+
+ object(stdClass)[13]
+ public 'id' => string '1' (length=1)
+
+ OR
+ array(
+ object(stdClass)[13]
+ ...
+ object(stdClass)[13]
+ ..
+ )
+
+ */
+ public static function fetch($option,$shortkey=false){
+ self::getInstance();
+ $DB=Database::getInstance();
+
+ $sql ="";
+ if(isset($option['id'])) $sql .="AND rowid = '".(int)tep_db_input($option['id'])."' ";
+
+
+
+ $sql="SELECT * FROM " . TABLE_IMAGES . " a ".
+ " LEFT JOIN " . TABLE_IMAGES_USED . " g ON (a.rowid=g.rowid) ".
+ " WHERE ".substr($sql,3);
+
+ $res=$DB->query($sql);
+
+ $num = $res->__get('numRows');
+
+ if($num == 1){
+ $result=$res->fetchAssoc();
+ return ((!$shortkey)? $result : self::CleanKey($result));
+ }
+ elseif($num > 1){
+ $array=array();
+
+ foreach($res->fetchAllAssoc() as $result)
+ $array[]= ((!$shortkey)? $result : self::CleanKey($result));
+
+ return $array;
+ }
+
+ return false;
+ }
+
+ /**
+ @brief delete row
+ */
+ public static function delete($option){
+ self::getInstance();
+ $DB=Database::getInstance();
+
+ if(isset($option['id']))
+ $_id = (int)tep_db_input($option['id']) ;
+ else
+ return false;
+
+
+ // ACA START DELETE CATEGORY
+// self::$modules->delete($categories[$i]['id']);
+
+
+ $DB->query("delete from " . TABLE_IMAGES_USED . " where rowid = '" . (int)$_id . "' ");
+
+ $DB->query("delete from " . TABLE_IMAGES . " where rowid = '" . (int)$_id . "'");
+
+
+ return true;
+ }
+
+
+ /**
+ @brief
+ @return array product empty
+ */
+ public static function Specimen(){
+ $par = array('rowid' => '',
+ 'path' => '',
+ 'file' => '',
+ 'date_added' => '',
+ 'last_modified' => '',
+ 'width' => '',
+ 'height' => '',
+ 'watermark' => '',
+ );
+
+ return self::CleanKey($par);
+ }
+
+
+
+ /**
+ @fn CleanKey()
+ @brief Clean string name key
+ */
+ private static function CleanKey($array){
+ self::getInstance();
+ $object= new stdclass();
+
+ foreach($array as $key=>$value){
+ if( strpos($key,'admin_') ===0)
+ $key=substr($key,6);
+
+
+ $object->$key = $value;
+ }
+
+ return $object;
+ }
+
+}
+
+
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/classes/drivers/sqlorder.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlorder.php (rev 0)
+++ trunk/catalog/admin/includes/classes/drivers/sqlorder.php 2011-10-20 20:50:22 UTC (rev 3836)
@@ -0,0 +1,211 @@
+<?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 22/09/11, 20:11
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class manage link table configuration
+*/
+
+
+
+
+class sqlorder
+ implements ModSqlDataDriver{
+
+
+ /**
+ @brief create new ligne in table configuration
+ */
+ public static function create($option){
+
+// if(!isset($option['key'])) return 'key';
+//
+// if(isset($option['id'])) $sql_data_array['configuration_id'] = $option['id'];
+// if(isset($option['title'])) $sql_data_array['configuration_title'] = $option['title'];
+// $sql_data_array['configuration_key'] = $option['key'];
+// if(isset($option['value'])) $sql_data_array['configuration_value'] = $option['value'];
+// if(isset($option['description'])) $sql_data_array['configuration_description'] = $option['description'];
+// if(isset($option['group_id'])) $sql_data_array['configuration_group_id'] = $option['group_id'];
+// if(isset($option['sort_order'])) $sql_data_array['sort_order'] = $option['sort_order'];
+// if(isset($option['modified'])) $sql_data_array['last_modified'] = $option['modified'];
+// $sql_data_array['date_added'] = (isset($option['added'])) ? $option['added'] : date('Y-m-d H:i:s');
+// if(isset($option['use'])) $sql_data_array['use'] = $option['use'];
+// if(isset($option['set'])) $sql_data_array['set'] = $option['set'];
+// $sql_data_array['configuration_type'] = (isset($option['type'])) ? $option['type'] : 2;
+//
+// $res=tep_db_perform(TABLE_CONFIGURATION, $sql_data_array);
+//
+// if(!$res)
+// return $res;
+// else
+// return $res->__get('insertId');
+ }
+
+ /**
+ @brief update ligne in table configuration
+ */
+ public static function update($option){
+
+// if(!isset($option['key']) && !isset($option['id'])) return 'key or id';
+//
+// $where ='';
+// if(isset($option['id'])) $where .="AND configuration_id = '".(int)$option['id']."' ";
+// if(isset($option['key'])) $where .="AND configuration_key = '".$option['key']."' ";
+//
+// if(isset($option['title'])) $sql_data_array['configuration_title'] = $option['title'];
+// if(isset($option['value'])) $sql_data_array['configuration_value'] = $option['value'];
+// if(isset($option['description'])) $sql_data_array['configuration_description'] = $option['description'];
+// if(isset($option['group_id'])) $sql_data_array['configuration_group_id'] = $option['group_id'];
+// if(isset($option['sort_order'])) $sql_data_array['sort_order'] = $option['sort_order'];
+// $sql_data_array['last_modified'] = (isset($option['modified'])) ? $option['modified'] : date('Y-m-d H:i:s');
+// if(isset($option['use'])) $sql_data_array['use'] = $option['use'];
+// if(isset($option['set'])) $sql_data_array['set'] = $option['set'];
+// $sql_data_array['configuration_type'] = (isset($option['type'])) ? $option['type'] : 2;
+//
+//
+//
+//
+//
+// $res=tep_db_perform(TABLE_CONFIGURATION, $sql_data_array, 'update' , substr($where,3) );
+
+ return $res;
+ }
+
+ /**
+ @brief load ligne in table configuration
+ @param option array
+ id => row id int (configuration_id)
+ key => string key (configuration_key)
+ group_id => group_id int (configuration_group_id)
+
+ @return
+
+ object(stdClass)[13]
+ public 'id' => string '1' (length=1)
+
+ OR
+ array(
+ object(stdClass)[13]
+ ...
+ object(stdClass)[13]
+ ..
+ )
+
+ */
+ public static function fetch($option,$shortkey=false){
+ $DB=Database::getInstance();
+
+// $sql ="";
+// if(isset($option['id'])) $sql .="AND configuration_id = '".(int)tep_db_input($option['id'])."' ";
+// if(isset($option['key'])) $sql .="AND configuration_key = '".(string)tep_db_input($option['key'])."' ";
+// if(isset($option['group_id'])) $sql .="AND configuration_group_id = '".(int)(string)tep_db_input($option['group_id'])."' ";
+//
+// $sql ="SELECT * FROM ".TABLE_ORDERS." WHERE ".substr($sql,3);
+//
+// $res=$DB->query($sql);
+//
+// $num = $res->__get('numRows');
+//
+// if($num == 1){
+// $result=$res->fetchAssoc();
+// return ((!$shortkey)? $result : self::CleanKey($result));
+// }
+// elseif($num > 1){
+// $array=array();
+//
+// foreach($res->fetchAllAssoc() as $result)
+// $array[]= ((!$shortkey)? $result : self::CleanKey($result));
+//
+// return $array;
+// }
+
+ return false;
+ }
+
+ /**
+ @brief delete row
+ */
+ public static function delete($option){
+ $DB=Database::getInstance();
+
+ $sql ="";
+ if(isset($option['id'])){
+ $_oID = tep_db_prepare_input($option['id']);
+ $sql .="AND orders_id = '".(int)tep_db_input($option['id'])."' ";
+ }
+ else
+ return false;
+// if(isset($option['key'])) $sql .="AND configuration_key = '".(string)tep_db_input($option['key'])."' ";
+// if(isset($option['group_id'])) $sql .="AND configuration_group_id = '".(int)(string)tep_db_input($option['group_id'])."' ";
+//
+// if(strlen($sql)==0)
+// return false;
+//
+
+ if(isset($option['cid']))
+ $cid = $option['cid']
+ else {
+
+ $check_status_query = tep_db_query("select customers_id from " . TABLE_ORDERS . " where orders_id = '" . (int)$_oID . "'");
+ $check = tep_db_fetch_array($check_status_query);
+ $cid = $check['customers_id'];
+ }
+
+
+ if(isset($option['restock']))
+
+// error_reporting(E_ALL);
+
+
+// global $products_modules;
+ if ($restock =='on'){
+ tep_products_restock($_oID,$cid);
+ }
+
+ $sql = substr($sql,3);
+
+ $DB->query("delete from " . TABLE_ORDERS_PRODUCTS . " where ".$sql);
+ $DB->query("delete from " . TABLE_ORDERS_PRODUCTS_ATTRIBUTES . " where ".$sql);
+ $DB->query("delete from " . TABLE_ORDERS_STATUS_HISTORY . " where ".$sql);
+ $DB->query("delete from " . TABLE_ORDERS_TOTAL . " where ".$sql);
+
+// $sql ="DELETE FROM ".TABLE_CONFIGURATION." WHERE ".;
+ $DB->query("delete from " . TABLE_ORDERS . " where ".$sql);
+// $res=$DB->query($sql);
+
+ return $res;
+ }
+
+ /**
+ @fn CleanKey()
+ @brief Clean string name key
+ */
+ private static function CleanKey($array){
+
+ $object= new stdclass();
+
+ foreach($array as $key=>$value){
+ if( strpos($key,'configuration_') ===0)
+ $key=substr($key,14);
+ elseif(strpos($key,'_function') >0)
+ $key=str_replace('_function','',$key);
+ elseif(strpos($key,'date_') ===0)
+ $key=str_replace('date_','',$key);
+ elseif(strpos($key,'last_') ===0)
+ $key=str_replace('last_','',$key);
+
+
+ $object->$key = $value;
+ }
+
+ return $object;
+ }
+
+}
+
+
+?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/database_tables.php
===================================================================
--- trunk/catalog/admin/includes/database_tables.php 2011-10-18 08:53:45 UTC (rev 3835)
+++ trunk/catalog/admin/includes/database_tables.php 2011-10-20 20:50:22 UTC (rev 3836)
@@ -57,6 +57,12 @@
define('TABLE_HOLDING_ORDERS_PRODUCTS_ATTRIBUTES', DB_TABLE_PREFIX . 'holding_orders_products_attributes');
define('TABLE_HOLDING_ORDERS_PRODUCTS_DOWNLOAD', DB_TABLE_PREFIX . 'holding_orders_products_download');
define('TABLE_HOLDING_ORDERS_STATUS_HISTORY', DB_TABLE_PREFIX . 'holding_orders_status_history');
+
+/// TOP Not Used for dev
+ define('TABLE_IMAGES', DB_TABLE_PREFIX . 'images');
+ define('TABLE_IMAGES_USED', DB_TABLE_PREFIX . 'images_used');
+/// END Not Used for dev
+
define('TABLE_LANGUAGES', DB_TABLE_PREFIX . 'languages');
define('TABLE_MANUFACTURERS', DB_TABLE_PREFIX . 'manufacturers');
define('TABLE_MANUFACTURERS_INFO', DB_TABLE_PREFIX . 'manufacturers_info');
Modified: trunk/catalog/admin/includes/functions/general.php
===================================================================
--- trunk/catalog/admin/includes/functions/general.php 2011-10-18 08:53:45 UTC (rev 3835)
+++ trunk/catalog/admin/includes/functions/general.php 2011-10-20 20:50:22 UTC (rev 3836)
@@ -626,25 +626,6 @@
-/**
- suppression de commandes
- @package oscss-major
- @author oscim
- @version 4.1
- @page held_orders.php,orders.php
-*/
-function tep_remove_order($order_id, $restock = false,$customers_id='') {
- error_reporting(E_ALL);
- global $products_modules;
- if ($restock =='on'){
- tep_products_restock($order_id,$customers_id);
- }
- tep_db_query("delete from " . TABLE_ORDERS . " where orders_id = '" . (int)$order_id . "'");
- tep_db_query("delete from " . TABLE_ORDERS_PRODUCTS . " where orders_id = '" . (int)$order_id . "'");
- tep_db_query("delete from " . TABLE_ORDERS_PRODUCTS_ATTRIBUTES . " where orders_id = '" . (int)$order_id . "'");
- tep_db_query("delete from " . TABLE_ORDERS_STATUS_HISTORY . " where orders_id = '" . (int)$order_id . "'");
- tep_db_query("delete from " . TABLE_ORDERS_TOTAL . " where orders_id = '" . (int)$order_id . "'");
-}
/**
@fn status_name($type , $status_id, $language_id = '')
@@ -674,23 +655,6 @@
/**
- TODO: Revoir le nom de cette fonction, et l'integer dans la class image
- @date 22/08/10, 01:30
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
-*/
-function tep_banner_image_extension() {
- if (function_exists('imagetypes')) {
- if (imagetypes() & IMG_PNG) return 'png';
- elseif (imagetypes() & IMG_JPG)return 'jpg';
- elseif (imagetypes() & IMG_GIF) return 'gif';
- }
- elseif (function_exists('imagecreatefrompng') && function_exists('imagepng')) return 'png';
- elseif (function_exists('imagecreatefromjpeg') && function_exists('imagejpeg')) return 'jpg';
- elseif (function_exists('imagecreatefromgif') && function_exists('imagegif')) return 'gif';
- return false;
-}
-
-/**
list templates directorys
@package oscss
@author OscssTeam
Deleted: trunk/catalog/admin/includes/functions/lib.banner_manager.php
===================================================================
--- trunk/catalog/admin/includes/functions/lib.banner_manager.php 2011-10-18 08:53:45 UTC (rev 3835)
+++ trunk/catalog/admin/includes/functions/lib.banner_manager.php 2011-10-20 20:50:22 UTC (rev 3836)
@@ -1,86 +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
-*/
-
-/**
- Sets the status of a banner
- @package oscss-2 <www http://www.oscss.org>
- @author oscim <mail os...@os...> <www http://www.oscim.fr>
-*/
-function tep_set_banner_status($banners_id, $status) {
- if ($status == '1') {
- return tep_db_query("update " . TABLE_BANNERS . " set status = '1', expires_impressions = NULL, expires_date = NULL, date_status_change = NULL where banners_id = '" . $banners_id . "'");
- } elseif ($status == '0') {
- return tep_db_query("update " . TABLE_BANNERS . " set status = '0', date_status_change = now() where banners_id = '" . $banners_id . "'");
- } else {
- return -1;
- }
-}
-
-
-/**
- Banniere 3j infobox
- @package oscss-2 <www http://www.oscss.org>
- @author oscim <mail os...@os...> <www http://www.oscim.fr>
-*/
-function banner_infobox($banner_id,$banner_stats,$days){
-
- $banner_extension = tep_banner_image_extension();
-
- include(DIR_WS_CLASSES . 'phplot.php');
-
- $stats = array();
- $banner_stats_query = tep_db_query("select dayofmonth(banners_history_date) as name, banners_shown as value, banners_clicked as dvalue from " . TABLE_BANNERS_HISTORY . " where banners_id = '" . $banner_id . "' and to_days(now()) - to_days(banners_history_date) < " . $days . " order by banners_history_date");
- while ($banner_stats = tep_db_fetch_array($banner_stats_query)) {
- $stats[] = array($banner_stats['name'], $banner_stats['value'], $banner_stats['dvalue']);
- }
-
- if (sizeof($stats) < 1) $stats = array(array(date('j'), 0, 0));
-
- $img='images/graphs/banner_infobox-' . $banner_id . '.' . $banner_extension;
-
- $graph = new PHPlot(200, 220,$img );
-
- $graph->SetFileFormat($banner_extension);
- $graph->SetIsInline(1);
- $graph->SetPrintImage(0);
-
- $graph->draw_vert_ticks = 0;
- $graph->SetSkipBottomTick(1);
- $graph->SetDrawXDataLabels(0);
- $graph->SetDrawYGrid(0);
- $graph->SetPlotType('bars');
- //$graph->SetDrawDataLabels(1);
- $graph->SetLabelScalePosition(1);
- $graph->SetMarginsPixels(15,15,15,30);
-
- //! font , et taille
- $graph->SetTitleFontSize('3');
- $graph->SetTTFPath(DIR_FS_CATALOG.DIR_WS_COMMON_FONTS);
- $graph->SetDefaultTTFont('arial.ttf');
- $graph->SetFontTTF('x_label', 'arial.ttf','8');
- $graph->SetFontTTF('y_label', 'arial.ttf','8');
- $graph->SetFontTTF('legend', 'arial.ttf','10');
-
- $graph->SetTitle(utf8_decode(TEXT_BANNERS_LAST_3_DAYS));
-
- $graph->SetBackgroundColor('#f0f0ee');
- $graph->SetTransparentColor('#f0f0ee');
-
- $graph->SetDataValues($stats);
- $graph->SetDataColors(array('blue','red'),array('blue', 'red'));
-
- $graph->DrawGraph();
-
- $graph->PrintImage();
-
- return $img;
-}
-?>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/functions/lib.banner_statistics.php
===================================================================
--- trunk/catalog/admin/includes/functions/lib.banner_statistics.php 2011-10-18 08:53:45 UTC (rev 3835)
+++ trunk/catalog/admin/includes/functions/lib.banner_statistics.php 2011-10-20 20:50:22 UTC (rev 3836)
@@ -1,190 +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
-*/
-
-
-
-/**
- Banniere banner_daily
- @package oscss-2 <www http://www.oscss.org>
- @author oscim <mail os...@os...> <www http://www.oscim.fr>
-*/
-function banner_daily($banner_id,$banner){
-
- $banner_extension = tep_banner_image_extension();
-
- include(DIR_WS_CLASSES . 'phplot.php');
-
- $year = (isset($_GET['year']) ? $_GET['year'] : date('Y'));
- $month = (isset($_GET['month'...
[truncated message content] |
|
From: <os...@us...> - 2011-10-22 16:28:02
|
Revision: 3838
http://oscss.svn.sourceforge.net/oscss/?rev=3838&view=rev
Author: oscim
Date: 2011-10-22 16:27:52 +0000 (Sat, 22 Oct 2011)
Log Message:
-----------
Suiet amelioration gestion de la configuration, ajout de class fixe pour les pages de configuration
Ajout d'une serie de class de configuration , associ?\195?\169 ?\195?\160 leur gabarits et deport des element present de l'installation dans les fichiers de langue de ces modules
Ajustement install suite modification precendentes
correction coquille (err notice class form)
AJout element manquant dans le nouveau template
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/configUtility.php
trunk/catalog/admin/includes/content/configuration.central.inc
trunk/catalog/admin/includes/template/oscss/jquery-ui-1.css
trunk/catalog/common/classes/formUtility.php
trunk/catalog/install/includes/language/fr_FR/oscss_config.txt
trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration_group.sql
Added Paths:
-----------
trunk/catalog/admin/includes/gabarit/configuration/modimages.listing.gab
trunk/catalog/admin/includes/gabarit/configuration/modmail.listing.gab
trunk/catalog/admin/includes/gabarit/configuration/modstock.listing.gab
trunk/catalog/admin/includes/gabarit/configuration/my_boutique.listing.gab
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modimages.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modmail.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modstock.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/my_boutique.txt
trunk/catalog/admin/includes/modules/configuration/modimages.php
trunk/catalog/admin/includes/modules/configuration/modstock.php
trunk/catalog/admin/includes/modules/configuration/my_boutique.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/generic/lazyload/lib/jquery.lazyload.js
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/generic/slider/images/header-bg.png
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/generic/slider/images/nav-bg.png
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/generic/slider/images/silde-nav.png
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/generic/slider/images/slide-bg.png
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/generic/slider/inc/easySlider.css
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/generic/slider/inc/easySlider1.7.js
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/generic/slider/inc/slider.js
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/product/slimbox/inc/closelabel.gif
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/product/slimbox/inc/loading.gif
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/product/slimbox/inc/nextlabel.gif
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/product/slimbox/inc/prevlabel.gif
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/product/slimbox/inc/slimbox2-rtl.css
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/product/slimbox/inc/slimbox2.css
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/product/slimbox/inc/slimbox2.js
Modified: trunk/catalog/admin/includes/classes/configUtility.php
===================================================================
--- trunk/catalog/admin/includes/classes/configUtility.php 2011-10-20 21:30:32 UTC (rev 3837)
+++ trunk/catalog/admin/includes/classes/configUtility.php 2011-10-22 16:27:52 UTC (rev 3838)
@@ -42,7 +42,7 @@
foreach($value_array['array'] as $key=>$value){
$keys =sprintf( ($use_format !=false && isset($use_format['label'])? $use_format['label'] : '<label>%s</label>' ) , $value['title']);
- $keys .=sprintf( ($use_format !=false && isset($use_format['description'])? $use_format['description'] : '<br />%s<br />' ) , $value['description']);
+ $keys .=sprintf( ($use_format !=false && isset($use_format['description'])? $use_format['description'] : '%s' ) , $value['description']);
$key2 =self::CallExecConfigLine($value['set_function'], $key, $value['value']);
$keys .=sprintf( ($use_format !=false && isset($use_format['value_edit'])? $use_format['value_edit'] : '<span class="value_edit">%s</span>' ) , $key2);
@@ -53,7 +53,7 @@
$keys .=sprintf( ($use_format !=false && isset($use_format['view_view'])? $use_format['view_view'] : '<span class="view_view">%s</span>' ) , $key2);
- $sortie .=sprintf( ($use_format !=false && isset($use_format['block'])? $use_format['block'] : '<p class="block_input button_nav">%s</p><br />' ) , $keys);
+ $sortie .=sprintf( ($use_format !=false && isset($use_format['block'])? $use_format['block'] : '<p class="block_input button_nav">%s</p>' ) , $keys);
}
return $sortie;
Modified: trunk/catalog/admin/includes/content/configuration.central.inc
===================================================================
--- trunk/catalog/admin/includes/content/configuration.central.inc 2011-10-20 21:30:32 UTC (rev 3837)
+++ trunk/catalog/admin/includes/content/configuration.central.inc 2011-10-22 16:27:52 UTC (rev 3838)
@@ -33,8 +33,12 @@
<?php foreach($list_edit as $row) { ?>
<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>
- <p class="block_input tirroir"><?php if (tep_not_null($row->description))echo $row->description; ?><br />
- <?php echo $row->value_field ; ?></p>
+ <div class="block_input tirroir">
+ <label><?php if (tep_not_null($row->description))echo $row->description; ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
</li>
<?php } ?>
</ul>
Added: trunk/catalog/admin/includes/gabarit/configuration/modimages.listing.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/modimages.listing.gab (rev 0)
+++ trunk/catalog/admin/includes/gabarit/configuration/modimages.listing.gab 2011-10-22 16:27:52 UTC (rev 3838)
@@ -0,0 +1,187 @@
+<?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.1
+ @date 22/09/11, 20:05
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @brief mise en forme de la gestion du stock
+*/
+?>
+
+<div id="ssmenu">
+ <?php echo tep_ssmenu_configuration($_GET['gparentID']) ?>
+</div>
+
+
+
+<h3 class="main-title"><?php echo __('heading modimages configuration') ?></h3>
+
+<?php echo tep_draw_form('configuration', FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&gID=' . $_GET['gID'] . '&action=save_mutli') ?>
+
+
+<div class="block_form">
+
+
+ <div class="block_field">
+ <h4 class="main-title"><?php echo __('heading modimages tailles') ?></h4>
+
+ <p class="main-intro"><?php echo __('modimages tailles txt intro') ?></p>
+
+ <fieldset class="block_field">
+ <legend><?php echo __('modimages legend small') ?></legend>
+ <div class="block_input">
+ <?php /** */ $row = modimages::$list['SMALL_IMAGE_WIDTH']; ?>
+ <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 = modimages::$list['SMALL_IMAGE_HEIGHT']; ?>
+ <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 __('modimages legend heading') ?></legend>
+ <div class="block_input">
+ <?php /** */ $row = modimages::$list['HEADING_IMAGE_WIDTH']; ?>
+ <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 = modimages::$list['HEADING_IMAGE_HEIGHT']; ?>
+ <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 __('modimages legend subcategory') ?></legend>
+ <div class="block_input">
+ <?php /** */ $row = modimages::$list['SUBCATEGORY_IMAGE_WIDTH']; ?>
+ <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 = modimages::$list['SUBCATEGORY_IMAGE_HEIGHT']; ?>
+ <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 __('modimages legend popup') ?></legend>
+ <div class="block_input">
+ <?php /** */ $row = modimages::$list['POPUP_IMAGE_WIDTH']; ?>
+ <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 = modimages::$list['POPUP_IMAGE_HEIGHT']; ?>
+ <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 __('modimages legend stack') ?></legend>
+ <div class="block_input">
+ <?php /** */ $row = modimages::$list['STACK_IMAGE_WIDTH']; ?>
+ <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 = modimages::$list['STACK_IMAGE_HEIGHT']; ?>
+ <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>
+
+ </div>
+
+
+ <fieldset class="block_field">
+ <?php /** */ $row = modimages::$list['JPEG_QUALITY']; ?>
+ <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>
+ </div>
+ </p>
+ </fieldset>
+
+
+ <?php /** Attribut produit / option stock associé */ ?>
+ <fieldset class="block_field">
+ <legend class="block_field-title"><?php echo __('modimages legend other') ?></legend>
+
+ <ul class="block_input">
+ <?php foreach(modimages::$list as $row)
+ if(!in_array($row->key,array('SMALL_IMAGE_WIDTH', 'SMALL_IMAGE_HEIGHT', 'HEADING_IMAGE_WIDTH', 'HEADING_IMAGE_HEIGHT', 'SUBCATEGORY_IMAGE_WIDTH', 'SUBCATEGORY_IMAGE_HEIGHT', 'POPUP_IMAGE_WIDTH','POPUP_IMAGE_HEIGHT','STACK_IMAGE_WIDTH','STACK_IMAGE_HEIGHT','JPEG_QUALITY')) && substr($row->key,0,4) !='SMTP' ) { ?>
+ <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 } ?>
+ </ul>
+ </fieldset>
+
+ <div class="button_nav">
+ <?php print tep_image_submit('button_copy.gif', IMAGE_UPDATE) .tep_js_back(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&gID=' . $_GET['gID'] )) ; ?>
+ </div>
+
+
+ <div class="block_field">
+ <h4 class="block_field-title"><?php echo __('modimages legend brief') ?></h4>
+
+ <p class="block_field-text"><?php printf(__('modimages text path images %s'), DIR_FS_CATALOG_IMAGES ) ?></p>
+ <p class="block_field-text"><?php printf(__('modimages text url images %s'), tep_catalog_href_link(DIR_WS_IMAGES,'','NONSSL',false) ) ?></p>
+
+ <p class="block_field-text"><?php echo __('modimages text brief') ?></p>
+
+ </div>
+
+</div>
+</form>
\ No newline at end of file
Added: trunk/catalog/admin/includes/gabarit/configuration/modmail.listing.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/modmail.listing.gab (rev 0)
+++ trunk/catalog/admin/includes/gabarit/configuration/modmail.listing.gab 2011-10-22 16:27:52 UTC (rev 3838)
@@ -0,0 +1,151 @@
+<?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.1
+ @date 22/09/11, 20:05
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @brief mise en forme de la gestion du stock
+*/
+?>
+
+<div id="ssmenu">
+ <?php echo tep_ssmenu_configuration($_GET['gparentID']) ?>
+</div>
+
+
+
+<h3 class="main-title"><?php echo __('heading modmail configuration') ?></h3>
+
+<?php echo tep_draw_form('configuration', FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&gID=' . $_GET['gID'] . '&action=save_mutli') ?>
+
+
+<div class="block_form">
+
+ <fieldset class="block_field">
+ <?php /** */ $row = modmail::$list['SEND_EMAILS']; ?>
+ <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>
+ </div>
+ </p>
+ </fieldset>
+
+
+ <?php /** activation des emails */ ?>
+ <?php if(_test_bool(modmail::$list['SEND_EMAILS']->value)): ?>
+
+
+ <fieldset class="block_field">
+ <legend class="block_field-title"><?php echo __('modmail legend method') ?></legend>
+ <?php /** */ $row = modmail::$list['EMAIL_TRANSPORT']; ?>
+ <div class="block_input">
+ <label><?php if (tep_not_null($row->description))echo __($row->description); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+
+ <?php /** option de la gestion de stock, disponible que ci value precendente a true */ ?>
+ <?php if(modmail::$list['EMAIL_TRANSPORT']->value =='smtp'): ?>
+ <ul class="block_input">
+ <?php foreach(modmail::$list as $row)
+ if(substr($row->key,0,4) =='SMTP') { ?>
+ <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 } ?>
+ </ul>
+ <?php endif; ?>
+ </fieldset>
+
+
+
+ <fieldset class="block_field">
+ <legend class="block_field-title"><?php echo __('modmail legend htmlmode') ?></legend>
+ <?php /** */ $row = modmail::$list['EMAIL_USE_HTML']; ?>
+ <div class="block_input">
+ <label><?php if (tep_not_null($row->description))echo __($row->description); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+
+ <?php /** option de la gestion de stock, disponible que ci value precendente a true */ ?>
+ <?php if(_test_bool(modmail::$list['EMAIL_USE_HTML']->value)): ?>
+ <ul class="block_input">
+ <?php foreach(modmail::$list as $row)
+ if(in_array($row->key,array('EMAIL_LINEFEED','') )) { ?>
+ <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 } ?>
+ </ul>
+ <?php endif; ?>
+ </fieldset>
+
+
+
+
+
+ <?php endif; ?>
+
+
+ <fieldset class="block_field">
+ <?php /** */ $row = modmail::$list['ENTRY_EMAIL_ADDRESS_CHECK']; ?>
+ <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>
+ </div>
+ </p>
+ </fieldset>
+
+
+ <?php /** Attribut produit / option stock associé */ ?>
+ <fieldset class="block_field">
+ <legend class="block_field-title"><?php echo __('modmail legend other') ?></legend>
+
+ <ul class="block_input">
+ <?php foreach(modmail::$list as $row)
+ if(!in_array($row->key,array('SEND_EMAILS','EMAIL_TRANSPORT','EMAIL_USE_HTML','EMAIL_LINEFEED','ENTRY_EMAIL_ADDRESS_CHECK')) && substr($row->key,0,4) !='SMTP' ) { ?>
+ <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 } ?>
+ </ul>
+ </fieldset>
+
+ <div class="button_nav">
+ <?php print tep_image_submit('button_copy.gif', IMAGE_UPDATE) .tep_js_back(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&gID=' . $_GET['gID'] )) ; ?>
+ </div>
+
+</div>
+</form>
\ No newline at end of file
Added: trunk/catalog/admin/includes/gabarit/configuration/modstock.listing.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/modstock.listing.gab (rev 0)
+++ trunk/catalog/admin/includes/gabarit/configuration/modstock.listing.gab 2011-10-22 16:27:52 UTC (rev 3838)
@@ -0,0 +1,96 @@
+<?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.1
+ @date 22/09/11, 20:05
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @brief mise en forme de la gestion du stock
+*/
+?>
+
+<div id="ssmenu">
+ <?php echo tep_ssmenu_configuration($_GET['gparentID']) ?>
+</div>
+
+
+
+<h3 class="main-title"><?php echo __('heading manage stock and process stock') ?></h3>
+
+<?php echo tep_draw_form('configuration', FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&gID=' . $_GET['gID'] . '&action=save_mutli') ?>
+
+
+<div class="block_form">
+
+ <fieldset class="block_field">
+ <?php /** */ $row = modstock::$list['STOCK_CHECK']; ?>
+ <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>
+ </div>
+ </p>
+ </fieldset>
+
+
+ <?php /** option de la gestion de stock, disponible que ci value precendente a true */ ?>
+ <?php if(_test_bool(modstock::$list['STOCK_CHECK']->value)): ?>
+
+ <?php /** Attribut produit / option stock associé */ ?>
+ <fieldset class="block_field">
+ <legend class="block_field-title"><?php echo __('heading manage general option stock') ?></legend>
+
+ <ul class="block_input">
+ <?php foreach(modstock::$list as $row)
+ if(strpos($row->key,'ATTRIBUTE')===false && !in_array($row->key,array('STOCK_CHECK')) ) { ?>
+ <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 } ?>
+ </ul>
+ </fieldset>
+
+
+ <?php /** Attribut produit / option stock associé */ ?>
+ <fieldset class="block_field">
+ <legend class="block_field-title"><?php echo __('heading manage general option attributes stock') ?></legend>
+
+ <ul class="block_input">
+ <?php foreach(modstock::$list as $row)
+ if(strpos($row->key,'ATTRIBUTE') > 0) { ?>
+ <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 } ?>
+ </ul>
+ </fieldset>
+
+
+ <?php endif; ?>
+
+
+
+
+ <div class="button_nav">
+ <?php print tep_image_submit('button_copy.gif', IMAGE_UPDATE) .tep_js_back(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&gID=' . $_GET['gID'] )) ; ?>
+ </div>
+
+</div>
+</form>
\ No newline at end of file
Added: trunk/catalog/admin/includes/gabarit/configuration/my_boutique.listing.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/my_boutique.listing.gab (rev 0)
+++ trunk/catalog/admin/includes/gabarit/configuration/my_boutique.listing.gab 2011-10-22 16:27:52 UTC (rev 3838)
@@ -0,0 +1,167 @@
+<?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.1
+ @date 22/09/11, 20:05
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @brief mise en forme de la gestion de la configuration principale de la boutique
+*/
+?>
+
+<div id="ssmenu">
+ <?php echo tep_ssmenu_configuration($_GET['gparentID']) ?>
+</div>
+
+
+
+<h3 class="main-title"><?php echo __('heading my boutique') ?></h3>
+
+<?php echo tep_draw_form('configuration', FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&gID=' . $_GET['gID'] . '&action=save_mutli') ?>
+
+
+<div class="block_form">
+
+ <fieldset class="block_field">
+ <?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>
+ </div>
+ </fieldset>
+
+
+ <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>
+ </div>
+ </fieldset>
+
+
+
+ <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>
+ </div>
+ </fieldset>
+
+
+ <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>
+ </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>
+ </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>
+ </div>
+ </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>
+
+ <div class="block_input tirroir">
+ <label><?php echo __($row->description); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </li>
+ <?php } ?>
+ </ul>
+ </fieldset>
+
+
+ <div class="button_nav">
+ <?php print tep_image_submit('button_copy.gif', IMAGE_UPDATE) .tep_js_back(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&gID=' . $_GET['gID'] )) ; ?>
+ </div>
+
+</div>
+</form>
\ No newline at end of file
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modimages.txt
================================================...
[truncated message content] |
|
From: <os...@us...> - 2011-10-23 19:28:26
|
Revision: 3841
http://oscss.svn.sourceforge.net/oscss/?rev=3841&view=rev
Author: oscim
Date: 2011-10-23 19:28:16 +0000 (Sun, 23 Oct 2011)
Log Message:
-----------
Suite evolution des page de configuration
Refonte de la configuration/gestion des livraisons, centralisation de tous les element ayant trait ?\195?\160 la livraison dans une page unique
Association des elements de confi, des zones , des modules
Ajout d'une class moduleUtility, qui centralise les elements pour manipuler les modules (TODO ?\195?\160 int?\195?\169grer dans ext/packageutility) dont il reprend une partie du code
Ajout d'un menu dans l'espace configuration, specifique ?\195?\160 la gestion des membres admin, des groupes, des acl
Modified Paths:
--------------
trunk/catalog/admin/includes/boxes/01_configuration.php
trunk/catalog/admin/includes/database_tables.php
trunk/catalog/admin/includes/languages/fr_FR/boxes/01_configuration.php
trunk/catalog/admin/includes/template/oscss/jquery-ui-1.css
trunk/catalog/includes/classes/drivers/data/product.php
trunk/catalog/install/includes/language/fr_FR/oscss_config.txt
trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration_group.sql
Added Paths:
-----------
trunk/catalog/admin/includes/boxes/002_admin.php
trunk/catalog/admin/includes/classes/drivers/sqlgeozone.php
trunk/catalog/admin/includes/classes/modulesUtility.php
trunk/catalog/admin/includes/gabarit/configuration/moddownloads.listing.gab
trunk/catalog/admin/includes/gabarit/configuration/modexpedition.listing.gab
trunk/catalog/admin/includes/gabarit/configuration/modmembres.listing.gab
trunk/catalog/admin/includes/languages/fr_FR/boxes/002_admin.php
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/moddownloads.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modexpedition.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modmembres.txt
trunk/catalog/admin/includes/modules/configuration/moddownloads.php
trunk/catalog/admin/includes/modules/configuration/modexpedition.php
trunk/catalog/admin/includes/modules/configuration/modmembres.php
trunk/catalog/install/includes/sql/mysql/data/91_osc_admin_cip.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_admin_cip.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_admin_cip_depend.sql
Removed Paths:
-------------
trunk/catalog/install/includes/sql/mysql/data/91_osc_cip.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_cip.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_cip_depend.sql
Added: trunk/catalog/admin/includes/boxes/002_admin.php
===================================================================
--- trunk/catalog/admin/includes/boxes/002_admin.php (rev 0)
+++ trunk/catalog/admin/includes/boxes/002_admin.php 2011-10-23 19:28:16 UTC (rev 3841)
@@ -0,0 +1,24 @@
+<?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.1
+ @date 23/10/11, 17:06
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+ $configuration_groups_query = tep_db_query("SELECT configuration_group_id AS cgID, configuration_group_title AS cgTitle ,configuration_group_parentid AS gparentID from " . TABLE_CONFIGURATION_GROUP . " ORDER BY configuration_group_parentid , sort_order ASC");
+
+ while ($configuration_groups = tep_db_fetch_array($configuration_groups_query)) {
+ if ($configuration_groups['gparentID'] =='0') $tabl_link[$configuration_groups['cgID']]= array('ss_menu', $configuration_groups['cgTitle'], 'config_'.$configuration_groups['cgID'], @$img['config_'.$configuration_groups['cgID']]);
+ else $tabl_link[$configuration_groups['gparentID']][4][]= array(FILENAME_CONFIGURATION.'?gparentID=' . $configuration_groups['gparentID'].'&gID=' . $configuration_groups['cgID'], $configuration_groups['cgTitle'], 'config_'.$configuration_groups['cgID'], @$img['config_'.$configuration_groups['cgID']]);
+ }
+
+/* taxe et zone de taxe*/
+ $tabl_link[130]= array('ss_menu','BOX_ZONE_AND_TAXE','taxes_in_zone');
+ $tabl_link[130][4][]= array(FILENAME_COUNTRIES, 'BOX_TAXES_COUNTRIES', 'countries');
+ $tabl_link[130][4][]= array(FILENAME_GEO_ZONES, 'BOX_TAXES_GEO_ZONES', 'taxes_geo_zone');
+ $tabl_link[130][4][]= array(FILENAME_TAX_CLASSES, 'BOX_TAXES_TAX_CLASSES', 'taxes_classes');
+
+?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/boxes/01_configuration.php
===================================================================
--- trunk/catalog/admin/includes/boxes/01_configuration.php 2011-10-23 09:56:43 UTC (rev 3840)
+++ trunk/catalog/admin/includes/boxes/01_configuration.php 2011-10-23 19:28:16 UTC (rev 3841)
@@ -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 11/02/11, 09:49
+ @version 2.1.1
+ @date 23/10/11, 17:06
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -20,11 +20,5 @@
$tabl_link[130][4][]= array(FILENAME_COUNTRIES, 'BOX_TAXES_COUNTRIES', 'countries');
$tabl_link[130][4][]= array(FILENAME_GEO_ZONES, 'BOX_TAXES_GEO_ZONES', 'taxes_geo_zone');
$tabl_link[130][4][]= array(FILENAME_TAX_CLASSES, 'BOX_TAXES_TAX_CLASSES', 'taxes_classes');
-/* gestion gourpe admin */
- $tabl_link[140]= array('ss_menu','BOX_HEADING_CONF_ADMINISTRATOR','administrator');
- $tabl_link[140][4][]= array(FILENAME_ADMINUSERS, 'BOX_ADMINISTRATOR_MEMBERS', 'members');
- $tabl_link[140][4][]= array(FILENAME_ADMINGROUP, 'BOX_ADMINISTRATOR_GROUPS', 'groups');
- $tabl_link[140][4][]= array(FILENAME_ADMIN_MEMBERS.'?gID=groups', 'BOX_ADMINISTRATOR_GROUPS_PERMISSION', 'groups');
- $tabl_link[140][4][]= array(FILENAME_ADMINNOTIF, 'BOX_ADMIN_NOTIFICATIONS', 'groups');
?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/classes/drivers/sqlgeozone.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlgeozone.php (rev 0)
+++ trunk/catalog/admin/includes/classes/drivers/sqlgeozone.php 2011-10-23 19:28:16 UTC (rev 3841)
@@ -0,0 +1,197 @@
+<?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 23/10/11, 16:51
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class sqlgeozone
+ @brief manage insert/update/delete in zone tables
+*/
+
+
+
+
+class sqlgeozone
+ implements ModSqlDataDriver{
+
+ public static $modules;
+
+ protected static $_instance;
+
+ protected function __construct(){
+ }
+
+
+ public static function getInstance() {
+ if(self::$_instance == null) self::$_instance = new self();
+ return self::$_instance;
+ }
+
+
+ /**
+ @brief create new ligne in table configuration
+ */
+ public static function create($option){
+ self::getInstance();
+
+ if(!isset($option['name']))
+ return 'name';
+
+ $sql_data_array['geo_zone_name'] = tep_db_prepare_input($option['name']);
+ if(isset($option['type'])) $sql_data_array['geo_zone_type'] = tep_db_prepare_input($option['type']);
+ if(isset($option['description'])) $sql_data_array['geo_zone_description'] = tep_db_prepare_input($option['description']);
+
+ $sql_data_array['date_added'] = 'now()';
+
+ $res=tep_db_perform(TABLE_GEO_ZONES, $sql_data_array);
+
+ if(!$res)
+ return $res;
+ else
+ return $res->__get('insertId');
+ }
+
+ /**
+ @brief update ligne in table configuration
+ */
+ public static function update($option){
+ self::getInstance();
+
+ if(!isset($option['id']))
+ return 'id';
+
+ $where ='';
+ if(isset($option['id'])) $where .="AND geo_zone_id = '".(int)$option['id']."' ";
+
+ if(isset($option['name']))$sql_data_array['geo_zone_name'] = tep_db_prepare_input($option['name']);
+ if(isset($option['type'])) $sql_data_array['geo_zone_type'] = tep_db_prepare_input($option['type']);
+ if(isset($option['description'])) $sql_data_array['geo_zone_description'] = tep_db_prepare_input($option['description']);
+
+ $sql_data_array['last_modified'] = 'now()';
+ $res=tep_db_perform(TABLE_GEO_ZONES, $sql_data_array, 'update' , substr($where,3) );
+
+ return $res;
+ }
+
+ /**
+ @brief load ligne in table configuration
+ @param option array
+ id => row id int (configuration_id)
+ key => string key (configuration_key)
+ group_id => group_id int (configuration_group_id)
+ @param $shortkey use cleankey for return short key
+ @return
+
+ object(stdClass)[13]
+ public 'id' => string '1' (length=1)
+
+ OR
+ array(
+ object(stdClass)[13]
+ ...
+ object(stdClass)[13]
+ ..
+ )
+
+ */
+ public static function fetch($option,$shortkey=false){
+ self::getInstance();
+ $DB=Database::getInstance();
+
+ $sql ="";
+ if(isset($option['id'])) $sql .="AND geo_zone_id = '".(int)tep_db_input($option['id'])."' ";
+ if(isset($option['type'])) $sql .="AND geo_zone_type = '".(int)tep_db_input($option['type'])."' ";
+
+ if($sql=='')
+ return false;
+
+
+ $sql="SELECT * FROM " . TABLE_GEO_ZONES . " a ".
+// " LEFT JOIN " . TABLE_IMAGES_USED . " g ON (a.rowid=g.rowid) ".
+ " WHERE ".substr($sql,3);
+
+ $res=$DB->query($sql);
+
+ $num = $res->__get('numRows');
+
+ if($num == 1){
+ $result=$res->fetchAssoc();
+ return ((!$shortkey)? $result : self::CleanKey($result));
+ }
+ elseif($num > 1){
+ $array=array();
+
+ foreach($res->fetchAllAssoc() as $result)
+ $array[]= ((!$shortkey)? $result : self::CleanKey($result));
+
+ return $array;
+ }
+
+ return false;
+ }
+
+ /**
+ @brief delete row
+ */
+ public static function delete($option){
+ self::getInstance();
+ $DB=Database::getInstance();
+
+ if(isset($option['id']))
+ $_id = (int)tep_db_input($option['id']) ;
+ else
+ return false;
+
+ $DB->query("delete from " . TABLE_ZONES_TO_GEO_ZONES . " where geo_zone_id = '" . (int)$_id . "' ");
+
+ $DB->query("delete from " . TABLE_GEO_ZONES . " where geo_zone_id = '" . (int)$_id . "'");
+
+
+ return true;
+ }
+
+
+ /**
+ @brief
+ @return array product empty
+ */
+ public static function Specimen(){
+ $par = array('geo_zone_id' => '',
+ 'geo_zone_type' => '',
+ 'geo_zone_name' => '',
+ 'geo_zone_description' => '',
+ 'last_modified' => '',
+ 'date_added' => '',
+ );
+
+ return self::CleanKey($par);
+ }
+
+
+
+ /**
+ @fn CleanKey()
+ @brief Clean string name key
+ */
+ private static function CleanKey($array){
+ self::getInstance();
+ $object= new stdclass();
+
+ foreach($array as $key=>$value){
+ if( strpos($key,'geo_zone_') ===0)
+ $key=substr($key,9);
+
+
+ $object->$key = $value;
+ }
+
+ return $object;
+ }
+
+}
+
+
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/classes/modulesUtility.php
===================================================================
--- trunk/catalog/admin/includes/classes/modulesUtility.php (rev 0)
+++ trunk/catalog/admin/includes/classes/modulesUtility.php 2011-10-23 19:28:16 UTC (rev 3841)
@@ -0,0 +1,139 @@
+<?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 23/10/11, 17:20
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class modulesUtility
+*/
+class modulesUtility {
+
+
+ static public $pathType;
+
+ protected static $_instance;
+
+ protected function __construct(){
+
+ self::$pathType['checkout_process']=array('key'=>'MODULE_CHECKOUT_PROCESS_INSTALLED', 'value'=>MODULE_CHECKOUT_PROCESS_INSTALLED, 'module_directory'=> 'process/');
+ self::$pathType['shipping']=array('key'=>'MODULE_SHIPPING_INSTALLED', 'value'=>MODULE_SHIPPING_INSTALLED, 'module_directory'=>'shipping/');
+ self::$pathType['payment']=array('key'=>'MODULE_PAYMENT_INSTALLED', 'value'=>MODULE_PAYMENT_INSTALLED, 'module_directory'=> 'payment/');
+ self::$pathType['order_total']=array('key'=>'MODULE_ORDER_TOTAL_INSTALLED', 'value'=>MODULE_ORDER_TOTAL_INSTALLED, 'module_directory'=> 'order_total/');
+ self::$pathType['generic']=array('key'=>'MODULE_GENERIC_INSTALLED', 'value'=>MODULE_GENERIC_INSTALLED, 'key_BO'=>'MODULE_GENERIC_INSTALLED_BO', 'value_BO'=>MODULE_GENERIC_INSTALLED_BO,'module_directory'=>'generic/','module_language'=>DIR_FS_ADMIN.'includes/languages/');
+ self::$pathType['products']=array('key'=>'MODULE_ACAPRO_INSTALLED', 'value'=>MODULE_ACAPRO_INSTALLED,'key_BO'=>'MODULE_ACAPRO_INSTALLED_BO', 'value_BO'=>MODULE_ACAPRO_INSTALLED_BO,'module_directory'=> 'products/','module_language'=>DIR_FS_ADMIN.'includes/languages/' );
+ self::$pathType['content']=array('key'=>'MODULE_CONTENT_INSTALLED', 'value'=>MODULE_CONTENT_INSTALLED, 'key_BO'=>'MODULE_CONTENT_INSTALLED_BO', 'value_BO'=>MODULE_CONTENT_INSTALLED_BO,'module_directory'=>'content/','module_language'=>DIR_FS_ADMIN.'includes/languages/');
+ self::$pathType['categories']=array('key'=>'MODULE_ACACAT_INSTALLED', 'value'=>MODULE_ACACAT_INSTALLED ,'key_BO'=>'MODULE_ACACAT_INSTALLED_BO', 'value_BO'=>MODULE_ACACAT_INSTALLED_BO,'module_directory'=> 'categories/','module_language'=>DIR_FS_ADMIN.DIR_WS_LANGUAGES );
+ self::$pathType['account']=array('key'=>'MODULE_ACCOUNT_INSTALLED', 'value'=>MODULE_ACCOUNT_INSTALLED,'key_BO'=>'MODULE_ACCOUNT_INSTALLED_BO', 'value_BO'=>MODULE_ACCOUNT_INSTALLED_BO,'module_directory'=> 'account/','module_language'=>DIR_FS_ADMIN.DIR_WS_LANGUAGES );
+ self::$pathType['listing']=array('key'=>'MODULE_LISTING_INSTALLED', 'value'=>MODULE_LISTING_INSTALLED,'key_BO'=>'MODULE_LISTING_INSTALLED_BO', 'value_BO'=>@MODULE_LISTING_INSTALLED_BO,'module_directory'=> 'listing/','module_language'=>DIR_FS_ADMIN.DIR_WS_LANGUAGES );
+ self::$pathType['home']=array('key'=>'MODULE_HOME_INSTALLED', 'value'=>MODULE_HOME_INSTALLED, 'key_BO'=>'MODULE_HOME_INSTALLED_BO', 'value_BO'=>MODULE_HOME_INSTALLED_BO ,'module_directory'=>'home/','module_language'=>DIR_FS_ADMIN.DIR_WS_LANGUAGES );
+
+
+ }
+
+ protected static function getInstance() {
+ if(self::$_instance == null) self::$_instance = new self();
+ return self::$_instance;
+ }
+
+
+
+ static public function GetModule($type, $filename){
+ self::getInstance();
+
+ $r = new stdClass;
+
+ $r->classe = (( substr($row,-3) =='php') ? substr($row,0, -4) : $filename );
+
+
+
+ if(isset(self::$pathType[$type])){
+
+ $dt=new objectInfo(self::$pathType[$type]);
+
+ $r->detail = self::info_module($filename,DIR_FS_CATALOG.DIR_WS_MODULES.$dt->module_directory, DIR_FS_ADMIN.DIR_WS_MODULES.$dt->module_directory, '.php');
+
+ }
+
+ return $r;
+ }
+
+
+ static public function LoadModule($type, $filename){
+
+ global $language,$oscss;
+
+ self::getInstance();
+
+
+ $r = new stdClass;
+
+ $r->classe = (( substr($filename,-3) =='php') ? substr($filename,0, -4) : $filename );
+
+
+
+ if(isset(self::$pathType[$type])){
+
+ $dt=new objectInfo(self::$pathType[$type]);
+
+
+ $r->status = (bool)(in_array($filename,explode(';',$dt->value)));
+
+ $r->detail = self::info_module($filename,DIR_FS_CATALOG.DIR_WS_MODULES.$dt->module_directory, DIR_FS_ADMIN.DIR_WS_MODULES.$dt->module_directory, '.php');
+
+
+ $oscss->pile_file_lang(DIR_FS_CATALOG.DIR_WS_LANGUAGES.$language.'/modules/'.$type . '/' .$r->detail->filelg.'.txt');
+
+ include_once($r->detail->path.$r->detail->filemod);
+
+ if (class_exists($r->detail->classe)) {
+ $module = new $r->detail->classe;
+
+ $r->content = $module;
+ }
+
+ }
+
+ return $r;
+ }
+
+
+
+
+
+ /**
+ @param
+ @a string element file/dir
+ @a string path shop
+ @a string path admin
+ @a string ext
+ */
+ private static function info_module($file,$ref_shop, $ref_admin, $ref_ext='.php'){
+ $_obj=new stdClass;
+ $filelg='';
+ //! module dans leur propre sous rep
+ if(is_dir($ref_shop.$file)) {
+ $ref_shop .= $file.'/';
+ $ref_admin .= $file.'/';
+ $file .=$ref_ext;
+ $filelg = substr($file,0,-4).'/';
+ }
+
+ //! verif file in ext php
+ if (substr($file, strrpos($file, '.')) == $ref_ext) {
+ $class=substr($file, 0, (strlen($file)-strlen($ref_ext)));
+ $code=strtoupper($class);
+
+ if (file_exists($ref_admin.$file))$_obj->path_BO=$ref_admin;
+ if(file_exists($ref_shop.$file)) $_obj->path=$ref_shop;
+ $_obj->filemod=$file;
+ $_obj->classe=$class;
+ $_obj->filelg=$filelg.$class;
+ }
+
+ return $_obj;
+ }
+}
+?>
Modified: trunk/catalog/admin/includes/database_tables.php
===================================================================
--- trunk/catalog/admin/includes/database_tables.php 2011-10-23 09:56:43 UTC (rev 3840)
+++ trunk/catalog/admin/includes/database_tables.php 2011-10-23 19:28:16 UTC (rev 3841)
@@ -13,6 +13,8 @@
define('TABLE_ADMIN', DB_TABLE_PREFIX . 'admin_users');
define('TABLE_ADMIN_GROUPS', DB_TABLE_PREFIX . 'admin_groups');
define('TABLE_ADMIN_NOTIFICATION', DB_TABLE_PREFIX.'admin_notification');
+ define('TABLE_CIP', DB_TABLE_PREFIX . 'admin_cip');
+ define('TABLE_CIP_DEPEND', DB_TABLE_PREFIX . 'admin_cip_depend');
define('TABLE_ADMIN_FILES', DB_TABLE_PREFIX . 'admin_m_files');
define('TABLE_ADMIN_FILES2RIGHT', DB_TABLE_PREFIX . 'admin_m_files_to_right');
@@ -26,8 +28,7 @@
define('TABLE_CATEGORIES_DESCRIPTION', DB_TABLE_PREFIX . 'categories_description');
define('TABLE_CATEGORIES_EXTRA', DB_TABLE_PREFIX . 'categories_extra');
- define('TABLE_CIP', DB_TABLE_PREFIX . 'cip');
- define('TABLE_CIP_DEPEND', DB_TABLE_PREFIX . 'cip_depend');
+
define('TABLE_CONFIGURATION', DB_TABLE_PREFIX . 'configuration');
define('TABLE_CONFIGURATION_GROUP', DB_TABLE_PREFIX . 'configuration_group');
Added: trunk/catalog/admin/includes/gabarit/configuration/moddownloads.listing.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/moddownloads.listing.gab (rev 0)
+++ trunk/catalog/admin/includes/gabarit/configuration/moddownloads.listing.gab 2011-10-23 19:28:16 UTC (rev 3841)
@@ -0,0 +1,75 @@
+<?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.1
+ @date 22/09/11, 20:05
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @brief mise en forme de la gestion du stock
+*/
+?>
+
+<div id="ssmenu">
+ <?php echo tep_ssmenu_configuration($_GET['gparentID']) ?>
+</div>
+
+
+
+<h3 class="main-title"><?php echo __('moddownloads heading') ?></h3>
+
+<?php echo tep_draw_form('configuration', FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&gID=' . $_GET['gID'] . '&action=save_mutli') ?>
+
+
+<div class="block_form">
+
+ <fieldset class="block_field">
+ <?php /** */ $row = moddownloads::$list['DOWNLOAD_ENABLED']; ?>
+ <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>
+ </div>
+ </p>
+
+
+
+ <?php /** option de la gestion de stock, disponible que ci value precendente a true */ ?>
+ <?php if(_test_bool(moddownloads::$list['DOWNLOAD_ENABLED']->value)): ?>
+
+ <?php /** Attribut produit / option stock associé */ ?>
+
+ <h4 class="block_field-title"><?php echo __('moddownloads legend other') ?></h4>
+
+ <ul class="block_input">
+ <?php foreach(moddownloads::$list as $row)
+ if(!in_array($row->key,array('DOWNLOAD_ENABLED')) ) { ?>
+ <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 } ?>
+ </ul>
+ </fieldset>
+
+
+ <?php endif; ?>
+
+
+
+
+ <div class="button_nav">
+ <?php print tep_image_submit('button_copy.gif', IMAGE_UPDATE) .tep_js_back(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&gID=' . $_GET['gID'] )) ; ?>
+ </div>
+
+</div>
+</form>
\ No newline at end of file
Added: trunk/catalog/admin/includes/gabarit/configuration/modexpedition.listing.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/modexpedition.listing.gab (rev 0)
+++ trunk/catalog/admin/includes/gabarit/configuration/modexpedition.listing.gab 2011-10-23 19:28:16 UTC (rev 3841)
@@ -0,0 +1,206 @@
+<?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.1
+ @date 22/09/11, 20:05
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @brief mise en forme de la gestion du stock
+
+ @note
+ les id css de type (id="modexpedition-xxxx") sont urilisé dans la class associé, pour replacer la page apres enregsitrement
+*/
+?>
+
+<div id="ssmenu">
+ <?php echo tep_ssmenu_configuration($_GET['gparentID']) ?>
+</div>
+
+
+
+<h3 class="main-title"><?php echo __('heading modexpedition configuration') ?></h3>
+
+
+ <div id="tabs">
+ <ul>
+ <li><a href="#tabs-1"><?php echo __('tab shipping configuration'); ?></a></li>
+ <li><a href="#tabs-2"><?php echo __('tab shipping zones'); ?></a></li>
+ <li><a href="#tabs-3"><?php echo __('tab shipping modules'); ?></a></li>
+ </ul>
+
+ <div id="tabs-1" class="tabPage">
+
+ <?php echo tep_draw_form('configuration', FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&gID=' . $_GET['gID'] . '&action=save_mutli') ?>
+ <div id="modexpedition-config" class="block_form">
+
+
+ <fieldset class="block_field">
+ <legend><?php echo __('modexpedition legend localisation entrepot') ?></legend>
+ <div class="block_input">
+ <?php /** */ $row = modexpedition::$list['SHIPPING_ORIGIN_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 = modexpedition::$list['SHIPPING_ORIGIN_ZIP']; ?>
+ <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">
+ <?php /** */ $row = modexpedition::$list['SHIPPING_MAX_WEIGHT']; ?>
+ <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>
+ </div>
+ </p>
+ </fieldset>
+
+
+ <?php /** Attribut produit / option stock associé */ ?>
+ <fieldset class="block_field">
+ <legend class="block_field-title"><?php echo __('modexpedition legend other') ?></legend>
+
+ <ul class="block_input">
+ <?php foreach(modexpedition::$list as $row)
+ if(!in_array($row->key,array('SHIPPING_ORIGIN_COUNTRY', 'SHIPPING_ORIGIN_ZIP', 'SHIPPING_MAX_WEIGHT', 'HEADING_IMAGE_HEIGHT', 'SUBCATEGORY_IMAGE_WIDTH', 'SUBCATEGORY_IMAGE_HEIGHT', 'POPUP_IMAGE_WIDTH','POPUP_IMAGE_HEIGHT','STACK_IMAGE_WIDTH','STACK_IMAGE_HEIGHT','JPEG_QUALITY')) ) { ?>
+ <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 } ?>
+ </ul>
+ </fieldset>
+
+ <div class="button_nav">
+ <?php print tep_image_submit('button_copy.gif', IMAGE_UPDATE) .tep_js_back(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&gID=' . $_GET['gID'] )) ; ?>
+ </div>
+
+
+ <!-- <div class="block_field">
+ <h4 class="block_field-title"><?php echo __('modexpedition legend brief') ?></h4>
+
+ <p class="block_field-text"><?php printf(__('modexpedition text path images %s'), DIR_FS_CATALOG_IMAGES ) ?></p>
+ <p class="block_field-text"><?php printf(__('modexpedition text url images %s'), tep_catalog_href_link(DIR_WS_IMAGES,'','NONSSL',false) ) ?></p>
+
+ <p class="block_field-text"><?php echo __('modexpedition text brief') ?></p>
+
+ </div>-->
+ </div>
+ </form>
+ </div>
+
+
+
+
+
+ <div id="tabs-2" class="tabPage">
+ <?php /** Liste des zone de livraison */ ?>
+ <?php echo tep_draw_form('configuration', FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&gID=' . $_GET['gID'] . '&action=zones') ?>
+ <div id="modexpedition-zone" class="block_form">
+ <h4 class="main-title"><?php echo __('modexpedition heading zone shipping'); ?></h4>
+
+ <table class="dataTable">
+ <thead>
+ <tr>
+ <th><?php echo __('table heading tax zones'); ?></th>
+ <th><?php echo __('table heading tax zones desc'); ?></th>
+ <th><?php echo __('table heading nbr sub'); ?></th>
+ <th><?php echo __('table heading action'); ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <!-- AJAX BLOCK -->
+
+ <?php foreach(modexpedition::$zone as $row): ?>
+ <tr>
+ <td><?php echo tep_draw_input_field('modexpedition[zone]['.$row->id.']','',$row->name, ' style="width:100%;" '); ?></td>
+ <td><?php echo $row->description; ?></td>
+ <td class="tcenter"><?php echo tep_date_short(empty($row->last_modified)? $row->date_added : $row->last_modified); ?></td>
+ <td class="tright"><?php echo '' ?></td>
+ </tr>
+ <?php endforeach; ?>
+ </tbody>
+ </table>
+
+ <div class="button_nav">
+ <?php print tep_image_submit('button_copy.gif', IMAGE_UPDATE) .tep_js_back(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&gID=' . $_GET['gID'] )) ; ?>
+ </div>
+
+ </div>
+ </form>
+ </div>
+
+
+
+
+
+ <div id="tabs-3" class="tabPage">
+ <?php /** Liste des moduel de livraison */ ?>
+ <?php echo tep_draw_form('configuration', FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&gID=' . $_GET['gID'] . '&action=modules') ?>
+ <div id="modexpedition-module" class="block_form">
+ <h4 class="main-title"><?php echo __('modexpedition heading modules shipping'); ?></h4>
+
+
+ <table class="dataTable">
+ <thead>
+ <tr>
+ <th><?php echo __('table heading module code'); ?></th>
+ <th><?php echo __('table heading module title'); ?></th>
+ <th><?php echo __('table heading module desc'); ?></th>
+ <th><?php echo __('table heading module sort'); ?></th>
+ <th><?php echo __('table heading module status'); ?></th>
+ <th><?php echo __('table heading action'); ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php foreach(modexpedition::$module as $row): /*print_r($row)*/ ?>
+ <tr>
+ <td><?php echo $row->content->code; ?></td>
+ <td><?php echo $row->content->title; ?></td>
+ <td><?php echo $row->content->description; ?></td>
+ <td class="tcenter"><?php echo $row->content->sort_order; ?></td>
+ <td class="tcenter"><?php
+ if($row->status) {
+ echo tep_image(DIR_WS_ICONS . 'icon_status_green.gif', IMAGE_ICON_STATUS_GREEN) . ' <a href="' . tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&gID=' . $_GET['gID'] . '&action=modules'.'&flag=0' ) . '">' . tep_image(DIR_WS_ICONS . 'icon_status_red_light.gif', IMAGE_ICON_STATUS_RED_LIGHT) . '</a>';
+ } else {
+ echo '<a href="' . tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&gID=' . $_GET['gID'] . '&action=modules'.'&flag=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);
+ }
+ ?></td>
+ <td class="tright">
+ <?php echo '' ?>
+ </td>
+ </tr>
+ <?php endforeach; ?>
+ </tbody>
+ </table>
+
+
+ <div class="button_nav">
+ <?php print tep_image_submit('button_copy.gif', IMAGE_UPDATE) .tep_js_back(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&gID=' . $_GET['gID'] )) ; ?>
+ </div>
+
+ </div>
+ </form>
+ </div>
+
+</div>
\ No newline at end of file
Added: trunk/catalog/admin/includes/gabarit/configuration/modmembres.listing.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/modmembres.li...
[truncated message content] |
|
From: <os...@us...> - 2011-10-24 10:04:25
|
Revision: 3843
http://oscss.svn.sourceforge.net/oscss/?rev=3843&view=rev
Author: oscim
Date: 2011-10-24 10:04:15 +0000 (Mon, 24 Oct 2011)
Log Message:
-----------
suite report des langue espace config
Ajustement page config, pour la rise en charge des traductions bas?\195?\169 sur id gid.
Ajout des fichiers de langue
correction coquille commiut precendent sur css theme admin
Deport du dossier des driver sql dans un sous rep de class
correction coquille
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/configUtility.php
trunk/catalog/admin/includes/content/configuration.central.inc
trunk/catalog/admin/includes/content/configuration.top.inc
trunk/catalog/admin/includes/languages/fr_FR/boxes/01_configuration.php
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/my_boutique.txt
trunk/catalog/admin/includes/modules/configuration/modstock.php
trunk/catalog/admin/includes/template/oscss/jquery-ui-1.css
trunk/catalog/admin/includes/template/oscss/stylesheet-1.css
trunk/catalog/common/classes/Database.php
trunk/catalog/includes/classes/breadcrumb.php
trunk/catalog/install/includes/application.php
trunk/catalog/install/includes/language/fr_FR/oscss_config.txt
Added Paths:
-----------
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_0.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_10.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_11.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_128.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_14.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_15.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_16.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_17.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_2.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_20.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_21.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_22.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_24.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_27.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_8.txt
trunk/catalog/admin/includes/modules/configuration/modmail.php
trunk/catalog/common/classes/sql_drivers/
Removed Paths:
-------------
trunk/catalog/common/drivers/
Modified: trunk/catalog/admin/includes/classes/configUtility.php
===================================================================
--- trunk/catalog/admin/includes/classes/configUtility.php 2011-10-24 08:14:16 UTC (rev 3842)
+++ trunk/catalog/admin/includes/classes/configUtility.php 2011-10-24 10:04:15 UTC (rev 3843)
@@ -86,12 +86,7 @@
$keys= call_user_func(array($class_method[0], $class_method[1]), $value, $key);
}
else {
-/**
- @date 20/10/11, 23:02
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- TODO Desactiver bug sur les module des tache programmé
-*/
-// if(strpos($_function,')') === false) $_function.='(';
+ if(strpos($_function,'(') === false) $_function.='(';
eval('$keys = ' . $_function . "'" . $value . "', '" . $key . "');");
}
return $keys;
Modified: trunk/catalog/admin/includes/content/configuration.central.inc
===================================================================
--- trunk/catalog/admin/includes/content/configuration.central.inc 2011-10-24 08:14:16 UTC (rev 3842)
+++ trunk/catalog/admin/includes/content/configuration.central.inc 2011-10-24 10:04:15 UTC (rev 3843)
@@ -20,21 +20,23 @@
<?php echo $cfg->draw(); ?>
<?php elseif($action=='' && tep_not_null($gID) && is_numeric($gID) ): ?>
-<h3><?php echo tep_cst_menu_conf($cfg_group['configuration_group_title']); ?></h3>
-<h4><?php echo tep_cst_menu_conf('TITLE_'.$cfg_group['configuration_group_title']); ?></h4>
+
<div id="ssmenu">
<?php echo tep_ssmenu_configuration($gparentID); ?>
</div>
-<br style="clear:both" />
+
+<h3 class="main-title"><?php echo tep_cst_menu_conf($cfg_group['configuration_group_title']); ?></h3>
+<h4><?php echo tep_cst_menu_conf('TITLE_'.$cfg_group['configuration_group_title']); ?></h4>
+
<?php echo tep_draw_form('configuration', FILENAME_CONFIGURATION, 'gparentID=' . $gparentID.'&gID=' . $gID . '&action=save_mutli') ?>
<div class="box_left">
<ul class="block_form">
<?php foreach($list_edit as $row) { ?>
- <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>
+ <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 if (tep_not_null($row->description))echo $row->description; ?></label>
+ <label><?php if (tep_not_null(__($row->description)))echo __($row->description); ?></label>
<p>
<?php echo $row->value_field ; ?>
</p>
Modified: trunk/catalog/admin/includes/content/configuration.top.inc
===================================================================
--- trunk/catalog/admin/includes/content/configuration.top.inc 2011-10-24 08:14:16 UTC (rev 3842)
+++ trunk/catalog/admin/includes/content/configuration.top.inc 2011-10-24 10:04:15 UTC (rev 3843)
@@ -47,8 +47,12 @@
$cfg =new $class();
}
+ else {
+ $oscss->pile_file_lang(DIR_FS_ADMIN.DIR_WS_LANGUAGES.$language.'/modules/configuration/cfg_'.$gID.'.txt');
+ }
+
if(isset($mID) && class_exists($class)) $cfg->draw_action();
else
switch ($action) {
Modified: trunk/catalog/admin/includes/languages/fr_FR/boxes/01_configuration.php
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/boxes/01_configuration.php 2011-10-24 08:14:16 UTC (rev 3842)
+++ trunk/catalog/admin/includes/languages/fr_FR/boxes/01_configuration.php 2011-10-24 10:04:15 UTC (rev 3843)
@@ -58,5 +58,6 @@
define('BOX_HEADING_CONF_CONFIGURATION COMMERCIALE',"Configuration catalogue" );
define('BOX_HEADING_CONF_CONFIG_COMM',"Configuration commerciale" );
define('BOX_HEADING_CONF_TEMPLATE',"Template" );
-
+define('BOX_HEADING_CONF_BOX_CONFIGURATION_ENVIRONEMENT',"Environement" );
+define('BOX_HEADING_CONF_TITLE_BOX_CONFIGURATION_ENVIRONEMENT',"Environement" );
?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_0.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_0.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_0.txt 2011-10-24 10:04:15 UTC (rev 3843)
@@ -0,0 +1,29 @@
+<?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.1
+ @date 24/10/11, 11:18
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+$lang['TEMPLATE_NAME_S']="Nom du template par défaut" ;
+$lang['TEMPLATE_NAME_L']="Nom du template par défaut." ;
+$lang['TYPE_VIRTUAL_PRODUCTS_S']="type produit virtuel" ;
+$lang['TYPE_VIRTUAL_PRODUCTS_L']="préciser les statut de produit qui sont virtuel en opposition au produit physique" ;
+$lang['CFG_CLASS_VIRTUAL_TYPE_L']="les class non autorisées pour ce type de produits" ;
+$lang['CFG_CLASS_VIRTUAL_TYPE_1_S']="configuration type products 1" ;
+$lang['CFG_CLASS_VIRTUAL_TYPE_2_S']="configuration type products 2" ;
+$lang['CFG_CLASS_VIRTUAL_TYPE_3_S']="configuration type products 3" ;
+$lang['CFG_CLASS_VIRTUAL_TYPE_4_S']="configuration type products 4" ;
+$lang['ORPHELIN_COLLECTOR_S']="Collecteur d'orphelin" ;
+$lang['ORPHELIN_COLLECTOR_L']="Préciser l'id de la catégorie dans laquelle les éléments orphelins sont associés" ;
+$lang['PUBLIC_PAGE_TYPE_S']="type page public" ;
+$lang['PUBLIC_PAGE_TYPE_L']="precise les type de page public, cf extension et type extensions" ;
+$lang['DEFAULT_CURRENCY_S']="Devise par défaut" ;
+$lang['DEFAULT_CURRENCY_L']="Devise par défaut." ;
+$lang['DEFAULT_LANGUAGE_S']="Langage par défaut" ;
+$lang['DEFAULT_LANGUAGE_L']="Langage par défaut." ;
+
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_10.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_10.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_10.txt 2011-10-24 10:04:15 UTC (rev 3843)
@@ -0,0 +1,27 @@
+<?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.1
+ @date 24/10/11, 11:18
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+$lang['STORE_PAGE_PARSE_TIME_S']="Stockage du temps d'exécution" ;
+$lang['STORE_PAGE_PARSE_TIME__L']="Stocke le temps d'exécution d'une page." ;
+$lang['STORE_PAGE_PARSE_TIME_LOG_S']="Emplacement du fichier pour le stocke d'exécution" ;
+$lang['STORE_PAGE_PARSE_TIME_LOG_L']="Chemin d'accès et nom du fichier des temps d'exécution." ;
+$lang['STORE_PARSE_DATE_TIME_FORMAT_S']="Format de date des exécutions" ;
+$lang['STORE_PARSE_DATE_TIME_FORMAT_L']="Format de la date des exécutions." ;
+$lang['DISPLAY_PAGE_PARSE_TIME_S']="Affichage du temps d'exécution" ;
+$lang['DISPLAY_PAGE_PARSE_TIME_L']="Affiche le temps d'exécution d'une page (le stockage du temps d'exécution doit être activé et avoir choisie l'emplacement du fichier pour le stocke d'exécution)." ;
+$lang['STORE_DB_TRANSACTIONS_S']="Requêtes de base des données" ;
+$lang['STORE_DB_TRANSACTIONS_L']="Stocke les requêtes de la base des données avec les temps d'exécution." ;
+$lang['STORE_PAGE_PARSE_STOCK_ERROR_S']="erreur php fichier de log" ;
+$lang['STORE_PAGE_PARSE_STOCK_ERROR_L']="enregistrement des erreur php dans un fichier de log" ;
+$lang['STORE_PAGE_PARSE_EMAIL_OWNER_S']="erreur php email webmaster" ;
+$lang['STORE_PAGE_PARSE_EMAIL_OWNER_L']="Envoyer un email lors d'erreur php" ;
+
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_11.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_11.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_11.txt 2011-10-24 10:04:15 UTC (rev 3843)
@@ -0,0 +1,31 @@
+<?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.1
+ @date 24/10/11, 11:18
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+$lang['COUNTRY_LOCALNAME_S']="Afficher le nom local des états/pays" ;
+$lang['COUNTRY_LOCALNAME_L']="Afficher le nom local des états/pays sur create_account?<br />e.G.<br />Deutschland instead of Germany<br />Sverige instead of Sweden" ;
+$lang['AJAX_CART_MODE_S']="[panier] Utiliser javascript asynchrone" ;
+$lang['AJAX_CART_MODE_L']="Utiliser un javascript asynchrone (sans rafraîchissement de la page) pour le panier (modification du panier par l'utilisateur)." ;
+$lang['LOGIN_SET_SNAPSHOT_S']="Se souvenir de la page pour l'identification par box login ?" ;
+$lang['LOGIN_SET_SNAPSHOT_L']="Se souvenir de la page pour l'identification par box login ?" ;
+$lang['NO_SHOPPING_CART_FOR_GUEST_S']="Autoriser le panier sans connection" ;
+$lang['NO_SHOPPING_CART_FOR_GUEST_L']="Autoriser l'usage du panier sans compte et sans être connecté" ;
+$lang['ACCOUNT_FORCE_ACTIV_MAIL_S']="Impose la confirmation d'inscription par email " ;
+$lang['ACCOUNT_FORCE_ACTIV_MAIL_L']="Envoi un email de confirmation d'inscription " ;
+$lang['WHOS_ONLINE_ACTIVE_S']="[whos online] Active la détection des client en ligne" ;
+$lang['WHOS_ONLINE_ACTIVE_L']="Choisissez auto pour activer ce service à chaque fois que vous vous connecter à l'espace d'admin. Si vous choisissiez Off, ce service sera désactiver de manière permanente" ;
+$lang['USE_DEFAULT_LANGUAGE_CURRENCY_S']="Change la langue en fonction de la devise" ;
+$lang['USE_DEFAULT_LANGUAGE_CURRENCY_L']="Change automatiquement la langue sur celle correspondant à la nouvelle devise choisie." ;
+$lang['DISPLAY_CART_S']="Afficher le panier après l'ajout de produit" ;
+$lang['DISPLAY_CART_L']="Affiche le contenu du panier après avoir ajouté un article (ou retourne à l'origine)." ;
+
+$lang['ADVANCED_SEARCH_DEFAULT_OPERATOR_S']="Option de recherche par défaut" ;
+$lang['ADVANCED_SEARCH_DEFAULT_OPERATOR_L']="Choisir l'opérateur de recherche par défaut.<br />(AND ou OR)" ;
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_128.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_128.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_128.txt 2011-10-24 10:04:15 UTC (rev 3843)
@@ -0,0 +1,17 @@
+<?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.1
+ @date 24/10/11, 11:18
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+$lang['USE_LOCAL_GENERAT_PDF_S']="Generation des pdf(commande/BL..)" ;
+$lang['USE_LOCAL_GENERAT_PDF_L']="Utiliser un outils externe pour la generation des document pdf, disponible coté public et privé" ;
+
+$lang['USE_LOCAL_GENERAT_ORDER_REF_S']="Référence des commandes" ;
+$lang['USE_LOCAL_GENERAT_ORDER_REF_L']="Utiliser la numerotaion interne, ou laisser un outils externe prendre en charge cette référence. Celle ci ne sera donc disponible qu'apres la prise en compte par l'outil tiers de la commande. Coté public, le numero generic interne est utilisé en attente de reference" ;
+
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_14.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_14.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_14.txt 2011-10-24 10:04:15 UTC (rev 3843)
@@ -0,0 +1,17 @@
+<?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.1
+ @date 24/10/11, 11:18
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+$lang['GZIP_COMPRESSION_S']="Permettre compression GZip" ;
+$lang['GZIP_COMPRESSION_L']="Permettre la compression HTTP GZip." ;
+$lang['GZIP_LEVEL_S']="Niveau de Compression" ;
+$lang['GZIP_LEVEL_L']="Employer ce niveau de compression de 0 à 9.<br />(0 = minimum, 9 = maximum)" ;
+
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_15.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_15.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_15.txt 2011-10-24 10:04:15 UTC (rev 3843)
@@ -0,0 +1,30 @@
+<?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.1
+ @date 24/10/11, 11:18
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+$lang['SESSION_LIFE_ADMIN_S']="Durée de vie des sessions administrateurs" ;
+$lang['SESSION_LIFE_ADMIN_L']="Définir la durée de vie en minute des sessions administrateurs." ;
+$lang['SESSION_LIFE_PUBLIC_S']="Durée de vie des sessions visiteurs" ;
+$lang['SESSION_LIFE_PUBLIC_L']="Définir la durée de vie en minute des sessions visiteurs." ;
+$lang['SESSION_FORCE_COOKIE_USE_S']="Utilisation forcée des cookies" ;
+$lang['SESSION_FORCE_COOKIE_USE_L']="Forcer l'utilisation des sessions quand les cookies sont permis." ;
+$lang['SESSION_CHECK_SSL_SESSION_ID_S']="Vérifier l'identification de session" ;
+$lang['SESSION_CHECK_SSL_SESSION_ID_L']="Valider la SSL_SESSION_ID sur chaque demande de page sécurisée en HTTPS." ;
+$lang['SESSION_CHECK_USER_AGENT_S']="[user agent] Vérifier l'utilisateur" ;
+$lang['SESSION_CHECK_USER_AGENT_L']="Valider le navigateur du client sur chaque demande de page." ;
+$lang['SESSION_CHECK_IP_ADDRESS_S']="Vérifier l'adresse IP" ;
+$lang['SESSION_CHECK_IP_ADDRESS_L']="Valider l'adresse IP du client sur chaque demande de page." ;
+$lang['SESSION_BLOCK_SPIDERS_S']="[session] Empêcher les sessions d'araignée" ;
+$lang['SESSION_BLOCK_SPIDERS_L']="Empêcher les araignées connues de commencer une session." ;
+$lang['SESSION_RECREATE_S']="Recréer une session" ;
+$lang['SESSION_RECREATE_L']="Recréer la session pour produire une nouvelle identification de session quand le client entre ou créer un compte." ;
+
+
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_16.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_16.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_16.txt 2011-10-24 10:04:15 UTC (rev 3843)
@@ -0,0 +1,40 @@
+<?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.1
+ @date 24/10/11, 11:18
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+$lang['SEO_ENABLED_S']="SEO url" ;
+$lang['SEO_ENABLED_L']="active service SEO" ;
+$lang['SEO_ADD_CPATH_TO_PRODUCT_URLS_S']="Ajouter le cpath dans l'url" ;
+$lang['SEO_ADD_CPATH_TO_PRODUCT_URLS_L']="Ajoute le Cpath a la fin de l'url (i.e. - some-product-p-1.html?cPath=xx)." ;
+$lang['SEO_ADD_CAT_PARENT_S']="Ajoute la categorie parent dans l'url " ;
+$lang['SEO_ADD_CAT_PARENT_L']="Ce reglage ajoute la categorie parent dans l'url (i.e. - parent-category-c-1.html)." ;
+$lang['SEO_URLS_FILTER_SHORT_WORDS_S']="Filtre pour des url courte" ;
+$lang['SEO_URLS_FILTER_SHORT_WORDS_L']="Ce reglage impose un nomber de mots dans l'url." ;
+$lang['SEO_URLS_USE_W3C_VALID_S']="Sortie conforme au W3C?" ;
+$lang['SEO_URLS_USE_W3C_VALID_L']="Impose sortie conforme au W3C pour les url " ;
+$lang['USE_SEO_CACHE_GLOBAL_S']="Cache SEO sql ?" ;
+$lang['USE_SEO_CACHE_GLOBAL_L']="Active le cache sur les requete sql" ;
+$lang['USE_SEO_CACHE_PRODUCTS_S']="Cache url produit?" ;
+$lang['USE_SEO_CACHE_PRODUCTS_L']="Active le cache sur les url des produits" ;
+$lang['USE_SEO_CACHE_CATEGORIES_S']="Cache url categorie?" ;
+$lang['USE_SEO_CACHE_CATEGORIES_L']="Active le cache sur les url des categories." ;
+$lang['USE_SEO_CACHE_TOPICS_S']="Cache url articles?" ;
+$lang['USE_SEO_CACHE_TOPICS_L']="Active le cache sur les url des article." ;
+$lang['USE_SEO_CACHE_LINKS_S']="Cache url liens?" ;
+$lang['USE_SEO_CACHE_LINKS_L']="Active le cache sur les url des liens" ;
+$lang['SEO_REWRITE_TYPE_S']="Choix forme reecriture" ;
+$lang['SEO_REWRITE_TYPE_L']="Choix format" ;
+$lang['SEO_CHAR_CONVERT_SET_S']="Remplacemenet de caracteres" ;
+$lang['SEO_CHAR_CONVERT_SET_L']="Vous permet de remplacer les caracteres dans les url <strong>char=>conv,char2=>conv2</strong>" ;
+$lang['SEO_REMOVE_ALL_SPEC_CHARS_S']="Retirer les caractére non imprimable" ;
+$lang['SEO_REMOVE_ALL_SPEC_CHARS_L']="Retire tous les caractéres non imprimable" ;
+$lang['SEO_URLS_CACHE_RESET_S']="Vide le cache SEO" ;
+$lang['SEO_URLS_CACHE_RESET_L']="Vide le cache" ;
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_17.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_17.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_17.txt 2011-10-24 10:04:15 UTC (rev 3843)
@@ -0,0 +1,30 @@
+<?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.1
+ @date 24/10/11, 11:18
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+
+$lang['CHECKUP_WARN_S']="[checkup] active le chekup" ;
+$lang['CHECKUP_WARN_L']="Choisissez vrai pour activer les autre options" ;
+$lang['WARN_INSTALL_EXISTENCE_S']="[checkup] Vérifie si le répertoire d'installation est présent" ;
+$lang['WARN_INSTALL_EXISTENCE_L']="Choisissez vrai ou faux , si vous avez supprimer ce repertoire, placer sur faux" ;
+$lang['WARN_CONFIG_WRITEABLE_S']="[checkup] Vérifie l'accès en écriture du fichier configure.php" ;
+$lang['WARN_CONFIG_WRITEABLE_L']="Choisissez vrai par mesure de précaution." ;
+$lang['WARN_SESSION_DIRECTORY_NOT_WRITEABLE_S']="[checkup] Vérifie l'accès en écriture du répertoire des sessions" ;
+$lang['WARN_SESSION_DIRECTORY_NOT_WRITEABLE_L']="Choisissez faux une fois en production" ;
+$lang['WARN_DOWNLOAD_DIRECTORY_NOT_READABLE_S']="[checkup] Vérifie si le répertoire des downloads est lisible" ;
+$lang['WARN_DOWNLOAD_DIRECTORY_NOT_READABLE_L']="Choisissez vrai ou faux)" ;
+$lang['WARN_SESSION_AUTO_START_S']="[checkup] Vérifie la configuration serveur" ;
+$lang['WARN_SESSION_AUTO_START_L']="Choisissez vrai par précaution" ;
+
+$lang['BO_FILEBROSWER_SERVER_USE_S']="Filebrowser pour le serveur" ;
+$lang['BO_FILEBROSWER_SERVER_USE_L']="Préciser le broswer à utiliser pour naviguer dans les fichiers du serveur." ;
+$lang['BO_WISIWYG_SELECTED_S']="Éditeur mode html (wysiwyg)" ;
+$lang['BO_WISIWYG_SELECTED_L']="Préciser l'éditeur à utiliser" ;
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_2.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_2.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_2.txt 2011-10-24 10:04:15 UTC (rev 3843)
@@ -0,0 +1,16 @@
+<?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.1
+ @date 24/10/11, 11:18
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+$lang['TAX_DECIMAL_PLACES_S']="Taxe décimale" ;
+$lang['TAX_DECIMAL_PLACES_L']="Emplacement décimal pour la valeur du montant de la taxe." ;
+$lang['UNIT_WEIGHT_NAME_S']="Unité de poids" ;
+$lang['UNIT_WEIGHT_NAME_L']="Préciser l'unité de poids utilisée (kg)" ;
+
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_20.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_20.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_20.txt 2011-10-24 10:04:15 UTC (rev 3843)
@@ -0,0 +1,18 @@
+<?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.1
+ @date 24/10/11, 11:18
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+
+$lang['EXPECTED_PRODUCTS_SORT_S']="[module] Ordre de tri des articles" ;
+$lang['EXPECTED_PRODUCTS_SORT_L']="Ordre de tri utilisé dans la boîte 'articles en attente'.<br />(Ascendant ou Descendant)" ;
+$lang['EXPECTED_PRODUCTS_FIELD_S']="[module] Tri des articles en attente" ;
+$lang['EXPECTED_PRODUCTS_FIELD_L']="Critère de tri utilisé dans la boîte 'articles en attente'.<br />(par Nom ou par Date)" ;
+
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_21.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_21.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_21.txt 2011-10-24 10:04:15 UTC (rev 3843)
@@ -0,0 +1,30 @@
+<?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.1
+ @date 24/10/11, 11:18
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+$lang['MAX_DISPLAY_MANUFACTURERS_IN_A_LIST_S']="[boxe] Affichage du Bloc Fabricants" ;
+$lang['MAX_DISPLAY_MANUFACTURERS_IN_A_LIST_L']="Quand le nombre de fabricants dépasse cette valeur, une 'liste déroulante' sera utilisée à la place de la liste par défaut." ;
+$lang['MAX_MANUFACTURERS_LIST_S']="[boxe] Affichage du Bloc Fabricants 'Liste'" ;
+$lang['MAX_MANUFACTURERS_LIST_L']="Quand cette valeur est égale à 1 la 'liste déroulante' classique sera utilisée. Sinon, une liste sera affichée avec le nombre de lignes spécifiées." ;
+$lang['MAX_DISPLAY_MANUFACTURER_NAME_LEN_S']="[boxe] Affichage du Bloc Fabricants 'Longueur du nom'" ;
+$lang['MAX_DISPLAY_MANUFACTURER_NAME_LEN_L']="Longueur maximum du nom de fabricant à afficher." ;
+$lang['MAX_RANDOM_SELECT_NEW_S']="[boxe]Sélection de nouveaux produits au hasard" ;
+$lang['MAX_RANDOM_SELECT_NEW_L']="Nombre d'entrées possible pour choisir (affichage) un des nouveaux produits." ;
+$lang['MAX_RANDOM_SELECT_SPECIALS_S']="[boxe]Sélection d'articles en promotion au hasard" ;
+$lang['MAX_RANDOM_SELECT_SPECIALS_L']="Nombre d'entrées possible pour choisir (affichage) un des articles ayant une offre promotionnelle ou ayant un effet spécial." ;
+
+
+
+$lang['OSCSS__B_RECENTLY_VIEWED_S']="[recently_viewed] activer les produits récemment vu" ;
+$lang['OSCSS__B_RECENTLY_VIEWED_L']="Choisissez vrai pour activer l'enregistrement des produits vues.! Attention, gourmand en ressource" ;
+$lang['CLASSIC_CATEGORIES_TREE_S']="Utiliser le menu catégories classique" ;
+$lang['CLASSIC_CATEGORIES_TREE_L']="Sélectionner l'apparence du menu catégories.<br />Menu classique ( true ) <br /> Menu déroulant en css ( false )" ;
+
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_22.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_22.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_22.txt 2011-10-24 10:04:15 UTC (rev 3843)
@@ -0,0 +1,59 @@
+<?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.1
+ @date 24/10/11, 11:18
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+/// 22 cart recover
+$lang['RCS_BASE_DAYS_S']="Revu des jours" ;
+$lang['RCS_BASE_DAYS_L']="Nombre de jours antérieurs à partir d'aujourd'hui pour les cartes abandonnés." ;
+$lang['RCS_SKIP_DAYS_S']="Jours à ignorer" ;
+$lang['RCS_SKIP_DAYS_L']="Nombre de jours à ignorer lors d'une recherche de panier abandonnés." ;
+$lang['RCS_REPORT_DAYS_S']="Rapport /jours résultats des ventes " ;
+$lang['RCS_REPORT_DAYS_L']="Nombre de jour de vente à prendre en compte dans les rapports d'un compte. Plus il y a de jour, plus la requête SQL est longue !" ;
+$lang['RCS_INCLUDE_TAX_IN_PRICES_S']="Utiliser les taxes calculées" ;
+$lang['RCS_INCLUDE_TAX_IN_PRICES_L']="Essayez de calculer les taxes lors de la détermination des prix. Cela ne peut pas être 100% correct suivant l'emplacement, etc. Peut comporter des erreurs." ;
+$lang['RCS_USE_FIXED_TAX_IN_PRICES_S']="Utiliser les taxes fixes" ;
+$lang['RCS_USE_FIXED_TAX_IN_PRICES_L']="Utiliser un taux de taxes fixe lors de la détermination des prix (taux fixé ci-dessous) . Substitution si les taxes utilisées calculées est True." ;
+$lang['RCS_FIXED_TAX_RATE_S']="Taux de taxe fixe" ;
+$lang['RCS_FIXED_TAX_RATE_L']="Le taux de taxe fixe est utilisé lorsque 'Utiliser les taxes fixes' est sur true et 'Utiliser les taxes calculées' est sur false.<br />Utilisez des valeurs décimales, ex: 0.10 for 10%." ;
+$lang['RCS_EMAIL_TTL_S']="Longueur de vie d'un E-Mail" ;
+$lang['RCS_EMAIL_TTL_L']="Nombre de jour à laisser à un email avant de ne plus les afficher comme envoyés." ;
+$lang['RCS_EMAIL_FRIENDLY_S']="E-Mails amis" ;
+$lang['RCS_EMAIL_FRIENDLY_L']="Si cette valeur est sur <strong>true</strong> le nom du client sera utilisé dans le mail de bienvenue. Si la valeur est sur <strong>false</strong> le mail générique sera envoyé." ;
+$lang['RCS_EMAIL_COPIES_TO_S']="Envoyer une copie des E-Mail à" ;
+$lang['RCS_EMAIL_COPIES_TO_L']="Lors des rappels des panier abandonnés vers les clients, envoyer une copie à l'adresse suivante :" ;
+$lang['RCS_SHOW_ATTRIBUTES_S']="Voir les Attributs" ;
+$lang['RCS_SHO...
[truncated message content] |
|
From: <os...@us...> - 2011-10-24 16:21:37
|
Revision: 3844
http://oscss.svn.sourceforge.net/oscss/?rev=3844&view=rev
Author: oscim
Date: 2011-10-24 16:21:27 +0000 (Mon, 24 Oct 2011)
Log Message:
-----------
Suite evolution des modules de configuration
Correction mineurs
Modified Paths:
--------------
trunk/catalog/admin/includes/functions/lib.configuration.php
trunk/catalog/admin/includes/template/oscss/inc/init_theme-1.php
trunk/catalog/admin/includes/template/oscss/stylesheet-1.css
trunk/catalog/admin/includes/widget/brief_config.php
trunk/catalog/common/classes/Database.php
trunk/catalog/install/includes/language/fr_FR/oscss_config.txt
trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration_group.sql
Added Paths:
-----------
trunk/catalog/admin/includes/gabarit/configuration/modadminconfig.listing.gab
trunk/catalog/admin/includes/gabarit/configuration/modcustextra/
trunk/catalog/admin/includes/gabarit/configuration/modcustextra/draw.delete.gab
trunk/catalog/admin/includes/gabarit/configuration/modcustextra/draw.edit.gab
trunk/catalog/admin/includes/gabarit/configuration/modcustextra/draw.listing.gab
trunk/catalog/admin/includes/gabarit/configuration/modlangue.listing.gab
trunk/catalog/admin/includes/gabarit/configuration/modprodextra/
trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.delete.gab
trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.edit.gab
trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.listing.gab
trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.value.edit.gab
trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.value.listing.gab
trunk/catalog/admin/includes/gabarit/configuration/modseourl.listing.gab
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modadminconfig.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modcustextra.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modlangue.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modprodextra.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modseourl.txt
trunk/catalog/admin/includes/modules/configuration/modadminconfig.php
trunk/catalog/admin/includes/modules/configuration/modcustextra.php
trunk/catalog/admin/includes/modules/configuration/modlangue.php
trunk/catalog/admin/includes/modules/configuration/modprodextra.php
trunk/catalog/admin/includes/modules/configuration/modseourl.php
Removed Paths:
-------------
trunk/catalog/admin/includes/gabarit/cfg_31.listing.gab
trunk/catalog/admin/includes/gabarit/cfg_33.delete.gab
trunk/catalog/admin/includes/gabarit/cfg_33.edit.gab
trunk/catalog/admin/includes/gabarit/cfg_33.listing.gab
trunk/catalog/admin/includes/gabarit/cfg_34.delete.gab
trunk/catalog/admin/includes/gabarit/cfg_34.label.edit.gab
trunk/catalog/admin/includes/gabarit/cfg_34.listing.gab
trunk/catalog/admin/includes/gabarit/cfg_34.value.edit.gab
trunk/catalog/admin/includes/gabarit/cfg_34.value.listing.gab
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_16.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_17.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_31.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_33.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_34.txt
trunk/catalog/admin/includes/modules/configuration/cfg_31.php
trunk/catalog/admin/includes/modules/configuration/cfg_33.php
trunk/catalog/admin/includes/modules/configuration/cfg_34.php
Modified: trunk/catalog/admin/includes/functions/lib.configuration.php
===================================================================
--- trunk/catalog/admin/includes/functions/lib.configuration.php 2011-10-24 10:04:15 UTC (rev 3843)
+++ trunk/catalog/admin/includes/functions/lib.configuration.php 2011-10-24 16:21:27 UTC (rev 3844)
@@ -28,7 +28,17 @@
/**
- Alias function for Store configuration values in the Administration Tool
+ @fn tep_cfg_select_option($select_array, $key_value, $key = '')
+ @brief Alias function for Store configuration values in the Administration Tool
+ @param $select_array array array('true', 'false')
+ @param $key_value current value status
+ @param $key key input name configuration[' . $key . '] Or configuration_value
+ @return string
+ <span class="edit-input">
+ <input type="radio" name="" />
+ <span class="edit-input-value Val-.."> text value </span>
+ <span class="edit-input-value-alternate Val-.."></span>
+ </span>
*/
function tep_cfg_select_option($select_array, $key_value, $key = '') {
$string = '';
@@ -36,15 +46,25 @@
$name = ((tep_not_null($key)) ? 'configuration[' . $key . ']' : 'configuration_value');
$string .= '<span class="edit-input"> <input type="radio" name="' . $name . '" value="' . $select_array[$i] . '"';
if ($key_value == $select_array[$i]) $string .= ' checked="checked"';
- $string .= '/> <span class="edit-input-value"> ' . $select_array[$i] . ' </span> </span> <br />';
+ $string .= '/> <span class="edit-input-value Val-'.$select_array[$i].' "> ' . $select_array[$i] . ' </span> <span class="edit-input-value-alternate Val-'.$select_array[$i].'"></span> </span> <br />';
}
return $string;
}
/**
- Function de la table admin_config; met en forme le tableau d'option,possible avec un tabelau clef/valeur, avec la key pour valeur db et value pour lecture humaine
- $select_array = array(key=value => value=text)
+ @fn tep_cfg_select_option_bis($select_array, $key_value, $key = '')
+ @brief Function de la table admin_config; met en forme le tableau d'option,possible avec un tabelau clef/valeur, avec la key pour valeur db et value pour lecture humaine
+ @param $select_array array array(key=value => value=text)
+ @param $key_value current value status
+ @param $key key input name configuration[' . $key . '] Or configuration_value
+ @return string
+ @return string
+ <span class="edit-input">
+ <input type="radio" name="" />
+ <span class="edit-input-value Val-.."> text value </span>
+ <span class="edit-input-value-alternate Val-.."></span>
+ </span>
*/
function tep_cfg_select_option_bis($select_array, $key_value, $key = '') {
$string = '';
@@ -52,18 +72,24 @@
$name = ((tep_not_null($key)) ? 'configuration[' . $key . ']' : 'configuration_value');
$string .= '<span class="edit-input"> <input type="radio" name="' . $name . '" value="' . $rs['key'] . '"';
if ($key_value == $rs['key']) $string .= ' checked="checked"';
- $string .= '/> <span class="edit-input-value"> ' . $rs['value'] . '</span> </span> <br />';
+ $string .= '/> <span class="edit-input-value Val-'.$rs['key'].' "> ' . $rs['value'] . '</span><span class="edit-input-value-alternate Val-'.$rs['key'].' "></span> </span> <br />';
}
return $string;
}
/**
- Alias tep_cfg_select_option_bis en Select
+ @fn tep_cfg_select_pull_down($select_array, $key_value, $key = '')
+ @brief Alias tep_cfg_select_option_bis en Select
+ @param $select_array array array(key=value => value=text)
+ @param $key_value current value status
+ @param $key key input name configuration[' . $key . '] Or configuration_value
+ @return string
*/
function tep_cfg_select_pull_down($select_array, $key_value, $key = '') {
$name = (tep_not_null($key) ? 'configuration[' . $key . ']' : 'configuration_value');
- foreach ($select_array as $k=>$v) $list_array[] = array('id' => $k, 'text' => $v);
+ foreach ($select_array as $k=>$v)
+ $list_array[] = array('id' => $k, 'text' => $v);
return tep_draw_pull_down_menu($name, $list_array, $key_value);
}
Deleted: trunk/catalog/admin/includes/gabarit/cfg_31.listing.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/cfg_31.listing.gab 2011-10-24 10:04:15 UTC (rev 3843)
+++ trunk/catalog/admin/includes/gabarit/cfg_31.listing.gab 2011-10-24 16:21:27 UTC (rev 3844)
@@ -1,50 +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.0.9
- @date 18/08/10, 18:12
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-error_reporting(E_ALL);
-?>
-<h3><?php echo __('heading title') ?></h3>
-
- <div class="button_nav">
- <a class="button" href="<?php echo tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','lID')). 'action=new') ?>"><?php echo tep_image(DIR_WS_ICONS . 'icon_add_new.png', IMAGE_NEW_LANGUAGE). IMAGE_NEW_LANGUAGE ?></a>
- </div>
-
-<div class="box_left">
- <div id="ssmenu">
- <?php echo tep_ssmenu_configuration(cfg_31::$gparentID) ?>
- </div>
- <table class="dataTable">
- <thead>
- <tr>
- <th><?php echo __('table heading language name') ?></th>
- <th class="tleft" style="width:40px"><?php echo __('table heading language code') ?></th>
- <th class="tright"><?php echo __('table heading action') ?></th>
- </tr>
- </thead>
- <tbody>
- <?php foreach (cfg_31::$liste as $theme): ?>
- <tr class="view parent dataTableRow <?php echo (($theme->languages_id==@$_GET['lID'])?'Selected' :'') ?>">
- <td><?php echo $theme->name ?></td>
- <td><?php echo $theme->code ?></td>
- <td class="row_action">
- <a class="buttonimg" href="<?php echo tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','lID')). 'lID=' .$theme->languages_id. '&action=edit') ?>"><?php echo tep_image(DIR_WS_ICONS . 'icon_edit.png',IMAGE_EDIT )?></a>
- <a class="buttonimg" href="<?php echo tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','lID')). 'lID=' . $theme->languages_id . '&action=delete') ?>"><?php echo tep_image(DIR_WS_ICONS . 'icon_delete.png',IMAGE_DELETE) ?></a>
-
- <?php if (isset(cfg_31::$lInfo) && is_object(cfg_31::$lInfo) && ($theme->languages_id == cfg_31::$lInfo->languages_id)) { echo tep_image(DIR_WS_ICONS . 'icon_arrow_right.gif', ''); }
- else { echo '<a href="' . tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','oID')). 'lID=' . $theme->languages_id) . '">' . tep_image(DIR_WS_ICONS . 'icon_info.gif', IMAGE_ICON_INFO) . '</a>'; } ?>
- </td>
- </tr>
- <?php endforeach; ?>
-
- </tbody>
- </table>
-</div>
-
-<?php cfg_31::draw_right_columm(); ?>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/gabarit/cfg_33.delete.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/cfg_33.delete.gab 2011-10-24 10:04:15 UTC (rev 3843)
+++ trunk/catalog/admin/includes/gabarit/cfg_33.delete.gab 2011-10-24 16:21:27 UTC (rev 3844)
@@ -1,17 +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 02/03/11, 08:34
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-?>
-<h3><?php echo __('heading title option delete') ?></h3>
- <?php echo tep_draw_form('delete', cfg_33::FILENAME, FILENAME_CFG_33.'&cID='.$_GET['cID'].'&action=deleteconfirm', 'post') ?>
-
- <?php echo tep_image_submit('', IMAGE_DELETE). tep_js_back(tep_href_link(cfg_33::FILENAME, tep_get_all_get_params(array('action','cID'))), IMAGE_CANCEL) ; ?>
-
- </form>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/gabarit/cfg_33.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/cfg_33.edit.gab 2011-10-24 10:04:15 UTC (rev 3843)
+++ trunk/catalog/admin/includes/gabarit/cfg_33.edit.gab 2011-10-24 16:21:27 UTC (rev 3844)
@@ -1,82 +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 03/03/11, 20:17
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-global $languages;
-?>
-<h3><?php echo __('text heading edit field') ?></h3>
- <?php echo tep_draw_form('update', cfg_33::FILENAME, FILENAME_CFG_33.((!empty(cfg_33::$fInfo->fields_id )?'&cID=' . cfg_33::$fInfo->fields_id . '&action=update' :'&action=insert') ), 'post') ?>
-
-
- <p>
- <?php echo __('text edit intro') ?>
- </p>
-
-
-
- <p class="block_input">
- <?php echo __('text field name') ?>
- <?php for ($i=0, $n=sizeof($languages); $i<$n; $i++) : ?>
- <?php echo tep_image(DIR_WS_CATALOG_LANGUAGES . $languages[$i]['directory'] . '/images/' . $languages[$i]['image'], $languages[$i]['name']) . ' ' . tep_draw_input_field('fields_name[' . $languages[$i]['id'] . ']','fields_name_' . $languages[$i]['id'],cfg_33::get_customers_extra_fields_name(cfg_33::$fInfo->fields_id, $languages[$i]['id'])); ?>
- <?php endfor; ?>
- </p>
-
- <ul class="block_input">
- <li><?php echo tep_draw_radio_field('fields_input_type','fields_input_type', 0, (cfg_33::$fInfo->fields_input_type==0) ? true : false) . __('text input field') ?></li>
- <li><?php echo tep_draw_radio_field('fields_input_type','fields_input_type', 1, (cfg_33::$fInfo->fields_input_type==1) ? true : false) . __('text textarea field') ?></li>
- <li><?php echo tep_draw_radio_field('fields_input_type','fields_input_type', 2, (cfg_33::$fInfo->fields_input_type==2) ? true : false) . __('text radio field') ?></li>
- <li><?php echo tep_draw_radio_field('fields_input_type','fields_input_type', 3, (cfg_33::$fInfo->fields_input_type==3) ? true : false) . __('text check field') ?></li>
- <li><?php echo tep_draw_radio_field('fields_input_type','fields_input_type', 4, (cfg_33::$fInfo->fields_input_type==4) ? true : false) . __('text down field') ?></li>
- </ul>
-
- <p class="block_input">
- <label for="fields_input_value" title="<?php echo __('text field input value help') ?>"><?php echo __('text field input value').tep_image(DIR_WS_ICONS . 'icon_help.gif') ?></label>
- <?php echo tep_draw_textarea_field('fields_input_value', 'fields_input_value', 30, 8, cfg_33::$fInfo->fields_input_value) ?>
- </p>
-
- <p class="block_input">
- <label ><?php echo __('text field required status') ?></label>
- <?php echo tep_draw_radio_field('fields_required_status','fields_required_status', 0, (cfg_33::$fInfo->fields_required_status==0) ? true : false) . 'false' . tep_draw_radio_field('fields_required_status','fields_required_status', 1, (cfg_33::$fInfo->fields_required_status==1) ? true : false) . 'true' ?>
- </p>
-
-
- <p class="block_input">
- <label><?php echo __('text field size') ?></label>
- <?php echo tep_draw_input_field('fields_size','fields_size', cfg_33::$fInfo->fields_size) ?>
- </p>
-
- <p class="block_input">
- <label><?php echo __('text field status email') ?></label>
- <?php echo tep_draw_radio_field('fields_required_email','fields_required_email',0,(cfg_33::$fInfo->fields_required_email==0)?true:false) . 'false' . tep_draw_radio_field('fields_required_email','fields_required_email',1,(cfg_33::$fInfo->fields_required_email==1)?true:false) . 'true' ?>
- </p>
-
- <p class="block_input">
- <label for="fields_key" title="<?php echo __('text field input key') ?>"><?php echo __('text field key').tep_image(DIR_WS_ICONS . 'icon_help.gif') ?></label>
- <?php echo tep_draw_input_field('fields_key','fields_key', cfg_33::$fInfo->fields_key) ?>
- </p>
-
- <p class="block_input">
- <label for="fields_admin" title="<?php echo __('text field input fields_admin') ?>"><?php echo __('text field fields_admin').tep_image(DIR_WS_ICONS . 'icon_help.gif') ?></label>
- <?php echo tep_draw_pull_down_menu('fields_admin',array(array('id'=>0,'text'=>__('visible BO and FO')) ,array('id'=>1,'text'=>__('uniquement admin')) ,array('id'=>2,'text'=>__('hidden')) ), cfg_33::$fInfo->fields_admin) ?>
- </p>
-
- <p class="block_input">
- <label for="fields_special_mod" title="<?php echo __('text field input fields_special_mod') ?>"><?php echo __('text field fields_special_mod').tep_image(DIR_WS_ICONS . 'icon_help.gif') ?></label>
- <?php echo tep_draw_input_field('fields_special_mod','fields_special_mod', cfg_33::$fInfo->fields_special_mod) ?>
- </p>
-
- <p class="block_input">
- <label for="fields_group_class" title="<?php echo __('text field input fields_group_class') ?>"><?php echo __('text field fields_group_class').tep_image(DIR_WS_ICONS . 'icon_help.gif') ?></label>
- <?php echo tep_draw_input_field('fields_group_class','fields_group_class', cfg_33::$fInfo->fields_group_class) ?>
- </p>
-
- <div class="button_nav">
- <?php echo tep_image_submit('',((!empty(cfg_33::$fInfo->fields_id )?IMAGE_UPDATE :IMAGE_SAVE)) ). tep_js_back(tep_href_link(cfg_33::FILENAME, tep_get_all_get_params(array('action','cID'))), IMAGE_CANCEL) ; ?>
- </div>
- </form>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/gabarit/cfg_33.listing.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/cfg_33.listing.gab 2011-10-24 10:04:15 UTC (rev 3843)
+++ trunk/catalog/admin/includes/gabarit/cfg_33.listing.gab 2011-10-24 16:21:27 UTC (rev 3844)
@@ -1,62 +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 03/03/11, 20:17
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-global $gparentID;
-?>
-<div id="ssmenu">
- <?php echo tep_ssmenu_configuration($gparentID) ?>
-</div>
-
- <h3><?php echo __("heading title"); ?></h3>
- <div class="button_nav">
- <p><?php echo '<a class="button" href="' . tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','cID')) . 'action=new') . '">' . tep_image(DIR_WS_ICONS . 'icon_add_new.png', IMAGE_INSERT). IMAGE_INSERT . '</a>'; ?></p>
- </div>
-
- <div class="">
-
- <table class="dataTable">
- <thead>
- <tr>
- <th><?php echo __('table heading fields'); ?></th>
- <th class="tcenter"><?php echo __('table heading visibility'); ?></th>
- <th class="tcenter"><?php echo __('table heading group class'); ?></th>
- <th class="tcenter"><?php echo __('table heading status'); ?></th>
- <th class="row_action"><?php echo __('table heading action'); ?></th>
- </tr>
- </thead>
- <tfoot>
- <tr>
- <td><?php echo cfg_33::$split->display_count(cfg_33::$fields_query_numrows, MAX_DISPLAY_SEARCH_RESULTS, $page, __('text display number of fields')); ?></td>
- <td colspan="2"><?php echo cfg_33::$split->display_links(cfg_33::$fields_query_numrows, MAX_DISPLAY_SEARCH_RESULTS, MAX_DISPLAY_PAGE_LINKS, $page);; ?></td>
- </tr>
- </tfoot>
- <?php foreach(cfg_33::$list as $fields) { ?>
- <tr class="dataTableRow <?php if(isset( cfg_33::$fInfo) && is_object( cfg_33::$fInfo) && cfg_33::$fInfo->fields_id == cfg_33::$cID) echo "Selected" ?>" >
- <td><?php echo $fields->fields_name; ?></td>
- <td><?php echo $fields->fields_admin; ?></td>
- <td><?php echo $fields->fields_group_class; ?></td>
- <td class="tcenter">
- <?php
- if ($fields->fields_status == '1') {
- echo tep_image(DIR_WS_ICONS . 'icon_status_green.gif', IMAGE_ICON_STATUS_GREEN) . ' <a href="' . tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','flag','fID')) . 'action=setflag&flag=0&fID=' . $fields->fields_id. '&page=' . $page) . '">' . tep_image(DIR_WS_ICONS . 'icon_status_red_light.gif', IMAGE_ICON_STATUS_RED_LIGHT) . '</a>';
- } else {
- echo '<a href="' . tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','flag','fID')) . 'action=setflag&flag=1&fID=' . $fields->fields_id . '&page=' . $page) . '">' . 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);
- }
- ?>
- </td>
- <td class="row_action">
- <?php echo cfg_33::get_item_action($fields); ?>
- </td>
- </tr>
- <?php } ?>
- </table>
- </div>
-
-
Deleted: trunk/catalog/admin/includes/gabarit/cfg_34.delete.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/cfg_34.delete.gab 2011-10-24 10:04:15 UTC (rev 3843)
+++ trunk/catalog/admin/includes/gabarit/cfg_34.delete.gab 2011-10-24 16:21:27 UTC (rev 3844)
@@ -1,27 +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 27/02/11, 09:51
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
- @brief gabarit for listing extra fields products
-*/
-?>
-
-<h3><?php echo HEADING_TITLE ?></h3>
-
-<h4><?php echo HEADING_DELETE . cfg_34::$eid ?></h4>
-
-<?php if (cfg_34::$double_check == 'no') {
- echo '<p>' . TEXT_ARE_SURE . (cfg_34::$pInfo->uses_list ? TEXT_VALUES_GONE : '') . "</p>\n";
- echo '<p>' . tep_draw_form('yes',cfg_34::FILENAME, tep_get_all_get_params(array('action','eid','confirm')). 'confirm=yes&action=delete&eid=' . cfg_34::$eid . '&used=' . cfg_34::$pInfo->used) . tep_draw_input_field('yes','', TEXT_YES, 'alt="' . TEXT_YES . '"', false, 'submit') . '</form> ';
- echo tep_draw_form('no', cfg_34::FILENAME, tep_get_all_get_params(array('action','eid','confirm')) .'eid=' . cfg_34::$eid) . tep_draw_input_field('no','', TEXT_NO, 'alt="' . TEXT_NO . '"', false, 'submit') . "</form></p>\n";
- } else {
- echo '<p><b>' . TEXT_CONFIRM_DELETE . (cfg_34::$pInfo->uses_list ? TEXT_VALUES_GONE : '') . "</b></p>\n";
- echo '<p>' . tep_draw_form('yes', cfg_34::FILENAME, tep_get_all_get_params(array('action','eid','confirm')). 'confirm=yes&action=delete&eid=' . cfg_34::$eid) . tep_draw_input_field('yes','', TEXT_YES, 'alt="' . TEXT_YES . '"', false, 'submit') . '</form> ';
- echo tep_draw_form('no', cfg_34::FILENAME, tep_get_all_get_params(array('action','eid','confirm')).'eid=' . cfg_34::$eid) . tep_draw_input_field('no','', TEXT_NO, 'alt="' . TEXT_NO . '"', false, 'submit') . "</form></p>\n";
- }
-?>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/gabarit/cfg_34.label.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/cfg_34.label.edit.gab 2011-10-24 10:04:15 UTC (rev 3843)
+++ trunk/catalog/admin/includes/gabarit/cfg_34.label.edit.gab 2011-10-24 16:21:27 UTC (rev 3844)
@@ -1,120 +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 27/02/11, 09:51
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
- @brief gabarit for listing extra fields products
-
-*/
-global $action, $languages;
-?>
- <div class="box_unique">
- <h4><?php echo (($action == 'edit')? __('HEADING_NEW') : __('HEADING_EDIT') . cfg_34::$eid ) ?></h4>
- <?php
- if (!empty($messages)) {
- echo '<ul ' . ($error ? 'class="error"' : 'class="warning"') . '>' . "\n";
- foreach ($messages as $message) {
- echo '<li>' . $message . "</li>\n";
- }
- echo "</ul>\n";
- }
-
- echo tep_draw_form('field_entry',FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','eid','confirm')). 'action=' . (($action == 'new') ? 'insert' : 'update') . '&confirm=yes&eid=' . cfg_34::$eid /*. ($confirmation_needed ? '&confirm=yes' : '')*/, 'post'); ?>
-
-
- <p class="block_input">
- <label><?php echo __('ENTRY_ACTIVATE_NOW') ?></label>
- <?php echo tep_draw_radio_field('status','status', '1', (((int)cfg_34::$cInfo['epf_status']==1)? true : false) ). ' ' .__('TEXT_YES'). ' ' . tep_draw_radio_field('status','status', '0', (((int)cfg_34::$cInfo['epf_status']==0)? true : false) ). ' ' .__('TEXT_NO'); ?>
- </p>
-
- <?php if ($action == 'new') : ?>
- <p class="block_input">
- <label><?php echo __('ENTRY_VALUE_LIST') ?></label>
- <?php echo tep_draw_radio_field('value_list','value_list', '1',(((int)cfg_34::$cInfo['epf_uses_value_list']==1)? true : false)) . ' ' .__('TEXT_YES'). ' ' . tep_draw_radio_field('value_list','value_list', '0',(((int)cfg_34::$cInfo['epf_uses_value_list']==0)? true : false)) . ' ' .__('TEXT_NO'); ?>
- </p>
- <?php elseif ((int)cfg_34::$cInfo['epf_uses_value_list']==1) : ?>
- <?php echo tep_draw_hidden_field('value_list','value_list', (((int)cfg_34::$cInfo['epf_uses_value_list']==1)? '1' : '0')) ?>
- <?php endif; ?>
-
- <p class="block_input">
- <label for="epf_active_for_language" title="<?php echo __('ENTRY_ACTIVE_HELP') ?>"><?php echo __('ENTRY_ACTIVE'). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
- <?php echo tep_draw_radio_field('epf_active_for_language' ,'epf_active_for_language' , '1', (((int)cfg_34::$cInfo['epf_active_for_language']==1)? true : false) ) . ' ' . __('TEXT_YES') .
- ' ' . tep_draw_radio_field('epf_active_for_language' ,'epf_active_for_language', '0', (((int)cfg_34::$cInfo['epf_active_for_language']==0)? true : false) ) . ' ' . __('TEXT_NO'); ?>
- </p>
-
- <fieldset class="tabs_lang block_field">
- <ul>
- <?php for ($i=0, $n=sizeof($languages); $i<$n; $i++) { ?>
- <li><?php echo '<a href="#products_name-' . ($i+1).'" >' . tep_image(DIR_WS_CATALOG_LANGUAGES . $languages[$i]['directory'] . '/images/' . $languages[$i]['image'], $languages[$i]['name']) . ' ' . $languages[$i]['name'] . '</a>' ?></li>
- <?php } ?>
- </ul>
- <?php for ($i=0, $n=sizeof($languages); $i<$n; $i++) { ?>
- <ul id="<?php echo 'products_name-'.($i+1) ?>">
- <li class="block_input">
- <?php echo __('ENTRY_LABEL') . tep_draw_input_field('label_' . $languages[$i]['id'],'label_' . $languages[$i]['id'], cfg_34::$pInfo[$languages[$i]['id']]['epf_label'], "size=64 maxlength=64") ?>
- </li>
- </ul>
- <?php } ?>
- </fieldset>
-
- <p class="block_input">
- <label for="epf_key" title="<?php echo __('ENTRY_UNIQ_KEY_HELP') ?>"><?php echo __('ENTRY_UNIQ_KEY'). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
- <?php echo tep_draw_input_field('epf_key','epf_key', cfg_34::$cInfo['epf_key']); ?>
- </p>
-
- <p class="block_input">
- <label><?php echo __('ENTRY_ORDER') ?></label>
- <?php echo tep_draw_input_field('sort_order','sort_order', (!empty(cfg_34::$cInfo['epf_order'])? cfg_34::$cInfo['epf_order'] : '0' ) ); ?>
- </p>
- <p class="block_input">
- <label for="search" title="<?php echo __('ENTRY_SEARCH_HELP') ?>"><?php echo __('ENTRY_SEARCH'). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
- <?php echo tep_draw_radio_field('search','search', '1', (((int)cfg_34::$cInfo['epf_advanced_search']==1)? true : false) ). ' ' .__('TEXT_YES'). ' ' . tep_draw_radio_field('search','search', '0', (((int)cfg_34::$cInfo['epf_advanced_search']==0)? true : false) ) . ' ' .__('TEXT_NO'); ?>
- </p>
- <p class="block_input">
- <label><?php echo __('ENTRY_LISTING') ?></label>
- <?php echo tep_draw_radio_field('listing','listing', '1', (((int)cfg_34::$cInfo['epf_show_in_listing']==1)? true : false) ) . ' ' .__('TEXT_YES'). ' ' . tep_draw_radio_field('listing','listing', '0', (((int)cfg_34::$cInfo['epf_show_in_listing']==0)? true : false) ) . ' ' .__('TEXT_NO'); ?>
- </p>
- <p class="block_input">
- <label><?php echo __('ENTRY_META') ?></label>
- <?php echo tep_draw_radio_field('meta','meta', '1',(((int)cfg_34::$cInfo['epf_use_as_meta_keyword']==1)? true : false) ) . ' ' .__('TEXT_YES'). ' ' . tep_draw_radio_field('meta','meta', '0', (((int)cfg_34::$cInfo['epf_use_as_meta_keyword']==0)? true : false) ) . ' ' .__('TEXT_NO'); ?>
- </p>
- <p class="block_input">
- <label><?php echo __('ENTRY_USE_ADMIN') ?></label>
- <?php echo tep_draw_radio_field('epf_admin','epf_admin', '1', (((int)cfg_34::$cInfo['epf_admin']==1)? true : false) ) . ' ' .__('TEXT_YES'). ' ' . tep_draw_radio_field('epf_admin','epf_admin', '0', (((int)cfg_34::$cInfo['epf_admin']==0)? true : false) ) . ' ' .__('TEXT_NO'); ?>
- </p>
- <p class="block_input">
- <label for="epf_special_mod" title="<?php echo __('ENTRY_SPECIFIQUE_MODULE_HELP') ?>"><?php echo __('ENTRY_SPECIFIQUE_MODULE'). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
- <?php echo tep_draw_input_field('epf_special_mod','epf_special_mod', cfg_34::$cInfo['epf_special_mod']); ?>
- </p>
- <p class="block_input">
- <label><?php echo __('ENTRY_CHAIN') ?></label>
- <?php echo tep_draw_radio_field('chain','chain', '1', (((int)cfg_34::$cInfo['epf_show_parent_chain']==1)? true : false) ) . ' ' .__('TEXT_YES'). ' ' . tep_draw_radio_field('chain','chain', '0', (((int)cfg_34::$cInfo['epf_show_parent_chain']==0)? true : false)) . ' ' .__('TEXT_NO'); ?>
- </p>
-
- <?php if ($action == 'new' || (!cfg_34::$cInfo['epf_uses_value_list']) ) : ?>
- <p class="block_input">
- <label for="restrict" title="<?php echo __('ENTRY_RESTRICT_HELP') ?>"><?php echo __('ENTRY_RESTRICT'). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
- <?php echo tep_draw_radio_field('restrict','restrict', '1',(((int)cfg_34::$cInfo['epf_use_to_restrict_listings']==1)? true : false)) . ' ' .__('TEXT_YES'). ' ' . tep_draw_radio_field('restrict','restrict', '0',(((int)cfg_34::$cInfo['epf_use_to_restrict_listings']==0)? true : false) ) . ' ...
[truncated message content] |
Thanks for helping keep SourceForge clean.
X