Menu
▾
▴
oscss-commit — SVN Commit Notifications
You can subscribe to this list here.
| 2011 |
Jan
|
Feb
|
Mar
(4) |
Apr
(57) |
May
(31) |
Jun
(21) |
Jul
(11) |
Aug
(23) |
Sep
(22) |
Oct
(36) |
Nov
(62) |
Dec
(85) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2012 |
Jan
(24) |
Feb
(24) |
Mar
(65) |
Apr
(232) |
May
(118) |
Jun
(22) |
Jul
(54) |
Aug
(57) |
Sep
(14) |
Oct
(27) |
Nov
(16) |
Dec
(19) |
| 2013 |
Jan
(16) |
Feb
(12) |
Mar
(3) |
Apr
(17) |
May
(2) |
Jun
(30) |
Jul
(33) |
Aug
(19) |
Sep
(35) |
Oct
(58) |
Nov
(27) |
Dec
(64) |
| 2014 |
Jan
(102) |
Feb
(80) |
Mar
(15) |
Apr
(4) |
May
(3) |
Jun
(3) |
Jul
(5) |
Aug
(11) |
Sep
(15) |
Oct
|
Nov
(3) |
Dec
(5) |
| 2015 |
Jan
(5) |
Feb
(4) |
Mar
(2) |
Apr
(11) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(9) |
Nov
(10) |
Dec
|
| 2016 |
Jan
(3) |
Feb
(2) |
Mar
(18) |
Apr
(13) |
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
(4) |
Oct
|
Nov
|
Dec
|
|
From: <os...@us...> - 2012-04-21 16:32:06
|
Revision: 4295
http://oscss.svn.sourceforge.net/oscss/?rev=4295&view=rev
Author: oscim
Date: 2012-04-21 16:31:40 +0000 (Sat, 21 Apr 2012)
Log Message:
-----------
Mise a niveau de l'installateur du modele datatype et ajout elment de langue manquant
Modified Paths:
--------------
trunk/dev/GenerCode/datatype/Modele/install.xml
Added Paths:
-----------
trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/languages/fr_FR/modules/_DATATYPE_REPLACE_/_DATATYPE_REPLACE_SEOTAG_criteres.txt
Added: trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/languages/fr_FR/modules/_DATATYPE_REPLACE_/_DATATYPE_REPLACE_SEOTAG_criteres.txt
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/languages/fr_FR/modules/_DATATYPE_REPLACE_/_DATATYPE_REPLACE_SEOTAG_criteres.txt (rev 0)
+++ trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/languages/fr_FR/modules/_DATATYPE_REPLACE_/_DATATYPE_REPLACE_SEOTAG_criteres.txt 2012-04-21 16:31:40 UTC (rev 4295)
@@ -0,0 +1,17 @@
+<?php
+/**
+ @licence GPL 2005-_CURRENTYEAR_ The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version _CURRENTVERSION_
+ @date _CURRENTDATE_
+ @author genrated by GenerCode
+ @encode UTF-8
+ @sub-package _DATATYPE_REPLACE_SEOTAG_criteres
+*/
+$lang['acriteres title']="Critéres pour les _DATATYPE_REPLACE_ " ;
+$lang['acriteres description']="Ajoute la gestion des critéres de _DATATYPE_REPLACE_ par categories" ;
+$lang['acriteres tab']="Critéres" ;
+$lang['acriteres alert too many categories, only select one category to use this extension']="Pour activer les critéres sur ce _DATATYPE_REPLACE_, celui ci doit necessairement n'appartenir qu'a une seul categorie. Modifié vos categories et enregistrer vos modification afin d'acceder à ces options " ;
+$lang['category extra fields']="Ajuster les contenus des critéres" ;
+?>
\ No newline at end of file
Modified: trunk/dev/GenerCode/datatype/Modele/install.xml
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/install.xml 2012-04-21 16:24:40 UTC (rev 4294)
+++ trunk/dev/GenerCode/datatype/Modele/install.xml 2012-04-21 16:31:40 UTC (rev 4295)
@@ -25,7 +25,9 @@
<file name="admin/includes/gabarit/_DATATYPE_REPLACE_s/display_view.inline.gab" />
<file name="admin/includes/gabarit/_DATATYPE_REPLACE_s/display_view.listing.gab" />
<file name="admin/includes/gabarit/_DATATYPE_REPLACE_s/display_view.new.gab" />
+
<file name="admin/includes/gabarit/_DATATYPE_REPLACE_s/_DATATYPE_REPLACE_SEOTAG__description/display_edit.edit.gab" />
+ <file name="admin/includes/gabarit/_DATATYPE_REPLACE_s/_DATATYPE_REPLACE_SEOTAG__criteres/display_edit.edit.gab" />
<!-- extra config -->
<file name="admin/includes/gabarit/configuration/mod_DATATYPE_REPLACE_extra/draw.delete.gab" />
<file name="admin/includes/gabarit/configuration/mod_DATATYPE_REPLACE_extra/draw.label.edit.gab" />
@@ -36,6 +38,7 @@
<file name="admin/includes/gabarit/configuration/mod_DATATYPE_REPLACE_extra/draw.value.edit.gab" />
<file name="admin/includes/gabarit/configuration/mod_DATATYPE_REPLACE_extra/draw.value.new.gab" />
+
<!-- datatype -->
<file name="common/classes/datatype_drivers/Data__DATATYPE_REPLACE_.php" />
@@ -47,6 +50,7 @@
<!-- Module -->
<file name="includes/modules/_DATATYPE_REPLACE_/_DATATYPE_REPLACE_SEOTAG__description.php" />
+ <file name="includes/modules/_DATATYPE_REPLACE_/_DATATYPE_REPLACE_SEOTAG__criteres.php" />
<file name="includes/modules/account/ac__DATATYPE_REPLACE_.php" />
<!-- template -->
@@ -65,8 +69,8 @@
<file name="admin/includes/languages/%LANGUAGE%/modules/pages/_DATATYPE_REPLACE_s.txt" lgref="fr_FR"/>
<file name="admin/includes/languages/%LANGUAGE%/modules/_DATATYPE_REPLACE_/_DATATYPE_REPLACE_SEOTAG__description.txt" lgref="fr_FR"/>
+ <file name="admin/includes/languages/%LANGUAGE%/modules/_DATATYPE_REPLACE_/_DATATYPE_REPLACE_SEOTAG__criteres.txt" lgref="fr_FR"/>
-
<file name="includes/languages/%LANGUAGE%/modules/_DATATYPE_REPLACE_/_DATATYPE_REPLACE_SEOTAG__description.txt" lgref="fr_FR"/>
<file name="includes/languages/%LANGUAGE%/modules/account/ac__DATATYPE_REPLACE_.txt" lgref="fr_FR"/>
</addfilelg>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-21 16:24:47
|
Revision: 4294
http://oscss.svn.sourceforge.net/oscss/?rev=4294&view=rev
Author: oscim
Date: 2012-04-21 16:24:40 +0000 (Sat, 21 Apr 2012)
Log Message:
-----------
Correction des extra complexe (product / datatype)
gabarit et module de configuration
liens bugg?\195?\169 , incoherance du mode de gestion mon/multilangue dans la gestion des valeurs
Modified Paths:
--------------
trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.edit.gab
trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.new.gab
trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.value.delete.gab
trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.value.edit.gab
trunk/catalog/admin/includes/modules/configuration/modprodextra.php
trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/gabarit/configuration/mod_DATATYPE_REPLACE_extra/draw.label.edit.gab
trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/gabarit/configuration/mod_DATATYPE_REPLACE_extra/draw.label.new.gab
trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/gabarit/configuration/mod_DATATYPE_REPLACE_extra/draw.value.delete.gab
trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/gabarit/configuration/mod_DATATYPE_REPLACE_extra/draw.value.edit.gab
trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/gabarit/configuration/mod_DATATYPE_REPLACE_extra/draw.value.listing.gab
trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/modules/configuration/mod_DATATYPE_REPLACE_extra.php
Modified: trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.edit.gab 2012-04-21 15:53:40 UTC (rev 4293)
+++ trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.edit.gab 2012-04-21 16:24:40 UTC (rev 4294)
@@ -14,7 +14,7 @@
?>
<div class="box_unique">
<h4><?php echo __('heading edit') ?></h4>
- <?php echo tep_draw_form('field_entry',FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','eid','confirm')). 'action=update' . '&confirm=yes&eid=' . modprodextra::$eid , 'post'); ?>
+ <?php echo tep_draw_form('field_entry',FILENAME_CONFIGURATION, FILENAME_CFG_34. '&action=update' . '&confirm=yes&eid=' . modprodextra::$eid , 'post'); ?>
<p>
@@ -54,14 +54,14 @@
<label for="search" title="<?php echo __('entry search help') ?>"><?php echo __('entry search'); ?></label>
<?php echo tep_draw_radio_field('search','search', '1', (((int)modprodextra::$cInfo->epf_advanced_search==1)? true : false) ). ' ' .__('text yes'). ' ' . tep_draw_radio_field('search','search', '0', (((int)modprodextra::$cInfo->epf_advanced_search==0)? true : false) ) . ' ' .__('text no'); ?>
</p>
- <p class="block_input">
+<!-- <p class="block_input">
<label><?php echo __('ENTRY_LISTING') ?></label>
<?php echo tep_draw_radio_field('listing','listing', '1', (((int)modprodextra::$cInfo->epf_show_in_listing==1)? true : false) ) . ' ' .__('text yes'). ' ' . tep_draw_radio_field('listing','listing', '0', (((int)modprodextra::$cInfo->epf_show_in_listing==0)? true : false) ) . ' ' .__('text no'); ?>
- </p>
- <p class="block_input">
+ </p>-->
+<!-- <p class="block_input">
<label><?php echo __('ENTRY_META') ?></label>
<?php echo tep_draw_radio_field('meta','meta', '1',(((int)modprodextra::$cInfo->epf_use_as_meta_keyword==1)? true : false) ) . ' ' .__('text yes'). ' ' . tep_draw_radio_field('meta','meta', '0', (((int)modprodextra::$cInfo->epf_use_as_meta_keyword==0)? true : false) ) . ' ' .__('text no'); ?>
- </p>
+ </p>-->
</fieldset>
@@ -95,10 +95,10 @@
<?php if ($action == 'new' || (!modprodextra::$cInfo->epf_uses_value_list) ) : ?>
<fieldset class="block_field">
- <p class="block_input">
+<!-- <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)modprodextra::$cInfo->epf_use_to_restrict_listings==1)? true : false)) . ' ' .__('text yes'). ' ' . tep_draw_radio_field('restrict','restrict', '0',(((int)modprodextra::$cInfo->epf_use_to_restrict_listings==0)? true : false) ) . ' ' .__('text no'); ?>
- </p>
+ </p>-->
<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>
@@ -113,7 +113,7 @@
<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=' . modprodextra::$eid) . '">' . IMAGE_CANCEL . "</a>\n" ?>
+ <?php echo tep_image_submit('button_save.gif', IMAGE_SAVE) . ' <a class="button" href="' . tep_href_link(FILENAME_CONFIGURATION, FILENAME_CFG_34. '&eid=' . modprodextra::$eid) . '">' . IMAGE_CANCEL . "</a>\n" ?>
</div>
</form>
Modified: trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.new.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.new.gab 2012-04-21 15:53:40 UTC (rev 4293)
+++ trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.new.gab 2012-04-21 16:24:40 UTC (rev 4294)
@@ -15,7 +15,7 @@
<div class="box_unique">
<h4><?php echo (($action != 'edit')? __('heading extra fields list add value') : __('heading extra fields list edit value') . modprodextra::$eid ) ?></h4>
- <?php echo tep_draw_form('field_entry',FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','eid','confirm')). 'action=insert', 'post'); ?>
+ <?php echo tep_draw_form('field_entry',FILENAME_CONFIGURATION, FILENAME_CFG_34. '&action=insert', 'post'); ?>
@@ -53,7 +53,7 @@
<div class="button_nav">
<?php echo tep_image_submit('button_save.gif', __('modprodextra extra label add')) .
- tep_js_back(tep_href_link(modprodextra::FILENAME, tep_get_all_get_params(array('action','flag','eid')) ), IMAGE_CANCEL) ;
+ tep_js_back(tep_href_link(modprodextra::FILENAME, FILENAME_CFG_34 ), IMAGE_CANCEL) ;
// ' <a class="button" href="' . tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','flag','eid')) . 'eid=' . modprodextra::$eid) . '">' . IMAGE_CANCEL . "</a>\n" ?>
</div>
Modified: trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.value.delete.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.value.delete.gab 2012-04-21 15:53:40 UTC (rev 4293)
+++ trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.value.delete.gab 2012-04-21 16:24:40 UTC (rev 4294)
@@ -14,11 +14,11 @@
<h3><?php echo __('heading delete value') ?></h3>
-<?php echo tep_draw_form('yes', modprodextra::FILENAME, tep_get_all_get_params(array('action','eid','confirm')). 'action=delete_value_confirm&eid=' . modprodextra::$eid.'&vid='.$_GET['vid']) ?>
+<?php echo tep_draw_form('yes', modprodextra::FILENAME, FILENAME_CFG_34. '&action=delete_value_confirm&eid=' . modprodextra::$eid.'&vid='.$_GET['vid']) ?>
<p><?php echo __('text delete value') ?>
<fieldset class="block_input button_nav">
- <?php print tep_image_submit('button_delete.gif', IMAGE_DELETE) . tep_js_back(tep_href_link(modprodextra::FILENAME, 'eid=' . modprodextra::$eid ), IMAGE_CANCEL) ; ?>
+ <?php print tep_image_submit('button_delete.gif', IMAGE_DELETE) . tep_js_back(tep_href_link(modprodextra::FILENAME, FILENAME_CFG_34. '&eid=' . modprodextra::$eid ), IMAGE_CANCEL) ; ?>
</fieldset>
</form>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.value.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.value.edit.gab 2012-04-21 15:53:40 UTC (rev 4293)
+++ trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.value.edit.gab 2012-04-21 16:24:40 UTC (rev 4294)
@@ -16,7 +16,7 @@
-<?php echo tep_draw_form('value_entry', FILENAME_CONFIGURATION,FILENAME_CFG_34.'action=' . (($action == 'value_new') ? 'value_insert' : 'value_update') . '&eid=' . modprodextra::$eid . '&vid=' . $_GET['vid'], 'post'); ?>
+<?php echo tep_draw_form('value_entry', FILENAME_CONFIGURATION,FILENAME_CFG_34.'&action=' . (($action == 'value_new') ? 'value_insert' : 'value_update') . '&eid=' . modprodextra::$eid . '&vid=' . $_GET['vid'], 'post'); ?>
<?php /** @remarks loop for language or mode no language and use language id = 0 */ ?>
@@ -66,7 +66,7 @@
<div class="button_nav">
<?php echo tep_js_back(tep_href_link(modprodextra::FILENAME,FILENAME_CFG_34), __('listing fields') ); ?>
- <?php echo tep_js_back(tep_href_link(modprodextra::FILENAME,FILENAME_CFG_34.'eid='.modprodextra::$eid.'&action=value_listing'), __('listing value fields') ); ?>
+ <?php echo tep_js_back(tep_href_link(modprodextra::FILENAME,FILENAME_CFG_34.'&eid='.modprodextra::$eid.'&action=value_listing'), __('listing value fields') ); ?>
<?php echo tep_image_submit('button_save.gif', IMAGE_SAVE) ?>
Modified: trunk/catalog/admin/includes/modules/configuration/modprodextra.php
===================================================================
--- trunk/catalog/admin/includes/modules/configuration/modprodextra.php 2012-04-21 15:53:40 UTC (rev 4293)
+++ trunk/catalog/admin/includes/modules/configuration/modprodextra.php 2012-04-21 16:24:40 UTC (rev 4294)
@@ -118,11 +118,11 @@
if (!isset($_POST['search'])) throw new Exception(ERROR_ENTRY_REQUIRED . ENTRY_SEARCH);
$search = ($_POST['search'] == '0') ? 0 : 1;
- if (!isset($_POST['listing'])) throw new Exception(ERROR_ENTRY_REQUIRED . ENTRY_LISTING);
- $listing = ($_POST['listing'] == '0') ? 0 : 1;
+// if (!isset($_POST['listing'])) throw new Exception(ERROR_ENTRY_REQUIRED . ENTRY_LISTING);
+ $listing = 0;//($_POST['listing'] == '0') ? 0 : 1;
- if (!isset($_POST['meta'])) throw new Exception(ERROR_ENTRY_REQUIRED . ENTRY_META);
- $meta = ($_POST['meta'] == '0') ? 0 : 1;
+// if (!isset($_POST['meta'])) throw new Exception(ERROR_ENTRY_REQUIRED . ENTRY_META);
+ $meta = 0; //($_POST['meta'] == '0') ? 0 : 1;
if (!isset($_POST['size'])) throw new Exception(ERROR_ENTRY_REQUIRED . TEXT_SIZE);
$size = ($_POST['size'] == '0') ? 0 : (int)$_POST['size'];
@@ -137,8 +137,8 @@
$size = 64;
if (!isset($_POST['chain']))throw new Exception(ERROR_ENTRY_REQUIRED . TEXT_SHOW_PARENTS);
$chain = ($_POST['chain'] == '0') ? 0 : 1;
- if (!isset($_POST['restrict'])) throw new Exception(ERROR_ENTRY_REQUIRED . TEXT_RESTRICTS);
- $restrict = ($_POST['restrict'] == '0') ? 0 : 1;
+// if (!isset($_POST['restrict'])) throw new Exception(ERROR_ENTRY_REQUIRED . TEXT_RESTRICTS);
+ $restrict = 0;//($_POST['restrict'] == '0') ? 0 : 1;
} else { // parent chain and restrict listing are never active if not using value list
$chain = 0;
$restrict = 0;
@@ -240,7 +240,7 @@
sqlproductsextrafields::delete(array('id'=> (int)self::$eid));
- tep_redirect(tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','confirm','eid'),false)));
+ tep_redirect(tep_href_link(FILENAME_CONFIGURATION, FILENAME_CFG_34));
}
} else {
self::$double_check = 'no';
@@ -270,7 +270,7 @@
}
if(!isset($_GET['forceajax']))
- tep_redirect(tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','flag_spe','flag_admin','flag'),false)));
+ tep_redirect(tep_href_link(FILENAME_CONFIGURATION, FILENAME_CFG_34));
break;
@@ -307,17 +307,31 @@
*/
case 'value_insert':
- $languages = tep_get_languages();
- for ($i=0, $n=sizeof($languages); $i<$n; $i++){
- $data_array = array(
- 'sort_order' => (int)(isset($_POST['sort_order'][$languages[$i]['id']]) ? tep_db_prepare_input($_POST['sort_order'][$languages[$i]['id']]) : 0),
- 'epf_value' => (isset($_POST['value'][$languages[$i]['id']]) ? tep_db_prepare_input($_POST['value'][$languages[$i]['id']]) : 0),
- 'languages_id'=> $languages[$i]['id'],
- 'epf_id' => (int)self::$eid,
- 'parent_id' => (int)0,
- );
- $r=tep_db_perform(TABLE_PRODUCTS_EXTRA_FIELDS_VALUES, $data_array);
+ $fields=sqlproductsextrafields::fetch(array('id'=>(int)self::$eid ), true);
+
+ if($fields->active_value_language) {
+ $languages = tep_get_languages();
+ for ($i=0, $n=sizeof($languages); $i<$n; $i++){
+ $data_array = array(
+ 'sort_order' => (int)(isset($_POST['sort_order'][$languages[$i]['id']]) ? tep_db_prepare_input($_POST['sort_order'][$languages[$i]['id']]) : 0),
+ 'epf_value' => (isset($_POST['value'][$languages[$i]['id']]) ? tep_db_prepare_input($_POST['value'][$languages[$i]['id']]) : 0),
+ 'languages_id'=> $languages[$i]['id'],
+ 'epf_id' => (int)self::$eid,
+ 'parent_id' => (int)0,
+ );
+ $r=tep_db_perform(TABLE_PRODUCTS_EXTRA_FIELDS_VALUES, $data_array);
+ }
}
+ else {
+ $data_array = array(
+ 'sort_order' => (int)(isset($_POST['sort_order'][0]) ? tep_db_prepare_input($_POST['sort_order'][0]) : 0),
+ 'epf_value' => (isset($_POST['value'][0]) ? tep_db_prepare_input($_POST['value'][0]) : 0),
+ 'languages_id'=> 0,
+ 'epf_id' => (int)self::$eid,
+ 'parent_id' => (int)0,
+ );
+ $r=tep_db_perform(TABLE_PRODUCTS_EXTRA_FIELDS_VALUES, $data_array);
+ }
tep_redirect(tep_href_link(FILENAME_CONFIGURATION, FILENAME_CFG_34 . '&eid=' . self::$eid.'&action=value_listing'));
break;
@@ -332,7 +346,7 @@
$field = 'extra_value_id' . (int)$eid;
$query = tep_db_query("update " . TABLE_PRODUCTS_DESCRIPTION . " set " . $field . " = 0 where language_id = " . (int)$lid . " and " . $field . " in (" . (int)$vid . $children . ")");
tep_db_query('delete from ' . TABLE_PRODUCTS_EXTRA_FIELDS_VALUES . ' where value_id in (' . (int)$vid . $children . ")");
- tep_redirect(tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','vid','list_id','parent'),false). 'list_id=' . $list_id));
+ tep_redirect(tep_href_link(FILENAME_CONFIGURATION, FILENAME_CFG_34. '&list_id=' . $list_id));
}
} else {
$double_check = 'no';
Modified: trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/gabarit/configuration/mod_DATATYPE_REPLACE_extra/draw.label.edit.gab
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/gabarit/configuration/mod_DATATYPE_REPLACE_extra/draw.label.edit.gab 2012-04-21 15:53:40 UTC (rev 4293)
+++ trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/gabarit/configuration/mod_DATATYPE_REPLACE_extra/draw.label.edit.gab 2012-04-21 16:24:40 UTC (rev 4294)
@@ -14,7 +14,7 @@
?>
<div class="box_unique">
<h4><?php echo __('heading edit') ?></h4>
- <?php echo tep_draw_form('field_entry',FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','eid','confirm')). 'action=update' . '&confirm=yes&eid=' . mod_DATATYPE_REPLACE_extra::$eid , 'post'); ?>
+ <?php echo tep_draw_form('field_entry',FILENAME_CONFIGURATION, FILENAME_CFG__DATATYPE_REPLACE_SEOTAG_.'&action=update' . '&confirm=yes&eid=' . mod_DATATYPE_REPLACE_extra::$eid , 'post'); ?>
<p>
@@ -54,14 +54,14 @@
<label for="search" title="<?php echo __('entry search help') ?>"><?php echo __('entry search'); ?></label>
<?php echo tep_draw_radio_field('search','search', '1', (((int)mod_DATATYPE_REPLACE_extra::$cInfo->epf_advanced_search==1)? true : false) ). ' ' .__('text yes'). ' ' . tep_draw_radio_field('search','search', '0', (((int)mod_DATATYPE_REPLACE_extra::$cInfo->epf_advanced_search==0)? true : false) ) . ' ' .__('text no'); ?>
</p>
- <p class="block_input">
+<!-- <p class="block_input">
<label><?php echo __('ENTRY_LISTING') ?></label>
<?php echo tep_draw_radio_field('listing','listing', '1', (((int)mod_DATATYPE_REPLACE_extra::$cInfo->epf_show_in_listing==1)? true : false) ) . ' ' .__('text yes'). ' ' . tep_draw_radio_field('listing','listing', '0', (((int)mod_DATATYPE_REPLACE_extra::$cInfo->epf_show_in_listing==0)? true : false) ) . ' ' .__('text no'); ?>
- </p>
- <p class="block_input">
+ </p>-->
+<!-- <p class="block_input">
<label><?php echo __('ENTRY_META') ?></label>
<?php echo tep_draw_radio_field('meta','meta', '1',(((int)mod_DATATYPE_REPLACE_extra::$cInfo->epf_use_as_meta_keyword==1)? true : false) ) . ' ' .__('text yes'). ' ' . tep_draw_radio_field('meta','meta', '0', (((int)mod_DATATYPE_REPLACE_extra::$cInfo->epf_use_as_meta_keyword==0)? true : false) ) . ' ' .__('text no'); ?>
- </p>
+ </p>-->
</fieldset>
@@ -95,10 +95,10 @@
<?php if ($action == 'new' || (!mod_DATATYPE_REPLACE_extra::$cInfo->epf_uses_value_list) ) : ?>
<fieldset class="block_field">
- <p class="block_input">
+<!-- <p class="block_input">
<label for="restrict" title="<?php echo __('ENTRY_RESTRICT_HELP') ?>"><?php echo __('ENTRY_RESTRICT'). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
<?php echo tep_draw_radio_field('restrict','restrict', '1',(((int)mod_DATATYPE_REPLACE_extra::$cInfo->epf_use_to_restrict_listings==1)? true : false)) . ' ' .__('text yes'). ' ' . tep_draw_radio_field('restrict','restrict', '0',(((int)mod_DATATYPE_REPLACE_extra::$cInfo->epf_use_to_restrict_listings==0)? true : false) ) . ' ' .__('text no'); ?>
- </p>
+ </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>
@@ -113,7 +113,7 @@
<div class="button_nav">
- <?php echo tep_image_submit('button_save.gif', IMAGE_SAVE) . ' <a class="button" href="' . tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','flag','eid')) . 'eid=' . mod_DATATYPE_REPLACE_extra::$eid) . '">' . IMAGE_CANCEL . "</a>\n" ?>
+ <?php echo tep_image_submit('button_save.gif', IMAGE_SAVE) . ' <a class="button" href="' . tep_href_link(FILENAME_CONFIGURATION, FILENAME_CFG__DATATYPE_REPLACE_SEOTAG_.'&eid=' . mod_DATATYPE_REPLACE_extra::$eid) . '">' . IMAGE_CANCEL . "</a>\n" ?>
</div>
</form>
Modified: trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/gabarit/configuration/mod_DATATYPE_REPLACE_extra/draw.label.new.gab
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/gabarit/configuration/mod_DATATYPE_REPLACE_extra/draw.label.new.gab 2012-04-21 15:53:40 UTC (rev 4293)
+++ trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/gabarit/configuration/mod_DATATYPE_REPLACE_extra/draw.label.new.gab 2012-04-21 16:24:40 UTC (rev 4294)
@@ -15,7 +15,7 @@
<div class="box_unique">
<h4><?php echo (($action != 'edit')? __('heading extra fields list add value') : __('heading extra fields list edit value') . mod_DATATYPE_REPLACE_extra::$eid ) ?></h4>
- <?php echo tep_draw_form('field_entry',FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','eid','confirm')). 'action=insert', 'post'); ?>
+ <?php echo tep_draw_form('field_entry',FILENAME_CONFIGURATION, FILENAME_CFG__DATATYPE_REPLACE_SEOTAG_.'&action=insert', 'post'); ?>
@@ -53,7 +53,7 @@
<div class="button_nav">
<?php echo tep_image_submit('button_save.gif', __('mod_DATATYPE_REPLACE_extra extra label add')) .
- tep_js_back(tep_href_link(mod_DATATYPE_REPLACE_extra::FILENAME, tep_get_all_get_params(array('action','flag','eid')) ), IMAGE_CANCEL) ;
+ tep_js_back(tep_href_link(mod_DATATYPE_REPLACE_extra::FILENAME, FILENAME_CFG__DATATYPE_REPLACE_SEOTAG_ ), IMAGE_CANCEL) ;
// ' <a class="button" href="' . tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','flag','eid')) . 'eid=' . mod_DATATYPE_REPLACE_extra::$eid) . '">' . IMAGE_CANCEL . "</a>\n" ?>
</div>
Modified: trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/gabarit/configuration/mod_DATATYPE_REPLACE_extra/draw.value.delete.gab
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/gabarit/configuration/mod_DATATYPE_REPLACE_extra/draw.value.delete.gab 2012-04-21 15:53:40 UTC (rev 4293)
+++ trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/gabarit/configuration/mod_DATATYPE_REPLACE_extra/draw.value.delete.gab 2012-04-21 16:24:40 UTC (rev 4294)
@@ -14,11 +14,11 @@
<h3><?php echo __('heading delete value') ?></h3>
-<?php echo tep_draw_form('yes', mod_DATATYPE_REPLACE_extra::FILENAME, tep_get_all_get_params(array('action','eid','confirm')). 'action=delete_value_confirm&eid=' . mod_DATATYPE_REPLACE_extra::$eid.'&vid='.$_GET['vid']) ?>
+<?php echo tep_draw_form('yes', mod_DATATYPE_REPLACE_extra::FILENAME, FILENAME_CFG__DATATYPE_REPLACE_SEOTAG_.'&action=delete_value_confirm&eid=' . mod_DATATYPE_REPLACE_extra::$eid.'&vid='.$_GET['vid']) ?>
<p><?php echo __('text delete value') ?>
<fieldset class="block_input button_nav">
- <?php print tep_image_submit('button_delete.gif', IMAGE_DELETE) . tep_js_back(tep_href_link(mod_DATATYPE_REPLACE_extra::FILENAME, 'eid=' . mod_DATATYPE_REPLACE_extra::$eid ), IMAGE_CANCEL) ; ?>
+ <?php print tep_image_submit('button_delete.gif', IMAGE_DELETE) . tep_js_back(tep_href_link(mod_DATATYPE_REPLACE_extra::FILENAME, FILENAME_CFG__DATATYPE_REPLACE_SEOTAG_.'&eid=' . mod_DATATYPE_REPLACE_extra::$eid ), IMAGE_CANCEL) ; ?>
</fieldset>
</form>
\ No newline at end of file
Modified: trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/gabarit/configuration/mod_DATATYPE_REPLACE_extra/draw.value.edit.gab
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/gabarit/configuration/mod_DATATYPE_REPLACE_extra/draw.value.edit.gab 2012-04-21 15:53:40 UTC (rev 4293)
+++ trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/gabarit/configuration/mod_DATATYPE_REPLACE_extra/draw.value.edit.gab 2012-04-21 16:24:40 UTC (rev 4294)
@@ -16,7 +16,7 @@
-<?php echo tep_draw_form('value_entry', FILENAME_CONFIGURATION,FILENAME_CFG__DATATYPE_REPLACE_SEOTAG_.'action=' . (($action == 'value_new') ? 'value_insert' : 'value_update') . '&eid=' . mod_DATATYPE_REPLACE_extra::$eid . '&vid=' . $_GET['vid'], 'post'); ?>
+<?php echo tep_draw_form('value_entry', FILENAME_CONFIGURATION,FILENAME_CFG__DATATYPE_REPLACE_SEOTAG_.'&action=' . (($action == 'value_new') ? 'value_insert' : 'value_update') . '&eid=' . mod_DATATYPE_REPLACE_extra::$eid . '&vid=' . $_GET['vid'], 'post'); ?>
<div class="tabs_lang">
<ul>
@@ -45,7 +45,7 @@
<div class="button_nav">
<?php echo tep_js_back(tep_href_link(mod_DATATYPE_REPLACE_extra::FILENAME,FILENAME_CFG__DATATYPE_REPLACE_SEOTAG_), __('listing fields') ); ?>
- <?php echo tep_js_back(tep_href_link(mod_DATATYPE_REPLACE_extra::FILENAME,FILENAME_CFG__DATATYPE_REPLACE_SEOTAG_.'eid='.mod_DATATYPE_REPLACE_extra::$eid.'&action=value_listing'), __('listing value fields') ); ?>
+ <?php echo tep_js_back(tep_href_link(mod_DATATYPE_REPLACE_extra::FILENAME,FILENAME_CFG__DATATYPE_REPLACE_SEOTAG_.'&eid='.mod_DATATYPE_REPLACE_extra::$eid.'&action=value_listing'), __('listing value fields') ); ?>
<?php echo tep_image_submit('button_save.gif', IMAGE_SAVE) ?>
Modified: trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/gabarit/configuration/mod_DATATYPE_REPLACE_extra/draw.value.listing.gab
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/gabarit/configuration/mod_DATATYPE_REPLACE_extra/draw.value.listing.gab 2012-04-21 15:53:40 UTC (rev 4293)
+++ trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/gabarit/configuration/mod_DATATYPE_REPLACE_extra/draw.value.listing.gab 2012-04-21 16:24:40 UTC (rev 4294)
@@ -14,8 +14,8 @@
global $action, $languages;
?>
<div class="button_nav">
- <?php printf(CsrtAction::getLink('button_nav', __('listing fields') ), '', tep_href_link(mod_DATATYPE_REPLACE_extra::FILENAME, FILENAME_CFG__DATATYPE_REPLACE_SEOTAG_. 'eid='.mod_DATATYPE_REPLACE_extra::$eid.'&list_id=&vid=&parent=') ,'' );?>
- <?php printf(CsrtAction::getLink('button_nav', __('BUTTON_VALUE_ADD_LIST') ), '', tep_href_link(mod_DATATYPE_REPLACE_extra::FILENAME, FILENAME_CFG__DATATYPE_REPLACE_SEOTAG_. 'eid='.mod_DATATYPE_REPLACE_extra::$eid.'&list_id=&vid=&parent=&action=value_new') ,'' );?>
+ <?php printf(CsrtAction::getLink('button_nav', __('listing fields') ), '', tep_href_link(mod_DATATYPE_REPLACE_extra::FILENAME, FILENAME_CFG__DATATYPE_REPLACE_SEOTAG_. '&eid='.mod_DATATYPE_REPLACE_extra::$eid.'&list_id=&vid=&parent=') ,'' );?>
+ <?php printf(CsrtAction::getLink('button_nav', __('BUTTON_VALUE_ADD_LIST') ), '', tep_href_link(mod_DATATYPE_REPLACE_extra::FILENAME, FILENAME_CFG__DATATYPE_REPLACE_SEOTAG_. '&eid='.mod_DATATYPE_REPLACE_extra::$eid.'&list_id=&vid=&parent=&action=value_new') ,'' );?>
</div>
<table class="dataTable" >
Modified: trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/modules/configuration/mod_DATATYPE_REPLACE_extra.php
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/modules/configuration/mod_DATATYPE_REPLACE_extra.php 2012-04-21 15:53:40 UTC (rev 4293)
+++ trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/modules/configuration/mod_DATATYPE_REPLACE_extra.php 2012-04-21 16:24:40 UTC (rev 4294)
@@ -118,11 +118,11 @@
if (!isset($_POST['search'])) throw new Exception(ERROR_ENTRY_REQUIRED . ENTRY_SEARCH);
$search = ($_POST['search'] == '0') ? 0 : 1;
- if (!isset($_POST['listing'])) throw new Exception(ERROR_ENTRY_REQUIRED . ENTRY_LISTING);
- $listing = ($_POST['listing'] == '0') ? 0 : 1;
+// if (!isset($_POST['listing'])) throw new Exception(ERROR_ENTRY_REQUIRED . ENTRY_LISTING);
+ $listing = 0;//($_POST['listing'] == '0') ? 0 : 1;
- if (!isset($_POST['meta'])) throw new Exception(ERROR_ENTRY_REQUIRED . ENTRY_META);
- $meta = ($_POST['meta'] == '0') ? 0 : 1;
+// if (!isset($_POST['meta'])) throw new Exception(ERROR_ENTRY_REQUIRED . ENTRY_META);
+ $meta = 0;//($_POST['meta'] == '0') ? 0 : 1;
if (!isset($_POST['size'])) throw new Exception(ERROR_ENTRY_REQUIRED . TEXT_SIZE);
$size = ($_POST['size'] == '0') ? 0 : (int)$_POST['size'];
@@ -137,8 +137,8 @@
$size = 64;
if (!isset($_POST['chain']))throw new Exception(ERROR_ENTRY_REQUIRED . TEXT_SHOW_PARENTS);
$chain = ($_POST['chain'] == '0') ? 0 : 1;
- if (!isset($_POST['restrict'])) throw new Exception(ERROR_ENTRY_REQUIRED . TEXT_RESTRICTS);
- $restrict = ($_POST['restrict'] == '0') ? 0 : 1;
+// if (!isset($_POST['restrict'])) throw new Exception(ERROR_ENTRY_REQUIRED . TEXT_RESTRICTS);
+ $restrict = 0; //($_POST['restrict'] == '0') ? 0 : 1;
} else { // parent chain and restrict listing are never active if not using value list
$chain = 0;
$restrict = 0;
@@ -240,7 +240,7 @@
sql_DATATYPE_REPLACE_extrafields::delete(array('id'=> (int)self::$eid));
- tep_redirect(tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','confirm','eid'),false)));
+ tep_redirect(tep_href_link(FILENAME_CONFIGURATION, FILENAME_CFG__DATATYPE_REPLACE_SEOTAG_));
}
} else {
self::$double_check = 'no';
@@ -270,22 +270,37 @@
}
if(!isset($_GET['forceajax']))
- tep_redirect(tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','flag_spe','flag_admin','flag'),false)));
+ tep_redirect(tep_href_link(FILENAME_CONFIGURATION, FILENAME_CFG__DATATYPE_REPLACE_SEOTAG_));
break;
case 'value_update':
- $languages = tep_get_languages();
- for ($i=0, $n=sizeof($languages); $i<$n; $i++){
- $data_array = array('sort_order' => (int)(isset($_POST['sort_order'][$languages[$i]['id']]) ? tep_db_prepare_input($_POST['sort_order'][$languages[$i]['id']]) : 0),
- 'epf_value' => (isset($_POST['value'][$languages[$i]['id']]) ? tep_db_prepare_input($_POST['value'][$languages[$i]['id']]) : 0),
- 'languages_id'=> $languages[$i]['id']);
+
+ $fields=sql_DATATYPE_REPLACE_extrafields::fetch(array('id'=>(int)self::$eid ), true);
+
+ if($fields->active_value_language) {
+ foreach ( tep_get_languages() as $row){
+ $data_array = array(
+ 'sort_order' => (int)(isset($_POST['sort_order'][$row['id']]) ? tep_db_prepare_input($_POST['sort_order'][$row['id']]) : 0),
+ 'epf_value' => (isset($_POST['value'][$row['id']]) ? tep_db_prepare_input($_POST['value'][$row['id']]) :''),
+ 'languages_id'=> $row['id']
+ );
+ }
}
+ else{
+ $data_array = array(
+ 'sort_order' => (int)(isset($_POST['sort_order'][0]) ? tep_db_prepare_input($_POST['sort_order'][0]) : 0),
+ 'epf_value' => (isset($_POST['value'][0]) ? tep_db_prepare_input($_POST['value'][0]) : ''),
+ 'languages_id'=> '0'
+ );
+ }
tep_db_perform(TABLE__DATATYPE_REPLACE_MAJ__EXTRA_FIELDS_VALUES, $data_array, 'update',"value_id = '" . (int)$_GET['vid']."' and epf_id='".self::$eid."' ");
- tep_redirect(tep_href_link(FILENAME_CONFIGURATION, FILENAME_CFG__DATATYPE_REPLACE_SEOTAG_ . 'eid=' . self::$eid.'&action=value_listing'));
+
+
+ tep_redirect(tep_href_link(FILENAME_CONFIGURATION, FILENAME_CFG__DATATYPE_REPLACE_SEOTAG_ . '&eid=' . self::$eid.'&action=value_listing'));
break;
@@ -294,19 +309,35 @@
*/
case 'value_insert':
- $languages = tep_get_languages();
- for ($i=0, $n=sizeof($languages); $i<$n; $i++){
- $data_array = array(
- 'sort_order' => (int)(isset($_POST['sort_order'][$languages[$i]['id']]) ? tep_db_prepare_input($_POST['sort_order'][$languages[$i]['id']]) : 0),
- 'epf_value' => (isset($_POST['value'][$languages[$i]['id']]) ? tep_db_prepare_input($_POST['value'][$languages[$i]['id']]) : 0),
- 'languages_id'=> $languages[$i]['id'],
- 'epf_id' => (int)self::$eid,
- 'parent_id' => (int)0,
- );
- $r=tep_db_perform(TABLE__DATATYPE_REPLACE_MAJ__EXTRA_FIELDS_VALUES, $data_array);
+
+ $fields=sql_DATATYPE_REPLACE_extrafields::fetch(array('id'=>(int)self::$eid ), true);
+
+ if($fields->active_value_language) {
+ $languages = tep_get_languages();
+ for ($i=0, $n=sizeof($languages); $i<$n; $i++){
+ $data_array = array(
+ 'sort_order' => (int)(isset($_POST['sort_order'][$languages[$i]['id']]) ? tep_db_prepare_input($_POST['sort_order'][$languages[$i]['id']]) : 0),
+ 'epf_value' => (isset($_POST['value'][$languages[$i]['id']]) ? tep_db_prepare_input($_POST['value'][$languages[$i]['id']]) : 0),
+ 'languages_id'=> $languages[$i]['id'],
+ 'epf_id' => (int)self::$eid,
+ 'parent_id' => (int)0,
+ );
+ $r=tep_db_perform(TABLE__DATATYPE_REPLACE_MAJ__EXTRA_FIELDS_VALUES, $data_array);
+ }
}
+ else {
+ $data_array = array(
+ 'sort_order' => (int)(isset($_POST['sort_order'][0]) ? tep_db_prepare_input($_POST['sort_order'][0]) : 0),
+ 'epf_value' => (isset($_POST['value'][0]) ? tep_db_prepare_input($_POST['value'][0]) : 0),
+ 'languages_id'=> 0,
+ 'epf_id' => (int)self::$eid,
+ 'parent_id' => (int)0,
+ );
+ $r=tep_db_perform(TABLE__DATATYPE_REPLACE_MAJ__EXTRA_FIELDS_VALUES, $data_array);
+ }
- tep_redirect(tep_href_link(FILENAME_CONFIGURATION, FILENAME_CFG__DATATYPE_REPLACE_SEOTAG_ . 'eid=' . self::$eid.'&action=value_listing'));
+
+ tep_redirect(tep_href_link(FILENAME_CONFIGURATION, FILENAME_CFG__DATATYPE_REPLACE_SEOTAG_ . '&eid=' . self::$eid.'&action=value_listing'));
break;
@@ -319,7 +350,8 @@
$field = 'extra_value_id' . (int)$eid;
$query = tep_db_query("update " . TABLE__DATATYPE_REPLACE_MAJ__DESCRIPTION . " set " . $field . " = 0 where language_id = " . (int)$lid . " and " . $field . " in (" . (int)$vid . $children . ")");
tep_db_query('delete from ' . TABLE__DATATYPE_REPLACE_MAJ__EXTRA_FIELDS_VALUES . ' where value_id in (' . (int)$vid . $children . ")");
- tep_redirect(tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','vid','list_id','parent'),false). 'list_id=' . $list_id));
+
+ tep_redirect(tep_href_link(FILENAME_CONFIGURATION, FILENAME_CFG__DATATYPE_REPLACE_SEOTAG_ . '&list_id=' . $list_id));
}
} else {
$double_check = 'no';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-21 15:53:51
|
Revision: 4293
http://oscss.svn.sourceforge.net/oscss/?rev=4293&view=rev
Author: oscim
Date: 2012-04-21 15:53:40 +0000 (Sat, 21 Apr 2012)
Log Message:
-----------
implementation du champs "use in advanced search" des extra dans les Datatypes, lors de la recherche
Modified Paths:
--------------
trunk/catalog/advanced_search.php
trunk/catalog/common/classes/datatype_drivers/Data_product.php
trunk/dev/GenerCode/datatype/Modele/catalog/common/classes/datatype_drivers/Data__DATATYPE_REPLACE_.php
Modified: trunk/catalog/advanced_search.php
===================================================================
--- trunk/catalog/advanced_search.php 2012-04-21 13:13:15 UTC (rev 4292)
+++ trunk/catalog/advanced_search.php 2012-04-21 15:53:40 UTC (rev 4293)
@@ -6,8 +6,6 @@
* \date 09/02/2012, 22:16
* \author oscim <mail aur...@os...> <www http://www.oscim.fr>
* \encode UTF-8
-*
-* \file
* \brief Page de Recherche avancé
*
*/
@@ -78,7 +76,10 @@
$page->add_var_page('childs_gab',$dyntype->listing_sql['gab']);
- $listing_sql = 'SELECT DISTINCT '.$dyntype->listing_sql['col_count'] .' '. $dyntype->listing_sql['tables'] .' '. $dyntype->listing_sql['where'] .' ORDER BY '. $dyntype->listing_sql['sort'];
+ $listing_sql = 'SELECT DISTINCT '.$dyntype->listing_sql['col_count'] .
+ ' '. $dyntype->listing_sql['tables'] .
+ ' '. $dyntype->listing_sql['where'] .
+ ' ORDER BY '. $dyntype->listing_sql['sort'];
$listing_split = new splitPageResults($listing_sql, $page->_conf_value('MAX_DISPLAY_SEARCH_RESULTS'), $dyntype->listing_sql['col_count'] );
Modified: trunk/catalog/common/classes/datatype_drivers/Data_product.php
===================================================================
--- trunk/catalog/common/classes/datatype_drivers/Data_product.php 2012-04-21 13:13:15 UTC (rev 4292)
+++ trunk/catalog/common/classes/datatype_drivers/Data_product.php 2012-04-21 15:53:40 UTC (rev 4293)
@@ -215,11 +215,45 @@
switch(strtolower(DataTypes::$CurrentMode)){
case 'search':
- global $keywords, $search_keywords, $pto, $dto, $pfrom, $dfrom;
+ global $keywords, $search_keywords, $pto, $dto, $pfrom, $dfrom, $currencies;
+
+
+
+ if (tep_not_null($pfrom)) {
+ if ($currencies->is_set($currency)) {
+ $rate = $currencies->get_value($currency);
+
+ $pfrom = $pfrom / $rate;
+ }
+ }
+
+ if (tep_not_null($pto)) {
+ if (isset($rate)) {
+ $pto = $pto / $rate;
+ }
+ }
+
+
+ // calcul extra actived for search
+ $allextraactived = array();
+ $query = $DB->query("SELECT epf_id, epf_uses_value_list, epf_active_value_language FROM " . TABLE_PRODUCTS_EXTRA_FIELDS . " WHERE epf_status = '1' AND epf_advanced_search = '1' ");
+ $allextraactived = $query->fetchAllAssoc();
+
+ foreach($allextraactived as $row)
+ if($row['epf_uses_value_list'] == 0)
+ $use_value_list[] = false;
+ else
+ $use_value_list[] = true;
+
+
$this->listing_sql['col_count'] = " ".$this->p.".products_id ";
+ /// sort
+ $this->listing_sql['sort'] = " ".$this->p."d.products_name ";
+ /// add input entry in advanced search page forms
+ $this->listing_sql['gab'] = $this->DataType.'/advanced_search.other.input';
-// $select_str = "SELECT DISTINCT p.products_id ";
+
$this->listing_sql['tables'] = " FROM " . TABLE_PRODUCTS . " ".$this->p." ";
$this->listing_sql['tables'] .=" LEFT JOIN " . TABLE_SPECIALS . " s USING(products_id) ";
$this->listing_sql['tables'] .=" LEFT JOIN " . TABLE_MANUFACTURERS . " m USING(manufacturers_id) ";
@@ -237,11 +271,20 @@
}
- $this->listing_sql['tables'] .= " LEFT JOIN " . TABLE_CATEGORIES . " c ON( p2c.categories_id = c.categories_id and c.categories_status='1' ) ";
+/** TODO link to datatype cat */
+ $this->listing_sql['tables'] .= " LEFT JOIN " . TABLE_CATEGORIES . " c ON( p2c.categories_id = c.categories_id ".DataForceStatus(" AND c.categories_status='1' ")." ) ";
- $this->listing_sql['where'] = " WHERE ".$this->p.".products_status > 0 AND ".$this->p."d.language_id = '" . (int)$languages_id . "' ";
+ /// Add search in Extra value
+ $this->listing_sql['tables'] .= " LEFT JOIN " . TABLE_PRODUCTS_TO_PRODUCTS_EXTRA_FIELDS . " p2pef ON(p2pef.products_id = p.products_id AND ( p2pef.languages_id = '" . (int)$languages_id . "' OR p2pef.languages_id = '0' ) ) ";
+ if(in_array(true, (array)$use_value_list))
+ $this->listing_sql['tables'] .= " LEFT JOIN " . TABLE_PRODUCTS_EXTRA_FIELDS_VALUES . " pefv ON(pefv.epf_id = p2pef.products_extra_fields_id AND ( pefv.languages_id = '" . (int)$languages_id . "' OR pefv.languages_id = '0' ) ) ";
+
+
+ //! WHERE
+ $this->listing_sql['where'] = " WHERE ".$this->p."d.language_id = '" . (int)$languages_id . "' ".DataForceStatus(" AND ".$this->p.".products_status > 0 ")." ";
+
if (isset($_GET['categories_id']) && tep_not_null($_GET['categories_id'])) {
if (isset($_GET['inc_subcat']) && ($_GET['inc_subcat'] == '1')) {
$subcategories_array = array();
@@ -259,6 +302,7 @@
}
}
+/** TODO link to datatype manufacturers */
if (isset($_GET['manufacturers_id']) && tep_not_null($_GET['manufacturers_id'])) {
$this->listing_sql['where'] .= " and m.manufacturers_id = '" . (int)$_GET['manufacturers_id'] . "'";
}
@@ -285,59 +329,57 @@
$this->listing_sql['where'] .= " )";
}
+ // search date
if (tep_not_null($dfrom)) $this->listing_sql['where'] .= " and p.products_date_added >= '" . tep_date_raw($dfrom) . "'";
-
if (tep_not_null($dto)) $this->listing_sql['where'] .= " and p.products_date_added <= '" . tep_date_raw($dto) . "'";
- if (tep_not_null($pfrom)) {
- if ($currencies->is_set($currency)) {
- $rate = $currencies->get_value($currency);
- $pfrom = $pfrom / $rate;
- }
- }
+ /// search price
+ if ($pfrom > 0) {
+ $this->listing_sql['where'] .= " and ( (p.final_price * if(gz.geo_zone_id is null, 1, 1 + (tr.tax_rate / 100) ) >= " . (double)$pfrom . ")";
+ $this->listing_sql['where'] .= " OR (IF(s.status, s.specials_new_products_price, p.products_price) >= " . (double)$pfrom . ") ) ";
+ }
+ if ($pto > 0){
+ $this->listing_sql['where'] .= " and ( (p.final_price * if(gz.geo_zone_id is null, 1, 1 + (tr.tax_rate / 100) ) <= " . (double)$pto . ")";
+ $this->listing_sql['where'] .= " OR (IF(s.status, s.specials_new_products_price, p.products_price) <= " . (double)$pto . ") )";
+ }
- if (tep_not_null($pto)) {
- if (isset($rate)) {
- $pto = $pto / $rate;
- }
- }
-
- if ($pfrom > 0) {
- $this->listing_sql['where'] .= " and ( (p.final_price * if(gz.geo_zone_id is null, 1, 1 + (tr.tax_rate / 100) ) >= " . (double)$pfrom . ")";
- $this->listing_sql['where'] .= " OR (IF(s.status, s.specials_new_products_price, p.products_price) >= " . (double)$pfrom . ") ) ";
+ /// search in attribute option product
+ $attributes_query = tep_db_query("select * from " . TABLE_PRODUCTS_OPTIONS . " where language_id = '" . (int)$languages_id . "'");
+ $option_value_selected = false;
+ $products_stock_attributes_array = array();
+ while ($attributes = tep_db_fetch_array($attributes_query)) {
+ if (isset($_GET[$attributes["products_options_name"]]) && !empty($_GET[$attributes["products_options_name"]]))
+ $option_value_selected = true;
+ }
+ // the above while loop is to check to see if any values were selected
+ if ($option_value_selected == true){
+ $attributes_query2 = tep_db_query("select * from " . TABLE_PRODUCTS_OPTIONS . " where language_id = '" . (int)$languages_id . "'");
+ while ($attributes2 = tep_db_fetch_array($attributes_query2)) {
+ if (isset($_GET[$attributes2["products_options_name"]]) && !empty($_GET[$attributes2["products_options_name"]])) {
+ $str_selected_values = $str_selected_values . $_GET[$attributes2["products_options_name"]] . ',';
+ }
}
- if ($pto > 0){
- $this->listing_sql['where'] .= " and ( (p.final_price * if(gz.geo_zone_id is null, 1, 1 + (tr.tax_rate / 100) ) <= " . (double)$pto . ")";
- $this->listing_sql['where'] .= " OR (IF(s.status, s.specials_new_products_price, p.products_price) <= " . (double)$pto . ") )";
- }
+ $str_selected_values = substr($str_selected_values,0,strlen($str_selected_values) - 1);
+ $this->listing_sql['where'] .= "AND pa.products_id = p.products_id and pa.options_values_id in (".$str_selected_values.")";
+ }
- $attributes_query = tep_db_query("select * from " . TABLE_PRODUCTS_OPTIONS . " where language_id = '" . (int)$languages_id . "'");
- $option_value_selected = false;
- $products_stock_attributes_array = array();
- while ($attributes = tep_db_fetch_array($attributes_query)) {
- if (isset($_GET[$attributes["products_options_name"]]) && !empty($_GET[$attributes["products_options_name"]]))
- $option_value_selected = true;
+
+ /// Add search in Extra value
+ if(count($allextraactived) > 0){
+ $tmp = '';
+ foreach($allextraactived as $row) {
+ if($row['epf_uses_value_list'] == 0)
+ $tmp .= " OR ( p2pef.products_extra_fields_id = '".$row['epf_id']."' AND p2pef.products_extra_fields_value like '%" . tep_db_input($keyword) . "%' ) ";
+ else
+ $tmp .= " OR ( pefv.epf_id = '".$row['epf_id']."' AND pefv.epf_value like '%" . tep_db_input($keyword) . "%' ) ";
}
- // the above while loop is to check to see if any values were selected
- if ($option_value_selected == true){
- $attributes_query2 = tep_db_query("select * from " . TABLE_PRODUCTS_OPTIONS . " where language_id = '" . (int)$languages_id . "'");
- while ($attributes2 = tep_db_fetch_array($attributes_query2)) {
- if (isset($_GET[$attributes2["products_options_name"]]) && !empty($_GET[$attributes2["products_options_name"]])) {
- $str_selected_values = $str_selected_values . $_GET[$attributes2["products_options_name"]] . ',';
- }
- }
- $str_selected_values = substr($str_selected_values,0,strlen($str_selected_values) - 1);
- $this->listing_sql['where'] .= "and pa.products_id = p.products_id and pa.options_values_id in (".$str_selected_values.")";
- }
+ $this->listing_sql['where'] .= " OR ( " . substr($tmp, 3) . " ) ";
+ }
- $this->listing_sql['sort'] = " ".$this->p."d.products_name ";
- /// add input entry in advanced search page forms
- $this->listing_sql['gab'] = $this->DataType.'/advanced_search.other.input';
-
return $this;
break;
Modified: trunk/dev/GenerCode/datatype/Modele/catalog/common/classes/datatype_drivers/Data__DATATYPE_REPLACE_.php
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/catalog/common/classes/datatype_drivers/Data__DATATYPE_REPLACE_.php 2012-04-21 13:13:15 UTC (rev 4292)
+++ trunk/dev/GenerCode/datatype/Modele/catalog/common/classes/datatype_drivers/Data__DATATYPE_REPLACE_.php 2012-04-21 15:53:40 UTC (rev 4293)
@@ -201,14 +201,39 @@
case 'search':
global $keywords, $search_keywords, $pto, $dto, $pfrom, $dfrom;
+
+
+ // calcul extra actived for search
+ $allextraactived = array();
+ $query = $DB->query("SELECT epf_id, epf_uses_value_list, epf_active_value_language FROM " . TABLE_PRODUCTS_EXTRA_FIELDS . " WHERE epf_status = '1' AND epf_advanced_search = '1' ");
+ $allextraactived = $query->fetchAllAssoc();
+
+ foreach($allextraactived as $row)
+ if($row['epf_uses_value_list'] == 0)
+ $use_value_list[] = false;
+ else
+ $use_value_list[] = true;
+
+
+
$this->listing_sql['col_count'] = " ".$this->p."._DATATYPE_REPLACE__id ";
+ $this->listing_sql['sort'] = " ".$this->p."d._DATATYPE_REPLACE__title ";
+ /// add input entry in advanced search page forms
+ $this->listing_sql['gab'] = $this->DataType.'/advanced_search.other.input';
+
$this->listing_sql['tables'] = " FROM " . TABLE__DATATYPE_REPLACE_MAJ_ . " ".$this->p." ";
$this->listing_sql['tables'] .=" LEFT JOIN " . TABLE__DATATYPE_REPLACE_MAJ__DESCRIPTION . " ".$this->p."d using(_DATATYPE_REPLACE__id) ";
$this->listing_sql['tables'] .=" LEFT JOIN " . TABLE__DATATYPE_REPLACE_MAJ__TO_CATEGORIES . " ".$this->p."2c using(_DATATYPE_REPLACE__id) ";
$this->listing_sql['tables'] .= " LEFT JOIN " . TABLE_CATEGORIES . " cat ON( ".$this->p."2c.categories_id = cat.categories_id and cat.categories_status='1' ) ";
-
+ /// Add search in Extra value
+ $this->listing_sql['tables'] .= " LEFT JOIN " . TABLE__DATATYPE_REPLACE_MAJ__TO__DATATYPE_REPLACE_MAJ__EXTRA_FIELDS . " p2pef ON(p2pef._DATATYPE_REPLACE__id = p."._DATATYPE_REPLACE_."_id AND ( p2pef.languages_id = '" . (int)$languages_id . "' OR p2pef.languages_id = '0' ) ) ";
+
+ if(in_array(true, (array)$use_value_list))
+ $this->listing_sql['tables'] .= " LEFT JOIN " . TABLE__DATATYPE_REPLACE_MAJ__EXTRA_FIELDS_VALUES . " pefv ON(pefv.epf_id = p2pef._DATATYPE_REPLACE__extra_fields_id AND ( pefv.languages_id = '" . (int)$languages_id . "' OR pefv.languages_id = '0' ) ) ";
+
+
$this->listing_sql['where'] = " WHERE ".$this->p."._DATATYPE_REPLACE__status > 0 AND ".$this->p."d.language_id = '" . (int)$languages_id . "' ";
if (isset($_GET['categories_id']) && tep_not_null($_GET['categories_id'])) {
@@ -256,11 +281,20 @@
if (tep_not_null($dto)) $this->listing_sql['where'] .= " and ".$this->p.".date_added <= '" . tep_date_raw($dto) . "'";
- $this->listing_sql['sort'] = " ".$this->p."d._DATATYPE_REPLACE__title ";
- /// add input entry in advanced search page forms
- $this->listing_sql['gab'] = $this->DataType.'/advanced_search.other.input';
+ /// Add search in Extra value
+ if(count($allextraactived) > 0){
+ $tmp = '';
+ foreach($allextraactived as $row) {
+ if($row['epf_uses_value_list'] == 0)
+ $tmp .= " OR ( p2pef._DATATYPE_REPLACE__extra_fields_id = '".$row['epf_id']."' AND p2pef._DATATYPE_REPLACE__extra_fields_value like '%" . tep_db_input($keyword) . "%' ) ";
+ else
+ $tmp .= " OR ( pefv.epf_id = '".$row['epf_id']."' AND pefv.epf_value like '%" . tep_db_input($keyword) . "%' ) ";
+ }
+ $this->listing_sql['where'] .= " OR ( " . substr($tmp, 3) . " ) ";
+ }
+
return $this;
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-21 13:13:21
|
Revision: 4292
http://oscss.svn.sourceforge.net/oscss/?rev=4292&view=rev
Author: oscim
Date: 2012-04-21 13:13:15 +0000 (Sat, 21 Apr 2012)
Log Message:
-----------
mise aniveau pour un traitement mon/ mutlilangue
Modified Paths:
--------------
trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.value.edit.gab
Modified: trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.value.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.value.edit.gab 2012-04-21 13:11:28 UTC (rev 4291)
+++ trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.value.edit.gab 2012-04-21 13:13:15 UTC (rev 4292)
@@ -18,6 +18,10 @@
<?php echo tep_draw_form('value_entry', FILENAME_CONFIGURATION,FILENAME_CFG_34.'action=' . (($action == 'value_new') ? 'value_insert' : 'value_update') . '&eid=' . modprodextra::$eid . '&vid=' . $_GET['vid'], 'post'); ?>
+
+ <?php /** @remarks loop for language or mode no language and use language id = 0 */ ?>
+ <?php if(modprodextra::$cInfo['fields']->active_value_language): ?>
+
<div class="tabs_lang">
<ul>
<?php for ($i=0, $n=sizeof($languages); $i<$n; $i++) { ?>
@@ -42,6 +46,23 @@
</div>
+
+ <?php else: ?>
+
+ <fieldset id="<?php echo 'lang-0' ?>">
+ <p class="block_input">
+ <label for="<?php echo 'sort_order[0]' ?>" title="<?php echo __('entry value sort help') ?>"><?php echo __('entry value sort'); ?></label>
+ <?php echo tep_draw_input_field('sort_order[0]','sort_order_0',modprodextra::$cInfo[0]['sort_order']) ; ?>
+ </p>
+ <p class="block_input">
+ <label for="<?php echo 'value[0]' ?>" title="<?php echo __('entry value value help') ?>"><?php echo __('entry value value') ; ?></label>
+ <?php echo tep_draw_input_field('value[0]','value_0', modprodextra::$cInfo[0]['epf_value']/*, 'size=64 maxlength=64'*/); ?>
+ </p>
+ </fieldset>
+
+ <?php endif; ?>
+
+
<div class="button_nav">
<?php echo tep_js_back(tep_href_link(modprodextra::FILENAME,FILENAME_CFG_34), __('listing fields') ); ?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-21 13:11:39
|
Revision: 4291
http://oscss.svn.sourceforge.net/oscss/?rev=4291&view=rev
Author: oscim
Date: 2012-04-21 13:11:28 +0000 (Sat, 21 Apr 2012)
Log Message:
-----------
suite travail genercode datatype
correction coquille
Modified Paths:
--------------
trunk/catalog/admin/includes/modules/configuration/modprodextra.php
Added Paths:
-----------
trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/gabarit/_DATATYPE_REPLACE_s/_DATATYPE_REPLACE_SEOTAG_criteres/
trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/gabarit/_DATATYPE_REPLACE_s/_DATATYPE_REPLACE_SEOTAG_criteres/display_edit.edit.gab
Modified: trunk/catalog/admin/includes/modules/configuration/modprodextra.php
===================================================================
--- trunk/catalog/admin/includes/modules/configuration/modprodextra.php 2012-04-21 09:31:39 UTC (rev 4290)
+++ trunk/catalog/admin/includes/modules/configuration/modprodextra.php 2012-04-21 13:11:28 UTC (rev 4291)
@@ -277,15 +277,28 @@
case 'value_update':
- $languages = tep_get_languages();
- for ($i=0, $n=sizeof($languages); $i<$n; $i++){
- $data_array = array('sort_order' => (int)(isset($_POST['sort_order'][$languages[$i]['id']]) ? tep_db_prepare_input($_POST['sort_order'][$languages[$i]['id']]) : 0),
- 'epf_value' => (isset($_POST['value'][$languages[$i]['id']]) ? tep_db_prepare_input($_POST['value'][$languages[$i]['id']]) : 0),
- 'languages_id'=> $languages[$i]['id']);
+
+ $fields=sqlproductsextrafields::fetch(array('id'=>(int)self::$eid ), true);
+
+ if($fields->active_value_language) {
+ foreach ( tep_get_languages() as $row){
+ $data_array = array(
+ 'sort_order' => (int)(isset($_POST['sort_order'][$row['id']]) ? tep_db_prepare_input($_POST['sort_order'][$row['id']]) : 0),
+ 'epf_value' => (isset($_POST['value'][$row['id']]) ? tep_db_prepare_input($_POST['value'][$row['id']]) :''),
+ 'languages_id'=> $row['id']
+ );
+ }
}
+ else{
+ $data_array = array(
+ 'sort_order' => (int)(isset($_POST['sort_order'][0]) ? tep_db_prepare_input($_POST['sort_order'][0]) : 0),
+ 'epf_value' => (isset($_POST['value'][0]) ? tep_db_prepare_input($_POST['value'][0]) : ''),
+ 'languages_id'=> '0'
+ );
+ }
tep_db_perform(TABLE_PRODUCTS_EXTRA_FIELDS_VALUES, $data_array, 'update',"value_id = '" . (int)$_GET['vid']."' and epf_id='".self::$eid."' ");
- tep_redirect(tep_href_link(FILENAME_CONFIGURATION, FILENAME_CFG_34 . 'eid=' . self::$eid.'&action=value_listing'));
+ tep_redirect(tep_href_link(FILENAME_CONFIGURATION, FILENAME_CFG_34 . '&eid=' . self::$eid.'&action=value_listing'));
break;
@@ -306,7 +319,7 @@
$r=tep_db_perform(TABLE_PRODUCTS_EXTRA_FIELDS_VALUES, $data_array);
}
- tep_redirect(tep_href_link(FILENAME_CONFIGURATION, FILENAME_CFG_34 . 'eid=' . self::$eid.'&action=value_listing'));
+ tep_redirect(tep_href_link(FILENAME_CONFIGURATION, FILENAME_CFG_34 . '&eid=' . self::$eid.'&action=value_listing'));
break;
@@ -357,7 +370,7 @@
$eid=self::$eid;
$lid=$languages;
- $query = tep_db_fetch_array(tep_db_query($sql="select epf_label from " . TABLE_PRODUCTS_EXTRA_FIELDS_LABELS . " where epf_id = " . (int)$eid . " and languages_id = " . (int)$lid));
+ $query = tep_db_fetch_array(tep_db_query($sql="select epf_label from " . TABLE_PRODUCTS_EXTRA_FIELDS_LABELS . " where epf_id = " . (int)$eid . " and ( languages_id = '" . (int)$lid."' OR languages_id = 0 ) "));
$current_label = $query['epf_label'];
if ($current_label == '') { // if invalid label get first matching label and use that information
@@ -384,6 +397,21 @@
$vid = (isset($_GET['vid']) ? $_GET['vid'] : '');
$confirm = (isset($_GET['confirm']) ? $_GET['confirm'] : '');
$parent_id = (isset($_GET['parent']) ? $_GET['parent'] : 0);
+
+ $list = array();
+ $list['fields']=sqlproductsextrafields::fetch(array('id'=>(int)self::$eid ), true);
+
+ if($list['fields']->active_value_language) {
+ foreach ( tep_get_languages() as $row){
+ $list[$row['id']] =array('sort_order'=>'','epf_value'=>'') ;
+ }
+ }
+ else{
+ $list[0] =array('sort_order'=>'','epf_value'=>'') ;
+ }
+
+ return $list;
+
break;
/**
@@ -391,15 +419,24 @@
*/
case 'value_delete':
case 'value_edit':
- $sql = tep_db_query($sql_="select * from " . TABLE_PRODUCTS_EXTRA_FIELDS_VALUES . " where epf_id = " . self::$eid. " and value_id = " . (int)$_GET['vid'] . " order by sort_order, epf_value");
- while ($v = tep_db_fetch_array($sql)) {
- $res[$v['languages_id']] =$v;
- }
- $languages = tep_get_languages();
- for ($i=0, $n=sizeof($languages); $i<$n; $i++){
- $list[$languages[$i]['id']] = $res[$languages[$i]['id']] ;
+ $list = array();
+ $list['fields']=sqlproductsextrafields::fetch(array('id'=>(int)self::$eid ), true);
+
+ if($list['fields']->active_value_language) {
+
+ $sql = tep_db_query($sql_="select * from " . TABLE_PRODUCTS_EXTRA_FIELDS_VALUES . " where epf_id = " . self::$eid. " and value_id = " . (int)$_GET['vid'] . " order by sort_order, epf_value");
+ while ($v = tep_db_fetch_array($sql)) {
+ $res[$v['languages_id']] =$v;
+ }
+
+ foreach ( tep_get_languages() as $row){
+ $list[$row['id']] =$res[$row['id']] ;
+ }
}
+ else{
+ $list[0] =array('sort_order'=>'','epf_value'=>'') ;
+ }
return $list;
break;
@@ -628,7 +665,7 @@
*/
private function build_value_list($epf_id, $lang_id, $value_array = '', $parent_id = 0) {
if (!is_array($value_array)) $value_array = array();
- $sql = tep_db_query($sql_="select * from " . TABLE_PRODUCTS_EXTRA_FIELDS_VALUES . " where epf_id = " . (int)$epf_id . " and languages_id = " . (int)$lang_id . " and parent_id = " . (int)$parent_id . " order by sort_order, epf_value");
+ $sql = tep_db_query($sql_="select * from " . TABLE_PRODUCTS_EXTRA_FIELDS_VALUES . " where epf_id = " . (int)$epf_id . " and (languages_id = " . (int)$lang_id . " OR languages_id = 0) and parent_id = " . (int)$parent_id . " order by sort_order, epf_value");
// echo $sql_;
while ($v = tep_db_fetch_array($sql)) {
$value_array[] = $v;
Added: trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/gabarit/_DATATYPE_REPLACE_s/_DATATYPE_REPLACE_SEOTAG_criteres/display_edit.edit.gab
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/gabarit/_DATATYPE_REPLACE_s/_DATATYPE_REPLACE_SEOTAG_criteres/display_edit.edit.gab (rev 0)
+++ trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/gabarit/_DATATYPE_REPLACE_s/_DATATYPE_REPLACE_SEOTAG_criteres/display_edit.edit.gab 2012-04-21 13:11:28 UTC (rev 4291)
@@ -0,0 +1,21 @@
+<?php
+/**
+ @licence GPL 2005-_CURRENTYEAR_ The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version _CURRENTVERSION_
+ @date _CURRENTDATE_
+ @author genrated by GenerCode
+ @encode UTF-8
+ @class _DATATYPE_REPLACE_SEOTAG_criteres
+ @brief manage _DATATYPE_REPLACE_
+*/
+global $languages_id;
+?>
+
+<div class="block_input">
+ <fieldset class="block_field">
+ <legend><?php echo __('category extra fields') ?></legend>
+ <?php echo _DATATYPE_REPLACE_SEOTAG_criteres::get_extra_fields(_DATATYPE_REPLACE_SEOTAG_criteres::$pID,$languages_id) ?>
+ </fieldset>
+</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-21 09:31:46
|
Revision: 4290
http://oscss.svn.sourceforge.net/oscss/?rev=4290&view=rev
Author: oscim
Date: 2012-04-21 09:31:39 +0000 (Sat, 21 Apr 2012)
Log Message:
-----------
correction diverse de fonctionnement
Modified Paths:
--------------
trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.listing.gab
trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.value.listing.gab
trunk/catalog/admin/includes/modules/configuration/modprodextra.php
trunk/catalog/install/includes/sql/mysql/tables/osc_configuration_group.sql
trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/gabarit/configuration/mod_DATATYPE_REPLACE_extra/draw.label.listing.gab
trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/modules/configuration/mod_DATATYPE_REPLACE_extra.php
trunk/dev/GenerCode/datatype/Modele/catalog/common/classes/datatype_drivers/Data__DATATYPE_REPLACE_.php
trunk/dev/GenerCode/datatype/Modele/install.xml
trunk/dev/GenerCode/datatype/index.php
Modified: trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.listing.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.listing.gab 2012-04-20 14:18:11 UTC (rev 4289)
+++ trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.listing.gab 2012-04-21 09:31:39 UTC (rev 4290)
@@ -19,7 +19,7 @@
<h3><?php echo __('HEADING_TITLE') ?></h3>
<div class="button_nav">
- <?php printf(CsrtAction::getLink('button_nav', __('BUTTON_NEW') ), '', tep_href_link(modprodextra::FILENAME, FILENAME_CFG_34. '&list_id=&vid=&action=new') ,'' );?>
+ <?php printf(CsrtAction::getLink('button_nav', __('BUTTON_NEW') ), '', tep_href_link(modprodextra::FILENAME, FILENAME_CFG_34. '&action=new') ,'' );?>
</div>
<div class="box_uniq">
@@ -37,13 +37,13 @@
</tr>
</thead>
<tbody>
- <?php foreach(modprodextra::$list as $epf) {?>
+ <?php foreach(modprodextra::$list as $epf): ?>
<tr class="dataTableRow">
<td class="dataTableContent"><?php echo $epf->epf_id; ?></td>
<td class="dataTableContent">
<?php $label_query = tep_db_query("select languages_id, epf_label from " . TABLE_PRODUCTS_EXTRA_FIELDS_LABELS . " where (epf_id = " . (int)$epf->epf_id . ") ");
while ($label = tep_db_fetch_array($label_query)) {
- echo tep_image(DIR_WS_CATALOG_LANGUAGES . modprodextra::$lang[$label['languages_id']]['directory'] . '/images/' . modprodextra::$lang[$label['languages_id']]['image'], modprodextra::$lang[$label['languages_id']]['name']) . ' ' . $label['epf_label'] . '<br>';
+ echo tep_language_image( modprodextra::$lang[$label['languages_id']]['directory'] . '/images/' . modprodextra::$lang[$label['languages_id']]['image'], modprodextra::$lang[$label['languages_id']]['name']) . ' ' . $label['epf_label'] . '<br>';
}
?>
</td>
@@ -65,7 +65,7 @@
<?php echo modprodextra::get_item_action($epf); ?>
</td>
</tr>
- <?php } ?>
+ <?php endforeach; ?>
</tbody>
</table>
</div>
Modified: trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.value.listing.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.value.listing.gab 2012-04-20 14:18:11 UTC (rev 4289)
+++ trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.value.listing.gab 2012-04-21 09:31:39 UTC (rev 4290)
@@ -14,8 +14,8 @@
global $action, $languages;
?>
<div class="button_nav">
- <?php printf(CsrtAction::getLink('button_nav', __('listing fields') ), '', tep_href_link(modprodextra::FILENAME, FILENAME_CFG_34. 'eid='.modprodextra::$eid.'&list_id=&vid=&parent=') ,'' );?>
- <?php printf(CsrtAction::getLink('button_nav', __('BUTTON_VALUE_ADD_LIST') ), '', tep_href_link(modprodextra::FILENAME, FILENAME_CFG_34. 'eid='.modprodextra::$eid.'&list_id=&vid=&parent=&action=value_new') ,'' );?>
+ <?php printf(CsrtAction::getLink('button_nav', __('listing fields') ), '', tep_href_link(modprodextra::FILENAME, FILENAME_CFG_34. '&eid='.modprodextra::$eid.'') ,'' );?>
+ <?php printf(CsrtAction::getLink('button_nav', __('BUTTON_VALUE_ADD_LIST') ), '', tep_href_link(modprodextra::FILENAME, FILENAME_CFG_34. '&eid='.modprodextra::$eid.'&action=value_new') ,'' );?>
</div>
<table class="dataTable" >
Modified: trunk/catalog/admin/includes/modules/configuration/modprodextra.php
===================================================================
--- trunk/catalog/admin/includes/modules/configuration/modprodextra.php 2012-04-20 14:18:11 UTC (rev 4289)
+++ trunk/catalog/admin/includes/modules/configuration/modprodextra.php 2012-04-21 09:31:39 UTC (rev 4290)
@@ -11,7 +11,7 @@
@brief Gestion Des configuration product extra fields
*/
-define('FILENAME_CFG_34',"gparentID=".@$_GET['gparentID']."&gID=&".@$_GET['gID']);
+define('FILENAME_CFG_34',"gparentID=".@$_GET['gparentID']."&gID=".@$_GET['gID']);
Class modprodextra{
@@ -361,7 +361,7 @@
$current_label = $query['epf_label'];
if ($current_label == '') { // if invalid label get first matching label and use that information
- $query = tep_db_fetch_array(tep_db_query("select l.epf_label, l.epf_format, l.languages_id, l.epf_id from " . TABLE_PRODUCTS_EXTRA_FIELDS_LABELS . " l join " . TABLE_PRODUCTS_EXTRA_FIELDS . " e where e.epf_id = l.epf_id and l.epf_active_for_language and e.epf_input_type order by e.epf_order"));
+ $query = tep_db_fetch_array(tep_db_query("select l.epf_label, l.epf_format, l.languages_id, l.epf_id from " . TABLE_PRODUCTS_EXTRA_FIELDS_LABELS . " l join " . TABLE_PRODUCTS_EXTRA_FIELDS . " e where e.epf_id = l.epf_id and epf_active_value_language and e.epf_input_type order by e.epf_order"));
$current_label = $query['epf_label'];
$eid = $query['epf_id'];
$lid = $query['languages_id'];
@@ -579,7 +579,7 @@
return sprintf(
CsrtAction::getFormat('row_action'),
'' ,
- (($item->epf_input_type)? sprintf(CsrtAction::getLink('row_action_right', IMAGE_EDIT, 'edit'), '', tep_href_link(self::FILENAME,FILENAME_CFG_34.'&eid=' . $item->epf_id . '&action=' . 'value_listing' ) ,'' ) :'').
+ (($item->epf_input_type)? sprintf(CsrtAction::getLink('row_action_right', IMAGE_EDIT, 'childs'), '', tep_href_link(self::FILENAME,FILENAME_CFG_34.'&eid=' . $item->epf_id . '&action=' . 'value_listing' ) ,'' ) :'').
sprintf(CsrtAction::getLink('row_action_right', IMAGE_EDIT, 'edit'), '', tep_href_link(self::FILENAME,FILENAME_CFG_34.'&eid=' . $item->epf_id . '&action=edit') ,'' ).
sprintf(CsrtAction::getLink('row_action_right', IMAGE_DELETE, 'delete'), 'fancy', tep_href_link(self::FILENAME, FILENAME_CFG_34.'&eid=' . $item->epf_id . '&action=delete') ,'' )
);
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_configuration_group.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_configuration_group.sql 2012-04-20 14:18:11 UTC (rev 4289)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_configuration_group.sql 2012-04-21 09:31:39 UTC (rev 4290)
@@ -19,7 +19,7 @@
configuration_group_description varchar(1) NULL,
sort_order int(5) default NULL,
visible int(1) default '1',
- configuration_group_parentid tinyint(1) NOT NULL,
+ configuration_group_parentid int(3) NOT NULL,
configuration_group_group_id varchar(64) NOT NULL,
configuration_group_key varchar(64) not null ,
PRIMARY KEY (configuration_group_id),
Modified: trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/gabarit/configuration/mod_DATATYPE_REPLACE_extra/draw.label.listing.gab
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/gabarit/configuration/mod_DATATYPE_REPLACE_extra/draw.label.listing.gab 2012-04-20 14:18:11 UTC (rev 4289)
+++ trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/gabarit/configuration/mod_DATATYPE_REPLACE_extra/draw.label.listing.gab 2012-04-21 09:31:39 UTC (rev 4290)
@@ -16,34 +16,34 @@
</div>
-<h3><?php echo __('HEADING_TITLE') ?></h3>
+<h3><?php echo __('heading title') ?></h3>
<div class="button_nav">
- <?php printf(CsrtAction::getLink('button_nav', __('BUTTON_NEW') ), '', tep_href_link(mod_DATATYPE_REPLACE_extra::FILENAME, FILENAME_CFG__DATATYPE_REPLACE_SEOTAG_. '&list_id=&vid=&action=new') ,'' );?>
+ <?php printf(CsrtAction::getLink('button_nav', __('button new') ), '', tep_href_link(mod_DATATYPE_REPLACE_extra::FILENAME, FILENAME_CFG__DATATYPE_REPLACE_SEOTAG_. '&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><?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 visibility'); ?></th>
<th class="tcenter"><?php echo __('table heading type'); ?></th>
- <th class="tcenter"><?php echo __('TABLE_HEADING_SPE_MODULE'); ?></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(mod_DATATYPE_REPLACE_extra::$list as $epf) {?>
+ <?php foreach(mod_DATATYPE_REPLACE_extra::$list as $epf): ?>
<tr class="dataTableRow">
<td class="dataTableContent"><?php echo $epf->epf_id; ?></td>
<td class="dataTableContent">
- <?php $label_query = tep_db_query("select languages_id, epf_label from " . TABLE_PRODUCTS_EXTRA_FIELDS_LABELS . " where (epf_id = " . (int)$epf->epf_id . ") ");
+ <?php $label_query = tep_db_query("select languages_id, epf_label from " . TABLE__DATATYPE_REPLACE_MAJ__EXTRA_FIELDS_LABELS . " where (epf_id = " . (int)$epf->epf_id . ") ");
while ($label = tep_db_fetch_array($label_query)) {
- echo tep_image(DIR_WS_CATALOG_LANGUAGES . mod_DATATYPE_REPLACE_extra::$lang[$label['languages_id']]['directory'] . '/images/' . mod_DATATYPE_REPLACE_extra::$lang[$label['languages_id']]['image'], mod_DATATYPE_REPLACE_extra::$lang[$label['languages_id']]['name']) . ' ' . $label['epf_label'] . '<br>';
+ echo tep_language_image( mod_DATATYPE_REPLACE_extra::$lang[$label['languages_id']]['directory'] . '/images/' . mod_DATATYPE_REPLACE_extra::$lang[$label['languages_id']]['image'], mod_DATATYPE_REPLACE_extra::$lang[$label['languages_id']]['name']) . ' ' . $label['epf_label'] . '<br>';
}
?>
</td>
@@ -65,7 +65,7 @@
<?php echo mod_DATATYPE_REPLACE_extra::get_item_action($epf); ?>
</td>
</tr>
- <?php } ?>
+ <?php endforeach; ?>
</tbody>
</table>
</div>
Modified: trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/modules/configuration/mod_DATATYPE_REPLACE_extra.php
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/modules/configuration/mod_DATATYPE_REPLACE_extra.php 2012-04-20 14:18:11 UTC (rev 4289)
+++ trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/modules/configuration/mod_DATATYPE_REPLACE_extra.php 2012-04-21 09:31:39 UTC (rev 4290)
@@ -11,7 +11,7 @@
@brief Gestion Des configuration product extra fields
*/
-define('FILENAME_CFG__DATATYPE_REPLACE_SEOTAG_',"gparentID=".@$_GET['gparentID']."&gID=&".@$_GET['gID']);
+define('FILENAME_CFG__DATATYPE_REPLACE_SEOTAG_',"gparentID=".@$_GET['gparentID']."&gID=".@$_GET['gID']);
Class mod_DATATYPE_REPLACE_extra{
Modified: trunk/dev/GenerCode/datatype/Modele/catalog/common/classes/datatype_drivers/Data__DATATYPE_REPLACE_.php
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/catalog/common/classes/datatype_drivers/Data__DATATYPE_REPLACE_.php 2012-04-20 14:18:11 UTC (rev 4289)
+++ trunk/dev/GenerCode/datatype/Modele/catalog/common/classes/datatype_drivers/Data__DATATYPE_REPLACE_.php 2012-04-21 09:31:39 UTC (rev 4290)
@@ -23,7 +23,7 @@
@var DataType array reg for seo class
*/
public $reg_anchors = array(
- '_DATATYPE_REPLACE_MAJ_' => '_DATATYPE_REPLACE_SEOTAG_'
+ '_DATATYPE_REPLACE_' => '_DATATYPE_REPLACE_SEOTAG_'
);
/**
@var DataType array reg check for control get params , please respect order $reg_anchors
@@ -35,7 +35,7 @@
@var DataType files for folder /_DATATYPE_REPLACE_
*/
public $reg_filenames = array(
- 'FILENAME__DATATYPE_REPLACE_' => FILENAME_DEFAULT // unique page
+ 'FILENAME__DATATYPE_REPLACE_MAJ_' => FILENAME_DEFAULT // unique page
);
/**
@var DataType Tables define
Modified: trunk/dev/GenerCode/datatype/Modele/install.xml
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/install.xml 2012-04-20 14:18:11 UTC (rev 4289)
+++ trunk/dev/GenerCode/datatype/Modele/install.xml 2012-04-21 09:31:39 UTC (rev 4290)
@@ -19,13 +19,24 @@
<file name="admin/includes/modules/_DATATYPE_REPLACE_/header_tags.php" />
<file name="admin/includes/modules/configuration/mod_DATATYPE_REPLACE_extra.php" />
+<!-- moduel page -->
<file name="admin/includes/gabarit/_DATATYPE_REPLACE_s/display_view.delete.gab" />
<file name="admin/includes/gabarit/_DATATYPE_REPLACE_s/display_view.edit.gab" />
<file name="admin/includes/gabarit/_DATATYPE_REPLACE_s/display_view.inline.gab" />
<file name="admin/includes/gabarit/_DATATYPE_REPLACE_s/display_view.listing.gab" />
<file name="admin/includes/gabarit/_DATATYPE_REPLACE_s/display_view.new.gab" />
<file name="admin/includes/gabarit/_DATATYPE_REPLACE_s/_DATATYPE_REPLACE_SEOTAG__description/display_edit.edit.gab" />
+<!-- extra config -->
+ <file name="admin/includes/gabarit/configuration/mod_DATATYPE_REPLACE_extra/draw.delete.gab" />
+ <file name="admin/includes/gabarit/configuration/mod_DATATYPE_REPLACE_extra/draw.label.edit.gab" />
+ <file name="admin/includes/gabarit/configuration/mod_DATATYPE_REPLACE_extra/draw.label.listing.gab" />
+ <file name="admin/includes/gabarit/configuration/mod_DATATYPE_REPLACE_extra/draw.label.new.gab" />
+ <file name="admin/includes/gabarit/configuration/mod_DATATYPE_REPLACE_extra/draw.value.delete.gab" />
+ <file name="admin/includes/gabarit/configuration/mod_DATATYPE_REPLACE_extra/draw.value.listing.gab" />
+ <file name="admin/includes/gabarit/configuration/mod_DATATYPE_REPLACE_extra/draw.value.edit.gab" />
+ <file name="admin/includes/gabarit/configuration/mod_DATATYPE_REPLACE_extra/draw.value.new.gab" />
+
<!-- datatype -->
<file name="common/classes/datatype_drivers/Data__DATATYPE_REPLACE_.php" />
@@ -65,6 +76,14 @@
<add type="php" lgref="fr_FR"><![CDATA[ define('BOX_TOOLS__DATATYPE_REPLACE_MAJ_', 'Datatype _DATATYPE_REPLACE_MAJ_');]]></add>
</add2endlg>
+ <add2endlg>
+ <file name="admin/includes/languages/%LANGUAGE%/boxes/01_configuration.php" />
+ <add type="php" lgref="fr_FR">
+ <![CDATA[ define('BOX_HEADING_CONF_OPTION_ANNONCE', 'Option _DATATYPE_REPLACE_MAJ_');
+ define('BOX_HEADING_CONF_EXTRA_ANNONCE', '_DATATYPE_REPLACE_MAJ_ EXTRA');]]>
+ </add>
+ </add2endlg>
+
<add2end>
<file name="admin/includes/boxes/08_cms.php" />
<add type="php"><![CDATA[$tabl_link[]= array(FILENAME__DATATYPE_REPLACE_MAJ_, 'BOX_TOOLS__DATATYPE_REPLACE_MAJ_', '_DATATYPE_REPLACE_',@$img['_DATATYPE_REPLACE_']);]]></add>
@@ -85,6 +104,23 @@
</add2end>
+
+ <sql>
+ <query>
+ <![CDATA[
+ insert into %DB_PREFIX%configuration_group ( configuration_group_title,visible,configuration_group_parentid, configuration_group_group_id, configuration_group_key) values ('OPTION_ANNONCE', 1, 127, '1', 'OPTION_ANNONCE');
+
+ insert into %DB_PREFIX%configuration_group ( configuration_group_title,visible,configuration_group_parentid, configuration_group_group_id, configuration_group_key) values ( 'EXTRA_ANNONCE', 1, LAST_INSERT_ID(), '1', 'MODANNONCEEXTRA');
+
+ ]]>
+ </query>
+ <remove_query>
+ <![CDATA[
+ delete from %DB_PREFIX%configuration_group where configuration_group_id='32'
+ ]]></remove_query>
+ </sql>
+
+
<filesql> </filesql>
</contrib>
\ No newline at end of file
Modified: trunk/dev/GenerCode/datatype/index.php
===================================================================
--- trunk/dev/GenerCode/datatype/index.php 2012-04-20 14:18:11 UTC (rev 4289)
+++ trunk/dev/GenerCode/datatype/index.php 2012-04-21 09:31:39 UTC (rev 4290)
@@ -48,6 +48,7 @@
$conf->NAME = strtoupper($conf->name);
$conf->Name = ucwords($conf->name);
$conf->seotag = tep_db_prepare_input($_GET['seotag']);
+
$conf->head_tag = (isset($_GET['head_tag']) && $_GET['head_tag']=='active') ? true : false;
$conf->link_to_customers = (isset($_GET['link_to_customers']) && $_GET['link_to_customers']=='active') ? true : false;
$conf->level = 'stable';
@@ -120,7 +121,7 @@
// return false;
//
-// return true;
+ return true;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-20 14:18:21
|
Revision: 4289
http://oscss.svn.sourceforge.net/oscss/?rev=4289&view=rev
Author: oscim
Date: 2012-04-20 14:18:11 +0000 (Fri, 20 Apr 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/catalog/admin/includes/boxes/08_cms.php
Modified: trunk/catalog/admin/includes/boxes/08_cms.php
===================================================================
--- trunk/catalog/admin/includes/boxes/08_cms.php 2012-04-20 06:46:31 UTC (rev 4288)
+++ trunk/catalog/admin/includes/boxes/08_cms.php 2012-04-20 14:18:11 UTC (rev 4289)
@@ -12,5 +12,4 @@
$tabl_link[]= array(FILENAME_NAVIGATION_LINKS, 'BOX_NAVIGATION_LINK', 'nav',@$img['navigation_link']);
$tabl_link[]= array('browser.php', 'BOX_NAVIGATION_IMAGE', 'images',@$img['navigation_image']);
-
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-20 06:46:38
|
Revision: 4288
http://oscss.svn.sourceforge.net/oscss/?rev=4288&view=rev
Author: oscim
Date: 2012-04-20 06:46:31 +0000 (Fri, 20 Apr 2012)
Log Message:
-----------
nettoyage suite
Modified Paths:
--------------
trunk/catalog/Documents/admin/data/repository_sources.xml
Modified: trunk/catalog/Documents/admin/data/repository_sources.xml
===================================================================
--- trunk/catalog/Documents/admin/data/repository_sources.xml 2012-04-20 06:29:31 UTC (rev 4287)
+++ trunk/catalog/Documents/admin/data/repository_sources.xml 2012-04-20 06:46:31 UTC (rev 4288)
@@ -7,8 +7,7 @@
<description>official repository</description>
<repository>http://pluginsv2.oscss.org/services.php</repository>
<ident>
- <user>3</user>
- <token>535bb3a85ff52c66ef19f6a6ca29bfb78665d5c2</token>
+
</ident>
<service>
<listing>listing_package</listing>
@@ -16,22 +15,6 @@
<download>download_package</download>
</service>
</channel>
-
- <channel>
- <title>oscim</title>
- <key>oscim</key>
- <description>oscim repository</description>
- <repository>http://exts.oscim.org/services.php</repository>
- <ident>
- <user>3</user>
- <token>535bb3a85ff52c66ef19f6a6ca29bfb78665d5c2</token>
- </ident>
- <service>
- <listing>listing_package</listing>
- <view>detail_package</view>
- <download>download_package</download>
- </service>
- </channel>
<channel>
<title>Local</title>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-20 06:29:41
|
Revision: 4287
http://oscss.svn.sourceforge.net/oscss/?rev=4287&view=rev
Author: oscim
Date: 2012-04-20 06:29:31 +0000 (Fri, 20 Apr 2012)
Log Message:
-----------
correction coquille, dans ce context d'une installation sans les datas, et donc tous les resultat des module et boxe sont null
Modified Paths:
--------------
trunk/catalog/includes/classes/core_page/overlay/oscss_modules.php
Modified: trunk/catalog/includes/classes/core_page/overlay/oscss_modules.php
===================================================================
--- trunk/catalog/includes/classes/core_page/overlay/oscss_modules.php 2012-04-20 05:49:44 UTC (rev 4286)
+++ trunk/catalog/includes/classes/core_page/overlay/oscss_modules.php 2012-04-20 06:29:31 UTC (rev 4287)
@@ -1,9 +1,9 @@
<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
/**
- \licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ \licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
\package osCSS-2 <www http://www.oscss.org>
- \version 2.1.0
- \date 15/12/10, 15:45
+ \version 2.1.1
+ \date 20/04/2012, 15:45
\author oscim <mail aur...@os...> <www http://www.oscim.fr>
\encode UTF-8
\file page.oscss_modules.php
@@ -14,12 +14,16 @@
class oscss_modules{
/**
- private
- pile qui est appelé lors du _call d'un module et qui charge les commande en atente
+ @var pile qui est appelé lors du _call d'un module et qui charge les commande en atente
*/
private $temp;
-
- var $modules_chargee;
+ /**
+ @var
+ */
+ public $modules_chargee;
+ /**
+ @var
+ */
protected static $_instance;
/**
@@ -43,8 +47,7 @@
/**
- * \brief
- Scan template modules folders and display template boxes if exist, if not display default oscss boxes
+ * \brief Scan template modules folders and display template boxes if exist, if not display default oscss boxes
le type permet de classer les box par groupe
Seul l'extentions .php est autoriser
cherche dans plugins theme, puis, boxes theme, puis noyau.
@@ -74,6 +77,7 @@
$path_lg= DIR_WS_LANGUAGES.$page->page['language'].'/modules/';
}
+;
// if(isset($page->page['modules']['list'][$name_clean]) ) return false;
$array=(isset($page->page['modules']['list'][$name_clean])) ? $page->page['modules']['list'][$name_clean] : array();
$array['name']=$file_to_display;
@@ -126,7 +130,7 @@
if ($exe) {
$page->page['modules']['list'][$mod['name_clean']]['result_sql']=$res;
// if (page::TestFile($mod['dir_lang']. $mod['name'])) require_once($mod['dir_lang']. $mod['name'] );
- if(($path_lg=$page->fix_file($mod['dir_lang'] . $mod['name'],true)) !=false) $page->pile_file_lang($path_lg);
+ if(($path_lg=$page->fix_file($mod['dir_lang'] . $mod['name'],true)) !=false) $page->pile_file_lang($path_lg);
return $mod['path'];
}
$this->modules_chargee[$key]=$page->page['modules'][$type][$key]='false';
@@ -137,6 +141,9 @@
if (isset($page->page['modules']['sort'])) {
foreach ($page->page['modules']['sort'] as $key=>$value){
+ if(empty($key))
+ continue;
+
/** Charment de la pile d'action en attente */
if (isset($this->temp[$key]) )
$page->page['modules'][$type][$key]=$this->temp[$key]['value'];
@@ -148,10 +155,15 @@
( @$page->page['modules'][$type][$key] !='false' )
) {
$mod=$this->ret_modules($key);
+
+ // if not active, retrun is ''
+ if(!is_array($mod))
+ continue;
+
// $file=$mod['dir_lang'] . $mod['name'] ;
$function='sql_'.$mod['name_clean'];
- require_once($mod['path']);
+ require_once( $mod['path']);
if ( ($res=$this->test_value_content($function)) !=false) $exe=true;
elseif(function_exists($function)) $exe=false;
@@ -161,7 +173,7 @@
if(page::TestFile($mod['dir_lang']. $mod['name']))require_once($mod['dir_lang']. $mod['name']);
if(($path_lg=$page->fix_file($mod['dir_lang'] . $mod['name'],true)) !=false) $page->pile_file_lang($path_lg);
-// if (page::TestFile($file)) require_once($file);
+
$this->modules_chargee[$key]=@$page->page['modules'][$type][$key];
$page->page['modules']['list'][$key]['result_sql']=$res;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-20 05:49:50
|
Revision: 4286
http://oscss.svn.sourceforge.net/oscss/?rev=4286&view=rev
Author: oscim
Date: 2012-04-20 05:49:44 +0000 (Fri, 20 Apr 2012)
Log Message:
-----------
coquille
Modified Paths:
--------------
trunk/catalog/admin/includes/languages/fr_FR/widget/HelpConfig.txt
trunk/catalog/admin/includes/widget/HelpConfig.php
Modified: trunk/catalog/admin/includes/languages/fr_FR/widget/HelpConfig.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/widget/HelpConfig.txt 2012-04-20 05:43:47 UTC (rev 4285)
+++ trunk/catalog/admin/includes/languages/fr_FR/widget/HelpConfig.txt 2012-04-20 05:49:44 UTC (rev 4286)
@@ -10,7 +10,7 @@
*/
-$lang['widget help config index']="Configuration minimun" ;
+$lang['widget help config ']="Configuration minimun" ;
$lang['widget help config config_35']="Configuration des produits" ;
$lang['widget help config config_39']="Configuration des utilisateurs - Aides" ;
$lang['widget help config config_40']="Configuration du processus - Aides" ;
Modified: trunk/catalog/admin/includes/widget/HelpConfig.php
===================================================================
--- trunk/catalog/admin/includes/widget/HelpConfig.php 2012-04-20 05:43:47 UTC (rev 4285)
+++ trunk/catalog/admin/includes/widget/HelpConfig.php 2012-04-20 05:49:44 UTC (rev 4286)
@@ -11,39 +11,47 @@
global $conf;
$DB=Database::getInstance();
+
+switch(@$_GET['type']){
+ case 'home': // home
+ case 'index': // home
+ default:
+ if ( $_SESSION['login_lognum'] > 0)
+ return false;
+}
?>
<div id="HelpConfig" class="<?php echo $widg['class'] ?>" >
<h3><?php echo __('widget help config '.@$_GET['type']) ?></h3>
-
+
<?php
switch(@$_GET['type']){
case 'config_39': // user
echo '<p>'.
sprintf(
- __('widget text help config_39'),
+ __('widget text help config_39'),
'<a href="'.tep_href_link(FILENAME_CONFIGURATION, 'gparentID=39&gID=1').'">'.__('HelpConfig link myshop').'</a>'
).
'</p>';
break;
- case 'config_40': // orders
+ case 'config_40': // orders
echo '<p>'.
sprintf(
- __('widget text help config_40'),
+ __('widget text help config_40'),
'<a href="'.tep_href_link(FILENAME_CONFIGURATION, 'gparentID=40&gID=129').'">'.__('HelpConfig link config_40 step 1').'</a>',
'<a href="'.tep_href_link(FILENAME_CONFIGURATION, 'gparentID=40&gID=7').'">'.__('HelpConfig link config_40 step 2').'</a>'
).
'</p>';
break;
- case 'config_110': // base
+ case 'config_110': // base
echo '<p>'.
sprintf(
- __('widget text help config_110'),
+ __('widget text help config_110'),
'<a href="'.tep_href_link(FILENAME_CONFIGURATION, 'gparentID=110&gID=1').'">'.__('HelpConfig link myshop').'</a>'
).
'</p>';
@@ -56,24 +64,23 @@
if( tep_not_null($res->modified) && $res->modified > $res->added )
echo '<p>'.
sprintf(
- __('widget text help config_100 step 1'),
+ __('widget text help config_100 step 1'),
'<a href="'.tep_href_link(FILENAME_CONFIGURATION, 'gparentID=100&gID=29').'">'.__('HelpConfig link template').'</a>'
).
'</p>';
break;
- case 'home': // home
- case 'index': // home
+ case 'home': // home
+ case 'index': // home
default:
if($_SESSION['login_lognum'] == 0){
echo '<p>'.
sprintf(
- __('widget text help index'),
+ __('widget text help index'),
'<a href="'.tep_href_link('adminAccount.php', 'action=init_menu').'">'.__('HelpConfig link init menu').'</a>'
).
'</p>';
}
-
break;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-20 05:43:54
|
Revision: 4285
http://oscss.svn.sourceforge.net/oscss/?rev=4285&view=rev
Author: oscim
Date: 2012-04-20 05:43:47 +0000 (Fri, 20 Apr 2012)
Log Message:
-----------
correction des menu suite test
Modified Paths:
--------------
trunk/catalog/admin/includes/boxes/00_hidden.php
trunk/catalog/admin/includes/boxes/01_configuration.php
trunk/catalog/admin/includes/boxes/04_tools.php
trunk/catalog/admin/includes/boxes/07_catalog.php
trunk/catalog/admin/includes/boxes/08_cms.php
trunk/catalog/admin/includes/boxes/09_commercial.php
Modified: trunk/catalog/admin/includes/boxes/00_hidden.php
===================================================================
--- trunk/catalog/admin/includes/boxes/00_hidden.php 2012-04-19 17:48:51 UTC (rev 4284)
+++ trunk/catalog/admin/includes/boxes/00_hidden.php 2012-04-20 05:43:47 UTC (rev 4285)
@@ -36,9 +36,4 @@
NOTE: Ne placer dans ce fichier que les liens qui ne doivent pas apparaitre dans le menu, mais qui doivent être idexe dans l agestion des acls.
*/
-
-
-/* Begin ATTRIBUTEMANAGER_stable - installed by CIP */
-$tabl_link[]= array('attributeManager.php', '', '');
-/* End ATTRIBUTEMANAGER_stable - installed by CIP */
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/boxes/01_configuration.php
===================================================================
--- trunk/catalog/admin/includes/boxes/01_configuration.php 2012-04-19 17:48:51 UTC (rev 4284)
+++ trunk/catalog/admin/includes/boxes/01_configuration.php 2012-04-20 05:43:47 UTC (rev 4285)
@@ -15,50 +15,57 @@
// construct structur and hierarchie
foreach($_query->fetchAllAssoc() as $row){
$trace[$row['cgID']] = $row['gparentID'];
- if ((int)$row['gparentID'] ==0)
+ if ((int)$row['gparentID'] ==0)
$tabl_link[$row['cgID']]= array(
- 'ss_menu',
- $row['cgTitle'],
- 'config_'.$row['cgID'],
+ 'ss_menu',
+ $row['cgTitle'],
+ 'config_'.$row['cgID'],
@$img['config_'.$row['cgID']]
);
elseif((int)$row['is_sub_menu'] ==1 /*&&*/ ){
$tabl_link[$row['gparentID']][4][$row['cgID']]= array(
'ss_menu',
- $row['cgTitle'],
- 'config_'.$row['cgID'],
+ $row['cgTitle'],
+ 'config_'.$row['cgID'],
@$img['config_'.$row['cgID']]
);
}
-
+
}
- // peuple by link page
+ // peuple by link page
foreach($_query->fetchAllAssoc() as $row){
if((int)$row['is_sub_menu'] !=1 && (int)$row['gparentID'] !=0 && isset($trace[$row['gparentID']]) ) {
- if( (int)$trace[$row['gparentID']] == 0 )
+ if( (int)$trace[$row['gparentID']] == 0 )
$tabl_link[$row['gparentID']][4][$row['cgID']]= array(
- FILENAME_CONFIGURATION.'?gparentID=' . $row['gparentID'].'&gID=' . $row['cgID'],
- $row['cgTitle'],
- 'config_'.$row['cgID'],
- @$img['config_'.$row['cgID']]
+ FILENAME_CONFIGURATION.'?gparentID=' . $row['gparentID'].'&gID=' . $row['cgID'],
+ $row['cgTitle'],
+ 'config_'.$row['cgID'],
+ @$img['config_'.$row['cgID']]
);
else
$tabl_link[(int)$trace[$row['gparentID']]][4][(int)$row['gparentID']][4][]= array(
FILENAME_CONFIGURATION.'?gparentID='. $row['gparentID'] . '&gID=' . $row['cgID'],
- $row['cgTitle'],
- 'config_'.$row['cgID'],
- @$img['config_'.$row['cgID']]
+ $row['cgTitle'],
+ 'config_'.$row['cgID'],
+ @$img['config_'.$row['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');
+ $tabl_link[] = array(
+ 'ss_menu',
+ 'BOX_ZONE_AND_TAXE',
+ 'taxes_in_zone',
+ @$img['taxes_in_zone'],
+ 4=> array(
+ array(FILENAME_COUNTRIES, 'BOX_TAXES_COUNTRIES', 'countries'),
+ array(FILENAME_GEO_ZONES, 'BOX_TAXES_GEO_ZONES', 'taxes_geo_zone'),
+ array(FILENAME_TAX_CLASSES, 'BOX_TAXES_TAX_CLASSES', 'taxes_classes')
+ )
+ );
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/boxes/04_tools.php
===================================================================
--- trunk/catalog/admin/includes/boxes/04_tools.php 2012-04-19 17:48:51 UTC (rev 4284)
+++ trunk/catalog/admin/includes/boxes/04_tools.php 2012-04-20 05:43:47 UTC (rev 4285)
@@ -23,7 +23,5 @@
$tabl_link[608][4][]= array(FILENAME_CURRENCIES, 'BOX_LOCALIZATION_CURRENCIES', 'currencies');
$tabl_link[608][4][]= array(FILENAME_CRONJOB, 'BOX_TOOLS_CRONJOB', 'database',@$img['database']);
-/* Begin IMPORTEXPORT_unstable - installed by CIP */
-$tabl_link[]= array(FILENAME_IMPORTEXPORT, 'BOX_CATALOG_IMPORTEXPORT', 'specials', @$img['manufacturers']);
-/* End IMPORTEXPORT_unstable - installed by CIP */
+
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/boxes/07_catalog.php
===================================================================
--- trunk/catalog/admin/includes/boxes/07_catalog.php 2012-04-19 17:48:51 UTC (rev 4284)
+++ trunk/catalog/admin/includes/boxes/07_catalog.php 2012-04-20 05:43:47 UTC (rev 4285)
@@ -1,19 +1,16 @@
-<?php
-/**
- @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.1
- @date 03/03/2012, 17:23
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
- $tabl_link[]= array(FILENAME_PRODUCTS, 'BOX_CATALOG_PRODUCTS', 'products', @$img['products']);
- $tabl_link[]= array(FILENAME_PRODUCTS.'?cPath=&action=new', 'BOX_CATALOG_PRODUCT_ADD', 'product_add', @$img['product_add']);
- $tabl_link[]= array(FILENAME_PRODUCTS.'?expected=true', 'BOX_CATALOG_PRODUCTS_EXPECTED', 'products', @$img['products']);
- $tabl_link[]= array(FILENAME_ATTRIBUTES, 'BOX_CATALOG_ATTIBUTES', 'attributes', @$img['attributes']);
- $tabl_link[]= array(FILENAME_STOCK, 'BOX_CATALOG_STOCK', 'stock', @$img['stock']);
+<?php
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 03/03/2012, 17:23
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+ $tabl_link[]= array(FILENAME_PRODUCTS, 'BOX_CATALOG_PRODUCTS', 'products', @$img['products']);
+ $tabl_link[]= array(FILENAME_PRODUCTS.'?cPath=&action=new', 'BOX_CATALOG_PRODUCT_ADD', 'product_add', @$img['product_add']);
+ $tabl_link[]= array(FILENAME_PRODUCTS.'?expected=true', 'BOX_CATALOG_PRODUCTS_EXPECTED', 'products', @$img['products']);
+ $tabl_link[]= array(FILENAME_ATTRIBUTES, 'BOX_CATALOG_ATTIBUTES', 'attributes', @$img['attributes']);
+ $tabl_link[]= array(FILENAME_STOCK, 'BOX_CATALOG_STOCK', 'stock', @$img['stock']);
-/* Begin SPECIALS_stable - installed by CIP */
-$tabl_link[]= array(FILENAME_SPECIALS, 'BOX_CATALOG_SPECIALS', 'specials', @$img['specials']);
-/* End SPECIALS_stable - installed by CIP */
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/boxes/08_cms.php
===================================================================
--- trunk/catalog/admin/includes/boxes/08_cms.php 2012-04-19 17:48:51 UTC (rev 4284)
+++ trunk/catalog/admin/includes/boxes/08_cms.php 2012-04-20 05:43:47 UTC (rev 4285)
@@ -12,7 +12,5 @@
$tabl_link[]= array(FILENAME_NAVIGATION_LINKS, 'BOX_NAVIGATION_LINK', 'nav',@$img['navigation_link']);
$tabl_link[]= array('browser.php', 'BOX_NAVIGATION_IMAGE', 'images',@$img['navigation_image']);
-/* Begin ANNUAIRE_stable - installed by CIP */
-$tabl_link[]= array(FILENAME_ANNUAIRE, 'BOX_TOOLS_ANNUAIRE', 'annuaire',@$img['annuaire']);
-/* End ANNUAIRE_stable - installed by CIP */
+
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/boxes/09_commercial.php
===================================================================
--- trunk/catalog/admin/includes/boxes/09_commercial.php 2012-04-19 17:48:51 UTC (rev 4284)
+++ trunk/catalog/admin/includes/boxes/09_commercial.php 2012-04-20 05:43:47 UTC (rev 4285)
@@ -10,7 +10,7 @@
$tabl_link[] = array(
'ss_menu',
- 'BOX_TOOLS_MAIL',
+ 'BOX_TOOLS_MAIL',
'mail',
@$img['mail'],
4=> array(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-19 17:48:59
|
Revision: 4284
http://oscss.svn.sourceforge.net/oscss/?rev=4284&view=rev
Author: oscim
Date: 2012-04-19 17:48:51 +0000 (Thu, 19 Apr 2012)
Log Message:
-----------
correction coquille sur la gestion de l'activation des module BO/FO dans les extensions
correction et ajsutement de class sqlxxx
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/drivers/sqlconfiguration.php
trunk/catalog/admin/includes/gabarit/package/display_view.package.config.gab
trunk/catalog/admin/includes/modules/pages/package.php
Modified: trunk/catalog/admin/includes/classes/drivers/sqlconfiguration.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlconfiguration.php 2012-04-19 15:10:17 UTC (rev 4283)
+++ trunk/catalog/admin/includes/classes/drivers/sqlconfiguration.php 2012-04-19 17:48:51 UTC (rev 4284)
@@ -1,10 +1,10 @@
<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 22/09/11, 20:11
+ @date 19/4/2012, 20:11
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class manage link table configuration
@@ -24,14 +24,17 @@
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'];
+ $sql_data_array['configuration_value'] = ((isset($option['value'])) ? $option['value'] : '' );
+
+ $sql_data_array['configuration_title'] = ( (isset($option['title']) || empty($option['title']) ) ?$option['title'] : strtoupper($option['key'].'_S'));
+ $sql_data_array['configuration_description'] = ( (isset($option['description']) || empty($option['description']) ) ?$option['description'] : strtoupper($option['key'].'_L'));
+
+// if(isset($option['id'])) $sql_data_array['configuration_id'] = $option['id'];
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'];
+// 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'];
@@ -58,9 +61,9 @@
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['title'])) $sql_data_array['configuration_title'] = $option['title'];
+ $sql_data_array['configuration_value'] = ((isset($option['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');
Modified: trunk/catalog/admin/includes/gabarit/package/display_view.package.config.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/package/display_view.package.config.gab 2012-04-19 15:10:17 UTC (rev 4283)
+++ trunk/catalog/admin/includes/gabarit/package/display_view.package.config.gab 2012-04-19 17:48:51 UTC (rev 4284)
@@ -44,7 +44,7 @@
<td><?php echo $row->filename ?></td>
<td class="tcenter">
<?php if( in_array( $row->type, array('module')) ): ?>
- <?php echo package::status_flag(in_array($row->filename,explode(';', @package::$code_inistalletd_array[$row->typetype]['value'])), 'dbset='.$row->id); ?>
+ <?php echo package::status_flag(in_array($row->filename,explode(';', @package::$code_inistalletd_array[$row->typetype]['value'.((!$row->core)?'':'_BO' )])), 'dbset='.$row->id); ?>
<?php else: ?>
<?php echo tep_image(DIR_WS_ICONS . 'icon_status_green.gif', IMAGE_ICON_STATUS_GREEN) ?>
<?php endif; ?>
Modified: trunk/catalog/admin/includes/modules/pages/package.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/package.php 2012-04-19 15:10:17 UTC (rev 4283)
+++ trunk/catalog/admin/includes/modules/pages/package.php 2012-04-19 17:48:51 UTC (rev 4284)
@@ -225,16 +225,27 @@
if(!in_array($v , $tss) && $v !='.php' )
$tss[]=str_replace('.php.php', '.php',$v);
+ // name configuration_key
+ $config_key = self::$code_inistalletd_array[$objres->typetype]['key'].$core;
- $check_query = tep_db_query("select configuration_value from " . TABLE_CONFIGURATION . " where configuration_key = '" . self::$code_inistalletd_array[$objres->typetype]['key'].$core . "'");
+// $check_query = tep_db_query($sql="select configuration_value from " . TABLE_CONFIGURATION . " where configuration_key = '" . $config_key . "'");
- if (!tep_db_num_rows($check_query)) {
- tep_db_query($sql="insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added) values ('Installed Modules ".$objres->typetype."', '" . self::$code_inistalletd_array[$objres->typetype]['key'].$core . "', '" .$tss . ";', 'This is automatically updated. No need to edit.', '6', '0', now())");
+ $test = sqlconfiguration::fetch(array('key'=>$config_key));
+// var_dump($test);
+if($test ==false){
+// if (tep_db_num_rows($check_query) >=0 ) {
+
+// tep_db_query($sql="insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added) values ('Installed Modules ".$objres->typetype."', '" . $config_key . ";','" . implode(';', $tss) . "', 'This is automatically updated. No need to edit.', '6', '0', now())");
+
+ $res = sqlconfiguration::create(array('key'=>$config_key, 'value'=>implode(';', $tss) ));
}
+ else {
+ $res = sqlconfiguration::update(array('key'=>$config_key, 'value'=>implode(';', $tss) ));
+// tep_db_query($sql="update " . TABLE_CONFIGURATION . " set configuration_value = '" . implode(';', $tss) . "', last_modified = now() where configuration_key = '" . $config_key. "'");
+ }
+// var_dump($res);
- tep_db_query($sql="update " . TABLE_CONFIGURATION . " set configuration_value = '" . implode(';', $tss) . "', last_modified = now() where configuration_key = '" . self::$code_inistalletd_array[$objres->typetype]['key'].$core . "'");
-
$objres =sqlcip::fetch(array('id'=>$objres->cip_id), true);
if(!isset($_GET['forceajax']))
@@ -444,6 +455,7 @@
break;
case 'config':
$action='config';
+// var_dump(self::$objChild);
call_user_func(array(self::$objChild, 'load_config_value'));
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-19 15:10:28
|
Revision: 4283
http://oscss.svn.sourceforge.net/oscss/?rev=4283&view=rev
Author: oscim
Date: 2012-04-19 15:10:17 +0000 (Thu, 19 Apr 2012)
Log Message:
-----------
Ajsutement du code des boxe pour plus de claret?\195?\169
correction coquille , ajsutement
ajout commentaire
Modified Paths:
--------------
trunk/catalog/admin/includes/boxes/04_tools.php
trunk/catalog/admin/includes/boxes/07_catalog.php
trunk/catalog/admin/includes/boxes/08_cms.php
trunk/catalog/admin/includes/boxes/09_commercial.php
trunk/catalog/admin/includes/boxes/10_orders.php
trunk/catalog/admin/includes/classes/qtproUtility.php
trunk/catalog/admin/includes/exts/package/tags/sql.php
trunk/catalog/admin/includes/javascript/modules/pages/products.js.php
trunk/catalog/admin/includes/modules/pages/stock.php
trunk/catalog/index.php
trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/modules/rapport/rp__DATATYPE_REPLACE_.php
Modified: trunk/catalog/admin/includes/boxes/04_tools.php
===================================================================
--- trunk/catalog/admin/includes/boxes/04_tools.php 2012-04-19 13:12:03 UTC (rev 4282)
+++ trunk/catalog/admin/includes/boxes/04_tools.php 2012-04-19 15:10:17 UTC (rev 4283)
@@ -22,4 +22,8 @@
$tabl_link[608][4][]= array(FILENAME_CONFIGURATION.'?gmod=modsysinfo', 'BOX_TOOLS_SERVER_INFO', 'server_info');
$tabl_link[608][4][]= array(FILENAME_CURRENCIES, 'BOX_LOCALIZATION_CURRENCIES', 'currencies');
$tabl_link[608][4][]= array(FILENAME_CRONJOB, 'BOX_TOOLS_CRONJOB', 'database',@$img['database']);
+
+/* Begin IMPORTEXPORT_unstable - installed by CIP */
+$tabl_link[]= array(FILENAME_IMPORTEXPORT, 'BOX_CATALOG_IMPORTEXPORT', 'specials', @$img['manufacturers']);
+/* End IMPORTEXPORT_unstable - installed by CIP */
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/boxes/07_catalog.php
===================================================================
--- trunk/catalog/admin/includes/boxes/07_catalog.php 2012-04-19 13:12:03 UTC (rev 4282)
+++ trunk/catalog/admin/includes/boxes/07_catalog.php 2012-04-19 15:10:17 UTC (rev 4283)
@@ -12,4 +12,8 @@
$tabl_link[]= array(FILENAME_PRODUCTS.'?expected=true', 'BOX_CATALOG_PRODUCTS_EXPECTED', 'products', @$img['products']);
$tabl_link[]= array(FILENAME_ATTRIBUTES, 'BOX_CATALOG_ATTIBUTES', 'attributes', @$img['attributes']);
$tabl_link[]= array(FILENAME_STOCK, 'BOX_CATALOG_STOCK', 'stock', @$img['stock']);
+
+/* Begin SPECIALS_stable - installed by CIP */
+$tabl_link[]= array(FILENAME_SPECIALS, 'BOX_CATALOG_SPECIALS', 'specials', @$img['specials']);
+/* End SPECIALS_stable - installed by CIP */
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/boxes/08_cms.php
===================================================================
--- trunk/catalog/admin/includes/boxes/08_cms.php 2012-04-19 13:12:03 UTC (rev 4282)
+++ trunk/catalog/admin/includes/boxes/08_cms.php 2012-04-19 15:10:17 UTC (rev 4283)
@@ -11,4 +11,8 @@
$tabl_link[]= array(FILENAME_CMS_CONTENT, 'BOX_CMS_CONTENT', 'cms_content',@$img['cms_content']);
$tabl_link[]= array(FILENAME_NAVIGATION_LINKS, 'BOX_NAVIGATION_LINK', 'nav',@$img['navigation_link']);
$tabl_link[]= array('browser.php', 'BOX_NAVIGATION_IMAGE', 'images',@$img['navigation_image']);
+
+/* Begin ANNUAIRE_stable - installed by CIP */
+$tabl_link[]= array(FILENAME_ANNUAIRE, 'BOX_TOOLS_ANNUAIRE', 'annuaire',@$img['annuaire']);
+/* End ANNUAIRE_stable - installed by CIP */
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/boxes/09_commercial.php
===================================================================
--- trunk/catalog/admin/includes/boxes/09_commercial.php 2012-04-19 13:12:03 UTC (rev 4282)
+++ trunk/catalog/admin/includes/boxes/09_commercial.php 2012-04-19 15:10:17 UTC (rev 4283)
@@ -7,9 +7,18 @@
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
- $tabl_link[609]= array('ss_menu', 'BOX_TOOLS_MAIL', 'mail',@$img['mail']);
- $tabl_link[609][4][]= array(FILENAME_NEWSLETTERS, 'BOX_TOOLS_NEWSLETTER_MANAGER', 'newsletters',@$img['newsletters']);
- $tabl_link[609][4][]= array('newslettersModeles.php', 'BOX_TOOLS_NEWSLETTER_MANAGER_MODELES', 'newsletters',@$img['newsletters']);
+
+ $tabl_link[] = array(
+ 'ss_menu',
+ 'BOX_TOOLS_MAIL',
+ 'mail',
+ @$img['mail'],
+ 4=> array(
+ array(FILENAME_NEWSLETTERS, 'BOX_TOOLS_NEWSLETTER_MANAGER', 'newsletters',@$img['newsletters']),
+ array('newslettersModeles.php', 'BOX_TOOLS_NEWSLETTER_MANAGER_MODELES', 'newsletters',@$img['newsletters']),
+ )
+ );
+
// $tabl_link[609]= array('ss_menu', 'BOX_TOOLS_MAIL', 'mail',@$img['mail']);
$tabl_link[]= array(FILENAME_HELD_ORDERS, 'BOX_CUSTOMERS_HELD_ORDERS', 'held_orders',@$img['held_orders']);
$tabl_link[]= array(FILENAME_RECOVER_CART_SALES, 'BOX_RECOVER_CART_SALES', 'recover_cart_sales',@$img['recover_cart_sales']);
Modified: trunk/catalog/admin/includes/boxes/10_orders.php
===================================================================
--- trunk/catalog/admin/includes/boxes/10_orders.php 2012-04-19 13:12:03 UTC (rev 4282)
+++ trunk/catalog/admin/includes/boxes/10_orders.php 2012-04-19 15:10:17 UTC (rev 4283)
@@ -1,34 +1,57 @@
-<?php
-/**
- @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.1
- @date 03/03/2012, 17:23
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-
-
- $tabl_link[850]= array('ss_menu', 'BOX_CUSTOMERS_ORDERS', 'orders',@$img['orders']);
- $tabl_link[850][4][]= array(FILENAME_ORDERS.'?view=thisday', 'BOX_CUSTOMERS_ORDERS_THISDAY', 'orders',@$img['orders']);
- $tabl_link[850][4][]= array(FILENAME_ORDERS.'?view=opened', 'BOX_CUSTOMERS_ORDERS_OPENED', 'orders',@$img['orders']);
- $tabl_link[850][4][]= array(FILENAME_ORDERS.'?view=nopayed', 'BOX_CUSTOMERS_ORDERS_NOPAYED', 'orders',@$img['orders']);
- $tabl_link[850][4][]= array(FILENAME_ORDERS.'?view=allnoclosed', 'BOX_CUSTOMERS_ORDERS_ALLNOCLOSED', 'orders',@$img['orders']);
- $tabl_link[850][4][]= array(FILENAME_ORDERS, 'BOX_CUSTOMERS_ORDERS_ALL', 'orders',@$img['orders']);
- if(_cst_bool('RMA_RETURN_PRODUCTS_STATUS'))
- $tabl_link[850][4][]= array(FILENAME_RETURNS, 'BOX_RETURNS_HEADING', 'return',@$img['return']);
-
-
- $tabl_link[851]= array('ss_menu', 'BOX_CUSTOMERS_SHIPPING', 'shipping',@$img['shipping']);
- $tabl_link[851][4][]= array('shipping.php?view=opened', 'BOX_CUSTOMERS_SHIPPING_OPENNED', 'orders',@$img['orders']);
- $tabl_link[851][4][]= array('shipping.php?view=progress', 'BOX_CUSTOMERS_SHIPPING_PROGRESS', 'orders',@$img['orders']);
- $tabl_link[851][4][]= array('shipping.php?view=clsed', 'BOX_CUSTOMERS_SHIPPING_CLOSE', 'orders',@$img['orders']);
-
- if( strlen(TYPE_VIRTUAL_PRODUCTS) >= 1) {
- $tabl_link[852]= array('ss_menu', 'BOX_CUSTOMERS_SERVICES', 'services',@$img['services']);
- $tabl_link[852][4][]= array('services.php', 'BOX_CUSTOMERS_SERVICES_ALL', 'services',@$img['services']);
- $tabl_link[852][4][]= array('services.php?view=opened', 'BOX_CUSTOMERS_SERVICES_ACTIVED', 'services',@$img['services']);
- $tabl_link[852][4][]= array('services.php?view=closed', 'BOX_CUSTOMERS_SERVICES_INACTIVED', 'services',@$img['services']);
- }
-
+<?php
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 03/03/2012, 17:23
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+ $tabl_link[] = array(
+ 'ss_menu',
+ 'BOX_CUSTOMERS_ORDERS',
+ 'orders',
+ @$img['orders'],
+ 4=> array(
+ array(FILENAME_ORDERS.'?view=thisday', 'BOX_CUSTOMERS_ORDERS_THISDAY', 'orders',@$img['orders']),
+ array(FILENAME_ORDERS.'?view=opened', 'BOX_CUSTOMERS_ORDERS_OPENED', 'orders',@$img['orders']),
+ array(FILENAME_ORDERS.'?view=nopayed', 'BOX_CUSTOMERS_ORDERS_NOPAYED', 'orders',@$img['orders']),
+ array(FILENAME_ORDERS.'?view=allnoclosed', 'BOX_CUSTOMERS_ORDERS_ALLNOCLOSED', 'orders',@$img['orders']),
+ array(FILENAME_ORDERS, 'BOX_CUSTOMERS_ORDERS_ALL', 'orders',@$img['orders']),
+ )
+ );
+
+ if(_cst_bool('RMA_RETURN_PRODUCTS_STATUS'))
+ $tabl_link[]= array(FILENAME_RETURNS, 'BOX_RETURNS_HEADING', 'return',@$img['return']);
+
+
+ $tabl_link[] = array(
+ 'ss_menu',
+ 'BOX_CUSTOMERS_SHIPPING',
+ 'shipping',
+ @$img['shipping'],
+ 4=> array(
+ array('shipping.php?view=opened', 'BOX_CUSTOMERS_SHIPPING_OPENNED', 'orders',@$img['orders']),
+ array('shipping.php?view=progress', 'BOX_CUSTOMERS_SHIPPING_PROGRESS', 'orders',@$img['orders']),
+ array('shipping.php?view=clsed', 'BOX_CUSTOMERS_SHIPPING_CLOSE', 'orders',@$img['orders']),
+ )
+ );
+
+ if( strlen(TYPE_VIRTUAL_PRODUCTS) >= 1) {
+ $tabl_link[] = array(
+ 'ss_menu',
+ 'BOX_CUSTOMERS_SERVICES',
+ 'services',
+ @$img['services'],
+ 4=> array(
+ array('services.php', 'BOX_CUSTOMERS_SERVICES_ALL', 'services',@$img['services']),
+ array('services.php?view=opened', 'BOX_CUSTOMERS_SERVICES_ACTIVED', 'services',@$img['services']),
+ array('services.php?view=closed', 'BOX_CUSTOMERS_SERVICES_INACTIVED', 'services',@$img['services']),
+ )
+ );
+
+ }
+
+
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/classes/qtproUtility.php
===================================================================
--- trunk/catalog/admin/includes/classes/qtproUtility.php 2012-04-19 13:12:03 UTC (rev 4282)
+++ trunk/catalog/admin/includes/classes/qtproUtility.php 2012-04-19 15:10:17 UTC (rev 4283)
@@ -74,7 +74,7 @@
//Check every products_stock_attributes for errors
while ($products_stock_attributes = tep_db_fetch_array($attributes_stock_query)) {
$this_row_is_sick = false;
- $string_options_array = qtpro_products_attributes_string2options_array($products_stock_attributes['products_stock_attributes']);
+ $string_options_array = self::products_attributes_string2options_array($products_stock_attributes['products_stock_attributes']);
//Now check for "intruder" errors (check for attributes which are there but should not as they are not stocktracked)
foreach($string_options_array as $option)
Modified: trunk/catalog/admin/includes/exts/package/tags/sql.php
===================================================================
--- trunk/catalog/admin/includes/exts/package/tags/sql.php 2012-04-19 13:12:03 UTC (rev 4282)
+++ trunk/catalog/admin/includes/exts/package/tags/sql.php 2012-04-19 15:10:17 UTC (rev 4283)
@@ -2,22 +2,14 @@
/**
@licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
+ @author-orginial Vlad Savitsky
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
@date 11/04/2012, 18:17
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class Tc_sql
-*/
-/*
-Class SQL operates with sql-tag from install.xml.
-Made by Vlad Savitsky
- http://forums.oscommerce.com/index.php?showuser=20490
-Support:
- http://forums.oscommerce.com/index.php?showtopic=156667
-Released under GPL
-*/
-/*
+ @example
Now you could use some SQL-statments into one <sql>-tag.
They must be separated by ";".
For example:
@@ -55,11 +47,17 @@
*/
-class Tc_sql extends ContribInstallerBaseTag {
- var $tag_name='sql';
+class Tc_sql
+ extends ContribInstallerBaseTag {
+ /**
+ @var
+ */
+ public $tag_name='sql';
+ /**
+ @var
+ */
+ public $priority = 200;
- var $priority = 200;
-
// Class Constructor
function Tc_sql($contrib='', $id='', $xml_data='', $dep='') {
$this->params=array(
Modified: trunk/catalog/admin/includes/javascript/modules/pages/products.js.php
===================================================================
--- trunk/catalog/admin/includes/javascript/modules/pages/products.js.php 2012-04-19 13:12:03 UTC (rev 4282)
+++ trunk/catalog/admin/includes/javascript/modules/pages/products.js.php 2012-04-19 15:10:17 UTC (rev 4283)
@@ -109,12 +109,12 @@
$(function() {
$.datepicker.setDefaults($.extend({
- duration: '',
- changeMonth: true,
- changeYear: true,
- showOn: 'button',
- buttonImage: '<?php echo DIR_WS_ICONS . 'calendar.gif';?>',
- buttonImageOnly: true
+ duration: '',
+ changeMonth: true,
+ changeYear: true,
+ showOn: 'button',
+ buttonImage: '<?php echo DIR_WS_ICONS . 'calendar.gif';?>',
+ buttonImageOnly: true
}
<?php if (($lng=language::LangueSelected())&& $lng != 'en') echo ",\n"."$.datepicker.regional['".$lng."']"."\n"; ?>
));
@@ -159,13 +159,26 @@
document.forms["new_product"].products_price.value = doRound(netValue, 6);
}
+
+
+ $(function(){
+
+ // on cache les bouton enregsitrer si aucune modification effectué
+// $('.button.ActionYes').hide();
+//
+// // view form if input chnage
+// $('#new_product *').change(function(){
+// $('.button.ActionYes').show();
+// });
+// });
+
//--></script>
<?php
// tep_include_file (DIR_WS_TEMPLATE."jquery.validate.css",true);
// tep_include_file (DIR_WS_JS . "jquery.validate.min.js",true);
?>
<script type="text/javascript">
- $(function(){
+// $(function(){
// validate signup form on keyup and submit
// $("#new_product").validate({
// rules: {
Modified: trunk/catalog/admin/includes/modules/pages/stock.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/stock.php 2012-04-19 13:12:03 UTC (rev 4282)
+++ trunk/catalog/admin/includes/modules/pages/stock.php 2012-04-19 15:10:17 UTC (rev 4283)
@@ -158,10 +158,16 @@
break;
case "Apply to all":
break;
+ case "update_summary":
+ if(self::$pID > 0){
+ self::qtpro_doctor_amputate_bad_from_product(self::$pID);
+
+ tep_redirect(tep_href_link(self::FILENAME, 'product_id=' . self::$pID.(isset($_GET['forceajax']) || isset($_GET['forceview'])? '&forceview=true':'') ));
+ }
+ break;
default:
self::load_db_values(self::$pID);
- case "update_summary":
- break;
+
}
return self::$action;
@@ -212,7 +218,7 @@
self::$product_name=stripslashes($list['products_name']);
}
- self::$investigation = qtpro_doctor_investigate_product($ID);
+ self::$investigation = qtproUtility::doctor_investigate_product($ID);
}
/**
@@ -329,6 +335,7 @@
}
private static function qtdoctor($products_id){
+
switch(self::$action){
case 'examine':
if(self::qtpro_doctor_product_healthy($products_id)){
@@ -365,6 +372,7 @@
Proposition acttion suite control du stock
*/
public static function qtpro_doctor_formulate_product_investigation($facts_array, $formulate_style){
+
$str_ret ='';
switch($formulate_style){
case 'short_suggestion':
@@ -487,19 +495,21 @@
private static function qtpro_doctor_formulate_database_investigation(){
+
print "<p>Sick products in the database:</p>";
$prod_query = tep_db_query("SELECT products_id FROM " . TABLE_PRODUCTS);
while($product = tep_db_fetch_array($prod_query)){
- $investigation= self::qtpro_doctor_investigate_product($product['products_id']);
+ $investigation= qtproUtility::doctor_investigate_product($product['products_id']);
if($investigation['any_problems']){
- print '<p class="messageStackWarning">Product with ID '.$product['products_id'].': '.qtpro_doctor_formulate_product_investigation($investigation, 'short_suggestion').'</p>';
+ print '<p class="messageStackWarning">Product with ID '.$product['products_id'].': '.
+ self::qtpro_doctor_formulate_product_investigation($investigation, 'short_suggestion').'</p>';
}
}
}
private static function qtpro_doctor_product_healthy($products_id){
- $results = self::qtpro_doctor_investigate_product($products_id);
+ $results = qtproUtility::doctor_investigate_product($products_id);
if($results['any_problems'] == false){
return true;
}else{
@@ -545,7 +555,7 @@
//Check every row for errors
while ($products_stock_attributes = tep_db_fetch_array($attributes_stock_query)) {
$amputate_this = false;
- $string_options_array = qtpro_products_attributes_string2options_array($products_stock_attributes['products_stock_attributes']);
+ $string_options_array = qtproUtility::products_attributes_string2options_array($products_stock_attributes['products_stock_attributes']);
//Now check for "intruder" errors (check for attributes which are there but should not as they are not stocktracked)
foreach($string_options_array as $option){
Modified: trunk/catalog/index.php
===================================================================
--- trunk/catalog/index.php 2012-04-19 13:12:03 UTC (rev 4282)
+++ trunk/catalog/index.php 2012-04-19 15:10:17 UTC (rev 4283)
@@ -80,6 +80,7 @@
use /content/index_listing.php
*/
elseif ( ($dyntype = DataTypes::is_type('listing')) && $dyntype != false ){
+
$page->init(basename(__FILE__),$language);
$breadcrumb=$page->return_object('breadcrumb');
// call master DataTypes listing and next childs modules
Modified: trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/modules/rapport/rp__DATATYPE_REPLACE_.php
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/modules/rapport/rp__DATATYPE_REPLACE_.php 2012-04-19 13:12:03 UTC (rev 4282)
+++ trunk/dev/GenerCode/datatype/Modele/catalog/admin/includes/modules/rapport/rp__DATATYPE_REPLACE_.php 2012-04-19 15:10:17 UTC (rev 4283)
@@ -93,7 +93,7 @@
);
- $this->query['select'] = " p._DATATYPE_REPLACE__id, pd._DATATYPE_REPLACE__name, pd._DATATYPE_REPLACE__viewed , l.name";
+ $this->query['select'] = " p._DATATYPE_REPLACE__id, pd._DATATYPE_REPLACE__title, pd._DATATYPE_REPLACE__viewed , l.name";
$this->query['tables'] = " " . TABLE__DATATYPE_REPLACE_MAJ_. " p, " . TABLE__DATATYPE_REPLACE_MAJ__DESCRIPTION . " pd , " . TABLE_LANGUAGES . " l ";
$this->query['where'] = " p._DATATYPE_REPLACE__id = pd._DATATYPE_REPLACE__id and l.languages_id = pd.language_id ";
$this->query['orderby'] = " pd._DATATYPE_REPLACE__viewed DESC";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-19 13:12:14
|
Revision: 4282
http://oscss.svn.sourceforge.net/oscss/?rev=4282&view=rev
Author: oscim
Date: 2012-04-19 13:12:03 +0000 (Thu, 19 Apr 2012)
Log Message:
-----------
Correction diverse et ajout de la prise en charge du datatype dans le GabaritTemplate, qui deteermine le fichier de template principal a utiliser.
Ajustement des driver de datatype , et correction de celui des categories, sur la prise en charge des produit des sous cat de la cat courante
Modified Paths:
--------------
trunk/catalog/common/classes/DataTypes.php
trunk/catalog/common/classes/datatype_drivers/Data_categorie.php
trunk/catalog/common/classes/datatype_drivers/Data_content.php
trunk/catalog/common/classes/datatype_drivers/Data_manufacturer.php
trunk/catalog/common/classes/datatype_drivers/Data_product.php
trunk/catalog/includes/classes/drivers/page/GabaritTemplate.php
trunk/catalog/includes/modules/listing.php
trunk/dev/GenerCode/datatype/Modele/catalog/common/classes/datatype_drivers/Data__DATATYPE_REPLACE_.php
Modified: trunk/catalog/common/classes/DataTypes.php
===================================================================
--- trunk/catalog/common/classes/DataTypes.php 2012-04-19 08:11:07 UTC (rev 4281)
+++ trunk/catalog/common/classes/DataTypes.php 2012-04-19 13:12:03 UTC (rev 4282)
@@ -370,7 +370,7 @@
foreach(self::$env->modlist as $class=>$module){
- if(isset(self::$env->RootListing[$class]) && is_array(self::$env->RootListing[$class]))
+ if(isset(self::$env->RootListing[$class]) && is_array(self::$env->RootListing[$class]))
if(
( isset(self::$env->RootListing[$class]) && is_array(self::$env->RootListing[$class]) && count(self::$env->RootListing[$class])>0 )// this module is RootListing (manufacturer, categories)
Modified: trunk/catalog/common/classes/datatype_drivers/Data_categorie.php
===================================================================
--- trunk/catalog/common/classes/datatype_drivers/Data_categorie.php 2012-04-19 08:11:07 UTC (rev 4281)
+++ trunk/catalog/common/classes/datatype_drivers/Data_categorie.php 2012-04-19 13:12:03 UTC (rev 4282)
@@ -240,9 +240,20 @@
*/
public function FO_load_listing($type, $subtype){
global $current_category_id, $languages_id, $list;
+
$page = page::getInstance();
+ $DB=Database::getInstance();
+
$category_depth = $page->GetVar('category_depth');
+
+ //! List des categorie enfant
+ $categories_query = $DB->query($sql="select c.categories_id from " . TABLE_CATEGORIES . " c where c.parent_id = '" . (int)$current_category_id . "' and c.categories_status='1' ");
+ $lis="";
+ while ($cat= $categories_query->fetchAssoc() ){ $lis .="'".$cat['categories_id']."',"; }
+ $list = $lis . $current_category_id;
+
+
$this->ChildsType = $type;
/**
@remarks define all var for exec listing + split_page
@@ -328,6 +339,8 @@
$obj->description = $categories->categories_description;
$page->add_var_page('RootListing',$obj);
+ $page->add_var_page('current_id',$current_category_id);
+
break;
Modified: trunk/catalog/common/classes/datatype_drivers/Data_content.php
===================================================================
--- trunk/catalog/common/classes/datatype_drivers/Data_content.php 2012-04-19 08:11:07 UTC (rev 4281)
+++ trunk/catalog/common/classes/datatype_drivers/Data_content.php 2012-04-19 13:12:03 UTC (rev 4282)
@@ -266,6 +266,8 @@
$page_content = $page->force_content('content.php');
+ $page->add_var_page('current_id',@$_GET['content']);
+
return $page_content;
}
Modified: trunk/catalog/common/classes/datatype_drivers/Data_manufacturer.php
===================================================================
--- trunk/catalog/common/classes/datatype_drivers/Data_manufacturer.php 2012-04-19 08:11:07 UTC (rev 4281)
+++ trunk/catalog/common/classes/datatype_drivers/Data_manufacturer.php 2012-04-19 13:12:03 UTC (rev 4282)
@@ -194,6 +194,7 @@
$obj->description = false;
$page->add_var_page('RootListing',$obj);
+ $page->add_var_page('current_id',(int)$_GET['manufacturers_id']);
}
break;
}
Modified: trunk/catalog/common/classes/datatype_drivers/Data_product.php
===================================================================
--- trunk/catalog/common/classes/datatype_drivers/Data_product.php 2012-04-19 08:11:07 UTC (rev 4281)
+++ trunk/catalog/common/classes/datatype_drivers/Data_product.php 2012-04-19 13:12:03 UTC (rev 4282)
@@ -393,6 +393,9 @@
$page->product->pile_img[]=$product_info['products_image'];
$page_content = $page->force_content('product_info.php');
+
+ $page->add_var_page('current_id',(int)$_GET['products_id']);
+
return $page_content;
break;
default:
Modified: trunk/catalog/includes/classes/drivers/page/GabaritTemplate.php
===================================================================
--- trunk/catalog/includes/classes/drivers/page/GabaritTemplate.php 2012-04-19 08:11:07 UTC (rev 4281)
+++ trunk/catalog/includes/classes/drivers/page/GabaritTemplate.php 2012-04-19 13:12:03 UTC (rev 4282)
@@ -39,67 +39,132 @@
global $page;
if(isset(parent::$GlobalCache['gabarit'])) return $page->page['gabarit']=parent::$GlobalCache['gabarit'];
- $format_file="%1\$s.%2\$s.php";
- $path = $page->getPathTemplate();
+ $format_file="%1%.%2%.%3%.php";
+ $basepath = array($page->getPathTemplate()/*, DIR_WS_TEMPLATES . DEFAULT_TEMPLATE_NAME. '/'*/);
+ $suffixe = array();
+ // add cpath or tag_id for specifical template
+ if ( ($dyntype = DataTypes::is_type('cpath')) && $dyntype != false ){
-// var_dump($page->page['type']);
+ $cPath = $dyntype->GetcPath('cpath');
- switch($page->page['type']){
- case 'product':
- if (empty($page->page['var']['product_info']['products_id'])) $suffixe='error';
- else $suffixe='p_'.$page->page['var']['product_info']['products_id'];
- break;
+ if($page->GetVar('current_id')> 0 )
+ foreach($dyntype->reg_anchors as $suf){
+ $prev = array();
+ if(strpos($cPath,'_')>0){
+ foreach(explode('_', $cPath) as $cpath)
+ $prev[]='c_'.$cpath .'.';
+ }
+ else
+ $prev[]='c_'.$cPath.'.';
- case 'categorie':
- if (!tep_not_null($page->page['var']['cPath'])) $suffixe='error';
- else {
- if(strpos($page->page['var']['cPath'],'_')!=false)
- $suffixe='c_'.substr($page->page['var']['cPath'], 0, strpos($page->page['var']['cPath'],'_')).'.childs';
- else
- $suffixe='c_'.$page->page['var']['cPath'];
+ foreach($prev as $p)
+ // cpath link
+ $suffixe[]=$p . $suf.'_'.$page->GetVar('current_id');
+
+ // normal link
+ $suffixe[]=$suf.'_'.$page->GetVar('current_id');
+ }
+
+
+ if(strpos($cPath,'_')!=false)
+ $suffixe[]='c_'.substr($cPath, 0, strpos($cPath,'_')).'.childs';
+ else
+ $suffixe[]='c_'.$cPath;
+
+ }
+ elseif(isset($_GET['cPath'])){
+ $cPath =$_GET['cPath'];
+ $prev = array();
+ if(strpos($cPath,'_')>0){
+// $suffixe[]='c_'.substr($cPath, 0, strpos($cPath,'_')).'.childs';
+
+ foreach(explode('_', $cPath) as $cpath)
+ $prev[]='c_'.$cpath ;
+ }
+ else
+ $prev[]='c_'.$cPath;
+
+ foreach($prev as $p)
+ // cpath link
+ $suffixe[]=$p ;
+
+
+ }
+
+
+ // reel normal page
+ $basename = array(substr($page->page['content'],0,-4), 'template');
+ $page->page['gabarit']= '';
+
+ // array path template
+ foreach($basepath as $path){
+
+ // array file name
+ foreach($basename as $name){
+
+ // array suffixe name
+ foreach($suffixe as $suf){
+ $test = str_replace(array('%1%.','%2%.','%3%'), array('',$suf.'.',$name), $format_file);
+
+ if( parent::TestFile($path . $test) ){
+ $page->page['gabarit']= $test ;
+ return parent::$GlobalCache['gabarit']=$page->page['gabarit'];
+ }
}
- break;
- }
- $p_red=substr($page->page['content'],0,-4);
- if (isset($_GET['popup']) && parent::TestFile($path.'popup.php') )
- $page->page['gabarit']='popup.php';
- // type products
- elseif($page->page['type']=='product' && parent::TestFile($path.sprintf($format_file,$p_red,'type_'.$page->page['var']['product_info']['type'])) )
- $page->page['gabarit']=sprintf($format_file,$p_red,'type_'.$page->page['var']['product_info']['type']);
- elseif($page->page['type']=='product' && parent::TestFile($path.sprintf($format_file,'template','type_'.$page->page['var']['product_info']['type'])) )
- $page->page['gabarit']=sprintf($format_file,'template','type_'.$page->page['var']['product_info']['type']);
- //page
- elseif(isset($suffixe) && parent::TestFile($path.sprintf($format_file,$p_red,$suffixe)) )
- $page->page['gabarit']=sprintf($format_file,$p_red,$suffixe);
- elseif(isset($suffixe) && parent::TestFile($path.sprintf($format_file,'template',$suffixe)) )
- $page->page['gabarit']=sprintf($format_file,'template',$suffixe) ;
- elseif(parent::TestFile($path.$page->page['content']))
- $page->page['gabarit']=$page->page['content'] ;
- // class
- elseif(isset($suffixe) && parent::TestFile($path.$page->page['class'].'.'.sprintf($format_file,$p_red,$suffixe) ))
- $page->page['gabarit']=$page->page['class'].'.'.sprintf($format_file,$p_red,$suffixe) ;
- elseif(parent::TestFile($path.$page->page['class'].'.'.$page->page['content'] ))
- $page->page['gabarit']=$page->page['class'].'.'.$page->page['content'] ;
- elseif(isset($suffixe) && parent::TestFile($path.$page->page['class'].'.'.sprintf($format_file,'template',$suffixe) ))
- $page->page['gabarit']=$page->page['class'].'.'.sprintf($format_file,'template',$suffixe) ;
- elseif(parent::TestFile($path.$page->page['class'].'.'.'template.php' ))
- $page->page['gabarit']=$page->page['class'].'.'.'template.php' ;
- // type
- elseif(isset($suffixe) && parent::TestFile($path.$page->page['type'].'.'.sprintf($format_file,$p_red,$suffixe) ))
- $page->page['gabarit']=$page->page['type'].'.'.sprintf($format_file,$p_red,$suffixe) ;
- elseif(parent::TestFile($path.$page->page['type'].'.'.$page->page['content'] ))
- $page->page['gabarit']=$page->page['type'].'.'.$page->page['content'] ;
- elseif(isset($suffixe) && parent::TestFile($path.$page->page['type'].'.'.sprintf($format_file,'template',$suffixe) ))
- $page->page['gabarit']=$page->page['type'].'.'.sprintf($format_file,'template',$suffixe) ;
- elseif(parent::TestFile($path.$page->page['type'].'.'.'template.php' ))
- $page->page['gabarit']=$page->page['type'].'.'.'template.php' ;
- // base
- elseif(parent::TestFile($path .'template.php'))
- $page->page['gabarit']='template.php';
- else die(__('object page (lg '.__LINE__.') FATAL ERROR: the gabarit template not found!'));
+
+ // no suffixe
+ $test = str_replace(array('%1%.','%2%.','%3%'), array('','',$name), $format_file);
+ if( parent::TestFile($path . $test) ){
+ $page->page['gabarit']= $test ;
+ return parent::$GlobalCache['gabarit']=$page->page['gabarit'];
+ }
+ }
+ }
- parent::$GlobalCache['gabarit']=$page->page['gabarit'];
+// var_dump($page->page['gabarit']);
+
+// return ;/**/
+
+return ;
+// if (isset($_GET['popup']) && parent::TestFile($path.'popup.php') )
+// $page->page['gabarit']='popup.php';
+// // type products
+// elseif($page->page['type']=='product' && parent::TestFile($path.sprintf($format_file,$p_red,'type_'.$page->page['var']['product_info']['type'])) )
+// $page->page['gabarit']=sprintf($format_file,$p_red,'type_'.$page->page['var']['product_info']['type']);
+// elseif($page->page['type']=='product' && parent::TestFile($path.sprintf($format_file,'template','type_'.$page->page['var']['product_info']['type'])) )
+// $page->page['gabarit']=sprintf($format_file,'template','type_'.$page->page['var']['product_info']['type']);
+// //page
+// elseif(isset($suffixe) && parent::TestFile($path.sprintf($format_file,$p_red,$suffixe)) )
+// $page->page['gabarit']=sprintf($format_file,$p_red,$suffixe);
+// elseif(isset($suffixe) && parent::TestFile($path.sprintf($format_file,'template',$suffixe)) )
+// $page->page['gabarit']=sprintf($format_file,'template',$suffixe) ;
+// elseif(parent::TestFile($path.$page->page['content']))
+// $page->page['gabarit']=$page->page['content'] ;
+// // class
+// elseif(isset($suffixe) && parent::TestFile($path.$page->page['class'].'.'.sprintf($format_file,$p_red,$suffixe) ))
+// $page->page['gabarit']=$page->page['class'].'.'.sprintf($format_file,$p_red,$suffixe) ;
+// elseif(parent::TestFile($path.$page->page['class'].'.'.$page->page['content'] ))
+// $page->page['gabarit']=$page->page['class'].'.'.$page->page['content'] ;
+// elseif(isset($suffixe) && parent::TestFile($path.$page->page['class'].'.'.sprintf($format_file,'template',$suffixe) ))
+// $page->page['gabarit']=$page->page['class'].'.'.sprintf($format_file,'template',$suffixe) ;
+// elseif(parent::TestFile($path.$page->page['class'].'.'.'template.php' ))
+// $page->page['gabarit']=$page->page['class'].'.'.'template.php' ;
+// // type
+// elseif(isset($suffixe) && parent::TestFile($path.$page->page['type'].'.'.sprintf($format_file,$p_red,$suffixe) ))
+// $page->page['gabarit']=$page->page['type'].'.'.sprintf($format_file,$p_red,$suffixe) ;
+// elseif(parent::TestFile($path.$page->page['type'].'.'.$page->page['content'] ))
+// $page->page['gabarit']=$page->page['type'].'.'.$page->page['content'] ;
+// elseif(isset($suffixe) && parent::TestFile($path.$page->page['type'].'.'.sprintf($format_file,'template',$suffixe) ))
+// $page->page['gabarit']=$page->page['type'].'.'.sprintf($format_file,'template',$suffixe) ;
+// elseif(parent::TestFile($path.$page->page['type'].'.'.'template.php' ))
+// $page->page['gabarit']=$page->page['type'].'.'.'template.php' ;
+// // base
+// elseif(parent::TestFile($path .'template.php'))
+// $page->page['gabarit']='template.php';
+// else die(__('object page (lg '.__LINE__.') FATAL ERROR: the gabarit template not found!'));
+//
+// parent::$GlobalCache['gabarit']=$page->page['gabarit'];
}
Modified: trunk/catalog/includes/modules/listing.php
===================================================================
--- trunk/catalog/includes/modules/listing.php 2012-04-19 08:11:07 UTC (rev 4281)
+++ trunk/catalog/includes/modules/listing.php 2012-04-19 13:12:03 UTC (rev 4282)
@@ -40,8 +40,13 @@
else
$key = $subtype. '_id';
+ if(!isset($listing[$key]) )
+ continue;
+
// result
$pd=$subtype::get_item($listing[$key]);
+ if(!$pd )
+ continue;
// call loop for Aca modules
$pd->aca=$aca_listing->return_db_min($listing[$key]);
// add type data in current item
Modified: trunk/dev/GenerCode/datatype/Modele/catalog/common/classes/datatype_drivers/Data__DATATYPE_REPLACE_.php
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/catalog/common/classes/datatype_drivers/Data__DATATYPE_REPLACE_.php 2012-04-19 08:11:07 UTC (rev 4281)
+++ trunk/dev/GenerCode/datatype/Modele/catalog/common/classes/datatype_drivers/Data__DATATYPE_REPLACE_.php 2012-04-19 13:12:03 UTC (rev 4282)
@@ -290,6 +290,7 @@
$breadcrumb->add($_DATATYPE_REPLACE_->title, $_DATATYPE_REPLACE_->href );
$page_content = $page->force_content('_DATATYPE_REPLACE_.php');
+ $page->add_var_page('current_id',(int)$_GET['_DATATYPE_REPLACE_']);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-19 08:11:17
|
Revision: 4281
http://oscss.svn.sourceforge.net/oscss/?rev=4281&view=rev
Author: oscim
Date: 2012-04-19 08:11:07 +0000 (Thu, 19 Apr 2012)
Log Message:
-----------
element obsolete et non fonctionnel. suppression definitive
Removed Paths:
-------------
trunk/catalog/includes/classes/drivers/page/GabaritTemplateSql.php
Deleted: trunk/catalog/includes/classes/drivers/page/GabaritTemplateSql.php
===================================================================
--- trunk/catalog/includes/classes/drivers/page/GabaritTemplateSql.php 2012-04-19 07:45:49 UTC (rev 4280)
+++ trunk/catalog/includes/classes/drivers/page/GabaritTemplateSql.php 2012-04-19 08:11:07 UTC (rev 4281)
@@ -1,192 +0,0 @@
-<?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 10/12/11, 10:15
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
- @class GabaritTemplate
- @brief Adjust conportement for master construct public page
- This class it's basic load for osCSS
- It's possible add new class for modifie process and determine conportement this master class constructor.
-*/
-
-class GabaritTemplateSql
- extends page{
-
-
- /**
- @fn GabaritTemplate::GetGabaritTemplate()
- @brief traite le nom de la page pour determine le gabarit utilisé
- @param [out] $this page[type] determine la class de gabarit.
- @param [out] $this page[content]
- @return retour du nom du template
- */
- protected static function GetGabaritTemplate() {
- global $page;
- if(isset(parent::$GlobalCache['gabarit'])) return $page->page['gabarit']=parent::$GlobalCache['gabarit'];
-
- $format_file="%1\$s.%2\$s.php";
- $path = $page->getPathTemplate();
-
- $DB=Database::getInstance();
-
- $r=$DB->query("SELECT * FROM osc_template WHERE type='".$page->page['type']."' ORDER BY id DESC");
-
- $result = $r->fetchAllAssoc();
- foreach($result as $lg) {
- if($lg['id'] =='') $gab[0] = $lg;
- else $gab[$lg['id']] = $lg;
- }
-
-
- switch($page->page['type']){
- case 'product':
- if (!empty($page->page['var']['product_info']['products_id']))
- $prefix = $gab[$page->page['var']['product_info']['products_id']]['file'];
- else
- $prefix = $gab[0]['file'];
- break;
-
- case 'listing':
- case 'listing_cat':
- if (!empty($page->page['var']['cPath'])){
- if(strpos($page->page['var']['cPath'],'_')!=false)
- $suffixe_id=substr($page->page['var']['cPath'], 0, strpos($page->page['var']['cPath'],'_'));
- else
- $suffixe=$page->page['var']['cPath'];
-
- $prefix = $gab[$suffixe_id]['file'];
- }
- else
- $prefix = $gab[0]['file'];
- break;
-
- default:
- $prefix = @$gab[0]['file'];
- }
-
- if(parent::TestFile($path.$prefix.'.php' ))
- $page->page['gabarit']=$prefix.'.php' ;
- // base
- elseif(parent::TestFile($path .'template.php'))
- $page->page['gabarit']='template.php';
-
- else die(__('object page (lg '.__LINE__.') FATAL ERROR: the gabarit template not found!'));
-
- parent::$GlobalCache['gabarit']=$page->page['gabarit'];
- }
-
-
-
- /**
- \fn GabaritTemplate::GetTypeContent()
- \brief determine le type de page (class de page)
- */
- protected static function GetTypeContent(){
- global $page;
-
- if(isset(parent::$GlobalCache['gabarit'])){
- $page->page['class']=parent::$GlobalCache['class_content'];
- return $page->page['type']=parent::$GlobalCache['type_content'];
- }
- if (isset($_GET['popup'])){
- $page->page['type']='popup';
- }elseif ($page->page['content']=='index.php' ||$page->page['content']=='home.php' && (empty($_SERVER['QUERY_STRING']) || (isset($_GET['osCsid']) || isset($_GET['divers']) ) )) {
- $page->page['type']='home';
- }elseif ($page->page['content']=='index.php' && (!empty($_SERVER['QUERY_STRING']) && isset($_GET['customers_id']) )) {
- $page->page['type']='member';
- $page->page['class']='single';
- }elseif (in_array(substr($page->page['content'],0,7), array('account','address')) || in_array(substr(basename($_SERVER['SCRIPT_NAME']),0,-4), array('account','address')) ) {
- $page->page['type']='account';
- }elseif (substr($page->page['content'],0,8) =='checkout') {
- $page->page['type']='checkout';
- }elseif (substr($page->page['content'],0,7) =='product') {
- $page->page['type']='product';
- $page->page['class']='single';
- }elseif (in_array(substr($page->page['content'],0,6) , array('shoppi'))) {
- $page->page['type']='cart';
- }elseif (substr($page->page['content'],0,9) =='index_cat') {
- $page->page['type']='listing_cat';
- }elseif (in_array(substr($page->page['content'],0,6) , array('listin','index_','index.'))) {
- $page->page['type']='listing';
-
- if(isset($page->page['var']['manufacturers']))$page->page['class']='manufactuers';
- elseif(!empty($page->page['var']['cPath'])) $page->page['class']='categories';
- else $page->page['class']='listing';
-
- }elseif (in_array(substr($page->page['content'],0,7) , array('content')) && isset($_GET['content']) ) {
- $page->page['type']='content';
- $page->page['class']='single';
- }else {
- $page->page['type']='none';
- }
-
- parent::$GlobalCache['type_content']=$page->page['type'];
- parent::$GlobalCache['class_content']=(isset($page->page['class'])? $page->page['class'] :'single' );
- }
-
-
- /**
- \fn GabaritTemplate::GetPageContent()
- \brief Scan template content folders and display template content if exist, if not display default oscss content
- */
- protected static function GetPageContent() {
- global $page;
-
- $filename = $page->getPathTemplate() . '/includes/content/'. $page->page['content'];
-
- if (parent::TestFile($filename)) $page->page['path_content'] = (DIR_WS_TEMPLATES . $page->page['template'] . '/includes/content/'. $page->page['content']);
- elseif (parent::TestFile(DIR_WS_INCLUDES.'content/' . $page->page['content'])) $page->page['path_content'] = (DIR_WS_INCLUDES.'content/' . $page->page['content']);
- else $page->page['path_content'] = (DIR_WS_INCLUDES.'content/404.php' );
-
- return($page->page['path_content']);
- }
-
- /**
- \fn GabaritTemplate::GetFooter()
- \brief choose file for include
- */
- protected static function GetFooter(){
- global $page;
-
- $the_title = $page->page['the_title'];
- $the_desc = $page->page['the_desc'];
- $the_key_words = $page->page['the_key_words'];
-
- return $page->getPathTemplate().'footer.php';
- }
-
- /**
- \fn GabaritTemplate::GetFooter()
- \brief choose file for include
- */
- protected static function GetHeader(){
- global $page;
- return $page->getPathTemplate().'header.php';
- }
-
- /**
- \fn GabaritTemplate::GetInit()
- \brief choose file for include
- */
- protected static function GetInit(){
- global $page;
- return $page->getPathTemplate().'cfg/init.php';
- }
-
- /**
- \fn GabaritTemplate::GetSidebar($bar='sidebar')
- \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'){
- // report des var d'enviroennement
- global $page;
-
- return $page->getPathTemplate().$bar.'.php';
- }
-}
-?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-19 07:45:59
|
Revision: 4280
http://oscss.svn.sourceforge.net/oscss/?rev=4280&view=rev
Author: oscim
Date: 2012-04-19 07:45:49 +0000 (Thu, 19 Apr 2012)
Log Message:
-----------
Fix bug du module, correction fonctionnel et coquille php. Suppression reliquat code de dev
Modified Paths:
--------------
trunk/catalog/common/modules/core/seo_modrewrite/SeoR_classic.php
Modified: trunk/catalog/common/modules/core/seo_modrewrite/SeoR_classic.php
===================================================================
--- trunk/catalog/common/modules/core/seo_modrewrite/SeoR_classic.php 2012-04-19 07:36:12 UTC (rev 4279)
+++ trunk/catalog/common/modules/core/seo_modrewrite/SeoR_classic.php 2012-04-19 07:45:49 UTC (rev 4280)
@@ -8,7 +8,7 @@
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
-error_reporting(E_ALL);
+
class SeoR_classic {
/**
@@ -39,7 +39,7 @@
$this->separator = '-';
- $this->separator_value = '-';
+ $this->separator_value = '=';
}
@@ -131,6 +131,7 @@
if(isset($obj->anchor)){
$t = 0;
+ if(isset($obj->check))
foreach($obj->check as $key=>$row){
$base[]='%CHECK_'.$t.'_%';
$replace[]=$row;
@@ -138,6 +139,7 @@
}
$t = 0;
+ if(isset($obj->pages))
foreach($obj->pages as $key=>$row){
$base[]='%PAGE_REPLACE_'.$t.'_%';
$replace[]=$row;
@@ -145,6 +147,7 @@
}
$t = 0;
+ if(isset($obj->anchor))
foreach($obj->anchor as $key=>$row){
$tmp[$i] = "\n\n## Datatype - ".$k."";
$i++;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-19 07:36:23
|
Revision: 4279
http://oscss.svn.sourceforge.net/oscss/?rev=4279&view=rev
Author: oscim
Date: 2012-04-19 07:36:12 +0000 (Thu, 19 Apr 2012)
Log Message:
-----------
SEO Correction coquille php et control info creer par les dadatype
Configseo , finition et mise en oeuvre du remplacement du htaccess lors changement du module de rewrite
Ajout d'un modele htaccess d'entete dans les docs/origin
Modified Paths:
--------------
trunk/catalog/Documents/admin/data/repository_sources.xml
trunk/catalog/admin/includes/modules/configuration/modseourl.php
trunk/catalog/common/classes/datatype_drivers/Data_diver.php
trunk/catalog/common/classes/seo_url.php
Added Paths:
-----------
trunk/catalog/Documents/admin/origin/htaccess/htaccess_top.txt
Modified: trunk/catalog/Documents/admin/data/repository_sources.xml
===================================================================
--- trunk/catalog/Documents/admin/data/repository_sources.xml 2012-04-18 21:37:57 UTC (rev 4278)
+++ trunk/catalog/Documents/admin/data/repository_sources.xml 2012-04-19 07:36:12 UTC (rev 4279)
@@ -7,8 +7,8 @@
<description>official repository</description>
<repository>http://pluginsv2.oscss.org/services.php</repository>
<ident>
- <user></user>
- <token></token>
+ <user>3</user>
+ <token>535bb3a85ff52c66ef19f6a6ca29bfb78665d5c2</token>
</ident>
<service>
<listing>listing_package</listing>
@@ -16,6 +16,22 @@
<download>download_package</download>
</service>
</channel>
+
+ <channel>
+ <title>oscim</title>
+ <key>oscim</key>
+ <description>oscim repository</description>
+ <repository>http://exts.oscim.org/services.php</repository>
+ <ident>
+ <user>3</user>
+ <token>535bb3a85ff52c66ef19f6a6ca29bfb78665d5c2</token>
+ </ident>
+ <service>
+ <listing>listing_package</listing>
+ <view>detail_package</view>
+ <download>download_package</download>
+ </service>
+ </channel>
<channel>
<title>Local</title>
Added: trunk/catalog/Documents/admin/origin/htaccess/htaccess_top.txt
===================================================================
--- trunk/catalog/Documents/admin/origin/htaccess/htaccess_top.txt (rev 0)
+++ trunk/catalog/Documents/admin/origin/htaccess/htaccess_top.txt 2012-04-19 07:36:12 UTC (rev 4279)
@@ -0,0 +1,87 @@
+# licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+# package oscss-2 <www http://www.oscss.org>
+# version %CURRENT_VERSION%
+# date %CREATE_DATE%
+# author oscim <mail aur...@os...> <www http://www.oscim.fr>
+# encode UTF-8
+# Default OsCss Htaccess
+
+
+
+# <Directory "/usr/local/apache/htdocs">
+# AllowOverride Options
+# </Directory>
+# The following makes adjustments to the SSL protocol for Internet
+# Explorer browsers
+# <IfModule mod_setenvif.c>
+# <IfDefine SSL>
+# SetEnvIf User-Agent ".*MSIE.*" \
+# nokeepalive ssl-unclean-shutdown \
+# downgrade-1.0 force-response-1.0
+# </IfDefine>
+# </IfModule>
+
+
+
+# Fix certain PHP values
+## element pour hebergement mutulalise, a commenter si inutile
+ SetEnv REGISTER_GLOBALS 0
+ SetEnv MAGIC_QUOTES 1
+ SetEnv PHP_VER 5
+
+# force default charset
+ AddDefaultCharset UTF-8
+
+# Turns off directory browsing
+# not absolutely essential, but keeps people from snooping around without
+# needing empty index.html files everywhere
+Options -Indexes
+
+
+# Etre discret ne coûte rien
+ServerSignature Off
+
+
+# FIX
+<IfModule mod_php5.c>
+ php_flag register_long_arrays Off
+ php_value register_globals off
+</IfModule>
+
+<IfModule mod_rewrite.c>
+
+# 404 error
+ ErrorDocument 404 /404.php
+
+ RewriteEngine on
+ RewriteBase %WS_DOCUMENT_ROOT%
+
+
+## Accept Canonical Url or no-rewrite mode
+ RewriteCond %{REQUEST_FILENAME} ^/.*/content.* [OR]
+ RewriteCond %{REQUEST_FILENAME} ^/.*/index_listing.* [OR]
+ RewriteCond %{REQUEST_FILENAME} ^/.*/product_info.* [NC]
+ RewriteRule ^([a-zA-Z_]*)\.(php)$ index.php?%{QUERY_STRING} [L]
+
+
+## Protection
+ RewriteCond %{QUERY_STRING} (\<|%3C).*script.*(\>|%3E) [NC,OR]
+ RewriteCond %{QUERY_STRING} (\<|%3C).*(\>|%3E) [NC,OR]
+ RewriteCond %{QUERY_STRING} GLOBALS(=|\[|\%[0-9A-Z]{0,2}) [OR]
+ RewriteCond %{QUERY_STRING} _REQUEST(=|\[|\%[0-9A-Z]{0,2})
+ RewriteRule ^(.*)$ index.php [F,L]
+
+
+# Block loop redirect
+ RewriteCond %{REQUEST_URI} ^/(stats/|missing\.html|failed_auth\.html|error/).* [NC]
+ RewriteRule .* - [L]
+
+ RewriteCond %{ENV:REDIRECT_STATUS} 200
+ RewriteRule .* - [L]
+
+
+
+
+##newsletter trace opened email
+ RewriteRule n-([0-9]+)-([0-9]+).jpg newsletters.php?mode=opened&newsID=$1&cID=$2 [L,QSA]
+
Modified: trunk/catalog/admin/includes/modules/configuration/modseourl.php
===================================================================
--- trunk/catalog/admin/includes/modules/configuration/modseourl.php 2012-04-18 21:37:57 UTC (rev 4278)
+++ trunk/catalog/admin/includes/modules/configuration/modseourl.php 2012-04-19 07:36:12 UTC (rev 4279)
@@ -47,6 +47,10 @@
$oscss->pile_file_lang(DIR_FS_ADMIN.DIR_WS_LANGUAGES.$language.'/modules/configuration/'.$this->code.'.txt');
self::$cfg =new sqlconfiguration();
+
+
+ if (file_exists(DIR_FS_CATALOG . '.htaccess') && !is_writeable(DIR_FS_CATALOG . '.htaccess'))
+ $messageStack->add(__('error destination not writeable').' '. 'htaccess', 'error');
}
@@ -76,7 +80,6 @@
foreach($liste as $row) {
-
if(isset($_POST['configuration'][$row->key])) {
$configuration_value = tep_db_prepare_input($_POST['configuration'][$row->key]);
@@ -90,6 +93,17 @@
if(!in_array(false,$erreur)) $messageStack->add_session(SAVE_CONFIG_OK, 'success');
else $messageStack->add_session(SAVE_CONFIG_NOT_OK, 'error');
+
+ // calculate htaccess
+ $this->load_db_values($Id);
+
+ $fp = @fopen(DIR_FS_CATALOG . '.htaccess', 'w+');
+ fwrite($fp, self::$view_htaccess);
+ fclose($fp);
+
+ if($fp ==false)
+ $messageStack->add_session(__('erreur for rewrite htaccess file, please replace htaccess by new content'), 'error');
+
}
tep_redirect(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $gparentID.'&gID=' . $_GET['gID'] . '&cID=' . $cID));
@@ -133,11 +147,11 @@
foreach(scan($path) as $row )
if(substr($row, -3) == 'php'){
+
$class = substr($row, 0,-4);
-// // print_r($row);
include_once($path . $row);
$obj = new $class();
-//
+
$row = $obj->GetDescription();
if((SEO_REWRITE_TYPE == $row->code))
$current = $obj;
@@ -147,12 +161,17 @@
$DT = DataTypes::getInstance();
-// print_r($DT->GetRegHtaccess());
$all_reg = $DT->GetRegHtaccess();
- self::$view_htaccess = $current->GetHtaccess($all_reg);
+ // get Header htaccess
+ $r = file_get_contents(DIR_FS_ROOT_DOCS . 'admin/origin/htaccess/htaccess_top.txt', 'r');
+ // replace string
+ $deb = str_replace(array('%CURRENT_VERSION%', '%CREATE_DATE%', '%WS_DOCUMENT_ROOT%'), array(PROJECT_VERSION ,date('Y-m-d H:i:s'), DIR_WS_CATALOG ), $r);
+ // concaten
+ self::$view_htaccess = "\n".trim($deb)."\n" . $current->GetHtaccess($all_reg);
+
return $list_edit;
}
Modified: trunk/catalog/common/classes/datatype_drivers/Data_diver.php
===================================================================
--- trunk/catalog/common/classes/datatype_drivers/Data_diver.php 2012-04-18 21:37:57 UTC (rev 4278)
+++ trunk/catalog/common/classes/datatype_drivers/Data_diver.php 2012-04-19 07:36:12 UTC (rev 4279)
@@ -145,7 +145,8 @@
$res=$DB->query( "select ft.page_id as ID, head_title_tag as tName, head_desc_tag, head_keywords_tag from " . TABLE_FULL_TAG . " ft, " . TABLE_FULL_TAG_DESCRIPTION . " ftd where ft.tag_id=ftd.tag_id and ft.page_type='page' and ftd.language_id = '" . $language_id. "' " );
- while ($result =$res->fetchAssoc()){
+// while ($result =$res->fetchAssoc()){
+ foreach($res->fetchAllAssoc() as $result){
$result[] = array ($result['ID'],$result,'DIVER') ;
}
Modified: trunk/catalog/common/classes/seo_url.php
===================================================================
--- trunk/catalog/common/classes/seo_url.php 2012-04-18 21:37:57 UTC (rev 4278)
+++ trunk/catalog/common/classes/seo_url.php 2012-04-19 07:36:12 UTC (rev 4279)
@@ -702,8 +702,9 @@
$result = DataTypes::Getseocache($this->languages_id);
foreach($result as $row){
- if(is_array($row) && count($row) ==3)
+ if(is_array($row) && is_int(@$row[0]) && is_string(@$row[2])){
self::GetCacheId($row[0],$row[1],$row[2]);
+ }
}
/**
@@ -729,9 +730,14 @@
* @return array
*/
private static function GetCacheId($id,$result,$type){
- if(!isset(self::$cache[$type][$id])) return self::$cache[$type][$id]= $result;
- elseif(is_array($result)) return self::$cache[$type][$id]= array_merge(self::$cache[$type][$id], $result);
- else return self::$cache[$type][$id];
+// if(is_array())
+
+ if(!isset(self::$cache[$type][$id]))
+ return self::$cache[$type][$id]= $result;
+ elseif(is_array($result))
+ return self::$cache[$type][$id]= array_merge(self::$cache[$type][$id], $result);
+ else
+ return self::$cache[$type][$id];
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-18 21:38:03
|
Revision: 4278
http://oscss.svn.sourceforge.net/oscss/?rev=4278&view=rev
Author: oscim
Date: 2012-04-18 21:37:57 +0000 (Wed, 18 Apr 2012)
Log Message:
-----------
Fix liens de retour manquant
Modified Paths:
--------------
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/rapport.txt
trunk/catalog/admin/includes/modules/pages/rapport.php
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/pages/rapport.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/pages/rapport.txt 2012-04-18 21:12:24 UTC (rev 4277)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/rapport.txt 2012-04-18 21:37:57 UTC (rev 4278)
@@ -11,6 +11,7 @@
*/
$lang['heading title rapport'] = "Liste des rapports";
+$lang['image back'] = "Retour";
$lang['table heading code'] = "Code";
$lang['table heading name'] = "Titre";
Modified: trunk/catalog/admin/includes/modules/pages/rapport.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/rapport.php 2012-04-18 21:12:24 UTC (rev 4277)
+++ trunk/catalog/admin/includes/modules/pages/rapport.php 2012-04-18 21:37:57 UTC (rev 4278)
@@ -138,17 +138,21 @@
Just for Edit listing
*/
self::$InitInfo['modele']['view']=$new->listing['modele'];
+
+
+
+ self::$InitInfo['MenuModule'][]=array(
+ 'type'=>'getLink',
+ 'format'=>'button_nav',
+ 'image'=>'',
+ 'cssclass'=>'',
+ 'title'=>__('image back'),
+ 'url'=>tep_href_link(self::FILENAME, ''),
+ );
+
}
-// self::$InitInfo['MenuModule'][]=array(
-// 'type'=>'getLink',
-// 'format'=>'button_nav',
-// 'image'=>'',
-// 'cssclass'=>'',
-// 'title'=>__('image add rapport'),
-// 'url'=>tep_href_link(self::FILENAME, 'action=new'),
-// );
return true;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-18 21:14:44
|
Revision: 4275
http://oscss.svn.sourceforge.net/oscss/?rev=4275&view=rev
Author: oscim
Date: 2012-04-18 20:46:06 +0000 (Wed, 18 Apr 2012)
Log Message:
-----------
ajustement suite modification arboresance
Modified Paths:
--------------
trunk/catalog/admin/includes/modules/pages/header_tags.php
Modified: trunk/catalog/admin/includes/modules/pages/header_tags.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/header_tags.php 2012-04-18 19:51:42 UTC (rev 4274)
+++ trunk/catalog/admin/includes/modules/pages/header_tags.php 2012-04-18 20:46:06 UTC (rev 4275)
@@ -1,10 +1,10 @@
<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 18/04/11, 22:45
+ @version 2.1.1
+ @date 19/04/2012, 22:45
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class header_tag
@@ -145,15 +145,28 @@
public static function load_db_values($ID){
//! liste des page dispo , hors page specifique, et si un article cms ne prend pas la priorité
- foreach (scan(DIR_FS_CATALOG .DIR_WS_INCLUDES.'content/') as $file) {
+ foreach (scan(DIR_FS_CATALOG . 'templates/' . TEMPLATE_NAME .'/'. DIR_WS_INCLUDES.'content/') as $file) {
if (substr("$file", -4) == '.php') {
$name=substr("$file",0,strlen($file)-4);
if(!in_array($name, self::$not_list) && parent::get_prio_cms($name)==false ) {
self::$list[]=array('file'=>$file, 'name'=>$name, 'key'=>$name);
+
+ self::$not_list[] = $name;
}
}
}
+
+ foreach (scan(DIR_FS_CATALOG .'templates/' . DEFAULT_TEMPLATE_NAME .'/'. DIR_WS_INCLUDES.'content/') as $file) {
+ if (substr("$file", -4) == '.php') {
+ $name=substr("$file",0,strlen($file)-4);
+ if(!in_array($name, self::$not_list) && parent::get_prio_cms($name)==false ) {
+
+ self::$list[]=array('file'=>$file, 'name'=>$name, 'key'=>$name);
+ }
+ }
+ }
+
//! Ajout Element generic
self::$list[]=array('file'=>'generic', 'name'=>__('generic shop'), 'key'=>'generic');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-18 21:12:35
|
Revision: 4277
http://oscss.svn.sourceforge.net/oscss/?rev=4277&view=rev
Author: oscim
Date: 2012-04-18 21:12:24 +0000 (Wed, 18 Apr 2012)
Log Message:
-----------
Suite mise en oeuvre du template defaut
Modified Paths:
--------------
trunk/catalog/includes/classes/page.php
Added Paths:
-----------
trunk/catalog/templates/defaut/Childs_tpl/
trunk/catalog/templates/defaut/Childs_tpl/boxe.php
trunk/catalog/templates/defaut/Childs_tpl/footer.php
trunk/catalog/templates/defaut/Childs_tpl/header.php
trunk/catalog/templates/defaut/Childs_tpl/module.php
trunk/catalog/templates/defaut/Childs_tpl/sidebar.php
trunk/catalog/templates/defaut/Childs_tpl/ssheader.php
trunk/catalog/templates/defaut/cfg/
trunk/catalog/templates/defaut/cfg/init.php
trunk/catalog/templates/defaut/template.php
Modified: trunk/catalog/includes/classes/page.php
===================================================================
--- trunk/catalog/includes/classes/page.php 2012-04-18 20:48:55 UTC (rev 4276)
+++ trunk/catalog/includes/classes/page.php 2012-04-18 21:12:24 UTC (rev 4277)
@@ -445,8 +445,12 @@
*/
public function pre_init(){
// set the template
- $this->page['template'] = TEMPLATE_NAME;
+ if(is_dir(DIR_WS_TEMPLATES . TEMPLATE_NAME) )
+ $this->page['template'] = TEMPLATE_NAME;
+ else
+ $this->page['template'] = DEFAULT_TEMPLATE_NAME;
+
// force redirect clean url after empty page cache
if(self::$CacheCalcul){
$quey_string=tep_get_all_get_params(array('cache','page'));
Added: trunk/catalog/templates/defaut/Childs_tpl/boxe.php
===================================================================
--- trunk/catalog/templates/defaut/Childs_tpl/boxe.php (rev 0)
+++ trunk/catalog/templates/defaut/Childs_tpl/boxe.php 2012-04-18 21:12:24 UTC (rev 4277)
@@ -0,0 +1,18 @@
+<?php
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 04/03/2012, 21:54
+ @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/templates/defaut/Childs_tpl/footer.php
===================================================================
--- trunk/catalog/templates/defaut/Childs_tpl/footer.php (rev 0)
+++ trunk/catalog/templates/defaut/Childs_tpl/footer.php 2012-04-18 21:12:24 UTC (rev 4277)
@@ -0,0 +1,51 @@
+<?php
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 04/03/2012, 21:54
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+
+ @note La Licence OpenSource d'osCSS, vous impose de conserver le liens vers le site de la communauté. C'est la seul contrepartie imposé part l'utilisation de cette solution , qui est diffusé gratuitement, dans le cadre de ca licence.
+ Si vous supprimer la référence à osCSS, la commuanté se reserve le droit de faire valoir ces droits aupres des organisme dedié à la protection de cette licence.
+
+ CE template est livré gratuitement pour donner un aperçu des disponibilités du moteur de templates.
+ Veuillez respecter les termes et conditions générales d'utilisation.
+ Vous pouvez employer nos templates sous n'importe quel site Web publiquement accessible selon les termes et conditions générales du contrat Creative Commons
+*/
+global $template;
+?>
+ <footer id="main-tpl-footer">
+ <div class="left_footer"></div>
+ <div class="center_footer">
+ ~ Realisation <a href="http://www.oscim.fr">oscim</a> 2010-<?php echo date('Y') ?> ~<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> ~
+ </div>
+ <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/templates/defaut/Childs_tpl/header.php
===================================================================
--- trunk/catalog/templates/defaut/Childs_tpl/header.php (rev 0)
+++ trunk/catalog/templates/defaut/Childs_tpl/header.php 2012-04-18 21:12:24 UTC (rev 4277)
@@ -0,0 +1,81 @@
+<?php
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 04/03/2012, 21:54
+ @author 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->GetHtmlMeta(); ?></title>
+ <meta name="description" content="<?php echo $page->GetHtmlMeta('description'); ?>" />
+ <meta name="keywords" content="<?php echo $page->GetHtmlMeta('keywords'); ?>" />
+ <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 ]>
+ <link rel="stylesheet" type="text/css" href="<?php echo 'templates/'.$template.'/'; ?>iecss.css" />
+ <![endif]-->
+
+<!--[if lte IE 8]>
+
+ <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></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 $page->GetHtmlMeta('canonical'); ?>" />
+</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/templates/defaut/Childs_tpl/module.php
===================================================================
--- trunk/catalog/templates/defaut/Childs_tpl/module.php (rev 0)
+++ trunk/catalog/templates/defaut/Childs_tpl/module.php 2012-04-18 21:12:24 UTC (rev 4277)
@@ -0,0 +1,133 @@
+<?php
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 04/03/2012, 21:54
+ @author 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($ele->type =='product'): /** 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="' . $ele->href . '" 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="' . $ele->href . '" 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 /** @remarks If buy possible and attribute , force choose attribute */ ?>
+
+ <?php if (_test_bool($ele->action['buy'] ) && count(product_attribut_info($ele->products_id)) != 0): ?>
+ <p><a class="submitBt" href="<?php echo $ele->href ?>" ><img border="0" class="left_bt" title="" alt="" src="<?php echo $page->getPathTemplate() ?>images/carticon.png"></a></p>
+
+ <?php /** @remarks If buy possible and attribute */ ?>
+
+ <?php elseif (_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 endif; ?>
+ <?php } ?>
+
+
+ <a class="details prod" href="<?php echo $ele->href ?>" title="header=[<?php echo __('view more') ?>] body=[ ] fade=[on]"><?php echo __('more') ?></a>
+ </div>
+ </div>
+ </section>
+ </li>
+ <?php elseif($ele->type =='content') : /** POSTS */ ?>
+ <dl class="listing contents <?php echo $page->page_content_clean() ?>">
+ <dt class="listing_s">
+ <a id="<?php echo $ele->id; ?>" href="<?php echo $ele->href ; ?>" ><?php echo $ele->title ?></a>
+ </dt>
+ </dl>
+
+ <?php elseif($ele->type =='categorie'): /** CATEGORIES */ ?>
+ <li class="one categorie">
+ <section class="outerblock">
+ <div class="innerblock">
+ <p class="title categorie">
+ <a href="<?php echo $ele->href ?>"> <?php echo $ele->categories_name ;?></a>
+ </p>
+ <p class="img categorie">
+ <?php echo '<a href="' . $ele->href. '">' . 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 else : /** Other */ ?>
+ <dl class="listing contents <?php echo $page->page_content_clean() ?>">
+ <dt class="listing_s">
+ <a id="<?php echo $ele->id; ?>" href="<?php echo $ele->href ; ?>" ><?php echo $ele->title ?></a>
+ </dt>
+ </dl>
+ <?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/templates/defaut/Childs_tpl/sidebar.php
===================================================================
--- trunk/catalog/templates/defaut/Childs_tpl/sidebar.php (rev 0)
+++ trunk/catalog/templates/defaut/Childs_tpl/sidebar.php 2012-04-18 21:12:24 UTC (rev 4277)
@@ -0,0 +1,28 @@
+<?php
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 04/03/2012, 21:54
+ @author 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/templates/defaut/Childs_tpl/ssheader.php
===================================================================
--- trunk/catalog/templates/defaut/Childs_tpl/ssheader.php (rev 0)
+++ trunk/catalog/templates/defaut/Childs_tpl/ssheader.php 2012-04-18 21:12:24 UTC (rev 4277)
@@ -0,0 +1,110 @@
+<?php
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 04/03/2012, 21:54
+ @author 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; ?>">
+ <section id="Box-<?php echo $boxe->name_clean; ?>" class="boxe">
+ <?php echo unhtmlentities($boxe->content) ?>
+ </section>
+ </div>
+
+ <div class="languages">
+ <?php
+ /**
+ @remarks Call widget boxe serach suggest
+ */
+ $boxe =$page->oscss_boxes->_return('languages'); ?>
+ <section id="Box-<?php echo $boxe->name_clean; ?>" class="boxe">
+ <?php echo unhtmlentities($boxe->content) ?>
+ </section>
+ </div>
+
+ <?php while($boxe=templ_draw_list('type=boxes&pile=header')):
+ 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; ?>
+ </div>
+
+
+
+</header>
+
+
+
+<nav>
+ <ul class="menu content">
+ <li><a href="<?php echo tep_href_link() ?>" 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/templates/defaut/cfg/init.php
===================================================================
--- trunk/catalog/templates/defaut/cfg/init.php (rev 0)
+++ trunk/catalog/templates/defaut/cfg/init.php 2012-04-18 21:12:24 UTC (rev 4277)
@@ -0,0 +1,212 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @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 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é
+*/
+
+
+
+
+/** 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('shopping_cart_short', 'header' ,array('cache'=>false));
+ $this->oscss_boxes->_add('whats_new', 'sidebar', array('cache'=>false));
+ $this->oscss_boxes->_add('specials', 'sidebar', array('cache'=>false));
+
+ $this->oscss_boxes->_add('bann_type', 'sidebar', array('cache'=>false));
+
+ $load->mode = 'home';
+
+ $this->oscss_modules->_add(FILENAME_NEW_PRODUCTS,'center',array('sort'=>60));
+ 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('myaccount', 'sidebar' ,array('cache'=>false,'sort'=>40));
+ $this->oscss_boxes->_add('specials', 'sidebar', array('cache'=>false));
+ break;
+
+ case 'content':
+// $this->oscss_boxes->_add('shopping_cart_short', 'header' ,array('cache'=>false));
+ $this->oscss_boxes->_add('categories', 'sidebar');
+ break;
+
+ case 'product':
+// $this->oscss_boxes->_add('shopping_cart_short', 'header' ,array('cache'=>false));
+ $this->oscss_boxes->_add('categories', 'sidebar');
+ $this->oscss_boxes->_add('manufacturer_info', 'sidebar');
+ $this->oscss_boxes->_add('specials', 'sidebar', array('cache'=>false));
+
+ $this->oscss_modules->_add(FILENAME_ALSO_PURCHASED_PRODUCTS,'center',array('sort'=>60));
+ $this->oscss_modules->_add(FILENAME_UPCOMING_PRODUCTS,'center',array('sort'=>61));
+ break;
+
+ case 'listing':
+// $this->oscss_boxes->_add('shopping_cart_short', 'header' ,array('cache'=>false));
+ $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));
+
+
+ // precise si module utilisé comme pleine page
+ switch(self::oscss_body_id()){
+ case '404':
+ $this->oscss_modules->_add(FILENAME_NEW_PRODUCTS,'center',array('sort'=>60));
+ break;
+ default:
+ }
+
+}
+
+
+
+
+
+
+/**
+ 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));
+
+
+?>
\ No newline at end of file
Added: trunk/catalog/templates/defaut/template.php
===================================================================
--- trunk/catalog/templates/defaut/template.php (rev 0)
+++ trunk/catalog/templates/defaut/template.php 2012-04-18 21:12:24 UTC (rev 4277)
@@ -0,0 +1,117 @@
+<?php
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 04/03/2012, 21:54
+ @author 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();
+?>
+
+<?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'); ?>
+ <?php echo $page->tep_get_sidebar('Childs_tpl/ssheader') ?>
+<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; ?>
+ <br class="clear" />
+ </div>
+
+ </div>
+ </div>
+
+ <?php echo $page->tep_get_footer($page->the_var('PathChildGab').'footer') ; ?>
+
+
+ </body>
+</html>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-18 20:49:01
|
Revision: 4276
http://oscss.svn.sourceforge.net/oscss/?rev=4276&view=rev
Author: oscim
Date: 2012-04-18 20:48:55 +0000 (Wed, 18 Apr 2012)
Log Message:
-----------
correction et ajustement
suppression du exit si pas de template trouve dans le front
Modified Paths:
--------------
trunk/catalog/includes/classes/page.php
trunk/dev/GenerCode/datatype/Modele/catalog/common/classes/datatype_drivers/Data__DATATYPE_REPLACE_.php
trunk/dev/GenerCode/datatype/Modele/install.xml
Modified: trunk/catalog/includes/classes/page.php
===================================================================
--- trunk/catalog/includes/classes/page.php 2012-04-18 20:46:06 UTC (rev 4275)
+++ trunk/catalog/includes/classes/page.php 2012-04-18 20:48:55 UTC (rev 4276)
@@ -176,16 +176,6 @@
}
/**
- * \brief retour du nom du template
- */
- private static function oscss_get_template() {
- if(!defined('TEMPLATE_NAME')) die(__('FATAL ERROR: no template defined !'));
- elseif(!is_dir(DIR_WS_TEMPLATES . TEMPLATE_NAME) ) die(__('FATAL ERROR: the template directory do not exist!'));
- else return TEMPLATE_NAME;
- }
-
-
- /**
@fn oscss_get_gabarit_template()
@brief traite le nom de la page pour determine le gabarit utilisé
Use drivers/page/
@@ -455,9 +445,8 @@
*/
public function pre_init(){
// set the template
- $this->page['template'] = page::oscss_get_template();
+ $this->page['template'] = TEMPLATE_NAME;
-
// force redirect clean url after empty page cache
if(self::$CacheCalcul){
$quey_string=tep_get_all_get_params(array('cache','page'));
Modified: trunk/dev/GenerCode/datatype/Modele/catalog/common/classes/datatype_drivers/Data__DATATYPE_REPLACE_.php
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/catalog/common/classes/datatype_drivers/Data__DATATYPE_REPLACE_.php 2012-04-18 20:46:06 UTC (rev 4275)
+++ trunk/dev/GenerCode/datatype/Modele/catalog/common/classes/datatype_drivers/Data__DATATYPE_REPLACE_.php 2012-04-18 20:48:55 UTC (rev 4276)
@@ -23,7 +23,7 @@
@var DataType array reg for seo class
*/
public $reg_anchors = array(
- '_DATATYPE_REPLACE_' => '_DATATYPE_REPLACE_SEOTAG_'
+ '_DATATYPE_REPLACE_MAJ_' => '_DATATYPE_REPLACE_SEOTAG_'
);
/**
@var DataType array reg check for control get params , please respect order $reg_anchors
Modified: trunk/dev/GenerCode/datatype/Modele/install.xml
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/install.xml 2012-04-18 20:46:06 UTC (rev 4275)
+++ trunk/dev/GenerCode/datatype/Modele/install.xml 2012-04-18 20:48:55 UTC (rev 4276)
@@ -39,11 +39,11 @@
<file name="includes/modules/account/ac__DATATYPE_REPLACE_.php" />
<!-- template -->
- <file name="includes/templates/defaut/content/_DATATYPE_REPLACE_.php" />
- <file name="includes/templates/defaut/gabarit/_DATATYPE_REPLACE_/account.box_view.gab" />
- <file name="includes/templates/defaut/gabarit/_DATATYPE_REPLACE_/account.display_view.edit.gab" />
- <file name="includes/templates/defaut/gabarit/_DATATYPE_REPLACE_/account.display_view.step.0.gab" />
- <file name="includes/templates/defaut/gabarit/_DATATYPE_REPLACE_/account.display_view.page.gab" />
+ <file name="templates/defaut/includes/content/_DATATYPE_REPLACE_.php" />
+ <file name="templates/defaut/includes/gabarit/_DATATYPE_REPLACE_/account.box_view.gab" />
+ <file name="templates/defaut/includes/gabarit/_DATATYPE_REPLACE_/account.display_view.edit.gab" />
+ <file name="templates/defaut/includes/gabarit/_DATATYPE_REPLACE_/account.display_view.edit.step.0.gab" />
+ <file name="templates/defaut/includes/gabarit/_DATATYPE_REPLACE_/account.display_view.page.gab" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-18 19:51:53
|
Revision: 4274
http://oscss.svn.sourceforge.net/oscss/?rev=4274&view=rev
Author: oscim
Date: 2012-04-18 19:51:42 +0000 (Wed, 18 Apr 2012)
Log Message:
-----------
correction coquille notice php
correction erreur appel function
ajustement chemin TestFile
Modified Paths:
--------------
trunk/catalog/includes/classes/navigation_history.php
trunk/catalog/includes/classes/page.php
trunk/catalog/templates/defaut/includes/gabarit/box.myaccount.gab
Modified: trunk/catalog/includes/classes/navigation_history.php
===================================================================
--- trunk/catalog/includes/classes/navigation_history.php 2012-04-18 18:38:35 UTC (rev 4273)
+++ trunk/catalog/includes/classes/navigation_history.php 2012-04-18 19:51:42 UTC (rev 4274)
@@ -1,10 +1,10 @@
<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
/**
- @ licence GPL *2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 18/12/11, 21:44
+ @date 19/04/2012, 21:44
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
\class navigation_history
@@ -114,7 +114,7 @@
)
return;
- $current = array('title' => $array['title'],
+ $current = array('title' => @$array['title'],
'page' => $page,
'mode' => $request_type,
'link' => $array['url'],
Modified: trunk/catalog/includes/classes/page.php
===================================================================
--- trunk/catalog/includes/classes/page.php 2012-04-18 18:38:35 UTC (rev 4273)
+++ trunk/catalog/includes/classes/page.php 2012-04-18 19:51:42 UTC (rev 4274)
@@ -1,10 +1,10 @@
<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
/**
- @ licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 09/01/12, 21:44
+ @date 19/04/2012, 21:44
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
\class page
@@ -227,15 +227,16 @@
if($lg && $file=substr($file,0,-4) ) {
if($core==NULL || $core==false)
- foreach( array('txt','php') as $ext_lg)
- if( ($s=$path_template.$file_path.$file.'.'.$ext_lg) && self::TestFile($s) && !in_array($s,(array)$doublon)) $sortie= $s;
+ foreach( array('txt','php') as $ext_lg)
+ if( ($s=$path_template.$file_path.$file.'.'.$ext_lg) && self::TestFile($s) && !in_array($s,(array)$doublon)) $sortie= $s;
if($sortie==NULL)
- foreach( array('txt','php') as $ext_lg)
- if( ($s=$path.$file.'.'.$ext_lg) && self::TestFile($s) && !in_array($s,(array)$doublon)) $sortie= $s;
+ foreach( array('txt','php') as $ext_lg)
+ if( ($s=$path.$file.'.'.$ext_lg) && self::TestFile($s) && !in_array($s,(array)$doublon)) $sortie= $s;
}
else {
if( ($s=$path_template.$file_path.$file) && self::TestFile($s) && !in_array($s,(array)$doublon)) $sortie= $s;
+ elseif( ($s=DIR_WS_TEMPLATES . DEFAULT_TEMPLATE_NAME . '/' .$file_path.$file) && self::TestFile($s) && !in_array($s,(array)$doublon)) $sortie= $s;
elseif( ($s=$path.$file) && self::TestFile($s) && !in_array($s,(array)$doublon) ) $sortie= $s;
}
$doublon[]=$sortie;
Modified: trunk/catalog/templates/defaut/includes/gabarit/box.myaccount.gab
===================================================================
--- trunk/catalog/templates/defaut/includes/gabarit/box.myaccount.gab 2012-04-18 18:38:35 UTC (rev 4273)
+++ trunk/catalog/templates/defaut/includes/gabarit/box.myaccount.gab 2012-04-18 19:51:42 UTC (rev 4274)
@@ -34,7 +34,7 @@
<li><?php echo '<a href="' . tep_href_link(FILENAME_LOGOFF, '', 'NONSSL') . '">' .TEXT_LOGOFF . '</a>'; ?></li>
</ul>
- <?php if($account['customers_newsletter'] > 0 || $account['global_product_notifications'] > 0 ) : ?>
+ <?php if($account['customers_newsletter'] > 0 || @$account['global_product_notifications'] > 0 ) : ?>
<!-- dynamic notification menu -->
<div class="contentBox myEmail">
<h3><?php echo EMAIL_NOTIFICATIONS_TITLE; ?></h3>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-18 18:38:46
|
Revision: 4273
http://oscss.svn.sourceforge.net/oscss/?rev=4273&view=rev
Author: oscim
Date: 2012-04-18 18:38:35 +0000 (Wed, 18 Apr 2012)
Log Message:
-----------
correction et ajustement mise en forme des sortie de logs
Modified Paths:
--------------
trunk/catalog/admin/includes/exts/package/CIP.php
trunk/catalog/admin/includes/exts/package/packageInstaller.php
trunk/catalog/admin/includes/exts/package/tags/addfile.php
trunk/catalog/admin/includes/exts/package/tags/addfilelg.php
trunk/catalog/admin/includes/gabarit/package/display_view.package.install.gab
Modified: trunk/catalog/admin/includes/exts/package/CIP.php
===================================================================
--- trunk/catalog/admin/includes/exts/package/CIP.php 2012-04-18 18:34:53 UTC (rev 4272)
+++ trunk/catalog/admin/includes/exts/package/CIP.php 2012-04-18 18:38:35 UTC (rev 4273)
@@ -329,9 +329,11 @@
sqlcip::delete(array('id'=>self::$cInfo->id));
}
-///================================================================== //Is installed? //==================================================================
+///================================================================== //Is installed //==================================================================
/**
+ @fn is_installed()
+ @return int 1 : install | 0 : not install
*/
private function is_installed() {
if (!isset($this->cip_installed)) {
@@ -340,7 +342,7 @@
$result=tep_db_query("select cip_installed from ".TABLE_CIP." where cip_folder_name='".self::$cip_name."'");
if ($result===false) { trigger_error(__CLASS__.sprintf('error %s', __FUNCTION__.'::'.__LINE__), E_USER_ERROR); return $this->cip_installed=false; }
$installed=tep_db_fetch_array($result);
- $this->cip_installed=$installed['cip_installed'];
+ $this->cip_installed=(int)$installed['cip_installed'];
}
return $this->cip_installed;
}
@@ -349,7 +351,10 @@
*/
private function unset_installed() {$this->set_installed('0');}
+
/**
+ @fn set_installed($status='1')
+ @param $status
*/
private function set_installed($status='1') {
if(is_object(self::$cInfo) && self::$cInfo->id > 0)
@@ -381,17 +386,15 @@
//! Erreur fatal before process, delete and exit
if(!$this->check_bylevel(1)){
self::InProcess(__("Erreur suite lecture XML file "), __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'block');
-
+ //$this->DeleteContribFull();
return false;
-
-// $this->DeleteContribFull();
}
else
return true;
}
elseif ($this->was_unpacked()) {
$messageStack->add( 'Couldn\'t unpack <strong>'.$this->get_zip_name().'</strong> to read data about CIP. ', 'warning');
-// $this->DeleteContribFull();
+ //$this->DeleteContribFull();
}
return false;
}
@@ -404,7 +407,7 @@
$this->does_have_install_xml();
if(!$xmlDoc=new DomDocument()) return false;
-// $xmlDoc->prevservWhiteSpace = false;
+ //$xmlDoc->prevservWhiteSpace = false;
if(! $xmlDoc->load(DIR_FS_CIP.self::$cip_name.'/'.self::CONFIG_FILENAME)) return false;
if(!$root = $xmlDoc->documentElement) return false;
if(!$this->parcourir($root)) return false;
@@ -618,10 +621,10 @@
// if ( _cst_bool('ALLOW_FILES_BACKUP')){
//! Backup Files:
-// if (!$this->backup() || !self::check_bylevel(1) /* !$this->is_all_right()*/){
-// self::InProcess(__("Erreur apres traitement de cette fonction : backup()"), __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'block');
-// return false;
-// }
+ if (!$this->backup() || !self::check_bylevel(1) /* !$this->is_all_right()*/){
+ self::InProcess(__("Erreur apres traitement de cette fonction : backup()"), __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'block');
+ return false;
+ }
//! Backup DataBase:
// if (!CipUtility::sql_backup() || !self::check_bylevel(1)){
// self::InProcess(__("Erreur apres traitement de cette fonction : CipUtility::sql_backup()"), __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'block');
@@ -691,7 +694,7 @@
foreach ($this->contrib_data as $id=>$tag)
if ( $tag->conflicts_check_for_install() ===false){
- self::InProcess($msg.__("Erreur durant traitement de cette fonction "),'tag_xml-['.$id.']'. $tag->tag_name.'->'.__FUNCTION__,'block');
+ self::InProcess(__("Erreur durant traitement de cette fonction "), '<strong>'.$tag->tag_name.'->'.__FUNCTION__.'</strong>','block');
break;
}
return true;
@@ -705,7 +708,7 @@
foreach ($this->contrib_data as $id=>$tag)
if ( $tag->conflicts_check_for_remove() ===false){
- self::InProcess($msg.__("Erreur durant traitement de cette fonction "),'tag_xml-['.$id.']'. $tag->tag_name.'->'.__FUNCTION__,'block');
+ self::InProcess(__("Erreur durant traitement de cette fonction "), '<strong>'.$tag->tag_name.'->'.__FUNCTION__.'</strong>','block');
break;
}
return true;
@@ -722,10 +725,13 @@
foreach ($this->contrib_data as $id=>$tag)
if ( $tag->permissions_check_for_install() ===false){
- self::InProcess($msg.__("Erreur durant traitement de cette fonction "),'tag_xml-['.$id.']'. $tag->tag_name.'->'.__FUNCTION__,'block');
+ self::InProcess(__("Erreur durant traitement de cette fonction "), '<strong>'.$tag->tag_name.'->'.__FUNCTION__.'</strong>','block');
break;
}
+ if(!self::check_bylevel(0))
+ return false;
+
return true;
}
@@ -740,7 +746,7 @@
foreach ($this->contrib_data as $id=>$tag)
if ( $tag->permissions_check_for_remove() ===false){
- self::InProcess($msg.__("Erreur durant traitement de cette fonction "),'tag_xml-['.$id.']'. $tag->tag_name.'->'.__FUNCTION__,'block');
+ self::InProcess(__("Erreur durant traitement de cette fonction "), '<strong>'.$tag->tag_name.'->'.__FUNCTION__.'</strong>','block');
break;
}
return true;
@@ -842,16 +848,18 @@
//! Check full control
if (!$this->$permissions_check()){
- self::InProcess(__("Erreur durant traitement de cette fonction permissions_check_for_remove()"), __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'block');
- return;
+// self::InProcess(__("Erreur durant traitement de cette fonction permissions_check_for_remove()"), __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'block');
+ return false;
}
if (!$this->$conflicts_check()){
- self::InProcess(__("Erreur durant traitement de cette fonction conflicts_check_for_remove()"), __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'block');
- return;
+// self::InProcess(__("Erreur durant traitement de cette fonction conflicts_check_for_remove()"), __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'block');
+ return false;
}
//! check error level
- if(!self::check_bylevel(0)) return false;
+ if(!self::check_bylevel(0))
+ return false;
+
return true;
}
Modified: trunk/catalog/admin/includes/exts/package/packageInstaller.php
===================================================================
--- trunk/catalog/admin/includes/exts/package/packageInstaller.php 2012-04-18 18:34:53 UTC (rev 4272)
+++ trunk/catalog/admin/includes/exts/package/packageInstaller.php 2012-04-18 18:38:35 UTC (rev 4273)
@@ -97,6 +97,12 @@
return $array;
}
+
+ /**
+ @fn install_exts($pkgID)
+ @brief execute installation process
+ @param $pkgID
+ */
public function install_exts($pkgID){
global $messageStack;
Modified: trunk/catalog/admin/includes/exts/package/tags/addfile.php
===================================================================
--- trunk/catalog/admin/includes/exts/package/tags/addfile.php 2012-04-18 18:34:53 UTC (rev 4272)
+++ trunk/catalog/admin/includes/exts/package/tags/addfile.php 2012-04-18 18:38:35 UTC (rev 4273)
@@ -105,7 +105,7 @@
parent::recursive_mkdir($path);
if(!is_writable($path)) {
- CIP::InProcess('check'.__('write permissins needed text').$path, __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'block');
+ CIP::InProcess('check'.__('write permissins needed text').'<pre>'.$path.'</pre>', __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'block');
return false;
}
if(file_exists($fs_filename) && !is_writable($fs_filename)) {
@@ -131,12 +131,12 @@
if (!_cst_bool('ALLOW_OVERWRITE_MODIFIED')) {
if (!is_file($cip_file)) {
- $msg="Backup file ".$backup_file." is not exists. This file needed to check if file". $fs_filename. " was modified since Contrib Installer have been installed.
- <br /><b>CIP.NET.UA Advise</b>:<br />
- Set \"Allow Overwrite Existing Modified Files\" to TRUE and all modified files will be overwritten.
- All changes will be lost!<br />
- <i>or</i><br />
- Copy clean osCommerce files to ".DIR_FS_CIP."/".CONTRIB_INSTALLER_NAME."_".CONTRIB_INSTALLER_VERSION. "/catalog/ and try again.";
+ $msg="Backup file ".$backup_file." is not exists. This file needed to check if file". $fs_filename. " was modified since Contrib Installer have been installed.";
+// <br /><b>CIP.NET.UA Advise</b>:<br />
+// Set \"Allow Overwrite Existing Modified Files\" to TRUE and all modified files will be overwritten.
+// All changes will be lost!<br />
+// <i>or</i><br />
+// Copy clean osCommerce files to ".DIR_FS_CIP."/".CONTRIB_INSTALLER_NAME."_".CONTRIB_INSTALLER_VERSION. "/catalog/ and try again.";
CIP::InProcess($msg, __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'noblock');
}
@@ -175,13 +175,12 @@
if (!_cst_bool('ALLOW_OVERWRITE_MODIFIED')) {
if (is_file($cip_file)) {
if (!fileUtility::equal_files($current_file, $cip_file)) {
- CIP::InProcess("File ".$current_file." exists and was modified since CIP have been installed. Overwriting is not allowed.<br /><b>CIP.NET.UA Advise</b>:<br />Set \"Allow Overwrite Existing Modified Files\" to TRUE or change install.xml.".$cip_file, __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'block');
+ CIP::InProcess("File ".$current_file." exists and was modified since CIP have been installed. Overwriting is not allowed.<br /><br />Set \"Allow Overwrite Existing Modified Files\" to TRUE or change install.xml.".$cip_file, __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'block');
return false;
}
}
else {
CIP::InProcess("File ".$cip_file." needed to check if file". $current_file. " was modified since CIP have been installed.
- <br /><b>CIP.NET.UA Advise</b>:<br />
Restore CIP files in Contributions folder and try again.<br />
<i>or</i><br />
Set \"Allow Overwrite Existing Modified Files\" to TRUE and all modified files will be overwritten.
@@ -217,7 +216,7 @@
$fs_filename=replace_path_admin($this->fs_filename($i));
if (!file_exists($cip_file) && is_file($cip_file)) {
- CIP::InProcess("Run time error: <strong>".__("le fichier de la contrib n'existe pas ")."</strong><br /> fichier :: ".$cip_file, __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'block');
+ CIP::InProcess("Run time error: <strong>".__("le fichier de la contrib qui esy declare dans install n est pas trouve ")."</strong><br /> "."<pre> fichier :: ".$cip_file."</pre>" , __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'block');
return true;
}
@@ -225,7 +224,7 @@
//!if file is copied
if(fileUtility::equal_files($cip_file,$fs_filename)){
- CIP::InProcess("Run time : ".__('les fichiers sont identique ok! sortie pour ').$fs_filename, __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'info');
+ CIP::InProcess("Run time : ".__('les fichiers sont identique ok! sortie pour ')."<pre> ".$fs_filename."</pre>", __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'info');
continue;
}
@@ -238,15 +237,17 @@
parent::backup_file(replace_path_admin($this->data['filename'][$i]));
if(!ci_remove($this->fs_filename($i)))
- CIP::InProcess("Run time error: ".__('impossible supprimer ce fichier ').$fs_filename, __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'info');
+ CIP::InProcess("Run time error: ".__('impossible supprimer ce fichier ')."<pre> ".$fs_filename."</pre>", __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'info');
}
//! We copy file to right location:
if(fileUtility::_copy($cip_file, $fs_filename) ===false) {
- CIP::InProcess("Run time error: ".__('couldnt copy to text')."<br /> original:: ".$cip_file."<br /> copy:: ".$fs_filename, __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'block');
+ CIP::InProcess("Run time error: ".__('couldnt copy to text')."<br /> <pre> original:: ".$cip_file."<br /> copy:: ".$fs_filename."</pre>", __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'block');
return false;
}
+ else
+ CIP::InProcess("Run time : ".__('copy effectue')."<pre> copy:: ".$fs_filename."</pre>", __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'info');
if (file_exists($fs_filename))
fileUtility::_chmod($fs_filename, 0777);
Modified: trunk/catalog/admin/includes/exts/package/tags/addfilelg.php
===================================================================
--- trunk/catalog/admin/includes/exts/package/tags/addfilelg.php 2012-04-18 18:34:53 UTC (rev 4272)
+++ trunk/catalog/admin/includes/exts/package/tags/addfilelg.php 2012-04-18 18:38:35 UTC (rev 4273)
@@ -73,16 +73,16 @@
for ($i = 0; $i < $tags->length; $i++) {
reset($languages);
for ($j=0; $j<$n; $j++) {
- $path = $languages[$j]['directory'];
- $this->data['filename'][$c] = str_replace('%LANGUAGE%',$path ,$this->getITagAttr($tags,$i,'name'));
- $this->data['srcdir'][$c] = str_replace('%LANGUAGE%',$path ,$this->getITagAttr($tags,$i,'srcdir'));
- $this->data['lgref'][$c] = $this->getITagAttr($tags,$i,'lgref') ;
+ $path = $languages[$j]['directory'];
+ $this->data['filename'][$c] = str_replace('%LANGUAGE%',$path ,$this->getITagAttr($tags,$i,'name'));
+ $this->data['srcdir'][$c] = str_replace('%LANGUAGE%',$path ,$this->getITagAttr($tags,$i,'srcdir'));
+ $this->data['lgref'][$c] = $this->getITagAttr($tags,$i,'lgref') ;
- //! lang file en cours
- $this->data['lgfile'][$c] = $path ;
+ //! lang file en cours
+ $this->data['lgfile'][$c] = $path ;
- if($this->data['srcdir'][$c]==NULL)$this->data['srcdir'][$c] = 'catalog';
- $c++;
+ if($this->data['srcdir'][$c]==NULL)$this->data['srcdir'][$c] = 'catalog';
+ $c++;
}
}
}
@@ -116,7 +116,7 @@
if (is_file($fs_filename)) {
//!if file is copied
if($this->equal_files($cip_file,$fs_filename)){
- CIP::InProcess("Run time : ".__('les fichiers sont identique ok! sortie pour ').$fs_filename, __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'info');
+ CIP::InProcess("Run time : ".__('les fichiers sont identique ok! sortie pour ')."<pre> ".$fs_filename."</pre>", __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'info');
continue;
}
@@ -127,17 +127,18 @@
*/
if (_cst_bool('ALLOW_FILES_BACKUP')) parent::backup_file(replace_path_admin($this->data['filename'][$i]));
- if(!ci_remove($this->fs_filename($i)))CIP::InProcess("Run time error: ".__('impossible supprimer ce fichier ').$fs_filename, __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'info');
+ if(!ci_remove($this->fs_filename($i)))CIP::InProcess("Run time error: ".__('impossible supprimer ce fichier ')."<pre> ".$fs_filename."</pre>", __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'info');
}
//! We copy file to right location:
if(!fileUtility::_copy($cip_file, $fs_filename)) {
- CIP::InProcess("Run time error: ".__('couldnt copy to text')."<br /> original:: ".$cip_file."<br /> copy:: ".$fs_filename, __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'block');
+ CIP::InProcess("Run time error: ".__('couldnt copy to text')."<br /><pre> original:: ".$cip_file."<br /> copy:: ".$fs_filename."</pre>", __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'block');
trigger_error(__CLASS__.sprintf(' error %s', __FUNCTION__), E_USER_ERROR);
return false;
}
- if (file_exists($fs_filename))chmod($fs_filename, 0777);
+ if (file_exists($fs_filename))
+ fileUtility::_chmod($fs_filename, 0777);
}
return true;
Modified: trunk/catalog/admin/includes/gabarit/package/display_view.package.install.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/package/display_view.package.install.gab 2012-04-18 18:34:53 UTC (rev 4272)
+++ trunk/catalog/admin/includes/gabarit/package/display_view.package.install.gab 2012-04-18 18:38:35 UTC (rev 4273)
@@ -18,10 +18,11 @@
<?php endforeach; ?>
</ul>
</div>
+</div>
- <div class="fright w_50">
- <h3><?php echo __('package heading title install logs') ?></h3>
- <ul>
+ <div class="block_uniq">
+ <h3 class="Ctrtirroir"><?php echo __('package heading title install logs') ?></h3>
+ <ul class="tirroir">
<?php foreach(package::$Rightlist as $item): ?>
<li>- <?php echo $item ?></li>
<?php endforeach; ?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-18 18:35:03
|
Revision: 4272
http://oscss.svn.sourceforge.net/oscss/?rev=4272&view=rev
Author: oscim
Date: 2012-04-18 18:34:53 +0000 (Wed, 18 Apr 2012)
Log Message:
-----------
coquille d'extention
Added Paths:
-----------
trunk/dev/GenerCode/datatype/Modele/catalog/includes/languages/fr_FR/modules/account/ac__DATATYPE_REPLACE_.txt
Removed Paths:
-------------
trunk/dev/GenerCode/datatype/Modele/catalog/includes/languages/fr_FR/modules/account/ac__DATATYPE_REPLACE_.php
Deleted: trunk/dev/GenerCode/datatype/Modele/catalog/includes/languages/fr_FR/modules/account/ac__DATATYPE_REPLACE_.php
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/catalog/includes/languages/fr_FR/modules/account/ac__DATATYPE_REPLACE_.php 2012-04-18 16:30:19 UTC (rev 4271)
+++ trunk/dev/GenerCode/datatype/Modele/catalog/includes/languages/fr_FR/modules/account/ac__DATATYPE_REPLACE_.php 2012-04-18 18:34:53 UTC (rev 4272)
@@ -1,13 +0,0 @@
-<?php
-/**
- @licence GPL 2005-_CURRENTYEAR_ The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version _CURRENTVERSION_
- @date _CURRENTDATE_
- @author genrated by GenerCode
- @encode UTF-8
- @note not delete item in public module. this reserved in admin panel
-*/
-
-?>
\ No newline at end of file
Copied: trunk/dev/GenerCode/datatype/Modele/catalog/includes/languages/fr_FR/modules/account/ac__DATATYPE_REPLACE_.txt (from rev 4269, trunk/dev/GenerCode/datatype/Modele/catalog/includes/languages/fr_FR/modules/account/ac__DATATYPE_REPLACE_.php)
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/catalog/includes/languages/fr_FR/modules/account/ac__DATATYPE_REPLACE_.txt (rev 0)
+++ trunk/dev/GenerCode/datatype/Modele/catalog/includes/languages/fr_FR/modules/account/ac__DATATYPE_REPLACE_.txt 2012-04-18 18:34:53 UTC (rev 4272)
@@ -0,0 +1,56 @@
+<?php
+/**
+ @licence GPL 2005-_CURRENTYEAR_ The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version _CURRENTVERSION_
+ @date _CURRENTDATE_
+ @author genrated by GenerCode
+ @encode UTF-8
+ @note not delete item in public module. this reserved in admin panel
+*/
+
+
+ /* Link in menu */
+ $lang['ac__DATATYPE_REPLACE_ menu myaccount link manage'] = "Annuaires";
+
+ /* Bouton */
+ $lang['ac__DATATYPE_REPLACE_ box action add'] = "Ajouter";
+ $lang['ac__DATATYPE_REPLACE_ action abandons'] = "Abandonner";
+
+ /* Widget */
+ $lang['ac__DATATYPE_REPLACE_ widget view'] = "_DATATYPE_REPLACE_s";
+
+ /* Pleine page */
+ $lang['ac__DATATYPE_REPLACE_ page view'] = "Annuaire";
+
+ $lang['ac__DATATYPE_REPLACE_ table heading title']="Titre" ;
+ $lang['ac__DATATYPE_REPLACE_ table heading date']="créer" ;
+ $lang['ac__DATATYPE_REPLACE_ table heading action']="action" ;
+
+$lang['history tab']="Voir mes anciennes commandes" ;
+$lang['history tab']="Voir mes anciennes commandes" ;
+
+
+
+
+// $lang['history tab']="Voir mes anciennes commandes" ;
+
+$lang['history widget view']="Toutes mes commandes" ;
+
+$lang['history heading listing']="Historique des Commandes" ;
+$lang['history text order number']="Numéro de commande : " ;
+$lang['history text order status']="Statut de la commande : " ;
+$lang['history text order date']="Date de la commande : " ;
+$lang['history text order products']="Produit(s) : " ;
+$lang['history text order cost']="Coût de la commande : " ;
+
+
+$lang['history small image button view']="Afficher" ;
+$lang['history pdf link']="Pdf" ;
+
+
+$lang['history text result %s']="result %s" ;
+
+
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-18 16:30:30
|
Revision: 4271
http://oscss.svn.sourceforge.net/oscss/?rev=4271&view=rev
Author: oscim
Date: 2012-04-18 16:30:19 +0000 (Wed, 18 Apr 2012)
Log Message:
-----------
correction coquille , et coherance de l'apparition des bouton dans l'etape db de l'install
Suite travail wiget HelpConfig
Modified Paths:
--------------
trunk/catalog/Documents/admin/data/dashboard.xml
trunk/catalog/admin/includes/languages/fr_FR/widget/HelpConfig.txt
trunk/catalog/admin/includes/widget/HelpConfig.php
trunk/catalog/install/includes/content/core.installdb.php
Modified: trunk/catalog/Documents/admin/data/dashboard.xml
===================================================================
--- trunk/catalog/Documents/admin/data/dashboard.xml 2012-04-18 16:04:30 UTC (rev 4270)
+++ trunk/catalog/Documents/admin/data/dashboard.xml 2012-04-18 16:30:19 UTC (rev 4271)
@@ -91,7 +91,7 @@
<config_110>
<left>
- <widget>HelpConfig</widget>
+ <widget>HelpConfig</widget>
</left>
<right>
<widget>SsMenuConfig</widget>
@@ -100,7 +100,7 @@
<config_120>
<left>
- <widget>HelpConfig</widget>
+ <widget>HelpConfig</widget>
</left>
<right>
<widget>SsMenuConfig</widget>
@@ -109,7 +109,7 @@
<config_126>
<left>
- <widget>HelpConfig</widget>
+ <widget>HelpConfig</widget>
</left>
<right>
<widget>SsMenuConfig</widget>
@@ -118,7 +118,7 @@
<config_127>
<left>
- <widget>HelpConfig</widget>
+ <widget>HelpConfig</widget>
</left>
<right>
<widget>SsMenuConfig</widget>
@@ -138,6 +138,7 @@
<home>
<left>
+ <widget>HelpConfig</widget>
<widget>Notification</widget>
<widget>homeStock</widget>
<widget>CustomerLast</widget>
Modified: trunk/catalog/admin/includes/languages/fr_FR/widget/HelpConfig.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/widget/HelpConfig.txt 2012-04-18 16:04:30 UTC (rev 4270)
+++ trunk/catalog/admin/includes/languages/fr_FR/widget/HelpConfig.txt 2012-04-18 16:30:19 UTC (rev 4271)
@@ -9,6 +9,8 @@
@encode UTF-8
*/
+
+$lang['widget help config index']="Configuration minimun" ;
$lang['widget help config config_35']="Configuration des produits" ;
$lang['widget help config config_39']="Configuration des utilisateurs - Aides" ;
$lang['widget help config config_40']="Configuration du processus - Aides" ;
@@ -45,5 +47,14 @@
<br /> N'oubliez pas de configurer le template une fois celui-ci choisi. " ;
+$lang['HelpConfig link init menu'] = "initialiser le menu";
+$lang['widget text help index']="Votre première connexion à l'espace privé d'administration. <br />
+ Vous devez suivre ces étapes de base... <br />
+- Commencer par %s <br />
+<br />
+ce wizard ne sera plus affiché, et vous devrez utliser le menu de d'administration
+" ;
+
+
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/widget/HelpConfig.php
===================================================================
--- trunk/catalog/admin/includes/widget/HelpConfig.php 2012-04-18 16:04:30 UTC (rev 4270)
+++ trunk/catalog/admin/includes/widget/HelpConfig.php 2012-04-18 16:30:19 UTC (rev 4271)
@@ -60,7 +60,22 @@
'<a href="'.tep_href_link(FILENAME_CONFIGURATION, 'gparentID=100&gID=29').'">'.__('HelpConfig link template').'</a>'
).
'</p>';
+ break;
+ case 'home': // home
+ case 'index': // home
+ default:
+ if($_SESSION['login_lognum'] == 0){
+ echo '<p>'.
+ sprintf(
+ __('widget text help index'),
+ '<a href="'.tep_href_link('adminAccount.php', 'action=init_menu').'">'.__('HelpConfig link init menu').'</a>'
+ ).
+ '</p>';
+ }
+
+ break;
+
}
?>
Modified: trunk/catalog/install/includes/content/core.installdb.php
===================================================================
--- trunk/catalog/install/includes/content/core.installdb.php 2012-04-18 16:04:30 UTC (rev 4270)
+++ trunk/catalog/install/includes/content/core.installdb.php 2012-04-18 16:30:19 UTC (rev 4271)
@@ -172,34 +172,36 @@
foreach($res as $row)
echo $row;
+ elseif(!isset($_POST['upgrade'])) {
+ echo '<hr />';
+ echo '<form id="install" action="?etape='.$this->get_current_etape().'&upgrade=true" method="post">'."\n";
+ $this->repet_post();
+ echo "<p>" .core::l10n("Nouvelle installation. Supprime les données de la base si elles esistent " ).
+ ' '.osc_draw_hidden_field('upgrade', '','install') .
+ ' <input type="submit" class="submitBt" name="up_bouton_'.$version['name'].'" value="'.core::l10n("Installer" ).'" />';
+ echo "</p>\n".'</form>'."\n";
+ }
- else {
- echo '<hr />';
- echo '<form id="install" action="?etape='.$this->get_current_etape().'&upgrade=true" method="post">'."\n";
- $this->repet_post();
- echo "<p>" .core::l10n("Nouvelle installation. Supprime les données de la base si elles esistent " ).
- ' '.osc_draw_hidden_field('upgrade', '','install') .
- ' <input type="submit" class="submitBt" name="up_bouton_'.$version['name'].'" value="'.core::l10n("Installer" ).'" />';
- echo "</p>\n".'</form>'."\n";
- }
- echo '<hr />';
+ echo '<hr />';
- echo '<form id="install" action="?etape='.$this->get_current_etape(1).'" method="post">'."\n";
- $this->repet_post();
- if(isset($_POST['upgrade'])) echo osc_draw_hidden_field('up_upgrade['.$_POST['upgrade'].']', '', $version['name']);
- echo $this->draw_button();
- echo '</form>'."\n";
+ echo '<form id="install" action="?etape='.$this->get_current_etape(1).'" method="post">'."\n";
+ $this->repet_post();
+ if(isset($_POST['upgrade'])) {
+ echo osc_draw_hidden_field('up_upgrade['.$_POST['upgrade'].']', '', $version['name']);
+ echo $this->draw_button(true, false);
+ }
+ else
+ echo $this->draw_button(false, true);
+
+ echo '</form>'."\n";
}
+
/**
-
*/
function draw(){
// conf
$this->get_server_conf();
- // exe install db oscss
-// if(!isset($_POST['db_exists']) || !(bool)$_POST['db_exists']) $this->install_base_db();
-
// upgrade
if(isset($_POST['upgrade']) && tep_not_null($_POST['upgrade']) ){
if($_POST['upgrade'] =='install')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
