Menu
▾
▴
oscss-commit — SVN Commit Notifications
You can subscribe to this list here.
| 2011 |
Jan
|
Feb
|
Mar
(4) |
Apr
(57) |
May
(31) |
Jun
(21) |
Jul
(11) |
Aug
(23) |
Sep
(22) |
Oct
(36) |
Nov
(62) |
Dec
(85) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2012 |
Jan
(24) |
Feb
(24) |
Mar
(65) |
Apr
(232) |
May
(118) |
Jun
(22) |
Jul
(54) |
Aug
(57) |
Sep
(14) |
Oct
(27) |
Nov
(16) |
Dec
(19) |
| 2013 |
Jan
(16) |
Feb
(12) |
Mar
(3) |
Apr
(17) |
May
(2) |
Jun
(30) |
Jul
(33) |
Aug
(19) |
Sep
(35) |
Oct
(58) |
Nov
(27) |
Dec
(64) |
| 2014 |
Jan
(102) |
Feb
(80) |
Mar
(15) |
Apr
(4) |
May
(3) |
Jun
(3) |
Jul
(5) |
Aug
(11) |
Sep
(15) |
Oct
|
Nov
(3) |
Dec
(5) |
| 2015 |
Jan
(5) |
Feb
(4) |
Mar
(2) |
Apr
(11) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(9) |
Nov
(10) |
Dec
|
| 2016 |
Jan
(3) |
Feb
(2) |
Mar
(18) |
Apr
(13) |
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
(4) |
Oct
|
Nov
|
Dec
|
|
From: <os...@us...> - 2012-04-10 18:02:17
|
Revision: 4195
http://oscss.svn.sourceforge.net/oscss/?rev=4195&view=rev
Author: oscim
Date: 2012-04-10 18:02:10 +0000 (Tue, 10 Apr 2012)
Log Message:
-----------
Fix bug avec les action ajax de l'attribute manager
Modified Paths:
--------------
trunk/catalog/admin/includes/javascript/modules/pages/products.js.php
Modified: trunk/catalog/admin/includes/javascript/modules/pages/products.js.php
===================================================================
--- trunk/catalog/admin/includes/javascript/modules/pages/products.js.php 2012-04-10 17:25:38 UTC (rev 4194)
+++ trunk/catalog/admin/includes/javascript/modules/pages/products.js.php 2012-04-10 18:02:10 UTC (rev 4195)
@@ -161,51 +161,51 @@
//--></script>
<?php
- tep_include_file (DIR_WS_TEMPLATE."jquery.validate.css",true);
- tep_include_file (DIR_WS_JS . "jquery.validate.min.js",true);
+// tep_include_file (DIR_WS_TEMPLATE."jquery.validate.css",true);
+// tep_include_file (DIR_WS_JS . "jquery.validate.min.js",true);
?>
<script type="text/javascript">
$(function(){
// validate signup form on keyup and submit
- $("#new_product").validate({
- rules: {
- <?php for ($i=0, $n=sizeof(products::$languages); $i<$n; $i++): ?>
- "products_name[<?php echo products::$languages[$i]['id']; ?>]": {
- required: true,
- minlength: 3
- },
- <?php endfor; ?>
+// $("#new_product").validate({
+// rules: {
+// <?php for ($i=0, $n=sizeof(products::$languages); $i<$n; $i++): ?>
+// "products_name[<?php echo products::$languages[$i]['id']; ?>]": {
+// required: true,
+// minlength: 3
+// },
+// <?php endfor; ?>
+//
+// <?php if(products::CheckClassProduct('CLASS_PRICE')): /** Si Class de prix defini, les prix sont pris en charge par un onglet */ ?>
+// products_price: {
+// required: true,
+// minlength: 1
+// },
+// <?php endif; ?>
+// },
+// messages: {
+// <?php for ($i=0, $n=sizeof(products::$languages); $i<$n; $i++): ?>
+// "products_name[<?php echo products::$languages[$i]['id']; ?>]": {
+// required: " <?php echo addslashes(__('js alert products name')) ?>",
+// minlength: " <?php echo addslashes(__('your products name must consist of at least 3 characters')) ?>"
+// },
+// <?php endfor; ?>
+//
+// <?php if(products::CheckClassProduct('CLASS_PRICE')): /** Si Class de prix defini, les prix sont pris en charge par un onglet */ ?>
+// products_price: {
+// required: " <?php echo addslashes(__('js alert price')) ?>",
+// minlength: " <?php echo addslashes(__('your price must consist of at least 1 characters')) ?>"
+// },
+// <?php endif; ?>
+// },
+// errorElement: "span",
+// errorPlacement: function(error, element) {
+// error.appendTo( element.parent());
+// },
+// onkeyup: true
+// });
+// });
- <?php if(products::CheckClassProduct('CLASS_PRICE')): /** Si Class de prix defini, les prix sont pris en charge par un onglet */ ?>
- products_price: {
- required: true,
- minlength: 1
- },
- <?php endif; ?>
- },
- messages: {
- <?php for ($i=0, $n=sizeof(products::$languages); $i<$n; $i++): ?>
- "products_name[<?php echo products::$languages[$i]['id']; ?>]": {
- required: " <?php echo addslashes(__('js alert products name')) ?>",
- minlength: " <?php echo addslashes(__('your products name must consist of at least 3 characters')) ?>"
- },
- <?php endfor; ?>
-
- <?php if(products::CheckClassProduct('CLASS_PRICE')): /** Si Class de prix defini, les prix sont pris en charge par un onglet */ ?>
- products_price: {
- required: " <?php echo addslashes(__('js alert price')) ?>",
- minlength: " <?php echo addslashes(__('your price must consist of at least 1 characters')) ?>"
- },
- <?php endif; ?>
- },
- errorElement: "span",
- errorPlacement: function(error, element) {
- error.appendTo( element.parent());
- },
- onkeyup: true
- });
- });
-
//--></script>
<?php endif; ?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-10 17:25:50
|
Revision: 4194
http://oscss.svn.sourceforge.net/oscss/?rev=4194&view=rev
Author: oscim
Date: 2012-04-10 17:25:38 +0000 (Tue, 10 Apr 2012)
Log Message:
-----------
Deport des gabarit dans dossier products
Added Paths:
-----------
trunk/catalog/admin/includes/gabarit/products/stock.doctor.gab
trunk/catalog/admin/includes/gabarit/products/stock.edit.gab
Removed Paths:
-------------
trunk/catalog/admin/includes/gabarit/stock.doctor.gab
trunk/catalog/admin/includes/gabarit/stock.edit.gab
Copied: trunk/catalog/admin/includes/gabarit/products/stock.doctor.gab (from rev 4193, trunk/catalog/admin/includes/gabarit/stock.doctor.gab)
===================================================================
--- trunk/catalog/admin/includes/gabarit/products/stock.doctor.gab (rev 0)
+++ trunk/catalog/admin/includes/gabarit/products/stock.doctor.gab 2012-04-10 17:25:38 UTC (rev 4194)
@@ -0,0 +1,23 @@
+<?php
+/**
+ @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.0.9
+ @date 17/07/10, 16:35
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+?>
+<h3><?php echo __('qtpro doctor') ?></h3>
+
+<div class="box_left">
+ <ul>
+ <?php foreach(stock::$list as $item): ?>
+ <li><?php echo $item; ?></li>
+ <?php endforeach; ?>
+ </ul>
+</div>
+
+<div class="button_nav">
+
+</div>
\ No newline at end of file
Copied: trunk/catalog/admin/includes/gabarit/products/stock.edit.gab (from rev 4193, trunk/catalog/admin/includes/gabarit/stock.edit.gab)
===================================================================
--- trunk/catalog/admin/includes/gabarit/products/stock.edit.gab (rev 0)
+++ trunk/catalog/admin/includes/gabarit/products/stock.edit.gab 2012-04-10 17:25:38 UTC (rev 4194)
@@ -0,0 +1,83 @@
+<?php
+/**
+ @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.0.9
+ @date 17/07/10, 16:35
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+?>
+<h3><?php echo __('products stock') . ': ' . stock::$product_name . ''; ?></h3>
+<div id="ret_ajax"></div>
+
+<div class="box_left">
+
+ <?php print tep_draw_form('productstock', stock::FILENAME, 'product_id='.stock::$pID.(isset($_GET['forceajax']) || isset($_GET['forceview'])? '&forceview=true':'') , 'post', (isset($_GET['forceajax']) && isset($_GET['forceview'])? 'class="fancy"' :'') ) ; ?>
+ <table class="dataTableBase">
+ <tr>
+
+<?php if (stock::$by_attribute_stock) {
+ while(list($k,$v)=each(stock::$options)) { ?>
+ <th><?php echo stock::$option_names[$k] ?></th> <?php } ?>
+
+ <th><?php echo __('quantity') ?></th>
+ <th> </th>
+ </tr>
+
+ <?php foreach(stock::load_db_stock() as $rec){
+ $val_array=explode(",",$rec['products_stock_attributes']);
+ echo "<tr>";
+ foreach($val_array as $val) {
+ if (preg_match("/^(\d+)-(\d+)$/",$val,$m1)) {
+ echo "<td class=smalltext> ".tep_values_name($m1[2])."</td>";
+ } else {
+ echo "<td> </td>";
+ }
+ }
+ for($i=0;$i<sizeof(stock::$options)-sizeof($val_array);$i++) {
+ echo "<td> </td>";
+ }
+ echo "<td class=smalltext>$rec[products_stock_quantity]</td>".
+ "<td> </td>".
+ "</tr>";
+ }
+ echo "<tr>";
+
+ }
+ else { ?>
+ <th><?php echo __('quantity') ?></th>
+ <?php }
+?>
+
+ </tr>
+ <tr>
+ <?php if (stock::$by_attribute_stock) {
+ reset(stock::$options);
+ while(list($k,$v)=each(stock::$options)) {
+ echo "<td><select name=option$k>";
+ foreach($v as $v1) {
+ echo "<option value=".$v1[1].">".$v1[0];
+ }
+ echo "</select></td>";
+ }
+ } ?>
+ <td>
+ <input type="text" name="quantity" size="4" value="<?php echo stock::$db_quantity ?>">
+ <input type="hidden" name="product_id" value="<?php echo stock::$pID ?>">
+ </td>
+ <td class="row_action"><input class="button" type="submit" name="action" value="<?php echo (stock::$by_attribute_stock ?"Add":"Update") ?>"></td>
+ </tr>
+ </table>
+
+ </form>
+</div>
+
+<div class="box_right">
+ <h4><?php echo __('qtpro doctor') ?></h4>
+ <?php print stock::qtpro_doctor_formulate_product_investigation(stock::$investigation, 'detailed'); ?>
+</div>
+
+<div class="button_nav">
+<?php echo tep_js_back(tep_href_link((isset($_GET['origin'])? $_GET['origin'] : stock::FILENAME) ), IMAGE_CANCEL) ; ?>
+</div>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/gabarit/stock.doctor.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/stock.doctor.gab 2012-04-10 16:42:56 UTC (rev 4193)
+++ trunk/catalog/admin/includes/gabarit/stock.doctor.gab 2012-04-10 17:25:38 UTC (rev 4194)
@@ -1,23 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.0.9
- @date 17/07/10, 16:35
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-?>
-<h3><?php echo __('qtpro doctor') ?></h3>
-
-<div class="box_left">
- <ul>
- <?php foreach(stock::$list as $item): ?>
- <li><?php echo $item; ?></li>
- <?php endforeach; ?>
- </ul>
-</div>
-
-<div class="button_nav">
-
-</div>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/gabarit/stock.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/stock.edit.gab 2012-04-10 16:42:56 UTC (rev 4193)
+++ trunk/catalog/admin/includes/gabarit/stock.edit.gab 2012-04-10 17:25:38 UTC (rev 4194)
@@ -1,83 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.0.9
- @date 17/07/10, 16:35
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-?>
-<h3><?php echo __('products stock') . ': ' . stock::$product_name . ''; ?></h3>
-<div id="ret_ajax"></div>
-
-<div class="box_left">
-
- <?php print tep_draw_form('productstock', stock::FILENAME, 'product_id='.stock::$pID.(isset($_GET['forceajax']) || isset($_GET['forceview'])? '&forceview=true':'') , 'post', (isset($_GET['forceajax']) && isset($_GET['forceview'])? 'class="fancy"' :'') ) ; ?>
- <table class="dataTableBase">
- <tr>
-
-<?php if (stock::$by_attribute_stock) {
- while(list($k,$v)=each(stock::$options)) { ?>
- <th><?php echo stock::$option_names[$k] ?></th> <?php } ?>
-
- <th><?php echo __('quantity') ?></th>
- <th> </th>
- </tr>
-
- <?php foreach(stock::load_db_stock() as $rec){
- $val_array=explode(",",$rec['products_stock_attributes']);
- echo "<tr>";
- foreach($val_array as $val) {
- if (preg_match("/^(\d+)-(\d+)$/",$val,$m1)) {
- echo "<td class=smalltext> ".tep_values_name($m1[2])."</td>";
- } else {
- echo "<td> </td>";
- }
- }
- for($i=0;$i<sizeof(stock::$options)-sizeof($val_array);$i++) {
- echo "<td> </td>";
- }
- echo "<td class=smalltext>$rec[products_stock_quantity]</td>".
- "<td> </td>".
- "</tr>";
- }
- echo "<tr>";
-
- }
- else { ?>
- <th><?php echo __('quantity') ?></th>
- <?php }
-?>
-
- </tr>
- <tr>
- <?php if (stock::$by_attribute_stock) {
- reset(stock::$options);
- while(list($k,$v)=each(stock::$options)) {
- echo "<td><select name=option$k>";
- foreach($v as $v1) {
- echo "<option value=".$v1[1].">".$v1[0];
- }
- echo "</select></td>";
- }
- } ?>
- <td>
- <input type="text" name="quantity" size="4" value="<?php echo stock::$db_quantity ?>">
- <input type="hidden" name="product_id" value="<?php echo stock::$pID ?>">
- </td>
- <td class="row_action"><input class="button" type="submit" name="action" value="<?php echo (stock::$by_attribute_stock ?"Add":"Update") ?>"></td>
- </tr>
- </table>
-
- </form>
-</div>
-
-<div class="box_right">
- <h4><?php echo __('qtpro doctor') ?></h4>
- <?php print stock::qtpro_doctor_formulate_product_investigation(stock::$investigation, 'detailed'); ?>
-</div>
-
-<div class="button_nav">
-<?php echo tep_js_back(tep_href_link((isset($_GET['origin'])? $_GET['origin'] : stock::FILENAME) ), IMAGE_CANCEL) ; ?>
-</div>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-10 16:43:03
|
Revision: 4193
http://oscss.svn.sourceforge.net/oscss/?rev=4193&view=rev
Author: oscim
Date: 2012-04-10 16:42:56 +0000 (Tue, 10 Apr 2012)
Log Message:
-----------
Ajsutement dev - modele datatype
Modified Paths:
--------------
trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE__description.sql
Added Paths:
-----------
trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/modules/rapport/
trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/modules/rapport/rp__DATATYPE_REPLACE_.php
Added: trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/modules/rapport/rp__DATATYPE_REPLACE_.php
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/modules/rapport/rp__DATATYPE_REPLACE_.php (rev 0)
+++ trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/modules/rapport/rp__DATATYPE_REPLACE_.php 2012-04-10 16:42:56 UTC (rev 4193)
@@ -0,0 +1,179 @@
+<?php
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 10/04/2012 , 15:00:00
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class rp__DATATYPE_REPLACE_
+ @brief manage description rp__DATATYPE_REPLACE_
+*/
+
+class rp__DATATYPE_REPLACE_
+ implements InterfaceModule{
+ /**
+ @var current string name
+ */
+ public $code;
+ /**
+ @var Datatype master
+ */
+ public $type;
+ /**
+ @var string title current module
+ */
+ public $title;
+ /**
+ @var string description current module
+ */
+ public $description;
+
+ /**
+ @var array info post data
+ */
+ public $listing = array();
+ /**
+ @var array info post data
+ */
+ public $query = array();
+ /**
+ @var boolean true/false
+ */
+ public $enabled;
+
+ /**
+ @brief class constructor
+ */
+ function __construct() {
+ $this->code = 'rp__DATATYPE_REPLACE_';
+ $this->type ='rapport';
+ $this->title = __('rp__DATATYPE_REPLACE_ heading title');
+ $this->description = __('rp__DATATYPE_REPLACE_ heading description');
+ $this->enabled = true;
+
+
+ global $languages_id;
+ $this->language_id = $languages_id;
+
+
+ }
+
+ /**
+ */
+ public function check_action($actions){
+ }
+
+ /**
+ @brief Edition/affichage produit
+ */
+ function load_db_values ($id) {
+
+ /**
+ @remarks this define col theader title, and ajust html code
+ Just for Edit listing
+ */
+ $this->listing['theader']=array(
+ array('width'=>'5%','class'=>'tcenter', 'txt'=>__('rp__DATATYPE_REPLACE_ table heading number') ) ,
+ array('width'=>'70%','class'=>'tcenter', 'txt'=>__('rp__DATATYPE_REPLACE_ table heading data') ) ,
+ array('width'=>'10%','class'=>'tcenter', 'txt'=>__('rp__DATATYPE_REPLACE_ table heading viewed') ),
+ array('width'=>'5%','class'=>'tcenter', 'txt'=>__('rp__DATATYPE_REPLACE_ table heading language') ),
+ );
+
+ /**
+ @remarks this define col in table, and if is possible sort
+ Just for Edit listing
+ */
+ $this->listing['modele']=array(
+ '_DATATYPE_REPLACE__id'=>true,
+ '_DATATYPE_REPLACE__name' =>true,
+ '_DATATYPE_REPLACE__viewed'=>true,
+ 'name'=>false,
+ );
+
+
+ $this->query['select'] = " p._DATATYPE_REPLACE__id, pd._DATATYPE_REPLACE__name, pd._DATATYPE_REPLACE__viewed , l.name";
+ $this->query['tables'] = " " . TABLE__DATATYPE_REPLACE_MAJ_. " p, " . TABLE__DATATYPE_REPLACE_MAJ__DESCRIPTION . " pd , " . TABLE_LANGUAGES . " l ";
+ $this->query['where'] = " p._DATATYPE_REPLACE__id = pd._DATATYPE_REPLACE__id and l.languages_id = pd.language_id ";
+ $this->query['orderby'] = " pd._DATATYPE_REPLACE__viewed DESC";
+
+ }
+
+ /**
+ @fn FormatDBValue($row)
+ @brief Format row values for put in listing
+ @param $item arrary/object
+ @return array;
+ */
+ function FormatDBValue($item) {
+ $ord = array();
+ foreach($this->listing['modele'] as $k=>$r){
+ if($k == '_DATATYPE_REPLACE__id')
+ $ord[$k]= '<a href="'.tep_href_link(FILENAME__DATATYPE_REPLACE_, 'action=view&cID='.$item[$k]).'" >'.$item[$k].'</a>';
+ else
+ $ord[$k]=$item[$k];
+
+ }
+
+ return $ord;
+ }
+
+
+ /**
+ */
+ function display_view($id) {
+ }
+
+
+
+
+ /**
+ @remarks implements InterfaceModule depend
+ if module twin in backoffice, report all content install in the other module
+ public function check() {return true;}
+ public function install() {return true;}
+ public function remove() {return true;}
+ public function keys() {return array(); }
+ */
+
+ /**
+ @fn check()
+ @brief test if count all var , and keys is equal
+ @return boolean true/false
+ */
+ function check() { return false; }
+
+
+ /**
+ @fn keys()
+ @return array all key configuration define by this module
+ */
+ function keys() {
+ return array('MODULE_PRODUCTS_VIEWEDDESCRIPTION_SORT_ORDER');
+ }
+
+ /**
+ @fn install()
+ @brief add all configuration
+ @note
+ - Modules can emarquer sql installation instructions, however, in the case of transverse information, or dependent of an extension, preferring the implementation of an extension, file with sql independent
+ - please, pefix all var configuration by 'MODULE_OT__MODTYPENAME_MAJ_'
+ - if module twin in backoffice, report all content install in the other module
+ - Not use language in DB , but function :__()
+ for MODULE_TOTO_ST
+ var title MODULE_TOTO_ST_S (small description)
+ var description MODULE_TOTO_ST_L (long description)
+ */
+ function install() { return false; }
+
+ /**
+ @fn remove()
+ @brief delete all configuration
+ @note
+ - please, pefix all var configuration by 'MODULE_PAYMENT__MODTYPENAME_MAJ_'
+ - if module twin in backoffice, report all content remove in the other module
+ */
+ function remove() { return false; }
+}
+?>
\ No newline at end of file
Modified: trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE__description.sql
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE__description.sql 2012-04-10 16:23:03 UTC (rev 4192)
+++ trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE__description.sql 2012-04-10 16:42:56 UTC (rev 4193)
@@ -7,5 +7,6 @@
language_id int(3) NOT NULL DEFAULT '1',
_DATATYPE_REPLACE__title varchar(128) NOT NULL,
_DATATYPE_REPLACE__chapo text NOT NULL,
- _DATATYPE_REPLACE__description text NOT NULL
+ _DATATYPE_REPLACE__description text NOT NULL,
+ _DATATYPE_REPLACE__viewed int(11) NOT NULL DEFAULT '1'
) CHARSET=utf8 ;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-10 16:23:14
|
Revision: 4192
http://oscss.svn.sourceforge.net/oscss/?rev=4192&view=rev
Author: oscim
Date: 2012-04-10 16:23:03 +0000 (Tue, 10 Apr 2012)
Log Message:
-----------
Suite mise en forme des rapports, et deport des tous les anciennes stats en rapport
Hors loaw_stock_attrib
Mise a niveau du code et finition des ajustements pour la pages/rapport
Ajustement application top et le whos_on_line afin de restreindre les enregsitrement aux pages et non image ou fichier documents.php
Modified Paths:
--------------
trunk/catalog/admin/includes/languages/fr_FR/modules/rapport/products_viewed.txt
trunk/catalog/admin/includes/modules/pages/rapport.php
trunk/catalog/admin/includes/modules/rapport/products_viewed.php
trunk/catalog/includes/application_top.php
Added Paths:
-----------
trunk/catalog/admin/includes/languages/fr_FR/modules/rapport/newsletters.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/rapport/products_purchased.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/rapport/whos_online.txt
trunk/catalog/admin/includes/modules/rapport/newsletters.php
trunk/catalog/admin/includes/modules/rapport/products_purchased.php
trunk/catalog/admin/includes/modules/rapport/whos_online.php
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/rapport/newsletters.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/rapport/newsletters.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/rapport/newsletters.txt 2012-04-10 16:23:03 UTC (rev 4192)
@@ -0,0 +1,20 @@
+<?php
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 10/04/2012 , 15:00:00
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+$lang['newsletters heading title'] ="Clients recevant les newsletters" ;
+$lang['newsletters heading description'] ="Les clients inscris aux bulletins d'informations " ;
+
+$lang['newsletters table heading id'] ="N°" ;
+$lang['newsletters table heading firstname'] ="Prénom" ;
+$lang['newsletters table heading lastname'] ="Nom" ;
+$lang['newsletters table heading email'] ="Email" ;
+$lang['newsletters table heading date'] ="Date" ;
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/rapport/products_purchased.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/rapport/products_purchased.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/rapport/products_purchased.txt 2012-04-10 16:23:03 UTC (rev 4192)
@@ -0,0 +1,18 @@
+<?php
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 10/04/2012 , 15:00:00
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+$lang['products_purchased heading title'] ="Produits les plus achetés" ;
+$lang['products_purchased heading description'] ="Les produits les plus achetés" ;
+
+$lang['products_purchased table heading number'] ="N°" ;
+$lang['products_purchased table heading products'] ="Produits" ;
+$lang['products_purchased table heading purchased'] ="Vu" ;
+?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/rapport/products_viewed.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/rapport/products_viewed.txt 2012-04-10 14:17:06 UTC (rev 4191)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/rapport/products_viewed.txt 2012-04-10 16:23:03 UTC (rev 4192)
@@ -11,7 +11,6 @@
$lang['products_viewed heading title'] ="Les produits les plus consultés" ;
$lang['products_viewed heading description'] ="Les produits les plus consultés par langue" ;
-$lang['products_viewed heading title'] ="Les produits les plus consultés" ;
$lang['products_viewed table heading number'] ="N°" ;
$lang['products_viewed table heading products'] ="Produits" ;
$lang['products_viewed table heading viewed'] ="Vu" ;
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/rapport/whos_online.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/rapport/whos_online.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/rapport/whos_online.txt 2012-04-10 16:23:03 UTC (rev 4192)
@@ -0,0 +1,22 @@
+<?php
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 10/04/2012 , 15:00:00
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+$lang['products_purchased heading title'] ="Produits les plus achetés" ;
+$lang['products_purchased heading description'] ="Les produits les plus achetés" ;
+
+$lang['whos_online table heading customer_id'] ="N°" ;
+$lang['whos_online table heading full_name'] ="Utilisateur" ;
+$lang['whos_online table heading ip_address'] ="ip" ;
+$lang['whos_online table heading time_entry'] ="entrée" ;
+$lang['whos_online table heading time_last_click'] ="Dernier click" ;
+$lang['whos_online table heading last_page_url'] ="url" ;
+$lang['whos_online table heading session_id'] ="session" ;
+?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/modules/pages/rapport.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/rapport.php 2012-04-10 14:17:06 UTC (rev 4191)
+++ trunk/catalog/admin/includes/modules/pages/rapport.php 2012-04-10 16:23:03 UTC (rev 4192)
@@ -123,7 +123,7 @@
include_once(DIR_FS_ADMIN .DIR_WS_MODULES.'rapport/'.self::$Id.'.php');
$oscss->pile_file_lang(DIR_FS_ADMIN.DIR_WS_LANGUAGES.$language.'/modules/rapport/'.self::$Id.'.txt');
- $new = new $name();
+ self::$Info = $new = new $name();
$new->load_db_values(0);
@@ -184,54 +184,37 @@
@return
*/
public static function GetDBValue(){
-// var_dump('__GetDBValue');
+
$DB= Database::getInstance();
switch (self::$action) {
-// case 'delete':
-// case 'edit':
case 'view':
-
/**
- @remarks retrun object load one inventaire
+ @remarks retrun object load one
*/
global $query_numrows;
$adjust=new objectInfo(self::$InitInfo['adjust']);
-// print_r($adjust);
-
-// if( (int)self::$Id > 0) {
-// self::$Info = sqlrapport::fetch(array('id'=>self::$Id ), true);
-// }
-// else{
-// self::$Info = sqlrapport::Specimen(true);
-// }
-// echo DIR_FS_ADMIN .DIR_WS_MODULES.'rapport/'.self::$Id.'.php';
$name = self::$Id;
- include_once(DIR_FS_ADMIN .DIR_WS_MODULES.'rapport/'.self::$Id.'.php');
-
-
-
- $new = new $name();
-
+ $new = self::$Info;
$new->load_db_values(0);
+ $query_raw = 'SELECT '. $new->query['select'] .' FROM ' . $new->query['tables'] .
+ ((!empty($new->query['where'])) ? " WHERE ". $new->query['where'] : ''). ((!empty($adjust->sWhere)) ? substr($adjust->sWhere, 3) : '').
+ ((isset($new->query['groupby'])) ? " GROUP BY ". $new->query['groupby'] : '').
+ " ORDER BY ". ((!empty($adjust->sOrder)) ? $adjust->sOrder : $new->query['orderby'] );
- /*echo*/ $query_raw = 'SELECT '. $new->query['select'] .' FROM ' . $new->query['tables'] .
- ((!empty($new->query['where'])) ? " WHERE ". $new->query['where'] : ''). ((!empty($adjust->sWhere)) ? substr($adjust->sWhere, 3) : '').
- " ORDER BY ". ((!empty($adjust->sOrder)) ? $adjust->sOrder : $new->query['orderby'] );
-
$_split = new splitPageResults($adjust->page, $adjust->rowbyp, $query_raw, $query_numrows);
$_query = $DB->query($query_raw);
$res=self::FormatDBValue($_query);
-// print_r($res);
+
return $res;
@@ -254,8 +237,8 @@
include_once(DIR_FS_ADMIN .DIR_WS_MODULES.'rapport/'.$file );
$oscss->pile_file_lang(DIR_FS_ADMIN.DIR_WS_LANGUAGES.$language.'/modules/rapport/'.$name.'.txt');
$new = new $name();
-// print_r($new);
+ if( ! $new->enabled ) continue;
$tmp = array(
'rapport_code'=>$new->code,
'rapport_title'=>$new->title,
@@ -366,14 +349,13 @@
case 'view':
global $query_numrows,$languages_id;
+ $new = self::$Info;
+
foreach($_query->fetchAllAssoc() as $item) {
// print_r($item);
- foreach(self::$InitInfo['modele']['view'] as $k=>$row)
- if($k == 'action') $ord[$k]=self::ButtonRowsActions($item);
-// elseif($k == 'rapport_visible') $ord[$k]=self::RowStatus($item);
- else $ord[$k]=$item[$k];
- $res[]=$ord;
+
+ $res[]=$new->FormatDBValue($item); //$ord;
}
break;
case 'listing':
Added: trunk/catalog/admin/includes/modules/rapport/newsletters.php
===================================================================
--- trunk/catalog/admin/includes/modules/rapport/newsletters.php (rev 0)
+++ trunk/catalog/admin/includes/modules/rapport/newsletters.php 2012-04-10 16:23:03 UTC (rev 4192)
@@ -0,0 +1,179 @@
+<?php
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 10/04/2012 , 15:00:00
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class newsletters
+ @brief manage description newsletters
+*/
+
+class newsletters
+ implements InterfaceModule{
+ /**
+ @var current string name
+ */
+ public $code;
+ /**
+ @var Datatype master
+ */
+ public $type;
+ /**
+ @var string title current module
+ */
+ public $title;
+ /**
+ @var string description current module
+ */
+ public $description;
+ /**
+ @var array info post data
+ */
+ public $listing = array();
+ /**
+ @var array info post data
+ */
+ public $query = array();
+ /**
+ @var boolean true/false
+ */
+ public $enabled;
+
+ /**
+ @brief class constructor
+ */
+ function __construct() {
+ $this->code = 'newsletters';
+ $this->type ='rapport';
+ $this->title = __('newsletters heading title');
+ $this->description = __('newsletters heading description');
+ $this->enabled = true;
+
+
+ global $languages_id;
+ $this->language_id = $languages_id;
+
+
+ }
+
+ /**
+ */
+ public function check_action($actions){
+ }
+
+ /**
+ @brief Edition/affichage produit
+ */
+ function load_db_values ($id) {
+
+ /**
+ @remarks this define col theader title, and ajust html code
+ Just for Edit listing
+ */
+ $this->listing['theader']=array(
+ array('width'=>'5%','class'=>'tcenter', 'txt'=>__('newsletters table heading id') ) ,
+ array('width'=>'25%','class'=>'tcenter', 'txt'=>__('newsletters table heading firstname') ) ,
+ array('width'=>'25%','class'=>'tcenter', 'txt'=>__('newsletters table heading lastname') ),
+ array('class'=>'tcenter', 'txt'=>__('newsletters table heading email') ),
+ array('width'=>'10%','class'=>'tcenter', 'txt'=>__('newsletters table heading date') ),
+ );
+
+ /**
+ @remarks this define col in table, and if is possible sort
+ Just for Edit listing
+ */
+ $this->listing['modele']=array(
+ 'customers_id'=>true,
+ 'customers_firstname' =>true,
+ 'customers_lastname' =>true,
+ 'customers_email_address' =>true,
+ 'customers_info_date_account_created' =>true,
+ );
+
+
+ $this->query['select'] = " c.customers_id, c.customers_firstname, c.customers_lastname, c.customers_email_address, c.customers_newsletter , b.customers_info_date_account_created ";
+ $this->query['tables'] = " " . TABLE_CUSTOMERS . " c," . TABLE_CUSTOMERS_INFO . " b ";
+ $this->query['where'] = " c.customers_id = b.customers_info_id and c.customers_newsletter = '1' ";
+ $this->query['orderby'] = " b.customers_info_date_account_created, c.customers_lastname, c.customers_firstname ";
+
+ }
+
+ /**
+ @fn FormatDBValue($row)
+ @brief Format row values for put in listing
+ @param $item arrary/object
+ @return array;
+ */
+ function FormatDBValue($item) {
+ $ord = array();
+ foreach($this->listing['modele'] as $k=>$r){
+ if($k == 'customers_id')
+ $ord[$k]= '<a href="'.tep_href_link(FILENAME_CUSTOMERS, 'action=noedit&cID='.$item[$k]).'" >'.$item[$k].'</a>';
+ elseif($k == 'customers_email_address')
+ $ord[$k]= '<a href="'.tep_href_link(FILENAME_MAIL, 'origin='.urlencode(FILENAME_RAPPORT.'?cID='.__CLASS__.'&action=view').'&customer='.$item[$k]).'" >'.$item[$k].'</a>';
+ else $ord[$k]=$item[$k];
+
+ }
+
+ return $ord;
+ }
+
+ /**
+ */
+ function display_view($id) {
+ }
+
+
+
+ /**
+ @remarks implements InterfaceModule depend
+ if module twin in backoffice, report all content install in the other module
+ public function check() {return true;}
+ public function install() {return true;}
+ public function remove() {return true;}
+ public function keys() {return array(); }
+ */
+
+ /**
+ @fn check()
+ @brief test if count all var , and keys is equal
+ @return boolean true/false
+ */
+ function check() { return false; }
+
+
+ /**
+ @fn keys()
+ @return array all key configuration define by this module
+ */
+ function keys() {
+ return array('MODULE_PRODUCTS_VIEWEDDESCRIPTION_SORT_ORDER');
+ }
+
+ /**
+ @fn install()
+ @brief add all configuration
+ @note
+ - Modules can emarquer sql installation instructions, however, in the case of transverse information, or dependent of an extension, preferring the implementation of an extension, file with sql independent
+ - please, pefix all var configuration by 'MODULE_OT__MODTYPENAME_MAJ_'
+ - if module twin in backoffice, report all content install in the other module
+ - Not use language in DB , but function :__()
+ for MODULE_TOTO_ST
+ var title MODULE_TOTO_ST_S (small description)
+ var description MODULE_TOTO_ST_L (long description)
+ */
+ function install() { return false; }
+
+ /**
+ @fn remove()
+ @brief delete all configuration
+ @note
+ - please, pefix all var configuration by 'MODULE_PAYMENT__MODTYPENAME_MAJ_'
+ - if module twin in backoffice, report all content remove in the other module
+ */
+ function remove() { return false; }
+}
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/modules/rapport/products_purchased.php
===================================================================
--- trunk/catalog/admin/includes/modules/rapport/products_purchased.php (rev 0)
+++ trunk/catalog/admin/includes/modules/rapport/products_purchased.php 2012-04-10 16:23:03 UTC (rev 4192)
@@ -0,0 +1,178 @@
+<?php
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 10/04/2012 , 15:00:00
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class products_purchased
+ @brief manage description products_purchased
+*/
+
+class products_purchased
+ implements InterfaceModule{
+ /**
+ @var current string name
+ */
+ public $code;
+ /**
+ @var Datatype master
+ */
+ public $type;
+ /**
+ @var string title current module
+ */
+ public $title;
+ /**
+ @var string description current module
+ */
+ public $description;
+ /**
+ @var array info post data
+ */
+ public $listing = array();
+ /**
+ @var array info post data
+ */
+ public $query = array();
+ /**
+ @var boolean true/false
+ */
+ public $enabled;
+
+ /**
+ @brief class constructor
+ */
+ function __construct() {
+ $this->code = 'products_purchased';
+ $this->type ='rapport';
+ $this->title = __('products_purchased heading title');
+ $this->description = __('products_purchased heading description');
+ $this->enabled = true;
+
+
+ global $languages_id;
+ $this->language_id = $languages_id;
+
+
+ }
+
+ /**
+ */
+ public function check_action($actions){
+ }
+
+ /**
+ @brief Edition/affichage produit
+ */
+ function load_db_values ($id) {
+
+ /**
+ @remarks this define col theader title, and ajust html code
+ Just for Edit listing
+ */
+ $this->listing['theader']=array(
+ array('width'=>'5%','class'=>'tcenter', 'txt'=>__('products_purchased table heading number') ) ,
+ array('width'=>'70%','class'=>'tcenter', 'txt'=>__('products_purchased table heading products') ) ,
+ array('width'=>'10%','class'=>'tcenter', 'txt'=>__('products_purchased table heading purchased') ),
+ );
+
+ /**
+ @remarks this define col in table, and if is possible sort
+ Just for Edit listing
+ */
+ $this->listing['modele']=array(
+ 'products_id'=>true,
+ 'products_name' =>true,
+ 'products_ordered'=>true,
+ );
+
+
+ global $languages_id;
+
+ $this->query['select'] = " p.products_id, p.products_ordered, pd.products_name ";
+ $this->query['tables'] = " " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd ";
+ $this->query['where'] = " pd.products_id = p.products_id and pd.language_id = '" . $languages_id. "' and p.products_ordered > 0 ";
+ $this->query['groupby'] = " pd.products_id ";
+ $this->query['orderby'] = " p.products_ordered DESC, pd.products_name ";
+
+ }
+
+ /**
+ @fn FormatDBValue($row)
+ @brief Format row values for put in listing
+ @param $item arrary/object
+ @return array;
+ */
+ function FormatDBValue($item) {
+ $ord = array();
+ foreach($this->listing['modele'] as $k=>$r){
+ if($k == 'customers_id')
+ $ord[$k]= '<a href="'.tep_href_link(FILENAME_CUSTOMERS, 'action=noedit&cID='.$item[$k]).'" >'.$item[$k].'</a>';
+ elseif($k == 'customers_email_address')
+ $ord[$k]= '<a href="'.tep_href_link(FILENAME_MAIL, 'origin='.urlencode(FILENAME_RAPPORT.'?cID='.__CLASS__.'&action=view').'&customer='.$item[$k]).'" >'.$item[$k].'</a>';
+ else $ord[$k]=$item[$k];
+
+ }
+
+ return $ord;
+ }
+
+ /**
+ */
+ function display_view($id) {
+ }
+
+
+
+ /**
+ @remarks implements InterfaceModule depend
+ if module twin in backoffice, report all content install in the other module
+ public function check() {return true;}
+ public function install() {return true;}
+ public function remove() {return true;}
+ public function keys() {return array(); }
+ */
+
+ /**
+ @fn check()
+ @brief test if count all var , and keys is equal
+ @return boolean true/false
+ */
+ function check() { return false; }
+
+
+ /**
+ @fn keys()
+ @return array all key configuration define by this module
+ */
+ function keys() {
+ return array('MODULE_PRODUCTS_VIEWEDDESCRIPTION_SORT_ORDER');
+ }
+
+ /**
+ @fn install()
+ @brief add all configuration
+ @note
+ - Modules can emarquer sql installation instructions, however, in the case of transverse information, or dependent of an extension, preferring the implementation of an extension, file with sql independent
+ - please, pefix all var configuration by 'MODULE_OT__MODTYPENAME_MAJ_'
+ - if module twin in backoffice, report all content install in the other module
+ - Not use language in DB , but function :__()
+ for MODULE_TOTO_ST
+ var title MODULE_TOTO_ST_S (small description)
+ var description MODULE_TOTO_ST_L (long description)
+ */
+ function install() { return false; }
+
+ /**
+ @fn remove()
+ @brief delete all configuration
+ @note
+ - please, pefix all var configuration by 'MODULE_PAYMENT__MODTYPENAME_MAJ_'
+ - if module twin in backoffice, report all content remove in the other module
+ */
+ function remove() { return false; }
+}
+?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/modules/rapport/products_viewed.php
===================================================================
--- trunk/catalog/admin/includes/modules/rapport/products_viewed.php 2012-04-10 14:17:06 UTC (rev 4191)
+++ trunk/catalog/admin/includes/modules/rapport/products_viewed.php 2012-04-10 16:23:03 UTC (rev 4192)
@@ -29,10 +29,6 @@
@var string description current module
*/
public $description;
- /**
- @var object info current data
- */
- public $sort_order;
/**
@var array info post data
@@ -55,7 +51,6 @@
$this->type ='rapport';
$this->title = __('products_viewed heading title');
$this->description = __('products_viewed heading description');
- $this->sort_order = (defined('MODULE_PRODUCTS_VIEWEDDESCRIPTION_SORT_ORDER'))?MODULE_PRODUCTS_VIEWEDDESCRIPTION_SORT_ORDER : 0;
$this->enabled = true;
@@ -105,7 +100,23 @@
}
+ /**
+ @fn FormatDBValue($row)
+ @brief Format row values for put in listing
+ @param $item arrary/object
+ @return array;
+ */
+ function FormatDBValue($item) {
+ $ord = array();
+ foreach($this->listing['modele'] as $k=>$r){
+ $ord[$k]=$item[$k];
+ }
+
+ return $ord;
+ }
+
+
/**
*/
function display_view($id) {
Added: trunk/catalog/admin/includes/modules/rapport/whos_online.php
===================================================================
--- trunk/catalog/admin/includes/modules/rapport/whos_online.php (rev 0)
+++ trunk/catalog/admin/includes/modules/rapport/whos_online.php 2012-04-10 16:23:03 UTC (rev 4192)
@@ -0,0 +1,266 @@
+<?php
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 10/04/2012 , 15:00:00
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class whos_online
+ @brief manage description whos_online
+*/
+
+class whos_online
+ implements InterfaceModule{
+ /**
+ @var current string name
+ */
+ public $code;
+ /**
+ @var Datatype master
+ */
+ public $type;
+ /**
+ @var string title current module
+ */
+ public $title;
+ /**
+ @var string description current module
+ */
+ public $description;
+
+ /**
+ @var array info post data
+ */
+ public $listing = array();
+ /**
+ @var array info post data
+ */
+ public $query = array();
+ /**
+ @var boolean true/false
+ */
+ public $enabled;
+
+ /**
+ @brief class constructor
+ */
+ function __construct() {
+ $this->code = 'whos_online';
+ $this->type ='rapport';
+ $this->title = __('whos_online heading title');
+ $this->description = __('whos_online heading description');
+ $this->enabled = _cst_bool('WHOS_ONLINE_ACTIVE') ;
+
+
+ global $languages_id;
+ $this->language_id = $languages_id;
+
+
+ // remove entries that have expired
+ $xx_mins_ago = (time() - 900);
+ tep_db_query("delete from " . TABLE_WHOS_ONLINE . " where time_last_click < '" . $xx_mins_ago . "'");
+
+ }
+
+ /**
+ */
+ public function check_action($actions){
+ }
+
+ /**
+ @brief Edition/affichage produit
+ */
+ function load_db_values ($id) {
+
+ /**
+ @remarks this define col theader title, and ajust html code
+ Just for Edit listing
+ */
+ $this->listing['theader']=array(
+ array('width'=>'5%','class'=>'tcenter', 'txt'=>__('whos_online table heading customer_id') ) ,
+ array('width'=>'15%','class'=>'tcenter', 'txt'=>__('whos_online table heading full_name') ) ,
+ array('width'=>'5%','class'=>'tcenter', 'txt'=>__('whos_online table heading ip_address') ),
+ array('width'=>'5%','class'=>'tcenter', 'txt'=>__('whos_online table heading time_entry') ) ,
+ array('width'=>'10%','class'=>'tcenter', 'txt'=>__('whos_online table heading time_last_click') ) ,
+ array('width'=>'50%','class'=>'tcenter', 'txt'=>__('whos_online table heading last_page_url') ),
+// array('width'=>'10%','class'=>'tcenter', 'txt'=>__('whos_online table heading session_id') ),
+ );
+
+ /**
+ @remarks this define col in table, and if is possible sort
+ Just for Edit listing
+ */
+ $this->listing['modele']=array(
+ 'customer_id'=>true,
+ 'full_name' =>true,
+ 'ip_address'=>true,
+ 'time_entry' =>true,
+ 'time_last_click'=>true,
+ 'last_page_url'=>true,
+// 'session_id'=>true,
+ );
+
+
+ global $languages_id;
+
+// "select customer_id, full_name, ip_address, time_entry, time_last_click, last_page_url, session_id from " . TABLE_WHOS_ONLINE
+
+ $this->query['select'] = " customer_id, full_name, ip_address, time_entry, time_last_click, last_page_url, session_id ";
+ $this->query['tables'] = " " . TABLE_WHOS_ONLINE . " ";
+ $this->query['where'] = " 1 ";
+ $this->query['orderby'] = " time_last_click DESC " ;
+ }
+
+ /**
+ @fn FormatDBValue($row)
+ @brief Format row values for put in listing
+ @param $item arrary/object
+ @return array;
+ */
+ function FormatDBValue($item) {
+ $ord = array();
+ foreach($this->listing['modele'] as $k=>$r){
+ if($k == 'customer_id' && $item[$k] > 0)
+ $ord[$k]= '<a href="'.tep_href_link(FILENAME_CUSTOMERS, 'action=noedit&cID='.$item[$k]).'" >'.$item[$k].'</a>';
+ elseif($k == 'time_entry' )
+ $ord[$k]= date('H:i:s',(time() - $item[$k]) ) ;
+ elseif($k == 'time_last_click' )
+ $ord[$k]=date('H:i:s', $item[$k]) ;
+ else $ord[$k]=$item[$k];
+
+ }
+
+ return $ord;
+ }
+
+ /**
+ */
+ function display_view($id) {
+ }
+
+
+ /**
+ @brief draw cart user
+ */
+ function CartUser(){
+ $heading[] = array('text' => '<h4>' . TABLE_HEADING_SHOPPING_CART . '</h4>');
+
+ if (STORE_SESSIONS == 'mysql') {
+ $session_data = tep_db_query("select value from " . TABLE_SESSIONS . " WHERE sesskey = '" . $info . "'");
+ $session_data = tep_db_fetch_array($session_data);
+ $session_data = trim($session_data['value']);
+ } else {
+ if ( (file_exists(tep_session_save_path() . '/sess_' . $info)) && (filesize(tep_session_save_path() . '/sess_' . $info) > 0) ) {
+ $session_data = file(tep_session_save_path() . '/sess_' . $info);
+ $session_data = trim(implode('', $session_data));
+ }
+ }
+ if ($length = strlen($session_data)) {
+ $start_id = strpos($session_data, 'customer_id|s');
+ $start_cart = strpos($session_data, 'cart|O');
+ $start_currency = strpos($session_data, 'currency|s');
+ $start_country = strpos($session_data, 'customer_country_id|s');
+ $start_zone = strpos($session_data, 'customer_zone_id|s');
+
+ if ($start_cart<1) $start_cart=1;
+ for ($i=$start_cart; $i<$length; $i++) {
+ if ($session_data[$i] == '{') {
+ if (isset($tag)) {
+ $tag++;
+ } else {
+ $tag = 1;
+ }
+ } elseif ($session_data[$i] == '}') {
+ $tag--;
+ } elseif ( (isset($tag)) && ($tag < 1) ) {
+ break;
+ }
+ }
+
+ $session_data_id = substr($session_data, $start_id, (strpos($session_data, ';', $start_id) - $start_id + 1));
+ $session_data_cart = substr($session_data, $start_cart, $i);
+ $session_data_currency = substr($session_data, $start_currency, (strpos($session_data, ';', $start_currency) - $start_currency + 1));
+ $session_data_country = substr($session_data, $start_country, (strpos($session_data, ';', $start_country) - $start_country + 1));
+ $session_data_zone = substr($session_data, $start_zone, (strpos($session_data, ';', $start_zone) - $start_zone + 1));
+
+ session_decode($session_data_id);
+ session_decode($session_data_currency);
+ session_decode($session_data_country);
+ session_decode($session_data_zone);
+ session_decode($session_data_cart);
+
+ if (isset($cart) && is_object($cart)) {
+ $products = $cart->get_products();
+ for ($i = 0, $n = sizeof($products); $i < $n; $i++) {
+ $contents[] = array('text' => $products[$i]['quantity'] . ' x ' . $products[$i]['name']);
+ }
+
+ if (sizeof($products) > 0) {
+ $contents[] = array('text' => TEXT_SHOPPING_CART_SUBTOTAL . ' ' . $currencies->format($cart->show_total(), true, $currency));
+ } else {
+ $contents[] = array('text' => ' ');
+ }
+ }
+ }
+// }
+
+
+ if ( (tep_not_null($heading)) && (tep_not_null($contents)) ) {
+
+ $box = new box;
+ return $box->infoBox($heading, $contents);
+ }
+ }
+
+
+ /**
+ @remarks implements InterfaceModule depend
+ if module twin in backoffice, report all content install in the other module
+ public function check() {return true;}
+ public function install() {return true;}
+ public function remove() {return true;}
+ public function keys() {return array(); }
+ */
+
+ /**
+ @fn check()
+ @brief test if count all var , and keys is equal
+ @return boolean true/false
+ */
+ function check() { return false; }
+
+
+ /**
+ @fn keys()
+ @return array all key configuration define by this module
+ */
+ function keys() {
+ return array('MODULE_PRODUCTS_VIEWEDDESCRIPTION_SORT_ORDER');
+ }
+
+ /**
+ @fn install()
+ @brief add all configuration
+ @note
+ - Modules can emarquer sql installation instructions, however, in the case of transverse information, or dependent of an extension, preferring the implementation of an extension, file with sql independent
+ - please, pefix all var configuration by 'MODULE_OT__MODTYPENAME_MAJ_'
+ - if module twin in backoffice, report all content install in the other module
+ - Not use language in DB , but function :__()
+ for MODULE_TOTO_ST
+ var title MODULE_TOTO_ST_S (small description)
+ var description MODULE_TOTO_ST_L (long description)
+ */
+ function install() { return false; }
+
+ /**
+ @fn remove()
+ @brief delete all configuration
+ @note
+ - please, pefix all var configuration by 'MODULE_PAYMENT__MODTYPENAME_MAJ_'
+ - if module twin in backoffice, report all content remove in the other module
+ */
+ function remove() { return false; }
+}
+?>
\ No newline at end of file
Modified: trunk/catalog/includes/application_top.php
===================================================================
--- trunk/catalog/includes/application_top.php 2012-04-10 14:17:06 UTC (rev 4191)
+++ trunk/catalog/includes/application_top.php 2012-04-10 16:23:03 UTC (rev 4192)
@@ -372,9 +372,13 @@
/// include the who's online functions
-if (_cst_bool('WHOS_ONLINE_ACTIVE') || ( (tep_cst_define('WHOS_ONLINE_ACTIVE') =='auto') && _cst_bool('WHOS_ONLINE_FLAG')) ){
- require(DIR_WS_FUNCTIONS . 'whos_online.php');
- tep_update_whos_online();
+if ( _cst_bool('WHOS_ONLINE_ACTIVE') || ( (tep_cst_define('WHOS_ONLINE_ACTIVE') =='auto') && _cst_bool('WHOS_ONLINE_FLAG')) ){
+ /// exclude image and document.php
+ $ext = substr( basename($_SERVER['REQUEST_URI']) , -3);
+ if( !in_array(strtolower($ext) , array('gif', 'png', 'jpg', 'jpeg')) && basename($_SERVER['SCRIPT_NAME']) !='document.php') {
+ require(DIR_WS_FUNCTIONS . 'whos_online.php');
+ tep_update_whos_online();
+ }
}
/* MARK FOR CIP -- DOES NOT TOUCH */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-10 14:17:14
|
Revision: 4191
http://oscss.svn.sourceforge.net/oscss/?rev=4191&view=rev
Author: oscim
Date: 2012-04-10 14:17:06 +0000 (Tue, 10 Apr 2012)
Log Message:
-----------
Correction mineur sur les modele de Dev
Ajout d'une page de rapport pour remplacer l'actuelle page des stats , et reconstruction de sous modules associ?\195?\169 nomm?\195?\169 rapport, remplacement du module les produit les plus vue par ce nouveau modules
Ajustement du menu correspondant
Modified Paths:
--------------
trunk/catalog/admin/includes/boxes/04_tools.php
trunk/catalog/admin/includes/filenames.php
trunk/catalog/admin/includes/languages/fr_FR/boxes/04_tools.php
trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/modules/_DATATYPE_REPLACE_/_DATATYPE_REPLACE_SEOTAG__description.php
Added Paths:
-----------
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/rapport.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/rapport/
trunk/catalog/admin/includes/languages/fr_FR/modules/rapport/products_viewed.txt
trunk/catalog/admin/includes/modules/pages/rapport.php
trunk/catalog/admin/includes/modules/rapport/
trunk/catalog/admin/includes/modules/rapport/products_viewed.php
Removed Paths:
-------------
trunk/catalog/admin/includes/gabarit/recover_cart_sales/display_view.porcessconfirm.gab
trunk/catalog/admin/includes/languages/fr_FR/modules/stats/stats_products_viewed.php
trunk/catalog/admin/includes/modules/stats/stats_products_viewed.php
Modified: trunk/catalog/admin/includes/boxes/04_tools.php
===================================================================
--- trunk/catalog/admin/includes/boxes/04_tools.php 2012-04-10 11:27:39 UTC (rev 4190)
+++ trunk/catalog/admin/includes/boxes/04_tools.php 2012-04-10 14:17:06 UTC (rev 4191)
@@ -18,6 +18,8 @@
$tabl_link[600][4][]=array(FILENAME_STATS.'?module='.$name, ''.$name, 'stats '.$name,@$img[$name]);
}
+ $tabl_link[]= array(FILENAME_RAPPORT, 'BOX_TOOLS_RAPPORT', 'stats',@$img['stats']);
+
$tabl_link[]= array(FILENAME_GOOGLE_SITEMAP, 'BOX_TOOLS_GOOGLE_SITEMAP', 'ggmap',@$img['ggmap']);
$tabl_link[]= array(FILENAME_FULL_TAG, 'BOX_TOOLS_HEADER_TAG', 'headertag',@$img['headertag']);
Modified: trunk/catalog/admin/includes/filenames.php
===================================================================
--- trunk/catalog/admin/includes/filenames.php 2012-04-10 11:27:39 UTC (rev 4190)
+++ trunk/catalog/admin/includes/filenames.php 2012-04-10 14:17:06 UTC (rev 4191)
@@ -53,6 +53,7 @@
define('FILENAME_PASSWORD_FORGOTTEN', 'password_forgotten.php');
define('FILENAME_PLUGINS', 'plugins.php');
define('FILENAME_RECOVER_CART_SALES', 'recover_cart_sales.php');
+define('FILENAME_RAPPORT', 'rapport.php');
define('FILENAME_GRAPHS_STATS', 'graphs_stats.php');
define('FILENAME_SITEMONITOR_CONFIGURE', 'sitemonitor_configure.php');
define('FILENAME_SITEMONITOR_ADMIN', 'sitemonitor_admin.php');
Deleted: trunk/catalog/admin/includes/gabarit/recover_cart_sales/display_view.porcessconfirm.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/recover_cart_sales/display_view.porcessconfirm.gab 2012-04-10 11:27:39 UTC (rev 4190)
+++ trunk/catalog/admin/includes/gabarit/recover_cart_sales/display_view.porcessconfirm.gab 2012-04-10 14:17:06 UTC (rev 4191)
@@ -1,23 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.1
- @date 18/12/11, 09:40
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-?>
-<h3><?php echo __('table heading customer'); ?></h3>
-
-
-<div class="box_left">
- <?php foreach(recover_cart_sales::$list as $item): ?>
- <p><?php echo $item['text'] ?></p>
- <?php endforeach; ?>
-</div>
-
-
- <div class="block_input button_nav">
- <?php print tep_image_submit('button_delete.gif', IMAGE_DELETE) . tep_js_back(tep_href_link(recover_cart_sales::FILENAME,recover_cart_sales::RepostDate()), IMAGE_CANCEL) ; ?>
- </div>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/languages/fr_FR/boxes/04_tools.php
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/boxes/04_tools.php 2012-04-10 11:27:39 UTC (rev 4190)
+++ trunk/catalog/admin/includes/languages/fr_FR/boxes/04_tools.php 2012-04-10 14:17:06 UTC (rev 4191)
@@ -1,44 +1,44 @@
-<?php
-/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 09/12/10, 17:23
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
- @brief file languages for boxes menu
-*/
-
-define('BOX_HEADING_CONF_TOOLS',"Outils" );
-
-define('BOX_HEADING_CONF_STATS_PRODUCTS_VIEWED',"Produits vus" );
-define('BOX_HEADING_CONF_STATS_DISCOUNT_COUPONS',"Coupons de réductions" );
-define('BOX_HEADING_CONF_STATS_PRODUCTS_PURCHASED',"Produits achetés" );
-define('BOX_HEADING_CONF_STATS_CUSTOMERS',"Total de commande client" );
-define('BOX_HEADING_CONF_STATS_NEWSLETTER',"Clients inscrits newsletter" );
-define('BOX_HEADING_CONF_STATS_PRODUCTS_NOTIFICATIONS',"Suivi envoi notification" );
-define('BOX_HEADING_CONF_WHOS_ONLINE',"Qui est en ligne" );
-define('BOX_HEADING_CONF_STATS_RECOVER_CART_SALES',"stats recover cart sales" );
-define('BOX_HEADING_CONF_STATS_LOW_STOCK_ATTRIB',"Stock par produit" );
-define('BOX_TOOLS_GOOGLE_SITEMAP',"Sitmap google" );
-define('BOX_TOOLS_HEADER_TAG',"Référencement" );
-define('BOX_TOOLS_BANNER_MANAGER',"Bannière" );
-define('BOX_TOOLS_SYSTEM',"Système" );
-define('BOX_CONFIGURATION_CACHE',"Cache" );
-define('BOX_TOOLS_CACHE',"Contrôle du cache" );
-define('BOX_TOOLS_BACKUP',"Backup database" );
-define('BOX_TOOLS_SERVER_INFO',"Infos serveur" );
-define('BOX_LOCALIZATION_CURRENCIES',"Devises" );
-define('BOX_HEADING_CONF_BOX_REPORTS',"Statistiques" );
-define('BOX_HEADING_CONF_BOX_TOOLS_BATCH_CENTER',"Batch Print Center" );
-define('BOX_TOOLS_CRONJOB',"Tache(s) programmée(s)" );
-
+<?php
+/**
+ @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.0
+ @date 09/12/10, 17:23
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @brief file languages for boxes menu
+*/
+define('BOX_HEADING_CONF_TOOLS',"Outils" );
+
+define('BOX_TOOLS_RAPPORT',"Rapports" );
+
+// define('BOX_HEADING_CONF_STATS_PRODUCTS_VIEWED',"Produits vus" );
+define('BOX_HEADING_CONF_STATS_DISCOUNT_COUPONS',"Coupons de réductions" );
+define('BOX_HEADING_CONF_STATS_PRODUCTS_PURCHASED',"Produits achetés" );
+define('BOX_HEADING_CONF_STATS_CUSTOMERS',"Total de commande client" );
+define('BOX_HEADING_CONF_STATS_NEWSLETTER',"Clients inscrits newsletter" );
+define('BOX_HEADING_CONF_STATS_PRODUCTS_NOTIFICATIONS',"Suivi envoi notification" );
+define('BOX_HEADING_CONF_WHOS_ONLINE',"Qui est en ligne" );
+define('BOX_HEADING_CONF_STATS_RECOVER_CART_SALES',"stats recover cart sales" );
+define('BOX_HEADING_CONF_STATS_LOW_STOCK_ATTRIB',"Stock par produit" );
+
+
+define('BOX_TOOLS_GOOGLE_SITEMAP',"Sitmap google" );
+define('BOX_TOOLS_HEADER_TAG',"Référencement" );
+define('BOX_TOOLS_BANNER_MANAGER',"Bannière" );
+define('BOX_TOOLS_SYSTEM',"Système" );
+define('BOX_CONFIGURATION_CACHE',"Cache" );
+define('BOX_TOOLS_CACHE',"Contrôle du cache" );
+define('BOX_TOOLS_BACKUP',"Backup database" );
+define('BOX_TOOLS_SERVER_INFO',"Infos serveur" );
+define('BOX_LOCALIZATION_CURRENCIES',"Devises" );
+define('BOX_HEADING_CONF_BOX_REPORTS',"Statistiques" );
+define('BOX_HEADING_CONF_BOX_TOOLS_BATCH_CENTER',"Batch Print Center" );
+define('BOX_TOOLS_CRONJOB',"Tache(s) programmée(s)" );
+
+
/* Begin MANAGELOG_stable - installed by CIP */
define('BOX_TOOLS_MANAGELOG', 'Fichier de Logs');
/* End MANAGELOG_stable - installed by CIP */
-
-/* Begin ANNUAIRE_stable - installed by CIP */
-define('BOX_TOOLS_ANNUAIRE', 'Datatype ANNUAIRE');
-/* End ANNUAIRE_stable - installed by CIP */
?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/pages/rapport.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/pages/rapport.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/rapport.txt 2012-04-10 14:17:06 UTC (rev 4191)
@@ -0,0 +1,19 @@
+<?php
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 10/04/2012 ,13:36:56
+ @author genrated by GenerCode
+ @encode UTF-8
+ @class rapport
+*/
+$lang['heading title rapport'] = "Liste des rapports";
+
+
+$lang['table heading code'] = "Code";
+$lang['table heading name'] = "Titre";
+$lang['table heading description'] = "Description";
+$lang['table heading action'] = "Action";
+?>
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/rapport/products_viewed.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/rapport/products_viewed.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/rapport/products_viewed.txt 2012-04-10 14:17:06 UTC (rev 4191)
@@ -0,0 +1,19 @@
+<?php
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 10/04/2012 , 15:00:00
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+$lang['products_viewed heading title'] ="Les produits les plus consultés" ;
+$lang['products_viewed heading description'] ="Les produits les plus consultés par langue" ;
+
+$lang['products_viewed heading title'] ="Les produits les plus consultés" ;
+$lang['products_viewed table heading number'] ="N°" ;
+$lang['products_viewed table heading products'] ="Produits" ;
+$lang['products_viewed table heading viewed'] ="Vu" ;
+$lang['products_viewed table heading language'] ="Langue" ;
+?>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/languages/fr_FR/modules/stats/stats_products_viewed.php
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/stats/stats_products_viewed.php 2012-04-10 11:27:39 UTC (rev 4190)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/stats/stats_products_viewed.php 2012-04-10 14:17:06 UTC (rev 4191)
@@ -1,15 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 19/12/10, 17:41
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-define('HEADING_TITLE',"Les produits les plus consultés" );
-define('TABLE_HEADING_NUMBER',"N°" );
-define('TABLE_HEADING_PRODUCTS',"Produits" );
-define('TABLE_HEADING_VIEWED',"Vu" );
-?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/modules/pages/rapport.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/rapport.php (rev 0)
+++ trunk/catalog/admin/includes/modules/pages/rapport.php 2012-04-10 14:17:06 UTC (rev 4191)
@@ -0,0 +1,467 @@
+<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 10/04/2012 ,13:36:56
+ @author genrated by GenerCode
+ @encode UTF-8
+ @class rapport
+*/
+
+
+class rapport
+ extends ModTwo /// new abstract class for nextgen module
+ implements
+ InterfaceModule,
+ /*IntModTwo, */ /// new interface module for nextgen module
+ ExtModConfig {
+
+ const FILENAME = FILENAME_RAPPORT;
+
+ /**
+ @var string file
+ */
+ public static $Id;
+ /**
+ @var array list code action module
+ */
+ public static $list=array();
+ /**
+ @var bool $dir_ok
+ */
+ public static $dir_ok;
+ /**
+ @var current object
+ */
+ public static $Info;
+
+ /**
+ @brief class constructor
+ */
+ public function __construct() {
+ self::GetConf();
+ }
+
+
+ /**
+ @brief Load , adjust and define var environement exe for module
+ Is use in module and class abstract for init value config this module
+ */
+ public static function GetConf(){
+ global $languages_id;
+
+ self::$code=__CLASS__;
+
+ self::$action=(isset($_REQUEST['action'])? (string)$_REQUEST['action'] : 'listing' );
+ self::$Id=(isset($_REQUEST['cID'])? (string)$_REQUEST['cID'] : 0 );
+
+ /**
+ @remarks define var execution sql in GetDBValue()
+ */
+ self::$InitInfo['adjust']=array(
+ 'languages_id'=>$languages_id,
+ 'page'=>1,
+ 'rowbyp'=>10,
+ 'sOrder'=>'',
+ 'sWhere'=>'',
+ );
+
+
+
+ /**
+ @remarks not load if not first init
+ */
+ if(defined('JSONSTATMENT')) return;
+
+ if(self::$action =='' || self::$action =='listing')
+ //! active datatable in ajax, precise les GET necessaire
+ define('JSONSTATMENT', 'ModTwo=true&mod=page&type='.self::$code.
+ (isset(parent::$action)?'&action='.parent::$action : '' ).
+ (isset(self::$Id)?'&file='.self::$Id : '' )
+ );
+ else
+ //! active datatable in ajax, precise les GET necessaire
+ define('JSONSTATMENT', 'ModTwo=true&mod=page&type='.self::$code.
+ (isset(parent::$action)?'&action='.parent::$action : '' ).
+ (isset(self::$Id)?'&cID='.self::$Id : '' )
+ );
+
+ /**
+ @remarks this define col theader title, and ajust html code
+ Just for Edit listing
+ */
+ self::$InitInfo['theader']['listing']=array(
+ array('width'=>'10%','class'=>'tcenter', 'txt'=>__('table heading code') ) ,
+ array('width'=>'30%','class'=>'tcenter', 'txt'=>__('table heading name') ) ,
+ array('width'=>'50%','class'=>'tcenter', 'txt'=>__('table heading description') ),
+ array('width'=>'10%','class'=>'tcenter', 'txt'=>__('table heading action') ),
+ );
+
+ /**
+ @remarks this define col in table, and if is possible sort
+ Just for Edit listing
+ */
+ self::$InitInfo['modele']['listing']=array(
+// 0 =>false,
+ 'rapport_code'=>true,
+ 'rapport_title' =>true,
+ 'rapport_description'=>true,
+ 'action'=>false,
+ );
+
+
+
+ /**
+ @remarks this define menu master module in page
+ */
+ if( self::$action =='view'){
+ global $query_numrows, $oscss, $language;
+
+ $name = self::$Id;
+ include_once(DIR_FS_ADMIN .DIR_WS_MODULES.'rapport/'.self::$Id.'.php');
+
+ $oscss->pile_file_lang(DIR_FS_ADMIN.DIR_WS_LANGUAGES.$language.'/modules/rapport/'.self::$Id.'.txt');
+ $new = new $name();
+
+ $new->load_db_values(0);
+
+ /**
+ @remarks this define col theader title, and ajust html code
+ Just for Edit listing
+ */
+ self::$InitInfo['theader']['view']=$new->listing['theader'];
+
+ /**
+ @remarks this define col in table, and if is possible sort
+ Just for Edit listing
+ */
+ self::$InitInfo['modele']['view']=$new->listing['modele'];
+ }
+
+
+// self::$InitInfo['MenuModule'][]=array(
+// 'type'=>'getLink',
+// 'format'=>'button_nav',
+// 'image'=>'',
+// 'cssclass'=>'',
+// 'title'=>__('image add rapport'),
+// 'url'=>tep_href_link(self::FILENAME, 'action=new'),
+// );
+
+
+ return true;
+ }
+
+
+ /**
+ @fn check_action($actions)
+ @brief Process action
+ @param $actions string
+ @return $actions string
+ */
+ public function check_action($actions){
+ global $messageStack;
+
+ self::$action=$actions;
+
+ switch (self::$action) {
+ default:
+ }
+
+ return self::$action;
+ }
+
+ public function get_header(){
+ }
+
+
+ /**
+ @fn rapport::GetDBValue();
+ @brief return DB value adapted for current action
+ Use self::action for determine switch
+ @return
+ */
+ public static function GetDBValue(){
+// var_dump('__GetDBValue');
+ $DB= Database::getInstance();
+
+ switch (self::$action) {
+
+// case 'delete':
+// case 'edit':
+ case 'view':
+
+
+ /**
+ @remarks retrun object load one inventaire
+ */
+ global $query_numrows;
+ $adjust=new objectInfo(self::$InitInfo['adjust']);
+
+
+// print_r($adjust);
+
+// if( (int)self::$Id > 0) {
+// self::$Info = sqlrapport::fetch(array('id'=>self::$Id ), true);
+// }
+// else{
+// self::$Info = sqlrapport::Specimen(true);
+// }
+// echo DIR_FS_ADMIN .DIR_WS_MODULES.'rapport/'.self::$Id.'.php';
+ $name = self::$Id;
+ include_once(DIR_FS_ADMIN .DIR_WS_MODULES.'rapport/'.self::$Id.'.php');
+
+
+
+ $new = new $name();
+
+ $new->load_db_values(0);
+
+
+
+ /*echo*/ $query_raw = 'SELECT '. $new->query['select'] .' FROM ' . $new->query['tables'] .
+ ((!empty($new->query['where'])) ? " WHERE ". $new->query['where'] : ''). ((!empty($adjust->sWhere)) ? substr($adjust->sWhere, 3) : '').
+ " ORDER BY ". ((!empty($adjust->sOrder)) ? $adjust->sOrder : $new->query['orderby'] );
+
+
+
+ $_split = new splitPageResults($adjust->page, $adjust->rowbyp, $query_raw, $query_numrows);
+ $_query = $DB->query($query_raw);
+
+ $res=self::FormatDBValue($_query);
+// print_r($res);
+ return $res;
+
+
+ break;
+
+
+ case 'listing':
+ default:
+ /**
+ @remarks retrun object load one inventaire
+ */
+ global $query_numrows, $oscss, $language;
+ $adjust=new objectInfo(self::$InitInfo['adjust']);
+
+
+ /* Calcul des module de stats et rapport*/
+ foreach(scan(DIR_FS_ADMIN .DIR_WS_MODULES.'rapport/') as $file)
+ if (substr("$file", -4) == '.php'){
+ $name=substr("$file",0,strlen($file)-4);
+ include_once(DIR_FS_ADMIN .DIR_WS_MODULES.'rapport/'.$file );
+ $oscss->pile_file_lang(DIR_FS_ADMIN.DIR_WS_LANGUAGES.$language.'/modules/rapport/'.$name.'.txt');
+ $new = new $name();
+// print_r($new);
+
+ $tmp = array(
+ 'rapport_code'=>$new->code,
+ 'rapport_title'=>$new->title,
+ 'rapport_description'=>$new->description,
+ );
+ $res[] = $tmp;
+ }
+
+ $res=self::FormatDBValue($res);
+
+ return $res;
+ }
+ }
+
+
+
+ /**
+ @fn display_view()
+ @brief this methode is switch for call gabarit action
+ */
+ public function display_view(){
+ switch (parent::$action) {
+ /**
+ @remarks Ajax View result
+ */
+// case 'setflag':
+// return self::RowStatus(array('country_visible'=>(int)$_GET['flag'], 'rapport_id'=>(int)$_GET['cID']));
+// break;
+
+
+ /**
+ @remarks Normal View Page
+ */
+// case 'new':
+// self::load_db_values(0);
+// return MGabCont::CallGab('edit',__FUNCTION__,__CLASS__);
+// break;
+// case 'edit':
+// self::load_db_values(self::$Id);
+// return MGabCont::CallGab(parent::$action,__FUNCTION__,__CLASS__);
+// break;
+// case 'delete':
+// self::load_db_values(self::$Id);
+// return MGabCont::CallGab(parent::$action,__FUNCTION__,__CLASS__);
+// break;
+ case 'listing':
+ default:
+ self::$list=self::tep_get_list();
+ /// use master gabarit
+ MGabCont::SetCurrentName(__CLASS__);
+ return MGabCont::CallGab('listing',__FUNCTION__,self::MASTER);
+ }
+ }
+
+
+
+ /**
+ @fn tep_get_list($page=1,$rowbyp=10,$sOrder='',$sWhere='',$options='')
+ @brief Constructeur listing element cms _DATATYPE_REPLACE_
+ @param $page integer default(1) split page
+ @param $rowbyp integer default(10) nbr line in page
+ @param $sOrder string | null
+ @param $sWhere string | null
+ @param $options array
+ @return Array
+ */
+ public static function tep_get_list($page=1,$rowbyp=10,$sOrder='',$sWhere='',$options=''){
+// global $query_numrows;
+
+ /// @remarks force load conf
+ self::GetConf();
+
+ $res=array();
+
+ /**
+ @remarks adjust param for sql requete
+ */
+ self::$InitInfo['adjust']['page']=$page;
+ self::$InitInfo['adjust']['rowbyp']=$rowbyp;
+ self::$InitInfo['adjust']['sOrder']=$sOrder;
+ self::$InitInfo['adjust']['sWhere']=$sWhere;
+ self::$InitInfo['adjust']['options']=$options;
+
+ $res = self::GetDBValue();
+
+// var_dump($_GET['action']);
+// print_r(self::$InitInfo['adjust']);
+// exit;
+
+ self::$list= count($res);
+
+ return $res;
+ }
+
+
+ /** public static InterfacedTJsonS */
+
+ /**
+ @brief format db value for display page
+ @param $_query ressource db sql
+ @return array
+ */
+ private static function FormatDBValue($_query){
+ $DB=Database::getInstance();
+ $res=array();
+
+ switch (parent::$action) {
+ case 'view':
+ global $query_numrows,$languages_id;
+
+ foreach($_query->fetchAllAssoc() as $item) {
+// print_r($item);
+ foreach(self::$InitInfo['modele']['view'] as $k=>$row)
+ if($k == 'action') $ord[$k]=self::ButtonRowsActions($item);
+// elseif($k == 'rapport_visible') $ord[$k]=self::RowStatus($item);
+ else $ord[$k]=$item[$k];
+
+ $res[]=$ord;
+ }
+ break;
+ case 'listing':
+ global $query_numrows,$languages_id;
+
+ foreach($_query as $item) {
+
+ foreach(self::$InitInfo['modele']['listing'] as $k=>$row)
+ if($k == 'action') $ord[$k]=self::ButtonRowsActions($item);
+// elseif($k == 'rapport_visible') $ord[$k]=self::RowStatus($item);
+ else $ord[$k]=$item[$k];
+
+ $res[]=$ord;
+ }
+ break;
+ }
+
+ return $res;
+ }
+
+ /**
+ @fn ButtonRowsActions($item)
+ @return string html
+ */
+ public static function ButtonRowsActions($item){
+ return sprintf(
+ CsrtAction::getFormat('row_action'),
+ ''
+ ,
+ sprintf(CsrtAction::getLink('row_action_right', IMAGE_VIEW, 'view'), '', tep_href_link(self::FILENAME, 'cID=' . $item['rapport_code'] . '&action=view') ,'' )
+ );
+ }
+
+
+
+ /**
+ @brief return Filename
+ */
+ public static function GetFILENAME(){
+ return self::FILENAME;
+ }
+
+
+ /**
+ @remarks implements InterfaceModule depend
+ if module twin in backoffice, report all content install in the other module
+ public function check() {return true;}
+ public function install() {return true;}
+ public function remove() {return true;}
+ public function keys() {return array(); }
+ */
+
+ /**
+ @fn check()
+ @brief test if count all var , and keys is equal
+ @return boolean true/false
+ */
+ function check() { return false; }
+
+
+ /**
+ @fn keys()
+ @return array all key configuration define by this module
+ */
+ function keys() { return false; }
+
+ /**
+ @fn install()
+ @brief add all configuration
+ @note
+ - Modules can emarquer sql installation instructions, however, in the case of transverse information, or dependent of an extension, preferring the implementation of an extension, file with sql independent
+ - please, pefix all var configuration by 'MODULE_OT__MODTYPENAME_MAJ_'
+ - if module twin in backoffice, report all content install in the other module
+ - Not use language in DB , but function :__()
+ for MODULE_TOTO_ST
+ var title MODULE_TOTO_ST_S (small description)
+ var description MODULE_TOTO_ST_L (long description)
+ */
+ function install() { return false; }
+
+ /**
+ @fn remove()
+ @brief delete all configuration
+ @note
+ - please, pefix all var configuration by 'MODULE_PAYMENT__MODTYPENAME_MAJ_'
+ - if module twin in backoffice, report all content remove in the other module
+ */
+ function remove() { return false; }
+}
+
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/modules/rapport/products_viewed.php
===================================================================
--- trunk/catalog/admin/includes/modules/rapport/products_viewed.php (rev 0)
+++ trunk/catalog/admin/includes/modules/rapport/products_viewed.php 2012-04-10 14:17:06 UTC (rev 4191)
@@ -0,0 +1,165 @@
+<?php
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 10/04/2012 , 15:00:00
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class products_viewed
+ @brief manage description products_viewed
+*/
+
+class products_viewed
+ implements InterfaceModule{
+ /**
+ @var current string name
+ */
+ public $code;
+ /**
+ @var Datatype master
+ */
+ public $type;
+ /**
+ @var string title current module
+ */
+ public $title;
+ /**
+ @var string description current module
+ */
+ public $description;
+ /**
+ @var object info current data
+ */
+ public $sort_order;
+
+ /**
+ @var array info post data
+ */
+ public $listing = array();
+ /**
+ @var array info post data
+ */
+ public $query = array();
+ /**
+ @var boolean true/false
+ */
+ public $enabled;
+
+ /**
+ @brief class constructor
+ */
+ function __construct() {
+ $this->code = 'products_viewed';
+ $this->type ='rapport';
+ $this->title = __('products_viewed heading title');
+ $this->description = __('products_viewed heading description');
+ $this->sort_order = (defined('MODULE_PRODUCTS_VIEWEDDESCRIPTION_SORT_ORDER'))?MODULE_PRODUCTS_VIEWEDDESCRIPTION_SORT_ORDER : 0;
+ $this->enabled = true;
+
+
+ global $languages_id;
+ $this->language_id = $languages_id;
+
+
+ }
+
+ /**
+ */
+ public function check_action($actions){
+ }
+
+ /**
+ @brief Edition/affichage produit
+ */
+ function load_db_values ($id) {
+
+ /**
+ @remarks this define col theader title, and ajust html code
+ Just for Edit listing
+ */
+ $this->listing['theader']=array(
+ array('width'=>'5%','class'=>'tcenter', 'txt'=>__('products_viewed table heading number') ) ,
+ array('width'=>'70%','class'=>'tcenter', 'txt'=>__('products_viewed table heading products') ) ,
+ array('width'=>'10%','class'=>'tcenter', 'txt'=>__('products_viewed table heading viewed') ),
+ array('width'=>'5%','class'=>'tcenter', 'txt'=>__('products_viewed table heading language') ),
+ );
+
+ /**
+ @remarks this define col in table, and if is possible sort
+ Just for Edit listing
+ */
+ $this->listing['modele']=array(
+ 'products_id'=>true,
+ 'products_name' =>true,
+ 'products_viewed'=>true,
+ 'name'=>false,
+ );
+
+
+ $this->query['select'] = " p.products_id, pd.products_name, pd.products_viewed, l.name ";
+ $this->query['tables'] = " " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_LANGUAGES . " l ";
+ $this->query['where'] = " p.products_id = pd.products_id and l.languages_id = pd.language_id ";
+ $this->query['orderby'] = " pd.products_viewed DESC";
+
+ }
+
+
+ /**
+ */
+ function display_view($id) {
+ }
+
+
+
+
+ /**
+ @remarks implements InterfaceModule depend
+ if module twin in backoffice, report all content install in the other module
+ public function check() {return true;}
+ public function install() {return true;}
+ public function remove() {return true;}
+ public function keys() {return array(); }
+ */
+
+ /**
+ @fn check()
+ @brief test if count all var , and keys is equal
+ @return boolean true/false
+ */
+ function check() { return false; }
+
+
+ /**
+ @fn keys()
+ @return array all key configuration define by this module
+ */
+ function keys() {
+ return array('MODULE_PRODUCTS_VIEWEDDESCRIPTION_SORT_ORDER');
+ }
+
+ /**
+ @fn install()
+ @brief add all configuration
+ @note
+ - Modules can emarquer sql installation instructions, however, in the case of transverse information, or dependent of an extension, preferring the implementation of an extension, file with sql independent
+ - please, pefix all var configuration by 'MODULE_OT__MODTYPENAME_MAJ_'
+ - if module twin in backoffice, report all content install in the other module
+ - Not use language in DB , but function :__()
+ for MODULE_TOTO_ST
+ var title MODULE_TOTO_ST_S (small description)
+ var description MODULE_TOTO_ST_L (long description)
+ */
+ function install() { return false; }
+
+ /**
+ @fn remove()
+ @brief delete all configuration
+ @note
+ - please, pefix all var configuration by 'MODULE_PAYMENT__MODTYPENAME_MAJ_'
+ - if module twin in backoffice, report all content remove in the other module
+ */
+ function remove() { return false; }
+}
+?>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/modules/stats/stats_products_viewed.php
===================================================================
--- trunk/catalog/admin/includes/modules/stats/stats_products_viewed.php 2012-04-10 11:27:39 UTC (rev 4190)
+++ trunk/catalog/admin/includes/modules/stats/stats_products_viewed.php 2012-04-10 14:17:06 UTC (rev 4191)
@@ -1,48 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.0.9
- @date 05/09/10, 11:17
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-?>
-<!-- body //-->
-<h4><?php echo HEADING_TITLE; ?></h4>
-<!-- body_text //-->
- <table style="width:100%" class="dataTable">
- <thead>
- <tr>
- <th><?php echo TABLE_HEADING_NUMBER; ?></th>
- <th><?php echo TABLE_HEADING_PRODUCTS; ?></th>
- <th><?php echo TABLE_HEADING_VIEWED; ?></th>
- </tr>
- </thead>
- <tbody>
-<?php
- if (isset($_GET['page']) && ($_GET['page'] > 1)) $rows = $_GET['page'] * MAX_DISPLAY_SEARCH_RESULTS - MAX_DISPLAY_SEARCH_RESULTS;
- $rows = 0;
- $products_query_raw = "select p.products_id, pd.products_name, pd.products_viewed, l.name from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_LANGUAGES . " l where p.products_id = pd.products_id and l.languages_id = pd.language_id order by pd.products_viewed DESC";
- $db_query_split = new splitPageResults($_GET['page'], MAX_DISPLAY_ROW_BY_PAGE, $products_query_raw, $db_query_numrows);
- $products_query = tep_db_query($products_query_raw);
- while ($products = tep_db_fetch_array($products_query)) {
- $rows++;
-
- if (strlen($rows) < 2) {
- $rows = '0' . $rows;
- }
-?>
- <tr class="dataTableRow" >
- <td><?php echo $rows; ?>.</td>
- <td><?php echo '<a href="' . tep_href_link(FILENAME_CATEGORIES, 'action=new_product_preview&read=only&pID=' . $products['products_id'] . '&origin=' . FILENAME_STATS.'?module='.$module_stats . '&page=' . $_GET['page'], 'NONSSL') . '">' . $products['products_name'] . '</a> (' . $products['name'] . ')'; ?></td>
- <td><?php echo $products['products_viewed']; ?></td>
- </tr>
-<?php
- }
-?>
- </tbody>
-</table>
-<!-- body_text_eof //-->
-<!-- body_eof //-->
\ No newline at end of file
Modified: trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/modules/_DATATYPE_REPLACE_/_DATATYPE_REPLACE_SEOTAG__description.php
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/modules/_DATATYPE_REPLACE_/_DATATYPE_REPLACE_SEOTAG__description.php 2012-04-10 11:27:39 UTC (rev 4190)
+++ trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/modules/_DATATYPE_REPLACE_/_DATATYPE_REPLACE_SEOTAG__description.php 2012-04-10 14:17:06 UTC (rev 4191)
@@ -49,7 +49,7 @@
/**
@brief class constructor
*/
- function _DATATYPE_REPLACE_SEOTAG__description() {
+ function __construct() {
$this->code = '_DATATYPE_REPLACE_SEOTAG__description';
$this->type ='_DATATYPE_REPLACE_';
$this->title = __('_DATATYPE_REPLACE_SEOTAG__description heading title');
@@ -140,21 +140,58 @@
/// use master gabarit
$m= MGabCont::CallGab('edit',__FUNCTION__,'_DATATYPE_REPLACE_/'.__CLASS__);
}
- $contents []=array('title'=> __('Description') ,'text'=> $m);
+ $contents []=array('title'=> __('_DATATYPE_REPLACE_ tab title description') ,'text'=> $m);
}
/** Fonction complementaire utilisé dans la page produits */
+ /**
+ @remarks implements InterfaceModule depend
+ if module twin in backoffice, report all content install in the other module
+ public function check() {return true;}
+ public function install() {return true;}
+ public function remove() {return true;}
+ public function keys() {return array(); }
+ */
-/** Force implements InterfaceModule class to define this method */
+ /**
+ @fn check()
+ @brief test if count all var , and keys is equal
+ @return boolean true/false
+ */
+ function check() { return false; }
- function check() { return false; }
- function install() { return false; }
- function remove() { return false; }
+
+ /**
+ @fn keys()
+ @return array all key configuration define by this module
+ */
function keys() {
return array('MODULE__DATATYPE_REPLACE_MAJ_DESCRIPTION_SORT_ORDER');
}
+ /**
+ @fn install()
+ @brief add all configuration
+ @note
+ - Modules can emarquer sql installation instructions, however, in the case of transverse information, or dependent of an extension, preferring the implementation of an extension, file with sql independent
+ - please, pefix all var configuration by 'MODULE_OT__MODTYPENAME_MAJ_'
+ - if module twin in backoffice, report all content install in the other module
+ - Not use language in DB , but function :__()
+ for MODULE_TOTO_ST
+ var title MODULE_TOTO_ST_S (small description)
+ var description MODULE_TOTO_ST_L (long description)
+ */
+ function install() { return false; }
+
+ /**
+ @fn remove()
+ @brief delete all configuration
+ @note
+ - please, pefix all var configuration by 'MODULE_PAYMENT__MODTYPENAME_MAJ_'
+ - if module twin in backoffice, report all content remove in the other module
+ */
+ function remove() { return false; }
}
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-10 11:27:48
|
Revision: 4190
http://oscss.svn.sourceforge.net/oscss/?rev=4190&view=rev
Author: oscim
Date: 2012-04-10 11:27:39 +0000 (Tue, 10 Apr 2012)
Log Message:
-----------
FIX FS#976
Modified Paths:
--------------
trunk/catalog/common/classes/datatype_drivers/Data_categorie.php
Modified: trunk/catalog/common/classes/datatype_drivers/Data_categorie.php
===================================================================
--- trunk/catalog/common/classes/datatype_drivers/Data_categorie.php 2012-04-10 09:26:18 UTC (rev 4189)
+++ trunk/catalog/common/classes/datatype_drivers/Data_categorie.php 2012-04-10 11:27:39 UTC (rev 4190)
@@ -135,13 +135,13 @@
case 'transversal':
case 'listing':
- if( isset($_GET['cPath']) )
+ if( isset($_GET['cPath']) && $_GET['cPath'] > 0)
return true;
break;
// Mode Display Unique
case 'unique':
- if( isset($_GET['cPath']) )
+ if( isset($_GET['cPath']) && $_GET['cPath'] > 0)
DataTypes::ForceChilds($this->DataType, $childs_type);
break;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-10 09:26:29
|
Revision: 4189
http://oscss.svn.sourceforge.net/oscss/?rev=4189&view=rev
Author: oscim
Date: 2012-04-10 09:26:18 +0000 (Tue, 10 Apr 2012)
Log Message:
-----------
Correction coquille
Correction driver mysqli et les requetes de recuperation des nom de colonne des tables
Modified Paths:
--------------
trunk/catalog/admin/includes/languages/fr_FR/boxes/08_cms.php
trunk/catalog/common/classes/datatype_drivers/Data_categorie.php
trunk/catalog/common/classes/sql_drivers/DB_Mysqli.php
trunk/catalog/index.php
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_admin_m_files_to_right.sql
Modified: trunk/catalog/admin/includes/languages/fr_FR/boxes/08_cms.php
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/boxes/08_cms.php 2012-04-10 06:50:47 UTC (rev 4188)
+++ trunk/catalog/admin/includes/languages/fr_FR/boxes/08_cms.php 2012-04-10 09:26:18 UTC (rev 4189)
@@ -15,4 +15,8 @@
define('BOX_NAVIGATION_LINK',"Gestion du Menu" );
define('BOX_NAVIGATION_IMAGE',"Gestion des images" );
// define('BOX_CMS_HELP', 'Aide');
+
+/* Begin ANNONCES_stable - installed by CIP */
+define('BOX_TOOLS_ANNONCES', 'Datatype ANNONCES');
+/* End ANNONCES_stable - installed by CIP */
?>
\ No newline at end of file
Modified: trunk/catalog/common/classes/datatype_drivers/Data_categorie.php
===================================================================
--- trunk/catalog/common/classes/datatype_drivers/Data_categorie.php 2012-04-10 06:50:47 UTC (rev 4188)
+++ trunk/catalog/common/classes/datatype_drivers/Data_categorie.php 2012-04-10 09:26:18 UTC (rev 4189)
@@ -83,7 +83,6 @@
$category_depth = $page->GetVar('category_depth');
$current_category_id = $page->GetVar('current_category_id');
-
//! Recup des element cat en cours
categorie::resetCacheId((int)$current_category_id);
if( ($categories=categorie::get_item((int)$current_category_id)) ==false){
@@ -100,7 +99,6 @@
}
// elseif($current_category_id==0)$category_depth = 'top';
else {
-
foreach($this->RootListing as $row){
if(!empty($categories->datatype) && in_array($row, explode(',', $categories->datatype) ) && class_exists($row) ){
Modified: trunk/catalog/common/classes/sql_drivers/DB_Mysqli.php
===================================================================
--- trunk/catalog/common/classes/sql_drivers/DB_Mysqli.php 2012-04-10 06:50:47 UTC (rev 4188)
+++ trunk/catalog/common/classes/sql_drivers/DB_Mysqli.php 2012-04-10 09:26:18 UTC (rev 4189)
@@ -1,10 +1,10 @@
<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 12/10/11, 14:42
+ @date 10/04/2012, 14:42
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -119,7 +119,7 @@
protected function list_fields($strTable)
{
$arrReturn = array();
- $arrFields = $this->execute(sprintf($this->strListFields, $strTable))->fetchAllAssoc();
+ $arrFields = $this->query(sprintf($this->strListFields, $strTable))->fetchAllAssoc();
foreach ($arrFields as $k=>$v)
{
@@ -128,20 +128,20 @@
$arrReturn[$k]['name'] = $v['Field'];
$arrReturn[$k]['type'] = $arrChunks[0];
- if (strlen($arrChunks[1]))
+ if (isset($arrChunks[1]) && strlen($arrChunks[1]))
{
$arrChunks[1] = str_replace(array('(', ')'), array('', ''), $arrChunks[1]);
$arrSubChunks = explode(',', $arrChunks[1]);
$arrReturn[$k]['length'] = trim($arrSubChunks[0]);
- if (strlen($arrSubChunks[1]))
+ if (isset($arrSubChunks[1]) && strlen($arrSubChunks[1]))
{
$arrReturn[$k]['precision'] = trim($arrSubChunks[1]);
}
}
- if (strlen($arrChunks[2]))
+ if (isset($arrSubChunks[2]) && strlen($arrChunks[2]))
{
$arrReturn[$k]['attributes'] = trim($arrChunks[2]);
}
@@ -218,7 +218,7 @@
}
/**
- * Server info
+ * Server info
*/
public function server_info()
{
@@ -308,7 +308,7 @@
switch(mysqli_errno(@$this->resConnection)){
case 1091: // upgrade DROP COLUM col not exits
case 1060: // upgrade ADD COLUM col exits
- case 1050: // upgrade RENAME table but already exist
+ case 1050: // upgrade RENAME table but already exist
break;
default:
oscss_db_error($this->strQuery, 0, @$this->resConnection->error);
Modified: trunk/catalog/index.php
===================================================================
--- trunk/catalog/index.php 2012-04-10 06:50:47 UTC (rev 4188)
+++ trunk/catalog/index.php 2012-04-10 09:26:18 UTC (rev 4189)
@@ -84,7 +84,6 @@
$breadcrumb=$page->return_object('breadcrumb');
// call master DataTypes listing and next childs modules
DataTypes::transversal('transversal');
-// exit;
$listing=listing::getInstance();
$listing_split = $listing->listing($dyntype);
Modified: trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_admin_m_files_to_right.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_admin_m_files_to_right.sql 2012-04-10 06:50:47 UTC (rev 4188)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_admin_m_files_to_right.sql 2012-04-10 09:26:18 UTC (rev 4189)
@@ -12,8 +12,8 @@
--+######################################################################--+
-
-CREATE TABLE IF NOT EXISTS osc_admin_m_files_to_right (
+DROP TABLE IF EXISTS osc_admin_m_files_to_right
+CREATE TABLE osc_admin_m_files_to_right (
files_id int(11) DEFAULT NULL,
type_id int(1) DEFAULT '0',
ref_id int(11) NOT NULL,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-10 06:50:57
|
Revision: 4188
http://oscss.svn.sourceforge.net/oscss/?rev=4188&view=rev
Author: oscim
Date: 2012-04-10 06:50:47 +0000 (Tue, 10 Apr 2012)
Log Message:
-----------
Correction coquille et/ou ajout report modification db
Ajout element manquant
Modified Paths:
--------------
trunk/catalog/install/includes/modele/admin_configure.txt
trunk/catalog/install/includes/sql/mysql/tables/osc_admin_m_files_to_right.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/data/40_osc_categories.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_categories.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_extra_fields_info.sql
Added Paths:
-----------
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/data/40_osc_admin_groups.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/data/40_osc_admin_users.sql
Modified: trunk/catalog/install/includes/modele/admin_configure.txt
===================================================================
--- trunk/catalog/install/includes/modele/admin_configure.txt 2012-04-09 20:39:24 UTC (rev 4187)
+++ trunk/catalog/install/includes/modele/admin_configure.txt 2012-04-10 06:50:47 UTC (rev 4188)
@@ -113,13 +113,19 @@
$conf['login']='oscss;';
/**
- @var Define class use for encrypt password
+ @var Define class use for encrypt password
Value possible:
- Classic normal in oscommerce mode
- Md5 special for acces by other mode
- Sha1 new mode
*/
$conf['ModPassword'] = 'Classic';
+
+ /**
+ @var Define var for display result
+ */
+ // nbr de ligne dans les widget
+ $conf['widget_max_line'] = 7;
/**
@var Security key
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_admin_m_files_to_right.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_admin_m_files_to_right.sql 2012-04-09 20:39:24 UTC (rev 4187)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_admin_m_files_to_right.sql 2012-04-10 06:50:47 UTC (rev 4188)
@@ -15,7 +15,8 @@
DROP TABLE IF EXISTS osc_admin_m_files_to_right;
CREATE TABLE osc_admin_m_files_to_right (
files_id int(11) ,
- type_id int(1) default '0',
- id_ref int(11) ,
- UNIQUE filesgroup (files_id,type_id,id_ref)
+ type int(1) default '0',
+ ref_id int(11) ,
+ action varchar(32) ,
+ UNIQUE filesgroup (files_id,type,ref_id, action)
) DEFAULT CHARSET=utf8;
Added: trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/data/40_osc_admin_groups.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/data/40_osc_admin_groups.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/data/40_osc_admin_groups.sql 2012-04-10 06:50:47 UTC (rev 4188)
@@ -0,0 +1,16 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2012 The osCSS developers |
+--| |
+--| http://www.oscss.org |
+--| Portions Copyright (c) 2003 osCommerce |
+--+######################################################################--+
+--| This source file is subject to version 2.0 of the GPL license, |
+--| available at the following url: |
+--| http://www.oscss.org/ |
+--+######################################################################--+
+
+
+
+UPDATE osc_admin_groups SET admin_groups_status = '1';
Added: trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/data/40_osc_admin_users.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/data/40_osc_admin_users.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/data/40_osc_admin_users.sql 2012-04-10 06:50:47 UTC (rev 4188)
@@ -0,0 +1,16 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2012 The osCSS developers |
+--| |
+--| http://www.oscss.org |
+--| Portions Copyright (c) 2003 osCommerce |
+--+######################################################################--+
+--| This source file is subject to version 2.0 of the GPL license, |
+--| available at the following url: |
+--| http://www.oscss.org/ |
+--+######################################################################--+
+
+
+
+UPDATE osc_admin_users SET admin_status = '1';
Modified: trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/data/40_osc_categories.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/data/40_osc_categories.sql 2012-04-09 20:39:24 UTC (rev 4187)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/data/40_osc_categories.sql 2012-04-10 06:50:47 UTC (rev 4188)
@@ -12,10 +12,7 @@
--+######################################################################--+
-ALTER TABLE osc_categories ADD categories_datatype varchar(64) NOT NULL DEFAULT 'product,' COMMENT 'list type separated by ,' AFTER categories_id;
-ALTER TABLE osc_categories ADD categories_cpath varchar(64) NOT NULL AFTER parent_id;
+
UPDATE osc_categories SET categories_datatype = 'product' ;
-ALTER TABLE osc_categories ADD sortchids_products varchar(150) NULL ;
-ALTER TABLE osc_categories ADD sortchids_content varchar(150) NULL ;
\ No newline at end of file
Modified: trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_categories.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_categories.sql 2012-04-09 20:39:24 UTC (rev 4187)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_categories.sql 2012-04-10 06:50:47 UTC (rev 4188)
@@ -12,7 +12,9 @@
--+######################################################################--+
-ALTER TABLE osc_categories ADD COLUMN categories_datatype varchar(64) NULL AFTER categories_id;
+ALTER TABLE osc_categories ADD categories_datatype varchar(64) NOT NULL DEFAULT 'product,' COMMENT 'list type separated by ,' AFTER categories_id;
+ALTER TABLE osc_categories ADD categories_cpath varchar(64) NOT NULL AFTER parent_id;
+
ALTER TABLE osc_categories CHANGE sortchids_products sortchids VARCHAR( 150 ) ,
-CHANGE sortchids_content sortchids_datatype VARCHAR( 150 ) ;
\ No newline at end of file
+CHANGE sortchids_content sortchids_datatype VARCHAR( 150 ) ;
Modified: trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_extra_fields_info.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_extra_fields_info.sql 2012-04-09 20:39:24 UTC (rev 4187)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_extra_fields_info.sql 2012-04-10 06:50:47 UTC (rev 4188)
@@ -13,4 +13,4 @@
-DROP TABLE osc_extra_fields_info;
\ No newline at end of file
+DROP TABLE IF EXISTS osc_extra_fields_info;
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-09 20:39:31
|
Revision: 4187
http://oscss.svn.sourceforge.net/oscss/?rev=4187&view=rev
Author: oscim
Date: 2012-04-09 20:39:24 +0000 (Mon, 09 Apr 2012)
Log Message:
-----------
correction coquille
correction bug
mise a niveau du code
Modified Paths:
--------------
trunk/catalog/admin/includes/gabarit/recover_cart_sales/display_view.processconfirm.gab
trunk/catalog/admin/includes/languages/fr_FR/boxes/01_configuration.php
trunk/catalog/admin/includes/languages/fr_FR/configuration.php
trunk/catalog/admin/includes/modules/pages/recover_cart_sales.php
trunk/catalog/common/classes/datatype_drivers/Data_content.php
trunk/catalog/common/classes/datatype_drivers/Data_product.php
trunk/catalog/common/modules/core/seo_modrewrite/SeoR_byfolder.php
trunk/catalog/install/includes/modele/htaccess.txt
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_admin_m_files_to_right.sql
Modified: trunk/catalog/admin/includes/gabarit/recover_cart_sales/display_view.processconfirm.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/recover_cart_sales/display_view.processconfirm.gab 2012-04-09 20:03:31 UTC (rev 4186)
+++ trunk/catalog/admin/includes/gabarit/recover_cart_sales/display_view.processconfirm.gab 2012-04-09 20:39:24 UTC (rev 4187)
@@ -1,9 +1,10 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.1
- @date 18/12/11, 09:40
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 16/03/2012, 16:16
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
Modified: trunk/catalog/admin/includes/languages/fr_FR/boxes/01_configuration.php
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/boxes/01_configuration.php 2012-04-09 20:03:31 UTC (rev 4186)
+++ trunk/catalog/admin/includes/languages/fr_FR/boxes/01_configuration.php 2012-04-09 20:39:24 UTC (rev 4187)
@@ -22,7 +22,6 @@
// define('BOX_HEADING_CONF_OPTION_MODULES_SHIP',"Vue modes livraisons " );
// define('BOX_HEADING_CONF_OPTION_MODULES_TOT',"Vue modes paiements total" );
// define('BOX_HEADING_CONF_CONFIGURATION COMMERCIALE',"Configuration catalogue" );
-// define('BOX_HEADING_CONF_TITLE_BOX_CONFIGURATION_ENVIRONEMENT',"Environement" );
// define('BOX_HEADING_CONF_BOX_CONFIGURATION_ABONNEMENT',"Option des Abonnements" );
// define('BOX_HEADING_CONF_PARAMETERS',"Paramètres" );
// define('BOX_HEADING_LOCATION_AND_TAXES', 'Lieux / Taxes');
Modified: trunk/catalog/admin/includes/languages/fr_FR/configuration.php
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/configuration.php 2012-04-09 20:03:31 UTC (rev 4186)
+++ trunk/catalog/admin/includes/languages/fr_FR/configuration.php 2012-04-09 20:39:24 UTC (rev 4187)
@@ -55,4 +55,6 @@
define('BOX_HEADING_CONF_TITLE_ATTRIBUTE_PRODUCT',"Gestion de l'affichage et du fonctionnement des options de produits" );
define('BOX_HEADING_CONF_TITLE_RECOVER_CART_SALES',"Gestion du système de récupération des panniers client abandonnées" );
define('BOX_HEADING_CONF_TITLE_MEMBRES_DETAIL',"Détail des informations demandées lors de l'inscription d'un membre/client" );
+define('BOX_HEADING_CONF_TITLE_BOX_CONFIGURATION_ENVIRONEMENT',"Environement" );
+
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/modules/pages/recover_cart_sales.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/recover_cart_sales.php 2012-04-09 20:03:31 UTC (rev 4186)
+++ trunk/catalog/admin/includes/modules/pages/recover_cart_sales.php 2012-04-09 20:39:24 UTC (rev 4187)
@@ -1,10 +1,10 @@
<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 18/12/11, 15:32
+ @date 09/04/2012, 15:32
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class recover_cart_sales
@@ -191,10 +191,10 @@
// set new cline and curcus
if ($lastcid != $cid) {
if ($lastcid != "") {
- self::$list[] = array('text' => '<strong>' . TABLE_CART_TOTAL . '</strong>' . $currencies->format($tprice));
+ self::$list[] = array('text' => '<strong>' . __('table cart total') . '</strong>' . $currencies->format($tprice));
self::$list[] = array('text' => '<a class="button" href="' . tep_href_link(FILENAME_RECOVER_CART_SALES, "action=delete&customer_id=" . $cid . "&tdate=" . $this->basedays . "&sdate=" . $this->skipdays) . '">' . tep_image_button('button_delete.gif', IMAGE_DELETE) . '</a>');
}
- self::$list[] = array('text' => '<a class="button" href="' . tep_href_link(FILENAME_CUSTOMERS, 'search=' . $inrec['lname'], 'NONSSL') . '">' . $inrec['fname'] . ' ' . $inrec['lname'] . '</a>' . $customer);
+ self::$list[] = array('text' => '<a class="button" href="' . tep_href_link(FILENAME_CUSTOMERS, 'action=noedit&cID=' . $cid, 'NONSSL') . '">' . $inrec['fname'] . ' ' . $inrec['lname'] . '</a>' . $customer);
$tprice = 0;
}
$lastcid = $cid;
@@ -216,11 +216,11 @@
$pprice_formated = $currencies->format($sprice);
$tpprice_formated = $currencies->format(($inrec['qty'] * $sprice));
- self::$list[] = array('text' => TABLE_HEADING_MODEL . $inrec2['model']);
- self::$list[] = array('text' => TABLE_HEADING_DESCRIPTION . '<a class="button" href="' . tep_href_link(FILENAME_CATEGORIES, 'action=new_product_preview&read=only&pID=' . $inrec['pid'] . '&origin=' . FILENAME_RECOVER_CART_SALES) . '">' . $inrec2['name'] . '</a>');
- self::$list[] = array('text' => TABLE_HEADING_QUANTY . $inrec['qty']);
- self::$list[] = array('text' => TABLE_HEADING_PRICE . $pprice_formated);
- self::$list[] = array('text' => TABLE_HEADING_TOTAL . $tpprice_formated);
+ self::$list[] = array('text' => __('table heading model') . $inrec2['model']);
+ self::$list[] = array('text' => __('table heading description') . '<a class="button" href="' . tep_href_link(FILENAME_PRODUCTS, 'action=edit&pID=' . $inrec['pid'] . '&origin=' . FILENAME_RECOVER_CART_SALES) . '">' . $inrec2['name'] . '</a>');
+ self::$list[] = array('text' => __('table heading quanty') . $inrec['qty']);
+ self::$list[] = array('text' => __('table heading price') . $pprice_formated);
+ self::$list[] = array('text' => __('table heading total') . $tpprice_formated);
if( _cst_bool('EMAIL_USE_HTML')) $mline .= $inrec['qty'] . ' x <a class="button" href="' . tep_catalog_href_link(FILENAME_CATALOG_PRODUCT_INFO, 'products_id='. $inrec['pid']) . '">' . $inrec2['name'] . '</a>' . "\n";
else $mline .= $inrec['qty'] . ' x ' . $inrec2['name'] . "\n";
Modified: trunk/catalog/common/classes/datatype_drivers/Data_content.php
===================================================================
--- trunk/catalog/common/classes/datatype_drivers/Data_content.php 2012-04-09 20:03:31 UTC (rev 4186)
+++ trunk/catalog/common/classes/datatype_drivers/Data_content.php 2012-04-09 20:39:24 UTC (rev 4187)
@@ -48,6 +48,10 @@
@var base listing sql
*/
public $listing_sql;
+ /**
+ @var use in advanced search
+ */
+// public $use_in_search = true;
/**
@brief constructor
@@ -55,6 +59,9 @@
function __construct(){
global $languages_id;
+// $this->use_in_search = _cst_bool('DATA_CONTENT_USEINSEARCH');
+
+
$this->listing_sql['tables'] = " FROM " . TABLE_CONTENT . " ".$this->p." ".
" LEFT JOIN " . TABLE_CONTENT_DESCRIPTION . " ".$this->p."d ON( ".$this->p."d.content_id = ".$this->p.".content_id AND ".$this->p."d.language_id = '" . (int)$languages_id . "' ) ".
"";
Modified: trunk/catalog/common/classes/datatype_drivers/Data_product.php
===================================================================
--- trunk/catalog/common/classes/datatype_drivers/Data_product.php 2012-04-09 20:03:31 UTC (rev 4186)
+++ trunk/catalog/common/classes/datatype_drivers/Data_product.php 2012-04-09 20:39:24 UTC (rev 4187)
@@ -48,6 +48,10 @@
@var base listing sql
*/
public $listing_sql = array();
+ /**
+ @var use in advanced search
+ */
+// public $use_in_search = true;
/**
@brief constructor
@@ -55,6 +59,9 @@
function __construct(){
global $languages_id;
+
+// $this->use_in_search = _cst_bool('DATA_PRODUCT_USEINSEARCH');
+
/// Utiliser dans les appels dynamique
//! TODO Normalisation des nom de tables produits , sans "s"
if(!defined('TABLE_PRODUCT_TO_CATEGORIES'))
Modified: trunk/catalog/common/modules/core/seo_modrewrite/SeoR_byfolder.php
===================================================================
--- trunk/catalog/common/modules/core/seo_modrewrite/SeoR_byfolder.php 2012-04-09 20:03:31 UTC (rev 4186)
+++ trunk/catalog/common/modules/core/seo_modrewrite/SeoR_byfolder.php 2012-04-09 20:39:24 UTC (rev 4187)
@@ -132,6 +132,7 @@
if(isset($obj->anchor)){
$t = 0;
+ if(isset($obj->check))
foreach($obj->check as $key=>$row){
$base[]='%CHECK_'.$t.'_%';
$replace[]=$row;
@@ -139,6 +140,7 @@
}
$t = 0;
+ if(isset($obj->pages))
foreach($obj->pages as $key=>$row){
$base[]='%PAGE_REPLACE_'.$t.'_%';
$replace[]=$row;
@@ -146,6 +148,7 @@
}
$t = 0;
+ if(isset($obj->anchor))
foreach($obj->anchor as $key=>$row){
$tmp[$i] = "\n\n## Datatype - ".$k."";
$i++;
Modified: trunk/catalog/install/includes/modele/htaccess.txt
===================================================================
--- trunk/catalog/install/includes/modele/htaccess.txt 2012-04-09 20:03:31 UTC (rev 4186)
+++ trunk/catalog/install/includes/modele/htaccess.txt 2012-04-09 20:39:24 UTC (rev 4187)
@@ -64,39 +64,6 @@
RewriteRule ^([a-zA-Z_]*)\.(php)$ index.php?%{QUERY_STRING} [L]
-
- ## Error Document
- ## Authorization htaccess & htpassword
- ErrorDocument 401 %WS_DOCUMENT_ROOT%error/401.html
- ## no found
- ErrorDocument 404 %WS_DOCUMENT_ROOT%error/404.html
- ## error in process payment
- ErrorDocument 402 %WS_DOCUMENT_ROOT%checkout_confirmation.php
- ## Bad request
- ErrorDocument 400 %WS_DOCUMENT_ROOT%error/400.html
- ## forbidden Intrustion error
- ErrorDocument 403 %WS_DOCUMENT_ROOT%error/403.html
- ## méthode non autorisée.
- ErrorDocument 405 %WS_DOCUMENT_ROOT%error/405.html
- ## technical error
- ErrorDocument 500 %WS_DOCUMENT_ROOT%error/500.html
- ## le serveur ne supporte pas le service demandé.
- ErrorDocument 501 %WS_DOCUMENT_ROOT%error/501.html
- ## mauvaise passerelle.
- ErrorDocument 502 %WS_DOCUMENT_ROOT%error/502.html
- ## service indisponible.
- ErrorDocument 503 %WS_DOCUMENT_ROOT%error/503.html
- ## trop de temps à la réponse.
- ErrorDocument 504 %WS_DOCUMENT_ROOT%error/504.html
- ## version HTTP non supportée.
- ErrorDocument 505 %WS_DOCUMENT_ROOT%error/505.html
-
-
- # rule for error page
- RewriteRule ^error/([0-9]*).html$ index.php?ServerError=$1 [L]
-
-
-
## Protection
RewriteCond %{QUERY_STRING} (\<|%3C).*script.*(\>|%3E) [NC,OR]
RewriteCond %{QUERY_STRING} (\<|%3C).*(\>|%3E) [NC,OR]
@@ -121,98 +88,95 @@
+## Error Document
+## Authorization htaccess & htpassword
+ ErrorDocument 401 %WS_DOCUMENT_ROOT%error/401.html
+## no found
+ ErrorDocument 404 %WS_DOCUMENT_ROOT%error/404.html
+## error in process payment
+ ErrorDocument 402 %WS_DOCUMENT_ROOT%checkout_confirmation.php
+## Bad request
+ ErrorDocument 400 %WS_DOCUMENT_ROOT%error/400.html
+## forbidden Intrustion error
+ ErrorDocument 403 %WS_DOCUMENT_ROOT%error/403.html
+## méthode non autorisée.
+ ErrorDocument 405 %WS_DOCUMENT_ROOT%error/405.html
+## technical error
+ ErrorDocument 500 %WS_DOCUMENT_ROOT%error/500.html
+## le serveur ne supporte pas le service demandé.
+ ErrorDocument 501 %WS_DOCUMENT_ROOT%error/501.html
+## mauvaise passerelle.
+ ErrorDocument 502 %WS_DOCUMENT_ROOT%error/502.html
+## service indisponible.
+ ErrorDocument 503 %WS_DOCUMENT_ROOT%error/503.html
+## trop de temps à la réponse.
+ ErrorDocument 504 %WS_DOCUMENT_ROOT%error/504.html
+## version HTTP non supportée.
+ ErrorDocument 505 %WS_DOCUMENT_ROOT%error/505.html
- ## Home Et index Ou Home = index
- ## Force Unique Home page
- RewriteRule ^((home|index).(php|html))(.*)$ %WS_DOCUMENT_ROOT% [R=301]
- RewriteRule ^(d/index/index-home.html)$ %WS_DOCUMENT_ROOT% [R=301]
- RewriteRule ^(d/index/index.html)$ %WS_DOCUMENT_ROOT% [R=301]
+# rule for error page
+ RewriteRule ^error/([0-9]*).html index.php?ServerError=$1 [L]
+## Datatype - Data_diver## contact
+ RewriteRule ^contact.(php|html)$ index.php?d=contact.php&%{QUERY_STRING} [L,QSA]
- RewriteCond %{QUERY_STRING} =''
- RewriteRule ^(index)\.(php|html)$ %WS_DOCUMENT_ROOT% [R=301]
+## Move xxxx.php >> xxx.html
+ RewriteCond %{REQUEST_FILENAME} !-f
+ RewriteCond %{REQUEST_FILENAME} !-d
+ #Mode
+ RewriteRule ^([a-zA-Z_]*).(php)$ d/$1/$1.html?&%{QUERY_STRING} [R=301]
+## Datatype - Data_home## Home
+ RewriteCond %{QUERY_STRING} =''
+ RewriteRule ^(([a-z]{2,3}_[A-Z]{2,3})/|)(index).(php|html)$ /oscss/trunk/catalog/ [R=301]
+## Retro-compatibilité
+ ## Account specific pages
+ RewriteRule ^create_account.(php|html)$ create_account.php?%{QUERY_STRING} [L,QSA]
+ RewriteRule ^(.*)account.(php|html)$ account.php?%{QUERY_STRING} [L,QSA]
+ RewriteRule ^(.*)account(_([a-z_]*)).(php|html)$ account.php?action=$3&%{QUERY_STRING} [L,QSA]
+ RewriteRule ^address_([a-z_]*).php$ account.php?aca_mod=address_book&aca_type=account&aca_action=display_view&%{QUERY_STRING}
- ## Home page & index page; two distinct page
-# RewriteRule ^(home.(php|html)) %WS_DOCUMENT_ROOT%index.php?_ID=home.php [L,QSA]
-# RewriteRule ^()$ %WS_DOCUMENT_ROOT%index.php?_ID=home.php [L,QSA]
-# RewriteRule ^(.*)(index.html)$ %WS_DOCUMENT_ROOT%index.php?%{QUERY_STRING} [R=301]
+## RETRO - COMPATIBILITE
+## Move images/ Or images/imagecache/ in document.php?.. if image not defined id in db table
+ # RewriteRule ^images/imagecache/([0-9]*)x([0-9]*)[_](.*)\.([a-z]{3,4})[_](.*)$ document.php?mod=img&i=$3.$4&w=$1&h=$2 [R=301]
+ RewriteRule ^images/(.*)$ document.php?mod=img&i=$1&%{QUERY_STRING} [R=301]
- ## Retro-compatibilité
- ## Account specific pages
- RewriteRule ^create_account.(php|html)$ create_account.php?%{QUERY_STRING} [L,QSA]
- RewriteRule ^(.*)account.(php|html)$ account.php?%{QUERY_STRING} [L,QSA]
- RewriteRule ^(.*)account(_([a-z_]*)).(php|html)$ account.php?action=$3&%{QUERY_STRING} [L,QSA]
- RewriteRule ^address_([a-z_]*).php$ account.php?aca_mod=address_book&aca_type=account&aca_action=display_view&%{QUERY_STRING}
- ## form contact_us
- RewriteRule ^contact.(php|html)$ index.php?d=contact.php&%{QUERY_STRING} [L,QSA]
+## Datatype - Data_product
+RewriteRule ^([a-z]{2,3}_[A-Z]{2,3})/pi/([0-9]*)/(.*).html$ popup_image.php?pID=$2&%{QUERY_STRING} [L]
+RewriteRule ^pi/([0-9]*)/(.*).html$ popup_image.php?pID=$1&%{QUERY_STRING} [L]
- ## Move xxxx.php >> xxx.html
- RewriteCond %{REQUEST_FILENAME} !-f
- RewriteCond %{REQUEST_FILENAME} !-d
- #Mode SEO2 default
- RewriteRule ^([a-zA-Z_]*)\.(php)$ d/$1/$1.html?&%{QUERY_STRING} [R=301]
- ## Mode SEO
- # RewriteRule ^([a-zA-Z_]*)\.(php)$ $1d-$1.html?&%{QUERY_STRING} [R=301]
+## Datatype - Data_product
+RewriteRule ^([a-z]{2,3}_[A-Z]{2,3})/p/([0-9]*)/(.*).html$ index.php?products_id=$2&%{QUERY_STRING} [L]
+RewriteRule ^p/([0-9]*)/(.*).html$ index.php?products_id=$1&%{QUERY_STRING} [L]
- ## RETRO - COMPATIBILITE
- ## Move images/ Or images/imagecache/ in document.php?.. if image not defined id in db table
- # RewriteRule ^images/imagecache/([0-9]*)x([0-9]*)[_](.*)\.([a-z]{3,4})[_](.*)$ document.php?mod=img&i=$3.$4&w=$1&h=$2 [R=301]
- # RewriteRule ^images/(.*)$ document.php?mod=img&i=$1&%{QUERY_STRING} [R=301]
+## Datatype - Data_content
+RewriteRule ^([a-z]{2,3}_[A-Z]{2,3})/t/([0-9]*)/(.*).html$ index.php?content=$2&%{QUERY_STRING} [L]
+RewriteRule ^t/([0-9]*)/(.*).html$ index.php?content=$1&%{QUERY_STRING} [L]
+## Datatype - Data_diver
+RewriteRule ^([a-z]{2,3}_[A-Z]{2,3})/d/([A-Za-z0-9_]*)/(.*).html$ index.php?divers=$2&%{QUERY_STRING} [L]
+RewriteRule ^d/([A-Za-z0-9_]*)/(.*).html$ index.php?divers=$1&%{QUERY_STRING} [L]
-# SEO
- # MODE SEO Rewrite-mode2 (Default)
+## Datatype - Data_categorie
+RewriteRule ^([a-z]{2,3}_[A-Z]{2,3})/c/([0-9_]*)/(.*).html$ index.php?cPath=$2&%{QUERY_STRING} [L]
+RewriteRule ^c/([0-9_]*)/(.*).html$ index.php?cPath=$1&%{QUERY_STRING} [L]
- ## Product page
- ## force cpath product
- RewriteRule ^p/([0-9]*)/c-([0-9_]*)-(.*).html$ index.php?products_id=$1&cPath=$2&%{QUERY_STRING} [L]
- ## default cpath product
- RewriteRule ^p/([0-9]*)/(.*).html$ index.php?products_id=$1&%{QUERY_STRING} [L]
- ## CMS content page
- ## force cpath
- RewriteRule ^t/([0-9]*)/c-([0-9_]*)-(.*).html$ index.php?content=$1&cPath=$2&%{QUERY_STRING} [L]
- ## default cpath
- RewriteRule ^t/([0-9]*)/(.*).html$ index.php?content=$1&%{QUERY_STRING} [L]
+## Datatype - Data_manufacturer
+RewriteRule ^([a-z]{2,3}_[A-Z]{2,3})/m/([0-9]*)/(.*).html$ index.php?manufacturers_id=$2&%{QUERY_STRING} [L]
+RewriteRule ^m/([0-9]*)/(.*).html$ index.php?manufacturers_id=$1&%{QUERY_STRING} [L]
- ## POPUP page image produit
- RewriteRule ^pi/(.*)/(.*).html$ popup_image.php?pID=$1&%{QUERY_STRING} [L]
- ## Categroy page
- RewriteRule ^c/([0-9_]*)/(.*).html$ index.php?cPath=$1&%{QUERY_STRING} [L]
- ## Manufacturer page
- RewriteRule ^m/([0-9]*)/(.*).html$ index.php?manufacturers_id=$1&%{QUERY_STRING} [L]
- ## Divers page
- RewriteRule ^d/(.*)/(.*).html$ index.php?d=$1.php&%{QUERY_STRING} [L]
- ## Public members page
- RewriteRule ^u/([0-9]*)/(.*).html$ index.php?customers_id=$1&%{QUERY_STRING} [L]
+## Datatype - Data_home
+RewriteRule ^([a-z]{2,3}_[A-Z]{2,3})/h/%CHECK_0_%/(.*).html$ %PAGE_REPLACE_0_%?home=$2&%{QUERY_STRING} [L]
+RewriteRule ^h/%CHECK_0_%/(.*).html$ %PAGE_REPLACE_0_%?home=$1&%{QUERY_STRING} [L]
+## Datatype - Data_error
+## Datatype - Data_diver
+## Datatype - Data_home
-# RewriteRule ^b/(.*)/(.*).html$ index.php?content=$1&%{QUERY_STRING} [L]
-# RewriteRule ^pr/(.*)/(.*).html$ index.php?d=listing_reviews.php&products_id=$1&%{QUERY_STRING} [L]
-# RewriteRule ^i/(.*)/(.*).html$ information.php?info_id=$1&%{QUERY_STRING} [L]
-# RewriteRule ^l/(.*)/(.*).html$ $1.php?lID=$1&%{QUERY_STRING} [L]
-
-
- # MODE SEO Rewrite
-# RewriteRule ^(.*)-p-([0-9]*).html$ index.php?products_id=$2&%{QUERY_STRING}
-# RewriteRule ^(.*)-c-([0-9_]*).html$ index.php?cPath=$2&%{QUERY_STRING}
-# RewriteRule ^(.*)-b-(.*).html$ index.php?content=$2&%{QUERY_STRING}
-# RewriteRule ^(.*)-m-([0-9]*).html$ index.php?manufacturers_id=$2&%{QUERY_STRING}
-# RewriteRule ^(.*)-pi-(.*).html$ popup_image.php?pID=$2&%{QUERY_STRING}
-# RewriteRule ^(.*)-t-([0-9]*).html$ index.php?content=$2&%{QUERY_STRING}
-# # RewriteRule ^(.*)-pr-(.*).html$ product_reviews.php?products_id=$2&%{QUERY_STRING}
-# RewriteRule ^(.*)-pr-(.*).html$ index.php?d=listing_reviews.php&products_id=$2&%{QUERY_STRING}
-# # RewriteRule ^(.*)-pri-(.*).html$ product_reviews_info.php?products_id=$2&%{QUERY_STRING}
-# RewriteRule ^(.*)-i-(.*).html$ information.php?info_id=$2&%{QUERY_STRING}
-# RewriteRule ^(.*)-d-(.*).html$ $2.php?divers=$2&%{QUERY_STRING}
-# RewriteRule ^(.*)-l-(.*).html$ $2.php?lID=$2&%{QUERY_STRING} [L]
-# RewriteRule ^(.*)-u-([0-9]*).html$ index.php?customers_id=$2&%{QUERY_STRING} [L]
-
-
</IfModule>
Modified: trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_admin_m_files_to_right.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_admin_m_files_to_right.sql 2012-04-09 20:03:31 UTC (rev 4186)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_admin_m_files_to_right.sql 2012-04-09 20:39:24 UTC (rev 4187)
@@ -16,6 +16,7 @@
CREATE TABLE IF NOT EXISTS osc_admin_m_files_to_right (
files_id int(11) DEFAULT NULL,
type_id int(1) DEFAULT '0',
- id_ref int(11) DEFAULT NULL,
- UNIQUE KEY filesgroup (files_id,type_id,id_ref)
+ ref_id int(11) NOT NULL,
+ action varchar(64) DEFAULT NULL,
+ UNIQUE KEY filesgroup (files_id,type_id,action)
) CHARSET=utf8;
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-09 20:03:38
|
Revision: 4186
http://oscss.svn.sourceforge.net/oscss/?rev=4186&view=rev
Author: oscim
Date: 2012-04-09 20:03:31 +0000 (Mon, 09 Apr 2012)
Log Message:
-----------
Correction erreur de commit
Modified Paths:
--------------
trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.delete.gab
trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.edit.gab
trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.listing.gab
trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.new.gab
trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.value.delete.gab
trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.value.edit.gab
trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.value.listing.gab
trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.value.new.gab
Modified: trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.delete.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.delete.gab 2012-04-09 19:45:16 UTC (rev 4185)
+++ trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.delete.gab 2012-04-09 20:03:31 UTC (rev 4186)
@@ -4,24 +4,24 @@
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 04/03/2012, 21:54
- @author genrated by dev/datatype/generat
+ @date 08/02/2012, 15:38
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
- @brief gabarit for listing extra fields _DATATYPE_REPLACE_
+ @brief gabarit for listing extra fields products
*/
?>
<h3><?php echo HEADING_TITLE ?></h3>
-<h4><?php echo HEADING_DELETE . mod_DATATYPE_REPLACE_extra::$eid ?></h4>
+<h4><?php echo HEADING_DELETE . modprodextra::$eid ?></h4>
-<?php if (mod_DATATYPE_REPLACE_extra::$double_check == 'no') {
- echo '<p>' . TEXT_ARE_SURE . (mod_DATATYPE_REPLACE_extra::$pInfo->uses_list ? TEXT_VALUES_GONE : '') . "</p>\n";
- echo '<p>' . tep_draw_form('yes',mod_DATATYPE_REPLACE_extra::FILENAME, tep_get_all_get_params(array('action','eid','confirm')). 'confirm=yes&action=delete&eid=' . mod_DATATYPE_REPLACE_extra::$eid . '&used=' . mod_DATATYPE_REPLACE_extra::$pInfo->used) . tep_draw_input_field('yes','', TEXT_YES, 'alt="' . TEXT_YES . '"', false, 'submit') . '</form> ';
- echo tep_draw_form('no', mod_DATATYPE_REPLACE_extra::FILENAME, tep_get_all_get_params(array('action','eid','confirm')) .'eid=' . mod_DATATYPE_REPLACE_extra::$eid) . tep_draw_input_field('no','', TEXT_NO, 'alt="' . TEXT_NO . '"', false, 'submit') . "</form></p>\n";
+<?php if (modprodextra::$double_check == 'no') {
+ echo '<p>' . TEXT_ARE_SURE . (modprodextra::$pInfo->uses_list ? TEXT_VALUES_GONE : '') . "</p>\n";
+ echo '<p>' . tep_draw_form('yes',modprodextra::FILENAME, tep_get_all_get_params(array('action','eid','confirm')). 'confirm=yes&action=delete&eid=' . modprodextra::$eid . '&used=' . modprodextra::$pInfo->used) . tep_draw_input_field('yes','', TEXT_YES, 'alt="' . TEXT_YES . '"', false, 'submit') . '</form> ';
+ echo tep_draw_form('no', modprodextra::FILENAME, tep_get_all_get_params(array('action','eid','confirm')) .'eid=' . modprodextra::$eid) . tep_draw_input_field('no','', TEXT_NO, 'alt="' . TEXT_NO . '"', false, 'submit') . "</form></p>\n";
} else {
- echo '<p><b>' . TEXT_CONFIRM_DELETE . (mod_DATATYPE_REPLACE_extra::$pInfo->uses_list ? TEXT_VALUES_GONE : '') . "</b></p>\n";
- echo '<p>' . tep_draw_form('yes', mod_DATATYPE_REPLACE_extra::FILENAME, tep_get_all_get_params(array('action','eid','confirm')). 'confirm=yes&action=delete&eid=' . mod_DATATYPE_REPLACE_extra::$eid) . tep_draw_input_field('yes','', TEXT_YES, 'alt="' . TEXT_YES . '"', false, 'submit') . '</form> ';
- echo tep_draw_form('no', mod_DATATYPE_REPLACE_extra::FILENAME, tep_get_all_get_params(array('action','eid','confirm')).'eid=' . mod_DATATYPE_REPLACE_extra::$eid) . tep_draw_input_field('no','', TEXT_NO, 'alt="' . TEXT_NO . '"', false, 'submit') . "</form></p>\n";
+ echo '<p><b>' . TEXT_CONFIRM_DELETE . (modprodextra::$pInfo->uses_list ? TEXT_VALUES_GONE : '') . "</b></p>\n";
+ echo '<p>' . tep_draw_form('yes', modprodextra::FILENAME, tep_get_all_get_params(array('action','eid','confirm')). 'confirm=yes&action=delete&eid=' . modprodextra::$eid) . tep_draw_input_field('yes','', TEXT_YES, 'alt="' . TEXT_YES . '"', false, 'submit') . '</form> ';
+ echo tep_draw_form('no', modprodextra::FILENAME, tep_get_all_get_params(array('action','eid','confirm')).'eid=' . modprodextra::$eid) . tep_draw_input_field('no','', TEXT_NO, 'alt="' . TEXT_NO . '"', false, 'submit') . "</form></p>\n";
}
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.edit.gab 2012-04-09 19:45:16 UTC (rev 4185)
+++ trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.edit.gab 2012-04-09 20:03:31 UTC (rev 4186)
@@ -4,43 +4,44 @@
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 04/03/2012, 21:54
- @author genrated by dev/datatype/generat
+ @date 08/02/2012, 15:38
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
- @brief gabarit for listing extra fields _DATATYPE_REPLACE_
+ @brief gabarit for listing extra fields products
+
*/
global $action, $languages;
?>
<div class="box_unique">
<h4><?php echo __('heading edit') ?></h4>
- <?php echo tep_draw_form('field_entry',FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','eid','confirm')). 'action=update' . '&confirm=yes&eid=' . mod_DATATYPE_REPLACE_extra::$eid , 'post'); ?>
+ <?php echo tep_draw_form('field_entry',FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','eid','confirm')). 'action=update' . '&confirm=yes&eid=' . modprodextra::$eid , 'post'); ?>
<p>
- <?php echo tep_draw_hidden_field('value_list','value_list', (((int)mod_DATATYPE_REPLACE_extra::$cInfo->epf_uses_value_list==1)? '1' : '0')) ?>
- <?php echo tep_draw_hidden_field('epf_active_value_language','epf_active_value_language', (((int)mod_DATATYPE_REPLACE_extra::$cInfo->epf_active_value_language==1)? '1' : '0')) ?>
+ <?php echo tep_draw_hidden_field('value_list','value_list', (((int)modprodextra::$cInfo->epf_uses_value_list==1)? '1' : '0')) ?>
+ <?php echo tep_draw_hidden_field('epf_active_value_language','epf_active_value_language', (((int)modprodextra::$cInfo->epf_active_value_language==1)? '1' : '0')) ?>
</p>
<fieldset class="tabs_lang block_field">
<ul>
<?php for ($i=0, $n=sizeof($languages); $i<$n; $i++) { ?>
- <li><?php echo '<a href="#_DATATYPE_REPLACE__name-' . ($i+1).'" >' . tep_language_image ( $languages[$i]['directory'] . '/images/' . $languages[$i]['image'], $languages[$i]['name']) . ' ' . $languages[$i]['name'] . '</a>' ?></li>
+ <li><?php echo '<a href="#products_name-' . ($i+1).'" >' . tep_language_image ( $languages[$i]['directory'] . '/images/' . $languages[$i]['image'], $languages[$i]['name']) . ' ' . $languages[$i]['name'] . '</a>' ?></li>
<?php } ?>
</ul>
<?php reset($languages); for ($i=0, $n=sizeof($languages); $i<$n; $i++) { ?>
- <ul id="<?php echo '_DATATYPE_REPLACE__name-'.($i+1) ?>">
+ <ul id="<?php echo 'products_name-'.($i+1) ?>">
<li>
<p class="block_input">
<label for="<?php echo 'label_' . $languages[$i]['id'] ?>" title="<?php echo __('entry label help') ?>"><?php echo __('entry label') ; ?></label>
- <?php echo tep_draw_input_field('label_' . $languages[$i]['id'],'label_' . $languages[$i]['id'], mod_DATATYPE_REPLACE_extra::$cInfo->lg[$languages[$i]['id']]->epf_label, "size=64 maxlength=64") ?>
+ <?php echo tep_draw_input_field('label_' . $languages[$i]['id'],'label_' . $languages[$i]['id'], modprodextra::$cInfo->lg[$languages[$i]['id']]->epf_label, "size=64 maxlength=64") ?>
</p>
</li>
<li>
<p class="block_input">
<label for="<?php echo 'format_' . $languages[$i]['id'] ?>" title="<?php echo __('entry label help') ?>"><?php echo __('entry label format') ; ?></label>
- <?php echo tep_draw_input_field('format_' . $languages[$i]['id'],'format_' . $languages[$i]['id'], mod_DATATYPE_REPLACE_extra::$cInfo->lg[$languages[$i]['id']]->epf_format, "size=64 maxlength=64") ?>
+ <?php echo tep_draw_input_field('format_' . $languages[$i]['id'],'format_' . $languages[$i]['id'], modprodextra::$cInfo->lg[$languages[$i]['id']]->epf_format, "size=64 maxlength=64") ?>
</p>
</li>
</ul>
@@ -51,15 +52,15 @@
<fieldset class="block_field">
<p class="block_input">
<label for="search" title="<?php echo __('entry search help') ?>"><?php echo __('entry search'); ?></label>
- <?php echo tep_draw_radio_field('search','search', '1', (((int)mod_DATATYPE_REPLACE_extra::$cInfo->epf_advanced_search==1)? true : false) ). ' ' .__('text yes'). ' ' . tep_draw_radio_field('search','search', '0', (((int)mod_DATATYPE_REPLACE_extra::$cInfo->epf_advanced_search==0)? true : false) ) . ' ' .__('text no'); ?>
+ <?php echo tep_draw_radio_field('search','search', '1', (((int)modprodextra::$cInfo->epf_advanced_search==1)? true : false) ). ' ' .__('text yes'). ' ' . tep_draw_radio_field('search','search', '0', (((int)modprodextra::$cInfo->epf_advanced_search==0)? true : false) ) . ' ' .__('text no'); ?>
</p>
<p class="block_input">
<label><?php echo __('ENTRY_LISTING') ?></label>
- <?php echo tep_draw_radio_field('listing','listing', '1', (((int)mod_DATATYPE_REPLACE_extra::$cInfo->epf_show_in_listing==1)? true : false) ) . ' ' .__('text yes'). ' ' . tep_draw_radio_field('listing','listing', '0', (((int)mod_DATATYPE_REPLACE_extra::$cInfo->epf_show_in_listing==0)? true : false) ) . ' ' .__('text no'); ?>
+ <?php echo tep_draw_radio_field('listing','listing', '1', (((int)modprodextra::$cInfo->epf_show_in_listing==1)? true : false) ) . ' ' .__('text yes'). ' ' . tep_draw_radio_field('listing','listing', '0', (((int)modprodextra::$cInfo->epf_show_in_listing==0)? true : false) ) . ' ' .__('text no'); ?>
</p>
<p class="block_input">
<label><?php echo __('ENTRY_META') ?></label>
- <?php echo tep_draw_radio_field('meta','meta', '1',(((int)mod_DATATYPE_REPLACE_extra::$cInfo->epf_use_as_meta_keyword==1)? true : false) ) . ' ' .__('text yes'). ' ' . tep_draw_radio_field('meta','meta', '0', (((int)mod_DATATYPE_REPLACE_extra::$cInfo->epf_use_as_meta_keyword==0)? true : false) ) . ' ' .__('text no'); ?>
+ <?php echo tep_draw_radio_field('meta','meta', '1',(((int)modprodextra::$cInfo->epf_use_as_meta_keyword==1)? true : false) ) . ' ' .__('text yes'). ' ' . tep_draw_radio_field('meta','meta', '0', (((int)modprodextra::$cInfo->epf_use_as_meta_keyword==0)? true : false) ) . ' ' .__('text no'); ?>
</p>
</fieldset>
@@ -67,52 +68,52 @@
<fieldset class="block_field">
<p class="block_input">
<label><?php echo __('ENTRY_ORDER') ?></label>
- <?php echo tep_draw_input_field('sort_order','sort_order', (!empty(mod_DATATYPE_REPLACE_extra::$cInfo->epf_order)? mod_DATATYPE_REPLACE_extra::$cInfo->epf_order : '0' ) ); ?>
+ <?php echo tep_draw_input_field('sort_order','sort_order', (!empty(modprodextra::$cInfo->epf_order)? modprodextra::$cInfo->epf_order : '0' ) ); ?>
</p>
<p class="block_input">
<label for="epf_key" title="<?php echo __('ENTRY_UNIQ_KEY_HELP') ?>"><?php echo __('ENTRY_UNIQ_KEY'). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
- <?php echo tep_draw_input_field('epf_key','epf_key', mod_DATATYPE_REPLACE_extra::$cInfo->epf_key); ?>
+ <?php echo tep_draw_input_field('epf_key','epf_key', modprodextra::$cInfo->epf_key); ?>
</p>
<p class="block_input">
<label><?php echo __('ENTRY_USE_ADMIN') ?></label>
- <?php echo tep_draw_radio_field('epf_admin','epf_admin', '1', (((int)mod_DATATYPE_REPLACE_extra::$cInfo->epf_admin==1)? true : false) ) . ' ' .__('text yes'). ' ' . tep_draw_radio_field('epf_admin','epf_admin', '0', (((int)mod_DATATYPE_REPLACE_extra::$cInfo->epf_admin==0)? true : false) ) . ' ' .__('text no'); ?>
+ <?php echo tep_draw_radio_field('epf_admin','epf_admin', '1', (((int)modprodextra::$cInfo->epf_admin==1)? true : false) ) . ' ' .__('text yes'). ' ' . tep_draw_radio_field('epf_admin','epf_admin', '0', (((int)modprodextra::$cInfo->epf_admin==0)? true : false) ) . ' ' .__('text no'); ?>
</p>
<p class="block_input">
<label for="epf_special_mod" title="<?php echo __('ENTRY_SPECIFIQUE_MODULE_HELP') ?>"><?php echo __('ENTRY_SPECIFIQUE_MODULE'). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
- <?php echo tep_draw_input_field('epf_special_mod','epf_special_mod', mod_DATATYPE_REPLACE_extra::$cInfo->epf_special_mod); ?>
+ <?php echo tep_draw_input_field('epf_special_mod','epf_special_mod', modprodextra::$cInfo->epf_special_mod); ?>
</p>
<p class="block_input">
<label><?php echo __('ENTRY_CHAIN') ?></label>
- <?php echo tep_draw_radio_field('chain','chain', '1', (((int)mod_DATATYPE_REPLACE_extra::$cInfo->epf_show_parent_chain==1)? true : false) ) . ' ' .__('text yes'). ' ' . tep_draw_radio_field('chain','chain', '0', (((int)mod_DATATYPE_REPLACE_extra::$cInfo->epf_show_parent_chain==0)? true : false)) . ' ' .__('text no'); ?>
+ <?php echo tep_draw_radio_field('chain','chain', '1', (((int)modprodextra::$cInfo->epf_show_parent_chain==1)? true : false) ) . ' ' .__('text yes'). ' ' . tep_draw_radio_field('chain','chain', '0', (((int)modprodextra::$cInfo->epf_show_parent_chain==0)? true : false)) . ' ' .__('text no'); ?>
</p>
</fieldset>
- <?php if ($action == 'new' || (!mod_DATATYPE_REPLACE_extra::$cInfo->epf_uses_value_list) ) : ?>
+ <?php if ($action == 'new' || (!modprodextra::$cInfo->epf_uses_value_list) ) : ?>
<fieldset class="block_field">
<p class="block_input">
<label for="restrict" title="<?php echo __('ENTRY_RESTRICT_HELP') ?>"><?php echo __('ENTRY_RESTRICT'). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
- <?php echo tep_draw_radio_field('restrict','restrict', '1',(((int)mod_DATATYPE_REPLACE_extra::$cInfo->epf_use_to_restrict_listings==1)? true : false)) . ' ' .__('text yes'). ' ' . tep_draw_radio_field('restrict','restrict', '0',(((int)mod_DATATYPE_REPLACE_extra::$cInfo->epf_use_to_restrict_listings==0)? true : false) ) . ' ' .__('text no'); ?>
+ <?php echo tep_draw_radio_field('restrict','restrict', '1',(((int)modprodextra::$cInfo->epf_use_to_restrict_listings==1)? true : false)) . ' ' .__('text yes'). ' ' . tep_draw_radio_field('restrict','restrict', '0',(((int)modprodextra::$cInfo->epf_use_to_restrict_listings==0)? true : false) ) . ' ' .__('text no'); ?>
</p>
<p class="block_input">
<label for="size" title="<?php echo __('ENTRY_SIZE_HELP') ?>"><?php echo __('ENTRY_SIZE'). tep_image(DIR_WS_ICONS . 'icon_help.gif') ?></label>
- <?php echo tep_draw_input_field('size','size', mod_DATATYPE_REPLACE_extra::$cInfo->epf_size,'',true); ?>
+ <?php echo tep_draw_input_field('size','size', modprodextra::$cInfo->epf_size,'',true); ?>
</p>
</fieldset>
<?php else: ?>
- <p><?php echo tep_draw_hidden_field('size','size', mod_DATATYPE_REPLACE_extra::$cInfo->epf_size ) .tep_draw_hidden_field('restrict','restrict', mod_DATATYPE_REPLACE_extra::$cInfo->restrict,(((int)mod_DATATYPE_REPLACE_extra::$cInfo->restrict==1)? '1' : '0')) ?></p>
+ <p><?php echo tep_draw_hidden_field('size','size', modprodextra::$cInfo->epf_size ) .tep_draw_hidden_field('restrict','restrict', modprodextra::$cInfo->restrict,(((int)modprodextra::$cInfo->restrict==1)? '1' : '0')) ?></p>
<?php endif; ?>
<div class="button_nav">
- <?php echo tep_image_submit('button_save.gif', IMAGE_SAVE) . ' <a class="button" href="' . tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','flag','eid')) . 'eid=' . mod_DATATYPE_REPLACE_extra::$eid) . '">' . IMAGE_CANCEL . "</a>\n" ?>
+ <?php echo tep_image_submit('button_save.gif', IMAGE_SAVE) . ' <a class="button" href="' . tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','flag','eid')) . 'eid=' . modprodextra::$eid) . '">' . IMAGE_CANCEL . "</a>\n" ?>
</div>
</form>
Modified: trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.listing.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.listing.gab 2012-04-09 19:45:16 UTC (rev 4185)
+++ trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.listing.gab 2012-04-09 20:03:31 UTC (rev 4186)
@@ -1,13 +1,13 @@
<?php
/**
- @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 04/03/2012, 21:54
- @author genrated by dev/datatype/generat
+ @date 24/10/11, 15:38
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
- @brief gabarit for listing extra fields _DATATYPE_REPLACE_
+ @brief gabarit for listing extra fields products
*/
?>
@@ -19,7 +19,7 @@
<h3><?php echo __('HEADING_TITLE') ?></h3>
<div class="button_nav">
- <?php printf(CsrtAction::getLink('button_nav', __('BUTTON_NEW') ), '', tep_href_link(mod_DATATYPE_REPLACE_extra::FILENAME, FILENAME_CFG__DATATYPE_REPLACE_SEOTAG_. '&list_id=&vid=&action=new') ,'' );?>
+ <?php printf(CsrtAction::getLink('button_nav', __('BUTTON_NEW') ), '', tep_href_link(modprodextra::FILENAME, FILENAME_CFG_34. '&list_id=&vid=&action=new') ,'' );?>
</div>
<div class="box_uniq">
@@ -37,19 +37,19 @@
</tr>
</thead>
<tbody>
- <?php foreach(mod_DATATYPE_REPLACE_extra::$list as $epf) {?>
+ <?php foreach(modprodextra::$list as $epf) {?>
<tr class="dataTableRow">
<td class="dataTableContent"><?php echo $epf->epf_id; ?></td>
<td class="dataTableContent">
<?php $label_query = tep_db_query("select languages_id, epf_label from " . TABLE_PRODUCTS_EXTRA_FIELDS_LABELS . " where (epf_id = " . (int)$epf->epf_id . ") ");
while ($label = tep_db_fetch_array($label_query)) {
- echo tep_image(DIR_WS_CATALOG_LANGUAGES . mod_DATATYPE_REPLACE_extra::$lang[$label['languages_id']]['directory'] . '/images/' . mod_DATATYPE_REPLACE_extra::$lang[$label['languages_id']]['image'], mod_DATATYPE_REPLACE_extra::$lang[$label['languages_id']]['name']) . ' ' . $label['epf_label'] . '<br>';
+ echo tep_image(DIR_WS_CATALOG_LANGUAGES . modprodextra::$lang[$label['languages_id']]['directory'] . '/images/' . modprodextra::$lang[$label['languages_id']]['image'], modprodextra::$lang[$label['languages_id']]['name']) . ' ' . $label['epf_label'] . '<br>';
}
?>
</td>
<td class="tcenter"><?php echo $epf->epf_order; ?></td>
<td class="tcenter">
- <?php echo mod_DATATYPE_REPLACE_extra::get_item_status($epf); ?>
+ <?php echo modprodextra::get_item_status($epf); ?>
</td>
<td class="tcenter">
<?php echo ExtraUtility::GetInputVisibility($epf->epf_admin, true); ?>
@@ -62,7 +62,7 @@
<?php echo $epf->epf_special_mod ?>
</td>
<td class="row_action">
- <?php echo mod_DATATYPE_REPLACE_extra::get_item_action($epf); ?>
+ <?php echo modprodextra::get_item_action($epf); ?>
</td>
</tr>
<?php } ?>
Modified: trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.new.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.new.gab 2012-04-09 19:45:16 UTC (rev 4185)
+++ trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.new.gab 2012-04-09 20:03:31 UTC (rev 4186)
@@ -4,16 +4,16 @@
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 04/03/2012, 21:54
- @author genrated by dev/datatype/generat
+ @date 08/02/2012, 15:38
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
- @brief gabarit for listing extra fields _DATATYPE_REPLACE_, create new entry
+ @brief gabarit for listing extra fields products, create new entry
*/
global $action, $languages;
?>
<div class="box_unique">
- <h4><?php echo (($action != 'edit')? __('heading extra fields list add value') : __('heading extra fields list edit value') . mod_DATATYPE_REPLACE_extra::$eid ) ?></h4>
+ <h4><?php echo (($action != 'edit')? __('heading extra fields list add value') : __('heading extra fields list edit value') . modprodextra::$eid ) ?></h4>
<?php echo tep_draw_form('field_entry',FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','eid','confirm')). 'action=insert', 'post'); ?>
@@ -23,28 +23,28 @@
<fieldset class="block_field">
<label><?php echo __('entry type input') ?></label>
- <?php //echo tep_draw_radio_field('value_list','value_list', '1',(((int)mod_DATATYPE_REPLACE_extra::$cInfo->epf_uses_value_list==1)? true : false)) . ' ' .__('TEXT_YES'). ' ' . tep_draw_radio_field('value_list','value_list', '0',(((int)mod_DATATYPE_REPLACE_extra::$cInfo->epf_uses_value_list==0)? true : false)) . ' ' .__('TEXT_NO'); ?>
+ <?php //echo tep_draw_radio_field('value_list','value_list', '1',(((int)modprodextra::$cInfo->epf_uses_value_list==1)? true : false)) . ' ' .__('TEXT_YES'). ' ' . tep_draw_radio_field('value_list','value_list', '0',(((int)modprodextra::$cInfo->epf_uses_value_list==0)? true : false)) . ' ' .__('TEXT_NO'); ?>
<ul class="block_input">
- <li><?php echo tep_draw_radio_field('epf_input_type','epf_input_type', 0, (mod_DATATYPE_REPLACE_extra::$cInfo->epf_input_type==0) ? true : false) . __('entry list type input') ?></li>
- <li><?php echo tep_draw_radio_field('epf_input_type','epf_input_type', 1, (mod_DATATYPE_REPLACE_extra::$cInfo->epf_input_type==1) ? true : false) . __('entry list type textarea') ?></li>
- <li><?php echo tep_draw_radio_field('epf_input_type','epf_input_type', 2, (mod_DATATYPE_REPLACE_extra::$cInfo->epf_input_type==2) ? true : false) . __('entry list type radio') ?></li>
- <li><?php echo tep_draw_radio_field('epf_input_type','epf_input_type', 5, (mod_DATATYPE_REPLACE_extra::$cInfo->epf_input_type==5) ? true : false) . __('entry list type hidden') ?></li>
+ <li><?php echo tep_draw_radio_field('epf_input_type','epf_input_type', 0, (modprodextra::$cInfo->epf_input_type==0) ? true : false) . __('entry list type input') ?></li>
+ <li><?php echo tep_draw_radio_field('epf_input_type','epf_input_type', 1, (modprodextra::$cInfo->epf_input_type==1) ? true : false) . __('entry list type textarea') ?></li>
+ <li><?php echo tep_draw_radio_field('epf_input_type','epf_input_type', 2, (modprodextra::$cInfo->epf_input_type==2) ? true : false) . __('entry list type radio') ?></li>
+ <li><?php echo tep_draw_radio_field('epf_input_type','epf_input_type', 5, (modprodextra::$cInfo->epf_input_type==5) ? true : false) . __('entry list type hidden') ?></li>
</ul>
<ul class="block_input">
- <li><?php echo tep_draw_radio_field('epf_input_type','epf_input_type', 3, (mod_DATATYPE_REPLACE_extra::$cInfo->epf_input_type==3) ? true : false) . __('entry list type checkbox') ?></li>
- <li><?php echo tep_draw_radio_field('epf_input_type','epf_input_type', 7, (mod_DATATYPE_REPLACE_extra::$cInfo->epf_input_type==7) ? true : false) . __('entry list type checkbox multi') ?></li>
- <li><?php echo tep_draw_radio_field('epf_input_type','epf_input_type', 4, (mod_DATATYPE_REPLACE_extra::$cInfo->epf_input_type==4) ? true : false) . __('entry list type select') ?></li>
- <li><?php echo tep_draw_radio_field('epf_input_type','epf_input_type', 6, (mod_DATATYPE_REPLACE_extra::$cInfo->epf_input_type==6) ? true : false) . __('entry list type select multi') ?></li>
+ <li><?php echo tep_draw_radio_field('epf_input_type','epf_input_type', 3, (modprodextra::$cInfo->epf_input_type==3) ? true : false) . __('entry list type checkbox') ?></li>
+ <li><?php echo tep_draw_radio_field('epf_input_type','epf_input_type', 7, (modprodextra::$cInfo->epf_input_type==7) ? true : false) . __('entry list type checkbox multi') ?></li>
+ <li><?php echo tep_draw_radio_field('epf_input_type','epf_input_type', 4, (modprodextra::$cInfo->epf_input_type==4) ? true : false) . __('entry list type select') ?></li>
+ <li><?php echo tep_draw_radio_field('epf_input_type','epf_input_type', 6, (modprodextra::$cInfo->epf_input_type==6) ? true : false) . __('entry list type select multi') ?></li>
</ul>
</fieldset>
<p class="block_input">
<label for="epf_active_value_language" title="<?php echo __('ENTRY_ACTIVE_HELP') ?>"><?php echo __('ENTRY_ACTIVE') ?></label>
- <?php echo tep_draw_radio_field('epf_active_value_language' ,'epf_active_value_language' , '1', (((int)mod_DATATYPE_REPLACE_extra::$cInfo->epf_active_value_language==1)? true : false) ) . ' ' . __('text yes') .
- ' ' . tep_draw_radio_field('epf_active_value_language' ,'epf_active_value_language', '0', (((int)mod_DATATYPE_REPLACE_extra::$cInfo->epf_active_value_language==0)? true : false) ) . ' ' . __('text no'); ?>
+ <?php echo tep_draw_radio_field('epf_active_value_language' ,'epf_active_value_language' , '1', (((int)modprodextra::$cInfo->epf_active_value_language==1)? true : false) ) . ' ' . __('text yes') .
+ ' ' . tep_draw_radio_field('epf_active_value_language' ,'epf_active_value_language', '0', (((int)modprodextra::$cInfo->epf_active_value_language==0)? true : false) ) . ' ' . __('text no'); ?>
</p>
@@ -52,10 +52,10 @@
<div class="button_nav">
- <?php echo tep_image_submit('button_save.gif', __('mod_DATATYPE_REPLACE_extra extra label add')) .
- tep_js_back(tep_href_link(mod_DATATYPE_REPLACE_extra::FILENAME, tep_get_all_get_params(array('action','flag','eid')) ), IMAGE_CANCEL) ;
+ <?php echo tep_image_submit('button_save.gif', __('modprodextra extra label add')) .
+ tep_js_back(tep_href_link(modprodextra::FILENAME, tep_get_all_get_params(array('action','flag','eid')) ), IMAGE_CANCEL) ;
-// ' <a class="button" href="' . tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','flag','eid')) . 'eid=' . mod_DATATYPE_REPLACE_extra::$eid) . '">' . IMAGE_CANCEL . "</a>\n" ?>
+// ' <a class="button" href="' . tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','flag','eid')) . 'eid=' . modprodextra::$eid) . '">' . IMAGE_CANCEL . "</a>\n" ?>
</div>
</form>
Modified: trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.value.delete.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.value.delete.gab 2012-04-09 19:45:16 UTC (rev 4185)
+++ trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.value.delete.gab 2012-04-09 20:03:31 UTC (rev 4186)
@@ -4,21 +4,21 @@
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 04/03/2012, 21:54
- @author genrated by dev/datatype/generat
+ @date 08/02/2012, 15:38
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
- @brief gabarit for listing extra fields _DATATYPE_REPLACE_
+ @brief gabarit for listing extra fields products
*/
?>
<h3><?php echo __('heading delete value') ?></h3>
-<?php echo tep_draw_form('yes', mod_DATATYPE_REPLACE_extra::FILENAME, tep_get_all_get_params(array('action','eid','confirm')). 'action=delete_value_confirm&eid=' . mod_DATATYPE_REPLACE_extra::$eid.'&vid='.$_GET['vid']) ?>
+<?php echo tep_draw_form('yes', modprodextra::FILENAME, tep_get_all_get_params(array('action','eid','confirm')). 'action=delete_value_confirm&eid=' . modprodextra::$eid.'&vid='.$_GET['vid']) ?>
<p><?php echo __('text delete value') ?>
<fieldset class="block_input button_nav">
- <?php print tep_image_submit('button_delete.gif', IMAGE_DELETE) . tep_js_back(tep_href_link(mod_DATATYPE_REPLACE_extra::FILENAME, 'eid=' . mod_DATATYPE_REPLACE_extra::$eid ), IMAGE_CANCEL) ; ?>
+ <?php print tep_image_submit('button_delete.gif', IMAGE_DELETE) . tep_js_back(tep_href_link(modprodextra::FILENAME, 'eid=' . modprodextra::$eid ), IMAGE_CANCEL) ; ?>
</fieldset>
</form>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.value.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.value.edit.gab 2012-04-09 19:45:16 UTC (rev 4185)
+++ trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.value.edit.gab 2012-04-09 20:03:31 UTC (rev 4186)
@@ -4,10 +4,10 @@
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 04/03/2012, 21:54
- @author genrated by dev/datatype/generat
+ @date 08/02/2012, 15:38
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
- @brief gabarit for listing extra fields _DATATYPE_REPLACE_
+ @brief gabarit for listing extra fields products
*/
global $action, $languages;
@@ -16,7 +16,7 @@
-<?php echo tep_draw_form('value_entry', FILENAME_CONFIGURATION,FILENAME_CFG__DATATYPE_REPLACE_SEOTAG_.'action=' . (($action == 'value_new') ? 'value_insert' : 'value_update') . '&eid=' . mod_DATATYPE_REPLACE_extra::$eid . '&vid=' . $_GET['vid'], 'post'); ?>
+<?php echo tep_draw_form('value_entry', FILENAME_CONFIGURATION,FILENAME_CFG_34.'action=' . (($action == 'value_new') ? 'value_insert' : 'value_update') . '&eid=' . modprodextra::$eid . '&vid=' . $_GET['vid'], 'post'); ?>
<div class="tabs_lang">
<ul>
@@ -30,11 +30,11 @@
<fieldset id="<?php echo 'lang-'.($i+1) ?>">
<p class="block_input">
<label for="<?php echo 'sort_order[' . $languages[$i]['id'].']' ?>" title="<?php echo __('entry value sort help') ?>"><?php echo __('entry value sort'); ?></label>
- <?php echo tep_draw_input_field('sort_order['.$languages[$i]['id'].']','sort_order_'.$languages[$i]['id'],mod_DATATYPE_REPLACE_extra::$cInfo[$languages[$i]['id']]['sort_order']) ; ?>
+ <?php echo tep_draw_input_field('sort_order['.$languages[$i]['id'].']','sort_order_'.$languages[$i]['id'],modprodextra::$cInfo[$languages[$i]['id']]['sort_order']) ; ?>
</p>
<p class="block_input">
<label for="<?php echo 'value[' . $languages[$i]['id'].']' ?>" title="<?php echo __('entry value value help') ?>"><?php echo __('entry value value') ; ?></label>
- <?php echo tep_draw_input_field('value['.$languages[$i]['id'].']','value_'.$languages[$i]['id'], mod_DATATYPE_REPLACE_extra::$cInfo[$languages[$i]['id']]['epf_value'], 'size=64 maxlength=64'); ?>
+ <?php echo tep_draw_input_field('value['.$languages[$i]['id'].']','value_'.$languages[$i]['id'], modprodextra::$cInfo[$languages[$i]['id']]['epf_value'], 'size=64 maxlength=64'); ?>
</p>
</fieldset>
@@ -44,8 +44,8 @@
<div class="button_nav">
- <?php echo tep_js_back(tep_href_link(mod_DATATYPE_REPLACE_extra::FILENAME,FILENAME_CFG__DATATYPE_REPLACE_SEOTAG_), __('listing fields') ); ?>
- <?php echo tep_js_back(tep_href_link(mod_DATATYPE_REPLACE_extra::FILENAME,FILENAME_CFG__DATATYPE_REPLACE_SEOTAG_.'eid='.mod_DATATYPE_REPLACE_extra::$eid.'&action=value_listing'), __('listing value fields') ); ?>
+ <?php echo tep_js_back(tep_href_link(modprodextra::FILENAME,FILENAME_CFG_34), __('listing fields') ); ?>
+ <?php echo tep_js_back(tep_href_link(modprodextra::FILENAME,FILENAME_CFG_34.'eid='.modprodextra::$eid.'&action=value_listing'), __('listing value fields') ); ?>
<?php echo tep_image_submit('button_save.gif', IMAGE_SAVE) ?>
Modified: trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.value.listing.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.value.listing.gab 2012-04-09 19:45:16 UTC (rev 4185)
+++ trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.value.listing.gab 2012-04-09 20:03:31 UTC (rev 4186)
@@ -1,21 +1,21 @@
<?php
/**
- @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 04/03/2012, 21:54
- @author genrated by dev/datatype/generat
+ @date 24/10/11, 15:38
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
- @brief gabarit for listing extra fields _DATATYPE_REPLACE_
+ @brief gabarit for listing extra fields products
*/
global $action, $languages;
?>
<div class="button_nav">
- <?php printf(CsrtAction::getLink('button_nav', __('listing fields') ), '', tep_href_link(mod_DATATYPE_REPLACE_extra::FILENAME, FILENAME_CFG__DATATYPE_REPLACE_SEOTAG_. 'eid='.mod_DATATYPE_REPLACE_extra::$eid.'&list_id=&vid=&parent=') ,'' );?>
- <?php printf(CsrtAction::getLink('button_nav', __('BUTTON_VALUE_ADD_LIST') ), '', tep_href_link(mod_DATATYPE_REPLACE_extra::FILENAME, FILENAME_CFG__DATATYPE_REPLACE_SEOTAG_. 'eid='.mod_DATATYPE_REPLACE_extra::$eid.'&list_id=&vid=&parent=&action=value_new') ,'' );?>
+ <?php printf(CsrtAction::getLink('button_nav', __('listing fields') ), '', tep_href_link(modprodextra::FILENAME, FILENAME_CFG_34. 'eid='.modprodextra::$eid.'&list_id=&vid=&parent=') ,'' );?>
+ <?php printf(CsrtAction::getLink('button_nav', __('BUTTON_VALUE_ADD_LIST') ), '', tep_href_link(modprodextra::FILENAME, FILENAME_CFG_34. 'eid='.modprodextra::$eid.'&list_id=&vid=&parent=&action=value_new') ,'' );?>
</div>
<table class="dataTable" >
@@ -29,14 +29,14 @@
</tr>
</thead>
<tbody>
- <?php foreach (mod_DATATYPE_REPLACE_extra::$list[0] as $k=>$value): ?>
+ <?php foreach (modprodextra::$list[0] as $k=>$value): ?>
<tr class="dataTableRow">
<td class="tcenter"><?php echo $value['value_id']; ?></td>
<td><?php echo $value['epf_value']; ?></td>
<td class="tcenter"><?php echo $value['parent_id']; ?></td>
<td class="tcenter"><?php echo $value['sort_order']; ?></td>
<td class="row_action">
- <?php echo mod_DATATYPE_REPLACE_extra::get_item_value_action($value); ?>
+ <?php echo modprodextra::get_item_value_action($value); ?>
</tr>
<?php endforeach; ?>
Modified: trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.value.new.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.value.new.gab 2012-04-09 19:45:16 UTC (rev 4185)
+++ trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.value.new.gab 2012-04-09 20:03:31 UTC (rev 4186)
@@ -4,16 +4,16 @@
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 04/03/2012, 21:54
- @author genrated by dev/datatype/generat
+ @date 08/02/2012, 15:38
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
- @brief gabarit for listing extra fields _DATATYPE_REPLACE_, create new entry
+ @brief gabarit for listing extra fields products, create new entry
*/
global $action, $languages;
?>
<div class="box_unique">
- <h4><?php echo (($action == 'edit')? __('HEADING_NEW') : __('HEADING_EDIT') . mod_DATATYPE_REPLACE_extra::$eid ) ?></h4>
+ <h4><?php echo (($action == 'edit')? __('HEADING_NEW') : __('HEADING_EDIT') . modprodextra::$eid ) ?></h4>
<?php echo tep_draw_form('field_entry',FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','eid','confirm')). 'action=insert', 'post'); ?>
@@ -23,14 +23,14 @@
<p class="block_input">
<label><?php echo __('ENTRY_VALUE_LIST') ?></label>
- <?php echo tep_draw_radio_field('value_list','value_list', '1',(((int)mod_DATATYPE_REPLACE_extra::$cInfo['epf_uses_value_list']==1)? true : false)) . ' ' .__('TEXT_YES'). ' ' . tep_draw_radio_field('value_list','value_list', '0',(((int)mod_DATATYPE_REPLACE_extra::$cInfo['epf_uses_value_list']==0)? true : false)) . ' ' .__('TEXT_NO'); ?>
+ <?php echo tep_draw_radio_field('value_list','value_list', '1',(((int)modprodextra::$cInfo['epf_uses_value_list']==1)? true : false)) . ' ' .__('TEXT_YES'). ' ' . tep_draw_radio_field('value_list','value_list', '0',(((int)modprodextra::$cInfo['epf_uses_value_list']==0)? true : false)) . ' ' .__('TEXT_NO'); ?>
</p>
<p class="block_input">
<label for="epf_active_for_language" title="<?php echo __('ENTRY_ACTIVE_HELP') ?>"><?php echo __('ENTRY_ACTIVE'). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
- <?php echo tep_draw_radio_field('epf_active_for_language' ,'epf_active_for_language' , '1', (((int)mod_DATATYPE_REPLACE_extra::$cInfo['epf_active_for_language']==1)? true : false) ) . ' ' . __('TEXT_YES') .
- ' ' . tep_draw_radio_field('epf_active_for_language' ,'epf_active_for_language', '0', (((int)mod_DATATYPE_REPLACE_extra::$cInfo['epf_active_for_language']==0)? true : false) ) . ' ' . __('TEXT_NO'); ?>
+ <?php echo tep_draw_radio_field('epf_active_for_language' ,'epf_active_for_language' , '1', (((int)modprodextra::$cInfo['epf_active_for_language']==1)? true : false) ) . ' ' . __('TEXT_YES') .
+ ' ' . tep_draw_radio_field('epf_active_for_language' ,'epf_active_for_language', '0', (((int)modprodextra::$cInfo['epf_active_for_language']==0)? true : false) ) . ' ' . __('TEXT_NO'); ?>
</p>
@@ -38,10 +38,10 @@
<div class="button_nav">
- <?php echo tep_image_submit('button_save.gif', __('mod_DATATYPE_REPLACE_extra extra label add')) .
- tep_js_back(tep_href_link(mod_DATATYPE_REPLACE_extra::FILENAME, tep_get_all_get_params(array('action','flag','eid')) ), IMAGE_CANCEL) ;
+ <?php echo tep_image_submit('button_save.gif', __('modprodextra extra label add')) .
+ tep_js_back(tep_href_link(modprodextra::FILENAME, tep_get_all_get_params(array('action','flag','eid')) ), IMAGE_CANCEL) ;
-// ' <a class="button" href="' . tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','flag','eid')) . 'eid=' . mod_DATATYPE_REPLACE_extra::$eid) . '">' . IMAGE_CANCEL . "</a>\n" ?>
+// ' <a class="button" href="' . tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','flag','eid')) . 'eid=' . modprodextra::$eid) . '">' . IMAGE_CANCEL . "</a>\n" ?>
</div>
</form>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-09 19:45:22
|
Revision: 4185
http://oscss.svn.sourceforge.net/oscss/?rev=4185&view=rev
Author: oscim
Date: 2012-04-09 19:45:16 +0000 (Mon, 09 Apr 2012)
Log Message:
-----------
coquille erreur de nom de fichier
Added Paths:
-----------
trunk/catalog/admin/includes/gabarit/recover_cart_sales/display_view.processconfirm.gab
Copied: trunk/catalog/admin/includes/gabarit/recover_cart_sales/display_view.processconfirm.gab (from rev 4183, trunk/catalog/admin/includes/gabarit/recover_cart_sales/display_view.porcessconfirm.gab)
===================================================================
--- trunk/catalog/admin/includes/gabarit/recover_cart_sales/display_view.processconfirm.gab (rev 0)
+++ trunk/catalog/admin/includes/gabarit/recover_cart_sales/display_view.processconfirm.gab 2012-04-09 19:45:16 UTC (rev 4185)
@@ -0,0 +1,23 @@
+<?php
+/**
+ @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 18/12/11, 09:40
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+?>
+<h3><?php echo __('table heading customer'); ?></h3>
+
+
+<div class="box_left">
+ <?php foreach(recover_cart_sales::$list as $item): ?>
+ <p><?php echo $item['text'] ?></p>
+ <?php endforeach; ?>
+</div>
+
+
+ <div class="block_input button_nav">
+ <?php print tep_image_submit('button_delete.gif', IMAGE_DELETE) . tep_js_back(tep_href_link(recover_cart_sales::FILENAME,recover_cart_sales::RepostDate()), IMAGE_CANCEL) ; ?>
+ </div>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-09 16:39:07
|
Revision: 4184
http://oscss.svn.sourceforge.net/oscss/?rev=4184&view=rev
Author: oscim
Date: 2012-04-09 16:38:59 +0000 (Mon, 09 Apr 2012)
Log Message:
-----------
Refonte complete de la recherche, et utilisation a travers les datatypes, un GET precise le datatype, ou celui par defaut product
Modified Paths:
--------------
trunk/catalog/advanced_search.php
trunk/catalog/common/classes/DataTypes.php
trunk/catalog/common/classes/datatype_drivers/Data_categorie.php
trunk/catalog/common/classes/datatype_drivers/Data_content.php
trunk/catalog/common/classes/datatype_drivers/Data_product.php
trunk/catalog/includes/languages/fr_FR/advanced_search.php
Modified: trunk/catalog/advanced_search.php
===================================================================
--- trunk/catalog/advanced_search.php 2012-04-09 16:32:35 UTC (rev 4183)
+++ trunk/catalog/advanced_search.php 2012-04-09 16:38:59 UTC (rev 4184)
@@ -16,275 +16,74 @@
require(DIR_WS_FUNCTIONS.'search.php');
$page->init(basename(__FILE__),$language);
- $error = false;
-// if ( (isset($_GET['keywords']) && empty($_GET['keywords'])) &&
-// (isset($_GET['dfrom']) && (empty($_GET['dfrom']) || ($_GET['dfrom'] == DOB_FORMAT_STRING))) &&
-// (isset($_GET['dto']) && (empty($_GET['dto']) || ($_GET['dto'] == DOB_FORMAT_STRING))) &&
-// (isset($_GET['pfrom']) && !is_numeric($_GET['pfrom'])) &&
-// (isset($_GET['pto']) && !is_numeric($_GET['pto'])) ) {
-// $error = true;
-//
-// $page->messageStack->add('search', ERROR_AT_LEAST_ONE_INPUT);
-// } else {
- $dfrom = '';
- $dto = '';
- $pfrom = '';
- $pto = '';
- $keywords = '';
- if (isset($_GET['dfrom'])) $dfrom = (($_GET['dfrom'] == DOB_FORMAT_STRING) ? '' : $_GET['dfrom']);
- if (isset($_GET['dto'])) $dto = (($_GET['dto'] == DOB_FORMAT_STRING) ? '' : $_GET['dto']);
- if (isset($_GET['pfrom'])) $pfrom = $_GET['pfrom'];
- if (isset($_GET['pto'])) $pto = $_GET['pto'];
- if (isset($_GET['keywords'])) $keywords = $_GET['keywords'];
- $date_check_error = false;
- if (tep_not_null($dfrom)) {
- if (!tep_checkdate($dfrom, DOB_FORMAT_STRING, $dfrom_array)) {
- $error = true;
- $date_check_error = true;
- $page->messageStack->add_session('search', ERROR_INVALID_FROM_DATE);
- }
- }
- if (tep_not_null($dto)) {
- if (!tep_checkdate($dto, DOB_FORMAT_STRING, $dto_array)) {
- $error = true;
- $date_check_error = true;
+ $dfrom = '';
+ $dto = '';
+ $pfrom = '';
+ $pto = '';
+ $keywords = '';
- $page->messageStack->add_session('search', ERROR_INVALID_TO_DATE);
- }
- }
+ if (isset($_GET['dfrom'])) $dfrom = (($_GET['dfrom'] == DOB_FORMAT_STRING) ? '' : $_GET['dfrom']);
+ if (isset($_GET['dto'])) $dto = (($_GET['dto'] == DOB_FORMAT_STRING) ? '' : $_GET['dto']);
+ if (isset($_GET['pfrom'])) $pfrom = $_GET['pfrom'];
+ if (isset($_GET['pto'])) $pto = $_GET['pto'];
+ if (isset($_GET['keywords'])) $keywords = $_GET['keywords'];
- if (($date_check_error == false) && tep_not_null($dfrom) && tep_not_null($dto)) {
- if (mktime(0, 0, 0, $dfrom_array[1], $dfrom_array[2], $dfrom_array[0]) > mktime(0, 0, 0, $dto_array[1], $dto_array[2], $dto_array[0])) {
- $error = true;
+ $date_check_error = false;
+ if (tep_not_null($dfrom)) {
+ if (!tep_checkdate($dfrom, DOB_FORMAT_STRING, $dfrom_array)) {
+ $error = true;
+ $date_check_error = true;
- $page->messageStack->add_session('search', ERROR_TO_DATE_LESS_THAN_FROM_DATE);
- }
- }
+ $page->messageStack->add_session('search', ERROR_INVALID_FROM_DATE);
+ }
+ }
- $price_check_error = false;
- if (tep_not_null($pfrom)) {
- if (!settype($pfrom, 'double')) {
- $error = true;
- $price_check_error = true;
+ if (tep_not_null($dto)) {
+ if (!tep_checkdate($dto, DOB_FORMAT_STRING, $dto_array)) {
+ $error = true;
+ $date_check_error = true;
- $page->messageStack->add_session('search', ERROR_PRICE_FROM_MUST_BE_NUM);
- }
- }
+ $page->messageStack->add_session('search', ERROR_INVALID_TO_DATE);
+ }
+ }
- if (tep_not_null($pto)) {
- if (!settype($pto, 'double')) {
- $error = true;
- $price_check_error = true;
- $page->messageStack->add_session('search', ERROR_PRICE_TO_MUST_BE_NUM);
- }
- }
+ if (tep_not_null($keywords)) {
+ if (!tep_parse_search_string($keywords, $search_keywords)) {
+ $error = true;
- if (($price_check_error == false) && is_float($pfrom) && is_float($pto)) {
- if ($pfrom >= $pto) {
- $error = true;
+ $page->messageStack->add_session('search', ERROR_INVALID_KEYWORDS);
+ }
+ }
- $page->messageStack->add_session('search', ERROR_PRICE_TO_LESS_THAN_PRICE_FROM);
- }
- }
- if (tep_not_null($keywords)) {
- if (!tep_parse_search_string($keywords, $search_keywords)) {
- $error = true;
- $page->messageStack->add_session('search', ERROR_INVALID_KEYWORDS);
- }
- }
-// }
-// var_dump($error);
- if ($error != true) {
+ // force product if not type detected
+ if(!isset($_REQUEST['data']))
+ $_REQUEST['data'] = 'product';
- // create column list
- $define_list = array('PRODUCT_LIST_MODEL' => _cst_bool('PRODUCT_LIST_MODEL'),
- 'PRODUCT_LIST_NAME' => _cst_bool('PRODUCT_LIST_NAME'),
- 'PRODUCT_LIST_MANUFACTURER' => _cst_bool('PRODUCT_LIST_MANUFACTURER'),
- 'PRODUCT_LIST_PRICE' =>_cst_bool(' PRODUCT_LIST_PRICE'),
- 'PRODUCT_LIST_QUANTITY' => _cst_bool('PRODUCT_LIST_QUANTITY'),
- 'PRODUCT_LIST_WEIGHT' => _cst_bool('PRODUCT_LIST_WEIGHT'),
- 'PRODUCT_LIST_IMAGE' => _cst_bool('PRODUCT_LIST_IMAGE'),
- 'PRODUCT_LIST_BUY_NOW' => _cst_bool('PRODUCT_LIST_BUY_NOW') );
- asort($define_list);
+ /**
+ @remarks detect type by Get[data]
+ */
+ if( ($dyntype = DataTypes::is_type('search')) && $dyntype != false ){
+ global $keywords, $search_keywords, $pto, $dto, $pfrom, $dfrom;
- $column_list = array();
- reset($define_list);
- while (list($key, $value) = each($define_list)) {
- if (_test_bool($value)) $column_list[] = $key;
- }
+ $list = $dyntype->FO_load_page('search');
- $select_column_list = '';
+ $listing_sql = 'SELECT DISTINCT '.$dyntype->listing_sql['col_count'] .' '. $dyntype->listing_sql['tables'] .' '. $dyntype->listing_sql['where'] .' ORDER BY '. $dyntype->listing_sql['sort'];
- for ($i=0, $n=sizeof($column_list); $i<$n; $i++) {
- switch ($column_list[$i]) {
- case 'PRODUCT_LIST_MODEL': $select_column_list .= 'p.products_model, '; break;
- case 'PRODUCT_LIST_MANUFACTURER': $select_column_list .= 'm.manufacturers_name, '; break;
- case 'PRODUCT_LIST_QUANTITY': $select_column_list .= 'p.products_quantity, '; break;
- case 'PRODUCT_LIST_IMAGE': $select_column_list .= 'p.products_image, '; break;
- case 'PRODUCT_LIST_WEIGHT': $select_column_list .= 'p.products_weight, '; break;
- }
- }
+ $listing_split = new splitPageResults($listing_sql, $page->_conf_value('MAX_DISPLAY_SEARCH_RESULTS'), $dyntype->listing_sql['col_count'] );
+// echo $listing_split->sql_query;
+ $listing_query = $DB->query($listing_split->sql_query);
+ }
- $select_str = "SELECT DISTINCT " . $select_column_list . " m.manufacturers_id, p.products_id, pd.products_name, p.products_price,p.products_quantity, p.products_tax_class_id, IF(s.status, s.specials_new_products_price, NULL) as specials_new_products_price , IF(s.status, s.specials_new_products_price, p.products_price) ,p.products_tax_class_id ";
-
- if ( (_cst_bool('DISPLAY_PRICE_WITH_TAX')) && (tep_not_null($pfrom) || tep_not_null($pto)) ) {
- $select_str .= ", SUM(tr.tax_rate) as tax_rate ";
- }
-
- $from_str = "from " . TABLE_PRODUCTS . " p ";
- $from_str .=" left join " . TABLE_SPECIALS . " s USING(products_id) ";
- $from_str .=" left join " . TABLE_MANUFACTURERS . " m USING(manufacturers_id) ";
- $from_str .=" left join " . TABLE_PRODUCTS_DESCRIPTION . " pd using(products_id) ";
- // $from_str .=" left join " . TABLE_CATEGORIES . " c using(manufacturers_id) ";
- $from_str .=" left join " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c using(products_id) ";
- $from_str .=" left join " . TABLE_PRODUCTS_ATTRIBUTES . " pa using(products_id) ";
-// $from_str .= ", " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_CATEGORIES . " c, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c ," . TABLE_PRODUCTS_ATTRIBUTES . ' pa ';
-
-
- if ( /*(_cst_bool('DISPLAY_PRICE_WITH_TAX')) &&*/ (tep_not_null($pfrom) || tep_not_null($pto)) ) {
- if (!tep_session_is_registered('customer_country_id')) {
- $customer_country_id = STORE_COUNTRY;
- $customer_zone_id = STORE_ZONE;
- }
- $from_str .= " left join " . TABLE_TAX_RATES . " tr on p.products_tax_class_id = tr.tax_class_id left join " . TABLE_ZONES_TO_GEO_ZONES . " gz on tr.tax_zone_id = gz.geo_zone_id and (gz.zone_country_id is null or gz.zone_country_id = '0' or gz.zone_country_id = '" . (int)$customer_country_id . "') and (gz.zone_id is null or gz.zone_id = '0' or gz.zone_id = '" . (int)$customer_zone_id . "')";
- }
- $from_str .= ", " . TABLE_CATEGORIES . " c ";
-// $from_str .= ", " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_CATEGORIES . " c, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c ," . TABLE_PRODUCTS_ATTRIBUTES . ' pa';
-
-// $where_str = " WHERE p.products_id = pd.products_id and pd.language_id = '" . (int)$languages_id . "' and p.products_id = p2c.products_id and p2c.categories_id = c.categories_id and c.categories_status='1'";
- $where_str = " WHERE pd.language_id = '" . (int)$languages_id . "' and p2c.categories_id = c.categories_id and c.categories_status='1'";
-
- if (isset($_GET['categories_id']) && tep_not_null($_GET['categories_id'])) {
- if (isset($_GET['inc_subcat']) && ($_GET['inc_subcat'] == '1')) {
- $subcategories_array = array();
- tep_get_subcategories($subcategories_array, $_GET['categories_id']);
-
- $where_str .= " and p2c.products_id = p.products_id and p2c.products_id = pd.products_id and (p2c.categories_id = '" . (int)$_GET['categories_id'] . "'";
-
- for ($i=0, $n=sizeof($subcategories_array); $i<$n; $i++ ) {
- $where_str .= " or p2c.categories_id = '" . (int)$subcategories_array[$i] . "'";
- }
-
- $where_str .= ")";
- } else {
- $where_str .= " and p2c.products_id = p.products_id and p2c.products_id = pd.products_id and pd.language_id = '" . (int)$languages_id . "' and p2c.categories_id = '" . (int)$_GET['categories_id'] . "'";
- }
- }
-
- if (isset($_GET['manufacturers_id']) && tep_not_null($_GET['manufacturers_id'])) {
- $where_str .= " and m.manufacturers_id = '" . (int)$_GET['manufacturers_id'] . "'";
- }
-
- if (isset($search_keywords) && (sizeof($search_keywords) > 0)) {
- $where_str .= " and (";
- for ($i=0, $n=sizeof($search_keywords); $i<$n; $i++ ) {
- switch ($search_keywords[$i]) {
- case '(':
- case ')':
- case 'and':
- case 'or':
- $where_str .= " " . $search_keywords[$i] . " ";
- break;
- default:
- $keyword = tep_db_prepare_input($search_keywords[$i]);
- $where_str .= "(pd.products_name like '%" . tep_db_input($keyword) . "%' or p.products_model like '%" . tep_db_input($keyword) . "%' or m.manufacturers_name like '%" . tep_db_input($keyword) . "%'";
- if (isset($_GET['search_in_description']) && ($_GET['search_in_description'] == '1')) $where_str .= " or pd.products_description like '%" . tep_db_input($keyword) . "%'";
- $where_str .= ')';
- break;
- }
- }
- $where_str .= " )";
- }
-
- if (tep_not_null($dfrom)) $where_str .= " and p.products_date_added >= '" . tep_date_raw($dfrom) . "'";
-
- if (tep_not_null($dto)) $where_str .= " and p.products_date_added <= '" . tep_date_raw($dto) . "'";
-
- if (tep_not_null($pfrom)) {
- if ($currencies->is_set($currency)) {
- $rate = $currencies->get_value($currency);
-
- $pfrom = $pfrom / $rate;
- }
- }
-
- if (tep_not_null($pto)) {
- if (isset($rate)) {
- $pto = $pto / $rate;
- }
- }
-
-// if (_cst_bool('DISPLAY_PRICE_WITH_TAX')) {
- if ($pfrom > 0) $where_str .= " and (p.final_price * if(gz.geo_zone_id is null, 1, 1 + (tr.tax_rate / 100) ) >= " . (double)$pfrom . ")";
- if ($pto > 0) $where_str .= " and (p.final_price * if(gz.geo_zone_id is null, 1, 1 + (tr.tax_rate / 100) ) <= " . (double)$pto . ")";
-// } else {
-// if ($pfrom > 0) $where_str .= " and (IF(s.status, s.specials_new_products_price, p.products_price) >= " . (double)$pfrom . ")";
-// if ($pto > 0) $where_str .= " and (IF(s.status, s.specials_new_products_price, p.products_price) <= " . (double)$pto . ")";
-// }
- $attributes_query = tep_db_query("select * from " . TABLE_PRODUCTS_OPTIONS . " where language_id = '" . (int)$languages_id . "'");
- $option_value_selected = false;
- $products_stock_attributes_array = array();
- while ($attributes = tep_db_fetch_array($attributes_query)) {
- if (isset($_GET[$attributes["products_options_name"]]) && !empty($_GET[$attributes["products_options_name"]]))
- $option_value_selected = true;
- }
- // the above while loop is to check to see if any values were selected
- if ($option_value_selected == true){
- $attributes_query2 = tep_db_query("select * from " . TABLE_PRODUCTS_OPTIONS . " where language_id = '" . (int)$languages_id . "'");
- while ($attributes2 = tep_db_fetch_array($attributes_query2)) {
- if (isset($_GET[$attributes2["products_options_name"]]) && !empty($_GET[$attributes2["products_options_name"]])) {
- $str_selected_values = $str_selected_values . $_GET[$attributes2["products_options_name"]] . ',';
- }
- }
- $str_selected_values = substr($str_selected_values,0,strlen($str_selected_values) - 1);
- $where_str .= "and pa.products_id = p.products_id and pa.options_values_id in (".$str_selected_values.")";
- // end of accompanying code to advanced_search_result.php that accompanies advanced_search.php
- // that will include all options_values_id that were selected
- // *********************************************************************************************************
- // *********************************************************************************************************
- }
- if ( (_cst_bool('DISPLAY_PRICE_WITH_TAX')) && (tep_not_null($pfrom) || tep_not_null($pto)) ) {
- $where_str .= " group by p.products_id, tr.tax_priority";
- }
-
- if ( (!isset($_GET['sort'])) || (!preg_match('/[1-8][ad]/', $_GET['sort'])) || (substr($_GET['sort'], 0, 1) > sizeof($column_list)) ) {
- for ($i=0, $n=sizeof($column_list); $i<$n; $i++) {
- if ($column_list[$i] == 'PRODUCT_LIST_NAME') {
- $_GET['sort'] = $i+1 . 'a';
- $order_str = ' order by pd.products_name';
- break;
- }
- }
- } else {
- $sort_col = substr($_GET['sort'], 0 , 1);
- $sort_order = substr($_GET['sort'], 1);
- $order_str = ' order by ';
- switch ($column_list[$sort_col-1]) {
- case 'PRODUCT_LIST_MODEL': $order_str .= "p.products_model " . ($sort_order == 'd' ? "desc" : "") . ", pd.products_name"; break;
- case 'PRODUCT_LIST_NAME': $order_str .= "pd.products_name " . ($sort_order == 'd' ? "desc" : ""); break;
- case 'PRODUCT_LIST_MANUFACTURER': $order_str .= "m.manufacturers_name " . ($sort_order == 'd' ? "desc" : "") . ", pd.products_name"; break;
- case 'PRODUCT_LIST_QUANTITY': $order_str .= "p.products_quantity " . ($sort_order == 'd' ? "desc" : "") . ", pd.products_name"; break;
- case 'PRODUCT_LIST_IMAGE': $order_str .= "pd.products_name"; break;
- case 'PRODUCT_LIST_WEIGHT': $order_str .= "p.products_weight " . ($sort_order == 'd' ? "desc" : "") . ", pd.products_name"; break;
- case 'PRODUCT_LIST_PRICE': $order_str .= "final_price " . ($sort_order == 'd' ? "desc" : "") . ", pd.products_name"; break;
- }
- }
-
- if(!isset($order_str))$order_str = 'order by p.products_id DESC';
- $listing_sql = $select_str . $from_str . $where_str . $order_str;
- }
-
-
$page->post_init();
require($page->path_gabarit());
Modified: trunk/catalog/common/classes/DataTypes.php
===================================================================
--- trunk/catalog/common/classes/DataTypes.php 2012-04-09 16:32:35 UTC (rev 4183)
+++ trunk/catalog/common/classes/DataTypes.php 2012-04-09 16:38:59 UTC (rev 4184)
@@ -45,9 +45,12 @@
@var This var define if RootListing actived and loop for check childs type
*/
public static $ForceChilds = false;
+ /**
+ @var CurrentMode
+ */
+ public static $CurrentMode = '';
-
/**
@brief constructor
*/
@@ -295,9 +298,11 @@
public static function is_type($mode='page'){
self::getInstance();
+ self::$CurrentMode = $mode;
+
foreach(self::$env->modlist as $class=>$module){
if( $module->is_type($mode) ){
- if( /*!self::GetForceChilds() && */ in_array($mode, array('unique'/*, 'listing'*/)) )
+ if( /*!self::GetForceChilds() && */ in_array($mode, array('unique', 'search')) )
self::$currenttype = $module->DataType;
elseif($mode == 'listing')
self::$rootDataType = $module->DataType;
Modified: trunk/catalog/common/classes/datatype_drivers/Data_categorie.php
===================================================================
--- trunk/catalog/common/classes/datatype_drivers/Data_categorie.php 2012-04-09 16:32:35 UTC (rev 4183)
+++ trunk/catalog/common/classes/datatype_drivers/Data_categorie.php 2012-04-09 16:38:59 UTC (rev 4184)
@@ -276,6 +276,7 @@
}
/**
+ @fn FO_load_page($mode='unique')
@brief calcul du cpath specifique a ce type de donnée
*/
public function FO_load_page($mode='unique'){
@@ -283,16 +284,14 @@
$page = page::getInstance();
$DB=Database::getInstance();
-// var_dump($current_category_id);
- switch(strtolower($mode)){
+
+ switch(strtolower(DataTypes::$CurrentMode)){
case 'transversal':
case 'listing':
$category_depth = $page->GetVar('category_depth');
$current_category_id = $page->GetVar('current_category_id');
-// var_dump($current_category_id);
-
//! Recup des element cat en cours
categorie::resetCacheId((int)$current_category_id);
if( ($categories=categorie::get_item((int)$current_category_id)) ==false){
Modified: trunk/catalog/common/classes/datatype_drivers/Data_content.php
===================================================================
--- trunk/catalog/common/classes/datatype_drivers/Data_content.php 2012-04-09 16:32:35 UTC (rev 4183)
+++ trunk/catalog/common/classes/datatype_drivers/Data_content.php 2012-04-09 16:38:59 UTC (rev 4184)
@@ -75,6 +75,10 @@
*/
function is_type($mode='unique'){
switch(strtolower($mode)){
+ case 'search':
+ if(isset($_GET['data']) && $_GET['data'] == $this->DataType )
+ return true;
+ break;
case 'cpath':
if( isset($_GET['content']) && is_numeric($_GET['content']) )
return true;
@@ -168,20 +172,86 @@
@brief calcul du cpath specifique a ce tyep de donnée
*/
function FO_load_page(){
- global $aca_product,$product_info, $page_content, $language, $cPath;
+ global $aca_product,$product_info, $page_content, $language, $cPath, $languages_id;
$page = page::getInstance();
$DB=Database::getInstance();
- $page->init('content.php',$language);
- $breadcrumb=$page->return_object('breadcrumb');
+ switch(strtolower(DataTypes::$CurrentMode)){
+ case 'search':
+ global $keywords, $search_keywords, $pto, $dto, $pfrom, $dfrom;
- // call transversal load in other modules
- DataTypes::transversal('transversal');
+ $this->listing_sql['col_count'] = " ".$this->p.".content_id ";
- $page_content = $page->force_content('content.php');
+ $this->listing_sql['tables'] = " FROM " . TABLE_CONTENT . " ".$this->p." ";
+ $this->listing_sql['tables'] .=" LEFT JOIN " . TABLE_CONTENT_DESCRIPTION . " ".$this->p."d using(content_id) ";
+ $this->listing_sql['tables'] .=" LEFT JOIN " . TABLE_CONTENT_TO_CATEGORIES . " ".$this->p."2c using(content_id) ";
+ $this->listing_sql['tables'] .= " LEFT JOIN " . TABLE_CATEGORIES . " cat ON( ".$this->p."2c.categories_id = cat.categories_id and cat.categories_status='1' ) ";
- return $page_content;
+
+ $this->listing_sql['where'] = " WHERE ".$this->p.".content_status > 0 AND ".$this->p."d.language_id = '" . (int)$languages_id . "' ";
+
+ if (isset($_GET['categories_id']) && tep_not_null($_GET['categories_id'])) {
+ if (isset($_GET['inc_subcat']) && ($_GET['inc_subcat'] == '1')) {
+ $subcategories_array = array();
+ tep_get_subcategories($subcategories_array, $_GET['categories_id']);
+
+ $this->listing_sql['where'] .= " and ".$this->p."2c.content_id = ".$this->p.".content_id and ".$this->p."2c.content_id = ".$this->p."d.content_id and (".$this->p."2c.categories_id = '" . (int)$_GET['categories_id'] . "'";
+
+ for ($i=0, $n=sizeof($subcategories_array); $i<$n; $i++ ) {
+ $this->listing_sql['where'] .= " or ".$this->p."2c.categories_id = '" . (int)$subcategories_array[$i] . "'";
+ }
+
+ $this->listing_sql['where'] .= ")";
+ } else {
+ $this->listing_sql['where'] .= " and ".$this->p."2c.content_id = ".$this->p.".content_id and ".$this->p."2c.content_id = ".$this->p."d.content_id and ".$this->p."d.language_id = '" . (int)$languages_id . "' and p2c.categories_id = '" . (int)$_GET['categories_id'] . "'";
+ }
+ }
+
+
+ if (isset($search_keywords) && (sizeof($search_keywords) > 0)) {
+ $this->listing_sql['where'] .= " and (";
+ for ($i=0, $n=sizeof($search_keywords); $i<$n; $i++ ) {
+ switch ($search_keywords[$i]) {
+ case '(':
+ case ')':
+ case 'and':
+ case 'or':
+ $this->listing_sql['where'] .= " " . $search_keywords[$i] . " ";
+ break;
+ default:
+ $keyword = tep_db_prepare_input($search_keywords[$i]);
+ $this->listing_sql['where'] .= "(".$this->p."d.content_title like '%" . tep_db_input($keyword) . "%' ";
+// if (isset($_GET['search_in_description']) && ($_GET['search_in_description'] == '1'))
+ $this->listing_sql['where'] .= " or ".$this->p."d.content_text like '%" . tep_db_input($keyword) . "%'";
+ $this->listing_sql['where'] .= ')';
+ break;
+ }
+ }
+ $this->listing_sql['where'] .= " )";
+ }
+
+ if (tep_not_null($dfrom)) $this->listing_sql['where'] .= " and ".$this->p.".date_added >= '" . tep_date_raw($dfrom) . "'";
+
+ if (tep_not_null($dto)) $this->listing_sql['where'] .= " and ".$this->p.".date_added <= '" . tep_date_raw($dto) . "'";
+
+
+ $this->listing_sql['sort'] = " ".$this->p."d.content_title ";
+
+
+ break;
+ default:
+ $page->init('content.php',$language);
+ $breadcrumb=$page->return_object('breadcrumb');
+
+ // call transversal load in other modules
+ DataTypes::transversal('transversal');
+
+ $page_content = $page->force_content('content.php');
+
+ return $page_content;
+ }
+
}
Modified: trunk/catalog/common/classes/datatype_drivers/Data_product.php
===================================================================
--- trunk/catalog/common/classes/datatype_drivers/Data_product.php 2012-04-09 16:32:35 UTC (rev 4183)
+++ trunk/catalog/common/classes/datatype_drivers/Data_product.php 2012-04-09 16:38:59 UTC (rev 4184)
@@ -83,6 +83,10 @@
*/
function is_type($mode='unique'){
switch($mode){
+ case 'search':
+ if(isset($_GET['data']) && $_GET['data'] == $this->DataType )
+ return true;
+ break;
case 'cpath':
if(isset($_GET['products_id']) && !isset($_GET['manufacturers_id']) )
return true;
@@ -182,62 +186,205 @@
@brief Unique page Content
*/
function FO_load_page(){
- global $aca_product,$product_info, $page_content, $language, $cPath, $languages_id;
+ global $aca_product,$product_info, $page_content, $language, $cPath, $languages_id, $languages_id;
$page = page::getInstance();
$DB=Database::getInstance();
- $page->init('product_info.php',$language);
- $breadcrumb=$page->return_object('breadcrumb');
+ switch(strtolower(DataTypes::$CurrentMode)){
+ case 'search':
+ global $keywords, $search_keywords, $pto, $dto, $pfrom, $dfrom;
- // call transversal load in other modules
- DataTypes::transversal('transversal');
+ $this->listing_sql['col_count'] = " ".$this->p.".products_id ";
- /** init aca module */
- $aca_product=$page->new_class('product',true);
+// $select_str = "SELECT DISTINCT p.products_id ";
+ $this->listing_sql['tables'] = " FROM " . TABLE_PRODUCTS . " ".$this->p." ";
+ $this->listing_sql['tables'] .=" LEFT JOIN " . TABLE_SPECIALS . " s USING(products_id) ";
+ $this->listing_sql['tables'] .=" LEFT JOIN " . TABLE_MANUFACTURERS . " m USING(manufacturers_id) ";
+ $this->listing_sql['tables'] .=" LEFT JOIN " . TABLE_PRODUCTS_DESCRIPTION . " pd using(products_id) ";
+ $this->listing_sql['tables'] .=" LEFT JOIN " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c using(products_id) ";
+ $this->listing_sql['tables'] .=" LEFT JOIN " . TABLE_PRODUCTS_ATTRIBUTES . " pa using(products_id) ";
- if (isset($_GET['action'])) {
- $action=(string)tep_db_prepare_input($_GET['action']);
- if ($aca_product->check_action('',$action) ) {
- $aca_product->after_check_action('',$action);
- tep_redirect(tep_href_link('product_info.php', tep_get_all_get_params(array('action'))));
+
+ if ( (tep_not_null($pfrom) || tep_not_null($pto)) ) {
+ if (!tep_session_is_registered('customer_country_id')) {
+ $customer_country_id = STORE_COUNTRY;
+ $customer_zone_id = STORE_ZONE;
+ }
+ $this->listing_sql['tables'] .= " left join " . TABLE_TAX_RATES . " tr on p.products_tax_class_id = tr.tax_class_id left join " . TABLE_ZONES_TO_GEO_ZONES . " gz on tr.tax_zone_id = gz.geo_zone_id and (gz.zone_country_id is null or gz.zone_country_id = '0' or gz.zone_country_id = '" . (int)$customer_country_id . "') and (gz.zone_id is null or gz.zone_id = '0' or gz.zone_id = '" . (int)$customer_zone_id . "')";
+ }
+
+
+ $this->listing_sql['tables'] .= " LEFT JOIN " . TABLE_CATEGORIES . " c ON( p2c.categories_id = c.categories_id and c.categories_status='1' ) ";
+
+
+ $this->listing_sql['where'] = " WHERE ".$this->p.".products_status > 0 AND ".$this->p."d.language_id = '" . (int)$languages_id . "' ";
+
+ if (isset($_GET['categories_id']) && tep_not_null($_GET['categories_id'])) {
+ if (isset($_GET['inc_subcat']) && ($_GET['inc_subcat'] == '1')) {
+ $subcategories_array = array();
+ tep_get_subcategories($subcategories_array, $_GET['categories_id']);
+
+ $this->listing_sql['where'] .= " and p2c.products_id = p.products_id and p2c.products_id = pd.products_id and (p2c.categories_id = '" . (int)$_GET['categories_id'] . "'";
+
+ for ($i=0, $n=sizeof($subcategories_array); $i<$n; $i++ ) {
+ $this->listing_sql['where'] .= " or p2c.categories_id = '" . (int)$subcategories_array[$i] . "'";
+ }
+
+ $this->listing_sql['where'] .= ")";
+ } else {
+ $this->listing_sql['where'] .= " and p2c.products_id = p.products_id and p2c.products_id = pd.products_id and pd.language_id = '" . (int)$languages_id . "' and p2c.categories_id = '" . (int)$_GET['categories_id'] . "'";
+ }
}
- }
- //! produit nom trouvé
- if ( ($obj_product_info =product_info((int)$_GET['products_id'])) ==false )
- tep_redirect(tep_href_link('','ServerError=404') );
+ if (isset($_GET['manufacturers_id']) && tep_not_null($_GET['manufacturers_id'])) {
+ $this->listing_sql['where'] .= " and m.manufacturers_id = '" . (int)$_GET['manufacturers_id'] . "'";
+ }
- $product_info=arrayInfo($obj_product_info);
- $page->add_var_page('product_info',$product_info);
+ if (isset($search_keywords) && (sizeof($search_keywords) > 0)) {
+ $this->listing_sql['where'] .= " and (";
+ for ($i=0, $n=sizeof($search_keywords); $i<$n; $i++ ) {
+ switch ($search_keywords[$i]) {
+ case '(':
+ case ')':
+ case 'and':
+ case 'or':
+ $this->listing_sql['where'] .= " " . $search_keywords[$i] . " ";
+ break;
+ default:
+ $keyword = tep_db_prepare_input($search_keywords[$i]);
+ $this->listing_sql['where'] .= "(pd.products_name like '%" . tep_db_input($keyword) . "%' or p.products_model like '%" . tep_db_input($keyword) . "%' or m.manufacturers_name like '%" . tep_db_input($keyword) . "%'";
+// if (isset($_GET['search_in_description']) && ($_GET['search_in_description'] == '1'))
+ $this->listing_sql['where'] .= " or pd.products_description like '%" . tep_db_input($keyword) . "%'";
+ $this->listing_sql['where'] .= ')';
+ break;
+ }
+ }
+ $this->listing_sql['where'] .= " )";
+ }
- $page->title=$product_info['title'];
- $breadcrumb->add($product_info['title'], tep_href_link('product_info.php', 'products_id=' . (int)$_GET['products_id'].'&cPath=' . $cPath . ''));
+ if (tep_not_null($dfrom)) $this->listing_sql['where'] .= " and p.products_date_added >= '" . tep_date_raw($dfrom) . "'";
- /**
- Incremente nbr de vus du produits
- */
- $DB->query("update " . TABLE_PRODUCTS_DESCRIPTION . " set products_viewed = products_viewed+1 where products_id = '" . (int)$_GET['products_id'] . "' and language_id = '" . (int)$languages_id . "'");
+ if (tep_not_null($dto)) $this->listing_sql['where'] .= " and p.products_date_added <= '" . tep_date_raw($dto) . "'";
- /**
- Specifique au bloite récement vu. Enregistrement désactivier si OSCSS__B_RECENTLY_VIEWED et a false
- */
- if($page->_conf_value('OSCSS__B_RECENTLY_VIEWED')) {
- $recently_viewed = '';
- if (!tep_session_is_registered('recently_viewed')){
- tep_session_register('recently_viewed');
- $recently_viewed = (int)$_GET['products_id'] . ';';
- }
- $check_not_duplicate = (int)$_GET['products_id'];
- $temp_recent = $recently_viewed;
- if (preg_match('/'.$check_not_duplicate.'/', $temp_recent ) ) $recently_viewed = preg_replace('/'.$check_not_duplicate.'/',"",$temp_recent);
- $recently_viewed = (int)$_GET['products_id'] . ';' . $recently_viewed ;
- }
- $page->product->pile_img[]=$product_info['products_image'];
- $page_content = $page->force_content('product_info.php');
+ if (tep_not_null($pfrom)) {
+ if ($currencies->is_set($currency)) {
+ $rate = $currencies->get_value($currency);
- return $page_content;
+ $pfrom = $pfrom / $rate;
+ }
+ }
+
+ if (tep_not_null($pto)) {
+ if (isset($rate)) {
+ $pto = $pto / $rate;
+ }
+ }
+
+
+ if ($pfrom > 0) {
+ $this->listing_sql['where'] .= " and ( (p.final_price * if(gz.geo_zone_id is null, 1, 1 + (tr.tax_rate / 100) ) >= " . (double)$pfrom . ")";
+ $this->listing_sql['where'] .= " OR (IF(s.status, s.specials_new_products_price, p.products_price) >= " . (double)$pfrom . ") ) ";
+ }
+ if ($pto > 0){
+ $this->listing_sql['where'] .= " and ( (p.final_price * if(gz.geo_zone_id is null, 1, 1 + (tr.tax_rate / 100) ) <= " . (double)$pto . ")";
+ $this->listing_sql['where'] .= " OR (IF(s.status, s.specials_new_products_price, p.products_price) <= " . (double)$pto . ") )";
+ }
+
+
+ $attributes_query = tep_db_query("select * from " . TABLE_PRODUCTS_OPTIONS . " where language_id = '" . (int)$languages_id . "'");
+ $option_value_selected = false;
+ $products_stock_attributes_array = array();
+ while ($attributes = tep_db_fetch_array($attributes_query)) {
+ if (isset($_GET[$attributes["products_options_name"]]) && !empty($_GET[$attributes["products_options_name"]]))
+ $option_value_selected = true;
+ }
+ // the above while loop is to check to see if any values were selected
+ if ($option_value_selected == true){
+ $attributes_query2 = tep_db_query("select * from " . TABLE_PRODUCTS_OPTIONS . " where language_id = '" . (int)$languages_id . "'");
+ while ($attributes2 = tep_db_fetch_array($attributes_query2)) {
+ if (isset($_GET[$attributes2["products_options_name"]]) && !empty($_GET[$attributes2["products_options_name"]])) {
+ $str_selected_values = $str_selected_values . $_GET[$attributes2["products_options_name"]] . ',';
+ }
+ }
+ $str_selected_values = substr($str_selected_values,0,strlen($str_selected_values) - 1);
+ $this->listing_sql['where'] .= "and pa.products_id = p.products_id and pa.options_values_id in (".$str_selected_values.")";
+ }
+
+
+/*
+ $this->listing_sql['tables'] = " FROM " . TABLE_PRODUCTS . " ".$this->p." ".
+ " left join " . TABLE_PRODUCTS_DESCRIPTION . " ".$this->p."d using(products_id) ".
+ // " left join " . TABLE_MANUFACTURERS . " m USING(manufacturers_id) ".
+ " left join " . TABLE_SPECIALS . " ".$this->p."s USING(products_id) ".
+ " left join " . TABLE_PRODUCTS_ATTRIBUTES . " ".$this->p."a using(products_id) ".
+ "";*/
+
+// $this->listing_sql['where'] = " WHERE ".$this->p.".products_status = '1' ";
+ $this->listing_sql['sort'] = " ".$this->p."d.products_name ";
+// $this->listing_sql['base_key'] = "products_id ";
+// $this->listing_sql['col_count'] = " ".$this->p.".products_id ";
+
+ return $this;
+
+ break;
+
+
+ case 'unique':
+ $page->init('product_info.php',$language);
+ $breadcrumb=$page->return_object('breadcrumb');
+
+ // call transversal load in other modules
+ DataTypes::transversal('transversal');
+
+ /** init aca module */
+ $aca_product=$page->new_class('product',true);
+
+ if (isset($_GET['action'])) {
+ $action=(string)tep_db_prepare_input($_GET['action']);
+ if ($aca_product->check_action('',$action) ) {
+ $aca_product->after_check_action('',$action);
+ tep_redirect(tep_href_link('product_info.php', tep_get_all_get_params(array('action'))));
+ }
+ }
+
+ //! produit nom trouvé
+ if ( ($obj_product_info =product_info((int)$_GET['products_id'])) ==false )
+ tep_redirect(tep_href_link('','ServerError=404') );
+
+ $product_info=arrayInfo($obj_product_info);
+ $page->add_var_page('product_info',$product_info);
+
+ $page->title=$product_info['title'];
+ $breadcrumb->add($product_info['title'], tep_href_link('product_info.php', 'products_id=' . (int)$_GET['products_id'].'&cPath=' . $cPath . ''));
+
+ /**
+ Incremente nbr de vus du produits
+ */
+ $DB->query("update " . TABLE_PRODUCTS_DESCRIPTION . " set products_viewed = products_viewed+1 where products_id = '" . (int)$_GET['products_id'] . "' and language_id = '" . (int)$languages_id . "'");
+
+ /**
+ Specifique au bloite récement vu. Enregistrement désactivier si OSCSS__B_RECENTLY_VIEWED et a false
+ */
+ if($page->_conf_value('OSCSS__B_RECENTLY_VIEWED')) {
+ $recently_viewed = '';
+ if (!tep_session_is_registered('recently_viewed')){
+ tep_session_register('recently_viewed');
+ $recently_viewed = (int)$_GET['products_id'] . ';';
+ }
+ $check_not_duplicate = (int)$_GET['products_id'];
+ $temp_recent = $recently_viewed;
+ if (preg_match('/'.$check_not_duplicate.'/', $temp_recent ) ) $recently_viewed = preg_replace('/'.$check_not_duplicate.'/',"",$temp_recent);
+ $recently_viewed = (int)$_GET['products_id'] . ';' . $recently_viewed ;
+ }
+ $page->product->pile_img[]=$product_info['products_image'];
+ $page_content = $page->force_content('product_info.php');
+
+ return $page_content;
+ break;
+ default:
+ }
}
Modified: trunk/catalog/includes/languages/fr_FR/advanced_search.php
===================================================================
--- trunk/catalog/includes/languages/fr_FR/advanced_search.php 2012-04-09 16:32:35 UTC (rev 4183)
+++ trunk/catalog/includes/languages/fr_FR/advanced_search.php 2012-04-09 16:38:59 UTC (rev 4184)
@@ -1,16 +1,16 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 15/12/10, 14:47
+ @version 2.1.1
+ @date 09/04/2012, 14:47
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
define('NAVBAR_TITLE_1',"Recherche avancée" );
define('NAVBAR_TITLE_2',"Résultats de recherche" );
define('HEADING_TITLE_1',"Recherche avancée" );
-define('HEADING_TITLE_2',"Produits répondant aux critères de recherche" );
+define('HEADING_TITLE_2',"Résultats répondant aux critères de recherche" );
define('HEADING_SEARCH_CRITERIA',"Critères de recherche" );
define('ENTRY_KEYWORDS',"Mots clés" );
define('ENTRY_CATEGORIES',"Catégories:" );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-09 16:32:41
|
Revision: 4183
http://oscss.svn.sourceforge.net/oscss/?rev=4183&view=rev
Author: oscim
Date: 2012-04-09 16:32:35 +0000 (Mon, 09 Apr 2012)
Log Message:
-----------
Deplacement du template public electronix dans les extensions
Added Paths:
-----------
trunk/extensions/ELECTRONIX_stable/
trunk/extensions/ELECTRONIX_stable/electronix/
Removed Paths:
-------------
trunk/catalog/install/data/templates/appareil_photo/electronix/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-09 12:36:39
|
Revision: 4182
http://oscss.svn.sourceforge.net/oscss/?rev=4182&view=rev
Author: oscim
Date: 2012-04-09 12:36:26 +0000 (Mon, 09 Apr 2012)
Log Message:
-----------
Suite du dev, correction et nettoyage du code,
refonte de la page de gestion des utilisateurs adminUsers, ajout des class sqlxx de manipulation des extra pour les utilisateur, ajustement du driver pour la prise en charge de module aca
Correction bug li?\195?\169e au chargement des langue dans les emails
Correctuion coquille , et ou manque retrun false
Ajout d'une class de gestion des acl d'action (en cours de dev)
ajustement sql correspondant.
correction erreur lors de la suppresion des page cms
Ajustement du nombre de ligne, et normalisation dans la var $conf, report des conf de base dans configure.php
correction des pages package, qu ne chargeaient pas si l'un des depots ne fonctionnaient pas
Modification de l'index de l'amdin, pour autoriser un appel sans aucune sortie html
Dans le dossier dev, suite de l'amelioration des modeles de GenerCode
Modified Paths:
--------------
trunk/catalog/admin/includes/application_top.php
trunk/catalog/admin/includes/boxes/002_admin.php
trunk/catalog/admin/includes/classes/ModTwo.php
trunk/catalog/admin/includes/classes/drivers/sqladmingroups.php
trunk/catalog/admin/includes/classes/drivers/sqladminuser.php
trunk/catalog/admin/includes/classes/drivers/sqlcategoriesextra.php
trunk/catalog/admin/includes/classes/emailUtility.php
trunk/catalog/admin/includes/classes/fileUtility.php
trunk/catalog/admin/includes/classes/login_ident.php
trunk/catalog/admin/includes/exts/package/packageRepository.php
trunk/catalog/admin/includes/functions/general.php
trunk/catalog/admin/includes/gabarit/adminAccount/display_view.page.gab
trunk/catalog/admin/includes/gabarit/adminGroup/display_view.define_group.gab
trunk/catalog/admin/includes/gabarit/adminGroup/display_view.listing.gab
trunk/catalog/admin/includes/gabarit/adminUsers/display_view.edit.gab
trunk/catalog/admin/includes/gabarit/adminUsers/display_view.listing.gab
trunk/catalog/admin/includes/gabarit/cms_content/display_view.delete.gab
trunk/catalog/admin/includes/javascript/modules/pages/adminUsers.js.php
trunk/catalog/admin/includes/languages/fr_FR/modeles/email/mouton/admin_members_new.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/adminGroup.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/adminUsers.txt
trunk/catalog/admin/includes/languages/fr_FR/widget/Notification.txt
trunk/catalog/admin/includes/languages/fr_FR/widget/brief_config.txt
trunk/catalog/admin/includes/modules/pages/adminAccount.php
trunk/catalog/admin/includes/modules/pages/adminGroup.php
trunk/catalog/admin/includes/modules/pages/adminUsers.php
trunk/catalog/admin/includes/modules/pages/cms_content.php
trunk/catalog/admin/includes/modules/pages/package.php
trunk/catalog/admin/includes/widget/Notification.php
trunk/catalog/admin/includes/widget/brief_config.php
trunk/catalog/admin/includes/widget/homeStock.php
trunk/catalog/admin/index.php
trunk/catalog/common/classes/osCSS_Cache.php
trunk/catalog/includes/functions/general.php
trunk/catalog/install/includes/sql/mysql/data/40_osc_admin_groups.sql
trunk/catalog/install/includes/sql/mysql/data/40_osc_admin_users.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_admin_groups.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_admin_users.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_admin.sql
trunk/dev/GenerCode/Dicos/Modele/catalog/admin/includes/gabarit/_REPLDICO_/display_view.edit.gab
trunk/dev/GenerCode/Dicos/Modele/catalog/admin/includes/modules/pages/_REPLDICO_.php
trunk/dev/GenerCode/Dicos/Modele/install.xml
trunk/dev/GenerCode/class.GenerCode.php
trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/classes/drivers/sql_DATATYPE_REPLACE_.php
trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/classes/drivers/sql_DATATYPE_REPLACE_extrafields.php
trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/gabarit/_DATATYPE_REPLACE_s/_DATATYPE_REPLACE_SEOTAG__description/display_edit.edit.gab
trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/gabarit/_DATATYPE_REPLACE_s/display_view.delete.gab
trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/gabarit/_DATATYPE_REPLACE_s/display_view.edit.gab
trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/gabarit/_DATATYPE_REPLACE_s/display_view.inline.gab
trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/gabarit/_DATATYPE_REPLACE_s/display_view.listing.gab
trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/gabarit/_DATATYPE_REPLACE_s/display_view.new.gab
trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/gabarit/configuration/mod_DATATYPE_REPLACE_extra/draw.delete.gab
trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/gabarit/configuration/mod_DATATYPE_REPLACE_extra/draw.label.edit.gab
trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/gabarit/configuration/mod_DATATYPE_REPLACE_extra/draw.label.listing.gab
trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/gabarit/configuration/mod_DATATYPE_REPLACE_extra/draw.label.new.gab
trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/gabarit/configuration/mod_DATATYPE_REPLACE_extra/draw.value.delete.gab
trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/gabarit/configuration/mod_DATATYPE_REPLACE_extra/draw.value.edit.gab
trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/gabarit/configuration/mod_DATATYPE_REPLACE_extra/draw.value.listing.gab
trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/gabarit/configuration/mod_DATATYPE_REPLACE_extra/draw.value.new.gab
trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/languages/fr_FR/modules/_DATATYPE_REPLACE_/_DATATYPE_REPLACE_SEOTAG__description.txt
trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/languages/fr_FR/modules/pages/_DATATYPE_REPLACE_s.txt
trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/modules/_DATATYPE_REPLACE_/_DATATYPE_REPLACE_SEOTAG__description.php
trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/modules/_DATATYPE_REPLACE_/header_tags.php
trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/modules/configuration/mod_DATATYPE_REPLACE_extra.php
trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/modules/pages/_DATATYPE_REPLACE_s.php
trunk/dev/GenerCode/datatype/Modele/catalog/includes/classes/drivers/data/_DATATYPE_REPLACE_.php
trunk/dev/GenerCode/datatype/Modele/catalog/includes/content/_DATATYPE_REPLACE_.php
trunk/dev/GenerCode/datatype/Modele/catalog/includes/languages/fr_FR/modules/_DATATYPE_REPLACE_/_DATATYPE_REPLACE_SEOTAG__description.txt
trunk/dev/GenerCode/datatype/Modele/catalog/includes/modules/_DATATYPE_REPLACE_/_DATATYPE_REPLACE_SEOTAG__description.php
trunk/dev/GenerCode/datatype/Modele/install.xml
Added Paths:
-----------
trunk/catalog/admin/includes/classes/drivers/sqladminextra.php
trunk/catalog/admin/includes/classes/oscss_acl.php
trunk/catalog/install/includes/sql/mysql/tables/osc_admin_extra.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_admin_groups.sql
Modified: trunk/catalog/admin/includes/application_top.php
===================================================================
--- trunk/catalog/admin/includes/application_top.php 2012-04-08 16:19:59 UTC (rev 4181)
+++ trunk/catalog/admin/includes/application_top.php 2012-04-09 12:36:26 UTC (rev 4182)
@@ -1,10 +1,10 @@
<?php
/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 29/08/11, 11:37
+ @date 08/04/2012, 11:37
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
\dir admin/includes/
Modified: trunk/catalog/admin/includes/boxes/002_admin.php
===================================================================
--- trunk/catalog/admin/includes/boxes/002_admin.php 2012-04-08 16:19:59 UTC (rev 4181)
+++ trunk/catalog/admin/includes/boxes/002_admin.php 2012-04-09 12:36:26 UTC (rev 4182)
@@ -11,5 +11,5 @@
$tabl_link[]= array(FILENAME_ADMINUSERS, 'BOX_ADMINISTRATOR_MEMBERS', 'members');
$tabl_link[]= array(FILENAME_ADMINGROUP, 'BOX_ADMINISTRATOR_GROUPS', 'groups');
- $tabl_link[]= array(FILENAME_ADMINNOTIF, 'BOX_ADMIN_NOTIFICATIONS', 'groups');
+ $tabl_link[]= array(FILENAME_ADMINNOTIF.'?action=config', 'BOX_ADMIN_NOTIFICATIONS', 'groups');
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/classes/ModTwo.php
===================================================================
--- trunk/catalog/admin/includes/classes/ModTwo.php 2012-04-08 16:19:59 UTC (rev 4181)
+++ trunk/catalog/admin/includes/classes/ModTwo.php 2012-04-09 12:36:26 UTC (rev 4182)
@@ -1,15 +1,15 @@
<?php
/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 29/04/11, 23:11
+ @version 2.1.1
+ @date 09/04/2012, 23:11
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
-error_reporting(E_ALL);
+
/**
@interface ExtModConfig
@brief interface for module content abstract level config in extra module conf
@@ -240,6 +240,9 @@
*/
public static function load_db_values($ID=''){
+ if(!method_exists(self::$code, 'GetConf'))
+ return false;
+
call_user_func(array(self::$code, 'GetConf'));
if(!empty($ID) && is_array($ID)) self::$InitInfo['adjust']=$ID;
Added: trunk/catalog/admin/includes/classes/drivers/sqladminextra.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqladminextra.php (rev 0)
+++ trunk/catalog/admin/includes/classes/drivers/sqladminextra.php 2012-04-09 12:36:26 UTC (rev 4182)
@@ -0,0 +1,172 @@
+<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 07/04/2012, 20:11
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+class sqladminextra
+ implements ModSqlDataDriver{
+
+
+ /**
+ @brief create new ligne in table configuration
+ */
+ public static function create($option){
+
+ if(!isset($option['type'])) return 'type';
+
+ if(isset($option['id'])) $sql_data_array['data_id'] = $option['id'];
+ if(isset($option['type'])) $sql_data_array['type'] = $option['type'];
+ if(isset($option['key'])) $sql_data_array['key'] = strtoupper($option['key']);
+ if(isset($option['value'])) $sql_data_array['value '] = $option['value'];
+
+
+ $res=tep_db_perform(TABLE_ADMIN_EXTRA, $sql_data_array);
+
+ if(!$res)
+ return $res;
+ else
+ return $res->__get('insertId');
+ }
+
+
+
+ /**
+ @brief update ligne in table configuration
+ */
+ public static function update($option){
+
+ if(!isset($option['type'])) return ' type';
+
+ $where ='';
+ if(isset($option['id'])) $where .="AND data_id = '".(int)$option['id']."' ";
+ if(isset($option['type'])) $where .="AND type = '".(int)$option['type']."' ";
+ if(isset($option['key'])) $where .="AND key = '".(string)strtoupper(tep_db_input($option['key']))."' ";
+
+// if(isset($option['id'])) $sql_data_array['data_id'] = $option['id'];
+// if(isset($option['key'])) $sql_data_array['key'] = $option['key'];
+ if(isset($option['value'])) $sql_data_array['value '] = $option['value'];
+
+
+ $res=tep_db_perform(TABLE_ADMIN_EXTRA, $sql_data_array, 'update' , substr($where,3) );
+
+ return $res;
+ }
+
+ /**
+ @brief load ligne in table configuration
+ @param option array
+ id => row id int (configuration_id)
+ key => string key (configuration_key)
+ group_id => group_id int (configuration_group_id)
+
+ @return
+
+ object(stdClass)[13]
+ public 'id' => string '1' (length=1)
+
+ OR
+ array(
+ object(stdClass)[13]
+ ...
+ object(stdClass)[13]
+ ..
+ )
+
+ */
+ public static function fetch($option,$shortkey=false){
+ $DB=Database::getInstance();
+
+ $sql ="";
+ if(isset($option['id'])) $sql .="AND data_id = '".(int)$option['id']."' ";
+ if(isset($option['type'])) $sql .="AND type = '".(int)$option['type']."' ";
+ if(isset($option['key'])) $sql .="AND key = '".(string)strtoupper(tep_db_input($option['key']))."' ";
+
+ if($sql =='')
+ return false;
+
+ $sql ="SELECT * FROM ".TABLE_ADMIN_EXTRA." WHERE ".substr($sql,3);
+
+ $res=$DB->query($sql);
+
+ $num = $res->__get('numRows');
+
+ if($num == 1){
+ $result=$res->fetchAssoc();
+ return ((!$shortkey)? $result : self::CleanKey($result));
+ }
+ elseif($num > 1){
+ $array=array();
+
+ foreach($res->fetchAllAssoc() as $result)
+ $array[]= ((!$shortkey)? $result : self::CleanKey($result));
+
+ return $array;
+ }
+
+ return false;
+ }
+
+ /**
+ @brief delete row
+ */
+ public static function delete($option){
+ $DB=Database::getInstance();
+
+ $sql ="";
+ if(isset($option['id'])) $sql .="AND data_id = '".(int)$option['id']."' ";
+ if(isset($option['key'])) $sql .="AND key = '".(string)tep_db_input($option['key'])."' ";
+
+ if(strlen($sql)==0)
+ return false;
+
+ $sql ="DELETE FROM ".TABLE_ADMIN_EXTRA." WHERE ".substr($sql,3);
+
+ $res=$DB->query($sql);
+
+ return $res;
+ }
+
+ /**
+ @fn CleanKey()
+ @brief Clean string name key
+ */
+ private static function CleanKey($array){
+
+ $object= new stdclass();
+
+ foreach($array as $key=>$value){
+
+ $object->$key = $value;
+ }
+
+ return $object;
+ }
+
+ /**
+ @brief
+ @return array empty
+ */
+ public static function Specimen($shortkey=false){
+
+ $par = array(
+ 'data_id'=>-1,
+ 'type' =>'',
+ 'key' =>'',
+ 'value' =>'',
+
+ );
+
+ return ((!$shortkey)? $par : self::CleanKey($par));
+ }
+
+}
+
+
+
+?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/classes/drivers/sqladmingroups.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqladmingroups.php 2012-04-08 16:19:59 UTC (rev 4181)
+++ trunk/catalog/admin/includes/classes/drivers/sqladmingroups.php 2012-04-09 12:36:26 UTC (rev 4182)
@@ -43,12 +43,13 @@
if(isset($option['id'])) $sql_data_array['admin_groups_id'] = $option['id'];
if(isset($option['name'])) $sql_data_array['admin_groups_name'] = $option['name'];
+ if(isset($option['status'])) $sql_data_array['admin_groups_status'] = (int)$option['status'];
// $sql_data_array['admin_created'] = 'now()';
- $res=tep_db_perform(TABLE_ADMIN, $sql_data_array);
+ $res=tep_db_perform(TABLE_ADMIN_GROUPS, $sql_data_array);
if(!$res)
return $res;
@@ -66,13 +67,15 @@
$where ='';
if(isset($option['id'])) $where .="AND admin_groups_id = '".(int)$option['id']."' ";
+ if(isset($option['status'])) $where .="AND admin_groups_status = '".(int)$option['status']. "' " ;
if(isset($option['id'])) $sql_data_array['admin_groups_id'] = $option['id'];
if(isset($option['name'])) $sql_data_array['admin_groups_name'] = $option['name'];
+ if(isset($option['new_status'])) $sql_data_array['admin_groups_status'] = (int)$option['new_status'];
// $sql_data_array['admin_modified'] = 'now()';
- $res=tep_db_perform(TABLE_ADMIN, $sql_data_array, 'update' , substr($where,3) );
+ $res=tep_db_perform(TABLE_ADMIN_GROUPS, $sql_data_array, 'update' , substr($where,3) );
return $res;
}
@@ -102,18 +105,18 @@
self::getInstance();
$DB=Database::getInstance();
+ $where = "";
$sql ="";
if(isset($option['id'])) $sql .="AND admin_groups_id = '".(int)tep_db_input($option['id'])."' ";
if(isset($option['name'])) $sql .="AND admin_groups_name = '".(int)(string)tep_db_input($option['name'])."' ";
+ if(isset($option['status'])) $sql .="AND admin_groups_status = '".(int)$option['status']. "' " ;
+ if($sql !='')
+ $where = " WHERE ".substr($sql,3);
- if($sql =='')
- return false;
+ $sql="SELECT * FROM " . TABLE_ADMIN_GROUPS . " g ".
+ $where;
- $sql="SELECT * FROM " . TABLE_ADMIN . " a ".
- " LEFT JOIN " . TABLE_ADMIN_GROUPS . " g ON (a.admin_groups_id=g.admin_groups_id) ".
- " WHERE ".substr($sql,3);
-
$res=$DB->query($sql);
$num = $res->__get('numRows');
@@ -126,7 +129,7 @@
$array=array();
foreach($res->fetchAllAssoc() as $result)
- $array[]= ((!$shortkey)? $result : self::CleanKey($result));
+ $array[]= ((!$shortkey)? $result : self::CleanKey($result));
return $array;
}
@@ -153,7 +156,7 @@
// utilisateur de ce groupe
$res = sqladminuser::fetch(array('group_id'=>(int)$_id));
// groupe
- $DB->query("delete from " . TABLE_ADMIN . " where admin_id = '" . (int)$_id . "'");
+ $DB->query("delete from " . TABLE_ADMIN_GROUPS . " where admin_id = '" . (int)$_id . "'");
return true;
@@ -165,13 +168,10 @@
@return array product empty
*/
public static function Specimen(){
- $par = array('admin_groups_id' => '',
- 'admin_firstname' => '',
- 'admin_lastname' => '',
- 'admin_email_address' => '',
- 'admin_modified' => '',
- 'admin_password' => '',
- 'url_openid' => '',
+ $par = array(
+ 'admin_groups_id' => '',
+ 'admin_groups_name' => '',
+ 'admin_groups_status' => '',
);
return self::CleanKey($par);
@@ -188,8 +188,8 @@
$object= new stdclass();
foreach($array as $key=>$value){
- if( strpos($key,'admin_') ===0)
- $key=substr($key,6);
+ if( strpos($key,'admin_groups') ===0)
+ $key=substr($key,strlen('admin_groups_'));
$object->$key = $value;
Modified: trunk/catalog/admin/includes/classes/drivers/sqladminuser.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqladminuser.php 2012-04-08 16:19:59 UTC (rev 4181)
+++ trunk/catalog/admin/includes/classes/drivers/sqladminuser.php 2012-04-09 12:36:26 UTC (rev 4182)
@@ -41,11 +41,13 @@
if(!isset($option['password']))
return 'password';
- if(isset($option['groups_id'])) $sql_data_array['admin_groups_id'] = $option['groups_id'];
+ if(isset($option['groups_id'])) $sql_data_array['admin_groups_id'] = (int)$option['groups_id'];
if(isset($option['firstname'])) $sql_data_array['admin_firstname'] = $option['firstname'];
if(isset($option['lastname'])) $sql_data_array['admin_lastname'] = $option['lastname'];
if(isset($option['email_address'])) $sql_data_array['admin_email_address'] = $option['email_address'];
if(isset($option['password'])) $sql_data_array['admin_password'] = $option['password'];
+ if(isset($option['language_id'])) $sql_data_array['admin_language_id'] = (int)$option['language_id'];
+ if(isset($option['status'])) $sql_data_array['admin_status'] = (int)$option['status'];
$sql_data_array['admin_created'] = 'now()';
@@ -69,11 +71,13 @@
$where ='';
if(isset($option['id'])) $where .="AND admin_id = '".(int)$option['id']."' ";
- if(isset($option['groups_id'])) $sql_data_array['admin_groups_id'] = $option['groups_id'];
- if(isset($option['firstname'])) $sql_data_array['admin_firstname'] = $option['firstname'];
- if(isset($option['lastname'])) $sql_data_array['admin_lastname'] = $option['lastname'];
- if(isset($option['email_address'])) $sql_data_array['admin_email_address'] = $option['email_address'];
- if(isset($option['password'])) $sql_data_array['admin_password'] = $option['password'];
+ if(isset($option['groups_id'])) $sql_data_array['admin_groups_id'] = $option['groups_id'];
+ if(isset($option['firstname'])) $sql_data_array['admin_firstname'] = $option['firstname'];
+ if(isset($option['lastname'])) $sql_data_array['admin_lastname'] = $option['lastname'];
+ if(isset($option['email_address'])) $sql_data_array['admin_email_address']= $option['email_address'];
+ if(isset($option['password'])) $sql_data_array['admin_password'] = $option['password'];
+ if(isset($option['language_id'])) $sql_data_array['admin_language_id'] = (int)$option['language_id'];
+ if(isset($option['status'])) $sql_data_array['admin_status'] = (int)$option['status'];
$sql_data_array['admin_modified'] = 'now()';
@@ -110,6 +114,7 @@
$sql ="";
if(isset($option['id'])) $sql .="AND admin_id = '".(int)tep_db_input($option['id'])."' ";
if(isset($option['group_id'])) $sql .="AND a.admin_groups_id = '".(int)(string)tep_db_input($option['group_id'])."' ";
+ if(isset($option['email'])) $sql .="AND admin_email_address = '".(int)tep_db_input($option['email'])."' ";
@@ -174,6 +179,8 @@
'admin_email_address' => '',
'admin_modified' => '',
'admin_password' => '',
+ 'admin_language_id' => '',
+ 'admin_status' => '',
'url_openid' => '',
);
Modified: trunk/catalog/admin/includes/classes/drivers/sqlcategoriesextra.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlcategoriesextra.php 2012-04-08 16:19:59 UTC (rev 4181)
+++ trunk/catalog/admin/includes/classes/drivers/sqlcategoriesextra.php 2012-04-09 12:36:26 UTC (rev 4182)
@@ -44,7 +44,7 @@
*/
public static function update($option){
- if(!isset($option['id'])) return ' id';
+// if(!isset($option['id'])) return ' id';
$where ='';
if(isset($option['id'])) $where .="AND categories_id = '".(int)$option['id']."' ";
@@ -90,8 +90,11 @@
if(isset($option['id'])) $sql .="AND categories_id = '".(int)$option['id']."' ";
if(isset($option['key'])) $sql .="AND cat_key = '".(string)strtoupper(tep_db_input($option['key']))."' ";
- $sql ="SELECT * FROM ".TABLE_CATEGORIES_EXTRA." WHERE ".substr($sql,3);
+ if($sql =='')
+ return false;
+ $sql ="SELECT * FROM ".TABLE_CATEGORIES_EXTRA." WHERE ".substr($sql,3);
+
$res=$DB->query($sql);
$num = $res->__get('numRows');
Modified: trunk/catalog/admin/includes/classes/emailUtility.php
===================================================================
--- trunk/catalog/admin/includes/classes/emailUtility.php 2012-04-08 16:19:59 UTC (rev 4181)
+++ trunk/catalog/admin/includes/classes/emailUtility.php 2012-04-09 12:36:26 UTC (rev 4182)
@@ -163,21 +163,21 @@
/// fix path
if( file_exists( DIR_FS_ROOT_DOCS . self::$PATH_DOCS_EMAIL. self::PATH_PUBLICCUSTOMERS.$template) ){
- @include(DIR_FS_CATALOG.DIR_WS_LANGUAGES . $language .'/'.DIR_MODELES . self::TYPE_EMAIL . USE_MODELE_EMAIL.'/' .substr($template, 0, strlen($template)-4) .'.txt');
+ $lg=DIR_FS_CATALOG.DIR_WS_LANGUAGES . $language .'/'.DIR_MODELES . self::TYPE_EMAIL . USE_MODELE_EMAIL.'/' .substr($template, 0, strlen($template)-4) .'.txt';
$dir = DIR_FS_ROOT_DOCS . self::$PATH_DOCS_EMAIL . self::PATH_PUBLICCUSTOMERS ;
}
elseif( file_exists( DIR_FS_ROOT_DOCS . self::$PATH_DOCS_EMAIL . self::DOCS_ADMINUSER . $template) ){
- @include(DIR_FS_ADMIN.DIR_WS_LANGUAGES . $language .'/'.DIR_MODELES . self::TYPE_EMAIL . USE_MODELE_EMAIL.'/'.substr($template, 0, strlen($template)-4) .'.txt');
+ $lg=DIR_FS_ADMIN.DIR_WS_LANGUAGES . $language .'/'.DIR_MODELES . self::TYPE_EMAIL . USE_MODELE_EMAIL.'/'.substr($template, 0, strlen($template)-4) .'.txt';
$dir = DIR_FS_ROOT_DOCS . self::$PATH_DOCS_EMAIL .self:: DOCS_ADMINUSER ;
}
else{
$template = 'defaut.tpl';
- @include(DIR_FS_CATALOG.DIR_WS_LANGUAGES . $language .'/'.DIR_MODELES . self::TYPE_EMAIL . USE_MODELE_EMAIL.'/'.substr($template, 0, strlen($template)-4) .'.txt');
+ $lg=DIR_FS_CATALOG.DIR_WS_LANGUAGES . $language .'/'.DIR_MODELES . self::TYPE_EMAIL . USE_MODELE_EMAIL.'/'.substr($template, 0, strlen($template)-4) .'.txt';
$dir = DIR_FS_ROOT_DOCS . self::$PATH_DOCS_EMAIL . self::PATH_PUBLICCUSTOMERS ;
}
+ include($lg);
-
$tpl = &Template::singleton();
if (!empty($tpl->error)) {
$messageStack->add_session($tpl->error, 'error');
Modified: trunk/catalog/admin/includes/classes/fileUtility.php
===================================================================
--- trunk/catalog/admin/includes/classes/fileUtility.php 2012-04-08 16:19:59 UTC (rev 4181)
+++ trunk/catalog/admin/includes/classes/fileUtility.php 2012-04-09 12:36:26 UTC (rev 4182)
@@ -113,7 +113,7 @@
public static function _unlink($source){
- if (is_writeable($source))
+ if (file_exists($source) && is_writeable($source))
return unlink($source);
else
self::ComportForError(__CLASS__.'->'.__FUNCTION__.'::'.__LINE__.__('error file not removeable'). $source, 'error');
Modified: trunk/catalog/admin/includes/classes/login_ident.php
===================================================================
--- trunk/catalog/admin/includes/classes/login_ident.php 2012-04-08 16:19:59 UTC (rev 4181)
+++ trunk/catalog/admin/includes/classes/login_ident.php 2012-04-09 12:36:26 UTC (rev 4182)
@@ -48,7 +48,7 @@
*/
public function init_login(){
$DB=Database::getInstance();
- $check_admin_query = $DB->query($sql="select admin_id as login_id, admin_groups_id as login_groups_id, admin_firstname as login_firstname, admin_email_address as login_email_address, admin_password as login_password, admin_modified as login_modified, admin_logdate as login_logdate, admin_lognum as login_lognum from " . TABLE_ADMIN . " where admin_id = '" . (int)self::$lID . "'");
+ $check_admin_query = $DB->query($sql="select admin_id as login_id, admin_groups_id as login_groups_id, admin_firstname as login_firstname, admin_email_address as login_email_address, admin_password as login_password, admin_modified as login_modified, admin_logdate as login_logdate, admin_lognum as login_lognum from " . TABLE_ADMIN . " where admin_id = '" . (int)self::$lID . "' AND admin_status = '1' ");
$check_admin = $check_admin_query->fetchAssoc();
Added: trunk/catalog/admin/includes/classes/oscss_acl.php
===================================================================
--- trunk/catalog/admin/includes/classes/oscss_acl.php (rev 0)
+++ trunk/catalog/admin/includes/classes/oscss_acl.php 2012-04-09 12:36:26 UTC (rev 4182)
@@ -0,0 +1,138 @@
+<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 09/04/2012, 09:08
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+*/
+
+
+/**
+ @class oscss_acl
+*/
+class oscss_acl {
+ /**
+ @var file name not control acl
+ */
+ private $authorise = array();
+ /**
+ @var page_id
+ */
+ private $page_id ;
+ /**
+ @var current object detail row
+ */
+ private $current = array() ;
+ /**
+ @var ressource instance
+ */
+ protected static $_instance;
+
+
+ /**
+ @fn __construct()
+ @brief constructor
+ */
+ protected function __construct(){
+ $this->authorise=array(
+ FILENAME_DEFAULT,
+ FILENAME_FORBIDEN,
+ FILENAME_LOGOFF,
+ FILENAME_ADMIN_ACCOUNT
+ );
+
+ $this->page_id = 0;
+
+ }
+
+ /**
+ @fn loafconfig()
+ @brief
+ */
+ public static function getInstance() {
+ if(self::$_instance == null)
+ self::$_instance = new self();
+
+ return self::$_instance;
+ }
+
+ /**
+ @fn loafconfig()
+ @brief
+ */
+ function loafconfig(){
+ $sql ="SELECT u.action FROM " . TABLE_ADMIN_FILES2RIGHT." u ".
+ " WHERE files_id = '" . $this->page_id . "' AND ( u.ref_id = '0' AND u.ref_id = '" .(int) $_SESSION['login_groups_id'] . "' ) OR ( u.ref_id = '1' AND u.ref_id = '" .(int) $_SESSION['login_id'] . "' ) ";
+
+ $_query = tep_db_query($sql);
+
+ if (!tep_db_num_rows($_query))
+ return false;
+ else{
+ foreach($_query->fetchAllAssoc() as $row)
+ $this->current[] = $row['action'];
+ }
+ }
+
+ /**
+ @fn PageRight()
+ @brief
+ */
+ function PageRight($_page){
+ $filename = trim($_page);
+
+
+ if (
+ in_array($filename,$this->authorise)
+ || in_array(substr($filename,0,strpos($filename,'?') ),array('attributeManager.php'))
+ )
+ return true;
+
+ $sql ="SELECT f.admin_files_id, f.admin_files_name FROM " . TABLE_ADMIN_FILES . " f , ".TABLE_ADMIN_GROUPS." u ".
+ " WHERE FIND_IN_SET( '" .(int) $_SESSION['login_groups_id'] . "', f.admin_groups_id) AND admin_files_name = '" . $filename . "' AND u.admin_groups_id = '" .(int) $_SESSION['login_groups_id'] . "' AND admin_groups_status = 1 ";
+
+ $_query = tep_db_query($sql);
+
+ if (!tep_db_num_rows($_query))
+ return false;
+ else{
+ $res = $_query->fetchAssoc();
+ $this->page_id = $res['admin_files_id'];
+
+ $this->loafconfig();
+ }
+
+
+ return true;
+ }
+
+ /**
+ @fn ActionRight()
+ @brief
+ */
+ function ActionRight($action, $_page=''){
+ return true;
+
+
+// if( (int) $_SESSION['login_groups_id'] == 1)
+// return true;
+// elseif (
+// in_array($action,$this->current)
+// )
+// return true;
+// else
+// return false;
+ }
+
+ /**
+ @fn Block()
+ @brief
+ */
+ function Block(){
+ tep_redirect(tep_href_link(FILENAME_FORBIDEN,'', 'NONSSL'));
+ }
+}
+
+?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/exts/package/packageRepository.php
===================================================================
--- trunk/catalog/admin/includes/exts/package/packageRepository.php 2012-04-08 16:19:59 UTC (rev 4181)
+++ trunk/catalog/admin/includes/exts/package/packageRepository.php 2012-04-09 12:36:26 UTC (rev 4182)
@@ -1,10 +1,10 @@
<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 31/10/11, 15:47
+ @date 09/04/2012, 15:47
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class packageRepository
@@ -12,7 +12,6 @@
if(!class_exists('package')) include_once(DIR_WS_MODULES .'pages/package.php');
-error_reporting(E_ALL);
class packageRepository
extends package {
@@ -119,6 +118,7 @@
if(isset($Repos->error)){
$messageStack->add_session(sprintf(__('package packageRepository error in process for repository %s :>> %s') , $repo->repository , self::FomatError($Repos->error ) ),'error' );
+ return false;
}
return $Repos;
@@ -161,7 +161,12 @@
if((string)$repo->key =='local'){
//! add local package
$locale=0;
- foreach(scan(DIR_FS_CIP) as $item){
+ foreach(scan(DIR_FS_CIP) as $item)
+ if(substr($item,0,1) !='.') {
+
+ //! compteur entree / repository
+ $comp=0;
+
$pkg=(!is_dir(DIR_FS_CIP.$item))?substr($item, 0,(strlen($item) -4) ) : $item;
if(!isset($temparray[md5($pkg)]) && $pkg !='index.' && !empty($pkg)) {
@@ -214,53 +219,54 @@
}
//! message
if(count($var_file)==0)
- throw new Exception('Erreur recuperation');
+ $messageStack->add_session(__('Erreur recuperation') ,'error' );
+// throw new Exception('Erreur recuperation');
else
$messageStack->add_session(sprintf(__('package packageRepository repository %supdate ok'),$repo->title) ,'success' );
}
else{
- if($Repos = self::InitConnexion($repo, 'listing') ){
+ if( ($Repos = self::InitConnexion($repo, 'listing')) && $Repos !=false ){
- //! compteur entree / repository
- $comp=0;
+ //! compteur entree / repository
+ $comp=0;
- if(!isset($Repos->channel->item))
- return $Repos;
+ if(!isset($Repos->channel->item))
+ return $Repos;
- $objres=$Repos->channel->item;
+ $objres=$Repos->channel->item;
- foreach($objres as $item){
+ foreach($objres as $item){
- if(!isset($temparray[md5((string)$item->ident.'_'.(string)$item->level)]) ) {
- $item->sourceTitle=(string)$repo->title;
- $item->sourceKey=(string)$repo->key;
- $item->internalID=$InternalID;
- $comp++;
- $InternalID++;
- $dom_sxe = dom_import_simplexml($item);
- $dom_sxe=$dom->importNode($dom_sxe, true);
- $channel->appendChild($dom_sxe);
- $dom->saveXML();
+ if(!isset($temparray[md5((string)$item->ident.'_'.(string)$item->level)]) ) {
+ $item->sourceTitle=(string)$repo->title;
+ $item->sourceKey=(string)$repo->key;
+ $item->internalID=$InternalID;
+ $comp++;
+ $InternalID++;
+ $dom_sxe = dom_import_simplexml($item);
+ $dom_sxe=$dom->importNode($dom_sxe, true);
+ $channel->appendChild($dom_sxe);
+ $dom->saveXML();
- $temparray[md5((string)$item->ident.'_'.(string)$item->level)]='';
- }
- }
+ $temparray[md5((string)$item->ident.'_'.(string)$item->level)]='';
+ }
+ }
- //! mise en cache info
- $var_file[(string)$repo->key]['last_update']= date("Y-m-d H:n:s");
- $var_file[(string)$repo->key]['count']= $comp;
- $var_file[(string)$repo->key]['title']= (string)$repo->title;
- $var_file[(string)$repo->key]['link']= (string)$repo->repository;
- // $var_file[(string)$repo->key]['object']=$objres;
+ //! mise en cache info
+ $var_file[(string)$repo->key]['last_update']= date("Y-m-d H:n:s");
+ $var_file[(string)$repo->key]['count']= $comp;
+ $var_file[(string)$repo->key]['title']= (string)$repo->title;
+ $var_file[(string)$repo->key]['link']= (string)$repo->repository;
+ // $var_file[(string)$repo->key]['object']=$objres;
- //! message
- $messageStack->add_session(sprintf(__('package packageRepository repository %supdate ok'),$repo->title) ,'success' );
+ //! message
+ $messageStack->add_session(sprintf(__('package packageRepository repository %supdate ok'),$repo->title) ,'success' );
- $compteur +=$comp;
- }
+ $compteur +=$comp;
+ }
+// else
-
}
//! mise en cache global
$var_file['global']['last_update']= date("Y-m-d H:n:s");
@@ -276,6 +282,8 @@
if($dom->save(DIR_FS_ROOT_DOCS.'admin/data/'.parent::REPOSITORY_DATA) !=true)
throw new Exception('erreur enregistrement');
+
+
$osCSS_Cache->writeBuffer($var_file,true);
Modified: trunk/catalog/admin/includes/functions/general.php
===================================================================
--- trunk/catalog/admin/includes/functions/general.php 2012-04-08 16:19:59 UTC (rev 4181)
+++ trunk/catalog/admin/includes/functions/general.php 2012-04-09 12:36:26 UTC (rev 4182)
@@ -60,29 +60,34 @@
/**
- @author oscim - OscssTeam
- @version 1.0
- Verifie si user loggé, sinon renvoi sur login
- Verifie l'acl sur la page en cours, sinon renvoi vers forbiden
+ @fn tep_admin_check_login()
+ @brief Verifie si user loggé, sinon renvoi sur login
+ puis Verifie l'acl sur la page en cours, sinon renvoi vers forbiden
*/
function tep_admin_check_login() {
global $navigation, $current_page;
if (!tep_session_is_registered('login_id')) {
$navigation->set_snapshot();
tep_redirect(tep_href_link(FILENAME_LOGIN, '', 'SSL'));
- } else {
- $filename = trim($current_page);
- $authorise=array(FILENAME_DEFAULT,FILENAME_FORBIDEN,FILENAME_LOGOFF,FILENAME_ADMIN_ACCOUNT);
- if (!in_array($filename,$authorise) && !in_array(substr($filename,0,strpos($filename,'?') ),array('attributeManager.php'))){
- $db_file_query = tep_db_query("select admin_files_name from " . TABLE_ADMIN_FILES . " where FIND_IN_SET( '" . $_SESSION['login_groups_id'] . "', admin_groups_id) and admin_files_name = '" . $filename . "'");
- if (!tep_db_num_rows($db_file_query)) {
- tep_redirect(tep_href_link(FILENAME_FORBIDEN,'', 'NONSSL'));
- }
- }
+ }
+ else {
+ $acl = oscss_acl::getInstance();
+ if( ! $acl->PageRight($current_page) )
+ $acl->Block();
}
}
/**
+ @fn tep_action_check()
+ @brief test acl groups puis utilisateur pour l'action precisé
+*/
+function tep_action_check($action) {
+ $acl = oscss_acl::getInstance();
+ return $acl->ActionRight($action) ;
+}
+
+
+/**
@author OscssTeam
@version 1.0
@return 'true' or 'false' value to display boxes and files in index.php
Modified: trunk/catalog/admin/includes/gabarit/adminAccount/display_view.page.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/adminAccount/display_view.page.gab 2012-04-08 16:19:59 UTC (rev 4181)
+++ trunk/catalog/admin/includes/gabarit/adminAccount/display_view.page.gab 2012-04-09 12:36:26 UTC (rev 4182)
@@ -9,6 +9,9 @@
@encode UTF-8
@brief content admin account detail
*/
+
+// var_dump(__FILE__);
+// exit;
?>
<h3><?php echo __('heading title'); ?></h3>
<div class="block_form">
@@ -24,7 +27,7 @@
<div id="tabs-1" class="tabPage">
<div >
<?php
- if ((adminAccount::$myAccount->admin_lognum <= 1) ) printf(__('text info intro default first time'), adminAccount::$myAccount->admin_firstname);
+ if ((adminAccount::$myAccount->lognum <= 1) ) printf(__('text info intro default first time'), adminAccount::$myAccount->firstname);
/* Liens d'initalisation du menu */
echo '<br /><br />'.__('init menu admin').' <a class="button" href="'.tep_href_link(FILENAME_ADMIN_ACCOUNT,'action=init_menu').'">'.__('image init menu').'</a><br /><br />';
Modified: trunk/catalog/admin/includes/gabarit/adminGroup/display_view.define_group.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/adminGroup/display_view.define_group.gab 2012-04-08 16:19:59 UTC (rev 4181)
+++ trunk/catalog/admin/includes/gabarit/adminGroup/display_view.define_group.gab 2012-04-09 12:36:26 UTC (rev 4182)
@@ -71,7 +71,7 @@
$group_boxes_files['admin_boxes_id']=$group_boxes_files['admin_files_id'];
$group_boxes_files['admin_boxes_name']=$group_boxes_files['admin_files_name'];
$groupsArray =array();
-
+// print_r($fils);
if ($group_boxes_files['etat'] ==true) {
$del_boxes = array($_GET['gID']);
$groupsArray[]=$_GET['gID'];
@@ -92,13 +92,13 @@
$page_box=(empty($regi[1])) ? $group_boxes_files['admin_files_name'] : $regi[1] ;
?>
<p style="clear:both; padding:0 1em;" class="view parent dataTableRow" >
- <span style="width:40px" class="fleft"><?php echo adminGroup::status_flag($checked,'action=setflag&gID='.$_GET['gID'].'&admin_files_id='.$group_boxes_files['admin_files_id'],'#afi_'.$group_boxes['admin_boxes_id']); //tep_draw_checkbox_field('groups_to_boxes[]', 'ubgroups_' . $group_boxes['admin_boxes_id'], $group_boxes_files['admin_files_id'], $checked, '', 'onclick="checkSub(this)"') ?></span>
+ <span style="padding-left:<?php if($group_boxes_files['type'] =='ss_menu') echo '10' ?>px; width:40px" class="fleft"><?php if($group_boxes_files['type'] !='ss_menu') echo adminGroup::status_flag($checked,'action=setflag&gID='.$_GET['gID'].'&admin_files_id='.$group_boxes_files['admin_files_id'],'#afi_'.$group_boxes['admin_boxes_id']); ?></span>
<span class="fleft"><?php echo $group_boxes_files['admin_files_name'] ?></span>
<?php echo tep_draw_hidden_field('menu_id_' . $group_boxes_files['admin_files_id'], '', $group_boxes_files['admin_files_id']) . tep_draw_hidden_field('unchecked_' . $group_boxes_files['admin_files_id'], '', $uncheckedBox);?>
<span class="view fils fright">
</span>
</p>
- <?php /*} */
+ <?php
if (isset($group_boxes_files['fils']) && is_array($group_boxes_files['fils'])) list_hierac($group_boxes_files['fils'],'hierac_enfant');
} /* Fin de while*/
Modified: trunk/catalog/admin/includes/gabarit/adminGroup/display_view.listing.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/adminGroup/display_view.listing.gab 2012-04-08 16:19:59 UTC (rev 4181)
+++ trunk/catalog/admin/includes/gabarit/adminGroup/display_view.listing.gab 2012-04-09 12:36:26 UTC (rev 4182)
@@ -8,12 +8,13 @@
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
+
?>
<h3><?php echo __('heading title'); ?></h3>
<div class="button_nav">
- <?php echo ' <a class="button" href="' . tep_href_link(adminGroup::FILENAME, 'action=new') . '">' .tep_image(DIR_WS_ICONS . 'icon_add_new.png',IMAGE_NEW_GROUP). IMAGE_NEW_GROUP . '</a>'; ?>
+ <?php if(tep_action_check('new')) echo ' <a class="button" href="' . tep_href_link(adminGroup::FILENAME, 'action=new') . '">' .tep_image(DIR_WS_ICONS . 'icon_add_new.png',IMAGE_NEW_GROUP). IMAGE_NEW_GROUP . '</a>'; ?>
</div>
<div class="box_uniq">
@@ -22,7 +23,8 @@
<thead>
<tr>
<th><?php echo __('table heading groups name'); ?></th>
- <th class="tright"><?php echo __('table heading action'); ?></th>
+ <th><?php echo __('table heading groups status'); ?></th>
+ <th class="tright row_action"><?php echo __('table heading action'); ?></th>
</tr>
</thead>
<tfoot>
@@ -34,20 +36,21 @@
<?php foreach(adminGroup::$list as $groups){ ?>
<tr class="view parent dataTableRow <?php if(isset($_GET['gID']) && $_GET['gID'] == $groups['admin_groups_id']) echo "Selected"; ?>" >
<td><strong><?php echo $groups['admin_groups_name']; ?></strong></td>
- <td class="tright">
+ <td><strong><?php echo adminGroup::GetStatus($groups); ?></strong></td>
+ <td class="tright row_action">
<span class="view fils fright">
<?php
-// if (adminGroup::$gInfo->admin_groups_id != 1)
- echo ' <a class="buttonimg" href="' . tep_href_link(adminGroup::FILENAME, 'gID=' . $groups['admin_groups_id'] . '&action=define_group') . '">' . tep_image(DIR_WS_ICONS .
-'locked.gif',__('image define groups') ). '</a> ';
+ if ($groups['admin_groups_id'] != 1)
+ echo ' <a class="buttonimg" href="' . tep_href_link(adminGroup::FILENAME, 'gID=' . $groups['admin_groups_id'] . '&action=define_group') . '">' . tep_image(DIR_WS_ICONS .
+ 'locked.gif',__('image define groups') ). '</a> ';
- echo ' <a class="buttonimg" href="' . tep_href_link(FILENAME_ADMINUSERS, 'group_id=' . $groups['admin_groups_id'] . '&action=new_member') . '">' . tep_image(DIR_WS_ICONS .
-'icon_add_new.png', __('image
-add user in this group') ). '</a> ';
- echo ' <a class="buttonimg" href="' . tep_href_link(adminGroup::FILENAME, 'gID=' . $groups['admin_groups_id'] . '&action=edit') . '">' . tep_image(DIR_WS_ICONS . 'icon_edit.png',
-__('image edit') ). '</a> ';
+ echo ' <a class="buttonimg" href="' . tep_href_link(FILENAME_ADMINUSERS, 'group_id=' . $groups['admin_groups_id'] . '&action=new') . '">' . tep_image(DIR_WS_ICONS .
+ 'icon_add_new.png', __('image
+ add user in this group') ). '</a> ';
+ echo ' <a class="buttonimg" href="' . tep_href_link(adminGroup::FILENAME, 'gID=' . $groups['admin_groups_id'] . '&action=edit') . '">' . tep_image(DIR_WS_ICONS . 'icon_edit.png',
+ __('image edit') ). '</a> ';
- if($groups['admin_groups_id'] !=1) echo '<a class="buttonimg fancy" href="' . tep_href_link(adminGroup::FILENAME, 'gID=' . $groups['admin_groups_id'] . '&action=delete') . '">' . tep_image(DIR_WS_ICONS . 'icon_delete.png',IMAGE_DELETE).'</a>'; ?>
+ if($groups['admin_groups_id'] !=1) echo '<a class="buttonimg fancy" href="' . tep_href_link(adminGroup::FILENAME, 'gID=' . $groups['admin_groups_id'] . '&action=delete') . '">' . tep_image(DIR_WS_ICONS . 'icon_delete.png',IMAGE_DELETE).'</a>'; ?>
</span>
</td>
</tr>
Modified: trunk/catalog/admin/includes/gabarit/adminUsers/display_view.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/adminUsers/display_view.edit.gab 2012-04-08 16:19:59 UTC (rev 4181)
+++ trunk/catalog/admin/includes/gabarit/adminUsers/display_view.edit.gab 2012-04-09 12:36:26 UTC (rev 4182)
@@ -4,60 +4,61 @@
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 12/03/2012, 19:33
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @date 07/04/2012 ,13:40:10
+ @author genrated by GenerCode
@encode UTF-8
*/
+
?>
-<h3><?php echo __('heading title'); ?></h3>
+<h3><?php echo __('heading title edit'); ?></h3>
- <div class="button_nav">
- <?php echo ' <a class="button" href="' . tep_href_link(adminUsers::FILENAME, 'action=new_member') . '">' .tep_image(DIR_WS_ICONS . 'icon_add_new.png',IMAGE_NEW_MEMBER). IMAGE_NEW_MEMBER . '</a>'; ?>
- </div>
+<div class="box_uniq block_form">
-<div class="box_uniq">
- <div class="box_left">
- <table class="dataTable">
- <thead>
- <tr>
- <th><?php echo __('table heading name'); ?></th>
- <th><?php echo __('table heading email'); ?></th>
- <th class="tcenter"><?php echo __('table heading groups'); ?></th>
- <th class="tcenter"><?php echo __('table heading lognum'); ?></th>
- <th class="row_action"><?php echo __('table heading action'); ?></th>
- </tr>
- </thead>
-<?php /* <tfoot>
- <tr>
- <td colspan="2"><?php echo $db_admin_split->display_count($db_admin_query_numrows, MAX_DISPLAY_SEARCH_RESULTS, $page, TEXT_DISPLAY_NUMBER_OF_MEMBERS); ?></td>
- <td colspan="2"><?php echo $db_admin_split->display_links($db_admin_query_numrows, MAX_DISPLAY_SEARCH_RESULTS, MAX_DISPLAY_PAGE_LINKS, $page); ?></td>
- </tr>
- </tfoot> */ ?>
- <tbody>
- <?php foreach(adminUsers::$list as $admin){ ?>
- <tr class="view parent dataTableRow <?php if ((!isset($_GET['mID'])) || ($_GET['mID'] == $admin['admin_id']) ) echo "Selected"; ?>" >
- <td><?php echo $admin['admin_firstname'].' '.$admin['admin_lastname']; ?></td>
- <td><?php echo $admin['admin_email_address']; ?></td>
- <td class="tcenter"><?php echo $admin['admin_groups_name']; ?></td>
- <td class="tcenter"><?php echo $admin['admin_lognum']; ?></td>
- <td class="row_action">
- <span class="view fils fleft">
- <?php
- echo ' <a class="buttonimg" href="' . tep_href_link(adminUsers::FILENAME, 'mID=' . $admin['admin_id'] . '&action=edit') . '">' . tep_image(DIR_WS_ICONS . 'icon_edit.png',IMAGE_EDIT ). '</a> <a class="buttonimg" href="' . tep_href_link(adminUsers::FILENAME, 'mID=' . $admin['admin_id'] . '&action=del_member') . '">' . tep_image(DIR_WS_ICONS . 'icon_delete.png',IMAGE_DELETE).'</a> '; ?>
- </span>
- <span class="fright">
- <?php if ( (is_object(adminUsers::$mInfo)) && ($admin['admin_id'] == adminUsers::$mInfo->admin_id) ) { echo tep_image(DIR_WS_ICONS . 'icon_arrow_right.gif'); }
- else { echo '<a href="' . tep_href_link(adminUsers::FILENAME, 'mID=' . $admin['admin_id']) . '">' . tep_image(DIR_WS_ICONS . 'icon_info.gif', IMAGE_ICON_INFO) . '</a>'; } ?>
- </span>
- </td>
- </tr>
- <?php } ?>
- </tbody>
- </table>
- </div>
+ <div id="tabs">
+ <ul>
+ <li><a href="#tabs-1"><?php echo __('adminUsers tab specification'); ?></a></li>
+ </ul>
- <div class="box_right">
- <?php echo adminUsers::get_right_bar(); ?>
- </div>
-</div>
\ No newline at end of file
+
+ <div id="tabs-1" class="tabPage">
+
+ <?php echo tep_draw_form('adminUsers', adminUsers::FILENAME, 'action='.((adminUsers::$action == 'new')?'insert' : 'update&cID='.$_GET['cID']), 'post') ?>
+
+
+ <p class="block_input">
+ <Label><?php echo __('text info adminUsers firstname') ?></label>
+ <?php echo tep_draw_input_field('admin_firstname', '', adminUsers::$Info->firstname) ?>
+ </p>
+
+ <p class="block_input">
+ <Label><?php echo __('text info adminUsers lastname') ?></label>
+ <?php echo tep_draw_input_field('admin_lastname', '', adminUsers::$Info->lastname) ?>
+ </p>
+
+ <p class="block_input">
+ <Label><?php echo __('text info adminUsers email') ?></label>
+ <?php echo tep_draw_input_field('admin_email', '', adminUsers::$Info->email_address) ?>
+ </p>
+
+ <p class="block_input">
+ <Label><?php echo __('text info adminUsers groups') ?></label>
+ <?php echo tep_draw_pull_down_menu('admin_groups_id', adminUsers::$Info->allgroups, (isset($_GET['group_id'])? $_GET['group_id'] : adminUsers::$Info->groups_id) ) ?>
+ </p>
+
+
+ <p class="block_input button_nav">
+ <?php
+ echo tep_image_submit('', IMAGE_UPDATE) /*. tep_image_submit('', IMAGE_UPDATE_AND_CLOSE,' name="up_and_close"' )*/;
+ echo tep_js_back(tep_href_link(adminUsers::FILENAME), IMAGE_CANCEL) ;
+ ?>
+ </p>
+ </form>
+ </div>
+
+
+
+ <br class="clear" />
+ </div>
+
+</div>
Modified: trunk/catalog/admin/includes/gabarit/adminUsers/display_view.listing.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/adminUsers/display_view.listing.gab 2012-04-08 16:19:59 UTC (rev 4181)
+++ trunk/catalog/admin/includes/gabarit/adminUsers/display_view.listing.gab 2012-04-09 12:36:26 UTC (rev 4182)
@@ -8,6 +8,7 @@
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
+
?>
<h3><?php echo __('heading title'); ?></h3>
Modified: trunk/catalog/admin/includes/gabarit/cms_content/display_view.delete.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/cms_content/display_view.delete.gab 2012-04-08 16:19:59 UTC (rev 4181)
+++ trunk/catalog/admin/includes/gabarit/cms_content/display_view.delete.gab 2012-04-09 12:36:26 UTC (rev 4182)
@@ -1,10 +1,10 @@
<?php
/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 07/02/11, 19:07
+ @version 2.1.1
+ @date 08/04/2012, 19:07
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
Modified: trunk/catalog/admin/includes/javascript/modules/pages/adminUsers.js.php
===================================================================
--- trunk/catalog/admin/includes/javascript/modules/pages/adminUsers.js.php 2012-04-08 16:19:59 UTC (rev 4181)
+++ trunk/catalog/admin/includes/javascript/modules/pages/adminUsers.js.php 2012-04-09 12:36:26 UTC (rev 4182)
@@ -9,14 +9,16 @@
@encode UTF-8
*/
- if(in_array(adminUsers::$action,array('new','edit','new_member')) ) :
- tep_include_file (DIR_WS_TEMPLATE."jquery.validate.css",true);
- tep_include_file ("includes/javascript/jquery.validate.min.js",true);
- ?>
+if(in_array(adminUsers::$action,array('new','edit','new_member')) ) :
+
+
+ tep_include_file (DIR_WS_TEMPLATE."jquery.validate.css",true);
+ tep_include_file ("includes/javascript/jquery.validate.min.js",true);
+ ?>
<script type="text/javascript">
$(function(){
// validate signup form on keyup and submit
- $("#newmember").validate({
+ var validator = $("#adminUsers").validate({
rules: {
admin_firstname: {
required: true,
@@ -26,8 +28,9 @@
required: true,
minlength: 3
},
- admin_email_address: {
- required: true,
+ admin_email: {
+// required: true,
+ checkmail: true,
email: true
},
admin_groups_id:{
@@ -44,7 +47,7 @@
required: " <?php echo addslashes(__('js alert lastname')) ?>",
minlength: " <?php echo addslashes(__('your lastname must consist of at least 3 characters')) ?>"
},
- admin_email_address: " <?php echo addslashes(__('js alert email')) ?>",
+// admin_email: " <?php echo addslashes(__('js alert email')) ?>",
admin_groups_id: " <?php echo addslashes(__('please enter groupe id')) ?>"
},
errorElement: "span",
@@ -53,6 +56,72 @@
},
onkeyup: true
});
+
+
+
+
+
+
+
+
+
+ jQuery.validator.addMethod("checkmail", function(value, element) {
+// var result = false;
+var exists;
+
+//function to call inside ajax callback
+function set_exists(x){
+ exists = x;
+}
+
+
+$.ajax({
+ url: "<?php echo adminUsers::FILENAME ?>",
+ type: "GET",
+ async: false, // set to false so order of operations is correct
+ data: { action:"CheckMail", ajax : "true", cID : '<?php echo @$_GET['cID'] ?>' , email : value},
+ success: function(data){
+ if(data == true){
+ set_exists(true);
+ }
+ else{
+ set_exists(false);
+ }
+ }
+});
+if(exists == true){
+ return true;
+}
+else{
+ return false;
+}
+
+// var result = $.get("<?php echo adminUsers::FILENAME ?>", { action:"CheckMail", ajax : "true", uID : '<?php echo adminUsers::$Info->id ?>' },
+// function success(data) {
+// // alert(data);
+// // if(data === '1')
+// // result = false;
+// // // alert('dfdf');
+// // else
+// result = true;
+// return true;
+// return false;
+// return result;
+// });
+// alert(result);
+// return true;
+ },
+ jQuery.format("this email already exists")
+ );
+
+// ?action=CheckMail&cID=1&flag=0&forceajax=true
+/*
+ $("#admin_email").onout( function () {
+ $.get("<?php //echo adminUsers::FILENAME ?>", { action:"CheckMail", },
+ function success(data) {
+ $("#state").replaceWith(data);
+ });
+ });*/
});
</script>
- <?php endif; ?>
\ No newline at end of file
+<?php endif; ?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/languages/fr_FR/modeles/email/mouton/admin_members_new.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modeles/email/mouton/admin_members_new.txt 2012-04-08 16:19:59 UTC (rev 4181)
+++ trunk/catalog/admin/includes/languages/fr_FR/modeles/email/mouton/admin_members_new.txt 2012-04-09 12:36:26 UTC (rev 4182)
@@ -7,14 +7,14 @@
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
-$lang['EMAIL_SEPARATOR']="------------------------------------------------------" ;
-$lang['EMAIL_TEXT_SUBJECT']="Rappel de vos informations personnelles" ;
-$lang['EMAIL_TEXT_FOOTER_LG1']="Ceci est un message automatisé, veuillez ne pas répondre !. " ;
+ $lang['EMAIL_SEPARATOR']="------------------------------------------------------" ;
+ $lang['EMAIL_TEXT_SUBJECT']="Rappel de vos informations personnelles" ;
+ $lang['EMAIL_TEXT_FOOTER_LG1']="Ceci est un message automatisé, veuillez ne pas répondre !. " ;
-$lang['ADMIN_EMAIL_TEXT_BONOUR']="Bonjour " ;
-$lang['ADMIN_EMAIL_TEXT_LOGIN']="Nom d\'utilisateur " ;
-$lang['ADMIN_EMAIL_TEXT_MDP']="Mot de passe " ;
-$lang['ADMIN_EMAIL_TEXT_WWW']="Connectez vous " ;
-$lang['ADMIN_EMAIL_TEXT_EMAIL']="Email " ;
-$lang['ADMIN_EMAIL_TEXT']="Cet Email vous fournis les informations nécessaires pour vous connecter à l'interface privé de gestion de la boutique. En cas de besoin contacter l'administrateur du site. " ;
+ $lang['ADMIN_EMAIL_TEXT_BONOUR']="Bonjour " ;
+ $lang['ADMIN_EMAIL_TEXT_LOGIN']="Nom d 'utilisateur " ;
+ $lang['ADMIN_EMAIL_TEXT_MDP']="Mot de passe " ;
+ $lang['ADMIN_EMAIL_TEXT_WWW']="Connectez vous " ;
+ $lang['ADMIN_EMAIL_TEXT_EMAIL']="Email " ;
+ $lang['ADMIN_EMAIL_TEXT']="Cet Email vous fournis les informations nécessaires pour vous connecter à l'interface privé de gestion de la boutique. En cas de besoin contacter l'administrateur du site. " ;
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/pages/adminGroup.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/pages/adminGroup.txt 2012-04-08 16:19:59 UTC (rev 4181)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/adminGroup.txt 2012-04-09 12:36:26 UTC (rev 4182)
@@ -14,6 +14,7 @@
$lang['text count groups']="Groupes : " ;
$lang['TABLE_HEADING_NAME']="Nom" ;
$lang['table heading groups']="Niveau du groupe" ;
+$lang['table heading groups status']="Etat" ;
$lang['table heading action']="Action" ;
$lang['table heading groups name']="Nom du groupe" ;
$lang['TEXT_INFO_DELETE_INTRO_NOT']="Vous ne pouvez pas supprimer <nobr>%s du groupe !</nobr>" ;
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/pages/adminUsers.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/pages/adminUsers.txt 2012-04-08 16:19:59 UTC (rev 4181)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/adminUsers.txt 2012-04-09 12:36:26 UTC (rev 4182)
@@ -7,32 +7,57 @@
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
-$lang['heading title']="Gestion des utilisateurs" ;
-$lang['table heading name']="Nom" ;
-$lang['table heading email']="Email" ;
-$lang['table heading groups']="Groupe" ;
-$lang['table heading lognum']="Accès" ;
-$lang['table heading action']="Action" ;
+
+
$lang['text info heading default']="Gestion du membre" ;
$lang['text info heading delete']="Effacement de permission " ;
$lang['text info heading new']="Nouveau membre d'Admin " ;
$lang['text info delete intro']="Supprimer <nobr><strong>%s</strong></nobr> des <nobr>membres de l'administration ?</nobr>" ;
$lang['text info fullname']="Nom : " ;
-$lang['text info firstname']="Prénom : " ;
-$lang['text info lastname']="Nom : " ;
-$lang['text info email']="Email : " ;
-$lang['text info url_openid']="openID : " ;
-$lang['text info created']="Date de création : " ;
-$lang['text info modified']="Date de modification : " ;
-$lang['text info logdate']="Dernier accès : " ;
-$lang['text info lognum']="Nombre d'accès : " ;
-$lang['text info group']="Groupe : " ;
+
$lang['text none']="choix du groupe" ;
+/* Bouton */
+ $lang['image add adminUsers']="Créer un nouvel utilisateur" ;
+/* Listing */
+ $lang['heading title adminUsers']="Gestion des utilisateurs" ;
+
+ $lang['table heading lastname']="Prenom" ;
+ $lang['table heading firstname']="Nom" ;
+ $lang['table heading email']="Email" ;
+ $lang['table heading group name']="Groupe" ;
+ $lang['table heading lognum']="Accès" ;
+ $lang['table heading status']="Etat" ;
+ $lang['table heading action']="Action" ;
+
+
+/* Edit */
+ $lang['heading title edit']="Gestion du membre" ;
+
+ $lang['adminUsers tab specification']="Profil" ;
+
+ $lang['text info adminUsers firstname']="Prénom : " ;
+ $lang['text info adminUsers lastname']="Nom : " ;
+ $lang['text info adminUsers email']="Email : " ;
+ $lang['text info adminUsers url_openid']="openID : " ;
+ $lang['text info adminUsers created']="Date de création : " ;
+ $lang['text info adminUsers modified']="Date de modification : " ;
+ $lang['text info adminUsers logdate']="Dernier accès : " ;
+ $lang['text info adminUsers lognum']="Nombre d'accès : " ;
+ $lang['text info adminUsers groups']="Groupe : " ;
+
+
+/* Delete */
+ $lang['heading title delete adminUsers']="Suppression d'un utilisateurs" ;
+
+
+
+
+
/** message action re...
[truncated message content] |
|
From: <os...@us...> - 2012-04-08 16:20:07
|
Revision: 4181
http://oscss.svn.sourceforge.net/oscss/?rev=4181&view=rev
Author: oscim
Date: 2012-04-08 16:19:59 +0000 (Sun, 08 Apr 2012)
Log Message:
-----------
Suppression template admin oscss associ?\195?\169 au groupe 2
Removed Paths:
-------------
trunk/catalog/admin/includes/template/oscss/footer-2.php
trunk/catalog/admin/includes/template/oscss/gabarit-2.php
trunk/catalog/admin/includes/template/oscss/header-2.php
trunk/catalog/admin/includes/template/oscss/img/2/
trunk/catalog/admin/includes/template/oscss/inc/init_theme-2.php
trunk/catalog/admin/includes/template/oscss/jquery-ui-2.css
trunk/catalog/admin/includes/template/oscss/stylesheet-2.css
trunk/catalog/admin/includes/template/oscss/stylesheet-ie-2.css
Deleted: trunk/catalog/admin/includes/template/oscss/footer-2.php
===================================================================
--- trunk/catalog/admin/includes/template/oscss/footer-2.php 2012-04-07 09:50:44 UTC (rev 4180)
+++ trunk/catalog/admin/includes/template/oscss/footer-2.php 2012-04-08 16:19:59 UTC (rev 4181)
@@ -1,20 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 05/01/11, 17:14
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-?>
-
-<div id="headInfos">
- <h1><?php echo tep_image(DIR_WS_IMAGES . 'oscss_logo.png', 'osCSS'); ?></h1>
- <h2><?php echo PROJECT_VERSION ;?></h2>
-</div>
-<div id="author">
- <img src="<?php echo DIR_WS_TEMPLATE ?>img/2/logo_oscim.png" alt="oscim" />
- <h2>template by <a href="http://www.oscim.fr">oscim</a></h2>
-</div>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/template/oscss/gabarit-2.php
===================================================================
--- trunk/catalog/admin/includes/template/oscss/gabarit-2.php 2012-04-07 09:50:44 UTC (rev 4180)
+++ trunk/catalog/admin/includes/template/oscss/gabarit-2.php 2012-04-08 16:19:59 UTC (rev 4181)
@@ -1,103 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 16/04/11, 17:01
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
- @include(DIR_WS_INCLUDES . 'content/'.$page_admin.'.top.inc');
- require(DIR_WS_TEMPLATE.'inc/lib.template.php');
- if (($init_theme=tep_test_gab_ele('inc/init_theme')) !=false) require($init_theme);
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" <?php echo HTML_PARAMS; ?> >
-<head>
-<meta http-equiv="content-type" content="text/html; charset=<?php echo CHARSET; ?>" />
-<title><?php echo $page_admin.' | '.TITLE; ?></title>
-<base href="<?php echo tep_get_http().DIR_WS_ADMIN ?>" />
-<?php
- /* Fichier header systheme */
- require(DIR_FS_ADMIN.DIR_WS_INCLUDES . 'header.php');
-
- /* Appel des js et css */
- if (($stylesheet=tep_test_gab_ele('stylesheet','css')) !=false) tep_include_file ($stylesheet,true);
-
- tep_include_file (DIR_WS_TEMPLATE ."jquery-ui-".$_SESSION['login_groups_id'].".css",true);
- tep_include_file ("includes/javascript/jquery-ui.min.js",true);
-// tep_include_file (DIR_WS_TEMPLATE."inc/lib_general-".$_SESSION['login_groups_id'].".js",true);
-
-?>
-<?php if (($header=tep_test_gab_ele('header')) !=false) require($header); ?>
-
-<?php @include( DIR_WS_INCLUDES . "content/".$page_admin.".header.inc") ?>
-
-<!--[if IE]>
- <?php if (($stylesheet=tep_test_gab_ele('stylesheet-ie','css')) !=false) tep_include_file ($stylesheet,true); ?>
-<![endif]-->
-</head>
-
-<body class="<?php echo $page_admin ?>">
- <!-- header //-->
- <div id="header">
- <div id="headInfos">
- <h1><?php echo tep_image(DIR_WS_TEMPLATE . 'img/1/oscss.png', 'osCSS'); ?></h1>
- <h2><?php echo PROJECT_VERSION ;?></h2>
- <a href="<?php echo tep_catalog_href_link() ?>"><?php echo HEADER_TITLE_ONLINE_CATALOG ;?></a>
- </div>
- </div>
- <!-- header_eof //-->
-
- <!-- user //-->
- <?php
- for ($i = 0, $n = sizeof($languages); $i < $n; $i++) {
- $languages_array[] = array('id' => $languages[$i]['code'], 'text' => $languages[$i]['name']);
- if ($languages[$i]['directory'] == $language) { $languages_selected = $languages[$i]['code']; }
- }
- ?>
- <div id="user">
- <ul>
-<!-- <li class="langSelector"><?php //echo tep_draw_form('menubookmark', 'index.php', '', 'get') .'<p class="themeSwitcher">Bookmark: '. tep_draw_pull_down_menu('page_admin',$Bookmark, '' , 'onchange="this.form.submit();"')?></p></form></li> -->
-<!-- <li class="langSelector"><?php //echo tep_draw_form('languages', basename($PHP_SELF), '', 'get').tep_draw_pull_down_menu('language', $languages_array, $languages_selected, 'onchange="this.form.submit();"').'</form>'; ?></li> -->
- <li><a href="<?php echo tep_href_link(FILENAME_ADMINNOTIF, '', 'NONSSL') ?>" class="messages"><?php echo __('notifications') ?> (<?php echo adminNotif::CountNotif() ?>)</a><span> | </span></li>
- <li class="userName"><?php echo '<a class="buttonimg" href="' . tep_href_link(FILENAME_ADMIN_ACCOUNT, '', 'NONSSL') . '" class="menuBoxContentLink" >' . tep_image(DIR_WS_ICONS. 'users.png', HEADER_TITLE_ACCOUNT.' '.$login_firstname) . '</a>'; ?> </li>
- <li class="account"><?php echo '<a class="buttonimg" href="' . tep_href_link(FILENAME_LOGOFF, '', 'NONSSL') . '" class="menuBoxContentLink">' . tep_image(DIR_WS_ICONS. 'icon_logoff.png',HEADER_TITLE_LOGOFF) . '</a>'; ?> </li>
- </ul>
- </div>
- <!-- user_eof //-->
-
- <div id="accordion">
- <?php echo $ctr_menu; ?>
- </div>
- <!-- central //-->
- <div id="central" class="<?php echo $page_admin ?>">
- <?php require(DIR_WS_INCLUDES . 'content/'.$page_admin.'.central.inc'); ?>
- <?php if(isset($_GET['origin'])) : ?>
- <div class="button_nav">
- <?php echo ' <a class="button" href="' . tep_href_link(basename($_GET['origin']), strchr('?',$_GET['origin'])) .'">' .IMAGE_BACK . '</a>'; ?>
- </div>
- <?php endif; ?>
- <div class="separator" ></div>
- </div>
- <!-- central_eof //-->
-
- <div class="separator"></div>
- <!-- footer_gabarit_eof //-->
- <div id="bas">
- <?php if (($footer=tep_test_gab_ele('footer')) !=false) require($footer); ?>
- </div>
- <!-- footer_gabarit_eof //-->
-
- <!-- footer //-->
- <div id="footer">
- <?php require(DIR_WS_INCLUDES . 'footer.php'); ?>
- </div>
- <!-- footer_eof //-->
-
-<script type="text/javascript"><!--//
-$(function() {
- $("#accordion").accordion({active: <?php echo (isset($menu_activ) ? $menu_activ-1:4 ); ?>});
-});
-//--></script>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/template/oscss/header-2.php
===================================================================
--- trunk/catalog/admin/includes/template/oscss/header-2.php 2012-04-07 09:50:44 UTC (rev 4180)
+++ trunk/catalog/admin/includes/template/oscss/header-2.php 2012-04-08 16:19:59 UTC (rev 4181)
@@ -1,12 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 05/01/11, 17:14
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-/// force call class notification
-?>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/template/oscss/inc/init_theme-2.php
===================================================================
--- trunk/catalog/admin/includes/template/oscss/inc/init_theme-2.php 2012-04-07 09:50:44 UTC (rev 4180)
+++ trunk/catalog/admin/includes/template/oscss/inc/init_theme-2.php 2012-04-08 16:19:59 UTC (rev 4181)
@@ -1,50 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 16/04/11, 16:26
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
- require_once(DIR_WS_MODULES.'pages/adminNotif.php');
-
-for ($i = 0, $n = sizeof($languages); $i < $n; $i++) {
- if(is_dir(DIR_WS_LANGUAGES.$languages[$i]['directory'])){
- $languages_array[] = array('id' => $languages[$i]['code'], 'text' => $languages[$i]['name']);
- if ($languages[$i]['directory'] == $language ) $languages_selected = $languages[$i]['code'];
- }
-}
-
-$option_menu_admin['format_line_box_open_entete']='<h3 class="'."%4\$s".'" id="'."%3\$s".'">'."%1\$s".'</h3><div id="'."fils%3\$s".'" class="ssmenu"><ul>'."%2\$s".'</ul></div>' ."\n";
-$option_menu_admin['format_line_box_open']='<li class="'."%4\$s".'" id="'."%3\$s".'">'."%1\$s".'<ul id="'."fils%3\$s".'" class="ssmenu">'."%2\$s".'</ul></li>' ."\n";
-$option_menu_admin['format_line_box']='<li class="'."%4\$s".'" id="'."%3\$s".'">'."%1\$s".''."%2\$s".'</li>' ."\n";
-$option_menu_admin['format_entete']='<a id="'."%1\$s".'" href="'."%2\$s".'" '."%4\$s".'>'."%3\$s".'</a>' ."\n";
-
-/* Boucle calcul stat nbr commande, client, etc*/
-$customers_query = tep_db_query("select count(*) as count from " . TABLE_CUSTOMERS);
-$customers = tep_db_fetch_array($customers_query);
-$products_query = tep_db_query("select count(*) as count from " . TABLE_PRODUCTS . " where products_status = '1'");
-$products = tep_db_fetch_array($products_query);
-$whos_online_query = tep_db_query("select * from " . TABLE_WHOS_ONLINE);
-
-
-/* Init menu */
-$menu=menu::resetInstance();
-$ctr_menu=$menu->cstr($option_menu_admin);
-$menu_activ=$menu->in_rub( (($current_page=='index.php')?$current_page.'?page_admin=index': $current_page) );
-
-/* Menu bookmarks */
-if(isset($navigation->path[count($navigation->path)-1])) {
- $der=$navigation->path[count($navigation->path)-1];
- $Bookmark[]= array('id' =>$der['get']['page_admin'], 'text' => __('heading title') );
-}
-$Bookmark[]= array('id' =>'index', 'text' => __('Tableau de bord') );
-$Bookmark[]= array('id' =>'categories', 'text' => __('Categories'));
-$Bookmark[]= array('id' =>'products', 'text' => __('Produits'));
-$Bookmark[]= array('id' =>'customers', 'text' => __('Client/membres'));
-
-
-
-?>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/template/oscss/jquery-ui-2.css
===================================================================
--- trunk/catalog/admin/includes/template/oscss/jquery-ui-2.css 2012-04-07 09:50:44 UTC (rev 4180)
+++ trunk/catalog/admin/includes/template/oscss/jquery-ui-2.css 2012-04-08 16:19:59 UTC (rev 4181)
@@ -1,565 +0,0 @@
-/*
- * jQuery UI CSS Framework 1.8.18
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Theming/API
- */
-
-/* Layout helpers
-----------------------------------*/
-.ui-helper-hidden { display: none; }
-.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
-.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
-.ui-helper-clearfix:before, .ui-helper-clearfix:after { content: ""; display: table; }
-.ui-helper-clearfix:after { clear: both; }
-.ui-helper-clearfix { zoom: 1; }
-.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
-
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-disabled { cursor: default !important; }
-
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Overlays */
-.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
-
-
-/*
- * jQuery UI CSS Framework 1.8.18
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Theming/API
- *
- * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana,%20Arial,%20sans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=333333&bgTextureHeader=08_diagonals_thick.png&bgImgOpacityHeader=8&borderColorHeader=a3a3a3&fcHeader=eeeeee&iconColorHeader=bbbbbb&bgColorContent=f9f9f9&bgTextureContent=04_highlight_hard.png&bgImgOpacityContent=100&borderColorContent=cccccc&fcContent=222222&iconColorContent=222222&bgColorDefault=111111&bgTextureDefault=02_glass.png&bgImgOpacityDefault=40&borderColorDefault=777777&fcDefault=e3e3e3&iconColorDefault=ededed&bgColorHover=1c1c1c&bgTextureHover=02_glass.png&bgImgOpacityHover=55&borderColorHover=000000&fcHover=ffffff&iconColorHover=ffffff&bgColorActive=ffffff&bgTextureActive=01_flat.png&bgImgOpacityActive=65&borderColorActive=cccccc&fcActive=222222&iconColorActive=222222&bgColorHighlight=ffeb80&bgTextureHighlight=06_inset_hard.png&bgImgOpacityHighlight=55&borderColorHighlight=ffde2e&fcHighlight=363636&iconColorHighlight=4ca300&bgColorError=cd0a0a&bgTextureError=06_inset_hard.png&bgImgOpacityError=45&borderColorError=9e0505&fcError=ffffff&iconColorError=ffcf29&bgColorOverlay=aaaaaa&bgTextureOverlay=04_highlight_hard.png&bgImgOpacityOverlay=40&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=03_highlight_soft.png&bgImgOpacityShadow=50&opacityShadow=20&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
- */
-
-
-/* Component containers
-----------------------------------*/
-.ui-widget { font-family: Verdana, Arial, sans-serif; font-size: 1.1em; }
-.ui-widget .ui-widget { font-size: 1em; }
-.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana, Arial, sans-serif; font-size: 1em; }
-.ui-widget-content { border: 1px solid #cccccc; background: #f9f9f9 url(img/2/ui-bg_highlight-hard_100_f9f9f9_1x100.png) 50% top repeat-x; color: #222222; }
-.ui-widget-content a { color: #222222; }
-.ui-widget-header { border: 1px solid #a3a3a3; background: #333333 url(img/2/ui-bg_diagonals-thick_8_333333_40x40.png) 50% 50% repeat; color: #eeeeee; font-weight: bold; }
-.ui-widget-header a { color: #eeeeee; }
-
-/* Interaction states
-----------------------------------*/
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #777777; background: #111111 url(img/2/ui-bg_glass_40_111111_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #e3e3e3; }
-.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #e3e3e3; text-decoration: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #000000; background: #1c1c1c url(img/2/ui-bg_glass_55_1c1c1c_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #ffffff; }
-.ui-state-hover a, .ui-state-hover a:hover { color: #ffffff; text-decoration: none; }
-.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #cccccc; background: #ffffff url(img/2/ui-bg_flat_65_ffffff_40x100.png) 50% 50% repeat-x; font-weight: normal; color: #222222; }
-.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #222222; text-decoration: none; }
-.ui-widget :active { outline: none; }
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #ffde2e; background: #ffeb80 url(img/2/ui-bg_inset-hard_55_ffeb80_1x100.png) 50% bottom repeat-x; color: #363636; }
-.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
-.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #9e0505; background: #cd0a0a url(img/2/ui-bg_inset-hard_45_cd0a0a_1x100.png) 50% bottom repeat-x; color: #ffffff; }
-.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #ffffff; }
-.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #ffffff; }
-.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
-.ui-priority-secondary, .ui-widget-content .ui-priority-secondary, .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
-.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon { width: 16px; height: 16px; background-image: url(img/2/ui-icons_222222_256x240.png); }
-.ui-widget-content .ui-icon {background-image: url(img/2/ui-icons_222222_256x240.png); }
-.ui-widget-header .ui-icon {background-image: url(img/2/ui-icons_bbbbbb_256x240.png); }
-.ui-state-default .ui-icon { background-image: url(img/2/ui-icons_ededed_256x240.png); }
-.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(img/2/ui-icons_ffffff_256x240.png); }
-.ui-state-active .ui-icon {background-image: url(img/2/ui-icons_222222_256x240.png); }
-.ui-state-highlight .ui-icon {background-image: url(img/2/ui-icons_4ca300_256x240.png); }
-.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(img/2/ui-icons_ffcf29_256x240.png); }
-
-/* positioning */
-.ui-icon-carat-1-n { background-position: 0 0; }
-.ui-icon-carat-1-ne { background-position: -16px 0; }
-.ui-icon-carat-1-e { background-position: -32px 0; }
-.ui-icon-carat-1-se { background-position: -48px 0; }
-.ui-icon-carat-1-s { background-position: -64px 0; }
-.ui-icon-carat-1-sw { background-position: -80px 0; }
-.ui-icon-carat-1-w { background-position: -96px 0; }
-.ui-icon-carat-1-nw { background-position: -112px 0; }
-.ui-icon-carat-2-n-s { background-position: -128px 0; }
-.ui-icon-carat-2-e-w { background-position: -144px 0; }
-.ui-icon-triangle-1-n { background-position: 0 -16px; }
-.ui-icon-triangle-1-ne { background-position: -16px -16px; }
-.ui-icon-triangle-1-e { background-position: -32px -16px; }
-.ui-icon-triangle-1-se { background-position: -48px -16px; }
-.ui-icon-triangle-1-s { background-position: -64px -16px; }
-.ui-icon-triangle-1-sw { background-position: -80px -16px; }
-.ui-icon-triangle-1-w { background-position: -96px -16px; }
-.ui-icon-triangle-1-nw { background-position: -112px -16px; }
-.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
-.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
-.ui-icon-arrow-1-n { background-position: 0 -32px; }
-.ui-icon-arrow-1-ne { background-position: -16px -32px; }
-.ui-icon-arrow-1-e { background-position: -32px -32px; }
-.ui-icon-arrow-1-se { background-position: -48px -32px; }
-.ui-icon-arrow-1-s { background-position: -64px -32px; }
-.ui-icon-arrow-1-sw { background-position: -80px -32px; }
-.ui-icon-arrow-1-w { background-position: -96px -32px; }
-.ui-icon-arrow-1-nw { background-position: -112px -32px; }
-.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
-.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
-.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
-.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
-.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
-.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
-.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
-.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
-.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
-.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
-.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
-.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
-.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
-.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
-.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
-.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
-.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
-.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
-.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
-.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
-.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
-.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
-.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
-.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
-.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
-.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
-.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
-.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
-.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
-.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
-.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
-.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
-.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
-.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
-.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
-.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
-.ui-icon-arrow-4 { background-position: 0 -80px; }
-.ui-icon-arrow-4-diag { background-position: -16px -80px; }
-.ui-icon-extlink { background-position: -32px -80px; }
-.ui-icon-newwin { background-position: -48px -80px; }
-.ui-icon-refresh { background-position: -64px -80px; }
-.ui-icon-shuffle { background-position: -80px -80px; }
-.ui-icon-transfer-e-w { background-position: -96px -80px; }
-.ui-icon-transferthick-e-w { background-position: -112px -80px; }
-.ui-icon-folder-collapsed { background-position: 0 -96px; }
-.ui-icon-folder-open { background-position: -16px -96px; }
-.ui-icon-document { background-position: -32px -96px; }
-.ui-icon-document-b { background-position: -48px -96px; }
-.ui-icon-note { background-position: -64px -96px; }
-.ui-icon-mail-closed { background-position: -80px -96px; }
-.ui-icon-mail-open { background-position: -96px -96px; }
-.ui-icon-suitcase { background-position: -112px -96px; }
-.ui-icon-comment { background-position: -128px -96px; }
-.ui-icon-person { background-position: -144px -96px; }
-.ui-icon-print { background-position: -160px -96px; }
-.ui-icon-trash { background-position: -176px -96px; }
-.ui-icon-locked { background-position: -192px -96px; }
-.ui-icon-unlocked { background-position: -208px -96px; }
-.ui-icon-bookmark { background-position: -224px -96px; }
-.ui-icon-tag { background-position: -240px -96px; }
-.ui-icon-home { background-position: 0 -112px; }
-.ui-icon-flag { background-position: -16px -112px; }
-.ui-icon-calendar { background-position: -32px -112px; }
-.ui-icon-cart { background-position: -48px -112px; }
-.ui-icon-pencil { background-position: -64px -112px; }
-.ui-icon-clock { background-position: -80px -112px; }
-.ui-icon-disk { background-position: -96px -112px; }
-.ui-icon-calculator { background-position: -112px -112px; }
-.ui-icon-zoomin { background-position: -128px -112px; }
-.ui-icon-zoomout { background-position: -144px -112px; }
-.ui-icon-search { background-position: -160px -112px; }
-.ui-icon-wrench { background-position: -176px -112px; }
-.ui-icon-gear { background-position: -192px -112px; }
-.ui-icon-heart { background-position: -208px -112px; }
-.ui-icon-star { background-position: -224px -112px; }
-.ui-icon-link { background-position: -240px -112px; }
-.ui-icon-cancel { background-position: 0 -128px; }
-.ui-icon-plus { background-position: -16px -128px; }
-.ui-icon-plusthick { background-position: -32px -128px; }
-.ui-icon-minus { background-position: -48px -128px; }
-.ui-icon-minusthick { background-position: -64px -128px; }
-.ui-icon-close { background-position: -80px -128px; }
-.ui-icon-closethick { background-position: -96px -128px; }
-.ui-icon-key { background-position: -112px -128px; }
-.ui-icon-lightbulb { background-position: -128px -128px; }
-.ui-icon-scissors { background-position: -144px -128px; }
-.ui-icon-clipboard { background-position: -160px -128px; }
-.ui-icon-copy { background-position: -176px -128px; }
-.ui-icon-contact { background-position: -192px -128px; }
-.ui-icon-image { background-position: -208px -128px; }
-.ui-icon-video { background-position: -224px -128px; }
-.ui-icon-script { background-position: -240px -128px; }
-.ui-icon-alert { background-position: 0 -144px; }
-.ui-icon-info { background-position: -16px -144px; }
-.ui-icon-notice { background-position: -32px -144px; }
-.ui-icon-help { background-position: -48px -144px; }
-.ui-icon-check { background-position: -64px -144px; }
-.ui-icon-bullet { background-position: -80px -144px; }
-.ui-icon-radio-off { background-position: -96px -144px; }
-.ui-icon-radio-on { background-position: -112px -144px; }
-.ui-icon-pin-w { background-position: -128px -144px; }
-.ui-icon-pin-s { background-position: -144px -144px; }
-.ui-icon-play { background-position: 0 -160px; }
-.ui-icon-pause { background-position: -16px -160px; }
-.ui-icon-seek-next { background-position: -32px -160px; }
-.ui-icon-seek-prev { background-position: -48px -160px; }
-.ui-icon-seek-end { background-position: -64px -160px; }
-.ui-icon-seek-start { background-position: -80px -160px; }
-/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
-.ui-icon-seek-first { background-position: -80px -160px; }
-.ui-icon-stop { background-position: -96px -160px; }
-.ui-icon-eject { background-position: -112px -160px; }
-.ui-icon-volume-off { background-position: -128px -160px; }
-.ui-icon-volume-on { background-position: -144px -160px; }
-.ui-icon-power { background-position: 0 -176px; }
-.ui-icon-signal-diag { background-position: -16px -176px; }
-.ui-icon-signal { background-position: -32px -176px; }
-.ui-icon-battery-0 { background-position: -48px -176px; }
-.ui-icon-battery-1 { background-position: -64px -176px; }
-.ui-icon-battery-2 { background-position: -80px -176px; }
-.ui-icon-battery-3 { background-position: -96px -176px; }
-.ui-icon-circle-plus { background-position: 0 -192px; }
-.ui-icon-circle-minus { background-position: -16px -192px; }
-.ui-icon-circle-close { background-position: -32px -192px; }
-.ui-icon-circle-triangle-e { background-position: -48px -192px; }
-.ui-icon-circle-triangle-s { background-position: -64px -192px; }
-.ui-icon-circle-triangle-w { background-position: -80px -192px; }
-.ui-icon-circle-triangle-n { background-position: -96px -192px; }
-.ui-icon-circle-arrow-e { background-position: -112px -192px; }
-.ui-icon-circle-arrow-s { background-position: -128px -192px; }
-.ui-icon-circle-arrow-w { background-position: -144px -192px; }
-.ui-icon-circle-arrow-n { background-position: -160px -192px; }
-.ui-icon-circle-zoomin { background-position: -176px -192px; }
-.ui-icon-circle-zoomout { background-position: -192px -192px; }
-.ui-icon-circle-check { background-position: -208px -192px; }
-.ui-icon-circlesmall-plus { background-position: 0 -208px; }
-.ui-icon-circlesmall-minus { background-position: -16px -208px; }
-.ui-icon-circlesmall-close { background-position: -32px -208px; }
-.ui-icon-squaresmall-plus { background-position: -48px -208px; }
-.ui-icon-squaresmall-minus { background-position: -64px -208px; }
-.ui-icon-squaresmall-close { background-position: -80px -208px; }
-.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
-.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
-.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
-.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
-.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
-.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Corner radius */
-.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -khtml-border-top-left-radius: 4px; border-top-left-radius: 4px; }
-.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; -khtml-border-top-right-radius: 4px; border-top-right-radius: 4px; }
-.ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; -khtml-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
-.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; -khtml-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
-
-/* Overlays */
-.ui-widget-overlay { background: #aaaaaa url(img/2/ui-bg_highlight-hard_40_aaaaaa_1x100.png) 50% top repeat-x; opacity: .30;filter:Alpha(Opacity=30); }
-.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(img/2/ui-bg_highlight-soft_50_aaaaaa_1x100.png) 50% top repeat-x; opacity: .20;filter:Alpha(Opacity=20); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/*
- * jQuery UI Resizable 1.8.18
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Resizable#theming
- */
-.ui-resizable { position: relative;}
-.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block; }
-.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
-.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
-.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; }
-.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; }
-.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; }
-.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
-.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
-.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
-.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/*
- * jQuery UI Selectable 1.8.18
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Selectable#theming
- */
-.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; }
-/*
- * jQuery UI Accordion 1.8.18
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Accordion#theming
- */
-/* IE/Win - Fix animation bug - #4615 */
-.ui-accordion { width: 100%; }
-.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
-.ui-accordion .ui-accordion-li-fix { display: inline; }
-.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
-.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em .7em; }
-.ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; }
-.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
-.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; }
-.ui-accordion .ui-accordion-content-active { display: block; }
-/*
- * jQuery UI Autocomplete 1.8.18
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Autocomplete#theming
- */
-.ui-autocomplete { position: absolute; cursor: default; }
-
-/* workarounds */
-* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
-
-/*
- * jQuery UI Menu 1.8.18
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Menu#theming
- */
-.ui-menu {
- list-style:none;
- padding: 2px;
- margin: 0;
- display:block;
- float: left;
-}
-.ui-menu .ui-menu {
- margin-top: -3px;
-}
-.ui-menu .ui-menu-item {
- margin:0;
- padding: 0;
- zoom: 1;
- float: left;
- clear: left;
- width: 100%;
-}
-.ui-menu .ui-menu-item a {
- text-decoration:none;
- display:block;
- padding:.2em .4em;
- line-height:1.5;
- zoom:1;
-}
-.ui-menu .ui-menu-item a.ui-state-hover,
-.ui-menu .ui-menu-item a.ui-state-active {
- font-weight: normal;
- margin: -1px;
-}
-/*
- * jQuery UI Button 1.8.18
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Button#theming
- */
-.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: hidden; *overflow: visible; } /* the overflow property removes extra width in IE */
-.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
-button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */
-.ui-button-icons-only { width: 3.4em; }
-button.ui-button-icons-only { width: 3.7em; }
-
-/*button text element */
-.ui-button .ui-button-text { display: block; line-height: 1.4; }
-.ui-button-text-only .ui-button-text { padding: .4em 1em; }
-.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; }
-.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
-.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; }
-.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; }
-/* no icon support for input elements, provide padding by default */
-input.ui-button { padding: .4em 1em; }
-
-/*button icon element(s) */
-.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; }
-.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
-.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
-.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
-.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
-
-/*button sets*/
-.ui-buttonset { margin-right: 7px; }
-.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; }
-
-/* workarounds */
-button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
-/*
- * jQuery UI Dialog 1.8.18
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Dialog#theming
- */
-.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
-.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative; }
-.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; }
-.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
-.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
-.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
-.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
-.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
-.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; }
-.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; }
-.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
-.ui-draggable .ui-dialog-titlebar { cursor: move; }
-/*
- * jQuery UI Slider 1.8.18
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Slider#theming
- */
-.ui-slider { position: relative; text-align: left; }
-.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
-.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
-
-.ui-slider-horizontal { height: .8em; }
-.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
-.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
-.ui-slider-horizontal .ui-slider-range-min { left: 0; }
-.ui-slider-horizontal .ui-slider-range-max { right: 0; }
-
-.ui-slider-vertical { width: .8em; height: 100px; }
-.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
-.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
-.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
-.ui-slider-vertical .ui-slider-range-max { top: 0; }/*
- * jQuery UI Tabs 1.8.18
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Tabs#theming
- */
-.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
-.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
-.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; }
-.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; }
-.ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: 0; padding-bottom: 1px; }
-.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
-.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
-.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
-.ui-tabs .ui-tabs-hide { display: none !important; }
-/*
- * jQuery UI Datepicker 1.8.18
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Datepicker#theming
- */
-.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; }
-.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
-.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
-.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
-.ui-datepicker .ui-datepicker-prev { left:2px; }
-.ui-datepicker .ui-datepicker-next { right:2px; }
-.ui-datepicker .ui-datepicker-prev-hover { left:1px; }
-.ui-datepicker .ui-datepicker-next-hover { right:1px; }
-.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px; }
-.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
-.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
-.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
-.ui-datepicker select.ui-datepicker-month,
-.ui-datepicker select.ui-datepicker-year { width: 49%;}
-.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
-.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0; }
-.ui-datepicker td { border: 0; padding: 1px; }
-.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
-.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
-.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
-.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
-
-/* with multiple calendars */
-.ui-datepicker.ui-datepicker-multi { width:auto; }
-.ui-datepicker-multi .ui-datepicker-group { float:left; }
-.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
-.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
-.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
-.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
-.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
-.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
-.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
-.ui-datepicker-row-break { clear:both; width:100%; font-size:0em; }
-
-/* RTL support */
-.ui-datepicker-rtl { direction: rtl; }
-.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
-.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
-.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
-.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
-.ui-datepicker-rtl .ui-datepicker-group { float:right; }
-.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
-.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
-
-/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
-.ui-datepicker-cover {
- display: none; /*sorry for IE5*/
- display/**/: block; /*sorry for IE5*/
- position: absolute; /*must have*/
- z-index: -1; /*must have*/
- filter: mask(); /*must have*/
- top: -4px; /*must have*/
- left: -4px; /*must have*/
- width: 200px; /*must have*/
- height: 200px; /*must have*/
-}/*
- * jQuery UI Progressbar 1.8.18
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Progressbar#theming
- */
-.ui-progressbar { height:2em; text-align: left; overflow: hidden; }
-.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/template/oscss/stylesheet-2.css
===================================================================
--- trunk/catalog/admin/includes/template/oscss/stylesheet-2.css 2012-04-07 09:50:44 UTC (rev 4180)
+++ trunk/catalog/admin/includes/template/oscss/stylesheet-2.css 2012-04-08 16:19:59 UTC (rev 4181)
@@ -1,319 +0,0 @@
-/*
- $Id: stylesheet-1.css,v 1.2 29.07.2009 15:11:46 oscim Exp $
-// kate: replace-trailing-space-save true; space-indent on; indent-width 2; mixedindent off; indent-mode cstyle; word-wrap-marker-color #41C2A4
-+-----------------------------------------------------------------------+
-| osCSS Open Source E-commerce |
-+-----------------------------------------------------------------------+
-*/
-
-body { background:#e4e4e4 url(../../../images/back.jpg) repeat-x; color:#000; margin:0; padding:0; font: normal 11px Verdana, Arial, sans-serif; }
-
-/* prepend */
-* {margin:0;padding:0}
-a:link, a:visited {text-decoration: underline; color:#000;}
-a:hover { text-decoration: none; }
-img { border-width:0 ; margin:0; padding:0; vertical-align:middle; }
-h1 { font-size: 2em ; padding:1em; }
-h2 { font-size: 1.2em ;}
-h3 { font-size: 1.2em ;}
-h4 { font-size: 1em ; }
-h5 { font-size: 1em ; }
-p {padding:1em;}
-/* form */
-#form_bt { width: 80%; margin: 1em 2em;}
-input.radioInput {width:30px;}
-fieldset { width: 80%; margin: 1em 2em; padding:1em; border:none; }
-fieldset p { margin: 1em 0 0 0; }
-fieldset input { min-width:200px; display:inline-block;}
-fieldset label { /*width: 180px;*/ line-height: 18px; margin-right: 10px; display:inline-block; text-align: right; padding: 0 0 2px 0;}
-fieldset ul { list-style:none;}
-ul.form_radio_inline{display:inline-block;}
-.spacer {clear:both;}
-
-/* Structure */
-#header {background:transparent url(img/1/bg_header.jpg) repeat-x ; width:100%; height:25px; position:fixed;z-index:10;}
- /* hedader */
-#headInfos h1 {float:left; margin:2px; padding:0; border-width:0;}
-#headInfos h2 {padding-top:3px;float:left;color:white;}
-#headInfos a {padding:5px 0 0 5px;float:left;color:white;text-decoration:none;}
-#headInfos a:hover{text-decoration:underline;}
-
-#menubar{ clear:both; background:transparent url(img/1/menu_bg.jpg) repeat-x ; border-top:0px solid #bdbdbd; border-bottom:1px solid #ccc; height:22px; margin:0; padding:0;position:fixed; z-index:10;}
-
-#message{ position:relative; top:48px;}
-
-/* user bar */
-div#user { background:transparent url(img/2/menu_bg.jpg) repeat-x ; border-top: 1px solid #fff; text-align:right; padding-right:10px; height:25px; right:0; width:350px; position:fixed; z-index:10; float:right;
- margin-top:-20px; margin-top:-1px;}
-div#user ul{ top:-20px; }
-div#user ul li { display: inline; }
-div#user, div#user a{color:white}
-div#user select { vertical-align:middle; width:80px; }
-
- /* content */
-#central { position:relative; top:40px;padding:10px 5px; width:85%;float:right; min-height:400px;}
-#central h3{border-bottom:1px solid black; font-size:17px; font-weight:bold; margin:0 0 10px; padding:0 5px 10px 3px; }
-
-#central div.box_uniq { width:99%; float:left; }
-#central div.box_left { width:60%; float:left; }
-#central div.box_right { width:39%; float:right; background:#F1F1F1;}
-
-
- /* Block formulaire central */
-#central .block_form { -moz-border-radius:10px; -webkit-border-radius: 10px; width:99%; margin:0;padding:5px 0.2em 10px 0.2em; display:inline-block; text-align: left; background:#C9C9C9;}
-#central .block_form .tabs_lang{width:98%; float:left;}
-#central form p.block_input {width:98%;}
-#central form .block_input { -moz-border-radius:10px; -webkit-border-radius: 10px; width:48%; margin:2px 1px; display:inline-block; text-align: left; padding: 0 5px; background:#DEDADE;float:left;line-height:30px;}
-#central form .box_right .block_input {width:98%;}
-#central form .block_input .hasDatepicker{ margin:2px 1px; display:inline-block; text-align: left; padding: 0 5px; background:#DEDADE;float:left;line-height:30px; min-width:0;}
-#central form .block_field { -moz-border-radius:10px; -webkit-border-radius: 10px;width:97.3%; margin:2px 0; display:inline-block; text-align: left; padding: 0 5px; border:1px solid #ACAAAC;float:left;}
-#central form fieldset legend { padding:0 25px;}
-#central form p input { margin:5px 15px; min-width:200px; }
-#central form label { margin:5px 15px; line-height: 18px; display:inline-block; text-align: right; padding: 0 0 2px 0; width:25%; float:left;}
-#central form p.block_input label {width:90%;text-align:left;}
- /* Block formulaire central block right */
-#central .box_right form .block_input { -moz-border-radius:10px; -webkit-border-radius: 10px; width:97%; margin:2px 1px; display:inline-block; text-align: left; padding: 0 5px; background:#DEDADE;float:left;}
-#central .box_right form label { width:30%;}
-#central .box_right form fieldset .button_nav input.block_input {min-width:0; }
-
-/* div.box_left, div.box_right {-moz-border-radius:10px; -webkit-border-radius: 10px;} */
-/* footer */
-#bas { margin-top:6em; clear:both; height:25px; background:transparent url(img/1/menu_user_bg.jpg) repeat-x ;}
-#bas a {padding: 4px 25px;}
-#bas a.oscommerce { background: transparent url(img/1/oscss.png) 0px 2px no-repeat; text-decoration:none; }
-#bas a.oscss { background: transparent url(img/1/oscss.png) 0px 2px no-repeat; text-decoration:none; }
-
-
-
-
-
-/* account */
-.formArea { background-color: #f1f9fe; border-color: #7b9ebd; border-style: solid; border-width: 1px; }
-.formAreaTitle { font-family: Tahoma, Verdana, Arial, sans-serif; font-size: 12px; font-weight: bold; }
-
-/* attributes */
-.attributes-odd { background-color: #f4f7fd; }
-.attributes-even { background-color: #ffffff; }
-
-/* row effects */
-#rowOut { }
-#rowOver { background-color: #fffaf3; cursor: auto;}
-
-
-td.main img, td.smallText img, td.infoBoxContent img {vertical-align: baseline;}
-/* new table design */
-table.dataTable tbody {background-color: #f1f1f1;}
-/* data table */
-table.dataTable { width:98%; border-width:0; border-collapse: collapse; background: #fff; }
-.dataTable tr{border:1px solid transparent;cursor:default}
-.dataTable thead tr{border-top-color: #FFFFFF; border-bottom-color: #525552; border-left-color: #FFFFFF; border-right-color: #525552; border-style: solid; border-width: 1px;}
-.dataTable th{ height:40px; background-color: #C9C9C9; font-size:1em; font-weight:bold; text-align:center }
-.dataTable tr td{ color: #000000;padding: 2px; font-size: 10px;cursor:default}
-.dataTable td.row_action { width:150px; text-align:right;}
-.dataTable td.row_action_large { width:250px; text-align:right;}
-.dataTable td.row_customers { width:250px; text-align:left;}
-
-/* Onglet */
-.tabPage { border: solid #ccc; border-width: 0px 1px 1px 1px; background: #f5f5f5; position: relative; top: 0; z-index: 0; }
-/* Class apercu ligne au survol */
-.dataTableRow {background-color: #F0F1F1;}
-tr.dataTableRow:hover{ background-color: #fffaf3; cursor: pointer;}
-tr.dataTableRow.Selected { background-color: #fbebb1;}
-/* .dataTableRow td.hierac_enfant {padding-left:0.7em;} */
-/* class qui rend element enfant visible au survol de l'element parent*/
-/* .view.fils {display:none} */
-tr.dataTableRow.Selected .view.fils, tr.view.parent:hover .view.fils{display:block}
-/* sort by*/
-.sort_by { clear:both;display:block; text-align:center; width:100%}
-.sort_by .Selected { border-bottom:2px solid red;}
-/* Bouton bas page*/
-.button_nav{clear:both;}
-
-
-/* info box block droit */
-li.infoBoxHeading , .infoBoxHeading ul,li.infoBoxContent , .infoBoxContent ul{list-style:none;}
-.infoBoxHeading { background-color:#C9C9C9; border-color:#FFFFFF #525552 #525552 #FFFFFF; border-style:solid; border-width:1px; color:#000000; font-size:12px; font-weight:bold; height:25px; margin-top:-1px; padding:13px 0 0 10px;}
-.infoBoxContent{ border-width: 0px 1px 0px 1px; border-color: #E6E6E6; border-style: solid; padding: 2px; font-size: 10px; color: #000; background-color: #f1f1f1; }
-ul.infoBoxContent li{list-style:none;clear:both;}
-/* buttons */
-.button{font-family:Arial; font-size:13px;white-space:nowrap; float:right;-moz-border-radius:5px; -webkit-border-radius: 5px;}
-input.button{background:#e3e5f0; border:1px solid #003c74; padding:1px 5px; margin:1px 2px;color:black; -moz-border-radius:5px; -webkit-border-radius: 5px;}
-input.button:hover{background:#797979; color:white;}
-a.button{background:#e3e5f0; border:1px solid #003c74; padding:2px 5px; margin:1px 2px ;color:black;text-decoration:none;-moz-border-radius:5px; -webkit-border-radius: 5px;height:17px; line-height:17px;}
-a.button:hover{background:#797979; color:white;text-decoration:none;}
-
-
-/* Styles for categories tabbed-pages */
-
-table.categories { background: #f5f5f5; text-align: left; z-index: 0; }
-table.categories td, tr { text-align: left; font-size:12px; }
-table.categories .radio { width:20px; }
-table.categories input , table.categories select { width: 300px; }
-table.categories textarea { width: 100%; height:250px;}
-.categories div, .categories table{ margin:0 auto; }
-
-table.titleTag input { width: 500px; }
-table.descTag textarea ,table.keywordTag textarea { width: 500px; height:100px;}
-
-/*old layout ( this will be removed in further version ) */
-
-td.pageheading { font-size: 18px; font-weight:bold; padding:5px 0;}
-
-
-/* Widget */
-#customerStats {background:transparent url(img/1/header_stats.png) no-repeat bottom right;}
-#orderStats {background:transparent url(img/1/header_orders.png) no-repeat bottom right;}
-#customerInfos {background:transparent url(img/1/header_infos.png) no-repeat bottom right;}
-#salesStats {background:transparent url(img/1/header_sales.png) no-repeat bottom right;}
-/* #orderStats, #customerStats , #customerInfos, #salesStats {float:right;} */
-#headInfos {/* height: 110px;*/ margin:0; padding:0;}
-/* #orderStats, #customerStats, #customerInfos { display:block; width: 170px; height: 110px; } */
-/* #salesStats { display:block; width: 320px; height: 110px; } */
-#orderStats ul, #customerStats ul, #salesStats ul { list-style-type:none; margin:0 0 0 2px; padding:0;}
-
-
-/* Widget BOX */
-.adminBlock,.box {float:right; border:1px solid #dedede; margin:10px;border-left:1px solid #fff; border-right:1px solid #ccc;min-width:200px;}
-.adminBlock h3,.box h3 { margin: 0;height:27px; background:transparent url(img/1/menu_bg.jpg) repeat-x ; padding:0.3em;}
-.adminBlock ul,.box ul { list-style-type:none; margin:0 0 0 2px; padding:0;}
-/* Widget block header admin*/
-.adminBlock {margin:0;}
-
-/* user bar */
-div#user ul li,div#user ul li form { display: inline; }
-div#user select { vertical-align:middle; width:80px; }
-
-/* general */
-#content { margin-top: 2em;}
-div.separator { height:0; margin:0; padding: 0; clear:both; visibility:hidden;}
-.specialPrice { color: #ff0000; }
-.oldPrice { text-decoration: line-through; }
-.fieldRequired { color: #ff0000; }
-.smallText { font-size: 0.8em; }
-.errorText { color: #ff0000; }
-
-div.editBlock { background-color: #DFDFDF; }
-
-.block { display:block; background: transparent url(img/1/menu_bg.jpg) repeat-x; border-color:#fff #dedede #dedede #fff; border-style:solid; border-width:1px; color:#000; padding:3px; }
-
-
-/* Switcher */
-p.themeSwitcher { text-align:right; margin:0; padding:2px 1em 0 0;width:150px; }
-p.themeSwitcher select { vertical-align:middle; font-size:0.8em; width:100px; }
-
-/* ---- menu ---- */
-
-#accordion {width:13%;float:left;position:relative; top:35px;/*min-height:300px;z-index:10*/}
-#accordion{ padding:0; margin:1px 0; }
-#accordion ul { padding:0; margin:3px 0; }
-#accordion ul li{ padding:0; margin:0px 0 0 -5px; list-style:none; }
-#accordion .disabled, #accordion .disabled:hover { display:none; }
-#accordion .disabled ul li a, #accordion .disabled ul li a:hover { display:none; }
-
-/* ---- ss menu ---- */
-#ssmenu a { float:left; border:1px solid black; padding:5px 10px 5px 20px; margin:0 1px; }
-
-/* ---- MEnu ADmin ---- */
-
-
-
-
-
-
-
-
-/*--sales stats box --*/
-#salesStats .BarGraph { background: url(img/1/horizontal_line.png) bottom left; border-bottom: 1px solid #333; font: 9px Helvetica, Geneva, sans-serif; height: 50px; width:230px; margin: 1em 1em 2em 1em; padding: 0; position: relative;color:#000;font-weight:bold; }
-
-#salesStats .BarGraph li { width: 11px; }
-#salesStats .BarGraph li.p0{margin:0 0 -3px 16px;color:#FFF;}
-
-/*bar graph for sales_stats.php*/
-.BarGraph { background: url(img/1/horizontal_line_2.png) bottom left; border-bottom: 1px solid #FFF; font: 9px Helvetica, Geneva, sans-serif; height: 200px; margin: 1em 0 2em 0; padding: 0; position: relative;color:#000;font-weight:bold; }
-.BarGraph li { border: 1px solid #ccc; border-bottom: none; bottom: 0; color: #FFF; margin: 0; padding: 0; position: absolute; list-style: none; text-align: center; width: 44px;color:#000;font-weight:bold; }
-.BarGraph li.p0{margin:0 0 -15px 50px;font-weight:bold;}
-.BarGraph li.bar{color:#FFF;font-weight:bold;}
-.legend {margin:20px;width:200px;text-align:center;}
-
-/* Onglet */
-.tabPage { border: solid #ccc; border-width: 0px 1px 1px 1px; background: #f5f5f5; position: relative; width:99%; top: 0; z-index: 0; }
-
-/* Bouton bas page*/
-.button_nav{clear:both;}
-
-
-/* --- message box --- */
-.messageBox { font-family: Verdana, Arial, sans-serif; font-size: 10px; padding:0;}
-.messageStack{ font-family: Verdana, Arial, sans-serif;}
-.messageStackError, .messageStackWarning { background:transparent url(img/1/menu_bg_error.jpg) left top repeat-x;padding:0; height:20px;line-height:25px;}
-.messageStackSuccess { background:transparent url(img/1/menu_bg_success.jpg) left top repeat-x; padding:0; height:20px;line-height:25px;}
-.messageStackNotice { background:transparent url(img/1/menu_bg_success.jpg) left top repeat-x; padding:0; height:20px;line-height:25px;}
-
-/* general class */
-.error{ color:red; }
-.info{ color:blue;}
-div.info{ color:black;padding:10px 2px; border:2px solid #3A3B35; -moz-border-radius:10px; -webkit-border-radius: 10px; background:#73756A;}
-.alert{ color:#7b181e; }
-
-.fright{ float:right; }
-.fleft {float:left; }
-
-.tleft{text-align:left}
-.tright{text-align:right}
-.tcenter{text-align:center}
-
-.inline { display:inline }
-
-.nobr {white-space:nowrap;}
-
-/* PAge sPECIFIQUE*/
- /* homePage */
-#homestats { background:transparent url(../../../images/stats.gif) bottom right no-repeat; }
-#homestats dd {margin-left: 14em; padding: 3px; margin-bottom: 5px; line-height: 1.5em}
-#homestats dt {float:left; width: 13em; padding: 3px; line-height: 1.5em; text-align:right; font-weight:bold;}
-#homestats dl {padding: 5px 0 10px 5px;}
-#homeNews { background:transparent url(../../../images/feed.gif) bottom right no-repeat; }
-#homeNews dl {padding: 5px 0 10px 5px;}
-#homeNews dt {padding: 3px; font-size:12px; font-weight:bold;}
-#homeNews dt span.date {font-size:9px; color:gray;}
-#homeNews dd {padding: 3px; margin-bottom: 5px;}
-#homeNews dt a {text-decoration:none; color:#545683;}
-#homeNews dt a:hover {color:#9D9FBF;}
-
-
-#bas{ clear:both; background:#797979; color:white;}
-#bas a{ color:white;}
-#bas #author img{ clear:both;position:relative; top:21px; left:-150px;}
-#bas #author h2{ float:left;position:relative; left:150px; width:210px}
-...
[truncated message content] |
|
From: <os...@us...> - 2012-04-07 09:50:51
|
Revision: 4180
http://oscss.svn.sourceforge.net/oscss/?rev=4180&view=rev
Author: oscim
Date: 2012-04-07 09:50:44 +0000 (Sat, 07 Apr 2012)
Log Message:
-----------
correction coquillee et erreur de code suite evolution Extra
Ajsutement code et ajout retour info success/error apres update
Modified Paths:
--------------
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/customers.txt
trunk/catalog/admin/includes/modules/pages/customers.php
trunk/catalog/includes/content/create_account.php
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/pages/customers.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/pages/customers.txt 2012-04-07 09:11:33 UTC (rev 4179)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/customers.txt 2012-04-07 09:50:44 UTC (rev 4180)
@@ -1,10 +1,10 @@
<?php
/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 30/12/11, 22:00
+ @date 06/04/2012, 22:00
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -81,11 +81,18 @@
$lang['entry customers points']="Points : " ;
$lang['entry customers notif created new account']="Notifier le nouveaux client :" ;
-$lang['js gender']="* La valeur de 'Genre' doit être choisie." ;
-$lang['js first_name']="* L'entrée 'Prénom' doit avoir au moins %s caractères." ;
-$lang['js last_name %s']="* L'entrée 'Nom' doit avoir au moins %s caractères." ;
-$lang['js dob']="* L'entrée 'Date de naissance' doit avoir la forme: jj/mm/aaaa (10/09/1975)." ;
-$lang['js email_address']="* L'entrée 'Adresse électronique' doit avoir au moins %s caractères." ;
-$lang['js address']="* L'entrée 'Adresse' doit avoir au moins %s caractères." ;
-$lang['js city']="* L'entrée 'Ville' doit avoir au moins %s caractères." ;
+
+/* Edit */
+ $lang['customers save success']="Eenresgitrement du client reussie" ;
+ $lang['error save in process']="Erreur lors de l'enregistrement du client" ;
+
+
+/* js alert */
+ $lang['js gender']="* La valeur de 'Genre' doit être choisie." ;
+ $lang['js first_name']="* L'entrée 'Prénom' doit avoir au moins %s caractères." ;
+ $lang['js last_name %s']="* L'entrée 'Nom' doit avoir au moins %s caractères." ;
+ $lang['js dob']="* L'entrée 'Date de naissance' doit avoir la forme: jj/mm/aaaa (10/09/1975)." ;
+ $lang['js email_address']="* L'entrée 'Adresse électronique' doit avoir au moins %s caractères." ;
+ $lang['js address']="* L'entrée 'Adresse' doit avoir au moins %s caractères." ;
+ $lang['js city']="* L'entrée 'Ville' doit avoir au moins %s caractères." ;
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/modules/pages/customers.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/customers.php 2012-04-07 09:11:33 UTC (rev 4179)
+++ trunk/catalog/admin/includes/modules/pages/customers.php 2012-04-07 09:50:44 UTC (rev 4180)
@@ -203,10 +203,6 @@
if (!self::tep_validate_email($testobj->customers_email_address))throw new Exception(ENTRY_EMAIL_ADDRESS_CHECK_ERROR);
if (strlen($testobj->customers_telephone) < ENTRY_TELEPHONE_MIN_LENGTH)throw new Exception(__("Le numero de téléphone est trop court"));
- $extra_fields_query = tep_db_query("select ce.fields_id, ce.fields_input_type, ce.fields_required_status, cei.fields_name, ce.fields_status, ce.fields_input_type, ce.fields_size from " . TABLE_EXTRA_FIELDS . " ce, " . TABLE_EXTRA_FIELDS_INFO . " cei where ce.fields_status=1 and ce.fields_required_status=1 and cei.fields_id=ce.fields_id and cei.languages_id =" . $languages_id);
- while($extra_fields = tep_db_fetch_array($extra_fields_query)){
- if(strlen($_post['fields_' . $extra_fields['fields_id']]) < $extra_fields['fields_size'])throw new Exception(sprintf(ENTRY_EXTRA_FIELDS_ERROR,$extra_fields['fields_name'],$extra_fields['fields_size']) );
- }
}catch(Exception $e){
$messageStack->add($e->getMessage(), 'error');
@@ -250,11 +246,10 @@
tep_mail($result['customers_firstname'] . ' ' . $result['customers_lastname'], $result['customers_email_address'],__('email text subject'), $message_final);
}
+ $messageStack->add_session(__('customers save success'), 'success');
if(isset($_POST['up_and_close']) ) tep_redirect(tep_href_link(self::FILENAME));
else tep_redirect(tep_href_link(self::FILENAME, 'cID=' .$_id.'&action=edit'));
-
-
}
else /*if (self::$error == true) */{
$_POST['customers_gender']='m';
@@ -263,6 +258,8 @@
$dest_form='insert';
else
$dest_form='update';
+
+ $messageStack->add(__('error save in process'), 'error');
}
break;
Modified: trunk/catalog/includes/content/create_account.php
===================================================================
--- trunk/catalog/includes/content/create_account.php 2012-04-07 09:11:33 UTC (rev 4179)
+++ trunk/catalog/includes/content/create_account.php 2012-04-07 09:50:44 UTC (rev 4180)
@@ -18,7 +18,7 @@
<p class="notice"><?php echo FORM_REQUIRED_INFORMATION; ?></p>
- <?php echo tep_draw_form('create_account', tep_href_link(FILENAME_CREATE_ACCOUNT, , tep_get_all_get_params(array('action','process')), 'SSL'), 'post') ;?>
+ <?php echo tep_draw_form('create_account', tep_href_link(FILENAME_CREATE_ACCOUNT, tep_get_all_get_params(array('action','process')), 'SSL'), 'post') ;?>
<fieldset>
<legend><?php echo CATEGORY_PERSONAL; ?></legend>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-07 09:11:39
|
Revision: 4179
http://oscss.svn.sourceforge.net/oscss/?rev=4179&view=rev
Author: oscim
Date: 2012-04-07 09:11:33 +0000 (Sat, 07 Apr 2012)
Log Message:
-----------
suppression reliquat obsolete contenut dans une extension
Removed Paths:
-------------
trunk/catalog/admin/includes/gabarit/sppc_cust_force.form.gab
Deleted: trunk/catalog/admin/includes/gabarit/sppc_cust_force.form.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/sppc_cust_force.form.gab 2012-04-07 09:10:07 UTC (rev 4178)
+++ trunk/catalog/admin/includes/gabarit/sppc_cust_force.form.gab 2012-04-07 09:11:33 UTC (rev 4179)
@@ -1,125 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.0.9
- @date 22/06/10, 18:12
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-global $processed;
-?>
- <fieldset class="block_field">
- <div class="block_input">
- <h4><?php echo __('heading title modules payment') ?></h4>
- <?php
- if ($processed == true) {
- if (isset(sppc_cust_force::$cInfo->customers_payment_settings) && sppc_cust_force::$cInfo->customers_payment_settings == '1') ENTRY_CUSTOMERS_PAYMENT_SET.' : ';
- else echo __('entry customers payment default');
- echo tep_draw_hidden_field('customers_payment_settings');
- } else {
- echo tep_draw_radio_field('customers_payment_settings', '','1', (tep_not_null(sppc_cust_force::$cInfo->customers_payment_allowed)? '1' : '0' )) .
- ' ' . __('entry customers payment set') . ' ' . tep_draw_radio_field('customers_payment_settings','', '0', (tep_not_null(sppc_cust_force::$cInfo->customers_payment_allowed))? '0' : '1' ) .
- ' ' . __('entry customers payment default') ;
- }
- ?>
-
- <?php if ($processed != true) { ?>
- <ul>
- <?php foreach(sppc_cust_force::get_array_mod('payment') as $item) echo '<li>'.$item['input'].' '.$item['name'].'</li>'; ?>
- </ul>
- <p><?php echo __('entry customers payment set explain') ?></p>
- <?php } else { ?>
- <p>
- <?php if (isset(sppc_cust_force::$cInfo->customers_payment_settings) && sppc_cust_force::$cInfo->customers_payment_settings == '1') sppc_cust_force::$cInfo->customers_payment_allowed;
- else echo __('entry customers payment default');
- echo tep_draw_hidden_field('customers_payment_allowed', sppc_cust_force::$cInfo->customers_payment_allowed);
- ?>
- </p>
- <?php } ?>
- </div>
-
- <div class="block_input">
- <h4 for="customers_fax"><?php echo __('heading title modules shipping') ?></h4>
-<?php
- if ($processed == true) {
- if (isset(sppc_cust_force::$cInfo->customers_shipping_settings) && sppc_cust_force::$cInfo->customers_shipping_settings == '1') ENTRY_CUSTOMERS_SHIPPING_SET.' : ';
- else echo __('entry customers shipping default');
- echo tep_draw_hidden_field('customers_shipping_settings');
- } else {
- echo tep_draw_radio_field('customers_shipping_settings','', '1', (tep_not_null(sppc_cust_force::$cInfo->customers_shipping_allowed)? '1' : '0' )) .
- ' ' . __('entry customers shipping set') .
- ' ' . tep_draw_radio_field('customers_shipping_settings','', '0', (tep_not_null(sppc_cust_force::$cInfo->customers_shipping_allowed)? '0' :'1' )) . ' ' . __('entry customers shipping default') ;
- }
-?>
-
- <?php if ($processed != true) { ?>
- <ul>
- <?php foreach(sppc_cust_force::get_array_mod('shipping') as $item) echo '<li>'.$item['input'].' '.$item['name'].'</li>'; ?>
- </ul>
- <p><?php echo __('entry customers shipping set explain') ?></p>
- <?php } else { ?>
- <p>
- <?php if (sppc_cust_force::$cInfo->customers_shipping_settings == '1') sppc_cust_force::$cInfo->customers_shipping_allowed;
- else echo __('entry customers shipping default');
- tep_draw_hidden_field('customers_shipping_allowed', sppc_cust_force::$cInfo->customers_shipping_allowed); ?>
- </p>
- <?php } ?>
- </div>
-
-
- <div class="block_input">
- <h4 for="customers_fax"><?php echo __('heading title modules order total') ?></h4>
- <?php if ($processed == true) {
- if (sppc_cust_force::$cInfo->customers_order_total_settings == '1') echo __('entry customers order total set'). ' : ';
- else echo __('entry customers order total default');
- echo tep_draw_hidden_field('customers_order_total_settings');
- } else {
- echo tep_draw_radio_field('customers_order_total_settings','', '1', (tep_not_null(sppc_cust_force::$cInfo->customers_order_total_allowed)? '1' : '0' )) .
- ' ' . __('entry customers order total set') .
- ' ' . tep_draw_radio_field('customers_order_total_settings','', '0', (tep_not_null(sppc_cust_force::$cInfo->customers_order_total_allowed)? '0': '1' )) . ' ' . __('entry customers order total default') ;
- }
-?>
-<?php if ($processed != true) { ?>
- <ul>
- <?php foreach(sppc_cust_force::get_array_mod('order_total') as $item) echo '<li>'.$item['input'].' '.$item['name'].'</li>'; ?>
- </ul>
- <p><?php echo __('entry customers order total set explain') ?><p>
- <?php } else { ?>
- <p>
- <?php if (sppc_cust_force::$cInfo->customers_order_total_settings == '1') sppc_cust_force::$cInfo->customers_order_total_allowed;
- else echo __('entry customers order total default');
- echo tep_draw_hidden_field('customers_order_total_allowed',sppc_cust_force::$cInfo->customers_order_total_allowed);
- ?>
- <p>
- <?php } ?>
- </div>
-
-
- <div class="block_input">
- <h4 for="customers_fax"><?php echo __('heading title customers tax rates exempt') ?></h4>
- <?php if ($processed == true) {
- if (isset(sppc_cust_force::$cInfo->customers_tax_rate_exempt_settings) && sppc_cust_force::$cInfo->customers_tax_rate_exempt_settings == '1') ENTRY_CUSTOMERS_TAX_RATES_EXEMPT.' : ';
- else echo __('entry customers tax rates default');
- echo tep_draw_hidden_field('customers_tax_rate_exempt_settings');
- } else {
- echo tep_draw_radio_field('customers_tax_rate_exempt_settings','', '1', (tep_not_null(sppc_cust_force::$cInfo->customers_specific_taxes_exempt))? '1' : '0' ) . ' ' . __('entry customers tax rates exempt') . ' ' . tep_draw_radio_field('customers_tax_rate_exempt_settings','', '0', (tep_not_null(sppc_cust_force::$cInfo->customers_specific_taxes_exempt))? '0' : '1' ) . ' ' . __('entry customers tax rates default') ;
- }
- ?>
- <?php if ($processed != true) { ?>
- <ul>
- <?php foreach(sppc_cust_force::get_array_taxe() as $item) echo '<li>'.$item['input'].' '.$item['name'].'</li>'; ?>
- </ul>
-
- <p><?php echo __('entry customers tax rates exempt explain') ?></p>
- <?php } else { ?>
- <p>
- <?php if (sppc_cust_force::$cInfo->customers_tax_rate_exempt_settings == '1') $customers_specific_taxes_exempt;
- else echo __('entry customers tax rates default');
- echo tep_draw_hidden_field('customers_specific_taxes_exempt', $customers_specific_taxes_exempt);?>
- <p>
- <?php } ?>
- </div>
- </fieldset>
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-07 09:10:13
|
Revision: 4178
http://oscss.svn.sourceforge.net/oscss/?rev=4178&view=rev
Author: oscim
Date: 2012-04-07 09:10:07 +0000 (Sat, 07 Apr 2012)
Log Message:
-----------
Correction d'erreur dans la gestion des groupes
mise a niveau hi?\195?\169rarchie des fichier et dossier de gabarit
Modified Paths:
--------------
trunk/extensions/CUSTOMERS_GROUPS_stable/catalog/admin/includes/gabarit/customers_groups/display_view.edit.gab
trunk/extensions/CUSTOMERS_GROUPS_stable/catalog/admin/includes/modules/account/sppc_cust_force.php
trunk/extensions/CUSTOMERS_GROUPS_stable/catalog/admin/includes/modules/pages/customers_groups.php
trunk/extensions/CUSTOMERS_GROUPS_stable/install.xml
Added Paths:
-----------
trunk/extensions/CUSTOMERS_GROUPS_stable/catalog/admin/includes/gabarit/customers/
trunk/extensions/CUSTOMERS_GROUPS_stable/catalog/admin/includes/gabarit/customers/sppc_cust_force/
Modified: trunk/extensions/CUSTOMERS_GROUPS_stable/catalog/admin/includes/gabarit/customers_groups/display_view.edit.gab
===================================================================
--- trunk/extensions/CUSTOMERS_GROUPS_stable/catalog/admin/includes/gabarit/customers_groups/display_view.edit.gab 2012-04-07 08:36:32 UTC (rev 4177)
+++ trunk/extensions/CUSTOMERS_GROUPS_stable/catalog/admin/includes/gabarit/customers_groups/display_view.edit.gab 2012-04-07 09:10:07 UTC (rev 4178)
@@ -1,12 +1,12 @@
<?php
/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
@sub-package Customers_groups
@sub-version 2.4
- @date 07/11/11, 10:04
+ @date 06/04/2012, 10:04
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -32,7 +32,7 @@
<?php
/**
- @brief detail this groups
+ @brief detail this groups
*/
?>
<div id="tabs-1" class="tabPage">
@@ -90,9 +90,9 @@
<h4><?php echo __('heading title group tax rates exempt'); ?></h4>
<?php echo tep_draw_radio_field('group_tax_rate_exempt_settings','', '1', (tep_not_null(customers_groups::$cInfo->group_specific_taxes_exempt)? '1' : '0' )) . ' ' . __('entry group tax rates exempt') . ' ' . tep_draw_radio_field('group_tax_rate_exempt_settings', '','0', ((tep_not_null(customers_groups::$cInfo->group_specific_taxes_exempt)) ? '0' : '1' )) . ' ' . __('entry group tax rates default') ; ?>
<ul>
- <?php $tax_query = tep_db_query("select tax_rates_id, tax_rate, tax_description from " . TABLE_TAX_RATES . " order by tax_rates_id");
+ <?php $tax_query = tep_db_query("select tax_rates_id, tax_rate, tax_class_title , tax_description FROM " . TABLE_TAX_RATES . " r LEFT JOIN ".TABLE_TAX_CLASS." c ON( c.tax_class_id = r.tax_class_id ) order by r.tax_rates_id");
while ($tax_rate = tep_db_fetch_array($tax_query)) { ?>
- <li><?php echo tep_draw_checkbox_field('group_tax_rate_exempt_id[' . $tax_rate['tax_rates_id'] . ']','', $tax_rate['tax_rates_id'] , (in_array($tax_rate['tax_rates_id'], (array)@$group_tax_ids_exempt)) ? 1 : 0); ?> <?php echo $tax_rate['tax_description']; ?></li>
+ <li><?php echo tep_draw_checkbox_field('group_tax_rate_exempt_id[' . $tax_rate['tax_rates_id'] . ']','', $tax_rate['tax_rates_id'] , (in_array($tax_rate['tax_rates_id'], (array)@$group_tax_ids_exempt)) ? 1 : 0); ?> <?php echo '('.$tax_rate['tax_class_title'].' - '.$tax_rate['tax_rate'].' )' . $tax_rate['tax_description']; ?></li>
<?php } ?>
</ul>
<p><?php echo __('entry tax rates exempt explain') ?></p>
@@ -108,24 +108,24 @@
<?php
/**
- @brief list customers in groups
+ @brief list customers in groups
*/
?>
<div id="tabs-2" class="tabPage">
- <table class="dataTableBase">
- <thead>
- <tr>
- <th style="width:20px;"><?php echo __('table heading name'); ?></th>
- </tr>
- </thead>
+ <table class="dataTableBase">
+ <thead>
+ <tr>
+ <th style="width:20px;"><?php echo __('table heading name'); ?></th>
+ </tr>
+ </thead>
<tbody>
- <?php foreach(customers_groups::$cInfo->customers as $row): ?>
- <tr>
- <td><?php echo tep_customers_row_action($row['customers_id']); ?></td>
- </tr>
- <?php endforeach; ?>
+ <?php foreach(customers_groups::$cInfo->customers as $row): ?>
+ <tr>
+ <td><?php echo tep_customers_row_action($row['customers_id']); ?></td>
+ </tr>
+ <?php endforeach; ?>
</tbody>
</table>
</div>
@@ -135,28 +135,28 @@
<?php
/**
- @brief list customers in groups
+ @brief list customers in groups
*/
?>
<div id="tabs-3" class="tabPage">
<table class="dataTableBase">
- <thead>
- <tr>
- <th style="width:20px;"><?php echo __('table heading name'); ?></th>
- <th style="width:20px;"><?php echo __('table heading normal price'); ?></th>
- <th style="width:20px;"><?php echo __('table heading group price'); ?></th>
- </tr>
- </thead>
+ <thead>
+ <tr>
+ <th style="width:20px;"><?php echo __('table heading name'); ?></th>
+ <th style="width:20px;"><?php echo __('table heading normal price'); ?></th>
+ <th style="width:20px;"><?php echo __('table heading group price'); ?></th>
+ </tr>
+ </thead>
<tbody>
- <?php foreach(customers_groups::$cInfo->products as $row): ?>
- <tr>
- <td style="width:20px;"><?php echo $row['products_id']; ?></td>
- <td style="width:20px;"><?php echo $row['products_price']; ?></td>
- <td style="width:20px;"><?php echo $row['customers_group_price']; ?></td>
- </tr>
- <?php endforeach; ?>
+ <?php foreach(customers_groups::$cInfo->products as $row): ?>
+ <tr>
+ <td style="width:20px;"><?php echo $row['products_id']; ?></td>
+ <td style="width:20px;"><?php echo $row['products_price']; ?></td>
+ <td style="width:20px;"><?php echo $row['customers_group_price']; ?></td>
+ </tr>
+ <?php endforeach; ?>
</tbody>
</table>
</div>
Modified: trunk/extensions/CUSTOMERS_GROUPS_stable/catalog/admin/includes/modules/account/sppc_cust_force.php
===================================================================
--- trunk/extensions/CUSTOMERS_GROUPS_stable/catalog/admin/includes/modules/account/sppc_cust_force.php 2012-04-07 08:36:32 UTC (rev 4177)
+++ trunk/extensions/CUSTOMERS_GROUPS_stable/catalog/admin/includes/modules/account/sppc_cust_force.php 2012-04-07 09:10:07 UTC (rev 4178)
@@ -1,10 +1,10 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.0.9
- @date 06/06/10, 15:38
+ @version 2.1.1
+ @date 06/04/2012, 15:38
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class sppc_cust_force
@@ -123,8 +123,10 @@
global $processed;
$this->load_db_values($id);
- $contents []=array('title'=> __('tab customers module'),
- 'text'=> tep_get_include_contents(__CLASS__.'.form'));
+ $contents []=array(
+ 'title'=> __('tab customers module'),
+ 'text'=> tep_get_include_contents('customers/'.__CLASS__.'/display_edit.edit')
+ );
}
Modified: trunk/extensions/CUSTOMERS_GROUPS_stable/catalog/admin/includes/modules/pages/customers_groups.php
===================================================================
--- trunk/extensions/CUSTOMERS_GROUPS_stable/catalog/admin/includes/modules/pages/customers_groups.php 2012-04-07 08:36:32 UTC (rev 4177)
+++ trunk/extensions/CUSTOMERS_GROUPS_stable/catalog/admin/includes/modules/pages/customers_groups.php 2012-04-07 09:10:07 UTC (rev 4178)
@@ -1,12 +1,12 @@
<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
@sub-package Customers_groups
@sub-version 2.4
- @date 07/11/11, 10:04
+ @date 06/04/2012, 10:04
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class customers_groups
Modified: trunk/extensions/CUSTOMERS_GROUPS_stable/install.xml
===================================================================
--- trunk/extensions/CUSTOMERS_GROUPS_stable/install.xml 2012-04-07 08:36:32 UTC (rev 4177)
+++ trunk/extensions/CUSTOMERS_GROUPS_stable/install.xml 2012-04-07 09:10:07 UTC (rev 4178)
@@ -17,12 +17,14 @@
<!-- Install new files -->
<addfile>
<file name="admin/includes/modules/pages/customers_groups.php" />
+ <file name="admin/includes/modules/account/sppc_cust_force.php" />
<file name="admin/includes/gabarit/customers_groups/display_view.listing.gab" />
<file name="admin/includes/gabarit/customers_groups/display_view.edit.gab" />
<file name="admin/includes/gabarit/customers_groups/display_view.delete.gab" />
+ <file name="admin/includes/gabarit/customers/sppc_cust_force/display_edit.edit.gab" />
- <file name="admin/includes/modules/account/sppc_cust_force.php" />
+
</addfile>
<!-- lang -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-07 08:36:39
|
Revision: 4177
http://oscss.svn.sourceforge.net/oscss/?rev=4177&view=rev
Author: oscim
Date: 2012-04-07 08:36:32 +0000 (Sat, 07 Apr 2012)
Log Message:
-----------
Correction coquille
deport du code js de fotter vers application_bottom
Correction liens vers checkout corrig?\195?\169 suite modification en cours de dev
Correction css minime d'ajustement du BO
Correction pad_base, et report de la desactivation complete du stock
Modified Paths:
--------------
trunk/catalog/admin/includes/application_bottom.php
trunk/catalog/admin/includes/classes/MGabCont.php
trunk/catalog/admin/includes/footer.php
trunk/catalog/admin/includes/gabarit/products/display_view.edit.gab
trunk/catalog/admin/includes/template/oscss/stylesheet-1.css
trunk/catalog/includes/classes/pad_base.php
trunk/catalog/includes/content/shopping_cart.php
Modified: trunk/catalog/admin/includes/application_bottom.php
===================================================================
--- trunk/catalog/admin/includes/application_bottom.php 2012-04-07 08:34:02 UTC (rev 4176)
+++ trunk/catalog/admin/includes/application_bottom.php 2012-04-07 08:36:32 UTC (rev 4177)
@@ -1,12 +1,11 @@
<?php
/**
- \licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ \licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
\package osCSS-2 <www http://www.oscss.org>
- \version 2.1.0
- \date 03/12/10, 10:27
+ \version 2.1.1
+ \date 07/04/2012, 10:27
\author oscim <mail aur...@os...> <www http://www.oscim.fr>
\encode UTF-8
- \file
\dir admin/includes/
\brief is close core pages
*/
@@ -55,8 +54,84 @@
osC_ErrorHandler::stop();
}
?>
+
+
+<?php
+/**
+ @brief javascript for all page, post_load_value, is a function call after load page
+*/
+?>
<script type="text/javascript"><!--
+
/** Init page event js */
+function post_load_page(){
+
+ $('form.fancy,form.fancyView').ajaxForm({
+ success: function(responseText){
+ $.fancybox({'content':responseText});
+ }
+ });
+
+ //! Fancy exe
+ $('a.fancytext').fancybox({'overlayOpacity':0.6});
+ $('a.buttonimg.fancy,a.button.fancy,a.buttonimg.fancyView,a.button.fancyView').fancybox({'overlayOpacity':0.6, autoDimensions:true, showCloseButton:false, changeSpeed:0, titleShow:false});
+
+ //! Updat GET
+ $('a.buttonimg.fancy,a.button.fancy,form.fancy').each(function(){
+ if(this.action !=null) this.action +='&forceajax=true';
+ else this.href +='&forceajax=true';
+ });
+ $('a.buttonimg.fancyView,a.button.fancyView,form.fancyView').each(function(){
+ if(this.action !=null) this.action +='&forceview=true';
+ else this.href +='&forceview=true';
+ });
+
+ // Tabs Exe
+ $('#tabs, .tabs').tabs({cookie: {expires:30}}).find('.ui-tabs-nav').sortable({axis:'x'});
+ $('.tabs_lang').tabs().find('.ui-tabs-nav').sortable({axis:'x'});
+
+
+ /** Flag ajax process Used in row status */
+ $('a.ajaxinline').each(function(){
+ var current = $(this);
+ var reg = /(forceajax)/gi;
+ if( ! reg.test( this.href) )
+ var ref =this.href +='&forceajax=true';
+ else
+ var ref =this.href;
+
+ current.click(function() {
+ $.get(ref, function(data) {
+ current.replaceWith(data);
+ });
+ return false;
+ });
+ });
+
+
+// simple_tooltip("input","tooltip");
+
+// Multi in datatable, for select all rows
+ $("#select_all").click(function(){
+ var checked_status = $("#select_all").is(':checked');
+ $("input[type='checkbox'].multi").each(function(){
+ if(checked_status == true)
+ this.checked = true;
+ else
+ this.checked = false;
+ });
+ });
+
+
+ // Call Back Exec
+ <?php echo oscss_cstr::CallBackExec(); ?>
+}
+
+// --></script>
+
+
+<script type="text/javascript"><!--
+/** Init page event js */
post_load_page()
// --></script>
</body>
Modified: trunk/catalog/admin/includes/classes/MGabCont.php
===================================================================
--- trunk/catalog/admin/includes/classes/MGabCont.php 2012-04-07 08:34:02 UTC (rev 4176)
+++ trunk/catalog/admin/includes/classes/MGabCont.php 2012-04-07 08:36:32 UTC (rev 4177)
@@ -113,9 +113,9 @@
if(!empty($arg2)){
/// @remarks By Master Gabarit Load
if(!empty($arg3)){
- self::$Folder=$arg3;
- self::$function=$arg2;
- if(self::$Name===false)self::$Name=$arg3;
+ self::$Folder=$arg3;
+ self::$function=$arg2;
+ if(self::$Name===false)self::$Name=$arg3;
}
self::$action=$arg1;
@@ -141,11 +141,11 @@
$Object=self::$Object;
if (is_file($filename)) {
- ob_start();
- include $filename;
- $contents = ob_get_contents();
- ob_end_clean();
- return $contents;
+ ob_start();
+ include $filename;
+ $contents = ob_get_contents();
+ ob_end_clean();
+ return $contents;
}
return false;
}
Modified: trunk/catalog/admin/includes/footer.php
===================================================================
--- trunk/catalog/admin/includes/footer.php 2012-04-07 08:34:02 UTC (rev 4176)
+++ trunk/catalog/admin/includes/footer.php 2012-04-07 08:36:32 UTC (rev 4177)
@@ -16,72 +16,3 @@
<br />osCSS is a derived from Copyright © 2003 <a href="http://www.oscommerce.com">osCommerce</a>.<a href="http://www.fsf.org/licenses/gpl.txt"><br />GNU General Public License</a>
</p>
<p>Powered by <a href="http://www.oscss.org/">osCSS-2</a></p>
-
-
-<script type="text/javascript"><!--
-
-/** Init page event js */
-function post_load_page(){
-
- $('form.fancy,form.fancyView').ajaxForm({
- success: function(responseText){
- $.fancybox({'content':responseText});
- }
- });
-
- //! Fancy exe
- $('a.fancytext').fancybox({'overlayOpacity':0.6});
- $('a.buttonimg.fancy,a.button.fancy,a.buttonimg.fancyView,a.button.fancyView').fancybox({'overlayOpacity':0.6, autoDimensions:true, showCloseButton:false, changeSpeed:0, titleShow:false});
-
- //! Updat GET
- $('a.buttonimg.fancy,a.button.fancy,form.fancy').each(function(){
- if(this.action !=null) this.action +='&forceajax=true';
- else this.href +='&forceajax=true';
- });
- $('a.buttonimg.fancyView,a.button.fancyView,form.fancyView').each(function(){
- if(this.action !=null) this.action +='&forceview=true';
- else this.href +='&forceview=true';
- });
-
- // Tabs Exe
- $('#tabs, .tabs').tabs({cookie: {expires:30}}).find('.ui-tabs-nav').sortable({axis:'x'});
- $('.tabs_lang').tabs().find('.ui-tabs-nav').sortable({axis:'x'});
-
-
- /** Flag ajax process Used in row status */
- $('a.ajaxinline').each(function(){
- var current = $(this);
- var reg = /(forceajax)/gi;
- if( ! reg.test( this.href) )
- var ref =this.href +='&forceajax=true';
- else
- var ref =this.href;
-
- current.click(function() {
- $.get(ref, function(data) {
- current.replaceWith(data);
- });
- return false;
- });
- });
-
-
-// simple_tooltip("input","tooltip");
-
-// Multi in datatable, for select all rows
- $("#select_all").click(function(){
- var checked_status = $("#select_all").is(':checked');
- $("input[type='checkbox'].multi").each(function(){
- if(checked_status == true)
- this.checked = true;
- else
- this.checked = false;
- });
- });
-
-
- // Call Back Exec
- <?php echo oscss_cstr::CallBackExec(); ?>
-}
-
-// --></script>
Modified: trunk/catalog/admin/includes/gabarit/products/display_view.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/products/display_view.edit.gab 2012-04-07 08:34:02 UTC (rev 4176)
+++ trunk/catalog/admin/includes/gabarit/products/display_view.edit.gab 2012-04-07 08:36:32 UTC (rev 4177)
@@ -226,7 +226,7 @@
<label>
<span class="text"><?php echo __('txt categories'); ?></span>
- <span class="button_nav"><?php echo '<a class="buttonimg fancy" href="' . tep_href_link(FILENAME_CATEGORIES, '&datatype=content&action=new_light&origin='. urlencode(products::FILENAME.'?action=edit&pID='. (int)@$_GET['cID']) ) . '" title="'. __('add category datatype content').'">' .tep_image(DIR_WS_ICONS.'icon_add_new.png' ). '</a>'; ?> </span>
+ <span class="button_nav"><?php echo '<a class="buttonimg fancy" href="' . tep_href_link(FILENAME_CATEGORIES, '&datatype=product&action=new_light&origin='. urlencode(products::FILENAME.'?action=edit&pID='. (int)@$_GET['cID']) ) . '" title="'. __('add category datatype content').'">' .tep_image(DIR_WS_ICONS.'icon_add_new.png' ). '</a>'; ?> </span>
</label>
<ul id="cat_list_in_edit" class="ChooseSelect">
Modified: trunk/catalog/admin/includes/template/oscss/stylesheet-1.css
===================================================================
--- trunk/catalog/admin/includes/template/oscss/stylesheet-1.css 2012-04-07 08:34:02 UTC (rev 4176)
+++ trunk/catalog/admin/includes/template/oscss/stylesheet-1.css 2012-04-07 08:36:32 UTC (rev 4177)
@@ -294,7 +294,7 @@
#central h5.Ctrtirroir{ margin: 10px 0; padding: 0 0 0 20px; }
/* Block formulaire central */
#central .block_form { -moz-border-radius:6px; -webkit-border-radius:6px; margin:0;padding:5px 0.2em 10px 0.2em; width:100%;display:inline-block; text-align: left; background:#C9C9C9;}
-#central .block_form .tabs_lang{/*width:98%;*/ float:left;}
+#central .block_form .tabs_lang{width:98.5%; float:left;}
#central .block_form div.tabPage {padding-left:0; padding-right:0;padding-top: 0;}
#central .block_form .block_input,
#central form .block_input { text-shadow:0 1px 0 #fff;-moz-border-radius:6px; -webkit-border-radius:6px; width:97%; margin:2px 1px; display:inline-block; text-align: left; padding: 0 5px; background:#DEDADE;float:left;line-height:30px;}
Modified: trunk/catalog/includes/classes/pad_base.php
===================================================================
--- trunk/catalog/includes/classes/pad_base.php 2012-04-07 08:34:02 UTC (rev 4176)
+++ trunk/catalog/includes/classes/pad_base.php 2012-04-07 08:36:32 UTC (rev 4177)
@@ -1,10 +1,10 @@
<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
/**
- \licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ \licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
\portion code Copyright (c) 2002 osCommerce
\package osCSS-2 <www http://www.oscss.org>
- \version 2.1.0
- @date 23/06/11, 15:31
+ \version 2.1.1
+ @date 06/04/2012, 15:31
\author oscim <mail aur...@os...> <www http://www.oscim.fr>
\encode UTF-8
\file pad_base.php
@@ -87,7 +87,7 @@
// price::getInstance();
$pr=$price->get_products_price((int)$products_id);
-// print_r($product_obj);
+
$this->products_tax_class_id = $product_obj->products_tax_class_id;
$this->products_original_price_ht = (float)$product_obj->products_tax_class_id;
$this->products_original_price = (float)print_products_price_rv($product_obj,'text');
@@ -106,7 +106,7 @@
*/
protected function _SetConfigurationProperties($prefix,$product_obj) {
- if($product_obj->track_stock>0) {
+ if(_cst_bool('STOCK_CHECK') && $product_obj->track_stock>0) {
$this->show_out_of_stock = _cst_bool($prefix . 'SHOW_OUT_OF_STOCK');
$this->mark_out_of_stock = tep_cst_define($prefix . 'MARK_OUT_OF_STOCK');
$this->out_of_stock_msgline = _cst_bool($prefix . 'OUT_OF_STOCK_MSGLINE');
Modified: trunk/catalog/includes/content/shopping_cart.php
===================================================================
--- trunk/catalog/includes/content/shopping_cart.php 2012-04-07 08:34:02 UTC (rev 4176)
+++ trunk/catalog/includes/content/shopping_cart.php 2012-04-07 08:36:32 UTC (rev 4177)
@@ -107,7 +107,9 @@
<input class="Bt navBt submit" type="submit" value="<?php echo IMAGE_BUTTON_UPDATE_CART; ?>" />
<?php echo '<a class="Bt navBt link" href="' . $navigation->GetBack() . '">' . IMAGE_BUTTON_CONTINUE_SHOPPING . '</a>'; ?>
- <?php echo '<a class="Bt navBt link" href="' . tep_href_link('checkout.php'/*FILENAME_CHECKOUT_SHIPPING*/, 'step=init', 'SSL') . '">' . IMAGE_BUTTON_CHECKOUT . '</a>'; ?>
+
+ <?php /*! FOR DEV */ //echo '<a class="Bt navBt link" href="' . tep_href_link(/*'checkout.php'*/FILENAME_CHECKOUT_SHIPPING, ''/*'step=init'*/, 'SSL') . '">' . IMAGE_BUTTON_CHECKOUT . '</a>'; ?>
+ <?php echo '<a class="Bt navBt link" href="' . tep_href_link(FILENAME_CHECKOUT_SHIPPING, '', 'SSL') . '">' . IMAGE_BUTTON_CHECKOUT . '</a>'; ?>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-07 08:34:12
|
Revision: 4176
http://oscss.svn.sourceforge.net/oscss/?rev=4176&view=rev
Author: oscim
Date: 2012-04-07 08:34:02 +0000 (Sat, 07 Apr 2012)
Log Message:
-----------
Mise a niveau du code, correction d'erreur , ajustement fonctionnel
Modified Paths:
--------------
trunk/extensions/ULTIMATEIMAGE_stable/catalog/admin/includes/modules/products/UltimateImage.php
Modified: trunk/extensions/ULTIMATEIMAGE_stable/catalog/admin/includes/modules/products/UltimateImage.php
===================================================================
--- trunk/extensions/ULTIMATEIMAGE_stable/catalog/admin/includes/modules/products/UltimateImage.php 2012-04-06 20:19:17 UTC (rev 4175)
+++ trunk/extensions/ULTIMATEIMAGE_stable/catalog/admin/includes/modules/products/UltimateImage.php 2012-04-07 08:34:02 UTC (rev 4176)
@@ -4,7 +4,7 @@
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 04/04/2012, 21:49
+ @date 06/04/2012, 21:49
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class UltimateImage
@@ -28,12 +28,24 @@
*/
public static $THUMB = '100';
/**
-
+ @var
*/
public $code;
+ /**
+ @var
+ */
public $title;
+ /**
+ @var
+ */
public $description;
+ /**
+ @var
+ */
public $sort_order;
+ /**
+ @var
+ */
public $enabled;
/**
@var public object
@@ -57,10 +69,10 @@
function __construct(){
$this->code = __CLASS__;
- $this->title = MODULE_ACA_ULTIMATEIMAGE_TEXT_TITLE;
- $this->description = MODULE_ACA_ULTIMATEIMAGE_TEXT_DESCRIPTION . ' (module v2.0)';
+ $this->title = __('module aca ultimateimage text title');
+ $this->description = __('module aca ultimateimage text description') ;
$this->sort_order = (defined('MODULE_ACA_ULTIMATEIMAGE_SORT_ORDER')) ? MODULE_ACA_ULTIMATEIMAGE_SORT_ORDER : 0;
- $this->enabled = true; //_cst_bool('MODULE_ACA_ULTIMATEIMAGE_STATUS');
+ $this->enabled = true;
global $language,$languages_id;
$this->language = $language;
@@ -85,7 +97,7 @@
switch(self::$action){
/**
- @remarks general action for products
+ @remarks general action for products
*/
case 'deleteconfirm':
@@ -94,7 +106,7 @@
/**
- @remarks specific action for images
+ @remarks specific action for images
*/
case 'Imgdeleteconfirm':
$pID = tep_db_prepare_input($_GET['pID']);
@@ -113,12 +125,14 @@
exit;
break;
+
+
case 'Imgupdate':
$iID = (int)(isset($_REQUEST['iID'])?tep_db_prepare_input(@$_REQUEST['iID']) : 0);
$pID = (int)tep_db_prepare_input((int)$_REQUEST['pID']);
- if(isset($_POST['products_image_add_min']) && !empty($_POST['products_image_add_min'])
- || isset($_POST['products_image_add_max']) && !empty($_POST['products_image_add_max']) ) {
+ if(isset($_POST['products_image_add_min']) && !empty($_POST['products_image_add_min'])
+ || isset($_POST['products_image_add_max']) && !empty($_POST['products_image_add_max']) ) {
$sql_data_array['products_image_sm']=( (!empty($_POST['products_image_add_min']))
? tep_db_prepare_input( (( strpos($_POST['products_image_add_min'],DIR_WS_CATALOG_IMAGES) ===false)
@@ -137,10 +151,10 @@
: ''
);
- $sql_data_array['products_id']=$pID;
- $sql_data_array['status']=1;
+ $sql_data_array['products_id']=$pID;
+ $sql_data_array['status']=1;
- }
+ }
if($iID===0){
$res=tep_db_perform(TABLE_PRODUCTS_IMAGES,$sql_data_array);
@@ -153,9 +167,9 @@
}
- // var_dump($sql_data_array);
- $result="<td>".tep_image(DIR_WS_CATALOG_IMAGES.$sql_data_array['products_image_sm'],'',self::$THUMB)."</td>".
- "<td>".tep_image(DIR_WS_CATALOG_IMAGES.$sql_data_array['products_image_xl'],'',self::$THUMB)."</td>".
+
+ $result="<td>".tep_info_image($sql_data_array['products_image_sm'],basename($sql_data_array['products_image_sm']),self::$THUMB)."</td>".
+ "<td>".tep_info_image($sql_data_array['products_image_xl'],basename($sql_data_array['products_image_xl']),self::$THUMB)."</td>".
"<td>"/*.(self::RowsAction($iID))*/."</td>";
echo
@@ -190,24 +204,26 @@
public function insert_table_products(){
$sql_data_array=array();
- if ((isset($_POST['delete_image_sm_1']) && $_POST['delete_image_sm_1'] == 'yes') /*&& ($image_sm_1_count['total']<= '1')*/) {
- @unlink(DIR_FS_CATALOG_IMAGES . $_POST['products_previous_image_sm_1']);
+// $DB=Database::getInstance();
+
+ if ((isset($_POST['delete_image_sm_1']) && $_POST['delete_image_sm_1'] == 'yes') /*&& ($image_sm_1_count['total']<= '1')*/) {
+ @unlink(DIR_FS_CATALOG_IMAGES . $_POST['products_previous_image_sm_1']);
}
if ((isset($_POST['delete_image_xl_1']) && $_POST['delete_image_xl_1'] == 'yes') /*&& ($image_xl_1_count['total']<= '1')*/) {
- @unlink(DIR_FS_CATALOG_IMAGES . $_POST['products_previous_image_xl_1']);
+ @unlink(DIR_FS_CATALOG_IMAGES . $_POST['products_previous_image_xl_1']);
}
if(isset($_POST['products_image_add_min']) && !empty($_POST['products_image_add_min'])
|| isset($_POST['products_image_add_max']) && !empty($_POST['products_image_add_max']) ) {
- $sql_data_array['products_image_sm']=(!empty($_POST['products_image_add_min'])) ?tep_db_prepare_input(substr($_POST['products_image_add_min'], strlen( DIR_WS_CATALOG_IMAGES) ) ) : '' ;
- $sql_data_array['products_image_xl']=(!empty($_POST['products_image_add_max'])) ?tep_db_prepare_input(substr($_POST['products_image_add_max'], strlen( DIR_WS_CATALOG_IMAGES) ) ) : '' ;
+ $sql_data_array['products_image_sm']=(!empty($_POST['products_image_add_min'])) ?tep_db_prepare_input(substr($_POST['products_image_add_min'], strlen( DIR_WS_CATALOG_IMAGES) ) ) : '' ;
+ $sql_data_array['products_image_xl']=(!empty($_POST['products_image_add_max'])) ?tep_db_prepare_input(substr($_POST['products_image_add_max'], strlen( DIR_WS_CATALOG_IMAGES) ) ) : '' ;
- $sql_data_array['products_id']=(int)$_GET['pID'];
- $sql_data_array['status']=1;
- tep_db_perform(TABLE_PRODUCTS_IMAGES,$sql_data_array);
+ $sql_data_array['products_id']=(int)$_GET['pID'];
+ $sql_data_array['status']=1;
+ tep_db_perform(TABLE_PRODUCTS_IMAGES,$sql_data_array);
}
@@ -227,7 +243,8 @@
pInfo is an array [field name][language id]=value
*/
public function load_db_values ($pID) {
- $product_query = tep_db_query("select * from " . TABLE_PRODUCTS_IMAGES . " p where p.products_id = '".$pID."' ");
+ self::$iList = array();
+ $product_query = tep_db_query("select DISTINCT * from " . TABLE_PRODUCTS_IMAGES . " p where p.products_id = '".$pID."' ");
$res=$product_query->fetchAllAssoc();
foreach($res as $img)
self::$iList[]=new ObjectInfo($img);
@@ -244,7 +261,7 @@
$title= __('tab products utltimate image');
/// use master gabarit
- $m = MGabCont::CallGab('listing',__FUNCTION__,__CLASS__);
+ $m = MGabCont::CallGab('listing',__FUNCTION__,'products/'.__CLASS__);
$contents[]=array('title'=> $title,'text'=> $m);
}
@@ -252,6 +269,7 @@
public function display_view(){
$action=self::$action;
+
switch(self::$action){
case 'new_image':
$action='edit';
@@ -263,8 +281,8 @@
default:
}
- /// use master gabarit
- return MGabCont::CallGab($action,__FUNCTION__,'products/'.__CLASS__);
+ /// use master gabarit
+ return MGabCont::CallGab($action,__FUNCTION__,'products/'.__CLASS__);
}
@@ -273,10 +291,10 @@
*/
static public function RowsAction($id){
return sprintf(
- CsrtAction::getFormat('row_action'),
- '',
- sprintf(CsrtAction::getLink('row_action_right', IMAGE_EDIT, 'edit'), 'fancyView iframe', UltimateImage::HrefLinkInMod('edit', 'iID='.$id) ,'' ).
- sprintf(CsrtAction::getLink('row_action_right', IMAGE_DELETE, 'delete'), 'fancyView iframe', UltimateImage::HrefLinkInMod('delete', 'iID='.$id) ,'' )
+ CsrtAction::getFormat('row_action'),
+ '',
+ sprintf(CsrtAction::getLink('row_action_right', IMAGE_EDIT, 'edit'), 'fancyView iframe', UltimateImage::HrefLinkInMod('edit', 'iID='.$id) ,'' ).
+ sprintf(CsrtAction::getLink('row_action_right', IMAGE_DELETE, 'delete'), 'fancyView iframe', UltimateImage::HrefLinkInMod('delete', 'iID='.$id) ,'' )
);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-06 20:19:23
|
Revision: 4175
http://oscss.svn.sourceforge.net/oscss/?rev=4175&view=rev
Author: oscim
Date: 2012-04-06 20:19:17 +0000 (Fri, 06 Apr 2012)
Log Message:
-----------
mise a niveau du code
Modified Paths:
--------------
trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.edit.gab
trunk/catalog/admin/includes/modules/pages/adminGroup.php
trunk/catalog/admin/includes/modules/pages/adminUsers.php
trunk/catalog/admin/includes/modules/pages/countries.php
trunk/catalog/admin/includes/modules/pages/geo_zones.php
Modified: trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.edit.gab 2012-04-06 19:45:22 UTC (rev 4174)
+++ trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.edit.gab 2012-04-06 20:19:17 UTC (rev 4175)
@@ -8,7 +8,6 @@
@author genrated by dev/datatype/generat
@encode UTF-8
@brief gabarit for listing extra fields _DATATYPE_REPLACE_
-
*/
global $action, $languages;
?>
Modified: trunk/catalog/admin/includes/modules/pages/adminGroup.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/adminGroup.php 2012-04-06 19:45:22 UTC (rev 4174)
+++ trunk/catalog/admin/includes/modules/pages/adminGroup.php 2012-04-06 20:19:17 UTC (rev 4175)
@@ -12,7 +12,10 @@
class adminGroup
- implements ExtModPage, InterfaceModule {
+ implements
+ ExtModPage,
+ InterfaceModule
+ {
/**
Configuration
@@ -68,12 +71,15 @@
/**
- class constructor
+ @brief constructor
*/
public function __construct() {
self::$code=__CLASS__;
}
+ /**
+ @brief process action
+ */
public function check_action($actions){
global $messageStack;
@@ -162,7 +168,7 @@
case 'delete_confirm':
$set_groups_id = tep_db_prepare_input( $_GET['gID']);
-error_reporting(E_ALL);
+// error_reporting(E_ALL);
// tep_db_query("delete from " . TABLE_ADMIN_GROUPS . " where admin_groups_id = '" . (int)$set_groups_id . "'");
// tep_db_query("delete from " . TABLE_ADMIN . " where admin_groups_id = '" . (int) $set_groups_id . "'");
Modified: trunk/catalog/admin/includes/modules/pages/adminUsers.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/adminUsers.php 2012-04-06 19:45:22 UTC (rev 4174)
+++ trunk/catalog/admin/includes/modules/pages/adminUsers.php 2012-04-06 20:19:17 UTC (rev 4175)
@@ -12,7 +12,9 @@
class adminUsers
- implements ExtModPage, InterfaceModule {
+ implements
+ ExtModPage,
+ InterfaceModule {
/**
Configuration
Modified: trunk/catalog/admin/includes/modules/pages/countries.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/countries.php 2012-04-06 19:45:22 UTC (rev 4174)
+++ trunk/catalog/admin/includes/modules/pages/countries.php 2012-04-06 20:19:17 UTC (rev 4175)
@@ -12,9 +12,10 @@
class countries
extends ModTwo /// new abstract class for nextgen module
- implements InterfaceModule
- ,IntModTwo /// new interface module for nextgen module
- ,ExtModConfig {
+ implements
+ InterfaceModule,
+ /*IntModTwo, */ /// new interface module for nextgen module
+ ExtModConfig {
const FILENAME = FILENAME_COUNTRIES;
Modified: trunk/catalog/admin/includes/modules/pages/geo_zones.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/geo_zones.php 2012-04-06 19:45:22 UTC (rev 4174)
+++ trunk/catalog/admin/includes/modules/pages/geo_zones.php 2012-04-06 20:19:17 UTC (rev 4175)
@@ -83,14 +83,12 @@
self::$is_zone= (self::$saction == 'list') ? false : true ;
// if(!self::$is_zone && self::$action =='edit')
-// var_dump(self::$is_zone);
//! active datatable in ajax, precise les GET necessaire
if(!defined('JSONSTATMENT'))
if(self::$is_zone && self::$action =='edit')
define('JSONSTATMENT', 'mod=page&type='.self::$code.(isset($_GET['zID']) ? '&zID='.$_GET['zID'] : '').'&saction=list');
else
define('JSONSTATMENT', 'mod=page&type='.self::$code.(isset($_GET['zID']) ? '&zID='.$_GET['zID'] : '').(isset($_GET['saction']) ? '&saction='.$_GET['saction'] : ''));
-// var_dump(JSONSTATMENT);
self::$geoTypes = array(
array('id'=>'1', 'text'=> __('geo_zone zone taxe')),
@@ -507,36 +505,25 @@
private static function get_item_action($zones){
self::init();
- $s = '<span class="view fils fleft">';
+ $s = '';
if (self::$is_zone) {
-
- $s = sprintf(
- CsrtAction::getFormat('row_action'),
- '' ,
- sprintf(CsrtAction::getLink('row_action_right', IMAGE_EDIT, 'edit'), '', tep_href_link(self::FILENAME, 'zID=' . $zones['geo_zone_id'] . '&action=edit') ,'' ).
- sprintf(CsrtAction::getLink('row_action_right', IMAGE_DELETE, 'delete'), 'fancy', tep_href_link(self::FILENAME, 'zID=' . $zones['geo_zone_id'] . '&action=delete') ,'' )
- );
-
-// '<a href="' . tep_href_link(FILENAME_GEO_ZONES, 'zpage=' . $zpage . '&zID=' . $zones['geo_zone_id'] . '&action=list&spage=1&sID=' . $zones['geo_zone_id'] .'&saction=new') . '">' . tep_image(DIR_WS_ICONS . 'icon_add_new.png', IMAGE_INSERT) . '</a> '
-// '<a href="' . tep_href_link(self::FILENAME,'&zID=' . $zones['geo_zone_id']. '&geo_zone_name=' . $zones['geo_zone_name'] . '&saction=list') . '">' . tep_image(DIR_WS_ICONS . 'icon_plus.gif', ICON_FOLDER) . '</a> ';
-// if (self:: $getzID == $zones['geo_zone_id'] ) { $s .= tep_image(DIR_WS_ICONS . 'icon_arrow_right.gif'); }
-// else { $s .= '<a href="' . tep_href_link(self::FILENAME, 'zID=' . $zones['geo_zone_id']) . '">' . tep_image(DIR_WS_ICONS . 'icon_info.gif', IMAGE_ICON_INFO) . '</a>'; }
-
+ $s = sprintf(
+ CsrtAction::getFormat('row_action'),
+ '' ,
+ sprintf(CsrtAction::getLink('row_action_right', IMAGE_EDIT, 'edit'), '', tep_href_link(self::FILENAME, 'zID=' . $zones['geo_zone_id'] . '&action=edit') ,'' ).
+ sprintf(CsrtAction::getLink('row_action_right', IMAGE_DELETE, 'delete'), 'fancy', tep_href_link(self::FILENAME, 'zID=' . $zones['geo_zone_id'] . '&action=delete') ,'' )
+ );
}
else {
- $s = sprintf(
- CsrtAction::getFormat('row_action'),
- '' ,
- sprintf(CsrtAction::getLink('row_action_right', IMAGE_EDIT, 'edit'), '', tep_href_link(self::FILENAME, 'sID=' . $zones['association_id'] . '&zID='.self:: $getzID.'&action=edit&saction=edit') ,'' ).
- sprintf(CsrtAction::getLink('row_action_right', IMAGE_DELETE, 'delete'), 'fancy', tep_href_link(self::FILENAME, 'sID=' . $zones['association_id'] . '&zID='.self:: $getzID.'&saction=list&action=deletesub') ,'' )
- );
-// $s .=
-//
-// if (self:: $getsID == $zones['association_id'] ) { $s .= tep_image(DIR_WS_ICONS . 'icon_arrow_right.gif'); }
-// else { $s .= '<a href="' . tep_href_link(self::FILENAME, 'sID=' . $zones['association_id'] . '&zID='.self:: $getzID.'&saction=list') . '">' . tep_image(DIR_WS_ICONS . 'icon_info.gif', IMAGE_ICON_INFO) . '</a>'; }
+ $s = sprintf(
+ CsrtAction::getFormat('row_action'),
+ '' ,
+ sprintf(CsrtAction::getLink('row_action_right', IMAGE_EDIT, 'edit'), '', tep_href_link(self::FILENAME, 'sID=' . $zones['association_id'] . '&zID='.self:: $getzID.'&action=edit&saction=edit') ,'' ).
+ sprintf(CsrtAction::getLink('row_action_right', IMAGE_DELETE, 'delete'), 'fancy', tep_href_link(self::FILENAME, 'sID=' . $zones['association_id'] . '&zID='.self:: $getzID.'&saction=list&action=deletesub') ,'' )
+ );
}
-// $s .='</span>';
+
return $s;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-06 19:45:29
|
Revision: 4174
http://oscss.svn.sourceforge.net/oscss/?rev=4174&view=rev
Author: oscim
Date: 2012-04-06 19:45:22 +0000 (Fri, 06 Apr 2012)
Log Message:
-----------
Ajout d'un generateur de code pour les page de type dico 1 table + une page de gestion
modele complet comprenant sql, gabarit html et modules
Modified Paths:
--------------
trunk/dev/GenerCode/class.GenerCode.php
Added Paths:
-----------
trunk/dev/GenerCode/Dicos/
trunk/dev/GenerCode/Dicos/.directory
trunk/dev/GenerCode/Dicos/Modele/
trunk/dev/GenerCode/Dicos/Modele/catalog/
trunk/dev/GenerCode/Dicos/Modele/catalog/admin/
trunk/dev/GenerCode/Dicos/Modele/catalog/admin/includes/
trunk/dev/GenerCode/Dicos/Modele/catalog/admin/includes/classes/
trunk/dev/GenerCode/Dicos/Modele/catalog/admin/includes/classes/drivers/
trunk/dev/GenerCode/Dicos/Modele/catalog/admin/includes/classes/drivers/sql_REPLDICO_.php
trunk/dev/GenerCode/Dicos/Modele/catalog/admin/includes/gabarit/
trunk/dev/GenerCode/Dicos/Modele/catalog/admin/includes/gabarit/_REPLDICO_/
trunk/dev/GenerCode/Dicos/Modele/catalog/admin/includes/gabarit/_REPLDICO_/display_view.delete.gab
trunk/dev/GenerCode/Dicos/Modele/catalog/admin/includes/gabarit/_REPLDICO_/display_view.edit.gab
trunk/dev/GenerCode/Dicos/Modele/catalog/admin/includes/languages/
trunk/dev/GenerCode/Dicos/Modele/catalog/admin/includes/languages/fr_FR/
trunk/dev/GenerCode/Dicos/Modele/catalog/admin/includes/languages/fr_FR/modules/
trunk/dev/GenerCode/Dicos/Modele/catalog/admin/includes/languages/fr_FR/modules/pages/
trunk/dev/GenerCode/Dicos/Modele/catalog/admin/includes/languages/fr_FR/modules/pages/_REPLDICO_.txt
trunk/dev/GenerCode/Dicos/Modele/catalog/admin/includes/modules/
trunk/dev/GenerCode/Dicos/Modele/catalog/admin/includes/modules/pages/
trunk/dev/GenerCode/Dicos/Modele/catalog/admin/includes/modules/pages/_REPLDICO_.php
trunk/dev/GenerCode/Dicos/Modele/install.xml
trunk/dev/GenerCode/Dicos/Modele/sql/
trunk/dev/GenerCode/Dicos/Modele/sql/mysql/
trunk/dev/GenerCode/Dicos/Modele/sql/mysql/install/
trunk/dev/GenerCode/Dicos/Modele/sql/mysql/install/data/
trunk/dev/GenerCode/Dicos/Modele/sql/mysql/install/tables/
trunk/dev/GenerCode/Dicos/Modele/sql/mysql/install/tables/osc__REPLDICO_.sql
trunk/dev/GenerCode/Dicos/Modele/sql/mysql/remove/
trunk/dev/GenerCode/Dicos/Modele/sql/mysql/remove/data/
trunk/dev/GenerCode/Dicos/Modele/sql/mysql/remove/tables/
trunk/dev/GenerCode/Dicos/Modele/sql/mysql/remove/tables/osc__REPLDICO_.sql
trunk/dev/GenerCode/Dicos/index.php
trunk/dev/GenerCode/Dicos/readme
Added: trunk/dev/GenerCode/Dicos/.directory
===================================================================
--- trunk/dev/GenerCode/Dicos/.directory (rev 0)
+++ trunk/dev/GenerCode/Dicos/.directory 2012-04-06 19:45:22 UTC (rev 4174)
@@ -0,0 +1,8 @@
+[Dolphin]
+AdditionalInfoV2=Details_Size,Details_Date,CustomizedDetails
+Timestamp=2012,4,6,21,28,28
+Version=2
+ViewMode=1
+
+[Settings]
+ShowDotFiles=true
Added: trunk/dev/GenerCode/Dicos/Modele/catalog/admin/includes/classes/drivers/sql_REPLDICO_.php
===================================================================
--- trunk/dev/GenerCode/Dicos/Modele/catalog/admin/includes/classes/drivers/sql_REPLDICO_.php (rev 0)
+++ trunk/dev/GenerCode/Dicos/Modele/catalog/admin/includes/classes/drivers/sql_REPLDICO_.php 2012-04-06 19:45:22 UTC (rev 4174)
@@ -0,0 +1,194 @@
+<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
+/**
+ @licence GPL 2005-_CURRENTYEAR_ The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version _CURRENTVERSION_
+ @date _CURRENTDATE_
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class sql_REPLDICO_
+ @file sql_REPLDICO_.php
+ @brief manage db update/insert/delete for _REPLDICO_
+*/
+
+
+
+
+class sql_REPLDICO_
+ implements ModSqlDataDriver{
+
+ public static $modules;
+
+ protected static $_instance;
+
+ protected function __construct(){
+ }
+
+
+ public static function getInstance() {
+ if(self::$_instance == null) self::$_instance = new self();
+ return self::$_instance;
+ }
+
+
+ /**
+ @brief create new ligne in table configuration
+ */
+ public static function create($option){
+ self::getInstance();
+
+ if(!isset($option['name']))
+ return 'name';
+
+ $sql_data_array['_REPLDICO__name'] = tep_db_prepare_input($option['name']);
+ $sql_data_array['_REPLDICO_visible'] = (isset($option['visible'])) ? tep_db_prepare_input($option['visible']) :'0';
+
+ $res=tep_db_perform(TABLE__REPLDICO_MAJ_, $sql_data_array);
+
+ if(!$res)
+ return $res;
+ else
+ return $res->__get('insertId');
+ }
+
+ /**
+ @brief update ligne in table configuration
+ */
+ public static function update($option){
+ self::getInstance();
+
+ if(!isset($option['id']))
+ return 'id';
+
+ $where ='';
+ if(isset($option['id'])) $where .="AND _REPLDICO__id = '".(int)$option['id']."' ";
+
+
+ if(isset($option['name']))$sql_data_array['_REPLDICO__name'] = tep_db_prepare_input($option['name']);
+ if(isset($option['visible'])) $sql_data_array['_REPLDICO_visible'] = (int)tep_db_prepare_input($option['visible']);
+
+ $res=tep_db_perform(TABLE__REPLDICO_MAJ_, $sql_data_array, 'update' , substr($where,3) );
+
+ return $res;
+ }
+
+ /**
+ @brief load ligne in table configuration
+ @param option array
+ id => row id int (configuration_id)
+ key => string key (configuration_key)
+ group_id => group_id int (configuration_group_id)
+ @param $shortkey use cleankey for return short key
+ @return
+
+ object(stdClass)[13]
+ public 'id' => string '1' (length=1)
+
+ OR
+ array(
+ object(stdClass)[13]
+ ...
+ object(stdClass)[13]
+ ..
+ )
+
+ */
+ public static function fetch($option,$shortkey=false){
+ self::getInstance();
+ $DB=Database::getInstance();
+
+ $sql ="";
+ if(isset($option['id'])) $sql .="AND _REPLDICO__id = '".(int)$option['id']."' ";
+ if(isset($option['name'])) $sql .="AND _REPLDICO__name = '".(string)tep_db_input($option['name'])."' ";
+ if(isset($option['visible'])) $sql .="AND _REPLDICO_visible = '".(int)$option['visible']."' ";
+
+
+ if($sql=='')
+ return false;
+
+
+ $sql="SELECT * FROM " . TABLE__REPLDICO_MAJ_ . " a ".
+ " WHERE ".substr($sql,3);
+
+ $res=$DB->query($sql);
+
+ $num = $res->__get('numRows');
+
+ if($num == 1){
+ $result=$res->fetchAssoc();
+ return ((!$shortkey)? $result : self::CleanKey($result));
+ }
+ elseif($num > 1){
+ $array=array();
+
+ foreach($res->fetchAllAssoc() as $result)
+ $array[]= ((!$shortkey)? $result : self::CleanKey($result));
+
+ return $array;
+ }
+
+ return false;
+ }
+
+ /**
+ @brief delete row
+ */
+ public static function delete($option){
+ self::getInstance();
+ $DB=Database::getInstance();
+
+ $sql ="";
+ if(isset($option['id'])) $sql .="AND _REPLDICO__id = '".(int)$option['id']."' ";
+ if(isset($option['name'])) $sql .="AND _REPLDICO__name = '".(string)tep_db_input($option['name'])."' ";
+ if(isset($option['visible'])) $sql .="AND _REPLDICO_visible = '".(int)$option['visible']."' ";
+
+
+ if($sql=='')
+ return false;
+
+ $DB->query("DELETE FROM " . TABLE__REPLDICO_MAJ_ ." WHERE ". substr($where, 3 ) );
+
+
+ return true;
+ }
+
+
+ /**
+ @brief
+ @return array product empty
+ */
+ public static function Specimen($shortkey=false){
+ $par = array(
+ '_REPLDICO__id' => '',
+ '_REPLDICO__name' => '',
+ '_REPLDICO_visible' => '',
+ );
+
+ return ((!$shortkey)? $par : self::CleanKey($par));
+ }
+
+
+
+ /**
+ @fn CleanKey()
+ @brief Clean string name key
+ */
+ private static function CleanKey($array){
+ self::getInstance();
+ $object= new stdclass();
+
+ foreach($array as $key=>$value){
+ if( strpos($key,'_REPLDICO__') ===0)
+ $key=substr($key,10);
+
+ $object->$key = $value;
+ }
+
+ return $object;
+ }
+
+}
+
+
+?>
\ No newline at end of file
Added: trunk/dev/GenerCode/Dicos/Modele/catalog/admin/includes/gabarit/_REPLDICO_/display_view.delete.gab
===================================================================
--- trunk/dev/GenerCode/Dicos/Modele/catalog/admin/includes/gabarit/_REPLDICO_/display_view.delete.gab (rev 0)
+++ trunk/dev/GenerCode/Dicos/Modele/catalog/admin/includes/gabarit/_REPLDICO_/display_view.delete.gab 2012-04-06 19:45:22 UTC (rev 4174)
@@ -0,0 +1,34 @@
+<?php
+/**
+ @licence GPL 2005-_CURRENTYEAR_ The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version _CURRENTVERSION_
+ @date _CURRENTDATE_
+ @author genrated by GenerCode
+ @encode UTF-8
+*/
+?>
+<h3><?php echo __('heading title delete _REPLDICO_'); ?></h3>
+
+
+<div class="box_uniq block_form">
+
+
+ <?php echo tep_draw_form('zone', _REPLDICO_::FILENAME, 'action=delete_confirm', 'post') ?>
+
+
+ <p class="block_input button_nav">
+ <?php
+ echo tep_draw_hidden_field('cID', '', _REPLDICO_::$Id);
+
+ echo tep_image_submit('button_delete.gif', IMAGE_DELETE);
+ echo tep_js_back(tep_href_link(_REPLDICO_::FILENAME), IMAGE_CANCEL) ;
+ ?>
+ </p>
+ </form>
+ </div>
+
+ <br class="clear" />
+
+</div>
Added: trunk/dev/GenerCode/Dicos/Modele/catalog/admin/includes/gabarit/_REPLDICO_/display_view.edit.gab
===================================================================
--- trunk/dev/GenerCode/Dicos/Modele/catalog/admin/includes/gabarit/_REPLDICO_/display_view.edit.gab (rev 0)
+++ trunk/dev/GenerCode/Dicos/Modele/catalog/admin/includes/gabarit/_REPLDICO_/display_view.edit.gab 2012-04-06 19:45:22 UTC (rev 4174)
@@ -0,0 +1,53 @@
+<?php
+/**
+ @licence GPL 2005-_CURRENTYEAR_ The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version _CURRENTVERSION_
+ @date _CURRENTDATE_
+ @author genrated by GenerCode
+ @encode UTF-8
+*/
+?>
+<h3><?php echo __('heading title edit'); ?></h3>
+
+<div class="box_uniq block_form">
+
+
+ <div id="tabs">
+ <ul>
+ <li><a href="#tabs-1"><?php echo __('_REPLDICO_ tab specification'); ?></a></li>
+ </ul>
+
+
+ <div id="tabs-1" class="tabPage">
+
+ <?php echo tep_draw_form('categories', _REPLDICO_::FILENAME, 'action='.((_REPLDICO_::$action == 'new')?'insert' : 'update&cID='.$_GET['cID']), 'post') ?>
+
+
+ <p class="block_input">
+ <Label><?php echo __('text info _REPLDICO_ name') ?></label>
+ <?php echo tep_draw_input_field('_REPLDICO__name', '', _REPLDICO_::$Info->name) ?>
+ </p>
+
+<!-- <p class="block_input">
+ <Label><?php //echo __('text info _REPLDICO_ visible') ?></label>
+ <?php //echo tep_draw_radio_field('_REPLDICO__visible', '_REPLDICO__visible_1', '1', $_REPLDICO__visible_Y) . ' ' . VISIBLE_YES . ' ' . tep_draw_radio_field('_REPLDICO__visible', '_REPLDICO__visible_0', '0', $_REPLDICO__visible_N) . ' ' . VISIBLE_NO ?>
+ </p>-->
+
+
+ <p class="block_input button_nav">
+ <?php
+ echo tep_image_submit('', IMAGE_UPDATE) /*. tep_image_submit('', IMAGE_UPDATE_AND_CLOSE,' name="up_and_close"' )*/;
+ echo tep_js_back(tep_href_link(_REPLDICO_::FILENAME), IMAGE_CANCEL) ;
+ ?>
+ </p>
+ </form>
+ </div>
+
+
+
+ <br class="clear" />
+ </div>
+
+</div>
Added: trunk/dev/GenerCode/Dicos/Modele/catalog/admin/includes/languages/fr_FR/modules/pages/_REPLDICO_.txt
===================================================================
--- trunk/dev/GenerCode/Dicos/Modele/catalog/admin/includes/languages/fr_FR/modules/pages/_REPLDICO_.txt (rev 0)
+++ trunk/dev/GenerCode/Dicos/Modele/catalog/admin/includes/languages/fr_FR/modules/pages/_REPLDICO_.txt 2012-04-06 19:45:22 UTC (rev 4174)
@@ -0,0 +1,16 @@
+<?php
+/**
+ @licence GPL 2005-_CURRENTYEAR_ The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version _CURRENTVERSION_
+ @date _CURRENTDATE_
+ @author genrated by GenerCode
+ @encode UTF-8
+ @class _REPLDICO_
+*/
+
+
+
+
+?>
Added: trunk/dev/GenerCode/Dicos/Modele/catalog/admin/includes/modules/pages/_REPLDICO_.php
===================================================================
--- trunk/dev/GenerCode/Dicos/Modele/catalog/admin/includes/modules/pages/_REPLDICO_.php (rev 0)
+++ trunk/dev/GenerCode/Dicos/Modele/catalog/admin/includes/modules/pages/_REPLDICO_.php 2012-04-06 19:45:22 UTC (rev 4174)
@@ -0,0 +1,431 @@
+<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
+/**
+ @licence GPL 2005-_CURRENTYEAR_ The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version _CURRENTVERSION_
+ @date _CURRENTDATE_
+ @author genrated by GenerCode
+ @encode UTF-8
+ @class _REPLDICO_
+*/
+
+class _REPLDICO_
+ extends ModTwo /// new abstract class for nextgen module
+ implements
+ InterfaceModule,
+ /*IntModTwo, */ /// new interface module for nextgen module
+ ExtModConfig {
+
+ const FILENAME = FILENAME__REPLDICO_MAJ_;
+
+ /**
+ @var string file
+ */
+ public static $Id;
+ /**
+ @var array list code action module
+ */
+ public static $list=array();
+ /**
+ @var bool $dir_ok
+ */
+ public static $dir_ok;
+ /**
+ @var current object
+ */
+ public static $Info;
+
+ /**
+ @brief class constructor
+ */
+ public function __construct() {
+ self::GetConf();
+ }
+
+
+ /**
+ @brief Load , adjust and define var environement exe for module
+ Is use in module and class abstract for init value config this module
+ */
+ public static function GetConf(){
+ global $languages_id;
+
+ self::$code=__CLASS__;
+
+ self::$action=(isset($_REQUEST['action'])? (string)$_REQUEST['action'] : 'listing' );
+ self::$Id=(isset($_REQUEST['cID'])? (int)$_REQUEST['cID'] : 0 );
+
+ /**
+ @remarks define var execution sql in GetDBValue()
+ */
+ self::$InitInfo['adjust']=array(
+ 'languages_id'=>$languages_id,
+ 'page'=>1,
+ 'rowbyp'=>10,
+ 'sOrder'=>'',
+ 'sWhere'=>'',
+ );
+
+
+
+ /**
+ @remarks not load if not first init
+ */
+ if(defined('JSONSTATMENT')) return;
+
+ if(self::$action =='' || self::$action =='listing')
+ //! active datatable in ajax, precise les GET necessaire
+ define('JSONSTATMENT', 'ModTwo=true&mod=page&type='.self::$code.
+ (isset(parent::$action)?'&action='.parent::$action : '' ).
+ (isset(self::$Id)?'&file='.self::$Id : '' )
+ );
+
+ /**
+ @remarks this define col theader title, and ajust html code
+ Just for Edit listing
+ */
+ self::$InitInfo['theader']['listing']=array(
+ array('width'=>'15%','class'=>'tcenter', 'txt'=>__('table heading name') ) ,
+ array('width'=>'8%','class'=>'tcenter', 'txt'=>__('table heading status') ),
+ array('width'=>'8%','class'=>'tcenter', 'txt'=>__('table heading action') ),
+ );
+
+ /**
+ @remarks this define col in table, and if is possible sort
+ Just for Edit listing
+ */
+ self::$InitInfo['modele']['listing']=array(
+// 0 =>false,
+ '_REPLDICO__name' =>true,
+ '_REPLDICO__visible'=>true,
+ 'action'=>false,
+ );
+
+
+
+ /**
+ @remarks this define menu master module in page
+ */
+ if(self::$action =='' || self::$action =='listing'){
+ self::$InitInfo['MenuModule'][]=array(
+ 'type'=>'getLink',
+ 'format'=>'button_nav',
+ 'image'=>'',
+ 'cssclass'=>'',
+ 'title'=>__('image add _REPLDICO_'),
+ 'url'=>tep_href_link(self::FILENAME, 'action=new'),
+ );
+
+ }
+
+
+
+
+
+ return true;
+ }
+
+
+
+ public function check_action($actions){
+ global $messageStack;
+
+ self::$action=$actions;
+
+ switch (self::$action) {
+
+
+ case 'setflag':
+ if ( ($_GET['flag'] == '0') || ($_GET['flag'] == '1') ) {
+ $c_id =(int) tep_db_prepare_input($_GET['cID']);
+
+ if ($c_id > 0){
+ $myarray = array('id'=>$c_id, 'visible'=>$_GET['flag'] );
+ sql_REPLDICO_::update($myarray);
+ }
+ }
+
+ if(!isset($_GET['forceajax']))
+ tep_redirect(tep_href_link(self::FILENAME, 'cID=' . $_GET['cID']));
+ break;
+
+ case 'insert':
+
+ $myarray = array(
+ 'name'=>tep_db_prepare_input($_POST['_REPLDICO__name']),
+ );
+
+ sql_REPLDICO_::create($myarray);
+
+ tep_redirect(tep_href_link(self::FILENAME ));
+ break;
+
+ case 'update':
+ $c_id =(int) tep_db_prepare_input($_GET['cID']);
+
+ if ($c_id > 0){
+ $myarray = array(
+ 'id'=>$c_id,
+ 'name'=>tep_db_prepare_input($_POST['_REPLDICO__name']),
+ 'visible'=>tep_db_prepare_input($_POST['_REPLDICO__visible']),
+ );
+
+ sql_REPLDICO_::update($myarray);
+ }
+
+ tep_redirect(tep_href_link(self::FILENAME, 'action=edit&cID=' . $c_id ));
+ break;
+
+ case 'delete_confirm':
+ $c_id =(int) tep_db_prepare_input($_POST['cID']);
+ if ($c_id > 0){
+ $myarray = array(
+ 'id'=>$c_id,
+ );
+ $res=sql_REPLDICO_::delete($myarray);
+ }
+
+ tep_redirect(tep_href_link(self::FILENAME));
+ break;
+ }
+
+ return self::$action;
+ }
+
+ public function get_header(){
+ }
+
+
+ /**
+ @fn _REPLDICO_::GetDBValue();
+ @brief return DB value adapted for current action
+ Use self::action for determine switch
+ @return
+ */
+ public static function GetDBValue(){
+
+ $DB= Database::getInstance();
+
+ switch (self::$action) {
+
+ case 'delete':
+ case 'edit':
+ case 'new':
+ if( (int)self::$Id > 0) {
+ self::$Info = sql_REPLDICO_::fetch(array('id'=>self::$Id ), true);
+ }
+ else{
+ self::$Info = sql_REPLDICO_::Specimen(true);
+ }
+ break;
+
+
+ case 'listing':
+ default:
+ /**
+ @remarks retrun object load one inventaire
+ */
+ global $query_numrows;
+ $adjust=new objectInfo(self::$InitInfo['adjust']);
+
+ $query_raw = "select _REPLDICO__id , _REPLDICO__name , _REPLDICO__visible from " . TABLE__REPLDICO_MAJ_ . " c ".
+ ((!empty($adjust->sWhere)) ? " WHERE ".substr($adjust->sWhere, 3) : '').
+ " ORDER BY ".((!empty($adjust->sOrder)) ? $adjust->sOrder : ' _REPLDICO__name ASC ');
+
+ $_split = new splitPageResults($adjust->page, $adjust->rowbyp, $query_raw, $query_numrows);
+ $_query = $DB->query($query_raw);
+
+ $res=self::FormatDBValue($_query);
+
+ return $res;
+ }
+ }
+
+
+
+ public function display_view(){
+ switch (parent::$action) {
+ /**
+ @remarks Ajax View result
+ */
+ case 'setflag':
+ return self::RowStatus(array('country_visible'=>(int)$_GET['flag'], '_REPLDICO__id'=>(int)$_GET['cID']));
+ break;
+
+
+ /**
+ @remarks Normal View Page
+ */
+ case 'new':
+ self::load_db_values(0);
+ return MGabCont::CallGab('edit',__FUNCTION__,__CLASS__);
+ break;
+ case 'edit':
+ self::load_db_values(self::$Id);
+ return MGabCont::CallGab(parent::$action,__FUNCTION__,__CLASS__);
+ break;
+ case 'delete':
+ self::load_db_values(self::$Id);
+ return MGabCont::CallGab(parent::$action,__FUNCTION__,__CLASS__);
+ break;
+ case 'listing':
+ default:
+ self::$list=self::tep_get_list();
+ /// use master gabarit
+ MGabCont::SetCurrentName(__CLASS__);
+ return MGabCont::CallGab('listing',__FUNCTION__,self::MASTER);
+ }
+ }
+
+
+
+
+ public static function tep_get_list($page=1,$rowbyp=10,$sOrder='',$sWhere='',$options=''){
+ global $query_numrows;
+
+ /// @remarks force load conf
+ self::GetConf();
+
+ $res=array();
+
+ /**
+ @remarks adjust param for sql requete
+ */
+ self::$InitInfo['adjust']['page']=$page;
+ self::$InitInfo['adjust']['rowbyp']=$rowbyp;
+ self::$InitInfo['adjust']['sOrder']=$sOrder;
+ self::$InitInfo['adjust']['sWhere']=$sWhere;
+ self::$InitInfo['adjust']['options']=$options;
+
+ $res = self::GetDBValue();
+
+ self::$list= $query_numrows ; //= count($res);
+
+ return $res;
+ }
+
+
+ /** public static InterfacedTJsonS */
+
+ /**
+ @brief format db value for display page
+ @param $_query ressource db sql
+ @return array
+ */
+ private static function FormatDBValue($_query){
+ $DB=Database::getInstance();
+ $res=array();
+
+ switch (parent::$action) {
+ case 'edit';
+ global $query_numrows,$languages_id;
+
+ break;
+ case 'listing':
+ global $query_numrows,$languages_id;
+
+ while ($item = $_query->fetchAssoc()) {
+
+ foreach(self::$InitInfo['modele']['listing'] as $k=>$row)
+ if($k == 'action') $ord[$k]=self::ButtonRowsActions($item);
+ elseif($k == '_REPLDICO__visible') $ord[$k]=self::RowStatus($item);
+ else $ord[$k]=$item[$k];
+
+ $res[]=$ord;
+ }
+ break;
+ }
+
+ return $res;
+ }
+
+ /**
+ @fn ButtonRowsActions($item)
+ @return string html
+ */
+ public static function ButtonRowsActions($item){
+ return sprintf(
+ CsrtAction::getFormat('row_action'),
+''
+ ,
+ sprintf(CsrtAction::getLink('row_action_right', IMAGE_DELETE, 'edit'), '', tep_href_link(self::FILENAME, 'cID=' . $item['_REPLDICO__id'] . '&action=edit') ,'' ).
+ sprintf(CsrtAction::getLink('row_action_right', IMAGE_DELETE, 'delete'), 'fancy', tep_href_link(self::FILENAME, 'cID=' . $item['_REPLDICO__id'] . '&action=delete') ,'' )
+ );
+ }
+
+ /**
+ @brief return format html for row status
+ @param $product array restuts row product
+ @return string html
+ */
+ private static function RowStatus($item){
+ $exclude=array('action','pID','forceajax','type','class','function','funct', 'mod');
+ $query_s='action=setflag&cID=' . $item['_REPLDICO__id'].'&flag=';
+
+ return '<a class="ajaxinline" href="' . tep_href_link(self::FILENAME, tep_get_all_get_params($exclude).$query_s.(($item['country_visible'] == '1')? '0' : '1') ) . '">'.
+ sprintf(
+ CsrtAction::getFormat('row_flag'),
+ (int)$item['country_visible'],
+ ( ($item['country_visible'] == '1')? IMAGE_ICON_STATUS_GREEN : IMAGE_ICON_STATUS_RED)
+ ).
+ '</a>';
+ }
+
+
+ /**
+ @brief return Filename
+ */
+ public static function GetFILENAME(){
+ return self::FILENAME;
+ }
+
+
+ /**
+ @remarks implements InterfaceModule depend
+ if module twin in backoffice, report all content install in the other module
+ public function check() {return true;}
+ public function install() {return true;}
+ public function remove() {return true;}
+ public function keys() {return array(); }
+ */
+
+ /**
+ @fn check()
+ @brief test if count all var , and keys is equal
+ @return boolean true/false
+ */
+ function check() { return false; }
+
+
+ /**
+ @fn keys()
+ @return array all key configuration define by this module
+ */
+ function keys() { return false; }
+
+ /**
+ @fn install()
+ @brief add all configuration
+ @note
+ - Modules can emarquer sql installation instructions, however, in the case of transverse information, or dependent of an extension, preferring the implementation of an extension, file with sql independent
+ - please, pefix all var configuration by 'MODULE_OT__MODTYPENAME_MAJ_'
+ - if module twin in backoffice, report all content install in the other module
+ - Not use language in DB , but function :__()
+ for MODULE_TOTO_ST
+ var title MODULE_TOTO_ST_S (small description)
+ var description MODULE_TOTO_ST_L (long description)
+ */
+ function install() { return false; }
+
+ /**
+ @fn remove()
+ @brief delete all configuration
+ @note
+ - please, pefix all var configuration by 'MODULE_PAYMENT__MODTYPENAME_MAJ_'
+ - if module twin in backoffice, report all content remove in the other module
+ */
+ function remove() { return false; }
+}
+
+?>
\ No newline at end of file
Added: trunk/dev/GenerCode/Dicos/Modele/install.xml
===================================================================
--- trunk/dev/GenerCode/Dicos/Modele/install.xml (rev 0)
+++ trunk/dev/GenerCode/Dicos/Modele/install.xml 2012-04-06 19:45:22 UTC (rev 4174)
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<contrib>
+ <description>
+ <details contrib_ref="" forum_ref="" contrib_type="module," status="0" last_update="2010-10-27" />
+ <author_pkg>www.oscss.org</author_pkg>
+ <comments><![CDATA[ ]]>
+ </comments>
+ <credits>oscim</credits>
+ <version>1.0</version>
+ <post_install_notes><![CDATA[ ]]></post_install_notes>
+ </description>
+
+ <addfile>
+ <file name="admin/includes/classes/drivers/sql_DATATYPE_REPLACE_.php" />
+ <file name="admin/includes/classes/drivers/sql_DATATYPE_REPLACE_extrafields.php" />
+
+ <file name="admin/includes/modules/pages/_DATATYPE_REPLACE_s.php" />
+ <file name="admin/includes/modules/_DATATYPE_REPLACE_/_DATATYPE_REPLACE_SEOTAG__description.php" />
+ <file name="admin/includes/modules/_DATATYPE_REPLACE_/header_tags.php" />
+ <file name="admin/includes/modules/configuration/mod_DATATYPE_REPLACE_extra.php" />
+
+ <file name="admin/includes/gabarit/_DATATYPE_REPLACE_s/display_view.delete.gab" />
+ <file name="admin/includes/gabarit/_DATATYPE_REPLACE_s/display_view.edit.gab" />
+ <file name="admin/includes/gabarit/_DATATYPE_REPLACE_s/display_view.inline.gab" />
+ <file name="admin/includes/gabarit/_DATATYPE_REPLACE_s/display_view.listing.gab" />
+ <file name="admin/includes/gabarit/_DATATYPE_REPLACE_s/display_view.new.gab" />
+ <file name="admin/includes/gabarit/_DATATYPE_REPLACE_s/_DATATYPE_REPLACE_SEOTAG__description/display_edit.edit.gab" />
+
+ <file name="common/classes/datatype_drivers/Data__DATATYPE_REPLACE_.php" />
+
+ <file name="includes/classes/drivers/data/_DATATYPE_REPLACE_.php" />
+
+ <file name="includes/content/_DATATYPE_REPLACE_.php" />
+
+ <file name="includes/modules/_DATATYPE_REPLACE_/_DATATYPE_REPLACE_SEOTAG__description.php" />
+ </addfile>
+
+ <addfilelg>
+ <file name="admin/includes/languages/%LANGUAGE%/modules/pages/_DATATYPE_REPLACE_s.txt" lgref="fr_FR"/>
+
+ <file name="admin/includes/languages/%LANGUAGE%/modules/_DATATYPE_REPLACE_/_DATATYPE_REPLACE_SEOTAG__description.txt" lgref="fr_FR"/>
+
+<!-- <file name="includes/languages/%LANGUAGE%/modules/_DATATYPE_REPLACE_/_DATATYPE_REPLACE_SEOTAG__description.txt" lgref="fr_FR"/> -->
+ </addfilelg>
+
+ <add2endlg>
+ <file name="admin/includes/languages/%LANGUAGE%/boxes/08_cms.php" />
+ <add type="php" lgref="fr_FR"><![CDATA[ define('BOX_TOOLS__DATATYPE_REPLACE_MAJ_', 'Datatype _DATATYPE_REPLACE_MAJ_');]]></add>
+ </add2endlg>
+
+ <add2end>
+ <file name="admin/includes/boxes/08_cms.php" />
+ <add type="php"><![CDATA[$tabl_link[]= array(FILENAME__DATATYPE_REPLACE_MAJ_, 'BOX_TOOLS__DATATYPE_REPLACE_MAJ_', '_DATATYPE_REPLACE_',@$img['_DATATYPE_REPLACE_']);]]></add>
+ </add2end>
+
+ <add2end>
+ <file name="admin/includes/tables_files_modules.php" />
+ <add type="php"><![CDATA[
+ define('TABLE__DATATYPE_REPLACE_MAJ_', DB_TABLE_PREFIX . '_DATATYPE_REPLACE_');
+ define('TABLE__DATATYPE_REPLACE_MAJ__DESCRIPTION', DB_TABLE_PREFIX . '_DATATYPE_REPLACE__description');
+ define('TABLE__DATATYPE_REPLACE_MAJ__EXTRA', DB_TABLE_PREFIX . '_DATATYPE_REPLACE__extra');
+ define('TABLE__DATATYPE_REPLACE_MAJ__TO_CATEGORIES', DB_TABLE_PREFIX . '_DATATYPE_REPLACE__to_categories');
+ define('FILENAME__DATATYPE_REPLACE_MAJ_', '_DATATYPE_REPLACE_s.php');]]></add>
+ </add2end>
+
+
+ <add2end>
+ <file name="includes/tables_files_modules.php" />
+ <add type="php"><![CDATA[
+ ## table master
+ define('TABLE__DATATYPE_REPLACE_MAJ_', DB_TABLE_PREFIX . '_DATATYPE_REPLACE_');
+ define('TABLE__DATATYPE_REPLACE_MAJ__DESCRIPTION', DB_TABLE_PREFIX . '_DATATYPE_REPLACE__description');
+ ## link categories
+ define('TABLE__DATATYPE_REPLACE_MAJ__TO_CATEGORIES', DB_TABLE_PREFIX . '_DATATYPE_REPLACE__to_categories');
+ ## extra
+ // define('TABLE__DATATYPE_REPLACE_MAJ__EXTRA', DB_TABLE_PREFIX . '_DATATYPE_REPLACE__extra');
+ define('TABLE__DATATYPE_REPLACE_MAJ__EXTRA_FIELDS', DB_TABLE_PREFIX .'_DATATYPE_REPLACE__extra_fields');
+ define('TABLE__DATATYPE_REPLACE_MAJ__EXTRA_FIELDS_LABELS', DB_TABLE_PREFIX .'_DATATYPE_REPLACE__extra_fields_labels');
+ define('TABLE__DATATYPE_REPLACE_MAJ__EXTRA_FIELDS_VALUES', DB_TABLE_PREFIX .'_DATATYPE_REPLACE__extra_fields_values');
+ define('TABLE__DATATYPE_REPLACE_MAJ__TO__DATATYPE_REPLACE_MAJ__EXTRA_FIELDS', DB_TABLE_PREFIX .'_DATATYPE_REPLACE__to__DATATYPE_REPLACE__extra_fields');
+
+ define('FILENAME__DATATYPE_REPLACE_MAJ_', '_DATATYPE_REPLACE_.php');]]>
+ </add>
+
+ </add2end>
+
+ <filesql> </filesql>
+
+</contrib>
\ No newline at end of file
Added: trunk/dev/GenerCode/Dicos/Modele/sql/mysql/install/tables/osc__REPLDICO_.sql
===================================================================
--- trunk/dev/GenerCode/Dicos/Modele/sql/mysql/install/tables/osc__REPLDICO_.sql (rev 0)
+++ trunk/dev/GenerCode/Dicos/Modele/sql/mysql/install/tables/osc__REPLDICO_.sql 2012-04-06 19:45:22 UTC (rev 4174)
@@ -0,0 +1,9 @@
+--
+-- Structure de la table osc__REPLDICO_
+--
+
+CREATE TABLE IF NOT EXISTS osc__REPLDICO_(
+ _REPLDICO__id int(11) NOT NULL AUTO_INCREMENT,
+ _REPLDICO__name varchar(32) NULL '',
+ PRIMARY KEY (_REPLDICO__id)
+) CHARSET=utf8 ;
Added: trunk/dev/GenerCode/Dicos/Modele/sql/mysql/remove/tables/osc__REPLDICO_.sql
===================================================================
--- trunk/dev/GenerCode/Dicos/Modele/sql/mysql/remove/tables/osc__REPLDICO_.sql (rev 0)
+++ trunk/dev/GenerCode/Dicos/Modele/sql/mysql/remove/tables/osc__REPLDICO_.sql 2012-04-06 19:45:22 UTC (rev 4174)
@@ -0,0 +1,6 @@
+
+--
+-- Structure de la table osc__REPLDICO_
+--
+
+DROP TABLE IF EXISTS osc__REPLDICO_ ;
Added: trunk/dev/GenerCode/Dicos/index.php
===================================================================
--- trunk/dev/GenerCode/Dicos/index.php (rev 0)
+++ trunk/dev/GenerCode/Dicos/index.php 2012-04-06 19:45:22 UTC (rev 4174)
@@ -0,0 +1,154 @@
+<?php
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 05/04/2012, 09:40
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @note if yoru copie this file replace all ModuleType by new name folder
+*/
+global $current;
+
+
+
+
+$_CurrentRoot = 'Dicos/';
+
+
+$arrReturn = array();
+// Scan directory
+$folder = $_CurrentRoot.'Modele/catalog/includes/modules/';
+foreach (scandir($current . $folder) as $strFile) {
+ if ( in_array($strFile , array( '.' , '..' , '.svn') ) || !is_dir($current . $folder . $strFile) ) continue;
+ $arrReturn[] = array('id'=>$strFile, 'text'=>$strFile);
+}
+
+
+/**
+ @brief Adjust Class for this page
+*/
+class GenerCodeModuleType
+ extends GenerCode{
+
+ function __construct($conf ){
+
+
+ $conf->curent;
+ $conf->name = tep_db_prepare_input($_GET['name']);
+// $conf->match = tep_db_prepare_input($_GET['module']);
+ $conf->level = 'stable';
+
+ $this->modele_path = $conf->modele_path;
+
+
+ $this->allsearch=array(
+ '_REPLDICO_MAJ_',
+ '_REPLDICO_',
+ );
+
+ $this->allreplace=array(
+ strtoupper($conf->name),
+ $conf->name
+ );
+
+
+ $this->folder = $conf->curent .'/'. strtoupper($conf->name).'_'.$conf->level.'/';
+
+ if(!file_exists($this->folder) || !is_dir($this->folder)) {
+ mkdir($this->folder);
+ }
+
+ $this->ProcessAndFinish();
+
+ echo 'le dossier creer ce situe :' . $this->folder;
+
+ }
+
+
+ function process($current=''){
+
+ if (!empty($current) && substr($current, -1, 1) != '/') $current .= '/';
+
+ $path_mod = $this->modele_path . $current;
+
+ foreach($this->browse($path_mod) as $row){
+ if(is_dir($path_mod.$row)) {
+
+ mkdir( $this->stringreplace($this->folder . $current. $row) );
+ $this->process($current.$row);
+ }
+ else{
+ $res=file_get_contents($path_mod.$row);
+
+ $file_contents = $this->stringreplace($res);
+
+ $fp = fopen( $this->stringreplace($this->folder . $current. $row) , 'w');
+ fputs($fp, $file_contents);
+ fclose($fp);
+ }
+ }
+ }
+
+}
+
+
+
+
+/**
+ Action
+*/
+if(isset($_GET['name']) && !empty($_GET['name'])){
+
+ $conf = new stdClass();
+ $conf->curent = $current . $_CurrentRoot;
+ $conf->name = tep_db_prepare_input($_GET['name']);
+ $conf->seotag = tep_db_prepare_input($_GET['seotag']);
+ $conf->head_tag = false;
+ $conf->level = 'stable';
+ $conf->modele_path = $conf->curent . 'Modele/';
+
+ $object = new GenerCodeModuleType($conf);
+
+ exit;
+}
+
+?>
+
+
+<h2>Create Dico base exts</h2>
+
+
+<form>
+</p>
+<table>
+ <tr>
+ <td>Nom de base </td>
+ <td><?php echo tep_draw_input_field('name', 'name') ?>(string) full name (no special caratere)</td>
+ </tr>
+
+ <tr>
+ <td>Nom de base enfants</td>
+ <td><?php //echo tep_draw_input_field('name', 'name') ?>(string) full name (no special caratere)</td>
+ </tr>
+
+<!-- <tr>
+ <td>quick tag for rewrite</label>
+ <td><?php //echo tep_draw_input_field('seotag', 'seotag') ?>(string) quik key </td>
+ </tr>-->
+<!-- <tr>
+ <td>other rows in master table, respect classique sql commande ; just subline in create </label>
+ <td><?php echo tep_draw_pull_down_menu('module','', $arrReturn) ?></td>
+ </tr>-->
+</table>
+<!-- <p>
+ <label>add head_tag</label>
+ <?php echo tep_draw_checkbox_field('head_tag', 'head_tag', 'active') ?>
+ </p>-->
+
+
+ <p>
+ <input type="hidden" name="goto" value="<?php echo $_CurrentRoot ?>" />
+ <input type="submit" value="Translate" />
+ </p>
+</form>
Added: trunk/dev/GenerCode/Dicos/readme
===================================================================
--- trunk/dev/GenerCode/Dicos/readme (rev 0)
+++ trunk/dev/GenerCode/Dicos/readme 2012-04-06 19:45:22 UTC (rev 4174)
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+Createur d'un dico. Soit simplement l'edition / gestion d'une table dans la db associé à son module de gestion
+Cette table ne contient aucun element de localisation (language), elle correspond donc plus a des element de struture/configuration.
+
+
+Creation des pages et ressource à un dictionnaire. Le dictionnaire correspond à une ressource statique (pays, region devise ..);
+
+Ce constructeur assure la creation de
+
+ - includes/modules/pages/_REPLDICO_.php
\ No newline at end of file
Modified: trunk/dev/GenerCode/class.GenerCode.php
===================================================================
--- trunk/dev/GenerCode/class.GenerCode.php 2012-04-06 17:17:51 UTC (rev 4173)
+++ trunk/dev/GenerCode/class.GenerCode.php 2012-04-06 19:45:22 UTC (rev 4174)
@@ -14,52 +14,29 @@
Class GenerCode{
+ const CURRENT_VERSION = '2.1.1';
protected $head_tag = false;
-// function __construct($conf /*$curent, $name, $seotag, $head_tag=false*/){
-//
-//
-// /*$curent = */ $conf->curent;
-// $conf->name = tep_db_prepare_input($_GET['name']);
-// $conf->seotag = tep_db_prepare_input($_GET['seotag']);
-// $conf->head_tag = false;
-// $conf->level = 'stable';
-//
-// $this->modele_path = $conf->modele_path;
-//
-//
-// $this->allsearch=array(
-// '_DATATYPE_REPLACE_SEOTAG_',
-// '_DATATYPE_REPLACE_MAJ_',
-// '_DATATYPE_REPLACE_UCWORDS_',
-// '_DATATYPE_REPLACE_'
-// );
-//
-// $this->allreplace=array(
-// $conf->seotag,
-// strtoupper($conf->name),
-// ucwords($conf->name),
-// $conf->name
-// );
-//
-//
-// $this->folder = $conf->curent .'/'. strtoupper($conf->name).'_'.$conf->level.'/';
-//
-// if(!file_exists($this->folder) || !is_dir($this->folder)) {
-// mkdir($this->folder);
-// }
-//
-// $this->process();
-// // }
-//
-//
-// echo 'le dossier creer ce situe :' . $this->folder;
-//
-// }
+ function ProcessAndFinish(){
+ $this->allsearch[]= '_CURRENTYEAR_';
+ $this->allsearch[]= '_CURRENTDATE_';
+ $this->allsearch[]= '_CURRENTVERSION_';
+
+
+ $this->allreplace[]= date('Y');
+ $this->allreplace[]= date('d/m/Y ,H:i:s');
+ $this->allreplace[]= self::CURRENT_VERSION;
+
+ $this->process();
+
+ }
+
+
+
function process($current=''){
if (!empty($current) && substr($current, -1, 1) != '/') $current .= '/';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-06 17:17:56
|
Revision: 4173
http://oscss.svn.sourceforge.net/oscss/?rev=4173&view=rev
Author: oscim
Date: 2012-04-06 17:17:51 +0000 (Fri, 06 Apr 2012)
Log Message:
-----------
ajustement des dossiers
Added Paths:
-----------
trunk/dev/GenerCode/ModuleType/Modele/catalog/
Removed Paths:
-------------
trunk/dev/GenerCode/ModuleType/catalog/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-06 17:16:27
|
Revision: 4172
http://oscss.svn.sourceforge.net/oscss/?rev=4172&view=rev
Author: oscim
Date: 2012-04-06 17:16:21 +0000 (Fri, 06 Apr 2012)
Log Message:
-----------
Suite ajout base genercode moduletype
Added Paths:
-----------
trunk/dev/GenerCode/ModuleType/catalog/
trunk/dev/GenerCode/ModuleType/catalog/admin/
trunk/dev/GenerCode/ModuleType/catalog/includes/
trunk/dev/GenerCode/ModuleType/catalog/includes/languages/
trunk/dev/GenerCode/ModuleType/catalog/includes/modules/
trunk/dev/GenerCode/ModuleType/catalog/includes/modules/account/
trunk/dev/GenerCode/ModuleType/catalog/includes/modules/content/
trunk/dev/GenerCode/ModuleType/catalog/includes/modules/generic/
trunk/dev/GenerCode/ModuleType/catalog/includes/modules/home/
trunk/dev/GenerCode/ModuleType/catalog/includes/modules/order_total/
trunk/dev/GenerCode/ModuleType/catalog/includes/modules/order_total/ot__MODTYPENAME_.php
trunk/dev/GenerCode/ModuleType/catalog/includes/modules/payment/
trunk/dev/GenerCode/ModuleType/catalog/includes/modules/payment/_MODTYPENAME_.php
trunk/dev/GenerCode/ModuleType/catalog/includes/modules/products/
trunk/dev/GenerCode/ModuleType/catalog/includes/modules/shipping/
Added: trunk/dev/GenerCode/ModuleType/catalog/includes/modules/order_total/ot__MODTYPENAME_.php
===================================================================
--- trunk/dev/GenerCode/ModuleType/catalog/includes/modules/order_total/ot__MODTYPENAME_.php (rev 0)
+++ trunk/dev/GenerCode/ModuleType/catalog/includes/modules/order_total/ot__MODTYPENAME_.php 2012-04-06 17:16:21 UTC (rev 4172)
@@ -0,0 +1,168 @@
+<?php
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 04/03/2012, 21:54
+ @author genrated by dev/GenerCode/ModuleType
+ @encode UTF-8
+ @class ot__MODTYPENAME_
+*/
+
+class ot__MODTYPENAME_
+ implements
+ InterfaceModule,
+ InterfaceAcaOrderTotal
+ {
+ /**
+ @var string title for display
+ */
+ public $title;
+ /**
+ @var string description display
+ */
+ public $description;
+ /**
+ @var string name class current module
+ */
+ public $code;
+ /**
+ @var int sort order
+ */
+ public $sort_order;
+ /**
+ @var boolean
+ */
+ public $enabled =true ;
+ /**
+ @var boolean active in shopping cart and preview calculate current module
+ */
+ public $shopping_cart =true ;
+ /**
+ @var array
+ */
+ public $pre_output = array() ;
+ /**
+ @var array
+ */
+ public $output = array();
+
+
+ /**
+ @fn __construct()
+ @brief constructor
+ */
+ function __construct() {
+ $this->code = __CLASS__;
+ $this->title = __('module order total _MODTYPENAME_ title');
+ $this->description = __('module order total _MODTYPENAME_ description');
+ $this->sort_order = (defined('MODULE_OT__MODTYPENAME_MAJ__SORT_ORDER')) ? MODULE_OT__MODTYPENAME_MAJ__SORT_ORDER : 0;
+ }
+
+
+ /**
+ @remarks implements InterfaceAcaOrderTotal depend
+ */
+
+ /**
+ @fn process()
+ @note use class orders for base
+ this here section for modfied by you
+ @remarks classed in checkout_xxx
+ */
+ public function process() {
+ global $order, $currencies;
+
+ $this->output[] = array('title' => $this->title . ':',
+ 'text_ht' => $currencies->format(0, true, $order->info['currency'], $order->info['currency_value']),
+ 'text' => $currencies->format(0, true, $order->info['currency'], $order->info['currency_value']),
+ 'value_ht' => 0,
+ 'value' => 0
+ );
+ }
+
+ /**
+ @fn show_list_total()
+ @brief calculate and display subtotal temp in cart
+ @note use class shopping cart for base
+ this here section for modfied by you
+ @remarks classed in shopping_cart
+ */
+ public function show_list_total() {
+ global $currencies, $cart;
+ $this->pre_output = new objectInfo(array('text'=>$this->title,
+ 'value'=> $cart->ListTotal
+ )
+ );
+
+ return $this->pre_output;
+ }
+
+
+
+
+ /**
+ @remarks implements InterfaceModule depend
+ if module twin in backoffice, report all content install in the other module
+ public function check() {return true;}
+ public function install() {return true;}
+ public function remove() {return true;}
+ public function keys() {return array(); }
+ */
+
+ /**
+ @fn check()
+ @brief test if count all var , and keys is equal
+ @return boolean true/false
+ */
+ public function check() {
+ $DB=Database::getInstance();
+ if (!isset($this->_check)) {
+ $check_query = $DB->query("select configuration_value from " . TABLE_CONFIGURATION . " where configuration_key LIKE 'MODULE_OT__MODTYPENAME_MAJ_%' ");
+ if( $check_query->__get('numRows') == count($this->keys()) ) $this->_check=true;
+ else {
+ $this->remove();
+ $this->_check=false;
+ }
+ }
+ return $this->_check;
+ }
+
+ /**
+ @fn keys()
+ @return array all key configuration define by this module
+ */
+ function keys() {
+ return array( 'MODULE_OT__MODTYPENAME_MAJ__SORT_ORDER');
+ }
+
+
+ /**
+ @fn install()
+ @brief add all configuration
+ @note
+ - Modules can emarquer sql installation instructions, however, in the case of transverse information, or dependent of an extension, preferring the implementation of an extension, file with sql independent
+ - please, pefix all var configuration by 'MODULE_OT__MODTYPENAME_MAJ_'
+ - if module twin in backoffice, report all content install in the other module
+ - Not use language in DB , but function :__()
+ for MODULE_TOTO_ST
+ var title MODULE_TOTO_ST_S (small description)
+ var description MODULE_TOTO_ST_L (long description)
+ */
+ function install() {
+ tep_db_query("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added) values ('MODULE_OT__MODTYPENAME_MAJ__SORT_ORDER_S', 'MODULE_OT__MODTYPENAME_MAJ__SORT_ORDER', '1', 'MODULE_OT__MODTYPENAME_MAJ__SORT_ORDER_L', '6', '2', now())");
+ }
+
+ /**
+ @fn remove()
+ @brief delete all configuration
+ @note
+ - please, pefix all var configuration by 'MODULE_PAYMENT__MODTYPENAME_MAJ_'
+ - if module twin in backoffice, report all content remove in the other module
+ */
+ function remove() {
+ tep_db_query("delete from " . TABLE_CONFIGURATION . " where configuration_key in ('" . implode("', '", $this->keys()) . "')");
+ }
+}
+?>
\ No newline at end of file
Added: trunk/dev/GenerCode/ModuleType/catalog/includes/modules/payment/_MODTYPENAME_.php
===================================================================
--- trunk/dev/GenerCode/ModuleType/catalog/includes/modules/payment/_MODTYPENAME_.php (rev 0)
+++ trunk/dev/GenerCode/ModuleType/catalog/includes/modules/payment/_MODTYPENAME_.php 2012-04-06 17:16:21 UTC (rev 4172)
@@ -0,0 +1,226 @@
+<?php
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 04/03/2012, 21:54
+ @author genrated by dev/GenerCode/ModuleType
+ @encode UTF-8
+ @class ot__MODTYPENAME_
+*/
+
+class _MODTYPENAME_
+ implements
+ InterfaceModule,
+ InterfaceAcaPayment
+ {
+
+ /**
+ @var string title for display
+ */
+ public $title;
+ /**
+ @var string description display
+ */
+ public $description;
+ /**
+ @var string name class current module
+ */
+ public $code;
+ /**
+ @var int sort order
+ */
+ public $sort_order;
+ /**
+ @var boolean
+ */
+ public $enabled = true ;
+ /**
+ @var string path file name image
+ */
+ public $icon ;
+
+
+ /**
+ @fn __construct()
+ @brief constructor
+ */
+ public function __construct() {
+ $this->code = '_MODTYPENAME_';
+ $this->title = __('module payment _MODTYPENAME_ text title');
+ $this->description = __('module payment _MODTYPENAME_ text description');
+ $this->sort_order = (defined('MODULE_PAYMENT__MODTYPENAME_MAJ__SORT_ORDER')? MODULE_PAYMENT__MODTYPENAME_MAJ__SORT_ORDER : 0);
+ $this->icon = (tep_not_null('MODULE_PAYMENT__MODTYPENAME_MAJ__ICON')? substr(MODULE_PAYMENT__MODTYPENAME_MAJ__ICON,strlen(DIR_WS_CATALOG)) : '');
+
+
+ if ((int)MODULE_PAYMENT__MODTYPENAME_MAJ__ORDER_STATUS_ID > 0)$this->order_status = MODULE_PAYMENT__MODTYPENAME_MAJ__ORDER_STATUS_ID;
+
+ global $order;
+ if (is_object($order)) $this->update_status();
+
+ //! texte supp dans email commande
+ $this->email_footer = __('MODULE_PAYMENT__MODTYPENAME_MAJ__TEXT_EMAIL_FOOTER');
+ }
+
+ /**
+ @fn update_status()
+ @brief check all current var and update status module
+ this check zone / country user and match configuration module and zone authorised
+ @remarks this call after all call
+ */
+ public function update_status() {
+ global $order;
+
+ if ( ($this->enabled == true) && ((int)MODULE_PAYMENT__MODTYPENAME_MAJ__ZONE > 0) ) {
+ $check_flag = false;
+ $check_query = tep_db_query("select zone_id from " . TABLE_ZONES_TO_GEO_ZONES . " where geo_zone_id = '" . MODULE_PAYMENT__MODTYPENAME_MAJ__ZONE . "' and (zone_country_id = '" . $order->delivery['country']['id'] . "' OR zone_country_id ='0') order by zone_id");
+ while ($check = tep_db_fetch_array($check_query)) {
+ if ($check['zone_id'] < 1) {
+ $check_flag = true;
+ break;
+ } elseif ($check['zone_id'] == $order->billing['zone_id']) {
+ $check_flag = true;
+ break;
+ }
+ }
+
+ if ($check_flag == false) $this->enabled = false;
+ }
+
+
+ }
+
+ /**
+ @fn javascript_validation()
+ */
+ public function javascript_validation() {
+ return false;
+ }
+
+ /**
+ @fn selection()
+ @brief called in payement page selector, this data use in dislpay page
+ */
+ public function selection() {
+ return array(
+ 'id' => $this->code,
+ 'module' => $this->title,
+ 'icon'=>tep_image($this->icon, $this->title)
+ );
+ }
+
+ /**
+ @fn pre_confirmation_check()
+ */
+ public function pre_confirmation_check() { return false; }
+
+ /**
+ @fn confirmation()
+ */
+ public function confirmation() {
+ return array('title' => __('module payment _MODTYPENAME_ text title'));
+ }
+
+ /**
+ @fn process_button()
+ */
+ public function process_button() { return false; }
+
+ /**
+ @fn before_process()
+ */
+ public function before_process() { return false; }
+
+ /**
+ @fn after_process()
+ */
+ public function after_process() { return false; }
+
+ /**
+ @fn payment_succes()
+ @brief Retour des éléments de num order, de order de cheque, et des liens vers account
+ */
+ public function payment_succes() {
+
+ $s=sprintf(__('note succes monyeyorder %s'),str_replace(array('\r\n', '\n', '\r'),array('<br />'), STORE_NAME_ADDRESS ) );
+
+ if(tep_session_is_registered('the_order_formated')) $s.=sprintf(__('link succes monyeyorder'),$_SESSION['the_order_formated']);
+ elseif(tep_session_is_registered('the_order_id')) $s.=sprintf(__('link succes monyeyorder'),$_SESSION['the_order_id']);
+ return $s;
+ }
+
+ /**
+ @fn v()
+ @brief display error in this module and current process
+ */
+ public function get_error() {
+ return false;
+ }
+
+
+
+ /**
+ @remarks implements InterfaceModule depend
+ */
+
+ /**
+ @fn check()
+ @brief test if count all var , and keys is equal
+ @return boolean true/false
+ */
+ public function check() {
+ $DB=Database::getInstance();
+ if (!isset($this->_check)) {
+ $check_query = $DB->query("select configuration_value from " . TABLE_CONFIGURATION . " where configuration_key LIKE 'MODULE_PAYMENT__MODTYPENAME_MAJ_%' ");
+ if( $check_query->__get('numRows') == count($this->keys()) ) $this->_check=true;
+ else {
+ $this->remove();
+ $this->_check=false;
+ }
+ }
+ return $this->_check;
+ }
+
+ /**
+ @fn keys()
+ @return array all key configuration define by this module
+ */
+ public function keys() {
+ return array(
+ 'MODULE_PAYMENT__MODTYPENAME_MAJ__ZONE',
+ 'MODULE_PAYMENT__MODTYPENAME_MAJ__ORDER_STATUS_ID',
+ 'MODULE_PAYMENT__MODTYPENAME_MAJ__SORT_ORDER',
+ 'MODULE_PAYMENT__MODTYPENAME_MAJ__PAYTO',
+ 'MODULE_PAYMENT__MODTYPENAME_MAJ__ICON'
+ );
+ }
+
+ /**
+ @fn install()
+ @brief add all configuration
+ @note
+ - Modules can emarquer sql installation instructions, however, in the case of transverse information, or dependent of an extension, preferring the implementation of an extension, file with sql independent
+ - please, pefix all var configuration by 'MODULE_OT__MODTYPENAME_MAJ_'
+ - if module twin in backoffice, report all content install in the other module
+ - Not use language in DB , but function :__()
+ for MODULE_TOTO_ST
+ var title MODULE_TOTO_ST_S (small description)
+ var description MODULE_TOTO_ST_L (long description)
+ */
+ public function install() {
+ }
+
+ /**
+ @fn remove()
+ @brief delete all configuration
+ @note
+ - please, pefix all var configuration by 'MODULE_PAYMENT__MODTYPENAME_MAJ_'
+ - if module twin in backoffice, report all content remove in the other module
+ */
+ public function remove() {
+ }
+
+
+}
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-06 17:14:49
|
Revision: 4171
http://oscss.svn.sourceforge.net/oscss/?rev=4171&view=rev
Author: oscim
Date: 2012-04-06 17:14:43 +0000 (Fri, 06 Apr 2012)
Log Message:
-----------
Added Paths:
-----------
trunk/dev/GenerCode/ModuleType/Modele/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
