From: <be...@us...> - 2012-07-23 19:58:35
|
Revision: 9915 http://xoops.svn.sourceforge.net/xoops/?rev=9915&view=rev Author: beckmi Date: 2012-07-23 19:58:26 +0000 (Mon, 23 Jul 2012) Log Message: ----------- Restructuring folders Added Paths: ----------- XoopsModules/oledrion/releases/2.31/oledrion/.htaccess XoopsModules/oledrion/releases/2.31/oledrion/admin/ XoopsModules/oledrion/releases/2.31/oledrion/ajax.php XoopsModules/oledrion/releases/2.31/oledrion/all-lists.php XoopsModules/oledrion/releases/2.31/oledrion/all-products.php XoopsModules/oledrion/releases/2.31/oledrion/blocks/ XoopsModules/oledrion/releases/2.31/oledrion/caddy.php XoopsModules/oledrion/releases/2.31/oledrion/cancel-payment.php XoopsModules/oledrion/releases/2.31/oledrion/categories-map.php XoopsModules/oledrion/releases/2.31/oledrion/category.php XoopsModules/oledrion/releases/2.31/oledrion/cgv.php XoopsModules/oledrion/releases/2.31/oledrion/changelog.php XoopsModules/oledrion/releases/2.31/oledrion/checkout.php XoopsModules/oledrion/releases/2.31/oledrion/class/ XoopsModules/oledrion/releases/2.31/oledrion/comment_delete.php XoopsModules/oledrion/releases/2.31/oledrion/comment_edit.php XoopsModules/oledrion/releases/2.31/oledrion/comment_new.php XoopsModules/oledrion/releases/2.31/oledrion/comment_post.php XoopsModules/oledrion/releases/2.31/oledrion/comment_reply.php XoopsModules/oledrion/releases/2.31/oledrion/config.php XoopsModules/oledrion/releases/2.31/oledrion/dewplayer/ XoopsModules/oledrion/releases/2.31/oledrion/download.php XoopsModules/oledrion/releases/2.31/oledrion/extra/ XoopsModules/oledrion/releases/2.31/oledrion/gateway-notify.php XoopsModules/oledrion/releases/2.31/oledrion/header.php XoopsModules/oledrion/releases/2.31/oledrion/images/ XoopsModules/oledrion/releases/2.31/oledrion/include/ XoopsModules/oledrion/releases/2.31/oledrion/index.php XoopsModules/oledrion/releases/2.31/oledrion/invoice.php XoopsModules/oledrion/releases/2.31/oledrion/js/ XoopsModules/oledrion/releases/2.31/oledrion/lang.diff XoopsModules/oledrion/releases/2.31/oledrion/language/ XoopsModules/oledrion/releases/2.31/oledrion/licence.txt XoopsModules/oledrion/releases/2.31/oledrion/list.php XoopsModules/oledrion/releases/2.31/oledrion/list.tag.php XoopsModules/oledrion/releases/2.31/oledrion/manufacturer.php XoopsModules/oledrion/releases/2.31/oledrion/media.php XoopsModules/oledrion/releases/2.31/oledrion/mime/ XoopsModules/oledrion/releases/2.31/oledrion/my-lists.php XoopsModules/oledrion/releases/2.31/oledrion/notification_update.php XoopsModules/oledrion/releases/2.31/oledrion/paypal-notify.php XoopsModules/oledrion/releases/2.31/oledrion/pdf/ XoopsModules/oledrion/releases/2.31/oledrion/plugins/ XoopsModules/oledrion/releases/2.31/oledrion/product.php XoopsModules/oledrion/releases/2.31/oledrion/rate-product.php XoopsModules/oledrion/releases/2.31/oledrion/recommended.php XoopsModules/oledrion/releases/2.31/oledrion/rss.php XoopsModules/oledrion/releases/2.31/oledrion/search.php XoopsModules/oledrion/releases/2.31/oledrion/sql/ XoopsModules/oledrion/releases/2.31/oledrion/templates/ XoopsModules/oledrion/releases/2.31/oledrion/thankyou.php XoopsModules/oledrion/releases/2.31/oledrion/view.tag.php XoopsModules/oledrion/releases/2.31/oledrion/whoswho.php XoopsModules/oledrion/releases/2.31/oledrion/xoops_version.php Removed Paths: ------------- XoopsModules/oledrion/releases/2.31/.htaccess XoopsModules/oledrion/releases/2.31/admin/ XoopsModules/oledrion/releases/2.31/ajax.php XoopsModules/oledrion/releases/2.31/all-lists.php XoopsModules/oledrion/releases/2.31/all-products.php XoopsModules/oledrion/releases/2.31/blocks/ XoopsModules/oledrion/releases/2.31/caddy.php XoopsModules/oledrion/releases/2.31/cancel-payment.php XoopsModules/oledrion/releases/2.31/categories-map.php XoopsModules/oledrion/releases/2.31/category.php XoopsModules/oledrion/releases/2.31/cgv.php XoopsModules/oledrion/releases/2.31/changelog.php XoopsModules/oledrion/releases/2.31/checkout.php XoopsModules/oledrion/releases/2.31/class/ XoopsModules/oledrion/releases/2.31/comment_delete.php XoopsModules/oledrion/releases/2.31/comment_edit.php XoopsModules/oledrion/releases/2.31/comment_new.php XoopsModules/oledrion/releases/2.31/comment_post.php XoopsModules/oledrion/releases/2.31/comment_reply.php XoopsModules/oledrion/releases/2.31/config.php XoopsModules/oledrion/releases/2.31/dewplayer/ XoopsModules/oledrion/releases/2.31/download.php XoopsModules/oledrion/releases/2.31/extra/ XoopsModules/oledrion/releases/2.31/gateway-notify.php XoopsModules/oledrion/releases/2.31/header.php XoopsModules/oledrion/releases/2.31/images/ XoopsModules/oledrion/releases/2.31/include/ XoopsModules/oledrion/releases/2.31/index.php XoopsModules/oledrion/releases/2.31/invoice.php XoopsModules/oledrion/releases/2.31/js/ XoopsModules/oledrion/releases/2.31/lang.diff XoopsModules/oledrion/releases/2.31/language/ XoopsModules/oledrion/releases/2.31/licence.txt XoopsModules/oledrion/releases/2.31/list.php XoopsModules/oledrion/releases/2.31/list.tag.php XoopsModules/oledrion/releases/2.31/manufacturer.php XoopsModules/oledrion/releases/2.31/media.php XoopsModules/oledrion/releases/2.31/mime/ XoopsModules/oledrion/releases/2.31/my-lists.php XoopsModules/oledrion/releases/2.31/notification_update.php XoopsModules/oledrion/releases/2.31/paypal-notify.php XoopsModules/oledrion/releases/2.31/pdf/ XoopsModules/oledrion/releases/2.31/plugins/ XoopsModules/oledrion/releases/2.31/product.php XoopsModules/oledrion/releases/2.31/rate-product.php XoopsModules/oledrion/releases/2.31/recommended.php XoopsModules/oledrion/releases/2.31/rss.php XoopsModules/oledrion/releases/2.31/search.php XoopsModules/oledrion/releases/2.31/sql/ XoopsModules/oledrion/releases/2.31/templates/ XoopsModules/oledrion/releases/2.31/thankyou.php XoopsModules/oledrion/releases/2.31/view.tag.php XoopsModules/oledrion/releases/2.31/whoswho.php XoopsModules/oledrion/releases/2.31/xoops_version.php Deleted: XoopsModules/oledrion/releases/2.31/.htaccess =================================================================== --- XoopsModules/oledrion/releases/2.31/.htaccess 2012-07-23 19:48:32 UTC (rev 9914) +++ XoopsModules/oledrion/releases/2.31/.htaccess 2012-07-23 19:58:26 UTC (rev 9915) @@ -1,6 +0,0 @@ -RewriteEngine On -RewriteRule ^category-([0-9]+)(-).*(\.html)$ category.php?cat_cid=$1 -RewriteRule ^category-([0-9]+)(-)([0-9]+)(-).*(\.html)$ category.php?cat_cid=$1&start=$3 -RewriteRule ^product-([0-9]+)(-).*(\.html)$ product.php?product_id=$1 -RewriteRule ^manufacturer-([0-9]+)(-).*(\.html)$ manufacturer.php?manu_id=$1 -RewriteRule ^list-([0-9]+)(-).*(\.html)$ list.php?list_id=$1 \ No newline at end of file Deleted: XoopsModules/oledrion/releases/2.31/ajax.php =================================================================== --- XoopsModules/oledrion/releases/2.31/ajax.php 2012-07-23 19:48:32 UTC (rev 9914) +++ XoopsModules/oledrion/releases/2.31/ajax.php 2012-07-23 19:58:26 UTC (rev 9915) @@ -1,123 +0,0 @@ -<?php -/** - * **************************************************************************** - * oledrion - MODULE FOR XOOPS - * Copyright (c) Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) - * - * You may not change or alter any portion of this comment or credits - * of supporting developers from this source code or any supporting source code - * which is considered copyrighted (c) material of the original comment or credit authors. - * 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. - * - * @copyright Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) - * @license http://www.fsf.org/copyleft/gpl.html GNU public license - * @package oledrion - * @author Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) - * - * Version : $Id: - * **************************************************************************** - */ - -/** - * Script pour tout ce qui est relatif \xE0 Ajax et JSON - * - * @since 2.3.2009.03.17 - */ -require_once 'header.php'; -error_reporting(0); -@$xoopsLogger->activated = false; - -$op = isset($_POST['op']) ? $_POST['op'] : ''; -if($op =='') { - $op = isset($_GET['op']) ? $_GET['op'] : ''; -} -$return = ''; -$uid = oledrion_utils::getCurrentUserID(); -$isAdmin = oledrion_utils::isAdmin(); - - -switch($op) { - // **************************************************************************************************************** - case 'updatePrice': // Mise \xE0 jour du prix du produit en fonction des attributs s\xE9lectionn\xE9s - // **************************************************************************************************************** - $product_id = isset($_POST['product_id']) ? intval($_POST['product_id']) : 0; - if(isset($_POST['formcontent']) && $product_id > 0) { - $data = $data = $attributesIds = $attributes = $templateProduct = array(); - $handlers = oledrion_handler::getInstance(); - $product = null; - $product = $handlers->h_oledrion_products->get($product_id); - if(!is_object($product)) { - return _OLEDRION_NA; - } - if(!$product->isProductVisible()) { - return _OLEDRION_NA; - } - $vat_id = $product->getVar('product_vat_id'); - - if( intval($product->getVar('product_discount_price', '')) != 0 ) { - $productPrice = floatval($product->getVar('product_discount_price', 'e')); - } else { - $productPrice = floatval($product->getVar('product_price', 'e')); - } - - parse_str(utf8_decode(urldecode($_POST['formcontent'])), $data); -/* - require_once 'FirePHPCore/FirePHP.class.php'; - $firephp = FirePHP::getInstance(true); - $firephp->log($data, 'Iterators'); -*/ - // On r\xE9cup\xE8re les ID des attributs valoris\xE9s - foreach($data as $key => $value) { - $attributesIds[] = oledrion_utils::getId($key); - } - if(count($attributesIds) == 0) { - return _OLEDRION_NA; - } - // Puis les attributs - $attributes = $handlers->h_oledrion_attributes->getItemsFromIds($attributesIds); - if(count($attributes) == 0) { - return _OLEDRION_NA; - } - - // Et on recalcule le prix - foreach($attributes as $attribute) { - $attributeNameInForm = xoops_trim($attribute->getVar('attribute_name').'_'.$attribute->getVar('attribute_id')); - if(isset($data[$attributeNameInForm])) { - $attributeValues = $data[$attributeNameInForm]; - if(is_array($attributeValues)) { - foreach($attributeValues as $attributeValue) { - $optionName = oledrion_utils::getName($attributeValue); - $optionPrice = $attribute->getOptionPriceFromValue($optionName); - $productPrice += $optionPrice; - } - } else { - $optionPrice = $attribute->getOptionPriceFromValue(oledrion_utils::getName($attributeValues)); - $productPrice += $optionPrice; - } - } - } - // Mise en template - include_once XOOPS_ROOT_PATH.'/class/template.php'; - $template = new XoopsTpl(); - $vat = null; - $vat = $handlers->h_oledrion_vat->get($vat_id); - $productPriceTTC = oledrion_utils::getAmountWithVat($productPrice, $vat_id); - - $oledrion_Currency = oledrion_Currency::getInstance(); - - $templateProduct = $product->toArray(); - $templateProduct['product_final_price_ht_formated_long'] = $oledrion_Currency->amountForDisplay($productPrice, 'l'); - $templateProduct['product_final_price_ttc_formated_long'] = $oledrion_Currency->amountForDisplay($productPriceTTC, 'l'); - if(is_object($vat)) { - $templateProduct['product_vat_rate'] = $vat->toArray(); - } - $templateProduct['product_vat_amount_formated_long'] = $oledrion_Currency->amountForDisplay($productPriceTTC - $productPrice, 'l'); - $template->assign('product', $templateProduct); - $return = $template->fetch('db:oledrion_product_price.html'); - } - break; -} -echo utf8_encode($return); -?> \ No newline at end of file Deleted: XoopsModules/oledrion/releases/2.31/all-lists.php =================================================================== --- XoopsModules/oledrion/releases/2.31/all-lists.php 2012-07-23 19:48:32 UTC (rev 9914) +++ XoopsModules/oledrion/releases/2.31/all-lists.php 2012-07-23 19:58:26 UTC (rev 9915) @@ -1,63 +0,0 @@ -<?php -/** - * **************************************************************************** - * oledrion - MODULE FOR XOOPS - * Copyright (c) Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) - * - * You may not change or alter any portion of this comment or credits - * of supporting developers from this source code or any supporting source code - * which is considered copyrighted (c) material of the original comment or credit authors. - * 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. - * - * @copyright Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) - * @license http://www.fsf.org/copyleft/gpl.html GNU public license - * @package oledrion - * @author Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) - * - * Version : $Id: - * **************************************************************************** - */ - -/** - * Toutes les listes publiques - * - * @param integer $start Position de d\xE9part dans les listes - */ -require 'header.php'; -$GLOBALS['current_category'] = -1; -$xoopsOption['template_main'] = 'oledrion_all_lists.html'; -require_once XOOPS_ROOT_PATH.'/header.php'; -require_once XOOPS_ROOT_PATH.'/class/pagenav.php'; - -$xoopsTpl->assign('mod_pref', $mod_pref); // Pr\xE9f\xE9rences du module -$start = isset($_GET['start']) ? intval($_GET['start']) : 0; -$limit = oledrion_utils::getModuleOption('perpage'); - -if($limit > 0) { - $handlers = oledrion_handler::getInstance(); - $itemsCount = $handlers->h_oledrion_lists->getRecentListsCount(OLEDRION_LISTS_ALL_PUBLIC); - if($itemsCount > $limit) { - $pagenav = new XoopsPageNav( $itemsCount, $limit, $start, 'start'); - $xoopsTpl->assign('pagenav', $pagenav->renderNav()); - } - $items = array(); - $items = $handlers->h_oledrion_lists->getRecentLists(new oledrion_parameters(array('start' => $start, 'limit' => $limit, 'sort' => 'list_date', 'order' => 'DESC', 'idAsKey' => true, 'listType' => OLEDRION_LISTS_ALL_PUBLIC))); - if(count($items) > 0) { - foreach($items as $item) { - $xoopsTpl->append('lists', $item->toArray()); - } - } -} - -oledrion_utils::setCSS(); -oledrion_utils::loadLanguageFile('modinfo.php'); - -$xoopsTpl->assign('global_advert', oledrion_utils::getModuleOption('advertisement')); -$xoopsTpl->assign('breadcrumb', oledrion_utils::breadcrumb(array(OLEDRION_URL.basename(__FILE__) => _MI_OLEDRION_SMNAME11))); - -$title = _MI_OLEDRION_SMNAME11.' - '.oledrion_utils::getModuleName(); -oledrion_utils::setMetas($title, $title); -require_once XOOPS_ROOT_PATH.'/footer.php'; -?> \ No newline at end of file Deleted: XoopsModules/oledrion/releases/2.31/all-products.php =================================================================== --- XoopsModules/oledrion/releases/2.31/all-products.php 2012-07-23 19:48:32 UTC (rev 9914) +++ XoopsModules/oledrion/releases/2.31/all-products.php 2012-07-23 19:58:26 UTC (rev 9915) @@ -1,75 +0,0 @@ -<?php -/** - * **************************************************************************** - * oledrion - MODULE FOR XOOPS - * Copyright (c) Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) - * - * You may not change or alter any portion of this comment or credits - * of supporting developers from this source code or any supporting source code - * which is considered copyrighted (c) material of the original comment or credit authors. - * 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. - * - * @copyright Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) - * @license http://www.fsf.org/copyleft/gpl.html GNU public license - * @package oledrion - * @author Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) - * - * Version : $Id: - * **************************************************************************** - */ - -/** - * Liste de tous les produits du catalogue (en fonction des param\xE8tres du module) - */ -require 'header.php'; -$GLOBALS['current_category'] = -1; -$xoopsOption['template_main'] = 'oledrion_allproducts.html'; -require_once XOOPS_ROOT_PATH.'/header.php'; -require_once XOOPS_ROOT_PATH.'/class/pagenav.php'; - -$categories = $vatArray = array(); - -// Lecture des TVA -$vatArray = $h_oledrion_vat->getAllVats(new oledrion_parameters()); -// Pr\xE9f\xE9rences du module -$xoopsTpl->assign('mod_pref', $mod_pref); - -$start = isset($_GET['start']) ? intval($_GET['start']) : 0; -$limit = oledrion_utils::getModuleOption('perpage'); - -// Lecture des produits -$itemsCount = $oledrion_shelf->getProductsCount('recent'); -if($itemsCount > $limit) { - $pagenav = new XoopsPageNav( $itemsCount, $limit, $start, 'start'); - $xoopsTpl->assign('pagenav', $pagenav->renderNav()); -} - -$products = array(); -$oledrion_shelf_parameters->resetDefaultValues()->setProductsType('recent')->setStart($start)->setLimit($limit)->setSort('product_submitted DESC, product_title'); -$products = $oledrion_shelf->getProducts($oledrion_shelf_parameters); -if(isset($products['lastTitle'])) { - $lastTitle = strip_tags($products['lastTitle']); - unset($products['lastTitle']); -} -$xoopsTpl->assign('products', $products); - -$xoopsTpl->assign('pdf_catalog', oledrion_utils::getModuleOption('pdf_catalog')); - -oledrion_utils::setCSS(); -if(!OLEDRION_MY_THEME_USES_JQUERY) { - oledrion_utils::callJavascriptFile('jquery/jquery.js'); -} -oledrion_utils::callJavascriptFile('noconflict.js'); -oledrion_utils::callJavascriptFile('tablesorter/jquery.tablesorter.min.js'); - -oledrion_utils::loadLanguageFile('modinfo.php'); - -$xoopsTpl->assign('global_advert', oledrion_utils::getModuleOption('advertisement')); -$xoopsTpl->assign('breadcrumb', oledrion_utils::breadcrumb(array(OLEDRION_URL.basename(__FILE__) => _MI_OLEDRION_SMNAME6))); - -$title = _MI_OLEDRION_SMNAME6.' - '.oledrion_utils::getModuleName(); -oledrion_utils::setMetas($title, $title); -require_once(XOOPS_ROOT_PATH.'/footer.php'); -?> \ No newline at end of file Deleted: XoopsModules/oledrion/releases/2.31/caddy.php =================================================================== --- XoopsModules/oledrion/releases/2.31/caddy.php 2012-07-23 19:48:32 UTC (rev 9914) +++ XoopsModules/oledrion/releases/2.31/caddy.php 2012-07-23 19:58:26 UTC (rev 9915) @@ -1,211 +0,0 @@ -<?php -/** - * **************************************************************************** - * oledrion - MODULE FOR XOOPS - * Copyright (c) Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) - * - * You may not change or alter any portion of this comment or credits - * of supporting developers from this source code or any supporting source code - * which is considered copyrighted (c) material of the original comment or credit authors. - * 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. - * - * @copyright Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) - * @license http://www.fsf.org/copyleft/gpl.html GNU public license - * @package oledrion - * @author Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) - * - * Version : $Id: - * **************************************************************************** - */ - -/** - * Affichage et gestion du caddy - */ -require 'header.php'; -$GLOBALS['current_category'] = -1; -$xoopsOption['template_main'] = 'oledrion_caddy.html'; -require_once XOOPS_ROOT_PATH.'/header.php'; -require_once OLEDRION_PATH.'class/registryfile.php'; - -$xoopsTpl->assign('mod_pref', $mod_pref); // Pr\xE9f\xE9rences du module - -if(oledrion_utils::getModuleOption('restrict_orders', false)) { - $registry = new oledrion_registryfile(); - $text = $registry->getfile(OLEDRION_TEXTFILE5); - $xoopsTpl->assign('restrict_orders_text', xoops_trim($text)); -} else { - $xoopsTpl->assign('restrict_orders_text', ''); -} - - -$op = 'default'; -if(isset($_POST['op'])) { - $op = $_POST['op']; -} elseif(isset($_GET['op'])) { - $op = $_GET['op']; -} - -$productId = 0; -if(isset($_POST['product_id'])) { - $productId = intval($_POST['product_id']); -} elseif(isset($_GET['product_id'])) { - $productId = intval($_GET['product_id']); -} - -$xoopsTpl->assign('op', $op); -$xoopsTpl->assign('confEmpty', oledrion_utils::javascriptLinkConfirm(_OLEDRION_EMPTY_CART_SURE,true)); -$xoopsTpl->assign('confirm_delete_item', oledrion_utils::javascriptLinkConfirm(_OLEDRION_EMPTY_ITEM_SURE, false)); - -$uid = oledrion_utils::getCurrentUserID(); -if($uid > 0) { - $xoopsTpl->assign('isCartExists', $h_oledrion_persistent_cart->isCartExists()); -} else { - $xoopsTpl->assign('isCartExists', false); -} - - -// ******************************************************************************************************************** -// Liste le contenu du caddy -// ******************************************************************************************************************** -function listCart() -{ - global $xoopsTpl, $uid; - $cartForTemplate = $discountsDescription = array(); - $emptyCart = false; - $shippingAmount = $commandAmount = $vatAmount = $commandAmountTTC = $discountsCount = 0; - $goOn = ''; - $reductions = new oledrion_reductions(); - $reductions->computeCart($cartForTemplate, $emptyCart, $shippingAmount, $commandAmount, $vatAmount, $goOn, $commandAmountTTC, $discountsDescription, $discountsCount); - $oledrion_Currency = & oledrion_Currency::getInstance(); - $xoopsTpl->assign('emptyCart', $emptyCart); // Caddy Vide ? - $xoopsTpl->assign('caddieProducts', $cartForTemplate); // Produits dans le caddy - $xoopsTpl->assign('shippingAmount', $oledrion_Currency->amountForDisplay($shippingAmount)); // Montant des frais de port - $xoopsTpl->assign('commandAmount', $oledrion_Currency->amountForDisplay($commandAmount)); // Montant HT de la commande - $xoopsTpl->assign('vatAmount', $oledrion_Currency->amountForDisplay($vatAmount)); // Montant de la TVA - $xoopsTpl->assign('discountsCount', $discountsCount); // Nombre de r\xE9ductions appliqu\xE9es - $xoopsTpl->assign('goOn', $goOn); // Adresse \xE0 utiliser pour continuer ses achats - $xoopsTpl->assign('commandAmountTTC', $oledrion_Currency->amountForDisplay($commandAmountTTC, 'l')); // Montant TTC de la commande - $xoopsTpl->assign('discountsDescription', $discountsDescription); // Liste des r\xE9ductions accord\xE9es - $showOrderButton = true; - $showRegistredOnly = false; - if(oledrion_utils::getModuleOption('restrict_orders', false) && $uid == 0) { - $showRegistredOnly = true; - $showOrderButton = false; - } - $xoopsTpl->assign('showRegistredOnly', $showRegistredOnly); - $xoopsTpl->assign('showOrderButton', $showOrderButton); -} - -// ******************************************************************************************************************** -// ******************************************************************************************************************** -// ******************************************************************************************************************** -switch ($op) { - // **************************************************************************************************************** - case 'update': // Recalcul des quantit\xE9s - // **************************************************************************************************************** - $h_oledrion_caddy->updateQuantites(); - listCart(); - break; - - // **************************************************************************************************************** - case 'reload': // Chargement du dernier panier enregistr\xE9 - // **************************************************************************************************************** - $h_oledrion_caddy->reloadPersistentCart(); - listCart(); - break; - - // **************************************************************************************************************** - case 'delete': // Suppression d'un \xE9l\xE9ment - // **************************************************************************************************************** - $productId--; - $h_oledrion_caddy->deleteProduct($productId); - listCart(); - break; - - // **************************************************************************************************************** - case 'addproduct': // Ajout d'un produit - // **************************************************************************************************************** - if($productId == 0) { - oledrion_utils::redirect(_OLEDRION_ERROR9, 'index.php', 4); - } - $product = null; - $product = $h_oledrion_products->get($productId); - if(!is_object($product)) { - oledrion_utils::redirect(_OLEDRION_ERROR9, 'index.php', 4); - } - if($product->getVar('product_online') == 0) { - oledrion_utils::redirect(_OLEDRION_ERROR2, 'index.php', 4); - } - - if($product->getVar('product_stock') - 1 >= 0) { - // Les attributs - $userAttributes = array(); - if($product->productAttributesCount() > 0) { // Si le produit a des attributs - $productAttributes = array(); - // On commence par v\xE9rifier que les attributs obligatoires sont renseign\xE9s - if($product->getProductMandatoryAttributesCount()) { - $mandatoryFieldsList = array(); - $mandatoryFieldsList = $product->getProductMandatoryFieldsList(); - if(count($mandatoryFieldsList) > 0) { - $productUrl = $product->getLink(); - foreach($mandatoryFieldsList as $mandatoryField) { - $mandatoryFieldKey = $mandatoryField->getAttributeNameInForm(); - $mandatoryFielText = $mandatoryField->getVar('attribute_title'); - if(!isset($_POST[$mandatoryFieldKey]) && !$mandatoryField->hasDefaultValue()) { - oledrion_utils::redirect(sprintf(_OLEDRION_MANDATORY_MISSED, $mandatoryFielText), $productUrl, 4); - } - } - } - } - // Toujours l\xE0 c'est que le produit a des attributs et qu'ils sont renseign\xE9s - $productAttributes = $product->getProductsAttributesList(); - foreach($productAttributes as $attribute) { - $nameInForm = $attribute->getAttributeNameInForm(); - if(isset($_POST[$nameInForm])) { - $userAttributes[$attribute->attribute_id] = $_POST[$nameInForm]; - } else { // On va chercher sa valeur par d\xE9faut - if($attribute->hasDefaultValue()) { - $userAttributes[$attribute->attribute_id] = $attribute->getAttributeDefaultValue(); - } - } - } - } - $h_oledrion_caddy->addProduct($productId, 1, $userAttributes); - $url = OLEDRION_URL.'caddy.php'; - if(!OLEDRION_CART_BUG) { - header("Location: $url"); - } else { - listCart(); - } - } else { - oledrion_utils::redirect(_OLEDRION_PROBLEM_QTY, 'index.php', 5); // Plus de stock ! - } - listCart(); - break; - - // **************************************************************************************************************** - case 'empty': // Suppression du contenu du caddy - // **************************************************************************************************************** - $h_oledrion_caddy->emptyCart(); - listCart(); - break; - - // **************************************************************************************************************** - case 'default': // Action par d\xE9faut - // **************************************************************************************************************** - listCart(); - break; -} - -oledrion_utils::setCSS(); -oledrion_utils::loadLanguageFile('modinfo.php'); - -$xoopsTpl->assign('global_advert', oledrion_utils::getModuleOption('advertisement')); -$xoopsTpl->assign('breadcrumb', oledrion_utils::breadcrumb(array(OLEDRION_URL.basename(__FILE__) => _MI_OLEDRION_SMNAME1))); - -$title = _MI_OLEDRION_SMNAME1.' - '.oledrion_utils::getModuleName(); -oledrion_utils::setMetas($title, $title); -require_once XOOPS_ROOT_PATH.'/footer.php'; -?> \ No newline at end of file Deleted: XoopsModules/oledrion/releases/2.31/cancel-payment.php =================================================================== --- XoopsModules/oledrion/releases/2.31/cancel-payment.php 2012-07-23 19:48:32 UTC (rev 9914) +++ XoopsModules/oledrion/releases/2.31/cancel-payment.php 2012-07-23 19:58:26 UTC (rev 9915) @@ -1,56 +0,0 @@ -<?php -/** - * **************************************************************************** - * oledrion - MODULE FOR XOOPS - * Copyright (c) Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) - * - * You may not change or alter any portion of this comment or credits - * of supporting developers from this source code or any supporting source code - * which is considered copyrighted (c) material of the original comment or credit authors. - * 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. - * - * @copyright Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) - * @license http://www.fsf.org/copyleft/gpl.html GNU public license - * @package oledrion - * @author Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) - * - * Version : $Id: - * **************************************************************************** - */ - -/** - * Page appel\xE9e par la passerelle de paiement dans le cas de l'annulation d'une commande - */ -require 'header.php'; -$GLOBALS['current_category'] = -1; -$xoopsOption['template_main'] = 'oledrion_cancelpurchase.html'; -require_once XOOPS_ROOT_PATH.'/header.php'; - -// On donne la possibilit\xE9 \xE0 la passerelle d'annuler la commande -$gateway = null; -$gateway = oledrion_gateways::getGatewayObject(); -if(is_object($gateway) && method_exists($gateway, 'cancelOrder')) { - if(!file_exists(OLEDRION_GATEWAY_LOG_PATH)) { - file_put_contents(OLEDRION_GATEWAY_LOG_PATH, '<?php exit(); ?>'); - } - $gateway->cancelOrder(OLEDRION_GATEWAY_LOG_PATH); - unset($gateway); -} elseif(isset($_GET['id'])) { - $order = null; - $order = $h_oledrion_commands->getOrderFromCancelPassword($_GET['id']); - if(is_object($order)) { - $h_oledrion_commands->setOrderCanceled($order); - } -} -$h_oledrion_caddy->emptyCart(); - -$xoopsTpl->assign('global_advert', oledrion_utils::getModuleOption('advertisement')); -$xoopsTpl->assign('breadcrumb', oledrion_utils::breadcrumb(array(OLEDRION_URL.basename(__FILE__) => _OLEDRION_ORDER_CANCELED))); - -$title = _OLEDRION_ORDER_CANCELED.' - '.oledrion_utils::getModuleName(); -oledrion_utils::setMetas($title, $title); -oledrion_utils::setCSS(); -require_once(XOOPS_ROOT_PATH.'/footer.php'); -?> Deleted: XoopsModules/oledrion/releases/2.31/categories-map.php =================================================================== --- XoopsModules/oledrion/releases/2.31/categories-map.php 2012-07-23 19:48:32 UTC (rev 9914) +++ XoopsModules/oledrion/releases/2.31/categories-map.php 2012-07-23 19:58:26 UTC (rev 9915) @@ -1,53 +0,0 @@ -<?php -/** - * **************************************************************************** - * oledrion - MODULE FOR XOOPS - * Copyright (c) Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) - * - * You may not change or alter any portion of this comment or credits - * of supporting developers from this source code or any supporting source code - * which is considered copyrighted (c) material of the original comment or credit authors. - * 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. - * - * @copyright Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) - * @license http://www.fsf.org/copyleft/gpl.html GNU public license - * @package oledrion - * @author Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) - * - * Version : $Id: - * **************************************************************************** - */ - -/** - * Plan des cat\xE9gories - */ -require 'header.php'; -$GLOBALS['current_category'] = -1; -$xoopsOption['template_main'] = 'oledrion_map.html'; -require_once XOOPS_ROOT_PATH.'/header.php'; -require_once OLEDRION_PATH.'class/tree.php'; - -$xoopsTpl->assign('mod_pref', $mod_pref); // Pr\xE9f\xE9rences du module -$categories = array(); -$categories = $h_oledrion_cat->getAllCategories(new oledrion_parameters()); -$mytree = new Oledrion_XoopsObjectTree($categories, 'cat_cid', 'cat_pid'); -$tree = $mytree->makeTreeAsArray('cat_title', '-'); -foreach($tree as $key => $value) { - if(isset($categories[$key])) { - $category = $categories[$key]; - $xoopsTpl->append('categories', array('cat_url_rewrited' => $category->getLink(), 'cat_href_title' => $category->getHrefTitle(), 'cat_title' => $value)); - } -} - -oledrion_utils::setCSS(); -oledrion_utils::loadLanguageFile('modinfo.php'); - -$xoopsTpl->assign('global_advert', oledrion_utils::getModuleOption('advertisement')); -$xoopsTpl->assign('breadcrumb', oledrion_utils::breadcrumb(array(OLEDRION_URL.basename(__FILE__) => _MI_OLEDRION_SMNAME4))); - -$title = _MI_OLEDRION_SMNAME4.' - '.oledrion_utils::getModuleName(); -oledrion_utils::setMetas($title, $title); -require_once XOOPS_ROOT_PATH.'/footer.php'; -?> \ No newline at end of file Deleted: XoopsModules/oledrion/releases/2.31/category.php =================================================================== --- XoopsModules/oledrion/releases/2.31/category.php 2012-07-23 19:48:32 UTC (rev 9914) +++ XoopsModules/oledrion/releases/2.31/category.php 2012-07-23 19:58:26 UTC (rev 9915) @@ -1,245 +0,0 @@ -<?php -/** - * **************************************************************************** - * oledrion - MODULE FOR XOOPS - * Copyright (c) Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) - * - * You may not change or alter any portion of this comment or credits - * of supporting developers from this source code or any supporting source code - * which is considered copyrighted (c) material of the original comment or credit authors. - * 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. - * - * @copyright Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) - * @license http://www.fsf.org/copyleft/gpl.html GNU public license - * @package oledrion - * @author Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) - * - * Version : $Id: - * **************************************************************************** - */ - -/** - * Page des cat\xE9gories - * Principe : - * Quand on est sur une cat\xE9gorie m\xE8re (pas de parent) ou si on n'a pas sp\xE9cifi\xE9 de cat\xE9gorie, - * on affiche (si c'est demand\xE9), les 4 blocs, sinon on affiche les produits de la cat\xE9gorie - */ -require 'header.php'; -$cat_cid = isset($_GET['cat_cid']) ? intval($_GET['cat_cid']) : 0; -$GLOBALS['current_category'] = $cat_cid; -$start = isset($_GET['start']) ? intval($_GET['start']) : 0; - -$category = null; -if($cat_cid > 0) { - $category = $h_oledrion_cat->get($cat_cid); - if(!is_object($category)) { - oledrion_utils::redirect(_OLEDRION_ERROR8, 'index.php', 5); - } -} -// On peut afficher les blocs ********************************************************************* -$xoopsOption['template_main'] = 'oledrion_category.html'; -require_once XOOPS_ROOT_PATH.'/header.php'; -$vatArray = $tbl_categories = array(); -$limit = oledrion_utils::getModuleOption('perpage'); - -// Lecture des TVA ******************************************************************************** -$vatArray = $h_oledrion_vat->getAllVats(new oledrion_parameters()); - -// Lecture des cat\xE9gories ************************************************************************* -$categories = $h_oledrion_cat->getAllCategories(new oledrion_parameters()); - -// Options pour le template *********************************************************************** -$xoopsTpl->assign('mod_pref', $mod_pref); // Pr\xE9f\xE9rences du module -$xoopsTpl->assign('columnsCount', oledrion_utils::getModuleOption('catagory_colums')); - -require_once OLEDRION_PATH.'class/tree.php'; -$tbl_tmp = array(); -$mytree = new Oledrion_XoopsObjectTree($categories, 'cat_cid', 'cat_pid'); -$subCategoriesSearched = false; -// Si on est sur une cat\xE9gorie m\xE8re ou si on n'a pas sp\xE9cifi\xE9 de cat\xE9gorie -if( (is_object($category) && $category->getVar('cat_pid') == 0) || $cat_cid == 0 ) { // On affiche les 4 blocs - $xoopsTpl->assign('case', 1); - - $tblChildsO = $tblChilds = array(); - if($cat_cid != 0) { - $tblChilds[] = $cat_cid; - } - if($cat_cid > 0) { - $tblChildsO = $mytree->getAllChild($cat_cid); - foreach($tblChildsO as $item) { - $tblChilds[] = $item->getVar('cat_cid'); - } - } - - if(is_object($category)) { // On est sur une cat\xE9gorie particuli\xE8re - $xoopsTpl->assign('category', $category->toArray()); - $title = _OLEDRION_CATEGORYC.' '.$category->getVar('cat_title').' - '.oledrion_utils::getModuleName(); - if(!oledrion_utils::getModuleOption('manual_meta')) { - oledrion_utils::setMetas($title, $title); - } else { - $pageTitle = xoops_trim($category->getVar('cat_metatitle')) == '' ? $title : $category->getVar('cat_metatitle'); - $metaDescription = xoops_trim($category->getVar('cat_metadescription')) != '' ? $category->getVar('cat_metadescription') : $title; - $metaKeywords = xoops_trim($category->getVar('cat_metakeywords')); - oledrion_utils::setMetas($pageTitle, $metaDescription, $metaKeywords); - } - $xoopsTpl->assign('breadcrumb', oledrion_utils::breadcrumb(array(OLEDRION_URL.basename(__FILE__) => $category->getVar('cat_title')))); - if(OLEDRION_SHOW_SUB_CATEGORIES) { - $count = 1; - $firstChilds = array(); - $firstChilds = $mytree->getFirstChild($category->getVar('cat_cid')); - foreach($firstChilds as $children) { - $tmpCategory = array(); - $tmpCategory = $children->toArray(); - $tmpCategory['count'] = $count; - $xoopsTpl->append('subCategories', $tmpCategory); - $count++; - } - $subCategoriesSearched = true; - } - } else { // page d'accueil des cat\xE9gories - $title = _OLEDRION_CATEGORIES.' - '.oledrion_utils::getModuleName(); - oledrion_utils::setMetas($title, $title); - $xoopsTpl->assign('breadcrumb', oledrion_utils::breadcrumb(array(OLEDRION_URL.basename(__FILE__) => _OLEDRION_CATEGORIES))); - if(OLEDRION_SHOW_MAIN_CATEGORIES) { - $count = 1; - $motherCategories = $h_oledrion_cat->getMotherCategories(); - foreach($motherCategories as $mothercategory) { - $tmpCategory = array(); - $tmpCategory = $mothercategory->toArray(); - $tmpCategory['count'] = $count; - $xoopsTpl->append('motherCategories', $tmpCategory); - $count++; - } - } - } - - // Param\xE9trage des cat\xE9gories - $chunk1 = oledrion_utils::getModuleOption('chunk1'); // Produits les plus r\xE9cents - $chunk2 = oledrion_utils::getModuleOption('chunk2'); // Produits les plus achet\xE9s - $chunk3 = oledrion_utils::getModuleOption('chunk3'); // Produits les plus vus - $chunk4 = oledrion_utils::getModuleOption('chunk4'); // Produits les mieux not\xE9s - - if( $chunk1 > 0 ) { // Produits les plus r\xE9cents (dans cette cat\xE9gorie ou dans toutes les cat\xE9gories) - $products = array(); - $oledrion_shelf_parameters->resetDefaultValues()->setProductsType('recent')->setCategory($tblChilds)->setStart($start)->setLimit($limit)->setSort('product_submitted DESC, product_title'); - $products = $oledrion_shelf->getProducts($oledrion_shelf_parameters); - if(count($products) > 0) { - $xoopsTpl->assign('chunk'.$chunk1.'Title', _OLEDRION_MOST_RECENT); - if(isset($products['lastTitle'])) { - unset($products['lastTitle']); - } - $xoopsTpl->assign('chunk'.$chunk1, $products); - } - } - - if( $chunk2 > 0 ) { // Produits les plus achet\xE9s (dans cette cat\xE9gorie ou dans toutes les cat\xE9gories) - $products = array(); - $oledrion_shelf_parameters->resetDefaultValues()->setProductsType('mostsold')->setStart($start)->setLimit($limit)->setSort('product_submitted DESC, product_title')->setCategory($tblChilds); - $products = $oledrion_shelf->getProducts($oledrion_shelf_parameters); - if(count($products) > 0) { - $xoopsTpl->assign('chunk'.$chunk2.'Title', _OLEDRION_MOST_SOLD); - if(isset($products['lastTitle'])) { - unset($products['lastTitle']); - } - $xoopsTpl->assign('chunk'.$chunk2, $products); - } - } - - if( $chunk3 > 0 ) { // Produits les plus vus - $products = array(); - $oledrion_shelf_parameters->resetDefaultValues()->setProductsType('mostviewed')->setStart($start)->setLimit($limit)->setSort('product_hits')->setOrder('DESC')->setCategory($tblChilds); - $products = $oledrion_shelf->getProducts($oledrion_shelf_parameters); - if(count($products) > 0) { - $xoopsTpl->assign('chunk'.$chunk3.'Title', _OLEDRION_MOST_VIEWED); - if(isset($products['lastTitle'])) { - unset($products['lastTitle']); - } - $xoopsTpl->assign('chunk'.$chunk3, $products); - } - } - - if( $chunk4 > 0 ) { // Produits les mieux not\xE9s - $products = array(); - $oledrion_shelf_parameters->resetDefaultValues()->setProductsType('bestrated')->setStart($start)->setLimit($limit)->setSort('product_rating')->setOrder('DESC')->setCategory($tblChilds); - $products = $oledrion_shelf->getProducts($oledrion_shelf_parameters); - if(count($products) > 0) { - $xoopsTpl->assign('chunk'.$chunk4.'Title', _OLEDRION_MOST_RATED); - if(isset($products['lastTitle'])) { - unset($products['lastTitle']); - } - $xoopsTpl->assign('chunk'.$chunk4, $products); - } - } -} - -if( is_object($category) && $cat_cid > 0 ) { // On est sur une cat\xE9gorie d\xE9finie donc on affiche les produits de cette cat\xE9gorie - $xoopsTpl->assign('case', 2); - $xoopsTpl->assign('category', $category->toArray()); - if(OLEDRION_SHOW_SUB_CATEGORIES && ! $subCategoriesSearched) { - $count = 1; - $firstChilds = array(); - $firstChilds = $mytree->getFirstChild($category->getVar('cat_cid')); - foreach($firstChilds as $children) { - $tmpCategory = array(); - $tmpCategory = $children->toArray(); - $tmpCategory['count'] = $count; - $xoopsTpl->append('subCategories', $tmpCategory); - $count++; - } - } - - // Pager ****************************************************************************************** - // Recherche du nombre de produits dans cette cat\xE9gorie - $productsCount = $h_oledrion_products->getTotalPublishedProductsCount($cat_cid); - $limit = oledrion_utils::getModuleOption('perpage'); - if ( $productsCount > $limit ) { - require_once XOOPS_ROOT_PATH.'/class/pagenav.php'; - $catLink = $category->getLink(); - $pagenav = new XoopsPageNav( $productsCount, $limit, $start, 'start', 'cat_cid='.$cat_cid); - $xoopsTpl->assign('pagenav', $pagenav->renderNav()); - } else { - $xoopsTpl->assign('pagenav', ''); - } - - // Breadcrumb ********************************************************************************* - $ancestors = $mytree->getAllParent($cat_cid); - $ancestors = array_reverse($ancestors); - $tbl_tmp[] = "<a href='".OLEDRION_URL."index.php' title='".oledrion_utils::makeHrefTitle(oledrion_utils::getModuleName())."'>".oledrion_utils::getModuleName().'</a>'; - foreach($ancestors as $item) { - $tbl_tmp[] = "<a href='".$item->getLink()."' title='".oledrion_utils::makeHrefTitle($item->getVar('cat_title'))."'>".$item->getVar('cat_title').'</a>'; - } - // Ajout de la cat\xE9gorie courante - $tbl_tmp[] = "<a href='".$category->getLink()."' title='".oledrion_utils::makeHrefTitle($category->getVar('cat_title'))."'>".$category->getVar('cat_title').'</a>'; - $breadcrumb = implode(' » ', $tbl_tmp); - $xoopsTpl->assign('breadcrumb', $breadcrumb); - - // Meta *************************************************************************************** - $title = strip_tags($breadcrumb); - if(!oledrion_utils::getModuleOption('manual_meta')) { - oledrion_utils::setMetas($title, $title, str_replace('»', ',', $title)); - } else { - $pageTitle = xoops_trim($category->getVar('cat_metatitle')) == '' ? $title : $category->getVar('cat_metatitle'); - $metaDescription = xoops_trim($category->getVar('cat_metadescription')) != '' ? $category->getVar('cat_metadescription') : $title; - $metaKeywords = xoops_trim($category->getVar('cat_metakeywords')); - oledrion_utils::setMetas($pageTitle, $metaDescription, $metaKeywords); - } - - - // Donn\xE9es des Produits ************************************************************************* - $products = array(); - $oledrion_shelf_parameters->resetDefaultValues()->setProductsType('recent')->setCategory($cat_cid)->setStart($start)->setLimit($limit)->setSort('product_submitted DESC, product_title'); - $products = $oledrion_shelf->getProducts($oledrion_shelf_parameters); - - if(count($products) > 0) { - if(isset($products['lastTitle'])) { - unset($products['lastTitle']); - } - $xoopsTpl->assign('products', $products); - } -} - -oledrion_utils::setCSS(); -require_once(XOOPS_ROOT_PATH.'/footer.php'); -?> \ No newline at end of file Deleted: XoopsModules/oledrion/releases/2.31/cgv.php =================================================================== --- XoopsModules/oledrion/releases/2.31/cgv.php 2012-07-23 19:48:32 UTC (rev 9914) +++ XoopsModules/oledrion/releases/2.31/cgv.php 2012-07-23 19:58:26 UTC (rev 9915) @@ -1,44 +0,0 @@ -<?php -/** - * **************************************************************************** - * oledrion - MODULE FOR XOOPS - * Copyright (c) Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) - * - * You may not change or alter any portion of this comment or credits - * of supporting developers from this source code or any supporting source code - * which is considered copyrighted (c) material of the original comment or credit authors. - * 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. - * - * @copyright Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) - * @license http://www.fsf.org/copyleft/gpl.html GNU public license - * @package oledrion - * @author Herv\xE9 Thouzard of Instant Zero (http://www.instant-zero.com) - * - * Version : $Id: - * **************************************************************************** - */ - -/** - * Affichage des conditions g\xE9n\xE9rales de vente - */ -require 'header.php'; -$GLOBALS['current_category'] = -1; -$xoopsOption['template_main'] = 'oledrion_cgv.html'; -require_once XOOPS_ROOT_PATH.'/header.php'; -require_once OLEDRION_PATH.'class/registryfile.php'; - -$registry = new oledrion_registryfile(); - -$xoopsTpl->assign('nostock_msg', oledrion_utils::getModuleOption('nostock_msg')); -$xoopsTpl->assign('mod_pref', $mod_pref); // Pr\xE9f\xE9rences du module -$xoopsTpl->assign('cgv_msg', $registry->getfile(OLEDRION_TEXTFILE2)); - -$xoopsTpl->assign('global_advert', oledrion_utils::getModuleOption('advertisement')); -$xoopsTpl->assign('breadcrumb', oledrion_utils::breadcrumb(array(OLEDRION_URL.basename(__FILE__) => _OLEDRION_CGV))); - -oledrion_utils::setCSS(); -oledrion_utils::setMetas(_OLEDRION_CGV.' '.oledrion_utils::getModuleName(), _OLEDRION_CGV.' '.oledrion_utils::getModuleName()); -require_once(XOOPS_ROOT_PATH.'/footer.php'); -?> Deleted: XoopsModules/oledrion/releases/2.31/changelog.php =================================================================== --- XoopsModules/oledrion/releases/2.31/changelog.php 2012-07-23 19:48:32 UTC (rev 9914) +++ XoopsModules/oledrion/releases/2.31/changelog.php 2012-07-23 19:58:26 UTC (rev 9915) @@ -1,244 +0,0 @@ -************* -Version 2.31 -************* -- Changelog.txt was renamed to changelog.php -- Code refactoring -- The block used to show categories can now show all categories unfolded (useful if you need to create a scrolling menu) -- You have 2 new options to select the columns count on the module's index page and on the category page -- The page used to show the list of recommended products was added to the Xoops menu -- In the orders manager, you can now see the total of your orders -- Addition of wish lists. - There are some new pages and blocks -- The module does not use anymore extJs (the module is lighter of 6 Mb), so the "all products" page was changed -- The module does not use anymore swfobject, instead it uses a jQuery plugin -- Corrections in the module's administration, in the part used to manage files attached to products -- Correction of a bug in the PayPal's Gateway -- You can set a message to display on the checkout form -- Some changes in the gateways structures -- Correction of a bug in the module's administration, in the products filters -- Bug correction in the CSV export -- Addition of a new option to enable clients to enter their VAT number -- Addition of a new block : Recently Sold - This block shows the products that were recently sold -- Addition of a new parameter in config.php, OLEDRION_CART_BUG, set this to true if you can't see products when you add them to the cart -- Correction of several bugs in the cart, be sure to update your templates (Herv\xE9/sailjapan) -- The product's page now uses a lightview effect to show the product's picture -- You have a new tab, "blocks", to see the module's blocks -- The module will automatically update the monetary fields in its tables to decimal(10,2) to accept billions -- You have a news preferences called "Maximum products count to display before to replace the list with an adapted list". - When the module reach a certain count of products, they are too much to be seen in the module's list so the module replace this standard - lists with a new kind of list (and search). -- The module now uses jQuery intensively -- Several bugs corrections when a product is removed -- Addition of products attributes - Addition of 3 new templates (for attributes) : - - oledrion_attribute_select.html - - oledrion_attribute_checkbox.html - - oledrion_attribute_radio.html - - YOU MUST UPDATE THE MODULE IN THE XOOPS MODULES MANAGER - - YOU MUST GO AT LEAST ONE TIME IN THE MODULE'S ADMINISTRATION (to create some new tables in the database) - For this moment, persistent cart does not save products attributes -- You can now use and create plugins for the module (see the "plugins" folder for examples) - As an example, the notifications on a new product and new category are made with plugins - -- Notes for the translators: - - There is a new file (in your language folder) called messages.js to translate, take care, this file is a Javascript file - - There's also a picture to "translate", in your language folder, addtocart.png (this picture is used when products have attributes) and addtowishlist.png - -************* -Version 2.2 -************* -- Code refactoring -- Bugs corrections in the checkout page -- New option in config.php : OLEDRION_DONT_RESIZE_IF_SMALLER, when this option is on "true", if pictures are smaller than defined dimensions, then they are not resized -- Addition of a new option in config.php => OLEDRION_AUTO_FILL_MANUAL_DATE - When this option is set to true, the module will automatically fill the manual date when you create a new product -- Bugs correction in the advanced search and addition of a pager -- Better support of Xoops 2.3 -- Change in the gateways class and structure -- In the module's administration, manufacturer's name are now clickable -- In the module's administration, the count of products is now visible -- When you add a product, in the module's administration, the module shows you an example for the "Path of the file to download" field -- Correction of several bugs with the Paypal gateway and orders records on some hosts (burning/herve) -- Bug correction in the shelf class (Bezoops/Herv\xE9) -- There were 2 minor changes in the translations, see lang.diff - - -************* -Version 2.1 -************* -- You can now use the Xoops TAG module -- In the file config.php, you can select where to place the "duplicated" word (at the beginning or at the end of the product's title and in the reductions) -- In config.php, addition of an option to select the visible tabs in the module's administration (see config.php for some explanations) -- There was a problem in the CSS class used to represent the breadcrumb in the categories page -- The products duplication had several problems : - a) The attached files were not save - b) The product's picture and thumb was identical to the original product so in case of deletion (the original product), the pictures of the clone product were also removed (de facto) -- Addition of a new parameter in config.php, "OLEDRION_RELATED_BOTH" - When this option is set to false, if Product A has Product B as a related product but Product A is not noted as related to Product B then the display of product A will display Product B as a related product. - But Product B will not show Product A as a related product. - When this option is set to true, Product A and Product B display each other as two related products even if Product A was not set as a related product to Product A. - - By default this option is set to false to respect the initial module's behavior. -- When sending template mails, the module is now verifying that the language folder for your translation exists (if you are not English). - If the translation folder does not exist then it will use the English folder. -- The cache Lite class was updated -- New translations (see lang.diff) - -************* -Version 2.0 -************* -- It was not possible to see a product if you did not defined a VAT - philou -- When you duplicate a product you are now redirected to the product - philou -- It was not possible to see the list of all products when you was not using the price field - philou -- Bug correction in the categories list (categories were duplicated) - philou -- There was a bug, still in the categories list, when you was not using the price field - philou -- Correction on the product's page (product.php) and in the page used to rate a product (rate-product.php), - it was not possible to vote for products - blueteen -- There were many changes in the translations (see lang.diff) - There is a new file to translate here : /xoops/modules/admin/gateways/paypal/language/mylanguage/main.php -- Bug correction in the reductions when prices was not used - philou -- Bug correction in the cart when a product was removed but still present in a user's cart - philou -- Some templates were modified so you need to update them -- Addition of a new table in the database to manage gateways options -- Addition of a new field (cmd_comment) in the "oledrion_commands" table -- In the module's administration, and in the part used to manage the products, the products list was changed, - you can now filter products -- The templates used to send emails were changed (command_shop.tpl, command_shop_verified.tpl, command_shop_fraud.tpl, command_shop_pending.tpl, command_shop_failed.tpl, command_shop_cancel.tpl) - I have added {COMMENT} -- The file config.php was changed -- The module was deeply modified to be able to use other payment gateways (that's why the module's version was changed to a major one) - - - YOU MUST UPDATE THE MODULE IN THE XOOPS MODULES MANAGER - - YOU MUST GO AT LEAST ONE TIME IN THE MODULE'S ADMINISTRATION (to create a new table in the database) - - YOU MUST REVALIDATE AT LEAST ONE TIME THE MODULE'S PREFENCES - - YOU MUST GO IN THE MODULE'S ADMINISTRATION AND IN THE "GATEWAY" TAB, SELECT PAYPAL AND SET ITS PREFERENCES - - -************* -Version 1.65 -************* -- The module's administration will verify that the cache folder is writable -- Some bugs were corrected in the page called category.php -- Bug correction in the shopping cart -- The module is capable of using the editors of Xoops 2.3 more easily -- In the module's search, there was a problem with the categories selector -- The support for the Spaw editor is abandoned -- The support of Xoops 2.2.x is abandoned -- You can use tinymce if you are running Xoops 2.3 (but there are some bugs in Xoops) -- TCPDF was updated -- No changes in the translations (except some typo corrections in the english translation) -- Some changes in the templates - -************* -Version 1.64 -************* -- Correction of a bug in the csv export -- TCPDF was updated -- Correction of a bug in the products prices in the PDF catalog -- Addition of a pager in the module's index page -- Correction of a bug in the discount system, there was a problem when you was creating a discount with a starting and ending date -- Correction of a bug in the cart's template (for the link used to remove a product from the cart) -- New module option to select if you want to multiply the produt's shipping amount by the product's quantity. - New translation in modinfo.php : - _MI_OLEDRION_SHIPPING_QUANTITY - -************* -Version 1.63 -************* -- Bug correction in the PDF catalog -- Bug correction in the shipping's calculation (quantites was not used for shipping calculation) -- Bug correction in the cart/order tables (as a consequence, there was some bugs in the invoice and dashboard) -- Bugs corrections in the emails sent to the website and to the client after his/her order -- You have a plugin for RssFit & Sitemap - - -************* -Version 1.62 -************* -- Correction of a bug in download.php (thank you Trabis) -- TCPDF was updated -- Correction of a bug when the product's quantity as changed in the cart (thank you Trabis) - -************* -Version 1.61 -************* -- Rajout d'une option permettant de d\xE9sactiver la zone prix (des produits) -- Dans la fiche d'un produit, la liste des produits r\xE9cents ne contient plus le produit en cours -- Ajout d'une zone cat_footer dans les cat\xE9gories (pour pouvoir mettre un pied de page par cat\xE9gorie) -- Eclatement de l'administration en plusieurs fichiers -- M\xE9nage dans /admin/functions.php -- Ajout de cache aux flux RSS -- Beaucoup de refactorisation du code (conventions d'\xE9criture) -- Ajout de ExtJs pour la page qui liste tous les produits -- Mise \xE0 jour de TCPDF -- Modification de la page des cat\xE9gories afin de pouvoir y afficher les cat\xE9gories m\xE8res ou les cat\xE9gories filles (selon le cas) sur param\xE9trage (cf config.php) -... [truncated message content] |