|
From: <be...@us...> - 2013-07-03 23:18:44
|
Revision: 11808
http://sourceforge.net/p/xoops/svn/11808
Author: beckmi
Date: 2013-07-03 23:18:37 +0000 (Wed, 03 Jul 2013)
Log Message:
-----------
Adding new changes from Voltan
Modified Paths:
--------------
XoopsModules/oledrion/branches/voltan/oledrion/admin/about.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/attributes.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/categories.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/dashboard.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/discounts.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/files.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/gateways.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/index.html
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/lists.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/lowstock.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/manufacturers.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/newsletter.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/orders.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/products.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/property.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/texts.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/vat.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/vendors.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/admin_footer.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/admin_header.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/exports/csv.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/exports/dbase.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/exports/export.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/exports/index.html
XoopsModules/oledrion/branches/voltan/oledrion/admin/functions.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/gateway.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/index.html
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/paypal/gateway.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/paypal/index.html
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/paypal/language/english/index.html
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/paypal/language/english/main.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/paypal/language/french/index.html
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/paypal/language/french/main.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/paypal/language/index.html
XoopsModules/oledrion/branches/voltan/oledrion/admin/index.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/menu.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/productsselector.php
XoopsModules/oledrion/branches/voltan/oledrion/ajax.php
XoopsModules/oledrion/branches/voltan/oledrion/all-lists.php
XoopsModules/oledrion/branches/voltan/oledrion/all-products.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/index.html
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_ajax_search.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_best_sales.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_block_tag.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_cart.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_categories.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_categoy_lists.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_mostviewed_lists.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_my_lists.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_new.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_promotion.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_random.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_random_lists.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_rated.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_recent_lists.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_recentlysold.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_recommended.php
XoopsModules/oledrion/branches/voltan/oledrion/blocks/oledrion_top.php
XoopsModules/oledrion/branches/voltan/oledrion/caddy.php
XoopsModules/oledrion/branches/voltan/oledrion/cancel-payment.php
XoopsModules/oledrion/branches/voltan/oledrion/categories-map.php
XoopsModules/oledrion/branches/voltan/oledrion/category.php
XoopsModules/oledrion/branches/voltan/oledrion/cgv.php
XoopsModules/oledrion/branches/voltan/oledrion/changelog.php
XoopsModules/oledrion/branches/voltan/oledrion/checkout.php
XoopsModules/oledrion/branches/voltan/oledrion/class/PersistableObjectHandler.php
XoopsModules/oledrion/branches/voltan/oledrion/class/classheader.php
XoopsModules/oledrion/branches/voltan/oledrion/class/index.html
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_attributes.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_caddy.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_caddy_attributes.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_cat.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_commands.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_currency.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_discounts.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_files.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_gateways.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_gateways_options.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_handlers.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_lists.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_manufacturer.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_parameters.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_persistent_cart.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_plugins.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_products.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_products_list.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_productsmanu.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_reductions.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_related.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_shelf.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_shelf_parameters.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_utils.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_vat.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_vendors.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_votedata.php
XoopsModules/oledrion/branches/voltan/oledrion/class/registryfile.php
XoopsModules/oledrion/branches/voltan/oledrion/class/tree.php
XoopsModules/oledrion/branches/voltan/oledrion/comment_delete.php
XoopsModules/oledrion/branches/voltan/oledrion/comment_edit.php
XoopsModules/oledrion/branches/voltan/oledrion/comment_new.php
XoopsModules/oledrion/branches/voltan/oledrion/comment_post.php
XoopsModules/oledrion/branches/voltan/oledrion/comment_reply.php
XoopsModules/oledrion/branches/voltan/oledrion/config.php
XoopsModules/oledrion/branches/voltan/oledrion/css/autocomplete.css
XoopsModules/oledrion/branches/voltan/oledrion/css/index.html
XoopsModules/oledrion/branches/voltan/oledrion/css/oledrion.css
XoopsModules/oledrion/branches/voltan/oledrion/css/print.css
XoopsModules/oledrion/branches/voltan/oledrion/css/validate.css
XoopsModules/oledrion/branches/voltan/oledrion/docs/changelog.txt
XoopsModules/oledrion/branches/voltan/oledrion/download.php
XoopsModules/oledrion/branches/voltan/oledrion/extra/clone.php
XoopsModules/oledrion/branches/voltan/oledrion/extra/index.html
XoopsModules/oledrion/branches/voltan/oledrion/extra/modules/index.html
XoopsModules/oledrion/branches/voltan/oledrion/extra/modules/rss/index.html
XoopsModules/oledrion/branches/voltan/oledrion/extra/modules/rss/plugins/index.html
XoopsModules/oledrion/branches/voltan/oledrion/extra/modules/rss/plugins/rssfit.oledrion.php
XoopsModules/oledrion/branches/voltan/oledrion/extra/modules/sitemap/index.html
XoopsModules/oledrion/branches/voltan/oledrion/extra/modules/sitemap/plugins/index.html
XoopsModules/oledrion/branches/voltan/oledrion/extra/modules/sitemap/plugins/oledrion.php
XoopsModules/oledrion/branches/voltan/oledrion/gateway-notify.php
XoopsModules/oledrion/branches/voltan/oledrion/header.php
XoopsModules/oledrion/branches/voltan/oledrion/include/comment_functions.php
XoopsModules/oledrion/branches/voltan/oledrion/include/common.php
XoopsModules/oledrion/branches/voltan/oledrion/include/functions.php
XoopsModules/oledrion/branches/voltan/oledrion/include/index.html
XoopsModules/oledrion/branches/voltan/oledrion/include/notification.inc.php
XoopsModules/oledrion/branches/voltan/oledrion/include/plugin.tag.php
XoopsModules/oledrion/branches/voltan/oledrion/include/product_search_form.php
XoopsModules/oledrion/branches/voltan/oledrion/include/search.inc.php
XoopsModules/oledrion/branches/voltan/oledrion/index.php
XoopsModules/oledrion/branches/voltan/oledrion/invoice.php
XoopsModules/oledrion/branches/voltan/oledrion/js/attributes.js
XoopsModules/oledrion/branches/voltan/oledrion/language/english/admin.php
XoopsModules/oledrion/branches/voltan/oledrion/language/english/blocks.php
XoopsModules/oledrion/branches/voltan/oledrion/language/english/help/help.html
XoopsModules/oledrion/branches/voltan/oledrion/language/english/help/index.html
XoopsModules/oledrion/branches/voltan/oledrion/language/english/index.html
XoopsModules/oledrion/branches/voltan/oledrion/language/english/mail_template/command_client.tpl
XoopsModules/oledrion/branches/voltan/oledrion/language/english/mail_template/command_shop.tpl
XoopsModules/oledrion/branches/voltan/oledrion/language/english/mail_template/global_newcategory_notify.tpl
XoopsModules/oledrion/branches/voltan/oledrion/language/english/mail_template/index.html
XoopsModules/oledrion/branches/voltan/oledrion/language/english/main.php
XoopsModules/oledrion/branches/voltan/oledrion/language/english/modinfo.php
XoopsModules/oledrion/branches/voltan/oledrion/language/english/newsletter.php
XoopsModules/oledrion/branches/voltan/oledrion/language/index.html
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/admin.php
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/blocks.php
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/index.html
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/index.html
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/mail_template/command_client.tpl
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/mail_template/command_client_verified.tpl
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/mail_template/command_shop.tpl
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/mail_template/command_shop_failed.tpl
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/mail_template/global_newcategory_notify.tpl
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/mail_template/index.html
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/main.php
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/modinfo.php
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/newsletter.php
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/style.css
XoopsModules/oledrion/branches/voltan/oledrion/list.php
XoopsModules/oledrion/branches/voltan/oledrion/list.tag.php
XoopsModules/oledrion/branches/voltan/oledrion/manufacturer.php
XoopsModules/oledrion/branches/voltan/oledrion/media.php
XoopsModules/oledrion/branches/voltan/oledrion/my-lists.php
XoopsModules/oledrion/branches/voltan/oledrion/notification_update.php
XoopsModules/oledrion/branches/voltan/oledrion/paypal-notify.php
XoopsModules/oledrion/branches/voltan/oledrion/plugins/actions/newelements/plugins.php
XoopsModules/oledrion/branches/voltan/oledrion/plugins/models/oledrion_action.php
XoopsModules/oledrion/branches/voltan/oledrion/plugins/models/oledrion_filter.php
XoopsModules/oledrion/branches/voltan/oledrion/product.php
XoopsModules/oledrion/branches/voltan/oledrion/rate-product.php
XoopsModules/oledrion/branches/voltan/oledrion/recommended.php
XoopsModules/oledrion/branches/voltan/oledrion/rss.php
XoopsModules/oledrion/branches/voltan/oledrion/search.php
XoopsModules/oledrion/branches/voltan/oledrion/sql/index.html
XoopsModules/oledrion/branches/voltan/oledrion/sql/mysql.sql
XoopsModules/oledrion/branches/voltan/oledrion/templates/admin/oledrion_order_print.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_ajax_search.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_bestsales.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_cart.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_category_lists.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_mostviewed_lists.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_my_lists.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_new.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_promotion.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_random.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_random_lists.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_rated.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_recent_lists.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_recentlysold.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_recommended.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/oledrion_block_top.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_all_lists.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_allproducts.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_caddy.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_cancelpurchase.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_categories_list.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_category.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_cgv.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_command.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_index.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_list.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_manufacturer.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_map.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_mylists.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_product.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_rate_product.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_recommended.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_search.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_thankyou.html
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_whoswho.html
XoopsModules/oledrion/branches/voltan/oledrion/thankyou.php
XoopsModules/oledrion/branches/voltan/oledrion/view.tag.php
XoopsModules/oledrion/branches/voltan/oledrion/whoswho.php
XoopsModules/oledrion/branches/voltan/oledrion/xoops_version.php
Added Paths:
-----------
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/delivery.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/location.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/maintain.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/packing.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/payment.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24/
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24/gateway.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24/index.html
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24/language/
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24/language/english/
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24/language/english/index.html
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24/language/english/main.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24/language/index.html
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24/language/persian/
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24/language/persian/index.html
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24/language/persian/main.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24/nusoap.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/gateways/pec24.tar.gz
XoopsModules/oledrion/branches/voltan/oledrion/blocks/.directory
XoopsModules/oledrion/branches/voltan/oledrion/class/.directory
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_delivery.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_delivery_payment.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_location.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_location_delivery.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_packing.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_payment.php
XoopsModules/oledrion/branches/voltan/oledrion/class/oledrion_payment_log.php
XoopsModules/oledrion/branches/voltan/oledrion/comment_fast.php
XoopsModules/oledrion/branches/voltan/oledrion/include/functions_install.php
XoopsModules/oledrion/branches/voltan/oledrion/include/functions_update.php
XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/step1.png
XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/step2.png
XoopsModules/oledrion/branches/voltan/oledrion/language/english/image/step3.png
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/step1.png
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/step2.png
XoopsModules/oledrion/branches/voltan/oledrion/language/persian/image/step3.png
XoopsModules/oledrion/branches/voltan/oledrion/templates/.directory
XoopsModules/oledrion/branches/voltan/oledrion/templates/blocks/.directory
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_product_box.html
Removed Paths:
-------------
XoopsModules/oledrion/branches/voltan/oledrion/admin/dbupdate.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/main.php
XoopsModules/oledrion/branches/voltan/oledrion/admin/tablefunctions.php
XoopsModules/oledrion/branches/voltan/oledrion/class/PEAR.php
XoopsModules/oledrion/branches/voltan/oledrion/class/PEAR5.php
XoopsModules/oledrion/branches/voltan/oledrion/class/lite.php
XoopsModules/oledrion/branches/voltan/oledrion/include/validate.css
XoopsModules/oledrion/branches/voltan/oledrion/templates/oledrion_caddy1.html
Modified: XoopsModules/oledrion/branches/voltan/oledrion/admin/about.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/admin/about.php 2013-07-03 20:01:14 UTC (rev 11807)
+++ XoopsModules/oledrion/branches/voltan/oledrion/admin/about.php 2013-07-03 23:18:37 UTC (rev 11808)
@@ -1,22 +1,22 @@
<?php
-/**
- * Birthday module
- *
- * 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 The XOOPS Project (http://www.xoops.org)
- * @license {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License}
- * @package birthday
- * @since 2.5.0
- * @author XOOPS Module Team
- * @version $Id $
- **/
-
+/*
+ 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.
+*/
+
+/**
+ * oledrion
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Hervé Thouzard (http://www.herve-thouzard.com/)
+ * @version $Id$
+ */
include_once dirname(__FILE__) . '/admin_header.php';
xoops_cp_header();
Modified: XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/attributes.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/attributes.php 2013-07-03 20:01:14 UTC (rev 11807)
+++ XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/attributes.php 2013-07-03 23:18:37 UTC (rev 11808)
@@ -1,30 +1,28 @@
<?php
+/*
+ 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.
+*/
+
/**
- * ****************************************************************************
- * oledrion - MODULE FOR XOOPS
- * Copyright (c) Hervé Thouzard (http://www.herve-thouzard.com/)
+ * oledrion
*
- * 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é Thouzard (http://www.herve-thouzard.com/)
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package oledrion
- * @author Hervé Thouzard (http://www.herve-thouzard.com/)
- *
- * Version : $Id:
- * ****************************************************************************
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Hervé Thouzard (http://www.herve-thouzard.com/)
+ * @version $Id$
*/
/**
* Gestion des attributs produits
*/
-if(!defined("OLEDRION_ADMIN")) exit();
-global $baseurl; // Pour faire taire les warnings de Zend Studio
+if (!defined("OLEDRION_ADMIN")) exit();
+global $baseurl; // Pour faire taire les warnings de Zend Studio
$operation = 'attributes';
/**
@@ -34,305 +32,303 @@
*/
function removeAttributInSession()
{
- if(isset($_SESSION['oledrion_attribute'])) {
+ if (isset($_SESSION['oledrion_attribute'])) {
$_SESSION['oledrion_attribute'] = null;
unset($_SESSION['oledrion_attribute']);
}
}
-switch($action) {
- // ****************************************************************************************************************
- case 'default': // Liste des attributs produits
+switch ($action) {
// ****************************************************************************************************************
+ case 'default': // Liste des attributs produits
+ // ****************************************************************************************************************
xoops_cp_header();
- oledrion_adminMenu(13);
- global $xoopsConfig;
- $productsIds = $products = $productsIdsForList = $productsForList = array();
+
+ global $xoopsConfig;
+ $productsIds = $products = $productsIdsForList = $productsForList = array();
$class = '';
removeAttributInSession();
- $form = "<form method='post' action='$baseurl' name='frmadd$operation' id='frmadd$operation'><input type='hidden' name='op' id='op' value='$operation' /><input type='hidden' name='action' id='action' value='add' /><input type='submit' name='btngo' id='btngo' value='"._AM_OLEDRION_ADD_ITEM."' /></form>";
- echo $form;
+ $form = "<form method='post' action='$baseurl' name='frmadd$operation' id='frmadd$operation'><input type='hidden' name='op' id='op' value='$operation' /><input type='hidden' name='action' id='action' value='add' /><input type='submit' name='btngo' id='btngo' value='" . _AM_OLEDRION_ADD_ITEM . "' /></form>";
+ echo $form;
- oledrion_utils::htitle(_AM_OLEDRION_ATTRIBUTES_LIST, 4);
+ oledrion_utils::htitle(_AM_OLEDRION_ATTRIBUTES_LIST, 4);
$start = isset($_GET['start']) ? intval($_GET['start']) : 0;
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria('attribute_id', 0, '<>'));
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('attribute_id', 0, '<>'));
- $filter_attribute_id = $filter_attribute_id = $filter_attribute_weight = $filter_attribute_type = $filter_attribute_product_id = 0;
- $filter_attribute_title = '';
+ $filter_attribute_id = $filter_attribute_id = $filter_attribute_weight = $filter_attribute_type = $filter_attribute_product_id = 0;
+ $filter_attribute_title = '';
- $newFilter = false;
+ $newFilter = false;
- if(isset($_POST['filter_attribute_id'])) {
- if(intval($_POST['filter_attribute_id']) != 0) {
- $criteria->add(new Criteria('attribute_id', intval($_POST['filter_attribute_id']), '='));
- }
- $filter_attribute_id = intval($_POST['filter_attribute_id']);
- $newFilter = true;
- }
- if(isset($_POST['filter_attribute_title']) && xoops_trim($_POST['filter_attribute_title']) != '') {
- $criteria->add(new Criteria('attribute_title', '%'.$_POST['filter_attribute_title'].'%', 'LIKE'));
- $filter_attribute_title = $_POST['filter_attribute_title'];
- $newFilter = true;
- }
- if(isset($_POST['filter_attribute_product_id']) && intval($_POST['filter_attribute_product_id']) != 0) {
- $criteria->add(new Criteria('attribute_product_id', intval($_POST['filter_attribute_product_id']), '='));
- $filter_attribute_product_id = intval($_POST['filter_attribute_product_id']);
- $newFilter = true;
- }
- if(isset($_POST['filter_attribute_weight']) && intval($_POST['filter_attribute_weight']) != 0) {
- $criteria->add(new Criteria('attribute_weight', intval($_POST['filter_attribute_weight']), '='));
- $filter_attribute_weight = intval($_POST['filter_attribute_weight']);
- $newFilter = true;
- }
- if(isset($_POST['filter_attribute_type']) && intval($_POST['filter_attribute_type']) != 0) {
- $criteria->add(new Criteria('attribute_type', intval($_POST['filter_attribute_type']), '='));
- $filter_attribute_type = intval($_POST['filter_attribute_type']);
- $newFilter = true;
- }
+ if (isset($_POST['filter_attribute_id'])) {
+ if (intval($_POST['filter_attribute_id']) != 0) {
+ $criteria->add(new Criteria('attribute_id', intval($_POST['filter_attribute_id']), '='));
+ }
+ $filter_attribute_id = intval($_POST['filter_attribute_id']);
+ $newFilter = true;
+ }
+ if (isset($_POST['filter_attribute_title']) && xoops_trim($_POST['filter_attribute_title']) != '') {
+ $criteria->add(new Criteria('attribute_title', '%' . $_POST['filter_attribute_title'] . '%', 'LIKE'));
+ $filter_attribute_title = $_POST['filter_attribute_title'];
+ $newFilter = true;
+ }
+ if (isset($_POST['filter_attribute_product_id']) && intval($_POST['filter_attribute_product_id']) != 0) {
+ $criteria->add(new Criteria('attribute_product_id', intval($_POST['filter_attribute_product_id']), '='));
+ $filter_attribute_product_id = intval($_POST['filter_attribute_product_id']);
+ $newFilter = true;
+ }
+ if (isset($_POST['filter_attribute_weight']) && intval($_POST['filter_attribute_weight']) != 0) {
+ $criteria->add(new Criteria('attribute_weight', intval($_POST['filter_attribute_weight']), '='));
+ $filter_attribute_weight = intval($_POST['filter_attribute_weight']);
+ $newFilter = true;
+ }
+ if (isset($_POST['filter_attribute_type']) && intval($_POST['filter_attribute_type']) != 0) {
+ $criteria->add(new Criteria('attribute_type', intval($_POST['filter_attribute_type']), '='));
+ $filter_attribute_type = intval($_POST['filter_attribute_type']);
+ $newFilter = true;
+ }
- if($filter_attribute_id == 0 && $filter_attribute_title == '' && $filter_attribute_weight == 0 && $filter_attribute_type == 0) {
- $newFilter = true;
- }
+ if ($filter_attribute_id == 0 && $filter_attribute_title == '' && $filter_attribute_weight == 0 && $filter_attribute_type == 0) {
+ $newFilter = true;
+ }
- if(!$newFilter && isset($_SESSION['oledrion_filter_attributes'])) {
- $criteria = unserialize($_SESSION['oledrion_filter_attributes']);
- $filter_attribute_id = $_SESSION['filter_attribute_id'];
- $filter_attribute_title = $_SESSION['filter_attribute_title'];
- $filter_attribute_product_id = $_SESSION['filter_attribute_product_id'];
- $filter_attribute_weight = $_SESSION['filter_attribute_weight'];
- $filter_attribute_type = $_SESSION['filter_attribute_type'];
- }
+ if (!$newFilter && isset($_SESSION['oledrion_filter_attributes'])) {
+ $criteria = unserialize($_SESSION['oledrion_filter_attributes']);
+ $filter_attribute_id = $_SESSION['filter_attribute_id'];
+ $filter_attribute_title = $_SESSION['filter_attribute_title'];
+ $filter_attribute_product_id = $_SESSION['filter_attribute_product_id'];
+ $filter_attribute_weight = $_SESSION['filter_attribute_weight'];
+ $filter_attribute_type = $_SESSION['filter_attribute_type'];
+ }
- $_SESSION['oledrion_filter_attributes'] = serialize($criteria);
- $_SESSION['filter_attribute_id'] = $filter_attribute_id;
- $_SESSION['filter_attribute_title'] = $filter_attribute_title;
- $_SESSION['filter_attribute_product_id'] = $filter_attribute_product_id;
- $_SESSION['filter_attribute_weight'] = $filter_attribute_weight;
- $_SESSION['filter_attribute_type'] = $filter_attribute_type;
+ $_SESSION['oledrion_filter_attributes'] = serialize($criteria);
+ $_SESSION['filter_attribute_id'] = $filter_attribute_id;
+ $_SESSION['filter_attribute_title'] = $filter_attribute_title;
+ $_SESSION['filter_attribute_product_id'] = $filter_attribute_product_id;
+ $_SESSION['filter_attribute_weight'] = $filter_attribute_weight;
+ $_SESSION['filter_attribute_type'] = $filter_attribute_type;
- $itemsCount = $oledrion_handlers->h_oledrion_attributes->getCount($criteria);
- if($itemsCount > $limit) {
- $pagenav = new XoopsPageNav( $itemsCount, $limit, $start, 'start', 'op='.$operation);
- }
+ $itemsCount = $oledrion_handlers->h_oledrion_attributes->getCount($criteria);
+ if ($itemsCount > $limit) {
+ $pagenav = new XoopsPageNav($itemsCount, $limit, $start, 'start', 'op=' . $operation);
+ }
- $criteria->setLimit($limit);
- $criteria->setStart($start);
- $criteria->setSort('attribute_product_id, attribute_weight');
- $items = $oledrion_handlers->h_oledrion_attributes->getObjects($criteria);
- if(count($items) > 0) {
- foreach($items as $item) {
- if(!isset($productsIds[$item->getVar('attribute_product_id')])) {
- $productsIds[] = $item->getVar('attribute_product_id');
- }
- }
- if(count($productsIds) > 0) {
+ $criteria->setLimit($limit);
+ $criteria->setStart($start);
+ $criteria->setSort('attribute_product_id, attribute_weight');
+ $items = $oledrion_handlers->h_oledrion_attributes->getObjects($criteria);
+ if (count($items) > 0) {
+ foreach ($items as $item) {
+ if (!isset($productsIds[$item->getVar('attribute_product_id')])) {
+ $productsIds[] = $item->getVar('attribute_product_id');
+ }
+ }
+ if (count($productsIds) > 0) {
$products = $oledrion_handlers->h_oledrion_products->getProductsFromIDs($productsIds, true);
- }
- }
- $typeSelect = oledrion_utils::htmlSelect('filter_attribute_type', array( OLEDRION_ATTRIBUTE_RADIO => _AM_OLEDRION_TYPE_RADIO, OLEDRION_ATTRIBUTE_CHECKBOX => _AM_OLEDRION_TYPE_CHECKBOX, OLEDRION_ATTRIBUTE_SELECT => _AM_OLEDRION_TYPE_LIST) , $filter_attribute_type);
+ }
+ }
+ $typeSelect = oledrion_utils::htmlSelect('filter_attribute_type', array(OLEDRION_ATTRIBUTE_RADIO => _AM_OLEDRION_TYPE_RADIO, OLEDRION_ATTRIBUTE_CHECKBOX => _AM_OLEDRION_TYPE_CHECKBOX, OLEDRION_ATTRIBUTE_SELECT => _AM_OLEDRION_TYPE_LIST), $filter_attribute_type);
- $productsIdsForList = $oledrion_handlers->h_oledrion_attributes->getDistinctsProductsIds();
- if(count($productsIdsForList) > 0) {
- $productsForList = $oledrion_handlers->h_oledrion_products->getList(new Criteria('product_id', '('.implode(',',$productsIdsForList).')', 'IN'));
- }
+ $productsIdsForList = $oledrion_handlers->h_oledrion_attributes->getDistinctsProductsIds();
+ if (count($productsIdsForList) > 0) {
+ $productsForList = $oledrion_handlers->h_oledrion_products->getList(new Criteria('product_id', '(' . implode(',', $productsIdsForList) . ')', 'IN'));
+ }
$selectProduct = oledrion_utils::htmlSelect('filter_attribute_product_id', $productsForList, $filter_attribute_product_id);
- echo "<table width='100%' cellspacing='1' cellpadding='3' border='0' class='outer'>";
- if(isset($pagenav) && is_object($pagenav)) {
- echo "<tr><td colspan='2' align='left'>".$pagenav->renderNav()."</td><td align='right' colspan='3'> </td></tr>\n";
- }
- echo "<tr><th align='center'>"._AM_OLEDRION_ID."</th><th align='center'>"._AM_OLEDRION_TITLE."</th><th align='center'>"._AM_OLEDRION_DISCOUNT_PRODUCT."</th><th align='center'>"._AM_OLEDRION_WEIGHT."</th><th align='center'>"._AM_OLEDRION_TYPE."</th><th align='center'>"._AM_OLEDRION_ACTION."</th></tr>";
+ echo "<table width='100%' cellspacing='1' cellpadding='3' border='0' class='outer'>";
+ if (isset($pagenav) && is_object($pagenav)) {
+ echo "<tr><td colspan='2' align='left'>" . $pagenav->renderNav() . "</td><td align='right' colspan='3'> </td></tr>\n";
+ }
+ echo "<tr><th align='center'>" . _AM_OLEDRION_ID . "</th><th align='center'>" . _AM_OLEDRION_TITLE . "</th><th align='center'>" . _AM_OLEDRION_DISCOUNT_PRODUCT . "</th><th align='center'>" . _AM_OLEDRION_WEIGHT . "</th><th align='center'>" . _AM_OLEDRION_TYPE . "</th><th align='center'>" . _AM_OLEDRION_ACTION . "</th></tr>";
- // Les filtres
- echo "<tr><form method='post' action='$baseurl'><th align='center'><input type='text' size='3' name='filter_attribute_id' id='filter_attribute_id' value='$filter_attribute_id' /></th>\n";
- echo "<th align='center'><input type='text' size='25' name='filter_attribute_title' id='filter_attribute_title' value='$filter_attribute_title' /></th>\n";
- echo "<th align='center'>".$selectProduct."</th>\n";
- echo "<th align='center'><input type='text' size='5' name='filter_attribute_weight' id='filter_attribute_weight' value='$filter_attribute_weight' /></th>\n";
- echo "<th align='center'>".$typeSelect."</th>\n";
- echo "<th align='center'><input type='hidden' name='op' id='op' value='attributes' /><input type='submit' name='btngo' id='btngo' value='"._GO."' /></th></form></tr>\n";
+ // Les filtres
+ echo "<tr><form method='post' action='$baseurl'><th align='center'><input type='text' size='3' name='filter_attribute_id' id='filter_attribute_id' value='$filter_attribute_id' /></th>\n";
+ echo "<th align='center'><input type='text' size='25' name='filter_attribute_title' id='filter_attribute_title' value='$filter_attribute_title' /></th>\n";
+ echo "<th align='center'>" . $selectProduct . "</th>\n";
+ echo "<th align='center'><input type='text' size='5' name='filter_attribute_weight' id='filter_attribute_weight' value='$filter_attribute_weight' /></th>\n";
+ echo "<th align='center'>" . $typeSelect . "</th>\n";
+ echo "<th align='center'><input type='hidden' name='op' id='op' value='attributes' /><input type='submit' name='btngo' id='btngo' value='" . _GO . "' /></th></form></tr>\n";
- foreach ($items as $item) {
- $class = ($class == 'even') ? 'odd' : 'even';
- $id = $item->getVar('attribute_id');
- $actions = array();
- $actions[] = "<a href='$baseurl?op=$operation&action=edit&id=".$id."' title='"._OLEDRION_EDIT."'>".$icones['edit'].'</a>';
- $actions[] = "<a href='$baseurl?op=$operation&action=copy&id=".$id."' title='"._OLEDRION_DUPLICATE_ATTRIBUTE."'>".$icones['copy'].'</a>';
- $actions[] = "<a href='$baseurl?op=$operation&action=delete&id=".$id."' title='"._OLEDRION_DELETE."'".$conf_msg.">".$icones['delete'].'</a>';
- $productTitle = isset($products[$item->getVar('attribute_product_id')]) ? $products[$item->getVar('attribute_product_id')]->getVar('product_title') : '' ;
- $productLink = isset($products[$item->getVar('attribute_product_id')]) ? $products[$item->getVar('attribute_product_id')]->getLink() : '' ;
- echo "<tr class='".$class."'>\n";
- echo "<td align='right'>".$item->attribute_id."</a></td>";
- echo "<td align='left'><a target='_blank' href='".$productLink."'>".$item->attribute_title."</a></td>";
- $urlProductEdit = $baseurl."?op=products&action=edit&id=".$item->getVar('attribute_product_id');
+ foreach ($items as $item) {
+ $class = ($class == 'even') ? 'odd' : 'even';
+ $id = $item->getVar('attribute_id');
+ $actions = array();
+ $actions[] = "<a href='$baseurl?op=$operation&action=edit&id=" . $id . "' title='" . _OLEDRION_EDIT . "'>" . $icones['edit'] . '</a>';
+ $actions[] = "<a href='$baseurl?op=$operation&action=copy&id=" . $id . "' title='" . _OLEDRION_DUPLICATE_ATTRIBUTE . "'>" . $icones['copy'] . '</a>';
+ $actions[] = "<a href='$baseurl?op=$operation&action=delete&id=" . $id . "' title='" . _OLEDRION_DELETE . "'" . $conf_msg . ">" . $icones['delete'] . '</a>';
+ $productTitle = isset($products[$item->getVar('attribute_product_id')]) ? $products[$item->getVar('attribute_product_id')]->getVar('product_title') : '';
+ $productLink = isset($products[$item->getVar('attribute_product_id')]) ? $products[$item->getVar('attribute_product_id')]->getLink() : '';
+ echo "<tr class='" . $class . "'>\n";
+ echo "<td align='right'>" . $item->attribute_id . "</a></td>";
+ echo "<td align='left'><a target='_blank' href='" . $productLink . "'>" . $item->attribute_title . "</a></td>";
+ $urlProductEdit = $baseurl . "?op=products&action=edit&id=" . $item->getVar('attribute_product_id');
- echo "<td align='center'><a title='"._EDIT."' href='".$urlProductEdit."'><img src='".OLEDRION_IMAGES_URL."smalledit.png' /> ".$productTitle."</a></td>";
- echo "<td align='center'>".$item->attribute_weight."</td>\n";
- echo "<td align='center'>".$item->getTypeName()."</td>\n";
- echo "<td align='center'>".implode(' ', $actions)."</td>\n";
- echo "<tr>\n";
- }
- $class = ($class == 'even') ? 'odd' : 'even';
- echo "<tr class='".$class."'>\n";
- echo "<td colspan='6' align='center'>".$form."</td>\n";
- echo "</tr>\n";
- echo '</table>';
- if(isset($pagenav) && is_object($pagenav)) {
- echo "<div align='right'>".$pagenav->renderNav()."</div>";
- }
- include_once OLEDRION_ADMIN_PATH . 'admin_footer.php';
+ echo "<td align='center'><a title='" . _EDIT . "' href='" . $urlProductEdit . "'><img src='" . OLEDRION_IMAGES_URL . "smalledit.png' /> " . $productTitle . "</a></td>";
+ echo "<td align='center'>" . $item->attribute_weight . "</td>\n";
+ echo "<td align='center'>" . $item->getTypeName() . "</td>\n";
+ echo "<td align='center'>" . implode(' ', $actions) . "</td>\n";
+ echo "<tr>\n";
+ }
+ $class = ($class == 'even') ? 'odd' : 'even';
+ echo "<tr class='" . $class . "'>\n";
+ echo "<td colspan='6' align='center'>" . $form . "</td>\n";
+ echo "</tr>\n";
+ echo '</table>';
+ if (isset($pagenav) && is_object($pagenav)) {
+ echo "<div align='right'>" . $pagenav->renderNav() . "</div>";
+ }
+ include_once OLEDRION_ADMIN_PATH . 'admin_footer.php';
break;
- // ****************************************************************************************************************
- case 'copy': // Dupliquer un attribut
- // ****************************************************************************************************************
+ // ****************************************************************************************************************
+ case 'copy': // Dupliquer un attribut
+ // ****************************************************************************************************************
xoops_cp_header();
- $id = isset($_GET['id']) ? intval($_GET['id']) : 0;
- if(empty($id)) {
- oledrion_utils::redirect(_AM_OLEDRION_ERROR_1, $baseurl, 5);
- }
- $attribute = null;
- $attribute = $oledrion_handlers->h_oledrion_attributes->get($id);
- if(is_object($attribute)) {
- $newAttribute = $oledrion_handlers->h_oledrion_attributes->cloneAttribute($attribute);
+ $id = isset($_GET['id']) ? intval($_GET['id']) : 0;
+ if (empty($id)) {
+ oledrion_utils::redirect(_AM_OLEDRION_ERROR_1, $baseurl, 5);
+ }
+ $attribute = null;
+ $attribute = $oledrion_handlers->h_oledrion_attributes->get($id);
+ if (is_object($attribute)) {
+ $newAttribute = $oledrion_handlers->h_oledrion_attributes->cloneAttribute($attribute);
$newAttributeId = $newAttribute->attribute_id;
- if($newAttribute !== false) {
- oledrion_utils::redirect(_AM_OLEDRION_SAVE_OK, $baseurl.'?op='.$operation."&action=edit&id=".$newAttributeId, 2);
- } else {
- oledrion_utils::redirect(_AM_OLEDRION_SAVE_PB, $baseurl.'?op='.$operation, 5);
- }
- }
- break;
+ if ($newAttribute !== false) {
+ oledrion_utils::redirect(_AM_OLEDRION_SAVE_OK, $baseurl . '?op=' . $operation . "&action=edit&id=" . $newAttributeId, 2);
+ } else {
+ oledrion_utils::redirect(_AM_OLEDRION_SAVE_PB, $baseurl . '?op=' . $operation, 5);
+ }
+ }
+ break;
- // ****************************************************************************************************************
- case 'delete': // Suppression d'un attribut
- // ****************************************************************************************************************
+ // ****************************************************************************************************************
+ case 'delete': // Suppression d'un attribut
+ // ****************************************************************************************************************
xoops_cp_header();
- $id = isset($_GET['id']) ? intval($_GET['id']) : 0;
- if(empty($id)) {
- oledrion_utils::redirect(_AM_OLEDRION_ERROR_1, $baseurl, 5);
- }
- $attribute = null;
- $attribute = $oledrion_handlers->h_oledrion_attributes->get($id);
- if(!is_object($attribute)) {
- oledrion_utils::redirect(_AM_OLEDRION_NOT_FOUND, $baseurl.'?op='.$operation, 5);
- }
- $attributesCountInCaddy = $oledrion_handlers->h_oledrion_caddy_attributes->getCaddyCountFromAttributeId($id);
- if($attributesCountInCaddy == 0) {
- $res = $oledrion_handlers->h_oledrion_attributes->deleteAttribute($attribute);
- if($res) {
- oledrion_utils::redirect(_AM_OLEDRION_SAVE_OK, $baseurl.'?op='.$operation, 2);
- } else {
- oledrion_utils::redirect(_AM_OLEDRION_SAVE_PB, $baseurl.'?op='.$operation, 5);
- }
- } else {
- oledrion_adminMenu(13);
+ $id = isset($_GET['id']) ? intval($_GET['id']) : 0;
+ if (empty($id)) {
+ oledrion_utils::redirect(_AM_OLEDRION_ERROR_1, $baseurl, 5);
+ }
+ $attribute = null;
+ $attribute = $oledrion_handlers->h_oledrion_attributes->get($id);
+ if (!is_object($attribute)) {
+ oledrion_utils::redirect(_AM_OLEDRION_NOT_FOUND, $baseurl . '?op=' . $operation, 5);
+ }
+ $attributesCountInCaddy = $oledrion_handlers->h_oledrion_caddy_attributes->getCaddyCountFromAttributeId($id);
+ if ($attributesCountInCaddy == 0) {
+ $res = $oledrion_handlers->h_oledrion_attributes->deleteAttribute($attribute);
+ if ($res) {
+ oledrion_utils::redirect(_AM_OLEDRION_SAVE_OK, $baseurl . '?op=' . $operation, 2);
+ } else {
+ oledrion_utils::redirect(_AM_OLEDRION_SAVE_PB, $baseurl . '?op=' . $operation, 5);
+ }
+ } else {
oledrion_utils::htitle(_AM_OLEDRION_SORRY_NOREMOVE2, 4);
$tblTmp = $oledrion_handlers->h_oledrion_caddy_attributes->getCommandIdFromAttribute($id);
- $tblTmp2 = $h_oledrion_commands->getObjects(new Criteria('cmd_id', '('.implode(',', $tblTmp).')', 'IN'), true);
- echo "<table width='100%' cellspacing='1' cellpadding='3' border='0' class='outer'>";
- $class = '';
- echo "<tr><th align='center'>"._AM_OLEDRION_ID."</th><th align='center'>"._AM_OLEDRION_DATE."</th><th align='center'>"._AM_OLEDRION_CLIENT."</th><th align='center'>"._AM_OLEDRION_TOTAL_SHIPP."</th></tr>";
- foreach ($tblTmp2 as $item) {
- $class = ($class == 'even') ? 'odd' : 'even';
- $date = formatTimestamp(strtotime($item->getVar('cmd_date')), 's');
- echo "<tr class='".$class."'>\n";
- echo "<td align='right'>".$item->getVar('cmd_id')."</td><td align='center'>".$date."</td><td align='center'>".$item->getVar('cmd_lastname').' '.$item->getVar('cmd_firstname')."</td><td align='center'>".$item->getVar('cmd_total').' '.oledrion_utils::getModuleOption('money_short').' / '.$item->getVar('cmd_shipping').' '.oledrion_utils::getModuleOption('money_short')."</td>\n";
- echo "<tr>\n";
- }
- echo '</table>';
- include_once OLEDRION_ADMIN_PATH . 'admin_footer.php';
- }
- break;
+ $tblTmp2 = $h_oledrion_commands->getObjects(new Criteria('cmd_id', '(' . implode(',', $tblTmp) . ')', 'IN'), true);
+ echo "<table width='100%' cellspacing='1' cellpadding='3' border='0' class='outer'>";
+ $class = '';
+ echo "<tr><th align='center'>" . _AM_OLEDRION_ID . "</th><th align='center'>" . _AM_OLEDRION_DATE . "</th><th align='center'>" . _AM_OLEDRION_CLIENT . "</th><th align='center'>" . _AM_OLEDRION_TOTAL_SHIPP . "</th></tr>";
+ foreach ($tblTmp2 as $item) {
+ $class = ($class == 'even') ? 'odd' : 'even';
+ $date = formatTimestamp(strtotime($item->getVar('cmd_date')), 's');
+ echo "<tr class='" . $class . "'>\n";
+ echo "<td align='right'>" . $item->getVar('cmd_id') . "</td><td align='center'>" . $date . "</td><td align='center'>" . $item->getVar('cmd_lastname') . ' ' . $item->getVar('cmd_firstname') . "</td><td align='center'>" . $item->getVar('cmd_total') . ' ' . oledrion_utils::getModuleOption('money_short') . ' / ' . $item->getVar('cmd_shipping') . ' ' . oledrion_utils::getModuleOption('money_short') . "</td>\n";
+ echo "<tr>\n";
+ }
+ echo '</table>';
+ include_once OLEDRION_ADMIN_PATH . 'admin_footer.php';
+ }
+ break;
- // ****************************************************************************************************************
- case 'add': // Ajout d'un attribut
- case 'edit': // Edition d'un attribut
- // ****************************************************************************************************************
+ // ****************************************************************************************************************
+ case 'add': // Ajout d'un attribut
+ case 'edit': // Edition d'un attribut
+ // ****************************************************************************************************************
xoops_cp_header();
- oledrion_adminMenu(13);
removeAttributInSession();
- if($action == 'edit') {
- $title = _AM_OLEDRION_EDIT_ATTRIBUTE;
- $id = isset($_GET['id']) ? intval($_GET['id']) : 0;
- if(empty($id)) {
- oledrion_utils::redirect(_AM_OLEDRION_ERROR_1, $baseurl, 5);
- }
- // Item exits ?
- $item = null;
- $item = $oledrion_handlers->h_oledrion_attributes->get($id);
- if(!is_object($item)) {
- oledrion_utils::redirect(_AM_OLEDRION_NOT_FOUND, $baseurl, 5);
- }
- $edit = true;
- $label_submit = _AM_OLEDRION_MODIFY;
- } else {
- $title = _AM_OLEDRION_ADD_ATTRIBUTE;
- $item = $oledrion_handlers->h_oledrion_attributes->create(true);
- $item->setVar('attribute_id', 0);
- $label_submit = _AM_OLEDRION_ADD;
- $edit = false;
- }
- // Appel à jQuery
- $xoTheme->addScript("browse.php?Frameworks/jquery/jquery.js");
- oledrion_utils::callJavascriptFile('noconflict.js', false, true);
- // Appel du fichier langue
- oledrion_utils::callJavascriptFile('messages.js', true, true);
+ if ($action == 'edit') {
+ $title = _AM_OLEDRION_EDIT_ATTRIBUTE;
+ $id = isset($_GET['id']) ? intval($_GET['id']) : 0;
+ if (empty($id)) {
+ oledrion_utils::redirect(_AM_OLEDRION_ERROR_1, $baseurl, 5);
+ }
+ // Item exits ?
+ $item = null;
+ $item = $oledrion_handlers->h_oledrion_attributes->get($id);
+ if (!is_object($item)) {
+ oledrion_utils::redirect(_AM_OLEDRION_NOT_FOUND, $baseurl, 5);
+ }
+ $edit = true;
+ $label_submit = _AM_OLEDRION_MODIFY;
+ } else {
+ $title = _AM_OLEDRION_ADD_ATTRIBUTE;
+ $item = $oledrion_handlers->h_oledrion_attributes->create(true);
+ $item->setVar('attribute_id', 0);
+ $label_submit = _AM_OLEDRION_ADD;
+ $edit = false;
+ }
+ // Appel à jQuery
+ $xoTheme->addScript("browse.php?Frameworks/jquery/jquery.js");
+ oledrion_utils::callJavascriptFile('noconflict.js', false, true);
+ // Appel du fichier langue
+ oledrion_utils::callJavascriptFile('messages.js', true, true);
- $sform = new XoopsThemeForm($title, 'frm'.$operation, $baseurl);
- $sform->addElement(new XoopsFormHidden('op', $operation));
- $sform->addElement(new XoopsFormHidden('action', 'saveedit'));
- $sform->addElement(new XoopsFormHidden('attribute_id', $item->getVar('attribute_id')));
- $sform->addElement(new XoopsFormText(_AM_OLEDRION_TITLE, 'attribute_title', 50, 255, $item->getVar('attribute_title','e')), true);
- $sform->addElement(new XoopsFormText(_AM_OLEDRION_ATTRIBUTE_NAME, 'attribute_name', 50, 255, $item->getVar('attribute_name','e')), true);
+ $sform = new XoopsThemeForm($title, 'frm' . $operation, $baseurl);
+ $sform->addElement(new XoopsFormHidden('op', $operation));
+ $sform->addElement(new XoopsFormHidden('action', 'saveedit'));
+ $sform->addElement(new XoopsFormHidden('attribute_id', $item->getVar('attribute_id')));
+ $sform->addElement(new XoopsFormText(_AM_OLEDRION_TITLE, 'attribute_title', 50, 255, $item->getVar('attribute_title', 'e')), true);
+ $sform->addElement(new XoopsFormText(_AM_OLEDRION_ATTRIBUTE_NAME, 'attribute_name', 50, 255, $item->getVar('attribute_name', 'e')), true);
- $products = array();
- $products = $oledrion_handlers->h_oledrion_products->getList();
- $productsSelect = $oledrion_handlers->h_oledrion_products->productSelector(new oledrion_parameters(array('caption' => _AM_OLEDRION_ATTRIBUTE_PRODUCT, 'name' => 'attribute_product_id', 'value' => $item->getVar('attribute_product_id','e'), 'size' => 1, 'multiple' => false, 'values' => null, 'showAll' => true, 'sort' => 'product_title', 'order' => 'ASC', 'formName' => 'frm'.$operation)));
- $sform->addElement($productsSelect);
+ $products = array();
+ $products = $oledrion_handlers->h_oledrion_products->getList();
+ $productsSelect = $oledrion_handlers->h_oledrion_products->productSelector(new oledrion_parameters(array('caption' => _AM_OLEDRION_ATTRIBUTE_PRODUCT, 'name' => 'attribute_product_id', 'value' => $item->getVar('attribute_product_id', 'e'), 'size' => 1, 'multiple' => false, 'values' => null, 'showAll' => true, 'sort' => 'product_title', 'order' => 'ASC', 'formName' => 'frm' . $operation)));
+ $sform->addElement($productsSelect);
- $sform->addElement(new XoopsFormText(_AM_OLEDRION_WEIGHT, 'attribute_weight', 10, 10, $item->getVar('attribute_weight','e')), true);
+ $sform->addElement(new XoopsFormText(_AM_OLEDRION_WEIGHT, 'attribute_weight', 10, 10, $item->getVar('attribute_weight', 'e')), true);
- $typeSelect = new XoopsFormSelect(_AM_OLEDRION_TYPE, 'attribute_type', $item->getVar('attribute_type','e'));
- $typeSelect->addOptionArray($item->getTypesList());
- $sform->addElement($typeSelect, true);
+ $typeSelect = new XoopsFormSelect(_AM_OLEDRION_TYPE, 'attribute_type', $item->getVar('attribute_type', 'e'));
+ $typeSelect->addOptionArray($item->getTypesList());
+ $sform->addElement($typeSelect, true);
- // Paramétrage (pour les boutons radio et cases à cocher, le délimiteur, pour les listes déroulantes, le nombre d'éléments visibles et la sélection multiple)
- // Les boutons radio et cases à cocher
- $attributeParameters = "<div name='attributeParameters' id='attributeParameters'>\n";
- $defaultValue = OLEDRION_ATTRIBUTE_CHECKBOX_WHITE_SPACE;
- if($edit) {
- if($item->getVar('attribute_type') == OLEDRION_ATTRIBUTE_RADIO || $item->getVar('attribute_type') == OLEDRION_ATTRIBUTE_CHECKBOX) {
+ // Paramétrage (pour les boutons radio et cases à cocher, le délimiteur, pour les listes déroulantes, le nombre d'éléments visibles et la sélection multiple)
+ // Les boutons radio et cases à cocher
+ $attributeParameters = "<div name='attributeParameters' id='attributeParameters'>\n";
+ $defaultValue = OLEDRION_ATTRIBUTE_CHECKBOX_WHITE_SPACE;
+ if ($edit) {
+ if ($item->getVar('attribute_type') == OLEDRION_ATTRIBUTE_RADIO || $item->getVar('attribute_type') == OLEDRION_ATTRIBUTE_CHECKBOX) {
$defaultValue = $item->getVar('attribute_option1', 'e');
- }
- }
- $options = array(OLEDRION_ATTRIBUTE_CHECKBOX_WHITE_SPACE => _AM_OLEDRION_ATTRIBUTE_DELIMITER1, OLEDRION_ATTRIBUTE_CHECKBOX_NEW_LINE => _AM_OLEDRION_ATTRIBUTE_DELIMITER2);
- $parameterButtonOption = _AM_OLEDRION_ATTRIBUTE_DELIMITER.' '.oledrion_utils::htmlSelect('option1', $options, $defaultValue, false);
- $attributeParameters .= "<div name='attributeParametersCheckbox' id='attributeParametersCheckbox'>\n";
- $attributeParameters .= $parameterButtonOption."\n";
+ }
+ }
+ $options = array(OLEDRION_ATTRIBUTE_CHECKBOX_WHITE_SPACE => _AM_OLEDRION_ATTRIBUTE_DELIMITER1, OLEDRION_ATTRIBUTE_CHECKBOX_NEW_LINE => _AM_OLEDRION_ATTRIBUTE_DELIMITER2);
+ $parameterButtonOption = _AM_OLEDRION_ATTRIBUTE_DELIMITER . ' ' . oledrion_utils::htmlSelect('option1', $options, $defaultValue, false);
+ $attributeParameters .= "<div name='attributeParametersCheckbox' id='attributeParametersCheckbox'>\n";
+ $attributeParameters .= $parameterButtonOption . "\n";
$attributeParameters .= "</div>\n";
- // Les listes déroulantes
- $attributeParameters .= "<div name='attributeParametersSelect' id='attributeParametersSelect'>\n";
- $defaultValue1 = OLEDRION_ATTRIBUTE_SELECT_VISIBLE_OPTIONS;
- $defaultValue2 = OLEDRION_ATTRIBUTE_SELECT_MULTIPLE;
- if($edit) {
- if($item->getVar('attribute_type') == OLEDRION_ATTRIBUTE_SELECT) {
+ // Les listes déroulantes
+ $attributeParameters .= "<div name='attributeParametersSelect' id='attributeParametersSelect'>\n";
+ $defaultValue1 = OLEDRION_ATTRIBUTE_SELECT_VISIBLE_OPTIONS;
+ $defaultValue2 = OLEDRION_ATTRIBUTE_SELECT_MULTIPLE;
+ if ($edit) {
+ if ($item->getVar('attribute_type') == OLEDRION_ATTRIBUTE_SELECT) {
$defaultValue1 = $item->getVar('attribute_option1', 'e');
$defaultValue2 = $item->getVar('attribute_option2', 'e');
- }
- }
- $checked1 = $checked2 = '';
- if($defaultValue2 == 1) {
- $checked1 = "checked='checked'";
- } else {
- $checked2 = "checked='checked'";
- }
- $attributeParameters .= _AM_OLEDRION_ATTRIBUTE_VISIBLE_OPTIONS." <input type='text' name='option2' id='option2' size='3' maxlength='3' value='$defaultValue1' />";
- $attributeParameters .= "<br />"._AM_OLEDRION_ATTRIBUTE_MULTI_OPTIONS." <input type='radio' name='option3' id='option3' value='1' $checked1 />"._YES." <input type='radio' name='option3' id='option3' value='0' $checked2 />"._NO;
+ }
+ }
+ $checked1 = $checked2 = '';
+ if ($defaultValue2 == 1) {
+ $checked1 = "checked='checked'";
+ } else {
+ $checked2 = "checked='checked'";
+ }
+ $attributeParameters .= _AM_OLEDRION_ATTRIBUTE_VISIBLE_OPTIONS . " <input type='text' name='option2' id='option2' size='3' maxlength='3' value='$defaultValue1' />";
+ $attributeParameters .= "<br />" . _AM_OLEDRION_ATTRIBUTE_MULTI_OPTIONS . " <input type='radio' name='option3' id='option3' value='1' $checked1 />" . _YES . " <input type='radio' name='option3' id='option3' value='0' $checked2 />" . _NO;
$attributeParameters .= "</div>\n";
...
[truncated message content] |