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...> - 2016-03-22 11:59:50
|
Revision: 5304
http://sourceforge.net/p/oscss/svn/5304
Author: oscim
Date: 2016-03-22 11:59:43 +0000 (Tue, 22 Mar 2016)
Log Message:
-----------
Fix htacess incomplet for featured in full page
Modified Paths:
--------------
trunk/catalog/install/includes/modele/htaccess.txt
Modified: trunk/catalog/install/includes/modele/htaccess.txt
===================================================================
--- trunk/catalog/install/includes/modele/htaccess.txt 2016-03-22 11:57:42 UTC (rev 5303)
+++ trunk/catalog/install/includes/modele/htaccess.txt 2016-03-22 11:59:43 UTC (rev 5304)
@@ -177,6 +177,10 @@
RewriteRule ^([a-z]{2,3}_[A-Z]{2,3})/c/([0-9_]*)/(.*).html$ index.php?cPath=$2&%{QUERY_STRING} [L]
RewriteRule ^c/([0-9_]*)/(.*).html$ index.php?cPath=$1&%{QUERY_STRING} [L]
+## Datatype - Data_featured
+RewriteRule ^([a-z]{2,3}_[A-Z]{2,3})/f/([0-9]*)/(.*).html$ index.php?featured=$2&%{QUERY_STRING} [L]
+RewriteRule ^f/([0-9]*)/(.*).html$ index.php?featured=$1&%{QUERY_STRING} [L]
+RewriteRule ^featured/([0-9]*)$ restfulapi.php?featured=$1&%{QUERY_STRING} [L]
## Datatype - Data_manufacturer
RewriteRule ^([a-z]{2,3}_[A-Z]{2,3})/m/([0-9]*)/(.*).html$ index.php?manufacturers_id=$2&%{QUERY_STRING} [L]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2016-03-22 11:57:44
|
Revision: 5303
http://sourceforge.net/p/oscss/svn/5303
Author: oscim
Date: 2016-03-22 11:57:42 +0000 (Tue, 22 Mar 2016)
Log Message:
-----------
Fix erreur in load page featured
Fix error in save featured for create new item
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/drivers/sqlfeatured.php
trunk/catalog/admin/includes/modules/pages/featureds.php
trunk/catalog/common/classes/datatype_drivers/Data_categorie.php
trunk/catalog/common/classes/datatype_drivers/Data_featured.php
trunk/catalog/templates/defaut/includes/content/index_listing.php
Modified: trunk/catalog/admin/includes/classes/drivers/sqlfeatured.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlfeatured.php 2016-03-22 09:58:30 UTC (rev 5302)
+++ trunk/catalog/admin/includes/classes/drivers/sqlfeatured.php 2016-03-22 11:57:42 UTC (rev 5303)
@@ -74,7 +74,7 @@
// language table
if( $error <= 0){
- if(count($sql_data_array_lg['lg']) > 0)
+ if(count($sql_data_array_lg['lg']) > 0){
foreach($sql_data_array_lg['lg'] as $key=>$sql_data_array){
$sql_data_array['featured_id'] = $id;
$sql_data_array['languages_id'] = $key;
@@ -91,15 +91,15 @@
$sql_data_array = array(
'featured_title' => '',
'featured_id' => $id,
- 'language_id' => $language_id
+ 'languages_id' => $language_id
);
-
$res=tep_db_perform(TABLE_FEATURED_DESCRIPTION, $sql_data_array);
if(!$res)
$error++;
}
}
-
+ }
+
if( $error > 0){
$DB->rollbackTransaction();
return false;
@@ -220,7 +220,7 @@
$res=$DB->query($sql);
$num = $res->__get('numRows');
-
+// var_dump($num);
if($num >= 1){
$array=array();
global $languages_id;
@@ -246,9 +246,10 @@
return ((!$shortkey)? $array[0] : self::CleanKey($array[0])) ;
}
elseif($num > 1){
+ $arr= $array;
$array=array();
- foreach($array as $lg)
+ foreach($arr as $lg)
$array[]= ((!$shortkey)? $lg : self::CleanKey($lg));
return $array;
Modified: trunk/catalog/admin/includes/modules/pages/featureds.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/featureds.php 2016-03-22 09:58:30 UTC (rev 5302)
+++ trunk/catalog/admin/includes/modules/pages/featureds.php 2016-03-22 11:57:42 UTC (rev 5303)
@@ -13,7 +13,7 @@
require_once(DIR_FS_ADMIN . DIR_WS_CLASSES .'ModTreePage.php');
-
+require_once(DIR_FS_ADMIN . DIR_WS_CLASSES .'listeners/EventMessListener.php');
/**
@class featureds
*/
@@ -36,7 +36,7 @@
, RightToFilter
// Events Interface for display and exec all notification
-// , EventMessInterface
+ , EventMessInterface
// Event propagation Action
// , EventTriggersCacheInterface
@@ -115,6 +115,7 @@
'input_size'=>'64',
'required_status'=>true,
'active_value_language'=>true,
+ 'position_col'=>'left',
),
),
@@ -140,6 +141,17 @@
'width'=>'10%',
'class'=>'tcenter',
'default'=>true,
+ 'edit'=>array(
+ 'input_name'=>'status_name',
+ 'input_type'=>'radio',
+ 'required_status'=>true,
+ 'values_list'=>array(
+ array('id'=>0, 'text'=>__('@featured text status off') ),
+ array('id'=>1, 'text'=>__('@featured text status on') ),
+ ),
+ 'position_col'=>'right',
+ 'position_grp'=>5
+ ),
),
'c.featured_min' => array(
@@ -281,14 +293,20 @@
if (self::$Id > 0){
$myarray = array('id'=>self::$Id ,'sqlarray'=>array('featured_status'=>$_GET['flag'] ) );
- sqlfeatured::update($myarray);
+ $r = sqlfeatured::update($myarray);
+
+ if($r){
+ self::PutMessage(
+ new EventMessListener(__('update status', __CLASS__) , 'success')
+ );
+
+ if(!isset($_GET['forceajax']))
+ tep_redirect(tep_href_link(self::FILENAME, 'cID=' . self::$Id));
+ else
+ return true;
+ }
}
}
-
- $messageStack->add(__('@featureds update status'), 'success');
-
- if(!isset($_GET['forceajax']))
- tep_redirect(tep_href_link(self::FILENAME, 'cID=' . self::$Id));
break;
@@ -445,14 +463,16 @@
while ($item = $_query->fetchAssoc()) {
$ord = array();
- $item[0]=$item['id'];
- $item[1]=tep_draw_checkbox_field('action_multi['.$item['id'].']','action_mutli_'.$item['id'],$item['id']);
+
foreach(self::$InitInfo['modele']['listing'] as $k=>$row)
if( ($value = self::FormatDBValueRow($k, $item)) && $value !=false )
$ord[$k]= $value;
else $ord[$k]=$item[$k];
+ $ord[0]=$item['id'];
+ $ord[1]=tep_draw_checkbox_field('action_multi['.$item['id'].']','action_mutli_'.$item['id'],$item['id']);
+
$res[]=$ord;
}
break;
Modified: trunk/catalog/common/classes/datatype_drivers/Data_categorie.php
===================================================================
--- trunk/catalog/common/classes/datatype_drivers/Data_categorie.php 2016-03-22 09:58:30 UTC (rev 5302)
+++ trunk/catalog/common/classes/datatype_drivers/Data_categorie.php 2016-03-22 11:57:42 UTC (rev 5303)
@@ -467,7 +467,6 @@
// put dynamical sort for childs curent datatype for this cat
// if(isset($categories->sortchids_datatype) && tep_not_null($categories->sortchids_datatype))
// $this->listing_query_sort = $categories->sortchids_datatype;
-// print_r($listing);
$listing->QueryAddWhere( " AND ".$this->p."2c.categories_id = '" . (int)$categories->id . "'");
}
Modified: trunk/catalog/common/classes/datatype_drivers/Data_featured.php
===================================================================
--- trunk/catalog/common/classes/datatype_drivers/Data_featured.php 2016-03-22 09:58:30 UTC (rev 5302)
+++ trunk/catalog/common/classes/datatype_drivers/Data_featured.php 2016-03-22 11:57:42 UTC (rev 5303)
@@ -253,8 +253,8 @@
- $page->add_var_page('RootListing',$obj);
- $page->add_var_page('current_id',(int)$_GET['featured']);
+// $page->SetVar('RootListing',$obj);
+// $page->SetVar('current_id',(int)$_GET['featured']);
$breadcrumb=$page->return_object('breadcrumb');
@@ -274,14 +274,14 @@
$obj->href = $featured->title ;
$obj->description = false;
- $page->add_var_page('RootListing',$obj);
- $page->add_var_page('current_id',(int)$_GET['featured']);
- $page->add_var_page('current_type',(string)'featured');
+ $page->SetVar('RootListing',$obj);
+ $page->SetVar('current_id',(int)$_GET['featured']);
+ $page->SetVar('current_type',(string)'featured');
+ $page->SetVar('current_object', $featured);
-
-
$listing->QueryAddWhere( " AND ".$this->p."data.datatype_parent_id = '".$_GET['featured']."' ");
+
return true;
}
}
Modified: trunk/catalog/templates/defaut/includes/content/index_listing.php
===================================================================
--- trunk/catalog/templates/defaut/includes/content/index_listing.php 2016-03-22 09:58:30 UTC (rev 5302)
+++ trunk/catalog/templates/defaut/includes/content/index_listing.php 2016-03-22 11:57:42 UTC (rev 5303)
@@ -24,6 +24,7 @@
*/
$RootListing=$page->GetVar('RootListing');
+
/**
@remarks Pre-load module no-type
*/
@@ -38,16 +39,16 @@
The key of extra is 'listing'
value of extra is name of module in /modules/xxx.php
*/
-// $objectCatt=$page->GetVar('current_object');
+ $objectCuurent=$page->GetVar('current_object');
$gab = '';
- if(is_object($objectCatt)){
+ if(is_object($objectCuurent)){
$gab = 'listing';
// extract extra fileds 'listing' for choose specific listing module
- foreach($objectCatt->GetExtra() as $key=>$rows )
+ foreach($objectCuurent->GetExtra() as $key=>$rows )
if($rows->epf_key == 'listing')
$gab = str_replace(array(','), array(''), $rows->input_value );
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2016-03-22 09:58:32
|
Revision: 5302
http://sourceforge.net/p/oscss/svn/5302
Author: oscim
Date: 2016-03-22 09:58:30 +0000 (Tue, 22 Mar 2016)
Log Message:
-----------
Fix item in configuration template for activate module
Modified Paths:
--------------
trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/cfg/configuration.php
Modified: trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/cfg/configuration.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/cfg/configuration.php 2016-03-22 09:58:00 UTC (rev 5301)
+++ trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/cfg/configuration.php 2016-03-22 09:58:30 UTC (rev 5302)
@@ -48,6 +48,7 @@
ResetConfigKey('MODULE_CONTENT_INSTALLED_BO');
+
addConfigModule('MODULE_ACAPRO_INSTALLED', 'desc_base.php');
addConfigModule('MODULE_ACAPRO_INSTALLED_BO', 'desc_base.php');
@@ -55,6 +56,13 @@
addConfigModule('MODULE_ACACAT_INSTALLED_BO', 'header_tags.php');
addConfigModule('MODULE_CONTENT_INSTALLED_BO', 'header_tags.php');
+addConfigModule('MODULE_ACCOUNT_INSTALLED', 'history.php');
+addConfigModule('MODULE_ACCOUNT_INSTALLED_BO', 'history.php');
+
+addConfigModule('MODULE_ACCOUNT_INSTALLED', 'address_book.php');
+addConfigModule('MODULE_ACCOUNT_INSTALLED_BO', 'address_book.php');
+
+
//install plugin for template
addConfigModule('PLUGIN_PRODUCT_INSTALLED', 'lightbox.php');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2016-03-22 09:58:02
|
Revision: 5301
http://sourceforge.net/p/oscss/svn/5301
Author: oscim
Date: 2016-03-22 09:58:00 +0000 (Tue, 22 Mar 2016)
Log Message:
-----------
Fix item for languages in template FO
add box for correct display and links in template
adjust box
Fix error in tva in sql
Modified Paths:
--------------
trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/footer.php
trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/ssheader.php
trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/cfg/init.php
trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/languages/fr_FR.txt
trunk/catalog/install/includes/sql/mysql/data/91_osc_tax_rates.sql
Added Paths:
-----------
trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/boxes/myaccount2.php
trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/gabarit/box.generic2.gab
Modified: trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/footer.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/footer.php 2016-03-22 08:15:47 UTC (rev 5300)
+++ trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/footer.php 2016-03-22 09:58:00 UTC (rev 5301)
@@ -3,13 +3,13 @@
@licence GPL 2005-2014 The osCSS developers - osCSS Open Source E-commerce
@subpackage Template Modern Responsive web design
@package osCSS-2 <www http://www.oscss.org>
- @author NP <mail n....@op...> <www http://www.oscss.biz>
+ @author NP <mail no...@os...> <www http://www.oscss-shop.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.
+ @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 sa licence.
+ Si vous supprimer la référence à osCSS, la commuanté se reserve le droit de faire valoir ces droits aupres des organismes dediés à la protection de cette licence.
- CE template est livré gratuitement pour donner un aperçu des disponibilités du moteur de templates.
+ Ce template est livré gratuitement pour donner un aperçu des possibilité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
*/
@@ -34,18 +34,18 @@
<div class="col-sm-3">
<h3><span class="sprite-contact rotator"></span><?= __('Nous contacter footer') ?></h3>
<address class="vcard">
- <h4 class="name">Open Commerce</h4>
+ <h4 class="name">osCSS-Shop</h4>
<div>
<i class="sprite-address"></i>
- <a class="adr" target="_blank" href="https://www.google.fr/maps/place/34+avenue+de+l%27Europe,+38100+Grenoble">
- <span class="street-address">34 avenue de l'europe</span>
- <span class="postal-code">38100</span><br />
- <span class="locality">Grenoble</span>,
+ <a class="adr" target="_blank" href="https://www.google.fr/maps/place/5 impasse de la cerisaie,+28240+La Loupe">
+ <span class="street-address">5 Impasse de la cerisaie</span>
+ <span class="postal-code">28240</span><br />
+ <span class="locality">La Loupe</span>,
<span class="country-name">France</span>
</a>
</div>
- <div class="tel"><i class="sprite-tel"></i><a href="tel:+33633323234">+33 (0)6 33 32 32 34</a></div>
- <div class="email"><i class="sprite-email"></i><a href="mailto:co...@op...">co...@op...</a></div>
+ <div class="tel"><i class="sprite-tel"></i><a href="tel:+33458005391">+33 (0)4 58 00 53 91</a></div>
+ <div class="email"><i class="sprite-email"></i><a href="mailto:su...@os...">su...@os...</a></div>
</address>
</div>
<div class="col-sm-3">
@@ -64,10 +64,8 @@
<div class="col-sm-3">
<h3><span class="sprite-info rotator"></span>Informations</h3>
<div class="footer_box">
- <p><a href="<?php echo tep_href_link(FILENAME_TEMPLATE) ?>"><?php echo __('about') ?></a></p>
- <p><a href="/">Informations de livraison</a></p>
- <p><a href="/">Vie privée</a></p>
- <p><a href="/">Conditions générales</a></p>
+ <?php $boxe =$page->oscss_boxes->_return('information');
+ echo unhtmlentities($boxe->content) ?>
</div>
</div>
<div class="col-sm-3">
@@ -91,10 +89,11 @@
<div class="col-sm-3">
<h3><span class="sprite-account rotator"></span>Mon compte</h3>
<div class="footer_box">
- <p><a href="/">Espace utilisateur</a></p>
- <p><a href="/">Historique des commandes</a></p>
+<!--
<p><a href="/">Liste de voeux</a></p>
- <p><a href="/">Newsletter</a></p>
+ -->
+ <?php $boxe =$page->oscss_boxes->_return('myaccount2');
+ echo unhtmlentities($boxe->content) ?>
</div>
</div>
</div>
@@ -102,7 +101,7 @@
<div><i class="sprite-row"></i></div>
<div class="container bas">
<p class="text-center"><i class="sprite-cb"></i></p>
- <p class="text-muted text-center">~ Design <a target="_blank" href="http://www.oscss.biz"><b>OpenCommerce</b></a> - ©<?php echo date('Y') ?>
+ <p class="text-muted text-center">~ Design <a target="_blank" href="http://www.oscss.biz"><b>osCSS-Shop</b></a> - ©<?php echo date('Y') ?>
~ Based on <a target="_blank" href="https://twitter.com/twbootstrap" class="twitter-follow-button" data-link-color="#0069D6" data-show-count="true"><b>@twbootstrap</b></a>
~ Propulsé par <a target="_blank" href="http://www.oscss.org/" title=" osCSS "><b>osCSS-2</b></a> ~</p>
</div>
Modified: trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/ssheader.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/ssheader.php 2016-03-22 08:15:47 UTC (rev 5300)
+++ trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/ssheader.php 2016-03-22 09:58:00 UTC (rev 5301)
@@ -25,20 +25,29 @@
<div id="navbar-collapse1" class="navbar-collapse collapse">
<ul class="nav navbar-nav navbar-left">
<li class="divider"></li>
- <li><a href="<?= tep_href_link(FILENAME_LOGIN, '', 'SSL') ?>" class="btn btn-warning"><?= __('link text login') ?></a></li>
- <li class="divider"></li>
- <li><a href="<?= tep_href_link(FILENAME_CREATE_ACCOUNT, '', 'SSL') ?>" class="btn btn-warning"><?= __('link text create account') ?></a></li>
+ <?php if(tep_session_register('customer_id') && $customer_id > 0) : ?>
+ <li><a href="<?= tep_href_link(FILENAME_LOGOFF, '', 'SSL') ?>" class="btn btn-warning"><?= __('link text logoff') ?></a></li>
+ <li class="divider"></li>
+ <li><a href="<?= tep_href_link(FILENAME_ACCOUNT, '', 'SSL') ?>" class="btn btn-warning"><?= __('my account page') ?></a></li>
+ <?php else : ?>
+ <li><a href="<?= tep_href_link(FILENAME_LOGIN, '', 'SSL') ?>" class="btn btn-warning"><?= __('link text login') ?></a></li>
+ <li class="divider"></li>
+ <li><a href="<?= tep_href_link(FILENAME_CREATE_ACCOUNT, '', 'SSL') ?>" class="btn btn-warning"><?= __('link text create account') ?></a></li>
+ <?php endif; ?>
</ul>
<ul class="nav navbar-nav navbar-right">
- <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">Réglages de langue<span class="caret "></span></a>
+ <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown"><?= __('languages') ?><span class="caret "></span></a>
<ul class="dropdown-menu" role="menu">
- <?php $boxe =$page->oscss_boxes->_return('currencies');
- echo unhtmlentities($boxe->content) ?>
- <li class="divider"></li>
<?php $boxe =$page->oscss_boxes->_return('languages');
echo unhtmlentities($boxe->content) ?>
</ul>
</li>
+ <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown"><?= __('devises') ?><span class="caret "></span></a>
+ <ul class="dropdown-menu" role="menu">
+ <?php $boxe =$page->oscss_boxes->_return('currencies');
+ echo unhtmlentities($boxe->content) ?>
+ </ul>
+ </li>
<li class="divider"></li>
<li class="dropdown">
<?php $boxe =$page->oscss_boxes->_return('view_min_cart'); ?>
@@ -66,14 +75,19 @@
</div>
<div id="navbar-collapse2" class="navbar-collapse collapse">
<ul class="nav navbar-nav navbar-left">
- <li><a href=""><?php echo __('') ?>Catégories</a><?php // echo in_menu_cat('ParentGroupString=ul&catID=0&max_level=3&datatype=product'); ?></li>
+ <li class="dropdown">
+ <a href="#"><?php echo __('link category') ?></a>
+ <ul class="dropdown-menu" role="menu">
+ <?php echo in_menu_cat('ParentGroupString=ul&catID=0&max_level=3&datatype=product'); ?>
+ </ul>
+ </li>
<li><a href="<?php echo tep_href_link(FILENAME_PRODUCTS_NEW) ?>" ><?php echo __('link product new') ?></a></li>
<li><a href="<?php echo tep_href_link(FILENAME_BEST_SELLERS) ?>" ><?php echo __('link best sellers') ?></a></li>
<li><a href="<?php echo tep_href_link(FILENAME_SMALL_PRICE) ?>" ><?php echo __('link small price') ?></a></li>
<?php if(tep_cst_define('MODULE_ACA_SPECIALS_SORT_ORDER') !='false') : ?>
<li><?php echo '<a href="' . tep_href_link(FILENAME_SPECIALS) . '">' . __('link specials') . '</a>'; ?></li>
<?php endif; ?>
- <li><a href="#"><?php echo __('') ?>Blog</a></li>
+ <li><a href="#"><?php echo __('') ?>Blog</a></li>
</ul>
<?php echo tep_draw_form('advanced_search', tep_href_link(FILENAME_ADVANCED_SEARCH, '', 'NONSSL', false), 'get', 'class="navbar-form navbar-right input-group"') ;?>
<?php echo tep_draw_input_field('keywords','keywords','', 'class="form-control" placeholder="'.__('entry keywords').'"',false,"search"); ?>
Modified: trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/cfg/init.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/cfg/init.php 2016-03-22 08:15:47 UTC (rev 5300)
+++ trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/cfg/init.php 2016-03-22 09:58:00 UTC (rev 5301)
@@ -110,6 +110,7 @@
$this->oscss_boxes->_add('languages', 'headertop');
+
/** Boite de recherche */
$this->oscss_boxes->_addWidget('Widget_search_suggest', 'headertop');
@@ -121,6 +122,9 @@
$this->oscss_boxes->_add('shopping_cart_short', 'header' ,array('cache'=>false));
+ $this->oscss_boxes->_add('information', 'footer');
+ $this->oscss_boxes->_add('myaccount2', 'footer');
+
/**
@var mode used in template.php for adjust affichage
mixed type and other control for determine mode
Added: trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/boxes/myaccount2.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/boxes/myaccount2.php (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/boxes/myaccount2.php 2016-03-22 09:58:00 UTC (rev 5301)
@@ -0,0 +1,66 @@
+<?php
+/**
+ *\licence GPL 2005-2013 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.2
+ *\date 04/10/2013, 08:18
+ *\author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ *\encode UTF-8
+ *\group boxes
+
+*/
+require_once(DIR_FS_CATALOG . DIR_WS_CLASSES . 'drivers/BoxesListenerRow.php');
+/**
+ @remarks Process Specific Boxes
+*/
+
+global $language,$customer_id,$account, $page ;
+global $list, $type;
+ $type = 'link';
+ $max = 20;
+ $list = array();
+
+
+
+ $objectBoxes = new BoxesListenerRow(
+ __('my account page'),
+ __('my account page'),
+ tep_href_link(FILENAME_ACCOUNT, '', 'SSL')
+ );
+
+ $list[] = $objectBoxes;
+
+ if(tep_session_register('customer_id') && $customer_id > 0) {
+ $ModuleAccount = account::getInstance();
+ foreach($ModuleAccount->CstrMenu() as $k=>$aca_mod) :
+// <!-- dynamic myaccount menu -->
+ if($aca_mod->pile =='myaccount') :
+ foreach($aca_mod->conteneur as $row) :
+ $objectBoxes = new BoxesListenerRow(
+ unhtmlentities($row->title),
+ unhtmlentities($row->title),
+ $row->href
+ );
+
+ $list[] = $objectBoxes;
+ endforeach;
+ endif;
+ endforeach;
+
+
+ }
+
+/**
+ @remarks Transmit var array for master construtor boxes
+*/
+
+ $title='<a href="'.tep_href_link(FILENAME_ACCOUNT).'">'.__('box heading my account').'</a>';
+
+ $array= array(
+ 'title'=> tep_output_string_protected($title,false,true),
+ 'content'=>tep_output_string_protected(tep_get_include_contents('box.generic2'),false,true),
+ 'class'=> $type,
+ );
+
+?>
\ No newline at end of file
Added: trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/gabarit/box.generic2.gab
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/gabarit/box.generic2.gab (rev 0)
+++ trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/gabarit/box.generic2.gab 2016-03-22 09:58:00 UTC (rev 5301)
@@ -0,0 +1,36 @@
+<?php
+/**
+ @licence GPL 2005-2014 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.2.0
+ @date 05/10/2013, 14:32
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+global $list, $type;
+
+?>
+
+<!-- <ul class="list-group inner-boxe <?php if(count($list)<=1) echo 'list unique' ?>"> -->
+ <?php foreach($list as $row) : ?>
+ <p>
+ <span class="title <?php echo $type ?>">
+ <a href="<?php echo $row->GetHref() ?>"><?php echo $row->GetTitle() ?></a>
+ </span>
+ <?php if(count($list) <=2 && $row->GetImage() !='' ) : ?>
+ <span class="img <?php echo $type ?>">
+ <a href="<?php echo $row->GetHref() ?>">
+ <?php echo tep_image(DIR_WS_IMAGES . $row->GetImage(), '', $page->_conf_value('SIDEBAR_IMG_WIDTH'), $page->_conf_value('SIDEBAR_IMG_HEIGHT'), ' class="img-responsive"') ?>
+ </a>
+ </span>
+ <?php endif; ?>
+ <?php if( get_class($row) =='DataListenerRowProduct' && $row->GetPrice() !=false && count($list)<=1) : ?>
+ <span class="price <?php echo $type ?>">
+ <?php echo print_products_price_rv($row); ?>
+ </span>
+ <?php endif; ?>
+ </p>
+ <?php endforeach; ?>
+<!-- </ul> -->
Modified: trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/languages/fr_FR.txt
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/languages/fr_FR.txt 2016-03-22 08:15:47 UTC (rev 5300)
+++ trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/includes/languages/fr_FR.txt 2016-03-22 09:58:00 UTC (rev 5301)
@@ -16,12 +16,14 @@
$lang['Nous contacter footer'] = "Nous contacter :";
$lang['Nous suivre footer'] = "Nous suivre :";
$lang['Forum footer'] = "Forum";
+ $lang['languages'] = "Réglages de langue";
+ $lang['devises'] = "Réglages de la devise";
+ $lang['link text login'] = "Connexion";
+ $lang['my account page'] = "Espace utilisateur";
+ $lang['link category'] = "Catégories";
$lang[''] = "";
$lang[''] = "";
$lang[''] = "";
$lang[''] = "";
- $lang[''] = "";
- $lang[''] = "";
- $lang[''] = "";
- $lang[''] = "";
- $lang[''] = "";
\ No newline at end of file
+
+?>
\ No newline at end of file
Modified: trunk/catalog/install/includes/sql/mysql/data/91_osc_tax_rates.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/data/91_osc_tax_rates.sql 2016-03-22 08:15:47 UTC (rev 5300)
+++ trunk/catalog/install/includes/sql/mysql/data/91_osc_tax_rates.sql 2016-03-22 09:58:00 UTC (rev 5301)
@@ -11,7 +11,7 @@
--| http://www.oscss.org/ |
--+######################################################################--+
insert into osc_tax_rates (tax_rates_id, tax_zone_id, tax_class_id, tax_priority, tax_rate, tax_description, last_modified, date_added) values ('1', '2', '1', '0', '7.0000', 'FL TAX 7.0%', NULL, NOW());
-insert into osc_tax_rates (tax_rates_id, tax_zone_id, tax_class_id, tax_priority, tax_rate, tax_description, last_modified, date_added) values ('2', '1', '2', '1', '19.6000', 'TVA normal', NULL, NOW());
+insert into osc_tax_rates (tax_rates_id, tax_zone_id, tax_class_id, tax_priority, tax_rate, tax_description, last_modified, date_added) values ('2', '1', '2', '1', '20.0000', 'TVA 20%', NULL, NOW());
insert into osc_tax_rates (tax_rates_id, tax_zone_id, tax_class_id, tax_priority, tax_rate, tax_description, last_modified, date_added) values ('3', '1', '3', '2', '7.0000', 'TVA 7%', NULL, NOW());
insert into osc_tax_rates (tax_rates_id, tax_zone_id, tax_class_id, tax_priority, tax_rate, tax_description, last_modified, date_added) values ('4', '1', '3', '2', '5.5000', 'TVA 5.5', NULL, NOW());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2016-03-22 08:15:50
|
Revision: 5300
http://sourceforge.net/p/oscss/svn/5300
Author: oscim
Date: 2016-03-22 08:15:47 +0000 (Tue, 22 Mar 2016)
Log Message:
-----------
Fix bug in customer page and manipulate in listing by ajax
Fix error in control process by update value for customers in sqlcustomer
Add control in update_cell method in master control for ModTreePage
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/ModTreePage.php
trunk/catalog/admin/includes/classes/drivers/sqlcustomer.php
trunk/catalog/admin/includes/modules/pages/customers.php
Modified: trunk/catalog/admin/includes/classes/ModTreePage.php
===================================================================
--- trunk/catalog/admin/includes/classes/ModTreePage.php 2016-03-21 13:15:09 UTC (rev 5299)
+++ trunk/catalog/admin/includes/classes/ModTreePage.php 2016-03-22 08:15:47 UTC (rev 5300)
@@ -132,7 +132,10 @@
*/
case 'update_cell':
try {
-
+
+ if( !isset($_REQUEST['id']) || (int)$_REQUEST['id']<= 0)
+ throw new Exception(__(' error param no found (id)', $class)) ;
+
$params['id'] = $_REQUEST['id'];
$params['sqlarray'] = $sqlclass::ExtractForm( $class::ExtractValByName($languages_id, $_REQUEST['columnName'], $_REQUEST['value']) );
$params['action']=self::$action;
Modified: trunk/catalog/admin/includes/classes/drivers/sqlcustomer.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlcustomer.php 2016-03-21 13:15:09 UTC (rev 5299)
+++ trunk/catalog/admin/includes/classes/drivers/sqlcustomer.php 2016-03-22 08:15:47 UTC (rev 5300)
@@ -149,10 +149,10 @@
if(isset($sqlarray['customers_discount']))$sql_data_array['customers_discount'] = $sqlarray['customers_discount'];
if(isset($sqlarray['customers_balance_account']))$sql_data_array['customers_balance_account'] = $sqlarray['customers_balance_account'];
- if (_cst_bool('ACCOUNT_GENDER'))
+ if (_cst_bool('ACCOUNT_GENDER') && isset($sqlarray['customers_gender']) )
$sql_data_array['customers_gender'] = $sqlarray['customers_gender'];
- if (_cst_bool('ACCOUNT_DOB'))
+ if (_cst_bool('ACCOUNT_DOB') && isset($sqlarray['customers_dob']) )
$sql_data_array['customers_dob'] = tep_date_raw($sqlarray['customers_dob']);
Modified: trunk/catalog/admin/includes/modules/pages/customers.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/customers.php 2016-03-21 13:15:09 UTC (rev 5299)
+++ trunk/catalog/admin/includes/modules/pages/customers.php 2016-03-22 08:15:47 UTC (rev 5300)
@@ -144,7 +144,7 @@
'width'=>'15%',
),
);
-
+ if (_cst_bool('ACCOUNT_GENDER') )
self::$allfields['c.customers_gender'] = array(
'sort'=>true,
'alias'=>'gender',
@@ -528,38 +528,33 @@
/**
@remarks specific ajax action
*/
-
+ case 'setflagda':
case 'setflag':
+ $col = ((self::$action == 'setflag') ? 'customers_status' : 'customers_group_ra' );
+
if ( ($_GET['flag'] == '0') || ($_GET['flag'] == '1') ) {
- $newsletter_id = tep_db_prepare_input($_GET['cID']);
+ $_id = tep_db_prepare_input($_GET['cID']);
- if (!empty($newsletter_id))
- $DB->query("update " . TABLE_CUSTOMERS . " set customers_status = '" .(int) $_GET['flag'] . "' where customers_id = '" . (int)$newsletter_id . "'");
- }
-
- $messageStack->add(__('@customers update status customers'), 'success');
-
- if(!isset($_GET['forceajax']))
- tep_redirect(tep_href_link(self::FILENAME, 'cID=' . $_GET['cID']));
-
+ if (!empty($_id)){
+ $r = $DB->query("update " . TABLE_CUSTOMERS . " set ".$col." = '" .(int) $_GET['flag'] . "' where customers_id = '" . (int)$_id . "'");
+
+
+ if($r){
+ self::PutMessage(
+ new EventMessListener(__('update confirm status customers', __CLASS__) , 'success')
+ );
+
+ if(!isset($_GET['forceajax']))
+ tep_redirect(tep_href_link(self::FILENAME, 'cID=' . $_id));
+ else
+ return true;
+ }
+ }
+ }
break;
- case 'setflagda':
- if ( ($_GET['flag'] == '0') || ($_GET['flag'] == '1') ) {
- $newsletter_id = tep_db_prepare_input($_GET['cID']);
- if (!empty($newsletter_id))
- $DB->query("update " . TABLE_CUSTOMERS . " set customers_group_ra = '" .(int) $_GET['flag'] . "' where customers_id = '" . (int)$newsletter_id . "'");
- }
- $messageStack->add(__('@customers update confirm status customers'), 'success');
-
- if(!isset($_GET['forceajax']))
- tep_redirect(tep_href_link(self::FILENAME, 'cID=' . $_GET['cID']));
-
- break;
-
-
case 'vcard':
$result=sqlcustomer::fetch(array('id'=> tep_db_prepare_input(self::$Id) ), true );
@@ -660,7 +655,7 @@
if (!emailUtility::tep_validate_email($testobj->customers_email_address))
throw new Exception(ENTRY_EMAIL_ADDRESS_CHECK_ERROR);
- if(self::$action =='insert' && self::$Id > 0 && ! sqlcustomer::userTestNotExists($testobj->customers_email_address) )
+ if(self::$Id > 0 && ! sqlcustomer::userTestNotExists($testobj->customers_email_address) )
throw new Exception(__('email address is already used') ) ;
if (strlen($testobj->customers_telephone) < ENTRY_TELEPHONE_MIN_LENGTH)throw new Exception(__("Le numero de téléphone est trop court"));
@@ -726,12 +721,16 @@
$messageStack->add_session(sprintf(__('error in process notification for %s'), STORE_OWNER .' '. STORE_OWNER_EMAIL_ADDRESS ), 'error');
}
- $messageStack->add(__('customers save success'), 'success');
+ self::PutMessage(
+ new EventMessListener(__('customers save success', __CLASS__) , 'success')
+ );
+
if(isset($_POST['up_and_close']) )
tep_redirect(tep_href_link(self::FILENAME));
else
tep_redirect(tep_href_link(self::FILENAME, 'cID=' .$_id.'&action=edit'));
+
}
else /*if (self::$error == true) */{
$_POST['customers_gender']='m';
@@ -741,7 +740,10 @@
else
$dest_form='update';
- $messageStack->add(__('error save in process'), 'error');
+
+ self::PutMessage(
+ new EventMessListener(__('error save in process', __CLASS__) , 'error')
+ );
}
break;
@@ -1041,14 +1043,11 @@
while ($item = $_query->fetchAssoc()) {
$ord =array();
-
- $item[0]=$item['id'];
- $item[1]=tep_draw_checkbox_field('action_multi['.$item['id'].']','action_mutli_'.$item['id'],$item['id']);
foreach(self::$InitInfo['modele']['listing'] as $k=>$row){
if( ($value = self::FormatDBValueRow($k, $item)) && $value !=false )
$ord[$k]= $value;
- elseif($k == 'entry_gender')
+ elseif($k == 'gender')
$ord[$k]=self::tep_view_gender_human($row);
elseif($k == 'group_ra')
$ord[$k]=self::GenericRowsFlag($item, 'group_ra', 'setflagda', 'row_etat');
@@ -1060,6 +1059,9 @@
$ord[$k]=$item[$k];
}
+ $ord[0]=$item['id'];
+ $ord[1]=tep_draw_checkbox_field('action_multi['.$item['id'].']','action_mutli_'.$item['id'],$item['id']);
+
$res[]=$ord;
}
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2016-03-21 13:15:11
|
Revision: 5299
http://sourceforge.net/p/oscss/svn/5299
Author: oscim
Date: 2016-03-21 13:15:09 +0000 (Mon, 21 Mar 2016)
Log Message:
-----------
Fix error in param for general lib
Fix error in template ModerRWD
Fix error in class CartPidFormat
Modified Paths:
--------------
trunk/catalog/common/classes/cart/CartPidFormat.class.php
trunk/catalog/includes/functions/general.php
trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/ssheader.php
Modified: trunk/catalog/common/classes/cart/CartPidFormat.class.php
===================================================================
--- trunk/catalog/common/classes/cart/CartPidFormat.class.php 2016-03-21 10:57:29 UTC (rev 5298)
+++ trunk/catalog/common/classes/cart/CartPidFormat.class.php 2016-03-21 13:15:09 UTC (rev 5299)
@@ -37,7 +37,7 @@
*/
public function __construct(){
$args = func_get_args();
- $list = $args[0];
+ $list = @$args[0];
$this->reset();
if ( count($list) > 0 ) {
Modified: trunk/catalog/includes/functions/general.php
===================================================================
--- trunk/catalog/includes/functions/general.php 2016-03-21 10:57:29 UTC (rev 5298)
+++ trunk/catalog/includes/functions/general.php 2016-03-21 13:15:09 UTC (rev 5299)
@@ -3,7 +3,7 @@
@licence GPL 2005-2013 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
+ @version 2.2.0
@date 14/09/11, 20:33
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@@ -457,7 +457,7 @@
/**
@brief Return a product ID with attributes
*/
-function tep_get_uprid($prid, $params, $parent=0) {
+function tep_get_uprid($prid, $params, $parent_id=0) {
$objPidFormat = new CartPidFormat(array($prid, $params, $parent_id));
return $objPidFormat->GetIdString();
}
Modified: trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/ssheader.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/ssheader.php 2016-03-21 10:57:29 UTC (rev 5298)
+++ trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/Childs_tpl/ssheader.php 2016-03-21 13:15:09 UTC (rev 5299)
@@ -41,8 +41,8 @@
</li>
<li class="divider"></li>
<li class="dropdown">
- <?= $boxe =$page->oscss_boxes->_return('view_min_cart'); ?>
- <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="sprite-basket rotator"></i><?= $boxe->total ?> € <span class="badge"><?= $boxe->items ?></span><span class="caret"></span></a>
+ <?php $boxe =$page->oscss_boxes->_return('view_min_cart'); ?>
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="sprite-basket rotator"></i><?= $boxe->total ?> € <span class="badge"><?= $boxe->items ?></span><span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
<li><?php echo unhtmlentities($boxe->content) ?></li>
@@ -76,7 +76,7 @@
<li><a href="#"><?php echo __('') ?>Blog</a></li>
</ul>
<?php echo tep_draw_form('advanced_search', tep_href_link(FILENAME_ADVANCED_SEARCH, '', 'NONSSL', false), 'get', 'class="navbar-form navbar-right input-group"') ;?>
- <?php echo tep_draw_input_field('keywords','keywords','', 'class="form-control" placeholder="'.ENTRY_KEYWORDS.'"',false,"search"); ?>
+ <?php echo tep_draw_input_field('keywords','keywords','', 'class="form-control" placeholder="'.__('entry keywords').'"',false,"search"); ?>
<span class="input-group-btn">
<input type="submit" class="btn btn-default" value="<?php echo __('') ?>Go" />
</span>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2016-03-21 10:57:31
|
Revision: 5298
http://sourceforge.net/p/oscss/svn/5298
Author: oscim
Date: 2016-03-21 10:57:29 +0000 (Mon, 21 Mar 2016)
Log Message:
-----------
Fix add ligne in tbl basket
Add item for test
Modified Paths:
--------------
trunk/catalog/install/includes/sql/mysql/tables/osc_customers_basket.sql
trunk/test/phpunit/Front/core/cart/ShoppingCartTest.php
Added Paths:
-----------
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.2_2.2.0/tables/osc_customers_basket.sql
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_customers_basket.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_customers_basket.sql 2016-03-21 10:14:35 UTC (rev 5297)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_customers_basket.sql 2016-03-21 10:57:29 UTC (rev 5298)
@@ -16,6 +16,8 @@
customers_basket_id int(11) not null auto_increment,
customers_id int(11) default '0' not null ,
products_id tinytext not null ,
+ parent_id int(11) default '0' not null ,
+ grp_line int(11) default '0' not null ,
customers_basket_quantity int(2) default '0' not null ,
final_price decimal(15,6) ,
customers_basket_date_added varchar(8) ,
Added: trunk/catalog/install/includes/sql/mysql/upgrade/2.1.2_2.2.0/tables/osc_customers_basket.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.1.2_2.2.0/tables/osc_customers_basket.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.2_2.2.0/tables/osc_customers_basket.sql 2016-03-21 10:57:29 UTC (rev 5298)
@@ -0,0 +1,16 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2012 The osCSS developers |
+--| |
+--| http://www.oscss.org |
+--| Portions Copyright (c) 2003 osCommerce |
+--+######################################################################--+
+--| This source file is subject to version 2.0 of the GPL license, |
+--| available at the following url: |
+--| http://www.oscss.org/ |
+--+######################################################################--+
+
+ALTER TABLE osc_customers_basket ADD parent_id INT NOT NULL DEFAULT '0' AFTER products_id ;
+ALTER TABLE osc_customers_basket ADD grp_line INT NOT NULL DEFAULT '0' AFTER parent_id ;
+
Modified: trunk/test/phpunit/Front/core/cart/ShoppingCartTest.php
===================================================================
--- trunk/test/phpunit/Front/core/cart/ShoppingCartTest.php 2016-03-21 10:14:35 UTC (rev 5297)
+++ trunk/test/phpunit/Front/core/cart/ShoppingCartTest.php 2016-03-21 10:57:29 UTC (rev 5298)
@@ -75,7 +75,7 @@
$cart->add_cart($pid, 1, array() );
- $this ->assertTrue ( ($cart->in_cart( $pid )>0 ) , 'ShoppingCart add_cart error ' ) ;
+ $this ->assertTrue ( ($cart->in_cart( $pid )>0 ) , 'ShoppingCart add_cart error ' ) ;
}
/**
@@ -105,7 +105,68 @@
$this ->assertTrue ( ($cart->get_quantity($pid ) == 2 ) , 'ShoppingCart get_quantity error ' ) ;
}
+
+ /**
+ * \brief
+ * @depends testShoppingCart_NotExist
+ */
+ public function testShoppingCartshow_list_total($cart){
+ self::InitUser();
+
+ $pid = 9;
+
+ $cart->add_cart($pid, 1, array() );
+
+ $list = $cart->show_list_total();
+
+ $this ->assertTrue ( ( is_array($list) ) , 'ShoppingCart show_list_total error , is not array ' ) ;
+
+ $this ->assertTrue ( ( count($list) > 0 ) , 'ShoppingCart show_list_total error , array is empty ' ) ;
+ }
+
+ /**
+ * \brief
+ * @depends testShoppingCart_NotExist
+ */
+// public function testShoppingCartget_product_id_list($cart){
+//
+// self::InitUser();
+//
+// $pid = 9;
+//
+// $cart->add_cart($pid, 1, array() );
+//
+// $list = $cart->get_product_id_list();
+//
+// $this ->assertTrue ( ( is_string($list) ) , 'ShoppingCart get_product_id_list error , is not string ' ) ;
+// }
+
+ /**
+ * \brief
+ * @depends testShoppingCart_NotExist
+ */
+ public function testShoppingCartGetTotal($cart){
+
+ self::InitUser();
+
+ $pid = 9;
+
+ $cart->add_cart($pid, 1, array() );
+
+
+
+
+ $this ->assertTrue ( ( $cart->GetTotal('price' ) > 0 ) , 'ShoppingCart testShoppingCartGetTotal error , price is null' ) ;
+
+ $this ->assertTrue ( ( $cart->GetTotal('total' ) > 0 ) , 'ShoppingCart testShoppingCartGetTotal error , total is null' ) ;
+
+ $this ->assertTrue ( ( $cart->GetTotal('item' ) > 0 ) , 'ShoppingCart testShoppingCartGetTotal error , item is null' ) ;
+
+ $this ->assertTrue ( ( $cart->GetTotal('weight' ) > 0 ) , 'ShoppingCart testShoppingCartGetTotal error , weight is null' ) ;
+ }
+
+
/**
@brief call user and init session
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2016-03-21 10:14:37
|
Revision: 5297
http://sourceforge.net/p/oscss/svn/5297
Author: oscim
Date: 2016-03-21 10:14:35 +0000 (Mon, 21 Mar 2016)
Log Message:
-----------
Fix update customers and control email
Modified Paths:
--------------
trunk/catalog/admin/includes/modules/pages/customers.php
Modified: trunk/catalog/admin/includes/modules/pages/customers.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/customers.php 2016-03-21 09:09:54 UTC (rev 5296)
+++ trunk/catalog/admin/includes/modules/pages/customers.php 2016-03-21 10:14:35 UTC (rev 5297)
@@ -635,7 +635,7 @@
return false;
$testobj = new objectInfo($array['sqlarray']);
-// var_dump();
+
try{
/*
* \brief test user is exists email address in db
@@ -660,7 +660,7 @@
if (!emailUtility::tep_validate_email($testobj->customers_email_address))
throw new Exception(ENTRY_EMAIL_ADDRESS_CHECK_ERROR);
- if(self::$Id > 0 && ! sqlcustomer::userTestNotExists($testobj->customers_email_address) )
+ if(self::$action =='insert' && self::$Id > 0 && ! sqlcustomer::userTestNotExists($testobj->customers_email_address) )
throw new Exception(__('email address is already used') ) ;
if (strlen($testobj->customers_telephone) < ENTRY_TELEPHONE_MIN_LENGTH)throw new Exception(__("Le numero de téléphone est trop court"));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2016-03-21 09:09:58
|
Revision: 5296
http://sourceforge.net/p/oscss/svn/5296
Author: oscim
Date: 2016-03-21 09:09:54 +0000 (Mon, 21 Mar 2016)
Log Message:
-----------
Fix
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/drivers/sqlproduct.php
Modified: trunk/catalog/admin/includes/classes/drivers/sqlproduct.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlproduct.php 2016-03-21 07:36:22 UTC (rev 5295)
+++ trunk/catalog/admin/includes/classes/drivers/sqlproduct.php 2016-03-21 09:09:54 UTC (rev 5296)
@@ -71,7 +71,7 @@
// /// Call ACA module put post var
// $modules->load_post_values($post);
// }
-// var_dump($post);
+
$dataarray = (array)(isset($option['sqlarray'])? $option['sqlarray'] : array() );
self::PrepaDataAfterUse( $specimen , $dataarray, $post );
@@ -81,19 +81,18 @@
-// $languages_id = (isset($option['language_id']) ? $option['language_id'] : $languages_id);
-// $type = (isset($option['type']))? $option['type'] : 1;
+ $languages_id = (isset($option['language_id']) ? $option['language_id'] : $languages_id);
+ $type = (isset($option['type']))? $option['type'] : 1;
+ $sql_data_array = array(
+ 'products_type' => $type,
+ 'products_quantity' => (isset($option['products_quantity'])? $option['products_quantity'] : 1),
+ 'products_price' => (isset($option['products_price'])? $option['products_price'] : 0),
+ 'products_date_added' => 'now()',
+ 'manufacturers_id' => '',
+ 'track_stock' => ( ($type == 1) ? 1 : 0 )
+ );
-// $sql_data_array = array(
-// 'products_type' => $type,
-// 'products_quantity' => (isset($option['products_quantity'])? $option['products_quantity'] : 1),
-// 'products_price' => (isset($option['products_price'])? $option['products_price'] : 0),
-// 'products_date_added' => 'now()',
-// 'manufacturers_id' => '',
-// 'track_stock' => ( ($type == 1) ? 1 : 0 )
-// );
-
if(count($sql_data_array) > 0 || count($sql_data_array_lg) ){
// print_r($sql_data_array);
if(isset($sql_data_array['products_tax_class_id']))
@@ -117,7 +116,8 @@
$resobj=tep_db_perform(TABLE_PRODUCTS, $sql_data_array);
-
+// var_dump(__line__, $resobj);
+// exit;
if(!$resobj){
$DB->rollbackTransaction();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2016-03-21 07:36:24
|
Revision: 5295
http://sourceforge.net/p/oscss/svn/5295
Author: oscim
Date: 2016-03-21 07:36:22 +0000 (Mon, 21 Mar 2016)
Log Message:
-----------
Fix
Added Paths:
-----------
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.2_2.2.0/tables/osc_orders.sql
Added: trunk/catalog/install/includes/sql/mysql/upgrade/2.1.2_2.2.0/tables/osc_orders.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/upgrade/2.1.2_2.2.0/tables/osc_orders.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/upgrade/2.1.2_2.2.0/tables/osc_orders.sql 2016-03-21 07:36:22 UTC (rev 5295)
@@ -0,0 +1,15 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2012 The osCSS developers |
+--| |
+--| http://www.oscss.org |
+--| Portions Copyright (c) 2003 osCommerce |
+--+######################################################################--+
+--| This source file is subject to version 2.0 of the GPL license, |
+--| available at the following url: |
+--| http://www.oscss.org/ |
+--+######################################################################--+
+
+ALTER TABLE osc_orders ADD parent_id INT NOT NULL DEFAULT '0' AFTER products_id ;
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2016-03-21 07:36:08
|
Revision: 5294
http://sourceforge.net/p/oscss/svn/5294
Author: oscim
Date: 2016-03-21 07:36:06 +0000 (Mon, 21 Mar 2016)
Log Message:
-----------
add sql item no found
Modified Paths:
--------------
trunk/catalog/install/includes/sql/mysql/tables/osc_orders_products.sql
Added Paths:
-----------
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.2_2.2.0/
trunk/catalog/install/includes/sql/mysql/upgrade/2.1.2_2.2.0/tables/
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_orders_products.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_orders_products.sql 2016-03-21 07:00:54 UTC (rev 5293)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_orders_products.sql 2016-03-21 07:36:06 UTC (rev 5294)
@@ -17,6 +17,7 @@
orders_products_id int(11) not null auto_increment,
orders_id int(11) default '0' not null ,
products_id int(11) default '0' not null ,
+ parent_id int(11) default '0' not null ,
products_type int(1) NOT NULL DEFAULT '1',
products_model varchar(12) ,
products_name varchar(64) not null ,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2016-03-21 07:00:56
|
Revision: 5293
http://sourceforge.net/p/oscss/svn/5293
Author: oscim
Date: 2016-03-21 07:00:54 +0000 (Mon, 21 Mar 2016)
Log Message:
-----------
Fix Error in install by cli
fix erreor in process install for configure public template
Modified Paths:
--------------
trunk/catalog/admin/includes/functions/lib.configuration.php
trunk/catalog/install/includes/content/core.configuration.php
trunk/catalog/install/includes/content/core.template_sample.php
trunk/dev/cli_install.php
trunk/dev/install/install.php
Modified: trunk/catalog/admin/includes/functions/lib.configuration.php
===================================================================
--- trunk/catalog/admin/includes/functions/lib.configuration.php 2016-02-26 05:55:49 UTC (rev 5292)
+++ trunk/catalog/admin/includes/functions/lib.configuration.php 2016-03-21 07:00:54 UTC (rev 5293)
@@ -410,6 +410,13 @@
$code_inistalletd_array['MODULE_HOME_INSTALLED']=DIR_FS_CATALOG.DIR_WS_MODULES.'home/';
$code_inistalletd_array['MODULE_HOME_INSTALLED_BO']=DIR_FS_ADMIN.DIR_WS_MODULES.'home/';
+
+ $code_inistalletd_array['PLUGIN_PRODUCT_INSTALLED']=DIR_FS_TEMPLATES.TEMPLATE_NAME.'/includes/plugins/product/';
+ $code_inistalletd_array['PLUGIN_ACCOUNT_INSTALLED']=DIR_FS_TEMPLATES.TEMPLATE_NAME.'/includes/plugins/account/';
+ $code_inistalletd_array['PLUGIN_GENERIC_INSTALLED']=DIR_FS_TEMPLATES.TEMPLATE_NAME.'/includes/plugins/generic/';
+ $code_inistalletd_array['PLUGIN_HOME_INSTALLED']=DIR_FS_TEMPLATES.TEMPLATE_NAME.'/includes/plugins/home/';
+ $code_inistalletd_array['PLUGIN_LISTING_INSTALLED']=DIR_FS_TEMPLATES.TEMPLATE_NAME.'/includes/plugins/listing/';
+
if(isset($code_inistalletd_array[$key])) return $code_inistalletd_array[$key];
return '';
}
@@ -454,8 +461,11 @@
@a string le nom du fichier avec extension
*/
function addConfigModule($key, $value_add){
- if(!file_exists(ConvertKeyDir($key).$value_add)) return false;
- AddConfigInKey($key, $value_add);
+ $path = ConvertKeyDir($key).$value_add;
+ if( file_exists($path) || file_exists(substr($path,0,-4)) ){
+ AddConfigInKey($key, $value_add);
+ }
+ return false;
}
/**
Modified: trunk/catalog/install/includes/content/core.configuration.php
===================================================================
--- trunk/catalog/install/includes/content/core.configuration.php 2016-02-26 05:55:49 UTC (rev 5292)
+++ trunk/catalog/install/includes/content/core.configuration.php 2016-03-21 07:00:54 UTC (rev 5293)
@@ -385,10 +385,12 @@
$this->get_fs_document_root();
$this->get_server_conf();
$this->get_db_conf();
- if (!defined('DB_TABLE_PREFIX'))
+
+
+ if (!defined('DB_TABLE_PREFIX') )
define('DB_TABLE_PREFIX', $this->db['DB_TABLE_PREFIX']);
if (!defined('DIR_WS_MODULES'))
- define('DIR_WS_MODULES', $this->fs_document_root . $this->ws_admin_rand . '/includes/modules/');
+ define('DIR_WS_MODULES', /*$this->fs_document_root . $this->ws_admin_rand .*/ '/includes/modules/');
// error_reporting(0);
include_once($this->fs_document_root . $this->ws_admin_rand . '/includes/database_tables.php');
@@ -430,9 +432,13 @@
*/
if ($this->GetConfig('email') === true) {
- $headers = 'From: webmaster@' . $this->cookie_domain . "\r\n" .
- 'Reply-To: webmaster@' . $this->cookie_domain . "\r\n" .
+
+ $headers = 'From: su...@os...' . "\r\n" .
+ 'Reply-To: su...@os...' . "\r\n" .
'X-Mailer: PHP/' . phpversion();
+// $headers = 'From: webmaster@' . $this->cookie_domain . "\r\n" .
+// 'Reply-To: webmaster@' . $this->cookie_domain . "\r\n" .
+// 'X-Mailer: PHP/' . phpversion();
if (file_exists('includes/language/fr_FR/email_install.html')) {
// headers for html
$headers .= "MIME-Version: 1.0\r\n";
@@ -441,9 +447,9 @@
$message = file_get_contents('includes/language/fr_FR/email_install.html');
// build list of key to replace
$parmeters = array();
+ $parmeters['PASSWORD'] = 'admin';
$parmeters['FO_URL'] = $_POST['HTTP_WWW_ADDRESS'];
- $parmeters['BO_URL'] = $_POST['HTTP_WWW_ADDRESS'] . $this->ws_admin_rand;
- $parmeters['PASSWORD'] = 'admin';
+ $parmeters['BO_URL'] = $_POST['HTTP_WWW_ADDRESS'] . $this->ws_admin_rand ."/login.php?action=process&email_address={$_POST['EMAIL_ADMIN']}&password={$parmeters['PASSWORD']}";
$message = $this->inject_data_from_array($message, $parmeters);
} else {
$message = core::l10n("Votre nouvelle boutique osCSS est maintenant installé. ") . "\n"
@@ -558,6 +564,8 @@
if (file_exists($this->fs_document_root . 'admin'))
rename($this->fs_document_root . 'admin', $this->fs_document_root . $this->ws_admin_rand);
+ if (!defined('DB_TABLE_PREFIX') )
+ define('DB_TABLE_PREFIX', $this->db['DB_TABLE_PREFIX']);
// if (!defined('TABLE_CONFIGURATION'))
// define('TABLE_CONFIGURATION', $this->db['DB_TABLE_PREFIX'] . 'configuration');
// if (!defined('TABLE_COUNTRIES'))
@@ -585,4 +593,4 @@
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/catalog/install/includes/content/core.template_sample.php
===================================================================
--- trunk/catalog/install/includes/content/core.template_sample.php 2016-02-26 05:55:49 UTC (rev 5292)
+++ trunk/catalog/install/includes/content/core.template_sample.php 2016-03-21 07:00:54 UTC (rev 5293)
@@ -44,7 +44,7 @@
if(!defined('DB_TABLE_PREFIX'))
define('DB_TABLE_PREFIX', $this->db['DB_TABLE_PREFIX']);
if(!defined('DIR_WS_MODULES'))
- define('DIR_WS_MODULES', $this->fs_document_root.$this->ws_admin_rand.'/includes/modules/');
+ define('DIR_WS_MODULES', /*$this->fs_document_root.$this->ws_admin_rand.*/'/includes/modules/');
// include($this->fs_document_root.$this->ws_admin_rand.'/includes/configure.php');
include_once($this->fs_document_root.$this->ws_admin_rand.'/includes/database_tables.php');
@@ -68,8 +68,10 @@
define('DIR_FS_CATALOG',$this->fs_document_root);
if(!defined('DIR_WS_IMAGES'))
define('DIR_WS_IMAGES',$this->fs_document_root.'images/');
- if(!defined('DIR_WS_TEMPLATE'))
+ if(!defined('DIR_WS_TEMPLATE')){
define('DIR_WS_TEMPLATE',$this->fs_document_root.'templates/');
+ define('DIR_FS_TEMPLATES',$this->fs_document_root.'templates/');
+ }
if(!defined('TEMPLATE_NAME'))
define('TEMPLATE_NAME',trim($get[1]));
@@ -115,12 +117,15 @@
// depend exe file configuration
include_once($this->fs_document_root.$this->ws_admin_rand.'/includes/functions/lib.configuration.php');
-
+// echo $this->fs_document_root.$this->ws_admin_rand.'/includes/functions/lib.configuration.php';
// exec fichier conf du template
$file_cfg=DIR_WS_TEMPLATE.TEMPLATE_NAME.'/'.'cfg/configuration.php';
- if(file_exists($file_cfg))
- require_once($file_cfg);
+
+// if(file_exists($file_cfg))
+ $e=include_once($file_cfg);
+ var_dump($file_cfg,$e);
+
$this->PileMessage('succes', core::l10n("L'installation et la configuration du template sont terminés" ) ) ;
}
Modified: trunk/dev/cli_install.php
===================================================================
--- trunk/dev/cli_install.php 2016-02-26 05:55:49 UTC (rev 5292)
+++ trunk/dev/cli_install.php 2016-03-21 07:00:54 UTC (rev 5293)
@@ -147,25 +147,25 @@
die('please use php cli.php -h '."\n");
- echo '.';
+// echo '.';
include($path_init.'/'.$cmd.'/'.$cmd.'.php');
- echo '.';
+// echo '.';
$class = 'cli'.$cmd;
$obj = new $class($path_base,$path,$path_install, $path_init);
- echo '.';
+// echo '.';
$obj->SetCmd($cmd);
- echo '.';
+// echo '.';
$obj->init($argv);
- echo '.';
+// echo '.';
$obj->check();
- echo '.';
+// echo '.';
$obj->preprocess();
- echo '.';
+// echo '.';
$obj->process();
- echo '.';
+// echo '.';
$obj->displayerror();
- echo '.';
+// echo '.';
-echo "\n";
+// echo "\n";
?>
\ No newline at end of file
Modified: trunk/dev/install/install.php
===================================================================
--- trunk/dev/install/install.php 2016-02-26 05:55:49 UTC (rev 5292)
+++ trunk/dev/install/install.php 2016-03-21 07:00:54 UTC (rev 5293)
@@ -100,7 +100,7 @@
@brief exec
*/
public function process(){
- echo 'process'."\n";
+// echo 'process'."\n";
@@ -162,6 +162,7 @@
// for db
$_POST['upgrade']= 'forceinstall'; // forceinstall / install/ update
+
// base
$_GET['etape']= $_POST['current_e'] =2;
@@ -192,7 +193,7 @@
// next step
// defined all params for simulate html form process
$_GET['etape']= $_POST['current_e'] =5;
- $_POST['TEMPLATE_SAMPLE']= 'appareil_photo___booststrap';
+ $_POST['TEMPLATE_SAMPLE']= 'appareil_photo___Modern_RWD';
$_POST['DB_INSERT_SAMPLE_DATA']= 'on'; // insert sample
//
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hom...@us...> - 2016-02-26 05:55:51
|
Revision: 5292
http://sourceforge.net/p/oscss/svn/5292
Author: homer8173
Date: 2016-02-26 05:55:49 +0000 (Fri, 26 Feb 2016)
Log Message:
-----------
IMPLEMANTED : login via url
add iframe in admin configure.php -> $conf['login']='iframe';
Access BO via URL -> /admin/login.php?action=process&ema...@do...&password=XXXXXXXX
Added Paths:
-----------
trunk/catalog/admin/includes/exts/login/iframe.php
Added: trunk/catalog/admin/includes/exts/login/iframe.php
===================================================================
--- trunk/catalog/admin/includes/exts/login/iframe.php (rev 0)
+++ trunk/catalog/admin/includes/exts/login/iframe.php 2016-02-26 05:55:49 UTC (rev 5292)
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ @licence GPL 2005-2013 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 20/05/2012, 17:28
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @file
+ @brief base functions and class fro login by methode
+
+ Cette fonction assure l'identification par la methode intégres a oscss.
+ */
+class iframe {
+
+ function __construct() {
+ // echo $_SERVER['HTTP_REFERER'];
+ }
+
+ /**
+ * \fn draw()
+ * \brief call NULL
+ */
+ public function draw() {
+
+ }
+
+ /**
+ * \fn check()
+ * \brief call check exe
+ */
+ public function check() {
+ return $this->check_exe();
+ }
+
+ /**
+ * \fn check()
+ * \brief test and retrun bool
+ * \return boolean
+ * @param $_GET['email_address'] string
+ * @param $_GET['password'] string
+ */
+ protected function check_exe() {
+ global $conf;
+ $DB = Database::getInstance();
+
+ $email_address = tep_db_prepare_input($_GET['email_address']);
+ $password = tep_db_prepare_input($_GET['password']);
+
+ // Check if email exists
+ $check_admin_query = $DB->query($sql = "select admin_id as login_id, admin_password as login_password from " . TABLE_ADMIN_USERS . " au LEFT JOIN " . TABLE_ADMIN_GROUPS . " ag ON (ag.admin_groups_id = au.admin_groups_id) where ag.admin_groups_status = 1 AND au.admin_status = 1 AND au.admin_email_address = '" . tep_db_input($email_address) . "'");
+
+ if (!$check_admin_query->__get('numRows')) {
+ return false;
+ } else {
+
+ $check_admin = $check_admin_query->fetchAssoc();
+ // Check that password is good
+ if (!PasswordUtility::validate_password($password, $check_admin['login_password']))
+ return false;
+ else {
+ login_ident::$lID = $check_admin['login_id'];
+
+ if (tep_session_is_registered('password_forgotten')) {
+ tep_session_unregister('password_forgotten');
+ }
+ return true;
+ }
+ }
+ return false;
+ }
+
+}
+
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hom...@us...> - 2016-02-26 05:49:25
|
Revision: 5291
http://sourceforge.net/p/oscss/svn/5291
Author: homer8173
Date: 2016-02-26 05:49:24 +0000 (Fri, 26 Feb 2016)
Log Message:
-----------
BUG : restfull API : Categories were not working
Modified Paths:
--------------
trunk/catalog/restfulapi.php
Modified: trunk/catalog/restfulapi.php
===================================================================
--- trunk/catalog/restfulapi.php 2016-01-27 08:56:21 UTC (rev 5290)
+++ trunk/catalog/restfulapi.php 2016-02-26 05:49:24 UTC (rev 5291)
@@ -1,108 +1,104 @@
<?php
+
/**
@licence GPL 2005-2014 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.2.0
@date 11/05/2012 ,15:04:13
- *\author oscim <mail aur...@os...> <www http://www.oscim.fr>
- *\encode UTF-8
- *\file restfulapi.php
- *\brief Page for RESTFUL API
-*/
- require('includes/application_top.php');
+ * \author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ * \encode UTF-8
+ * \file restfulapi.php
+ * \brief Page for RESTFUL API
+ */
+require('includes/application_top.php');
- $page->init(basename(__FILE__),$language);
-
-
-
- //! Choix du mode affichage des listign et priorité
- $page->add_var_page('category_depth','top');
+$page->init(basename(__FILE__), $language);
- /// call preload root listing for childs modules
- DataTypes::Preload('preload_root');
- $category_depth = $page->GetVar('category_depth');
+//! Choix du mode affichage des listign et priorité
+$page->add_var_page('category_depth', 'top');
+
+/// call preload root listing for childs modules
+DataTypes::Preload('preload_root');
+$category_depth = $page->GetVar('category_depth');
+
+
/**
@brief page unique sans heritages ou element externe (aca en pleine page)
-*/
- if( ($dyntype = DataTypes::is_type('error')) && $dyntype != false )
- $page_content = $dyntype->FO_load_page();
+ */
+if (($dyntype = DataTypes::is_type('error')) && $dyntype != false)
+ $page_content = $dyntype->FO_load_page();
- elseif ($category_depth == 'top') {
+elseif ($category_depth == 'top') {
- if( ($dyntype = DataTypes::is_type('unique')) && $dyntype != false && ($page_content = $dyntype->FO_load_page()) && $page_content !=false){
- header('Content-Type: application/json');
- $value=$page->GetVar('current_object');
- }
- else{
- header("Status: 404 Not Found");
- header("HTTP/1.0 301 Moved Permanently");
- }
+ if (($dyntype = DataTypes::is_type('unique')) && $dyntype != false && ($page_content = $dyntype->FO_load_page()) && $page_content != false) {
+ header('Content-Type: application/json');
+ $value = $page->GetVar('current_object');
+ } else {
+ header("Status: 404 Not Found");
+ header("HTTP/1.0 301 Moved Permanently");
+ }
- unset($category_cfils,$category_pfils,$category_parent);
- }
+ unset($category_cfils, $category_pfils, $category_parent);
+}
/**
@brief Modes Avec heritage des informations sur un parent (categorie, manufacturer, ...)
-*/
- else{
+ */ else {
- if( ($dyntype = DataTypes::is_type('unique')) && $dyntype != false && ($page_content = $dyntype->FO_load_page()) && $page_content !=false ) {
-
- header('Content-Type: application/json');
- $value=$page->GetVar('current_object');
- }
- /**
- @brief Unique Page 404 next check correct parent
- use /content/404.php
- */
- elseif ( $page->GetVar('category_depth') == 'nofound') {
- header("Status: 404 Not Found");
- header("HTTP/1.0 301 Moved Permanently");
- }
- elseif ( $page->GetVar('category_depth') == 'empty') {
- header("Status: 404 Not Found");
- header("HTTP/1.0 301 Moved Permanently");
- }
- elseif ( $page->GetVar('category_depth') == 'error') {
- header("Status: 500 technical error ");
- header("HTTP/1.0 301 Moved Permanently");
- }
- /**
- @brief Listing Page / Mutli prodycts / cms
- use /content/index_listing.php
- */
- elseif ( ($dyntype = DataTypes::is_type('listing')) && $dyntype != false ){
+ if (($dyntype = DataTypes::is_type('unique')) && $dyntype != false && ($page_content = $dyntype->FO_load_page()) && $page_content != false) {
- $page->init(basename(__FILE__),$language);
- $breadcrumb=$page->return_object('breadcrumb');
-
- $listing=listing::getInstance();
-
- // call master DataTypes listing and next childs modules
- $page_content = DataTypes::transversal('transversal' /*, $listing*/ );
+ header('Content-Type: application/json');
+ $value = $page->GetVar('current_object');
+ }
+ /**
+ @brief Unique Page 404 next check correct parent
+ use /content/404.php
+ */ elseif ($page->GetVar('category_depth') == 'nofound') {
+ header("Status: 404 Not Found");
+ header("HTTP/1.0 301 Moved Permanently");
+ } elseif ($page->GetVar('category_depth') == 'empty') {
+ header("Status: 404 Not Found");
+ header("HTTP/1.0 301 Moved Permanently");
+ } elseif ($page->GetVar('category_depth') == 'error') {
+ header("Status: 500 technical error ");
+ header("HTTP/1.0 301 Moved Permanently");
+ }
+ /**
+ @brief Listing Page / Mutli prodycts / cms
+ use /content/index_listing.php
+ */ elseif (($dyntype = DataTypes::is_type('listing')) && $dyntype != false) {
- $listing_split = $listing->listing($dyntype);
+ $page->init(basename(__FILE__), $language);
+ $breadcrumb = $page->return_object('breadcrumb');
- $listing_query = $DB->query($listing_split->sql_query);
-
- if(!empty($page_content))
- $page->force_content($page_content);
- else
- $page_content = $page->force_content('index_listing.php');
- }
- else{
- header("Status: 404 Not Found");
- header("HTTP/1.0 301 Moved Permanently");
- }
- }
-
-
- $page->post_init(false);
+ $listing = listing::getInstance();
-
- exit(json_encode($value));
+ // call master DataTypes listing and next childs modules
+ $page_content = DataTypes::transversal('transversal' /* , $listing */);
+ $listing_split = $listing->listing($dyntype);
+
+ $listing_query = $DB->query($listing_split->sql_query);
+
+ if (!empty($page_content))
+ $page->force_content($page_content);
+ else
+ $page_content = $page->force_content('index_listing.php');
+
+ $value = $page->GetVar('current_object');
+ }
+ else {
+ header("Status: 404 Not Found");
+ header("HTTP/1.0 301 Moved Permanently");
+ }
+}
+
+
+$page->post_init(false);
+
+
+exit(json_encode($value));
?>
\ 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...> - 2016-01-27 08:56:24
|
Revision: 5290
http://sourceforge.net/p/oscss/svn/5290
Author: oscim
Date: 2016-01-27 08:56:21 +0000 (Wed, 27 Jan 2016)
Log Message:
-----------
Add option for smtp server configuration
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/emailUtility.php
trunk/catalog/includes/functions/general.php
trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql
Modified: trunk/catalog/admin/includes/classes/emailUtility.php
===================================================================
--- trunk/catalog/admin/includes/classes/emailUtility.php 2016-01-26 17:23:33 UTC (rev 5289)
+++ trunk/catalog/admin/includes/classes/emailUtility.php 2016-01-27 08:56:21 UTC (rev 5290)
@@ -61,13 +61,37 @@
// Instantiate a new mail object
$message = new PHPMailer();
- if (EMAIL_TRANSPORT == 'smtp'){
- $message->IsSMTP(); // telling the class to use SMTP
+ if (EMAIL_TRANSPORT == 'smtp') {
+
+ if( OSCSS_DEBUG == true)
+ $message->SMTPDebug = true;
+
+ if (tep_cst_define('SMTP_USERNAME') && tep_cst_define('SMTP_PASSWORD')) {
+ $message->SMTPAuth = true;
- if( !tep_not_null($from_email_address) ) $from_email_address = SMTP_SENDMAIL_FROM;
- if( !tep_not_null($from_email_name) ) $from_email_name = SMTP_FROMEMAIL_NAME;
- $message->Host = SMTP_MAIL_SERVER; // SMTP server
- }else{
+ $message->Username = SMTP_USERNAME;
+ $message->Password = SMTP_PASSWORD;
+
+ if (tep_cst_define('SMTP_SSL_TYPE'))
+ $message->SMTPSecure = SMTP_SSL_TYPE;
+ }
+
+ $message->IsSMTP(); // telling the class to use SMTP
+
+ if (!tep_not_null($from_email_address))
+ $from_email_address = SMTP_SENDMAIL_FROM;
+
+ if (!tep_not_null($from_email_name))
+ $from_email_name = SMTP_FROMEMAIL_NAME;
+
+ $message->Sender = SMTP_SENDMAIL_FROM;
+ $message->SMTPAuth = true;
+
+ $message->Host = SMTP_MAIL_SERVER; // SMTP server
+
+ $message->Port = SMTP_PORT_NUMBER; // SMTP server
+ }
+ else{
$message->IsSendmail();
//////(EMAIL_TRANSPORT == 'sendmail')
//////You need to implement here if you are using sendmail
Modified: trunk/catalog/includes/functions/general.php
===================================================================
--- trunk/catalog/includes/functions/general.php 2016-01-26 17:23:33 UTC (rev 5289)
+++ trunk/catalog/includes/functions/general.php 2016-01-27 08:56:21 UTC (rev 5290)
@@ -742,14 +742,37 @@
// Instantiate a new mail object
$message = new PHPMailer();
- if (EMAIL_TRANSPORT == 'smtp'){
- $message->IsSMTP(); // telling the class to use SMTP
+ if (EMAIL_TRANSPORT == 'smtp') {
+
+ if( OSCSS_DEBUG == true)
+ $message->SMTPDebug = true;
+
+ if (tep_cst_define('SMTP_USERNAME') && tep_cst_define('SMTP_PASSWORD')) {
+ $message->SMTPAuth = true;
- if( !tep_not_null($from_email_address) ) $from_email_address = SMTP_SENDMAIL_FROM;
- if( !tep_not_null($from_email_name) ) $from_email_name = SMTP_FROMEMAIL_NAME;
- // Config
- $message->Host = SMTP_MAIL_SERVER; // SMTP server
- }else{
+ $message->Username = SMTP_USERNAME;
+ $message->Password = SMTP_PASSWORD;
+
+ if (tep_cst_define('SMTP_SSL_TYPE'))
+ $message->SMTPSecure = SMTP_SSL_TYPE;
+ }
+
+ $message->IsSMTP(); // telling the class to use SMTP
+
+ if (!tep_not_null($from_email_address))
+ $from_email_address = SMTP_SENDMAIL_FROM;
+
+ if (!tep_not_null($from_email_name))
+ $from_email_name = SMTP_FROMEMAIL_NAME;
+
+ $message->Sender = SMTP_SENDMAIL_FROM;
+ $message->SMTPAuth = true;
+
+ $message->Host = SMTP_MAIL_SERVER; // SMTP server
+
+ $message->Port = SMTP_PORT_NUMBER; // SMTP server
+ }
+ else{
$message->IsSendmail();
// $mail->Sendmail ='/usr/sbin/sendmail';
//////(EMAIL_TRANSPORT == 'sendmail')
Modified: trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql 2016-01-26 17:23:33 UTC (rev 5289)
+++ trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql 2016-01-27 08:56:21 UTC (rev 5290)
@@ -181,6 +181,11 @@
insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('EMAIL_TRANSPORT_S', 'EMAIL_TRANSPORT', 'sendmail', 'EMAIL_TRANSPORT_L', '12', '1', NOW(), NOW(), NULL, 'tep_cfg_select_option(array(\'sendmail\', \'smtp\'),');
insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('SMTP_MAIL_SERVER_S', 'SMTP_MAIL_SERVER', 'localhost', 'SMTP_MAIL_SERVER_L', '12', '1', NOW(), NOW(), NULL, NULL);
insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('SMTP_PORT_NUMBER_S', 'SMTP_PORT_NUMBER', '25', 'SMTP_PORT_NUMBER_L', '12', '1', NOW(), NOW(), NULL, NULL);
+
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('SMTP_USERNAME_S', 'SMTP_USERNAME', '', 'SMTP_USERNAME_L', '12', '1', NOW(), NOW(), NULL, NULL);
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('SMTP_PASSWORD_S', 'SMTP_PASSWORD', '25', 'SMTP_PASSWORD_L', '12', '1', NOW(), NOW(), NULL, NULL);
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('SMTP_SSL_TYPE_S', 'SMTP_SSL_TYPE', '25', 'SMTP_SSL_TYPE_L', '12', '1', NOW(), NOW(), NULL, 'tep_cfg_select_option(array(\'\', \'ssl\', \'tls\'),');
+
insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('SMTP_SENDMAIL_FROM_S', 'SMTP_SENDMAIL_FROM', 'root@localhost', 'SMTP_SENDMAIL_FROM_L', '12', '1', NOW(), NOW(), NULL, NULL);
insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('SMTP_FROMEMAIL_NAME_S', 'SMTP_FROMEMAIL_NAME', 'Store owner name', 'SMTP_FROMEMAIL_NAME_L', '12', '1', NOW(), NOW(), NULL, NULL);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hom...@us...> - 2016-01-26 17:23:35
|
Revision: 5289
http://sourceforge.net/p/oscss/svn/5289
Author: homer8173
Date: 2016-01-26 17:23:33 +0000 (Tue, 26 Jan 2016)
Log Message:
-----------
BUG : call on boxes was broken EX : /catalog/ajax_exe.php?action=GET&box=search
Modified Paths:
--------------
trunk/catalog/ajax_exe.php
Modified: trunk/catalog/ajax_exe.php
===================================================================
--- trunk/catalog/ajax_exe.php 2016-01-26 13:38:15 UTC (rev 5288)
+++ trunk/catalog/ajax_exe.php 2016-01-26 17:23:33 UTC (rev 5289)
@@ -45,7 +45,7 @@
$c=$page->oscss_boxes->_add($_GET['box'],'ajax','');
$box_left=$page->oscss_boxes->_call($_GET['box'],'ajax');
$boxe =$page->oscss_boxes->_return($_GET['box']);
- include(DIR_WS_TEMPLATES.$page->the_template().'/boxe.php');
+ include(DIR_WS_TEMPLATES.$page->the_template().'/Childs_tpl/boxe.php');
page::StopCacheVar();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hom...@us...> - 2016-01-26 13:38:16
|
Revision: 5288
http://sourceforge.net/p/oscss/svn/5288
Author: homer8173
Date: 2016-01-26 13:38:15 +0000 (Tue, 26 Jan 2016)
Log Message:
-----------
FIX : console.log make bug on ie
Modified Paths:
--------------
trunk/catalog/admin/includes/template/oscss/footer2-1.php
Modified: trunk/catalog/admin/includes/template/oscss/footer2-1.php
===================================================================
--- trunk/catalog/admin/includes/template/oscss/footer2-1.php 2015-11-30 09:24:37 UTC (rev 5287)
+++ trunk/catalog/admin/includes/template/oscss/footer2-1.php 2016-01-26 13:38:15 UTC (rev 5288)
@@ -24,7 +24,7 @@
ajustement = typeof ajustement === "number" ? ajustement : 59;
window_height = $(window).height();
used_height = $('#glob .menu_top').height() + $('#bas').height() + $('footer').height();
- console.log( ajustement);
+ // console.log( ajustement);
$('#central').css('min-height', window_height - used_height - ajustement);
};
init_resize(59); // ajustement different car less pas encore chargé !!!!!
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2015-11-30 09:24:39
|
Revision: 5287
http://sourceforge.net/p/oscss/svn/5287
Author: oscim
Date: 2015-11-30 09:24:37 +0000 (Mon, 30 Nov 2015)
Log Message:
-----------
Modified Paths:
--------------
trunk/catalog/rss.php
Modified: trunk/catalog/rss.php
===================================================================
--- trunk/catalog/rss.php 2015-11-30 07:56:49 UTC (rev 5286)
+++ trunk/catalog/rss.php 2015-11-30 09:24:37 UTC (rev 5287)
@@ -7,7 +7,7 @@
*\date 22/06/10, 09:21
*\author oscim <mail aur...@os...> <www http://www.oscim.fr>
*\encode UTF-8
- *\file
+ *\file rss.php
*\dir catalog/
*\brief page des flux
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2015-11-30 07:56:51
|
Revision: 5286
http://sourceforge.net/p/oscss/svn/5286
Author: oscim
Date: 2015-11-30 07:56:49 +0000 (Mon, 30 Nov 2015)
Log Message:
-----------
Fix install in cli mode
Modified Paths:
--------------
trunk/catalog/install/includes/content/core.configuration.php
Modified: trunk/catalog/install/includes/content/core.configuration.php
===================================================================
--- trunk/catalog/install/includes/content/core.configuration.php 2015-11-17 18:17:33 UTC (rev 5285)
+++ trunk/catalog/install/includes/content/core.configuration.php 2015-11-30 07:56:49 UTC (rev 5286)
@@ -391,7 +391,7 @@
define('DIR_WS_MODULES', $this->fs_document_root . $this->ws_admin_rand . '/includes/modules/');
// error_reporting(0);
- include($this->fs_document_root . $this->ws_admin_rand . '/includes/database_tables.php');
+ include_once($this->fs_document_root . $this->ws_admin_rand . '/includes/database_tables.php');
osc_db_connect($this->db['DBMOTOR'], $this->db['DBMOTOR_PORT'], $this->db['DBMOTOR_CHARSET'], $this->db['DB_SERVER'], $this->db['DB_SERVER_USERNAME'], $this->db['DB_SERVER_PASSWORD'], strtolower($this->db['DBMOTOR_TYPE']));
osc_db_select_db($this->db['DB_DATABASE']);
@@ -558,11 +558,11 @@
if (file_exists($this->fs_document_root . 'admin'))
rename($this->fs_document_root . 'admin', $this->fs_document_root . $this->ws_admin_rand);
- if (!defined('TABLE_CONFIGURATION'))
- define('TABLE_CONFIGURATION', $this->db['DB_TABLE_PREFIX'] . 'configuration');
- if (!defined('TABLE_COUNTRIES'))
- define('TABLE_COUNTRIES', $this->db['DB_TABLE_PREFIX'] . 'countries');
-
+// if (!defined('TABLE_CONFIGURATION'))
+// define('TABLE_CONFIGURATION', $this->db['DB_TABLE_PREFIX'] . 'configuration');
+// if (!defined('TABLE_COUNTRIES'))
+// define('TABLE_COUNTRIES', $this->db['DB_TABLE_PREFIX'] . 'countries');
+ include_once($this->fs_document_root . $this->ws_admin_rand . '/includes/database_tables.php');
//! dependance
require_once($this->fs_document_root . $this->ws_admin_rand . '/includes/functions/lib.configuration.php');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hom...@us...> - 2015-11-17 18:17:35
|
Revision: 5285
http://sourceforge.net/p/oscss/svn/5285
Author: homer8173
Date: 2015-11-17 18:17:33 +0000 (Tue, 17 Nov 2015)
Log Message:
-----------
FIX : orthographe in mail
Modified Paths:
--------------
trunk/catalog/install/includes/language/fr_FR/email_install.html
Modified: trunk/catalog/install/includes/language/fr_FR/email_install.html
===================================================================
--- trunk/catalog/install/includes/language/fr_FR/email_install.html 2015-11-17 17:59:10 UTC (rev 5284)
+++ trunk/catalog/install/includes/language/fr_FR/email_install.html 2015-11-17 18:17:33 UTC (rev 5285)
@@ -54,7 +54,7 @@
<td width="50%" valign="top"><h2 style="color: #4f8ecb;text-align:center">Découvrez</h2>
<p>Notez bien, votre site est disponible à l'adresse :</p>
<p><a href="[[FO_URL]]">[[FO_URL]]</a> </p>
- <p style="text-align:center;"><a href="[[FO_URL]]" class="btn">Acceder au site</a></p></td>
+ <p style="text-align:center;"><a href="[[FO_URL]]" class="btn">Accéder au site</a></p></td>
</tr>
<tr>
<td colspan="2"><hr style="margin:20px 0 20px 0; padding: 0; border: none; border-top: medium dotted #999; color: #999; text-align: center;" /></td>
@@ -66,13 +66,13 @@
<p><a href="[[BO_URL]]">[[BO_URL]]</a></p>
<p>Votre mot de passe par défaut : <strong>[[PASSWORD]]</strong><br />
(le login c'est l'email que vous avez fourni.)</p>
- <p style="text-align:center;"><a href="[[BO_URL]]" class="btn">Acceder à mon espace privé</a></p></td>
+ <p style="text-align:center;"><a href="[[BO_URL]]" class="btn">Accéder à mon espace privé</a></p></td>
</tr>
<tr>
<td colspan="2"><hr style="margin:20px 0 20px 0; padding: 0; border: none; border-top: medium dotted #999; color: #999; text-align: center;" />
<h2 style="color: #4f8ecb;text-align:center">Supportez osCSS ! </h2>
- <p>Nous sommes interressez par tous
- les retours d'expérience que vous pourrez nous donner. Notre objectif est d'améliorer les performances et les fonctionnalités d'osCSS en permanence.<strong> Ca vous coutes quelques minutes aujourd'hui mais ça vous fera gagner des heures demain, alors participez !</strong></p></td>
+ <p>Nous sommes intéressé par tous
+ les retours d'expérience que vous pourrez nous donner. Notre objectif est d'améliorer les performances et les fonctionnalités d'osCSS en permanence.<strong> Ça vous coutes quelques minutes aujourd'hui mais ça vous fera gagner des heures demain, alors participez !</strong></p></td>
</tr>
<tr>
<td width="50%"><h3 style="color: #4f8ecb;text-align:center">Aidez-nous à promouvoir osCSS</h3>
@@ -81,7 +81,7 @@
<li><a class="blank" href="https://facebook.com/oscss.org" target="_blank">Facebook</a></li>
<li><a class="blank" href="https://twitter.com/osCSS" target="_blank">Tweeter</a></li>
</ul></td>
- <td width="50%"><h3 style="color: #4f8ecb;text-align:center">Participez au development</h3>
+ <td width="50%"><h3 style="color: #4f8ecb;text-align:center">Participez au développement</h3>
<ul style="margin:0;padding:0;list-style:none;text-align:center;">
<li><a class="blank" href="http://sourceforge.net/projects/oscss/" target="_blank">SourceForge</a></li>
<li><a class="blank" href="http://dev.oscss.org/" target="_blank">Remonter un bug</a></li>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hom...@us...> - 2015-11-17 17:59:12
|
Revision: 5284
http://sourceforge.net/p/oscss/svn/5284
Author: homer8173
Date: 2015-11-17 17:59:10 +0000 (Tue, 17 Nov 2015)
Log Message:
-----------
FIX : path of custom email during install
Modified Paths:
--------------
trunk/catalog/install/includes/content/core.configuration.php
Modified: trunk/catalog/install/includes/content/core.configuration.php
===================================================================
--- trunk/catalog/install/includes/content/core.configuration.php 2015-11-17 13:35:51 UTC (rev 5283)
+++ trunk/catalog/install/includes/content/core.configuration.php 2015-11-17 17:59:10 UTC (rev 5284)
@@ -433,12 +433,12 @@
$headers = 'From: webmaster@' . $this->cookie_domain . "\r\n" .
'Reply-To: webmaster@' . $this->cookie_domain . "\r\n" .
'X-Mailer: PHP/' . phpversion();
- if (file_exists('includes/language/' . $langue['file'] . '/email_install.html')) {
+ if (file_exists('includes/language/fr_FR/email_install.html')) {
// headers for html
$headers .= "MIME-Version: 1.0\r\n";
- $headers .= "Content-Type: text/html; charset=ISO-8859-1\r\n";
+ $headers .= "Content-Type: text/html; charset=utf-8\r\n";
// load mail sample from lang dir
- $message = file_get_contents('includes/language/' . $langue['file'] . '/email_install.html');
+ $message = file_get_contents('includes/language/fr_FR/email_install.html');
// build list of key to replace
$parmeters = array();
$parmeters['FO_URL'] = $_POST['HTTP_WWW_ADDRESS'];
@@ -459,7 +459,7 @@
}
/*
- @remarsk Email admin send for process finish
+ replace vars in a text
*/
function inject_data_from_array($subject, $array = array()) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hom...@us...> - 2015-11-17 13:35:53
|
Revision: 5283
http://sourceforge.net/p/oscss/svn/5283
Author: homer8173
Date: 2015-11-17 13:35:51 +0000 (Tue, 17 Nov 2015)
Log Message:
-----------
UPDATE : thumb for admin template oscss
Modified Paths:
--------------
trunk/catalog/admin/includes/template/oscss/oscss.png
Modified: trunk/catalog/admin/includes/template/oscss/oscss.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hom...@us...> - 2015-11-17 13:07:42
|
Revision: 5282
http://sourceforge.net/p/oscss/svn/5282
Author: homer8173
Date: 2015-11-17 13:07:39 +0000 (Tue, 17 Nov 2015)
Log Message:
-----------
NEW : template system for install email notification
Modified Paths:
--------------
trunk/catalog/install/includes/content/core.configuration.php
Added Paths:
-----------
trunk/catalog/install/includes/language/fr_FR/email_install.html
Modified: trunk/catalog/install/includes/content/core.configuration.php
===================================================================
--- trunk/catalog/install/includes/content/core.configuration.php 2015-11-17 12:30:56 UTC (rev 5281)
+++ trunk/catalog/install/includes/content/core.configuration.php 2015-11-17 13:07:39 UTC (rev 5282)
@@ -1,4 +1,5 @@
<?php
+
/**
@licence GPL 2005-2014 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@@ -10,550 +11,578 @@
@encode UTF-8
@brief This class use modele in includes/modele/xxx.txt
- In the modele , use %XXXX_XXX% For replace in reel file
+ In the modele , use %XXXX_XXX% For replace in reel file
- For call and install new file, use in this class
+ For call and install new file, use in this class
- $res=file_get_contents(self::$modele_path.'configure.txt');
+ $res=file_get_contents(self::$modele_path.'configure.txt');
- $file_contents = '<?php' ."\n";
- $file_contents .=str_replace(self::$c_k, self::$c_v ,$res);
- $file_contents .= "\n".'?>';
+ $file_contents = '<?php' ."\n";
+ $file_contents .=str_replace(self::$c_k, self::$c_v ,$res);
+ $file_contents .= "\n".'?>';
Tableau des Correspodnance
- [CURRENT_VERSION] => 2.1.1
- [CREATE_DATE] => 2011-10-31 12:00:44
- [VAR_OSCSS_DEBUG] => true
- [HTTP_SERVER] => http://localhost
- [HTTPS_SERVER] =>
- [ENABLE_SSL] => false
- [HTTP_COOKIE_DOMAIN] =>
- [HTTPS_COOKIE_DOMAIN] =>
- [HTTP_COOKIE_PATH] => /workspace/oscss_test/2.1.1/08/trunk/catalog/
- [HTTPS_COOKIE_PATH] =>
- [HTTP_CATALOG] => /workspace/oscss_test/2.1.1/08/trunk/catalog/
- [FS_DOCUMENT_ROOT] => /var/www/workspace/oscss_test/2.1.1/08/trunk/catalog/
- [WS_DOCUMENT_ROOT] => /workspace/oscss_test/2.1.1/08/trunk/catalog/
- [FS_ROOT_DOCS] => /var/www/workspace/oscss_test/2.1.1/08/trunk/Documents/
- [WS_ADMIN] => /workspace/oscss_test/2.1.1/08/trunk/catalog/admin613
- [FS_ADMIN] => /var/www/workspace/oscss_test/2.1.1/08/trunk/catalog/admin613
- [HTTP_WORK_DIRECTORY] => Documents/
- [DB_SERVER] => localhost
- [DB_SERVER_USERNAME] => root
- [DB_SERVER_PASSWORD] => aurelien
- [DB_DATABASE] => oscss_211_08_innodb
- [DB_TABLE_PREFIX] => osc_
- [USE_PCONNECT] => false
- [STORE_SESSIONS] =>
- [DBMOTOR] => Mysql
- [DBMOTOR_CHARSET] => utf8
- [DBMOTOR_PORT] => 3306
- [DBMOTOR_TYPE] => InnoDB
- [SECURE_KEY] => 1d2bf0664163e0b7562f90c9f3de2518b26cac28
+ [CURRENT_VERSION] => 2.1.1
+ [CREATE_DATE] => 2011-10-31 12:00:44
+ [VAR_OSCSS_DEBUG] => true
+ [HTTP_SERVER] => http://localhost
+ [HTTPS_SERVER] =>
+ [ENABLE_SSL] => false
+ [HTTP_COOKIE_DOMAIN] =>
+ [HTTPS_COOKIE_DOMAIN] =>
+ [HTTP_COOKIE_PATH] => /workspace/oscss_test/2.1.1/08/trunk/catalog/
+ [HTTPS_COOKIE_PATH] =>
+ [HTTP_CATALOG] => /workspace/oscss_test/2.1.1/08/trunk/catalog/
+ [FS_DOCUMENT_ROOT] => /var/www/workspace/oscss_test/2.1.1/08/trunk/catalog/
+ [WS_DOCUMENT_ROOT] => /workspace/oscss_test/2.1.1/08/trunk/catalog/
+ [FS_ROOT_DOCS] => /var/www/workspace/oscss_test/2.1.1/08/trunk/Documents/
+ [WS_ADMIN] => /workspace/oscss_test/2.1.1/08/trunk/catalog/admin613
+ [FS_ADMIN] => /var/www/workspace/oscss_test/2.1.1/08/trunk/catalog/admin613
+ [HTTP_WORK_DIRECTORY] => Documents/
+ [DB_SERVER] => localhost
+ [DB_SERVER_USERNAME] => root
+ [DB_SERVER_PASSWORD] => aurelien
+ [DB_DATABASE] => oscss_211_08_innodb
+ [DB_TABLE_PREFIX] => osc_
+ [USE_PCONNECT] => false
+ [STORE_SESSIONS] =>
+ [DBMOTOR] => Mysql
+ [DBMOTOR_CHARSET] => utf8
+ [DBMOTOR_PORT] => 3306
+ [DBMOTOR_TYPE] => InnoDB
+ [SECURE_KEY] => 1d2bf0664163e0b7562f90c9f3de2518b26cac28
-*/
-
+ */
// error_reporting(E_ALL);
class configuration extends core {
+ /**
+ @var
+ */
+ static protected $c_k = array();
+ /**
+ @var
+ */
+ static protected $c_v = array();
- /**
- @var
- */
- static protected $c_k = array() ;
- /**
- @var
- */
- static protected $c_v = array() ;
- /**
- @var
- */
- static protected $corresp = array() ;
- /**
- @var
- */
- static protected $modele_path = 'includes/modele/';
+ /**
+ @var
+ */
+ static protected $corresp = array();
+ /**
+ @var
+ */
+ static protected $modele_path = 'includes/modele/';
+ public static function GetSort() {
+ // sort in process
+ return 60;
+ }
- public static function GetSort(){
- // sort in process
- return 60;
- }
+ /**
+ @brief create all linnk and var for global configuration
+ */
+ private function AdjustConf() {
+ $http_url = parse_url($_POST['HTTP_WWW_ADDRESS']);
+ $http_server = $http_url['scheme'] . '://' . $http_url['host'];
+ $http_catalog = $http_url['path'];
+ if (isset($http_url['port']) && !empty($http_url['port']))
+ $http_server .= ':' . $http_url['port'];
+ if (substr($http_catalog, -1) != '/')
+ $http_catalog .= '/';
- /**
- @brief create all linnk and var for global configuration
- */
- private function AdjustConf(){
+ $https_server = '';
+ $https_catalog = '';
+ if (isset($_POST['HTTPS_WWW_ADDRESS']) && !empty($_POST['HTTPS_WWW_ADDRESS'])) {
+ $https_url = parse_url($_POST['HTTPS_WWW_ADDRESS']);
+ $https_server = $https_url['scheme'] . '://' . $https_url['host'];
+ $https_catalog = $https_url['path'];
- $http_url = parse_url($_POST['HTTP_WWW_ADDRESS']);
- $http_server = $http_url['scheme'] . '://' . $http_url['host'];
- $http_catalog = $http_url['path'];
- if (isset($http_url['port']) && !empty($http_url['port'])) $http_server .= ':' . $http_url['port'];
- if (substr($http_catalog, -1) != '/') $http_catalog .= '/';
+ if (isset($https_url['port']) && !empty($https_url['port']))
+ $https_server .= ':' . $https_url['port'];
+ if (substr($https_catalog, -1) != '/')
+ $https_catalog .= '/';
+ }
- $https_server = '';
- $https_catalog = '';
- if (isset($_POST['HTTPS_WWW_ADDRESS']) && !empty($_POST['HTTPS_WWW_ADDRESS'])) {
- $https_url = parse_url($_POST['HTTPS_WWW_ADDRESS']);
- $https_server = $https_url['scheme'] . '://' . $https_url['host'];
- $https_catalog = $https_url['path'];
+ $enable_ssl = (isset($_POST['ENABLE_SSL']) && ($_POST['ENABLE_SSL'] == 'on') ? 'true' : 'false');
- if (isset($https_url['port']) && !empty($https_url['port'])) $https_server .= ':' . $https_url['port'];
- if (substr($https_catalog, -1) != '/') $https_catalog .= '/';
- }
+ $http_cookie_domain = $_POST['HTTP_COOKIE_DOMAIN'];
+ $https_cookie_domain = (isset($_POST['HTTPS_COOKIE_DOMAIN']) ? $_POST['HTTPS_COOKIE_DOMAIN'] : '');
+ $http_cookie_path = $_POST['HTTP_COOKIE_PATH'];
+ $https_cookie_path = (isset($_POST['HTTPS_COOKIE_PATH']) ? $_POST['HTTPS_COOKIE_PATH'] : '');
- $enable_ssl = (isset($_POST['ENABLE_SSL']) && ($_POST['ENABLE_SSL'] == 'on') ? 'true' : 'false');
+ $http_work_directory = $_POST['HTTP_WORK_DIRECTORY'];
+ if (substr($http_work_directory, -1) != '/')
+ $http_work_directory .= '/';
- $http_cookie_domain = $_POST['HTTP_COOKIE_DOMAIN'];
- $https_cookie_domain = (isset($_POST['HTTPS_COOKIE_DOMAIN']) ? $_POST['HTTPS_COOKIE_DOMAIN'] : '');
- $http_cookie_path = $_POST['HTTP_COOKIE_PATH'];
- $https_cookie_path = (isset($_POST['HTTPS_COOKIE_PATH']) ? $_POST['HTTPS_COOKIE_PATH'] : '');
- $http_work_directory = $_POST['HTTP_WORK_DIRECTORY'];
- if (substr($http_work_directory, -1) != '/') $http_work_directory .= '/';
+ $root_docs = $this->fs_document_root . $http_work_directory;
+ if (isset($_POST['ARBORESANCE']))
+ if ($_POST['ARBORESANCE'] == 'vhost')
+ $root_docs = substr($this->fs_document_root, 0, -(int) strlen('catalog/')) . $http_work_directory;
+ $_POST['FS_ROOT_DOCS'] = $root_docs;
- $root_docs = $this->fs_document_root . $http_work_directory;
- if (isset($_POST['ARBORESANCE']) )
- if($_POST['ARBORESANCE'] =='vhost')
- $root_docs = substr($this->fs_document_root,0, -(int)strlen('catalog/') ) . $http_work_directory;
+ $Key = sha1(mt_rand(10000, 99999) . time());
- $_POST['FS_ROOT_DOCS'] = $root_docs;
+ $this->get_db_conf();
- $Key=sha1(mt_rand(10000,99999).time());
+ /**
+ Creation admin configure
+ */
+ $corresp = array();
+ $corresp['CURRENT_VERSION'] = '2.1.1';
+ $corresp['CREATE_DATE'] = date("Y-m-d H:i:s");
+ $corresp['VAR_OSCSS_DEBUG'] = 'true';
+ $corresp['HTTP_SERVER'] = $http_server;
+ $corresp['HTTPS_SERVER'] = (($enable_ssl == 'true') ? $https_server : '');
+ ;
+ $corresp['ENABLE_SSL'] = $enable_ssl;
+ $corresp['HTTP_COOKIE_DOMAIN'] = (($http_cookie_domain != 'localhost') ? $http_cookie_domain : '');
+ $corresp['HTTPS_COOKIE_DOMAIN'] = (($enable_ssl == 'true' && $https_cookie_domain != 'localhost') ? $https_cookie_domain : '');
+ $corresp['HTTP_COOKIE_PATH'] = $http_cookie_path;
+ $corresp['HTTPS_COOKIE_PATH'] = (($enable_ssl == 'true') ? $https_cookie_path : '');
+ $corresp['HTTP_CATALOG'] = $http_catalog;
+ $corresp['FS_DOCUMENT_ROOT'] = $this->fs_document_root;
+ $corresp['WS_DOCUMENT_ROOT'] = $this->ws_document_root;
+ $corresp['FS_ROOT_DOCS'] = $root_docs;
+ $corresp['WS_ADMIN'] = $http_catalog . $this->ws_admin_rand . '/';
+ $corresp['FS_ADMIN'] = $this->fs_document_root . $this->ws_admin_rand . '/';
+ $corresp['HTTP_WORK_DIRECTORY'] = $http_work_directory;
+ $corresp['DB_SERVER'] = $this->db['DB_SERVER'];
+ $corresp['DB_SERVER_USERNAME'] = $this->db['DB_SERVER_USERNAME'];
+ $corresp['DB_SERVER_PASSWORD'] = $this->db['DB_SERVER_PASSWORD'];
+ $corresp['DB_DATABASE'] = $this->db['DB_DATABASE'];
+ $corresp['DB_TABLE_PREFIX'] = $this->db['DB_TABLE_PREFIX'];
+ $corresp['USE_PCONNECT'] = ((isset($_POST['USE_PCONNECT']) && $_POST['USE_PCONNECT'] == 'on') ? 'true' : 'false');
+ $corresp['STORE_SESSIONS'] = ((isset($_POST['STORE_SESSIONS']) && $_POST['STORE_SESSIONS'] == 'files') ? '' : 'mysql');
+ $corresp['DBMOTOR'] = $this->db['DBMOTOR'];
+ $corresp['DBMOTOR_CHARSET'] = $this->db['DBMOTOR_CHARSET'];
+ $corresp['DBMOTOR_PORT'] = $this->db['DBMOTOR_PORT'];
+ $corresp['DBMOTOR_TYPE'] = $this->db['DBMOTOR_TYPE'];
+ $corresp['SECURE_KEY'] = $Key;
- $this->get_db_conf();
+ self::$corresp = $corresp;
- /**
- Creation admin configure
- */
- $corresp = array();
- $corresp['CURRENT_VERSION'] = '2.1.1';
- $corresp['CREATE_DATE'] = date("Y-m-d H:i:s");
- $corresp['VAR_OSCSS_DEBUG'] = 'true';
- $corresp['HTTP_SERVER'] = $http_server;
- $corresp['HTTPS_SERVER'] = (($enable_ssl =='true')?$https_server : ''); ;
- $corresp['ENABLE_SSL'] = $enable_ssl;
- $corresp['HTTP_COOKIE_DOMAIN'] = (($http_cookie_domain !='localhost')? $http_cookie_domain: '');
- $corresp['HTTPS_COOKIE_DOMAIN'] = (($enable_ssl =='true' && $https_cookie_domain !='localhost')? $https_cookie_domain: '');
- $corresp['HTTP_COOKIE_PATH'] = $http_cookie_path;
- $corresp['HTTPS_COOKIE_PATH'] = (($enable_ssl =='true')?$https_cookie_path : '');
- $corresp['HTTP_CATALOG'] = $http_catalog;
- $corresp['FS_DOCUMENT_ROOT'] = $this->fs_document_root;
- $corresp['WS_DOCUMENT_ROOT'] = $this->ws_document_root;
- $corresp['FS_ROOT_DOCS'] = $root_docs;
- $corresp['WS_ADMIN'] = $http_catalog .$this->ws_admin_rand.'/';
- $corresp['FS_ADMIN'] = $this->fs_document_root.$this->ws_admin_rand.'/' ;
- $corresp['HTTP_WORK_DIRECTORY'] = $http_work_directory;
- $corresp['DB_SERVER'] = $this->db['DB_SERVER'];
- $corresp['DB_SERVER_USERNAME'] = $this->db['DB_SERVER_USERNAME'];
- $corresp['DB_SERVER_PASSWORD'] = $this->db['DB_SERVER_PASSWORD'];
- $corresp['DB_DATABASE'] = $this->db['DB_DATABASE'];
- $corresp['DB_TABLE_PREFIX'] = $this->db['DB_TABLE_PREFIX'];
- $corresp['USE_PCONNECT'] = ((isset($_POST['USE_PCONNECT']) && $_POST['USE_PCONNECT'] == 'on') ? 'true' : 'false');
- $corresp['STORE_SESSIONS'] = ((isset($_POST['STORE_SESSIONS']) && $_POST['STORE_SESSIONS'] == 'files') ? '' : 'mysql');
- $corresp['DBMOTOR'] = $this->db['DBMOTOR'];
- $corresp['DBMOTOR_CHARSET'] = $this->db['DBMOTOR_CHARSET'];
- $corresp['DBMOTOR_PORT'] = $this->db['DBMOTOR_PORT'];
- $corresp['DBMOTOR_TYPE'] = $this->db['DBMOTOR_TYPE'];
- $corresp['SECURE_KEY'] = $Key;
+ function remove(&$item2) {
+ $item2 = "%" . $item2 . "%";
+ }
- self::$corresp = $corresp;
+ self::$c_k = array_keys($corresp);
+ array_walk(self::$c_k, 'remove');
- function remove(&$item2){
- $item2 = "%".$item2."%";
+ self::$c_v = array_values($corresp);
}
- self::$c_k=array_keys($corresp);
- array_walk(self::$c_k, 'remove');
- self::$c_v=array_values($corresp);
+ /**
+ Installation des fichier de configurations
+ */
+ private function install_base_conf() {
- }
- /**
- Installation des fichier de configurations
- */
- private function install_base_conf(){
+ /**
+ @remarks adjust hierarchie folder by radio select
+ */
+ if (isset($_POST['ARBORESANCE'])) {
+ if ($_POST['ARBORESANCE'] == 'all') {
+ /**
+ @remarks Add htacess for secure folder and childs
+ */
+ } elseif ($_POST['ARBORESANCE'] == 'vhost') {
+ /**
+ @remarks Copy to up folder
+ */
+ if (file_exists(self::$corresp['FS_DOCUMENT_ROOT'] . 'Documents/')) {
+ parent::recurse_copy(self::$corresp['FS_DOCUMENT_ROOT'] . 'Documents/', self::$corresp['FS_ROOT_DOCS']);
- /**
- @remarks adjust hierarchie folder by radio select
- */
- if (isset($_POST['ARBORESANCE']) ){
+ parent::recurse_delete(self::$corresp['FS_DOCUMENT_ROOT'] . 'Documents/');
+ }
+ }
+ }
- if($_POST['ARBORESANCE'] =='all'){
- /**
- @remarks Add htacess for secure folder and childs
- */
- }
- elseif($_POST['ARBORESANCE'] =='vhost'){
- /**
- @remarks Copy to up folder
- */
- if(file_exists(self::$corresp['FS_DOCUMENT_ROOT']. 'Documents/')) {
- parent::recurse_copy(self::$corresp['FS_DOCUMENT_ROOT']. 'Documents/', self::$corresp['FS_ROOT_DOCS']);
- parent::recurse_delete(self::$corresp['FS_DOCUMENT_ROOT']. 'Documents/');
- }
- }
- }
+ $res = file_get_contents(self::$modele_path . 'configure.txt');
+ $file_contents = '<?php' . "\n";
+ $file_contents .=str_replace(self::$c_k, self::$c_v, $res);
+ $file_contents .= "\n" . '?>';
+ $fp = fopen($this->fs_document_root . 'includes/configure.php', 'w');
+ fputs($fp, $file_contents);
+ fclose($fp);
+ $res = file_get_contents(self::$modele_path . 'admin_configure.txt');
- $res=file_get_contents(self::$modele_path.'configure.txt');
+ $file_contents = '<?php' . "\n";
+ $file_contents .=str_replace(self::$c_k, self::$c_v, $res);
+ $file_contents .= "\n" . '?>';
- $file_contents = '<?php' ."\n";
- $file_contents .=str_replace(self::$c_k, self::$c_v ,$res);
- $file_contents .= "\n".'?>';
+ $fp = fopen($this->fs_document_root . $this->ws_admin_rand . '/includes/configure.php', 'w');
+ fputs($fp, $file_contents);
+ fclose($fp);
- $fp = fopen($this->fs_document_root . 'includes/configure.php', 'w');
- fputs($fp, $file_contents);
- fclose($fp);
- $res=file_get_contents(self::$modele_path.'admin_configure.txt');
- $file_contents = '<?php' ."\n";
- $file_contents .=str_replace(self::$c_k, self::$c_v ,$res);
- $file_contents .= "\n".'?>';
+ $res = file_get_contents(self::$modele_path . 'robot.txt');
+ $file_contents = str_replace(self::$c_k, self::$c_v, $res);
- $fp = fopen($this->fs_document_root .$this->ws_admin_rand.'/includes/configure.php', 'w');
- fputs($fp, $file_contents);
- fclose($fp);
+ $fp = fopen($this->fs_document_root . 'robots.txt', 'w');
+ fputs($fp, $file_contents);
+ fclose($fp);
+ }
+ /**
+ Installation htaccess rewriting | fichier equivalent
+ */
+ private function install_rewrite() {
+ if (!isset($_POST['install']['rewrite']) || (isset($_POST['install']['rewrite']) && $_POST['install']['rewrite'] != 'on' )) {
+ $this->zip_extractto('no_rewrite.zip', '../');
+ if (file_exists($this->fs_document_root . 'admin'))
+ rename($this->fs_document_root . 'admin', $this->fs_document_root . $this->ws_admin_rand);
+ }
+ elseif ((isset($_POST['install']['rewrite']) && $_POST['install']['rewrite'] == 'on')) {
- $res=file_get_contents(self::$modele_path.'robot.txt');
- $file_contents =str_replace(self::$c_k, self::$c_v ,$res);
+ $res = file_get_contents(self::$modele_path . 'admin_htaccess.txt');
+ $file_contents = str_replace(self::$c_k, self::$c_v, $res);
- $fp = fopen($this->fs_document_root . 'robots.txt', 'w');
- fputs($fp, $file_contents);
- fclose($fp);
- }
+ $fp = fopen($this->fs_document_root . $this->ws_admin_rand . '/.htaccess', 'w');
+ fputs($fp, $file_contents);
+ fclose($fp);
- /**
- Installation htaccess rewriting | fichier equivalent
- */
- private function install_rewrite(){
- if(!isset($_POST['install']['rewrite']) || (isset($_POST['install']['rewrite']) && $_POST['install']['rewrite'] !='on' ) ) {
- $this->zip_extractto('no_rewrite.zip', '../');
- if(file_exists($this->fs_document_root.'admin'))rename($this->fs_document_root.'admin',$this->fs_document_root.$this->ws_admin_rand);
+
+ $res = file_get_contents(self::$modele_path . 'htaccess.txt');
+ $file_contents = str_replace(self::$c_k, self::$c_v, $res);
+
+ $fp = fopen($this->fs_document_root . '.htaccess', 'w');
+ fputs($fp, $file_contents);
+ fclose($fp);
+ } else
+ return false;
}
- elseif((isset($_POST['install']['rewrite']) && $_POST['install']['rewrite'] =='on' ) ) {
- $res=file_get_contents(self::$modele_path.'admin_htaccess.txt');
- $file_contents =str_replace(self::$c_k, self::$c_v ,$res);
+ /**
+ Installation fichier suplementaires
+ */
+ private function install_extents() {
+ $file = 'includes/tables_files_modules.php';
+ $res = file_get_contents(self::$modele_path . 'tables_files_modules.txt');
- $fp = fopen($this->fs_document_root .$this->ws_admin_rand.'/.htaccess', 'w');
- fputs($fp, $file_contents);
- fclose($fp);
+ $file_contents = '<?php' . "\n";
+ $file_contents .=str_replace(self::$c_k, self::$c_v, $res);
+ $file_contents .= "\n" . '?>';
+ $fp = fopen($this->fs_document_root . $this->ws_admin_rand . '/' . $file, 'w');
+ fputs($fp, $file_contents);
+ fclose($fp);
+ $fp = fopen($this->fs_document_root . '/' . $file, 'w');
+ fputs($fp, $file_contents);
+ fclose($fp);
+ }
- $res=file_get_contents(self::$modele_path.'htaccess.txt');
- $file_contents =str_replace(self::$c_k, self::$c_v ,$res);
+ /**
+ Config site_monitor
+ */
+ public function install_sitemonitor() {
+ //! config site_monitor
+ $file_contents = '<?php' . "\n" .
+ '/************** THE OPTIONS AND SETTINGS ****************/' . "\n" .
+ '$always_email = 1; //set to 1 to always email the results' . "\n" .
+ '$verbose = 1; //set to 1 to see the results displayed on the page (for when running manually)' . "\n" .
+ '$logfile = 1; //set to 1 to see to track results in a log file' . "\n" .
+ '$logfile_size = 100000; //set the maximum size of the logfile' . "\n" .
+ '$reference_reset = 0; //delete the reference file this many days apart' . "\n" .
+ '$quarantine = 0; //set to 1 to move new files found to the quarantine directory' . "\n" .
+ '$to = \'' . $_POST['EMAIL_ADMIN'] . '\'; //where email is sent to' . "\n" .
+ '$from = \'From: webmestre' . $this->cookie_domain . '\'; //where email is sent from' . "\n" .
+ '$start_dir = \'' . $this->fs_document_root . '\'; //your shops root' . "\n" .
+ '$admin_dir = \'' . $this->fs_document_root . $this->ws_admin_rand . '\'; //your shops admin' . "\n" .
+ '$admin_username = \'username\'; //your admin username' . "\n" .
+ '$admin_password = \'password\'; //your admin password' . "\n" .
+ '$excludeList = array("b2.0.9k/osCSS-2/admin177/quarantine", "admin/quarantine", "cgi-bin","admin"); //don\'t check these directories - change to your liking - must be set prior to first run' . "\n" .
+ ' ?>';
- $fp = fopen($this->fs_document_root . '.htaccess', 'w');
- fputs($fp, $file_contents);
- fclose($fp);
-
+ $fp = fopen($this->fs_document_root . $this->ws_admin_rand . '/includes/sitemonitor_configure.php', 'w');
+ fputs($fp, $file_contents);
+ fclose($fp);
}
- else return false;
- }
+ /**
+ @package oscss-2 <www http://www.oscss.org>
+ @author oscim - OscssTeam
+ @version 2.0
+ @note Appel de function. ou de class
+ */
+ private function tep_call_function($function, $parameter, $object = '') {
+ $this->get_db_conf();
+ osc_db_connect($this->db['DBMOTOR'], $this->db['DBMOTOR_PORT'], $this->db['DBMOTOR_CHARSET'], $this->db['DB_SERVER'], $this->db['DB_SERVER_USERNAME'], $this->db['DB_SERVER_PASSWORD'], strtolower($this->db['DBMOTOR_TYPE']));
- /**
- Installation fichier suplementaires
- */
- private function install_extents(){
+ osc_db_select_db($this->db['DB_DATABASE']);
+ if (is_string($object) && $object == '')
+ return call_user_func($function, $parameter);
+ else
+ return call_user_func(array($object, $function), $parameter);
+ }
- $file='includes/tables_files_modules.php';
- $res=file_get_contents(self::$modele_path.'tables_files_modules.txt');
+ private function recup_db_conf_plus() {
+ $this->get_db_conf();
+ osc_db_connect($this->db['DBMOTOR'], $this->db['DBMOTOR_PORT'], $this->db['DBMOTOR_CHARSET'], $this->db['DB_SERVER'], $this->db['DB_SERVER_USERNAME'], $this->db['DB_SERVER_PASSWORD'], strtolower($this->db['DBMOTOR_TYPE']));
- $file_contents = '<?php' ."\n";
- $file_contents .=str_replace(self::$c_k, self::$c_v ,$res);
- $file_contents .= "\n".'?>';
+ osc_db_select_db($this->db['DB_DATABASE']);
+ $configuration_query = osc_db_query("select * from " . TABLE_CONFIGURATION . " where configuration_key in ('STORE_COUNTRY','STORE_OWNER','SHIPPING_ORIGIN_COUNTRY','SHIPPING_ORIGIN_ZIP','SMTP_MAIL_SERVER') order by sort_order");
- $fp = fopen($this->fs_document_root .$this->ws_admin_rand.'/'.$file, 'w');
- fputs($fp, $file_contents);
- fclose($fp);
+ $list_edit = array();
+ while ($configuration = tep_db_fetch_array($configuration_query)) {
+ if (!empty($configuration['use_function'])) {
+ $use_function = $configuration['use_function'];
+ if (preg_match('/->/', $use_function)) {
+ $class_method = explode('->', $use_function);
+ if (!is_object(${$class_method[0]})) {
+ include($this->fs_document_root . $this->ws_admin_rand . '/includes/classes/' . $class_method[0] . '.php');
+ ${$class_method[0]} = new $class_method[0]();
+ }
+ $cfgValue = $this->tep_call_function($class_method[1], $configuration['configuration_value'], ${$class_method[0]});
+ } else {
+ $cfgValue = $this->tep_call_function($use_function, $configuration['configuration_value']);
+ }
+ } else {
+ $cfgValue = $configuration['configuration_value'];
+ }
- $fp = fopen($this->fs_document_root .'/'.$file, 'w');
- fputs($fp, $file_contents);
- fclose($fp);
- }
+ if ($configuration['set_function'])
+ eval($s[] = '$value_field = ' . $configuration['set_function'] . '"' . htmlspecialchars($configuration['configuration_value']) . '","' . $configuration['configuration_key'] . '");');
+ else
+ $value_field = osc_draw_input_field('configuration[' . $configuration['configuration_key'] . ']', '', $configuration['configuration_value']);
+ $configuration['cfgValue'] = $cfgValue;
+ $configuration['value_field'] = $value_field;
- /**
- Config site_monitor
- */
- public function install_sitemonitor(){
- //! config site_monitor
- $file_contents =
- '<?php' . "\n" .
- '/************** THE OPTIONS AND SETTINGS ****************/' . "\n" .
- '$always_email = 1; //set to 1 to always email the results' . "\n" .
- '$verbose = 1; //set to 1 to see the results displayed on the page (for when running manually)' . "\n" .
- '$logfile = 1; //set to 1 to see to track results in a log file' . "\n" .
- '$logfile_size = 100000; //set the maximum size of the logfile' . "\n" .
- '$reference_reset = 0; //delete the reference file this many days apart' . "\n" .
- '$quarantine = 0; //set to 1 to move new files found to the quarantine directory' . "\n" .
- '$to = \''.$_POST['EMAIL_ADMIN'].'\'; //where email is sent to' . "\n" .
- '$from = \'From: webmestre'.$this->cookie_domain .'\'; //where email is sent from' . "\n" .
- '$start_dir = \''.$this->fs_document_root .'\'; //your shops root' . "\n" .
- '$admin_dir = \''.$this->fs_document_root .$this->ws_admin_rand.'\'; //your shops admin' . "\n" .
- '$admin_username = \'username\'; //your admin username' . "\n" .
- '$admin_password = \'password\'; //your admin password' . "\n" .
- '$excludeList = array("b2.0.9k/osCSS-2/admin177/quarantine", "admin/quarantine", "cgi-bin","admin"); //don\'t check these directories - change to your liking - must be set prior to first run' . "\n" .
- ' ?>' ;
+ $list_edit[] = $configuration;
+ }
- $fp = fopen($this->fs_document_root .$this->ws_admin_rand.'/includes/sitemonitor_configure.php', 'w');
- fputs($fp, $file_contents);
- fclose($fp);
- }
- /**
- @package oscss-2 <www http://www.oscss.org>
- @author oscim - OscssTeam
- @version 2.0
- @note Appel de function. ou de class
- */
- private function tep_call_function($function, $parameter, $object = '') {
- $this->get_db_conf();
- osc_db_connect($this->db['DBMOTOR'], $this->db['DBMOTOR_PORT'],$this->db['DBMOTOR_CHARSET'],$this->db['DB_SERVER'], $this->db['DB_SERVER_USERNAME'], $this->db['DB_SERVER_PASSWORD'],strtolower( $this->db['DBMOTOR_TYPE']) );
+ return $list_edit;
+ }
- osc_db_select_db($this->db['DB_DATABASE']);
- if (is_string($object) && $object == '') return call_user_func($function, $parameter);
- else return call_user_func(array($object, $function), $parameter);
- }
+ /**
+ Callback
+ */
+ public function exe_prev() {
+ $this->get_fs_document_root();
+ $this->get_server_conf();
+ $this->get_db_conf();
+ if (!defined('DB_TABLE_PREFIX'))
+ define('DB_TABLE_PREFIX', $this->db['DB_TABLE_PREFIX']);
+ if (!defined('DIR_WS_MODULES'))
+ define('DIR_WS_MODULES', $this->fs_document_root . $this->ws_admin_rand . '/includes/modules/');
- private function recup_db_conf_plus(){
- $this->get_db_conf();
- osc_db_connect($this->db['DBMOTOR'], $this->db['DBMOTOR_PORT'],$this->db['DBMOTOR_CHARSET'],$this->db['DB_SERVER'], $this->db['DB_SERVER_USERNAME'], $this->db['DB_SERVER_PASSWORD'],strtolower( $this->db['DBMOTOR_TYPE']) );
+// error_reporting(0);
+ include($this->fs_document_root . $this->ws_admin_rand . '/includes/database_tables.php');
+ osc_db_connect($this->db['DBMOTOR'], $this->db['DBMOTOR_PORT'], $this->db['DBMOTOR_CHARSET'], $this->db['DB_SERVER'], $this->db['DB_SERVER_USERNAME'], $this->db['DB_SERVER_PASSWORD'], strtolower($this->db['DBMOTOR_TYPE']));
- osc_db_select_db($this->db['DB_DATABASE']);
- $configuration_query = osc_db_query("select * from ".TABLE_CONFIGURATION." where configuration_key in ('STORE_COUNTRY','STORE_OWNER','SHIPPING_ORIGIN_COUNTRY','SHIPPING_ORIGIN_ZIP','SMTP_MAIL_SERVER') order by sort_order");
+ osc_db_select_db($this->db['DB_DATABASE']);
- $list_edit=array();
- while ($configuration = tep_db_fetch_array($configuration_query)) {
- if (!empty($configuration['use_function'])) {
- $use_function = $configuration['use_function'];
- if (preg_match('/->/', $use_function)) {
- $class_method = explode('->', $use_function);
- if (!is_object(${$class_method[0]})) {
- include($this->fs_document_root.$this->ws_admin_rand.'/includes/classes/'. $class_method[0] . '.php');
- ${$class_method[0]} = new $class_method[0]();
- }
- $cfgValue = $this->tep_call_function($class_method[1], $configuration['configuration_value'], ${$class_method[0]});
- } else {
- $cfgValue = $this->tep_call_function($use_function, $configuration['configuration_value']);
- }
- } else {
- $cfgValue = $configuration['configuration_value'];
- }
+// $this->install_sitemonitor();
- if ($configuration['set_function']) eval($s[]='$value_field = ' . $configuration['set_function'] . '"' . htmlspecialchars($configuration['configuration_value']) . '","'.$configuration['configuration_key'].'");');
- else $value_field = osc_draw_input_field('configuration['.$configuration['configuration_key'].']', '',$configuration['configuration_value']);
- $configuration['cfgValue']=$cfgValue;
- $configuration['value_field']=$value_field;
- $list_edit[]=$configuration;
- }
+ /**
+ Config base
+ */
+ osc_db_query($sql = "update " . TABLE_ADMIN . " set admin_email_address='" . $_POST['EMAIL_ADMIN'] . "' where admin_id='1'");
+ osc_db_query($sql = "update " . TABLE_CONFIGURATION . " set configuration_value='" . $_POST['EMAIL_ADMIN'] . "' where configuration_key='STORE_OWNER_EMAIL_ADDRESS'");
+ osc_db_query($sql = "update " . TABLE_CONFIGURATION . " set configuration_value='" . $_POST['EMAIL_ADMIN'] . "' where configuration_key='EMAIL_FROM'");
- return $list_edit;
- }
+ osc_db_query($sql = "update " . TABLE_CONFIGURATION . " set configuration_value='" . $_POST['STORE_NAME'] . "' where configuration_key='STORE_NAME'");
- /**
- Callback
- */
- public function exe_prev(){
- $this->get_fs_document_root();
- $this->get_server_conf();
- $this->get_db_conf();
- if(!defined('DB_TABLE_PREFIX') )
- define('DB_TABLE_PREFIX', $this->db['DB_TABLE_PREFIX']);
- if(!defined('DIR_WS_MODULES') )
- define('DIR_WS_MODULES', $this->fs_document_root.$this->ws_admin_rand.'/includes/modules/');
-
-// error_reporting(0);
- include($this->fs_document_root.$this->ws_admin_rand.'/includes/database_tables.php');
- osc_db_connect($this->db['DBMOTOR'], $this->db['DBMOTOR_PORT'],$this->db['DBMOTOR_CHARSET'],$this->db['DB_SERVER'], $this->db['DB_SERVER_USERNAME'], $this->db['DB_SERVER_PASSWORD'],strtolower( $this->db['DBMOTOR_TYPE']) );
- osc_db_select_db($this->db['DB_DATABASE']);
+ /**
+ Config avancé
+ */
+ if (is_array($_POST['configuration']))
+ foreach ($_POST['configuration'] as $key => $cfg) {
+ $configuration_value = tep_db_prepare_input($_POST['configuration'][$key]);
+ tep_db_query($sql = "update " . TABLE_CONFIGURATION . " set configuration_value = '" . tep_db_input($configuration_value) . "', last_modified = now() where configuration_key = '" . $key . "'");
+ }
-// $this->install_sitemonitor();
+ /*
+ @remarsk Langue supplementaire
+ execution dans etape suivante
+ */
- /**
- Config base
- */
- osc_db_query($sql="update ".TABLE_ADMIN." set admin_email_address='".$_POST['EMAIL_ADMIN']."' where admin_id='1'" );
- osc_db_query($sql="update ".TABLE_CONFIGURATION." set configuration_value='".$_POST['EMAIL_ADMIN']."' where configuration_key='STORE_OWNER_EMAIL_ADDRESS'" );
- osc_db_query($sql="update ".TABLE_CONFIGURATION." set configuration_value='".$_POST['EMAIL_ADMIN']."' where configuration_key='EMAIL_FROM'" );
- osc_db_query($sql="update ".TABLE_CONFIGURATION." set configuration_value='".$_POST['STORE_NAME']."' where configuration_key='STORE_NAME'" );
+ /*
+ @remarsk Email admin send for process finish
+ */
+ if ($this->GetConfig('email') === true) {
+ $headers = 'From: webmaster@' . $this->cookie_domain . "\r\n" .
+ 'Reply-To: webmaster@' . $this->cookie_domain . "\r\n" .
+ 'X-Mailer: PHP/' . phpversion();
+ if (file_exists('includes/language/' . $langue['file'] . '/email_install.html')) {
+ // headers for html
+ $headers .= "MIME-Version: 1.0\r\n";
+ $headers .= "Content-Type: text/html; charset=ISO-8859-1\r\n";
+ // load mail sample from lang dir
+ $message = file_get_contents('includes/language/' . $langue['file'] . '/email_install.html');
+ // build list of key to replace
+ $parmeters = array();
+ $parmeters['FO_URL'] = $_POST['HTTP_WWW_ADDRESS'];
+ $parmeters['BO_URL'] = $_POST['HTTP_WWW_ADDRESS'] . $this->ws_admin_rand;
+ $parmeters['PASSWORD'] = 'admin';
+ $message = $this->inject_data_from_array($message, $parmeters);
+ } else {
+ $message = core::l10n("Votre nouvelle boutique osCSS est maintenant installé. ") . "\n"
+ . core::l10n("Vos accès à votre espace privé de gestion sont:") . "\n"
+ . $_POST['HTTP_WWW_ADDRESS'] . $this->ws_admin_rand . "/ \n"
+ . core::l10n(" Votre mot de passe ") . " admin \n";
+ }
+ if (!@mail($_POST['EMAIL_ADMIN'], core::l10n("Votre nouveau osCSS-2"), $message, $headers))
+ $this->PileMessage('alert', core::l10n("L'Email n'a pas été envoyé !"), array(explode("\n", $message)));
+ else
+ $this->PileMessage('succes', core::l10n("L'Email a été envoyé à " . $_POST['EMAIL_ADMIN']), array(explode("\n", $message)));
+ }
+ }
- /**
- Config avancé
- */
- if(is_array($_POST['configuration'] ))
- foreach($_POST['configuration'] as $key=>$cfg){
- $configuration_value = tep_db_prepare_input($_POST['configuration'][$key]);
- tep_db_query($sql="update " . TABLE_CONFIGURATION . " set configuration_value = '" . tep_db_input($configuration_value) . "', last_modified = now() where configuration_key = '" . $key. "'");
- }
-
/*
- @remarsk Langue supplementaire
- execution dans etape suivante
- */
+ @remarsk Email admin send for process finish
+ */
+ function inject_data_from_array($subject, $array = array()) {
+ foreach ($array as $key => $value) {
+ $subject = str_replace("[[$key]]", $value, $subject);
+ }
+ return $subject;
+ }
+ /**
+ Form d'etape
+ */
+ function draw_form() {
+ $this->writeMessage();
+ echo '<form id="install" action="?language=' . DC_LOADER_LANG . '&etape=' . $this->get_current_etape(1) . '" method="post">' . "\n";
+ $this->repet_post();
+ echo osc_draw_hidden_field('FS_ROOT_DOCS', '', $_POST['FS_ROOT_DOCS']);
- /*
- @remarsk Email admin send for process finish
- */
- if($this->GetConfig('email') === true ){
- $headers = 'From: webmaster@'. $this->cookie_domain. "\r\n" .
- 'Reply-To: webmaster@'.$this->cookie_domain . "\r\n" .
- 'X-Mailer: PHP/' . phpversion();
+ echo '<h3>' . core::l10n("Obligatoire") . '</h3>' . "\n";
- $message =core::l10n("Votre nouvelle boutique osCSS est maintenant installé. ")."\n"
- .core::l10n("Vos accès à votre espace privé de gestion sont:")."\n"
- .$_POST['HTTP_WWW_ADDRESS'].$this->ws_admin_rand."/ \n"
- .core::l10n(" Votre mot de passe ")." admin \n";
+ echo '<p class="smallDesc">' . "\n"
+ . '<label>' . core::l10n('Adresse email administrateur:') . '</label>' . "\n"
+ . osc_draw_input_field('EMAIL_ADMIN')
+ . core::draw_help('EmailAdminSD', core::l10n("L'adresse Email de l'administrateur")/* , core::l10n("L'adresse en ligne du magasin, comme par exemple <em>http://www.my-server.com/catalog/</em>") */) . "\n"
+ . '</p>' . "\n";
- if(!@mail($_POST['EMAIL_ADMIN'],core::l10n("Votre nouveau osCSS-2"),$message, $headers )) $this->PileMessage('alert', core::l10n("L'Email n'a pas été envoyé !") , array(explode("\n",$message))) ;
- else $this->PileMessage('succes', core::l10n("L'Email a été envoyé à ".$_POST['EMAIL_ADMIN'] ) , array(explode("\n",$message))) ;
- }
- }
- /**
- Form d'etape
- */
- function draw_form(){
- $this->writeMessage();
- echo '<form id="install" action="?language='.DC_LOADER_LANG.'&etape='.$this->get_current_etape(1).'" method="post">'."\n";
- $this->repet_post();
- echo osc_draw_hidden_field('FS_ROOT_DOCS', '',$_POST['FS_ROOT_DOCS']);
+ echo '<h3>' . core::l10n("Langue(s) supplementaire(s)") . '</h3>' . "\n";
+ echo '<ul>';
+ foreach (core::browse_rep('data/language/') as $langue) {
+ echo '<li>'
+ . '<label><img src="data/language/' . $langue['file'] . '/public/' . $langue['file'] . '/images/icon.gif" /> ' . core::l10n("Ajouter la langue " . $langue['file']) . '</label>' . "\n"
+ . osc_draw_checkbox_field('lang[' . $langue['file'] . ']') . core::l10n(" Coté boutique");
+ if (file_exists('data/language/' . $langue['file'] . '/admin/' . $langue['file']))
+ echo osc_draw_checkbox_field('lang_admin[' . $langue['file'] . ']') . core::l10n(" Espace Privé admin");
+ echo ' </li>';
+ }
+ echo '</ul><br />';
- echo '<h3>'.core::l10n("Obligatoire").'</h3>'."\n";
+ echo '<h3>' . core::l10n("Optionnel, vous pouvez le régler plus tard") . '</h3>' . "\n";
- echo '<p class="smallDesc">'."\n"
- .'<label>'.core::l10n('Adresse email administrateur:').'</label>'."\n"
- .osc_draw_input_field('EMAIL_ADMIN')
- .core::draw_help('EmailAdminSD', core::l10n("L'adresse Email de l'administrateur")/*, core::l10n("L'adresse en ligne du magasin, comme par exemple <em>http://www.my-server.com/catalog/</em>")*/)."\n"
- .'</p>'."\n";
+ echo '<p class="smallDesc">' . "\n"
+ . '<label>' . core::l10n('Nom de la boutique:') . '</label>' . "\n"
+ . osc_draw_input_field('STORE_NAME', '', 'osCSS-2 demo shop') . "\n"
+ . core::draw_help('StoreName', core::l10n("Le nom du site, nom utilisé pour les Emails, les contact... ")/* , core::l10n("Le nom de la boutique") */) . "\n"
+ . '</p>' . "\n";
+ foreach ($this->recup_db_conf_plus() as $configuration) {
+ echo '<p class="smallDesc">' . "\n"
+ . '<label>' . core::l10n($configuration['configuration_title']) . '</label>' . "\n"
+ . $configuration['value_field']
+ . core::draw_help($configuration['configuration_key'], core::l10n($configuration['configuration_description'])) . "\n"
+ . '</p>' . "\n";
+ }
- echo '<h3>'.core::l10n("Langue(s) supplementaire(s)").'</h3>'."\n";
-
- echo '<ul>';
- foreach(core::browse_rep('data/language/') as $langue){
- echo '<li>'
- .'<label><img src="data/language/'.$langue['file'].'/public/'.$langue['file'].'/images/icon.gif" /> '.core::l10n("Ajouter la langue ".$langue['file']).'</label>'."\n"
- .osc_draw_checkbox_field('lang['.$langue['file'].']').core::l10n(" Coté boutique");
- if(file_exists('data/language/'.$langue['file'].'/admin/'.$langue['file']))echo osc_draw_checkbox_field('lang_admin['.$langue['file'].']').core::l10n(" Espace Privé admin");
- echo ' </li>';
+ echo $this->draw_button(true);
+ echo '</form>' . "\n";
}
- echo '</ul><br />';
- echo '<h3>'.core::l10n("Optionnel, vous pouvez le régler plus tard").'</h3>'."\n";
+ /**
+ Js control
+ */
+ private static function jscontrol() {
+ ?>
+ <script type="text/javascript"><!--
+ $().ready(function () {
+ // Validation de formulaire avec jquery.validate
+ $("#install").validate({
+ rules: {
+ EMAIL_ADMIN: {
+ required: true,
+ email: true,
+ },
+ errorElement: "span",
+ errorPlacement: function (error, element) {
+ error.appendTo(element.parent());
+ },
+ onkeyup: true
+ },
+ });
+ });
+ //--></script>
+ <?php
- echo '<p class="smallDesc">'."\n"
- .'<label>'.core::l10n('Nom de la boutique:').'</label>'."\n"
- .osc_draw_input_field('STORE_NAME', '','osCSS-2 demo shop')."\n"
- .core::draw_help('StoreName', core::l10n("Le nom du site, nom utilisé pour les Emails, les contact... ")/*, core::l10n("Le nom de la boutique")*/)."\n"
- .'</p>'."\n";
-
- foreach($this->recup_db_conf_plus() as $configuration) {
- echo '<p class="smallDesc">'."\n"
- .'<label>'.core::l10n($configuration['configuration_title']).'</label>'."\n"
- .$configuration['value_field']
- .core::draw_help($configuration['configuration_key'], core::l10n($configuration['configuration_description']))."\n"
- .'</p>'."\n";
}
- echo $this->draw_button(true);
- echo '</form>'."\n";
- }
+ public function preload() {
+ //! recup conf
+ $this->get_fs_document_root();
+ $this->get_server_conf();
+ $this->get_db_conf();
- /**
- Js control
- */
- private static function jscontrol(){
- ?>
- <script type="text/javascript"><!--
- $().ready(function() {
- // Validation de formulaire avec jquery.validate
- $("#install").validate({
- rules: {
- EMAIL_ADMIN: {
- required: true,
- email: true,
- },
- errorElement: "span",
- errorPlacement: function(error, element) {
- error.appendTo( element.parent());
- },
- onkeyup: true
- },
- });
- });
- //--></script>
- <?php
- }
-
- public function preload(){
- //! recup conf
- $this->get_fs_document_root();
- $this->get_server_conf();
- $this->get_db_conf();
+ if (file_exists($this->fs_document_root . 'admin'))
+ rename($this->fs_document_root . 'admin', $this->fs_document_root . $this->ws_admin_rand);
+ if (!defined('TABLE_CONFIGURATION'))
+ define('TABLE_CONFIGURATION', $this->db['DB_TABLE_PREFIX'] . 'configuration');
+ if (!defined('TABLE_COUNTRIES'))
+ define('TABLE_COUNTRIES', $this->db['DB_TABLE_PREFIX'] . 'countries');
- if(file_exists($this->fs_document_root.'admin')) rename($this->fs_document_root.'admin',$this->fs_document_root.$this->ws_admin_rand);
+ //! dependance
+ require_once($this->fs_document_root . $this->ws_admin_rand . '/includes/functions/lib.configuration.php');
- if(!defined('TABLE_CONFIGURATION'))
- define('TABLE_CONFIGURATION', $this->db['DB_TABLE_PREFIX'].'configuration');
- if(!defined('TABLE_COUNTRIES'))
- define('TABLE_COUNTRIES', $this->db['DB_TABLE_PREFIX'].'countries');
- //! dependance
- require_once($this->fs_document_root.$this->ws_admin_rand.'/includes/functions/lib.configuration.php');
+ $this->AdjustConf();
- $this->AdjustConf();
+ //! ecriture des fichier de conf
+ $this->install_base_conf();
+ $this->install_rewrite();
+ $this->install_extents();
+ }
+ function draw() {
- //! ecriture des fichier de conf
- $this->install_base_conf();
- $this->install_rewrite();
- $this->install_extents();
- }
-
+ //! draw form etape
+ $this->draw_form();
- function draw(){
+ $this->jscontrol();
+ }
- //! draw form etape
- $this->draw_form();
-
- $this->jscontrol();
- }
}
-
?>
\ No newline at end of file
Added: trunk/catalog/install/includes/language/fr_FR/email_install.html
===================================================================
--- trunk/catalog/install/includes/language/fr_FR/email_install.html (rev 0)
+++ trunk/catalog/install/includes/language/fr_FR/email_install.html 2015-11-17 13:07:39 UTC (rev 5282)
@@ -0,0 +1,93 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional //EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+<head>
+<title></title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<style type="text/css">
+@import url(https://fonts.googleapis.com/css?family=Lobster+Two);
+@import url(https://fonts.googleapis.com/css?family=Open+Sans);
+.btn {
+ font-family: 'Lobster Two', cursive;
+ background-color: #ff9803;
+ color: #eeeeee;
+ display: inline-block;
+ font-weight: bold;
+ font-size: 1.4em;
+ padding: 5px 10px;
+ margin: 30px 10px 0 10px;
+ border: 1px solid #e88a03;
+ -moz-border-radius: 0.5em;
+ -webkit-border-radius: 0.5em;
+ -khtml-border-radius: 0.5em;
+ border-radius: 0.5em;
+ cursor: pointer;
+ text-decoration: none;
+}
+.btn:hover {
+ background-color: #ffae38;
+ color: white;
+ box-shadow: 0 0 15px #999;
+}
+h1, h2, h3 {
+ font-family: 'Lobster Two', cursive;
+}
+a {
+ text-decoration: none;
+}
+</style>
+</head>
+
+<body style="margin: 30px 0;padding: 0;min-width: 100%;background-color: #f5f7fa;color:#666666;font-family: 'Open Sans', sans-serif;">
+<table width="600" border="0" align="center" cellpadding="0" cellspacing="10" style="background-color:#ffffff;border:1px solid #eeeeee;border-radius: 10px;box-shadow: 0 0 1em #4f8ecb;">
+ <tr>
+ <td colspan="2"><img src="http://www.oscss.org/mail/logo.png" alt="osCSS" width="742" height="105" /></td>
+ </tr>
+ <tr>
+ <td colspan="2" align="center"><h1 style="color: #4f8ecb;">Votre nouvelle boutique est maintenant installée.</h1>
+ <p>Vos accès à votre e-commerce sont :</p></td>
+ </tr>
+ <tr>
+ <td colspan="2"><hr style="margin:20px 0 20px 0; padding: 0; border: none; border-top: medium dotted #999; color: #999; text-align: center;" /></td>
+ </tr>
+ <tr>
+ <td width="50%" align="center"><a href="[[FO_URL]]"><img src="http://www.oscss.org/mail/fo-mini.jpg" alt="Votre site" width="250" height="250" /></a></td>
+ <td width="50%" valign="top"><h2 style="color: #4f8ecb;text-align:center">Découvrez</h2>
+ <p>Notez bien, votre site est disponible à l'adresse :</p>
+ <p><a href="[[FO_URL]]">[[FO_URL]]</a> </p>
+ <p style="text-align:center;"><a href="[[FO_URL]]" class="btn">Acceder au site</a></p></td>
+ </tr>
+ <tr>
+ <td colspan="2"><hr style="margin:20px 0 20px 0; padding: 0; border: none; border-top: medium dotted #999; color: #999; text-align: center;" /></td>
+ </tr>
+ <tr>
+ <td width="50%" align="center"><a href="[[BO_URL]]"><img src="http://www.oscss.org/mail/bo-mini.jpg" alt="Votre site" width="250" height="250" /></a></td>
+ <td width="50%" valign="top"><h2 style="color: #4f8ecb;text-align:center">Publiez</h2>
+ <p>Votre accès à votre espace privé de gestion :</p>
+ <p><a href="[[BO_URL]]">[[BO_URL]]</a></p>
+ <p>Votre mot de passe par défaut : <strong>[[PASSWORD]]</strong><br />
+ (le login c'est l'email que vous avez fourni.)</p>
+ <p style="text-align:center;"><a href="[[BO_URL]]" class="btn">Acceder à mon espace privé</a></p></td>
+ </tr>
+ <tr>
+ <td colspan="2"><hr style="margin:20px 0 20px 0; padding: 0; border: none; border-top: medium dotted #999; color: #999; text-align: center;" />
+ <h2 style="color: #4f8ecb;text-align:center">Supportez osCSS ! </h2>
+ <p>Nous sommes interressez par tous
+ les retours d'expérience que vous pourrez nous donner. Notre objectif est d'améliorer les performances et les fonctionnalités d'osCSS en permanence.<strong> Ca vous coutes quelques minutes aujourd'hui mais ça vous fera gagner des heures demain, alors participez !</strong></p></td>
+ </tr>
+ <tr>
+ <td width="50%"><h3 style="color: #4f8ecb;text-align:center">Aidez-nous à promouvoir osCSS</h3>
+ <ul style="margin:0;padding:0;list-style:none;text-align:center;">
+ <li><a class="blank" href="https://plus.google.com/107698144587463763937/posts" target="_blank">Google+</a></li>
+ <li><a class="blank" href="https://facebook.com/oscss.org" target="_blank">Facebook</a></li>
+ <li><a class="blank" href="https://twitter.com/osCSS" target="_blank">Tweeter</a></li>
+ </ul></td>
+ <td width="50%"><h3 style="color: #4f8ecb;text-align:center">Participez au development</h3>
+ <ul style="margin:0;padding:0;list-style:none;text-align:center;">
+ <li><a class="blank" href="http://sourceforge.net/projects/oscss/" target="_blank">SourceForge</a></li>
+ <li><a class="blank" href="http://dev.oscss.org/" target="_blank">Remonter un bug</a></li>
+ <li><a class="blank" href="http://forums.oscss.org/" target="_blank">La communauté sur les forums</a></li>
+ </ul></td>
+ </tr>
+</table>
+</body>
+</html>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hom...@us...> - 2015-11-17 12:30:59
|
Revision: 5281
http://sourceforge.net/p/oscss/svn/5281
Author: homer8173
Date: 2015-11-17 12:30:56 +0000 (Tue, 17 Nov 2015)
Log Message:
-----------
New icons set for BO menu
Modified Paths:
--------------
trunk/catalog/admin/includes/boxes/002_admin.php
trunk/catalog/admin/includes/boxes/01_configuration.php
trunk/catalog/admin/includes/boxes/02_modules.php
trunk/catalog/admin/includes/boxes/04_tools.php
trunk/catalog/admin/includes/boxes/05_customers.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/functions/lib.configuration.php
trunk/catalog/admin/includes/template/oscss/stylesheet-1.css
Modified: trunk/catalog/admin/includes/boxes/002_admin.php
===================================================================
--- trunk/catalog/admin/includes/boxes/002_admin.php 2015-11-16 19:04:22 UTC (rev 5280)
+++ trunk/catalog/admin/includes/boxes/002_admin.php 2015-11-17 12:30:56 UTC (rev 5281)
@@ -1,4 +1,5 @@
<?php
+
/**
@licence GPL 2005-2013 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@@ -7,9 +8,9 @@
@date 28/12/11, 17:06
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
-*/
- $tabl_link[]= array(FILENAME_ADMINUSERS, 'BOX_ADMINISTRATOR_MEMBERS', 'members');
- $tabl_link[]= array(FILENAME_ADMINGROUP, 'BOX_ADMINISTRATOR_GROUPS', 'groups');
+ */
+$tabl_link[] = array(FILENAME_ADMINUSERS, 'BOX_ADMINISTRATOR_MEMBERS', 'members');
+$tabl_link[] = array(FILENAME_ADMINGROUP, 'BOX_ADMINISTRATOR_GROUPS', 'groups');
- $tabl_link[]= array(FILENAME_ADMINNOTIF.'?action=config', 'BOX_ADMIN_NOTIFICATIONS', 'groups');
+$tabl_link[] = array(FILENAME_ADMINNOTIF . '?action=config', 'BOX_ADMIN_NOTIFICATIONS', 'notifications');
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/boxes/01_configuration.php
===================================================================
--- trunk/catalog/admin/includes/boxes/01_configuration.php 2015-11-16 19:04:22 UTC (rev 5280)
+++ trunk/catalog/admin/includes/boxes/01_configuration.php 2015-11-17 12:30:56 UTC (rev 5281)
@@ -1,4 +1,5 @@
<?php
+
/**
@licence GPL 2005-2013 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@@ -7,65 +8,60 @@
@date 13/03/2012, 17:06
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
-*/
-
+ */
/* Construct menu based on table configuration_group */
- $_query = tep_db_query("SELECT configuration_group_id AS cgID, configuration_group_title AS cgTitle ,configuration_group_parentid AS gparentID, configuration_group_group_id as is_sub_menu from " . TABLE_CONFIGURATION_GROUP . " WHERE visible = 1 ORDER BY configuration_group_parentid ASC , sort_order ASC");
+$_query = tep_db_query("SELECT configuration_group_id AS cgID, configuration_group_title AS cgTitle ,configuration_group_parentid AS gparentID, configuration_group_group_id as is_sub_menu from " . TABLE_CONFIGURATION_GROUP . " WHERE visible = 1 ORDER BY configuration_group_parentid ASC , sort_order ASC");
- // construct structur and hierarchie
- foreach($_query->fetchAllAssoc() as $row){
- $trace[$row['cgID']] = $row['gparentID'];
- if ((int)$row['gparentID'] ==0)
- $tabl_link[$row['cgID']]= array(
- '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'],
- @$img['config_'.$row['cgID']]
- );
- }
+// construct structur and hierarchie
+foreach ($_query->fetchAllAssoc() as $row) {
+ $trace[$row['cgID']] = $row['gparentID'];
+ if ((int) $row['gparentID'] == 0)
+ $tabl_link[$row['cgID']] = array(
+ 'ss_menu',
+ $row['cgTitle'],
+ ' ' . $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'],
+ ' ' . $row['cgTitle'] . ' config_' . $row['cgID'],
+ @$img['config_' . $row['cgID']]
+ );
+ }
+}
- }
+// 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)
+ $tabl_link[$row['gparentID']][4][$row['cgID']] = array(
+ FILENAME_CONFIGURATION . '?gparentID=' . $row['gparentID'] . '&gID=' . $row['cgID'],
+ $row['cgTitle'],
+ ' ' . $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'],
+ ' ' . $row['cgTitle'] . ' config_' . $row['cgID'],
+ @$img['config_' . $row['cgID']]
+ );
+ }
+}
- // 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 )
- $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']]
- );
- 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']]
- );
-
- }
- }
-
-/* taxe et zone de taxe*/
- $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')
- )
- );
-
-
+/* taxe et zone de taxe */
+$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/02_modules.php
===================================================================
--- trunk/catalog/admin/includes/boxes/02_modules.php 2015-11-16 19:04:22 UTC (rev 5280)
+++ trunk/catalog/admin/includes/boxes/02_modules.php 2015-11-17 12:30:56 UTC (rev 5281)
@@ -1,4 +1,5 @@
<?php
+
/**
@licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@@ -7,9 +8,9 @@
@date 24/06/10, 10:25
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
-*/
- $tabl_link[]= array(FILENAME_PACKAGE, 'BOX_MODULES_INSTALLATEUR', 'appli_ext',@$img['appli_ext']);
- $tabl_link[]= array(FILENAME_MODULES, 'BOX_MODULES_PANEL', 'appli_ext',@$img['appli_ext']);
- $tabl_link[]= array(FILENAME_MODULES.'?manager=process', 'BOX_MODULES_CHECKOUT_PANEL', 'appli_ext',@$img['appli_ext']);
- $tabl_link[]= array('plugins.php', 'BOX_PLUGINS_PANEL', 'appli_ext',@$img['appli_ext']);
+ */
+$tabl_link[] = array(FILENAME_PACKAGE, 'BOX_MODULES_INSTALLATEUR', 'appli_ext1', @$img['appli_ext']);
+$tabl_link[] = array(FILENAME_MODULES, 'BOX_MODULES_PANEL', 'appli_ext2', @$img['appli_ext']);
+$tabl_link[] = array(FILENAME_MODULES . '?manager=process', 'BOX_MODULES_CHECKOUT_PANEL', 'appli_ext3', @$img['appli_ext']);
+$tabl_link[] = array('plugins.php', 'BOX_PLUGINS_PANEL', 'appli_ext4', @$img['appli_ext']);
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/boxes/04_tools.php
===================================================================
--- trunk/catalog/admin/includes/boxes/04_tools.php 2015-11-16 19:04:22 UTC (rev 5280)
+++ trunk/catalog/admin/includes/boxes/04_tools.php 2015-11-17 12:30:56 UTC (rev 5281)
@@ -1,4 +1,5 @@
<?php
+
/**
@licence GPL 2005-2013 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@@ -7,21 +8,19 @@
@date 03/04/2012, 22:06
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
-*/
- $tabl_link[]= array(FILENAME_RAPPORT, 'BOX_TOOLS_RAPPORT', 'stats',@$img['stats']);
+ */
+$tabl_link[] = array(FILENAME_RAPPORT, 'BOX_TOOLS_RAPPORT', 'stats', @$img['stats']);
- $tabl_link[]= array(FILENAME_GOOGLE_SITEMAP, 'BOX_TOOLS_GOOGLE_SITEMAP', 'ggmap',@$img['ggmap']);
- $tabl_link[]= array(FILENAME_FULL_TAG, 'BOX_TOOLS_HEADER_TAG', 'headertag',@$img['headertag']);
+$tabl_link[] = array(FILENAME_GOOGLE_SITEMAP, 'BOX_TOOLS_GOOGLE_SITEMAP', 'ggmap', @$img['ggmap']);
+$tabl_link[] = array(FILENAME_FULL_TAG, 'BOX_TOOLS_HEADER_TAG', 'headertag', @$img['headertag']);
- $tabl_link[]= array(FILENAME_NAVIGATION_LINKS, 'BOX_NAVIGATION_LINK', 'nav',@$img['navigation_link']);
+$tabl_link[] = array(FILENAME_NAVIGATION_LINKS, 'BOX_NAVIGATION_LINK', 'nav', @$img['navigation_link']);
- $tabl_link[608]= array('ss_menu', 'BOX_TOOLS_SYSTEM', 'system',@$img['system']);
- $tabl_link[608][4][]= array(FILENAME_BACKUP, 'BOX_TOOLS_BACKUP', 'database',@$img['database']);
- $tabl_link[608][4][]= array(FILENAME_CONFIGURATION.'?gmod=modcorecache', 'BOX_TOOLS_CACHE', 'cache');
- $tabl_link[608][4][]= array(FILENAME_CONFIGURATION.'?gmod=modsysinfo', 'BOX_TOOLS_SERVER_INFO', 'server_info');
- $tabl_link[608][4][]= array(FILENAME_CURRENCIES, 'BOX_LOCALIZATION_CURRENCIES', 'currencies');
- $tabl_link[608][4][]= array(FILENAME_CRONJOB, 'BOX_TOOLS_CRONJOB', 'database',@$img['database']);
-
-
+$tabl_link[608] = array('ss_menu', 'BOX_TOOLS_SYSTEM', 'system', @$img['system']);
+$tabl_link[608][4][] = array(FILENAME_BACKUP, 'BOX_TOOLS_BACKUP', 'database', @$img['database']);
+$tabl_link[608][4][] = array(FILENAME_CONFIGURATION . '?gmod=modcorecache', 'BOX_TOOLS_CACHE', 'cache');
+$tabl_link[608][4][] = array(FILENAME_CONFIGURATION . '?gmod=modsysinfo', 'BOX_TOOLS_SERVER_INFO', 'server_info');
+$tabl_link[608][4][] = array(FILENAME_CURRENCIES, 'BOX_LOCALIZATION_CURRENCIES', 'currencies');
+$tabl_link[608][4][] = array(FILENAME_CRONJOB, 'BOX_TOOLS_CRONJOB', 'cronjob', @$img['database']);
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/boxes/05_customers.php
===================================================================
--- trunk/catalog/admin/includes/boxes/05_customers.php 2015-11-16 19:04:22 UTC (rev 5280)
+++ trunk/catalog/admin/includes/boxes/05_customers.php 2015-11-17 12:30:56 UTC (rev 5281)
@@ -1,4 +1,5 @@
<?php
+
/**
@licence GPL 2005-2013 The osCSS developers - osCSS Open Source E-commerce
@package osCSS-2 <www http://www.oscss.org>
@@ -6,7 +7,7 @@
@date 03/03/2012, 17:23
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
-*/
- $tabl_link[]= array(FILENAME_CUSTOMERS, 'BOX_CUSTOMERS_CUSTOMERS', 'membres',@$img['suppliers']);
- $tabl_link[]= array(FILENAME_CUSTOMERS.'?action=new', 'BOX_CUSTOMERS_CUSTOMERS_ADD_NEW', 'membres',@$img['suppliers']);
+ */
+$tabl_link[] = array(FILENAME_CUSTOMERS, 'BOX_CUSTOMERS_CUSTOMERS', 'membres', @$img['suppliers']);
+$tabl_link[] = array(FILENAME_CUSTOMERS . '?action=new', 'BOX_CUSTOMERS_CUSTOMERS_ADD_NEW', 'membres_add', @$img['suppliers']);
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/boxes/07_catalog.php
===================================================================
--- trunk/catalog/admin/includes/boxes/07_catalog.php 2015-11-16 19:04:22 UTC (rev 5280)
+++ trunk/catalog/admin/includes/boxes/07_catalog.php 2015-11-17 12:30:56 UTC (rev 5281)
@@ -1,4 +1,5 @@
<?php
+
/**
@licence GPL 2005-2013 The osCSS developers - osCSS Open Source E-commerce
@package osCSS-2 <www http://www.oscss.org>
@@ -6,17 +7,16 @@
@date 03/03/2012, 17:23
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
-*/
- //! @remarks depend Data_product active
- if( ! DataTypes::is_active('product'))
- return false;
+ */
+//! @remarks depend Data_product active
+if (!DataTypes::is_active('product'))
+ return false;
- $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_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', 'product_wait', @$img['products']);
+$tabl_link[] = array(FILENAME_ATTRIBUTES, 'BOX_CATALOG_ATTIBUTES', 'attributes', @$img['attributes']);
- if(_cst_bool('STOCK_CHECK'))
- $tabl_link[]= array(FILENAME_STOCK, 'BOX_CATALOG_STOCK', 'stock', @$img['stock']);
-
+if (_cst_bool('STOCK_CHECK'))
+ $tabl_link[] = array(FILENAME_STOCK, 'BOX_CATALOG_STOCK', 'stock', @$img['stock']);
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/boxes/08_cms.php
===================================================================
--- trunk/catalog/admin/includes/boxes/08_cms.php 2015-11-16 19:04:22 UTC (rev 5280)
+++ trunk/catalog/admin/includes/boxes/08_cms.php 2015-11-17 12:30:56 UTC (rev 5281)
@@ -1,4 +1,5 @@
<?php
+
/**
@licence GPL 2005-2013 The osCSS developers - osCSS Open Source E-commerce
@package osCSS-2 <www http://www.oscss.org>
@@ -6,23 +7,22 @@
@date 03/03/2012, 17:23
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
-*/
- if( DataTypes::is_active('categorie'))
- $tabl_link[]= array(FILENAME_CATEGORIES, 'BOX_CATALOG_CATEGORIES', 'categories', @$img['categories']);
+ */
+if (DataTypes::is_active('categorie'))
+ $tabl_link[] = array(FILENAME_CATEGORIES, 'BOX_CATALOG_CATEGORIES', 'categories', @$img['categories']);
- if( DataTypes::is_active('content'))
- $tabl_link[]= array(FILENAME_CMS_CONTENT, 'BOX_CMS_CONTENT', 'cms_content',@$img['cms_content']);
+if (DataTypes::is_active('content'))
+ $tabl_link[] = array(FILENAME_CMS_CONTENT, 'BOX_CMS_CONTENT', 'cms_content', @$img['cms_content']);
- $tabl_link[] = array(
- 'ss_menu',
- 'BOX_NAVIGATION_DOCSANDIMAGE',
- 'docsandimage',
- @$img['docsandimage'],
- 4=> array(
- array('browser.php', 'BOX_NAVIGATION_IMAGE', 'images',@$img['image']),
- array('browser.php?type=file', 'BOX_NAVIGATION_DOCSFILES', 'docsfiles',@$img['docsfiles'])
- )
- );
-
+$tabl_link[] = array(
+ 'ss_menu',
+ 'BOX_NAVIGATION_DOCSANDIMAGE',
+ 'docsandimage',
+ @$img['docsandimage'],
+ 4 => array(
+ array('browser.php', 'BOX_NAVIGATION_IMAGE', 'images', @$img['image']),
+ array('browser.php?type=file', 'BOX_NAVIGATION_DOCSFILES', 'docsfiles', @$img['docsfiles'])
+ )
+);
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/boxes/09_commercial.php
===================================================================
--- trunk/catalog/admin/includes/boxes/09_commercial.php 2015-11-16 19:04:22 UTC (rev 5280)
+++ trunk/catalog/admin/includes/boxes/09_commercial.php 2015-11-17 12:30:56 UTC (rev 5281)
@@ -1,4 +1,5 @@
<?php
+
/**
@licence GPL 2005-2013 The osCSS developers - osCSS Open Source E-commerce
@package osCSS-2 <www http://www.oscss.org>
@@ -6,26 +7,24 @@
@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_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[] = 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']);
+$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']);
- if( DataTypes::is_active('featured'))
- $tabl_link[]= array(FILENAME_FEATURED, 'BOX_FEATURED', 'featured', @$img['featured']);
-
+if (DataTypes::is_active('featured'))
+ $tabl_link[] = array(FILENAME_FEATURED, 'BOX_FEATURED', 'featured', @$img['featured']);
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/boxes/10_orders.php
===================================================================
--- trunk/catalog/admin/includes/boxes/10_orders.php 2015-11-16 19:04:22 UTC (rev 5280)
+++ trunk/catalog/admin/includes/boxes/10_orders.php 2015-11-17 12:30:56 UTC (rev 5281)
@@ -1,4 +1,5 @@
<?php
+
/**
@licence GPL 2005-2013 The osCSS developers - osCSS Open Source E-commerce
@package osCSS-2 <www http://www.oscss.org>
@@ -6,51 +7,47 @@
@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_sm',
+ @$img['orders'],
+ 4 => array(
+ array(FILENAME_ORDERS . '?view=thisday', 'BOX_CUSTOMERS_ORDERS_THISDAY', 'orders_sm', @$img['orders']),
+ array(FILENAME_ORDERS . '?view=thisweek', 'BOX_CUSTOMERS_ORDERS_THISWEEK', 'orders_sm', @$img['orders']),
+ array(FILENAME_ORDERS . '?view=allnoclosed', 'BOX_CUSTOMERS_ORDERS_ALLNOCLOSED', 'orders_sm', @$img['orders']),
+ array(FILENAME_ORDERS . '?view=allclosed', 'BOX_CUSTOMERS_ORDERS_ALLCLOSED', 'orders_sm', @$img['orders']),
+ )
+);
- $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=thisweek', 'BOX_CUSTOMERS_ORDERS_THISWEEK', 'orders',@$img['orders']),
- array(FILENAME_ORDERS.'?view=allnoclosed', 'BOX_CUSTOMERS_ORDERS_ALLNOCLOSED', 'orders',@$img['orders']),
- array(FILENAME_ORDERS.'?view=allclosed', 'BOX_CUSTOMERS_ORDERS_ALLCLOSED', 'orders',@$img['orders']),
- )
- );
+if (_cst_bool('RMA_RETURN_PRODUCTS_STATUS'))
+ $tabl_link[] = array(FILENAME_RETURNS, 'BOX_RETURNS_HEADING', 'return', @$img['return']);
- 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',
+ 'shippings',
+ @$img['shippings'],
+ 4 => array(
+ array('shippings.php?view=opened', 'BOX_CUSTOMERS_SHIPPING_OPENNED', 'shippings', @$img['shippings']),
+ array('shippings.php?view=progress', 'BOX_CUSTOMERS_SHIPPING_PROGRESS', 'shippings', @$img['shippings']),
+ array('shippings.php?view=closed', 'BOX_CUSTOMERS_SHIPPING_CLOSE', 'shippings', @$img['shippings']),
+ )
+);
- $tabl_link[] = array(
- 'ss_menu',
- 'BOX_CUSTOMERS_SHIPPING',
- 'shippings',
- @$img['shippings'],
- 4=> array(
- array('shippings.php?view=opened', 'BOX_CUSTOMERS_SHIPPING_OPENNED', 'shippings',@$img['shippings']),
- array('shippings.php?view=progress', 'BOX_CUSTOMERS_SHIPPING_PROGRESS', 'shippings',@$img['shippings']),
- array('shippings.php?view=closed', 'BOX_CUSTOMERS_SHIPPING_CLOSE', 'shippings',@$img['shippings']),
- )
- );
-
- 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']),
- )
- );
-
- }
-
-
+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/functions/lib.configuration.php
===================================================================
--- trunk/catalog/admin/includes/functions/lib.configuration.php 2015-11-16 19:04:22 UTC (rev 5280)
+++ trunk/catalog/admin/includes/functions/lib.configuration.php 2015-11-17 12:30:56 UTC (rev 5281)
@@ -27,7 +27,7 @@
);
$link .=sprintf($format_line_ssmenu,
- '<a href="' . $href . '" class="menuBoxContentLink config'.$row['cgID'].'">' . tep_cst_menu_conf($row['cgTitle']) . '</a>'."\n"
+ '<a href="' . $href . '" class="menuBoxContentLink config_'.$row['cgID'].'">' . tep_cst_menu_conf($row['cgTitle']) . '</a>'."\n"
,$parent_id);
}
Modified: trunk/catalog/admin/includes/template/oscss/stylesheet-1.css
===================================================================
--- trunk/catalog/admin/includes/template/oscss/stylesheet-1.css 2015-11-16 19:04:22 UTC (rev 5280)
+++ trunk/catalog/admin/includes/template/oscss/stylesheet-1.css 2015-11-17 12:30:56 UTC (rev 5281)
@@ -8,6 +8,12 @@
* @encode UTF-8
*/
+/*!
+ * Font Awesome 4.4.0 by @davegandy - http://fontawesome.io - @fontawesome
+ * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
+ */@font-face{font-family:'FontAwesome';src:url('fonts/fontawesome-webfont.eot?v=4.4.0');src:url('fonts/fontawesome-webfont.eot?#iefix&v=4.4.0') format('embedded-opentype'),url('fonts/fontawesome-webfont.woff2?v=4.4.0') format('woff2'),url('fonts/fontawesome-webfont.woff?v=4.4.0') format('woff'),url('fonts/fontawesome-webfont.ttf?v=4.4.0') format('truetype'),url('fonts/fontawesome-webfont.svg?v=4.4.0#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.fa{display:inline-block;font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.33333333em;line-height:.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571429em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14285714em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.14285714em;width:2.14285714em;top:.14285714em;text-align:center}.fa-li.fa-lg{left:-1.85714286em}.fa-border{padding:.2em .25em .15em;border:solid .08em #eee;border-radius:.1em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left{margin-right:.3em}.fa.fa-pull-right{margin-left:.3em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left{margin-right:.3em}.fa.pull-right{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s infinite linear;animation:fa-spin 2s infinite linear}.fa-pulse{-webkit-animation:fa-spin 1s infinite steps(8);animation:fa-spin 1s infinite steps(8)}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);-webkit-transform:scale(-1, 1);-ms-transform:scale(-1, 1);transform:scale(-1, 1)}.fa-flip-vertical{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1);-webkit-transform:scale(1, -1);-ms-transform:scale(1, -1);transform:scale(1, -1)}:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-flip-horizontal,:root .fa-flip-vertical{filter:none}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:"\f000"}.fa-music:before{content:"\f001"}.fa-search:before{content:"\f002"}.fa-envelope-o:before{content:"\f003"}.fa-heart:before{content:"\f004"}.fa-star:before{content:"\f005"}.fa-star-o:before{content:"\f006"}.fa-user:before{content:"\f007"}.fa-film:before{content:"\f008"}.fa-th-large:before{content:"\f009"}.fa-th:before{content:"\f00a"}.fa-th-list:before{content:"\f00b"}.fa-check:before{content:"\f00c"}.fa-remove:before,.fa-close:before,.fa-times:before{content:"\f00d"}.fa-search-plus:before{content:"\f00e"}.fa-search-minus:before{content:"\f010"}.fa-power-off:before{content:"\f011"}.fa-signal:before{content:"\f012"}.fa-gear:before,.fa-cog:before{content:"\f013"}.fa-trash-o:before{content:"\f014"}.fa-home:before{content:"\f015"}.fa-file-o:before{content:"\f016"}.fa-clock-o:before{content:"\f017"}.fa-road:before{content:"\f018"}.fa-download:before{content:"\f019"}.fa-arrow-circle-o-down:before{content:"\f01a"}.fa-arrow-circle-o-up:before{content:"\f01b"}.fa-inbox:before{content:"\f01c"}.fa-play-circle-o:before{content:"\f01d"}.fa-rotate-right:before,.fa-repeat:before{content:"\f01e"}.fa-refresh:before{content:"\f021"}.fa-list-alt:before{content:"\f022"}.fa-lock:before{content:"\f023"}.fa-flag:before{content:"\f024"}.fa-headphones:before{content:"\f025"}.fa-volume-off:before{content:"\f026"}.fa-volume-down:before{content:"\f027"}.fa-volume-up:before{content:"\f028"}.fa-qrcode:before{content:"\f029"}.fa-barcode:before{content:"\f02a"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-book:before{content:"\f02d"}.fa-bookmark:before{content:"\f02e"}.fa-print:before{content:"\f02f"}.fa-camera:before{content:"\f030"}.fa-font:before{content:"\f031"}.fa-bold:before{content:"\f032"}.fa-italic:before{content:"\f033"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-align-left:before{content:"\f036"}.fa-align-center:before{content:"\f037"}.fa-align-right:before{content:"\f038"}.fa-align-justify:before{content:"\f039"}.fa-list:before{content:"\f03a"}.fa-dedent:before,.fa-outdent:before{content:"\f03b"}.fa-indent:before{content:"\f03c"}.fa-video-camera:before{content:"\f03d"}.fa-photo:before,.fa-image:before,.fa-picture-o:before{content:"\f03e"}.fa-pencil:before{content:"\f040"}.fa-map-marker:before{content:"\f041"}.fa-adjust:before{content:"\f042"}.fa-tint:before{content:"\f043"}.fa-edit:before,.fa-pencil-square-o:before{content:"\f044"}.fa-share-square-o:before{content:"\f045"}.fa-check-square-o:before{content:"\f046"}.fa-arrows:before{content:"\f047"}.fa-step-backward:before{content:"\f048"}.fa-fast-backward:before{content:"\f049"}.fa-backward:before{content:"\f04a"}.fa-play:before{content:"\f04b"}.fa-pause:before{content:"\f04c"}.fa-stop:before{content:"\f04d"}.fa-forward:before{content:"\f04e"}.fa-fast-forward:before{content:"\f050"}.fa-step-forward:before{content:"\f051"}.fa-eject:before{content:"\f052"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-plus-circle:before{content:"\f055"}.fa-minus-circle:before{content:"\f056"}.fa-times-circle:before{content:"\f057"}.fa-check-circle:before{content:"\f058"}.fa-question-circle:before{content:"\f059"}.fa-info-circle:before{content:"\f05a"}.fa-crosshairs:before{content:"\f05b"}.fa-times-circle-o:before{content:"\f05c"}.fa-check-circle-o:before{content:"\f05d"}.fa-ban:before{content:"\f05e"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrow-down:before{content:"\f063"}.fa-mail-forward:before,.fa-share:before{content:"\f064"}.fa-expand:before{content:"\f065"}.fa-compress:before{content:"\f066"}.fa-plus:before{content:"\f067"}.fa-minus:before{content:"\f068"}.fa-asterisk:before{content:"\f069"}.fa-exclamation-circle:before{content:"\f06a"}.fa-gift:before{content:"\f06b"}.fa-leaf:before{content:"\f06c"}.fa-fire:before{content:"\f06d"}.fa-eye:before{content:"\f06e"}.fa-eye-slash:before{content:"\f070"}.fa-warning:before,.fa-exclamation-triangle:before{content:"\f071"}.fa-plane:before{content:"\f072"}.fa-calendar:before{content:"\f073"}.fa-random:before{content:"\f074"}.fa-comment:before{content:"\f075"}.fa-magnet:before{content:"\f076"}.fa-chevron-up:before{content:"\f077"}.fa-chevron-down:before{content:"\f078"}.fa-retweet:before{content:"\f079"}.fa-shopping-cart:before{content:"\f07a"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-arrows-v:before{content:"\f07d"}.fa-arrows-h:before{content:"\f07e"}.fa-bar-chart-o:before,.fa-bar-chart:before{content:"\f080"}.fa-twitter-square:before{content:"\f081"}.fa-facebook-square:before{content:"\f082"}.fa-camera-retro:before{content:"\f083"}.fa-key:before{content:"\f084"}.fa-gears:before,.fa-cogs:before{content:"\f085"}.fa-comments:before{content:"\f086"}.fa-thumbs-o-up:before{content:"\f087"}.fa-thumbs-o-down:before{content:"\f088"}.fa-star-half:before{content:"\f089"}.fa-heart-o:before{content:"\f08a"}.fa-sign-out:before{content:"\f08b"}.fa-linkedin-square:before{content:"\f08c"}.fa-thumb-tack:before{content:"\f08d"}.fa-external-link:before{content:"\f08e"}.fa-sign-in:before{content:"\f090"}.fa-trophy:before{content:"\f091"}.fa-github-square:before{content:"\f092"}.fa-upload:before{content:"\f093"}.fa-lemon-o:before{content:"\f094"}.fa-phone:before{content:"\f095"}.fa-square-o:before{content:"\f096"}.fa-bookmark-o:before{content:"\f097"}.fa-phone-square:before{content:"\f098"}.fa-twitter:before{content:"\f099"}.fa-facebook-f:before,.fa-facebook:before{content:"\f09a"}.fa-github:before{content:"\f09b"}.fa-unlock:before{content:"\f09c"}.fa-credit-card:before{content:"\f09d"}.fa-feed:before,.fa-rss:before{content:"\f09e"}.fa-hdd-o:before{content:"\f0a0"}.fa-bullhorn:before{content:"\f0a1"}.fa-bell:before{content:"\f0f3"}.fa-certificate:before{content:"\f0a3"}.fa-hand-o-right:before{content:"\f0a4"}.fa-hand-o-left:before{content:"\f0a5"}.fa-hand-o-up:before{content:"\f0a6"}.fa-hand-o-down:before{content:"\f0a7"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-globe:before{content:"\f0ac"}.fa-wrench:before{content:"\f0ad"}.fa-tasks:before{content:"\f0ae"}.fa-filter:before{content:"\f0b0"}.fa-briefcase:before{content:"\f0b1"}.fa-arrows-alt:before{content:"\f0b2"}.fa-group:before,.fa-users:before{content:"\f0c0"}.fa-chain:before,.fa-link:before{content:"\f0c1"}.fa-cloud:before{content:"\f0c2"}.fa-flask:before{content:"\f0c3"}.fa-cut:before,.fa-scissors:before{content:"\f0c4"}.fa-copy:before,.fa-files-o:before{content:"\f0c5"}.fa-paperclip:before{content:"\f0c6"}.fa-save:before,.fa-floppy-o:before{content:"\f0c7"}.fa-square:before{content:"\f0c8"}.fa-navicon:before,.fa-reorder:before,.fa-bars:before{content:"\f0c9"}.fa-list-ul:before{content:"\f0ca"}.fa-list-ol:before{content:"\f0cb"}.fa-strikethrough:before{content:"\f0cc"}.fa-underline:before{content:"\f0cd"}.fa-table:before{content:"\f0ce"}.fa-magic:before{content:"\f0d0"}.fa-truck:before{content:"\f0d1"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-square:before{content:"\f0d3"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-plus:before{content:"\f0d5"}.fa-money:before{content:"\f0d6"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-columns:before{content:"\f0db"}.fa-unsorted:before,.fa-sort:before{content:"\f0dc"}.fa-sort-down:before,.fa-sort-desc:before{content:"\f0dd"}.fa-sort-up:before,.fa-sort-asc:before{content:"\f0de"}.fa-envelope:before{content:"\f0e0"}.fa-linkedin:before{content:"\f0e1"}.fa-rotate-left:before,.fa-undo:before{content:"\f0e2"}.fa-legal:before,.fa-gavel:before{content:"\f0e3"}.fa-dashboard:before,.fa-tachometer:before{content:"\f0e4"}.fa-comment-o:before{content:"\f0e5"}.fa-comments-o:before{content:"\f0e6"}.fa-flash:before,.fa-bolt:before{content:"\f0e7"}.fa-sitemap:before{content:"\f0e8"}.fa-umbrella:before{content:"\f0e9"}.fa-paste:before,.fa-clipboard:before{content:"\f0ea"}.fa-lightbulb-o:before{content:"\f0eb"}.fa-exchange:before{content:"\f0ec"}.fa-cloud-download:before{content:"\f0ed"}.fa-cloud-upload:before{content:"\f0ee"}.fa-user-md:before{content:"\f0f0"}.fa-stethoscope:before{content:"\f0f1"}.fa-suitcase:before{content:"\f0f2"}.fa-bell-o:before{content:"\f0a2"}.fa-coffee:before{content:"\f0f4"}.fa-cutlery:before{content:"\f0f5"}.fa-file-text-o:before{content:"\f0f6"}.fa-building-o:before{content:"\f0f7"}.fa-hospital-o:before{content:"\f0f8"}.fa-ambulance:before{content:"\f0f9"}.fa-medkit:before{content:"\f0fa"}.fa-fighter-jet:before{content:"\f0fb"}.fa-beer:before{content:"\f0fc"}.fa-h-square:before{content:"\f0fd"}.fa-plus-square:before{content:"\f0fe"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angle-down:before{content:"\f107"}.fa-desktop:before{content:"\f108"}.fa-laptop:before{content:"\f109"}.fa-tablet:before{content:"\f10a"}.fa-mobile-phone:before,.fa-mobile:before{content:"\f10b"}.fa-circle-o:before{content:"\f10c"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-spinner:before{content:"\f110"}.fa-circle:before{content:"\f111"}.fa-mail-reply:before,.fa-reply:before{content:"\f112"}.fa-github-alt:before{content:"\f113"}.fa-folder-o:before{content:"\f114"}.fa-folder-open-o:before{content:"\f115"}.fa-smile-o:before{content:"\f118"}.fa-frown-o:before{content:"\f119"}.fa-meh-o:before{content:"\f11a"}.fa-gamepad:before{content:"\f11b"}.fa-keyboard-o:before{content:"\f11c"}.fa-flag-o:before{content:"\f11d"}.fa-flag-checkered:before{content:"\f11e"}.fa-terminal:before{content:"\f120"}.fa-code:before{content:"\f121"}.fa-mail-reply-all:before,.fa-reply-all:before{content:"\f122"}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:"\f123"}.fa-location-arrow:before{content:"\f124"}.fa-crop:before{content:"\f125"}.fa-code-fork:before{content:"\f126"}.fa-unlink:before,.fa-chain-broken:before{content:"\f127"}.fa-question:before{content:"\f128"}.fa-info:before{content:"\f129"}.fa-exclamation:before{content:"\f12a"}.fa-superscript:before{content:"\f12b"}.fa-subscript:before{content:"\f12c"}.fa-eraser:before{content:"\f12d"}.fa-puzzle-piece:before{content:"\f12e"}.fa-microphone:before{content:"\f130"}.fa-microphone-slash:before{content:"\f131"}.fa-shield:before{content:"\f132"}.fa-calendar-o:before{content:"\f133"}.fa-fire-extinguisher:before{content:"\f134"}.fa-rocket:before{content:"\f135"}.fa-maxcdn:before{content:"\f136"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-html5:before{content:"\f13b"}.fa-css3:before{content:"\f13c"}.fa-anchor:before{content:"\f13d"}.fa-unlock-alt:before{content:"\f13e"}.fa-bullseye:before{content:"\f140"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-rss-square:before{content:"\f143"}.fa-play-circle:before{content:"\f144"}.fa-ticket:before{content:"\f145"}.fa-minus-square:before{content:"\f146"}.fa-minus-square-o:before{content:"\f147"}.fa-level-up:before{content:"\f148"}.fa-level-down:before{content:"\f149"}.fa-check-square:before{content:"\f14a"}.fa-pencil-square:before{content:"\f14b"}.fa-external-link-square:before{content:"\f14c"}.fa-share-square:before{content:"\f14d"}.fa-compass:before{content:"\f14e"}.fa-toggle-down:before,.fa-caret-square-o-down:before{content:"\f150"}.fa-toggle-up:before,.fa-caret-square-o-up:before{content:"\f151"}.fa-toggle-right:before,.fa-caret-square-o-right:before{content:"\f152"}.fa-euro:before,.fa-eur:before{content:"\f153"}.fa-gbp:before{content:"\f154"}.fa-dollar:before,.fa-usd:before{content:"\f155"}.fa-rupee:before,.fa-inr:before{content:"\f156"}.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:"\f157"}.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:"\f158"}.fa-won:before,.fa-krw:before{content:"\f159"}.fa-bitcoin:before,.fa-btc:before{content:"\f15a"}.fa-file:before{content:"\f15b"}.fa-file-text:before{content:"\f15c"}.fa-sort-alpha-asc:before{content:"\f15d"}.fa-sort-alpha-desc:before{content:"\f15e"}.fa-sort-amount-asc:before{content:"\f160"}.fa-sort-amount-desc:before{content:"\f161"}.fa-sort-numeric-asc:before{content:"\f162"}.fa-sort-numeric-desc:before{content:"\f163"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbs-down:before{content:"\f165"}.fa-youtube-square:before{content:"\f166"}.fa-youtube:before{content:"\f167"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-youtube-play:before{content:"\f16a"}.fa-dropbox:before{content:"\f16b"}.fa-stack-overflow:before{content:"\f16c"}.fa-instagram:before{content:"\f16d"}.fa-flickr:before{content:"\f16e"}.fa-adn:before{content:"\f170"}.fa-bitbucket:before{content:"\f171"}.fa-bitbucket-square:before{content:"\f172"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-long-arrow-down:before{content:"\f175"}.fa-long-arrow-up:before{content:"\f176"}.fa-long-arrow-left:before{content:"\f177"}.fa-long-arrow-right:before{content:"\f178"}.fa-apple:before{content:"\f179"}.fa-windows:before{content:"\f17a"}.fa-android:before{content:"\f17b"}.fa-linux:before{content:"\f17c"}.fa-dribbble:before{content:"\f17d"}.fa-skype:before{content:"\f17e"}.fa-foursquare:before{content:"\f180"}.fa-trello:before{content:"\f181"}.fa-female:before{content:"\f182"}.fa-male:before{content:"\f183"}.fa-gittip:before,.fa-gratipay:before{content:"\f184"}.fa-sun-o:before{content:"\f185"}.fa-moon-o:before{content:"\f186"}.fa-archive:before{content:"\f187"}.fa-bug:before{content:"\f188"}.fa-vk:before{content:"\f189"}.fa-weibo:before{content:"\f18a"}.fa-renren:before{content:"\f18b"}.fa-pagelines:before{content:"\f18c"}.fa-stack-exchange:before{content:"\f18d"}.fa-arrow-circle-o-right:before{content:"\f18e"}.fa-arrow-circle-o-left:before{content:"\f190"}.fa-toggle-left:before,.fa-caret-square-o-left:before{content:"\f191"}.fa-dot-circle-o:before{content:"\f192"}.fa-wheelchair:before{content:"\f193"}.fa-vimeo-square:before{content:"\f194"}.fa-turkish-lira:before,.fa-try:before{content:"\f195"}.fa-plus-square-o:before{content:"\f196"}.fa-space-shuttle:before{content:"\f197"}.fa-slack:before{content:"\f198"}.fa-envelope-square:before{content:"\f199"}.fa-wordpress:before{content:"\f19a"}.fa-openid:before{content:"\f19b"}.fa-institution:before,.fa-bank:before,.fa-university:before{content:"\f19c"}.fa-mortar-board:before,.fa-graduation-cap:before{content:"\f19d"}.fa-yahoo:before{content:"\f19e"}.fa-google:before{content:"\f1a0"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-square:before{content:"\f1a2"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-stumbleupon:before{content:"\f1a4"}.fa-delicious:before{content:"\f1a5"}.fa-digg:before{content:"\f1a6"}.fa-pied-piper:before{content:"\f1a7"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-drupal:before{content:"\f1a9"}.fa-joomla:before{content:"\f1aa"}.fa-language:before{content:"\f1ab"}.fa-fax:before{content:"\f1ac"}.fa-building:before{content:"\f1ad"}.fa-child:before{content:"\f1ae"}.fa-paw:before{content:"\f1b0"}.fa-spoon:before{content:"\f1b1"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-recycle:before{content:"\f1b8"}.fa-automobile:before,.fa-car:before{content:"\f1b9"}.fa-cab:before,.fa-taxi:before{content:"\f1ba"}.fa-tree:before{content:"\f1bb"}.fa-spotify:before{content:"\f1bc"}.fa-deviantart:before{content:"\f1bd"}.fa-soundcloud:before{content:"\f1be"}.fa-database:before{content:"\f1c0"}.fa-file-pdf-o:before{content:"\f1c1"}.fa-file-word-o:before{content:"\f1c2"}.fa-file-excel-o:before{content:"\f1c3"}.fa-file-powerpoint-o:before{content:"\f1c4"}.fa-file-photo-o:before,.fa-file-picture-o:before,.fa-file-image-o:before{content:"\f1c5"}.fa-file-zip-o:before,.fa-file-archive-o:before{content:"\f1c6"}.fa-file-sound-o:before,.fa-file-audio-o:before{content:"\f1c7"}.fa-file-movie-o:before,.fa-file-video-o:before{content:"\f1c8"}.fa-file-code-o:before{content:"\f1c9"}.fa-vine:before{content:"\f1ca"}.fa-codepen:before{content:"\f1cb"}.fa-jsfiddle:before{content:"\f1cc"}.fa-life-bouy:before,.fa-life-buoy:before,.fa-life-saver:before,.fa-support:before,.fa-life-ring:before{content:"\f1cd"}.fa-circle-o-notch:before{content:"\f1ce"}.fa-ra:before,.fa-rebel:before{content:"\f1d0"}.fa-ge:before,.fa-empire:before{content:"\f1d1"}.fa-git-square:before{content:"\f1d2"}.fa-git:before{content:"\f1d3"}.fa-y-combinator-square:before,.fa-yc-square:before,.fa-hacker-news:before{content:"\f1d4"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-qq:before{content:"\f1d6"}.fa-wechat:before,.fa-weixin:before{content:"\f1d7"}.fa-send:before,.fa-paper-plane:before{content:"\f1d8"}.fa-send-o:before,.fa-paper-plane-o:before{content:"\f1d9"}.fa-history:before{content:"\f1da"}.fa-circle-thin:before{content:"\f1db"}.fa-header:before{content:"\f1dc"}.fa-paragraph:before{content:"\f1dd"}.fa-sliders:before{content:"\f1de"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-bomb:before{content:"\f1e2"}.fa-soccer-ball-o:before,.fa-futbol-o:before{content:"\f1e3"}.fa-tty:before{content:"\f1e4"}.fa-binoculars:before{content:"\f1e5"}.fa-plug:before{content:"\f1e6"}.fa-slideshare:before{content:"\f1e7"}.fa-twitch:before{content:"\f1e8"}.fa-yelp:before{content:"\f1e9"}.fa-newspaper-o:before{content:"\f1ea"}.fa-wifi:before{content:"\f1eb"}.fa-calculator:before{content:"\f1ec"}.fa-paypal:before{content:"\f1ed"}.fa-google-wallet:before{content:"\f1ee"}.fa-cc-visa:before{content:"\f1f0"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-bell-slash:before{content:"\f1f6"}.fa-bell-slash-o:before{content:"\f1f7"}.fa-trash:before{content:"\f1f8"}.fa-copyright:before{content:"\f1f9"}.fa-at:before{content:"\f1fa"}.fa-eyedropper:before{content:"\f1fb"}.fa-paint-brush:before{content:"\f1fc"}.fa-birthday-cake:before{content:"\f1fd"}.fa-area-chart:before{content:"\f1fe"}.fa-pie-chart:before{content:"\f200"}.fa-line-chart:before{content:"\f201"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-bicycle:before{content:"\f206"}.fa-bus:before{content:"\f207"}.fa-ioxhost:before{content:"\f208"}.fa-angellist:before{content:"\f209"}.fa-cc:before{content:"\f20a"}.fa-shekel:before,.fa-sheqel:before,.fa-ils:before{content:"\f20b"}.fa-meanpath:before{content:"\f20c"}.fa-buysellads:before{content:"\f20d"}.fa-connectdevelop:before{content:"\f20e"}.fa-dashcube:before{content:"\f210"}.fa-forumbee:before{content:"\f211"}.fa-leanpub:before{content:"\f212"}.fa-sellsy:before{content:"\f213"}.fa-shirtsinbulk:before{content:"\f214"}.fa-simplybuilt:before{content:"\f215"}.fa-skyatlas:before{content:"\f216"}.fa-cart-plus:before{content:"\f217"}.fa-cart-arrow-down:before{content:"\f218"}.fa-diamond:before{content:"\f219"}.fa-ship:before{content:"\f21a"}.fa-user-secret:before{content:"\f21b"}.fa-motorcycle:before{content:"\f21c"}.fa-street-view:before{content:"\f21d"}.fa-heartbeat:before{content:"\f21e"}.fa-venus:before{content:"\f221"}.fa-mars:before{content:"\f222"}.fa-mercury:before{content:"\f223"}.fa-intersex:before,.fa-transgender:before{content:"\f224"}.fa-transgender-alt:before{content:"\f225"}.fa-venus-double:before{content:"\f226"}.fa-mars-double:before{content:"\f227"}.fa-venus-mars:before{content:"\f228"}.fa-mars-stroke:before{content:"\f229"}.fa-mars-stroke-v:before{content:"\f22a"}.fa-mars-stroke-h:before{content:"\f22b"}.fa-neuter:before{content:"\f22c"}.fa-genderless:before{content:"\f22d"}.fa-facebook-official:before{content:"\f230"}.fa-pinterest-p:before{content:"\f231"}.fa-whatsapp:before{content:"\f232"}.fa-server:before{content:"\f233"}.fa-user-plus:before{content:"\f234"}.fa-user-times:before{content:"\f235"}.fa-hotel:before,.fa-bed:before{content:"\f236"}.fa-viacoin:before{content:"\f237"}.fa-train:before{content:"\f238"}.fa-subway:before{content:"\f239"}.fa-medium:before{content:"\f23a"}.fa-yc:before,.fa-y-combinator:before{content:"\f23b"}.fa-optin-monster:before{content:"\f23c"}.fa-opencart:before{content:"\f23d"}.fa-expeditedssl:before{content:"\f23e"}.fa-battery-4:before,.fa-battery-full:before{content:"\f240"}.fa-battery-3:before,.fa-battery-three-quarters:before{content:"\f241"}.fa-battery-2:before,.fa-battery-half:before{content:"\f242"}.fa-battery-1:before,.fa-battery-quarter:before{content:"\f243"}.fa-battery-0:before,.fa-battery-empty:before{content:"\f244"}.fa-mouse-pointer:before{content:"\f245"}.fa-i-cursor:before{content:"\f246"}.fa-object-group:before{content:"\f247"}.fa-object-ungroup:before{content:"\f248"}.fa-sticky-note:before{content:"\f249"}.fa-sticky-note-o:before{content:"\f24a"}.fa-cc-jcb:before{content:"\f24b"}.fa-cc-diners-club:before{content:"\f24c"}.fa-clone:before{content:"\f24d"}.fa-balance-scale:before{content:"\f24e"}.fa-hourglass-o:before{content:"\f250"}.fa-hourglass-1:before,.fa-hourglass-start:before{content:"\f251"}.fa-hourglass-2:before,.fa-hourglass-half:before{content:"\f252"}.fa-hourglass-3:before,.fa-hourglass-end:before{content:"\f253"}.fa-hourglass:before{content:"\f254"}.fa-hand-grab-o:before,.fa-hand-rock-o:before{content:"\f255"}.fa-hand-stop-o:before,.fa-hand-paper-o:before{content:"\f256"}.fa-hand-scissors-o:before{content:"\f257"}.fa-hand-lizard-o:before{content:"\f258"}.fa-hand-spock-o:before{content:"\f259"}.fa-hand-pointer-o:before{content:"\f25a"}.fa-hand-peace-o:before{content:"\f25b"}.fa-trademark:before{content:"\f25c"}.fa-registered:before{content:"\f25d"}.fa-creative-commons:before{content:"\f25e"}.fa-gg:before{content:"\f260"}.fa-gg-circle:before{content:"\f261"}.fa-tripadvisor:before{content:"\f262"}.fa-odnoklassniki:before{content:"\f263"}.fa-odnoklassniki-square:before{content:"\f264"}.fa-get-pocket:before{content:"\f265"}.fa-wikipedia-w:before{content:"\f266"}.fa-safari:before{content:"\f267"}.fa-chrome:before{content:"\f268"}.fa-firefox:before{content:"\f269"}.fa-opera:before{content:"\f26a"}.fa-internet-explorer:before{content:"\f26b"}.fa-tv:before,.fa-television:before{content:"\f26c"}.fa-contao:before{content:"\f26d"}.fa-500px:before{content:"\f26e"}.fa-amazon:before{content:"\f270"}.fa-calendar-plus-o:before{content:"\f271"}.fa-calendar-minus-o:before{content:"\f272"}.fa-calendar-times-o:before{content:"\f273"}.fa-calendar-check-o:before{content:"\f274"}.fa-industry:before{content:"\f275"}.fa-map-pin:before{content:"\f276"}.fa-map-signs:before{content:"\f277"}.fa-map-o:before{content:"\f278"}.fa-map:before{content:"\f279"}.fa-commenting:before{content:"\f27a"}.fa-commenting-o:before{content:"\f27b"}.fa-houzz:before{content:"\f27c"}.fa-vimeo:before{content:"\f27d"}.fa-black-tie:before{content:"\f27e"}.fa-fonticons:before{content:"\f280"}
+
+
button.DTTT_button, div.DTTT_button, a.DTTT_button {
background: -moz-linear-gradient(center top , #FFFFFF 0%, #F3F3F3 89%, #F9F9F9 100%) repeat scroll 0 0 transparent;
border: 1px solid #999999;
@@ -39,8 +45,9 @@
div.menuSeparator { padding:2px 10px; display:block; background:#888; border-bottom:1px solid #ccc; font-size:12px; color:#FFF; line-height:14px; clear:both; }
#menu_theme * {display:block;}
-#ssmenu a { float:left; padding:5px 10px; margin:0;font-size:10px;background:#797979;color:white;text-shadow: 0 1px 0 #000;border-right:1px solid #444;}
-#ssmenu a:hover { float:left; padding:5px 10px ; margin:0;font-size:10px;background:#eee;color:#000;text-shadow: 0 1px 0 #fff;-moz-box-shadow: 0 1px 3px rgba(0,0,0,0.5);-webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.5);}
+#ssmenu a { float:left; padding:5px 10px; margin:0;font-size:14px;background:#797979;color:white;text-shadow: 0 1px 0 #000;border-right:1px solid #444;}
+#ssmenu a:before { font-size:20px;vertical-align: middle;}
+#ssmenu a:hover { background:#eee;color:#000;text-shadow: 0 1px 0 #fff;-moz-box-shadow: 0 1px 3px rgba(0,0,0,0.5);-webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.5);}
#menubar li.account {padding-right:8px;}
/* Block formulaire central block right */
@@ -124,66 +131,85 @@
/* MEnu ADmin Habillage icone */
a.menuBoxContentLink{text-decoration:none;text-shadow: 0 1px 0 #ae0405;}
a.menuBoxContentLink:before { content: '\f0ad ';font-family: FontAwesome;}
-a.menuBoxContentLink.configuration:before { content: ''; }
-a.menuBoxContentLink.config_1:before { content: ''; }
-a.menuBoxContentLink.config_2,
+a.menuBoxContentLink.configuration:before { content: '\f013 '; }
+a.menuBoxContentLink.config_1:before { content: '\f07a '; }
+a.menuBoxContentLink.config_2:before {content: '\f24e '; }
+a.menuBoxContentLink.config_20:before {content: '\f017 '; }
a.menuBoxContentLink.config_3:before { content: ''; }
-a.menuBoxContentLink.config_4:before { content: ''; }
+a.menuBoxContentLink.config_4:before { content: '\f065 '; }
+a.menuBoxContentLink.config_40:before { content: '\f06b '; }
+a.menuBoxContentLink.config_41:before { content: '\f09d '; }
+a.menuBoxContentLink.config_42:before { content: '\f0f0 '; }
+a.menuBoxContentLink.config_43:before { content: '\f15b '; }
+a.menuBoxContentLink.config_44:before { content: '\f013 '; }
+a.menuBoxContentLink.config_45:before { content: '\f02d '; }
+a.menuBoxContentLink.config_46:before { content: '\f013 '; }
+a.menuBoxContentLink.config_47:before { content: '\f1c3 '; }
+a.menuBoxContentLink.config_48:before { content: '\f1de '; }
+a.menuBoxContentLink.config_49:before { content: '\f013 '; }
a.menuBoxContentLink.config_5:before { content: '';}
+a.menuBoxContentLink.config_50:before { content: '\f1de ';}
+a.menuBoxContentLink.config_51:before { content: '\f1ea ';}
+a.menuBoxContentLink.config_52:before { content: '\f013 ';}
+a.menuBoxContentLink.config_53:before { content: '\f085 ';}
+a.menuBoxContentLink.config_55:before { content: '\f233 ';}
+a.menuBoxContentLink.config_56:before { content: '\f046 ';}
+a.menuBoxContentLink.config_57:before { content: '\f07a ';}
a.menuBoxContentLink.config_6:before { content: '';}
a.menuBoxContentLink.config_61:before { content: '';}
a.menuBoxContentLink.config_62:before { content: ''; }
a.menuBoxContentLink.config_63:before { content: ''; }
-a.menuBoxContentLink.config_7:before { content: '';}
-a.menuBoxContentLink.config_8:before { content: ''; }
-a.menuBoxContentLink.config_9:before { content: ''; }
-a.menuBoxContentLink.config_10:before { content: ''; }
-a.menuBoxContentLink.config_11:before { content: ''; }
-a.menuBoxContentLink.config_12:before { content: ''; }
-a.menuBoxContentLink.config_13:before { content: ''; }
-a.menuBoxContentLink.config_14:before { content: ''; }
-a.menuBoxContentLink.config_15:before { content: ''; }
-a.menuBoxContentLink.config_16:before { content: ''; }
-a.menuBoxContentLink.config_17:before { content: ''; }
-a.menuBoxContentLink.config_19:before { content: ''; }
-a.menuBoxContentLink.config_21:before { content: ''; }
+a.menuBoxContentLink.config_7:before { content: '\f0d1 ';}
+a.menuBoxContentLink.config_8:before { content: '\f022 '; }
+a.menuBoxContentLink.config_9:before { content: '\f0cb '; }
+a.menuBoxContentLink.config_10:before { content: '\f0f6 '; }
+a.menuBoxContentLink.config_11:before { content: '\f085 '; }
+a.menuBoxContentLink.config_12:before { content: '\f003 '; }
+a.menuBoxContentLink.config_13:before { content: '\f019 '; }
+a.menuBoxContentLink.config_14:before { content: '\f1c6 '; }
+a.menuBoxContentLink.config_15:before { content: '\f21b '; }
+a.menuBoxContentLink.config_16:before { content: '\f246 '; }
+a.menuBoxContentLink.config_17:before { content: '\f14a '; }
+a.menuBoxContentLink.config_19:before { content: '\f11b '; }
+a.menuBoxContentLink.config_21:before { content: '\f1b3 '; }
a.menuBoxContentLink.quick_update:before { content: ''; }
-a.menuBoxContentLink.config_20:before { content: ''; }
-a.menuBoxContentLink.config_22:before { content: ''; }
-a.menuBoxContentLink.config_24:before { content: ''; }
-a.menuBoxContentLink.config_25:before { content: ''; }
-a.menuBoxContentLink.config_27:before { content: ''; }
-a.menuBoxContentLink.config_28:before { content: ''; }
-a.menuBoxContentLink.config_29:before { content: ''; }
-a.menuBoxContentLink.config_30:before { content: ''; }
-a.menuBoxContentLink.config_31:before { content: ''; }
+a.menuBoxContentLink.config_22:before { content: '\f0e2 '; }
+a.menuBoxContentLink.config_24:before { content: '\f1b3 '; }
+a.menuBoxContentLink.config_25:before { content: '\f196 '; }
+a.menuBoxContentLink.config_27:before { content: '\f1ea '; }
+a.menuBoxContentLink.config_28:before { content: '\f21b '; }
+a.menuBoxContentLink.config_29:before { content: '\f1ea '; }
+a.menuBoxContentLink.config_30:before { content: '\f046 '; }
+a.menuBoxContentLink.config_31:before { content: '\f1ab '; }
a.menuBoxContentLink.return:before { content: ''; }
a.menuBoxContentLink.config_32:before { content: ''; }
-a.menuBoxContentLink.config_33:before { content: ''; }
-a.menuBoxContentLink.config_34:before { content: ''; }
+a.menuBoxContentLink.config_33:before { content: '\f1de '; }
+a.menuBoxContentLink.config_34:before { content: '\f1de '; }
+a.menuBoxContentLink.config_35:before { content: '\f022 '; }
+a.menuBoxContentLink.config_36:before { content: '\f013 '; }
+a.menuBoxContentLink.config_39:before { content: '\f0c0 '; }
a.menuBoxContentLink.config_100:before { content: ''; }
a.menuBoxContentLink.config_110:before { content: ''; }
a.menuBoxContentLink.config_120:before { content: ''; }
a.menuBoxContentLink.config_126:before { content: ''; }
a.menuBoxContentLink.config_127:before { content: ''; }
+a.menuBoxContentLink.admin:before { content: '\f0c0 '; }
a.menuBoxContentLink.administrator:before { content: ''; }
-a.menuBoxContentLink.taxes_in_zone:before { content: ''; }
a.menuBoxContentLink.templates:before { content: ''; }
a.menuBoxContentLink.nav:before { content: '\f0c9 ' ; }
a.menuBoxContentLink.language:before { content: '';}
a.menuBoxContentLink.languages:before { content: ''; }
-a.menuBoxContentLink.countries:before { content: ''; }
+a.menuBoxContentLink.countries:before { content: '\f0ac '; }
a.menuBoxContentLink.taxes_zone:before { content: ''; }
-a.menuBoxContentLink.taxes_geo_zone:before { content: ''; }
-a.menuBoxContentLink.taxes_classes:before { content: '';}
+a.menuBoxContentLink.taxes_in_zone:before { content: '\f0d6 '; }
+a.menuBoxContentLink.taxes_geo_zone:before { content: '\f05b '; }
+a.menuBoxContentLink.taxes_classes:before { content: '\f200 ';}
a.menuBoxContentLink.taxes_rates:before { content: ''; }
a.menuBoxContentLink.currencies:before { content: '\f0d6 '; }
-/* ---- extensions ---- */
-a.menuBoxContentLink.appli_ext:before { content: ''; }
/* ---- catalogue ---- */
a.menuBoxContentLink.products:before { content: '\f022 '; }
a.menuBoxContentLink.product_add:before { content: '\f0fe '; }
-a.menuBoxContentLink.product_wait:before { content: '\f04c '; }
+a.menuBoxContentLink.product_wait:before { content: '\f017 '; }
a.menuBoxContentLink.attributes:before { content: '\f1de ';}
a.menuBoxContentLink.stock:before { content: '\f080 ';}
a.menuBoxContentLink.manufacturers:before { content: ''; }
@@ -192,40 +218,48 @@
a.menuBoxContentLink.expected:before { content: ''; }
a.menuBoxContentLink.discount_coupon:before { content: ''; }
/* ---- modules ---- */
-a.menuBoxContentLink.modules:before { content: '';}
+a.menuBoxContentLink.modules:before { content: '\f0ed ';}
+a.menuBoxContentLink.appli_ext1:before { content: '\f019 ';}
+a.menuBoxContentLink.appli_ext2:before { content: '\f126 ';}
+a.menuBoxContentLink.appli_ext3:before { content: '\f0ec ';}
+a.menuBoxContentLink.appli_ext4:before { content: '\f0fe ';}
a.menuBoxContentLink.payment:before { content: ''; }
a.menuBoxContentLink.shipping:before { content: ''; }
a.menuBoxContentLink.orderTotal:before { content: '';}
/* ---- customers ---- */
a.menuBoxContentLink.customers:before { content: '\f0c0 ' }
-a.menuBoxContentLink.membres:before { content: ''; }
+a.menuBoxContentLink.groups:before { content: '\f0c0 '; }
+a.menuBoxContentLink.notifications:before { content: '\f0e5 '; }
+a.menuBoxContentLink.members:before { content: '\f007 '; }
+a.menuBoxContentLink.membres_add:before { content: '\f234 '; }
-a.menuBoxContentLink.orders:before { content: '\f1b3 '; }
+a.menuBoxContentLink.o...
[truncated message content] |
|
From: <hom...@us...> - 2015-11-16 19:04:25
|
Revision: 5280
http://sourceforge.net/p/oscss/svn/5280
Author: homer8173
Date: 2015-11-16 19:04:22 +0000 (Mon, 16 Nov 2015)
Log Message:
-----------
Fix lightbox responsive - auto install
Modified Paths:
--------------
trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/cfg/configuration.php
Modified: trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/cfg/configuration.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/cfg/configuration.php 2015-11-14 11:15:56 UTC (rev 5279)
+++ trunk/catalog/install/data/templates/appareil_photo/Modern_RWD/cfg/configuration.php 2015-11-16 19:04:22 UTC (rev 5280)
@@ -55,7 +55,10 @@
addConfigModule('MODULE_ACACAT_INSTALLED_BO', 'header_tags.php');
addConfigModule('MODULE_CONTENT_INSTALLED_BO', 'header_tags.php');
+//install plugin for template
+addConfigModule('PLUGIN_PRODUCT_INSTALLED', 'lightbox.php');
+
/* Purge du repertoire de miniature */
$path = DIR_FS_ROOT_DOCS.DIR_WS_IMAGES.'imagecache/' ;
$dir = @opendir($path);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|