You can subscribe to this list here.
| 2011 |
Jan
|
Feb
|
Mar
(4) |
Apr
(57) |
May
(31) |
Jun
(21) |
Jul
(11) |
Aug
(23) |
Sep
(22) |
Oct
(36) |
Nov
(62) |
Dec
(85) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2012 |
Jan
(24) |
Feb
(24) |
Mar
(65) |
Apr
(232) |
May
(118) |
Jun
(22) |
Jul
(54) |
Aug
(57) |
Sep
(14) |
Oct
(27) |
Nov
(16) |
Dec
(19) |
| 2013 |
Jan
(16) |
Feb
(12) |
Mar
(3) |
Apr
(17) |
May
(2) |
Jun
(30) |
Jul
(33) |
Aug
(19) |
Sep
(35) |
Oct
(58) |
Nov
(27) |
Dec
(64) |
| 2014 |
Jan
(102) |
Feb
(80) |
Mar
(15) |
Apr
(4) |
May
(3) |
Jun
(3) |
Jul
(5) |
Aug
(11) |
Sep
(15) |
Oct
|
Nov
(3) |
Dec
(5) |
| 2015 |
Jan
(5) |
Feb
(4) |
Mar
(2) |
Apr
(11) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(9) |
Nov
(10) |
Dec
|
| 2016 |
Jan
(3) |
Feb
(2) |
Mar
(18) |
Apr
(13) |
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
(4) |
Oct
|
Nov
|
Dec
|
|
From: <os...@us...> - 2011-12-01 21:08:13
|
Revision: 3919
http://oscss.svn.sourceforge.net/oscss/?rev=3919&view=rev
Author: oscim
Date: 2011-12-01 21:08:06 +0000 (Thu, 01 Dec 2011)
Log Message:
-----------
suite correction gestion affichage public et seo
suite normalisation des clef passe en GET
Modified Paths:
--------------
trunk/catalog/common/classes/seo_url.php
trunk/catalog/document.php
trunk/catalog/includes/application_top.php
trunk/catalog/includes/classes/drivers/data/categorie.php
trunk/catalog/includes/classes/page.php
trunk/catalog/includes/filenames.php
trunk/catalog/index.php
trunk/catalog/install/includes/modele/configure.txt
trunk/catalog/install/includes/modele/htaccess.txt
Modified: trunk/catalog/common/classes/seo_url.php
===================================================================
--- trunk/catalog/common/classes/seo_url.php 2011-12-01 17:48:57 UTC (rev 3918)
+++ trunk/catalog/common/classes/seo_url.php 2011-12-01 21:08:06 UTC (rev 3919)
@@ -26,17 +26,17 @@
* $cache is the per page data array that contains all of the previously stripped titles
@var array
*/
- var $cache;
+ public $cache;
/**
* $languages_id contains the language_id for this instance
@var integer
*/
- var $languages_id;
+ public $languages_id;
/**
* $attributes array contains all the required settings for class
@var array
*/
- var $attributes;
+ public $attributes;
/**
* $base_url is the NONSSL URL for site
@var string
@@ -51,73 +51,73 @@
* $performance array contains evaluation metric data
@var array
*/
- var $performance;
+ public $performance;
/**
* $timestamp simply holds the temp variable for time calculations
@var float
*/
- var $timestamp;
+ public $timestamp;
/**
* $reg_anchors holds the anchors used by the .htaccess rewrites
@var array
*/
- var $reg_anchors;
+ public $reg_anchors;
/**
* $cache_query is the resource_id used for database cache logic
@var resource
*/
- var $cache_query;
+ public $cache_query;
/**
* $cache_file is the basename of the cache database entry
@var string
*/
- var $cache_file;
+ public $cache_file;
/**
* $data array contains all records retrieved from database cache
@var array
*/
- var $data;
+ public $data;
/**
* $need_redirect determines whether the URL needs to be redirected
@var boolean
*/
- var $need_redirect;
+ public $need_redirect;
/**
* $is_seopage holds value as to whether page is in allowed SEO pages
@var boolean
*/
- var $is_seopage;
+ public $is_seopage;
/**
* $uri contains the $_SERVER['REQUEST_URI'] value
@var string
*/
- var $uri;
+ public $uri;
/**
* $real_uri contains the $_SERVER['SCRIPT_NAME'] . '?' . $_SERVER['QUERY_STRING'] value
@var string
*/
- var $real_uri;
+ public $real_uri;
/**
* $uri_parsed contains the parsed uri value array
@var array
*/
- var $uri_parsed;
+ public $uri_parsed;
/**
* $path_info contains the getenv('PATH_INFO') value
@var string
*/
- var $path_info;
+ public $path_info;
/**
* $DB is the database object
@var object
*/
- var $DB;
+ public $DB;
/**
* $header_tag element for page
@var object
*/
- var $header_tag;
+ public $header_tag;
/**
* $header_tag activ
@var bool
@@ -178,6 +178,7 @@
FILENAME_SPECIALS,
FILENAME_BEST_SELLERS,
FILENAME_SITEMAP,
+ FILENAME_HOME,
FILENAME_TEMPLATE,
FILENAME_CONTACT_US,
FILENAME_SHOPPING_CART
@@ -220,13 +221,13 @@
// respecter l'ordre
$this->reg_anchors= array(
- 'pID' => 'pi',
+ 'pID' => 'pi',
'products_id' => 'p',
- 'cPath' => 'c',
- 'manufacturers_id' => 'm',
+ 'cPath' => 'c',
+ 'manufacturers_id' => 'm',
'content' => 't',
'divers' => 'd',
- 'lID' => 'l',
+ 'lID' => 'l',
'customers_id' => 'u',
'type_object' => 'to',
);
@@ -251,27 +252,27 @@
$this->performance = array('NUMBER_URLS_GENERATED' => 0,
- 'NUMBER_QUERIES' => 0,
- 'CACHE_QUERY_SAVINGS' => 0,
- 'NUMBER_STANDARD_URLS_GENERATED' => 0,
- 'TOTAL_CACHED_PER_PAGE_RECORDS' => 0,
- 'TOTAL_TIME' => 0,
- 'TIME_PER_URL' => 0,
- 'QUERIES' => array()
+ 'NUMBER_QUERIES' => 0,
+ 'CACHE_QUERY_SAVINGS' => 0,
+ 'NUMBER_STANDARD_URLS_GENERATED' => 0,
+ 'TOTAL_CACHED_PER_PAGE_RECORDS' => 0,
+ 'TOTAL_TIME' => 0,
+ 'TIME_PER_URL' => 0,
+ 'QUERIES' => array()
);
//ojp generate_link_cache
if (_test_bool(self::$USE_SEO_CACHE_GLOBAL)){
- $this->cache_file = 'seo_urls_v2_';
- $this->cache_gc();
+ $this->cache_file = 'seo_urls_v2_';
+ $this->cache_gc();
- if ( _test_bool(self::$USE_SEO_CACHE_PRODUCTS )) $this->generate_products_cache();
- if ( _test_bool(self::$USE_SEO_CACHE_CATEGORIES)) $this->generate_categories_cache();
- // if ( _test_bool($this->attributes['USE_SEO_CACHE_MANUFACTURERS'] ) ) $this->generate_manufacturers_cache();
- // if ( _test_bool($this->attributes['USE_SEO_CACHE_ARTICLES'] ) && defined('TABLE_ARTICLES_DESCRIPTION'))
- // $this->generate_articles_cache();
- if ( _test_bool(self::$USE_SEO_CACHE_TOPICS) && defined('TABLE_CONTENT_DESCRIPTION')) $this->generate_topics_cache();
- $this->generate_divers_cache();
- if ( _test_bool(self::$USE_SEO_CACHE_LINKS) ) $this->generate_links_cache();
+ if ( _test_bool(self::$USE_SEO_CACHE_PRODUCTS )) $this->generate_products_cache();
+ if ( _test_bool(self::$USE_SEO_CACHE_CATEGORIES)) $this->generate_categories_cache();
+ // if ( _test_bool($this->attributes['USE_SEO_CACHE_MANUFACTURERS'] ) ) $this->generate_manufacturers_cache();
+ // if ( _test_bool($this->attributes['USE_SEO_CACHE_ARTICLES'] ) && defined('TABLE_ARTICLES_DESCRIPTION'))
+ // $this->generate_articles_cache();
+ if ( _test_bool(self::$USE_SEO_CACHE_TOPICS) && defined('TABLE_CONTENT_DESCRIPTION')) $this->generate_topics_cache();
+ $this->generate_divers_cache();
+ if ( _test_bool(self::$USE_SEO_CACHE_LINKS) ) $this->generate_links_cache();
}
@@ -294,11 +295,14 @@
*\brief Base tag defaut
*/
$sql = "select head_title_tag , head_desc_tag, head_keywords_tag from " . TABLE_FULL_TAG . " ft, " . TABLE_FULL_TAG_DESCRIPTION . " ftd where ft.tag_id=ftd.tag_id and ft.page_type='generic' and ft.page_id = 'generic' and ftd.language_id = '" . (int)$this->languages_id. "' Limit 1";
+
$query=$this->DB->query( $sql );
$res=$query->fetchAssoc();
define('HEAD_TITLE_TAG_ALL', $res['head_title_tag']);
define('HEAD_DESC_TAG_ALL', $res['head_desc_tag']);
define('HEAD_KEY_TAG_ALL', $res['head_keywords_tag']);
+
+
}
public static function getInstance($languages_id='') {
@@ -363,7 +367,9 @@
$link = $connection == 'NONSSL' ? self::$base_url : self::$base_url_ssl;
$separator = '?';
self::$htexe = true;
- $this->parse_parameters($page, $parameters ,$connection , $separator, true);
+
+ $this->parse_parameters($page, $parameters ,$connection , $separator);
+
self::$htexe = false;
}
@@ -457,65 +463,79 @@
* @param $separator string NOTE: passed by reference
* @return string
*/
- private function parse_parameters($page, $params ,$connection , &$separator){
+ protected function parse_parameters($page, $params ,$connection , &$separator){
$params=str_replace('&','&',$params);
- $p = @explode('&', $params);
+ if(!empty($params))
+ $p = @explode('&', $params);
+ else
+ $p = array();
+
krsort($p);
$container = array();
- // preparation array key/value
- foreach ($p as $index => $valuepair)
- if(!empty($valuepair) || $index !=0) {
- $p2 = @explode('=', $valuepair);
+ // preparation array key/value
+ foreach ($p as $index => $valuepair)
+ if(!empty($valuepair) || $index !=0) {
+ $p2 = @explode('=', $valuepair);
- $p3[$p2[0]]=$p2[1];
- }
+ $p3[$p2[0]]=$p2[1];
+ }
+
$check=array_keys($this->reg_anchors);
- if(isset($p3))
+ if(isset($p3)){
foreach ($p3 as $key => $value){
$url='';
- switch ($key){
- case (in_array($key, $check)):
- $Rkey=$this->reg_anchors[$key];
- $function = 'GetName_'.$Rkey;
- if(method_exists($this,$function)) {
- $url = $this->make_url($page, $this->$function($value), $key, $value, $separator);
+ switch ($key){
+ case (in_array($key, $check)):
- // $url = $this->make_url($page, $this->get_product_name($p2[1]), $p2[0], $p2[1], $separator);
- $this->ValidateName($url, $Rkey, $value, $connection, $separator);
- }
- break;
+ $Rkey=$this->reg_anchors[$key];
+ $function = 'GetName_'.$Rkey;
+ if(method_exists($this,$function)) {
+ $url = $this->make_url($page, $this->$function($value), $key, $value, $separator);
+ // $url = $this->make_url($page, $this->get_product_name($p2[1]), $p2[0], $p2[1], $separator);
+ $this->ValidateName($url, $Rkey, $value, $connection, $separator);
+ }
+ break;
- default:
- $container[$key] = @$value;
- switch(true){
- case ($page == '' || $page ==FILENAME_DEFAULT):
- $id=AbstractHeader_tags::get_prio_cms('home');
- //! home by cms
- if(is_int($id)) {
- $url = $this->make_url($page, $this->get_topic_name($id), "content", $id, $separator);
- $this->ValidateName($url, "t", $id, $connection, $separator);
- }
- //! home by page content
- else {
- $url = ''; // $this->make_url('home', $this->get_divers_name('home'), 'divers', 'home', $separator);
- //$this->ValidateName($url, "d", 'home', $connection, $separator);
- }
- break;
default:
- if(is_array($p2)) $container[$key] = $value;
- break;
- }
- }
+ $container[$key] = @$value;
+
+ switch(true){
+ case ($page == '' || $page ==FILENAME_DEFAULT):
+ $id=AbstractHeader_tags::get_prio_cms('home');
+ //! home by cms
+ if(is_int($id)) {
+ $url = $this->make_url($page, $this->get_topic_name($id), "content", $id, $separator);
+ $this->ValidateName($url, "t", $id, $connection, $separator);
+ }
+ //! home by page content
+ else {
+ $url = ''; // $this->make_url('home', $this->get_divers_name('home'), 'divers', 'home', $separator);
+ //$this->ValidateName($url, "d", 'home', $connection, $separator);
+ }
+ break;
+ default:
+ if(is_array($p2)) $container[$key] = $value;
+ break;
+ }
+ }
+
}
+ }
+// else
+// var_dump($page);
+// elseif(count($p) ==0 ) {
+// // if()
+//
+// }
$url = isset($url) ? $url : $page;
@@ -603,9 +623,13 @@
* @param $pID integer
* @return string Stripped anchor text
*/
- private function GetName_d($pID){
+ protected function GetName_d($pID){
// private function get_divers_name($pID){
+// var_dump(self::$htexe);
+// exit;
+// var_dump($pID);
+// var_dump(self::$htexe);
switch(true){
case (_test_bool(self::$USE_SEO_CACHE_GLOBAL) && isset($this->cache['DIVERS'][$pID])):
$this->performance['CACHE_QUERY_SAVINGS']++;
@@ -617,7 +641,7 @@
break;
default:
$this->performance['NUMBER_QUERIES']++;
- $sql = "select head_title_tag as tName, head_desc_tag, head_keywords_tag from " . TABLE_FULL_TAG . " ft, " . TABLE_FULL_TAG_DESCRIPTION . " ftd where ft.tag_id=ftd.tag_id and ft.page_type='page' and ft.page_id = '" . basename($pID). "' and ftd.language_id = '" . (int)$this->languages_id. "' Limit 1";
+ $sql = "select head_title_tag as tName, head_desc_tag, head_keywords_tag from " . TABLE_FULL_TAG . " ft, " . TABLE_FULL_TAG_DESCRIPTION . " ftd where ft.tag_id=ftd.tag_id and ft.page_type='page' and ft.page_id = '" . basename($pID). "' and ftd.language_id = '" . (int)$this->languages_id. "' Limit 1";
$query=$this->DB->query( $sql );
if ($query->__get('numRows')>0) $result =$query->fetchAssoc();
else $result['tName'] = $this->strip($pID);
@@ -742,10 +766,32 @@
* @return array
*/
private function generate_products_cache(){
- $res=$this->DB->query( "select ft.page_id as ID , head_title_tag as tName, head_desc_tag, head_keywords_tag from " . TABLE_FULL_TAG . " ft, " . TABLE_FULL_TAG_DESCRIPTION . " ftd where ft.tag_id=ftd.tag_id and ft.page_type='product' and ftd.language_id = '" . (int)$this->languages_id. "'" );
- while ($result =$res->fetchAssoc()){
- $this->get_cache_id($result['ID'],$result,'PRODUCTS');
- }
+
+// $this->is_cached($this->cache_file . 'products', $is_cached, $is_expired);
+//
+//
+// if ( !$is_cached || $is_expired ) {
+ $prod_cache = array();
+ $res=$this->DB->query( "select ft.page_id as ID , head_title_tag as tName, head_desc_tag, head_keywords_tag from " . TABLE_FULL_TAG . " ft, " . TABLE_FULL_TAG_DESCRIPTION . " ftd where ft.tag_id=ftd.tag_id and ft.page_type='product' and ftd.language_id = '" . (int)$this->languages_id. "'" );
+
+ while ($result =$res->fetchAssoc()){
+ $this->get_cache_id($result['ID'],$result,'PRODUCTS');
+
+// $define = 'define(\'PRODUCT_NAME_' . $result['ID'] . '\', \'' . $this->strip( $result['tName']) . '\');';
+// $prod_cache .= $define . "\n";
+// eval("$define");
+// $prod_cache[$result['ID']] = $result;
+// $this->cache['PRODUCTS']
+ }
+
+// $this->save_cache($this->cache_file . 'products', $prod_cache, 'ARRAY', 1 , 1);
+// }
+// else {
+//
+// $this->get_cache($this->cache_file . 'products');
+// // var_dump($is_cached , $is_expired );
+// // exit;
+// }
}
/**
@@ -1195,10 +1241,10 @@
$cache_check = ( $is_cached ? 'true' : 'false' );
switch ( $cache_check ) {
case 'true':
- $this->DB->DBPerform(TABLE_SEO_CACHE, $sql_data_array, 'update', "cache_id='".md5($name)."'");
+ tep_db_perform(TABLE_SEO_CACHE, $sql_data_array, 'update', "cache_id='".md5($name)."'");
break;
case 'false':
- $this->DB->DBPerform(TABLE_SEO_CACHE, $sql_data_array, 'insert');
+ tep_db_perform(TABLE_SEO_CACHE, $sql_data_array, 'insert');
break;
default:
}
@@ -1252,7 +1298,7 @@
}
}
unset($cache_data);
- $this->DB->Free($this->cache_query);
+ $this->cache_query->Free($this->cache_query);
switch (true) {
case ($num_rows == 1):
if ($global){
@@ -1345,14 +1391,18 @@
@param $is_expired boolean NOTE: passed by reference
*/
private function is_cached($name, &$is_cached, &$is_expired){ // NOTE: $is_cached and $is_expired is passed by reference !!
- $this->cache_query = $this->DB->query("SELECT cache_expires FROM ". TABLE_SEO_CACHE." WHERE cache_id='".md5($name)."' AND cache_language_id='".(int)$this->languages_id."' LIMIT 1");
+
+ $this->cache_query = $this->DB->query($s="SELECT cache_expires FROM ". TABLE_SEO_CACHE." WHERE cache_id='".md5($name)."' AND cache_language_id='".(int)$this->languages_id."' LIMIT 1");
+
+// var_dump($s);
+
$is_cached = ( $this->cache_query->__get('NumRows') > 0 ? true : false );
if ($is_cached){
$check = $this->cache_query->fetchAssoc($this->cache_query);
$is_expired = ( $check['cache_expires'] <= date("Y-m-d H:i:s") ? true : false );
unset($check);
}
- $this->DB->Free($this->cache_query);
+ $this->cache_query->free($this->cache_query);
}
/**
@@ -1375,7 +1425,8 @@
$this->need_redirect();
$this->check_seo_page();
- if ( $this->need_redirect && $this->is_seopage && self::$USE_SEO_REDIRECT == 'true') $this->do_redirect();
+ if ( $this->need_redirect && $this->is_seopage && self::$USE_SEO_REDIRECT == 'true')
+ $this->do_redirect();
}
/**
@@ -1433,7 +1484,7 @@
@author Bobby Easland
*/
private function do_redirect(){
-var_dump(__FUNCTION__);
+// var_dump(__FUNCTION__);
$rs=str_replace('&','&',$this->uri_parsed['query']);
$p = @explode('&', $rs);
Modified: trunk/catalog/document.php
===================================================================
--- trunk/catalog/document.php 2011-12-01 17:48:57 UTC (rev 3918)
+++ trunk/catalog/document.php 2011-12-01 21:08:06 UTC (rev 3919)
@@ -27,9 +27,8 @@
$width=((isset($_REQUEST['w']) && (int)$_REQUEST['w'] > 0)? (int)$_REQUEST['w'] : '');
$height=((isset($_REQUEST['h']) && (int)$_REQUEST['h'] > 0)? (int)$_REQUEST['h'] : '');
- $img=((isset($_REQUEST['i']) && strlen((string)$_REQUEST['i']) > 0)? tep_sanitize_request($_REQUEST['i']) : '');
+ $img=((isset($_REQUEST['i']) && strlen((string)$_REQUEST['i']) > 0) ? tep_sanitize_request($_REQUEST['i']) : '' );
-
$get=image_ratio::get_image(DIR_WS_IMAGES.$img,'',$width,$height);
if($ext='jpg')$ext='jpeg';
Modified: trunk/catalog/includes/application_top.php
===================================================================
--- trunk/catalog/includes/application_top.php 2011-12-01 17:48:57 UTC (rev 3918)
+++ trunk/catalog/includes/application_top.php 2011-12-01 21:08:06 UTC (rev 3919)
@@ -367,9 +367,10 @@
$page->add_var_page('current_category_id',$current_category_id);
$page->add_var_page('cPath',$cPath);
$page->add_var_page('cPath_array',@$cPath_array);
- /// include start the breadcrumb trail
- $breadcrumb=$page->new_class('breadcrumb');
+
+
+
$page->pre_init();
/// initialize the message stack for output messages
@@ -377,13 +378,7 @@
/// set the template
$template = $page->ret_template();
+// $breadcrumb=$page->ret_o
-/// add category names to the breadcrumb trail
- if (isset($cPath_array)) {
- for ($i=0, $n=sizeof($cPath_array); $i<$n; $i++) {
- if( ($categories=categorie::get_item((int)$cPath_array[$i])) !=false) $page->breadcrumb->add($categories->categories_name, tep_href_link(FILENAME_DEFAULT, 'cPath=' . implode('_', array_slice($cPath_array, 0, ($i+1)))));
- else break;
- }
- }
?>
\ No newline at end of file
Modified: trunk/catalog/includes/classes/drivers/data/categorie.php
===================================================================
--- trunk/catalog/includes/classes/drivers/data/categorie.php 2011-12-01 17:48:57 UTC (rev 3918)
+++ trunk/catalog/includes/classes/drivers/data/categorie.php 2011-12-01 21:08:06 UTC (rev 3919)
@@ -3,8 +3,8 @@
\licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
\portion code Copyright (c) 2002 osCommerce
\package osCSS-2 <www http://www.oscss.org>
- \version 2.1.0
- \date 29/11/10, 11:33
+ \version 2.1.1
+ \date 29/11/11, 11:33
\author oscim <mail aur...@os...> <www http://www.oscim.fr>
\encode UTF-8
Modified: trunk/catalog/includes/classes/page.php
===================================================================
--- trunk/catalog/includes/classes/page.php 2011-12-01 17:48:57 UTC (rev 3918)
+++ trunk/catalog/includes/classes/page.php 2011-12-01 21:08:06 UTC (rev 3919)
@@ -393,21 +393,23 @@
/**
* \fn CurrentPageInit()
- * \brief Methode for detremine tag html page and title
+ * \brief Methode for determine current html page meta and title
* \param $path string pathname or null
* \return none
*/
protected function CurrentPageInit($path=''){
global $languages_id;
- $here = (!empty($path)? $path : substr($_SERVER['SCRIPT_NAME'],strlen(DIR_WS_CATALOG) ) ) ;
+ $here = (!empty($path)? $path : substr($_SERVER['REQUEST_URI'],strlen(DIR_WS_CATALOG) ) ) ;
/**
Gestion des tag, title et key
*/
if (_cst_bool('SEO_ENABLED')){
$seo_urls=seo_url::getInstance($languages_id);
+
$seo_urls->header_tags($here, $_SERVER['QUERY_STRING']);
+
$the_title= $seo_urls->header_tag['title'];
$the_desc= $seo_urls->header_tag['desc'];
$the_key_words= $seo_urls->header_tag['keywords'];
@@ -429,10 +431,7 @@
* \note fonction qui doit être appelé dans le application_top
*/
public function pre_init(){
- $this->CurrentPageInit();
- $this->breadcrumb->add(HEADER_TITLE_TOP, tep_get_httpdir() );
- $this->breadcrumb->add(HEADER_TITLE_CATALOG, tep_href_link(FILENAME_DEFAULT));
// set the template
$this->page['template'] = page::oscss_get_template();
@@ -456,6 +455,13 @@
$this->CurrentPageInit($p_content);
+ /// include start the breadcrumb trail
+ $page->new_class('breadcrumb');
+ /// initialise beradcumb
+ $this->breadcrumb->add(HEADER_TITLE_TOP, tep_get_httpdir() );
+ $this->breadcrumb->add(HEADER_TITLE_CATALOG, tep_href_link(FILENAME_DEFAULT));
+
+
/* Init class gestion js */
$this->new_class('javascript');
@@ -472,6 +478,14 @@
$res=$aca->check_action('',@$_GET['action']);
+ /// add category names to the breadcrumb trail
+ if (isset($this->page['var']['cPath_array'])) {
+ for ($i=0, $n=sizeof($this->page['var']['cPath_array']); $i<$n; $i++) {
+ if( ($categories=categorie::get_item((int)$this->page['var']['cPath_array'][$i])) !=false)
+ $this->breadcrumb->add($categories->categories_name, tep_href_link(FILENAME_DEFAULT, 'cPath=' . implode('_', array_slice($this->page['var']['cPath_array'], 0, ($i+1)))));
+ else break;
+ }
+ }
}
Modified: trunk/catalog/includes/filenames.php
===================================================================
--- trunk/catalog/includes/filenames.php 2011-12-01 17:48:57 UTC (rev 3918)
+++ trunk/catalog/includes/filenames.php 2011-12-01 21:08:06 UTC (rev 3919)
@@ -3,8 +3,8 @@
@licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 12/02/11, 15:02
+ @version 2.1.1
+ @date 01/11/11, 15:02
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -72,4 +72,21 @@
/* One Page Checkout - BEGIN */
define('FILENAME_CHECKOUT', 'checkout.php');
/* One Page Checkout - END */
+
+ /**
+ @var File for register user
+ Add name for contraint login in table_file_modules.php
+ */
+ $FileRegistered=array(
+ FILENAME_ACCOUNT,
+ FILENAME_ADDRESS_BOOK,
+ FILENAME_ADDRESS_BOOK_PROCESS,
+ FILENAME_CHECKOUT_PAYMENT_ADDRESS,
+ FILENAME_CHECKOUT_PAYMENT,
+ FILENAME_CHECKOUT_SHIPPING,
+ FILENAME_CHECKOUT_CONFIRMATION,
+ FILENAME_CHECKOUT_SHIPPING_ADDRESS,
+ FILENAME_LOGIN,
+ FILENAME_PASSWORD_FORGOTTEN
+ );
?>
\ No newline at end of file
Modified: trunk/catalog/index.php
===================================================================
--- trunk/catalog/index.php 2011-12-01 17:48:57 UTC (rev 3918)
+++ trunk/catalog/index.php 2011-12-01 21:08:06 UTC (rev 3919)
@@ -66,7 +66,7 @@
}
elseif ($category_depth == 'top') {
-// var_dump($page_content);
+
/**
* \section Page Customer public
*/
@@ -94,10 +94,10 @@
Or form
OR module aca action and exec
*/
- elseif( (isset($_GET['_ID']) && $_GET['_ID'] !='home.php') || isset($_GET['content']) || isset($_GET['aca_mod']) ){
+ elseif( (isset($_GET['d']) && $_GET['d'] !='home.php') || isset($_GET['content']) || isset($_GET['aca_mod']) ){
- $p=(string)tep_db_prepare_input(basename($_GET['_ID']));
+ $p=(string)tep_db_prepare_input(basename($_GET['d']));
$page->init($p,$language);
@@ -142,9 +142,10 @@
/** HOME */
else {
+
$page->init('home.php',$language);
- $page->force_content('home.php');
+// $page->force_content('home.php');
}
unset($category_cfils,$category_pfils,$category_parent);
Modified: trunk/catalog/install/includes/modele/configure.txt
===================================================================
--- trunk/catalog/install/includes/modele/configure.txt 2011-12-01 17:48:57 UTC (rev 3918)
+++ trunk/catalog/install/includes/modele/configure.txt 2011-12-01 21:08:06 UTC (rev 3919)
@@ -100,20 +100,4 @@
*/
$SecuKey='%SECURE_KEY%';
-
- /**
- @var File for register user
- Add name for contraint login in table_file_modules.php
- */
- $FileRegistered=array(
- FILENAME_ACCOUNT,
- FILENAME_ADDRESS_BOOK,
- FILENAME_ADDRESS_BOOK_PROCESS,
- FILENAME_CHECKOUT_PAYMENT_ADDRESS,
- FILENAME_CHECKOUT_PAYMENT,
- FILENAME_CHECKOUT_SHIPPING,
- FILENAME_CHECKOUT_CONFIRMATION,
- FILENAME_CHECKOUT_SHIPPING_ADDRESS,
- FILENAME_LOGIN,
- FILENAME_PASSWORD_FORGOTTEN
- );
\ No newline at end of file
+ ?>
\ No newline at end of file
Modified: trunk/catalog/install/includes/modele/htaccess.txt
===================================================================
--- trunk/catalog/install/includes/modele/htaccess.txt 2011-12-01 17:48:57 UTC (rev 3918)
+++ trunk/catalog/install/includes/modele/htaccess.txt 2011-12-01 21:08:06 UTC (rev 3919)
@@ -120,8 +120,13 @@
## Home Et index Ou Home = index
## Force Unique Home page
- RewriteRule ^(home.php)(.*)$ %WS_DOCUMENT_ROOT%?%{QUERY_STRING} [R=301]
- RewriteRule ^(.*)(index.html)$ %WS_DOCUMENT_ROOT%?%{QUERY_STRING} [R=301]
+ RewriteRule ^(home.php)(.*)$ /www/dev/oscss/2.1.1/01/trunk/catalog/ [R=301]
+ RewriteRule ^(d/index/index-home.html)$ /www/dev/oscss/2.1.1/01/trunk/catalog/ [R=301]
+
+ RewriteCond %{QUERY_STRING} =''
+ RewriteRule ^(index)\.(php|html)$ /www/dev/oscss/2.1.1/01/trunk/catalog/ [R=301]
+
+
## Home page & index page; two distinct page
# RewriteRule ^(home.(php|html)) %WS_DOCUMENT_ROOT%index.php?_ID=home.php [L,QSA]
# RewriteRule ^()$ %WS_DOCUMENT_ROOT%index.php?_ID=home.php [L,QSA]
@@ -162,12 +167,12 @@
## CMS content page
RewriteRule ^t/(.*)/(.*).html$ index.php?content=$1%{QUERY_STRING} [L]
## Divers page
- RewriteRule ^d/(.*)/(.*).html$ index.php?_ID=$1.php&%{QUERY_STRING} [L]
+ RewriteRule ^d/(.*)/(.*).html$ index.php?d=$1.php&%{QUERY_STRING} [L]
## Public members page
RewriteRule ^u/(.*)/(.*).html$ index.php?customers_id=$1&%{QUERY_STRING} [L]
# RewriteRule ^b/(.*)/(.*).html$ index.php?content=$1&%{QUERY_STRING} [L]
-# RewriteRule ^pr/(.*)/(.*).html$ index.php?_ID=listing_reviews.php&products_id=$1&%{QUERY_STRING} [L]
+# RewriteRule ^pr/(.*)/(.*).html$ index.php?d=listing_reviews.php&products_id=$1&%{QUERY_STRING} [L]
# RewriteRule ^i/(.*)/(.*).html$ information.php?info_id=$1&%{QUERY_STRING} [L]
# RewriteRule ^l/(.*)/(.*).html$ $1.php?lID=$1&%{QUERY_STRING} [L]
@@ -180,7 +185,7 @@
# RewriteRule ^(.*)-pi-(.*).html$ popup_image.php?pID=$2&%{QUERY_STRING}
# RewriteRule ^(.*)-t-(.*).html$ index.php?content=$2&%{QUERY_STRING}
# # RewriteRule ^(.*)-pr-(.*).html$ product_reviews.php?products_id=$2&%{QUERY_STRING}
-# RewriteRule ^(.*)-pr-(.*).html$ index.php?_ID=listing_reviews.php&products_id=$2&%{QUERY_STRING}
+# RewriteRule ^(.*)-pr-(.*).html$ index.php?d=listing_reviews.php&products_id=$2&%{QUERY_STRING}
# # RewriteRule ^(.*)-pri-(.*).html$ product_reviews_info.php?products_id=$2&%{QUERY_STRING}
# RewriteRule ^(.*)-i-(.*).html$ information.php?info_id=$2&%{QUERY_STRING}
# RewriteRule ^(.*)-d-(.*).html$ $2.php?divers=$2&%{QUERY_STRING}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-12-01 17:49:03
|
Revision: 3918
http://oscss.svn.sourceforge.net/oscss/?rev=3918&view=rev
Author: oscim
Date: 2011-12-01 17:48:57 +0000 (Thu, 01 Dec 2011)
Log Message:
-----------
coquille
Modified Paths:
--------------
trunk/catalog/includes/application_top.php
Modified: trunk/catalog/includes/application_top.php
===================================================================
--- trunk/catalog/includes/application_top.php 2011-11-28 08:27:50 UTC (rev 3917)
+++ trunk/catalog/includes/application_top.php 2011-12-01 17:48:57 UTC (rev 3918)
@@ -114,11 +114,11 @@
@note if vou want to allow specific fields, added an exclusion in the loop in question
*/
if(isset($_GET))
- foreach($_GET as $k=>$v) $_GET[$k]=tep_sanitize_string($v);
+ foreach($_GET as $k=>$v) $_GET[$k]=tep_sanitize_request($v);
if(isset($_POST))
- foreach($_POST as $k=>$v) $_POST[$k]=tep_sanitize_string($v);
+ foreach($_POST as $k=>$v) $_POST[$k]=tep_sanitize_request($v);
if(isset($_REQUEST))
- foreach($_REQUEST as $k=>$v) $_REQUEST[$k]=tep_sanitize_string($v);
+ foreach($_REQUEST as $k=>$v) $_REQUEST[$k]=tep_sanitize_request($v);
/// Constructeur de page
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-11-28 08:28:00
|
Revision: 3917
http://oscss.svn.sourceforge.net/oscss/?rev=3917&view=rev
Author: oscim
Date: 2011-11-28 08:27:50 +0000 (Mon, 28 Nov 2011)
Log Message:
-----------
correction mineurs
Ajustement modeles robots.txt , suppression indexation des page accountxxx, checkoutxxx,
Modified Paths:
--------------
trunk/catalog/install/includes/modele/robot.txt
trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql
Modified: trunk/catalog/install/includes/modele/robot.txt
===================================================================
--- trunk/catalog/install/includes/modele/robot.txt 2011-11-26 22:55:14 UTC (rev 3916)
+++ trunk/catalog/install/includes/modele/robot.txt 2011-11-28 08:27:50 UTC (rev 3917)
@@ -22,5 +22,21 @@
Disallow: /pub/
Disallow: /error/
+# disable shopping cart
+Disallow: /shopping_cart.*
+# disable checkout page
+Disallow: /checkout.*
+#disable account page
+Disallow: /account.*
+# disable sitemap
+Disallow: /sitemap.*
+# disable cms content base CGU
+Disallow: /t/1.*
+Disallow: /t/2.*
+Disallow: /t/3.*
+# disable contact us page
+Disallow: /d/contact.*
+
+
# For sitemaps.xml autodiscovery.
Sitemap: %HTTP_SERVER%%HTTP_CATALOG%sitemapindex.xml
\ No newline at end of file
Modified: trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql 2011-11-26 22:55:14 UTC (rev 3916)
+++ trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql 2011-11-28 08:27:50 UTC (rev 3917)
@@ -80,7 +80,7 @@
insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type ) values ('DEFAULT_RETURN_STATUS_ID_S', 'DEFAULT_RETURN_STATUS_ID', '1', 'DEFAULT_RETURN_STATUS_ID_L', '6', '4', '2003-02-28 07:10:04', '1000-01-01 00:00:00', NULL, NULL,4);
insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type ) values ('DEFAULT_REFUND_METHOD_S', 'DEFAULT_REFUND_METHOD', '1', 'DEFAULT_REFUND_METHOD_L', '6', '5', '2003-03-01 16:46:12', '1000-01-01 00:00:00', NULL, NULL,4);
insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ( 'MODULE_GENERIC_INSTALLED_S', 'MODULE_GENERIC_INSTALLED', '', 'MODULE_GENERIC_INSTALLED_L', '6', '6', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',');
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('MODULE_GENERIC_INSTALLED_BO_S', 'MODULE_GENERIC_INSTALLED_BO', 'CheckCore', 'MODULE_GENERIC_INSTALLED_BO_L', '6', '7', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',', '1');
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('MODULE_GENERIC_INSTALLED_BO_S', 'MODULE_GENERIC_INSTALLED_BO', 'CheckCore.php;', 'MODULE_GENERIC_INSTALLED_BO_L', '6', '7', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',', '1');
insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('MODULE_ACAPRO_INSTALLED_S', 'MODULE_ACAPRO_INSTALLED', 'desc_base.php;', 'MODULE_ACAPRO_INSTALLED_L', '6', '8', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',');
insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('MODULE_ACAPRO_INSTALLED_BO_S', 'MODULE_ACAPRO_INSTALLED_BO', 'desc_base.php;', 'MODULE_ACAPRO_INSTALLED_BO_L', '6', '9', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',', '1');
insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('MODULE_CONTENT_INSTALLED_S', 'MODULE_CONTENT_INSTALLED', '', 'MODULE_CONTENT_INSTALLED_L', '6', '10', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-11-26 22:55:21
|
Revision: 3916
http://oscss.svn.sourceforge.net/oscss/?rev=3916&view=rev
Author: oscim
Date: 2011-11-26 22:55:14 +0000 (Sat, 26 Nov 2011)
Log Message:
-----------
coquille
Modified Paths:
--------------
trunk/catalog/admin/includes/modules/generic/CheckCore.php
trunk/catalog/admin/includes/modules/pages/customers.php
Modified: trunk/catalog/admin/includes/modules/generic/CheckCore.php
===================================================================
--- trunk/catalog/admin/includes/modules/generic/CheckCore.php 2011-11-26 22:04:33 UTC (rev 3915)
+++ trunk/catalog/admin/includes/modules/generic/CheckCore.php 2011-11-26 22:55:14 UTC (rev 3916)
@@ -69,7 +69,7 @@
global $languages_id, $messageStack;
$this->language_id = $languages_id;
- if (_cst_bool('CHECKUP_WARN'))
+ if (!_cst_bool('CHECKUP_WARN'))
return false;
$CheckCore=0;
Modified: trunk/catalog/admin/includes/modules/pages/customers.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/customers.php 2011-11-26 22:04:33 UTC (rev 3915)
+++ trunk/catalog/admin/includes/modules/pages/customers.php 2011-11-26 22:55:14 UTC (rev 3916)
@@ -17,56 +17,56 @@
const FILENAME = FILENAME_CUSTOMERS;
/**
- @p string $code
+ @var string $code
*/
public static $code;
/**
- @p string $action
+ @var string $action
*/
public static $action;
/**
- @p array $actions
+ @var array $actions
*/
public static $actions;
/**
- @p array $modules
+ @var array $modules
*/
public static $list=array();
/**
- @p array $modules
+ @var array $modules
*/
public static $modules;
/**
- @p array $languages
+ @var array $languages
*/
public static $languages;
/**
- @p objet $cInfo
+ @var objet $cInfo
*/
public static $cInfo;
/**
- @p array $newsletter_array
+ @var array $newsletter_array
*/
public static $newsletter_array;
/**
- @p bool $processed
+ @var bool $processed
*/
public static $processed;
/**
- @p array $DiversInfo transport var
+ @var array $DiversInfo transport var
*/
public static $DiversInfo;
/**
- @p obj $box
+ @var obj $box
*/
public static $box;
/**
- @p bool $error
+ @var bool $error
*/
public static $error=false;
/**
- @p int Id customers
+ @var int Id customers
*/
public static $cID;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-11-26 22:04:41
|
Revision: 3915
http://oscss.svn.sourceforge.net/oscss/?rev=3915&view=rev
Author: oscim
Date: 2011-11-26 22:04:33 +0000 (Sat, 26 Nov 2011)
Log Message:
-----------
nombreuse petite correction de coquille html, ou php suite evolution du core
mise a jour de l'affichage des flag (on/off) dans les listing, traitement des image via css et utilisation du modeles xml du template courant .
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/customerUtility.php
trunk/catalog/admin/includes/languages/fr_FR/fr_FR.php
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/cronjob.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/currencies.txt
trunk/catalog/admin/includes/modules/pages/attributes.php
trunk/catalog/admin/includes/modules/pages/backup.php
trunk/catalog/admin/includes/modules/pages/categories.php
trunk/catalog/admin/includes/modules/pages/cms_content.php
trunk/catalog/admin/includes/modules/pages/cronjob.php
trunk/catalog/admin/includes/modules/pages/currencies.php
trunk/catalog/admin/includes/modules/pages/customers.php
trunk/catalog/admin/includes/modules/pages/held_orders.php
trunk/catalog/admin/includes/modules/pages/orders.php
trunk/catalog/admin/includes/modules/pages/products.php
trunk/catalog/admin/includes/template/oscss/stylesheet-1.css
trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql
Modified: trunk/catalog/admin/includes/classes/customerUtility.php
===================================================================
--- trunk/catalog/admin/includes/classes/customerUtility.php 2011-11-26 14:31:54 UTC (rev 3914)
+++ trunk/catalog/admin/includes/classes/customerUtility.php 2011-11-26 22:04:33 UTC (rev 3915)
@@ -169,9 +169,14 @@
if(!tep_db_num_rows($customers)) return;
+
$customers_values = tep_db_fetch_array($customers);
+ $languages = tep_get_languages($customers_values['customers_language']);
- $nom=$customers_values['customers_firstname'] . ' ' . $customers_values['customers_lastname'];
+ foreach($languages as $row)
+ $lg = $row;
+
+ $nom= /*tep_image(DIR_WS_CATALOG_LANGUAGES . $lg['directory'] . '/images/' . $lg['image'], $lg['name']) .' ' . */$customers_values['customers_firstname'] . ' ' . $customers_values['customers_lastname'];
$action= '<a href="'.tep_mailto($customers_values['customers_email_address'],$origin).'">'.tep_image(DIR_WS_ICONS.'icon_custom_mail.png',TXT_MINIF_EMAIL).'</a> '
.'<a href="'.tep_href_link(FILENAME_CUSTOMERS,'cID=' . $customers_id. '&origin='.urlencode($origin) ).'&action=edit">'.tep_image(DIR_WS_ICONS.'icon_custom_edit.png',TXT_MINIF_DETAIL).'</a> '
.'<a href="'.tep_href_link(FILENAME_STATS,'module=stats_customers').'">'.tep_image(DIR_WS_ICONS.'icon_stats.png',TXT_MINIF_STATS_BUY).'</a> '
Modified: trunk/catalog/admin/includes/languages/fr_FR/fr_FR.php
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/fr_FR.php 2011-11-26 14:31:54 UTC (rev 3914)
+++ trunk/catalog/admin/includes/languages/fr_FR/fr_FR.php 2011-11-26 22:04:33 UTC (rev 3915)
@@ -29,6 +29,7 @@
define('DATE_FORMAT_SHORT', '%d/%m/%Y'); // this is used for tep_strftime()
define('DATE_FORMAT_LONG', '%A %d %B %Y'); // this is used for tep_strftime()
define('DATE_FORMAT', 'd/m/Y'); // this is used for date()
+define('PHP_DATE_TIME_FORMAT', 'd/m/Y H:i:s'); // this is used for date()
define('DATE_TIME_FORMAT'," ".DATE_FORMAT_SHORT . " %H:%M:%S" );
////
@@ -313,6 +314,7 @@
define('FIRST',"Premier" );
define('PREVIOUS',"Dernier" );
+
// CIP ADD AUTO -- NOT TOUCH LINE
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/pages/cronjob.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/pages/cronjob.txt 2011-11-26 14:31:54 UTC (rev 3914)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/cronjob.txt 2011-11-26 22:04:33 UTC (rev 3915)
@@ -3,8 +3,8 @@
@licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 23/03/11, 14:45
+ @version 2.1.1
+ @date 26/11/11, 21:43
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -56,9 +56,6 @@
$lang['txt detail usage']="Les taches programmées vous permette d'automatiser certaines actions . Celle ci sont complement centralisé dans cette gestion.<br /><br />
-Les taches programmées vous permette d'automatiser certaines actions . Celle ci sont complement centralisé dans cette gestion.<br /><br />
-Les taches programmées vous permette d'automatiser certaines actions . Celle ci sont complement centralisé dans cette gestion.<br /><br />
-Les taches programmées vous permette d'automatiser certaines actions . Celle ci sont complement centralisé dans cette gestion.<br /><br />
<pre>".tep_get_http().DIR_WS_ADMIN."cronfile.php</pre>" ;
/* Module Name */
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/pages/currencies.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/pages/currencies.txt 2011-11-26 14:31:54 UTC (rev 3914)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/currencies.txt 2011-11-26 22:04:33 UTC (rev 3915)
@@ -1,9 +1,10 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.0.9
- @date 30/08/10, 21:39
+ @version 2.1.1
+ @date 26/11/11, 22:00
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -29,7 +30,7 @@
$lang['text info heading new currency']="Nouvelle devise" ;
$lang['text info heading edit currency']="Éditer la devise" ;
$lang['text info heading delete currency']="Supprimer la devise" ;
-$lang['text info set as default']=" ".EXT_SET_DEFAULT . " (Requiert une mise à jour manuelle de la valeur de la devise)" ;
+$lang['text info set as default']=" Definir comme valeur par defaut. (Requiert que vous utilisez la valeur 1.00 et lancer une mise à jour des devises)" ;
$lang['text info currency updated']="Le taux de change pour %s (%s) a été mis à jour avec succès par l'intermédiaire de %s." ;
$lang['error remove default currency']="Erreur : La devise par défaut ne peut être supprimé. Merci de choisir une autre devise par défaut et de réessayer." ;
$lang['error currency invalid']="Erreur : Le taux de change pour %s (%s) n'a pas été mis à jour par l'intermédiaire de %s. S'agit-t'il d'un code devise valide ?" ;
Modified: trunk/catalog/admin/includes/modules/pages/attributes.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/attributes.php 2011-11-26 14:31:54 UTC (rev 3914)
+++ trunk/catalog/admin/includes/modules/pages/attributes.php 2011-11-26 22:04:33 UTC (rev 3915)
@@ -4,7 +4,7 @@
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 01/11/11, 09:50
+ @date 26/11/11, 21:49
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class attributes
@@ -314,29 +314,59 @@
'</span>';
}
- //! flag optionnel
+
+ /**
+ @brief return format html for row flag optionnel
+ @param $product array restuts row
+ @return string html
+ */
private static function get_item_optionnel($item){
- if ($item['products_options_condition'] == '1') {
- return tep_image(DIR_WS_ICONS . 'icon_status_green.gif', IMAGE_ICON_STATUS_GREEN) . ' <a href="' . tep_href_link(attributes::FILENAME ,'action=setcond&flag=0&poID=' . $item['products_options_id'] ) . '">' . tep_image(DIR_WS_ICONS . 'icon_status_red_light.gif', IMAGE_ICON_STATUS_RED_LIGHT) . '</a>';
- } else {
- return '<a href="' . tep_href_link(attributes::FILENAME ,'action=setcond&flag=1&poID=' . $item['products_options_id'] ) . '">' . tep_image(DIR_WS_ICONS . 'icon_status_green_light.gif', IMAGE_ICON_STATUS_GREEN_LIGHT) . '</a> ' . tep_image(DIR_WS_ICONS . 'icon_status_red.gif', IMAGE_ICON_STATUS_RED);
- }
+ $exclude=array('action','cID','forceajax','type','class','function','funct', 'mod');
+ $query_s='action=setcond&cID=' . $item['products_options_id'].'&flag=';
+
+ return '<a href="' . tep_href_link(self::FILENAME, tep_get_all_get_params($exclude).$query_s.(($item['products_options_condition'] == '1')? '0' : '1') ) . '">'.
+ sprintf(
+ CsrtAction::getFormat('row_flag'),
+ (int)$item['products_options_condition'],
+ ( ($item['products_options_condition'] == '1')? IMAGE_ICON_STATUS_GREEN : IMAGE_ICON_STATUS_RED)
+ ).
+ '</a>';
}
- //! flag track stock
+
+ /**
+ @brief return format html for row stock
+ @param $product array restuts row
+ @return string html
+ */
private static function get_item_stock($item){
- if ($item['products_options_track_stock'] == '1') {
- return tep_image(DIR_WS_ICONS . 'icon_status_green.gif', IMAGE_ICON_STATUS_GREEN) . ' <a href="' . tep_href_link(attributes::FILENAME,'action=setstock&flag=0&poID=' . $item['products_options_id'] ) . '">' . tep_image(DIR_WS_ICONS . 'icon_status_red_light.gif', IMAGE_ICON_STATUS_RED_LIGHT) . '</a>';
- } else {
- return '<a href="' . tep_href_link(attributes::FILENAME, 'action=setstock&flag=1&poID=' . $item['products_options_id'] ) . '">' . tep_image(DIR_WS_ICONS . 'icon_status_green_light.gif', IMAGE_ICON_STATUS_GREEN_LIGHT) . '</a> ' . tep_image(DIR_WS_ICONS . 'icon_status_red.gif', IMAGE_ICON_STATUS_RED);
- }
+ $exclude=array('action','cID','forceajax','type','class','function','funct', 'mod');
+ $query_s='action=setstock&cID=' . $item['products_options_id'].'&flag=';
+
+ return '<a href="' . tep_href_link(self::FILENAME, tep_get_all_get_params($exclude).$query_s.(($item['products_options_track_stock'] == '1')? '0' : '1') ) . '">'.
+ sprintf(
+ CsrtAction::getFormat('row_flag'),
+ (int)$item['products_options_track_stock'],
+ ( ($item['products_options_track_stock'] == '1')? IMAGE_ICON_STATUS_GREEN : IMAGE_ICON_STATUS_RED)
+ ).
+ '</a>';
}
- //! flag image
+
+ /**
+ @brief return format html for row image
+ @param $product array restuts row
+ @return string html
+ */
private static function get_item_images($item){
- if ($item['products_options_images_enabled'] == '1') {
- return tep_image(DIR_WS_ICONS . 'icon_status_green.gif', IMAGE_ICON_STATUS_GREEN) . ' <a href="' . tep_href_link(attributes::FILENAME, 'action=setimg&flag=0&poID=' . $item['products_options_id'] ) . '">' . tep_image(DIR_WS_ICONS . 'icon_status_red_light.gif', IMAGE_ICON_STATUS_RED_LIGHT) . '</a>';
- } else {
- return '<a href="' . tep_href_link(attributes::FILENAME, 'action=setimg&flag=1&poID=' . $item['products_options_id'] ) . '">' . tep_image(DIR_WS_ICONS . 'icon_status_green_light.gif', IMAGE_ICON_STATUS_GREEN_LIGHT) . '</a> ' . tep_image(DIR_WS_ICONS . 'icon_status_red.gif', IMAGE_ICON_STATUS_RED);
- }
+ $exclude=array('action','cID','forceajax','type','class','function','funct', 'mod');
+ $query_s='action=setimg&cID=' . $item['products_options_id'].'&flag=';
+
+ return '<a href="' . tep_href_link(self::FILENAME, tep_get_all_get_params($exclude).$query_s.(($item['products_options_images_enabled'] == '1')? '0' : '1') ) . '">'.
+ sprintf(
+ CsrtAction::getFormat('row_flag'),
+ (int)$item['products_options_images_enabled'],
+ ( ($item['products_options_images_enabled'] == '1')? IMAGE_ICON_STATUS_GREEN : IMAGE_ICON_STATUS_RED)
+ ).
+ '</a>';
}
private static function emptyResult(){
Modified: trunk/catalog/admin/includes/modules/pages/backup.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/backup.php 2011-11-26 14:31:54 UTC (rev 3914)
+++ trunk/catalog/admin/includes/modules/pages/backup.php 2011-11-26 22:04:33 UTC (rev 3915)
@@ -3,8 +3,8 @@
@licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 05/06/11, 18:10
+ @version 2.1.1
+ @date 26/11/11, 21:49
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class backup
@@ -357,25 +357,8 @@
}
-// public static function get_right_bar()
-// {
-// // case 'detail':
-// // if (isset($buInfo) && is_object($buInfo)) {
-// // $heading[] = array('text' => $buInfo->date );
-// //
-// // $contents[] = array('class' => 'button_nav', 'text' => '<a class="button" href="' . tep_href_link(self::FILENAME, 'file=' . $buInfo->file . '&action=restore') . '">' .__('image restore') . '</a> <a class="button" href="' . tep_href_link(self::FILENAME, 'file=' . $buInfo->file . '&action=delete') . '">' . IMAGE_DELETE . '</a>');
-// // $contents[] = array('text' => __('text info date').' '. $buInfo->date);
-// // $contents[] = array('text' => __('text info size') .' '. $buInfo->size);
-// // $contents[] = array('text' => __('text info compression') .' '. $buInfo->compression);
-// // }
-// // break;
-// }
-
-
-
-
public static function tep_get_list($page=1,$rowbyp=10,$sOrder='',$sWhere='',$options=''){
global $query_numrows;
Modified: trunk/catalog/admin/includes/modules/pages/categories.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/categories.php 2011-11-26 14:31:54 UTC (rev 3914)
+++ trunk/catalog/admin/includes/modules/pages/categories.php 2011-11-26 22:04:33 UTC (rev 3915)
@@ -425,18 +425,41 @@
);
}
+
+ /**
+ @brief return format html for row status
+ @param $product array restuts row
+ @return string html
+ */
private static function get_status_categories($categories){
- if ($categories['categories_status'] == '1')
- return tep_image(DIR_WS_ICONS . 'icon_status_green.gif', IMAGE_ICON_STATUS_GREEN) . ' <a href="' . tep_href_link(categories::FILENAME, 'action=setflag&flag=0&cID=' . $categories['categories_id'] . '&cPath=' . self::$cPath) . '">' . tep_image(DIR_WS_ICONS . 'icon_status_red_light.gif', IMAGE_ICON_STATUS_RED_LIGHT) . '</a>';
- else
- return '<a href="' . tep_href_link(categories::FILENAME, 'action=setflag&flag=1&cID=' . $categories['categories_id'] . '&cPath=' . self::$cPath) . '">' . tep_image(DIR_WS_ICONS . 'icon_status_green_light.gif', IMAGE_ICON_STATUS_GREEN_LIGHT) . '</a> ' . tep_image(DIR_WS_ICONS . 'icon_status_red.gif', IMAGE_ICON_STATUS_RED);
+ $exclude=array('action','cID','forceajax','type','class','function','funct', 'mod');
+ $query_s='action=setflag&cID=' . $categories['categories_id'].'&flag=';
+
+ return '<a href="' . tep_href_link(self::FILENAME, tep_get_all_get_params($exclude).$query_s.(($categories['categories_status'] == '1')? '0' : '1') ) . '">'.
+ sprintf(
+ CsrtAction::getFormat('row_flag'),
+ (int)$categories['categories_status'],
+ ( ($categories['categories_status'] == '1')? IMAGE_ICON_STATUS_GREEN : IMAGE_ICON_STATUS_RED)
+ ).
+ '</a>';
}
+ /**
+ @brief return format html for row hidden
+ @param $product array restuts row
+ @return string html
+ */
private static function get_status_menu($categories){
- if ($categories['categories_hidden'] == '1')
- return tep_image(DIR_WS_ICONS . 'icon_status_green.gif', IMAGE_ICON_STATUS_GREEN) . ' <a href="' . tep_href_link(self::FILENAME, 'action=viewflag&flag=0&cID=' . $categories['categories_id'] . '&cPath=' . self::$cPath) . '" title="'.__('view in menu').'">' . tep_image(DIR_WS_ICONS . 'icon_status_red_light.gif', IMAGE_ICON_STATUS_RED_LIGHT) . '</a>';
- else
- return '<a href="' . tep_href_link(self::FILENAME, 'action=viewflag&flag=1&cID=' . $categories['categories_id'] . '&cPath=' . self::$cPath) . '" title="'.__('view in menu').'">' . tep_image(DIR_WS_ICONS . 'icon_status_green_light.gif', IMAGE_ICON_STATUS_GREEN_LIGHT) . '</a> ' . tep_image(DIR_WS_ICONS . 'icon_status_red.gif', IMAGE_ICON_STATUS_RED);
+ $exclude=array('action','cID','forceajax','type','class','function','funct', 'mod');
+ $query_s='action=viewflag&cID=' . $categories['categories_id'].'&flag=';
+
+ return '<a href="' . tep_href_link(self::FILENAME, tep_get_all_get_params($exclude).$query_s.(($categories['categories_hidden'] == '1')? '0' : '1') ) . '">'.
+ sprintf(
+ CsrtAction::getFormat('row_flag'),
+ (int)$categories['categories_hidden'],
+ ( ($categories['categories_hidden'] == '1')? IMAGE_ICON_STATUS_GREEN : IMAGE_ICON_STATUS_RED)
+ ).
+ '</a>';
}
public static function tep_get_modele(){
Modified: trunk/catalog/admin/includes/modules/pages/cms_content.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/cms_content.php 2011-11-26 14:31:54 UTC (rev 3914)
+++ trunk/catalog/admin/includes/modules/pages/cms_content.php 2011-11-26 22:04:33 UTC (rev 3915)
@@ -280,8 +280,16 @@
@param $content array
*/
private static function get_item_status($content){
- if($content['content_status'] == '1') return tep_image(DIR_WS_ICONS . 'icon_status_green.gif', IMAGE_ICON_STATUS_GREEN) . ' <a href="' . tep_href_link(self::FILENAME, 'action=setflag&flag=0&cID=' . $content['content_id']) . '">' . tep_image(DIR_WS_ICONS . 'icon_status_red_light.gif', IMAGE_ICON_STATUS_RED_LIGHT) . '</a>';
- else return '<a href="' . tep_href_link(self::FILENAME, 'action=setflag&flag=1&cID=' . $content['content_id']) . '">' . tep_image(DIR_WS_ICONS . 'icon_status_green_light.gif', IMAGE_ICON_STATUS_GREEN_LIGHT) . '</a> ' . tep_image(DIR_WS_ICONS . 'icon_status_red.gif', IMAGE_ICON_STATUS_RED) ;
+ $exclude=array('action','cID','forceajax','type','class','function','funct', 'mod');
+ $query_s='action=setflag&cID=' . $content['content_id'].'&flag=';
+
+ return '<a href="' . tep_href_link(self::FILENAME, tep_get_all_get_params($exclude).$query_s.(($content['content_status'] == '1')? '0' : '1') ) . '">'.
+ sprintf(
+ CsrtAction::getFormat('row_flag'),
+ (int)$content['content_status'],
+ ( ($content['content_status'] == '1')? IMAGE_ICON_STATUS_GREEN : IMAGE_ICON_STATUS_RED)
+ ).
+ '</a>';
}
/**
@@ -290,8 +298,17 @@
@param $content array
*/
private static function get_item_content_hidden($content){
- if($content['content_hidden'] == '1') return tep_image(DIR_WS_ICONS . 'icon_status_green.gif', IMAGE_ICON_STATUS_GREEN) . ' <a href="' . tep_href_link(self::FILENAME, 'action=viewflag&flag=0&cID=' . $content['content_id']) . '">' . tep_image(DIR_WS_ICONS . 'icon_status_red_light.gif', IMAGE_ICON_STATUS_RED_LIGHT) . '</a>';
- else return '<a href="' . tep_href_link(self::FILENAME, 'action=viewflag&flag=1&cID=' . $content['content_id']) . '">' . tep_image(DIR_WS_ICONS . 'icon_status_green_light.gif', IMAGE_ICON_STATUS_GREEN_LIGHT) . '</a> ' . tep_image(DIR_WS_ICONS . 'icon_status_red.gif', IMAGE_ICON_STATUS_RED) ;
+
+ $exclude=array('action','cID','forceajax','type','class','function','funct', 'mod');
+ $query_s='action=viewflag&cID=' . $content['content_id'].'&flag=';
+
+ return '<a href="' . tep_href_link(self::FILENAME, tep_get_all_get_params($exclude).$query_s.(($content['content_hidden'] == '1')? '0' : '1') ) . '">'.
+ sprintf(
+ CsrtAction::getFormat('row_flag'),
+ (int)$content['content_hidden'],
+ ( ($content['content_hidden'] == '1')? IMAGE_ICON_STATUS_GREEN : IMAGE_ICON_STATUS_RED)
+ ).
+ '</a>';
}
/**
Modified: trunk/catalog/admin/includes/modules/pages/cronjob.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/cronjob.php 2011-11-26 14:31:54 UTC (rev 3914)
+++ trunk/catalog/admin/includes/modules/pages/cronjob.php 2011-11-26 22:04:33 UTC (rev 3915)
@@ -3,8 +3,8 @@
@licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 22/03/11, 21:28
+ @version 2.1.1
+ @date 26/11/11, 21:45
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class cronjob
@@ -284,12 +284,23 @@
}
+ /**
+ @brief return format html for row status
+ @param $product array restuts row
+ @return string html
+ */
private static function get_item_status($array){
- if ($array['status'] == '1')
- return tep_image(DIR_WS_ICONS . 'icon_status_green.gif', IMAGE_ICON_STATUS_GREEN) . ' <a href="' . tep_href_link(self::FILENAME, 'action=setflag&flag=0&cID=' .$array['id']) . '">' . tep_image(DIR_WS_ICONS . 'icon_status_red_light.gif', IMAGE_ICON_STATUS_RED_LIGHT) . '</a>';
- else
- return '<a href="' . tep_href_link(self::FILENAME, 'action=setflag&flag=1&cID=' . $array['id'] ) . '">' . tep_image(DIR_WS_ICONS . 'icon_status_green_light.gif', IMAGE_ICON_STATUS_GREEN_LIGHT) . '</a> ' . tep_image(DIR_WS_ICONS . 'icon_status_red.gif', IMAGE_ICON_STATUS_RED);
+ $exclude=array('action','cID','forceajax','type','class','function','funct', 'mod');
+ $query_s='action=setflag&cID=' . $array['id'].'&flag=';
+ return '<a href="' . tep_href_link(self::FILENAME, tep_get_all_get_params($exclude).$query_s.(($array['status'] == '1')? '0' : '1') ) . '">'.
+ sprintf(
+ CsrtAction::getFormat('row_flag'),
+ (int)$array['status'],
+ ( ($array['status'] == '1')? IMAGE_ICON_STATUS_GREEN : IMAGE_ICON_STATUS_RED)
+ ).
+ '</a>';
+
}
/**
Modified: trunk/catalog/admin/includes/modules/pages/currencies.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/currencies.php 2011-11-26 14:31:54 UTC (rev 3914)
+++ trunk/catalog/admin/includes/modules/pages/currencies.php 2011-11-26 22:04:33 UTC (rev 3915)
@@ -11,6 +11,13 @@
@brief This class manipulate devise (add/up/delete)
*/
+// Define how do we update currency exchange rates
+// Possible values are 'oanda' 'xe' or ''
+ define('CURRENCY_SERVER_PRIMARY', 'oanda');
+ define('CURRENCY_SERVER_BACKUP', 'xe');
+
+
+
class currencies
implements ExtModPage, InterfacedTJsonS, InterfaceModule {
Modified: trunk/catalog/admin/includes/modules/pages/customers.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/customers.php 2011-11-26 14:31:54 UTC (rev 3914)
+++ trunk/catalog/admin/includes/modules/pages/customers.php 2011-11-26 22:04:33 UTC (rev 3915)
@@ -407,6 +407,11 @@
);
}
+ /**
+ @brief return format html for row
+ @param $product array restuts row
+ @return string html
+ */
private static function get_status_da($customers){
return sprintf(
CsrtAction::getFormat('row_etat'),
@@ -415,6 +420,11 @@
);
}
+ /**
+ @brief return format html for row status
+ @param $product array restuts row
+ @return string html
+ */
private static function get_status_c($customers){
$exclude=array('action','cID','forceajax','type','class','function','funct', 'mod');
$query_s='action=setflag&cID=' . $customers['customers_id'].'&flag=';
Modified: trunk/catalog/admin/includes/modules/pages/held_orders.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/held_orders.php 2011-11-26 14:31:54 UTC (rev 3914)
+++ trunk/catalog/admin/includes/modules/pages/held_orders.php 2011-11-26 22:04:33 UTC (rev 3915)
@@ -3,8 +3,8 @@
@licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 07/06/11, 22:17
+ @version 2.1.1
+ @date 26/11/11, 22:33
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class held_orders
@@ -252,7 +252,7 @@
return sprintf(
CsrtAction::getFormat('row_action'),
'' ,
- sprintf(CsrtAction::getLink('row_action_right', __('image recup help order'), 'recup_order'), '', tep_href_link(self::FILENAME, 'oID=' . $orders['oID'] . '&action=new_product') ,'' ).
+ sprintf(CsrtAction::getLink('row_action_right', __('image recup help order'), 'recup_order'), 'fancy', tep_href_link(self::FILENAME, 'oID=' . $orders['oID'] . '&action=recup_order') ,'' ).
sprintf(CsrtAction::getLink('row_action_right', IMAGE_DELETE, 'delete'), 'fancy', tep_href_link(self::FILENAME, 'oID=' . $orders['oID'] . '&action=delete') ,'' )
);
}
Modified: trunk/catalog/admin/includes/modules/pages/orders.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/orders.php 2011-11-26 14:31:54 UTC (rev 3914)
+++ trunk/catalog/admin/includes/modules/pages/orders.php 2011-11-26 22:04:33 UTC (rev 3915)
@@ -173,6 +173,12 @@
}
+
+
+ global $oscss;
+ $oscss->_add_ext(BO_WISIWYG_SELECTED,'editeur/');
+ echo $oscss->_call(BO_WISIWYG_SELECTED,'_top','comments','800','400');
+
return true;
}
@@ -344,7 +350,12 @@
}
public function get_header(){
- if (self::$action == 'edit'): ?>
+ if (self::$action == 'edit'):
+
+
+
+
+ ?>
<script type="text/javascript"><!--
function disabled(inputs){$(inputs).css.display='none';}
function activ(inputs){$(inputs).css.display='inline';}
Modified: trunk/catalog/admin/includes/modules/pages/products.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/products.php 2011-11-26 14:31:54 UTC (rev 3914)
+++ trunk/catalog/admin/includes/modules/pages/products.php 2011-11-26 22:04:33 UTC (rev 3915)
@@ -556,14 +556,22 @@
);
}
+ /**
+ @brief return format html for row status
+ @param $product array restuts row product
+ @return string html
+ */
private static function get_status_product($products){
$exclude=array('action','pID','forceajax','type','class','function','funct', 'mod');
$query_s='action=setflag&pID=' . $products['products_id'].'&flag=';
- if ($products['products_status'] == '1')
- return tep_image(DIR_WS_ICONS . 'icon_status_green.gif', IMAGE_ICON_STATUS_GREEN) . ' <a href="' . tep_href_link(self::FILENAME, tep_get_all_get_params($exclude).$query_s.'0' ) . '">' . tep_image(DIR_WS_ICONS . 'icon_status_red_light.gif', IMAGE_ICON_STATUS_RED_LIGHT) . '</a>';
- else
- return '<a href="' . tep_href_link(self::FILENAME, tep_get_all_get_params($exclude).$query_s.'1') . '">' . tep_image(DIR_WS_ICONS . 'icon_status_green_light.gif', IMAGE_ICON_STATUS_GREEN_LIGHT) . '</a> ' . tep_image(DIR_WS_ICONS . 'icon_status_red.gif', IMAGE_ICON_STATUS_RED);
+ return '<a href="' . tep_href_link(self::FILENAME, tep_get_all_get_params($exclude).$query_s.(($products['products_status'] == '1')? '0' : '1') ) . '">'.
+ sprintf(
+ CsrtAction::getFormat('row_flag'),
+ (int)$products['products_status'],
+ ( ($products['products_status'] == '1')? IMAGE_ICON_STATUS_GREEN : IMAGE_ICON_STATUS_RED)
+ ).
+ '</a>';
}
private static function emptyResult(){
Modified: trunk/catalog/admin/includes/template/oscss/stylesheet-1.css
===================================================================
--- trunk/catalog/admin/includes/template/oscss/stylesheet-1.css 2011-11-26 14:31:54 UTC (rev 3914)
+++ trunk/catalog/admin/includes/template/oscss/stylesheet-1.css 2011-11-26 22:04:33 UTC (rev 3915)
@@ -254,7 +254,7 @@
#user ul#MenuExts li a {color:white;}
#user ul#MenuExts li a:hover{color:gray;}
#user li { position:relative; float:left;}
- #user a { display:block; padding-top:4px; color:#000; text-decoration:none; text-shadow:0 1px 0 #fff; height:18px; text-align:center; font:normal 11px Verdana, Arial, sans-serif; }
+ #user a { display:block; padding-top:4px; color:#000; text-decoration:none; text-shadow:none; height:18px; text-align:center; font:normal 11px Verdana, Arial, sans-serif; }
/* Switcher */
p.themeSwitcher { float:right; margin:0; padding:2px 1em 0 0; text-align:right; width:250px; }
p.themeSwitcher select { vertical-align:middle; font-size:0.9em; width:100px; }
Modified: trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql 2011-11-26 14:31:54 UTC (rev 3914)
+++ trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql 2011-11-26 22:04:33 UTC (rev 3915)
@@ -239,6 +239,7 @@
-- 17 General Backoffice
insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('BO_FILEBROSWER_SERVER_USE_S', 'BO_FILEBROSWER_SERVER_USE', 'tinybrowser', 'BO_FILEBROSWER_SERVER_USE_L', '17', '0', NOW(), NOW(), NULL, NULL, '1');
insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('BO_WISIWYG_SELECTED_S', 'BO_WISIWYG_SELECTED', 'tiny_mce', 'BO_WISIWYG_SELECTED_L', '17', '0', NOW(), NOW(), NULL, 'tep_cfg_select_option_bis(modadminconfig::GetBrowser(),', '1');
+-- section checkupsys modules presinstall
insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type ) values ('CHECKUP_WARN_S', 'CHECKUP_WARN', 'true', 'CHECKUP_WARN_L', '17', '6', NOW(), NOW(),'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),','1');
insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('WARN_INSTALL_EXISTENCE_S', 'WARN_INSTALL_EXISTENCE', 'true', 'WARN_INSTALL_EXISTENCE_L', '17', '7', NOW(), NOW(),'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),','1');
insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('WARN_CONFIG_WRITEABLE_S', 'WARN_CONFIG_WRITEABLE', 'true', 'WARN_CONFIG_WRITEABLE_L', '17', '8', NOW(), NOW(),'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),','1');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-11-26 14:32:02
|
Revision: 3914
http://oscss.svn.sourceforge.net/oscss/?rev=3914&view=rev
Author: oscim
Date: 2011-11-26 14:31:54 +0000 (Sat, 26 Nov 2011)
Log Message:
-----------
report des controls en modules, et suppression class checkup_sys
suppression des elements de langue du fichier principal
Modified Paths:
--------------
trunk/catalog/admin/includes/appli_top_Test.php
trunk/catalog/admin/includes/application_top.php
trunk/catalog/admin/includes/content/aca.central.inc
trunk/catalog/admin/includes/content/aca.top.inc
trunk/catalog/admin/includes/languages/fr_FR/fr_FR.php
Added Paths:
-----------
trunk/catalog/admin/includes/gabarit/CheckCore/
trunk/catalog/admin/includes/gabarit/CheckCore/display_view.view.gab
trunk/catalog/admin/includes/languages/fr_FR/modules/generic/CheckCore.txt
trunk/catalog/admin/includes/modules/generic/CheckCore.php
Removed Paths:
-------------
trunk/catalog/admin/includes/classes/osCSS_checkupSys.php
Modified: trunk/catalog/admin/includes/appli_top_Test.php
===================================================================
--- trunk/catalog/admin/includes/appli_top_Test.php 2011-11-26 13:06:22 UTC (rev 3913)
+++ trunk/catalog/admin/includes/appli_top_Test.php 2011-11-26 14:31:54 UTC (rev 3914)
@@ -209,12 +209,8 @@
$languages_array = array();
$languages_selected = DEFAULT_LANGUAGE;
-/// Checkup systeme
- if (_cst_bool('CHECKUP_WARN')) new checkupSys;
/// Element modulaire aca
-// require ($rpa.DIR_WS_CLASSES.'aca.generic.php');
-// $generic_modules = new generic();
$generic_modules = new AcaFactory('generic');
/// Definition pour gestion affichage
Modified: trunk/catalog/admin/includes/application_top.php
===================================================================
--- trunk/catalog/admin/includes/application_top.php 2011-11-26 13:06:22 UTC (rev 3913)
+++ trunk/catalog/admin/includes/application_top.php 2011-11-26 14:31:54 UTC (rev 3914)
@@ -217,12 +217,7 @@
$languages_array = array();
$languages_selected = DEFAULT_LANGUAGE;
-/// Checkup systeme
- if (_cst_bool('CHECKUP_WARN')) new checkupSys;
-
/// Element modulaire aca
-// require ($rpa.DIR_WS_CLASSES.'aca.generic.php');
-// $generic_modules = new generic();
$generic_modules = new AcaFactory('generic');
/// Definition pour gestion affichage
Deleted: trunk/catalog/admin/includes/classes/osCSS_checkupSys.php
===================================================================
--- trunk/catalog/admin/includes/classes/osCSS_checkupSys.php 2011-11-26 13:06:22 UTC (rev 3913)
+++ trunk/catalog/admin/includes/classes/osCSS_checkupSys.php 2011-11-26 14:31:54 UTC (rev 3914)
@@ -1,95 +0,0 @@
-<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
-/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 12/12/10, 15:25
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
- @brief checkup system
-*/
-
-class checkupSys{
-
- private static $check;
-
- function __construct(){
- $messageStack=messageStack::getInstance();
- $checkup_sys=0;
-
- $checkup_sys=$this->checkup();
-
- if(is_array($checkup_sys)) {
- foreach($checkup_sys as $alert)
- $messageStack->add((string)$alert['mess'], $alert['type']) ;
- }
-
- }
-
-
- /**
- Mise en tampon des alerts
- */
- private function add($mess, $type){
- self::$check[]=array('mess'=>$mess, 'type'=>$type);
- }
-
- /**
- Checkup
- */
- private function checkup(){
-
- //!check if the 'install' directory exists, and warn of its existence
- if (_cst_bool('WARN_INSTALL_EXISTENCE'))
- if (file_exists(DIR_FS_CATALOG. 'install'))
- $this->add( WARNING_INSTALL_DIRECTORY_EXISTS, 'warning');
-
-
- //!check if the configure.php file is writeable
- if (_cst_bool('WARN_CONFIG_WRITEABLE'))
- if ( (file_exists(DIR_FS_CATALOG . 'includes/configure.php')) && (is_writeable(DIR_FS_CATALOG. 'includes/configure.php')) )
- $this->add( WARNING_CONFIG_FILE_WRITEABLE.tep_get_file_permissions(fileperms(DIR_FS_CATALOG. 'includes/configure.php')), 'warning');
-
-
- //!check if the session folder is writeable
- if (_cst_bool('WARN_SESSION_DIRECTORY_NOT_WRITEABLE'))
- if (STORE_SESSIONS == '')
- if (!is_dir(tep_session_save_path())) {
- $this->add( WARNING_SESSION_DIRECTORY_NON_EXISTENT, 'warning');
- } elseif (!is_writeable(tep_session_save_path())) {
- $this->add( WARNING_SESSION_DIRECTORY_NOT_WRITEABLE, 'warning');
- }
-
-
- //!check session.auto_start is disabled
- if ( (function_exists('ini_get')) && (_cst_bool('WARN_SESSION_AUTO_START')) )
- if (ini_get('session.auto_start') == '1')
- $this->add( WARNING_SESSION_AUTO_START, 'warning');
-
-
- if ( (_cst_bool('WARN_DOWNLOAD_DIRECTORY_NOT_READABLE')) && (_cst_bool('DOWNLOAD_ENABLED')) )
- if (!is_dir(DIR_FS_CATALOG.DIR_WS_DOWNLOAD))
- $this->add( WARNING_DOWNLOAD_DIRECTORY_NON_EXISTENT, 'warning');
-
-
-
- /// check if a default currency is set
- if (!defined('DEFAULT_CURRENCY'))
- $this->add(ERROR_NO_DEFAULT_CURRENCY_DEFINED, 'error');
-
- /// check if a default language is set
- if (!defined('DEFAULT_LANGUAGE'))
- $this->add(ERROR_NO_DEFAULT_LANGUAGE_DEFINED, 'error');
-
- //!
- if (function_exists('ini_get') && ((bool)ini_get('file_uploads') == false) )
- $this->add(WARNING_FILE_UPLOADS_DISABLED, 'warning');
-
-
- return self::$check;
- }
-
-}
-
-?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/content/aca.central.inc
===================================================================
--- trunk/catalog/admin/includes/content/aca.central.inc 2011-11-26 13:06:22 UTC (rev 3913)
+++ trunk/catalog/admin/includes/content/aca.central.inc 2011-11-26 14:31:54 UTC (rev 3914)
@@ -1,11 +1,12 @@
<?php
/**
- @licence GPL 2005-2009 The osCSS developers - osCSS Open Source E-commerce
- @package oscss-2 <www http://www.oscss.org>
- @version Rc-3
- @date 27/04/10, 15:31
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 26/11/11, 14:28
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
+ @encode UTF-8
*/
?>
<!-- body //-->
@@ -15,9 +16,30 @@
/** ACA incluion specifique */ include DIR_WS_INCLUDES.$actions['display_file'];
elseif (!empty($actions['action_method'])){
-/** ACA function specifique */
- if(isset($box) && is_object($box)) print( $box->TableBox( $box->_call_pile() ) );
- else echo $box;
+
+ /**
+ @remarks ACA function specifique
+ This box is array in format class box
+ */
+ if(isset($box) && is_object($box))
+ print( $box->TableBox( $box->_call_pile() ) );
+ /**
+ @remarks ACA function specifique
+ $box is array:
+ array
+ 0 =>
+ array
+ 'title' => string ''
+ 'text' => string ''
+ */
+ if(isset($box) && is_array($box) && isset($box[0]['text']) ){
+ echo $box[0]['text'];
+ }
+ /**
+ @remarks Draw string
+ */
+ else
+ echo $box;
}
?>
Modified: trunk/catalog/admin/includes/content/aca.top.inc
===================================================================
--- trunk/catalog/admin/includes/content/aca.top.inc 2011-11-26 13:06:22 UTC (rev 3913)
+++ trunk/catalog/admin/includes/content/aca.top.inc 2011-11-26 14:31:54 UTC (rev 3914)
@@ -3,8 +3,8 @@
@licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 04/07/11, 10:14
+ @version 2.1.1
+ @date 26/11/11, 14:28
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@brief page call for action ajax
@@ -32,8 +32,7 @@
$post_exe=false;
/**
- @remarks
- generic init in appli top
+ @remarks generic init in appli top
*/
if($actions['action_type']=='generic'){
$aca_modules=$generic_modules;
@@ -41,7 +40,6 @@
}
/**
@remarks Init class type pages for call methode no static
-
*/
elseif(!class_exists($actions['action_type']) && $actions['action_type']=='pages' && file_exists(DIR_WS_MODULES.'pages/'.$actions['action_class'].'.php')){
include (DIR_WS_MODULES.'pages/'.$actions['action_class'].'.php');
@@ -92,10 +90,9 @@
$box=$aca_modules->modules[$actions['action_class']]->$actions['action_method']($box,(int)$ID);
}
if ($post_exe && (isset($aca_modules->modules[$actions['action_class']])) )
- if (!empty($actions['action_method']) && method_exists($aca_modules->modules[$actions['action_class']],$actions['action_method'] )){
- echo $aca_modules->modules[$actions['action_class']]->$actions['action_method']($box,(int)$ID);
- exit;
- }
- else $box='';
+ if (!empty($actions['action_method']) && method_exists($aca_modules->modules[$actions['action_class']],$actions['action_method'] ))
+ $box=$aca_modules->modules[$actions['action_class']]->$actions['action_method']($box,(int)$ID);
+ else
+ $box='';
?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/gabarit/CheckCore/display_view.view.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/CheckCore/display_view.view.gab (rev 0)
+++ trunk/catalog/admin/includes/gabarit/CheckCore/display_view.view.gab 2011-11-26 14:31:54 UTC (rev 3914)
@@ -0,0 +1,19 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 26/11/11, 15:18
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+?>
+<h3><?php echo __('CheckCore heading title') ?></h3>
+
+
+<?php foreach( CheckCore::$check as $row): ?>
+ <p class="<?php echo $row['type']; ?>">
+ <?php echo $row['mess']; ?>
+ </p>
+<?php endforeach; ?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/languages/fr_FR/fr_FR.php
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/fr_FR.php 2011-11-26 13:06:22 UTC (rev 3913)
+++ trunk/catalog/admin/includes/languages/fr_FR/fr_FR.php 2011-11-26 14:31:54 UTC (rev 3914)
@@ -1,9 +1,10 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 09/12/10, 17:23
+ @version 2.1.1
+ @date 26/11/11, 15:25
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@brief master file for languages
@@ -312,18 +313,6 @@
define('FIRST',"Premier" );
define('PREVIOUS',"Dernier" );
-
-
-define('WARNING_INSTALL_DIRECTORY_EXISTS',"Attention : le répertoire d'installation existe à : " . DIR_WS_CATALOG . "install. Veuillez supprimer ce répertoire pour des raisons de sécurité." );
-define('WARNING_CONFIG_FILE_WRITEABLE',"Attention : Il est possible d'écrire sur le fichier de configuration : " . DIR_WS_CATALOG . "includes/configure.php. Ceci est un risque potentiel - Mettez les bonnes permissions sur ce fichier." );
-define('WARNING_SESSION_DIRECTORY_NON_EXISTENT',"Attention : Le répertoire de session n'existe pas : " . tep_session_save_path() . ". Les sessions ne fonctionneront pas tant que ce répertoire n'aura pas été créé." );
-define('WARNING_SESSION_DIRECTORY_NOT_WRITEABLE',"Attention : Il est impossible d'écrire dans le répertoire de sessions " . tep_session_save_path() .". Les sessions ne fonctionneront pas tant que les permissions n'auront pas été corrigées." );
-define('WARNING_SESSION_AUTO_START',"Attention : session.auto_start is enabled - désactiver cette fonctionnalité dans php.ini et redémarrer le serveur http." );
-define('WARNING_DOWNLOAD_DIRECTORY_NON_EXISTENT',"Attention : Le répertoire de téléchargement n'existe pas : " . DIR_WS_CATALOG.DIR_WS_CATALOG_DOWNLOAD . ". Le téléchargement de produits ne fonctionnera qu'avec un répertoire valide." );
-define('ERROR_NO_DEFAULT_CURRENCY_DEFINED',"Erreur : Il n'y a actuellement aucune devise par défaut. Veuillez en choisir une : Outils administration->Localisation->Devises" );
-define('WARNING_FILE_UPLOADS_DISABLED',"Attention : transfert le fichier est désactivé dans le fichier de configuration php.ini." );
-define('ERROR_NO_DEFAULT_LANGUAGE_DEFINED',"Erreur : Il n'y a actuellement aucune langue par défaut. Allez à configuration/langue" );
-
// CIP ADD AUTO -- NOT TOUCH LINE
?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/generic/CheckCore.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/generic/CheckCore.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/generic/CheckCore.txt 2011-11-26 14:31:54 UTC (rev 3914)
@@ -0,0 +1,30 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 26/11/11, 15:16
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+$lang['CheckCore core protect']="Controle" ;
+$lang['CheckCore core protect description']="Controle" ;
+
+/// text button menu
+$lang['CheckCore view alerts']="Controle" ;
+/// line warning alert and link for detail
+$lang['CheckCore warning, check files or folders %s']="Attention, revoir les droit d'accés à certain fichiers ou dossiers <a href=\"%s\"> voir le detail </a> " ;
+///
+$lang['CheckCore heading title']="Controles" ;
+/// test
+$lang['warning install directory exists %s']="Attention : le répertoire d'installation existe à : %s. Veuillez supprimer ce répertoire pour des raisons de sécurité." ;
+$lang['warning config file writeable %s %s']="Attention : Il est possible d'écrire sur le fichier de configuration public : %s . les permissions actuelles sont: %s ; \n Ceci est un risque potentiel - Mettez les bonnes permissions sur ce fichier., appliqué un 0644 " ;
+$lang['warning session directory non existent %s']="Attention : Le répertoire de session n'existe pas : %s . Les sessions ne fonctionneront pas tant que ce répertoire n'aura pas été créé." ;
+$lang['warning session directory not writeable %s']="Attention : Il est impossible d'écrire dans le répertoire de sessions %s . Les sessions ne fonctionneront pas tant que les permissions n'auront pas été corrigées." ;
+$lang['warning session auto start']="Attention : session.auto_start is enabled - désactiver cette fonctionnalité dans php.ini et redémarrer le serveur http." ;
+$lang['warning download directory non existent %s']="Attention : Le répertoire de téléchargement n'existe pas : %s. Le téléchargement de produits ne fonctionnera qu'avec un répertoire valide." ;
+$lang['error no default currency defined']="Erreur : Il n'y a actuellement aucune devise par défaut. Veuillez en choisir une : Outils administration->Localisation->Devises" ;
+$lang['warning file uploads disabled']="Attention : transfert le fichier est désactivé dans le fichier de configuration php.ini." ;
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/modules/generic/CheckCore.php
===================================================================
--- trunk/catalog/admin/includes/modules/generic/CheckCore.php (rev 0)
+++ trunk/catalog/admin/includes/modules/generic/CheckCore.php 2011-11-26 14:31:54 UTC (rev 3914)
@@ -0,0 +1,221 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 17/11/11, 10:06
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class CheckCore
+*/
+class CheckCore
+ implements InterfaceModule{
+
+
+ //! page de redirection apres exec
+ const FILENAME = '';
+
+ /**
+ @var version module
+ */
+ public $version='1.1.0';
+ /**
+ @var
+ */
+ public static $code;
+ /**
+ @var
+ */
+ public $title;
+ /**
+ @var
+ */
+ public $description;
+ /**
+ @var
+ */
+ public $sort_order;
+ /**
+ @var
+ */
+ public $enabled;
+ /**
+ @var
+ */
+ public static $actu_rev;
+ /**
+ @var
+ */
+ public static $current_rev;
+ /**
+ @var
+ */
+ public static $check;
+
+ /**
+ @brief class constructor
+ */
+ function __construct() {
+
+ self::$code = __CLASS__;
+ $this->type='generic';
+ $this->enabled = true;
+ $this->sort_order = (defined('MODULE_GENERIC_CHECKCORE_SORT_ORDER')) ? MODULE_GENERIC_CHECKCORE_SORT_ORDER : 0;
+
+ $this->title = __('CheckCore core protect');
+ $this->description = __('CheckCore core protect description');
+
+ global $languages_id, $messageStack;
+ $this->language_id = $languages_id;
+
+ if (_cst_bool('CHECKUP_WARN'))
+ return false;
+
+ $CheckCore=0;
+ if(!tep_session_is_registered('CheckCore')) {
+ $_SESSION['CheckCore'] = $CheckCore = 1 ;
+ }
+ else $CheckCore=(int)$_SESSION['CheckCore'];
+
+ $messageStack=messageStack::getInstance();
+ $checkup_sys=0;
+
+ $checkup_sys=$this->checkup();
+
+ if(is_array($checkup_sys)
+ && (!isset($_GET['action_class']) || (isset($_GET['action_class']) && $_GET['action_class'] !=__CLASS__) )
+ )
+ {
+ $messageStack->add( sprintf(__("CheckCore warning, check files or folders %s"), tep_href_link(FILENAME_ACA,'action_type='.$this->type.'&action_class='.self::$code.'&action_method=display_view&action_type=generic') ) );
+
+ }
+ }
+
+
+ function check_action($actions){
+ return $actions;
+ }
+
+//=====================================
+// Functions for modules specific
+//=====================================
+
+ /**
+ @brief Ajout menu
+ */
+ public function _add_menu() {
+ return('<a href="'.tep_href_link(FILENAME_ACA,'action_type='.$this->type.'&action_class='.self::$code.'&action_method=display_view&action_type=generic').'">'.__('CheckCore view alerts').'</a>');
+ }
+
+
+ /**
+ */
+ public function display_view(){
+
+ $contents []=array('title'=> __('CheckCore title page') ,'text'=> MGabCont::CallGab('view',__FUNCTION__,__CLASS__) );
+ return $contents;
+ }
+
+
+
+ /**
+ Mise en tampon des alerts
+ */
+ private function add($mess, $type){
+ self::$check[]=array('mess'=>$mess, 'type'=>$type);
+ }
+
+ /**
+ Checkup
+ */
+ private function checkup(){
+
+ //!check if the 'install' directory exists, and warn of its existence
+ if (_cst_bool('WARN_INSTALL_EXISTENCE'))
+ if (file_exists(DIR_FS_CATALOG. 'install'))
+ $this->add( sprintf(__('warning install directory exists %s'), DIR_WS_CATALOG.'install/'), 'warning');
+
+
+ //!check if the configure.php file is writeable
+ if (_cst_bool('WARN_CONFIG_WRITEABLE'))
+ if ( (file_exists(DIR_FS_CATALOG . 'includes/configure.php')) && (is_writeable(DIR_FS_CATALOG. 'includes/configure.php')) )
+ $this->add( sprintf(__('warning config file writeable %s %s'), DIR_WS_CATALOG . "includes/configure.php" , tep_get_file_permissions(fileperms(DIR_FS_CATALOG. 'includes/configure.php')) ) , 'warning');
+
+
+ //!check if the session folder is writeable
+ if (_cst_bool('WARN_SESSION_DIRECTORY_NOT_WRITEABLE'))
+ if (STORE_SESSIONS == '')
+ if (!is_dir(tep_session_save_path())) {
+ $this->add( sprintf( __('warning session directory non existent %s'), tep_session_save_path() ), 'warning');
+ } elseif (!is_writeable(tep_session_save_path())) {
+ $this->add( sprintf( __('warning session directory not writeable %s'), tep_session_save_path() ) , 'warning');
+ }
+
+
+ //!check session.auto_start is disabled
+ if ( (function_exists('ini_get')) && (_cst_bool('WARN_SESSION_AUTO_START')) )
+ if (ini_get('session.auto_start') == '1')
+ $this->add( __('warning session auto start') , 'warning');
+
+
+ if ( (_cst_bool('WARN_DOWNLOAD_DIRECTORY_NOT_READABLE')) && (_cst_bool('DOWNLOAD_ENABLED')) )
+ if (!is_dir(DIR_FS_CATALOG.DIR_WS_DOWNLOAD))
+ $this->add( sprintf( __('warning download directory non existent %s'), DIR_WS_CATALOG.DIR_WS_CATALOG_DOWNLOAD ), 'warning');
+
+
+
+ /// check if a default currency is set
+ if (!defined('DEFAULT_CURRENCY'))
+ $this->add(__('error no default currency defined'), 'error');
+
+ /// check if a default language is set
+ if (!defined('DEFAULT_LANGUAGE'))
+ $this->add(__('error no default language defined'), 'error');
+
+ //!
+ if (function_exists('ini_get') && ((bool)ini_get('file_uploads') == false) )
+ $this->add(__('warning file uploads disabled'), 'warning');
+
+
+ return self::$check;
+ }
+
+
+
+
+
+ function check() {
+ if (!isset($this->_check)) {
+ $check_query = tep_db_query("select configuration_value from " . TABLE_CONFIGURATION . " where configuration_key = 'MODULE_GENERIC_CHECKCORE_SORT_ORDER'");
+ $this->_check = tep_db_num_rows($check_query);
+ }
+ return $this->_check;
+ }
+
+ function install() {
+ tep_db_query("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('CHECKUP_WARN_S', 'CHECKUP_WARN', 'true', 'CHECKUP_WARN_L', '17', '6', NOW(), NOW(),'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),','1'); ");
+
+ tep_db_query("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('WARN_INSTALL_EXISTENCE_S', 'WARN_INSTALL_EXISTENCE', 'true', 'WARN_INSTALL_EXISTENCE_L', '17', '7', NOW(), NOW(),'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),','1'); ");
+ tep_db_query("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('WARN_CONFIG_WRITEABLE_S', 'WARN_CONFIG_WRITEABLE', 'true', 'WARN_CONFIG_WRITEABLE_L', '17', '8', NOW(), NOW(),'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),','1'); ");
+ tep_db_query("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('WARN_SESSION_DIRECTORY_NOT_WRITEABLE_S', 'WARN_SESSION_DIRECTORY_NOT_WRITEABLE', 'true', 'WARN_SESSION_DIRECTORY_NOT_WRITEABLE_L', '17', '9', NOW(), NOW(),'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),','1'); ");
+ tep_db_query("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('WARN_DOWNLOAD_DIRECTORY_NOT_READABLE_S', 'WARN_DOWNLOAD_DIRECTORY_NOT_READABLE', 'true', 'WARN_DOWNLOAD_DIRECTORY_NOT_READABLE_L', '17', '10', NOW(), NOW(),'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),','1'); ");
+ tep_db_query("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('WARN_SESSION_AUTO_START_S', 'WARN_SESSION_AUTO_START', 'true', 'WARN_SESSION_AUTO_START_L', '17', '11', NOW(), NOW(),'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),','1'); ");
+ }
+
+ function remove() { return false; }
+
+ function keys() {
+ return array(
+ 'MODULE_GENERIC_CHECKCORE_SORT_ORDER',
+ 'CHECKUP_WARN',
+ 'WARN_INSTALL_EXISTENCE',
+ 'WARN_CONFIG_WRITEABLE',
+ 'WARN_SESSION_DIRECTORY_NOT_WRITEABLE',
+ 'WARN_DOWNLOAD_DIRECTORY_NOT_READABLE',
+ 'WARN_SESSION_AUTO_START'
+ );
+ }
+
+}
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-11-26 13:06:28
|
Revision: 3913
http://oscss.svn.sourceforge.net/oscss/?rev=3913&view=rev
Author: oscim
Date: 2011-11-26 13:06:22 +0000 (Sat, 26 Nov 2011)
Log Message:
-----------
correction coquille
public renforcement control GET/POST/REQUEST
Ajout function et control global sur application top
Ajout protect sur le htaccess
Modified Paths:
--------------
trunk/catalog/admin/includes/application_top.php
trunk/catalog/includes/application_top.php
trunk/catalog/includes/functions/general.php
trunk/catalog/install/includes/modele/admin_htaccess.txt
trunk/catalog/install/includes/modele/htaccess.txt
trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql
Modified: trunk/catalog/admin/includes/application_top.php
===================================================================
--- trunk/catalog/admin/includes/application_top.php 2011-11-24 09:58:03 UTC (rev 3912)
+++ trunk/catalog/admin/includes/application_top.php 2011-11-26 13:06:22 UTC (rev 3913)
@@ -53,9 +53,8 @@
$action = (isset($_GET['action'])) ? tep_sanitize_string($_GET['action']) : '';
//! set php_self in the local scope
- $PHP_SELF = (isset($_SERVER['PHP_SELF']) ? $_SERVER['PHP_SELF'] : $_SERVER['SCRIPT_NAME']);
+ $PHP_SELF = (isset($_SERVER['PHP_SELF']) ? tep_sanitize_string($_SERVER['PHP_SELF']) : tep_sanitize_string($_SERVER['SCRIPT_NAME']) );
-
/// make a connection to the database... now
$DB=Database::getInstance();
@@ -103,7 +102,8 @@
}
/// set the session cookie parameters
- if (function_exists('session_set_cookie_params')) session_set_cookie_params(0, DIR_WS_ADMIN);
+ if (function_exists('session_set_cookie_params'))
+ session_set_cookie_params(0, DIR_WS_ADMIN);
elseif (function_exists('ini_set')) {
ini_set('session.cookie_lifetime', '0');
ini_set('session.cookie_path', DIR_WS_ADMIN);
@@ -198,7 +198,7 @@
///this is for admin themes
- if (!isset($_GET['menu_theme']) && isset($_COOKIE['menu_theme'])) $current_theme = $_COOKIE['menu_theme'] ;
+ if (!isset($_GET['menu_theme']) && isset($_COOKIE['menu_theme'])) $current_theme = tep_sanitize_string($_COOKIE['menu_theme']) ;
else {
$current_theme = (isset($_GET['menu_theme']) ? tep_sanitize_string($_GET['menu_theme']) : get_info_core(DIR_FS_CATALOG. DIR_WS_COMMON.'oscss.version.xml','template_admin'));
setcookie('menu_theme', $current_theme , time()+31536000);
@@ -241,8 +241,9 @@
//! specific quick search in BO
if(isset($_POST['SearchSpeed'])){
- if($_REQUEST['sSearch'] !='') tep_redirect(tep_href_link($_REQUEST['SearchSpeed'].'.php','sSearch='.$_REQUEST['sSearch']));
- else tep_redirect(tep_href_link($_REQUEST['SearchSpeed'].'.php'));
+ $SearchSpeed=tep_sanitize_string($_REQUEST['SearchSpeed']);
+ if($_REQUEST['sSearch'] !='') tep_redirect(tep_href_link($SearchSpeed.'.php','sSearch='.tep_sanitize_string($_REQUEST['sSearch']) ));
+ else tep_redirect(tep_href_link($SearchSpeed.'.php'));
}
///
Modified: trunk/catalog/includes/application_top.php
===================================================================
--- trunk/catalog/includes/application_top.php 2011-11-24 09:58:03 UTC (rev 3912)
+++ trunk/catalog/includes/application_top.php 2011-11-26 13:06:22 UTC (rev 3913)
@@ -108,10 +108,19 @@
}
}
-//! control get
+
+/**
+ @remarks Protect Var GET/POST/REQUEST
+ @note if vou want to allow specific fields, added an exclusion in the loop in question
+*/
if(isset($_GET))
foreach($_GET as $k=>$v) $_GET[$k]=tep_sanitize_string($v);
+ if(isset($_POST))
+ foreach($_POST as $k=>$v) $_POST[$k]=tep_sanitize_string($v);
+ if(isset($_REQUEST))
+ foreach($_REQUEST as $k=>$v) $_REQUEST[$k]=tep_sanitize_string($v);
+
/// Constructeur de page
$page= page::getInstance($FileRegistered);
$page->add_var_page('request_type',$request_type);
Modified: trunk/catalog/includes/functions/general.php
===================================================================
--- trunk/catalog/includes/functions/general.php 2011-11-24 09:58:03 UTC (rev 3912)
+++ trunk/catalog/includes/functions/general.php 2011-11-26 13:06:22 UTC (rev 3913)
@@ -87,7 +87,8 @@
\param string la chaîne à nettoyer
*/
function tep_sanitize_request($string) {
- return preg_replace("#(\./|\.\./|<|>|(\<|%3C).*script.*(\>|%3E))*#i",'',$string);
+ $string = htmlspecialchars(strip_tags($string));
+ return preg_replace("#(\./|\.\./|(\<|%3C)|(\>|%3E)|(\<|%3C).*script.*(\>|%3E))*#i",'',$string);
}
/**
Modified: trunk/catalog/install/includes/modele/admin_htaccess.txt
===================================================================
--- trunk/catalog/install/includes/modele/admin_htaccess.txt 2011-11-24 09:58:03 UTC (rev 3912)
+++ trunk/catalog/install/includes/modele/admin_htaccess.txt 2011-11-26 13:06:22 UTC (rev 3913)
@@ -47,6 +47,7 @@
RewriteBase %WS_ADMIN%
RewriteCond %{QUERY_STRING} (\<|%3C).*script.*(\>|%3E) [NC,OR]
+ RewriteCond %{QUERY_STRING} (\<|%3C).*(\>|%3E) [NC,OR]
RewriteCond %{QUERY_STRING} GLOBALS(=|\[|\%[0-9A-Z]{0,2}) [OR]
RewriteCond %{QUERY_STRING} _REQUEST(=|\[|\%[0-9A-Z]{0,2})
RewriteRule ^(.*)$ index.php [F,L]
Modified: trunk/catalog/install/includes/modele/htaccess.txt
===================================================================
--- trunk/catalog/install/includes/modele/htaccess.txt 2011-11-24 09:58:03 UTC (rev 3912)
+++ trunk/catalog/install/includes/modele/htaccess.txt 2011-11-26 13:06:22 UTC (rev 3913)
@@ -95,6 +95,7 @@
## Protection
RewriteCond %{QUERY_STRING} (\<|%3C).*script.*(\>|%3E) [NC,OR]
+ RewriteCond %{QUERY_STRING} (\<|%3C).*(\>|%3E) [NC,OR]
RewriteCond %{QUERY_STRING} GLOBALS(=|\[|\%[0-9A-Z]{0,2}) [OR]
RewriteCond %{QUERY_STRING} _REQUEST(=|\[|\%[0-9A-Z]{0,2})
RewriteRule ^(.*)$ index.php [F,L]
Modified: trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql 2011-11-24 09:58:03 UTC (rev 3912)
+++ trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql 2011-11-26 13:06:22 UTC (rev 3913)
@@ -80,7 +80,7 @@
insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type ) values ('DEFAULT_RETURN_STATUS_ID_S', 'DEFAULT_RETURN_STATUS_ID', '1', 'DEFAULT_RETURN_STATUS_ID_L', '6', '4', '2003-02-28 07:10:04', '1000-01-01 00:00:00', NULL, NULL,4);
insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type ) values ('DEFAULT_REFUND_METHOD_S', 'DEFAULT_REFUND_METHOD', '1', 'DEFAULT_REFUND_METHOD_L', '6', '5', '2003-03-01 16:46:12', '1000-01-01 00:00:00', NULL, NULL,4);
insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ( 'MODULE_GENERIC_INSTALLED_S', 'MODULE_GENERIC_INSTALLED', '', 'MODULE_GENERIC_INSTALLED_L', '6', '6', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',');
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('MODULE_GENERIC_INSTALLED_BO_S', 'MODULE_GENERIC_INSTALLED_BO', '', 'MODULE_GENERIC_INSTALLED_BO_L', '6', '7', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',', '1');
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('MODULE_GENERIC_INSTALLED_BO_S', 'MODULE_GENERIC_INSTALLED_BO', 'CheckCore', 'MODULE_GENERIC_INSTALLED_BO_L', '6', '7', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',', '1');
insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('MODULE_ACAPRO_INSTALLED_S', 'MODULE_ACAPRO_INSTALLED', 'desc_base.php;', 'MODULE_ACAPRO_INSTALLED_L', '6', '8', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',');
insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('MODULE_ACAPRO_INSTALLED_BO_S', 'MODULE_ACAPRO_INSTALLED_BO', 'desc_base.php;', 'MODULE_ACAPRO_INSTALLED_BO_L', '6', '9', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',', '1');
insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('MODULE_CONTENT_INSTALLED_S', 'MODULE_CONTENT_INSTALLED', '', 'MODULE_CONTENT_INSTALLED_L', '6', '10', NULL, NOW(), NULL, 'tep_cfg_Non_Edit(\';\',');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-11-24 09:58:09
|
Revision: 3912
http://oscss.svn.sourceforge.net/oscss/?rev=3912&view=rev
Author: oscim
Date: 2011-11-24 09:58:03 +0000 (Thu, 24 Nov 2011)
Log Message:
-----------
passage en stable
Removed Paths:
-------------
branches/2.1.0/extensions/ULTIMATEIMAGE_unstable/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-11-24 09:54:29
|
Revision: 3911
http://oscss.svn.sourceforge.net/oscss/?rev=3911&view=rev
Author: oscim
Date: 2011-11-24 09:54:19 +0000 (Thu, 24 Nov 2011)
Log Message:
-----------
passage en stable
Added Paths:
-----------
branches/2.1.0/extensions/ULTIMATEIMAGE_stable/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-11-21 13:59:42
|
Revision: 3910
http://oscss.svn.sourceforge.net/oscss/?rev=3910&view=rev
Author: oscim
Date: 2011-11-21 13:59:30 +0000 (Mon, 21 Nov 2011)
Log Message:
-----------
correction coquille et suite travail evolution process
Correction erreur suppression d'un function dans general.php
Modified Paths:
--------------
trunk/catalog/includes/classes/checkout_process.php
trunk/catalog/includes/content/checkout_shipping.php
trunk/catalog/includes/functions/general.php
trunk/catalog/install/includes/sql/mysql/tables/osc_holding_orders.sql
Removed Paths:
-------------
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/Bottom.css
Modified: trunk/catalog/includes/classes/checkout_process.php
===================================================================
--- trunk/catalog/includes/classes/checkout_process.php 2011-11-21 08:33:02 UTC (rev 3909)
+++ trunk/catalog/includes/classes/checkout_process.php 2011-11-21 13:59:30 UTC (rev 3910)
@@ -551,8 +551,9 @@
$order=new order($order_id);
- if (isset($$payment) && is_object($$payment)) {
- $payment_class = $$payment;
+ $payment_mod=payment::getInstance($payment);
+ if (isset($payment_mod->modules[$payment]) && is_object($payment_mod->modules[$payment])) {
+ $payment_class = $payment_mod->modules[$payment];
$payment_= $payment_class->title;
$email_footer = (isset($payment_class->email_footer)) ? $payment_class->email_footer . "\n\n" : '';
}
Modified: trunk/catalog/includes/content/checkout_shipping.php
===================================================================
--- trunk/catalog/includes/content/checkout_shipping.php 2011-11-21 08:33:02 UTC (rev 3909)
+++ trunk/catalog/includes/content/checkout_shipping.php 2011-11-21 13:59:30 UTC (rev 3910)
@@ -3,8 +3,8 @@
@licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 23/01/11, 16:28
+ @version 2.1.1
+ @date 21/11/11, 14:48
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -15,7 +15,7 @@
<h2 class="content title <?php echo $language ;?>"><?php echo HEADING_TITLE; ?></h2>
- <?php echo tep_draw_form('checkout_address', tep_href_link(FILENAME_CHECKOUT_SHIPPING, '', 'SSL')) . '<p>' . tep_draw_hidden_field('action', 'process') . '</p>'; ?>
+ <?php echo tep_draw_form('checkout_address', tep_href_link('checkout.php'/*FILENAME_CHECKOUT_SHIPPING*/, '', 'SSL')) . '<p>' . tep_draw_hidden_field('action', 'process') . '</p>'; ?>
<div class="contentBox shippingAddress">
Modified: trunk/catalog/includes/functions/general.php
===================================================================
--- trunk/catalog/includes/functions/general.php 2011-11-21 08:33:02 UTC (rev 3909)
+++ trunk/catalog/includes/functions/general.php 2011-11-21 13:59:30 UTC (rev 3910)
@@ -899,6 +899,78 @@
$from_email_adress The eMail address of the sender,
e.g. in...@my...
*/
+function tep_mail($to_name, $to_email_address, $email_subject, $email_array, $from_email_name, $from_email_address) {
+
+ if (!_cst_bool('SEND_EMAILS')) return false;
+ // Instantiate a new mail object
+ $message = new PHPMailer();
+
+ if (EMAIL_TRANSPORT == 'smtp'){
+ $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;
+ // Config
+ $message->Host = SMTP_MAIL_SERVER; // SMTP server
+ }else{
+ $message->IsSendmail();
+// $mail->Sendmail ='/usr/sbin/sendmail';
+ //////(EMAIL_TRANSPORT == 'sendmail')
+ //////You need to implement here if you are using sendmail
+ if(empty($from_email_address))$from_email_address=EMAIL_FROM;
+ if(empty($from_email_name))$from_email_name=STORE_OWNER;
+ }
+
+
+ $message->From = $from_email_address;
+ $message->FromName = $from_email_name;
+
+ $message->CharSet = strtoupper(CHARSET );
+
+ if( !tep_not_null($to_name) ) $to_name = '';
+
+ if( !tep_not_null($to_email_address) ) return false;
+
+
+ $message->AddAddress($to_email_address, $to_name);
+ $message->Subject = $email_subject;
+
+ ///retro compatibilité
+ if(!is_array($email_array)) $email_array=array('text'=>$email_array, 'html'=>$email_array);
+
+ // Build the text version
+ $text = str_replace( array('<br>','<br />','<br/>', ' ','€'), array("\n","\n",' ','euro'),$email_array['text']);
+ $text = strip_tags(html_entity_decode($text ,ENT_QUOTES ));
+// $text = iconv ( 'ISO-8859-1',strtoupper(CHARSET ), strip_tags(html_entity_decode($text ,ENT_QUOTES, strtoupper(CHARSET ) ) ,"\n\r"));
+
+ if (EMAIL_USE_HTML == 'true') {
+ $message->Body = $email_array['html'];// tep_convert_linefeeds(array("\r\n", "\n", "\r"), '<br>', $email_text);
+ $message->AltBody = $text;
+ $message->IsHTML(true);
+ } else {
+ $message->Body = $text;
+ $message->IsHTML(false);
+ }
+
+ // Send message
+ if(!$message->Send()){
+ trigger_error(sprintf(__FUNCTION__.'Mailer error: %s', $message->ErrorInfo), E_USER_ERROR);
+ return false;
+ }
+ else return true;
+
+}
+
+/**
+ @package oscss-Rv
+ @author oscim - OscssTeam
+ @version 2.0
+ Construteur de mise en forme des email avant envoi; remplace les code raccouris et ajoute si necessaire l'entete html
+ @param string nom du template
+ @param string path du language utilis pour le mail
+ @param array $myarray key/value des var perso
+ @param boolean return / print
+*/
function tep_post_prepare_email($gabarit_template,$language,$myarray,$print=false){
global $title_email,$messageStack,$page;
Deleted: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/Bottom.css
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/Bottom.css 2011-11-21 08:33:02 UTC (rev 3909)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Css/Bottom.css 2011-11-21 13:59:30 UTC (rev 3910)
@@ -1,43 +0,0 @@
-/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
- @subpackage Template 2cShopHtml5Oscim
- @package osCSS-2 <www http://www.oscss.org>
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-
-
-/* footer */
-footer {
- clear: both;
- background: #222;
- width: 960px;
- height:80px;
- color: #fff;
- margin-bottom: 10px;
-
- /* curved border radius */
- -moz-border-radius: 10px;
- -webkit-border-radius: 10px;
- }
-
-footer p {
- text-align: right;
- font-size: 11px;
- padding-right: 20px;
- }
-
-footer a {
- color: #999;
- }
-
-footer a:hover {
- color: #FFF;
- text-decoration: none;
- }
-
-footer div {margin:0; padding:0; width:33%; float:left; display:block; height:100%; text-align:left;}
-
-footer div.center_footer{
-text-align:center;
-}
\ No newline at end of file
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_holding_orders.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_holding_orders.sql 2011-11-21 08:33:02 UTC (rev 3909)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_holding_orders.sql 2011-11-21 13:59:30 UTC (rev 3910)
@@ -59,6 +59,8 @@
currency_value decimal(14,6) default NULL,
ip_address varchar(50) NOT NULL,
total_weight varchar(5) default NULL,
+ class_payment VARCHAR( 30 ) NULL ,
+ class_shipping VARCHAR( 30 ) NULL ,
PRIMARY KEY (orders_id)
) DEFAULT CHARSET=utf8 ;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-11-21 08:33:12
|
Revision: 3909
http://oscss.svn.sourceforge.net/oscss/?rev=3909&view=rev
Author: oscim
Date: 2011-11-21 08:33:02 +0000 (Mon, 21 Nov 2011)
Log Message:
-----------
pettite coquille et erreur lors commit precedent
Modified Paths:
--------------
trunk/catalog/admin/includes/content/configuration.central.inc
trunk/catalog/admin/includes/content/configuration.top.inc
trunk/catalog/admin/includes/content/countries.central.inc
trunk/catalog/admin/includes/content/countries.top.inc
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/orders.txt
trunk/catalog/includes/functions/general.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php
trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql
Modified: trunk/catalog/admin/includes/content/configuration.central.inc
===================================================================
--- trunk/catalog/admin/includes/content/configuration.central.inc 2011-11-20 22:16:57 UTC (rev 3908)
+++ trunk/catalog/admin/includes/content/configuration.central.inc 2011-11-21 08:33:02 UTC (rev 3909)
@@ -4,225 +4,56 @@
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 19/11/11, 10:38
+ @date 22/09/11, 22:00
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
+ @brief content for pages configuration
*/
?>
<!-- body //-->
-<?php if($action=='list') { ?>
-<h3><?php echo HEADING_TITLE; ?></h3>
-<h4><?php echo HEADING_TITLE_COUNTRY_ZONE; ?></h4>
- <div class="button_nav">
- <?php echo '<a class="button" href="' . tep_href_link(FILENAME_COUNTRIES, tep_get_all_get_params(array('page_admin')) . 'saction=new') . '">' . tep_image(DIR_WS_ICONS . 'icon_add_new.png',IMAGE_INSERT) . IMAGE_NEW_ZONE . '</a>'; ?>
- <?php echo '<a class="button" href="' . tep_href_link(FILENAME_COUNTRIES, tep_get_all_get_params(array('rID','action','saction'))) . '">' . IMAGE_BACK . '</a>'; ?>
- </div>
-<div class="box_left">
- <table width="100%" class="dataTable">
- <thead>
- <tr>
- <th><?php echo TABLE_HEADING_COUNTRY_NAME.tep_link_sort_by(FILENAME_COUNTRIES,'c.countries_name'); ?></th>
- <th><?php echo TABLE_HEADING_ZONE_NAME.tep_link_sort_by(FILENAME_COUNTRIES,'z.zone_name'); ?></th>
- <th class="tcenter"><?php echo TABLE_HEADING_ZONE_CODE.tep_link_sort_by(FILENAME_COUNTRIES,'z.zone_code'); ?></th>
- <th class="tright" style="width:100px"><?php echo TABLE_HEADING_ACTION; ?></th>
- </tr>
- </thead>
- <tfoot>
- <tr>
- <td><?php echo $zones_split->display_count($zones_query_numrows, MAX_DISPLAY_ROW_BY_PAGE, $page, TEXT_DISPLAY_NUMBER_OF_ZONES); ?></td>
- <td><?php echo row_by_page(FILENAME_COUNTRIES, $row_bypage_array, $row_by_page, "fleft"); ?></td>
- <td colspan="2"><?php echo $zones_split->display_links($zones_query_numrows, MAX_DISPLAY_ROW_BY_PAGE, MAX_DISPLAY_PAGE_LINKS, $page,tep_get_all_get_params(array('page', 'oID'))); ?></td>
- </tr>
- </tfoot>
- <tbody>
- <?php foreach($list_z as $zones) { ?>
- <tr class="view parent dataTableRow <?php if(( $rID ==$zones['zone_id'])) echo 'Selected' ?>" >
- <td><?php echo $zones['countries_name']; ?></td>
- <td><?php echo $zones['zone_name']; ?></td>
- <td class="tcenter"><?php echo $zones['zone_code']; ?></td>
- <td>
- <span class="view fils fleft">
- <?php echo '<a class="buttonimg" href="' . tep_href_link(FILENAME_COUNTRIES, tep_get_all_get_params(array('page','rID')) .'rID=' . $zones['zone_id']. '&saction=edit') . '">' . tep_image(DIR_WS_ICONS . 'icon_edit.png',IMAGE_EDIT ) . '</a> <a class="buttonimg" href="' . tep_href_link(FILENAME_COUNTRIES, tep_get_all_get_params(array('page','rID')). 'rID=' . $zones['zone_id'] . '&saction=delete') . '">' . tep_image(DIR_WS_ICONS . 'icon_delete.png',IMAGE_DELETE ) . '</a>';
- ?>
- </span>
- <span class="fright">
- <?php if (isset($cInfo) && is_object($cInfo) && ($zones['zone_id'] == $cInfo->zone_id) ) { echo tep_image(DIR_WS_ICONS . 'icon_arrow_right.gif', ''); } else { echo '<a href="' . tep_href_link(FILENAME_COUNTRIES,tep_get_all_get_params(array('page','rID')). 'rID=' . $zones['zone_id']) . '">' . tep_image(DIR_WS_ICONS . 'icon_info.gif', IMAGE_ICON_INFO) . '</a>'; } ?>
- </span>
- </td>
- </tr>
- <?php } ?>
- </tbody>
- </table>
-</div>
+<br style="clear:both" />
+<!-- body_text //-->
+<?php if( isset($mID) ): ?>
-<?php } else { ?>
-<h3><?php echo HEADING_TITLE; ?></h3>
-<h4><?php echo HEADING_TITLE_COUNTRY; ?></h4>
- <div class="button_nav">
- <?php echo '<a class="button" href="' . tep_href_link(FILENAME_COUNTRIES,tep_get_all_get_params(array('page_admin')). 'action=new') . '">' . tep_image(DIR_WS_ICONS.'icon_add_new.png' , IMAGE_NEW_COUNTRY) . IMAGE_NEW_COUNTRY . '</a>'; ?>
- </div>
-<div class="box_uniq">
- <div class="box_left">
- <table width="100%" class="dataTable">
- <thead>
- <tr>
- <th><?php echo TABLE_HEADING_COUNTRY_NAME.tep_link_sort_by(FILENAME_COUNTRIES,'countries_name'); ?></th>
- <th><?php echo TABLE_HEADING_COUNTRY_LOCALNAME.tep_link_sort_by(FILENAME_COUNTRIES,'countries_localname' ); ?></th>
- <th style="width:40px"><?php echo TABLE_HEADING_COUNTRY_CODE_2.tep_link_sort_by(FILENAME_COUNTRIES,'countries_iso_code_2'); ?></th>
- <th style="width:40px"><?php echo TABLE_HEADING_COUNTRY_CODE_3.tep_link_sort_by(FILENAME_COUNTRIES,'countries_iso_code_3'); ?></th>
- <th><?php echo TABLE_HEADING_COUNTRY_VISIBLE.tep_link_sort_by(FILENAME_COUNTRIES,'country_visible'); ?></th>
- <th class="tright" style="width:100px"><?php echo TABLE_HEADING_ACTION; ?></th>
- </tr>
- </thead>
- <tfoot>
- <tr>
- <td colspan="1"><?php echo $countries_split->display_count($countries_query_numrows, MAX_DISPLAY_ROW_BY_PAGE, $page, TEXT_DISPLAY_NUMBER_OF_COUNTRIES); ?></td>
- <td colspan="3"><?php echo row_by_page(FILENAME_COUNTRIES, $row_bypage_array, $row_by_page, "fleft"); ?></td>
- <td colspan="2"><?php echo $countries_split->display_links($countries_query_numrows, MAX_DISPLAY_ROW_BY_PAGE, MAX_DISPLAY_PAGE_LINKS,$page, tep_get_all_get_params(array('page_admin','page','cID'))); ?></td>
- </tr>
- </tfoot>
- <tbody>
- <?php foreach($list_c as $countries) { ?>
- <tr class="view parent dataTableRow <?php if(isset($cID) && $cID==$countries['countries_id']) echo 'Selected' ?>">
- <td class="tleft"><?php echo $countries['countries_name']; ?></td>
- <td class="tleft"><?php echo $countries['countries_localname']; ?></td>
- <td class="tcenter"><?php echo $countries['countries_iso_code_2']; ?></td>
- <td class="tcenter"><?php echo $countries['countries_iso_code_3']; ?></td>
- <td class="tcenter">
- <?php if ($countries['country_visible'] == '1') echo tep_image(DIR_WS_ICONS . 'icon_status_green.gif', IMAGE_ICON_STATUS_GREEN) . ' <a href="' . tep_href_link(FILENAME_COUNTRIES, 'action=update&country_visible=0&cID=' . $countries['countries_id'] . '&page=' . $page) . '">' . tep_image(DIR_WS_ICONS . 'icon_status_red_light.gif', IMAGE_ICON_STATUS_RED_LIGHT) . '</a>';
- else echo '<a href="' . tep_href_link(FILENAME_COUNTRIES, 'action=update&country_visible=1&cID=' . $countries['countries_id'] . '&page=' . $page) . '">' . tep_image(DIR_WS_ICONS . 'icon_status_green_light.gif', IMAGE_ICON_STATUS_GREEN_LIGHT) . '</a> ' . tep_image(DIR_WS_ICONS . 'icon_status_red.gif', IMAGE_ICON_STATUS_RED); ?>
- </td>
- <td class="row_action">
- <span class="view fils fleft">
- <?php
- echo '<a href="' . tep_href_link(FILENAME_COUNTRIES, tep_get_all_get_params(array('action','cID')).'cID=' .$countries['countries_id'] . '&action=list') . '">' . tep_image(DIR_WS_ICONS . 'icon_plus.gif', ICON_FOLDER) . '</a>';
- echo '<a class="buttonimg" href="' . tep_href_link(FILENAME_COUNTRIES, 'page=' . $page . '&cID=' . $countries['countries_id'] . '&row_by_page='.$row_by_page.'&action=edit') . '">' . tep_image(DIR_WS_ICONS . 'icon_edit.png',IMAGE_EDIT ) . '</a> <a class="buttonimg" href="' . tep_href_link(FILENAME_COUNTRIES, 'page=' . $page . '&cID=' . $countries['countries_id'] .'&row_by_page='.$row_by_page. '&action=delete') . '">' . tep_image(DIR_WS_ICONS . 'icon_delete.png',IMAGE_DELETE ) . '</a> ';
- ?>
- </span>
- <span class="fright">
- <?php if (isset($cInfo) && is_object($cInfo) && ($countries['countries_id'] == $cInfo->countries_id) ) { echo tep_image(DIR_WS_ICONS . 'icon_arrow_right.gif', ''); }
- else { echo '<a href="' . tep_href_link(FILENAME_COUNTRIES, 'page=' . $page . '&cID=' . $countries['countries_id'].'&row_by_page='.$row_by_page) . '">' . tep_image(DIR_WS_ICONS . 'icon_info.gif', IMAGE_ICON_INFO) . '</a>'; } ?>
- </span>
- </td>
- </tr>
- <?php } ?>
- </tbody>
- </table>
- </div>
-<?php } ?>
-<?php
- $heading = array();
- $contents = array();
+ <?php echo $cfg->draw(); ?>
-if($action=='list'){
- switch ($saction) {
- case 'new':
- $heading[] = array('text' => TEXT_INFO_HEADING_NEW_ZONE );
- $contents = array('form' => tep_draw_form('zones', FILENAME_COUNTRIES, tep_get_all_get_params(array('saction')).'saction=insert'));
- $contents[] = array('text' => TEXT_INFO_INSERT_INTRO);
- $contents[] = array('class' => 'block_input', 'text' => TEXT_INFO_ZONES_NAME . tep_draw_input_field('zone_name'));
- $contents[] = array('class' => 'block_input', 'text' => TEXT_INFO_ZONES_CODE . tep_draw_input_field('zone_code'));
- $contents[] = array('class' => 'block_input', 'text' => TEXT_INFO_COUNTRY_NAME . tep_draw_pull_down_menu('zone_country_id', tep_get_countries(), $cID));
- $contents[] = array('class' => 'button_nav', 'text' => tep_image_submit('button_insert.gif', IMAGE_INSERT) . ' <a class="button" href="' . tep_href_link(FILENAME_COUNTRIES, tep_get_all_get_params(array('page_admin','saction')) ) . '">' . IMAGE_CANCEL . '</a>');
- break;
- case 'edit':
- $heading[] = array('text' => TEXT_INFO_HEADING_EDIT_ZONE );
- $contents = array('form' => tep_draw_form('zones', FILENAME_COUNTRIES, tep_get_all_get_params(array('saction','rID')).'rID=' . $cInfo->zone_id.'&saction=save'));
- $contents[] = array('text' => TEXT_INFO_EDIT_INTRO);
- $contents[] = array('class' => 'block_input', 'text' => TEXT_INFO_ZONES_NAME . tep_draw_input_field('zone_name','', $cInfo->zone_name));
- $contents[] = array('class' => 'block_input', 'text' => TEXT_INFO_ZONES_CODE . tep_draw_input_field('zone_code','', $cInfo->zone_code));
- $contents[] = array('class' => 'block_input', 'text' => TEXT_INFO_COUNTRY_NAME . tep_draw_pull_down_menu('zone_country_id', tep_get_countries(), $cInfo->countries_id));
- $contents[] = array('class' => 'button_nav', 'text' => tep_image_submit('button_update.gif', IMAGE_UPDATE) . ' <a class="button" href="' . tep_href_link(FILENAME_COUNTRIES, tep_get_all_get_params(array('saction')).'rID=' . $cInfo->zone_id) . '">' . IMAGE_CANCEL . '</a>');
- break;
- case 'delete':
- $heading[] = array('text' => TEXT_INFO_HEADING_DELETE_ZONE );
- $contents = array('form' => tep_draw_form('zones', FILENAME_COUNTRIES, tep_get_all_get_params(array('saction','rID')).'rID=' . $cInfo->zone_id.'&action=deleteconfirm'));
- $contents[] = array('text' => TEXT_INFO_DELETE_INTRO);
- $contents[] = array('text' => '<strong>' . $cInfo->zone_name . '</strong>');
- $contents[] = array('class' => 'button_nav', 'text' => tep_image_submit('button_delete.gif', IMAGE_DELETE) . ' <a class="button" href="' . tep_href_link(FILENAME_COUNTRIES, tep_get_all_get_params(array('saction','rID')).'rID=' . $cInfo->zone_id) . '">' . IMAGE_CANCEL . '</a>');
- break;
- default:
- if (isset($cInfo) && is_object($cInfo)) {
- $heading[] = array('text' => $cInfo->zone_name);
- $contents[] = array('text' => TEXT_INFO_ZONES_NAME . $cInfo->zone_name . ' (' . $cInfo->zone_code . ')');
- $contents[] = array('text' => TEXT_INFO_COUNTRY_NAME . $cInfo->countries_name);
- }
-// break;
- }
-}else {
+<?php elseif($action=='' && tep_not_null($gID) && is_numeric($gID) ): ?>
- if (isset($cInfo) && is_object($cInfo) && ($countries['countries_id'] == $cInfo->countries_id) ){
- $country_visible = ($cInfo->country_visible == '1') ? VISIBLE_YES : VISIBLE_NO;
- $country_visible_Y = ($cInfo->country_visible == '1') ? true : false;
- $country_visible_N = ($cInfo->country_visible == '0') ? true : false;
- } else {
- $country_visible = VISIBLE_YES ;
- $country_visible_Y = true ;
- $country_visible_N = false;
- }
+<div id="ssmenu">
+ <?php echo tep_ssmenu_configuration($gparentID); ?>
+</div>
- switch ($action) {
- case 'new':
- $heading[] = array('text' => TEXT_INFO_HEADING_NEW_COUNTRY );
- $contents = array('form' => tep_draw_form('countries', FILENAME_COUNTRIES, 'page=' . $page .'&row_by_page='.$row_by_page. '&action=insert'));
- $contents[] = array('text' => TEXT_INFO_INSERT_INTRO);
- $contents[] = array('class' => 'block_input','text' => TEXT_INFO_COUNTRY_NAME . tep_draw_input_field('countries_name'));
- $contents[] = array('class' => 'block_input','text' => TEXT_INFO_COUNTRY_LOCALNAME . tep_draw_input_field('countries_localname'));
- $contents[] = array('class' => 'block_input','text' => TEXT_INFO_COUNTRY_CODE_2 . tep_draw_input_field('countries_iso_code_2'));
- $contents[] = array('class' => 'block_input','text' => TEXT_INFO_COUNTRY_CODE_3 . tep_draw_input_field('countries_iso_code_3'));
- $contents[] = array('class' => 'block_input','text' => TEXT_INFO_ADDRESS_FORMAT . tep_draw_pull_down_menu('address_format_id', tep_get_address_formats()));
- $contents[] = array('class' => 'block_input','text' => TEXT_INFO_COUNTRY_VISIBLE . tep_draw_radio_field('country_visible', 'country_visible_1', '1', $country_visible_Y) . ' ' . VISIBLE_YES . ' ' . tep_draw_radio_field('country_visible', 'country_visible_0', '0', $country_visible_N) . ' ' . VISIBLE_NO);
- $contents[] = array('class' => 'button_nav', 'text' => tep_image_submit('button_insert.gif', IMAGE_INSERT) . ' <a class="button" href="' . tep_href_link(FILENAME_COUNTRIES, tep_get_all_get_params(array('page_admin', 'action'))) . '">' . IMAGE_CANCEL . '</a>');
- break;
- case 'edit':
- $heading[] = array('text' => TEXT_INFO_HEADING_EDIT_COUNTRY );
- $contents = array('form' => tep_draw_form('countries', FILENAME_COUNTRIES, 'page=' . $page . '&cID=' . $cInfo->countries_id .'&row_by_page='.$row_by_page. '&action=save'));
- $contents[] = array('text' => TEXT_INFO_EDIT_INTRO);
- $contents[] = array('class' => 'block_input','text' => TEXT_INFO_COUNTRY_NAME . tep_draw_input_field('countries_name', '', $cInfo->countries_name));
- $contents[] = array('class' => 'block_input','text' => TEXT_INFO_COUNTRY_LOCALNAME . tep_draw_input_field('countries_localname', '', $cInfo->countries_localname));
- $contents[] = array('class' => 'block_input','text' => TEXT_INFO_COUNTRY_CODE_2 . tep_draw_input_field('countries_iso_code_2', '', $cInfo->countries_iso_code_2));
- $contents[] = array('class' => 'block_input','text' => TEXT_INFO_COUNTRY_CODE_3 . tep_draw_input_field('countries_iso_code_3', '', $cInfo->countries_iso_code_3));
- $contents[] = array('class' => 'block_input','text' => TEXT_INFO_ADDRESS_FORMAT . tep_draw_pull_down_menu('address_format_id', tep_get_address_formats(), $cInfo->address_format_id));
- $contents[] = array('class' => 'block_input','text' => TEXT_INFO_COUNTRY_VISIBLE . tep_draw_radio_field('country_visible', 'country_visible_1', '1', $country_visible_Y) . ' ' . VISIBLE_YES . ' ' . tep_draw_radio_field('country_visible', 'country_visible_0', '0', $country_visible_N) . ' ' . VISIBLE_NO);
- $contents[] = array('class' => 'button_nav','text' => tep_image_submit('button_update.gif', IMAGE_UPDATE) . ' <a class="button" href="' . tep_href_link(FILENAME_COUNTRIES, 'page=' . $page . '&cID=' . $cInfo->countries_id .'&row_by_page='.$row_by_page) . '">' . IMAGE_CANCEL . '</a>');
- break;
- case 'delete':
- $heading[] = array('text' => TEXT_INFO_HEADING_DELETE_COUNTRY );
- $contents = array('form' => tep_draw_form('countries', FILENAME_COUNTRIES, 'page=' . $page . '&cID=' . $cInfo->countries_id .'&row_by_page='.$row_by_page. '&action=deleteconfirm'));
- $contents[] = array('text' => TEXT_INFO_DELETE_INTRO);
- $contents[] = array('text' => '<strong>' . $cInfo->countries_name . '</strong>');
- $contents[] = array('class' => 'button_nav','text' => tep_image_submit('button_delete.gif', IMAGE_UPDATE) . ' <a class="button" href="' . tep_href_link(FILENAME_COUNTRIES, 'page=' . $page . '&cID=' . $cInfo->countries_id) . '">' . IMAGE_CANCEL . '</a>');
- break;
+<h3 class="main-title"><?php echo tep_cst_menu_conf($cfg_group['configuration_group_title']); ?></h3>
+<h4><?php echo tep_cst_menu_conf('TITLE_'.$cfg_group['configuration_group_title']); ?></h4>
- default:
- if (isset($cInfo) && is_object($cInfo)) {
- $heading[] = array('text' => $cInfo->countries_name );
- $contents[] = array('text' => TEXT_INFO_COUNTRY_NAME . $cInfo->countries_name);
- $contents[] = array('text' => TEXT_INFO_COUNTRY_LOCALNAME . $cInfo->countries_localname);
- $contents[] = array('text' => TEXT_INFO_COUNTRY_CODE_2 . $cInfo->countries_iso_code_2);
- $contents[] = array('text' => TEXT_INFO_COUNTRY_CODE_3 . $cInfo->countries_iso_code_3);
- $contents[] = array('text' => TEXT_INFO_ADDRESS_FORMAT . $cInfo->address_format_id .
-'<br />'.
-'<div class="ViewAddress ViewAddress-format">'.
-str_replace('\n','<br />',$address_format_array[$cInfo->address_format_id]).
-'</div>'
-);
+ <?php echo tep_draw_form('configuration', FILENAME_CONFIGURATION, 'gparentID=' . $gparentID.'&gID=' . $gID . '&action=save_mutli') ?>
+ <div class="box_left">
+ <ul class="block_form">
+ <?php foreach($list_edit as $row) { ?>
+ <li id="nav_<?php echo $row->key ?>"><h5 title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></h5>
- $contents[] = array('text' => TEXT_INFO_COUNTRY_VISIBLE . $country_visible);
- }
- break;
- }
- }
-?>
-<div class="box_right">
-<?php
- if ( (tep_not_null($heading)) && (tep_not_null($contents)) ) {
- $box = new box;
- echo $box->infoBox($heading, $contents);
- }
-?>
-</div>
-</div>
\ No newline at end of file
+ <div class="block_input tirroir">
+ <label><?php if (tep_not_null(__($row->description)))echo __($row->description); ?></label>
+ <p>
+ <?php echo $row->value_field ; ?>
+ </p>
+ </div>
+ </li>
+ <?php } ?>
+ </ul>
+ </div>
+ <div class="box_right">
+ <ul>
+ <div class="button_nav">
+ <?php print tep_image_submit('button_copy.gif', IMAGE_UPDATE) .tep_js_back(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $gparentID.'&gID=' . $gID )) ; ?>
+ </div>
+ </li>
+ </ul>
+ </div>
+ </form>
+<?php endif; ?>
+<!-- body_text_eof //-->
+<!-- body_eof //-->
\ No newline at end of file
Modified: trunk/catalog/admin/includes/content/configuration.top.inc
===================================================================
--- trunk/catalog/admin/includes/content/configuration.top.inc 2011-11-20 22:16:57 UTC (rev 3908)
+++ trunk/catalog/admin/includes/content/configuration.top.inc 2011-11-21 08:33:02 UTC (rev 3909)
@@ -1,125 +1,169 @@
<?php
/**
- @licence GPL 2005-2009 The osCSS developers - osCSS Open Source E-commerce
- @package oscss-2 <www http://www.oscss.org>
- @version Rc-3
- @date 08/04/10, 22:41
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 22/09/11, 22:00
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
+ @encode UTF-8
+ @brief generic page for configuration in confuguration_table
+ This page is replaced by module type configuration if exists
+ For replace this page by module configurtaion type, name new module cfg_xx, and xx is gID (configuration_group_id)
*/
- $rID=(isset($_GET['rID'])) ? $_GET['rID'] : '';
- $cID=(isset($_GET['cID'])) ? $_GET['cID'] : '';
- $saction=(isset($_GET['saction'])) ? $_GET['saction'] : '';
+ // clef de groupe (configuration_group_id)
+ $gID = (isset($_GET['gID'])) ? $_GET['gID'] : 1;
+ // groupe parent
+ $gparentID = (isset($_GET['gparentID'])) ? $_GET['gparentID'] : 0;
- switch ($action) {
- case 'insert':
- $countries_name = tep_db_prepare_input($_POST['countries_name']);
- $countries_localname = tep_db_prepare_input($_POST['countries_localname']);
- $countries_iso_code_2 = tep_db_prepare_input($_POST['countries_iso_code_2']);
- $countries_iso_code_3 = tep_db_prepare_input($_POST['countries_iso_code_3']);
- $address_format_id = tep_db_prepare_input($_POST['address_format_id']);
- $country_visible = tep_db_prepare_input($_POST['country_visible']);
+ /**
+ @remarks Adjust name child module
+ Old : cfg_21 >> 21 == configuration_group_id
+ New : template >> [cg_]template == configuration_group_key
+ */
- tep_db_query("insert into " . TABLE_COUNTRIES . " (countries_name, countries_localname, countries_iso_code_2, countries_iso_code_3, address_format_id, country_visible) values ('" . tep_db_input($countries_name) . "', '" . tep_db_input($countries_localname) . "', '" . tep_db_input($countries_iso_code_2) . "', '" . tep_db_input($countries_iso_code_3) . "', '" . (int)$address_format_id . "', '" . (int)$country_visible . "')");
+ if(file_exists(DIR_WS_MODULES.'configuration/cfg_'.$gID.'.php'))
+ $class='cfg_'.$gID;
+ else {
+ $_query = tep_db_query("SELECT configuration_group_key AS childmodule FROM " . TABLE_CONFIGURATION_GROUP . " WHERE configuration_group_id = '" . (int)$gID . "' ORDER BY sort_order");
+ $conf = tep_db_fetch_array($_query);
- tep_redirect(tep_href_link(FILENAME_COUNTRIES));
- break;
+ $class= trim(strtolower($conf['childmodule']));
- case 'update':
- $countries_id = tep_db_prepare_input($_GET['cID']);
- $country_visible = tep_db_prepare_input($_GET['country_visible']);
+ if(substr($class,0,3) =='cg_') $class = substr($class,3);
+ }
- tep_db_query("update " . TABLE_COUNTRIES . " set country_visible = '" . (int)$country_visible . "' where countries_id = '" . (int)$countries_id . "'");
+ /**
+ @remarks Call child modules configuration in /modules/configuration folder
+ */
- tep_redirect(tep_href_link(FILENAME_COUNTRIES, 'page=' . $_GET['page'] . '&cID=' . $countries_id.'&row_by_page='.$row_by_page));
- break;
+ if(file_exists(DIR_WS_MODULES.'configuration/'.$class.'.php') && !class_exists($class)) {
+ require(DIR_WS_MODULES.'configuration/'.$class.'.php');
+ // module key precis
+ $mID=$gID;
+ $cfg =new $class();
+ }
+ else {
+ $oscss->pile_file_lang(DIR_FS_ADMIN.DIR_WS_LANGUAGES.$language.'/modules/configuration/cfg_'.$gID.'.txt');
+ }
- case 'save':
- $countries_id = tep_db_prepare_input($_GET['cID']);
- $countries_name = tep_db_prepare_input($_POST['countries_name']);
- $countries_localname = tep_db_prepare_input($_POST['countries_localname']);
- $countries_iso_code_2 = tep_db_prepare_input($_POST['countries_iso_code_2']);
- $countries_iso_code_3 = tep_db_prepare_input($_POST['countries_iso_code_3']);
- $address_format_id = tep_db_prepare_input($_POST['address_format_id']);
- $country_visible = tep_db_prepare_input($_POST['country_visible']);
- tep_db_query("update " . TABLE_COUNTRIES . " set countries_name = '" . tep_db_input($countries_name) . "', countries_localname = '" . tep_db_input($countries_localname) . "', countries_iso_code_2 = '" . tep_db_input($countries_iso_code_2) . "', countries_iso_code_3 = '" . tep_db_input($countries_iso_code_3) . "', address_format_id = '" . (int)$address_format_id . "', country_visible = '" . (int)$country_visible . "' where countries_id = '" . (int)$countries_id . "'");
- tep_redirect(tep_href_link(FILENAME_COUNTRIES, 'page=' . $_GET['page'] . '&cID=' . $countries_id.'&row_by_page='.$row_by_page));
- break;
- case 'deleteconfirm':
- $countries_id = tep_db_prepare_input($_GET['cID']);
+ if(isset($mID) && class_exists($class)) $cfg->draw_action();
+ else
+ switch ($action) {
- tep_db_query("delete from " . TABLE_COUNTRIES . " where countries_id = '" . (int)$countries_id . "'");
+ /**
+ @brief save unique ligne
+ */
+ case 'save':
+ $configuration_value = tep_db_prepare_input($_POST['configuration_value']);
+ $cID = tep_db_prepare_input($_GET['cID']);
- tep_redirect(tep_href_link(FILENAME_COUNTRIES, 'page=' . $_GET['page'].'&row_by_page='.$row_by_page));
+ if( ($res=sqlconfiguration::update(array('key'=>(int)$cID , 'value'=>tep_db_input($configuration_value) ))) == false)
+ $messageStack->add(SAVE_CONFIG_OK, 'success');
+ else
+ $messageStack->add(SAVE_CONFIG_NOT_OK, 'error');
+
+ tep_redirect(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $gparentID.'&gID=' . $_GET['gID'] . '&cID=' . $cID));
break;
- case 'list':
- break;
- default:
- $address_format_query = tep_db_query("select address_format_id, address_example from " . TABLE_ADDRESS_FORMAT . " order by address_format_id");
- $address_format_array = array();
- while ($address_format_values = tep_db_fetch_array($address_format_query)) {
- $address_format_array[$address_format_values['address_format_id']] = $address_format_values['address_example'] ;
- }
-// return $address_format_array;
+ /**
+ @brief save page groupe
+ */
+ case 'save_mutli':
+ if(tep_not_null($gID) ){
+ $list=sqlconfiguration::fetch(array('group_id'=> (int)$gID), true);
+ if(is_object($list))
+ $liste[]=$list;
+ else
+ $liste=$list;
- $countries_query_raw = "select countries_id, countries_name, countries_localname, countries_iso_code_2, countries_iso_code_3, address_format_id, country_visible from " . TABLE_COUNTRIES . " order by ".((isset($_GET['sort_by'])) ? $_GET['sort_by'] : 'countries_name ASC, country_visible DESC');
- $countries_split = new splitPageResults($page, MAX_DISPLAY_ROW_BY_PAGE, $countries_query_raw, $countries_query_numrows);
- $countries_query = tep_db_query($countries_query_raw);
- $list_c=array();
- while ($countries = tep_db_fetch_array($countries_query)) {
- if ($cID == $countries['countries_id']) $cInfo = new objectInfo($countries);
- $list_c[]=$countries;
+ foreach($liste as $row) {
+
+ if(isset($_POST['configuration'][$row->key])) {
+ $configuration_value = tep_db_prepare_input($_POST['configuration'][$row->key]);
+
+ if( ($res=sqlconfiguration::update(array('key'=>$row->key , 'value'=>tep_db_input($configuration_value) ))) == false)$erreur[]=false;
+ else $erreur[]=true;
+
+ }
+
+ }
+
+ if(!in_array(false,$erreur)) $messageStack->add_session(SAVE_CONFIG_OK, 'success');
+ else $messageStack->add_session(SAVE_CONFIG_NOT_OK, 'error');
+
}
-}
+ tep_redirect(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $gparentID.'&gID=' . $_GET['gID'] . '&cID=' . $cID));
+ break;
- switch ($saction) {
- case 'insert':
- $zone_country_id = tep_db_prepare_input($_POST['zone_country_id']);
- $zone_code = tep_db_prepare_input($_POST['zone_code']);
- $zone_name = tep_db_prepare_input($_POST['zone_name']);
- tep_db_query("insert into " . TABLE_ZONES . " (zone_country_id, zone_code, zone_name) values ('" . (int)$zone_country_id . "', '" . tep_db_input($zone_code) . "', '" . tep_db_input($zone_name) . "')");
+ case 'save_grp':
+ $new_grp_id = tep_db_prepare_input($_POST['new_grp_id']);
+ $cID = tep_db_prepare_input($_GET['cID']);
- tep_redirect(tep_href_link(FILENAME_ZONES, 'page=' . $_GET['page'].'&row_by_page='.$row_by_page));
- break;
- case 'save':
- $zone_id = tep_db_prepare_input($_GET['cID']);
- $zone_country_id = tep_db_prepare_input($_POST['zone_country_id']);
- $zone_code = tep_db_prepare_input($_POST['zone_code']);
- $zone_name = tep_db_prepare_input($_POST['zone_name']);
+ if( ($res=sqlconfiguration::update(array('id'=>(int)$cID , 'group_id'=>tep_db_input($new_grp_id) ))) == false)
+ $messageStack->add_session(SAVE_CONFIG_NOT_OK, 'error');
+ else
+ $messageStack->add_session(SAVE_CONFIG_OK, 'success');
- tep_db_query("update " . TABLE_ZONES . " set zone_country_id = '" . (int)$zone_country_id . "', zone_code = '" . tep_db_input($zone_code) . "', zone_name = '" . tep_db_input($zone_name) . "' where zone_id = '" . (int)$zone_id . "'");
+ tep_redirect(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $gparentID.'&gID=' . $new_grp_id . '&cID=' . $cID));
+ break;
- tep_redirect(tep_href_link(FILENAME_ZONES, 'page=' . $_GET['page'] . '&cID=' . $zone_id.'&row_by_page='.$row_by_page));
- break;
- case 'deleteconfirm':
- $zone_id = tep_db_prepare_input($_GET['cID']);
- tep_db_query("delete from " . TABLE_ZONES . " where zone_id = '" . (int)$zone_id . "'");
+ case 'delete_confirm':
- tep_redirect(tep_href_link(FILENAME_ZONES, 'page=' . $_GET['page'].'&row_by_page='.$row_by_page));
+ if( ($res=sqlconfiguration::delete(array('id'=>(int)$cID ))) == false)
+ $messageStack->add_session(SAVE_CONFIG_NOT_OK, 'error');
+ else
+ $messageStack->add_session(SAVE_CONFIG_OK, 'success');
+
+ tep_redirect(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $gparentID.'&gID=' . $gparentID ));
break;
+
+
default:
- $wh=(tep_not_null($cID)? " and z.zone_country_id = '".$cID."' ":'');
- $zones_query_raw = "select z.zone_id, c.countries_id, c.countries_name, z.zone_name, z.zone_code, z.zone_country_id from " . TABLE_ZONES . " z, " . TABLE_COUNTRIES . " c where z.zone_country_id = c.countries_id ".$wh." order by ".((isset($_GET['sort_by'])) ? $_GET['sort_by'] : 'c.countries_name, z.zone_name ASC');
- $zones_split = new splitPageResults($page, MAX_DISPLAY_ROW_BY_PAGE, $zones_query_raw, $zones_query_numrows);
- $zones_query = tep_db_query($zones_query_raw);
- $list_z=array();
- while ($zones = tep_db_fetch_array($zones_query)) {
- if ($rID == $zones['zone_id']) $cInfo = new objectInfo($zones);
- $list_z[]=$zones;
- }
-// break;
+
+ $list_edit=array();
+ if(isset($mID) ){
+ $cfg->load_db_values();
+ }
+ elseif(tep_not_null($gID) && is_numeric($gID) ){
+ $list=sqlconfiguration::fetch(array('group_id'=> (int)$gID), true);
+
+ if(is_object($list))
+ $liste[]=$list;
+ else
+ $liste=$list;
+
+ foreach($liste as $row) {
+
+ $cfgValue =configUtility::CallExecConfigLine($row->use, $row->key, $row->value);
+
+ if ($row->set) eval($s[]='$value_field = ' . $row->set . '"' . htmlspecialchars($row->value) . '","'.$row->key.'");');
+ else $value_field = tep_draw_input_field('configuration['.$row->key.']', '',$row->value);
+
+ $conf = $row;
+ $row->cfgValue=$cfgValue;
+ $row->value_field=$value_field;
+
+ $list_edit[]=$conf;
+ }
+ }
+
}
+// exit;
+
+
+ $cfg_group_query = tep_db_query("select configuration_group_title from " . TABLE_CONFIGURATION_GROUP . " where configuration_group_id = '" . (int)$gID . "'");
+ $cfg_group = tep_db_fetch_array($cfg_group_query);
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/content/countries.central.inc
===================================================================
--- trunk/catalog/admin/includes/content/countries.central.inc 2011-11-20 22:16:57 UTC (rev 3908)
+++ trunk/catalog/admin/includes/content/countries.central.inc 2011-11-21 08:33:02 UTC (rev 3909)
@@ -1,11 +1,12 @@
<?php
/**
- @licence GPL 2005-2009 The osCSS developers - osCSS Open Source E-commerce
- @package oscss-2 <www http://www.oscss.org>
- @version Rc-3
- @date 07/04/10, 22:11
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 22/09/11, 22:00
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
+ @encode UTF-8
*/
?>
<!-- body //-->
@@ -203,7 +204,13 @@
$contents[] = array('text' => TEXT_INFO_COUNTRY_LOCALNAME . $cInfo->countries_localname);
$contents[] = array('text' => TEXT_INFO_COUNTRY_CODE_2 . $cInfo->countries_iso_code_2);
$contents[] = array('text' => TEXT_INFO_COUNTRY_CODE_3 . $cInfo->countries_iso_code_3);
- $contents[] = array('text' => TEXT_INFO_ADDRESS_FORMAT . $cInfo->address_format_id);
+ $contents[] = array('text' => TEXT_INFO_ADDRESS_FORMAT . $cInfo->address_format_id .
+'<br />'.
+'<div class="ViewAddress ViewAddress-format">'.
+str_replace('\n','<br />',$address_format_array[$cInfo->address_format_id]).
+'</div>'
+);
+
$contents[] = array('text' => TEXT_INFO_COUNTRY_VISIBLE . $country_visible);
}
break;
Modified: trunk/catalog/admin/includes/content/countries.top.inc
===================================================================
--- trunk/catalog/admin/includes/content/countries.top.inc 2011-11-20 22:16:57 UTC (rev 3908)
+++ trunk/catalog/admin/includes/content/countries.top.inc 2011-11-21 08:33:02 UTC (rev 3909)
@@ -1,11 +1,12 @@
<?php
/**
- @licence GPL 2005-2009 The osCSS developers - osCSS Open Source E-commerce
- @package oscss-2 <www http://www.oscss.org>
- @version Rc-3
- @date 08/04/10, 22:41
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 22/09/11, 22:00
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
+ @encode UTF-8
*/
$rID=(isset($_GET['rID'])) ? $_GET['rID'] : '';
@@ -62,6 +63,15 @@
break;
default:
+ $address_format_query = tep_db_query("select address_format_id, address_example from " . TABLE_ADDRESS_FORMAT . " order by address_format_id");
+ $address_format_array = array();
+ while ($address_format_values = tep_db_fetch_array($address_format_query)) {
+ $address_format_array[$address_format_values['address_format_id']] = $address_format_values['address_example'] ;
+ }
+// return $address_format_array;
+
+
+
$countries_query_raw = "select countries_id, countries_name, countries_localname, countries_iso_code_2, countries_iso_code_3, address_format_id, country_visible from " . TABLE_COUNTRIES . " order by ".((isset($_GET['sort_by'])) ? $_GET['sort_by'] : 'countries_name ASC, country_visible DESC');
$countries_split = new splitPageResults($page, MAX_DISPLAY_ROW_BY_PAGE, $countries_query_raw, $countries_query_numrows);
$countries_query = tep_db_query($countries_query_raw);
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/pages/orders.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/pages/orders.txt 2011-11-20 22:16:57 UTC (rev 3908)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/orders.txt 2011-11-21 08:33:02 UTC (rev 3909)
@@ -48,6 +48,7 @@
$lang['entry shipping address']="Adresse d'expédition" ;
$lang['entry billing address']="Adresse de facturation" ;
$lang['entry payment method']="Méthode de paiement" ;
+$lang['entry shipping method']="Méthode de livraison" ;
$lang['entry credit card type']="Type de carte de crédit :" ;
$lang['entry credit card owner']="Propriétaire de la carte de crédit :" ;
$lang['entry credit card number']="Numéro de la carte de crédit :" ;
@@ -88,10 +89,20 @@
$lang['text no order history']="Aucun historique de commande disponible" ;
$lang['text shedule return']="engager une procédure de retour produit ou d'échange" ;
+
+$lang['order table pdf heading file']="Fichiers" ;
+$lang['order table pdf heading weight']="Poids" ;
+$lang['order table pdf heading date']="Date" ;
+
+
$lang['legend contact customers']="Contact" ;
$lang['legend update order history']="Mise à jour" ;
$lang['pdf generate']="Generer" ;
+$lang['error order not update address']="Erreur : adresse de la commande non mise à jour" ;
+$lang['success order update address']="Succes, mise à jour de l'adresse de la commande" ;
+$lang['error order not update mod']="Erreur : methode de la commande non mise à jour" ;
+$lang['success order update mod']="Succes, mise à jour de la méthode" ;
$lang['error order does not exist']="Erreur : La commande n'existe pas." ;
$lang['success order updated']="Succès : La commande est mise à jour avec succès." ;
$lang['warning order not updated']="Attention : Aucune modification n'a été effectuée. La commande n'a pas été mise à jour." ;
Modified: trunk/catalog/includes/functions/general.php
===================================================================
--- trunk/catalog/includes/functions/general.php 2011-11-20 22:16:57 UTC (rev 3908)
+++ trunk/catalog/includes/functions/general.php 2011-11-21 08:33:02 UTC (rev 3909)
@@ -962,78 +962,7 @@
else return $tpl->display($file);
}
-/**
- @package oscss-Rv
- @author oscim - OscssTeam
- @version 2.0
- Construteur de mise en forme des email avant envoi; remplace les code raccouris et ajoute si necessaire l'entete html
- @param string nom du template
- @param string path du language utilis pour le mail
- @param array $myarray key/value des var perso
- @param boolean return / print
-*/
-function tep_post_prepare_email($gabarit_template,$language,$myarray,$print=false){
- global $title_email,$messageStack,$page;
- $gabarit_template=(tep_not_null($gabarit_template))? $gabarit_template : 'defaut.tpl' ;
-
- if ( ($template=page::TestFile(DIR_FS_CATALOG.DIR_WS_MODULES . 'template_email/'.$gabarit_template)) !=false)
- $new_file=DIR_WS_MODULES . 'template_email/'.$gabarit_template;
- elseif ( ($template=page::TestFile(DIR_FS_CATALOG.$page->getPathTemplate().DIR_WS_MODULES . 'template_email/'.$gabarit_template)) !=false)
- $new_file=$page->getPathTemplate().DIR_WS_MODULES . 'template_email/'.$gabarit_template;
- elseif ( ($template=page::TestFile(DIR_FS_CATALOG.DIR_WS_MODULES . 'template_email/'.'defaut.tpl')) !=false)
- $new_file=DIR_WS_MODULES . 'template_email/'.'defaut.tpl';
- elseif ( ($template=page::TestFile(DIR_FS_CATALOG.$page->getPathTemplate().DIR_WS_MODULES . 'template_email/'.'defaut.tpl')) !=false)
- $new_file=$page->getPathTemplate().DIR_WS_MODULES . 'template_email/'.'defaut.tpl';
- else
- trigger_error(sprintf(__FUNCTION__.'Mailer template error no found : %s', $gabarit_template), E_USER_ERROR);
-
- $file = basename($new_file);
- if ( ($fileLang=page::fix_file(DIR_FS_CATALOG.DIR_WS_LANGUAGES . $language .'/modules/template_email/'.substr($file, 0, strlen($file)-4) .'.txt')) !=false)
- include($fileLang);
-
- $title_email=$lang['EMAIL_TEXT_SUBJECT'];
- if(!defined('EMAIL_TEXT_SUBJECT'))define('EMAIL_TEXT_SUBJECT',$lang['EMAIL_TEXT_SUBJECT']);
-
- $tpl = &Template::singleton();
-
- $myarray['br']="\n";
- if (!empty($tpl->error)) {
- trigger_error(sprintf(__FUNCTION__.'Mailer template error: %s', $message->ErrorInfo), E_USER_ERROR);
- return false;
- }
- $tpl->template_dir = dirname($new_file).'/'; //DIR_WS_MODULES . 'template_email/';
- $tpl->assign("STORE_LOGO_PRINT",STORE_LOGO_PRINT);
- $tpl->assign("DIR_WS_CATALOG", DIR_WS_CATALOG);
- $tpl->assign("HTTP_SERVER", HTTP_SERVER);
- $tpl->assign("DIR_WS_IMAGES", DIR_WS_IMAGES.'mail/');
- $tpl->assign("DIR_WS_LANGUAGES", DIR_WS_LANGUAGES);
- $tpl->assign("CHARSET", CHARSET);
- $tpl->assign("STORE_NAME", STORE_NAME);
- $tpl->assign("myarray", $myarray);
- $tpl->assign("TPL_CONTENT", addslashes($myarray['message']));
- if (isset($lang) && is_array($lang))$tpl->assign("lg", $lang);
-
- if (!empty($tpl->error)) {
- trigger_error(sprintf(__FUNCTION__.'Mailer template error: %s', $message->ErrorInfo), E_USER_ERROR);
- return false;
- }
-
- if(!$print) {
- $mess['html']=$tpl->get($file);
-
- // force calcul txt
- $myarray['email_use_html']=false;
- $tpl->assign("myarray", $myarray);
-
- $mess['text']=$tpl->get($file);
-
- return $mess;
- }
- else return $tpl->display($file);
-}
-
-
/**
\brief Chargement des fichiers de gabarit html
\a string name file sans ext
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php 2011-11-20 22:16:57 UTC (rev 3908)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php 2011-11-21 08:33:02 UTC (rev 3909)
@@ -84,7 +84,7 @@
/** Box login / info */
- $this->oscss_boxes->_addWidget('Widget_login_box', 'hidden');
+// $this->oscss_boxes->_addWidget('Widget_login_box', 'hidden');
$this->oscss_boxes->_add('languages', 'headertop');
/** Boite de recherche */
Modified: trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql 2011-11-20 22:16:57 UTC (rev 3908)
+++ trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql 2011-11-21 08:33:02 UTC (rev 3909)
@@ -189,7 +189,7 @@
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_USE_HTML_S', 'EMAIL_USE_HTML', 'true', 'EMAIL_USE_HTML_L', '12', '3', NOW(), NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),');
insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('ENTRY_EMAIL_ADDRESS_CHECK_S', 'ENTRY_EMAIL_ADDRESS_CHECK', 'false', 'ENTRY_EMAIL_ADDRESS_CHECK_L', '12', '4', NOW(), NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),');
insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('SEND_EMAILS_S', 'SEND_EMAILS', 'true', 'SEND_EMAILS_L', '12', '5', NOW(), NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),');
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('USE_MODELE_EMAIL_S', 'USE_MODELE_EMAIL', 'mouton', 'USE_MODELE_EMAIL_L', '12', '5', NOW(), NOW(), NULL, 'tep_cfg_select_pull_down($this->GetModeleEmails(),', \'false\'),',2);
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('USE_MODELE_EMAIL_S', 'USE_MODELE_EMAIL', 'mouton', 'USE_MODELE_EMAIL_L', '12', '5', NOW(), NOW(), NULL, 'tep_cfg_select_pull_down($this->GetModeleEmails(),', 2);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-11-20 22:17:03
|
Revision: 3908
http://oscss.svn.sourceforge.net/oscss/?rev=3908&view=rev
Author: oscim
Date: 2011-11-20 22:16:57 +0000 (Sun, 20 Nov 2011)
Log Message:
-----------
Added Paths:
-----------
trunk/catalog/checkout.php
Added: trunk/catalog/checkout.php
===================================================================
--- trunk/catalog/checkout.php (rev 0)
+++ trunk/catalog/checkout.php 2011-11-20 22:16:57 UTC (rev 3908)
@@ -0,0 +1,60 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 20/11/11, 22:47
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ *\file
+ *\brief page pre-process order
+*/
+
+ require('includes/application_top.php');
+
+
+error_reporting(E_ALL);
+
+
+ //! chargement order
+ $order = new order;
+ $page->add_object('order',$order);
+
+
+ $ACA =$page->new_class('checkout', @$_GET['step']);
+
+ $Etape=$ACA->GetCurrentEtape();
+ $filepath = 'checkout_'.strtolower(substr($Etape, 2)).'.php';
+
+
+ $page->init($filepath,$language);
+ $page->force_content($filepath);
+
+ $page->is_registered();
+
+
+
+
+ if(isset($ACA->modules[$Etape])) {
+
+ $BeforeProcess=$ACA->modules[$Etape]->BeforeProcess();
+
+ }
+
+
+ $page->breadcrumb->add(NAVBAR_TITLE_1, tep_href_link(constant('FILENAME_CHECKOUT_'.strtoupper(substr($Etape, 2))), '', 'SSL'));
+ $page->post_init();
+
+
+ $page->javascript->add_framework("ext/jquery/jquery.min.js");
+ $page->javascript->add_script("ext/jquery/jquery.validate.min.js", array('sort'=>30));
+
+
+
+ include($page->path_gabarit());
+
+
+ require(DIR_WS_INCLUDES . 'application_bottom.php');
+
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-11-20 22:16:29
|
Revision: 3907
http://oscss.svn.sourceforge.net/oscss/?rev=3907&view=rev
Author: oscim
Date: 2011-11-20 22:16:23 +0000 (Sun, 20 Nov 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/catalog/admin/includes/template/oscss/stylesheet-1.css
Modified: trunk/catalog/admin/includes/template/oscss/stylesheet-1.css
===================================================================
--- trunk/catalog/admin/includes/template/oscss/stylesheet-1.css 2011-11-20 22:15:55 UTC (rev 3906)
+++ trunk/catalog/admin/includes/template/oscss/stylesheet-1.css 2011-11-20 22:16:23 UTC (rev 3907)
@@ -66,6 +66,7 @@
/* buttons */
.button,
+ select.button,
input[type=submit].button,
input[type=button].button,
button.button,
@@ -95,12 +96,14 @@
input.button,
button.button{font-size:11px; background:#ccc;padding:2px 5px; }
+
a.button{ background:#eee; padding:2px 5px; margin:10px 20px ;text-decoration:none;height:18px; line-height:18px;}
a.button:hover{background:#797979; color:white;text-decoration:none; }
a.button,
+ select.button,
input.button,
- button.button {background:#ccc url(img/1/button.jpg) left top repeat-x;}
+ button.button {background:#df1217 url(img/1/button.jpg) left top repeat-x;}
a.button.ActionYes,
input.button.ActionYes,
@@ -181,6 +184,8 @@
.sort_by .Selected { border-bottom:2px solid red;}
/* Bouton bas page*/
.button_nav{clear:both;}
+ .button_nav form{float:right; width:100px;}
+ .button_nav form p {margin:0;padding:0;}
/* */
#row_by_page_select option {display:block;}
@@ -348,7 +353,9 @@
#central form .input-multi input[type="radio"]{float:none;}
#central form#configuration p input[type="text"] { margin:5px 15px;width:60%; }
- #central form label { white-space:nowrap; display: inline-block; font-weight: bold; line-height: 18px; margin: 5px 5px 5px 0; padding: 0 0 2px; text-align: left; width: 20%;}
+
+ #central form label { display: inline-block; font-weight: bold; line-height: 18px; margin: 5px 5px 5px 0; padding: 0 0 2px; text-align: left; min-width: 20%;}
+ #central form .block_input label.inline { white-space:nowrap; width: 20%;}
#central form textarea{ vertical-align:baseline;}
#central .label.text {font-weight:bold;margin:0 5px;}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-11-20 22:16:01
|
Revision: 3906
http://oscss.svn.sourceforge.net/oscss/?rev=3906&view=rev
Author: oscim
Date: 2011-11-20 22:15:55 +0000 (Sun, 20 Nov 2011)
Log Message:
-----------
Added Paths:
-----------
trunk/catalog/admin/includes/languages/fr_FR/modules/payment/moneyorder.txt
Added: trunk/catalog/admin/includes/languages/fr_FR/modules/payment/moneyorder.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/payment/moneyorder.txt (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/payment/moneyorder.txt 2011-11-20 22:15:55 UTC (rev 3906)
@@ -0,0 +1,30 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 19/11/11, 19:20
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+$lang['module payment moneyorder text title']="Paiement par chéque";
+$lang['module payment moneyorder text description']="Paiement par chéque. en attente du chèque pour confirmation de la commande";
+
+// $lang['module payment cod sort order']="tri";
+// $lang['module payment cod status']="etat";
+// $lang['module payment cod order status id']="Le statut des commande apres choix de ce type de paiment";
+
+
+/* Necessaire a l'installion */
+ $lang['MODULE_PAYMENT_MONEYORDER_STATUS_TITLE']="Paiement par chèque" ;
+ $lang['MODULE_PAYMENT_MONEYORDER_STATUS']="Voulez-vous accepter le paiement par chèque ?" ;
+ $lang['MODULE_PAYMENT_MONEYORDER_SORT_ORDER_TITLE']="ordre de tri" ;
+ $lang['MODULE_PAYMENT_MONEYORDER_PAYTO_TITLE']="Payable à:" ;
+// $lang['MODULE_PAYMENT_MONEYORDER_PAYTO']= 'À qu'elle ordre doit être établi le règlement ?';
+ $lang['MODULE_PAYMENT_MONEYORDER_ORDER_STATUS_ID_TITLE']="État de la commande" ;
+// $lang['MODULE_PAYMENT_MONEYORDER_ORDER_STATUS_ID']= 'Sélectionner l'état de la commande que vous voulez par défaut.';
+ $lang['MODULE_PAYMENT_MONEYORDER_ZONE_TITLE']="Zone de paiement" ;
+// $lang['MODULE_PAYMENT_MONEYORDER_ZONE']= 'Permettre seulement cette méthode de paiement pour la zone choisie.';
+
+?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-11-20 22:15:29
|
Revision: 3905
http://oscss.svn.sourceforge.net/oscss/?rev=3905&view=rev
Author: oscim
Date: 2011-11-20 22:15:22 +0000 (Sun, 20 Nov 2011)
Log Message:
-----------
Added Paths:
-----------
trunk/catalog/admin/includes/modules/shipping/item.php
trunk/catalog/admin/includes/modules/shipping/spu.php
Added: trunk/catalog/admin/includes/modules/shipping/item.php
===================================================================
--- trunk/catalog/admin/includes/modules/shipping/item.php (rev 0)
+++ trunk/catalog/admin/includes/modules/shipping/item.php 2011-11-20 22:15:22 UTC (rev 3905)
@@ -0,0 +1,127 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 20/11/11, 00:06
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+class item {
+ public $code;
+ public $title;
+ public $description;
+ public $enabled;
+
+// class constructor
+ public function __construct() {
+ $this->code = __CLASS__;
+ $this->title = __('module shipping text item title');
+ $this->description = __('module shipping item text description');
+ $this->sort_order = (defined('MODULE_SHIPPING_SPU_SORT_ORDER;')? MODULE_SHIPPING_SPU_SORT_ORDER: 0);
+ $this->icon = (tep_not_null('MODULE_SHIPPING_SPU_ICON')? MODULE_SHIPPING_SPU_ICON : '');
+ $this->enabled = true ;
+
+ global $order;
+ if (is_object($order)) $this->update_status($order);
+ }
+
+// class methods
+ /**
+ */
+ public function update_status($order) {
+ if ($this->enabled == true ) {
+ $this->enabled = false;
+ if ( ((int)MODULE_SHIPPING_ITEM_ZONE > 0) && ((int)MODULE_SHIPPING_ITEM_ZONE == shipping::getGeoZoneID($order->delivery['country']['id'], $order->delivery['zone_id'])) )
+ $this->enabled = true;
+ elseif ((int)MODULE_SHIPPING_ITEM_ZONE == 0)
+ $this->enabled = true;
+ }
+ }
+
+
+ /**
+ @brief after save table order, adjust modules data save
+ @param $id int order id
+ */
+ public function after_update($id){
+
+ if(empty($id) || (int)$id >0 ){
+ return true;
+ }
+
+// exit;
+ return false;
+ }
+
+ /**
+ @brief load specific data modules
+ */
+ public function load_post_values(){
+ }
+
+ /**
+ @brief load specific data modules
+ */
+ public function load_db_value(){
+ }
+
+ /**
+ @brief retrun html view data modules
+ */
+ public function display_view(){
+// if (tep_not_null(orders::$order->info['cc_type']) || tep_not_null(orders::$order->info['cc_owner']) )
+ return MGabCont::CallGab('view','shipping/'.__CLASS__,'orders');
+ }
+
+ /**
+ @brief retrun html view form data modules
+ */
+ public function display_edit(){
+ return MGabCont::CallGab('edit','shipping/'.__CLASS__,'orders');
+ }
+
+
+ public function get_error() {
+ return false;
+ }
+
+ /**
+ */
+ public function check() {
+ if (!isset($this->_check)) {
+ $check_query = tep_db_query("select configuration_value from " . TABLE_CONFIGURATION . " where configuration_key LIKE 'MODULE_SHIPPING_SPU%' ");
+ if( tep_db_num_rows($check_query) == count($this->keys()) ) $this->_check=true;
+ else {
+ $this->remove();
+ $this->_check=false;
+ }
+ }
+ return $this->_check;
+ }
+
+ /**
+ */
+ public function install() {
+ $DB=Database::getInstance();
+ $DB->query("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added) values ('Coût de livraison', 'MODULE_SHIPPING_ITEM_COST', '2.50', 'Le coût de livraison sera multiplié par le nombre d\'articles dans la commande employant cette méthode.', '6', '0', now())");
+ $DB->query("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added) values ('Coûts de manutention', 'MODULE_SHIPPING_ITEM_HANDLING', '0', 'Les coûts de manutention pour cette méthode de livraison.', '6', '0', now())");
+ $DB->query("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('Type de taxe', 'MODULE_SHIPPING_ITEM_TAX_CLASS', '0', 'Employez la classe suivante de taxe sur les coûts de livraison.', '6', '0', 'tep_get_tax_class_title', 'tep_cfg_pull_down_tax_classes(', now())");
+ $DB->query("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('Zone de livraison', 'MODULE_SHIPPING_ITEM_ZONE', '0', 'Permettre seulement cette méthode de livraison pour la zone choisie.', '6', '0', 'tep_get_zone_class_title', 'tep_cfg_pull_down_zone_shipping(', now())");
+ $DB->query("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added) values ('Ordre de tri', 'MODULE_SHIPPING_ITEM_SORT_ORDER', '0', 'Ordre de tri pour l\'affichage (Le plus petit nombre est montré en premier).', '6', '0', now())");
+
+ $DB->query("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added,set_function) values ('".addslashes(__("Icone"))."', 'MODULE_SHIPPING_ITEM_ICON', '', '".addslashes(__("Choix d'un icone"))."', '6', '0', now(),'tep_cfg_choose_img(')");
+ }
+
+ public function remove() {
+ $DB=Database::getInstance();
+ $DB->query("delete from " . TABLE_CONFIGURATION . " where configuration_key in ('" . implode("', '", $this->keys()) . "')");
+ }
+
+ public function keys() {
+ return array( 'MODULE_SHIPPING_ITEM_COST', 'MODULE_SHIPPING_ITEM_HANDLING', 'MODULE_SHIPPING_ITEM_TAX_CLASS', 'MODULE_SHIPPING_ITEM_ZONE', 'MODULE_SHIPPING_ITEM_SORT_ORDER','MODULE_SHIPPING_ITEM_ICON');
+ }
+}
+?>
\ No newline at end of file
Added: trunk/catalog/admin/includes/modules/shipping/spu.php
===================================================================
--- trunk/catalog/admin/includes/modules/shipping/spu.php (rev 0)
+++ trunk/catalog/admin/includes/modules/shipping/spu.php 2011-11-20 22:15:22 UTC (rev 3905)
@@ -0,0 +1,135 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 20/11/11, 00:06
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+class spu {
+ public $code;
+ public $title;
+ public $description;
+ public $enabled;
+
+// class constructor
+ public function __construct() {
+ $this->code = __CLASS__;
+ $this->title = __('module shipping text spu title');
+ $this->description = __('module shipping spu text description');
+ $this->sort_order = (defined('MODULE_SHIPPING_SPU_SORT_ORDER;')? MODULE_SHIPPING_SPU_SORT_ORDER: 0);
+ $this->icon = (tep_not_null('MODULE_SHIPPING_SPU_ICON')? MODULE_SHIPPING_SPU_ICON : '');
+ $this->enabled = true ;
+
+ global $order;
+ if (is_object($order)) $this->update_status($order);
+ }
+
+// class methods
+ public function update_status($order) {
+ if ($this->enabled == true ) {
+ $this->enabled = false;
+ if ( ((int)MODULE_SHIPPING_SPU_ZONE > 0) && ((int)MODULE_SHIPPING_SPU_ZONE == shipping::getGeoZoneID($order->delivery['country']['id'], $order->delivery['zone_id'])) )
+ $this->enabled = true;
+ elseif ((int)MODULE_SHIPPING_SPU_ZONE == 0)
+ $this->enabled = true;
+ }
+ }
+
+
+ /**
+ @brief after save table order, adjust modules data save
+ @param $id int order id
+ */
+ public function after_update($id){
+
+ if(empty($id) || (int)$id >0 ){
+ return true;
+ }
+
+// exit;
+ return false;
+ }
+
+ /**
+ @brief load specific data modules
+ */
+ public function load_post_values(){
+ }
+
+ /**
+ @brief load specific data modules
+ */
+ public function load_db_value(){
+ }
+
+ /**
+ @brief retrun html view data modules
+ */
+ public function display_view(){
+// if (tep_not_null(orders::$order->info['cc_type']) || tep_not_null(orders::$order->info['cc_owner']) )
+ return MGabCont::CallGab('view','shipping/'.__CLASS__,'orders');
+ }
+
+ /**
+ @brief retrun html view form data modules
+ */
+ public function display_edit(){
+ return MGabCont::CallGab('edit','shipping/'.__CLASS__,'orders');
+ }
+
+
+ public function get_error() {
+ return false;
+ }
+
+ /**
+ */
+ public function check() {
+ if (!isset($this->_check)) {
+ $check_query = tep_db_query("select configuration_value from " . TABLE_CONFIGURATION . " where configuration_key LIKE 'MODULE_SHIPPING_SPU%' ");
+ if( tep_db_num_rows($check_query) == count($this->keys()) ) $this->_check=true;
+ else {
+ $this->remove();
+ $this->_check=false;
+ }
+ }
+ return $this->_check;
+ }
+
+ /**
+ */
+ public function install() {
+ $DB=Database::getInstance();
+ $DB->query("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added) values ('".addslashes(__('Store Pickup Cost'))."', 'MODULE_SHIPPING_SPU_COST', '0.00', '".addslashes(__('Preciser le cout'))."', '6', '0', now())");
+ $DB->query("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('".__('Shipping Zone')."', 'MODULE_SHIPPING_SPU_ZONE', '0', '".addslashes(__('If a zone is selected, only enable this shipping method for that zone.'))."', '6', '0', 'tep_get_zone_class_title', 'tep_cfg_pull_down_zone_shipping(', now())");
+ $DB->query("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added) values ('".addslashes(__('Sort order'))."', 'MODULE_SHIPPING_SPU_SORT_ORDER', '0', '".addslashes(__('Preciser un nombre pour le tri'))."', '6', '0', now())");
+ $DB->query("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added,set_function) values ('choose icon', 'MODULE_SHIPPING_SPU_ICON', '', 'choose icon transporteur', '6', '0', now(),'tep_cfg_choose_img(')");
+
+ // chargée sur demande
+ $DB->query("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added, configuration_type) values ('".addslashes(__('Store Pick Up Zip Code Allowed'))."', 'MODULE_SHIPPING_SPU_ZIP', '01, 07, 26, 38, 42, 69, 74', '".addslashes(__("Departement autorisé pour le retrait magasin ? laisser vide si vous ne l'utilisez pas"))."', '6', '0', now(),0)");
+ }
+
+ /**
+ */
+ public function remove() {
+ $keys = '';
+ $keys_array = $this->keys();
+ for ($i=0; $i<sizeof($keys_array); $i++) {
+ $keys .= "'" . $keys_array[$i] . "',";
+ }
+ $keys = substr($keys, 0, -1);
+
+ tep_db_query("delete from " . TABLE_CONFIGURATION . " where configuration_key in (" . $keys . ")");
+ }
+
+ /**
+ */
+ public function keys() {
+ return array( 'MODULE_SHIPPING_SPU_COST', 'MODULE_SHIPPING_SPU_SORT_ORDER', 'MODULE_SHIPPING_SPU_ZONE', 'MODULE_SHIPPING_SPU_ZIP','MODULE_SHIPPING_SPU_ICON');
+ }
+}
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-11-20 22:14:58
|
Revision: 3904
http://oscss.svn.sourceforge.net/oscss/?rev=3904&view=rev
Author: oscim
Date: 2011-11-20 22:14:52 +0000 (Sun, 20 Nov 2011)
Log Message:
-----------
Added Paths:
-----------
trunk/catalog/admin/includes/modules/payment/moneyorder.php
Added: trunk/catalog/admin/includes/modules/payment/moneyorder.php
===================================================================
--- trunk/catalog/admin/includes/modules/payment/moneyorder.php (rev 0)
+++ trunk/catalog/admin/includes/modules/payment/moneyorder.php 2011-11-20 22:14:52 UTC (rev 3904)
@@ -0,0 +1,156 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 19/11/11, 23:59
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+class moneyorder implements InterfaceModule,InterfaceAcaPayment{
+ var $code, $title, $description, $enabled;
+
+
+ public function __construct() {
+ global $order;
+
+ $this->code = __CLASS__;
+ $this->title = __('module payment moneyorder text title');
+ $this->description = __('module payment moneyorder text description');
+ $this->sort_order = (defined('MODULE_PAYMENT_MONEYORDER_SORT_ORDER')? MODULE_PAYMENT_MONEYORDER_SORT_ORDER : 0);
+ $this->icon = (tep_not_null('MODULE_PAYMENT_MONEYORDER_ICON')? substr(MODULE_PAYMENT_MONEYORDER_ICON,strlen(DIR_WS_CATALOG)) : '');
+ $this->enabled = true;
+
+ if ((int)MODULE_PAYMENT_MONEYORDER_ORDER_STATUS_ID > 0)$this->order_status = MODULE_PAYMENT_MONEYORDER_ORDER_STATUS_ID;
+
+// if (is_object($order)) $this->update_status();
+
+ //! texte supp dans email commande
+// $this->email_footer = __('MODULE_PAYMENT_MONEYORDER_TEXT_EMAIL_FOOTER');
+ }
+
+
+// public function update_status() {
+// global $order;
+//
+// if ( ($this->enabled == true) && ((int)MODULE_PAYMENT_MONEYORDER_ZONE > 0) ) {
+// $check_flag = false;
+// $check_query = tep_db_query("select zone_id from " . TABLE_ZONES_TO_GEO_ZONES . " where geo_zone_id = '" . MODULE_PAYMENT_MONEYORDER_ZONE . "' and (zone_country_id = '" . $order->delivery['country']['id'] . "' OR zone_country_id ='0') order by zone_id");
+// while ($check = tep_db_fetch_array($check_query)) {
+// if ($check['zone_id'] < 1) {
+// $check_flag = true;
+// break;
+// } elseif ($check['zone_id'] == $order->billing['zone_id']) {
+// $check_flag = true;
+// break;
+// }
+// }
+//
+// if ($check_flag == false) $this->enabled = false;
+// }
+// }
+
+ /**
+ @brief after save table order, adjust modules data save
+ @param $id int order id
+ */
+ public function after_update($id){
+
+ if(empty($id) || (int)$id >0 ){
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ @brief load specific data modules
+ */
+ public function load_post_values(){
+ }
+
+ /**
+ @brief load specific data modules
+ */
+ public function load_db_value(){
+ }
+
+ /**
+ @brief retrun html view data modules
+ */
+ public function display_view(){
+ return MGabCont::CallGab('view','payment/'.__CLASS__,'orders');
+ }
+
+ /**
+ @brief retrun html view form data modules
+ */
+ public function display_edit(){
+ return MGabCont::CallGab('edit','payment/'.__CLASS__,'orders');
+ }
+
+ public function javascript_validation() { return false; }
+
+ public function selection() {
+ return array( 'id' => $this->code,
+ 'module' => $this->title,
+ 'icon'=>tep_image($this->icon, $this->title)
+ );
+ }
+
+ public function pre_confirmation_check() { return false; }
+
+ public function confirmation() {
+ return array('title' => __('module payment moneyorder text title'));
+ }
+
+ public function process_button() { return false; }
+ public function before_process() { return false; }
+ public function after_process() { return false; }
+
+ /**
+ Retour des éléments de num order, de order de cheque, et des liens vers account
+ */
+// public function payment_succes() {
+// $s=__('note succes monyeyorder');
+// if(tep_session_is_registered('the_order_formated')) $s.=sprintf(__('link succes monyeyorder'),$_SESSION['the_order_formated']);
+// elseif(tep_session_is_registered('the_order_id')) $s.=sprintf(__('link succes monyeyorder'),$_SESSION['the_order_id']);
+// return $s;
+// }
+
+ public function get_error() { return false; }
+
+ public function check() {
+ $DB=Database::getInstance();
+ if (!isset($this->_check)) {
+ $check_query = $DB->query("select configuration_value from " . TABLE_CONFIGURATION . " where configuration_key LIKE 'MODULE_PAYMENT_MONEYORDER%' ");
+ if( $check_query->__get('numRows') == count($this->keys()) ) $this->_check=true;
+ else {
+ $this->remove();
+ $this->_check=false;
+ }
+ }
+ return $this->_check;
+ }
+
+ public function install() {
+ $DB=Database::getInstance();
+ $DB->query("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added) values ('".addslashes(__("Payable à..."))."', 'MODULE_PAYMENT_MONEYORDER_PAYTO', '', '".addslashes(__("A qu'elle ordre doit être effectue le paiement ?"))."', '6', '0', now());");
+ $DB->query("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added) values ('".addslashes(__("Ordre de tri"))."', 'MODULE_PAYMENT_MONEYORDER_SORT_ORDER', '0', '".addslashes(__("Ordre de tri pour l'affichage (Le plus petit nombre est montré en premier)."))."', '6', '1', now())");
+ $DB->query("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('Zone de paiement', 'MODULE_PAYMENT_MONEYORDER_ZONE', '0', '".addslashes(__("Permettre seulement cette méthode de paiement pour la zone choisie."))."', '6', '2', 'tep_get_zone_class_title', 'tep_cfg_pull_down_zone_classes(', now())");
+ $DB->query("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, set_function, use_function, date_added) values ('".addslashes(__("Etat de la commande"))."', 'MODULE_PAYMENT_MONEYORDER_ORDER_STATUS_ID', '0', '".addslashes(__("Sélectionner l'état de la commande que vous voulez par défault."))."', '6', '1', 'tep_cfg_pull_down_order_statuses(', 'tep_get_order_status_name', now())");
+
+ $DB->query("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, set_function, use_function, date_added) values ('".__('Icone pour ce mode paiement')."', 'MODULE_PAYMENT_MONEYORDER_ICON', '', '".addslashes(__("Choix d'un icone"))."', '6', '5', 'tep_cfg_choose_img(', NULL, now())");
+ }
+
+ public function remove() {
+ $DB=Database::getInstance();
+ $DB->query("delete from " . TABLE_CONFIGURATION . " where configuration_key in ('" . implode("', '", $this->keys()) . "')");
+ }
+
+ public function keys() {
+ return array( 'MODULE_PAYMENT_MONEYORDER_ZONE', 'MODULE_PAYMENT_MONEYORDER_ORDER_STATUS_ID', 'MODULE_PAYMENT_MONEYORDER_SORT_ORDER', 'MODULE_PAYMENT_MONEYORDER_PAYTO','MODULE_PAYMENT_MONEYORDER_ICON');
+ }
+}
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-11-20 22:13:40
|
Revision: 3903
http://oscss.svn.sourceforge.net/oscss/?rev=3903&view=rev
Author: oscim
Date: 2011-11-20 22:13:34 +0000 (Sun, 20 Nov 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/catalog/admin/includes/gabarit/orders/display_view.edit.gab
Modified: trunk/catalog/admin/includes/gabarit/orders/display_view.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/orders/display_view.edit.gab 2011-11-20 22:13:20 UTC (rev 3902)
+++ trunk/catalog/admin/includes/gabarit/orders/display_view.edit.gab 2011-11-20 22:13:34 UTC (rev 3903)
@@ -17,6 +17,7 @@
<li><a href="#tabs-1"><?php echo __('tab orders briefs'); ?></a></li>
<li><a href="#tabs-2"><?php echo __('tab orders details'); ?></a></li>
<li><a href="#tabs-3"><?php echo __('tab orders history'); ?></a></li>
+<!-- <li><a href="#tabs-4"><?php echo __('tab orders shipping'); ?></a></li> -->
</ul>
<div id="tabs-1" class="tabPage">
@@ -47,6 +48,8 @@
</div>
<!-- DRAW ADRESS SHIPING / BILLING -->
+
+ <?php /** Billing Address */ ?>
<div class="box_uniq">
<fieldset class="block_field fleft w_50" >
@@ -58,7 +61,7 @@
</span>
</legend>
- <p class="block_input">
+ <div class="block_input">
<?php if(!isset($_REQUEST['address']) || ( isset($_REQUEST['address']) && $_REQUEST['address'] !='billing' ) ): ?>
<?php echo tep_address_format(orders::$order->billing['format_id'], orders::$order->billing, 1, '', '<br />'); ?>
<?php else: ?>
@@ -94,46 +97,56 @@
</form>
<?php endif; ?>
- </p>
+ </div>
</fieldset>
+ <?php /** Shipping address */ ?>
<fieldset class="block_field fleft w_50" >
<legend>
<?php echo __('entry shipping address'); ?>
+
+ <?php if(isset(orders::$order->delivery['street_address'])): ?>
<span class="row_action">
<?php echo sprintf(CsrtAction::getLink('row_action_right', IMAGE_EDIT, 'edit'), '', tep_href_link(orders::FILENAME, 'action=edit&oID='.orders::$oID . '&address=delivery') ,'' ) ?>
</span>
+ <?php endif; ?>
</legend>
<?php if(isset(orders::$order->delivery['street_address'])): ?>
- <p class="block_input">
+ <div class="block_input">
<?php if(!isset($_REQUEST['address']) || ( isset($_REQUEST['address']) && $_REQUEST['address'] !='delivery' ) ): ?>
<?php echo tep_address_format(orders::$order->delivery['format_id'], orders::$order->delivery, 1, '', '<br />'); ?></p>
<?php else: ?>
<?php echo tep_draw_form('add_ship', orders::FILENAME,'oID='.orders::$oID.'&action=address&address=delivery', 'post', ' class="block_form"'); ?>
+ <ul>
+ <li>
+ <label for ="notify"><?php echo __('entry shipping address actived'); ?></label>
+ <?php echo tep_draw_checkbox_field('address[activate]', '', '', (!empty(orders::$order->delivery['name']) ? true :false) ); ?>
+ </li>
<?php if(_cst_bool('ACCOUNT_COMPANY')): ?>
- <?php echo tep_draw_input_field('address[company]','company', orders::$order->delivery['company']) ; ?>
+ <li><?php echo tep_draw_input_field('address[company]','company', orders::$order->delivery['company']) ; ?></li>
<?php endif; ?>
- <?php echo tep_draw_input_field('address[name]','name', orders::$order->delivery['name'] ); ?>
+ <li><?php echo tep_draw_input_field('address[name]','name', orders::$order->delivery['name'] ); ?></li>
- <?php echo tep_draw_input_field('address[street_address]','street_address', orders::$order->delivery['street_address']) ; ?>
+ <li><?php echo tep_draw_input_field('address[street_address]','street_address', orders::$order->delivery['street_address']) ; ?></li>
- <?php echo tep_draw_input_field('address[suburb]','suburb', orders::$order->delivery['suburb']) ; ?>
+ <li><?php echo tep_draw_input_field('address[suburb]','suburb', orders::$order->delivery['suburb']) ; ?></li>
- <?php echo tep_draw_input_field('address[postcode]','postcode', orders::$order->delivery['postcode']) ; ?>
+ <li><?php echo tep_draw_input_field('address[postcode]','postcode', orders::$order->delivery['postcode']) ; ?></li>
- <?php echo tep_draw_input_field('address[city]','city', orders::$order->delivery['city']) ; ?>
+ <li><?php echo tep_draw_input_field('address[city]','city', orders::$order->delivery['city']) ; ?></li>
- <?php echo tep_draw_pull_down_menu('address[country]', worldUtility::get_countries(), worldUtility::GetCountryIdByName(orders::$order->delivery['country']) ) ; ?>
+ <li><?php echo tep_draw_pull_down_menu('address[country]', worldUtility::get_countries(), worldUtility::GetCountryIdByName(orders::$order->delivery['country']) ) ; ?></li>
<?php if(_cst_bool('ACCOUNT_STATE')): ?>
- <?php echo tep_draw_input_field('address[state]','state', orders::$order->delivery['state']) ; ?>
+ <li><?php echo tep_draw_input_field('address[state]','state', orders::$order->delivery['state']) ; ?></li>
<?php endif; ?>
+ </ul>
<div class="button_nav">
<?php echo tep_js_back(tep_href_link(orders::FILENAME, tep_get_all_get_params(array('address')) ), IMAGE_CANCEL);?>
@@ -142,13 +155,16 @@
</form>
<?php endif; ?>
- </p>
+ </div>
<?php endif; ?>
</fieldset>
</div>
<!-- DRAW METHOD SHIPING / BILLING -->
+
+
+ <?php /** Payment Methode */ ?>
<div class="box_uniq">
<fieldset class="block_field fleft w_50">
<legend><?php echo __('entry payment method'); ?>
@@ -156,7 +172,7 @@
<?php echo sprintf(CsrtAction::getLink('row_action_right', IMAGE_EDIT, 'edit'), '', tep_href_link(orders::FILENAME, 'action=edit&oID='.orders::$oID . '&mod=payment') ,'' ) ?>
</span>
</legend>
- <p class="block_input">
+ <div class="block_input">
<?php if(!isset($_REQUEST['mod']) || ( isset($_REQUEST['mod']) && $_REQUEST['mod'] !='payment' ) ): ?>
<?php echo orders::$order->info['payment_method'] ; ?>
@@ -181,11 +197,10 @@
</div>
</form>
<?php endif; ?>
- </p>
+ </div>
+ </fieldset>
- </fieldset>
-
<?php /** Shipping Methode */ ?>
<?php if(isset(orders::$order->delivery['street_address'])): ?>
<fieldset class="block_field fleft w_50">
@@ -194,12 +209,14 @@
<?php echo sprintf(CsrtAction::getLink('row_action_right', IMAGE_EDIT, 'edit'), '', tep_href_link(orders::FILENAME, 'action=edit&oID='.orders::$oID . '&mod=shipping') ,'' ) ?>
</span>
</legend>
- <p class="block_input">
+ <div class="block_input">
<?php if(!isset($_REQUEST['mod']) || ( isset($_REQUEST['mod']) && $_REQUEST['mod'] !='shipping' ) ): ?>
- <?php echo orders::$order->mod['class_shipping'] ; ?>
+ <?php echo orders::GetTitle('shipping',orders::$order->mod['class_shipping']) ; ?>
<?php else: ?>
<?php echo tep_draw_form('mod_pay', orders::FILENAME,'oID='.orders::$oID.'&action=mod&mod=shipping', 'post', ' class="block_form"'); ?>
+ <?php echo tep_draw_pull_down_menu('mod[shipping]', orders::PrepaPullDownType('shipping'), orders::$order->mod['class_shipping'] , '') ; ?>
+
<div id="modShip">
<?php echo orders::EditMod('shipping', orders::$order->mod['class_shipping']) ?>
</div>
@@ -210,7 +227,7 @@
</div>
</form>
<?php endif; ?>
- </p>
+ </div>
</fieldset>
<?php endif; ?>
</div>
@@ -401,6 +418,30 @@
</div>
+
+
+ <div id="tabs-4" class="tabPage">
+ </div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
<?php
/**
DRAW BLOCK DOCS EXISTS OR LINK PDF CREATE
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-11-20 22:13:26
|
Revision: 3902
http://oscss.svn.sourceforge.net/oscss/?rev=3902&view=rev
Author: oscim
Date: 2011-11-20 22:13:20 +0000 (Sun, 20 Nov 2011)
Log Message:
-----------
Added Paths:
-----------
trunk/catalog/admin/includes/gabarit/orders/payment/moneyorder.edit.gab
trunk/catalog/admin/includes/gabarit/orders/payment/moneyorder.view.gab
Added: trunk/catalog/admin/includes/gabarit/orders/payment/moneyorder.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/orders/payment/moneyorder.edit.gab (rev 0)
+++ trunk/catalog/admin/includes/gabarit/orders/payment/moneyorder.edit.gab 2011-11-20 22:13:20 UTC (rev 3902)
@@ -0,0 +1,14 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 20/11/11, 00:02
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+?>
+<p class="block_input">
+</p>
\ No newline at end of file
Added: trunk/catalog/admin/includes/gabarit/orders/payment/moneyorder.view.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/orders/payment/moneyorder.view.gab (rev 0)
+++ trunk/catalog/admin/includes/gabarit/orders/payment/moneyorder.view.gab 2011-11-20 22:13:20 UTC (rev 3902)
@@ -0,0 +1,14 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 20/11/11, 00:02
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+?>
+<p class="block_input">
+</p>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-11-20 22:12:28
|
Revision: 3901
http://oscss.svn.sourceforge.net/oscss/?rev=3901&view=rev
Author: oscim
Date: 2011-11-20 22:12:22 +0000 (Sun, 20 Nov 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/catalog/admin/includes/gabarit/configuration/modstatus.listing.gab
Modified: trunk/catalog/admin/includes/gabarit/configuration/modstatus.listing.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/modstatus.listing.gab 2011-11-20 22:11:51 UTC (rev 3900)
+++ trunk/catalog/admin/includes/gabarit/configuration/modstatus.listing.gab 2011-11-20 22:12:22 UTC (rev 3901)
@@ -12,14 +12,20 @@
global $current_theme;
?>
- <div id="ssmenu">
- <?php echo tep_ssmenu_configuration($_GET['gparentID']) ?>
- </div>
+<div id="ssmenu">
+ <?php echo tep_ssmenu_configuration($_GET['gparentID']) ?>
+</div>
+
<br />
-<div class="box_uniq">
+
<h3><?php echo __('edition de status') ?></h3>
+
+<div class="box_uniq">
<?php echo modstatus::menu_mod();?>
+</div>
+
+<div class="box_uniq">
<div class="box_left">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-11-20 22:11:57
|
Revision: 3900
http://oscss.svn.sourceforge.net/oscss/?rev=3900&view=rev
Author: oscim
Date: 2011-11-20 22:11:51 +0000 (Sun, 20 Nov 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/catalog/admin/includes/modules/configuration/modstatus.php
trunk/catalog/admin/includes/modules/pages/orders.php
Modified: trunk/catalog/admin/includes/modules/configuration/modstatus.php
===================================================================
--- trunk/catalog/admin/includes/modules/configuration/modstatus.php 2011-11-20 22:10:26 UTC (rev 3899)
+++ trunk/catalog/admin/includes/modules/configuration/modstatus.php 2011-11-20 22:11:51 UTC (rev 3900)
@@ -155,11 +155,24 @@
*/
public static function menu_mod(){
+ $r = array();
+
+ foreach (self::$list_types as $type)
+ $r[]=array('id'=>$type->name,'text'=> __('liste '.$type->name,__CLASS__) );
+
+
$s ='<div class="button_nav">'."\n".
// '<a class="button" href="'.tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','sID')).'action=addtype').'">'. tep_image(DIR_WS_ICONS.'icon_add_new.png' , __('Add status type',__CLASS__)).__('Add status type',__CLASS__).'</a>'."\n".
'<a class="button" href="'.tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','sID')).'action=add').'">'. tep_image(DIR_WS_ICONS.'icon_add_new.png' , __('add status',__CLASS__)).__('add status',__CLASS__).'</a>'."\n";
- foreach (self::$list_types as $type)
- $s .='<a class="button" href="'.tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','sID')).'action=list&type='.$type->name).'">'.__('liste '.$type->name,__CLASS__).'</a>'."\n";
+
+ $s .= tep_draw_form('statustype', FILENAME_CONFIGURATION,'', 'get', ' class=""');
+ $s .= '<p>'.
+ tep_draw_hidden_field('gparentID',$_GET['gparentID']).
+ tep_draw_hidden_field('gID',$_GET['gID']).
+ tep_draw_hidden_field('action','list').
+ tep_draw_pull_down_menu('type', $r, (isset($_GET['type']) ? $_GET['type'] : 'orders' ) , ' class="button" onchange="submit()"').
+ '</p>';
+ $s .= '</form>';
$s .='</div>';
return $s;
}
Modified: trunk/catalog/admin/includes/modules/pages/orders.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/orders.php 2011-11-20 22:10:26 UTC (rev 3899)
+++ trunk/catalog/admin/includes/modules/pages/orders.php 2011-11-20 22:11:51 UTC (rev 3900)
@@ -283,10 +283,17 @@
$oID=(int)$_GET['oID'];
$type=(string)tep_db_input($_GET['address']);
+ if(!self::test_oID((int)self::$oID))
+ return false;
+
+ $order= sqlorder::fetch(array('id'=>self::$oID), true);
+
$opt['id'] = $oID;
$opt['post'] = $_POST;
+ $opt['status'] = $order->info['orders_status_id'];
$opt[$type] = $_POST['address'] ;
+
if(!sqlorder::update($opt))
$messageStack->add_session(__('error order not update address'), 'warning');
else
@@ -310,19 +317,25 @@
$oID=(int)$_GET['oID'];
$type=(string)tep_db_input($_GET['mod']);
+ if(!self::test_oID((int)self::$oID))
+ return false;
+
+ $order= sqlorder::fetch(array('id'=>self::$oID), true);
+
$opt['id'] = $oID;
+ $opt['status'] = $order->info['orders_status_id'];
$opt['post'] = $_POST;
$opt['mod'][$type] = $_POST['mod'][$type] ;
if(!sqlorder::update($opt))
- $messageStack->add_session(__('error order not update address'), 'warning');
+ $messageStack->add_session(__('error order not update mod'), 'warning');
else
- $messageStack->add_session(__('success order update address'), 'success');
+ $messageStack->add_session(__('success order update mod'), 'success');
/**
TODO Force refresh pdf
*/
-
+// exit;
tep_redirect(tep_href_link(self::FILENAME, 'oID='.$oID.'&action=edit'));
break;
}
@@ -604,6 +617,19 @@
@param $mod string
@return string html
*/
+ public static function GetTitle($type, $mod){
+ if(isset(sqlorder::$modules_type->$type)
+ && isset(sqlorder::$modules_type->$type->modules[$mod])
+ )
+ return sqlorder::$modules_type->$type->modules[$mod]->title;
+ }
+
+ /**
+ @brief View childs module (shipping/ payment)
+ @param $type string
+ @param $mod string
+ @return string html
+ */
public static function ViewMod($type, $mod){
if(isset(sqlorder::$modules_type->$type)
&& isset(sqlorder::$modules_type->$type->modules[$mod])
@@ -634,7 +660,7 @@
$list=array();
$DB=Database::getInstance();
- $orders_history_query = $DB->query("select orders_status_id, date_added, customer_notified, comments, status_color from " . TABLE_ORDERS_STATUS_HISTORY . " oh, ".TABLE_STATUS." WHERE orders_id = '" . tep_db_input($oID) . "' and status_type='orders' AND orders_status_id=status_id ORDER BY date_added");
+ $orders_history_query = $DB->query("select orders_status_id, date_added, customer_notified, comments, status_color from " . TABLE_ORDERS_STATUS_HISTORY . " oh, ".TABLE_STATUS." WHERE orders_id = '" . tep_db_input($oID) . "' and status_type='orders' AND orders_status_id=status_id ORDER BY date_added DESC");
if ($orders_history_query->__get('numRows')) {
while ($orders_history = $orders_history_query->fetchAssoc()) {
self::$update=(DEFAULT_ORDERS_STATUS_COMPLETED== $orders_history['orders_status_id'])? false : true;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-11-20 22:10:32
|
Revision: 3899
http://oscss.svn.sourceforge.net/oscss/?rev=3899&view=rev
Author: oscim
Date: 2011-11-20 22:10:26 +0000 (Sun, 20 Nov 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/catalog/admin/includes/functions/html_output.php
Modified: trunk/catalog/admin/includes/functions/html_output.php
===================================================================
--- trunk/catalog/admin/includes/functions/html_output.php 2011-11-20 22:10:09 UTC (rev 3898)
+++ trunk/catalog/admin/includes/functions/html_output.php 2011-11-20 22:10:26 UTC (rev 3899)
@@ -3,11 +3,10 @@
@licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 06/02/11, 19:57
+ @version 2.1.1
+ @date 20/11/11, 22:53
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
-
*/
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-11-20 22:10:15
|
Revision: 3898
http://oscss.svn.sourceforge.net/oscss/?rev=3898&view=rev
Author: oscim
Date: 2011-11-20 22:10:09 +0000 (Sun, 20 Nov 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/catalog/admin/includes/content/modules.top.inc
Modified: trunk/catalog/admin/includes/content/modules.top.inc
===================================================================
--- trunk/catalog/admin/includes/content/modules.top.inc 2011-11-20 22:09:53 UTC (rev 3897)
+++ trunk/catalog/admin/includes/content/modules.top.inc 2011-11-20 22:10:09 UTC (rev 3898)
@@ -30,9 +30,9 @@
switch ($manager){
case 'process':
$code_inistalletd_array['checkout_process']=array('key'=>'MODULE_CHECKOUT_PROCESS_INSTALLED', 'value'=>MODULE_CHECKOUT_PROCESS_INSTALLED, 'module_directory'=> 'checkout/','key_BO'=>'MODULE_CHECKOUT_PROCESS_INSTALLED_BO', 'value_BO'=>MODULE_CHECKOUT_PROCESS_INSTALLED_BO, 'prefix'=>'Pr');
- $code_inistalletd_array['shipping']=array('key'=>'MODULE_SHIPPING_INSTALLED', 'value'=>MODULE_SHIPPING_INSTALLED, 'module_directory'=>'shipping/', 'prefix'=>'');
+ $code_inistalletd_array['shipping']=array('key'=>'MODULE_SHIPPING_INSTALLED', 'value'=>MODULE_SHIPPING_INSTALLED,'key_BO'=>'MODULE_SHIPPING_INSTALLED_BO', 'value_BO'=>MODULE_SHIPPING_INSTALLED_BO, 'module_directory'=>'shipping/', 'prefix'=>'');
$code_inistalletd_array['payment']=array('key'=>'MODULE_PAYMENT_INSTALLED', 'value'=>MODULE_PAYMENT_INSTALLED, 'key_BO'=>'MODULE_PAYMENT_INSTALLED_BO', 'value_BO'=>MODULE_PAYMENT_INSTALLED_BO,'module_directory'=> 'payment/', 'prefix'=>'');
- $code_inistalletd_array['order_total']=array('key'=>'MODULE_ORDER_TOTAL_INSTALLED', 'value'=>MODULE_ORDER_TOTAL_INSTALLED, 'module_directory'=> 'order_total/', 'prefix'=>'');
+ $code_inistalletd_array['order_total']=array('key'=>'MODULE_ORDER_TOTAL_INSTALLED', 'value'=>MODULE_ORDER_TOTAL_INSTALLED, 'key_BO'=>'MODULE_ORDER_TOTAL_INSTALLED_BO', 'value_BO'=>MODULE_ORDER_TOTAL_INSTALLED_BO, 'module_directory'=> 'order_total/', 'prefix'=>'');
$code_inistalletd_array['orders']=array('key_BO'=>'MODULE_ORDERS_INSTALLED_BO', 'value_BO'=>MODULE_ORDERS_INSTALLED_BO, 'module_directory'=> 'orders/', 'prefix'=>'');
break;
case 'general':
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-11-20 22:09:59
|
Revision: 3897
http://oscss.svn.sourceforge.net/oscss/?rev=3897&view=rev
Author: oscim
Date: 2011-11-20 22:09:53 +0000 (Sun, 20 Nov 2011)
Log Message:
-----------
coquille
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/aca.php
trunk/catalog/admin/includes/classes/drivers/sqlorder.php
trunk/catalog/admin/includes/classes/worldUtility.php
Modified: trunk/catalog/admin/includes/classes/aca.php
===================================================================
--- trunk/catalog/admin/includes/classes/aca.php 2011-11-20 22:09:29 UTC (rev 3896)
+++ trunk/catalog/admin/includes/classes/aca.php 2011-11-20 22:09:53 UTC (rev 3897)
@@ -1,11 +1,10 @@
<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
/**
@licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
- @original_licence Copyright (c) 2006 osCommerce
- @original_author products class for ACA v2 (Advanced Categories Admin) by Rigadin2, www.osc-help.net
+ @portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 04/07/11, 10:14
+ @version 2.1.1
+ @date 20/11/11, 22:53
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@brief base class for aca extension
@@ -160,7 +159,7 @@
$r=array();
foreach ($this->modules as $key=>$module) {
if (method_exists($module, $method )) /// control presence method
- $r[]=$this->modules[$key]->$method($attrs);
+ $r[$key]=$this->modules[$key]->$method($attrs[0]);
}
return $r;
Modified: trunk/catalog/admin/includes/classes/drivers/sqlorder.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlorder.php 2011-11-20 22:09:29 UTC (rev 3896)
+++ trunk/catalog/admin/includes/classes/drivers/sqlorder.php 2011-11-20 22:09:53 UTC (rev 3897)
@@ -31,6 +31,10 @@
@var string error detail
*/
public static $error = false;
+ /**
+ @var array row string for tmp stock comment in process if update
+ */
+ public static $comment;
/**
@brief constructor
@@ -106,39 +110,35 @@
self::getInstance();
+ /**
+ @var (boolean) check error
+ */
$error = false;
+ /**
+ @var (boolean) activate / inactive shipping mod and address
+ */
+ $shipping = false;
if( ! isset($option['id']) )
- self::$error = __('no id');
+ return __('no id');
else
$id = (int)$option['id'];
+ if( ! isset($option['status']) )
+ return __('no status');
+ else
+ $status = (int)$option['status'];
+
if( ! isset($option['post']) )
- self::$error = __('no post');
+ return __('no post');
else
$post = $option['post'];
-
- /// update shipping address
- if(isset($option['delivery'])) {
- $row = new objectInfo($option['delivery']);
-
- $sql_data_array['delivery_name'] = (string)(!empty($row->name)) ? tep_db_prepare_input($row->name) : '' ;
- $sql_data_array['delivery_company'] = (string)(!empty($row->company)) ? tep_db_prepare_input($row->company) : '' ;
- $sql_data_array['delivery_street_address'] = (string)(!empty($row->street_address)) ? tep_db_prepare_input($row->street_address) : '' ;
- $sql_data_array['delivery_suburb'] = (string)(!empty($row->suburb)) ? tep_db_prepare_input($row->suburb) : '' ;
- $sql_data_array['delivery_city'] = (string)(!empty($row->city)) ? tep_db_prepare_input($row->city) : '' ;
- $sql_data_array['delivery_postcode'] = (string)(!empty($row->postcode)) ? tep_db_prepare_input($row->postcode) : '' ;
- $sql_data_array['delivery_state'] = (string)(!empty($row->state)) ? tep_db_prepare_input($row->state) : '' ;
- $sql_data_array['delivery_country'] = (string)(!empty($row->country)) ? worldUtility::get_country_name($row->country) : '' ;
- $sql_data_array['delivery_address_format_id'] = (int)(!empty($row->format_id)) ? tep_db_prepare_input($row->format_id) : worldUtility::GetCountryFormatAddress($row->country) ;
-
- }
-
/// update billing address
if(isset($option['billing'])) {
+
$row = new objectInfo($option['billing']);
$sql_data_array['billing_name'] = (string)(!empty($row->name)) ? tep_db_prepare_input($row->name) : '' ;
@@ -151,29 +151,87 @@
$sql_data_array['billing_country'] = (string)(!empty($row->country)) ? worldUtility::get_country_name($row->country) : '' ;
$sql_data_array['billing_address_format_id'] = (int)(!empty($row->format_id)) ? tep_db_prepare_input($row->format_id) : worldUtility::GetCountryFormatAddress($row->country) ;
+
+ self::$comment[] = __('orders inline comment update billing address');
}
- if(isset($option['mod'])) {
+
+ /// update shipping address
+ if(isset($option['delivery'])) {
+
+ if(!isset($row->activate) || empty($row->activate) )
+ $shipping = false ;
+ else
+ $shipping = true ;
+
+ $row = new objectInfo($option['delivery']);
+ if($shipping){
+ $sql_data_array['delivery_name'] = (string)(!empty($row->name)) ? tep_db_prepare_input($row->name) : '' ;
+ $sql_data_array['delivery_company'] = (string)(!empty($row->company)) ? tep_db_prepare_input($row->company) : '' ;
+ $sql_data_array['delivery_street_address'] = (string)(!empty($row->street_address)) ? tep_db_prepare_input($row->street_address) : '' ;
+ $sql_data_array['delivery_suburb'] = (string)(!empty($row->suburb)) ? tep_db_prepare_input($row->suburb) : '' ;
+ $sql_data_array['delivery_city'] = (string)(!empty($row->city)) ? tep_db_prepare_input($row->city) : '' ;
+ $sql_data_array['delivery_postcode'] = (string)(!empty($row->postcode)) ? tep_db_prepare_input($row->postcode) : '' ;
+ $sql_data_array['delivery_state'] = (string)(!empty($row->state)) ? tep_db_prepare_input($row->state) : '' ;
+ $sql_data_array['delivery_country'] = (string)(!empty($row->country)) ? worldUtility::get_country_name($row->country) : '' ;
+ $sql_data_array['delivery_address_format_id'] = (int)(!empty($row->format_id)) ? tep_db_prepare_input($row->format_id) : worldUtility::GetCountryFormatAddress($row->country) ;
+
+ self::$comment[] = __('orders inline comment update delivery address');
+ }
+ else {
+ // force reset data
+ $sql_data_array['delivery_name'] = (string) '' ;
+ $sql_data_array['delivery_company'] = (string) '' ;
+ $sql_data_array['delivery_street_address'] = (string) '' ;
+ $sql_data_array['delivery_suburb'] = (string) '' ;
+ $sql_data_array['delivery_city'] = (string) '' ;
+ $sql_data_array['delivery_postcode'] = (string)'' ;
+ $sql_data_array['delivery_state'] = (string) '' ;
+ $sql_data_array['delivery_country'] = (string) '' ;
+ $sql_data_array['delivery_address_format_id'] = (int)0 ;
+
+ self::$comment[] = __('orders inline comment delete delivery address');
+ }
+ }
+
+
+
+ if(isset($option['mod']) && is_array($option['mod']) ) {
+
foreach($option['mod'] as $key=>$row)
switch($key){
case 'payment':
$sql_data_array['class_payment'] = (string)$row ;
-// $sql_data_array['payment_method'] = (string)(!empty($row->name)) ? tep_db_prepare_input($row->name) : '' ;
+ $sql_data_array['payment_method'] = (string)( (isset(self::$modules_type->payment->modules[$row]->txt_in_order ))? self::$modules_type->payment->modules[$row]->txt_in_order : self::$modules_type->payment->modules[$row]->title );
/// force check and save module payment selected
self::$modules_type->payment->modules[$row]->load_post_values($post);
self::$modules_type->payment->modules[$row]->after_update($id);
+/**
+ TODO Add in history
+*/
+ self::$comment[] = __('orders inline comment update method payment');
break;
case 'shipping':
- $sql_data_array['class_shipping'] = (string)$row ;
+ if($shipping) {
+ $sql_data_array['class_shipping'] = (string)$row ;
- /// force check and save module payment selected
- self::$modules_type->shipping->modules[$row]->load_post_values($post);
+ /// force check and save module payment selected
+ self::$modules_type->shipping->modules[$row]->load_post_values($post);
- self::$modules_type->shipping->modules[$row]->after_update($id);
+ self::$modules_type->shipping->modules[$row]->after_update($id);
+
+ /**
+ TODO Add in history
+ */
+ self::$comment[] = __('orders inline comment update method delivery');
+ }
+ else
+ $sql_data_array['class_shipping'] = (string)'';
+
break;
}
@@ -184,7 +242,7 @@
$sql_data_array['last_modified'] = 'NOW()';
- $error = tep_db_perform(TABLE_ORDERS, $sql_data_array, 'update', "orders_id = '" . $id . "'");
+ /*$error =*/ tep_db_perform(TABLE_ORDERS, $sql_data_array, 'update', "orders_id = '" . $id . "'");
}
@@ -195,6 +253,8 @@
self::$modules->after_update($id);
+ self::AddOrderHistory($id, $status , 0/*$notif*/, implode("<br />", self::$comment) );
+
// $list_languages=tep_get_languages();
//
// $sql_data_array = $option['sqlarray'];
@@ -568,6 +628,27 @@
return self::CleanKey($par);
}
+
+
+ /**
+ * \fn AddOrderHistory($order)
+ * \brief status history
+ * @param $object object/array
+ * @return $customer_notification bool
+ */
+ public function AddOrderHistory($oID, $status_id , $notif, $comment =''){
+ $sql_data_array = array('orders_id' => (int)$oID ,
+ 'orders_status_id' => (int)$status_id,
+ 'date_added' => 'now()',
+ 'customer_notified' => (int)$notif ,
+ 'comments' => addslashes($comment)
+ );
+
+ return tep_db_perform(TABLE_ORDERS_STATUS_HISTORY , $sql_data_array);
+ }
+
+
+
}
Modified: trunk/catalog/admin/includes/classes/worldUtility.php
===================================================================
--- trunk/catalog/admin/includes/classes/worldUtility.php 2011-11-20 22:09:29 UTC (rev 3896)
+++ trunk/catalog/admin/includes/classes/worldUtility.php 2011-11-20 22:09:53 UTC (rev 3897)
@@ -126,11 +126,11 @@
/**
@brief return id country by local name search
- @param $country_name string local name country
+ @param $country_name string name country
@return int id country
*/
public static function GetCountryIdByName($country_name) {
- $country_query = tep_db_query("select countries_id from " . TABLE_COUNTRIES . " where countries_localname = '" . (string)$country_name . "'");
+ $country_query = tep_db_query("select countries_id from " . TABLE_COUNTRIES . " where countries_name = '" . (string)$country_name . "'");
if (!tep_db_num_rows($country_query)) return $country_name;
else {
$country = tep_db_fetch_array($country_query);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-11-20 22:09:35
|
Revision: 3896
http://oscss.svn.sourceforge.net/oscss/?rev=3896&view=rev
Author: oscim
Date: 2011-11-20 22:09:29 +0000 (Sun, 20 Nov 2011)
Log Message:
-----------
coquille
Modified Paths:
--------------
trunk/catalog/common/classes/seo_url.php
Modified: trunk/catalog/common/classes/seo_url.php
===================================================================
--- trunk/catalog/common/classes/seo_url.php 2011-11-20 22:09:09 UTC (rev 3895)
+++ trunk/catalog/common/classes/seo_url.php 2011-11-20 22:09:29 UTC (rev 3896)
@@ -169,11 +169,9 @@
//ojp FILENAME_LINKS
$seo_pages=array(
FILENAME_DEFAULT,
-// FILENAME_ACCOUNT,
FILENAME_POPUP_IMAGE,
FILENAME_PRODUCT_INFO,
FILENAME_CONTENT,
-// FILENAME_CREATE_ACCOUNT,
FILENAME_ADVANCED_SEARCH,
FILENAME_PRODUCTS_NEW,
FILENAME_SMALL_PRICE,
@@ -475,6 +473,7 @@
$check=array_keys($this->reg_anchors);
+ if(isset($p3))
foreach ($p3 as $key => $value){
$url='';
switch ($key){
@@ -491,133 +490,11 @@
break;
-// switch(true){
-// default:
-// case ( !$this->is_attribute_string($p2[1]) && in_array($page,array(FILENAME_PRODUCT_INFO, FILENAME_DEFAULT) ) ):
-// $url = $this->make_url($page, $this->get_product_name($p2[1]), $p2[0], $p2[1], $separator);
-// $this->ValidateName($url, "p", $p2[1], $connection, $separator);
-// break;
-// default:
-// $container[$p2[0]] = $p2[1];
-// break;
-// }
-// break;
-// case 'cPath':
-// switch(true){
-// case ($page == FILENAME_DEFAULT):
-// default:
-// $url = $this->make_url($page, $this->get_category_name($p2[1]), $p2[0], $p2[1], $separator);
-// $this->ValidateName($url, "c", $p2[1], $connection, $separator);
-// break;
-// }
-// break;
-// case 'manufacturers_id':
-//
-//
-// switch(true){
-// case (/*$page == FILENAME_DEFAULT &&*/ !$this->is_cPath_string($params) && !$this->is_product_string($params) ):
-// $url = $this->make_url($page, $this->get_manufacturer_name($p2[1]), $p2[0], $p2[1], $separator);
-// $this->ValidateName($url, "m", $p2[1], $connection, $separator);
-//
-//
-// break;
-// case ($page == FILENAME_PRODUCT_INFO):
-// break;
-// default:
-// $container[$p2[0]] = $p2[1];
-// break;
-// }
-// break;
-// case 'pID':
-// switch(true){
-// case ($page == FILENAME_POPUP_IMAGE):
-// $url = $this->make_url($page, $this->get_product_name($p2[1]), $p2[0], $p2[1], $separator);
-// $this->ValidateName($url, "pID", $p2[1], $connection, $separator);
-// break;
-// default:
-// $container[$p2[0]] = $p2[1];
-// break;
-// }
-// break;
-// case 'lID':
-// switch(true){
-// default:
-// $url = $this->make_url($page, $this->get_links_name($p2[1]), $p2[0], $p2[1], $separator);
-// $this->ValidateName($url, "lID", $p2[1], $connection, $separator);
-// break;
-// }
-// break;
-// case 'content':
-// switch(true){
-// case ($page == FILENAME_CONTENT):
-// $url = $this->make_url($page, $this->get_topic_name($p2[1]), $p2[0], $p2[1], $separator);
-// $this->ValidateName($url, "t", $p2[1], $connection, $separator);
-// break;
-// default:
-// $container[$p2[0]] = $p2[1];
-// break;
-// }
-// break;
-// case 'divers':
-// switch(true){
-// case ($page == '' || $page ==FILENAME_DEFAULT):
-// $id=AbstractHeader_tags::get_prio_cms('home');
-// //! home by cms
-// if(is_int($id)) {
-// $url = $this->make_url($page, $this->get_topic_name($id), "content", $id, $separator);
-// $this->ValidateName($url, "t", $id, $connection, $separator);
-// }
-// //! home by page content
-// else {
-// $url = $this->make_url('home', $this->get_divers_name('home'), 'divers', 'home', $separator);
-// $this->ValidateName($url, "d", 'home', $connection, $separator);
-// }
-// var_dump($url);
-// break;
-// default:
-// $url = $this->make_url($page, $this->get_divers_name($p2[1]), $p2[0], $p2[1], $separator);
-// $this->ValidateName($url, "d", $p2[1], $connection, $separator);
-// break;
-// }
-// break;
-// case 'customers_id':
-// switch(true){
-// default:
-// $url = $this->make_url($page, $this->get_divers_name($p2[1]), $p2[0], $p2[1], $separator);
-// $this->ValidateName($url, "u", $p2[1], $connection, $separator);
-// break;
-// }
-// break;
-//
-//
-// case 'type_object':
-// switch(true){
-//
-// /**
-// Listing fabricant
-// */
-// case 'manufacturers':
-// default:
-//
-//
-// $url = $this->make_url($page, $this->get_divers_name(substr($page,0,-4)), $p2[0], $p2[1], $separator);
-// $this->ValidateName($url, "d", $p2[1], $connection, $separator);
-// break;
-// }
-// break;
-//
-//
-//
-//
-// case (in_array($key, array('categories_id'))):
-// $this->do_redirect();
-// break
-
default:
-// $key => $value
+
$container[$key] = @$value;
-// var_dump($page,$key);
+
switch(true){
case ($page == '' || $page ==FILENAME_DEFAULT):
$id=AbstractHeader_tags::get_prio_cms('home');
@@ -637,7 +514,7 @@
break;
}
}
-// if($url !='') continue;
+
}
$url = isset($url) ? $url : $page;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2011-11-20 22:09:15
|
Revision: 3895
http://oscss.svn.sourceforge.net/oscss/?rev=3895&view=rev
Author: oscim
Date: 2011-11-20 22:09:09 +0000 (Sun, 20 Nov 2011)
Log Message:
-----------
coquille
Modified Paths:
--------------
trunk/catalog/install/includes/modele/configure.txt
Modified: trunk/catalog/install/includes/modele/configure.txt
===================================================================
--- trunk/catalog/install/includes/modele/configure.txt 2011-11-20 22:08:51 UTC (rev 3894)
+++ trunk/catalog/install/includes/modele/configure.txt 2011-11-20 22:09:09 UTC (rev 3895)
@@ -105,7 +105,7 @@
@var File for register user
Add name for contraint login in table_file_modules.php
*/
- $ContentRegistered=array(
+ $FileRegistered=array(
FILENAME_ACCOUNT,
FILENAME_ADDRESS_BOOK,
FILENAME_ADDRESS_BOOK_PROCESS,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|