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...> - 2011-10-24 16:21:37
|
Revision: 3844
http://oscss.svn.sourceforge.net/oscss/?rev=3844&view=rev
Author: oscim
Date: 2011-10-24 16:21:27 +0000 (Mon, 24 Oct 2011)
Log Message:
-----------
Suite evolution des modules de configuration
Correction mineurs
Modified Paths:
--------------
trunk/catalog/admin/includes/functions/lib.configuration.php
trunk/catalog/admin/includes/template/oscss/inc/init_theme-1.php
trunk/catalog/admin/includes/template/oscss/stylesheet-1.css
trunk/catalog/admin/includes/widget/brief_config.php
trunk/catalog/common/classes/Database.php
trunk/catalog/install/includes/language/fr_FR/oscss_config.txt
trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration_group.sql
Added Paths:
-----------
trunk/catalog/admin/includes/gabarit/configuration/modadminconfig.listing.gab
trunk/catalog/admin/includes/gabarit/configuration/modcustextra/
trunk/catalog/admin/includes/gabarit/configuration/modcustextra/draw.delete.gab
trunk/catalog/admin/includes/gabarit/configuration/modcustextra/draw.edit.gab
trunk/catalog/admin/includes/gabarit/configuration/modcustextra/draw.listing.gab
trunk/catalog/admin/includes/gabarit/configuration/modlangue.listing.gab
trunk/catalog/admin/includes/gabarit/configuration/modprodextra/
trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.delete.gab
trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.edit.gab
trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.listing.gab
trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.value.edit.gab
trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.value.listing.gab
trunk/catalog/admin/includes/gabarit/configuration/modseourl.listing.gab
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modadminconfig.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modcustextra.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modlangue.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modprodextra.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modseourl.txt
trunk/catalog/admin/includes/modules/configuration/modadminconfig.php
trunk/catalog/admin/includes/modules/configuration/modcustextra.php
trunk/catalog/admin/includes/modules/configuration/modlangue.php
trunk/catalog/admin/includes/modules/configuration/modprodextra.php
trunk/catalog/admin/includes/modules/configuration/modseourl.php
Removed Paths:
-------------
trunk/catalog/admin/includes/gabarit/cfg_31.listing.gab
trunk/catalog/admin/includes/gabarit/cfg_33.delete.gab
trunk/catalog/admin/includes/gabarit/cfg_33.edit.gab
trunk/catalog/admin/includes/gabarit/cfg_33.listing.gab
trunk/catalog/admin/includes/gabarit/cfg_34.delete.gab
trunk/catalog/admin/includes/gabarit/cfg_34.label.edit.gab
trunk/catalog/admin/includes/gabarit/cfg_34.listing.gab
trunk/catalog/admin/includes/gabarit/cfg_34.value.edit.gab
trunk/catalog/admin/includes/gabarit/cfg_34.value.listing.gab
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_16.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_17.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_31.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_33.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_34.txt
trunk/catalog/admin/includes/modules/configuration/cfg_31.php
trunk/catalog/admin/includes/modules/configuration/cfg_33.php
trunk/catalog/admin/includes/modules/configuration/cfg_34.php
Modified: trunk/catalog/admin/includes/functions/lib.configuration.php
===================================================================
--- trunk/catalog/admin/includes/functions/lib.configuration.php 2011-10-24 10:04:15 UTC (rev 3843)
+++ trunk/catalog/admin/includes/functions/lib.configuration.php 2011-10-24 16:21:27 UTC (rev 3844)
@@ -28,7 +28,17 @@
/**
- Alias function for Store configuration values in the Administration Tool
+ @fn tep_cfg_select_option($select_array, $key_value, $key = '')
+ @brief Alias function for Store configuration values in the Administration Tool
+ @param $select_array array array('true', 'false')
+ @param $key_value current value status
+ @param $key key input name configuration[' . $key . '] Or configuration_value
+ @return string
+ <span class="edit-input">
+ <input type="radio" name="" />
+ <span class="edit-input-value Val-.."> text value </span>
+ <span class="edit-input-value-alternate Val-.."></span>
+ </span>
*/
function tep_cfg_select_option($select_array, $key_value, $key = '') {
$string = '';
@@ -36,15 +46,25 @@
$name = ((tep_not_null($key)) ? 'configuration[' . $key . ']' : 'configuration_value');
$string .= '<span class="edit-input"> <input type="radio" name="' . $name . '" value="' . $select_array[$i] . '"';
if ($key_value == $select_array[$i]) $string .= ' checked="checked"';
- $string .= '/> <span class="edit-input-value"> ' . $select_array[$i] . ' </span> </span> <br />';
+ $string .= '/> <span class="edit-input-value Val-'.$select_array[$i].' "> ' . $select_array[$i] . ' </span> <span class="edit-input-value-alternate Val-'.$select_array[$i].'"></span> </span> <br />';
}
return $string;
}
/**
- Function de la table admin_config; met en forme le tableau d'option,possible avec un tabelau clef/valeur, avec la key pour valeur db et value pour lecture humaine
- $select_array = array(key=value => value=text)
+ @fn tep_cfg_select_option_bis($select_array, $key_value, $key = '')
+ @brief Function de la table admin_config; met en forme le tableau d'option,possible avec un tabelau clef/valeur, avec la key pour valeur db et value pour lecture humaine
+ @param $select_array array array(key=value => value=text)
+ @param $key_value current value status
+ @param $key key input name configuration[' . $key . '] Or configuration_value
+ @return string
+ @return string
+ <span class="edit-input">
+ <input type="radio" name="" />
+ <span class="edit-input-value Val-.."> text value </span>
+ <span class="edit-input-value-alternate Val-.."></span>
+ </span>
*/
function tep_cfg_select_option_bis($select_array, $key_value, $key = '') {
$string = '';
@@ -52,18 +72,24 @@
$name = ((tep_not_null($key)) ? 'configuration[' . $key . ']' : 'configuration_value');
$string .= '<span class="edit-input"> <input type="radio" name="' . $name . '" value="' . $rs['key'] . '"';
if ($key_value == $rs['key']) $string .= ' checked="checked"';
- $string .= '/> <span class="edit-input-value"> ' . $rs['value'] . '</span> </span> <br />';
+ $string .= '/> <span class="edit-input-value Val-'.$rs['key'].' "> ' . $rs['value'] . '</span><span class="edit-input-value-alternate Val-'.$rs['key'].' "></span> </span> <br />';
}
return $string;
}
/**
- Alias tep_cfg_select_option_bis en Select
+ @fn tep_cfg_select_pull_down($select_array, $key_value, $key = '')
+ @brief Alias tep_cfg_select_option_bis en Select
+ @param $select_array array array(key=value => value=text)
+ @param $key_value current value status
+ @param $key key input name configuration[' . $key . '] Or configuration_value
+ @return string
*/
function tep_cfg_select_pull_down($select_array, $key_value, $key = '') {
$name = (tep_not_null($key) ? 'configuration[' . $key . ']' : 'configuration_value');
- foreach ($select_array as $k=>$v) $list_array[] = array('id' => $k, 'text' => $v);
+ foreach ($select_array as $k=>$v)
+ $list_array[] = array('id' => $k, 'text' => $v);
return tep_draw_pull_down_menu($name, $list_array, $key_value);
}
Deleted: trunk/catalog/admin/includes/gabarit/cfg_31.listing.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/cfg_31.listing.gab 2011-10-24 10:04:15 UTC (rev 3843)
+++ trunk/catalog/admin/includes/gabarit/cfg_31.listing.gab 2011-10-24 16:21:27 UTC (rev 3844)
@@ -1,50 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.0.9
- @date 18/08/10, 18:12
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-error_reporting(E_ALL);
-?>
-<h3><?php echo __('heading title') ?></h3>
-
- <div class="button_nav">
- <a class="button" href="<?php echo tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','lID')). 'action=new') ?>"><?php echo tep_image(DIR_WS_ICONS . 'icon_add_new.png', IMAGE_NEW_LANGUAGE). IMAGE_NEW_LANGUAGE ?></a>
- </div>
-
-<div class="box_left">
- <div id="ssmenu">
- <?php echo tep_ssmenu_configuration(cfg_31::$gparentID) ?>
- </div>
- <table class="dataTable">
- <thead>
- <tr>
- <th><?php echo __('table heading language name') ?></th>
- <th class="tleft" style="width:40px"><?php echo __('table heading language code') ?></th>
- <th class="tright"><?php echo __('table heading action') ?></th>
- </tr>
- </thead>
- <tbody>
- <?php foreach (cfg_31::$liste as $theme): ?>
- <tr class="view parent dataTableRow <?php echo (($theme->languages_id==@$_GET['lID'])?'Selected' :'') ?>">
- <td><?php echo $theme->name ?></td>
- <td><?php echo $theme->code ?></td>
- <td class="row_action">
- <a class="buttonimg" href="<?php echo tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','lID')). 'lID=' .$theme->languages_id. '&action=edit') ?>"><?php echo tep_image(DIR_WS_ICONS . 'icon_edit.png',IMAGE_EDIT )?></a>
- <a class="buttonimg" href="<?php echo tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','lID')). 'lID=' . $theme->languages_id . '&action=delete') ?>"><?php echo tep_image(DIR_WS_ICONS . 'icon_delete.png',IMAGE_DELETE) ?></a>
-
- <?php if (isset(cfg_31::$lInfo) && is_object(cfg_31::$lInfo) && ($theme->languages_id == cfg_31::$lInfo->languages_id)) { echo tep_image(DIR_WS_ICONS . 'icon_arrow_right.gif', ''); }
- else { echo '<a href="' . tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','oID')). 'lID=' . $theme->languages_id) . '">' . tep_image(DIR_WS_ICONS . 'icon_info.gif', IMAGE_ICON_INFO) . '</a>'; } ?>
- </td>
- </tr>
- <?php endforeach; ?>
-
- </tbody>
- </table>
-</div>
-
-<?php cfg_31::draw_right_columm(); ?>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/gabarit/cfg_33.delete.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/cfg_33.delete.gab 2011-10-24 10:04:15 UTC (rev 3843)
+++ trunk/catalog/admin/includes/gabarit/cfg_33.delete.gab 2011-10-24 16:21:27 UTC (rev 3844)
@@ -1,17 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 02/03/11, 08:34
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-?>
-<h3><?php echo __('heading title option delete') ?></h3>
- <?php echo tep_draw_form('delete', cfg_33::FILENAME, FILENAME_CFG_33.'&cID='.$_GET['cID'].'&action=deleteconfirm', 'post') ?>
-
- <?php echo tep_image_submit('', IMAGE_DELETE). tep_js_back(tep_href_link(cfg_33::FILENAME, tep_get_all_get_params(array('action','cID'))), IMAGE_CANCEL) ; ?>
-
- </form>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/gabarit/cfg_33.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/cfg_33.edit.gab 2011-10-24 10:04:15 UTC (rev 3843)
+++ trunk/catalog/admin/includes/gabarit/cfg_33.edit.gab 2011-10-24 16:21:27 UTC (rev 3844)
@@ -1,82 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 03/03/11, 20:17
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-global $languages;
-?>
-<h3><?php echo __('text heading edit field') ?></h3>
- <?php echo tep_draw_form('update', cfg_33::FILENAME, FILENAME_CFG_33.((!empty(cfg_33::$fInfo->fields_id )?'&cID=' . cfg_33::$fInfo->fields_id . '&action=update' :'&action=insert') ), 'post') ?>
-
-
- <p>
- <?php echo __('text edit intro') ?>
- </p>
-
-
-
- <p class="block_input">
- <?php echo __('text field name') ?>
- <?php for ($i=0, $n=sizeof($languages); $i<$n; $i++) : ?>
- <?php echo tep_image(DIR_WS_CATALOG_LANGUAGES . $languages[$i]['directory'] . '/images/' . $languages[$i]['image'], $languages[$i]['name']) . ' ' . tep_draw_input_field('fields_name[' . $languages[$i]['id'] . ']','fields_name_' . $languages[$i]['id'],cfg_33::get_customers_extra_fields_name(cfg_33::$fInfo->fields_id, $languages[$i]['id'])); ?>
- <?php endfor; ?>
- </p>
-
- <ul class="block_input">
- <li><?php echo tep_draw_radio_field('fields_input_type','fields_input_type', 0, (cfg_33::$fInfo->fields_input_type==0) ? true : false) . __('text input field') ?></li>
- <li><?php echo tep_draw_radio_field('fields_input_type','fields_input_type', 1, (cfg_33::$fInfo->fields_input_type==1) ? true : false) . __('text textarea field') ?></li>
- <li><?php echo tep_draw_radio_field('fields_input_type','fields_input_type', 2, (cfg_33::$fInfo->fields_input_type==2) ? true : false) . __('text radio field') ?></li>
- <li><?php echo tep_draw_radio_field('fields_input_type','fields_input_type', 3, (cfg_33::$fInfo->fields_input_type==3) ? true : false) . __('text check field') ?></li>
- <li><?php echo tep_draw_radio_field('fields_input_type','fields_input_type', 4, (cfg_33::$fInfo->fields_input_type==4) ? true : false) . __('text down field') ?></li>
- </ul>
-
- <p class="block_input">
- <label for="fields_input_value" title="<?php echo __('text field input value help') ?>"><?php echo __('text field input value').tep_image(DIR_WS_ICONS . 'icon_help.gif') ?></label>
- <?php echo tep_draw_textarea_field('fields_input_value', 'fields_input_value', 30, 8, cfg_33::$fInfo->fields_input_value) ?>
- </p>
-
- <p class="block_input">
- <label ><?php echo __('text field required status') ?></label>
- <?php echo tep_draw_radio_field('fields_required_status','fields_required_status', 0, (cfg_33::$fInfo->fields_required_status==0) ? true : false) . 'false' . tep_draw_radio_field('fields_required_status','fields_required_status', 1, (cfg_33::$fInfo->fields_required_status==1) ? true : false) . 'true' ?>
- </p>
-
-
- <p class="block_input">
- <label><?php echo __('text field size') ?></label>
- <?php echo tep_draw_input_field('fields_size','fields_size', cfg_33::$fInfo->fields_size) ?>
- </p>
-
- <p class="block_input">
- <label><?php echo __('text field status email') ?></label>
- <?php echo tep_draw_radio_field('fields_required_email','fields_required_email',0,(cfg_33::$fInfo->fields_required_email==0)?true:false) . 'false' . tep_draw_radio_field('fields_required_email','fields_required_email',1,(cfg_33::$fInfo->fields_required_email==1)?true:false) . 'true' ?>
- </p>
-
- <p class="block_input">
- <label for="fields_key" title="<?php echo __('text field input key') ?>"><?php echo __('text field key').tep_image(DIR_WS_ICONS . 'icon_help.gif') ?></label>
- <?php echo tep_draw_input_field('fields_key','fields_key', cfg_33::$fInfo->fields_key) ?>
- </p>
-
- <p class="block_input">
- <label for="fields_admin" title="<?php echo __('text field input fields_admin') ?>"><?php echo __('text field fields_admin').tep_image(DIR_WS_ICONS . 'icon_help.gif') ?></label>
- <?php echo tep_draw_pull_down_menu('fields_admin',array(array('id'=>0,'text'=>__('visible BO and FO')) ,array('id'=>1,'text'=>__('uniquement admin')) ,array('id'=>2,'text'=>__('hidden')) ), cfg_33::$fInfo->fields_admin) ?>
- </p>
-
- <p class="block_input">
- <label for="fields_special_mod" title="<?php echo __('text field input fields_special_mod') ?>"><?php echo __('text field fields_special_mod').tep_image(DIR_WS_ICONS . 'icon_help.gif') ?></label>
- <?php echo tep_draw_input_field('fields_special_mod','fields_special_mod', cfg_33::$fInfo->fields_special_mod) ?>
- </p>
-
- <p class="block_input">
- <label for="fields_group_class" title="<?php echo __('text field input fields_group_class') ?>"><?php echo __('text field fields_group_class').tep_image(DIR_WS_ICONS . 'icon_help.gif') ?></label>
- <?php echo tep_draw_input_field('fields_group_class','fields_group_class', cfg_33::$fInfo->fields_group_class) ?>
- </p>
-
- <div class="button_nav">
- <?php echo tep_image_submit('',((!empty(cfg_33::$fInfo->fields_id )?IMAGE_UPDATE :IMAGE_SAVE)) ). tep_js_back(tep_href_link(cfg_33::FILENAME, tep_get_all_get_params(array('action','cID'))), IMAGE_CANCEL) ; ?>
- </div>
- </form>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/gabarit/cfg_33.listing.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/cfg_33.listing.gab 2011-10-24 10:04:15 UTC (rev 3843)
+++ trunk/catalog/admin/includes/gabarit/cfg_33.listing.gab 2011-10-24 16:21:27 UTC (rev 3844)
@@ -1,62 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 03/03/11, 20:17
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-global $gparentID;
-?>
-<div id="ssmenu">
- <?php echo tep_ssmenu_configuration($gparentID) ?>
-</div>
-
- <h3><?php echo __("heading title"); ?></h3>
- <div class="button_nav">
- <p><?php echo '<a class="button" href="' . tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','cID')) . 'action=new') . '">' . tep_image(DIR_WS_ICONS . 'icon_add_new.png', IMAGE_INSERT). IMAGE_INSERT . '</a>'; ?></p>
- </div>
-
- <div class="">
-
- <table class="dataTable">
- <thead>
- <tr>
- <th><?php echo __('table heading fields'); ?></th>
- <th class="tcenter"><?php echo __('table heading visibility'); ?></th>
- <th class="tcenter"><?php echo __('table heading group class'); ?></th>
- <th class="tcenter"><?php echo __('table heading status'); ?></th>
- <th class="row_action"><?php echo __('table heading action'); ?></th>
- </tr>
- </thead>
- <tfoot>
- <tr>
- <td><?php echo cfg_33::$split->display_count(cfg_33::$fields_query_numrows, MAX_DISPLAY_SEARCH_RESULTS, $page, __('text display number of fields')); ?></td>
- <td colspan="2"><?php echo cfg_33::$split->display_links(cfg_33::$fields_query_numrows, MAX_DISPLAY_SEARCH_RESULTS, MAX_DISPLAY_PAGE_LINKS, $page);; ?></td>
- </tr>
- </tfoot>
- <?php foreach(cfg_33::$list as $fields) { ?>
- <tr class="dataTableRow <?php if(isset( cfg_33::$fInfo) && is_object( cfg_33::$fInfo) && cfg_33::$fInfo->fields_id == cfg_33::$cID) echo "Selected" ?>" >
- <td><?php echo $fields->fields_name; ?></td>
- <td><?php echo $fields->fields_admin; ?></td>
- <td><?php echo $fields->fields_group_class; ?></td>
- <td class="tcenter">
- <?php
- if ($fields->fields_status == '1') {
- echo tep_image(DIR_WS_ICONS . 'icon_status_green.gif', IMAGE_ICON_STATUS_GREEN) . ' <a href="' . tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','flag','fID')) . 'action=setflag&flag=0&fID=' . $fields->fields_id. '&page=' . $page) . '">' . tep_image(DIR_WS_ICONS . 'icon_status_red_light.gif', IMAGE_ICON_STATUS_RED_LIGHT) . '</a>';
- } else {
- echo '<a href="' . tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','flag','fID')) . 'action=setflag&flag=1&fID=' . $fields->fields_id . '&page=' . $page) . '">' . tep_image(DIR_WS_ICONS . 'icon_status_green_light.gif', IMAGE_ICON_STATUS_GREEN_LIGHT) . '</a> ' . tep_image(DIR_WS_ICONS . 'icon_status_red.gif', IMAGE_ICON_STATUS_RED);
- }
- ?>
- </td>
- <td class="row_action">
- <?php echo cfg_33::get_item_action($fields); ?>
- </td>
- </tr>
- <?php } ?>
- </table>
- </div>
-
-
Deleted: trunk/catalog/admin/includes/gabarit/cfg_34.delete.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/cfg_34.delete.gab 2011-10-24 10:04:15 UTC (rev 3843)
+++ trunk/catalog/admin/includes/gabarit/cfg_34.delete.gab 2011-10-24 16:21:27 UTC (rev 3844)
@@ -1,27 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 27/02/11, 09:51
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
- @brief gabarit for listing extra fields products
-*/
-?>
-
-<h3><?php echo HEADING_TITLE ?></h3>
-
-<h4><?php echo HEADING_DELETE . cfg_34::$eid ?></h4>
-
-<?php if (cfg_34::$double_check == 'no') {
- echo '<p>' . TEXT_ARE_SURE . (cfg_34::$pInfo->uses_list ? TEXT_VALUES_GONE : '') . "</p>\n";
- echo '<p>' . tep_draw_form('yes',cfg_34::FILENAME, tep_get_all_get_params(array('action','eid','confirm')). 'confirm=yes&action=delete&eid=' . cfg_34::$eid . '&used=' . cfg_34::$pInfo->used) . tep_draw_input_field('yes','', TEXT_YES, 'alt="' . TEXT_YES . '"', false, 'submit') . '</form> ';
- echo tep_draw_form('no', cfg_34::FILENAME, tep_get_all_get_params(array('action','eid','confirm')) .'eid=' . cfg_34::$eid) . tep_draw_input_field('no','', TEXT_NO, 'alt="' . TEXT_NO . '"', false, 'submit') . "</form></p>\n";
- } else {
- echo '<p><b>' . TEXT_CONFIRM_DELETE . (cfg_34::$pInfo->uses_list ? TEXT_VALUES_GONE : '') . "</b></p>\n";
- echo '<p>' . tep_draw_form('yes', cfg_34::FILENAME, tep_get_all_get_params(array('action','eid','confirm')). 'confirm=yes&action=delete&eid=' . cfg_34::$eid) . tep_draw_input_field('yes','', TEXT_YES, 'alt="' . TEXT_YES . '"', false, 'submit') . '</form> ';
- echo tep_draw_form('no', cfg_34::FILENAME, tep_get_all_get_params(array('action','eid','confirm')).'eid=' . cfg_34::$eid) . tep_draw_input_field('no','', TEXT_NO, 'alt="' . TEXT_NO . '"', false, 'submit') . "</form></p>\n";
- }
-?>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/gabarit/cfg_34.label.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/cfg_34.label.edit.gab 2011-10-24 10:04:15 UTC (rev 3843)
+++ trunk/catalog/admin/includes/gabarit/cfg_34.label.edit.gab 2011-10-24 16:21:27 UTC (rev 3844)
@@ -1,120 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 27/02/11, 09:51
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
- @brief gabarit for listing extra fields products
-
-*/
-global $action, $languages;
-?>
- <div class="box_unique">
- <h4><?php echo (($action == 'edit')? __('HEADING_NEW') : __('HEADING_EDIT') . cfg_34::$eid ) ?></h4>
- <?php
- if (!empty($messages)) {
- echo '<ul ' . ($error ? 'class="error"' : 'class="warning"') . '>' . "\n";
- foreach ($messages as $message) {
- echo '<li>' . $message . "</li>\n";
- }
- echo "</ul>\n";
- }
-
- echo tep_draw_form('field_entry',FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','eid','confirm')). 'action=' . (($action == 'new') ? 'insert' : 'update') . '&confirm=yes&eid=' . cfg_34::$eid /*. ($confirmation_needed ? '&confirm=yes' : '')*/, 'post'); ?>
-
-
- <p class="block_input">
- <label><?php echo __('ENTRY_ACTIVATE_NOW') ?></label>
- <?php echo tep_draw_radio_field('status','status', '1', (((int)cfg_34::$cInfo['epf_status']==1)? true : false) ). ' ' .__('TEXT_YES'). ' ' . tep_draw_radio_field('status','status', '0', (((int)cfg_34::$cInfo['epf_status']==0)? true : false) ). ' ' .__('TEXT_NO'); ?>
- </p>
-
- <?php if ($action == 'new') : ?>
- <p class="block_input">
- <label><?php echo __('ENTRY_VALUE_LIST') ?></label>
- <?php echo tep_draw_radio_field('value_list','value_list', '1',(((int)cfg_34::$cInfo['epf_uses_value_list']==1)? true : false)) . ' ' .__('TEXT_YES'). ' ' . tep_draw_radio_field('value_list','value_list', '0',(((int)cfg_34::$cInfo['epf_uses_value_list']==0)? true : false)) . ' ' .__('TEXT_NO'); ?>
- </p>
- <?php elseif ((int)cfg_34::$cInfo['epf_uses_value_list']==1) : ?>
- <?php echo tep_draw_hidden_field('value_list','value_list', (((int)cfg_34::$cInfo['epf_uses_value_list']==1)? '1' : '0')) ?>
- <?php endif; ?>
-
- <p class="block_input">
- <label for="epf_active_for_language" title="<?php echo __('ENTRY_ACTIVE_HELP') ?>"><?php echo __('ENTRY_ACTIVE'). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
- <?php echo tep_draw_radio_field('epf_active_for_language' ,'epf_active_for_language' , '1', (((int)cfg_34::$cInfo['epf_active_for_language']==1)? true : false) ) . ' ' . __('TEXT_YES') .
- ' ' . tep_draw_radio_field('epf_active_for_language' ,'epf_active_for_language', '0', (((int)cfg_34::$cInfo['epf_active_for_language']==0)? true : false) ) . ' ' . __('TEXT_NO'); ?>
- </p>
-
- <fieldset class="tabs_lang block_field">
- <ul>
- <?php for ($i=0, $n=sizeof($languages); $i<$n; $i++) { ?>
- <li><?php echo '<a href="#products_name-' . ($i+1).'" >' . tep_image(DIR_WS_CATALOG_LANGUAGES . $languages[$i]['directory'] . '/images/' . $languages[$i]['image'], $languages[$i]['name']) . ' ' . $languages[$i]['name'] . '</a>' ?></li>
- <?php } ?>
- </ul>
- <?php for ($i=0, $n=sizeof($languages); $i<$n; $i++) { ?>
- <ul id="<?php echo 'products_name-'.($i+1) ?>">
- <li class="block_input">
- <?php echo __('ENTRY_LABEL') . tep_draw_input_field('label_' . $languages[$i]['id'],'label_' . $languages[$i]['id'], cfg_34::$pInfo[$languages[$i]['id']]['epf_label'], "size=64 maxlength=64") ?>
- </li>
- </ul>
- <?php } ?>
- </fieldset>
-
- <p class="block_input">
- <label for="epf_key" title="<?php echo __('ENTRY_UNIQ_KEY_HELP') ?>"><?php echo __('ENTRY_UNIQ_KEY'). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
- <?php echo tep_draw_input_field('epf_key','epf_key', cfg_34::$cInfo['epf_key']); ?>
- </p>
-
- <p class="block_input">
- <label><?php echo __('ENTRY_ORDER') ?></label>
- <?php echo tep_draw_input_field('sort_order','sort_order', (!empty(cfg_34::$cInfo['epf_order'])? cfg_34::$cInfo['epf_order'] : '0' ) ); ?>
- </p>
- <p class="block_input">
- <label for="search" title="<?php echo __('ENTRY_SEARCH_HELP') ?>"><?php echo __('ENTRY_SEARCH'). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
- <?php echo tep_draw_radio_field('search','search', '1', (((int)cfg_34::$cInfo['epf_advanced_search']==1)? true : false) ). ' ' .__('TEXT_YES'). ' ' . tep_draw_radio_field('search','search', '0', (((int)cfg_34::$cInfo['epf_advanced_search']==0)? true : false) ) . ' ' .__('TEXT_NO'); ?>
- </p>
- <p class="block_input">
- <label><?php echo __('ENTRY_LISTING') ?></label>
- <?php echo tep_draw_radio_field('listing','listing', '1', (((int)cfg_34::$cInfo['epf_show_in_listing']==1)? true : false) ) . ' ' .__('TEXT_YES'). ' ' . tep_draw_radio_field('listing','listing', '0', (((int)cfg_34::$cInfo['epf_show_in_listing']==0)? true : false) ) . ' ' .__('TEXT_NO'); ?>
- </p>
- <p class="block_input">
- <label><?php echo __('ENTRY_META') ?></label>
- <?php echo tep_draw_radio_field('meta','meta', '1',(((int)cfg_34::$cInfo['epf_use_as_meta_keyword']==1)? true : false) ) . ' ' .__('TEXT_YES'). ' ' . tep_draw_radio_field('meta','meta', '0', (((int)cfg_34::$cInfo['epf_use_as_meta_keyword']==0)? true : false) ) . ' ' .__('TEXT_NO'); ?>
- </p>
- <p class="block_input">
- <label><?php echo __('ENTRY_USE_ADMIN') ?></label>
- <?php echo tep_draw_radio_field('epf_admin','epf_admin', '1', (((int)cfg_34::$cInfo['epf_admin']==1)? true : false) ) . ' ' .__('TEXT_YES'). ' ' . tep_draw_radio_field('epf_admin','epf_admin', '0', (((int)cfg_34::$cInfo['epf_admin']==0)? true : false) ) . ' ' .__('TEXT_NO'); ?>
- </p>
- <p class="block_input">
- <label for="epf_special_mod" title="<?php echo __('ENTRY_SPECIFIQUE_MODULE_HELP') ?>"><?php echo __('ENTRY_SPECIFIQUE_MODULE'). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
- <?php echo tep_draw_input_field('epf_special_mod','epf_special_mod', cfg_34::$cInfo['epf_special_mod']); ?>
- </p>
- <p class="block_input">
- <label><?php echo __('ENTRY_CHAIN') ?></label>
- <?php echo tep_draw_radio_field('chain','chain', '1', (((int)cfg_34::$cInfo['epf_show_parent_chain']==1)? true : false) ) . ' ' .__('TEXT_YES'). ' ' . tep_draw_radio_field('chain','chain', '0', (((int)cfg_34::$cInfo['epf_show_parent_chain']==0)? true : false)) . ' ' .__('TEXT_NO'); ?>
- </p>
-
- <?php if ($action == 'new' || (!cfg_34::$cInfo['epf_uses_value_list']) ) : ?>
- <p class="block_input">
- <label for="restrict" title="<?php echo __('ENTRY_RESTRICT_HELP') ?>"><?php echo __('ENTRY_RESTRICT'). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
- <?php echo tep_draw_radio_field('restrict','restrict', '1',(((int)cfg_34::$cInfo['epf_use_to_restrict_listings']==1)? true : false)) . ' ' .__('TEXT_YES'). ' ' . tep_draw_radio_field('restrict','restrict', '0',(((int)cfg_34::$cInfo['epf_use_to_restrict_listings']==0)? true : false) ) . ' ' .__('TEXT_NO'); ?>
- </p>
-
- <p class="block_input">
- <label for="size" title="<?php echo __('ENTRY_SIZE_HELP') ?>"><?php echo __('ENTRY_SIZE'). tep_image(DIR_WS_ICONS . 'icon_help.gif') ?></label>
- <?php echo tep_draw_input_field('size','size', cfg_34::$cInfo['epf_size'],'',true); ?>
- </p>
- <?php else: ?>
- <?php echo tep_draw_hidden_field('size','size', cfg_34::$cInfo['epf_size'] ) .tep_draw_hidden_field('restrict','restrict', cfg_34::$cInfo['restrict'],(((int)cfg_34::$cInfo['restrict']==1)? '1' : '0')) ?>
- <?php endif; ?>
-
-
-
-
- <div class="button_nav">
- <?php echo tep_image_submit('button_save.gif', IMAGE_SAVE) . ' <a class="button" href="' . tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','flag','eid')) . 'eid=' . cfg_34::$eid) . '">' . IMAGE_CANCEL . "</a>\n" ?>
- </div>
- </form>
-
- </div>
Deleted: trunk/catalog/admin/includes/gabarit/cfg_34.listing.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/cfg_34.listing.gab 2011-10-24 10:04:15 UTC (rev 3843)
+++ trunk/catalog/admin/includes/gabarit/cfg_34.listing.gab 2011-10-24 16:21:27 UTC (rev 3844)
@@ -1,73 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 27/02/11, 09:51
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
- @brief gabarit for listing extra fields products
-*/
-?>
-
-<h3><?php echo __('HEADING_TITLE') ?></h3>
-
- <div class="button_nav">
- <?php printf(CsrtAction::getLink('button_nav', __('BUTTON_NEW') ), '', tep_href_link(cfg_34::FILENAME, FILENAME_CFG_34. '&list_id=&vid=&action=new') ,'' );?>
- </div>
-<div class="box_uniq">
-
- <table class="dataTable">
- <thead>
- <tr>
- <th><?php echo __('TABLE_HEADING_ID'); ?></th>
- <th><?php echo __('TABLE_HEADING_LABEL'); ?></th>
- <th class="tright"><?php echo __('TABLE_HEADING_ORDER'); ?></th>
- <th class="tcenter"><?php echo __('TABLE_HEADING_STATUS'); ?></th>
- <th class="tcenter"><?php echo __('TABLE_HEADING_USE_ADMIN'); ?></th>
- <th class="tcenter"><?php echo __('TABLE_HEADING_SPE_MODULE'); ?></th>
- <th class="row_action"><?php echo __('table heading action'); ?></th>
- </tr>
- </thead>
- <tbody>
- <?php foreach(cfg_34::$list as $epf) {
- if ($epf->epf_id == cfg_34::$eid) $selected = $epf; ?>
- <tr class="dataTableRow <?php if ($epf->epf_id == cfg_34::$eid) echo "Selected" ; ?>">
- <td class="dataTableContent"><?php echo $epf->epf_id; ?></td>
- <td class="dataTableContent">
- <?php $label_query = tep_db_query("select languages_id, epf_label from " . TABLE_PRODUCTS_EXTRA_FIELDS_LABELS . " where (epf_id = " . (int)$epf->epf_id . ") ");
- while ($label = tep_db_fetch_array($label_query)) {
- echo tep_image(DIR_WS_CATALOG_LANGUAGES . cfg_34::$lang[$label['languages_id']]['directory'] . '/images/' . cfg_34::$lang[$label['languages_id']]['image'], cfg_34::$lang[$label['languages_id']]['name']) . ' ' . $label['epf_label'] . '<br>';
- }
- ?>
- </td>
- <td class="tcenter"><?php echo $epf->epf_order; ?></td>
- <td class="tcenter">
- <?php
- if ($epf->epf_status == '1') {
- echo tep_image(DIR_WS_ICONS . 'icon_status_green.gif', IMAGE_ICON_STATUS_GREEN) . ' <a href="' . tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','flag','eid')) . 'action=setflag&flag=0&eid=' . $epf->epf_id) . '">' . tep_image(DIR_WS_ICONS . 'icon_status_red_light.gif', IMAGE_ICON_STATUS_RED_LIGHT) . '</a>';
- } else {
- echo '<a href="' . tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','flag','eid')) . 'action=setflag&flag=1&eid=' . $epf->epf_id) . '">' . tep_image(DIR_WS_ICONS . 'icon_status_green_light.gif', IMAGE_ICON_STATUS_GREEN_LIGHT) . '</a> ' . tep_image(DIR_WS_ICONS . 'icon_status_red.gif', IMAGE_ICON_STATUS_RED);
- }
- ?>
- </td>
- <td class="tcenter">
- <?php
- if ($epf->epf_admin == '1') {
- echo tep_image(DIR_WS_ICONS . 'icon_status_green.gif', IMAGE_ICON_STATUS_GREEN) . ' <a href="' . tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','flag_admin','eid')) . 'action=setflag&flag_admin=0&eid=' . $epf->epf_id) . '">' . tep_image(DIR_WS_ICONS . 'icon_status_red_light.gif', IMAGE_ICON_STATUS_RED_LIGHT) . '</a>';
- } else {
- echo '<a href="' . tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','flag_admin','eid')) . 'action=setflag&flag_admin=1&eid=' . $epf->epf_id) . '">' . tep_image(DIR_WS_ICONS . 'icon_status_green_light.gif', IMAGE_ICON_STATUS_GREEN_LIGHT) . '</a> ' . tep_image(DIR_WS_ICONS . 'icon_status_red.gif', IMAGE_ICON_STATUS_RED);
- }
- ?>
- </td>
- <td class="tcenter">
- <?php echo $epf->epf_special_mod ?>
- </td>
- <td class="row_action">
- <?php echo cfg_34::get_item_action($epf); ?> </td>
- </tr>
- <?php } ?>
- </tbody>
- </table>
-</div>
Deleted: trunk/catalog/admin/includes/gabarit/cfg_34.value.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/cfg_34.value.edit.gab 2011-10-24 10:04:15 UTC (rev 3843)
+++ trunk/catalog/admin/includes/gabarit/cfg_34.value.edit.gab 2011-10-24 16:21:27 UTC (rev 3844)
@@ -1,52 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 27/02/11, 09:51
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
- @brief gabarit for listing extra fields products
-
-*/
-global $action, $languages;
-?>
-<h4><?php echo __('HT_ADD_VALUE_LIST_LANG') ?></h4>
-
-
-
-<?php echo tep_draw_form('value_entry', FILENAME_CONFIGURATION,FILENAME_CFG_34.'action=' . (($action == 'value_new') ? 'value_insert' : 'value_update') . '&eid=' . cfg_34::$eid . '&vid=' . $_GET['vid']/*. '&parent=' . $parent_id*/ /*. ($confirmation_needed ? '&confirm=yes' : '')*/, 'post'); ?>
-
- <div class="tabs_lang">
- <ul>
- <?php for ($i=0, $n=sizeof($languages); $i<$n; $i++) { ?>
- <li><?php echo '<a href="#lang-' . ($i+1).'" >' . tep_image(DIR_WS_CATALOG_LANGUAGES . $languages[$i]['directory'] . '/images/' . $languages[$i]['image'], $languages[$i]['name']) . ' ' . $languages[$i]['name'] . '</a>' ?></li>
- <?php } ?>
- </ul>
-
- <?php for ($i=0, $n=sizeof($languages); $i<$n; $i++): ?>
-
- <fieldset id="<?php echo 'lang-'.($i+1) ?>">
- <p class="block_input">
- <?php echo __('ENTRY_ORDER') . tep_draw_input_field('sort_order['.$languages[$i]['id'].']','sort_order_'.$languages[$i]['id'],cfg_34::$cInfo[$languages[$i]['id']]['sort_order']) ; ?>
- </p>
- <p class="block_input">
- <?php echo __('ENTRY_VALUE') . tep_draw_input_field('value['.$languages[$i]['id'].']','value_'.$languages[$i]['id'], cfg_34::$cInfo[$languages[$i]['id']]['epf_value'], 'size=64 maxlength=64'); ?>
- </p>
- </fieldset>
-
- <?php endfor; ?>
-
- </div>
-
- <div class="button_nav">
-
- <?php echo tep_js_back(tep_href_link(cfg_34::FILENAME,FILENAME_CFG_34), __('listing fields') ); ?>
- <?php echo tep_js_back(tep_href_link(cfg_34::FILENAME,FILENAME_CFG_34.'eid='.cfg_34::$eid.'&action=value_listing'), __('listing value fields') ); ?>
-
- <?php echo tep_image_submit('button_save.gif', IMAGE_SAVE) ?>
-
- </div>
-
-</form>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/gabarit/cfg_34.value.listing.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/cfg_34.value.listing.gab 2011-10-24 10:04:15 UTC (rev 3843)
+++ trunk/catalog/admin/includes/gabarit/cfg_34.value.listing.gab 2011-10-24 16:21:27 UTC (rev 3844)
@@ -1,44 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 27/02/11, 09:51
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
- @brief gabarit for listing extra fields products
-
-*/
-
-global $action, $languages;
-?>
- <div class="button_nav">
- <?php printf(CsrtAction::getLink('button_nav', __('listing fields') ), '', tep_href_link(cfg_34::FILENAME, FILENAME_CFG_34. 'eid='.cfg_34::$eid.'&list_id=&vid=&parent=') ,'' );?>
- <?php printf(CsrtAction::getLink('button_nav', __('BUTTON_VALUE_ADD_LIST') ), '', tep_href_link(cfg_34::FILENAME, FILENAME_CFG_34. 'eid='.cfg_34::$eid.'&list_id=&vid=&parent=&action=value_new') ,'' );?>
-
- </div>
- <table class="dataTable" border="0" width="100%" cellspacing="0" cellpadding="2">
- <thead>
- <tr>
- <th class="tcenter"><?php echo __('TABLE_HEADING_ID'); ?></th>
- <th><?php echo __('TABLE_HEADING_VALUE'); ?></th>
- <th class="tcenter"><?php echo __('TABLE_HEADING_PARENT'); ?></th>
- <th class="tcenter"><?php echo __('TABLE_HEADING_ORDER'); ?></th>
- <th class="row_action"><?php echo __('table heading action'); ?></th>
- </tr>
- </thead>
- <tbody>
- <?php foreach (cfg_34::$list[0] as $k=>$value): ?>
- <tr class="dataTableRow <?php if($value['value_id'] == $vid) echo "Selected" ?>">
- <td class="tcenter"><?php echo $value['value_id']; ?></td>
- <td><?php echo $value['epf_value']; ?></td>
- <td class="tcenter"><?php echo $value['parent_id']; ?></td>
- <td class="tcenter"><?php echo $value['sort_order']; ?></td>
- <td class="row_action">
- <?php echo cfg_34::get_item_value_action($value); ?>
- </tr>
- <?php endforeach; ?>
-<!-- <tr><td colspan=5><?php //echo TEXT_PREVIEW . tep_draw_pull_down_menu('preview', tep_build_epf_pulldown($eid, $lid)); ?></td></tr> -->
- </tbody>
- </table>
Added: trunk/catalog/admin/includes/gabarit/configuration/modadminconfig.listing.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/modadminconfig.listing.gab (rev 0)
+++ trunk/catalog/admin/includes/gabarit/configuration/modadminconfig.listing.gab 2011-10-24 16:21:27 UTC (rev 3844)
@@ -0,0 +1,93 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 22/09/11, 20:05
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @brief mise en forme de la gestion du stock
+*/
+?>
+
+<div id="ssmenu">
+ <?php echo tep_ssmenu_configuration($_GET['gparentID']) ?>
+</div>
+
+
+
+<h3 class="main-title"><?php echo __('heading modadminconfig configuration') ?></h3>
+
+<?php echo tep_draw_form('configuration', FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&gID=' . $_GET['gID'] . '&action=save_mutli') ?>
+
+
+<div class="block_form">
+
+ <fieldset class="block_field">
+ <?php /** */ $row = modadminconfig::$list['CHECKUP_WARN']; ?>
+ <legend title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></legend>
+
+ <div class="block_input">
+ <label><?php if (tep_not_null($row->description))echo __($row->description); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </p>
+
+
+
+ <?php /** */ ?>
+ <?php if(_test_bool(modadminconfig::$list['CHECKUP_WARN']->value)): ?>
+
+
+ <h4 class="block_field-title"><?php echo __('modadminconfig legend warn') ?></h4>
+
+ <?php /** option de la gestion de stock, disponible que ci value precendente a true */ ?>
+ <ul class="block_input">
+ <?php foreach(modadminconfig::$list as $row)
+ if(substr($row->key,0,4) =='WARN') { ?>
+ <li id="nav_<?php echo $row->key ?>"><h5 title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></h5>
+
+ <div class="block_input tirroir">
+ <label><?php echo __($row->description); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </li>
+ <?php } ?>
+ </ul>
+
+
+ <?php endif; ?>
+ </fieldset>
+
+
+ <?php /** */ ?>
+ <fieldset class="block_field">
+ <legend class="block_field-title"><?php echo __('modadminconfig legend other') ?></legend>
+
+ <ul class="block_input">
+ <?php foreach(modadminconfig::$list as $row)
+ if(!in_array($row->key,array('CHECKUP_WARN',)) && substr($row->key,0,4) !='WARN' ) { ?>
+ <li id="nav_<?php echo $row->key ?>"><h5 title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></h5>
+
+ <div class="block_input tirroir">
+ <label><?php echo __($row->description); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </li>
+ <?php } ?>
+ </ul>
+ </fieldset>
+
+ <div class="button_nav">
+ <?php print tep_image_submit('button_copy.gif', IMAGE_UPDATE) .tep_js_back(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&gID=' . $_GET['gID'] )) ; ?>
+ </div>
+
+</div>
+</form>
\ No newline at end of file
Copied: trunk/catalog/admin/includes/gabarit/configuration/modcustextra/draw.delete.gab (from rev 3832, trunk/catalog/admin/includes/gabarit/cfg_33.delete.gab)
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/modcustextra/draw.delete.gab (rev 0)
+++ trunk/catalog/admin/includes/gabarit/configuration/modcustextra/draw.delete.gab 2011-10-24 16:21:27 UTC (rev 3844)
@@ -0,0 +1,17 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 24/10/11, 15:46
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+?>
+<h3><?php echo __('heading title option delete') ?></h3>
+ <?php echo tep_draw_form('delete', modcustextra::FILENAME, FILENAME_CFG_33.'&cID='.$_GET['cID'].'&action=deleteconfirm', 'post') ?>
+
+ <?php echo tep_image_submit('', IMAGE_DELETE). tep_js_back(tep_href_link(modcustextra::FILENAME, tep_get_all_get_params(array('action','cID'))), IMAGE_CANCEL) ; ?>
+
+ </form>
\ No newline at end of file
Copied: trunk/catalog/admin/includes/gabarit/configuration/modcustextra/draw.edit.gab (from rev 3832, trunk/catalog/admin/includes/gabarit/cfg_33.edit.gab)
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/modcustextra/draw.edit.gab (rev 0)
+++ trunk/catalog/admin/includes/gabarit/configuration/modcustextra/draw.edit.gab 2011-10-24 16:21:27 UTC (rev 3844)
@@ -0,0 +1,82 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 24/10/11, 15:46
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+global $languages;
+?>
+<h3><?php echo __('text heading edit field') ?></h3>
+ <?php echo tep_draw_form('update', modcustextra::FILENAME, FILENAME_CFG_33.((!empty(modcustextra::$fInfo->fields_id )?'&cID=' . modcustextra::$fInfo->fields_id . '&action=update' :'&action=insert') ), 'post') ?>
+
+
+ <p>
+ <?php echo __('text edit intro') ?>
+ </p>
+
+
+
+ <p class="block_input">
+ <?php echo __('text field name') ?>
+ <?php for ($i=0, $n=sizeof($languages); $i<$n; $i++) : ?>
+ <?php echo tep_image(DIR_WS_CATALOG_LANGUAGES . $languages[$i]['directory'] . '/images/' . $languages[$i]['image'], $languages[$i]['name']) . ' ' . tep_draw_input_field('fields_name[' . $languages[$i]['id'] . ']','fields_name_' . $languages[$i]['id'],modcustextra::get_customers_extra_fields_name(modcustextra::$fInfo->fields_id, $languages[$i]['id'])); ?>
+ <?php endfor; ?>
+ </p>
+
+ <ul class="block_input">
+ <li><?php echo tep_draw_radio_field('fields_input_type','fields_input_type', 0, (modcustextra::$fInfo->fields_input_type==0) ? true : false) . __('text input field') ?></li>
+ <li><?php echo tep_draw_radio_field('fields_input_type','fields_input_type', 1, (modcustextra::$fInfo->fields_input_type==1) ? true : false) . __('text textarea field') ?></li>
+ <li><?php echo tep_draw_radio_field('fields_input_type','fields_input_type', 2, (modcustextra::$fInfo->fields_input_type==2) ? true : false) . __('text radio field') ?></li>
+ <li><?php echo tep_draw_radio_field('fields_input_type','fields_input_type', 3, (modcustextra::$fInfo->fields_input_type==3) ? true : false) . __('text check field') ?></li>
+ <li><?php echo tep_draw_radio_field('fields_input_type','fields_input_type', 4, (modcustextra::$fInfo->fields_input_type==4) ? true : false) . __('text down field') ?></li>
+ </ul>
+
+ <p class="block_input">
+ <label for="fields_input_value" title="<?php echo __('text field input value help') ?>"><?php echo __('text field input value').tep_image(DIR_WS_ICONS . 'icon_help.gif') ?></label>
+ <?php echo tep_draw_textarea_field('fields_input_value', 'fields_input_value', 30, 8, modcustextra::$fInfo->fields_input_value) ?>
+ </p>
+
+ <p class="block_input">
+ <label ><?php echo __('text field required status') ?></label>
+ <?php echo tep_draw_radio_field('fields_required_status','fields_required_status', 0, (modcustextra::$fInfo->fields_required_status==0) ? true : false) . 'false' . tep_draw_radio_field('fields_required_status','fields_required_status', 1, (modcustextra::$fInfo->fields_required_status==1) ? true : false) . 'true' ?>
+ </p>
+
+
+ <p class="block_input">
+ <label><?php echo __('text field size') ?></label>
+ <?php echo tep_draw_input_field('fields_size','fields_size', modcustextra::$fInfo->fields_size) ?>
+ </p>
+
+ <p class="block_input">
+ <label><?php echo __('text field status email') ?></label>
+ <?php echo tep_draw_radio_field('fields_required_email','fields_required_email',0,(modcustextra::$fInfo->fields_required_email==0)?true:false) . 'false' . tep_draw_radio_field('fields_required_email','fields_required_email',1,(modcustextra::$fInfo->fields_required_email==1)?true:false) . 'true' ?>
+ </p>
+
+ <p class="block_input">
+ <label for="fields_key" title="<?php echo __('text field input key') ?>"><?php echo __('text field key').tep_image(DIR_WS_ICONS . 'icon_help.gif') ?></label>
+ <?php echo tep_draw_input_field('fields_key','fields_key', modcustextra::$fInfo->fields_key) ?>
+ </p>
+
+ <p class="block_input">
+ <label for="fields_admin" title="<?php echo __('text field input fields_admin') ?>"><?php echo __('text field fields_admin').tep_image(DIR_WS_ICONS . 'icon_help.gif') ?></label>
+ <?php echo tep_draw_pull_down_menu('fields_admin',array(array('id'=>0,'text'=>__('visible BO and FO')) ,array('id'=>1,'text'=>__('uniquement admin')) ,array('id'=>2,'text'=>__('hidden')) ), modcustextra::$fInfo->fields_admin) ?>
+ </p>
+
+ <p class="block_input">
+ <label for="fields_special_mod" title="<?php echo __('text field input fields_special_mod') ?>"><?php echo __('text field fields_special_mod').tep_image(DIR_WS_ICONS . 'icon_help.gif') ?></label>
+ <?php echo tep_draw_input_field('fields_special_mod','fields_special_mod', modcustextra::$fInfo->fields_special_mod) ?>
+ </p>
+
+ <p class="block_input">
+ <label for="fields_group_class" title="<?php echo __('text field input fields_group_class') ?>"><?php echo __('text field fields_group_class').tep_image(DIR_WS_ICONS . 'icon_help.gif') ?></label>
+ <?php echo tep_draw_input_field('fields_group_class','fields_group_class', modcustextra::$fInfo->fields_group_class) ?>
+ </p>
+
+ <div class="button_nav">
+ <?php echo tep_image_submit('',((!empty(modcustextra::$fInfo->fields_id )?IMAGE_UPDATE :IMAGE_SAVE)) ). tep_js_back(tep_href_link(modcustextra::FILENAME, tep_get_all_get_params(array('action','cID'))), IMAGE_CANCEL) ; ?>
+ </div>
+ </form>
\ No newline at end of file
Copied: trunk/catalog/admin/includes/gabarit/configuration/modcustextra/draw.listing.gab (from rev 3832, trunk/catalog/admin/includes/gabarit/cfg_33.listing.gab)
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/modcustextra/draw.listing.gab (rev 0)
+++ trunk/catalog/admin/includes/gabarit/configuration/modcustextra/draw.listing.gab 2011-10-24 16:21:27 UTC (rev 3844)
@@ -0,0 +1,62 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 24/10/11, 15:46
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+global $gparentID;
+?>
+<div id="ssmenu">
+ <?php echo tep_ssmenu_configuration($gparentID) ?>
+</div>
+
+ <h3><?php echo __("heading title"); ?></h3>
+ <div class="button_nav">
+ <p><?php echo '<a class="button" href="' . tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','cID')) . 'action=new') . '">' . tep_image(DIR_WS_ICONS . 'icon_add_new.png', IMAGE_INSERT). IMAGE_INSERT . '</a>'; ?></p>
+ </div>
+
+ <div class="">
+
+ <table class="dataTable">
+ <thead>
+ <tr>
+ <th><?php echo __('table heading fields'); ?></th>
+ <th class="tcenter"><?php echo __('table heading visibility'); ?></th>
+ <th class="tcenter"><?php echo __('table heading group class'); ?></th>
+ <th class="tcenter"><?php echo __('table heading status'); ?></th>
+ <th class="row_action"><?php echo __('table heading action'); ?></th>
+ </tr>
+ </thead>
+ <tfoot>
+ <tr>
+ <td><?php echo modcustextra::$split->display_count(modcustextra::$fields_query_numrows, MAX_DISPLAY_SEARCH_RESULTS, 1, __('text display number of fields')); ?></td>
+ <td colspan="2"><?php echo modcustextra::$split->display_links(modcustextra::$fields_query_numrows, MAX_DISPLAY_SEARCH_RESULTS, MAX_DISPLAY_PAGE_LINKS, 1);; ?></td>
+ </tr>
+ </tfoot>
+ <?php foreach(modcustextra::$list as $fields) { ?>
+ <tr class="dataTableRow <?php if(isset( modcustextra::$fInfo) && is_object( modcustextra::$fInfo) && modcustextra::$fInfo->fields_id == modcustextra::$cID) echo "Selected" ?>" >
+ <td><?php echo $fields->fields_name; ?></td>
+ <td><?php echo $fields->fields_admin; ?></td>
+ <td><?php echo $fields->fields_group_class; ?></td>
+ <td class="tcenter">
+ <?php
+ if ($fields->fields_status == '1') {
+ echo tep_image(DIR_WS_ICONS . 'icon_status_green.gif', IMAGE_ICON_STATUS_GREEN) . ' <a href="' . tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','flag','fID')) . 'action=setflag&flag=0&fID=' . $fields->fields_id) . '">' . tep_image(DIR_WS_ICONS . 'icon_status_red_light.gif', IMAGE_ICON_STATUS_RED_LIGHT) . '</a>';
+ } else {
+ echo '<a href="' . tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','flag','fID')) . 'action=setflag&flag=1&fID=' . $fields->fields_id ) . '">' . tep_image(DIR_WS_ICONS . 'icon_status_green_light.gif', IMAGE_ICON_STATUS_GREEN_LIGHT) . '</a> ' . tep_image(DIR_WS_ICONS . 'icon_status_red.gif', IMAGE_ICON_STATUS_RED);
+ }
+ ?>
+ </td>
+ <td class="row_action">
+ <?php echo modcustextra::get_item_action($fields); ?>
+ </td>
+ </tr>
+ <?php } ?>
+ </table>
+ </div>
+
+
Copied: trunk/catalog/admin/includes/gabarit/configuration/modlangue.listing.gab (from rev 3832, trunk/catalog/admin/includes/gabarit/cfg_31.listing.gab)
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/modlangue.listing.gab (rev 0)
+++ trunk/catalog/admin/includes/gabarit/configuration/modlangue.listing.gab 2011-10-24 16:21:27 UTC (rev 3844)
@@ -0,0 +1,57 @@
+<?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.1
+ @date 24/10/11, 17:00
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+?>
+ <div id="ssmenu">
+ <?php echo tep_ssmenu_configuration(modlangue::$gparentID) ?>
+ </div>
+
+
+<h3><?php echo __('heading title') ?></h3>
+
+ <div class="button_nav">
+ <a class="button" href="<?php echo tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','lID')). 'action=new') ?>"><?php echo tep_image(DIR_WS_ICONS . 'icon_add_new.png', IMAGE_NEW_LANGUAGE). IMAGE_NEW_LANGUAGE ?></a>
+ </div>
+
+<div class="box_uniq">
+ <div class="box_left">
+
+ <table class="dataTable">
+ <thead>
+ <tr>
+ <th><?php echo __('table heading language name') ?></th>
+ <th class="tleft" style="width:40px"><?php echo __('table heading language code') ?></th>
+ <th class="tright"><?php echo __('table heading action') ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php foreach (modlangue::$liste as $theme): ?>
+ <tr class="view parent dataTableRow <?php echo (($theme->languages_id==@$_GET['lID'])?'Selected' :'') ?>">
+ <td><?php echo $theme->name ?></td>
+ <td><?php echo $theme->code ?></td>
+ <td class="row_action">
+ <a class="buttonimg" href="<?php echo tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','lID')). 'lID=' .$theme->languages_id. '&action=edit') ?>"><?php echo tep_image(DIR_WS_ICONS . 'icon_edit.png',IMAGE_EDIT )?></a>
+ <a class="buttonimg" href="<?php echo tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','lID')). 'lID=' . $theme->languages_id . '&action=delete') ?>"><?php echo tep_image(DIR_WS_ICONS . 'icon_delete.png',IMAGE_DELETE) ?></a>
+
+ <?php if (isset(modlangue::$lInfo) && is_object(modlangue::$lInfo) && ($theme->languages_id == modlangue::$lInfo->languages_id)) { echo tep_image(DIR_WS_ICONS . 'icon_arrow_right.gif', ''); }
+ else { echo '<a href="' . tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','oID')). 'lID=' . $theme->languages_id) . '">' . tep_image(DIR_WS_ICONS . 'icon_info.gif', IMAGE_ICON_INFO) . '</a>'; } ?>
+ </td>
+ </tr>
+ <?php endforeach; ?>
+
+ </tbody>
+ </table>
+ </div>
+
+ <div class="box_right">
+ <?php echo modlangue::draw_right_columm(); ?>
+ </div>
+
+</div>
\ No newline at end of file
Copied: trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.delete.gab (from rev 3832, trunk/catalog/admin/includes/gabarit/cfg_34.delete.gab)
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.delete.gab (rev 0)
+++ trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.delete.gab 2011-10-24 16:21:27 UTC (rev 3844)
@@ -0,0 +1,27 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 24/10/11, 15:38
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @brief gabarit for listing extra fields products
+*/
+?>
+
+<h3><?php echo HEADING_TITLE ?></h3>
+
+<h4><?php echo HEADING_DELETE . modprodextra::$eid ?></h4>
+
+<?php if (modprodextra::$double_check == 'no') {
+ echo '<p>' . TEXT_ARE_SURE . (modprodextra::$pInfo->uses_list ? TEXT_VALUES_GONE : '') . "</p>\n";
+ echo '<p>' . tep_draw_form('yes',modprodextra::FILENAME, tep_get_all_get_params(array('action','eid','confirm')). 'confirm=yes&action=delete&eid=' . modprodextra::$eid . '&used=' . modprodextra::$pInfo->used) . tep_draw_input_field('yes','', TEXT_YES, 'alt="' . TEXT_YES . '"', false, 'submit') . '</form> ';
+ echo tep_draw_form('no', modprodextra::FILENAME, tep_get_all_get_params(array('action','eid','confirm')) .'eid=' . modprodextra::$eid) . tep_draw_input_field('no','', TEXT_NO, 'alt="' . TEXT_NO . '"', false, 'submit') . "</form></p>\n";
+ } else {
+ echo '<p><b>' . TEXT_CONFIRM_DELETE . (modprodextra::$pInfo->uses_list ? TEXT_VALUES_GONE : '') . "</b></p>\n";
+ echo '<p>' . tep_draw_form('yes', modprodextra::FILENAME, tep_get_all_get_params(array('action','eid','confirm')). 'confirm=yes&action=delete&eid=' . modprodextra::$eid) . tep_draw_input_field('yes','', TEXT_YES, 'alt="' . TEXT_YES . '"', false, 'submit') . '</form> ';
+ echo tep_draw_form('no', modprodextra::FILENAME, tep_get_all_get_params(array('action','eid','confirm')).'eid=' . modprodextra::$eid) . tep_draw_input_field('no','', TEXT_NO, 'alt="' . TEXT_NO . '"', false, 'submit') . "</form></p>\n";
+ }
+?>
\ No newline at end of file
Copied: trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.edit.gab (from rev 3832, trunk/catalog/admin/includes/gabarit/cfg_34.label.edit.gab)
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.edit.gab (rev 0)
+++ trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.edit.gab 2011-10-24 16:21:27 UTC (rev 3844)
@@ -0,0 +1,120 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 24/10/11, 15:38
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @brief gabarit for listing extra fields products
+
+*/
+global $action, $languages;
+?>
+ ...
[truncated message content] |
|
From: <os...@us...> - 2011-10-24 10:04:25
|
Revision: 3843
http://oscss.svn.sourceforge.net/oscss/?rev=3843&view=rev
Author: oscim
Date: 2011-10-24 10:04:15 +0000 (Mon, 24 Oct 2011)
Log Message:
-----------
suite report des langue espace config
Ajustement page config, pour la rise en charge des traductions bas?\195?\169 sur id gid.
Ajout des fichiers de langue
correction coquille commiut precendent sur css theme admin
Deport du dossier des driver sql dans un sous rep de class
correction coquille
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/configUtility.php
trunk/catalog/admin/includes/content/configuration.central.inc
trunk/catalog/admin/includes/content/configuration.top.inc
trunk/catalog/admin/includes/languages/fr_FR/boxes/01_configuration.php
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/my_boutique.txt
trunk/catalog/admin/includes/modules/configuration/modstock.php
trunk/catalog/admin/includes/template/oscss/jquery-ui-1.css
trunk/catalog/admin/includes/template/oscss/stylesheet-1.css
trunk/catalog/common/classes/Database.php
trunk/catalog/includes/classes/breadcrumb.php
trunk/catalog/install/includes/application.php
trunk/catalog/install/includes/language/fr_FR/oscss_config.txt
Added Paths:
-----------
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_0.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_10.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_11.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_128.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_14.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_15.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_16.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_17.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_2.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_20.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_21.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_22.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_24.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_27.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_8.txt
trunk/catalog/admin/includes/modules/configuration/modmail.php
trunk/catalog/common/classes/sql_drivers/
Removed Paths:
-------------
trunk/catalog/common/drivers/
Modified: trunk/catalog/admin/includes/classes/configUtility.php
===================================================================
--- trunk/catalog/admin/includes/classes/configUtility.php 2011-10-24 08:14:16 UTC (rev 3842)
+++ trunk/catalog/admin/includes/classes/configUtility.php 2011-10-24 10:04:15 UTC (rev 3843)
@@ -86,12 +86,7 @@
$keys= call_user_func(array($class_method[0], $class_method[1]), $value, $key);
}
else {
-/**
- @date 20/10/11, 23:02
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- TODO Desactiver bug sur les module des tache programmé
-*/
-// if(strpos($_function,')') === false) $_function.='(';
+ if(strpos($_function,'(') === false) $_function.='(';
eval('$keys = ' . $_function . "'" . $value . "', '" . $key . "');");
}
return $keys;
Modified: trunk/catalog/admin/includes/content/configuration.central.inc
===================================================================
--- trunk/catalog/admin/includes/content/configuration.central.inc 2011-10-24 08:14:16 UTC (rev 3842)
+++ trunk/catalog/admin/includes/content/configuration.central.inc 2011-10-24 10:04:15 UTC (rev 3843)
@@ -20,21 +20,23 @@
<?php echo $cfg->draw(); ?>
<?php elseif($action=='' && tep_not_null($gID) && is_numeric($gID) ): ?>
-<h3><?php echo tep_cst_menu_conf($cfg_group['configuration_group_title']); ?></h3>
-<h4><?php echo tep_cst_menu_conf('TITLE_'.$cfg_group['configuration_group_title']); ?></h4>
+
<div id="ssmenu">
<?php echo tep_ssmenu_configuration($gparentID); ?>
</div>
-<br style="clear:both" />
+
+<h3 class="main-title"><?php echo tep_cst_menu_conf($cfg_group['configuration_group_title']); ?></h3>
+<h4><?php echo tep_cst_menu_conf('TITLE_'.$cfg_group['configuration_group_title']); ?></h4>
+
<?php echo tep_draw_form('configuration', FILENAME_CONFIGURATION, 'gparentID=' . $gparentID.'&gID=' . $gID . '&action=save_mutli') ?>
<div class="box_left">
<ul class="block_form">
<?php foreach($list_edit as $row) { ?>
- <li id="nav_<?php echo $row->key ?>"><h5 title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo $row->title. tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></h5>
+ <li id="nav_<?php echo $row->key ?>"><h5 title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></h5>
<div class="block_input tirroir">
- <label><?php if (tep_not_null($row->description))echo $row->description; ?></label>
+ <label><?php if (tep_not_null(__($row->description)))echo __($row->description); ?></label>
<p>
<?php echo $row->value_field ; ?>
</p>
Modified: trunk/catalog/admin/includes/content/configuration.top.inc
===================================================================
--- trunk/catalog/admin/includes/content/configuration.top.inc 2011-10-24 08:14:16 UTC (rev 3842)
+++ trunk/catalog/admin/includes/content/configuration.top.inc 2011-10-24 10:04:15 UTC (rev 3843)
@@ -47,8 +47,12 @@
$cfg =new $class();
}
+ else {
+ $oscss->pile_file_lang(DIR_FS_ADMIN.DIR_WS_LANGUAGES.$language.'/modules/configuration/cfg_'.$gID.'.txt');
+ }
+
if(isset($mID) && class_exists($class)) $cfg->draw_action();
else
switch ($action) {
Modified: trunk/catalog/admin/includes/languages/fr_FR/boxes/01_configuration.php
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/boxes/01_configuration.php 2011-10-24 08:14:16 UTC (rev 3842)
+++ trunk/catalog/admin/includes/languages/fr_FR/boxes/01_configuration.php 2011-10-24 10:04:15 UTC (rev 3843)
@@ -58,5 +58,6 @@
define('BOX_HEADING_CONF_CONFIGURATION COMMERCIALE',"Configuration catalogue" );
define('BOX_HEADING_CONF_CONFIG_COMM',"Configuration commerciale" );
define('BOX_HEADING_CONF_TEMPLATE',"Template" );
-
+define('BOX_HEADING_CONF_BOX_CONFIGURATION_ENVIRONEMENT',"Environement" );
+define('BOX_HEADING_CONF_TITLE_BOX_CONFIGURATION_ENVIRONEMENT',"Environement" );
?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_0.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_0.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_0.txt 2011-10-24 10:04:15 UTC (rev 3843)
@@ -0,0 +1,29 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 24/10/11, 11:18
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+$lang['TEMPLATE_NAME_S']="Nom du template par défaut" ;
+$lang['TEMPLATE_NAME_L']="Nom du template par défaut." ;
+$lang['TYPE_VIRTUAL_PRODUCTS_S']="type produit virtuel" ;
+$lang['TYPE_VIRTUAL_PRODUCTS_L']="préciser les statut de produit qui sont virtuel en opposition au produit physique" ;
+$lang['CFG_CLASS_VIRTUAL_TYPE_L']="les class non autorisées pour ce type de produits" ;
+$lang['CFG_CLASS_VIRTUAL_TYPE_1_S']="configuration type products 1" ;
+$lang['CFG_CLASS_VIRTUAL_TYPE_2_S']="configuration type products 2" ;
+$lang['CFG_CLASS_VIRTUAL_TYPE_3_S']="configuration type products 3" ;
+$lang['CFG_CLASS_VIRTUAL_TYPE_4_S']="configuration type products 4" ;
+$lang['ORPHELIN_COLLECTOR_S']="Collecteur d'orphelin" ;
+$lang['ORPHELIN_COLLECTOR_L']="Préciser l'id de la catégorie dans laquelle les éléments orphelins sont associés" ;
+$lang['PUBLIC_PAGE_TYPE_S']="type page public" ;
+$lang['PUBLIC_PAGE_TYPE_L']="precise les type de page public, cf extension et type extensions" ;
+$lang['DEFAULT_CURRENCY_S']="Devise par défaut" ;
+$lang['DEFAULT_CURRENCY_L']="Devise par défaut." ;
+$lang['DEFAULT_LANGUAGE_S']="Langage par défaut" ;
+$lang['DEFAULT_LANGUAGE_L']="Langage par défaut." ;
+
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_10.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_10.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_10.txt 2011-10-24 10:04:15 UTC (rev 3843)
@@ -0,0 +1,27 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 24/10/11, 11:18
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+$lang['STORE_PAGE_PARSE_TIME_S']="Stockage du temps d'exécution" ;
+$lang['STORE_PAGE_PARSE_TIME__L']="Stocke le temps d'exécution d'une page." ;
+$lang['STORE_PAGE_PARSE_TIME_LOG_S']="Emplacement du fichier pour le stocke d'exécution" ;
+$lang['STORE_PAGE_PARSE_TIME_LOG_L']="Chemin d'accès et nom du fichier des temps d'exécution." ;
+$lang['STORE_PARSE_DATE_TIME_FORMAT_S']="Format de date des exécutions" ;
+$lang['STORE_PARSE_DATE_TIME_FORMAT_L']="Format de la date des exécutions." ;
+$lang['DISPLAY_PAGE_PARSE_TIME_S']="Affichage du temps d'exécution" ;
+$lang['DISPLAY_PAGE_PARSE_TIME_L']="Affiche le temps d'exécution d'une page (le stockage du temps d'exécution doit être activé et avoir choisie l'emplacement du fichier pour le stocke d'exécution)." ;
+$lang['STORE_DB_TRANSACTIONS_S']="Requêtes de base des données" ;
+$lang['STORE_DB_TRANSACTIONS_L']="Stocke les requêtes de la base des données avec les temps d'exécution." ;
+$lang['STORE_PAGE_PARSE_STOCK_ERROR_S']="erreur php fichier de log" ;
+$lang['STORE_PAGE_PARSE_STOCK_ERROR_L']="enregistrement des erreur php dans un fichier de log" ;
+$lang['STORE_PAGE_PARSE_EMAIL_OWNER_S']="erreur php email webmaster" ;
+$lang['STORE_PAGE_PARSE_EMAIL_OWNER_L']="Envoyer un email lors d'erreur php" ;
+
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_11.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_11.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_11.txt 2011-10-24 10:04:15 UTC (rev 3843)
@@ -0,0 +1,31 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 24/10/11, 11:18
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+$lang['COUNTRY_LOCALNAME_S']="Afficher le nom local des états/pays" ;
+$lang['COUNTRY_LOCALNAME_L']="Afficher le nom local des états/pays sur create_account?<br />e.G.<br />Deutschland instead of Germany<br />Sverige instead of Sweden" ;
+$lang['AJAX_CART_MODE_S']="[panier] Utiliser javascript asynchrone" ;
+$lang['AJAX_CART_MODE_L']="Utiliser un javascript asynchrone (sans rafraîchissement de la page) pour le panier (modification du panier par l'utilisateur)." ;
+$lang['LOGIN_SET_SNAPSHOT_S']="Se souvenir de la page pour l'identification par box login ?" ;
+$lang['LOGIN_SET_SNAPSHOT_L']="Se souvenir de la page pour l'identification par box login ?" ;
+$lang['NO_SHOPPING_CART_FOR_GUEST_S']="Autoriser le panier sans connection" ;
+$lang['NO_SHOPPING_CART_FOR_GUEST_L']="Autoriser l'usage du panier sans compte et sans être connecté" ;
+$lang['ACCOUNT_FORCE_ACTIV_MAIL_S']="Impose la confirmation d'inscription par email " ;
+$lang['ACCOUNT_FORCE_ACTIV_MAIL_L']="Envoi un email de confirmation d'inscription " ;
+$lang['WHOS_ONLINE_ACTIVE_S']="[whos online] Active la détection des client en ligne" ;
+$lang['WHOS_ONLINE_ACTIVE_L']="Choisissez auto pour activer ce service à chaque fois que vous vous connecter à l'espace d'admin. Si vous choisissiez Off, ce service sera désactiver de manière permanente" ;
+$lang['USE_DEFAULT_LANGUAGE_CURRENCY_S']="Change la langue en fonction de la devise" ;
+$lang['USE_DEFAULT_LANGUAGE_CURRENCY_L']="Change automatiquement la langue sur celle correspondant à la nouvelle devise choisie." ;
+$lang['DISPLAY_CART_S']="Afficher le panier après l'ajout de produit" ;
+$lang['DISPLAY_CART_L']="Affiche le contenu du panier après avoir ajouté un article (ou retourne à l'origine)." ;
+
+$lang['ADVANCED_SEARCH_DEFAULT_OPERATOR_S']="Option de recherche par défaut" ;
+$lang['ADVANCED_SEARCH_DEFAULT_OPERATOR_L']="Choisir l'opérateur de recherche par défaut.<br />(AND ou OR)" ;
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_128.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_128.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_128.txt 2011-10-24 10:04:15 UTC (rev 3843)
@@ -0,0 +1,17 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 24/10/11, 11:18
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+$lang['USE_LOCAL_GENERAT_PDF_S']="Generation des pdf(commande/BL..)" ;
+$lang['USE_LOCAL_GENERAT_PDF_L']="Utiliser un outils externe pour la generation des document pdf, disponible coté public et privé" ;
+
+$lang['USE_LOCAL_GENERAT_ORDER_REF_S']="Référence des commandes" ;
+$lang['USE_LOCAL_GENERAT_ORDER_REF_L']="Utiliser la numerotaion interne, ou laisser un outils externe prendre en charge cette référence. Celle ci ne sera donc disponible qu'apres la prise en compte par l'outil tiers de la commande. Coté public, le numero generic interne est utilisé en attente de reference" ;
+
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_14.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_14.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_14.txt 2011-10-24 10:04:15 UTC (rev 3843)
@@ -0,0 +1,17 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 24/10/11, 11:18
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+$lang['GZIP_COMPRESSION_S']="Permettre compression GZip" ;
+$lang['GZIP_COMPRESSION_L']="Permettre la compression HTTP GZip." ;
+$lang['GZIP_LEVEL_S']="Niveau de Compression" ;
+$lang['GZIP_LEVEL_L']="Employer ce niveau de compression de 0 à 9.<br />(0 = minimum, 9 = maximum)" ;
+
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_15.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_15.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_15.txt 2011-10-24 10:04:15 UTC (rev 3843)
@@ -0,0 +1,30 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 24/10/11, 11:18
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+$lang['SESSION_LIFE_ADMIN_S']="Durée de vie des sessions administrateurs" ;
+$lang['SESSION_LIFE_ADMIN_L']="Définir la durée de vie en minute des sessions administrateurs." ;
+$lang['SESSION_LIFE_PUBLIC_S']="Durée de vie des sessions visiteurs" ;
+$lang['SESSION_LIFE_PUBLIC_L']="Définir la durée de vie en minute des sessions visiteurs." ;
+$lang['SESSION_FORCE_COOKIE_USE_S']="Utilisation forcée des cookies" ;
+$lang['SESSION_FORCE_COOKIE_USE_L']="Forcer l'utilisation des sessions quand les cookies sont permis." ;
+$lang['SESSION_CHECK_SSL_SESSION_ID_S']="Vérifier l'identification de session" ;
+$lang['SESSION_CHECK_SSL_SESSION_ID_L']="Valider la SSL_SESSION_ID sur chaque demande de page sécurisée en HTTPS." ;
+$lang['SESSION_CHECK_USER_AGENT_S']="[user agent] Vérifier l'utilisateur" ;
+$lang['SESSION_CHECK_USER_AGENT_L']="Valider le navigateur du client sur chaque demande de page." ;
+$lang['SESSION_CHECK_IP_ADDRESS_S']="Vérifier l'adresse IP" ;
+$lang['SESSION_CHECK_IP_ADDRESS_L']="Valider l'adresse IP du client sur chaque demande de page." ;
+$lang['SESSION_BLOCK_SPIDERS_S']="[session] Empêcher les sessions d'araignée" ;
+$lang['SESSION_BLOCK_SPIDERS_L']="Empêcher les araignées connues de commencer une session." ;
+$lang['SESSION_RECREATE_S']="Recréer une session" ;
+$lang['SESSION_RECREATE_L']="Recréer la session pour produire une nouvelle identification de session quand le client entre ou créer un compte." ;
+
+
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_16.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_16.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_16.txt 2011-10-24 10:04:15 UTC (rev 3843)
@@ -0,0 +1,40 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 24/10/11, 11:18
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+$lang['SEO_ENABLED_S']="SEO url" ;
+$lang['SEO_ENABLED_L']="active service SEO" ;
+$lang['SEO_ADD_CPATH_TO_PRODUCT_URLS_S']="Ajouter le cpath dans l'url" ;
+$lang['SEO_ADD_CPATH_TO_PRODUCT_URLS_L']="Ajoute le Cpath a la fin de l'url (i.e. - some-product-p-1.html?cPath=xx)." ;
+$lang['SEO_ADD_CAT_PARENT_S']="Ajoute la categorie parent dans l'url " ;
+$lang['SEO_ADD_CAT_PARENT_L']="Ce reglage ajoute la categorie parent dans l'url (i.e. - parent-category-c-1.html)." ;
+$lang['SEO_URLS_FILTER_SHORT_WORDS_S']="Filtre pour des url courte" ;
+$lang['SEO_URLS_FILTER_SHORT_WORDS_L']="Ce reglage impose un nomber de mots dans l'url." ;
+$lang['SEO_URLS_USE_W3C_VALID_S']="Sortie conforme au W3C?" ;
+$lang['SEO_URLS_USE_W3C_VALID_L']="Impose sortie conforme au W3C pour les url " ;
+$lang['USE_SEO_CACHE_GLOBAL_S']="Cache SEO sql ?" ;
+$lang['USE_SEO_CACHE_GLOBAL_L']="Active le cache sur les requete sql" ;
+$lang['USE_SEO_CACHE_PRODUCTS_S']="Cache url produit?" ;
+$lang['USE_SEO_CACHE_PRODUCTS_L']="Active le cache sur les url des produits" ;
+$lang['USE_SEO_CACHE_CATEGORIES_S']="Cache url categorie?" ;
+$lang['USE_SEO_CACHE_CATEGORIES_L']="Active le cache sur les url des categories." ;
+$lang['USE_SEO_CACHE_TOPICS_S']="Cache url articles?" ;
+$lang['USE_SEO_CACHE_TOPICS_L']="Active le cache sur les url des article." ;
+$lang['USE_SEO_CACHE_LINKS_S']="Cache url liens?" ;
+$lang['USE_SEO_CACHE_LINKS_L']="Active le cache sur les url des liens" ;
+$lang['SEO_REWRITE_TYPE_S']="Choix forme reecriture" ;
+$lang['SEO_REWRITE_TYPE_L']="Choix format" ;
+$lang['SEO_CHAR_CONVERT_SET_S']="Remplacemenet de caracteres" ;
+$lang['SEO_CHAR_CONVERT_SET_L']="Vous permet de remplacer les caracteres dans les url <strong>char=>conv,char2=>conv2</strong>" ;
+$lang['SEO_REMOVE_ALL_SPEC_CHARS_S']="Retirer les caractére non imprimable" ;
+$lang['SEO_REMOVE_ALL_SPEC_CHARS_L']="Retire tous les caractéres non imprimable" ;
+$lang['SEO_URLS_CACHE_RESET_S']="Vide le cache SEO" ;
+$lang['SEO_URLS_CACHE_RESET_L']="Vide le cache" ;
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_17.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_17.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_17.txt 2011-10-24 10:04:15 UTC (rev 3843)
@@ -0,0 +1,30 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 24/10/11, 11:18
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+
+$lang['CHECKUP_WARN_S']="[checkup] active le chekup" ;
+$lang['CHECKUP_WARN_L']="Choisissez vrai pour activer les autre options" ;
+$lang['WARN_INSTALL_EXISTENCE_S']="[checkup] Vérifie si le répertoire d'installation est présent" ;
+$lang['WARN_INSTALL_EXISTENCE_L']="Choisissez vrai ou faux , si vous avez supprimer ce repertoire, placer sur faux" ;
+$lang['WARN_CONFIG_WRITEABLE_S']="[checkup] Vérifie l'accès en écriture du fichier configure.php" ;
+$lang['WARN_CONFIG_WRITEABLE_L']="Choisissez vrai par mesure de précaution." ;
+$lang['WARN_SESSION_DIRECTORY_NOT_WRITEABLE_S']="[checkup] Vérifie l'accès en écriture du répertoire des sessions" ;
+$lang['WARN_SESSION_DIRECTORY_NOT_WRITEABLE_L']="Choisissez faux une fois en production" ;
+$lang['WARN_DOWNLOAD_DIRECTORY_NOT_READABLE_S']="[checkup] Vérifie si le répertoire des downloads est lisible" ;
+$lang['WARN_DOWNLOAD_DIRECTORY_NOT_READABLE_L']="Choisissez vrai ou faux)" ;
+$lang['WARN_SESSION_AUTO_START_S']="[checkup] Vérifie la configuration serveur" ;
+$lang['WARN_SESSION_AUTO_START_L']="Choisissez vrai par précaution" ;
+
+$lang['BO_FILEBROSWER_SERVER_USE_S']="Filebrowser pour le serveur" ;
+$lang['BO_FILEBROSWER_SERVER_USE_L']="Préciser le broswer à utiliser pour naviguer dans les fichiers du serveur." ;
+$lang['BO_WISIWYG_SELECTED_S']="Éditeur mode html (wysiwyg)" ;
+$lang['BO_WISIWYG_SELECTED_L']="Préciser l'éditeur à utiliser" ;
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_2.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_2.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_2.txt 2011-10-24 10:04:15 UTC (rev 3843)
@@ -0,0 +1,16 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 24/10/11, 11:18
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+$lang['TAX_DECIMAL_PLACES_S']="Taxe décimale" ;
+$lang['TAX_DECIMAL_PLACES_L']="Emplacement décimal pour la valeur du montant de la taxe." ;
+$lang['UNIT_WEIGHT_NAME_S']="Unité de poids" ;
+$lang['UNIT_WEIGHT_NAME_L']="Préciser l'unité de poids utilisée (kg)" ;
+
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_20.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_20.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_20.txt 2011-10-24 10:04:15 UTC (rev 3843)
@@ -0,0 +1,18 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 24/10/11, 11:18
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+
+$lang['EXPECTED_PRODUCTS_SORT_S']="[module] Ordre de tri des articles" ;
+$lang['EXPECTED_PRODUCTS_SORT_L']="Ordre de tri utilisé dans la boîte 'articles en attente'.<br />(Ascendant ou Descendant)" ;
+$lang['EXPECTED_PRODUCTS_FIELD_S']="[module] Tri des articles en attente" ;
+$lang['EXPECTED_PRODUCTS_FIELD_L']="Critère de tri utilisé dans la boîte 'articles en attente'.<br />(par Nom ou par Date)" ;
+
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_21.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_21.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_21.txt 2011-10-24 10:04:15 UTC (rev 3843)
@@ -0,0 +1,30 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 24/10/11, 11:18
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+$lang['MAX_DISPLAY_MANUFACTURERS_IN_A_LIST_S']="[boxe] Affichage du Bloc Fabricants" ;
+$lang['MAX_DISPLAY_MANUFACTURERS_IN_A_LIST_L']="Quand le nombre de fabricants dépasse cette valeur, une 'liste déroulante' sera utilisée à la place de la liste par défaut." ;
+$lang['MAX_MANUFACTURERS_LIST_S']="[boxe] Affichage du Bloc Fabricants 'Liste'" ;
+$lang['MAX_MANUFACTURERS_LIST_L']="Quand cette valeur est égale à 1 la 'liste déroulante' classique sera utilisée. Sinon, une liste sera affichée avec le nombre de lignes spécifiées." ;
+$lang['MAX_DISPLAY_MANUFACTURER_NAME_LEN_S']="[boxe] Affichage du Bloc Fabricants 'Longueur du nom'" ;
+$lang['MAX_DISPLAY_MANUFACTURER_NAME_LEN_L']="Longueur maximum du nom de fabricant à afficher." ;
+$lang['MAX_RANDOM_SELECT_NEW_S']="[boxe]Sélection de nouveaux produits au hasard" ;
+$lang['MAX_RANDOM_SELECT_NEW_L']="Nombre d'entrées possible pour choisir (affichage) un des nouveaux produits." ;
+$lang['MAX_RANDOM_SELECT_SPECIALS_S']="[boxe]Sélection d'articles en promotion au hasard" ;
+$lang['MAX_RANDOM_SELECT_SPECIALS_L']="Nombre d'entrées possible pour choisir (affichage) un des articles ayant une offre promotionnelle ou ayant un effet spécial." ;
+
+
+
+$lang['OSCSS__B_RECENTLY_VIEWED_S']="[recently_viewed] activer les produits récemment vu" ;
+$lang['OSCSS__B_RECENTLY_VIEWED_L']="Choisissez vrai pour activer l'enregistrement des produits vues.! Attention, gourmand en ressource" ;
+$lang['CLASSIC_CATEGORIES_TREE_S']="Utiliser le menu catégories classique" ;
+$lang['CLASSIC_CATEGORIES_TREE_L']="Sélectionner l'apparence du menu catégories.<br />Menu classique ( true ) <br /> Menu déroulant en css ( false )" ;
+
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_22.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_22.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_22.txt 2011-10-24 10:04:15 UTC (rev 3843)
@@ -0,0 +1,59 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 24/10/11, 11:18
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+/// 22 cart recover
+$lang['RCS_BASE_DAYS_S']="Revu des jours" ;
+$lang['RCS_BASE_DAYS_L']="Nombre de jours antérieurs à partir d'aujourd'hui pour les cartes abandonnés." ;
+$lang['RCS_SKIP_DAYS_S']="Jours à ignorer" ;
+$lang['RCS_SKIP_DAYS_L']="Nombre de jours à ignorer lors d'une recherche de panier abandonnés." ;
+$lang['RCS_REPORT_DAYS_S']="Rapport /jours résultats des ventes " ;
+$lang['RCS_REPORT_DAYS_L']="Nombre de jour de vente à prendre en compte dans les rapports d'un compte. Plus il y a de jour, plus la requête SQL est longue !" ;
+$lang['RCS_INCLUDE_TAX_IN_PRICES_S']="Utiliser les taxes calculées" ;
+$lang['RCS_INCLUDE_TAX_IN_PRICES_L']="Essayez de calculer les taxes lors de la détermination des prix. Cela ne peut pas être 100% correct suivant l'emplacement, etc. Peut comporter des erreurs." ;
+$lang['RCS_USE_FIXED_TAX_IN_PRICES_S']="Utiliser les taxes fixes" ;
+$lang['RCS_USE_FIXED_TAX_IN_PRICES_L']="Utiliser un taux de taxes fixe lors de la détermination des prix (taux fixé ci-dessous) . Substitution si les taxes utilisées calculées est True." ;
+$lang['RCS_FIXED_TAX_RATE_S']="Taux de taxe fixe" ;
+$lang['RCS_FIXED_TAX_RATE_L']="Le taux de taxe fixe est utilisé lorsque 'Utiliser les taxes fixes' est sur true et 'Utiliser les taxes calculées' est sur false.<br />Utilisez des valeurs décimales, ex: 0.10 for 10%." ;
+$lang['RCS_EMAIL_TTL_S']="Longueur de vie d'un E-Mail" ;
+$lang['RCS_EMAIL_TTL_L']="Nombre de jour à laisser à un email avant de ne plus les afficher comme envoyés." ;
+$lang['RCS_EMAIL_FRIENDLY_S']="E-Mails amis" ;
+$lang['RCS_EMAIL_FRIENDLY_L']="Si cette valeur est sur <strong>true</strong> le nom du client sera utilisé dans le mail de bienvenue. Si la valeur est sur <strong>false</strong> le mail générique sera envoyé." ;
+$lang['RCS_EMAIL_COPIES_TO_S']="Envoyer une copie des E-Mail à" ;
+$lang['RCS_EMAIL_COPIES_TO_L']="Lors des rappels des panier abandonnés vers les clients, envoyer une copie à l'adresse suivante :" ;
+$lang['RCS_SHOW_ATTRIBUTES_S']="Voir les Attributs" ;
+$lang['RCS_SHOW_ATTRIBUTES_L']="Controler l'affichage des attributs de produits.<br />Pour afficher les attributs de vos produits, passez ce paramètre sur <strong>true</strong>." ;
+$lang['RCS_CHECK_SESSIONS_S']="Ignorer les clients avec session" ;
+$lang['RCS_CHECK_SESSIONS_L']="Passer ce paramètre à true si vous souahitez ignorer les utilisateurs avec une session active (probablement en cours d'achat).<br />Passez ce paramètre à false pour une utilisation normale utilisant moins de ressources." ;
+$lang['RCS_CURCUST_COLOR_S']="Couleur du client" ;
+$lang['RCS_CURCUST_COLOR_L']="Couleur utilisé pour afficher un client.<br />Un client est une personne ayant déjà effectué un achat dans le passé dans votre boutique." ;
+$lang['RCS_UNCONTACTED_COLOR_S']="Couleur du client non contacté" ;
+$lang['RCS_UNCONTACTED_COLOR_L']="Mise en valeur d'un client non contacté.<br />Indique un client qui n'a jamais reçu d'email auparavant." ;
+$lang['RCS_CONTACTED_COLOR_S']="Couleur du client contacté" ;
+$lang['RCS_CONTACTED_COLOR_L']="Mise en valeur d'un client contacté.<br />Indique un client qui a déjà reçu d'email auparavant." ;
+
+$lang['RCS_MATCHED_ORDER_COLOR_S']="Matching Order Hilight" ;
+$lang['RCS_MATCHED_ORDER_COLOR_L']="Row highlight color for entrees that may have a matching order.<br />An entry will be marked with this color if an order contains one or more of an item in the abandoned cart and matches either the cart's customer email address or database ID." ;
+
+$lang['RCS_SKIP_MATCHED_CARTS_S']="Skip Carts w/Matched Orders" ;
+$lang['RCS_SKIP_MATCHED_CARTS_L']="To ignore carts with an a matching order set this to true.<br />Setting this to false will cause entries with a matching order to show, along with the matching order's status.<br />See documentation for details." ;
+$lang['RCS_AUTO_CHECK_S']="Autocheck 'safe' carts to email" ;
+
+$lang['RCS_AUTO_CHECK_L']="To check entries which are most likely safe to email (ie, not existing customers, not previously emailed, etc.) set this to true.<br />Setting this to false will leave all entries unchecked (must manually check entries to send an email to)." ;
+$lang['RCS_CARTS_MATCH_ALL_DATES_S']="Match orders from any date" ;
+$lang['RCS_CARTS_MATCH_ALL_DATES_L']="If <strong>true</strong> then any order found with a matching item will be considered a matched order.<br />If <strong>false</strong> only orders placed after the abandoned cart are considered." ;
+$lang['RCS_PENDING_SALE_STATUS_S']="Pending sales statuses" ;
+$lang['RCS_PENDING_SALE_STATUS_L']="Select the order statuses that can be considered as pending. This information is used to find a succesfull order from the same customer with the same products." ;
+$lang['RCS_REPORT_EVEN_STYLE_S']="Report Even Row Style" ;
+$lang['RCS_REPORT_EVEN_STYLE_L']="Style for even rows in results report. Typical options are <i>dataTableRow</i> and <i>attributes-even</i>." ;
+$lang['RCS_REPORT_ODD_STYLE_S']="Report Odd Row Style" ;
+$lang['RCS_REPORT_ODD_STYLE_L']="Style for odd rows in results report. Typical options are NULL (ie, no entry) and <i>attributes-odd</i>." ;
+
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_24.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_24.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_24.txt 2011-10-24 10:04:15 UTC (rev 3843)
@@ -0,0 +1,34 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 24/10/11, 11:18
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+$lang['DIR_FS_CIP_S']="Répertoire contribution" ;
+$lang['DIR_FS_CIP_L']="Localisation des fichiers contributions" ;
+$lang['ALLOW_FILES_BACKUP_S']="Toujours faire un backup des fichiers" ;
+$lang['ALLOW_FILES_BACKUP_L']="" ;
+$lang['ALLOW_SQL_BACKUP_S']="Toujours faire un backup sql" ;
+$lang['ALLOW_SQL_BACKUP_L']="" ;
+$lang['ALLOW_FILES_RESTORE_S']="Toujours restaurer les fichiers sauvegardés" ;
+$lang['ALLOW_FILES_RESTORE_L']="" ;
+$lang['ALLOW_SQL_RESTORE_S']="Toujours restaurer la db sauvegardée" ;
+$lang['ALLOW_SQL_RESTORE_L']="" ;
+$lang['ALLOW_OVERWRITE_MODIFIED_S']="Toujours écraser les fichiers" ;
+$lang['ALLOW_OVERWRITE_MODIFIED_L']="" ;
+$lang['ALWAYS_DISPLAY_REMOVE_BUTTON_S']="Toujours afficher Remove-Button" ;
+$lang['ALWAYS_DISPLAY_REMOVE_BUTTON_L']="Choisir TRUE et le bouton REMOVE sera affiché mais pas les CIP installés (contrib installer package)." ;
+$lang['ALWAYS_DISPLAY_INSTALL_BUTTON_S']="Toujours afficher Install-Button" ;
+$lang['ALWAYS_DISPLAY_INSTALL_BUTTON_L']="Choisissez le bouton TRUE et l'installation sera affiché pour les deux ensembles - CIP installé et non installé. " ;
+$lang['USE_LOG_SYSTEM_S']="Utilise système Log" ;
+$lang['USE_LOG_SYSTEM_L']="Choisir TRUE et toutes les actions seront logées dans un fichier en répertoire de sauvegarde." ;
+$lang['MAX_UPLOADED_FILESIZE_S']="Taille maximum de fichier pour l'upload CIP." ;
+$lang['MAX_UPLOADED_FILESIZE_L']="Réglage taille maximum du fichier en bytes pour le fichier pouvant être upload sur le serveur." ;
+
+
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_27.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_27.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_27.txt 2011-10-24 10:04:15 UTC (rev 3843)
@@ -0,0 +1,17 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 24/10/11, 11:18
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+$lang['SHOW_COUNTS_S']="Décompte des catégories" ;
+$lang['SHOW_COUNTS_L']="Décompter combien de produits sont présents dans chaque catégorie." ;
+$lang['NOT_RECUP_CASSE_IN_TXT_CATEGORIES_S']="[general] Ne pas rattraper la casse des Noms de catégories" ;
+$lang['NOT_RECUP_CASSE_IN_TXT_CATEGORIES_L']="" ;
+
+
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_8.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_8.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/cfg_8.txt 2011-10-24 10:04:15 UTC (rev 3843)
@@ -0,0 +1,56 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 24/10/11, 11:18
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+$lang['MAX_DISPLAY_PAGE_LINKS_S']="Liens de page" ;
+$lang['MAX_DISPLAY_PAGE_LINKS_L']="Nombre de liens utilisés." ;
+$lang['MAX_DISPLAY_SPECIAL_PRODUCTS_S']="Affichage des promotions" ;
+$lang['MAX_DISPLAY_SPECIAL_PRODUCTS_L']="Nombre maximum d'articles en promotion à afficher." ;
+$lang['MAX_DISPLAY_NEW_PRODUCTS_S']="[module] Affichage nouveaux produits" ;
+$lang['MAX_DISPLAY_NEW_PRODUCTS_L']="Nombre maximum de nouveaux produits à afficher." ;
+$lang['MAX_DISPLAY_UPCOMING_PRODUCTS_S']="Affichage produits en attente" ;
+$lang['MAX_DISPLAY_UPCOMING_PRODUCTS_L']="Nombre maximum de produits en attente à afficher." ;
+$lang['MAX_DISPLAY_PRODUCTS_NEW_S']="[content] Affichage Page Nouveautés" ;
+$lang['MAX_DISPLAY_PRODUCTS_NEW_L']="Nombre maximum de produits à afficher dans la page nouveautés." ;
+$lang['MAX_DISPLAY_BESTSELLERS_S']="[content] Affichage Bloc Meilleures ventes" ;
+$lang['MAX_DISPLAY_BESTSELLERS_L']="Nombre maximum de meilleures ventes à afficher dans le bloc." ;
+$lang['MAX_DISPLAY_ALSO_PURCHASED_S']="[content] Affichage Bloc également acheté" ;
+$lang['MAX_DISPLAY_ALSO_PURCHASED_L']="Nombre maximum de produits déjà achetés à afficher dans le bloc." ;
+$lang['MAX_DISPLAY_SEARCH_RESULTS_S']="Résultats de recherche" ;
+$lang['MAX_DISPLAY_SEARCH_RESULTS_L']="Quantité d'articles à afficher par page." ;
+$lang['PRODUCT_LIST_IMAGE_S']="[listing] Affichage de l'image" ;
+$lang['PRODUCT_LIST_IMAGE_L']="Dans la liste des articles, voulez-vous afficher l'image du produit ?" ;
+$lang['PRODUCT_LIST_DESCRIPTION_S']="[listing] Affichage de la description" ;
+$lang['PRODUCT_LIST_DESCRIPTION_L']="Dans la liste des articles, voulez-vous afficher la description ?" ;
+$lang['PRODUCT_LIST_MANUFACTURER_S']="[listing] Affichage du fabricant" ;
+$lang['PRODUCT_LIST_MANUFACTURER_L']="Dans la liste des articles, voulez-vous afficher le nom du fabricant ?" ;
+$lang['PRODUCT_LIST_MODEL_S']="[listing] Affichage du modèle" ;
+$lang['PRODUCT_LIST_MODEL_L']="Dans la liste des articles, voulez-vous afficher le modèle du produit ?" ;
+$lang['PRODUCT_LIST_NAME_S']="[listing] Affichage nom du produit" ;
+$lang['PRODUCT_LIST_NAME_L']="Dans la liste des articles, voulez-vous afficher le nom du produit ?<br />(0 ou ordre de tri)" ;
+$lang['PRODUCT_LIST_PRICE_S']="[listing] Affichage prix" ;
+$lang['PRODUCT_LIST_PRICE_L']="Dans la liste des articles, voulez-vous afficher le prix du produit ?" ;
+$lang['PRODUCT_LIST_QUANTITY_S']="[listing] Affichage quantité" ;
+$lang['PRODUCT_LIST_QUANTITY_L']="Dans la liste des articles, voulez-vous afficher la quantité du produit ?" ;
+$lang['PRODUCT_LIST_WEIGHT_S']="[listing] Affichage poids" ;
+$lang['PRODUCT_LIST_WEIGHT_L']="Dans la liste des articles, voulez-vous afficher le poids du produit ?" ;
+$lang['PRODUCT_LIST_BUY_NOW_S']="[listing] Affichage bouton 'acheter maintenant'" ;
+$lang['PRODUCT_LIST_BUY_NOW_L']="Dans la liste des articles, voulez-vous afficher le bouton \"acheter maintenant\" du produit ? (false n'affiche pas le boutton)" ;
+$lang['PRODUCT_LIST_FILTER_S']="[listing] Affichage du filtre Catégorie/Fabricant" ;
+$lang['PRODUCT_LIST_FILTER_L']="Afficher le filtre dans la liste des articles ?<br />(0=non, 1=oui)" ;
+$lang['PREV_NEXT_BAR_LOCATION_S']="Position de la barre de navigation" ;
+$lang['PREV_NEXT_BAR_LOCATION_L']="Position de la barre de navigation.<br />(1-haut, 2-bas, 3-les deux)" ;
+$lang['MIN_DISPLAY_BESTSELLERS_S']="Affichage du Bloc Meilleures ventes" ;
+$lang['MIN_DISPLAY_BESTSELLERS_L']="Nombre minimum de meilleures ventes à afficher dans le bloc." ;
+$lang['MIN_DISPLAY_ALSO_PURCHASED_S']="Affichage du Bloc également acheté" ;
+$lang['MIN_DISPLAY_ALSO_PURCHASED_L']="Nombre minimum d'articles déjà achetés à afficher dans le bloc." ;
+
+
+?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/my_boutique.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/my_boutique.txt 2011-10-24 08:14:16 UTC (rev 3842)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/my_boutique.txt 2011-10-24 10:04:15 UTC (rev 3843)
@@ -47,18 +47,12 @@
$lang['STORE_COUNTRY_L']="Le pays de résidence de la boutique.<br /><strong>Note : Pensez à mettre à jour la zone.</strong>" ;
$lang['STORE_ZONE_S']="Zone" ;
$lang['STORE_ZONE_L']="Zone de la localisation de la boutique." ;
-$lang['USE_DEFAULT_LANGUAGE_CURRENCY_S']="Change la langue en fonction de la devise" ;
-$lang['USE_DEFAULT_LANGUAGE_CURRENCY_L']="Change automatiquement la langue sur celle correspondant à la nouvelle devise choisie." ;
$lang['STORE_LOGO_S']="Le logo de la boutique" ;
$lang['STORE_LOGO_L']="Le logo utilisé pour la partie public" ;
$lang['STORE_LOGO_PRINT_S']="Le logo pour impression" ;
$lang['STORE_LOGO_PRINT_L']="Le logo utilisé lors de l'impression, uniquement en jpg, pas de couche de transparence" ;
$lang['SEND_EXTRA_ORDER_EMAILS_TO_S']="Email lors d'une commande" ;
$lang['SEND_EXTRA_ORDER_EMAILS_TO_L']="Envoie une copie de la commande aux adresses spécifiées. Celles-ci doivent être dans le format :<br />Nom 1 ‹email@address1›, Nom 2 ‹email@address2›" ;
-$lang['DISPLAY_CART_S']="Afficher le panier après l'ajout de produit" ;
-$lang['DISPLAY_CART_L']="Affiche le contenu du panier après avoir ajouté un article (ou retourne à l'origine)." ;
-$lang['ADVANCED_SEARCH_DEFAULT_OPERATOR_S']="Option de recherche par défaut" ;
-$lang['ADVANCED_SEARCH_DEFAULT_OPERATOR_L']="Choisir l'opérateur de recherche par défaut.<br />(AND ou OR)" ;
$lang['STORE_NAME_ADDRESS_S']="Nom, adresse, pays et tél. de la boutique" ;
$lang['STORE_NAME_ADDRESS_L']="Nom, adresse, pays et téléphone de la boutique utilisés dans les impressions de documents et l'affichage en ligne." ;
$lang['STORE_OFFLINE_S']="Mode maintenance" ;
Added: trunk/catalog/admin/includes/modules/configuration/modmail.php
===================================================================
--- trunk/catalog/admin/includes/modules/configuration/modmail.php (rev 0)
+++ trunk/catalog/admin/includes/modules/configuration/modmail.php 2011-10-24 10:04:15 UTC (rev 3843)
@@ -0,0 +1,143 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 22/09/11, 19:49
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class modmail
+ Mise en forme et structuration des options de stock
+*/
+
+
+Class modmail
+ implements ext_configuration
+ {
+ /**
+ @var array list template
+ */
+ public static $list;
+
+ public static $cfg;
+
+ /**
+ */
+ function __construct(){
+ global $oscss;
+ $this->code=__CLASS__;
+ global $messageStack, $language,$lang;
+ if (!is_writeable(DIR_FS_TEMPLATES)) $messageStack->add(ERROR_DESTINATION_NOT_WRITEABLE. 'template/', 'error');
+
+ $oscss->pile_file_lang(DIR_FS_ADMIN.DIR_WS_LANGUAGES.$language.'/modules/configuration/'.$this->code.'.txt');
+
+ self::$cfg =new sqlconfiguration();
+ }
+
+
+ /**
+ Action Prise en charge par le modules
+ @param
+ @e global $action
+ @e global $messageStack
+ */
+ public function draw_action(){
+ global $action,$messageStack;
+
+ $DB=Database::getInstance();
+ $gparentID = tep_db_prepare_input($_GET['gparentID']);
+ $gID= tep_db_prepare_input($_GET['gID']);
+
+ switch($action){
+ /**
+ @brief save page groupe
+ */
+ case 'save_mutli':
+ if(tep_not_null($gID) ){
+
+ $list=sqlconfiguration::fetch(array('group_id'=> (int)$gID), true);
+
+ foreach($list as $row) {
+
+ if(isset($_POST['configuration'][$row->key])) {
+ $configuration_value = tep_db_prepare_input($_POST['configuration'][$row->key]);
+
+ if( ($res=sqlconfiguration::update(array('key'=>$row->key , 'value'=>tep_db_input($configuration_value) ))) == false)$erreur[]=false;
+ else $erreur[]=true;
+
+ }
+
+ }
+
+ if(!in_array(false,$erreur)) $messageStack->add_session(SAVE_CONFIG_OK, 'success');
+ else $messageStack->add_session(SAVE_CONFIG_NOT_OK, 'error');
+
+ }
+
+ tep_redirect(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $gparentID.'&gID=' . $_GET['gID'] . '&cID=' . $cID));
+ break;
+ }
+ }
+
+ /**
+ @return array
+ */
+ public function load_db_values($Id){
+
+
+ $list_edit=array();
+ $gID = 12;
+
+ $list=sqlconfiguration::fetch(array('group_id'=> (int)$gID), true);
+
+ foreach($list as $row) {
+
+ $cfgValue =configUtility::CallExecConfigLine($row->use, $row->key, $row->value);
+
+ if ($row->set) eval($s[]='$value_field = ' . $row->set . '"' . htmlspecialchars($row->value) . '","'.$row->key.'");');
+ else $value_field = tep_draw_input_field('configuration['.$row->key.']', '',$row->value);
+
+ $conf = $row;
+ $row->cfgValue=$cfgValue;
+ $row->value_field=$value_field;
+
+ $list_edit[$row->key]=$conf;
+ }
+
+ return $list_edit;
+ }
+
+ /**
+ Appelé dans le header de page
+ */
+ public static function draw_header(){
+ ?>
+ <style type="text/css">
+ #central form label {
+ display: inline-block;
+ font-weight: normal;
+ margin: 5px 10px;
+ text-align: left;
+ white-space: pre-wrap;
+ width: 90%;
+ }
+ </style>
+ <?php
+ }
+
+ /**
+ Contenu central
+ @param
+ @e global $action
+ @e global $gparentID
+ */
+ public function draw(){
+ global $action,$gparentID;
+ if($action=='cfg') return;
+ self::$list = $this->load_db_values('');
+ return tep_get_include_contents('configuration/'.__CLASS__.'.listing');
+ }
+}
+
+?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/modules/configuration/modstock.php
===================================================================
--- trunk/catalog/admin/includes/modules/configuration/modstock.php 2011-10-24 08:14:16 UTC (rev 3842)
+++ trunk/catalog/admin/includes/modules/configuration/modstock.php 2011-10-24 10:04:15 UTC (rev 3843)
@@ -7,12 +7,12 @@
@date 22/09/11, 19:49
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
- @class modmail
- Mise en forme et structuration des options de stock
+ @class modstock
+ @brief Mise en forme et structuration des options de stock
*/
-Class modmail
+Class modstock
implements ext_configuration
{
/**
@@ -87,7 +87,7 @@
$list_edit=array();
- $gID = 12;
+ $gID = 9;
$list=sqlconfiguration::fetch(array('group_id'=> (int)$gID), true);
Modified: trunk/catalog/admin/includes/template/oscss/jquery-ui-1.css
===================================================================
--- trunk/catalog/admin/includes/template/oscss/jquery-ui-1.css 2011-10-24 08:14:16 UTC (rev 3842)
+++ trunk/catalog/admin/includes/template/oscss/jquery-ui-1.css 2011-10-24 10:04:15 UTC (rev 3843)
@@ -1,553 +1,578 @@
-/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.0.9
- @date 23/06/10, 17:42
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-body { background:#faf9f7 url(img/1/body.jpg) repeat-x; color:#000; margin:0; padding:0; font: normal 11px Verdana, Arial, sans-serif; }
-html { height: 100%;}
-/* prepend */
- * {margin:0;padding:0}
- a:link,
- a:visited {text-decoration: underline; color:#000;}
- a:hover { text-decoration: none; }
- img { border-width:0 ; margin:0; padding:0; }
- h1 { font-size: 2em ; padding:1em; }
- h1 img {border-width:0 ; margin:0; padding:0;}
- h2 { font-size: 1.2em ;text-shadow:0 1px 0 #fff;}
- h3 { font-size: 1.2em ;text-shadow:0 1px 0 #fff;color:#666;}
- h4 { font-size: 1em ;text-shadow:0 1px 0 #fff;}
- h5 { font-size: 1em ;text-shadow:0 1px 0 #fff;}
- p {padding:1em;}
- ul {list-style:none;}
- #central li {padding-left:0;cursor:pointer;margin:0.1em 0;}
- th { text-shadow:0 1px 0 #fff;-moz-border-radius:6px; -webkit-border-radius:6px; margin:2px 1px; text-align: left; padding: 0 5px;line-height:30px;}
+/*
+ * jQuery UI CSS Framework 1.8.12
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Theming/API
+ */
-/* form defintion generale */
- #form_bt { width: 80%; margin: 1em 2em;}
- input.radioInput {width:30px;}
- fieldset { margin: 1em 2em; padding:1em; border:none; }
- fieldset p { margin: 1em 0 0 0; }
- fieldset input[type="text"] { min-width:65%; display:inline-block;}
- fieldset label { width: 70%; line-height: 18px; margin-right: 10px; display:inline-block; text-align: right; padding: 0 0 2px 0;}
- fieldset ul { list-style:none;}
- ul.form_radio_inline{display:inline-block;}
- .spacer {clear:both;}
- .noselected{}
- .selected{background:#f0d4bf;}
+/* Layout helpers
+----------------------------------*/
+.ui-helper-hidden { display: none; }
+.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
+.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
+.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
+.ui-helper-clearfix { display: inline-block; }
+/* required comment for clearfix to work in Opera \*/
+* html .ui-helper-clearfix { height:1%; }
+.ui-helper-clearfix { display:block; }
+/* end clearfix */
+.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
-/* general class */
- .error{ color:red; }
- .info{ color:blue;}
- div.info{ color:black;padding:10px 2px; border:2px solid #3A3B35; -moz-border-radius:6px; -webkit-border-radius:6px; background:#73756A;}
- .alert{ color:#ae0405; }
- .fright{ float:right; }
- .fleft {float:left; }
- .tleft{text-align:left}
- .tright{text-align:right}
- .tcenter{text-align:center}
- .inline { display:inline-block; }
- .inline * { display:inline-block; }
- .nobr {white-space:nowrap;}
- #central form {padding:0.5em 1em;}
- .w_100 {width:99%;}
- .w_90 {width:89%;}
- .w_80 {width:79%;}
- .w_70 {width:69%;}
- .w_60 {width:59%;}
- .w_50 {width:49%;}
- .w_40 {width:39%;}
- .w_30 {width:29%;}
-/* buttons */
- .button,
- input[type=submit].button,
- input[type=button].button,
- button.button,
- a.button{
- display: inline-block;
- font-family:Arial;
- white-space:nowrap;
- float:right;
- color:white;
- vertical-align:middle;
- border:1px solid #fff;
- height: 25px;
- line-height: 25px;
- -moz-border-radius:5px;
- -webkit-border-radius: 5px;
- -moz-box-shadow: 0 1px 3px rgba(0,0,0,0.5);
- -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.5);
- margin:8px 20px;
- text-shadow: none;
- }
- input[type=image].button {
- float:left;
- height:18px;
- width:18px;
- }
+/* Interaction Cues
+----------------------------------*/
+.ui-state-disabled { cursor: default !important; }
- input.button,
- button.button{font-size:11px; background:#ccc;padding:2px 5px; }
- a.button{ background:#eee; padding:2px 5px; margin:10px 20px ;text-decoration:none;height:18px; line-height:18px;}
- a.button:hover{background:#797979; color:white;text-decoration:none; }
+/* Icons
+----------------------------------*/
- a.button,
- input.button,
- button.button {background:#ccc url(img/1/button.jpg) left top repeat-x;}
+/* states and images */
+.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
- a.button.ActionYes,
- input.button.ActionYes,
- input[type=image].button.ActionYes,
- input[type=submit].button.ActionYes,
- button.button.ActionYes {background:#ccc url(img/1/button-submit.jpg) left top repeat-x;}
- a.button.ActionBack,
- input[type=image].button.ActionBack,
- button.button.ActionBack {background:#ccc url(img/1/button-back.jpg) left top repeat-x;}
+/* Misc visuals
+----------------------------------*/
+/* Overlays */
+.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
- input:hover.button,
- button:hover.button{background:#797979;color:white;}
- a:hover.button,
- input:hover.button,
- button:hover.button {background:#ccc url(img/1/button.jpg) left -40px repeat-x; opacity:0.6;}
+/*
+ * jQuery UI CSS Framework 1.8.12
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Theming/API
+ *
+ * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana,Arial,sans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=03_highlight_soft.png&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=01_flat.png&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=02_glass.png&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=02_glass.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
+ */
- a:hover.button.ActionYes,
- input:hover.button.ActionYes,
- button:hover.button.ActionYes {background:#ccc url(img/1/button-submit.jpg) left -40px repeat-x; color:black;}
- a.button.ActionBack,
- input.button.ActionBack,
- button.button.ActionBack {background:#ccc url(img/1/button-back.jpg) left -40px repeat-x;}
+/* Component containers
+----------------------------------*/
+.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; }
+.ui-widget .ui-widget { font-size: 1em; }
+.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
+.ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(img/1/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; }
+.ui-widget-content a { color: #222222; }
+.ui-widget-header { border: 1px solid #aaaaaa; background: #cccccc url(img/1/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; }
+.ui-widget-header a { color: #222222; }
+/* Interaction states
+----------------------------------*/
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d3d3d3; background: #e6e6e6 url(img/1/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #555555; }
+.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555; text-decoration: none; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #999999; background: #dadada url(img/1/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
+.ui-state-hover a, .ui-state-hover a:hover { color: #212121; text-decoration: none; }
+.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa; background: #ffffff url(img/1/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
+.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121; text-decoration: none; }
+.ui-widget :active { outline: none; }
- input[type=image].button,
- a.buttonimg img{ opacity:1;}
+/* Interaction Cues
+----------------------------------*/
+.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #fcefa1; background: #fbf9ee url(img/1/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x; color: #363636; }
+.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
+.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(img/1/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; color: #cd0a0a; }
+.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a; }
+.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a; }
+.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
+.ui-priority-secondary, .ui-widget-content .ui-priority-secondary, .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
+.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
- input[type=image]:hover.button ,
- a:hover.buttonimg img,
- a.buttonimg img:hover{ opacity:0.6;}
+/* Icons
+----------------------------------*/
- /* Spe buttons broswer img */
- a.button.browser {height:28px;}
- a.button img {vertical-align:middle;margin:0.3em 0.3em 0 0;}
- .row_action a.button {margin:0;}
+/* states and images */
+.ui-icon { width: 16px; height: 16px; background-image: url(img/1/ui-icons_222222_256x240.png); }
+.ui-widget-content .ui-icon {background-image: url(img/1/ui-icons_222222_256x240.png); }
+.ui-widget-header .ui-icon {background-image: url(img/1/ui-icons_222222_256x240.png); }
+.ui-state-default .ui-icon { background-image: url(img/1/ui-icons_888888_256x240.png); }
+.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(img/1/ui-icons_454545_256x240.png); }
+.ui-state-active .ui-icon {background-image: url(img/1/ui-icons_454545_256x240.png); }
+.ui-state-highlight .ui-icon {background-image: url(img/1/ui-icons_2e83ff_256x240.png); }
+.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(img/1/ui-icons_cd0a0a_256x240.png); }
+/* positioning */
+.ui-icon-carat-1-n { background-position: 0 0...
[truncated message content] |
|
From: <os...@us...> - 2011-10-24 08:14:23
|
Revision: 3842
http://oscss.svn.sourceforge.net/oscss/?rev=3842&view=rev
Author: oscim
Date: 2011-10-24 08:14:16 +0000 (Mon, 24 Oct 2011)
Log Message:
-----------
report des function des abnner dans leur modules
Correction coquille branche
Modified Paths:
--------------
branches/2.1.0/catalog/checkout_payment_address.php
Added Paths:
-----------
branches/2.1.0/extensions/BANNER_MANAGER_stable/catalog/admin/includes/functions/
branches/2.1.0/extensions/BANNER_MANAGER_stable/catalog/admin/includes/functions/lib.banner_manager.php
branches/2.1.0/extensions/BANNER_MANAGER_stable/catalog/admin/includes/functions/lib.banner_statistics.php
Modified: branches/2.1.0/catalog/checkout_payment_address.php
===================================================================
--- branches/2.1.0/catalog/checkout_payment_address.php 2011-10-23 19:28:16 UTC (rev 3841)
+++ branches/2.1.0/catalog/checkout_payment_address.php 2011-10-24 08:14:16 UTC (rev 3842)
@@ -88,8 +88,8 @@
/**
@brief use session stocked for pre-entry forms
*/
- if($_SESSION['country_id']) $entry['country']=$_SESSION['country_id'];
- if($_SESSION['state_id']) $entry['state']=$_SESSION['state_id'];
+ if(isset($_SESSION['country_id'])) $entry['country']=$_SESSION['country_id'];
+ if(isset($_SESSION['state_id'])) $entry['state']=$_SESSION['state_id'];
// $entry['lastname']=$_SESSION['customer_lastname'];
$entry['firstname']=$_SESSION['customer_first_name'];
Copied: branches/2.1.0/extensions/BANNER_MANAGER_stable/catalog/admin/includes/functions/lib.banner_manager.php (from rev 3832, trunk/catalog/admin/includes/functions/lib.banner_manager.php)
===================================================================
--- branches/2.1.0/extensions/BANNER_MANAGER_stable/catalog/admin/includes/functions/lib.banner_manager.php (rev 0)
+++ branches/2.1.0/extensions/BANNER_MANAGER_stable/catalog/admin/includes/functions/lib.banner_manager.php 2011-10-24 08:14:16 UTC (rev 3842)
@@ -0,0 +1,102 @@
+<?php
+/**
+ @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.0
+ @date 19/12/10, 19:49
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+/**
+ Sets the status of a banner
+ @package oscss-2 <www http://www.oscss.org>
+ @author oscim <mail os...@os...> <www http://www.oscim.fr>
+*/
+function tep_set_banner_status($banners_id, $status) {
+ if ($status == '1') {
+ return tep_db_query("update " . TABLE_BANNERS . " set status = '1', expires_impressions = NULL, expires_date = NULL, date_status_change = NULL where banners_id = '" . $banners_id . "'");
+ } elseif ($status == '0') {
+ return tep_db_query("update " . TABLE_BANNERS . " set status = '0', date_status_change = now() where banners_id = '" . $banners_id . "'");
+ } else {
+ return -1;
+ }
+}
+
+/**
+ TODO: Revoir le nom de cette fonction, et l'integer dans la class image
+ @date 22/08/10, 01:30
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+*/
+function tep_banner_image_extension() {
+ if (function_exists('imagetypes')) {
+ if (imagetypes() & IMG_PNG) return 'png';
+ elseif (imagetypes() & IMG_JPG)return 'jpg';
+ elseif (imagetypes() & IMG_GIF) return 'gif';
+ }
+ elseif (function_exists('imagecreatefrompng') && function_exists('imagepng')) return 'png';
+ elseif (function_exists('imagecreatefromjpeg') && function_exists('imagejpeg')) return 'jpg';
+ elseif (function_exists('imagecreatefromgif') && function_exists('imagegif')) return 'gif';
+ return false;
+}
+
+/**
+ Banniere 3j infobox
+ @package oscss-2 <www http://www.oscss.org>
+ @author oscim <mail os...@os...> <www http://www.oscim.fr>
+*/
+function banner_infobox($banner_id,$banner_stats,$days){
+
+ $banner_extension = tep_banner_image_extension();
+
+ include(DIR_WS_CLASSES . 'phplot.php');
+
+ $stats = array();
+ $banner_stats_query = tep_db_query("select dayofmonth(banners_history_date) as name, banners_shown as value, banners_clicked as dvalue from " . TABLE_BANNERS_HISTORY . " where banners_id = '" . $banner_id . "' and to_days(now()) - to_days(banners_history_date) < " . $days . " order by banners_history_date");
+ while ($banner_stats = tep_db_fetch_array($banner_stats_query)) {
+ $stats[] = array($banner_stats['name'], $banner_stats['value'], $banner_stats['dvalue']);
+ }
+
+ if (sizeof($stats) < 1) $stats = array(array(date('j'), 0, 0));
+
+ $img='images/graphs/banner_infobox-' . $banner_id . '.' . $banner_extension;
+
+ $graph = new PHPlot(200, 220,$img );
+
+ $graph->SetFileFormat($banner_extension);
+ $graph->SetIsInline(1);
+ $graph->SetPrintImage(0);
+
+ $graph->draw_vert_ticks = 0;
+ $graph->SetSkipBottomTick(1);
+ $graph->SetDrawXDataLabels(0);
+ $graph->SetDrawYGrid(0);
+ $graph->SetPlotType('bars');
+ //$graph->SetDrawDataLabels(1);
+ $graph->SetLabelScalePosition(1);
+ $graph->SetMarginsPixels(15,15,15,30);
+
+ //! font , et taille
+ $graph->SetTitleFontSize('3');
+ $graph->SetTTFPath(DIR_FS_CATALOG.DIR_WS_COMMON_FONTS);
+ $graph->SetDefaultTTFont('arial.ttf');
+ $graph->SetFontTTF('x_label', 'arial.ttf','8');
+ $graph->SetFontTTF('y_label', 'arial.ttf','8');
+ $graph->SetFontTTF('legend', 'arial.ttf','10');
+
+ $graph->SetTitle(utf8_decode(TEXT_BANNERS_LAST_3_DAYS));
+
+ $graph->SetBackgroundColor('#f0f0ee');
+ $graph->SetTransparentColor('#f0f0ee');
+
+ $graph->SetDataValues($stats);
+ $graph->SetDataColors(array('blue','red'),array('blue', 'red'));
+
+ $graph->DrawGraph();
+
+ $graph->PrintImage();
+
+ return $img;
+}
+?>
\ No newline at end of file
Copied: branches/2.1.0/extensions/BANNER_MANAGER_stable/catalog/admin/includes/functions/lib.banner_statistics.php (from rev 3832, trunk/catalog/admin/includes/functions/lib.banner_statistics.php)
===================================================================
--- branches/2.1.0/extensions/BANNER_MANAGER_stable/catalog/admin/includes/functions/lib.banner_statistics.php (rev 0)
+++ branches/2.1.0/extensions/BANNER_MANAGER_stable/catalog/admin/includes/functions/lib.banner_statistics.php 2011-10-24 08:14:16 UTC (rev 3842)
@@ -0,0 +1,190 @@
+<?php
+/**
+ @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.0
+ @date 19/12/10, 19:49
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+
+
+/**
+ Banniere banner_daily
+ @package oscss-2 <www http://www.oscss.org>
+ @author oscim <mail os...@os...> <www http://www.oscim.fr>
+*/
+function banner_daily($banner_id,$banner){
+
+ $banner_extension = tep_banner_image_extension();
+
+ include(DIR_WS_CLASSES . 'phplot.php');
+
+ $year = (isset($_GET['year']) ? $_GET['year'] : date('Y'));
+ $month = (isset($_GET['month']) ? $_GET['month'] : date('n'));
+
+ $days = (date('t', mktime(0,0,0,$month))+1);
+ $stats = array();
+ for ($i=1; $i<$days; $i++) {
+ $stats[] = array($i, '0', '0');
+ }
+
+ $banner_stats_query = tep_db_query("select dayofmonth(banners_history_date) as banner_day, banners_shown as value, banners_clicked as dvalue from " . TABLE_BANNERS_HISTORY . " where banners_id = '" . $banner_id . "' and month(banners_history_date) = '" . $month . "' and year(banners_history_date) = '" . $year . "'");
+ while ($banner_stats = tep_db_fetch_array($banner_stats_query)) {
+ $stats[($banner_stats['banner_day']-1)] = array($banner_stats['banner_day'], (($banner_stats['value']) ? $banner_stats['value'] : '0'), (($banner_stats['dvalue']) ? $banner_stats['dvalue'] : '0'));
+ }
+
+ $graph = new PHPlot(600, 350, 'images/graphs/banner_daily-' . $banner_id . '.' . $banner_extension);
+
+ $graph->SetFileFormat($banner_extension);
+ $graph->SetIsInline(1);
+ $graph->SetPrintImage(0);
+
+ $graph->SetSkipBottomTick(1);
+ $graph->SetDrawYGrid(1);
+ $graph->SetPrecisionY(0);
+ $graph->SetPlotType('lines');
+
+ //! font , et taille
+ $graph->SetTitleFontSize('3');
+ $graph->SetTTFPath(DIR_FS_CATALOG.DIR_WS_COMMON_FONTS);
+ $graph->SetDefaultTTFont('arial.ttf');
+ $graph->SetFontTTF('x_label', 'arial.ttf','8');
+ $graph->SetFontTTF('y_label', 'arial.ttf','8');
+ $graph->SetFontTTF('legend', 'arial.ttf','10');
+
+ $graph->SetPlotBorderType('left');
+ $graph->SetTitle(utf8_decode(sprintf(TEXT_BANNERS_DAILY_STATISTICS, $banner['banners_title'], tep_strftime('%B', mktime(0,0,0,$month)), $year)));
+
+ $graph->SetBackgroundColor('white');
+// $graph->SetTransparentColor('white');
+
+ $graph->SetVertTickPosition('plotleft');
+ $graph->SetDataValues($stats);
+ $graph->SetDataColors(array('blue','red'),array('blue', 'red'));
+
+ $graph->DrawGraph();
+
+ $graph->PrintImage();
+
+ return $stats;
+}
+
+/**
+ Banniere banner_daily
+ @package oscss-2 <www http://www.oscss.org>
+ @author oscim <mail os...@os...> <www http://www.oscim.fr>
+*/
+function banner_monthly($banner_id,$banner){
+
+ $banner_extension = tep_banner_image_extension();
+
+ include(DIR_WS_CLASSES . 'phplot.php');
+
+ $year = (isset($_GET['year']) ? $_GET['year'] : date('Y'));
+
+ $stats = array();
+ for ($i=1; $i<13; $i++) {
+ $stats[] = array(tep_strftime('%b', mktime(0,0,0,$i)), '0', '0');
+ }
+
+ $banner_stats_query = tep_db_query("select month(banners_history_date) as banner_month, sum(banners_shown) as value, sum(banners_clicked) as dvalue from " . TABLE_BANNERS_HISTORY . " where banners_id = '" . $banner_id . "' and year(banners_history_date) = '" . $year . "' group by banner_month");
+ while ($banner_stats = tep_db_fetch_array($banner_stats_query)) {
+ $stats[($banner_stats['banner_month']-1)] = array(tep_strftime('%b', mktime(0,0,0,$banner_stats['banner_month'])),
+ (($banner_stats['value']) ? $banner_stats['value'] : '0'),
+ (($banner_stats['dvalue']) ? $banner_stats['dvalue'] : '0'));
+ }
+
+ $graph = new PHPlot(600, 350, 'images/graphs/banner_monthly-' . $banner_id . '.' . $banner_extension);
+
+ $graph->SetFileFormat($banner_extension);
+ $graph->SetIsInline(1);
+ $graph->SetPrintImage(0);
+
+// $graph->SetXLabelType('data', 2, '', '\xe2\x82\xac');
+ //! font , et taille
+ $graph->SetTitleFontSize('3');
+ $graph->SetTTFPath(DIR_FS_CATALOG.DIR_WS_COMMON_FONTS);
+ $graph->SetDefaultTTFont('arial.ttf');
+ $graph->SetFontTTF('x_label', 'arial.ttf','8');
+ $graph->SetFontTTF('y_label', 'arial.ttf','8');
+ $graph->SetFontTTF('legend', 'arial.ttf','10');
+
+ $graph->SetSkipBottomTick(1);
+ $graph->SetDrawYGrid(1);
+ $graph->SetPrecisionY(0);
+ $graph->SetPlotType('lines');
+
+ $graph->SetPlotBorderType('left');
+ $graph->SetTitle(sprintf(TEXT_BANNERS_MONTHLY_STATISTICS, $banner['banners_title'], $year));
+
+ $graph->SetBackgroundColor('white');
+// $graph->SetTransparentColor('white');
+
+ $graph->SetVertTickPosition('plotleft');
+ $graph->SetDataValues($stats);
+ $graph->SetDataColors(array('blue','red'),array('blue', 'red'));
+
+ $graph->DrawGraph();
+
+ $graph->PrintImage();
+
+ return $stats;
+}
+
+
+/**
+ Banniere banner_daily
+ @package oscss-2 <www http://www.oscss.org>
+ @author oscim <mail os...@os...> <www http://www.oscim.fr>
+*/
+function banner_yearly($banner_id,$banner){
+
+ $banner_extension = tep_banner_image_extension();
+
+ include(DIR_WS_CLASSES . 'phplot.php');
+
+ $stats = array(array('0', '0', '0'));
+ $banner_stats_query = tep_db_query("select year(banners_history_date) as year, sum(banners_shown) as value, sum(banners_clicked) as dvalue from " . TABLE_BANNERS_HISTORY . " where banners_id = '" . $banner_id . "' group by year");
+ while ($banner_stats = tep_db_fetch_array($banner_stats_query)) {
+ $stats[] = array($banner_stats['year'], (($banner_stats['value']) ? $banner_stats['value'] : '0'), (($banner_stats['dvalue']) ? $banner_stats['dvalue'] : '0'));
+ }
+
+ $graph = new PHPlot(600, 350, 'images/graphs/banner_yearly-' . $banner_id . '.' . $banner_extension);
+
+ $graph->SetFileFormat($banner_extension);
+ $graph->SetIsInline(1);
+ $graph->SetPrintImage(0);
+
+ //! font , et taille
+ $graph->SetTitleFontSize('3');
+ $graph->SetTTFPath(DIR_FS_CATALOG.DIR_WS_COMMON_FONTS);
+ $graph->SetDefaultTTFont('arial.ttf');
+ $graph->SetFontTTF('x_label', 'arial.ttf','8');
+ $graph->SetFontTTF('y_label', 'arial.ttf','8');
+ $graph->SetFontTTF('legend', 'arial.ttf','10');
+
+ $graph->SetSkipBottomTick(1);
+ $graph->SetDrawYGrid(1);
+ $graph->SetPrecisionY(0);
+ $graph->SetPlotType('lines');
+
+ $graph->SetPlotBorderType('left');
+ $graph->SetTitle(sprintf(TEXT_BANNERS_YEARLY_STATISTICS, $banner['banners_title']));
+
+ $graph->SetBackgroundColor('white');
+// $graph->SetTransparentColor('white');
+
+ $graph->SetVertTickPosition('plotleft');
+ $graph->SetDataValues($stats);
+ $graph->SetDataColors(array('blue','red'),array('blue', 'red'));
+
+ $graph->DrawGraph();
+
+ $graph->PrintImage();
+
+ return $stats;
+}
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-10-23 19:28:26
|
Revision: 3841
http://oscss.svn.sourceforge.net/oscss/?rev=3841&view=rev
Author: oscim
Date: 2011-10-23 19:28:16 +0000 (Sun, 23 Oct 2011)
Log Message:
-----------
Suite evolution des page de configuration
Refonte de la configuration/gestion des livraisons, centralisation de tous les element ayant trait ?\195?\160 la livraison dans une page unique
Association des elements de confi, des zones , des modules
Ajout d'une class moduleUtility, qui centralise les elements pour manipuler les modules (TODO ?\195?\160 int?\195?\169grer dans ext/packageutility) dont il reprend une partie du code
Ajout d'un menu dans l'espace configuration, specifique ?\195?\160 la gestion des membres admin, des groupes, des acl
Modified Paths:
--------------
trunk/catalog/admin/includes/boxes/01_configuration.php
trunk/catalog/admin/includes/database_tables.php
trunk/catalog/admin/includes/languages/fr_FR/boxes/01_configuration.php
trunk/catalog/admin/includes/template/oscss/jquery-ui-1.css
trunk/catalog/includes/classes/drivers/data/product.php
trunk/catalog/install/includes/language/fr_FR/oscss_config.txt
trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration_group.sql
Added Paths:
-----------
trunk/catalog/admin/includes/boxes/002_admin.php
trunk/catalog/admin/includes/classes/drivers/sqlgeozone.php
trunk/catalog/admin/includes/classes/modulesUtility.php
trunk/catalog/admin/includes/gabarit/configuration/moddownloads.listing.gab
trunk/catalog/admin/includes/gabarit/configuration/modexpedition.listing.gab
trunk/catalog/admin/includes/gabarit/configuration/modmembres.listing.gab
trunk/catalog/admin/includes/languages/fr_FR/boxes/002_admin.php
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/moddownloads.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modexpedition.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modmembres.txt
trunk/catalog/admin/includes/modules/configuration/moddownloads.php
trunk/catalog/admin/includes/modules/configuration/modexpedition.php
trunk/catalog/admin/includes/modules/configuration/modmembres.php
trunk/catalog/install/includes/sql/mysql/data/91_osc_admin_cip.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_admin_cip.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_admin_cip_depend.sql
Removed Paths:
-------------
trunk/catalog/install/includes/sql/mysql/data/91_osc_cip.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_cip.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_cip_depend.sql
Added: trunk/catalog/admin/includes/boxes/002_admin.php
===================================================================
--- trunk/catalog/admin/includes/boxes/002_admin.php (rev 0)
+++ trunk/catalog/admin/includes/boxes/002_admin.php 2011-10-23 19:28:16 UTC (rev 3841)
@@ -0,0 +1,24 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 23/10/11, 17:06
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+ $configuration_groups_query = tep_db_query("SELECT configuration_group_id AS cgID, configuration_group_title AS cgTitle ,configuration_group_parentid AS gparentID from " . TABLE_CONFIGURATION_GROUP . " ORDER BY configuration_group_parentid , sort_order ASC");
+
+ while ($configuration_groups = tep_db_fetch_array($configuration_groups_query)) {
+ if ($configuration_groups['gparentID'] =='0') $tabl_link[$configuration_groups['cgID']]= array('ss_menu', $configuration_groups['cgTitle'], 'config_'.$configuration_groups['cgID'], @$img['config_'.$configuration_groups['cgID']]);
+ else $tabl_link[$configuration_groups['gparentID']][4][]= array(FILENAME_CONFIGURATION.'?gparentID=' . $configuration_groups['gparentID'].'&gID=' . $configuration_groups['cgID'], $configuration_groups['cgTitle'], 'config_'.$configuration_groups['cgID'], @$img['config_'.$configuration_groups['cgID']]);
+ }
+
+/* taxe et zone de taxe*/
+ $tabl_link[130]= array('ss_menu','BOX_ZONE_AND_TAXE','taxes_in_zone');
+ $tabl_link[130][4][]= array(FILENAME_COUNTRIES, 'BOX_TAXES_COUNTRIES', 'countries');
+ $tabl_link[130][4][]= array(FILENAME_GEO_ZONES, 'BOX_TAXES_GEO_ZONES', 'taxes_geo_zone');
+ $tabl_link[130][4][]= array(FILENAME_TAX_CLASSES, 'BOX_TAXES_TAX_CLASSES', 'taxes_classes');
+
+?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/boxes/01_configuration.php
===================================================================
--- trunk/catalog/admin/includes/boxes/01_configuration.php 2011-10-23 09:56:43 UTC (rev 3840)
+++ trunk/catalog/admin/includes/boxes/01_configuration.php 2011-10-23 19:28:16 UTC (rev 3841)
@@ -3,8 +3,8 @@
@licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 11/02/11, 09:49
+ @version 2.1.1
+ @date 23/10/11, 17:06
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -20,11 +20,5 @@
$tabl_link[130][4][]= array(FILENAME_COUNTRIES, 'BOX_TAXES_COUNTRIES', 'countries');
$tabl_link[130][4][]= array(FILENAME_GEO_ZONES, 'BOX_TAXES_GEO_ZONES', 'taxes_geo_zone');
$tabl_link[130][4][]= array(FILENAME_TAX_CLASSES, 'BOX_TAXES_TAX_CLASSES', 'taxes_classes');
-/* gestion gourpe admin */
- $tabl_link[140]= array('ss_menu','BOX_HEADING_CONF_ADMINISTRATOR','administrator');
- $tabl_link[140][4][]= array(FILENAME_ADMINUSERS, 'BOX_ADMINISTRATOR_MEMBERS', 'members');
- $tabl_link[140][4][]= array(FILENAME_ADMINGROUP, 'BOX_ADMINISTRATOR_GROUPS', 'groups');
- $tabl_link[140][4][]= array(FILENAME_ADMIN_MEMBERS.'?gID=groups', 'BOX_ADMINISTRATOR_GROUPS_PERMISSION', 'groups');
- $tabl_link[140][4][]= array(FILENAME_ADMINNOTIF, 'BOX_ADMIN_NOTIFICATIONS', 'groups');
?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/classes/drivers/sqlgeozone.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlgeozone.php (rev 0)
+++ trunk/catalog/admin/includes/classes/drivers/sqlgeozone.php 2011-10-23 19:28:16 UTC (rev 3841)
@@ -0,0 +1,197 @@
+<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 23/10/11, 16:51
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class sqlgeozone
+ @brief manage insert/update/delete in zone tables
+*/
+
+
+
+
+class sqlgeozone
+ implements ModSqlDataDriver{
+
+ public static $modules;
+
+ protected static $_instance;
+
+ protected function __construct(){
+ }
+
+
+ public static function getInstance() {
+ if(self::$_instance == null) self::$_instance = new self();
+ return self::$_instance;
+ }
+
+
+ /**
+ @brief create new ligne in table configuration
+ */
+ public static function create($option){
+ self::getInstance();
+
+ if(!isset($option['name']))
+ return 'name';
+
+ $sql_data_array['geo_zone_name'] = tep_db_prepare_input($option['name']);
+ if(isset($option['type'])) $sql_data_array['geo_zone_type'] = tep_db_prepare_input($option['type']);
+ if(isset($option['description'])) $sql_data_array['geo_zone_description'] = tep_db_prepare_input($option['description']);
+
+ $sql_data_array['date_added'] = 'now()';
+
+ $res=tep_db_perform(TABLE_GEO_ZONES, $sql_data_array);
+
+ if(!$res)
+ return $res;
+ else
+ return $res->__get('insertId');
+ }
+
+ /**
+ @brief update ligne in table configuration
+ */
+ public static function update($option){
+ self::getInstance();
+
+ if(!isset($option['id']))
+ return 'id';
+
+ $where ='';
+ if(isset($option['id'])) $where .="AND geo_zone_id = '".(int)$option['id']."' ";
+
+ if(isset($option['name']))$sql_data_array['geo_zone_name'] = tep_db_prepare_input($option['name']);
+ if(isset($option['type'])) $sql_data_array['geo_zone_type'] = tep_db_prepare_input($option['type']);
+ if(isset($option['description'])) $sql_data_array['geo_zone_description'] = tep_db_prepare_input($option['description']);
+
+ $sql_data_array['last_modified'] = 'now()';
+ $res=tep_db_perform(TABLE_GEO_ZONES, $sql_data_array, 'update' , substr($where,3) );
+
+ return $res;
+ }
+
+ /**
+ @brief load ligne in table configuration
+ @param option array
+ id => row id int (configuration_id)
+ key => string key (configuration_key)
+ group_id => group_id int (configuration_group_id)
+ @param $shortkey use cleankey for return short key
+ @return
+
+ object(stdClass)[13]
+ public 'id' => string '1' (length=1)
+
+ OR
+ array(
+ object(stdClass)[13]
+ ...
+ object(stdClass)[13]
+ ..
+ )
+
+ */
+ public static function fetch($option,$shortkey=false){
+ self::getInstance();
+ $DB=Database::getInstance();
+
+ $sql ="";
+ if(isset($option['id'])) $sql .="AND geo_zone_id = '".(int)tep_db_input($option['id'])."' ";
+ if(isset($option['type'])) $sql .="AND geo_zone_type = '".(int)tep_db_input($option['type'])."' ";
+
+ if($sql=='')
+ return false;
+
+
+ $sql="SELECT * FROM " . TABLE_GEO_ZONES . " a ".
+// " LEFT JOIN " . TABLE_IMAGES_USED . " g ON (a.rowid=g.rowid) ".
+ " WHERE ".substr($sql,3);
+
+ $res=$DB->query($sql);
+
+ $num = $res->__get('numRows');
+
+ if($num == 1){
+ $result=$res->fetchAssoc();
+ return ((!$shortkey)? $result : self::CleanKey($result));
+ }
+ elseif($num > 1){
+ $array=array();
+
+ foreach($res->fetchAllAssoc() as $result)
+ $array[]= ((!$shortkey)? $result : self::CleanKey($result));
+
+ return $array;
+ }
+
+ return false;
+ }
+
+ /**
+ @brief delete row
+ */
+ public static function delete($option){
+ self::getInstance();
+ $DB=Database::getInstance();
+
+ if(isset($option['id']))
+ $_id = (int)tep_db_input($option['id']) ;
+ else
+ return false;
+
+ $DB->query("delete from " . TABLE_ZONES_TO_GEO_ZONES . " where geo_zone_id = '" . (int)$_id . "' ");
+
+ $DB->query("delete from " . TABLE_GEO_ZONES . " where geo_zone_id = '" . (int)$_id . "'");
+
+
+ return true;
+ }
+
+
+ /**
+ @brief
+ @return array product empty
+ */
+ public static function Specimen(){
+ $par = array('geo_zone_id' => '',
+ 'geo_zone_type' => '',
+ 'geo_zone_name' => '',
+ 'geo_zone_description' => '',
+ 'last_modified' => '',
+ 'date_added' => '',
+ );
+
+ return self::CleanKey($par);
+ }
+
+
+
+ /**
+ @fn CleanKey()
+ @brief Clean string name key
+ */
+ private static function CleanKey($array){
+ self::getInstance();
+ $object= new stdclass();
+
+ foreach($array as $key=>$value){
+ if( strpos($key,'geo_zone_') ===0)
+ $key=substr($key,9);
+
+
+ $object->$key = $value;
+ }
+
+ return $object;
+ }
+
+}
+
+
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/classes/modulesUtility.php
===================================================================
--- trunk/catalog/admin/includes/classes/modulesUtility.php (rev 0)
+++ trunk/catalog/admin/includes/classes/modulesUtility.php 2011-10-23 19:28:16 UTC (rev 3841)
@@ -0,0 +1,139 @@
+<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 23/10/11, 17:20
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class modulesUtility
+*/
+class modulesUtility {
+
+
+ static public $pathType;
+
+ protected static $_instance;
+
+ protected function __construct(){
+
+ self::$pathType['checkout_process']=array('key'=>'MODULE_CHECKOUT_PROCESS_INSTALLED', 'value'=>MODULE_CHECKOUT_PROCESS_INSTALLED, 'module_directory'=> 'process/');
+ self::$pathType['shipping']=array('key'=>'MODULE_SHIPPING_INSTALLED', 'value'=>MODULE_SHIPPING_INSTALLED, 'module_directory'=>'shipping/');
+ self::$pathType['payment']=array('key'=>'MODULE_PAYMENT_INSTALLED', 'value'=>MODULE_PAYMENT_INSTALLED, 'module_directory'=> 'payment/');
+ self::$pathType['order_total']=array('key'=>'MODULE_ORDER_TOTAL_INSTALLED', 'value'=>MODULE_ORDER_TOTAL_INSTALLED, 'module_directory'=> 'order_total/');
+ self::$pathType['generic']=array('key'=>'MODULE_GENERIC_INSTALLED', 'value'=>MODULE_GENERIC_INSTALLED, 'key_BO'=>'MODULE_GENERIC_INSTALLED_BO', 'value_BO'=>MODULE_GENERIC_INSTALLED_BO,'module_directory'=>'generic/','module_language'=>DIR_FS_ADMIN.'includes/languages/');
+ self::$pathType['products']=array('key'=>'MODULE_ACAPRO_INSTALLED', 'value'=>MODULE_ACAPRO_INSTALLED,'key_BO'=>'MODULE_ACAPRO_INSTALLED_BO', 'value_BO'=>MODULE_ACAPRO_INSTALLED_BO,'module_directory'=> 'products/','module_language'=>DIR_FS_ADMIN.'includes/languages/' );
+ self::$pathType['content']=array('key'=>'MODULE_CONTENT_INSTALLED', 'value'=>MODULE_CONTENT_INSTALLED, 'key_BO'=>'MODULE_CONTENT_INSTALLED_BO', 'value_BO'=>MODULE_CONTENT_INSTALLED_BO,'module_directory'=>'content/','module_language'=>DIR_FS_ADMIN.'includes/languages/');
+ self::$pathType['categories']=array('key'=>'MODULE_ACACAT_INSTALLED', 'value'=>MODULE_ACACAT_INSTALLED ,'key_BO'=>'MODULE_ACACAT_INSTALLED_BO', 'value_BO'=>MODULE_ACACAT_INSTALLED_BO,'module_directory'=> 'categories/','module_language'=>DIR_FS_ADMIN.DIR_WS_LANGUAGES );
+ self::$pathType['account']=array('key'=>'MODULE_ACCOUNT_INSTALLED', 'value'=>MODULE_ACCOUNT_INSTALLED,'key_BO'=>'MODULE_ACCOUNT_INSTALLED_BO', 'value_BO'=>MODULE_ACCOUNT_INSTALLED_BO,'module_directory'=> 'account/','module_language'=>DIR_FS_ADMIN.DIR_WS_LANGUAGES );
+ self::$pathType['listing']=array('key'=>'MODULE_LISTING_INSTALLED', 'value'=>MODULE_LISTING_INSTALLED,'key_BO'=>'MODULE_LISTING_INSTALLED_BO', 'value_BO'=>@MODULE_LISTING_INSTALLED_BO,'module_directory'=> 'listing/','module_language'=>DIR_FS_ADMIN.DIR_WS_LANGUAGES );
+ self::$pathType['home']=array('key'=>'MODULE_HOME_INSTALLED', 'value'=>MODULE_HOME_INSTALLED, 'key_BO'=>'MODULE_HOME_INSTALLED_BO', 'value_BO'=>MODULE_HOME_INSTALLED_BO ,'module_directory'=>'home/','module_language'=>DIR_FS_ADMIN.DIR_WS_LANGUAGES );
+
+
+ }
+
+ protected static function getInstance() {
+ if(self::$_instance == null) self::$_instance = new self();
+ return self::$_instance;
+ }
+
+
+
+ static public function GetModule($type, $filename){
+ self::getInstance();
+
+ $r = new stdClass;
+
+ $r->classe = (( substr($row,-3) =='php') ? substr($row,0, -4) : $filename );
+
+
+
+ if(isset(self::$pathType[$type])){
+
+ $dt=new objectInfo(self::$pathType[$type]);
+
+ $r->detail = self::info_module($filename,DIR_FS_CATALOG.DIR_WS_MODULES.$dt->module_directory, DIR_FS_ADMIN.DIR_WS_MODULES.$dt->module_directory, '.php');
+
+ }
+
+ return $r;
+ }
+
+
+ static public function LoadModule($type, $filename){
+
+ global $language,$oscss;
+
+ self::getInstance();
+
+
+ $r = new stdClass;
+
+ $r->classe = (( substr($filename,-3) =='php') ? substr($filename,0, -4) : $filename );
+
+
+
+ if(isset(self::$pathType[$type])){
+
+ $dt=new objectInfo(self::$pathType[$type]);
+
+
+ $r->status = (bool)(in_array($filename,explode(';',$dt->value)));
+
+ $r->detail = self::info_module($filename,DIR_FS_CATALOG.DIR_WS_MODULES.$dt->module_directory, DIR_FS_ADMIN.DIR_WS_MODULES.$dt->module_directory, '.php');
+
+
+ $oscss->pile_file_lang(DIR_FS_CATALOG.DIR_WS_LANGUAGES.$language.'/modules/'.$type . '/' .$r->detail->filelg.'.txt');
+
+ include_once($r->detail->path.$r->detail->filemod);
+
+ if (class_exists($r->detail->classe)) {
+ $module = new $r->detail->classe;
+
+ $r->content = $module;
+ }
+
+ }
+
+ return $r;
+ }
+
+
+
+
+
+ /**
+ @param
+ @a string element file/dir
+ @a string path shop
+ @a string path admin
+ @a string ext
+ */
+ private static function info_module($file,$ref_shop, $ref_admin, $ref_ext='.php'){
+ $_obj=new stdClass;
+ $filelg='';
+ //! module dans leur propre sous rep
+ if(is_dir($ref_shop.$file)) {
+ $ref_shop .= $file.'/';
+ $ref_admin .= $file.'/';
+ $file .=$ref_ext;
+ $filelg = substr($file,0,-4).'/';
+ }
+
+ //! verif file in ext php
+ if (substr($file, strrpos($file, '.')) == $ref_ext) {
+ $class=substr($file, 0, (strlen($file)-strlen($ref_ext)));
+ $code=strtoupper($class);
+
+ if (file_exists($ref_admin.$file))$_obj->path_BO=$ref_admin;
+ if(file_exists($ref_shop.$file)) $_obj->path=$ref_shop;
+ $_obj->filemod=$file;
+ $_obj->classe=$class;
+ $_obj->filelg=$filelg.$class;
+ }
+
+ return $_obj;
+ }
+}
+?>
Modified: trunk/catalog/admin/includes/database_tables.php
===================================================================
--- trunk/catalog/admin/includes/database_tables.php 2011-10-23 09:56:43 UTC (rev 3840)
+++ trunk/catalog/admin/includes/database_tables.php 2011-10-23 19:28:16 UTC (rev 3841)
@@ -13,6 +13,8 @@
define('TABLE_ADMIN', DB_TABLE_PREFIX . 'admin_users');
define('TABLE_ADMIN_GROUPS', DB_TABLE_PREFIX . 'admin_groups');
define('TABLE_ADMIN_NOTIFICATION', DB_TABLE_PREFIX.'admin_notification');
+ define('TABLE_CIP', DB_TABLE_PREFIX . 'admin_cip');
+ define('TABLE_CIP_DEPEND', DB_TABLE_PREFIX . 'admin_cip_depend');
define('TABLE_ADMIN_FILES', DB_TABLE_PREFIX . 'admin_m_files');
define('TABLE_ADMIN_FILES2RIGHT', DB_TABLE_PREFIX . 'admin_m_files_to_right');
@@ -26,8 +28,7 @@
define('TABLE_CATEGORIES_DESCRIPTION', DB_TABLE_PREFIX . 'categories_description');
define('TABLE_CATEGORIES_EXTRA', DB_TABLE_PREFIX . 'categories_extra');
- define('TABLE_CIP', DB_TABLE_PREFIX . 'cip');
- define('TABLE_CIP_DEPEND', DB_TABLE_PREFIX . 'cip_depend');
+
define('TABLE_CONFIGURATION', DB_TABLE_PREFIX . 'configuration');
define('TABLE_CONFIGURATION_GROUP', DB_TABLE_PREFIX . 'configuration_group');
Added: trunk/catalog/admin/includes/gabarit/configuration/moddownloads.listing.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/moddownloads.listing.gab (rev 0)
+++ trunk/catalog/admin/includes/gabarit/configuration/moddownloads.listing.gab 2011-10-23 19:28:16 UTC (rev 3841)
@@ -0,0 +1,75 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 22/09/11, 20:05
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @brief mise en forme de la gestion du stock
+*/
+?>
+
+<div id="ssmenu">
+ <?php echo tep_ssmenu_configuration($_GET['gparentID']) ?>
+</div>
+
+
+
+<h3 class="main-title"><?php echo __('moddownloads heading') ?></h3>
+
+<?php echo tep_draw_form('configuration', FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&gID=' . $_GET['gID'] . '&action=save_mutli') ?>
+
+
+<div class="block_form">
+
+ <fieldset class="block_field">
+ <?php /** */ $row = moddownloads::$list['DOWNLOAD_ENABLED']; ?>
+ <legend title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></legend>
+
+ <div class="block_input">
+ <label><?php if (tep_not_null($row->description))echo __($row->description); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </p>
+
+
+
+ <?php /** option de la gestion de stock, disponible que ci value precendente a true */ ?>
+ <?php if(_test_bool(moddownloads::$list['DOWNLOAD_ENABLED']->value)): ?>
+
+ <?php /** Attribut produit / option stock associé */ ?>
+
+ <h4 class="block_field-title"><?php echo __('moddownloads legend other') ?></h4>
+
+ <ul class="block_input">
+ <?php foreach(moddownloads::$list as $row)
+ if(!in_array($row->key,array('DOWNLOAD_ENABLED')) ) { ?>
+ <li id="nav_<?php echo $row->key ?>"><h5 title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></h5>
+
+ <div class="block_input tirroir">
+ <label><?php echo __($row->description); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </li>
+ <?php } ?>
+ </ul>
+ </fieldset>
+
+
+ <?php endif; ?>
+
+
+
+
+ <div class="button_nav">
+ <?php print tep_image_submit('button_copy.gif', IMAGE_UPDATE) .tep_js_back(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&gID=' . $_GET['gID'] )) ; ?>
+ </div>
+
+</div>
+</form>
\ No newline at end of file
Added: trunk/catalog/admin/includes/gabarit/configuration/modexpedition.listing.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/modexpedition.listing.gab (rev 0)
+++ trunk/catalog/admin/includes/gabarit/configuration/modexpedition.listing.gab 2011-10-23 19:28:16 UTC (rev 3841)
@@ -0,0 +1,206 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 22/09/11, 20:05
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @brief mise en forme de la gestion du stock
+
+ @note
+ les id css de type (id="modexpedition-xxxx") sont urilisé dans la class associé, pour replacer la page apres enregsitrement
+*/
+?>
+
+<div id="ssmenu">
+ <?php echo tep_ssmenu_configuration($_GET['gparentID']) ?>
+</div>
+
+
+
+<h3 class="main-title"><?php echo __('heading modexpedition configuration') ?></h3>
+
+
+ <div id="tabs">
+ <ul>
+ <li><a href="#tabs-1"><?php echo __('tab shipping configuration'); ?></a></li>
+ <li><a href="#tabs-2"><?php echo __('tab shipping zones'); ?></a></li>
+ <li><a href="#tabs-3"><?php echo __('tab shipping modules'); ?></a></li>
+ </ul>
+
+ <div id="tabs-1" class="tabPage">
+
+ <?php echo tep_draw_form('configuration', FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&gID=' . $_GET['gID'] . '&action=save_mutli') ?>
+ <div id="modexpedition-config" class="block_form">
+
+
+ <fieldset class="block_field">
+ <legend><?php echo __('modexpedition legend localisation entrepot') ?></legend>
+ <div class="block_input">
+ <?php /** */ $row = modexpedition::$list['SHIPPING_ORIGIN_COUNTRY']; ?>
+ <div class="fleft w_50">
+ <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ <?php /** */ $row = modexpedition::$list['SHIPPING_ORIGIN_ZIP']; ?>
+ <div class="fleft w_50">
+ <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </div>
+ </fieldset>
+
+
+ <fieldset class="block_field">
+ <?php /** */ $row = modexpedition::$list['SHIPPING_MAX_WEIGHT']; ?>
+ <legend title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></legend>
+
+ <div class="block_input">
+ <label><?php if (tep_not_null($row->description))echo __($row->description); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </p>
+ </fieldset>
+
+
+ <?php /** Attribut produit / option stock associé */ ?>
+ <fieldset class="block_field">
+ <legend class="block_field-title"><?php echo __('modexpedition legend other') ?></legend>
+
+ <ul class="block_input">
+ <?php foreach(modexpedition::$list as $row)
+ if(!in_array($row->key,array('SHIPPING_ORIGIN_COUNTRY', 'SHIPPING_ORIGIN_ZIP', 'SHIPPING_MAX_WEIGHT', 'HEADING_IMAGE_HEIGHT', 'SUBCATEGORY_IMAGE_WIDTH', 'SUBCATEGORY_IMAGE_HEIGHT', 'POPUP_IMAGE_WIDTH','POPUP_IMAGE_HEIGHT','STACK_IMAGE_WIDTH','STACK_IMAGE_HEIGHT','JPEG_QUALITY')) ) { ?>
+ <li id="nav_<?php echo $row->key ?>"><h5 title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></h5>
+
+ <div class="block_input tirroir">
+ <label><?php echo __($row->description); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </li>
+ <?php } ?>
+ </ul>
+ </fieldset>
+
+ <div class="button_nav">
+ <?php print tep_image_submit('button_copy.gif', IMAGE_UPDATE) .tep_js_back(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&gID=' . $_GET['gID'] )) ; ?>
+ </div>
+
+
+ <!-- <div class="block_field">
+ <h4 class="block_field-title"><?php echo __('modexpedition legend brief') ?></h4>
+
+ <p class="block_field-text"><?php printf(__('modexpedition text path images %s'), DIR_FS_CATALOG_IMAGES ) ?></p>
+ <p class="block_field-text"><?php printf(__('modexpedition text url images %s'), tep_catalog_href_link(DIR_WS_IMAGES,'','NONSSL',false) ) ?></p>
+
+ <p class="block_field-text"><?php echo __('modexpedition text brief') ?></p>
+
+ </div>-->
+ </div>
+ </form>
+ </div>
+
+
+
+
+
+ <div id="tabs-2" class="tabPage">
+ <?php /** Liste des zone de livraison */ ?>
+ <?php echo tep_draw_form('configuration', FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&gID=' . $_GET['gID'] . '&action=zones') ?>
+ <div id="modexpedition-zone" class="block_form">
+ <h4 class="main-title"><?php echo __('modexpedition heading zone shipping'); ?></h4>
+
+ <table class="dataTable">
+ <thead>
+ <tr>
+ <th><?php echo __('table heading tax zones'); ?></th>
+ <th><?php echo __('table heading tax zones desc'); ?></th>
+ <th><?php echo __('table heading nbr sub'); ?></th>
+ <th><?php echo __('table heading action'); ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <!-- AJAX BLOCK -->
+
+ <?php foreach(modexpedition::$zone as $row): ?>
+ <tr>
+ <td><?php echo tep_draw_input_field('modexpedition[zone]['.$row->id.']','',$row->name, ' style="width:100%;" '); ?></td>
+ <td><?php echo $row->description; ?></td>
+ <td class="tcenter"><?php echo tep_date_short(empty($row->last_modified)? $row->date_added : $row->last_modified); ?></td>
+ <td class="tright"><?php echo '' ?></td>
+ </tr>
+ <?php endforeach; ?>
+ </tbody>
+ </table>
+
+ <div class="button_nav">
+ <?php print tep_image_submit('button_copy.gif', IMAGE_UPDATE) .tep_js_back(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&gID=' . $_GET['gID'] )) ; ?>
+ </div>
+
+ </div>
+ </form>
+ </div>
+
+
+
+
+
+ <div id="tabs-3" class="tabPage">
+ <?php /** Liste des moduel de livraison */ ?>
+ <?php echo tep_draw_form('configuration', FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&gID=' . $_GET['gID'] . '&action=modules') ?>
+ <div id="modexpedition-module" class="block_form">
+ <h4 class="main-title"><?php echo __('modexpedition heading modules shipping'); ?></h4>
+
+
+ <table class="dataTable">
+ <thead>
+ <tr>
+ <th><?php echo __('table heading module code'); ?></th>
+ <th><?php echo __('table heading module title'); ?></th>
+ <th><?php echo __('table heading module desc'); ?></th>
+ <th><?php echo __('table heading module sort'); ?></th>
+ <th><?php echo __('table heading module status'); ?></th>
+ <th><?php echo __('table heading action'); ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php foreach(modexpedition::$module as $row): /*print_r($row)*/ ?>
+ <tr>
+ <td><?php echo $row->content->code; ?></td>
+ <td><?php echo $row->content->title; ?></td>
+ <td><?php echo $row->content->description; ?></td>
+ <td class="tcenter"><?php echo $row->content->sort_order; ?></td>
+ <td class="tcenter"><?php
+ if($row->status) {
+ echo tep_image(DIR_WS_ICONS . 'icon_status_green.gif', IMAGE_ICON_STATUS_GREEN) . ' <a href="' . tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&gID=' . $_GET['gID'] . '&action=modules'.'&flag=0' ) . '">' . tep_image(DIR_WS_ICONS . 'icon_status_red_light.gif', IMAGE_ICON_STATUS_RED_LIGHT) . '</a>';
+ } else {
+ echo '<a href="' . tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&gID=' . $_GET['gID'] . '&action=modules'.'&flag=1') . '">' . tep_image(DIR_WS_ICONS . 'icon_status_green_light.gif', IMAGE_ICON_STATUS_GREEN_LIGHT) . '</a> ' . tep_image(DIR_WS_ICONS . 'icon_status_red.gif', IMAGE_ICON_STATUS_RED);
+ }
+ ?></td>
+ <td class="tright">
+ <?php echo '' ?>
+ </td>
+ </tr>
+ <?php endforeach; ?>
+ </tbody>
+ </table>
+
+
+ <div class="button_nav">
+ <?php print tep_image_submit('button_copy.gif', IMAGE_UPDATE) .tep_js_back(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&gID=' . $_GET['gID'] )) ; ?>
+ </div>
+
+ </div>
+ </form>
+ </div>
+
+</div>
\ No newline at end of file
Added: trunk/catalog/admin/includes/gabarit/configuration/modmembres.listing.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/modmembres.listing.gab (rev 0)
+++ trunk/catalog/admin/includes/gabarit/configuration/modmembres.listing.gab 2011-10-23 19:28:16 UTC (rev 3841)
@@ -0,0 +1,375 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 22/09/11, 20:05
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @brief mise en forme de la gestion du stock
+*/
+?>
+
+<div id="ssmenu">
+ <?php echo tep_ssmenu_configuration($_GET['gparentID']) ?>
+</div>
+
+
+
+<h3 class="main-title"><?php echo __('modmembres heading') ?></h3>
+
+<?php echo tep_draw_form('configuration', FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&gID=' . $_GET['gID'] . '&action=save_mutli') ?>
+
+
+<div class="block_form">
+
+
+ <fieldset class="block_field">
+ <legend><?php echo __('modmembres legend dob') ?></legend>
+ <div class="block_input">
+ <?php /** */ $row = modmembres::$list['ACCOUNT_DOB']; ?>
+ <div class="fleft w_50">
+ <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+
+ <?php if(_test_bool(modmembres::$list['ACCOUNT_DOB']->value)): ?>
+ <?php /** */ $row = modmembres::$list['ENTRY_DOB_MIN_LENGTH']; ?>
+ <div class="fleft w_50">
+ <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ <?php endif; ?>
+ </div>
+ </fieldset>
+
+
+ <fieldset class="block_field">
+ <legend><?php echo __('modmembres legend dob') ?></legend>
+ <div class="block_input">
+ <?php /** */ $row = modmembres::$list['ACCOUNT_COMPANY']; ?>
+ <div class="fleft w_50">
+ <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+
+ <?php if(_test_bool(modmembres::$list['ACCOUNT_COMPANY']->value)): ?>
+ <?php /** */ $row = modmembres::$list['ENTRY_COMPANY_MIN_LENGTH']; ?>
+ <div class="fleft w_50">
+ <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ <?php endif; ?>
+ </div>
+ </fieldset>
+
+ <fieldset class="block_field">
+ <legend><?php echo __('modmembres legend gender') ?></legend>
+ <div class="block_input">
+ <?php /** */ $row = modmembres::$list['ACCOUNT_GENDER']; ?>
+ <div class="fleft w_50">
+ <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+
+ </div>
+ </fieldset>
+
+ <fieldset class="block_field">
+ <legend><?php echo __('modmembres legend firstanme') ?></legend>
+ <ul class="block_input">
+ <?php /** */ $row = modmembres::$list['ENTRY_FIRST_NAME_MIN_LENGTH']; ?>
+ <li id="nav_<?php echo $row->key ?>"><h5 title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></h5>
+
+ <div class="block_input tirroir">
+ <label><?php echo __($row->description); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </li>
+ <?php /** */ $row = modmembres::$list['CUSTOMER_FORCE_UCWORDS']; ?>
+ <li id="nav_<?php echo $row->key ?>"><h5 title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></h5>
+
+ <div class="block_input tirroir">
+ <label><?php echo __($row->description); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </li>
+ </ul>
+ </fieldset>
+
+
+ <fieldset class="block_field">
+ <legend><?php echo __('modmembres legend lastname') ?></legend>
+ <ul class="block_input">
+ <?php /** */ $row = modmembres::$list['ENTRY_LAST_NAME_MIN_LENGTH']; ?>
+ <li id="nav_<?php echo $row->key ?>"><h5 title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></h5>
+
+ <div class="block_input tirroir">
+ <label><?php echo __($row->description); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </li>
+ <?php /** */ $row = modmembres::$list['CUSTOMER_FORCE_STRTOUPPER']; ?>
+ <li id="nav_<?php echo $row->key ?>"><h5 title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></h5>
+
+ <div class="block_input tirroir">
+ <label><?php echo __($row->description); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </li>
+ </ul>
+ </fieldset>
+
+
+
+
+
+
+ <fieldset class="block_field">
+ <legend><?php echo __('modmembres legend state') ?></legend>
+ <div class="block_input">
+ <?php /** */ $row = modmembres::$list['ACCOUNT_STATE']; ?>
+ <div class="fleft w_50">
+ <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+
+ <?php if(_test_bool(modmembres::$list['ACCOUNT_STATE']->value)): ?>
+ <?php /** */ $row = modmembres::$list['ENTRY_STATE_MIN_LENGTH']; ?>
+ <div class="fleft w_50">
+ <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ <?php endif; ?>
+ </div>
+ </fieldset>
+
+
+ <fieldset class="block_field">
+ <legend><?php echo __('modmembres legend gender') ?></legend>
+ <div class="block_input">
+ <?php /** */ $row = modmembres::$list['ACCOUNT_FAXNUM']; ?>
+ <div class="fleft w_50">
+ <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+
+ </div>
+ </fieldset>
+
+
+ <fieldset class="block_field">
+ <?php /** */ $row = modmembres::$list['MAX_DISPLAY_PRODUCTS_IN_ORDER_HISTORY_BOX']; ?>
+ <legend title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></legend>
+
+ <div class="block_input">
+ <label><?php if (tep_not_null($row->description))echo __($row->description); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+
+
+ <?php /** option de la gestion de stock, disponible que ci value precendente a true */ ?>
+ <?php if(_test_bool(modmembres::$list['MAX_DISPLAY_PRODUCTS_IN_ORDER_HISTORY_BOX']->value)): ?>
+ <?php /** */ $row = modmembres::$list['MAX_DISPLAY_ORDER_HISTORY']; ?>
+ <div class="block_input">
+ <label><?php if (tep_not_null($row->description))echo __($row->description); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+
+ <?php endif; ?>
+
+ </fieldset>
+
+
+
+
+ <fieldset class="block_field">
+ <legend><?php echo __('modmembres legend ville') ?></legend>
+ <ul class="block_input">
+ <?php /** */ $row = modmembres::$list['ENTRY_CITY_MIN_LENGTH']; ?>
+ <li id="nav_<?php echo $row->key ?>"><h5 title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></h5>
+
+ <div class="block_input tirroir">
+ <label><?php echo __($row->description); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </li>
+ <?php /** */ $row = modmembres::$list['CUSTOMER_CITY_FORCE_STRTOUPPER']; ?>
+ <li id="nav_<?php echo $row->key ?>"><h5 title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></h5>
+
+ <div class="block_input tirroir">
+ <label><?php echo __($row->description); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </li>
+ </ul>
+ </fieldset>
+
+ <fieldset class="block_field">
+ <legend><?php echo __('modmembres legend country') ?></legend>
+ <div class="block_input">
+ <?php /** */ $row = modmembres::$list['ACCOUNT_COUNTRY']; ?>
+ <div class="fleft w_50">
+ <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+
+ </div>
+ </fieldset>
+
+
+ <fieldset class="block_field">
+
+ <legend><?php echo __('modmembres legend general'); ?></legend>
+
+ <ul class="block_input">
+ <?php /** */ $row = modmembres::$list['ENTRY_EMAIL_ADDRESS_MIN_LENGTH']; ?>
+ <li id="nav_<?php echo $row->key ?>"><h5 title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></h5>
+
+ <div class="block_input tirroir">
+ <label><?php echo __($row->description); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </li>
+ <?php /** */ $row = modmembres::$list['ENTRY_STREET_ADDRESS_MIN_LENGTH']; ?>
+ <li id="nav_<?php echo $row->key ?>"><h5 title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></h5>
+
+ <div class="block_input tirroir">
+ <label><?php echo __($row->description); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </li>
+ <?php /** */ $row = modmembres::$list['ENTRY_POSTCODE_MIN_LENGTH']; ?>
+ <li id="nav_<?php echo $row->key ?>"><h5 title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></h5>
+
+ <div class="block_input tirroir">
+ <label><?php echo __($row->description); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </li>
+ <?php /** */ $row = modmembres::$list['ENTRY_TELEPHONE_MIN_LENGTH']; ?>
+ <li id="nav_<?php echo $row->key ?>"><h5 title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></h5>
+
+ <div class="block_input tirroir">
+ <label><?php echo __($row->description); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </li>
+ <?php /** */ $row = modmembres::$list['ENTRY_PASSWORD_MIN_LENGTH']; ?>
+ <li id="nav_<?php echo $row->key ?>"><h5 title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></h5>
+
+ <div class="block_input tirroir">
+ <label><?php echo __($row->description); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </li>
+ </ul>
+ </fieldset>
+
+
+
+
+ <fieldset class="block_field">
+
+ <legend><?php echo __('modmembres legend cb'); ?></legend>
+
+ <ul class="block_input">
+ <?php /** */ $row = modmembres::$list['CC_OWNER_MIN_LENGTH']; ?>
+ <li id="nav_<?php echo $row->key ?>"><h5 title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></h5>
+
+ <div class="block_input tirroir">
+ <label><?php echo __($row->description); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </li>
+ <?php /** */ $row = modmembres::$list['CC_NUMBER_MIN_LENGTH']; ?>
+ <li id="nav_<?php echo $row->key ?>"><h5 title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></h5>
+
+ <div class="block_input tirroir">
+ <label><?php echo __($row->description); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </li>
+ </ul>
+ </fieldset>
+
+
+
+ <?php /** Attribut produit / option stock associé */ ?>
+ <fieldset class="block_field">
+ <legend class="block_field-title"><?php echo __('modmembres legend other') ?></legend>
+
+ <ul class="block_input">
+ <?php foreach(modmembres::$list as $row)
+ if(!in_array($row->key,array('ACCOUNT_DOB','ENTRY_DOB_MIN','MAX_DISPLAY_PRODUCTS_IN_ORDER_HISTORY_BOX','MAX_DISPLAY_ORDER_HISTORY','CC_NUMBER_MIN_LENGTH', 'CC_OWNER_MIN_LENGTH', 'ACCOUNT_DOB', 'ENTRY_DOB_MIN_LENGTH', 'ENTRY_LAST_NAME_MIN_LENGTH', 'ENTRY_FIRST_NAME_MIN_LENGTH','ACCOUNT_GENDER' ,'ENTRY_EMAIL_ADDRESS_MIN_LENGTH', 'ENTRY_STREET_ADDRESS_MIN_LENGTH', 'ENTRY_POSTCODE_MIN_LENGTH', 'ENTRY_CITY_MIN_LENGTH', 'ACCOUNT_COMPANY', 'ENTRY_COMPANY_MIN_LENGTH','CUSTOMER_FORCE_UCWORDS','CUSTOMER_FORCE_STRTOUPPER','ENTRY_STATE_MIN_LENGTH', 'ACCOUNT_STATE', 'ENTRY_PASSWORD_MIN_LENGTH', 'ENTRY_TELEPHONE_MIN_LENGTH', 'ACCOUNT_FAXNUM', 'ACCOUNT_COUNTRY')) ) { ?>
+ <li id="nav_<?php echo $row->key ?>"><h5 title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></h5>
+
+ <div class="block_input tirroir">
+ <label><?php echo __($row->description); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </li>
+ <?php } ?>
+ </ul>
+
+ </fieldset>
+
+
+
+ <div class="button_nav">
+ <?php print tep_image_submit('button_copy.gif', IMAGE_UPDATE) .tep_js_back(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&gID=' . $_GET['gID'] )) ; ?>
+ </div>
+
+</div>
+</form>
\ No newline at end of file
Added: trunk/catalog/admin/includes/languages/fr_FR/boxes/002_admin.php
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/boxes/002_admin.php (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/boxes/002_admin.php 2011-10-23 19:28:16 UTC (rev 3841)
@@ -0,0 +1,19 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 23/10/11, 17:06
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+define('BOX_HEADING_CONF_ADMIN',"Admin" );
+define('BOX_HEADING_CONF_ADMINISTRATOR',"Admin" );
+define('BOX_ADMINISTRATOR_MEMBERS',"Utilisateurs" );
+define('BOX_ADMINISTRATOR_MEMBER',"Membres" );
+define('BOX_ADMINISTRATOR_GROUPS',"Groupes" );
+define('BOX_ADMINISTRATOR_GROUPS_PERMISSION',"Permissions" );
+define('BOX_ADMIN_NOTIFICATIONS',"Notifications" );
+?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/languages/fr_FR/boxes/01_configuration.php
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/boxes/01_configuration.php 2011-10-23 09:56:43 UTC (rev 3840)
+++ trunk/catalog/admin/includes/languages/fr_FR/boxes/01_configuration.php 2011-10-23 19:28:16 UTC (rev 3841)
@@ -1,12 +1,12 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 09/12/10, 17:23
+ @version 2.1.1
+ @date 23/10/11, 17:06
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
- @brief file languages for boxes menu
*/
define('BOX_TOOLS_DEFINE_LANGUAGE',"Gestion langues site" );
@@ -59,10 +59,4 @@
define('BOX_HEADING_CONF_CONFIG_COMM',"Configuration commerciale" );
define('BOX_HEADING_CONF_TEMPLATE',"Template" );
-define('BOX_HEADING_CONF_ADMINISTRATOR',"Admin" );
-define('BOX_ADMINISTRATOR_MEMBERS',"Utilisateurs" );
-define('BOX_ADMINISTRATOR_MEMBER',"Membres" );
-define('BOX_ADMINISTRATOR_GROUPS',"Groupes" );
-define('BOX_ADMINISTRATOR_GROUPS_PERMISSION',"Permissions" );
-define('BOX_ADMIN_NOTIFICATIONS',"Notifications" );
?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/moddownloads.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/moddownloads.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/moddownloads.txt 2011-10-23 19:28:16 UTC (rev 3841)
@@ -0,0 +1,32 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 27/09/11, 18:29
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+
+$lang['moddownloads heading']="Configuration de la gestion des téléchargement" ;
+$lang['moddownloads legend other']="Autres" ;
+
+
+/**
+ @remarks stock Valeur stocké en db pour conversion
+ @note
+ XXXX : key de configuration
+ XXXX_S : desciption courte
+ XXXX_L description longue
+*/
+$lang['DOWNLOAD_ENABLED_S']="Activer la gestion des téléchargements" ;
+$lang['DOWNLOAD_ENABLED_L']="Activer la fonction de téléchargement des produits." ;
+$lang['DOWNLOAD_BY_REDIRECT_S']="Téléchargement par redirection" ;
+$lang['DOWNLOAD_BY_REDIRECT_L']="Utiliser la redirection pour télécharger. Désactiver sur des systèmes non UNIX." ;
+$lang['DOWNLOAD_MAX_DAYS_S']="Délais d'expiration des téléchargements" ;
+$lang['DOWNLOAD_MAX_DAYS_L']="Nombre de jours avant expiration du lien de téléchargement.<br />(0 pour pas de limite)" ;
+$lang['DOWNLOAD_MAX_COUNT_S']="Nombre maximum de téléchargements" ;
+$lang['DOWNLOAD_MAX_COUNT_L']="Nombre maximum de téléchargements autorisés.<br />(0 pour aucun)" ;
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modexpedition.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modexpedition.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modexpedition.txt 2011-10-23 19:28:16 UTC (rev 3841)
@@ -0,0 +1,57 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 27/09/11, 18:29
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+
+$lang['heading modexpedition configuration']="Configuration des expeditions " ;
+
+$lang['tab shipping configuration']="Configuration" ;
+$lang['tab shipping zones']="Zones" ;
+$lang['tab shipping modules']="Modules" ;
+
+
+$lang['modexpedition legend localisation entrepot']="Localisation entrepot" ;
+$lang['modimages tailles txt intro']="Pour toutes les images, ces valeurs definissent les tailles (largeur et hauteur) maximun. Dans l'utilisation par defaut, (sans module specifique) les proportion de l'image sont conservées" ;
+$lang['modexpedition legend other']="Autres" ;
+
+
+
+$lang['modexpedition heading zone shipping']="Zones de livraison" ;
+$lang['modexpedition heading modules shipping']="Modules de livraison" ;
+
+$lang['table heading tax zones']="Nom" ;
+$lang['table heading tax zones desc']="Description" ;
+$lang['table heading nbr sub']="crée/modifié" ;
+$lang['table heading action']="action" ;
+
+$lang['table heading module code']="Nom" ;
+$lang['table heading module title']="Description" ;
+$lang['table heading module desc']="crée/modifié" ;
+$lang['table heading module sort']="Ordre" ;
+$lang['table heading module status']="Etat" ;
+
+/**
+ @remarks stock Valeur stocké en db pour conversion
+ @note
+ XXXX : key de configuration
+ XXXX_S : desciption courte
+ XXXX_L description longue
+*/
+$lang['SHIPPING_ORIGIN_COUNTRY_S']="Code pays boutique" ;
+$lang['SHIPPING_ORIGIN_COUNTRY_L']="Entrer le code \"ISO 3166\" du pays pour calculer les coûts d'expédition." ;
+$lang['SHIPPING_ORIGIN_ZIP_S']="Code postal boutique" ;
+$lang['SHIPPING_ORIGIN_ZIP_L']="Entrer le code postal de la boutique pour calculer les frais d'expédition." ;
+$lang['SHIPPING_MAX_WEIGHT_S']="Poids maximum expédition (en kg)" ;
+$lang['SHIPPING_MAX_WEIGHT_L']="Les transporteurs ont une limite de poids maximum par colis. Cette limite est commune pour tous." ;
+$lang['SHIPPING_BOX_WEIGHT_S']="Tare de l'emballage" ;
+$lang['SHIPPING_BOX_WEIGHT_L']="Quel est le poids moyen de l'emballage et conditionnement des colis de petite à moyenne taille ?" ;
+$lang['SHIPPING_BOX_PADDING_S']="Gros colis - Pourcentage de supplément" ;
+$lang['SHIPPING_BOX_PADDING_L']="Pour 10% de supplément, entrez 10." ;
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modmembres.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modmembres.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modmembres.txt 2011-10-23 19:28:16 UTC (rev 3841)
@@ -0,0 +1,90 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 27/09/11, 18:29
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+
+$lang['modmembres heading']="Configuration des membres" ;
+$lang['modmembres legend dob']="Date de naissance" ;
+$lang['modmembres legend sct']="Société" ;
+$lang['modmembres legend gender']="Genre" ;
+$lang['modmembres legend firstanme']="Prenom" ;
+$lang['modmembres legend lastname']="Nom" ;
+$lang['modmembres legend state']="Etat/Departement" ;
+$lang['modmembres legend fax']="Fax" ;
+$lang['modmembres legend ville']="Ville" ;
+$lang['modmembres legend general']="Control mini" ;
+$lang['modmembres legend country']="Pays" ;
+$lang['modmembres legend cb']="Cb" ;
+$lang['modmembres legend other']="Autres" ;
+
+
+/**
+ @remarks stock Valeur stocké en db pour conversion
+ @note
+ XXXX : key de configuration
+ XXXX_S : desciption courte
+ XXXX_L description longue
+*/
+$lang['ACCOUNT_GENDER_S']="Genre" ;
+$lang['ACCOUNT_GENDER_L']="Afficher le genre dans le compte client." ;
+$lang['MAX_ADDRESS_BOOK_ENTRIES_S']="Nombre d'entrées dans le carnet d'adresses" ;
+$lang['MAX_ADDRESS_BOOK_ENTRIES_L']="Nombre maximum d'entrées dans le carnet d'adresses pour un client." ;
+$lang['ENTRY_FIRST_NAME_MIN_LENGTH_S']="Prénom" ;
+$lang['ENTRY_FIRST_NAME_MIN_LENGTH_L']="Nombre de caractères minimum requis pour le prénom." ;
+$lang['ENTRY_LAST_NAME_MIN_LENGTH_S']="Nom" ;
+$lang['ENTRY_LAST_NAME_MIN_LENGTH_L']="Nombre de caractères minimum requis pour le nom de famille." ;
+$lang['ACCOUNT_DOB_S']="Date de naissance" ;
+$lang['ACCOUNT_DOB_L']="Afficher la date de naissance dans le compte client." ;
+$lang['ENTRY_DOB_MIN_LENGTH_S']="Date de naissance" ;
+$lang['ENTRY_DOB_MIN_LENGTH_L']="Nombre de caractères minimum requis pour la date de naissance." ;
+$lang['ENTRY_EMAIL_ADDRESS_MIN_LENGTH_S']="Adresse Email" ;
+$lang['ENTRY_EMAIL_ADDRESS_MIN_LENGTH_L']="Nombre de caractères minimum requis pour l'adresse Email." ;
+$lang['ENTRY_STREET_ADDRESS_MIN_LENGTH_S']="Adresse" ;
+$lang['ENTRY_STREET_ADDRESS_MIN_LENGTH_L']="Nombre de caractères minimum requis pour l'adresse postale." ;
+$lang['ACCOUNT_SUBURB_S']="Complément d'adresse" ;
+$lang['ACCOUNT_SUBURB_L']="Afficher le complément d'adresse dans le compte client." ;
+$lang['ACCOUNT_COMPANY_S']="Société" ;
+$lang['ACCOUNT_COMPANY_L']="Afficher la société dans le compte client." ;
+$lang['ENTRY_COMPANY_MIN_LENGTH_S']="Société" ;
+$lang['ENTRY_COMPANY_MIN_LENGTH_L']="Nombre de caractères minimum requis pour le nom de la société." ;
+$lang['ENTRY_POSTCODE_MIN_LENGTH_S']="Code Postal" ;
+$lang['ENTRY_POSTCODE_MIN_LENGTH_L']="Nombre de caractères minimum requis pour le code postal." ;
+$lang['ENTRY_CITY_MIN_LENGTH_S']="Ville" ;
+$lang['ENTRY_CITY_MIN_LENGTH_L']="Nombre de caractères minimum requis pour la ville." ;
+$lang['ACCOUNT_STATE_S']="État, Département" ;
+$lang['ACCOUNT_STATE_L']="Afficher le département (état) dans le compte client." ;
+$lang['ACCOUNT_COUNTRY_S']="Pays, permettre le choix du pays" ;
+$lang['ACCOUNT_COUNTRY_L']="Afficher une liste pour le choix du pays, sinon, le pays est celui de la boutique" ;
+$lang['ACCOUNT_FAXNUM_S']="Numéro de fax" ;
+$lang['ACCOUNT_FAXNUM_L']="Afficher le numéro de fax dans le compte client." ;
+$lang['ENTRY_STATE_MIN_LENGTH_S']="État" ;
+$lang['ENTRY_STATE_MIN_LENGTH_L']="Nombre de caractères minimum requis pour l'état." ;
+$lang['ENTRY_TELEPHONE_MIN_LENGTH_S']="Téléphone" ;
+$lang['ENTRY_TELEPHONE_MIN_LENGTH_L']="Nombre de caractères minimum requis pour le téléphone." ;
+$lang['ENTRY_PASSWORD_MIN_LENGTH_S']="Mot de Passe" ;
+$lang['ENTRY_PASSWORD_MIN_LENGTH_L']="Nombre de caractères minimum requis pour le mot de passe utilisateur." ;
+$lang['CC_OWNER_MIN_LENGTH_S']="Propriétaire de la carte de crédit" ;
+$lang['CC_OWNER_MIN_LENGTH_L']="Nombre de caractères minimum requis pour le nom du propriétaire de la carte de crédit." ;
+$lang['CC_NUMBER_MIN_LENGTH_S']="Numéro de la carte de crédit" ;
+$lang['CC_NUMBER_MIN_LENGTH_L']="Nombre de caractères minimum requis pour le numéro de la carte de crédit." ;
+$lang['SPPC_EMAIL_ALERT_CREAT_ACCOUNT_S']="Email alerte lors création compte pro" ;
+$lang['SPPC_EMAIL_ALERT_CREAT_ACCOUNT_L']="Envoyer un Email lors de la création d'un compte professionnel" ;
+$lang['MAX_DISPLAY_PRODUCTS_IN_ORDER_HISTORY_BOX_S']="[content] Affichage Bloc Historique de commande" ;
+$lang['MAX_DISPLAY_PRODUCTS_IN_ORDER_HISTORY_BOX_L']="Nombre maximum d'historiques de commande à afficher dans le bloc." ;
+$lang['MAX_DISPLAY_ORDER_HISTORY_S']="[content] Affichage Page Historique de commande" ;
+$lang['MAX_DISPLAY_ORDER_HISTORY_L']="Nombre maximum d'historiques de commande à afficher dans la page." ;
+$lang['CUSTOMER_FORCE_UCWORDS_S']="Premier lettre majuscule" ;
+$lang['CUSTOMER_FORCE_UCWORDS_L']="Force la premiere lettre en majuscule lors enregistrement" ;
+$lang['CUSTOMER_FORCE_STRTOUPPER_S']="Force le nom en majscule" ;
+$lang['CUSTOMER_FORCE_STRTOUPPER_L']="Force le nom en majscule lors enregistrement" ;
+$lang['CUSTOMER_CITY_FORCE_STRTOUPPER_S']="Force le nom de la ville en majscule" ;
+$lang['CUSTOMER_CITY_FORCE_STRTOUPPER_L']="Force le nom de la ville en majscule lors enregistrement" ;
+
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/modules/configuration/moddownloads.php
===================================================================
--- trunk/catalog/admin/includes/modules/configuration/moddownloads.php (rev 0)
+++ trunk/catalog/admin/includes/modules/configuration/moddownloads.php 2011-10-23 19:28:16 UTC (rev 3841)
@@ -0,0 +1,143 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 22/09/11, 19:49
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class moddownloads
+ Mise en forme et structuration des options de stock
+*/
+
+
+Class moddownloads
+ implements ext_configuration
+ {
+ /**
+ @var array list template
+ */
+ public static $list;
+
+ public static $cfg;
+
+ /**
+ */
+ function __construct(){
+ global $oscss;
+ $this->code=__CLASS__;
+ global $messageStack, $language,$lang;
+ if (!is_writeable(DIR_FS_TEMPLATES)) $messageStack->add(ERROR_DESTINATION_NOT_WRITEABLE. 'template/', 'error');
+
+ $oscss->pile_file_lang(DIR_FS_ADMIN.DIR_WS_LANGUAGES.$language.'/modules/configuration/'.$this->code.'.txt');
+
+ self::$cfg =new sqlconfiguration();
+ }
+
+
+ /**
+ Action Prise en charge par le modules
+ @param
+ @e global $action
+ @e global $messageStack
+ */
+ public function draw_action(){
+ global $action,$messageStack;
+
+ $DB=Database::getInstance();
+ $gparentID = tep_db_prepare_input($_GET['gparentID']);
+ $gID= tep_db_prepare_input($_GET['gID']);
+
+ switch($action){
+ /**
+ @brief save page groupe
+ */
+ case 'save_mutli':
+ if(tep_not_null($gID) ){
+
+ $list=sqlconfiguration::fetch(array('group_id'=> (int)$gID), true);
+
+ foreach($list as $row) {
+
+ if(isset($_POST['configuration'][$row->key])) {
+ $configuration_value = tep_db_prepare_input($_POST['configuration'][$row->key]);
+
+ if( ($res=sqlconfiguration::update(array('key'=>$row->key , 'value'=>tep_db_input($configuration_value) ))) == false)$erreur[]=false;
+ else $erreur[]=true;
+
+ }
+
+ }
+
+ if(!in_array(false,$erreur)) $messageStack->add_session(SAVE_CONFIG_OK, 'success');
+ else $messageStack->add_session(SAVE_CONFIG_NOT_OK, 'error');
+
+ }
+
+ tep_redirect(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $gparentID.'&gID=' . $_GET['gID'] . '&cID=' . $cID));
+ break;
+ }
+ }
+
+ /**
+ @return array
+ */
+ public function load_db_values($Id){
+
+
+ $list_edit=array();
+ $gID = 13;
+
+ $list=sqlconfiguration::fetch(array('group_id'=> (int)$gID), true);
+
+ foreach($list as $row) {
+...
[truncated message content] |
|
From: <os...@us...> - 2011-10-23 09:56:49
|
Revision: 3840
http://oscss.svn.sourceforge.net/oscss/?rev=3840&view=rev
Author: oscim
Date: 2011-10-23 09:56:43 +0000 (Sun, 23 Oct 2011)
Log Message:
-----------
desactivation stock dans le panier, et alerte associ?\195?\169
Modified Paths:
--------------
trunk/catalog/common/classes/shoppingCart.php
Modified: trunk/catalog/common/classes/shoppingCart.php
===================================================================
--- trunk/catalog/common/classes/shoppingCart.php 2011-10-23 09:53:10 UTC (rev 3839)
+++ trunk/catalog/common/classes/shoppingCart.php 2011-10-23 09:56:43 UTC (rev 3840)
@@ -523,10 +523,11 @@
$products[$i]['alert_stock'] = '';
//! Stock check
- if( Stock::check_inline($products[$i]) ) {
- $any_out_of_stock = 1;
- $products[$i]['alert_stock'] = Stock::mark_inline();
- }
+ if( _cst_bool('STOCK_CHECK') )
+ if( Stock::check_inline($products[$i]) ) {
+ $any_out_of_stock = 1;
+ $products[$i]['alert_stock'] = Stock::mark_inline();
+ }
if (isset($products[$i]['attributes']) && is_array($products[$i]['attributes'])) {
reset($products[$i]['attributes']);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-10-23 09:53:16
|
Revision: 3839
http://oscss.svn.sourceforge.net/oscss/?rev=3839&view=rev
Author: oscim
Date: 2011-10-23 09:53:10 +0000 (Sun, 23 Oct 2011)
Log Message:
-----------
correction , desactivation complete des champs et page li?\195?\169e au stock
Modified Paths:
--------------
trunk/catalog/admin/includes/gabarit/products/display_view.edit.gab
trunk/catalog/admin/includes/gabarit/products/display_view.listing.gab
trunk/catalog/admin/includes/modules/pages/products.php
trunk/catalog/admin/includes/widget/homeStock.php
Modified: trunk/catalog/admin/includes/gabarit/products/display_view.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/products/display_view.edit.gab 2011-10-22 16:27:52 UTC (rev 3838)
+++ trunk/catalog/admin/includes/gabarit/products/display_view.edit.gab 2011-10-23 09:53:10 UTC (rev 3839)
@@ -155,7 +155,7 @@
<?php endif; ?>
- <?php if(products::CheckClassProduct('CLASS_STOCK')): /** Si Class de stock defini, les prix sont pris en charge par un onglet */ ?>
+ <?php if( _cst_bool('STOCK_CHECK') && products::CheckClassProduct('CLASS_STOCK')): /** Si Class de stock defini, les prix sont pris en charge par un onglet */ ?>
<fieldset class="block_field">
<legend><?php echo __('text legend stock'); ?></legend>
<label><?php echo __('table heading stock'); ?></label>
Modified: trunk/catalog/admin/includes/gabarit/products/display_view.listing.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/products/display_view.listing.gab 2011-10-22 16:27:52 UTC (rev 3838)
+++ trunk/catalog/admin/includes/gabarit/products/display_view.listing.gab 2011-10-23 09:53:10 UTC (rev 3839)
@@ -20,7 +20,12 @@
</div>
<div class="navButtons">
<?php
- echo '<a class="button" href="' . tep_href_link(FILENAME_FEEDS,'box=low_stock') . '">' . tep_image(DIR_WS_ICONS.'icon_feed.png' , IMAGE_TRACKED_LOW_STOCK,16,16) .IMAGE_TRACKED_LOW_STOCK . '</a>';
+
+ /// Uniquement si stock actif
+ if(_cst_bool('STOCK_CHECK'))
+ echo '<a class="button" href="' . tep_href_link(FILENAME_FEEDS,'box=low_stock') . '">' . tep_image(DIR_WS_ICONS.'icon_feed.png' , IMAGE_TRACKED_LOW_STOCK,16,16) .IMAGE_TRACKED_LOW_STOCK . '</a>';
+
+
echo '<a class="button fancy" href="' . tep_href_link(FILENAME_PRODUCTS, tep_get_all_get_params(array('action','cPath','search')).'action=new') . '">' . tep_image(DIR_WS_ICONS.'icon_add_new.png' , IMAGE_NEW_PRODUCT) .IMAGE_NEW_PRODUCT . '</a>';
if(!isset($_GET['expected'])) echo '<a class="button" href="' . tep_href_link(FILENAME_PRODUCTS, 'expected=true') . '">' . __('image expected on') . '</a>';
else echo '<a class="button" href="' . tep_href_link(FILENAME_PRODUCTS) . '">' . __('image expected off') . '</a>';
@@ -40,7 +45,9 @@
<th style="width:10%" class="tcenter"><?php echo __('table heading model'); ?></th>
<th style="width:25%" class="tleft"><?php echo __('table heading products'); ?></th>
<th style="width:12%" class="tleft"><?php echo __('table heading categorie'); ?></th>
- <th style="width:4%" align="center"><?php echo __('table heading stock'); ?></th>
+ <?php if(_cst_bool('STOCK_CHECK')): ?>
+ <th style="width:4%" align="center"><?php echo __('table heading stock'); ?></th>
+ <?php endif; ?>
<th style="width:6%" align="center"><?php echo __('table heading price'); ?></th>
<th style="width:4%" align="center"><?php echo __('table heading status'); ?></th>
<th class="tcenter"><?php echo __('table heading action'); ?></th>
@@ -55,7 +62,9 @@
<td style="width:10%" class="tcenter"><?php echo tep_draw_input_field('model','model',__('table heading model'),'style="width:100%" class="search_init"'); ?></td>
<td style="width:25%" class="tleft"><?php echo tep_draw_input_field('p.product_id','pproduct_id',__('table heading products'),'style="width:100%" class="search_init"'); ?></td>
<td style="width:12%" class="tleft"><?php echo tep_draw_input_field('categories_name','categories_name',__('table heading categorie'),'style="width:100%" class="search_init"'); ?></td>
- <td style="width:4%" class="tcenter"><?php echo tep_draw_input_field('stock','stock',__('table heading stock'),'style="width:100%" class="search_init"'); ?></td>
+ <?php if(_cst_bool('STOCK_CHECK')): ?>
+ <td style="width:4%" class="tcenter"><?php echo tep_draw_input_field('stock','stock',__('table heading stock'),'style="width:100%" class="search_init"'); ?></td>
+ <?php endif; ?>
<td style="width:6%" class="tcenter"><?php echo tep_draw_input_field('p.products_price','price',__('table heading price'),'style="width:100%" class="search_init"'); ?></td>
<td style="width:4%" class="tcenter"><?php echo tep_draw_pull_down_menu('view_status', array(array('id'=>'all', 'text'=> __('txt all') ),array('id'=>'1', 'text'=> 'on'),array('id'=>'0', 'text'=> 'off')), ((isset($_GET['view_status']) && (is_numeric($_GET['view_status'])))?$_GET['view_status'] : 'all'),'style="width:100%" class="search_init" onchange="oTable.fnFilter( $(this).val(), 7 );
"'); ?></td>
Modified: trunk/catalog/admin/includes/modules/pages/products.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/products.php 2011-10-22 16:27:52 UTC (rev 3838)
+++ trunk/catalog/admin/includes/modules/pages/products.php 2011-10-23 09:53:10 UTC (rev 3839)
@@ -501,7 +501,10 @@
sprintf(CsrtAction::getLink('row_action_right', IMAGE_COPY_TO, 'copyto'), 'fancy', tep_href_link(self::FILENAME, 'pID=' . $products['products_id'] . '&action=copy_to') ,'' ).
sprintf(CsrtAction::getLink('row_action_right', IMAGE_EDIT, 'edit'), '', tep_href_link(self::FILENAME, 'pID=' . $products['products_id'] . '&action=new_product') ,'' ).
sprintf(CsrtAction::getLink('row_action_right', IMAGE_DELETE, 'delete'), 'fancy', tep_href_link(self::FILENAME, 'pID=' . $products['products_id'] . '&action=delete_product') ,'' ).
- sprintf(CsrtAction::getLink('row_action_right', __('txt stock') , 'stock'), 'fancyView', tep_href_link(FILENAME_STOCK, 'product_id=' . $products['products_id'].'&origin='.self::FILENAME) ,'' ).
+ ((_cst_bool('STOCK_CHECK'))
+ ? sprintf(CsrtAction::getLink('row_action_right', __('txt stock') , 'stock'), 'fancyView', tep_href_link(FILENAME_STOCK, 'product_id=' . $products['products_id'].'&origin='.self::FILENAME) ,'' )
+ : ''
+ ).
sprintf(CsrtAction::getLink('row_action_right', __('image view public') , 'publiclink'), '', tep_catalog_href_link('product_info.php', 'products_id=' . $products['products_id']) ,' target="blank"' )
);
}
@@ -517,33 +520,35 @@
}
private static function emptyResult(){
- return array( 'null',
- 'id',
- 'image',
- 'pv.typeID',
- 'model',
- 'name',
- 'categorie',
- 'quantity',
- 'price',
- 'status',
- 'action'
- );
+// return array( 'null', 'id', 'image', 'pv.typeID', 'model', 'name', 'categorie', 'quantity', 'price', 'status', 'action' );
+ $mod[] = 'null';
+ $mod[] = 'null';
+ $mod[] = 'null';
+ $mod[] = 'null';
+ $mod[] = 'null';
+ $mod[] = 'null';
+ $mod[] = 'null';
+ if(_cst_bool('STOCK_CHECK')) $mod[] = '0';
+ $mod[] = '0';
+ $mod[] = '0';
+ $mod[] = '';
+ return $mod;
}
public static function tep_get_modele(){
- return array( 0 =>false,
- 'products_id'=>true,
- 'products_image'=>true,
- 'pv.typeID'=>true,
- 'products_model'=>true,
- 'products_name'=>true,
- 'categories_name'=>false,
- 'products_quantity'=>true,
- 'products_price'=>true,
- 'products_status'=>true,
- 'action'=>false
- );
+ $mod[0] = false;
+ $mod['products_id'] = true;
+ $mod['products_image'] = true;
+ $mod['typeID'] = true;
+ $mod['products_model'] = true;
+ $mod['products_name'] = true;
+ $mod['categories_name'] = true;
+ if(_cst_bool('STOCK_CHECK')) $mod['products_quantity'] = true;
+ $mod['products_price'] = true;
+ $mod['products_status'] = true;
+ $mod['action'] = false;
+
+ return $mod;
}
public static function tep_get_list($page=1,$rowbyp=10,$sOrder='',$sWhere='',$options=''){
Modified: trunk/catalog/admin/includes/widget/homeStock.php
===================================================================
--- trunk/catalog/admin/includes/widget/homeStock.php 2011-10-22 16:27:52 UTC (rev 3838)
+++ trunk/catalog/admin/includes/widget/homeStock.php 2011-10-23 09:53:10 UTC (rev 3839)
@@ -3,13 +3,16 @@
@licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 21/03/11, 14:23
+ @version 2.1.1
+ @date 23/10/11, 11:36
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
-
*/
$i=0;
+
+if(!_cst_bool('STOCK_CHECK'))
+ return false;
+
?>
<div id="homeStock" class="<?php echo $widg['class'] ?>">
<h3><a href="<?php echo tep_href_link(FILENAME_STATS,'module=stats_low_stock_attrib') ?>"><?php echo __('heading stock') ;?></a></h3>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-10-22 16:28:02
|
Revision: 3838
http://oscss.svn.sourceforge.net/oscss/?rev=3838&view=rev
Author: oscim
Date: 2011-10-22 16:27:52 +0000 (Sat, 22 Oct 2011)
Log Message:
-----------
Suiet amelioration gestion de la configuration, ajout de class fixe pour les pages de configuration
Ajout d'une serie de class de configuration , associ?\195?\169 ?\195?\160 leur gabarits et deport des element present de l'installation dans les fichiers de langue de ces modules
Ajustement install suite modification precendentes
correction coquille (err notice class form)
AJout element manquant dans le nouveau template
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/configUtility.php
trunk/catalog/admin/includes/content/configuration.central.inc
trunk/catalog/admin/includes/template/oscss/jquery-ui-1.css
trunk/catalog/common/classes/formUtility.php
trunk/catalog/install/includes/language/fr_FR/oscss_config.txt
trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration_group.sql
Added Paths:
-----------
trunk/catalog/admin/includes/gabarit/configuration/modimages.listing.gab
trunk/catalog/admin/includes/gabarit/configuration/modmail.listing.gab
trunk/catalog/admin/includes/gabarit/configuration/modstock.listing.gab
trunk/catalog/admin/includes/gabarit/configuration/my_boutique.listing.gab
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modimages.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modmail.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modstock.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/my_boutique.txt
trunk/catalog/admin/includes/modules/configuration/modimages.php
trunk/catalog/admin/includes/modules/configuration/modstock.php
trunk/catalog/admin/includes/modules/configuration/my_boutique.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/generic/lazyload/lib/jquery.lazyload.js
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/generic/slider/images/header-bg.png
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/generic/slider/images/nav-bg.png
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/generic/slider/images/silde-nav.png
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/generic/slider/images/slide-bg.png
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/generic/slider/inc/easySlider.css
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/generic/slider/inc/easySlider1.7.js
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/generic/slider/inc/slider.js
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/product/slimbox/inc/closelabel.gif
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/product/slimbox/inc/loading.gif
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/product/slimbox/inc/nextlabel.gif
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/product/slimbox/inc/prevlabel.gif
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/product/slimbox/inc/slimbox2-rtl.css
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/product/slimbox/inc/slimbox2.css
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/product/slimbox/inc/slimbox2.js
Modified: trunk/catalog/admin/includes/classes/configUtility.php
===================================================================
--- trunk/catalog/admin/includes/classes/configUtility.php 2011-10-20 21:30:32 UTC (rev 3837)
+++ trunk/catalog/admin/includes/classes/configUtility.php 2011-10-22 16:27:52 UTC (rev 3838)
@@ -42,7 +42,7 @@
foreach($value_array['array'] as $key=>$value){
$keys =sprintf( ($use_format !=false && isset($use_format['label'])? $use_format['label'] : '<label>%s</label>' ) , $value['title']);
- $keys .=sprintf( ($use_format !=false && isset($use_format['description'])? $use_format['description'] : '<br />%s<br />' ) , $value['description']);
+ $keys .=sprintf( ($use_format !=false && isset($use_format['description'])? $use_format['description'] : '%s' ) , $value['description']);
$key2 =self::CallExecConfigLine($value['set_function'], $key, $value['value']);
$keys .=sprintf( ($use_format !=false && isset($use_format['value_edit'])? $use_format['value_edit'] : '<span class="value_edit">%s</span>' ) , $key2);
@@ -53,7 +53,7 @@
$keys .=sprintf( ($use_format !=false && isset($use_format['view_view'])? $use_format['view_view'] : '<span class="view_view">%s</span>' ) , $key2);
- $sortie .=sprintf( ($use_format !=false && isset($use_format['block'])? $use_format['block'] : '<p class="block_input button_nav">%s</p><br />' ) , $keys);
+ $sortie .=sprintf( ($use_format !=false && isset($use_format['block'])? $use_format['block'] : '<p class="block_input button_nav">%s</p>' ) , $keys);
}
return $sortie;
Modified: trunk/catalog/admin/includes/content/configuration.central.inc
===================================================================
--- trunk/catalog/admin/includes/content/configuration.central.inc 2011-10-20 21:30:32 UTC (rev 3837)
+++ trunk/catalog/admin/includes/content/configuration.central.inc 2011-10-22 16:27:52 UTC (rev 3838)
@@ -33,8 +33,12 @@
<?php foreach($list_edit as $row) { ?>
<li id="nav_<?php echo $row->key ?>"><h5 title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo $row->title. tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></h5>
- <p class="block_input tirroir"><?php if (tep_not_null($row->description))echo $row->description; ?><br />
- <?php echo $row->value_field ; ?></p>
+ <div class="block_input tirroir">
+ <label><?php if (tep_not_null($row->description))echo $row->description; ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
</li>
<?php } ?>
</ul>
Added: trunk/catalog/admin/includes/gabarit/configuration/modimages.listing.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/modimages.listing.gab (rev 0)
+++ trunk/catalog/admin/includes/gabarit/configuration/modimages.listing.gab 2011-10-22 16:27:52 UTC (rev 3838)
@@ -0,0 +1,187 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 22/09/11, 20:05
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @brief mise en forme de la gestion du stock
+*/
+?>
+
+<div id="ssmenu">
+ <?php echo tep_ssmenu_configuration($_GET['gparentID']) ?>
+</div>
+
+
+
+<h3 class="main-title"><?php echo __('heading modimages configuration') ?></h3>
+
+<?php echo tep_draw_form('configuration', FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&gID=' . $_GET['gID'] . '&action=save_mutli') ?>
+
+
+<div class="block_form">
+
+
+ <div class="block_field">
+ <h4 class="main-title"><?php echo __('heading modimages tailles') ?></h4>
+
+ <p class="main-intro"><?php echo __('modimages tailles txt intro') ?></p>
+
+ <fieldset class="block_field">
+ <legend><?php echo __('modimages legend small') ?></legend>
+ <div class="block_input">
+ <?php /** */ $row = modimages::$list['SMALL_IMAGE_WIDTH']; ?>
+ <div class="fleft w_50">
+ <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ <?php /** */ $row = modimages::$list['SMALL_IMAGE_HEIGHT']; ?>
+ <div class="fleft w_50">
+ <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </div>
+ </fieldset>
+
+
+ <fieldset class="block_field">
+ <legend><?php echo __('modimages legend heading') ?></legend>
+ <div class="block_input">
+ <?php /** */ $row = modimages::$list['HEADING_IMAGE_WIDTH']; ?>
+ <div class="fleft w_50">
+ <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ <?php /** */ $row = modimages::$list['HEADING_IMAGE_HEIGHT']; ?>
+ <div class="fleft w_50">
+ <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </div>
+ </fieldset>
+
+ <fieldset class="block_field">
+ <legend><?php echo __('modimages legend subcategory') ?></legend>
+ <div class="block_input">
+ <?php /** */ $row = modimages::$list['SUBCATEGORY_IMAGE_WIDTH']; ?>
+ <div class="fleft w_50">
+ <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ <?php /** */ $row = modimages::$list['SUBCATEGORY_IMAGE_HEIGHT']; ?>
+ <div class="fleft w_50">
+ <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </div>
+ </fieldset>
+
+ <fieldset class="block_field">
+ <legend><?php echo __('modimages legend popup') ?></legend>
+ <div class="block_input">
+ <?php /** */ $row = modimages::$list['POPUP_IMAGE_WIDTH']; ?>
+ <div class="fleft w_50">
+ <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ <?php /** */ $row = modimages::$list['POPUP_IMAGE_HEIGHT']; ?>
+ <div class="fleft w_50">
+ <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </div>
+ </fieldset>
+
+ <fieldset class="block_field">
+ <legend><?php echo __('modimages legend stack') ?></legend>
+ <div class="block_input">
+ <?php /** */ $row = modimages::$list['STACK_IMAGE_WIDTH']; ?>
+ <div class="fleft w_50">
+ <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ <?php /** */ $row = modimages::$list['STACK_IMAGE_HEIGHT']; ?>
+ <div class="fleft w_50">
+ <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </div>
+ </fieldset>
+
+ </div>
+
+
+ <fieldset class="block_field">
+ <?php /** */ $row = modimages::$list['JPEG_QUALITY']; ?>
+ <legend title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></legend>
+
+ <div class="block_input">
+ <label><?php if (tep_not_null($row->description))echo __($row->description); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </p>
+ </fieldset>
+
+
+ <?php /** Attribut produit / option stock associé */ ?>
+ <fieldset class="block_field">
+ <legend class="block_field-title"><?php echo __('modimages legend other') ?></legend>
+
+ <ul class="block_input">
+ <?php foreach(modimages::$list as $row)
+ if(!in_array($row->key,array('SMALL_IMAGE_WIDTH', 'SMALL_IMAGE_HEIGHT', 'HEADING_IMAGE_WIDTH', 'HEADING_IMAGE_HEIGHT', 'SUBCATEGORY_IMAGE_WIDTH', 'SUBCATEGORY_IMAGE_HEIGHT', 'POPUP_IMAGE_WIDTH','POPUP_IMAGE_HEIGHT','STACK_IMAGE_WIDTH','STACK_IMAGE_HEIGHT','JPEG_QUALITY')) && substr($row->key,0,4) !='SMTP' ) { ?>
+ <li id="nav_<?php echo $row->key ?>"><h5 title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></h5>
+
+ <div class="block_input tirroir">
+ <label><?php echo __($row->description); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </li>
+ <?php } ?>
+ </ul>
+ </fieldset>
+
+ <div class="button_nav">
+ <?php print tep_image_submit('button_copy.gif', IMAGE_UPDATE) .tep_js_back(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&gID=' . $_GET['gID'] )) ; ?>
+ </div>
+
+
+ <div class="block_field">
+ <h4 class="block_field-title"><?php echo __('modimages legend brief') ?></h4>
+
+ <p class="block_field-text"><?php printf(__('modimages text path images %s'), DIR_FS_CATALOG_IMAGES ) ?></p>
+ <p class="block_field-text"><?php printf(__('modimages text url images %s'), tep_catalog_href_link(DIR_WS_IMAGES,'','NONSSL',false) ) ?></p>
+
+ <p class="block_field-text"><?php echo __('modimages text brief') ?></p>
+
+ </div>
+
+</div>
+</form>
\ No newline at end of file
Added: trunk/catalog/admin/includes/gabarit/configuration/modmail.listing.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/modmail.listing.gab (rev 0)
+++ trunk/catalog/admin/includes/gabarit/configuration/modmail.listing.gab 2011-10-22 16:27:52 UTC (rev 3838)
@@ -0,0 +1,151 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 22/09/11, 20:05
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @brief mise en forme de la gestion du stock
+*/
+?>
+
+<div id="ssmenu">
+ <?php echo tep_ssmenu_configuration($_GET['gparentID']) ?>
+</div>
+
+
+
+<h3 class="main-title"><?php echo __('heading modmail configuration') ?></h3>
+
+<?php echo tep_draw_form('configuration', FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&gID=' . $_GET['gID'] . '&action=save_mutli') ?>
+
+
+<div class="block_form">
+
+ <fieldset class="block_field">
+ <?php /** */ $row = modmail::$list['SEND_EMAILS']; ?>
+ <legend title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></legend>
+
+ <div class="block_input">
+ <label><?php if (tep_not_null($row->description))echo __($row->description); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </p>
+ </fieldset>
+
+
+ <?php /** activation des emails */ ?>
+ <?php if(_test_bool(modmail::$list['SEND_EMAILS']->value)): ?>
+
+
+ <fieldset class="block_field">
+ <legend class="block_field-title"><?php echo __('modmail legend method') ?></legend>
+ <?php /** */ $row = modmail::$list['EMAIL_TRANSPORT']; ?>
+ <div class="block_input">
+ <label><?php if (tep_not_null($row->description))echo __($row->description); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+
+ <?php /** option de la gestion de stock, disponible que ci value precendente a true */ ?>
+ <?php if(modmail::$list['EMAIL_TRANSPORT']->value =='smtp'): ?>
+ <ul class="block_input">
+ <?php foreach(modmail::$list as $row)
+ if(substr($row->key,0,4) =='SMTP') { ?>
+ <li id="nav_<?php echo $row->key ?>"><h5 title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></h5>
+
+ <div class="block_input tirroir">
+ <label><?php echo __($row->description); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </li>
+ <?php } ?>
+ </ul>
+ <?php endif; ?>
+ </fieldset>
+
+
+
+ <fieldset class="block_field">
+ <legend class="block_field-title"><?php echo __('modmail legend htmlmode') ?></legend>
+ <?php /** */ $row = modmail::$list['EMAIL_USE_HTML']; ?>
+ <div class="block_input">
+ <label><?php if (tep_not_null($row->description))echo __($row->description); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+
+ <?php /** option de la gestion de stock, disponible que ci value precendente a true */ ?>
+ <?php if(_test_bool(modmail::$list['EMAIL_USE_HTML']->value)): ?>
+ <ul class="block_input">
+ <?php foreach(modmail::$list as $row)
+ if(in_array($row->key,array('EMAIL_LINEFEED','') )) { ?>
+ <li id="nav_<?php echo $row->key ?>"><h5 title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></h5>
+
+ <div class="block_input tirroir">
+ <label><?php echo __($row->description); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </li>
+ <?php } ?>
+ </ul>
+ <?php endif; ?>
+ </fieldset>
+
+
+
+
+
+ <?php endif; ?>
+
+
+ <fieldset class="block_field">
+ <?php /** */ $row = modmail::$list['ENTRY_EMAIL_ADDRESS_CHECK']; ?>
+ <legend title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></legend>
+
+ <div class="block_input">
+ <label><?php if (tep_not_null($row->description))echo __($row->description); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </p>
+ </fieldset>
+
+
+ <?php /** Attribut produit / option stock associé */ ?>
+ <fieldset class="block_field">
+ <legend class="block_field-title"><?php echo __('modmail legend other') ?></legend>
+
+ <ul class="block_input">
+ <?php foreach(modmail::$list as $row)
+ if(!in_array($row->key,array('SEND_EMAILS','EMAIL_TRANSPORT','EMAIL_USE_HTML','EMAIL_LINEFEED','ENTRY_EMAIL_ADDRESS_CHECK')) && substr($row->key,0,4) !='SMTP' ) { ?>
+ <li id="nav_<?php echo $row->key ?>"><h5 title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></h5>
+
+ <div class="block_input tirroir">
+ <label><?php echo __($row->description); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </li>
+ <?php } ?>
+ </ul>
+ </fieldset>
+
+ <div class="button_nav">
+ <?php print tep_image_submit('button_copy.gif', IMAGE_UPDATE) .tep_js_back(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&gID=' . $_GET['gID'] )) ; ?>
+ </div>
+
+</div>
+</form>
\ No newline at end of file
Added: trunk/catalog/admin/includes/gabarit/configuration/modstock.listing.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/modstock.listing.gab (rev 0)
+++ trunk/catalog/admin/includes/gabarit/configuration/modstock.listing.gab 2011-10-22 16:27:52 UTC (rev 3838)
@@ -0,0 +1,96 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 22/09/11, 20:05
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @brief mise en forme de la gestion du stock
+*/
+?>
+
+<div id="ssmenu">
+ <?php echo tep_ssmenu_configuration($_GET['gparentID']) ?>
+</div>
+
+
+
+<h3 class="main-title"><?php echo __('heading manage stock and process stock') ?></h3>
+
+<?php echo tep_draw_form('configuration', FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&gID=' . $_GET['gID'] . '&action=save_mutli') ?>
+
+
+<div class="block_form">
+
+ <fieldset class="block_field">
+ <?php /** */ $row = modstock::$list['STOCK_CHECK']; ?>
+ <legend title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></legend>
+
+ <div class="block_input">
+ <label><?php if (tep_not_null($row->description))echo __($row->description); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </p>
+ </fieldset>
+
+
+ <?php /** option de la gestion de stock, disponible que ci value precendente a true */ ?>
+ <?php if(_test_bool(modstock::$list['STOCK_CHECK']->value)): ?>
+
+ <?php /** Attribut produit / option stock associé */ ?>
+ <fieldset class="block_field">
+ <legend class="block_field-title"><?php echo __('heading manage general option stock') ?></legend>
+
+ <ul class="block_input">
+ <?php foreach(modstock::$list as $row)
+ if(strpos($row->key,'ATTRIBUTE')===false && !in_array($row->key,array('STOCK_CHECK')) ) { ?>
+ <li id="nav_<?php echo $row->key ?>"><h5 title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></h5>
+
+ <div class="block_input tirroir">
+ <label><?php echo __($row->description); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </li>
+ <?php } ?>
+ </ul>
+ </fieldset>
+
+
+ <?php /** Attribut produit / option stock associé */ ?>
+ <fieldset class="block_field">
+ <legend class="block_field-title"><?php echo __('heading manage general option attributes stock') ?></legend>
+
+ <ul class="block_input">
+ <?php foreach(modstock::$list as $row)
+ if(strpos($row->key,'ATTRIBUTE') > 0) { ?>
+ <li id="nav_<?php echo $row->key ?>"><h5 title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></h5>
+
+ <div class="block_input tirroir">
+ <label><?php echo __($row->description); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </li>
+ <?php } ?>
+ </ul>
+ </fieldset>
+
+
+ <?php endif; ?>
+
+
+
+
+ <div class="button_nav">
+ <?php print tep_image_submit('button_copy.gif', IMAGE_UPDATE) .tep_js_back(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&gID=' . $_GET['gID'] )) ; ?>
+ </div>
+
+</div>
+</form>
\ No newline at end of file
Added: trunk/catalog/admin/includes/gabarit/configuration/my_boutique.listing.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/my_boutique.listing.gab (rev 0)
+++ trunk/catalog/admin/includes/gabarit/configuration/my_boutique.listing.gab 2011-10-22 16:27:52 UTC (rev 3838)
@@ -0,0 +1,167 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 22/09/11, 20:05
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @brief mise en forme de la gestion de la configuration principale de la boutique
+*/
+?>
+
+<div id="ssmenu">
+ <?php echo tep_ssmenu_configuration($_GET['gparentID']) ?>
+</div>
+
+
+
+<h3 class="main-title"><?php echo __('heading my boutique') ?></h3>
+
+<?php echo tep_draw_form('configuration', FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&gID=' . $_GET['gID'] . '&action=save_mutli') ?>
+
+
+<div class="block_form">
+
+ <fieldset class="block_field">
+ <?php /** */ $row = my_boutique::$list['STORE_NAME']; ?>
+ <legend title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></legend>
+ <div class="block_input">
+ <label><?php if (tep_not_null($row->description))echo __($row->description); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </fieldset>
+
+
+ <fieldset class="block_field">
+ <legend><?php echo __('my_boutique legend prop') ?></legend>
+ <div class="block_input">
+ <?php /** */ $row = my_boutique::$list['STORE_OWNER']; ?>
+ <div class="fleft w_50">
+ <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ <?php /** */ $row = my_boutique::$list['STORE_OWNER_EMAIL_ADDRESS']; ?>
+ <div class="fleft w_50">
+ <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </div>
+ </fieldset>
+
+
+
+ <fieldset class="block_field">
+ <legend><?php echo __('my_boutique legend localisation') ?></legend>
+ <div class="block_input">
+ <?php /** */ $row = my_boutique::$list['STORE_COUNTRY']; ?>
+ <div class="fleft w_50">
+ <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ <?php /** */ $row = my_boutique::$list['STORE_ZONE']; ?>
+ <div class="fleft w_50">
+ <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </div>
+ </fieldset>
+
+
+ <fieldset class="block_field">
+ <legend><?php echo __('my_boutique legend logo') ?></legend>
+ <div class="block_input">
+ <?php /** */ $row = my_boutique::$list['STORE_LOGO']; ?>
+ <div class="fleft w_50">
+ <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ <?php /** */ $row = my_boutique::$list['STORE_LOGO_PRINT']; ?>
+ <div class="fleft w_50">
+ <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </div>
+ </fieldset>
+
+ <fieldset class="block_field">
+ <legend><?php echo __('my_boutique legend legales') ?></legend>
+ <div class="block_input">
+ <?php /** */ $row = my_boutique::$list['STORE_NAME_ADDRESS']; ?>
+ <div class="fleft w_50">
+ <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ <?php /** */ $row = my_boutique::$list['STORE_LEGAL_INFO']; ?>
+ <div class="fleft w_50">
+ <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </div>
+ </fieldset>
+
+ <fieldset class="block_field">
+ <legend><?php echo __('my_boutique legend maintenance') ?></legend>
+ <div class="block_input">
+ <?php /** */ $row = my_boutique::$list['STORE_OFFLINE']; ?>
+ <div class="fleft w_50">
+ <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ <?php /** */ $row = my_boutique::$list['STORE_OFFLINE_TXT']; ?>
+ <div class="fleft w_50">
+ <label title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->description). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </div>
+ </fieldset>
+
+
+ <fieldset class="block_field">
+ <legend class="block_field-title"><?php echo __('my_boutique legend other') ?></legend>
+ <ul class="block_input">
+ <?php foreach(my_boutique::$list as $row)
+ if(!in_array($row->key,array('STORE_NAME','STORE_OWNER','STORE_OWNER_EMAIL_ADDRESS','STORE_COUNTRY','STORE_ZONE','STORE_LOGO','STORE_LOGO_PRINT','STORE_OFFLINE','STORE_OFFLINE_TXT','STORE_NAME_ADDRESS','STORE_LEGAL_INFO')) ) { ?>
+ <li id="nav_<?php echo $row->key ?>"><h5 title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></h5>
+
+ <div class="block_input tirroir">
+ <label><?php echo __($row->description); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </li>
+ <?php } ?>
+ </ul>
+ </fieldset>
+
+
+ <div class="button_nav">
+ <?php print tep_image_submit('button_copy.gif', IMAGE_UPDATE) .tep_js_back(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&gID=' . $_GET['gID'] )) ; ?>
+ </div>
+
+</div>
+</form>
\ No newline at end of file
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modimages.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modimages.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modimages.txt 2011-10-22 16:27:52 UTC (rev 3838)
@@ -0,0 +1,66 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 27/09/11, 18:29
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+
+$lang['heading modimages configuration']="Configuration des images " ;
+$lang['heading modimages tailles']="Tailles des differentes type images " ;
+$lang['modimages tailles txt intro']="Pour toutes les images, ces valeurs definissent les tailles (largeur et hauteur) maximun. Dans l'utilisation par defaut, (sans module specifique) les proportion de l'image sont conservées" ;
+$lang['modmail legend htmlmode']="Utiliser des emails au format html" ;
+
+$lang['modimages legend small']="Petite images" ;
+$lang['modimages legend heading']="Images de titre (fabricant / catgeorie)" ;
+$lang['modimages legend subcategory']="Sous categories" ;
+$lang['modimages legend popup']="Pleine page (popup/Ajaxbox)" ;
+$lang['modimages legend stack']="stack images" ;
+$lang['modmail legend other']="Autres" ;
+
+$lang['modimages legend brief']="Rappel / Aides" ;
+$lang['modimages text path images %s']="Pour rappel le dossier des images est : %s" ;
+$lang['modimages text url images %s']="Pour rappel les images sont accessible a cette adresse : %s" ;
+$lang['modimages text brief']="" ;
+
+/**
+ @remarks stock Valeur stocké en db pour conversion
+ @note
+ XXXX : key de configuration
+ XXXX_S : desciption courte
+ XXXX_L description longue
+*/
+
+$lang['SMALL_IMAGE_WIDTH_S']="Petite image, Largeur" ;
+$lang['SMALL_IMAGE_WIDTH_L']="Nombre de pixels pour la largeur des petites images des articles." ;
+$lang['SMALL_IMAGE_HEIGHT_S']="Petite image, Hauteur" ;
+$lang['SMALL_IMAGE_HEIGHT_L']="Nombre de pixels pour la hauteur des petites images des articles." ;
+$lang['HEADING_IMAGE_WIDTH_S']="Image d'en-tête, Largeur" ;
+$lang['HEADING_IMAGE_WIDTH_L']="Nombre de pixels pour la largeur des images d'en-tête." ;
+$lang['HEADING_IMAGE_HEIGHT_S']="Image d'en-tête, Hauteur" ;
+$lang['HEADING_IMAGE_HEIGHT_L']="Nombre de pixels pour la hauteur des images d'en-tête." ;
+$lang['SUBCATEGORY_IMAGE_WIDTH_S']="Image de sous-catégorie, Largeur" ;
+$lang['SUBCATEGORY_IMAGE_WIDTH_L']="Nombre de pixels pour la largeur des images de sous-catégorie." ;
+$lang['SUBCATEGORY_IMAGE_HEIGHT_S']="Image de sous-catégorie, Hauteur" ;
+$lang['SUBCATEGORY_IMAGE_HEIGHT_L']="Nombre de pixels pour la hauteur des images de sous-catégorie." ;
+$lang['POPUP_IMAGE_WIDTH_S']="Image de popup, Largeur" ;
+$lang['POPUP_IMAGE_WIDTH_L']="Nombre de pixels pour la largeur des images de popup." ;
+$lang['POPUP_IMAGE_HEIGHT_S']="Image de popup, Hauteur" ;
+$lang['POPUP_IMAGE_HEIGHT_L']="Nombre de pixels pour la hauteur des images de popup." ;
+$lang['STACK_IMAGE_WIDTH_S']="Image de la pile, Largeur" ;
+$lang['STACK_IMAGE_WIDTH_L']="Nombre de pixels pour la largeur des images de la pile." ;
+$lang['STACK_IMAGE_HEIGHT_S']="Image de la pile, Hauteur" ;
+$lang['STACK_IMAGE_HEIGHT_L']="Nombre de pixels pour la hauteur des images de la pile." ;
+$lang['JPEG_QUALITY_S']="Qualité des vignettes jpeg" ;
+$lang['JPEG_QUALITY_L']="Définissez la qualité de compression des vignettes jpeg." ;
+$lang['IMAGE_REQUIRED_S']="Image inexistante" ;
+$lang['IMAGE_REQUIRED_L']="Permettre l'affichage des liens brisés sur les images (pour le développement)." ;
+$lang['IMAGE_NONEXISTENT_S']="Substitution image introuvable" ;
+$lang['IMAGE_NONEXISTENT_L']="Image qui vient remplacer l'image non trouvée" ;
+$lang['WATERMARK_IMAGE_PROTECT_S']="Ajoute de filigrame sur les images" ;
+$lang['WATERMARK_IMAGE_PROTECT_L']="preciser le texte à ajouter sur les images" ;
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modmail.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modmail.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modmail.txt 2011-10-22 16:27:52 UTC (rev 3838)
@@ -0,0 +1,55 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 27/09/11, 18:29
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+
+$lang['heading modmail configuration']="Configuration des emails" ;
+
+$lang['modmail legend htmlmode']="Utiliser des emails au format html" ;
+$lang['modmail legend method']="Methode" ;
+$lang['modmail legend other']="Autres" ;
+
+
+
+/**
+ @remarks stock Valeur stocké en db pour conversion
+ @note
+ XXXX : key de configuration
+ XXXX_S : desciption courte
+ XXXX_L description longue
+*/
+
+$lang['SEND_EMAILS_S']="Activation des emails" ;
+$lang['SEND_EMAILS_L']="Permettre l'envoi des emails. Si vous descativez l'envoi d'email, la partie boutique n'expedira plus aucun email. Le backoffice pourra neanmoins envoyer les emails propre au fonctionement de la partie privé " ;
+
+$lang['ENTRY_EMAIL_ADDRESS_CHECK_S']="Vérifier l'adresse email par le DNS" ;
+$lang['ENTRY_EMAIL_ADDRESS_CHECK_L']="Vérifier l'adresse email au travers un serveur DNS. Cette verification sera effectué dans toutes les pages, public et ou privé qui manipule des adresse email clients" ;
+
+
+$lang['EMAIL_TRANSPORT_S']="Méthode de transport d'email" ;
+$lang['EMAIL_TRANSPORT_L']="Définit si le serveur utilise une connexion locale à sendmail ou une connexion SMTP par TCP/IP. Les Serveurs Windows et MacOS devraient codifier SMTP." ;
+
+$lang['SMTP_MAIL_SERVER_S']="Url serveur SMTP" ;
+$lang['SMTP_MAIL_SERVER_L']="Définit l'url du serveur SMTP, si le méthode de transport choisie est le smtp, par défaut : localhost " ;
+$lang['SMTP_PORT_NUMBER_S']="Port sur serveur SMTP" ;
+$lang['SMTP_PORT_NUMBER_L']="Précise le port utilisé pour le serveur smtp, par défaut : 25" ;
+$lang['SMTP_SENDMAIL_FROM_S']="Email expediteur , via SMTP" ;
+$lang['SMTP_SENDMAIL_FROM_L']="Precise l'adresse de l'expéditeur, avec la méthode SMTP" ;
+$lang['SMTP_FROMEMAIL_NAME_S']="Nom d'expéditeur via SMTP" ;
+$lang['SMTP_FROMEMAIL_NAME_L']="Précise le nom lors de l'envoi via SMTP" ;
+
+
+$lang['EMAIL_LINEFEED_S']="Saut de ligne en-tête des emails" ;
+$lang['EMAIL_LINEFEED_L']="Définit les caractères utilisés pour séparer les en-têtes des emails." ;
+$lang['EMAIL_USE_HTML_S']="Utiliser MIME HTML pour l'envoi des emails" ;
+$lang['EMAIL_USE_HTML_L']="Envoie les emails au format html (true) ou texte brut (false)." ;
+
+
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modstock.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modstock.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modstock.txt 2011-10-22 16:27:52 UTC (rev 3838)
@@ -0,0 +1,64 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 27/09/11, 18:29
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+
+$lang['heading manage stock and process stock']="Configuration gestion de stock" ;
+
+$lang['heading manage general option stock']="Options générale du stock" ;
+$lang['heading manage general option attributes stock']="Options des attributes pour le stock" ;
+
+
+
+
+/**
+ @remarks stock Valeur stocké en db pour conversion
+ @note
+ XXXX : key de configuration
+ XXXX_S : desciption courte
+ XXXX_L description longue
+*/
+
+
+$lang['STOCK_CHECK_S']="Utiliser la gestion de stock" ;
+$lang['STOCK_CHECK_L']="Cet option vous permet d'activer/ descativer la gestion du stock pour les produits" ;
+
+
+
+
+$lang['DEFAULT_RESTOCK_VALUE_S']="Re-stock article non-endommagé" ;
+$lang['DEFAULT_RESTOCK_VALUE_L']="Il s'agit de la charge appliquée au remboursement pour couvrir le retour des articles non-défectueux qui doivent être re-stocké" ;
+$lang['STOCK_LIMITED_S']="Décompte du stock" ;
+$lang['STOCK_LIMITED_L']="Décompte du stock les articles commandés." ;
+$lang['STOCK_ALLOW_CHECKOUT_S']="Autorisation achat hors stock" ;
+$lang['STOCK_ALLOW_CHECKOUT_L']="Permet au client de commander même si un article n'est pas en stock." ;
+$lang['STOCK_MARK_PRODUCT_OUT_OF_STOCK_S']="Affichage des produits en rupture de stock" ;
+$lang['STOCK_MARK_PRODUCT_OUT_OF_STOCK_L']="Affiche cette marque suivante si le produit n'est plus en stock." ;
+$lang['STOCK_MARK_PRODUCT_NO_STOCK_S']="Affichage des produits hors stock (sur commande)" ;
+$lang['STOCK_MARK_PRODUCT_NO_STOCK_L']="Affiche cette marque suivante si le produit n'est disponible que sur commande." ;
+$lang['STOCK_REORDER_LEVEL_S']="Stock niveau d'alerte" ;
+$lang['STOCK_REORDER_LEVEL_L']="Niveau pour l'alerte de réapprovisionnement du stock." ;
+
+
+
+$lang['PRODINFO_ATTRIBUTE_PLUGIN_S']="Affichage des attributs du plugin produit Info" ;
+$lang['PRODINFO_ATTRIBUTE_PLUGIN_L']="Le plugin utilisé pour les attributs affichés sur la page d'informations produit ." ;
+$lang['PRODINFO_ATTRIBUTE_SHOW_OUT_OF_STOCK_S']="Afficher les attributs rupture de stock" ;
+// $lang['PRODINFO_ATTRIBUTE_SHOW_OUT_OF_STOCK_L']= '<strong>Si True:</strong> Les attributs qui sont en rupture de stock seront affichés. <br /><strong> si False:</strong> Les attributs qui sont en rupture de stock <strong><em>ne seront pas</em></strong>affichés.</strong><br /><strong>True par défaut.</strong>';
+$lang['PRODINFO_ATTRIBUTE_SHOW_OUT_OF_STOCK_L']="Si True : Les attributs qui sont en rupture de stock seront affichés.<br />Si False : Les attributs qui sont en rupture de stock ne seront pas affichés.<br />True par défaut." ;
+$lang['PRODINFO_ATTRIBUTE_MARK_OUT_OF_STOCK_S']="Attributs rupture de stock" ;
+$lang['PRODINFO_ATTRIBUTE_MARK_OUT_OF_STOCK_L']="Contrôle la façon dont les attributs de stock sont marqués lors d'une rupture de stock ." ;
+$lang['PRODINFO_ATTRIBUTE_OUT_OF_STOCK_MSGLINE_S']="Affichage de la ligne Message Stock " ;
+$lang['PRODINFO_ATTRIBUTE_OUT_OF_STOCK_MSGLINE_L']="<strong>Si True:</strong> Si une combinaison d'attributs est sélectionné par le client, une ligne de message informant de cette volonté s'affichera." ;
+$lang['PRODINFO_ATTRIBUTE_ACTUAL_PRICE_PULL_DOWN_S']="Liste des attributs des prix actuels." ;
+$lang['PRODINFO_ATTRIBUTE_ACTUAL_PRICE_PULL_DOWN_L']="<strong>NOTE:</strong></font> N'affiche un résultat satisfaisant que si vous avez une seule option par produit.<br /><strong> Si True:</strong> Le prix des options sera affiché comme un prix de produit final.<br /><strong> False par défaut.</strong>" ;
+$lang['PRODINFO_ATTRIBUTE_DISPLAY_STOCK_LIST_S']="Affichage table avec information stock" ;
+$lang['PRODINFO_ATTRIBUTE_DISPLAY_STOCK_LIST_L']="<strong>Si True:</strong> Un tableau avec les informations sur le stock sera affiché au client. Si le produit n'a pas tous les attributs de stock suivi, la table ne sera pas affichée.<br /><strong>True par défaut.</strong>" ;
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/my_boutique.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/my_boutique.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/my_boutique.txt 2011-10-22 16:27:52 UTC (rev 3838)
@@ -0,0 +1,70 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 27/09/11, 18:29
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+
+$lang['heading my boutique']="Configuration générale de la boutique" ;
+
+$lang['my_boutique legend prop']="Propriétaire" ;
+$lang['my_boutique legend localisation']="Localisation" ;
+$lang['my_boutique legend logo']="Logos" ;
+$lang['my_boutique legend maintenance']="Maintenance/Offline" ;
+$lang['my_boutique legend legales']="Légales" ;
+$lang['my_boutique legend other']="Autres" ;
+
+
+
+/**
+ @remarks stock Valeur stocké en db pour conversion
+ @note
+ XXXX : key de configuration
+ XXXX_S : desciption courte
+ XXXX_L description longue
+*/
+
+$lang['STORE_NAME_S']="Nom de la boutique" ;
+$lang['STORE_NAME_L']="Indiquer le nom de votre boutique." ;
+
+
+
+$lang['ORDERS_NUMBER_PREFIX_S']="Préfixe numéro commande" ;
+$lang['ORDERS_NUMBER_PREFIX_L']="Indiquer le préfixe des numéros de commande le chiffre precise le nombre de chiffre du numéro; ex: 'ym-5'(1005-00001); Laissez vide si vous ne voulez pas de préfixe." ;
+
+$lang['STORE_OWNER_S']="Propriétaire de la boutique" ;
+$lang['STORE_OWNER_L']="Indiquer le nom du propriétaire de la boutique." ;
+$lang['STORE_OWNER_EMAIL_ADDRESS_S']="Adresse Email" ;
+$lang['STORE_OWNER_EMAIL_ADDRESS_L']="L'adresse Email du gérant de la boutique." ;
+$lang['EMAIL_FROM_S']="Champ 'From' d'un Email envoyé" ;
+$lang['EMAIL_FROM_L']="L'adresse Email utilisée pour identifier l'expéditeur des Emails envoyés par la boutique." ;
+$lang['STORE_COUNTRY_S']="Pays" ;
+$lang['STORE_COUNTRY_L']="Le pays de résidence de la boutique.<br /><strong>Note : Pensez à mettre à jour la zone.</strong>" ;
+$lang['STORE_ZONE_S']="Zone" ;
+$lang['STORE_ZONE_L']="Zone de la localisation de la boutique." ;
+$lang['USE_DEFAULT_LANGUAGE_CURRENCY_S']="Change la langue en fonction de la devise" ;
+$lang['USE_DEFAULT_LANGUAGE_CURRENCY_L']="Change automatiquement la langue sur celle correspondant à la nouvelle devise choisie." ;
+$lang['STORE_LOGO_S']="Le logo de la boutique" ;
+$lang['STORE_LOGO_L']="Le logo utilisé pour la partie public" ;
+$lang['STORE_LOGO_PRINT_S']="Le logo pour impression" ;
+$lang['STORE_LOGO_PRINT_L']="Le logo utilisé lors de l'impression, uniquement en jpg, pas de couche de transparence" ;
+$lang['SEND_EXTRA_ORDER_EMAILS_TO_S']="Email lors d'une commande" ;
+$lang['SEND_EXTRA_ORDER_EMAILS_TO_L']="Envoie une copie de la commande aux adresses spécifiées. Celles-ci doivent être dans le format :<br />Nom 1 ‹email@address1›, Nom 2 ‹email@address2›" ;
+$lang['DISPLAY_CART_S']="Afficher le panier après l'ajout de produit" ;
+$lang['DISPLAY_CART_L']="Affiche le contenu du panier après avoir ajouté un article (ou retourne à l'origine)." ;
+$lang['ADVANCED_SEARCH_DEFAULT_OPERATOR_S']="Option de recherche par défaut" ;
+$lang['ADVANCED_SEARCH_DEFAULT_OPERATOR_L']="Choisir l'opérateur de recherche par défaut.<br />(AND ou OR)" ;
+$lang['STORE_NAME_ADDRESS_S']="Nom, adresse, pays et tél. de la boutique" ;
+$lang['STORE_NAME_ADDRESS_L']="Nom, adresse, pays et téléphone de la boutique utilisés dans les impressions de documents et l'affichage en ligne." ;
+$lang['STORE_OFFLINE_S']="Mode maintenance" ;
+$lang['STORE_OFFLINE_L']="Bloquer l'affichage public pour mettre à jour ou intervenir sur votre boutique " ;
+$lang['STORE_OFFLINE_TXT_S']="Texte mode maintenance " ;
+$lang['STORE_OFFLINE_TXT_L']="texte affiché lorsque votre boutique est en maintenance " ;
+$lang['STORE_LEGAL_INFO_S']="Informations légales " ;
+$lang['STORE_LEGAL_INFO_L']="texte affiché en pied de page des imprimés pdf" ;
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/modules/configuration/modimages.php
===================================================================
--- trunk/catalog/admin/includes/modules/configuration/modimages.php (rev 0)
+++ trunk/catalog/admin/includes/modules/configuration/modimages.php 2011-10-22 16:27:52 UTC (rev 3838)
@@ -0,0 +1,143 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 22/09/11, 19:49
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class modimages
+ Mise en forme et structuration des options de stock
+*/
+
+
+Class modimages
+ implements ext_configuration
+ {
+ /**
+ @var array list template
+ */
+ public static $list;
+
+ public static $cfg;
+
+ /**
+ */
+ function __construct(){
+ global $oscss;
+ $this->code=__CLASS__;
+ global $messageStack, $language,$lang;
+ if (!is_writeable(DIR_FS_TEMPLATES)) $messageStack->add(ERROR_DESTINATION_NOT_WRITEABLE. 'template/', 'error');
+
+ $oscss->pile_file_lang(DIR_FS_ADMIN.DIR_WS_LANGUAGES.$language.'/modules/configuration/'.$this->code.'.txt');
+
+ self::$cfg =new sqlconfiguration();
+ }
+
+
+ /**
+ Action Prise en charge par le modules
+ @param
+ @e global $action
+ @e global $messageStack
+ */
+ public function draw_action(){
+ global $action,$messageStack;
+
+ $DB=Database::getInstance();
+ $gparentID = tep_db_prepare_input($_GET['gparentID']);
+ $gID= tep_db_prepare_input($_GET['gID']);
+
+ switch($action){
+ /**
+ @brief save page groupe
+ */
+ case 'save_mutli':
+ if(tep_not_null($gID) ){
+
+ $list=sqlconfiguration::fetch(array('group_id'=> (int)$gID), true);
+
+ foreach($list as $row) {
+
+ if(isset($_POST['configuration'][$row->key])) {
+ $configuration_value = tep_db_prepare_input($_POST['configuration'][$row->key]);
+
+ if( ($res=sqlconfiguration::update(array('key'=>$row->key , 'value'=>tep_db_input($configuration_value) ))) == false)$erreur[]=false;
+ else $erreur[]=true;
+
+ }
+
+ }
+
+ if(!in_array(false,$erreur)) $messageStack->add_session(SAVE_CONFIG_OK, 'success');
+ else $messageStack->add_session(SAVE_CONFIG_NOT_OK, 'error');
+
+ }
+
+ tep_redirect(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $gparentID.'&gID=' . $_GET['gID'] . '&cID=' . $cID));
+ break;
+ }
+ }
+
+ /**
+ @return array
+ */
+ public function load_db_values($Id){
+
+
+ $list_edit=array();
+ $gID = 4;
+
+ $list=sqlconfiguration::fetch(array('group_id'=> (int)$gID), true);
+
+ foreach($list as $row) {
+
+ $cfgValue =configUtility::CallExecConfigLine($row->use, $row->key, $row->value);
+
+ if ($row->set) eval($s[]='$value_field = ' . $row->set . '"' . htmlspecialchars($row->value) . '","'.$row->key.'");');
+ else $value_field = tep_draw_input_field('configuration['.$row->key.']', '',$row->value);
+
+ $conf = $row;
+ $row->cfgValue=$cfgValue;
+ $row->value_field=$value_field;
+
+ $list_edit[$row->key]=$conf;
+ }
+
+ return $list_edit;
+ }
+
+ /**
+ Appelé dans le header de page
+ */
+ public static function draw_header(){
+ ?>
+ <style type="text/css">
+ #central form label {
+ display: inline-block;
+ font-weight: normal;
+ margin: 5px 10px;
+ text-align: left;
+ white-space: pre-wrap;
+ width: 90%;
+ }
+ </style>
+ <?php
+ }
+
+ /**
+ Contenu central
+ @param
+ @e global $action
+ @e global $gparentID
+ */
+ public function draw(){
+ global $action,$gparentID;
+ if($action=='cfg') return;
+ self::$list = $this->load_db_values('');
+ return tep_get_include_contents('configuration/'.__CLASS__.'.listing');
+ }
+}
+
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/modules/configuration/modstock.php
===================================================================
--- trunk/catalog/admin/includes/modules/configuration/modstock.php (rev 0)
+++ trunk/catalog/admin/includes/modules/configuration/modstock.php 2011-10-22 16:27:52 UTC (rev 3838)
@@ -0,0 +1,143 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 22/09/11, 19:49
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class modmail
+ Mise en forme et structuration des options de stock
+*/
+
+
+Class modmail
+ implements ext_configuration
+ {
+ /**
+ @var array list template
+ */
+ public static $list;
+
+ public static $cfg;
+
+ /**
+ */
+ function __construct(){
+ global $oscss;
+ $this->code=__CLASS__;
+ global $messageStack, $language,$lang;
+ if (!is_writeable(DIR_FS_TEMPLATES)) $messageStack->add(ERROR_DESTINATION_NOT_WRITEABLE. 'template/', 'error');
+
+ $oscss->pile_file_lang(DIR_FS_ADMIN.DIR_WS_LANGUAGES.$language.'/modules/configuration/'.$this->code.'.txt');
+
+ self::$cfg =new sqlconfiguration();
+ }
+
+
+ /**
+ Action Prise en charge par le modules
+ @param
+ @e global $action
+ @e global $messageStack
+ */
+ public function draw_action(){
+ global $action,$messageStack;
+
+ $DB=Database::getInstance();
+ $gparentID = tep_db_prepare_input($_GET['gparentID']);
+ $gID= tep_db_prepare_input($_GET['gID']);
+
+ switch($action){
+ /**
+ @brief save page groupe
+ */
+ case 'save_mutli':
+ if(tep_not_null($gID) ){
+
+ $list=sqlconfiguration::fetch(array('group_id'=> (int)$gID), true);
+
+ foreach($list as $row) {
+
+ if(isset($_POST['configuration'][$row->key])) {
+ $configuration_value = tep_db_prepare_input($_POST['configuration'][$row->key]);
+
+ if( ($res=sqlconfiguration::update(array('key'=>$row->key , 'value'=>tep_db_input($configuration_value) ))) == false)$erreur[]=false;
+ else $erreur[]=true;
+
+ }
+
+ }
+
+ if(!in_array(false,$erreur)) $messageStack->add_session(SAVE_CONFIG_OK, 'success');
+ else $messageStack->add_session(SAVE_CONFIG_NOT_OK, 'error');
+
+ }
+
+ tep_redirect(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $gparentID.'&gID=' . $_GET['gID'] . '&cID=' . $cID));
+ break;
+ }
+ }
+
+ /**
+ @return array
+ */
+ public function load_db_values($Id){
+
+
+ $list_edit=array();
+ $gID = 12;
+
+ $list=sqlconfiguration::fetch(array('group_id'=> (int)$gID), true);
+
+ foreach($list as $row) {
+
+ $cfgValue =configUtility::CallExecConfigLine($row->use, $row->key, $row->value);
+
+ if ($row->set) eval($s[]='$value_field = ' . $row->set . '"' . htmlspecialchars($row->value) . '","'.$row->key.'");');
+ else $value_field = tep_draw_input_field('configuration['.$row->key.']', '',$row->value);
+
+ $conf = $row;
+ $row->cfgValue=$cfgValue;
+ $row->value_field=$value_field;
+
+ $list_edit[$row->key]=$conf;
+ }
+
+ return $list_edit;
+ }
+
+ /**
+ Appelé dans le header de page
+ */
+ public static function draw_header(){
+ ?>
+ <style type="text/css">
+ #central form label {
+ display: inline-block;
+ font-weight: normal;
+ margin: 5px 10px;
+ text-align: left;
+ white-space: pre-wrap;
+ width: 90%;
+ }
+ </style>
+ <?php
+ }
+
+ /**
+ Contenu central
+ @param
+ @e global $action
+ @e global $gparentID
+ */
+ public function draw(){
+ global $action,$gparentID;
+ if($action=='cfg') return;
+ self::$list = $this->load_db_values('');
+ return tep_get_include_contents('configuration/'.__CLASS__.'.listing');
+ }
+}
+
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/modules/configuration/my_boutique.php
===================================================================
--- trunk/catalog/admin/includes/modules/configuration/my_boutique.php (rev 0)
+++ trunk/catalog/admin/includes/modules/configuration/my_boutique.php 2011-10-22 16:27:52 UTC (rev 3838)
@@ -0,0 +1,143 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 22/09/11, 19:49
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class my_boutique
+ Mise en forme et structuration des options de stock
+*/
+
+
+Class my_boutique
+ implements ext_configuration
+ {
+ /**
+ @var array list template
+ */
+ public static $list;
+
+ public static $cfg;
+
+ /**
+ */
+ function __construct(){
+ global $oscss;
+ $this->code=__CLASS__;
+ global $messageStack, $language,$lang;
+ if (!is_writeable(DIR_FS_TEMPLATES)) $messageStack->add(ERROR_DESTINATION_NOT_WRITEABLE. 'template/', 'error');
+
+ $oscss->pile_file_lang(DIR_FS_ADMIN.DIR_WS_LANGUAGES.$language.'/modules/configuration/'.$this->code.'.txt');
+
+ self::$cfg =new sqlconfiguration();
+ }
+
+
+ /**
+ Action Prise en charge par le modules
+ @param
+ @e global $action
+ @e global $messageStack
+ */
+ public function draw_action(){
+ global $action,$messageStack;
+
+ $DB=Database::getInstance();
+ $gparentID = tep_db_prepare_input($_GET['gparentID']);
+ $gID= tep_db_prepare_input($_GET['gID']);
+
+ switch($action){
+ /**
+ @brief save page groupe
+ */
+ case 'save_mutli':
+ if(tep_not_null($gID) ){
+
+ $list=sqlconfiguration::fetch(array('group_id'=> (int)$gID), true);
+
+ foreach($list as $row) {
+
+ if(isset($_POST['configuration'][$row->key])) {
+ $configuration_value = tep_db_prepare_input($_POST['configuration'][$row->key]);
+
+ if( ($res=sqlconfiguration::update(array('key'=>$row->key , 'value'=>tep_db_input($configuration_value) ))) == false)$erreur[]=false;
+ else $erreur[]=true;
+
+ }
+
+ }
+
+ if(!in_array(false,$erreur)) $messageStack->add_session(SAVE_CONFIG_OK, 'success');
+ else $messageStack->add_session(SAVE_CONFIG_NOT_OK, 'error');
+
+ }
+
+ tep_redirect(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $gparentID.'&gID=' . $_GET['gID'] . '&cID=' . $cID));
+ break;
+ }
+ }
+
+ /**
+ @return array
+ */
+ public function load_db_values($Id){
+
+
+ $list_edit=array();
+ $gID = 1;
+
+ $list=sqlconfiguration::fetch(array('group_id'=> (int)$gID), true);
+
+ foreach($list as $row) {
+
+ $cfgValue =configUtility::CallExecConfigLine($row->use, $row->key, $row->value);
+
+ if ($row->set) eval($s[]='$value_field = ' . $row->set . '"' . htmlspecialchars($row->value) . '","'.$row->key.'");');
+ else $value_field = tep_draw_input_field('configuration['.$row->key.']', '',$row->value);
+
+ $conf = $row;
+ $row->cfgValue=$cfgValue;
+ $row->value_field=$value_field;
+
+ $list_edit[$row->key]=$conf;
+ }
+
+ return $list_edit;
+ }
+
+ /**
+ Appelé dans le header de page
+ */
+ public static function draw_header(){
+ ?>
+ <style type="text/css">
+ #central form label {
+ display: inline-block;
+ font-weight: normal;
+ margin: 5px 10px;
+ text-align: left;
+ white-space: pre-wrap;
+ width: 90%;
+ }
+ </style>
+ <?php
+ }
+
+ /**
+ Contenu central
+ @param
+ @e global $action
+ @e global $gparentID
+ */
+ public function draw(){
+ global $action,$gparentID;
+ if($action=='cfg') return;
+ self::$list = $this->load_db_values('');
+ return tep_get_include_contents('configuration/'.__CLASS__.'.listing');
+ }
+}
+
+?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/template/oscss/jquery-ui-1.css
===================================================================
--- trunk/catalog/admin/includes/template/oscss/jquery-ui-1.css 2011-10-20 21:30:32 UTC (rev 3837)
+++ trunk/catalog/admin/includes/template/oscss/jquery-ui-1.css 2011-10-22 16:27:52 UTC (rev 3838)
@@ -1,578 +1,543 @@
-/*
- * jQuery UI CSS Framework 1.8.12
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Theming/API
- */
+/**
+ @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.0.9
+ @date 23/06/10, 17:42
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+body { background:#faf9f7 url(img/1/body.jpg) repeat-x; color:#000; margin:0; padding:0; font: normal 11px Verdana, Arial, sans-serif; }
+html { height: 100%;}
+/* prepend */
+ * {margin:0;padding:0}
+ a:link,
+ a:visited {text-decoration: underline; color:#000;}
+ a:hover { text-decoration: none; }
+ img { border-width:0 ; margin:0; padding:0; }
+ h1 { font-size: 2em ; padding:1em; }
+ h1 img {border-width:0 ; margin:0; padding:0;}
+ h2 { font-size: 1.2em ;text-shadow:0 1px 0 #fff;}
+ h3 { font-size: 1.2em ;text-shadow:0 1px 0 #fff;color:#666;}
+ h4 { font-size: 1em ;text-shadow:0 1px 0 #fff;}
+ h5 { font-size: 1em ;text-shadow:0 1px 0 #fff;}
+ p {padding:1em;}
+ ul {list-style:none;}
+ #central li {padding-left:0;cursor:pointer;margin:0.1em 0;}
+ th { text-shadow:0 1px 0 #fff;-moz-border-radius:6px; -webkit-border-radius:6px; margin:2px 1px; text-align: left; padding: 0 5px;line-height:30px;}
-/* Layout helpers
-----------------------------------*/
-.ui-helper-hidden { display: none; }
-.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
-.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
-.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
-.ui-helper-clearfix { display: inline-block; }
-/* required comment for clearfix to work in Opera \*/
-* html .ui-helper-clearfix { height:1%; }
-.ui-helper-clearfix { display:block; }
-/* end clearfix */
-.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
+/*...
[truncated message content] |
|
From: <os...@us...> - 2011-10-20 21:30:39
|
Revision: 3837
http://oscss.svn.sourceforge.net/oscss/?rev=3837&view=rev
Author: oscim
Date: 2011-10-20 21:30:32 +0000 (Thu, 20 Oct 2011)
Log Message:
-----------
correction coquille, ajustement css
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/configUtility.php
trunk/catalog/admin/includes/functions/lib.configuration.php
trunk/catalog/admin/includes/template/oscss/stylesheet-1.css
Modified: trunk/catalog/admin/includes/classes/configUtility.php
===================================================================
--- trunk/catalog/admin/includes/classes/configUtility.php 2011-10-20 20:50:22 UTC (rev 3836)
+++ trunk/catalog/admin/includes/classes/configUtility.php 2011-10-20 21:30:32 UTC (rev 3837)
@@ -70,7 +70,7 @@
TODO update method for accept call static method and init class by new or getInstance if exits
*/
public static function CallExecConfigLine($_function, $key, $value){
-
+ $_function=trim($_function);
if (tep_not_null($_function)) {
if (preg_match('/->/', $_function)) {
$class_method = explode('->', $_function);
@@ -86,7 +86,12 @@
$keys= call_user_func(array($class_method[0], $class_method[1]), $value, $key);
}
else {
- if(strpos($_function,')') === false) $_function.='(';
+/**
+ @date 20/10/11, 23:02
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ TODO Desactiver bug sur les module des tache programmé
+*/
+// if(strpos($_function,')') === false) $_function.='(';
eval('$keys = ' . $_function . "'" . $value . "', '" . $key . "');");
}
return $keys;
Modified: trunk/catalog/admin/includes/functions/lib.configuration.php
===================================================================
--- trunk/catalog/admin/includes/functions/lib.configuration.php 2011-10-20 20:50:22 UTC (rev 3836)
+++ trunk/catalog/admin/includes/functions/lib.configuration.php 2011-10-20 21:30:32 UTC (rev 3837)
@@ -3,8 +3,8 @@
@licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 19/12/10, 19:49
+ @version 2.1.1
+ @date 20/10/11, 23:12
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -34,9 +34,9 @@
$string = '';
for ($i=0, $n=sizeof($select_array); $i<$n; $i++) {
$name = ((tep_not_null($key)) ? 'configuration[' . $key . ']' : 'configuration_value');
- $string .= '<input type="radio" name="' . $name . '" value="' . $select_array[$i] . '"';
+ $string .= '<span class="edit-input"> <input type="radio" name="' . $name . '" value="' . $select_array[$i] . '"';
if ($key_value == $select_array[$i]) $string .= ' checked="checked"';
- $string .= '/> ' . $select_array[$i] . '<br />';
+ $string .= '/> <span class="edit-input-value"> ' . $select_array[$i] . ' </span> </span> <br />';
}
return $string;
}
@@ -50,9 +50,9 @@
$string = '';
while($rs=each($select_array)){
$name = ((tep_not_null($key)) ? 'configuration[' . $key . ']' : 'configuration_value');
- $string .= '<input type="radio" name="' . $name . '" value="' . $rs['key'] . '"';
+ $string .= '<span class="edit-input"> <input type="radio" name="' . $name . '" value="' . $rs['key'] . '"';
if ($key_value == $rs['key']) $string .= ' checked="checked"';
- $string .= '/> ' . $rs['value'] . '<br />';
+ $string .= '/> <span class="edit-input-value"> ' . $rs['value'] . '</span> </span> <br />';
}
return $string;
}
Modified: trunk/catalog/admin/includes/template/oscss/stylesheet-1.css
===================================================================
--- trunk/catalog/admin/includes/template/oscss/stylesheet-1.css 2011-10-20 20:50:22 UTC (rev 3836)
+++ trunk/catalog/admin/includes/template/oscss/stylesheet-1.css 2011-10-20 21:30:32 UTC (rev 3837)
@@ -260,6 +260,13 @@
#central .block_form div.tabPage {padding-left:0; padding-right:0;}
#central .block_form .block_input,
#central form .block_input { text-shadow:0 1px 0 #fff;-moz-border-radius:6px; -webkit-border-radius:6px; width:98%; margin:2px 1px; display:inline-block; text-align: left; padding: 0 5px; background:#DEDADE;float:left;line-height:30px;}
+/* input[type="radio"] */
+
+
+ #central .block_form .block_input span.value_edit {display:inline-block; width:100%;}
+ #central .block_form .block_input span.value_edit br{display:none;}
+ #central .block_form .block_input span.value_edit span.edit-input{float:left; display:inline-block; padding:0 12px;}
+
/* central form .block_input */
#central form .block_input .hasDatepicker{ margin:0; display:inline-block; text-align: left; padding: 0 5px; background:#DEDADE;float:left;line-height:30px; min-width:0;}
#central form .block_field { text-shadow:0 1px 0 #fff;-moz-border-radius:6px; -webkit-border-radius:6px; min-width:96%; width:96.5%; max-width:97%; margin:2px ; display:inline-block; text-align: left; padding: 5px; float:left;background:#eee;}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-10-20 20:50:31
|
Revision: 3836
http://oscss.svn.sourceforge.net/oscss/?rev=3836&view=rev
Author: oscim
Date: 2011-10-20 20:50:22 +0000 (Thu, 20 Oct 2011)
Log Message:
-----------
Nombreuse petite correction
nettoyage diverse , suite centralisation a travers les drivers sql du BO. (Ajout de class en cours de dev)
Refonte du js du panier en ajax, et amelioration calcul ligne et totaux globaux
Ajout de la vue des frais de ports dans le panier
Suite ajout element manquant du template
Suppression du core des lib.xx functions appartenant ?\195?\160 la gestion des bannieres, report dans le modules correspondants
Modified Paths:
--------------
trunk/catalog/admin/includes/database_tables.php
trunk/catalog/admin/includes/functions/general.php
trunk/catalog/admin/includes/functions/lib.orders.php
trunk/catalog/admin/includes/gabarit/header_tags.listing.gab
trunk/catalog/admin/includes/languages/fr_FR/modules/aca_header_tags.txt
trunk/catalog/admin/includes/languages/fr_FR/widget/brief_config.txt
trunk/catalog/admin/includes/modules/pages/orders.php
trunk/catalog/admin/includes/widget/brief_config.php
trunk/catalog/ajax_exe.php
trunk/catalog/common/classes/price.php
trunk/catalog/common/classes/shoppingCart.php
trunk/catalog/includes/classes/page.php
trunk/catalog/includes/content/shopping_cart.php
trunk/catalog/includes/js/shopping_cart.js.php
trunk/catalog/includes/languages/fr_FR/shopping_cart.php
trunk/catalog/includes/modules/order_total/ot_shipping.php
trunk/catalog/index.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/shopping_cart.php
trunk/catalog/install/includes/content/core.configuration.php
Added Paths:
-----------
trunk/catalog/admin/includes/classes/drivers/sqladminmenu.php
trunk/catalog/admin/includes/classes/drivers/sqlimage.php
trunk/catalog/admin/includes/classes/drivers/sqlorder.php
trunk/catalog/includes/languages/fr_FR/triggers/
trunk/catalog/includes/languages/fr_FR/triggers/cart_totaux.txt
trunk/catalog/includes/triggers/cart_line.inc
trunk/catalog/includes/triggers/cart_totaux.inc
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/generic/lazyload/includes_header.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/generic/lazyload/lib/
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/generic/slider/images/
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/generic/slider/inc/
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/generic/slider/includes_header.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/product/slimbox/inc/
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/product/slimbox/includes_header.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/product/uicoretabs/includes_header.php
Removed Paths:
-------------
trunk/catalog/admin/includes/functions/lib.banner_manager.php
trunk/catalog/admin/includes/functions/lib.banner_statistics.php
trunk/catalog/content.php
trunk/catalog/includes/triggers/shopping_cart.inc
Added: trunk/catalog/admin/includes/classes/drivers/sqladminmenu.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqladminmenu.php (rev 0)
+++ trunk/catalog/admin/includes/classes/drivers/sqladminmenu.php 2011-10-20 20:50:22 UTC (rev 3836)
@@ -0,0 +1,251 @@
+<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 22/09/11, 20:11
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class sqladminmenu
+ @brief Manage delete/update/insert in table admin groupe
+
+TODO :
+
+ EN cours de dev
+
+
+CREATE TABLE IF NOT EXISTS `osc_admin_m_menu` (
+ `rowid` int(11) NOT NULL AUTO_INCREMENT,
+ `admin_url` varchar(128) NOT NULL COMMENT 'fichier, avec get',
+ `sort_order` int(11) NOT NULL,
+ `parent_id` int(11) NOT NULL,
+ PRIMARY KEY (`rowid`),
+ UNIQUE KEY `admin_files_name` (`admin_url`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=115 ;
+
+-- --------------------------------------------------------
+
+--
+-- Structure de la table `osc_admin_m_menu_description`
+--
+
+CREATE TABLE IF NOT EXISTS `osc_admin_m_menu_description` (
+ `rowid` int(11) NOT NULL,
+ `language_id` int(11) NOT NULL,
+ `title` varchar(250) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+-- --------------------------------------------------------
+
+--
+-- Structure de la table `osc_admin_m_menu_to_right`
+--
+
+CREATE TABLE IF NOT EXISTS `osc_admin_m_menu_to_right` (
+ `menu_id` int(11) DEFAULT NULL,
+ `type_id` int(1) NOT NULL COMMENT '0 group / 1 user',
+ `id_ref` int(11) DEFAULT NULL,
+ UNIQUE KEY `menuusergroup` (`menu_id`,`type_id`,`id_ref`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+*/
+
+
+
+
+class sqladminmenu
+ implements ModSqlDataDriver{
+ /**
+ @var object childs module class
+ */
+ public static $modules;
+ /**
+ @var current ressource class
+ */
+ protected static $_instance;
+ /**
+ @var string error detail
+ */
+ public static $error = false;
+
+ /**
+ @brief constructor
+ no direct call, but is auto call by static public method
+ This method init Childs modules class
+ */
+ protected function __construct(){
+ self::$modules=new AcaFactory('adminuser'/*,'MODULE_ACACAT_INSTALLED_BO'*/);
+ }
+
+ /**
+ @brief for call construct class in singletown
+ @return current instance
+ */
+ public static function getInstance() {
+ if(self::$_instance == null) self::$_instance = new self();
+ return self::$_instance;
+ }
+
+ /**
+ @brief create new ligne in table configuration
+ */
+ public static function create($option){
+ self::getInstance();
+
+ if(isset($option['admin_url'])) $sql_data_array['admin_url'] = $option['admin_url'];
+ if(isset($option['sort_order'])) $sql_data_array['sort_order'] = $option['sort_order'];
+ if(isset($option['parent_id'])) $sql_data_array['parent_id'] = $option['parent_id'];
+
+ $res=tep_db_perform(TABLE_ADMIN_MENU, $sql_data_array);
+
+ if(!$res)
+ return $res;
+ else
+ return $res->__get('insertId');
+ }
+
+ /**
+ @brief update ligne in table configuration
+ */
+ public static function update($option){
+ self::getInstance();
+
+ if(!isset($option['id']) ){
+ self::$error= 'no id';
+ return false;
+ }else
+ $id = (int)$option['id'];
+
+ if(isset($option['rowid'])) $sql_data_array['rowid'] = $id;
+ if(isset($option['admin_url'])) $sql_data_array['admin_url'] = $option['admin_url'];
+ if(isset($option['sort_order'])) $sql_data_array['sort_order'] = $option['sort_order'];
+ if(isset($option['parent_id'])) $sql_data_array['parent_id'] = $option['parent_id'];
+
+
+ $res=tep_db_perform(TABLE_ADMIN_MENU, $sql_data_array, 'update' , substr($where,3) );
+
+ return $res;
+ }
+
+
+
+ /**
+ @brief load ligne in table configuration
+ @param option array
+ id => row id int (configuration_id)
+ key => string key (configuration_key)
+ group_id => group_id int (configuration_group_id)
+ @param $shortkey use cleankey for return short key
+ @return
+
+ object(stdClass)[13]
+ public 'id' => string '1' (length=1)
+
+ OR
+ array(
+ object(stdClass)[13]
+ ...
+ object(stdClass)[13]
+ ..
+ )
+
+ */
+ public static function fetch($option,$shortkey=false){
+ self::getInstance();
+ $DB=Database::getInstance();
+
+ $sql ="";
+ if(isset($option['id'])) $sql .="AND admin_id = '".(int)tep_db_input($option['id'])."' ";
+ if(isset($option['group_id'])) $sql .="AND a.admin_groups_id = '".(int)(string)tep_db_input($option['group_id'])."' ";
+
+
+
+ $sql="SELECT * FROM " . TABLE_ADMIN_MENU . " a ".
+ " LEFT JOIN " . TABLE_ADMIN_MENU_GROUPS . " g ON (a.admin_groups_id=g.admin_groups_id) ".
+ " WHERE ".substr($sql,3);
+
+ $res=$DB->query($sql);
+
+ $num = $res->__get('numRows');
+
+ if($num == 1){
+ $result=$res->fetchAssoc();
+ return ((!$shortkey)? $result : self::CleanKey($result));
+ }
+ elseif($num > 1){
+ $array=array();
+
+ foreach($res->fetchAllAssoc() as $result)
+ $array[]= ((!$shortkey)? $result : self::CleanKey($result));
+
+ return $array;
+ }
+
+ return false;
+ }
+
+ /**
+ @brief delete row
+ */
+ public static function delete($option){
+ self::getInstance();
+ $DB=Database::getInstance();
+
+ if(isset($option['id']))
+ $_id = (int)tep_db_input($option['id']) ;
+ else
+ return false;
+
+
+ // ACA START DELETE
+ self::$modules->delete($_id);
+
+
+// $DB->query("delete from " . TABLE_ADMIN_MENU_NOTIFICATION . " where rowid = '" . (int)$_id . "' AND notif_type = '1' ");
+
+ $DB->query("delete from " . TABLE_ADMIN_MENU . " where rowid = '" . (int)$_id . "'");
+
+
+ return true;
+ }
+
+
+ /**
+ @brief
+ @return array product empty
+ */
+ public static function Specimen(){
+ $par = array('rowid' => '',
+ 'admin_url' => '',
+ 'sort_order' => '',
+ 'parent_id' => '',
+ );
+
+ return self::CleanKey($par);
+ }
+
+
+ /**
+ @fn CleanKey()
+ @brief Clean string name key
+ */
+ private static function CleanKey($array){
+ self::getInstance();
+ $object= new stdclass();
+
+ foreach($array as $key=>$value){
+ if( strpos($key,'admin_') ===0)
+ $key=substr($key,6);
+
+
+ $object->$key = $value;
+ }
+
+ return $object;
+ }
+
+}
+
+
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/classes/drivers/sqlimage.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlimage.php (rev 0)
+++ trunk/catalog/admin/includes/classes/drivers/sqlimage.php 2011-10-20 20:50:22 UTC (rev 3836)
@@ -0,0 +1,229 @@
+<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 22/09/11, 20:11
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class manage link table configuration
+
+
+
+TODO :
+
+ EN cours de dev
+
+
+CREATE TABLE IF NOT EXISTS `osc_images` (
+ `rowid` int(11) NOT NULL,
+ `path` varchar(250) NOT NULL,
+ `file` varchar(100) NOT NULL,
+ `date_added` datetime NOT NULL,
+ `last_modified` datetime NOT NULL,
+ PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT ;
+
+
+
+CREATE TABLE IF NOT EXISTS `osc_images_used` (
+ `rowid` int(11) NOT NULL,
+ `width` float NOT NULL,
+ `height` float NOT NULL,
+ `watermark` varchar(100) NOT NULL
+) ENGINE=InnoDB DEFAULT ;
+
+*/
+
+
+
+
+class sqlimage
+ implements ModSqlDataDriver{
+
+ public static $modules;
+
+ protected static $_instance;
+
+ protected function __construct(){
+ self::$modules=new AcaFactory('adminuser'/*,'MODULE_ACACAT_INSTALLED_BO'*/);
+// self::$modules->set_image_handler();
+ }
+
+
+ public static function getInstance() {
+ if(self::$_instance == null) self::$_instance = new self();
+ return self::$_instance;
+ }
+
+
+ /**
+ @brief create new ligne in table configuration
+ */
+ public static function create($option){
+ self::getInstance();
+
+ if(!isset($option['path']))
+ return 'path';
+ if(!isset($option['file']))
+ return 'file';
+
+ $sql_data_array['path'] = 'now()';
+ $sql_data_array['file'] = 'now()';
+ $sql_data_array['date_added'] = 'now()';
+
+ $res=tep_db_perform(TABLE_IMAGES, $sql_data_array);
+
+ if(!$res)
+ return $res;
+ else
+ return $res->__get('insertId');
+ }
+
+ /**
+ @brief update ligne in table configuration
+ */
+ public static function update($option){
+ self::getInstance();
+
+ if(!isset($option['path']))
+ return 'path';
+ if(!isset($option['file']))
+ return 'file';
+ $where ='';
+ if(isset($option['id'])) $where .="AND rowid = '".(int)$option['id']."' ";
+
+
+
+ $sql_data_array['path'] = 'now()';
+ $sql_data_array['file'] = 'now()';
+ $sql_data_array['last_modified'] = 'now()';
+ $res=tep_db_perform(TABLE_IMAGES, $sql_data_array, 'update' , substr($where,3) );
+
+ return $res;
+ }
+
+ /**
+ @brief load ligne in table configuration
+ @param option array
+ id => row id int (configuration_id)
+ key => string key (configuration_key)
+ group_id => group_id int (configuration_group_id)
+ @param $shortkey use cleankey for return short key
+ @return
+
+ object(stdClass)[13]
+ public 'id' => string '1' (length=1)
+
+ OR
+ array(
+ object(stdClass)[13]
+ ...
+ object(stdClass)[13]
+ ..
+ )
+
+ */
+ public static function fetch($option,$shortkey=false){
+ self::getInstance();
+ $DB=Database::getInstance();
+
+ $sql ="";
+ if(isset($option['id'])) $sql .="AND rowid = '".(int)tep_db_input($option['id'])."' ";
+
+
+
+ $sql="SELECT * FROM " . TABLE_IMAGES . " a ".
+ " LEFT JOIN " . TABLE_IMAGES_USED . " g ON (a.rowid=g.rowid) ".
+ " WHERE ".substr($sql,3);
+
+ $res=$DB->query($sql);
+
+ $num = $res->__get('numRows');
+
+ if($num == 1){
+ $result=$res->fetchAssoc();
+ return ((!$shortkey)? $result : self::CleanKey($result));
+ }
+ elseif($num > 1){
+ $array=array();
+
+ foreach($res->fetchAllAssoc() as $result)
+ $array[]= ((!$shortkey)? $result : self::CleanKey($result));
+
+ return $array;
+ }
+
+ return false;
+ }
+
+ /**
+ @brief delete row
+ */
+ public static function delete($option){
+ self::getInstance();
+ $DB=Database::getInstance();
+
+ if(isset($option['id']))
+ $_id = (int)tep_db_input($option['id']) ;
+ else
+ return false;
+
+
+ // ACA START DELETE CATEGORY
+// self::$modules->delete($categories[$i]['id']);
+
+
+ $DB->query("delete from " . TABLE_IMAGES_USED . " where rowid = '" . (int)$_id . "' ");
+
+ $DB->query("delete from " . TABLE_IMAGES . " where rowid = '" . (int)$_id . "'");
+
+
+ return true;
+ }
+
+
+ /**
+ @brief
+ @return array product empty
+ */
+ public static function Specimen(){
+ $par = array('rowid' => '',
+ 'path' => '',
+ 'file' => '',
+ 'date_added' => '',
+ 'last_modified' => '',
+ 'width' => '',
+ 'height' => '',
+ 'watermark' => '',
+ );
+
+ return self::CleanKey($par);
+ }
+
+
+
+ /**
+ @fn CleanKey()
+ @brief Clean string name key
+ */
+ private static function CleanKey($array){
+ self::getInstance();
+ $object= new stdclass();
+
+ foreach($array as $key=>$value){
+ if( strpos($key,'admin_') ===0)
+ $key=substr($key,6);
+
+
+ $object->$key = $value;
+ }
+
+ return $object;
+ }
+
+}
+
+
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/classes/drivers/sqlorder.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlorder.php (rev 0)
+++ trunk/catalog/admin/includes/classes/drivers/sqlorder.php 2011-10-20 20:50:22 UTC (rev 3836)
@@ -0,0 +1,211 @@
+<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 22/09/11, 20:11
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class manage link table configuration
+*/
+
+
+
+
+class sqlorder
+ implements ModSqlDataDriver{
+
+
+ /**
+ @brief create new ligne in table configuration
+ */
+ public static function create($option){
+
+// if(!isset($option['key'])) return 'key';
+//
+// if(isset($option['id'])) $sql_data_array['configuration_id'] = $option['id'];
+// if(isset($option['title'])) $sql_data_array['configuration_title'] = $option['title'];
+// $sql_data_array['configuration_key'] = $option['key'];
+// if(isset($option['value'])) $sql_data_array['configuration_value'] = $option['value'];
+// if(isset($option['description'])) $sql_data_array['configuration_description'] = $option['description'];
+// if(isset($option['group_id'])) $sql_data_array['configuration_group_id'] = $option['group_id'];
+// if(isset($option['sort_order'])) $sql_data_array['sort_order'] = $option['sort_order'];
+// if(isset($option['modified'])) $sql_data_array['last_modified'] = $option['modified'];
+// $sql_data_array['date_added'] = (isset($option['added'])) ? $option['added'] : date('Y-m-d H:i:s');
+// if(isset($option['use'])) $sql_data_array['use'] = $option['use'];
+// if(isset($option['set'])) $sql_data_array['set'] = $option['set'];
+// $sql_data_array['configuration_type'] = (isset($option['type'])) ? $option['type'] : 2;
+//
+// $res=tep_db_perform(TABLE_CONFIGURATION, $sql_data_array);
+//
+// if(!$res)
+// return $res;
+// else
+// return $res->__get('insertId');
+ }
+
+ /**
+ @brief update ligne in table configuration
+ */
+ public static function update($option){
+
+// if(!isset($option['key']) && !isset($option['id'])) return 'key or id';
+//
+// $where ='';
+// if(isset($option['id'])) $where .="AND configuration_id = '".(int)$option['id']."' ";
+// if(isset($option['key'])) $where .="AND configuration_key = '".$option['key']."' ";
+//
+// if(isset($option['title'])) $sql_data_array['configuration_title'] = $option['title'];
+// if(isset($option['value'])) $sql_data_array['configuration_value'] = $option['value'];
+// if(isset($option['description'])) $sql_data_array['configuration_description'] = $option['description'];
+// if(isset($option['group_id'])) $sql_data_array['configuration_group_id'] = $option['group_id'];
+// if(isset($option['sort_order'])) $sql_data_array['sort_order'] = $option['sort_order'];
+// $sql_data_array['last_modified'] = (isset($option['modified'])) ? $option['modified'] : date('Y-m-d H:i:s');
+// if(isset($option['use'])) $sql_data_array['use'] = $option['use'];
+// if(isset($option['set'])) $sql_data_array['set'] = $option['set'];
+// $sql_data_array['configuration_type'] = (isset($option['type'])) ? $option['type'] : 2;
+//
+//
+//
+//
+//
+// $res=tep_db_perform(TABLE_CONFIGURATION, $sql_data_array, 'update' , substr($where,3) );
+
+ return $res;
+ }
+
+ /**
+ @brief load ligne in table configuration
+ @param option array
+ id => row id int (configuration_id)
+ key => string key (configuration_key)
+ group_id => group_id int (configuration_group_id)
+
+ @return
+
+ object(stdClass)[13]
+ public 'id' => string '1' (length=1)
+
+ OR
+ array(
+ object(stdClass)[13]
+ ...
+ object(stdClass)[13]
+ ..
+ )
+
+ */
+ public static function fetch($option,$shortkey=false){
+ $DB=Database::getInstance();
+
+// $sql ="";
+// if(isset($option['id'])) $sql .="AND configuration_id = '".(int)tep_db_input($option['id'])."' ";
+// if(isset($option['key'])) $sql .="AND configuration_key = '".(string)tep_db_input($option['key'])."' ";
+// if(isset($option['group_id'])) $sql .="AND configuration_group_id = '".(int)(string)tep_db_input($option['group_id'])."' ";
+//
+// $sql ="SELECT * FROM ".TABLE_ORDERS." WHERE ".substr($sql,3);
+//
+// $res=$DB->query($sql);
+//
+// $num = $res->__get('numRows');
+//
+// if($num == 1){
+// $result=$res->fetchAssoc();
+// return ((!$shortkey)? $result : self::CleanKey($result));
+// }
+// elseif($num > 1){
+// $array=array();
+//
+// foreach($res->fetchAllAssoc() as $result)
+// $array[]= ((!$shortkey)? $result : self::CleanKey($result));
+//
+// return $array;
+// }
+
+ return false;
+ }
+
+ /**
+ @brief delete row
+ */
+ public static function delete($option){
+ $DB=Database::getInstance();
+
+ $sql ="";
+ if(isset($option['id'])){
+ $_oID = tep_db_prepare_input($option['id']);
+ $sql .="AND orders_id = '".(int)tep_db_input($option['id'])."' ";
+ }
+ else
+ return false;
+// if(isset($option['key'])) $sql .="AND configuration_key = '".(string)tep_db_input($option['key'])."' ";
+// if(isset($option['group_id'])) $sql .="AND configuration_group_id = '".(int)(string)tep_db_input($option['group_id'])."' ";
+//
+// if(strlen($sql)==0)
+// return false;
+//
+
+ if(isset($option['cid']))
+ $cid = $option['cid']
+ else {
+
+ $check_status_query = tep_db_query("select customers_id from " . TABLE_ORDERS . " where orders_id = '" . (int)$_oID . "'");
+ $check = tep_db_fetch_array($check_status_query);
+ $cid = $check['customers_id'];
+ }
+
+
+ if(isset($option['restock']))
+
+// error_reporting(E_ALL);
+
+
+// global $products_modules;
+ if ($restock =='on'){
+ tep_products_restock($_oID,$cid);
+ }
+
+ $sql = substr($sql,3);
+
+ $DB->query("delete from " . TABLE_ORDERS_PRODUCTS . " where ".$sql);
+ $DB->query("delete from " . TABLE_ORDERS_PRODUCTS_ATTRIBUTES . " where ".$sql);
+ $DB->query("delete from " . TABLE_ORDERS_STATUS_HISTORY . " where ".$sql);
+ $DB->query("delete from " . TABLE_ORDERS_TOTAL . " where ".$sql);
+
+// $sql ="DELETE FROM ".TABLE_CONFIGURATION." WHERE ".;
+ $DB->query("delete from " . TABLE_ORDERS . " where ".$sql);
+// $res=$DB->query($sql);
+
+ return $res;
+ }
+
+ /**
+ @fn CleanKey()
+ @brief Clean string name key
+ */
+ private static function CleanKey($array){
+
+ $object= new stdclass();
+
+ foreach($array as $key=>$value){
+ if( strpos($key,'configuration_') ===0)
+ $key=substr($key,14);
+ elseif(strpos($key,'_function') >0)
+ $key=str_replace('_function','',$key);
+ elseif(strpos($key,'date_') ===0)
+ $key=str_replace('date_','',$key);
+ elseif(strpos($key,'last_') ===0)
+ $key=str_replace('last_','',$key);
+
+
+ $object->$key = $value;
+ }
+
+ return $object;
+ }
+
+}
+
+
+?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/database_tables.php
===================================================================
--- trunk/catalog/admin/includes/database_tables.php 2011-10-18 08:53:45 UTC (rev 3835)
+++ trunk/catalog/admin/includes/database_tables.php 2011-10-20 20:50:22 UTC (rev 3836)
@@ -57,6 +57,12 @@
define('TABLE_HOLDING_ORDERS_PRODUCTS_ATTRIBUTES', DB_TABLE_PREFIX . 'holding_orders_products_attributes');
define('TABLE_HOLDING_ORDERS_PRODUCTS_DOWNLOAD', DB_TABLE_PREFIX . 'holding_orders_products_download');
define('TABLE_HOLDING_ORDERS_STATUS_HISTORY', DB_TABLE_PREFIX . 'holding_orders_status_history');
+
+/// TOP Not Used for dev
+ define('TABLE_IMAGES', DB_TABLE_PREFIX . 'images');
+ define('TABLE_IMAGES_USED', DB_TABLE_PREFIX . 'images_used');
+/// END Not Used for dev
+
define('TABLE_LANGUAGES', DB_TABLE_PREFIX . 'languages');
define('TABLE_MANUFACTURERS', DB_TABLE_PREFIX . 'manufacturers');
define('TABLE_MANUFACTURERS_INFO', DB_TABLE_PREFIX . 'manufacturers_info');
Modified: trunk/catalog/admin/includes/functions/general.php
===================================================================
--- trunk/catalog/admin/includes/functions/general.php 2011-10-18 08:53:45 UTC (rev 3835)
+++ trunk/catalog/admin/includes/functions/general.php 2011-10-20 20:50:22 UTC (rev 3836)
@@ -626,25 +626,6 @@
-/**
- suppression de commandes
- @package oscss-major
- @author oscim
- @version 4.1
- @page held_orders.php,orders.php
-*/
-function tep_remove_order($order_id, $restock = false,$customers_id='') {
- error_reporting(E_ALL);
- global $products_modules;
- if ($restock =='on'){
- tep_products_restock($order_id,$customers_id);
- }
- tep_db_query("delete from " . TABLE_ORDERS . " where orders_id = '" . (int)$order_id . "'");
- tep_db_query("delete from " . TABLE_ORDERS_PRODUCTS . " where orders_id = '" . (int)$order_id . "'");
- tep_db_query("delete from " . TABLE_ORDERS_PRODUCTS_ATTRIBUTES . " where orders_id = '" . (int)$order_id . "'");
- tep_db_query("delete from " . TABLE_ORDERS_STATUS_HISTORY . " where orders_id = '" . (int)$order_id . "'");
- tep_db_query("delete from " . TABLE_ORDERS_TOTAL . " where orders_id = '" . (int)$order_id . "'");
-}
/**
@fn status_name($type , $status_id, $language_id = '')
@@ -674,23 +655,6 @@
/**
- TODO: Revoir le nom de cette fonction, et l'integer dans la class image
- @date 22/08/10, 01:30
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
-*/
-function tep_banner_image_extension() {
- if (function_exists('imagetypes')) {
- if (imagetypes() & IMG_PNG) return 'png';
- elseif (imagetypes() & IMG_JPG)return 'jpg';
- elseif (imagetypes() & IMG_GIF) return 'gif';
- }
- elseif (function_exists('imagecreatefrompng') && function_exists('imagepng')) return 'png';
- elseif (function_exists('imagecreatefromjpeg') && function_exists('imagejpeg')) return 'jpg';
- elseif (function_exists('imagecreatefromgif') && function_exists('imagegif')) return 'gif';
- return false;
-}
-
-/**
list templates directorys
@package oscss
@author OscssTeam
Deleted: trunk/catalog/admin/includes/functions/lib.banner_manager.php
===================================================================
--- trunk/catalog/admin/includes/functions/lib.banner_manager.php 2011-10-18 08:53:45 UTC (rev 3835)
+++ trunk/catalog/admin/includes/functions/lib.banner_manager.php 2011-10-20 20:50:22 UTC (rev 3836)
@@ -1,86 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 19/12/10, 19:49
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-
-/**
- Sets the status of a banner
- @package oscss-2 <www http://www.oscss.org>
- @author oscim <mail os...@os...> <www http://www.oscim.fr>
-*/
-function tep_set_banner_status($banners_id, $status) {
- if ($status == '1') {
- return tep_db_query("update " . TABLE_BANNERS . " set status = '1', expires_impressions = NULL, expires_date = NULL, date_status_change = NULL where banners_id = '" . $banners_id . "'");
- } elseif ($status == '0') {
- return tep_db_query("update " . TABLE_BANNERS . " set status = '0', date_status_change = now() where banners_id = '" . $banners_id . "'");
- } else {
- return -1;
- }
-}
-
-
-/**
- Banniere 3j infobox
- @package oscss-2 <www http://www.oscss.org>
- @author oscim <mail os...@os...> <www http://www.oscim.fr>
-*/
-function banner_infobox($banner_id,$banner_stats,$days){
-
- $banner_extension = tep_banner_image_extension();
-
- include(DIR_WS_CLASSES . 'phplot.php');
-
- $stats = array();
- $banner_stats_query = tep_db_query("select dayofmonth(banners_history_date) as name, banners_shown as value, banners_clicked as dvalue from " . TABLE_BANNERS_HISTORY . " where banners_id = '" . $banner_id . "' and to_days(now()) - to_days(banners_history_date) < " . $days . " order by banners_history_date");
- while ($banner_stats = tep_db_fetch_array($banner_stats_query)) {
- $stats[] = array($banner_stats['name'], $banner_stats['value'], $banner_stats['dvalue']);
- }
-
- if (sizeof($stats) < 1) $stats = array(array(date('j'), 0, 0));
-
- $img='images/graphs/banner_infobox-' . $banner_id . '.' . $banner_extension;
-
- $graph = new PHPlot(200, 220,$img );
-
- $graph->SetFileFormat($banner_extension);
- $graph->SetIsInline(1);
- $graph->SetPrintImage(0);
-
- $graph->draw_vert_ticks = 0;
- $graph->SetSkipBottomTick(1);
- $graph->SetDrawXDataLabels(0);
- $graph->SetDrawYGrid(0);
- $graph->SetPlotType('bars');
- //$graph->SetDrawDataLabels(1);
- $graph->SetLabelScalePosition(1);
- $graph->SetMarginsPixels(15,15,15,30);
-
- //! font , et taille
- $graph->SetTitleFontSize('3');
- $graph->SetTTFPath(DIR_FS_CATALOG.DIR_WS_COMMON_FONTS);
- $graph->SetDefaultTTFont('arial.ttf');
- $graph->SetFontTTF('x_label', 'arial.ttf','8');
- $graph->SetFontTTF('y_label', 'arial.ttf','8');
- $graph->SetFontTTF('legend', 'arial.ttf','10');
-
- $graph->SetTitle(utf8_decode(TEXT_BANNERS_LAST_3_DAYS));
-
- $graph->SetBackgroundColor('#f0f0ee');
- $graph->SetTransparentColor('#f0f0ee');
-
- $graph->SetDataValues($stats);
- $graph->SetDataColors(array('blue','red'),array('blue', 'red'));
-
- $graph->DrawGraph();
-
- $graph->PrintImage();
-
- return $img;
-}
-?>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/functions/lib.banner_statistics.php
===================================================================
--- trunk/catalog/admin/includes/functions/lib.banner_statistics.php 2011-10-18 08:53:45 UTC (rev 3835)
+++ trunk/catalog/admin/includes/functions/lib.banner_statistics.php 2011-10-20 20:50:22 UTC (rev 3836)
@@ -1,190 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 19/12/10, 19:49
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-
-
-
-/**
- Banniere banner_daily
- @package oscss-2 <www http://www.oscss.org>
- @author oscim <mail os...@os...> <www http://www.oscim.fr>
-*/
-function banner_daily($banner_id,$banner){
-
- $banner_extension = tep_banner_image_extension();
-
- include(DIR_WS_CLASSES . 'phplot.php');
-
- $year = (isset($_GET['year']) ? $_GET['year'] : date('Y'));
- $month = (isset($_GET['month']) ? $_GET['month'] : date('n'));
-
- $days = (date('t', mktime(0,0,0,$month))+1);
- $stats = array();
- for ($i=1; $i<$days; $i++) {
- $stats[] = array($i, '0', '0');
- }
-
- $banner_stats_query = tep_db_query("select dayofmonth(banners_history_date) as banner_day, banners_shown as value, banners_clicked as dvalue from " . TABLE_BANNERS_HISTORY . " where banners_id = '" . $banner_id . "' and month(banners_history_date) = '" . $month . "' and year(banners_history_date) = '" . $year . "'");
- while ($banner_stats = tep_db_fetch_array($banner_stats_query)) {
- $stats[($banner_stats['banner_day']-1)] = array($banner_stats['banner_day'], (($banner_stats['value']) ? $banner_stats['value'] : '0'), (($banner_stats['dvalue']) ? $banner_stats['dvalue'] : '0'));
- }
-
- $graph = new PHPlot(600, 350, 'images/graphs/banner_daily-' . $banner_id . '.' . $banner_extension);
-
- $graph->SetFileFormat($banner_extension);
- $graph->SetIsInline(1);
- $graph->SetPrintImage(0);
-
- $graph->SetSkipBottomTick(1);
- $graph->SetDrawYGrid(1);
- $graph->SetPrecisionY(0);
- $graph->SetPlotType('lines');
-
- //! font , et taille
- $graph->SetTitleFontSize('3');
- $graph->SetTTFPath(DIR_FS_CATALOG.DIR_WS_COMMON_FONTS);
- $graph->SetDefaultTTFont('arial.ttf');
- $graph->SetFontTTF('x_label', 'arial.ttf','8');
- $graph->SetFontTTF('y_label', 'arial.ttf','8');
- $graph->SetFontTTF('legend', 'arial.ttf','10');
-
- $graph->SetPlotBorderType('left');
- $graph->SetTitle(utf8_decode(sprintf(TEXT_BANNERS_DAILY_STATISTICS, $banner['banners_title'], tep_strftime('%B', mktime(0,0,0,$month)), $year)));
-
- $graph->SetBackgroundColor('white');
-// $graph->SetTransparentColor('white');
-
- $graph->SetVertTickPosition('plotleft');
- $graph->SetDataValues($stats);
- $graph->SetDataColors(array('blue','red'),array('blue', 'red'));
-
- $graph->DrawGraph();
-
- $graph->PrintImage();
-
- return $stats;
-}
-
-/**
- Banniere banner_daily
- @package oscss-2 <www http://www.oscss.org>
- @author oscim <mail os...@os...> <www http://www.oscim.fr>
-*/
-function banner_monthly($banner_id,$banner){
-
- $banner_extension = tep_banner_image_extension();
-
- include(DIR_WS_CLASSES . 'phplot.php');
-
- $year = (isset($_GET['year']) ? $_GET['year'] : date('Y'));
-
- $stats = array();
- for ($i=1; $i<13; $i++) {
- $stats[] = array(tep_strftime('%b', mktime(0,0,0,$i)), '0', '0');
- }
-
- $banner_stats_query = tep_db_query("select month(banners_history_date) as banner_month, sum(banners_shown) as value, sum(banners_clicked) as dvalue from " . TABLE_BANNERS_HISTORY . " where banners_id = '" . $banner_id . "' and year(banners_history_date) = '" . $year . "' group by banner_month");
- while ($banner_stats = tep_db_fetch_array($banner_stats_query)) {
- $stats[($banner_stats['banner_month']-1)] = array(tep_strftime('%b', mktime(0,0,0,$banner_stats['banner_month'])),
- (($banner_stats['value']) ? $banner_stats['value'] : '0'),
- (($banner_stats['dvalue']) ? $banner_stats['dvalue'] : '0'));
- }
-
- $graph = new PHPlot(600, 350, 'images/graphs/banner_monthly-' . $banner_id . '.' . $banner_extension);
-
- $graph->SetFileFormat($banner_extension);
- $graph->SetIsInline(1);
- $graph->SetPrintImage(0);
-
-// $graph->SetXLabelType('data', 2, '', '\xe2\x82\xac');
- //! font , et taille
- $graph->SetTitleFontSize('3');
- $graph->SetTTFPath(DIR_FS_CATALOG.DIR_WS_COMMON_FONTS);
- $graph->SetDefaultTTFont('arial.ttf');
- $graph->SetFontTTF('x_label', 'arial.ttf','8');
- $graph->SetFontTTF('y_label', 'arial.ttf','8');
- $graph->SetFontTTF('legend', 'arial.ttf','10');
-
- $graph->SetSkipBottomTick(1);
- $graph->SetDrawYGrid(1);
- $graph->SetPrecisionY(0);
- $graph->SetPlotType('lines');
-
- $graph->SetPlotBorderType('left');
- $graph->SetTitle(sprintf(TEXT_BANNERS_MONTHLY_STATISTICS, $banner['banners_title'], $year));
-
- $graph->SetBackgroundColor('white');
-// $graph->SetTransparentColor('white');
-
- $graph->SetVertTickPosition('plotleft');
- $graph->SetDataValues($stats);
- $graph->SetDataColors(array('blue','red'),array('blue', 'red'));
-
- $graph->DrawGraph();
-
- $graph->PrintImage();
-
- return $stats;
-}
-
-
-/**
- Banniere banner_daily
- @package oscss-2 <www http://www.oscss.org>
- @author oscim <mail os...@os...> <www http://www.oscim.fr>
-*/
-function banner_yearly($banner_id,$banner){
-
- $banner_extension = tep_banner_image_extension();
-
- include(DIR_WS_CLASSES . 'phplot.php');
-
- $stats = array(array('0', '0', '0'));
- $banner_stats_query = tep_db_query("select year(banners_history_date) as year, sum(banners_shown) as value, sum(banners_clicked) as dvalue from " . TABLE_BANNERS_HISTORY . " where banners_id = '" . $banner_id . "' group by year");
- while ($banner_stats = tep_db_fetch_array($banner_stats_query)) {
- $stats[] = array($banner_stats['year'], (($banner_stats['value']) ? $banner_stats['value'] : '0'), (($banner_stats['dvalue']) ? $banner_stats['dvalue'] : '0'));
- }
-
- $graph = new PHPlot(600, 350, 'images/graphs/banner_yearly-' . $banner_id . '.' . $banner_extension);
-
- $graph->SetFileFormat($banner_extension);
- $graph->SetIsInline(1);
- $graph->SetPrintImage(0);
-
- //! font , et taille
- $graph->SetTitleFontSize('3');
- $graph->SetTTFPath(DIR_FS_CATALOG.DIR_WS_COMMON_FONTS);
- $graph->SetDefaultTTFont('arial.ttf');
- $graph->SetFontTTF('x_label', 'arial.ttf','8');
- $graph->SetFontTTF('y_label', 'arial.ttf','8');
- $graph->SetFontTTF('legend', 'arial.ttf','10');
-
- $graph->SetSkipBottomTick(1);
- $graph->SetDrawYGrid(1);
- $graph->SetPrecisionY(0);
- $graph->SetPlotType('lines');
-
- $graph->SetPlotBorderType('left');
- $graph->SetTitle(sprintf(TEXT_BANNERS_YEARLY_STATISTICS, $banner['banners_title']));
-
- $graph->SetBackgroundColor('white');
-// $graph->SetTransparentColor('white');
-
- $graph->SetVertTickPosition('plotleft');
- $graph->SetDataValues($stats);
- $graph->SetDataColors(array('blue','red'),array('blue', 'red'));
-
- $graph->DrawGraph();
-
- $graph->PrintImage();
-
- return $stats;
-}
-?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/functions/lib.orders.php
===================================================================
--- trunk/catalog/admin/includes/functions/lib.orders.php 2011-10-18 08:53:45 UTC (rev 3835)
+++ trunk/catalog/admin/includes/functions/lib.orders.php 2011-10-20 20:50:22 UTC (rev 3836)
@@ -3,8 +3,8 @@
@licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 19/12/10, 19:49
+ @version 2.1.1
+ @date 20/10/11, 22:36
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -25,22 +25,7 @@
}
}
-/**
- @package oscss-major
- @author oscim <mail a...@os... /><web http://www.oscim.fr />
- Gestion suppression d'une order
-*/
-function delete_order($oID){
- $_oID = tep_db_prepare_input($oID);
- $check_status_query = tep_db_query("select customers_id from " . TABLE_ORDERS . " where orders_id = '" . (int)$_oID . "'");
- $check = tep_db_fetch_array($check_status_query);
-
- tep_remove_order($_oID, $_POST['restock'], $check['customers_id']);
-}
-
-
-
/**
Gestion des evolution du status d'une commandes
@package oscss-major
Modified: trunk/catalog/admin/includes/gabarit/header_tags.listing.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/header_tags.listing.gab 2011-10-18 08:53:45 UTC (rev 3835)
+++ trunk/catalog/admin/includes/gabarit/header_tags.listing.gab 2011-10-20 20:50:22 UTC (rev 3836)
@@ -3,14 +3,23 @@
@licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.0.9
- @date 19/08/10, 14:32
+ @version 2.1.1
+ @date 20/10/11, 21:53
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
?>
-<h3><?php echo __('heading title'); ?></h3>
+
+
+<h3 class="main-title"><?php echo __('header tags heading title'); ?></h3>
+
+<p class="main-intro">
+ <?php echo __('text intro for help'); ?>
+</p>
+
+
+
<div class="w_40 fleft">
<table class="dataTable" style="width:100%;">
<thead>
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/aca_header_tags.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/aca_header_tags.txt 2011-10-18 08:53:45 UTC (rev 3835)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/aca_header_tags.txt 2011-10-20 20:50:22 UTC (rev 3836)
@@ -3,14 +3,15 @@
@licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 23/03/11, 16:30
+ @version 2.1.1
+ @date 20/10/11, 22:14
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
/* Block admin */
$lang['text htc page title']="Titre :" ;
-$lang['heading title']="Référencement" ;
+$lang['header tags heading title']="Référencement" ;
+$lang['text intro for help']="Cette page vous permet de definir les informations necessaire au referencement des page en 'dur'. Vous pouvez ainsi y definir texte et meta. Les fichier correspondants sont situé dans le dossier content de l'espace public. Si vous ajouter des fichier dans ce repertoire, vous pourrez ainsi completer son référencement." ;
/*Products */
$lang['heading page']="Page" ;
Modified: trunk/catalog/admin/includes/languages/fr_FR/widget/brief_config.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/widget/brief_config.txt 2011-10-18 08:53:45 UTC (rev 3835)
+++ trunk/catalog/admin/includes/languages/fr_FR/widget/brief_config.txt 2011-10-20 20:50:22 UTC (rev 3836)
@@ -13,4 +13,12 @@
$lang['tools for generate ref order']="Générateur de référence de commande : " ;
$lang['use local']="Interne" ;
$lang['use externe']="Externe" ;
+
+$lang['config brief environement']="Environement general des liaisons avec outils tiers" ;
+$lang['config brief sendmail']="Gestion d'envoi des emails " ;
+
+$lang['config brief sendmail']="Gestion d'envoi des emails " ;
+$lang['email use sendmail system']="Le systeme utilse sendmail " ;
+$lang['use smtp externe %s']="Le systeme utilse un serveur smtp externe : %s " ;
+$lang['use smtp local']="Le systeme utilse le serveur smtp local " ;
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/modules/pages/orders.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/orders.php 2011-10-18 08:53:45 UTC (rev 3835)
+++ trunk/catalog/admin/includes/modules/pages/orders.php 2011-10-20 20:50:22 UTC (rev 3836)
@@ -3,8 +3,8 @@
@licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 15/05/11, 11:45
+ @version 2.1.1
+ @date 20/10/11, 22:42
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class orders
@@ -262,10 +262,17 @@
tep_redirect(tep_href_link(self::FILENAME, 'oID='.$oID.'&action=edit'));
break;
+ /**
+ @remarks Delete Orders
+ */
case 'deleteconfirm':
- $oID=(int)$_GET['oID'];
- delete_order($oID);
- tep_redirect(tep_href_link(self::FILENAME));
+
+ if(!sqlorder::delete(array('id'=>(int)$_GET['oID'])))
+ $messageStack->add_session(__('error order not delete'), 'warning');
+ else
+ $messageStack->add_session(__('success order delete'), 'success');
+
+ tep_redirect(tep_href_link(self::FILENAME));
break;
}
Modified: trunk/catalog/admin/includes/widget/brief_config.php
===================================================================
--- trunk/catalog/admin/includes/widget/brief_config.php 2011-10-18 08:53:45 UTC (rev 3835)
+++ trunk/catalog/admin/includes/widget/brief_config.php 2011-10-20 20:50:22 UTC (rev 3836)
@@ -21,8 +21,16 @@
</ul>
+ <?php if(EMAIL_TRANSPORT_L =='smtp'): ?>
<h4><?php echo __('config brief smtp') ?></h4>
-
-
-
+ <ul>
+ <li><?php echo __('Server use smtp')?> <strong><?php echo ((tep_cst_define('SMTP_MAIL_SERVER') == 'localhost')? __('use smtp local') : sprintf(__('use smtp externe %s'), SMTP_MAIL_SERVER) ) ?></strong></li>
+ <li><?php echo __('Server use smtp')?> <strong><?php echo ((tep_cst_define('SMTP_MAIL_SERVER') == 'localhost')? __('use smtp local') : sprintf(__('use smtp externe %s'), SMTP_MAIL_SERVER) ) ?></strong></li>
+ </ul>
+ <?php else: ?>
+ <h4><?php echo __('config brief sendmail') ?></h4>
+ <ul>
+ <li><?php echo __('email use sendmail system')?> </li>
+ </ul>
+ <?php endif; ?>
</div>
\ No newline at end of file
Modified: trunk/catalog/ajax_exe.php
===================================================================
--- trunk/catalog/ajax_exe.php 2011-10-18 08:53:45 UTC (rev 3835)
+++ trunk/catalog/ajax_exe.php 2011-10-20 20:50:22 UTC (rev 3836)
@@ -3,8 +3,8 @@
*\licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
*\portion code Copyright (c) 2002 osCommerce
*\package osCSS-2 <www http://www.oscss.org>
- *\version 2.1.0
- *\date 15/12/10, 22:12
+ @version 2.1.1
+ @date 20/10/11, 11:25
*\author oscim <mail aur...@os...> <www http://www.oscim.fr>
*\encode UTF-8
*\file ajax_exe.php
@@ -12,6 +12,7 @@
*/
require('includes/application_top.php');
+ $page->init(basename(__FILE__),$language);
$action=(isset($_GET['action'])? $_GET['action'] : (isset($_POST['action'])? $_POST['action'] : '')) ;
@@ -21,7 +22,12 @@
@brief code is part of execution call trigger by name $action
@param $action string
*/
-// echo $file= $page->getPathTemplate(). DIR_WS_TRIGGERS . $action . '.inc';
+ $page->post_init(false);
+
+ // cherche fichier langue specific
+ if(($path=page::fix_file(DIR_WS_LANGUAGES . $language . '/triggers/' . $action.'.txt',true)) !=false)
+ $page->pile_file_lang($path);
+
$file= $page->fix_file(DIR_WS_TRIGGERS . $action . '.inc');
if( ($r=page::TestFile($file)) && $r !=false ){
require_once($file);
@@ -33,7 +39,7 @@
@param $_GET['box'] string le nom de la boxe
*/
if(!isset($_GET['box'])) exit;
- $page->post_init();
+ $page->post_init(false);
$c=$page->oscss_boxes->_add($_GET['box'],'ajax','');
$box_left=$page->oscss_boxes->_call($_GET['box'],'ajax');
$boxe =$page->oscss_boxes->_return($_GET['box']);
Modified: trunk/catalog/common/classes/price.php
===================================================================
--- trunk/catalog/common/classes/price.php 2011-10-18 08:53:45 UTC (rev 3835)
+++ trunk/catalog/common/classes/price.php 2011-10-20 20:50:22 UTC (rev 3836)
@@ -3,8 +3,8 @@
\licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
\portion code Copyright (c) 2002 osCommerce
\package osCSS-2 <www http://www.oscss.org>
- \version 2.1.0
- \date 25/01/11, 11:33
+ @version 2.1.1
+ @date 20/10/11, 11:50
\author oscim <mail aur...@os...> <www http://www.oscim.fr>
ORDONEZ Olivier <mail in...@ol...> <www http://www.olivier-ordonez.fr>
\encode UTF-8
@@ -233,6 +233,9 @@
global $currency;
$euro_string = '';
+ // force number format
+ $number = (float)$number;
+
if (empty($currency_type))
$currency_type = (!empty($currency) ? $currency : (_cst_bool('USE_DEFAULT_LANGUAGE_CURRENCY') ? LANGUAGE_CURRENCY : DEFAULT_CURRENCY) ) ;
Modified: trunk/catalog/common/classes/shoppingCart.php
===================================================================
--- trunk/catalog/common/classes/shoppingCart.php 2011-10-18 08:53:45 UTC (rev 3835)
+++ trunk/catalog/common/classes/shoppingCart.php 2011-10-20 20:50:22 UTC (rev 3836)
@@ -1,12 +1,13 @@
<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
+ *\licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ *\portion code Copyright (c) 2002 osCommerce
+ *\package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 12/10/11, 13:42
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
+ @date 20/10/11, 11:12
+ *\author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ *\encode UTF-8
+ *\file
*\dir common/classes/
*\class shoppingCart
*/
@@ -402,11 +403,11 @@
if ($this->count_contents() > 0) {
reset($this->contents);
while (list($products_id, ) = each($this->contents)) {
- $virtual_products_result = tep_db_query("select products_type from ".TABLE_PRODUCTS." where products_id=".(int)$products_id);
+ $virtual_products_result = tep_db_query("select * from ".TABLE_PRODUCTS_VIRTUAL." where productsID=".(int)$products_id);
if (tep_db_num_rows($virtual_products_result) > 0) {
$res=tep_db_fetch_array($virtual_products_result);
- $array_content_type[] = (in_array($res['products_type'], explode(';',TYPE_VIRTUAL_PRODUCTS)))? 'virtual' : 'physical';
+ $array_content_type[] = (in_array($res['typeID'], explode(';',TYPE_VIRTUAL_PRODUCTS)))? 'virtual' : 'physical';
}
else $array_content_type[] = 'physical';
}
@@ -520,12 +521,11 @@
}
}
- $products[$i]['name'] = $products[$i]['name'] ;
-
+ $products[$i]['alert_stock'] = '';
//! Stock check
if( Stock::check_inline($products[$i]) ) {
$any_out_of_stock = 1;
- $products[$i]['name'] .= Stock::mark_inline();
+ $products[$i]['alert_stock'] = Stock::mark_inline();
}
if (isset($products[$i]['attributes']) && is_array($products[$i]['attributes'])) {
Deleted: trunk/catalog/content.php
===================================================================
--- trunk/catalog/content.php 2011-10-18 08:53:45 UTC (rev 3835)
+++ trunk/catalog/content.php 2011-10-20 20:50:22 UTC (rev 3836)
@@ -1,97 +0,0 @@
-<?php
-/**
- *\licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- *\portion code Copyright (c) 2002 osCommerce
- *\package osCSS-2 <www http://www.oscss.org>
- *\version 2.1.0
- *\date 31/10/10, 22:59
- *\author oscim <mail aur...@os...> <www http://www.oscim.fr>
- *\encode UTF-8
- *\file
- *\brief
- Page de gestion des contenus . prend en charge les elements modulaires
- *\details
- Si un _ID est pésent, charge alors les block de cet id, et force le contenu de la page vers cet _ID.
- cherche une class, nommé page._ID.php
-
- L'_ID est fournit par la page de la racine appelante (ex: contact.php de la racine defini un contact.php)
-
- *\param
- Option 1
- \a string _ID non du gabarit de prise en charge \
- \a string content id du contenu \
- Option 2
- \a string aca_action l'action aca, soit le non de la methode \
- \a string aca_mod le nom du module aca chargée \
- \a string aca_type le type du module chargée , soit le nom de la class mêre
-
- Option general
- @a boolean popup true/false block la partie ext des lamise en forme, conserve le block
-
- NOTE: Tous les fichier n'ayant aucun tratiement specifique complexe sont prise en charga par cette page
-*/
- require('includes/application_top.php');
-
- $p=(isset($_ID)) ? $_ID : (isset($_GET['_ID']) ? $_GET['_ID'] : basename(__FILE__));
- switch ($p){
- case 'template.php':
- require('templates/'.$template.'/includes/languages/' . $language . '/'.FILENAME_TEMPLATE);
- break;
- default:
- }
-
- $page->init($p,$language);
-
-
- switch ($p){
-// case 'template.php':
-// break;
- case 'form.php':
- case 'contact.php':
- $pp=substr($p, 0, -strlen($page->ext));
- $page->new_class($pp);
- $page->force_content($pp.'_'.$page->_call($pp,'the_form').$page->ext);
- if (isset($_GET['action'])) $page->_call($pp,'action');
- break;
- default:
- if (isset($_GET['content']) && !is_numeric($_GET['content'])){
- $pp=$_GET['content'];
- $page->new_class($pp);
- $page->force_content('page'.$page->ext);
- $page->force_gabarit('content');
- $page->_call($pp,'page');
- }
- /** Module aca */
- elseif (isset($_GET['aca_mod']) && !is_numeric($_GET['aca_mod']) && isset($_GET['aca_type']) && isset($_GET['aca_action'])){
- $module=$_GET['aca_mod'];
- $type=$_GET['aca_type'];
- $aca=$page->new_class($type);
- $aca_module=$page->_call($type,'ret_modules');
- /* cf content/page.php */
- $page->force_content('page'.$page->ext);
-
- if (isset($_GET['action']) ) {
- if ($aca_module[$module]->check_action($_GET['action']) ) {
- /** Exe == true */
- $aca_module[$module]->after_check_action($_GET['action']);
-// tep_redirect(tep_href_link(FILENAME_PRODUCT_INFO, tep_get_all_get_params(array('action'))));
- }
- }
-
- }
- }
-
-
-
-
- $page->post_init(false);
-
- require($page->path_gabarit());
-
- /** after_check_action */
-// if (isset($_GET['aca_mod']) && !is_numeric($_GET['aca_mod']) && isset($_GET['aca_type']) && isset($_GET['aca_action']))
-// $aca->after_check_action($module,$_GET['aca_action']);
-
-
- require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>
\ No newline at end of file
Modified: trunk/catalog/includes/classes/page.php
===================================================================
--- trunk/catalog/includes/classes/page.php 2011-10-18 08:53:45 UTC (rev 3835)
+++ trunk/catalog/includes/classes/page.php 2011-10-20 20:50:22 UTC (rev 3836)
@@ -350,7 +350,7 @@
$load = self::$load_theme;
foreach( tep_extrac_querystring($StringGet) as $k =>$v)
- $load->$k = $v;
+ if(!empty($k)) $load->$k = $v;
/* chargement des js en sortie*/
$this->javascript->cstr_header();
Modified: trunk/catalog/includes/content/shopping_cart.php
===================================================================
--- trunk/catalog/includes/content/shopping_cart.php 2011-10-18 08:53:45 UTC (rev 3835)
+++ trunk/catalog/includes/content/shopping_cart.php 2011-10-20 20:50:22 UTC (rev 3836)
@@ -1,101 +1,126 @@
<?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 28/11/10, 08:18
- *\author oscim <mail aur...@os...> <www http://www.oscim.fr>
- *\encode UTF-8
- *\group content
- *\file
- *\dir includes/content/
- *\brief cart custommers
+ @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.1
+ @date 20/10/11, 11:14
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
*/
+ $page->add_var_page('SMALL_IMAGE_WIDTH_CART', '30');
+ $page->add_var_page('SMALL_IMAGE_HEIGHT_CART', '30');
//! chargement cart fonction d'affichage
$DCart=$cart->init_draw();
+
?>
<div id="shoppingCart">
<?php $boxe =$page->oscss_boxes->_return('checkout_progressbar'); ?>
<?php echo unhtmlentities($boxe->content) ?>
- <h2 class="content title <?php echo $language ;?>"><?php echo HEADING_TITLE; ?></h2>
+ <?php echo tep_draw_form('cart_quantity', tep_href_link(FILENAME_SHOPPING_CART, 'action=update_product')); ?>
- <?php echo tep_draw_form('cart_quantity', tep_href_link(FILENAME_SHOPPING_CART, 'action=update_product')); ?>
- <?php if ($cart->count_contents() > 0) { ?>
- <div id="cartContent">
+
+ <?php if ($cart->count_contents() > 0): ?>
+
+ <table class="invoice invoiceDetails" cellspacing="0" >
+ <tr>
+ <th class="cart-header desc tleft"><?php echo TABLE_HEADING_PRODUCTS; ?></th>
+ <th class="cart-header puht tcenter"><?php echo HEADING_PRODUCTS_PRICE_U; ?></th>
+ <th class="cart-header qty tcenter"><?php echo HEADING_PRODUCTS_QTY; ?></th>
+ <th class="cart-header taxe tcenter"><?php echo HEADING_PRODUCTS_TAXE; ?></th>
+ <th class="cart-header tottaxe tright"><?php echo HEADING_PRODUCTS_TOT_TAXE ?></th>
+ <th class="cart-header totttc tright"><?php echo HEADING_PRODUCTS_TOT_TTC; ?></th>
+ </tr>
+
+
+
<?php echo $DCart->hidden ; ?>
- <fieldset>
- <legend> <?php echo MY_CART_LEGEND; ?> </legend>
- <?php foreach($DCart->products as $i=>$product):
-// $p=$cart->draw_cart('',$product);
- if( false ) echo $product;
- else { ?>
- <div id="ajaxcartProduct<?php echo $i; ?>" class="cartProduct <?php echo @$product['class']; ?>">
- <p class="cartDelete">
- <label for="cart_delete<?php echo $i ;?>" title="<?php echo TABLE_HEADING_REMOVE ; ?>" ><span><?php echo TABLE_HEADING_REMOVE ; ?></span></label>
- <?php if(_cst_bool('AJAX_CART_MODE')) echo tep_draw_checkbox_field('cart_delete[]','cart_delete'.$i, $product['id'], false, 'onclick="changecartdel('.$i.')"');
- else echo tep_draw_checkbox_field('cart_delete[]','cart_delete'.$i, $product['id']); ?>
- </p>
- <?php echo '<a class="tn" href="' . tep_href_link(FILENAME_PRODUCT_INFO, 'products_id=' . $product['id']) . '">' . tep_image(DIR_WS_IMAGES . $product['image'], $product['name'], $page->_conf_value('SMALL_IMAGE_WIDTH'), $page->_conf_value('SMALL_IMAGE_HEIGHT')) . '</a>' ; ?>
- <ul>
- <li class="cartName"><?php echo $product['name'] ;?></li>
- <li class="cartQty"> <?php
- if(_cst_bool('AJAX_CART_MODE')) echo MY_CART_QTY .' '. tep_draw_input_field('cart_quantity[]','cartQty'.$i, $product['quantity'], ' size="2" onkeyup="changecartqty('.$i.')"') . tep_draw_hidden_field('products_id[]', $product['id']) ;
- else echo MY_CART_QTY .' '. tep_draw_input_field('cart_quantity[]','cartQty', $product['quantity'], 'size="2" ') . tep_draw_hidden_field('products_id[]', $product['id']) ;
- ?> </li>
-<!-- <li id="ajaxcartPriceht<?php echo $i; ?>" class="cartPrice"> <?php //echo $currencies->display_price($product['final_price'], 1, $product['quantity']) ;?> </li> -->
- <li id="ajaxcartPrice<?php echo $i; ?>" class="cartPrice"> <?php echo $currencies->format($product['total_line_ttc']) ?> </li>
- </ul>
- </div>
- <?php } endforeach; ?>
- <div class="spacer"> </div>
- </fieldset>
- </div>
- <div id="TotCart" class="SubTotal">
- <ul>
- <li id="ajaxcartSubTotal" class="cartSubTotal">
- <ul>
- <?php foreach($cart->show_list_total() as $i=>$tot) { ?>
- <li class="cart SubTotal"><?php printf('<span>%s </span> %s' ,$tot->text, $currencies->format($tot->value)); ?></li>
- <?php } ?>
- </ul>
- </li>
+ <?php foreach($DCart->products as $i=>$product): ?>
+ <tr class="cart-line <?php echo ($i%2)?'pair':'impair'; ?>">
+ <td class="cart-line desc">
+ <?php echo $product['name'] ;?><span id="ajaxcarttext<?php echo $i; ?>"><?php echo $product['alert_stock'] ;?></span>
+ </td>
+ <td class="cart-line puht tcenter">
+ <?php echo $currencies->format($product['price']) ;?>
+ </td>
+ <td class="cart-line qty tcenter">
+ <input class="Bt button cart-line" type="button" value="+" >
+ <?php echo tep_draw_input_field('cart_quantity[]','cartQty_'.$i, $product['quantity'], 'class="CartQty" ');?>
+ <input class="Bt button cart-line" type="button" value="-" >
+
+ <?php echo tep_draw_hidden_field('products_id[]', $product['id']) ; ?>
+ </td>
+ <td class="cart-line taxe tcenter">
+ <?php echo tep_get_tax_rate($product['tax_class_id']) ;?> </span>
+ </td>
+ <td class="cart-line tottaxe tright">
+ <span id="ajaxcarttaxe<?php echo $i; ?>" class="cartPrice"> <?php echo ($product['final_price_ttc'] - $product['final_price']) ;?> </span>
+ </td>
+ <td class="cart-line totttc tright">
+ <span id="ajaxcartPrice<?php echo $i; ?>" class="cartPrice"> <?php echo $currencies->format(tep_add_tax($product['final_price'], tep_get_tax_rate($product['tax_class_id'])) *$product['quantity'] ) ;?> </span>
+ </td>
+ </tr>
+
+
+ <?php endforeach; ?>
+
+ </table>
+
+
+ <div class="spacer"> </div>
+
+
+
+ <div class="SubTotal">
+ <ul id="TotCart">
+ <?php foreach($cart->show_list_total() as $i=>$tot): ?>
+ <li><?php printf('<span>%s </span> %s' ,$tot->text, $currencies->format($tot->value)); ?></li>
+ <?php endforeach; ?>
<li id="ajaxcartWeight" class="cartWeight">
<?php echo '<span>' . SUB_TITLE_WEIGHT_TOTAL .'</span>' . $cart->show_weight().' '.UNIT_WEIGHT_NAME; ?>
</li>
</ul>
</div>
- <?php if ($DCart->any_out_of_stock == 1) {
- if (_cst_bool('STOCK_ALLOW_CHECKOUT')) { ?>
- <div class="warning"><?php echo OUT_OF_STOCK_CAN_CHECKOUT; ?></div>
- <?php } else { ?>
- <div class="warning"><?php echo OUT_OF_STOCK_CANT_CHECKOUT; ?></div>
- <?php }
- } ?>
- <p class="formBt">
- <?php echo '<a class="navBt" href="' . tep_href_link(FILENAME_SHOPPING_CART, 'action=resetCart') . '">' . IMAGE_BUTTON_RESET_CART . '</a>'; ?>
- <input class="submitBt" type="submit" value="<?php echo IMAGE_BUTTON_UPDATE_CART; ?>" />
- </p>
- <div class="navBt">
- <?php
- $back = sizeof($navigation->path)-2;
- if (isset($navigation->path[$back])) echo '<a class="navBt" href="' . tep_href_link($navigation->path[$back]['page'], tep_array_to_string($navigation->path[$back]['get'], array('action')), $navigation->path[$back]['mode']) . '">' . IMAGE_BUTTON_CONTINUE_SHOPPING . '</a>';
- else echo '<a class="navBt" href="javascript:history.go(-1)">' . IMA...
[truncated message content] |
|
From: <os...@us...> - 2011-10-18 08:53:57
|
Revision: 3835
http://oscss.svn.sourceforge.net/oscss/?rev=3835&view=rev
Author: oscim
Date: 2011-10-18 08:53:45 +0000 (Tue, 18 Oct 2011)
Log Message:
-----------
Ajout nouveau template pour la 2.1.1 dans l'installateur
suite et fin
Added Paths:
-----------
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/languages/en_EN/template.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/languages/fr_FR/template.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/modules/generic/cat_home.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/generic/lazyload/
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/generic/slider/
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/product/slimbox/
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/product/uicoretabs/
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/languages/en_EN/template.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/languages/en_EN/template.php (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/languages/en_EN/template.php 2011-10-18 08:53:45 UTC (rev 3835)
@@ -0,0 +1,63 @@
+<?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 16/09/10, 21:54
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+define('HEADING_TITLE', "osCSS Solution de boutique en ligne, 100% Open Source ");
+define('TEXT_INFORMATION', "
+<div>
+<h3>Engine osCSS</h3>
+
+This engine shop e-commerce and the work of Communities of, and is offered free as part of its license. This software is only possible through the work of a team of volunteers, and whose entire solution falls into this team. Join this team, bring your comments and support needs.
+<ul>
+ <li>* Retouver us on the <a href=\"http://forums.oscss.org\">forums</a></li>
+ <li>* Go to the <a href=\"http://wiki.oscss.org\">documentation</a></li>
+ <li>* Add <a href=\"http://plugins.oscss.org\">extensions</a></li>
+ <li>* Report your <a href=\"http://dev.oscss.org\">bugs</a></li>
+ <li>* Submit your <a href=\"http://folio.oscss.org\">sites</a></li>
+ <li>* Download the latest version of <a href=\"http://download.oscss.org\">osCSS</a></li>
+ <li>* Stay informed <a href=\"http://twitter.com/osCSS\">twitter</a></li>
+</ul>
+<h3>Free Template osCSS</h3>
+
+osCSS is an open source script of osCommerce provided by a team of web designers and programmers.
+
+Some templates are delivered free to give an overview of the availability of the template engine.
+
+Please abide by the terms and conditions of use.
+
+You can use our templates in any website publicly available under the terms and conditions of the Creative Commons license:
+
+Creative Commons License
+<h3>What you CAN DO:</h3>
+<ul>
+ <li> * - The templates are provided free of osCSS under this agreement, which takes into account the usage of our work but do not transfer ownership. The templates remain the property of their respective authors</li>
+ <li>* - You can use the templates of osCSS in any commercial project as many times as desired according to compliance with the terms and conditions</li>
+ <li> * -. All uses other than those mentioned above must be approved in writing by osCSS.</li>
+ <li> * - Unauthorized use will result in an immediate halt to these terms of use, and with it, your rights to use the work of osCSS.</li>
+ <li> * - You can modify and create derivative works osCSS templates specifying that the template is a version derived from a template osCSS.</li>
+ <li> * - You need a back link with credits osCSS (example Footer: Free Template by osCSS).</li>
+</ul>
+<h3>What you CAN NOT:</h3>
+<ul>
+ <li> * - You can not sell, rent osCSS templates or make available for download in their present form or modified form</li>
+ <li> * - You may not distribute the templates of osCSS online in a downloadable format or enable them to be distributed elsewhere on <a href=\"http://oscss.org\">osCSS</a></li>
+ <li> * - You can not embed the work of osCSS a logo, trademark or service mark</li>
+</ul>
+<h3>Copyright</h3>
+
+osCSS reserves the rights of ownership of works downloaded from the website osCSS. We reserve the right to change parts of the contract without notice.
+Features of this template.
+<ul>
+ <li> * This template uses many basic jquery plugin, please refer to the site of their respective authors</li>
+ <li> * This template is valid XHTML 1.0 Strict and CSS 2.1.</li>
+</ul>
+</div>
+");
+?>
\ No newline at end of file
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/languages/fr_FR/template.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/languages/fr_FR/template.php (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/languages/fr_FR/template.php 2011-10-18 08:53:45 UTC (rev 3835)
@@ -0,0 +1,65 @@
+<?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 16/09/10, 21:54
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+define('HEADING_TITLE', "osCSS Solution de boutique en ligne, 100% Open Source ");
+define('TEXT_INFORMATION', "
+<div>
+ <h3>Moteur osCSS</h3>
+ <p>Ce moteur de boutique e-commerce et l'oeuvre d'une commuanuté, et vous est proposé gratuitement, dans le cadre de sa licence. Ce logiciel n'est possible que par le travail d'une équipe de bénévole, et dont l'ensemble de la solution appartient à cette équipe. Rejoinez cette équipe, apportez vos remarques besoins et soutient.
+<ul>
+<li>Retouvez nous sur le <a href=\"http://forums.oscss.org\">forums</a></li>
+<li>Accedez à la <a href=\"http://wiki.oscss.org\">documentation</a></li>
+<li>Ajoutez des <a href=\"http://plugins.oscss.org\">extensions</a></li>
+<li>Reportez vos <a href=\"http://dev.oscss.org\">bugs</a></li>
+<li>Publiez vos <a href=\"http://folio.oscss.org\">sites</a></li>
+<li>Télécharger la nouvelle version d'<a href=\"http://download.oscss.org\">osCSS</a></li>
+<li>Tenez vous informé <a href=\"http://twitter.com/osCSS\">twitter</a></li>
+</ul>
+</p>
+
+
+ <h3>Template gratuit osCSS</h3>
+
+ <p>osCSS est un script open source dérivé d'osCommerce fourni par une équipe de concepteurs et programmeurs du Web.</p>
+<p>Certains templates sont livrés gratuitement pour donner un aperçu des disponibilités du moteur de templates.</p>
+<p><strong>Veuillez respecter les termes et conditions générales d'utilisation.</strong></p>
+ <p>Vous pouvez employer nos templates sous n'importe quel site Web publiquement accessible selon les termes et conditions générales du <a href=\"http://creativecommons.org/licenses/by-sa/2.0/fr/\" rel=\"license\">contrat Creative Commons</a> :</p>
+<p><a href=\"http://creativecommons.org/licenses/by-sa/2.0/fr/\" rel=\"license\">
+<img src=\"http://creativecommons.org/images/public/somerights20.png\" style=\"border-width: 0pt;\" alt=\"Creative Commons License\">
+</a>
+</p>
+<h3>Ce que vous POUVEZ FAIRE :</h3>
+<ul>
+ <li>- Les templates gratuit d'osCSS sont fournis en vertu de cet accord, qui tient compte de l'usage de nos travaux mais ne transfèrent pas la propriété. Les templates demeurent la propriété de leurs auteurs respectifs</li>
+ <li>- Vous pouvez employer les templates d'osCSS dans tout projet commercial autant de fois que souhaitée selon le respect des termes et conditions générales</li>
+ <li>-. Toutes les utilisations autres que celles mentionnées ci-dessus doivent être approuvées par osCSS par écrit.</li>
+ <li>- L'utilisation non autorisée aura comme conséquence l'arrêt immédiat de ces conditions d'utilisation, et avec elle, vos droits d'employer les travaux d'osCSS.</li>
+ <li>- Vous pouvez modifier et créer des travaux dérivés de templates osCSS en précisant bien que le template est une version dérivé d'un template osCSS.</li>
+ <li>- Vous devez mettre un lien retour avec les crédits à osCSS <i>(exemple en pied de page : <a href=\"http://www.oscss.org\">Template gratuit par osCSS</a>)</i>.</li>
+</ul>
+<h3>Ce que vous NE POUVEZ PAS FAIRE :</h3>
+<ul>
+ <li>- Vous ne pouvez pas vendre, louer les templates de osCSS ou les mettre à disposition en téléchargement sous leur forme actuelle ou sous une forme modifiée </li>
+ <li>- Vous ne pouvez pas distribuer les templates d'osCSS en ligne dans un format téléchargeable ou leur permettre d'être distribué ailleurs que sur <a href=\"http://www.oscss.org\">osCSS</a></li>
+ <li>- Vous ne pouvez pas incorporer les travaux d'osCSS à un logo, à une marque déposée ou à une marque de service</li>
+</ul>
+<h3>Copyright</h3>
+<p>
+ osCSS se réserve les droits de propriété des travaux téléchargés sur le site Web osCSS. Nous nous réservons le droit de changer des parties de ce contrat sans communication préalable.
+</p>
+<h3>Fonctionnalités du template.</h3>
+<ul>
+<li>Ce template utilise de nombreux plugin base sur jquery, veuillez vous referer au site de leurs auteurs respectifs</li>
+<li>Ce template est valide <a title=\"validator W3C\" href=\"http://validator.w3.org/check?uri=referer\">XHTML 1.0 strict</a> et <a title=\"validate css\" href=\"http://jigsaw.w3.org/css-validator/check/referer\">CSS 2.1.</a></li></ul>
+</div>
+
+");
+?>
\ No newline at end of file
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/modules/generic/cat_home.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/modules/generic/cat_home.php (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/modules/generic/cat_home.php 2011-10-18 08:53:45 UTC (rev 3835)
@@ -0,0 +1,121 @@
+<?php
+/**
+ @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.0.9
+ @date 11/09/10, 10:53
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+class cat_home
+ implements InterfaceModule {
+
+ /**
+ Id cat home
+ */
+ const CAT_HOME_ID = 3;
+ /**
+ Cesure nbr carat dans les cms
+ */
+ const CMS_CESURE = 50;
+
+ public $code;
+ public $title;
+ public $description;
+ public $sort_order;
+ public $enabled;
+
+ public static $list;
+
+ function __construct() {
+ $this->code =__CLASS__;
+ $this->title = __('module cat_home text title');
+ $this->description = __('module cat_home text description') ;
+ $this->sort_order = (defined('MODULE_HOME_FEATURED_SORT_ORDER')) ? MODULE_HOME_FEATURED_SORT_ORDER : 0 ;
+ $this->enabled = true;
+
+ global $page;
+ if(!is_object($page)) return false;
+ $this->language = $page->the_var('language');
+ $this->languages_id = $page->the_var('languages_id');
+
+
+
+ }
+
+ /**
+ Object db _value
+ */
+ public function obj_db_values(){
+ $res=$this->load_db_values();
+ while ($featured_products = tep_db_fetch_array($res)) $re[]=new objectInfo($featured_products);
+ if(is_array($re)) return $re;
+ else return array();
+ }
+
+
+ /**
+ */
+ public function load_db_values($_id=''){
+ global $page;
+ $DB=Database::getInstance();
+
+ $listing_sql = " select distinct p.*, pd.products_name, pd.products_chapo from " . TABLE_CATEGORIES . " cat,".TABLE_V_PRODUCTS." p LEFT JOIN " . TABLE_PRODUCTS_DESCRIPTION . " pd on pd.products_id = p.products_id LEFT JOIN " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c on p2c.products_id= p.products_id where cat.categories_id=p2c.categories_id and cat.categories_status='1'and pd.language_id = '" . (int)$this->languages_id . "' and p2c.categories_id = '" . (int)self::CAT_HOME_ID . "' order by products_date_added limit 5";
+ $pr=$DB->query($listing_sql);
+ $product=$pr->fetchAllAssoc();
+
+ $listing_sql = "select c.content_id,ctc.categories_id, content_name,content_title,content_text, c.date_added, c.last_modified, content_status, ctc.categories_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)$this->languages_id . "' and cat.categories_id = '" . (int)self::CAT_HOME_ID . "' order by date_added limit 5";
+ $ct=$DB->query($listing_sql);
+ $content=$ct->fetchAllAssoc();
+
+// print_r($content);
+ foreach($product as $item)
+ $res[]=new objectInfo($item);
+
+ foreach($content as $item){
+// print_r($item);
+// if( ($s=strpos($item['content_text'],'<!-- pagebreak -->')) >0 ) $item['content_text']=substr($item['content_text'], 0, $s-self::CMS_CESURE );
+ $res[]=new objectInfo($item);
+ }
+ srand(time());
+ shuffle($res);
+
+ self::$list= $res;
+ }
+
+/*
+ Function ACA option
+*/
+ /**
+
+ @param
+ @a int l'ID de la categorie en cours
+ */
+ public function display_view($categorie_id=''){
+ $this->load_db_values();
+ $v['title']=__('heading cat_home text title');
+ $v['content']=tep_output_string_protected(tep_get_include_contents(__CLASS__.'.'.__FUNCTION__), false, true);
+ return new objectInfo($v);
+ }
+
+
+
+
+/** implements InterfaceModule depend */
+ public function check() {
+ }
+
+ public function install() {
+ }
+
+ public function remove() {
+ }
+
+ public function keys() {
+ return array( );
+ }
+
+}
+
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-10-18 08:52:32
|
Revision: 3834
http://oscss.svn.sourceforge.net/oscss/?rev=3834&view=rev
Author: oscim
Date: 2011-10-18 08:52:20 +0000 (Tue, 18 Oct 2011)
Log Message:
-----------
Ajout nouveau template pour la 2.1.1 dans l'installateur
Added Paths:
-----------
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/boxes/categories.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/.htaccess
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/404.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/account.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/account_edit.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/account_history.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/account_history_info.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/account_newsletters.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/account_password.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/advanced_search.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/checkout_confirmation.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/checkout_payment.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/checkout_payment_address.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/checkout_shipping.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/checkout_shipping_address.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/checkout_success.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/contact_us.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/content.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/cookie_usage.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/create_account.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/create_account_success.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/customers.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/home.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/index.html
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/index.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/index_listing.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/index_products.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/info_shopping_cart.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/listing_best_sellers.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/listing_products_new.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/listing_small_price.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/listing_specials.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/login.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/logoff.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/new_sent_email_confirm.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/page.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/password_forgotten.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/product_info.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/search_help.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/shopping_cart.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/sitemap.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/ssl_check.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/tell_a_friend.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/template.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/wishlist.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/address_book.display_view.gab
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/address_book.form_delete.gab
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/address_book.form_edit.gab
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/address_book_details.gab
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/box.cart.gab
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/box.cart.short.gab
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/box.categories.gab
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/box.checkout_progressbar.gab
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/box.currencies.gab
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/box.languages.gab
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/box.manufacturers.gab
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/box.menu.gab
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/box.recently_viewed.gab
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/box.search_suggest.gab
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/box.specials.gab
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/box.tags.gab
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/box.whats_new.gab
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/cat_home.display_view.gab
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/desc_base.display_view.gab
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/index.html
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/languages/en_EN/
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/languages/en_EN.txt
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/languages/fr_FR/
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/languages/fr_FR.txt
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/modules/generic/
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/generic/
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/product/
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/boxes/categories.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/boxes/categories.php (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/boxes/categories.php 2011-10-18 08:52:20 UTC (rev 3834)
@@ -0,0 +1,44 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @subpackage 2cShopHtml5Oscim
+ @package osCSS-2 <www http://www.oscss.org>
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ *\group boxes
+ *\file includes/boxes/categories.php
+ *\brief display process calcul category, and retrun array
+*/
+require_once(DIR_WS_CLASSES . 'category_tree.php');
+$CategoryTree = new category_tree;
+$osCSS_Cache=new osCSS_Cache;
+$cPath=$page->the_var('cPath');
+$current_category_id=$page->the_var('current_category_id');
+$language=$page->the_var('language');
+$tableau='';
+global $tableau, $subcat;
+
+
+$CategoryTree->setMaximumLevel(1);
+
+if(strpos($cPath,'_') > 0)
+ $CCCAT = substr($cPath,0, strpos($cPath,'_'));
+else
+ $CCCAT = $cPath;
+
+$subcat= $CategoryTree->getTree($CCCAT);
+
+// if (($osCSS_Cache->read('categoriesBox-' . $language .'-cpath-'.$cPath.'-type', 720) === false) ) {
+
+ $CategoryTree->setSpacerString('', 2);
+ $CategoryTree->setCategoryProductCountString('(',')');
+ $CategoryTree->setMaximumLevel(1);
+ $tableau = $CategoryTree->getTree(0) ;
+
+ $s=tep_get_include_contents('box.categories');
+
+// $osCSS_Cache->writeBuffer($s);
+// }
+// else $s= $osCSS_Cache->getCache();
+ $array=array('title'=>__('categories menu'),'content'=>tep_output_string_protected($s,false,true));
+?>
\ No newline at end of file
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/.htaccess
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/.htaccess (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/.htaccess 2011-10-18 08:52:20 UTC (rev 3834)
@@ -0,0 +1,22 @@
+# $Id: .htaccess,v 1.4 2001/04/22 20:30:03 dwatkins Exp $
+#
+# This is used with Apache WebServers
+# The following blocks direct HTTP requests in this directory recursively
+#
+# For this to work, you must include the parameter 'Limit' to the AllowOverride configuration
+#
+# Example:
+#
+#<Directory "/usr/local/apache/htdocs">
+# AllowOverride Limit
+#
+# 'All' with also work. (This configuration is in your apache/conf/httpd.conf file)
+#
+# This does not affect PHP include/require functions
+#
+# Example: http://server/catalog/includes/application_top.php will not work
+
+<Files *.php>
+Order Deny,Allow
+Deny from all
+</Files>
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/404.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/404.php (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/404.php 2011-10-18 08:52:20 UTC (rev 3834)
@@ -0,0 +1,33 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @subpackage 2cShopHtml5Oscim
+ @package osCSS-2 <www http://www.oscss.org>
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @date 16/09/10, 21:54
+ @encode UTF-8
+* \dir includes/content/
+* \page 404
+* \brief 404 no found / non trouvé
+* \section Gestion des erreurs d'url
+* Cette page est visible si l'adresse fournis est introuvable \n
+* Elle peut se declencher dans plusieur cas, les plus ourant sont : \n
+* \li Produit avec statut inactif, hors stock (et boutique mode non stocké non visible) ou supprimé
+* \li categorie caché, non visible ou supprimé
+*
+*/
+?>
+
+<header>
+ <h1 class="content title <?php echo $language ;?>"><?php echo HEADING_TITLE; ?></h1>
+</header>
+
+<div id="page404">
+
+ <div class="textMain"><?php echo TEXT_MAIN ; ?></div>
+
+
+ <div class="banner_main">
+ <?php $page->oscss_modules->_add(FILENAME_NEW_PRODUCTS,'center'); ?>
+ </div>
+</div>
\ No newline at end of file
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/account.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/account.php (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/account.php 2011-10-18 08:52:20 UTC (rev 3834)
@@ -0,0 +1,84 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @subpackage 2cShopHtml5Oscim
+ @package osCSS-2 <www http://www.oscss.org>
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @date 16/09/10, 21:54
+ @encode UTF-8
+*/
+
+ $module=$page->_call('account','ret_modules');
+ $i=0;
+ $orders_query = tep_db_query("select o.orders_id,o.orders_prefix, o.date_purchased, o.delivery_name, o.delivery_country, o.billing_name, o.billing_country, ot.text as order_total, s.status_name as orders_status_name from " . TABLE_ORDERS . " o, " . TABLE_ORDERS_TOTAL . " ot, " . TABLE_STATUS . " s where o.customers_id = '" . (int)$customer_id . "' and o.orders_id = ot.orders_id and ot.class = 'ot_total' and o.orders_status = s.status_id and s.language_id = '" . (int)$languages_id . "' AND status_type='orders' ORDER BY orders_id desc limit 1");
+
+?>
+
+
+<header>
+ <h1 class="content title <?php echo $language ;?>"><?php echo HEADING_TITLE; ?></h1>
+</header>
+
+
+
+<div id="account">
+
+ <?php /** Retour d'erreur checkup sur la boutique */ $page->messageStack->_draw('account'); ?>
+
+
+ <?php if ($cart->count_contents() > 0) { ?>
+ <div class="contentBox news_info">
+ <h3><?php echo OVERVIEW_TITLE; ?></h3>
+ <ul>
+ <li><?php echo '<a href="' . tep_href_link(FILENAME_SHOPPING_CART) . '">' . SHOPPING_CART_ACTIF . '</a>'; ?></li>
+ </ul>
+ </div>
+ <?php } ?>
+
+
+ <?php while ($orders = tep_db_fetch_array($orders_query)) {
+ if (tep_count_customer_orders() > 0) { ?>
+ <div class="contentBox overview">
+ <h4><?php echo OVERVIEW_PREVIOUS_ORDERS ; ?></h4>
+ <ul>
+ <li><?php echo '#' . $orders['orders_prefix'].$orders['orders_id']; ?> <?php echo tep_date_short($orders['date_purchased']); ?> <?php echo $orders['order_total']; ?> <?php echo '<a class="navBtMini" href="' . tep_href_link(FILENAME_ACCOUNT, 'action=history_info&order_id=' . $orders['orders_id'], 'SSL') . '">' . SMALL_IMAGE_BUTTON_VIEW . '</a>'; ?></li>
+ <li><?php echo $orders['orders_status_name']; ?></li>
+ <li><?php if (tep_not_null($orders['delivery_name'])) echo tep_output_string_protected($orders['delivery_name']) . ', ' . $orders['delivery_country'];
+ else echo tep_output_string_protected($orders['billing_name']) . ', ' . $orders['billing_country']; ?></li>
+ </ul>
+ <?php } ?>
+ <p><?php echo '<a class="navBtMini" href="' . tep_href_link(FILENAME_ACCOUNT, 'action=history', 'SSL') . '">' . OVERVIEW_SHOW_ALL_ORDERS . '</a>'; ?></p>
+ </div>
+ <?php } ?>
+
+ <div class="contentBox myAccount">
+ <h3><?php echo MY_ACCOUNT_TITLE; ?></h3>
+ <ul>
+ <li><?php echo '<a href="' . tep_href_link(FILENAME_ACCOUNT, 'action=edit', 'SSL') . '">' . MY_ACCOUNT_INFORMATION . '</a>'; ?></li>
+ <li><?php echo '<a href="' . tep_href_link(FILENAME_ACCOUNT, 'action=password', 'SSL') . '">' . MY_ACCOUNT_PASSWORD . '</a>'; ?></li>
+ <?php /** ACA module */ foreach($module as $k){ if (method_exists($k, 'display_view_min_listMyAccount')) foreach($k->display_view_min_listMyAccount($customer_id) as $kt=>$vt){ $i++; echo '<li><a href="'.$vt->href_link.'">'.$vt->title.'</a> </li>'; } } ?>
+ </ul>
+ </div>
+
+ <div class="contentBox myOrders">
+ <h3><?php echo MY_ORDERS_TITLE; ?></h3>
+ <ul>
+ <li><?php echo '<a href="' . tep_href_link(FILENAME_ACCOUNT, 'action=history', 'SSL') . '">' . MY_ORDERS_VIEW . '</a>'; ?></li>
+ </ul>
+ </div>
+
+ <div class="contentBox myEmail">
+ <h3><?php echo EMAIL_NOTIFICATIONS_TITLE; ?></h3>
+ <ul>
+ <li><?php echo '<a href="' . tep_href_link(FILENAME_ACCOUNT, 'action=newsletters', 'SSL') . '">' . EMAIL_NOTIFICATIONS_NEWSLETTERS . '</a>'; ?></li>
+ </ul>
+ </div>
+
+ <div class="contentBox myEmail">
+ <h3><?php echo HEADER_TITLE_LOGOFF; ?></h3>
+ <ul>
+ <li><?php echo '<a href="' . tep_href_link(FILENAME_LOGOFF, '', 'NONSSL') . '">' .TEXT_LOGOFF . '</a>'; ?></li>
+ </ul>
+ </div>
+
+</div>
\ No newline at end of file
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/account_edit.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/account_edit.php (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/account_edit.php 2011-10-18 08:52:20 UTC (rev 3834)
@@ -0,0 +1,100 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @subpackage 2cShopHtml5Oscim
+ @package osCSS-2 <www http://www.oscss.org>
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @date 16/09/10, 21:54
+ @encode UTF-8
+*/
+$account = $page->_call('customer','the_customer');
+?>
+
+<header>
+ <h1 class="content title <?php echo $language ;?>"><?php echo HEADING_TITLE_7; ?></h1>
+</header>
+
+
+<div id="accountEdit">
+ <?php $page->messageStack->_draw('account_edit');?>
+
+
+ <p class="notice"><?php echo FORM_REQUIRED_INFORMATION; ?></p>
+
+ <?php echo tep_draw_form('account_edit', tep_href_link(FILENAME_ACCOUNT, 'action=edit', 'SSL'), 'post', 'onsubmit="return check_form(account_edit);"') ;?>
+
+ <fieldset class="account">
+ <legend><?php echo MY_ACCOUNT_TITLE; ?></legend>
+
+ <?php if ( $page->_draw_in_page('ACCOUNT_GENDER')) {
+ $male = ($account['customers_gender'] == 'm' ? true : false);
+ $female = ($account['customers_gender'] == 'f'? true : false);
+ $mlle = ($account['customers_gender'] == 'l' ? true : false);
+ ?>
+ <p class="gender">
+ <label><?php echo ENTRY_GENDER; ?></label>
+ <?php echo tep_draw_radio_field('gender','male', 'm', $male) ;?>
+ <?php echo MALE ;?>
+ <?php echo tep_draw_radio_field('gender','female', 'f', $female) ;?>
+ <?php echo FEMALE ;?>
+ <?php echo tep_draw_radio_field('gender','mlle', 'l', $mlle) ;?>
+ <?php echo MLLE ;?>
+ <?php echo (tep_not_null(ENTRY_GENDER_TEXT) ? '<span class="inputRequirement">' . ENTRY_GENDER_TEXT . '</span>': ''); ?>
+ </p>
+ <?php } ?>
+
+ <p>
+ <label for="accountEditFirstname"><?php echo ENTRY_FIRST_NAME; ?></label>
+ <?php echo tep_draw_input_field('firstname','accountEditFirstname', $account['customers_firstname']) . ' ' . (tep_not_null(ENTRY_FIRST_NAME_TEXT) ? '<span class="inputRequirement">' . ENTRY_FIRST_NAME_TEXT . '</span>': ''); ?>
+ </p>
+
+ <p>
+ <label for="accountEditLastname"><?php echo ENTRY_LAST_NAME; ?></label>
+ <?php echo tep_draw_input_field('lastname','accountEditLastname', $account['customers_lastname']) . ' ' . (tep_not_null(ENTRY_LAST_NAME_TEXT) ? '<span class="inputRequirement">' . ENTRY_LAST_NAME_TEXT . '</span>': ''); ?>
+ </p>
+
+ <?php if ( $page->_draw_in_page('ACCOUNT_DOB')) { ?>
+ <p>
+ <label for="accountEditDob"><?php echo ENTRY_DATE_OF_BIRTH; ?></label>
+ <?php echo tep_draw_input_field('dob','accountEditDob', tep_date_short($account['customers_dob'])) . ' ' . (tep_not_null(ENTRY_DATE_OF_BIRTH_TEXT) ? '<span class="inputRequirement">' . ENTRY_DATE_OF_BIRTH_TEXT . '</span>': ''); ?>
+ </p>
+ <?php } ?>
+
+ <p>
+ <label for="accountEditEmail"><?php echo ENTRY_EMAIL_ADDRESS; ?></label>
+ <?php echo tep_draw_input_field('email_address', 'accountEditEmail',$account['customers_email_address']) . ' ' . (tep_not_null(ENTRY_EMAIL_ADDRESS_TEXT) ? '<span class="inputRequirement">' . ENTRY_EMAIL_ADDRESS_TEXT . '</span>': ''); ?>
+ </p>
+
+ <p>
+ <label for="accountEditPhone"><?php echo ENTRY_TELEPHONE_NUMBER; ?></label>
+ <?php echo tep_draw_input_field('telephone','accountEditPhone', $account['customers_telephone']) . ' ' . (tep_not_null(ENTRY_TELEPHONE_NUMBER_TEXT) ? '<span class="inputRequirement">' . ENTRY_TELEPHONE_NUMBER_TEXT . '</span>': ''); ?>
+ </p>
+
+ <?php if (_cst_bool('ACCOUNT_FAXNUM')): ?>
+ <p>
+ <label for="accountEditFax"><?php echo ENTRY_FAX_NUMBER; ?></label>
+ <?php echo tep_draw_input_field('fax', 'accountEditFax',$account['customers_fax']) . ' ' . (tep_not_null(ENTRY_FAX_NUMBER_TEXT) ? '<span class="inputRequirement">' . ENTRY_FAX_NUMBER_TEXT . '</span>': ''); ?>
+ </p>
+ <?php endif; ?>
+
+ <!-- // BOF Customers extra fields -->
+ <?php echo tep_get_extra_fields($customer_id, $languages_id)?>
+ <!-- // EOF Customers extra fields -->
+
+
+ <p class="formBt"><?php echo tep_draw_hidden_field('action', 'process') ;?><input type="submit" class="submitBt" value="<?php echo IMAGE_BUTTON_CONTINUE; ?>" /></p>
+ </fieldset>
+ </form>
+
+ <div class="navBt">
+ <?php echo '<a class="navBt" href="' . tep_href_link(FILENAME_ACCOUNT) . '">' . IMAGE_BUTTON_BACK . '</a>'; ?>
+ </div>
+
+ <!-- extra divs to add extra pictures. -->
+ <div class="extraDiv1"><span></span></div>
+ <div class="extraDiv2"><span></span></div>
+ <div class="extraDiv3"><span></span></div>
+ <div class="extraDiv4"><span></span></div>
+ <div class="extraDiv5"><span></span></div>
+
+</div>
\ No newline at end of file
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/account_history.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/account_history.php (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/account_history.php 2011-10-18 08:52:20 UTC (rev 3834)
@@ -0,0 +1,68 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @subpackage 2cShopHtml5Oscim
+ @package osCSS-2 <www http://www.oscss.org>
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @date 16/09/10, 21:54
+ @encode UTF-8
+*/
+?>
+
+<header>
+ <h1 class="content title <?php echo $language ;?>"><?php echo HEADING_TITLE_6; ?></h1>
+</header>
+
+
+
+<div id="accountHistory">
+
+<?php
+ $orders_total = tep_count_customer_orders();
+
+ if ($orders_total > 0) {
+ $history_query_raw = "select o.orders_id,o.orders_prefix, o.date_purchased, o.delivery_name, o.billing_name, ot.text as order_total,o.orders_status, s.status_name as orders_status_name from " . TABLE_ORDERS . " o, " . TABLE_ORDERS_TOTAL . " ot, " . TABLE_STATUS . " s where o.customers_id = '" . (int)$customer_id . "' and o.orders_id = ot.orders_id and ot.class = 'ot_total' and o.orders_status = s.status_id AND status_type='orders' AND s.language_id = '" . (int)$languages_id . "' order by orders_id DESC";
+ $history_split = new splitPageResults($history_query_raw, MAX_DISPLAY_ORDER_HISTORY);
+ $history_query = tep_db_query($history_split->sql_query);
+
+ while ($history = tep_db_fetch_array($history_query)) {
+ $products_query = tep_db_query("select count(*) as count from " . TABLE_ORDERS_PRODUCTS . " where orders_id = '" . (int)$history['orders_id'] . "'");
+ $products = tep_db_fetch_array($products_query);
+
+ if (tep_not_null($history['delivery_name'])) {
+ $order_type = TEXT_ORDER_SHIPPED_TO;
+ $order_name = $history['delivery_name'];
+ } else {
+ $order_type = TEXT_ORDER_BILLED_TO;
+ $order_name = $history['billing_name'];
+ }
+?>
+ <dl class="orderHistory">
+ <dt><?php echo TEXT_ORDER_NUMBER . $history['orders_prefix'].$history['orders_id']; ?> <span class="linkPdf"><a href="<?php echo tep_href_link(FILENAME_ACCOUNT, 'action=pdf&'.(isset($_GET['page']) ? 'page=' . $_GET['page'] . '&' : '') . 'order_id=' . $history['orders_id'], 'SSL') ?>">PDF</a></span></dt>
+ <dd><?php echo TEXT_ORDER_STATUS . $history['orders_status_name']; ?></dd>
+ <dd><?php echo TEXT_ORDER_DATE . tep_date_long($history['date_purchased']) ;?></dd>
+ <dd><?php echo $order_type . tep_output_string_protected($order_name); ?></dd>
+ <dd><?php echo TEXT_ORDER_PRODUCTS . $products['count'] ;?></dd>
+ <dd><?php echo TEXT_ORDER_COST . strip_tags($history['order_total']); ?></dd>
+ <dd><?php echo '<a class="navBtMini" href="' . tep_href_link(FILENAME_ACCOUNT, 'action=history_info&'.(isset($_GET['page']) ? 'page=' . $_GET['page'] . '&' : '') . 'order_id=' . $history['orders_id'], 'SSL') . '">' . SMALL_IMAGE_BUTTON_VIEW . '</a>'; ?></dd>
+ </dl>
+
+<?php }
+ } else { ?>
+ <p class="infoText"><?php echo TEXT_NO_PURCHASES; ?></p>
+<?php } ?>
+
+<?php if ($orders_total > 0) { ?>
+
+<div id="splitPageBottom">
+ <p class="sP1"><?php echo $history_split->display_count(TEXT_DISPLAY_NUMBER_OF_ORDERS); ?></p>
+ <p class="sP2"><?php echo TEXT_RESULT_PAGE . ' ' . $history_split->display_links(MAX_DISPLAY_PAGE_LINKS, tep_get_all_get_params(array('page', 'info', 'x', 'y'))); ?></p>
+</div>
+
+<?php } ?>
+
+ <div class="navBt">
+ <?php echo '<a class="navBt" href="' . tep_href_link(FILENAME_ACCOUNT, '', 'SSL') . '">' . IMAGE_BUTTON_BACK . '</a>'; ?>
+ </div>
+
+</div>
\ No newline at end of file
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/account_history_info.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/account_history_info.php (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/account_history_info.php 2011-10-18 08:52:20 UTC (rev 3834)
@@ -0,0 +1,117 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @subpackage 2cShopHtml5Oscim
+ @package osCSS-2 <www http://www.oscss.org>
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @date 16/09/10, 21:54
+ @encode UTF-8
+*/
+$acount=account::getInstance();
+$aca_account=$page->return_object('account');
+?>
+
+<header>
+ <h1 class="content title <?php echo $language ;?>"><?php echo HEADING_TITLE; ?></h1>
+</header>
+
+
+<div id="accountHistoryInfo">
+
+ <h3><?php echo sprintf(HEADING_ORDER_NUMBER,$order->info['orders_prefix'].$_GET['order_id']) . ' <small>(' . $order->info['orders_status'] . ')</small>'; ?></h3>
+ <h4><?php echo HEADING_ORDER_DATE . ' ' . tep_date_long($order->info['date_purchased']); ?></h4>
+
+
+ <table class="invoice invoiceAdress" cellspacing="0" summary="<?php echo HEADING_TITLE; ?>">
+ <thead>
+ <tr>
+ <th class="deliveryAddress"><?php echo HEADING_DELIVERY_ADDRESS; ?></th>
+ <th class="billingAdress"><?php echo HEADING_BILLING_ADDRESS; ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td class="deliveryAddress"><?php echo tep_address_format($order->delivery['format_id'], $order->delivery, 1, ' ', '<br />'); ?></td>
+ <td class="billingAdress"><?php echo tep_address_format($order->billing['format_id'], $order->billing, 1, ' ', '<br />'); ?></td>
+ </tr>
+ </tbody>
+ </table>
+
+ <table class="invoice invoiceDetails" cellspacing="0" summary="<?php echo HEADING_TITLE; ?>">
+ <thead>
+ <tr>
+ <th class="invoiceProducts"><?php echo HEADING_PRODUCTS; ?></th>
+ <th class="invoiceQty"><?php echo HEADING_PRODUCTS_QTY; ?></th>
+ <th class="invoiceTaxes"><?php echo HEADING_TAX; ?></th>
+ <th class="invoicePrice"><?php echo HEADING_PRODUCTS_PRICE; ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php reset($order->products); foreach($order->products as $prdct) { ?>
+ <tr>
+ <td class="invoiceProducts tleft">
+ <?php echo implode(',',$acount->displayInForProducts(array_merge(array('order_id'=>$_GET['order_id'], 'orders_status_id'=>$order->info['orders_status_id']), $prdct))).'<br />' ;
+ echo $prdct['name'] ;
+ if ( (isset($prdct['attributes'])) && (sizeof($prdct['attributes']) > 0) )
+ foreach($prdct['attributes'] as $attrib) echo '<br /><span class="invoiceAttributes"> - ' . $attrib['option'] . ': ' . $attrib['value'] .'</span>' ;
+ ?> </td>
+ <td class="invoiceQty tcenter"><?php echo $prdct['qty'] ;?></td>
+ <td class="invoiceTaxes tcenter taxe"><?php echo tep_display_tax_value($prdct['tax']) . '%' ; ?></td>
+ <td class="invoicePrice tright pu"><?php echo $currencies->format($prdct['final_price'] , true, $order->info['currency'], $order->info['currency_value']) ; ?></td>
+ <td class="invoicePrice tright totht"><?php echo $currencies->format($prdct['final_price'] * $prdct['qty'], true, $order->info['currency'], $order->info['currency_value']) ; ?></td>
+ <td class="invoicePrice tright totttc"><?php echo $currencies->format(tep_add_tax($prdct['final_price'], $prdct['tax'],true) * $prdct['qty'], true, $order->info['currency'], $order->info['currency_value']) ; ?></td>
+ </tr>
+ <?php } ?>
+ </tbody>
+ </table>
+
+ <table class="invoice invoiceTotal" cellspacing="0">
+ <tbody>
+ <?php for ($i=0, $n=sizeof($order->totals); $i<$n; $i++) { ?>
+ <tr>
+ <td colspan="3" class="otTtitle"><?php echo $order->totals[$i]['title'] ;?></td>
+ <td class="otText totttc"><?php echo $order->totals[$i]['text'];?></td>
+ </tr>
+ <?php } ?>
+ </tbody>
+ </table>
+
+
+ <?php if (tep_not_null($order->info['shipping_method'])) { ?>
+ <p><?php echo HEADING_SHIPPING_METHOD . ':' . $order->info['shipping_method']; ?></p>
+ <?php } ?>
+ <p><?php echo HEADING_PAYMENT_METHOD . ':' . $order->info['payment_method']; ?></p>
+
+
+ <h5><?php echo HEADING_ORDER_HISTORY; ?></h5>
+
+ <table class="invoiceHistory" cellspacing="0" summary="<?php echo HEADING_ORDER_HISTORY; ?>">
+ <thead>
+ <tr>
+ <th><?php echo HEADING_HISTORY_DATE; ?></th>
+ <th><?php echo HEADING_HISTORY_STATUS; ?></th>
+ <th><?php echo HEADING_HISTORY_COMMENT; ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php
+ $statuses_query = tep_db_query("select os.status_name, osh.date_added, osh.comments from " . TABLE_STATUS . " os, " . TABLE_ORDERS_STATUS_HISTORY . " osh where osh.orders_id = '" . (int)$_GET['order_id'] . "' and osh.orders_status_id = os.status_id AND status_type='orders' AND os.language_id = '" . (int)$languages_id . "' order by osh.date_added");
+ while ($statuses = tep_db_fetch_array($statuses_query)) {
+ echo '<tr>' . "\n" .
+ '<td>' . tep_date_short($statuses['date_added']) . '</td>' . "\n" .
+ '<td>' . $statuses['status_name'] . '</td>' . "\n" .
+ '<td>' . (empty($statuses['comments']) ? ' ' : nl2br(tep_output_string_protected($statuses['comments']))) . '</td>' . "\n" .
+ '</tr>' . "\n" ;
+
+ }
+ ?>
+ </tbody>
+ </table>
+
+ <?php if (_cst_bool('DOWNLOAD_ENABLED')) include(DIR_WS_MODULES . 'downloads.php'); ?>
+
+ <div class="navBt">
+ <?php echo '<a class="navBt" href="' . tep_href_link(FILENAME_ACCOUNT, 'action=history', 'SSL'). '">' . IMAGE_BUTTON_BACK . '</a>'; ?>
+ </div>
+
+</div>
\ No newline at end of file
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/account_newsletters.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/account_newsletters.php (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/account_newsletters.php 2011-10-18 08:52:20 UTC (rev 3834)
@@ -0,0 +1,52 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @subpackage 2cShopHtml5Oscim
+ @package osCSS-2 <www http://www.oscss.org>
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @date 16/09/10, 21:54
+ @encode UTF-8
+ \ingroup content
+ \brief display form for choose neswletters and subscribe
+*/
+$account = $page->_call('customer','the_customer');
+?>
+
+<header>
+ <h1 class="content title <?php echo $language ;?>"><?php echo HEADING_TITLE_4; ?></h1>
+</header>
+
+
+<div id="accountNewsLetters">
+
+ <?php echo tep_draw_form('account_newsletter', tep_href_link(FILENAME_ACCOUNT, 'action=newsletters', 'SSL')); ?>
+
+ <fieldset class="account">
+ <legend><?php echo MY_NEWSLETTERS_TITLE; ?></legend>
+
+ <p>
+ <?php echo tep_draw_hidden_field('action', 'process'); ?>
+ <label for="newsletter_general" title="<?php echo MY_NEWSLETTERS_GENERAL_NEWSLETTER_DESCRIPTION; ?>"><?php echo MY_NEWSLETTERS_GENERAL_NEWSLETTER; ?></label>
+ <?php echo tep_draw_checkbox_field('newsletter_general', 'newsletter_general', '1', $account['customers_newsletter'], 'onclick="checkBox(\'newsletter_general\')"'); ?>
+ </p>
+
+ <br />
+
+ <p>
+ <label for="newsletter_product_notification" title="<?php echo MY_NEWSLETTERS_GENERAL_P_NOTIFICATION_DESCRIPTION; ?>"><?php echo MY_NEWSLETTERS_GENERAL_P_NOTOFICATIONS; ?></label>
+ <?php echo tep_draw_checkbox_field('newsletter_product_notification', 'newsletter_product_notification', '1', $account['global_product_notifications'], 'onclick="checkBox(\'newsletter_general\')"'); ?>
+ </p>
+
+ <br />
+
+ <p><?php echo MY_NEWSLETTERS_GENERAL_NEWSLETTER_DESCRIPTION; ?></p>
+ <p class="formBt"><input type="submit" class="submitBt" value="Mise à jour" /></p>
+ </fieldset>
+
+ </form>
+
+ <div class="navBt">
+ <?php echo '<a class="navBt" href="' . tep_href_link(FILENAME_ACCOUNT, '', 'SSL') . '">' .IMAGE_BUTTON_BACK. '</a>'; ?>
+ </div>
+
+</div>
\ No newline at end of file
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/account_password.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/account_password.php (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/account_password.php 2011-10-18 08:52:20 UTC (rev 3834)
@@ -0,0 +1,55 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @subpackage 2cShopHtml5Oscim
+ @package osCSS-2 <www http://www.oscss.org>
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @date 16/09/10, 21:54
+ @encode UTF-8
+*/
+?>
+
+<header>
+ <h1 class="content title <?php echo $language ;?>"><?php echo HEADING_TITLE_5; ?></h1>
+</header>
+
+
+<div id="accountPassword">
+ <?php $page->messageStack->_draw('account_password');?>
+
+
+ <p class="notice"><?php echo FORM_REQUIRED_INFORMATION; ?></p>
+
+ <?php echo tep_draw_form('account_password', tep_href_link(FILENAME_ACCOUNT, 'action=password', 'SSL'), 'post', 'onsubmit="return check_form(account_password);"') ; ?>
+
+ <fieldset class="account">
+ <legend><?php echo MY_PASSWORD_TITLE; ?></legend>
+
+ <p><?php echo tep_draw_hidden_field('action', 'process'); ?></p>
+
+ <p>
+ <label for="currentPassword" ><?php echo ENTRY_PASSWORD_CURRENT; ?></label>
+ <?php echo tep_draw_password_field('password_current','currentPassword') . (tep_not_null(ENTRY_PASSWORD_CURRENT_TEXT) ? ' <span class="notice">' . ENTRY_PASSWORD_CURRENT_TEXT . '</span>': ''); ?>
+ </p>
+
+ <p>
+ <label for="newPassword" ><?php echo ENTRY_PASSWORD_NEW; ?></label>
+ <?php echo tep_draw_password_field('password_new','newPassword') . (tep_not_null(ENTRY_PASSWORD_NEW_TEXT) ? ' <span class="notice">' . ENTRY_PASSWORD_NEW_TEXT . '</span>': ''); ?>
+ </p>
+
+ <p>
+ <label for="confirm" ><?php echo ENTRY_PASSWORD_CONFIRMATION; ?></label>
+ <?php echo tep_draw_password_field('password_confirmation','confirm') . (tep_not_null(ENTRY_PASSWORD_CONFIRMATION_TEXT) ? ' <span class="notice">' . ENTRY_PASSWORD_CONFIRMATION_TEXT . '</span>': ''); ?>
+ </p>
+
+ <p class="formBt">
+ <input class="submitBt" id="send" type="submit" value="<?php echo IMAGE_BUTTON_LOGIN; ?>" />
+ </p>
+ </fieldset>
+ </form>
+
+ <div class="navBt">
+ <?php echo '<a class="navBt" href="' . tep_href_link(FILENAME_ACCOUNT) . '">' . IMAGE_BUTTON_BACK . '</a>'; ?>
+ </div>
+
+</div>
\ No newline at end of file
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/advanced_search.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/advanced_search.php (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/advanced_search.php 2011-10-18 08:52:20 UTC (rev 3834)
@@ -0,0 +1,94 @@
+<?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 16/09/10, 21:53
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+?>
+<div id="advancedSearch">
+ <?php $page->messageStack->_draw('search');?>
+
+ <h2 class="content title <?php echo $language ;?>"><?php echo HEADING_TITLE_1; ?></h2>
+
+ <?php
+ if ( ($replace=$page->prop_ctrl('text_search_help_link', 'text_search_help_link')) !=false) echo $replace();
+ else {
+ echo '<p id="text_search_help_link" class="infoText"><a href="javascript:popupWindow(\'' . tep_href_link(FILENAME_SEARCH_HELP,'&popup=true') . '\')">' . TEXT_SEARCH_HELP_LINK . '</a></p>';
+ } ?>
+
+ <?php echo tep_draw_form('advanced_search', tep_href_link(FILENAME_ADVANCED_SEARCH, '', 'NONSSL', false), 'get', 'onsubmit="return check_form(this);"') ;?>
+
+ <fieldset class="advancedSearch">
+ <legend><?php echo HEADING_SEARCH_CRITERIA ; ?></legend>
+ <?php echo tep_hide_session_id().tep_draw_hidden_field('search_in_description', '1') ;?>
+ <ul>
+ <li>
+ <label><?php echo ENTRY_KEYWORDS ; ?></label>
+ <?php echo tep_draw_input_field('keywords', 'keywords','','onfocus="this.value=\'\'"') ; ?>
+ </li>
+
+ <li>
+ <label><?php echo ENTRY_CATEGORIES; ?></label>
+ <?php echo tep_draw_pull_down_menu('categories_id', 'categories_id', tep_get_categories(array(array('id' => '', 'text' => TEXT_ALL_CATEGORIES)))); ?>
+ </li>
+
+ <li class="check">
+ <label><?php echo ENTRY_INCLUDE_SUBCATEGORIES; ?></label>
+ <?php echo tep_draw_checkbox_field('inc_subcat','inc_subcat', '1', true) ;?>
+ </li>
+
+ <li>
+ <label><?php echo ENTRY_MANUFACTURERS; ?></label>
+ <?php echo tep_draw_pull_down_menu('manufacturers_id', 'manufacturers_id', tep_get_manufacturers(array(array('id' => '', 'text' => TEXT_ALL_MANUFACTURERS)))); ?>
+ </li>
+
+ <li>
+ <label for="pfrom"><?php echo ENTRY_PRICE_FROM; ?></label>
+ <?php echo tep_draw_input_field('pfrom','pfrom'); ?>
+ </li>
+
+ <li>
+ <label for="pto"><?php echo ENTRY_PRICE_TO; ?></label>
+ <?php echo tep_draw_input_field('pto','pto'); ?>
+ </li>
+
+ <li>
+ <label for="dfrom"><?php echo ENTRY_DATE_FROM; ?></label>
+ <?php echo tep_draw_input_field('dfrom','dfrom', DOB_FORMAT_STRING, 'onfocus="this.value=\'\'"'); ?>
+ </li>
+
+ <li>
+ <label for="dto"><?php echo ENTRY_DATE_TO; ?></label>
+ <?php echo tep_draw_input_field('dto','dto', DOB_FORMAT_STRING, 'onfocus="this.value=\'\'"'); ?>
+ </li>
+
+ <li>
+ <label for="dto"><?php echo ENTRY_DATE_TO; ?></label>
+ <?php echo tep_list_option_value_dipso(); ?>
+ </li>
+ <li class="formBt"><input type="submit" class="submitBt" value="<?php echo IMAGE_BUTTON_SEARCH; ?>" /></li>
+ </ul>
+ </fieldset>
+ </form>
+
+</div>
+<?php if (isset($listing_sql) && tep_not_null($listing_sql) ) {
+
+$listing_split = new splitPageResults($listing_sql, $page->_conf_value('MAX_DISPLAY_SEARCH_RESULTS'), 'p.products_id');
+?>
+<div id="advancedSearchResult">
+
+ <h2 class="content title <?php echo $language ;?>"><?php echo HEADING_TITLE_2; ?></h2>
+
+ <?php $page->oscss_modules->_add(FILENAME_PRODUCT_LISTING,'center', array('listing_split'=>$listing_split,'listing_query'=>$listing_sql) ); ?>
+
+ <div class="navBt">
+ <?php echo '<a class="navBt" href="' . tep_href_link(FILENAME_ADVANCED_SEARCH, tep_get_all_get_params(array('sort', 'page')), 'NONSSL', true, false) . '">' . IMAGE_BUTTON_BACK . '</a>'; ?>
+ </div>
+
+</div>
+ <?php } ?>
\ No newline at end of file
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/checkout_confirmation.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/checkout_confirmation.php (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/checkout_confirmation.php 2011-10-18 08:52:20 UTC (rev 3834)
@@ -0,0 +1,110 @@
+<?php
+/**
+ @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.0
+ @date 18/11/10, 21:53
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+$order_totals=$page->the_var('order_totals');
+?>
+<div id="checkoutConfirmation">
+ <?php $boxe =$page->oscss_boxes->_return('checkout_progressbar'); ?>
+ <?php echo unhtmlentities($boxe->content) ?>
+
+ <h2 class="content title <?php echo $language ;?>"><?php echo HEADING_TITLE; ?></h2>
+
+ <table class="invoice invoiceAdress" cellspacing="0" summary="<?php echo HEADING_TITLE; ?>">
+ <thead>
+ <tr>
+ <?php if($sendto != false): ?>
+ <th class="deliveryAddress"><?php echo HEADING_DELIVERY_ADDRESS . ' <a href="' . tep_href_link(FILENAME_CHECKOUT_SHIPPING_ADDRESS, '', 'SSL') . '">(' . TEXT_EDIT . ')</a>'; ?></th>
+ <?php endif; ?>
+ <th class="billingAdress"><?php echo HEADING_BILLING_ADDRESS . ' <a href="' . tep_href_link(FILENAME_CHECKOUT_PAYMENT_ADDRESS, '', 'SSL') . '">(' . TEXT_EDIT . ')</a>'; ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <?php if($sendto != false): ?>
+ <td class="deliveryAddress"><?php echo tep_address_format($order->delivery['format_id'], $order->delivery, 1, ' ', '<br />') ; ?></td>
+ <?php endif; ?>
+ <td class="billingAdress"><?php echo tep_address_format($order->billing['format_id'], $order->billing, 1, ' ', '<br />'); ?></td>
+ </tr>
+ </tbody>
+ </table>
+
+ <table class="invoice invoiceDetails" cellspacing="0" summary="<?php echo HEADING_TITLE; ?>">
+ <thead>
+ <tr>
+ <th class="invoiceProducts "><?php echo HEADING_PRODUCTS; ?></th>
+ <th class="invoiceQty "><?php echo HEADING_PRODUCTS_QTY; ?></th>
+ <th class="invoiceTaxes taxe"><?php echo HEADING_TAX; ?></th>
+ <th class="invoicePrice pu"><?php echo HEADING_PRODUCTS_PRICE_U; ?></th>
+ <th class="invoicePrice tright totht "><?php echo HEADING_PRODUCTS_TOT_HT; ?></th>
+ <th class="invoicePrice tright totttc"><?php echo HEADING_PRODUCTS_TOT_TTC; ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php reset($order->products); foreach($order->products as $prdct) { ?>
+ <tr>
+ <td class="invoiceProducts tleft"> <?php echo $prdct['name'] ;
+ if ( (isset($prdct['attributes'])) && (sizeof($prdct['attributes']) > 0) )
+ foreach($prdct['attributes'] as $attrib) echo '<br /><span class="invoiceAttributes"> - ' . $attrib['option'] . ': ' . $attrib['value'] .'</span>' ;
+ ?> </td>
+ <td class="invoiceQty tcenter"><?php echo $prdct['qty'] ;?></td>
+ <td class="invoiceTaxes tcenter taxe"><?php echo tep_display_tax_value($prdct['tax']) . '%' ; ?></td>
+ <td class="invoicePrice tright pu"><?php echo $currencies->format($prdct['final_price'] , true, $order->info['currency'], $order->info['currency_value']) ; ?></td>
+ <td class="invoicePrice tright totht"><?php echo $currencies->format($prdct['total_line'], true, $order->info['currency'], $order->info['currency_value']) ; ?></td>
+ <td class="invoicePrice tright totttc"><?php echo $currencies->format($prdct['total_line_ttc'], true, $order->info['currency'], $order->info['currency_value']) ; ?></td>
+ </tr>
+ <?php } ?>
+ </tbody>
+ </table>
+
+ <table class="invoice invoiceTotal" cellspacing="0">
+ <tbody>
+ <?php print $order_total_modules->output("<tr>%s</tr>", '<td class="otTtitle">%s</td><td class="otText totht">%s</td><td class="otText totttc">%s</td>'); ?>
+ </tbody>
+ </table>
+
+<?php
+ if (is_array($payment_modules->modules)) {
+ if ($confirmation = $payment_modules->confirmation()) {
+?>
+ <div class="contenBox paymentInformation">
+ <h3><?php echo HEADING_PAYMENT_INFORMATION; ?></h3>
+ <p><?php echo $confirmation['title']; ?></p>
+
+<?php if (isset($confirmation['fields']))
+ for ($i=0, $n=sizeof($confirmation['fields']); $i<$n; $i++) { ?>
+ <p>
+ <label><?php echo $confirmation['fields'][$i]['title']; ?></label>
+ <?php echo $confirmation['fields'][$i]['field'] . "\n"; ?>
+ </p>
+ <?php } ?>
+ </div>
+<?php
+ }
+ } ?>
+
+ <?php if (tep_not_null($order->info['comments'])) { ?>
+ <div class="contentBox comment">
+ <h3><?php echo HEADING_ORDER_COMMENTS . ' <a href="' . tep_href_link(FILENAME_CHECKOUT_PAYMENT, '', 'SSL') . '">(' . TEXT_EDIT . ')</a>'; ?></h3>
+ <blockquote>
+ <p><?php echo nl2br(tep_output_string_protected($order->info['comments'])) . tep_draw_hidden_field('comments', $order->info['comments']); ?></p>
+ </blockquote>
+ </div>
+ <?php } ?>
+
+ <?php echo tep_draw_form('checkout_confirmation',(isset($$payment->form_action_url) ?$$payment->form_action_url : tep_href_link(FILENAME_CHECKOUT_PROCESS, '', 'SSL') ), 'post'); ?>
+
+ <?php if (is_array($payment_modules->modules)) echo $payment_modules->process_button(); ?>
+ <p class="formBt">
+ <?php echo (isset($$payment->form_submit) ? $$payment->form_submit : '<input type="submit" class="submitBt" value="'.IMAGE_BUTTON_CONFIRM_ORDER.'" />') ; ?>
+ </p>
+
+ </form>
+
+</div>
\ No newline at end of file
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/checkout_payment.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/checkout_payment.php (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/checkout_payment.php 2011-10-18 08:52:20 UTC (rev 3834)
@@ -0,0 +1,121 @@
+<?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 09/09/11, 22:30
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+?>
+<div id="checkoutPayment" class="orderProcess">
+ <?php $boxe =$page->oscss_boxes->_return('checkout_progressbar'); ?>
+ <?php echo unhtmlentities($boxe->content) ?>
+
+ <?php echo $payment_modules->javascript_validation(); ?>
+
+ <h2 class="content title <?php echo $language ;?>"><?php echo HEADING_TITLE; ?></h2>
+
+ <?php echo tep_draw_form('checkout_payment', tep_href_link(FILENAME_CHECKOUT_CONFIRMATION, '', 'SSL'), 'post', 'onsubmit="return check_form();"'); ?>
+
+ <?php /** Retour des erreurs */
+ if (isset($_GET['payment_error']) && is_object(${$_GET['payment_error']}) && ($error = ${$_GET['payment_error']}->get_error())) { ?>
+ <div class="alert">
+ <p class="infoText"><?php echo tep_output_string_protected($error['title']); ?></p>
+ <p class="infoText"><?php echo tep_output_string_protected($error['error']); ?></p>
+ </div>
+ <?php } ?>
+
+
+ <div class="contentBox billingAddress">
+
+ <h3><?php echo TABLE_HEADING_BILLING_ADDRESS; ?></h3>
+ <p><?php echo TEXT_SELECTED_BILLING_DESTINATION; ?></p>
+
+ <h4><?php echo TITLE_BILLING_ADDRESS; ?></h4>
+ <p class="currentAdress"><?php echo tep_address_label($customer_id, $billto, true, ' ', '<br />'); ?></p>
+ <p><?php echo '<a class="navBtMini" href="' . tep_href_link(FILENAME_CHECKOUT_PAYMENT_ADDRESS, '', 'SSL') . '">' . IMAGE_BUTTON_CHANGE_ADDRESS . '</a>'; ?></p>
+
+ </div>
+
+
+ <div class="contentBox paymentMethod">
+
+ <h3><?php echo TABLE_HEADING_PAYMENT_METHOD; ?></h3>
+
+ <?php if (sizeof($selection) > 1): ?>
+ <p class="textInfo"><?php echo TEXT_SELECT_PAYMENT_METHOD; ?></p>
+ <?php else: ?>
+ <p class="textInfo"><?php echo TEXT_ENTER_PAYMENT_INFORMATION; ?></p>
+ <?php endif; ?>
+
+
+ <ul class="listSelect listModules">
+ <?php for ($i=0, $n=sizeof($selection); $i<$n; $i++): ?>
+ <li class="methodSelect nameModule" onmouseover="this.id='mouseOver';" onmouseout="this.id='mouseOutpost';">
+ <label for="payment<?php echo $i; ?>">
+ <span class="methodName"><?php echo $selection[$i]['module']; ?></span>
+ <span class="methodIcon"><?php if (isset($selection[$i]['icon']) && tep_not_null($selection[$i]['icon'])) { echo $selection[$i]['icon']; } ?></span>
+ </label>
+
+ <?php if (sizeof($selection) > 1) echo '<span class="radioBt">'.tep_draw_radio_field('payment','payment'.$i, $selection[$i]['id']) .'</span>'. "\n";
+ else echo tep_draw_hidden_field('payment', $selection[$i]['id']). "<br />\n"; ?>
+
+ <?php /** Erreur module */ if (isset($selection[$i]['error'])) : ?>
+
+ <p class="paymentError"><?php echo $selection[$i]['error']; ?></p>
+
+ <?php elseif (isset($selection[$i]['fields']) && is_array($selection[$i]['fields'])) :
+ for ($j=0, $n2=sizeof($selection[$i]['fields']); $j<$n2; $j++) { ?>
+
+ <p class="paymentFields" >
+ <label><?php echo $selection[$i]['fields'][$j]['title']; ?></label>
+ <?php echo $selection[$i]['fields'][$j]['field'] . "\n"; ?>
+ </p>
+ <?php } endif; $radio_buttons++; ?>
+ </li>
+ <?php endfor; // for ($i=0, $n=sizeof($selection); $i<$n; $i++) ?>
+ </ul>
+ </div>
+
+ <p class="checkoutComment">
+ <label for="comment"><?php echo TABLE_HEADING_COMMENTS; ?></label>
+ <?php echo tep_draw_textarea_field('comments', 'comment', '48', '5'); ?>
+ </p>
+
+ <?php if( _cst_bool('MODULE_ORDER_TOTAL_DISCOUNT_COUPON_STATUS')) { ?>
+ <p class="checkoutcoupon">
+ <label for="coupon"><?php echo ENTRY_DISCOUNT_COUPON; ?></label>
+ <?php
+ /**
+ Propose une liste de coupon possibe secifique pour le client
+ */
+ $check_user_query = tep_db_query( $sql = 'SELECT dc.coupons_discount_amount, dc2u.coupons_id FROM '.TABLE_DISCOUNT_COUPONS.' dc, '.TABLE_DISCOUNT_COUPONS_TO_CUSTOMERS.' dc2u WHERE dc.coupons_id=dc2u.coupons_id and dc2u.customers_id='.(int)$customer_id.' AND in_out=\'I\' ' );
+ if( tep_db_num_rows( $check_user_query ) > 0 ) {
+ echo "<ul>";
+ while($v = tep_db_fetch_array( $check_user_query ) ): ?>
+ <li><?php echo ''.tep_draw_radio_field('coupon','coupon', $v['coupons_id']) .'<span>'. $v['coupons_id'].'</span> <span>'.$v['coupons_discount_amount'].'</span>'; ?></li>
+ <?php endwhile;
+ echo "</ul>";
+ } else echo tep_draw_input_field('coupon','coupon', '', 'size="32"');
+ ?>
+ </p>
+ <p id="checkoutcouponerror" class="warning"><?php if(isset($_GET['error_message'])) echo $_GET['error_message'] ?></p>
+ <?php } ?>
+
+ <fieldset>
+ <legend><?php echo CHECKOUT_CGV ;?></legend>
+
+ <label for="conditions"><?php printf(TEXT_CONDITIONS , tep_href_link(FILENAME_CONDITIONS, 'origin=checkout_payment') );?></label>
+ <input name="conditions" id="conditions" type="checkbox" <?php echo isset($_GET['consult_conditions']) ? 'checked="checked"' : '' ;?> />
+ </fieldset>
+
+ <p class="formBt ieExtractFieldset">
+ <?php echo TITLE_CONTINUE_CHECKOUT_PROCEDURE ;?>
+ <input type="submit" class="submitBt" value="<?php echo IMAGE_BUTTON_CONTINUE; ?>" />
+ </p>
+
+ </form>
+
+</div>
\ No newline at end of file
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/checkout_payment_address.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/checkout_payment_address.php (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/checkout_payment_address.php 2011-10-18 08:52:20 UTC (rev 3834)
@@ -0,0 +1,77 @@
+<?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 29/01/11, 11:43
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+?>
+<div id="checkoutPaymentAddress">
+ <?php $boxe =$page->oscss_boxes->_return('checkout_progressbar'); ?>
+ <?php echo unhtmlentities($boxe->content) ?>
+
+ <?php $page->messageStack->_draw('checkout_address');?>
+
+ <h2 class="content title <?php echo $language ;?>"><?php echo HEADING_TITLE; ?></h2>
+
+ <?php echo tep_draw_form('checkout_address', tep_href_link(FILENAME_CHECKOUT_PAYMENT_ADDRESS, '', 'SSL'), 'post', 'onsubmit="return check_form_optional(\'checkout_address\');"'); ?>
+
+ <?php if ($process == false): ?>
+
+ <div class="contentBox paymentAddress">
+ <h3><?php echo TABLE_HEADING_PAYMENT_ADDRESS ;?></h3>
+ <p><?php echo TEXT_SELECTED_PAYMENT_DESTINATION ;?></p>
+ <h4><?php echo TITLE_PAYMENT_ADDRESS ;?></h4>
+ <p class="Adress"><?php echo tep_address_label($customer_id, $billto, true, ' ', '<br />') ;?></p>
+ </div>
+
+ <?php if ($addresses_count > 1): ?>
+ <div class="contentBox paymentAddress">
+ <h3><?php echo TABLE_HEADING_ADDRESS_BOOK_ENTRIES ;?></h3>
+ <p><?php echo TEXT_SELECT_OTHER_PAYMENT_DESTINATION ;?><p>
+ <h4><?php echo TITLE_PLEASE_SELECT ;?></h4>
+
+ <?php while ($addresses = tep_db_fetch_array($addresses_query)) :
+ $format_id = tep_get_address_format_id($addresses['country_id']); ?>
+ <p>
+ <label><?php echo tep_output_string_protected($addresses['firstname'] . ' ' . $addresses['lastname']); ?></label>
+ <?php echo tep_draw_radio_field('address', 'address', $addresses['address_book_id'], ($addresses['address_book_id'] == $billto)); ?>
+ </p>
+ <p class="Adress"> <?php echo tep_address_format($format_id, $addresses, true, ' ', ', '); ?></p>
+ <?php endwhile; ?>
+
+ </div>
+ <?php endif; //if ($addresses_count > 1) ?>
+ <?php endif; // if ($process == false) ?>
+
+ <?php if ($addresses_count < MAX_ADDRESS_BOOK_ENTRIES) { ?>
+
+ <h3><?php echo TABLE_HEADING_NEW_PAYMENT_ADDRESS; ?></h3>
+ <p><?php echo TEXT_CREATE_NEW_PAYMENT_ADDRESS; ?></p>
+
+ <?php echo tep_get_include_contents('address_book_details'); ?>
+ <?php } ?>
+
+ <p class="infoForms"><?php echo TITLE_CONTINUE_CHECKOUT_PROCEDURE . '<br />' . TEXT_CONTINUE_CHECKOUT_PROCEDURE; ?></p>
+
+ <div class="navBt">
+ <p class="formBt">
+ <?php echo tep_draw_hidden_field('action', 'submit') ;?>
+ <input type="submit" class="submitBt" value="<?php echo IMAGE_BUTTON_CONTINUE; ?>" />
+ </p>
+ <p>
+ <?php echo '<a class="navBt" href="' . tep_href_link(FILENAME_CHECKOUT_PAYMENT, '', 'SSL') . '">' . IMAGE_BUTTON_BACK . '</a>'; ?>
+ </p>
+ </div>
+ </form>
+
+ <?php /*if ($process == true) { ?>
+ <div class="navBt">
+ <?php echo '<a class="navBt" href="' . tep_href_link(FILENAME_CHECKOUT_PAYMENT_ADDRESS, '', 'SSL') . '">' . IMAGE_BUTTON_BACK . '</a>'; ?>
+ </div>
+ <?php }*/ ?>
+
+</div>
\ No newline at end of file
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/checkout_shipping.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/checkout_shipping.php (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/checkout_shipping.php 2011-10-18 08:52:20 UTC (rev 3834)
@@ -0,0 +1,112 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.0
+ @date 23/01/11, 16:28
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+?>
+<div id ="checkoutShipping" class="orderProcess">
+ <?php $boxe =$page->oscss_boxes->_return('checkout_progressbar'); ?>
+ <?php echo unhtmlentities($boxe->content) ?>
+
+ <h2 class="content title <?php echo $language ;?>"><?php echo HEADING_TITLE; ?></h2>
+
+ <?php echo tep_draw_form('checkout_address', tep_href_link(FILENAME_CHECKOUT_SHIPPING, '', 'SSL')) . '<p>' . tep_draw_hidden_field('action', 'process') . '</p>'; ?>
+
+ <div class="contentBox shippingAddress">
+
+ <h3><?php echo TABLE_HEADING_SHIPPING_ADDRESS; ?></h3>
+ <p><?php echo TEXT_CHOOSE_SHIPPING_DESTINATION ;?></p>
+
+ <h4><?php echo TITLE_SHIPPING_ADDRESS ; ?></h4>
+ <p class="currentAdress"><?php echo tep_address_label($customer_id, $sendto, true, ' ', '<br />'); ?></p>
+ <p><?php echo '<a class="navBtMini" href="' . tep_href_link(FILENAME_CHECKOUT_SHIPPING_ADDRESS, '', 'SSL') . '">' . IMAGE_BUTTON_CHANGE_ADDRESS . '</a>'; ?></p>
+ </div>
+
+ <?php if (tep_count_shipping_modules() > 0) { ?>
+ <div class="contentBox shippingMethod">
+ <h3><?php echo TABLE_HEADING_SHIPPING_METHOD; ?></h3>
+
+ <?php if (sizeof($quotes) > 1 && sizeof($quotes[0]) > 1): ?>
+ <p class="infoText"><?php echo TEXT_CHOOSE_SHIPPING_METHOD; ?></p>
+ <?php elseif ($free_shipping == false): ?>
+ <p class="infoText"><?php echo TEXT_ENTER_SHIPPING_INFORMATION; ?></p>
+ <?php endif; ?>
+ <p class="infoText weight"><?php echo TOTAL_WEIGHT.' '.$cart->show_weight().' '.UNIT_WEIGHT_NAME; ?></p>
+
+ <?php if ($free_shipping == true): /** Free shipping */ ?>
+ <p><?php echo FREE_SHIPPING_TITLE; ?> <?php if (isset($quotes[0]['icon'])) echo $quotes[0]['icon']; ?></p>
+ <p><?php echo sprintf(FREE_SHIPPING_DESCRIPTION, $currencies->format(MODULE_ORDER_TOTAL_SHIPPING_FREE_SHIPPING_OVER)) . tep_draw_hidden_field('shipping', 'free_free'); ?></p>
+
+ <?php else: /** choose method shipping */ ?>
+
+ <ul class="shippingSelect listSelect listModules">
+ <?php $radio_buttons = 0;
+ for ($i=0, $n=sizeof($quotes); $i<$n; $i++) :?>
+ <li class="shippingSelect nameModule" onmouseover="this.id='mouseOver';" onmouseout="this.id='mouseOutpost';">
+ <label for="shipping<?php echo $i; ?>">
+ <span class="methodName"><?php echo $quotes...
[truncated message content] |
|
From: <os...@us...> - 2011-10-18 08:50:25
|
Revision: 3833
http://oscss.svn.sourceforge.net/oscss/?rev=3833&view=rev
Author: oscim
Date: 2011-10-18 08:50:17 +0000 (Tue, 18 Oct 2011)
Log Message:
-----------
Ajout nouveau template pour la 2.1.1 dans l'installateur
Added Paths:
-----------
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/Bottom.css
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/Sitemap.css
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/Top.css
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/sitmap/
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/sitmap/L1-center.png
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/sitmap/L1-left.png
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/sitmap/L1-right.png
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/sitmap/L3-bottom.png
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/sitmap/L3-center.png
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/sitmap/L3-li-top.png
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/sitmap/L3-ul-top.png
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/sitmap/vertical-line.png
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/sitmap/white-highlight.png
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/boxes/
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/gabarit/
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/languages/
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/lib.functions.theme.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/modules/
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/plugins/
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/js/boxOver.js
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/Bottom.css
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/Bottom.css (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/Bottom.css 2011-10-18 08:50:17 UTC (rev 3833)
@@ -0,0 +1,36 @@
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @subpackage Template 2cShopHtml5Oscim
+ @package osCSS-2 <www http://www.oscss.org>
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+
+/* footer */
+footer {
+ clear: both;
+ background: #222;
+ width: 960px;
+ color: #fff;
+ margin-bottom: 10px;
+
+ /* curved border radius */
+ -moz-border-radius: 10px;
+ -webkit-border-radius: 10px;
+ }
+
+footer p {
+ text-align: right;
+ font-size: 11px;
+ padding-right: 20px;
+ }
+
+footer a {
+ color: #999;
+ }
+
+footer a:hover {
+ color: #FFF;
+ text-decoration: none;
+ }
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/Sitemap.css
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/Sitemap.css (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/Sitemap.css 2011-10-18 08:50:17 UTC (rev 3833)
@@ -0,0 +1,51 @@
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @subpackage Template 2cShopHtml5Oscim
+ @package osCSS-2 <www http://www.oscss.org>
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+
+/* ------------------------------------------------------------
+ Site Map Styles
+------------------------------------------------------------ */
+
+##primaryNav {list-style:none;}
+/* -------- Top Level --------- */
+
+#primaryNav { margin: 0; float: left; width: 100%;list-style:none; }
+#primaryNav #home { display: block; float: none; background: #ffffff url('../images/sitmap/L1-left.png') center bottom no-repeat; position: relative; z-index: 2; padding: 0 0 30px 0; }
+#primaryNav li {list-style:none; float: left; background: url('../images/sitmap/L1-center.png') center top no-repeat; padding: 30px 0; margin-top: -30px; }
+#primaryNav li.rows {clear:both}
+#primaryNav li a { margin: 0 20px 0 0; padding: 10px 0; display: block; text-decoration:none;font-size: 12px; font-weight: bold; text-align: center; color: #504b4b; background: #6fa8b2 url('../images/sitmap/white-highlight.png') top left repeat-x; border: 2px solid #44808b; -moz-border-radius: 5px; -webkit-border-radius: 5px; -webkit-box-shadow: rgba(0,0,0,0.5) 2px 2px 2px; -moz-box-shadow: rgba(0,0,0,0.5) 2px 2px 2px; /* FF 3.5+ */ }
+#primaryNav li a:hover { background-color: #e2f4fd; border-color: #97bdcf; }
+#primaryNav li:last-child { background: url('../images/sitmap/L1-right.png') center top no-repeat; }
+#primaryNav li a:link:before,
+#primaryNav li a:visited:before { color: #78a9c0; }
+/* -------- Second Level --------- */
+#primaryNav li li { width: 100%; clear: left; margin-top: 0; padding: 10px 0 0 0; background: url('../images/sitmap/vertical-line.png') center bottom repeat-y; }
+#primaryNav li li a { background-color: #cee3ac; border-color: #b8da83; }
+#primaryNav li li a:hover { border-color: #94b75f; background-color: #e7f1d7; }
+#primaryNav li li:first-child { padding-top: 30px; }
+#primaryNav li li:last-child { background: url('../images/sitmap/vertical-line.png') center bottom repeat-y; }
+#primaryNav li li a:link:before,
+#primaryNav li li a:visited:before { color: #8faf5c; }
+/* -------- Third Level --------- */
+#primaryNav li li ul { margin: 10px 0 0 0; width: 100%; float: right; padding: 9px 0 10px 0; background: #ffffff url('../images/sitmap/L3-ul-top.png') center top no-repeat; }
+#primaryNav li li li { background: url('../images/sitmap/L3-center.png') left center no-repeat; padding: 5px 0; }
+#primaryNav li li li a { background-color: #fff7aa; border-color: #e3ca4b; font-size: 12px; padding: 5px 0; width: 80%; float: right; }
+#primaryNav li li li a:hover { background-color: #fffce5; border-color: #d1b62c; }
+#primaryNav li li li:first-child { padding: 15px 0 5px 0; background: url('../images/sitmap/L3-li-top.png') left center no-repeat; }
+#primaryNav li li li:last-child { background: url('../images/sitmap/L3-bottom.png') left center no-repeat; }
+#primaryNav li li li a:link:before,
+#primaryNav li li li a:visited:before { color: #ccae14; font-size: 9px; }
+/* ------ Utility Navigation ------------- */
+#utilityNav { float: right; max-width: 50%; margin-right: 10px; }
+#utilityNav li { float: left; margin-bottom: 10px; }
+#utilityNav li a { margin: 0 10px 0 0; padding: 5px 10px; display: block; border: 2px solid #e3ca4b; font-size: 12px; font-weight: bold; text-align: center; color: black; background: #fff7aa url('../images/sitmap/white-highlight.png') top left repeat-x; -moz-border-radius: 5px; -webkit-border-radius: 5px; -webkit-box-shadow: rgba(0,0,0,0.5) 2px 2px 2px; -moz-box-shadow: rgba(0,0,0,0.5) 2px 2px 2px; /* FF 3.5+ */ }
+#utilityNav li a:hover { background-color: #fffce5; border-color: #d1b62c; }
+#utilityNav li a:link:before,
+#utilityNav li a:visited:before { color: #ccae14; font-size: 9px; margin-bottom: 3px; }
+
+
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/Top.css
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/Top.css (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/Top.css 2011-10-18 08:50:17 UTC (rev 3833)
@@ -0,0 +1,164 @@
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @subpackage Template 2cShopHtml5Oscim
+ @package osCSS-2 <www http://www.oscss.org>
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+
+
+/* Hx tags */
+
+/* ------------ Structure ------------ */
+
+ header#top {
+ height:130px;
+ }
+
+ #logo {
+ width:250px;
+ float:left;
+ }
+
+ #logo p,
+ #logo h1 {
+ padding: 20px 0;
+ }
+
+
+
+
+ #top_bar {
+ float:left;
+ position:relative;
+ left:260px
+ }
+
+
+
+ nav {
+ position: absolute;
+ width: inherit;
+ height:45px;
+ }
+
+
+
+ section#intro {
+ margin-top: 57px;
+ width: inherit;
+ }
+
+ #intro .intro.content {padding: 12px;}
+
+
+ nl#breadcrumbs {
+ margin-top: 12px;
+ margin-bottom: 12px;
+ clear: both;
+ float: left;
+ height: 25px;
+ padding: 5px 12px;
+ position: relative;
+ top: 22px;
+ width: inherit;
+}
+/* ------------ Habillage ------------ */
+
+ /*header {
+ }*/
+
+ #logo p,
+ #logo h1 {
+ padding: 20px 0;
+ color: #FFF;
+ font-size: 28px;
+ }
+
+
+ /* #top_bar {
+ }*/
+
+
+ nav {
+ background: url("../images/navbg.png");
+ /* curved border radius */
+ -moz-border-radius: 10px;
+ -webkit-border-radius: 10px;
+ }
+
+ nav ul {
+ margin: 0 auto;
+ width: inherit;
+ list-style: none;
+ }
+
+ nav ul li {
+ float: left;
+ }
+
+ nav ul li a {
+ display: block;
+ margin-right: 20px;
+ width: 100px;
+ font-size: 16px;
+ font-weight: bold;
+ line-height: 44px;
+ text-align: center;
+ text-decoration: none;
+ color: #b4e3ec;
+ }
+
+ nav ul li a:hover {
+ color: #fff;
+ }
+
+ nav ul li.selected a {
+ color: #fff;
+ }
+
+
+
+
+ section#intro {
+ background: #778899 url("../images/introbkg.png") repeat-x;
+
+ /* background size */
+ -webkit-background-size: 100%;
+ -o-background-size: 100%;
+ -khtml-background-size: 100%;
+
+
+ /* curved border radius */
+ -moz-border-radius: 20px;
+ -webkit-border-radius: 20px;
+ }
+
+ #intro h1,
+ #intro h2,
+ #intro p {
+ position: relative;
+ z-index: 9999;
+ width: 800px;
+ }
+
+ #intro h1,
+ #intro h2 {
+ padding: 0 0 20px 0;
+ font-weight: normal;
+ color: #333;
+ }
+
+ #intro p {
+ color: #5D4A3D;
+ }
+
+
+
+/* nav */
+
+
+/* intro */
+
+
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/habillage.css 2011-10-18 08:50:17 UTC (rev 3833)
@@ -0,0 +1,195 @@
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @subpackage Template 2cShopHtml5Oscim
+ @package osCSS-2 <www http://www.oscss.org>
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+
+/* standard body */
+ body {
+ font: 14px/20px "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif;
+ background: #ff8300;
+ }
+
+/* standard alignments */
+ img { border: none; }
+ .center { text-align: center; }
+
+
+/* Hx tags */
+
+
+ h1 {
+ color: #FFF;
+ font-size: 28px;
+ }
+
+ h2 {
+ font-size: 24px;
+ }
+
+ h3 {
+ font-size: 18px;
+ }
+
+ .messageStack {
+ color: #FFF;
+ background-color: #f18f7e;
+/* curved border radius */
+ -moz-border-radius: 20px;
+ -webkit-border-radius: 20px;
+ }
+
+
+
+
+
+
+/* content and sidebar layout */
+
+#content {
+ background-color: #f2f2f2;
+
+/* curved border radius */
+ -moz-border-radius: 20px;
+ -webkit-border-radius: 20px;
+}
+
+/* article */
+
+.product header p, .blogPost header p a {
+ font-size: 14px;
+ font-style: italic;
+ color: #777;
+ }
+
+.product p a {
+ color: #0e9fc0;
+ }
+
+.product p a:hover {
+ color: #000;
+ }
+
+.product header p a:hover {
+ text-decoration: none;
+ color: #000;
+ }
+
+article h1/*,
+.product h2,
+.product h1*/ {
+ background-color: #B4E3EC;
+/* curved border radius */
+ -moz-border-radius: 10px;
+ -webkit-border-radius: 10px;
+ }
+
+article h1/*,
+.product h1,
+.regular h2*/ {
+ color: black;
+ background-color: #B4E3EC;
+/* curved border radius */
+ -moz-border-radius: 10px;
+ -webkit-border-radius: 10px;
+ }
+
+/* sidebar */
+aside section {
+ background-color: #f2f2f2;
+
+ /* curved border radius */
+ -moz-border-radius: 20px;
+ -webkit-border-radius: 20px;
+}
+
+aside section ul {
+ list-style: square;
+ color: #0e9fc0;
+ }
+
+aside section ul li {
+ border-bottom: 1px #0e9fc0 dotted;
+ }
+
+aside section ul li a {
+ text-decoration: none;
+ color: #000;
+ font-size: 16px;
+ font-variant: small-caps;
+ }
+
+aside section ul li a:hover {
+ text-decoration: underline;
+ }
+
+aside section header h3 {
+ background-color: #B4E3EC;
+/* curved border radius */
+ -moz-border-radius: 10px;
+ -webkit-border-radius: 10px;
+ }
+
+
+aside section div.inner-boxe{
+ text-align:center;
+}
+
+
+/* columns */
+
+
+.module ul {
+ list-style: none;
+}
+
+
+.module .outerblock {
+ font-size: 1em;
+ background: #0e9fc0;
+/* curved border radius */
+ -moz-border-radius: 10px;
+ -webkit-border-radius: 10px;
+ }
+
+.module .innerblock {
+ font-size: 1em;
+ background: #fff;
+ text-align:center;
+/* curved border radius */
+ -moz-border-radius: 10px;
+ -webkit-border-radius: 10px;
+}
+
+.module .innerblock img {
+ border: none;
+}
+
+.module .innerblock a {
+ color: #0e9fc0;
+}
+
+.module .innerblock h2 {
+ font-size: 16px;
+}
+
+
+
+
+.module .innerblock .innerblock-more{
+ text-align:left;
+}
+
+/* end of column configuration */
+
+
+
+article.product.single figure p{
+ text-align:center;
+}
+article.product.single figure ul{
+ list-style:none;
+}
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/sitmap/L1-center.png
===================================================================
(Binary files differ)
Property changes on: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/sitmap/L1-center.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/sitmap/L1-left.png
===================================================================
(Binary files differ)
Property changes on: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/sitmap/L1-left.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/sitmap/L1-right.png
===================================================================
(Binary files differ)
Property changes on: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/sitmap/L1-right.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/sitmap/L3-bottom.png
===================================================================
(Binary files differ)
Property changes on: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/sitmap/L3-bottom.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/sitmap/L3-center.png
===================================================================
(Binary files differ)
Property changes on: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/sitmap/L3-center.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/sitmap/L3-li-top.png
===================================================================
(Binary files differ)
Property changes on: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/sitmap/L3-li-top.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/sitmap/L3-ul-top.png
===================================================================
(Binary files differ)
Property changes on: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/sitmap/L3-ul-top.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/sitmap/vertical-line.png
===================================================================
(Binary files differ)
Property changes on: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/sitmap/vertical-line.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/sitmap/white-highlight.png
===================================================================
(Binary files differ)
Property changes on: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/sitmap/white-highlight.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/lib.functions.theme.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/lib.functions.theme.php (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/lib.functions.theme.php 2011-10-18 08:50:17 UTC (rev 3833)
@@ -0,0 +1,120 @@
+<?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 28/11/10, 08:18
+ *\author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ *\encode UTF-8
+ *\brief lib function template
+*/
+$customer_status = (tep_session_is_registered('customer_id') ? 'client' : 'guest');
+$template=$page->the_template();
+
+
+
+/**
+ Alias Widget_menu pour menu account
+*/
+function Widget_account_info(){
+ $t='<a href="' . tep_href_link(FILENAME_ACCOUNT, '', 'SSL') . '">' . PAGE_ACCOUNT . '</a>'."\n";
+ $s=Widget_menu(3,false,true);
+ global $page,$language;
+ return array('title'=>tep_output_string_protected($t,false,true),'content'=>$s['content']);
+}
+
+function Widget_search_suggest(){
+ global $page;
+ $s='';
+ $s.='<script type="text/javascript"><!--//'."\n";
+ $s.='function searchSuggest() {'."\n";
+ $s.='keySend = document.getElementById(\'quick_find\').keywords.value;'."\n";
+ $s.='divOutput = document.getElementById(\'search_suggest\');'."\n";
+ $s.='divOutput.innerHTML = \'\';'."\n";
+ $s.='divOutput.style.visibility="hidden";'."\n";
+ $s.='if ( keySend.length > 1 ) {'."\n";
+ $s.='if ( text = file(\''.tep_href_link('ajax_exe.php', 'action=search_suggest').'&'.'search=\'+escape(keySend)) ) {'."\n";
+ $s.='divOutput.style.visibility="visible";'."\n";
+ $s.='searchResult = text.split("\n");'."\n";
+ $s.='suggest = \'<ul>\';'."\n";
+ $s.='suggest += \'<li class="smenufull_arhaut"></li>\';'."\n";
+
+ $s.='for(i=0; i < searchResult.length-1; i++) {'."\n";
+ $s.=' suggest += \'<li onmouseover="javascript:suggestOver(this);" onmouseout="javascript:suggestOut(this);" \';'."\n";
+ $s.=' suggest += \'onclick="javascript:setSearch(this.innerHTML);" class="suggest_link">\' + searchResult[i] + \'</li>\';'."\n";
+ $s.='}'."\n";
+ $s.=' suggest += \'<li class="smenufull_arbas"></li>\';'."\n";
+ $s.='suggest += \'</ul>\';'."\n";
+ $s.='divOutput.innerHTML = suggest;'."\n";
+ $s.=' }'."\n";
+ $s.='}'."\n";
+ $s.='}'."\n";
+
+ //Mouse over function
+ $s.='function suggestOver(div_value) {'."\n";
+ $s.='div_value.className = \'suggest_link_over\';'."\n";
+ $s.='}'."\n";
+ //Mouse out function
+ $s.='function suggestOut(div_value) {'."\n";
+ $s.='div_value.className = \'suggest_link\';'."\n";
+ $s.='}'."\n";
+ //Click function
+ $s.='function setSearch(selectedValue) {'."\n";
+ $s.='document.getElementById(\'quick_find\').keywords.value = selectedValue;'."\n";
+ $s.='document.getElementById(\'search_suggest\').innerHTML = \'\';'."\n";
+ $s.='document.getElementById(\'search_suggest\').style.visibility="hidden";'."\n";
+ $s.='}'."\n";
+ $s.='//--></script>'."\n";
+
+ $page->javascript->add_script_src(array('file'=>'search_suggest','script'=>tep_output_string_protected($s,false,true)) );
+
+ return array('title'=>__('widget box heading search suggest'),'content'=>tep_output_string_protected(tep_get_include_contents('box.search_suggest'),false,true));
+}
+
+function Widget_login_box(){
+ global $page;
+ $s='';
+ if (tep_session_is_registered('customer_first_name') && tep_session_is_registered('customer_id')) {
+ $s.='<div class="back_login" ><p>Bienvenue '.'</p><br />'."\n";
+ $s.='<p class="createAccount"><a href="'. tep_href_link(FILENAME_LOGOFF) .'">'. BOX_LOGIN_LINK5 .'</a></p>'."\n";
+ $s.='</div>'."\n";
+ } else {
+ if (_cst_bool('LOGIN_SET_SNAPSHOT')) {
+ $navigation = $page->return_object('navigation_history');
+ $navigation->set_snapshot();
+ }
+
+ $s.=tep_draw_form('login_form_box', tep_href_link(FILENAME_LOGIN, 'action=process', 'SSL'));
+ $s.='<fieldset class="back_login">'."\n";
+ $s.='<p class="inputLog">'."\n";
+ $s.=tep_draw_input_field('email_address','login_email',__('widget box input email'), 'onclick="this.value=\'\'"');
+ $s.='</p>'."\n";
+ $s.='<p class="inputLog">'."\n";
+ $s.=tep_draw_password_field('password','login_password','0123','onclick="this.value=\'\'"')."\n";
+ $s.='</p>'."\n";
+ $s.='<p class="formBt">'."\n";
+ $s.='<input type="submit" class="submitBt" value="'.IMAGE_BUTTON_LOGIN.'" />'."\n";
+ $s.='</p>'."\n";
+ $s.='</fieldset>'."\n";
+ $s.='<p class="createAccount">'."\n";
+ $s.='<a href="'.tep_href_link(FILENAME_CREATE_ACCOUNT, '', 'SSL').'">'.__('widget box creat account').'</a>'."\n";
+ $s.='</p>'."\n";
+ $s.='</form>'."\n";
+ }
+ return array('title'=>'','content'=>tep_output_string_protected($s,false,true));
+}
+
+/** TAGS */
+function Widget_Tags(){
+ if(isset($_GET['products_id']) || isset($_GET['content']) || isset($_GET['cPath'])){
+ // include cloud generator
+ include_once(DIR_WS_FUNCTIONS.'generate.php');
+ $s= generateCloud(array('products'=>@$_GET['products_id'],'cPath'=>@$_GET['cPath'],'content'=>@$_GET['content']));
+ return array('title'=>__('widget box heading tag'),'content'=>tep_output_string_protected($s,false,true));
+ }
+ return array('title'=>'','content'=>'');
+}
+
+
+?>
\ No newline at end of file
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/js/boxOver.js
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/js/boxOver.js (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/js/boxOver.js 2011-10-18 08:50:17 UTC (rev 3833)
@@ -0,0 +1,367 @@
+/* --- BoxOver ---
+ */
+
+if (typeof document.attachEvent!='undefined') {
+ window.attachEvent('onload',initboxOver);
+ document.attachEvent('onmousemove',moveMouse);
+ document.attachEvent('onclick',checkMove); }
+else {
+ window.addEventListener('load',initboxOver,false);
+ document.addEventListener('mousemove',moveMouse,false);
+ document.addEventListener('click',checkMove,false);
+}
+
+var oDv=document.createElement("div");
+var dvHdr=document.createElement("div");
+var dvBdy=document.createElement("div");
+var windowlock,boxMove,fixposx,fixposy,lockX,lockY,fixx,fixy,ox,oy,boxLeft,boxRight,boxTop,boxBottom,evt,mouseX,mouseY,boxOpen,totalScrollTop,totalScrollLeft;
+boxOpen=false;
+ox=10;
+oy=10;
+lockX=0;
+lockY=0;
+
+function initboxOver() {
+ oDv.appendChild(dvHdr);
+ //oDv.appendChild(dvBdy);
+ oDv.style.position="absolute";
+ oDv.style.visibility='hidden';
+ document.body.appendChild(oDv);
+}
+
+function defHdrStyle() {
+ //dvHdr.innerHTML=' '+dvHdr.innerHTML;
+ dvHdr.style.maxWidth='auto';
+ dvHdr.style.width='auto';
+ dvHdr.style.fontFamily='Verdana';
+ dvHdr.style.fontSize='11px';
+ dvHdr.style.border='1px solid #666666';
+ dvHdr.style.padding='3px';
+ dvHdr.style.color='#FFFFFF';
+ dvHdr.style.background='#707778';
+ dvHdr.style.filter='alpha(opacity=88)'; // IE
+ dvHdr.style.opacity='0.88'; // FF
+}
+
+function defBdyStyle() {
+ dvBdy.style.borderBottom='none';
+ dvBdy.style.borderLeft='none';
+ dvBdy.style.borderRight='none';
+ dvBdy.style.width='210px';
+ dvBdy.style.height='1px';
+ dvBdy.style.padding='0';
+ dvBdy.style.margin='0';
+ dvBdy.style.color='#999999';
+}
+
+function checkElemBO(txt) {
+if (!txt || typeof(txt) != 'string') return false;
+if ((txt.indexOf('header')>-1)&&(txt.indexOf('body')>-1)&&(txt.indexOf('[')>-1)&&(txt.indexOf('[')>-1))
+ return true;
+else
+ return false;
+}
+
+function scanBO(curNode) {
+ if (checkElemBO(curNode.title)) {
+ curNode.boHDR=getParam('header',curNode.title);
+ curNode.boBDY=getParam('body',curNode.title);
+ curNode.boCSSBDY=getParam('cssbody',curNode.title);
+ curNode.boCSSHDR=getParam('cssheader',curNode.title);
+ curNode.IEbugfix=(getParam('hideselects',curNode.title)=='on')?true:false;
+ curNode.fixX=parseInt(getParam('fixedrelx',curNode.title));
+ curNode.fixY=parseInt(getParam('fixedrely',curNode.title));
+ curNode.absX=parseInt(getParam('fixedabsx',curNode.title));
+ curNode.absY=parseInt(getParam('fixedabsy',curNode.title));
+ curNode.offY=(getParam('offsety',curNode.title)!='')?parseInt(getParam('offsety',curNode.title)):10;
+ curNode.offX=(getParam('offsetx',curNode.title)!='')?parseInt(getParam('offsetx',curNode.title)):10;
+ curNode.fade=(getParam('fade',curNode.title)=='on')?true:false;
+ curNode.fadespeed=(getParam('fadespeed',curNode.title)!='')?getParam('fadespeed',curNode.title):0.04;
+ curNode.delay=(getParam('delay',curNode.title)!='')?parseInt(getParam('delay',curNode.title)):0;
+ if (getParam('requireclick',curNode.title)=='on') {
+ curNode.requireclick=true;
+ document.all?curNode.attachEvent('onclick',showHideBox):curNode.addEventListener('click',showHideBox,false);
+ document.all?curNode.attachEvent('onmouseover',hideBox):curNode.addEventListener('mouseover',hideBox,false);
+ }
+ else {// Note : if requireclick is on the stop clicks are ignored
+ if (getParam('doubleclickstop',curNode.title)!='off') {
+ document.all?curNode.attachEvent('ondblclick',pauseBox):curNode.addEventListener('dblclick',pauseBox,false);
+ }
+ if (getParam('singleclickstop',curNode.title)=='on') {
+ document.all?curNode.attachEvent('onclick',pauseBox):curNode.addEventListener('click',pauseBox,false);
+ }
+ }
+ curNode.windowLock=getParam('windowlock',curNode.title).toLowerCase()=='off'?false:true;
+ curNode.title='';
+ curNode.hasbox=1;
+ }
+ else
+ curNode.hasbox=2;
+}
+
+
+function getParam(param,list) {
+ var reg = new RegExp('([^a-zA-Z]' + param + '|^' + param + ')\\s*=\\s*\\[\\s*(((\\[\\[)|(\\]\\])|([^\\]\\[]))*)\\s*\\]');
+ var res = reg.exec(list);
+ var returnvar;
+ if(res)
+ return res[2].replace('[[','[').replace(']]',']');
+ else
+ return '';
+}
+
+function Left(elem){
+ var x=0;
+ if (elem.calcLeft)
+ return elem.calcLeft;
+ var oElem=elem;
+ while(elem){
+ if ((elem.currentStyle)&& (!isNaN(parseInt(elem.currentStyle.borderLeftWidth)))&&(x!=0))
+ x+=parseInt(elem.currentStyle.borderLeftWidth);
+ x+=elem.offsetLeft;
+ elem=elem.offsetParent;
+ }
+ oElem.calcLeft=x;
+ return x;
+ }
+
+function Top(elem){
+ var x=0;
+ if (elem.calcTop)
+ return elem.calcTop;
+ var oElem=elem;
+ while(elem){
+ if ((elem.currentStyle)&& (!isNaN(parseInt(elem.currentStyle.borderTopWidth)))&&(x!=0))
+ x+=parseInt(elem.currentStyle.borderTopWidth);
+ x+=elem.offsetTop;
+ elem=elem.offsetParent;
+ }
+ oElem.calcTop=x;
+ return x;
+
+}
+
+var ah,ab;
+function applyStyles() {
+ if(ab)
+ oDv.removeChild(dvBdy);
+ if (ah)
+ oDv.removeChild(dvHdr);
+ dvHdr=document.createElement("div");
+ dvBdy=document.createElement("div");
+ CBE.boCSSBDY?dvBdy.className=CBE.boCSSBDY:defBdyStyle();
+ CBE.boCSSHDR?dvHdr.className=CBE.boCSSHDR:defHdrStyle();
+ dvHdr.innerHTML=CBE.boHDR;
+ dvBdy.innerHTML=CBE.boBDY;
+ ah=false;
+ ab=false;
+ if (CBE.boHDR!='') {
+ oDv.appendChild(dvHdr);
+ ah=true;
+ }
+ if (CBE.boBDY!=''){
+ oDv.appendChild(dvBdy);
+ ab=true;
+ }
+}
+
+var CSE,iterElem,LSE,CBE,LBE, totalScrollLeft, totalScrollTop, width, height ;
+var ini=false;
+
+// Customised function for inner window dimension
+function SHW() {
+ if (document.body && (document.body.clientWidth !=0)) {
+ width=document.body.clientWidth;
+ height=document.body.clientHeight;
+ }
+ if (document.documentElement && (document.documentElement.clientWidth!=0) && (document.body.clientWidth + 20 >= document.documentElement.clientWidth)) {
+ width=document.documentElement.clientWidth;
+ height=document.documentElement.clientHeight;
+ }
+ return [width,height];
+}
+
+
+var ID=null;
+function moveMouse(e) {
+ //boxMove=true;
+ e?evt=e:evt=event;
+
+ CSE=evt.target?evt.target:evt.srcElement;
+
+ if (!CSE.hasbox) {
+ // Note we need to scan up DOM here, some elements like TR don't get triggered as srcElement
+ iElem=CSE;
+ while ((iElem.parentNode) && (!iElem.hasbox)) {
+ scanBO(iElem);
+ iElem=iElem.parentNode;
+ }
+ }
+
+ if ((CSE!=LSE)&&(!isChild(CSE,dvHdr))&&(!isChild(CSE,dvBdy))){
+ if (!CSE.boxItem) {
+ iterElem=CSE;
+ while ((iterElem.hasbox==2)&&(iterElem.parentNode))
+ iterElem=iterElem.parentNode;
+ CSE.boxItem=iterElem;
+ }
+ iterElem=CSE.boxItem;
+ if (CSE.boxItem&&(CSE.boxItem.hasbox==1)) {
+ LBE=CBE;
+ CBE=iterElem;
+ if (CBE!=LBE) {
+ applyStyles();
+ if (!CBE.requireclick)
+ if (CBE.fade) {
+ if (ID!=null)
+ clearTimeout(ID);
+ ID=setTimeout("fadeIn("+CBE.fadespeed+")",CBE.delay);
+ }
+ else {
+ if (ID!=null)
+ clearTimeout(ID);
+ COL=1;
+ ID=setTimeout("oDv.style.visibility='visible';ID=null;",CBE.delay);
+ }
+ if (CBE.IEbugfix) {hideSelects();}
+ fixposx=!isNaN(CBE.fixX)?Left(CBE)+CBE.fixX:CBE.absX;
+ fixposy=!isNaN(CBE.fixY)?Top(CBE)+CBE.fixY:CBE.absY;
+ lockX=0;
+ lockY=0;
+ boxMove=true;
+ ox=CBE.offX?CBE.offX:10;
+ oy=CBE.offY?CBE.offY:10;
+ }
+ }
+ else if (!isChild(CSE,dvHdr) && !isChild(CSE,dvBdy) && (boxMove)) {
+ // The conditional here fixes flickering between tables cells.
+ if ((!isChild(CBE,CSE)) || (CSE.tagName!='TABLE')) {
+ CBE=null;
+ if (ID!=null)
+ clearTimeout(ID);
+ fadeOut();
+ showSelects();
+ }
+ }
+ LSE=CSE;
+ }
+ else if (((isChild(CSE,dvHdr) || isChild(CSE,dvBdy))&&(boxMove))) {
+ totalScrollLeft=0;
+ totalScrollTop=0;
+
+ iterElem=CSE;
+ while(iterElem) {
+ if(!isNaN(parseInt(iterElem.scrollTop)))
+ totalScrollTop+=parseInt(iterElem.scrollTop);
+ if(!isNaN(parseInt(iterElem.scrollLeft)))
+ totalScrollLeft+=parseInt(iterElem.scrollLeft);
+ iterElem=iterElem.parentNode;
+ }
+ if (CBE!=null) {
+ boxLeft=Left(CBE)-totalScrollLeft;
+ boxRight=parseInt(Left(CBE)+CBE.offsetWidth)-totalScrollLeft;
+ boxTop=Top(CBE)-totalScrollTop;
+ boxBottom=parseInt(Top(CBE)+CBE.offsetHeight)-totalScrollTop;
+ doCheck();
+ }
+ }
+
+ if (boxMove&&CBE) {
+ // This added to alleviate bug in IE6 w.r.t DOCTYPE
+ bodyScrollTop=document.documentElement&&document.documentElement.scrollTop?document.documentElement.scrollTop:document.body.scrollTop;
+ bodyScrollLet=document.documentElement&&document.documentElement.scrollLeft?document.documentElement.scrollLeft:document.body.scrollLeft;
+ mouseX=evt.pageX?evt.pageX-bodyScrollLet:evt.clientX-document.body.clientLeft;
+ mouseY=evt.pageY?evt.pageY-bodyScrollTop:evt.clientY-document.body.clientTop;
+ if ((CBE)&&(CBE.windowLock)) {
+ mouseY < -oy?lockY=-mouseY-oy:lockY=0;
+ mouseX < -ox?lockX=-mouseX-ox:lockX=0;
+ mouseY > (SHW()[1]-oDv.offsetHeight-oy)?lockY=-mouseY+SHW()[1]-oDv.offsetHeight-oy:lockY=lockY;
+ mouseX > (SHW()[0]-dvBdy.offsetWidth-ox)?lockX=-mouseX-ox+SHW()[0]-dvBdy.offsetWidth:lockX=lockX;
+ }
+ oDv.style.left=((fixposx)||(fixposx==0))?fixposx:bodyScrollLet+mouseX+ox+lockX+"px";
+ oDv.style.top=((fixposy)||(fixposy==0))?fixposy:bodyScrollTop+mouseY+oy+lockY+"px";
+
+ }
+}
+
+function doCheck() {
+ if ( (mouseX < boxLeft) || (mouseX >boxRight) || (mouseY < boxTop) || (mouseY > boxBottom)) {
+ if (!CBE.requireclick)
+ fadeOut();
+ if (CBE.IEbugfix) {showSelects();}
+ CBE=null;
+ }
+}
+
+function pauseBox(e) {
+ e?evt=e:evt=event;
+ boxMove=false;
+ evt.cancelBubble=true;
+}
+
+function showHideBox(e) {
+ oDv.style.visibility=(oDv.style.visibility!='visible')?'visible':'hidden';
+}
+
+function hideBox(e) {
+ oDv.style.visibility='hidden';
+}
+
+var COL=0;
+var stopfade=false;
+function fadeIn(fs) {
+ ID=null;
+ COL=0;
+ oDv.style.visibility='visible';
+ fadeIn2(fs);
+}
+
+function fadeIn2(fs) {
+ COL=COL+fs;
+ COL=(COL>1)?1:COL;
+ oDv.style.filter='alpha(opacity='+parseInt(100*COL)+')';
+ oDv.style.opacity=COL;
+ if (COL<1)
+ setTimeout("fadeIn2("+fs+")",10);
+}
+
+
+function fadeOut() {
+ oDv.style.visibility='hidden';
+
+}
+
+function isChild(s,d) {
+ while(s) {
+ if (s==d)
+ return true;
+ s=s.parentNode;
+ }
+ return false;
+}
+
+var cSrc;
+function checkMove(e) {
+ e?evt=e:evt=event;
+ cSrc=evt.target?evt.target:evt.srcElement;
+ if ((!boxMove)&&(!isChild(cSrc,oDv))) {
+ fadeOut();
+ if (CBE&&CBE.IEbugfix) {showSelects();}
+ boxMove=true;
+ CBE=null;
+ }
+}
+
+function showSelects(){
+ var elements = document.getElementsByTagName("select");
+ for (i=0;i< elements.length;i++){
+ elements[i].style.visibility='visible';
+ }
+}
+
+function hideSelects(){
+ var elements = document.getElementsByTagName("select");
+ for (i=0;i< elements.length;i++){
+ elements[i].style.visibility='hidden';
+ }
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-10-18 08:47:55
|
Revision: 3832
http://oscss.svn.sourceforge.net/oscss/?rev=3832&view=rev
Author: oscim
Date: 2011-10-18 08:47:44 +0000 (Tue, 18 Oct 2011)
Log Message:
-----------
Ajout nouveau template pour la 2.1.1 dans l'installateur
Added Paths:
-----------
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/boxe.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/footer.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/header.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/module.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/sidebar.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/ssheader.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/blank.gif
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/configuration.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/desc.xml
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/iecss.css
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/iepngfix.htc
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/buynow.png
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/cart.png
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/carticon.png
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/introbkg.png
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/introimage.png
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/introimage1.png
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/methodspayment.png
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/moreinfo.png
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/navbg.png
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/js/
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/popup.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/template.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/thumb.jpg
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/boxe.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/boxe.php (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/boxe.php 2011-10-18 08:47:44 UTC (rev 3832)
@@ -0,0 +1,16 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @subpackage Template 2cShopHtml5Oscim
+ @package osCSS-2 <www http://www.oscss.org>
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+?>
+<section id="Box-<?php echo $boxe->name_clean; ?>" class="boxe">
+ <header>
+ <h3 class="boxe title"><?php echo unhtmlentities($boxe->title) ;?></h3>
+ </header>
+
+ <?php echo unhtmlentities($boxe->content) ?>
+</section>
\ No newline at end of file
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/footer.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/footer.php (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/footer.php 2011-10-18 08:47:44 UTC (rev 3832)
@@ -0,0 +1,44 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @subpackage Template 2cShopHtml5Oscim
+ @package osCSS-2 <www http://www.oscss.org>
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+global $template;
+?>
+ <footer id="main-tpl-footer">
+ <p class="left_footer"></p>
+ <p class="center_footer">
+ ~ Realisation <a href="http://www.oscim.fr">oscim</a> 2010-2011 ~<br />
+ ~ Propulsé par <a href="http://www.oscss.org/" title=" osCSS ">osCSS</a> ~<br />
+ ~ Valid <a href="http://validator.w3.org/check?uri=referer" title=" validate XHTML ">XHTML</a>
+ · <a href="http://jigsaw.w3.org/css-validator/check/referer" title=" validate CSS ">CSS</a> ~
+ <br />
+ <a href="http://csscreme.com" rel="nofollow" ><img alt="csscreme" src="<?php echo tep_get_httpdir().'templates/'.$template.'/' ?>images/csscreme.jpg" /></a>
+ </p>
+ <div class="right_footer">
+ <a href="<?php echo tep_href_link() ?>"><?php echo __('home') ?></a>
+ <a href="<?php echo tep_href_link(FILENAME_TEMPLATE) ?>"><?php echo __('about') ?></a>
+ <a href="<?php echo tep_href_link(FILENAME_SITEMAP) ?>"><?php echo __('sitemap') ?></a>
+ <a href="<?php echo tep_href_link('rss.php') ?>"><?php echo __('rss') ?></a>
+ <a href="<?php echo tep_href_link(FILENAME_CONTACT_US) ?>"><?php echo __('contact us') ?></a>
+ </div>
+
+ <?php $box_left=$page->oscss_boxes->_call('','hidden');
+ while($box=each($box_left)) : $boxe =$page->oscss_boxes->_return($box['key']);
+ if (!$page->is_page_here($boxe->name_clean)) : ?>
+ <div id="<?php echo $boxe->name_clean; ?>Box" class="<?php echo $boxe->name_clean; ?>">
+ <?php include('boxe.php'); ?>
+ </div>
+ <?php endif; endwhile; ?>
+
+ <?php /** Retour d'erreur sur la boutique */ $this->messageStack->_draw('error'); ?>
+
+ </footer>
+
+ </div>
+
+
+ <?php /** Fichier appel bottom page */ $this->draw_file_footer(); ?>
\ No newline at end of file
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/header.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/header.php (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/header.php 2011-10-18 08:47:44 UTC (rev 3832)
@@ -0,0 +1,78 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @subpackage Template 2cShopHtml5Oscim
+ @package osCSS-2 <www http://www.oscss.org>
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+
+
+ Dans Ce fichier, les element du constructeur sont accessible directement, via la variable this.
+ Chaque sous object est nommé comme la variable habituelle
+ ex: $breadcrumb == $this->breadcrumb
+
+ Les variable local, de la page application top par exemple, eux ne le sont pas. Tout les appel ici, doit utiliser l'object constructeur
+
+ La configuration du theme: editer le fichier /cfg/init.php
+
+
+ @note
+ Ce fichier assure le chargement de l'entete de page, et des element qu'il doit contenir (css , javascript, meta, title) de maniere dynamqiue.
+ En générale, il n'est pas necessaire de modifié celui ci .
+
+ Les variable accessible au sein de ce fichier pour traité les parametre sont:
+ - $page : object contrusteur
+ - $load : configuration fournis en arguement de l'appel de ce fichier
+
+
+ C'est le fichier de template Master, qui est chargée de l'appel de ce fichier.
+ Pour intégrer celui ci dans u fichier master il est necessaire d'utiliser cette forme
+
+ echo $page->tep_get_header('file='.$page->the_var('PathChildGab').'header') ;
+
+ L'arguement est optionnel, il permet le cas echeants de transmettre un chemin autre que le chemin par default
+ Sans arguement la function cherche a charger un fichier header.php palcé à la racine du theme
+*/
+
+?>
+<!-- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -->
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" <?php echo HTML_PARAMS; ?> >
+<head>
+ <title><?php echo $page->the_title(); ?></title>
+ <meta name="description" content="<?php echo $the_desc ?>" />
+ <meta name="keywords" content="<?php echo $the_key_words ?>" />
+ <meta http-equiv="content-type" content="text/html; charset=<?php echo CHARSET; ?>" />
+ <meta name="author" content="oscim"/>
+ <meta name="reply-to" content="<?php echo HEAD_REPLY_TAG_ALL ?>" />
+ <meta name="robots" content="all" />
+ <meta name="generator" content="osCSS-2" />
+ <base href="<?php echo tep_get_httpdir() ; ?>" />
+ <link rel="stylesheet" type="text/css" href="<?php echo 'templates/'.$template.'/'; ?>sample.css" media="all"/>
+ <!--[if IE 6]>
+ <link rel="stylesheet" type="text/css" href="<?php echo 'templates/'.$template.'/'; ?>iecss.css" />
+ <![endif]-->
+ <!--<if LT IE8>
+ <script type="text/css">
+ .checkoutBar li { display:inline!important; }
+ </script>
+ <endif>-->
+
+ <script type="text/javascript" src="<?php echo 'templates/'.$template.'/'; ?>js/boxOver.js"></script>
+
+ <script type="text/javascript" src="includes/general.js" ></script>
+
+
+ <?php /**
+ @remarks Cette fonction doit necessairement être chargée lors de l'appel du gabarit,
+ sans quoi l'initialisation du template n'et pas achevé
+ */
+ $this->draw_file_header(); ?>
+
+
+ <link rel="shortcut icon" type="images/x-icon" href="favicon.ico"/>
+ <link rel="alternate" type="application/rss+xml" title="global" href="<?php echo tep_get_httpdir().'rss.php' ?>" />
+ <link rel="canonical" href="<?php echo CanonicalUrl(); ?>" />
+</head>
+ <body id="<?php echo page::oscss_body_id() ; ?>" class="<?php echo 'Type_'.$page->the_type(); ?> <?php echo 'Class_'.$page->the_typeClass('class'); ?>">
+
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/module.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/module.php (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/module.php 2011-10-18 08:47:44 UTC (rev 3832)
@@ -0,0 +1,128 @@
+<?php
+/**
+ @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.0
+ @date 15/12/10, 21:14
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+global $load;
+?>
+
+<?php if($load->module !='child') : ?>
+ <header>
+ <h1 class="content title <?php echo $language ;?>"><?php echo HEADING_TITLE ?></h1>
+ </header>
+<?php endif; ?>
+
+<div class="module">
+ <section class="module">
+ <?php if($load->module =='child') : ?>
+ <header>
+ <h4 class="module title"><?php echo unhtmlentities($themodule->module_db->title) ;?></h4>
+ </header>
+ <?php endif; ?>
+
+ <?php if(isset($ele->text)): ?>
+ <p><?php echo unhtmlentities($themodule->module_db->text) ;?></p>
+ <?php endif; ?>
+
+
+ <?php /*if ( isset($themodule->module_db->split) && ($themodule->module_db->split->number_of_rows > 0) && (in_array(PREV_NEXT_BAR_LOCATION ,array('1','3') )) ) { ?>
+ <div id="splitPageTop" class="splitnav">
+ <p class="sP1"><?php echo $themodule->module_db->split->display_count(TEXT_DISPLAY_NUMBER_OF); ?></p>
+ <p class="sP2"><?php echo TEXT_RESULT_PAGE . ' ' . $themodule->module_db->split->display_links(MAX_DISPLAY_PAGE_LINKS, tep_get_all_get_params(array('page', 'info'))); ?></p>
+ </div>
+ <?php }*/ ?>
+
+
+
+ <ul>
+
+ <?php foreach($themodule->module_db->content as $ele): ?>
+
+ <?php if(isset($ele->products_id)): /** PRODUCTS */ ?>
+ <li class="one product">
+ <section class="outerblock">
+ <div class="innerblock">
+ <?php if ($page->_draw_in_page('PRODUCT_LIST_NAME')) { ?>
+ <p class="title product"><?php echo '<a href="' . tep_href_link(FILENAME_PRODUCT_INFO, 'products_id=' . $ele->products_id) . '" title="header=['.$ele->products_name.'] body=[ ] fade=[on]">' . $ele->products_name . '</a>' ;?></p>
+ <?php } ?>
+
+ <?php if ($page->_draw_in_page('PRODUCT_LIST_IMAGE')) { ?>
+ <p class="img product"><?php echo '<a href="' . tep_href_link(FILENAME_PRODUCT_INFO, 'products_id=' . $ele->products_id) . '" title="header=['.$ele->products_name.'] body=[ ] fade=[on]" >' . tep_image(DIR_WS_IMAGES . @$ele->products_image, $ele->products_name, $page->_conf_value('SMALL_IMAGE_WIDTH'), $page->_conf_value('SMALL_IMAGE_HEIGHT')) . '</a>' ; ?></p>
+ <?php } ?>
+
+ <?php if (tep_not_null($ele->products_price) && $page->_draw_in_page('PRODUCT_LIST_PRICE')) { ?>
+ <p class="price prod">
+ <?php echo print_products_price_rv($ele) ?>
+ </p>
+ <?php } ?>
+
+ <div class="innerblock-more">
+ <?php if ( $page->_draw_in_page('PRODUCT_LIST_BUY_NOW')) { ?>
+ <?php if (_test_bool($ele->action['buy'] )) : ?>
+ <?php echo tep_draw_form($themodule->id.'cart_quantity'.$ele->products_id, tep_href_link(FILENAME_DEFAULT, tep_get_all_get_params(array('action')) . 'action=add_product')); ?>
+ <p>
+ <?php echo tep_draw_hidden_field('products_id', $ele->products_id). tep_draw_hidden_field('products_quantity', '1'); ?>
+ <input title="header=[<?php echo __('add to cart') ?>] body=[ ] fade=[on]" type="image" src="<?php echo $page->getPathTemplate() ?>images/carticon.png" onclick="this.form.submit()"/>
+ </p>
+ </form>
+ <?php elseif (count(product_attribut_info($ele->products_id)) != 0): ?>
+ <p><a class="submitBt" href="<?php echo tep_href_link(FILENAME_PRODUCT_INFO,'products_id='.$ele->products_id)?>" ><img border="0" class="left_bt" title="" alt="" src="<?php echo $page->getPathTemplate() ?>images/carticon.png"></a></p>
+ <?php endif; ?>
+ <?php } ?>
+
+ <?php /* if ( $page->_draw_in_page('PRODUCT_LIST_BUY_NOW')) { ?>
+ <?php echo tep_draw_form($themodule->id.'wishlist_quantity'.$ele->products_id, tep_href_link(FILENAME_DEFAULT, tep_get_all_get_params(array('action')) . 'action=add_wishlist'), 'post', ' class="left_bt" '); ?>
+ <p>
+ <?php echo tep_draw_hidden_field('products_id', $ele->products_id). tep_draw_hidden_field('products_quantity', '1'); ?>
+ <input title="header=[<?php echo __('add to wishlist') ?>] body=[ ] fade=[on]" type="image" src="<?php echo $page->getPathTemplate() ?>images/favs.gif" onclick="this.form.submit()"/>
+ </p>
+ </form>
+ <?php }*/ ?>
+
+ <a class="details prod" href="<?php echo tep_href_link(FILENAME_PRODUCT_INFO, 'products_id=' . $ele->products_id) ?>" title="header=[<?php echo __('view more') ?>] body=[ ] fade=[on]"><?php echo __('more') ?></a>
+ </div>
+ </div>
+ </section>
+ </li>
+ <?php elseif(isset($ele->content_id)) : /** POSTS */ ?>
+ <dl class="listing contents <?php echo $page->page_content_clean() ?>">
+ <dt class="listing_s">
+ <a id="<?php echo $ele->content_id; ?>" href="<?php echo tep_href_link(FILENAME_CONTENT,'content='.$ele->content_id) ; ?>" ><?php echo $ele->content_title ?></a>
+ </dt>
+ </dl>
+
+ <?php elseif(isset($ele->categories_id)): /** CATEGORIES */ ?>
+ <li class="one categorie">
+ <section class="outerblock">
+ <div class="innerblock">
+ <p class="title categorie">
+ <a href="<?php echo tep_href_link(FILENAME_DEFAULT, 'cPath='.$ele->cPath) ?>"> <?php echo $ele->categories_name ;?></a>
+ </p>
+ <p class="img categorie">
+ <?php echo '<a href="' . tep_href_link(FILENAME_DEFAULT, 'cPath='.$ele->cPath) . '">' . tep_image(DIR_WS_IMAGES . $ele->categories_image, $ele->categories_name, $page->_conf_value('SUBCATEGORY_IMAGE_WIDTH'), $page->_conf_value('SUBCATEGORY_IMAGE_HEIGHT')) . '<br />' . $ele->categories_name . '</a>' ;?>
+ </p>
+ </div>
+ </section>
+ </li>
+ <?php endif; ?>
+
+ <?php endforeach; ?>
+
+ </ul>
+ </section>
+
+
+ <?php if ( isset($themodule->module_db->split) && ($themodule->module_db->split->number_of_rows > 0)&& (in_array(PREV_NEXT_BAR_LOCATION ,array('2','3') )) ) { ?>
+ <section id="splitPageBottom" class="splitnav">
+ <p class="sP1"><?php echo $themodule->module_db->split->display_count(TEXT_DISPLAY_NUMBER_OF); ?></p>
+ <p class="sP2"><?php echo TEXT_RESULT_PAGE . ' ' . $themodule->module_db->split->display_links(MAX_DISPLAY_PAGE_LINKS, tep_get_all_get_params(array('page', 'info'))); ?></p>
+ </section>
+ <?php } ?>
+ <br class="clear" />
+</div>
+<?php ?>
\ No newline at end of file
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/sidebar.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/sidebar.php (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/sidebar.php 2011-10-18 08:47:44 UTC (rev 3832)
@@ -0,0 +1,26 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @subpackage Template 2cShopHtml5Oscim
+ @package osCSS-2 <www http://www.oscss.org>
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+/** Page produits */ if(isset($_GET['products_id'])) $product_info=$page->the_var('product_info');
+?>
+
+ <?php while($boxe=templ_draw_list('type=boxes&pile='.$page->the_type().'')):
+ if (!$page->is_page_here($boxe->name_clean) ) : ?>
+<!-- <div id="<?php echo $boxe->name_clean; ?>Box" class="deroul l_158"> -->
+ <?php include('boxe.php'); ?>
+<!-- </div> -->
+ <?php endif; endwhile; ?>
+
+ <?php while($boxe=templ_draw_list('type=boxes&pile=sidebar')):
+ if (!$page->is_page_here($boxe->name_clean) ) : ?>
+<!-- <div id="<?php echo $boxe->name_clean; ?>Box" class="deroul l_158"> -->
+ <?php include('boxe.php'); ?>
+<!-- </div> -->
+ <?php endif; endwhile; ?>
+
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/ssheader.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/ssheader.php (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/ssheader.php 2011-10-18 08:47:44 UTC (rev 3832)
@@ -0,0 +1,98 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @subpackage Template 2cShopHtml5Oscim
+ @package osCSS-2 <www http://www.oscss.org>
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+global $customer_id;
+?>
+
+
+
+<header id="top" role="banner">
+
+ <div id="logo">
+ <?php if($load->mode =='home') : ?>
+ <h1><a href="<?php echo tep_href_link() ?>"><img src="<?php echo STORE_LOGO ?>" alt="<?php echo STORE_NAME ?>" title="<?php echo STORE_NAME ?>" /></a></h1>
+ <?php else : ?>
+ <p><a href="<?php echo tep_href_link() ?>"><img src="<?php echo STORE_LOGO ?>" alt="<?php echo STORE_NAME ?>" title="<?php echo STORE_NAME ?>" /></a></p>
+ <?php endif; ?>
+ </div>
+
+
+ <div id="top_bar">
+ <?php
+ /**
+ @remarks Call widget boxe serach suggest
+ */
+ $boxe =$page->oscss_boxes->_return('Widget_search_suggest'); ?>
+ <div id="<?php echo $boxe->name_clean; ?>Box" class="<?php echo $boxe->name_clean; ?>">
+ <?php include('boxe.php'); ?>
+ </div>
+
+ <div class="languages">
+ <?php
+ /**
+ @remarks Call widget boxe serach suggest
+ */
+ $boxe =$page->oscss_boxes->_return('languages'); ?>
+ <?php include('boxe.php'); ?>
+ </div>
+
+ </div>
+
+
+
+</header>
+
+
+
+<nav>
+ <ul class="menu content">
+ <li><a href="<?php echo tep_href_link(FILENAME_DEFAULT) ?>" class="nav1"><?php echo __('home') ?></a></li>
+ <li><a href="<?php echo tep_href_link(FILENAME_SMALL_PRICE) ?>" class="nav2"><?php echo PAGE_SMALL_PRICE ?></a></li>
+ <li>
+ <?php if(defined('FILENAME_WISHLIST')) : ?>
+ <a href="<?php echo tep_href_link(FILENAME_WISHLIST) ?>" class="nav3"><?php echo __('wishlist') ?></a></li>
+ <?php else : ?>
+ <a href="<?php echo tep_href_link(FILENAME_SPECIALS) ?>" class="nav3"><?php echo PAGE_SPECIALS ?></a></li>
+ <?php endif; ?>
+ <li><a id="GoLogin" href="<?php echo tep_href_link(FILENAME_ACCOUNT) ?>" class="nav4"><?php echo PAGE_ACCOUNT ?></a></li>
+ <li><a href="<?php echo tep_href_link(FILENAME_CONTENT, 'content=1') ?>" class="nav5"><?php echo __('shipping') ?> </a></li>
+ <li><a href="<?php echo tep_href_link(FILENAME_CONTACT_US) ?>" class="nav6"><?php echo BOX_INFORMATION_CONTACT ?></a></li>
+<!-- <li class="currencies">
+ <?php //$boxe =$page->oscss_boxes->_return('currencies'); ?>
+ <?php //include('boxe.php'); ?>
+ </li>-->
+ </ul>
+</nav>
+
+<?php if($load->mode =='home') : ?>
+ <section id="intro">
+ <div class="intro content">
+ <?php
+ /**
+ @remarks Call generic moduel cat_home for slider
+ */
+ $ACA_generic=generic::getInstance();
+ if(is_object($res=$ACA_generic->display_view($customer_id,'cat_home')) ) : ?>
+ <?php echo unhtmlentities($res->content); ?>
+
+
+ <a class="intro content more" href="details.html" >details</a>
+ <?php /** FOR EXAMPLE */ else : ?>
+ <h3>Tee Central - Home of the Cheap Cheap Tees</h3>
+
+ <div>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut. Consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi.</div>
+ <?php endif; ?>
+ </div>
+ </section>
+<?php endif; ?>
+
+<?php if($load->mode !='home') : ?>
+ <nl role="breadcrumbs" id="breadcrumbs">
+ <?php echo __('Navigation:').$page->draw_breadcrumb(); ?>
+ </nl>
+<?php endif; ?>
\ No newline at end of file
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/blank.gif
===================================================================
(Binary files differ)
Property changes on: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/blank.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/configuration.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/configuration.php (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/configuration.php 2011-10-18 08:47:44 UTC (rev 3832)
@@ -0,0 +1,81 @@
+<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
+/**
+ @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.0
+ @date 26/09/10, 21:14
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+/* Config divers */
+UpConfigKey('SMALL_IMAGE_WIDTH','60');
+UpConfigKey('SMALL_IMAGE_HEIGHT','60');
+UpConfigKey('HEADING_IMAGE_WIDTH','160');
+UpConfigKey('HEADING_IMAGE_HEIGHT','250');
+UpConfigKey('SUBCATEGORY_IMAGE_WIDTH','120');
+UpConfigKey('SUBCATEGORY_IMAGE_HEIGHT','120');
+UpConfigKey('POPUP_IMAGE_WIDTH','600');
+UpConfigKey('POPUP_IMAGE_HEIGHT','600');
+UpConfigKey('STACK_IMAGE_WIDTH','50');
+UpConfigKey('STACK_IMAGE_HEIGHT','50');
+UpConfigKey('JPEG_QUALITY','95');
+
+UpConfigKey('PRODUCT_LIST_WEIGHT','false');
+UpConfigKey('PRODUCT_LIST_MODEL','false');
+UpConfigKey('PRODUCT_LIST_DESCRIPTION','false');
+UpConfigKey('PRODUCT_LIST_MANUFACTURER','false');
+UpConfigKey('PRODUCT_LIST_PRICE','false');
+UpConfigKey('PRODUCT_LIST_WEIGHT','false');
+UpConfigKey('PRODUCT_LIST_QUANTITY','false');
+
+UpConfigKey('DISPLAY_CART','false');
+
+/* Config des plugins */
+ResetConfigKey('PLUGIN_ACCOUNT_INSTALLED');
+ResetConfigKey('PLUGIN_GENERIC_INSTALLED');
+ResetConfigKey('PLUGIN_HOME_INSTALLED');
+ResetConfigKey('PLUGIN_LISTING_INSTALLED');
+ResetConfigKey('PLUGIN_PRODUCT_INSTALLED');
+
+AddConfigInKey('PLUGIN_GENERIC_INSTALLED','lazyload.php');
+AddConfigInKey('PLUGIN_GENERIC_INSTALLED','slider .php');
+AddConfigInKey('PLUGIN_PRODUCT_INSTALLED','slimbox.php');
+AddConfigInKey('PLUGIN_PRODUCT_INSTALLED','uicoretabs.php');
+
+
+/* Config des modules base */
+ResetConfigKey('MODULE_ACAPRO_INSTALLED');
+ResetConfigKey('MODULE_ACAPRO_INSTALLED_BO');
+ResetConfigKey('MODULE_ACCOUNT_INSTALLED');
+ResetConfigKey('MODULE_ACCOUNT_INSTALLED_BO');
+ResetConfigKey('MODULE_GENERIC_INSTALLED');
+
+addConfigModule('MODULE_ACAPRO_INSTALLED', 'attributeManager.php');
+addConfigModule('MODULE_ACAPRO_INSTALLED', 'desc_base.php');
+addConfigModule('MODULE_ACAPRO_INSTALLED_BO', 'attributeManager.php');
+addConfigModule('MODULE_ACAPRO_INSTALLED_BO', 'desc_base.php');
+addConfigModule('MODULE_ACAPRO_INSTALLED_BO', 'header_tags.php');
+addConfigModule('MODULE_ACCOUNT_INSTALLED', 'address_book.php');
+addConfigModule('MODULE_ACCOUNT_INSTALLED', 'account_extra.php');
+addConfigModule('MODULE_ACCOUNT_INSTALLED_BO', 'address_book.php');
+addConfigModule('MODULE_ACCOUNT_INSTALLED_BO', 'sppc_cust_force.php');
+addConfigModule('MODULE_GENERIC_INSTALLED', 'banner.php');
+addConfigModule('MODULE_GENERIC_INSTALLED', 'cat_home.php');
+
+//! Update plugin sinatlled vs CIP
+LibConf_UpPackageBD('LAZYLOAD_stable','LAZYLOAD_stable');
+LibConf_UpPackageBD('UIEFFECT_stable','UIEFFECT_stable');
+LibConf_UpPackageBD('JCAROUSEL_stable','JCAROUSEL_stable');
+LibConf_UpPackageBD('ATTRIBUTEMANAGER_stable','ATTRIBUTEMANAGER_stable');
+LibConf_UpPackageBD('HEADER_TAGS_stable','HEADER_TAGS_stable');
+/* Purge du repertoire de miniature */
+$path = DIR_FS_CATALOG.DIR_WS_IMAGES.'imagecache/' ;
+$dir = opendir($path);
+$templates = array();
+while ($file = readdir($dir)) {
+ if($file != '..' && $file !='.' && $file !='') unlink($path.$file);
+}
+closedir($dir);
+?>
+<p><?php echo __('text option success') ?></p>
\ No newline at end of file
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php 2011-10-18 08:47:44 UTC (rev 3832)
@@ -0,0 +1,240 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @subpackage Template 2cShopHtml5Oscim
+ @package osCSS-2 <www http://www.oscss.org>
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+
+
+
+ @note
+ Dans Ce fichier, les element du constructeur sont accessible directement, via la variable this.
+ Chaque sous object est nommé comme la variable habituelle
+ ex: $breadcrumb == $this->breadcrumb
+
+ Les variable locales, du application_top par exemple, ne le sont pas.
+ Tout les appels ici, doit utiliser l'object constructeur
+
+
+ Utilisation de l'objet local
+ $load
+
+ Cet object est specifique au templae, il est initialisé avant l'appel de fichier, est accesible depuis tous les elemnts inclus de ce theme
+ Il transmet ainsi tout calcul ou opertaion necessitant un transport d'informations
+*/
+
+$load = $page->GetThemeLoad();
+
+
+/**
+ @var develop
+ commenté par defaut
+ affiche le panneau des définitions de pages
+*/
+$this->add_var_page('develop','false');
+
+
+/**
+ @var PathChildGab Path
+ Childs html tpl files
+*/
+$this->add_var_page('PathChildGab','Childs_tpl/');
+
+
+/**
+ Dimension rediemensionnement img sidebar si pas de configuration prticuliére (plugin, Configuration)
+*/
+$this->add_var_page('SIDEBAR_IMG_WIDTH','150');
+$this->add_var_page('SIDEBAR_IMG_HEIGHT','150');
+$this->add_var_page('HEADING_IMG_WIDTH','150');
+$this->add_var_page('HEADING_IMG_HEIGHT','150');
+/**
+ Nbr maxi dans les listes (shearch, listing)
+*/
+$this->add_var_page('MAX_DISPLAY_SEARCH_RESULTS','10');
+$this->add_var_page('MAX_DISPLAY_PAGE_LINKS','15');
+
+
+/**
+ Configuration des boxes
+Les boxes sont appelé via les lg suivant.
+$this->oscss_boxes(Nom de la boxes, parent);
+@param string boxe: juste le nom, sans ext, et sans path
+@param string parent: le nom dans lesquel l'element sera stocké
+*/
+
+
+
+
+
+/** Menu des devises */
+
+
+
+
+
+
+// if( tep_session_is_registered('customer_id') )
+// $this->oscss_boxes->_addWidget('Widget_account_info', 'right');
+
+
+
+
+
+
+/** Box login / info */
+ $this->oscss_boxes->_addWidget('Widget_login_box', 'hidden');
+
+ $this->oscss_boxes->_add('languages', 'headertop');
+/** Boite de recherche */
+ $this->oscss_boxes->_addWidget('Widget_search_suggest', 'headertop');
+
+ $this->oscss_boxes->_add('currencies', 'header');
+
+ $this->oscss_boxes->_add('shopping_cart_short', 'header' ,array('cache'=>false));
+
+
+ /**
+ @var mode used in template.php for adjust affichage
+ mixed type and other control for determine mode
+ */
+ $load->mode = $page->GetPageType();
+ /**
+ @var module default child, else master
+ master is mode full screen , and child is complete existant page
+ */
+ $load->module = 'child';
+
+/**
+ @brief Estimate environement, for choose block load
+*/
+
+switch($page->GetPageType()){
+
+
+ case 'home':
+ $this->oscss_boxes->_add('whats_new', 'sidebar', array('cache'=>false));
+ $this->oscss_boxes->_add('specials', 'sidebar', array('cache'=>false));
+
+ $load->mode = 'home';
+ break;
+
+ case 'cart':
+ $this->oscss_boxes->_add('categories', 'sidebar');
+ $this->oscss_boxes->_add('whats_new', 'sidebar', array('cache'=>false));
+ $this->oscss_boxes->_add('specials', 'sidebar', array('cache'=>false));
+ break;
+ case 'checkout':
+ $this->oscss_boxes->_add('checkout_progressbar', 'progressbar');
+ break;
+
+ case 'account':
+ $this->oscss_boxes->_add('shopping_cart', 'sidebar' ,array('cache'=>false,'sort'=>40));
+ $this->oscss_boxes->_add('specials', 'sidebar', array('cache'=>false));
+ break;
+
+ case 'content':
+ $this->oscss_boxes->_add('categories', 'sidebar');
+ break;
+
+ case 'product':
+ $this->oscss_boxes->_add('categories', 'sidebar');
+ $this->oscss_boxes->_add('manufacturer_info', 'sidebar');
+ $this->oscss_boxes->_add('specials', 'sidebar', array('cache'=>false));
+ break;
+
+ case 'listing':
+ $this->oscss_boxes->_add('categories', 'sidebar');
+ $this->oscss_boxes->_add('manufacturers', 'sidebar');
+
+ // precise si module utilisé comme pleine page
+ switch(self::oscss_body_id()){
+ case 'Page_listing_small_price':
+ case 'Page_listing_best_sellers':
+ case 'Page_listing_specials':
+ case 'Page_listing_products_new':
+ $load->module = 'master';
+ break;
+ default:
+ $load->module = 'child';
+ }
+
+
+ break;
+
+
+ case 'none':
+ default:
+
+ $this->oscss_boxes->_add('categories', 'sidebar');
+ $this->oscss_boxes->_add('whats_new', 'sidebar', array('cache'=>false));
+ $this->oscss_boxes->_add('specials', 'sidebar', array('cache'=>false));
+}
+
+
+
+
+
+
+/**
+ Redéfini les elements visible sur cette page
+
+ Ces appel force la configuration defini dans le backoffice. Ces appels ne peuvent avoir lieux que sur des foction d'affichge, et en aucun cas de fonctionnement.
+
+ Les elements suivant redéfinisent des valeurs bollean
+
+ Utilisable dans le template via la commande
+ $page->_draw_in_page('PRODUCT_LIST_DESCRIPTION')
+*/
+
+$page->add_var_page('PRODUCT_LIST_IMAGE','true');
+$page->add_var_page('SMALL_IMAGE_WIDTH','100');
+$page->add_var_page('SMALL_IMAGE_HEIGHT','100');
+$page->add_var_page('PRODUCT_LIST_BUY_NOW','true');
+$page->add_var_page('PRODUCT_LIST_NAME','true');
+$page->add_var_page('PRODUCT_LIST_PRICE','true');
+/**
+ Force les configurations sur les valeurs sauf boolean
+ utilisable via l'appel $page->_conf_value('NON_CONSTANTE');
+*/
+$page->add_var_page('MAX_DISPLAY_PRODUCTS_NEW','25');
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/**
+ Configuration des modules.
+*/
+// if($page->is_page_type('product') ){
+// $this->oscss_modules->_add(FILENAME_ALSO_PURCHASED_PRODUCTS,'center',array('sort'=>60));
+// $this->oscss_modules->_add(FILENAME_UPCOMING_PRODUCTS,'center',array('sort'=>60));
+// }
+// elseif(!$page->is_page_type('account') && !$page->is_page_type('cart') && !$page->is_page_type('checkout')&& !$page->is_page_type('none'))
+// $this->oscss_modules->_add(FILENAME_NEW_PRODUCTS,'center',array('sort'=>60));
+
+/**
+Les element a placé dans les gabarits de page
+
+Il sont nécessairement appelé par $page, ou le code raccourcis de l'object
+*/
+?>
\ No newline at end of file
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/desc.xml
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/desc.xml (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/desc.xml 2011-10-18 08:47:44 UTC (rev 3832)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<template>
+ <name>2cShopHtml5Oscim</name>
+ <version>1</version>
+ <author>oscim</author>
+ <desc>Thème generic, 2 colonnes, classique ecommerce. Html5 </desc>
+ <thumb>thumb.jpg</thumb>
+</template>
+
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/iecss.css
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/iecss.css (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/iecss.css 2011-10-18 08:47:44 UTC (rev 3832)
@@ -0,0 +1 @@
+img, div { behavior: url(iepngfix.htc) }
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/iepngfix.htc
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/iepngfix.htc (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/iepngfix.htc 2011-10-18 08:47:44 UTC (rev 3832)
@@ -0,0 +1,68 @@
+<public:component>
+<public:attach event="onpropertychange" onevent="doFix()" />
+
+<script type="text/javascript">
+
+// IE5.5+ PNG Alpha Fix v1.0RC4
+// (c) 2004-2005 Angus Turnbull http://www.twinhelix.com
+
+// This is licensed under the CC-GNU LGPL, version 2.1 or later.
+// For details, see: http://creativecommons.org/licenses/LGPL/2.1/
+
+
+// This must be a path to a blank image. That's all the configuration you need.
+if (typeof blankImg == 'undefined') var blankImg = 'blank.gif';
+
+
+var f = 'DXImageTransform.Microsoft.AlphaImageLoader';
+
+function filt(s, m)
+{
+ if (filters[f])
+ {
+ filters[f].enabled = s ? true : false;
+ if (s) with (filters[f]) { src = s; sizingMethod = m }
+ }
+ else if (s) style.filter = 'progid:'+f+'(src="'+s+'",sizingMethod="'+m+'")';
+}
+
+function doFix()
+{
+ // Assume IE7 is OK.
+ if (!/MSIE (5\.5|6\.)/.test(navigator.userAgent) ||
+ (event && !/(background|src)/.test(event.propertyName))) return;
+
+ var bgImg = currentStyle.backgroundImage || style.backgroundImage;
+
+ if (tagName == 'IMG')
+ {
+ if ((/\.png$/i).test(src))
+ {
+ if (currentStyle.width == 'auto' && currentStyle.height == 'auto')
+ style.width = offsetWidth + 'px';
+ filt(src, 'scale');
+ src = blankImg;
+ }
+ else if (src.indexOf(blankImg) < 0) filt();
+ }
+ else if (bgImg && bgImg != 'none')
+ {
+ if (bgImg.match(/^url[("']+(.*\.png)[)"']+$/i))
+ {
+ var s = RegExp.$1;
+ if (currentStyle.width == 'auto' && currentStyle.height == 'auto')
+ style.width = offsetWidth + 'px';
+ style.backgroundImage = 'none';
+ filt(s, 'crop');
+ // IE link fix.
+ for (var n = 0; n < childNodes.length; n++)
+ if (childNodes[n].style) childNodes[n].style.position = 'relative';
+ }
+ else filt();
+ }
+}
+
+doFix();
+
+</script>
+</public:component>
\ No newline at end of file
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/buynow.png
===================================================================
(Binary files differ)
Property changes on: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/buynow.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/cart.png
===================================================================
(Binary files differ)
Property changes on: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/cart.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/carticon.png
===================================================================
(Binary files differ)
Property changes on: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/carticon.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/introbkg.png
===================================================================
(Binary files differ)
Property changes on: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/introbkg.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/introimage.png
===================================================================
(Binary files differ)
Property changes on: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/introimage.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/introimage1.png
===================================================================
(Binary files differ)
Property changes on: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/introimage1.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/methodspayment.png
===================================================================
(Binary files differ)
Property changes on: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/methodspayment.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/moreinfo.png
===================================================================
(Binary files differ)
Property changes on: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/moreinfo.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/navbg.png
===================================================================
(Binary files differ)
Property changes on: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/images/navbg.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/popup.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/popup.php (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/popup.php 2011-10-18 08:47:44 UTC (rev 3832)
@@ -0,0 +1,28 @@
+<?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 26/09/10, 21:14
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+?>
+<?php echo $page->tep_get_header() ; ?>
+ <div id="content">
+ <?php tep_call_function_mod('tep_get_cms_content',$page->oscss_body_id()); ?>
+ <?php require_once($page->oscss_content()); ?>
+
+ <?php if ( ($module_c=$page->oscss_modules->_call('','center')) && is_array($module_c) )
+ while($mod=each($module_c)) : $module =$page->oscss_modules->_return($mod['key']);?>
+ <div id="<?php echo $module['name_clean']; ?>Box" class="<?php echo $module['name_clean']; ?>">
+ <?php $page->oscss_modules->_draw($module); ?>
+ </div>
+ <?php endwhile; ?>
+ </div>
+<?php /*$page->debugg('modules'); *//*print_r($box_left);*/ ?>
+ <br style="clear:both" />
+ </div>
+</body>
+</html>
\ No newline at end of file
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css 2011-10-18 08:47:44 UTC (rev 3832)
@@ -0,0 +1,263 @@
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @subpackage Template 2cShopHtml5Oscim
+ @package osCSS-2 <www http://www.oscss.org>
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+@import url("Css/Top.css");
+@import url("Css/Bottom.css");
+@import url("Css/Sitemap.css");
+@import url("Css/habillage.css");
+
+/**
+ Style commun et permanent.
+ Ce fichier est appelé dans le tiny du backoffice
+
+*/
+
+
+/* supp du fond sur iframe pour block wisiwing */
+ body.mceContentBody ,
+ iframe#wysiwygmessage{ background:#f0f0ee; clear:both; width:650px; }
+ body.mceContentBody .gabarit{border: 1px solid black; background:white; margin:5px 0;}
+ /* Gabarit pour edition */
+ .central {float:left; width:100%; }
+ .colonne_gd{ width:330px;}
+ .colonne_small{ width:200px;}
+ .col_equal { width:270px;}
+ .fright{ float:right; }
+ .fleft{float:left;}
+
+ .tcenter {text-align:center}
+ .tright {text-align:right}
+
+
+/* Block debugg template */
+ #develop{background:white none repeat scroll 0 0; border:1px solid black; padding:1em; position:fixed; right:0; top:0;}
+
+
+
+
+
+
+
+
+/* --------------------- Css theme ---------------------*/
+
+
+/* Squelette & dim */
+
+/* reset */
+ * { margin: 0; padding: 0; }
+ br.clear {height:0; width:0;}
+/* render html5 elements as block */
+ header,
+ footer,
+ section,
+ aside,
+ nav,
+ article,
+ nl{ display: block; }
+
+/* standard body */
+ body {
+ margin: 0 auto;
+ width: 960px;
+ font: 14px/20px "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif;
+ background: #ff8300;
+ }
+
+/* standard alignments */
+ .alignleft { float: left; }
+
+ img { border: none; }
+ img.alignleft { margin: 5px 10px 0 0; }
+ .alignright { float: right; }
+ img.alignright { margin: 5px 0 0 10px; }
+ .center { text-align: center; }
+
+/* Standard width*/
+ #main_container {width:960px;}
+
+ .messageStack *{list-style:none; margin:0; padding:0;}
+ .messageStack {margin:5px 0; padding:0;}
+ .messageStack li{padding:5px 12px;}
+
+
+
+
+/* Hx tags */
+
+
+h1 {
+ padding: 20px 0;
+ }
+
+h2 {
+ padding: 20px 0;
+ }
+
+h3 {
+ padding: 10px 0;
+ }
+
+p {
+ padding-bottom: 20px;
+ }
+
+
+
+
+
+
+
+/* content and sidebar layout */
+
+#main-tpl {clear:both;}
+
+
+#content {
+ float: right;
+ width: 71.3%;
+ margin:10px 0 10px 0;
+ padding:5px 12px 0 12px;
+}
+
+aside {
+ float: left;
+ width: 26%;
+ margin:0;
+ padding:0;
+ }
+
+/* article */
+
+article {
+ clear:both;
+ }
+
+
+
+
+article h1/*,
+.product h2,
+.product h1*/ {
+ padding-left: 10px;
+ margin-top: 10px;
+ }
+
+article h1/*,
+.product h1,
+.regular h2*/ {
+ padding-left: 10px;
+ margin: 12px 0;
+ }
+
+/* sidebar */
+aside section {
+ margin: 10px 12px 0 0;
+ padding: 10px 15px;
+}
+
+aside section ul {
+ margin-left: 12px;
+ padding-left: 12px;
+ }
+
+aside section ul li {
+ padding-top: 10px;
+ padding-bottom: 22px;
+ }
+
+aside section ul li a {
+ display: block;
+ }
+
+aside section header h3 {
+ padding-left: 10px;
+ margin-top: 10px;
+ }
+
+
+
+
+/* columns */
+
+article div.module {
+clear:both;
+}
+
+.module ul {
+ width: 110%;
+ padding: 0;
+ margin: 0;
+}
+
+.module ul li {
+ display: inline;
+ float: left;
+ margin: 0 17px 12px 0;
+ padding: 0;
+ width: 216px;
+}
+
+.module .outerblock {
+ height: 255px;
+ padding: 12px;
+ width: 90%;
+ }
+
+.module .innerblock {
+ height: 220px;
+ padding: 12px;
+}
+
+
+
+.module .innerblock p {
+ padding-bottom:0.2em;
+}
+
+.module .innerblock p.title{
+ height:41px;
+}
+.module .innerblock p.img{
+ height:100px;
+}
+
+.module .innerblock .innerblock-more{
+ height:35px;
+}
+.module .innerblock .innerblock-more *{
+float:left;
+padding:5px 0 0 5px;
+}
+.module .innerblock .innerblock-more a.details{
+ display:inline-block;
+ line-height:25px;
+ padding-top:15px;
+ padding-right:12px;
+ float:right;
+}
+
+.module .splitnav{clear:both;}
+/* end of column configuration */
+
+
+
+article.product.single figure{
+ display: block;
+ float: left;
+ width: 50%;
+}
+
+
+article.product.single figure ul{
+ display:inline;
+}
+article.product.single figure ul li{
+ float:left;
+ margin:5px 5px;
+}
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/template.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/template.php (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/template.php 2011-10-18 08:47:44 UTC (rev 3832)
@@ -0,0 +1,123 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @subpackage Template 2cShopHtml5Oscim
+ @package osCSS-2 <www http://www.oscss.org>
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+
+ @brief HTML5 gabarit template
+
+ @note
+ Ce fichier est le master du template, il est chargée systematiquement, et assure la mise en oeuvre des sous elements.
+ Ces sous elements sont contenu dans le dossier Chidls_tpl, il est donc necessaire pour les charger d'utliser l'appel comme suit
+ ex :
+ - include($page->the_var('PathChildGab').'module.php')
+ - $page->tep_get_header($page->the_var('PathChildGab').'header')
+
+ Au sein des sous tpl, pour appeler un autre sous tpl, il suffit de preciser lenom de celui li, compte tenu qu'il sont tous les deux conetnu dans le même fichier.
+
+*/
+$load = $page->GetThemeLoad();
+// var_dump($page->the_var('PathChildGab').'header');
+
+?>
+
+<?php /** Section appel header unifié */
+ echo $page->tep_get_header($page->the_var('PathChildGab').'header') ; ?>
+
+
+<?php /** Retour d'erreur checkup sur la boutique */
+ echo $page->messageStack->_draw('header'); ?>
+
+<div id="main_container">
+
+ <?php /** Section appel sous-header unifié */
+ echo $page->tep_get_sidebar($page->the_var('PathChildGab').'ssheader') ?>
+
+ <div id="main-tpl">
+
+ <aside>
+ <?php /** Appel sidebar - fichier type template */
+ echo $page->tep_get_sidebar($page->the_var('PathChildGab').'sidebar') ?>
+ </aside>
+
+ <div id="content">
+
+ <article class="<?php echo ''.$page->the_type(); ?> <?php echo $page->the_typeClass('class'); ?>" >
+ <?php /** Page cms de contenu (Page_home, .. ), ou page contenu dans content */
+ if(( $page->oscss_body_id()!='Page_contact_us' ) &&
+ (($conti=tep_get_cms_content($page->oscss_body_id(), true,
+ '<header>
+ <h1 class="content title '.$language.'">%s</h1>
+ </header>
+ <div class="prod_box_big">
+ <div class="top_prod_box_big"></div>
+ <div class="center_prod_box_big">%s</div>
+ <div class="bottom_prod_box_big"></div>
+ </div>'
+ )) !=false ) ): ?>
+ <?php echo $conti; ?>
+ <?php else: ?>
+ <?php require_once($page->oscss_content()); ?>
+
+ <?php if($load->module !='child') : ?>
+ <?php /* Force draw here content module load by require */ ?>
+ <?php while($themodule=templ_draw_list('type=modules&pile=fullscreen')): /** Appel des module (new_products, product_listing ...) */ ?>
+ <section id="<?php echo $themodule->id ?>" class="<?php echo $themodule->css_class; ?> ">
+ <?php include($page->the_var('PathChildGab').'module.php'); ?>
+ </section>
+ <?php endwhile; ?>
+ <?php endif; ?>
+ <?php endif; ?>
+
+ <?php if($page->is_page_type('product') && $modules=$ACA->display_view($_GET['products_id']) ): /** Boucle des modules aca actif */ ?>
+ <div class="prod_box_big">
+ <div class="center_prod_box_big">
+ <div id="in_tabs" class="in_tabs">
+ <ul id="tablist" class="tabNavigation">
+ <?php /** ACA module */ foreach($modules as $k =>$v){ foreach($v as $kt=>$vt){ $i++; echo '<li style="display:inline"><a href="#in_tabs'.$i.$kt.'">'.$vt->title.'</a> </li>'; } } ?>
+ </ul>
+ <?php reset($modules); $i=1;
+ foreach($modules as $k=>$v)
+ foreach($v as $kt=>$vt){ $i++; ?>
+ <div id="in_tabs<?php echo $i.$kt ?>" class="tabcontent">
+ <?php /** ACA module */ echo unhtmlentities($vt->content); ?>
+ <br style="clear:both" />
+ </div>
+ <?php } ?>
+ </div>
+ </div>
+ </div>
+ <?php endif; ?>
+ </article>
+
+ <?php if($load->module =='child') : ?>
+ <article class="" >
+ <header>
+ <h3 class="content title <?php echo $language ;?>"><?php echo ''; ?></h3>
+ </header>
+ <?php while($themodule=templ_draw_list('type=modules&pile=center')): /** Appel des module (new_products, product_listing ...) */ $load->module='child' ?>
+ <section id="<?php echo $themodule->id ?>" class="<?php echo $themodule->css_class; ?> ">
+ <?php include($page->the_var('PathChildGab').'module.php'); ?>
+ </section>
+ <?php endwhile; ?>
+ </article>
+ <?php endif; ?>
+ <hr class="clear" />
+ </div>
+
+ </div>
+ </div>
+
+ <?php echo $page->tep_get_footer($page->the_var('PathChildGab').'footer') ; ?>
+
+
+ </body>
+</html>
+<?php
+
+// print_r($page->page['modules']);
+exit;
+
+?>
\ No newline at end of file
Added: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/thumb.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/thumb.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-10-18 08:40:30
|
Revision: 3831
http://oscss.svn.sourceforge.net/oscss/?rev=3831&view=rev
Author: oscim
Date: 2011-10-18 08:40:21 +0000 (Tue, 18 Oct 2011)
Log Message:
-----------
correction coquille
amelioration souplesse gestion
Ajout methode class page, alias de function duplication des the_var par GetVar
Ajout var pour transmission element interne au template
Modified Paths:
--------------
trunk/catalog/common/classes/language.php
trunk/catalog/includes/classes/breadcrumb.php
trunk/catalog/includes/classes/core_page/customer.php
trunk/catalog/includes/classes/drivers/data/content.php
trunk/catalog/includes/classes/drivers/page/GabaritTemplate.php
trunk/catalog/includes/classes/page.php
trunk/catalog/password_forgotten.php
Added Paths:
-----------
trunk/catalog/install/includes/sql/mysql/data/40_osc_admin_users.sql
trunk/catalog/install/includes/sql/mysql/data/91_osc_admin_m_files.sql
Removed Paths:
-------------
trunk/catalog/install/includes/sql/mysql/data/40_osc_admin.sql
trunk/catalog/install/includes/sql/mysql/data/91_osc_admin_files.sql
Modified: trunk/catalog/common/classes/language.php
===================================================================
--- trunk/catalog/common/classes/language.php 2011-10-15 08:25:28 UTC (rev 3830)
+++ trunk/catalog/common/classes/language.php 2011-10-18 08:40:21 UTC (rev 3831)
@@ -3,12 +3,14 @@
@licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
+ @version 2.1.1
@date 03/03/11, 15:51
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class language
@brief load langue
+ @note
+ 18/09/2011 Add compatibility OSCSS_ALTERNATE
*/
class language {
@@ -173,6 +175,7 @@
private static function check_langue($directory,$public){
$base=(!$public)? DIR_FS_ADMIN : DIR_FS_CATALOG ;
if(is_dir($base.DIR_WS_LANGUAGES.$directory)) return true;
+ elseif(tep_cst_define('OSCSS_ALTERNATE') == true && is_dir(CORE_PATH.DIR_WS_LANGUAGES.$directory)) return true;
return false;
}
}
Modified: trunk/catalog/includes/classes/breadcrumb.php
===================================================================
--- trunk/catalog/includes/classes/breadcrumb.php 2011-10-15 08:25:28 UTC (rev 3830)
+++ trunk/catalog/includes/classes/breadcrumb.php 2011-10-18 08:40:21 UTC (rev 3831)
@@ -1,12 +1,12 @@
<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
/**
- *\licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- *\portion code Copyright (c) 2002 osCommerce
- *\package osCSS-2 <www http://www.oscss.org>
- *\version 2.1.0
- *\date 28/11/10, 08:18
- *\author oscim <mail aur...@os...> <www http://www.oscim.fr>
- *\encode UTF-8
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 13/10/11, 22:54
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
*\ingroup FrontClass
*\file breadcrumb.php
*\class breadcrumb
@@ -16,27 +16,32 @@
*/
class breadcrumb{
/**
- *
+ *
* @var $_trail array
*/
protected $_trail;
/**
- *
+ @brief reset all, or row for id
*/
- function breadcrumb() {
- $this->reset();
+ function reset($id=0) {
+ if($id>0) {
+ $id = $id-1;
+ unset($this->_trail[$id]);
+ sort($this->_trail);
+ }
+ elseif($id==0) $this->_trail = array();
}
/**
- *
+ *
*/
function reset() {
$this->_trail = array();
}
/**
- *
+ *
* @param $title
* @param $link
*/
@@ -45,7 +50,7 @@
}
/**
- *
+ *
* @param $separator
* @return string
*/
Modified: trunk/catalog/includes/classes/core_page/customer.php
===================================================================
--- trunk/catalog/includes/classes/core_page/customer.php 2011-10-15 08:25:28 UTC (rev 3830)
+++ trunk/catalog/includes/classes/core_page/customer.php 2011-10-18 08:40:21 UTC (rev 3831)
@@ -3,8 +3,8 @@
@licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 29/01/11, 10:55
+ @version 2.1.1
+ @date 17/10/11, 11:03
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@Class customer
@@ -931,7 +931,7 @@
@param logon adjust date logon
*/
static public function initSession($user, $logon = true){
- global $cart;
+ global $cart,$customer_id;
$DB=Database::getInstance();
if (_cst_bool('SESSION_RECREATE')) tep_session_recreate();
Modified: trunk/catalog/includes/classes/drivers/data/content.php
===================================================================
--- trunk/catalog/includes/classes/drivers/data/content.php 2011-10-15 08:25:28 UTC (rev 3830)
+++ trunk/catalog/includes/classes/drivers/data/content.php 2011-10-18 08:40:21 UTC (rev 3831)
@@ -93,7 +93,7 @@
*/
public static function get_query($id='',$search='',$exclude='',$option=array()){ global $languages_id; return contentData::get_query($id,$search,$exclude,$option); }
- public static function get_item($id){ return contentData::get_item($id); }
+ public static function get_item($id,$option=array()){ return contentData::get_item($id,$option); }
public static function get_content_cat($id){ return contentData::get_content_cat($id); }
public static function get_content_path($id){ return contentData::get_content_path($id); }
public static function get_content_in_cat($current_category_id=0, $exclude=''){ return contentData::get_content_in_cat($current_category_id=0, $exclude=''); }
@@ -142,7 +142,10 @@
$DB=Database::getInstance();
self::$obj_language = $DB->query("select code from " . TABLE_LANGUAGES . " where languages_id='" .self::$lg_id . "'");
- if(!empty($option) && is_array($option)) self::$opt=$option;
+ if(!empty($option) && is_array($option)) {
+ self::$opt=$option;
+ self::$cache=array();
+ }
}
@@ -205,7 +208,7 @@
Requeteur
*/
protected static function cstr_query($orderby='', $limit='', $option=''){
- $query="SELECT content_title AS title, c.content_id AS id, c.content_name AS name, content_text AS text
+ $query="SELECT content_title AS title, c.content_id AS id, c.content_name AS name, content_text AS text, c.date_added as date_added
FROM " . TABLE_CONTENT_DESCRIPTION . " cd, " . TABLE_CONTENT . " c, " . TABLE_CONTENT_TO_CATEGORIES . " ctc, " . TABLE_CATEGORIES . " cat
WHERE cat.categories_id=ctc.categories_id and cat.categories_status='1' AND c.content_status = '1' AND c.content_id = ctc.content_id AND cd.content_id = ctc.content_id AND cd.language_id = '" . self::$lg_id . "' " ;
@@ -235,8 +238,10 @@
self::extract_img($id,$content,$pattern);
$sortie=(isset(self::$opt['img']) && !_test_bool(self::$opt['img']))? preg_replace($pattern, '', $content) : $content;
- $sortie=(isset(self::$opt['more']) && _test_bool(self::$opt['more']))? substr($sortie, 0, strpos($sortie,'<!-- pagebreak -->')) : $sortie;
-
+ if(isset(self::$opt['more']) && _test_bool(self::$opt['more'])){
+ if(strpos($sortie,'<!-- pagebreak -->') > 0)
+ $sortie = substr($sortie, 0, strpos($sortie,'<!-- pagebreak -->'));
+ }
/// process replace in text the var config in constante
$pattern = "/%_.*_%/i";
preg_match_all($pattern, $sortie, $replace,PREG_OFFSET_CAPTURE);
@@ -315,9 +320,10 @@
/**
Alias unique ID
*/
- public static function get_item($id){
- $db_list=self::get_query($id);
+ public static function get_item($id,$option=array()){
+ $db_list=self::get_query($id,'','',$option);
+
if(is_numeric($id) && isset($db_list[(int)$id])){
return $db_list[$id];
}else{
Modified: trunk/catalog/includes/classes/drivers/page/GabaritTemplate.php
===================================================================
--- trunk/catalog/includes/classes/drivers/page/GabaritTemplate.php 2011-10-15 08:25:28 UTC (rev 3830)
+++ trunk/catalog/includes/classes/drivers/page/GabaritTemplate.php 2011-10-18 08:40:21 UTC (rev 3831)
@@ -3,8 +3,8 @@
@licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 17/07/11, 10:15
+ @version 2.1.1
+ @date 17/10/11, 10:44
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class GabaritTemplate
@@ -169,18 +169,18 @@
\fn GabaritTemplate::GetFooter()
\brief choose file for include
*/
- protected static function GetFooter(){
+ protected static function GetFooter($path='footer'){
global $page;
- return $page->getPathTemplate().'footer.php';
+ return $page->getPathTemplate().$path.'.php';
}
/**
\fn GabaritTemplate::GetFooter()
\brief choose file for include
*/
- protected static function GetHeader(){
+ protected static function GetHeader($path='header'){
global $page;
- return $page->getPathTemplate().'header.php';
+ return $page->getPathTemplate().$path.'.php';
}
/**
@@ -197,11 +197,11 @@
\brief choose file for include
@param $bar string bar le nom du fichier a inclure (par defaut sidebar) sans extension
*/
- protected static function GetSidebar($bar='sidebar'){
+ protected static function GetSidebar($path='sidebar'){
// report des var d'enviroennement
global $page;
- return $page->getPathTemplate().$bar.'.php';
+ return $page->getPathTemplate().$path.'.php';
}
}
?>
\ No newline at end of file
Modified: trunk/catalog/includes/classes/page.php
===================================================================
--- trunk/catalog/includes/classes/page.php 2011-10-15 08:25:28 UTC (rev 3830)
+++ trunk/catalog/includes/classes/page.php 2011-10-18 08:40:21 UTC (rev 3831)
@@ -4,7 +4,7 @@
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 10/10/11, 22:04
+ @date 17/10/11, 10:44
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
\class page
@@ -26,58 +26,61 @@
@var generic var for call constructeur
*/
public $page;
-
+ /**
+ @var
+ */
public $oscss_boxes;
-
/**
- \brief public Contient les propriete des element devant être remplacé dans les pages
+ @var public Contient les propriete des element devant être remplacé dans les pages
*/
public $propriete = array();
-
+ /**
+ @var
+ */
public $currencies;
/**
- \brief Title intermediarire
+ @var Title intermediarire
*/
public $title;
-
/**
- \brief Array file lang (.txt)
-
+ @var Array file lang (.txt)
*/
private $PileFileLang=array();
/**
- Array file exist cache
-
+ @var Array file exist cache
*/
private static $PileFile=array();
/**
- \brief Array cache global
-
+ @var Array cache global
*/
protected static $GlobalCache=array();
/**
- @p object cache global
-
+ @var object cache global
*/
private static $objCache;
/**
- @p bool admin liaison base
-
+ @var bool admin liaison base
*/
private static $CookieAdmin;
/**
- @a string res md5 url en cours
- public
+ @var string res md5 url en cours
*/
public static $keyCacheName;
/**
- @a bool recalcul mode
- public
+ @var $CacheCalcul public bool recalcul mode
*/
public static $CacheCalcul;
-
+ /**
+ @var $load_theme for specific usage in template, and transport var in template file
+ */
+ protected static $load_theme;
+ /**
+ @var
+ */
private $file_registered;
-
+ /**
+ @var
+ */
protected static $_instance;
@@ -306,6 +309,7 @@
}
+
/**
@brief function d'inititalisation du theme public, via mecanisme drivers
Cette fonction charge le init du theme lors de l'appel au gabarit du template.
@@ -321,19 +325,21 @@
$current_category_id=$this->ret_var_page('current_category_id');
$languages_id=$this->ret_var_page('languages_id');
+ $load = self::$load_theme ;
+
$init_theme=call_user_func(array(PUBLIC_DRIVERS_PAGE,'GetInit'));
if(self::TestFile($init_theme)) include($init_theme);
+ self::$load_theme = $load;
}
-
-
/**
- * \fn draw_file_header()
- * \brief Seul les variables global (GET,POST,etc) et l'object this sont accessible dans les fichiers appelé par cette fcuntion
+ @fn draw_file_header()
+ @brief Seul les variables global (GET,POST,etc) et l'object this sont accessible dans les fichiers appelé par cette fcuntion
Fonction appelé dans le header des themes
+ @param $StringGet
*/
- private function draw_file_header(){
+ private function draw_file_header($StringGet=''){
$page=$this;
$language=$this->page['language'];
@@ -342,6 +348,9 @@
$current_category_id=$this->ret_var_page('current_category_id');
$languages_id=$this->ret_var_page('languages_id');
+ $load = self::$load_theme;
+ foreach( tep_extrac_querystring($StringGet) as $k =>$v)
+ $load->$k = $v;
/* chargement des js en sortie*/
$this->javascript->cstr_header();
@@ -369,6 +378,10 @@
*/
$file=DIR_WS_INCLUDES.'js/'.$this->page_content_clean().'.js.php';
if( ($file=self::fix_file($file)) && $file !=false ) tep_include_file($file);
+
+
+
+ self::$load_theme = $load;
}
@@ -478,6 +491,11 @@
//! Class permanente
$this->new_class('oscss_modules');
$this->new_class('oscss_boxes');
+
+
+ // init local object specific theme
+ self::$load_theme = new stdClass;
+ return self::$load_theme;
}
/**
@@ -659,9 +677,7 @@
@return string path template/name/template.php
*/
public function path_gabarit(){
- /// load init Theme
$this->LoadInitTheme();
- /// retrun path string
return $this->getPathTemplate().$this->page['gabarit'];
}
@@ -701,12 +717,14 @@
@return value/false
*/
public function the_var($key){ return $this->ret_var_page($key); }
+ public function GetVar($key){ return $this->ret_var_page($key); }
/**
@fn the_template()
\brief Nom du template
*/
public function the_template(){ return $this->page['template']; }
+ public function GetTemplate(){ return $this->page['template']; }
/**
@fn the_content($court=false)
@@ -726,8 +744,15 @@
\brief retourne le type de page
*/
public function the_type(){ return (isset($this->page['type'])? $this->page['type'] : 'none') ; }
+ public function GetPageType(){ return (isset($this->page['type'])? $this->page['type'] : 'none') ; }
/**
+ @fn GetThemeLoad()
+ \brief retrun load_theme object
+ */
+ public function GetThemeLoad(){ return self::$load_theme; }
+
+ /**
@fn the_typeClass()
\brief retourne le type class de page
*/
@@ -815,10 +840,11 @@
/**
- \fn tep_get_header()
- \brief draw header
+ @fn tep_get_header()
+ @brief draw header
+ @param $opt transmis au fichier header du template
*/
- public function tep_get_header(){
+ public function tep_get_header($bar='header'){
//! report des var d'enviroennement
global $lang;
@@ -829,6 +855,11 @@
$current_category_id=$this->ret_var_page('current_category_id');
$languages_id=$this->ret_var_page('languages_id');
+ $load = self::$load_theme;
+// foreach( tep_extrac_querystring($StringGet) as $k =>$v)
+// $load->$k = $v;
+
+
/**
\brief Langue specifique au template
\note specifique text __()
@@ -892,10 +923,18 @@
}
$this->page['the_title']=(tep_not_null($the_title)? $the_title : (tep_not_null($this->title)? $this->title: STORE_NAME));
- $file=call_user_func(array(PUBLIC_DRIVERS_PAGE,'GetHeader'));
+
+
+
+ $file=call_user_func(array(PUBLIC_DRIVERS_PAGE,'GetHeader'),$bar);
if(self::TestFile($file)) include($file);
+ // report file in liste
+ $load->lists_file[__FUNCTION__][] = $bar;
+
+ self::$load_theme = $load;
/**
+ @remarks specific menu admin for front loggued admin
*/
if(self::$CookieAdmin)
echo '<div class="osCSS_Admin" style="position:absolute; right:20px; top:0;">'.
@@ -911,6 +950,7 @@
@param $bar string bar le nom du fichier a inclure (par defaut sidebar) sans extension
*/
public function tep_get_sidebar($bar='sidebar'){
+
// report des var d'enviroennement
$page=$this;
$language=$this->page['language'];
@@ -921,16 +961,27 @@
$currencies=$page->currencies;
$request_type=$page->ret_var_page('request_type');
+ $load = self::$load_theme;
+
$file=call_user_func(array(PUBLIC_DRIVERS_PAGE,'GetSidebar'),$bar);
if(self::TestFile($file)) require_once($file);
+
+ // report file in liste
+ $load->lists_file[__FUNCTION__][] = $bar;
+
+ self::$load_theme = $load;
}
/**
\fn tep_get_footer()
\brief draw footer
*/
- public function tep_get_footer(){
+ public function tep_get_footer($bar='footer'){
$page=$this;
+
+ $load = self::$load_theme;
+
+
if ($this->page['var']['develop']=='true') $this->develop();
$plugins=$this->the_var('plugins');
@@ -949,8 +1000,10 @@
$this->javascript->add_multi($fct());
}
}
- $file=call_user_func(array(PUBLIC_DRIVERS_PAGE,'GetFooter'));
+ $file=call_user_func(array(PUBLIC_DRIVERS_PAGE,'GetFooter'),$bar);
if(self::TestFile($file)) require_once($file);
+
+ self::$load_theme = $load;
}
Deleted: trunk/catalog/install/includes/sql/mysql/data/40_osc_admin.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/data/40_osc_admin.sql 2011-10-15 08:25:28 UTC (rev 3830)
+++ trunk/catalog/install/includes/sql/mysql/data/40_osc_admin.sql 2011-10-18 08:40:21 UTC (rev 3831)
@@ -1,25 +0,0 @@
-#+#######################################################################+
-#| osCSS Open Source E-commerce |
-#+#######################################################################+
-#| Copyright (c) 2005-2011 The osCSS developers |
-#| |
-#| http://www.oscss.org |
-#| Portions Copyright (c) 2003 osCommerce |
-#+#######################################################################+
-#| This source file is subject to version 2.0 of the GPL license, |
-#| available at the following url: |
-#| http://www.oscss.org/license/2_0.txt. |
-#+#######################################################################+
-
-# NOTE: * Please make any modifications to this file by hand!
-# * DO NOT use a mysqldump created file for new changes!
-# * Please take note of the table structure, and use this
-# structure as a standard for future modifications!
-# * Any tables you add here should be added in admin/backup.php
-# and in catalog/install/includes/functions/database.php
-# * Comments should be like these, full line comments.
-# (don't use inline comments '--', but use #)
-
-
-insert into osc_admin (admin_id, admin_groups_id, admin_firstname, admin_lastname, admin_email_address, admin_password, admin_created, admin_modified, admin_logdate, admin_lognum) values ('1', '1', 'AdminFirstname', 'AdminLastname', 'admin@localhost', '351683ea4e19efe34874b501fdbf9792:9b', NOW(), '1000-01-01 00:00:00', NOW(), '0');
-
Added: trunk/catalog/install/includes/sql/mysql/data/40_osc_admin_users.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/data/40_osc_admin_users.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/data/40_osc_admin_users.sql 2011-10-18 08:40:21 UTC (rev 3831)
@@ -0,0 +1,25 @@
+#+#######################################################################+
+#| osCSS Open Source E-commerce |
+#+#######################################################################+
+#| Copyright (c) 2005-2011 The osCSS developers |
+#| |
+#| http://www.oscss.org |
+#| Portions Copyright (c) 2003 osCommerce |
+#+#######################################################################+
+#| This source file is subject to version 2.0 of the GPL license, |
+#| available at the following url: |
+#| http://www.oscss.org/license/2_0.txt. |
+#+#######################################################################+
+
+# NOTE: * Please make any modifications to this file by hand!
+# * DO NOT use a mysqldump created file for new changes!
+# * Please take note of the table structure, and use this
+# structure as a standard for future modifications!
+# * Any tables you add here should be added in admin/backup.php
+# and in catalog/install/includes/functions/database.php
+# * Comments should be like these, full line comments.
+# (don't use inline comments '--', but use #)
+
+
+insert into osc_admin_users (admin_id, admin_groups_id, admin_firstname, admin_lastname, admin_email_address, admin_password, admin_created, admin_modified, admin_logdate, admin_lognum) values ('1', '1', 'AdminFirstname', 'AdminLastname', 'admin@localhost', '351683ea4e19efe34874b501fdbf9792:9b', NOW(), '1000-01-01 00:00:00', NOW(), '0');
+
Deleted: trunk/catalog/install/includes/sql/mysql/data/91_osc_admin_files.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/data/91_osc_admin_files.sql 2011-10-15 08:25:28 UTC (rev 3830)
+++ trunk/catalog/install/includes/sql/mysql/data/91_osc_admin_files.sql 2011-10-18 08:40:21 UTC (rev 3831)
@@ -1,134 +0,0 @@
-#+#######################################################################+
-#| osCSS Open Source E-commerce |
-#+#######################################################################+
-#| Copyright (c) 2005-2011 The osCSS developers |
-#| |
-#| http://www.oscss.org |
-#| Portions Copyright (c) 2003 osCommerce |
-#+#######################################################################+
-#| This source file is subject to version 2.0 of the GPL license, |
-#| available at the following url: |
-#| http://www.oscss.org/license/2_0.txt. |
-#+#######################################################################+
-
-# NOTE: * Please make any modifications to this file by hand!
-# * DO NOT use a mysqldump created file for new changes!
-# * Please take note of the table structure, and use this
-# structure as a standard for future modifications!
-# * Any tables you add here should be added in admin/backup.php
-# and in catalog/install/includes/functions/database.php
-# * Comments should be like these, full line comments.
-# (don't use inline comments '--', but use #)
-
-
-
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (1, 'configuration.php', 1, 0, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (2, 'catalog.php', 1, 0, '1,2');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (3, 'customers.php', 1, 0, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (4, 'modules.php', 1, 0, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (6, 'tools.php', 1, 0, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (5, 'parameters.php', 1, 0, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (7, 'administrator.php', 1, 0, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (8, 'cms.php', 1, 0, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (9, 'hidden.php', 1, 0, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (10, 'commercial.php', 1, 0, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (11, 'return_product.php', 0, 1, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (12, 'returns_invoice.php', 0, 1, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (13, 'returns_packingslip.php', 0, 1, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (14, 'attributeManager.php', 0, 1, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (15, 'products_cross.php', 0, 1, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (16, 'graphs_stats.php', 0, 1, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (17, 'ajax.php', 0, 1, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (18, 'qtprodoctor.php', 0, 1, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (19, 'sitemonitor.php', 0, 1, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (20, 'coupons_exclusions.php', 0, 1, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (21, 'stock.php', 0, 1, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (22, 'sitemaps.php', 0, 1, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (23, 'aca_portfolio.php', 0, 1, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (24, 'sales_stats.php', 0, 1, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (25, 'aca.php', 0, 1, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (26, 'mail.php', 0, 1, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (27, 'rss.php', 0, 1, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (28, 'tinybrowser.php', 0, 1, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (29, 'package.php', 0, 1, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (30, 'admin_members.php', 0, 1, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (31, 'config_110.php', 0, 8, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (32, 'configuration.php?gparentID=110&gID=25', 0, 4, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (33, 'configuration.php?gparentID=110&gID=31', 0, 4, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (34, 'configuration.php?gparentID=110&gID=1', 0, 4, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (35, 'configuration.php?gparentID=110&gID=2', 0, 4, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (36, 'configuration.php?gparentID=110&gID=28', 0, 4, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (37, 'configuration.php?gparentID=110&gID=30', 0, 4, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (38, 'return.php', 0, 4, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (39, 'configuration.php?gparentID=110&gID=30&type=returns', 0, 4, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (40, 'configuration.php?gparentID=110&gID=30&type=return_reasons', 0, 4, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (41, 'configuration.php?gparentID=110&gID=30&type=refund_method', 0, 4, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (42, 'configuration.php?gparentID=110&gID=35', 0, 4, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (43, 'config_127.php', 0, 8, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (44, 'configuration.php?gparentID=127&gID=7', 0, 7, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (45, 'configuration.php?gparentID=127&gID=9', 0, 7, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (46, 'configuration.php?gparentID=127&gID=11', 0, 7, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (47, 'configuration.php?gparentID=127&gID=13', 0, 7, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (48, 'config_126.php', 0, 8, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (49, 'configuration.php?gparentID=126&gID=22', 0, 6, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (50, 'configuration.php?gparentID=126&gID=20', 0, 6, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (51, 'configuration.php?gparentID=126&gID=17', 0, 6, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (52, 'config_120.php', 0, 8, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (53, 'configuration.php?gparentID=120&gID=6', 0, 0, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (54, 'configuration.php?gparentID=120&gID=24', 0, 0, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (55, 'configuration.php?gparentID=120&gID=10', 0, 0, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (56, 'configuration.php?gparentID=120&gID=12', 0, 0, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (57, 'configuration.php?gparentID=120&gID=16', 0, 0, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (58, 'configuration.php?gparentID=120&gID=33', 0, 0, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (59, 'configuration.php?gparentID=120&gID=15', 0, 0, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (60, 'configuration.php?gparentID=120&gID=14', 0, 0, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (61, 'configuration.php?gparentID=120&gID=34', 0, 0, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (62, 'config_100.php', 0, 8, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (63, 'configuration.php?gparentID=100&gID=29', 0, 7, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (64, 'configuration.php?gparentID=100&gID=27', 0, 7, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (65, 'configuration.php?gparentID=100&gID=21', 0, 7, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (66, 'configuration.php?gparentID=100&gID=19', 0, 7, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (67, 'configuration.php?gparentID=100&gID=8', 0, 7, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (68, 'configuration.php?gparentID=100&gID=4', 0, 7, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (69, 'taxes_in_zone.php', 0, 8, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (70, 'countries.php', 0, 0, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (71, 'geo_zones.php', 0, 0, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (72, 'tax_classes.php', 0, 0, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (73, 'adminUsers.php', 0, 1, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (74, 'adminGroup.php', 0, 1, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (75, 'admin_members.php?gID=groups', 0, 1, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (76, 'modules.php?manager=process', 0, 0, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (77, 'plugins.php', 0, 0, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (78, 'stats.php', 0, 7, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (79, 'stats.php?module=stats_customers', 0, 6, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (80, 'stats.php?module=stats_low_stock_attrib', 0, 6, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (81, 'stats.php?module=stats_newsletter', 0, 6, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (82, 'stats.php?module=stats_products_purchased', 0, 6, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (83, 'stats.php?module=stats_products_viewed', 0, 6, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (84, 'stats.php?module=whos_online', 0, 6, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (85, 'ggsitemap.php', 0, 7, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (86, 'header_tags.php', 0, 7, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (87, 'batch_print.php', 0, 7, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (88, 'system.php', 0, 7, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (89, 'backup.php', 0, 5, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (90, 'configuration.php?gID=37', 0, 5, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (91, 'configuration.php?gID=36', 0, 5, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (92, 'currencies.php', 0, 5, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (93, 'newsletters.php', 0, 4, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (94, 'orders.php', 0, 7, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (95, 'held_orders.php', 0, 7, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (96, 'recover_cart_sales.php', 0, 7, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (97, 'products.php', 0, 5, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (98, 'products.php?cPath=&action=new', 0, 5, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (99, 'products.php?expected=true', 0, 5, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (100, 'attributes.php', 0, 5, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (101, 'categories.php', 0, 5, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (102, 'cms_content.php', 0, 5, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (103, 'navigation_links.php', 0, 5, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (104, 'upload.php', 0, 5, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (105, 'upload_process.php', 0, 5, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (106, 'adminNotif.php', 0, 5, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (107, 'cronjob.php', 0, 5, '1');
-INSERT INTO osc_admin_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (108, 'newslettersModeles.php', 0, 5, '1');
-
-
Added: trunk/catalog/install/includes/sql/mysql/data/91_osc_admin_m_files.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/data/91_osc_admin_m_files.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/data/91_osc_admin_m_files.sql 2011-10-18 08:40:21 UTC (rev 3831)
@@ -0,0 +1,134 @@
+#+#######################################################################+
+#| osCSS Open Source E-commerce |
+#+#######################################################################+
+#| Copyright (c) 2005-2011 The osCSS developers |
+#| |
+#| http://www.oscss.org |
+#| Portions Copyright (c) 2003 osCommerce |
+#+#######################################################################+
+#| This source file is subject to version 2.0 of the GPL license, |
+#| available at the following url: |
+#| http://www.oscss.org/license/2_0.txt. |
+#+#######################################################################+
+
+# NOTE: * Please make any modifications to this file by hand!
+# * DO NOT use a mysqldump created file for new changes!
+# * Please take note of the table structure, and use this
+# structure as a standard for future modifications!
+# * Any tables you add here should be added in admin/backup.php
+# and in catalog/install/includes/functions/database.php
+# * Comments should be like these, full line comments.
+# (don't use inline comments '--', but use #)
+
+
+
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (1, 'configuration.php', 1, 0, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (2, 'catalog.php', 1, 0, '1,2');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (3, 'customers.php', 1, 0, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (4, 'modules.php', 1, 0, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (6, 'tools.php', 1, 0, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (5, 'parameters.php', 1, 0, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (7, 'administrator.php', 1, 0, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (8, 'cms.php', 1, 0, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (9, 'hidden.php', 1, 0, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (10, 'commercial.php', 1, 0, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (11, 'return_product.php', 0, 1, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (12, 'returns_invoice.php', 0, 1, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (13, 'returns_packingslip.php', 0, 1, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (14, 'attributeManager.php', 0, 1, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (15, 'products_cross.php', 0, 1, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (16, 'graphs_stats.php', 0, 1, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (17, 'ajax.php', 0, 1, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (18, 'qtprodoctor.php', 0, 1, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (19, 'sitemonitor.php', 0, 1, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (20, 'coupons_exclusions.php', 0, 1, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (21, 'stock.php', 0, 1, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (22, 'sitemaps.php', 0, 1, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (23, 'aca_portfolio.php', 0, 1, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (24, 'sales_stats.php', 0, 1, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (25, 'aca.php', 0, 1, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (26, 'mail.php', 0, 1, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (27, 'rss.php', 0, 1, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (28, 'tinybrowser.php', 0, 1, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (29, 'package.php', 0, 1, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (30, 'admin_members.php', 0, 1, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (31, 'config_110.php', 0, 8, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (32, 'configuration.php?gparentID=110&gID=25', 0, 4, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (33, 'configuration.php?gparentID=110&gID=31', 0, 4, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (34, 'configuration.php?gparentID=110&gID=1', 0, 4, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (35, 'configuration.php?gparentID=110&gID=2', 0, 4, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (36, 'configuration.php?gparentID=110&gID=28', 0, 4, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (37, 'configuration.php?gparentID=110&gID=30', 0, 4, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (38, 'return.php', 0, 4, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (39, 'configuration.php?gparentID=110&gID=30&type=returns', 0, 4, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (40, 'configuration.php?gparentID=110&gID=30&type=return_reasons', 0, 4, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (41, 'configuration.php?gparentID=110&gID=30&type=refund_method', 0, 4, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (42, 'configuration.php?gparentID=110&gID=35', 0, 4, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (43, 'config_127.php', 0, 8, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (44, 'configuration.php?gparentID=127&gID=7', 0, 7, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (45, 'configuration.php?gparentID=127&gID=9', 0, 7, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (46, 'configuration.php?gparentID=127&gID=11', 0, 7, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (47, 'configuration.php?gparentID=127&gID=13', 0, 7, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (48, 'config_126.php', 0, 8, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (49, 'configuration.php?gparentID=126&gID=22', 0, 6, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (50, 'configuration.php?gparentID=126&gID=20', 0, 6, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (51, 'configuration.php?gparentID=126&gID=17', 0, 6, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (52, 'config_120.php', 0, 8, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (53, 'configuration.php?gparentID=120&gID=6', 0, 0, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (54, 'configuration.php?gparentID=120&gID=24', 0, 0, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (55, 'configuration.php?gparentID=120&gID=10', 0, 0, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (56, 'configuration.php?gparentID=120&gID=12', 0, 0, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (57, 'configuration.php?gparentID=120&gID=16', 0, 0, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (58, 'configuration.php?gparentID=120&gID=33', 0, 0, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (59, 'configuration.php?gparentID=120&gID=15', 0, 0, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (60, 'configuration.php?gparentID=120&gID=14', 0, 0, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (61, 'configuration.php?gparentID=120&gID=34', 0, 0, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (62, 'config_100.php', 0, 8, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (63, 'configuration.php?gparentID=100&gID=29', 0, 7, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (64, 'configuration.php?gparentID=100&gID=27', 0, 7, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (65, 'configuration.php?gparentID=100&gID=21', 0, 7, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (66, 'configuration.php?gparentID=100&gID=19', 0, 7, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (67, 'configuration.php?gparentID=100&gID=8', 0, 7, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (68, 'configuration.php?gparentID=100&gID=4', 0, 7, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (69, 'taxes_in_zone.php', 0, 8, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (70, 'countries.php', 0, 0, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (71, 'geo_zones.php', 0, 0, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (72, 'tax_classes.php', 0, 0, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (73, 'adminUsers.php', 0, 1, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (74, 'adminGroup.php', 0, 1, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (75, 'admin_members.php?gID=groups', 0, 1, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (76, 'modules.php?manager=process', 0, 0, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (77, 'plugins.php', 0, 0, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (78, 'stats.php', 0, 7, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (79, 'stats.php?module=stats_customers', 0, 6, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (80, 'stats.php?module=stats_low_stock_attrib', 0, 6, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (81, 'stats.php?module=stats_newsletter', 0, 6, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (82, 'stats.php?module=stats_products_purchased', 0, 6, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (83, 'stats.php?module=stats_products_viewed', 0, 6, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (84, 'stats.php?module=whos_online', 0, 6, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (85, 'ggsitemap.php', 0, 7, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (86, 'header_tags.php', 0, 7, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (87, 'batch_print.php', 0, 7, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin_files_is_boxes, admin_files_to_boxes, admin_groups_id) VALUES (88, 'system.php', 0, 7, '1');
+INSERT INTO osc_admin_m_files (admin_files_id, admin_files_name, admin...
[truncated message content] |
|
From: <os...@us...> - 2011-10-15 08:25:34
|
Revision: 3830
http://oscss.svn.sourceforge.net/oscss/?rev=3830&view=rev
Author: oscim
Date: 2011-10-15 08:25:28 +0000 (Sat, 15 Oct 2011)
Log Message:
-----------
Evolution de l'ordonancement des elements du theme dans le constructeur de page.
Mise en oeuvre de l'appel de l'initialisation du template (cf driver gabarittemplate) des l'appels du fichier master du template, utilis?\195?\169 dans les page de la racine public.
Tous elements charg?\195?\169e du template, contient donc en amont l'initialisation du theme celui ci
Modified Paths:
--------------
trunk/catalog/includes/classes/page.php
Modified: trunk/catalog/includes/classes/page.php
===================================================================
--- trunk/catalog/includes/classes/page.php 2011-10-12 12:48:13 UTC (rev 3829)
+++ trunk/catalog/includes/classes/page.php 2011-10-15 08:25:28 UTC (rev 3830)
@@ -306,7 +306,28 @@
}
+ /**
+ @brief function d'inititalisation du theme public, via mecanisme drivers
+ Cette fonction charge le init du theme lors de l'appel au gabarit du template.
+ Cette fonction est donc chargée des l'utilisation du gabarit
+ @return none
+ */
+ private function LoadInitTheme(){
+ $page=$this;
+ $language=$this->page['language'];
+ $PHP_SELF=$this->page['content'];
+ $template=$this->page['template'];
+ $current_category_id=$this->ret_var_page('current_category_id');
+ $languages_id=$this->ret_var_page('languages_id');
+
+ $init_theme=call_user_func(array(PUBLIC_DRIVERS_PAGE,'GetInit'));
+ if(self::TestFile($init_theme)) include($init_theme);
+
+ }
+
+
+
/**
* \fn draw_file_header()
* \brief Seul les variables global (GET,POST,etc) et l'object this sont accessible dans les fichiers appelé par cette fcuntion
@@ -321,9 +342,6 @@
$current_category_id=$this->ret_var_page('current_category_id');
$languages_id=$this->ret_var_page('languages_id');
-// $init_theme=$this->getPathTemplate() .'cfg/init.php';
- $init_theme=call_user_func(array(PUBLIC_DRIVERS_PAGE,'GetInit'));
- if(self::TestFile($init_theme)) include($init_theme);
/* chargement des js en sortie*/
$this->javascript->cstr_header();
@@ -636,8 +654,16 @@
/**
@fn path_gabarit()
+ @brief retrun path gabarit html in path theme
+ This function init base theme
+ @return string path template/name/template.php
*/
- public function path_gabarit(){ return $this->getPathTemplate().$this->page['gabarit']; }
+ public function path_gabarit(){
+ /// load init Theme
+ $this->LoadInitTheme();
+ /// retrun path string
+ return $this->getPathTemplate().$this->page['gabarit'];
+ }
/**
\fn draw_breadcrumb($caract =' » ')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-10-12 12:48:22
|
Revision: 3829
http://oscss.svn.sourceforge.net/oscss/?rev=3829&view=rev
Author: oscim
Date: 2011-10-12 12:48:13 +0000 (Wed, 12 Oct 2011)
Log Message:
-----------
Suite evolution install pour la prise encharge des driver sql des l'install
Mise au point gestion des param avanc?\195?\169 lors de l'installation vis a vis de la db support innodb/mysiam
Mise a jour fichier des creation de tables de l'installateur
Correction coquille /class/drivers/data/
Suppression reference vers old tables product_virtual
Modified Paths:
--------------
trunk/catalog/common/classes/shoppingCart.php
trunk/catalog/common/drivers/DB_Mysql.php
trunk/catalog/includes/application_top.php
trunk/catalog/includes/classes/drivers/data/categorie.php
trunk/catalog/includes/classes/drivers/data/product.php
trunk/catalog/install/data/templates/appareil_photo/electronix/includes/content/home.php
trunk/catalog/install/includes/classes/core.php
trunk/catalog/install/includes/content/core.configuration.php
trunk/catalog/install/includes/content/core.installdb.php
trunk/catalog/install/includes/content/core.modes.php
trunk/catalog/install/includes/content/core.template_sample.php
trunk/catalog/install/includes/functions/database.php
trunk/catalog/install/includes/sql/mysql/tables/osc_address_book.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_address_format.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_admin_groups.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_admin_m_files.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_admin_m_files_to_right.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_admin_notification.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_admin_users.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_categories.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_categories_description.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_categories_extra.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_checknotif.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_cip.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_cip_depend.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_configuration.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_configuration_group.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_configuration_text.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_content.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_content_description.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_content_to_categories.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_countries.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_cronjob.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_currencies.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_customers.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_customers_basket.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_customers_basket_attributes.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_customers_groups.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_customers_info.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_customers_to_extra_fields.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_extra_field_labels.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_extra_field_values.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_extra_fields.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_extra_fields_info.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_full_tag.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_full_tag_description.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_geo_zones.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_holding_orders.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_holding_orders_products.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_holding_orders_products_attributes.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_holding_orders_products_download.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_holding_orders_status_history.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_holding_orders_total.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_languages.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_manufacturers.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_manufacturers_info.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_navigation_links.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_navigation_links_description.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_newsletters.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_newsletters_modeles.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_newsletters_sent.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_orders.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_orders_products.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_orders_products_attributes.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_orders_products_download.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_orders_status_history.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_orders_total.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_am_attributes_to_templates.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_am_templates.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_attributes.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_attributes_download.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_attributes_groups.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_description.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_extra_fields.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_extra_fields_labels.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_extra_fields_values.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_groups.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_options.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_options_values.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_options_values_to_products_options.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_stock.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_to_categories.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_to_products_extra_fields.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_scart.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_seo_cache.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_sessions.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_specials.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_status.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_tax_class.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_tax_rates.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_whos_online.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_zones.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_zones_to_geo_zones.sql
Added Paths:
-----------
trunk/catalog/common/drivers/DB_Mysqli.php
Modified: trunk/catalog/common/classes/shoppingCart.php
===================================================================
--- trunk/catalog/common/classes/shoppingCart.php 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/common/classes/shoppingCart.php 2011-10-12 12:48:13 UTC (rev 3829)
@@ -1,13 +1,12 @@
<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
/**
- *\licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
- *\portion code Copyright (c) 2002 osCommerce
- *\package osCSS-2 <www http://www.oscss.org>
- *\version 2.1.0
- *\date 28/11/10, 22:44
- *\author oscim <mail aur...@os...> <www http://www.oscim.fr>
- *\encode UTF-8
- *\file
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 12/10/11, 13:42
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
*\dir common/classes/
*\class shoppingCart
*/
@@ -403,11 +402,11 @@
if ($this->count_contents() > 0) {
reset($this->contents);
while (list($products_id, ) = each($this->contents)) {
- $virtual_products_result = tep_db_query("select * from ".TABLE_PRODUCTS_VIRTUAL." where productsID=".(int)$products_id);
+ $virtual_products_result = tep_db_query("select products_type from ".TABLE_PRODUCTS." where products_id=".(int)$products_id);
if (tep_db_num_rows($virtual_products_result) > 0) {
$res=tep_db_fetch_array($virtual_products_result);
- $array_content_type[] = (in_array($res['typeID'], explode(';',TYPE_VIRTUAL_PRODUCTS)))? 'virtual' : 'physical';
+ $array_content_type[] = (in_array($res['products_type'], explode(';',TYPE_VIRTUAL_PRODUCTS)))? 'virtual' : 'physical';
}
else $array_content_type[] = 'physical';
}
Modified: trunk/catalog/common/drivers/DB_Mysql.php
===================================================================
--- trunk/catalog/common/drivers/DB_Mysql.php 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/common/drivers/DB_Mysql.php 2011-10-12 12:48:13 UTC (rev 3829)
@@ -1,16 +1,43 @@
<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.0.9
- @date 13/06/10, 11:26
+ @version 2.1.1
+ @date 12/10/11, 14:42
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
+/**
+ * TYPOlight Open Source CMS
+ * Copyright (C) 2005-2010 Leo Feyer
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program. If not, please visit the Free
+ * Software Foundation website at <http://www.gnu.org/licenses/>.
+ *
+ * PHP version 5
+ * @copyright Leo Feyer 2005-2010
+ * @author Leo Feyer <http://www.typolight.org>
+ * @license LGPL
+ * @filesource
+ */
+
+
+
class DB_Mysql extends database{
/**
@@ -47,20 +74,12 @@
@mysql_query("SET sql_mode=''", $this->resConnection);
@mysql_query("SET NAMES " . parent::CHARSET, $this->resConnection);
if($db)
- $this->db_select();
+ $this->set_database(parent::DB);
}
}
/**
- Select from database
- */
- /*protected*/ function db_select($db=false) {
- return @mysql_select_db( ((!$db)?parent::DB: $db ), $this->resConnection);
- }
-
-
- /**
Disconnect from database
*/
protected function disconnect() {
@@ -108,7 +127,7 @@
foreach ($arrFields as $k=>$v)
{
$arrChunks = preg_split('/(\([^\)]+\))/', $v['Type'], -1, PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY);
-// print_r($arrChunks);
+
$arrReturn[$k]['name'] = $v['Field'];
$arrReturn[$k]['type'] = $arrChunks[0];
Added: trunk/catalog/common/drivers/DB_Mysqli.php
===================================================================
--- trunk/catalog/common/drivers/DB_Mysqli.php (rev 0)
+++ trunk/catalog/common/drivers/DB_Mysqli.php 2011-10-12 12:48:13 UTC (rev 3829)
@@ -0,0 +1,398 @@
+<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 12/10/11, 14:42
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+
+/**
+ * TYPOlight Open Source CMS
+ * Copyright (C) 2005-2010 Leo Feyer
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program. If not, please visit the Free
+ * Software Foundation website at <http://www.gnu.org/licenses/>.
+ *
+ * PHP version 5
+ * @copyright Leo Feyer 2005-2010
+ * @author Leo Feyer <http://www.typolight.org>
+ * @license LGPL
+ * @filesource
+ */
+
+
+
+/**
+ * Class DB_Mysqlii
+ *
+ * Driver class for MySQLi databases.
+ * @copyright Leo Feyer 2005-2010
+ * @author Leo Feyer <http://www.typolight.org>
+ * @package Driver
+ */
+class DB_Mysqli extends Database
+{
+
+ /**
+ * List tables query
+ * @var string
+ */
+ protected $strListTables = "SHOW TABLES FROM `%s`";
+
+ /**
+ * List fields query
+ * @var string
+ */
+ protected $strListFields = "SHOW COLUMNS FROM `%s`";
+
+
+ /**
+ * Connect to database server and select database
+ */
+ protected function connect($db=true)
+ {
+ @$this->resConnection = new mysqli($GLOBALS['TL_CONFIG']['dbHost'], $GLOBALS['TL_CONFIG']['dbUser'], $GLOBALS['TL_CONFIG']['dbPass'], $GLOBALS['TL_CONFIG']['dbDatabase'], $GLOBALS['TL_CONFIG']['dbPort']);
+ @$this->resConnection->set_charset($GLOBALS['TL_CONFIG']['dbCharset']);
+ }
+
+
+ /**
+ * Disconnect from database
+ */
+ protected function disconnect()
+ {
+ @$this->resConnection->close();
+ }
+
+
+ /**
+ * Return the last error message
+ * @return string
+ */
+ protected function get_error()
+ {
+ return @$this->resConnection->error;
+ }
+
+
+ /**
+ * Return a standardized array with field information
+ *
+ * Standardized format:
+ * - name: field name (e.g. my_field)
+ * - type: field type (e.g. "int" or "number")
+ * - length: field length (e.g. 20)
+ * - precision: precision of a float number (e.g. 5)
+ * - null: NULL or NOT NULL
+ * - default: default value (e.g. "default_value")
+ * - attributes: attributes (e.g. "unsigned")
+ * - index: PRIMARY, UNIQUE or INDEX
+ * - extra: extra information (e.g. auto_increment)
+ * @param string
+ * @return string
+ * @todo Support all kind of keys (e.g. FULLTEXT or FOREIGN).
+ */
+ protected function list_fields($strTable)
+ {
+ $arrReturn = array();
+ $arrFields = $this->execute(sprintf($this->strListFields, $strTable))->fetchAllAssoc();
+
+ foreach ($arrFields as $k=>$v)
+ {
+ $arrChunks = preg_split('/(\([^\)]+\))/', $v['Type'], -1, PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY);
+
+ $arrReturn[$k]['name'] = $v['Field'];
+ $arrReturn[$k]['type'] = $arrChunks[0];
+
+ if (strlen($arrChunks[1]))
+ {
+ $arrChunks[1] = str_replace(array('(', ')'), array('', ''), $arrChunks[1]);
+ $arrSubChunks = explode(',', $arrChunks[1]);
+
+ $arrReturn[$k]['length'] = trim($arrSubChunks[0]);
+
+ if (strlen($arrSubChunks[1]))
+ {
+ $arrReturn[$k]['precision'] = trim($arrSubChunks[1]);
+ }
+ }
+
+ if (strlen($arrChunks[2]))
+ {
+ $arrReturn[$k]['attributes'] = trim($arrChunks[2]);
+ }
+
+ if (strlen($v['Key']))
+ {
+ switch ($v['Key'])
+ {
+ case 'PRI':
+ $arrReturn[$k]['index'] = 'PRIMARY';
+ break;
+
+ case 'UNI':
+ $arrReturn[$k]['index'] = 'UNIQUE';
+ break;
+
+ default:
+ $arrReturn[$k]['index'] = 'KEY';
+ break;
+ }
+ }
+
+ $arrReturn[$k]['null'] = ($v['Null'] == 'YES') ? 'NULL' : 'NOT NULL';
+ $arrReturn[$k]['default'] = $v['Default'];
+ $arrReturn[$k]['extra'] = $v['Extra'];
+ }
+
+ return $arrReturn;
+ }
+
+
+ /**
+ * Change the current database
+ * @param string
+ * @return boolean
+ */
+ protected function set_database($strDatabase)
+ {
+ @$this->resConnection = new mysqli($GLOBALS['TL_CONFIG']['dbHost'], $GLOBALS['TL_CONFIG']['dbUser'], $GLOBALS['TL_CONFIG']['dbPass'], $strDatabase, $GLOBALS['TL_CONFIG']['dbPort']);
+ }
+
+
+ /**
+ * Begin a transaction
+ */
+ protected function begin_transaction()
+ {
+ @$this->resConnection->query("SET AUTOCOMMIT=0");
+ @$this->resConnection->query("BEGIN");
+ }
+
+
+ /**
+ * Commit a transaction
+ */
+ protected function commit_transaction()
+ {
+ @$this->resConnection->query("COMMIT");
+ @$this->resConnection->query("SET AUTOCOMMIT=1");
+ }
+
+
+ /**
+ * Rollback a transaction
+ */
+ protected function rollback_transaction()
+ {
+ @$this->resConnection->query("ROLLBACK");
+ @$this->resConnection->query("SET AUTOCOMMIT=1");
+ }
+
+ /**
+ Alias retro-compatibilité
+ */
+ public function db_input($strString)
+ {
+ return $this->resConnection->real_escape_string($strString) ;
+ }
+}
+
+
+/**
+ * Class DB_Mysqli_Statement
+ *
+ * Driver class for MySQLi databases.
+ * @copyright Leo Feyer 2005-2010
+ * @author Leo Feyer <http://www.typolight.org>
+ * @package Driver
+ */
+class DB_Mysqli_Statement extends Database_Statement
+{
+
+ /**
+ * Prepare a query and return it
+ * @param string
+ */
+ protected function prepare_query($strQuery)
+ {
+ return $strQuery;
+ }
+
+
+ /**
+ * Escape a string
+ * @param string
+ * @return string
+ */
+ protected function string_escape($strString)
+ {
+ return "'" . $this->resConnection->real_escape_string($strString) . "'";
+ }
+
+
+ /**
+ * Limit the current query
+ * @param int
+ * @param int
+ */
+ protected function limit_query($intRows, $intOffset)
+ {
+ $strType = strtoupper(preg_replace('/\s+.*$/is', '', trim($this->strQuery)));
+
+ switch ($strType)
+ {
+ case 'SELECT':
+ $this->strQuery .= sprintf(' LIMIT %d,%d', $intOffset, $intRows);
+ break;
+
+ default:
+ $this->strQuery .= sprintf(' LIMIT %d', $intRows);
+ break;
+ }
+ }
+
+
+ /**
+ * Execute the current query
+ * @return resource
+ */
+ protected function execute_query()
+ {
+ return @$this->resConnection->query($this->strQuery);
+ }
+
+
+ /**
+ * Return the last error message
+ * @return string
+ */
+ protected function get_error()
+ {
+
+ oscss_db_error($this->strQuery, 0, @$this->resConnection->error);
+// return @$this->resConnection->error;
+ }
+
+
+ /**
+ * Return the number of affected rows
+ * @return int
+ */
+ protected function affected_rows()
+ {
+ return @$this->resConnection->affected_rows;
+ }
+
+
+ /**
+ * Return the last insert ID
+ * @return int
+ */
+ protected function insert_id()
+ {
+ return @$this->resConnection->insert_id;
+ }
+
+
+ /**
+ * Explain the current query
+ * @return array
+ */
+ protected function explain_query()
+ {
+ return @$this->resConnection->query('EXPLAIN ' . $this->strQuery)->fetch_assoc();
+ }
+}
+
+
+/**
+ * Class DB_Mysqli_Result
+ *
+ * Driver class for MySQLi databases.
+ * @copyright Leo Feyer 2005-2010
+ * @author Leo Feyer <http://www.typolight.org>
+ * @package Driver
+ */
+class DB_Mysqli_Result extends Database_Result
+{
+
+ /**
+ * Fetch the current row as enumerated array
+ * @return array
+ */
+ protected function fetch_row()
+ {
+ return @$this->resResult->fetch_row();
+ }
+
+
+ /**
+ * Fetch the current row as associative array
+ * @return array
+ */
+ protected function fetch_assoc()
+ {
+ return @$this->resResult->fetch_assoc();
+ }
+
+
+ /**
+ * Return the number of rows of the current result
+ * @return int
+ */
+ protected function num_rows()
+ {
+ return @$this->resResult->num_rows;
+ }
+
+
+ /**
+ * Return the number of fields of the current result
+ * @return int
+ */
+ protected function num_fields()
+ {
+ return @$this->resResult->field_countmysql;
+ }
+
+
+ /**
+ * Get column information
+ * @param int
+ * @return object
+ */
+ protected function fetch_field($intOffset)
+ {
+ return @$this->resResult->fetch_field_direct($intOffset);
+ }
+
+
+ /**
+ * Free the current result
+ */
+ public function free()
+ {
+ if (is_object($this->resResult))
+ {
+ @$this->resResult->free();
+ }
+ }
+}
+
+?>
\ No newline at end of file
Modified: trunk/catalog/includes/application_top.php
===================================================================
--- trunk/catalog/includes/application_top.php 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/includes/application_top.php 2011-10-12 12:48:13 UTC (rev 3829)
@@ -3,8 +3,8 @@
@licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 12/02/11, 15:02
+ @version 2.1.1
+ @date 12/10/11, 13:43
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*\file application_top.php
@@ -93,7 +93,7 @@
include(DIR_WS_INCLUDES . 'inc_base_lib.php');
if(OSCSS_GARBAGE_ERROR == true){
- if (_cst_bool('STORE_PAGE_PARSE_STOCK_ERROR')) $errorHandler->attachFileWriter('sessions/err-php.log');
+ if (_cst_bool('STORE_PAGE_PARSE_STOCK_ERROR')) $errorHandler->attachFileWriter(DIR_FS_ROOT_DOCS.'public_err-php.log');
if (_cst_bool('STORE_PAGE_PARSE_EMAIL_OWNER')) $errorHandler->attachMailWriter(STORE_OWNER_EMAIL_ADDRESS);
}
Modified: trunk/catalog/includes/classes/drivers/data/categorie.php
===================================================================
--- trunk/catalog/includes/classes/drivers/data/categorie.php 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/includes/classes/drivers/data/categorie.php 2011-10-12 12:48:13 UTC (rev 3829)
@@ -264,39 +264,20 @@
* @param $value bool si false, sortie string "cPath=1_3" si true, sortie string "1_3"
*/
public static function get_path($current_category_id = '',$value=false) {
- global $cPath_array;
+ global $cPath_array;
- if (tep_not_null($current_category_id)) {
- $cp_size = sizeof($cPath_array);
- if ($cp_size == 0) {
- $cPath_new = $current_category_id;
- } else {
- $cPath_new = '';
- $last_category_query = tep_db_query("select parent_id from " . TABLE_CATEGORIES . " where categories_id = '" . (int)$cPath_array[($cp_size-1)] . "'");
- $last_category = tep_db_fetch_array($last_category_query);
+ if (tep_not_null($current_category_id)) {
- $current_category_query = tep_db_query("select parent_id from " . TABLE_CATEGORIES . " where categories_id = '" . (int)$current_category_id . "'");
- $current_category = tep_db_fetch_array($current_category_query);
+ $cPath_array = array();
+ self::get_parent_categories(&$cPath_array, $current_category_id) ;
+ $cPath_array[] = $current_category_id;
+ $cPath_new = implode('_', $cPath_array);
+ }
+ elseif(isset($cPath_array) && is_array($cPath_array)){
+ $cPath_new = implode('_', $cPath_array);
+ }
- if ($last_category['parent_id'] == $current_category['parent_id']) {
- for ($i=0; $i<($cp_size-1); $i++) {
- $cPath_new .= '_' . $cPath_array[$i];
- }
- } else {
- for ($i=0; $i<$cp_size; $i++) {
- $cPath_new .= '_' . $cPath_array[$i];
- }
- }
- $cPath_new .= '_' . $current_category_id;
- if (substr($cPath_new, 0, 1) == '_') {
- $cPath_new = substr($cPath_new, 1);
- }
- }
- } else {
- $cPath_new = implode('_', $cPath_array);
- }
-
if ($value) return 'cPath=' . $cPath_new;
else return $cPath_new;
}
Modified: trunk/catalog/includes/classes/drivers/data/product.php
===================================================================
--- trunk/catalog/includes/classes/drivers/data/product.php 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/includes/classes/drivers/data/product.php 2011-10-12 12:48:13 UTC (rev 3829)
@@ -1,12 +1,12 @@
<?php
/**
- \licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- \portion code Copyright (c) 2002 osCommerce
- \package osCSS-2 <www http://www.oscss.org>
- \version 2.1.0
- \date 15/12/10, 11:33
- \author oscim <mail aur...@os...> <www http://www.oscim.fr>
- \encode UTF-8
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 12/10/11, 13:40
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
Prise en charge des product
@@ -302,8 +302,8 @@
*/
protected static function cstr_query($orderby='', $limit='', $option=''){
- $query="SELECT distinct p.products_id, pd.products_name, pd.products_description, p.products_model, p.products_quantity, p.products_image, pd.products_url, p.products_price,p.track_stock, p.products_tax_class_id, p.products_date_added, p.products_date_available, p.manufacturers_id, pd.products_viewed, p2c.categories_id, p.products_weight, IF(pv.typeID, pv.typeID, 1) as type
- FROM " . TABLE_PRODUCTS . " p left join ".TABLE_PRODUCTS_VIRTUAL." pv on p.products_id = pv.productsID , " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c, " . TABLE_CATEGORIES . " c
+ $query="SELECT distinct p.products_id, pd.products_name, pd.products_description, p.products_model, p.products_quantity, p.products_image, pd.products_url, p.products_price,p.track_stock, p.products_tax_class_id, p.products_date_added, p.products_date_available, p.manufacturers_id, pd.products_viewed, p2c.categories_id, p.products_weight, products_type as type
+ FROM " . TABLE_PRODUCTS . " p , " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c, " . TABLE_CATEGORIES . " c
WHERE p.products_status = '1' and pd.products_id = p.products_id and pd.language_id = '" . self::$lg_id . "' and p2c.products_id=p.products_id and c.categories_id=p2c.categories_id and c.categories_status='1' " ;
$query .=self::$where_query;
@@ -787,11 +787,11 @@
if(isset(productData::$array_data[(int)$_GET['products_id']]) ) return productData::$array_data[(int)$_GET['products_id']];
- $sql = "select * from ".TABLE_PRODUCTS_VIRTUAL." where productsID=".(int)$_GET['products_id'];
+ $sql = "select products_type from ".TABLE_PRODUCTS." where products_id=".(int)$_GET['products_id'];
$result = tep_db_query($sql);
if (tep_db_num_rows($result) > 0) { // this product is in the virtual table
$virtual = tep_db_fetch_array($result);
- $this->type_flag= $virtual['typeID'];
+ $this->type_flag= $virtual['products_type'];
}
else $this->type_flag=1;
productData::$array_data[(int)$_GET['products_id']] = $this->type_flag;
Modified: trunk/catalog/install/data/templates/appareil_photo/electronix/includes/content/home.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/electronix/includes/content/home.php 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/install/data/templates/appareil_photo/electronix/includes/content/home.php 2011-10-12 12:48:13 UTC (rev 3829)
@@ -16,7 +16,7 @@
<div class="top_prod_box_big"></div>
<div class="center_prod_box_big">
<p class="customerGreeting"><?php echo tep_customer_greeting(); ?></p>
- <div class="textMain"><?php printf(TEXT_MAIN, PROJECT_VERSION ; ?></div>
+ <div class="textMain"><?php printf(TEXT_MAIN, PROJECT_VERSION ) ; ?></div>
</div>
<div class="bottom_prod_box_big"></div>
</div>
Modified: trunk/catalog/install/includes/classes/core.php
===================================================================
--- trunk/catalog/install/includes/classes/core.php 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/install/includes/classes/core.php 2011-10-12 12:48:13 UTC (rev 3829)
@@ -153,6 +153,10 @@
$this->db['DB_SERVER_PASSWORD'] = trim(stripslashes($_POST['DB_SERVER_PASSWORD']));
$this->db['DB_DATABASE'] = trim(stripslashes($_POST['DB_DATABASE']));
$this->db['DB_TABLE_PREFIX'] = trim($_POST['DB_TABLE_PREFIX']);
+ $this->db['DBMOTOR'] = trim(stripslashes($_POST['DBMOTOR']));
+ $this->db['DBMOTOR_CHARSET'] = trim(stripslashes($_POST['DBMOTOR_CHARSET']));
+ $this->db['DBMOTOR_PORT'] = trim(stripslashes($_POST['DBMOTOR_PORT']));
+ $this->db['DBMOTOR_TYPE'] = trim($_POST['DBMOTOR_TYPE']);
}
/**
Modified: trunk/catalog/install/includes/content/core.configuration.php
===================================================================
--- trunk/catalog/install/includes/content/core.configuration.php 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/install/includes/content/core.configuration.php 2011-10-12 12:48:13 UTC (rev 3829)
@@ -561,7 +561,8 @@
*/
private function tep_call_function($function, $parameter, $object = '') {
$this->get_db_conf();
- osc_db_connect($this->db['DB_SERVER'], $this->db['DB_SERVER_USERNAME'], $this->db['DB_SERVER_PASSWORD']);
+ osc_db_connect($this->db['DBMOTOR'], $this->db['DBMOTOR_PORT'],$this->db['DBMOTOR_CHARSET'],$this->db['DB_SERVER'], $this->db['DB_SERVER_USERNAME'], $this->db['DB_SERVER_PASSWORD'],strtolower( $this->db['DBMOTOR_TYPE']) );
+
osc_db_select_db($this->db['DB_DATABASE']);
if (is_string($object) && $object == '') return call_user_func($function, $parameter);
else return call_user_func(array($object, $function), $parameter);
@@ -569,7 +570,8 @@
private function recup_db_conf_plus(){
$this->get_db_conf();
- osc_db_connect($this->db['DB_SERVER'], $this->db['DB_SERVER_USERNAME'], $this->db['DB_SERVER_PASSWORD']);
+ osc_db_connect($this->db['DBMOTOR'], $this->db['DBMOTOR_PORT'],$this->db['DBMOTOR_CHARSET'],$this->db['DB_SERVER'], $this->db['DB_SERVER_USERNAME'], $this->db['DB_SERVER_PASSWORD'],strtolower( $this->db['DBMOTOR_TYPE']) );
+
osc_db_select_db($this->db['DB_DATABASE']);
$configuration_query = osc_db_query("select * from ".TABLE_CONFIGURATION." where configuration_key in ('STORE_COUNTRY','STORE_OWNER','SHIPPING_ORIGIN_COUNTRY','SHIPPING_ORIGIN_ZIP','SMTP_MAIL_SERVER') order by sort_order");
@@ -610,7 +612,8 @@
define('DB_TABLE_PREFIX', $this->db['DB_TABLE_PREFIX']);
define('DIR_WS_MODULES', $this->fs_document_root.$this->ws_admin_rand.'/includes/modules/');
include($this->fs_document_root.$this->ws_admin_rand.'/includes/database_tables.php');
- osc_db_connect($this->db['DB_SERVER'], $this->db['DB_SERVER_USERNAME'], $this->db['DB_SERVER_PASSWORD']);
+ osc_db_connect($this->db['DBMOTOR'], $this->db['DBMOTOR_PORT'],$this->db['DBMOTOR_CHARSET'],$this->db['DB_SERVER'], $this->db['DB_SERVER_USERNAME'], $this->db['DB_SERVER_PASSWORD'],strtolower( $this->db['DBMOTOR_TYPE']) );
+
osc_db_select_db($this->db['DB_DATABASE']);
$this->install_sitemonitor();
@@ -619,10 +622,10 @@
/**
Config base
*/
- osc_db_query($sql="update ".$this->db['DB_TABLE_PREFIX']."admin set admin_email_address='".$_POST['EMAIL_ADMIN']."' where admin_id='1'" );
- osc_db_query($sql="update ".$this->db['DB_TABLE_PREFIX']."configuration set configuration_value='".$_POST['STORE_OWNER_EMAIL_ADDRESS']."' where configuration_key='STORE_OWNER_EMAIL_ADDRESS'" );
- osc_db_query($sql="update ".$this->db['DB_TABLE_PREFIX']."configuration set configuration_value='".$_POST['EMAIL_FROM']."' where configuration_key='EMAIL_FROM'" );
- osc_db_query($sql="update ".$this->db['DB_TABLE_PREFIX']."configuration set configuration_value='".$_POST['STORE_NAME']."' where configuration_key='STORE_NAME'" );
+ osc_db_query($sql="update ".TABLE_ADMIN." set admin_email_address='".$_POST['EMAIL_ADMIN']."' where admin_id='1'" );
+ osc_db_query($sql="update ".TABLE_CONFIGURATION." set configuration_value='".$_POST['STORE_OWNER_EMAIL_ADDRESS']."' where configuration_key='STORE_OWNER_EMAIL_ADDRESS'" );
+ osc_db_query($sql="update ".TABLE_CONFIGURATION." set configuration_value='".$_POST['EMAIL_FROM']."' where configuration_key='EMAIL_FROM'" );
+ osc_db_query($sql="update ".TABLE_CONFIGURATION." set configuration_value='".$_POST['STORE_NAME']."' where configuration_key='STORE_NAME'" );
/**
Modified: trunk/catalog/install/includes/content/core.installdb.php
===================================================================
--- trunk/catalog/install/includes/content/core.installdb.php 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/install/includes/content/core.installdb.php 2011-10-12 12:48:13 UTC (rev 3829)
@@ -21,10 +21,13 @@
$this->get_fs_document_root();
$this->get_db_conf();
- osc_db_connect($this->db['DB_SERVER'], $this->db['DB_SERVER_USERNAME'], $this->db['DB_SERVER_PASSWORD']);
+ osc_db_connect($this->db['DBMOTOR'], $this->db['DBMOTOR_PORT'],$this->db['DBMOTOR_CHARSET'],$this->db['DB_SERVER'], $this->db['DB_SERVER_USERNAME'], $this->db['DB_SERVER_PASSWORD'],strtolower( $this->db['DBMOTOR_TYPE']) );
osc_db_select_db($this->db['DB_DATABASE']);
$db_error = false;
+ $DB=Database::getInstance();
+ $DB->query("SET storage_engine=".$this->db['DBMOTOR_TYPE'].";");
+
osc_set_time_limit(0);
// creation des tables
@@ -33,12 +36,14 @@
osc_db_upgrade($this->db['DB_DATABASE'], $this->fs_document_root . 'install/includes/sql/mysql/tables/'.$file['file'] , $this->db['DB_TABLE_PREFIX']);
}
}
+
// add key
- foreach(core::browse_rep($this->fs_document_root . 'install/includes/sql/mysql/tables/') as $file){
- if(strpos($file['file'] , '.key') > 0){
- osc_db_upgrade($this->db['DB_DATABASE'], $this->fs_document_root . 'install/includes/sql/mysql/tables/'.$file['file'] , $this->db['DB_TABLE_PREFIX']);
+ if($this->db['DBMOTOR_TYPE'] =='InnoDB')
+ foreach(core::browse_rep($this->fs_document_root . 'install/includes/sql/mysql/tables/') as $file){
+ if(strpos($file['file'] , '.key') > 0){
+ osc_db_upgrade($this->db['DB_DATABASE'], $this->fs_document_root . 'install/includes/sql/mysql/tables/'.$file['file'] , $this->db['DB_TABLE_PREFIX']);
+ }
}
- }
// add data config
if ( ($db_error == false) ) {
@@ -59,7 +64,8 @@
$this->get_fs_document_root();
$this->get_db_conf();
- osc_db_connect($this->db['DB_SERVER'], $this->db['DB_SERVER_USERNAME'], $this->db['DB_SERVER_PASSWORD']);
+ osc_db_connect($this->db['DBMOTOR'], $this->db['DBMOTOR_PORT'],$this->db['DBMOTOR_CHARSET'],$this->db['DB_SERVER'], $this->db['DB_SERVER_USERNAME'], $this->db['DB_SERVER_PASSWORD'],strtolower( $this->db['DBMOTOR_TYPE']) );
+
osc_db_select_db($this->db['DB_DATABASE']);
$db_error = false;
$sql_file = $this->fs_document_root . 'install/includes/upgrade/'.$file.'.sql';
@@ -79,7 +85,8 @@
// conf
$this->get_server_conf();
$this->get_db_conf();
- osc_db_connect($this->db['DB_SERVER'], $this->db['DB_SERVER_USERNAME'], $this->db['DB_SERVER_PASSWORD']);
+ osc_db_connect($this->db['DBMOTOR'], $this->db['DBMOTOR_PORT'],$this->db['DBMOTOR_CHARSET'],$this->db['DB_SERVER'], $this->db['DB_SERVER_USERNAME'], $this->db['DB_SERVER_PASSWORD'],strtolower( $this->db['DBMOTOR_TYPE']) );
+
osc_db_select_db($this->db['DB_DATABASE']);
Modified: trunk/catalog/install/includes/content/core.modes.php
===================================================================
--- trunk/catalog/install/includes/content/core.modes.php 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/install/includes/content/core.modes.php 2011-10-12 12:48:13 UTC (rev 3829)
@@ -319,7 +319,9 @@
$db['DBMOTOR_PORT'] = trim(stripslashes($_POST['DBMOTOR_PORT']));
$db['DBMOTOR_TYPE'] = strtolower(trim(stripslashes($_POST['DBMOTOR_TYPE'])));
-osc_db_connect($db['DBMOTOR'], $db['DBMOTOR_PORT'],$db['DBMOTOR_CHARSET'], $db['DB_SERVER'], $db['DB_SERVER_USERNAME'], $db['DB_SERVER_PASSWORD'],$db['DB_DATABASE'], strtolower( $db['DBMOTOR_TYPE']) );
+
+
+ osc_db_connect($db['DBMOTOR'], $db['DBMOTOR_PORT'],$db['DBMOTOR_CHARSET'], $db['DB_SERVER'], $db['DB_SERVER_USERNAME'], $db['DB_SERVER_PASSWORD'],$db['DB_DATABASE'], strtolower( $db['DBMOTOR_TYPE']) );
// if ( osc_db_connect($db['DBMOTOR'], $db['DBMOTOR_PORT'], $db['DBMOTOR_PORT'], $db['DBMOTOR_TYPE'],$db['DBMOTOR_CHARSET'], $db['DB_SERVER'], $db['DB_SERVER_USERNAME'], $db['DB_SERVER_PASSWORD']) != false) {
if(!osc_db_select_db()){
Modified: trunk/catalog/install/includes/content/core.template_sample.php
===================================================================
--- trunk/catalog/install/includes/content/core.template_sample.php 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/install/includes/content/core.template_sample.php 2011-10-12 12:48:13 UTC (rev 3829)
@@ -33,7 +33,10 @@
define('DB_TABLE_PREFIX', $this->db['DB_TABLE_PREFIX']);
define('DIR_WS_MODULES', $this->fs_document_root.$this->ws_admin_rand.'/includes/modules/');
include($this->fs_document_root.$this->ws_admin_rand.'/includes/database_tables.php');
- osc_db_connect($this->db['DB_SERVER'], $this->db['DB_SERVER_USERNAME'], $this->db['DB_SERVER_PASSWORD']);
+
+// osc_db_connect($this->db['DB_SERVER'], $this->db['DB_SERVER_USERNAME'], $this->db['DB_SERVER_PASSWORD']);
+osc_db_connect($this->db['DBMOTOR'], $this->db['DBMOTOR_PORT'],$this->db['DBMOTOR_CHARSET'],$this->db['DB_SERVER'], $this->db['DB_SERVER_USERNAME'], $this->db['DB_SERVER_PASSWORD'],strtolower( $this->db['DBMOTOR_TYPE']) );
+
osc_db_select_db($this->db['DB_DATABASE']);
$db_error = false;
// recup array( 0=>sample(rep), 1=>template(rep))
Modified: trunk/catalog/install/includes/functions/database.php
===================================================================
--- trunk/catalog/install/includes/functions/database.php 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/install/includes/functions/database.php 2011-10-12 12:48:13 UTC (rev 3829)
@@ -10,7 +10,7 @@
*/
- function osc_db_connect($motor, $port, $charset, $server, $username, $password, $database,$type) {
+ function osc_db_connect($motor, $port, $charset, $server, $username, $password, $database/*,$type*/) {
define('HTTP_SERVER',true);
define('DIR_WS_COMMON','');
@@ -19,7 +19,7 @@
// define our database connection
define('DB_CONNECTOR', $motor);
define('DB_PORT', $port);
- define('DB_TYPE', $type);
+// define('DB_TYPE', $type);
define('DB_CHARSET', $charset);
define('DB_SERVER', $server); // eg, localhost - should not be empty for productive servers
define('DB_SERVER_USERNAME', $username);
@@ -49,7 +49,7 @@
if(!empty($database))
return $DB->db_select($database);
else
- return $DB->db_select();
+ return $DB->db_select(DB_DATABASE);
}
@@ -152,12 +152,12 @@
function osc_db_data_seek($db_query, $row_number) {
- return mysql_data_seek($db_query, $row_number);
+// return mysql_data_seek($db_query, $row_number);
}
function osc_db_free_result($db_query) {
- return mysql_free_result($db_query);
+// return mysql_free_result($db_query);
}
function osc_db_test_create_db_permission($database) {
@@ -167,17 +167,17 @@
// return $DB->query($query);
$db_created = false;
$db_error = false;
-// echo 'test';
+
if (!$database) {
$db_error = 'No Database selected.';
return false;
}
-// echo 'db ok';
+
if (!$db_error) {
if (!osc_db_select_db($database)) {
$db_created = true;
-// echo 'create';
- if ( ($r=$DB->query('create database ' . $database)) && !$r ) {
+
+ if ( ($r=$DB->query('CREATE DATABASE ' . $database)) && !$r ) {
// $db_error = $r;
}
@@ -199,9 +199,6 @@
}
}
}
-// var_dump($db_error);
-//
-// exit;
if (!$db_error) return true;
else return false;
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_address_book.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_address_book.sql 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_address_book.sql 2011-10-12 12:48:13 UTC (rev 3829)
@@ -1,5 +1,5 @@
-SET storage_engine=innodb;
+
drop table if exists osc_address_book;
CREATE TABLE osc_address_book (
address_book_id int(11) NOT NULL auto_increment,
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_address_format.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_address_format.sql 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_address_format.sql 2011-10-12 12:48:13 UTC (rev 3829)
@@ -1,4 +1,3 @@
-SET storage_engine=innodb;
drop table if exists osc_address_format;
CREATE TABLE osc_address_format (
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_admin_groups.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_admin_groups.sql 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_admin_groups.sql 2011-10-12 12:48:13 UTC (rev 3829)
@@ -1,5 +1,5 @@
-SET storage_engine=innodb;
+
drop table if exists osc_admin_groups;
create table osc_admin_groups (
admin_groups_id int(11) not null auto_increment,
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_admin_m_files.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_admin_m_files.sql 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_admin_m_files.sql 2011-10-12 12:48:13 UTC (rev 3829)
@@ -1,5 +1,5 @@
-SET storage_engine=innodb;
+
drop table if exists osc_admin_m_files;
CREATE TABLE osc_admin_m_files (
admin_files_id int(11) NOT NULL auto_increment,
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_admin_m_files_to_right.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_admin_m_files_to_right.sql 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_admin_m_files_to_right.sql 2011-10-12 12:48:13 UTC (rev 3829)
@@ -1,10 +1,10 @@
-SET storage_engine=innodb;
+
DROP TABLE IF EXISTS osc_admin_m_files_to_right;
CREATE TABLE osc_admin_m_files_to_right (
files_id int(11) ,
type_id int(1) default '0',
id_ref int(11) ,
UNIQUE filesgroup (files_id,type_id,id_ref)
-);
+) DEFAULT CHARSET=utf8;
COMMIT;
\ No newline at end of file
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_admin_notification.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_admin_notification.sql 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_admin_notification.sql 2011-10-12 12:48:13 UTC (rev 3829)
@@ -1,5 +1,5 @@
-SET storage_engine=innodb;
+
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',
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_admin_users.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_admin_users.sql 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_admin_users.sql 2011-10-12 12:48:13 UTC (rev 3829)
@@ -1,5 +1,5 @@
-SET storage_engine=innodb;
+
DROP TABLE IF EXISTS osc_admin_users;
CREATE TABLE osc_admin_users (
admin_id int(11) not null auto_increment,
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_categories.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_categories.sql 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_categories.sql 2011-10-12 12:48:13 UTC (rev 3829)
@@ -1,4 +1,3 @@
-SET storage_engine=innodb;
drop table if exists osc_categories;
create table osc_categories (
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_categories_description.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_categories_description.sql 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_categories_description.sql 2011-10-12 12:48:13 UTC (rev 3829)
@@ -1,5 +1,5 @@
-SET storage_engine=innodb;
+
drop table if exists osc_categories_description;
create table osc_categories_description (
categories_id int(11) default '0' not null ,
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_categories_extra.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_categories_extra.sql 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_categories_extra.sql 2011-10-12 12:48:13 UTC (rev 3829)
@@ -1,4 +1,3 @@
-SET storage_engine=innodb;
drop table if exists osc_categories_extra;
CREATE TABLE IF NOT EXISTS osc_categories_extra (
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_checknotif.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_checknotif.sql 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_checknotif.sql 2011-10-12 12:48:13 UTC (rev 3829)
@@ -1,5 +1,5 @@
-SET storage_engine=innodb;
+
CREATE TABLE IF NOT EXISTS osc_checknotif (
chknotif_id int(11) NOT NULL auto_increment,
chknotif_key varchar(100) NOT NULL,
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_cip.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_cip.sql 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_cip.sql 2011-10-12 12:48:13 UTC (rev 3829)
@@ -1,5 +1,5 @@
-SET storage_engine=innodb;
+
drop table if exists osc_cip;
create table osc_cip (
cip_id int(11) NOT NULL auto_increment,
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_cip_depend.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_cip_depend.sql 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_cip_depend.sql 2011-10-12 12:48:13 UTC (rev 3829)
@@ -1,5 +1,5 @@
-SET storage_engine=innodb;
+
drop table if exists osc_cip_depend;
create table osc_cip_depend (
cip_ident varchar(255) NOT NULL,
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_configuration.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_configuration.sql 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_configuration.sql 2011-10-12 12:48:13 UTC (rev 3829)
@@ -1,4 +1,3 @@
-SET storage_engine=innodb;
drop table if exists osc_configuration;
create table osc_configuration (
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_configuration_group.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_configuration_group.sql 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_configuration_group.sql 2011-10-12 12:48:13 UTC (rev 3829)
@@ -1,5 +1,5 @@
-SET storage_engine=innodb;
+
drop table if exists osc_configuration_group;
CREATE TABLE osc_configuration_group (
configuration_group_id int(11) NOT NULL auto_increment,
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_configuration_text.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_configuration_text.sql 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_configuration_text.sql 2011-10-12 12:48:13 UTC (rev 3829)
@@ -1,4 +1,3 @@
-SET storage_engine=innodb;
CREATE TABLE IF NOT EXISTS osc_configuration_text (
cfgtxt_id tinyint(3) unsigned NOT NULL DEFAULT '0',
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_content.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_content.sql 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_content.sql 2011-10-12 12:48:13 UTC (rev 3829)
@@ -1,5 +1,5 @@
-SET storage_engine=innodb;
+
drop table if exists osc_content;
create table osc_content (
content_id int(10) unsigned not null auto_increment,
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_content_description.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_content_description.sql 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_content_description.sql 2011-10-12 12:48:13 UTC (rev 3829)
@@ -1,4 +1,3 @@
-SET storage_engine=innodb;
drop table if exists osc_content_description;
create table osc_content_description (
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_content_to_categories.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_content_to_categories.sql 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_content_to_categories.sql 2011-10-12 12:48:13 UTC (rev 3829)
@@ -1,4 +1,3 @@
-SET storage_engine=innodb;
drop table if exists osc_content_to_categories;
CREATE TABLE osc_content_to_categories (
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_countries.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_countries.sql 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_countries.sql 2011-10-12 12:48:13 UTC (rev 3829)
@@ -1,4 +1,3 @@
-SET storage_engine=innodb;
drop table if exists osc_countries;
create table osc_countries (
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_cronjob.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_cronjob.sql 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_cronjob.sql 2011-10-12 12:48:13 UTC (rev 3829)
@@ -1,5 +1,5 @@
-SET storage_engine=innodb;
+
CREATE TABLE IF NOT EXISTS osc_cronjob (
id tinyint(5) NOT NULL AUTO_INCREMENT,
scriptpath varchar(150) NOT NULL,
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_currencies.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_currencies.sql 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_currencies.sql 2011-10-12 12:48:13 UTC (rev 3829)
@@ -1,4 +1,3 @@
-SET storage_engine=innodb;
drop table if exists osc_currencies;
create table osc_currencies (
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_customers.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_customers.sql 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_customers.sql 2011-10-12 12:48:13 UTC (rev 3829)
@@ -1,5 +1,5 @@
-SET storage_engine=innodb;
+
drop table if exists osc_customers;
CREATE TABLE osc_customers (
customers_id int(11) NOT NULL auto_increment,
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_customers_basket.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_customers_basket.sql 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_customers_basket.sql 2011-10-12 12:48:13 UTC (rev 3829)
@@ -1,4 +1,3 @@
-SET storage_engine=innodb;
drop table if exists osc_customers_basket;
create table osc_customers_basket (
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_customers_basket_attributes.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_customers_basket_attributes.sql 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_customers_basket_attributes.sql 2011-10-12 12:48:13 UTC (rev 3829)
@@ -1,4 +1,3 @@
-SET storage_engine=innodb;
drop table if exists osc_customers_basket_attributes;
create table osc_customers_basket_attributes (
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_customers_groups.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_customers_groups.sql 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_customers_groups.sql 2011-10-12 12:48:13 UTC (rev 3829)
@@ -1,5 +1,5 @@
-SET storage_engine=innodb;
+
DROP TABLE IF EXISTS osc_customers_groups;
CREATE TABLE osc_customers_groups (
customers_group_id smallint UNSIGNED NOT NULL,
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_customers_info.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_customers_info.sql 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_customers_info.sql 2011-10-12 12:48:13 UTC (rev 3829)
@@ -1,5 +1,5 @@
-SET storage_engine=innodb;
+
drop table if exists osc_customers_info;
CREATE TABLE osc_customers_info (
customers_info_id int(11) NOT NULL default '0',
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_customers_to_extra_fields.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_customers_to_extra_fields.sql 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_customers_to_extra_fields.sql 2011-10-12 12:48:13 UTC (rev 3829)
@@ -1,5 +1,5 @@
-SET storage_engine=innodb;
+
drop table if exists osc_customers_to_extra_fields;
CREATE TABLE osc_customers_to_extra_fields (
customers_id int(11) NOT NULL default '0',
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_extra_field_labels.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_extra_field_labels.sql 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_extra_field_labels.sql 2011-10-12 12:48:13 UTC (rev 3829)
@@ -1,4 +1,3 @@
-SET storage_engine=innodb;
drop table if exists osc_extra_field_labels;
CREATE TABLE osc_extra_field_labels (
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_extra_field_values.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_extra_field_values.sql 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_extra_field_values.sql 2011-10-12 12:48:13 UTC (rev 3829)
@@ -1,5 +1,5 @@
-SET storage_engine=innodb;
+
drop table if exists osc_extra_field_values;
CREATE TABLE osc_extra_field_values (
value_id int(10) unsigned NOT NULL auto_increment,
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_extra_fields.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_extra_fields.sql 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_extra_fields.sql 2011-10-12 12:48:13 UTC (rev 3829)
@@ -1,5 +1,5 @@
-SET storage_engine=innodb;
+
drop table if exists osc_extra_fields;
CREATE TABLE osc_extra_fields (
fields_id int(11) NOT NULL auto_increment,
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_extra_fields_info.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_extra_fields_info.sql 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_extra_fields_info.sql 2011-10-12 12:48:13 UTC (rev 3829)
@@ -1,5 +1,5 @@
-SET storage_engine=innodb;
+
drop table if exists osc_extra_fields_info;
CREATE TABLE osc_extra_fields_info (
fields_id int(11) NOT NULL default '0',
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_full_tag.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_full_tag.sql 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_full_tag.sql 2011-10-12 12:48:13 UTC (rev 3829)
@@ -1,4 +1,3 @@
-SET storage_engine=innodb;
drop table if exists osc_full_tag;
CREATE TABLE osc_full_tag (
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_full_tag_description.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_full_tag_description.sql 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_full_tag_description.sql 2011-10-12 12:48:13 UTC (rev 3829)
@@ -1,5 +1,5 @@
-SET storage_engine=innodb;
+
drop table if exists osc_full_tag_description;
CREATE TABLE osc_full_tag_description (
tag_id int(11) NOT NULL default '0',
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_geo_zones.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_geo_zones.sql 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_geo_zones.sql 2011-10-12 12:48:13 UTC (rev 3829)
@@ -1,4 +1,3 @@
-SET storage_engine=innodb;
drop table if exists osc_geo_zones;
create table osc_geo_zones (
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_holding_orders.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_holding_orders.sql 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_holding_orders.sql 2011-10-12 12:48:13 UTC (rev 3829)
@@ -1,4 +1,3 @@
-SET storage_engine=innodb;
drop table if exists osc_holding_orders;
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_holding_orders_products.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_holding_orders_products.sql 2011-10-10 20:46:26 UTC (rev 3828)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_holding_orders_products.sql 2011-10-12 12:48:13 UTC (rev 3829)
@@ -1,4 +1,3 @@
-SET storage_engine=innodb;
drop table if exists osc_holding_orders_products;
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_holding_orders_products_attributes.sql
===================================================================
--- trunk/catalog/in...
[truncated message content] |
|
From: <os...@us...> - 2011-10-10 20:46:33
|
Revision: 3828
http://oscss.svn.sourceforge.net/oscss/?rev=3828&view=rev
Author: oscim
Date: 2011-10-10 20:46:26 +0000 (Mon, 10 Oct 2011)
Log Message:
-----------
Suite modification pour utilisation des dirvers de base de donn?\195?\169e lors de l'installation
Evolution des class Database et driver, refonte partielle function database de l'installateur
Ajustement des class content de l'installateur
Ajout d'option permettant un choix avance sur la db port, type moteur, type engine
Modified Paths:
--------------
trunk/catalog/common/classes/Database.php
trunk/catalog/common/drivers/DB_Mysql.php
trunk/catalog/includes/classes/drivers/data/content.php
trunk/catalog/includes/classes/page.php
trunk/catalog/install/includes/content/core.installdb.php
trunk/catalog/install/includes/content/core.modes.php
trunk/catalog/install/includes/content/core.update.php
trunk/catalog/install/includes/functions/database.php
trunk/catalog/install/includes/functions/general.php
trunk/catalog/install/templates/main_page/stylesheet.css
Modified: trunk/catalog/common/classes/Database.php
===================================================================
--- trunk/catalog/common/classes/Database.php 2011-10-09 08:47:33 UTC (rev 3827)
+++ trunk/catalog/common/classes/Database.php 2011-10-10 20:46:26 UTC (rev 3828)
@@ -45,7 +45,6 @@
-
/**
* Current object instance (Singleton)
* @var object
@@ -75,15 +74,15 @@
- protected function __construct() {
- $this->connect();
+ protected function __construct($db_select=true) {
+ $this->connect($db_select);
if (!is_resource($this->resConnection) && !is_object($this->resConnection))
throw new Exception(sprintf('Could not connect to database (%s)', $this->error));
}
- public static function getInstance() {
+ public static function getInstance($db_select=true) {
if(self::$_instance == null) {
$strClass = 'DB_' . ucfirst(strtolower(self::CONNECTOR));
$strFile = sprintf('%s'.DIR_WS_COMMON.'drivers/%s.php', DIR_FS_CATALOG, $strClass);
@@ -92,7 +91,8 @@
include_once($strFile);
define('DB_DRIVER', $strClass);
- self::$_instance = new $strClass();
+ self::$_instance = new $strClass($db_select);
+
}
return self::$_instance;
}
@@ -250,7 +250,8 @@
/**
* Abstract database driver methods
*/
- abstract protected function connect();
+ abstract protected function connect($db=true);
+ abstract /*protected */function db_select($db=false);
abstract protected function disconnect();
abstract protected function get_error();
abstract protected function begin_transaction();
Modified: trunk/catalog/common/drivers/DB_Mysql.php
===================================================================
--- trunk/catalog/common/drivers/DB_Mysql.php 2011-10-09 08:47:33 UTC (rev 3827)
+++ trunk/catalog/common/drivers/DB_Mysql.php 2011-10-10 20:46:26 UTC (rev 3828)
@@ -34,7 +34,7 @@
/**
* Connect to database server and select database
*/
- protected function connect() {
+ protected function connect($db=true) {
$strHost = parent::HOST;
if (parent::PORT) $strHost .= ':' . parent::PORT;
@@ -46,12 +46,21 @@
{
@mysql_query("SET sql_mode=''", $this->resConnection);
@mysql_query("SET NAMES " . parent::CHARSET, $this->resConnection);
- @mysql_select_db(parent::DB, $this->resConnection);
+ if($db)
+ $this->db_select();
}
}
/**
+ Select from database
+ */
+ /*protected*/ function db_select($db=false) {
+ return @mysql_select_db( ((!$db)?parent::DB: $db ), $this->resConnection);
+ }
+
+
+ /**
Disconnect from database
*/
protected function disconnect() {
Modified: trunk/catalog/includes/classes/drivers/data/content.php
===================================================================
--- trunk/catalog/includes/classes/drivers/data/content.php 2011-10-09 08:47:33 UTC (rev 3827)
+++ trunk/catalog/includes/classes/drivers/data/content.php 2011-10-10 20:46:26 UTC (rev 3828)
@@ -33,6 +33,7 @@
protected static function start_module(){
$pdm=contentModule::getInstance();
self::$modules=$pdm->ret_modules();
+ return $pdm;
}
public static function getInstance($full=false) {
@@ -45,15 +46,52 @@
return self::getInstance();
}
+
/**
- Module configuration
+ Data function
*/
+ /**
+ * \fn ret_modules()
+ * \brief Retour tableau des modules type products actif
+ * @return plusieurs modules via array(object)
+ */
public function ret_modules(){ self::start_module(); return self::$modules;}
+ /**
+ * \fn check_action($class='',$actions='')
+ * \brief execute la capture des actions par les modlues
+ * @param $class string
+ * @param $actions array
+ */
+ public function check_action($class='',$actions=''){ $pdm=self::start_module(); return $pdm->check_action($class,$actions);}
+ /**
+ * \fn get_header($class='',$actions='')
+ * \brief traitement block header des module
+ * Display block header modules
+ * @param $class string
+ * @param $actions array
+ */
+// public function get_header($class='',$actions=''){ $pdm=self::start_module(); return $pdm->get_header($class,$actions);}
+ /**
+ * \fn after_check_action($class='',$actions='')
+ * \brief after_check_action
+ * @param $class string
+ * @param $actions array
+ */
+ public function after_check_action($class='',$actions=''){ $pdm=self::start_module(); return $pdm->after_check_action($class,$actions);}
+ /**
+ * \fn display_view($pID,$class='',$exclude=array())
+ * \brief after_check_action
+ * @param $pID int
+ * @param $class string
+ * @param $exclude array
+ */
+ public function display_view($ID,$class='',$exclude=array()){$pdm=self::start_module(); return $pdm->display_view($ID,$class,$exclude);}
/**
Data function
*/
+
public static function get_query($id='',$search='',$exclude='',$option=array()){ global $languages_id; return contentData::get_query($id,$search,$exclude,$option); }
public static function get_item($id){ return contentData::get_item($id); }
public static function get_content_cat($id){ return contentData::get_content_cat($id); }
@@ -395,6 +433,11 @@
extends AbstractAcaModule
implements InterfaceAcaGene {
+ /**
+ @var string Les modules actif
+ */
+ public $modules;
+
protected static $_instance;
/**
@@ -404,7 +447,7 @@
$this->name=__CLASS__;
$this->modules=array();
$list_mod=array();
- foreach(parent::initialise_type('MODULE_CONTENT_INSTALLED',$this->name) as $class){
+ foreach(parent::initialise_type('MODULE_CONTENT_INSTALLED','content') as $class){
$cl[$class]=new $class ();
$list_mod[$class] = $cl[$class]->sort_order;
}
@@ -427,7 +470,33 @@
return self::getInstance();
}
- public function display_view($ID,$class=''){return array();}
+ /**
+ * \fn display_view($pID,$class='',$exclude=array() )
+ @brief Affiche module elemennt html
+ Block principal d'affichage, liste ou vue des élément. Block principal de page
+ @param $pID int le Id du produits
+ @param $class string le nom de la class appelé, ou vide pour toutes les class enfants
+ @param $exclude array
+ */
+ public function display_view($pID,$class='',$exclude=array() ){
+ global $page;
+ if (!empty($class)) {
+ if (isset($this->modules[$class]) && $this->modules[$class]->enabled and (method_exists($class, 'display_view' ))){
+ $this->modules[$class]->load_db_values($pID);
+ return $this->modules[$class]->display_view($pID);
+ }
+ } else {
+ $c=array();
+ if(isset($this->modules) && is_array($this->modules))
+ foreach ($this->modules as $key=>$module) {
+ if ( !in_array($key,$exclude) && ($module->enabled) and (method_exists($module, 'display_view' ))) {
+ $this->modules[$key]->load_db_values($pID);
+ $c[$key]=$this->modules[$key]->display_view($pID);
+ }
+ }
+ return $c;
+ }
+ }
/**
Affiche module display_view mini
Modified: trunk/catalog/includes/classes/page.php
===================================================================
--- trunk/catalog/includes/classes/page.php 2011-10-09 08:47:33 UTC (rev 3827)
+++ trunk/catalog/includes/classes/page.php 2011-10-10 20:46:26 UTC (rev 3828)
@@ -3,8 +3,8 @@
@licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 17/07/11, 11:12
+ @version 2.1.1
+ @date 10/10/11, 22:04
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
\class page
@@ -434,6 +434,9 @@
// $this->new_class($this->the_type(),true);
$ACA = $this->return_object($this->the_type());
}
+
+ if (isset($_REQUEST['action']))
+ $ACA->check_action('',$_REQUEST['action']);
}
//! Init du theme
$this->oscss_get_gabarit_template();
Modified: trunk/catalog/install/includes/content/core.installdb.php
===================================================================
--- trunk/catalog/install/includes/content/core.installdb.php 2011-10-09 08:47:33 UTC (rev 3827)
+++ trunk/catalog/install/includes/content/core.installdb.php 2011-10-10 20:46:26 UTC (rev 3828)
@@ -81,6 +81,9 @@
$this->get_db_conf();
osc_db_connect($this->db['DB_SERVER'], $this->db['DB_SERVER_USERNAME'], $this->db['DB_SERVER_PASSWORD']);
osc_db_select_db($this->db['DB_DATABASE']);
+
+
+
/* Mise a jour db et config diverse */
osc_db_query($sql="update ".$this->db['DB_TABLE_PREFIX']."configuration set configuration_value='".$this->fs_document_root.$this->ws_admin_rand."/sessions/page_parse_time.log' where configuration_key='STORE_PAGE_PARSE_TIME_LOG'" );
osc_db_query($sql="update ".$this->db['DB_TABLE_PREFIX']."configuration set configuration_value='".substr(DC_LOADER_LANG,0,2)."' where configuration_key='DEFAULT_LANGUAGE'" );
Modified: trunk/catalog/install/includes/content/core.modes.php
===================================================================
--- trunk/catalog/install/includes/content/core.modes.php 2011-10-09 08:47:33 UTC (rev 3827)
+++ trunk/catalog/install/includes/content/core.modes.php 2011-10-10 20:46:26 UTC (rev 3828)
@@ -168,14 +168,68 @@
.'</p>'."\n";
- echo '<h2>'.core::l10n("Serveur").'</h2>'."\n";
+ echo '<h2>'.core::l10n("Serveur").'</h2>'."\n";
echo '<p class="smallDesc">'."\n"
.'<label>'.core::l10n('Activer les connections SSL:').'</label>'."\n"
.osc_draw_checkbox_field('ENABLE_SSL', '', ( (isset($_POST['ENABLE_SSL'])&& $_POST['ENABLE_SSL'] == 'true')? true : false) )."\n"
.core::draw_help('httpSSL', core::l10n('Activer les connections sécurisé SSL (HTTPS) (exige un certificat installé sur le serveur web).')/*, core::l10n('Activer les connections SSL:')*/)."\n"
.'</p>'."\n";
- echo "<p>".osc_draw_hidden_field('go_test', '', true)."</p>\n";
+
+ echo '<h2>'.core::l10n("Avance").'</h2>'."\n";
+
+
+ echo '<p class="smallDesc">'."\n"
+ .'<label>'.core::l10n('Type de base de donnée').'</label>'."\n"
+ .'<select name="DBMOTOR" >'."\n"
+ .'<option value="Mysql" '.($language_code == DC_LOADER_LANG ? 'selected="selected"' : '').'>Mysql</option>'."\n"
+ .'<option value="Mysqli" '.($language_code == DC_LOADER_LANG ? 'selected="selected"' : '').'>Mysqli</option>'."\n"
+ .'</select>'."\n"
+ .core::draw_help('httpSSL', core::l10n('Le type de base de donnée'))."\n"
+ .'</p>'."\n";
+
+ echo '<p class="smallDesc">'."\n"
+ .'<label>'.core::l10n('Base de donnée encodage').'</label>'."\n"
+ .'<select name="DBMOTOR_CHARSET" >'."\n"
+ .'<option value="utf8" '.($language_code == DC_LOADER_LANG ? 'selected="selected"' : '').'>utf-8</option>'."\n"
+ .'<option value="latin1" '.($language_code == DC_LOADER_LANG ? 'selected="selected"' : '').'>latin1</option>'."\n"
+ .'</select>'."\n"
+ .core::draw_help('httpSSL', core::l10n('L\'encodage de la base de donnée'))."\n"
+ .'</p>'."\n";
+
+ echo '<p class="smallDesc">'."\n"
+ .'<label>'.core::l10n('Le port de la base de donnée').'</label>'."\n"
+ .osc_draw_input_field('DBMOTOR_PORT', '',( isset($_POST['DBMOTOR_PORT'])? $_POST['DBMOTOR_PORT'] : '3306'))."\n"
+ .core::draw_help('httpSSL', core::l10n(' Post du serveur de base de donnée mysql(3306), ')/*, core::l10n('Activer les connections SSL:')*/)."\n"
+ .'</p>'."\n";
+
+ echo '<p class="smallDesc">'."\n"
+ .'<label>'.core::l10n('Type de moteur dans la base de donnée').'</label>'."\n"
+ .'<select name="DBMOTOR_TYPE" >'."\n"
+ .'<option value="MyISAM" '.($language_code == DC_LOADER_LANG ? 'selected="selected"' : '').'>MyISAM</option>'."\n"
+ .'<option value="InnoDB" '.($language_code == DC_LOADER_LANG ? 'selected="selected"' : '').'>InnoDB</option>'."\n"
+ .'</select>'."\n"
+ .core::draw_help('httpSSL', core::l10n('Preferer le moteur innodb pour les base volumineuse, uniquement lors d\'une nouvelle installation. le moteur ne peut être converti apres installation'))."\n"
+ .'</p>'."\n";
+
+
+ echo '<p class="smallDesc">'."\n"
+ .'<label>'.core::l10n('Choix de l\'arboresance des dossiers inscriptibles').'</label>'."\n"
+ .'<ul>'
+ .'<li>'
+ .osc_draw_radio_field('ARBORESANCE', '1', ( (!isset($_POST['ARBORESANCE']) || $_POST['ARBORESANCE'] == '1')? true : false) )."\n" . core::l10n('Classique')
+ .core::draw_help('httpSSL', core::l10n('Un dossier contient l\'ensemble des donnée de l\'application')/*, core::l10n('Activer les connections SSL:')*/)."\n"
+ .'</li>'
+ .'<li>'
+ .osc_draw_radio_field('ARBORESANCE', '2', ( (isset($_POST['ARBORESANCE'])&& $_POST['ARBORESANCE'] == '2')? true : false) )."\n" . core::l10n('Vhost')
+ .core::draw_help('httpSSL', core::l10n('Le dossier des données et document est placé au dessus du dossier de l\'application. modificatio du vhost ou acces au dossier superieur')/*, core::l10n('Activer les connections SSL:')*/)."\n"
+ .'</li>'
+ .'</ul>'
+ .'</p>'."\n";
+
+
+
+ echo "<p>".osc_draw_hidden_field('go_test', '', true)."</p>\n";
echo $this->draw_button();
echo '</form>'."\n";
@@ -260,11 +314,15 @@
$db['DB_SERVER_PASSWORD'] = trim(stripslashes($_POST['DB_SERVER_PASSWORD']));
$db['DB_DATABASE'] = trim(stripslashes($_POST['DB_DATABASE']));
$db['DB_TABLE_PREFIX'] = trim(stripslashes($_POST['DB_TABLE_PREFIX']));
+ $db['DBMOTOR'] = trim(stripslashes($_POST['DBMOTOR']));
+ $db['DBMOTOR_CHARSET'] = strtolower(trim(stripslashes($_POST['DBMOTOR_CHARSET'])));
+ $db['DBMOTOR_PORT'] = trim(stripslashes($_POST['DBMOTOR_PORT']));
+ $db['DBMOTOR_TYPE'] = strtolower(trim(stripslashes($_POST['DBMOTOR_TYPE'])));
+osc_db_connect($db['DBMOTOR'], $db['DBMOTOR_PORT'],$db['DBMOTOR_CHARSET'], $db['DB_SERVER'], $db['DB_SERVER_USERNAME'], $db['DB_SERVER_PASSWORD'],$db['DB_DATABASE'], strtolower( $db['DBMOTOR_TYPE']) );
+// if ( osc_db_connect($db['DBMOTOR'], $db['DBMOTOR_PORT'], $db['DBMOTOR_PORT'], $db['DBMOTOR_TYPE'],$db['DBMOTOR_CHARSET'], $db['DB_SERVER'], $db['DB_SERVER_USERNAME'], $db['DB_SERVER_PASSWORD']) != false) {
-
- if ( osc_db_connect($db['DB_SERVER'], $db['DB_SERVER_USERNAME'], $db['DB_SERVER_PASSWORD']) != false) {
- if(!osc_db_select_db($db['DB_DATABASE'])){
+ if(!osc_db_select_db()){
$this->PileMessage('alert', core::l10n("Test de connexion à la base de données échoué. ") );
if(osc_db_test_create_db_permission($db['DB_DATABASE']) ==true){
@@ -276,12 +334,15 @@
$this->PileMessage('alert', core::l10n("la création de la base de donnée à echoué, creer la base manuellement puis poursuivez l'installation") );
}
}
- }
- else{
- $lp_error=false;
- $this->PileMessage('alert', core::l10n("le couple utilisateur login/password n'est pas correct") );
- }
+ else
+ $db_error= false;
+// }
+// else{
+// $lp_error=false;
+// $this->PileMessage('alert', core::l10n("le couple utilisateur login/password n'est pas correct") );
+// }
+
/** Test si db oscss deja existante, si c'est le cas, force mode upgrade db */
if ($db_error === false) {
$final=array();
Modified: trunk/catalog/install/includes/content/core.update.php
===================================================================
--- trunk/catalog/install/includes/content/core.update.php 2011-10-09 08:47:33 UTC (rev 3827)
+++ trunk/catalog/install/includes/content/core.update.php 2011-10-10 20:46:26 UTC (rev 3828)
@@ -1,11 +1,11 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @package oscss-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 03/01/11, 09:20
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 09/10/11, 17:43
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @modified Ayatus <www http://www.ayatus.org>
@encode UTF-8
@class update
Prise en charge recup version courante svn / par rapport revision enregitré
@@ -15,7 +15,7 @@
define('URL_OSCSS_ORG_TRAC', 'http://sourceforge.net/apps/trac/oscss/changeset/?format=zip&new=SVN_REV_MAX&old=SVN_REV&new_path=branches%2F2.1.0%2Fcatalog&old_path=branches%2F2.1.0%2Fcatalog');
define('URL_OSCSS_GET_REV', 'http://oscss.svn.sourceforge.net/viewvc/oscss?view=revision');
-define('PATH_SVN_BRANCHE', 'branches/2.1.0/catalog/');
+define('PATH_SVN_BRANCHE', 'trunk/catalog/');
define('FILEPATH_SVN_CORE', 'common/oscss.version.xml');
class update extends core {
Modified: trunk/catalog/install/includes/functions/database.php
===================================================================
--- trunk/catalog/install/includes/functions/database.php 2011-10-09 08:47:33 UTC (rev 3827)
+++ trunk/catalog/install/includes/functions/database.php 2011-10-10 20:46:26 UTC (rev 3828)
@@ -9,42 +9,67 @@
@encode UTF-8
*/
- function osc_db_connect($server, $username, $password, $link = 'db_link') {
- global $link, $db_error;
- $db_error = false;
+ function osc_db_connect($motor, $port, $charset, $server, $username, $password, $database,$type) {
+ define('HTTP_SERVER',true);
- if (!$server) {
- $db_error = 'No Server selected.';
- return false;
- }
+ define('DIR_WS_COMMON','');
+ define('DIR_FS_CATALOG',substr(dirname(__FILE__),0,strpos(dirname(__FILE__),'install/includes/functions') ).'/common/');
- $link = @mysql_connect($server, $username, $password) or $db_error = mysql_error();
- @mysql_query("SET NAMES 'utf8' " , $link);
- return $link;
+ // define our database connection
+ define('DB_CONNECTOR', $motor);
+ define('DB_PORT', $port);
+ define('DB_TYPE', $type);
+ define('DB_CHARSET', $charset);
+ define('DB_SERVER', $server); // eg, localhost - should not be empty for productive servers
+ define('DB_SERVER_USERNAME', $username);
+ define('DB_SERVER_PASSWORD', $password);
+
+// define('DB_TABLE_PREFIX', 'osc_');
+ define('USE_PCONNECT', 'false'); // use persisstent connections?
+
+ define('DB_DATABASE', $database);
+
+
+ include_once('../common/classes/Database.php');
+
+
+ $DB=Database::getInstance(false);
+
}
- function osc_db_select_db($database) {
- return mysql_select_db($database);
+
+
+
+ function osc_db_select_db($database='') {
+
+ $DB=Database::getInstance();
+
+
+ if(!empty($database))
+ return $DB->db_select($database);
+ else
+ return $DB->db_select();
}
+
function osc_db_close($link = 'db_link') {
global $link;
return mysql_close($link);
}
- function osc_db_query($query, $link = 'db_link') {
- global $link;
+ function osc_db_query($query/*, $link = 'db_link'*/) {
+// global $link;
- $res= mysql_query($query, $link) or oscss_db_error($query, mysql_errno(), mysql_error());
- return $res;
+// $res= mysql_query($query, $link) or oscss_db_error($query, mysql_errno(), mysql_error());
+ $DB=Database::getInstance();
+ return $DB->query($query);
}
- function osc_db_query_noblock($query, $link = 'db_link') {
- global $link;
-// error_reporting()
- if( ($res=mysql_query($query, $link)) ==false) echo '<br /><strong>Database reported:</strong> '.htmlspecialchars(mysql_error()).'<br /><strong>Failed query:</strong> '.htmlspecialchars($query)."<br />\n";
+ function osc_db_query_noblock($query/*, $link = 'db_link'*/) {
+ $DB=Database::getInstance();
+ if( ($res=$DB->query($query)) ==false) echo '<br /><strong>Database reported:</strong> '.htmlspecialchars(mysql_error()).'<br /><strong>Failed query:</strong> '.htmlspecialchars($query)."<br />\n";
else return $res;
}
@@ -52,20 +77,24 @@
/**
Alias
*/
- function tep_db_query($query, $link = 'db_link') {
+ function tep_db_query($query/*, $link = 'db_link'*/) {
global $link;
return osc_db_query($query, $link);
}
- function tep_db_fetch_array($db_query){
- return mysql_fetch_array($db_query, MYSQL_ASSOC);
- }
- function tep_db_num_rows($db_query) {
- return mysql_num_rows($db_query);
- }
+
+ function tep_db_fetch_array($rId) { return $rId->fetchAssoc(); }
+ function osc_db_fetch_array($db_query){return tep_db_fetch_array($db_query); };
+
+
+
+ function tep_db_num_rows($rId) { return $rId->__get('numRows');}
+ function osc_db_num_rows($db_query) { return tep_db_num_rows($db_query); }
+
+
function tep_db_prepare_input($string) {
if (is_string($string)) {
return trim(stripslashes($string));
@@ -80,15 +109,12 @@
}
}
-function tep_db_insert_id() {
- global $link;
- return mysql_insert_id($link);
-}
+function tep_db_insert_id($rId) { return $rId->__get('insertId'); }
+function osc_db_insert_id($rId) { return tep_db_insert_id($rId); }
-function tep_db_input($string, $link = 'link') {
- global $link;
- return mysql_real_escape_string($string, $link);
-}
+function tep_db_input($string) { $DB=Database::getInstance(); return $DB->db_input($string); }
+
+
function oscss_db_error($query, $errno, $error) {
?>
@@ -122,21 +148,13 @@
die;
}
- function osc_db_fetch_array($db_query) {
- return mysql_fetch_array($db_query);
- }
- function osc_db_num_rows($db_query) {
- return mysql_num_rows($db_query);
- }
+
function osc_db_data_seek($db_query, $row_number) {
return mysql_data_seek($db_query, $row_number);
}
- function osc_db_insert_id() {
- return mysql_insert_id();
- }
function osc_db_free_result($db_query) {
return mysql_free_result($db_query);
@@ -145,40 +163,45 @@
function osc_db_test_create_db_permission($database) {
global $db_error;
+ $DB=Database::getInstance();
+// return $DB->query($query);
$db_created = false;
$db_error = false;
-
+// echo 'test';
if (!$database) {
$db_error = 'No Database selected.';
return false;
}
-
+// echo 'db ok';
if (!$db_error) {
if (!osc_db_select_db($database)) {
$db_created = true;
-
- if (!osc_db_query('create database ' . $database)) {
- $db_error = mysql_error();
+// echo 'create';
+ if ( ($r=$DB->query('create database ' . $database)) && !$r ) {
+// $db_error = $r;
}
} else {
- $db_error = mysql_error();
+// $db_error = mysql_error();
}
if (!$db_error) {
if (osc_db_select_db($database)) {
- if (osc_db_query('create table temp ( temp_id int(5) )')) {
- if (!osc_db_query('drop table temp')) {
- $db_error = mysql_error();
+ if ($DB->query('create table temp ( temp_id int(5) )')) {
+ if (!$DB->query('drop table temp')) {
+// $db_error = mysql_error();
}
} else {
- $db_error = mysql_error();
+// $db_error = mysql_error();
}
} else {
- $db_error = mysql_error();
+// $db_error = mysql_error();
}
}
}
+// var_dump($db_error);
+//
+// exit;
if (!$db_error) return true;
else return false;
Modified: trunk/catalog/install/includes/functions/general.php
===================================================================
--- trunk/catalog/install/includes/functions/general.php 2011-10-09 08:47:33 UTC (rev 3827)
+++ trunk/catalog/install/includes/functions/general.php 2011-10-10 20:46:26 UTC (rev 3828)
@@ -190,4 +190,41 @@
return isset($lang[$str]) ? $lang[$str] : $str;
}
+
+
+/**
+ @author oscim - OscssTeam
+ @param string/boolean defini par une constante!
+ @return boolean true/false
+*/
+function _cst_bool($text){
+ if(!tep_not_null($text)) return false;
+ $value=tep_cst_define($text);
+ if( (is_string($value) && strtoupper($value)=='TRUE')||( is_bool($value) && $value==TRUE) ) return true;
+ elseif( (is_string($value) && (strtoupper($value)=='FALSE')) || ( is_bool($value) && $value==FALSE) ) return false;
+ return false;
+}
+
+/**
+ @package oscss-major
+ @author oscim - OscssTeam
+ @param string/boolean
+ @return boolean true/false
+*/
+function _test_bool($value){
+ if(!tep_not_null($value)) return false;
+ if( (is_string($value) && (strtoupper($value)=='TRUE' || $value=='1' ) )||( is_bool($value) && ($value==TRUE || $value==1) ) || (is_numeric($value) && $value=1) ) return true;
+ elseif( (is_string($value) && (strtoupper($value)=='FALSE')) || ( is_bool($value) && $value==FALSE) ) return false;
+ return false;
+}
+
+/**
+ @author oscim - OscssTeam
+ @version 1.0
+ Test si une constante est defini , si celle-ci existe, renvoi sa valeur, sinon return (string)'false'
+*/
+function tep_cst_define($text){
+ if(defined(strtoupper($text))) return constant(strtoupper($text));
+ else return 'false';
+}
?>
\ No newline at end of file
Modified: trunk/catalog/install/templates/main_page/stylesheet.css
===================================================================
--- trunk/catalog/install/templates/main_page/stylesheet.css 2011-10-09 08:47:33 UTC (rev 3827)
+++ trunk/catalog/install/templates/main_page/stylesheet.css 2011-10-10 20:46:26 UTC (rev 3828)
@@ -28,10 +28,13 @@
form, fieldset {margin:0 0 1em; padding:0; border:none;}
label {margin-right:1em;}
input, button, select {font-size:12px;}
-input[type=text], input[type=password] {width:30%;}
+input[type=text], input[type=password] {width:45%;}
input[type=radio] {margin: .3em 1em;}
img {border:none;}
+
+#install label {display:inline-block; width:35%; }
+
/* ---Template--- */
#template {
background-color:white;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-10-09 08:47:40
|
Revision: 3827
http://oscss.svn.sourceforge.net/oscss/?rev=3827&view=rev
Author: oscim
Date: 2011-10-09 08:47:33 +0000 (Sun, 09 Oct 2011)
Log Message:
-----------
modification nommage table admin
Ajout table pour gerer les acl
mise a iveau des fichier datatables
Modified Paths:
--------------
trunk/catalog/admin/includes/database_tables.php
trunk/catalog/includes/database_tables.php
Added Paths:
-----------
trunk/catalog/install/includes/sql/mysql/tables/osc_admin_m_files.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_admin_m_files_to_right.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_admin_users.sql
Removed Paths:
-------------
trunk/catalog/install/includes/sql/mysql/tables/osc_admin.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_admin_files.sql
Modified: trunk/catalog/admin/includes/database_tables.php
===================================================================
--- trunk/catalog/admin/includes/database_tables.php 2011-10-08 14:03:15 UTC (rev 3826)
+++ trunk/catalog/admin/includes/database_tables.php 2011-10-09 08:47:33 UTC (rev 3827)
@@ -3,17 +3,19 @@
@licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 11/02/11, 09:48
+ @version 2.1.1
+ @date 09/10/11, 10:46
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
//Admin begin
- define('TABLE_ADMIN', DB_TABLE_PREFIX . 'admin');
- define('TABLE_ADMIN_FILES', DB_TABLE_PREFIX . 'admin_files');
+ define('TABLE_ADMIN', DB_TABLE_PREFIX . 'admin_users');
define('TABLE_ADMIN_GROUPS', DB_TABLE_PREFIX . 'admin_groups');
define('TABLE_ADMIN_NOTIFICATION', DB_TABLE_PREFIX.'admin_notification');
+
+ define('TABLE_ADMIN_FILES', DB_TABLE_PREFIX . 'admin_m_files');
+ define('TABLE_ADMIN_FILES2RIGHT', DB_TABLE_PREFIX . 'admin_m_files_to_right');
//Admin end
// define the database table names used in the project
Modified: trunk/catalog/includes/database_tables.php
===================================================================
--- trunk/catalog/includes/database_tables.php 2011-10-08 14:03:15 UTC (rev 3826)
+++ trunk/catalog/includes/database_tables.php 2011-10-09 08:47:33 UTC (rev 3827)
@@ -3,15 +3,15 @@
@licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 12/02/11, 15:02
+ @version 2.1.1
+ @date 09/10/11, 10:46
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
define('TABLE_ADMIN_NOTIFICATION', DB_TABLE_PREFIX.'admin_notification');
define('TABLE_NOTIFICATION', DB_TABLE_PREFIX.'checknotif');
- define('TABLE_ADMIN', DB_TABLE_PREFIX . 'admin');
+ define('TABLE_ADMIN', DB_TABLE_PREFIX . 'admin_users');
// define the database table names used in the project
define('TABLE_ADDRESS_BOOK', DB_TABLE_PREFIX . 'address_book');
Deleted: trunk/catalog/install/includes/sql/mysql/tables/osc_admin.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_admin.sql 2011-10-08 14:03:15 UTC (rev 3826)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_admin.sql 2011-10-09 08:47:33 UTC (rev 3827)
@@ -1,19 +0,0 @@
-SET storage_engine=innodb;
-
-DROP TABLE IF EXISTS osc_admin;
-CREATE TABLE osc_admin (
- admin_id int(11) not null auto_increment,
- admin_groups_id int(11) ,
- admin_firstname varchar(32) not null ,
- admin_lastname varchar(32) ,
- admin_email_address varchar(96) not null ,
- admin_password varchar(40) not null ,
- admin_created datetime ,
- admin_modified datetime default '1000-01-01 00:00:00' not null ,
- admin_logdate datetime ,
- admin_lognum int(11) default '0' not null ,
- url_openid varchar(150) null,
- PRIMARY KEY (admin_id),
- UNIQUE admin_email_address (admin_email_address)
-) DEFAULT CHARSET=utf8;
-COMMIT;
\ No newline at end of file
Deleted: trunk/catalog/install/includes/sql/mysql/tables/osc_admin_files.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_admin_files.sql 2011-10-08 14:03:15 UTC (rev 3826)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_admin_files.sql 2011-10-09 08:47:33 UTC (rev 3827)
@@ -1,15 +0,0 @@
-SET storage_engine=innodb;
-
-drop table if exists osc_admin_files;
-CREATE TABLE osc_admin_files (
- admin_files_id int(11) NOT NULL auto_increment,
- admin_files_name varchar(128) NOT NULL COMMENT 'fichier, avec get',
- admin_files_is_boxes tinyint(1) NOT NULL default '0' COMMENT '1 si est une boîte',
- admin_files_to_boxes tinyint(1) NOT NULL default '0' COMMENT 'precise le num de la boîte parent',
- admin_groups_id set('1','2','3','4','5') NOT NULL default '1',
- PRIMARY KEY (admin_files_id),
- UNIQUE KEY admin_files_name (admin_files_name,admin_files_is_boxes,admin_files_to_boxes)
-) DEFAULT CHARSET=utf8;
-
-
-COMMIT;
\ No newline at end of file
Copied: trunk/catalog/install/includes/sql/mysql/tables/osc_admin_m_files.sql (from rev 3815, trunk/catalog/install/includes/sql/mysql/tables/osc_admin_files.sql)
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_admin_m_files.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_admin_m_files.sql 2011-10-09 08:47:33 UTC (rev 3827)
@@ -0,0 +1,15 @@
+SET storage_engine=innodb;
+
+drop table if exists osc_admin_m_files;
+CREATE TABLE osc_admin_m_files (
+ admin_files_id int(11) NOT NULL auto_increment,
+ admin_files_name varchar(128) NOT NULL COMMENT 'fichier, avec get',
+ admin_files_is_boxes tinyint(1) NOT NULL default '0' COMMENT '1 si est une boîte',
+ admin_files_to_boxes tinyint(1) NOT NULL default '0' COMMENT 'precise le num de la boîte parent',
+ admin_groups_id set('1','2','3','4','5') NOT NULL default '1',
+ PRIMARY KEY (admin_files_id),
+ UNIQUE KEY admin_m_files_name (admin_files_name,admin_files_is_boxes,admin_files_to_boxes)
+) DEFAULT CHARSET=utf8;
+
+
+COMMIT;
\ No newline at end of file
Added: trunk/catalog/install/includes/sql/mysql/tables/osc_admin_m_files_to_right.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_admin_m_files_to_right.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_admin_m_files_to_right.sql 2011-10-09 08:47:33 UTC (rev 3827)
@@ -0,0 +1,10 @@
+SET storage_engine=innodb;
+
+DROP TABLE IF EXISTS osc_admin_m_files_to_right;
+CREATE TABLE osc_admin_m_files_to_right (
+ files_id int(11) ,
+ type_id int(1) default '0',
+ id_ref int(11) ,
+ UNIQUE filesgroup (files_id,type_id,id_ref)
+);
+COMMIT;
\ No newline at end of file
Copied: trunk/catalog/install/includes/sql/mysql/tables/osc_admin_users.sql (from rev 3815, trunk/catalog/install/includes/sql/mysql/tables/osc_admin.sql)
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_admin_users.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_admin_users.sql 2011-10-09 08:47:33 UTC (rev 3827)
@@ -0,0 +1,19 @@
+SET storage_engine=innodb;
+
+DROP TABLE IF EXISTS osc_admin_users;
+CREATE TABLE osc_admin_users (
+ admin_id int(11) not null auto_increment,
+ admin_groups_id int(11) ,
+ admin_firstname varchar(32) not null ,
+ admin_lastname varchar(32) ,
+ admin_email_address varchar(96) not null ,
+ admin_password varchar(40) not null ,
+ admin_created datetime ,
+ admin_modified datetime default '1000-01-01 00:00:00' not null ,
+ admin_logdate datetime ,
+ admin_lognum int(11) default '0' not null ,
+ url_openid varchar(150) null,
+ PRIMARY KEY (admin_id),
+ UNIQUE admin_email_address (admin_email_address)
+) DEFAULT CHARSET=utf8;
+COMMIT;
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-10-08 14:03:23
|
Revision: 3826
http://oscss.svn.sourceforge.net/oscss/?rev=3826&view=rev
Author: oscim
Date: 2011-10-08 14:03:15 +0000 (Sat, 08 Oct 2011)
Log Message:
-----------
Finition ajustement sqlcategorie
Nettoyage module categorie page
Amelioration edition des cats
Ajustement css
Correction mineurs cms_content lang
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/categorieUtility.php
trunk/catalog/admin/includes/classes/drivers/sqlcategorie.php
trunk/catalog/admin/includes/gabarit/categories/display_view.edit.gab
trunk/catalog/admin/includes/gabarit/cms_content/display_view.edit.gab
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/cms_content.txt
trunk/catalog/admin/includes/modules/account/account_extra.php
trunk/catalog/admin/includes/modules/pages/categories.php
trunk/catalog/admin/includes/modules/pages/cms_content.php
trunk/catalog/admin/includes/template/oscss/jquery-ui-1.css
trunk/catalog/admin/includes/template/oscss/stylesheet-1.css
trunk/catalog/checkout_payment_address.php
Modified: trunk/catalog/admin/includes/classes/categorieUtility.php
===================================================================
--- trunk/catalog/admin/includes/classes/categorieUtility.php 2011-10-03 12:51:47 UTC (rev 3825)
+++ trunk/catalog/admin/includes/classes/categorieUtility.php 2011-10-08 14:03:15 UTC (rev 3826)
@@ -27,7 +27,7 @@
$niv=($incre ==false)? 0 : $incre++ ;
$search = (isset($_GET['search'])) ? "and cd.categories_name like '%" .tep_db_prepare_input($_GET['search']). "%' " : '' ;
- $categories_query = tep_db_query("select c.categories_id, cd.categories_name, c.categories_image, c.parent_id, c.sort_order, c.date_added, c.last_modified,c.categories_status,c.categories_hidden, cd.categories_description, cd.categories_head_keywords_tag from " . TABLE_CATEGORIES . " c, " . TABLE_CATEGORIES_DESCRIPTION . " cd where c.parent_id = '" . (int)(empty($current_ID)?$current_category_id:$current_ID ) . "' and c.categories_id = cd.categories_id and cd.language_id = '" . (int)$languages_id . "' ".$search." order by c.parent_id ASC , c.sort_order ASC, cd.categories_name ASC");
+ $categories_query = tep_db_query("select c.categories_id, cd.categories_name, c.categories_image, c.parent_id, c.sort_order, c.date_added, c.last_modified,c.categories_status,c.categories_hidden, cd.categories_description, cd.categories_head_keywords_tag from " . TABLE_CATEGORIES . " c, " . TABLE_CATEGORIES_DESCRIPTION . " cd where c.parent_id = '" . (int)(($current_ID >=0)?$current_ID :$current_category_id) . "' and c.categories_id = cd.categories_id and cd.language_id = '" . (int)$languages_id . "' ".$search." order by c.parent_id ASC , c.sort_order ASC, cd.categories_name ASC");
while ($categories = tep_db_fetch_array($categories_query)){
$nbr=self::childs_in_category_count($categories['categories_id']);
Modified: trunk/catalog/admin/includes/classes/drivers/sqlcategorie.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlcategorie.php 2011-10-03 12:51:47 UTC (rev 3825)
+++ trunk/catalog/admin/includes/classes/drivers/sqlcategorie.php 2011-10-08 14:03:15 UTC (rev 3826)
@@ -11,15 +11,26 @@
*/
-
-
class sqlcategorie
implements ModSqlDataDriver{
-
+ /**
+ @var object childs module class
+ */
public static $modules;
-
+ /**
+ @var current ressource class
+ */
protected static $_instance;
+ /**
+ @var string error detail
+ */
+ public static $error = false;
+ /**
+ @brief constructor
+ no direct call, but is auto call by static public method
+ This method init Childs modules class
+ */
protected function __construct(){
/**
TODO : remplacer le nom de constante par un MODULE_CATEGORIES_INSTALLED_BO
@@ -28,7 +39,10 @@
self::$modules->set_image_handler();
}
-
+ /**
+ @brief for call construct class in singletown
+ @return current instance
+ */
public static function getInstance() {
if(self::$_instance == null) self::$_instance = new self();
return self::$_instance;
@@ -37,61 +51,141 @@
/**
- @brief create new ligne in table configuration
+ @brief create new record
+ @param $option array
+ @return (bool)false Or (Int) id create
*/
public static function create($option){
+
self::getInstance();
- if(!isset($option['key'])) return 'key';
- if(isset($option['id'])) $sql_data_array['configuration_id'] = $option['id'];
- if(isset($option['title'])) $sql_data_array['configuration_title'] = $option['title'];
- $sql_data_array['configuration_key'] = $option['key'];
- if(isset($option['value'])) $sql_data_array['configuration_value'] = $option['value'];
- if(isset($option['description'])) $sql_data_array['configuration_description'] = $option['description'];
- if(isset($option['group_id'])) $sql_data_array['configuration_group_id'] = $option['group_id'];
- if(isset($option['sort_order'])) $sql_data_array['sort_order'] = $option['sort_order'];
- if(isset($option['modified'])) $sql_data_array['last_modified'] = $option['modified'];
- $sql_data_array['date_added'] = (isset($option['added'])) ? $option['added'] : date('Y-m-d H:i:s');
- if(isset($option['use'])) $sql_data_array['use'] = $option['use'];
- if(isset($option['set'])) $sql_data_array['set'] = $option['set'];
- $sql_data_array['configuration_type'] = (isset($option['type'])) ? $option['type'] : 2;
+ if( ! isset($option['id']) )
+ self::$error = __('no id');
+ else
+ $id = (int)$option['id'];
- $res=tep_db_perform(TABLE_CONFIGURATION, $sql_data_array);
+ if( ! isset($option['post']) )
+ self::$error = __('no post');
+ else
+ $post = $option['post'];
+ $list_languages=tep_get_languages();
+
+ $sql_data_array['date_added'] = 'now()';
+ $sql_data_array['sort_order'] = (!empty($post['sort_order'])) ? tep_db_prepare_input((int)$post['sort_order']) : 0 ;
+ $sql_data_array['parent_id'] = (!empty($sql_data_array['parent_id'])) ? tep_db_prepare_input((int)$sql_data_array['parent_id']) : 0 ;
+ $sql_data_array['categories_status'] = (!empty($post['categories_status'])) ? tep_db_prepare_input((int)$post['categories_status']) : 0 ;
+ $sql_data_array['categories_hidden'] = (!empty($post['categories_hidden'])) ? tep_db_prepare_input((int)$post['categories_hidden']) : 0 ;
+
+ // Put post value
+ self::$modules->load_post_values($post);
+
+ self::$modules->get_insert_table_categories($sql_data_array,'');
+
+ $res=tep_db_perform(TABLE_CATEGORIES, $sql_data_array);
+
if(!$res)
return $res;
else
+ $categories_id = $res->__get('insertId');
+
+
+ $categories_name_array = $_POST['categories_name'];
+ $categories_desc_array = $_POST['categories_description'];
+
+
+ for ($i=0, $n=sizeof($list_languages); $i<$n; $i++) {
+ $language_id = $list_languages[$i]['id'];
+ $sql_data_array = array('categories_name' => tep_db_prepare_input($categories_name_array[$language_id]),
+ 'categories_description'=>tep_db_prepare_input($categories_desc_array[$language_id]));
+
+ $insert_sql_data = array('categories_id' => $categories_id,
+ 'language_id' => $list_languages[$i]['id']);
+ $sql_data_array = array_merge($sql_data_array, $insert_sql_data);
+ $sql_data_array = array_merge($sql_data_array,self::$modules->get_insert_table_categories_description (array(),$list_languages[$i]['id']));
+
+ tep_db_perform(TABLE_CATEGORIES_DESCRIPTION, $sql_data_array);
+ }
+
+
+ /// Child module, Call After Update process
+ self::$modules->after_update($id);
+
+
+ if(!$res)
+ return $res;
+ else
return $res->__get('insertId');
}
+
/**
- @brief update ligne in table configuration
+ @brief update record
*/
public static function update($option){
+
self::getInstance();
- if(!isset($option['key']) && !isset($option['id'])) return 'key or id';
- $where ='';
- if(isset($option['id'])) $where .="AND configuration_id = '".(int)$option['id']."' ";
- if(isset($option['key'])) $where .="AND configuration_key = '".$option['key']."' ";
+ if( ! isset($option['id']) )
+ self::$error = __('no id');
+ else
+ $id = (int)$option['id'];
- if(isset($option['title'])) $sql_data_array['configuration_title'] = $option['title'];
- if(isset($option['value'])) $sql_data_array['configuration_value'] = $option['value'];
- if(isset($option['description'])) $sql_data_array['configuration_description'] = $option['description'];
- if(isset($option['group_id'])) $sql_data_array['configuration_group_id'] = $option['group_id'];
- if(isset($option['sort_order'])) $sql_data_array['sort_order'] = $option['sort_order'];
- $sql_data_array['last_modified'] = (isset($option['modified'])) ? $option['modified'] : date('Y-m-d H:i:s');
- if(isset($option['use'])) $sql_data_array['use'] = $option['use'];
- if(isset($option['set'])) $sql_data_array['set'] = $option['set'];
- $sql_data_array['configuration_type'] = (isset($option['type'])) ? $option['type'] : 2;
+ if( ! isset($option['post']) )
+ self::$error = __('no post');
+ else
+ $post = $option['post'];
+ $list_languages=tep_get_languages();
+ $sql_data_array = $option['sqlarray'];
+ $sql_data_array['last_modified'] = 'now()';
+ $sql_data_array['sort_order'] = (!empty($post['sort_order'])) ? tep_db_prepare_input((int)$post['sort_order']) : 0 ;
+ $sql_data_array['parent_id'] = (!empty($sql_data_array['parent_id'])) ? tep_db_prepare_input((int)$sql_data_array['parent_id']) : 0 ;
+ $sql_data_array['categories_status'] = (!empty($post['categories_status'])) ? tep_db_prepare_input((int)$post['categories_status']) : 0 ;
+ $sql_data_array['categories_hidden'] = (!empty($post['categories_hidden'])) ? tep_db_prepare_input((int)$post['categories_hidden']) : 0 ;
- $res=tep_db_perform(TABLE_CONFIGURATION, $sql_data_array, 'update' , substr($where,3) );
+ // Put post value
+ self::$modules->load_post_values($post);
- return $res;
+ $sql_data_array=array_merge($sql_data_array, (array) self::$modules->get_update_table_categories($sql_data_array) );
+
+
+ tep_db_perform(TABLE_CATEGORIES, $sql_data_array, 'update', "categories_id = '" . $id . "'");
+
+ $categories_name_array = $post['categories_name'];
+ $categories_desc_array = $post['categories_description'];
+
+
+ for ($i=0, $n=sizeof($list_languages); $i<$n; $i++) {
+
+ $language_id = (int)$list_languages[$i]['id'];
+ $sql_data_array = array('categories_name' => tep_db_prepare_input($categories_name_array[$language_id]),
+ 'categories_description'=>tep_db_prepare_input($categories_desc_array[$language_id]));
+
+ $tabl=self::$modules->get_update_table_categories_description ($list_languages[$i]['id']);
+ $sql_data_array = array_merge($sql_data_array, $tabl);
+
+ tep_db_perform(TABLE_CATEGORIES_DESCRIPTION, $sql_data_array, 'update', "categories_id = '" . $id . "' and language_id = '" . $language_id . "'");
+
+ }
+
+// if ( !empty($_FILES['categories_image']['tmp_name']) ) {
+// $categories_image = new upload('categories_image', DIR_FS_CATALOG_IMAGES);
+// tep_db_query("update " . TABLE_CATEGORIES . " set categories_image = '" . tep_db_input($categories_image->filename) . "' where categories_id = '" . (int)$categories_id . "'");
+// }
+
+
+ /// Child module, Call After Update process
+ self::$modules->after_update($id);
+
+
+ if(self::$error !=false)
+ return false;
+ else
+ return true;
}
/**
@@ -120,38 +214,68 @@
$DB=Database::getInstance();
$sql ="";
- if(isset($option['id'])) $sql .="AND configuration_id = '".(int)tep_db_input($option['id'])."' ";
-// if(isset($option['key'])) $sql .="AND configuration_key = '".(string)tep_db_input($option['key'])."' ";
-// if(isset($option['group_id'])) $sql .="AND configuration_group_id = '".(int)(string)tep_db_input($option['group_id'])."' ";
+ if( ! isset($option['id']) )
+ self::$error = __('no id');
+ else{
+ $ID = $option['id'];
+ }
-// $sql ="SELECT * FROM ".TABLE_CONFIGURATION." WHERE ".substr($sql,3);
+ if( ! isset($option['language_id']) )
+ self::$error = __('no language_id');
+ else
+ $languages_id = $option['language_id'];
-// $res=$DB->query($sql);
-// $num = $res->__get('numRows');
+ $sql ="SELECT * FROM " . TABLE_CATEGORIES . " c WHERE c.categories_id = '" . (int)$ID . "' "; //.substr($sql,3);
- $check_q = $DB->query("select * from " . TABLE_CATEGORIES_DESCRIPTION . " cd where categories_id = '" .(int) $ID . "' and language_id='".(int)$languages_id."' ");
+ $res=$DB->query($sql);
+ $num = $res->__get('numRows');
- $category_child = array( 'products_count' => categorieUtility::products_in_category_count($ID),
- 'cms_count' => categorieUtility::cms_in_category_count($ID),
- 'childs_count'=>categorieUtility::childs_in_category_count($ID),
- 'cPath'=>categorieUtility::get_generated_category_path_ids($ID)
- );
- return new objectInfo(array_merge($check_q->fetchAssoc(),$category_child));
+ if($num == 1){
+ $result = $res->fetchAssoc();
- if($num == 1){
- $result=$res->fetchAssoc();
+ $check_q = $DB->query($sql="select * from " . TABLE_CATEGORIES_DESCRIPTION . " cd where categories_id = '" .(int) $ID . "'");
+
+ foreach($check_q->fetchAllAssoc() as $catlg){
+ $result['categories_name'][$catlg['language_id']] = $catlg['categories_name'];
+ $result['categories_description'][$catlg['language_id']] = $catlg['categories_description'];
+ }
+ $result['products_count'] = categorieUtility::products_in_category_count($ID);
+ $result['cms_count'] =categorieUtility::cms_in_category_count($ID);
+ $result['childs_count'] =categorieUtility::childs_in_category_count($ID);
+ $result['cPath'] = categorieUtility::get_generated_category_path_ids($ID);
+
+ /// Childs module load
+ self::$modules->load_db_values($ID);
+
return ((!$shortkey)? $result : self::CleanKey($result));
}
elseif($num > 1){
$array=array();
- foreach($res->fetchAllAssoc() as $result)
+ foreach($res->fetchAllAssoc() as $result){
+
+ $check_q = $DB->query($sql="select * from " . TABLE_CATEGORIES_DESCRIPTION . " cd where categories_id = '" .(int) $ID . "'");
+
+ foreach($check_q->fetchAllAssoc() as $catlg){
+ $result['categories_name'][$catlg['language_id']] = $catlg['categories_name'];
+ $result['categories_description'][$catlg['language_id']] = $catlg['categories_description'];
+ }
+ $result['products_count'] = categorieUtility::products_in_category_count($ID);
+ $result['cms_count'] =categorieUtility::cms_in_category_count($ID);
+ $result['childs_count'] =categorieUtility::childs_in_category_count($ID);
+ $result['cPath'] = categorieUtility::get_generated_category_path_ids($ID);
+
+ /// Childs module load
+ self::$modules->load_db_values($ID);
+
$array[]= ((!$shortkey)? $result : self::CleanKey($result));
+ }
return $array;
}
+
return false;
}
@@ -183,10 +307,11 @@
// ACA START DELETE CATEGORY
self::$modules->delete($categories[$i]['id']);
-
+ // child tables cats
$DB->query("delete from " . TABLE_CATEGORIES_DESCRIPTION . " where categories_id = '" . (int)$_id . "'");
$DB->query("delete from " . TABLE_CATEGORIES_EXTRA . " where categories_id = '" . (int)$_id . "'");
+ // master table cats
$DB->query("delete from " . TABLE_CATEGORIES . " where categories_id = '" . (int)$_id . "'");
@@ -226,8 +351,100 @@
+ /**
+ @brief
+ @return array empty
+ */
+ public static function Specimen(){
+ $list_languages=tep_get_languages();
+
+ $par = array(
+ 'parent_id'=>0,
+ 'sort_order'=>0,
+ 'categories_id'=>null,
+ 'categories_image'=>DIR_WS_CATALOG_IMAGES.IMAGE_NONEXISTENT,
+ 'categories_status'=>null,
+ 'categories_hidden'=>null,
+ );
+ for ($i=0, $n=sizeof($list_languages); $i<$n; $i++) {
+ $par['categories_name'][$list_languages[$i]['id']] = '';
+ $par['categories_description'][$list_languages[$i]['id']] = '';
+ }
+
+ return self::CleanKey($par);
+ }
+
+
+
/**
+ @brief Check image cat and add or /delete
+ Adjust process, return path img if ok
+ @param $cat_image string path img input
+ @param $no_img (null or string "on") chekbox no image
+ @return (string) path or empty
+ */
+ public static function AddImage($cat_image='', $no_img=''){
+
+ if (tep_not_null($cat_image) && ($cat_image != 'none')){
+ if( strpos($cat_image,DIR_WS_CATALOG_IMAGES) >=0 )
+ $cat_image = tep_db_prepare_input(substr($cat_image, strlen( DIR_WS_CATALOG_IMAGES) ) );
+ else
+ $cat_image = tep_db_prepare_input($cat_image);
+ }
+
+ $cat_image =(empty($cat_image) || ($no_img=='' && $cat_image=='on') ) ? '' : tep_db_prepare_input($cat_image) ;
+
+ return $cat_image;
+ }
+
+
+ /**
+ @fn MaintenanceTables()
+ @brief clean and maintient link table and data
+ */
+ public static function Maintenance(){
+ self::UpdateCheckLoop();
+
+ self::UpdateCheckLoopByPair();
+ }
+
+
+
+
+ /**
+ @fn UpdateCheckLoop()
+ @brief Check parent_id / rowid and block loop context
+ */
+ private static function UpdateCheckLoop(){
+ $DB=Database::getInstance();
+ $_query = $DB->query($s="SELECT categories_id as id, parent_id FROM " . TABLE_CATEGORIES . " WHERE categories_id = parent_id ");
+
+ foreach($_query->fetchAllAssoc() as $loop)
+ $DB->query("UPDATE " . TABLE_CATEGORIES . " SET parent_id = '0' WHERE categories_id = '" . (int)$loop['id'] . "' ");
+ }
+
+ /**
+ @fn UpdateCheckLoopByPair()
+ @brief Check Pair parent_id / rowid and block loop context
+ */
+ private static function UpdateCheckLoopByPair(){
+ $DB=Database::getInstance();
+ $_query = $DB->query($s="SELECT categories_id as id, parent_id FROM " . TABLE_CATEGORIES . " ORDER BY parent_id ");
+
+ foreach($_query->fetchAllAssoc() as $loop)
+ $cat[$loop['id']] = $loop['parent_id'];
+
+
+ foreach($cat as $k => $v)
+ if($cat[(int)$v] == $k){
+ $DB->query("UPDATE " . TABLE_CATEGORIES . " SET parent_id = ".ORPHELIN_COLLECTOR." WHERE categories_id = '" . (int)$k . "' ");
+ $DB->query("UPDATE " . TABLE_CATEGORIES . " SET parent_id = ".ORPHELIN_COLLECTOR." WHERE categories_id = '" . (int)$v . "' ");
+ }
+ }
+
+
+ /**
@fn CleanKey()
@brief Clean string name key
*/
Modified: trunk/catalog/admin/includes/gabarit/categories/display_view.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/categories/display_view.edit.gab 2011-10-03 12:51:47 UTC (rev 3825)
+++ trunk/catalog/admin/includes/gabarit/categories/display_view.edit.gab 2011-10-08 14:03:15 UTC (rev 3826)
@@ -3,8 +3,8 @@
@licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 07/02/11, 19:18
+ @version 2.1.1
+ @date 07/10/11, 23:13
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -12,6 +12,7 @@
?>
<h3><?php echo __('text info heading edit category'); ?></h3>
+
<div class="box_uniq block_form">
<?php echo tep_draw_form('categories', categories::FILENAME, 'action='.((categories::$action == 'new')?'insert' : 'update').'&cPath=' . categories::$cPath, 'post', 'enctype="multipart/form-data"') ?>
@@ -30,21 +31,17 @@
</ul>
<div id="tabs-1" class="tabPage">
- <p>
- <?php echo __('text edit intro') ?>
- </p>
+
<p class="block_input">
- <?php echo tep_draw_pull_down_menu('cPath', array_merge(array(array('id'=>'', 'text'=> __('txt cat all'))),tep_get_category_tree(0,'',@$_GET['cID'])), categories::$cInfo->parent_id);
- if(categories::$action == 'edit') echo tep_draw_hidden_field('categories_id', '', categories::$cInfo->categories_id); ?>
- </p>
- <p class="block_input">
<Label><?php echo __('text edit sort order') ?></label>
<?php echo tep_draw_input_field('sort_order', '', categories::$cInfo->sort_order, 'size="2"') ?>
+
+ <?php /** Hidden Inputs */ if(categories::$action == 'edit') echo tep_draw_hidden_field('categories_id', '', categories::$cInfo->categories_id); ?>
+
</p>
<p class="block_input">
<div class="tabs_lang">
- <?php /* categories::$languages = tep_get_languages(); */?>
<ul>
<?php for ($i=0, $n=sizeof(categories::$languages); $i<$n; $i++) { ?>
<li><a href="#fieldset_<?php echo $i ?>"><?php echo tep_image(DIR_WS_CATALOG_LANGUAGES . categories::$languages[$i]['directory'] . '/images/' . categories::$languages[$i]['image'], categories::$languages[$i]['name']); ?></a></li>
@@ -100,6 +97,23 @@
<label><?php echo __('text categories hidden'); ?></label>
<?php echo tep_draw_radio_field('categories_hidden', 'categories_hidden_1', '1', (((bool)categories::$cInfo->categories_hidden)?true:false),'','class="radio"') . __('text categories not hidden') .' '. tep_draw_radio_field('categories_hidden', 'categories_hidden_0', '0', ((!(bool)categories::$cInfo->categories_hidden)?true:false),'','class="radio"') . __('text categories hidden'); ?>
</dt>
+
+ <dd class="block_input w_90 CategoryView ">
+ <label for="products_date_available"><?php echo __('txt categories'); ?></label>
+ <ul id="cat_list_in_edit" class="ChooseSelect">
+ <li class="<?php echo (((int)categories::$cInfo->parent_id == '0')? 'selected' : 'noselected') ?>"><?php echo tep_draw_radio_field('cPath','cat_0', '0', ((int)categories::$cInfo->parent_id == '0') ).' '.__('text categorie racine') ?></li>
+ <?php foreach(get_cat_list(0) as $v)
+ if(categories::$cInfo->categories_id != $v['categories_id']){
+ $etat = ((categories::$cInfo->parent_id > 0 && categories::$cInfo->parent_id == $v['categories_id']) ? true :false );
+ echo '<li class="'.(($etat)? 'selected' : 'noselected').'">'.
+ tep_decal(($v['niveau']+1)).
+ ' '. tep_draw_radio_field('cPath','cat_'.$v['categories_id'], (string)$v['categories_id'],(bool)$etat).
+ ' '.$v['categories_name'].
+ '</li>';
+ } ?>
+ </ul>
+ </dd>
+
<dt class="button_nav block_input" style="width:95%;">
<?php
echo tep_image_submit('', IMAGE_UPDATE) . tep_image_submit('', IMAGE_UPDATE_AND_CLOSE,' name="up_and_close"' );
Modified: trunk/catalog/admin/includes/gabarit/cms_content/display_view.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/cms_content/display_view.edit.gab 2011-10-03 12:51:47 UTC (rev 3825)
+++ trunk/catalog/admin/includes/gabarit/cms_content/display_view.edit.gab 2011-10-08 14:03:15 UTC (rev 3826)
@@ -56,7 +56,7 @@
<div class="edit box_right w_30">
<dl>
<dt class="block_input w_90">
- <label for="content_name"><?php echo __('entry content'); ?></label>
+ <label for="content_name" title="<?php echo __('entry content help'); ?>"><?php echo __('entry content').tep_image(DIR_WS_ICONS .'icon_help.gif') ?></label>
<?php echo tep_draw_input_field('content_name', '', cms_content::$cInfo->content_name) . tep_draw_hidden_field('p_format','','HTML'); ?>
</dt>
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/pages/cms_content.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/pages/cms_content.txt 2011-10-03 12:51:47 UTC (rev 3825)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/cms_content.txt 2011-10-08 14:03:15 UTC (rev 3826)
@@ -3,8 +3,8 @@
@licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 24/05/11, 23:25
+ @version 2.1.1
+ @date 08/10/11, 11:13
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -17,7 +17,8 @@
$lang['table heading c title']="Titre" ;
$lang['table heading last modified']="Dernière modification" ;
$lang['table heading action']="Action" ;
-$lang['entry content']="Nom de la page" ;
+$lang['entry content']="Clef : " ;
+$lang['entry content help']="La clef permet l'appel de cette page, elle ce doit d'être unique. Pour appeler plusieurs page, il est possible d'utiliser une racine de clef commune " ;
$lang['text info delete content intro']="Êtes-vous sûr de vouloir supprimer ce contenu ?" ;
$lang['text info date added']="Date d'ajout :" ;
$lang['text info last modified']="Dernière modification :" ;
Modified: trunk/catalog/admin/includes/modules/account/account_extra.php
===================================================================
--- trunk/catalog/admin/includes/modules/account/account_extra.php 2011-10-03 12:51:47 UTC (rev 3825)
+++ trunk/catalog/admin/includes/modules/account/account_extra.php 2011-10-08 14:03:15 UTC (rev 3826)
@@ -34,7 +34,7 @@
self::$cInfo = new objectInfo(array());
- require_once(DIR_WS_FUNCTIONS.'lib.extra_fields.php');
+// require_once(DIR_WS_FUNCTIONS.'lib.extra_fields.php');
}
public function check_action($actions){
Modified: trunk/catalog/admin/includes/modules/pages/categories.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/categories.php 2011-10-03 12:51:47 UTC (rev 3825)
+++ trunk/catalog/admin/includes/modules/pages/categories.php 2011-10-08 14:03:15 UTC (rev 3826)
@@ -92,8 +92,6 @@
//! detail item in ajax
define('AJAXSTATMENTDETAIL', 'mod=page&type='.self::$code);
- // Use factory class aca
- //self::$modules=new categoriesACA();
/**
TODO : remplacer le nom de constante par un MODULE_CATEGORIES_INSTALLED_BO
*/
@@ -117,7 +115,7 @@
public function check_action($actionss){
global $languages_id, $oscss,$messageStack;
-// self::$action=$actionss;
+
$DB=Database::getInstance();
self::$actions['action'] = self::$action;
@@ -132,9 +130,22 @@
self::$DiversInfo['current_category_id']=((isset($_GET['cPath'])&& !empty($_GET['cPath'])) ? tep_db_prepare_input($_GET['cPath']) : 0);
- if ( empty(self::$actions['action_class']) ) {
+// if ( empty(self::$actions['action_class']) ) {
+ /**
+ A module has asked to privately take care of this action, check if class and method exist and run it.
+ */
+ if (!empty(self::$actions['action_method']) && method_exists(self::$modules->modules[self::$actions['action_class']],self::$actions['action_method'] )){
+ $metho=self::$actions['action_method'];
+ self::$box = new box;
+ self::$box=self::$modules->modules[self::$actions['action_class']]->$metho(self::$box,(int)$_GET['cID']);
+ }
- if ( preg_match("/(insert|update|setflag)/i", self::$action) ) tep_reset_cache_data_seo_urls('reset');
+ else {
+
+ /// specific SEO cache
+ if ( preg_match("/(insert|update|setflag)/i", self::$action) )
+ tep_reset_cache_data_seo_urls('reset');
+
switch (self::$action) {
case 'setflag':
if ( ($_GET['flag'] == '0') || ($_GET['flag'] == '1') ) {
@@ -174,85 +185,34 @@
if (isset($_POST['categories_id'])) $categories_id = tep_db_prepare_input((int)$_POST['categories_id']);
- if (isset($_POST['categories_image']) && tep_not_null($_POST['categories_image']) && ($_POST['categories_image'] != 'none')){
- if( strpos($_POST['categories_image'],DIR_WS_CATALOG_IMAGES) >=0 )
- $_POST['categories_image'] = tep_db_prepare_input(substr($_POST['categories_image'], strlen( DIR_WS_CATALOG_IMAGES) ) );
- else
- $_POST['categories_image'] = tep_db_prepare_input($_POST['categories_image']);
- }
- $sort_order = (isset($_POST['sort_order'])) ? tep_db_prepare_input((int)$_POST['sort_order']) : 0 ;
- self::$current_category_id = (isset($_POST['cPath'])) ? tep_db_prepare_input($_POST['cPath']) : 0 ;
- $categories_status = (isset($_POST['categories_status'])) ? tep_db_prepare_input((int)$_POST['categories_status']) : 0 ;
- $categories_hidden = (isset($_POST['categories_hidden'])) ? tep_db_prepare_input((int)$_POST['categories_hidden']) : 0 ;
- $categories_image = (!isset($_POST['categories_image']) || (!isset($_POST['categories_image_no']) && $_POST['categories_image']=='on') ) ? '' : tep_db_prepare_input($_POST['categories_image']) ;
+ $params['sqlarray'] = array('sort_order' => (isset($_POST['sort_order'])) ? tep_db_prepare_input((int)$_POST['sort_order']) : 0 ,
+ 'parent_id' => tep_db_prepare_input((int)@$_POST['cPath']),
+ 'categories_status' => (isset($_POST['categories_status'])) ? tep_db_prepare_input((int)$_POST['categories_status']) : 0,
+ 'categories_hidden' => (isset($_POST['categories_hidden'])) ? tep_db_prepare_input((int)$_POST['categories_hidden']) : 0 ,
+ 'categories_image'=>sqlcategorie::AddImage(@$_POST['categories_image'], @$_POST['categories_image_no'])
+ );
- $sql_data_array = array('sort_order' => $sort_order,
- 'parent_id' => self::$current_category_id,
- 'categories_status' => $categories_status,
- 'categories_hidden' => $categories_hidden,
- 'categories_image'=>$categories_image
- );
+ $params['id']=$categories_id;
+ $params['action']=self::$action;
+ $params['post']=$_POST;
+ $params['language_id']= $languages_id;
+ $params['cPath']=(isset($_POST['cPath'])) ? tep_db_prepare_input($_POST['cPath']) : 0;
- if (self::$action == 'insert') {
- $insert_sql_data = array('date_added' => 'now()');
- $sql_data_array = array_merge($sql_data_array, $insert_sql_data);
- self::$modules->load_post_values ($_POST);
- self::$modules->get_insert_table_categories($sql_data_array,'');
+ if (self::$action == 'insert')
+ $res = sqlcategorie::create($params);
+ elseif (self::$action == 'update')
+ $res = sqlcategorie::update($params);
- $resobj=tep_db_perform(TABLE_CATEGORIES, $sql_data_array);
- $categories_id = tep_db_insert_id($resobj);
+ if( ! $res )
+ $messageStack->add_session(sprintf(__('error save categorie : %s'), sqlcategorie::$error ), 'error');
+ else
+ $messageStack->add_session(sprintf(__('save categorie %s success'), $categories_id ), 'success');
- } elseif (self::$action == 'update') {
- $update_sql_data = array('last_modified' => 'now()');
- $sql_data_array = array_merge($sql_data_array, $update_sql_data);
-
- self::$modules->load_post_values ($_POST);
- $sql_data_array=array_merge($sql_data_array, (array) self::$modules->get_update_table_categories($sql_data_array) );
-
- tep_db_perform(TABLE_CATEGORIES, $sql_data_array, 'update', "categories_id = '" . (int)$categories_id . "'");
- }
-
- $categories_name_array = $_POST['categories_name'];
- $categories_desc_array = $_POST['categories_description'];
-
-
- for ($i=0, $n=sizeof(self::$languages); $i<$n; $i++) {
-
- $language_id = self::$languages[$i]['id'];
- $sql_data_array = array('categories_name' => tep_db_prepare_input($categories_name_array[$language_id]),
- 'categories_description'=>tep_db_prepare_input($categories_desc_array[$language_id]));
-
- if (self::$action == 'insert') {
- $insert_sql_data = array('categories_id' => $categories_id,
- 'language_id' => self::$languages[$i]['id']);
- $sql_data_array = array_merge($sql_data_array, $insert_sql_data);
- $sql_data_array = array_merge($sql_data_array,self::$modules->get_insert_table_categories_description (array(),self::$languages[$i]['id']));
-
- tep_db_perform(TABLE_CATEGORIES_DESCRIPTION, $sql_data_array);
-
- } elseif (self::$action == 'update') {
- $tabl=self::$modules->get_update_table_categories_description (self::$languages[$i]['id']);
- $sql_data_array = array_merge($sql_data_array, $tabl);
-
- tep_db_perform(TABLE_CATEGORIES_DESCRIPTION, $sql_data_array, 'update', "categories_id = '" . (int)$categories_id . "' and language_id = '" . (int)$language_id . "'");
- }
- }
-
-// if ( !empty($_FILES['categories_image']['tmp_name']) ) {
-// $categories_image = new upload('categories_image', DIR_FS_CATALOG_IMAGES);
-// tep_db_query("update " . TABLE_CATEGORIES . " set categories_image = '" . tep_db_input($categories_image->filename) . "' where categories_id = '" . (int)$categories_id . "'");
-// }
-
-
-
- self::$modules->after_update ($categories_id);
-
-
osCSS_Cache::clear('categoriesBox');
osCSS_Cache::clear('category_tree');
osCSS_Cache::clear('also_purchased');
@@ -262,6 +222,19 @@
break;
case 'delete_confirm':
+
+/**
+
+ TODO Utiliser var de configuration
+
+TABLES_TO_CATEGORIE, pour lister les table de laison vers les catgories
+
+Voir a l 'eploiter avec les pace public, pour autoriser les listong sur la même base.
+
+Simplifier ainsi la gestion de la class listing
+
+
+*/
if (isset($_POST['categories_id'])) {
$categories_id = tep_db_prepare_input($_POST['categories_id']);
@@ -329,8 +302,6 @@
}
}
-// tep_remove_category($categories_id);
-
sqlcategorie::delete(array('id'=>$categories_id));
osCSS_Cache::clear('categoriesBox');
@@ -340,70 +311,47 @@
tep_redirect(tep_href_link(FILENAME_CATEGORIES, 'cPath=' . self::$cPath ));
- break;
+ break;
+
case 'new':
- $cInfo_array=array(
- 'parent_id'=>0,
- 'sort_order'=>0,
- 'categories_id'=>null,
- 'categories_image'=>DIR_WS_CATALOG_IMAGES.IMAGE_NONEXISTENT,
- 'categories_status'=>null,
- 'categories_hidden'=>null,
- );
- for ($i=0, $n=sizeof(self::$languages); $i<$n; $i++) {
- $cInfo_array['categories_name'][self::$languages[$i]['id']]='';
- $cInfo_array['categories_description'][self::$languages[$i]['id']]='';
- }
- self::$cInfo = new objectInfo($cInfo_array);
+ /// reliquat oscom Reset Global For use tep_input_radio
+ $GLOBALS['cPath']=null;
- $oscss->_add_ext(BO_WISIWYG_SELECTED,'editeur/');
- for ($i=0, $n=sizeof(self::$languages); $i<$n; $i++) {
- echo $oscss->_call(BO_WISIWYG_SELECTED,'_top','categories_description[' . self::$languages[$i]['id'] . ']','600','400');
- }
+ self::$cInfo = new objectInfo( sqlcategorie::Specimen() );
- break;
- case 'edit':
+ $oscss->_add_ext(BO_WISIWYG_SELECTED,'editeur/');
+ for ($i=0, $n=sizeof(self::$languages); $i<$n; $i++) {
+ echo $oscss->_call(BO_WISIWYG_SELECTED,'_top','categories_description[' . self::$languages[$i]['id'] . ']','600','400');
+ }
- $check_query = tep_db_query("select * from " . TABLE_CATEGORIES . " c where c.categories_id = '" . (int)$_GET['cID'] . "' ");
- $categories = tep_db_fetch_array($check_query);
- $category_products = array( 'products_count' => categorieUtility::products_in_category_count($_GET['cID'] ),
- 'cms_count' => categorieUtility::cms_in_category_count($_GET['cID'] )
- );
- $cInfo_array = array_merge($categories, $category_products);
+ break;
- for ($i=0, $n=sizeof(self::$languages); $i<$n; $i++) {
- $check_q = tep_db_query("select * from " . TABLE_CATEGORIES_DESCRIPTION . " cd where categories_id = '" . (int)$_GET['cID'] . "' and language_id='".(int)self::$languages[$i]['id']."' ");
- $categ = tep_db_fetch_array($check_q);
- $cInfo_array['categories_name'][self::$languages[$i]['id']]=$categ['categories_name'];
- $cInfo_array['categories_description'][self::$languages[$i]['id']]=$categ['categories_description'];
- }
+ case 'edit':
+ /// reliquat oscom Reset Global For use tep_input_radio
+ $GLOBALS['cPath']=null;
- self::$cInfo = new objectInfo($cInfo_array);
+ $categories_id = tep_db_prepare_input( (int)$_GET['cID']);
- $oscss->_add_ext(BO_WISIWYG_SELECTED,'editeur/');
- for ($i=0, $n=sizeof(self::$languages); $i<$n; $i++) {
- echo $oscss->_call(BO_WISIWYG_SELECTED,'_top','categories_description[' . self::$languages[$i]['id'] . ']','600','400');
- }
- // ACA START LOAD VALUES FROM DB
- self::$modules->load_db_values ($_GET['cID']);
+ $cInfo_array=sqlcategorie::fetch(array('id'=>$categories_id));
- break;
+ self::$cInfo = new objectInfo($cInfo_array);
- }
+ /// Editeur Load
+ $oscss->_add_ext(BO_WISIWYG_SELECTED,'editeur/');
+ for ($i=0, $n=sizeof(self::$languages); $i<$n; $i++) {
+ echo $oscss->_call(BO_WISIWYG_SELECTED,'_top','categories_description[' . self::$languages[$i]['id'] . ']','600','400');
+ }
+ break;
- } else {
- /**
- A module has asked to privately take care of this action, check if class and method exist and run it.
- */
- if (!empty(self::$actions['action_method']) && method_exists(self::$modules->modules[self::$actions['action_class']],self::$actions['action_method'] )){
- $metho=self::$actions['action_method'];
- self::$box = new box;
- self::$box=self::$modules->modules[self::$actions['action_class']]->$metho(self::$box,(int)$_GET['cID']);
- }
+ default:
+ sqlcategorie::Maintenance();
+
+ }
}
+
}
@@ -523,13 +471,22 @@
$DB=Database::getInstance();
- $categories_query = "select c.categories_id, cd.categories_name, c.categories_image, c.parent_id, c.sort_order, c.date_added, c.last_modified,c.categories_status,c.categories_hidden, cd.categories_description, cd.categories_head_keywords_tag from " . TABLE_CATEGORIES . " c, " . TABLE_CATEGORIES_DESCRIPTION . " cd where c.parent_id = '" . $cID . "' and c.categories_id = cd.categories_id and cd.language_id = '" . (int)$languages_id . "' ".$sWhere." order by ".((!empty($sOrder)) ? $sOrder : " c.parent_id ASC , c.sort_order ASC, cd.categories_name ASC");
+ $categories_query = "SELECT DISTINCT c.categories_id, cd.categories_name, c.categories_image, c.parent_id, c.sort_order, c.date_added, c.last_modified,c.categories_status,c.categories_hidden, cd.categories_description, cd.categories_head_keywords_tag ".
+ " FROM " . TABLE_CATEGORIES . " c ".
+ " JOIN " . TABLE_CATEGORIES_DESCRIPTION . " cd ON (cd.categories_id = c.categories_id AND cd.language_id = '" . (int)$languages_id . "') ".
+ "WHERE c.parent_id = '" . (int)$cID . "' ".$sWhere.
+ " ORDER BY ".(
+ (!empty($sOrder))
+ ? $sOrder
+ : (($cID !=0)?" c.parent_id ASC , ": "" ) . " c.sort_order ASC, cd.categories_name ASC").
+ "";
$categories_split = new splitPageResults($page, $rowbyp, $categories_query,$query_numrows);
$pq=$DB->query($categories_query);
- while ($categories = $pq->fetchAssoc()) {
+ foreach($pq->fetchAllAssoc() as $categories){
+
$categories['c.categories_id']=$categories['categories_id'];
$categories['categories_image']=(!empty($categories['categories_image'])) ? tep_info_image($categories['categories_image'], $categories['categories_name'], TEMP_BO_SMALL_IMAGE_WIDTH, TEMP_BO_SMALL_IMAGE_HEIGHT) : ' N/A';
$categories['categories_status']=self::get_status_categories($categories);
@@ -538,6 +495,7 @@
self::$list[]=$categories;
}
+
$li=$res=array();
foreach(self::$list as $item){
foreach(self::tep_get_modele() as $k=>$v) $li[$k]=(isset($item[$k]) && !empty($item[$k]))? $item[$k] : ' ';
Modified: trunk/catalog/admin/includes/modules/pages/cms_content.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/cms_content.php 2011-10-03 12:51:47 UTC (rev 3825)
+++ trunk/catalog/admin/includes/modules/pages/cms_content.php 2011-10-08 14:03:15 UTC (rev 3826)
@@ -69,7 +69,7 @@
if(defined('JSONSTATMENT')) return;
//! active datatable in ajax, precise les GET necessaire
- if(!defined('JSONSTATMENT'))define('JSONSTATMENT', 'mod=page&type='.self::$code);
+ if(!defined('JSONSTATMENT'))define('JSONSTATMENT', 'mod=page&type='.self::$code .(isset($_GET['cPath'])?'&cPath='.(int)$_GET['cPath']:'') );
//! detail item in ajax
if(!defined('AJAXSTATMENTDETAIL'))define('AJAXSTATMENTDETAIL', 'mod=page&type='.self::$code);
@@ -348,8 +348,10 @@
$DB=Database::getInstance();
$sWhere=str_replace('content_id','c.content_id',$sWhere);
+ if(isset($_GET['cPath'])) $sWhere .=" AND categories_id='". (int)$_GET['cPath']."' ";
- $query_raw = "select distinct c.content_id, content_name, date_added, content_title, last_modified, content_status, content_hidden from " . TABLE_CONTENT . " c ," . TABLE_CONTENT_DESCRIPTION . " cd WHERE c.content_id =cd.content_id AND cd.language_id='".(int)$languages_id."' ".$sWhere." order by ".((!empty($sOrder)) ? $sOrder :'date_added DESC') ;
+ $query_raw = "SELECT DISTINCT c.content_id, content_name, date_added, content_title, last_modified, content_status, content_hidden FROM " . TABLE_CONTENT . " c ," . TABLE_CONTENT_DESCRIPTION . " cd, " . TABLE_CONTENT_TO_CATEGORIES . " p2c WHERE c.content_id =cd.content_id AND cd.language_id='".(int)$languages_id."' AND c.content_id=p2c.content_id ".$sWhere." ORDER BY ".((!empty($sOrder)) ? $sOrder :'date_added DESC') ;
+
$split = new splitPageResults($page, $rowbyp, $query_raw, $query_numrows);
$_query = $DB->query($query_raw);
Modified: trunk/catalog/admin/includes/template/oscss/jquery-ui-1.css
===================================================================
--- trunk/catalog/admin/includes/template/oscss/jquery-ui-1.css 2011-10-03 12:51:47 UTC (rev 3825)
+++ trunk/catalog/admin/includes/template/oscss/jquery-ui-1.css 2011-10-08 14:03:15 UTC (rev 3826)
@@ -490,9 +490,9 @@
* http://docs.jquery.com/UI/Tabs#theming
*/
.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
-.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
+.ui-tabs .ui-tabs-nav { margin: 0; padding: 0 .2em 0; }
.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; }
-.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; }
+.ui-tabs .ui-tabs-nav li a { float: left; padding: .3em 0.5em; text-decoration: none; }
.ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: 0; padding-bottom: 1px; }
.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
Modified: trunk/catalog/admin/includes/template/oscss/stylesheet-1.css
===================================================================
--- trunk/catalog/admin/includes/template/oscss/stylesheet-1.css 2011-10-03 12:51:47 UTC (rev 3825)
+++ trunk/catalog/admin/includes/template/oscss/stylesheet-1.css 2011-10-08 14:03:15 UTC (rev 3826)
@@ -23,7 +23,7 @@
h5 { font-size: 1em ;text-shadow:0 1px 0 #fff;}
p {padding:1em;}
ul {list-style:none;}
- #central li {padding-left:0;cursor:pointer;margin:0.3em 0;}
+ #central li {padding-left:0;cursor:pointer;margin:0.1em 0;}
th { text-shadow:0 1px 0 #fff;-moz-border-radius:6px; -webkit-border-radius:6px; margin:2px 1px; text-align: left; padding: 0 5px;line-height:30px;}
/* form defintion generale */
@@ -270,10 +270,10 @@
#central form .edit.col_right .block_input label{width:20%;text-align:left;font-weight:bold}
#central form p.new_product_img { float:left; padding:5px; margin : 0 auto;text-align:center; width:98%;}
#central form p.new_product_img img{ -moz-border-radius:6px; -webkit-border-radius: 6px; border:1px solid #ACAAAC; margin:1px}
- #central form fieldset legend { color:#666666; font-size:1.2em; font-style:italic; font-weight:bold; padding:0px 20px 10px 20px;}
+ #central form fieldset legend { color:#666666; font-size:1.2em; font-style:italic; font-weight:bold; padding:0 5px 0 20px;}
#central form p input[type="text"] { margin:5px 15px; min-width:200px; }
#central form#configuration p input[type="text"] { margin:5px 15px;width:60%; }
- #central form label { display: inline-block; font-weight: bold; line-height: 18px; margin: 5px 5px 5px 0; padding: 0 0 2px; text-align: left; width: 20%;}
+ #central form label { white-space:nowrap; display: inline-block; font-weight: bold; line-height: 18px; margin: 5px 5px 5px 0; padding: 0 0 2px; text-align: left; width: 20%;}
#central form textarea{ vertical-align:baseline;}
#central .label.text {font-weight:bold;margin:0 5px;}
@@ -293,7 +293,7 @@
.dataTable tr{border:1px solid transparent;cursor:default}
.dataTableBase th,
.dataTableSearch th,
- .dataTable th{ background-color: #303030; font-size:1em; font-weight:bold; text-align:center; color:white;text-shadow:none; }
+ .dataTable th{ background-color: #303030; font-size:1em; font-weight:bold; text-align:center; color:white; text-shadow:none; }
.dataTableBase tr td,
.dataTableSearch tr td,
.dataTable tr td{ color: #000000;padding: 2px; font-size: 10px;cursor:default;text-shadow:0 1px 0 #fff;}
Modified: trunk/catalog/checkout_payment_address.php
===================================================================
--- trunk/catalog/checkout_payment_address.php 2011-10-03 12:51:47 UTC (rev 3825)
+++ trunk/catalog/checkout_payment_address.php 2011-10-08 14:03:15 UTC (rev 3826)
@@ -3,12 +3,11 @@
@licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 29/01/11, 11:46
+ @version 2.1.1
+ @date 05/10/11, 09:02
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
- *\file
- *\brief page choose address payement
+ @brief page choose address payement
*/
require('includes/application_top.php');
@@ -88,8 +87,8 @@
/**
@brief use session stocked for pre-entry forms
*/
- if($_SESSION['country_id']) $entry['country']=$_SESSION['country_id'];
- if($_SESSION['state_id']) $entry['state']=$_SESSION['state_id'];
+ if(isset($_SESSION['country_id'])) $entry['country']=$_SESSION['country_id'];
+ if(isset($_SESSION['state_id'])) $entry['state']=$_SESSION['state_id'];
// $entry['lastname']=$_SESSION['customer_lastname'];
$entry['firstname']=$_SESSION['customer_first_name'];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-10-03 12:51:54
|
Revision: 3825
http://oscss.svn.sourceforge.net/oscss/?rev=3825&view=rev
Author: oscim
Date: 2011-10-03 12:51:47 +0000 (Mon, 03 Oct 2011)
Log Message:
-----------
correction coquille mineur, sur branche et trunk
Modified Paths:
--------------
branches/2.1.0/catalog/admin/includes/classes/aca.php
branches/2.1.0/catalog/admin/includes/languages/fr_FR/modules/pages/customers.txt
branches/2.1.0/catalog/admin/includes/languages/fr_FR/modules/pages/orders.txt
branches/2.1.0/catalog/admin/includes/modules/account/address_book.php
trunk/catalog/admin/includes/classes/aca.php
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/customers.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/orders.txt
trunk/catalog/admin/includes/modules/account/address_book.php
Modified: branches/2.1.0/catalog/admin/includes/classes/aca.php
===================================================================
--- branches/2.1.0/catalog/admin/includes/classes/aca.php 2011-10-03 08:59:33 UTC (rev 3824)
+++ branches/2.1.0/catalog/admin/includes/classes/aca.php 2011-10-03 12:51:47 UTC (rev 3825)
@@ -107,6 +107,9 @@
foreach ($this->modules as $key=>$module) {
if (($module->enabled) and (method_exists($module, 'load_post_values' )) and (isset($post[$module->code])))
$this->modules[$key]->load_post_values($post[$module->code]);
+ /// retro-compatibilite
+ else
+ $this->modules[$key]->load_post_values($post);
}
}
Modified: branches/2.1.0/catalog/admin/includes/languages/fr_FR/modules/pages/customers.txt
===================================================================
--- branches/2.1.0/catalog/admin/includes/languages/fr_FR/modules/pages/customers.txt 2011-10-03 08:59:33 UTC (rev 3824)
+++ branches/2.1.0/catalog/admin/includes/languages/fr_FR/modules/pages/customers.txt 2011-10-03 12:51:47 UTC (rev 3825)
@@ -14,8 +14,8 @@
$lang['table heading firstname']="Prénom" ;
$lang['table heading lastname']="Nom" ;
$lang['table heading customers groups']="Groupe" ;
-$lang['table heading account created']="Compte créé" ;
-$lang['table heading account logon']="dernier accès" ;
+$lang['table heading account created']="Créé" ;
+$lang['table heading account logon']="Accès" ;
$lang['table heading points']="points" ;
$lang['table heading action']="Action" ;
$lang['table heading request authentication']="DA" ;
Modified: branches/2.1.0/catalog/admin/includes/languages/fr_FR/modules/pages/orders.txt
===================================================================
--- branches/2.1.0/catalog/admin/includes/languages/fr_FR/modules/pages/orders.txt 2011-10-03 08:59:33 UTC (rev 3824)
+++ branches/2.1.0/catalog/admin/includes/languages/fr_FR/modules/pages/orders.txt 2011-10-03 12:51:47 UTC (rev 3825)
@@ -56,6 +56,7 @@
$lang['entry printable']="Imprimer la facture" ;
$lang['entry ip']="Adresse IP : " ;
$lang['entry telephone number']="Tél. : " ;
+$lang['entry email address']="Email : " ;
$lang['heading title search name']="Nom : " ;
$lang['heading title search montant']="Montant : " ;
$lang['not this status']="Sauf " ;
Modified: branches/2.1.0/catalog/admin/includes/modules/account/address_book.php
===================================================================
--- branches/2.1.0/catalog/admin/includes/modules/account/address_book.php 2011-10-03 08:59:33 UTC (rev 3824)
+++ branches/2.1.0/catalog/admin/includes/modules/account/address_book.php 2011-10-03 12:51:47 UTC (rev 3825)
@@ -146,7 +146,7 @@
$res=tep_db_perform(TABLE_ADDRESS_BOOK, self::$cInfo->sql_data_array);
$sql_data_array=array('customers_default_address_id'=>tep_db_insert_id($res) ) ;
- tep_db_perform(TABLE_CUSTOMERS, $sql_data_array, 'update', "customers_id = '" . (int)self::$cInfo->sql_data_array['customers_id'] . "' ");
+ $r=tep_db_perform(TABLE_CUSTOMERS, $sql_data_array, 'update', " customers_id = '" . (int)self::$cInfo->sql_data_array['customers_id'] . "' ");
return array();
}
Modified: trunk/catalog/admin/includes/classes/aca.php
===================================================================
--- trunk/catalog/admin/includes/classes/aca.php 2011-10-03 08:59:33 UTC (rev 3824)
+++ trunk/catalog/admin/includes/classes/aca.php 2011-10-03 12:51:47 UTC (rev 3825)
@@ -107,6 +107,9 @@
foreach ($this->modules as $key=>$module) {
if (($module->enabled) and (method_exists($module, 'load_post_values' )) and (isset($post[$module->code])))
$this->modules[$key]->load_post_values($post[$module->code]);
+ /// retro-compatibilite
+ else
+ $this->modules[$key]->load_post_values($post);
}
}
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/pages/customers.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/pages/customers.txt 2011-10-03 08:59:33 UTC (rev 3824)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/customers.txt 2011-10-03 12:51:47 UTC (rev 3825)
@@ -14,8 +14,8 @@
$lang['table heading firstname']="Prénom" ;
$lang['table heading lastname']="Nom" ;
$lang['table heading customers groups']="Groupe" ;
-$lang['table heading account created']="Compte créé" ;
-$lang['table heading account logon']="dernier accès" ;
+$lang['table heading account created']="Créé" ;
+$lang['table heading account logon']="Accès" ;
$lang['table heading points']="points" ;
$lang['table heading action']="Action" ;
$lang['table heading request authentication']="DA" ;
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/pages/orders.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/pages/orders.txt 2011-10-03 08:59:33 UTC (rev 3824)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/orders.txt 2011-10-03 12:51:47 UTC (rev 3825)
@@ -56,6 +56,7 @@
$lang['entry printable']="Imprimer la facture" ;
$lang['entry ip']="Adresse IP : " ;
$lang['entry telephone number']="Tél. : " ;
+$lang['entry email address']="Email : " ;
$lang['heading title search name']="Nom : " ;
$lang['heading title search montant']="Montant : " ;
$lang['not this status']="Sauf " ;
Modified: trunk/catalog/admin/includes/modules/account/address_book.php
===================================================================
--- trunk/catalog/admin/includes/modules/account/address_book.php 2011-10-03 08:59:33 UTC (rev 3824)
+++ trunk/catalog/admin/includes/modules/account/address_book.php 2011-10-03 12:51:47 UTC (rev 3825)
@@ -146,7 +146,7 @@
$res=tep_db_perform(TABLE_ADDRESS_BOOK, self::$cInfo->sql_data_array);
$sql_data_array=array('customers_default_address_id'=>tep_db_insert_id($res) ) ;
- tep_db_perform(TABLE_CUSTOMERS, $sql_data_array, 'update', "customers_id = '" . (int)self::$cInfo->sql_data_array['customers_id'] . "' ");
+ $r=tep_db_perform(TABLE_CUSTOMERS, $sql_data_array, 'update', " customers_id = '" . (int)self::$cInfo->sql_data_array['customers_id'] . "' ");
return array();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-10-03 08:59:39
|
Revision: 3824
http://oscss.svn.sourceforge.net/oscss/?rev=3824&view=rev
Author: oscim
Date: 2011-10-03 08:59:33 +0000 (Mon, 03 Oct 2011)
Log Message:
-----------
coquille fichier de langue
Modified Paths:
--------------
branches/2.1.0/catalog/admin/includes/languages/fr_FR/modules/pages/categories.txt
branches/2.1.0/catalog/admin/includes/languages/fr_FR/modules/pages/products.txt
branches/2.1.0/catalog/admin/includes/modules/pages/categories.php
branches/2.1.0/catalog/admin/includes/modules/pages/products.php
branches/2.1.0/catalog/includes/content/home.php
branches/2.1.0/catalog/includes/languages/fr_FR/home.php
branches/2.1.0/catalog/install/data/templates/appareil_photo/electronix/includes/content/home.php
Modified: branches/2.1.0/catalog/admin/includes/languages/fr_FR/modules/pages/categories.txt
===================================================================
--- branches/2.1.0/catalog/admin/includes/languages/fr_FR/modules/pages/categories.txt 2011-10-03 08:36:18 UTC (rev 3823)
+++ branches/2.1.0/catalog/admin/includes/languages/fr_FR/modules/pages/categories.txt 2011-10-03 08:59:33 UTC (rev 3824)
@@ -58,8 +58,8 @@
$lang['text delete image cat']="Aucune image" ;
$lang['text how to copy']="Méthode de copie :" ;
$lang['view in menu']="Voir dans le menu" ;
-$lang['error catalog image directory not writeable']="Erreur : Impossible d\'écrire dans le répertoire images : " . DIR_FS_CATALOG_IMAGE. " " ;
-$lang['error catalog image directory does not exist']="Erreur : Le répertoire d\'images n\'existe pas : " . DIR_FS_CATALOG_IMAGE. " " ;
+$lang['error catalog image directory not writeable']="Erreur : Impossible d\'écrire dans le répertoire images : %s" ;
+$lang['error catalog image directory does not exist']="Erreur : Le répertoire d\'images n\'existe pas : %s" ;
$lang['error cannot move category to parent']="Erreur : La catégorie ne peut pas être déplacée dans la sous-catégorie." ;
$lang['image preview public']="Prévisualiser page public" ;
$lang['image view public']="Voir page public" ;
Modified: branches/2.1.0/catalog/admin/includes/languages/fr_FR/modules/pages/products.txt
===================================================================
--- branches/2.1.0/catalog/admin/includes/languages/fr_FR/modules/pages/products.txt 2011-10-03 08:36:18 UTC (rev 3823)
+++ branches/2.1.0/catalog/admin/includes/languages/fr_FR/modules/pages/products.txt 2011-10-03 08:59:33 UTC (rev 3824)
@@ -95,8 +95,8 @@
$lang['text copy as link']="Lien du produit" ;
$lang['text copy as duplicate']="Dupliquer le produit" ;
$lang['error cannot link to same category']="Erreur : Impossible de lier des produits dans la même catégorie." ;
-$lang['error catalog image directory not writeable']="Erreur : Impossible d'écrire dans le répertoire d'images : " . DIR_FS_CATALOG_IMAGE." " ;
-$lang['error catalog image directory does not exist']="Erreur : Le répertoire d'images n'existe pas : " . DIR_FS_CATALOG_IMAGE." " ;
+$lang['error catalog image directory not writeable']="Erreur : Impossible d'écrire dans le répertoire d'images : %s" ;
+$lang['error catalog image directory does not exist']="Erreur : Le répertoire d'images n'existe pas : %s" ;
$lang['error cannot move category to parent']="Erreur : La catégorie ne peut être déplacé dans la sous-catégorie." ;
$lang['image preview public']="Prévisualiser la page public" ;
Modified: branches/2.1.0/catalog/admin/includes/modules/pages/categories.php
===================================================================
--- branches/2.1.0/catalog/admin/includes/modules/pages/categories.php 2011-10-03 08:36:18 UTC (rev 3823)
+++ branches/2.1.0/catalog/admin/includes/modules/pages/categories.php 2011-10-03 08:59:33 UTC (rev 3824)
@@ -105,10 +105,10 @@
// check if the catalog image directory exists
global $messageStack;
- if (is_dir(DIR_FS_CATALOG_IMAGES)) {
- if (!is_writeable(DIR_FS_CATALOG_IMAGES)) $messageStack->add(__('error catalog image directory not writeable'), 'error');
+ if (is_dir(DIR_FS_CATALOG.DIR_WS_IMAGES)) {
+ if (!is_writeable(DIR_FS_CATALOG.DIR_WS_IMAGES)) $messageStack->add(sprintf(__('error catalog image directory not writeable %s'),DIR_FS_CATALOG.DIR_WS_IMAGES ), 'error');
}
- else $messageStack->add(__('error catalog image directory does not exist'), 'error');
+ else $messageStack->add(sprintf(__('error catalog image directory does not exist %s'),DIR_FS_CATALOG.DIR_WS_IMAGES ), 'error');
self::$languages = tep_get_languages();
}
Modified: branches/2.1.0/catalog/admin/includes/modules/pages/products.php
===================================================================
--- branches/2.1.0/catalog/admin/includes/modules/pages/products.php 2011-10-03 08:36:18 UTC (rev 3823)
+++ branches/2.1.0/catalog/admin/includes/modules/pages/products.php 2011-10-03 08:59:33 UTC (rev 3824)
@@ -116,10 +116,10 @@
// check if the catalog image directory exists
global $messageStack;
- if (is_dir(DIR_FS_CATALOG_IMAGES)) {
- if (!is_writeable(DIR_FS_CATALOG_IMAGES)) $messageStack->add(__('error catalog image directory not writeable'), 'error');
+ if (is_dir(DIR_FS_CATALOG.DIR_WS_IMAGES)) {
+ if (!is_writeable(DIR_FS_CATALOG.DIR_WS_IMAGES)) $messageStack->add(sprintf(__('error catalog image directory not writeable %s'),DIR_FS_CATALOG.DIR_WS_IMAGES ), 'error');
}
- else $messageStack->add(__('error catalog image directory does not exist'), 'error');
+ else $messageStack->add(sprintf(__('error catalog image directory does not exist %s'),DIR_FS_CATALOG.DIR_WS_IMAGES ), 'error');
self::$languages = tep_get_languages();
}
Modified: branches/2.1.0/catalog/includes/content/home.php
===================================================================
--- branches/2.1.0/catalog/includes/content/home.php 2011-10-03 08:36:18 UTC (rev 3823)
+++ branches/2.1.0/catalog/includes/content/home.php 2011-10-03 08:59:33 UTC (rev 3824)
@@ -14,7 +14,7 @@
<h2 class="content title <?php echo $language ;?>"><?php echo HEADING_TITLE; ?></h2>
<p class="customerGreeting"><?php echo tep_customer_greeting(); ?></p>
- <div class="textMain"><?php echo TEXT_MAIN ; ?></div>
+ <div class="textMain"><?php printf(TEXT_MAIN, PROJECT_VERSION) ; ?></div>
<div class="banner_main">
<?php $page->oscss_modules->_add(FILENAME_NEW_PRODUCTS,'center'); ?>
</div>
Modified: branches/2.1.0/catalog/includes/languages/fr_FR/home.php
===================================================================
--- branches/2.1.0/catalog/includes/languages/fr_FR/home.php 2011-10-03 08:36:18 UTC (rev 3823)
+++ branches/2.1.0/catalog/includes/languages/fr_FR/home.php 2011-10-03 08:59:33 UTC (rev 3824)
@@ -8,6 +8,6 @@
@encode UTF-8
*/
define('HEADING_TITLE',"Bienvenue" );
-define('TEXT_MAIN',"<p>Ceci est une installation par défaut du projet osCSS, les produits affichés le sont dans un but démonstratif, <strong>aucun produit acheté ne sera livré ni facturé au client.</strong></p><p>Toutes informations vues sur ces produits doivent être traitées comme fictives. </p><p>Si vous souhaitez télécharger la solution qui propulse cette boutique, ou contribuer au projet osCSS, rendez-vous sur le <a href=\"http://forums.oscss.org\">forum osCSS</a>. </p><p>Cette boutique est propulsée par osCSS <strong>\' . PROJECT_VERSION . \'</strong>.</p>" );
+define('TEXT_MAIN',"<p>Ceci est une installation par défaut du projet osCSS, les produits affichés le sont dans un but démonstratif, <strong>aucun produit acheté ne sera livré ni facturé au client.</strong></p><p>Toutes informations vues sur ces produits doivent être traitées comme fictives. </p><p>Si vous souhaitez télécharger la solution qui propulse cette boutique, ou contribuer au projet osCSS, rendez-vous sur le <a href=\"http://forums.oscss.org\">forum osCSS</a>. </p><p>Cette boutique est propulsée par osCSS <strong>%s</strong>.</p>" );
?>
\ No newline at end of file
Modified: branches/2.1.0/catalog/install/data/templates/appareil_photo/electronix/includes/content/home.php
===================================================================
--- branches/2.1.0/catalog/install/data/templates/appareil_photo/electronix/includes/content/home.php 2011-10-03 08:36:18 UTC (rev 3823)
+++ branches/2.1.0/catalog/install/data/templates/appareil_photo/electronix/includes/content/home.php 2011-10-03 08:59:33 UTC (rev 3824)
@@ -16,7 +16,7 @@
<div class="top_prod_box_big"></div>
<div class="center_prod_box_big">
<p class="customerGreeting"><?php echo tep_customer_greeting(); ?></p>
- <div class="textMain"><?php echo TEXT_MAIN ; ?></div>
+ <div class="textMain"><?php printf(TEXT_MAIN, PROJECT_VERSION) ; ?></div>
</div>
<div class="bottom_prod_box_big"></div>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-10-03 08:36:29
|
Revision: 3823
http://oscss.svn.sourceforge.net/oscss/?rev=3823&view=rev
Author: oscim
Date: 2011-10-03 08:36:18 +0000 (Mon, 03 Oct 2011)
Log Message:
-----------
Nompbresue correction
mise a jour element de langue
Modified Paths:
--------------
branches/2.1.0/catalog/includes/appli_top_Test.php
branches/2.1.0/catalog/includes/application_top.php
branches/2.1.0/catalog/includes/content/listing_specials.php
branches/2.1.0/catalog/includes/functions/initialize.php
branches/2.1.0/catalog/includes/languages/fr_FR/fr_FR.php
branches/2.1.0/catalog/install/includes/language/fr_FR/oscss_config.txt
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/admin_members.php
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/boxes/04_tools.php
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/boxes/09_commercial.php
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/boxes/10_orders.php
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/configuration.php
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/countries.php
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/es_ES.php
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/forbiden.php
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/login.php
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/logoff.php
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/modules/aca_header_tags.txt
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/modules/account/address_book.txt
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/modules/configuration/cfg_29.txt
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/modules/configuration/cfg_30.txt
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/modules/configuration/cfg_31.txt
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/modules/configuration/cfg_33.txt
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/modules/configuration/cfg_36.txt
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/modules/configuration/cfg_37.txt
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/modules/cronjob/customers_birthday.txt
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/modules/cronjob/relance_order.txt
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/modules/newsletters/new_products.txt
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/modules/newsletters/newsletter.txt
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/modules/pages/adminAccount.txt
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/modules/pages/adminGroup.txt
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/modules/pages/adminNotif.txt
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/modules/pages/adminUsers.txt
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/modules/pages/attributes.txt
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/modules/pages/backup.txt
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/modules/pages/batch_print.txt
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/modules/pages/categories.txt
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/modules/pages/cms_content.txt
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/modules/pages/cronjob.txt
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/modules/pages/currencies.txt
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/modules/pages/customers.txt
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/modules/pages/geo_zones.txt
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/modules/pages/ggsitemap.txt
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/modules/pages/held_orders.txt
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/modules/pages/index.txt
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/modules/pages/mail.txt
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/modules/pages/newsletters.txt
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/modules/pages/newslettersModeles.txt
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/modules/pages/orders.txt
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/modules/pages/package.txt
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/modules/pages/products.txt
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/modules/stats/stats_discount_coupons.php
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/modules/stats/whos_online.php
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/modules/template_email/add_customer.txt
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/modules/template_email/admin_account.txt
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/modules/template_email/admin_members.txt
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/modules/template_email/admin_members_new.txt
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/modules/template_email/held_orders.txt
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/modules/template_email/newsletter.txt
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/modules/template_email/orders.txt
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/modules/template_email/recover_cart_sales.txt
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/modules.php
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/navigation_links.php
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/rss.php
branches/2.1.0/language/es_ES/admin/includes/languages/es_ES/tax_classes.php
branches/2.1.0/language/es_ES/includes/languages/es_ES/account.php
branches/2.1.0/language/es_ES/includes/languages/es_ES/advanced_search.php
branches/2.1.0/language/es_ES/includes/languages/es_ES/checkout_confirmation.php
branches/2.1.0/language/es_ES/includes/languages/es_ES/checkout_payment.php
branches/2.1.0/language/es_ES/includes/languages/es_ES/checkout_success.php
branches/2.1.0/language/es_ES/includes/languages/es_ES/contact.php
branches/2.1.0/language/es_ES/includes/languages/es_ES/contact_us.php
branches/2.1.0/language/es_ES/includes/languages/es_ES/create_account.php
branches/2.1.0/language/es_ES/includes/languages/es_ES/create_account_success.php
branches/2.1.0/language/es_ES/includes/languages/es_ES/es_ES.php
branches/2.1.0/language/es_ES/includes/languages/es_ES/home.php
branches/2.1.0/language/es_ES/includes/languages/es_ES/info_shopping_cart.php
branches/2.1.0/language/es_ES/includes/languages/es_ES/listing_small_price.php
branches/2.1.0/language/es_ES/includes/languages/es_ES/login.php
branches/2.1.0/language/es_ES/includes/languages/es_ES/modules/payment/cod.php
branches/2.1.0/language/es_ES/includes/languages/es_ES/modules/payment/moneyorder.txt
branches/2.1.0/language/es_ES/includes/languages/es_ES/modules/products/desc_base.txt
branches/2.1.0/language/es_ES/includes/languages/es_ES/modules/template_email/checkout_process.txt
branches/2.1.0/language/es_ES/includes/languages/es_ES/modules/template_email/create_account.txt
branches/2.1.0/language/es_ES/includes/languages/es_ES/modules/template_email/create_account_confirm.txt
branches/2.1.0/language/es_ES/includes/languages/es_ES/modules/template_email/orders.txt
branches/2.1.0/language/es_ES/includes/languages/es_ES/modules/template_email/password_forgotten.txt
branches/2.1.0/language/es_ES/includes/languages/es_ES/password_forgotten.php
branches/2.1.0/language/es_ES/includes/languages/es_ES/search_help.php
branches/2.1.0/language/es_ES/includes/languages/es_ES/shopping_cart.php
branches/2.1.0/language/es_ES/includes/languages/es_ES/tell_a_friend.php
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/admin_members.php
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/boxes/09_commercial.php
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/configuration.php
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/countries.php
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/forbiden.php
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/it_IT.php
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/login.php
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/logoff.php
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/modules/aca_header_tags.txt
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/modules/account/address_book.txt
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/modules/configuration/cfg_29.txt
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/modules/configuration/cfg_30.txt
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/modules/configuration/cfg_31.txt
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/modules/configuration/cfg_33.txt
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/modules/configuration/cfg_34.txt
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/modules/configuration/cfg_36.txt
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/modules/configuration/cfg_37.txt
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/modules/cronjob/customers_birthday.txt
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/modules/cronjob/relance_order.txt
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/modules/newsletters/new_products.txt
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/modules/newsletters/newsletter.txt
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/modules/pages/adminAccount.txt
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/modules/pages/adminGroup.txt
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/modules/pages/adminNotif.txt
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/modules/pages/adminUsers.txt
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/modules/pages/attributes.txt
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/modules/pages/backup.txt
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/modules/pages/batch_print.txt
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/modules/pages/categories.txt
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/modules/pages/cms_content.txt
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/modules/pages/cronjob.txt
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/modules/pages/currencies.txt
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/modules/pages/customers.txt
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/modules/pages/geo_zones.txt
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/modules/pages/ggsitemap.txt
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/modules/pages/held_orders.txt
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/modules/pages/index.txt
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/modules/pages/mail.txt
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/modules/pages/newsletters.txt
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/modules/pages/newslettersModeles.txt
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/modules/pages/orders.txt
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/modules/pages/package.txt
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/modules/pages/products.txt
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/modules/stats/stats_discount_coupons.php
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/modules/stats/whos_online.php
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/modules/template_email/add_customer.txt
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/modules/template_email/admin_account.txt
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/modules/template_email/admin_members.txt
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/modules/template_email/admin_members_new.txt
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/modules/template_email/held_orders.txt
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/modules/template_email/newsletter.txt
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/modules/template_email/orders.txt
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/modules.php
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/navigation_links.php
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/rss.php
branches/2.1.0/language/it_IT/admin/includes/languages/it_IT/tax_classes.php
branches/2.1.0/language/it_IT/includes/languages/it_IT/account.php
branches/2.1.0/language/it_IT/includes/languages/it_IT/advanced_search.php
branches/2.1.0/language/it_IT/includes/languages/it_IT/checkout_confirmation.php
branches/2.1.0/language/it_IT/includes/languages/it_IT/checkout_payment.php
branches/2.1.0/language/it_IT/includes/languages/it_IT/checkout_shipping_address.php
branches/2.1.0/language/it_IT/includes/languages/it_IT/checkout_success.php
branches/2.1.0/language/it_IT/includes/languages/it_IT/contact.php
branches/2.1.0/language/it_IT/includes/languages/it_IT/contact_us.php
branches/2.1.0/language/it_IT/includes/languages/it_IT/create_account.php
branches/2.1.0/language/it_IT/includes/languages/it_IT/create_account_success.php
branches/2.1.0/language/it_IT/includes/languages/it_IT/home.php
branches/2.1.0/language/it_IT/includes/languages/it_IT/info_shopping_cart.php
branches/2.1.0/language/it_IT/includes/languages/it_IT/it_IT.php
branches/2.1.0/language/it_IT/includes/languages/it_IT/listing_small_price.php
branches/2.1.0/language/it_IT/includes/languages/it_IT/login.php
branches/2.1.0/language/it_IT/includes/languages/it_IT/modules/payment/cod.php
branches/2.1.0/language/it_IT/includes/languages/it_IT/modules/payment/moneyorder.txt
branches/2.1.0/language/it_IT/includes/languages/it_IT/modules/products/desc_base.txt
branches/2.1.0/language/it_IT/includes/languages/it_IT/modules/template_email/checkout_process.txt
branches/2.1.0/language/it_IT/includes/languages/it_IT/modules/template_email/create_account.txt
branches/2.1.0/language/it_IT/includes/languages/it_IT/modules/template_email/create_account_confirm.txt
branches/2.1.0/language/it_IT/includes/languages/it_IT/modules/template_email/orders.txt
branches/2.1.0/language/it_IT/includes/languages/it_IT/modules/template_email/password_forgotten.txt
branches/2.1.0/language/it_IT/includes/languages/it_IT/password_forgotten.php
branches/2.1.0/language/it_IT/includes/languages/it_IT/search_help.php
branches/2.1.0/language/it_IT/includes/languages/it_IT/shopping_cart.php
branches/2.1.0/language/it_IT/includes/languages/it_IT/tell_a_friend.php
Added Paths:
-----------
branches/2.1.0/catalog/includes/classes/drivers/data/
branches/2.1.0/catalog/includes/classes/drivers/data/categorie.php
branches/2.1.0/catalog/includes/classes/drivers/data/content.php
branches/2.1.0/catalog/includes/classes/drivers/data/product.php
branches/2.1.0/language/es_ES/includes/languages/es_ES/images/
branches/2.1.0/language/es_ES/includes/languages/es_ES/images/icon.png
branches/2.1.0/language/es_ES/install/
branches/2.1.0/language/es_ES/install/includes/
branches/2.1.0/language/es_ES/install/includes/language/
branches/2.1.0/language/es_ES/install/includes/language/es_ES/
branches/2.1.0/language/es_ES/install/includes/language/es_ES/install.base.txt
branches/2.1.0/language/es_ES/install/includes/language/es_ES/oscss_config.txt
branches/2.1.0/language/es_ES/install/includes/language/es_ES/oscss_sample_data.txt
branches/2.1.0/language/it_IT/includes/languages/it_IT/images/
branches/2.1.0/language/it_IT/includes/languages/it_IT/images/icon.png
branches/2.1.0/language/it_IT/install/
branches/2.1.0/language/it_IT/install/includes/
branches/2.1.0/language/it_IT/install/includes/language/
branches/2.1.0/language/it_IT/install/includes/language/it_IT/
branches/2.1.0/language/it_IT/install/includes/language/it_IT/install.base.txt
branches/2.1.0/language/it_IT/install/includes/language/it_IT/oscss_config.txt
branches/2.1.0/language/it_IT/install/includes/language/it_IT/oscss_sample_data.txt
Removed Paths:
-------------
branches/2.1.0/catalog/includes/classes/driver.categorie.php
branches/2.1.0/catalog/includes/classes/driver.content.php
branches/2.1.0/catalog/includes/classes/driver.product.php
Modified: branches/2.1.0/catalog/includes/appli_top_Test.php
===================================================================
--- branches/2.1.0/catalog/includes/appli_top_Test.php 2011-10-02 20:48:23 UTC (rev 3822)
+++ branches/2.1.0/catalog/includes/appli_top_Test.php 2011-10-03 08:36:18 UTC (rev 3823)
@@ -19,26 +19,7 @@
/// start the timer for the page parse time log
define('PAGE_PARSE_START_TIME', microtime());
-//!This displays executed queries in error message NOT recommanded in a production environment!
- /**
- * \brief as active / inactive cache and error return
- * @var boolean
- */
- define('OSCSS_DEBUG', true);
- /**
- * \brief as active view query in error requet sql
- * @var boolean
- */
- define('OSCSS_SHOW_QUERIES', true);
- /**
- * \brief as active / incative garbage collector error
- * @var boolean
- */
- define('OSCSS_GARBAGE_ERROR', false);
-
-// define('MODULE_ORDER_TOTAL_DISCOUNT_COUPON_DEBUG', true);
-
/// Set the local configuration parameters - mainly for developers
if (file_exists('includes/local/configure.php')) include('includes/local/configure.php');
elseif (!file_exists('includes/configure.php')) {
Modified: branches/2.1.0/catalog/includes/application_top.php
===================================================================
--- branches/2.1.0/catalog/includes/application_top.php 2011-10-02 20:48:23 UTC (rev 3822)
+++ branches/2.1.0/catalog/includes/application_top.php 2011-10-03 08:36:18 UTC (rev 3823)
@@ -85,7 +85,7 @@
autoload::getInstance();
autoload::addPath(DIR_FS_TEMPLATES.TEMPLATE_NAME.'/'.DIR_WS_CLASSES .'%s.php',4);
autoload::addPath(DIR_FS_TEMPLATES.TEMPLATE_NAME.'/'.DIR_WS_CLASSES .'page.%s.php',4);
- autoload::addPath(DIR_FS_TEMPLATES.TEMPLATE_NAME.'/'.DIR_WS_CLASSES .'driver.%s.php',4);
+ autoload::addPath(DIR_FS_TEMPLATES.TEMPLATE_NAME.'/'.DIR_WS_CLASSES .'drivers/data/%s.php',4);
/// include list of project class and lib permanente
include(DIR_WS_INCLUDES . 'inc_base_lib.php');
Deleted: branches/2.1.0/catalog/includes/classes/driver.categorie.php
===================================================================
--- branches/2.1.0/catalog/includes/classes/driver.categorie.php 2011-10-02 20:48:23 UTC (rev 3822)
+++ branches/2.1.0/catalog/includes/classes/driver.categorie.php 2011-10-03 08:36:18 UTC (rev 3823)
@@ -1,569 +0,0 @@
-<?php
-/**
- \licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- \portion code Copyright (c) 2002 osCommerce
- \package osCSS-2 <www http://www.oscss.org>
- \version 2.1.0
- \date 29/11/10, 11:33
- \author oscim <mail aur...@os...> <www http://www.oscim.fr>
- \encode UTF-8
-
-*/
-
-
-/**
- \class categorie
- \brief Control init et gestion des data product
-*/
-class categorie {
-
- //! @p object
- protected static $_instance;
-
- public static $modules;
-
- /**
- */
- protected function __construct($full) {
- global $languages_id;
-// productData::start();
- if($full) self::start_module();
- }
-
- protected static function start_module(){
- $pdm=categorieModule::getInstance();
- self::$modules=$pdm->ret_modules();
- return $pdm;
- }
-
- public static function getInstance($full=true) {
- if(self::$_instance == null) self::$_instance = new self($full);
- return self::$_instance;
- }
-
- public static function resetInstance(){
- self::$_instance = null;
- return self::getInstance();
- }
-
- /**
- Module configuration
- */
-// public function ret_modules(){ self::start_module(); return self::$modules;}
-
-
- /**
- Data function
- */
- public static function get_path($current_category_id = '',$value=false){ return categorieData::get_path($current_category_id,$value); }
- public static function get_count_products_in_category($category_id, $include_inactive = false){ return categorieData::get_count_products_in_category($category_id,$include_inactive); }
- public static function get_count_content_in_category($category_id){ return categorieData::get_count_content_in_category($category_id); }
- public static function get_has_category_subcategories($category_id){ return categorieData::get_has_category_subcategories($category_id); }
- public static function get_parent_categories(&$categories, $categories_id) { return categorieData::get_parent_categories($categories, $categories_id); }
- public static function get_subcategories(&$subcategories_array, $parent_id = 0){ return categorieData::get_subcategories($subcategories_array, $parent_id); }
- public static function get_categories($categories_array = '', $parent_id = '0', $indent = '') { return categorieData::get_categories($categories_array , $parent_id, $indent); }
-
- public static function get_query($id='',$search='',$exclude='',$option=''){ global $languages_id; return categorieData::get_query($id,$search,$exclude,$option); }
- public static function get_item($id){ return categorieData::get_item($id); }
- public static function add_where_query($where){ return categorieData::add_where_query($where); }
-
- /**
- \fn categorie::resetCacheId($id);
- \brief delet item in cache
- \param $id integer id cat
- */
- public static function resetCacheId($id){ return categorieData::resetCacheId($id); }
-
- /**
- * \fn ret_modules()
- * \brief Retour tableau des modules type products actif
- * @return plusieurs modules via array(object)
- */
- public function ret_modules(){ self::start_module(); return self::$modules;}
- /**
- * \fn get_option_data($product_array)
- * \brief adjust products, depend class price, execute by productData
- * @param $product_array array
- */
- public static function get_option_data($_array){ $pdm=self::start_module();return $pdm->get_option_data($_array);}
-
-}
-
-
-/**
- @class productData
- Traitement sql des cat
-*/
-class categorieData
- extends DataStatmentFO
- implements Interfacedata{
-
- //! @p int
- public static $lg_id;
- //! @p obj res db
- public static $obj_language;
- //! @p array
- public static $cache=array();
-
- //! @p object cache
- public static $object_data;
- //! @p array cache
- public static $array_data=array();
-
- //! @p string
- private static $where_query='';
-
-
- /**
- */
- public static function start(){
- global $languages_id;
- self::$lg_id=(int)$languages_id;
- $DB=Database::getInstance();
- self::$obj_language = $DB->query("select code from " . TABLE_LANGUAGES . " where languages_id='" .self::$lg_id . "'");
- }
-
- /**
- \brief delet item in cache
- \param $id integer id cat
- */
- public static function resetCacheId($id){
- foreach(self::$cache as $k=>$v)
- if($v==$id) {
- unset(self::$cache[$k]);
- }
- }
-
- /**
- * \brief Mise en pile de toutes les element des page de cms
- * @param $id int
- */
- private static function add_cache($id){
- self::$cache[]=$id;
- }
-
- /**
- * \brief Appel et recup des element du cache
- */
- private static function in_cache(){
- return implode("," ,self::$cache);
- }
-
- /**
- * \brief Prepa donnée sortie
- * @param $content_query
- * @param $exclude array
- * @param $search string
- */
- protected static function statment_query($content_query,$exclude='',$search=''){
-
- $display_lang=self::$obj_language->fetchAssoc();
- if (empty($exclude))$exclude=array();
- $tabl=$res=array();
- while ($content = $content_query->fetchAssoc()) {
- if(count(self::$cache)>0 && in_array($content['categories_id'],self::$cache) ) $tabl[$content['categories_id']]=self::$object_data[$content['categories_id']];
- elseif (!in_array($content['categories_name'],$exclude)) {
- $res=$content;
- $res['href']=tep_href_link(FILENAME_PRODUCT_INFO,'categories_id=' . $content['categories_id'] . '&language=' . $display_lang['code']);
- $res['key']=$content['categories_id'];
- $res['id']=$content['categories_id'];
- $res['title']=$content['categories_name'];
- $res['name']=$content['categories_name'];
-
- $res=categorie::get_option_data($res);
-
- self::$object_data[$content['categories_id']]=$tabl[$content['categories_id']]=new objectInfo($res);
- self::add_cache($content['categories_id']);
- }
- }
- return $tabl;
- }
-
- /**
- * \brief Ajout constrainte clause where
- * @param $add
- */
- public static function add_where_query($add){ self::$where_query .=' '.$add.' '; }
-
- /**
- * \fn reset_query()
- */
- protected static function reset_query() { self::$where_query=''; }
-
-
-
- /**
- * \fn cstr_query($orderby='', $limit='', $option='')
- * \brief Requeteur
- * @param $orderby
- * @param $limit
- * @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, sortchids_products, sortchids_content FROM " . TABLE_CATEGORIES . " c, " . TABLE_CATEGORIES_DESCRIPTION . " cd WHERE 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) ;
- if($limit!='0')
- $query .=' LIMIT '.(!tep_not_null($limit)? '50' : $limit) ;
-
- return $query;
- }
-
-
-
-
-
- /**
- * \brief Appel item
-
- * @param $id int l'Id
- * @param $search string content_name le nom du titre
- * @param $exclude array tableau d'exclusion de nom
- * @param $option array option
- */
- public static function get_query($id='',$search='', $exclude='',$option=''){
- global $languages_id;
-
- self::start();
- $DB=Database::getInstance();
- self::$lg_id=(int)$languages_id;
- $search=tep_db_prepare_input($search);
-
- //! soit id soit sherach name key
- self::add_where_query((tep_not_null($id) && is_numeric($id) ? " AND c.categories_id = '" . (int)$id . "' ": (!empty($search)?" AND cd.categories_name LIKE '%" . tep_db_input($search) . "%' ":'') ));
- $sql=self::cstr_query( (isset($option['orderby'])?(string)$option['orderby']:''),(isset($option['limit'])?(int)$option['limit']:''),(array)@$option) ;
-
- $content_query = $DB->query($sql);
- self::reset_query();
- return self::statment_query($content_query,$exclude,$search);
- }
-
- /**
- * \brief Alias unique ID
- * @param $id int
- */
- public static function get_item($id){
- self::reset_query();
- $db_list=self::get_query($id);
-
- if(is_numeric($id) && isset($db_list[(int)$id])){
- return $db_list[$id];
- }else{
- $db_list=self::get_query('',$id);
- foreach($db_list as $item)
- if((string)$id==(string)$item->name)return $item;
- }
- return false;
- }
-
- /**
- * \fn get_path($current_category_id = '',$value=false)
- * \brief Generate a path to categories
- * @param $current_category_id int cat ID
- * @param $value bool si false, sortie string "cPath=1_3" si true, sortie string "1_3"
- */
- public static function get_path($current_category_id = '',$value=false) {
- global $cPath_array;
-
- if (tep_not_null($current_category_id)) {
- $cp_size = sizeof($cPath_array);
- if ($cp_size == 0) {
- $cPath_new = $current_category_id;
- } else {
- $cPath_new = '';
- $last_category_query = tep_db_query("select parent_id from " . TABLE_CATEGORIES . " where categories_id = '" . (int)$cPath_array[($cp_size-1)] . "'");
- $last_category = tep_db_fetch_array($last_category_query);
-
- $current_category_query = tep_db_query("select parent_id from " . TABLE_CATEGORIES . " where categories_id = '" . (int)$current_category_id . "'");
- $current_category = tep_db_fetch_array($current_category_query);
-
- if ($last_category['parent_id'] == $current_category['parent_id']) {
- for ($i=0; $i<($cp_size-1); $i++) {
- $cPath_new .= '_' . $cPath_array[$i];
- }
- } else {
- for ($i=0; $i<$cp_size; $i++) {
- $cPath_new .= '_' . $cPath_array[$i];
- }
- }
- $cPath_new .= '_' . $current_category_id;
-
- if (substr($cPath_new, 0, 1) == '_') {
- $cPath_new = substr($cPath_new, 1);
- }
- }
- } else {
- $cPath_new = implode('_', $cPath_array);
- }
-
- if ($value) return 'cPath=' . $cPath_new;
- else return $cPath_new;
- }
-
-
- /**
- * \brief Return the number of products and category child in a category
- // TABLES: products, products_to_categories, categories
- */
- public static function get_count_products_in_category($category_id, $include_inactive = false) {
-
-// if(isset(self::$object_data[$category_id]->count_products)) return self::$object_data[$category_id]->count_products;
-
- $products_count = 0;
- $DB=Database::getInstance();
- if ($include_inactive == true) {
- $products_query = $DB->query("select count(p.products_id) as total from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c where p.products_id = p2c.products_id and p2c.categories_id = '" . (int)$category_id . "'");
- } else {
- $products_query = $DB->query("select count(p.products_id) as total from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c where p.products_id = p2c.products_id and p.products_status = '1' and p2c.categories_id = '" .(int) $category_id . "' ");
- }
- if($products_query->__get('numRows')>0 ) $products = $products_query->fetchAssoc();
- else $products['total']= 0;
- $products_count += $products['total'];
-
- if(!isset(self::$object_data[$category_id]) || !self::get_item($category_id)) return false;
- self::$object_data[$category_id]->count_products=(int)$products_count;
-
- self::add_where_query(" AND parent_id = '" . (int)$category_id . "' ");
- $db_list=self::get_query('','','',array('limit'=>'30'));
-
- foreach($db_list as $cat)
- if($cat->key !=(int)$category_id && (int)$category_id ==$cat->parent_id) {
- $products_count +=(isset($cat->count_products) ? $cat->count_products : self::get_count_products_in_category($cat->categories_id) );
- }
-
- return $products_count;
- }
-
- /**
- * \brief Return the number of products and category child in a category
- // TABLES: products, products_to_categories, categories
- */
- public static function get_count_content_in_category($category_id) {
- $products_count = 0;
- $DB=Database::getInstance();
-
- $products_query = $DB->query("select count(c.content_id) as total from " . TABLE_CONTENT . " c , " . TABLE_CONTENT_TO_CATEGORIES . " c2c where c.content_id = c2c.content_id and c2c.categories_id = '" . (int)$category_id . "' and c.content_status='1' ");
-
- if($products_query->__get('numRows')>0 ) $products = $products_query->fetchAssoc();
- else $products['total']= 0;
- $products_count += $products['total'];
-
- if(!isset(self::$object_data[$category_id]) || !self::get_item($category_id)) return false;
- self::$object_data[$category_id]->count_products=(int)$products_count;
-
- self::add_where_query(" AND parent_id = '" . (int)$category_id . "' ");
- $db_list=self::get_query('','','',array('limit'=>'30'));
-
- foreach($db_list as $cat)
- if($cat->key !=(int)$category_id && (int)$category_id ==$cat->parent_id) {
- $products_count +=(isset($cat->count_products) ? $cat->count_products : self::get_count_products_in_category($cat->categories_id) );
- }
-
- return $products_count;
- }
-
- /**
- * \brief Return false if not the category has subcategories or nbr category
- */
- public static function get_has_category_subcategories($category_id) {
-
- self::add_where_query(" AND parent_id = '" . (int)$category_id . "' ");
- $db_list=self::get_query();
-
- if (($count=count($db_list)) && $count > 0) return $count;
- else return 0;
-
- }
-
- /**
- * \brief Recursively go through the categories and retreive all parent categories IDs
- // TABLES: categories
- */
- public static function get_parent_categories(&$categories, $categories_id) {
-
- if(!isset(self::$object_data[$categories_id]->parent_array)) {
- $db_list=self::get_query((int)$categories_id);
- foreach($db_list as $cats) {
- if ($cats->parent_id == 0) return true;
- $categories[sizeof($categories)] = $cats->parent_id;
- if ($cats->parent_id != $categories_id) {
- self::get_parent_categories($categories, $cats->parent_id);
- }
- }
-// self::$object_data[$categories_id]->parent_array=$categories;
- } else $categories=self::$object_data[$categories_id]->parent_array;
-
-
-// $parent_categories_query = tep_db_query("select parent_id from " . TABLE_CATEGORIES . " where categories_id = '" . (int)$categories_id . "' ");
-// while ($parent_categories = tep_db_fetch_array($parent_categories_query)) {
-// if ($parent_categories['parent_id'] == 0) return true;
-// $categories[sizeof($categories)] = $parent_categories['parent_id'];
-// if ($parent_categories['parent_id'] != $categories_id) {
-// self::tep_get_parent_categories($categories, $parent_categories['parent_id']);
-// }
-// }
-
- }
-
-/**
- * \brief
- Return all subcategory IDs. Recursivite
- TABLES: categories
-*/
-public static function get_subcategories(&$subcategories_array, $parent_id = 0) {
- $subcategories_query = tep_db_query("select categories_id from " . TABLE_CATEGORIES . " where parent_id = '" . (int)$parent_id . "' and categories_status='1' ");
- while ($subcategories = tep_db_fetch_array($subcategories_query)) {
- $subcategories_array[sizeof($subcategories_array)] = $subcategories['categories_id'];
- if ($subcategories['categories_id'] != $parent_id)
- tep_get_subcategories($subcategories_array, $subcategories['categories_id']);
- }
-}
-
-/**
- * \brief Construction d'un select sur les catégories actives
-*/
-public static function get_categories($categories_array = '', $parent_id = '0', $indent = '') {
- global $languages_id;
- if (!is_array($categories_array)) $categories_array = array();
- $categories_query = tep_db_query("select c.categories_id, cd.categories_name from " . TABLE_CATEGORIES . " c, " . TABLE_CATEGORIES_DESCRIPTION . " cd where parent_id = '" . (int)$parent_id . "' and c.categories_status='1' and c.categories_id = cd.categories_id and cd.language_id = '" . (int)$languages_id . "' order by sort_order, cd.categories_name");
- while ($categories = tep_db_fetch_array($categories_query)) {
- $categories_array[] = array('id' => $categories['categories_id'], 'text' => $indent . $categories['categories_name']);
-
- if ($categories['categories_id'] != $parent_id) $categories_array = tep_get_categories($categories_array, $categories['categories_id'], $indent . ' ');
- }
-
- return $categories_array;
-}
-
-}
-
-
-
-
-/**
- * \class productModule
- * \brief Traitement des modules associé
-*/
-class categorieModule
- extends AbstractAcaModule
- implements InterfaceAcaGene{
-
- /**
- flag de la class
- @param string
- */
- var $name;
- /**
- Les modules actif
- @param string
- */
- var $modules;
- /**
- Pile des images du porduit
- @param array
- */
- var $pile_img;
-
-
- protected static $_instance;
-
- /**
- */
- protected function __construct() {
- global $language, $page;
- $this-> name=__CLASS__;
- $this->type_flag=1;
- $this-> products_id='';
- $this-> image_handler='';
-
- $this->modules=array();
- $this->pile_img=array();
- $list_mod=array();
-
- foreach(parent::initialise_type('MODULE_ACACAT_INSTALLED','categories') as $class){
- $cl[$class]=new $class ();
- $list_mod[$class] = $cl[$class]->sort_order;
- }
- asort($list_mod);
- foreach($list_mod as $class=>$s){
- $this->modules[$class] =$cl[$class];
- }
- unset($cl);unset($list_mod);
- return $this->modules;
- }
-
-
- public static function getInstance() {
- if(self::$_instance == null) self::$_instance = new self();
- return self::$_instance;
- }
-
- public static function resetInstance(){
- self::$_instance = null;
- return self::getInstance();
- }
-
- public function get_option_data($_array){
- if(isset($this->modules) && is_array($this->modules))
- foreach ($this->modules as $key=>$module) {
- if ( $module->enabled && (method_exists($module, 'get_option_data' ))) {
- $_array=$this->modules[$key]->get_option_data($_array);
- }
- }
- return $_array;
- }
-
- /**
- * \brief Affiche module elemennt html
- * Block principal d'affichage, liste ou vue des élément. Block principal de page
- * @param $pID int $pID le Id du produits
- * @param @classe string le nom de la class appelé, ou vide pour toutes les class enfants
- */
- public function display_view($pID,$classe=''){
- global $page;
- if (!empty($classe)) {
- if (isset($this->modules[$classe]) && $this->modules[$classe]->enabled and (method_exists($classe, 'display_view' ))){
- $this->modules[$classe]->load_db_values($pID);
- return $this->modules[$classe]->display_view($pID);
- }
- } else {
- $c='';
- if(isset($this->modules) && is_array($this->modules))
- foreach ($this->modules as $key=>$module) {
- if (($module->enabled) and (method_exists($module, 'display_view' ))) {
- $this->modules[$key]->load_db_values($pID);
- $c .=$this->modules[$key]->display_view($pID);
- }
- }
- return $c;
- }
- }
-
- /**
- * \brief Affiche module display_view mini
- * @param $cID int cID le Id du customers
- * @param $class string class le nom de la class appelé, ou vide pour toutes les class enfants
- */
- public function display_view_min($cID,$class=''){
- global $page;
- if (!empty($class)) {
- if (isset($this->modules[$class]) && $this->modules[$class]->enabled and (method_exists($module, 'display_view_min' ))){
- $this->modules[$class]->load_db_values($cID);
- return $this->modules[$class]->display_view_min($cID);
- }
- } else {
- $c='';
- foreach ($this->modules as $key=>$module) {
- if (($module->enabled) and (method_exists($module, 'display_view_min' ))) {
- $this->modules[$key]->load_db_values($cID);
- $c .=$this->modules[$key]->display_view_min($cID);
- }
- }
- return $c;
- }
- }
-
-
-}
-?>
\ No newline at end of file
Deleted: branches/2.1.0/catalog/includes/classes/driver.content.php
===================================================================
--- branches/2.1.0/catalog/includes/classes/driver.content.php 2011-10-02 20:48:23 UTC (rev 3822)
+++ branches/2.1.0/catalog/includes/classes/driver.content.php 2011-10-03 08:36:18 UTC (rev 3823)
@@ -1,445 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 19/11/10, 18:04
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
- @file driver.content.php
-*/
-
-
-/**
- @class content
- Control init et gestion des data product
-*/
-class content {
-
- //! @p object
- protected static $_instance;
-
- public static $modules;
-
- /**
- */
- protected function __construct($full) {
- global $languages_id;
- contentData::start();
- if($full) self::start_module();
- }
-
- protected static function start_module(){
- $pdm=contentModule::getInstance();
- self::$modules=$pdm->ret_modules();
- }
-
- public static function getInstance($full=false) {
- if(self::$_instance == null) self::$_instance = new self($full);
- return self::$_instance;
- }
-
- public static function resetInstance(){
- self::$_instance = null;
- return self::getInstance();
- }
-
- /**
- Module configuration
- */
- public function ret_modules(){ self::start_module(); return self::$modules;}
-
-
- /**
- Data function
- */
- public static function get_query($id='',$search='',$exclude='',$option=array()){ global $languages_id; return contentData::get_query($id,$search,$exclude,$option); }
- public static function get_item($id){ return contentData::get_item($id); }
- public static function get_content_cat($id){ return contentData::get_content_cat($id); }
- public static function get_content_path($id){ return contentData::get_content_path($id); }
- public static function get_content_in_cat($current_category_id=0, $exclude=''){ return contentData::get_content_in_cat($current_category_id=0, $exclude=''); }
- public static function get_cms_liste_byDate($max, $exclude){ return contentData::get_cms_liste_byDate($max, $exclude); }
-}
-
-
-/**
- @class productData
- Traitement sql des product
-*/
-class contentData
- extends DataStatmentFO
- implements Interfacedata{
-
- //! @p int
- public static $lg_id;
- //! @p obj res db
- public static $obj_language;
- //! @p array
- public static $cache=array();
-
- //! @p array
- public static $opt=array();
-
- //! @p array cache
- public static $array_data=array();
-
- //! @p string
- private static $where_query='';
- //! @p object
- protected static $_instance;
-
- /**
- */
- protected function __construct() {
- global $languages_id;
- self::start();
- }
-
- /**
- */
- public static function start($option=''){
- global $languages_id;
- self::$lg_id=(int)$languages_id;
- $DB=Database::getInstance();
- self::$obj_language = $DB->query("select code from " . TABLE_LANGUAGES . " where languages_id='" .self::$lg_id . "'");
-
- if(!empty($option) && is_array($option)) self::$opt=$option;
-
- }
-
-
- /**
- Mise en pile de toutes les element des page de cms
- */
- private static function add_cache($id){
- self::$cache[]=$id;
- }
-
- /**
- Appel et recup des element du cache
- */
- private static function in_cache(){
- return implode("," ,self::$cache);
- }
-
- /**
- Prepa donnée sortie
- */
- protected static function statment_query($content_query,$exclude='',$search=''){
-
- $display_lang=self::$obj_language->fetchAssoc();
- if (empty($exclude))$exclude=array();
- $tabl=$res=array();
- while ($content = $content_query->fetchAssoc()) {
- if (!in_array($content['name'],$exclude)) {
- $res=$content;
- $res['href']=tep_href_link(FILENAME_CONTENT,'content=' . $content['id'] . '&language=' . $display_lang['code']);
- $res['key']=$content['name'];
- $res['original']=$content['text'];
- $res['images']=array();
-
- self::$array_data[$content['id']]=$tabl[$content['id']]=new objectInfo($res);
- self::$array_data[$content['id']]->text=self::parse_content($res['text'],$content['id']);
- self::add_cache($content['id']);
- }
- }
-
- if((count(self::$array_data)>0))
- foreach(self::$array_data as $k=>$content)
- if (!in_array($content->name,$exclude)) {
- if((!empty($search) && strstr($content->name,$search) !=false) || empty($search)) $tabl[$content->id]=$content;
- }
-
- return $tabl;
- }
-
- /**
- Ajout constrainte clause where
- */
- protected static function add_where_query($add){ self::$where_query .=' '.$add; }
-
- /**
- */
- protected static function reset_query() { self::$where_query=''; }
-
- /**
- Requeteur
- */
- protected static function cstr_query($orderby='', $limit='', $option=''){
- $query="SELECT content_title AS title, c.content_id AS id, c.content_name AS name, content_text AS text
- FROM " . TABLE_CONTENT_DESCRIPTION . " cd, " . TABLE_CONTENT . " c, " . TABLE_CONTENT_TO_CATEGORIES . " ctc, " . TABLE_CATEGORIES . " cat
- WHERE cat.categories_id=ctc.categories_id and cat.categories_status='1' AND c.content_status = '1' AND c.content_id = ctc.content_id AND cd.content_id = ctc.content_id AND cd.language_id = '" . self::$lg_id . "' " ;
-
- $query .=self::$where_query;
- $query .=' ORDER BY ' .(!tep_not_null($orderby)? ' c.sort_order, c.content_name ASC ' : $orderby) ;
- $query .=' LIMIT '.(!tep_not_null($limit)? '1' : $limit) ;
-
- return $query;
- }
-
- /**
- Extract img et complete cache avec img extraites
- */
- private static function extract_img($id,$content,$pattern){
- $pattern = "#<img.+[^>]/>#i";
- preg_match_all($pattern, $content, $images);
- //! mise en cache
- self::$array_data[$id]->images=$images ;
- }
-
- /**
- Parse content texte
- Fucntion qui permet de prendre en charge des element contenu dans la description du cms.
- */
- private static function parse_content($content,$id){
-
- $pattern ="#<img (.+)[^>]/>#i";
- self::extract_img($id,$content,$pattern);
-
- $sortie=(isset(self::$opt['img']) && !_test_bool(self::$opt['img']))? preg_replace($pattern, '', $content) : $content;
- $sortie=(isset(self::$opt['more']) && _test_bool(self::$opt['more']))? substr($sortie, 0, strpos($sortie,'<!-- pagebreak -->')) : $sortie;
- return $sortie;
- }
-
-
-
-
- public static function getInstance() {
- if(self::$_instance == null) self::$_instance = new self();
- return self::$_instance;
- }
-
- public static function resetInstance(){
- self::$_instance = null;
- return self::getInstance();
- }
-
- /**
- Function recuperation des page associé a une cat
-
- @author oscim <mail a...@os... /><web http://www.oscim.fr /> - OscssTeam
- @param
- @a int l'id de la categorie courante ou null
- @a array tableau d'exclusion
- */
- public static function get_content_in_cat($current_category_id=0, $exclude='',$option=''){
- global $languages_id;
- self::start($option);
- self::reset_query();
- $DB=Database::getInstance();
- self::$lg_id=(int)$languages_id;
- self::add_where_query(" AND ctc.categories_id = '" . (int)$current_category_id . "' ");
- $content_query = $DB->query($sql=self::cstr_query('',25) );
-
- return self::statment_query($content_query,$exclude);
- }
-
- /**
- Appel item
- @param
- @a string content_name le nom du titre
- @a array tableau d'exclusion
- */
- public static function get_query($id='',$search='',$exclude='',$option=array()){
- global $languages_id;
-
- self::start($option);
-
- self::reset_query();
- $DB=Database::getInstance();
- self::$lg_id=(int)$languages_id;
- $search=tep_db_prepare_input($search);
-
- if (count(self::$cache)>0) self::add_where_query(' AND c.content_id NOT IN ('.self::in_cache().') ');
- //! soit id soit sherach name key
- self::add_where_query((tep_not_null($id) && is_numeric($id) ? " AND c.content_id = '" . $id . "' ": (!empty($search)?" AND content_name LIKE '%" . tep_db_input($search) . "%' ":'') ));
-
- $content_query = $DB->query($sql=self::cstr_query((string)@$option['orderby'],@$option['limit'],(array)@$option) );
-
- return self::statment_query($content_query,$exclude,$search);
- }
-
- /**
- Alias unique ID
- */
- public static function get_item($id){
- $db_list=self::get_query($id);
-
- if(is_numeric($id) && isset($db_list[(int)$id])){
- return $db_list[$id];
- }else{
- $db_list=self::get_query('',$id);
- foreach($db_list as $item)
- if((string)$id==(string)$item->name)return $item;
- }
- return false;
- }
-
- /**
- Function recuperation de la cat d'un content_id
-
- @author oscim <mail a...@os... /><web http://www.oscim.fr /> - OscssTeam
- @param
- @a int l'id de la cat
- */
- public static function get_content_cat($content_id){
- $DB=Database::getInstance();
- $cur = $DB->query("SELECT categories_id from " . TABLE_CONTENT_TO_CATEGORIES . " WHERE content_id='" . (int)$content_id . "'");
- if($cur->__get('numRows')) {
- $display = $cur->fetchAssoc();
- //! mise en cache
- self::$array_data[$content_id]->parent_id=$display['categories_id'];
- return $display['categories_id'];
- }
- else return false;
- }
-
- /**
- Construct a category path to the product
- @author oscim <mail a...@os... /><web http://www.oscim.fr /> - OscssTeam
- @param
- @a int l'id de la ressource
- */
- public static function get_content_path($content_id) {
- $cPath = '';
-
- $category_query = tep_db_query("select p2c.categories_id from " . TABLE_CONTENT . " p, " . TABLE_CONTENT_TO_CATEGORIES . " p2c where p.content_id = '" . (int)$content_id . "' and p.content_status = '1' and p.content_id = p2c.content_id limit 1");
- if (tep_db_num_rows($category_query)) {
- $category = tep_db_fetch_array($category_query);
-
- $categories = array();
- tep_get_parent_categories($categories, $category['categories_id']);
-
- $categories = array_reverse($categories);
-
- $cPath = implode('_', $categories);
-
- if (tep_not_null($cPath)) $cPath .= '_';
- $cPath .= $category['categories_id'];
- }
-
- return $cPath;
- }
-
- /**
- Recupere la liste des article cms triée par date
-
- @note Article Type News, not in Page_xxx
- @author oscim - <mail aur...@os...> <www http://www.oscim.fr>
- @param
- @a int max le nombre d'item dans le tableau
- @a array tableau d'exclusion des id
- @return array
- */
- public static function get_cms_liste_byDate($max=10, $exclude='') {
- global $languages_id;
-
- self::start();
- self::reset_query();
- $DB=Database::getInstance();
- self::$lg_id=(int)$languages_id;
- self::add_where_query(" AND content_name NOT LIKE 'Page_%' ");
- $sql=self::cstr_query(" c.date_added DESC ", $max);
- $content_query = $DB->query($sql);
-
- return self::statment_query($content_query,$exclude);
- }
-
- /**
- Return balise img
- */
- public static function get_img($id, $img_num=0){
- if(is_array( self::$array_data[$id]->images[$img_num])&& isset( self::$array_data[$id]->images[$img_num][0]) )
- return (string)self::$array_data[$id]->images[$img_num][0];
- }
-
-}
-
-
-
-/**
- @class AbstractProduct
- @brief Force mise en forme via class absctarction des modules de produits
-*/
-abstract class AbstractContent {
- // Force la classe étendue à définir cette méthode
- abstract protected function display_view($pID,$class='');
- abstract protected function load_db_values($pID);
- abstract protected function get_header($action='');
- // méthode commune
-// public function printOut() { }
-}
-
-
-
-/**
- @class contentModule
- @brief Traitement des modules associé
-*/
-class contentModule
- extends AbstractAcaModule
- implements InterfaceAcaGene {
-
- protected static $_instance;
-
- /**
- */
- protected function __construct() {
- global $language, $page;
- $this->name=__CLASS__;
- $this->modules=array();
- $list_mod=array();
- foreach(parent::initialise_type('MODULE_CONTENT_INSTALLED',$this->name) as $class){
- $cl[$class]=new $class ();
- $list_mod[$class] = $cl[$class]->sort_order;
- }
- asort($list_mod);
- foreach($list_mod as $class=>$s){
- $this->modules[$class] =$cl[$class];
- }
- unset($cl);unset($list_mod);
- return $this->modules;
- }
-
-
- public static function getInstance() {
- if(self::$_instance == null) self::$_instance = new self();
- return self::$_instance;
- }
-
- public static function resetInstance(){
- self::$_instance = null;
- return self::getInstance();
- }
-
- public function display_view($ID,$class=''){return array();}
-
- /**
- Affiche module display_view mini
-
- @param
- @a int cID le Id du customers
- @a string class le nom de la class appelé, ou vide pour toutes les class enfants
- */
- public function display_view_min($cID,$class=''){
- global $page;
- if (!empty($class)) {
- if (isset($this->modules[$class]) && $this->modules[$class]->enabled and (method_exists($module, 'display_view_min' ))){
- $this->modules[$class]->load_db_values($cID);
- return $this->modules[$class]->display_view_min($cID);
- }
- } else {
- $c='';
- foreach ($this->modules as $key=>$module) {
- if (($module->enabled) and (method_exists($module, 'display_view_min' ))) {
- $this->modules[$key]->load_db_values($cID);
- $c .=$this->modules[$key]->display_view_min($cID);
- }
- }
- return $c;
- }
- }
-}
-
-?>
\ No newline at end of file
Deleted: branches/2.1.0/catalog/includes/classes/driver.product.php
===================================================================
--- branches/2.1.0/catalog/includes/classes/driver.product.php 2011-10-02 20:48:23 UTC (rev 3822)
+++ branches/2.1.0/catalog/includes/classes/driver.product.php 2011-10-03 08:36:18 UTC (rev 3823)
@@ -1,805 +0,0 @@
-<?php
-/**
- \licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- \portion code Copyright (c) 2002 osCommerce
- \package osCSS-2 <www http://www.oscss.org>
- \version 2.1.0
- \date 15/12/10, 11:33
- \author oscim <mail aur...@os...> <www http://www.oscim.fr>
- \encode UTF-8
-
- Prise en charge des product
-
- \note
- Convention nommage alias table:
- \li TABLE_PRODUCTS : p
- \li TABLE_PRODUCTS_DESCRIPTION pd
- \li TABLE_PRODUCTS_TO_CATEGORIES p2c
- \li TABLE_CATEGORIES c
-
-*/
-
-
-/**
- * \class product
- * \brief Control init et gestion des data product
- *
- * Assure tous les appels vers les class enfants, Data et Modules.
- * \li Tous les appels vers les methodes de la class productModule sont public \n
- * les modules de sont extends de AbstractProduct
- * \li Tous les appels vers les methodes de la class productData sont static
- *
-*/
-class product {
-
- //! @p object
- protected static $_instance;
-
- public static $modules;
-
- /**
- Pile des images du porduit
- @param array
- */
- var $pile_img;
-
- /**
- */
- protected function __construct($full) {
- global $languages_id;
- productData::start();
- if($full) self::start_module();
- }
-
- protected static function start_module(){
- $pdm=productModule::getInstance();
- self::$modules=$pdm->ret_modules();
- return $pdm;
- }
-
- public static function getInstance($full=false) {
- if(self::$_instance == null) self::$_instance = new self($full);
- return self::$_instance;
- }
-
- public static function resetInstance(){
- self::$_instance = null;
- return self::getInstance();
- }
-
- /**
- Module ACA
- */
-
- /**
- * \fn ret_modules()
- * \brief Retour tableau des modules type products actif
- * @return plusieurs modules via array(object)
- */
- public function ret_modules(){ self::start_module(); return self::$modules;}
- /**
- * \fn check_action($class='',$actions='')
- * \brief execute la capture des actions par les modlues
- * @param $class string
- * @param $actions array
- */
- public function check_action($class='',$actions=''){ $pdm=self::start_module(); return $pdm->check_action($class,$actions);}
- /**
- * \fn get_header($class='',$actions='')
- * \brief traitement block header des module
- * Display block header modules
- * @param $class string
- * @param $actions array
- */
- public function get_header($class='',$actions=''){ $pdm=self::start_module(); return $pdm->get_header($class,$actions);}
- /**
- * \fn after_check_action($class='',$actions='')
- * \brief after_check_action
- * @param $class string
- * @param $actions array
- */
- public function after_check_action($class='',$actions=''){ $pdm=self::start_module(); return $pdm->after_check_action($class,$actions);}
- /**
- * \fn display_view($pID,$class='',$exclude=array())
- * \brief after_check_action
- * @param $pID int
- * @param $class string
- * @param $exclude array
- */
- public function display_view($pID,$class='',$exclude=array()){ $pdm=self::start_module(); return $pdm->display_view($pID,$class,$exclude);}
-
- /**
- * \fn get_adjust_price($product_array)
- * \brief adjust price products , depend class price, execute by productData
- * @param $product_array array
- */
- public static function get_adjust_price($product_array){ $pdm=self::start_module(); return $pdm->adjust_price($product_array);}
- /**
- * \fn get_option_data($product_array)
- * \brief adjust products, depend class price, execute by productData
- * @param $product_array array
- */
- public static function get_option_data($product_array){ $pdm=self::start_module(); return $pdm->get_option_data($product_array);}
-
- /**
- Data function
- */
-
- /**
- * \fn get_query($id='',$search='',$exclude='',$option='')
- * \brief generation automatique de requetes pour exraire les données des produits.
- * Cet appel est mis en cache afin d'optimiser les requetes, de maniére incremental pour chaque produit, et par produits.
- * @param $id integer id
- * @param $search string champs qui sera recherché dans tous les champs de la db
- * @param $exclude tableau d'ecxlusion de produits par id
- * @param $option array option passé par couple key/values
- * @return object
- */
- public static function get_query($id='',$search='',$exclude='',$option=''){ global $languages_id; return productData::get_query($id,$search,$exclude,$option); }
- /**
- * \fn get_item($id)
- * \brief appel d'un produit par son id, il sera recupere dans la pile du cache, ou via une requet sql
- * @param $id
- * @return object
- */
- public static function get_item($id){ return productData::get_item($id); }
- /**
- * \fn get_product_path($id)
- * \brief generation du cPath d'un produits
- * @param $id int
- * @return string cPath
- */
- public static function get_product_path($id){ return productData::get_product_path($id); }
- /**
- * \fn get_product_attribut_info($id)
- * \brief appel info attribute product , renvoi tableau d'information
- * @param $id int products id
- */
- public static function get_product_attribut_info($id){ return productData::get_product_attribut_info($id); }
- /**
- * \fn get_product_attribut_info($id)
- * \brief retourne le nombre de produits en stock, en fonction de ces caratèristiques,
- * \li si produit sans attribut alors retour nombre de produits,
- * \li si produit + attribute, alors retour du stock pour cette association attributs produits
- * @param $id int id produit
- * @return int
- */
- public static function get_products_stock($id,$attributes=array()){ return productData::get_products_stock($id, $attributes); }
- /**
- * \fn get_has_product_attributes($id)
- * \brief true/false si attribut associé a ce produits
- * @param $id int
- */
- public static function get_has_product_attributes($id){ return productData::get_has_product_attributes($id); }
- /**
- * \fn get_product_attribut_price($products_id, $attributes=array())
- * \brief calcul prix produit avec attribute
- * @param $products_id int
- * @param $attributes array
- * @return float
- */
- public static function get_product_attribut_price($products_id, $attributes=array()) {return productData::get_product_attribut_price($products_id, $attributes); }
- /**
- * \fn get_attributes_weight($products_id, $attributes=array())
- * \brief calcul du poids avec attribute
- * @param $products_id int
- * @param $a...
[truncated message content] |
|
From: <os...@us...> - 2011-10-02 20:48:30
|
Revision: 3822
http://oscss.svn.sourceforge.net/oscss/?rev=3822&view=rev
Author: oscim
Date: 2011-10-02 20:48:23 +0000 (Sun, 02 Oct 2011)
Log Message:
-----------
Suite normalition des modifications des donn?\195?\169e en base
Suite construction des class de sqldriverdata pour les modification des donn?\195?\169es
Ajout prise en charge des enregsitrement sur les user admin
Ajout sortie des methode fetch avec clef normal ou courte (admin_id / id )
Modified Paths:
--------------
trunk/catalog/admin/includes/class.interfaces.php
trunk/catalog/admin/includes/classes/categorieUtility.php
trunk/catalog/admin/includes/classes/drivers/sqlcategorie.php
trunk/catalog/admin/includes/classes/drivers/sqlconfiguration.php
trunk/catalog/admin/includes/classes/drivers/sqlcontent.php
trunk/catalog/admin/includes/classes/drivers/sqlproduct.php
trunk/catalog/admin/includes/content/configuration.top.inc
trunk/catalog/admin/includes/gabarit/adminUsers.listing.gab
trunk/catalog/admin/includes/modules/pages/adminUsers.php
trunk/catalog/admin/includes/modules/pages/categories.php
Added Paths:
-----------
trunk/catalog/admin/includes/classes/drivers/sqladminuser.php
Modified: trunk/catalog/admin/includes/class.interfaces.php
===================================================================
--- trunk/catalog/admin/includes/class.interfaces.php 2011-10-02 08:30:54 UTC (rev 3821)
+++ trunk/catalog/admin/includes/class.interfaces.php 2011-10-02 20:48:23 UTC (rev 3822)
@@ -3,8 +3,8 @@
@licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 05/04/11, 11:49
+ @version 2.1.1
+ @date 02/10/11, 22:45
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -180,10 +180,11 @@
Interface ModSqlDataDriver {
public static function create($option);
public static function update($option);
- public static function fetch($option);
+ public static function fetch($option,$shortkey=false);
public static function delete($option);
}
+
/**
Just define class for use module public configuration
*/
Modified: trunk/catalog/admin/includes/classes/categorieUtility.php
===================================================================
--- trunk/catalog/admin/includes/classes/categorieUtility.php 2011-10-02 08:30:54 UTC (rev 3821)
+++ trunk/catalog/admin/includes/classes/categorieUtility.php 2011-10-02 20:48:23 UTC (rev 3822)
@@ -95,7 +95,7 @@
$categories_query = tep_db_query("select c.categories_id, cd.categories_name, c.parent_id from " . TABLE_CATEGORIES . " c, " . TABLE_CATEGORIES_DESCRIPTION . " cd where c.categories_id = cd.categories_id and cd.language_id = '" . (int)$languages_id . "' and c.parent_id = '" . (int)$parent_id . "' order by c.sort_order, cd.categories_name");
while ($categories = tep_db_fetch_array($categories_query)) {
if ($exclude != $categories['categories_id']) $category_tree_array[] = array('id' => $categories['categories_id'], 'text' => $spacing . $categories['categories_name']);
- $category_tree_array = tep_get_category_tree($categories['categories_id'], $spacing . ' ', $exclude, $category_tree_array);
+ $category_tree_array = self::get_category_tree($categories['categories_id'], $spacing . ' ', $exclude, $category_tree_array);
}
return $category_tree_array;
Added: trunk/catalog/admin/includes/classes/drivers/sqladminuser.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqladminuser.php (rev 0)
+++ trunk/catalog/admin/includes/classes/drivers/sqladminuser.php 2011-10-02 20:48:23 UTC (rev 3822)
@@ -0,0 +1,206 @@
+<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 22/09/11, 20:11
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class manage link table configuration
+*/
+
+
+
+
+class sqladminuser
+ implements ModSqlDataDriver{
+
+ public static $modules;
+
+ protected static $_instance;
+
+ protected function __construct(){
+ self::$modules=new AcaFactory('adminuser'/*,'MODULE_ACACAT_INSTALLED_BO'*/);
+// self::$modules->set_image_handler();
+ }
+
+
+ public static function getInstance() {
+ if(self::$_instance == null) self::$_instance = new self();
+ return self::$_instance;
+ }
+
+
+ /**
+ @brief create new ligne in table configuration
+ */
+ public static function create($option){
+ self::getInstance();
+
+ if(!isset($option['password']))
+ return 'password';
+
+ if(isset($option['groups_id'])) $sql_data_array['admin_groups_id'] = $option['groups_id'];
+ if(isset($option['firstname'])) $sql_data_array['admin_firstname'] = $option['firstname'];
+ if(isset($option['lastname'])) $sql_data_array['admin_lastname'] = $option['lastname'];
+ if(isset($option['email_address'])) $sql_data_array['admin_email_address'] = $option['email_address'];
+ if(isset($option['password'])) $sql_data_array['admin_password'] = $option['password'];
+
+
+ $sql_data_array['admin_created'] = 'now()';
+
+ $res=tep_db_perform(TABLE_ADMIN, $sql_data_array);
+
+ if(!$res)
+ return $res;
+ else
+ return $res->__get('insertId');
+ }
+
+ /**
+ @brief update ligne in table configuration
+ */
+ public static function update($option){
+ self::getInstance();
+
+ if(!isset($option['id']) ) return 'id';
+
+ $where ='';
+ if(isset($option['id'])) $where .="AND admin_id = '".(int)$option['id']."' ";
+
+ if(isset($option['groups_id'])) $sql_data_array['admin_groups_id'] = $option['groups_id'];
+ if(isset($option['firstname'])) $sql_data_array['admin_firstname'] = $option['firstname'];
+ if(isset($option['lastname'])) $sql_data_array['admin_lastname'] = $option['lastname'];
+ if(isset($option['email_address'])) $sql_data_array['admin_email_address'] = $option['email_address'];
+ if(isset($option['password'])) $sql_data_array['admin_password'] = $option['password'];
+
+ $sql_data_array['admin_modified'] = 'now()';
+
+ $res=tep_db_perform(TABLE_ADMIN, $sql_data_array, 'update' , substr($where,3) );
+
+ return $res;
+ }
+
+ /**
+ @brief load ligne in table configuration
+ @param option array
+ id => row id int (configuration_id)
+ key => string key (configuration_key)
+ group_id => group_id int (configuration_group_id)
+ @param $shortkey use cleankey for return short key
+ @return
+
+ object(stdClass)[13]
+ public 'id' => string '1' (length=1)
+
+ OR
+ array(
+ object(stdClass)[13]
+ ...
+ object(stdClass)[13]
+ ..
+ )
+
+ */
+ public static function fetch($option,$shortkey=false){
+ self::getInstance();
+ $DB=Database::getInstance();
+
+ $sql ="";
+ if(isset($option['id'])) $sql .="AND admin_id = '".(int)tep_db_input($option['id'])."' ";
+ if(isset($option['group_id'])) $sql .="AND a.admin_groups_id = '".(int)(string)tep_db_input($option['group_id'])."' ";
+
+
+
+ $sql="SELECT * FROM " . TABLE_ADMIN . " a ".
+ " LEFT JOIN " . TABLE_ADMIN_GROUPS . " g ON (a.admin_groups_id=g.admin_groups_id) ".
+ " WHERE ".substr($sql,3);
+
+ $res=$DB->query($sql);
+
+ $num = $res->__get('numRows');
+
+ if($num == 1){
+ $result=$res->fetchAssoc();
+ return ((!$shortkey)? $result : self::CleanKey($result));
+ }
+ elseif($num > 1){
+ $array=array();
+
+ foreach($res->fetchAllAssoc() as $result)
+ $array[]= ((!$shortkey)? $result : self::CleanKey($result));
+
+ return $array;
+ }
+
+ return false;
+ }
+
+ /**
+ @brief delete row
+ */
+ public static function delete($option){
+ self::getInstance();
+ $DB=Database::getInstance();
+
+ if(isset($option['id']))
+ $_id = (int)tep_db_input($option['id']) ;
+ else
+ return false;
+
+
+ // ACA START DELETE CATEGORY
+// self::$modules->delete($categories[$i]['id']);
+
+
+ $DB->query("delete from " . TABLE_ADMIN_NOTIFICATION . " where user_id = '" . (int)$_id . "' AND notif_type = '1' ");
+
+ $DB->query("delete from " . TABLE_ADMIN . " where admin_id = '" . (int)$_id . "'");
+
+
+ return true;
+ }
+
+
+ /**
+ @brief
+ @return array product empty
+ */
+ public static function Specimen(){
+ $par = array('admin_groups_id' => '',
+ 'admin_firstname' => '',
+ 'admin_lastname' => '',
+ 'admin_email_address' => '',
+ 'admin_modified' => '',
+ 'url_openid' => '',
+ );
+
+ return self::CleanKey($par);
+ }
+
+
+
+ /**
+ @fn CleanKey()
+ @brief Clean string name key
+ */
+ private static function CleanKey($array){
+ self::getInstance();
+ $object= new stdclass();
+
+ foreach($array as $key=>$value){
+ if( strpos($key,'admin_') ===0)
+ $key=substr($key,6);
+
+
+ $object->$key = $value;
+ }
+
+ return $object;
+ }
+
+}
+
+
+?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/classes/drivers/sqlcategorie.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlcategorie.php 2011-10-02 08:30:54 UTC (rev 3821)
+++ trunk/catalog/admin/includes/classes/drivers/sqlcategorie.php 2011-10-02 20:48:23 UTC (rev 3822)
@@ -29,6 +29,13 @@
}
+ public static function getInstance() {
+ if(self::$_instance == null) self::$_instance = new self();
+ return self::$_instance;
+ }
+
+
+
/**
@brief create new ligne in table configuration
*/
@@ -108,30 +115,39 @@
)
*/
- public static function fetch($option){
+ public static function fetch($option,$shortkey=false){
self::getInstance();
$DB=Database::getInstance();
$sql ="";
if(isset($option['id'])) $sql .="AND configuration_id = '".(int)tep_db_input($option['id'])."' ";
- if(isset($option['key'])) $sql .="AND configuration_key = '".(string)tep_db_input($option['key'])."' ";
- if(isset($option['group_id'])) $sql .="AND configuration_group_id = '".(int)(string)tep_db_input($option['group_id'])."' ";
+// if(isset($option['key'])) $sql .="AND configuration_key = '".(string)tep_db_input($option['key'])."' ";
+// if(isset($option['group_id'])) $sql .="AND configuration_group_id = '".(int)(string)tep_db_input($option['group_id'])."' ";
- $sql ="SELECT * FROM ".TABLE_CONFIGURATION." WHERE ".substr($sql,3);
+// $sql ="SELECT * FROM ".TABLE_CONFIGURATION." WHERE ".substr($sql,3);
- $res=$DB->query($sql);
+// $res=$DB->query($sql);
- $num = $res->__get('numRows');
+// $num = $res->__get('numRows');
+ $check_q = $DB->query("select * from " . TABLE_CATEGORIES_DESCRIPTION . " cd where categories_id = '" .(int) $ID . "' and language_id='".(int)$languages_id."' ");
+
+ $category_child = array( 'products_count' => categorieUtility::products_in_category_count($ID),
+ 'cms_count' => categorieUtility::cms_in_category_count($ID),
+ 'childs_count'=>categorieUtility::childs_in_category_count($ID),
+ 'cPath'=>categorieUtility::get_generated_category_path_ids($ID)
+ );
+ return new objectInfo(array_merge($check_q->fetchAssoc(),$category_child));
+
if($num == 1){
$result=$res->fetchAssoc();
- return self::CleanKey($result);
+ return ((!$shortkey)? $result : self::CleanKey($result));
}
elseif($num > 1){
$array=array();
- foreach($res->fetchAllAssoc() as $lg)
- $array[]= self::CleanKey($lg);
+ foreach($res->fetchAllAssoc() as $result)
+ $array[]= ((!$shortkey)? $result : self::CleanKey($result));
return $array;
}
@@ -197,13 +213,13 @@
if($table =='false')
return false;
- $DB->query("delete from " . $table . " where content_id='" . (int)$data_id . "' ");
+ $DB->query("delete from " . $table . " where ".$datatype."_id='" . (int)$data_id . "' ");
if(!is_array($data_array_link) || count($data_array_link) == 0)
- $DB->query($sql="insert into " . $table . " (content_id, categories_id) values ('" . (int)$data_id . "', '1')");
+ $DB->query($sql="INSERT INTO " . $table . " (".$datatype."_id, categories_id) VALUES ('" . (int)$data_id . "', '".ORPHELIN_COLLECTOR."')");
else
foreach($data_array_link as $value)
- $DB->query($sql="insert into " . $table . " (content_id, categories_id) values ('" . (int)$data_id . "', '" . (int)$value. "')");
+ $DB->query($sql="INSERT INTO " . $table . " (".$datatype."_id, categories_id) VALUES ('" . (int)$data_id . "', '" . (int)$value. "')");
return true;
}
@@ -220,16 +236,9 @@
$object= new stdclass();
foreach($array as $key=>$value){
-// if( strpos($key,'configuration_') ===0)
-// $key=substr($key,14);
-// elseif(strpos($key,'_function') >0)
-// $key=str_replace('_function','',$key);
-// elseif(strpos($key,'date_') ===0)
-// $key=str_replace('date_','',$key);
-// elseif(strpos($key,'last_') ===0)
-// $key=str_replace('last_','',$key);
+ if( strpos($key,'categories_') ===0)
+ $key=substr($key,11);
-
$object->$key = $value;
}
Modified: trunk/catalog/admin/includes/classes/drivers/sqlconfiguration.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlconfiguration.php 2011-10-02 08:30:54 UTC (rev 3821)
+++ trunk/catalog/admin/includes/classes/drivers/sqlconfiguration.php 2011-10-02 20:48:23 UTC (rev 3822)
@@ -96,7 +96,7 @@
)
*/
- public static function fetch($option){
+ public static function fetch($option,$shortkey=false){
$DB=Database::getInstance();
$sql ="";
@@ -112,13 +112,13 @@
if($num == 1){
$result=$res->fetchAssoc();
- return self::CleanKey($result);
+ return ((!$shortkey)? $result : self::CleanKey($result));
}
elseif($num > 1){
$array=array();
- foreach($res->fetchAllAssoc() as $lg)
- $array[]= self::CleanKey($lg);
+ foreach($res->fetchAllAssoc() as $result)
+ $array[]= ((!$shortkey)? $result : self::CleanKey($result));
return $array;
}
Modified: trunk/catalog/admin/includes/classes/drivers/sqlcontent.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlcontent.php 2011-10-02 08:30:54 UTC (rev 3821)
+++ trunk/catalog/admin/includes/classes/drivers/sqlcontent.php 2011-10-02 20:48:23 UTC (rev 3822)
@@ -160,7 +160,7 @@
)
*/
- public static function fetch($option){
+ public static function fetch($option,$shortkey=false){
self::getInstance();
$DB=Database::getInstance();
@@ -206,7 +206,7 @@
- return self::CleanKey($cInfo_array);
+ return ((!$shortkey)? $cInfo_array : self::CleanKey($cInfo_array)) ;
// if($num == 1){
// $result=$res->fetchAssoc();
// return self::CleanKey($result);
@@ -416,16 +416,9 @@
$object= new stdclass();
foreach($array as $key=>$value){
-// if( strpos($key,'products_') ===0)
-// $key=substr($key,9);
-// elseif(strpos($key,'_function') >0)
-// $key=str_replace('_function','',$key);
-// elseif(strpos($key,'date_') ===0)
-// $key=str_replace('date_','',$key);
-// elseif(strpos($key,'last_') ===0)
-// $key=str_replace('last_','',$key);
+ if( strpos($key,'content_') ===0)
+ $key=substr($key,8);
-
$object->$key = $value;
}
Modified: trunk/catalog/admin/includes/classes/drivers/sqlproduct.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlproduct.php 2011-10-02 08:30:54 UTC (rev 3821)
+++ trunk/catalog/admin/includes/classes/drivers/sqlproduct.php 2011-10-02 20:48:23 UTC (rev 3822)
@@ -200,7 +200,7 @@
)
*/
- public static function fetch($option){
+ public static function fetch($option,$shortkey=false){
self::getInstance();
$DB=Database::getInstance();
@@ -249,7 +249,7 @@
self::$modules->load_db_values($ID);
- return self::CleanKey($product);
+ return ((!$shortkey)? $product : self::CleanKey($product));
// if($num == 1){
// $result=$res->fetchAssoc();
// return self::CleanKey($result);
@@ -461,16 +461,9 @@
$object= new stdclass();
foreach($array as $key=>$value){
-// if( strpos($key,'products_') ===0)
-// $key=substr($key,9);
-// elseif(strpos($key,'_function') >0)
-// $key=str_replace('_function','',$key);
-// elseif(strpos($key,'date_') ===0)
-// $key=str_replace('date_','',$key);
-// elseif(strpos($key,'last_') ===0)
-// $key=str_replace('last_','',$key);
+ if( strpos($key,'products_') ===0)
+ $key=substr($key,9);
-
$object->$key = $value;
}
Modified: trunk/catalog/admin/includes/content/configuration.top.inc
===================================================================
--- trunk/catalog/admin/includes/content/configuration.top.inc 2011-10-02 08:30:54 UTC (rev 3821)
+++ trunk/catalog/admin/includes/content/configuration.top.inc 2011-10-02 20:48:23 UTC (rev 3822)
@@ -74,7 +74,8 @@
case 'save_mutli':
if(tep_not_null($gID) ){
- $list=sqlconfiguration::fetch(array('group_id'=> (int)$gID));
+ $list=sqlconfiguration::fetch(array('group_id'=> (int)$gID), true);
+
foreach($list as $row) {
if(isset($_POST['configuration'][$row->key])) {
@@ -125,10 +126,10 @@
$list_edit=array();
if(isset($mID) ){
$cfg->load_db_values();
- }elseif(tep_not_null($gID) && is_numeric($gID) ){
- $configuration_query = tep_db_query("select configuration_key,configuration_id, configuration_title, configuration_description,configuration_value, use_function,set_function from " . TABLE_CONFIGURATION . " where configuration_group_id = '" . (int)$gID . "' order by sort_order");
+ }
+ elseif(tep_not_null($gID) && is_numeric($gID) ){
- $list=sqlconfiguration::fetch(array('group_id'=> (int)$gID));
+ $list=sqlconfiguration::fetch(array('group_id'=> (int)$gID), true);
foreach($list as $row) {
Modified: trunk/catalog/admin/includes/gabarit/adminUsers.listing.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/adminUsers.listing.gab 2011-10-02 08:30:54 UTC (rev 3821)
+++ trunk/catalog/admin/includes/gabarit/adminUsers.listing.gab 2011-10-02 20:48:23 UTC (rev 3822)
@@ -1,9 +1,10 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.0.9
- @date 17/07/10, 16:35
+ @version 2.1.1
+ @date 02/10/11, 19:33
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -43,11 +44,11 @@
<td class="row_action">
<span class="view fils fleft">
<?php
- echo ' <a class="buttonimg" href="' . tep_href_link(adminUsers::FILENAME, 'page=' . $page . '&mID=' . $admin['admin_id'] . '&action=edit_member') . '">' . tep_image(DIR_WS_ICONS . 'icon_edit.png',IMAGE_EDIT ). '</a> <a class="buttonimg" href="' . tep_href_link(adminUsers::FILENAME, 'page=' . $page . '&mID=' . $admin['admin_id'] . '&action=del_member') . '">' . tep_image(DIR_WS_ICONS . 'icon_delete.png',IMAGE_DELETE).'</a> '; ?>
+ echo ' <a class="buttonimg" href="' . tep_href_link(adminUsers::FILENAME, 'mID=' . $admin['admin_id'] . '&action=edit_member') . '">' . tep_image(DIR_WS_ICONS . 'icon_edit.png',IMAGE_EDIT ). '</a> <a class="buttonimg" href="' . tep_href_link(adminUsers::FILENAME, 'mID=' . $admin['admin_id'] . '&action=del_member') . '">' . tep_image(DIR_WS_ICONS . 'icon_delete.png',IMAGE_DELETE).'</a> '; ?>
</span>
<span class="fright">
<?php if ( (is_object(adminUsers::$mInfo)) && ($admin['admin_id'] == adminUsers::$mInfo->admin_id) ) { echo tep_image(DIR_WS_ICONS . 'icon_arrow_right.gif'); }
- else { echo '<a href="' . tep_href_link(adminUsers::FILENAME, 'page=' . $page . '&mID=' . $admin['admin_id']) . '">' . tep_image(DIR_WS_ICONS . 'icon_info.gif', IMAGE_ICON_INFO) . '</a>'; } ?>
+ else { echo '<a href="' . tep_href_link(adminUsers::FILENAME, 'mID=' . $admin['admin_id']) . '">' . tep_image(DIR_WS_ICONS . 'icon_info.gif', IMAGE_ICON_INFO) . '</a>'; } ?>
</span>
</td>
</tr>
Modified: trunk/catalog/admin/includes/modules/pages/adminUsers.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/adminUsers.php 2011-10-02 08:30:54 UTC (rev 3821)
+++ trunk/catalog/admin/includes/modules/pages/adminUsers.php 2011-10-02 20:48:23 UTC (rev 3822)
@@ -1,16 +1,16 @@
<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.0.9
- @date 30/08/10, 10:32
+ @version 2.1.1
+ @date 02/10/11, 22:43
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class adminUsers
*/
-
+error_reporting(E_ALL);
class adminUsers
implements ExtModPage, InterfaceModule {
@@ -64,18 +64,19 @@
if (in_array($_POST['admin_email_address'], $stored_email)) {
tep_redirect(tep_href_link(self::FILENAME, 'error=email&action=new_member'));
- } else {
+ }
+ else {
$makePassword = self::randomize();
- $sql_data_array = array('admin_groups_id' => tep_db_prepare_input($_POST['admin_groups_id']),
- 'admin_firstname' => tep_db_prepare_input($_POST['admin_firstname']),
- 'admin_lastname' => tep_db_prepare_input($_POST['admin_lastname']),
- 'admin_email_address' => tep_db_prepare_input($_POST['admin_email_address']),
- 'admin_password' => tep_encrypt_password($makePassword),
- 'admin_created' => 'now()');
+ $_data_array = array('groups_id' => tep_db_prepare_input($_POST['admin_groups_id']),
+ 'firstname' => tep_db_prepare_input($_POST['admin_firstname']),
+ 'lastname' => tep_db_prepare_input($_POST['admin_lastname']),
+ 'email_address' => tep_db_prepare_input($_POST['admin_email_address']),
+ 'password' => tep_encrypt_password($makePassword),
+ );
- tep_db_perform(TABLE_ADMIN, $sql_data_array);
+ $_id=sqladminuser::create($_data_array);
$myarray = array(
'email_use_html'=>_cst_bool('EMAIL_USE_HTML'),
@@ -85,10 +86,12 @@
'hiddenPassword'=>$makePassword,
'message'=>''
);
+
$message_final=tep_post_prepare_email('admin_members_new.tpl',$language,$myarray);
//! envoi a l'user
tep_mail($_POST['admin_firstname'] , $_POST['admin_email_address'],__('email text subject create account'), $message_final, STORE_OWNER, STORE_OWNER_EMAIL_ADDRESS);
+
//! copy au porp mag
tep_mail(STORE_OWNER, STORE_OWNER_EMAIL_ADDRESS,__('creat new compte for admin'), $message_final);
@@ -107,76 +110,87 @@
if (in_array($_POST['admin_email_address'], $stored_email)) {
tep_redirect(tep_href_link(self::FILENAME, 'page=' . $page . 'mID=' . $_GET['mID'] . '&error=email&action=edit_member'));
- } else {
- $sql_data_array = array('admin_groups_id' => tep_db_prepare_input($_POST['admin_groups_id']),
- 'admin_firstname' => tep_db_prepare_input($_POST['admin_firstname']),
- 'admin_lastname' => tep_db_prepare_input($_POST['admin_lastname']),
- 'admin_email_address' => tep_db_prepare_input($_POST['admin_email_address']),
+ }
+ else {
+ $sql_data_array = array('id' => $admin_id,
+ 'groups_id' => tep_db_prepare_input($_POST['admin_groups_id']),
+ 'firstname' => tep_db_prepare_input($_POST['admin_firstname']),
+ 'lastname' => tep_db_prepare_input($_POST['admin_lastname']),
+ 'email_address' => tep_db_prepare_input($_POST['admin_email_address']),
'url_openid' => tep_db_prepare_input($_POST['url_openid']),
- 'admin_modified' => 'now()');
+ );
- tep_db_perform(TABLE_ADMIN, $sql_data_array, 'update', 'admin_id = \'' . $admin_id . '\'');
+ if(!sqladminuser::update($_data_array) )
+ $messageStack->add(__('error in process for save user :'), 'error');
+ else {
- $myarray = array(
- 'email_use_html'=>_cst_bool('EMAIL_USE_HTML'),
- 'links'=>HTTP_SERVER . DIR_WS_ADMIN,
- 'admin_firstname'=>$_POST['admin_firstname'],
- 'admin_email_address'=>$_POST['admin_email_address'],
- 'url_openid'=>$_POST['url_openid'],
- 'hiddenPassword'=>$hiddenPassword,
- 'message'=>''
- );
- $message_final=tep_post_prepare_email('admin_members.tpl',$language,$myarray);
- tep_mail($_POST['admin_firstname'] . ' ' . $_POST['admin_lastname'], $_POST['admin_email_address'],__('email text subject'), $message_final);
+ $myarray = array(
+ 'email_use_html'=>_cst_bool('EMAIL_USE_HTML'),
+ 'links'=>HTTP_SERVER . DIR_WS_ADMIN,
+ 'admin_firstname'=>$_POST['admin_firstname'],
+ 'admin_email_address'=>$_POST['admin_email_address'],
+ 'url_openid'=>$_POST['url_openid'],
+ 'hiddenPassword'=>$hiddenPassword,
+ 'message'=>''
+ );
+ $message_final=tep_post_prepare_email('admin_members.tpl',$language,$myarray);
+ tep_mail($_POST['admin_firstname'] . ' ' . $_POST['admin_lastname'], $_POST['admin_email_address'],__('email text subject'), $message_final, STORE_OWNER, STORE_OWNER_EMAIL_ADDRESS);
+ }
+
tep_redirect(tep_href_link(self::$url_redirect, 'mID=' . $admin_id));
- }
- break;
+ }
+ break;
+
+
case 'member_delete':
$admin_id = tep_db_prepare_input($_POST['admin_id']);
- tep_db_query("delete from " . TABLE_ADMIN . " where admin_id = '" . $admin_id . "'");
+ sqladminuser::delete(array('id'=>$admin_id));
+
tep_redirect(tep_href_link(self::FILENAME, 'page=' . $page));
- break;
+ break;
- case 'setflag':
- if($_GET['gPath']==1) tep_redirect(tep_href_link(self::FILENAME, 'gPath=' . $_GET['gPath'] .'&action=define_group'));
- if(isset($_GET['admin_boxes_id'])) {
- $ID=$_GET['admin_boxes_id'].'.php';
- $key='admin_files_name';
- $where= " and admin_files_is_boxes='1' ";
- } else {
- $ID=$_GET['admin_files_id'];
- $key='admin_files_id';
- $where=" and admin_files_is_boxes='0' ";
- }
- $define_files_query = tep_db_query($sql="select * from " . TABLE_ADMIN_FILES . " where ".$key."='".$ID."' ".$where." LIMIT 1");
- $define_files = tep_db_fetch_array($define_files_query);
+ case 'setflag':
+ if($_GET['gPath']==1) tep_redirect(tep_href_link(self::FILENAME, 'gPath=' . $_GET['gPath'] .'&action=define_group'));
+ if(isset($_GET['admin_boxes_id'])) {
+ $ID=$_GET['admin_boxes_id'].'.php';
+ $key='admin_files_name';
+ $where= " and admin_files_is_boxes='1' ";
+ } else {
+ $ID=$_GET['admin_files_id'];
+ $key='admin_files_id';
+ $where=" and admin_files_is_boxes='0' ";
+ }
- $t=explode(',',$define_files['admin_groups_id']);
+ $define_files_query = tep_db_query($sql="select * from " . TABLE_ADMIN_FILES . " where ".$key."='".$ID."' ".$where." LIMIT 1");
+ $define_files = tep_db_fetch_array($define_files_query);
- if($_GET['flag'] ==0) {
- foreach($t as $v){
- if($_GET['gPath'] != $v && !empty($v) )$ts[]=$v;
- }
- }
- elseif(!in_array($_GET['gPath'] ,$t)) {
- $ts=$t;
- $ts[]=$_GET['gPath'];
- }else $ts=$t;
- $define_files_query = tep_db_query($sql="update " . TABLE_ADMIN_FILES . " set admin_groups_id = '".implode(',',$ts)."' where admin_files_id='".$define_files['admin_files_id']."'");
+ $t=explode(',',$define_files['admin_groups_id']);
- tep_redirect(tep_href_link(self::FILENAME, 'gPath=' . $_GET['gPath'] .'&action=define_group'));
- break;
- default:
+ if($_GET['flag'] ==0) {
+ foreach($t as $v)
+ if($_GET['gPath'] != $v && !empty($v) )$ts[]=$v;
+ }
+ elseif(!in_array($_GET['gPath'] ,$t)) {
+ $ts=$t;
+ $ts[]=$_GET['gPath'];
+ }
+ else $ts=$t;
+ $define_files_query = tep_db_query($sql="update " . TABLE_ADMIN_FILES . " set admin_groups_id = '".implode(',',$ts)."' where admin_files_id='".$define_files['admin_files_id']."'");
+ tep_redirect(tep_href_link(self::FILENAME, 'gPath=' . $_GET['gPath'] .'&action=define_group'));
+ break;
+ default:
+
+
}
}
@@ -234,8 +248,10 @@
public static function load_db_values($ID){
$DB=Database::getInstance();
- $db_admin_query_raw = $DB->query($sql="select * from " . TABLE_ADMIN . " a LEFT JOIN " . TABLE_ADMIN_GROUPS . " g ON a.admin_groups_id=g.admin_groups_id where a.admin_id='".$ID."' ");
- return new objectInfo($db_admin_query_raw->fetchAssoc());
+
+ $array=sqladminuser::fetch(array('id'=>(int)$ID));
+
+ return new objectInfo($array);
}
Modified: trunk/catalog/admin/includes/modules/pages/categories.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/categories.php 2011-10-02 08:30:54 UTC (rev 3821)
+++ trunk/catalog/admin/includes/modules/pages/categories.php 2011-10-02 20:48:23 UTC (rev 3822)
@@ -10,7 +10,6 @@
@brief manage category and module aca for cat
*/
-error_reporting(E_ALL);
/**
@class categories
@@ -310,12 +309,7 @@
if(isset($_POST['delete_childs_in_cat']) && $_POST['delete_childs_in_cat']=='on') {
for ($i=0, $n=sizeof($categories); $i<$n; $i++) {
-// tep_remove_category($categories[$i]['id']);
-
sqlcategorie::delete(array('id'=>$categories[$i]['id']));
-
- // ACA START DELETE CATEGORY
-// self::$modules->delete_category($categories[$i]['id']);
}
}
@@ -412,6 +406,9 @@
}
+
+ /**
+ */
public function get_header(){
echo tep_get_filebroswerserveur();
if (self::$action == 'new_category') self::$modules->get_header_js('new_category');
@@ -419,6 +416,8 @@
}
+ /**
+ */
public static function load_db_values($ID){
global $languages_id;
$DB=Database::getInstance();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-10-02 08:31:01
|
Revision: 3821
http://oscss.svn.sourceforge.net/oscss/?rev=3821&view=rev
Author: oscim
Date: 2011-10-02 08:30:54 +0000 (Sun, 02 Oct 2011)
Log Message:
-----------
Added Paths:
-----------
trunk/catalog/admin/includes/classes/drivers/sqlcategorie.php
Added: trunk/catalog/admin/includes/classes/drivers/sqlcategorie.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlcategorie.php (rev 0)
+++ trunk/catalog/admin/includes/classes/drivers/sqlcategorie.php 2011-10-02 08:30:54 UTC (rev 3821)
@@ -0,0 +1,242 @@
+<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 22/09/11, 20:11
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class manage link table configuration
+*/
+
+
+
+
+class sqlcategorie
+ implements ModSqlDataDriver{
+
+ public static $modules;
+
+ protected static $_instance;
+
+ protected function __construct(){
+ /**
+ TODO : remplacer le nom de constante par un MODULE_CATEGORIES_INSTALLED_BO
+ */
+ self::$modules=new AcaFactory('categories','MODULE_ACACAT_INSTALLED_BO');
+ self::$modules->set_image_handler();
+ }
+
+
+ /**
+ @brief create new ligne in table configuration
+ */
+ public static function create($option){
+ self::getInstance();
+ if(!isset($option['key'])) return 'key';
+
+ if(isset($option['id'])) $sql_data_array['configuration_id'] = $option['id'];
+ if(isset($option['title'])) $sql_data_array['configuration_title'] = $option['title'];
+ $sql_data_array['configuration_key'] = $option['key'];
+ if(isset($option['value'])) $sql_data_array['configuration_value'] = $option['value'];
+ if(isset($option['description'])) $sql_data_array['configuration_description'] = $option['description'];
+ if(isset($option['group_id'])) $sql_data_array['configuration_group_id'] = $option['group_id'];
+ if(isset($option['sort_order'])) $sql_data_array['sort_order'] = $option['sort_order'];
+ if(isset($option['modified'])) $sql_data_array['last_modified'] = $option['modified'];
+ $sql_data_array['date_added'] = (isset($option['added'])) ? $option['added'] : date('Y-m-d H:i:s');
+ if(isset($option['use'])) $sql_data_array['use'] = $option['use'];
+ if(isset($option['set'])) $sql_data_array['set'] = $option['set'];
+ $sql_data_array['configuration_type'] = (isset($option['type'])) ? $option['type'] : 2;
+
+ $res=tep_db_perform(TABLE_CONFIGURATION, $sql_data_array);
+
+ if(!$res)
+ return $res;
+ else
+ return $res->__get('insertId');
+ }
+
+ /**
+ @brief update ligne in table configuration
+ */
+ public static function update($option){
+ self::getInstance();
+ if(!isset($option['key']) && !isset($option['id'])) return 'key or id';
+
+ $where ='';
+ if(isset($option['id'])) $where .="AND configuration_id = '".(int)$option['id']."' ";
+ if(isset($option['key'])) $where .="AND configuration_key = '".$option['key']."' ";
+
+ if(isset($option['title'])) $sql_data_array['configuration_title'] = $option['title'];
+ if(isset($option['value'])) $sql_data_array['configuration_value'] = $option['value'];
+ if(isset($option['description'])) $sql_data_array['configuration_description'] = $option['description'];
+ if(isset($option['group_id'])) $sql_data_array['configuration_group_id'] = $option['group_id'];
+ if(isset($option['sort_order'])) $sql_data_array['sort_order'] = $option['sort_order'];
+ $sql_data_array['last_modified'] = (isset($option['modified'])) ? $option['modified'] : date('Y-m-d H:i:s');
+ if(isset($option['use'])) $sql_data_array['use'] = $option['use'];
+ if(isset($option['set'])) $sql_data_array['set'] = $option['set'];
+ $sql_data_array['configuration_type'] = (isset($option['type'])) ? $option['type'] : 2;
+
+
+
+
+
+ $res=tep_db_perform(TABLE_CONFIGURATION, $sql_data_array, 'update' , substr($where,3) );
+
+ return $res;
+ }
+
+ /**
+ @brief load ligne in table configuration
+ @param option array
+ id => row id int (configuration_id)
+ key => string key (configuration_key)
+ group_id => group_id int (configuration_group_id)
+
+ @return
+
+ object(stdClass)[13]
+ public 'id' => string '1' (length=1)
+
+ OR
+ array(
+ object(stdClass)[13]
+ ...
+ object(stdClass)[13]
+ ..
+ )
+
+ */
+ public static function fetch($option){
+ self::getInstance();
+ $DB=Database::getInstance();
+
+ $sql ="";
+ if(isset($option['id'])) $sql .="AND configuration_id = '".(int)tep_db_input($option['id'])."' ";
+ if(isset($option['key'])) $sql .="AND configuration_key = '".(string)tep_db_input($option['key'])."' ";
+ if(isset($option['group_id'])) $sql .="AND configuration_group_id = '".(int)(string)tep_db_input($option['group_id'])."' ";
+
+ $sql ="SELECT * FROM ".TABLE_CONFIGURATION." WHERE ".substr($sql,3);
+
+ $res=$DB->query($sql);
+
+ $num = $res->__get('numRows');
+
+ if($num == 1){
+ $result=$res->fetchAssoc();
+ return self::CleanKey($result);
+ }
+ elseif($num > 1){
+ $array=array();
+
+ foreach($res->fetchAllAssoc() as $lg)
+ $array[]= self::CleanKey($lg);
+
+ return $array;
+ }
+
+ return false;
+ }
+
+ /**
+ @brief delete row
+ */
+ public static function delete($option){
+ self::getInstance();
+ $DB=Database::getInstance();
+
+ if(isset($option['id']))
+ $_id = (int)tep_db_input($option['id']) ;
+ else
+ return false;
+
+
+ $category_image_query = $DB->query("select categories_image from " . TABLE_CATEGORIES . " where categories_id = '" . (int)$_id . "'");
+ $category_image = tep_db_fetch_array($category_image_query);
+
+ $duplicate_image_query = tep_db_query("select count(*) as total from " . TABLE_CATEGORIES . " where categories_image = '" . tep_db_input($category_image['categories_image']) . "'");
+ $duplicate_image = tep_db_fetch_array($duplicate_image_query);
+
+ if ($duplicate_image['total'] < 2) {
+ if (file_exists(DIR_FS_CATALOG_IMAGES . $category_image['categories_image'])) {
+ @unlink(DIR_FS_CATALOG_IMAGES . $category_image['categories_image']);
+ }
+ }
+
+ // ACA START DELETE CATEGORY
+ self::$modules->delete($categories[$i]['id']);
+
+
+ $DB->query("delete from " . TABLE_CATEGORIES_DESCRIPTION . " where categories_id = '" . (int)$_id . "'");
+ $DB->query("delete from " . TABLE_CATEGORIES_EXTRA . " where categories_id = '" . (int)$_id . "'");
+
+ $DB->query("delete from " . TABLE_CATEGORIES . " where categories_id = '" . (int)$_id . "'");
+
+
+ return true;
+ }
+
+
+
+ /**
+ @fn CleanKey()
+ @brief Clean link data to categorie and save new link
+ data tables must follow the nomenclature Liaison
+ Table link is : namedata_to_categorie
+ @param $datatype string name type data (product, content)
+ @param $data_id int rowid data
+ @param $data_array_link array value rowid link cat
+ */
+ public static function DataInCat($datatype, $data_id, $data_array_link=array()){
+ self::getInstance();
+ $DB=Database::getInstance();
+
+ $table = tep_cst_define('TABLE_'.strtoupper($datatype).'_TO_CATEGORIES');
+
+ if($table =='false')
+ return false;
+
+ $DB->query("delete from " . $table . " where content_id='" . (int)$data_id . "' ");
+
+ if(!is_array($data_array_link) || count($data_array_link) == 0)
+ $DB->query($sql="insert into " . $table . " (content_id, categories_id) values ('" . (int)$data_id . "', '1')");
+ else
+ foreach($data_array_link as $value)
+ $DB->query($sql="insert into " . $table . " (content_id, categories_id) values ('" . (int)$data_id . "', '" . (int)$value. "')");
+
+ return true;
+ }
+
+
+
+
+ /**
+ @fn CleanKey()
+ @brief Clean string name key
+ */
+ private static function CleanKey($array){
+ self::getInstance();
+ $object= new stdclass();
+
+ foreach($array as $key=>$value){
+// if( strpos($key,'configuration_') ===0)
+// $key=substr($key,14);
+// elseif(strpos($key,'_function') >0)
+// $key=str_replace('_function','',$key);
+// elseif(strpos($key,'date_') ===0)
+// $key=str_replace('date_','',$key);
+// elseif(strpos($key,'last_') ===0)
+// $key=str_replace('last_','',$key);
+
+
+ $object->$key = $value;
+ }
+
+ return $object;
+ }
+
+}
+
+
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-10-02 08:26:09
|
Revision: 3820
http://oscss.svn.sourceforge.net/oscss/?rev=3820&view=rev
Author: oscim
Date: 2011-10-02 08:26:02 +0000 (Sun, 02 Oct 2011)
Log Message:
-----------
Suite normalition des modifications des donn?\195?\169e en base
Suite construction des class de sqldriverdata pour les modification des donn?\195?\169es, structuration complete des cms_content
nettoyage et debut structuration des categories
correction css
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/categorieUtility.php
trunk/catalog/admin/includes/classes/drivers/sqlproduct.php
trunk/catalog/admin/includes/functions/general.php
trunk/catalog/admin/includes/gabarit/cms_content/display_view.inline.gab
trunk/catalog/admin/includes/gabarit/cms_content/display_view.listing.gab
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/cms_content.txt
trunk/catalog/admin/includes/modules/pages/categories.php
trunk/catalog/admin/includes/modules/pages/cms_content.php
trunk/catalog/admin/includes/template/oscss/stylesheet-1.css
Added Paths:
-----------
trunk/catalog/admin/includes/classes/drivers/sqlcontent.php
Removed Paths:
-------------
trunk/catalog/admin/includes/functions/lib.categories.php
Modified: trunk/catalog/admin/includes/classes/categorieUtility.php
===================================================================
--- trunk/catalog/admin/includes/classes/categorieUtility.php 2011-09-28 15:32:44 UTC (rev 3819)
+++ trunk/catalog/admin/includes/classes/categorieUtility.php 2011-10-02 08:26:02 UTC (rev 3820)
@@ -1,11 +1,10 @@
<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- Copyright phpMyAdmin (select_lang.lib.php3 v1.24 04/19/2002)
- Copyright Stephane Garin <sg...@sg...> (detect_language.php v0.1 04/02/2002)
- @package oscss-2 <www http://www.oscss.org>
- @version 2.0.9
- @date 22/08/10, 09:26
+ @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 02/10/11, 10:01
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class categorieUtility
@@ -31,7 +30,7 @@
$categories_query = tep_db_query("select c.categories_id, cd.categories_name, c.categories_image, c.parent_id, c.sort_order, c.date_added, c.last_modified,c.categories_status,c.categories_hidden, cd.categories_description, cd.categories_head_keywords_tag from " . TABLE_CATEGORIES . " c, " . TABLE_CATEGORIES_DESCRIPTION . " cd where c.parent_id = '" . (int)(empty($current_ID)?$current_category_id:$current_ID ) . "' and c.categories_id = cd.categories_id and cd.language_id = '" . (int)$languages_id . "' ".$search." order by c.parent_id ASC , c.sort_order ASC, cd.categories_name ASC");
while ($categories = tep_db_fetch_array($categories_query)){
- $nbr=tep_childs_in_category_count($categories['categories_id']);
+ $nbr=self::childs_in_category_count($categories['categories_id']);
$cat[]=array_merge($categories, array('childs_count' => $nbr, 'niveau'=>$niv) );
$niv++;
if($nbr !=0) $cat=array_merge($cat,(array)get_cat_list($categories['categories_id'], $niv) );
@@ -54,7 +53,7 @@
$categories_query = tep_db_query("select categories_id from " . TABLE_CATEGORIES . " where parent_id = '" . (int)$categories_id . "'");
while ($categories = tep_db_fetch_array($categories_query)) {
$categories_count++;
- $categories_count += tep_childs_in_category_count($categories['categories_id']);
+ $categories_count += self::childs_in_category_count($categories['categories_id']);
}
return $categories_count;
@@ -168,5 +167,52 @@
return $categories_array;
}
+
+
+
+ /**
+ @fn products_in_category_count($categories_id, $include_deactivated = false)
+ @brief Count how many products exist in a category
+ @param $categories_id integer
+ @param $include_deactivated boolean true = status products 1 | false status products null
+ @return integer count child products in catg
+ */
+ function products_in_category_count($categories_id, $include_deactivated = false) {
+ $products_count = 0;
+
+ if ($include_deactivated) $products_query = tep_db_query("select count(*) as total from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c where p.products_id = p2c.products_id and p2c.categories_id = '" . (int)$categories_id . "'");
+ else $products_query = tep_db_query("select count(*) as total from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c where p.products_id = p2c.products_id and p.products_status = '1' and p2c.categories_id = '" . (int)$categories_id . "'");
+
+ $products = tep_db_fetch_array($products_query);
+ $products_count += $products['total'];
+ $childs_query = tep_db_query("select categories_id from " . TABLE_CATEGORIES . " where parent_id = '" . (int)$categories_id . "'");
+ if (tep_db_num_rows($childs_query))
+ while ($childs = tep_db_fetch_array($childs_query)) $products_count += self::products_in_category_count($childs['categories_id'], $include_deactivated);
+
+ return $products_count;
+ }
+
+ /**
+ @fn cms_in_category_count($categories_id, $include_deactivated = false)
+ @brief Count how many cms exist in a category
+ @param $categories_id integer
+ @param $include_deactivated boolean true = status content 1 | false status content null
+ @return integer count child content in catg
+ */
+ function cms_in_category_count($categories_id, $include_deactivated = false) {
+ $products_count = 0;
+
+ if ($include_deactivated) $products_query = tep_db_query("select count(*) as total from " . TABLE_CONTENT . " p, " . TABLE_CONTENT_TO_CATEGORIES . " p2c where p.content_id = p2c.content_id and p2c.categories_id = '" . (int)$categories_id . "'");
+ else $products_query = tep_db_query("select count(*) as total from " . TABLE_CONTENT . " p, " . TABLE_CONTENT_TO_CATEGORIES . " p2c where p.content_id = p2c.content_id and p.content_status = '1' and p2c.categories_id = '" . (int)$categories_id . "'");
+
+ $products = tep_db_fetch_array($products_query);
+ $products_count += $products['total'];
+ $childs_query = tep_db_query("select categories_id from " . TABLE_CATEGORIES . " where parent_id = '" . (int)$categories_id . "'");
+ if (tep_db_num_rows($childs_query))
+ while ($childs = tep_db_fetch_array($childs_query)) $products_count += self::cms_in_category_count($childs['categories_id'], $include_deactivated);
+
+ return $products_count;
+ }
+
}
?>
Added: trunk/catalog/admin/includes/classes/drivers/sqlcontent.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlcontent.php (rev 0)
+++ trunk/catalog/admin/includes/classes/drivers/sqlcontent.php 2011-10-02 08:26:02 UTC (rev 3820)
@@ -0,0 +1,438 @@
+<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 22/09/11, 20:11
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class manage link table products
+*/
+
+
+class sqlcontent
+ implements ModSqlDataDriver{
+
+ public static $modules;
+
+ protected static $_instance;
+
+ protected function __construct(){
+ self::$modules=new AcaFactory('content'/*,'MODULE_CONTENT_INSTALLED_BO'*/);
+ self::$modules->set_image_handler();
+ }
+
+ public static function getInstance() {
+ if(self::$_instance == null) self::$_instance = new self();
+ return self::$_instance;
+ }
+
+
+ /**
+ @brief create new ligne in table configuration
+ @param $option array
+ language_id = > int $languages_id
+ */
+ public static function create($option){
+
+ self::getInstance();
+ $DB=Database::getInstance();
+
+ $languages_id = $option['language_id'];
+ return true;
+ }
+
+ /**
+ @brief update ligne in table configuration
+ */
+ public static function update($option){
+
+ self::getInstance();
+ $DB=Database::getInstance();
+
+ if(!isset($option['action']) && !isset($option['id'])) return 'action or id';
+
+ $list_languages=tep_get_languages();
+ $where ='';
+// $languages_id = $option['language_id'];
+
+ if(isset($option['id'])){
+ $content_id = (int)$option['id'];
+ $post['content_id'] = $content_id;
+ }
+
+ if(isset($option['action'])) $action=$option['action'];
+
+ // Put post value
+ if(isset($option['post'])){
+ $post=$option['post'];
+ self::$modules->load_post_values($post);
+ }
+
+ $sql_data_array = $option['sqlarray'];
+
+
+
+
+ if ($action == 'insert') {
+ $insert_sql_data = array('date_added' => 'now()');
+ $sql_data_array = array_merge($sql_data_array, $insert_sql_data);
+
+
+ $sql_data_array = array_merge($sql_data_array, self::$modules->get_insert_table_content ());
+
+ $resobj=tep_db_perform(TABLE_CONTENT, $sql_data_array);
+
+ $content_id =$resobj->__get('insertId');
+
+ } elseif ($action == 'update') {
+
+
+ $update_sql_data = array('last_modified' => 'now()');
+ $sql_data_array = array_merge($sql_data_array, $update_sql_data);
+
+ self::$modules->load_post_values($post);
+ $sql_data_array = array_merge($sql_data_array, self::$modules->get_update_table_content ());
+
+
+ tep_db_perform(TABLE_CONTENT, $sql_data_array, 'update', "content_id = '" . (int)$content_id . "'");
+ }
+
+
+ /// Clean link posts to categorie and save new link
+ if(isset($option['cPath']) && count($post['categories']) == 0)
+ $post['categories'][] = $option['cPath'];
+
+ sqlcategorie::DataInCat('content', $content_id, $post['categories']);
+
+
+ for ($i=0, $n=sizeof($list_languages); $i<$n; $i++) {
+
+ $language_id = $list_languages[$i]['id'];
+
+ $sql_data_array = array('content_text' => tep_db_prepare_input($post['content_text'][$language_id]) /*tep_db_prepare_input($content_text[$language_id])*/,
+ 'content_title' => tep_db_prepare_input($post['content_title'][$language_id]) /*str_replace('&','&',tep_db_prepare_input($content_title[$language_id]))*/);
+
+ if ($action == 'insert') {
+
+ $insert_sql_data = array(
+ 'content_id' => $content_id,
+ 'language_id' => $language_id
+ );
+
+ $sql_data_array = array_merge($sql_data_array, $insert_sql_data);
+
+ $sql_data_array = array_merge($sql_data_array, self::$modules->get_insert_table_content_description ($language_id));
+
+ tep_db_perform(TABLE_CONTENT_DESCRIPTION, $sql_data_array);
+
+ } elseif ($action == 'update') {
+
+ $sql_data_array = array_merge($sql_data_array, self::$modules->get_update_table_content_description ($language_id));
+
+ tep_db_perform(TABLE_CONTENT_DESCRIPTION, $sql_data_array, 'update', "content_id = '" . (int)$content_id . "' and language_id = '" . (int)$language_id . "'");
+ }
+ }
+
+ self::$modules->after_update ($content_id);
+
+ return 1;
+ }
+
+ /**
+ @brief load ligne in table configuration
+ @param option array
+ id => row id int (configuration_id)
+ key => string key (configuration_key)
+ group_id => group_id int (configuration_group_id)
+
+ @return
+
+ object(stdClass)[13]
+ public 'id' => string '1' (length=1)
+ OR
+ array(
+ object(stdClass)[13]
+ ...
+ object(stdClass)[13]
+ ..
+ )
+
+ */
+ public static function fetch($option){
+
+ self::getInstance();
+ $DB=Database::getInstance();
+
+ $languages_id = $option['language_id'];
+ $cat_list =array();
+ $list_languages=tep_get_languages();
+
+ $sql ="AND ";
+ if(isset($option['id'])){
+ $ID = (int) $option['id'];
+// $sql .="AND p.products_id = '".(int)tep_db_input($option['id'])."' ";
+ }
+
+
+ $content_query = $DB->query("select c.content_id, content_name, date_added, last_modified, content_status from " . TABLE_CONTENT . " c where c.content_id = '" . (int)$ID . "' ");
+ $cInfo_array = tep_db_fetch_array($content_query);
+
+ tep_db_free_result($content_query);
+
+ // call all langue for this post
+ for ($i=0, $n=sizeof($list_languages); $i<$n; $i++) {
+ $language_id = $list_languages[$i]['id'];
+ $content_query = $DB->query("select cd.content_text, cd.content_title from " . TABLE_CONTENT . " c, " . TABLE_CONTENT_DESCRIPTION . " cd where c.content_id = '" . (int)$ID . "' and c.content_id = cd.content_id and language_id='" . $language_id . "'");
+ $content = tep_db_fetch_array($content_query);
+ $cInfo_array['text'][$language_id] = $content['content_text'];
+ $cInfo_array['title'][$language_id] = $content['content_title'];
+ tep_db_free_result($content_query);
+ }
+
+ $cat_query = $DB->query("select categories_id from " . TABLE_CONTENT_TO_CATEGORIES . " where content_id='" . (int)$ID . "' ");
+
+
+ while($cat_l = tep_db_fetch_array($cat_query)){ $cat_list[$cat_l['categories_id']]=$cat_l; }
+ $cInfo_array['categories']=$cat_list;
+
+
+ tep_db_free_result($cat_query);
+
+
+ self::$modules->load_db_values($ID);
+
+
+
+
+ return self::CleanKey($cInfo_array);
+// if($num == 1){
+// $result=$res->fetchAssoc();
+// return self::CleanKey($result);
+// }
+// elseif($num > 1){
+// $array=array();
+//
+// foreach($res->fetchAllAssoc() as $lg)
+// $array[]= self::CleanKey($lg);
+//
+// return $array;
+// }
+
+// return false;
+ }
+
+ /**
+ @brief delete row
+ @param option array
+ */
+ public static function delete($option){
+
+ self::getInstance();
+ $DB=Database::getInstance();
+
+ $res = false;
+ $product_categories = array();
+
+ if(isset($option['id']))
+ $cms_id = (int)tep_db_input($option['id']) ;
+ else
+ return false;
+
+ if(isset($option['catarray'])){
+ foreach($option['catarray'] as $k=>$v)
+ $_categories[$k]=(int)tep_db_input($v) ;
+
+ for ($i=0, $n=sizeof($_categories); $i<$n; $i++) {
+ $DB->query("DELETE FROM " . TABLE_CONTENT_TO_CATEGORIES . " WHERE content_id = '" . (int)$cms_id . "' AND categories_id = '" . (int)$product_categories[$i] . "'");
+ }
+ }
+ else {
+ $DB->query("delete from " . TABLE_CONTENT_TO_CATEGORIES . " where content_id = '" . (int)$cms_id . "'");
+ }
+
+
+ $product_categories_query = $DB->query("SELECT COUNT(*) AS total FROM " . TABLE_CONTENT_TO_CATEGORIES . " WHERE content_id = '" . (int)$cms_id . "'");
+ $product_categories = tep_db_fetch_array($product_categories_query);
+
+ if ($product_categories['total'] == '0') {
+
+ self::$modules->delete($ID);
+
+ // childs tables
+ $DB->query("delete from " . TABLE_CONTENT_DESCRIPTION . " where content_id = '" . (int)$cms_id . "'");
+
+ // master table
+ $DB->query("delete from " . TABLE_CONTENT . " where content_id = '" . (int)$cms_id . "'");
+
+ return true;
+ }
+ else
+ return false;
+
+ return false;
+ }
+
+
+ /**
+ @brief
+ @return array product empty
+ */
+ public static function Specimen(){
+
+ $list_languages=tep_get_languages();
+
+ $par = array('content_id' => '',
+ 'content_name' => '',
+ 'date_added' => '',
+ 'last_modified' => '',
+ 'content_status' => '',
+ 'categories' => array(),
+ );
+
+ for ($i=0, $n=sizeof($list_languages); $i<$n; $i++) {
+ $par['text'][$list_languages[$i]['id']] = '';
+ $par['title'][$list_languages[$i]['id']] = '';
+ }
+
+ return self::CleanKey($par);
+ }
+
+
+ /**
+ @brief copy in duplicate or link
+ @param $option array
+ type => string duplicate/link
+ @return
+ */
+ public static function copyto($option){
+
+
+ if(isset($option['id']))
+ $pid = (int) $option['id'];
+ else
+ return false;
+
+ if(isset($option['catid']))
+ $catid = (int) $option['catid'];
+ else
+ return false;
+
+
+ $type=(isset($option['type']))? $option['type'] : 'duplicate' ; // type duplicate | link
+// $pid = (isset($option['id'])) ? : ;
+
+ self::getInstance();
+ $DB=Database::getInstance();
+
+
+
+ switch($type){
+ case 'link':
+ $check_query = $DB->query("select count(*) as total from " . TABLE_PRODUCTS_TO_CATEGORIES . " where products_id = '" . $pid . "' and categories_id = '" . $catid . "'");
+ $check = $check_query->fetchAssoc();
+ if ($check['total'] < '1') {
+ $DB->query("insert into " . TABLE_PRODUCTS_TO_CATEGORIES . " (products_id, categories_id) values ('" . $pid . "', '" . $catid . "')");
+ }
+
+ $products_id = $pid;
+ break;
+
+ case 'duplicate':
+ default:
+
+ $product_query = $DB->query("select products_type, products_quantity, products_model, products_image, products_price, products_date_available, products_weight, products_tax_class_id, manufacturers_id from " . TABLE_PRODUCTS . " where products_id = '" . $pid . "'");
+ $product = $product_query->fetchAssoc();
+
+ $resobj=$DB->query("insert into " . TABLE_PRODUCTS . " (products_type, products_quantity, products_model,products_image, products_price, products_date_added, products_date_available, products_weight, products_status, products_tax_class_id, manufacturers_id) values ('" . tep_db_input($product['products_type']) . "','" . tep_db_input($product['products_quantity']) . "', '" . tep_db_input($product['products_model']) . "', '" . tep_db_input($product['products_image']) . "', '" . tep_db_input($product['products_price']) . "', now(), " . (empty($product['products_date_available']) ? "null" : "'" . tep_db_input($product['products_date_available']) . "'") . ", '" . tep_db_input($product['products_weight']) . "', '0', '" . (int)$product['products_tax_class_id'] . "', '" . (int)$product['manufacturers_id'] . "')");
+
+ $dup_products_id = tep_db_insert_id($resobj);
+
+
+ $description_query = $DB->query("select language_id, products_name, products_description, products_url from " . TABLE_PRODUCTS_DESCRIPTION . " where products_id = '" . $pid . "'");
+ while ($description =$description_query->fetchAssoc()) {
+ $DB->query("insert into " . TABLE_PRODUCTS_DESCRIPTION . " (products_id, language_id, products_name, products_description, products_url, products_viewed) values ('" . (int)$dup_products_id . "', '" . (int)$description['language_id'] . "', '" . tep_db_input($description['products_name']) . "', '" . tep_db_input($description['products_description']) . "', '" . tep_db_input($description['products_url']) . "', '0')");
+ }
+
+ $DB->query("insert into " . TABLE_PRODUCTS_TO_CATEGORIES . " (products_id, categories_id) values ('" . (int)$dup_products_id . "', '" . $catid . "')");
+
+ // BOF Separate Pricing Per Customer
+ $cg_price_query = $DB->query("select customers_group_id, customers_group_price from " . TABLE_PRODUCTS_GROUPS . " where products_id = '" . $pid . "' order by customers_group_id");
+
+ // insert customer group prices in table products_groups when there are any for the copied product
+ if ($cg_price_query->__get('numRows') > 0) {
+ while ( $cg_prices = $cg_price_query->fetchAssoc()) {
+ $DB->query("insert into " . TABLE_PRODUCTS_GROUPS . " (customers_group_id, customers_group_price, products_id) values ('" . (int)$cg_prices['customers_group_id'] . "', '" . tep_db_input($cg_prices['customers_group_price']) . "', '" . (int)$dup_products_id . "')");
+ }
+ }
+
+ // ACA START DUPLICATE PRODUCT
+ self::$modules->duplicate_product($products_id,$dup_products_id);
+
+
+ $products_id = $dup_products_id;
+
+
+ }
+
+
+ return $products_id;
+
+ }
+
+
+
+ /**
+ @fn MaintenanceTables()
+ @brief clean and maintient link table and data
+ */
+ public static function Maintenance(){
+ self::UpdateOrphelin();
+ }
+
+
+
+
+ /**
+ @fn UpdateOrphelin()
+ @brief call method for update in cat , the content in not category
+ */
+ private static function UpdateOrphelin(){
+ $DB=Database::getInstance();
+ $content_query = $DB->query("SELECT p.content_id FROM " . TABLE_CONTENT . " p LEFT OUTER JOIN " . TABLE_CONTENT_TO_CATEGORIES . " p2c ON p.content_id =p2c.content_id WHERE p2c.content_id is null");
+ while ($content = tep_db_fetch_array($content_query))
+ $DB->query("insert into " . TABLE_CONTENT_TO_CATEGORIES . " (content_id, categories_id) values ('" . (int)$content['content_id'] . "', '".ORPHELIN_COLLECTOR."')");
+ }
+
+
+
+ /**
+ @fn CleanKey()
+ @brief Clean string name key
+ */
+ private static function CleanKey($array){
+
+ $object= new stdclass();
+
+ foreach($array as $key=>$value){
+// if( strpos($key,'products_') ===0)
+// $key=substr($key,9);
+// elseif(strpos($key,'_function') >0)
+// $key=str_replace('_function','',$key);
+// elseif(strpos($key,'date_') ===0)
+// $key=str_replace('date_','',$key);
+// elseif(strpos($key,'last_') ===0)
+// $key=str_replace('last_','',$key);
+
+
+ $object->$key = $value;
+ }
+
+ return $object;
+ }
+
+}
+
+
+?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/classes/drivers/sqlproduct.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlproduct.php 2011-09-28 15:32:44 UTC (rev 3819)
+++ trunk/catalog/admin/includes/classes/drivers/sqlproduct.php 2011-10-02 08:26:02 UTC (rev 3820)
@@ -120,17 +120,12 @@
/// Clean link product to categorie and save new link
- $DB->query("delete from " . TABLE_PRODUCTS_TO_CATEGORIES . " where products_id='" . (int)$products_id . "' ");
+ if(isset($option['cPath']) && count($post['categories']) == 0)
+ $post['categories'][] = $option['cPath'];
- if(!isset($post['categories']) || !is_array($post['categories']))
- $DB->query("insert into " . TABLE_PRODUCTS_TO_CATEGORIES . " (products_id, categories_id) values ('" . (int)$products_id . "', '1')");
- else
- foreach($post['categories'] as $value)
- $DB->query("insert into " . TABLE_PRODUCTS_TO_CATEGORIES . " (products_id, categories_id) values ('" . (int)$products_id . "', '" . (int)$value. "')");
+ sqlcategorie::DataInCat('products', $products_id, $post['categories']);
-
-
/// Separate Pricing Per Customer
$customers_group_query = $DB->query("select customers_group_id, customers_group_name from " . TABLE_CUSTOMERS_GROUPS . " where customers_group_id != '0' order by customers_group_id");
// Gets all of the customers groups
@@ -301,6 +296,9 @@
$product_categories = tep_db_fetch_array($product_categories_query);
if ($product_categories['total'] == '0') {
+
+ self::$modules->delete($ID);
+
$res=tep_remove_product($product_id);
}
Modified: trunk/catalog/admin/includes/functions/general.php
===================================================================
--- trunk/catalog/admin/includes/functions/general.php 2011-09-28 15:32:44 UTC (rev 3819)
+++ trunk/catalog/admin/includes/functions/general.php 2011-10-02 08:26:02 UTC (rev 3820)
@@ -625,21 +625,7 @@
}
-/**
- @package oscss-2 <www http://www.oscss.org>
- @version 1
- @date 11/03/10, 11:02
- @author oscim <mail os...@os...> <www http://www.oscim.fr>
- Suppression des cms
-*/
-function tep_remove_cms($cms_id){
- tep_db_query("delete from " . TABLE_CONTENT . " where content_id = '" . (int)$cms_id . "'");
- tep_db_query("delete from " . TABLE_CONTENT_DESCRIPTION . " where content_id = '" . (int)$cms_id . "'");
- tep_db_query("delete from " . TABLE_CONTENT_TO_CATEGORIES . " where content_id = '" . (int)$cms_id . "'");
-// osCSS_Cache::clear('cms_list');
-}
-
/**
suppression de commandes
@package oscss-major
Deleted: trunk/catalog/admin/includes/functions/lib.categories.php
===================================================================
--- trunk/catalog/admin/includes/functions/lib.categories.php 2011-09-28 15:32:44 UTC (rev 3819)
+++ trunk/catalog/admin/includes/functions/lib.categories.php 2011-10-02 08:26:02 UTC (rev 3820)
@@ -1,149 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 19/12/10, 19:46
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-
-/**
- @version 1.1
- @note Construit la sortie du chemin (fil arine ) de la catégory sous forme texte
-*/
-function tep_output_generated_category_path($id, $from = 'category') {
- $calculated_category_path_string = 'racine > ';
- $calculated_category_path = tep_generate_category_path($id, $from);
- for ($i=0, $n=sizeof($calculated_category_path); $i<$n; $i++) {
- for ($j=0, $k=sizeof($calculated_category_path[$i]); $j<$k; $j++) {
- $calculated_category_path_string .= $calculated_category_path[$i][$j]['text'] . ' > ';
- }
- $calculated_category_path_string = substr($calculated_category_path_string, 0, -16) ;
- }
-// $calculated_category_path_string = substr($calculated_category_path_string, 0, -4);
-
- if (strlen($calculated_category_path_string) < 1) $calculated_category_path_string = TEXT_TOP;
-
- return $calculated_category_path_string;
-}
-
-
-
-
-/**
- @version 1.1
- @note
-*/
-function tep_remove_category($category_id) {
- $category_image_query = tep_db_query("select categories_image from " . TABLE_CATEGORIES . " where categories_id = '" . (int)$category_id . "'");
- $category_image = tep_db_fetch_array($category_image_query);
-
- $duplicate_image_query = tep_db_query("select count(*) as total from " . TABLE_CATEGORIES . " where categories_image = '" . tep_db_input($category_image['categories_image']) . "'");
- $duplicate_image = tep_db_fetch_array($duplicate_image_query);
-
- if ($duplicate_image['total'] < 2) {
- if (file_exists(DIR_FS_CATALOG_IMAGES . $category_image['categories_image'])) {
- @unlink(DIR_FS_CATALOG_IMAGES . $category_image['categories_image']);
- }
- }
-
- tep_db_query("delete from " . TABLE_CATEGORIES . " where categories_id = '" . (int)$category_id . "'");
- tep_db_query("delete from " . TABLE_CATEGORIES_DESCRIPTION . " where categories_id = '" . (int)$category_id . "'");
-
- osCSS_Cache::clear('categoriesBox');
- osCSS_Cache::clear('category_tree');
- osCSS_Cache::clear('also_purchased');
-}
-
-/**
- @version 1.1
- @note Return l'id de
-*/
-function tep_get_path($current_category_id = '') {
- global $cPath_array;
-
- if ($current_category_id == '') {
- $cPath_new = implode('_', $cPath_array);
- } else {
- if (sizeof($cPath_array) == 0) {
- $cPath_new = $current_category_id;
- } else {
- $cPath_new = '';
- $last_category_query = tep_db_query("select parent_id from " . TABLE_CATEGORIES . " where categories_id = '" . (int)$cPath_array[(sizeof($cPath_array)-1)] . "'");
- $last_category = tep_db_fetch_array($last_category_query);
-
- $current_category_query = tep_db_query("select parent_id from " . TABLE_CATEGORIES . " where categories_id = '" . (int)$current_category_id . "'");
- $current_category = tep_db_fetch_array($current_category_query);
-
- if ($last_category['parent_id'] == $current_category['parent_id']) {
- for ($i = 0, $n = sizeof($cPath_array) - 1; $i < $n; $i++) {
- $cPath_new .= '_' . $cPath_array[$i];
- }
- } else {
- for ($i = 0, $n = sizeof($cPath_array); $i < $n; $i++) {
- $cPath_new .= '_' . $cPath_array[$i];
- }
- }
-
- $cPath_new .= '_' . $current_category_id;
-
- if (substr($cPath_new, 0, 1) == '_') {
- $cPath_new = substr($cPath_new, 1);
- }
- }
- }
-
- return 'cPath=' . $cPath_new;
-}
-
-
-
-/**
- @fn tep_products_in_category_count($categories_id, $include_deactivated = false)
- @brief Count how many products exist in a category
- @param $categories_id integer
- @param $include_deactivated boolean true = status products 1 | false status products null
- @return integer count child products in catg
-*/
-function tep_products_in_category_count($categories_id, $include_deactivated = false) {
- $products_count = 0;
-
- if ($include_deactivated) $products_query = tep_db_query("select count(*) as total from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c where p.products_id = p2c.products_id and p2c.categories_id = '" . (int)$categories_id . "'");
- else $products_query = tep_db_query("select count(*) as total from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c where p.products_id = p2c.products_id and p.products_status = '1' and p2c.categories_id = '" . (int)$categories_id . "'");
-
- $products = tep_db_fetch_array($products_query);
- $products_count += $products['total'];
- $childs_query = tep_db_query("select categories_id from " . TABLE_CATEGORIES . " where parent_id = '" . (int)$categories_id . "'");
- if (tep_db_num_rows($childs_query))
- while ($childs = tep_db_fetch_array($childs_query)) $products_count += tep_products_in_category_count($childs['categories_id'], $include_deactivated);
-
- return $products_count;
-}
-
-/**
- @fn tep_cms_in_category_count($categories_id, $include_deactivated = false)
- @brief Count how many cms exist in a category
- @param $categories_id integer
- @param $include_deactivated boolean true = status content 1 | false status content null
- @return integer count child content in catg
-*/
-function tep_cms_in_category_count($categories_id, $include_deactivated = false) {
- $products_count = 0;
-
- if ($include_deactivated) $products_query = tep_db_query("select count(*) as total from " . TABLE_CONTENT . " p, " . TABLE_CONTENT_TO_CATEGORIES . " p2c where p.content_id = p2c.content_id and p2c.categories_id = '" . (int)$categories_id . "'");
- else $products_query = tep_db_query("select count(*) as total from " . TABLE_CONTENT . " p, " . TABLE_CONTENT_TO_CATEGORIES . " p2c where p.content_id = p2c.content_id and p.content_status = '1' and p2c.categories_id = '" . (int)$categories_id . "'");
-
- $products = tep_db_fetch_array($products_query);
- $products_count += $products['total'];
- $childs_query = tep_db_query("select categories_id from " . TABLE_CATEGORIES . " where parent_id = '" . (int)$categories_id . "'");
- if (tep_db_num_rows($childs_query))
- while ($childs = tep_db_fetch_array($childs_query)) $products_count += tep_cms_in_category_count($childs['categories_id'], $include_deactivated);
-
- return $products_count;
-}
-
-
-
-?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/gabarit/cms_content/display_view.inline.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/cms_content/display_view.inline.gab 2011-09-28 15:32:44 UTC (rev 3819)
+++ trunk/catalog/admin/includes/gabarit/cms_content/display_view.inline.gab 2011-10-02 08:26:02 UTC (rev 3820)
@@ -1,9 +1,10 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.0.9
- @date 22/06/10, 18:12
+ @version 2.1.1
+ @date 01/10/11, 11:31
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -13,9 +14,9 @@
<td>
<div>
<ul>
- <li><?php echo __('txt info permalink').tep_catalog_href_link('content.php','content=' . cms_content::$cInfo->content_id ) ?></li>
- <li><?php echo __('text info date added').tep_date_short( cms_content::$cInfo->date_added) ?></li>
- <li><?php echo __('text info last modified').tep_date_short( cms_content::$cInfo->last_modified) ?></li>
+ <li><strong><?php echo __('txt info permalink'); ?> </strong><?php echo tep_catalog_href_link('content.php','content=' . cms_content::$cInfo->content_id, 'NONSSL' , false) ?></li>
+ <li><strong><?php echo __('text info date added'); ?> </strong><?php echo tep_date_short( cms_content::$cInfo->date_added) ?></li>
+ <li><strong><?php echo __('text info last modified'); ?> </strong><?php echo tep_date_short( cms_content::$cInfo->last_modified) ?></li>
<?php foreach(cms_content::$languages as $lg ): ?>
<li><?php echo tep_image(DIR_WS_CATALOG_LANGUAGES . $lg['directory'] . '/images/' . $lg['image'], $lg['name']) .' '. __('text info content size') . ' ' . (isset( cms_content::$cInfo->content_text_size[$lg['id']])? cms_content::$cInfo->content_text_size[$i]:0) . ' '.__('bytes') ?></li>
<?php endforeach; ?>
Modified: trunk/catalog/admin/includes/gabarit/cms_content/display_view.listing.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/cms_content/display_view.listing.gab 2011-09-28 15:32:44 UTC (rev 3819)
+++ trunk/catalog/admin/includes/gabarit/cms_content/display_view.listing.gab 2011-10-02 08:26:02 UTC (rev 3820)
@@ -1,10 +1,10 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 14/11/10, 15:25
+ @version 2.1.1
+ @date 01/10/11, 11:27
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -41,8 +41,8 @@
<td style="width:25%" class="tcenter"><?php echo tep_draw_input_field('content_title','content_title',__('table heading c title'),'style="width:100%" class="search_init"'); ?></td>
<td style="width:12%" class="tcenter w_50"><?php echo tep_draw_input_field('categories_name','categories_name',__('table heading categories'),'style="width:100%" class="search_init"'); ?></td>
<td style="width:3%" class="tleft"><?php echo tep_draw_input_field('date_added','date_added',__('table heading date added'),'style="width:100%" class="search_init"'); ?></td>
- <td class="tcenter row_status"><?php echo tep_draw_input_field('content_status','content_status',__('table heading status'),'style="width:100%" class="search_init"'); ?></td>
- <td class="tcenter row_status"><?php echo tep_draw_input_field('content_hidden','content_hidden',__('table heading view status'),'style="width:100%" class="search_init"'); ?></td>
+ <td class="tcenter row_status" style="width:2%"><?php echo tep_draw_input_field('content_status','content_status',__('table heading status'),'style="width:100%" class="search_init"'); ?></td>
+ <td class="tcenter row_status" style="width:2%"><?php echo tep_draw_input_field('content_hidden','content_hidden',__('table heading view status'),'style="width:100%" class="search_init"'); ?></td>
<td class="tcenter row_action"> </td>
</tr>
</tfoot>
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/pages/cms_content.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/pages/cms_content.txt 2011-09-28 15:32:44 UTC (rev 3819)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/cms_content.txt 2011-10-02 08:26:02 UTC (rev 3820)
@@ -11,7 +11,7 @@
$lang['heading title']="Gestion du contenu" ;
$lang['heading title edit']="Édition d'une page" ;
$lang['table heading id']="ID" ;
-$lang['table heading listings']="Contenu" ;
+$lang['table heading listings']="Clef" ;
$lang['table heading date added']="Crée(s)" ;
$lang['table heading categories']="Catégorie" ;
$lang['table heading c title']="Titre" ;
Modified: trunk/catalog/admin/includes/modules/pages/categories.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/categories.php 2011-09-28 15:32:44 UTC (rev 3819)
+++ trunk/catalog/admin/includes/modules/pages/categories.php 2011-10-02 08:26:02 UTC (rev 3820)
@@ -4,14 +4,14 @@
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 13/09/11, 17:42
+ @date 02/10/11, 09:44
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@brief manage category and module aca for cat
*/
+error_reporting(E_ALL);
-
/**
@class categories
@brief master class edit and manage cat
@@ -310,9 +310,12 @@
if(isset($_POST['delete_childs_in_cat']) && $_POST['delete_childs_in_cat']=='on') {
for ($i=0, $n=sizeof($categories); $i<$n; $i++) {
- tep_remove_category($categories[$i]['id']);
+// tep_remove_category($categories[$i]['id']);
+
+ sqlcategorie::delete(array('id'=>$categories[$i]['id']));
+
// ACA START DELETE CATEGORY
- self::$modules->delete_category ($categories[$i]['id']);
+// self::$modules->delete_category($categories[$i]['id']);
}
}
@@ -327,14 +330,15 @@
/* Suppression des cms de la cat */
if(isset($_POST['delete_cms_in_cat']) && $_POST['delete_cms_in_cat']=='on') {
reset($contents_delete);
- while (list($key) = each($contents_delete)) {
- tep_remove_cms($key);
- }
+ foreach($contents_delete as $key)
+ sqlcontent::delete(array('id'=>$key));
}
}
- tep_remove_category($categories_id);
+// tep_remove_category($categories_id);
+ sqlcategorie::delete(array('id'=>$categories_id));
+
osCSS_Cache::clear('categoriesBox');
osCSS_Cache::clear('category_tree');
osCSS_Cache::clear('also_purchased');
@@ -368,8 +372,8 @@
$check_query = tep_db_query("select * from " . TABLE_CATEGORIES . " c where c.categories_id = '" . (int)$_GET['cID'] . "' ");
$categories = tep_db_fetch_array($check_query);
- $category_products = array( 'products_count' => tep_products_in_category_count($_GET['cID'] ),
- 'cms_count' => tep_cms_in_category_count($_GET['cID'] )
+ $category_products = array( 'products_count' => categorieUtility::products_in_category_count($_GET['cID'] ),
+ 'cms_count' => categorieUtility::cms_in_category_count($_GET['cID'] )
);
$cInfo_array = array_merge($categories, $category_products);
@@ -419,10 +423,10 @@
global $languages_id;
$DB=Database::getInstance();
$check_q = $DB->query("select * from " . TABLE_CATEGORIES_DESCRIPTION . " cd where categories_id = '" .(int) $ID . "' and language_id='".(int)$languages_id."' ");
- $category_child = array( 'products_count' => tep_products_in_category_count($ID),
- 'cms_count' => tep_cms_in_category_count($ID),
- 'childs_count'=>tep_childs_in_category_count($ID),
- 'cPath'=>tep_get_generated_category_path_ids($ID)
+ $category_child = array( 'products_count' => categorieUtility::products_in_category_count($ID),
+ 'cms_count' => categorieUtility::cms_in_category_count($ID),
+ 'childs_count'=>categorieUtility::childs_in_category_count($ID),
+ 'cPath'=>categorieUtility::get_generated_category_path_ids($ID)
);
return new objectInfo(array_merge($check_q->fetchAssoc(),$category_child));
}
Modified: trunk/catalog/admin/includes/modules/pages/cms_content.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/cms_content.php 2011-09-28 15:32:44 UTC (rev 3819)
+++ trunk/catalog/admin/includes/modules/pages/cms_content.php 2011-10-02 08:26:02 UTC (rev 3820)
@@ -3,8 +3,8 @@
@licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 04/07/11, 08:55
+ @version 2.1.1
+ @date 02/10/11, 09:40
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@brief multiple class for content
@@ -128,81 +128,44 @@
case 'insert':
case 'update':
- $content_name = tep_db_prepare_input($_POST['content_name']);
- $content_text = tep_db_prepare_input($_POST['content_text']);
- $content_title = tep_db_prepare_input($_POST['content_title']);
- $current_category_id=(isset($_POST['cPath'])) ? tep_db_prepare_input($_POST['cPath']) : 0;
- $sql_data_array = array('content_name' => tep_db_prepare_input($content_name),
- 'content_status' => tep_db_prepare_input($_POST['content_status']));
+ if (isset($_GET['cID'])) $content_id = tep_db_prepare_input($_GET['cID']);
- if (self::$action == 'insert') {
- $insert_sql_data = array('date_added' => 'now()');
- $sql_data_array = array_merge($sql_data_array, $insert_sql_data);
+ $params['sqlarray'] = array('content_name' => tep_db_prepare_input($_POST['content_name']),
+ 'content_status' => tep_db_prepare_input($_POST['content_status']),
+ );
- self::$modules->load_post_values($_POST);
- $sql_data_array = array_merge($sql_data_array, self::$modules->get_insert_table_content ());
- $resobj=tep_db_perform(TABLE_CONTENT, $sql_data_array);
+ $params['id']=$content_id;
+ $params['action']=self::$action;
+ $params['post']=$_POST;
+ $params['language_id']= $languages_id;
+ $params['cPath']=(isset($_POST['cPath'])) ? tep_db_prepare_input($_POST['cPath']) : 0;
- $content_id =$resobj->__get('insertId');
+ sqlcontent::update($params);
- } elseif (self::$action == 'update') {
- $content_id = tep_db_prepare_input($_GET['cID']);
-
- $update_sql_data = array('last_modified' => 'now()');
- $sql_data_array = array_merge($sql_data_array, $update_sql_data);
-
- self::$modules->load_post_values($_POST);
- $sql_data_array = array_merge($sql_data_array, self::$modules->get_update_table_content ());
-
-
- tep_db_perform(TABLE_CONTENT, $sql_data_array, 'update', "content_id = '" . (int)$content_id . "'");
- }
-
- $DB->query("delete from " . TABLE_CONTENT_TO_CATEGORIES . " where content_id='" . (int)$content_id . "' ");
- if(!isset($_POST['categories']) || !is_array($_POST['categories']))
- $DB->query($sql="insert into " . TABLE_CONTENT_TO_CATEGORIES . " (content_id, categories_id) values ('" . (int)$content_id . "', '1')");
- else
- foreach($_POST['categories'] as $value)
- $DB->query($sql="insert into " . TABLE_CONTENT_TO_CATEGORIES . " (content_id, categories_id) values ('" . (int)$content_id . "', '" . (int)$value. "')");
-
-
- for ($i=0, $n=sizeof(self::$languages); $i<$n; $i++) {
-
- $language_id = self::$languages[$i]['id'];
- $sql_data_array = array('content_text' => tep_db_prepare_input($content_text[$language_id]),
- 'content_title' => str_replace('&','&',tep_db_prepare_input($content_title[$language_id])));
-
- if (self::$action == 'insert') {
- $insert_sql_data = array('content_id' => $content_id, 'language_id' => $language_id);
- $sql_data_array = array_merge($sql_data_array, $insert_sql_data);
-
- $sql_data_array = array_merge($sql_data_array, self::$modules->get_insert_table_content_description ($language_id));
-
- tep_db_perform(TABLE_CONTENT_DESCRIPTION, $sql_data_array);
-
- } elseif (self::$action == 'update') {
- $sql_data_array = array_merge($sql_data_array, self::$modules->get_update_table_content_description ($language_id));
-
- tep_db_perform(TABLE_CONTENT_DESCRIPTION, $sql_data_array, 'update', "content_id = '" . (int)$content_id . "' and language_id = '" . (int)$language_id . "'");
- }
- }
-
- self::$modules->after_update ($content_id);
-
if(isset($_POST['up_and_close']) ) tep_redirect(tep_href_link(self::FILENAME, tep_get_all_get_params(array( 'cID','flag','action'),false)) );
else tep_redirect(tep_href_link(self::FILENAME, 'page=' . $_GET['page'] . '&cID=' . $content_id.'&action=edit'));
break;
+ /**
+ @remarks Delete post
+ */
case 'deleteconfirm':
- $content_id = tep_db_prepare_input($_GET['cID']);
- tep_remove_cms($content_id);
+ $content_id = tep_db_prepare_input((int)$_GET['cID']);
+
+ if( !sqlcontent::delete(array('id'=>$content_id)) )
+ $messageStack->add_session(sprintf(__('error delet for post id %s'), $content_id ), 'error');
+ else
+ $messageStack->add_session(sprintf(__('delete post id %s success'), $content_id ), 'success');
+
tep_redirect(tep_href_link(self::FILENAME, tep_get_all_get_params(array( 'cID','flag','action'),false)));
break;
+
+
/**
POST AFFICHAGE
*/
@@ -211,15 +174,16 @@
self::load_db_values($_GET['cID']);
+ /// Load wysiwyg
$oscss->_add_ext(BO_WISIWYG_SELECTED,'editeur/');
- for ($i=0, $n=sizeof(self::$languages); $i<$n; $i++) {
+ for ($i=0, $n=sizeof(self::$languages); $i<$n; $i++)
echo $oscss->_call(BO_WISIWYG_SELECTED,'_top','content_text[' . self::$languages[$i]['id'] . ']','600','400');
- }
+
break;
default:
//! Entretient liens avec categorie
- self::UpdateOrphelin();
+ sqlcontent::Maintenance();
}
@@ -227,8 +191,11 @@
return self::$action;
}
+ /**
+ */
public function get_header(){
- if (self::$action == 'new' || self::$action == 'edit') self::$modules->get_header_js(self::$action);
+ if (self::$action == 'new' || self::$action == 'edit')
+ self::$modules->get_header_js(self::$action);
}
@@ -243,46 +210,24 @@
global $language_id;
$DB=Database::getInstance();
- $cID = tep_db_prepare_input($ID);
+ $cID = tep_db_prepare_input((int)$ID);
- if(in_array(self::$action ,array('edit' ,'delete', 'detail') ) ){
- $content_query = $DB->query("select c.content_id, content_name, date_added, last_modified, content_status from " . TABLE_CONTENT . " c where c.content_id = '" . (int)$cID . "' ");
- $cInfo_array = tep_db_fetch_array($content_query);
- tep_db_free_result($content_query);
+ if(in_array(self::$action ,array('edit' ,'delete', 'detail') ) )
+ $cInfo_array=sqlcontent::fetch(array('id'=>$cID,'language_id'=>$language_id));
+ elseif(self::$action == 'new')
+ $cInfo_array = sqlcontent::Specimen();
- for ($i=0, $n=sizeof(self::$languages); $i<$n; $i++) {
- $language_id = self::$languages[$i]['id'];
- $content_query = $DB->query("select cd.content_text, cd.content_title from " . TABLE_CONTENT . " c, " . TABLE_CONTENT_DESCRIPTION . " cd where c.content_id = '" . (int)$cID . "' and c.content_id = cd.content_id and language_id='" . $language_id . "'");
- $content = tep_db_fetch_array($content_query);
- $cInfo_array['text'][$language_id] = $content['content_text'];
- $cInfo_array['title'][$language_id] = $content['content_title'];
- tep_db_free_result($content_query);
- }
- $cat_query = $DB->query("select categories_id from " . TABLE_CONTENT_TO_CATEGORIES . " where content_id='" . (int)$cID . "' ");
- while($cat_l = tep_db_fetch_array($cat_query)){ $cat_list[$cat_l['categories_id']]=$cat_l; }
- $cInfo_array['categories']=$cat_list;
- tep_db_free_result($cat_query);
+ self::$cInfo = new objectInfo($cInfo_array);
- } elseif(self::$action == 'new') {
- $cInfo_array = array('content_id' => '', 'content_name' => '', 'date_added' => '', 'last_modified' => '', 'content_status' => '1', 'categories'=>array());
- for ($i=0, $n=sizeof(self::$languages); $i<$n; $i++) {
- $cInfo_array['text'][self::$languages[$i]['id']] = '';
- $cInfo_array['title'][self::$languages[$i]['id']] = '';
- }
- }
- self::$cInfo = new objectInfo($cInfo_array);
+ if (!isset(self::$cInfo->content_status)) self::$cInfo->content_status = '1';
+ switch (self::$cInfo->content_status) {
+ case '0': self::$enabled_status = false; self::$disabled_status = true; break;
+ case '1':
+ default: self::$enabled_status = true; self::$disabled_status = false;
+ }
- if (!isset(self::$cInfo->content_status)) self::$cInfo->content_status = '1';
- switch (self::$cInfo->content_status) {
- case '0': self::$enabled_status = false; self::$disabled_status = true; break;
- case '1':
- default: self::$enabled_status = true; self::$disabled_status = false;
- }
- // ACA START LOAD VALUES FROM DB
- self::$modules->load_db_values ($ID);
-
return self::$cInfo;
}
@@ -454,18 +399,7 @@
}
- /**
- @fn UpdateOrphelin()
- @brief call method for update in cat , the content in not category
- */
- private static function UpdateOrphelin(){
- $DB=Database::getInstance();
- $content_query = $DB->query("SELECT p.content_id FROM " . TABLE_CONTENT . " p LEFT OUTER JOIN " . TABLE_CONTENT_TO_CATEGORIES . " p2c ON p.content_id =p2c.content_id WHERE p2c.content_id is null");
- while ($content = tep_db_fetch_array($content_query))
- $DB->query("insert into " . TABLE_CONTENT_TO_CATEGORIES . " (content_id, categories_id) values ('" . (int)$content['content_id'] . "', '".ORPHELIN_COLLECTOR."')");
- }
-
/** Interface module */
function check() { return false; }
Modified: trunk/catalog/admin/includes/template/oscss/stylesheet-1.css
===================================================================
--- trunk/catalog/admin/includes/template/oscss/stylesheet-1.css 2011-09-28 15:32:44 UTC (rev 3819)
+++ trunk/catalog/admin/includes/template/oscss/stylesheet-1.css 2011-10-02 08:26:02 UTC (rev 3820)
@@ -293,7 +293,7 @@
.dataTable tr{border:1px solid transparent;cursor:default}
.dataTableBase th,
.dataTableSearch th,
- .dataTable th{ background-color: #303030; font-size:1em; font-weight:bold; text-align:center; color:white }
+ .dataTable th{ background-color: #303030; font-size:1em; font-weight:bold; text-align:center; color:white;text-shadow:none; }
.dataTableBase tr td,
.dataTableSearch tr td,
.dataTable tr td{ color: #000000;padding: 2px; font-size: 10px;cursor:default;text-shadow:0 1px 0 #fff;}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
