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-04 11:48:24
|
Revision: 4145
http://oscss.svn.sourceforge.net/oscss/?rev=4145&view=rev
Author: oscim
Date: 2012-04-04 11:48:16 +0000 (Wed, 04 Apr 2012)
Log Message:
-----------
Ajout d'une extension pour 2.1.1, UltimateImage
Added Paths:
-----------
trunk/extensions/ULTIMATEIMAGE_stable/
trunk/extensions/ULTIMATEIMAGE_stable/catalog/
trunk/extensions/ULTIMATEIMAGE_stable/catalog/admin/
trunk/extensions/ULTIMATEIMAGE_stable/catalog/admin/includes/
trunk/extensions/ULTIMATEIMAGE_stable/catalog/admin/includes/gabarit/
trunk/extensions/ULTIMATEIMAGE_stable/catalog/admin/includes/gabarit/products/
trunk/extensions/ULTIMATEIMAGE_stable/catalog/admin/includes/gabarit/products/UltimateImage/
trunk/extensions/ULTIMATEIMAGE_stable/catalog/admin/includes/gabarit/products/UltimateImage/display_edit.listing.gab
trunk/extensions/ULTIMATEIMAGE_stable/catalog/admin/includes/gabarit/products/UltimateImage/display_view.delete.gab
trunk/extensions/ULTIMATEIMAGE_stable/catalog/admin/includes/gabarit/products/UltimateImage/display_view.edit.gab
trunk/extensions/ULTIMATEIMAGE_stable/catalog/admin/includes/languages/
trunk/extensions/ULTIMATEIMAGE_stable/catalog/admin/includes/languages/fr_FR/
trunk/extensions/ULTIMATEIMAGE_stable/catalog/admin/includes/languages/fr_FR/modules/
trunk/extensions/ULTIMATEIMAGE_stable/catalog/admin/includes/languages/fr_FR/modules/products/
trunk/extensions/ULTIMATEIMAGE_stable/catalog/admin/includes/languages/fr_FR/modules/products/UltimateImage.txt
trunk/extensions/ULTIMATEIMAGE_stable/catalog/admin/includes/modules/
trunk/extensions/ULTIMATEIMAGE_stable/catalog/admin/includes/modules/products/
trunk/extensions/ULTIMATEIMAGE_stable/catalog/admin/includes/modules/products/UltimateImage.php
trunk/extensions/ULTIMATEIMAGE_stable/catalog/includes/
trunk/extensions/ULTIMATEIMAGE_stable/catalog/includes/languages/
trunk/extensions/ULTIMATEIMAGE_stable/catalog/includes/languages/fr_FR/
trunk/extensions/ULTIMATEIMAGE_stable/catalog/includes/languages/fr_FR/modules/
trunk/extensions/ULTIMATEIMAGE_stable/catalog/includes/languages/fr_FR/modules/products/
trunk/extensions/ULTIMATEIMAGE_stable/catalog/includes/languages/fr_FR/modules/products/UltimateImage.txt
trunk/extensions/ULTIMATEIMAGE_stable/catalog/includes/modules/
trunk/extensions/ULTIMATEIMAGE_stable/catalog/includes/modules/products/
trunk/extensions/ULTIMATEIMAGE_stable/catalog/includes/modules/products/UltimateImage.php
trunk/extensions/ULTIMATEIMAGE_stable/install.xml
trunk/extensions/ULTIMATEIMAGE_stable/readme
Added: trunk/extensions/ULTIMATEIMAGE_stable/catalog/admin/includes/gabarit/products/UltimateImage/display_edit.listing.gab
===================================================================
--- trunk/extensions/ULTIMATEIMAGE_stable/catalog/admin/includes/gabarit/products/UltimateImage/display_edit.listing.gab (rev 0)
+++ trunk/extensions/ULTIMATEIMAGE_stable/catalog/admin/includes/gabarit/products/UltimateImage/display_edit.listing.gab 2012-04-04 11:48:16 UTC (rev 4145)
@@ -0,0 +1,56 @@
+<?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/04/2012, 09:48
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @subpackage UltimateImage
+*/
+$cpt=0;
+?>
+<div>
+ <h3><?php echo __('UltimateImage heading edit image products') ?></h3>
+
+ <fielset class="block_field">
+ <?php echo __('UltimateImage txt add img product').sprintf(CsrtAction::getLink('row_action_right', IMAGE_NEW, 'new'), 'fancyView iframe', UltimateImage::HrefLinkInMod('new_image') ,'' ) ?>
+ </fielset>
+ <fielset class="block_field">
+
+ <legend><?php echo __('les images presente') ?></legend>
+
+ <table id="ListImage" class="dataTableBase">
+ <thead>
+ <tr>
+
+ <th><?php echo __('UltimateImage heading image sm') ?></th>
+ <th><?php echo __('UltimateImage heading image xl') ?></th>
+ <th><?php echo __('UltimateImage heading action') ?></th>
+ </tr>
+ </thead>
+
+ <tbody>
+ <?php foreach(UltimateImage::$iList as $img): $cpt++; ?>
+ <tr id="ListImage_<?php echo $img->id ?>">
+ <td>
+ <?php echo tep_info_image( $img->products_image_sm, products::$pInfo->products_name, UltimateImage::$THUMB, UltimateImage::$THUMB, 'align="left" hspace="0" vspace="5"') ?>
+ <?php echo tep_draw_hidden_field('products_image_sm_', $img->products_image_sm) ?>
+ </td>
+
+ <td>
+ <?php echo tep_draw_hidden_field('products_image_xl', $img->products_image_xl) ?>
+ <?php echo tep_info_image( $img->products_image_xl, products::$pInfo->products_name, UltimateImage::$THUMB, UltimateImage::$THUMB, 'align="left" hspace="0" vspace="5"') ?>
+
+ </td>
+
+ <td> <?php echo UltimateImage::RowsAction($img->id); ?> </td>
+ </tr>
+ <?php endforeach; ?>
+ </tbody>
+ </table>
+ </fielset>
+
+
+</div>
Property changes on: trunk/extensions/ULTIMATEIMAGE_stable/catalog/admin/includes/gabarit/products/UltimateImage/display_edit.listing.gab
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/extensions/ULTIMATEIMAGE_stable/catalog/admin/includes/gabarit/products/UltimateImage/display_view.delete.gab
===================================================================
--- trunk/extensions/ULTIMATEIMAGE_stable/catalog/admin/includes/gabarit/products/UltimateImage/display_view.delete.gab (rev 0)
+++ trunk/extensions/ULTIMATEIMAGE_stable/catalog/admin/includes/gabarit/products/UltimateImage/display_view.delete.gab 2012-04-04 11:48:16 UTC (rev 4145)
@@ -0,0 +1,18 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.0
+ @date 09/05/11, 21:49
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @subpackage UltimateImage
+*/
+?>
+<h3><?php echo __('UltimateImage heading title option delete') ?></h3>
+<?php echo tep_draw_form('delete', UltimateImage::HrefLinkInMod('Imgdeleteconfirm','','page'),UltimateImage::HrefLinkInMod('Imgdeleteconfirm','', 'param'), 'post',' class="fancy" ') ?>
+
+<?php echo tep_image_submit('', IMAGE_DELETE). tep_js_back(tep_href_link(UltimateImage::HrefLinkInMod('','','page'), tep_get_all_get_params(array('action','cID'))), IMAGE_CANCEL) ; ?>
+
+</form>
\ No newline at end of file
Added: trunk/extensions/ULTIMATEIMAGE_stable/catalog/admin/includes/gabarit/products/UltimateImage/display_view.edit.gab
===================================================================
--- trunk/extensions/ULTIMATEIMAGE_stable/catalog/admin/includes/gabarit/products/UltimateImage/display_view.edit.gab (rev 0)
+++ trunk/extensions/ULTIMATEIMAGE_stable/catalog/admin/includes/gabarit/products/UltimateImage/display_view.edit.gab 2012-04-04 11:48:16 UTC (rev 4145)
@@ -0,0 +1,35 @@
+<?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/04/2012, 09:48
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @subpackage UltimateImage
+*/
+?>
+<h3><?php echo __('UltimateImage heading title option edit') ?></h3>
+<?php echo tep_draw_form('add', UltimateImage::HrefLinkInMod('Imgupdate','','page'),UltimateImage::HrefLinkInMod('Imgupdate','', 'param'), 'post',' class="fancy" ') ?>
+
+
+ <fielset class="block_field">
+ <legend><?php echo __('Ajouter une image') ?></legend>
+ <p class="block_input">
+ <label><?php echo __('Ajouter image supplementaire mini') ?></label>
+ <a class="button" href="#" onclick="<?php echo tep_get_filebroswerserveur("products_image_add_min", "image", '') ?>">
+ <?php echo /* tep_draw_input_field('products_image_add_min','',UltimateImage::$iInfo->products_image_sm).*/'<input type="text" id="products_image_add_min" name="products_image_add_min" value="'.UltimateImage::$iInfo->products_image_sm.'"> '.tep_image(DIR_WS_ICONS . 'icon_browser.png', PARCOURIR_SERVER) ?>
+ </a>
+ <br />
+ <label><?php echo __('Ajouter image supplementaire maxi') ?></label>
+ <a class="button" href="#" onclick="<?php echo tep_get_filebroswerserveur("piaiqv", "image", '') ?>">
+ <?php echo /*tep_draw_input_field('products_image_add_max','piaiqv',UltimateImage::$iInfo->products_image_xl)*/'<input type="text" id="piaiqv" name="products_image_add_max" value="'.UltimateImage::$iInfo->products_image_xl.'"> '.tep_image(DIR_WS_ICONS . 'icon_browser.png', PARCOURIR_SERVER) ?>
+ </a>
+ </p>
+
+ </fielset>
+
+<?php echo tep_image_submit('', IMAGE_UPDATE).tep_js_back(tep_href_link(UltimateImage::HrefLinkInMod('','','page'), tep_get_all_get_params(array('action','cID'))), IMAGE_CANCEL) ; ?>
+
+</form>
\ No newline at end of file
Property changes on: trunk/extensions/ULTIMATEIMAGE_stable/catalog/admin/includes/gabarit/products/UltimateImage/display_view.edit.gab
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/extensions/ULTIMATEIMAGE_stable/catalog/admin/includes/languages/fr_FR/modules/products/UltimateImage.txt
===================================================================
--- trunk/extensions/ULTIMATEIMAGE_stable/catalog/admin/includes/languages/fr_FR/modules/products/UltimateImage.txt (rev 0)
+++ trunk/extensions/ULTIMATEIMAGE_stable/catalog/admin/includes/languages/fr_FR/modules/products/UltimateImage.txt 2012-04-04 11:48:16 UTC (rev 4145)
@@ -0,0 +1,51 @@
+<?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 09/10/10, 18:33
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class UltimateImage
+ @subpackage UltimateImage
+*/
+
+$lang['tab products utltimate image']= 'Images ';
+
+define('MODULE_ACA_ULTIMATEIMAGE_TEXT_TITLE', 'Gestion avancé des images ');
+define('MODULE_ACA_ULTIMATEIMAGE_TEXT_DESCRIPTION', 'Permet de gerer les images avancé ');
+
+
+define('TEXT_PRODUCTS_IMAGE_NOTE','<b>Products Image:</b><small><br>Main Image used in<br><u>catalog & description</u> page.<small>');
+define('TEXT_PRODUCTS_IMAGE_MEDIUM', '<b>Bigger Image:</b><br><small>REPLACES Small Image on<br><u>products description</u> page.</small>');
+define('TEXT_PRODUCTS_IMAGE_LARGE', '<b>Pop-up Image:</b><br><small>REPLACES Small Image on<br><u>pop-up window</u> page.</small>');
+define('TEXT_PRODUCTS_IMAGE_LINKED', '<u>Store Product/s Sharring this Image =</u>');
+define('TEXT_PRODUCTS_IMAGE_REMOVE', '<b>Remove</b> this Image from this Product?');
+define('TEXT_PRODUCTS_IMAGE_DELETE', '<b>Delete</b> this Image from the Server (Permanent!)?');
+define('TEXT_PRODUCTS_IMAGE_REMOVE_SHORT', 'Remove');
+define('TEXT_PRODUCTS_IMAGE_DELETE_SHORT', 'Delete');
+define('TEXT_PRODUCTS_IMAGE_TH_NOTICE', '<b>SM = Small Images,</b> if a "SM" image is used<br>(Alone) NO Pop-up window link is created, the "SM"<br>(small image) will be placed directly under the products<br>description. if used inconjunction with a<br>"XL" image on the right, A Pop-up Window Link<br> is created and the "XL" image will be<br>shown in a Pop-up window.<br><br>');
+define('TEXT_PRODUCTS_IMAGE_XL_NOTICE', '<b>XL = Large Images,</b> Used for the Pop-up image<br><br><br>');
+define('TEXT_PRODUCTS_IMAGE_ADDITIONAL', 'More Addition Images - These will appear below product description if used.');
+
+
+/* Page edit product */
+$lang['text products image remove short']= 'Retirer';
+$lang['text products image xl']= 'Image';
+$lang['text products image sm']= 'Miniature';
+$lang['les images presente']= 'Les image(s) présente(s)';
+
+
+$lang['UltimateImage heading image xl']= 'Grande';
+$lang['UltimateImage heading image sm']= 'Minitature';
+$lang['UltimateImage heading action']= 'Actions';
+$lang['UltimateImage heading edit image products']= 'Gestions des images du produit';
+$lang['UltimateImage txt add img product']= 'Selectionner une image : ';
+
+/* delete image */
+$lang['UltimateImage heading title option edit']= 'Editer/ajouter une image';
+
+/* delete image */
+$lang['UltimateImage heading title option delete']= 'Supprimer cette image';
+?>
\ No newline at end of file
Property changes on: trunk/extensions/ULTIMATEIMAGE_stable/catalog/admin/includes/languages/fr_FR/modules/products/UltimateImage.txt
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/extensions/ULTIMATEIMAGE_stable/catalog/admin/includes/modules/products/UltimateImage.php
===================================================================
--- trunk/extensions/ULTIMATEIMAGE_stable/catalog/admin/includes/modules/products/UltimateImage.php (rev 0)
+++ trunk/extensions/ULTIMATEIMAGE_stable/catalog/admin/includes/modules/products/UltimateImage.php 2012-04-04 11:48:16 UTC (rev 4145)
@@ -0,0 +1,333 @@
+<?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/04/2012, 21:49
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class UltimateImage
+ @subpackage UltimateImage
+ @brief Backoffice class
+
+
+
+ TODO
+ - Mettre en place la purge des image associé a un produit lors de la suppression du produit
+ - Inserer correction les boutons lors de l'ajout d'image (RowsAction)
+ - aJouter une methode pour remplacer l'image classique produit, et y ajouter Une minitaure de chacunne des images
+ - ajouter une redirection classique apres execution sans js
+*/
+
+
+class UltimateImage{
+
+ /**
+ @var whith/height Thumb
+ */
+ public static $THUMB = '100';
+ /**
+
+ */
+ public $code;
+ public $title;
+ public $description;
+ public $sort_order;
+ public $enabled;
+ /**
+ @var public object
+ */
+ public static $iInfo;
+ /**
+ @var public list
+ */
+ public static $iList=array();
+ /**
+ @var string
+ */
+ public static $action;
+
+
+
+
+ /**
+ Constructeur
+ */
+ function __construct(){
+
+ $this->code = __CLASS__;
+ $this->title = MODULE_ACA_ULTIMATEIMAGE_TEXT_TITLE;
+ $this->description = MODULE_ACA_ULTIMATEIMAGE_TEXT_DESCRIPTION . ' (module v2.0)';
+ $this->sort_order = (defined('MODULE_ACA_ULTIMATEIMAGE_SORT_ORDER')) ? MODULE_ACA_ULTIMATEIMAGE_SORT_ORDER : 0;
+ $this->enabled = true; //_cst_bool('MODULE_ACA_ULTIMATEIMAGE_STATUS');
+
+ global $language,$languages_id;
+ $this->language = $language;
+ $this->languages_id = (int)$languages_id;
+
+ /* Froce la descativation du iamge dans ecran principal */
+// define('CLASS_IMAGE', 'true');
+ }
+
+
+
+
+ /**
+ @brief process for module
+ Use javascript in section for close popup after process
+ */
+ public function check_action($actions){
+ global $messageStack;
+
+
+ self::$action=$actions['action'];
+
+ switch(self::$action){
+ /**
+ @remarks general action for products
+ */
+ case 'deleteconfirm':
+
+ break;
+
+
+
+ /**
+ @remarks specific action for images
+ */
+ case 'Imgdeleteconfirm':
+ $pID = tep_db_prepare_input($_GET['pID']);
+ $iID = tep_db_prepare_input($_GET['iID']);
+
+ tep_db_query($sql="DELETE FROM " . TABLE_PRODUCTS_IMAGES . " where products_id = '".$pID."' and id='".$iID."' LIMIT 1; ");
+
+ echo
+ '<script type="text/javascript"><!-- // '."\n".
+ " \n".
+
+ " function post_load_page(){}; \n".
+ " parent.$('#ListImage_".$iID."').remove(); \n".
+ " parent.$.fancybox.close(); \n".
+ '//--></script>';
+ 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']) ) {
+
+ $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)
+ ? $_POST['products_image_add_min']
+ : 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( (( strpos($_POST['products_image_add_max'],DIR_WS_CATALOG_IMAGES) ===false )
+ ? $_POST['products_image_add_max']
+ : substr($_POST['products_image_add_max'], strlen( DIR_WS_CATALOG_IMAGES) )
+ )
+ )
+ : ''
+ );
+
+ $sql_data_array['products_id']=$pID;
+ $sql_data_array['status']=1;
+
+ }
+
+ if($iID===0){
+ $res=tep_db_perform(TABLE_PRODUCTS_IMAGES,$sql_data_array);
+ $iID=$res->__get('insertId');
+ $mode=1;
+ }
+ else{
+ tep_db_perform(TABLE_PRODUCTS_IMAGES,$sql_data_array, 'update', " id='".$iID."' ");
+ $mode=2;
+ }
+
+
+ // 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>".
+ "<td>"/*.(self::RowsAction($iID))*/."</td>";
+
+ echo
+ '<script type="text/javascript"><!-- // '."\n".
+ " \n";
+
+ if($mode===1) echo " parent.$('table#ListImage tbody').prepend( $('"."<tr id=\"ListImage_".$iID."\">".$result."</tr>"."') ); \n";
+ else {
+ echo " parent.$('#ListImage_".$iID."').replaceWith( $('"."<tr id=\"ListImage_".$iID."\">".$result."</tr>"."') ); \n";
+ }
+
+
+ echo " parent.$.fancybox.close(); \n".
+ '//--></script>';
+ exit;
+ break;
+
+ }
+
+
+
+ return $actions;
+ }
+
+
+
+// function get_header_js ($action) {
+// }
+
+ /**
+ */
+ 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']);
+ }
+
+ 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']);
+ }
+
+ 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_id']=(int)$_GET['pID'];
+ $sql_data_array['status']=1;
+ tep_db_perform(TABLE_PRODUCTS_IMAGES,$sql_data_array);
+ }
+
+
+ return array();
+ }
+
+ /**
+ */
+ public function update_table_products(){
+ return $this->insert_table_products();
+ }
+
+
+ /**
+ Chargement des db
+
+ 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."' ");
+ $res=$product_query->fetchAllAssoc();
+ foreach($res as $img)
+ self::$iList[]=new ObjectInfo($img);
+
+ }
+
+
+
+ /**
+ Vue lors edition produits
+ */
+ public function display_edit(&$contents,$pID) {
+ global $pInfo;
+
+ $title= __('tab products utltimate image');
+ /// use master gabarit
+ $m = MGabCont::CallGab('listing',__FUNCTION__,__CLASS__);
+
+ $contents[]=array('title'=> $title,'text'=> $m);
+ }
+
+
+ public function display_view(){
+ $action=self::$action;
+ switch(self::$action){
+ case 'new_image':
+ $action='edit';
+ self::$iInfo=new ObjectInfo(array('products_image_sm'=>'','products_image_xl'=>''));
+ break;
+ case 'edit':
+ self::$iInfo=self::loadValues ((int)@$_GET['pID'],(int)@$_GET['iID']);
+ break;
+ default:
+ }
+
+ /// use master gabarit
+ return MGabCont::CallGab($action,__FUNCTION__,'products/'.__CLASS__);
+ }
+
+
+ /**
+ @brief Rows action column
+ */
+ 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) ,'' )
+ );
+ }
+
+ /**
+ @brief function for construct link use in aca action page
+ @param $separate bool false or string name key array
+ @return full href string, or partiel string extract array (page or param) or array
+ */
+ public static function HrefLinkInMod($action, $param='', $separate=false) {
+ if(!empty($param)) $param = '&'.$param;
+
+ if(strpos($param,'iID')===false) $param .='&iID='.@$_GET['iID'];
+ if(strpos($param,'pID')===false) $param .='&pID='.@$_GET['pID'];
+ if(strpos($param,'forceview')===false) $param .='&forceview=true';
+
+ $b=array('page'=>'aca.php',
+ 'param'=>'action_type=products&action_class='.__CLASS__.'&action_method=display_view&action='.$action.$param);
+
+ if(is_bool($separate) && !$separate)
+ return tep_href_link('aca.php', 'action_type=products&action_class='.__CLASS__.'&action_method=display_view&action='.$action.$param);
+
+ elseif(is_string($separate))
+ return (isset($b[$separate] )?$b[$separate] : $n);
+ }
+
+ /**
+ @brief load specific id in table image
+ */
+ private static function loadValues ($pID,$iID) {
+ $product_query = tep_db_query("select * from " . TABLE_PRODUCTS_IMAGES . " p where p.products_id = '".$pID."' and id='".$iID."' ");
+ return new ObjectInfo($product_query->fetchAssoc());
+ }
+
+
+
+ public function check() {
+ if (!isset($this->_check)) {
+ $check_query = tep_db_query("select configuration_value from " . TABLE_CONFIGURATION . " where configuration_key = 'MODULE_ACA_ULTIMATEIMAGE_STATUS'");
+ $this->_check = tep_db_num_rows($check_query);
+ }
+ return $this->_check;
+ }
+
+ public function install() { return false ; }
+
+ public function remove(){ return false ; }
+
+ public function keys() {
+ return array( 'MODULE_ACA_ULTIMATEIMAGE_STATUS',
+ 'MODULE_ACA_ULTIMATEIMAGE_SORT_ORDER');
+ }
+}
+
+?>
\ No newline at end of file
Property changes on: trunk/extensions/ULTIMATEIMAGE_stable/catalog/admin/includes/modules/products/UltimateImage.php
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/extensions/ULTIMATEIMAGE_stable/catalog/includes/languages/fr_FR/modules/products/UltimateImage.txt
===================================================================
--- trunk/extensions/ULTIMATEIMAGE_stable/catalog/includes/languages/fr_FR/modules/products/UltimateImage.txt (rev 0)
+++ trunk/extensions/ULTIMATEIMAGE_stable/catalog/includes/languages/fr_FR/modules/products/UltimateImage.txt 2012-04-04 11:48:16 UTC (rev 4145)
@@ -0,0 +1,14 @@
+<?php
+/**
+ @licences osCSS Open Source E-commerce <web http://www.oscss.org />
+ @original-code Copyright (c) 2002 osCommerce <web http://www.oscommerce.com />
+ @encode UTF-8
+ @package oscss-codev
+ @author oscim <mail a...@os... /><web http://www.oscim.fr />
+
+ Class description de base
+*/
+define('MODULE_ACAPRO_ULTIMATEIMAGE_TEXT_TITLE', 'Ultra Images');
+define('MODULE_ACAPRO_ULTIMATEIMAGE_TEXT_DESCRIPTION', 'Images supplementaires d\'un produits ');
+define('TAB_PRODUCTS_ULTIMATEIMAGE', 'Images supplementaires');
+?>
\ No newline at end of file
Added: trunk/extensions/ULTIMATEIMAGE_stable/catalog/includes/modules/products/UltimateImage.php
===================================================================
--- trunk/extensions/ULTIMATEIMAGE_stable/catalog/includes/modules/products/UltimateImage.php (rev 0)
+++ trunk/extensions/ULTIMATEIMAGE_stable/catalog/includes/modules/products/UltimateImage.php 2012-04-04 11:48:16 UTC (rev 4145)
@@ -0,0 +1,100 @@
+<?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 09/05/11, 21:49
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class UltimateImage
+ @subpackage UltimateImage
+ @brief Frontoffice class
+*/
+
+class UltimateImage
+ extends AbstractProduct
+ implements InterfaceModule {
+
+ function __construct($page=''){
+ global $page;
+ $this->code = __CLASS__;
+ $this->sort_order = (defined('MODULE_ACAPRO_ULTIMATEIMAGE_SORT_ORDER')) ? MODULE_ACAPRO_ULTIMATEIMAGE_SORT_ORDER : 0 ;
+ $this->enabled = true;
+
+ if(!is_object($page)) return null;
+ $this->language_id=$page->the_var('languages_id');
+
+
+ define('TABLE_PRODUCTS_IMAGES', DB_TABLE_PREFIX.'products_images' );
+ }
+
+
+ function get_header($action=''){
+ global $page;
+ $this->pID=(int)$_GET['products_id'];
+ $this->load_db_values((int)$this->pID);
+ //! calcu des images présente et ajout dans la pile des produits
+ $db_block=array();
+
+ if( is_array($this->imgs))
+ foreach($this->imgs as $img){
+ $img['xl']=(!empty($img['products_image_xl']))? $img['products_image_xl'] :$img['products_image_sm'];
+ if(tep_not_null($img['xl']) && !in_array($img['xl'],$db_block)){
+ $db_block[]=$img['xl'];
+ if(!in_array( $img,$page->product->pile_img)) $page->product->pile_img[]=$img['xl'];
+ }
+ }
+
+ }
+
+ /**
+ Chargement des db
+ */
+ public function load_db_values($pID){
+ $product_query = tep_db_query("select * from " . TABLE_PRODUCTS_IMAGES . " p where p.products_id = '".$pID."' and status =1 ");
+
+ while($i = tep_db_fetch_array($product_query))
+ $this->imgs[]=$i;
+
+ $this->viewimg=(tep_db_num_rows($product_query)>0)?true:false;
+ tep_db_free_result($product_query);
+ }
+
+ /**
+ Liste les titre
+ */
+
+ public function display_view($pID,$class=''){
+ global $page;
+ $m=array();
+ if(!isset($this->viewimg))$this->load_db_values((int)$pID);
+
+ if(!$this->viewimg) return array(new objectInfo(array('title'=>'','content'=>'')));
+
+
+ $content='<div id=\'additionalImages\'><ul id="gallery_img"> ';
+ foreach($this->imgs as $img){
+ $img['xl']=(!empty($img['products_image_xl']))? $img['products_image_xl'] :$img['products_image_sm'];
+ if(tep_not_null($img['xl'])){
+ $content .='<li>';
+ $content .='<p><a class="fancy" rel="fancy" href="' . tep_href_link(DIR_WS_IMAGES . $img['xl']) . '">' . tep_image(DIR_WS_IMAGES . $img['sm'], $img['key'], $page->_conf_value('HEADING_IMAGE_WIDTH'), $page->_conf_value('HEADING_IMAGE_HEIGHT'), ' id="image_master" ', 'simple') . '</a><br /><a class="fancy" rel="fancy" href="' . tep_href_link(DIR_WS_IMAGES . $img['xl']). '">' . TEXT_CLICK_TO_ENLARGE . '</a></p>'."\n";
+ $content .='</li>';
+ }
+ }
+ $content .='</ul></div>';
+
+ $v['title']=__('tab products ultimateimage');
+ $v['content']=$content;
+
+// return array(new objectInfo($v));
+ }
+
+
+/** implements InterfaceModule depend */
+ public function check() {}
+ public function install() {}
+ public function remove() {}
+ public function keys() {}
+}
+?>
\ No newline at end of file
Added: trunk/extensions/ULTIMATEIMAGE_stable/install.xml
===================================================================
--- trunk/extensions/ULTIMATEIMAGE_stable/install.xml (rev 0)
+++ trunk/extensions/ULTIMATEIMAGE_stable/install.xml 2012-04-04 11:48:16 UTC (rev 4145)
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<contrib>
+ <description>
+ <details contrib_ref="" forum_ref="" contrib_type="shipping" status="0" last_update="2010-08-30" />
+ <author_pkg>www.oscss.org</author_pkg>
+ <comments><![CDATA[]]> </comments>
+ <credits>oscim</credits>
+ <version>1.0</version>
+ </description>
+
+ <addfile>
+ <file name="admin/includes/modules/products/UltimateImage.php" />
+
+ <file name="admin/includes/gabarit/products/UltimateImage/display_edit.listing.gab" />
+ <file name="admin/includes/gabarit/products/UltimateImage/display_view.edit.gab" />
+ <file name="admin/includes/gabarit/products/UltimateImage/display_view.delete.gab" />
+
+ <file name="includes/modules/products/UltimateImage.php" />
+ </addfile>
+
+
+ <addfilelg>
+ <file name="admin/includes/languages/%LANGUAGE%/modules/products/UltimateImage.txt" lgref="fr_FR"/>
+ <file name="includes/languages/%LANGUAGE%/modules/products/UltimateImage.txt" lgref="fr_FR"/>
+ </addfilelg>
+
+ <add2end>
+ <file name="admin/includes/tables_files_modules.php" />
+ <add type="php"><![CDATA[
+ define('TABLE_PRODUCTS_IMAGES', DB_TABLE_PREFIX.'products_images' );]]></add>
+ </add2end>
+
+
+ <sql>
+ <query><![CDATA[
+ CREATE TABLE %DB_PREFIX%products_images (
+ id INT( 11 ) NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+ products_id INT( 11 ) NOT NULL ,
+ products_image_sm VARCHAR( 150 ) NOT NULL ,
+ products_image_xl VARCHAR( 100 ) NOT NULL ,
+ status tinyint(1) NOT NULL
+ ) ENGINE = MYISAM DEFAULT CHARSET=utf8;
+ ]]></query>
+ <remove_query>DROP TABLE IF EXISTS %DB_PREFIX%products_images;</remove_query>
+ </sql>
+</contrib>
\ No newline at end of file
Added: trunk/extensions/ULTIMATEIMAGE_stable/readme
===================================================================
--- trunk/extensions/ULTIMATEIMAGE_stable/readme (rev 0)
+++ trunk/extensions/ULTIMATEIMAGE_stable/readme 2012-04-04 11:48:16 UTC (rev 4145)
@@ -0,0 +1,47 @@
+
+Ce module apport une table de liaison afin d'ajouter des image suppelementaire aux produits, cette extensionne modifie par le core d'osCSS, mais ajoute une table.
+
+
+Récuperation des anciennes installation, avec le UltimateImage qui ajouter des colonne à la table des produits. il est donc necessaire de convertir le format de ces données.
+Pour ce faire utiliser la commande suivante,
+
+ INSERT INTO osc_products_images (products_id, products_image_sm, products_image_xl, status)
+ SELECT products_id, products_image_sm_1 as products_image_sm, products_image_xl_1 as products_image_xl , 1 FROM osc_products WHERE products_image_sm_1 IS NOT NULL OR products_image_xl_1 IS NOT NULL;
+
+
+ INSERT INTO osc_products_images (products_id, products_image_sm, products_image_xl, status)
+ SELECT products_id, products_image_sm_1 as products_image_xl, products_image_xl_1 as products_image_sm , 1 FROM osc_products WHERE products_image_sm_1 IS NOT NULL OR products_image_xl_1 IS NOT NULL;
+
+ INSERT INTO osc_products_images (products_id, products_image_sm, products_image_xl, status)
+ SELECT products_id, products_image_sm_2 as products_image_xl, products_image_xl_2 as products_image_sm , 1 FROM osc_products WHERE products_image_sm_2 IS NOT NULL OR products_image_xl_2 IS NOT NULL;
+
+ INSERT INTO osc_products_images (products_id, products_image_sm, products_image_xl, status)
+ SELECT products_id, products_image_sm_3 as products_image_xl, products_image_xl_3 as products_image_sm , 1 FROM osc_products WHERE products_image_sm_3 IS NOT NULL OR products_image_xl_3 IS NOT NULL;
+
+ INSERT INTO osc_products_images (products_id, products_image_sm, products_image_xl, status)
+ SELECT products_id, products_image_sm_4 as products_image_xl, products_image_xl_4 as products_image_sm , 1 FROM osc_products WHERE products_image_sm_4 IS NOT NULL OR products_image_xl_4 IS NOT NULL;
+
+ INSERT INTO osc_products_images (products_id, products_image_sm, products_image_xl, status)
+ SELECT products_id, products_image_sm_5 as products_image_xl, products_image_xl_5 as products_image_sm , 1 FROM osc_products WHERE products_image_sm_5 IS NOT NULL OR products_image_xl_5 IS NOT NULL;
+
+ INSERT INTO osc_products_images (products_id, products_image_sm, products_image_xl, status)
+ SELECT products_id, products_image_sm_6 as products_image_xl, products_image_xl_6 as products_image_sm , 1 FROM osc_products WHERE products_image_sm_6 IS NOT NULL OR products_image_xl_6 IS NOT NULL;
+
+ DELETE FROM `osc_products_images` WHERE `products_image_sm` =''
+
+
+ ALTER TABLE `osc_products`
+ DROP `products_image_med`,
+ DROP `products_image_lrg`,
+ DROP `products_image_sm_1`,
+ DROP `products_image_xl_1`,
+ DROP `products_image_sm_2`,
+ DROP `products_image_xl_2`,
+ DROP `products_image_sm_3`,
+ DROP `products_image_xl_3`,
+ DROP `products_image_sm_4`,
+ DROP `products_image_xl_4`,
+ DROP `products_image_sm_5`,
+ DROP `products_image_xl_5`,
+ DROP `products_image_sm_6`,
+ DROP `products_image_xl_6`;
\ 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-04 11:34:22
|
Revision: 4144
http://oscss.svn.sourceforge.net/oscss/?rev=4144&view=rev
Author: oscim
Date: 2012-04-04 11:34:16 +0000 (Wed, 04 Apr 2012)
Log Message:
-----------
Mise a niveau du zip
Modified Paths:
--------------
trunk/extensions/ATTRIBUTEMANAGER_stable/attributeManager.zip
Modified: trunk/extensions/ATTRIBUTEMANAGER_stable/attributeManager.zip
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-04 11:33:35
|
Revision: 4143
http://oscss.svn.sourceforge.net/oscss/?rev=4143&view=rev
Author: oscim
Date: 2012-04-04 11:33:25 +0000 (Wed, 04 Apr 2012)
Log Message:
-----------
correction diverse
ajustement nom des col de tri dans les categorie, et suppression de la reference au dadatype de tri , ajustement sql install et upgrade , report de la prise en charge
correction coquille sqlcategorie, et modification de l'appel au sous module dans les function associ?\195?\169 ?\195?\160 la modification des table primaires
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/drivers/sqlcategorie.php
trunk/catalog/admin/includes/gabarit/categories/display_view.edit.gab
trunk/catalog/admin/includes/gabarit/products/display_view.edit.gab
trunk/catalog/common/classes/datatype_drivers/Data_categorie.php
trunk/catalog/includes/classes/core_page/listing.php
trunk/catalog/includes/classes/drivers/data/categorie.php
trunk/catalog/install/includes/sql/mysql/tables/osc_categories.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_categories.sql
Modified: trunk/catalog/admin/includes/classes/drivers/sqlcategorie.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlcategorie.php 2012-04-03 22:13:09 UTC (rev 4142)
+++ trunk/catalog/admin/includes/classes/drivers/sqlcategorie.php 2012-04-04 11:33:25 UTC (rev 4143)
@@ -165,9 +165,13 @@
// Put post value
self::$modules->load_post_values($post);
- $sql_data_array=array_merge($sql_data_array, (array) self::$modules->get_update_table_categories($sql_data_array) );
+ foreach((array)self::$modules->get_update_table_categories($id, $sql_data_array) as $module=>$value)
+ if(is_array($value))
+ foreach($value as $key=>$row)
+ $sql_data_array[$key] = $row;
+
tep_db_perform(TABLE_CATEGORIES, $sql_data_array, 'update', "categories_id = '" . $id . "'");
$categories_name_array = $post['categories_name'];
Modified: trunk/catalog/admin/includes/gabarit/categories/display_view.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/categories/display_view.edit.gab 2012-04-03 22:13:09 UTC (rev 4142)
+++ trunk/catalog/admin/includes/gabarit/categories/display_view.edit.gab 2012-04-04 11:33:25 UTC (rev 4143)
@@ -4,7 +4,7 @@
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 06/03/2012, 20:11
+ @date 04/04/2012, 09:48
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
Modified: trunk/catalog/admin/includes/gabarit/products/display_view.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/products/display_view.edit.gab 2012-04-03 22:13:09 UTC (rev 4142)
+++ trunk/catalog/admin/includes/gabarit/products/display_view.edit.gab 2012-04-04 11:33:25 UTC (rev 4143)
@@ -4,7 +4,7 @@
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 30/02/2012, 23:13
+ @date 04/04/2012, 09:48
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
Modified: trunk/catalog/common/classes/datatype_drivers/Data_categorie.php
===================================================================
--- trunk/catalog/common/classes/datatype_drivers/Data_categorie.php 2012-04-03 22:13:09 UTC (rev 4142)
+++ trunk/catalog/common/classes/datatype_drivers/Data_categorie.php 2012-04-04 11:33:25 UTC (rev 4143)
@@ -1,13 +1,13 @@
<?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 16/03/2012, 16:16
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-
+ @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/04/2012, 09:48
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class Data_categorie
*/
class Data_categorie {
@@ -241,13 +241,11 @@
switch(strtolower($type)){
case 'product':
if($category_depth == 'nested'){
- $this->listing_sql = "select DISTINCT p.products_id from ".TABLE_PRODUCTS." p, " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c, " . TABLE_CATEGORIES . "
-c WHERE p.products_status > 0 AND c.categories_id=p2c.categories_id and c.categories_status='1' AND pd.products_id = p.products_id and pd.language_id = '" . (int)$languages_id . "' and p.products_id
-= p2c.products_id ".(tep_not_null($list)? " AND p2c.categories_id IN (" . $list . ")" : '');
- $this->listing_sort = " c.sort_order, pd.products_name ";
+ $this->listing_sql = "select DISTINCT p.products_id from ".TABLE_PRODUCTS." p, " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c, " . TABLE_CATEGORIES . " cat WHERE p.products_status > 0 AND cat.categories_id=p2c.categories_id and cat.categories_status='1' AND pd.products_id = p.products_id and pd.language_id = '" . (int)$languages_id . "' and p.products_id = p2c.products_id ".(tep_not_null($list)? " AND p2c.categories_id IN (" . $list . ")" : '');
+ $this->listing_sort = " cat.sort_order, pd.products_name ";
}
else{
- $this->listing_sql = "select DISTINCT p.products_id from ".TABLE_PRODUCTS." p, " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c, " . TABLE_CATEGORIES . " c WHERE p.products_status > 0 AND c.categories_id=p2c.categories_id and c.categories_status='1' AND pd.products_id = p.products_id and pd.language_id = '" . (int)$languages_id . "' and p.products_id = p2c.products_id and c.categories_id = '" . (int)$current_category_id . "' ";
+ $this->listing_sql = "select DISTINCT p.products_id from ".TABLE_PRODUCTS." p, " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c, " . TABLE_CATEGORIES . " cat WHERE p.products_status > 0 AND cat.categories_id=p2c.categories_id and cat.categories_status='1' AND pd.products_id = p.products_id and pd.language_id = '" . (int)$languages_id . "' and p.products_id = p2c.products_id and c.categories_id = '" . (int)$current_category_id . "' ";
$this->listing_sort = " pd.products_name ";
}
@@ -257,7 +255,7 @@
case 'content':
if($category_depth == 'nested'){
$this->listing_sql = "select DISTINCT c.content_id from " . TABLE_CONTENT_DESCRIPTION . " cd, " . TABLE_CONTENT . " c, " . TABLE_CONTENT_TO_CATEGORIES . " ctc, " . TABLE_CATEGORIES . " cat where cat.categories_id=ctc.categories_id and cat.categories_status='1' and c.content_status = '1' and c.content_id = ctc.content_id and cd.content_id = ctc.content_id and cd.language_id = '" . (int)$languages_id . "' ".(tep_not_null($list)? " AND p2c.categories_id IN (" . $list . ")" : '');
- $this->listing_sort = " c.sort_order, cd.content_title ";
+ $this->listing_sort = " cat.sort_order, cd.content_title ";
}
else{
$this->listing_sql = "SELECT DISTINCT c.content_id from " . TABLE_CONTENT . " c ".
Modified: trunk/catalog/includes/classes/core_page/listing.php
===================================================================
--- trunk/catalog/includes/classes/core_page/listing.php 2012-04-03 22:13:09 UTC (rev 4142)
+++ trunk/catalog/includes/classes/core_page/listing.php 2012-04-04 11:33:25 UTC (rev 4143)
@@ -227,11 +227,9 @@
/**
@brief Tri par default, option des categorie Champs sortchids_products & sortchids_content
*/
- $test = 'sortchids_'.listingData::$type_object;
- if(isset($categories->$test))
- if(tep_not_null($categories->$test))
- $listing_sql .= $categories->$test;
+ if(isset($categories->sortchids_datatype) && tep_not_null($categories->sortchids_datatype))
+ $listing_sql .= $categories->sortchids_datatype;
return $listing_sql;
Modified: trunk/catalog/includes/classes/drivers/data/categorie.php
===================================================================
--- trunk/catalog/includes/classes/drivers/data/categorie.php 2012-04-03 22:13:09 UTC (rev 4142)
+++ trunk/catalog/includes/classes/drivers/data/categorie.php 2012-04-04 11:33:25 UTC (rev 4143)
@@ -154,7 +154,7 @@
* @param $option
*/
protected static function cstr_query($orderby='', $limit='', $option=''){
- $query="SELECT c.categories_id, parent_id, cd.categories_description, c.categories_image, cd.categories_name,c.categories_datatype, sortchids_products as sortchids_product, sortchids_content FROM
+ $query="SELECT c.categories_id, parent_id, cd.categories_description, c.categories_image, cd.categories_name,c.categories_datatype, sortchids , sortchids_datatype FROM
" . TABLE_CATEGORIES . " c, " . TABLE_CATEGORIES_DESCRIPTION . " cd WHERE " . DataForceStatus(" c.categories_status='1' AND ") . " c.categories_id = cd.categories_id AND cd.language_id = '" .
self::$lg_id . "' ";
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_categories.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_categories.sql 2012-04-03 22:13:09 UTC (rev 4142)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_categories.sql 2012-04-04 11:33:25 UTC (rev 4143)
@@ -23,8 +23,8 @@
last_modified datetime default '1000-01-01 00:00:00' null ,
categories_status tinyint(1) NOT NULL default '0',
categories_hidden tinyint(1) NOT NULL default '0',
- sortchids_products varchar( 150 ),
- sortchids_content varchar( 150 ),
+ sortchids varchar( 150 ),
+ sortchids_datatype varchar( 150 ),
PRIMARY KEY (categories_id),
KEY idx_categories_parent_id (parent_id)
) DEFAULT CHARSET=utf8;
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-03 22:13:09 UTC (rev 4142)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_categories.sql 2012-04-04 11:33:25 UTC (rev 4143)
@@ -12,4 +12,7 @@
--+######################################################################--+
-ALTER TABLE osc_categories ADD COLUMN categories_datatype varchar(64) NULL AFTER categories_id;
\ No newline at end of file
+ALTER TABLE osc_categories ADD COLUMN categories_datatype varchar(64) NULL AFTER categories_id;
+
+ALTER TABLE osc_categories CHANGE sortchids_products sortchids VARCHAR( 150 ) ,
+CHANGE sortchids_content sortchids_datatype VARCHAR( 150 ) ;
\ 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-03 22:13:16
|
Revision: 4142
http://oscss.svn.sourceforge.net/oscss/?rev=4142&view=rev
Author: oscim
Date: 2012-04-03 22:13:09 +0000 (Tue, 03 Apr 2012)
Log Message:
-----------
correction coquille diverse et element de langue manquant
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/oscss_cstr.php
trunk/catalog/admin/includes/gabarit/adminGroup/display_view.edit.gab
trunk/catalog/admin/includes/gabarit/adminGroup/display_view.listing.gab
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/modules/pages/adminGroup.php
trunk/catalog/admin/includes/template/oscss/gabarit-1.php
trunk/catalog/admin/includes/template/oscss/inc/lib_general-1.js
trunk/catalog/admin/includes/template/oscss/stylesheet-1.css
trunk/catalog/install/data/sample/appareil_photo/oscss_sample_data.sql
Modified: trunk/catalog/admin/includes/classes/oscss_cstr.php
===================================================================
--- trunk/catalog/admin/includes/classes/oscss_cstr.php 2012-04-03 21:17:07 UTC (rev 4141)
+++ trunk/catalog/admin/includes/classes/oscss_cstr.php 2012-04-03 22:13:09 UTC (rev 4142)
@@ -304,7 +304,7 @@
/**
- @fn oscss_cstr::CallBack($code, $pile='post_load')
+ @fn oscss_cstr::CallBack($code, $mode='code',$pile='post_load')
@brief Add js put in header/footer page
@param $code path file or code
@param $mode string code / file
Modified: trunk/catalog/admin/includes/gabarit/adminGroup/display_view.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/adminGroup/display_view.edit.gab 2012-04-03 21:17:07 UTC (rev 4141)
+++ trunk/catalog/admin/includes/gabarit/adminGroup/display_view.edit.gab 2012-04-03 22:13:09 UTC (rev 4142)
@@ -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 17/12/11, 09:32
+ @date 03/04/2012, 09:32
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
Modified: trunk/catalog/admin/includes/gabarit/adminGroup/display_view.listing.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/adminGroup/display_view.listing.gab 2012-04-03 21:17:07 UTC (rev 4141)
+++ trunk/catalog/admin/includes/gabarit/adminGroup/display_view.listing.gab 2012-04-03 22:13:09 UTC (rev 4142)
@@ -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 17/12/11, 09:32
+ @date 03/04/2012, 09:32
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -38,10 +38,14 @@
<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',__('define groups') ). '</a> ';
+ 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', __('new membre') ). '</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_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> ';
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>
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-03 21:17:07 UTC (rev 4141)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/adminGroup.txt 2012-04-03 22:13:09 UTC (rev 4142)
@@ -1,14 +1,16 @@
<?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 23/03/11, 14:36
+ @version 2.1.1
+ @date 03/04/2012, 09:32
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
$lang['heading title']="Gestion des groupes" ;
-$lang['HEADING_TITLE_GRP']="Définir les groupes" ;
+$lang['table heading groups define']="Gestion des acces pour ce groupe" ;
+
$lang['text count groups']="Groupes : " ;
$lang['TABLE_HEADING_NAME']="Nom" ;
$lang['table heading groups']="Niveau du groupe" ;
@@ -35,4 +37,9 @@
$lang['TEXT_INFO_DEFINE_INTRO_BLOCK']="<strong>Groupe %s :</strong><br /><br />Vous ne pouvez pas changer la permission de(s) dossier(s) pour ce groupe.<br /><br />" ;
$lang['TEXT_INFO_DEFINE_INTRO']="<strong>Groupe %s :</strong><br /><br /><li>Changez la permission pour ce groupe en choisissant les boîtes et les dossiers.</li><br /><br /><li>Cliquer sur <strong>sauver</strong> après modification.</li><br /><br />" ;
$lang['TEXT_NOTE_DEFINE_GRP']="Cet espace est destiné à régler les autorisations d'accès au page, si vous souhaitez ajouter des éléments dans les menus, reportez vous à : Admin menu " ;
+
+$lang['image add user in this group']="Ajouter un utilisateur à ce groupe" ;
+$lang['image edit']="Editer" ;
+$lang['image define groups']="gestion des droits" ;
+
?>
\ No newline at end of file
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-03 21:17:07 UTC (rev 4141)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/adminUsers.txt 2012-04-03 22:13:09 UTC (rev 4142)
@@ -10,8 +10,8 @@
$lang['heading title']="Gestion des utilisateurs" ;
$lang['table heading name']="Nom" ;
-$lang['table heading email']="Adresse Email" ;
-$lang['table heading groups']="Niveau du groupe" ;
+$lang['table heading email']="Email" ;
+$lang['table heading groups']="Groupe" ;
$lang['table heading lognum']="Accès" ;
$lang['table heading action']="Action" ;
@@ -22,13 +22,13 @@
$lang['text info fullname']="Nom : " ;
$lang['text info firstname']="Prénom : " ;
$lang['text info lastname']="Nom : " ;
-$lang['text info email']="Adresse Email : " ;
+$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']="Niveau du groupe : " ;
+$lang['text info group']="Groupe : " ;
$lang['text none']="choix du groupe" ;
Modified: trunk/catalog/admin/includes/modules/pages/adminGroup.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/adminGroup.php 2012-04-03 21:17:07 UTC (rev 4141)
+++ trunk/catalog/admin/includes/modules/pages/adminGroup.php 2012-04-03 22:13:09 UTC (rev 4142)
@@ -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 28/12/11, 09:32
+ @date 03/04/2012, 09:32
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class adminGroup
Modified: trunk/catalog/admin/includes/template/oscss/gabarit-1.php
===================================================================
--- trunk/catalog/admin/includes/template/oscss/gabarit-1.php 2012-04-03 21:17:07 UTC (rev 4141)
+++ trunk/catalog/admin/includes/template/oscss/gabarit-1.php 2012-04-03 22:13:09 UTC (rev 4142)
@@ -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 17/03/11, 15:42
+ @version 2.1.1
+ @date 03/04/2012, 09:32
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
Modified: trunk/catalog/admin/includes/template/oscss/inc/lib_general-1.js
===================================================================
--- trunk/catalog/admin/includes/template/oscss/inc/lib_general-1.js 2012-04-03 21:17:07 UTC (rev 4141)
+++ trunk/catalog/admin/includes/template/oscss/inc/lib_general-1.js 2012-04-03 22:13:09 UTC (rev 4142)
@@ -1,3 +1,15 @@
+/**
+ * @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 28/03/2012, 21:29
+ * @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ * @encode UTF-8
+ * @brief
+ */
+
+
function showmenu(num_id){
for(i=0;i<8;i++){
if (num_id !=='' && num_id===i) {
@@ -10,21 +22,9 @@
$(".adminBlock h3").click(function () {$(".adminBlock .tirroir").slideToggle("slow");});
});
-
-
- // function simple_tooltip(target_items, name){
- // $(target_items).each(function(i){
- // $("body").append("<div class='"+name+"' id='"+name+i+"'><p>"+$(this).attr('title')+"</p></div>");
- // var my_tooltip = $("#"+name+i);
- //
- // var ref = $(this).attr("id");
- //
- // $("label[for='"+ref+"']").removeAttr("title").mouseover(function(){
- // my_tooltip.css({opacity:0.8, display:"none"}).fadeIn(400);
- // }).mousemove(function(kmouse){
- // my_tooltip.css({left:kmouse.pageX+15, top:kmouse.pageY+15});
- // }).mouseout(function(){
- // my_tooltip.fadeOut(400);
- // });
- // });
- // }
\ No newline at end of file
+/*
+ $(document).ready(function() {
+ $(function() {
+ $("#menutitre li ul li a").next('ul').prev().css("background-image", "url(images/icon/arrow-right.png)");
+ });
+ });*/
\ No newline at end of file
Modified: trunk/catalog/admin/includes/template/oscss/stylesheet-1.css
===================================================================
--- trunk/catalog/admin/includes/template/oscss/stylesheet-1.css 2012-04-03 21:17:07 UTC (rev 4141)
+++ trunk/catalog/admin/includes/template/oscss/stylesheet-1.css 2012-04-03 22:13:09 UTC (rev 4142)
@@ -183,7 +183,7 @@
/* Onglet */
.tabPage { position: relative; top: 0; z-index: 0; }
/* Class apercu ligne au survol */
-.dataTableRow{background-color: #F0F1F1;height:3em;}
+.dataTableRow{background-color: #F0F1F1;height:1.5em;}
.dataTableRow:hover,
.dataTableBase tr:hover,
.dataTable tr:hover{ background-color: #E6FF99; cursor: pointer; line-height:13px;}
Modified: trunk/catalog/install/data/sample/appareil_photo/oscss_sample_data.sql
===================================================================
--- trunk/catalog/install/data/sample/appareil_photo/oscss_sample_data.sql 2012-04-03 21:17:07 UTC (rev 4141)
+++ trunk/catalog/install/data/sample/appareil_photo/oscss_sample_data.sql 2012-04-03 22:13:09 UTC (rev 4142)
@@ -50,7 +50,7 @@
TRUNCATE TABLE osc_customers_info;
INSERT INTO osc_customers_info (customers_info_id, customers_info_date_of_last_logon, customers_info_number_of_logons, customers_info_date_account_created, customers_info_date_account_last_modified) VALUES
-(2, '2010-07-31 09:07:26', 6, '2010-07-24 12:34:55', '2010-07-24 12:42:20');
+(2, '2011-07-31 09:07:26', 6, '2011-07-24 12:34:55', '2011-07-24 12:42:20');
TRUNCATE TABLE osc_manufacturers;
INSERT INTO osc_manufacturers (manufacturers_id, manufacturers_name, manufacturers_image, date_added) VALUES
@@ -69,13 +69,27 @@
TRUNCATE TABLE osc_orders;
INSERT INTO osc_orders (orders_id, customers_id, customers_name, customers_company, customers_street_address, customers_suburb, customers_city, customers_postcode, customers_state, customers_country, customers_telephone, customers_email_address, customers_address_format_id, delivery_name, delivery_company, delivery_street_address, delivery_suburb, delivery_city, delivery_postcode, delivery_state, delivery_country, delivery_address_format_id, billing_name, billing_company, billing_street_address, billing_suburb, billing_city, billing_postcode, billing_state, billing_country, billing_address_format_id, payment_method, cc_type, cc_owner, cc_number, cc_expires, last_modified, date_purchased, orders_status, orders_date_finished, currency, currency_value, ip_address, class_payment) VALUES
-(4, 2, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', '0102010201', 'jc...@os...', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', 1, 'Paiement par chèque', '', '', '', '', '2010-07-24 13:11:36', '2010-06-24 12:36:40', 4, NULL, 'EUR', 1.000000, '127.0.0.1','moneyorder'),
-(5, 2, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', '0102010201', 'jc...@os...', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', 1, 'Paiement à la livraison', '', '', '', '', '2010-07-28 16:34:05', '2010-07-24 12:45:35', 4, NULL, 'EUR', 1.000000, '127.0.0.1','cod'),
-(9, 2, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', '0102010201', 'jc...@os...', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', 1, 'Paiement à la livraison', '', '', '', '', NULL, '2010-07-28 15:42:27', 1, NULL, 'EUR', 1.000000, '127.0.0.1','cod'),
-(10, 2, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', '0102010201', 'jc...@os...', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', 1, 'Paiement à la livraison', '', '', '', '', NULL, '2010-07-28 15:50:17', 1, NULL, 'EUR', 1.000000, '127.0.0.1','cod'),
-(11, 2, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', '0102010201', 'jc...@os...', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', 1, 'Paiement à la livraison', '', '', '', '', '2010-07-28 16:35:57', '2010-07-28 16:01:14', 3, NULL, 'EUR', 1.000000, '127.0.0.1','cod'),
-(12, 2, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', '0102010201', 'jc...@os...', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', 1, 'Paiement à la livraison', '', '', '', '', '2010-07-28 16:35:37', '2010-07-28 16:02:55', 2, NULL, 'EUR', 1.000000, '127.0.0.1','cod'),
-(13, 2, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', '0102010201', 'jc...@os...', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', 1, 'Paiement à la livraison', '', '', '', '', '2010-07-31 10:19:59', '2010-07-31 09:13:14', 2, NULL, 'EUR', 1.000000, '127.0.0.1','cod');
+(4, 2, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', '0102010201', 'jc...@os...', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000',
+'Franche-Comté', 'France', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', 1, 'Paiement par chèque', '', '', '', '', '2011-07-24 13:11:36',
+'2011-06-24 12:36:40', 4, NULL, 'EUR', 1.000000, '127.0.0.1','moneyorder'),
+(5, 2, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', '0102010201', 'jc...@os...', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000',
+'Franche-Comté', 'France', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', 1, 'Paiement à la livraison', '', '', '', '', '2011-07-28 16:34:05',
+'2011-07-24 12:45:35', 4, NULL, 'EUR', 1.000000, '127.0.0.1','cod'),
+(9, 2, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', '0102010201', 'jc...@os...', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000',
+'Franche-Comté', 'France', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', 1, 'Paiement à la livraison', '', '', '', '', NULL, '2011-07-28
+15:42:27', 1, NULL, 'EUR', 1.000000, '127.0.0.1','cod'),
+(10, 2, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', '0102010201', 'jc...@os...', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000',
+'Franche-Comté', 'France', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', 1, 'Paiement à la livraison', '', '', '', '', NULL, '2011-07-28
+15:50:17', 1, NULL, 'EUR', 1.000000, '127.0.0.1','cod'),
+(11, 2, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', '0102010201', 'jc...@os...', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000',
+'Franche-Comté', 'France', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', 1, 'Paiement à la livraison', '', '', '', '', '2011-07-28 16:35:57',
+'2011-07-28 16:01:14', 3, NULL, 'EUR', 1.000000, '127.0.0.1','cod'),
+(12, 2, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', '0102010201', 'jc...@os...', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000',
+'Franche-Comté', 'France', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', 1, 'Paiement à la livraison', '', '', '', '', '2011-07-28 16:35:37',
+'2011-07-28 16:02:55', 2, NULL, 'EUR', 1.000000, '127.0.0.1','cod'),
+(13, 2, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', '0102010201', 'jc...@os...', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000',
+'Franche-Comté', 'France', 1, 'Jean-Claude Duce', '', 'Rue des Bronzés', '', 'Paris', '75000', 'Franche-Comté', 'France', 1, 'Paiement à la livraison', '', '', '', '', '2011-07-31 10:19:59',
+'2011-07-31 09:13:14', 2, NULL, 'EUR', 1.000000, '127.0.0.1','cod');
TRUNCATE TABLE osc_orders_products;
INSERT INTO osc_orders_products (orders_products_id, orders_id, products_id, products_model, products_name, products_price, final_price, products_tax, products_quantity) VALUES
@@ -90,19 +104,19 @@
TRUNCATE TABLE osc_orders_status_history;
INSERT INTO osc_orders_status_history (orders_status_history_id, orders_id, orders_status_id, date_added, customer_notified, comments) VALUES
-(5, 4, 1, '2010-07-24 12:36:40', 1, ''),
-(6, 4, 3, '2010-07-24 12:41:11', 1, ''),
-(7, 5, 1, '2010-07-24 12:45:35', 1, ''),
-(13, 4, 4, '2010-07-24 13:12:37', 1, ''),
-(14, 9, 1, '2010-07-28 15:42:27', 1, ''),
-(15, 10, 1, '2010-07-28 15:50:17', 1, ''),
-(16, 11, 1, '2010-07-28 16:01:14', 1, ''),
-(17, 12, 1, '2010-07-28 16:02:55', 1, ''),
-(18, 5, 4, '2010-07-28 16:35:07', 1, ''),
-(19, 12, 2, '2010-07-28 16:35:37', 0, ''),
-(20, 11, 3, '2010-07-28 16:35:57', 0, ''),
-(21, 13, 1, '2010-07-31 09:13:14', 1, ''),
-(22, 13, 2, '2010-07-31 10:19:59', 0, '');
+(5, 4, 1, '2011-07-24 12:36:40', 1, ''),
+(6, 4, 3, '2011-07-24 12:41:11', 1, ''),
+(7, 5, 1, '2011-07-24 12:45:35', 1, ''),
+(13, 4, 4, '2011-07-24 13:12:37', 1, ''),
+(14, 9, 1, '2011-07-28 15:42:27', 1, ''),
+(15, 10, 1, '2011-07-28 15:50:17', 1, ''),
+(16, 11, 1, '2011-07-28 16:01:14', 1, ''),
+(17, 12, 1, '2011-07-28 16:02:55', 1, ''),
+(18, 5, 4, '2011-07-28 16:35:07', 1, ''),
+(19, 12, 2, '2011-07-28 16:35:37', 0, ''),
+(20, 11, 3, '2011-07-28 16:35:57', 0, ''),
+(21, 13, 1, '2011-07-31 09:13:14', 1, ''),
+(22, 13, 2, '2011-07-31 10:19:59', 0, '');
TRUNCATE TABLE osc_orders_total;
INSERT INTO osc_orders_total (orders_total_id, orders_id, title, text, value, class, sort_order) VALUES
@@ -202,16 +216,21 @@
INSERT INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) VALUES
-('Store Pickup Cost', 'MODULE_SHIPPING_SPU_COST', '0.00', 'Preciser le cout', 6, 0, '1000-01-01 00:00:00', '2010-12-12 11:49:44', NULL, NULL, 2),
-('Shipping Zone', 'MODULE_SHIPPING_SPU_ZONE', '0', 'If a zone is selected, only enable this shipping method for that zone.', 6, 0, '1000-01-01 00:00:00', '2010-12-12 11:49:44', 'tep_get_zone_class_title', 'tep_cfg_pull_down_zone_shipping(', 2),
-('Sort order', 'MODULE_SHIPPING_SPU_SORT_ORDER', '0', 'Preciser un nombre pour le tri', 6, 0, '1000-01-01 00:00:00', '2010-12-12 11:49:44', NULL, NULL, 2),
-('choose icon', 'MODULE_SHIPPING_SPU_ICON', '', 'choose icon transporteur', 6, 0, '1000-01-01 00:00:00', '2010-12-12 11:49:44', NULL, 'tep_cfg_choose_img(', 2),
-('Store Pick Up Zip Code Allowed', 'MODULE_SHIPPING_SPU_ZIP', '01, 07, 26, 38, 42, 69, 74', 'Departement autorisé pour le retrait magasin ? laisser vide si vous ne l''utilisez pas', 6, 0, '1000-01-01 00:00:00', '2010-12-12 11:49:44', NULL, NULL, 0),
-('Payable à...', 'MODULE_PAYMENT_MONEYORDER_PAYTO', '', 'A qu''elle ordre doit être effectue le paiement ?', 6, 0, '1000-01-01 00:00:00', '2010-12-12 11:50:48', NULL, NULL, 2),
-('Ordre de tri', 'MODULE_PAYMENT_MONEYORDER_SORT_ORDER', '0', 'Ordre de tri pour l''affichage (Le plus petit nombre est montré en premier).', 6, 1, '1000-01-01 00:00:00', '2010-12-12 11:50:48', NULL, NULL, 2),
-('Zone de paiement', 'MODULE_PAYMENT_MONEYORDER_ZONE', '0', 'Permettre seulement cette méthode de paiement pour la zone choisie.', 6, 2, '1000-01-01 00:00:00', '2010-12-12 11:50:48', 'tep_get_zone_class_title', 'tep_cfg_pull_down_zone_classes(', 2),
-('Etat de la commande', 'MODULE_PAYMENT_MONEYORDER_ORDER_STATUS_ID', '0', 'Sélectionner l''état de la commande que vous voulez par défault.', 6, 1, '1000-01-01 00:00:00', '2010-12-12 11:50:48', 'tep_get_order_status_name', 'tep_cfg_pull_down_order_statuses(', 2),
-('Icone pour ce mode paiement', 'MODULE_PAYMENT_MONEYORDER_ICON', '', 'Choix d''un icone', 6, 5, '1000-01-01 00:00:00', '2010-12-12 11:50:48', NULL, 'tep_cfg_choose_img(', 2);
+('Store Pickup Cost', 'MODULE_SHIPPING_SPU_COST', '0.00', 'Preciser le cout', 6, 0, '1000-01-01 00:00:00', '2011-12-12 11:49:44', NULL, NULL, 2),
+('Shipping Zone', 'MODULE_SHIPPING_SPU_ZONE', '0', 'If a zone is selected, only enable this shipping method for that zone.', 6, 0, '1000-01-01 00:00:00', '2011-12-12 11:49:44',
+'tep_get_zone_class_title', 'tep_cfg_pull_down_zone_shipping(', 2),
+('Sort order', 'MODULE_SHIPPING_SPU_SORT_ORDER', '0', 'Preciser un nombre pour le tri', 6, 0, '1000-01-01 00:00:00', '2011-12-12 11:49:44', NULL, NULL, 2),
+('choose icon', 'MODULE_SHIPPING_SPU_ICON', '', 'choose icon transporteur', 6, 0, '1000-01-01 00:00:00', '2011-12-12 11:49:44', NULL, 'tep_cfg_choose_img(', 2),
+('Store Pick Up Zip Code Allowed', 'MODULE_SHIPPING_SPU_ZIP', '01, 07, 26, 38, 42, 69, 74', 'Departement autorisé pour le retrait magasin ? laisser vide si vous ne l''utilisez pas', 6, 0, '1000-01-01
+00:00:00', '2011-12-12 11:49:44', NULL, NULL, 0),
+('Payable à...', 'MODULE_PAYMENT_MONEYORDER_PAYTO', '', 'A qu''elle ordre doit être effectue le paiement ?', 6, 0, '1000-01-01 00:00:00', '2011-12-12 11:50:48', NULL, NULL, 2),
+('Ordre de tri', 'MODULE_PAYMENT_MONEYORDER_SORT_ORDER', '0', 'Ordre de tri pour l''affichage (Le plus petit nombre est montré en premier).', 6, 1, '1000-01-01 00:00:00', '2011-12-12 11:50:48', NULL,
+NULL, 2),
+('Zone de paiement', 'MODULE_PAYMENT_MONEYORDER_ZONE', '0', 'Permettre seulement cette méthode de paiement pour la zone choisie.', 6, 2, '1000-01-01 00:00:00', '2011-12-12 11:50:48',
+'tep_get_zone_class_title', 'tep_cfg_pull_down_zone_classes(', 2),
+('Etat de la commande', 'MODULE_PAYMENT_MONEYORDER_ORDER_STATUS_ID', '0', 'Sélectionner l''état de la commande que vous voulez par défault.', 6, 1, '1000-01-01 00:00:00', '2011-12-12 11:50:48',
+'tep_get_order_status_name', 'tep_cfg_pull_down_order_statuses(', 2),
+('Icone pour ce mode paiement', 'MODULE_PAYMENT_MONEYORDER_ICON', '', 'Choix d''un icone', 6, 5, '1000-01-01 00:00:00', '2011-12-12 11:50:48', NULL, 'tep_cfg_choose_img(', 2);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-03 21:17:15
|
Revision: 4141
http://oscss.svn.sourceforge.net/oscss/?rev=4141&view=rev
Author: oscim
Date: 2012-04-03 21:17:07 +0000 (Tue, 03 Apr 2012)
Log Message:
-----------
Correction diverse
suppression derniere reference a mysql_xx pour n'exploiter que les drivers de DB
ajustement du menu configuration , mise a niveau fr et sql associ?\195?\169
Nettoyage fichier fr et constante de langue obsolete
ajustement dashoard
Modified Paths:
--------------
trunk/catalog/Documents/admin/data/dashboard.xml
trunk/catalog/admin/includes/functions/general.php
trunk/catalog/admin/includes/languages/fr_FR/boxes/01_configuration.php
trunk/catalog/admin/includes/languages/fr_FR/configuration.php
trunk/catalog/admin/includes/languages/fr_FR/fr_FR.php
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/index.txt
trunk/catalog/admin/includes/languages/fr_FR/widget/SsMenuConfig.txt
trunk/catalog/admin/includes/widget/homeStats.php
trunk/catalog/common/classes/Database.php
trunk/catalog/common/classes/sql_drivers/DB_Mysql.php
trunk/catalog/common/classes/sql_drivers/DB_Mysqli.php
trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration_group.sql
Modified: trunk/catalog/Documents/admin/data/dashboard.xml
===================================================================
--- trunk/catalog/Documents/admin/data/dashboard.xml 2012-04-03 18:06:26 UTC (rev 4140)
+++ trunk/catalog/Documents/admin/data/dashboard.xml 2012-04-03 21:17:07 UTC (rev 4141)
@@ -68,7 +68,25 @@
<widget>SsMenuConfig</widget>
</right>
</config_35>
+
+ <config_39>
+ <left>
+<!-- <widget>ProductsWizzard</widget> -->
+ </left>
+ <right>
+ <widget>SsMenuConfig</widget>
+ </right>
+ </config_39>
+ <config_40>
+ <left>
+ <!-- <widget>ProductsWizzard</widget> -->
+ </left>
+ <right>
+ <widget>SsMenuConfig</widget>
+ </right>
+ </config_40>
+
<config_100>
<left>
<widget>HelpConfig</widget>
Modified: trunk/catalog/admin/includes/functions/general.php
===================================================================
--- trunk/catalog/admin/includes/functions/general.php 2012-04-03 18:06:26 UTC (rev 4140)
+++ trunk/catalog/admin/includes/functions/general.php 2012-04-03 21:17:07 UTC (rev 4141)
@@ -540,11 +540,10 @@
/**
- Recup info sys
- @package osc 2.2Ms2
+ @brief Recup info sys
*/
function tep_get_system_information() {
-
+ $DB=Database::getInstance();
$db_query = tep_db_query("select now() as datetime");
$db = tep_db_fetch_array($db_query);
@@ -561,7 +560,8 @@
'zend' => (function_exists('zend_version') ? zend_version() : ''),
'db_server' => DB_SERVER,
'db_ip' => gethostbyname(DB_SERVER),
- 'db_version' => 'MySQL ' . (function_exists('mysql_get_server_info') ? mysql_get_server_info() : ''),
+ 'db_connector' => DB_CONNECTOR ,
+ 'db_version' => $DB->server_info(),
'db_date' => tep_datetime_short($db['datetime']));
}
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-03 18:06:26 UTC (rev 4140)
+++ trunk/catalog/admin/includes/languages/fr_FR/boxes/01_configuration.php 2012-04-03 21:17:07 UTC (rev 4141)
@@ -9,64 +9,73 @@
@encode UTF-8
*/
-define('BOX_TOOLS_DEFINE_LANGUAGE',"Gestion langues site" );
-define('BOX_TAXES_COUNTRIES',"Régions et Pays" );
-define('BOX_TAXES_GEO_ZONES',"Zones fiscales/livraisons" );
-define('BOX_TAXES_TAX_CLASSES',"Classes et Taux fiscaux" );
-define('BOX_HEADING_LOCALIZATION',"Localisation" );
-define('BOX_LOCALIZATION_LANGUAGES',"Langues" );
-define('BOX_LOCALIZATION_ORDERS_STATUS',"Gestion Status" );
-define('BOX_HEADING_CONF_RECOVER_CART_SALES',"Récupération de panier" );
-define('BOX_HEADING_CONF_BOX_SITEMONITOR_SETUP',"Sitemonitor" );
-define('BOX_HEADING_CONF_BOX_SITEMONITOR',"Sitemonitor" );
-define('BOX_HEADING_CONF_CG_CIP_MANAGER',"Installateur extensions" );
-define('BOX_HEADING_CONF_ATTRIBUTE_PRODUCT',"Options de produits" );
-define('BOX_HEADING_CONF_QUICK_UPDATE',"Général" );
-define('BOX_CONFIGURATION_TEMPLATE',"Template" );
-define('BOX_CONFIGURATION_MYSTORE',"Mon magasin" );
+
+
+// define('BOX_HEADING_LOCALIZATION',"Localisation" );
+// define('BOX_HEADING_CONF_BOX_SITEMONITOR_SETUP',"Sitemonitor" );
+// define('BOX_HEADING_CONF_BOX_SITEMONITOR',"Sitemonitor" );
+// define('BOX_HEADING_CONF_ATTRIBUTE_PRODUCT',"Options de produits" );
+// define('BOX_CONFIGURATION_MYSTORE',"Mon magasin" );
+// define('BOX_HEADING_CONF_DETAIL_CLIENTS',"Détails clients" );
+// define('BOX_HEADING_CONF_OPTION_MODULES',"Option des Modules" );
+// define('BOX_HEADING_CONF_OPTION_MODULES_PAY',"Vue modes paiements" );
+// 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');
+
+define('BOX_ZONE_AND_TAXE', 'Taxe / Zone');
+ define('BOX_TAXES_COUNTRIES',"Régions et Pays" );
+ define('BOX_TAXES_GEO_ZONES',"Zones fiscales/livraisons" );
+ define('BOX_TAXES_TAX_CLASSES',"Classes et Taux fiscaux" );
+
define('BOX_HEADING_CONF_CONFIGURATION',"Configuration" );
-define('BOX_HEADING_CONF_MY_BOUTIQUE',"Ma boutique" );
-define('BOX_HEADING_CONF_NEW_PRODUCTS',"Nouveaux produits" );
-define('BOX_HEADING_CONF_VALUE_MINI',"Unité" );
-define('BOX_HEADING_CONF_VALUE_MAXI',"Valeurs Maximun" );
-define('BOX_HEADING_CONF_IMAGES',"Images" );
-define('BOX_HEADING_CONF_DETAIL_CLIENTS',"Détails clients" );
-define('BOX_HEADING_CONF_OPTION_MODULES',"Option des Modules" );
-define('BOX_HEADING_CONF_OPTION_MODULES_PAY',"Vue modes paiements" );
-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_EXPEDITION_EMBALLAGE',"Expédition/Emballage" );
-define('BOX_HEADING_CONF_LIST_PRODUTCS',"Liste produits" );
-define('BOX_HEADING_CONF_STOCK',"Stock" );
-define('BOX_HEADING_CONF_LOGGING',"Log" );
-define('BOX_HEADING_CONF_OPTION_CATALOG',"Options du catalogue" );
-define('BOX_HEADING_CONF_OPTION_MAIL',"Options de mail" );
+ define('BOX_HEADING_CONF_MY_BOUTIQUE',"Ma boutique" );
+ define('BOX_HEADING_CONF_VALUE_MINI',"Unité" );
+ define('BOX_LOCALIZATION_ORDERS_STATUS',"Gestion Status" );
-define('BOX_HEADING_CONF_COMPRESSION',"Compression GZip" );
-define('BOX_HEADING_CONF_SESSION',"Session" );
-define('BOX_HEADING_CONF_PRODUCT_ATTENTE',"Produits en attentes" );
-define('BOX_HEADING_CONF_OPEN_BOX',"Gestion des boîtes" );
-define('BOX_HEADING_CONF_SEO_URL',"SEO URLs" );
+define('BOX_HEADING_CONF_ESPACE_ADMIN',"Backoffice" );
+ define('BOX_HEADING_CONF_PRODUCT_ATTENTE',"Produits en attentes" );
+ define('BOX_HEADING_CONF_RECOVER_CART_SALES',"Récupération de panier" );
+ define('BOX_HEADING_CONF_QUICK_UPDATE',"Général" );
+
define('BOX_HEADING_CONF_APPARENCE',"Apparence" );
-define('BOX_HEADING_CONF_APPARENCE_GENERAL',"Apparence générale" );
-define('BOX_HEADING_CONF_PAGE_PRODUCT_DETAIL',"Page produit" );
-define('BOX_HEADING_CONF_MEMBRES_DETAIL',"Membre détail" );
-define('BOX_HEADING_CONF_BOX_CONFIGURATION_EXTRA_FIELDS',"Clients extra" );
+ define('BOX_HEADING_CONF_APPARENCE_GENERAL',"Apparence générale" );
+ define('BOX_HEADING_CONF_PAGE_PRODUCT_DETAIL',"Page produit" );
+ define('BOX_HEADING_CONF_OPEN_BOX',"Gestion des boîtes" );
+ define('BOX_CONFIGURATION_TEMPLATE',"Template" );
+ define('BOX_HEADING_CONF_LIST_PRODUTCS',"Liste produits" );
+ define('BOX_HEADING_CONF_IMAGES',"Images" );
define('BOX_HEADING_CONF_CONFIG_AVANCE',"Configuration avancée" );
-define('BOX_HEADING_CONF_ESPACE_ADMIN',"Backoffice" );
-define('BOX_HEADING_CONF_CONFIGURATION COMMERCIALE',"Configuration catalogue" );
+ define('BOX_HEADING_CONF_SEO_URL',"SEO URLs" );
+ define('BOX_HEADING_CONF_SESSION',"Session" );
+ define('BOX_HEADING_CONF_LOGGING',"Log" );
+ define('BOX_HEADING_CONF_OPTION_MAIL',"Options de mail" );
+ define('BOX_HEADING_CONF_COMPRESSION',"Compression GZip" );
+ define('BOX_HEADING_CONF_BOX_CONFIGURATION_ENVIRONEMENT',"Environement" );
+ define('BOX_LOCALIZATION_LANGUAGES',"Langues" );
+ define('BOX_HEADING_CONF_VALUE_MAXI',"Valeurs Maximun" );
+ define('BOX_HEADING_CONF_CG_CIP_MANAGER',"Installateur extensions" );
+
define('BOX_HEADING_CONF_CONFIG_COMM',"Configuration commerciale" );
-define('BOX_HEADING_CONF_TEMPLATE',"Template" );
-define('BOX_HEADING_CONF_BOX_CONFIGURATION_ENVIRONEMENT',"Environement" );
-define('BOX_HEADING_CONF_TITLE_BOX_CONFIGURATION_ENVIRONEMENT',"Environement" );
-define('BOX_HEADING_CONF_CONFIGURATION_ORDERS',"Option des commandes" );
-define('BOX_HEADING_CONF_BOX_CONFIGURATION_ABONNEMENT',"Option des Abonnements" );
+ define('BOX_HEADING_CONF_OPTION_CATALOG',"Options du catalogue" );
+ define('BOX_HEADING_CONF_STOCK',"Stock" );
+ define('BOX_HEADING_CONF_OPTION_PRODUCTS',"Option des produits" );
+ define('BOX_HEADING_CONF_CONFIG_PRODUCTS',"Configuration des produits" );
+ define('BOX_HEADING_CONF_DOWNLOADS',"Téléchargements" );
+ define('BOX_HEADING_CONF_BOX_CONFIGURATION_PRODUCTS_EXTRA_FIELDS',"Produits extra" );
+ define('BOX_HEADING_CONF_NEW_PRODUCTS',"Nouveaux produits" );
+ define('BOX_HEADING_CONF_OPTION_CUSTOMERS',"Option des utilisateurs" );
+ define('BOX_HEADING_CONF_BOX_CONFIGURATION_EXTRA_FIELDS',"Clients extra" );
+ define('BOX_HEADING_CONF_MEMBRES_DETAIL',"Membre détail" );
+ define('BOX_HEADING_CONF_OPTION_ORDERS',"Option des commandes" );
+ define('BOX_HEADING_CONF_CONFIGURATION_ORDERS',"Configuration commandes" );
+ define('BOX_HEADING_CONF_EXPEDITION_EMBALLAGE',"Expédition/Emballage" );
-define('BOX_HEADING_CONF_OPTION_PRODUCTS',"Option des produits" );
-define('BOX_HEADING_CONF_CONFIG_PRODUCTS',"Configuration des produits" );
-define('BOX_HEADING_CONF_DOWNLOADS',"Téléchargements" );
-define('BOX_HEADING_CONF_BOX_CONFIGURATION_PRODUCTS_EXTRA_FIELDS',"Produits extra" );
define('BOX_HEADING_CONF_VIEW_SYSINFO',"info. systeme" );
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/languages/fr_FR/configuration.php
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/configuration.php 2012-04-03 18:06:26 UTC (rev 4140)
+++ trunk/catalog/admin/includes/languages/fr_FR/configuration.php 2012-04-03 21:17:07 UTC (rev 4141)
@@ -1,12 +1,13 @@
<?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/09/10, 11:09
+ @version 2.1.1
+ @date 03/04/2012, 11:09
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
+ @brief les definition de ces variable de langue ne sont utilsié que pour les groupe de configuration qui ne corresponde a aucun module specifique
*/
define('TABLE_HEADING_CONFIGURATION_TITLE',"Titre" );
define('TABLE_HEADING_CONFIGURATION_VALUE',"Valeur" );
Modified: trunk/catalog/admin/includes/languages/fr_FR/fr_FR.php
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/fr_FR.php 2012-04-03 18:06:26 UTC (rev 4140)
+++ trunk/catalog/admin/includes/languages/fr_FR/fr_FR.php 2012-04-03 21:17:07 UTC (rev 4141)
@@ -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 28/12/11, 15:25
+ @date 03/04/2012, 15:25
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@brief master file for languages
@@ -15,10 +15,7 @@
define('HEADER_TITLE_ACCOUNT',"Mon compte" );
define('HEADER_TITLE_LOGOFF',"Fermeture session" );
-// Admin Account
-define('BOX_HEADING_MY_ACCOUNT',"Mon compte" );
-
if(function_exists('date_default_timezone_set')) date_default_timezone_set('Europe/Paris');
// look in your $PATH_LOCALE/locale directory for available locales..
@@ -115,19 +112,7 @@
// text for date of birth example
define('DOB_FORMAT_STRING',"jj/mm/aaaa" );
-// configuration box text in includes/boxes/configuration.php
-
-define('BOX_CONFIGURATION_LOGGING',"Enregistrement" );
-
-define('BOX_HEADING_CONF_PARAMETERS',"Paramètres" );
-/** TODO: delete */define('BOX_ZONE_AND_TAXE', 'Taxe / Zone');
-/** TODO: delete */define('BOX_HEADING_LOCATION_AND_TAXES', 'Lieux / Taxes');
-
-
-
-define('BOX_HEADING_COMMANDE',"Commandes" );
-
// tools text in includes/boxes/tools.php
define('BOX_INFO',"Informations" );
define('BOX_HEADING_REPORTS',"Rapports" );
@@ -142,40 +127,15 @@
define('TEXT_DISPLAY_NUMBER_OF_CONTENT',"Affichage <strong>%d</strong> de <strong>%d</strong> (sur <strong>%d</strong> contenus)" );
-define('NEWS',"News" );
-define('NEW_ARTICLE',"New Article" );
-
// javascript messages
-define('JS_ERROR',"Des erreurs sont survenues durant le traitement de votre formulaire !\nMerci de faire les corrections suivantes :\n\n" );
-
-define('JS_OPTIONS_VALUE_PRICE',"* Le nouveau attribut produit nécessite un prix\n" );
-define('JS_OPTIONS_VALUE_PRICE_PREFIX',"* Le nouveau attribut produit nécessite un préfixe de prix\n" );
-
-define('JS_PRODUCTS_NAME',"* Le nouveau produit nécessite un nom\n" );
-define('JS_PRODUCTS_DESCRIPTION',"* Le nouveau produit nécessite une description\n" );
-define('JS_PRODUCTS_PRICE',"* Le nouveau produit nécessite un prix\n" );
-define('JS_PRODUCTS_WEIGHT',"* Le nouveau produit nécessite un poids\n" );
-define('JS_PRODUCTS_QUANTITY',"* Le nouveau produit nécessite une quantité\n" );
-define('JS_PRODUCTS_MODEL',"* Le nouveau produit nécessite un modèle\n" );
-define('JS_PRODUCTS_IMAGE',"* Le nouveau produit nécessite une image\n" );
-
-define('JS_SPECIALS_PRODUCTS_PRICE',"* Un nouveau prix pour ce produit doit être fixé\n" );
-
-
-define('JS_POST_CODE',"* L'entrée 'Code postal' doit avoir au moins " . ENTRY_POSTCODE_MIN_LENGTH . " caractères.\n" );
define('JS_STATE',"* L'entrée 'Etat' doit avoir été choisie.\n" );
define('JS_STATE_SELECT',"-- Choisissez ci-dessus --" );
-define('JS_ZONE',"* L'entrée 'Etat' doit être choisie parmi la liste pour ce pays." );
-define('JS_COUNTRY',"* La valeur 'Pays' doit être choisie.\n" );
define('JS_TELEPHONE',"* L'entrée 'Numéro de téléphone' doit avoir au moins " . ENTRY_TELEPHONE_MIN_LENGTH . " caractères.\n" );
-define('JS_PASSWORD',"* Les entrées 'Mot de passe' et 'Confirmation' doivent avoir au moins " . ENTRY_PASSWORD_MIN_LENGTH . " caractères.\n" );
-define('JS_ORDER_DOES_NOT_EXIST',"Le numéro de commande %s n'existe pas !" );
define('ENTRY_EMAIL_ADDRESS',"Adresse électronique :" );
// images
-define('IMAGE_ANI_SEND_EMAIL',"Envoyer un courrier électronique" );
define('IMAGE_BACK',"Retour" );
define('IMAGE_CANCEL',"Annuler" );
define('IMAGE_CONFIRM',"Confirmer" );
@@ -194,15 +154,9 @@
define('IMAGE_ICON_INFO',"Info" );
define('IMAGE_INSERT',"Insérer" );
define('IMAGE_LOCK',"Verrouiller" );
-define('IMAGE_MODULE_INSTALL',"Installez le module" );
-define('IMAGE_MODULE_REMOVE',"Supprimer le module" );
define('IMAGE_MOVE',"Déplacer" );
define('IMAGE_NEW',"Nouveau" );
-define('IMAGE_NEW_BANNER',"Nouvelle bannière" );
define('IMAGE_NEW_CATEGORY',"Nouvelle catégorie" );
-define('IMAGE_NEW_COUNTRY',"Nouveau pays" );
-define('IMAGE_NEW_FILE',"Nouveau fichier" );
-define('IMAGE_NEW_FOLDER',"Nouveau dossier" );
define('IMAGE_NEW_LANGUAGE',"Nouvelle Langue" );
define('IMAGE_NEW_NEWSLETTER',"Nouveau bulletin d'informations" );
define('IMAGE_NEW_PRODUCT',"Nouveau Produit" );
@@ -235,9 +189,6 @@
define('IMAGE_VERSION_FOR_PDF',"pdf" );
define('IMAGE_ADD',"Ajouter" );
define('IMAGE_SORT',"Tri" );
-define('IMAGE_FILE_PERMISSION',"Permission de dossier" );
-define('IMAGE_GROUPS',"Liste des groupes" );
-define('IMAGE_MEMBERS',"Liste des membres" );
define('IMAGE_NEW_GROUP',"Nouveau groupe" );
define('IMAGE_NEW_MEMBER',"Nouveau membres" );
define('IMAGE_NEXT',"Suivant" );
@@ -257,8 +208,8 @@
define('ICON_SUCCESS',"Succès" );
define('ICON_TICK',"Vrai" );
define('ICON_UNLOCKED',"Déverrouillé" );
-define('ICON_WARNING',"Attention" );
+
// constants for use in tep_prev_next_display function
define('TEXT_RESULT_PAGE',"Page %s sur %d" );
define('TEXT_MAXI_ROW_BY_PAGE',"Voir %s lignes" );
@@ -274,9 +225,6 @@
define('ERROR',"Erreur : " );
-define('TEXT_CACHE_CATEGORIES',"Boîte catégories" );
-define('TEXT_CACHE_MANUFACTURERS',"Boîte fabricants" );
-define('TEXT_CACHE_ALSO_PURCHASED',"Module d'achat supplémentaire" );
define('TEXT_NONE',"--aucun--" );
define('TEXT_TOP',"Choix d'une categorie" );
@@ -289,10 +237,6 @@
define('SUCCESS_FILE_SAVED_SUCCESSFULLY',"Succès : Le fichier transféré a été sauvegardé avec succès." );
define('WARNING_NO_FILE_UPLOADED',"Attention : fichier non transféré." );
define('ERROR_FILE_NOT_WRITEABLE',"Erreur : Impossible d'écrire dans le fichier cible: " );
-define('ERROR_FILE_NOT_OPENED',"Erreur : Impossible d'ouvrir le fichier cible: " );
-define('ERROR_IN_WRITE_FILE',"Erreur : lors de l'écriture dans le fichier cible: " );
-define('ERROR_DB',"Erreur : Modification non effectué " );
-define('ERROR_DB_REPLACE',"Erreur : Modification non effectué " );
// some commons texts
define('TEXT_HELP',"Aide" );
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/pages/index.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/pages/index.txt 2012-04-03 18:06:26 UTC (rev 4140)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/index.txt 2012-04-03 21:17:07 UTC (rev 4141)
@@ -29,6 +29,9 @@
$lang['heading title config_126']="Configuration de l'environement admin" ;
$lang['heading title config_127']="Configuration commerciale de votre boutique" ;
+$lang['heading title config_35']="Gestion de la configuration des données de type produits" ;
+$lang['heading title config_39']="Gestion de la configuration des données des utilisateurs public" ;
+$lang['heading title config_40']="Configuration des processus d'achats" ;
$lang['HEADING_STOCK']="Stock Alerte" ;
$lang['TEXT_OSCSS_VERSION']="version d'osCSS" ;
Modified: trunk/catalog/admin/includes/languages/fr_FR/widget/SsMenuConfig.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/widget/SsMenuConfig.txt 2012-04-03 18:06:26 UTC (rev 4140)
+++ trunk/catalog/admin/includes/languages/fr_FR/widget/SsMenuConfig.txt 2012-04-03 21:17:07 UTC (rev 4141)
@@ -9,6 +9,8 @@
@encode UTF-8
*/
$lang['widget ssmenuconfig config_35']="Menu" ;
+$lang['widget ssmenuconfig config_39']="Menu" ;
+$lang['widget ssmenuconfig config_40']="Menu" ;
$lang['widget ssmenuconfig config_110']="Menu" ;
$lang['widget ssmenuconfig config_100']="Menu" ;
$lang['widget ssmenuconfig config_120']="Menu" ;
Modified: trunk/catalog/admin/includes/widget/homeStats.php
===================================================================
--- trunk/catalog/admin/includes/widget/homeStats.php 2012-04-03 18:06:26 UTC (rev 4140)
+++ trunk/catalog/admin/includes/widget/homeStats.php 2012-04-03 21:17:07 UTC (rev 4141)
@@ -1,16 +1,17 @@
<?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 17/11/11, 23:57
+ @date 03/04/2012, 23:57
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
$info=tep_get_system_information();
+
// Get the database system version
$database_query = tep_db_query("SELECT VERSION()");
$database_version = tep_db_fetch_array($database_query);
@@ -57,8 +58,8 @@
<dt><?php echo __('base de donnee') ;?></dt>
<dd>
<ul>
- <li><?php echo __('SQL ') ?></li>
- <li><?php echo __('Version : ').$database_version['VERSION()'] ?></li>
+ <li><?php echo __('SQL ').$info['db_connector'] ?></li>
+ <li><?php echo __('Version : ').$info['db_version'] ?></li>
<li><?php echo __('Rows : ').$total_records ?></li>
<li><?php echo __('Size : ').$total_size ?></li>
</ul>
Modified: trunk/catalog/common/classes/Database.php
===================================================================
--- trunk/catalog/common/classes/Database.php 2012-04-03 18:06:26 UTC (rev 4140)
+++ trunk/catalog/common/classes/Database.php 2012-04-03 21:17:07 UTC (rev 4141)
@@ -106,7 +106,7 @@
/**
- * Execute a raw query (return a Database_Result object)
+ * @brief Execute a raw query (return a Database_Result object)
* @param string
* @return object
*/
@@ -125,7 +125,7 @@
}
/**
- * Return all tables of a database as array
+ * @brief Return all tables of a database as array
* @param string
* @param boolean
* @return array
@@ -156,7 +156,7 @@
/**
- * Determine if a particular database table exists
+ * @brief Determine if a particular database table exists
* @param string
* @param string
* @param boolean
@@ -169,7 +169,7 @@
/**
- * Return all columns of a particular table as array
+ * @brief Return all columns of a particular table as array
* @param string
* @param boolean
* @return array
@@ -187,7 +187,7 @@
/**
- * Determine if a particular column exists
+ * @brief Determine if a particular column exists
* @param string
* @param string
* @param boolean
@@ -209,7 +209,7 @@
/**
- * Change the current database
+ * @brief Change the current database
* @param string
* @return boolean
*/
@@ -220,7 +220,7 @@
/**
- * Begin a transaction
+ * @brief Begin a transaction
*/
public function beginTransaction()
{
@@ -229,7 +229,7 @@
/**
- * Commit a transaction
+ * @brief Commit a transaction
*/
public function commitTransaction()
{
@@ -238,17 +238,30 @@
/**
- * Rollback a transaction
+ * @brief Rollback a transaction
*/
public function rollbackTransaction()
{
$this->rollback_transaction();
}
+
+ /**
+ * @brief Server info
+ */
+ public function server_info(){
+ return $this->server_info();
+ }
+
+
+ /**
+ * @brief
+ */
public function db_select($strDatabase){
return $this->set_database($strDatabase);
}
+
/**
* Abstract database driver methods
*/
Modified: trunk/catalog/common/classes/sql_drivers/DB_Mysql.php
===================================================================
--- trunk/catalog/common/classes/sql_drivers/DB_Mysql.php 2012-04-03 18:06:26 UTC (rev 4140)
+++ trunk/catalog/common/classes/sql_drivers/DB_Mysql.php 2012-04-03 21:17:07 UTC (rev 4141)
@@ -217,6 +217,14 @@
}
/**
+ * Server info
+ */
+ public function server_info()
+ {
+ return @mysql_get_server_info();
+ }
+
+ /**
Alias retro-compatibilité
*/
public function db_input($strString)
Modified: trunk/catalog/common/classes/sql_drivers/DB_Mysqli.php
===================================================================
--- trunk/catalog/common/classes/sql_drivers/DB_Mysqli.php 2012-04-03 18:06:26 UTC (rev 4140)
+++ trunk/catalog/common/classes/sql_drivers/DB_Mysqli.php 2012-04-03 21:17:07 UTC (rev 4141)
@@ -218,6 +218,14 @@
}
/**
+ * Server info
+ */
+ public function server_info()
+ {
+ return @$this->resConnection->get_server_info();
+ }
+
+ /**
Alias retro-compatibilité
*/
public function db_input($strString)
Modified: trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration_group.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration_group.sql 2012-04-03 18:06:26 UTC (rev 4140)
+++ trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration_group.sql 2012-04-03 21:17:07 UTC (rev 4141)
@@ -26,15 +26,20 @@
-- insert into osc_configuration_group values (3, 'VALUE_MAXI', NULL, 0, 1, 110, '0', 'CG_VALUE_MAXI');
insert into osc_configuration_group values (2, 'VALUE_MINI', NULL, 0, 1, 110, '0', 'CG_VALUE_MINI');
insert into osc_configuration_group values (1, 'MY_BOUTIQUE', NULL, 0, 1, 110, '0', 'CG_MY_BOUTIQUE');
- insert into osc_configuration_group values (25 , 'NEW_PRODUCTS', NULL, 0 , 1, 110, '0', 'CG_NEW_PRODUCTS');
- insert into osc_configuration_group values (28 , 'MEMBRES_DETAIL', NULL, 0 , 1, 110, '0', 'MODMEMBRES');
+
insert into osc_configuration_group values (30 , 'BOX_LOCALIZATION_ORDERS_STATUS', NULL, 0 , 1, 110, '0', 'MODSTATUS');
- insert into osc_configuration_group values (31 , 'BOX_LOCALIZATION_LANGUAGES', NULL, 0 , 1, 110, '0', 'MODLANGUE');
+
insert into osc_configuration_group values (120,'CONFIG_AVANCE', NULL, 4, 1, 0, '1', 'CG_CONFIG_AVANCE');
insert into osc_configuration_group values (24 , 'CG_CIP_MANAGER', NULL, 0 , 1, 120, '0', 'CG_CIP_MANAGER');
- insert into osc_configuration_group values (33 , 'BOX_CONFIGURATION_EXTRA_FIELDS', NULL, 0 , 1, 120, '0', 'MODCUSTEXTRA');
+ insert into osc_configuration_group values (10, 'LOGGING', NULL, 0, 1, 120, '1', 'CG_LOGGING');
+ insert into osc_configuration_group values (12, 'OPTION_MAIL', NULL, 0, 1, 120, '0', 'MODMAIL');
+ insert into osc_configuration_group values (14, 'COMPRESSION', NULL, 0, 1, 120, '0', 'CG_COMPRESSION');
+ insert into osc_configuration_group values (15, 'SESSION', NULL, 0, 1, 120, '0', 'CG_SESSION');
+ insert into osc_configuration_group values (16, 'SEO_URL', NULL, 0, 1, 120, '0', 'MODSEOURL');
+ insert into osc_configuration_group values (31 , 'BOX_LOCALIZATION_LANGUAGES', NULL, 0 , 1, 120, '0', 'MODLANGUE');
+
-- insert into osc_configuration_group values (26, 'ATTRIBUTE_PRODUCT', NULL,0 , 1, 120, '0', 'CG_ATTRIBUTE_PRODUCT');
insert into osc_configuration_group values (128,'BOX_CONFIGURATION_ENVIRONEMENT', NULL, 0, 1, 120, '0', 'CFG_ENVIRONEMENT');
@@ -44,25 +49,29 @@
insert into osc_configuration_group values (22, 'RECOVER_CART_SALES', NULL, 0, 1, 126, '0', 'CG_RECOVER_CART_SALES');
insert into osc_configuration_group values (127,'CONFIG_COMM', NULL, 3, 1, 0, '1', 'CG_CONFIG_COMM');
- insert into osc_configuration_group values (7, 'EXPEDITION_EMBALLAGE', NULL, 0, 1, 127, '0', 'MODEXPEDITION');
+
insert into osc_configuration_group values (9, 'STOCK', NULL, 0, 1, 127, '0', 'MODSTOCK');
insert into osc_configuration_group values (11, 'OPTION_CATALOG', NULL, 0, 1, 127, '0', 'CG_OPTION_CATALOG');
- insert into osc_configuration_group values (10, 'LOGGING', NULL, 0, 1, 120, '1', 'CG_LOGGING');
- insert into osc_configuration_group values (12, 'OPTION_MAIL', NULL, 0, 1, 120, '0', 'MODMAIL');
- insert into osc_configuration_group values (14, 'COMPRESSION', NULL, 0, 1, 120, '0', 'CG_COMPRESSION');
- insert into osc_configuration_group values (15, 'SESSION', NULL, 0, 1, 120, '0', 'CG_SESSION');
- insert into osc_configuration_group values (16, 'SEO_URL', NULL, 0, 1, 120, '0', 'MODSEOURL');
- insert into osc_configuration_group values (6, 'OPTION_MODULES', NULL, 0, 1, 120, '0', 'CG_OPTION_MODULES');
- insert into osc_configuration_group values (129,'CONFIGURATION_ORDERS', NULL, 0, 1, 127, '0', 'MODORDER');
+
+-- insert into osc_configuration_group values (6, 'OPTION_MODULES', NULL, 0, 1, 120, '0', 'CG_OPTION_MODULES');
+
-- insert into osc_configuration_group values (130,'CONFIGURATION_DATATYPES', NULL, 0, 1, 127, '0', 'MODDATATYPE');
insert into osc_configuration_group values (35 , 'OPTION_PRODUCTS', NULL, 0 , 1, 127, '1', 'OPTION_PRODUCTS');
insert into osc_configuration_group values (36, 'CONFIG_PRODUCTS', NULL , 0, 1, 35, '0', 'DATATYPEPRODUCT');
insert into osc_configuration_group values (13, 'DOWNLOADS', NULL, 0, 1, 35, '0', 'MODDOWNLOADS');
insert into osc_configuration_group values (34 , 'BOX_CONFIGURATION_PRODUCTS_EXTRA_FIELDS', NULL, 0 , 1, 35, '0', 'MODPRODEXTRA');
+ insert into osc_configuration_group values (25 , 'NEW_PRODUCTS', NULL, 0 , 1, 35, '0', 'CG_NEW_PRODUCTS');
+ insert into osc_configuration_group values (39 , 'OPTION_CUSTOMERS', NULL, 0 , 1, 127, '1', 'OPTION_CUSTOMERS');
+ insert into osc_configuration_group values (28 , 'MEMBRES_DETAIL', NULL, 0 , 1, 39, '0', 'MODMEMBRES');
+ insert into osc_configuration_group values (33 , 'BOX_CONFIGURATION_EXTRA_FIELDS', NULL, 0 , 1, 39, '0', 'MODCUSTEXTRA');
+ insert into osc_configuration_group values (40 , 'OPTION_ORDERS', NULL, 0 , 1, 127, '1', 'OPTION_ORDERS');
+ insert into osc_configuration_group values (129,'CONFIGURATION_ORDERS', NULL, 0, 1, 40, '0', 'MODORDER');
+ insert into osc_configuration_group values (7, 'EXPEDITION_EMBALLAGE', NULL, 0, 1, 40, '0', 'MODEXPEDITION');
+
-- hidden in menu configuration
insert into osc_configuration_group values (37 , 'VIEW_SYSINFO', NULL, 0 , 0, 120, '1', 'MODSYSINFO');
insert into osc_configuration_group values (38 , 'VIEW_SYSINFO', NULL, 0 , 0, 120, '1', 'MODCORECACHE');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-03 18:06:36
|
Revision: 4140
http://oscss.svn.sourceforge.net/oscss/?rev=4140&view=rev
Author: oscim
Date: 2012-04-03 18:06:26 +0000 (Tue, 03 Apr 2012)
Log Message:
-----------
Correction des pages de graph_stats , ajustement du fichier de langue, et correction du gabarit html
Ajustement css , et correction des modules de graphique
Modified Paths:
--------------
trunk/catalog/admin/includes/gabarit/graphs_stats.page.gab
trunk/catalog/admin/includes/gabarit/orders/display_view.edit.gab
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/graphs_stats.txt
trunk/catalog/admin/includes/modules/graph_stats/NewCustomers.php
trunk/catalog/admin/includes/modules/graph_stats/Sales.php
trunk/catalog/admin/includes/modules/pages/graphs_stats.php
Modified: trunk/catalog/admin/includes/gabarit/graphs_stats.page.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/graphs_stats.page.gab 2012-04-03 16:56:41 UTC (rev 4139)
+++ trunk/catalog/admin/includes/gabarit/graphs_stats.page.gab 2012-04-03 18:06:26 UTC (rev 4140)
@@ -22,9 +22,9 @@
<table class="dataTable">
<thead>
<tr>
- <?php foreach(graphs_stats::tep_get_th() as $item): ?>
- <th><?php echo $item ?></th>
- <?php endforeach; ?>
+ <?php foreach(graphs_stats::tep_get_th() as $item): ?>
+ <th><?php echo $item ?></th>
+ <?php endforeach; ?>
</tr>
</thead>
<tbody>
@@ -36,23 +36,26 @@
<div class="box_right">
<div>
<?php echo tep_draw_form('goto',FILENAME_GRAPHS_STATS, tep_get_all_get_params(array('mode_view')), 'get'); ?>
- <p>Vue <?php echo tep_draw_pull_down_menu('mode_view', graphs_stats::$mode_view, @$_GET['mode_view']); ?></p>
- <p>
- Année <?php echo tep_draw_pull_down_menu('year', $anne, (isset($_GET['year'])?$_GET['year'] :$cu)); ?>
- Jusqu'a <?php echo tep_draw_pull_down_menu('year_end', array(array('id'=>2008,'text'=>2008),array('id'=>2009,'text'=>2009),array('id'=>2010,'text'=>2010),array('id'=>2011,'text'=>2011)), (isset($_GET['year_end'])?$_GET['year_end'] :$cu)); ?>
- </p>
- <p>Année </p>
- <?php echo tep_draw_hidden_field('vue', 'vue', (isset($_GET['vue'])? $_GET['vue']: 'Sales' ) ); ?>
- <p><input type="submit" value="valider" /></p>
+ <ul>
+ <li><?php echo __('text form view') .' '. tep_draw_pull_down_menu('mode_view', graphs_stats::$mode_view, @$_GET['mode_view']); ?></li>
+ <li><?php echo __('text form base year') .' '. tep_draw_pull_down_menu('year', $anne, (isset($_GET['year'])?$_GET['year'] :$cu)); ?> <?php echo __('text form finnish year') .' '.
+ tep_draw_pull_down_menu('year_end', $anne, (isset($_GET['year_end'])?$_GET['year_end'] :$cu)); ?> </li>
+ <li> </li>
+ <li><input class="button" type="submit" value="<?php echo __('text form submit') ?>" /><?php echo tep_draw_hidden_field('vue', 'vue', (isset($_GET['vue'])? $_GET['vue']: 'Sales' ) ); ?></li>
+ <li> </li>
+ </ul>
</form>
<br />
</div>
+
<?php // vue ?>
-
- <ul>
- <?php foreach(graphs_stats::$list as $file): ?>
- <li style="float:left"><a href="<?php echo tep_href_link(FILENAME_GRAPHS_STATS, tep_get_all_get_params(array('vue')). 'vue='.$file) ?>" title="<?php echo @constant('TITLE_GRAPH_MIN_'.strtoupper($file)) ?>"><?php echo tep_image(graphs_stats::AjaxInSats( $file), '','200',''). "\n"; ?></a></li>
- <?php endforeach; ?>
- </ul>
+ <div class="box_uniq">
+ <ul>
+ <?php foreach(graphs_stats::$list as $file): ?>
+ <li style="float:left; margin:2px;"><a href="<?php echo tep_href_link(FILENAME_GRAPHS_STATS, tep_get_all_get_params(array('vue')). 'vue='.$file) ?>" title="<?php echo
+@constant('TITLE_GRAPH_MIN_'.strtoupper($file)) ?>"><?php echo tep_image(graphs_stats::AjaxInSats( $file), '','195',''). "\n"; ?></a></li>
+ <?php endforeach; ?>
+ </ul>
+ </div>
</div>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/gabarit/orders/display_view.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/orders/display_view.edit.gab 2012-04-03 16:56:41 UTC (rev 4139)
+++ trunk/catalog/admin/includes/gabarit/orders/display_view.edit.gab 2012-04-03 18:06:26 UTC (rev 4140)
@@ -246,7 +246,7 @@
</div>
-
+ <div class="box_uniq">
<table class="main-orders history padd_w">
<thead>
<tr>
@@ -269,8 +269,8 @@
<?php endif; ?>
</tbody>
</table>
+ </div>
-
<?php if( !in_array(orders::$order->info['orders_status_id'], array(DEFAULT_ORDERS_STATUS_COMPLETED, DEFAULT_ORDERS_STATUS_ANNULATE ) ) ): ?>
<?php /*if(orders::$update) :*/?>
<!-- DRAW FORM UPDATE BLOCK -->
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/pages/graphs_stats.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/pages/graphs_stats.txt 2012-04-03 16:56:41 UTC (rev 4139)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/graphs_stats.txt 2012-04-03 18:06:26 UTC (rev 4140)
@@ -9,4 +9,22 @@
@encode UTF-8
*/
$lang['heading title']="Graphiques" ;
+
+$lang['txt barre cummule']="Barres Cummulées" ;
+$lang['txt barre']="Barres" ;
+$lang['txt stackedarea']="Stackedarea" ;
+$lang['txt lines']="lines" ;
+$lang['txt linepoints']="linepoints" ;
+$lang['txt area']="area" ;
+$lang['txt points']="Points" ;
+$lang['txt pie']="Camenbert" ;
+$lang['txt squared']="Squared" ;
+
+
+$lang['text form view']="Vues" ;
+$lang['text form base year']="Années" ;
+$lang['text form finnish year']="jusqu'à" ;
+$lang['text form submit']="Generer" ;
+
+
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/modules/graph_stats/NewCustomers.php
===================================================================
--- trunk/catalog/admin/includes/modules/graph_stats/NewCustomers.php 2012-04-03 16:56:41 UTC (rev 4139)
+++ trunk/catalog/admin/includes/modules/graph_stats/NewCustomers.php 2012-04-03 18:06:26 UTC (rev 4140)
@@ -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 25/04/11, 11:07
+ @version 2.1.1
+ @date 03/04/2012, 11:07
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class NewCustomers
@@ -62,9 +62,9 @@
$amplitude=($year_end-$year);
for($ir=0; $ir<=$amplitude; $ir++ ) {
for($i=0; $i<12; $i++ ) {
- $s[(($ir*12)+$i)][0]=str_pad(($i+1), 2, "0", STR_PAD_LEFT).'-'.substr(($this->base_year+$ir),2);
- for($is=1; $is<=$this->nbr_val; $is++ )
- $s[(($ir*12)+$i)][$is]=0;
+ $s[(($ir*12)+$i)][0]=str_pad(($i+1), 2, "0", STR_PAD_LEFT).'-'.substr(($this->base_year+$ir),2);
+ for($is=1; $is<=$this->nbr_val; $is++ )
+ $s[(($ir*12)+$i)][$is]=0;
}
}
$this->value=$s;
@@ -110,16 +110,13 @@
$anne=($this->base_year==$orders['annee'])? 0 : (($orders['annee']-$this->base_year)*12);
if(isset($this->value[($anne+$mit)])) {
- if($max<=$value_sommme) $max=$value_sommme;
+ if($max<=$value_sommme) $max=$value_sommme;
- $this->value[($anne+$mit)][($orders['status']+1)]=$value_sommme;
+ $this->value[($anne+$mit)][($orders['status']+1)]=$value_sommme;
}
}
- if($max<=10)$this->base_y='5';
- elseif($max<=100)$this->base_y='25';
- elseif($max<=300)$this->base_y='50';
- elseif($max<=800)$this->base_y='10';
+ $this->base_y=((int)$max * 10);
}
/**
@@ -142,7 +139,7 @@
$DB=Database::getInstance();
$status_color = $DB->query("select customers_group_id, customers_group_name FROM ".TABLE_CUSTOMERS_GROUPS." ");
while ($sales_products = $status_color->fetchAssoc())
- $this->les_color_name[]=utf8_decode($sales_products['customers_group_name']);
+ $this->les_color_name[]=$sales_products['customers_group_name'];
$this->les_color[]=GraphUtility::html2rgb('#4086d1');
$this->les_color[]=GraphUtility::html2rgb('#ffc652');
Modified: trunk/catalog/admin/includes/modules/graph_stats/Sales.php
===================================================================
--- trunk/catalog/admin/includes/modules/graph_stats/Sales.php 2012-04-03 16:56:41 UTC (rev 4139)
+++ trunk/catalog/admin/includes/modules/graph_stats/Sales.php 2012-04-03 18:06:26 UTC (rev 4140)
@@ -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 25/04/11, 11:07
+ @version 2.1.1
+ @date 03/04/2012, 11:07
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class Sales
@@ -62,9 +62,9 @@
$amplitude=($year_end-$year);
for($ir=0; $ir<=$amplitude; $ir++ ) {
for($i=0; $i<12; $i++ ) {
- $s[(($ir*12)+$i)][0]=str_pad(($i+1), 2, "0", STR_PAD_LEFT).'-'.substr(($this->base_year+$ir),2);
- for($is=1; $is<=$this->nbr_val; $is++ )
- $s[(($ir*12)+$i)][$is]=0;
+ $s[(($ir*12)+$i)][0]=str_pad(($i+1), 2, "0", STR_PAD_LEFT).'-'.substr(($this->base_year+$ir),2);
+ for($is=1; $is<=$this->nbr_val; $is++ )
+ $s[(($ir*12)+$i)][$is]=0;
}
}
$this->value=$s;
@@ -110,21 +110,19 @@
$value_sommme=$match[1];
$mit=($orders['mois']-1);
$anne=($this->base_year==$orders['annee'])? 0 : (($orders['annee']-$this->base_year)*12);
- if($max<=$value_sommme) $max=$value_sommme;
- if(isset($this->value[($anne+$mit)])){
- if($this->value[($anne+$mit)][0]=='txt') $this->value[($anne+$mit)][0] =date("m-y",strtotime($orders['date_purchased']));
+ if($max<=$value_sommme) $max=$value_sommme;
+ if(isset($this->value[($anne+$mit)])){
+ if($this->value[($anne+$mit)][0]=='txt') $this->value[($anne+$mit)][0] =date("m-y",strtotime($orders['date_purchased']));
- if($this->value[($anne+$mit)][$orders['orders_status']]==0) $this->value[($anne+$mit)][$orders['orders_status']] =$value_sommme;
- else $this->value[($anne+$mit)][$orders['orders_status']] +=$value_sommme;
+ if($this->value[($anne+$mit)][$orders['orders_status']]==0) $this->value[($anne+$mit)][$orders['orders_status']] =$value_sommme;
+ else $this->value[($anne+$mit)][$orders['orders_status']] +=$value_sommme;
}
}
- $max=(int)$max;
- if((int)$max<=100)$this->base_y='500';
- elseif($max<=200)$this->base_y='200';
- elseif($max<=500)$this->base_y='500';
- elseif($max<=1000)$this->base_y='5000';
- elseif($max<=5000)$this->base_y='25000';
+ $max=(int)$max;
+
+ $this->base_y=((int)$max * 5);
+
}
/**
@@ -133,7 +131,10 @@
private function les_orders(){
global $languages_id;
$DB=Database::getInstance();
- $orders_query_raw = $DB->query($sql=" select EXTRACT(YEAR FROM o.date_purchased) AS annee, EXTRACT(MONTH FROM o.date_purchased) AS mois, o.date_purchased, o.last_modified, o.currency, o.currency_value, o.orders_status, s.status_name as orders_status_name, ot.text as order_total from " . TABLE_ORDERS . " o left join " . TABLE_ORDERS_TOTAL . " ot on (o.orders_id = ot.orders_id), " . TABLE_STATUS . " s where o.orders_status = s.status_id and status_type='orders' and s.language_id = '" . (int)$languages_id . "' and ot.class = 'ot_total' and o.date_purchased > '".$this->base_date."' GROUP by year(o.date_purchased), month(o.date_purchased),o.orders_status ORDER BY year(o.date_purchased) ASC, month(o.date_purchased) ASC ");
+ $orders_query_raw = $DB->query($sql=" select EXTRACT(YEAR FROM o.date_purchased) AS annee, EXTRACT(MONTH FROM o.date_purchased) AS mois, o.date_purchased, o.last_modified, o.currency,
+o.currency_value, o.orders_status, s.status_name as orders_status_name, ot.text as order_total from " . TABLE_ORDERS . " o left join " . TABLE_ORDERS_TOTAL . " ot on (o.orders_id = ot.orders_id), " .
+TABLE_STATUS . " s where o.orders_status = s.status_id and status_type='orders' AND s.status_id IN(-1,1,2,3,4,5,6,7,8,9) and s.language_id = '" . (int)$languages_id . "' and ot.class = 'ot_total' and
+o.date_purchased > '".$this->base_date."' GROUP by year(o.date_purchased), month(o.date_purchased),o.orders_status ORDER BY year(o.date_purchased) ASC, month(o.date_purchased) ASC ");
if ($orders_query_raw->__get('numRows') > 0) return $orders_query_raw;
else return false;
@@ -146,16 +147,16 @@
private function les_status(){
global $languages_id;
$DB=Database::getInstance();
- $status_color = $DB->query("select status_id as orders_status_id, status_name as orders_status_name, status_color as orders_status_color FROM ".TABLE_STATUS." where status_type='orders' and language_id = '" . (int)$languages_id . "' ");
+ $status_color = $DB->query("select status_id as orders_status_id, status_name as orders_status_name, status_color as orders_status_color FROM ".TABLE_STATUS." s where status_type='orders' AND
+s.status_id IN(-1,1,2,3,4,5,6,7,8,9) and language_id = '" . (int)$languages_id . "' ");
while ($sales_products = $status_color->fetchAssoc()) {
+ $this->les_color[]=GraphUtility::html2rgb($sales_products['orders_status_color']);
+ $this->les_color_name[]=$sales_products['orders_status_name'];
+ }
+ $this->nbr_val=count($this->les_color);
- $this->les_color[]=GraphUtility::html2rgb($sales_products['orders_status_color']);
- $this->les_color_name[]=utf8_decode($sales_products['orders_status_name']);
- }
- $this->nbr_val=count($this->les_color);
-
}
}
Modified: trunk/catalog/admin/includes/modules/pages/graphs_stats.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/graphs_stats.php 2012-04-03 16:56:41 UTC (rev 4139)
+++ trunk/catalog/admin/includes/modules/pages/graphs_stats.php 2012-04-03 18:06:26 UTC (rev 4140)
@@ -1,9 +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.0
- @date 20/04/11, 18:04
+ @version 2.1.1
+ @date 03/04/2012, 11:07
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class graphs_stats
@@ -69,9 +70,9 @@
(isset($_REQUEST['mode_view'])?'&mode_view='.$_REQUEST['mode_view']: '' ).
(isset($_REQUEST['width'])?'&width='.$_REQUEST['width'] : '' )
);
-// var_dump(JSONSTATMENT);
+
//! mode graph
- self::$mode_view[]=array('id'=>'stackedbars', 'text'=>__('txt barre cummulé') );
+ self::$mode_view[]=array('id'=>'stackedbars', 'text'=>__('txt barre cummule') );
self::$mode_view[]=array('id'=>'bars', 'text'=>__('txt barre') );
self::$mode_view[]=array('id'=>'stackedarea', 'text'=>__('txt stackedarea') );
self::$mode_view[]=array('id'=>'lines', 'text'=>__('txt lines') );
@@ -81,7 +82,6 @@
self::$mode_view[]=array('id'=>'pie', 'text'=>__('txt pie') );
self::$mode_view[]=array('id'=>'thinbarline', 'text'=>__('txt thinbarline') );
self::$mode_view[]=array('id'=>'squared', 'text'=>__('txt squared') );
- self::$mode_view[]=array('id'=>'stackedarea', 'text'=>__('txt stackedarea') );
self::loadMod(self::$Vue);
@@ -96,8 +96,7 @@
if (function_exists('imagecreate') ) {
if (is_dir(DIR_WS_IMAGES . 'graphs')) {
- if (!is_writeable(DIR_WS_IMAGES . 'graphs')) $messageStack->add(ERROR_GRAPHS_DIRECTORY_NOT_WRITEABLE, 'error');
-
+ if (!is_writeable(DIR_WS_IMAGES . 'graphs')) $messageStack->add(ERROR_GRAPHS_DIRECTORY_NOT_WRITEABLE, 'error');
}
else $messageStack->add(ERROR_GRAPHS_DIRECTORY_DOES_NOT_EXIST, 'error');
}
@@ -117,12 +116,12 @@
var ter = document.getElementById(id);
ter.innerHTML = '<p style="text-align:center"><img src="<?php echo DIR_WS_IMAGES ?>loading.gif"/></p>';
$.ajax({
- type: "GET",
- url: lib,
- data: "<?php echo tep_session_name().'='.tep_session_id() ?>&" + vars,
- success: function(msg){
- ter.innerHTML = msg;
- }
+ type: "GET",
+ url: lib,
+ data: "<?php echo tep_session_name().'='.tep_session_id() ?>&" + vars,
+ success: function(msg){
+ ter.innerHTML = msg;
+ }
});
return false;
}
@@ -133,6 +132,10 @@
});
// --></script>
+
+ <style type="text/css">
+ #stats_div{width:98.8%;}
+ </style>
<?php
}
@@ -144,10 +147,10 @@
public static function load_db_values($ID){
foreach(scan(DIR_FS_ADMIN .DIR_WS_MODULES.self::PATH_GRAPH) as $file)
- if (substr("$file", -4) == '.php') {
- $name=substr("$file",0,strlen($file)-4);
- self::$list[]=$name;
- }
+ if (substr("$file", -4) == '.php') {
+ $name=substr("$file",0,strlen($file)-4);
+ self::$list[]=$name;
+ }
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-03 16:56:51
|
Revision: 4139
http://oscss.svn.sourceforge.net/oscss/?rev=4139&view=rev
Author: oscim
Date: 2012-04-03 16:56:41 +0000 (Tue, 03 Apr 2012)
Log Message:
-----------
Deport de la function load_post_page js dans le fichier footer.php
Amelioration de la class constructeur de page, ajout d'une gestion de pile pour int?\195?\169grer des fonctions js a charger apres les chargement ajax
fix toolip pour les listing produit
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/oscss_cstr.php
trunk/catalog/admin/includes/footer.php
trunk/catalog/admin/includes/header.php
trunk/catalog/admin/includes/javascript/modules/pages/products.js.php
trunk/catalog/admin/includes/modules/pages/products.php
Modified: trunk/catalog/admin/includes/classes/oscss_cstr.php
===================================================================
--- trunk/catalog/admin/includes/classes/oscss_cstr.php 2012-04-03 15:28:15 UTC (rev 4138)
+++ trunk/catalog/admin/includes/classes/oscss_cstr.php 2012-04-03 16:56:41 UTC (rev 4139)
@@ -39,6 +39,10 @@
*/
private static $key_file_cache;
/**
+ @var list all code stocked by call back
+ */
+ protected static $_CallBack;
+ /**
@var
*/
protected static $_instance;
@@ -290,14 +294,49 @@
@brief link for online docs, in http://wiki.oscss.org/documentation/
@param $page_module nom page courante
*/
- public static function linkDocs($page_module){
- $url ="http://wiki.oscss.org/documentation/?";
- $url.="version=2.1.0&lang=fr_FR&page=".$page_module."&path=".$page_module;
- if(isset($_REQUEST['type'])) $url.="/".$_REQUEST['type'];
- if(isset($_REQUEST['action'])) $url.="&action=".$_REQUEST['action'];
- return $url;
- }
+// public static function linkDocs($page_module){
+// $url ="http://wiki.oscss.org/documentation/?";
+// $url.="version=2.1.0&lang=fr_FR&page=".$page_module."&path=".$page_module;
+// if(isset($_REQUEST['type'])) $url.="/".$_REQUEST['type'];
+// if(isset($_REQUEST['action'])) $url.="&action=".$_REQUEST['action'];
+// return $url;
+// }
+
+ /**
+ @fn oscss_cstr::CallBack($code, $pile='post_load')
+ @brief Add js put in header/footer page
+ @param $code path file or code
+ @param $mode string code / file
+ @param $pile name for current pile
+ */
+ public static function CallBack($code,$mode='code', $pile='post_load'){
+ self::$_CallBack;
+
+ if(!isset(self::$_CallBack->$pile))
+ self::$_CallBack->$pile = '';
+
+ if($mode =='code') {
+ self::$_CallBack->$pile .= addslashes($code). "\n";
+ }
+// elseif($mode =='js')
+// tep_include_file($code);
+ }
+
+ /**
+ @fn oscss_cstr::CallBackExec($pile='post_load')
+ @brief call js stocked by CallBack methode
+ @param $page_module nom page courante
+ */
+ public static function CallBackExec($pile='post_load'){
+ if(!isset(self::$_CallBack->$pile))
+ return ;
+ else
+ return stripslashes(self::$_CallBack->$pile);
+ }
+
+
+
public function debugg(){
print_r( $this);
}
Modified: trunk/catalog/admin/includes/footer.php
===================================================================
--- trunk/catalog/admin/includes/footer.php 2012-04-03 15:28:15 UTC (rev 4138)
+++ trunk/catalog/admin/includes/footer.php 2012-04-03 16:56:41 UTC (rev 4139)
@@ -9,8 +9,79 @@
*/
?>
+
+
<p>
E-Commerce Engine Copyright © 2005-<?php echo date('Y'); ?> <a href="http://www.oscss.org/">osCSS</a>
<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/header.php
===================================================================
--- trunk/catalog/admin/includes/header.php 2012-04-03 15:28:15 UTC (rev 4138)
+++ trunk/catalog/admin/includes/header.php 2012-04-03 16:56:41 UTC (rev 4139)
@@ -41,67 +41,11 @@
?>
<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;
- });
- });
-}
-
-
+ // init jquery
$(function() {
//! slider block tirroir
@@ -128,43 +72,44 @@
function fnFormatDetails ( nTr ) {
var aData = oTable.fnGetData( nTr );
- $.get("<?php echo tep_get_http().DIR_WS_ADMIN ?>ajax.php?<?php echo AJAXSTATMENTDETAIL ?>",
- { 'class': "dataTableInnerHTML",funct: "display_view", action: "detail", forceajax: "true", ID: aData[0] },
- function(data){
- $('#detail_'+aData[0] ).html(data);
- post_load_page();
- });
+ $.get("<?php echo tep_get_http().DIR_WS_ADMIN ?>ajax.php?<?php echo AJAXSTATMENTDETAIL ?>",
+ { 'class': "dataTableInnerHTML",funct: "display_view", action: "detail", forceajax: "true", ID: aData[0] },
+ function(data){
+ $('#detail_'+aData[0] ).html(data);
+ post_load_page();
+ });
}
/* Event handler function */
function fnOpenClose ( oSettings ) {
- $('td img.imgDetail', oTable.fnGetNodes() ).each( function () {
- $(this).click( function () {
- var nTr = this.parentNode.parentNode;
- if ( this.src.match('details_close') )
- {
- /* This row is already open - close it */
- this.src = "<?php echo tep_get_http().DIR_WS_ADMIN.DIR_WS_ICONS ?>details_open.png";
- /* fnClose doesn't do anything for server-side processing - do it ourselves :-) */
- var nRemove = $(nTr).next()[0];
- nRemove.parentNode.removeChild( nRemove );
- }
- else {
- var aData = oTable.fnGetData( nTr );
- /* Open this row */
- this.src = "<?php echo tep_get_http().DIR_WS_ADMIN.DIR_WS_ICONS ?>details_close.png";
- var res = '<table id="detail_'+aData[0] +'" cellpadding="5" cellspacing="0" border="0" style="padding:0 1em; width:100%;">' + '</table>';
+ $('td img.imgDetail', oTable.fnGetNodes() ).each( function () {
+ $(this).click( function () {
+ var nTr = this.parentNode.parentNode;
+ if ( this.src.match('details_close') )
+ {
+ /* This row is already open - close it */
+ this.src = "<?php echo tep_get_http().DIR_WS_ADMIN.DIR_WS_ICONS ?>details_open.png";
+ /* fnClose doesn't do anything for server-side processing - do it ourselves :-) */
+ var nRemove = $(nTr).next()[0];
+ nRemove.parentNode.removeChild( nRemove );
+ }
+ else {
+ var aData = oTable.fnGetData( nTr );
+ /* Open this row */
+ this.src = "<?php echo tep_get_http().DIR_WS_ADMIN.DIR_WS_ICONS ?>details_close.png";
+ var res = '<table id="detail_'+aData[0] +'" cellpadding="5" cellspacing="0" border="0" style="padding:0 1em; width:100%;">' + '</table>';
- oTable.fnOpen( nTr, res , 'details' );
- fnFormatDetails(nTr);
- }
- });
- });
+ oTable.fnOpen( nTr, res , 'details' );
+ fnFormatDetails(nTr);
+ }
+ });
+ });
- post_load_page();
+ post_load_page();
}
-
<?php endif; ?>
+
+
TableToolsInit.sSwfPath="<?php echo DIR_WS_JS ?>media/swf/ZeroClipboard.swf";
/* Build the DataTable with third column using our custom sort functions */
Modified: trunk/catalog/admin/includes/javascript/modules/pages/products.js.php
===================================================================
--- trunk/catalog/admin/includes/javascript/modules/pages/products.js.php 2012-04-03 15:28:15 UTC (rev 4138)
+++ trunk/catalog/admin/includes/javascript/modules/pages/products.js.php 2012-04-03 16:56:41 UTC (rev 4139)
@@ -8,6 +8,9 @@
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
+
+/// put js listing post_load
+oscss_cstr::CallBack('screenshotPreview();');
?>
<script type="text/javascript"><!--
@@ -28,9 +31,39 @@
}
+// function Toolip(){
+ /// ScreenShot product in hover link products
+ this.screenshotPreview = function(){
+ /* CONFIG */
+ xOffset = 10;
+ yOffset = 30;
+ // these 2 variable determine popup's distance from the cursor
+ // you might want to adjust to get the right result
+ /* END CONFIG */
+ $("a.screenshot").hover(function(e){
+ this.t = this.title;
+ this.title = "";
+ var c = (this.t != "") ? "<br/>" + this.t : "";
+ $("body").append("<p id='screenshot'><img src='"+ this.rel +"' alt='url preview' />"+ c +"</p>");
+ $("#screenshot")
+ .css("top",(e.pageY - xOffset) + "px")
+ .css("left",(e.pageX + yOffset) + "px")
+ .fadeIn("fast");
+ },
+ function(){
+ this.title = this.t;
+ $("#screenshot").remove();
+ });
+ $("a.screenshot").mousemove(function(e){
+ $("#screenshot")
+ .css("top",(e.pageY - xOffset) + "px")
+ .css("left",(e.pageX + yOffset) + "px");
+ });
+ };
+// }
@@ -175,4 +208,20 @@
//--></script>
- <?php endif; ?>
\ No newline at end of file
+ <?php endif; ?>
+
+
+
+ <style type="text/css">
+ /* */
+
+ #screenshot{
+ position:absolute;
+ border:1px solid #ccc;
+ background:#333;
+ padding:5px;
+ display:none;
+ color:#fff;
+ }
+
+ </style>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/modules/pages/products.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/products.php 2012-04-03 15:28:15 UTC (rev 4138)
+++ trunk/catalog/admin/includes/modules/pages/products.php 2012-04-03 16:56:41 UTC (rev 4139)
@@ -324,6 +324,8 @@
//! Entretient liens avec categorie
sqlproduct::Maintenance();
+
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-03 15:28:26
|
Revision: 4138
http://oscss.svn.sourceforge.net/oscss/?rev=4138&view=rev
Author: oscim
Date: 2012-04-03 15:28:15 +0000 (Tue, 03 Apr 2012)
Log Message:
-----------
correction coquille cache , erreur de liens
Ajout fichier manquant lors de la creation de categorie rapide
Modified Paths:
--------------
trunk/catalog/admin/includes/boxes/04_tools.php
Added Paths:
-----------
trunk/catalog/admin/includes/gabarit/categories/display_view.new_light.gab
Modified: trunk/catalog/admin/includes/boxes/04_tools.php
===================================================================
--- trunk/catalog/admin/includes/boxes/04_tools.php 2012-04-03 13:55:14 UTC (rev 4137)
+++ trunk/catalog/admin/includes/boxes/04_tools.php 2012-04-03 15:28:15 UTC (rev 4138)
@@ -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 28/12/11, 22:06
+ @date 03/04/2012, 22:06
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -26,7 +26,7 @@
$tabl_link[608]= array('ss_menu', 'BOX_TOOLS_SYSTEM', 'system',@$img['system']);
$tabl_link[608][4][]= array(FILENAME_BACKUP, 'BOX_TOOLS_BACKUP', 'database',@$img['database']);
- $tabl_link[608][4][]= array(FILENAME_CONFIGURATION.'?gmod=modcoreache', 'BOX_TOOLS_CACHE', 'cache');
+ $tabl_link[608][4][]= array(FILENAME_CONFIGURATION.'?gmod=modcorecache', 'BOX_TOOLS_CACHE', 'cache');
$tabl_link[608][4][]= array(FILENAME_CONFIGURATION.'?gmod=modsysinfo', 'BOX_TOOLS_SERVER_INFO', 'server_info');
$tabl_link[608][4][]= array(FILENAME_CURRENCIES, 'BOX_LOCALIZATION_CURRENCIES', 'currencies');
$tabl_link[608][4][]= array(FILENAME_CRONJOB, 'BOX_TOOLS_CRONJOB', 'database',@$img['database']);
Added: trunk/catalog/admin/includes/gabarit/categories/display_view.new_light.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/categories/display_view.new_light.gab (rev 0)
+++ trunk/catalog/admin/includes/gabarit/categories/display_view.new_light.gab 2012-04-03 15:28:15 UTC (rev 4138)
@@ -0,0 +1,90 @@
+<?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 30/03/2012, 09:32
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+global $oscss;
+
+$DT = DataTypes::getInstance();
+
+?>
+
+ <h3><?php echo __('text info heading edit category'); ?></h3>
+
+ <div class="box_uniq block_form">
+ <?php echo tep_draw_form('categories', categories::FILENAME, 'action=insert&cPath=' . categories::$cPath, 'post') ?>
+
+
+<!-- <p class="block_input"> -->
+
+ <div class="tabs_lang">
+ <ul>
+ <?php for ($i=0, $n=sizeof(categories::$languages); $i<$n; $i++) { ?>
+ <li><a href="#fieldset_<?php echo $i ?>"><?php echo tep_language_image( categories::$languages[$i]['directory'] . '/images/' . categories::$languages[$i]['image'], categories::$languages[$i]['name']); ?></a></li>
+
+ <?php } ?>
+ </ul>
+ <?php for ($i=0, $n=sizeof(categories::$languages); $i<$n; $i++) { ?>
+ <fieldset id="fieldset_<?php echo $i ?>">
+ <legend><?php echo tep_image(DIR_WS_CATALOG_LANGUAGES . categories::$languages[$i]['directory'] . '/images/' . categories::$languages[$i]['image'], categories::$languages[$i]['name'], TEMP_BO_HEADING_IMAGE_WIDTH, TEMP_BO_HEADING_IMAGE_HEIGHT); ?></legend>
+ <p class="block_input" style="width:90%;">
+ <label for="<?php echo 'content_title' . categories::$languages[$i]['id']; ?>"><?php echo __('text edit categories name'); ?></label>
+ <?php echo tep_draw_input_field('categories_name[' . categories::$languages[$i]['id'] . ']', '', categories::$cInfo->categories_name[categories::$languages[$i]['id']]) ; ?>
+ </p>
+ </fieldset>
+ <?php } ?>
+ </div>
+
+
+
+
+ <div>
+
+
+ <?php echo tep_draw_hidden_field('categories_datatype','', @$_GET['datatype']).
+tep_draw_hidden_field('categories_status','', categories::$cInfo->categories_status).
+tep_draw_hidden_field('categories_hidden','', categories::$cInfo->categories_hidden).
+tep_draw_hidden_field('origin', '',@$_GET['origin']);
+// tep_draw_hidden_field();
+ ?>
+
+
+ </div>
+
+
+
+ <div class="edit box_right fleft ">
+ <dl>
+
+ <dd class="block_input w_90 CategoryView ">
+ <label for="products_date_available"><?php echo __('txt categories'); ?></label>
+ <ul id="cat_list_in_edit" class="ChooseSelect">
+ <li class="<?php echo (((int)categories::$cInfo->parent_id == '0')? 'selected' : 'noselected') ?>"><?php echo tep_draw_radio_field('cPath','cat_0', '0', ((int)categories::$cInfo->parent_id == '0') ).' '.__('text categorie racine') ?></li>
+ <?php foreach(categorieUtility::get_cat_list(array('root'=>0,'incre'=>false, 'datatype'=>categories::$cInfo->categories_datatype)) as $v)
+ if(categories::$cInfo->categories_id != $v['categories_id']){
+ $etat = ((categories::$cInfo->parent_id > 0 && categories::$cInfo->parent_id == $v['categories_id']) ? true :false );
+ echo '<li class="'.(($etat)? 'selected' : 'noselected').'">'.
+ tep_decal(($v['niveau']+1)).
+ ' '. tep_draw_radio_field('cPath','cat_'.$v['categories_id'], (string)$v['categories_id'],(bool)$etat).
+ ' '.$v['categories_name'].
+ '</li>';
+ } ?>
+ </ul>
+ </dd>
+
+ <dt class="button_nav block_input" style="width:95%;">
+ <?php
+ echo tep_image_submit('', __('image add cat and edit')) . tep_image_submit('', IMAGE_UPDATE_AND_CLOSE,' name="up_and_close"' );
+ echo tep_js_back(tep_href_link(categories::FILENAME, 'cPath=' . categories::$cPath . (isset($_GET['cID']) ? '&cID=' . $_GET['cID'] : '') ), IMAGE_CANCEL) ;
+ ?>
+ </dt>
+ </dl>
+ </div>
+
+ </form>
+ </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-03 13:55:23
|
Revision: 4137
http://oscss.svn.sourceforge.net/oscss/?rev=4137&view=rev
Author: oscim
Date: 2012-04-03 13:55:14 +0000 (Tue, 03 Apr 2012)
Log Message:
-----------
correction, diverse suite modification des tables
Modified Paths:
--------------
trunk/extensions/ATTRIBUTEMANAGER_stable/attributeManager/classes/attributeManager.class.php
trunk/extensions/ATTRIBUTEMANAGER_stable/attributeManager/classes/attributeManagerConfig.class.php
trunk/extensions/ATTRIBUTEMANAGER_stable/attributeManager/includes/attributeManagerGeneralFunctions.inc.php
Modified: trunk/extensions/ATTRIBUTEMANAGER_stable/attributeManager/classes/attributeManager.class.php
===================================================================
--- trunk/extensions/ATTRIBUTEMANAGER_stable/attributeManager/classes/attributeManager.class.php 2012-04-03 13:54:32 UTC (rev 4136)
+++ trunk/extensions/ATTRIBUTEMANAGER_stable/attributeManager/classes/attributeManager.class.php 2012-04-03 13:55:14 UTC (rev 4137)
@@ -4,7 +4,7 @@
Copyright @ 2006 Kangaroo Partners http://kangaroopartners.com os...@ka...
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 30/01/2012, 20:36
+ @date 11/03/2012, 20:36
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class attributeManager
@@ -26,51 +26,51 @@
* Holds all of the options in the database
* @access private
*/
- var $arrAllOptions = array();
+ public $arrAllOptions = array();
/**
* Holds all of the option values in the database
* @access private
*/
- var $arrAllOptionValues = array();
+ public $arrAllOptionValues = array();
/**
* Holds all of the options and their values where they are releated to each other
* @access private
*/
- var $arrAllOptionsAndValues = array();
+ public $arrAllOptionsAndValues = array();
/**
* Holds all of the current products options and option values
* @access protected
*/
- var $arrAllProductOptionsAndValues = array();
+ public $arrAllProductOptionsAndValues = array();
/**
* Currently selected language id
* @todo make multilingual
* @access private
*/
- var $intLanguageId;
+ public $intLanguageId;
/**
* Page actions
* @var $arrPageActions Array
* @access private
*/
- var $arrPageActions = array();
+ public $arrPageActions = array();
/**
* All templates
* @var $arrAllTemplatesAndAttributes Array
*/
- var $arrAllTemplatesAndAttributes = array();
+ public $arrAllTemplatesAndAttributes = array();
/**
* Type product
* @var $TypeProduct int
*/
- var $TypeProduct ;
+ public $TypeProduct ;
/**
* __construct()-
* Sets up page actions and sets the interface language
@@ -335,7 +335,8 @@
'language_id' => amDB::input($langId),
'products_options_values_name' => amDB::input($name)
);
-
+print_r($optionValues);
+exit;
amDB::perform(TABLE_PRODUCTS_OPTIONS_VALUES,$ovData);
}
Modified: trunk/extensions/ATTRIBUTEMANAGER_stable/attributeManager/classes/attributeManagerConfig.class.php
===================================================================
--- trunk/extensions/ATTRIBUTEMANAGER_stable/attributeManager/classes/attributeManagerConfig.class.php 2012-04-03 13:54:32 UTC (rev 4136)
+++ trunk/extensions/ATTRIBUTEMANAGER_stable/attributeManager/classes/attributeManagerConfig.class.php 2012-04-03 13:55:14 UTC (rev 4137)
@@ -2,8 +2,8 @@
/**
@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 01/11/11, 09:50
+ @version 2.0.9
+ @date 23/05/10, 01:00
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
Copyright @ 2006 Kangaroo Partners
@@ -17,7 +17,7 @@
if(file_exists('attributeManager/languages/'.$_SESSION['language'].'/attributeManager.php'))
include_once('attributeManager/languages/'.$_SESSION['language'].'/attributeManager.php');
else
- include_once('attributeManager/languages/'.'en_EN'.'/attributeManager.php');
+ include_once('attributeManager/languages/'.'english'.'/attributeManager.php');
class attributeManagerConfig {
@@ -70,8 +70,8 @@
/**
* Template Table names
*/
- $this->add('AM_TABLE_TEMPLATES',TABLE_PRODUCTS_AM_TEMPLATES);
- $this->add('AM_TABLE_ATTRIBUTES_TO_TEMPLATES',TABLE_PRODUCTS_AM_ATTRIBUTES_TO_TEMPLATES);
+ $this->add('AM_TABLE_TEMPLATES',DB_TABLE_PREFIX . 'products_am_templates');
+ $this->add('AM_TABLE_ATTRIBUTES_TO_TEMPLATES',DB_TABLE_PREFIX . 'products_am_attributes_to_templates');
$this->add('AM_USE_SORT_ORDER' , true);
$this->add('AM_USE_QT_PRO' , true);
Modified: trunk/extensions/ATTRIBUTEMANAGER_stable/attributeManager/includes/attributeManagerGeneralFunctions.inc.php
===================================================================
--- trunk/extensions/ATTRIBUTEMANAGER_stable/attributeManager/includes/attributeManagerGeneralFunctions.inc.php 2012-04-03 13:54:32 UTC (rev 4136)
+++ trunk/extensions/ATTRIBUTEMANAGER_stable/attributeManager/includes/attributeManagerGeneralFunctions.inc.php 2012-04-03 13:55:14 UTC (rev 4137)
@@ -16,19 +16,15 @@
return tep_draw_pull_down_menu(
"prefix",
array(
- array('id'=>'','text'=>'nc'),
- array('id'=>urlencode('='),'text'=>' = '),
- array('id'=>urlencode('x'),'text'=>' x '),
- array('id'=>urlencode('/'),'text'=>' / '),
- array('id'=>urlencode('+'),'text'=>' + '),
- array('id'=>urlencode('-'),'text'=>' - ')
+ array('id'=>'','text'=>''),
+ array('id'=>urlencode('+'),'text'=>' + '),
+ array('id'=>'-','text'=>' - ')
),
($selected == '+') ? urlencode('+') : $selected,
$params
);
}
-
function amGetAttributeManagerInstance($get) {
if (!is_numeric($get['products_id']) || AM_ATOMIC_PRODUCT_UPDATES) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-03 13:54:43
|
Revision: 4136
http://oscss.svn.sourceforge.net/oscss/?rev=4136&view=rev
Author: oscim
Date: 2012-04-03 13:54:32 +0000 (Tue, 03 Apr 2012)
Log Message:
-----------
integration var configuration Stock Active/inactive
Modified Paths:
--------------
trunk/extensions/ATTRIBUTEMANAGER_stable/attributeManager/attributeManager.php
Modified: trunk/extensions/ATTRIBUTEMANAGER_stable/attributeManager/attributeManager.php
===================================================================
--- trunk/extensions/ATTRIBUTEMANAGER_stable/attributeManager/attributeManager.php 2012-04-03 13:53:59 UTC (rev 4135)
+++ trunk/extensions/ATTRIBUTEMANAGER_stable/attributeManager/attributeManager.php 2012-04-03 13:54:32 UTC (rev 4136)
@@ -196,9 +196,11 @@
</td>
<td>
- <?php echo "Suivi stock: ".(($optionInfo['stock']==1)?tep_image(DIR_WS_ICONS . 'icon_status_green.gif', IMAGE_ICON_STATUS_GREEN) : tep_image(DIR_WS_ICONS . 'icon_status_red.gif', IMAGE_ICON_STATUS_RED)).
- " - Champs de type:".translate_type_to_name($optionInfo['type']).
- (($optionInfo['type']==4)? ' - longueur max:'.$optionInfo['length']: '') ;?>
+ <?php if(_cst_bool('STOCK_CHECK') )
+ echo __('am track stock'). " : ".(($optionInfo['stock']==1)?tep_image(DIR_WS_ICONS . 'icon_status_green.gif', IMAGE_ICON_STATUS_GREEN) : tep_image(DIR_WS_ICONS . 'icon_status_red.gif', IMAGE_ICON_STATUS_RED)) .' - ';
+
+ echo __('am champs de type')." :".translate_type_to_name($optionInfo['type']).
+ (($optionInfo['type']==4)? ' - '.__('am champs longueur max').' : '.$optionInfo['length']: '') ;?>
</td>
<td align="right">
@@ -354,7 +356,7 @@
<?php
-if (AM_USE_QT_PRO && products::CheckClassProduct('CLASS_STOCK', $TypeProduct)) {
+if (_cst_bool('STOCK_CHECK') && AM_USE_QT_PRO && products::CheckClassProduct('CLASS_STOCK', $TypeProduct)) {
if(!isset($_GET['target']) || 'currentProductStockValues' == $_GET['target']) {
if(!isset($_GET['target']))
echo '<div id="currentProductStockValues">';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-03 13:54:09
|
Revision: 4135
http://oscss.svn.sourceforge.net/oscss/?rev=4135&view=rev
Author: oscim
Date: 2012-04-03 13:53:59 +0000 (Tue, 03 Apr 2012)
Log Message:
-----------
Suite correction upgrade tools
Modified Paths:
--------------
trunk/catalog/Documents/admin/data/repository_sources.xml
trunk/catalog/admin/includes/boxes/00_hidden.php
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_cip.sql
Added Paths:
-----------
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_admin_cip_modfiles.sql
Modified: trunk/catalog/Documents/admin/data/repository_sources.xml
===================================================================
--- trunk/catalog/Documents/admin/data/repository_sources.xml 2012-04-03 13:24:08 UTC (rev 4134)
+++ trunk/catalog/Documents/admin/data/repository_sources.xml 2012-04-03 13:53:59 UTC (rev 4135)
@@ -5,10 +5,10 @@
<title>Official</title>
<key>official</key>
<description>official repository</description>
- <repository>http://plugins.oscss.org/services.php</repository>
+ <repository>http://pluginsv2.oscss.org/services.php</repository>
<ident>
- <user></user>
- <token></token>
+ <user>3</user>
+ <token>535bb3a85ff52c66ef19f6a6ca29bfb78665d5c2</token>
</ident>
<service>
<listing>listing_package</listing>
@@ -17,8 +17,22 @@
</service>
</channel>
+ <channel>
+ <title>Oscim</title>
+ <key>oscim</key>
+ <description>Oscim repository</description>
+ <repository>http://exts.oscim.org/services.php</repository>
+ <ident>
+ <user>3</user>
+ <token>535bb3a85ff52c66ef19f6a6ca29bfb78665d5c2</token>
+ </ident>
+ <service>
+ <listing>listing_package</listing>
+ <view>detail_package</view>
+ <download>download_package</download>
+ </service>
+ </channel>
-
<channel>
<title>Local</title>
<key>local</key>
Modified: trunk/catalog/admin/includes/boxes/00_hidden.php
===================================================================
--- trunk/catalog/admin/includes/boxes/00_hidden.php 2012-04-03 13:24:08 UTC (rev 4134)
+++ trunk/catalog/admin/includes/boxes/00_hidden.php 2012-04-03 13:53:59 UTC (rev 4135)
@@ -1,40 +1,44 @@
-<?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 24/03/11, 20:39
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-
-// element core
- $tabl_link[]= array(FILENAME_GRAPHS_STATS, '', '');
- $tabl_link[]= array('ajax.php', '', '');
- $tabl_link[]= array('qtprodoctor.php', '', '');
- $tabl_link[]= array('sitemonitor.php', '', '');
- $tabl_link[]= array('stock.php', '', '');
- $tabl_link[]= array('sitemaps.php', '', '');
- $tabl_link[]= array('aca_portfolio.php', '', '');
- $tabl_link[]= array('sales_stats.php', '', '');
- $tabl_link[]= array('aca.php', '', '');
- $tabl_link[]= array(FILENAME_MAIL, '', '');
- $tabl_link[]= array('rss.php', '', '');
- $tabl_link[]= array(FILENAME_PACKAGE, '', '');
- $tabl_link[]= array(FILENAME_ADMIN_MEMBERS, '', '');
- $tabl_link[]= array('document.php', '', '');
-
-/* tinybroswer */
- $tabl_link[]= array('editeur/tiny_mce/plugins/tinybrowser/tinybrowser.php', '', '');
- $tabl_link[]= array('tinybrowser.php', '', '');
- $tabl_link[]= array('upload.php', '', '');
- $tabl_link[]= array('upload_process.php', '', '');
- $tabl_link[]= array('upload_file.php', '', '');
-
-/**
- NOTE: Ne placer dans ce fichier que les liens qui ne doivent pas apparaitre dans le menu, mais qui doivent être idexe dans l agestion des acls.
-*/
-
-
+<?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 24/03/11, 20:39
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+// element core
+ $tabl_link[]= array(FILENAME_GRAPHS_STATS, '', '');
+ $tabl_link[]= array('ajax.php', '', '');
+ $tabl_link[]= array('qtprodoctor.php', '', '');
+ $tabl_link[]= array('sitemonitor.php', '', '');
+ $tabl_link[]= array('stock.php', '', '');
+ $tabl_link[]= array('sitemaps.php', '', '');
+ $tabl_link[]= array('aca_portfolio.php', '', '');
+ $tabl_link[]= array('sales_stats.php', '', '');
+ $tabl_link[]= array('aca.php', '', '');
+ $tabl_link[]= array(FILENAME_MAIL, '', '');
+ $tabl_link[]= array('rss.php', '', '');
+ $tabl_link[]= array(FILENAME_PACKAGE, '', '');
+ $tabl_link[]= array(FILENAME_ADMIN_MEMBERS, '', '');
+ $tabl_link[]= array('document.php', '', '');
+
+/* tinybroswer */
+ $tabl_link[]= array('editeur/tiny_mce/plugins/tinybrowser/tinybrowser.php', '', '');
+ $tabl_link[]= array('tinybrowser.php', '', '');
+ $tabl_link[]= array('upload.php', '', '');
+ $tabl_link[]= array('upload_process.php', '', '');
+ $tabl_link[]= array('upload_file.php', '', '');
+
+/**
+ NOTE: Ne placer dans ce fichier que les liens qui ne doivent pas apparaitre dans le menu, mais qui doivent être idexe dans l agestion des acls.
+*/
+
+
+
+/* Begin ATTRIBUTEMANAGER_stable - installed by CIP */
+$tabl_link[]= array('attributeManager.php', '', '');
+/* End ATTRIBUTEMANAGER_stable - installed by CIP */
?>
\ No newline at end of file
Added: trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_admin_cip_modfiles.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_admin_cip_modfiles.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_admin_cip_modfiles.sql 2012-04-03 13:53:59 UTC (rev 4135)
@@ -0,0 +1,26 @@
+--+######################################################################--+
+--| 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/ |
+--+######################################################################--+
+
+
+
+CREATE TABLE IF NOT EXISTS osc_admin_cip_modfiles (
+ rowid int(11) NOT NULL AUTO_INCREMENT,
+ k_cip_id int(11) NOT NULL,
+ cip_filename varchar(64) NOT NULL,
+ cip_folder varchar(255) NOT NULL COMMENT 'relative catalog path',
+ cip_type varchar(16) NOT NULL COMMENT 'module, drivers , plugin ',
+ cip_typetype varchar(16) NOT NULL COMMENT 'module type, driver type..',
+ core int(1) NOT NULL COMMENT '0 Frontend / 1 Backend',
+ cip_install varchar(2) NOT NULL COMMENT 'process in install',
+ PRIMARY KEY (rowid)
+) CHARSET=utf8 ;
\ No newline at end of file
Modified: trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_cip.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_cip.sql 2012-04-03 13:24:08 UTC (rev 4134)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_cip.sql 2012-04-03 13:53:59 UTC (rev 4135)
@@ -12,4 +12,8 @@
--+######################################################################--+
-RENAME TABLE osc_cip TO osc_admin_cip;
\ No newline at end of file
+RENAME TABLE osc_cip TO osc_admin_cip;
+
+ALTER TABLE osc_admin_cip ADD cip_checksum varchar(32) NOT NULL AFTER cip_id;
+
+ALTER TABLE osc_admin_cip ADD cip_level varchar(10) NOT NULL COMMENT 'test, unstable, stable';
\ 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-03 13:24:18
|
Revision: 4134
http://oscss.svn.sourceforge.net/oscss/?rev=4134&view=rev
Author: oscim
Date: 2012-04-03 13:24:08 +0000 (Tue, 03 Apr 2012)
Log Message:
-----------
Suite correction upgrade tools
Added Paths:
-----------
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_extra_fields.sql
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_labels.sql
Added: trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_extra_fields.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_extra_fields.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_extra_fields.sql 2012-04-03 13:24:08 UTC (rev 4134)
@@ -0,0 +1,19 @@
+--+######################################################################--+
+--| 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/ |
+--+######################################################################--+
+
+
+
+ALTER TABLE osc_extra_fields ADD fields_key varchar(100) NOT NULL COMMENT 'key de config pour plus de souplesse';
+ALTER TABLE osc_extra_fields ADD fields_admin int(1) NOT NULL COMMENT 'perament(0) dispo uniquement admin (1) permanent hidden(2)';
+ALTER TABLE osc_extra_fields ADD fields_special_mod varchar(100) NOT NULL COMMENT 'flag module proprietaire';
+ALTER TABLE osc_extra_fields ADD fields_group_class varchar(100) NOT NULL;
\ No newline at end of file
Added: 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 (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_extra_fields_info.sql 2012-04-03 13:24:08 UTC (rev 4134)
@@ -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/ |
+--+######################################################################--+
+
+
+
+DROP TABLE osc_extra_fields_info;
\ No newline at end of file
Added: trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_extra_fields_labels.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_extra_fields_labels.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_extra_fields_labels.sql 2012-04-03 13:24:08 UTC (rev 4134)
@@ -0,0 +1,23 @@
+--+######################################################################--+
+--| 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/ |
+--+######################################################################--+
+
+RENAME TABLE osc_extra_field_labels TO osc_extra_fields_labels;
+
+ALTER TABLE osc_extra_fields_labels CHANGE epf_id fields_id INTEGER(11);
+ALTER TABLE osc_extra_fields_labels CHANGE epf_label fields_name VARCHAR(64);
+
+ALTER TABLE osc_extra_fields_labels ADD fields_format varchar(64) NOT NULL;
+ALTER TABLE osc_extra_fields_labels ADD fields_unity_type_id int(11) NOT NULL;
+ALTER TABLE osc_extra_fields_labels ADD fields_unity_id int(11) NOT NULL;
+
+ALTER TABLE osc_extra_fields_labels DROP epf_active_for_language;
\ 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-03 12:58:54
|
Revision: 4133
http://oscss.svn.sourceforge.net/oscss/?rev=4133&view=rev
Author: oscim
Date: 2012-04-03 12:58:47 +0000 (Tue, 03 Apr 2012)
Log Message:
-----------
Suite correction upgrade tools
Modified Paths:
--------------
trunk/catalog/admin/includes/languages/fr_FR/boxes/01_configuration.php
trunk/catalog/includes/classes/core_page/develop.php
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/data/40_osc_categories.sql
Added Paths:
-----------
trunk/catalog/install/includes/sql/mysql/upgrade/2.0.9_2.1.0/tables/osc_products_extra_fields.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_products_extra_fields.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_products_extra_fields_labels.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_products_to_products_extra_fields.sql
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-03 11:36:21 UTC (rev 4132)
+++ trunk/catalog/admin/includes/languages/fr_FR/boxes/01_configuration.php 2012-04-03 12:58:47 UTC (rev 4133)
@@ -67,4 +67,6 @@
define('BOX_HEADING_CONF_CONFIG_PRODUCTS',"Configuration des produits" );
define('BOX_HEADING_CONF_DOWNLOADS',"Téléchargements" );
define('BOX_HEADING_CONF_BOX_CONFIGURATION_PRODUCTS_EXTRA_FIELDS',"Produits extra" );
+
+define('BOX_HEADING_CONF_VIEW_SYSINFO',"info. systeme" );
?>
\ No newline at end of file
Modified: trunk/catalog/includes/classes/core_page/develop.php
===================================================================
--- trunk/catalog/includes/classes/core_page/develop.php 2012-04-03 11:36:21 UTC (rev 4132)
+++ trunk/catalog/includes/classes/core_page/develop.php 2012-04-03 12:58:47 UTC (rev 4133)
@@ -244,6 +244,7 @@
}
#DevContent{clear:both;display:block;position:relative;width:100%;min-height:250px;height:100%;overflow:auto;}
#view-box .DevBar {width:100%; height:25px; text-align:center; background:black; color:white;}
+ #view-box .DevBar ul {margin:0;}
#view-box .DevBar ul *{display:inline-block;}
#view-box #DevTopbar a{text-align:right; font-size:20px; color:white; float: right;padding:2px 5px;}
#view-box #DevTopbar a:hover {color:gray;}
Added: trunk/catalog/install/includes/sql/mysql/upgrade/2.0.9_2.1.0/tables/osc_products_extra_fields.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.0.9_2.1.0/tables/osc_products_extra_fields.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.0.9_2.1.0/tables/osc_products_extra_fields.sql 2012-04-03 12:58:47 UTC (rev 4133)
@@ -0,0 +1,18 @@
+--+######################################################################--+
+--| 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/ |
+--+######################################################################--+
+
+
+
+ALTER TABLE osc_products_extra_fields ADD epf_key varchar(40) default NULL COMMENT 'key de config pour plus de souplesse' AFTER epf_show_parent_chain;
+ALTER TABLE osc_products_extra_fields ADD epf_admin int(1) NOT NULL default '1' COMMENT 'dispo uniquement admin' AFTER epf_key;
+ALTER TABLE osc_products_extra_fields ADD epf_special_mod varchar(30) default NULL COMMENT 'flag module proprietaire' AFTER epf_admin;
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-03 11:36:21 UTC (rev 4132)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/data/40_osc_categories.sql 2012-04-03 12:58:47 UTC (rev 4133)
@@ -15,4 +15,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' ;
\ No newline at end of file
+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
Added: trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_products_extra_fields.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_products_extra_fields.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_products_extra_fields.sql 2012-04-03 12:58:47 UTC (rev 4133)
@@ -0,0 +1,17 @@
+--+######################################################################--+
+--| 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/ |
+--+######################################################################--+
+
+
+ALTER TABLE osc_products_extra_fields ADD epf_input_type tinyint(1) NOT NULL DEFAULT '0' AFTER epf_order;
+ALTER TABLE osc_products_extra_fields ADD epf_active_value_language tinyint(1) NOT NULL DEFAULT '0' AFTER epf_show_parent_chain;
+
Added: trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_products_extra_fields_labels.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_products_extra_fields_labels.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_products_extra_fields_labels.sql 2012-04-03 12:58:47 UTC (rev 4133)
@@ -0,0 +1,18 @@
+--+######################################################################--+
+--| 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/ |
+--+######################################################################--+
+
+
+ALTER TABLE osc_products_extra_fields_labels ADD epf_format varchar(64) NOT NULL AFTER epf_label_help;
+ALTER TABLE osc_products_extra_fields_labels ADD epf_unity_type_id int(11) NOT NULL AFTER epf_format;
+ALTER TABLE osc_products_extra_fields_labels ADD epf_unity_id int(11) NOT NULL AFTER epf_unity_type_id;
+
Added: trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_products_to_products_extra_fields.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_products_to_products_extra_fields.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_products_to_products_extra_fields.sql 2012-04-03 12:58:47 UTC (rev 4133)
@@ -0,0 +1,23 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2011 The osCSS developers |
+--| |
+--| http://www.oscss.org |
+--| Portions Copyright (c) 2003 osCommerce |
+--+######################################################################--+
+--| This source file is subject to version 2.0 of the GPL license, |
+--| available at the following url: |
+--| http://www.oscss.org/ |
+--+######################################################################--+
+
+
+
+
+CREATE TABLE IF NOT EXISTS osc_products_to_products_extra_fields (
+ products_id int(11) NOT NULL DEFAULT '0',
+ products_extra_fields_id int(11) NOT NULL DEFAULT '0',
+ languages_id int(11) NOT NULL DEFAULT '0' COMMENT 'not use external key in table languages',
+ products_extra_fields_value text,
+ PRIMARY KEY (products_id,products_extra_fields_id)
+) ENGINE=MyISAM DEFAULT 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-03 11:36:32
|
Revision: 4132
http://oscss.svn.sourceforge.net/oscss/?rev=4132&view=rev
Author: oscim
Date: 2012-04-03 11:36:21 +0000 (Tue, 03 Apr 2012)
Log Message:
-----------
obsolete
Removed Paths:
-------------
trunk/catalog/install/includes/upgrade/2.1.0-2.1.1.sql
Deleted: trunk/catalog/install/includes/upgrade/2.1.0-2.1.1.sql
===================================================================
--- trunk/catalog/install/includes/upgrade/2.1.0-2.1.1.sql 2012-04-03 11:34:37 UTC (rev 4131)
+++ trunk/catalog/install/includes/upgrade/2.1.0-2.1.1.sql 2012-04-03 11:36:21 UTC (rev 4132)
@@ -1,93 +0,0 @@
-#+###################################-+
-#| osCSS Open Source E-commerce |
-#+###################################-+
-#| Copyright (c) 2005-2010 The osCSS developers |
-#| |
-#| http://www.oscss.org |
-#| http://www.oscim.net |
-#| Portions Copyright (c) 2003 osCommerce |
-#+###################################-+
-#| This source file is subject to version 2.0 of the GPL license, |
-#| available at the following url: |
-#| http://www.oscss.org/license/2_0.txt. |
-#+###################################-+
-
-# NOTE: * Please make any modifications to this file by hand!
-# * DO NOT use a mysqldump created file for new changes!
-# * Please take note of the table structure, and use this
-# structure as a standard for future modifications!
-# * Any tables you add here should be added in admin/backup.php
-# and in catalog/install/includes/functions/database.php
-# * Comments should be like these, full line comments.
-# (don't use inline comments)
-
-
-
-
-
-if not exists (select * from osc_configuration where configuration_key = 'CFG_CLASS_VIRTUAL_TYPE_1' )
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('CFG_CLASS_VIRTUAL_TYPE_1_S', 'CFG_CLASS_VIRTUAL_TYPE_1', '', 'CFG_CLASS_VIRTUAL_TYPE_L', '0', '0', NOW(), NOW(),NULL, 'tep_cfg_text_auto(', 1);
-
-if not exists (select * from osc_configuration where configuration_key = 'CFG_CLASS_VIRTUAL_TYPE_2' )
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('CFG_CLASS_VIRTUAL_TYPE_2_S', 'CFG_CLASS_VIRTUAL_TYPE_2', '', 'CFG_CLASS_VIRTUAL_TYPE_L', '0', '0', NOW(), NOW(),NULL, 'tep_cfg_text_auto(', 1);
-
-if not exists (select * from osc_configuration where configuration_key = 'CFG_CLASS_VIRTUAL_TYPE_3' )
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('CFG_CLASS_VIRTUAL_TYPE_3_S', 'CFG_CLASS_VIRTUAL_TYPE_3', '', 'CFG_CLASS_VIRTUAL_TYPE_L', '0', '0', NOW(), NOW(),NULL, 'tep_cfg_text_auto(', 1);
-
-if not exists (select * from osc_configuration where configuration_key = 'CFG_CLASS_VIRTUAL_TYPE_4' )
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('CFG_CLASS_VIRTUAL_TYPE_4_S', 'CFG_CLASS_VIRTUAL_TYPE_4', '', 'CFG_CLASS_VIRTUAL_TYPE_L', '0', '0', NOW(), NOW(),NULL, 'tep_cfg_text_auto(', 1);
-
-if not exists (select * from osc_configuration where configuration_key = 'TYPE_VIRTUAL_PRODUCTS' )
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('TYPE_VIRTUAL_PRODUCTS_S', 'TYPE_VIRTUAL_PRODUCTS', '', 'TYPE_VIRTUAL_PRODUCTS_L', '0', '0', NOW(), NOW(),NULL, NULL, 2);
-
-if not exists (select * from osc_configuration where configuration_key = 'STOCK_MARK_PRODUCT_NO_STOCK' )
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, configuration_type) values ('STOCK_MARK_PRODUCT_NO_STOCK_S', 'STOCK_MARK_PRODUCT_NO_STOCK', '*cmd*', 'STOCK_MARK_PRODUCT_NO_STOCK_L', '9', '4', NOW(), NOW(), 3);
-
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('CUSTOMER_FORCE_UCWORDS_S', 'CUSTOMER_FORCE_UCWORDS', '6', 'CUSTOMER_FORCE_UCWORDS_L', '28', '20', NULL, NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),','3');
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('CUSTOMER_FORCE_STRTOUPPER_S', 'CUSTOMER_FORCE_STRTOUPPER', '10', 'CUSTOMER_FORCE_STRTOUPPER_L', '28', '21', NULL, NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),','3');
-
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('CUSTOMER_CITY_FORCE_STRTOUPPER_S', 'CUSTOMER_CITY_FORCE_STRTOUPPER', '10', 'CUSTOMER_CITY_FORCE_STRTOUPPER_L', '28', '21', NULL, NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),','3');
-
-delete from osc_configuration where configuration_key='PRODINFO_ATTRIBUTE_PLUGIN' limit 1;
-
-
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('PUBLIC_PAGE_TYPE_S', 'PUBLIC_PAGE_TYPE', 'listing,product,account,home,content', 'PUBLIC_PAGE_TYPE_L', '0', '0', NOW(), NOW(),NULL, NULL, 2);
-
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('PUBLIC_DRIVERS_PAGE_S', 'PUBLIC_DRIVERS_PAGE', 'GabaritTemplate', 'PUBLIC_DRIVERS_PAGE_L', '0', '0', NOW(), NOW(),NULL, NULL, 2);
-
-
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('NO_DISPLAY_SYMBOL_TAXE_S', 'NO_DISPLAY_SYMBOL_TAXE', 'GabaritTemplate', 'NO_DISPLAY_SYMBOL_TAXE_L', '0', '0', NOW(), NOW(),NULL, NULL, 2);
-
-
-
-ALTER TABLE osc_orders ADD holding_origin_id INT( 11 ) NOT NULL ;
-
-ALTER TABLE osc_holding_orders_products ADD products_stock_attributes VARCHAR( 255 ) NULL AFTER products_quantity ;
-
-ALTER TABLE osc_orders ADD class_payment VARCHAR( 30 ) NOT NULL AFTER holding_origin_id ,
-ADD class_shipping VARCHAR( 30 ) NOT NULL AFTER class_payment ;
-
-ALTER TABLE osc_products CHANGE vendors_id track_stock INT( 1 ) NOT NULL DEFAULT 1;
-
-ALTER TABLE osc_customers ADD COLUMN customers_language int(10) NOT NULL DEFAULT '1';
-ALTER TABLE osc_customers ADD COLUMN customers_status int(1) NOT NULL DEFAULT '1';
-
-ALTER TABLE osc_customers_groups ADD group_discount DECIMAL( 5, 2 ) NOT NULL DEFAULT '0.00';
-
-ALTER TABLE osc_geo_zones ADD geo_zone_type TINYINT( 1 ) NOT NULL DEFAULT '1' AFTER geo_zone_id ;
-
-if not exists (select * from osc_status where status_name = 'VAT' )
-INSERT INTO osc_status VALUES (1, 'geo_zone_type', 1, 'VAT','');
-
-if not exists (select * from osc_status where status_name = 'SHIPPING' )
-INSERT INTO osc_status VALUES (2, 'geo_zone_type', 1, 'SHIPPING','');
-
-ALTER TABLE osc_newsletters ADD COLUMN newsletters_language int(11) NOT NULL default '1';
-
-drop table if exists osc_categories_extra;
-CREATE TABLE IF NOT EXISTS osc_categories_extra (
- categories_id int(11) NOT NULL,
- cat_key varchar(150) NOT NULL,
- cat_value varchar(250) NOT NULL,
- UNIQUE KEY categories_id (categories_id,cat_key)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-03 11:34:49
|
Revision: 4131
http://oscss.svn.sourceforge.net/oscss/?rev=4131&view=rev
Author: oscim
Date: 2012-04-03 11:34:37 +0000 (Tue, 03 Apr 2012)
Log Message:
-----------
Suite utilitaire upgrade
Modified Paths:
--------------
trunk/catalog/install/includes/sql/mysql/upgrade/2.0.6_2.0.9/data/20_osc_status.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/data/91_osc_configuration.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_orders.sql
Added Paths:
-----------
trunk/catalog/install/includes/sql/mysql/upgrade/2.0.6_2.0.9/tables/osc_content.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.0.9_2.1.0/data/91_osc_configuration.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.0.9_2.1.0/tables/osc_customers.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.0.9_2.1.0/tables/osc_orders.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/data/91_osc_configuration_group.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_admin.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_admin_files.sql
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_notification.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_checknotif.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_cip.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_cip_depend.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_images.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_services.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_shipping.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_shipping_products.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_status.sql
Modified: trunk/catalog/install/includes/sql/mysql/upgrade/2.0.6_2.0.9/data/20_osc_status.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.0.6_2.0.9/data/20_osc_status.sql 2012-04-03 09:37:24 UTC (rev 4130)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.0.6_2.0.9/data/20_osc_status.sql 2012-04-03 11:34:37 UTC (rev 4131)
@@ -11,8 +11,9 @@
--| http://www.oscss.org/ |
--+######################################################################--+
+Insert into osc_status (status_id, status_type, language_id, status_name, status_color )
+Select orders_status_id as status_id, 'orders', language_id, orders_status_name as status_name, orders_status_color as status_color from osc_orders_status;
-
INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color ) VALUES (1, 'returns', 1, 'OSC_RETURNS_STATUS_PENDING','#FF1A00');
INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color ) VALUES (2, 'returns',1, 'OSC_RETURNS_STATUS_AWAITING_RETURN', '#3393D9');
INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color ) VALUES (3, 'returns',1, 'OSC_RETURNS_STATUS_CANCELLED', '#66FF00');
@@ -37,3 +38,7 @@
INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color ) VALUES (2, 'attribute_optiontype', 1, 'Text','');
INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color ) VALUES (3, 'attribute_optiontype', 1, 'Radio','');
INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color ) VALUES (4, 'attribute_optiontype', 1, 'Checkbox','');
+
+
+
+
Added: trunk/catalog/install/includes/sql/mysql/upgrade/2.0.6_2.0.9/tables/osc_content.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.0.6_2.0.9/tables/osc_content.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.0.6_2.0.9/tables/osc_content.sql 2012-04-03 11:34:37 UTC (rev 4131)
@@ -0,0 +1,15 @@
+--+######################################################################--+
+--| 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/ |
+--+######################################################################--+
+
+
+ALTER TABLE osc_content ADD COLUMN content_hidden tinyint(1) default '0' not null ;
\ No newline at end of file
Added: trunk/catalog/install/includes/sql/mysql/upgrade/2.0.9_2.1.0/data/91_osc_configuration.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.0.9_2.1.0/data/91_osc_configuration.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.0.9_2.1.0/data/91_osc_configuration.sql 2012-04-03 11:34:37 UTC (rev 4131)
@@ -0,0 +1,15 @@
+--+######################################################################--+
+--| 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/ |
+--+######################################################################--+
+
+
+delete from osc_configuration where configuration_key='DIR_FS_CIP' limit 1;
\ No newline at end of file
Added: trunk/catalog/install/includes/sql/mysql/upgrade/2.0.9_2.1.0/tables/osc_customers.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.0.9_2.1.0/tables/osc_customers.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.0.9_2.1.0/tables/osc_customers.sql 2012-04-03 11:34:37 UTC (rev 4131)
@@ -0,0 +1,20 @@
+--+######################################################################--+
+--| 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/ |
+--+######################################################################--+
+
+
+
+ALTER TABLE osc_customers ADD customers_discount decimal(5,2) DEFAULT '0.00';
+ALTER TABLE osc_customers ADD customers_balance_account decimal(16,4) DEFAULT '0.0000';
+ALTER TABLE osc_customers ADD customers_shopping_points int(10) NOT NULL DEFAULT '0';
+ALTER TABLE osc_customers ADD customers_language int(10) NOT NULL DEFAULT '1';
+ALTER TABLE osc_customers ADD customers_status int(1) NOT NULL DEFAULT '1';
\ No newline at end of file
Added: trunk/catalog/install/includes/sql/mysql/upgrade/2.0.9_2.1.0/tables/osc_orders.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.0.9_2.1.0/tables/osc_orders.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.0.9_2.1.0/tables/osc_orders.sql 2012-04-03 11:34:37 UTC (rev 4131)
@@ -0,0 +1,18 @@
+--+######################################################################--+
+--| 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/ |
+--+######################################################################--+
+
+
+
+
+
+ALTER TABLE osc_orders ADD orders_prefix VARCHAR( 32 ) NULL AFTER orders_id ;
\ No newline at end of file
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-03 09:37:24 UTC (rev 4130)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/data/40_osc_categories.sql 2012-04-03 11:34:37 UTC (rev 4131)
@@ -12,6 +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' ;
\ No newline at end of file
Modified: trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/data/91_osc_configuration.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/data/91_osc_configuration.sql 2012-04-03 09:37:24 UTC (rev 4130)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/data/91_osc_configuration.sql 2012-04-03 11:34:37 UTC (rev 4131)
@@ -27,7 +27,15 @@
insert IGNORE into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('CUSTOMER_CITY_FORCE_STRTOUPPER_S', 'CUSTOMER_CITY_FORCE_STRTOUPPER', '10', 'CUSTOMER_CITY_FORCE_STRTOUPPER_L', '28', '21', NULL, NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),','3');
insert IGNORE into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('PUBLIC_PAGE_TYPE_S', 'PUBLIC_PAGE_TYPE', 'listing,product,account,home,content', 'PUBLIC_PAGE_TYPE_L', '0', '0', NOW(), NOW(),NULL, NULL, 2);
insert IGNORE into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('PUBLIC_DRIVERS_PAGE_S', 'PUBLIC_DRIVERS_PAGE', 'GabaritTemplate', 'PUBLIC_DRIVERS_PAGE_L', '0', '0', NOW(), NOW(),NULL, NULL, 2);
+
+insert IGNORE into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('PUBLIC_PAGE_TYPE_S', 'PUBLIC_PAGE_TYPE', 'listing,product,account,home,content', 'PUBLIC_PAGE_TYPE_L', '0', '0', NOW(), NOW(),NULL, NULL, 2);
+
insert IGNORE into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('NO_DISPLAY_SYMBOL_TAXE_S', 'NO_DISPLAY_SYMBOL_TAXE', 'GabaritTemplate', 'NO_DISPLAY_SYMBOL_TAXE_L', '0', '0', NOW(), NOW(),NULL, NULL, 2);
-delete from osc_configuration where configuration_key='PRODINFO_ATTRIBUTE_PLUGIN' limit 1;
\ No newline at end of file
+insert IGNORE into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('PUBLIC_PAGE_TYPE_S', 'PUBLIC_PAGE_TYPE', 'listing,product,account,home,content', 'PUBLIC_PAGE_TYPE_L', '130', '0', NOW(), NOW(),NULL, NULL, 2);
+insert IGNORE into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('DATATYPES_S', 'DATATYPES', 'error, product,content, diver, categorie, manufacturer,home,', 'DATATYPES_L', '130', '0', NOW(), NOW(),NULL, NULL, 2);
+
+
+delete from osc_configuration where configuration_key='PRODINFO_ATTRIBUTE_PLUGIN' limit 1;
+
Added: trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/data/91_osc_configuration_group.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/data/91_osc_configuration_group.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/data/91_osc_configuration_group.sql 2012-04-03 11:34:37 UTC (rev 4131)
@@ -0,0 +1,71 @@
+--+######################################################################--+
+--| 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/ |
+--+######################################################################--+
+
+
+TRUNCATE osc_configuration_group;
+
+
+-- Preserver les ID
+
+insert into osc_configuration_group values (100,'APPARENCE', NULL, 2, 1, 0, '1', 'CG_APPARENCE');
+ insert into osc_configuration_group values (19, 'PAGE_PRODUCT_DETAIL', NULL, 0, 1, 100, '0', 'CG_PAGE_PRODUCT_DETAIL');
+ insert into osc_configuration_group values (4, 'IMAGES', NULL, 0, 1, 100, '0', 'MODIMAGES');
+ insert into osc_configuration_group values (8, 'LIST_PRODUTCS', NULL, 0, 1, 100, '0', 'CG_LIST_PRODUTCS');
+ insert into osc_configuration_group values (21, 'OPEN_BOX', NULL, 0, 1, 100, '0', 'CG_OPEN_BOX');
+ insert into osc_configuration_group values (27 , 'APPARENCE_GENERAL', NULL, 0 , 1, 100, '0', 'CG_APPARENCE_GENERAL');
+ insert into osc_configuration_group values (29 , 'BOX_CONFIGURATION_TEMPLATE', NULL, 0 , 1, 100, '0', 'MODTEMPLATE');
+
+insert into osc_configuration_group values (110,'CONFIGURATION', NULL, 1, 1, 0, '1', 'CG_CONFIGURATION');
+-- insert into osc_configuration_group values (3, 'VALUE_MAXI', NULL, 0, 1, 110, '0', 'CG_VALUE_MAXI');
+ insert into osc_configuration_group values (2, 'VALUE_MINI', NULL, 0, 1, 110, '0', 'CG_VALUE_MINI');
+ insert into osc_configuration_group values (1, 'MY_BOUTIQUE', NULL, 0, 1, 110, '0', 'CG_MY_BOUTIQUE');
+ insert into osc_configuration_group values (25 , 'NEW_PRODUCTS', NULL, 0 , 1, 110, '0', 'CG_NEW_PRODUCTS');
+ insert into osc_configuration_group values (28 , 'MEMBRES_DETAIL', NULL, 0 , 1, 110, '0', 'MODMEMBRES');
+ insert into osc_configuration_group values (30 , 'BOX_LOCALIZATION_ORDERS_STATUS', NULL, 0 , 1, 110, '0', 'MODSTATUS');
+ insert into osc_configuration_group values (31 , 'BOX_LOCALIZATION_LANGUAGES', NULL, 0 , 1, 110, '0', 'MODLANGUE');
+
+insert into osc_configuration_group values (120,'CONFIG_AVANCE', NULL, 4, 1, 0, '1', 'CG_CONFIG_AVANCE');
+ insert into osc_configuration_group values (24 , 'CG_CIP_MANAGER', NULL, 0 , 1, 120, '0', 'CG_CIP_MANAGER');
+ insert into osc_configuration_group values (33 , 'BOX_CONFIGURATION_EXTRA_FIELDS', NULL, 0 , 1, 120, '0', 'MODCUSTEXTRA');
+
+-- insert into osc_configuration_group values (26, 'ATTRIBUTE_PRODUCT', NULL,0 , 1, 120, '0', 'CG_ATTRIBUTE_PRODUCT');
+ insert into osc_configuration_group values (128,'BOX_CONFIGURATION_ENVIRONEMENT', NULL, 0, 1, 120, '0', 'CFG_ENVIRONEMENT');
+
+insert into osc_configuration_group values (126,'ESPACE_ADMIN', NULL, 5, 1, 0, '1', 'CG_ESPACE_ADMIN');
+ insert into osc_configuration_group values (17, 'QUICK_UPDATE', NULL, 0, 1, 126, '0', 'MODADMINCONFIG');
+ insert into osc_configuration_group values (20, 'PRODUCT_ATTENTE', NULL, 0, 1, 126, '0', 'CG_PRODUCT_ATTENTE');
+ insert into osc_configuration_group values (22, 'RECOVER_CART_SALES', NULL, 0, 1, 126, '0', 'CG_RECOVER_CART_SALES');
+
+insert into osc_configuration_group values (127,'CONFIG_COMM', NULL, 3, 1, 0, '1', 'CG_CONFIG_COMM');
+ insert into osc_configuration_group values (7, 'EXPEDITION_EMBALLAGE', NULL, 0, 1, 127, '0', 'MODEXPEDITION');
+ insert into osc_configuration_group values (9, 'STOCK', NULL, 0, 1, 127, '0', 'MODSTOCK');
+ insert into osc_configuration_group values (11, 'OPTION_CATALOG', NULL, 0, 1, 127, '0', 'CG_OPTION_CATALOG');
+
+ insert into osc_configuration_group values (10, 'LOGGING', NULL, 0, 1, 120, '1', 'CG_LOGGING');
+ insert into osc_configuration_group values (12, 'OPTION_MAIL', NULL, 0, 1, 120, '0', 'MODMAIL');
+ insert into osc_configuration_group values (14, 'COMPRESSION', NULL, 0, 1, 120, '0', 'CG_COMPRESSION');
+ insert into osc_configuration_group values (15, 'SESSION', NULL, 0, 1, 120, '0', 'CG_SESSION');
+ insert into osc_configuration_group values (16, 'SEO_URL', NULL, 0, 1, 120, '0', 'MODSEOURL');
+ insert into osc_configuration_group values (6, 'OPTION_MODULES', NULL, 0, 1, 120, '0', 'CG_OPTION_MODULES');
+ insert into osc_configuration_group values (129,'CONFIGURATION_ORDERS', NULL, 0, 1, 127, '0', 'MODORDER');
+-- insert into osc_configuration_group values (130,'CONFIGURATION_DATATYPES', NULL, 0, 1, 127, '0', 'MODDATATYPE');
+
+ insert into osc_configuration_group values (35 , 'OPTION_PRODUCTS', NULL, 0 , 1, 127, '1', 'OPTION_PRODUCTS');
+ insert into osc_configuration_group values (36, 'CONFIG_PRODUCTS', NULL , 0, 1, 35, '0', 'DATATYPEPRODUCT');
+ insert into osc_configuration_group values (13, 'DOWNLOADS', NULL, 0, 1, 35, '0', 'MODDOWNLOADS');
+ insert into osc_configuration_group values (34 , 'BOX_CONFIGURATION_PRODUCTS_EXTRA_FIELDS', NULL, 0 , 1, 35, '0', 'MODPRODEXTRA');
+
+
+-- hidden in menu configuration
+insert into osc_configuration_group values (37 , 'VIEW_SYSINFO', NULL, 0 , 0, 120, '1', 'MODSYSINFO');
+insert into osc_configuration_group values (38 , 'VIEW_SYSINFO', NULL, 0 , 0, 120, '1', 'MODCORECACHE');
Added: trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_admin.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_admin.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_admin.sql 2012-04-03 11:34:37 UTC (rev 4131)
@@ -0,0 +1,15 @@
+--+######################################################################--+
+--| 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/ |
+--+######################################################################--+
+
+
+RENAME TABLE osc_admin TO osc_admin_users;
\ No newline at end of file
Added: trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_admin_files.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_admin_files.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_admin_files.sql 2012-04-03 11:34:37 UTC (rev 4131)
@@ -0,0 +1,15 @@
+--+######################################################################--+
+--| 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/ |
+--+######################################################################--+
+
+
+RENAME TABLE osc_admin_files TO osc_admin_m_files;
\ No newline at end of file
Added: 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 (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_admin_m_files_to_right.sql 2012-04-03 11:34:37 UTC (rev 4131)
@@ -0,0 +1,21 @@
+--+######################################################################--+
+--| 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/ |
+--+######################################################################--+
+
+
+
+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)
+) CHARSET=utf8;
\ No newline at end of file
Added: trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_admin_notification.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_admin_notification.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_admin_notification.sql 2012-04-03 11:34:37 UTC (rev 4131)
@@ -0,0 +1,25 @@
+--+######################################################################--+
+--| 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/ |
+--+######################################################################--+
+
+
+
+CREATE TABLE IF NOT EXISTS osc_admin_notification (
+ notif_id int(11) NOT NULL AUTO_INCREMENT,
+ notif_type varchar(10) NOT NULL COMMENT 'user/group',
+ user_id int(11) NOT NULL,
+ notif_key varchar(100) NOT NULL,
+ notif_data varchar(250) NOT NULL,
+ notif_text text NOT NULL,
+ notif_date datetime NOT NULL DEFAULT '1000-01-01 00:00:00',
+ PRIMARY KEY (notif_id)
+) CHARSET=utf8 ;
\ No newline at end of file
Added: trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_checknotif.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_checknotif.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_checknotif.sql 2012-04-03 11:34:37 UTC (rev 4131)
@@ -0,0 +1,25 @@
+--+######################################################################--+
+--| 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/ |
+--+######################################################################--+
+
+
+
+
+CREATE TABLE IF NOT EXISTS osc_checknotif (
+ chknotif_id int(11) NOT NULL AUTO_INCREMENT,
+ chknotif_key varchar(100) NOT NULL,
+ chknotif_uniq int(1) NOT NULL COMMENT 'user=0/grp=1',
+ chknotif_user int(11) NOT NULL COMMENT 'if chknotif_uniq this = grp_id',
+ chknotif_status int(1) NOT NULL,
+ chknotif_method varchar(15) NOT NULL DEFAULT 'email',
+ PRIMARY KEY (chknotif_id)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
\ No newline at end of file
Added: trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_cip.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_cip.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_cip.sql 2012-04-03 11:34:37 UTC (rev 4131)
@@ -0,0 +1,15 @@
+--+######################################################################--+
+--| 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/ |
+--+######################################################################--+
+
+
+RENAME TABLE osc_cip TO osc_admin_cip;
\ No newline at end of file
Added: trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_cip_depend.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_cip_depend.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_cip_depend.sql 2012-04-03 11:34:37 UTC (rev 4131)
@@ -0,0 +1,15 @@
+--+######################################################################--+
+--| 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/ |
+--+######################################################################--+
+
+
+RENAME TABLE osc_cip_depend TO osc_admin_cip_depend;
\ No newline at end of file
Added: trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_images.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_images.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_images.sql 2012-04-03 11:34:37 UTC (rev 4131)
@@ -0,0 +1,27 @@
+--+######################################################################--+
+--| 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/ |
+--+######################################################################--+
+
+
+
+CREATE TABLE IF NOT EXISTS osc_images (
+ rowid int(11) NOT NULL AUTO_INCREMENT,
+ pathkey varchar(32) NOT NULL,
+ path varchar(250) NOT NULL,
+ file varchar(100) NOT NULL,
+ date_added datetime NOT NULL,
+ last_modified datetime NOT NULL,
+ width int(5) NOT NULL,
+ height int(5) NOT NULL,
+ ext char(4) NOT NULL,
+ PRIMARY KEY (rowid)
+) CHARSET=utf8 ;
\ No newline at end of file
Modified: trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_orders.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_orders.sql 2012-04-03 09:37:24 UTC (rev 4130)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_orders.sql 2012-04-03 11:34:37 UTC (rev 4131)
@@ -12,7 +12,7 @@
--+######################################################################--+
-
+ALTER TABLE osc_orders ADD facture_id INT( 11 ) NULL ;
ALTER TABLE osc_orders ADD holding_origin_id INT( 11 ) NOT NULL ;
ALTER TABLE osc_orders ADD class_payment VARCHAR( 30 ) NOT NULL AFTER holding_origin_id ,
Added: trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_services.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_services.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_services.sql 2012-04-03 11:34:37 UTC (rev 4131)
@@ -0,0 +1,33 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2011 The osCSS developers |
+--| |
+--| http://www.oscss.org |
+--| Portions Copyright (c) 2003 osCommerce |
+--+######################################################################--+
+--| This source file is subject to version 2.0 of the GPL license, |
+--| available at the following url: |
+--| http://www.oscss.org/ |
+--+######################################################################--+
+
+
+--
+-- Structure de la table osc_services
+--
+
+CREATE TABLE IF NOT EXISTS osc_services (
+ row_id int(11) NOT NULL AUTO_INCREMENT,
+ customers_id int(11) NOT NULL,
+ orders_id int(11) NOT NULL,
+ orders_products_id int(11) NOT NULL,
+ status int(1) NOT NULL,
+ date_added datetime NOT NULL,
+ date_start datetime NULL,
+ date_end datetime NULL,
+ duration int(10) NOT NULL,
+ duration_unit varchar(10) NOT NULL,
+ date_revival datetime NOT NULL,
+ auto_retry int(1) NOT NULL,
+ PRIMARY KEY (row_id)
+) DEFAULT CHARSET=utf8;
Added: trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_shipping.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_shipping.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_shipping.sql 2012-04-03 11:34:37 UTC (rev 4131)
@@ -0,0 +1,28 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2011 The osCSS developers |
+--| |
+--| http://www.oscss.org |
+--| Portions Copyright (c) 2003 osCommerce |
+--+######################################################################--+
+--| This source file is subject to version 2.0 of the GPL license, |
+--| available at the following url: |
+--| http://www.oscss.org/ |
+--+######################################################################--+
+
+
+
+--
+-- Structure de la table osc_shipping
+--
+CREATE TABLE IF NOT EXISTS osc_shipping (
+ row_id int(11) NOT NULL AUTO_INCREMENT,
+ orders_id int(11) NOT NULL,
+ method varchar(64) NOT NULL,
+ tracking varchar(128) NOT NULL,
+ tracking_url varchar(256) NOT NULL,
+ date_expedition datetime NOT NULL,
+ status int(1) NOT NULL Default '0',
+ KEY row_id (row_id)
+) DEFAULT CHARSET=utf8;
Added: trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_shipping_products.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_shipping_products.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_shipping_products.sql 2012-04-03 11:34:37 UTC (rev 4131)
@@ -0,0 +1,25 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2011 The osCSS developers |
+--| |
+--| http://www.oscss.org |
+--| Portions Copyright (c) 2003 osCommerce |
+--+######################################################################--+
+--| This source file is subject to version 2.0 of the GPL license, |
+--| available at the following url: |
+--| http://www.oscss.org/ |
+--+######################################################################--+
+
+
+--
+-- Structure de la table osc_shipping_products
+--
+
+CREATE TABLE IF NOT EXISTS osc_shipping_products (
+ row_id int(11) NOT NULL AUTO_INCREMENT,
+ shipping_id int(11) NOT NULL,
+ orders_products_id int(11) NOT NULL,
+ qt_expedie int(11) NOT NULL,
+ KEY row_id (row_id)
+) DEFAULT CHARSET=utf8;
Added: trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_status.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_status.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_status.sql 2012-04-03 11:34:37 UTC (rev 4131)
@@ -0,0 +1,15 @@
+--+######################################################################--+
+--| 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/ |
+--+######################################################################--+
+
+
+ALTER TABLE osc_status ADD COLUMN status_status int(1) not null DEFAULT 1;
\ 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-03 09:37:33
|
Revision: 4130
http://oscss.svn.sourceforge.net/oscss/?rev=4130&view=rev
Author: oscim
Date: 2012-04-03 09:37:24 +0000 (Tue, 03 Apr 2012)
Log Message:
-----------
Suite developpement et mise a niveau de l'utilitaire d'upgrade
Modified Paths:
--------------
trunk/catalog/common/classes/sql_drivers/DB_Mysql.php
trunk/catalog/common/classes/sql_drivers/DB_Mysqli.php
trunk/catalog/install/includes/content/core.installdb.php
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_content.sql
Added Paths:
-----------
trunk/catalog/install/includes/sql/mysql/upgrade/2.0.6_2.0.9/
trunk/catalog/install/includes/sql/mysql/upgrade/2.0.6_2.0.9/data/
trunk/catalog/install/includes/sql/mysql/upgrade/2.0.6_2.0.9/data/20_osc_status.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.0.6_2.0.9/data/91_osc_configuration.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.0.6_2.0.9/data/91_osc_configuration_group.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.0.6_2.0.9/tables/
trunk/catalog/install/includes/sql/mysql/upgrade/2.0.6_2.0.9/tables/osc_categories.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.0.6_2.0.9/tables/osc_cip_depend.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.0.6_2.0.9/tables/osc_holding_orders.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.0.6_2.0.9/tables/osc_newsletters.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.0.6_2.0.9/tables/osc_newsletters_sent.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.0.6_2.0.9/tables/osc_orders.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.0.6_2.0.9/tables/osc_products.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.0.6_2.0.9/tables/osc_products_am_attributes_to_templates.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.0.6_2.0.9/tables/osc_products_am_templates.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.0.6_2.0.9/tables/osc_products_extra_fields.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.0.6_2.0.9/tables/osc_products_extra_fields_labels.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.0.6_2.0.9/tables/osc_products_to_vendors.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.0.6_2.0.9/tables/osc_status.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.0.6_2.0.9/tables/osc_vendors.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.0.9_2.1.0/
trunk/catalog/install/includes/sql/mysql/upgrade/2.0.9_2.1.0/data/
trunk/catalog/install/includes/sql/mysql/upgrade/2.0.9_2.1.0/tables/
trunk/catalog/install/includes/sql/mysql/upgrade/2.0.9_2.1.0/tables/osc_cronjob.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.0.9_2.1.0/tables/osc_newsletters_modeles.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.0.9_2.1.0/tables/osc_products.sql
Modified: trunk/catalog/common/classes/sql_drivers/DB_Mysql.php
===================================================================
--- trunk/catalog/common/classes/sql_drivers/DB_Mysql.php 2012-04-02 20:28:47 UTC (rev 4129)
+++ trunk/catalog/common/classes/sql_drivers/DB_Mysql.php 2012-04-03 09:37:24 UTC (rev 4130)
@@ -301,6 +301,7 @@
switch(mysql_errno()){
case 1091: // upgrade DROP COLUM col not exits
case 1060: // upgrade ADD COLUM col exits
+ case 1050: // upgrade RENAME table but already exist
break;
default:
oscss_db_error($this->strQuery, mysql_errno(), mysql_error());
Modified: trunk/catalog/common/classes/sql_drivers/DB_Mysqli.php
===================================================================
--- trunk/catalog/common/classes/sql_drivers/DB_Mysqli.php 2012-04-02 20:28:47 UTC (rev 4129)
+++ trunk/catalog/common/classes/sql_drivers/DB_Mysqli.php 2012-04-03 09:37:24 UTC (rev 4130)
@@ -300,6 +300,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
break;
default:
oscss_db_error($this->strQuery, 0, @$this->resConnection->error);
Modified: trunk/catalog/install/includes/content/core.installdb.php
===================================================================
--- trunk/catalog/install/includes/content/core.installdb.php 2012-04-02 20:28:47 UTC (rev 4129)
+++ trunk/catalog/install/includes/content/core.installdb.php 2012-04-03 09:37:24 UTC (rev 4130)
@@ -153,12 +153,12 @@
' <input type="submit" class="submitBt" name="up_bouton_'.$file.'" value="'.core::l10n("Mettre a jour" ).'" />';
$s .= "</p>\n".'</form>'."\n";
- $res[] = $s;
+ $res[substr($file,0,strpos($file,'_'))] = $s;
}
}
}
- krsort($res);
+ ksort($res);
if( isset($_POST['db_exists']) && (bool)$_POST['db_exists'])
foreach($res as $row)
Added: trunk/catalog/install/includes/sql/mysql/upgrade/2.0.6_2.0.9/data/20_osc_status.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.0.6_2.0.9/data/20_osc_status.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.0.6_2.0.9/data/20_osc_status.sql 2012-04-03 09:37:24 UTC (rev 4130)
@@ -0,0 +1,39 @@
+--+######################################################################--+
+--| 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/ |
+--+######################################################################--+
+
+
+
+INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color ) VALUES (1, 'returns', 1, 'OSC_RETURNS_STATUS_PENDING','#FF1A00');
+INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color ) VALUES (2, 'returns',1, 'OSC_RETURNS_STATUS_AWAITING_RETURN', '#3393D9');
+INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color ) VALUES (3, 'returns',1, 'OSC_RETURNS_STATUS_CANCELLED', '#66FF00');
+INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color ) VALUES (4, 'returns',1, 'OSC_RETURNS_STATUS_COMPLETE', '#666');
+
+INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color ) VALUES (1, 'return_reasons', 1, 'OSC_RETURN_REASONS_FAULTY','#FF1A00');
+INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color ) VALUES (2, 'return_reasons',1, 'OSC_RETURN_REASONS_DAMAGED', '#3393D9');
+INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color ) VALUES (3, 'return_reasons',1, 'OSC_RETURN_REASONS_INCORRECT_ITEM', '#66FF00');
+INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color ) VALUES (4, 'return_reasons',1, 'OSC_RETURN_REASONS_WARRANTY', '#666');
+
+INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color ) VALUES (1, 'refund_method', 1, 'OSC_REFUND_METHOD_PAYPAL','');
+INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color ) VALUES (2, 'refund_method', 1, 'OSC_REFUND_METHOD_NOCHEX','');
+INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color ) VALUES (3, 'refund_method', 1, 'OSC_REFUND_METHOD_EXCHANGE','');
+INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color ) VALUES (4, 'refund_method', 1, 'OSC_REFUND_METHOD_GIFT_VOUCHERS','');
+
+insert into osc_status (status_id, status_type, language_id, status_name, status_color ) values (1, 'products_virtual_types', 1, 'OSC_PRODUCTS_VIRTUAL_TYPES_PHYSICAL','');
+insert into osc_status (status_id, status_type, language_id, status_name, status_color ) values (2, 'products_virtual_types',1, 'OSC_PRODUCTS_VIRTUAL_TYPES_SUBSCRIPTION','');
+insert into osc_status (status_id, status_type, language_id, status_name, status_color ) values (3, 'products_virtual_types',1, 'OSC_PRODUCTS_VIRTUAL_TYPES_SERVICE','');
+insert into osc_status (status_id, status_type, language_id, status_name, status_color ) values (4, 'products_virtual_types',1, 'OSC_PRODUCTS_VIRTUAL_TYPES_SOFTWARE','');
+
+INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color ) VALUES (1, 'attribute_optiontype', 1, 'Select','');
+INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color ) VALUES (2, 'attribute_optiontype', 1, 'Text','');
+INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color ) VALUES (3, 'attribute_optiontype', 1, 'Radio','');
+INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color ) VALUES (4, 'attribute_optiontype', 1, 'Checkbox','');
Added: trunk/catalog/install/includes/sql/mysql/upgrade/2.0.6_2.0.9/data/91_osc_configuration.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.0.6_2.0.9/data/91_osc_configuration.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.0.6_2.0.9/data/91_osc_configuration.sql 2012-04-03 09:37:24 UTC (rev 4130)
@@ -0,0 +1,312 @@
+--+######################################################################--+
+--| 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/ |
+--+######################################################################--+
+
+
+
+
+## 0 Nom editable directement
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('TEMPLATE_NAME_S', 'TEMPLATE_NAME', 'genericLight', 'TEMPLATE_NAME_L', '0', '0', NOW(), NOW(), NULL, NULL);
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('Order completed', 'DEFAULT_ORDERS_STATUS_COMPLETED', '3', 'definir le status final d\'une commande livre', '0', '0', NULL, NOW(), NULL, NULL,2);
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('Order annulate', 'DEFAULT_ORDERS_STATUS_ANNULATE', '4', 'definir le status d\'une commande annule', '0', '0', NULL, NOW(), NULL, NULL,2);
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('DEFAULT_CURRENCY_S', 'DEFAULT_CURRENCY', 'EUR', 'DEFAULT_CURRENCY_L', '0', '0', NULL, NOW(), NULL, NULL);
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('DEFAULT_LANGUAGE_S', 'DEFAULT_LANGUAGE', 'fr', 'DEFAULT_LANGUAGE_L', '0', '1', NULL, NOW(), NULL, NULL);
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function) values ('WHOS_ONLINE_ACTIVE_S', 'WHOS_ONLINE_FLAG', 'false', 'WHOS_ONLINE_ACTIVE_L', '0', '0', NOW(), NOW(),NULL, 'tep_cfg_Non_Edit(\';\',');
+
+## 1 store
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, configuration_type) values ('ORDERS_NUMBER_PREFIX_S', 'ORDERS_NUMBER_PREFIX', 'ym-5', 'ORDERS_NUMBER_PREFIX_L', '1', '0', NULL, NOW(), '2');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added) values ('STORE_NAME_S', 'STORE_NAME', 'osCSS Demo Shop', 'STORE_NAME_L', '1', '1', NULL, NOW());
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added) values ('STORE_OWNER_S', 'STORE_OWNER', 'osCSS Demo Shop', 'STORE_OWNER_L', '1', '2', NULL, NOW());
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, configuration_type) values ('STORE_OWNER_EMAIL_ADDRESS_S', 'STORE_OWNER_EMAIL_ADDRESS', 'root@localhost', 'STORE_OWNER_EMAIL_ADDRESS_L', '1', '3', NULL, NOW(), 2);
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, configuration_type) values ('EMAIL_FROM_S', 'EMAIL_FROM', 'root@localhost', 'EMAIL_FROM_L', '1', '4', NULL, NOW(), '2');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('STORE_COUNTRY_S', 'STORE_COUNTRY', '73', 'STORE_COUNTRY_L', '1', '6', NULL, NOW(),'tep_get_country_name', 'tep_cfg_pull_down_country_list(');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('STORE_ZONE_S', 'STORE_ZONE', '256', 'STORE_ZONE_L', '1', '7', NULL, NOW(), 'tep_cfg_get_zone_name', 'tep_cfg_pull_down_zone_list(');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('STORE_LOGO_S', 'STORE_LOGO', 'oscss_logo.png', 'STORE_LOGO_L', '1', '9', NOW(), NOW(), NULL, 'tep_cfg_choose_img(');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('STORE_LOGO_PRINT_S', 'STORE_LOGO_PRINT', 'oscss_logo.png', 'STORE_LOGO_PRINT_L', '1', '10', NOW(), NOW(), NULL, 'tep_cfg_choose_img(');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('SEND_EXTRA_ORDER_EMAILS_TO_S', 'SEND_EXTRA_ORDER_EMAILS_TO', '', 'SEND_EXTRA_ORDER_EMAILS_TO_L', '1', '11', NULL, NOW(), NULL, NULL);
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('STORE_NAME_ADDRESS_S', 'STORE_NAME_ADDRESS', 'Nom,\n adresse,\n pays et Tel de la boutique', 'STORE_NAME_ADDRESS_L', '1', '18', NULL, NOW(), NULL, 'tep_cfg_textarea(');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('STORE_LEGAL_INFO_S', 'STORE_LEGAL_INFO', 'legale info \n ', 'STORE_LEGAL_INFO_L', '1', '18', NULL, NOW(), NULL, 'tep_cfg_textarea(');
+
+
+## INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('Afficher les prix avec taxe', 'DISPLAY_PRICE_WITH_TAX', 'true', 'Afficher les prix taxes incluses (true) ou ajouter la taxe à la fin (false).', '1', '21', NULL, NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added,set_function) values ('STORE_OFFLINE_S', 'STORE_OFFLINE', 'false', 'STORE_OFFLINE_L', '1', '30', NULL, NOW(),'tep_cfg_select_option(array(\'true\', \'false\'),');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added) values ('STORE_OFFLINE_TXT_S', 'STORE_OFFLINE_TXT', '', 'STORE_OFFLINE_TXT_L', '1', '31', NULL, NOW());
+
+## 2 unite
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added) values ('TAX_DECIMAL_PLACES_S', 'TAX_DECIMAL_PLACES', '0', 'TAX_DECIMAL_PLACES_L', '2', '20', NULL, NOW());
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added) values ('UNIT_WEIGHT_NAME_S', 'UNIT_WEIGHT_NAME', 'Kg', 'UNIT_WEIGHT_NAME_L', '2', '20', NULL, NOW());
+
+## 3 max value
+
+## 4 images
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('SMALL_IMAGE_WIDTH_S', 'SMALL_IMAGE_WIDTH', '150', 'SMALL_IMAGE_WIDTH_L', '4', '1', NULL, NOW(), NULL, NULL);
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('SMALL_IMAGE_HEIGHT_S', 'SMALL_IMAGE_HEIGHT', '', 'SMALL_IMAGE_HEIGHT_L', '4', '2', NULL, NOW(), NULL, NULL);
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('HEADING_IMAGE_WIDTH_S', 'HEADING_IMAGE_WIDTH', '300', 'HEADING_IMAGE_WIDTH_L', '4', '3', NULL, NOW(), NULL, NULL);
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('HEADING_IMAGE_HEIGHT_S', 'HEADING_IMAGE_HEIGHT', '', 'HEADING_IMAGE_HEIGHT_L', '4', '4', NULL, NOW(), NULL, NULL);
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('SUBCATEGORY_IMAGE_WIDTH_S', 'SUBCATEGORY_IMAGE_WIDTH', '120', 'SUBCATEGORY_IMAGE_WIDTH_L', '4', '5', NULL, NOW(), NULL, NULL);
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('SUBCATEGORY_IMAGE_HEIGHT_S', 'SUBCATEGORY_IMAGE_HEIGHT', '', 'SUBCATEGORY_IMAGE_HEIGHT_L', '4', '6', NULL, NOW(), NULL, NULL);
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('POPUP_IMAGE_WIDTH_S', 'POPUP_IMAGE_WIDTH', '600', 'POPUP_IMAGE_WIDTH_L', '4', '7', NULL, NOW(), NULL, NULL);
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('POPUP_IMAGE_HEIGHT_S', 'POPUP_IMAGE_HEIGHT', '600', 'POPUP_IMAGE_HEIGHT_L', '4', '8', NULL, NOW(), NULL, NULL);
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('STACK_IMAGE_WIDTH_S', 'STACK_IMAGE_WIDTH', '50', 'STACK_IMAGE_WIDTH_L', '4', '9', NULL, NOW(), NULL, NULL);
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('STACK_IMAGE_HEIGHT_S', 'STACK_IMAGE_HEIGHT', '50', 'STACK_IMAGE_HEIGHT_L', '4', '10', NULL, NOW(), NULL, NULL);
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('JPEG_QUALITY_S', 'JPEG_QUALITY', '95', 'JPEG_QUALITY_L', '4', '11', NULL, NOW(), NULL, 'tep_cfg_pull_down_num_list(80,100,1,');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('IMAGE_REQUIRED_S', 'IMAGE_REQUIRED', 'false', 'IMAGE_REQUIRED_L', '4', '12', NULL, NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('IMAGE_NONEXISTENT_S', 'IMAGE_NONEXISTENT', 'oscss_logo.png', 'IMAGE_NONEXISTENT_L', '4', '13', NOW(), NOW(), NULL, 'tep_cfg_choose_img(');
+
+## 6 module option
+
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('DEFAULT_ORDERS_STATUS_ID_S', 'DEFAULT_ORDERS_STATUS_ID', '1', 'DEFAULT_ORDERS_STATUS_ID_L', '6', '2', NULL, NOW(), NULL, NULL);
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('DEFAULT_RETURN_REASON_S', 'DEFAULT_RETURN_REASON', '2', 'DEFAULT_RETURN_REASON_L', '6', '3', '2003-02-27 06:44:29', '0000-00-00 00:00:00', NULL, NULL);
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('DEFAULT_RETURN_STATUS_ID_S', 'DEFAULT_RETURN_STATUS_ID', '1', 'DEFAULT_RETURN_STATUS_ID_L', '6', '4', '2003-02-28 07:10:04', '0000-00-00 00:00:00', NULL, NULL);
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('DEFAULT_REFUND_METHOD_S', 'DEFAULT_REFUND_METHOD', '1', 'DEFAULT_REFUND_METHOD_L', '6', '5', '2003-03-01 16:46:12', '0000-00-00 00:00:00', NULL, NULL);
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ( 'MODULE_GENERIC_INSTALLED_S', 'MODULE_GENERIC_INSTALLED', '', 'MODULE_GENERIC_INSTALLED_L', '6', '6', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('MODULE_GENERIC_INSTALLED_BO_S', 'MODULE_GENERIC_INSTALLED_BO', '', 'MODULE_GENERIC_INSTALLED_BO_L', '6', '7', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',', '1');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('MODULE_ACAPRO_INSTALLED_S', 'MODULE_ACAPRO_INSTALLED', 'desc_base.php;', 'MODULE_ACAPRO_INSTALLED_L', '6', '8', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('MODULE_ACAPRO_INSTALLED_BO_S', 'MODULE_ACAPRO_INSTALLED_BO', 'desc_base.php;', 'MODULE_ACAPRO_INSTALLED_BO_L', '6', '9', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',', '1');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('MODULE_CONTENT_INSTALLED_S', 'MODULE_CONTENT_INSTALLED', '', 'MODULE_CONTENT_INSTALLED_L', '6', '10', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('MODULE_CONTENT_INSTALLED_BO_S', 'MODULE_CONTENT_INSTALLED_BO', '', 'MODULE_CONTENT_INSTALLED_BO_L', '6', '11', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',', '1');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('MODULE_ACACAT_INSTALLED_S', 'MODULE_ACACAT_INSTALLED', '', 'MODULE_ACACAT_INSTALLED_L', '6', '12', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',');
+INSERT IGNORE INTO osc_configuration ( configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ( 'MODULE_ACACAT_INSTALLED_BO_S', 'MODULE_ACACAT_INSTALLED_BO', '', 'MODULE_ACACAT_INSTALLED_BO_L', '6', '13', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',',1);
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('MODULE_ACCOUNT_INSTALLED_S', 'MODULE_ACCOUNT_INSTALLED', '', 'MODULE_ACCOUNT_INSTALLED_L', '6', '14', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('MODULE_ACCOUNT_INSTALLED_BO_S', 'MODULE_ACCOUNT_INSTALLED_BO', '', 'MODULE_ACCOUNT_INSTALLED_BO_L', '6', '15', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',', '1');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ( 'MODULE_LISTING_INSTALLED_S', 'MODULE_LISTING_INSTALLED', '', 'MODULE_LISTING_INSTALLED_L', '6', '16', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('MODULE_LISTING_INSTALLED_BO_S', 'MODULE_LISTING_INSTALLED_BO', '', 'MODULE_LISTING_INSTALLED_BO_L', '6', '17', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',', '1');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('MODULE_HOME_INSTALLED_S', 'MODULE_HOME_INSTALLED', '', 'MODULE_HOME_INSTALLED_L', '6', '18', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('MODULE_HOME_INSTALLED_BO_S', 'MODULE_HOME_INSTALLED_BO', '', 'MODULE_HOME_INSTALLED_BO_L', '6', '19', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',', '1');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('MODULE_CHECKOUT_PROCESS_INSTALLED_S', 'MODULE_CHECKOUT_PROCESS_INSTALLED', '', 'MODULE_CHECKOUT_PROCESS_INSTALLED_L', '6', '20', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('MODULE_CHECKOUT_PROCESS_INSTALLED_BO_S', 'MODULE_CHECKOUT_PROCESS_INSTALLED_BO', '', 'MODULE_CHECKOUT_PROCESS_INSTALLED_BO_L', '6', '21', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',', '1');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('MODULE_SHIPPING_INSTALLED_S', 'MODULE_SHIPPING_INSTALLED', '', 'MODULE_SHIPPING_INSTALLED_L', '6', '22', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('MODULE_PAYMENT_INSTALLED_S', 'MODULE_PAYMENT_INSTALLED', '', 'MODULE_PAYMENT_INSTALLED_L', '6', '23', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('MODULE_ORDER_TOTAL_INSTALLED_S', 'MODULE_ORDER_TOTAL_INSTALLED', 'ot_total.php;ot_subtotal.php;ot_tax.php;', 'MODULE_ORDER_TOTAL_INSTALLED_L', '6', '24', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('PLUGIN_GENERIC_INSTALLED_S', 'PLUGIN_GENERIC_INSTALLED', '', 'PLUGIN_GENERIC_INSTALLED_L', '6', '25', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('PLUGIN_PRODUCT_INSTALLED_S', 'PLUGIN_PRODUCT_INSTALLED', '', 'PLUGIN_PRODUCT_INSTALLED_L', '6', '26', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('PLUGIN_ACCOUNT_INSTALLED_S', 'PLUGIN_ACCOUNT_INSTALLED', '', 'PLUGIN_ACCOUNT_INSTALLED_L', '6', '27', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('PLUGIN_LISTING_INSTALLED_S', 'PLUGIN_LISTING_INSTALLED', '', 'PLUGIN_LISTING_INSTALLED_L', '6', '28', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('PLUGIN_HOME_INSTALLED_S', 'PLUGIN_HOME_INSTALLED', '', 'PLUGIN_HOME_INSTALLED_L', '6', '29', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, configuration_type) values ('Ordre de tri total', 'MODULE_ORDER_TOTAL_TOTAL_SORT_ORDER', '9', 'Ordre de tri pour l\'affichage', '6', '10', NULL, NOW(), '2');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, configuration_type) values ('Ordre de tri sous-total', 'MODULE_ORDER_TOTAL_SUBTOTAL_SORT_ORDER', '0', 'Ordre de tri pour l\'affichage', '6', '11', NULL, NOW(), '2');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, configuration_type) values ('Ordre de tri taxes', 'MODULE_ORDER_TOTAL_TAX_SORT_ORDER', '8', 'Ordre de tri pour l\'affichage', '6', '12', NULL, NOW(), '2');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, configuration_type) values ('Ordre de description', 'MODULE_ACAPRO_DESC_BASE_SORT_ORDER', '1', 'Ordre de tri pour l\'affichage', '6', '13', NULL, NOW(), '2');
+
+
+## 7 shipping
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('SHIPPING_ORIGIN_COUNTRY_S', 'SHIPPING_ORIGIN_COUNTRY', '73', 'SHIPPING_ORIGIN_COUNTRY_L', '7', '1', NULL, NOW(), 'tep_get_country_name', 'tep_cfg_pull_down_country_list(');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('SHIPPING_ORIGIN_ZIP_S', 'SHIPPING_ORIGIN_ZIP', '75000', 'SHIPPING_ORIGIN_ZIP_L', '7', '2', NULL, NOW(), NULL, NULL);
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('SHIPPING_MAX_WEIGHT_S', 'SHIPPING_MAX_WEIGHT', '50', 'SHIPPING_MAX_WEIGHT_L', '7', '3', NULL, NOW(), NULL, NULL);
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('SHIPPING_BOX_WEIGHT_S', 'SHIPPING_BOX_WEIGHT', '0', 'SHIPPING_BOX_WEIGHT_L', '7', '4', NULL, NOW(), NULL, NULL);
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('SHIPPING_BOX_PADDING_S', 'SHIPPING_BOX_PADDING', '0', 'SHIPPING_BOX_PADDING_L', '7', '5', NULL, NOW(), NULL, NULL);
+
+## 8 products listing
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('MAX_DISPLAY_PAGE_LINKS_S', 'MAX_DISPLAY_PAGE_LINKS', '5', 'MAX_DISPLAY_PAGE_LINKS_L', '8', '0', NULL, NOW(), NULL, NULL);
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('MAX_DISPLAY_SPECIAL_PRODUCTS_S', 'MAX_DISPLAY_SPECIAL_PRODUCTS', '9', 'MAX_DISPLAY_SPECIAL_PRODUCTS_L', '8', '1', NULL, NOW(), NULL, NULL);
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('MAX_DISPLAY_NEW_PRODUCTS_S', 'MAX_DISPLAY_NEW_PRODUCTS', '9', 'MAX_DISPLAY_NEW_PRODUCTS_L', '8', '2', NULL, NOW(), NULL, NULL);
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('MAX_DISPLAY_UPCOMING_PRODUCTS_S', 'MAX_DISPLAY_UPCOMING_PRODUCTS', '10', 'MAX_DISPLAY_UPCOMING_PRODUCTS_L', '8', '3', NULL, NOW(), NULL, NULL);
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('MAX_DISPLAY_PRODUCTS_NEW_S', 'MAX_DISPLAY_PRODUCTS_NEW', '9', 'MAX_DISPLAY_PRODUCTS_NEW_L', '8', '4', NULL, NOW(), NULL, NULL);
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('MAX_DISPLAY_BESTSELLERS_S', 'MAX_DISPLAY_BESTSELLERS', '10', 'MAX_DISPLAY_BESTSELLERS_L', '8', '5', NULL, NOW(), NULL, NULL);
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('MAX_DISPLAY_ALSO_PURCHASED_S', 'MAX_DISPLAY_ALSO_PURCHASED', '6', 'MAX_DISPLAY_ALSO_PURCHASED_L', '8', '6', NULL, NOW(), NULL, NULL);
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('MAX_DISPLAY_SEARCH_RESULTS_S', 'MAX_DISPLAY_SEARCH_RESULTS', '5', 'MAX_DISPLAY_SEARCH_RESULTS_L', '8', '7', NULL, NOW(), NULL, NULL);
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('PRODUCT_LIST_IMAGE_S', 'PRODUCT_LIST_IMAGE', 'true', 'PRODUCT_LIST_IMAGE_L', '8', '8', NULL, NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('PRODUCT_LIST_DESCRIPTION_S', 'PRODUCT_LIST_DESCRIPTION', 'true', 'PRODUCT_LIST_DESCRIPTION_L', '8', '9', NULL, NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('PRODUCT_LIST_MANUFACTURER_S', 'PRODUCT_LIST_MANUFACTURER', 'true', 'PRODUCT_LIST_MANUFACTURER_L', '8', '10', NULL, NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('PRODUCT_LIST_MODEL_S', 'PRODUCT_LIST_MODEL', 'true', 'PRODUCT_LIST_MODEL_L', '8', '11', NULL, NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('PRODUCT_LIST_NAME_S', 'PRODUCT_LIST_NAME', 'true', 'PRODUCT_LIST_NAME_L', '8', '12', NULL, NOW(),'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('PRODUCT_LIST_PRICE_S', 'PRODUCT_LIST_PRICE', 'true', 'PRODUCT_LIST_PRICE_L', '8', '13', NULL, NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('PRODUCT_LIST_QUANTITY_S', 'PRODUCT_LIST_QUANTITY', 'true', 'PRODUCT_LIST_QUANTITY_L', '8', '14', NULL, NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('PRODUCT_LIST_WEIGHT_S', 'PRODUCT_LIST_WEIGHT', 'true', 'PRODUCT_LIST_WEIGHT_L', '8', '15', NULL, NOW(),'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('PRODUCT_LIST_BUY_NOW_S', 'PRODUCT_LIST_BUY_NOW', 'false', 'PRODUCT_LIST_BUY_NOW_L', '8', '16', NULL, NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('PRODUCT_LIST_FILTER_S', 'PRODUCT_LIST_FILTER', '1', 'PRODUCT_LIST_FILTER_L', '8', '17', NULL, NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('PREV_NEXT_BAR_LOCATION_S', 'PREV_NEXT_BAR_LOCATION', '3', 'PREV_NEXT_BAR_LOCATION_L', '8', '18', NULL, NOW(), NULL, NULL);
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('MIN_DISPLAY_BESTSELLERS_S', 'MIN_DISPLAY_BESTSELLERS', '1', 'MIN_DISPLAY_BESTSELLERS_L', '8', '19', NULL, NOW(), NULL, NULL);
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('MIN_DISPLAY_ALSO_PURCHASED_S', 'MIN_DISPLAY_ALSO_PURCHASED', '1', 'MIN_DISPLAY_ALSO_PURCHASED_L', '8', '20', NULL, NOW(), NULL, NULL);
+
+## 9 stock
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('DEFAULT_RESTOCK_VALUE_S', 'DEFAULT_RESTOCK_VALUE', '12.5', 'DEFAULT_RESTOCK_VALUE_L', '9', '0', NOW(), NOW(), NULL, NULL);
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('STOCK_CHECK_S', 'STOCK_CHECK', 'true', 'STOCK_CHECK_L', '9', '1', NULL, NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('STOCK_LIMITED_S', 'STOCK_LIMITED', 'true', 'STOCK_LIMITED_L', '9', '2', NULL, NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('STOCK_ALLOW_CHECKOUT_S', 'STOCK_ALLOW_CHECKOUT', 'true', 'STOCK_ALLOW_CHECKOUT_L', '9', '3', NULL, NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added) values ('STOCK_MARK_PRODUCT_OUT_OF_STOCK_S', 'STOCK_MARK_PRODUCT_OUT_OF_STOCK', '***', 'STOCK_MARK_PRODUCT_OUT_OF_STOCK_L', '9', '4', NOW(), NOW());
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added) values ('STOCK_REORDER_LEVEL_S', 'STOCK_REORDER_LEVEL', '5', 'STOCK_REORDER_LEVEL_L', '9', '5', NOW(), NOW());
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified,date_added, use_function, set_function) values ('PRODINFO_ATTRIBUTE_PLUGIN_S', 'PRODINFO_ATTRIBUTE_PLUGIN', 'base', 'PRODINFO_ATTRIBUTE_PLUGIN_L', '9', '6', NULL,NOW(), NULL, 'tep_cfg_pull_down_class_files(\'pad_\',');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified,date_added, use_function, set_function) values ('PRODINFO_ATTRIBUTE_SHOW_OUT_OF_STOCK_S', 'PRODINFO_ATTRIBUTE_SHOW_OUT_OF_STOCK', 'True', 'PRODINFO_ATTRIBUTE_SHOW_OUT_OF_STOCK_L', '9', '7', NULL,NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'True\', \'False\'),');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified,date_added, use_function, set_function) values ('PRODINFO_ATTRIBUTE_MARK_OUT_OF_STOCK_S', 'PRODINFO_ATTRIBUTE_MARK_OUT_OF_STOCK', 'Right', 'PRODINFO_ATTRIBUTE_MARK_OUT_OF_STOCK_L', '9', '8', NULL,NOW(), NULL, 'tep_cfg_select_option(array(\'None\', \'Right\', \'Left\'),');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified,date_added, use_function, set_function) values ('PRODINFO_ATTRIBUTE_OUT_OF_STOCK_MSGLINE_S', 'PRODINFO_ATTRIBUTE_OUT_OF_STOCK_MSGLINE', 'True', 'PRODINFO_ATTRIBUTE_OUT_OF_STOCK_MSGLINE_L', '9', '9', NULL,NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'True\', \'False\'),');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified,date_added, use_function, set_function) values ('PRODINFO_ATTRIBUTE_ACTUAL_PRICE_PULL_DOWN_S', 'PRODINFO_ATTRIBUTE_ACTUAL_PRICE_PULL_DOWN', 'False', 'PRODINFO_ATTRIBUTE_ACTUAL_PRICE_PULL_DOWN_L', '9', '10',NULL,NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'True\', \'False\'),');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified,date_added, use_function, set_function) values ('PRODINFO_ATTRIBUTE_DISPLAY_STOCK_LIST_S', 'PRODINFO_ATTRIBUTE_DISPLAY_STOCK_LIST', 'True', 'PRODINFO_ATTRIBUTE_DISPLAY_STOCK_LIST_L', '9', '11', NULL,NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'True\', \'False\'),');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified,date_added, use_function, set_function) values ('PRODINFO_ATTRIBUTE_NO_ADD_OUT_OF_STOCK_S', 'PRODINFO_ATTRIBUTE_NO_ADD_OUT_OF_STOCK', 'True', 'PRODINFO_ATTRIBUTE_NO_ADD_OUT_OF_STOCK_L', '9', '0', NULL,NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'True\', \'False\'),');
+
+
+## 10 log
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('STORE_PAGE_PARSE_TIME_S', 'STORE_PAGE_PARSE_TIME', 'false', 'STORE_PAGE_PARSE_TIME__L', '10', '1', NOW(), NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('STORE_PAGE_PARSE_TIME_LOG_S', 'STORE_PAGE_PARSE_TIME_LOG', 'E:/serveur/htdocs/oscss_cvs/logs/page_parse_time.log', 'STORE_PAGE_PARSE_TIME_LOG_L', '10', '2', NOW(), NOW(), NULL, NULL);
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('STORE_PARSE_DATE_TIME_FORMAT_S', 'STORE_PARSE_DATE_TIME_FORMAT', '%d/%m/%Y %H:%M:%S', 'STORE_PARSE_DATE_TIME_FORMAT_L', '10', '3', NOW(), NOW(), NULL, NULL);
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('DISPLAY_PAGE_PARSE_TIME_S', 'DISPLAY_PAGE_PARSE_TIME', 'false', 'DISPLAY_PAGE_PARSE_TIME_L.', '10', '4', NOW(), NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('STORE_DB_TRANSACTIONS_S', 'STORE_DB_TRANSACTIONS', 'false', 'STORE_DB_TRANSACTIONS_L', '10', '5', NOW(), NOW(), NULL, 'tep_cfg_select_option(array(\'true\', \'false\'),');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('STORE_PAGE_PARSE_STOCK_ERROR_S', 'STORE_PAGE_PARSE_STOCK_ERROR', 'true', 'STORE_PAGE_PARSE_STOCK_ERROR_L', '10', '6', NOW(), NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('STORE_PAGE_PARSE_EMAIL_OWNER_S', 'STORE_PAGE_PARSE_EMAIL_OWNER', 'false', 'STORE_PAGE_PARSE_EMAIL_OWNER_L', '10', '6', NOW(), NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),');
+
+
+## 11 catalog options
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('COUNTRY_LOCALNAME_S', 'COUNTRY_LOCALNAME', 'false', 'COUNTRY_LOCALNAME_L', '11', '30', NOW(), NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('AJAX_CART_MODE_S', 'AJAX_CART_MODE', 'true', 'AJAX_CART_MODE_L', '11', '31', NOW(), NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function,configuration_type) values ('ADVANCED_SEARCH_DEFAULT_OPERATOR_S', 'ADVANCED_SEARCH_DEFAULT_OPERATOR', 'and', 'ADVANCED_SEARCH_DEFAULT_OPERATOR_L', '11', '17', NULL, NOW(), NULL, 'tep_cfg_select_option(array(\'and\', \'or\'),', '3');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('USE_DEFAULT_LANGUAGE_CURRENCY_S', 'USE_DEFAULT_LANGUAGE_CURRENCY', 'false', 'USE_DEFAULT_LANGUAGE_CURRENCY_L', '11', '8', NULL, NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('DISPLAY_CART_S', 'DISPLAY_CART', 'true', 'DISPLAY_CART_L', '11', '14', NULL, NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function) values ('WHOS_ONLINE_ACTIVE_S', 'WHOS_ONLINE_ACTIVE', 'true', 'WHOS_ONLINE_ACTIVE_L', '11', '5', NOW(), NOW(),NULL, 'tep_cfg_select_option(array(\'true\', \'auto\',\'false\'),');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('LOGIN_SET_SNAPSHOT_S', 'LOGIN_SET_SNAPSHOT', 'true', 'LOGIN_SET_SNAPSHOT_L', '11', '6', NOW(), NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),');
+
+## 12 email
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('EMAIL_TRANSPORT_S', 'EMAIL_TRANSPORT', 'sendmail', 'EMAIL_TRANSPORT_L', '12', '1', NOW(), NOW(), NULL, 'tep_cfg_select_option(array(\'sendmail\', \'smtp\'),');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('EMAIL_LINEFEED_S', 'EMAIL_LINEFEED', 'LF', 'EMAIL_LINEFEED_L', '12', '2', NOW(), NOW(), NULL, 'tep_cfg_select_option(array(\'LF\', \'CRLF\'),');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('EMAIL_USE_HTML_S', 'EMAIL_USE_HTML', 'true', 'EMAIL_USE_HTML_L', '12', '3', NOW(), NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('ENTRY_EMAIL_ADDRESS_CHECK_S', 'ENTRY_EMAIL_ADDRESS_CHECK', 'false', 'ENTRY_EMAIL_ADDRESS_CHECK_L', '12', '4', NOW(), NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('SEND_EMAILS_S', 'SEND_EMAILS', 'true', 'SEND_EMAILS_L', '12', '5', NOW(), NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),');
+
+## 13 downloads
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('DOWNLOAD_ENABLED_S', 'DOWNLOAD_ENABLED', 'true', 'DOWNLOAD_ENABLED_L', '13', '1', NOW(), NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('DOWNLOAD_BY_REDIRECT_S', 'DOWNLOAD_BY_REDIRECT', 'false', 'DOWNLOAD_BY_REDIRECT_L', '13', '2', NOW(), NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('DOWNLOAD_MAX_DAYS_S', 'DOWNLOAD_MAX_DAYS', '7', 'DOWNLOAD_MAX_DAYS_L', '13', '3', NOW(), NOW(), NULL, '');
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('DOWNLOAD_MAX_COUNT_S', 'DOWNLOAD_MAX_COUNT', '5', 'DOWNLOAD_MAX_COUNT_L', '13', '4', NOW(), NOW(), NULL, '');
+
+## 14 gzip
+INSERT IGNORE INTO osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('GZIP_COMPRESSION_S', 'GZIP_COMPRESSION', 'true', 'GZIP_COMPRESSION_L', '14', '1', NOW(), NOW(), 'tep_value_for_humain', 'tep_cfg_selec...
[truncated message content] |
|
From: <os...@us...> - 2012-04-02 20:28:54
|
Revision: 4129
http://oscss.svn.sourceforge.net/oscss/?rev=4129&view=rev
Author: oscim
Date: 2012-04-02 20:28:47 +0000 (Mon, 02 Apr 2012)
Log Message:
-----------
Ajout des onglet destin?\195?\169 au specification des produti physique, et celui des produit virtuel
Modified Paths:
--------------
trunk/catalog/admin/includes/gabarit/configuration/datatypeproduct.listing.gab
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/datatypeproduct.txt
trunk/catalog/admin/includes/modules/configuration/datatypeproduct.php
Modified: trunk/catalog/admin/includes/gabarit/configuration/datatypeproduct.listing.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/datatypeproduct.listing.gab 2012-04-02 16:13:47 UTC (rev 4128)
+++ trunk/catalog/admin/includes/gabarit/configuration/datatypeproduct.listing.gab 2012-04-02 20:28:47 UTC (rev 4129)
@@ -26,58 +26,75 @@
<div id="tabs">
- <ul>
- <li><a href="#tabs-1"><?php echo __('datatypeproduct tab configuration'); ?></a></li>
- </ul>
+ <ul>
+ <li><a href="#tabs-1"><?php echo __('datatypeproduct tab configuration'); ?></a></li>
+ <?php if(datatypeproduct::$list->activ_physique): ?>
+ <li><a href="#tabs-2"><?php echo __('datatypeproduct tab physique'); ?></a></li>
+ <?php endif; ?>
+ <?php if(datatypeproduct::$list->activ_virtual): ?>
+ <li><a href="#tabs-3"><?php echo __('datatypeproduct tab virtual'); ?></a></li>
+ <?php endif; ?>
+ </ul>
+
<div id="tabs-1" class="tabPage">
- <h4 class="main-title"><?php echo __('heading datatypeproduct manage type products') ?></h4>
+ <h4 class="main-title"><?php echo __('heading datatypeproduct manage type products') ?></h4>
- <p class="main-intro"><?php echo __('datatypeproduct type txt intro') ?></p>
+ <p class="main-intro"><?php echo __('datatypeproduct type txt intro') ?></p>
- <fieldset class="block_field">
- <legend><?php echo __('datatypeproduct legend manage type') ?></legend>
- <div class="block_input">
+ <fieldset class="block_field">
+ <legend><?php echo __('datatypeproduct legend manage type') ?></legend>
+ <div class="block_input">
- <table>
- <thead>
- <tr>
- <th><?php echo __('datatypeproduct tableheading id') ?></th>
- <th><?php echo __('datatypeproduct tableheading active') ?></th>
- <th><?php echo __('datatypeproduct tableheading name') ?></th>
- <th><?php echo __('datatypeproduct tableheading physical') ?></th>
- <th><?php echo __('datatypeproduct tableheading virtual') ?></th>
- </tr>
- </thead>
-<!-- <tfoot>
- <tr>
- <td> </td>
- <td class="tcenter"> </td>
- <td><?php echo tep_draw_input_field('name_0', 'name_0', ''); ?></td>
- <td class="tcenter"><?php echo tep_draw_radio_field('virtual_0', 'virtual_0' , 0, 1); ?></td>
- <td class="tcenter"><?php echo tep_draw_radio_field('virtual_0', 'virtual_0' , 1, 0); ?></td>
- </tr>
- </tfoot>-->
- <tbody>
- <?php foreach(datatypeproduct::$list->types as $row): ?>
+ <table>
+ <thead>
<tr>
- <td><?php echo $row->id; ?></td>
- <td class="tcenter"><?php echo tep_draw_checkbox_field('types[active]['.$row->id.']', 'active_'.$row->id , $row->status, (bool)$row->status); ?></td>
- <td><?php echo $row->name /*tep_draw_input_field('types[name]['.$row->id.']', 'name_'.$row->id, $row->name)*/; ?></td>
- <td class="tcenter"><?php echo tep_draw_radio_field('types[virtual]['.$row->id.']', 'virtual_'.$row->id , 1, (bool)!in_array($row->id, explode(',', TYPE_VIRTUAL_PRODUCTS) )); ?></td>
- <td class="tcenter"><?php echo tep_draw_radio_field('types[virtual]['.$row->id.']', 'virtual_'.$row->id , 2, (bool)in_array($row->id, explode(',', TYPE_VIRTUAL_PRODUCTS) )); ?></td>
+ <th><?php echo __('datatypeproduct tableheading id') ?></th>
+ <th><?php echo __('datatypeproduct tableheading active') ?></th>
+ <th><?php echo __('datatypeproduct tableheading name') ?></th>
+ <th><?php echo __('datatypeproduct tableheading physical') ?></th>
+ <th><?php echo __('datatypeproduct tableheading virtual') ?></th>
</tr>
- <?php endforeach; ?>
- </tbody>
- </table>
+ </thead>
+ <!-- <tfoot>
+ <tr>
+ <td> </td>
+ <td class="tcenter"> </td>
+ <td><?php echo tep_draw_input_field('name_0', 'name_0', ''); ?></td>
+ <td class="tcenter"><?php echo tep_draw_radio_field('virtual_0', 'virtual_0' , 0, 1); ?></td>
+ <td class="tcenter"><?php echo tep_draw_radio_field('virtual_0', 'virtual_0' , 1, 0); ?></td>
+ </tr>
+ </tfoot>-->
+ <tbody>
+ <?php foreach(datatypeproduct::$list->types as $row): ?>
+ <tr>
+ <td><?php echo $row->id; ?></td>
+ <td class="tcenter"><?php echo tep_draw_checkbox_field('types[active]['.$row->id.']', 'active_'.$row->id , $row->status, (bool)$row->status); ?></td>
+ <td><?php echo $row->name /*tep_draw_input_field('types[name]['.$row->id.']', 'name_'.$row->id, $row->name)*/; ?></td>
+ <td class="tcenter"><?php echo tep_draw_radio_field('types[virtual]['.$row->id.']', 'virtual_'.$row->id , 1, (bool)!in_array($row->id, explode(',', TYPE_VIRTUAL_PRODUCTS) )); ?></td>
+ <td class="tcenter"><?php echo tep_draw_radio_field('types[virtual]['.$row->id.']', 'virtual_'.$row->id , 2, (bool)in_array($row->id, explode(',', TYPE_VIRTUAL_PRODUCTS) )); ?></td>
+ </tr>
+ <?php endforeach; ?>
+ </tbody>
+ </table>
+ </div>
+ </fieldset>
+
+ <div class="button_nav">
+ <?php print tep_image_submit('button_copy.gif', IMAGE_UPDATE) .tep_js_back(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&gID=' . $_GET['gID'] )) ; ?>
</div>
- </fieldset>
+ </div>
- <div class="button_nav">
- <?php print tep_image_submit('button_copy.gif', IMAGE_UPDATE) .tep_js_back(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&gID=' . $_GET['gID'] )) ; ?>
- </div>
-</div>
+ <?php if(datatypeproduct::$list->activ_physique): ?>
+ <div id="tabs-2" class="tabPage">
+ </div>
+ <?php endif; ?>
+ <?php if(datatypeproduct::$list->activ_virtual): ?>
+ <div id="tabs-3" class="tabPage">
+ </div>
+ <?php endif; ?>
+ </div>
</form>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/datatypeproduct.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/datatypeproduct.txt 2012-04-02 16:13:47 UTC (rev 4128)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/datatypeproduct.txt 2012-04-02 20:28:47 UTC (rev 4129)
@@ -11,6 +11,7 @@
$lang['heading datatypeproduct configuration']="DataType produits" ;
+/* tab configuration */
$lang['datatypeproduct tab configuration']="configuration" ;
$lang['heading datatypeproduct manage type products']="Gestion des types de produits" ;
$lang['datatypeproduct legend manage type']="Types de produits" ;
@@ -22,7 +23,10 @@
$lang['datatypeproduct tableheading physical']="physique" ;
$lang['datatypeproduct tableheading virtual']="Virtuel" ;
+/* tab physqiue */
+$lang['datatypeproduct tab physique']="physqiue" ;
+/* tab virtuel */
+$lang['datatypeproduct tab virtual']="virtuel" ;
-
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/modules/configuration/datatypeproduct.php
===================================================================
--- trunk/catalog/admin/includes/modules/configuration/datatypeproduct.php 2012-04-02 16:13:47 UTC (rev 4128)
+++ trunk/catalog/admin/includes/modules/configuration/datatypeproduct.php 2012-04-02 20:28:47 UTC (rev 4129)
@@ -140,6 +140,8 @@
$DB = Database::getInstance();
$list=new stdClass();
+ $list->activ_physique = false;
+ $list->activ_virtual = false;;
// $gID = 1;
$li=sqlconfiguration::fetch(array('group_id'=> (int)self::$gID), true);
@@ -165,6 +167,13 @@
$list->types = sqlstatus::fetch(array('type'=>'product'), true);
+ foreach($list->types as $row){
+ if((bool)!in_array($row->id, explode(',', TYPE_VIRTUAL_PRODUCTS)) )
+ $list->activ_physique = true;
+ if((bool)in_array($row->id, explode(',', TYPE_VIRTUAL_PRODUCTS)) )
+ $list->activ_virtual = true;
+ }
+
return $list;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-02 16:13:57
|
Revision: 4128
http://oscss.svn.sourceforge.net/oscss/?rev=4128&view=rev
Author: oscim
Date: 2012-04-02 16:13:47 +0000 (Mon, 02 Apr 2012)
Log Message:
-----------
correction coquille dans l'install
correction driver mysqli
Modified Paths:
--------------
trunk/catalog/common/classes/sql_drivers/DB_Mysqli.php
trunk/catalog/install/includes/classes/core.php
trunk/catalog/install/includes/content/core.installdb.php
trunk/catalog/install/includes/content/core.modes.php
Modified: trunk/catalog/common/classes/sql_drivers/DB_Mysqli.php
===================================================================
--- trunk/catalog/common/classes/sql_drivers/DB_Mysqli.php 2012-04-02 15:32:29 UTC (rev 4127)
+++ trunk/catalog/common/classes/sql_drivers/DB_Mysqli.php 2012-04-02 16:13:47 UTC (rev 4128)
@@ -297,8 +297,14 @@
*/
protected function get_error()
{
-
- oscss_db_error($this->strQuery, 0, @$this->resConnection->error);
+ switch(mysqli_errno(@$this->resConnection)){
+ case 1091: // upgrade DROP COLUM col not exits
+ case 1060: // upgrade ADD COLUM col exits
+ break;
+ default:
+ oscss_db_error($this->strQuery, 0, @$this->resConnection->error);
+ }
+// oscss_db_error($this->strQuery, 0, @$this->resConnection->error);
// return @$this->resConnection->error;
}
Modified: trunk/catalog/install/includes/classes/core.php
===================================================================
--- trunk/catalog/install/includes/classes/core.php 2012-04-02 15:32:29 UTC (rev 4127)
+++ trunk/catalog/install/includes/classes/core.php 2012-04-02 16:13:47 UTC (rev 4128)
@@ -39,58 +39,33 @@
}
}
-// exit;
-// /**
-// Ordre des etape de l'install
-// Fichier present dans /includes/content/
-// */
-// $etape=array(
-// /**
-// Check etat fichier et repertoire (droit fichier)
-// Cherche fichier configure pour detreminer mode d'install
-// */
-// 'core.base'=>1,
-// /**
-// 2 Etpape
-// Choix mode install (install|update)
-// Information DB , SSL
-// Information path , url
-// */
-// 'core.modes'=>2,
-// /**
-// */
-// 'core.update'=>3,
-// /**
-// Recup svn
-// */
-// 'core.installdb'=>4,
-// /**
-//
-// */
-// 'core.configuration'=>5,
-// 'core.template_sample'=>6,
-// 'core.finition'=>7,
-// );
-
-
asort($etape);
$i=1;
- if (!function_exists('curl_init') && !(boolean)ini_get('allow_url_fopen')){
- foreach($etape as $k=>$v)
- if($k!='core.update') $this->order_etape[$k]=$i++;
- }
- else
- foreach($etape as $k=>$v)
- $this->order_etape[$k]=$i++;
+ foreach($etape as $k=>$v){
+ if(!isset($_POST['install']) || !isset($_POST['install']['modes']) ) $this->order_etape[$k]=$i++;
+ elseif( isset($_POST['install']['modes']) ){
+ if($_POST['install']['modes'] == 'update'){
+ if(!in_array(substr($k,5) ,array('configuration' , 'installdb')))
+ $this->order_etape[$k]=$i++;
+ elseif( substr($k,5) =='installdb' && (!isset($_POST['upgrade']) || tep_not_null($_POST['upgrade'])) )
+ $this->order_etape[$k]=$i++;
-// print_r($this->order_etape);
-// exit;
+ }
+ else
+ $this->order_etape[$k]=$i++;
+ }
+
+ else echo substr($k,5);
+
+}
+
+
$this->Pile=array();
}
@@ -212,20 +187,24 @@
/**
Repost Post
*/
- function repet_post(){
+ function repet_post($return=false){
reset($_POST);
+ $s ='';
while (list($key, $value) = each($_POST)) {
if (!in_array($key,array('DB_TEST_CONNECTION','DC_LOADER_LANG','submit') )) {
if (is_array($value)) {
foreach($value as $k=>$v){
- echo "<p>".osc_draw_hidden_field($key . '['.$k.']', '', $v)."</p>\n";
+ $s .= "<p>".osc_draw_hidden_field($key . '['.$k.']', '', $v)."</p>\n";
}
} else {
- echo "<p>".osc_draw_hidden_field($key, '', $value)."</p>\n";
+ $s .= "<p>".osc_draw_hidden_field($key, '', $value)."</p>\n";
}
}
}
- echo "<p>".osc_draw_hidden_field('current_e', '', @$_GET['etape'])."</p>\n";
+ $s .= "<p>".osc_draw_hidden_field('current_e', '', @$_GET['etape'])."</p>\n";
+
+ if(!$return) echo $s;
+ else return $s;
}
/**
Modified: trunk/catalog/install/includes/content/core.installdb.php
===================================================================
--- trunk/catalog/install/includes/content/core.installdb.php 2012-04-02 15:32:29 UTC (rev 4127)
+++ trunk/catalog/install/includes/content/core.installdb.php 2012-04-02 16:13:47 UTC (rev 4128)
@@ -21,45 +21,46 @@
Installation du systeme de base, creation table + insertion conf
*/
private function install_base_db(){
- $this->get_fs_document_root();
- $this->get_db_conf();
+ $this->get_fs_document_root();
+ $this->get_db_conf();
- osc_db_connect($this->db['DBMOTOR'], $this->db['DBMOTOR_PORT'],$this->db['DBMOTOR_CHARSET'],$this->db['DB_SERVER'], $this->db['DB_SERVER_USERNAME'], $this->db['DB_SERVER_PASSWORD'],strtolower( $this->db['DBMOTOR_TYPE']) );
- osc_db_select_db($this->db['DB_DATABASE']);
- $db_error = false;
+ osc_db_connect($this->db['DBMOTOR'], $this->db['DBMOTOR_PORT'],$this->db['DBMOTOR_CHARSET'],$this->db['DB_SERVER'], $this->db['DB_SERVER_USERNAME'], $this->db['DB_SERVER_PASSWORD'],strtolower(
+$this->db['DBMOTOR_TYPE']) );
+ osc_db_select_db($this->db['DB_DATABASE']);
+ $db_error = false;
- $DB=Database::getInstance();
- $DB->query("SET storage_engine=".$this->db['DBMOTOR_TYPE'].";");
+ $DB=Database::getInstance();
+ $DB->query("SET storage_engine=".$this->db['DBMOTOR_TYPE'].";");
- osc_set_time_limit(0);
+ osc_set_time_limit(0);
- $driver = ( (strtolower( $this->db['DBMOTOR']) == 'mysqli')? 'mysql' : strtolower( $this->db['DBMOTOR']) );
+ $driver = ( (strtolower( $this->db['DBMOTOR']) == 'mysqli')? 'mysql' : strtolower( $this->db['DBMOTOR']) );
- // creation des tables
- foreach(core::browse_rep($this->fs_document_root . 'install/includes/sql/'.$driver.'/tables/') as $file){
- if(strpos($file['file'] , '.key')===false){
- osc_db_upgrade($this->db['DB_DATABASE'], $this->fs_document_root . 'install/includes/sql/'.$driver.'/tables/'.$file['file'] , $this->db['DB_TABLE_PREFIX']);
- }
- }
+ // creation des tables
+ foreach(core::browse_rep($this->fs_document_root . 'install/includes/sql/'.$driver.'/tables/') as $file){
+ if(strpos($file['file'] , '.key')===false){
+ osc_db_upgrade($this->db['DB_DATABASE'], $this->fs_document_root . 'install/includes/sql/'.$driver.'/tables/'.$file['file'] , $this->db['DB_TABLE_PREFIX']);
+ }
+ }
- // add key
- if($this->db['DBMOTOR_TYPE'] =='InnoDB')
- foreach(core::browse_rep($this->fs_document_root . 'install/includes/sql/'.$driver.'/tables/') as $file){
- if(strpos($file['file'] , '.key') > 0){
- osc_db_upgrade($this->db['DB_DATABASE'], $this->fs_document_root . 'install/includes/sql/'.$driver.'/tables/'.$file['file'] , $this->db['DB_TABLE_PREFIX']);
- }
- }
+ // add key
+ if($this->db['DBMOTOR_TYPE'] =='InnoDB')
+ foreach(core::browse_rep($this->fs_document_root . 'install/includes/sql/'.$driver.'/tables/') as $file){
+ if(strpos($file['file'] , '.key') > 0){
+ osc_db_upgrade($this->db['DB_DATABASE'], $this->fs_document_root . 'install/includes/sql/'.$driver.'/tables/'.$file['file'] , $this->db['DB_TABLE_PREFIX']);
+ }
+ }
- // add data config
- if ( ($db_error == false) ) {
- // data insert in db
- foreach(core::browse_rep($this->fs_document_root . 'install/includes/sql/'.$driver.'/data/') as $file){
- osc_db_install($this->db['DB_DATABASE'], $this->fs_document_root . 'install/includes/sql/'.$driver.'/data/'.$file['file'] , $this->db['DB_TABLE_PREFIX']);
- }
- }
+ // add data config
+ if ( ($db_error == false) ) {
+ // data insert in db
+ foreach(core::browse_rep($this->fs_document_root . 'install/includes/sql/'.$driver.'/data/') as $file){
+ osc_db_install($this->db['DB_DATABASE'], $this->fs_document_root . 'install/includes/sql/'.$driver.'/data/'.$file['file'] , $this->db['DB_TABLE_PREFIX']);
+ }
+ }
- if ($db_error != false) $this->PileMessage('error', core::l10n("Un problème à eu lieu durant la phase d'installation de la base de données" ) ) ;
- else $this->PileMessage('succes', core::l10n("L'installation de la base de données est ok" ) ) ;
+ if ($db_error != false) $this->PileMessage('error', core::l10n("Un problème à eu lieu durant la phase d'installation de la base de données" ) ) ;
+ else $this->PileMessage('succes', core::l10n("L'installation de la base de données est ok" ) ) ;
}
@@ -144,7 +145,7 @@
if($file !='.' && $file !='..' && $file !='.svn' ) {
if(!isset($_POST['upgrade']) || ( $_POST['upgrade'] != $file && $_POST['upgrade']<$file)) {
$s = '<form id="install" action="?etape='.$this->get_current_etape().'&upgrade=true" method="post">'."\n";
- $s .=$this->repet_post();
+ $s .=$this->repet_post(true);
$s .="<p>" .core::l10n("Mettre a niveau la base de donnée, de la version" ).
' '. substr($file,0,strpos($file,'_')).
' '.core::l10n("a" ).' '.substr($file,strpos($file,'_')+1).
Modified: trunk/catalog/install/includes/content/core.modes.php
===================================================================
--- trunk/catalog/install/includes/content/core.modes.php 2012-04-02 15:32:29 UTC (rev 4127)
+++ trunk/catalog/install/includes/content/core.modes.php 2012-04-02 16:13:47 UTC (rev 4128)
@@ -472,6 +472,7 @@
$this->get_fs_document_root();
$this->get_server_conf();
+ if (!function_exists('curl_init') && !(boolean)ini_get('allow_url_fopen'))
if(isset($_POST['USE_SVN']) && $_POST['USE_SVN'] =='on') {
// recup version svn core
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-02 15:32:39
|
Revision: 4127
http://oscss.svn.sourceforge.net/oscss/?rev=4127&view=rev
Author: oscim
Date: 2012-04-02 15:32:29 +0000 (Mon, 02 Apr 2012)
Log Message:
-----------
Removed Paths:
-------------
trunk/catalog/install/includes/sql/mysql/upgrade/tables/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-02 15:02:02
|
Revision: 4126
http://oscss.svn.sourceforge.net/oscss/?rev=4126&view=rev
Author: oscim
Date: 2012-04-02 15:01:51 +0000 (Mon, 02 Apr 2012)
Log Message:
-----------
devenu inutile
Removed Paths:
-------------
trunk/catalog/install/includes/content/core.update.php
Deleted: trunk/catalog/install/includes/content/core.update.php
===================================================================
--- trunk/catalog/install/includes/content/core.update.php 2012-04-02 15:00:53 UTC (rev 4125)
+++ trunk/catalog/install/includes/content/core.update.php 2012-04-02 15:01:51 UTC (rev 4126)
@@ -1,321 +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.1
- @date 16/12/11, 17:43
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
- @class update
- Prise en charge recup version courante svn / par rapport revision enregitré
- Utilise l'exporte n zip de trac
-*/
-
-define('URL_OSCSS_ORG_TRAC', 'http://sourceforge.net/apps/trac/oscss/changeset/?format=zip&new=SVN_REV_MAX&old=SVN_REV&new_path=branches%2F2.1.0%2Fcatalog&old_path=branches%2F2.1.0%2Fcatalog');
-define('URL_OSCSS_GET_REV', 'http://oscss.svn.sourceforge.net/viewvc/oscss?view=revision');
-
-define('PATH_SVN_BRANCHE', 'trunk/catalog/');
-
-/**
- TODO Prendre en charge la gestion du mode d'install (Classique / VHOST )
-*/
-define('FILEPATH_SVN_CORE', 'Documents/oscss.version.xml');
-
-
-
-class update
- extends core {
-
- public static function GetSort(){
- // sort in process
- return 20;
- }
-
-
- /**
- */
- private function fetchRemote($src,&$dest,$step=0) {
- if ($step > 3) return false;
-
- // Try curl to read remote file
- if (function_exists('curl_init')) {
- $ch = @curl_init();
- @curl_setopt($ch, CURLOPT_URL, $src);
- @curl_setopt($ch, CURLOPT_HEADER, 0);
- @curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
- @curl_setopt($ch, CURLOPT_USERAGENT, 'osCSS-2 Net Install');
- $content = @curl_exec($ch);
- @curl_close($ch);
- if ($content !== false) {
- $this->write_dest($content, $dest);
- return true;
- }
- }
-
- // Try file_get_contents to read remote file
- if ((boolean)ini_get('allow_url_fopen')) {
- $content = @file_get_contents($src);
- if ($content !== false) {
- $this->write_dest($content, $dest);
- return true;
- }
- }
-
- // Try fsockopen to read remote file
- $src = parse_url($src);
- $host = $src['host'];
- $path = $src['path'];
-
- if (($s = @fsockopen($host,80,$errno,$errstr,5)) === false) {
- return false;
- }
-
- fwrite($s,
- 'GET '.$path." HTTP/1.0\r\n"
- .'Host: '.$host."\r\n"
- ."User-Agent: osCSS-2 Svn upadte \r\n"
- ."Accept: text/xml,application/xml,application/xhtml+xml,text/html,text/plain,image/png,image/jpeg,image/gif,*/*\r\n"
- ."\r\n"
- );
-
- $i = 0;
- $in_content = false;
- while (!feof($s)) {
- $line = fgets($s,4096);
-
- if (rtrim($line,"\r\n") == '' && !$in_content) {
- $in_content = true;
- $i++;
- continue;
- }
- if ($i == 0) {
- if (!preg_match('/HTTP\/(\\d\\.\\d)\\s*(\\d+)\\s*(.*)/',rtrim($line,"\r\n"), $m)) {
- fclose($s);
- return false;
- }
- $status = (integer) $m[2];
- if ($status < 200 || $status >= 400) {
- fclose($s);
- return false;
- }
- }
- if (!$in_content) {
- if (preg_match('/Location:\s+?(.+)$/',rtrim($line,"\r\n"),$m)) {
- fclose($s);
- return $this->fetchRemote(trim($m[1]),$dest,$step+1);
- }
- $i++;
- continue;
- }
- $this->write_dest($line, $dest);
- $i++;
- }
- fclose($s);
- return true;
- }
-
- /**
- Recuperation des element de svn basé sur le fichier oscss.version.xml
- @package oscss-2 <www http://www.oscss.org>
- @date 15/05/10, 16:19
- @author oscim <mail os...@os...> <www http://www.oscim.fr>
- */
- private function get_info_core($file,$name='svn'){
- if(!file_exists($file)) return $this->PileMessage('alert', core::l10n("Erreur récupération fichier") );
- $SimpleParser = simplexml_load_file($file);
- if(!isset($SimpleParser->$name)) $this->PileMessage('alert', core::l10n("Erreur récupération n° révision courant") );
- else return $SimpleParser->$name;
- }
-
-
- /**
- Recup current version svn, basé sur ViewVC fournis pas Sourceforge , vieVC 1.0.5
- @package oscss-2 <www http://www.oscss.org>
- @date 15/05/10, 16:19
- @author oscim <mail os...@os...> <www http://www.oscim.fr>
- */
- private function get_current_rev($src) {
- if (function_exists('curl_init')) {
- $ch = @curl_init();
- @curl_setopt($ch, CURLOPT_URL, $src);
- @curl_setopt($ch, CURLOPT_HEADER, 0);
- @curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
- @curl_setopt($ch, CURLOPT_USERAGENT, 'osCSS-2 Net Install');
- $content = @curl_exec($ch);
- @curl_close($ch);
- if ($content !== false){
- preg_match("#.oscss..Revision.([0-9]*).*#i",strip_tags($content),$val );
- if(is_numeric($val[1])) return $val[1];
- }
- else return false;
- }
- elseif (($content = @file_get_contents($src)) != false) {
-
- preg_match("#.oscss..Revision.([0-9]*).*#i",strip_tags($content),$val );
- if(is_numeric($val[1])) return $val[1];
- else return false;
- }
- else return false;
- }
-
-
- /**
- */
- static private function write_dest($str, &$dest) {
- if (is_resource($dest)) fwrite($dest, $str);
- else $dest .= $str;
- }
-
-
- /**
- Callback
- */
- public function exe_prev(){
- $this->get_fs_document_root();
- $this->get_server_conf();
-
- if(isset($_POST['USE_SVN']) && $_POST['USE_SVN'] =='on') {
-
- // recup version svn core
- $core_rev=$this->get_info_core($this->fs_document_root.FILEPATH_SVN_CORE);
- // version current svn
- $c_v=$this->get_current_rev(URL_OSCSS_GET_REV);
- $curent_rev=((isset($_POST['CURENT_REV']) && $c_v != $_POST['CURENT_REV'])? $_POST['CURENT_REV']: $c_v);
-
- if((int)$core_rev>=(int)$curent_rev) {
- $this->PileMessage('succes', core::l10n("Aucune mise à jour effectuée. pas de version plus récente") );
- return;
- }
- osc_set_time_limit(0);
- $file=$this->fs_document_root.'install/old'.$core_rev.'new'.$curent_rev.'_patch.zip';
- $oscss_zip = @fopen($file,'wb');
- // recup zip
- $tp=@file_get_contents(str_replace( array('SVN_REV_MAX', 'SVN_REV'), array($curent_rev, $core_rev), URL_OSCSS_ORG_TRAC));
- fputs( $oscss_zip,$tp);
- fclose($oscss_zip);
- if ($file!=false) $this->PileMessage('succes', core::l10n("Le fichier à été enregistré") ) ;
- else $this->PileMessage('alert', core::l10n("Le fichier n'as pas été enregistré") ) ;
-
- // add img sample
- sleep(1);
- tep_zip_extractto( $file,'../');
-
-
-
-
- // remplacement fichier de version
-
- $SimpleParser = @simplexml_load_file($this->fs_document_root.FILEPATH_SVN_CORE);
-
- $SimpleParser->svn = (int)$curent_rev;
-
-
- // Create a new DOMDocument object
- $doc = new DOMDocument('1.0');
-
- // add spaces, new lines and make the XML more readable format
- $doc->formatOutput = true;
-
- // Get a DOMElement object from a SimpleXMLElement object
- $domnode = dom_import_simplexml($SimpleParser);
-
- $domnode->preserveWhiteSpace = false;
-
- // Import node into current document
- $domnode = $doc->importNode($domnode, true);
-
- // Add new child at the end of the children
- $domnode = $doc->appendChild($domnode);
-
- // Dump the internal XML tree back into a string
- $saveXml = $doc->saveXML();
-
- $file_vers= @fopen(DIR_FS_CATALOG.self::$FILEPATH_SVN_CORE,'w');
- fputs( $file_vers,$saveXml);
- fclose($file_vers);
-
-
-
-
- // report branche dans le core
- if(file_exists($this->fs_document_root.PATH_SVN_BRANCHE)){
- $this->recurse_copy($this->fs_document_root.PATH_SVN_BRANCHE,$this->fs_document_root);
- $this->recurse_delete($this->fs_document_root.'branches/');
- }
- // deplacement admin
- if(file_exists($this->fs_document_root.'admin')){
- $this->recurse_copy($this->fs_document_root.'admin',$this->fs_document_root.$this->ws_admin_rand);
- if($this->ws_admin_rand !='admin')$this->recurse_delete($this->fs_document_root.'admin/');
- }
- }
- }
-
- /**
- */
- function draw_form(){
-
-
- $this->writeMessage();
-
-
-// echo '<h2>'.core::l10n("choix des fonctionalites a configurer" ).'</h2>'."\n";
-//
-// echo '<ul>'."\n".
-// '<li>'.'<h3>'.core::l10n("les produits" ).'</h3>'.
-// '<ul>'."\n".
-// '<li>'.''.'<label>'.core::l10n('produits basique - non manufacture').'</label>'."\n"
-// .osc_draw_checkbox_field('CONFIG_USE_PRD_TYPE_1')."\n"
-// .core::draw_help('CONFIG_USE_PRD_TYPE_1', core::l10n("produits non manufacture help" ) ).
-// '</li>'.
-// '<li>'.''.'<label>'.core::l10n('produits basique - non manufacture').'</label>'."\n"
-// .osc_draw_checkbox_field('CONFIG_USE_PRD_TYPE_1')."\n"
-// .core::draw_help('CONFIG_USE_PRD_TYPE_2', core::l10n("produits non manufacture help" ) ).
-// '</li>'.
-// '</ul>'."\n";
-//
-// echo '</ul>'."\n";
-//
-// echo '<br />'."\n";
-// echo '<br />'."\n";
-
- echo '<h2>'.core::l10n("Version svn (développement) de osCSS-2" ).'</h2>'."\n";
- echo '<p>'.core::l10n("Les version svn contienent les dernières correction et mise à jour. Les revisions sont calculé sur votre version, et, en dehors des beta, vous devriez utiliser cette option. L'ecart entre les versions signifie qu'aucun paquet n'as été proposé depuis, et donc souligne qu'il s'agit de revision et correction mineure " )."\n" .'</p><br/>'."\n";
- echo '<p>'.core::l10n("Version svn actuelle: " )."\n"
- .$this->get_info_core($this->fs_document_root.FILEPATH_SVN_CORE)."\n"
- .'</p>'."\n";
- echo '<form id="install" action="?etape='.( (isset($_POST['install']['modes'])&& $_POST['install']['modes'] == 'install')? $this->get_current_etape(1) : $this->get_current_etape(2) ).'" method="post">'."\n";
- $this->repet_post();
- if((int)$this->get_current_rev(URL_OSCSS_GET_REV) > (int)$this->get_info_core($this->fs_document_root.FILEPATH_SVN_CORE) ){
- echo '<p class="smallDesc">'."\n"
- .'<label>'.core::l10n('Récupérer le patch de la version courante du dépôt subversion').'</label>'."\n"
- .osc_draw_checkbox_field('USE_SVN')."\n"
- .core::draw_help('patchsvn', core::l10n("Patcher votre shop avec les dernières modification du svn"))."\n"
- .'</p>'."\n";
-
- echo '<p class="smallDesc">'."\n"
- .'<label>'.core::l10n('Revision N° precis :').'</label>'."\n"
- .osc_draw_input_field('CURENT_REV', '', $this->get_current_rev(URL_OSCSS_GET_REV) )."\n"
- .core::draw_help('revsvn', core::l10n("Le numéro de révision svn (basé sur :https://oscss.svn.sourceforge.net/svnroot/oscss )pour patcher votre shop "))."\n"
- .'</p>'."\n";
- }
-
-
-
-
- echo $this->draw_button();
- echo '</form>'."\n";
- }
-
- /**
- */
- function draw(){
- // conf
- $this->get_fs_document_root();
- $this->get_server_conf();
-
- $this->draw_form();
- }
-}
-
-?>
\ 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-02 15:01:02
|
Revision: 4125
http://oscss.svn.sourceforge.net/oscss/?rev=4125&view=rev
Author: oscim
Date: 2012-04-02 15:00:53 +0000 (Mon, 02 Apr 2012)
Log Message:
-----------
Modification du code et la mise a niveau via svn du code avant installation est pass?\195?\169 en arriere plan
Modified Paths:
--------------
trunk/catalog/install/includes/classes/core.php
trunk/catalog/install/includes/content/core.base.php
trunk/catalog/install/includes/content/core.configuration.php
trunk/catalog/install/includes/content/core.modes.php
Modified: trunk/catalog/install/includes/classes/core.php
===================================================================
--- trunk/catalog/install/includes/classes/core.php 2012-04-02 14:11:08 UTC (rev 4124)
+++ trunk/catalog/install/includes/classes/core.php 2012-04-02 15:00:53 UTC (rev 4125)
@@ -299,11 +299,14 @@
$_POST['DB_SERVER_PASSWORD']=DB_SERVER_PASSWORD;
$_POST['DB_DATABASE']=DB_DATABASE;
$_POST['DB_TABLE_PREFIX']=DB_TABLE_PREFIX;
- $_POST['DB_TABLE_PREFIX']=DB_TABLE_PREFIX;
+ $_POST['DBMOTOR']=DB_MOTOR;
+ $_POST['DBMOTOR_CHARSET']=DB_CHARSET;
+ $_POST['DBMOTOR_PORT']=DB_PORT;
+ $_POST['DBMOTOR_TYPE']=DB_MOTOR_TYPE;
$_POST['USE_PCONNECT']=USE_PCONNECT;
$_POST['STORE_SESSIONS']=(STORE_SESSIONS =='mysql')? 'mysql' : 'files';
$_POST['ENABLE_SSL']=(ENABLE_SSL =='true') ?'true' : false;
-
+// print_r($_POST);
return true;
}
return false;
Modified: trunk/catalog/install/includes/content/core.base.php
===================================================================
--- trunk/catalog/install/includes/content/core.base.php 2012-04-02 14:11:08 UTC (rev 4124)
+++ trunk/catalog/install/includes/content/core.base.php 2012-04-02 15:00:53 UTC (rev 4125)
@@ -12,6 +12,7 @@
+
class base
extends core {
@@ -88,6 +89,13 @@
$this->PileMessage('succes',core::l10n("Tout est correct"));
$this->writeMessage();
echo '<form id="install" action="?etape='.$this->get_current_etape(1).'" method="post">'."\n";
+
+
+ echo '<label>'.core::l10n('obtenir les dernieres correction durant le processus').'</label>'."\n"
+ .osc_draw_checkbox_field('USE_SVN')."\n"
+// .core::draw_help('patchsvn', core::l10n("Patcher votre shop avec les dernières modification du svn"))."\n"
+ .'</p>'."\n";
+
echo $this-> draw_button(true);
$this->repet_post();
echo '</form>'."\n";
@@ -104,7 +112,7 @@
/** Contrôle écriture possible pour la suite */
while ($r=each($this->ctr)){
- $type= (preg_match("#/$#i",$r['value'])) ?'rep' : 'file';
+ $type= (preg_match("#/$#i",$r['value'])) ?'rep' : 'file';
if(!isset($_POST['WS_STORE_ADMIN']) && !empty($_POST['WS_STORE_ADMIN']))$r['value']=str_replace('admin', $_POST['WS_STORE_ADMIN'],$r['value']);
if ($type=='file'){
@@ -139,6 +147,8 @@
}
+
+
function draw(){
$this->definition();
if(!isset($_GET['language'])) $this->draw_form_lang();
@@ -151,7 +161,7 @@
foreach($this->browse_rep($this->fs_document_root) as $item)
if(is_dir($this->fs_document_root.$item['file'])&& preg_match('#(admin.*)#i',$item['file'] , $match)){
- $_POST['WS_STORE_ADMIN']=$item['file'];
+ $_POST['WS_STORE_ADMIN']=$item['file'];
}
}
Modified: trunk/catalog/install/includes/content/core.configuration.php
===================================================================
--- trunk/catalog/install/includes/content/core.configuration.php 2012-04-02 14:11:08 UTC (rev 4124)
+++ trunk/catalog/install/includes/content/core.configuration.php 2012-04-02 15:00:53 UTC (rev 4125)
@@ -166,7 +166,7 @@
self::$corresp = $corresp;
function remove(&$item2){
- $item2 = "%".$item2."%";
+ $item2 = "%".$item2."%";
}
self::$c_k=array_keys($corresp);
array_walk(self::$c_k, 'remove');
@@ -197,14 +197,14 @@
}
elseif($_POST['ARBORESANCE'] =='vhost'){
- /**
- @remarks Copy to up folder
- */
- if(file_exists(self::$corresp['FS_DOCUMENT_ROOT']. 'Documents/')) {
- parent::recurse_copy(self::$corresp['FS_DOCUMENT_ROOT']. 'Documents/', self::$corresp['FS_ROOT_DOCS']);
+ /**
+ @remarks Copy to up folder
+ */
+ if(file_exists(self::$corresp['FS_DOCUMENT_ROOT']. 'Documents/')) {
+ parent::recurse_copy(self::$corresp['FS_DOCUMENT_ROOT']. 'Documents/', self::$corresp['FS_ROOT_DOCS']);
- parent::recurse_delete(self::$corresp['FS_DOCUMENT_ROOT']. 'Documents/');
- }
+ parent::recurse_delete(self::$corresp['FS_DOCUMENT_ROOT']. 'Documents/');
+ }
}
}
Modified: trunk/catalog/install/includes/content/core.modes.php
===================================================================
--- trunk/catalog/install/includes/content/core.modes.php 2012-04-02 14:11:08 UTC (rev 4124)
+++ trunk/catalog/install/includes/content/core.modes.php 2012-04-02 15:00:53 UTC (rev 4125)
@@ -13,7 +13,17 @@
Si mise a jour, passe etape configuration direct
*/
+define('URL_OSCSS_ORG_TRAC', 'http://sourceforge.net/apps/trac/oscss/changeset/?format=zip&new=SVN_REV_MAX&old=SVN_REV&new_path=branches%2F2.1.0%2Fcatalog&old_path=branches%2F2.1.0%2Fcatalog');
+define('URL_OSCSS_GET_REV', 'http://oscss.svn.sourceforge.net/viewvc/oscss?view=revision');
+define('PATH_SVN_BRANCHE', 'trunk/catalog/');
+
+/**
+ TODO Prendre en charge la gestion du mode d'install (Classique / VHOST )
+*/
+define('FILEPATH_SVN_CORE', 'Documents/oscss.version.xml');
+
+
class modes
extends core {
@@ -174,8 +184,8 @@
echo '<p class="smallDesc">'."\n"
.'<label>'.core::l10n('Type de base de donnée').'</label>'."\n"
.'<select name="DBMOTOR" >'."\n"
- .'<option value="Mysql" selected="selected">Mysql</option>'."\n"
- .'<option value="Mysqli" >Mysqli</option>'."\n"
+ .'<option value="Mysql" '.(( isset($_POST['DBMOTOR']) && $_POST['DBMOTOR']=='Mysql') ? ' selected="selected" ' : '').'>Mysql</option>'."\n"
+ .'<option value="Mysqli"'.(( isset($_POST['DBMOTOR']) && $_POST['DBMOTOR']=='Mysqli') ? ' selected="selected" ' : '').' >Mysqli</option>'."\n"
.'</select>'."\n"
.core::draw_help('httpSSL', core::l10n('Le type de base de donnée'))."\n"
.'</p>'."\n";
@@ -183,8 +193,8 @@
echo '<p class="smallDesc">'."\n"
.'<label>'.core::l10n('Base de donnée encodage').'</label>'."\n"
.'<select name="DBMOTOR_CHARSET" >'."\n"
- .'<option value="utf8" selected="selected">utf-8</option>'."\n"
- .'<option value="latin1" >latin1</option>'."\n"
+ .'<option value="utf8" '.(( isset($_POST['DBMOTOR_CHARSET']) && $_POST['DBMOTOR_CHARSET']=='utf8') ? ' selected="selected" ' : '').'>utf-8</option>'."\n"
+ .'<option value="latin1" '.(( isset($_POST['DBMOTOR_CHARSET']) && $_POST['DBMOTOR_CHARSET']=='latin1') ? ' selected="selected" ' : '').'>latin1</option>'."\n"
.'</select>'."\n"
.core::draw_help('httpSSL', core::l10n('L\'encodage de la base de donnée'))."\n"
.'</p>'."\n";
@@ -198,8 +208,8 @@
echo '<p class="smallDesc">'."\n"
.'<label>'.core::l10n('Type de moteur dans la base de donnée').'</label>'."\n"
.'<select name="DBMOTOR_TYPE" >'."\n"
- .'<option value="MyISAM" selected="selected">MyISAM</option>'."\n"
- .'<option value="InnoDB" >InnoDB</option>'."\n"
+ .'<option value="MyISAM" '.(( isset($_POST['DBMOTOR_TYPE']) && $_POST['DBMOTOR_TYPE']=='MyISAM') ? ' selected="selected" ' : '').'>MyISAM</option>'."\n"
+ .'<option value="InnoDB" '.(( isset($_POST['DBMOTOR_TYPE']) && $_POST['DBMOTOR_TYPE']=='InnoDB') ? ' selected="selected" ' : '').'>InnoDB</option>'."\n"
.'</select>'."\n"
.core::draw_help('httpSSL', core::l10n('Preferer le moteur innodb pour les base volumineuse, uniquement lors d\'une nouvelle installation. le moteur ne peut être converti apres installation'))."\n"
.'</p>'."\n";
@@ -310,11 +320,233 @@
<?php
}
+
+
+
+
+
+
+
+
+
+
/**
+ */
+ private function fetchRemote($src,&$dest,$step=0) {
+ if ($step > 3) return false;
+
+ // Try curl to read remote file
+ if (function_exists('curl_init')) {
+ $ch = @curl_init();
+ @curl_setopt($ch, CURLOPT_URL, $src);
+ @curl_setopt($ch, CURLOPT_HEADER, 0);
+ @curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+ @curl_setopt($ch, CURLOPT_USERAGENT, 'osCSS-2 Net Install');
+ $content = @curl_exec($ch);
+ @curl_close($ch);
+ if ($content !== false) {
+ $this->write_dest($content, $dest);
+ return true;
+ }
+ }
+
+ // Try file_get_contents to read remote file
+ if ((boolean)ini_get('allow_url_fopen')) {
+ $content = @file_get_contents($src);
+ if ($content !== false) {
+ $this->write_dest($content, $dest);
+ return true;
+ }
+ }
+
+ // Try fsockopen to read remote file
+ $src = parse_url($src);
+ $host = $src['host'];
+ $path = $src['path'];
+
+ if (($s = @fsockopen($host,80,$errno,$errstr,5)) === false) {
+ return false;
+ }
+
+ fwrite($s,
+ 'GET '.$path." HTTP/1.0\r\n"
+ .'Host: '.$host."\r\n"
+ ."User-Agent: osCSS-2 Svn upadte \r\n"
+ ."Accept: text/xml,application/xml,application/xhtml+xml,text/html,text/plain,image/png,image/jpeg,image/gif,*/*\r\n"
+ ."\r\n"
+ );
+
+ $i = 0;
+ $in_content = false;
+ while (!feof($s)) {
+ $line = fgets($s,4096);
+
+ if (rtrim($line,"\r\n") == '' && !$in_content) {
+ $in_content = true;
+ $i++;
+ continue;
+ }
+ if ($i == 0) {
+ if (!preg_match('/HTTP\/(\\d\\.\\d)\\s*(\\d+)\\s*(.*)/',rtrim($line,"\r\n"), $m)) {
+ fclose($s);
+ return false;
+ }
+ $status = (integer) $m[2];
+ if ($status < 200 || $status >= 400) {
+ fclose($s);
+ return false;
+ }
+ }
+ if (!$in_content) {
+ if (preg_match('/Location:\s+?(.+)$/',rtrim($line,"\r\n"),$m)) {
+ fclose($s);
+ return $this->fetchRemote(trim($m[1]),$dest,$step+1);
+ }
+ $i++;
+ continue;
+ }
+ $this->write_dest($line, $dest);
+ $i++;
+ }
+ fclose($s);
+ return true;
+ }
+
+ /**
+ Recuperation des element de svn basé sur le fichier oscss.version.xml
+ @package oscss-2 <www http://www.oscss.org>
+ @date 15/05/10, 16:19
+ @author oscim <mail os...@os...> <www http://www.oscim.fr>
+ */
+ private function get_info_core($file,$name='svn'){
+ if(!file_exists($file)) return $this->PileMessage('alert', core::l10n("Erreur récupération fichier") );
+ $SimpleParser = simplexml_load_file($file);
+ if(!isset($SimpleParser->$name)) $this->PileMessage('alert', core::l10n("Erreur récupération n° révision courant") );
+ else return $SimpleParser->$name;
+ }
+
+
+ /**
+ Recup current version svn, basé sur ViewVC fournis pas Sourceforge , vieVC 1.0.5
+ @package oscss-2 <www http://www.oscss.org>
+ @date 15/05/10, 16:19
+ @author oscim <mail os...@os...> <www http://www.oscim.fr>
+ */
+ private function get_current_rev($src) {
+ if (function_exists('curl_init')) {
+ $ch = @curl_init();
+ @curl_setopt($ch, CURLOPT_URL, $src);
+ @curl_setopt($ch, CURLOPT_HEADER, 0);
+ @curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+ @curl_setopt($ch, CURLOPT_USERAGENT, 'osCSS-2 Net Install');
+ $content = @curl_exec($ch);
+ @curl_close($ch);
+ if ($content !== false){
+ preg_match("#.oscss..Revision.([0-9]*).*#i",strip_tags($content),$val );
+ if(is_numeric($val[1])) return $val[1];
+ }
+ else return false;
+ }
+ elseif (($content = @file_get_contents($src)) != false) {
+
+ preg_match("#.oscss..Revision.([0-9]*).*#i",strip_tags($content),$val );
+ if(is_numeric($val[1])) return $val[1];
+ else return false;
+ }
+ else return false;
+ }
+
+
+ /**
+ */
+ static private function write_dest($str, &$dest) {
+ if (is_resource($dest)) fwrite($dest, $str);
+ else $dest .= $str;
+ }
+
+
+ /**
Callback
*/
- function exe_prev(){
+ public function exe_prev(){
+ $this->get_fs_document_root();
+ $this->get_server_conf();
+ if(isset($_POST['USE_SVN']) && $_POST['USE_SVN'] =='on') {
+
+ // recup version svn core
+ $core_rev=$this->get_info_core($this->fs_document_root.FILEPATH_SVN_CORE);
+ // version current svn
+ $c_v=$this->get_current_rev(URL_OSCSS_GET_REV);
+ $curent_rev=((isset($_POST['CURENT_REV']) && $c_v != $_POST['CURENT_REV'])? $_POST['CURENT_REV']: $c_v);
+
+ if((int)$core_rev>=(int)$curent_rev) {
+ $this->PileMessage('succes', core::l10n("Aucune mise à jour effectuée. pas de version plus récente") );
+ return;
+ }
+ osc_set_time_limit(0);
+ $file=$this->fs_document_root.'install/old'.$core_rev.'new'.$curent_rev.'_patch.zip';
+ $oscss_zip = @fopen($file,'wb');
+ // recup zip
+ $tp=@file_get_contents(str_replace( array('SVN_REV_MAX', 'SVN_REV'), array($curent_rev, $core_rev), URL_OSCSS_ORG_TRAC));
+ fputs( $oscss_zip,$tp);
+ fclose($oscss_zip);
+ if ($file!=false) $this->PileMessage('succes', core::l10n("Le fichier à été enregistré") ) ;
+ else $this->PileMessage('alert', core::l10n("Le fichier n'as pas été enregistré") ) ;
+
+ // add img sample
+ sleep(1);
+
+ tep_zip_extractto( $file,'../');
+
+
+
+
+ // remplacement fichier de version
+
+ $SimpleParser = @simplexml_load_file($this->fs_document_root.FILEPATH_SVN_CORE);
+
+ $SimpleParser->svn = (int)$curent_rev;
+
+
+ // Create a new DOMDocument object
+ $doc = new DOMDocument('1.0');
+
+ // add spaces, new lines and make the XML more readable format
+ $doc->formatOutput = true;
+
+ // Get a DOMElement object from a SimpleXMLElement object
+ $domnode = dom_import_simplexml($SimpleParser);
+
+ $domnode->preserveWhiteSpace = false;
+
+ // Import node into current document
+ $domnode = $doc->importNode($domnode, true);
+
+ // Add new child at the end of the children
+ $domnode = $doc->appendChild($domnode);
+
+ // Dump the internal XML tree back into a string
+ $saveXml = $doc->saveXML();
+
+ $file_vers= @fopen(DIR_FS_CATALOG.self::$FILEPATH_SVN_CORE,'w');
+ fputs( $file_vers,$saveXml);
+ fclose($file_vers);
+
+
+
+
+ // report branche dans le core
+ if(file_exists($this->fs_document_root.PATH_SVN_BRANCHE)){
+ $this->recurse_copy($this->fs_document_root.PATH_SVN_BRANCHE,$this->fs_document_root);
+ $this->recurse_delete($this->fs_document_root.'branches/');
+ }
+ // deplacement admin
+ if(file_exists($this->fs_document_root.'admin')){
+ $this->recurse_copy($this->fs_document_root.'admin',$this->fs_document_root.$this->ws_admin_rand);
+ if($this->ws_admin_rand !='admin')$this->recurse_delete($this->fs_document_root.'admin/');
+ }
+ }
}
function draw(){
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-02 14:11:17
|
Revision: 4124
http://oscss.svn.sourceforge.net/oscss/?rev=4124&view=rev
Author: oscim
Date: 2012-04-02 14:11:08 +0000 (Mon, 02 Apr 2012)
Log Message:
-----------
Ajout des repertorie destin?\195?\169e a conserver les fichier d'instalaltion minimum , creation de table , table install?\195?\169/installable, hatccess
Added Paths:
-----------
trunk/catalog/Documents/admin/origin/
trunk/catalog/Documents/admin/origin/db/
trunk/catalog/Documents/admin/origin/htaccess/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-02 14:03:53
|
Revision: 4123
http://oscss.svn.sourceforge.net/oscss/?rev=4123&view=rev
Author: oscim
Date: 2012-04-02 14:03:46 +0000 (Mon, 02 Apr 2012)
Log Message:
-----------
Correction de coquille , suite bug seo mutli-mode
Suite ajustement des datatypes
Modified Paths:
--------------
trunk/catalog/common/classes/datatype_drivers/Data_categorie.php
trunk/catalog/common/classes/datatype_drivers/Data_home.php
trunk/catalog/common/classes/seo_url.php
trunk/catalog/common/modules/core/seo_modrewrite/SeoR_no.php
trunk/catalog/includes/classes/core_page/listing.php
trunk/catalog/includes/classes/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-02 13:10:28 UTC (rev 4122)
+++ trunk/catalog/common/classes/datatype_drivers/Data_categorie.php 2012-04-02 14:03:46 UTC (rev 4123)
@@ -244,11 +244,11 @@
$this->listing_sql = "select DISTINCT p.products_id from ".TABLE_PRODUCTS." p, " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c, " . TABLE_CATEGORIES . "
c WHERE p.products_status > 0 AND c.categories_id=p2c.categories_id and c.categories_status='1' AND pd.products_id = p.products_id and pd.language_id = '" . (int)$languages_id . "' and p.products_id
= p2c.products_id ".(tep_not_null($list)? " AND p2c.categories_id IN (" . $list . ")" : '');
- $this->listing_sort = " c.sort_order, p.products_id DESC ";
+ $this->listing_sort = " c.sort_order, pd.products_name ";
}
else{
$this->listing_sql = "select DISTINCT p.products_id from ".TABLE_PRODUCTS." p, " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c, " . TABLE_CATEGORIES . " c WHERE p.products_status > 0 AND c.categories_id=p2c.categories_id and c.categories_status='1' AND pd.products_id = p.products_id and pd.language_id = '" . (int)$languages_id . "' and p.products_id = p2c.products_id and c.categories_id = '" . (int)$current_category_id . "' ";
- $this->listing_sort = " p.products_id DESC ";
+ $this->listing_sort = " pd.products_name ";
}
$this->listing_col_count = " p.products_id ";
@@ -257,17 +257,17 @@
case 'content':
if($category_depth == 'nested'){
$this->listing_sql = "select DISTINCT c.content_id from " . TABLE_CONTENT_DESCRIPTION . " cd, " . TABLE_CONTENT . " c, " . TABLE_CONTENT_TO_CATEGORIES . " ctc, " . TABLE_CATEGORIES . " cat where cat.categories_id=ctc.categories_id and cat.categories_status='1' and c.content_status = '1' and c.content_id = ctc.content_id and cd.content_id = ctc.content_id and cd.language_id = '" . (int)$languages_id . "' ".(tep_not_null($list)? " AND p2c.categories_id IN (" . $list . ")" : '');
- $this->listing_sort = " c.sort_order, c.content_id DESC ";
+ $this->listing_sort = " c.sort_order, cd.content_title ";
}
else{
$this->listing_sql = "SELECT DISTINCT c.content_id from " . TABLE_CONTENT . " c ".
-// " LEFT JOIN " . TABLE_CONTENT_DESCRIPTION . " cd ON( cd.content_id = c.content_id AND cd.language_id = '" . (int)$languages_id . "' ) ".
+ " LEFT JOIN " . TABLE_CONTENT_DESCRIPTION . " cd ON( cd.content_id = c.content_id AND cd.language_id = '" . (int)$languages_id . "' ) ".
" LEFT JOIN " . TABLE_CONTENT_TO_CATEGORIES . " ctc ON(c.content_id = ctc.content_id ) ".
" LEFT JOIN " . TABLE_CATEGORIES . " cat ON(cat.categories_id=ctc.categories_id AND cat.categories_status='1') ".
" WHERE c.content_status = '1' AND cat.categories_id = '" . (int)$current_category_id . "' ".
// " GROUP BY c.content_id ".
"";
- $this->listing_sort = " c.content_id DESC ";
+ $this->listing_sort = " cd.content_title ";
}
// for split_page colum count
$this->listing_col_count = " c.content_id ";
Modified: trunk/catalog/common/classes/datatype_drivers/Data_home.php
===================================================================
--- trunk/catalog/common/classes/datatype_drivers/Data_home.php 2012-04-02 13:10:28 UTC (rev 4122)
+++ trunk/catalog/common/classes/datatype_drivers/Data_home.php 2012-04-02 14:03:46 UTC (rev 4123)
@@ -24,7 +24,7 @@
@var DataType array reg for seo class
*/
public $reg_anchors = array(
-// 'home'=> 'h'
+ 'home'=> 'h'
);
/**
Modified: trunk/catalog/common/classes/seo_url.php
===================================================================
--- trunk/catalog/common/classes/seo_url.php 2012-04-02 13:10:28 UTC (rev 4122)
+++ trunk/catalog/common/classes/seo_url.php 2012-04-02 14:03:46 UTC (rev 4123)
@@ -294,7 +294,7 @@
$separator = '?';
if ($this->not_null($parameters)) $link .= $this->parse_parameters($page, $parameters ,$connection , $separator);
- else $link .= $this->parse_parameters($page, (!empty($parameters)?$parameters.'&':'') .'divers='.substr($page,0,strlen($page)-4) ,$connection , $separator); //$page;
+ else $link .= $this->parse_parameters($page, 'divers='.substr($page,0,strlen($page)-4) ,$connection , $separator); //$page;
$this->stop($this->timestamp, $time);
$this->performance['TOTAL_TIME'] += $time;
@@ -429,12 +429,14 @@
* @return string
*/
protected function parse_parameters($page, $params ,$connection , &$separator){
+
$params=str_replace('&','&',$params);
+ $p3 = array();
if(!empty($params))
$p = @explode('&', $params);
else
- $p=$p3 = array();
+ $p= array();
krsort($p);
$container = array();
@@ -496,8 +498,8 @@
}
//! home by page content
else {
-// $url = $this->make_url('home', DataTypes::Getseoquery('h', '', 'home', $this->languages_id), 'home', '', $separator);
-// $this->ValidateName($url, "h", 'home', $connection, $separator);
+ $url = $this->make_url('home', DataTypes::Getseoquery('h', '', 'home', $this->languages_id), 'home', '', $separator);
+ $this->ValidateName($url, "h", 'home', $connection, $separator);
}
break;
default:
@@ -508,15 +510,35 @@
}
- $url = (isset($url) && !empty($url) ? $url : $page);
- if ( sizeof($container) > 0 ){
- if ( $imploded_params = $this->implode_assoc($container) ){
- $url .= /*$separator . */$this->output_string( $imploded_params );
-// $separator = '&';
- }
- }
+ if(self::$SEO_REWRITE_TYPE =='no'){
+
+ if(file_exists(DIR_FS_CATALOG .$page ))
+ $new_page = $page;
+ else
+ $new_page = FILENAME_DEFAULT;
+
+ $url = $new_page . $separator . (isset($url) && !empty($url) ? $url : '');
+
+ if ( sizeof($container) > 0 ){
+ if ( $imploded_params = $this->implode_assoc($container) ){
+ $url .= $this->output_string( $imploded_params );
+ }
+ }
+ }
+ else{
+
+ $url = (isset($url) && !empty($url) ? $url : $page);
+
+ if ( sizeof($container) > 0 ){
+ if ( $imploded_params = $this->implode_assoc($container) ){
+ $url .= $separator . $this->output_string( $imploded_params );
+ // $separator = '&';
+ }
+ }
+ }
+
return $url;
}
Modified: trunk/catalog/common/modules/core/seo_modrewrite/SeoR_no.php
===================================================================
--- trunk/catalog/common/modules/core/seo_modrewrite/SeoR_no.php 2012-04-02 13:10:28 UTC (rev 4122)
+++ trunk/catalog/common/modules/core/seo_modrewrite/SeoR_no.php 2012-04-02 14:03:46 UTC (rev 4123)
@@ -61,11 +61,6 @@
function makeurl($page,$lang, $key, $id, $text='',$ext=''){
$replace = array();
- if(file_exists(DIR_FS_CATALOG .$page ))
- $new_page = $page;
-
- else
- $new_page = FILENAME_DEFAULT;
$base = explode('%_SEPARATORVALUE_%', str_replace('%_SEPARATOR_%', $this->separator , trim($this->mask)) );
@@ -74,7 +69,7 @@
$key . $this->separator . $id ,
);
- return $new_page.'?' .str_replace(
+ return str_replace(
$base,
$replace,
implode($this->separator_value, $base)
Modified: trunk/catalog/includes/classes/core_page/listing.php
===================================================================
--- trunk/catalog/includes/classes/core_page/listing.php 2012-04-02 13:10:28 UTC (rev 4122)
+++ trunk/catalog/includes/classes/core_page/listing.php 2012-04-02 14:03:46 UTC (rev 4123)
@@ -208,40 +208,32 @@
static public function sortby($GETsort){
global $categories;
$listing_sql = '';
- if ( isset($GETsort)) {
- $sort_col = substr($GETsort, 0 , 1);
- $sort_order = substr($GETsort, 1);
+// if ( isset($GETsort)) {
+// $sort_col = substr($GETsort, 0 , 1);
+// $sort_order = substr($GETsort, 1);
+//
+// switch (self::$column_list[$sort_col-1]) {
+// case 'PRODUCT_LIST_MODEL': $listing_sql.="p.products_model " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name"; break;
+// case 'PRODUCT_LIST_NAME': $listing_sql.="pd.products_name " . ($sort_order == 'd' ? 'desc' : ''); break;
+// case 'PRODUCT_LIST_MANUFACTURER': $listing_sql.="m.manufacturers_name " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name"; break;
+// case 'PRODUCT_LIST_QUANTITY': $listing_sql.="p.products_quantity " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name"; break;
+// case 'PRODUCT_LIST_IMAGE': $listing_sql.="pd.products_name"; break;
+// case 'PRODUCT_LIST_WEIGHT': $listing_sql.="p.products_weight " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name"; break;
+// case 'PRODUCT_LIST_PRICE': $listing_sql.="final_price " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name"; break;
+// }
+// }
- switch (self::$column_list[$sort_col-1]) {
- case 'PRODUCT_LIST_MODEL': $listing_sql.="p.products_model " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name"; break;
- case 'PRODUCT_LIST_NAME': $listing_sql.="pd.products_name " . ($sort_order == 'd' ? 'desc' : ''); break;
- case 'PRODUCT_LIST_MANUFACTURER': $listing_sql.="m.manufacturers_name " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name"; break;
- case 'PRODUCT_LIST_QUANTITY': $listing_sql.="p.products_quantity " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name"; break;
- case 'PRODUCT_LIST_IMAGE': $listing_sql.="pd.products_name"; break;
- case 'PRODUCT_LIST_WEIGHT': $listing_sql.="p.products_weight " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name"; break;
- case 'PRODUCT_LIST_PRICE': $listing_sql.="final_price " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name"; break;
- }
- }
+
/**
@brief Tri par default, option des categorie Champs sortchids_products & sortchids_content
*/
- elseif(isset($categories->sortchids_products) || isset($categories->sortchids_content)){
+ $test = 'sortchids_'.listingData::$type_object;
- if(tep_not_null($categories->sortchids_products) && ( listingData::$type_object=='product' || listingData::$type_object=='nested' ) ) $listing_sql .= $categories->sortchids_products.", pd.products_name";
- elseif( tep_not_null($categories->sortchids_content) && listingData::$type_object=='content' ) $listing_sql .= $categories->sortchids_content;
+ if(isset($categories->$test))
+ if(tep_not_null($categories->$test))
+ $listing_sql .= $categories->$test;
- }
-
- /**
- Tri si aucun tri deja effectué
- */
- if(empty($listing_sql)){
- if( listingData::$type_object=='product' ) $listing_sql .= 'pd.products_name';
- elseif( listingData::$type_object=='content' ) $listing_sql .= 'content_name';
- }
-
-
return $listing_sql;
}
Modified: trunk/catalog/includes/classes/drivers/data/categorie.php
===================================================================
--- trunk/catalog/includes/classes/drivers/data/categorie.php 2012-04-02 13:10:28 UTC (rev 4122)
+++ trunk/catalog/includes/classes/drivers/data/categorie.php 2012-04-02 14:03:46 UTC (rev 4123)
@@ -154,7 +154,9 @@
* @param $option
*/
protected static function cstr_query($orderby='', $limit='', $option=''){
- $query="SELECT c.categories_id, parent_id, cd.categories_description, c.categories_image, cd.categories_name,c.categories_datatype, sortchids_products, sortchids_content FROM " . TABLE_CATEGORIES . " c, " . TABLE_CATEGORIES_DESCRIPTION . " cd WHERE " . DataForceStatus(" c.categories_status='1' AND ") . " c.categories_id = cd.categories_id AND cd.language_id = '" . self::$lg_id . "' ";
+ $query="SELECT c.categories_id, parent_id, cd.categories_description, c.categories_image, cd.categories_name,c.categories_datatype, sortchids_products as sortchids_product, sortchids_content FROM
+" . TABLE_CATEGORIES . " c, " . TABLE_CATEGORIES_DESCRIPTION . " cd WHERE " . DataForceStatus(" c.categories_status='1' AND ") . " c.categories_id = cd.categories_id AND cd.language_id = '" .
+self::$lg_id . "' ";
$query .=self::$where_query;
$query .=' ORDER BY ' .(!tep_not_null($orderby)? ' c.sort_order, cd.categories_name ASC ' : $orderby) ;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-02 13:10:38
|
Revision: 4122
http://oscss.svn.sourceforge.net/oscss/?rev=4122&view=rev
Author: oscim
Date: 2012-04-02 13:10:28 +0000 (Mon, 02 Apr 2012)
Log Message:
-----------
Suite des correction et ajustement ,
mod seo classic tester et corriger + seo + htaccess
Suite report du code en dur contenu dans la class page.listing vers les datatype correspondants
Ajsutement GabaritTemplate pour prendre en charge correctement les datatypes
nottoyage du code et commentaires
Modified Paths:
--------------
trunk/catalog/common/classes/DataTypes.php
trunk/catalog/common/classes/datatype_drivers/Data_categorie.php
trunk/catalog/common/classes/datatype_drivers/Data_manufacturer.php
trunk/catalog/common/classes/datatype_drivers/Data_product.php
trunk/catalog/includes/classes/core_page/listing.php
trunk/catalog/includes/classes/drivers/page/GabaritTemplate.php
trunk/catalog/index.php
Modified: trunk/catalog/common/classes/DataTypes.php
===================================================================
--- trunk/catalog/common/classes/DataTypes.php 2012-04-02 09:56:56 UTC (rev 4121)
+++ trunk/catalog/common/classes/DataTypes.php 2012-04-02 13:10:28 UTC (rev 4122)
@@ -38,6 +38,10 @@
*/
protected static $subDataType = NULL;
/**
+ @var current type child module
+ */
+ protected static $rootDataType = NULL;
+ /**
@var This var define if RootListing actived and loop for check childs type
*/
public static $ForceChilds = false;
@@ -75,6 +79,11 @@
}
/**
+ */
+// public function Get
+
+
+ /**
@brief Get regle anchors in childs module for seo class
@note backoffice use
@return array all type datatypeDynamic for manage and adjust in BO
@@ -97,7 +106,11 @@
return $list;
}
-
+ /**
+ @brief Get all reg for htaccess based on datatype active
+ @note backoffice use
+ @return array for all contraint
+ */
public function GetRegHtaccess(){
self::getInstance();
@@ -235,9 +248,16 @@
/**
@brief Return currenttype datatype
@note fontoffice use
+ @param $type string (current/sub) for return current or sub type data
+ @return string
*/
- public static function GetTypePage(){
+ public static function GetTypePage($type = 'current'){
self::getInstance();
+
+ if($type == 'sub' && !empty(self::$subDataType) )
+ return self::$subDataType;
+ if($type == 'root' && !empty(self::$rootDataType) )
+ return self::$rootDataType;
return self::$currenttype;
}
@@ -279,6 +299,9 @@
if( $module->is_type($mode) ){
if( /*!self::GetForceChilds() && */ in_array($mode, array('unique'/*, 'listing'*/)) )
self::$currenttype = $module->DataType;
+ elseif($mode == 'listing')
+ self::$rootDataType = $module->DataType;
+
return $module;
}
}
@@ -301,7 +324,6 @@
foreach(self::$env->modlist as $class=>$module){
-// var_dump($class.$mode.$type);
if(
( isset(self::$env->RootListing[$class]) && is_array(self::$env->RootListing[$class]) && count(self::$env->RootListing[$class])>0 )// this module is RootListing (manufacturer, categories)
&& in_array($type, $module->RootListing) // RootListing array require content current type
Modified: trunk/catalog/common/classes/datatype_drivers/Data_categorie.php
===================================================================
--- trunk/catalog/common/classes/datatype_drivers/Data_categorie.php 2012-04-02 09:56:56 UTC (rev 4121)
+++ trunk/catalog/common/classes/datatype_drivers/Data_categorie.php 2012-04-02 13:10:28 UTC (rev 4122)
@@ -228,26 +228,50 @@
$this->ChildsType = $type;
+
+ /**
+ @remarks define all var for exec listing + split_page
+ sql Select , but no order
+ $this->listing_sql
+ sort of sql requet
+ $this->listing_sort
+ for split_page colum count
+ $this->listing_col_count
+ */
switch(strtolower($type)){
case 'product':
- if($category_depth == 'nested')
- $this->listing_sql = "select DISTINCT p.products_id from ".TABLE_PRODUCTS." p, " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c, " . TABLE_CATEGORIES . " c WHERE p.products_status > 0 AND c.categories_id=p2c.categories_id and c.categories_status='1' AND pd.products_id = p.products_id and pd.language_id = '" . (int)$languages_id . "' and p.products_id = p2c.products_id ".(tep_not_null($list)? " AND p2c.categories_id IN (" . $list . ")" : '');
- else
+ if($category_depth == 'nested'){
+ $this->listing_sql = "select DISTINCT p.products_id from ".TABLE_PRODUCTS." p, " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c, " . TABLE_CATEGORIES . "
+c WHERE p.products_status > 0 AND c.categories_id=p2c.categories_id and c.categories_status='1' AND pd.products_id = p.products_id and pd.language_id = '" . (int)$languages_id . "' and p.products_id
+= p2c.products_id ".(tep_not_null($list)? " AND p2c.categories_id IN (" . $list . ")" : '');
+ $this->listing_sort = " c.sort_order, p.products_id DESC ";
+ }
+ else{
$this->listing_sql = "select DISTINCT p.products_id from ".TABLE_PRODUCTS." p, " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c, " . TABLE_CATEGORIES . " c WHERE p.products_status > 0 AND c.categories_id=p2c.categories_id and c.categories_status='1' AND pd.products_id = p.products_id and pd.language_id = '" . (int)$languages_id . "' and p.products_id = p2c.products_id and c.categories_id = '" . (int)$current_category_id . "' ";
-
+ $this->listing_sort = " p.products_id DESC ";
+ }
+
+ $this->listing_col_count = " p.products_id ";
break;
case 'content':
- if($category_depth == 'nested')
+ if($category_depth == 'nested'){
$this->listing_sql = "select DISTINCT c.content_id from " . TABLE_CONTENT_DESCRIPTION . " cd, " . TABLE_CONTENT . " c, " . TABLE_CONTENT_TO_CATEGORIES . " ctc, " . TABLE_CATEGORIES . " cat where cat.categories_id=ctc.categories_id and cat.categories_status='1' and c.content_status = '1' and c.content_id = ctc.content_id and cd.content_id = ctc.content_id and cd.language_id = '" . (int)$languages_id . "' ".(tep_not_null($list)? " AND p2c.categories_id IN (" . $list . ")" : '');
- else
- $this->listing_sql = "SELECT c.content_id from " . TABLE_CONTENT . " c ".
+ $this->listing_sort = " c.sort_order, c.content_id DESC ";
+ }
+ else{
+ $this->listing_sql = "SELECT DISTINCT c.content_id from " . TABLE_CONTENT . " c ".
// " LEFT JOIN " . TABLE_CONTENT_DESCRIPTION . " cd ON( cd.content_id = c.content_id AND cd.language_id = '" . (int)$languages_id . "' ) ".
" LEFT JOIN " . TABLE_CONTENT_TO_CATEGORIES . " ctc ON(c.content_id = ctc.content_id ) ".
" LEFT JOIN " . TABLE_CATEGORIES . " cat ON(cat.categories_id=ctc.categories_id AND cat.categories_status='1') ".
" WHERE c.content_status = '1' AND cat.categories_id = '" . (int)$current_category_id . "' ".
// " GROUP BY c.content_id ".
"";
+ $this->listing_sort = " c.content_id DESC ";
+ }
+ // for split_page colum count
+ $this->listing_col_count = " c.content_id ";
+
break;
}
}
Modified: trunk/catalog/common/classes/datatype_drivers/Data_manufacturer.php
===================================================================
--- trunk/catalog/common/classes/datatype_drivers/Data_manufacturer.php 2012-04-02 09:56:56 UTC (rev 4121)
+++ trunk/catalog/common/classes/datatype_drivers/Data_manufacturer.php 2012-04-02 13:10:28 UTC (rev 4122)
@@ -141,8 +141,11 @@
switch(strtolower($type)){
case 'product':
- $this->listing_sql = "select DISTINCT p.products_id from ".TABLE_PRODUCTS." p, " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c, " . TABLE_CATEGORIES . " c WHERE p.products_status > 0 AND c.categories_id=p2c.categories_id and c.categories_status='1' AND pd.products_id = p.products_id and pd.language_id = '" . (int)$languages_id . "' and p.products_id = p2c.products_id and manufacturers_id = '" . (int)$_GET['manufacturers_id'] . "' ";
-
+ $this->listing_sql = "select DISTINCT p.products_id from ".TABLE_PRODUCTS." p, " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c, " . TABLE_CATEGORIES . " c
+WHERE p.products_status > 0 AND c.categories_id=p2c.categories_id and c.categories_status='1' AND pd.products_id = p.products_id and pd.language_id = '" . (int)$languages_id . "' and p.products_id =
+p2c.products_id and manufacturers_id = '" . (int)$_GET['manufacturers_id'] . "' ";
+ $this->listing_sort = " p.products_id DESC ";
+ $this->listing_col_count = " p.products_id ";
break;
}
}
Modified: trunk/catalog/common/classes/datatype_drivers/Data_product.php
===================================================================
--- trunk/catalog/common/classes/datatype_drivers/Data_product.php 2012-04-02 09:56:56 UTC (rev 4121)
+++ trunk/catalog/common/classes/datatype_drivers/Data_product.php 2012-04-02 13:10:28 UTC (rev 4122)
@@ -55,8 +55,8 @@
foreach($this->reg_filenames as $key=>$row)
if(!defined($key))define($key, $row);
- // define reg for hatcess
+
}
/**
Modified: trunk/catalog/includes/classes/core_page/listing.php
===================================================================
--- trunk/catalog/includes/classes/core_page/listing.php 2012-04-02 09:56:56 UTC (rev 4121)
+++ trunk/catalog/includes/classes/core_page/listing.php 2012-04-02 13:10:28 UTC (rev 4122)
@@ -107,34 +107,30 @@
/**
@brief Public fonciton d'appel du listing
- @param $type_object le type de datatype
- @param $listing_sql le listing produit par les class childs Datatype
+ @param $object_type l'object retourné par le datatype
@param $getstring param string sous forme de chaine (abc=a&id=2)
*/
- static public function listing($type_object, $listing_sql, $getstring=''){
+ static public function listing($object_type, $getstring=''){
global $page;
$page = page::getInstance();
$category_depth = $page->GetVar('category_depth');
- self::$type_object=$type_object;
+ self::$type_object=$object_type->ChildsType;
+
$get=tep_extrac_querystring($getstring);
- $listing_sql=self::query($get,$listing_sql);
+ self::orderby($object_type->listing_sort);
+ $listing_sql=self::query($get,$object_type->listing_sql);
+
$listing_sql .=self::Exeorderby().self::$limit;
if( empty(self::$limit) ) {
if(!class_exists('splitPageResults')) require_once(DIR_WS_CLASSES . 'split_page_results.php');
+ $listing_split = new splitPageResults($listing_sql, $page->_conf_value('MAX_DISPLAY_PAGE_LINKS'), $object_type->listing_col_count );
- if( self::$type_object =='product' )
- $listing_split = new splitPageResults($listing_sql, $page->_conf_value('MAX_DISPLAY_PAGE_LINKS'), 'p.products_id');
- elseif( self::$type_object =='content')
- $listing_split = new splitPageResults($listing_sql, $page->_conf_value('MAX_DISPLAY_PAGE_LINKS'));
- elseif( self::$type_object =='nested')
- $listing_split = new splitPageResults($listing_sql, $page->_conf_value('MAX_DISPLAY_PAGE_LINKS'), 'p.products_id');
-
return $listing_split;
}
else
@@ -156,25 +152,13 @@
$cID=(self::$category_id ===false)? $current_category_id : self::$category_id;
//! We show them all and all type (page, products,link )
- switch (self::$type_object){
- case 'product':
- break;
- case 'content':
- break;
-
- case 'nested':
- global $list;
- self::orderby('c.sort_order ');
- break;
- }
-
return $listing_sql;
}
static private function Exeorderby($sql_sort=''){
- $listing_sql = ' order by ';
+ $listing_sql = ' ORDER BY ';
$sort=listingUtility::sortby(@$_GET['sort']);
$listing_sql .= ((strlen(self::$sql_sort)>0 && strlen($sort)>0)? self::$sql_sort.',': self::$sql_sort);
Modified: trunk/catalog/includes/classes/drivers/page/GabaritTemplate.php
===================================================================
--- trunk/catalog/includes/classes/drivers/page/GabaritTemplate.php 2012-04-02 09:56:56 UTC (rev 4121)
+++ trunk/catalog/includes/classes/drivers/page/GabaritTemplate.php 2012-04-02 13:10:28 UTC (rev 4122)
@@ -42,13 +42,16 @@
$format_file="%1\$s.%2\$s.php";
$path = $page->getPathTemplate();
+
+// var_dump($page->page['type']);
+
switch($page->page['type']){
case 'product':
if (empty($page->page['var']['product_info']['products_id'])) $suffixe='error';
else $suffixe='p_'.$page->page['var']['product_info']['products_id'];
break;
- case 'listing':
- case 'listing_cat':
+
+ case 'categorie':
if (!tep_not_null($page->page['var']['cPath'])) $suffixe='error';
else {
if(strpos($page->page['var']['cPath'],'_')!=false)
@@ -117,7 +120,8 @@
$page->page['type']='none';
-// var_dump(DataTypes::GetTypePage());
+// var_dump(DataTypes::is_type('listing'));
+
/// obtain type pre-selected by index.php page (Childs datatype_drivers)
if( ($type = DataTypes::GetTypePage()) && $type !=NULL)
$page->page['type']=$type;
Modified: trunk/catalog/index.php
===================================================================
--- trunk/catalog/index.php 2012-04-02 09:56:56 UTC (rev 4121)
+++ trunk/catalog/index.php 2012-04-02 13:10:28 UTC (rev 4122)
@@ -78,8 +78,7 @@
DataTypes::transversal('transversal');
$listing=listing::getInstance();
-// $listing->_reset();
- $listing_split = $listing->listing($dyntype->ChildsType, $dyntype->listing_sql);
+ $listing_split = $listing->listing($dyntype);
$listing_query = $DB->query($listing_split->sql_query);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-02 09:57:07
|
Revision: 4121
http://oscss.svn.sourceforge.net/oscss/?rev=4121&view=rev
Author: oscim
Date: 2012-04-02 09:56:56 +0000 (Mon, 02 Apr 2012)
Log Message:
-----------
Evolution du driver de DB, pour ne pas bloquer sur certaine erreur
Amelioration et refonte de la gestion de l'installation de la db ou de l'upgrade
refonte des fichier d'upgrade pour respcter les nomenclatures utilis?\195?\169 dans les fichier d'install
Mise a niveau de l'upgrade de 2.1.0 vers 2.1.1
Modified Paths:
--------------
trunk/catalog/common/classes/Database.php
trunk/catalog/common/classes/sql_drivers/DB_Mysql.php
trunk/catalog/install/includes/content/core.configuration.php
trunk/catalog/install/includes/content/core.installdb.php
trunk/catalog/install/includes/content/core.update.php
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/data/20_osc_status.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/data/91_osc_configuration.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_categories.sql
Added Paths:
-----------
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_categories_extra.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_customers.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_geo_zones.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_holding_orders_products.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_newsletters.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_orders.sql
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_products.sql
Modified: trunk/catalog/common/classes/Database.php
===================================================================
--- trunk/catalog/common/classes/Database.php 2012-04-02 09:47:05 UTC (rev 4120)
+++ trunk/catalog/common/classes/Database.php 2012-04-02 09:56:56 UTC (rev 4121)
@@ -541,7 +541,8 @@
// Execute the query
if (($this->resResult = $this->execute_query()) == false)
{
- throw new Exception(sprintf('Query error: %s (%s)', $this->error, $this->strQuery));
+// throw new Exception(sprintf('Query error: %s (%s)', $this->error, $this->strQuery));
+ $this->get_error();
}
// No result set available
Modified: trunk/catalog/common/classes/sql_drivers/DB_Mysql.php
===================================================================
--- trunk/catalog/common/classes/sql_drivers/DB_Mysql.php 2012-04-02 09:47:05 UTC (rev 4120)
+++ trunk/catalog/common/classes/sql_drivers/DB_Mysql.php 2012-04-02 09:56:56 UTC (rev 4121)
@@ -298,7 +298,13 @@
{
// throw new Exception(sprintf("Mysql Error n°::%s \nRessource:: (%s) \ndetail::%s".mysql_errno().mysql_error(),$this->resConnection));
// return mysql_error($this->resConnection);
- oscss_db_error($this->strQuery, mysql_errno(), mysql_error());
+ switch(mysql_errno()){
+ case 1091: // upgrade DROP COLUM col not exits
+ case 1060: // upgrade ADD COLUM col exits
+ break;
+ default:
+ oscss_db_error($this->strQuery, mysql_errno(), mysql_error());
+ }
}
Modified: trunk/catalog/install/includes/content/core.configuration.php
===================================================================
--- trunk/catalog/install/includes/content/core.configuration.php 2012-04-02 09:47:05 UTC (rev 4120)
+++ trunk/catalog/install/includes/content/core.configuration.php 2012-04-02 09:56:56 UTC (rev 4121)
@@ -81,7 +81,7 @@
public static function GetSort(){
// sort in process
- return 99;
+ return 60;
}
Modified: trunk/catalog/install/includes/content/core.installdb.php
===================================================================
--- trunk/catalog/install/includes/content/core.installdb.php 2012-04-02 09:47:05 UTC (rev 4120)
+++ trunk/catalog/install/includes/content/core.installdb.php 2012-04-02 09:56:56 UTC (rev 4121)
@@ -33,26 +33,28 @@
osc_set_time_limit(0);
+ $driver = ( (strtolower( $this->db['DBMOTOR']) == 'mysqli')? 'mysql' : strtolower( $this->db['DBMOTOR']) );
+
// creation des tables
- foreach(core::browse_rep($this->fs_document_root . 'install/includes/sql/mysql/tables/') as $file){
+ foreach(core::browse_rep($this->fs_document_root . 'install/includes/sql/'.$driver.'/tables/') as $file){
if(strpos($file['file'] , '.key')===false){
- osc_db_upgrade($this->db['DB_DATABASE'], $this->fs_document_root . 'install/includes/sql/mysql/tables/'.$file['file'] , $this->db['DB_TABLE_PREFIX']);
+ osc_db_upgrade($this->db['DB_DATABASE'], $this->fs_document_root . 'install/includes/sql/'.$driver.'/tables/'.$file['file'] , $this->db['DB_TABLE_PREFIX']);
}
}
// add key
if($this->db['DBMOTOR_TYPE'] =='InnoDB')
- foreach(core::browse_rep($this->fs_document_root . 'install/includes/sql/mysql/tables/') as $file){
+ foreach(core::browse_rep($this->fs_document_root . 'install/includes/sql/'.$driver.'/tables/') as $file){
if(strpos($file['file'] , '.key') > 0){
- osc_db_upgrade($this->db['DB_DATABASE'], $this->fs_document_root . 'install/includes/sql/mysql/tables/'.$file['file'] , $this->db['DB_TABLE_PREFIX']);
+ osc_db_upgrade($this->db['DB_DATABASE'], $this->fs_document_root . 'install/includes/sql/'.$driver.'/tables/'.$file['file'] , $this->db['DB_TABLE_PREFIX']);
}
}
// add data config
if ( ($db_error == false) ) {
// data insert in db
- foreach(core::browse_rep($this->fs_document_root . 'install/includes/sql/mysql/data/') as $file){
- osc_db_install($this->db['DB_DATABASE'], $this->fs_document_root . 'install/includes/sql/mysql/data/'.$file['file'] , $this->db['DB_TABLE_PREFIX']);
+ foreach(core::browse_rep($this->fs_document_root . 'install/includes/sql/'.$driver.'/data/') as $file){
+ osc_db_install($this->db['DB_DATABASE'], $this->fs_document_root . 'install/includes/sql/'.$driver.'/data/'.$file['file'] , $this->db['DB_TABLE_PREFIX']);
}
}
@@ -60,19 +62,37 @@
else $this->PileMessage('succes', core::l10n("L'installation de la base de données est ok" ) ) ;
}
- private function upgrade_base_db($file){
+
+
+ /**
+ @brief upgrade
+ */
+ private function upgrade_base_db($revs){
$this->get_fs_document_root();
$this->get_db_conf();
+
osc_db_connect($this->db['DBMOTOR'], $this->db['DBMOTOR_PORT'],$this->db['DBMOTOR_CHARSET'],$this->db['DB_SERVER'], $this->db['DB_SERVER_USERNAME'], $this->db['DB_SERVER_PASSWORD'],strtolower( $this->db['DBMOTOR_TYPE']) );
+ osc_set_time_limit(0);
+ $driver = ( (strtolower( $this->db['DBMOTOR']) == 'mysqli')? 'mysql' : strtolower( $this->db['DBMOTOR']) );
+
osc_db_select_db($this->db['DB_DATABASE']);
$db_error = false;
- $sql_file = $this->fs_document_root . 'install/includes/upgrade/'.$file.'.sql';
+// $sql_file = $this->fs_document_root . 'install/includes/sql/'.$driver.'/upgrade/'.$file.'.sql';
- osc_set_time_limit(0);
+ foreach(core::browse_rep($this->fs_document_root . 'install/includes/sql/'.$driver.'/upgrade/'.$revs.'/tables/') as $file){
+ echo $file;
+ osc_db_upgrade($this->db['DB_DATABASE'], $this->fs_document_root . 'install/includes/sql/'.$driver.'/upgrade/'.$revs.'/tables/'.$file['file'] , $this->db['DB_TABLE_PREFIX']);
+ }
+
+ foreach(core::browse_rep($this->fs_document_root . 'install/includes/sql/'.$driver.'/upgrade/'.$revs.'/data/') as $file)
+ osc_db_install($this->db['DB_DATABASE'], $this->fs_document_root . 'install/includes/sql/'.$driver.'/upgrade/'.$revs.'/data/'.$file['file'] , $this->db['DB_TABLE_PREFIX']);
+
+
+
//
- osc_db_upgrade($this->db['DB_DATABASE'], $sql_file, $this->db['DB_TABLE_PREFIX']);
+// osc_db_upgrade($this->db['DB_DATABASE'], $sql_file, $this->db['DB_TABLE_PREFIX']);
//
// if ($db_error != false) $this->PileMessage('error', core::l10n("Un problème à eu lieu durant la phase d'installation de la base de données" ) ) ;
// else $this->PileMessage('succes', core::l10n("L'installation de la base de données est ok" ) ) ;
@@ -111,26 +131,48 @@
if(isset($_POST['upgrade']) )
echo '<hr />';
- foreach(parent::browse_rep('includes/upgrade') as $version){
- if(!isset($_POST['up_upgrade'][$version['name']])) {
- echo '<form id="install" action="?etape='.$this->get_current_etape().'&upgrade=true" method="post">'."\n";
- $this->repet_post();
- echo "<p>" .core::l10n("Mettre a niveau la base de donnée, de la version" ).
- ' '. substr($version['name'],0,strpos($version['name'],'-')).
- ' '.core::l10n("a" ).' '.substr($version['name'],strpos($version['name'],'-')+1).
- osc_draw_hidden_field('upgrade', '', $version['name']) .
- ' <input type="submit" class="submitBt" name="up_bouton_'.$version['name'].'" value="'.core::l10n("Mettre a jour" ).'" />';
- echo "</p>\n".'</form>'."\n";
- }
+ $this->get_fs_document_root();
+ $this->get_db_conf();
+
+ $driver = ( (strtolower( $this->db['DBMOTOR']) == 'mysqli')? 'mysql' : strtolower( $this->db['DBMOTOR']) );
+
+
+ $fichier=opendir($this->fs_document_root . 'install/includes/sql/'.$driver.'/upgrade/');
+ $res=array();
+ $count=0;
+ while($file = readdir($fichier)){
+ if($file !='.' && $file !='..' && $file !='.svn' ) {
+ if(!isset($_POST['upgrade']) || ( $_POST['upgrade'] != $file && $_POST['upgrade']<$file)) {
+ $s = '<form id="install" action="?etape='.$this->get_current_etape().'&upgrade=true" method="post">'."\n";
+ $s .=$this->repet_post();
+ $s .="<p>" .core::l10n("Mettre a niveau la base de donnée, de la version" ).
+ ' '. substr($file,0,strpos($file,'_')).
+ ' '.core::l10n("a" ).' '.substr($file,strpos($file,'_')+1).
+ osc_draw_hidden_field('upgrade', '', $file) .
+ ' <input type="submit" class="submitBt" name="up_bouton_'.$file.'" value="'.core::l10n("Mettre a jour" ).'" />';
+ $s .= "</p>\n".'</form>'."\n";
+
+ $res[] = $s;
+ }
+ }
}
- echo '<hr />';
- echo '<form id="install" action="?etape='.$this->get_current_etape().'&upgrade=true" method="post">'."\n";
- $this->repet_post();
- echo "<p>" .core::l10n("Nouvelle installation. Supprime les données de la base si elles esistent " ).
- ' '.osc_draw_hidden_field('upgrade', '','install') .
- ' <input type="submit" class="submitBt" name="up_bouton_'.$version['name'].'" value="'.core::l10n("Installer" ).'" />';
- echo "</p>\n".'</form>'."\n";
+ krsort($res);
+
+ if( isset($_POST['db_exists']) && (bool)$_POST['db_exists'])
+ foreach($res as $row)
+ echo $row;
+
+
+ else {
+ echo '<hr />';
+ echo '<form id="install" action="?etape='.$this->get_current_etape().'&upgrade=true" method="post">'."\n";
+ $this->repet_post();
+ echo "<p>" .core::l10n("Nouvelle installation. Supprime les données de la base si elles esistent " ).
+ ' '.osc_draw_hidden_field('upgrade', '','install') .
+ ' <input type="submit" class="submitBt" name="up_bouton_'.$version['name'].'" value="'.core::l10n("Installer" ).'" />';
+ echo "</p>\n".'</form>'."\n";
+ }
echo '<hr />';
echo '<form id="install" action="?etape='.$this->get_current_etape(1).'" method="post">'."\n";
@@ -147,12 +189,14 @@
// conf
$this->get_server_conf();
// exe install db oscss
- if(!isset($_POST['db_exists']) || !(bool)$_POST['db_exists']) $this->install_base_db();
+// if(!isset($_POST['db_exists']) || !(bool)$_POST['db_exists']) $this->install_base_db();
// upgrade
if(isset($_POST['upgrade']) && tep_not_null($_POST['upgrade']) ){
- if($_POST['upgrade'] =='install') $this->install_base_db();
- else $this->upgrade_base_db($_POST['upgrade']);
+ if($_POST['upgrade'] =='install')
+ $this->install_base_db();
+ else
+ $this->upgrade_base_db($_POST['upgrade']);
}
// content
Modified: trunk/catalog/install/includes/content/core.update.php
===================================================================
--- trunk/catalog/install/includes/content/core.update.php 2012-04-02 09:47:05 UTC (rev 4120)
+++ trunk/catalog/install/includes/content/core.update.php 2012-04-02 09:56:56 UTC (rev 4121)
@@ -29,7 +29,7 @@
public static function GetSort(){
// sort in process
- return 99;
+ return 20;
}
Modified: trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/data/20_osc_status.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/data/20_osc_status.sql 2012-04-02 09:47:05 UTC (rev 4120)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/data/20_osc_status.sql 2012-04-02 09:56:56 UTC (rev 4121)
@@ -12,4 +12,12 @@
--+######################################################################--+
-UPDATE osc_status SET status_type = 'product' WHERE status_type = 'products_virtual_types';
\ No newline at end of file
+
+UPDATE osc_status SET status_type = 'product' WHERE status_type = 'products_virtual_types';
+
+
+-- if not exists (SELECT * FROM osc_status where status_type = 'geo_zone_type' AND status_name = 'VAT' )
+INSERT IGNORE INTO osc_status (status_id, status_type, language_id, status_name ) VALUES (1, 'geo_zone_type', 1, 'VAT');
+
+-- if not exists (SELECT * FROM osc_status WHERE status_type = 'geo_zone_type' AND status_name = 'SHIPPING' )
+INSERT IGNORE INTO osc_status (status_id, status_type, language_id, status_name ) VALUES (2, 'geo_zone_type', 1, 'SHIPPING');
Modified: trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/data/91_osc_configuration.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/data/91_osc_configuration.sql 2012-04-02 09:47:05 UTC (rev 4120)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/data/91_osc_configuration.sql 2012-04-02 09:56:56 UTC (rev 4121)
@@ -12,4 +12,22 @@
--+######################################################################--+
-UPDATE osc_configuration SET configuration_value = 'byfolder', set_function = NULL WHERE configuration_key = 'SEO_REWRITE_TYPE';
\ No newline at end of file
+UPDATE osc_configuration SET configuration_value = 'byfolder', set_function = NULL WHERE configuration_key = 'SEO_REWRITE_TYPE';
+
+
+
+insert IGNORE into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('CFG_CLASS_VIRTUAL_TYPE_1_S', 'CFG_CLASS_VIRTUAL_TYPE_1', '', 'CFG_CLASS_VIRTUAL_TYPE_L', '0', '0', NOW(), NOW(),NULL, 'tep_cfg_text_auto(', 1);
+insert IGNORE into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('CFG_CLASS_VIRTUAL_TYPE_2_S', 'CFG_CLASS_VIRTUAL_TYPE_2', '', 'CFG_CLASS_VIRTUAL_TYPE_L', '0', '0', NOW(), NOW(),NULL, 'tep_cfg_text_auto(', 1);
+insert IGNORE into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('CFG_CLASS_VIRTUAL_TYPE_3_S', 'CFG_CLASS_VIRTUAL_TYPE_3', '', 'CFG_CLASS_VIRTUAL_TYPE_L', '0', '0', NOW(), NOW(),NULL, 'tep_cfg_text_auto(', 1);
+insert IGNORE into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('CFG_CLASS_VIRTUAL_TYPE_4_S', 'CFG_CLASS_VIRTUAL_TYPE_4', '', 'CFG_CLASS_VIRTUAL_TYPE_L', '0', '0', NOW(), NOW(),NULL, 'tep_cfg_text_auto(', 1);
+insert IGNORE into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('TYPE_VIRTUAL_PRODUCTS_S', 'TYPE_VIRTUAL_PRODUCTS', '', 'TYPE_VIRTUAL_PRODUCTS_L', '0', '0', NOW(), NOW(),NULL, NULL, 2);
+insert IGNORE into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, configuration_type) values ('STOCK_MARK_PRODUCT_NO_STOCK_S', 'STOCK_MARK_PRODUCT_NO_STOCK', '*cmd*', 'STOCK_MARK_PRODUCT_NO_STOCK_L', '9', '4', NOW(), NOW(), 3);
+insert IGNORE into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('CUSTOMER_FORCE_UCWORDS_S', 'CUSTOMER_FORCE_UCWORDS', '6', 'CUSTOMER_FORCE_UCWORDS_L', '28', '20', NULL, NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),','3');
+insert IGNORE into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('CUSTOMER_FORCE_STRTOUPPER_S', 'CUSTOMER_FORCE_STRTOUPPER', '10', 'CUSTOMER_FORCE_STRTOUPPER_L', '28', '21', NULL, NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),','3');
+insert IGNORE into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('CUSTOMER_CITY_FORCE_STRTOUPPER_S', 'CUSTOMER_CITY_FORCE_STRTOUPPER', '10', 'CUSTOMER_CITY_FORCE_STRTOUPPER_L', '28', '21', NULL, NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),','3');
+insert IGNORE into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('PUBLIC_PAGE_TYPE_S', 'PUBLIC_PAGE_TYPE', 'listing,product,account,home,content', 'PUBLIC_PAGE_TYPE_L', '0', '0', NOW(), NOW(),NULL, NULL, 2);
+insert IGNORE into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('PUBLIC_DRIVERS_PAGE_S', 'PUBLIC_DRIVERS_PAGE', 'GabaritTemplate', 'PUBLIC_DRIVERS_PAGE_L', '0', '0', NOW(), NOW(),NULL, NULL, 2);
+insert IGNORE into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('NO_DISPLAY_SYMBOL_TAXE_S', 'NO_DISPLAY_SYMBOL_TAXE', 'GabaritTemplate', 'NO_DISPLAY_SYMBOL_TAXE_L', '0', '0', NOW(), NOW(),NULL, NULL, 2);
+
+
+delete from osc_configuration where configuration_key='PRODINFO_ATTRIBUTE_PLUGIN' limit 1;
\ 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-02 09:47:05 UTC (rev 4120)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_categories.sql 2012-04-02 09:56:56 UTC (rev 4121)
@@ -12,4 +12,4 @@
--+######################################################################--+
-ALTER TABLE osc_categories ADD categories_datatype varchar(64) NOT NULL AFTER categories_id
\ No newline at end of file
+ALTER TABLE osc_categories ADD categories_datatype varchar(64) NULL AFTER categories_id
\ No newline at end of file
Added: trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_categories_extra.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_categories_extra.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_categories_extra.sql 2012-04-02 09:56:56 UTC (rev 4121)
@@ -0,0 +1,21 @@
+--+######################################################################--+
+--| 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/ |
+--+######################################################################--+
+
+
+drop table if exists osc_categories_extra;
+CREATE TABLE IF NOT EXISTS osc_categories_extra (
+ categories_id int(11) NOT NULL,
+ cat_key varchar(150) NOT NULL,
+ cat_value varchar(250) NOT NULL,
+ UNIQUE KEY categories_id (categories_id,cat_key)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
\ No newline at end of file
Added: trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_customers.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_customers.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_customers.sql 2012-04-02 09:56:56 UTC (rev 4121)
@@ -0,0 +1,21 @@
+--+######################################################################--+
+--| 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/ |
+--+######################################################################--+
+
+
+
+
+
+ALTER TABLE osc_customers ADD COLUMN customers_language int(10) NOT NULL DEFAULT '1';
+ALTER TABLE osc_customers ADD COLUMN customers_status int(1) NOT NULL DEFAULT '1';
+
+ALTER TABLE osc_customers_groups ADD group_discount DECIMAL( 5, 2 ) NOT NULL DEFAULT '0.00';
\ No newline at end of file
Added: trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_geo_zones.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_geo_zones.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_geo_zones.sql 2012-04-02 09:56:56 UTC (rev 4121)
@@ -0,0 +1,19 @@
+--+######################################################################--+
+--| 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/ |
+--+######################################################################--+
+
+
+
+
+
+
+ALTER TABLE osc_geo_zones ADD geo_zone_type TINYINT( 1 ) NOT NULL DEFAULT '1' AFTER geo_zone_id ;
\ No newline at end of file
Added: trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_holding_orders_products.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_holding_orders_products.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_holding_orders_products.sql 2012-04-02 09:56:56 UTC (rev 4121)
@@ -0,0 +1,17 @@
+--+######################################################################--+
+--| 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/ |
+--+######################################################################--+
+
+
+
+
+ALTER TABLE osc_holding_orders_products ADD products_stock_attributes VARCHAR( 255 ) NULL AFTER products_quantity ;
\ No newline at end of file
Added: trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_newsletters.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_newsletters.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_newsletters.sql 2012-04-02 09:56:56 UTC (rev 4121)
@@ -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/ |
+--+######################################################################--+
+
+
+
+ALTER TABLE osc_newsletters ADD COLUMN newsletters_language int(11) NOT NULL default '1';
\ No newline at end of file
Added: trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_orders.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_orders.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_orders.sql 2012-04-02 09:56:56 UTC (rev 4121)
@@ -0,0 +1,19 @@
+--+######################################################################--+
+--| 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/ |
+--+######################################################################--+
+
+
+
+ALTER TABLE osc_orders ADD holding_origin_id INT( 11 ) NOT NULL ;
+
+ALTER TABLE osc_orders ADD class_payment VARCHAR( 30 ) NOT NULL AFTER holding_origin_id ,
+ADD class_shipping VARCHAR( 30 ) NOT NULL AFTER class_payment ;
\ No newline at end of file
Added: trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_products.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_products.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_products.sql 2012-04-02 09:56:56 UTC (rev 4121)
@@ -0,0 +1,20 @@
+--+######################################################################--+
+--| 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/ |
+--+######################################################################--+
+
+
+
+
+ALTER TABLE osc_products DROP COLUMN vendors_id ;
+
+ALTER TABLE osc_products ADD COLUMN track_stock INT( 1 ) NOT NULL DEFAULT 1;
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
