Menu
▾
▴
oscss-commit — SVN Commit Notifications
You can subscribe to this list here.
| 2011 |
Jan
|
Feb
|
Mar
(4) |
Apr
(57) |
May
(31) |
Jun
(21) |
Jul
(11) |
Aug
(23) |
Sep
(22) |
Oct
(36) |
Nov
(62) |
Dec
(85) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2012 |
Jan
(24) |
Feb
(24) |
Mar
(65) |
Apr
(232) |
May
(118) |
Jun
(22) |
Jul
(54) |
Aug
(57) |
Sep
(14) |
Oct
(27) |
Nov
(16) |
Dec
(19) |
| 2013 |
Jan
(16) |
Feb
(12) |
Mar
(3) |
Apr
(17) |
May
(2) |
Jun
(30) |
Jul
(33) |
Aug
(19) |
Sep
(35) |
Oct
(58) |
Nov
(27) |
Dec
(64) |
| 2014 |
Jan
(102) |
Feb
(80) |
Mar
(15) |
Apr
(4) |
May
(3) |
Jun
(3) |
Jul
(5) |
Aug
(11) |
Sep
(15) |
Oct
|
Nov
(3) |
Dec
(5) |
| 2015 |
Jan
(5) |
Feb
(4) |
Mar
(2) |
Apr
(11) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(9) |
Nov
(10) |
Dec
|
| 2016 |
Jan
(3) |
Feb
(2) |
Mar
(18) |
Apr
(13) |
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
(4) |
Oct
|
Nov
|
Dec
|
|
From: <os...@us...> - 2012-04-16 19:07:29
|
Revision: 4245
http://oscss.svn.sourceforge.net/oscss/?rev=4245&view=rev
Author: oscim
Date: 2012-04-16 19:07:22 +0000 (Mon, 16 Apr 2012)
Log Message:
-----------
suite amelioration modele datatype du generCode
correction module account
Modified Paths:
--------------
trunk/catalog/common/classes/DataTypes.php
trunk/catalog/includes/modules/account/address_book.php
trunk/dev/GenerCode/class.GenerCode.php
trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE__extra_fields_labels.sql
trunk/dev/GenerCode/datatype/index.php
Added Paths:
-----------
trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE__to_customers.sql
Modified: trunk/catalog/common/classes/DataTypes.php
===================================================================
--- trunk/catalog/common/classes/DataTypes.php 2012-04-16 14:04:02 UTC (rev 4244)
+++ trunk/catalog/common/classes/DataTypes.php 2012-04-16 19:07:22 UTC (rev 4245)
@@ -113,6 +113,8 @@
foreach($alltype as $test){
if(!empty($test)) {
$childclass = self::PREFIX.trim($test) ;
+ if(!class_exists($childclass)) continue;
+
self::$env->modlist[$childclass] = $tp = new $childclass(true);
}
}
Modified: trunk/catalog/includes/modules/account/address_book.php
===================================================================
--- trunk/catalog/includes/modules/account/address_book.php 2012-04-16 14:04:02 UTC (rev 4244)
+++ trunk/catalog/includes/modules/account/address_book.php 2012-04-16 19:07:22 UTC (rev 4245)
@@ -51,7 +51,7 @@
*/
function __construct(){
$this->code =__CLASS__;
- $this->type ='account';
+ $this->type =self::$type;
$this->title = __('module aca address book text title');
$this->description = __('module aca address book text description') ;
$this->sort_order = (defined('MODULE_ACA_ADDRESS_BOOK_SORT_ORDER')) ? MODULE_ACA_ADDRESS_BOOK_SORT_ORDER : 0;
@@ -260,7 +260,7 @@
switch(self::$action){
default:
$v['title']=__("address_book link manage address book");
- $v['href']= tep_href_link(FILENAME_ACCOUNT, 'aca_mod='.$this->code.'&aca_type='.$this->type.'&aca_action=display_view', 'SSL');
+ $v['href']= self::href_link(); //tep_href_link(FILENAME_ACCOUNT, 'aca_mod='.$this->code.'&aca_type='.$this->type.'&aca_action=display_view', 'SSL');
return new objectInfo( array(
'type'=>'menu',
'pile'=>'myaccount',
Modified: trunk/dev/GenerCode/class.GenerCode.php
===================================================================
--- trunk/dev/GenerCode/class.GenerCode.php 2012-04-16 14:04:02 UTC (rev 4244)
+++ trunk/dev/GenerCode/class.GenerCode.php 2012-04-16 19:07:22 UTC (rev 4245)
@@ -39,6 +39,10 @@
+ /**
+ @brief Process replace and constrcut new folder
+ @param $current
+ */
function process($current=''){
if (!empty($current) && substr($current, -1, 1) != '/') $current .= '/';
@@ -46,17 +50,18 @@
$path_mod = $this->modele_path . $current;
foreach($this->browse($path_mod) as $row){
-// if(
-// ( !$this->head_tag || ( $this->head_tag && substr($row,0,11) =='header_tags' ) ) //
-// )
+ // escape if not ok
+ if( ! $this->check_all_right( $row, $current) ){
+var_dump($row);
+ continue;
+ }
+
if(is_dir($path_mod.$row)) {
mkdir( $this->stringreplace($this->folder . $current. $row) );
$this->process($current.$row);
}
else {
-
-
$res=file_get_contents($path_mod.$row);
$file_contents = $this->stringreplace($res);
@@ -68,7 +73,18 @@
}
}
+ /**
+ @brief Control for espace other option or modele complexe
+ @param $row
+ @param $current
+ @return boolean true:ok / false : not ok
+ */
+ function check_all_right($row, $current){
+// var_dump($row,$current);
+ return true;
+ }
+
function stringreplace($string){
// var_dump($string);
return str_replace(
Modified: trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE__extra_fields_labels.sql
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE__extra_fields_labels.sql 2012-04-16 14:04:02 UTC (rev 4244)
+++ trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE__extra_fields_labels.sql 2012-04-16 19:07:22 UTC (rev 4245)
@@ -2,7 +2,7 @@
-- Structure de la table osc__DATATYPE_REPLACE__extra_fields_labels
--
-CREATE TABLE IF NOT EXISTS osc__DATATYPE_REPLACE__extra_fields_labels(
+CREATE TABLE IF NOT EXISTS osc_annuaire_extra_fields_labels(
epf_id int(10) unsigned NOT NULL,
languages_id int(11) NOT NULL,
epf_label varchar(64) DEFAULT NULL,
@@ -10,6 +10,6 @@
epf_format varchar(64) NOT NULL,
epf_unity_type_id int(11) NOT NULL,
epf_unity_id int(11) NOT NULL,
- PRIMARY KEY (epf_id,languages_id)
- KEY IDX_ORDER (epf_order)
-) CHARSET=utf8 ;
+ PRIMARY KEY (epf_id,languages_id),
+) ;
+
Added: trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE__to_customers.sql
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE__to_customers.sql (rev 0)
+++ trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE__to_customers.sql 2012-04-16 19:07:22 UTC (rev 4245)
@@ -0,0 +1,9 @@
+--
+-- Structure de la table osc__DATATYPE_REPLACE__to_customers
+--
+
+CREATE TABLE IF NOT EXISTS osc__DATATYPE_REPLACE__to_customers(
+ _DATATYPE_REPLACE__id int(11) NOT NULL,
+ customers_id int(11) NOT NULL,
+ PRIMARY KEY (_DATATYPE_REPLACE__id,customers_id)
+) CHARSET=utf8 ;
Modified: trunk/dev/GenerCode/datatype/index.php
===================================================================
--- trunk/dev/GenerCode/datatype/index.php 2012-04-16 14:04:02 UTC (rev 4244)
+++ trunk/dev/GenerCode/datatype/index.php 2012-04-16 19:07:22 UTC (rev 4245)
@@ -13,17 +13,43 @@
if(isset($_GET['name']) && !empty($_GET['name'])){
+// print_r($_GET);
+// exit;
class GenerCodeDataType
extends GenerCode{
+
+ /**
+ @var array option link to customers, list all file attached
+ */
+ public $opt_link_to_customers = array(
+ 'ac__DATATYPE_REPLACE_.php',
+ 'ac__DATATYPE_REPLACE_.txt',
+ 'osc__DATATYPE_REPLACE__to_customers.sql',
+ );
+
+ /**
+ @var array option link to header_tag, list all file attached
+ */
+ public $opt_header_tag = array(
+ 'header_tag.php',
+ 'header_tag.txt',
+ );
+
+
+
+
function __construct($conf /*$curent, $name, $seotag, $head_tag=false*/){
/*$curent = */ $conf->curent;
$conf->name = tep_db_prepare_input($_GET['name']);
+ $conf->NAME = strtoupper($conf->name);
+ $conf->Name = ucwords($conf->name);
$conf->seotag = tep_db_prepare_input($_GET['seotag']);
- $conf->head_tag = false;
+ $conf->head_tag = (isset($_GET['head_tag']) && $_GET['head_tag']=='active') ? true : false;
+ $conf->link_to_customers = (isset($_GET['link_to_customers']) && $_GET['link_to_customers']=='active') ? true : false;
$conf->level = 'stable';
$this->modele_path = $conf->modele_path;
@@ -38,11 +64,12 @@
$this->allreplace=array(
$conf->seotag,
- strtoupper($conf->name),
- ucwords($conf->name),
+ $conf->NAME,
+ $conf->Name,
$conf->name
);
+ $this->conf = $conf;
$this->folder = $conf->curent .'/'. strtoupper($conf->name).'_'.$conf->level.'/';
@@ -51,14 +78,49 @@
}
$this->process();
-// }
- echo 'le dossier creer ce situe :' . $this->folder;
+ echo 'le dossier creer ce situe : ' . $this->folder;
}
+ /**
+ @brief Control for espace other option or modele complexe
+ @param $row
+ @param $current
+ @return boolean true:ok / false : not ok
+ */
+ function check_all_right($row, $current){
+
+ // module header_tags
+ if(!$this->conf->head_tag && in_array($row, $this->opt_header_tag) /*$row == 'header_tags.php'*/)
+ return false;
+ elseif( !$this->conf->link_to_customers && in_array($row, $this->opt_link_to_customers) )
+ return false;
+
+
+ return true;
+ }
+
+ /**
+ @brief Control for espace other option or modele complexe
+ @param $row
+ @param $current
+ @return boolean true:ok / false : not ok
+ */
+ function specificprocess($row, $current){
+
+ // module header_tags
+// if(!$this->conf->head_tag && in_array($row, $this->opt_header_tag) /*$row == 'header_tags.php'*/)
+// return false;
+// elseif( !$this->conf->link_to_customers && in_array($row, $this->opt_link_to_customers) )
+// return false;
+//
+
+// return true;
+ }
+
}
@@ -77,8 +139,8 @@
$conf->curent = $current . 'datatype/';
$conf->name = tep_db_prepare_input($_GET['name']);
$conf->seotag = tep_db_prepare_input($_GET['seotag']);
- $conf->head_tag = false;
- $conf->level = 'stable';
+// $conf->head_tag = false;
+// $conf->level = 'stable';
$conf->modele_path = $conf->curent . 'Modele/';
$object = new GenerCodeDataType($conf);
@@ -103,15 +165,19 @@
<td>quick tag for rewrite</label>
<td><?php echo tep_draw_input_field('seotag', 'seotag') ?>(string) quik key </td>
</tr>
+ <tr>
+ <td>Add header_tag module for SEO</label>
+ <td><?php echo tep_draw_checkbox_field('head_tag', 'head_tag', 'active') ?></td>
+ </tr>
+ <tr>
+ <td>Add link data for edit or propose by customers; add module and context </label>
+ <td><?php echo tep_draw_checkbox_field('link_to_customers', 'link_to_customers', 'active') ?></td>
+ </tr>
<!-- <tr>
<td>other rows in master table, respect classique sql commande ; just subline in create </label>
<td><?php echo tep_draw_textarea_field('sql_adjust','', '50', '5', $text = '') ?></td>
</tr>-->
</table>
-<!-- <p>
- <label>add head_tag</label>
- <?php echo tep_draw_checkbox_field('head_tag', 'head_tag', 'active') ?>
- </p>-->
<p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-16 14:04:13
|
Revision: 4244
http://oscss.svn.sourceforge.net/oscss/?rev=4244&view=rev
Author: oscim
Date: 2012-04-16 14:04:02 +0000 (Mon, 16 Apr 2012)
Log Message:
-----------
correction supperssion sytematique des paquets si incoherance install detect?\195?\169
Modified Paths:
--------------
trunk/catalog/admin/includes/exts/package/CIP.php
trunk/catalog/admin/includes/exts/package/tags/filesql.php
Modified: trunk/catalog/admin/includes/exts/package/CIP.php
===================================================================
--- trunk/catalog/admin/includes/exts/package/CIP.php 2012-04-16 11:58:23 UTC (rev 4243)
+++ trunk/catalog/admin/includes/exts/package/CIP.php 2012-04-16 14:04:02 UTC (rev 4244)
@@ -375,11 +375,13 @@
if ($this->is_unpacked()) {
- if(!$this->read_from_xml()) self::InProcess(__("havn't contained well formed XML-file: ").(($this->is_cip_in_zip) ? $this->get_zip_name() : $this->get_cip_name()), __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'block');
+ if(!$this->read_from_xml())
+ self::InProcess(__("havn't contained well formed XML-file: ").(($this->is_cip_in_zip) ? $this->get_zip_name() : $this->get_cip_name()), __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'block');
//! Erreur fatal before process, delete and exit
if(!$this->check_bylevel(1)){
self::InProcess(__("Erreur suite lecture XML file "), __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'block');
+
return false;
// $this->DeleteContribFull();
@@ -479,7 +481,7 @@
*/
function install() {
- fileUtility::_rmdir(DIR_FS_CIP.$this->get_cip_name());
+// fileUtility::_rmdir(DIR_FS_CIP.$this->get_cip_name());
self::$was_unpacked=$this->read_xml();
Modified: trunk/catalog/admin/includes/exts/package/tags/filesql.php
===================================================================
--- trunk/catalog/admin/includes/exts/package/tags/filesql.php 2012-04-16 11:58:23 UTC (rev 4243)
+++ trunk/catalog/admin/includes/exts/package/tags/filesql.php 2012-04-16 14:04:02 UTC (rev 4244)
@@ -102,7 +102,7 @@
}
- $this->DFS = new DataFileSql();
+ $this->DFS = new DataFileSql($path);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-16 11:58:34
|
Revision: 4243
http://oscss.svn.sourceforge.net/oscss/?rev=4243&view=rev
Author: oscim
Date: 2012-04-16 11:58:23 +0000 (Mon, 16 Apr 2012)
Log Message:
-----------
Correction coquille php
Ajout fichier de langue manquant
Modified Paths:
--------------
trunk/catalog/Documents/admin/data/dashboard.xml
trunk/catalog/admin/includes/boxes/01_configuration.php
trunk/catalog/admin/includes/widget/ContentLast.php
Added Paths:
-----------
trunk/catalog/includes/languages/fr_FR/boxes/myaccount.txt
Modified: trunk/catalog/Documents/admin/data/dashboard.xml
===================================================================
--- trunk/catalog/Documents/admin/data/dashboard.xml 2012-04-16 06:43:53 UTC (rev 4242)
+++ trunk/catalog/Documents/admin/data/dashboard.xml 2012-04-16 11:58:23 UTC (rev 4243)
@@ -31,7 +31,6 @@
</left>
<right>
<widget>ImagesLast</widget>
- <widget>CategorieLast</widget>
</right>
</cms>
Modified: trunk/catalog/admin/includes/boxes/01_configuration.php
===================================================================
--- trunk/catalog/admin/includes/boxes/01_configuration.php 2012-04-16 06:43:53 UTC (rev 4242)
+++ trunk/catalog/admin/includes/boxes/01_configuration.php 2012-04-16 11:58:23 UTC (rev 4243)
@@ -35,7 +35,7 @@
// peuple by link page
foreach($_query->fetchAllAssoc() as $row){
- if((int)$row['is_sub_menu'] !=1 && (int)$row['gparentID'] !=0) {
+ if((int)$row['is_sub_menu'] !=1 && (int)$row['gparentID'] !=0 && isset($trace[$row['gparentID']]) ) {
if( (int)$trace[$row['gparentID']] == 0 )
$tabl_link[$row['gparentID']][4][$row['cgID']]= array(
FILENAME_CONFIGURATION.'?gparentID=' . $row['gparentID'].'&gID=' . $row['cgID'],
Modified: trunk/catalog/admin/includes/widget/ContentLast.php
===================================================================
--- trunk/catalog/admin/includes/widget/ContentLast.php 2012-04-16 06:43:53 UTC (rev 4242)
+++ trunk/catalog/admin/includes/widget/ContentLast.php 2012-04-16 11:58:23 UTC (rev 4243)
@@ -69,7 +69,7 @@
<th><?php echo __('ContentLast box date'); ?></th>
<th><?php echo __('ContentLast box status'); ?></th>
</tr>
- <?php foreach($_query->fetchAllAssoc() as $row) : ?>
+ <?php foreach($_query2->fetchAllAssoc() as $row) : ?>
<tr>
<td class="tcenter"><strong><a href="<?php echo tep_href_link(FILENAME_CMS_CONTENT, 'cID='.$row['content_id'].'&action=edit') ?>"><?php echo $row['content_id'] ?></strong></td>
<td style="width:200px;"><?php echo $row['content_title'] ?></td>
Added: trunk/catalog/includes/languages/fr_FR/boxes/myaccount.txt
===================================================================
--- trunk/catalog/includes/languages/fr_FR/boxes/myaccount.txt (rev 0)
+++ trunk/catalog/includes/languages/fr_FR/boxes/myaccount.txt 2012-04-16 11:58:23 UTC (rev 4243)
@@ -0,0 +1,12 @@
+<?php
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 06/04/2012, 15:35
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+$lang['box heading my account']="Espace perso" ;
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-16 06:43:59
|
Revision: 4242
http://oscss.svn.sourceforge.net/oscss/?rev=4242&view=rev
Author: oscim
Date: 2012-04-16 06:43:53 +0000 (Mon, 16 Apr 2012)
Log Message:
-----------
coquille
Modified Paths:
--------------
trunk/catalog/install/includes/content/core.installdb.php
Modified: trunk/catalog/install/includes/content/core.installdb.php
===================================================================
--- trunk/catalog/install/includes/content/core.installdb.php 2012-04-15 21:02:19 UTC (rev 4241)
+++ trunk/catalog/install/includes/content/core.installdb.php 2012-04-16 06:43:53 UTC (rev 4242)
@@ -1,10 +1,10 @@
<?php
/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 24/09/11, 11:10
+ @date 16/04/2012, 11:10
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -14,7 +14,7 @@
public static function GetSort(){
- // sort in process
+ // sort in process
return 50;
}
/**
@@ -43,14 +43,12 @@
}
}
-
+
// add key
if($this->db['DBMOTOR_TYPE'] =='InnoDB')
foreach(core::browse_rep($this->fs_document_root . 'install/includes/sql/'.$driver.'/tables/') as $file){
- 'Documents/'
-
if(strpos($file['file'] , '.key') > 0){
osc_db_upgrade($this->db['DB_DATABASE'], $this->fs_document_root . 'install/includes/sql/'.$driver.'/tables/'.$file['file'] , $this->db['DB_TABLE_PREFIX']);
}
@@ -65,8 +63,8 @@
}
- // copy in document
- parent::recurse_copy($this->fs_document_root . 'install/includes/sql/'.$driver.'/', $this->fs_document_root. 'Documents/admin/origin/db/');
+ // copy in document
+ parent::recurse_copy($this->fs_document_root . 'install/includes/sql/'.$driver.'/', $this->fs_document_root. 'Documents/admin/origin/db/install/');
if ($db_error != false) $this->PileMessage('error', core::l10n("Un problème à eu lieu durant la phase d'installation de la base de données" ) ) ;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-15 21:02:28
|
Revision: 4241
http://oscss.svn.sourceforge.net/oscss/?rev=4241&view=rev
Author: oscim
Date: 2012-04-15 21:02:19 +0000 (Sun, 15 Apr 2012)
Log Message:
-----------
Travail sur la gestion des page myaccount de l'espace public
Retructuration de la page principal , et amelioration de l'integration des modules Aca
Ajsutement template public correspondant
centralisation des gabarit html des modules d'accout dans un sous repertorie par modules
refonte du module de carnet d'adresse dans la gestion des affichages.
Debut report modularisation dans l'espace public des newsletters et toutes notification/abonnment information
Deport en boxes du menu principal de "myaccount"
Modified Paths:
--------------
trunk/catalog/account.php
trunk/catalog/common/class.interfaces.php
trunk/catalog/includes/classes/core_page/account.php
trunk/catalog/includes/languages/fr_FR/account.php
trunk/catalog/includes/languages/fr_FR/modules/account/address_book.txt
trunk/catalog/includes/languages/fr_FR/modules/account/history.txt
trunk/catalog/includes/modules/account/address_book.php
trunk/catalog/includes/modules/account/history.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/account.php
trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css
Added Paths:
-----------
trunk/catalog/includes/boxes/myaccount.php
trunk/catalog/includes/gabarit/address_book/
trunk/catalog/includes/gabarit/address_book/box_view.gab
trunk/catalog/includes/gabarit/box.myaccount.gab
trunk/catalog/includes/gabarit/history/
trunk/catalog/includes/gabarit/history/box_view.gab
Modified: trunk/catalog/account.php
===================================================================
--- trunk/catalog/account.php 2012-04-15 14:30:35 UTC (rev 4240)
+++ trunk/catalog/account.php 2012-04-15 21:02:19 UTC (rev 4241)
@@ -1,12 +1,12 @@
<?php
/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.1
- @date 24/09/11, 22:46
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 15/04/2012, 22:44
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
* \file
* \brief Fichier execution php compte client
*
@@ -103,16 +103,13 @@
}
/* Arrivé via admin */
elseif (isset($_GET['cID']) && is_numeric($_GET['cID'])){
- $cID = tep_db_prepare_input($_GET['cID']);
- $check_customer_query=$DB->query = tep_db_query("select customers_email_address from " . TABLE_CUSTOMERS . " where customers_id = '" . tep_db_input($cID) . "'");
- if ($check_customer_query__get('NumRows')>0) {
- $check_customer = $check_customer_query->fetchAssoc();
- $email_address=$check_customer['customers_email_address'];
- }
+ $cID = tep_db_prepare_input($_GET['cID']);
+ $check_customer_query=$DB->query = tep_db_query("select customers_email_address from " . TABLE_CUSTOMERS . " where customers_id = '" . tep_db_input($cID) . "'");
+ if ($check_customer_query__get('NumRows')>0) {
+ $check_customer = $check_customer_query->fetchAssoc();
+ $email_address=$check_customer['customers_email_address'];
+ }
}
-
-
-
break;
@@ -153,7 +150,7 @@
/// control id command eet id order
if ($customer_info['customers_id'] != $customer_id)
- tep_redirect(tep_href_link(FILENAME_ACCOUNT, 'action=history', 'SSL'));
+ tep_redirect(tep_href_link(FILENAME_ACCOUNT, 'action=history', 'SSL'));
$DF = new DatasFiles;
@@ -161,63 +158,63 @@
/// Generat Pdf
if(_cst_bool('USE_LOCAL_GENERAT_PDF')) {
- $time0 = time();
- require(DIR_WS_CLASSES . 'order.php');
- $order = new order((int)$_GET['order_id']);
+ $time0 = time();
+ require(DIR_WS_CLASSES . 'order.php');
+ $order = new order((int)$_GET['order_id']);
- osCSS_pdf::getInstance();
- $pageloop = "1";
+ osCSS_pdf::getInstance();
+ $pageloop = "1";
- $get_customer_comments = (isset($_POST['show_comments']))? ' and h.orders_status_id = ' . DEFAULT_ORDERS_STATUS_ID : '' ;
- $pull_w_status =(isset($_POST['pull_status']))? " and o.orders_status = ". $_POST['pull_status']:'';
+ $get_customer_comments = (isset($_POST['show_comments']))? ' and h.orders_status_id = ' . DEFAULT_ORDERS_STATUS_ID : '' ;
+ $pull_w_status =(isset($_POST['pull_status']))? " and o.orders_status = ". $_POST['pull_status']:'';
- $orders_query = tep_db_query("select o.orders_id,o.orders_status,h.comments,MIN(h.date_added) from " . TABLE_ORDERS . " o, " . TABLE_ORDERS_STATUS_HISTORY . " h where o.orders_id in (" . tep_db_input($_GET['order_id']) . ") and h.orders_id = o.orders_id" . $pull_w_status . $get_customer_comments . ' group by o.orders_id');
+ $orders_query = tep_db_query("select o.orders_id,o.orders_status,h.comments,MIN(h.date_added) from " . TABLE_ORDERS . " o, " . TABLE_ORDERS_STATUS_HISTORY . " h where o.orders_id in (" . tep_db_input($_GET['order_id']) . ") and h.orders_id = o.orders_id" . $pull_w_status . $get_customer_comments . ' group by o.orders_id');
- if (!tep_db_num_rows($orders_query) > 0) message_handler('FAILED_TO_OPEN');
- $orders = tep_db_fetch_array($orders_query);
+ if (!tep_db_num_rows($orders_query) > 0) message_handler('FAILED_TO_OPEN');
+ $orders = tep_db_fetch_array($orders_query);
- $type=($orders['orders_status']==DEFAULT_ORDERS_STATUS_COMPLETED)?'invoice' : 'packingslip';
+ $type=($orders['orders_status']==DEFAULT_ORDERS_STATUS_COMPLETED)?'invoice' : 'packingslip';
- $pdf=osCSS_pdf::OutputInit($type);
+ $pdf=osCSS_pdf::OutputInit($type);
- $order = new order($_GET['order_id']);
- include(osCSS_pdf::getPathModele());
+ $order = new order($_GET['order_id']);
+ include(osCSS_pdf::getPathModele());
- $time1 = time();
- if ($time1 >= $time0 + 30) {
- $time0 = $time1;
- header('X-bpPing: Pong');
- }
+ $time1 = time();
+ if ($time1 >= $time0 + 30) {
+ $time0 = $time1;
+ header('X-bpPing: Pong');
+ }
- $file=$DF->GetDoc(osCSS_pdf::GetPdfType(),$orders['orders_id']);
+ $file=$DF->GetDoc(osCSS_pdf::GetPdfType(),$orders['orders_id']);
- $pdf=osCSS_pdf::OutputEnd($type);
+ $pdf=osCSS_pdf::OutputEnd($type);
- }
+ }
- /// Load file pdf
- else {
+ /// Load file pdf
+ else {
- $type=($customer_info['orders_status']==DEFAULT_ORDERS_STATUS_COMPLETED)?'invoice' : 'packingslip';
+ $type=($customer_info['orders_status']==DEFAULT_ORDERS_STATUS_COMPLETED)?'invoice' : 'packingslip';
- if(( $filepath=$DF->GetDoc('packingslip', $_GET['order_id'])) && file_exists($filepath)){
+ if(( $filepath=$DF->GetDoc('packingslip', $_GET['order_id'])) && file_exists($filepath)){
- tep_redirect('document.php?mod=packingslip&id='.$_GET['order_id'] );
- }
+ tep_redirect('document.php?mod=packingslip&id='.$_GET['order_id'] );
+ }
- if(( $filepath=$DF->GetDoc('invoices', $_GET['order_id'])) && file_exists($filepath)){
- tep_redirect('document.php?mod=invoice&id='.$_GET['order_id'] );
- }
+ if(( $filepath=$DF->GetDoc('invoices', $_GET['order_id'])) && file_exists($filepath)){
+ tep_redirect('document.php?mod=invoice&id='.$_GET['order_id'] );
+ }
- }
+ }
break;
/**
- * \section execution modukle aca complementaire
+ * \section execution module aca complementaire
*/
case 'aca':
if (!isset($_GET['mod']))
Modified: trunk/catalog/common/class.interfaces.php
===================================================================
--- trunk/catalog/common/class.interfaces.php 2012-04-15 14:30:35 UTC (rev 4240)
+++ trunk/catalog/common/class.interfaces.php 2012-04-15 21:02:19 UTC (rev 4241)
@@ -1,12 +1,12 @@
<?php
/**
- @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.1
- @date 01/01/2012, 18:17
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 15/04/2012, 22:44
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
*/
@@ -84,10 +84,11 @@
/**
@interface InterfaceAccount
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
- Interface class support module aca account
+ @brief Interface class support module aca account, complement classic interface
+ @note use in Frontend
*/
Interface InterfaceAccount {
- public function display_view_min_listMyAccount();
+// public function display_view_min_listMyAccount();
}
/**
Added: trunk/catalog/includes/boxes/myaccount.php
===================================================================
--- trunk/catalog/includes/boxes/myaccount.php (rev 0)
+++ trunk/catalog/includes/boxes/myaccount.php 2012-04-15 21:02:19 UTC (rev 4241)
@@ -0,0 +1,18 @@
+<?php
+/**
+ *\licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ *\portion code Copyright (c) 2002 osCommerce
+ *\package osCSS-2 <www http://www.oscss.org>
+ *\version 2.1.1
+ *\date 15/04/2012, 22:44
+ *\author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ *\encode UTF-8
+ *\group boxes
+
+*/
+
+
+
+ $array= array('title'=>__('box heading my account'),'content'=>tep_output_string_protected(tep_get_include_contents('box.myaccount'),false,true));
+
+?>
\ No newline at end of file
Modified: trunk/catalog/includes/classes/core_page/account.php
===================================================================
--- trunk/catalog/includes/classes/core_page/account.php 2012-04-15 14:30:35 UTC (rev 4240)
+++ trunk/catalog/includes/classes/core_page/account.php 2012-04-15 21:02:19 UTC (rev 4241)
@@ -1,12 +1,12 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 05/11/10, 11:24
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 15/04/2012, 22:44
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
*/
/**
@@ -50,7 +50,7 @@
$list_mod[$class] = $cl[$class]->sort_order;
asort($list_mod);
foreach($list_mod as $class=>$s){
- $this->modules[$class] =$cl[$class];
+ $this->modules[$class] =$cl[$class];
}
unset($cl);unset($list_mod);
}
Added: trunk/catalog/includes/gabarit/address_book/box_view.gab
===================================================================
--- trunk/catalog/includes/gabarit/address_book/box_view.gab (rev 0)
+++ trunk/catalog/includes/gabarit/address_book/box_view.gab 2012-04-15 21:02:19 UTC (rev 4241)
@@ -0,0 +1,40 @@
+<?php
+/**
+ *\licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ *\portion code Copyright (c) 2002 osCommerce
+ *\package osCSS-2 <www http://www.oscss.org>
+ *\version 2.1.0
+ *\date 28/11/10, 22:44
+ *\author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ *\encode UTF-8
+ *\dir includes/gabarit/
+ *\file
+ *\brief display module address_book list address,
+ *
+ * template html for function display_view in class address_book
+*/
+global $language,$customer_id;
+
+ $orders_query = tep_db_query("select o.orders_id,o.orders_prefix, o.date_purchased, o.delivery_name, o.delivery_country, o.billing_name, o.billing_country, ot.text as order_total, s.status_name as orders_status_name from " . TABLE_ORDERS . " o, " . TABLE_ORDERS_TOTAL . " ot, " . TABLE_STATUS . " s where o.customers_id = '" . (int)$customer_id . "' and o.orders_id = ot.orders_id and ot.class = 'ot_total' and o.orders_status = s.status_id and s.language_id = '" . (int)$languages_id . "' AND status_type='orders' ORDER BY orders_id desc limit 1");
+?>
+
+
+ <div class="contentBox myOrders">
+ <h3><?php echo MY_ORDERS_TITLE; ?></h3>
+
+ <?php while ($orders = tep_db_fetch_array($orders_query)) {
+ if (tep_count_customer_orders() > 0) { ?>
+ <div class="contentBox overview">
+ <h4><?php echo OVERVIEW_PREVIOUS_ORDERS ; ?></h4>
+ <ul>
+ <li><?php echo '#' . $orders['orders_prefix'].$orders['orders_id']; ?> <?php echo tep_date_short($orders['date_purchased']); ?> <?php echo $orders['order_total']; ?> <?php echo '<a class="navBtMini" href="' . tep_href_link(FILENAME_ACCOUNT, 'action=history_info&order_id=' . $orders['orders_id'], 'SSL') . '">' . SMALL_IMAGE_BUTTON_VIEW . '</a>'; ?></li>
+ <li><?php echo $orders['orders_status_name']; ?></li>
+ <li><?php if (tep_not_null($orders['delivery_name'])) echo tep_output_string_protected($orders['delivery_name']) . ', ' . $orders['delivery_country'];
+ else echo tep_output_string_protected($orders['billing_name']) . ', ' . $orders['billing_country']; ?></li>
+ </ul>
+ <?php } ?>
+ </div>
+ <?php } ?>
+
+
+ </div>
\ No newline at end of file
Added: trunk/catalog/includes/gabarit/box.myaccount.gab
===================================================================
--- trunk/catalog/includes/gabarit/box.myaccount.gab (rev 0)
+++ trunk/catalog/includes/gabarit/box.myaccount.gab 2012-04-15 21:02:19 UTC (rev 4241)
@@ -0,0 +1,53 @@
+<?php
+/**
+ *\licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ *\portion code Copyright (c) 2002 osCommerce
+ *\package osCSS-2 <www http://www.oscss.org>
+ *\version 2.1.1
+ *\date 15/04/2012, 22:44
+ *\author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ *\encode UTF-8
+ *
+ * template html for function display_view in class address_book
+*/
+global $language,$customer_id,$account;
+
+ $ModuleAccount = account::getInstance();
+ $module=$page->_call('account','ret_modules');
+
+?>
+ <h3><?php echo MY_ACCOUNT_TITLE; ?></h3>
+ <ul>
+ <li><?php echo '<a href="' . tep_href_link(FILENAME_ACCOUNT, 'action=edit', 'SSL') . '">' . MY_ACCOUNT_INFORMATION . '</a>'; ?></li>
+ <li><?php echo '<a href="' . tep_href_link(FILENAME_ACCOUNT, 'action=password', 'SSL') . '">' . MY_ACCOUNT_PASSWORD . '</a>'; ?></li>
+ <li><?php echo '<a href="' . tep_href_link(FILENAME_ACCOUNT, 'action=newsletters', 'SSL') . '">' . EMAIL_NOTIFICATIONS_NEWSLETTERS . '</a>'; ?></li>
+ <?php foreach($ModuleAccount->CstrMenu() as $k=>$aca_mod) : ?>
+ <!-- dynamic myaccount menu -->
+ <?php if($aca_mod->pile =='myaccount') : ?>
+ <?php foreach($aca_mod->conteneur as $row) : /*print_r($row); */ ?>
+ <li>
+ <a href="<?php echo $row->href; ?>"><?php echo unhtmlentities($row->title); ?></a>
+ </li>
+ <?php endforeach; ?>
+ <?php endif; ?>
+ <?php endforeach; ?>
+ <li><?php echo '<a href="' . tep_href_link(FILENAME_LOGOFF, '', 'NONSSL') . '">' .TEXT_LOGOFF . '</a>'; ?></li>
+ </ul>
+
+ <?php if($account['customers_newsletter'] > 0 || $account['global_product_notifications'] > 0 ) : ?>
+<!-- dynamic notification menu -->
+ <div class="contentBox myEmail">
+ <h3><?php echo EMAIL_NOTIFICATIONS_TITLE; ?></h3>
+ <ul>
+ <?php foreach($ModuleAccount->CstrMenu() as $k=>$aca_mod) : ?>
+ <?php if($aca_mod->pile =='notification') : ?>
+ <?php foreach($aca_mod->conteneur as $row) : print_r($row); ?>
+ <li>
+ <a href="<?php echo $row->href; ?>"><?php echo unhtmlentities($row->title); ?></a>
+ </li>
+ <?php endforeach; ?>
+ <?php endif; ?>
+ <?php endforeach; ?>
+ </ul>
+ </div>
+ <?php endif; ?>
\ No newline at end of file
Added: trunk/catalog/includes/gabarit/history/box_view.gab
===================================================================
--- trunk/catalog/includes/gabarit/history/box_view.gab (rev 0)
+++ trunk/catalog/includes/gabarit/history/box_view.gab 2012-04-15 21:02:19 UTC (rev 4241)
@@ -0,0 +1,29 @@
+<?php
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 15/04/2012, 22:44
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ *\dir includes/gabarit/
+ *\file
+*/
+global $language,$customer_id;
+
+?>
+
+
+<div class="contentBox myOrders">
+
+ <div class="contentBox overview">
+ <h4><?php echo OVERVIEW_PREVIOUS_ORDERS ; ?></h4>
+ <ul>
+ <li><?php echo '#' . history::$current['orders_prefix'].history::$current['orders_id']; ?> <?php echo tep_date_short(history::$current['date_purchased']); ?> <?php echo history::$current['order_total']; ?> <?php echo '<a class="navBtMini" href="' . tep_href_link(FILENAME_ACCOUNT, 'action=history_info&order_id=' . history::$current['orders_id'], 'SSL') . '">' . SMALL_IMAGE_BUTTON_VIEW . '</a>'; ?></li>
+ <li><?php echo history::$current['orders_status_name']; ?></li>
+ <li><?php if (tep_not_null(history::$current['delivery_name'])) echo tep_output_string_protected(history::$current['delivery_name']) . ', ' . history::$current['delivery_country'];
+ else echo tep_output_string_protected(history::$current['billing_name']) . ', ' . history::$current['billing_country']; ?></li>
+ </ul>
+ </div>
+</div>
\ No newline at end of file
Modified: trunk/catalog/includes/languages/fr_FR/account.php
===================================================================
--- trunk/catalog/includes/languages/fr_FR/account.php 2012-04-15 14:30:35 UTC (rev 4240)
+++ trunk/catalog/includes/languages/fr_FR/account.php 2012-04-15 21:02:19 UTC (rev 4241)
@@ -1,11 +1,12 @@
<?php
/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.1
- @date 01/11/11, 21:42
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 15/04/2012, 22:44
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
*/
define('NAVBAR_TITLE',"Mon compte" );
define('NAVBAR_TITLE_2',"Éditer le compte" );
@@ -26,12 +27,12 @@
define('OVERVIEW_SHOW_ALL_ORDERS',"Afficher toutes mes commandes" );
define('OVERVIEW_PREVIOUS_ORDERS',"Commandes précédentes" );
define('MY_ACCOUNT_TITLE',"Mon compte" );
-define('MY_ACCOUNT_INFORMATION',"Afficher ou modifier les informations de mon compte." );
-define('MY_ACCOUNT_PASSWORD',"Modifier le mot de passe de mon compte." );
+define('MY_ACCOUNT_INFORMATION',"modifier mon compte" );
+define('MY_ACCOUNT_PASSWORD',"Mot de passe" );
define('MY_ORDERS_TITLE',"Mes commandes" );
define('MY_ORDERS_VIEW',"Afficher les commandes que j'ai effectué." );
-define('EMAIL_NOTIFICATIONS_TITLE',"Notifications par e-mail" );
-define('EMAIL_NOTIFICATIONS_NEWSLETTERS',"S'abonner ou se désabonner des bulletins d'information." );
+define('EMAIL_NOTIFICATIONS_TITLE',"Notifications" );
+define('EMAIL_NOTIFICATIONS_NEWSLETTERS',"S'abonner" );
define('EMAIL_NOTIFICATIONS_PRODUCTS',"Afficher ou modifier ma liste de notification de produit." );
define('SUCCESS_ACCOUNT_UPDATED',"Mise à jour effectuée" );
define('CATEGORY_EXTRA_FIELDS',"Champs complémentaires" );
Modified: trunk/catalog/includes/languages/fr_FR/modules/account/address_book.txt
===================================================================
--- trunk/catalog/includes/languages/fr_FR/modules/account/address_book.txt 2012-04-15 14:30:35 UTC (rev 4240)
+++ trunk/catalog/includes/languages/fr_FR/modules/account/address_book.txt 2012-04-15 21:02:19 UTC (rev 4241)
@@ -1,15 +1,19 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.0.9
- @date 03/06/10, 17:52
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 15/04/2012, 22:44
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
*/
$lang['module aca address book text title']="Gestion des adresses" ;
$lang['module aca address book text description']="Gèrer la liaison entre carnet d'adresse et client/membre" ;
+
+$lang['address_book link manage address book']="Adresse(s)" ;
+
$lang['TAB_CUSTOMERS_ADDRESS_BOOK']="Adresse" ;
$lang['NAVBAR_TITLE_2']="Carnet d'adresses" ;
$lang['TEXT_MAXIMUM_ENTRIES']="<strong class=\"notice\">REMARQUE :</strong> Un maximum de %s entrées dans le carnet d'adresses est autorisé." ;
Modified: trunk/catalog/includes/languages/fr_FR/modules/account/history.txt
===================================================================
--- trunk/catalog/includes/languages/fr_FR/modules/account/history.txt 2012-04-15 14:30:35 UTC (rev 4240)
+++ trunk/catalog/includes/languages/fr_FR/modules/account/history.txt 2012-04-15 21:02:19 UTC (rev 4241)
@@ -1,16 +1,18 @@
<?php
/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.1
- @date 01/11/11, 21:42
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 15/04/2012, 22:44
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
*/
-$lang['history tab']="Voir mes anciennes commandes" ;
+// $lang['history tab']="Voir mes anciennes commandes" ;
+$lang['history widget view']="Toutes mes commandes" ;
+
$lang['history heading listing']="Historique des Commandes" ;
$lang['history text order number']="Numéro de commande : " ;
$lang['history text order status']="Statut de la commande : " ;
Modified: trunk/catalog/includes/modules/account/address_book.php
===================================================================
--- trunk/catalog/includes/modules/account/address_book.php 2012-04-15 14:30:35 UTC (rev 4240)
+++ trunk/catalog/includes/modules/account/address_book.php 2012-04-15 21:02:19 UTC (rev 4241)
@@ -1,12 +1,12 @@
<?php
/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 22/01/11, 20:24
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 15/04/2012, 22:44
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
*\dir includes/modules/account/
*\file
*\class address_book
@@ -15,8 +15,12 @@
*/
class address_book
- extends AbstractAccount
- implements InterfaceModule{
+ extends
+ AbstractAccount
+ implements
+ InterfaceModule
+ ,InterfaceAccount
+ {
/**
@var array
@@ -34,6 +38,14 @@
@var string
*/
public static $display_view_form_title;
+ /**
+ @var string action
+ */
+ public static $action ='';
+ /**
+ @var string
+ */
+ public static $type ='account';
/**
*/
@@ -59,6 +71,15 @@
/// call js view last time
$file=DIR_WS_INCLUDES.'js/'.__CLASS__.'.js.php';
if( ($file=page::fix_file($file)) && $file !=false ) $page->javascript->add_script($file, array('sort'=>30));
+
+ if(isset($_GET['action']))
+ self::$action = tep_db_prepare_input($_GET['action']);
+// elseif(isset($_GET['aca_action']))
+// self::$action = tep_db_prepare_input($_GET['aca_action']);
+
+
+
+ // define all menu
}
public function get_header($action=''){}
@@ -70,38 +91,39 @@
* @p $cID int recupere le Session[]
*/
public function check_action($action) {
-
+// var_dump($action);
+ if(tep_not_null($action)) self::$action = $action;
// if ($action != 'process') return false;
if (!tep_session_is_registered('customer_id')) return false;
global $page;
$customer_id=$page->the_var('customer_id');
- switch ($action) {
+ switch (self::$action) {
case 'update':
case 'new':
- /**
- @brief use class customer class
- */
- $custo=customer::getInstance();
- /// force retour error sans session
- customer::definePostMess(0);
+ /**
+ @brief use class customer class
+ */
+ $custo=customer::getInstance();
+ /// force retour error sans session
+ customer::definePostMess(0);
- if ( ($resul=$custo->CheckDataAddressBook($_POST, 'addressbook')) && $resul !=false && is_array($resul)) {
+ if ( ($resul=$custo->CheckDataAddressBook($_POST, 'addressbook')) && $resul !=false && is_array($resul)) {
- if (_cst_bool('CUSTOMER_FORCE_UCWORDS')) {
- $resul['lastname']=ucwords($resul['lastname']);
- $resul['firstname']=ucwords($resul['firstname']);
- }
- if (_cst_bool('CUSTOMER_FORCE_STRTOUPPER')) {
- $resul['lastname']=strtoupper($resul['lastname']);
- }
+ if (_cst_bool('CUSTOMER_FORCE_UCWORDS')) {
+ $resul['lastname']=ucwords($resul['lastname']);
+ $resul['firstname']=ucwords($resul['firstname']);
+ }
+ if (_cst_bool('CUSTOMER_FORCE_STRTOUPPER')) {
+ $resul['lastname']=strtoupper($resul['lastname']);
+ }
- if (_cst_bool('CUSTOMER_CITY_FORCE_STRTOUPPER')) {
- $resul['city']=strtoupper($resul['city']);
- }
+ if (_cst_bool('CUSTOMER_CITY_FORCE_STRTOUPPER')) {
+ $resul['city']=strtoupper($resul['city']);
+ }
$sql_data_array = array('entry_firstname' => $resul['firstname'],
'entry_lastname' => $resul['lastname'],
@@ -221,14 +243,56 @@
/**
List des element du block my account
*/
- public function display_view_min_listMyAccount($cID){
- global $page;
+// public function display_view_min_listMyAccount($cID){
+// global $page;
+// }
- $v['title']=__("Afficher ou modifier des entrées dans mon carnet d'adresses.");
- $v['href_link']= tep_href_link(FILENAME_ACCOUNT, 'aca_mod='.$this->code.'&aca_type='.$this->type.'&aca_action=display_view', 'SSL');
- return array(new objectInfo($v));
+ /**
+ @fn CstrMenu()
+ @brief Prepare menu
+ */
+ public function CstrMenu(){
+ global $page;
+ $customer_id=$page->the_var('customer_id');
+// $this->load_db_values($customer_id);
+
+
+ switch(self::$action){
+ default:
+ $v['title']=__("address_book link manage address book");
+ $v['href']= tep_href_link(FILENAME_ACCOUNT, 'aca_mod='.$this->code.'&aca_type='.$this->type.'&aca_action=display_view', 'SSL');
+ return new objectInfo( array(
+ 'type'=>'menu',
+ 'pile'=>'myaccount',
+ 'conteneur'=>array(new objectInfo($v))
+ ));
+ }
}
+ /**
+ @brief internal link
+ @param classic action
+ @param other paams by strign GET format
+ @return href
+ */
+ static function href_link($action='', $params=''){
+ $base = 'aca_mod='.__CLASS__.'&aca_type='.self::$type.'&aca_action=';
+ switch ($action) {
+ case 'delete':
+ case 'edit':
+ $base .='display_view&action=ab_'.$action.'&'.$params;
+ break;
+ case 'page':
+ $base .='display_view';
+ break;
+ default:
+ $base .='display_view'. ((!empty($action))?'&action=ab_'.$action : '');
+ }
+
+
+ return tep_href_link(FILENAME_ACCOUNT, $base, 'SSL');
+ }
+
/**
* \fn display_view($pID='')
* \brief Affiche Block edit/modif reviews
@@ -239,52 +303,66 @@
global $page;
$customer_id=$page->the_var('customer_id');
$this->load_db_values($customer_id);
- self::$account = $page->_call('customer','the_customer');
- self::$adress_book=$this->cInfo->adress_book;
- self::$count=$this->cInfo->the_count;
- return new objectInfo(array('title'=>__("Carnet d'adresses personnel"),'content'=> tep_output_string_protected(tep_get_include_contents(__CLASS__.'.'.__FUNCTION__),false,true) ) );
- }
+ switch(self::$action){
+ case 'ab_delete':
+ global $page,$language, $navigation,$entry;
+ $customer_id=$page->the_var('customer_id');
+ $this->load_db_values($customer_id);
+ self::$account = $page->_call('customer','the_customer');
- /**
- * \brief select function for display
- */
- public function display_view_form(){
- global $page,$language, $navigation,$entry;
+ self::$display_view_form_title=__('HEADING_TITLE_DELETE_ENTRY');
- $customer_id=$page->the_var('customer_id');
- $this->load_db_values($customer_id);
- self::$account = $page->_call('customer','the_customer');
+ if (isset($_GET['id'])) $entry=(!isset($_POST['firstname']))? $this->cInfo->adress_book[$_GET['id']] : $_POST;
+ elseif(isset($_POST['firstname']))$entry= $_POST;
- if (isset($_GET['edit'])) $entry=(!isset($_POST['firstname']))? $this->cInfo->adress_book[$_GET['edit']] : $_POST;
- elseif(isset($_POST['firstname']))$entry= $_POST;
+ return new objectInfo(array('title'=>self::$display_view_form_title,'content'=>tep_output_string_protected(tep_get_include_contents(__CLASS__.'/'.__FUNCTION__.'.delete'),false,true))) ;
+ break;
- if (isset($_GET['delete'])) $s= self::form_delete();
- else $s= self::form_edit();
+ case 'ab_add':
+ case 'ab_edit':
+ global $page,$language, $navigation,$entry;
- return new objectInfo(array('title'=>self::$display_view_form_title,'content'=>tep_output_string_protected($s,false,true))) ;
- }
+ $customer_id=$page->the_var('customer_id');
+ $this->load_db_values($customer_id);
+ self::$account = $page->_call('customer','the_customer');
- /**
- * \brief Form delete entry address book
- */
- private static function form_delete(){
- self::$display_view_form_title=__('HEADING_TITLE_DELETE_ENTRY');
- return tep_get_include_contents(__CLASS__.'.'.__FUNCTION__);
- }
+ if (isset($_GET['id'])) self::$display_view_form_title=__('HEADING_TITLE_MODIFY_ENTRY');
+ else self::$display_view_form_title=__('HEADING_TITLE_ADD_ENTRY');
+ if (isset($_GET['id'])) $entry=(!isset($_POST['firstname']))? $this->cInfo->adress_book[$_GET['id']] : $_POST;
+ elseif(isset($_POST['firstname']))$entry= $_POST;
- /**
- * \brief Form add/edit entry address book
- */
- private static function form_edit(){
- if (isset($_GET['edit'])) self::$display_view_form_title=__('HEADING_TITLE_MODIFY_ENTRY');
- else self::$display_view_form_title=__('HEADING_TITLE_ADD_ENTRY');
+ return new objectInfo(array('title'=>self::$display_view_form_title,'content'=>tep_output_string_protected(tep_get_include_contents(__CLASS__.'/'.__FUNCTION__.'.edit'),false,true))) ;
+ break;
- return tep_get_include_contents(__CLASS__.'.'.__FUNCTION__);
+ default:
+ if(isset($_GET['aca_action'])){
+ self::$account = $page->_call('customer','the_customer');
+ self::$adress_book=$this->cInfo->adress_book;
+ self::$count=$this->cInfo->the_count;
+
+ $v['title']=__("Carnet d'adresses personnel");
+ $v['content']=tep_output_string_protected(tep_get_include_contents(__CLASS__.'/'.__FUNCTION__.'.page'),false,true);
+ return new objectInfo( $v );
+ }
+ else {
+ // my account home page
+// $v['title']=__("address_book widget view");
+// $v['content']=tep_output_string_protected(tep_get_include_contents(__CLASS__.'/box_view'),false,true);
+// return array(
+// 'type'=>'page',
+// // 'menu'=>'myaccount',
+// 'conteneur'=>array(new objectInfo( $v ))
+// );
+ }
+ }
}
+
+
+
/** implements InterfaceModule depend */
public function check() {}
public function install() {}
Modified: trunk/catalog/includes/modules/account/history.php
===================================================================
--- trunk/catalog/includes/modules/account/history.php 2012-04-15 14:30:35 UTC (rev 4240)
+++ trunk/catalog/includes/modules/account/history.php 2012-04-15 21:02:19 UTC (rev 4241)
@@ -1,20 +1,24 @@
<?php
/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.1
- @date 16/12/11, 21:42
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 15/04/2012, 22:44
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
*\class history
*\group modules
*\brief Address book for customers
*/
class history
- extends AbstractAccount
- implements InterfaceModule{
+ extends
+ AbstractAccount
+ implements
+ InterfaceModule
+ ,InterfaceAccount
+ {
/**
@var array
@@ -24,8 +28,14 @@
@var array
*/
public static $history_split;
+ /**
+ @var string action
+ */
+ public static $action ='';
+
/**
+ @brief constructor
*/
function __construct(){
$this->code =__CLASS__;
@@ -39,6 +49,13 @@
$this->sql_data_array=array();
$this->cInfo = new objectInfo(array());
+ // adjust action
+ if(isset($_GET['action']))
+ self::$action = tep_db_prepare_input($_GET['action']);
+ elseif(isset($_GET['aca_action']))
+ self::$action = tep_db_prepare_input($_GET['aca_action']);
+
+
}
public function get_header($action=''){}
@@ -64,6 +81,9 @@
}
/**
+ @fn after_check_action ($action)
+ @brief call after check_action incurrent module
+ @return none
*/
public function after_check_action ($action) {
if($action=='new') tep_redirect(tep_href_link(FILENAME_ACCOUNT, 'aca_mod='.$this->code.'&aca_type='.$this->type.'&aca_action=display_view', 'SSL'));
@@ -78,49 +98,60 @@
$DB=Database::getInstance();
- $sql="SELECT o.orders_id,o.orders_prefix, o.date_purchased, o.delivery_name, o.billing_name, ot.text as order_total,o.orders_status, s.status_name as orders_status_name from " . TABLE_ORDERS . " o, " . TABLE_ORDERS_TOTAL . " ot, " . TABLE_STATUS . " s WHERE o.customers_id = '" . (int)$cID . "' AND o.orders_id = ot.orders_id and ot.class = 'ot_total' and o.orders_status = s.status_id AND status_type='orders' AND s.language_id = '" . (int)$languages_id . "' ORDER BY orders_id DESC";
+ switch(self::$action){
+ case 'display_view':
- self::$history_split = new splitPageResults($sql, MAX_DISPLAY_ORDER_HISTORY);
- $_query = $DB->query(self::$history_split->sql_query);
+ $sql="SELECT o.orders_id,o.orders_prefix, o.date_purchased, o.delivery_name, o.billing_name, ot.text as order_total,o.orders_status, s.status_name as orders_status_name from " . TABLE_ORDERS . " o, " . TABLE_ORDERS_TOTAL . " ot, " . TABLE_STATUS . " s WHERE o.customers_id = '" . (int)$cID . "' AND o.orders_id = ot.orders_id and ot.class = 'ot_total' and o.orders_status = s.status_id AND status_type='orders' AND s.language_id = '" . (int)$languages_id . "' ORDER BY orders_id DESC";
- foreach($_query->fetchAllAssoc() as $row){
+ self::$history_split = new splitPageResults($sql, MAX_DISPLAY_ORDER_HISTORY);
+ $_query = $DB->query(self::$history_split->sql_query);
- $products_query = tep_db_query("select count(*) as count from " . TABLE_ORDERS_PRODUCTS . " where orders_id = '" . (int)$row['orders_id'] . "'");
- $products = tep_db_fetch_array($products_query);
+ foreach($_query->fetchAllAssoc() as $row){
- if (tep_not_null($row['delivery_name'])) {
- $order_type = TEXT_ORDER_SHIPPED_TO;
- $order_name = $row['delivery_name'];
- } else {
- $order_type = TEXT_ORDER_BILLED_TO;
- $order_name = $row['billing_name'];
- }
+ $products_query = tep_db_query("select count(*) as count from " . TABLE_ORDERS_PRODUCTS . " where orders_id = '" . (int)$row['orders_id'] . "'");
+ $products = tep_db_fetch_array($products_query);
+ if (tep_not_null($row['delivery_name'])) {
+ $order_type = TEXT_ORDER_SHIPPED_TO;
+ $order_name = $row['delivery_name'];
+ } else {
+ $order_type = TEXT_ORDER_BILLED_TO;
+ $order_name = $row['billing_name'];
+ }
- $n = new objectInfo($row);
- $n->date_purchased = tep_date_short($row['date_purchased']);
- $n->type = 'order';
- $n->count_products = $products['count'];
- $n->destinataire = $order_type.' '.$order_name;
-// $n->linkView = tep_href_link(FILENAME_ACCOUNT, 'aca_mod='.$this->code.'&aca_type='.$this->type.'&aca_action=display_info&oID='. (int)$row['orders_id'], 'SSL');
- $n->linkView = tep_href_link(FILENAME_ACCOUNT, 'action=history_info&order_id=' . (int)$row['orders_id'], 'SSL');
- /**
- @remarks Adjust link pdf if Exist. Use config process
- Link exist if file pdf exists.
- */
- $datadocs=new DatasFiles;
- if(( $filepath=$datadocs->GetDoc('packingslip',(int)$row['orders_id'])) && file_exists($filepath))
- $n->linkPdf = tep_href_link(FILENAME_ACCOUNT, 'action=pdf&order_id=' . (int)$row['orders_id'], 'SSL');
- else
- $n->linkPdf = false ;
+ $n = new objectInfo($row);
+ $n->date_purchased = tep_date_short($row['date_purchased']);
+ $n->type = 'order';
+ $n->count_products = $products['count'];
+ $n->destinataire = $order_type.' '.$order_name;
+ // $n->linkView = tep_href_link(FILENAME_ACCOUNT, 'aca_mod='.$this->code.'&aca_type='.$this->type.'&aca_action=display_info&oID='. (int)$row['orders_id'], 'SSL');
+ $n->linkView = tep_href_link(FILENAME_ACCOUNT, 'action=history_info&order_id=' . (int)$row['orders_id'], 'SSL');
- $result[strtotime($row['date_purchased'])]=$n;
- }
+ /**
+ @remarks Adjust link pdf if Exist. Use config process
+ Link exist if file pdf exists.
+ */
+ $datadocs=new DatasFiles;
+ if(( $filepath=$datadocs->GetDoc('packingslip',(int)$row['orders_id'])) && file_exists($filepath))
+ $n->linkPdf = tep_href_link(FILENAME_ACCOUNT, 'action=pdf&order_id=' . (int)$row['orders_id'], 'SSL');
+ else
+ $n->linkPdf = false ;
+ $result[strtotime($row['date_purchased'])]=$n;
+ }
- krsort($result);
+ krsort($result);
+ break;
+
+ default:
+
+ $orders_query = tep_db_query("select o.orders_id,o.orders_prefix, o.date_purchased, o.delivery_name, o.delivery_country, o.billing_name, o.billing_country, ot.text as order_total, s.status_name as orders_status_name from " . TABLE_ORDERS . " o, " . TABLE_ORDERS_TOTAL . " ot, " . TABLE_STATUS . " s where o.customers_id = '" . (int)$cID . "' and o.orders_id = ot.orders_id and ot.class = 'ot_total' and o.orders_status = s.status_id and s.language_id = '" . (int)$languages_id . "' AND status_type='orders' ORDER BY orders_id desc limit 1");
+
+ $result = $orders_query->fetchAssoc();
+ }
+
return ($result);
}
@@ -130,14 +161,14 @@
/**
List des element du block my account
*/
- public function display_view_min_listMyOrders($cID){
- global $page;
+// public function display_view_min_listMyOrders($cID){
+// global $page;
+//
+// $v['title']=__("history tab");
+// $v['href_link']= tep_href_link(FILENAME_ACCOUNT, 'aca_mod='.$this->code.'&aca_type='.$this->type.'&aca_action=display_view', 'SSL');
+// return array(new objectInfo($v));
+// }
- $v['title']=__("history tab");
- $v['href_link']= tep_href_link(FILENAME_ACCOUNT, 'aca_mod='.$this->code.'&aca_type='.$this->type.'&aca_action=display_view', 'SSL');
- return array(new objectInfo($v));
- }
-
/**
* \fn display_view($pID='')
* \brief Affiche Block edit/modif reviews
@@ -149,9 +180,26 @@
$customer_id=$page->the_var('customer_id');
- self::$current = $this->load_db_values($customer_id);
+ switch(self::$action){
+ case 'display_view':
+ self::$current = $this->load_db_values($customer_id);
- return new objectInfo(array('title'=>__("history heading listing"),'content'=> tep_output_string_protected(tep_get_include_contents(__CLASS__.'.'.__FUNCTION__),false,true) ) );
+ return new objectInfo(array(
+ 'title'=>__("history heading listing"),
+ 'content'=> tep_output_string_protected(tep_get_include_contents(__CLASS__.'.'.__FUNCTION__),false,true)
+ ) );
+ break;
+ default:
+ self::$current = $this->load_db_values($customer_id);
+
+ $v['title']=__("history widget view");
+ $v['href']= tep_href_link(FILENAME_ACCOUNT, 'aca_mod='.$this->code.'&aca_type='.$this->type.'&aca_action=display_view', 'SSL');
+ $v['content']=tep_output_string_protected(tep_get_include_contents(__CLASS__.'/box_view'),false,true);
+ return new objectInfo(array(
+ 'type'=>'box',
+ 'conteneur'=>array(new objectInfo( $v ))
+ ));
+ }
}
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php 2012-04-15 14:30:35 UTC (rev 4240)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php 2012-04-15 21:02:19 UTC (rev 4241)
@@ -128,6 +128,7 @@
case 'account':
// $this->oscss_boxes->_add('shopping_cart', 'sidebar' ,array('cache'=>false,'sort'=>40));
+ $this->oscss_boxes->_add('myaccount', 'sidebar' ,array('cache'=>false,'sort'=>30));
$this->oscss_boxes->_add('specials', 'sidebar', array('cache'=>false));
break;
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/account.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/account.php 2012-04-15 14:30:35 UTC (rev 4240)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/account.php 2012-04-15 21:02:19 UTC (rev 4241)
@@ -1,17 +1,18 @@
<?php
/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
@subpackage 2cShopHtml5Oscim
@package osCSS-2 <www http://www.oscss.org>
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @date 16/09/10, 21:54
+ @date 15/04/2012, 21:54
@encode UTF-8
*/
+ $ModuleAccount = account::getInstance();
$module=$page->_call('account','ret_modules');
$i=0;
- $orders_query = tep_db_query("select o.orders_id,o.orders_prefix, o.date_purchased, o.delivery_name, o.delivery_country, o.billing_name, o.billing_country, ot.text as order_total, s.status_name as orders_status_name from " . TABLE_ORDERS . " o, " . TABLE_ORDERS_TOTAL . " ot, " . TABLE_STATUS . " s where o.customers_id = '" . (int)$customer_id . "' and o.orders_id = ot.orders_id and ot.class = 'ot_total' and o.orders_status = s.status_id and s.language_id = '" . (int)$languages_id . "' AND status_type='orders' ORDER BY orders_id desc limit 1");
+
?>
@@ -26,62 +27,40 @@
<?php /** Retour d'erreur checkup sur la boutique */ $page->messageStack->_draw('account'); ?>
- <?php if ($cart->count_contents() > 0) { ?>
- <div class="contentBox news_info">
- <h3><?php echo OVERVIEW_TITLE; ?></h3>
- <ul>
- <li><?php echo '<a href="' . tep_href_link(FILENAME_SHOPPING_CART) . '">' . SHOPPING_CART_ACTIF . '</a>'; ?></li>
- </ul>
- </div>
- <?php } ?>
-
-
-
- <div class="contentBox myAccount">
- <h3><?php echo MY_ACCOUNT_TITLE; ?></h3>
+ <div class="box">
+ <h4><?php echo OVERVIEW_TITLE; ?></h4>
<ul>
- <li><?php echo '<a href="' . tep_href_link(FILENAME_ACCOUNT, 'action=edit', 'SSL') . '">' . MY_ACCOUNT_INFORMATION . '</a>'; ?></li>
- <li><?php echo '<a href="' . tep_href_link(FILENAME_ACCOUNT, 'action=password', 'SSL') . '">' . MY_ACCOUNT_PASSWORD . '</a>'; ?></li>
- <?php /** ACA module */ foreach($module as $k){ if (method_exists($k, 'display_view_min_listMyAccount')) foreach($k->display_view_min_listMyAccount($customer_id) as $kt=>$vt){ $i++; echo '<li><a href="'.$vt->href_link.'">'.$vt->title.'</a> </li>'; } } ?>
+ <?php if ($cart->count_contents() > 0): ?>
+ <li><?php echo '<a href="' . tep_href_link(FILENAME_SHOPPING_CART) . '">' . SHOPPING_CART_ACTIF . '</a>'; ?></li>
+ <?php endif; ?>
+ <?php foreach($ModuleAccount->CstrMenu() as $k=>$aca_mod) : ?>
+ <!-- dynamic overview menu -->
+ <?php if($aca_mod->pile =='overview') : ?>
+ <?php foreach($aca_mod->conteneur as $row) : ?>
+ <li>
+ <a href="<?php echo $row->href; ?>"><?php echo unhtmlentities($row->title); ?></a>
+ </li>
+ <?php endforeach; ?>
+ <?php endif; ?>
+ <?php endforeach; ?>
</ul>
</div>
- <div class="contentBox myEmail">
- <h3><?php echo HEADER_TITLE_LOGOFF; ?></h3>
- <ul>
- <li><?php echo '<a href="' . tep_href_link(FILENAME_LOGOFF, '', 'NONSSL') . '">' .TEXT_LOGOFF . '</a>'; ?></li>
- </ul>
- </div>
- <div class="contentBox myOrders">
- <h3><?php echo MY_ORDERS_TITLE; ?></h3>
- <?php while ($orders = tep_db_fetch_array($orders_query)) {
- if (tep_count_customer_orders() > 0) { ?>
- <div class="contentBox overview">
- <h4><?php echo OVERVIEW_PREVIOUS_ORDERS ; ?></h4>
- <ul>
- <li><?php echo '#' . $orders['orders_prefix'].$orders['orders_id']; ?> <?php echo tep_date_short($orders['date_purchased']); ?> <?php echo $orders['order_total']; ?> <?php echo '<a class="navBtMini" href="' . tep_href_link(FILENAME_ACCOUNT, 'action=history_info&order_id=' . $orders['orders_id'], 'SSL') . '">' . SMALL_IMAGE_BUTTON_VIEW . '</a>'; ?></li>
- <li><?php echo $orders['orders_status_name']; ?></li>
- <li><?php if (tep_not_null($orders['delivery_name'])) echo tep_output_string_protected($orders['delivery_name']) . ', ' . $orders['delivery_country'];
- else echo tep_output_string_protected($orders['billing_name']) . ', ' . $orders['billing_country']; ?></li>
- </ul>
- <?php } ?>
- </div>
- <?php } ?>
+ <?php foreach($ModuleAccount->display_view() as $k=>$aca_mod) :?>
+ <?php if($aca_mod->type =='box') : ?>
+ <?php foreach($aca_mod->conteneur as $row) : ?>
+ <div class="box">
+ <h4><a href="<?php echo $row->href; ?>"><?php echo unhtmlentities($row->title); ?></a></h4>
+ <?php echo unhtmlentities($row->content); ?>
+ </div>
+ <?php endforeach; ?>
+ <?php endif; ?>
+ <?php endforeach; ?>
- <ul>
- <?php /** ACA module */ foreach($module as $k){ if (method_exists($k, 'display_view_min_listMyOrders')) foreach($k->display_view_min_listMyOrders($customer_id) as $kt=>$vt){ $i++; echo '<li><a href="'.$vt->href_link.'">'.$vt->title.'</a> </li>'; } } ?>
- </ul>
- </div>
- <div class="contentBox myEmail">
- <h3><?php echo EMAIL_NOTIFICATIONS_TITLE; ?></h3>
- <ul>
- <li><?php echo '<a href="' . tep_href_link(FILENAME_ACCOUNT, 'action=newsletters', 'SSL') . '">' . EMAIL_NOTIFICATIONS_NEWSLETTERS . '</a>'; ?></li>
- </ul>
- </div>
Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css 2012-04-15 14:30:35 UTC (rev 4240)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css 2012-04-15 21:02:19 UTC (rev 4241)
@@ -344,4 +344,17 @@
/*checkout */
div.orderProcess p.checkoutComment {clear:both;}
- div.orderProcess fieldset {clear:both;}
\ No newline at end of file
+ div.orderProcess fieldset {clear:both;}
+
+
+ /* Account page */
+ #account div.box{
+ float:left;
+ width:50%;
+ }
+ #account div.box h4{
+ padding:5px;
+ }
+ #account div.box div.contentBox{
+ padding:5px;
+ }
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-15 14:30:43
|
Revision: 4240
http://oscss.svn.sourceforge.net/oscss/?rev=4240&view=rev
Author: oscim
Date: 2012-04-15 14:30:35 +0000 (Sun, 15 Apr 2012)
Log Message:
-----------
Mise a niveau et nettoyage du code , ajout de commentaire
suite travail et normalisation de la copes des commande sql dans le dossier origin , dans le tag filesql
Mise a niveau de tous les tag d'install
correction modele datatype
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/DataFileSql.php
trunk/catalog/admin/includes/classes/fileUtility.php
trunk/catalog/admin/includes/classes/oscss_DBIndex.php
trunk/catalog/admin/includes/exts/package/CIP.php
trunk/catalog/admin/includes/exts/package/ci_tag.class.php
trunk/catalog/admin/includes/exts/package/tags/add2end.php
trunk/catalog/admin/includes/exts/package/tags/add2endlg.php
trunk/catalog/admin/includes/exts/package/tags/addfile.php
trunk/catalog/admin/includes/exts/package/tags/addfilelg.php
trunk/catalog/admin/includes/exts/package/tags/addfilename.php
trunk/catalog/admin/includes/exts/package/tags/addlangdef.php
trunk/catalog/admin/includes/exts/package/tags/config.php
trunk/catalog/admin/includes/exts/package/tags/depend.php
trunk/catalog/admin/includes/exts/package/tags/description.php
trunk/catalog/admin/includes/exts/package/tags/extractzip.php
trunk/catalog/admin/includes/exts/package/tags/filesql.php
trunk/catalog/admin/includes/exts/package/tags/modifytable.class.php
trunk/catalog/admin/includes/exts/package/tags/requirements.php
trunk/catalog/admin/includes/exts/package/tags/sql.php
trunk/catalog/index.php
trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE__description.sql
trunk/dev/GenerCode/datatype/Modele/sql/mysql/install/tables/osc__DATATYPE_REPLACE__extra_fields_values.sql
Removed Paths:
-------------
trunk/catalog/admin/includes/classes/DataSqlFile.php
Modified: trunk/catalog/admin/includes/classes/DataFileSql.php
===================================================================
--- trunk/catalog/admin/includes/classes/DataFileSql.php 2012-04-15 13:43:19 UTC (rev 4239)
+++ trunk/catalog/admin/includes/classes/DataFileSql.php 2012-04-15 14:30:35 UTC (rev 4240)
@@ -14,11 +14,11 @@
/**
@def FOLDER_TABLES
*/
- const FOLDER_TABLES = 'tables/';
+ const FOLDER_TABLES = 'install/tables/';
/**
@def FOLDER_DATAS
*/
- const FOLDER_DATAS = 'data/';
+ const FOLDER_DATAS = 'install/data/';
/**
@@ -38,7 +38,7 @@
public function __construct($basepath){
// if(tep_not_null($basepath) )
- $this->Set('basepath', $basepath);
+ $this->Set('basepath', $basepath);
$this->Set('exekey', (DB_MOTOR_TYPE =='InnoDB'));
@@ -196,6 +196,9 @@
$buffer = '';
$lg=false;
+ if(!file_exists($sql_file))
+ return false;
+
$fp = fopen($sql_file, 'rb');
while (!feof ($fp)){
Deleted: trunk/catalog/admin/includes/classes/DataSqlFile.php
===================================================================
--- trunk/catalog/admin/includes/classes/DataSqlFile.php 2012-04-15 13:43:19 UTC (rev 4239)
+++ trunk/catalog/admin/includes/classes/DataSqlFile.php 2012-04-15 14:30:35 UTC (rev 4240)
@@ -1,167 +0,0 @@
-<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
-/**
- @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.1
- @date 11/04/2012, 18:17
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
- @brief Manipluate files.sql And execute
-
-
-
- Not used !!! In dev
-*/
-
-Class DataFileSql{
- /**
- @def TABLES_FOLDER
- */
- const TABLES_FOLDER = 'tables/';
- /**
- @def TABLES_DATA
- */
- const TABLES_DATA = 'data/';
-
-
- /**
- @var path base folder for list and
- */
- public $basepath;
-
-
- public function __construct(){
-
- $this->Ftables = $this->basepath . 'tables/';
- }
-
-
- /**
- @brief ordonne les fichier pour l'install
- @param path path directory for scan
- @return array
- [0] tables
- [1] keys
- [2] data
- */
- function SqlFileBrowse($path){
-
- $result=array();
- $result[0]=array();
- $result[1]=array();
- $result[2]=array();
-
-
-
- foreach(scan($path.'tables/') as $row){
- if(substr($row,-1) !='~') {
- if(strpos($row , '.key')===false)
- $result[0][]=$row;
-
- elseif(strpos($row , '.key') > 0){
- if(DB_MOTOR_TYPE =='InnoDB')
- $result[1][]=$row;
- }
- }
- }
-
- foreach(scan($path.'data/') as $row){
- if(substr($row,-1) !='~')
- $result[2][]=$row;
- }
-
-
- return $result;
-
- }
-
-
- /**
- @brief Process for load and install .sql or .key.sql
- */
- function SqlFileDataProcess( $sql_file, $table_prefix = -1,$file_lg_sample='') {
- global $language;
- $buffer = '';
- $lg=false;
-
-
- if( $file_lg_sample !='')include($file_lg_sample);
- else{
-// $file_lg= dirname($_SERVER['SCRIPT_FILENAME']).'/'.WS_LANGUAGE.DC_LOADER_LANG.'/'.preg_replace(array('#(.sql)#i','#^([0-9]*_)#i'),array('.txt','') ,basename($sql_file));
-// if(file_exists($file_lg))include($file_lg);
- }
-
- $fp = fopen($sql_file, 'rb');
-
- while (!feof ($fp)){
- $buf = fgets($fp, 4096);
- if (substr($buf, 0, 2) <> '--' ){
- $buf=preg_replace('/--(.+)*/' ,'',$buf);
- $buffer .= $buf;
- }
- }
-
- $DB=Database::getInstance();
- $repl = ((is_array($lg) && count($lg) >0)? true : false);
- $buffer=preg_replace('/[ ](OSC_)([A-Z])/i', ' '.$table_prefix.'$2',$buffer);
- $buffer = trim($buffer);
-
- $query=preg_split("/\n/i",$buffer,-1,PREG_SPLIT_NO_EMPTY);
-
-
- if($repl) {
- $lg_k = array_keys($lg);
- $lg_v = array_map('addslashes',$lg);
- }
- foreach($query as $row){
- $row = trim($row);
- if(strlen($row) > 3){
- $sql=($repl)? str_replace($lg_k,$lg_v,$row) : $row ;
-
- $DB->query($row);
-
- }
- }
-
- }
-
- /**
- @brief Process for load and install .sql or .key.sql
- */
- function SqlFileProcess( $sql_file, $table_prefix = -1) {
-
- $buffer = '';
- $lg=false;
-
- $fp = fopen($sql_file, 'rb');
-
- while (!feof ($fp)){
- $buf = fgets($fp, 4096);
- if (substr($buf, 0, 2) <> '--' ){
- $buf=preg_replace('/--(.+)*/' ,'',$buf);
- $buffer .= $buf;
- }
- }
- fclose($fp);
-
-
- $DB=Database::getInstance();
-
- $buffer=preg_replace('/[ ](OSC_)([A-Z])/i', ' '.$table_prefix.'$2',$buffer);
-
- $query=explode(';',$buffer);
- foreach($query as $row){
- $row = trim($row);
- if(strlen($row) > 3){
- $DB->query($row);
- }
- }
-
- }
-
-
-}
-
-
-?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/classes/fileUtility.php
===================================================================
--- trunk/catalog/admin/includes/classes/fileUtility.php 2012-04-15 13:43:19 UTC (rev 4239)
+++ trunk/catalog/admin/includes/classes/fileUtility.php 2012-04-15 14:30:35 UTC (rev 4240)
@@ -112,6 +112,12 @@
}
+ /**
+ @fn _unlink($source)
+ @brief recusrive delete folder and files
+ @param $source absolute path
+ @return boolean false for error
+ */
public static function _unlink($source){
if (file_exists($source) && is_writeable($source))
return unlink($source);
@@ -121,18 +127,22 @@
}
/**
+ @fn _mkdir($path)
+ @brief recusrive delete folder and files
+ @param $path absolute path
+ @return boolean false for error
*/
- public static function _mkdir($path, $mod=0777) {
+ public static function _mkdir($path) {
if (!file_exists($path)) {
if (is_dir($path))self::_chmod($path);
else {
self::_mkdir(dirname($path));
if (!is_writeable(dirname($path))) {
- self::ComportForError(__CLASS__.'->'.__FUNCTION__.'::'.__LINE__.__('error file not removeable'). $source, 'error');
+ self::ComportForError(__CLASS__.'->'.__FUNCTION__.'::'.__LINE__.__('error file not removeable'). $source, 'error');
return false;
}
if(!@mkdir($path, $mod)) {
- self::ComportForError(__CLASS__.'->'.__FUNCTION__.'::'.__LINE__.__("cant create dir text"), 'error');
+ self::ComportForError(__CLASS__.'->'.__FUNCTION__.'::'.__LINE__.__("cant create dir text"), 'error');
return false;
}
self::_chmod($path);
@@ -172,6 +182,9 @@
/**
@fn _copy($src,$dst)
@brief Copy repertoire recursif
+ @param $src absolute path
+ @param $dst absolute path
+ @return boolean true if ok
*/
public static function _copy($src,$dst){
if(!is_dir($src))
Modified: trunk/catalog/admin/includes/classes/oscss_DBIndex.php
===================================================================
--- trunk/catalog/admin/includes/classes/oscss_DBIndex.php 2012-04-15 13:43:19 UTC (rev 4239)
+++ trunk/catalog/admin/includes/classes/oscss_DBIndex.php 2012-04-15 14:30:35 UTC (rev 4240)
@@ -49,7 +49,7 @@
$this->all['lang'] = array();
$this->all['DataType'] = array();
- foreach (scan(DIR_FS_ROOT_DOCS . self::T_AVAILABLE .'tables/' ) as $file ) {
+ foreach (scan(DIR_FS_ROOT_DOCS . self::T_AVAILABLE .'install/tables/' ) as $file ) {
if(substr($file, 0,1) =='.') continue;
@@ -97,6 +97,7 @@
if($key && !in_array($name, array(DB_TABLE_PREFIX.'customers'))) {
+// var_dump($name);
/*
Traitement des clef et recherche des liaision vers la table language
Si une liaison existe, celle ci considere la table associé comme une table de langue et celle ci sera duspliqué lors de l'ajout d'une nouvelle language
Modified: trunk/catalog/admin/includes/exts/package/CIP.php
===================================================================
--- trunk/catalog/admin/includes/exts/package/CIP.php 2012-04-15 13:43:19 UTC (rev 4239)
+++ trunk/catalog/admin/includes/exts/package/CIP.php 2012-04-15 14:30:35 UTC (rev 4240)
@@ -36,29 +36,16 @@
/**
Name of the zip file with cip
*/
- var $zip_name;
+ public $zip_name;
/**
True if CIP should be read from ZIP-file
*/
- var $is_cip_in_zip;
+ public $is_cip_in_zip;
/**
tags data
*/
- var $contrib_data;
+ public $contrib_data;
/**
- @param array level error (cf fin de fichier)
-
- */
-// public static $level_error=array(0=>array(),1=>array(),2=>array(),3=>array());
- /**
- @param bool True if we have an error. error() sets this var
- */
-// public static $error=false;
- /**
- @param array collector erreur
- */
-// public static $ArrayError=array();
- /**
@param string
*/
public static $ident=null;
@@ -195,20 +182,20 @@
/** ================================================================== Archiver ZIP ================================================================== */
/**
- True if we unpack. So we should delete
+ @brief True if we unpack. So we should delete
*/
function was_unpacked() {
if(self::$was_unpacked===null) return false;
else return self::$was_unpacked;
}
/**
- True if unpacked folder exists.
+ @brief True if unpacked folder exists.
*/
function is_unpacked() {
return (self::$is_unpacked===null) ? is_dir(DIR_FS_CIP.self::$cip_name) :self::$is_unpacked ;
}
/**
- True if we have a zip for this CIP
+ @brief True if we have a zip for this CIP
*/
function is_zipped() {return (is_file(DIR_FS_CIP.$this->zip_name));}
/**
@@ -216,15 +203,16 @@
function full_path_to_zip() {return escapeshellcmd(DIR_FS_CIP.$this->zip_name);}
/**
- Creat zip
+ @brief Creat zip
si zip exists > delete
*/
function pack_cip($ext='zip') {
if (!$this->is_unpacked() || $this->is_zipped()) return false;
- if(file_exists(DIR_FS_CIP.escapeshellcmd(self::$cip_name))) unlink(DIR_FS_CIP.escapeshellcmd(self::$cip_name));
+ if(file_exists(DIR_FS_CIP.escapeshellcmd(self::$cip_name)))
+ unlink(DIR_FS_CIP.escapeshellcmd(self::$cip_name));
switch ($ext) {
case 'gzip':
- if(CI_ARCHIVER_GZIP) @ exec(CI_ARCHIVER_GZIP.' '.DIR_FS_CIP.escapeshellcmd(self::$cip_name), $output);
+ if(CI_ARCHIVER_GZIP) @exec(CI_ARCHIVER_GZIP.' '.DIR_FS_CIP.escapeshellcmd(self::$cip_name), $output);
break;
case 'zip':
$zipfile = new PclZip($this->full_path_to_zip());
@@ -242,7 +230,7 @@
}
/**
- upack zip
+ @brief upack zip
*/
function unpack_cip($ext='zip') {
error_reporting(E_ALL);
@@ -278,33 +266,33 @@
///================================================================== //Database //==================================================================
/**
- Write db for tags contrib
+ @brief Write db for tags contrib
*/
function write_to_database(){
if (!$this->is_all_right()) self::InProcess(__("Erreur avant traitement de cette fonction "), __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'error');
foreach ($this->contrib_data as $id=>$tag) {
if (!$tag->write_to_database()) {
- self::InProcess(__("Erreur avant traitement de cette fonction "), 'tag_xml-['.$id.']'. $tag->tag_name.'->'.__FUNCTION__.'()', 'error');
- break;
+ self::InProcess(__("Erreur avant traitement de cette fonction "), 'tag_xml-['.$id.']'. $tag->tag_name.'->'.__FUNCTION__.'()', 'error');
+ break;
}
}
}
/**
- Load db for tags contrib
+ @brief Load db for tags contrib
*/
function read_from_database(){
if (!$this->is_all_right()) self::InProcess(__("Erreur avant traitement de cette fonction "), __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'error');
foreach ($this->contrib_data as $id=>$tag) {
if (!$tag->read_from_database()){
- self::InProcess(__("Erreur avant traitement de cette fonction "), 'tag_xml-['.$id.']'. $tag->tag_name.'->'.__FUNCTION__.'()', 'error');
- break;
+ self::InProcess(__("Erreur avant traitement de cette fonction "), 'tag_xml-['.$id.']'. $tag->tag_name.'->'.__FUNCTION__.'()', 'error');
+ break;
}
}
}
/**
- delete db for tags contrib
+ @brief delete db for tags contrib
*/
function delete_tags_tables() {
if (!$this->is_all_right()) self::InProcess(__("Erreur avant traitement de cette fonction "), __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'error');
@@ -324,14 +312,9 @@
private function is_registered() {return (($this->cip_id) ? true : false);}
/**
- Write in db this contrib
+ @brief Write in db this contrib
*/
private function register() {
-
-// $resobj=self::$DB->query($sql="insert into ".TABLE_CIP." (cip_id, cip_folder_name, cip_installed, cip_ident, cip_version) values ('', '".self::$cip_name."', '0', '".$this->getIdent()."','".$this->getVersion()."')");
-// $this->cip_id=$resobj->__get('insertId');
-
-// if(is_object(self::$cInfo) && self::$cInfo->id > 0)
$this->cip_id=sqlcip::create(array('folder_name'=>self::$cip_name , 'ident'=>$this->getIdent() ,'version'=>$this->getVersion() ));
$this->cip_installed=0;
@@ -339,7 +322,7 @@
}
/**
- Delete in db this contrib
+ @brief Delete in db this contrib
*/
public function unregister() {
if(is_object(self::$cInfo) && self::$cInfo->id > 0)
@@ -350,7 +333,7 @@
/**
*/
- private function is_installed() {
+ private function is_installed() {
if (!isset($this->cip_installed)) {
@@ -666,7 +649,7 @@
/**
- on backup
+ @brief on backup
*/
private function backup() {
foreach ($this->contrib_data as $id=>$tag)
@@ -678,13 +661,14 @@
}
/**
- on remove
+ @brief on remove
*/
private function restore() {
foreach ($this->contrib_data as $id=>$tag)
if ( method_exists($tag, 'restore_file' ) && $tag->restore_file() ===false){
- self::InProcess(__("Erreur durant traitement de cette fonction "),'tag_xml-['.$id.']'. $tag->tag_name.'->restore_file()','block');
+ self::InProcess(__("Erreur durant traitement de cette fonction "),'tag_xml-['.$id.']'. $tag->tag_name.'->restore_file()','block');
}
+
if(file_exists(self::PATH_BACKUP.self::$cip_name) && !fileUtility::_rmdir(self::PATH_BACKUP.self::$cip_name)){
self::InProcess(__("Suppression backup impossible ").self::PATH_BACKUP.self::$cip_name, __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'block');
return false;
@@ -702,10 +686,11 @@
self::InProcess(__("Erreur avant traitement de cette fonction "), __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'block');
return false;
}
+
foreach ($this->contrib_data as $id=>$tag)
if ( $tag->conflicts_check_for_install() ===false){
- self::InProcess($msg.__("Erreur durant traitement de cette fonction "),'tag_xml-['.$id.']'. $tag->tag_name.'->'.__FUNCTION__,'block');
- break;
+ self::InProcess($msg.__("Erreur durant traitement de cette fonction "),'tag_xml-['.$id.']'. $tag->tag_name.'->'.__FUNCTION__,'block');
+ break;
}
return true;
}
@@ -715,10 +700,11 @@
self::InProcess(__("Erreur avant traitement de cette fonction "), __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'block');
return false;
}
+
foreach ($this->contrib_data as $id=>$tag)
if ( $tag->conflicts_check_for_remove() ===false){
- self::InProcess($msg.__("Erreur durant traitement de cette fonction "),'tag_xml-['.$id.']'. $tag->tag_name.'->'.__FUNCTION__,'block');
- break;
+ self::InProcess($msg.__("Erreur durant traitement de cette fonction "),'tag_xml-['.$id.']'. $tag->tag_name.'->'.__FUNCTION__,'block');
+ break;
}
return true;
}
@@ -731,27 +717,29 @@
self::InProcess(__("Erreur is_all_right() init cette fonction "), __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'block');
return false;
}
+
foreach ($this->contrib_data as $id=>$tag)
if ( $tag->permissions_check_for_install() ===false){
- self::InProcess($msg.__("Erreur durant traitement de cette fonction "),'tag_xml-['.$id.']'. $tag->tag_name.'->'.__FUNCTION__,'block');
- break;
+ self::InProcess($msg.__("Erreur durant traitement de cette fonction "),'tag_xml-['.$id.']'. $tag->tag_name.'->'.__FUNCTION__,'block');
+ break;
}
return true;
}
/**
- Control avant reomve cip
+ @brief Control avant reomve cip
*/
private function permissions_check_for_remove($msg='') {
if (!$this->is_all_right()){
self::InProcess(__("Erreur avant traitement de cette fonction "), __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'block');
return false;
}
+
foreach ($this->contrib_data as $id=>$tag)
if ( $tag->permissions_check_for_remove() ===false){
- self::InProcess($msg.__("Erreur durant traitement de cette fonction "),'tag_xml-['.$id.']'. $tag->tag_name.'->'.__FUNCTION__,'block');
- break;
+ self::InProcess($msg.__("Erreur durant traitement de cette fonction "),'tag_xml-['.$id.']'. $tag->tag_name.'->'.__FUNCTION__,'block');
+ break;
}
return true;
}
@@ -761,7 +749,7 @@
//==================================================================
/**
- Checks if we have no error and have a data to work with:
+ @brief Checks if we have no error and have a data to work with:
*/
public function is_all_right() {
@@ -771,32 +759,14 @@
else return true;
return false;
-// return ((((int)self::$error) || (!is_array($this->contrib_data)) || (is_array($this->contrib_data) && count($this->contrib_data)==0)) ? false : true);
}
-// function error($text='') {
-// global $messageStack;
-// if ($text) {
-// if ($this->was_unpacked() && $this->is_unpacked()) fileUtility::_rmdir(DIR_FS_CIP.$this->get_cip_name());
-// /* return self::$error=*/$messageStack->add($text, 'error');
-// }
-// }
- /**
- @return true if we have an error!...
- */
-// function check_error($stage='', $tag_name='', $id='', $text='') {
-//
-// trigger_error(__CLASS__.__FUNCTION__.' funciton obsolete, ', E_USER_ERROR);
-//
-// if (!is_null($text)) self::$ArrayError[]=$stage." at <<i>".$tag_name."</i>> #".$id.".<br /><strong>".$text."</strong>";
-// return self::$error=true;
-// }
//==================================================================
/**
- Load tag class /tags/xxx.php
+ @brief Load tag class /tags/xxx.php
*/
private static function include_tag_classes() {
if (defined('TAG_LOADED')) return null;
@@ -822,12 +792,7 @@
@return tag ident
*/
function getIdent(){
-// if(self::$ident!=null) return self::$ident;
-// if(isset($this->description_id) && isset( $this->contrib_data[$this->description_id]->data['ident']))
-// return self::$ident=$this->contrib_data[$this->description_id]->data['ident'];
return self::$ident = self::$cip_name;
-// self::InProcess(__("pas de tag de ident (obligatoire)"), __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'block');
-// return false;
}
/**
@@ -845,7 +810,7 @@
/**
- Recup dependence contrib
+ @brief Recup dependence contrib
*/
function getDependedCips(){
$cips = array();
@@ -865,7 +830,7 @@
/**
- Lance tous les controls
+ @brief Lance tous les controls
@param string type (install|remove)
*/
private function full_check($type='install'){
@@ -889,16 +854,15 @@
}
/**
- Delete contrib folder and Zip
+ @brief Delete contrib folder and Zip
*/
private function DeleteContribFull($zip=true, $message='not installable '){
if ($this->was_unpacked())
if(!fileUtility::_rmdir(DIR_FS_CIP.self::$cip_name) )
- self::InProcess(__("delete folder ,".$message).self::$cip_name, __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'normal');
+ self::InProcess(__("delete folder ,".$message).self::$cip_name, __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'normal');
if($zip && !fileUtility::_rmdir(DIR_FS_CIP.$this->get_zip_name()) )
self::InProcess(__("delete zip , ".$message).$this->get_zip_name(), __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'normal');
-
}
@@ -914,6 +878,12 @@
}
+
+
+/**
+ @class ErrorAndBlockProcess
+ @brief Manage and process collector error
+*/
class ErrorAndBlockProcess{
public static $ArrayError=array();
@@ -937,10 +907,8 @@
/**
- Control niveau d'erreur pour suite ou block script
-
- @param
- @a int level error control
+ @brief Control niveau d'erreur pour suite ou block script
+ @param int level error control
@return boolean suite script
*/
public static function CtrlForContinue($level=3){
@@ -952,10 +920,10 @@
/**
- @param
- @a string $msg
- @a string noblock|block
- @a string $origin Function/class
+ @param $msg string
+ @param $origin string $origin Function/class
+ @param $type
+ @param $level
*/
public static function ChooseAction($msg,$origin='',$type='',$level=E_USER_NOTICE){
@@ -963,33 +931,33 @@
switch($type){
case '0':
case 'error':
- /**
- Fatal sortie
- */
+ /**
+ @remarks Fatal sortie
+ */
- self::$level_error[0][$id]=true;
- self::$ArrayError[$id]='[['.number_format( array_sum(explode(' ', microtime())) - array_sum(CIP::$stamptime), 8, '.', '' ).']]'.__('ERROR :').$origin.':: '.CIP::$cip_name.' '.$msg;
+ self::$level_error[0][$id]=true;
+ self::$ArrayError[$id]='[['.number_format( array_sum(explode(' ', microtime())) - array_sum(CIP::$stamptime), 8, '.', '' ).']]'.__('ERROR :').$origin.':: '.CIP::$cip_name.' '.$msg;
case '1':
case 'block':
- /**
- Message type 1, block action d execution mais autorise traitement check, backup, restore
- */
- self::$level_error[1][$id]=true;
- self::$error=true;
- self::$ArrayError[$id]='[['.number_format( array_sum(explode(' ', microtime())) - array_sum(CIP::$stamptime), 8, '.', '' ).']]'.__('FATAL :').$origin.':: '.CIP::$cip_name.' '.$msg;
- return;
+ /**
+ remarks Message type 1, block action d execution mais autorise traitement check, backup, restore
+ */
+ self::$level_error[1][$id]=true;
+ self::$error=true;
+ self::$ArrayError[$id]='[['.number_format( array_sum(explode(' ', microtime())) - array_sum(CIP::$stamptime), 8, '.', '' ).']]'.__('FATAL :').$origin.':: '.CIP::$cip_name.' '.$msg;
+ return;
break;
case '2':
case 'noblock':
- self::$level_error[2][$id]=true;
- self::$ArrayError[$id]='[['. number_format( array_sum(explode(' ', microtime())) - array_sum(CIP::$stamptime), 8, '.', '' ).']]'.__('NO BLOCK :').' '.$origin.':: '.CIP::$cip_name.' '.$msg;
+ self::$level_error[2][$id]=true;
+ self::$ArrayError[$id]='[['. number_format( array_sum(explode(' ', microtime())) - array_sum(CIP::$stamptime), 8, '.', '' ).']]'.__('NO BLOCK :').' '.$origin.':: '.CIP::$cip_name.' '.$msg;
break;
default:
- /**
- Message info
- */
- self::$ArrayError[$id]=__('INFO :').$msg;
- self::$level_error[3][$id]=false;
+ /**
+ @remarks Message info
+ */
+ self::$ArrayError[$id]=__('INFO :').$msg;
+ self::$level_error[3][$id]=false;
}
}
Modified: trunk/catalog/admin/includes/exts/package/ci_tag.class.php
===================================================================
--- trunk/catalog/admin/includes/exts/package/ci_tag.class.php 2012-04-15 13:43:19 UTC (rev 4239)
+++ trunk/catalog/admin/includes/exts/package/ci_tag.class.php 2012-04-15 14:30:35 UTC (rev 4240)
@@ -32,32 +32,39 @@
}
-Abstract class ContribInstallerBaseTag
-/* extends CIP */{
- var $contrib; //contrib name
- var $tag_name; //name of the tag used in xml-file
- var $data;//contain a value and used to store to database
- var $params;//array with attributes
- /**
- * number of this type tag in xml
+Abstract class ContribInstallerBaseTag{
+ /**
+ @var contrib name
*/
- var $id;
+ public $contrib;
+ /**
+ @var name of the tag used in xml-file
+ */
+ public $tag_name;
+ /**
+ @var contain a value and used to store to database
+ */
+ public $data;
+ /**
+ @var array with attributes
+ */
+ public $params;
+ /**
+ @var number of this type tag in xml
+ */
+ public $id;
/**
- @param bool true if error
- */
-// public static $error;
+ @var priority in which this tag will be processed
+ */
+ public $priority = 0;
/**
- * priority in which this tag will be processed
- */
- var $priority = 0;
+ @var dependencie path for this tag
+ */
+ public $depend;
/**
- * dependencie path for this tag
- */
- var $depend;
- /**
- * parent cip for this tag
- */
- var $cip;
+ @var parent cip for this tag
+ */
+ public $cip;
@@ -66,16 +73,12 @@
$this->cip = $cip;
$this->contrib=CIP::$cip_name;
$this->id=$id+1;//For human understanding we add one.
-// $this->table=DB_PREFIX."cip_".$this->tag_name;
+
$this->depend = $dep;
if ($xml_data) $this->read_from_xml($xml_data);
$this->add_log();
-
-// $this->write_to_database();
-
-// $this->read_from_database();
}
@@ -91,8 +94,8 @@
$result=$DB->query($query);
if ($result===false)CIP::$ArrayError[]=(sql_error($query));
else {
- $installed=$result->fetchAssoc();
- return $installed['cip_id'];
+ $installed=$result->fetchAssoc();
+ return $installed['cip_id'];
}
}
@@ -176,57 +179,8 @@
return $this->linebreak_fixing($this->comment_string($this->data['replace'], $this->data['replace_type']));
}
function multi_search() {return (($this->data['type']=='continued') ? true : false);}
- //=======================================================================
- //error
- //=======================================================================
-// function get_error() {return CIP::$error;}
-
- //=======================================================================
- //Database functions:
- //=======================================================================
-// function create_database_table() {
-// $query="CREATE TABLE IF NOT EXISTS `".$this->table."` (
-// `cip_id` int(11) NOT NULL PRIMARY KEY,
-// `tag_id` int NOT NULL, ";
-// foreach ($this->params as $columns=>$info) $query.= '`'.$columns.'` '.$info['sql_type'].' NOT NULL, ';
-// $query=substr($query, 0, -2) . ");";
-// tep_db_query($query);
-// }
-//
-//
-// function delete_database_table() {cip_db_query("DROP TABLE IF EXISTS `".$this->table."`");}
-//
-// function is_database_table_exists() {
-// $check_query=tep_db_query("SHOW TABLE STATUS");
-// while ($table=tep_db_fetch_array($check_query))
-// if ($table['Name']==$this->table)return true;
-// return false;
-// }
-//
-//
-// function write_to_database() {
-// if (!$this->is_database_table_exists()) $this->create_database_table();
-// $data=$this->data;
-// $data['cip_id']=$this->get_cip_id();
-// $data['tag_id']=$this->get_id();
-//
-//
-// tep_db_perform($this->table, $data);
-// }
-//
-//
-// function read_from_database() {
-// if (!$this->is_database_table_exists()) return;
-// $query="SELECT ";
-// // while (list($columns, ) = each($data)) {$query .= 'tag.'.$columns.', ';}
-// $query .= 'tag.* ' ;
-// $query = substr($query, 0, -2) . " FROM ".$this->table." tag, ".TABLE_CIP." cip WHERE tag_id='".$this->id."' AND cip.cip_id=tag.cip_id AND cip.cip_folder_name='".$this->contrib."'";
-// $data=tep_db_output(tep_db_fetch_array(tep_db_query($query)));
-// return true;
-// }
-
//======================================================================= //XML: //=======================================================================
function get_data_from_xml_parser($xml_data='') {
@@ -236,82 +190,13 @@
function read_from_xml($xml_data) {
if (is_object($xml_data) and isset($xml_data->childNodes) ) $this->get_data_from_xml_parser($xml_data);
else {
-// die(__CLASS__.'->'.__FUNCTION__.'::'.__LINE__);
CIP::InProcess('No data from XML-file', __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'error');
}
}
-// function xml_check() {
-// foreach ($this->params as $tag=>$tag_data) {
-// if (!isset($tag_data['xml_error'])) continue; //'addcode' and 'find'
-// if ($tag=='start' or $tag=='end' or $tag=='type') {
-// if (
-// ($this->data['start'] && $this->data['end'] && !$this->data['type'])
-// or
-// (!$this->data['start'] && !$this->data['end'] && $this->data['type'])
-// ) {}
-// else
-// CIP::InProcess($tag_data['xml_error'], __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'info');
-// }
-// else if (!isset($this->data[$tag]) && isset($tag)) {
-// CIP::InProcess($tag_data['xml_error'], __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'info');
-// }
-// else if(is_array($this->data[$tag])){
-// $pocet = count(array_values($this->data[$tag]));
-// for($i=0;$i <$pocet; $i++){
-// if(!isset($this->data[$tag][$i])) CIP::InProcess($tag_data['xml_error']." on ".$i. ". subtag", __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'info');
-// }
-// }
-// }
-// }
-// function data_range_check() {
-// //For addcode and findreplace start<=end!!!!
-// //Check if we have <find> between lines with numbers "start" and "end".
-//
-//
-// //Range check:
-// while (list($tag_name, ) = each($this->params)) {
-// $value=$this->data[$tag_name];
-// if($value) {
-// $pieces=strtolower(explode(" ", $this->params[$tag_name]['sql_type']));//get a first word
-// $pos=strpos($pieces[0], '(');
-// if ($pos) {
-// $type=substr($pieces[0], 0, $pos-1);
-// $type_value=substr($pieces[0], $pos - strlen($pieces[0]), 1); //without '(' and ')'
-// } else $type=$pieces[0];
-//
-// switch ($type[0]) {
-// case 'varchar':
-// if (strlen($value)>$type_value) CIP::InProcess(__("value lenth must be less then ").$type_value, __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'noblock');
-//
-// break;
-// case 'text':
-// if (strlen($value)>65535)CIP::InProcess(__("value lenth must be less then 65535"), __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'noblock');
-// break;
-// case 'enum':
-// $values=strtolower(explode(",",str_replace("'", "",$this->params[$tag_name]['sql_type']) ));
-// if (!in_array($value, $values))CIP::InProcess(__("value must be ").implode (" or ", $values), __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'noblock');
-// break;
-// case 'int':
-// case 'integer'://unsigned
-// if ($value>4294967295)CIP::InProcess(__("value must be integer and less then 4294967295."), __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'noblock');
-// break;
-// case 'tinyint'://unsigned
-// if ($value>255) CIP::InProcess(__("value must be integer and less then 4294967295.").$type_value, __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'noblock');
-// break;
-// case 'smallint'://unsigned
-// if ($value>65535)CIP::InProcess(__("value must be integer and less then 65535.").$type_value, __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'noblock');
-// break;
-//
-// }
-// }
-// }
-// }
-
-
///======================================================================= //Backup //=======================================================================
/**
@@ -328,10 +213,7 @@
else $filenames[0] = $filename;
foreach($filenames as $full_path){
-// echo $full_path.'<br>';
-// $full_path=self::get_fs_filename($filename);
-
if(strpos('_'.$full_path, DIR_FS_ADMIN)> 0 )
$filename = str_replace(DIR_FS_ADMIN,'',$full_path);
elseif(strpos('_'.$full_path, DIR_FS_CATALOG)>0)
@@ -374,11 +256,12 @@
if (!is_file($backup_file)) return false;
//Restore
if (!fileUtility::_copy($backup_file, $current_file)) {
- CIP::InProcess(__("Couldn't restore file ").' '. $filename. __("from").' '.$backup_file, __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'block');
- return false;
+ CIP::InProcess(__("Couldn't restore file ").' '. $filename. __("from").' '.$backup_file, __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'block');
+ return false;
}
else{
- if(!ci_remove($backup_file)) return false;
+ if(!ci_remove($backup_file))
+ return false;
}
}
return true;
@@ -411,13 +294,12 @@
function comment_string($str, $type="php") {
switch ($type) {
case 'html':
- $start_com="\n<!-- ";
- $end_com=" //-->";
- break;
+ $start_com="\n<!-- ";
+ $end_com=" //-->";
+ break;
default:
- $start_com="\n/* ";
- $end_com=" */";
- break;
+ $start_com="\n/* ";
+ $end_com=" */";
}
$back_part=$this->contrib." - installed by ".CONTRIB_INSTALLER_NAME.$end_com."\n";
return $start_com. "Begin ".$back_part. $this->remove_fl_linebreaks($str). $start_com."End ".$back_part ;
@@ -457,7 +339,7 @@
}
function add_file_end($fname, $fpart) {
-// global $messageStack;
+
$enter = false;
$fs_fname = $this->get_fs_filename($fname);
if (is_file($fs_fname)) {
@@ -465,22 +347,22 @@
$position = strpos($old_file, $fpart);
if ($position === false) {
- if($this->get_type() == 'php'){
- $count = preg_match_all("(\?>\s*$\s*)",$old_file,$matches,PREG_OFFSET_CAPTURE);
- if ($count == 0) { // if file no ends with \?\>
- $new_file = rtrim($old_file). "\n<?php " . $fpart . " ?>";
- }else{
- $new_file = substr_replace($old_file, $fpart, $matches[0][0][1], 0); //inserts string into another string
- }
- }
- else
- $new_file = $old_file.$fpart;
+ if($this->get_type() == 'php'){
+ $count = preg_match_all("(\?>\s*$\s*)",$old_file,$matches,PREG_OFFSET_CAPTURE);
+ if ($count == 0) { // if file no ends with \?\>
+ $new_file = rtrim($old_file). "\n<?php " . $fpart . " ?>";
+ }else{
+ $new_file = substr_replace($old_file, $fpart, $matches[0][0][1], 0); //inserts string into another string
+ }
+ }
+ else
+ $new_file = $old_file.$fpart;
- $this->write_to_file($fs_fname, $new_file);
- return true;
+ $this->write_to_file($fs_fname, $new_file);
+ return true;
}
else {
- CIP::InProcess(__("found string, no add script"), __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'noblock');
+ CIP::InProcess(__("found string, no add script"), __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'noblock');
}
}
else return false;
@@ -501,20 +383,20 @@
else $fpart = "<?php " . $fpart . " ?>";
if ($position === false) {
- CIP::InProcess(__("couldnt find text") . ": " . nl2br(htmlentities($fpart)) .
- "</p>" . ('in the file text') . $fs_fname, __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'block');
- return false;
-// $output .= "<p class=\"error\">" . COULDNT_FIND_TEXT . ": " . nl2br(htmlentities($fpart)) .
- "</p>" . IN_THE_FILE_TEXT . $fs_fname . '</div>';
- } else {
- $length = strlen($fpart);
- $new_file = substr_replace($old_file, '', $position, $length);
- $this->write_to_file($fs_fname, $new_file);
- return true;
+ CIP::InProcess(__("couldnt find text") . ": " . nl2br(htmlentities($fpart)) .
+ "</p>" . ('in the file text') . $fs_fname, __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'block');
+ return false;
+ "</p>" . IN_THE_FILE_TEXT . $fs_fname . '</div>';
+ }
+ else {
+ $length = strlen($fpart);
+ $new_file = substr_replace($old_file, '', $position, $length);
+ $this->write_to_file($fs_fname, $new_file);
+ return true;
}
}
else return false;
-// $messageStack->add(FILE_NOT_EXISTS_TEXT . ": " . $fs_fname);
+
}
function replace_dbprefix($txt){
@@ -526,8 +408,8 @@
if ($text) {
if (CIP::was_unpacked() && CIP::is_unpacked())ci_remove(DIR_FS_CIP.'/'.$this->contrib);
else {
- CIP::InProcess($text."<br><<i>".$this->get_tag_name()."> #".$this->get_id(). " ".$this->depend, __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'block');
- return false;
+ CIP::InProcess($text."<br><<i>".$this->get_tag_name()."> #".$this->get_id(). " ".$this->depend, __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'block');
+ return false;
}
// return CIP::$error=$messageStack->add($text.
// "<br><<i>".$this->get_tag_name()."> #".$this->get_id(). " ".$this->depend. "</i>" , 'error');
@@ -548,7 +430,7 @@
}
/**
- Checksum 2 files
+ @brief Checksum 2 files
@return bool
*/
function equal_files($file1, $file2) {
@@ -568,10 +450,10 @@
if(is_object($xml_data)){
$obj = $xml_data->getElementsByTagName($tagname);
if(is_object($obj))
- if(is_object($obj->item($tagpos))){
- $rret = $obj->item($tagpos);
- return $rret->getAttribute($attrname);
- }
+ if(is_object($obj->item($tagpos))){
+ $rret = $obj->item($tagpos);
+ return $rret->getAttribute($attrname);
+ }
}
return $defval;
}
@@ -588,11 +470,10 @@
if(is_object($xml_data)){
$obj = $xml_data->getElementsByTagName($tagname);
if(is_object($obj))
- if(is_object($obj->item($tagpos))){
- $rret = $obj->item($tagpos);
-// return $rret->getText();
- return trim($rret->nodeValue);
- }
+ if(is_object($obj->item($tagpos))){
+ $rret = $obj->item($tagpos);
+ return trim($rret->nodeValue);
+ }
}
return $defval;
}
@@ -607,19 +488,21 @@
Rep /tmp
*/
function add_log(){
-// global $messageStack;
// if(!_cst_bool('USE_LOG_SYSTEM')) return;
$tag_data='';
$file_log=DIR_FS_ROOT_DOCS.'admin/'.DIR_LOGS.'cip_'.$this->contrib.'.log';
if($this->data==null) return false;
foreach($this->data as $key=>$value) {
if(is_array($value)) {
- $tag_data.="\r\n".$key." (Array):";
- foreach($value as $ky=>$val) $tag_data.= "\r\n".$ky."=>".$this->linebreak_view($val)."\r\n";
- } elseif ($value) {
- if($this->linebreak_view($value)==$value) {
- $tag_data.= "\r\n".$key.": ".$this->linebreak_view($value);
- } else $tag_data.= "\r\n".$key.":\r\n".$this->linebreak_view($value);
+ $tag_data.="\r\n".$key." (Array):";
+ foreach($value as $ky=>$val)
+ $tag_data.= "\r\n".$ky."=>".$this->linebreak_view($val)."\r\n";
+ }
+ elseif ($value) {
+ if($this->linebreak_view($value)==$value)
+ $tag_data.= "\r\n".$key.": ".$this->linebreak_view($value);
+ else
+ $tag_data.= "\r\n".$key.":\r\n".$this->linebreak_view($value);
}
}
$deb=(file_exists($file_log) )?file_get_contents($file_log) : '';
@@ -627,7 +510,6 @@
$fp=fopen($file_log,'w+');
fwrite($fp,$deb.$this->get_contrib()."\r\n".$this->get_tag_name()."#".$this->get_id()."\r\n". $tag_data);
fclose($fp);
-// $messageStack->add_log($this->get_contrib()."\r\n".$this->get_tag_name()."#".$this->get_id()."\r\n". $tag_data);
}
@@ -638,14 +520,15 @@
foreach ($lines as $line){
$line = trim($line);
if($i==0){
- $pos = strpos($line,'/* Begin');
- if($pos !== false)
- $tt .= '\/\* Begin [^-]* - installed by Contrib_Installer[^\*]* \*\/[\s]*';
- else
- $tt .= preg_quote($line).'[\s]*';
- }else{
- $tt .= preg_quote($line).'[\s]*';
+ $pos = strpos($line,'/* Begin');
+ if($pos !== false)
+ $tt .= '\/\* Begin [^-]* - installed by Contrib_Installer[^\*]* \*\/[\s]*';
+ else
+ $tt .= preg_quote($line).'[\s]*';
}
+ else{
+ $tt .= preg_quote($line).'[\s]*';
+ }
if(strlen($line)>0)$i++;
}
$tt = substr($tt,0,-5).")";
Modified: trunk/catalog/admin/includes/exts/package/tags/add2end.php
===================================================================
--- trunk/catalog/admin/includes/exts/package/tags/add2end.php 2012-04-15 13:43:19 UTC (rev 4239)
+++ trunk/catalog/admin/includes/exts/package/tags/add2end.php 2012-04-15 14:30:35 UTC (rev 4240)
@@ -1,11 +1,11 @@
<?php
/**
@licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @original author Made by Imrich Schindler <ischindl at progis.sk>
@portion code Copyright (c) 2002 osCommerce
- @original author Made by Imrich Schindler <ischindl at progis.sk>
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 02/01/2012, 18:17
+ @date 11/04/2012, 18:17
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class Tc_add2end
@@ -110,12 +110,22 @@
/**-----------------------------EXE--------------------------- */
+ /**
+ @fn do_install()
+ @brief Insert all info about requirements of this CIP
+ @return none
+ */
function do_install() {
if(!$this->add_file_end($this->data['filename'],$this->add_str($this->data['add']))) return false;
return true;
}
+ /**
+ @fn do_remove()
+ @brief Remove all info about requirements of this CIP
+ @return none
+ */
function do_remove() {
if(!$this->remove_file_part($this->data['filename'],$this->add_str($this->data['add'])))
return false;
Modified: trunk/catalog/admin/includes/exts/package/tags/add2endlg.php
===================================================================
--- trunk/catalog/admin/includes/exts/package/tags/add2endlg.php 2012-04-15 13:43:19 UTC (rev 4239)
+++ trunk/catalog/admin/includes/exts/package/tags/add2endlg.php 2012-04-15 14:30:35 UTC (rev 4240)
@@ -1,9 +1,9 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 19/12/10, 18:52
+ @version 2.1.1
+ @date 11/04/2012, 18:17
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class Tc_add2endlg
@@ -118,16 +118,23 @@
/**-----------------------------EXE--------------------------- */
+ /**
+ @fn do_install()
+ @brief Insert all info about requirements of this CIP
+ @return none
+ */
function do_install() {
-
for($i = 0; $i < count($this->data['filename']);$i++){
if(!$this->add_file_end($this->data['filename'][$i],$this->add_str($this->data['add'][$i]))) return false;
}
-
return true;
-
}
+ /**
+ @fn do_remove()
+ @brief Remove all info about requirements of this CIP
+ @return none
+ */
function do_remove() {
for($i = 0; $i < count($this->data['filename']);$i++){
if(!$this->remove_file_part($this->data['filename'][$i],$this->add_str($this->data['add'][$i]))) return false;
Modified: trunk/catalog/admin/includes/exts/package/tags/addfile.php
===================================================================
--- trunk/catalog/admin/includes/exts/package/tags/addfile.php 2012-04-15 13:43:19 UTC (rev 4239)
+++ trunk/catalog/admin/includes/exts/package/tags/addfile.php 2012-04-15 14:30:35 UTC (rev 4240)
@@ -1,12 +1,12 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@original author Vlad Savitsky
@Support: http://forums.oscommerce.com/index.php?showuser=20490, http://forums.oscommerce.com/index.php?showtopic=156667
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 03/01/12, 08:07
+ @date 11/04/2012, 18:17
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class Tc_addfile
@@ -196,6 +196,11 @@
/**-----------------------------EXE--------------------------- */
+ /**
+ @fn do_install()
+ @brief Insert all info about requirements of this CIP
+ @return none
+ */
public function do_install() {
if (!CIP::check_bylevel(1)) return false;
@@ -249,6 +254,11 @@
return true;
}
+ /**
+ @fn do_remove()
+ @brief Remove all info about requirements of this CIP
+ @return none
+ */
public function do_remove() {
foreach($this->data['filename'] as $file){
$fs_file=replace_path_admin($file);
Modified: trunk/catalog/admin/includes/exts/package/tags/addfilelg.php
===================================================================
--- trunk/catalog/admin/includes/exts/package/tags/addfilelg.php 2012-04-15 13:43:19 UTC (rev 4239)
+++ trunk/catalog/admin/includes/exts/package/tags/addfilelg.php 2012-04-15 14:30:35 UTC (rev 4240)
@@ -1,9 +1,9 @@
<?php
/**
- @licence GPL 2005-2009 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
@package oscss-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 19/12/10, 15:38
+ @version 2.1.1
+ @date 11/04/2012, 18:17
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class Tc_addfilelg
@@ -97,6 +97,11 @@
}
+ /**
+ @fn do_install()
+ @brief Insert all info about requirements of this CIP
+ @return none
+ */
public function do_install() {
if (!CIP::check_bylevel(1)) return false;
@@ -106,30 +111,30 @@
//! si element de langueu absnet, remplace par celui de reference, cf attributes lgref
if (!file_exists($cip_file))
- $cip_file=DIR_FS_CIP.$this->contrib.'/'. str_replace($this->data['lgfile'][$i] ,$this->data['lgref'][$i],$this->data['srcdir'][$i].'/'.$this->data['filename'][$i]);
+ $cip_file=DIR_FS_CIP.$this->contrib.'/'. str_replace($this->data['lgfile'][$i] ,$this->data['lgref'][$i],$this->data['srcdir'][$i].'/'.$this->data['filename'][$i]);
if (is_file($fs_filename)) {
- //!if file is copied
- if($this->equal_files($cip_file,$fs_filename)){
- CIP::InProcess("Run time : ".__('les fichiers sont identique ok! sortie pour ').$fs_filename, __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'info');
- continue;
- }
+ //!if file is copied
+ if($this->equal_files($cip_file,$fs_filename)){
+ CIP::InProcess("Run time : ".__('les fichiers sont identique ok! sortie pour ').$fs_filename, __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'info');
+ continue;
+ }
- /**
- If file exists we should backup them. Later we could restore him.
- If we couldn't backup we should print an error and stop.
- If Total_Backup havn't been done we should do it.
- */
- if (_cst_bool('ALLOW_FILES_BACKUP')) parent::backup_file(replace_path_admin($this->data['filename'][$i]));
+ /**
+ If file exists we should backup them. Later we could restore him.
+ If we couldn't backup we should print an error and stop.
+ If Total_Backup havn't been done we should do it.
+ */
+ if (_cst_bool('ALLOW_FILES_BACKUP')) parent::backup_file(replace_path_admin($this->data['filename'][$i]));
- if(!ci_remove($this->fs_filename($i)))CIP::InProcess("Run time error: ".__('impossible supprimer ce fichier ').$fs_filename, __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'info');
+ if(!ci_remove($this->fs_filename($i)))CIP::InProcess("Run time error: ".__('impossible supprimer ce fichier ').$fs_filename, __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'info');
}
//! We copy file to right location:
if(!fileUtility::_copy($cip_file, $fs_filename)) {
- CIP::InProcess("Run time error: ".__('couldnt copy to text')."<br /> original:: ".$cip_file."<br /> copy:: ".$fs_filename, __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'block');
- trigger_error(__CLASS__.sprintf(' error %s', __FUNCTION__), E_USER_ERROR);
- return false;
+ CIP::InProcess("Run time error: ".__('couldnt copy to text')."<br /> original:: ".$cip_file."<br /> copy:: ".$fs_filename, __CLASS__.'->'.__FUNCTION__.'::'.__LINE__,'block');
+ trigger_error(__CLASS__.sprintf(' error %s', __FUNCTION__), E_USER_ERROR);
+ return false;
}
if (file_exists($fs_filename))chmod($fs_filename, 0777);
@@ -138,19 +143,23 @@
return true;
}
+ /**
+ @fn do_remove()
+ @brief Remove all info about requirements of this CIP
+ @return none
+ */
public function do_remove() {
foreach($this->data['filename'] as $file){
$fs_file=replace_path_admin($file);
-// if(!in_array($this->get_fs_filename($file) ,self::$Exceptions)){
- $backup_file=DIR_FS_BACKUP.$this->contrib.'/'.$file;
- if (_cst_bool('ALLOW_FILES_RESTORE') && file_exists($backup_file) && !dir($backup_file) ){
- if(!parent::restore_file($file)) return false;
- }
- else{
- if(!ci_remove(DIR_FS_CATALOG.$fs_file)) return false;
- }
-
-// }
+ $backup_file=DIR_FS_BACKUP.$this->contrib.'/'.$file;
+ if (_cst_bool('ALLOW_FILES_RESTORE') && file_exists($backup_file) && !dir($backup_file) ){
+ if(!parent::restore_file($file))
+ return false;
+ }
+ else{
+ if(!ci_remove(DIR_FS_CATALOG.$fs_file))
+ return false;
+ }
}
return true;
}
Modified: trunk/catalog/admin/includes/exts/package/tags/addfilename.php
===================================================================
--- trunk/catalog/admin/includes/exts/package/tags/addfilename.php 2012-04-15 13:43:19 UTC (rev 4239)
+++ trunk/catalog/admin/includes/exts/package/tags/addfilename.php 2012-04-15 14:30:35 UTC (rev 4240)
@@ -1,11 +1,11 @@
<?php
/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@portion
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 06/09/11, 14:16
+ @date 11/04/2012, 18:17
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@author original by Imrich Scindler
@encode UTF-8
@@ -55,7 +55,11 @@
public function conflicts_check_for_remove() { return true; }
-
+ /**
+ @fn do_install()
+ @brief Insert all info about requirements of this CIP
+ @return none
+ */
function do_install() {
$tblrowsa = "";
$tblrows = "";
@@ -86,37 +90,43 @@
return $this->error;
}
- function do_remove() {
- $tblrowsa = "";
- $tblrows = "";
- $output='';
- for($i=0;$i < count($this->data['name']); $i++){
- $def = $this->data['filename'][$i];
- $val = $this->data['name'][$i];
- $pos = strpos($def, "FILENAME_");
- if ($pos !== false) {
- $def = substr($def, 9);
- }
- $pos = strpos($val, ".php");
- if ($pos > 0) {
- $val = substr($val, 0, $pos);
- }
- if ($this->data['dir'][$i]== 'admin'){
- $tblrowsa .= " define('CONTENT_" . $def . "','" . $val . "');\n";
- $tblrowsa .= " define('FILENAME_" . $def . "',CONTENT_" . $def . ".'.php');\n";
- }else{
- $tblrows .= " define('CONTENT_" . $def . "','" . $val . "');\n";
- $tblrows .= " define('FILENAME_" . $def . "',CONTENT_" . $def . ".'.php');\n";
- }
- }
- if ($tblrows != '')
- $output .= $this->remove_file_part("includes/filenames.php", $this->linebreak_fixing("\n" . $this->comment_string($tblrows)));
- if ($tblrowsa != '')
- $output .= $this->remove_file_part(replace_path_admin("admin/includes/filenames.php"), $this->linebreak_fixing("\n" . $this->comment_string($tblrowsa)));
- return $this->error;
+ /**
+ @fn do_remove()
+ @brief Remove all info about requirements of this CIP
+ @return none
+ */
+ function do_remove() {
+ $tblrowsa = "";
+ $tblrows = "";
+ $output='';
+ for($i=0;$i < count($this->data['name']); $i++){
+ $def = $this->data['filename'][$i];
+ $val = $this->data['name'][$i];
+ $pos = strpos($def, "FILENAME_");
+ if ($pos !== false) {
+ $def = substr($def, 9);
+ }
+ $pos = strpos($val, ".php");
+ if ($pos > 0) {
+ $val = substr($val, 0, $pos);
+ }
+ if ($this->data['dir'][$i]== 'admin'){
+ $tblrowsa .= " define('CONTENT_" . $def . "','" . $val . "');\n";
+ $tblrowsa .= " define('FILENAME_" . $def . "',CONTENT_" . $def . ".'.php');\n";
+ }else{
+ $tblrows .= " define('CONTENT_" . $def . "','" . $val . "');\n";
+ $tblrows .= " define('FILENAME_" . $def . "',CONTENT_" . $def . ".'.php');\n";
+ }
+ }
+
+ if ($tblrows != '')
+ $output .= $this->remove_file_part("includes/filenames.php", $this->linebreak_fixing("\n" . $this->comment_string($tblrows)));
+ if ($tblrowsa != '')
+ $output .= $this->remove_file_part(replace_path_admin("admin/includes/filenames.php"), $this->linebreak_fixing("\n" . $this->comment_string($tblrowsa)));
+
+ return $this->error;
}
-
}
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/exts/package/tags/addlangdef.php
===================================================================
--- trunk/catalog/admin/includes/exts/package/tags/addlangdef.php 2012-04-15 13:43:19 UTC (rev 4239)
+++ trunk/catalog/admin/includes/exts/package/tags/addlangdef.php 2012-04-15 14:30:35 UTC (rev 4240)
@@ -1,11 +1,11 @@
<?php
/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@portion
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 06/09/11, 14:16
+ @date 11/04/2012, 18:17
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@author original by Imrich Scindler
@encode UTF-8
@@ -79,9 +79,13 @@
}
}
}
- function do_remove() {
- return $this->do_install('remove');
- }
+
+
+ /**
+ @fn do_install()
+ @brief Insert all info about requirements of this CIP
+ @return none
+ */
function do_install($action = 'install') {
global $message;
$tblrowsa = array ();
@@ -106,7 +110,16 @@
return $this->error;
}
+ /**
+ @fn do_remove()
+ @brief Remove all info about requirements of this CIP
+ @return none
+ */
+ function do_remove() {
+ return $this->do_install('remove');
+ }
+
public function permissions_check_for_install() { parent::$error=false; return true; }
public function conflicts_check_for_install() {parent::$error=false; return true; }
public function permissions_check_for_remove() { parent::$error=false; return true; }
Modified: trunk/catalog/admin/includes/exts/package/tags/config.php
===================================================================
--- trunk/catalog/admin/includes/exts/package/tags/config.php 2012-04-15 13:43:19 UTC (rev 4239)
+++ trunk/catalog/admin/includes/exts/package/tags/config.php 2012-04-15 14:30:35 UTC (rev 4240)
@@ -6,7 +6,7 @@
@Support: http://forums.oscommerce.com/index.php?showuser=20490, http://forums.oscommerce.com/index.php?showtopic=156667
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 11/04/2012, 18:07
+ @date 11/04/2012, 18:17
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class Tc_config
@@ -151,6 +151,11 @@
/**-----------------------------EXE--------------------------- */
+ /**
+ @fn do_install()
+ @brief Insert all info about requirements of this CIP
+ @return none
+ */
function do_install() {
$DB=Database::getInstance();
$rs = $DB->query("select configuration_id from " . TABLE_CONFIGURATION . " where configuration_key='" . $this->data['key'] . "'");
@@ -172,8 +177,8 @@
" . ($this->data['set_function'] == NULL ? "NULL" : "'".$this->data['set_function']."'") . "
)";
if(!$DB->query($query)){
- CIP::InProcess(__('erreur insert into ').TABLE_CONFIGURATION.' '.$this->data['key'].__('requete').'<br />'.$query, __CLASS__.'->'.__FUNCTION__,'block');;
- return false;
+ CIP::InProcess(__('erreur insert into ').TABLE_CONFIGURATION.' '.$this->data['key'].__('requete').'<br />'.$query, __CLASS__.'->'.__FUNCTION__,'block');;
+ return false;
}
}
else CIP::InProcess(__('configuration key deja existante ::').$this->data['key'], __CLASS__.'->'.__FUNCTION__,'noblock');
@@ -181,7 +186,11 @@
return true;
}
-
+ /**
+ @fn do_remove()
+ @brief Remove all info about requirements of this CIP
+ @return none
+ */
function do_remove() {
$DB=Database::getInstance();
$rs = $DB->query("select configuration_id from " . TABLE_CONFIGURATION . " where configuration_key='" . $this->data['key'] . "'");
Modified: trunk/catalog/admin/includes/exts/package/tags/depend.php
===================================================================
--- trunk/catalog/admin/includes/exts/package/tags/depend.php 2012-04-15 13:43:19 UTC (rev 4239)
+++ trunk/catalog/admin/includes/exts/package/tags/depend.php 2012-04-15 14:30:35 UTC (rev 4240)
@@ -4,7 +4,7 @@
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 03/01/12, 08:07
+ @date 11/04/2012, 18:17
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@portion code by Imrich Schindler <ischindl at progis.sk>
@@ -134,7 +134,11 @@
}
- //===============================================================
+ /**
+ @fn do_install()
+ @brief Insert all info about requirements of this CIP
+ @return none
+ */
function do_install() {
//!Mise a niveau table des dependance
@@ -150,6 +154,11 @@
return true;
}
+ /**
+ @fn do_remove()
+ @brief Remove all info about requirements of this CIP
+ @return none
+ */
function do_remove() {
//!Mise a niveau table des dependance
@@ -159,13 +168,16 @@
//! boucle install sous tag dependance
foreach ($this->contrib_data as $tag)
if ( $tag->do_remove() ===false){
- CIP::InProcess(__("Erreur durant traitement de cette fonction "),'tag_xml-['.$id.']'. $tag->tag_name.'->do_remove()','block');
- break;
+ CIP::InProcess(__("Erreur durant traitement de cette fonction "),'tag_xml-['.$id.']'. $tag->tag_name.'->do_remove()','block');
+ break;
}
return true;
}
+
+
+
function getSubTags($mtag){
$tagcnt = array();
foreach ($mtag->childNodes as $id=>$tag_data) {
Modified: trunk/catalog/admin/includes/exts/package/tags/description.php
===================================================================
--- trunk/catalog/admin/includes/exts/package/tags/description.php 2012-04-15 13:43:19 UTC (rev 4239)
+++ trunk/catalog/admin/includes/exts/package/tags/description.php 2012-04-15 14:30:35 UTC (rev 4240)
@@ -5,7 +5,7 @@
@original author Vlad Savitsky
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 02/01/2012, 18:17
+ @date 11/04/2012, 18:17
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class Tc_description
@@ -148,7 +148,18 @@
/**-----------------------------EXE--------------------------- */
+ /**
+ @fn do_install()
+ @brief Insert all info about requirements of this CIP
+ @return none
+ */
public fun...
[truncated message content] |
|
From: <os...@us...> - 2012-04-15 13:43:25
|
Revision: 4239
http://oscss.svn.sourceforge.net/oscss/?rev=4239&view=rev
Author: oscim
Date: 2012-04-15 13:43:19 +0000 (Sun, 15 Apr 2012)
Log Message:
-----------
Added Paths:
-----------
trunk/catalog/Documents/admin/origin/db/install/data/
trunk/catalog/Documents/admin/origin/db/install/tables/
trunk/catalog/Documents/admin/origin/db/remove/data/
trunk/catalog/Documents/admin/origin/db/remove/tables/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-15 09:24:47
|
Revision: 4238
http://oscss.svn.sourceforge.net/oscss/?rev=4238&view=rev
Author: oscim
Date: 2012-04-15 09:24:41 +0000 (Sun, 15 Apr 2012)
Log Message:
-----------
dossier actions
Added Paths:
-----------
trunk/catalog/Documents/admin/origin/db/install/
trunk/catalog/Documents/admin/origin/db/remove/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-15 08:43:55
|
Revision: 4237
http://oscss.svn.sourceforge.net/oscss/?rev=4237&view=rev
Author: oscim
Date: 2012-04-15 08:43:48 +0000 (Sun, 15 Apr 2012)
Log Message:
-----------
Mise a niveau du code
suppression element obsolete, ajout element de lanque fr manquant
Ajustement css
Modified Paths:
--------------
trunk/extensions/ATTRIBUTEMANAGER_stable/attributeManager/attributeManager.php
trunk/extensions/ATTRIBUTEMANAGER_stable/attributeManager/css/attributeManager.css
trunk/extensions/ATTRIBUTEMANAGER_stable/attributeManager/languages/fr_FR/attributeManager.php
trunk/extensions/ATTRIBUTEMANAGER_stable/attributeManager.zip
Modified: trunk/extensions/ATTRIBUTEMANAGER_stable/attributeManager/attributeManager.php
===================================================================
--- trunk/extensions/ATTRIBUTEMANAGER_stable/attributeManager/attributeManager.php 2012-04-15 07:24:26 UTC (rev 4236)
+++ trunk/extensions/ATTRIBUTEMANAGER_stable/attributeManager/attributeManager.php 2012-04-15 08:43:48 UTC (rev 4237)
@@ -163,10 +163,10 @@
$numValues = count($optionInfo['values']); ?>
<tr class="option">
<td align="center">
- <input type="image" border="0" id="show_hide_<?php echo $optionId; ?>" src="<?php echo DIR_WS_ICONS ?>icon_plus.gif" onclick="return amShowHideOptionsValues(<?php echo $optionId; ?>);" />
+ <input type="image" border="0" id="show_hide_<?php echo $optionId; ?>" src="<?php echo DIR_WS_ICONS ?>icon_plus.gif" onclick="return amShowHideOptionsValues(<?php echo $optionId; ?>);" />
</td>
<td>
- <?php echo "{$optionInfo['name']} ($numValues) type:".translate_type_to_name($optionInfo['type']);?>
+ <?php echo "{$optionInfo['name']} ($numValues) type:".translate_type_to_name($optionInfo['type']);?>
</td>
<td align="right">
@@ -186,93 +186,101 @@
<?php } ?>
</td>
</tr>
-<?php /**
-
- Info type options
-
-*/?>
+<?php /** Info type options */?>
<tr class="optionValue">
- <td align="center">
-
- </td>
- <td>
+ <td colspan="2">
<?php if(_cst_bool('STOCK_CHECK') )
- echo __('am track stock'). " : ".(($optionInfo['stock']==1)?tep_image(DIR_WS_ICONS . 'icon_status_green.gif', IMAGE_ICON_STATUS_GREEN) : tep_image(DIR_WS_ICONS . 'icon_status_red.gif', IMAGE_ICON_STATUS_RED)) .' - ';
+ echo AM_TRACK_STOCK. " : ".(($optionInfo['stock']==1)?tep_image(DIR_WS_ICONS . 'icon_status_green.gif', IMAGE_ICON_STATUS_GREEN) : tep_image(DIR_WS_ICONS . 'icon_status_red.gif', IMAGE_ICON_STATUS_RED)) .' - ';
- echo __('am champs de type')." :".translate_type_to_name($optionInfo['type']).
- (($optionInfo['type']==4)? ' - '.__('am champs longueur max').' : '.$optionInfo['length']: '') ;?>
+ echo AM_TYPE_INPUT." :".translate_type_to_name($optionInfo['type']).
+ (($optionInfo['type']==4)? ' - '.AM_TYPE_INPUT_TEXT_MAX.' : '.$optionInfo['length']: '') ;?>
</td>
<td align="right">
- <?php if($TypeProduct==1) { ?>
- <span style="margin-right:71px;">
- Poids
- </span>
- <?php } ?>
- <span style="margin-right:141px;">
- Price
- </span>
+ <?php if(AM_USE_URLIMG && $optionInfo['img_supp']) : ?>
+ <span class="inlineblock">
+ <?php echo ADJUST_IMG_SUPP ?>
+ </span>
+ <?php endif; ?>
+ <?php if(AM_USE_DOWNLOAD): ?>
+ <span class="inlineblock">
+ <?php echo ADJUST_LINK_DOWNLOAD ?>
+ </span>
+ <?php endif; ?>
+ <?php if(!in_array($TypeProduct, explode(',', TYPE_VIRTUAL_PRODUCTS))): ?>
+ <span class="inlineblock" style="width:80px">
+ <?php echo ADJUST_PRODUCT_PHYSICAL_WEIGHT ?>
+ </span>
+ <?php endif; ?>
+ <span class="inlineblock" style="width:95px">
+ <?php echo ADJUST_PRICE ?>
+ </span>
+
+ <span class="inlineblock" style="width:25px"></span>
</td>
</tr>
-<?php /**
-
- Show Option Values
-
-*/?>
+<?php /** Show Option Values */?>
<?php if(0 < $numValues):
foreach($optionInfo['values'] as $optionValueId => $optionValueInfo): ?>
- <tr class="optionValue" id="trOptionsValues_<?php echo $optionId; ?>" style="display:none" >
- <td align="center">
- <img src="<?php echo DIR_WS_ICONS ?>icon_arrow.gif" />
- </td>
- <td>
+ <tr class="optionValue childs" id="trOptionsValues_<?php echo $optionId; ?>" style="display:none" >
+ <td colspan="2">
<?php /** URL IMAGES Pour remplacement texte option */ ?>
<?php if(AM_USE_COLOR && $optionInfo['img_supp'] ) { ?>
- <?php if($optionValueInfo['thumb'] !=''){ ?>
- <input type="image" border="0" onclick="return customPrompt('amEditthumbForProduct','<?php echo addslashes('option_id:' . $optionId . '|products_attributes_thumb:' . $optionValueInfo['thumb'] . '|option_value_name:'.str_replace('"','"',$optionValueInfo['name'] .'|option_value_id:'.$optionValueId))?>');" src="<?php echo DIR_WS_ICONS ?>icon_down_edit.png" title="<?php echo htmlspecialchars(sprintf(AM_AJAX_COLOR_EDIT,$optionValueInfo['name'],$optionInfo['name'])) ?>" />
- <input type="image" border="0" onclick="return customPrompt('amDeletethumbForProduct','<?php echo addslashes('option_id:' . $optionId . '|option_value_name:'.str_replace('"','"',$optionValueInfo['name']) .'|option_value_id:'.$optionValueId)?>');" src="<?php echo DIR_WS_ICONS ?>icon_down_delete.png" title="<?php echo htmlspecialchars(sprintf(AM_AJAX_COLOR_DELETE,$optionValueInfo['name'],$optionInfo['name'])) ?>" style="margin-right: 30px;" />
- <?php } else { ?>
- <input type="image" border="0" onclick="return customPrompt('amAddNewthumbForProduct','<?php echo addslashes('option_id:' . $optionId .'|option_value_id:'.$optionValueId . '|option_value_name:'.str_replace('"','"',$optionValueInfo['name']).'|option_value_id:'.$optionValueId)?>');" src="<?php echo DIR_WS_ICONS ?>icon_download.png" title="<?php echo htmlspecialchars(sprintf(AM_AJAX_COLOR_ADD_NEW,$optionValueInfo['name'],$optionInfo['name'])) ?>" style="margin-right: 30px;" />
- <?php } ?>
+ <?php if($optionValueInfo['thumb'] !=''){ ?>
+ <input type="image" border="0" onclick="return customPrompt('amEditthumbForProduct','<?php echo addslashes('option_id:' . $optionId . '|products_attributes_thumb:' . $optionValueInfo['thumb'] . '|option_value_name:'.str_replace('"','"',$optionValueInfo['name'] .'|option_value_id:'.$optionValueId))?>');" src="<?php echo DIR_WS_ICONS ?>icon_down_edit.png" title="<?php echo htmlspecialchars(sprintf(AM_AJAX_COLOR_EDIT,$optionValueInfo['name'],$optionInfo['name'])) ?>" />
+ <input type="image" border="0" onclick="return customPrompt('amDeletethumbForProduct','<?php echo addslashes('option_id:' . $optionId . '|option_value_name:'.str_replace('"','"',$optionValueInfo['name']) .'|option_value_id:'.$optionValueId)?>');" src="<?php echo DIR_WS_ICONS ?>icon_down_delete.png" title="<?php echo htmlspecialchars(sprintf(AM_AJAX_COLOR_DELETE,$optionValueInfo['name'],$optionInfo['name'])) ?>" />
+ <?php } else { ?>
+ <input type="image" border="0" onclick="return customPrompt('amAddNewthumbForProduct','<?php echo addslashes('option_id:' . $optionId .'|option_value_id:'.$optionValueId . '|option_value_name:'.str_replace('"','"',$optionValueInfo['name']).'|option_value_id:'.$optionValueId)?>');" src="<?php echo DIR_WS_ICONS ?>icon_download.png" title="<?php echo htmlspecialchars(sprintf(AM_AJAX_COLOR_ADD_NEW,$optionValueInfo['name'],$optionInfo['name'])) ?>" />
+ <?php } ?>
<?php } ?>
<?php echo $optionValueInfo['name']; ?>
</td>
<td align="right">
<?php /** URL IMAGES */ ?>
- <?php if(AM_USE_URLIMG && $optionInfo['img_supp']) { ?>
- <?php if($optionValueInfo['urlimg'] !=''){ /** URL IMAGES */ ?>
- <input type="image" border="0" onclick="return customPrompt('amEditurlimgForProduct','<?php echo addslashes('option_id:' . $optionId . '|products_attributes_urlimg:' . $optionValueInfo['urlimg'] . '|option_value_name:'.str_replace('"','"',$optionValueInfo['name'] .'|products_attributes_id:'.$optionValueInfo['products_attributes_id']))?>');" src="<?php echo DIR_WS_ICONS ?>icon_down_edit.png" title="<?php echo htmlspecialchars(sprintf(AM_AJAX_URLIMG_EDIT,$optionValueInfo['name'],$optionInfo['name'])) ?>" />
- <input type="image" border="0" onclick="return customPrompt('amDeleteurlimgForProduct','<?php echo addslashes('option_id:' . $optionId . '|option_value_name:'.str_replace('"','"',$optionValueInfo['name']) .'|products_attributes_id:'.$optionValueInfo['products_attributes_id'])?>');" src="<?php echo DIR_WS_ICONS ?>icon_down_delete.png" title="<?php echo htmlspecialchars(sprintf(AM_AJAX_URLIMG_DELETE,$optionValueInfo['name'],$optionInfo['name'])) ?>" style="margin-right: 30px;" />
- <?php } else { ?>
- <input type="image" border="0" onclick="return customPrompt('amAddNewurlimgForProduct','<?php echo addslashes('option_id:' . $optionId .'|option_value_id:'.$optionValueId . '|option_value_name:'.str_replace('"','"',$optionValueInfo['name']).'|products_attributes_id:'.$optionValueInfo['products_attributes_id'])?>');" src="<?php echo DIR_WS_ICONS ?>icon_download.png" title="<?php echo htmlspecialchars(sprintf(AM_AJAX_URLIMG_ADD_NEW,$optionValueInfo['name'],$optionInfo['name'])) ?>" style="margin-right: 30px;" />
- <?php } ?>
- <?php } ?>
+ <?php if(AM_USE_URLIMG && $optionInfo['img_supp']) : ?>
+ <span class="inlineblock" style="top:0;">
+ <span class="button img col">
+ <?php if($optionValueInfo['urlimg'] !=''){ /** URL IMAGES */ ?>
+ <input type="image" border="0" onclick="return customPrompt('amEditurlimgForProduct','<?php echo addslashes('option_id:' . $optionId . '|products_attributes_urlimg:' . $optionValueInfo['urlimg'] . '|option_value_name:'.str_replace('"','"',$optionValueInfo['name'] .'|products_attributes_id:'.$optionValueInfo['products_attributes_id']))?>');" src="<?php echo DIR_WS_ICONS ?>icon_down_edit.png" title="<?php echo htmlspecialchars(sprintf(AM_AJAX_URLIMG_EDIT,$optionValueInfo['name'],$optionInfo['name'])) ?>" />
+ <input type="image" border="0" onclick="return customPrompt('amDeleteurlimgForProduct','<?php echo addslashes('option_id:' . $optionId . '|option_value_name:'.str_replace('"','"',$optionValueInfo['name']) .'|products_attributes_id:'.$optionValueInfo['products_attributes_id'])?>');" src="<?php echo DIR_WS_ICONS ?>icon_down_delete.png" title="<?php echo htmlspecialchars(sprintf(AM_AJAX_URLIMG_DELETE,$optionValueInfo['name'],$optionInfo['name'])) ?>" style="margin-right: 30px;" />
+ <?php } else { ?>
+ <input type="image" border="0" onclick="return customPrompt('amAddNewurlimgForProduct','<?php echo addslashes('option_id:' . $optionId .'|option_value_id:'.$optionValueId . '|option_value_name:'.str_replace('"','"',$optionValueInfo['name']).'|products_attributes_id:'.$optionValueInfo['products_attributes_id'])?>');" src="<?php echo DIR_WS_ICONS ?>icon_download.png" title="<?php echo htmlspecialchars(sprintf(AM_AJAX_URLIMG_ADD_NEW,$optionValueInfo['name'],$optionInfo['name'])) ?>" style="margin-right: 30px;" />
+ <?php } ?>
+ </span>
+ </span>
+ <?php endif; ?>
<?php /** DOWNLOAD */ ?>
- <?php if(AM_USE_DOWNLOAD) { ?>
- <?php if($optionValueInfo['products_attributes_filename']){ /** DOWNLOAD*/ ?>
- <input type="image" border="0" onclick="return customPrompt('amEditDownloadForProduct','<?php echo addslashes('option_id:' . $optionId . '|products_attributes_filename:' . $optionValueInfo['products_attributes_filename'] . '|products_attributes_maxdays:'.$optionValueInfo['products_attributes_maxdays'] . '|products_attributes_maxcount:'.$optionValueInfo['products_attributes_maxcount'] .'|option_value_name:'.str_replace('"','"',$optionValueInfo['name'] .'|products_attributes_id:'.$optionValueInfo['products_attributes_id']))?>');" src="<?php echo DIR_WS_ICONS ?>icon_down_edit.png" title="<?php echo htmlspecialchars(sprintf(AM_AJAX_DOWLNOAD_EDIT,$optionValueInfo['name'],$optionInfo['name'])) ?>" />
- <input type="image" border="0" onclick="return customPrompt('amDeleteDownloadForProduct','<?php echo addslashes('option_id:' . $optionId . '|option_value_name:'.str_replace('"','"',$optionValueInfo['name']) .'|products_attributes_id:'.$optionValueInfo['products_attributes_id'])?>');" src="<?php echo DIR_WS_ICONS ?>icon_down_delete.png" title="<?php echo htmlspecialchars(sprintf(AM_AJAX_DOWLNOAD_DELETE,$optionValueInfo['name'],$optionInfo['name'])) ?>" style="margin-right: 30px;" />
- <?php } else { ?>
- <input type="image" border="0" onclick="return customPrompt('amAddNewDownloadForProduct','<?php echo addslashes('option_id:' . $optionId .'|option_value_id:'.$optionValueId . '|option_value_name:'.str_replace('"','"',$optionValueInfo['name']).'|products_attributes_id:'.$optionValueInfo['products_attributes_id'])?>');" src="<?php echo DIR_WS_ICONS ?>icon_download.png" title="<?php echo htmlspecialchars(sprintf(AM_AJAX_DOWLNOAD_ADD_NEW,$optionValueInfo['name'],$optionInfo['name'])) ?>" style="margin-right: 30px;" />
- <?php } ?>
- <?php } ?>
+ <?php if(AM_USE_DOWNLOAD): ?>
+ <span class="inlineblock">
+ <?php if($optionValueInfo['products_attributes_filename']){ /** DOWNLOAD*/ ?>
+ <input type="image" border="0" onclick="return customPrompt('amEditDownloadForProduct','<?php echo addslashes('option_id:' . $optionId . '|products_attributes_filename:' . $optionValueInfo['products_attributes_filename'] . '|products_attributes_maxdays:'.$optionValueInfo['products_attributes_maxdays'] . '|products_attributes_maxcount:'.$optionValueInfo['products_attributes_maxcount'] .'|option_value_name:'.str_replace('"','"',$optionValueInfo['name'] .'|products_attributes_id:'.$optionValueInfo['products_attributes_id']))?>');" src="<?php echo DIR_WS_ICONS ?>icon_down_edit.png" title="<?php echo htmlspecialchars(sprintf(AM_AJAX_DOWLNOAD_EDIT,$optionValueInfo['name'],$optionInfo['name'])) ?>" />
+ <input type="image" border="0" onclick="return customPrompt('amDeleteDownloadForProduct','<?php echo addslashes('option_id:' . $optionId . '|option_value_name:'.str_replace('"','"',$optionValueInfo['name']) .'|products_attributes_id:'.$optionValueInfo['products_attributes_id'])?>');" src="<?php echo DIR_WS_ICONS ?>icon_down_delete.png" title="<?php echo htmlspecialchars(sprintf(AM_AJAX_DOWLNOAD_DELETE,$optionValueInfo['name'],$optionInfo['name'])) ?>" style="margin-right: 30px;" />
+ <?php } else { ?>
+ <input type="image" border="0" onclick="return customPrompt('amAddNewDownloadForProduct','<?php echo addslashes('option_id:' . $optionId .'|option_value_id:'.$optionValueId . '|option_value_name:'.str_replace('"','"',$optionValueInfo['name']).'|products_attributes_id:'.$optionValueInfo['products_attributes_id'])?>');" src="<?php echo DIR_WS_ICONS ?>icon_download.png" title="<?php echo htmlspecialchars(sprintf(AM_AJAX_DOWLNOAD_ADD_NEW,$optionValueInfo['name'],$optionInfo['name'])) ?>" style="margin-right: 30px;" />
+ <?php } ?>
+ </span>
+ <?php endif; ?>
<?php /** Weight */ ?>
- <?php if($TypeProduct==1) { ?>
- <span style="margin-right:41px;">
+ <?php if(!in_array($TypeProduct, explode(',', TYPE_VIRTUAL_PRODUCTS))) { ?>
+ <span class="inlineblock" style="width:80px">
<?php echo tep_draw_input_field("weight_$optionValueId",'',$optionValueInfo['weight'],' style="margin:3px 0px 3px 0px;" size="7" onfocus="amF(this)" onblur="amB(this)" onchange="return amUpdateWeight(\''.$optionId.'\',\''.$optionValueId.'\',\'weight\');"'); ?>
</span>
<?php } ?>
<?php /** Price */ ?>
- <span style="margin-right:41px;">
+ <span class="inlineblock" style="width:95px">
<?php echo drawDropDownPrefix('id="prefix_'.$optionValueId.'" style="margin:3px 0px 3px 0px;" onchange="return amUpdate(\''.$optionId.'\',\''.$optionValueId.'\',\'prefix\');"',$optionValueInfo['prefix']);?><?php echo tep_draw_input_field("price_$optionValueId",'',$optionValueInfo['price'],' style="margin:3px 0px 3px 0px;" size="7" onfocus="amF(this)" onblur="amB(this)" onchange="return amUpdate(\''.$optionId.'\',\''.$optionValueId.'\',\'price\');"'); ?>
</span>
<?php /** Remove */ ?>
+ <span class="button img col">
<input type="image" border="0" onclick="return customPrompt('amRemoveOptionValueFromProduct','<?php echo addslashes("option_id:$optionId|option_value_id:$optionValueId|option_value_name:".str_replace('"','"',$optionValueInfo['name']))?>');" src="<?php echo DIR_WS_ICONS ?>icon_disable.png" title="<?php echo htmlspecialchars(sprintf(AM_AJAX_PRODUCT_REMOVES_VALUE_FROM_OPTION,$optionValueInfo['name'],$optionInfo['name'])) ?>" />
+ </span>
<?php /** Sort */ ?>
<?php if(AM_USE_SORT_ORDER) { ?>
+ <span class="button img col">
<input type="image" onclick="return amMoveOptionValue('<?php echo 'option_id:'.$optionId.'|option_value_id:'.$optionValueId.'|products_attributes_id:'.$optionValueInfo['products_attributes_id']; ?>', 'up');" src="<?php echo DIR_WS_ICONS ?>icon_up.png" title="<?php echo AM_AJAX_MOVES_VALUE_UP; ?>" />
<input type="image" onclick="return amMoveOptionValue('<?php echo 'option_id:'.$optionId.'|option_value_id:'.$optionValueId.'|products_attributes_id:'.$optionValueInfo['products_attributes_id']; ?>', 'down');" src="<?php echo DIR_WS_ICONS ?>icon_down.png" title="<?php echo AM_AJAX_MOVES_VALUE_DOWN; ?>" />
<?php } ?>
+ </span>
</td>
</tr>
<?php endforeach; endif;
@@ -377,15 +385,18 @@
$option_names[$list['_option_id']]=$list['_option'];
$product_name=$list['products_name'];
}
+// print_r($options);
}
?>
<table width="100%" border="0" cellspacing="0" cellpadding="3">
<tr class="header">
<td width="50" align="center">
+ <input type="image" src="<?php echo DIR_WS_ICONS ?>icon_plus.gif" onclick="return amShowHideOptionsValues(9999,true);" border="0" />
+ <input type="image" src="<?php echo DIR_WS_ICONS ?>icon_minus.gif" onclick="return amShowHideOptionsValues(9999,false);" border="0" />
</td>
<td>
- QT Pro
+ <?php echo QTPRO_USE_FOR_STOCK ?>
</td>
<td align="right" colspan="<?php echo (sizeof($options)+2); ?>">
@@ -396,74 +407,61 @@
<td align="center">
<input type="image" border="0" id="show_hide_9999" src="<?php echo DIR_WS_ICONS ?>icon_plus.gif" onclick="return amShowHideOptionsValues(9999);" />
</td>
-<?php
- if (tep_db_num_rows($q)>0) {
-$title_num=0;
- while(list($k,$v)=each($options)) {
-?>
- <td>
- <?php echo $option_names[$k]; ?>
- </td>
-<?php
- $title[$title_num]=$k;
-$title_num++;
- }
-?>
- <td align="right">
- <span style="margin-right:41px;">
- <?php echo AM_AJAX_QUANTITY; ?>
- </span>
- </td>
- </tr>
-<?php
- $q1=tep_db_query("select * from " . TABLE_PRODUCTS_STOCK . " where products_id='" . $_GET['products_id'] . "' order by products_stock_attributes");
- while($rec=tep_db_fetch_array($q1)) {
- $val_array=explode(",",$rec['products_stock_attributes']);
-?>
- <tr class="optionValue" id="trOptionsValues_9999" style="display:none" >
- <td align="center">
- <?php echo $rec['products_stock_id']; ?>
- <img src="<?php echo DIR_WS_ICONS ?>icon_arrow.gif" />
- </td>
-<?php
- foreach($val_array as $val) {
- if (preg_match("/^(\d+)-(\d+)$/",$val,$m1)) {
-?>
- <td>
- <?php echo tep_values_name($m1[2]); ?>
- </td>
-<?php
- } else {
-?>
- <td>
-
- </td>
-<?php
- }
- }
- for($i=0;$i<sizeof($options)-sizeof($val_array);$i++) {
-?>
- <td>
-
- </td>
-<?php
- }
-?>
- <td align="right">
- <span style="margin-right:41px;">
- <?php echo tep_draw_input_field("productStockQuantity_$rec[products_stock_id]",'', $rec['products_stock_quantity'], ' style="margin:3px 0px 3px 0px;" size="4" onchange="return amUpdateProductStockQuantity(\''.$rec['products_stock_id'].'\');"'); ?>
- </span>
- <input type="image" border="0" onclick="return customPrompt('amRemoveStockOptionValueFromProduct','<?php echo addslashes("option_id:$rec[products_stock_id]")?>');" src="<?php echo DIR_WS_ICONS ?>icon_disable.png" title="<?php echo AM_AJAX_ADDS_ATTRIBUTE_TO_PRODUCT; ?>" />
- </td>
- </tr>
-<?php
- }
-?>
-<?php
- }
-?>
+ <?php if (tep_db_num_rows($q)>0): ?>
+
+ <?php $title_num=0; while(list($k,$v)=each($options)): ?>
+ <td>
+ <?php echo $option_names[$k]; ?>
+ </td>
+ <?php $title[$title_num]=$k; $title_num++; endwhile; ?>
+
+ <td align="right">
+ <span style="margin-right:41px;">
+ <?php echo AM_AJAX_QUANTITY; ?>
+ </span>
+ </td>
+ </tr>
+
+ <?php
+ $q1=tep_db_query("select * from " . TABLE_PRODUCTS_STOCK . " where products_id='" . $_GET['products_id'] . "' order by products_stock_attributes");
+ while($rec=tep_db_fetch_array($q1)) {
+ $val_array=explode(",",$rec['products_stock_attributes']); ?>
+ <tr class="optionValue" id="trOptionsValues_9999" style="display:none" >
+ <td align="center">
+ <?php echo $rec['products_stock_id']; ?>
+ <img src="<?php echo DIR_WS_ICONS ?>icon_arrow.gif" />
+ </td>
+
+ <?php foreach($val_array as $val): ?>
+ <?php if (preg_match("/^(\d+)-(\d+)$/",$val,$m1)): ?>
+ <td>
+ <?php echo tep_values_name($m1[2]); ?>
+ </td>
+ <?php else : ?>
+ <td>
+
+ </td>
+ <?php endif; ?>
+ <?php endforeach; ?>
+
+ <?php for($i=0;$i<sizeof($options)-sizeof($val_array);$i++): ?>
+ <td>
+
+ </td>
+ <?php endfor; ?>
+
+ <td align="right">
+ <span style="margin-right:41px;">
+ <?php echo tep_draw_input_field("productStockQuantity_$rec[products_stock_id]",'', $rec['products_stock_quantity'], ' style="margin:3px 0px 3px 0px;" size="4" onchange="return amUpdateProductStockQuantity(\''.$rec['products_stock_id'].'\');"'); ?>
+ </span>
+ <input type="image" border="0" onclick="return customPrompt('amRemoveStockOptionValueFromProduct','<?php echo addslashes("option_id:$rec[products_stock_id]")?>');" src="<?php echo DIR_WS_ICONS ?>icon_disable.png" title="<?php echo AM_AJAX_ADDS_ATTRIBUTE_TO_PRODUCT; ?>" />
+ </td>
+ </tr>
+ <?php } ?>
+ <?php endif; // end loop while(list($k,$v)=each($options)) ?>
</table>
+
<?php
if(!isset($_GET['target']))
echo '</div>';
Modified: trunk/extensions/ATTRIBUTEMANAGER_stable/attributeManager/css/attributeManager.css
===================================================================
--- trunk/extensions/ATTRIBUTEMANAGER_stable/attributeManager/css/attributeManager.css 2012-04-15 07:24:26 UTC (rev 4236)
+++ trunk/extensions/ATTRIBUTEMANAGER_stable/attributeManager/css/attributeManager.css 2012-04-15 08:43:48 UTC (rev 4237)
@@ -31,8 +31,42 @@
background:#fff;
}
+#attributeManager tr.optionValue.childs {
+ height: 40px;
+}
+
+span.inlineblock{
+ float: left;
+ position: relative;
+ right: 10px;
+ width:20px;
+ display:inline-block;
+ text-align:center;
+ margin:0 3px;
+ white-space: nowrap;
+}
+#attributeManager tr.optionValue.childs span.inlineblock{
+ top: 8px;
+}
+
+/* Col bouton end ligne */
+.button.img.col {
+ background: none repeat scroll 0 0 transparent;
+ border: medium none;
+ border-radius:0;
+ box-shadow:none;
+ display: inline-block;
+ margin: 4px 1px ;
+ padding: 0;
+ width: 16px;
+ height:inherit;
+ vertical-align:middle;
+}
+.button.img.col input{float:left;}
+
#attributeManager tr.optionValue td{
border-top:1px dotted #ccc;
+ vertical-align: middle;
}
#attributeManager tr.optionValue td td{
Modified: trunk/extensions/ATTRIBUTEMANAGER_stable/attributeManager/languages/fr_FR/attributeManager.php
===================================================================
--- trunk/extensions/ATTRIBUTEMANAGER_stable/attributeManager/languages/fr_FR/attributeManager.php 2012-04-15 07:24:26 UTC (rev 4236)
+++ trunk/extensions/ATTRIBUTEMANAGER_stable/attributeManager/languages/fr_FR/attributeManager.php 2012-04-15 08:43:48 UTC (rev 4237)
@@ -122,4 +122,18 @@
//-----------------------------
define('AM_AJAX_OPTION_NEW_PANEL','Nouvelle option : ');
+
+
+
+define('QTPRO_USE_FOR_STOCK','Stock');
+
+define('ADJUST_PRODUCT_PHYSICAL_WEIGHT','Poids');
+define('ADJUST_PRICE','Prix');
+define('ADJUST_IMG_SUPP','Img.');
+define('ADJUST_LINK_DOWNLOAD','Téléch.');
+
+
+define('AM_TRACK_STOCK','Suivi stock');
+define('AM_TYPE_INPUT','type de champ');
+define('AM_TYPE_INPUT_TEXT_MAX','max carat.');
?>
\ No newline at end of file
Modified: trunk/extensions/ATTRIBUTEMANAGER_stable/attributeManager.zip
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-15 07:24:33
|
Revision: 4236
http://oscss.svn.sourceforge.net/oscss/?rev=4236&view=rev
Author: oscim
Date: 2012-04-15 07:24:26 +0000 (Sun, 15 Apr 2012)
Log Message:
-----------
Mise a nievau extension
correction et oubli
Modified Paths:
--------------
trunk/extensions/SPECIALS_stable/catalog/admin/includes/modules/pages/specials.php
Added Paths:
-----------
trunk/extensions/SPECIALS_stable/catalog/admin/includes/gabarit/specials/display_view.delete.gab
Added: trunk/extensions/SPECIALS_stable/catalog/admin/includes/gabarit/specials/display_view.delete.gab
===================================================================
--- trunk/extensions/SPECIALS_stable/catalog/admin/includes/gabarit/specials/display_view.delete.gab (rev 0)
+++ trunk/extensions/SPECIALS_stable/catalog/admin/includes/gabarit/specials/display_view.delete.gab 2012-04-15 07:24:26 UTC (rev 4236)
@@ -0,0 +1,21 @@
+<?php
+/**
+ @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.0
+ @date 04/10/10, 09:50
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+?>
+<?php echo tep_draw_form('specials', specials::FILENAME, 'sID=' . specials::$sInfo->specials_id . '&action=deleteconfirm'); ?>
+ <div class="box_uniq">
+ <h3><?php echo __('text info heading delete specials') ?></h3>
+ <p><?php echo __('text info delete intro'); ?>
+ <?php echo '<strong>' . specials::$sInfo->products_name . '</strong>' ?>
+ </p></div>
+ <div class="button_nav">
+ <?php echo tep_image_submit('button_delete.gif', IMAGE_DELETE) . tep_js_back(tep_href_link(specials::FILENAME, 'sID=' . specials::$sInfo->specials_id), IMAGE_CANCEL) ?>
+ </div>
+</form>
\ No newline at end of file
Property changes on: trunk/extensions/SPECIALS_stable/catalog/admin/includes/gabarit/specials/display_view.delete.gab
___________________________________________________________________
Added: svn:executable
+ *
Modified: trunk/extensions/SPECIALS_stable/catalog/admin/includes/modules/pages/specials.php
===================================================================
--- trunk/extensions/SPECIALS_stable/catalog/admin/includes/modules/pages/specials.php 2012-04-15 07:21:38 UTC (rev 4235)
+++ trunk/extensions/SPECIALS_stable/catalog/admin/includes/modules/pages/specials.php 2012-04-15 07:24:26 UTC (rev 4236)
@@ -240,7 +240,7 @@
switch (self::$action) {
default:
- if (isset($sInfo) && is_object($sInfo)) {
+ if (isset($sInfo) && is_object($sInfo) && isset($sInfo->products_name )) {
$heading[] = array('text' => $sInfo->products_name );
$contents[] = array('text' => __('text info date added') . tep_date_short($sInfo->specials_date_added));
$contents[] = array('text' => __('text info last modified') . tep_date_short($sInfo->specials_last_modified));
@@ -268,7 +268,7 @@
private static function get_item_action($specials){
return '<span class="view fils fleft">'.
'<a class="buttonimg" href="' . tep_href_link(FILENAME_SPECIALS, 'sID=' . $specials['specials_id']. '&action=edit') . '">' . tep_image(DIR_WS_ICONS . 'icon_edit.png',IMAGE_EDIT) . '</a>'.
- ' <a class="buttonimg fancytext" href="' . tep_href_link(FILENAME_SPECIALS, 'sID=' . $specials['specials_id']. '&action=delete') . '">' . tep_image(DIR_WS_ICONS . 'icon_delete.png',IMAGE_DELETE) . '</a>'.
+ ' <a class="buttonimg fancy" href="' . tep_href_link(FILENAME_SPECIALS, 'sID=' . $specials['specials_id']. '&action=delete') . '">' . tep_image(DIR_WS_ICONS . 'icon_delete.png',IMAGE_DELETE) . '</a>'.
'</span>';
}
private static function get_item_statut($specials){
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-15 07:21:48
|
Revision: 4235
http://oscss.svn.sourceforge.net/oscss/?rev=4235&view=rev
Author: oscim
Date: 2012-04-15 07:21:38 +0000 (Sun, 15 Apr 2012)
Log Message:
-----------
Report extension in trunck
mise a niveau du code
Added Paths:
-----------
trunk/extensions/BLUE_stable/
trunk/extensions/BLUE_stable/blue/
trunk/extensions/BLUE_stable/blue/TableTools-1.css
trunk/extensions/BLUE_stable/blue/blue.png
trunk/extensions/BLUE_stable/blue/footer-1.php
trunk/extensions/BLUE_stable/blue/footer-2.php
trunk/extensions/BLUE_stable/blue/gabarit-1.php
trunk/extensions/BLUE_stable/blue/gabarit-2.php
trunk/extensions/BLUE_stable/blue/gabarit-view.php
trunk/extensions/BLUE_stable/blue/header-1.php
trunk/extensions/BLUE_stable/blue/header-2.php
trunk/extensions/BLUE_stable/blue/img/
trunk/extensions/BLUE_stable/blue/img/1/
trunk/extensions/BLUE_stable/blue/img/1/address.png
trunk/extensions/BLUE_stable/blue/img/1/administrative-docs.png
trunk/extensions/BLUE_stable/blue/img/1/advertising.png
trunk/extensions/BLUE_stable/blue/img/1/archives.png
trunk/extensions/BLUE_stable/blue/img/1/attributes.png
trunk/extensions/BLUE_stable/blue/img/1/bank.png
trunk/extensions/BLUE_stable/blue/img/1/basket.png
trunk/extensions/BLUE_stable/blue/img/1/bestseller.png
trunk/extensions/BLUE_stable/blue/img/1/bg_header.jpg
trunk/extensions/BLUE_stable/blue/img/1/billing.png
trunk/extensions/BLUE_stable/blue/img/1/bookmark.png
trunk/extensions/BLUE_stable/blue/img/1/brainstorming.png
trunk/extensions/BLUE_stable/blue/img/1/business-contact.png
trunk/extensions/BLUE_stable/blue/img/1/busy.png
trunk/extensions/BLUE_stable/blue/img/1/calendar.png
trunk/extensions/BLUE_stable/blue/img/1/category.png
trunk/extensions/BLUE_stable/blue/img/1/check.png
trunk/extensions/BLUE_stable/blue/img/1/collaboration.png
trunk/extensions/BLUE_stable/blue/img/1/comment.png
trunk/extensions/BLUE_stable/blue/img/1/communication.png
trunk/extensions/BLUE_stable/blue/img/1/config.png
trunk/extensions/BLUE_stable/blue/img/1/consulting.png
trunk/extensions/BLUE_stable/blue/img/1/contact.png
trunk/extensions/BLUE_stable/blue/img/1/cost.png
trunk/extensions/BLUE_stable/blue/img/1/credit-card.png
trunk/extensions/BLUE_stable/blue/img/1/credit.png
trunk/extensions/BLUE_stable/blue/img/1/current-work.png
trunk/extensions/BLUE_stable/blue/img/1/customers.png
trunk/extensions/BLUE_stable/blue/img/1/cv.png
trunk/extensions/BLUE_stable/blue/img/1/database.png
trunk/extensions/BLUE_stable/blue/img/1/date.png
trunk/extensions/BLUE_stable/blue/img/1/delicious.png
trunk/extensions/BLUE_stable/blue/img/1/document-library.png
trunk/extensions/BLUE_stable/blue/img/1/donate.png
trunk/extensions/BLUE_stable/blue/img/1/drawings.png
trunk/extensions/BLUE_stable/blue/img/1/edit.png
trunk/extensions/BLUE_stable/blue/img/1/email.png
trunk/extensions/BLUE_stable/blue/img/1/featured.png
trunk/extensions/BLUE_stable/blue/img/1/feed.png
trunk/extensions/BLUE_stable/blue/img/1/finished-work.png
trunk/extensions/BLUE_stable/blue/img/1/flag.png
trunk/extensions/BLUE_stable/blue/img/1/folder.png
trunk/extensions/BLUE_stable/blue/img/1/free-for-job.png
trunk/extensions/BLUE_stable/blue/img/1/freelance.png
trunk/extensions/BLUE_stable/blue/img/1/full-time.png
trunk/extensions/BLUE_stable/blue/img/1/future-projects.png
trunk/extensions/BLUE_stable/blue/img/1/graphic-design.png
trunk/extensions/BLUE_stable/blue/img/1/header_feed.png
trunk/extensions/BLUE_stable/blue/img/1/header_infos.png
trunk/extensions/BLUE_stable/blue/img/1/header_orders.png
trunk/extensions/BLUE_stable/blue/img/1/header_sales.png
trunk/extensions/BLUE_stable/blue/img/1/header_stats.png
trunk/extensions/BLUE_stable/blue/img/1/heart.png
trunk/extensions/BLUE_stable/blue/img/1/hire-me.png
trunk/extensions/BLUE_stable/blue/img/1/home.png
trunk/extensions/BLUE_stable/blue/img/1/horizontal_line.png
trunk/extensions/BLUE_stable/blue/img/1/horizontal_line_2.png
trunk/extensions/BLUE_stable/blue/img/1/ico_oscim_20.png
trunk/extensions/BLUE_stable/blue/img/1/illustration.png
trunk/extensions/BLUE_stable/blue/img/1/invoice.png
trunk/extensions/BLUE_stable/blue/img/1/issue.png
trunk/extensions/BLUE_stable/blue/img/1/library.png
trunk/extensions/BLUE_stable/blue/img/1/lightbulb.png
trunk/extensions/BLUE_stable/blue/img/1/limited-edition.png
trunk/extensions/BLUE_stable/blue/img/1/link.png
trunk/extensions/BLUE_stable/blue/img/1/lock.png
trunk/extensions/BLUE_stable/blue/img/1/login.png
trunk/extensions/BLUE_stable/blue/img/1/logout.png
trunk/extensions/BLUE_stable/blue/img/1/menu_bg.jpg
trunk/extensions/BLUE_stable/blue/img/1/menu_bg.png
trunk/extensions/BLUE_stable/blue/img/1/menu_bg.xcf
trunk/extensions/BLUE_stable/blue/img/1/menu_bg_error.jpg
trunk/extensions/BLUE_stable/blue/img/1/menu_bg_success.jpg
trunk/extensions/BLUE_stable/blue/img/1/menu_user_bg.jpg
trunk/extensions/BLUE_stable/blue/img/1/milestone.png
trunk/extensions/BLUE_stable/blue/img/1/my-account.png
trunk/extensions/BLUE_stable/blue/img/1/networking.png
trunk/extensions/BLUE_stable/blue/img/1/old-versions.png
trunk/extensions/BLUE_stable/blue/img/1/order-1.png
trunk/extensions/BLUE_stable/blue/img/1/order.png
trunk/extensions/BLUE_stable/blue/img/1/oscss.png
trunk/extensions/BLUE_stable/blue/img/1/payment-card.png
trunk/extensions/BLUE_stable/blue/img/1/paypal.png
trunk/extensions/BLUE_stable/blue/img/1/pen.png
trunk/extensions/BLUE_stable/blue/img/1/pencil.png
trunk/extensions/BLUE_stable/blue/img/1/phone.png
trunk/extensions/BLUE_stable/blue/img/1/photography.png
trunk/extensions/BLUE_stable/blue/img/1/plus.png
trunk/extensions/BLUE_stable/blue/img/1/premium.png
trunk/extensions/BLUE_stable/blue/img/1/print.png
trunk/extensions/BLUE_stable/blue/img/1/process.png
trunk/extensions/BLUE_stable/blue/img/1/product-1.png
trunk/extensions/BLUE_stable/blue/img/1/product-design.png
trunk/extensions/BLUE_stable/blue/img/1/product.png
trunk/extensions/BLUE_stable/blue/img/1/project.png
trunk/extensions/BLUE_stable/blue/img/1/publish.png
trunk/extensions/BLUE_stable/blue/img/1/refresh.png
trunk/extensions/BLUE_stable/blue/img/1/search.png
trunk/extensions/BLUE_stable/blue/img/1/settings.png
trunk/extensions/BLUE_stable/blue/img/1/shipping.png
trunk/extensions/BLUE_stable/blue/img/1/showreel.png
trunk/extensions/BLUE_stable/blue/img/1/sign-in.png
trunk/extensions/BLUE_stable/blue/img/1/sign-out.png
trunk/extensions/BLUE_stable/blue/img/1/sign-up.png
trunk/extensions/BLUE_stable/blue/img/1/sitemap.png
trunk/extensions/BLUE_stable/blue/img/1/special-offer.png
trunk/extensions/BLUE_stable/blue/img/1/star.png
trunk/extensions/BLUE_stable/blue/img/1/statistics.png
trunk/extensions/BLUE_stable/blue/img/1/suppliers.png
trunk/extensions/BLUE_stable/blue/img/1/tag.png
trunk/extensions/BLUE_stable/blue/img/1/ticket.png
trunk/extensions/BLUE_stable/blue/img/1/twitter.png
trunk/extensions/BLUE_stable/blue/img/1/ui-bg_flat_0_aaaaaa_40x100.png
trunk/extensions/BLUE_stable/blue/img/1/ui-bg_flat_75_ffffff_40x100.png
trunk/extensions/BLUE_stable/blue/img/1/ui-bg_glass_55_fbf9ee_1x400.png
trunk/extensions/BLUE_stable/blue/img/1/ui-bg_glass_65_ffffff_1x400.png
trunk/extensions/BLUE_stable/blue/img/1/ui-bg_glass_75_dadada_1x400.png
trunk/extensions/BLUE_stable/blue/img/1/ui-bg_glass_75_e6e6e6_1x400.png
trunk/extensions/BLUE_stable/blue/img/1/ui-bg_glass_95_fef1ec_1x400.png
trunk/extensions/BLUE_stable/blue/img/1/ui-bg_highlight-soft_75_cccccc_1x100.png
trunk/extensions/BLUE_stable/blue/img/1/ui-icons_222222_256x240.png
trunk/extensions/BLUE_stable/blue/img/1/ui-icons_2e83ff_256x240.png
trunk/extensions/BLUE_stable/blue/img/1/ui-icons_454545_256x240.png
trunk/extensions/BLUE_stable/blue/img/1/ui-icons_888888_256x240.png
trunk/extensions/BLUE_stable/blue/img/1/ui-icons_cd0a0a_256x240.png
trunk/extensions/BLUE_stable/blue/img/1/upcoming-work.png
trunk/extensions/BLUE_stable/blue/img/1/user.png
trunk/extensions/BLUE_stable/blue/img/1/world.png
trunk/extensions/BLUE_stable/blue/img/1/zoom.png
trunk/extensions/BLUE_stable/blue/img/2/
trunk/extensions/BLUE_stable/blue/img/2/bg_graph.png
trunk/extensions/BLUE_stable/blue/img/2/bg_graph_small.png
trunk/extensions/BLUE_stable/blue/img/2/dock-bg2.gif
trunk/extensions/BLUE_stable/blue/img/2/header_infos.png
trunk/extensions/BLUE_stable/blue/img/2/header_orders.png
trunk/extensions/BLUE_stable/blue/img/2/header_sales.png
trunk/extensions/BLUE_stable/blue/img/2/header_stats.png
trunk/extensions/BLUE_stable/blue/img/2/horizontal_line.png
trunk/extensions/BLUE_stable/blue/img/2/horizontal_line_2.png
trunk/extensions/BLUE_stable/blue/img/2/logo_oscim.png
trunk/extensions/BLUE_stable/blue/img/2/menu_bg.jpg
trunk/extensions/BLUE_stable/blue/img/2/monitor1.png
trunk/extensions/BLUE_stable/blue/img/2/ui-bg_diagonals-thick_8_333333_40x40.png
trunk/extensions/BLUE_stable/blue/img/2/ui-bg_flat_65_ffffff_40x100.png
trunk/extensions/BLUE_stable/blue/img/2/ui-bg_glass_40_111111_1x400.png
trunk/extensions/BLUE_stable/blue/img/2/ui-bg_glass_55_1c1c1c_1x400.png
trunk/extensions/BLUE_stable/blue/img/2/ui-bg_highlight-hard_100_f9f9f9_1x100.png
trunk/extensions/BLUE_stable/blue/img/2/ui-bg_highlight-hard_40_aaaaaa_1x100.png
trunk/extensions/BLUE_stable/blue/img/2/ui-bg_highlight-soft_50_aaaaaa_1x100.png
trunk/extensions/BLUE_stable/blue/img/2/ui-bg_inset-hard_45_cd0a0a_1x100.png
trunk/extensions/BLUE_stable/blue/img/2/ui-bg_inset-hard_55_ffeb80_1x100.png
trunk/extensions/BLUE_stable/blue/img/2/ui-icons_222222_256x240.png
trunk/extensions/BLUE_stable/blue/img/2/ui-icons_4ca300_256x240.png
trunk/extensions/BLUE_stable/blue/img/2/ui-icons_bbbbbb_256x240.png
trunk/extensions/BLUE_stable/blue/img/2/ui-icons_ededed_256x240.png
trunk/extensions/BLUE_stable/blue/img/2/ui-icons_ffcf29_256x240.png
trunk/extensions/BLUE_stable/blue/img/2/ui-icons_ffffff_256x240.png
trunk/extensions/BLUE_stable/blue/img/menu_bg.jpg
trunk/extensions/BLUE_stable/blue/inc/
trunk/extensions/BLUE_stable/blue/inc/init_theme-1.php
trunk/extensions/BLUE_stable/blue/inc/init_theme-2.php
trunk/extensions/BLUE_stable/blue/inc/lib.template.php
trunk/extensions/BLUE_stable/blue/inc/lib_general-1.js
trunk/extensions/BLUE_stable/blue/inc/preload-1.php
trunk/extensions/BLUE_stable/blue/jquery-ui-1.css
trunk/extensions/BLUE_stable/blue/jquery-ui-2.css
trunk/extensions/BLUE_stable/blue/jquery.validate.css
trunk/extensions/BLUE_stable/blue/login.php
trunk/extensions/BLUE_stable/blue/stylesheet-1.css
trunk/extensions/BLUE_stable/blue/stylesheet-2.css
trunk/extensions/BLUE_stable/blue/stylesheet-ie-2.css
trunk/extensions/BLUE_stable/blue/stylesheet-print.css
trunk/extensions/BLUE_stable/blue/stylesheet-view.css
trunk/extensions/BLUE_stable/blue/theme.xml
trunk/extensions/BLUE_stable/blue.zip
trunk/extensions/BLUE_stable/install.xml
Added: trunk/extensions/BLUE_stable/blue/TableTools-1.css
===================================================================
--- trunk/extensions/BLUE_stable/blue/TableTools-1.css (rev 0)
+++ trunk/extensions/BLUE_stable/blue/TableTools-1.css 2012-04-15 07:21:38 UTC (rev 4235)
@@ -0,0 +1,97 @@
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * TableTools styles
+ */
+.TableTools {
+ padding: 3px 0 3px 3px;
+ border: 1px solid #d0d0d0;
+ background-color: #f0f0f0;
+ float: right;
+ margin-bottom: 1em;
+}
+
+.TableTools_button {
+ position: relative;
+ float: left;
+ margin-right: 3px;
+}
+
+.TableTools_csv {
+ background: url(../../../images/icons/csv.png) no-repeat center center;
+ border: 1px solid #f0f0f0;
+}
+
+.TableTools_csv_hover {
+ background: url(../../../images/icons/csv_hover.png) no-repeat center center;
+ border: 1px solid #d0d0d0;
+ background-color: #fdfdfd;
+}
+
+.TableTools_xls {
+ background: url(../../../images/icons/xls.png) no-repeat center center;
+ border: 1px solid #f0f0f0;
+}
+
+.TableTools_xls_hover {
+ background: url(../../../images/icons/xls_hover.png) no-repeat center center;
+ border: 1px solid #d0d0d0;
+ background-color: #fdfdfd;
+}
+
+.TableTools_clipboard {
+ background: url(../../../images/icons/copy.png) no-repeat center center;
+ border: 1px solid #f0f0f0;
+}
+
+.TableTools_clipboard_hover {
+ background: url(../../../images/icons/copy_hover.png) no-repeat center center;
+ border: 1px solid #d0d0d0;
+ background-color: #fdfdfd;
+}
+
+.TableTools_print {
+ background: url(../../../images/icons/print.png) no-repeat center center;
+ border: 1px solid #f0f0f0;
+}
+
+.TableTools_print_hover {
+ background: url(../../../images/icons/print_hover.png) no-repeat center center;
+ border: 1px solid #d0d0d0;
+ background-color: #fdfdfd;
+}
+
+.TableTools_PrintInfo {
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ width: 400px;
+ height: 150px;
+ margin-left: -200px;
+ margin-top: -75px;
+ text-align: center;
+ background-color: #3f3f3f;
+ color: white;
+ padding: 10px 30px;
+
+ opacity: 0.9;
+
+ border-radius: 5px;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+
+ box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.5);
+ -moz-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.5);
+ -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.5);
+}
+
+.TableTools_PrintInfo h6 {
+ font-weight: normal;
+ font-size: 28px;
+ line-height: 28px;
+ margin: 1em;
+}
+
+.TableTools_PrintInfo p {
+ font-size: 14px;
+ line-height: 20px;
+}
Added: trunk/extensions/BLUE_stable/blue/blue.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/blue.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/footer-1.php
===================================================================
--- trunk/extensions/BLUE_stable/blue/footer-1.php (rev 0)
+++ trunk/extensions/BLUE_stable/blue/footer-1.php 2012-04-15 07:21:38 UTC (rev 4235)
@@ -0,0 +1,13 @@
+<?php
+/*
+ $Id: footer-1.php, svn 14.07.2009 13:03:52 oscim Exp $
+// kate: space-indent on; indent-width 4; mixedindent off; indent-mode cstyle; word-wrap-marker-color #41C2A4
++-----------------------------------------------------------------------+
+| osCSS Open Source E-commerce |
++-----------------------------------------------------------------------+
+*/
+echo '<a href="http://www.oscss.org" class="menuBoxContentLink fleft oscss">' . HEADER_TITLE_SUPPORT_SITE . '</a>';
+echo '<a href="http://forums.oscss.org" class="menuBoxContentLink fleft oscss">Forum osCSS</a>';
+?>
+<a class="menuBoxContentLink fleft oscim" href="http://www.oscim.fr">template by oscim</a>
+<br style="clear:both;" />
Added: trunk/extensions/BLUE_stable/blue/footer-2.php
===================================================================
--- trunk/extensions/BLUE_stable/blue/footer-2.php (rev 0)
+++ trunk/extensions/BLUE_stable/blue/footer-2.php 2012-04-15 07:21:38 UTC (rev 4235)
@@ -0,0 +1,19 @@
+<?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 28/03/10, 17:16
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+?>
+
+<div id="headInfos">
+ <h1><?php echo tep_image(DIR_WS_IMAGES . 'oscss_logo.png', 'osCSS'); ?></h1>
+ <h2><?php echo PROJECT_VERSION ;?></h2>
+</div>
+<div id="author">
+ <img src="<?php echo DIR_WS_TEMPLATE ?>img/2/logo_oscim.png" alt="oscim" />
+ <h2>template by <a href="http://www.oscim.fr">oscim</a></h2>
+</div>
\ No newline at end of file
Added: trunk/extensions/BLUE_stable/blue/gabarit-1.php
===================================================================
--- trunk/extensions/BLUE_stable/blue/gabarit-1.php (rev 0)
+++ trunk/extensions/BLUE_stable/blue/gabarit-1.php 2012-04-15 07:21:38 UTC (rev 4235)
@@ -0,0 +1,90 @@
+<?php
+/**
+ @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.0
+ @date 24/10/10, 17:14
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+ /** Prechargement */
+ @include(DIR_WS_INCLUDES . 'content/'.$page_admin.'.top.inc');
+ require(DIR_WS_TEMPLATE.'inc/lib.template.php');
+ if (($init_theme=tep_test_gab_ele('inc/init_theme')) !=false) require($init_theme);
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" <?php echo HTML_PARAMS; ?> >
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>" />
+<title><?php echo $page_admin.' | '.TITLE; ?></title>
+<base href="<?php echo HTTP_SERVER.DIR_WS_ADMIN ?>" />
+<?php
+ /** Fichier header systheme */
+ require(DIR_FS_ADMIN.DIR_WS_INCLUDES . 'header.php');
+ /** Appel des js et css */
+ if (($stylesheet=tep_test_gab_ele('stylesheet','css')) !=false) tep_include_file ($stylesheet,true);
+ tep_include_file (DIR_WS_TEMPLATE."inc/lib_general-1.js",true);
+ tep_include_file (DIR_WS_JS."jquery.min.js",true);
+ @include( DIR_WS_INCLUDES . "content/".$page_admin.".header.inc"); ?>
+</head>
+<body class="<?php echo $page_admin; ?>">
+
+ <!-- header //-->
+ <div id="header">
+ <?php if (($header=tep_test_gab_ele('header')) !=false) require($header); ?>
+
+ <!-- menubar //-->
+ <?php $menu=menu::resetInstance();
+ $menu_link = '<div id="menubar">'."\n";
+ $menu_link .= '<ul id="menutitre">'."\n";
+ $menu_link .=$menu->cstr();
+ $menu_link .= '</ul>'."\n";
+ echo $menu_link;?>
+ <ul class="fright">
+ <li class="inline"><?php echo tep_draw_form('menubookmark', 'index.php', '', 'get') ?><p class="themeSwitcher">Bookmark: <?php echo tep_draw_pull_down_menu('page_admin',$Bookmark, '' , 'onchange="this.form.submit();"') ?></p></form></li>
+ <li class="account inline"><a class="buttonimg" href="<?php echo tep_href_link(FILENAME_LOGOFF, '', 'NONSSL') ?>"><?php echo tep_image(DIR_WS_ICONS. 'icon_logoff.png',HEADER_TITLE_LOGOFF) ?></a></li>
+ <li class="userName inline"><a class="buttonimg" href="<?php echo tep_href_link(FILENAME_ADMIN_ACCOUNT, '', 'NONSSL') ?>"><?php echo tep_image(DIR_WS_ICONS. 'users.png', HEADER_TITLE_ACCOUNT.' '.$login_firstname) ?></a></li>
+ </ul>
+ </div>
+
+ <!-- menubar_eof //-->
+
+ <div id="user">
+ <ul>
+ <?php /** Appel des menu specifique au module ACA . Tous module chargé epeut inétegrer des bock au menu */ echo $generic_modules->_show_menu(); ?>
+ </ul>
+ </div>
+ </div>
+ <!-- header_eof //-->
+
+ <!-- central //-->
+ <div id="central" class="<?php echo $page_admin; ?>">
+ <!-- return_erreur //-->
+ <?php if ($messageStack->size > 0) echo $messageStack->output(); ?>
+ <!-- return_erreur_eof //-->
+
+ <?php if(!include(DIR_WS_INCLUDES . 'content/'.$page_admin.'.central.inc')) print ERR_404; ?>
+
+ <?php if(isset($_GET['origin'])) : ?>
+ <div class="button_nav">
+ <?php echo ' <a class="button" href="' . tep_href_link(basename($_GET['origin']), strchr('?',$_GET['origin'])) .'">' .IMAGE_BACK . '</a>'; ?>
+ </div>
+ <?php endif; ?>
+ <div class="separator" ></div>
+ </div>
+ <!-- central_eof //-->
+
+ <div class="separator" ></div>
+ <!-- footer_gabarit_eof //-->
+ <div id="bas">
+ <?php if (($footer=tep_test_gab_ele('footer')) !=false) require($footer); ?>
+ </div>
+ <!-- footer_gabarit_eof //-->
+
+ <!-- footer //-->
+ <div id="footer">
+ <?php require(DIR_FS_ADMIN.DIR_WS_INCLUDES . 'footer.php'); ?>
+ </div>
+ <!-- footer_eof //-->
\ No newline at end of file
Added: trunk/extensions/BLUE_stable/blue/gabarit-2.php
===================================================================
--- trunk/extensions/BLUE_stable/blue/gabarit-2.php (rev 0)
+++ trunk/extensions/BLUE_stable/blue/gabarit-2.php 2012-04-15 07:21:38 UTC (rev 4235)
@@ -0,0 +1,99 @@
+<?php
+/**
+ @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.0
+ @date 24/10/10, 17:14
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+ @include(DIR_WS_INCLUDES . 'content/'.$page_admin.'.top.inc');
+ require(DIR_WS_TEMPLATE.'inc/lib.template.php');
+ if (($init_theme=tep_test_gab_ele('inc/init_theme')) !=false) require($init_theme);
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" <?php echo HTML_PARAMS; ?> >
+<head>
+<meta http-equiv="content-type" content="text/html; charset=<?php echo CHARSET; ?>" />
+<title><?php echo $page_admin.' | '.TITLE; ?></title>
+<base href="<?php echo HTTP_SERVER.DIR_WS_ADMIN ?>" />
+<?php
+ /* Fichier header systheme */
+ require(DIR_FS_ADMIN.DIR_WS_INCLUDES . 'header.php');
+
+ /* Appel des js et css */
+ if (($stylesheet=tep_test_gab_ele('stylesheet','css')) !=false) tep_include_file ($stylesheet,true);
+
+ tep_include_file (DIR_WS_TEMPLATE ."/jquery-ui-".$_SESSION['login_groups_id'].".css",true);
+ tep_include_file ("includes/javascript/jquery-ui.min.js",true);
+// tep_include_file (DIR_WS_TEMPLATE."inc/lib_general-".$_SESSION['login_groups_id'].".js",true);
+
+?>
+<?php @include( DIR_WS_INCLUDES . "content/".$page_admin.".header.inc") ?>
+<!--[if IE]>
+ <?php if (($stylesheet=tep_test_gab_ele('stylesheet-ie','css')) !=false) tep_include_file ($stylesheet,true); ?>
+<![endif]-->
+</head>
+
+<body class="<?php echo $page_admin ?>">
+ <!-- header //-->
+ <div id="header">
+ <div id="headInfos">
+ <h1><?php echo tep_image(DIR_WS_TEMPLATE . 'img/1/oscss.png', 'osCSS'); ?></h1>
+ <h2><?php echo PROJECT_VERSION ;?></h2>
+ <a href="<?php echo tep_catalog_href_link() ?>"><?php echo HEADER_TITLE_ONLINE_CATALOG ;?></a>
+ </div>
+ </div>
+ <!-- header_eof //-->
+
+ <!-- user //-->
+ <?php
+ for ($i = 0, $n = sizeof($languages); $i < $n; $i++) {
+ $languages_array[] = array('id' => $languages[$i]['code'], 'text' => $languages[$i]['name']);
+ if ($languages[$i]['directory'] == $language) { $languages_selected = $languages[$i]['code']; }
+ }
+ ?>
+ <div id="user">
+ <ul>
+<!-- <li class="inline langSelector"><?php echo tep_draw_form('menubookmark', 'index.php', '', 'get') .'<p class="themeSwitcher">Bookmark: '. tep_draw_pull_down_menu('page_admin',$Bookmark, '' , 'onchange="this.form.submit();"')?></p></form></li> -->
+ <li class="account"><?php echo '<a class="buttonimg" href="' . tep_href_link(FILENAME_LOGOFF, '', 'NONSSL') . '" class="menuBoxContentLink">' . tep_image(DIR_WS_ICONS. 'icon_logoff.png',HEADER_TITLE_LOGOFF) . '</a>'; ?> </li>
+ <li class="userName"><?php echo '<a class="buttonimg" href="' . tep_href_link(FILENAME_ADMIN_ACCOUNT, '', 'NONSSL') . '" class="menuBoxContentLink" >' . tep_image(DIR_WS_ICONS. 'users.png', HEADER_TITLE_ACCOUNT.' '.$login_firstname) . '</a>'; ?> </li>
+ <li class="langSelector"><?php echo tep_draw_form('languages', basename($PHP_SELF), '', 'get').tep_draw_pull_down_menu('language', $languages_array, $languages_selected, 'onchange="this.form.submit();"').'</form>'; ?></li>
+ </ul>
+ </div>
+ <!-- user_eof //-->
+
+ <div id="accordion">
+ <?php echo $ctr_menu; ?>
+ </div>
+ <!-- central //-->
+ <div id="central" class="<?php echo $page_admin ?>">
+ <?php require(DIR_WS_INCLUDES . 'content/'.$page_admin.'.central.inc'); ?>
+ <?php if(isset($_GET['origin'])) : ?>
+ <div class="button_nav">
+ <?php echo ' <a class="button" href="' . tep_href_link(basename($_GET['origin']), strchr('?',$_GET['origin'])) .'">' .IMAGE_BACK . '</a>'; ?>
+ </div>
+ <?php endif; ?>
+ <div class="separator" ></div>
+ </div>
+ <!-- central_eof //-->
+
+ <div class="separator"></div>
+ <!-- footer_gabarit_eof //-->
+ <div id="bas">
+ <?php if (($footer=tep_test_gab_ele('footer')) !=false) require($footer); ?>
+ </div>
+ <!-- footer_gabarit_eof //-->
+
+ <!-- footer //-->
+ <div id="footer">
+ <?php require(DIR_WS_INCLUDES . 'footer.php'); ?>
+ </div>
+ <!-- footer_eof //-->
+
+<script type="text/javascript"><!--//
+$(function() {
+ $("#accordion").accordion({active: <?php echo (isset($menu_activ) ? $menu_activ-1:4 ); ?>});
+});
+//--></script>
\ No newline at end of file
Added: trunk/extensions/BLUE_stable/blue/gabarit-view.php
===================================================================
--- trunk/extensions/BLUE_stable/blue/gabarit-view.php (rev 0)
+++ trunk/extensions/BLUE_stable/blue/gabarit-view.php 2012-04-15 07:21:38 UTC (rev 4235)
@@ -0,0 +1,33 @@
+<?php
+/**
+ @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.0.9
+ @date 11/08/10, 10:06
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+$css=($_GET['forceview']=='print')? 'print' : 'view' ;
+$CHARSET=(isset($_GET['forcecharset']))?$_GET['forcecharset'] : CHARSET ;
+@include(DIR_WS_INCLUDES . 'content/'.$page_admin.'.top.inc');
+require(DIR_WS_TEMPLATE.'inc/lib.template.php');
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" <?php echo HTML_PARAMS; ?> >
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>" />
+<title><?php echo TITLE; ?></title>
+<link rel="stylesheet" type="text/css" href="<?php echo DIR_WS_TEMPLATE ?>stylesheet-<?php echo $css ?>.css" media="<?php echo (($_GET['forceview']=='print')? 'print' : 'all') ?>">
+<?php include( DIR_WS_INCLUDES . "header.php");
+ @include( DIR_WS_INCLUDES . "content/".$page_admin.".header.inc"); ?>
+</head>
+<body class="<?php echo $page_admin ?>">
+
+<!-- central //-->
+<div id="central" class="<?php echo $page_admin ?>">
+ <?php require(DIR_WS_INCLUDES . 'content/'.$page_admin.'.central.inc'); ?>
+</div>
+<!-- central_eof //-->
+<?php include( DIR_WS_INCLUDES . "application_bottom.php"); ?>
\ No newline at end of file
Added: trunk/extensions/BLUE_stable/blue/header-1.php
===================================================================
--- trunk/extensions/BLUE_stable/blue/header-1.php (rev 0)
+++ trunk/extensions/BLUE_stable/blue/header-1.php 2012-04-15 07:21:38 UTC (rev 4235)
@@ -0,0 +1,17 @@
+<?php
+/**
+ @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.0.9
+ @date 08/06/10, 12:09
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+$class_widget="adminBlock";
+?>
+<div id="headInfos">
+ <h1><?php echo tep_image(DIR_WS_TEMPLATE . 'img/1/oscss.png', 'osCSS'); ?></h1>
+ <h2><?php echo PROJECT_VERSION ;?></h2>
+ <a href="<?php echo tep_catalog_href_link() ?>"><?php echo HEADER_TITLE_ONLINE_CATALOG ;?></a>
+</div>
+<?php load_widget_context(); ?>
\ No newline at end of file
Added: trunk/extensions/BLUE_stable/blue/header-2.php
===================================================================
--- trunk/extensions/BLUE_stable/blue/header-2.php (rev 0)
+++ trunk/extensions/BLUE_stable/blue/header-2.php 2012-04-15 07:21:38 UTC (rev 4235)
@@ -0,0 +1,13 @@
+<?php
+/**
+ @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.0.9
+ @date 08/06/10, 12:09
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+ $menu_link .=$ctr_menu;
+ echo $menu_link;
+?>
\ No newline at end of file
Added: trunk/extensions/BLUE_stable/blue/img/1/address.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/address.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/administrative-docs.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/administrative-docs.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/advertising.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/advertising.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/archives.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/archives.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/attributes.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/attributes.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/bank.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/bank.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/basket.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/basket.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/bestseller.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/bestseller.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/bg_header.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/bg_header.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/billing.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/billing.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/bookmark.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/bookmark.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/brainstorming.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/brainstorming.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/business-contact.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/business-contact.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/busy.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/busy.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/calendar.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/calendar.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/category.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/category.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/check.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/check.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/collaboration.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/collaboration.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/comment.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/comment.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/communication.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/communication.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/config.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/config.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/consulting.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/consulting.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/contact.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/contact.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/cost.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/cost.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/credit-card.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/credit-card.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/credit.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/credit.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/current-work.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/current-work.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/customers.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/customers.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/cv.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/cv.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/database.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/database.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/date.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/date.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/delicious.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/delicious.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/document-library.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/document-library.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/donate.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/donate.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/drawings.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/drawings.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/edit.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/edit.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/email.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/email.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/featured.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/featured.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/feed.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/feed.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/finished-work.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/finished-work.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/flag.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/flag.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/folder.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/folder.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/free-for-job.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/free-for-job.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/freelance.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/freelance.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/full-time.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/full-time.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/future-projects.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/future-projects.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/graphic-design.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/graphic-design.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/header_feed.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/header_feed.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/header_infos.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/header_infos.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/header_orders.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/header_orders.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/header_sales.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/header_sales.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/header_stats.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/header_stats.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/heart.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/heart.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/hire-me.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/hire-me.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/home.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/home.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/horizontal_line.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/horizontal_line.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/horizontal_line_2.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/horizontal_line_2.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/ico_oscim_20.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/ico_oscim_20.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/illustration.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/illustration.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/invoice.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/invoice.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/issue.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/issue.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/library.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/library.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/lightbulb.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/lightbulb.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/limited-edition.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/limited-edition.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/link.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/link.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/lock.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/lock.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/login.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/login.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/logout.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/logout.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/menu_bg.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/menu_bg.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/menu_bg.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/menu_bg.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/menu_bg.xcf
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/menu_bg.xcf
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/menu_bg_error.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/menu_bg_error.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/menu_bg_success.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/menu_bg_success.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/menu_user_bg.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/menu_user_bg.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/milestone.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/milestone.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/my-account.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/my-account.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/networking.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/networking.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/old-versions.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/old-versions.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/order-1.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/order-1.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/order.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/order.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/oscss.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/oscss.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/payment-card.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/payment-card.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/paypal.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/paypal.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/pen.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/pen.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/pencil.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/pencil.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/phone.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/phone.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/photography.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/photography.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/plus.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/plus.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/premium.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_stable/blue/img/1/premium.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/extensions/BLUE_stable/blue/img/1/print.png
===================================================================
(Binary files differ)
Property changes on: trunk/extensions/BLUE_sta...
[truncated message content] |
|
From: <os...@us...> - 2012-04-15 07:17:28
|
Revision: 4234
http://oscss.svn.sourceforge.net/oscss/?rev=4234&view=rev
Author: oscim
Date: 2012-04-15 07:17:18 +0000 (Sun, 15 Apr 2012)
Log Message:
-----------
Report extension in trunck
mise a niveau du code
Added Paths:
-----------
trunk/extensions/IN-ADMIN-PANEL_stable/
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/TableTools-1.css
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/css/
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/css/color_habillage.css
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/css/ie-css3.htc
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/css/squelete.css
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/data/
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/data/icon_set.xml
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/footer-1.php
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/gabarit-1.php
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/gabarit-view.php
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/header-1.php
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/image_login/
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/image_login/oscss_logo.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/arrow.gif
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/bg.jpg
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/botleft.jpg
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/botright.jpg
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/bt_blue_center.gif
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/bt_blue_left.gif
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/bt_blue_r.gif
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/bt_green_center.gif
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/bt_green_left.gif
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/bt_green_r.gif
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/bt_red_center.gif
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/bt_red_left.gif
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/bt_red_r.gif
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/bubble.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/button.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/buttonn.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/buttony.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/comment.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/error.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/footer_bg.jpg
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/green_bt.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/green_bt_a.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/help.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/indeziner_logo.gif
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/info.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/input.gif
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/left.jpg
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/list_bullet.gif
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/login_bg.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/logo.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/menu_bg.gif
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/menu_bg.jpg
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/menu_bg_a.gif
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/minus.gif
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/notice.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/oscss.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/oscss_logo.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/photo.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/plus.gif
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/red_bt.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/red_bt_a.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/right.jpg
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/search.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/sidebar_box_bottom.gif
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/sidebar_box_top.gif
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/sidebar_menu_top.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/sidebar_menu_top_a.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/trash.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/user_edit.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/user_logout.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/valid.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/images/warning.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/img/
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/img/0.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/img/button-left.gif
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/img/button-left.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/img/button-right.gif
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/img/button-right.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/img/button.gif
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/img/button.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/img/checkbox.gif
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/img/checkbox.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/img/file.gif
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/img/file.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/img/input-left.gif
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/img/input-left.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/img/input-right.gif
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/img/input-right.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/img/input.gif
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/img/input.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/img/logo.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/img/oscss.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/img/radio.gif
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/img/radio.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/img/select-left.gif
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/img/select-left.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/img/select-right.gif
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/img/select-right.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/img/textarea-bl.gif
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/img/textarea-bl.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/img/textarea-br.gif
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/img/textarea-br.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/img/textarea-l-off.gif
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/img/textarea-l-off.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/img/textarea-l-over.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/img/textarea-r-off.gif
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/img/textarea-r-off.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/img/textarea-r-over.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/img/textarea-tl.gif
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/img/textarea-tl.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/img/textarea-tr.gif
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/img/textarea-tr.png
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/inc/
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/inc/init_theme-1.php
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/inc/lib.template.php
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/inc/lib_general-1.js
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/inc/preload-1.php
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/jquery-ui-1.css
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/jquery.jclock-1.2.0.js.txt
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/jquery.validate.css
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/js/
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/js/clockh.js
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/js/clockp.js
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/js/ddaccordion.js
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/js/jconfirmaction.jquery.js
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/js/niceforms.js
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/languages/
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/languages/fr_FR.txt
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/license.txt
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/login.css
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/login.html
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/login.php
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/niceforms-default.css
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/screenshot-1.jpg
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/style-1.css
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/stylesheet-print.css
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/stylesheet-view.css
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/theme.xml
trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel.zip
trunk/extensions/IN-ADMIN-PANEL_stable/install.xml
Added: trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/TableTools-1.css
===================================================================
--- trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/TableTools-1.css (rev 0)
+++ trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/TableTools-1.css 2012-04-15 07:17:18 UTC (rev 4234)
@@ -0,0 +1,102 @@
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * TableTools styles
+ */
+.TableTools {
+ padding: 3px 0 3px 3px;
+ border: 1px solid #d0d0d0;
+ background-color: #f0f0f0;
+ float: right;
+ margin-bottom: 1em;
+}
+
+.TableTools_button {
+ position: relative;
+ float: left;
+ margin-right: 3px;
+}
+
+.TableTools_csv {
+ background: url(../../../images/icons/csv.png) no-repeat center center;
+ border: 1px solid #f0f0f0;
+}
+
+.TableTools_csv_hover {
+ background: url(../../../images/icons/csv_hover.png) no-repeat center center;
+ border: 1px solid #d0d0d0;
+ background-color: #fdfdfd;
+}
+
+.TableTools_xls {
+ background: url(../../../images/icons/xls.png) no-repeat center center;
+ border: 1px solid #f0f0f0;
+}
+
+.TableTools_xls_hover {
+ background: url(../../../images/icons/xls_hover.png) no-repeat center center;
+ border: 1px solid #d0d0d0;
+ background-color: #fdfdfd;
+}
+
+.TableTools_clipboard {
+ background: url(../../../images/icons/copy.png) no-repeat center center;
+ border: 1px solid #f0f0f0;
+}
+
+.TableTools_clipboard_hover {
+ background: url(../../../images/icons/copy_hover.png) no-repeat center center;
+ border: 1px solid #d0d0d0;
+ background-color: #fdfdfd;
+}
+
+.TableTools_print {
+ background: url(../../../images/icons/print.png) no-repeat center center;
+ border: 1px solid #f0f0f0;
+}
+
+.TableTools_print_hover {
+ background: url(../../../images/icons/print_hover.png) no-repeat center center;
+ border: 1px solid #d0d0d0;
+ background-color: #fdfdfd;
+}
+
+.TableTools_PrintInfo {
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ width: 400px;
+ height: 150px;
+ margin-left: -200px;
+ margin-top: -75px;
+ text-align: center;
+ background-color: #3f3f3f;
+ color: white;
+ padding: 10px 30px;
+
+ opacity: 0.9;
+
+ border-radius: 5px;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+
+ box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.5);
+ -moz-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.5);
+ -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.5);
+}
+
+.TableTools_PrintInfo h6 {
+ font-weight: normal;
+ font-size: 28px;
+ line-height: 28px;
+ margin: 1em;
+}
+
+.TableTools_PrintInfo p {
+ font-size: 14px;
+ line-height: 20px;
+}
+
+
+
+.paging_full_numbers span.paginate_button {border:none;background-color:#52beea; color:white;}
+.paging_full_numbers span.paginate_active{border:none;background-color:#003399; color:white; }
\ No newline at end of file
Added: trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/css/color_habillage.css
===================================================================
--- trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/css/color_habillage.css (rev 0)
+++ trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/css/color_habillage.css 2012-04-15 07:17:18 UTC (rev 4234)
@@ -0,0 +1,566 @@
+
+
+body
+{
+background:url(../images/bg.jpg) no-repeat center top #310b28;
+font-family:Arial, Helvetica, sans-serif;
+font-size:12px;
+color: #0e4354;
+}
+
+
+.tleft{text-align:left}
+.tright{text-align:right}
+.tcenter{text-align:center}
+
+.nobr {white-space:nowrap;}
+
+a{
+color:#256c89;
+}
+
+h2,
+h3 {
+font-size:18px;
+color:#256c89;
+font-weight:normal;
+}
+
+h3{
+font-size:18px;
+color:#256c89;
+font-weight:normal;
+}
+
+a.forgot_pass{
+float:right;
+color:#256c89;
+text-decoration:none;
+background:url(../images/help.png) no-repeat left;
+}
+
+img {border:none;}
+
+#main_container{
+
+
+}
+
+#main_content{
+/* */
+/* border: 1px solid #7299b0; */
+ -moz-border-radius: 5px; /* Firefox */
+ -webkit-border-radius: 5px; /* Safari and Chrome */
+ -khtml-border-radius: 5px; /* Konqueror */
+ border-radius: 5px; /* Opera 10.5+, future browsers, and now also Internet Explorer 6+ using IE-CSS3 */
+
+ -moz-box-shadow: 5px 5px 10px #656565; /* Firefox */
+ -webkit-box-shadow: 5px 5px 10px #656565; /* Safari and Chrome */
+ box-shadow: 5px 5px 10px #656565; /* Opera 10.5+, future browsers and IE6+ using IE-CSS3 */
+
+ behavior: url(ie-css3.htc); /* This lets IE know to call the script on all elements which get the 'box' class */
+
+ background:#fff url(../images/menu_bg.jpg) center top repeat-x ;
+}
+
+
+
+/*.box_left {
+}
+
+.box_right {
+}
+*/
+
+
+
+/*
+.jclock{
+color:#FFFFFF;
+float:right;
+font-size:22px;
+font-weight:bold;
+}*/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/* - Header */
+ .logo a {text-decoration:none; color:white}
+
+ /** -- Block login box */
+ .right_header{
+ text-align:right;
+ color:#FFFFFF;
+ }
+ .right_header a{
+ text-decoration:underline;
+ color:#FFFFFF;
+ }
+ /** link my account */
+ .right_header a.messages {
+ background: url("../images/comment.png") no-repeat scroll 2px center transparent;
+ color: blue;
+ display: inline-block;
+ font-size: 9px;
+ font-weight: bold;
+ line-height: 3px;
+ text-align: center;
+ text-decoration:none;
+ }
+ /* button logoff */
+ .right_header a.logout{
+ background:url(../images/user_logout.png) no-repeat right;
+ }
+
+
+
+/* - Content */
+
+ /*-- menu (static) */
+ #menu {font-size:11px;}
+
+ /* --- remove all the bullets, borders and padding from the default list styling */
+ #menu ul {list-style-type:none;white-space:nowrap;}
+ #menu ul li {line-height:30px;}
+ /* --- style the links for the top level */
+ #menu a, #menu a:visited {font-size:11px;text-decoration:none;color:#fff;font-weight:bold;}
+ #menu a.current{background:url(../images/menu_bg.gif) repeat-x center;}
+ /* --- style the sub level links */
+ #menu ul ul a, #menu ul ul a:visited {background:#57c0e8; border-bottom:1px #81dafc solid; color:#fff;line-height:1em;}
+ /* --- style the table so that it takes no part in the layout - required for IE to work */
+ #menu table {font-size:1em;}
+ /* --- style the third level background */
+ #menu ul ul ul a, #menu ul ul ul a:visited {background:#57c0e8;}
+ /* --- style the fourth level background */
+ #menu ul ul ul ul a, #menu ul ul ul ul a:visited {background:#57c0e8;}
+ /* --- style the sub level 1 background */
+ #menu ul :hover a.sub1 {background:url(../images/arrow.gif) no-repeat right #309dc7;}
+ /* --- style the sub level 2 background */
+ #menu ul ul :hover a.sub2 {background:url(../images/arrow.gif) no-repeat right #088bb4;}
+
+ /* --- style the level hovers */
+ /* ---- first */
+ #menu a:hover {color:#fff;background:url(../images/menu_bg.gif) repeat-x center;}
+ #menu :hover > a {color:#fff;background:url(../images/menu_bg.gif) repeat-x center;}
+ /* ---- second */
+ #menu ul ul a:hover{color:#fff;background:url(../images/menu_bg_a.gif) repeat-x center;}
+ #menu ul ul :hover > a {color:#fff;background:url(../images/menu_bg_a.gif) repeat-x center;}
+ /* ---- third */
+ #menu ul ul ul a:hover {background:url(../images/menu_bg_a.gif) repeat-x center;}
+ #menu ul ul ul :hover > a {background:url(../images/menu_bg_a.gif) repeat-x center;}
+ /* ---- fourth */
+ #menu ul ul ul ul a:hover {background:url(../images/menu_bg_a.gif) repeat-x center;}
+
+ /* --- hide the sub levels and give them a positon absolute so that they take up no room */
+ #menu ul ul {visibility:hidden;}
+ /* --- make the second level visible when hover on first level list OR link */
+ #menu ul li:hover ul, #menu ul a:hover ul {visibility:visible; background:transparent url(../images/trans.gif);}
+ /* --- keep the third level hidden when you hover on first level list OR link */
+ #menu ul :hover ul ul{visibility:hidden;}
+ /* --- keep the fourth level hidden when you hover on second level list OR link */
+ #menu ul :hover ul :hover ul ul{visibility:hidden;}
+ /* --- make the third level visible when you hover over second level list OR link */
+ #menu ul :hover ul :hover ul{visibility:visible;}
+ /* --- make the fourth level visible when you hover over third level list OR link */
+ #menu ul :hover ul :hover ul :hover ul {visibility:visible;}
+
+
+ /* -- quick search (static) */
+ #SearchSpeed option{display:block}
+
+
+
+ #menubookmark p{color:white;text-align:right}
+
+
+
+
+
+
+
+ /* */
+ #center_content h3 {
+ border:2px solid #0fa1d0;
+ -moz-border-radius: 5px; /* Firefox */
+ -webkit-border-radius: 5px; /* Safari and Chrome */
+ -khtml-border-radius: 5px; /* Konqueror */
+ border-radius: 5px; /* Opera 10.5+, future browsers, and now also Internet Explorer 6+ using IE-CSS3 */
+
+ behavior: url(ie-css3.htc); /* This lets IE know to call the script on all elements which get the 'box' class */
+ }
+
+ #center_content .box h3 {border:none;} /* Title Box in dashboard */
+ #center_content h4 {}
+ #center_content #ssmenu {
+ -moz-border-radius: 5px; /* Firefox */
+ -webkit-border-radius: 5px; /* Safari and Chrome */
+ -khtml-border-radius: 5px; /* Konqueror */
+ border-radius: 5px; /* Opera 10.5+, future browsers, and now also Internet Explorer 6+ using IE-CSS3 */
+ behavior: url(ie-css3.htc); /* This lets IE know to call the script on all elements which get the 'box' class */
+ background:#0fa1d0;
+ }
+ #center_content #ssmenu a {
+ border:1px solid white;
+ -moz-border-radius: 5px; /* Firefox */
+ -webkit-border-radius: 5px; /* Safari and Chrome */
+ -khtml-border-radius: 5px; /* Konqueror */
+ border-radius: 5px;/* Opera 10.5+, future browsers, and now also Internet Explorer 6+ using IE-CSS3 */
+ behavior: url(ie-css3.htc); /* This lets IE know to call the script on all elements which get the 'box' class */
+
+margin:0 5px;padding:2px 5px; color:white;
+text-decoration:none;
+}
+ /* */
+ #center_content .box_left ul.block_form {list-style:none;}
+ #center_content .box_left ul.block_form li {clear:both;}
+ #center_content .box_left ul.block_form li h5 {font-size:12px; background:transparent url(../images/plus.gif) top right no-repeat; border-bottom:1px solid #52beea; cursor:pointer;}
+
+
+
+
+
+
+
+
+
+
+
+
+
+#center_footer a,.left_footer a, .right_footer a {color:#FFFFFF;text-decoration:none;}
+.right_footer{color:#a8549b;}
+
+.left_footer{color:#a8549b;font-size:11px;}
+#center_footer {color:#a8549b; text-align:center}
+/*.left_footer_login{color:#a8549b;font-size:11px;}
+.left_footer_login a{color:#FFFFFF;text-decoration:none;}*/
+
+
+
+
+
+
+
+
+
+.sidebarmenu h3.menuitem{background:url(../images/sidebar_menu_top.png) no-repeat center top;
+display: block;position: relative;width:185px;height:31px;margin:0 0 5px 0;line-height:31px;padding:0px 0 0 10px;
+}
+.sidebarmenu h3.menuitem a{text-decoration: none;color: #fff;}
+.sidebarmenu a.menuitem_green{background:url(../images/green_bt.png) no-repeat center top;
+color: #fff;display: block;position: relative;width:185px;height:31px;margin:0 0 5px 0;line-height:31px;padding:0px 0 0 10px;text-decoration: none;
+}
+.sidebarmenu a.menuitem_red{background:url(../images/red_bt.png) no-repeat center top;
+color: #fff;line-height:31px;text-decoration: none;
+}
+.sidebarmenu a.menuitem:hover{background:url(../images/sidebar_menu_top_a.png) no-repeat center top;}
+.sidebarmenu a.menuitem_green:hover{background:url(../images/green_bt_a.png) no-repeat center top;}
+.sidebarmenu a.menuitem_red:hover{background:url(../images/red_bt_a.png) no-repeat center top;}
+
+.sidebarmenu a.menuitem:visited, .sidebarmenu .menuitem:active{
+color: white;
+}
+.sidebarmenu a.menuitem .statusicon{
+border: none;
+}
+
+.sidebarmenu div.submenu{
+background: white;
+}
+.sidebarmenu div.submenu ul{
+list-style-type: none;
+}
+.sidebarmenu div.submenu ul li{
+border-bottom: 1px dotted #bfd1d9;
+}
+.sidebarmenu div.submenu ul li a{
+color: black;
+text-decoration: none;
+}
+.sidebarmenu div.submenu ul li a:hover{
+background: #e2f0ff;
+color: #0e4354;
+}
+
+.sidebar_search{
+background:url(../images/sidebar_menu_top.png) no-repeat center;
+}
+input.search_input{
+border:1px #bdebfd solid;
+background:#92dbf8;
+color:#096184;
+font-size:11px;
+}
+input.search_submit{
+background:none;
+border:none;
+}
+
+
+
+
+.dataTableBase,
+.dataTable2,
+.dataTable
+{
+text-align: left;
+border-collapse: collapse;
+}
+.dataTableBase thead th.rounded-company,
+.dataTable2 thead th.rounded-company,
+.dataTable thead th.rounded-company
+{
+background: #60c8f2 url('../images/left.jpg') left top no-repeat;
+}
+.dataTableBase thead th.rounded-q4,
+.dataTable2 thead th.rounded-q4,
+.dataTable thead th.rounded-q4
+{
+background: #60c8f2 url('../images/right.jpg') right top no-repeat;
+}
+.dataTableBase th,
+.dataTable2 th,
+.dataTable th
+{
+font-weight: normal;
+font-size: 13px;
+color: #039;
+background: #60c8f2;
+}
+.dataTableBase td,
+.dataTable2 td,
+.dataTable td
+{
+background: #ecf8fd;
+border-top: 1px solid #fff;
+color: #669;
+}
+.dataTable2 tfoot td.rounded-foot-left,
+.dataTable tfoot td.rounded-foot-left
+{
+background: #ecf8fd url('../images/botleft.jpg') left bottom no-repeat;
+}
+.dataTable2 tfoot td.rounded-foot-right,
+.dataTable tfoot td.rounded-foot-right
+{
+background: #ecf8fd url('../images/botright.jpg') right bottom no-repeat;
+}
+.dataTable2 tbody tr:hover td,
+.dataTable tbody tr:hover td
+{
+background: #d2e7f0;
+}
+.dataTable2 .row_action,
+.dataTable .row_action a.button, .dataTable .row_action input.button {width:150px;margin: 1px;}
+
+.dataTable .row_status {width:55px;}
+.sorting_asc {
+ background: url('../images/sort_asc.png') no-repeat center right;
+}
+
+.sorting_desc {
+ background: url('../images/sort_desc.png') no-repeat center right;
+}
+
+.sorting {
+ background: url('../images/sort_both.png') no-repeat center right;
+}
+
+
+
+
+
+.question {
+text-align: center;
+
+font-size: 13px;
+line-height: 1.5em;
+background: url('../images/bubble.png') left top no-repeat;
+
+text-shadow: 0px 1px 0px #fff;
+
+opacity: 0;
+}
+
+
+
+
+
+
+
+
+
+
+input[type=submit].button {border:none;}
+a.button {}
+input[type=submit]:hover.button,
+a:hover.button{ text-decoration:underline;}
+
+.button{ line-height:31px; text-decoration:none; color:#FFFFFF; text-shadow:1px 1px #3597bf; background:url(../images/bt_blue_center.gif) repeat-x center;-moz-border-radius:7px;}
+
+
+
+.button_nav .ActionYes,
+.button_nav .yes{
+cursor: pointer;
+color: #434d17;
+text-shadow: 0px 1px 0px #fff;
+background: url('../images/bt_green_center.gif') left top repeat-x;
+}
+
+.button_nav .ActionBack,
+.button_nav .cancel {
+cursor: pointer;
+color: #fff;
+text-shadow: 0px 1px 0px #000;
+background: url('../images/bt_red_center.gif') left top repeat-x;
+}
+
+
+
+
+#center_content .box_right {
+ border:2px solid #0fa1d0;
+ -moz-border-radius: 5px; /* Firefox */
+ -webkit-border-radius: 5px; /* Safari and Chrome */
+ -khtml-border-radius: 5px; /* Konqueror */
+ border-radius: 5px; /* Opera 10.5+, future browsers, and now also Internet Explorer 6+ using IE-CSS3 */
+
+ behavior: url(ie-css3.htc); /* This lets IE know to call the script on all elements which get the 'box' class */
+
+ background:#ecf8fd;
+ list-style:none;
+}
+
+#center_content .box_right h4 {margin:5px 0 0 0; padding:0; text-align:center; }
+#center_content .box_right ul {padding:0;list-style:none;}
+#center_content .box_right ul li {clear:both;}
+/*
+a.bt_green{display:block; line-height:31px; text-decoration:none; color:#FFFFFF; text-shadow:1px 1px #8fa42b;}
+a.bt_green strong{ background:url(../images/bt_green_center.gif) repeat-x center;}
+a.bt_green span.bt_green_lft{background:url(../images/bt_green_left.gif) no-repeat center right;}
+a.bt_green span.bt_green_r{background:url(../images/bt_green_r.gif) no-repeat center right;}
+a:hover.bt_green{ text-decoration:underline;}
+*/
+
+
+
+
+
+/*a.bt_red{line-height:31px; text-decoration:none; color:#FFFFFF; text-shadow:1px 1px #c24739;}
+a.bt_red strong{background:url(../images/bt_red_center.gif) repeat-x center;}
+a.bt_red span.bt_red_lft{background:url(../images/bt_red_left.gif) no-repeat center right;}
+a.bt_red span.bt_red_r{background:url(../images/bt_red_r.gif) no-repeat center right;}
+a:hover.bt_red{ text-decoration:underline;}*/
+
+
+.sidebar_box_top{background:url(../images/sidebar_box_top.gif) no-repeat center bottom;}
+.sidebar_box_bottom{background:url(../images/sidebar_box_bottom.gif) no-repeat center bottom;}
+.sidebar_box_content{background-color:#ecf8fd; }
+
+.sidebar_box_content h3{ color:#49bae8; font-size:18px;font-weight:normal;}
+.sidebar_box_content h4{ color:#f75744; font-size:18px; font-weight:normal;}
+.sidebar_box_content h5{ color:#a4bf40; font-size:18px; font-weight:normal;}
+.sidebar_box_content p{ font-size:11px; text-align:left; line-height:17px;}
+
+.sidebar_box_content ul{
+list-style:none;
+}
+.sidebar_box_content ul li{
+background:url(../images/list_bullet.gif) no-repeat left top;
+background-position:0px 10px;
+}
+
+
+ul.messageStack { list-style:none;}
+ul.messageStack li{border:1px #e9e6c7 solid;background-position:15px 10px;}
+.messageStackWarning{background:url(../images/warning.png) no-repeat left #fcfae9;}
+.messageStackSuccess{background:url(../images/valid.png) no-repeat left #edfce9;}
+.messageStackError{background:url(../images/error.png) no-repeat left #fce9e9;}
+
+/*--------------*/
+div.pagination {
+
+
+text-align:center;
+
+font-size:11px;
+}
+
+div.pagination a {
+
+border: 1px solid #52bfea;
+text-decoration: none;
+color: #52bfea;
+}
+div.pagination a:hover, div.pagination a:active {
+border:1px solid #52bfea;
+color: #fff;
+background-color: #52bfea;
+}
+div.pagination span.current {
+border: 1px solid #52bfea;
+font-weight: bold;
+background-color: #52bfea;
+color: #FFF;
+}
+div.pagination span.disabled {
+border: 1px solid #f3f3f3;
+color: #ccc;
+}
+
+
+
+
+/* Block formulaire central */
+ .block_form {
+-moz-border-radius:5px;
+-webkit-border-radius:5px;
+-khtml-border-radius: 5px; /* Konqueror */
+border-radius: 5px;
+text-align: left;
+background:#ecf8fd;
+}
+
+ form .block_input { text-shadow:0 1px 0 #fff;-moz-border-radius:6px; -webkit-border-radius:6px; text-align: left; background:#ecf8fd;line-height:30px;}
+
+/* central form .block_input */
+ input{ background:url(../images/input.gif) repeat-x 0 0; color : #000; font-family : Verdana,Arial,Helvetica,sans-serif; font-size : 1em;-moz-border-radius:6px; -webkit-border-radius:6px;border:none;}
+
+ form .block_input .hasDatepicker{ text-align: left; background:#DEDADE;line-height:30px;}
+ fieldset { border:none; }
+
+ fieldset label { line-height: 18px; text-align: left; }
+ fieldset ul { list-style:none;padding-left:0.1em;}
+
+ form .block_input .hasDatepicker{ text-align: left; background:#DEDADE;float:left;line-height:30px;}
+ form .block_field { text-shadow:0 1px 0 #fff;-moz-border-radius:6px; -webkit-border-radius:6px; text-align: left;background:#eee;}
+
+
+ .block_form .edit.box_right #cat_list_in_edit{overflow:auto;background:white;}
+ .block_form .edit.box_right #cat_list_in_edit li{line-height:15px; }
+
+
+ div.box {background:#ecf8fd;-moz-border-radius:7px; -webkit-border-radius:7px;}
+
+.top, .bottom {
+ background:#ecf8fd;
+ border:1px solid #52beea;
+}
+
+
Added: trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/css/ie-css3.htc
===================================================================
--- trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/css/ie-css3.htc (rev 0)
+++ trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/css/ie-css3.htc 2012-04-15 07:17:18 UTC (rev 4234)
@@ -0,0 +1,323 @@
+--Do not remove this if you are using--
+Original Author: Remiz Rahnas
+Original Author URL: http://www.htmlremix.com
+Published date: 2008/09/24
+
+Changes by Nick Fetchak:
+- IE8 standards mode compatibility
+- VML elements now positioned behind original box rather than inside of it - should be less prone to breakage
+- Added partial support for 'box-shadow' style
+- Checks for VML support before doing anything
+- Updates VML element size and position via timer and also via window resize event
+- lots of other small things
+Published date : 2010/03/14
+http://fetchak.com/ie-css3
+
+Thanks to TheBrightLines.com (http://www.thebrightlines.com/2009/12/03/using-ies-filter-in-a-cross-browser-way) for enlightening me about the DropShadow filter
+
+<public:attach event="ondocumentready" onevent="ondocumentready('v08vnSVo78t4JfjH')" />
+<script type="text/javascript">
+
+timer_length = 200; // Milliseconds
+border_opacity = false; // Use opacity on borders of rounded-corner elements? Note: This causes antialiasing issues
+
+
+// supportsVml() borrowed from http://stackoverflow.com/questions/654112/how-do-you-detect-support-for-vml-or-svg-in-a-browser
+function supportsVml() {
+ if (typeof supportsVml.supported == "undefined") {
+ var a = document.body.appendChild(document.createElement('div'));
+ a.innerHTML = '<v:shape id="vml_flag1" adj="1" />';
+ var b = a.firstChild;
+ b.style.behavior = "url(#default#VML)";
+ supportsVml.supported = b ? typeof b.adj == "object": true;
+ a.parentNode.removeChild(a);
+ }
+ return supportsVml.supported
+}
+
+
+// findPos() borrowed from http://www.quirksmode.org/js/findpos.html
+function findPos(obj) {
+ var curleft = curtop = 0;
+
+ if (obj.offsetParent) {
+ do {
+ curleft += obj.offsetLeft;
+ curtop += obj.offsetTop;
+ } while (obj = obj.offsetParent);
+ }
+
+ return({
+ 'x': curleft,
+ 'y': curtop
+ });
+}
+
+function createBoxShadow(element, vml_parent) {
+ var style = element.currentStyle['iecss3-box-shadow'] || element.currentStyle['-moz-box-shadow'] || element.currentStyle['-webkit-box-shadow'] || element.currentStyle['box-shadow'] || '';
+ var match = style.match(/^(\d+)px (\d+)px (\d+)px/);
+ if (!match) { return(false); }
+
+
+ var shadow = document.createElement('v:roundrect');
+ shadow.userAttrs = {
+ 'x': parseInt(RegExp.$1 || 0),
+ 'y': parseInt(RegExp.$2 || 0),
+ 'radius': parseInt(RegExp.$3 || 0) / 2
+ };
+ shadow.position_offset = {
+ 'y': (0 - vml_parent.pos_ieCSS3.y - shadow.userAttrs.radius + shadow.userAttrs.y),
+ 'x': (0 - vml_parent.pos_ieCSS3.x - shadow.userAttrs.radius + shadow.userAttrs.x)
+ };
+ shadow.size_offset = {
+ 'width': 0,
+ 'height': 0
+ };
+ shadow.arcsize = element.arcSize +'px';
+ shadow.style.display = 'block';
+ shadow.style.position = 'absolute';
+ shadow.style.top = (element.pos_ieCSS3.y + shadow.position_offset.y) +'px';
+ shadow.style.left = (element.pos_ieCSS3.x + shadow.position_offset.x) +'px';
+ shadow.style.width = element.offsetWidth +'px';
+ shadow.style.height = element.offsetHeight +'px';
+ shadow.style.antialias = true;
+ shadow.className = 'vml_box_shadow';
+ shadow.style.zIndex = element.zIndex - 1;
+ shadow.style.filter = 'progid:DXImageTransform.Microsoft.Blur(pixelRadius='+ shadow.userAttrs.radius +',makeShadow=true,shadowOpacity='+ element.opacity +')';
+
+ element.parentNode.appendChild(shadow);
+ //element.parentNode.insertBefore(shadow, element.element);
+
+ // For window resizing
+ element.vml.push(shadow);
+
+ return(true);
+}
+
+function createBorderRect(element, vml_parent) {
+ if (isNaN(element.borderRadius)) { return(false); }
+
+ element.style.background = 'transparent';
+ element.style.borderColor = 'transparent';
+
+ var rect = document.createElement('v:roundrect');
+ rect.position_offset = {
+ 'y': (0.5 * element.strokeWeight) - vml_parent.pos_ieCSS3.y,
+ 'x': (0.5 * element.strokeWeight) - vml_parent.pos_ieCSS3.x
+ };
+ rect.size_offset = {
+ 'width': 0 - element.strokeWeight,
+ 'height': 0 - element.strokeWeight
+ };
+ rect.arcsize = element.arcSize +'px';
+ rect.strokeColor = element.strokeColor;
+ rect.strokeWeight = element.strokeWeight +'px';
+ rect.stroked = element.stroked;
+ rect.className = 'vml_border_radius';
+ rect.style.display = 'block';
+ rect.style.position = 'absolute';
+ rect.style.top = (element.pos_ieCSS3.y + rect.position_offset.y) +'px';
+ rect.style.left = (element.pos_ieCSS3.x + rect.position_offset.x) +'px';
+ rect.style.width = (element.offsetWidth + rect.size_offset.width) +'px';
+ rect.style.height = (element.offsetHeight + rect.size_offset.height) +'px';
+ rect.style.antialias = true;
+ rect.style.zIndex = element.zIndex - 1;
+
+ if (border_opacity && (element.opacity < 1)) {
+ rect.style.filter = 'progid:DXImageTransform.Microsoft.Alpha(Opacity='+ parseFloat(element.opacity * 100) +')';
+ }
+
+ var fill = document.createElement('v:fill');
+ fill.color = element.fillColor;
+ fill.src = element.fillSrc;
+ fill.className = 'vml_border_radius_fill';
+ fill.type = 'tile';
+ fill.opacity = element.opacity;
+
+ // Hack: IE6 doesn't support transparent borders, use padding to offset original element
+ isIE6 = /msie|MSIE 6/.test(navigator.userAgent);
+ if (isIE6 && (element.strokeWeight > 0)) {
+ element.style.borderStyle = 'none';
+ element.style.paddingTop = parseInt(element.currentStyle.paddingTop || 0) + element.strokeWeight;
+ element.style.paddingBottom = parseInt(element.currentStyle.paddingBottom || 0) + element.strokeWeight;
+ }
+
+ rect.appendChild(fill);
+ element.parentNode.appendChild(rect);
+ //element.parentNode.insertBefore(rect, element.element);
+
+ // For window resizing
+ element.vml.push(rect);
+
+ return(true);
+}
+
+function createTextShadow(element, vml_parent) {
+ if (!element.textShadow) { return(false); }
+
+ var match = element.textShadow.match(/^(\d+)px (\d+)px (\d+)px (#?\w+)/);
+ if (!match) { return(false); }
+
+
+ //var shadow = document.createElement('span');
+ var shadow = element.cloneNode(true);
+ var radius = parseInt(RegExp.$3 || 0);
+ shadow.userAttrs = {
+ 'x': parseInt(RegExp.$1 || 0) - (radius),
+ 'y': parseInt(RegExp.$2 || 0) - (radius),
+ 'radius': radius / 2,
+ 'color': (RegExp.$4 || '#000')
+ };
+ shadow.position_offset = {
+ 'y': (0 - vml_parent.pos_ieCSS3.y + shadow.userAttrs.y),
+ 'x': (0 - vml_parent.pos_ieCSS3.x + shadow.userAttrs.x)
+ };
+ shadow.size_offset = {
+ 'width': 0,
+ 'height': 0
+ };
+ shadow.style.color = shadow.userAttrs.color;
+ shadow.style.position = 'absolute';
+ shadow.style.top = (element.pos_ieCSS3.y + shadow.position_offset.y) +'px';
+ shadow.style.left = (element.pos_ieCSS3.x + shadow.position_offset.x) +'px';
+ shadow.style.antialias = true;
+ shadow.style.behavior = null;
+ shadow.className = 'ieCSS3_text_shadow';
+ shadow.innerHTML = element.innerHTML;
+ // For some reason it only looks right with opacity at 75%
+ shadow.style.filter = '\
+ progid:DXImageTransform.Microsoft.Alpha(Opacity=75)\
+ progid:DXImageTransform.Microsoft.Blur(pixelRadius='+ shadow.userAttrs.radius +',makeShadow=false,shadowOpacity=100)\
+ ';
+
+ var clone = element.cloneNode(true);
+ clone.position_offset = {
+ 'y': (0 - vml_parent.pos_ieCSS3.y),
+ 'x': (0 - vml_parent.pos_ieCSS3.x)
+ };
+ clone.size_offset = {
+ 'width': 0,
+ 'height': 0
+ };
+ clone.style.behavior = null;
+ clone.style.position = 'absolute';
+ clone.style.top = (element.pos_ieCSS3.y + clone.position_offset.y) +'px';
+ clone.style.left = (element.pos_ieCSS3.x + clone.position_offset.x) +'px';
+ clone.className = 'ieCSS3_text_shadow';
+
+
+ element.parentNode.appendChild(shadow);
+ element.parentNode.appendChild(clone);
+
+ element.style.visibility = 'hidden';
+
+ // For window resizing
+ element.vml.push(clone);
+ element.vml.push(shadow);
+
+ return(true);
+}
+
+function ondocumentready(classID) {
+ if (!supportsVml()) { return(false); }
+
+ if (this.className.match(classID)) { return(false); }
+ this.className = this.className.concat(' ', classID);
+
+ // Add a namespace for VML (IE8 requires it)
+ if (!document.namespaces.v) { document.namespaces.add("v", "urn:schemas-microsoft-com:vml"); }
+
+ // Check to see if we've run once before on this page
+ if (typeof(window.ieCSS3) == 'undefined') {
+ // Create global ieCSS3 object
+ window.ieCSS3 = {
+ 'vmlified_elements': new Array(),
+ 'update_timer': setInterval(updatePositionAndSize, timer_length)
+ };
+
+ if (typeof(window.onresize) == 'function') { window.ieCSS3.previous_onresize = window.onresize; }
+
+ // Attach window resize event
+ window.onresize = updatePositionAndSize;
+ }
+
+
+ // These attrs are for the script and have no meaning to the browser:
+ this.borderRadius = parseInt(this.currentStyle['iecss3-border-radius'] ||
+ this.currentStyle['-moz-border-radius'] ||
+ this.currentStyle['-webkit-border-radius'] ||
+ this.currentStyle['border-radius'] ||
+ this.currentStyle['-khtml-border-radius']);
+ this.arcSize = Math.min(this.borderRadius / Math.min(this.offsetWidth, this.offsetHeight), 1);
+ this.fillColor = this.currentStyle.backgroundColor;
+ this.fillSrc = this.currentStyle.backgroundImage.replace(/^url\("(.+)"\)$/, '$1');
+ this.strokeColor = this.currentStyle.borderColor;
+ this.strokeWeight = parseInt(this.currentStyle.borderWidth);
+ this.stroked = 'true';
+ if (isNaN(this.strokeWeight) || (this.strokeWeight == 0)) {
+ this.strokeWeight = 0;
+ this.strokeColor = fillColor;
+ this.stroked = 'false';
+ }
+ this.opacity = parseFloat(this.currentStyle.opacity || 1);
+ this.textShadow = this.currentStyle['text-shadow'];
+
+ this.element.vml = new Array();
+ this.zIndex = parseInt(this.currentStyle.zIndex);
+ if (isNaN(this.zIndex)) { this.zIndex = 0; }
+
+ // Find which element provides position:relative for the target element (default to BODY)
+ vml_parent = this;
+ var limit = 100, i = 0;
+ do {
+ vml_parent = vml_parent.parentElement;
+ i++;
+ if (i >= limit) { return(false); }
+ } while ((typeof(vml_parent) != 'undefined') && (vml_parent.currentStyle.position != 'relative') && (vml_parent.tagName != 'BODY'));
+
+ vml_parent.pos_ieCSS3 = findPos(vml_parent);
+ this.pos_ieCSS3 = findPos(this);
+
+ var rv1 = createBoxShadow(this, vml_parent);
+ var rv2 = createBorderRect(this, vml_parent);
+ var rv3 = createTextShadow(this, vml_parent);
+ if (rv1 || rv2 || rv3) { window.ieCSS3.vmlified_elements.push(this.element); }
+
+ if (typeof(vml_parent.document.ieCSS3_stylesheet) == 'undefined') {
+ vml_parent.document.ieCSS3_stylesheet = vml_parent.document.createStyleSheet();
+ vml_parent.document.ieCSS3_stylesheet.addRule("v\\:roundrect", "behavior: url(#default#VML)");
+ vml_parent.document.ieCSS3_stylesheet.addRule("v\\:fill", "behavior: url(#default#VML)");
+ // Compatibility with IE7.js
+ vml_parent.document.ieCSS3_stylesheet.ie7 = true;
+ }
+}
+
+function updatePositionAndSize() {
+ if (typeof(window.ieCSS3.vmlified_elements) != 'object') { return(false); }
+
+ for (var i in window.ieCSS3.vmlified_elements) {
+ var el = window.ieCSS3.vmlified_elements[i];
+
+ if (typeof(el.vml) != 'object') { continue; }
+
+ for (var z in el.vml) {
+ //var parent_pos = findPos(el.vml[z].parentNode);
+ var new_pos = findPos(el);
+ new_pos.x = (new_pos.x + el.vml[z].position_offset.x) + 'px';
+ new_pos.y = (new_pos.y + el.vml[z].position_offset.y) + 'px';
+ if (el.vml[z].style.left != new_pos.x) { el.vml[z].style.left = new_pos.x; }
+ if (el.vml[z].style.top != new_pos.y) { el.vml[z].style.top = new_pos.y; }
+
+ var new_size = {
+ 'width': parseInt(el.offsetWidth + el.vml[z].size_offset.width),
+ 'height': parseInt(el.offsetHeight + el.vml[z].size_offset.height)
+ }
+ if (el.vml[z].offsetWidth != new_size.width) { el.vml[z].style.width = new_size.width +'px'; }
+ if (el.vml[z].offsetHeight != new_size.height) { el.vml[z].style.height = new_size.height +'px'; }
+ }
+ }
+
+ if (event && (event.type == 'resize') && typeof(window.ieCSS3.previous_onresize) == 'function') { window.ieCSS3.previous_onresize(); }
+}
+</script>
+
Added: trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/css/squelete.css
===================================================================
--- trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/css/squelete.css (rev 0)
+++ trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/css/squelete.css 2012-04-15 07:17:18 UTC (rev 4234)
@@ -0,0 +1,473 @@
+
+
+
+
+body{
+
+margin:0 auto;
+}
+
+.separator,
+.spacer,
+.clear{
+clear:both;
+}
+
+.fright{ float:right; }
+.fleft {float:left; }
+
+.inline { display:inline-block; }
+.inline * { display:inline-block; }
+
+.w_100 {width:99%;}
+.w_90 {width:89%;}
+.w_80 {width:79%;}
+.w_70 {width:69%;}
+.w_60 {width:59%;}
+.w_50 {width:49%;}
+.w_40 {width:39%;}
+.w_30 {width:29%;}
+
+
+h2,
+h3 {
+padding:0px 0 15px 0;
+margin:0px;
+clear:both;
+width:100%;
+}
+
+h3{
+padding:15px 0 5px 20px;
+margin:0px;
+float:left;
+clear:both;
+}
+
+a.forgot_pass{
+float:right;
+padding:0 0 0 18px;
+display:block;
+margin:15px 20px 0 0;
+}
+
+img {border:none;}
+
+
+
+.button_action,
+.button_nav {clear:both}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/* STRUCTURE */
+
+#main_container{
+ margin:0 auto;
+ min-width:900px;
+ width:85%;
+ padding:0;
+}
+
+ #header{
+ width:100%;
+ height:65px;
+ }
+
+ #main_content{
+ margin:0 auto;
+ width:100%;
+ height:auto;
+ padding:0px 0 50px 0;
+ }
+
+
+ #menu {padding:0 1%; float:left; width:97%;}
+/* #center_content {} */
+
+ .footer{width:100%;height:87px;}
+
+
+
+
+
+
+
+ /* -- HEADER -- */
+ .header_login{ width:600px; margin:auto; }
+ .logo{ float:left; padding:5px 0 0 0; }
+ .right_header a.messages {
+ height: 10px;
+ margin: 0;
+ padding: 4px 0 0;
+ width: 20px;
+ }
+ .right_header{ width:550px; float:right; padding:45px 0 0 0; }
+ .right_header a{ margin:0 5px 0 5px; }
+ .right_header a.logout{ padding-right:20px; }
+
+
+ /* -- CENTRAL -- */
+
+ #center_content h3 {padding:5px 0 5px 20px;width:98%;}
+ #center_content #ssmenu {height:15px; padding:5px 15px;}
+ .box_left { clear:both; margin-left:2px; float:left; position:relative; width:69%; }
+ .box_right { margin-right:8px;padding:0 5px; float:right; position:relative; width:28%; }
+
+
+
+
+
+ /*---------------- menu----------------------*/
+ /* remove all the bullets, borders and padding from the default list styling */
+ #menu ul {padding:0;margin:0; height:34px;width:55%;float:left;}
+
+ /* style the sub-level lists */
+ #menu ul ul {width: auto;}
+
+ /* float the top list items to make it horizontal and a relative positon so that you can control the dropdown menu positon */
+ #menu ul li {float:left;height:34px;}
+
+ /* style the sub level list items */
+ #menu ul ul li {display:block;width: auto;height:auto;position:relative;}
+
+ /* style the links for the top level */
+ #menu a, #menu a:visited {display:block;float:left;height:100%;padding:0 21px 0 17px;}
+
+ /* style the sub level links */
+ #menu ul ul a, #menu ul ul a:visited {display:block;width:12em;height:100%;padding:1em 1em;}
+ #menu ul table ul a, #menu ul table ul a:visited { width:12em;}
+
+ /* style the table so that it takes no part in the layout - required for IE to work */
+ #menu table {position:absolute; left:0; top:0; font-size:1em; z-index:-1;}
+ #menu ul ul table {left:-1px;}
+ #menu ul ul table ul.left {margin-left:2px;}
+ #menu li:hover {position:relative;}
+ * html #menu a:hover {position:relative;}
+
+ /* hide the sub levels and give them a positon absolute so that they take up no room */
+ #menu ul ul {position:absolute;height:0;top:34px;left:0;/*width:14em; */z-index:999;}
+
+ /* position the third level flyout menu */
+ #menu ul ul ul{left:14em;top:0;width:14em;}
+
+ /* position the third level flyout menu for a left flyout */
+ #menu ul ul ul.left {left:-14em;}
+
+ /* make the second level visible when hover on first level list OR link */
+ #menu ul li:hover ul, #menu ul a:hover ul { height:auto; padding-bottom:3em;}
+
+
+
+ /** Message general alert / info / warnign */
+ ul.messageStack {padding-left:0; margin-left:0;}
+ ul.messageStack li{width:91%;clear:both;padding:20px 20px 15px 60px;margin:0 0 10px 0;}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+.footer_login{width:600px;margin:auto;}
+
+.left_footer{float:left;padding:25px 0 0 10px;}
+
+.right_footer{float:right;padding:25px 10px 0 0;}
+
+.left_footer_login{float:left;padding:15px 0 0 10px;}
+
+.right_footer_login{float:right;padding:15px 10px 0 0;}
+
+
+
+
+
+
+
+
+
+
+#center_content{
+clear:both;
+padding:10px;
+}
+
+/*.left_content{
+width:195px;
+float:left;
+padding:30px 0 0 10px;
+}
+.right_content{
+width:675px;
+float:left;
+padding:30px 0 0 10px;
+}*/
+
+.sidebarmenu{
+margin:0px 0;
+padding:0;
+width:195px;
+}
+.sidebarmenu h3#menuitem{
+display: block;position: relative;width:185px;height:31px;margin:0 0 5px 0;padding:0px 0 0 10px;
+}
+
+.sidebarmenu a#menuitem_green{
+display: block;position: relative;width:185px;height:31px;margin:0 0 5px 0;padding:0px 0 0 10px;
+}
+.sidebarmenu a#menuitem_red{
+display: block;position: relative;width:185px;height:31px;margin:0 0 5px 0;padding:0px 0 0 10px;
+}
+
+
+
+.sidebarmenu a#menuitem .statusicon{
+position: absolute;
+top:11px;
+right:7px;
+
+}
+
+
+.sidebarmenu div.submenu ul{
+
+margin: 0;
+padding: 0 0 5px 0;
+}
+
+.sidebarmenu div.submenu ul li a{
+display: block;
+padding:5px 0;
+padding-left: 10px;
+}
+.sidebarmenu div.submenu ul li a:hover{
+background: #e2f0ff;
+}
+
+.sidebar_search{
+width:195px;
+height:31px;
+margin:0 0 5px 0;
+}
+input.search_input{
+width:155px;
+height:16px;
+margin:5px 0 0 5px;
+
+
+padding:4px 0 0 2px;
+float:left;
+
+}
+input.search_submit{
+float:left;
+margin:7px 0 0 8px;
+}
+
+
+
+
+.dataTableBase,
+.dataTable2,
+.dataTable
+{
+margin:0px;
+width:100%;
+
+
+}
+.dataTableBase thead th.rounded-company,
+.dataTable2 thead th.rounded-company,
+.dataTable thead th.rounded-company
+{
+width:26px;
+
+}
+
+.dataTableBase th,
+.dataTable2 th,
+.dataTable th
+{
+padding: 0 8px;
+}
+.dataTableBase td,
+.dataTable2 td,
+.dataTable td
+{
+padding: 0 8px;
+
+}
+
+.dataTable2 .row_action,
+.dataTable .row_action a.button, .dataTable .row_action input.button {width:150px;margin: 1px;}
+
+.dataTable .row_status {width:55px;}
+
+.question {
+position: absolute;
+display: inline;
+
+width: 174px;
+height: 78px;
+
+padding: 10px 0 0 0;
+
+margin-left: -7em;
+margin-top: -6em;
+
+}
+
+.yes{
+margin-top: .5em;
+margin-right: .5em;
+
+display: inline-block;
+width: 63px;
+height: 21px;
+
+}
+.cancel {
+margin-top: .5em;
+margin-right: .5em;
+
+display: inline-block;
+width: 63px;
+height: 21px;
+
+}
+
+a.bt_green{display:block; float:right; margin:10px 5px 10px 5px;}
+a.bt_green strong{width:auto;height:31px; padding:0 10px 0 10px;display:block; float:left;}
+a.bt_green span.bt_green_lft{width:10px;height:31px;display:block; float:left;}
+a.bt_green span.bt_green_r{width:10px;height:31px;display:block; float:left;}
+
+
+
+.button{ display:block; float:right; margin:10px 5px 10px 5px; padding:0 10px 0 10px; }
+input[type=submit].button {height:31px;}
+a.button {}
+
+a.bt_red{display:block; float:right; margin:10px 5px 10px 5px; }
+a.bt_red strong{width:auto;height:31px; padding:0 10px 0 10px;display:block; float:left;}
+a.bt_red span.bt_red_lft{width:10px;height:31px;display:block; float:left;}
+a.bt_red span.bt_red_r{width:10px;height:31px;display:block; float:left;}
+
+
+.sidebar_box{
+width:195px;
+padding:15px 0 5px 0;
+}
+.sidebar_box_top{width:195px;height:8px;}
+.sidebar_box_bottom{width:195px;height:8px;}
+.sidebar_box_content{width:175px;height:auto; padding:0 10px 0 10px;}
+
+.sidebar_box_content h3{ float:left; font-size:18px; margin:0px;padding:0px;}
+.sidebar_box_content h4{ float:left; font-size:18px; margin:0px;padding:0px; }
+.sidebar_box_content h5{ float:left; font-size:18px; margin:0px;padding:0px;}
+.sidebar_box_content p{padding:5px 0 5px 0; margin:0px; clear:both;line-height:17px;}
+img.sidebar_icon_right{
+float:right; padding:0 0 0 0;
+}
+.sidebar_box_content ul{
+padding:10px 0 10px 0;
+margin:0px;
+clear:both;
+}
+.sidebar_box_content ul li{
+padding:5px 0 5px 10px;
+}
+
+
+
+
+/*--------------*/
+div.pagination {
+width:625px;
+clear:both;
+padding:10px 0 10px 0;
+margin:0px;
+
+float:left;
+clear:both;
+
+}
+
+div.pagination a {
+padding: 2px 5px 2px 5px;
+margin-right: 2px;
+}
+
+div.pagination span.current {
+padding: 2px 5px 2px 5px;
+margin-right: 2px;
+}
+div.pagination span.disabled {
+padding: 2px 5px 2px 5px;
+margin-right: 2px;
+}
+
+#menubookmark p{margin:6px 0 0 0;}
+#page_admin option{padding:0;display:block; margin:0;}
+
+/* Block formulaire central */
+ .block_form {width:99%; margin:0;padding:5px 0.2em 10px 0.2em; display:inline-block;}
+ .block_form .tabs_lang{width:98%; float:left;}
+ .block_form div.tabPage {padding-left:0; padding-right:0;}
+ form .block_input { width:95%; margin:2px 1px; display:inline-block; text-align: left; padding: 0 5px; background:#ecf8fd;float:left;}
+
+/* central form .block_input */
+ input{ height:21px;}
+
+ form .block_input .hasDatepicker{ margin:0; display:inline-block; padding: 0 5px; min-width:0;}
+ fieldset { margin:0px; padding:5px;}
+ fieldset p { margin: 1em 0 0 0; }
+ fieldset input[type="text"] { min-width:65%; display:inline-block;}
+ fieldset label { width: 170px; line-height: 18px; margin-right: 10px; display:inline-block; padding: 0 0 2px 0;}
+ fieldset ul { padding-left:0.1em;}
+
+ form .block_input .hasDatepicker{ margin:0; display:inline-block; padding: 0 5px;float:left;line-height:30px; min-width:0;}
+ form .block_field { width:98.5%; margin:2px 0; display:inline-block; padding: 5px; float:left;}
+ form .block_field.tabs_lang{width:98%}
+ form .block_field.tabs_lang ul.ui-tabs-nav{padding:0; margin:0 -5px;}
+ form .block_field.tabs_lang ul.ui-tabs-panel{padding:0; margin:0 -5px;}
+
+ .block_form .edit.box_right label {width:20%;}
+ .block_form .edit.box_right #cat_list_in_edit{height:120px; overflow:auto;}
+
+ .block_form .edit.box_right .button_nav .button{margin:1px}
+
+ div.box {padding:5px 10px; margin: 5px 0;}
+
+
+
+/** Specific affichage categorie hierarchie by checkbox in edit product, content*/
+.CategoryView {overflow:auto; max-height:160px;}
\ No newline at end of file
Added: trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/data/icon_set.xml
===================================================================
--- trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/data/icon_set.xml (rev 0)
+++ trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/data/icon_set.xml 2012-04-15 07:17:18 UTC (rev 4234)
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<root>
+ <set>
+ </set>
+
+ <img>
+ <icon>
+ <admin_files>admin_files.png</admin_files>
+ <arrow_right>icon_arrow_right.gif</arrow_right>
+ <calendar>calendar.png</calendar>
+ <categories>categories.png</categories>
+ <copy_hover>copy_hover.png</copy_hover>
+ <copy>copy.png</copy>
+ <copyto>icon_copy.png</copyto>
+ <cross>cross.gif</cross>
+ <csv_hover>csv_hover.png</csv_hover>
+ <csv>csv.png</csv>
+ <current_folder>current_folder.png</current_folder>
+ <delete>icon_delete.png</delete>
+ <dir>icon_plus.png</dir>
+ <details_close>details_close.png</details_close>
+ <details_open>details_open.png</details_open>
+ <edit>icon_edit.png</edit>
+ <plus>icon_plus.gif</plus>
+ <deplis>icon_down.gif</deplis>
+ <plis>icon_arrow_right.gif</plis>
+ <info>icon_info.gif</info>
+ <install>install.gif</install>
+ <publiclink>icon_link.jpg</publiclink>
+ <stock>icon_stock.jpeg</stock>
+ <new>icon_add_new.png</new>
+ <noedit>icon_view.png</noedit>
+ <preview>previews.png</preview>
+ <view>icon_view.png</view>
+ <trash>icon_trash.gif</trash>
+ <refresh>refresh.png</refresh>
+ <config>settings.png</config>
+ <heldorder>arrow_switch.png</heldorder>
+ <childs>icon_plus.gif</childs>
+ <!-- <recup_order>
+ </recup_order> -->
+ <remove>remove.gif</remove>
+ <stats>icon_stats.png</stats>
+ <statistic>statistics.gif</statistic>
+ <send>icon_send.png</send>
+ <sendtest>icon_sendtest.png</sendtest>
+ <incarner>icon_incarn.png</incarner>
+
+ <inventaire_update>cog_add.png</inventaire_update>
+ <inventaire_export>arrow_switch.png</inventaire_export>
+
+ <dbdelete>icon_db_remove.png</dbdelete>
+ <dbrestore>icon_db_restore.png</dbrestore>
+ <dbupload>icon_db_upload.png</dbupload>
+ <dbdownload>icon_db_download.png</dbdownload>
+
+ <package_installed>icon_edit.png</package_installed>
+ <package_a_remove>icon_edit.png</package_a_remove>
+ <package_config>icon_edit.png</package_config>
+ <package_is_zip>icon_edit.png</package_is_zip>
+ <package_is_folder>icon_edit.png</package_is_folder>
+ </icon>
+ </img>
+
+
+ <gabarit>
+ <row_action_right>
+ <link>
+ <icon width="18" height="18">
+ <![CDATA[<a class="buttonimg %s" href="%s" %s>%_TEXT_%</a>]]>
+ </icon>
+ <text>
+ <![CDATA[<a class="button %s" href="%s" %s>%_TEXT_%</a>]]>
+ </text>
+ </link>
+ <button>
+
+ </button>
+ </row_action_right>
+
+ <row_action_left>
+ <mode>icon</mode>
+ <icon>
+ <![CDATA[<a class="buttonimg %s" href="%s" %s>%_TEXT_%</a>]]>
+ </icon>
+ <text>
+ <![CDATA[<a class="button %s" href="%s" %s>%_TEXT_%</a>]]>
+ </text>
+ </row_action_left>
+
+ <button_nav>
+ <link>
+ <icon width="18" height="18">
+ <![CDATA[<a class="buttonimg %s" href="%s" %s>%_TEXT_%</a>]]>
+ </icon>
+ <text>
+ <![CDATA[<a class="button %s" href="%s" %s>%_TEXT_%</a>]]>
+ </text>
+ </link>
+ <button>
+ </button>
+ <submit>
+ <icon width="18" height="18" src="true">
+ <![CDATA[<input type="submit" class="button %s" src="%_SRC_%" title="%_TEXT_%" value="%_TEXT_%" %s>]]>
+ </icon>
+ <text>
+ <![CDATA[<input type="submit" class="button %s" title="%_TEXT_%" value=" %s" %s>]]>
+ </text>
+ </submit>
+ </button_nav>
+ <button_action>
+ <link>
+ <icon width="18" height="18">
+ <![CDATA[<a class="buttonimg %s" href="%s" %s>%_TEXT_%</a>]]>
+ </icon>
+ <text>
+ <![CDATA[<a class="button %s" href="%s" %s>%_TEXT_%</a>]]>
+ </text>
+ </link>
+ <button>
+ <icon width="18" height="18" src="true">
+ <![CDATA[<input type="image" class="button %s" src="%_SRC_%" title="%_TEXT_%" value="%_TEXT_%" %s>]]>
+ </icon>
+ <text>
+ <![CDATA[<input type="submit" class="button %s" title="%_TEXT_%" value=" %s" %s>]]>
+ </text>
+ </button>
+ <submit>
+ <icon width="18" height="18" src="true">
+ <![CDATA[<input type="submit" class="button %s" src="%_SRC_%" title="%_TEXT_%" value="%_TEXT_%" %s>]]>
+ </icon>
+ <text>
+ <![CDATA[<input type="submit" class="button %s" title="%_TEXT_%" value=" %s" %s>]]>
+ </text>
+ </submit>
+ </button_action>
+ </gabarit>
+
+ <format>
+ <row_action>
+ <![CDATA[<div class="row_action">
+ <span class="view fils fleft"> %s </span>
+ <span class="view fils fright "> %s </span>
+ </div>]]>
+ </row_action>
+ <row_status>
+ <![CDATA[<div class="row_action">
+ <span class="view fils fleft"> %s </span>
+ <span class="view fils fright "> %s </span>
+ </div>]]>
+ </row_status>
+ <row_etat>
+ <![CDATA[
+ <span class="edit-input-value">
+ <span class="Val Val-%1$s txt">%2$s</span>
+ <span class="Val Val-%1$s img">
+ </span>
+ </span>
+ ]]>
+ </row_etat>
+ <row_flag>
+ <![CDATA[
+ <span class="edit-input-value">
+ <span class="Val Flag-%1$s txt">%2$s</span>
+ <span class="Val Flag-%1$s img">
+ </span>
+ </span>
+ ]]>
+ </row_flag>
+ </format>
+</root>
\ No newline at end of file
Added: trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/footer-1.php
===================================================================
--- trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/footer-1.php (rev 0)
+++ trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/footer-1.php 2012-04-15 07:17:18 UTC (rev 4234)
@@ -0,0 +1,12 @@
+<?php
+/*
+ $Id: footer-1.php, svn 14.07.2009 13:03:52 oscim Exp $
+// kate: space-indent on; indent-width 4; mixedindent off; indent-mode cstyle; word-wrap-marker-color #41C2A4
++-----------------------------------------------------------------------+
+| osCSS Open Source E-commerce |
++-----------------------------------------------------------------------+
+*/
+echo '';
+echo '';
+?>
+
Added: trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/gabarit-1.php
===================================================================
--- trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/gabarit-1.php (rev 0)
+++ trunk/extensions/IN-ADMIN-PANEL_stable/in-admin-panel/gabarit-1.php 2012-04-15 07:17:18 UTC (rev 4234)
@@ -0,0 +1,111 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.0
+ @date 06/02/11, 18:25
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+ /** Prechargement */
+ @include(DIR_WS_INCLUDES . 'content/'.$page_admin.'.top.inc');
+ require(DIR_WS_TEMPLATE.'inc/lib.template.php');
+ if (($init_theme=tep_test_gab_ele('inc/init_theme')) !=false) require($init_theme);
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML ...
[truncated message content] |
|
From: <os...@us...> - 2012-04-14 22:01:34
|
Revision: 4233
http://oscss.svn.sourceforge.net/oscss/?rev=4233&view=rev
Author: oscim
Date: 2012-04-14 22:01:28 +0000 (Sat, 14 Apr 2012)
Log Message:
-----------
mise a niveau de l'install pour copier les fichier de tables dans le dossier Documents/ .. /origin
Modified Paths:
--------------
trunk/catalog/install/includes/content/core.installdb.php
Modified: trunk/catalog/install/includes/content/core.installdb.php
===================================================================
--- trunk/catalog/install/includes/content/core.installdb.php 2012-04-14 21:49:33 UTC (rev 4232)
+++ trunk/catalog/install/includes/content/core.installdb.php 2012-04-14 22:01:28 UTC (rev 4233)
@@ -35,6 +35,7 @@
$driver = ( (strtolower( $this->db['DBMOTOR']) == 'mysqli')? 'mysql' : strtolower( $this->db['DBMOTOR']) );
+
// creation des tables
foreach(core::browse_rep($this->fs_document_root . 'install/includes/sql/'.$driver.'/tables/') as $file){
if(strpos($file['file'] , '.key')===false){
@@ -42,9 +43,14 @@
}
}
+
+
// add key
if($this->db['DBMOTOR_TYPE'] =='InnoDB')
foreach(core::browse_rep($this->fs_document_root . 'install/includes/sql/'.$driver.'/tables/') as $file){
+
+ 'Documents/'
+
if(strpos($file['file'] , '.key') > 0){
osc_db_upgrade($this->db['DB_DATABASE'], $this->fs_document_root . 'install/includes/sql/'.$driver.'/tables/'.$file['file'] , $this->db['DB_TABLE_PREFIX']);
}
@@ -58,6 +64,11 @@
}
}
+
+ // copy in document
+ parent::recurse_copy($this->fs_document_root . 'install/includes/sql/'.$driver.'/', $this->fs_document_root. 'Documents/admin/origin/db/');
+
+
if ($db_error != false) $this->PileMessage('error', core::l10n("Un problème à eu lieu durant la phase d'installation de la base de données" ) ) ;
else $this->PileMessage('succes', core::l10n("L'installation de la base de données est ok" ) ) ;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-14 21:49:40
|
Revision: 4232
http://oscss.svn.sourceforge.net/oscss/?rev=4232&view=rev
Author: oscim
Date: 2012-04-14 21:49:33 +0000 (Sat, 14 Apr 2012)
Log Message:
-----------
Suite gestion duplication de langue, et stabilisation
report dans le module de gestion des langues et gestion de status, et mise ?\195?\160 niveau du code
Ajout de fichier de clefs manquantes
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/oscss_DBIndex.php
trunk/catalog/admin/includes/modules/configuration/modlangue.php
trunk/catalog/admin/includes/modules/configuration/modstatus.php
Added Paths:
-----------
trunk/catalog/install/includes/sql/mysql/tables/osc_products_options.key.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_options_values.key.sql
Modified: trunk/catalog/admin/includes/classes/oscss_DBIndex.php
===================================================================
--- trunk/catalog/admin/includes/classes/oscss_DBIndex.php 2012-04-14 20:30:23 UTC (rev 4231)
+++ trunk/catalog/admin/includes/classes/oscss_DBIndex.php 2012-04-14 21:49:33 UTC (rev 4232)
@@ -77,6 +77,7 @@
if (in_array($ext, array('sql')) ){
$tmp = array(
'file'=>$file,
+ 'shortname'=> $name1,
'name'=> $name,
'extension'=>$ext,
'type'=>(($key) ? 't' : 'k' ),
Modified: trunk/catalog/admin/includes/modules/configuration/modlangue.php
===================================================================
--- trunk/catalog/admin/includes/modules/configuration/modlangue.php 2012-04-14 20:30:23 UTC (rev 4231)
+++ trunk/catalog/admin/includes/modules/configuration/modlangue.php 2012-04-14 21:49:33 UTC (rev 4232)
@@ -1,10 +1,10 @@
<?php
/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 30/12/11, 17:00
+ @date 14/04/2012, 17:00
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class modlangue Gestion des langues configurées sur la boutique
@@ -46,82 +46,75 @@
if (tep_not_null(self::$action)) {
switch (self::$action) {
- case 'insert':
- $name = tep_db_prepare_input($_POST['name']);
- $code = tep_db_prepare_input($_POST['code']);
- $image = tep_db_prepare_input($_POST['image']);
- $directory = tep_db_prepare_input($_POST['directory']);
- $sort_order = tep_db_prepare_input($_POST['sort_order']);
+ case 'insert':
+ $name = tep_db_prepare_input($_POST['name']);
+ $code = tep_db_prepare_input($_POST['code']);
+ $image = tep_db_prepare_input($_POST['image']);
+ $directory = tep_db_prepare_input($_POST['directory']);
+ $sort_order = tep_db_prepare_input($_POST['sort_order']);
- $res=$DB->query("insert into " . TABLE_LANGUAGES . " (name, code, image, directory, sort_order) values ('" . tep_db_input($name) . "', '" . tep_db_input($code) . "', '" . tep_db_input($image) . "', '" . tep_db_input($directory) . "', '" . tep_db_input($sort_order) . "')");
- $insert_id = $res->__get('insertId');
+ $res=$DB->query("insert into " . TABLE_LANGUAGES . " (name, code, image, directory, sort_order) values ('" . tep_db_input($name) . "', '" . tep_db_input($code) . "', '" . tep_db_input($image) . "', '" . tep_db_input($directory) . "', '" . tep_db_input($sort_order) . "')");
+ $insert_id = $res->__get('insertId');
- self::repliqu_db_lang($languages_id,$insert_id);
+ self::repliqu_db_lang($languages_id,$insert_id);
+ if (isset($_POST['default']) && ($_POST['default'] == 'on')) {
+ $DB->query("update " . TABLE_CONFIGURATION . " set configuration_value = '" . tep_db_input($code) . "' where configuration_key = 'DEFAULT_LANGUAGE'");
+ }
- if (isset($_POST['default']) && ($_POST['default'] == 'on')) {
- $DB->query("update " . TABLE_CONFIGURATION . " set configuration_value = '" . tep_db_input($code) . "' where configuration_key = 'DEFAULT_LANGUAGE'");
- }
+ tep_redirect(tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','lID'),false)));
+ break;
- tep_redirect(tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','lID'),false)));
- break;
- case 'save':
- $lID = tep_db_prepare_input($_GET['lID']);
- $name = tep_db_prepare_input($_POST['name']);
- $code = tep_db_prepare_input($_POST['code']);
- $image = tep_db_prepare_input($_POST['image']);
- $directory = tep_db_prepare_input($_POST['directory']);
- $sort_order = tep_db_prepare_input($_POST['sort_order']);
+ case 'save':
+ $lID = tep_db_prepare_input($_GET['lID']);
+ $name = tep_db_prepare_input($_POST['name']);
+ $code = tep_db_prepare_input($_POST['code']);
+ $image = tep_db_prepare_input($_POST['image']);
+ $directory = tep_db_prepare_input($_POST['directory']);
+ $sort_order = tep_db_prepare_input($_POST['sort_order']);
- tep_db_query("update " . TABLE_LANGUAGES . " set name = '" . tep_db_input($name) . "', code = '" . tep_db_input($code) . "', image = '" . tep_db_input($image) . "', directory = '" . tep_db_input($directory) . "', sort_order = '" . tep_db_input($sort_order) . "' where languages_id = '" . (int)$lID . "'");
+ tep_db_query("update " . TABLE_LANGUAGES . " set name = '" . tep_db_input($name) . "', code = '" . tep_db_input($code) . "', image = '" . tep_db_input($image) . "', directory = '" . tep_db_input($directory) . "', sort_order = '" . tep_db_input($sort_order) . "' where languages_id = '" . (int)$lID . "'");
- if ($_POST['default'] == 'on') {
- tep_db_query("update " . TABLE_CONFIGURATION . " set configuration_value = '" . tep_db_input($code) . "' where configuration_key = 'DEFAULT_LANGUAGE'");
- }
+ if ($_POST['default'] == 'on') {
+ tep_db_query("update " . TABLE_CONFIGURATION . " set configuration_value = '" . tep_db_input($code) . "' where configuration_key = 'DEFAULT_LANGUAGE'");
+ }
- tep_redirect(tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','lID'),false). 'lID=' . $_GET['lID']));
- break;
+ tep_redirect(tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','lID'),false). 'lID=' . $_GET['lID']));
+ break;
- case 'deleteconfirm':
- $lID = tep_db_prepare_input($_GET['lID']);
+ case 'deleteconfirm':
+ $lID = tep_db_prepare_input($_GET['lID']);
- $lng_query = tep_db_query("select languages_id from " . TABLE_LANGUAGES . " where code = '" . DEFAULT_CURRENCY . "'");
- $lng = tep_db_fetch_array($lng_query);
- if ($lng['languages_id'] == $lID) {
- tep_db_query("update " . TABLE_CONFIGURATION . " set configuration_value = '' where configuration_key = 'DEFAULT_CURRENCY'");
- }
+ $lng_query = tep_db_query("select languages_id from " . TABLE_LANGUAGES . " where code = '" . DEFAULT_CURRENCY . "'");
+ $lng = tep_db_fetch_array($lng_query);
+ if ($lng['languages_id'] == $lID) {
+ tep_db_query("update " . TABLE_CONFIGURATION . " set configuration_value = '' where configuration_key = 'DEFAULT_CURRENCY'");
+ }
- tep_db_query("delete from " . TABLE_CATEGORIES_DESCRIPTION . " where language_id = '" . (int)$lID . "'");
- tep_db_query("delete from " . TABLE_PRODUCTS_DESCRIPTION . " where language_id = '" . (int)$lID . "'");
- tep_db_query("delete from " . TABLE_PRODUCTS_OPTIONS . " where language_id = '" . (int)$lID . "'");
- tep_db_query("delete from " . TABLE_PRODUCTS_OPTIONS_VALUES . " where language_id = '" . (int)$lID . "'");
- tep_db_query("delete from " . TABLE_MANUFACTURERS_INFO . " where languages_id = '" . (int)$lID . "'");
- require(DIR_WS_MODULES.'configuration/modstatus.php') ;
- modstatus::del_language($lID);
+ $this->delete_db_lang((int)$lID);
+ tep_db_query("delete from " . TABLE_LANGUAGES . " where languages_id = '" . (int)$lID . "'");
- tep_db_query("delete from " . TABLE_LANGUAGES . " where languages_id = '" . (int)$lID . "'");
+ tep_redirect(tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','lID'), false). 'page=' . $_GET['page']));
+ break;
- tep_redirect(tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','lID'), false). 'page=' . $_GET['page']));
- break;
+ case 'delete':
+ $lID = tep_db_prepare_input($_GET['lID']);
- case 'delete':
- $lID = tep_db_prepare_input($_GET['lID']);
+ $lng_query = tep_db_query("select code from " . TABLE_LANGUAGES . " where languages_id = '" . (int)$lID . "'");
+ $lng = tep_db_fetch_array($lng_query);
- $lng_query = tep_db_query("select code from " . TABLE_LANGUAGES . " where languages_id = '" . (int)$lID . "'");
- $lng = tep_db_fetch_array($lng_query);
-
- self::$remove_language = true;
- if ($lng['code'] == DEFAULT_LANGUAGE) {
- self::$remove_language = false;
- $messageStack->add(__('error remove default language'), 'error');
- }
+ self::$remove_language = true;
+ if ($lng['code'] == DEFAULT_LANGUAGE) {
+ self::$remove_language = false;
+ $messageStack->add(__('error remove default language'), 'error');
+ }
break;
- }
+ }
+ }
}
- }
/**
*/
@@ -142,7 +135,7 @@
else $class_s="";
$languages['name'] .= (DEFAULT_LANGUAGE == $languages['code'])? ' (' . TEXT_DEFAULT . ')' : '';
- $list_s[]=new objectInfo($languages);
+ $list_s[]=new objectInfo($languages);
}
return $list_s;
@@ -168,61 +161,81 @@
}
/**
- Duplication des entrée dans les db, por prendre en charge la gestion mutlilangue
+ @brief Duplication des entrée dans les db, por prendre en charge la gestion mutlilangue
*/
- public static function repliqu_db_lang($languages_id,$insert_id){
+ public static function repliqu_db_lang($languages_id,$insert_id, $mode = 'add'){
+ $DB=Database::getInstance();
+ $DBIndex = new oscss_DBIndex();
+ $DT =DataTypes::getInstance();
- // create additional categories_description records
- $categories_query = tep_db_query("select c.categories_id, cd.categories_name from " . TABLE_CATEGORIES . " c left join " . TABLE_CATEGORIES_DESCRIPTION . " cd on c.categories_id = cd.categories_id where cd.language_id = '" . (int)$languages_id . "'");
- while ($categories = tep_db_fetch_array($categories_query)) {
- tep_db_query("insert into " . TABLE_CATEGORIES_DESCRIPTION . " (categories_id, language_id, categories_name) values ('" . (int)$categories['categories_id'] . "', '" . (int)$insert_id . "', '" . tep_db_input($categories['categories_name']) . "')");
- }
+ foreach($DBIndex->all['lang'] as $k=>$row){
- // create additional products_description records
- $products_query = tep_db_query("select p.products_id, pd.products_name, pd.products_description, pd.products_url from " . TABLE_PRODUCTS . " p left join " . TABLE_PRODUCTS_DESCRIPTION . " pd on p.products_id = pd.products_id where pd.language_id = '" . (int)$languages_id . "'");
- while ($products = tep_db_fetch_array($products_query)) {
- tep_db_query("insert into " . TABLE_PRODUCTS_DESCRIPTION . " (products_id, language_id, products_name, products_description, products_url) values ('" . (int)$products['products_id'] . "', '" . (int)$insert_id . "', '" . tep_db_input($products['products_name']) . "', '" . tep_db_input($products['products_description']) . "', '" . tep_db_input($products['products_url']) . "')");
- }
+ $listFields='';
+ $item = $DBIndex->all['table'][$k]['keyPrim'] ;
+ $col = explode(',',$item);
- // create additional products_options records
- $products_options_query = tep_db_query("select products_options_id, products_options_name from " . TABLE_PRODUCTS_OPTIONS . " where language_id = '" . (int)$languages_id . "'");
- while ($products_options = tep_db_fetch_array($products_options_query)) {
- tep_db_query("insert into " . TABLE_PRODUCTS_OPTIONS . " (products_options_id, language_id, products_options_name) values ('" . (int)$products_options['products_options_id'] . "', '" . (int)$insert_id . "', '" . tep_db_input($products_options['products_options_name']) . "')");
- }
+ foreach($col as $rk){
+ if(preg_match('#(.*language[a-z_]*)#i',$rk))
+ $key_lg = $rk;
+ else{
+ $listFields .= $rk.',';
+ }
+ }
- // create additional products_options_values records
- $products_options_values_query = tep_db_query("select products_options_values_id, products_options_values_name from " . TABLE_PRODUCTS_OPTIONS_VALUES . " where language_id = '" . (int)$languages_id . "'");
- while ($products_options_values = tep_db_fetch_array($products_options_values_query)) {
- tep_db_query("insert into " . TABLE_PRODUCTS_OPTIONS_VALUES . " (products_options_values_id, language_id, products_options_values_name) values ('" . (int)$products_options_values['products_options_values_id'] . "', '" . (int)$insert_id . "', '" . tep_db_input($products_options_values['products_options_values_name']) . "')");
- }
+ if(!empty($key_lg) && !empty($listFields) ){
+ $sql = "SELECT ".substr($listFields, 0,-1)." FROM ".$row['name']." WHERE ". $key_lg . " = '". (int)$languages_id."'";
+ $_query = $DB->query($sql);
- // create additional manufacturers_info records
- $manufacturers_query = tep_db_query("select m.manufacturers_id, mi.manufacturers_url from " . TABLE_MANUFACTURERS . " m left join " . TABLE_MANUFACTURERS_INFO . " mi on m.manufacturers_id = mi.manufacturers_id where mi.languages_id = '" . (int)$languages_id . "'");
- while ($manufacturers = tep_db_fetch_array($manufacturers_query)) {
- tep_db_query("insert into " . TABLE_MANUFACTURERS_INFO . " (manufacturers_id, languages_id, manufacturers_url) values ('" . $manufacturers['manufacturers_id'] . "', '" . (int)$insert_id . "', '" . tep_db_input($manufacturers['manufacturers_url']) . "')");
- }
+ foreach($_query->fetchAllAssoc() as $kt=>$r){
+ $_key = $_val ='';
+ foreach($r as $kty=>$rty){
+ $_key .= $kty .',';
+ $_val .= "'".$rty ."',";
+ }
- // Ajout de status / boucle par type
- require(DIR_WS_MODULES.'configuration/modstatus.php') ;
- modstatus::add_language($insert_id);
+ $sql2 = "INSERT INTO ".$row['name']." (" .$_key. " ".$key_lg.") VALUES (" . $_val . " '" . (int)$insert_id . "');";
- // create additional return return texte
-// $orders_status_query = tep_db_query("select return_text_id, return_text_one from " . TABLE_RETURNS_TEXT . " where language_id = '" . (int)$languages_id . "'");
-// while ($orders_status = tep_db_fetch_array($orders_status_query)) {
-// tep_db_query("insert into " . TABLE_RETURNS_TEXT . " (return_text_id, language_id, return_text_one) values ('" . (int)$orders_status['return_text_id'] . "', '" . (int)$insert_id . "', '" . tep_db_input($orders_status['return_text_one']) . "')");
-// }
+ $DB->query($sql2);
+ }
+ }
- // create additional full_tag_description records
- $products_query = tep_db_query("select p.tag_id from " . TABLE_FULL_TAG . " p left join " . TABLE_FULL_TAG_DESCRIPTION . " pd on p.tag_id = pd.tag_id where pd.language_id = '" . (int)$languages_id . "'");
- while ($products = tep_db_fetch_array($products_query)) {
- tep_db_query("insert into " . TABLE_FULL_TAG_DESCRIPTION . " (tag_id, language_id) values ('" . (int)$products['tag_id'] . "', '" . (int)$insert_id . "')");
- }
+ }
}
+ /**
+ @fn delete_db_lang($languages_id)
+ @brief delete One language in all tabel content language_id
+ */
+ public static function delete_db_lang($languages_id){
+ $DB=Database::getInstance();
+ $DBIndex = new oscss_DBIndex();
+ $DT =DataTypes::getInstance();
+
+ foreach($DBIndex->all['lang'] as $k=>$row){
+
+ $listFields='';
+ $item = $DBIndex->all['table'][$k]['keyPrim'] ;
+ $col = explode(',',$item);
+
+ foreach($col as $rk){
+ if(preg_match('#(.*language[a-z_]*)#i',$rk))
+ $key_lg = $rk;
+ }
+
+ if(!empty($key_lg) ){
+ $sql = "DELETE FROM ".$row['name']." WHERE ". $key_lg . " = '". (int)$languages_id."'";
+
+ $DB->query($sql);
+ }
+ }
+
+ }
+
+
/* Private function class */
/**
Modified: trunk/catalog/admin/includes/modules/configuration/modstatus.php
===================================================================
--- trunk/catalog/admin/includes/modules/configuration/modstatus.php 2012-04-14 20:30:23 UTC (rev 4231)
+++ trunk/catalog/admin/includes/modules/configuration/modstatus.php 2012-04-14 21:49:33 UTC (rev 4232)
@@ -4,7 +4,7 @@
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 13/03/2012, 18:21
+ @date 14/04/2012, 17:00
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@class modstatus
@@ -179,35 +179,7 @@
}
- /**
- @fn add_language($new_lg)
- @brief Add langue pour tous les status
- Utilisé dans class de gestion langue cf @class cfg_31
- @param $languages_id string
- */
- static public function add_language($new_lg){
- global $languages_id;
- $query = "SELECT DISTINCT status_type as type FROM " . TABLE_STATUS . " WHERE language_id = '" . (int)$languages_id . "' GROUP BY status_type ";
- $que=tep_db_query($query);
- $list_s=array();
- while ($list_status = tep_db_fetch_array($que)){
- $status_query = tep_db_query($sql="select status_id, status_name, status_color from " . TABLE_STATUS . " where status_type='".$list_status['type']."' and language_id = '" . (int)$languages_id . "'");
- while ($status = tep_db_fetch_array($status_query)) {
- tep_db_query("insert into " . TABLE_STATUS . " (status_id, status_type, language_id, status_name,status_color) values ('" . (int)$status['status_id'] . "','" .$list_status['type'] . "', '" . (int)$new_lg . "', '" . tep_db_input($status['status_name']) . "', '" . tep_db_input($status['status_color']) . "')");
- }
- }
- }
- /**
- Add langue pour tous les status
- Utilisé dans class de gestion langue cf @class cfg_31
- @param string $languages_id
- */
- static public function del_language($lg){
- tep_db_query("DELETE FROM " . TABLE_STATUS . " WHERE language_id = '" . (int)$lg . "'" );
- }
-
-
/** PUBLIC METHODE */
/**
Added: trunk/catalog/install/includes/sql/mysql/tables/osc_products_options.key.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_products_options.key.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_products_options.key.sql 2012-04-14 21:49:33 UTC (rev 4232)
@@ -0,0 +1,18 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2011 The osCSS developers |
+--| |
+--| http://www.oscss.org |
+--| Portions Copyright (c) 2003 osCommerce |
+--+######################################################################--+
+--| This source file is subject to version 2.0 of the GPL license, |
+--| available at the following url: |
+--| http://www.oscss.org/ |
+--+######################################################################--+
+
+
+ALTER TABLE osc_products_options ADD INDEX idx_osc_products_options_lgid (language_id);
+ALTER TABLE osc_products_options ADD INDEX idx_products_options_id (products_options_id);
+
+ALTER TABLE osc_products_options ADD CONSTRAINT fk_osc_products_options_lgid FOREIGN KEY (language_id) REFERENCES osc_languages (languages_id);
Added: trunk/catalog/install/includes/sql/mysql/tables/osc_products_options_values.key.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_products_options_values.key.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_products_options_values.key.sql 2012-04-14 21:49:33 UTC (rev 4232)
@@ -0,0 +1,21 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2011 The osCSS developers |
+--| |
+--| http://www.oscss.org |
+--| Portions Copyright (c) 2003 osCommerce |
+--+######################################################################--+
+--| This source file is subject to version 2.0 of the GPL license, |
+--| available at the following url: |
+--| http://www.oscss.org/ |
+--+######################################################################--+
+
+
+ALTER TABLE osc_products_options_values ADD INDEX idx_osc_products_options_values_lgid (language_id);
+ALTER TABLE osc_products_options_values ADD INDEX idx_products_options_id (products_options_id);
+ALTER TABLE osc_products_options_values ADD INDEX idx_value_id (value_id);
+
+
+ALTER TABLE osc_products_options_values ADD CONSTRAINT fk_osc_products_options_values_lgid FOREIGN KEY (language_id) REFERENCES osc_languages (languages_id);
+ALTER TABLE osc_products_options_values ADD CONSTRAINT fk_osc_products_options_values_products_options_id FOREIGN KEY (v) REFERENCES osc_products_options (products_options_id);
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-14 20:30:30
|
Revision: 4231
http://oscss.svn.sourceforge.net/oscss/?rev=4231&view=rev
Author: oscim
Date: 2012-04-14 20:30:23 +0000 (Sat, 14 Apr 2012)
Log Message:
-----------
Suite du travail d'intgeration et d'exploitation des fichier sql , et leur liaision lors de la manipulation des langues
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/oscss_DBIndex.php
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/backup.txt
trunk/catalog/common/classes/DataTypes.php
Added Paths:
-----------
trunk/catalog/admin/includes/classes/DataFileSql.php
trunk/catalog/admin/includes/gabarit/backup/display_view.viewalldb.gab
Copied: trunk/catalog/admin/includes/classes/DataFileSql.php (from rev 4225, trunk/catalog/admin/includes/classes/DataSqlFile.php)
===================================================================
--- trunk/catalog/admin/includes/classes/DataFileSql.php (rev 0)
+++ trunk/catalog/admin/includes/classes/DataFileSql.php 2012-04-14 20:30:23 UTC (rev 4231)
@@ -0,0 +1,229 @@
+<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 11/04/2012, 18:17
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @brief Manipluate files.sql And execute
+*/
+
+Class DataFileSql{
+ /**
+ @def FOLDER_TABLES
+ */
+ const FOLDER_TABLES = 'tables/';
+ /**
+ @def FOLDER_DATAS
+ */
+ const FOLDER_DATAS = 'data/';
+
+
+ /**
+ @var path base folder for list and
+ */
+ public $basepath = '';
+ /**
+ @var boolean process keys
+ */
+ public $exekey = false;
+
+
+ /**
+ @brief constructor
+ @param $basepath string absolute path folder base
+ */
+ public function __construct($basepath){
+
+// if(tep_not_null($basepath) )
+ $this->Set('basepath', $basepath);
+
+ $this->Set('exekey', (DB_MOTOR_TYPE =='InnoDB'));
+
+ }
+
+ /**
+ @brief Define config value
+ @param $type string
+ basepath : absolute path folder base (include action install/remove)
+ @param $value string/int/bool
+ @return $value | false if type not exists
+ */
+ function Set($type, $value){
+ if(isset($this->$type))
+ return $this->$type = $value;
+ else
+ return false;
+ }
+
+ /**
+ @brief ordonne les fichier pour l'install
+ @param path path directory for scan
+ @return array
+ [t] tables
+ [k] keys
+ [d] data
+ */
+ function Browse($type='t'){
+
+ $result=array();
+
+ if($type =='t')
+ $path = $this->basepath . self::FOLDER_TABLES ;
+ elseif($type =='d')
+ $path = $this->basepath . self::FOLDER_DATAS ;
+ else
+ return false;
+
+ foreach(scan($path) as $row){
+ if(in_array(substr($row,-1) , array('~', '.') )) {
+ if(strpos($row , '.key')===false)
+ $result[$type][]=$row;
+
+ elseif(strpos($row , '.key') > 0){
+ if($this->exekey)
+ $result['k'][]=$row;
+ }
+ }
+ }
+
+ return $result;
+
+ }
+
+ /**
+ @brief Traite et analyse le fichier de clef pouren extraire les caratéristiques remarquable
+
+ @return false |
+ object {
+ [language] = 0/1 for link table languages
+ [categorie] = 0/1 for link table languages
+ }
+ */
+ function AnalyseFile($file){
+ $obj = new stdClass();
+
+ if(!file_exists($this->basepath . self::FOLDER_TABLES . $file))
+ return false;
+ /*
+ Traitement des clef et recherche des liaision vers la table language
+ Si une liaison existe, celle ci considere la table associé comme une table de langue et celle ci sera duspliqué lors de l'ajout d'une nouvelle language
+ */
+ $fp = @fopen($this->basepath . self::FOLDER_TABLES . $file, 'rb');
+ $test = $test2 =$test3 =array();
+ while (!feof ($fp)) {
+ $buf = fgets($fp, 4096);
+ if (substr($buf, 0, 2) <> '--' ) {
+ preg_match_all ('#(REFERENCES[ ]{1,}osc_languages[ ]{1,}[\(]languages_id[\)])#i' ,$buf, $match);
+ $test1[] = ((count($match[0])>0)? true : false );
+
+ preg_match_all ('#(REFERENCES[ ]{1,}osc_categories[ ]{1,}[\(]categories_id[\)])#i' ,$buf, $match);
+ $test2[] = ((count($match[0])>0)? true : false );
+
+ preg_match_all ('#(PRIMARY KEY[ ]{1,}[\(]([a-z_, ]*)[\)])#i' ,$buf, $match3);
+ $test3[] = ((count($match3[0])>0)? true : false );
+// print_r($match);
+ if(count($match3[0])>0)
+ $obj->primarykey = @$match3[2][0];
+ }
+ }
+ fclose($fp);
+
+ $obj->primary = (in_array(true, $test3 ));
+ $obj->language = (in_array(true,$test1 ));
+ $obj->categorie = (in_array(true,$test2 ));
+
+ return $obj;
+ }
+
+
+ /**
+ @brief Process for load and install file Datas, and translate in multiple languages
+
+TODO Ajouter multi-langue
+ */
+ function ProcessFileData( $sql_file, $table_prefix = -1,$file_lg_sample='') {
+ global $language;
+ $buffer = '';
+ $lg=false;
+
+ $DB=Database::getInstance();
+
+ if( $file_lg_sample !='')
+ include($file_lg_sample);
+
+ $fp = fopen($sql_file, 'rb');
+
+ while (!feof ($fp)){
+ $buf = fgets($fp, 4096);
+ if (substr($buf, 0, 2) <> '--' ){
+ $buf=preg_replace('/--(.+)*/' ,'',$buf);
+ $buffer .= $buf;
+ }
+ }
+
+
+ $repl = ((is_array($lg) && count($lg) >0)? true : false);
+ $buffer=preg_replace('/[ ](OSC_)([A-Z])/i', ' '.$table_prefix.'$2',$buffer);
+ $buffer = trim($buffer);
+
+ $query=preg_split("/\n/i",$buffer,-1,PREG_SPLIT_NO_EMPTY);
+
+
+ if($repl) {
+ $lg_k = array_keys($lg);
+ $lg_v = array_map('addslashes',$lg);
+ }
+
+ foreach($query as $row){
+ $row = trim($row);
+ if(strlen($row) > 3){
+ $sql=($repl)? str_replace($lg_k,$lg_v,$row) : $row ;
+
+ $DB->query($row);
+ }
+ }
+
+ }
+
+ /**
+ @brief Process for load and install .sql or .key.sql
+ */
+ function ProcessFile( $sql_file, $table_prefix = -1) {
+
+ $buffer = '';
+ $lg=false;
+
+ $fp = fopen($sql_file, 'rb');
+
+ while (!feof ($fp)){
+ $buf = fgets($fp, 4096);
+ if (substr($buf, 0, 2) <> '--' ){
+ $buf=preg_replace('/--(.+)*/' ,'',$buf);
+ $buffer .= $buf;
+ }
+ }
+ fclose($fp);
+
+
+ $DB=Database::getInstance();
+
+ $buffer=preg_replace('/[ ](OSC_)([A-Z])/i', ' '.$table_prefix.'$2',$buffer);
+
+ $query=explode(';',$buffer);
+ foreach($query as $row){
+ $row = trim($row);
+ if(strlen($row) > 3){
+ $DB->query($row);
+ }
+ }
+
+ }
+
+
+}
+
+
+?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/classes/oscss_DBIndex.php
===================================================================
--- trunk/catalog/admin/includes/classes/oscss_DBIndex.php 2012-04-14 17:41:44 UTC (rev 4230)
+++ trunk/catalog/admin/includes/classes/oscss_DBIndex.php 2012-04-14 20:30:23 UTC (rev 4231)
@@ -9,10 +9,6 @@
@encode UTF-8
@brief Base manipulate and track all table in core osCSS.
Manage add /install / dusplique for multi-language
-
-
-
- Not used !!! In dev
*/
@@ -21,7 +17,7 @@
/**
@def path
*/
- const T_AVAILABLE = 'admin/origin/db/tables/';
+ const T_AVAILABLE = 'admin/origin/db/';
/**
@var
*/
@@ -31,6 +27,11 @@
@brief constructor
*/
function __construct(){
+ // load class manipulate fileSql
+ $this->DFS = new DataFileSql(DIR_FS_ROOT_DOCS . self::T_AVAILABLE);
+ // call instance datatype
+ $this->DT = DataTypes::getInstance();
+
// index all tables
$this->ListTablesAvailable();
@@ -45,59 +46,66 @@
@brief Browse Folder stock file define table
*/
function ListTablesAvailable(){
-// $contents = array();
+ $this->all['lang'] = array();
+ $this->all['DataType'] = array();
- foreach (scan(DIR_FS_ROOT_DOCS . self::T_AVAILABLE ) as $file ) {
+ foreach (scan(DIR_FS_ROOT_DOCS . self::T_AVAILABLE .'tables/' ) as $file ) {
if(substr($file, 0,1) =='.') continue;
-// var_dump($file);
+
+
$ext=substr($file,-3);
- $name = substr($file,0,-4);
-// var_dump($file.'-'.$name);
+ $name0 = substr($file,0,-4) ;
+ $name1 = preg_replace('/(OSC_)([A-Z])/i', '$2',$name0) ;
+ $name = preg_replace('/(OSC_)([A-Z])/i', DB_TABLE_PREFIX.'$2',$name0) ;
$key = false;
+ $datatype='';
+
if( ( $pos =strpos($name, '.')) > 0 && ($new_name = substr($name, 0, $pos))){
- $name = $new_name;
+ $name = trim($new_name);
$key = true;
}
+ foreach($this->DT->GetAllDataType() as $key=>$row) {
+ if(isset($row->db_tables) && in_array($name1,array_values($row->db_tables)))
+ $datatype .= $row->DataType.',' ;
+// elseif( preg_match('/('.strtoupper($row->DataType).')([A-Z])/i', $name ) )
+// $datatype .= $row->DataType.',' ;
+ }
+
if (in_array($ext, array('sql')) ){
$tmp = array(
'file'=>$file,
- 'name'=>$name ,
+ 'name'=> $name,
'extension'=>$ext,
'type'=>(($key) ? 't' : 'k' ),
'installed'=>'0',
'Rows'=>0,
+ 'keyPrim'=>'',
+ 'datatype'=>$datatype,
+ 'action'=>(!strpos($name, 'admin')),
);
- if($key){
+ $test=$this->DFS->AnalyseFile($file);
+
+ if($test !=false && $test->primary)
+ $tmp['keyPrim'] = $test->primarykey;
+
+ $this->all['table'][$name] = $tmp;
+
+
+ if($key && !in_array($name, array(DB_TABLE_PREFIX.'customers'))) {
/*
Traitement des clef et recherche des liaision vers la table language
Si une liaison existe, celle ci considere la table associé comme une table de langue et celle ci sera duspliqué lors de l'ajout d'une nouvelle language
*/
- $fp = fopen(DIR_FS_ROOT_DOCS . self::T_AVAILABLE .$file , 'rb');
- $test = array();
- while (!feof ($fp)) {
- $buf = fgets($fp, 4096);
- if (substr($buf, 0, 2) <> '--' ) {
- $buf=preg_match_all ('#(REFERENCES[ ]{1,}osc_languages[ ]{1,}[\(]languages_id[\)])#i' ,$buf, $match);
-// print_r($match);
- $test[]= ((count($match[0])>0)? true : false );
- }
- }
- fclose($fp);
-
- if(in_array(true,$test ))
+ if($test !=false && $test->language)
$this->all['lang'][$name] = $tmp;
}
- $this->all['table'][$name] = $tmp;
- }
-
+ }
}
-// sort($contents);
-
// foreach ($contents as $row ) {
// }$this->all =
@@ -111,40 +119,22 @@
function ListTablesInstalled(){
$DB = Database::getInstance();
-// $res = $DB->query('SHOW TABLES FROM '.DB_DATABASE );
-// // print_r($res->fetchAllAssoc() );
-// // exit;
-// foreach ($res->fetchAllAssoc() as $key=>$row ) {
-// $row = array_values($row);
-//
-// if(!isset($this->all['table'][$row[0]])){
-// $this->all['inconnue'][$row[0]]['name'] = $row[0];
-// $this->all['inconnue'][$row[0]]['installed'] = '1';
-// }
-// else
-// $this->all['table'][$row[0]]['installed'] = '1';
-//
-// }
-
$res = $DB->query('SHOW TABLE STATUS ' );
foreach ($res->fetchAllAssoc() as $key=>$row ) {
if(!isset($this->all['table'][$row['Name']])){
+
$this->all['inconnue'][$row['Name']] = $row;
- $this->all['inconnue'][$row['Name']]['name'] = $row;
+ $this->all['inconnue'][$row['Name']]['name'] = $row['Name'];
$this->all['inconnue'][$row['Name']]['installed'] = '1';
$this->all['inconnue'][$row['Name']]['Create_time'] = $row['Create_time'];
$this->all['inconnue'][$row['Name']]['Rows'] = (int)$row['Rows'];
}
else{
-// $row['Name']
$this->all['table'][$row['Name']]['Create_time'] = $row['Create_time'];
$this->all['table'][$row['Name']]['Rows'] =(int)$row['Rows'];
$this->all['table'][$row['Name']]['installed'] = '1';
-
-// print_r($res->fetchAllAssoc() );
-// exit;
}
}
Added: trunk/catalog/admin/includes/gabarit/backup/display_view.viewalldb.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/backup/display_view.viewalldb.gab (rev 0)
+++ trunk/catalog/admin/includes/gabarit/backup/display_view.viewalldb.gab 2012-04-14 20:30:23 UTC (rev 4231)
@@ -0,0 +1,130 @@
+<?php
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 26/03/2012, 17:29
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+$DBIndex = new oscss_DBIndex();
+
+?>
+<?php echo tep_draw_form('backup', backup::FILENAME, 'action=backupnow') ?>
+<div class="box_uniq block_form">
+ <h3><?php echo __('text info heading backup view tables') ?></h3>
+
+
+ <div id="tabs">
+ <ul>
+ <li><a href="#tabs-1"><?php echo __('backup tab tables'); ?></a></li>
+ <li><a href="#tabs-2"><?php echo __('backup tab tables link language'); ?></a></li>
+ </ul>
+
+
+
+
+ <div id="tabs-1" class="tabPage">
+ <fieldset class="block_field">
+ <h3><?php echo __('backup title all tables available') ?></h3>
+ <table class="dataTableBase">
+ <thead>
+ <tr>
+ <th><?php echo __('table heading name'); ?></th>
+ <th><?php echo __('table heading datatype'); ?></th>
+ <th><?php echo __('table heading installed'); ?></th>
+ <th><?php echo __('table heading rows'); ?></th>
+ <th><?php echo __('table heading primary key'); ?></th>
+ <th><?php echo __('table heading action'); ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php foreach($DBIndex->all['table'] as $row): ?>
+ <tr>
+ <td><?php echo $row['name'] ; ?></td>
+ <td><?php echo $row['datatype'] ; ?></td>
+ <td class="tcenter">
+ <span class="edit-input-value">
+ <span class="Val Flag-<?php echo $row['installed'] ?> txt"><?php echo (($row['installed'] ==1)? __('backup txt active') : __('backup txt inactive') ) ?></span>
+ <span class="Val Flag-<?php echo $row['installed'] ?> img"></span>
+ </span>
+ </td>
+ <td><?php echo $row['Rows'] ; ?></td>
+ <td><?php echo $row['keyPrim'] ; ?></td>
+ <td>
+ <?php if($row['action']): ?>
+ <?php echo '' ; ?></td>
+ <?php else: ?>
+ <?php echo 'N/C' ; ?></td>
+ <?php endif; ?>
+ </tr>
+ <?php endforeach; ?>
+ </tbody>
+ </table>
+ </fieldset>
+
+ <h3><?php echo __('backup title tables installed and inconnue') ?></h3>
+ <table class="dataTableBase">
+ <thead>
+ <tr>
+ <th><?php echo __('table heading name'); ?></th>
+ <th><?php echo __('table heading installed'); ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php foreach($DBIndex->all['inconnue'] as $row): ?>
+ <tr>
+ <td><?php echo $row['name'] ; ?></td>
+ <td class="tcenter">
+ <span class="edit-input-value">
+ <span class="Val Flag-<?php echo $row['installed'] ?> txt"><?php echo (($row['installed'] ==1)? __('backup txt active') : __('backup txt inactive') ) ?></span>
+ <span class="Val Flag-<?php echo $row['installed'] ?> img"></span>
+ </span>
+ </td>
+ </tr>
+ <?php endforeach; ?>
+ </tbody>
+ </table>
+ </fieldset>
+ </div>
+
+
+ <div id="tabs-2" class="tabPage">
+ <fieldset class="block_field">
+ <h3><?php echo __('backup title all tables language') ?></h3>
+ <table class="dataTableBase">
+ <thead>
+ <tr>
+ <th><?php echo __('table heading name'); ?></th>
+ <th><?php echo __('table heading key used'); ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php foreach($DBIndex->all['lang'] as $k=>$row): /*print_r($row);*/ ?>
+ <tr>
+ <td><?php echo $row['name'] ; ?></td>
+ <td><?php echo $DBIndex->all['table'][$k]['keyPrim'] ; ?></td>
+ </tr>
+ <?php endforeach; ?>
+ </tbody>
+ </table>
+ </fieldset>
+
+ </div>
+
+
+
+
+ <div class="button_nav">
+ <?php echo tep_image_submit('button_backup.gif', __('image backup')). tep_js_back(tep_href_link(backup::FILENAME), IMAGE_CANCEL);?>
+ </div>
+
+
+
+
+
+</div>
+
+</form>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/pages/backup.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/pages/backup.txt 2012-04-14 17:41:44 UTC (rev 4230)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/backup.txt 2012-04-14 20:30:23 UTC (rev 4231)
@@ -1,10 +1,10 @@
<?php
/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 05/06/11, 18:10
+ @version 2.1.1
+ @date 26/03/2012, 17:29
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
@@ -21,6 +21,7 @@
$lang['image backup']="Sauvegarde" ;
$lang['image db restore']="Restaurer" ;
$lang['image restore file ext']="Restaurer un fichier téléchargé" ;
+ $lang['image viewalldb']="Voir les tables" ;
/* backup */
$lang['text info heading new backup']="Nouvelle sauvegarde" ;
@@ -50,12 +51,23 @@
/* viewalldb */
- $lang['backup tab all tables available']="Toutes" ;
+
+ $lang['text info heading backup view tables']="Vues et operations sur les tables" ;
+
+ $lang['backup tab tables']="Toutes" ;
$lang['backup tab tables link language']="Langues" ;
+ $lang['backup title all tables available']="Les tables d'osCSS et ces modules" ;
+ $lang['backup title tables installed and inconnue']="Table(s) trouvée(s) non prise en charge" ;
+ $lang['backup title all tables language']="Tables liées à la table de language" ;
+
$lang['table heading name']="Nom" ;
$lang['table heading installed']="Installé" ;
- $lang['table heading Rows']="Nbr Lignes" ;
+ $lang['table heading rows']="Nbr Lignes" ;
+ $lang['table heading datatype']="DataType" ;
+ $lang['table heading primary key']="Clef Primaire" ;
+ $lang['table heading action']="" ;
+ $lang['table heading key used']="colonnes utilisées manip. language" ;
/* other */
Modified: trunk/catalog/common/classes/DataTypes.php
===================================================================
--- trunk/catalog/common/classes/DataTypes.php 2012-04-14 17:41:44 UTC (rev 4230)
+++ trunk/catalog/common/classes/DataTypes.php 2012-04-14 20:30:23 UTC (rev 4231)
@@ -108,7 +108,7 @@
/**
- @remarks Force er-init after define prev
+ @remarks Force re-init after define prev
*/
foreach($alltype as $test){
if(!empty($test)) {
@@ -119,8 +119,13 @@
}
/**
+ @brief Get all datatype
+ @note backoffice used
+ @return array
*/
-// public function Get
+ public function GetAllDataType(){
+ return self::$env->modlist;
+ }
/**
@@ -177,7 +182,6 @@
// Ajout des regles spcifique au datatype hierachique (categorie / naufacturer)
foreach(self::$env->modlist as $class=>$module){
-
if(
( isset(self::$env->RootListing[$class]) && is_array(self::$env->RootListing[$class]) && count(self::$env->RootListing[$class])>0 )// this module is RootListing (manufacturer, categories)
// && in_array($type, $module->RootListing) // RootListing array require content current type
@@ -187,9 +191,6 @@
// echo $class;
// print_r(self::$env->RootListing[$class]);
}
-
-
-
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-14 17:41:50
|
Revision: 4230
http://oscss.svn.sourceforge.net/oscss/?rev=4230&view=rev
Author: oscim
Date: 2012-04-14 17:41:44 +0000 (Sat, 14 Apr 2012)
Log Message:
-----------
suppression obsolete
Removed Paths:
-------------
trunk/catalog/admin/includes/languages/fr_FR/widget/AdminUsersModified.txt
trunk/catalog/admin/includes/languages/fr_FR/widget/AdminUsersNew.txt
Deleted: trunk/catalog/admin/includes/languages/fr_FR/widget/AdminUsersModified.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/widget/AdminUsersModified.txt 2012-04-14 17:41:29 UTC (rev 4229)
+++ trunk/catalog/admin/includes/languages/fr_FR/widget/AdminUsersModified.txt 2012-04-14 17:41:44 UTC (rev 4230)
@@ -1,18 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.1
- @date 02/03/2012, 20:02
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-$lang['AdminUsersModified heading']="Derniers utilisateurs modifiés" ;
-
-$lang['AdminUsersModified box reference']="Réf." ;
-$lang['AdminUsersModified box title']="Nom" ;
-$lang['AdminUsersModified box date']="Crées le" ;
-$lang['AdminUsersModified box status']="Etat" ;
-
-?>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/languages/fr_FR/widget/AdminUsersNew.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/widget/AdminUsersNew.txt 2012-04-14 17:41:29 UTC (rev 4229)
+++ trunk/catalog/admin/includes/languages/fr_FR/widget/AdminUsersNew.txt 2012-04-14 17:41:44 UTC (rev 4230)
@@ -1,18 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.1
- @date 02/03/2012, 20:02
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-$lang['AdminUsersNew heading']="Derniers utilisateurs modifiés" ;
-
-$lang['AdminUsersNew box reference']="Réf." ;
-$lang['AdminUsersNew box title']="Nom" ;
-$lang['AdminUsersNew box date']="Crées le" ;
-$lang['AdminUsersNew box status']="Etat" ;
-
-?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-14 17:41:36
|
Revision: 4229
http://oscss.svn.sourceforge.net/oscss/?rev=4229&view=rev
Author: oscim
Date: 2012-04-14 17:41:29 +0000 (Sat, 14 Apr 2012)
Log Message:
-----------
suppression obsolete
Removed Paths:
-------------
trunk/catalog/admin/includes/widget/AdminUsersModified.php
trunk/catalog/admin/includes/widget/AdminUsersNew.php
Deleted: trunk/catalog/admin/includes/widget/AdminUsersModified.php
===================================================================
--- trunk/catalog/admin/includes/widget/AdminUsersModified.php 2012-04-14 17:28:56 UTC (rev 4228)
+++ trunk/catalog/admin/includes/widget/AdminUsersModified.php 2012-04-14 17:41:29 UTC (rev 4229)
@@ -1,38 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.1
- @date 02/03/2012, 20:02
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-
-$_query = tep_db_query("SELECT *, CONCAT(admin_firstname , ' ', admin_lastname) as name FROM " . TABLE_ADMIN_USERS . " n WHERE admin_modified >'2000' ORDER BY admin_modified DESC LIMIT 5");
-
-if( !$_query->__get('numRows') )
- return false;
-
-$datadocs=new DatasFiles;
-
-?>
-<div id="AdminUsersModified" class="<?php echo $widg['class'] ?>">
-<h3><?php echo __('AdminUsersModified heading'); ?></h3>
-<table class="dataTableBase">
- <tr>
- <th><?php echo __('AdminUsersModified box reference'); ?></th>
- <th><?php echo __('AdminUsersModified box title'); ?></th>
- <th><?php echo __('AdminUsersModified box date'); ?></th>
-<!-- <th><?php //echo __('AdminUsersModified box status'); ?></th> -->
- </tr>
- <?php foreach($_query->fetchAllAssoc() as $row) : ?>
- <tr>
- <td class="tcenter"><strong><a href="<?php echo tep_href_link(FILENAME_ADMINUSERS, 'mID='.$row['admin_id'].'&action=edit') ?>"><?php echo $row['admin_id'] ?></strong></td>
- <td style="width:200px;"><?php echo $row['name'] ?></td>
- <td class="tcenter"><?php echo tep_date_short($row['admin_modified']) ?></td>
-<!-- <td class="tcenter"><?php //echo $row['status'] ?></td> -->
- </tr>
- <?php endforeach; ?>
-</table>
-</div>
\ No newline at end of file
Deleted: trunk/catalog/admin/includes/widget/AdminUsersNew.php
===================================================================
--- trunk/catalog/admin/includes/widget/AdminUsersNew.php 2012-04-14 17:28:56 UTC (rev 4228)
+++ trunk/catalog/admin/includes/widget/AdminUsersNew.php 2012-04-14 17:41:29 UTC (rev 4229)
@@ -1,38 +0,0 @@
-<?php
-/**
- @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
- @portion code Copyright (c) 2002 osCommerce
- @package osCSS-2 <www http://www.oscss.org>
- @version 2.1.1
- @date 02/03/2012, 20:02
- @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- @encode UTF-8
-*/
-
-$_query = tep_db_query("SELECT *, CONCAT(admin_firstname , ' ', admin_lastname) as name FROM " . TABLE_ADMIN_USERS . " n ORDER BY admin_created DESC LIMIT 5");
-
-if( !$_query->__get('numRows') )
- return false;
-
-$datadocs=new DatasFiles;
-
-?>
-<div id="AdminUsersNew" class="<?php echo $widg['class'] ?>">
-<h3><?php echo __('AdminUsersNew heading'); ?></h3>
-<table class="dataTableBase">
- <tr>
- <th><?php echo __('AdminUsersNew box reference'); ?></th>
- <th><?php echo __('AdminUsersNew box title'); ?></th>
- <th><?php echo __('AdminUsersNew box date'); ?></th>
-<!-- <th><?php //echo __('AdminUsersNew box status'); ?></th> -->
- </tr>
- <?php foreach($_query->fetchAllAssoc() as $row) : ?>
- <tr>
- <td class="tcenter"><strong><a href="<?php echo tep_href_link(FILENAME_ADMINUSERS, 'mID='.$row['admin_id'].'&action=edit') ?>"><?php echo $row['admin_id'] ?></strong></td>
- <td style="width:200px;"><?php echo $row['name'] ?></td>
- <td class="tcenter"><?php echo tep_date_short($row['admin_created']) ?></td>
-<!-- <td class="tcenter"><?php //echo $row['status'] ?></td> -->
- </tr>
- <?php endforeach; ?>
-</table>
-</div>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-14 17:29:02
|
Revision: 4228
http://oscss.svn.sourceforge.net/oscss/?rev=4228&view=rev
Author: oscim
Date: 2012-04-14 17:28:56 +0000 (Sat, 14 Apr 2012)
Log Message:
-----------
Coquille
Modified Paths:
--------------
trunk/catalog/admin/includes/application_bottom.php
Modified: trunk/catalog/admin/includes/application_bottom.php
===================================================================
--- trunk/catalog/admin/includes/application_bottom.php 2012-04-14 16:57:44 UTC (rev 4227)
+++ trunk/catalog/admin/includes/application_bottom.php 2012-04-14 17:28:56 UTC (rev 4228)
@@ -79,9 +79,9 @@
//! Updat GET
$('a.buttonimg.fancy,a.button.fancy,form.fancy').each(function(){
- var reg = /(forceview)/gi;
+ var reg = /(forceajax)/gi;
if( ! reg.test( this.href) )
- this.href +='&forceview=true';
+ this.href +='&forceajax=true';
});
$('a.buttonimg.fancyView,a.button.fancyView,form.fancyView').each(function(){
var reg = /(forceview)/gi;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-14 16:57:51
|
Revision: 4227
http://oscss.svn.sourceforge.net/oscss/?rev=4227&view=rev
Author: oscim
Date: 2012-04-14 16:57:44 +0000 (Sat, 14 Apr 2012)
Log Message:
-----------
ajout key manquante
Modified Paths:
--------------
trunk/catalog/install/includes/sql/mysql/tables/osc_content_description.sql
Modified: trunk/catalog/install/includes/sql/mysql/tables/osc_content_description.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_content_description.sql 2012-04-14 14:58:48 UTC (rev 4226)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_content_description.sql 2012-04-14 16:57:44 UTC (rev 4227)
@@ -14,8 +14,9 @@
drop table if exists osc_content_description;
create table osc_content_description (
content_id int(10) unsigned default '0' not null ,
+ language_id int(3) default '1' not null,
content_title varchar(128) not null ,
content_text text not null ,
- language_id int(3) default '1' not null
+ PRIMARY KEY (content_id, language_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...> - 2012-04-14 14:58:55
|
Revision: 4226
http://oscss.svn.sourceforge.net/oscss/?rev=4226&view=rev
Author: oscim
Date: 2012-04-14 14:58:48 +0000 (Sat, 14 Apr 2012)
Log Message:
-----------
Ajustement et mise a niveau report dans cette branche
reorganisation des gabarit dans un dossier specials
Added Paths:
-----------
trunk/extensions/SPECIALS_stable/
trunk/extensions/SPECIALS_stable/catalog/
trunk/extensions/SPECIALS_stable/catalog/admin/
trunk/extensions/SPECIALS_stable/catalog/admin/includes/
trunk/extensions/SPECIALS_stable/catalog/admin/includes/gabarit/
trunk/extensions/SPECIALS_stable/catalog/admin/includes/gabarit/specials/
trunk/extensions/SPECIALS_stable/catalog/admin/includes/gabarit/specials/display_view.edit.gab
trunk/extensions/SPECIALS_stable/catalog/admin/includes/gabarit/specials/display_view.listing.gab
trunk/extensions/SPECIALS_stable/catalog/admin/includes/gabarit/specials/products.display_view.inline.gab
trunk/extensions/SPECIALS_stable/catalog/admin/includes/javascript/
trunk/extensions/SPECIALS_stable/catalog/admin/includes/javascript/modules/
trunk/extensions/SPECIALS_stable/catalog/admin/includes/javascript/modules/pages/
trunk/extensions/SPECIALS_stable/catalog/admin/includes/javascript/modules/pages/specials.js.php
trunk/extensions/SPECIALS_stable/catalog/admin/includes/languages/
trunk/extensions/SPECIALS_stable/catalog/admin/includes/languages/fr_FR/
trunk/extensions/SPECIALS_stable/catalog/admin/includes/languages/fr_FR/modules/
trunk/extensions/SPECIALS_stable/catalog/admin/includes/languages/fr_FR/modules/pages/
trunk/extensions/SPECIALS_stable/catalog/admin/includes/languages/fr_FR/modules/pages/specials.txt
trunk/extensions/SPECIALS_stable/catalog/admin/includes/languages/fr_FR/modules/products/
trunk/extensions/SPECIALS_stable/catalog/admin/includes/languages/fr_FR/modules/products/specials.txt
trunk/extensions/SPECIALS_stable/catalog/admin/includes/modules/
trunk/extensions/SPECIALS_stable/catalog/admin/includes/modules/pages/
trunk/extensions/SPECIALS_stable/catalog/admin/includes/modules/pages/specials.php
trunk/extensions/SPECIALS_stable/catalog/admin/includes/modules/products/
trunk/extensions/SPECIALS_stable/catalog/admin/includes/modules/products/specials.php
trunk/extensions/SPECIALS_stable/catalog/includes/
trunk/extensions/SPECIALS_stable/catalog/includes/modules/
trunk/extensions/SPECIALS_stable/catalog/includes/modules/generic/
trunk/extensions/SPECIALS_stable/catalog/includes/modules/generic/specials.php
trunk/extensions/SPECIALS_stable/install.xml
Added: trunk/extensions/SPECIALS_stable/catalog/admin/includes/gabarit/specials/display_view.edit.gab
===================================================================
--- trunk/extensions/SPECIALS_stable/catalog/admin/includes/gabarit/specials/display_view.edit.gab (rev 0)
+++ trunk/extensions/SPECIALS_stable/catalog/admin/includes/gabarit/specials/display_view.edit.gab 2012-04-14 14:58:48 UTC (rev 4226)
@@ -0,0 +1,54 @@
+<?php
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @subpackage specials
+ @version 2.1.1
+ @date 14/04/2012, 19:45
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @brief file the form for insert and update specials price, it's common for page specials and page products
+*/
+global $currencies;
+?>
+<h3><?php echo __('heading title'); ?></h3>
+
+<div class="box_uniq">
+ <div class="block_form">
+ <p>
+ <?php if (specials::$action == 'update_special' || specials::$action == 'edit') echo tep_draw_hidden_field('specials_id', '', (int)specials::$sInfo->specials_id);
+ echo tep_draw_hidden_field('products_id', '', (int)@specials::$sInfo->products_id);
+ echo tep_draw_hidden_field('products_price', '', (isset(specials::$sInfo->products_price) ? specials::$sInfo->products_price : '')); ?>
+ </p>
+ <p class="block_input">
+ <label><?php echo __('text specials product'); ?></label>
+ <?php echo (isset(specials::$sInfo->products_name))
+ ? specials::$sInfo->products_name . ' <small>(' . $currencies->format(specials::$sInfo->products_price) . ')</small>'
+ : tep_draw_pull_down_menu('products_id', specials::$p_array,@$sID,'style="font-size:10px" onchange="updatetaxe(this)"');
+ ?>
+ </p>
+ <p class="block_input" title="<?php echo __('text specials special price help'); ?>">
+ <label for="specials_price"><?php echo __('text specials special price') . tep_image(DIR_WS_ICONS . 'icon_help.gif'); ; ?></label>
+ <?php echo tep_draw_input_field('specials_price','', (isset(specials::$sInfo->specials_new_products_price ) ?specials::$sInfo->specials_new_products_price : 0), 'onkeyup="updateGross()"'). @specials::$tax_class_array['text']." (".doubleval(@specials::$tax_class_array['value'])."%)".tep_draw_input_field('value_price_gross','', '', 'size="6" disabled="disabled" ');; ?>
+ </p>
+ <p class="block_input" title="<?php echo __('text specials pourct help'); ?>">
+ <label class="smallText" id="infotaxe" for="value_price_gross"><?php echo __('Remise en pourcentage'). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
+ <?php echo tep_draw_input_field('value_discount','', '', 'size="6" onkeyup="updateNet()"'); ?><br />
+ </p>
+ <p class="block_input">
+ <label><?php echo __('text specials begin date'); ?></label>
+ <?php echo tep_draw_input_field('specials_begin_date','', ( isset(specials::$sInfo->specials_begin_date)? tep_date_short(specials::$sInfo->specials_begin_date):''), 'maxlength="10" size="10"') . tep_draw_input_field('begin_hour','',@specials::$sInfo->begin_hour,'maxlength="5" size="5"') .tep_draw_hidden_field('bt_specials_begin_date'); ?>
+ </p>
+ <p class="block_input">
+ <label title="<?php echo __('text specials expires date help'); ?>"><?php echo __('text specials expires date'). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
+ <?php echo tep_draw_input_field('expires_date','', ( isset(specials::$sInfo->expires_date)?tep_date_short(specials::$sInfo->expires_date):''), 'maxlength="10" size="10"') . tep_draw_input_field('expires_hour','',@specials::$sInfo->expires_hour,'maxlength="5" size="5"') . tep_draw_hidden_field('bt_expires_date'); ?>
+ </p>
+ <div class="button_nav">
+ <?php echo ( (specials::$action == 'new')
+ ? tep_image_submit('button_insert.gif', IMAGE_INSERT)
+ : tep_image_submit('button_update.gif', IMAGE_UPDATE)). tep_js_back(tep_href_link(specials::FILENAME, (isset($_GET['sID']) ? 'sID=' . (int)$_GET['sID'] : '')), IMAGE_CANCEL) ;
+ ?>
+ </div>
+ </div>
+</div>
Added: trunk/extensions/SPECIALS_stable/catalog/admin/includes/gabarit/specials/display_view.listing.gab
===================================================================
--- trunk/extensions/SPECIALS_stable/catalog/admin/includes/gabarit/specials/display_view.listing.gab (rev 0)
+++ trunk/extensions/SPECIALS_stable/catalog/admin/includes/gabarit/specials/display_view.listing.gab 2012-04-14 14:58:48 UTC (rev 4226)
@@ -0,0 +1,39 @@
+<?php
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @subpackage specials
+ @version 2.1.1
+ @date 14/04/2012, 19:45
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+?>
+<h3><?php echo __('heading title'); ?></h3>
+
+<div class="button_nav">
+ <?php echo '<a class="button" href="' . tep_href_link(FILENAME_SPECIALS, 'action=new') . '">' . tep_image(DIR_WS_ICONS . 'icon_add_new.png', IMAGE_INSERT) . IMAGE_NEW_PRODUCT . '</a>'; ?>
+</div>
+
+<div class="box_uniq">
+ <div class="box_left">
+ <table class="dataTable">
+ <thead>
+ <tr>
+ <th><?php echo __('table heading products'); ?></th>
+ <th><?php echo __('table heading products price'); ?></th>
+ <th><?php echo __('table heading status'); ?></th>
+ <th><?php echo __('table heading action'); ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <!-- AJAX LOAD -->
+ </tbody>
+ </table>
+ </div>
+
+ <div class="box_right">
+ <?php echo specials::get_right_bar() ?>
+ </div>
+</div>
Added: trunk/extensions/SPECIALS_stable/catalog/admin/includes/gabarit/specials/products.display_view.inline.gab
===================================================================
--- trunk/extensions/SPECIALS_stable/catalog/admin/includes/gabarit/specials/products.display_view.inline.gab (rev 0)
+++ trunk/extensions/SPECIALS_stable/catalog/admin/includes/gabarit/specials/products.display_view.inline.gab 2012-04-14 14:58:48 UTC (rev 4226)
@@ -0,0 +1,18 @@
+<?php
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @subpackage specials
+ @version 2.1.1
+ @date 14/04/2012, 19:45
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+// print_r(specials::$sInfo);
+?>
+ <h4><?php echo __('heading specials inline') ?></h4>
+ <ul>
+
+ </ul>
Added: trunk/extensions/SPECIALS_stable/catalog/admin/includes/javascript/modules/pages/specials.js.php
===================================================================
--- trunk/extensions/SPECIALS_stable/catalog/admin/includes/javascript/modules/pages/specials.js.php (rev 0)
+++ trunk/extensions/SPECIALS_stable/catalog/admin/includes/javascript/modules/pages/specials.js.php 2012-04-14 14:58:48 UTC (rev 4226)
@@ -0,0 +1,103 @@
+<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @subpackage specials
+ @version 2.1.1
+ @date 14/04/2012, 19:45
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+
+ global $languages_selected;
+
+ if (in_array(specials::$action , array(
+// specials module page
+'new', 'edit',
+// popup in product
+'update_special', 'insert_special'
+) ) ):
+ tep_include_file ("includes/javascript/timepicker.js",true);
+ if ($languages_selected != 'en') tep_include_file ("includes/javascript/jquery-ui-i18n.min.js",true);
+ ?>
+ <!-- Specific js for modules specials -->
+ <script type="text/javascript"><!--
+ var tax_rates = new Array();
+ <?php echo 'tax_rates = ' . specials::$tax_class_array['value'] . ';' . "\n"; ?>
+
+ function doRound(x, places) {
+ return Math.round(x * Math.pow(10, places)) / Math.pow(10, places);
+ }
+ function updateGross() {
+ var taxRate = tax_rates;
+ var grossValue = document.forms["new_special"].specials_price.value;
+ var baseprice = document.forms["new_special"].products_price.value;
+ var grossValueo=grossValue;
+ var netValue = grossValue;
+
+ if (taxRate > 0) {
+ grossValue = grossValue * ((taxRate / 100) + 1);
+ }
+
+ document.forms["new_special"].value_price_gross.value = doRound(grossValue, 2);
+ document.forms["new_special"].value_discount.value = Math.abs(doRound( ((1/(baseprice/grossValueo))-1) *100 , 2));
+ }
+
+ function updateNet() {
+ var taxRate = tax_rates;
+ var netValue = document.forms["new_special"].value_price_gross.value;
+ var baseprice = document.forms["new_special"].products_price.value;
+ var discount = document.forms["new_special"].value_discount.value;
+
+
+ var result=doRound( baseprice - (baseprice*discount)/100 , 2);
+
+ if (taxRate > 0) {
+ grossValue = result * ((taxRate / 100) + 1);
+ }
+
+ document.forms["new_special"].specials_price.value = result;
+ document.forms["new_special"].value_price_gross.value = doRound(grossValue, 2);
+
+ }
+
+ function updatetaxe(objselect) {
+ tax_rates = products_tax_infos[objselect.options[objselect.selectedIndex].value]["value"];
+ updateGross();
+ document.getElementById('infotaxe').innerHTML= products_tax_infos[objselect.options[objselect.selectedIndex].value]["class_title"]+ ' ('+ products_tax_infos[objselect.options[objselect.selectedIndex].value]["value"]+ '%)';
+ }
+ $(function() {
+ $.datepicker.setDefaults($.extend({
+ duration: '',
+ changeMonth: true,
+ changeYear: true,
+ showOn: 'button',
+ showTime: true,
+ time24h: true,
+ buttonImage: '<?php echo DIR_WS_ICONS . 'calendar.gif';?>',
+ buttonImageOnly: true
+ }
+ <?php if ($languages_selected != 'en') echo ",\n"."$.datepicker.regional['".$languages_selected."']"."\n"; ?>
+ ));
+ $('#bt_specials_begin_date').datepicker({altField: '#specials_begin_date', altTimeField: '#begin_hour'});
+ $('#bt_expires_date').datepicker({altField: '#expires_date',altTimeField: '#expires_hour'});
+ });
+ // --></script>
+ <?php endif; ?>
+
+
+
+ <style type="text/css">
+ /* */
+
+ #screenshot{
+ position:absolute;
+ border:1px solid #ccc;
+ background:#333;
+ padding:5px;
+ display:none;
+ color:#fff;
+ }
+
+ </style>
\ No newline at end of file
Added: trunk/extensions/SPECIALS_stable/catalog/admin/includes/languages/fr_FR/modules/pages/specials.txt
===================================================================
--- trunk/extensions/SPECIALS_stable/catalog/admin/includes/languages/fr_FR/modules/pages/specials.txt (rev 0)
+++ trunk/extensions/SPECIALS_stable/catalog/admin/includes/languages/fr_FR/modules/pages/specials.txt 2012-04-14 14:58:48 UTC (rev 4226)
@@ -0,0 +1,35 @@
+<?php
+/**
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.0
+ @date 29/03/11, 09:23
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+$lang['heading title']='Promotions';
+$lang['table heading products']='Produits';
+$lang['table heading products price']='Prix du Produits';
+$lang['table heading status']='Statut';
+$lang['table heading action']='Action';
+$lang['text specials product']='Produit :';
+$lang['text specials pourct help']='Vous pouvez entrer un pourcentage dans le champ prix remisé, par exemple : 20%';
+$lang['text specials special price']='Prix promotionnel :';
+$lang['text specials special price help']='Si vous entrez un prix, le séparateur décimal doit être un \'.\' (point décimal), exemple: 49.99';
+$lang['text specials begin date']='Date de début :<small>(jj/mm/aaaa)</small>';
+$lang['text specials expires date']='Date d\'expiration :<small>(jj/mm/aaaa)</small>';
+$lang['text specials expires date help']='Laissez la date d\'échéance vide pour aucune expiration';
+$lang['text info date added']='Date d\'ajout :';
+$lang['text info last modified']='dernière modification :';
+$lang['text info new price']='Nouveau Prix :';
+$lang['text info original price']='Prix original :';
+$lang['text info percentage']='Pourcentage :';
+$lang['text info begin date']='Débute le :';
+$lang['text info expires date']='Expire le :';
+$lang['text info status change']='Changement de statut :';
+$lang['text info heading delete specials']='Supprimer promotion';
+$lang['text info delete intro']='Etes vous sûr de vouloir supprimer cette promotion ?';
+
+$lang['button continue']='Continue';
+?>
\ No newline at end of file
Added: trunk/extensions/SPECIALS_stable/catalog/admin/includes/languages/fr_FR/modules/products/specials.txt
===================================================================
--- trunk/extensions/SPECIALS_stable/catalog/admin/includes/languages/fr_FR/modules/products/specials.txt (rev 0)
+++ trunk/extensions/SPECIALS_stable/catalog/admin/includes/languages/fr_FR/modules/products/specials.txt 2012-04-14 14:58:48 UTC (rev 4226)
@@ -0,0 +1,20 @@
+<?php
+/**
+ @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.0.9
+ @date 04/06/10, 12:04
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+$lang['MODULE_ACAPRO_SPECIAL_TEXT_TITLE']= 'Promotions';
+$lang['MODULE_ACAPRO_SPECIAL_TEXT_DESCRIPTION']= 'Promotions unique de produits';
+
+$lang['Produit :']= 'Produit :';
+$lang["Si vous entrez un prix, le séparateur décimal doit être un '.' (point décimal), exemple: 49.99"]= "Si vous entrez un prix, le séparateur décimal doit être un '.' (point décimal), exemple: 49.99";
+$lang['Prix promotionnel :']= 'Prix promotionnel :';
+$lang['Vous pouvez entrer un pourcentage dans le champ prix remisé, par exemple : 20%']= 'Vous pouvez entrer un pourcentage dans le champ prix remisé, par exemple : 20%';
+$lang['Date de début :<small>(jj/mm/aaaa)</small>']= 'Date de début :<small>(jj/mm/aaaa)</small>';
+$lang["Laissez la date d'échéance vide pour aucune expiration"]= "Laissez la date d'échéance vide pour aucune expiration";
+$lang["Date d'expiration :<small>(jj/mm/aaaa)</small>"]= "Date d'expiration :<small>(jj/mm/aaaa)</small>";
+?>
\ No newline at end of file
Property changes on: trunk/extensions/SPECIALS_stable/catalog/admin/includes/languages/fr_FR/modules/products/specials.txt
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/extensions/SPECIALS_stable/catalog/admin/includes/modules/pages/specials.php
===================================================================
--- trunk/extensions/SPECIALS_stable/catalog/admin/includes/modules/pages/specials.php (rev 0)
+++ trunk/extensions/SPECIALS_stable/catalog/admin/includes/modules/pages/specials.php 2012-04-14 14:58:48 UTC (rev 4226)
@@ -0,0 +1,321 @@
+<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @subpackage specials
+ @version 2.1.1
+ @date 14/04/2012, 19:45
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class specials
+*/
+
+
+class specials
+ implements ExtModPage, InterfacedTJsonS {
+
+ const FILENAME = FILENAME_SPECIALS;
+ /**
+ @var string
+ */
+ public static $code;
+ /**
+ @var string
+ */
+ public static $action;
+ /**
+ @var array
+ */
+ public static $list=array();
+ /**
+ @var int
+ */
+ public static $one;
+ /**
+ @var object
+ */
+ public static $sInfo;
+ /**
+ @var array
+ */
+ public static $tax_class_array;
+ /**
+ @var array
+ */
+ public static $p_array;
+
+ /**
+ class constructor
+ */
+ public function __construct() {
+ self::$code=__CLASS__;
+
+ //! active datatable in ajax, precise les GET necessaire
+ define('JSONSTATMENT', 'mod=page&type='.self::$code);
+ }
+
+ public function check_action($actions){
+ global $messageStack, $currencies, $languages_id;
+
+ self::$action=$actions;
+
+ $sID=(isset($_GET['sID'])) ? (int)$_GET['sID'] : '';
+
+
+ switch (self::$action) {
+ case 'setflag':
+ tep_set_specials_status($_GET['id'], $_GET['flag']);
+
+ tep_redirect(tep_href_link(FILENAME_SPECIALS, 'sID=' . $_GET['id'], 'NONSSL'));
+ break;
+ case 'insert':
+ case 'update':
+
+ $specials_price = tep_db_prepare_input($_POST['specials_price']);
+ $value_discount = tep_db_prepare_input($_POST['value_discount']);
+
+ $specials_begin_date = tep_db_prepare_input($_POST['specials_begin_date']);
+
+ $specials_begin_date = tep_date_raw($specials_begin_date);
+ $expires_date = tep_db_prepare_input($_POST['expires_date']);
+ $expires_date = tep_date_raw($expires_date);
+ $begin_hour = tep_db_prepare_input($_POST['begin_hour']);
+ $expires_hour = tep_db_prepare_input($_POST['expires_hour']);
+
+ $sql_data_array = array('specials_begin_date' => ((($specials_begin_date)&& $specials_begin_date!='--')? $specials_begin_date: '0000-00-00').' '.(tep_not_null($begin_hour)?$begin_hour:'00:00').':00',
+ 'expires_date' => ((tep_not_null($expires_date) && $expires_date!='--')? $expires_date: '0000-00-00').' '.(tep_not_null($expires_hour)?$expires_hour:'00:00').':00');
+
+ if (self::$action == 'insert') {
+ $products_id = tep_db_prepare_input($_POST['products_id']);
+
+ if (tep_not_null($value_discount)) {
+ $new_special_insert_query = tep_db_query("select products_id, products_price from " . TABLE_PRODUCTS . " where products_id = '" . (int)$products_id . "'");
+ $new_special_insert = tep_db_fetch_array($new_special_insert_query);
+
+ $products_price = $new_special_insert['products_price'];
+ $specials_price = ($products_price - (($specials_price / 100) * $products_price));
+ }
+ $insert_sql_data = array ('products_id' => intval($products_id),
+ 'specials_new_products_price' => tep_db_input($specials_price),
+ 'specials_date_added' => 'now()',
+ 'status' => '1');
+
+ $sql_data_array = array_merge($sql_data_array, $insert_sql_data);
+
+ tep_db_perform(TABLE_SPECIALS, $sql_data_array);
+
+ tep_redirect(tep_href_link(FILENAME_SPECIALS, 'page=' . $page));
+ } elseif (self::$action == 'update') {
+ $specials_id = tep_db_prepare_input($_POST['specials_id']);
+ $products_price = tep_db_prepare_input($_POST['products_price']);
+
+ if (tep_not_null($value_discount) ) $specials_price = ($products_price - (($value_discount / 100) * $products_price));
+
+ $update_sql_data = array ('specials_new_products_price' => tep_db_input($specials_price),
+ 'specials_last_modified' => 'now()');
+
+ $sql_data_array = array_merge($sql_data_array, $update_sql_data);
+
+ tep_db_perform(TABLE_SPECIALS, $sql_data_array, 'update', "specials_id = '" . intVal($specials_id) . "'");
+
+ tep_redirect(tep_href_link(FILENAME_SPECIALS, 'sID=' . $specials_id));
+ }
+
+ break;
+ case 'deleteconfirm':
+ $specials_id = tep_db_prepare_input($_GET['sID']);
+
+ tep_db_query("delete from " . TABLE_SPECIALS . " where specials_id = '" . (int)$specials_id . "'");
+
+ tep_redirect(tep_href_link(FILENAME_SPECIALS));
+ break;
+
+// case 'insert':
+// case 'update':
+ case 'edit':
+ case 'new':
+ $form_action = 'insert';
+ if ( (self::$action == 'edit' || self::$action == 'update' ) && isset($sID) ) {
+ $form_action = 'update';
+ // modified query for specials date begin
+ $product_query = tep_db_query("select p.products_id, pd.products_name, p.products_price, s.specials_new_products_price, s.expires_date, s.specials_begin_date from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_SPECIALS . " s where p.products_id = pd.products_id and pd.language_id = '" . (int)$languages_id . "' and p.products_id = s.products_id and s.specials_id = '" . (int)$sID . "'");
+ $product = tep_db_fetch_array($product_query);
+
+ $t['begin_hour']=(tep_not_null($product['specials_begin_date']) ? substr($product['specials_begin_date'], 11 ,16) : '');
+ $t['expires_hour']=(tep_not_null($product['expires_date'])? substr($product['expires_date'], 11 ,16) : '');
+ $product=array_merge($product,(array)$t);
+
+ $sInfo = new objectInfo($product);
+ } else {
+ $sInfo = new objectInfo(array('begin_hour'=>'',
+ 'expires_hour'=>'',
+ 'specials_new_products_price'=>'',
+ 'specials_begin_date'=>'',
+ 'expires_date'=>''
+ ));
+
+ // create an array of products on special, which will be excluded from the pull down menu of products
+ // (when creating a new product on special)
+ $specials_array = array();
+ $specials_query = tep_db_query("select p.products_id from " . TABLE_PRODUCTS . " p, " . TABLE_SPECIALS . " s where s.products_id = p.products_id");
+ while ($specials = tep_db_fetch_array($specials_query)) {
+ $specials_array[] = $specials['products_id'];
+ }
+
+ $list_products=tep_get_product_list($specials_array);
+ foreach($list_products as $k=>$v) self::$p_array[]=array('id'=>$v['products_id'],'text'=>$v['products_name'].' (' . $currencies->format($v['products_price']) . ') ');
+ }
+
+ $tax_class_query = tep_db_query("SELECT t.tax_class_id, t.tax_class_title FROM " . TABLE_PRODUCTS . " p, " . TABLE_TAX_CLASS . " t, ".TABLE_SPECIALS." s WHERE s.specials_id=".(int)$_GET['sID']." AND p.products_id=s.products_id AND p.products_tax_class_id=t.tax_class_id;");
+ $tax_class = tep_db_fetch_array($tax_class_query);
+ self::$tax_class_array = array('id' => $tax_class['tax_class_id'],
+ 'text' => $tax_class['tax_class_title'],
+ 'value' => tep_get_tax_rate_value($tax_class['tax_class_id']));
+
+
+ break;
+
+ default:
+ $list_t=array();
+
+
+ }
+
+ return self::$action;
+ }
+
+ public function get_header(){
+ tep_include_file(DIR_WS_JS . "modules/pages/".__CLASS__.".js.php",true);
+ }
+
+
+ public static function load_db_values($ID){
+ global $languages_id;
+ $DB=Database::getInstance();
+
+ $product_query = $DB->query($sql="select p.products_id, p.products_image, pd.products_name, p.products_price,s.specials_id, s.specials_new_products_price, s.expires_date, s.specials_begin_date, s.specials_date_added, s.specials_last_modified,s.date_status_change, s.status from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_SPECIALS . " s where p.products_id = pd.products_id and pd.language_id = '" . (int)$languages_id . "' and p.products_id = s.products_id and s.specials_id = '" . (int)$ID . "'");
+ $product = $product_query->fetchAssoc();
+
+ $t['begin_hour']=(tep_not_null($product['specials_begin_date']) ? substr($product['specials_begin_date'], 11 ,16) : '');
+ $t['expires_hour']=(tep_not_null($product['expires_date'])? substr($product['expires_date'], 11 ,16) : '');
+ $product=array_merge((array)$product,(array)$t);
+
+ $products_query = $DB->query("select products_image from " . TABLE_PRODUCTS . " where products_id = '" . (int)@$product['products_id'] . "'");
+ $products = $products_query->fetchAssoc();
+ $sInfo_array = array_merge((array)$product, (array)$products);
+
+ return new objectInfo($product);
+ }
+
+ public function display_view(){
+ switch (self::$action) {
+ case 'delete':
+ self::$sInfo=self::load_db_values((int)$_GET['sID'] );
+ return tep_get_include_contents(self::$code.'/'.__FUNCTION__.'.delete');
+ break;
+ case 'edit':
+ case 'new':
+
+ self::$sInfo=self::load_db_values((int)@$_GET['sID'] );
+
+ return '<form id="new_special" action="'.tep_href_link(specials::FILENAME, 'action=' . ((specials::$action == 'edit')?'update':'insert'), 'NONSSL').'" method="post">'.
+ tep_get_include_contents(self::$code.'/'.__FUNCTION__.'.edit').
+ '</form>';
+
+ break;
+ default:
+ self::tep_get_list();
+ return tep_get_include_contents(self::$code.'/'.__FUNCTION__.'.listing');
+ }
+ }
+
+
+ public static function get_right_bar(){
+ global $currencies;
+ $heading = array();
+ $contents = array();
+
+ $sInfo=self::load_db_values( (isset($_GET['sID']) ? $_GET['sID'] : self::$one) );
+
+ switch (self::$action) {
+ default:
+ if (isset($sInfo) && is_object($sInfo)) {
+ $heading[] = array('text' => $sInfo->products_name );
+ $contents[] = array('text' => __('text info date added') . tep_date_short($sInfo->specials_date_added));
+ $contents[] = array('text' => __('text info last modified') . tep_date_short($sInfo->specials_last_modified));
+ $contents[] = array('text' => tep_info_image($sInfo->products_image, $sInfo->products_name, SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT));
+ $contents[] = array('text' => __('text info original price') . $currencies->format($sInfo->products_price));
+ $contents[] = array('text' => __('text info new price') . $currencies->format($sInfo->specials_new_products_price));
+ $contents[] = array('text' => __('text info percentage') . number_format(100 - (($sInfo->specials_new_products_price / $sInfo->products_price) * 100)) . '%');
+
+ $contents[] = array('text' => __('text info begin date') . '<strong>' . tep_datetime_short($sInfo->specials_begin_date) . '</strong>');
+ $contents[] = array('text' => __('text info expires date') . '<strong>' . tep_datetime_short($sInfo->expires_date) . '</strong>');
+ $contents[] = array('text' => __('text info status change') . tep_date_short($sInfo->date_status_change));
+ }
+ }
+
+ if ( (tep_not_null($heading)) && (tep_not_null($contents)) ) {
+ $box = new box;
+ echo $box->infoBox($heading, $contents);
+
+ }
+ }
+
+
+ /** public static InterfacedTJsonS */
+
+ private static function get_item_action($specials){
+ return '<span class="view fils fleft">'.
+ '<a class="buttonimg" href="' . tep_href_link(FILENAME_SPECIALS, 'sID=' . $specials['specials_id']. '&action=edit') . '">' . tep_image(DIR_WS_ICONS . 'icon_edit.png',IMAGE_EDIT) . '</a>'.
+ ' <a class="buttonimg fancytext" href="' . tep_href_link(FILENAME_SPECIALS, 'sID=' . $specials['specials_id']. '&action=delete') . '">' . tep_image(DIR_WS_ICONS . 'icon_delete.png',IMAGE_DELETE) . '</a>'.
+ '</span>';
+ }
+ private static function get_item_statut($specials){
+ if ($specials['status'] == '1')
+ return tep_image(DIR_WS_ICONS . 'icon_status_green.gif', IMAGE_ICON_STATUS_GREEN) . ' <a href="' . tep_href_link(FILENAME_SPECIALS, 'action=setflag&flag=0&id=' . $specials['specials_id'], 'NONSSL') . '">' . tep_image(DIR_WS_ICONS . 'icon_status_red_light.gif', IMAGE_ICON_STATUS_RED_LIGHT) . '</a>';
+ else
+ return '<a href="' . tep_href_link(FILENAME_SPECIALS, 'action=setflag&flag=1&id=' . $specials['specials_id'], 'NONSSL') . '">' . 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);
+ }
+
+ public static function tep_get_modele(){
+ return array( 'products_name'=>true,
+ 'specials_new_products_price'=>true,
+ 'status'=>true,
+ 'action'=>false,
+ );
+ }
+
+ public static function tep_get_list($page=1,$rowbyp=10,$sOrder='',$sWhere='',$options=''){
+ global $query_numrows,$languages_id,$currencies;
+
+ $DB=Database::getInstance();
+
+ $query_raw = "select p.products_id, pd.products_name, p.products_price, s.specials_id, s.specials_new_products_price, s.expires_date, s.specials_begin_date, s.date_status_change, s.status from " . TABLE_PRODUCTS . " p, " . TABLE_SPECIALS . " s, " . TABLE_PRODUCTS_DESCRIPTION . " pd where p.products_id = pd.products_id and pd.language_id = '" . (int)$languages_id . "' and p.products_id = s.products_id ".$sWhere." order by ".((!empty($sOrder)) ? $sOrder : 'pd.products_name ASC');
+
+ $currency_split = new splitPageResults($page, $rowbyp, $query_raw, $query_numrows);
+
+ $currency_query = $DB->query($query_raw);
+
+ while ($currency = $currency_query->fetchAssoc() ) {
+ self::$list[]=$currency;
+ }
+
+ $li=$res=array();
+ foreach(self::$list as $item){
+ if(count($res)==0) self::$one=$item['specials_id'];
+
+ foreach(self::tep_get_modele() as $k=>$v){
+ if($k=='specials_new_products_price')$li['price']='<span class="oldPrice">'.$currencies->format($item['products_price']).'</span> <span class="specialPrice">'.$currencies->format($item['specials_new_products_price']).'</span>';
+ elseif($k=='status')$li['status']=self::get_item_statut($item);
+ elseif($k=='products_name') $li['name']=$item[$k];
+ }
+ $li['action']=self::get_item_action($item);
+ $res[]=$li;
+ }
+ return $res;
+ }
+
+}
+
+?>
\ No newline at end of file
Property changes on: trunk/extensions/SPECIALS_stable/catalog/admin/includes/modules/pages/specials.php
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/extensions/SPECIALS_stable/catalog/admin/includes/modules/products/specials.php
===================================================================
--- trunk/extensions/SPECIALS_stable/catalog/admin/includes/modules/products/specials.php (rev 0)
+++ trunk/extensions/SPECIALS_stable/catalog/admin/includes/modules/products/specials.php 2012-04-14 14:58:48 UTC (rev 4226)
@@ -0,0 +1,314 @@
+<?php
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @subpackage specials
+ @version 2.1.1
+ @date 14/04/2012, 19:45
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class specials
+*/
+
+class specials
+// extends
+ implements InterfaceModule{
+
+ const FILENAME = FILENAME_SPECIALS ;
+
+ public $code;
+
+ /**
+ @var boolean
+ si true ferme popup en fin de cycle
+ */
+ public $closeview;
+ /**
+ @var $action string
+ */
+ public static $action;
+ /**
+ @var object
+ */
+ public static $sInfo;
+ /**
+ @var array
+ */
+ public static $tax_class_array=array(
+ 'id'=>0,
+ 'text'=>'',
+ 'value'=>'0'
+ );
+ /**
+ @var array
+ */
+ public static $p_array;
+ /**
+ @var flag price boolean for active panel option price in edit page products
+ */
+ public $price;
+
+
+ /**
+ @brief constructor
+ */
+ function __construct() {
+ $this->code = __CLASS__;
+ $this->title = __('MODULE_ACAPRO_SPECIAL_TEXT_TITLE');
+ $this->description = __('MODULE_ACAPRO_SPECIAL_TEXT_DESCRIPTION') ;
+ $this->sort_order = (defined('MODULE_ACAPRO_SPECIAL_SORT_ORDER')) ? MODULE_ACAPRO_SPECIAL_SORT_ORDER : 0 ;
+ $this->enabled = true;
+ $this->price = false;
+ $this->closeview=false;
+ }
+
+ /**
+ */
+ public function get_header_js ($action) {
+ global $current_theme,$languages_selected;
+
+ // force load calculate array taxe for js function
+ $this->load_db_taxe(products::$pInfo->products_id);
+
+ tep_include_file(DIR_WS_JS . "modules/pages/".__CLASS__.".js.php",true);
+ return '';
+ }
+
+ public function check_action ($actions){
+ global $currencies;
+
+ self::$action=$act=$actions['action'];
+
+ switch (self::$action){
+ case 'insert_special':
+ $specials_array = array();
+ $specials_query = tep_db_query("select p.products_id from " . TABLE_PRODUCTS . " p, " . TABLE_SPECIALS . " s where s.products_id = p.products_id");
+ while ($specials = tep_db_fetch_array($specials_query)) {
+ $specials_array[] = $specials['products_id'];
+ }
+
+ $list_products=tep_get_product_list($specials_array);
+ foreach($list_products as $k=>$v) self::$p_array[]=array('id'=>$v['products_id'],'text'=>$v['products_name'].' (' . $currencies->format($v['products_price']) . ') ');
+ break;
+
+
+ default:
+ if( method_exists($this,$act) ) $this->$act();
+ }
+
+ if(isset($_GET['forceview']) && $this->closeview) {
+ echo '<script type="text/javascript">window.parent.$.fn.fancybox.close();</script>';
+ echo tep_js_back(tep_href_link(products::FILENAME), IMAGE_BACK);
+ }
+// else tep_redirect(tep_href_link(FILENAME_SPECIALS, 'page=' . $page . '&sID=' . $specials_id.'&row_by_page='.$row_by_page));
+ if(isset($_GET['origin_reload']))tep_redirect(tep_href_link($_GET['origin_reload']));
+
+ return $actions;
+ }
+
+ /**
+ @fn display_ColumnRowAction($id)
+ @brief Affichage dans la liste central colonne action
+ @param $id integer
+ @return string
+ */
+ public function display_ColumnRowAction($id) {
+ $this->load_db_values($id);
+ if(isset(self::$sInfo) && isset(self::$sInfo->products_id) && self::$sInfo->products_id==$id)
+ $contents = ' <a class="buttonimg fancyView iframe" href="' . tep_href_link('aca.php', 'action=update_special&action_type=products&action_class='.__CLASS__.'&action_method=display_view&products_id=' .$id . '') . '">' . tep_image(DIR_WS_ICONS . 'special_on.png',__('image special') ). '</a> ';
+ else
+ $contents = ' <a class="buttonimg fancyView iframe" href="' . tep_href_link('aca.php', 'action=insert_special&action_type=products&action_class='.__CLASS__.'&action_method=display_view&products_id=' .$id . '') . '">' . tep_image(DIR_WS_ICONS . 'special_off.png',__('image special') ). '</a> ';
+
+ return $contents;
+ }
+
+ /**
+ Recup element stocké dans db
+ */
+ public function load_db_values($products_id) {
+ global $languages_id;
+ $product_query = tep_db_query("select p.products_id, pd.products_name, p.products_price,s.specials_id, s.specials_new_products_price, s.expires_date, s.specials_begin_date from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_SPECIALS . " s where p.products_id = pd.products_id and pd.language_id = '" . (int)$languages_id . "' and p.products_id = s.products_id and s.products_id = '" . (int)$products_id . "'");
+ $product = tep_db_fetch_array($product_query);
+ self::$sInfo = ( (tep_db_num_rows($product_query)>0) ? new objectInfo($product) : array() );
+
+ return (tep_db_num_rows($product_query)>0)? true : false;
+ }
+
+ /**
+ @fn display_inline($array)
+ @brief specific for page edit products, and optionnal price
+ @param $array array
+ */
+ public function display_inline($array) {
+ $this->load_db_values (products::$pInfo->products_id);
+
+ /**
+ @remarks use gabarit not centralised in /specials/, but in poducts/specials/
+ */
+ return array(
+ 'title'=> __('heading specials inline') ,
+ 'text'=> tep_get_include_contents(''.__CLASS__.'/products.display_view.inline')
+ );
+ }
+
+
+
+ /**
+ @fn display_view()
+ @brief call by ajax and fancy
+ */
+ public function display_view(){
+
+ if(isset($_GET['products_id']) && ( $this->load_db_values((int)$_GET['products_id']) ) )
+ $form_action = 'update';
+
+ else
+ $form_action = 'insert';
+
+
+ switch (self::$action) {
+ case 'edit':
+ case 'new':
+ default:
+ /**
+ @remarks use gabarit centralised in /specials/, not specific for this modules
+ */
+ return
+ '<form id="new_special" action="' . tep_href_link('aca.php','action_type=products&action_class='.__CLASS__.'&action='.$form_action.'_special_exe&products_id=' .(int)$_GET['products_id'] . '&forceview=true', 'NONSSL') . '" method="post">'."\n".
+ tep_get_include_contents(__CLASS__.'/'.__FUNCTION__.'.edit').
+ '</form>';
+ }
+ }
+
+//=====================================
+// Functions for modules specific
+//=====================================
+
+
+ /**
+ Class taxe array
+ */
+ public function load_db_taxe ($products_id=0) {
+
+ if($products_id <=0)
+ return ;
+
+ $tax_class_query = tep_db_query("SELECT s.products_id,s.specials_id,t.tax_class_id, t.tax_class_title FROM " . TABLE_PRODUCTS . " p, " . TABLE_TAX_CLASS . " t, ".TABLE_SPECIALS." s WHERE s.products_id=".(int)$products_id." AND p.products_id=s.products_id AND p.products_tax_class_id=t.tax_class_id;");
+ $tax_class = tep_db_fetch_array($tax_class_query);
+
+ $this->tax_class_array =$tax_class_array = array('id' => $tax_class['tax_class_id'],
+ 'text' => $tax_class['tax_class_title'],
+ 'value' => tep_get_tax_rate_value($tax_class['tax_class_id']));
+ }
+
+ /**
+ Recup des produits n'etant pas en promos
+ */
+ public function load_db_list_product_no_special(){
+ $specials_array = array();
+ $specials_query = tep_db_query("select p.products_id from " . TABLE_PRODUCTS . " p, " . TABLE_SPECIALS . " s where s.products_id = p.products_id");
+ while ($specials = tep_db_fetch_array($specials_query)) {
+ $specials_array[] = $specials['products_id'];
+ }
+
+ $list_products=tep_get_product_list($specials_array);
+ foreach($list_products as $k=>$v)
+ $p_array[]=array('id'=>$v['products_id'],'text'=>$v['products_name'].' (' . $currencies->format($v['products_price']) . ') ');
+
+ $this->parray=$p_array;
+ }
+
+ /**
+ Recup element product
+ */
+ public function load_db_product($products_id) {
+ global $languages_id;
+
+ $product_query = tep_db_query($sql="select p.products_id, pd.language_id, pd.products_name, p.products_image, p.products_price, p.products_weight, p.products_date_added, p.products_last_modified, p.products_date_available, p.products_status, p.manufacturers_id from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd where p.products_id = pd.products_id and pd.language_id = '" . (int)$languages_id . "' and p.products_id = '" . (int)$products_id . "'");
+
+ $product = tep_db_fetch_array($product_query);
+ self::$sInfo = ( (tep_db_num_rows($product_query)>0) ? new objectInfo($product) : array() );
+ }
+
+
+
+ /**
+ @fn insert_special_exe()
+ @brief call by form in page products
+ */
+ public function insert_special_exe(){
+ $action=(isset(self::$action)? 'update' : 'insert');
+ $specials_price = tep_db_prepare_input($_POST['specials_price']);
+ $value_discount = tep_db_prepare_input($_POST['value_discount']);
+
+ $specials_begin_date = tep_db_prepare_input($_POST['specials_begin_date']);
+
+ $specials_begin_date = tep_date_raw($specials_begin_date);
+ $expires_date = tep_db_prepare_input($_POST['expires_date']);
+ $expires_date = tep_date_raw($expires_date);
+ $begin_hour = tep_db_prepare_input($_POST['begin_hour']);
+ $expires_hour = tep_db_prepare_input($_POST['expires_hour']);
+
+ $sql_data_array = array('specials_begin_date' => ((($specials_begin_date)&& $specials_begin_date!='--')? $specials_begin_date: '0000-00-00').' '.(tep_not_null($begin_hour)?$begin_hour:'00:00').':00',
+ 'expires_date' => ((tep_not_null($expires_date) && $expires_date!='--')? $expires_date: '0000-00-00').' '.(tep_not_null($expires_hour)?$expires_hour:'00:00').':00');
+
+ if (self::$action == 'insert') {
+ $products_id = tep_db_prepare_input($_POST['products_id']);
+
+ if (tep_not_null($value_discount)) {
+ $new_special_insert_query = tep_db_query("select products_id, products_price from " . TABLE_PRODUCTS . " where products_id = '" . (int)$products_id . "'");
+ $new_special_insert = tep_db_fetch_array($new_special_insert_query);
+
+ $products_price = $new_special_insert['products_price'];
+ $specials_price = ($products_price - (($specials_price / 100) * $products_price));
+ }
+ $insert_sql_data = array ('products_id' => intval($products_id),
+ 'specials_new_products_price' => tep_db_input($specials_price),
+ 'specials_date_added' => 'now()',
+ 'status' => '1');
+
+ $sql_data_array = array_merge($sql_data_array, $insert_sql_data);
+
+ tep_db_perform(TABLE_SPECIALS, $sql_data_array);
+
+// tep_redirect(tep_href_link(FILENAME_SPECIALS, 'page=' . $page));
+ } elseif (self::$action == 'update') {
+ $specials_id = tep_db_prepare_input($_POST['specials_id']);
+ $products_price = tep_db_prepare_input($_POST['products_price']);
+
+ if (tep_not_null($value_discount) ) $specials_price = ($products_price - (($value_discount / 100) * $products_price));
+
+ $update_sql_data = array ('specials_new_products_price' => tep_db_input($specials_price),
+ 'specials_last_modified' => 'now()');
+
+ $sql_data_array = array_merge($sql_data_array, $update_sql_data);
+
+ tep_db_perform(TABLE_SPECIALS, $sql_data_array, 'update', "specials_id = '" . intVal($specials_id) . "'");
+
+// tep_redirect(tep_href_link(FILENAME_SPECIALS, 'sID=' . $specials_id));
+ }
+ $this->closeview=true;
+ }
+
+ /**
+ @fn update_special_exe()
+ @brief call by form in page products
+ */
+ public function update_special_exe(){
+ if(isset($_GET['pID']) && $this->load_db_values((int)$_GET['pID']) ) $this->load_db_values ((int)$_GET['pID']);
+ self::$action='update';
+ $this->insert_special_exe('','update');
+ }
+
+
+/** Force implements InterfaceModule class to define this method */
+ function check() {return false; }
+ function install() {return false; }
+ function remove() {return false; }
+ function keys() {
+ return array( 'MODULE_ACAPRO_SPECIAL_SORT_ORDER');
+ }
+
+}
+?>
\ No newline at end of file
Property changes on: trunk/extensions/SPECIALS_stable/catalog/admin/includes/modules/products/specials.php
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/extensions/SPECIALS_stable/catalog/includes/modules/generic/specials.php
===================================================================
--- trunk/extensions/SPECIALS_stable/catalog/includes/modules/generic/specials.php (rev 0)
+++ trunk/extensions/SPECIALS_stable/catalog/includes/modules/generic/specials.php 2012-04-14 14:58:48 UTC (rev 4226)
@@ -0,0 +1,101 @@
+<?php
+/**
+ @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.0
+ @date 23/12/10, 11:01
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @class special
+*/
+
+class specials implements InterfaceModule {
+
+ /**
+ */
+ function __construct() {
+ $this->code = 'special';
+ $this->title = __('promotion');
+ $this->description = __('promotion des produits') ;
+ $this->sort_order = (defined('MODULE_SPECIAL_SORT_ORDER')) ? MODULE_SPECIAL_SORT_ORDER : 0 ;
+ $this->enabled = true;
+
+ //! si admin, pas de suite traitement
+ if(defined('DIR_WS_ADMIN')) return false;
+ $page=page::getInstance();
+ $this->language = $page->the_var('language');
+ $this->languages_id = $page->the_var('languages_id');
+
+ $this->DB=Database::getInstance();
+
+ /// auto expire special products
+ $this->tep_expire_specials();
+ }
+
+
+ public function get_header($action=''){}
+ public function display_view($pID,$class=''){ return array(); }
+
+ /**
+ Object db _value
+ */
+ public function obj_db_values(){
+ $res=$this->load_db_values();
+ while ($special_products = $res->fetchAssoc()) $re[]=new objectInfo($special_products);
+ if(is_array($re)) return $re;
+ else return array();
+ }
+
+
+ /**
+ */
+ public function load_db_values($cID=''){
+ global $page;
+
+ $special_products_category_id =$cID;
+ $mtm= rand();
+
+ $query ="select p.products_id, pd.products_name, p.products_price, p.products_tax_class_id, p.products_image, s.specials_new_products_price from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_SPECIALS . " s where p.products_status = '1' and p.products_id = s.products_id and pd.products_id = s.products_id and pd.language_id = '" . (int)$languages_id . "' and s.status = '1' order by s.specials_date_added desc limit " . $page->_conf_value('MAX_RANDOM_SELECT_SPECIALS');
+
+ $this->special_products_query = $this->DB->query( $query );
+
+ if($this->special_products_query->__get('NumRows')>0) return $this->special_products_query;
+ else return null;
+
+ }
+
+
+/** Function specifique module */
+ /**
+ Sets the status of a special product
+ */
+ private static function tep_set_specials_status($specials_id, $status) {
+ $DB=Database::getInstance();
+ return $DB->query("update " . TABLE_SPECIALS . " set status = '" . $status . "', date_status_change = now() where specials_id = '" . (int)$specials_id . "'");
+ }
+
+
+ /**
+ Auto expire special products
+ */
+ private static function tep_expire_specials() {
+ $DB=Database::getInstance();
+ $specials_debut_query = $DB->query("select specials_id from " . TABLE_SPECIALS . " where status = '0' and now() >= specials_begin_date and specials_begin_date >= 0");
+ if ($specials_debut_query->__get('NumRows')>0) {
+ while ($specials = $specials_debut_query->fetchAssoc()) self::tep_set_specials_status($specials['specials_id'], '1');
+ }
+ $specials_query = $DB->query("select specials_id from " . TABLE_SPECIALS . " where status = '1' and ((now() >= expires_date and expires_date > 0) or now() < specials_begin_date) and expires_date >= 0");
+ if ($specials_query->__get('NumRows')>0) {
+ while ($specials = $specials_query->fetchAssoc()) self::tep_set_specials_status($specials['specials_id'], '0');
+ }
+ }
+
+/** implements InterfaceModule depend */
+ public function check() {}
+ public function install() {}
+ public function remove() {}
+ public function keys() {}
+}
+
+?>
\ No newline at end of file
Added: trunk/extensions/SPECIALS_stable/install.xml
===================================================================
--- trunk/extensions/SPECIALS_stable/install.xml (rev 0)
+++ trunk/extensions/SPECIALS_stable/install.xml 2012-04-14 14:58:48 UTC (rev 4226)
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<contrib>
+ <description>
+ <details contrib_ref="" forum_ref="" contrib_type="aca" status="0" last_update="2010-07-20" />
+ <author_pkg>www.oscim.fr</author_pkg>
+ <comments><![CDATA[ ]]></comments>
+ <credits>oscim</credits>
+ <version>2.0</version>
+ <post_install_notes><![CDATA[ ]]></post_install_notes>
+ </description>
+
+ <addfile>
+ <file name="admin/includes/modules/pages/specials.php" />
+ <file name="admin/includes/modules/products/specials.php" />
+
+ <file name="admin/includes/gabarit/specials/display_view.listing.gab" />
+ <file name="admin/includes/gabarit/specials/display_view.edit.gab" />
+<!-- <file name="admin/includes/gabarit/specials.newChoose.gab" /> -->
+ <file name="admin/includes/gabarit/specials/display_view.delete.gab" />
+ <file name="admin/includes/gabarit/products.display_view.inline.gab" />
+
+ <file name="admin/includes/javascript/modules/pages/specials.js.php" />
+
+ <file name="includes/modules/generic/specials.php" />
+ </addfile>
+
+
+ <addfilelg>
+ <file name="admin/includes/languages/%LANGUAGE%/modules/pages/specials.txt" lgref="fr_FR" />
+ <file name="admin/includes/languages/%LANGUAGE%/modules/products/specials.txt" lgref="fr_FR" />
+ </addfilelg>
+
+
+ <add2endlg>
+ <file name="admin/includes/languages/%LANGUAGE%/boxes/07_catalog.php" />
+ <add type="php" lgref="fr_FR"><![CDATA[define('BOX_CATALOG_SPECIALS', 'Promotion');]]></add>
+ <add type="php" lgref="en_EN"><![CDATA[define('BOX_CATALOG_SPECIALS', 'Special');]]></add>
+ </add2endlg>
+
+
+ <add2end>
+ <file name="admin/includes/boxes/07_catalog.php" />
+ <add type="php"><![CDATA[ $tabl_link[]= array(FILENAME_SPECIALS, 'BOX_CATALOG_SPECIALS', 'specials', @$img['specials']);]]></add>
+ </add2end>
+
+ <config>
+ <group_key>CG_OPTION_MODULES</group_key>
+ <key>MODULE_ACA_SPECIALS_SORT_ORDER</key>
+ <title><![CDATA[Sort order of process.]]></title>
+ <value>true</value>
+ <descr><![CDATA[Sort order of process.]]></descr>
+ <sort_order>1</sort_order>
+ </config>
+
+</contrib>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-13 20:22:27
|
Revision: 4225
http://oscss.svn.sourceforge.net/oscss/?rev=4225&view=rev
Author: oscim
Date: 2012-04-13 20:22:21 +0000 (Fri, 13 Apr 2012)
Log Message:
-----------
suite travail de centralisation et d'expliotation des fichier sql
Modified Paths:
--------------
trunk/catalog/Documents/admin/data/dashboard.xml
trunk/catalog/admin/includes/classes/oscss_DBIndex.php
trunk/catalog/admin/includes/languages/fr_FR/boxes/07_catalog.php
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/backup.txt
trunk/catalog/admin/includes/modules/pages/backup.php
Added Paths:
-----------
trunk/catalog/admin/includes/classes/DataSqlFile.php
Modified: trunk/catalog/Documents/admin/data/dashboard.xml
===================================================================
--- trunk/catalog/Documents/admin/data/dashboard.xml 2012-04-13 15:37:03 UTC (rev 4224)
+++ trunk/catalog/Documents/admin/data/dashboard.xml 2012-04-13 20:22:21 UTC (rev 4225)
@@ -3,8 +3,7 @@
<admin>
<left>
- <widget>AdminUsersNew</widget>
- <widget>AdminUsersModified</widget>
+ <widget>AdminUsersLast</widget>
</left>
<right>
<widget>AdminGroupsNew</widget>
Added: trunk/catalog/admin/includes/classes/DataSqlFile.php
===================================================================
--- trunk/catalog/admin/includes/classes/DataSqlFile.php (rev 0)
+++ trunk/catalog/admin/includes/classes/DataSqlFile.php 2012-04-13 20:22:21 UTC (rev 4225)
@@ -0,0 +1,167 @@
+<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
+/**
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.1
+ @date 11/04/2012, 18:17
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+ @brief Manipluate files.sql And execute
+
+
+
+ Not used !!! In dev
+*/
+
+Class DataFileSql{
+ /**
+ @def TABLES_FOLDER
+ */
+ const TABLES_FOLDER = 'tables/';
+ /**
+ @def TABLES_DATA
+ */
+ const TABLES_DATA = 'data/';
+
+
+ /**
+ @var path base folder for list and
+ */
+ public $basepath;
+
+
+ public function __construct(){
+
+ $this->Ftables = $this->basepath . 'tables/';
+ }
+
+
+ /**
+ @brief ordonne les fichier pour l'install
+ @param path path directory for scan
+ @return array
+ [0] tables
+ [1] keys
+ [2] data
+ */
+ function SqlFileBrowse($path){
+
+ $result=array();
+ $result[0]=array();
+ $result[1]=array();
+ $result[2]=array();
+
+
+
+ foreach(scan($path.'tables/') as $row){
+ if(substr($row,-1) !='~') {
+ if(strpos($row , '.key')===false)
+ $result[0][]=$row;
+
+ elseif(strpos($row , '.key') > 0){
+ if(DB_MOTOR_TYPE =='InnoDB')
+ $result[1][]=$row;
+ }
+ }
+ }
+
+ foreach(scan($path.'data/') as $row){
+ if(substr($row,-1) !='~')
+ $result[2][]=$row;
+ }
+
+
+ return $result;
+
+ }
+
+
+ /**
+ @brief Process for load and install .sql or .key.sql
+ */
+ function SqlFileDataProcess( $sql_file, $table_prefix = -1,$file_lg_sample='') {
+ global $language;
+ $buffer = '';
+ $lg=false;
+
+
+ if( $file_lg_sample !='')include($file_lg_sample);
+ else{
+// $file_lg= dirname($_SERVER['SCRIPT_FILENAME']).'/'.WS_LANGUAGE.DC_LOADER_LANG.'/'.preg_replace(array('#(.sql)#i','#^([0-9]*_)#i'),array('.txt','') ,basename($sql_file));
+// if(file_exists($file_lg))include($file_lg);
+ }
+
+ $fp = fopen($sql_file, 'rb');
+
+ while (!feof ($fp)){
+ $buf = fgets($fp, 4096);
+ if (substr($buf, 0, 2) <> '--' ){
+ $buf=preg_replace('/--(.+)*/' ,'',$buf);
+ $buffer .= $buf;
+ }
+ }
+
+ $DB=Database::getInstance();
+ $repl = ((is_array($lg) && count($lg) >0)? true : false);
+ $buffer=preg_replace('/[ ](OSC_)([A-Z])/i', ' '.$table_prefix.'$2',$buffer);
+ $buffer = trim($buffer);
+
+ $query=preg_split("/\n/i",$buffer,-1,PREG_SPLIT_NO_EMPTY);
+
+
+ if($repl) {
+ $lg_k = array_keys($lg);
+ $lg_v = array_map('addslashes',$lg);
+ }
+ foreach($query as $row){
+ $row = trim($row);
+ if(strlen($row) > 3){
+ $sql=($repl)? str_replace($lg_k,$lg_v,$row) : $row ;
+
+ $DB->query($row);
+
+ }
+ }
+
+ }
+
+ /**
+ @brief Process for load and install .sql or .key.sql
+ */
+ function SqlFileProcess( $sql_file, $table_prefix = -1) {
+
+ $buffer = '';
+ $lg=false;
+
+ $fp = fopen($sql_file, 'rb');
+
+ while (!feof ($fp)){
+ $buf = fgets($fp, 4096);
+ if (substr($buf, 0, 2) <> '--' ){
+ $buf=preg_replace('/--(.+)*/' ,'',$buf);
+ $buffer .= $buf;
+ }
+ }
+ fclose($fp);
+
+
+ $DB=Database::getInstance();
+
+ $buffer=preg_replace('/[ ](OSC_)([A-Z])/i', ' '.$table_prefix.'$2',$buffer);
+
+ $query=explode(';',$buffer);
+ foreach($query as $row){
+ $row = trim($row);
+ if(strlen($row) > 3){
+ $DB->query($row);
+ }
+ }
+
+ }
+
+
+}
+
+
+?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/classes/oscss_DBIndex.php
===================================================================
--- trunk/catalog/admin/includes/classes/oscss_DBIndex.php 2012-04-13 15:37:03 UTC (rev 4224)
+++ trunk/catalog/admin/includes/classes/oscss_DBIndex.php 2012-04-13 20:22:21 UTC (rev 4225)
@@ -34,6 +34,8 @@
// index all tables
$this->ListTablesAvailable();
+
+
$this->ListTablesInstalled();
}
@@ -66,6 +68,7 @@
'extension'=>$ext,
'type'=>(($key) ? 't' : 'k' ),
'installed'=>'0',
+ 'Rows'=>0,
);
if($key){
@@ -108,18 +111,41 @@
function ListTablesInstalled(){
$DB = Database::getInstance();
- $res = $DB->query('SHOW TABLES FROM '.DB_DATABASE );
-// print_r($res->fetchAllAssoc() );
-// exit;
+// $res = $DB->query('SHOW TABLES FROM '.DB_DATABASE );
+// // print_r($res->fetchAllAssoc() );
+// // exit;
+// foreach ($res->fetchAllAssoc() as $key=>$row ) {
+// $row = array_values($row);
+//
+// if(!isset($this->all['table'][$row[0]])){
+// $this->all['inconnue'][$row[0]]['name'] = $row[0];
+// $this->all['inconnue'][$row[0]]['installed'] = '1';
+// }
+// else
+// $this->all['table'][$row[0]]['installed'] = '1';
+//
+// }
+
+ $res = $DB->query('SHOW TABLE STATUS ' );
+
foreach ($res->fetchAllAssoc() as $key=>$row ) {
- $row = array_values($row);
+ if(!isset($this->all['table'][$row['Name']])){
- if(!isset($this->all['table'][$row[0]])){
- $this->all['inconnue'][$row[0]]['name'] = $row[0];
- $this->all['inconnue'][$row[0]]['installed'] = '1';
+ $this->all['inconnue'][$row['Name']] = $row;
+ $this->all['inconnue'][$row['Name']]['name'] = $row;
+ $this->all['inconnue'][$row['Name']]['installed'] = '1';
+ $this->all['inconnue'][$row['Name']]['Create_time'] = $row['Create_time'];
+ $this->all['inconnue'][$row['Name']]['Rows'] = (int)$row['Rows'];
}
- else
- $this->all['table'][$row[0]]['installed'] = '1';
+ else{
+// $row['Name']
+ $this->all['table'][$row['Name']]['Create_time'] = $row['Create_time'];
+ $this->all['table'][$row['Name']]['Rows'] =(int)$row['Rows'];
+ $this->all['table'][$row['Name']]['installed'] = '1';
+
+// print_r($res->fetchAllAssoc() );
+// exit;
+ }
}
Modified: trunk/catalog/admin/includes/languages/fr_FR/boxes/07_catalog.php
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/boxes/07_catalog.php 2012-04-13 15:37:03 UTC (rev 4224)
+++ trunk/catalog/admin/includes/languages/fr_FR/boxes/07_catalog.php 2012-04-13 20:22:21 UTC (rev 4225)
@@ -15,4 +15,8 @@
define('BOX_CATALOG_PRODUCTS_EXPECTED',"Produit(s) en attente" );
define('BOX_CATALOG_ATTIBUTES',"Attribut(s)" );
define('BOX_CATALOG_STOCK',"Stock(s)" );
+
+/* Begin SPECIALS_stable - installed by CIP */
+define('BOX_CATALOG_SPECIALS', 'Promotion');
+/* End SPECIALS_stable - installed by CIP */
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/pages/backup.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/pages/backup.txt 2012-04-13 15:37:03 UTC (rev 4224)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/backup.txt 2012-04-13 20:22:21 UTC (rev 4225)
@@ -13,47 +13,55 @@
/* listing */
-$lang['table heading title']="Titre" ;
-$lang['table heading file date']="Date" ;
-$lang['table heading file size']="Taille" ;
-$lang['table heading action']="Action" ;
+ $lang['table heading title']="Titre" ;
+ $lang['table heading file date']="Date" ;
+ $lang['table heading file size']="Taille" ;
+ $lang['table heading action']="Action" ;
-$lang['image backup']="Sauvegarde" ;
-$lang['image db restore']="Restaurer" ;
-$lang['image restore file ext']="Restaurer un fichier téléchargé" ;
+ $lang['image backup']="Sauvegarde" ;
+ $lang['image db restore']="Restaurer" ;
+ $lang['image restore file ext']="Restaurer un fichier téléchargé" ;
/* backup */
-$lang['text info heading new backup']="Nouvelle sauvegarde" ;
-$lang['text info heading restore local']="Restaurer localement" ;
-$lang['text info new backup']="N'interrompez pas le processus de sauvegarde. Celui-ci peut durer quelques minutes" ;
-$lang['text info unpack']="(après extraction des fichiers de l\'archive)" ;
-$lang['text info restore']="<p>Ne pas interrompre le processus de restauration.<br />Plus le fichier est grand, plus cela prendra du temps!<br />Si possible, utilisez un client Mysql.<br />Par exemple :<br /><strong>mysql -h " . DB_SERVER . " -u " . DB_SERVER_USERNAME . " -p " . DB_DATABASE . " < %s </strong> %s</p>" ;
-$lang['text info restore local']="Ne pas interrompre le processus de restauration.<br /><br />Plus le fichier est grand, plus cela prendra du temps!" ;
-$lang['text info restore local raw file']="Le fichier transféré doit être au format SQL brut (texte)." ;
-$lang['text info date']="Date :" ;
-$lang['text info size']="Taille :" ;
-$lang['text info compression']="Compression :" ;
-$lang['text info use gzip']="Utiliser GZIP" ;
-$lang['text info use zip']="Utiliser ZIP" ;
-$lang['text info use no compression']="Pas de compression (Pur SQL)" ;
-$lang['text info download only']="Télécharger seulement (ne pas le stocker côté serveur)" ;
-$lang['text info best through https']="Préférez une connexion HTTPS" ;
-$lang['text no extension']="Aucune" ;
-$lang['faire un backup integrant la structure des tables']="faire un backup integrant la structure des tables." ;
-$lang['ajouter commande pour vider les tables avant de restaurer']="Ajouter commande pour vider les tables avant de restaurer" ;
+ $lang['text info heading new backup']="Nouvelle sauvegarde" ;
+ $lang['text info heading restore local']="Restaurer localement" ;
+ $lang['text info new backup']="N'interrompez pas le processus de sauvegarde. Celui-ci peut durer quelques minutes" ;
+ $lang['text info unpack']="(après extraction des fichiers de l\'archive)" ;
+ $lang['text info restore']="<p>Ne pas interrompre le processus de restauration.<br />Plus le fichier est grand, plus cela prendra du temps!<br />Si possible, utilisez un client Mysql.<br />Par exemple :<br /><strong>mysql -h " . DB_SERVER . " -u " . DB_SERVER_USERNAME . " -p " . DB_DATABASE . " < %s </strong> %s</p>" ;
+ $lang['text info restore local']="Ne pas interrompre le processus de restauration.<br /><br />Plus le fichier est grand, plus cela prendra du temps!" ;
+ $lang['text info restore local raw file']="Le fichier transféré doit être au format SQL brut (texte)." ;
+ $lang['text info date']="Date :" ;
+ $lang['text info size']="Taille :" ;
+ $lang['text info compression']="Compression :" ;
+ $lang['text info use gzip']="Utiliser GZIP" ;
+ $lang['text info use zip']="Utiliser ZIP" ;
+ $lang['text info use no compression']="Pas de compression (Pur SQL)" ;
+ $lang['text info download only']="Télécharger seulement (ne pas le stocker côté serveur)" ;
+ $lang['text info best through https']="Préférez une connexion HTTPS" ;
+ $lang['text no extension']="Aucune" ;
+ $lang['faire un backup integrant la structure des tables']="faire un backup integrant la structure des tables." ;
+ $lang['ajouter commande pour vider les tables avant de restaurer']="Ajouter commande pour vider les tables avant de restaurer" ;
/* delete */
-$lang['heading title delete backup']="Suppression d'une sauvegarde" ;
-$lang['text info delete backup']="Êtes-vous sûr de vouloir supprimer cette sauvegarde ?" ;
+ $lang['heading title delete backup']="Suppression d'une sauvegarde" ;
+ $lang['text info delete backup']="Êtes-vous sûr de vouloir supprimer cette sauvegarde ?" ;
+/* viewalldb */
+ $lang['backup tab all tables available']="Toutes" ;
+ $lang['backup tab tables link language']="Langues" ;
+ $lang['table heading name']="Nom" ;
+ $lang['table heading installed']="Installé" ;
+ $lang['table heading Rows']="Nbr Lignes" ;
+
+
/* other */
-$lang['text backup directory']="Répertoire de sauvegarde :" ;
-$lang['text last restoration']="Dernière restauration :" ;
-$lang['text forget']="(<u>oublier</u>)" ;
+ $lang['text backup directory']="Répertoire de sauvegarde :" ;
+ $lang['text last restoration']="Dernière restauration :" ;
+ $lang['text forget']="(<u>oublier</u>)" ;
$lang['error backup directory does not exist']="Erreur : Le répertoire de sauvegarde n\'existe pas. Merci de le préciser dans le fichier configure.php (cf DIR_FS_BACKUP)" ;
Modified: trunk/catalog/admin/includes/modules/pages/backup.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/backup.php 2012-04-13 15:37:03 UTC (rev 4224)
+++ trunk/catalog/admin/includes/modules/pages/backup.php 2012-04-13 20:22:21 UTC (rev 4225)
@@ -13,7 +13,7 @@
class backup
extends ModTwo /// new abstract class for nextgen module
implements InterfaceModule
- ,IntModTwo /// new interface module for nextgen module
+ //,IntModTwo /// new interface module for nextgen module
,ExtModConfig {
const FILENAME = FILENAME_BACKUP;
@@ -73,6 +73,7 @@
*/
if(defined('JSONSTATMENT')) return;
+ if(self::$action =='' || self::$action =='listing')
//! active datatable in ajax, precise les GET necessaire
define('JSONSTATMENT', 'mod=page&type='.self::$code.
(isset(parent::$action)?'&action='.parent::$action : '' ).
@@ -125,6 +126,16 @@
'title'=>__('image restore file ext'),
'url'=>tep_href_link(self::FILENAME, 'action=restorelocal'),
);
+
+
+ self::$InitInfo['MenuModule'][]=array(
+ 'type'=>'getLink',
+ 'format'=>'button_nav',
+ 'image'=>'',
+ 'cssclass'=>'',
+ 'title'=>__('image viewalldb'),
+ 'url'=>tep_href_link(self::FILENAME, 'action=viewalldb'),
+ );
}
@@ -160,18 +171,18 @@
case 'backupnow':
- $Go=new BackupProcess;
+ $Go=new BackupProcess;
- if (isset($_POST['backup_structure']) && ($_POST['backup_structure'] == 'yes'))
- $Go->UseStructure = true;
+ if (isset($_POST['backup_structure']) && ($_POST['backup_structure'] == 'yes'))
+ $Go->UseStructure = true;
- if (isset($_POST['backup_truncate']) && ($_POST['backup_truncate'] == 'yes'))
- $Go->EmptyTable = true;
+ if (isset($_POST['backup_truncate']) && ($_POST['backup_truncate'] == 'yes'))
+ $Go->EmptyTable = true;
- $backup_file = 'db_' . DB_DATABASE . '-' . date('YmdHis') . '.sql';
+ $backup_file = 'db_' . DB_DATABASE . '-' . date('YmdHis') . '.sql';
- $Go->Save($backup_file);
+ $Go->Save($backup_file);
if (isset($_POST['download']) && ($_POST['download'] == 'yes')) {
@@ -214,7 +225,7 @@
$restore_file = DIR_FS_BACKUP . $read_from;
}
}
- elseif (self::$action == 'restorelocalnow') {
+ elseif (self::$action == 'restorelocalnow') {
$sql_file = new upload('sql_file',DIR_FS_BACKUP);
if ($sql_file->parse() == true) {
@@ -223,9 +234,9 @@
}
}
- $Go=new BackupProcess;
+ $Go=new BackupProcess;
- $restore_query=$Go->Restore($restore_file);
+ $restore_query=$Go->Restore($restore_file);
if (isset($restore_query)) {
$sql_array = array();
@@ -242,7 +253,8 @@
case 'download':
$extension = substr($_GET['file'], -3);
- $file= tep_db_prepare_input($_GET['file']);
+ $file= tep_db_prepare_input($_GET['file']);
+
if ( ($extension == 'zip') || ($extension == '.gz') || ($extension == 'sql') ) {
if ($fp = fopen(DIR_FS_BACKUP . $file, 'rb')) {
$buffer = fread($fp, filesize(DIR_FS_BACKUP . $file));
@@ -261,7 +273,7 @@
break;
case 'deleteconfirm':
- $file= tep_db_prepare_input($_GET['file']);
+ $file= tep_db_prepare_input($_GET['file']);
if (strstr($file, '..')) tep_redirect(tep_href_link(self::FILENAME));
tep_remove(DIR_FS_BACKUP . '/' . $file);
@@ -302,9 +314,9 @@
$file_array['date'] = tep_datetime_short(date(PHP_DATE_TIME_FORMAT, filemtime(DIR_FS_BACKUP . $entry['file']))); ;
$file_array['size'] = number_format(filesize(DIR_FS_BACKUP . $entry['file'])) ;
switch ($entry['extension']) {
- case 'zip': $file_array['compression'] = 'ZIP'; break;
- case '.gz': $file_array['compression'] = 'GZIP'; break;
- default: $file_array['compression'] = __('text no extension'); break;
+ case 'zip': $file_array['compression'] = 'ZIP'; break;
+ case '.gz': $file_array['compression'] = 'GZIP'; break;
+ default: $file_array['compression'] = __('text no extension'); break;
}
self::$list[$entry['file']]=$file_array;
}
@@ -313,21 +325,21 @@
case 'backup':
case 'delete':
case 'restore':
- if(!empty(self::$Id ) && isset(self::$list[self::$Id ]))
- return self::$Info=self::$list[self::$Id];
+ if(!empty(self::$Id ) && isset(self::$list[self::$Id ]))
+ return self::$Info=self::$list[self::$Id];
break;
case 'listing':
default:
- $li=$res=array();
- foreach(self::$list as $item){
- $li['date']=date(PHP_DATE_TIME_FORMAT, filemtime(DIR_FS_BACKUP . $item['file']));
- $li['title']=$item['file'];
- $li['size']=number_format(filesize(DIR_FS_BACKUP . $item['file']));
- $li['action']=self::get_item_action($item);
- $res[$item['file']]=new objectInfo($li);
- }
+ $li=$res=array();
+ foreach(self::$list as $item){
+ $li['date']=date(PHP_DATE_TIME_FORMAT, filemtime(DIR_FS_BACKUP . $item['file']));
+ $li['title']=$item['file'];
+ $li['size']=number_format(filesize(DIR_FS_BACKUP . $item['file']));
+ $li['action']=self::get_item_action($item);
+ $res[$item['file']]=new objectInfo($li);
+ }
- return $res;
+ return $res;
}
}
@@ -335,24 +347,30 @@
public function display_view(){
switch (parent::$action) {
+
+ case 'viewalldb':
+// self::load_db_values(self::$Id);
+ return MGabCont::CallGab(parent::$action,__FUNCTION__,__CLASS__);
+ break;
+
case 'restorelocal':
case 'restore':
case 'backup':
- self::load_db_values(self::$Id);
- return MGabCont::CallGab(parent::$action,__FUNCTION__,__CLASS__);
+ self::load_db_values(self::$Id);
+ return MGabCont::CallGab(parent::$action,__FUNCTION__,__CLASS__);
break;
case 'delete':
- self::load_db_values(self::$Id);
- /// use master gabarit
- MGabCont::SetCurrentName(__CLASS__);
- return MGabCont::CallGab(parent::$action,__FUNCTION__,self::MASTER);
+ self::load_db_values(self::$Id);
+ /// use master gabarit
+ MGabCont::SetCurrentName(__CLASS__);
+ return MGabCont::CallGab(parent::$action,__FUNCTION__,self::MASTER);
break;
case 'listing':
default:
- self::$list=self::tep_get_list();
- /// use master gabarit
- MGabCont::SetCurrentName(__CLASS__);
- return MGabCont::CallGab('listing',__FUNCTION__,self::MASTER);
+ self::$list=self::tep_get_list();
+ /// use master gabarit
+ MGabCont::SetCurrentName(__CLASS__);
+ return MGabCont::CallGab('listing',__FUNCTION__,self::MASTER);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-13 16:14:57
|
Revision: 4223
http://oscss.svn.sourceforge.net/oscss/?rev=4223&view=rev
Author: oscim
Date: 2012-04-13 15:28:10 +0000 (Fri, 13 Apr 2012)
Log Message:
-----------
Suite evolution precendente, ajustement du modele DataType
Modified Paths:
--------------
trunk/dev/GenerCode/datatype/Modele/catalog/common/classes/datatype_drivers/Data__DATATYPE_REPLACE_.php
trunk/dev/GenerCode/datatype/Modele/install.xml
Modified: trunk/dev/GenerCode/datatype/Modele/catalog/common/classes/datatype_drivers/Data__DATATYPE_REPLACE_.php
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/catalog/common/classes/datatype_drivers/Data__DATATYPE_REPLACE_.php 2012-04-13 15:22:20 UTC (rev 4222)
+++ trunk/dev/GenerCode/datatype/Modele/catalog/common/classes/datatype_drivers/Data__DATATYPE_REPLACE_.php 2012-04-13 15:28:10 UTC (rev 4223)
@@ -25,19 +25,34 @@
public $reg_anchors = array(
'_DATATYPE_REPLACE_' => '_DATATYPE_REPLACE_SEOTAG_'
);
-
/**
+ @var DataType array reg check for control get params , please respect order $reg_anchors
+ */
+ public $reg_check = array(
+ '([0-9]*)' // unique page
+ );
+ /**
@var DataType files for folder /_DATATYPE_REPLACE_
*/
public $reg_filenames = array(
'FILENAME__DATATYPE_REPLACE_' => FILENAME_DEFAULT // unique page
);
-
/**
- @var DataType array reg check for control get params , please respect order $reg_anchors
+ @var DataType Tables define
*/
- public $reg_check = array(
- '([0-9]*)' // unique page
+ public $db_tables = array(
+ ## table master
+ 'TABLE__DATATYPE_REPLACE_MAJ_' => '_DATATYPE_REPLACE_', //
+ ## table language
+ 'TABLE__DATATYPE_REPLACE_MAJ__DESCRIPTION' => '_DATATYPE_REPLACE__description', //
+ ## table extra
+// 'TABLE__DATATYPE_REPLACE_MAJ__EXTRA' => '_DATATYPE_REPLACE__extra', //
+ 'TABLE__DATATYPE_REPLACE_MAJ__EXTRA_FIELDS' => '_DATATYPE_REPLACE__extra_fields', //
+ 'TABLE__DATATYPE_REPLACE_MAJ__EXTRA_FIELDS_LABELS' => '_DATATYPE_REPLACE__extra_fields_labels', //
+ 'TABLE__DATATYPE_REPLACE_MAJ__EXTRA_FIELDS_VALUES' => '_DATATYPE_REPLACE__extra_fields_values', //
+ 'TABLE__DATATYPE_REPLACE_MAJ__TO__DATATYPE_REPLACE_MAJ__EXTRA_FIELDS' => '_DATATYPE_REPLACE__to__DATATYPE_REPLACE__extra_fields', //
+ ## table link datatype categorie
+ 'TABLE__DATATYPE_REPLACE_MAJ__TO_CATEGORIES' => '_DATATYPE_REPLACE__to_categories' //
);
/**
@var DataType dynamic
@@ -54,20 +69,21 @@
/**
@brief constructor
+ @param next bool true for complete load , but use 2 call
*/
- function __construct(){
+ function __construct($next=false){
global $languages_id;
- $this->listing_sql['tables'] = " FROM " . TABLE__DATATYPE_REPLACE_MAJ_ . " ".$this->p." ".
- " LEFT JOIN " . TABLE__DATATYPE_REPLACE_MAJ__DESCRIPTION . " ".$this->p."d ON( ".$this->p."d._DATATYPE_REPLACE__id = ".$this->p."._DATATYPE_REPLACE__id AND ".$this->p."d.language_id = '" . (int)$languages_id . "' ) ".
- "";
+ if($next) {
+ $this->listing_sql['tables'] = " FROM " . TABLE__DATATYPE_REPLACE_MAJ_ . " ".$this->p." ".
+ " LEFT JOIN " . TABLE__DATATYPE_REPLACE_MAJ__DESCRIPTION . " ".$this->p."d ON( ".$this->p."d._DATATYPE_REPLACE__id = ".$this->p."._DATATYPE_REPLACE__id AND ".$this->p."d.language_id = '" . (int)$languages_id . "' ) ".
+ "";
- $this->listing_sql['where'] = " WHERE ".$this->p."._DATATYPE_REPLACE__status = '1' ";
- $this->listing_sql['sort'] = " ".$this->p."d._DATATYPE_REPLACE__title ";
- $this->listing_sql['base_key'] = "_DATATYPE_REPLACE__id ";
- $this->listing_sql['col_count'] = " ".$this->p."._DATATYPE_REPLACE__id ";
- foreach($this->reg_filenames as $key=>$row)
- if(!defined($key))define($key, $row);
+ $this->listing_sql['where'] = " WHERE ".$this->p."._DATATYPE_REPLACE__status = '1' ";
+ $this->listing_sql['sort'] = " ".$this->p."d._DATATYPE_REPLACE__title ";
+ $this->listing_sql['base_key'] = "_DATATYPE_REPLACE__id ";
+ $this->listing_sql['col_count'] = " ".$this->p."._DATATYPE_REPLACE__id ";
+ }
}
/**
Modified: trunk/dev/GenerCode/datatype/Modele/install.xml
===================================================================
--- trunk/dev/GenerCode/datatype/Modele/install.xml 2012-04-13 15:22:20 UTC (rev 4222)
+++ trunk/dev/GenerCode/datatype/Modele/install.xml 2012-04-13 15:28:10 UTC (rev 4223)
@@ -56,10 +56,6 @@
<add2end>
<file name="admin/includes/tables_files_modules.php" />
<add type="php"><![CDATA[
- define('TABLE__DATATYPE_REPLACE_MAJ_', DB_TABLE_PREFIX . '_DATATYPE_REPLACE_');
- define('TABLE__DATATYPE_REPLACE_MAJ__DESCRIPTION', DB_TABLE_PREFIX . '_DATATYPE_REPLACE__description');
- define('TABLE__DATATYPE_REPLACE_MAJ__EXTRA', DB_TABLE_PREFIX . '_DATATYPE_REPLACE__extra');
- define('TABLE__DATATYPE_REPLACE_MAJ__TO_CATEGORIES', DB_TABLE_PREFIX . '_DATATYPE_REPLACE__to_categories');
define('FILENAME__DATATYPE_REPLACE_MAJ_', '_DATATYPE_REPLACE_s.php');]]></add>
</add2end>
@@ -67,19 +63,7 @@
<add2end>
<file name="includes/tables_files_modules.php" />
<add type="php"><![CDATA[
- ## table master
- define('TABLE__DATATYPE_REPLACE_MAJ_', DB_TABLE_PREFIX . '_DATATYPE_REPLACE_');
- define('TABLE__DATATYPE_REPLACE_MAJ__DESCRIPTION', DB_TABLE_PREFIX . '_DATATYPE_REPLACE__description');
- ## link categories
- define('TABLE__DATATYPE_REPLACE_MAJ__TO_CATEGORIES', DB_TABLE_PREFIX . '_DATATYPE_REPLACE__to_categories');
- ## extra
- // define('TABLE__DATATYPE_REPLACE_MAJ__EXTRA', DB_TABLE_PREFIX . '_DATATYPE_REPLACE__extra');
- define('TABLE__DATATYPE_REPLACE_MAJ__EXTRA_FIELDS', DB_TABLE_PREFIX .'_DATATYPE_REPLACE__extra_fields');
- define('TABLE__DATATYPE_REPLACE_MAJ__EXTRA_FIELDS_LABELS', DB_TABLE_PREFIX .'_DATATYPE_REPLACE__extra_fields_labels');
- define('TABLE__DATATYPE_REPLACE_MAJ__EXTRA_FIELDS_VALUES', DB_TABLE_PREFIX .'_DATATYPE_REPLACE__extra_fields_values');
- define('TABLE__DATATYPE_REPLACE_MAJ__TO__DATATYPE_REPLACE_MAJ__EXTRA_FIELDS', DB_TABLE_PREFIX .'_DATATYPE_REPLACE__to__DATATYPE_REPLACE__extra_fields');
-
- define('FILENAME__DATATYPE_REPLACE_MAJ_', '_DATATYPE_REPLACE_.php');]]>
+]]>
</add>
</add2end>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-13 15:37:12
|
Revision: 4224
http://oscss.svn.sourceforge.net/oscss/?rev=4224&view=rev
Author: oscim
Date: 2012-04-13 15:37:03 +0000 (Fri, 13 Apr 2012)
Log Message:
-----------
Correction reliquat integration Class Database
Modified Paths:
--------------
trunk/catalog/common/classes/Database.php
Modified: trunk/catalog/common/classes/Database.php
===================================================================
--- trunk/catalog/common/classes/Database.php 2012-04-13 15:28:10 UTC (rev 4223)
+++ trunk/catalog/common/classes/Database.php 2012-04-13 15:37:03 UTC (rev 4224)
@@ -130,23 +130,19 @@
* @param boolean
* @return array
*/
- public function listTables($strDatabase=false, $blnNoCache=false)
- {
- if (!$strDatabase)
- {
- $strDatabase = $GLOBALS['TL_CONFIG']['dbDatabase'];
+ public function listTables($strDatabase=false, $blnNoCache=false){
+ if (!$strDatabase){
+ $strDatabase = self::DB;
}
- if (!$blnNoCache && isset($this->arrCache[$strDatabase]))
- {
+ if (!$blnNoCache && isset($this->arrCache[$strDatabase])){
return $this->arrCache[$strDatabase];
}
$arrReturn = array();
- $arrTables = $this->execute(sprintf($this->strListTables, $strDatabase))->fetchAllAssoc();
+ $arrTables = $this->query(sprintf($this->strListTables, $strDatabase))->fetchAllAssoc();
- foreach ($arrTables as $arrTable)
- {
+ foreach ($arrTables as $arrTable){
$arrReturn[] = current($arrTable);
}
@@ -162,8 +158,7 @@
* @param boolean
* @return boolean
*/
- public function tableExists($strTable, $strDatabase=false, $blnNoCache=false)
- {
+ public function tableExists($strTable, $strDatabase=false, $blnNoCache=false){
return in_array($strTable, $this->listTables($strDatabase, $blnNoCache));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-13 15:22:31
|
Revision: 4222
http://oscss.svn.sourceforge.net/oscss/?rev=4222&view=rev
Author: oscim
Date: 2012-04-13 15:22:20 +0000 (Fri, 13 Apr 2012)
Log Message:
-----------
Suite centralisation DataType, report des define de Tables vers les differents module,
ajustement du code dans l'ordonnancement des appels , modif public/prive
Allegement des datatables et filename
Modified Paths:
--------------
trunk/catalog/admin/includes/application_top.php
trunk/catalog/admin/includes/classes/ModTwo.php
trunk/catalog/admin/includes/classes/oscss_DBIndex.php
trunk/catalog/admin/includes/database_tables.php
trunk/catalog/admin/includes/exts/package/tags/config.php
trunk/catalog/common/classes/DataTypes.php
trunk/catalog/common/classes/datatype_drivers/Data_categorie.php
trunk/catalog/common/classes/datatype_drivers/Data_content.php
trunk/catalog/common/classes/datatype_drivers/Data_home.php
trunk/catalog/common/classes/datatype_drivers/Data_manufacturer.php
trunk/catalog/common/classes/datatype_drivers/Data_product.php
trunk/catalog/includes/application_top.php
trunk/catalog/includes/database_tables.php
trunk/catalog/includes/filenames.php
Modified: trunk/catalog/admin/includes/application_top.php
===================================================================
--- trunk/catalog/admin/includes/application_top.php 2012-04-13 13:37:27 UTC (rev 4221)
+++ trunk/catalog/admin/includes/application_top.php 2012-04-13 15:22:20 UTC (rev 4222)
@@ -177,7 +177,10 @@
$oscss->pile_file_lang($rpa.DIR_WS_LANGUAGES . $language . '/'.$page_admin.'.txt');
}
+/// Init Dynamic DataType
+ DataTypes::getInstance();
+
/// sortie
if (in_array($current_page, array('cronfile.php')) ) return ;
Modified: trunk/catalog/admin/includes/classes/ModTwo.php
===================================================================
--- trunk/catalog/admin/includes/classes/ModTwo.php 2012-04-13 13:37:27 UTC (rev 4221)
+++ trunk/catalog/admin/includes/classes/ModTwo.php 2012-04-13 15:22:20 UTC (rev 4222)
@@ -54,7 +54,7 @@
Implements IntModTwo
{
/**
- @var Folder Master Gabarit
+ @def MASTER Folder Master Gabarit
*/
const MASTER = 'MGabCont';
/**
@@ -166,7 +166,7 @@
*/
public static function DTheaderTable(){
$action=(empty(self::$action)? 'listing' :self::$action);
- return self::$InitInfo['theader'][$action];
+ return ((isset(self::$InitInfo['theader'][$action])) ? self::$InitInfo['theader'][$action] : array());
}
/**
Modified: trunk/catalog/admin/includes/classes/oscss_DBIndex.php
===================================================================
--- trunk/catalog/admin/includes/classes/oscss_DBIndex.php 2012-04-13 13:37:27 UTC (rev 4221)
+++ trunk/catalog/admin/includes/classes/oscss_DBIndex.php 2012-04-13 15:22:20 UTC (rev 4222)
@@ -22,14 +22,19 @@
@def path
*/
const T_AVAILABLE = 'admin/origin/db/tables/';
+ /**
+ @var
+ */
+ public $all;
/**
@brief constructor
*/
function __construct(){
// index all tables
- $all = $this->ListTablesAvailable();
+ $this->ListTablesAvailable();
+ $this->ListTablesInstalled();
}
@@ -38,22 +43,29 @@
@brief Browse Folder stock file define table
*/
function ListTablesAvailable(){
- $contents = array();
+// $contents = array();
foreach (scan(DIR_FS_ROOT_DOCS . self::T_AVAILABLE ) as $file ) {
+
+ if(substr($file, 0,1) =='.') continue;
+// var_dump($file);
$ext=substr($file,-3);
- $name = substr($file,-(strlen($ext)+1));
+ $name = substr($file,0,-4);
+// var_dump($file.'-'.$name);
$key = false;
if( ( $pos =strpos($name, '.')) > 0 && ($new_name = substr($name, 0, $pos))){
$name = $new_name;
$key = true;
+ }
- if (in_array($ext, array('sql')) ){
+
+ if (in_array($ext, array('sql')) ){
$tmp = array(
'file'=>$file,
'name'=>$name ,
'extension'=>$ext,
- 'type'=>(($key) ? 't' : 'k' )
+ 'type'=>(($key) ? 't' : 'k' ),
+ 'installed'=>'0',
);
if($key){
@@ -66,25 +78,27 @@
while (!feof ($fp)) {
$buf = fgets($fp, 4096);
if (substr($buf, 0, 2) <> '--' ) {
- $buf=preg_all_match ('#(REFERENCES[ ]{1,}osc_languages[ ]{1,}[\(]languages_id[\)])#i' ,$buf, $match);
- $test[]= ((count($match)>1)? true : false );
+ $buf=preg_match_all ('#(REFERENCES[ ]{1,}osc_languages[ ]{1,}[\(]languages_id[\)])#i' ,$buf, $match);
+// print_r($match);
+ $test[]= ((count($match[0])>0)? true : false );
}
}
fclose($fp);
if(in_array(true,$test ))
- $contents['lang'][$name] = $tmp;
+ $this->all['lang'][$name] = $tmp;
}
- $contents['table'][$name] = $tmp;
- }
+ $this->all['table'][$name] = $tmp;
+ }
+
}
- sort($contents);
+// sort($contents);
// foreach ($contents as $row ) {
-// }
+// }$this->all =
- return $contents;
+ return $this->all;
}
@@ -92,6 +106,24 @@
@brief Browse Folder stock file define table
*/
function ListTablesInstalled(){
+ $DB = Database::getInstance();
+
+ $res = $DB->query('SHOW TABLES FROM '.DB_DATABASE );
+// print_r($res->fetchAllAssoc() );
+// exit;
+ foreach ($res->fetchAllAssoc() as $key=>$row ) {
+ $row = array_values($row);
+
+ if(!isset($this->all['table'][$row[0]])){
+ $this->all['inconnue'][$row[0]]['name'] = $row[0];
+ $this->all['inconnue'][$row[0]]['installed'] = '1';
+ }
+ else
+ $this->all['table'][$row[0]]['installed'] = '1';
+
+ }
+
+ return $this->all;
}
/**
Modified: trunk/catalog/admin/includes/database_tables.php
===================================================================
--- trunk/catalog/admin/includes/database_tables.php 2012-04-13 13:37:27 UTC (rev 4221)
+++ trunk/catalog/admin/includes/database_tables.php 2012-04-13 15:22:20 UTC (rev 4222)
@@ -117,64 +117,13 @@
# track sent news for customers
define('TABLE_NEWSLETTERS_SENT', DB_TABLE_PREFIX . 'newsletters_sent');
-## Category tables
- # Master tables
- define('TABLE_CATEGORIES', DB_TABLE_PREFIX . 'categories');
- define('TABLE_CATEGORIES_DESCRIPTION', DB_TABLE_PREFIX . 'categories_description');
- ## Category Associed specifics tables
- # extra
- define('TABLE_CATEGORIES_EXTRA', DB_TABLE_PREFIX . 'categories_extra');
-
-
## Products Tables
- # Master tables
- define('TABLE_PRODUCTS', DB_TABLE_PREFIX . 'products');
- define('TABLE_PRODUCTS_GROUPS', DB_TABLE_PREFIX . 'products_groups');
- define('TABLE_PRODUCTS_GROUP_PRICES', DB_TABLE_PREFIX . 'products_group_prices_cg_');
-
- define('TABLE_PRODUCTS_ATTRIBUTES', DB_TABLE_PREFIX . 'products_attributes');
- define('TABLE_PRODUCTS_ATTRIBUTES_GROUPS', DB_TABLE_PREFIX . 'products_attributes_groups');
- define('TABLE_PRODUCTS_ATTRIBUTES_DOWNLOAD', DB_TABLE_PREFIX . 'products_attributes_download');
-
- define('TABLE_PRODUCTS_DESCRIPTION', DB_TABLE_PREFIX . 'products_description');
- define('TABLE_PRODUCTS_STOCK', DB_TABLE_PREFIX .'products_stock');
- # link to value option
- define('TABLE_PRODUCTS_OPTIONS_VALUES_TO_PRODUCTS_OPTIONS', DB_TABLE_PREFIX . 'products_options_values_to_products_options');
- # link to cat
- define('TABLE_PRODUCTS_TO_CATEGORIES', DB_TABLE_PREFIX . 'products_to_categories');
- # link to extra
- define('TABLE_PRODUCTS_TO_PRODUCTS_EXTRA_FIELDS', DB_TABLE_PREFIX .'products_to_products_extra_fields');
-
## Products Associed specifics tables
# Specials
define('TABLE_SPECIALS', DB_TABLE_PREFIX . 'specials');
- # Option for attribute
- define('TABLE_PRODUCTS_OPTIONS', DB_TABLE_PREFIX . 'products_options');
- define('TABLE_PRODUCTS_OPTIONS_VALUES', DB_TABLE_PREFIX . 'products_options_values');
- # Template d'option for products
- define('TABLE_PRODUCTS_AM_TEMPLATES', DB_TABLE_PREFIX . 'products_am_templates');
- define('TABLE_PRODUCTS_AM_ATTRIBUTES_TO_TEMPLATES', DB_TABLE_PREFIX . 'products_am_attributes_to_templates');
- ## Extra value for products
- define('TABLE_PRODUCTS_EXTRA_FIELDS', DB_TABLE_PREFIX .'products_extra_fields');
- define('TABLE_PRODUCTS_EXTRA_FIELDS_LABELS', DB_TABLE_PREFIX .'products_extra_fields_labels');
- define('TABLE_PRODUCTS_EXTRA_FIELDS_VALUES', DB_TABLE_PREFIX .'products_extra_fields_values');
-
-## Fabricants (linked by products)
- # Master tables
- define('TABLE_MANUFACTURERS', DB_TABLE_PREFIX . 'manufacturers');
- define('TABLE_MANUFACTURERS_INFO', DB_TABLE_PREFIX . 'manufacturers_info');
-
-## Page cms
- # Master tables
- define('TABLE_CONTENT', DB_TABLE_PREFIX . 'content');
- define('TABLE_CONTENT_DESCRIPTION', DB_TABLE_PREFIX . 'content_description');
- # link to cat
- define('TABLE_CONTENT_TO_CATEGORIES', DB_TABLE_PREFIX . 'content_to_categories');
-
-
## naviagtion links
# Master tables
define('TABLE_NAVIGATION_LINKS', DB_TABLE_PREFIX . 'navigation_links');
Modified: trunk/catalog/admin/includes/exts/package/tags/config.php
===================================================================
--- trunk/catalog/admin/includes/exts/package/tags/config.php 2012-04-13 13:37:27 UTC (rev 4221)
+++ trunk/catalog/admin/includes/exts/package/tags/config.php 2012-04-13 15:22:20 UTC (rev 4222)
@@ -32,16 +32,18 @@
implements PackageTags{
/**
- Tag xlm
+ @var Tag xlm
*/
- var $tag_name = 'config';
+ public $tag_name = 'config';
/**
- @param int group id
+ @var int group id
*/
public static $gid;
- // Class Constructor
+ /**
+ @brief Constructor
+ */
function __construct($contrib = '', $id = '', $xml_data = '', $dep = '') {
$this->params = array (
'title' => array (
@@ -77,6 +79,8 @@
);
parent::ContribInstallerBaseTag($contrib, $id, $xml_data, $dep);
}
+
+
// Class Methods
function get_data_from_xml_parser($xml_data = '') {
$this->data['title'] = $this->getTagText($xml_data, 'title', 0);
Modified: trunk/catalog/common/classes/DataTypes.php
===================================================================
--- trunk/catalog/common/classes/DataTypes.php 2012-04-13 13:37:27 UTC (rev 4221)
+++ trunk/catalog/common/classes/DataTypes.php 2012-04-13 15:22:20 UTC (rev 4222)
@@ -64,6 +64,8 @@
$alltype = explode(',',DATATYPES);
+ $define_table = array();
+ $reg_filename = array();
foreach($alltype as $test){
if(!empty($test)) {
@@ -77,8 +79,43 @@
if(isset($tp->RootListing) && count($tp->RootListing) > 0 )
self::$env->RootListing[$childclass] = $tp->RootListing;
+
+ if(isset($tp->reg_filenames) && count($tp->reg_filenames) > 0 )
+ $reg_filename[] = $tp->reg_filenames;
+
+ if(isset($tp->db_tables) && count($tp->db_tables) > 0 )
+ $define_table[] = $tp->db_tables;
}
}
+
+ /**
+ @remarks add define TABLES_XXX for tables detailled in Datatype drivers
+ */
+ foreach($define_table as $bydatatype){
+ foreach($bydatatype as $key=>$row)
+ if(!defined($key))
+ define($key , DB_TABLE_PREFIX . $row);
+ }
+
+ /**
+ @remarks add define FILENAME_XXX detailled in Datatype drivers
+ */
+ foreach($reg_filename as $bydatatype){
+ foreach($bydatatype as $key=>$row)
+ if(!defined($key))
+ define($key , $row);
+ }
+
+
+ /**
+ @remarks Force er-init after define prev
+ */
+ foreach($alltype as $test){
+ if(!empty($test)) {
+ $childclass = self::PREFIX.trim($test) ;
+ self::$env->modlist[$childclass] = $tp = new $childclass(true);
+ }
+ }
}
/**
Modified: trunk/catalog/common/classes/datatype_drivers/Data_categorie.php
===================================================================
--- trunk/catalog/common/classes/datatype_drivers/Data_categorie.php 2012-04-13 13:37:27 UTC (rev 4221)
+++ trunk/catalog/common/classes/datatype_drivers/Data_categorie.php 2012-04-13 15:22:20 UTC (rev 4222)
@@ -30,21 +30,24 @@
public $reg_check = array(
'([0-9_]*)' // unique page
);
-
-
/**
@var DataType files for folder /content
*/
public $reg_filenames = array(
'FILENAME_CATEGORIE' => FILENAME_DEFAULT // unique page
);
-
-
/**
+ @var DataType Tables define
+ */
+ public $db_tables = array(
+ 'TABLE_CATEGORIES' => 'categories', //
+ 'TABLE_CATEGORIES_DESCRIPTION' => 'categories_description', //
+ 'TABLE_CATEGORIES_EXTRA' => 'categories_extra' //
+ );
+ /**
@var DataType dynamic
*/
public $DataTypeDynamic = true;
-
/**
@var DataType root listing
Use for generate listing based on current data type precised in array
@@ -60,10 +63,12 @@
/**
@brief constructor
+ @param next bool true for complete load , but use 2 call
*/
- public function __construct(){
+ function __construct($next=false){
}
+
/**
@brief test si al page est du type produits
@param $mode le type de control (page/cpath/seo)
Modified: trunk/catalog/common/classes/datatype_drivers/Data_content.php
===================================================================
--- trunk/catalog/common/classes/datatype_drivers/Data_content.php 2012-04-13 13:37:27 UTC (rev 4221)
+++ trunk/catalog/common/classes/datatype_drivers/Data_content.php 2012-04-13 15:22:20 UTC (rev 4222)
@@ -25,16 +25,24 @@
'content' => 't'
);
/**
+ @var DataType array reg check for control get params , please respect order $reg_anchors
+ */
+ public $reg_check = array(
+ '([0-9]*)' // unique page
+ );
+ /**
@var DataType files for folder /content
*/
public $reg_filenames = array(
'FILENAME_CONTENT' => FILENAME_DEFAULT // unique page
);
/**
- @var DataType array reg check for control get params , please respect order $reg_anchors
+ @var DataType Tables define
*/
- public $reg_check = array(
- '([0-9]*)' // unique page
+ public $db_tables = array(
+ 'TABLE_CONTENT' => 'content', //
+ 'TABLE_CONTENT_DESCRIPTION' => 'content_description', //
+ 'TABLE_CONTENT_TO_CATEGORIES' => 'content_to_categories' //
);
/**
@var DataType dynamic
@@ -55,25 +63,23 @@
/**
@brief constructor
+ @param next bool true for complete load , but use 2 call
*/
- function __construct(){
+ function __construct($next=false){
global $languages_id;
-// $this->use_in_search = _cst_bool('DATA_CONTENT_USEINSEARCH');
+ if($next) {
+ // $this->use_in_search = _cst_bool('DATA_CONTENT_USEINSEARCH');
+ $this->listing_sql['tables'] = " FROM " . TABLE_CONTENT . " ".$this->p." ".
+ " LEFT JOIN " . TABLE_CONTENT_DESCRIPTION . " ".$this->p."d ON( ".$this->p."d.content_id = ".$this->p.".content_id AND ".$this->p."d.language_id = '" . (int)$languages_id . "' ) ".
+ "";
- $this->listing_sql['tables'] = " FROM " . TABLE_CONTENT . " ".$this->p." ".
- " LEFT JOIN " . TABLE_CONTENT_DESCRIPTION . " ".$this->p."d ON( ".$this->p."d.content_id = ".$this->p.".content_id AND ".$this->p."d.language_id = '" . (int)$languages_id . "' ) ".
- "";
-
- $this->listing_sql['where'] = " WHERE ".$this->p.".content_status = '1' ";
- $this->listing_sql['sort'] = " ".$this->p."d.content_title ";
- $this->listing_sql['base_key'] = "content_id ";
- $this->listing_sql['col_count'] = " ".$this->p.".content_id ";
-
-
- foreach($this->reg_filenames as $key=>$row)
- if(!defined($key))define($key, $row);
+ $this->listing_sql['where'] = " WHERE ".$this->p.".content_status = '1' ";
+ $this->listing_sql['sort'] = " ".$this->p."d.content_title ";
+ $this->listing_sql['base_key'] = "content_id ";
+ $this->listing_sql['col_count'] = " ".$this->p.".content_id ";
+ }
}
/**
Modified: trunk/catalog/common/classes/datatype_drivers/Data_home.php
===================================================================
--- trunk/catalog/common/classes/datatype_drivers/Data_home.php 2012-04-13 13:37:27 UTC (rev 4221)
+++ trunk/catalog/common/classes/datatype_drivers/Data_home.php 2012-04-13 15:22:20 UTC (rev 4222)
@@ -62,10 +62,9 @@
/**
@brief constructor
+ @param next bool true for complete load , but use 2 call
*/
- function __construct(){
- foreach($this->reg_filenames as $key=>$row)
- if(!defined($key))define($key, $row);
+ function __construct($next=false){
}
/**
Modified: trunk/catalog/common/classes/datatype_drivers/Data_manufacturer.php
===================================================================
--- trunk/catalog/common/classes/datatype_drivers/Data_manufacturer.php 2012-04-13 13:37:27 UTC (rev 4221)
+++ trunk/catalog/common/classes/datatype_drivers/Data_manufacturer.php 2012-04-13 15:22:20 UTC (rev 4222)
@@ -23,21 +23,25 @@
public $reg_anchors = array(
'manufacturers_id' => 'm'
);
-
/**
@var DataType array reg check for control get params , please respect order $reg_anchors
*/
public $reg_check = array(
'([0-9]*)' // unique page
);
-
-
/**
@var DataType files for folder /content
*/
public $reg_filenames = array(
'FILENAME_MANUFACTURER' => FILENAME_DEFAULT // unique page
);
+ /**
+ @var DataType Tables define
+ */
+ public $db_tables = array(
+ 'TABLE_MANUFACTURERS' => 'manufacturers', //
+ 'TABLE_MANUFACTURERS_INFO' => 'manufacturers_info' //
+ );
/**
@var DataType dynamic
@@ -52,8 +56,9 @@
/**
@brief constructor
+ @param next bool true for complete load , but use 2 call
*/
- function __construct(){
+ function __construct($next=false){
}
/**
Modified: trunk/catalog/common/classes/datatype_drivers/Data_product.php
===================================================================
--- trunk/catalog/common/classes/datatype_drivers/Data_product.php 2012-04-13 13:37:27 UTC (rev 4221)
+++ trunk/catalog/common/classes/datatype_drivers/Data_product.php 2012-04-13 15:22:20 UTC (rev 4222)
@@ -37,6 +37,29 @@
'FILENAME_PRODUCT_INFO' => FILENAME_DEFAULT // unique page prodcuts
);
/**
+ @var DataType Tables define
+ */
+ public $db_tables = array(
+ 'TABLE_PRODUCTS' => 'products', //
+ 'TABLE_PRODUCTS_ATTRIBUTES' => 'products_attributes', //
+ 'TABLE_PRODUCTS_ATTRIBUTES_DOWNLOAD' => 'products_attributes_download', //
+ 'TABLE_PRODUCTS_DESCRIPTION' => 'products_description', //
+ 'TABLE_PRODUCTS_GROUPS' => 'products_groups', //
+ 'TABLE_PRODUCTS_GROUP_PRICES' => 'products_group_prices_cg_', //
+ 'TABLE_PRODUCTS_ATTRIBUTES_GROUPS' => 'products_attributes_groups', //
+ 'TABLE_PRODUCTS_OPTIONS' => 'products_options', //
+ 'TABLE_PRODUCTS_OPTIONS_VALUES' => 'products_options_values', //
+ 'TABLE_PRODUCTS_OPTIONS_VALUES_TO_PRODUCTS_OPTIONS' => 'products_options_values_to_products_options', //
+ 'TABLE_PRODUCTS_STOCK' => 'products_stock', //
+ 'TABLE_PRODUCTS_EXTRA_FIELDS' => 'products_extra_fields', //
+ 'TABLE_PRODUCTS_EXTRA_FIELDS_LABELS' => 'products_extra_fields_labels', //
+ 'TABLE_PRODUCTS_EXTRA_FIELDS_VALUES' => 'products_extra_fields_values', //
+ 'TABLE_PRODUCTS_TO_PRODUCTS_EXTRA_FIELDS' => 'products_to_products_extra_fields', //
+ 'TABLE_PRODUCTS_TO_CATEGORIES' => 'products_to_categories', //
+ 'TABLE_PRODUCT_TO_CATEGORIES' => 'products_to_categories', // new format line
+// 'TABLE_PRODUCTS_PRICE' => 'products_price', //
+ );
+ /**
@var DataType dynamic
*/
public $DataTypeDynamic = true;
@@ -55,33 +78,24 @@
/**
@brief constructor
+ @param next bool true for complete load , but use 2 call
*/
- function __construct(){
+ function __construct($next=false){
global $languages_id;
-// $this->use_in_search = _cst_bool('DATA_PRODUCT_USEINSEARCH');
+ if($next) {
+ // $this->use_in_search = _cst_bool('DATA_PRODUCT_USEINSEARCH');
- /// Utiliser dans les appels dynamique
-//! TODO Normalisation des nom de tables produits , sans "s"
- if(!defined('TABLE_PRODUCT_TO_CATEGORIES'))
- define('TABLE_PRODUCT_TO_CATEGORIES', TABLE_PRODUCTS_TO_CATEGORIES);
+ $this->listing_sql['tables'] = " FROM " . TABLE_PRODUCTS . " ".$this->p." ".
+ " LEFT JOIN " . TABLE_PRODUCTS_DESCRIPTION . " ".$this->p."d ON( ".$this->p."d.products_id = ".$this->p.".products_id AND ".$this->p."d.language_id = '" . (int)$languages_id . "' ) ".
+ "";
- $this->listing_sql['tables'] = " FROM " . TABLE_PRODUCTS . " ".$this->p." ".
- " LEFT JOIN " . TABLE_PRODUCTS_DESCRIPTION . " ".$this->p."d ON( ".$this->p."d.products_id = ".$this->p.".products_id AND ".$this->p."d.language_id = '" . (int)$languages_id . "' ) ".
- "";
-
- $this->listing_sql['where'] = " WHERE ".$this->p.".products_status = '1' ";
- $this->listing_sql['sort'] = " ".$this->p."d.products_name ";
- $this->listing_sql['base_key'] = "products_id ";
- $this->listing_sql['col_count'] = " ".$this->p.".products_id ";
-
- // define filename
- foreach($this->reg_filenames as $key=>$row)
- if(!defined($key))define($key, $row);
-
-
-
+ $this->listing_sql['where'] = " WHERE ".$this->p.".products_status = '1' ";
+ $this->listing_sql['sort'] = " ".$this->p."d.products_name ";
+ $this->listing_sql['base_key'] = "products_id ";
+ $this->listing_sql['col_count'] = " ".$this->p.".products_id ";
+ }
}
/**
Modified: trunk/catalog/includes/application_top.php
===================================================================
--- trunk/catalog/includes/application_top.php 2012-04-13 13:37:27 UTC (rev 4221)
+++ trunk/catalog/includes/application_top.php 2012-04-13 15:22:20 UTC (rev 4222)
@@ -1,14 +1,15 @@
<?php
/**
- @ licence GPL *2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 18/12/11, 21:44
+ @date 13/04/2012, 21:44
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
- *\file application_top.php
- *
+ @file application_top.php
+ @brief This file is absolute necesary,il structur all core , this file is current and normal called by other all file in root dir
+ but, is process in php-cli , please use appli_top_Test.php
*/
/**
@@ -75,7 +76,7 @@
$DB=Database::getInstance();
//! element optionnel
-// if (file_exists(DIR_WS_INCLUDES . 'tables_files_modules.php')) require(DIR_WS_INCLUDES . 'tables_files_modules.php');
+ if (file_exists(DIR_WS_INCLUDES . 'tables_files_modules.php')) require(DIR_WS_INCLUDES . 'tables_files_modules.php');
/// set the application parameters
$res=$DB->query("SELECT configuration_key AS cfgKey, configuration_value AS cfgValue FROM " . TABLE_CONFIGURATION ." where configuration_type IN (2,3) ");
@@ -129,12 +130,6 @@
$page= page::getInstance($FileRegistered);
$page->add_var_page('request_type',$request_type);
-/// include osc Price
- $osC_Tax=$price=$currencies = new price();
- $page->add_object('price', $price);
- /// reto-compatibilité
- $page->add_object('currencies', $currencies);
- $page->add_object('osC_Tax', $osC_Tax);
/// set the cookie domain
$cookie_domain = (($request_type == 'NONSSL') ? HTTP_COOKIE_DOMAIN : HTTPS_COOKIE_DOMAIN);
@@ -295,17 +290,9 @@
}
}
-/// create the shopping cart & fix the cart if necesary
- if (!tep_session_is_registered('cart') || !isset($cart) || !is_object($cart) ) {
- $cart = new shoppingCart;
- tep_session_register('cart');
- }
- $page->add_object('cart', $cart);
-
-
/// set the language
- if (!tep_session_is_registered('language') || isset($_GET['language'])) {
- if (!tep_session_is_registered('language')) {
+ if (!tep_session_is_registered('language') || !tep_session_is_registered('languages_id') ||isset($_GET['language'])) {
+ if (!tep_session_is_registered('language') || !tep_session_is_registered('languages_id') ) {
tep_session_register('language');
tep_session_register('languages_id');
}
@@ -332,6 +319,24 @@
//! init cache lang (.txt)
$page->cache_lang();
+/// Init Dynamic DataType
+ DataTypes::getInstance();
+
+/// include osc Price
+ $osC_Tax=$price=$currencies = new price();
+ $page->add_object('price', $price);
+ /// reto-compatibilité
+ $page->add_object('currencies', $currencies);
+ $page->add_object('osC_Tax', $osC_Tax);
+
+
+/// create the shopping cart & fix the cart if necesary
+ if (!tep_session_is_registered('cart') || !isset($cart) || !is_object($cart) ) {
+ $cart = new shoppingCart;
+ tep_session_register('cart');
+ }
+ $page->add_object('cart', $cart);
+
/// Ultimate SEO URLs v2.1
if (_cst_bool('SEO_ENABLED')) $seo_urls = seo_url::getInstance($languages_id);
Modified: trunk/catalog/includes/database_tables.php
===================================================================
--- trunk/catalog/includes/database_tables.php 2012-04-13 13:37:27 UTC (rev 4221)
+++ trunk/catalog/includes/database_tables.php 2012-04-13 15:22:20 UTC (rev 4222)
@@ -25,16 +25,16 @@
// define the database table names used in the project
define('TABLE_ADDRESS_BOOK', DB_TABLE_PREFIX . 'address_book');
- define('TABLE_CATEGORIES', DB_TABLE_PREFIX . 'categories');
- define('TABLE_CATEGORIES_DESCRIPTION', DB_TABLE_PREFIX . 'categories_description');
- define('TABLE_CATEGORIES_EXTRA', DB_TABLE_PREFIX . 'categories_extra');
+// define('TABLE_CATEGORIES', DB_TABLE_PREFIX . 'categories');
+// define('TABLE_CATEGORIES_DESCRIPTION', DB_TABLE_PREFIX . 'categories_description');
+// define('TABLE_CATEGORIES_EXTRA', DB_TABLE_PREFIX . 'categories_extra');
define('TABLE_CONFIGURATION', DB_TABLE_PREFIX . 'configuration');
define('TABLE_CONFIGURATION_GROUP', DB_TABLE_PREFIX . 'configuration_group');
- define('TABLE_CONTENT', DB_TABLE_PREFIX . 'content');
- define('TABLE_CONTENT_DESCRIPTION', DB_TABLE_PREFIX . 'content_description');
- define('TABLE_CONTENT_TO_CATEGORIES', DB_TABLE_PREFIX . 'content_to_categories');
+// define('TABLE_CONTENT', DB_TABLE_PREFIX . 'content');
+// define('TABLE_CONTENT_DESCRIPTION', DB_TABLE_PREFIX . 'content_description');
+// define('TABLE_CONTENT_TO_CATEGORIES', DB_TABLE_PREFIX . 'content_to_categories');
define('TABLE_CURRENCIES', DB_TABLE_PREFIX . 'currencies');
@@ -61,8 +61,8 @@
define('TABLE_LANGUAGES', DB_TABLE_PREFIX . 'languages');
- define('TABLE_MANUFACTURERS', DB_TABLE_PREFIX . 'manufacturers');
- define('TABLE_MANUFACTURERS_INFO', DB_TABLE_PREFIX . 'manufacturers_info');
+// define('TABLE_MANUFACTURERS', DB_TABLE_PREFIX . 'manufacturers');
+// define('TABLE_MANUFACTURERS_INFO', DB_TABLE_PREFIX . 'manufacturers_info');
define('TABLE_NAVIGATION_LINKS', DB_TABLE_PREFIX . 'navigation_links');
define('TABLE_NAVIGATION_LINKS_DESCRIPTION', DB_TABLE_PREFIX . 'navigation_links_description');
@@ -83,24 +83,24 @@
define('TABLE_SHIPPING', DB_TABLE_PREFIX.'shipping');
define('TABLE_SHIPPING_PRODUCTS', DB_TABLE_PREFIX.'shipping_products');
- define('TABLE_PRODUCTS', DB_TABLE_PREFIX . 'products');
- define('TABLE_PRODUCTS_ATTRIBUTES', DB_TABLE_PREFIX . 'products_attributes');
- define('TABLE_PRODUCTS_ATTRIBUTES_DOWNLOAD', DB_TABLE_PREFIX . 'products_attributes_download');
- define('TABLE_PRODUCTS_DESCRIPTION', DB_TABLE_PREFIX . 'products_description');
- define('TABLE_PRODUCTS_GROUPS', DB_TABLE_PREFIX . 'products_groups');
- define('TABLE_PRODUCTS_GROUP_PRICES', DB_TABLE_PREFIX . 'products_group_prices_cg_');
- define('TABLE_PRODUCTS_ATTRIBUTES_GROUPS', DB_TABLE_PREFIX . 'products_attributes_groups');
- define('TABLE_PRODUCTS_OPTIONS', DB_TABLE_PREFIX . 'products_options');
- define('TABLE_PRODUCTS_OPTIONS_VALUES', DB_TABLE_PREFIX . 'products_options_values');
- define('TABLE_PRODUCTS_OPTIONS_VALUES_TO_PRODUCTS_OPTIONS', DB_TABLE_PREFIX . 'products_options_values_to_products_options');
- define('TABLE_PRODUCTS_STOCK', DB_TABLE_PREFIX .'products_stock');
-// define('TABLE_PRODUCTS_PRICE', DB_TABLE_PREFIX .'products_price');
- define('TABLE_PRODUCTS_EXTRA_FIELDS', DB_TABLE_PREFIX .'products_extra_fields');
- define('TABLE_PRODUCTS_EXTRA_FIELDS_LABELS', DB_TABLE_PREFIX .'products_extra_fields_labels');
- define('TABLE_PRODUCTS_EXTRA_FIELDS_VALUES', DB_TABLE_PREFIX .'products_extra_fields_values');
- define('TABLE_PRODUCTS_TO_PRODUCTS_EXTRA_FIELDS', DB_TABLE_PREFIX .'products_to_products_extra_fields');
- define('TABLE_PRODUCTS_TO_CATEGORIES', DB_TABLE_PREFIX . 'products_to_categories');
-// define('TABLE_PRODUCTS_VIRTUAL', DB_TABLE_PREFIX .'products_virtual');
+// define('TABLE_PRODUCTS', DB_TABLE_PREFIX . 'products');
+// define('TABLE_PRODUCTS_ATTRIBUTES', DB_TABLE_PREFIX . 'products_attributes');
+// define('TABLE_PRODUCTS_ATTRIBUTES_DOWNLOAD', DB_TABLE_PREFIX . 'products_attributes_download');
+// define('TABLE_PRODUCTS_DESCRIPTION', DB_TABLE_PREFIX . 'products_description');
+// define('TABLE_PRODUCTS_GROUPS', DB_TABLE_PREFIX . 'products_groups');
+// define('TABLE_PRODUCTS_GROUP_PRICES', DB_TABLE_PREFIX . 'products_group_prices_cg_');
+// define('TABLE_PRODUCTS_ATTRIBUTES_GROUPS', DB_TABLE_PREFIX . 'products_attributes_groups');
+// define('TABLE_PRODUCTS_OPTIONS', DB_TABLE_PREFIX . 'products_options');
+// define('TABLE_PRODUCTS_OPTIONS_VALUES', DB_TABLE_PREFIX . 'products_options_values');
+// define('TABLE_PRODUCTS_OPTIONS_VALUES_TO_PRODUCTS_OPTIONS', DB_TABLE_PREFIX . 'products_options_values_to_products_options');
+// define('TABLE_PRODUCTS_STOCK', DB_TABLE_PREFIX .'products_stock');
+// // define('TABLE_PRODUCTS_PRICE', DB_TABLE_PREFIX .'products_price');
+// define('TABLE_PRODUCTS_EXTRA_FIELDS', DB_TABLE_PREFIX .'products_extra_fields');
+// define('TABLE_PRODUCTS_EXTRA_FIELDS_LABELS', DB_TABLE_PREFIX .'products_extra_fields_labels');
+// define('TABLE_PRODUCTS_EXTRA_FIELDS_VALUES', DB_TABLE_PREFIX .'products_extra_fields_values');
+// define('TABLE_PRODUCTS_TO_PRODUCTS_EXTRA_FIELDS', DB_TABLE_PREFIX .'products_to_products_extra_fields');
+// define('TABLE_PRODUCTS_TO_CATEGORIES', DB_TABLE_PREFIX . 'products_to_categories');
+// // define('TABLE_PRODUCTS_VIRTUAL', DB_TABLE_PREFIX .'products_virtual');
define('TABLE_SEO_CACHE', DB_TABLE_PREFIX . 'seo_cache');
define('TABLE_STATUS',DB_TABLE_PREFIX.'status');
@@ -120,7 +120,7 @@
/// TOP Not Used for dev
- define('TABLE_IMAGES_USED', DB_TABLE_PREFIX . 'images_used');
+// define('TABLE_IMAGES_USED', DB_TABLE_PREFIX . 'images_used');
define('TABLE_UNITY', DB_TABLE_PREFIX . 'f_unity');
define('TABLE_UNITY_DET', DB_TABLE_PREFIX . 'f_unity_det');
@@ -129,8 +129,4 @@
define('TABLE_V_ORDERS_STATUS', 'view_orders_status');
define('TABLE_V_PRODUCTS_VIRTUAL_TYPES', 'view_products_virtual_types');
-/* Begin CIP-osCSS-RvBO-banner_manager - installed by Contrib_Installer */
-define('TABLE_BANNERS', DB_TABLE_PREFIX . 'banners');
-define('TABLE_BANNERS_HISTORY', DB_TABLE_PREFIX . 'banners_history');
-/* End CIP-osCSS-RvBO-banner_manager - installed by Contrib_Installer */
?>
\ No newline at end of file
Modified: trunk/catalog/includes/filenames.php
===================================================================
--- trunk/catalog/includes/filenames.php 2012-04-13 13:37:27 UTC (rev 4221)
+++ trunk/catalog/includes/filenames.php 2012-04-13 15:22:20 UTC (rev 4222)
@@ -1,19 +1,42 @@
<?php
/**
- @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
@version 2.1.1
- @date 01/11/11, 15:02
+ @date 13/04/2012, 15:02
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
- define('FILENAME_DEFAULT', 'index.php');
// define the filenames used in the project
+
+/* Exist in folder (/) */
+ define('FILENAME_DEFAULT', 'index.php');
+ define('FILENAME_ACCOUNT', 'account.php');
define('FILENAME_AJAX', 'ajax_exe.php');
- define('FILENAME_ACCOUNT', 'account.php');
+ define('FILENAME_ADVANCED_SEARCH', 'advanced_search.php');
+ define('FILENAME_CREATE_ACCOUNT', 'create_account.php');
+ define('FILENAME_LOGIN', 'login.php');
+ define('FILENAME_LOGOFF', 'logoff.php');
+ define('FILENAME_PASSWORD_FORGOTTEN', 'password_forgotten.php');
+ define('FILENAME_DOWNLOAD', 'download.php');
+ define('FILENAME_REDIRECT', 'redirect.php');
+
+ define('FILENAME_CHECKOUT_CONFIRMATION', 'checkout_confirmation.php');
+ define('FILENAME_CHECKOUT_PAYMENT', 'checkout_payment.php');
+ define('FILENAME_CHECKOUT_PAYMENT_ADDRESS', 'checkout_payment_address.php');
+ define('FILENAME_CHECKOUT_PROCESS', 'checkout_process.php');
+ define('FILENAME_CHECKOUT_SHIPPING', 'checkout_shipping.php');
+ define('FILENAME_CHECKOUT_SHIPPING_ADDRESS', 'checkout_shipping_address.php');
+ define('FILENAME_CHECKOUT_SUCCESS', 'checkout_success.php');
+ /* One Page Checkout - BEGIN */
+ define('FILENAME_CHECKOUT', 'checkout.php');
+
+
+/* Other / exist in content or retro-compatibilite*/
+
// define('FILENAME_ACCOUNT_EDIT', 'account_edit.php');
define('FILENAME_ACCOUNT_HISTORY', 'account_history.php');
define('FILENAME_ACCOUNT_HISTORY_INFO', 'account_history_info.php');
@@ -22,58 +45,46 @@
define('FILENAME_ACCOUNT_PASSWORD', 'account_password.php');
define('FILENAME_ADDRESS_BOOK', 'address_book.php');
define('FILENAME_ADDRESS_BOOK_PROCESS', 'address_book_process.php');
- define('FILENAME_ADVANCED_SEARCH', 'advanced_search.php');
- define('FILENAME_ALSO_PURCHASED_PRODUCTS', 'also_purchased_products.php');
- define('FILENAME_CHECKOUT_CONFIRMATION', 'checkout_confirmation.php');
- define('FILENAME_CHECKOUT_PAYMENT', 'checkout_payment.php');
- define('FILENAME_CHECKOUT_PAYMENT_ADDRESS', 'checkout_payment_address.php');
- define('FILENAME_CHECKOUT_PROCESS', 'checkout_process.php');
- define('FILENAME_CHECKOUT_SHIPPING', 'checkout_shipping.php');
- define('FILENAME_CHECKOUT_SHIPPING_ADDRESS', 'checkout_shipping_address.php');
- define('FILENAME_CHECKOUT_SUCCESS', 'checkout_success.php');
define('FILENAME_CONTACT_US', 'contact.php');
+ define('FILENAME_COOKIE_USAGE', 'cookie_usage.php');
- define('FILENAME_COOKIE_USAGE', 'cookie_usage.php');
- define('FILENAME_CREATE_ACCOUNT', 'create_account.php');
define('FILENAME_CREATE_ACCOUNT_SUCCESS', 'create_account_success.php');
- define('FILENAME_DOWNLOAD', 'download.php');
- define('FILENAME_INFO_SHOPPING_CART', 'info_shopping_cart.php');
define('FILENAME_HOME', 'home.php');
- define('FILENAME_LOGIN', 'login.php');
- define('FILENAME_LOGOFF', 'logoff.php');
- define('FILENAME_PASSWORD_FORGOTTEN', 'password_forgotten.php');
+ define('FILENAME_SHOPPING_CART', 'shopping_cart.php');
- define('FILENAME_PRODUCT_LISTING', 'product_listing.php');
+ define('FILENAME_SSL_CHECK', 'ssl_check.php');
+ define('FILENAME_TELL_A_FRIEND', 'tell_a_friend.php');
+ define('TEMPLATE_FILE', 'template.php');
- define('FILENAME_NEW_PRODUCTS', 'new_products.php');
- define('FILENAME_PRODUCTS_NEW', 'listing_products_new.php');
- define('FILENAME_REDIRECT', 'redirect.php');
- define('FILENAME_SEARCH_HELP', 'search_help.php');
- define('FILENAME_SHIPPING', 'shipping.php');
- define('FILENAME_SHOPPING_CART', 'shopping_cart.php');
+ /* Listing */
define('FILENAME_SPECIALS', 'listing_specials.php');
- define('FILENAME_SSL_CHECK', 'ssl_check.php');
- define('FILENAME_TELL_A_FRIEND', 'tell_a_friend.php');
- define('TEMPLATE_FILE', 'template.php');
- define('FILENAME_UPCOMING_PRODUCTS', 'upcoming_products.php');
define('FILENAME_SMALL_PRICE', 'listing_small_price.php');
define('FILENAME_BEST_SELLERS', 'listing_best_sellers.php');
+ define('FILENAME_PRODUCTS_NEW', 'listing_products_new.php');
/* via rewrite */
- define('FILENAME_CONDITIONS', 'conditions.php');
+// define('FILENAME_SHIPPING', 'shipping.php');
+// define('FILENAME_CONDITIONS', 'conditions.php');
define('FILENAME_PRIVACY', 'privacy.php');
define('FILENAME_SITEMAP', 'sitemap.php');
define('FILENAME_TEMPLATE', 'template.php');
- /* One Page Checkout - BEGIN */
- define('FILENAME_CHECKOUT', 'checkout.php');
+ /* No typed module */
+ define('FILENAME_ALSO_PURCHASED_PRODUCTS', 'also_purchased_products.php');
+ define('FILENAME_UPCOMING_PRODUCTS', 'upcoming_products.php');
+ define('FILENAME_PRODUCT_LISTING', 'product_listing.php');
+ define('FILENAME_NEW_PRODUCTS', 'new_products.php');
+ /* Popup */
+ define('FILENAME_SEARCH_HELP', 'search_help.php');
+ define('FILENAME_INFO_SHOPPING_CART', 'info_shopping_cart.php');
+
/**
@var File for register user
Add name for contraint login in table_file_modules.php
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-04-13 13:37:36
|
Revision: 4221
http://oscss.svn.sourceforge.net/oscss/?rev=4221&view=rev
Author: oscim
Date: 2012-04-13 13:37:27 +0000 (Fri, 13 Apr 2012)
Log Message:
-----------
Ajout de fichiers d'install de contraintes et jointure externe.
Ces fichiers de liason sont indispensable, m?\195?\170me sans utilisation d'innodb
Added Paths:
-----------
trunk/catalog/install/includes/sql/mysql/tables/osc_products_description.key.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_extra_fields_labels.key.sql
trunk/catalog/install/includes/sql/mysql/tables/osc_products_extra_fields_values.key.sql
Added: trunk/catalog/install/includes/sql/mysql/tables/osc_products_description.key.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_products_description.key.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_products_description.key.sql 2012-04-13 13:37:27 UTC (rev 4221)
@@ -0,0 +1,20 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2011 The osCSS developers |
+--| |
+--| http://www.oscss.org |
+--| Portions Copyright (c) 2003 osCommerce |
+--+######################################################################--+
+--| This source file is subject to version 2.0 of the GPL license, |
+--| available at the following url: |
+--| http://www.oscss.org/ |
+--+######################################################################--+
+
+
+ALTER TABLE osc_products_description ADD INDEX idx_products_description_lgid (language_id);
+ALTER TABLE osc_products_description ADD INDEX idx_products_id (products_id);
+
+
+ALTER TABLE osc_products_description ADD CONSTRAINT fk_products_description_lgid FOREIGN KEY (language_id) REFERENCES osc_languages (languages_id);
+ALTER TABLE osc_products_description ADD CONSTRAINT fk_products_id FOREIGN KEY (products_id) REFERENCES osc_products (products_id);
Added: trunk/catalog/install/includes/sql/mysql/tables/osc_products_extra_fields_labels.key.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_products_extra_fields_labels.key.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_products_extra_fields_labels.key.sql 2012-04-13 13:37:27 UTC (rev 4221)
@@ -0,0 +1,21 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2011 The osCSS developers |
+--| |
+--| http://www.oscss.org |
+--| Portions Copyright (c) 2003 osCommerce |
+--+######################################################################--+
+--| This source file is subject to version 2.0 of the GPL license, |
+--| available at the following url: |
+--| http://www.oscss.org/ |
+--+######################################################################--+
+
+
+
+ALTER TABLE osc_products_extra_fields_labels ADD INDEX idx_products_extra_fields_labels_lgid (languages_id);
+ALTER TABLE osc_products_extra_fields_labels ADD INDEX idx_epf_id (epf_id);
+
+
+ALTER TABLE osc_products_extra_fields_labels ADD CONSTRAINT fk_osc_products_extra_fields_labels_lgid FOREIGN KEY (languages_id) REFERENCES osc_languages (languages_id);
+ALTER TABLE osc_products_extra_fields_labels ADD CONSTRAINT fk_osc_products_extra_fields_labels_id FOREIGN KEY (epf_id) REFERENCES osc_products_extra_fields (epf_id);
\ No newline at end of file
Added: trunk/catalog/install/includes/sql/mysql/tables/osc_products_extra_fields_values.key.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/tables/osc_products_extra_fields_values.key.sql (rev 0)
+++ trunk/catalog/install/includes/sql/mysql/tables/osc_products_extra_fields_values.key.sql 2012-04-13 13:37:27 UTC (rev 4221)
@@ -0,0 +1,21 @@
+--+######################################################################--+
+--| osCSS Open Source E-commerce |
+--+######################################################################--+
+--| Copyright (c) 2005-2011 The osCSS developers |
+--| |
+--| http://www.oscss.org |
+--| Portions Copyright (c) 2003 osCommerce |
+--+######################################################################--+
+--| This source file is subject to version 2.0 of the GPL license, |
+--| available at the following url: |
+--| http://www.oscss.org/ |
+--+######################################################################--+
+
+
+ALTER TABLE osc_products_extra_fields_values ADD INDEX idx_products_extra_fields_labels_lgid (languages_id);
+ALTER TABLE osc_products_extra_fields_values ADD INDEX idx_epf_id (epf_id);
+ALTER TABLE osc_products_extra_fields_values ADD INDEX idx_value_id (value_id);
+
+
+ALTER TABLE osc_products_extra_fields_values ADD CONSTRAINT fk_osc_products_extra_fields_values_lgid FOREIGN KEY (languages_id) REFERENCES osc_languages (languages_id);
+ALTER TABLE osc_products_extra_fields_values ADD CONSTRAINT fk_osc_products_extra_fields_values_epf_id FOREIGN KEY (epf_id) REFERENCES osc_products_extra_fields (epf_id);
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
