oscss-commit — SVN Commit Notifications

[Oscss-commit] SF.net SVN: oscss:[4094] trunk/doc/Frontoffice/Doxyfile

[<os...@us...>]

Revision: 4094
          http://oscss.svn.sourceforge.net/oscss/?rev=4094&view=rev
Author:   oscim
Date:     2012-03-23 14:40:10 +0000 (Fri, 23 Mar 2012)
Log Message:
-----------
Mise a niveau du Doxyfile du Frontoffice

Modified Paths:
--------------
    trunk/doc/Frontoffice/Doxyfile

Modified: trunk/doc/Frontoffice/Doxyfile
===================================================================
--- trunk/doc/Frontoffice/Doxyfile	2012-03-22 20:01:05 UTC (rev 4093)
+++ trunk/doc/Frontoffice/Doxyfile	2012-03-23 14:40:10 UTC (rev 4094)
@@ -1,87 +1,614 @@
-# Doxyfile 1.5.6
+# Doxyfile 1.7.4
 
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project
+#
+# All text after a hash (#) is considered a comment and will be ignored
+# The format is:
+#       TAG = value [value, ...]
+# For lists items can also be appended using:
+#       TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ")
+
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file 
+# that follow. The default is UTF-8 which is also the encoding used for all 
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the 
+# iconv built into libc) for the transcoding. See 
+# http://www.gnu.org/software/libiconv for the list of possible encodings.
+
 DOXYFILE_ENCODING      = UTF-8
-PROJECT_NAME           = oscss
-PROJECT_NUMBER         = 2.1.0RC
-OUTPUT_DIRECTORY       =
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
+# by quotes) that should identify the project.
+
+PROJECT_NAME           = osCSS
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
+# This could be handy for archiving the generated documentation or 
+# if some version control system is used.
+
+PROJECT_NUMBER         = 2.1.1RC
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description 
+# for a project that appears at the top of each page and should give viewer 
+# a quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          = "e-shop OpenSource Xhtml/Html5 Full Css compliance"
+
+# With the PROJECT_LOGO tag one can specify an logo or icon that is 
+# included in the documentation. The maximum height of the logo should not 
+# exceed 55 pixels and the maximum width should not exceed 200 pixels. 
+# Doxygen will copy the logo to the output directory.
+
+PROJECT_LOGO           = 
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
+# base path where the generated documentation will be put. 
+# If a relative path is entered, it will be relative to the location 
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = 
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
+# 4096 sub-directories (in 2 levels) under the output directory of each output 
+# format and will distribute the generated files over these directories. 
+# Enabling this option can be useful when feeding doxygen a huge amount of 
+# source files, where putting all generated files in the same directory would 
+# otherwise cause performance problems for the file system.
+
 CREATE_SUBDIRS         = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
+# documentation generated by doxygen is written. Doxygen will use this 
+# information to generate all constant output in the proper language. 
+# The default language is English, other supported languages are: 
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, 
+# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, 
+# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English 
+# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, 
+# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, 
+# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
+
 OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
+# include brief member descriptions after the members that are listed in 
+# the file and class documentation (similar to JavaDoc). 
+# Set to NO to disable this.
+
 BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
+# the brief description of a member or function before the detailed description. 
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
+# brief descriptions will be completely suppressed.
+
 REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator 
+# that is used to form the text in various listings. Each string 
+# in this list, if found as the leading text of the brief description, will be 
+# stripped from the text and the result after processing the whole list, is 
+# used as the annotated text. Otherwise, the brief description is used as-is. 
+# If left blank, the following values are used ("$name" is automatically 
+# replaced with the name of the entity): "The $name class" "The $name widget" 
+# "The $name file" "is" "provides" "specifies" "contains" 
+# "represents" "a" "an" "the"
+
 ABBREVIATE_BRIEF       = YES
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
+# Doxygen will generate a detailed section even if there is only a brief 
+# description.
+
 ALWAYS_DETAILED_SEC    = YES
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 
+# inherited members of a class in the documentation of that class as if those 
+# members were ordinary class members. Constructors, destructors and assignment 
+# operators of the base classes will not be shown.
+
 INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
+# path before files name in the file list and in the header files. If set 
+# to NO the shortest path that makes the file name unique will be used.
+
 FULL_PATH_NAMES        = YES
-STRIP_FROM_PATH        =
-STRIP_FROM_INC_PATH    =
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
+# can be used to strip a user-defined part of the path. Stripping is 
+# only done if one of the specified strings matches the left-hand part of 
+# the path. The tag can be used to show relative paths in the file list. 
+# If left blank the directory from which doxygen is run is used as the 
+# path to strip.
+
+STRIP_FROM_PATH        = 
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
+# the path mentioned in the documentation of a class, which tells 
+# the reader which header file to include in order to use a class. 
+# If left blank only the name of the header file containing the class 
+# definition is used. Otherwise one should specify the include paths that 
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH    = 
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
+# (but less readable) file names. This can be useful if your file system 
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
 SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
+# will interpret the first line (until the first dot) of a JavaDoc-style 
+# comment as the brief description. If set to NO, the JavaDoc 
+# comments will behave just like regular Qt-style comments 
+# (thus requiring an explicit @brief command for a brief description.)
+
 JAVADOC_AUTOBRIEF      = YES
+
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will 
+# interpret the first line (until the first dot) of a Qt-style 
+# comment as the brief description. If set to NO, the comments 
+# will behave just like regular Qt-style comments (thus requiring 
+# an explicit \brief command for a brief description.)
+
 QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
+# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
+# comments) as a brief description. This used to be the default behaviour. 
+# The new default is to treat a multi-line C++ comment block as a detailed 
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
 MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
+# member inherits the documentation from any documented member that it 
+# re-implements.
+
 INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce 
+# a new page for each member. If set to NO, the documentation of a member will 
+# be part of the file/class/namespace that contains it.
+
 SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
 TAB_SIZE               = 8
-ALIASES                =
+
+# This tag can be used to specify a number of aliases that acts 
+# as commands in the documentation. An alias has the form "name=value". 
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
+# put the command \sideeffect (or @sideeffect) in the documentation, which 
+# will result in a user-defined paragraph with heading "Side Effects:". 
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES                = 
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C 
+# sources only. Doxygen will then generate output that is more tailored for C. 
+# For instance, some of the names that are used will be different. The list 
+# of all members will be omitted, etc.
+
 OPTIMIZE_OUTPUT_FOR_C  = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java 
+# sources only. Doxygen will then generate output that is more tailored for 
+# Java. For instance, namespaces will be presented as packages, qualified 
+# scopes will look different, etc.
+
 OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran 
+# sources only. Doxygen will then generate output that is more tailored for 
+# Fortran.
+
 OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL 
+# sources. Doxygen will then generate output that is tailored for 
+# VHDL.
+
 OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it 
+# parses. With this tag you can assign which parser to use for a given extension. 
+# Doxygen has a built-in mapping, but you can override or extend it using this 
+# tag. The format is ext=language, where ext is a file extension, and language 
+# is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C, 
+# C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make 
+# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C 
+# (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions 
+# you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
+
+EXTENSION_MAPPING      = 
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want 
+# to include (a tag file for) the STL sources as input, then you should 
+# set this tag to YES in order to let doxygen match functions declarations and 
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. 
+# func(std::string) {}). This also makes the inheritance and collaboration 
+# diagrams that involve STL classes more complete and accurate.
+
 BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to 
+# enable parsing support.
+
 CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. 
+# Doxygen will parse them like normal C++ but will assume all classes use public 
+# instead of private inheritance when no explicit protection keyword is present.
+
 SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate getter 
+# and setter methods for a property. Setting this option to YES (the default) 
+# will make doxygen replace the get and set methods by a property in the 
+# documentation. This will only work if the methods are indeed getting or 
+# setting a simple type. If this is not the case, or you want to show the 
+# methods anyway, you should set this option to NO.
+
 IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
+# tag is set to YES, then doxygen will reuse the documentation of the first 
+# member in the group (if any) for the other members of the group. By default 
+# all members of a group must be documented explicitly.
+
 DISTRIBUTE_GROUP_DOC   = NO
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
+# the same type (for instance a group of public functions) to be put as a 
+# subgroup of that type (e.g. under the Public Functions section). Set it to 
+# NO to prevent subgrouping. Alternatively, this can be done per class using 
+# the \nosubgrouping command.
+
 SUBGROUPING            = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and 
+# unions are shown inside the group in which they are included (e.g. using 
+# @ingroup) instead of on a separate page (for HTML and Man pages) or 
+# section (for LaTeX and RTF).
+
+INLINE_GROUPED_CLASSES = NO
+
+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum 
+# is documented as struct, union, or enum with the name of the typedef. So 
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct 
+# with name TypeT. When disabled the typedef will appear as a member of a file, 
+# namespace, or class. And the struct will be named TypeS. This can typically 
+# be useful for C code in case the coding convention dictates that all compound 
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+
 TYPEDEF_HIDES_STRUCT   = NO
+
+# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to 
+# determine which symbols to keep in memory and which to flush to disk. 
+# When the cache is full, less often used symbols will be written to disk. 
+# For small to medium size projects (<1000 input files) the default value is 
+# probably good enough. For larger projects a too small cache size can cause 
+# doxygen to be busy swapping symbols to and from disk most of the time 
+# causing a significant performance penalty. 
+# If the system has enough physical memory increasing the cache will improve the 
+# performance by keeping more symbols in memory. Note that the value works on 
+# a logarithmic scale so increasing the size by one will roughly double the 
+# memory usage. The cache size is given by this formula: 
+# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, 
+# corresponding to a cache size of 2^16 = 65536 symbols
+
+SYMBOL_CACHE_SIZE      = 0
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
+# documentation are documented, even if no documentation was available. 
+# Private class members and static file members will be hidden unless 
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
 EXTRACT_ALL            = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
+# will be included in the documentation.
+
 EXTRACT_PRIVATE        = YES
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file 
+# will be included in the documentation.
+
 EXTRACT_STATIC         = YES
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
+# defined locally in source files will be included in the documentation. 
+# If set to NO only classes defined in header files are included.
+
 EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. When set to YES local 
+# methods, which are defined in the implementation section but not in 
+# the interface are included in the documentation. 
+# If set to NO (the default) only methods in the interface are included.
+
 EXTRACT_LOCAL_METHODS  = YES
+
+# If this flag is set to YES, the members of anonymous namespaces will be 
+# extracted and appear in the documentation as a namespace called 
+# 'anonymous_namespace{file}', where file will be replaced with the base 
+# name of the file that contains the anonymous namespace. By default 
+# anonymous namespaces are hidden.
+
 EXTRACT_ANON_NSPACES   = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
+# undocumented members of documented classes, files or namespaces. 
+# If set to NO (the default) these members will be included in the 
+# various overviews, but no documentation section is generated. 
+# This option has no effect if EXTRACT_ALL is enabled.
+
 HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
+# undocumented classes that are normally visible in the class hierarchy. 
+# If set to NO (the default) these classes will be included in the various 
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
 HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
+# friend (class|struct|union) declarations. 
+# If set to NO (the default) these declarations will be included in the 
+# documentation.
+
 HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
+# documentation blocks found inside the body of a function. 
+# If set to NO (the default) these blocks will be appended to the 
+# function's detailed documentation block.
+
 HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation 
+# that is typed after a \internal command is included. If the tag is set 
+# to NO (the default) then the documentation will be excluded. 
+# Set it to YES to include the internal documentation.
+
 INTERNAL_DOCS          = YES
+
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
+# file names in lower-case letters. If set to YES upper-case letters are also 
+# allowed. This is useful if you have classes or files whose names only differ 
+# in case and if your file system supports case sensitive file names. Windows 
+# and Mac users are advised to set this option to NO.
+
 CASE_SENSE_NAMES       = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
+# will show members with their full class and namespace scopes in the 
+# documentation. If set to YES the scope will be hidden.
+
 HIDE_SCOPE_NAMES       = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
+# will put a list of the files that are included by a file in the documentation 
+# of that file.
+
 SHOW_INCLUDE_FILES     = YES
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen 
+# will list include files with double quotes in the documentation 
+# rather than with sharp brackets.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
+# is inserted in the documentation for inline members.
+
 INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
+# will sort the (detailed) documentation of file and class members 
+# alphabetically by member name. If set to NO the members will appear in 
+# declaration order.
+
 SORT_MEMBER_DOCS       = YES
-SORT_BRIEF_DOCS        = NO
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
+# brief documentation of file, namespace and class members alphabetically 
+# by member name. If set to NO (the default) the members will appear in 
+# declaration order.
+
+SORT_BRIEF_DOCS        = YES
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen 
+# will sort the (brief and detailed) documentation of class members so that 
+# constructors and destructors are listed first. If set to NO (the default) 
+# the constructors will appear in the respective orders defined by 
+# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. 
+# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO 
+# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the 
+# hierarchy of group names into alphabetical order. If set to NO (the default) 
+# the group names will appear in their defined order.
+
 SORT_GROUP_NAMES       = YES
-SORT_BY_SCOPE_NAME     = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
+# sorted by fully-qualified names, including namespaces. If set to 
+# NO (the default), the class list will be sorted only by class name, 
+# not including the namespace part. 
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. 
+# Note: This option applies only to the class list, not to the 
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME     = YES
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to 
+# do proper type resolution of all parameters of a function it will reject a 
+# match between the prototype and the implementation of a member function even 
+# if there is only one candidate or it is obvious which candidate to choose 
+# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen 
+# will still accept a match between prototype and implementation in such cases.
+
+STRICT_PROTO_MATCHING  = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or 
+# disable (NO) the todo list. This list is created by putting \todo 
+# commands in the documentation.
+
 GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or 
+# disable (NO) the test list. This list is created by putting \test 
+# commands in the documentation.
+
 GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or 
+# disable (NO) the bug list. This list is created by putting \bug 
+# commands in the documentation.
+
 GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
+# disable (NO) the deprecated list. This list is created by putting 
+# \deprecated commands in the documentation.
+
 GENERATE_DEPRECATEDLIST= YES
-ENABLED_SECTIONS       =
+
+# The ENABLED_SECTIONS tag can be used to enable conditional 
+# documentation sections, marked by \if sectionname ... \endif.
+
+ENABLED_SECTIONS       = 
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
+# the initial value of a variable or macro consists of for it to appear in 
+# the documentation. If the initializer consists of more lines than specified 
+# here it will be hidden. Use a value of 0 to hide initializers completely. 
+# The appearance of the initializer of individual variables and macros in the 
+# documentation can be controlled using \showinitializer or \hideinitializer 
+# command in the documentation regardless of this setting.
+
 MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
+# at the bottom of the documentation of classes and structs. If set to YES the 
+# list will mention the files that were used to generate the documentation.
+
 SHOW_USED_FILES        = YES
+
+# If the sources in your project are distributed over multiple directories 
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
+# in the documentation. The default is NO.
+
 SHOW_DIRECTORIES       = YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. 
+# This will remove the Files entry from the Quick Index and from the 
+# Folder Tree View (if specified). The default is YES.
+
 SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the 
+# Namespaces page.  This will remove the Namespaces entry from the Quick Index 
+# and from the Folder Tree View (if specified). The default is YES.
+
 SHOW_NAMESPACES        = NO
-FILE_VERSION_FILTER    =
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that 
+# doxygen should invoke to get the current version for each file (typically from 
+# the version control system). Doxygen will invoke the program by executing (via 
+# popen()) the command <command> <input-file>, where <command> is the value of 
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file 
+# provided by doxygen. Whatever the program writes to standard output 
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER    = 
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed 
+# by doxygen. The layout file controls the global structure of the generated 
+# output files in an output format independent way. The create the layout file 
+# that represents doxygen's defaults, run doxygen with the -l option. 
+# You can optionally specify a file name after the option, if omitted 
+# DoxygenLayout.xml will be used as the name of the layout file.
+
+LAYOUT_FILE            = 
+
 #---------------------------------------------------------------------------
 # configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated 
+# by doxygen. Possible values are YES and NO. If left blank NO is used.
+
 QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are 
+# generated by doxygen. Possible values are YES and NO. If left blank 
+# NO is used.
+
 WARNINGS               = YES
-WARN_IF_UNDOCUMENTED   = YES
+
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
+# automatically be disabled.
+
+WARN_IF_UNDOCUMENTED   = NO
+
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
+# potential errors in the documentation, such as not documenting some 
+# parameters in a documented function, or documenting parameters that 
+# don't exist or using markup commands wrongly.
+
 WARN_IF_DOC_ERROR      = YES
+
+# The WARN_NO_PARAMDOC option can be enabled to get warnings for 
+# functions that are documented, but have no documentation for their parameters 
+# or return value. If set to NO (the default) doxygen will only warn about 
+# wrong or incomplete parameter documentation, but not about the absence of 
+# documentation.
+
 WARN_NO_PARAMDOC       = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that 
+# doxygen can produce. The string should contain the $file, $line, and $text 
+# tags, which will be replaced by the file and line number from which the 
+# warning originated and the warning text. Optionally the format may contain 
+# $version, which will be replaced by the version of the file (if it could 
+# be obtained via FILE_VERSION_FILTER)
+
 WARN_FORMAT            = "$file:$line: $text"
-WARN_LOGFILE           =
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning 
+# and error messages should be written. If left blank the output is written 
+# to stderr.
+
+WARN_LOGFILE           = 
+
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
+
+# The INPUT tag can be used to specify the files and/or directories that contain 
+# documented source files. You may enter file names like "myfile.cpp" or 
+# directories like "/usr/src/myproject". Separate the files or directories 
+# with spaces.
+
 INPUT                  = ../../catalog/ \
                          ../../catalog/includes/ \
                          ../../catalog/includes/boxes/ \
@@ -115,168 +642,1112 @@
                          ../../catalog/includes/modules/generic/ \
                          ../../catalog/includes/modules/categories/ \
                          ../../catalog/includes/modules/home/ \
-                         ../../catalog/includes/modules/checkout_process/
+                         ../../catalog/includes/modules/checkout_process/ \
+                         ../../catalog/includes/classes/drivers/data/ \
+                         ../../catalog/includes/classes/core_page/ \
+                         ../../catalog/common/classes/imgratio_drivers/ \
+                         ../../catalog/common/classes/mailer_drivers/ \
+                         ../../catalog/common/classes/sql_drivers/ \
+                         ../../catalog/common/classes/datatype_drivers/ \
+                         ../../catalog/includes/classes/core_page/overlay/ \
+                         ../../catalog/common/modules/core/password/
+
+# This tag can be used to specify the character encoding of the source files 
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
+# also the default input encoding. Doxygen uses libiconv (or the iconv built 
+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for 
+# the list of possible encodings.
+
 INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the 
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+# and *.h) to filter out the source-files in the directories. If left 
+# blank the following patterns are tested: 
+# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh 
+# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py 
+# *.f90 *.f *.for *.vhd *.vhdl
+
 FILE_PATTERNS          = *.php \
                          *.css \
                          *.gab \
                          *.inc \
                          *.txt
+
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
+# should be searched for input files as well. Possible values are YES and NO. 
+# If left blank NO is used.
+
 RECURSIVE              = NO
-EXCLUDE                =
+
+# The EXCLUDE tag can be used to specify files and/or directories that should 
+# excluded from the INPUT source files. This way you can easily exclude a 
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+
+EXCLUDE                = 
+
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
+# directories that are symbolic links (a Unix file system feature) are excluded 
+# from the input.
+
 EXCLUDE_SYMLINKS       = NO
-EXCLUDE_PATTERNS       =
-EXCLUDE_SYMBOLS        =
+
+# If the value of the INPUT tag contains directories, you can use the 
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
+# certain files from those directories. Note that the wildcards are matched 
+# against the file with absolute path, so to exclude all test directories 
+# for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       = 
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names 
+# (namespaces, classes, functions, etc.) that should be excluded from the 
+# output. The symbol name can be a fully qualified name, a word, or if the 
+# wildcard * is used, a substring. Examples: ANamespace, AClass, 
+# AClass::ANamespace, ANamespace::*Test
+
+EXCLUDE_SYMBOLS        = 
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or 
+# directories that contain example code fragments that are included (see 
+# the \include command).
+
 EXAMPLE_PATH           = /doc/Frontoffice/example/
-EXAMPLE_PATTERNS       =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+# and *.h) to filter out the source-files in the directories. If left 
+# blank all files are included.
+
+EXAMPLE_PATTERNS       = 
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
+# searched for input files to be used with the \include or \dontinclude 
+# commands irrespective of the value of the RECURSIVE tag. 
+# Possible values are YES and NO. If left blank NO is used.
+
 EXAMPLE_RECURSIVE      = NO
-IMAGE_PATH             =
-INPUT_FILTER           =
-FILTER_PATTERNS        =
+
+# The IMAGE_PATH tag can be used to specify one or more files or 
+# directories that contain image that are included in the documentation (see 
+# the \image command).
+
+IMAGE_PATH             = 
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should 
+# invoke to filter for each input file. Doxygen will invoke the filter program 
+# by executing (via popen()) the command <filter> <input-file>, where <filter> 
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
+# input file. Doxygen will then use the output that the filter program writes 
+# to standard output.  If FILTER_PATTERNS is specified, this tag will be 
+# ignored.
+
+INPUT_FILTER           = 
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern 
+# basis.  Doxygen will compare the file name with each pattern and apply the 
+# filter if there is a match.  The filters are a list of the form: 
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further 
+# info on how filters are used. If FILTER_PATTERNS is empty or if 
+# non of the patterns match the file name, INPUT_FILTER is applied.
+
+FILTER_PATTERNS        = 
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
+# INPUT_FILTER) will be used to filter the input files when producing source 
+# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+
 FILTER_SOURCE_FILES    = NO
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file 
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) 
+# and it is also possible to disable source filtering for a specific pattern 
+# using *.ext= (so without naming a filter). This option only has effect when 
+# FILTER_SOURCE_FILES is enabled.
+
+FILTER_SOURCE_PATTERNS = 
+
 #---------------------------------------------------------------------------
 # configuration options related to source browsing
 #---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
+# be generated. Documented entities will be cross-referenced with these sources. 
+# Note: To get rid of all source code in the generated output, make sure also 
+# VERBATIM_HEADERS is set to NO.
+
 SOURCE_BROWSER         = YES
+
+# Setting the INLINE_SOURCES tag to YES will include the body 
+# of functions and classes directly in the documentation.
+
 INLINE_SOURCES         = YES
+
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
+# doxygen to hide any special comment blocks from generated source code 
+# fragments. Normal C and C++ comments will always remain visible.
+
 STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES 
+# then for each documented function all documented 
+# functions referencing it will be listed.
+
 REFERENCED_BY_RELATION = YES
+
+# If the REFERENCES_RELATION tag is set to YES 
+# then for each documented function all documented entities 
+# called/used by that function will be listed.
+
 REFERENCES_RELATION    = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) 
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from 
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will 
+# link to the source code.  Otherwise they will link to the documentation.
+
 REFERENCES_LINK_SOURCE = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code 
+# will point to the HTML generated by the htags(1) tool instead of doxygen 
+# built-in source browser. The htags tool is part of GNU's global source 
+# tagging system (see http://www.gnu.org/software/global/global.html). You 
+# will need version 4.8.6 or higher.
+
 USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
+# will generate a verbatim copy of the header file for each class for 
+# which an include is specified. Set to NO to disable this.
+
 VERBATIM_HEADERS       = YES
+
 #---------------------------------------------------------------------------
 # configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
+# of all compounds will be generated. Enable this if the project 
+# contains a lot of classes, structs, unions or interfaces.
+
 ALPHABETICAL_INDEX     = YES
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
+# in which this list will be split (can be a number in the range [1..20])
+
 COLS_IN_ALPHA_INDEX    = 5
-IGNORE_PREFIX          =
+
+# In case all classes in a project start with a common prefix, all 
+# classes will be put under the same header in the alphabetical index. 
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
+# should be ignored while generating the index headers.
+
+IGNORE_PREFIX          = 
+
 #---------------------------------------------------------------------------
 # configuration options related to the HTML output
 #---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
+# generate HTML output.
+
 GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `html' will be used as the default path.
+
 HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
+# doxygen will generate files with .html extension.
+
 HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a personal HTML header for 
+# each generated HTML page. If it is left blank doxygen will generate a 
+# standard header. Note that when using a custom header you are responsible 
+# for the proper inclusion of any scripts and style sheets that doxygen 
+# needs, which is dependent on the configuration options used. 
+# It is adviced to generate a default header using "doxygen -w html 
+# header.html footer.html stylesheet.css YourConfigFile" and then modify 
+# that header. Note that the header is subject to change so you typically 
+# have to redo this when upgrading to a newer version of doxygen or when
+# changing the value of configuration settings such as GENERATE_TREEVIEW!
+
 HTML_HEADER            = ../header.html
+
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for 
+# each generated HTML page. If it is left blank doxygen will generate a 
+# standard footer.
+
 HTML_FOOTER            = ../footer.html
-HTML_STYLESHEET        =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
+# style sheet that is used by each HTML page. It can be used to 
+# fine-tune the look of the HTML output. If the tag is left blank doxygen 
+# will generate a default style sheet. Note that doxygen will try to copy 
+# the style sheet file to the HTML output directory, so don't put your own 
+# stylesheet in the HTML output directory as well, or it will be erased!
+
+HTML_STYLESHEET        = 
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or 
+# other source files which should be copied to the HTML output directory. Note 
+# that these files will be copied to the base HTML output directory. Use the 
+# $relpath$ marker in the HTML_HEADER and/or HTML_FOOTER files to load these 
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that 
+# the files will be copied as-is; there are no commands or markers available.
+
+HTML_EXTRA_FILES       = 
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. 
+# Doxygen will adjust the colors in the stylesheet and background images 
+# according to this color. Hue is specified as an angle on a colorwheel, 
+# see http://en.wikipedia.org/wiki/Hue for more information. 
+# For instance the value 0 represents red, 60 is yellow, 120 is green, 
+# 180 is cyan, 240 is blue, 300 purple, and 360 is red again. 
+# The allowed range is 0 to 359.
+
+HTML_COLORSTYLE_HUE    = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of 
+# the colors in the HTML output. For a value of 0 the output will use 
+# grayscales only. A value of 255 will produce the most vivid colors.
+
+HTML_COLORSTYLE_SAT    = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to 
+# the luminance component of the colors in the HTML output. Values below 
+# 100 gradually make the output lighter, whereas values above 100 make 
+# the output darker. The value divided by 100 is the actual gamma applied, 
+# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2, 
+# and 100 does not change the gamma.
+
+HTML_COLORSTYLE_GAMMA  = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML 
+# page will contain the date and time when the page was generated. Setting 
+# this to NO can help when comparing the output of multiple runs.
+
+HTML_TIMESTAMP         = YES
+
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
+# files or namespaces will be aligned in HTML using tables. If set to 
+# NO a bullet list will be used.
+
 HTML_ALIGN_MEMBERS     = NO
-GENERATE_HTMLHELP      = NO
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML 
+# documentation will contain sections that can be hidden and shown after the 
+# page has loaded. For this to work a browser that supports 
+# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox 
+# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+
+HTML_DYNAMIC_SECTIONS  = YES
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files 
+# will be generated that can be used as input for Apple's Xcode 3 
+# integrated development environment, introduced with OSX 10.5 (Leopard). 
+# To create a documentation set, doxygen will generate a Makefile in the 
+# HTML output directory. Running make will produce the docset in that 
+# directory and running "make install" will install the docset in 
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find 
+# it at startup. 
+# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html 
+# for more information.
+
 GENERATE_DOCSET        = NO
+
+# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the 
+# feed. A documentation feed provides an umbrella under which multiple 
+# documentation sets from a single provider (such as a company or product suite) 
+# can be grouped.
+
 DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that 
+# should uniquely identify the documentation set bundle. This should be a 
+# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen 
+# will append .docset to the name.
+
 DOCSET_BUNDLE_ID       = org.doxygen.Project
-HTML_DYNAMIC_SECTIONS  = YES
-CHM_FILE               =
-HHC_LOCATION           =
+
+# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify 
+# the documentation publisher. This should be a reverse domain-name style 
+# string, e.g. com.mycompany.MyDocSet.documentation.
+
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+
+# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
+
+DOCSET_PUBLISHER_NAME  = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
+# will be generated that can be used as input for tools like the 
+# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) 
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP      = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
+# be used to specify the file name of the resulting .chm file. You 
+# can add a path in front of the file if the result should not be 
+# written to the html output directory.
+
+CHM_FILE               = 
+
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
+# be used to specify the location (absolute path including file name) of 
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
+# the HTML help compiler on the generated index.hhp.
+
+HHC_LOCATION           = 
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
+# controls if a separate .chi index file is generated (YES) or that 
+# it should be included in the master .chm file (NO).
+
 GENERATE_CHI           = NO
-CHM_INDEX_ENCODING     =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING 
+# is used to encode HtmlHelp index (hhk), content (hhc) and project file 
+# content.
+
+CHM_INDEX_ENCODING     = 
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
+# controls whether a binary table of contents is generated (YES) or a 
+# normal table of contents (NO) in the .chm file.
+
 BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members 
+# to the contents of the HTML help documentation and to the tree view.
+
 TOC_EXPAND             = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and 
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated 
+# that can be used as input for Qt's qhelpgenerator to generate a 
+# Qt Compressed Help (.qch) of the generated HTML documentation.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can 
+# be used to specify the file name of the resulting .qch file. 
+# The path specified is relative to the HTML output folder.
+
+QCH_FILE               = 
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating 
+# Qt Help Project output. For more information please see 
+# http://doc.trolltech.com/qthelpproject.html#namespace
+
+QHP_NAMESPACE          = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating 
+# Qt Help Project output. For more information please see 
+# http://doc.trolltech.com/qthelpproject.html#virtual-folders
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to 
+# add. For more information please see 
+# http://doc.trolltech.com/qthelpproject.html#custom-filters
+
+QHP_CUST_FILTER_NAME   = 
+
+# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the 
+# custom filter to add. For more information please see 
+# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters"> 
+# Qt Help Project / Custom Filters</a>.
+
+QHP_CUST_FILTER_ATTRS  = 
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this 
+# project's 
+# filter section matches. 
+# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes"> 
+# Qt Help Project / Filter Attributes</a>.
+
+QHP_SECT_FILTER_ATTRS  = 
+
+# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can 
+# be used to specify the location of Qt's qhelpgenerator. 
+# If non-empty doxygen will try to run qhelpgenerator on the generated 
+# .qhp file.
+
+QHG_LOCATION           = 
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files  
+# will be generated, which together with the HTML files, form an Eclipse help 
+# plugin. To install this plugin and make it available under the help contents 
+# menu in Eclipse, the contents of the directory containing the HTML and XML 
+# files needs to be copied into the plugins directory of eclipse. The name of 
+# the directory within the plugins directory should be the same as 
+# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before 
+# the help appears.
+
+GENERATE_ECLIPSEHELP   = NO
+
+# A unique identifier for the eclipse help plugin. When installing the plugin 
+# the directory name containing the HTML and XML files should also have 
+# this name.
+
+ECLIPSE_DOC_ID         = org.doxygen.Project
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
+# top of each HTML page. The value NO (the default) enables the index and 
+# the value YES disables it.
+
 DISABLE_INDEX          = NO
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values 
+# (range [0,1..20]) that doxygen will group on one line in the generated HTML 
+# documentation. Note that a value of 0 will completely suppress the enum 
+# values from appearing in the overview section.
+
 ENUM_VALUES_PER_LINE   = 4
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index 
+# structure should be generated to display hierarchical information. 
+# If the tag value is set to YES, a side panel will be generated 
+# containing a tree-like index structure (just like the one that 
+# is generated for HTML Help). For this to work a browser that supports 
+# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). 
+# Windows users are probably better off using the HTML help feature.
+
 GENERATE_TREEVIEW      = YES
+
+# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories, 
+# and Class Hierarchy pages using a tree view instead of an ordered list.
+
+USE_INLINE_TREES       = NO
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
+# used to set the initial width (in pixels) of the frame in which the tree 
+# is shown.
+
 TREEVIEW_WIDTH         = 250
+
+# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open 
+# links to external symbols imported via tag files in a separate window.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# Use this tag to change the font size of Latex formulas included 
+# as images in the HTML documentation. The default is 10. Note that 
+# when you change the font size after a successful doxygen run you need 
+# to manually remove any form_*.png images from the HTML output directory 
+# to force them to be regenerated.
+
 FORMULA_FONTSIZE       = 10
+
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images 
+# generated for formulas are transparent PNGs. Transparent PNGs are 
+# not supported properly for IE 6.0, but are supported on all modern browsers. 
+# Note that when changing this option you need to delete any form_*.png files 
+# in the HTML output before the changes have effect.
+
+FORMULA_TRANSPARENT    = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax 
+# (see http://www.mathjax.org) which uses client side Javascript for the 
+# rendering instead of using prerendered bitmaps. Use this if you do not 
+# have LaTeX installed or if you want to formulas look prettier in the HTML 
+# output. When enabled you also need to install MathJax separately and 
+# configure the path to it using the MATHJAX_RELPATH option.
+
+USE_MATHJAX            = NO
+
+# When MathJax is enabled you need to specify the location relative to the 
+# HTML output directory using the MATHJAX_RELPATH option. The destination 
+# directory should contain the MathJax.js script. For instance, if the mathjax 
+# directory is located at the same level as the HTML output directory, then 
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the 
+# mathjax.org site, so you can quickly see the result without installing 
+# MathJax, but it is strongly recommended to install a local copy of MathJax 
+# before deployment.
+
+MATHJAX_RELPATH        = http://www.mathjax.org/mathjax
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box 
+# for the HTML output. The underlying search engine uses javascript 
+# and DHTML and should work on any modern browser. Note that when using 
+# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets 
+# (GENERATE_DOCSET) there is already a search function so this one should 
+# typically be disabled. For large projects the javascript based search engine 
+# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
+
+SEARCHENGINE           = YES
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be 
+# implemented using a PHP enabled web server instead of at the web client 
+# using Javascript. Doxygen will generate the search PHP script and index 
+# file to put on the web server. The advantage of the server 
+# based approach is that it scales better to large projects and allows 
+# full text search. The disadvantages are that it is more difficult to setup 
+# and does not have live searching capabilities.
+
+SERVER_BASED_SEARCH    = NO
+
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
+# generate Latex output.
+
 GENERATE_LATEX         = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `latex' will be used as the default path.
+
 LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
+# invoked. If left blank `latex' will be used as the default command name. 
+# Note that when enabling USE_PDFLATEX this option is only used for 
+# generating bitmaps for formulas in the HTML output, but not in the 
+# Makefile that is written to the output directory.
+
 LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 
+# generate index for LaTeX. If left blank `makeindex' will be used as the 
+# default command name.
+
 MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
+# LaTeX documents. This may be useful for small projects and may help to 
+# save some trees in general.
+
 COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used 
+# by the printer. Possible values are: a4, letter, legal and 
+# executive. If left blank a4wide will be used.
+
 PAPER_TYPE             = a4wide
-EXTRA_PACKAGES         =
-LATEX_HEADER           =
+
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
+# packages that should be included in the LaTeX output.
+
+EXTRA_PACKAGES         = 
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
+# the generated latex document. The header should contain everything until 
+# the first chapter. If it is left blank doxygen will generate a 
+# standard header. Notice: only use this tag if you know what you are doing!
+
+LATEX_HEADER           = 
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for 
+# the generated latex document. The footer should contain everything after 
+# the last chapter. If it is left blank doxygen will generate a 
+# standard footer. Notice: only use this tag if you know what you are doing!
+
+LATEX_FOOTER           = 
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
+# contain links (just like the HTML output) instead of page references 
+# This makes the output suitable for online browsing using a pdf viewer.
+
 PDF_HYPERLINKS         = NO
+
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
+# plain latex in the generated Makefile. Set this option to YES to get a 
+# higher quality PDF documentation.
+
 USE_PDFLATEX           = NO
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
+# command to the generated LaTeX files. This will instruct LaTeX to keep 
+# running if errors occur, instead of asking the user for help. 
+# This option is also used when generating formulas in HTML.
+
 LATEX_BATCHMODE        = YES
+
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not 
+# include the index chapters (such as File Index, Compound Index, etc.) 
+# in the output.
+
 LATEX_HIDE_INDICES     = NO
+
+# If LATEX_SOURCE_CODE is set to YES then doxygen will include 
+# source code with syntax highlighting in the LaTeX output. 
+# Note that which sources are shown also depends on other settings 
+# such as SOURCE_BROWSER.
+
+LATEX_SOURCE_CODE      = NO
+
 #---------------------------------------------------------------------------
 # configuration options related to the RTF output
 #---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
+# The RTF output is optimized for Word 97 and may not look very pretty with 
+# other RTF readers or editors.
+
 GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `rtf' will be used as the default path.
+
 RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
+# RTF documents. This may be useful for small projects and may help to 
+# save some trees in general.
+
 COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
+# will contain hyperlink fields. The RTF file will 
+# contain links (just like the HTML output) instead of page references. 
+# This makes the output suitable for online browsing using WORD or other 
+# programs which support those fields. 
+# Note: wordpad (write) and others do not support links.
+
 RTF_HYPERLINKS         = NO
-RTF_STYLESHEET_FILE    =
-RTF_EXTENSIONS_FILE    =
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's 
+# config file, i.e. a series of assignments. You only have to provide 
+# replacements, missing definitions are set to their default value.
+
+RTF_STYLESHEET_FILE    = 
+
+# Set optional variables used in the generation of an rtf document. 
+# Syntax is similar to doxygen's config file.
+
+RTF_EXTENSIONS_FILE    = 
+
 #---------------------------------------------------------------------------
 # configuration options related to the man page output
 #---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
+# generate man pages
+
 GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `man' will be used as the default path.
+
 MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to 
+# the generated man pages (default is the subroutine's section .3)
+
 MAN_EXTENSION          = .3
+
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
+# then it will generate one additional man file for each entity 
+# documented in the real man page(s). These additional files 
+# only source the real man page, but without them the man command 
+# would be unable to find the correct page. The default is NO.
+
 MAN_LINKS              = NO
+
 #---------------------------------------------------------------------------
...
 
[truncated message content]

[Oscss-commit] SF.net SVN: oscss:[4093] trunk/catalog/admin/includes

[<os...@us...>]

Revision: 4093
          http://oscss.svn.sourceforge.net/oscss/?rev=4093&view=rev
Author:   oscim
Date:     2012-03-22 20:01:05 +0000 (Thu, 22 Mar 2012)
Log Message:
-----------
correction coquille 
suppression lien menu vers batch_printer / obsolete 

Modified Paths:
--------------
    trunk/catalog/admin/includes/boxes/04_tools.php
    trunk/catalog/admin/includes/template/oscss/stylesheet-1.css

Modified: trunk/catalog/admin/includes/boxes/04_tools.php
===================================================================
--- trunk/catalog/admin/includes/boxes/04_tools.php	2012-03-22 19:09:53 UTC (rev 4092)
+++ trunk/catalog/admin/includes/boxes/04_tools.php	2012-03-22 20:01:05 UTC (rev 4093)
@@ -21,8 +21,8 @@
     $tabl_link[]= array(FILENAME_GOOGLE_SITEMAP, 'BOX_TOOLS_GOOGLE_SITEMAP', 'ggmap',@$img['ggmap']);
     $tabl_link[]= array(FILENAME_FULL_TAG, 'BOX_TOOLS_HEADER_TAG', 'headertag',@$img['headertag']);
 
-    if(_cst_bool('USE_LOCAL_GENERAT_PDF'))
-      $tabl_link[]= array(FILENAME_BATCH_PRINT, 'BOX_TOOLS_BATCH_CENTER', 'batch_print',@$img['batch_print']);
+//     if(_cst_bool('USE_LOCAL_GENERAT_PDF'))
+//       $tabl_link[]= array(FILENAME_BATCH_PRINT, 'BOX_TOOLS_BATCH_CENTER', 'batch_print',@$img['batch_print']);
 
     $tabl_link[608]= array('ss_menu', 'BOX_TOOLS_SYSTEM', 'system',@$img['system']);
     $tabl_link[608][4][]= array(FILENAME_BACKUP, 'BOX_TOOLS_BACKUP', 'database',@$img['database']);

Modified: trunk/catalog/admin/includes/template/oscss/stylesheet-1.css
===================================================================
--- trunk/catalog/admin/includes/template/oscss/stylesheet-1.css	2012-03-22 19:09:53 UTC (rev 4092)
+++ trunk/catalog/admin/includes/template/oscss/stylesheet-1.css	2012-03-22 20:01:05 UTC (rev 4093)
@@ -43,7 +43,7 @@
 
 /* popup form by fancy */
 #fancybox-inner h3 {   background: none repeat scroll 0 0 black; color: white; font-weight: normal; height: 21px; left: 0; line-height: 20px; padding: 0; position: absolute; text-align: center; text-shadow: none; top: 0; width: 100%;}
-#fancybox-inner form {margin:0; padding:0; position: relative;top:20px;height: 100%;padding: 0 0 30px;}
+#fancybox-inner form {float:left;margin:0; padding:0; position: relative;top:20px;padding: 0 0 30px; margin-bottom:30px;}
 #fancybox-inner form h3{ top: -25px;}
 #fancybox-inner fieldset {  margin: 5px; padding:5pxem; border:none; }
 #fancybox-inner fieldset label { width: 100%; line-height: 18px; margin-right: 10px; display:inline-block; text-align: left; padding: 0 0 2px 0;}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Oscss-commit] SF.net SVN: oscss:[4092] trunk/catalog

[<os...@us...>]

Revision: 4092
          http://oscss.svn.sourceforge.net/oscss/?rev=4092&view=rev
Author:   oscim
Date:     2012-03-22 19:09:53 +0000 (Thu, 22 Mar 2012)
Log Message:
-----------
correction coquille 
ajout d'une page pour l'affichage du browser 
ajutement menu

Modified Paths:
--------------
    trunk/catalog/admin/includes/boxes/08_cms.php
    trunk/catalog/common/classes/datatype_drivers/Data_home.php
    trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/header.php
    trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php
    trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/home.php
    trunk/catalog/install/includes/sql/mysql/data/91_osc_full_tag_description.sql

Added Paths:
-----------
    trunk/catalog/admin/includes/modules/pages/browser.php

Modified: trunk/catalog/admin/includes/boxes/08_cms.php
===================================================================
--- trunk/catalog/admin/includes/boxes/08_cms.php	2012-03-22 14:55:35 UTC (rev 4091)
+++ trunk/catalog/admin/includes/boxes/08_cms.php	2012-03-22 19:09:53 UTC (rev 4092)
@@ -10,5 +10,5 @@
   $tabl_link[]= array(FILENAME_CATEGORIES, 'BOX_CATALOG_CATEGORIES', 'categories', @$img['categories']);
   $tabl_link[]= array(FILENAME_CMS_CONTENT, 'BOX_CMS_CONTENT', 'cms_content',@$img['cms_content']);
   $tabl_link[]= array(FILENAME_NAVIGATION_LINKS, 'BOX_NAVIGATION_LINK', 'nav',@$img['navigation_link']);
-	$tabl_link[]= array('editeur/tiny_mce/plugins/tinybrowser/tinybrowser.php?type=image', 'BOX_NAVIGATION_IMAGE', 'images',@$img['navigation_image']);
+	$tabl_link[]= array('browser.php', 'BOX_NAVIGATION_IMAGE', 'images',@$img['navigation_image']);
 ?>
\ No newline at end of file

Added: trunk/catalog/admin/includes/modules/pages/browser.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/browser.php	                        (rev 0)
+++ trunk/catalog/admin/includes/modules/pages/browser.php	2012-03-22 19:09:53 UTC (rev 4092)
@@ -0,0 +1,76 @@
+<?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  22/03/2012, 12:59
+  @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+  @encode UTF-8
+  @class index
+*/
+
+class browser
+  implements ExtModPage {
+
+  /**
+    @var string
+  */
+  public static $code;
+  /**
+    @var string
+  */
+  public static $action;
+  /**
+    @var string
+  */
+  public static $type;
+
+
+  /**
+    @brief class constructor
+  */
+  public function __construct() {
+    self::$code = __CLASS__;
+		self::$type = (isset($_GET['type'])? $_GET['type'] : 'image' );
+  }
+
+  /**
+    @brief 
+  */
+  public function check_action($actions){
+    global $messageStack;
+
+    self::$action=$actions;
+    switch (self::$action) {
+      default:
+    }
+
+    return self::$action;
+  }
+
+  /**
+    @brief
+  */
+  public function get_header(){
+  }
+
+  /**
+    @brief
+  */
+  public static function load_db_values($ID){
+  }
+
+  /**
+    @brief
+  */
+  public function display_view(){
+/**
+	TODO prendre en charge l'editeur d'image via la constante de configuration 
+*/
+    return '<iframe src="editeur/tiny_mce/plugins/tinybrowser/tinybrowser.php?type='.self::$type.'" style="width:100%; height:600px;"></iframe>'; 
+  }
+
+}
+
+?>
\ No newline at end of file

Modified: trunk/catalog/common/classes/datatype_drivers/Data_home.php
===================================================================
--- trunk/catalog/common/classes/datatype_drivers/Data_home.php	2012-03-22 14:55:35 UTC (rev 4091)
+++ trunk/catalog/common/classes/datatype_drivers/Data_home.php	2012-03-22 19:09:53 UTC (rev 4092)
@@ -24,6 +24,7 @@
 		@var DataType array reg for seo class 
 	*/
 	public $reg_anchors = array(
+	'home'=> 'h'
 		);
 
 
@@ -52,7 +53,36 @@
 		return '';
 	}
 
+	/**
+		@brief Prepare an retrun result Seo request 
+		@param $mode string anchor key used 
+		@param $subtype Not used
+		@param $id integer current id 
+		@param $language_id integer  current language id
+		@return array (
+							ID		=> '',
+							tName => '',
+							head_desc_tag => '',
+							head_keywords_tag =>''
+						)
+	*/
+	public function SeoGetQuery($mode, $subtype, $id_string, $language_id){
+		$DB=Database::getInstance();
 
+		switch($mode){
+			default:
+				$sql = "select head_title_tag as tName, head_desc_tag, head_keywords_tag from " . TABLE_FULL_TAG . " ft, "  . TABLE_FULL_TAG_DESCRIPTION .  " ftd where ft.tag_id=ftd.tag_id and ft.page_type='page' and  ft.page_id = 'home' and ftd.language_id = '" . (int)$language_id. "' Limit 1";
+				$rsql = $DB->query($sql);
+				$result = $rsql->fetchAssoc();
+				$result['head_desc_tag']='';
+				$result['head_keywords_tag']='';
+
+				$result['sql']=$sql;
+		}
+
+		return $result;
+	}
+
 	/**
 		@brief calcul du cpath specifique a ce tyep de donnée
 	*/

Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/header.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/header.php	2012-03-22 14:55:35 UTC (rev 4091)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/Childs_tpl/header.php	2012-03-22 19:09:53 UTC (rev 4092)
@@ -53,6 +53,12 @@
   <link rel="stylesheet" type="text/css" href="<?php echo 'templates/'.$template.'/'; ?>iecss.css" />
   <![endif]-->
 
+<!--[if lte IE 8]>
+
+  <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+
+<![endif]--> 
+
   <script type="text/javascript" src="<?php echo 'templates/'.$template.'/'; ?>js/boxOver.js"></script>
 
   <script type="text/javascript" src="includes/general.js" ></script>

Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php	2012-03-22 14:55:35 UTC (rev 4091)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/init.php	2012-03-22 19:09:53 UTC (rev 4092)
@@ -110,7 +110,11 @@
     $this->oscss_boxes->_add('whats_new', 'sidebar', array('cache'=>false));
     $this->oscss_boxes->_add('specials', 'sidebar', array('cache'=>false));
 
+    $this->oscss_boxes->_add('bann_type', 'sidebar', array('cache'=>false));
+
     $load->mode = 'home';
+
+		$this->oscss_modules->_add(FILENAME_NEW_PRODUCTS,'center',array('sort'=>60));
   break;
 
   case 'cart':
@@ -171,7 +175,7 @@
     // precise si module utilisé comme pleine page
     switch(self::oscss_body_id()){
       case '404':
-	$this->oscss_modules->_add(FILENAME_NEW_PRODUCTS,'center',array('sort'=>60));
+				$this->oscss_modules->_add(FILENAME_NEW_PRODUCTS,'center',array('sort'=>60));
       break;
       default:
     }

Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/home.php
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/home.php	2012-03-22 14:55:35 UTC (rev 4091)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/home.php	2012-03-22 19:09:53 UTC (rev 4092)
@@ -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
   @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  21/03/2012, 21:54
   @encode UTF-8
 */
 ?>
@@ -13,11 +13,9 @@
   <h1 class="content title <?php echo $language ;?>"><?php echo HEADING_TITLE; ?></h1>
 </header>
 
-
 <div id="home">
-  <p class="customerGreeting"><?php echo tep_customer_greeting(); ?></p>
-  <div class="textMain"><?php printf(TEXT_MAIN, PROJECT_VERSION ) ; ?></div>
-  <div class="banner_main">
-  <?php $page->oscss_modules->_add(FILENAME_NEW_PRODUCTS,'center'); ?>
-   </div>
+  <div class="textMain">
+		<p class="customerGreeting"><?php echo tep_customer_greeting(); ?></p>
+		<?php printf(TEXT_MAIN, PROJECT_VERSION ) ; ?>
+	</div>
 </div>
\ No newline at end of file

Modified: trunk/catalog/install/includes/sql/mysql/data/91_osc_full_tag_description.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/data/91_osc_full_tag_description.sql	2012-03-22 14:55:35 UTC (rev 4091)
+++ trunk/catalog/install/includes/sql/mysql/data/91_osc_full_tag_description.sql	2012-03-22 19:09:53 UTC (rev 4092)
@@ -10,6 +10,6 @@
 --| available at the following url:                                       |
 --| http://www.oscss.org/                                                 |
 --+######################################################################--+
-INSERT INTO osc_full_tag_description (tag_id, language_id, head_title_tag, head_desc_tag, head_keywords_tag) VALUES (1, 1, 'HEAD_TITLE_TAG_ALL', 'HEAD_DESC_TAG_ALL', 'HEAD_KEY_TAG_ALL');
+INSERT INTO osc_full_tag_description (tag_id, language_id, head_title_tag, head_desc_tag, head_keywords_tag) VALUES (1, 1, 'osCSS e-shop Open Source ', 'osCSS', 'osCSS');
 
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Oscss-commit] SF.net SVN: oscss:[4091] trunk/catalog/install/includes/functions/database. php

[<os...@us...>]

Revision: 4091
          http://oscss.svn.sourceforge.net/oscss/?rev=4091&view=rev
Author:   oscim
Date:     2012-03-22 14:55:35 +0000 (Thu, 22 Mar 2012)
Log Message:
-----------
nettoyage du code

Modified Paths:
--------------
    trunk/catalog/install/includes/functions/database.php

Modified: trunk/catalog/install/includes/functions/database.php
===================================================================
--- trunk/catalog/install/includes/functions/database.php	2012-03-21 21:45:30 UTC (rev 4090)
+++ trunk/catalog/install/includes/functions/database.php	2012-03-22 14:55:35 UTC (rev 4091)
@@ -1,103 +1,93 @@
 <?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  22/03/2012, 11:10
   @author oscim <mail aur...@os...> <www http://www.oscim.fr>
   @encode UTF-8
 */
 
 
-  function osc_db_connect($motor, $port, $charset, $server, $username, $password, $database/*,$type*/) {
+function osc_db_connect($motor, $port, $charset, $server, $username, $password, $database/*,$type*/) {
 
-    if(defined('DB_CONNECTOR'))
-      return false;
+	if(defined('DB_CONNECTOR'))
+		return false;
 
-    define('HTTP_SERVER',true);
-    define('DIR_WS_COMMON','');
-    define('DIR_FS_CATALOG',substr(dirname(__FILE__),0,strpos(dirname(__FILE__),'install/includes/functions') ).'/common/');
+	define('HTTP_SERVER',true);
+	define('DIR_WS_COMMON','');
+	define('DIR_FS_CATALOG',substr(dirname(__FILE__),0,strpos(dirname(__FILE__),'install/includes/functions') ).'/common/');
 
-  // define our database connection
-    define('DB_CONNECTOR', $motor);
-    define('DB_PORT', $port);
+// define our database connection
+	define('DB_CONNECTOR', $motor);
+	define('DB_PORT', $port);
 //     define('DB_TYPE', $type);
-    define('DB_CHARSET', $charset);
-    define('DB_SERVER', $server); // eg, localhost - should not be empty for productive servers
-    define('DB_SERVER_USERNAME', $username);
-    define('DB_SERVER_PASSWORD', $password);
+	define('DB_CHARSET', $charset);
+	define('DB_SERVER', $server); // eg, localhost - should not be empty for productive servers
+	define('DB_SERVER_USERNAME', $username);
+	define('DB_SERVER_PASSWORD', $password);
 
 //     define('DB_TABLE_PREFIX', 'osc_');
-    define('USE_PCONNECT', 'false'); // use persisstent connections?
+	define('USE_PCONNECT', 'false'); // use persisstent connections?
 
-    define('DB_DATABASE', $database);
+	define('DB_DATABASE', $database);
 
 
-    include_once('../common/classes/Database.php');
+	include_once('../common/classes/Database.php');
 
 
-    $DB=Database::getInstance(false);
+	$DB=Database::getInstance(false);
 
-  }
+}
 
 
 
+function osc_db_select_db($database='') {
+	$DB=Database::getInstance();
 
-  function osc_db_select_db($database='') {
+	if(!empty($database))
+		return $DB->db_select($database);
+	else
+		return $DB->db_select(DB_DATABASE);
+}
 
-        $DB=Database::getInstance();
 
+function osc_db_close($link = 'db_link') {
+	global $link;
 
-    if(!empty($database))
-	return $DB->db_select($database);
-    else
-      return $DB->db_select(DB_DATABASE);
-  }
+	return mysql_close($link);
+}
 
+function osc_db_query($query) {
+	$DB=Database::getInstance();
+	return $DB->query($query);
+}
 
-  function osc_db_close($link = 'db_link') {
-    global $link;
+function osc_db_query_noblock($query) {
+	$DB=Database::getInstance();
+	if( ($res=$DB->query($query)) ==false)  echo '<br /><strong>Database reported:</strong> '.htmlspecialchars(mysql_error()).'<br /><strong>Failed query:</strong> '.htmlspecialchars($query)."<br />\n";
+	else return $res;
 
-    return mysql_close($link);
-  }
+}
 
-  function osc_db_query($query/*, $link = 'db_link'*/) {
-//     global $link;
+/**
+	Alias
+*/
+function tep_db_query($query) {
+	global $link;
 
-//     $res= mysql_query($query, $link) or oscss_db_error($query, mysql_errno(), mysql_error());
-    $DB=Database::getInstance();
-    return $DB->query($query);
-  }
+	return osc_db_query($query, $link);
+}
 
-  function osc_db_query_noblock($query/*, $link = 'db_link'*/) {
-    $DB=Database::getInstance();
-    if( ($res=$DB->query($query)) ==false)  echo '<br /><strong>Database reported:</strong> '.htmlspecialchars(mysql_error()).'<br /><strong>Failed query:</strong> '.htmlspecialchars($query)."<br />\n";
-    else return $res;
 
-  }
+function tep_db_fetch_array($rId) { return $rId->fetchAssoc(); }
+function osc_db_fetch_array($db_query){return tep_db_fetch_array($db_query); };
 
-  /**
-    Alias
-  */
-  function tep_db_query($query/*, $link = 'db_link'*/) {
-    global $link;
+function tep_db_num_rows($rId) { return $rId->__get('numRows');}
+function osc_db_num_rows($db_query) { return tep_db_num_rows($db_query); }
 
-    return osc_db_query($query, $link);
-  }
 
-
-
-
-  function tep_db_fetch_array($rId) { return $rId->fetchAssoc(); }
-  function osc_db_fetch_array($db_query){return tep_db_fetch_array($db_query); };
-
-
-
-  function tep_db_num_rows($rId) { return $rId->__get('numRows');}
-  function osc_db_num_rows($db_query) { return tep_db_num_rows($db_query); }
-
-
 function tep_db_prepare_input($string) {
   if (is_string($string)) {
     return trim(stripslashes($string));
@@ -118,220 +108,209 @@
 function tep_db_input($string) { $DB=Database::getInstance(); return $DB->db_input($string); }
 
 
-  function oscss_db_error($query, $errno, $error) {
+function oscss_db_error($query, $errno, $error) {
 
-    ?>
-    <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-    <html dir="ltr">
-    <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET ?>" />
-    <title>Error</title>
-    <style type="text/css">
-    <!--
-    BODY {margin: 10% 20% auto 20%; font: 10px verdana, arial, helvetica, sans-serif}
-    #errorbox {border: 1px solid #b84623}
-    H2 {margin: 0; color: #ffffff; background-color: #b84623; font-size: 1.1em; padding: 5px 4px}
-    #errorbox DIV {padding: 6px 5px; background-color: #FFEFCE}
-    -->
-    </style>
-    </head>
-    <body>
+	?>
+	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+	<html dir="ltr">
+	<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET ?>" />
+	<title>Error</title>
+	<style type="text/css">
+	<!--
+	BODY {margin: 10% 20% auto 20%; font: 10px verdana, arial, helvetica, sans-serif}
+	#errorbox {border: 1px solid #b84623}
+	H2 {margin: 0; color: #ffffff; background-color: #b84623; font-size: 1.1em; padding: 5px 4px}
+	#errorbox DIV {padding: 6px 5px; background-color: #FFEFCE}
+	-->
+	</style>
+	</head>
+	<body>
 
-    <div id="errorbox">
-	    <h2>Error</h2>
-	    <div>
-	    <?php echo "\t\t".'<br /><br /><strong>Database reported:</strong> '.htmlspecialchars($error).(($errno) ? ' (Errno: '.$errno.')' : '')."\n";
-		  echo "\t\t".'<br /><br /><strong>Failed query:</strong> '.htmlspecialchars($query)."\n";  ?>
-	    </div>
-    </div>
+	<div id="errorbox">
+		<h2>Error</h2>
+		<div>
+		<?php echo "\t\t".'<br /><br /><strong>Database reported:</strong> '.htmlspecialchars($error).(($errno) ? ' (Errno: '.$errno.')' : '')."\n";
+		echo "\t\t".'<br /><br /><strong>Failed query:</strong> '.htmlspecialchars($query)."\n";  ?>
+		</div>
+	</div>
 
-    </body>
-    </html>
-    <?php
-	  die;
-  }
+	</body>
+	</html>
+	<?php
+	die;
+}
 
 
+function osc_db_test_create_db_permission($database) {
+	global $db_error;
 
+	$DB=Database::getInstance();
 
-  function osc_db_data_seek($db_query, $row_number) {
-//     return mysql_data_seek($db_query, $row_number);
-  }
+	$db_created = false;
+	$db_error = false;
 
+	if (!$database) {
+		$db_error = 'No Database selected.';
+		return false;
+	}
 
-  function osc_db_free_result($db_query) {
-//     return mysql_free_result($db_query);
-  }
+	if (!$db_error) {
+		if (!osc_db_select_db($database)) {
+			$db_created = true;
 
-  function osc_db_test_create_db_permission($database) {
-    global $db_error;
-
-    $DB=Database::getInstance();
-//     return $DB->query($query);
-    $db_created = false;
-    $db_error = false;
-
-    if (!$database) {
-      $db_error = 'No Database selected.';
-      return false;
-    }
-
-    if (!$db_error) {
-      if (!osc_db_select_db($database)) {
-        $db_created = true;
-
-        if ( ($r=$DB->query('CREATE DATABASE ' . $database)) && !$r ) {
+			if ( ($r=$DB->query('CREATE DATABASE ' . $database)) && !$r ) {
 //           $db_error = $r;
-        }
+			}
 
-      } else {
+		} else {
 //         $db_error = mysql_error();
-      }
+		}
 
-      if (!$db_error) {
-        if (osc_db_select_db($database)) {
-          if ($DB->query('create table temp ( temp_id int(5) )')) {
-            if (!$DB->query('drop table temp')) {
+		if (!$db_error) {
+			if (osc_db_select_db($database)) {
+				if ($DB->query('create table temp ( temp_id int(5) )')) {
+					if (!$DB->query('drop table temp')) {
 // 	      $db_error = mysql_error();
-            }
-          } else {
+					}
+				} else {
 //             $db_error = mysql_error();
-          }
-        } else {
+				}
+			} else {
 //           $db_error = mysql_error();
-        }
-      }
-    }
+			}
+		}
+	}
 
-    if (!$db_error) return true;
-    else  return false;
-  }
+	if (!$db_error) return true;
+	else  return false;
+}
 
-  /**
-    Test la connexion
-    @package oscss-2 <www http://www.oscss.org>
-  */
-  function osc_db_test_connection($database,$prefix) {
-    global $db_error;
+/**
+	Test la connexion
+	@package oscss-2 <www http://www.oscss.org>
+*/
+function osc_db_test_connection($database,$prefix) {
+	global $db_error;
 
-    $db_error = false;
+	$db_error = false;
 
-    if (!$db_error) {
-      if (!@osc_db_select_db($database)) {
-        $db_error = mysql_error();
-      } else {
-        if (!@osc_db_query('select count(*) from '.$prefix.'configuration')) {
-          $db_error = mysql_error();
-        }
-      }
-    }
+	if (!$db_error) {
+		if (!@osc_db_select_db($database)) {
+			$db_error = mysql_error();
+		} else {
+			if (!@osc_db_query('select count(*) from '.$prefix.'configuration')) {
+				$db_error = mysql_error();
+			}
+		}
+	}
 
-    if ($db_error) {
-      return false;
-    } else {
-      return true;
-    }
-  }
+	if ($db_error) {
+		return false;
+	} else {
+		return true;
+	}
+}
 
-  /**
-    Insertion d'un fichier sql_file
-    Converstion langue si fichier dispo
-    @package oscss-2 <www http://www.oscss.org>
-    @author modifié oscim <mail os...@os...> <www http://www.oscim.fr>
-  */
-  function osc_db_install($database, $sql_file, $table_prefix = -1,$file_lg_sample='') {
-    global $db_error,$language;
+/**
+	Insertion d'un fichier sql_file
+	Converstion langue si fichier dispo
+	@package oscss-2 <www http://www.oscss.org>
+	@author modifié oscim <mail os...@os...> <www http://www.oscim.fr>
+*/
+function osc_db_install($database, $sql_file, $table_prefix = -1,$file_lg_sample='') {
+	global $db_error,$language;
 
-    $db_error = false;
-    $lg=false;
-    if (!@osc_db_select_db($database)) {
-      if (@osc_db_query('create database ' . $database)) {
-        osc_db_select_db($database);
-      } else {
-        $db_error = mysql_error();
-      }
-    }
+	$db_error = false;
+	$lg=false;
+	if (!@osc_db_select_db($database)) {
+		if (@osc_db_query('create database ' . $database)) {
+			osc_db_select_db($database);
+		} else {
+			$db_error = mysql_error();
+		}
+	}
 
-    if (!$db_error) {
+	if (!$db_error) {
 
-	  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_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);
-	  }
+			if(file_exists($file_lg))include($file_lg);
+		}
 
-	$fp = fopen($sql_file, 'rb');
+		$fp = fopen($sql_file, 'rb');
 
-	while (!feof ($fp))
+		while (!feof ($fp))
 		{
 			$buf = fgets($fp, 4096);
 			if (substr($buf, 0, 2) <> '--' )
 			{
-			    $buf=preg_replace('/--(.+)*/' ,'',$buf);
+					$buf=preg_replace('/--(.+)*/' ,'',$buf);
 				$buffer .= $buf;
 			}
 		}
 		fclose($fp);
 
-	$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);
+		$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 ("/(;[ ]{0,}\n)/i",$buffer);
+		$query=preg_split ("/(;[ ]{0,}\n)/i",$buffer);
 
-	if($repl) {
-	  $lg_k = array_keys($lg);
-	  $lg_v = array_map('addslashes',array_values($lg));
-	}
+		if($repl) {
+			$lg_k = array_keys($lg);
+			$lg_v = array_map('addslashes',array_values($lg));
+		}
 
-	foreach($query as $row){
-	$row = trim($row);
-	  if(strlen($row) > 1){
-	    $sql=($repl)? str_replace($lg_k,$lg_v,$row) : $row ;
-	    $DB->query($sql);
-	  }
+		foreach($query as $row){
+			$row = trim($row);
+			if(strlen($row) > 1){
+				$sql=($repl)? str_replace($lg_k,$lg_v,$row) : $row ;
+				$DB->query($sql);
+			}
+		}
+	} else {
+		return false;
 	}
-    } else {
-      return false;
-    }
-  }
+}
 
 
-  function osc_db_upgrade($database, $sql_file, $table_prefix = -1) {
-    global $db_error,$language;
-    $db_error = false;
-    $lg=false;
+function osc_db_upgrade($database, $sql_file, $table_prefix = -1) {
+	global $db_error,$language;
+	$db_error = false;
+	$lg=false;
 
 
-    if (!$db_error) {
-	$fp = fopen($sql_file, 'rb');
+	if (!$db_error) {
+		$fp = fopen($sql_file, 'rb');
 
-	while (!feof ($fp))
-		{
-			$buf = fgets($fp, 4096);
-			if (substr($buf, 0, 2) <> '--'   )
+		while (!feof ($fp))
 			{
-			    $buf=preg_replace('/--(.+)*/' ,'',$buf);
-				$buffer .= $buf;
+				$buf = fgets($fp, 4096);
+				if (substr($buf, 0, 2) <> '--'   )
+				{
+						$buf=preg_replace('/--(.+)*/' ,'',$buf);
+					$buffer .= $buf;
+				}
 			}
-		}
-		fclose($fp);
+			fclose($fp);
 
 
 
-	$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){
-	  osc_db_query_noblock($row);
-	  }
-	}
+		$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){
+			osc_db_query_noblock($row);
+			}
+		}
 
-    } else {
-      return false;
-    }
-  }
+	} else {
+		return false;
+	}
+}
 ?>
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Oscss-commit] SF.net SVN: oscss:[4090] trunk/catalog/install/includes/sql/mysql/data/ 20_osc_status.sql

[<ay...@us...>]

Revision: 4090
          http://oscss.svn.sourceforge.net/oscss/?rev=4090&view=rev
Author:   ayatus
Date:     2012-03-21 21:45:30 +0000 (Wed, 21 Mar 2012)
Log Message:
-----------
Coquille requ?\195?\170te "insert into"

Modified Paths:
--------------
    trunk/catalog/install/includes/sql/mysql/data/20_osc_status.sql

Modified: trunk/catalog/install/includes/sql/mysql/data/20_osc_status.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/data/20_osc_status.sql	2012-03-21 15:09:29 UTC (rev 4089)
+++ trunk/catalog/install/includes/sql/mysql/data/20_osc_status.sql	2012-03-21 21:45:30 UTC (rev 4090)
@@ -12,45 +12,45 @@
 --+######################################################################--+
 
 
-INSERT INTO osc_status (status_id, status_type, language_id, status_name_status_color) VALUES (-1, 'orders', 1, 'OSC_ORDERS_STATUS_CANCELED', '#666');
-INSERT INTO osc_status (status_id, status_type, language_id, status_name_status_color) VALUES (1, 'orders', 1, 'OSC_ORDERS_STATUS_PENDING', '#FF1A00');
-INSERT INTO osc_status (status_id, status_type, language_id, status_name_status_color) VALUES (11, 'orders', 1, 'OSC_ORDERS_STATUS_PENDING_MONEY_ORDER', '#3393D9');
-INSERT INTO osc_status (status_id, status_type, language_id, status_name_status_color) VALUES (2, 'orders', 1, 'OSC_ORDERS_STATUS_PAYED', '#3393D9');
-INSERT INTO osc_status (status_id, status_type, language_id, status_name_status_color) VALUES (21, 'orders', 1, 'OSC_ORDERS_STATUS_PAYED_MONEY_ORDER', '#3393D9');
-INSERT INTO osc_status (status_id, status_type, language_id, status_name_status_color) VALUES (3, 'orders', 1, 'OSC_ORDERS_STATUS_PROCESSING', '#66FF00');
-INSERT INTO osc_status (status_id, status_type, language_id, status_name_status_color) VALUES (4, 'orders', 1, 'OSC_ORDERS_STATUS_EXPEDIED', '#66FF00');
-INSERT INTO osc_status (status_id, status_type, language_id, status_name_status_color) VALUES (5, 'orders', 1, 'OSC_ORDERS_STATUS_DELIVERED', '#66FF00');
-INSERT INTO osc_status (status_id, status_type, language_id, status_name_status_color) VALUES (6, 'orders', 1, 'OSC_ORDERS_STATUS_CLOSED', '#66FF00');
+INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color) VALUES (-1, 'orders', 1, 'OSC_ORDERS_STATUS_CANCELED', '#666');
+INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color) VALUES (1, 'orders', 1, 'OSC_ORDERS_STATUS_PENDING', '#FF1A00');
+INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color) VALUES (11, 'orders', 1, 'OSC_ORDERS_STATUS_PENDING_MONEY_ORDER', '#3393D9');
+INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color) VALUES (2, 'orders', 1, 'OSC_ORDERS_STATUS_PAYED', '#3393D9');
+INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color) VALUES (21, 'orders', 1, 'OSC_ORDERS_STATUS_PAYED_MONEY_ORDER', '#3393D9');
+INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color) VALUES (3, 'orders', 1, 'OSC_ORDERS_STATUS_PROCESSING', '#66FF00');
+INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color) VALUES (4, 'orders', 1, 'OSC_ORDERS_STATUS_EXPEDIED', '#66FF00');
+INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color) VALUES (5, 'orders', 1, 'OSC_ORDERS_STATUS_DELIVERED', '#66FF00');
+INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color) VALUES (6, 'orders', 1, 'OSC_ORDERS_STATUS_CLOSED', '#66FF00');
 
 
-INSERT INTO osc_status (status_id, status_type, language_id, status_name_status_color) VALUES (1, 'returns', 1, 'OSC_RETURNS_STATUS_PENDING','#FF1A00');
-INSERT INTO osc_status (status_id, status_type, language_id, status_name_status_color) VALUES (2, 'returns',1, 'OSC_RETURNS_STATUS_AWAITING_RETURN', '#3393D9');
-INSERT INTO osc_status (status_id, status_type, language_id, status_name_status_color) VALUES (3, 'returns',1, 'OSC_RETURNS_STATUS_CANCELLED', '#66FF00');
-INSERT INTO osc_status (status_id, status_type, language_id, status_name_status_color) VALUES (4, 'returns',1, 'OSC_RETURNS_STATUS_COMPLETE', '#666');
+INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color) VALUES (1, 'returns', 1, 'OSC_RETURNS_STATUS_PENDING','#FF1A00');
+INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color) VALUES (2, 'returns',1, 'OSC_RETURNS_STATUS_AWAITING_RETURN', '#3393D9');
+INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color) VALUES (3, 'returns',1, 'OSC_RETURNS_STATUS_CANCELLED', '#66FF00');
+INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color) VALUES (4, 'returns',1, 'OSC_RETURNS_STATUS_COMPLETE', '#666');
 
-INSERT INTO osc_status (status_id, status_type, language_id, status_name_status_color) VALUES (1, 'return_reasons', 1, 'OSC_RETURN_REASONS_FAULTY','#FF1A00');
-INSERT INTO osc_status (status_id, status_type, language_id, status_name_status_color) VALUES (2, 'return_reasons',1, 'OSC_RETURN_REASONS_DAMAGED', '#3393D9');
-INSERT INTO osc_status (status_id, status_type, language_id, status_name_status_color) VALUES (3, 'return_reasons',1, 'OSC_RETURN_REASONS_INCORRECT_ITEM', '#66FF00');
-INSERT INTO osc_status (status_id, status_type, language_id, status_name_status_color) VALUES (4, 'return_reasons',1, 'OSC_RETURN_REASONS_WARRANTY', '#666');
+INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color) VALUES (1, 'return_reasons', 1, 'OSC_RETURN_REASONS_FAULTY','#FF1A00');
+INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color) VALUES (2, 'return_reasons',1, 'OSC_RETURN_REASONS_DAMAGED', '#3393D9');
+INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color) VALUES (3, 'return_reasons',1, 'OSC_RETURN_REASONS_INCORRECT_ITEM', '#66FF00');
+INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color) VALUES (4, 'return_reasons',1, 'OSC_RETURN_REASONS_WARRANTY', '#666');
 
-INSERT INTO osc_status (status_id, status_type, language_id, status_name_status_color) VALUES (1, 'refund_method', 1, 'OSC_REFUND_METHOD_PAYPAL','');
-INSERT INTO osc_status (status_id, status_type, language_id, status_name_status_color) VALUES (2, 'refund_method', 1, 'OSC_REFUND_METHOD_NOCHEX','');
-INSERT INTO osc_status (status_id, status_type, language_id, status_name_status_color) VALUES (3, 'refund_method', 1, 'OSC_REFUND_METHOD_EXCHANGE','');
-INSERT INTO osc_status (status_id, status_type, language_id, status_name_status_color) VALUES (4, 'refund_method', 1, 'OSC_REFUND_METHOD_GIFT_VOUCHERS','');
-INSERT INTO osc_status (status_id, status_type, language_id, status_name_status_color) VALUES (5, 'refund_method', 1, 'OSC_REFUND_METHOD_CUSTOMERS_POINTS','');
+INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color) VALUES (1, 'refund_method', 1, 'OSC_REFUND_METHOD_PAYPAL','');
+INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color) VALUES (2, 'refund_method', 1, 'OSC_REFUND_METHOD_NOCHEX','');
+INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color) VALUES (3, 'refund_method', 1, 'OSC_REFUND_METHOD_EXCHANGE','');
+INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color) VALUES (4, 'refund_method', 1, 'OSC_REFUND_METHOD_GIFT_VOUCHERS','');
+INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color) VALUES (5, 'refund_method', 1, 'OSC_REFUND_METHOD_CUSTOMERS_POINTS','');
 
-insert into osc_status (status_id, status_type, language_id, status_name_status_color) VALUES (1, 'products_virtual_types', 1, 'OSC_PRODUCTS_VIRTUAL_TYPES_PHYSICAL','');
-insert into osc_status (status_id, status_type, language_id, status_name_status_color) VALUES (2, 'products_virtual_types',1, 'OSC_PRODUCTS_VIRTUAL_TYPES_SUBSCRIPTION','');
-insert into osc_status (status_id, status_type, language_id, status_name_status_color) VALUES (3, 'products_virtual_types',1, 'OSC_PRODUCTS_VIRTUAL_TYPES_SERVICE','');
-insert into osc_status (status_id, status_type, language_id, status_name_status_color) VALUES (4, 'products_virtual_types',1, 'OSC_PRODUCTS_VIRTUAL_TYPES_SOFTWARE','');
+insert into osc_status (status_id, status_type, language_id, status_name, status_color) VALUES (1, 'products_virtual_types', 1, 'OSC_PRODUCTS_VIRTUAL_TYPES_PHYSICAL','');
+insert into osc_status (status_id, status_type, language_id, status_name, status_color) VALUES (2, 'products_virtual_types',1, 'OSC_PRODUCTS_VIRTUAL_TYPES_SUBSCRIPTION','');
+insert into osc_status (status_id, status_type, language_id, status_name, status_color) VALUES (3, 'products_virtual_types',1, 'OSC_PRODUCTS_VIRTUAL_TYPES_SERVICE','');
+insert into osc_status (status_id, status_type, language_id, status_name, status_color) VALUES (4, 'products_virtual_types',1, 'OSC_PRODUCTS_VIRTUAL_TYPES_SOFTWARE','');
 
-INSERT INTO osc_status (status_id, status_type, language_id, status_name_status_color) VALUES (1, 'attribute_optiontype', 1, 'OSC_ATTRIBUTE_OPTIONTYPE_SELECT','');
-INSERT INTO osc_status (status_id, status_type, language_id, status_name_status_color) VALUES (2, 'attribute_optiontype', 1, 'OSC_ATTRIBUTE_OPTIONTYPE_TEXT','');
-INSERT INTO osc_status (status_id, status_type, language_id, status_name_status_color) VALUES (3, 'attribute_optiontype', 1, 'OSC_ATTRIBUTE_OPTIONTYPE_RADIO','');
-INSERT INTO osc_status (status_id, status_type, language_id, status_name_status_color) VALUES (4, 'attribute_optiontype', 1, 'OSC_ATTRIBUTE_OPTIONTYPE_CHECKBOX','');
+INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color) VALUES (1, 'attribute_optiontype', 1, 'OSC_ATTRIBUTE_OPTIONTYPE_SELECT','');
+INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color) VALUES (2, 'attribute_optiontype', 1, 'OSC_ATTRIBUTE_OPTIONTYPE_TEXT','');
+INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color) VALUES (3, 'attribute_optiontype', 1, 'OSC_ATTRIBUTE_OPTIONTYPE_RADIO','');
+INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color) VALUES (4, 'attribute_optiontype', 1, 'OSC_ATTRIBUTE_OPTIONTYPE_CHECKBOX','');
 
-INSERT INTO osc_status (status_id, status_type, language_id, status_name_status_color) VALUES (1, 'geo_zone_type', 1, 'OSC_GEO_ZONE_VAT','');
-INSERT INTO osc_status (status_id, status_type, language_id, status_name_status_color) VALUES (2, 'geo_zone_type', 1, 'OSC_GEO_ZONE_SHIPPING','');
+INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color) VALUES (1, 'geo_zone_type', 1, 'OSC_GEO_ZONE_VAT','');
+INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color) VALUES (2, 'geo_zone_type', 1, 'OSC_GEO_ZONE_SHIPPING','');
 
 
-INSERT INTO osc_status (status_id, status_type, language_id, status_name_status_color) VALUES (1, 'content', 1, 'OSC_CMS_CONTENT_SIMPLE','');
+INSERT INTO osc_status (status_id, status_type, language_id, status_name, status_color) VALUES (1, 'content', 1, 'OSC_CMS_CONTENT_SIMPLE','');

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Oscss-commit] SF.net SVN: oscss:[4089] trunk/catalog/admin/includes/modules/newsletters

[<os...@us...>]

Revision: 4089
          http://oscss.svn.sourceforge.net/oscss/?rev=4089&view=rev
Author:   oscim
Date:     2012-03-21 15:09:29 +0000 (Wed, 21 Mar 2012)
Log Message:
-----------
erreur de logique  dans la boucle d'ajustement des contenus newsletters 

Modified Paths:
--------------
    trunk/catalog/admin/includes/modules/newsletters/new_products.php
    trunk/catalog/admin/includes/modules/newsletters/newsletter.php

Modified: trunk/catalog/admin/includes/modules/newsletters/new_products.php
===================================================================
--- trunk/catalog/admin/includes/modules/newsletters/new_products.php	2012-03-21 13:45:03 UTC (rev 4088)
+++ trunk/catalog/admin/includes/modules/newsletters/new_products.php	2012-03-21 15:09:29 UTC (rev 4089)
@@ -1,12 +1,13 @@
 <?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  20/03/11, 20:48
+  @version 2.1.1
+  @date  21/03/2012, 20:48
   @author oscim <mail aur...@os...> <www http://www.oscim.fr>
   @encode UTF-8
+	@class new_products
 */
 
 class new_products
@@ -149,25 +150,26 @@
       $this->content=$this->get_content($this->content);
 
       while ($mail = $mail_query->fetchAssoc()) {
-	/// replace balise
-	$this->content=str_replace(NewslettersUtility::$replace, $mail ,$this->content);
-	/// force link by redirect shop
-	$this->content = preg_replace('~href[\s]*=[\s]*"~', 'href="'.HTTP_SERVER.DIR_WS_HTTP_CATALOG.'news.php?i='.$newsletter_id.'&c='.$mail['id'].'&u=$1', $this->content);
+				$content = $this->content;
+				/// replace balise
+				$content=str_replace(NewslettersUtility::$replace, $mail , $content);
+				/// force link by redirect shop
+				$content = preg_replace('~href[\s]*=[\s]*"~', 'href="'.HTTP_SERVER.DIR_WS_HTTP_CATALOG.'news.php?i='.$newsletter_id.'&c='.$mail['id'].'&u=$1', $content );
 
 
-	$myarray = array(
-		'email_use_html'=>_cst_bool('EMAIL_USE_HTML'),
-		'email_use_logo'=>NewslettersUtility::UseModele(parent::$CurrentMod->modele_id),
-		'email_use_link_online'=> sprintf(__('text view online <a href="%s" >click here</a>') , tep_catalog_href_link('newsletters.php','newsID='.$newsletter_id.'&cID='.$mail['id'].'&hash='.md5($mail['id'].$mail['email'].$newsletter_id,'NONSSL', true).'&mode=view')),
-		'tpl_link_trace'=>'<img src="'.HTTP_SERVER.DIR_WS_CATALOG.'n-'.$newsletter_id.'-'.$mail['id'].'.jpg" width="1" height="1">',
-		'message'=> NewslettersUtility::ApplModele($this->content, parent::$CurrentMod->modele_id),
-		);
+				$myarray = array(
+					'email_use_html'=>_cst_bool('EMAIL_USE_HTML'),
+					'email_use_logo'=>NewslettersUtility::UseModele(parent::$CurrentMod->modele_id),
+					'email_use_link_online'=> sprintf(__('text view online <a href="%s" >click here</a>') , tep_catalog_href_link('newsletters.php','newsID='.$newsletter_id.'&cID='.$mail['id'].'&hash='.md5($mail['id'].$mail['email'].$newsletter_id,'NONSSL', true).'&mode=view')),
+					'tpl_link_trace'=>'<img src="'.HTTP_SERVER.DIR_WS_CATALOG.'n-'.$newsletter_id.'-'.$mail['id'].'.jpg" width="1" height="1">',
+					'message'=> NewslettersUtility::ApplModele($content, parent::$CurrentMod->modele_id),
+					);
 
-	$message_final=tep_post_prepare_email('newsletter'.'.tpl',$language,$myarray);
-	if(tep_mail($mail['firstname'] . ' ' . $mail['lastname'], $mail['email'], $this->title, $message_final, STORE_OWNER, EMAIL_FROM) !=false){
+				$message_final=tep_post_prepare_email('newsletter'.'.tpl',$language,$myarray);
+				if(tep_mail($mail['firstname'] . ' ' . $mail['lastname'], $mail['email'], $this->title, $message_final, STORE_OWNER, EMAIL_FROM) !=false){
 
-	  parent::PushUserSent($mail['id'], $newsletter_id, (string) __CLASS__);
-	}
+					parent::PushUserSent($mail['id'], $newsletter_id, (string) __CLASS__);
+				}
 
       }
 

Modified: trunk/catalog/admin/includes/modules/newsletters/newsletter.php
===================================================================
--- trunk/catalog/admin/includes/modules/newsletters/newsletter.php	2012-03-21 13:45:03 UTC (rev 4088)
+++ trunk/catalog/admin/includes/modules/newsletters/newsletter.php	2012-03-21 15:09:29 UTC (rev 4089)
@@ -1,12 +1,13 @@
 <?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  20/03/11, 20:48
+  @version 2.1.1
+  @date  21/03/2012, 20:48
   @author oscim <mail aur...@os...> <www http://www.oscim.fr>
   @encode UTF-8
+	@class newsletter
 */
 
 class newsletter
@@ -99,29 +100,29 @@
 
     if($mail_query->__get('numRows')) {
       while ($mail = $mail_query->fetchAssoc()) {
-	/// replace balise
-	$this->content=str_replace(NewslettersUtility::$replace, $mail ,$this->content);
-	/// force link by redirect shop
-	$this->content = preg_replace('~href[\s]*=[\s]*"~', 'href="'.HTTP_SERVER.DIR_WS_HTTP_CATALOG.'news.php?i='.$newsletter_id.'&c='.$mail['id'].'&u=$1', $this->content);
+				$content= $this->content;
+				/// replace balise
+				$content=str_replace(NewslettersUtility::$replace, $mail ,$content);
+				/// force link by redirect shop
+				$content = preg_replace('~href[\s]*=[\s]*"~', 'href="'.HTTP_SERVER.DIR_WS_HTTP_CATALOG.'news.php?i='.$newsletter_id.'&c='.$mail['id'].'&u=$1', $content);
 
 
-	$myarray = array(
-		'email_use_html'=>_cst_bool('EMAIL_USE_HTML'),
-		'email_use_logo'=>NewslettersUtility::UseModele(parent::$CurrentMod->modele_id),
-		'email_use_link_online'=>
-		      sprintf(__('text view online %s') ,
-			      tep_catalog_href_link('newsletters.php','newsID='.$newsletter_id.'&cID='.$mail['id'].'&hash='.md5($mail['id'].$mail['email'].$newsletter_id).'&mode=view','NONSSL' ,true)
-			      ),
-		'tpl_link_trace'=>'<img src="'.HTTP_SERVER.DIR_WS_CATALOG.'n-'.$newsletter_id.'-'.$mail['id'].'.jpg" width="1" height="1">',
-		'message'=> NewslettersUtility::ApplModele($this->content, parent::$CurrentMod->modele_id),
-		);
+				$myarray = array(
+					'email_use_html'=>_cst_bool('EMAIL_USE_HTML'),
+					'email_use_logo'=>NewslettersUtility::UseModele(parent::$CurrentMod->modele_id),
+					'email_use_link_online'=>
+								sprintf(__('text view online %s') ,
+									tep_catalog_href_link('newsletters.php','newsID='.$newsletter_id.'&cID='.$mail['id'].'&hash='.md5($mail['id'].$mail['email'].$newsletter_id).'&mode=view','NONSSL' ,true)
+									),
+					'tpl_link_trace'=>'<img src="'.HTTP_SERVER.DIR_WS_CATALOG.'n-'.$newsletter_id.'-'.$mail['id'].'.jpg" width="1" height="1">',
+					'message'=> NewslettersUtility::ApplModele($content, parent::$CurrentMod->modele_id),
+					);
 
-	$message_final=tep_post_prepare_email(__CLASS__.'.tpl',$language,$myarray);
-	if(tep_mail($mail['firstname'] . ' ' . $mail['lastname'], $mail['email'], $this->title, $message_final, STORE_OWNER, EMAIL_FROM) !=false){
+				$message_final=tep_post_prepare_email(__CLASS__.'.tpl',$language,$myarray);
+				if(tep_mail($mail['firstname'] . ' ' . $mail['lastname'], $mail['email'], $this->title, $message_final, STORE_OWNER, EMAIL_FROM) !=false){
 
-	  parent::PushUserSent($mail['id'], $newsletter_id, (string) __CLASS__);
-	}
-
+					parent::PushUserSent($mail['id'], $newsletter_id, (string) __CLASS__);
+				}
       }
 
       parent::UpSent();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Oscss-commit] SF.net SVN: oscss:[4088] trunk/catalog/install/includes/team_info

[<ay...@us...>]

Revision: 4088
          http://oscss.svn.sourceforge.net/oscss/?rev=4088&view=rev
Author:   ayatus
Date:     2012-03-21 13:45:03 +0000 (Wed, 21 Mar 2012)
Log Message:
-----------
[install] remaniement des "team info"

Modified Paths:
--------------
    trunk/catalog/install/includes/team_info/base.inc
    trunk/catalog/install/includes/team_info/configuration.inc
    trunk/catalog/install/includes/team_info/finition.inc
    trunk/catalog/install/includes/team_info/installdb.inc
    trunk/catalog/install/includes/team_info/modes.inc
    trunk/catalog/install/includes/team_info/update.inc

Modified: trunk/catalog/install/includes/team_info/base.inc
===================================================================
--- trunk/catalog/install/includes/team_info/base.inc	2012-03-21 07:12:44 UTC (rev 4087)
+++ trunk/catalog/install/includes/team_info/base.inc	2012-03-21 13:45:03 UTC (rev 4088)
@@ -1,13 +1,13 @@
 <h2><a href="http:://www.osCSS.org">osCSS</a> </h2>
 <p>
 <a href="http:://www.osCSS.org"><img src="includes/team_info/img/oscss_logo.png" width="210" height="103" alt="logo osCSS"/></a>
-<strong>osCSS, moteur de boutique en ligne</strong> est une solution 100% Open Source, dont le moteur (le core) appartient à la communauté, et dont la communauté détient le choix de l'orientation et l'évolution de cet outil.
+<strong>osCSS, moteur de boutique en ligne</strong> est une solution 100% Open Source, dont le moteur (le core) appartient à la communauté qui en détient le choix d'orientation et d'évolution.
 </p>
 <p>Il est ainsi possible, pour toute personne désirant s'investir dans le développement, d'orienter les choix et évolutions de cette solution.
 </p>
-<p>Cette version du moteur est fortement éloignée du moteur osCommerce d'origine et tend plus à l'évolution poussée du développement d'osCSS. De plus au  niveau de l'orientation du moteur on est plus proche d'un "osCommmerce 3" ou de toute solution rigide.
+<p>Cette version du moteur est fortement éloignée du moteur osCommerce d'origine et tend plus à l'évolution poussée du développement d'osCSS. De plus, au niveau de l'orientation du moteur on est plus proche d'un "osCommmerce 3" ou de toutes solutions rigides.
 </p>
-<p><strong>Soutenez nous !</strong> Participez à la promotion, au développement, aux remontées de bug, afin d'améliorer les performances, la stabilité et la cohérence de l'ensemble. Toutes informations liées à votre utilisation nous intéressent. Quelques minutes pour nous faire connaître vos remarques sur cette solution seront les bienvenues.
+<p><strong>Soutenez nous ! </strong>Participez à la promotion, au développement, aux remontées de bug, afin d'améliorer les performances, la stabilité et la cohérence de l'ensemble. Toutes informations liées à votre utilisation nous intéressent. Quelques minutes pour nous faire connaître vos remarques sur cette solution seront les bienvenues.
 </p>
 <p>osCSS, 2005 - <?php echo date('Y') ?>. - Basé à l'origine sur osCommerce</p>
 

Modified: trunk/catalog/install/includes/team_info/configuration.inc
===================================================================
--- trunk/catalog/install/includes/team_info/configuration.inc	2012-03-21 07:12:44 UTC (rev 4087)
+++ trunk/catalog/install/includes/team_info/configuration.inc	2012-03-21 13:45:03 UTC (rev 4088)
@@ -4,6 +4,6 @@
 oscim est membre depuis plusieurs années et à participé ponctuellement.
 </p>
 <p>
-Puis depuis maintenant 2 ans, il s'est investi très activement et représente le membre le plus fortement impliqué actuellement. Il est l'instigateur, l'architecte et le principal développeur de cette version.
+Depuis 2 ans, il s'investi très activement et représente le membre le plus fortement impliqué actuellement. Il est l'instigateur, l'architecte et le principal développeur de cette version.
 </p>
 <span class="clear"></span>
\ No newline at end of file

Modified: trunk/catalog/install/includes/team_info/finition.inc
===================================================================
--- trunk/catalog/install/includes/team_info/finition.inc	2012-03-21 07:12:44 UTC (rev 4087)
+++ trunk/catalog/install/includes/team_info/finition.inc	2012-03-21 13:45:03 UTC (rev 4088)
@@ -1,4 +1,4 @@
-<h2>Personnaliser votre installation, ajouter des étapes </h2>
+<h2>Personnaliser votre installation, ajouter des étapes</h2>
 <p>
 <a href="http://oscss.org"><img src="includes/team_info/img/oscss_logo.png" width="210" height="103" alt="logo osCSS"/></a>
 Vous pouvez facilement personnaliser l'installateur, ajouter des étapes , proposer un template, affiner votre installateur.
@@ -8,7 +8,7 @@
 <li><a href="http://wiki.oscss.org/"> <em>Chercher dans la documentation</em></a></li>
 <li><a href="http://dir.oscss.org/"> <em>Présenter vos réalisation, référencer votre site</em></a></li>
 <li><a href="http://plugins.oscss.org/"> <em>Ajouter des extensions, trouver des modules, plugins et templates</em></a></li>
-<li><a href="http://dev.oscss.org/"> <em>Suivre l'évolution, tracer les bugs</em></a></li>
+<li><a href="http://dev.oscss.org/"> <em>Suivre l'évolution, reporter les bugs</em></a></li>
 <ul>
 <br />
 <h2>Remerciements</h2>
@@ -17,6 +17,6 @@
 <li><em><a href="http://oscim.fr">oscim</a></em> pour son investissement</li>
 <li><em><a href="http://ayatus.org">Ayatus</a></em> pour son suivi et ses tests</li>
 <li><em><a href="http://netmedia.coop">Netmedia</a></em> pour ses tests et ses retours</li>
-<li><em><a href="">Cynic</a></em> Pour ces traductions</li>
-<li>Tous les membres de la communauté, qui on testé, remonté les bugs et soutenu dans ce travail. </li>
+<li><em><a href="">Cynic</a></em> pour ces traductions</li>
+<li>Tous les membres de la communauté, qui ont testé, remonté les bugs et nous ont soutenu dans ce travail. </li>
 </ul>
\ No newline at end of file

Modified: trunk/catalog/install/includes/team_info/installdb.inc
===================================================================
--- trunk/catalog/install/includes/team_info/installdb.inc	2012-03-21 07:12:44 UTC (rev 4087)
+++ trunk/catalog/install/includes/team_info/installdb.inc	2012-03-21 13:45:03 UTC (rev 4088)
@@ -4,7 +4,7 @@
 oscim est membre depuis plusieurs années et à participé ponctuellement.
 </p>
 <p>
-Puis depuis maintenant 2 ans, il s'est investi très activement et représente le <em>membre le plus fortement impliqué actuellement</em>.<br />
+Depuis 2 ans, il s'investi très activement et représente le <em>membre le plus fortement impliqué actuellement</em>.<br />
 Il est l'instigateur, l'architecte et le principal développeur de cette version 2.xx.
 </p>
 <span class="clear"></span>
\ No newline at end of file

Modified: trunk/catalog/install/includes/team_info/modes.inc
===================================================================
--- trunk/catalog/install/includes/team_info/modes.inc	2012-03-21 07:12:44 UTC (rev 4087)
+++ trunk/catalog/install/includes/team_info/modes.inc	2012-03-21 13:45:03 UTC (rev 4088)
@@ -1,7 +1,7 @@
 <h2><a href="http://www.openstudio.fr/">j4k</a></h2>
 <p >
 <a href="http://www.openstudio.fr/"><img src="includes/team_info/img/openstudio.png" width="148" height="31" alt="logo OpenStudio"/></a>
-osCSS est porté par j4k depuis de nombreuse année, et qui héberge le site d'osCSS.org depuis le début de l'aventure.
+osCSS est porté par j4k depuis de nombreuses années, et qui héberge le site d'osCSS.org depuis le début de l'aventure.
 </p>
 <p>
 Il représente le mainteneur et développeur de la version 1.xx et reste l'initiateur de cette solution.

Modified: trunk/catalog/install/includes/team_info/update.inc
===================================================================
--- trunk/catalog/install/includes/team_info/update.inc	2012-03-21 07:12:44 UTC (rev 4087)
+++ trunk/catalog/install/includes/team_info/update.inc	2012-03-21 13:45:03 UTC (rev 4088)
@@ -1,9 +1,9 @@
 <h2><a href="http://www.oscim.fr">oscim</a></h2>
 <p>
 <a href="http://www.oscim.fr"><img src="includes/team_info/img/logo_oscim.gif" width="71" height="88" alt="logo oscim"/></a>
-oscim est membre depuis plusieurs années et à participé ponctuellement.
+oscim est membre depuis plusieurs années et a participé ponctuellement.
 </p>
 <p>
-Puis depuis maintenant 2 ans, il s'est investi très activement et représente le membre le plus fortement impliqué actuellement. Il est l'instigateur, l'architecte et le principal développeur de cette version.
+Depuis 2 ans, il s'investi très activement et représente le membre le plus fortement impliqué actuellement. Il est l'instigateur, l'architecte et le principal développeur de cette version.
 </p>
 <span class="clear"></span>
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Oscss-commit] SF.net SVN: oscss:[4087] trunk/catalog/install/includes/sql/mysql/data/ 91_osc_configuration.sql

[<os...@us...>]

Revision: 4087
          http://oscss.svn.sourceforge.net/oscss/?rev=4087&view=rev
Author:   oscim
Date:     2012-03-21 07:12:44 +0000 (Wed, 21 Mar 2012)
Log Message:
-----------
Ajout var de configuration qui definit ordonnancement et activation des module de Datatype necessaire au fichier index.php

Modified Paths:
--------------
    trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql

Modified: trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql	2012-03-20 22:27:44 UTC (rev 4086)
+++ trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql	2012-03-21 07:12:44 UTC (rev 4087)
@@ -360,7 +360,7 @@
 -- 130 option data types
 
 insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('PUBLIC_PAGE_TYPE_S', 'PUBLIC_PAGE_TYPE', 'listing,product,account,home,content', 'PUBLIC_PAGE_TYPE_L', '130', '0', NOW(), NOW(),NULL, NULL, 2);
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function , set_function,configuration_type) values ('DATATYPES_S', 'DATATYPES', 'error, product,content, diver, categorie, manufacturer,home,', 'DATATYPES_L', '130', '0', NOW(), NOW(),NULL, NULL, 2);
 
-
 COMMIT;
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Oscss-commit] SF.net SVN: oscss:[4086] trunk/catalog/includes/classes/page.php

[<os...@us...>]

Revision: 4086
          http://oscss.svn.sourceforge.net/oscss/?rev=4086&view=rev
Author:   oscim
Date:     2012-03-20 22:27:44 +0000 (Tue, 20 Mar 2012)
Log Message:
-----------
oublis commit precedent 

Modified Paths:
--------------
    trunk/catalog/includes/classes/page.php

Modified: trunk/catalog/includes/classes/page.php
===================================================================
--- trunk/catalog/includes/classes/page.php	2012-03-20 22:24:41 UTC (rev 4085)
+++ trunk/catalog/includes/classes/page.php	2012-03-20 22:27:44 UTC (rev 4086)
@@ -456,11 +456,13 @@
     // set the template
     $this->page['template'] = page::oscss_get_template();
 
+
 		// force redirect clean url after empty page cache
 		if(self::$CacheCalcul){
 			$quey_string=tep_get_all_get_params(array('cache','page'));
 			tep_redirect( tep_href_link(basename($_SERVER['SCRIPT_NAME']) , ( ( $quey_string !='')? $quey_string : '') ) );
 		}
+
   }
 
   /**
@@ -475,9 +477,11 @@
     $this->page['script']=$p_content;
     $this->page['content']=trim($p_content);
     $this->page['language']=$language;
+
     $this->type_content();
     $page=$this;
 
+
     $this->CurrentPageInit($p_content);
 
   /// include start the breadcrumb trail
@@ -505,12 +509,12 @@
 
     /// add category names to the breadcrumb trail
     if (isset($this->page['var']['cPath_array'])) {
-    for ($i=0, $n=sizeof($this->page['var']['cPath_array']); $i<$n; $i++) {
-    if( ($categories=categorie::get_item((int)$this->page['var']['cPath_array'][$i])) !=false)
-        $this->breadcrumb->add($categories->categories_name, tep_href_link(FILENAME_DEFAULT, 'cPath=' . implode('_', array_slice($this->page['var']['cPath_array'], 0, ($i+1)))));
-    else break;
+			for ($i=0, $n=sizeof($this->page['var']['cPath_array']); $i<$n; $i++) {
+				if( ($categories=categorie::get_item((int)$this->page['var']['cPath_array'][$i])) !=false)
+						$this->breadcrumb->add($categories->categories_name, tep_href_link(FILENAME_DEFAULT, 'cPath=' . implode('_', array_slice($this->page['var']['cPath_array'], 0, ($i+1)))));
+				else break;
+			}
     }
-    }
 
   }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Oscss-commit] SF.net SVN: oscss:[4085] trunk/catalog/includes/classes/drivers/page/data/

[<os...@us...>]

Revision: 4085
          http://oscss.svn.sourceforge.net/oscss/?rev=4085&view=rev
Author:   oscim
Date:     2012-03-20 22:24:41 +0000 (Tue, 20 Mar 2012)
Log Message:
-----------
obsolete

Removed Paths:
-------------
    trunk/catalog/includes/classes/drivers/page/data/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Oscss-commit] SF.net SVN: oscss:[4084] trunk/catalog

[<os...@us...>]

Revision: 4084
          http://oscss.svn.sourceforge.net/oscss/?rev=4084&view=rev
Author:   oscim
Date:     2012-03-20 22:23:13 +0000 (Tue, 20 Mar 2012)
Log Message:
-----------
Refonte du fichier index principale
mise en place d'une gestion modulaire du chargement de cette page , et centralisation d'un nouveau type de datatype_drivers dans common ; prise en charge unifi?\195?\169 du type
Mise a niveau de la class seo pour l'exploitation de ces nouveau type 
ajustement colonne de certaine table, ajout d'un type dans les table de cms
Ajout d'une colonne datatype dans les categories, et exloitation de cette colonne pour determiner le type de donn?\195?\169e affich?\195?\169 dans les listing public 
Correction coquille et erreur php

Modified Paths:
--------------
    trunk/catalog/admin/includes/appli_top_Test.php
    trunk/catalog/admin/includes/application_top.php
    trunk/catalog/admin/includes/classes/navigationHistory.php
    trunk/catalog/admin/includes/classes/oscss_cstr.php
    trunk/catalog/common/classes/seo_url.php
    trunk/catalog/includes/classes/core_page/develop.php
    trunk/catalog/includes/classes/core_page/listing.php
    trunk/catalog/includes/classes/drivers/data/categorie.php
    trunk/catalog/includes/classes/drivers/page/GabaritTemplate.php
    trunk/catalog/index.php
    trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/includes/content/index_listing.php
    trunk/catalog/install/includes/language/fr_FR/osc_status.txt
    trunk/catalog/install/includes/modele/htaccess.txt
    trunk/catalog/install/includes/sql/mysql/data/20_osc_status.sql
    trunk/catalog/install/includes/sql/mysql/tables/osc_categories.sql
    trunk/catalog/install/includes/sql/mysql/tables/osc_content.sql
    trunk/catalog/install/includes/sql/mysql/tables/osc_full_tag.sql

Added Paths:
-----------
    trunk/catalog/common/classes/DataTypes.php
    trunk/catalog/common/classes/datatype_drivers/
    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_customer.php
    trunk/catalog/common/classes/datatype_drivers/Data_diver.php
    trunk/catalog/common/classes/datatype_drivers/Data_error.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/install/includes/sql/mysql/tables/osc_content_extra.sql
    trunk/catalog/install/includes/sql/mysql/upgrade/
    trunk/catalog/install/includes/sql/mysql/upgrade/tables/

Modified: trunk/catalog/admin/includes/appli_top_Test.php
===================================================================
--- trunk/catalog/admin/includes/appli_top_Test.php	2012-03-16 12:20:09 UTC (rev 4083)
+++ trunk/catalog/admin/includes/appli_top_Test.php	2012-03-20 22:23:13 UTC (rev 4084)
@@ -29,6 +29,9 @@
   if (file_exists($rpa.'includes/local/configure.php')) include($rpa.'includes/local/configure.php');
   else require($rpa.'includes/configure.php');
 
+	//force current directory 
+	@chdir(DIR_FS_ADMIN);
+
   // force config in object, by stdclass
   $conf = (object)$conf;
 

Modified: trunk/catalog/admin/includes/application_top.php
===================================================================
--- trunk/catalog/admin/includes/application_top.php	2012-03-16 12:20:09 UTC (rev 4083)
+++ trunk/catalog/admin/includes/application_top.php	2012-03-20 22:23:13 UTC (rev 4084)
@@ -22,6 +22,9 @@
   if (file_exists($rpa.'includes/local/configure.php')) include($rpa.'includes/local/configure.php');
   else require($rpa.'includes/configure.php');
 
+	//force current directory 
+	@chdir(DIR_FS_ADMIN);
+
   // force config in object, by stdclass
   $conf = (object)$conf;
 

Modified: trunk/catalog/admin/includes/classes/navigationHistory.php
===================================================================
--- trunk/catalog/admin/includes/classes/navigationHistory.php	2012-03-16 12:20:09 UTC (rev 4083)
+++ trunk/catalog/admin/includes/classes/navigationHistory.php	2012-03-20 22:23:13 UTC (rev 4084)
@@ -1,10 +1,10 @@
 <?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
 /**
-  @licence GPL 2005-2010  The osCSS developers - osCSS Open Source E-commerce
+  @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.0.9
-  @date  10/06/10, 09:08
+  @version 2.1.1
+  @date  16/03/2012, 09:08
   @author oscim <mail aur...@os...> <www http://www.oscim.fr>
   @encode UTF-8
 */
@@ -25,7 +25,7 @@
     function add_current_page($title='') {
       global $PHP_SELF, $_GET, $_POST, $request_type, $cPath;
 
-      $PHP_SELF=$_SERVER['REQUEST_URI'];
+      $PHP_SELF= (isset($_SERVER['REQUEST_URI'])?$_SERVER['REQUEST_URI'] : $_SERVER['PHP_SELF']);
       $phpself=basename($PHP_SELF);
       $set = 'true';
       for ($i=0, $n=sizeof($this->path); $i<$n; $i++) {

Modified: trunk/catalog/admin/includes/classes/oscss_cstr.php
===================================================================
--- trunk/catalog/admin/includes/classes/oscss_cstr.php	2012-03-16 12:20:09 UTC (rev 4083)
+++ trunk/catalog/admin/includes/classes/oscss_cstr.php	2012-03-20 22:23:13 UTC (rev 4084)
@@ -1,10 +1,10 @@
 <?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
 /**
-  @licence GPL 2005-2011  The osCSS developers - osCSS Open Source E-commerce
+  @licence GPL 2005-2012  The osCSS developers - osCSS Open Source E-commerce
   @portion code Copyright (c) 2002 osCommerce
   @package osCSS-2 <www http://www.oscss.org>
-  @version 2.1.0
-  @date  25/03/11, 15:42
+  @version 2.1.1
+  @date  16/03/2012, 09:08
   @author oscim <mail aur...@os...> <www http://www.oscim.fr>
   @encode UTF-8
   @class oscss_cstr
@@ -45,9 +45,10 @@
       Pile des file de lang
     */
     $this->PileFileLang=array();
-
+	
+		$this->base = (isset($_SERVER['REQUEST_URI'])?basename($_SERVER['REQUEST_URI']) : basename($_SERVER['PHP_SELF']));
     //! key cache file
-    self::$key_file_cache= 'BO_files-'.md5(basename($_SERVER['REQUEST_URI']).(isset($_SESSION['login_firstname'])? $_SESSION['login_firstname']: 'guest'));
+    self::$key_file_cache= 'BO_files-'.md5( $this->base .(isset($_SESSION['login_firstname'])? $_SESSION['login_firstname']: 'guest'));
 
 
 
@@ -193,7 +194,7 @@
   public function cache_lang($load=true){
     global $osCSS_Cache,$lang;
 
-    $key_file= 'BO_lang-'.$this->the_var('languages_id').'-'.md5(basename($_SERVER['REQUEST_URI']).(isset($_SESSION['login_firstname'])? $_SESSION['login_firstname']: 'guest'));
+    $key_file= 'BO_lang-'.$this->the_var('languages_id').'-'.md5($this->base.(isset($_SESSION['login_firstname'])? $_SESSION['login_firstname']: 'guest'));
 
     if($load){
       if ($osCSS_Cache->read($key_file, 3600) ) {

Added: trunk/catalog/common/classes/DataTypes.php
===================================================================
--- trunk/catalog/common/classes/DataTypes.php	                        (rev 0)
+++ trunk/catalog/common/classes/DataTypes.php	2012-03-20 22:23:13 UTC (rev 4084)
@@ -0,0 +1,240 @@
+<?php  if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
+/**
+  @licence GPL 2005-2011  The osCSS developers - osCSS Open Source E-commerce
+  @portion code Copyright (c) 2002 osCommerce
+  @package osCSS-2 <www http://www.oscss.org>
+  @version 2.1.0
+  @date  20/03/11, 17:29
+  @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+  @encode UTF-8
+
+*/
+error_reporting(E_ALL);
+class DataTypes {
+	/**
+    @var repertoire des modules enfants
+  */
+	const PATH = 'datatype_drivers/';
+  /**
+    @var prefix des module enfants
+  */
+	const PREFIX = 'Data_';
+  /**
+    @var environnement execution de cette classe
+  */
+  protected static $env;
+  /**
+    @var ressource id current
+  */
+  protected static $_instance;
+  /**
+    @var current type child module
+  */
+  protected static $currenttype = NULL;
+  /**
+    @var current type child module
+  */
+  protected static $subDataType = NULL;
+  /**
+    @var This var define if RootListing actived and loop for check childs type
+  */
+  public static $ForceChilds = false;
+
+
+
+  /**
+    @brief constructor
+  */
+	protected function __construct(){
+		self::$env = new stdClass();
+
+		self::$env->path_childs = DIR_WS_COMMON_CLASSES . self::PATH ;
+
+// 		$alltype = explode(',',PUBLIC_PAGE_TYPE);
+		$alltype = explode(',',DATATYPES);
+
+
+		foreach($alltype as $test){
+			if(!empty($test)) {
+				$childclass = self::PREFIX.trim($test) ;
+				@include(self::$env->path_childs . $childclass. '.php' );
+				if(!class_exists($childclass))  continue;
+
+
+				self::$env->modlist[$childclass] = $tp = new $childclass();
+// 				self::$env->actived[$childclass] = true;
+				if(isset($tp->RootListing) && count($tp->RootListing) > 0 )
+					self::$env->RootListing[$childclass] = $tp->RootListing; //( ( isset($tp->RootListing) && count($tp->RootListing) > 0 )? $tp->RootListing : false );
+			}
+		}
+
+
+
+	}
+
+
+	/**
+		@brief Get regle anchors in childs module for seo class 
+	*/
+	public static function GetRegAnchor($reg_anchors){
+		self::getInstance();
+
+		foreach(self::$env->modlist as $class=>$module){
+			foreach($module->reg_anchors as $key=>$value)
+				$reg_anchors[$key] = $value;
+		}
+
+		return $reg_anchors;
+	}
+
+	/**
+		@brief return type based on anchors
+		@param $anchors string anchor used in seo and url 
+	*/
+	public static function GetTypeForAnchor($anchors){
+		self::getInstance();
+
+		foreach(self::$env->modlist as $class=>$module){
+			foreach($module->reg_anchors as $key=>$value)
+				if($value == $anchors) return $module->DataType;
+		}
+
+		return false;
+	}
+	/**
+		@brief Get regle anchors in childs module for seo class 
+		@param $anchor
+		@param $substype
+		@param $id
+		@param $language_id
+	*/
+	public static function Getseoquery($anchor, $substype='', $id, $language_id){
+		self::getInstance();
+
+		foreach(self::$env->modlist as $class=>$module){
+
+			if(in_array($anchor, $module->reg_anchors) && method_exists($module,'SeoGetQuery') ) 
+				return $module->SeoGetQuery($anchor, $substype, $id, $language_id);
+		}
+
+		return false;
+	}
+
+
+  /**
+    @brief
+  */
+  public static function getInstance() {
+		if(self::$_instance == null)
+			self::$_instance = new self();
+		return self::$_instance;
+  }
+
+	/**
+		@brief Return currenttype datatype
+	*/
+	public static function GetTypePage(){
+		self::getInstance();
+		return self::$currenttype;
+	}
+
+
+	/**
+		@brief active required childs module datatype used in Rootlisting
+	*/
+	public static function ForceChilds($type = '', $subtype=''){
+		self::getInstance();
+		if(!empty($type)) {
+			/*if(!empty($type))*/ self::$currenttype = $type;
+			if(!empty($subtype)) self::$subDataType = $subtype;
+			self::$ForceChilds = true;
+		}
+		return true ;
+	}
+
+	/**
+		@brief Get ForceChilds statut
+	*/
+	public static function GetForceChilds(){
+		self::getInstance();
+		return self::$ForceChilds;
+	}
+
+  /**
+		@fn DataTypes::is_type($mode='page');
+    @brief execute le control du type, et renvoi l'objet correspondant, sinon renvoi false
+		@param $mode le type de control (page/cpath/seo)
+		@return false or object
+  */
+	public static function is_type($mode='page'){
+		self::getInstance();
+
+		foreach(self::$env->modlist as $class=>$module){
+			if( $module->is_type($mode) ){
+				if(  /*!self::GetForceChilds() && */ in_array($mode, array('unique'/*, 'listing'*/)) )
+					self::$currenttype = $module->DataType;
+				return $module;
+			}
+		}
+
+		return false;
+	}
+
+
+  /**
+    @brief call transversal load in other modules
+		@param $mode le type de control (page/cpath/seo)
+		@return false or object
+  */
+	public static function transversal($mode='transversal', $type=''){
+		self::getInstance();
+
+		if(empty($type))
+			$type = self::$subDataType;
+
+
+		foreach(self::$env->modlist as $class=>$module){
+// 			var_dump($class.$mode.$type);
+			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
+					&& $module->is_type($mode)  // is_type actif
+				){
+
+					$module->FO_load_listing($type);
+
+					$module->FO_load_page($mode);
+				}
+		}
+
+		return false;
+	}
+
+  /**
+    @brief call transversal load in other modules
+		@param $mode le type de control (page/cpath/seo)
+		@return false or object
+  */
+	public static function Preload($mode='preload_root', $type=''){
+		self::getInstance();
+
+		if(empty($type))
+			$type = self::$currenttype;
+
+
+		foreach(self::$env->modlist as $class=>$module){
+			if(
+					 isset(self::$env->RootListing[$class]) && self::$env->RootListing[$class] !=false // this module is RootListing (manufacturer, categories)
+// 					&& in_array($type, $module->RootListing) // RootListing array require content current type
+					&& $module->is_type($mode)  // is_type actif
+				){
+					$module->FO_load_page($mode);
+			}
+		}
+
+		return false;
+	}
+}
+
+
+?>
\ No newline at end of file

Added: trunk/catalog/common/classes/datatype_drivers/Data_categorie.php
===================================================================
--- trunk/catalog/common/classes/datatype_drivers/Data_categorie.php	                        (rev 0)
+++ trunk/catalog/common/classes/datatype_drivers/Data_categorie.php	2012-03-20 22:23:13 UTC (rev 4084)
@@ -0,0 +1,276 @@
+<?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  16/03/2012, 16:16
+    @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+    @encode UTF-8
+
+*/
+
+class Data_categorie {
+
+	/**
+		@var DataType string
+	*/
+	public $DataType = 'categorie';
+
+	/**
+		@var DataType array reg for seo class 
+	*/
+	public $reg_anchors = array(
+			'cPath' 		=> 'c' 
+		);
+
+	/**
+		@var DataType root listing
+			Use  for generate listing based on current data type precised in array
+	*/
+	public $RootListing = array('product', 'content', 'nested');
+
+
+	public function __construct(){
+	}
+
+	/**
+		@brief test si al page est du type produits
+		@param $mode le type de control (page/cpath/seo)
+	*/
+	public function is_type($mode='unique'){
+
+		static $childs_type;
+
+
+		switch(strtolower($mode)){
+
+			case 'preload_root':
+				$page = page::getInstance();
+
+			  if (tep_not_null($page->GetVar('cPath'))) {
+
+					$category_depth = $page->GetVar('category_depth');
+					$current_category_id = $page->GetVar('current_category_id');
+
+
+					//! Recup des element cat en cours
+					categorie::resetCacheId((int)$current_category_id);
+					if( ($categories=categorie::get_item((int)$current_category_id)) ==false){
+						if($current_category_id !=0) $category_depth='nofound' ;
+
+						$categories=new objectInfo(array());
+					}
+
+					if ( ($count_cat=categorie::get_has_category_subcategories((int)$current_category_id)) && $count_cat > 0){
+								$category_depth = 'nested'; // navigate through the categories
+								$dd= explode(',', $categories->datatype);
+								$childs_type = $dd[0];
+								DataTypes::ForceChilds($this->DataType,$childs_type);
+					}
+			//     elseif($current_category_id==0)$category_depth = 'top';
+					else {
+
+						if(in_array('product', explode(',', $categories->datatype) ) || empty($categories->datatype) ){
+							$count_p=categorie::get_count_products_in_category((int)$current_category_id);
+							if ($count_p > 0 ){
+								$category_depth = 'products';
+								$childs_type =  'product';
+								DataTypes::ForceChilds($this->DataType, $childs_type);
+							}
+							else $category_depth = 'empty';
+						}
+						elseif(in_array('content', explode(',', $categories->datatype) ) ){
+							$count_c=categorie::get_count_content_in_category((int)$current_category_id);
+							if ($count_c > 0  ){
+								$category_depth = 'pages';
+								$childs_type =  'content';
+								DataTypes::ForceChilds($this->DataType, $childs_type);
+							}
+							else $category_depth = 'empty';
+						}
+						else
+							$category_depth = 'nofound';
+					}
+
+
+
+					$page->add_var_page('category_depth',$category_depth);
+				}
+
+			break;
+
+			case 'transversal':
+			case 'listing':
+				if( isset($_GET['cPath'])  )
+					return true;
+			break;
+
+			// Mode Display Unique
+			case 'unique':
+				if( isset($_GET['cPath'])  )
+					DataTypes::ForceChilds($this->DataType, $childs_type);
+			break;
+		}
+		return false;
+	}
+
+
+	/**
+		@brief calcul du cpath specifique a ce tyep de donnée
+	*/
+	public function GetcPath(){
+		if( isset($_GET['cPath'])  )
+			return $_GET['cPath'];
+
+		return false;
+	}
+
+	/**
+		@brief Prepare an retrun result Seo request 
+		@param $mode string anchor key used 
+		@param $subtype Not used
+		@param $id integer current id 
+		@param $language_id integer  current language id
+		@return array (
+							ID		=> '',
+							tName => '',
+							head_desc_tag => '',
+							head_keywords_tag =>''
+						)
+	*/
+	public function SeoGetQuery($mode, $subtype, $id, $language_id){
+		$DB=Database::getInstance();
+
+		// convert cpath 12_15 on id current cat 15
+		if(strpos($id,'_')){
+			$id_array = explode('_', $id);
+			$id = $id_array[( count($id_array) -1) ];
+		}
+
+		switch($mode){
+			default:
+			if( _test_bool('SEO_ADD_CAT_PARENT') ){
+				$sql = "SELECT  c.parent_id, cd.categories_name as tName, cd2.categories_name as pName
+									FROM ".TABLE_CATEGORIES." c
+									JOIN ".TABLE_CATEGORIES_DESCRIPTION." cd
+									ON c.categories_id = cd.categories_id AND cd.language_id='".(int)$language_id."'
+									LEFT JOIN ".TABLE_CATEGORIES_DESCRIPTION." cd2
+									ON c.parent_id=cd2.categories_id AND cd2.language_id='".(int)$language_id."'
+									WHERE c.categories_id='".(int)$ID."'
+									LIMIT 1";
+				$rsql = $this->DB->query($sql);
+				$result = $rsql->fetchAssoc();
+				$result['tName']= tep_not_null($result['pName']) ? $result['pName'] . ' ' . $result['tName'] : $result['tName'];
+				$result['sql']=$sql;
+			}
+			else{ 
+				$sql = "SELECT  categories_name as tName FROM ".TABLE_CATEGORIES_DESCRIPTION." WHERE categories_id='".(int)$id."' AND language_id='".(int)$language_id."' LIMIT 1";
+				$rsql = $DB->query($sql);
+				$result = $rsql->fetchAssoc();
+				$result['sql']=$sql;
+			}
+		}
+
+		return $result;
+	}
+
+
+	/**
+		@brief chargement des données transversal
+	*/
+	public function FO_load_listing($type){
+		global $current_category_id, $languages_id, $list;
+		$page = page::getInstance();
+		$category_depth = $page->GetVar('category_depth');
+
+			$this->ChildsType  = $type;
+
+			switch(strtolower($type)){
+					case 'product':
+						if($category_depth == 'nested')
+							$this->listing_sql = "select DISTINCT p.products_id from ".TABLE_PRODUCTS." p, " . TABLE_PRODUCTS_DESCRIPTION . " pd,  " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c, " . TABLE_CATEGORIES . " c WHERE  p.products_status > 0 AND c.categories_id=p2c.categories_id and c.categories_status='1' AND  pd.products_id = p.products_id and pd.language_id = '" . (int)$languages_id . "' and p.products_id = p2c.products_id ".(tep_not_null($list)? " AND  p2c.categories_id IN (" . $list . ")" : '');
+						else
+							$this->listing_sql = "select DISTINCT p.products_id from ".TABLE_PRODUCTS." p, " . TABLE_PRODUCTS_DESCRIPTION . " pd,  " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c, " . TABLE_CATEGORIES . " c WHERE  p.products_status > 0 AND c.categories_id=p2c.categories_id and c.categories_status='1' AND  pd.products_id = p.products_id and pd.language_id = '" . (int)$languages_id . "' and p.products_id = p2c.products_id and c.categories_id = '" . (int)$current_category_id . "' ";
+
+					break;
+
+					case 'content':
+						if($category_depth == 'nested')
+							$this->listing_sql = "select DISTINCT c.content_id  from " . TABLE_CONTENT_DESCRIPTION . " cd, " . TABLE_CONTENT . " c,   " . TABLE_CONTENT_TO_CATEGORIES . " ctc, " . TABLE_CATEGORIES . " cat where cat.categories_id=ctc.categories_id 	and cat.categories_status='1' and c.content_status = '1' and c.content_id = ctc.content_id and cd.content_id = ctc.content_id and cd.language_id = '" . (int)$languages_id . "'  ".(tep_not_null($list)? " AND  p2c.categories_id IN (" . $list . ")" : '');
+						else
+ 							$this->listing_sql = "SELECT c.content_id  from  " . TABLE_CONTENT . " c ".
+// 							" LEFT JOIN  " . TABLE_CONTENT_DESCRIPTION . " cd ON( cd.content_id = c.content_id AND cd.language_id = '" . (int)$languages_id . "'  ) ".
+							" LEFT JOIN  " . TABLE_CONTENT_TO_CATEGORIES . " ctc ON(c.content_id = ctc.content_id ) ".
+							" LEFT JOIN " . TABLE_CATEGORIES . " cat ON(cat.categories_id=ctc.categories_id AND cat.categories_status='1') ".
+							" WHERE  c.content_status = '1' AND cat.categories_id = '" . (int)$current_category_id . "' ".
+// 							" GROUP BY c.content_id ".
+							"";
+					break;
+			}
+	}
+
+	/**
+		@brief calcul du cpath specifique a ce tyep de donnée
+	*/
+	public function FO_load_page($mode='unique'){
+		global  $page_content, $language, $cPath;
+
+		$page = page::getInstance();
+		$DB=Database::getInstance();
+
+		switch(strtolower($mode)){
+			case 'transversal':
+			case 'listing':
+
+
+				$category_depth = $page->GetVar('category_depth');
+				$current_category_id = $page->GetVar('current_category_id');
+
+
+				//! Recup des element cat en cours
+				categorie::resetCacheId((int)$current_category_id);
+				if( ($categories=categorie::get_item((int)$current_category_id)) ==false){
+					if($current_category_id !=0) $category_depth='nofound' ;
+
+					$categories=new objectInfo(array());
+				}
+
+			//! List des categorie enfant
+				$categories_query = $DB->query($sql="select c.categories_id from " . TABLE_CATEGORIES . " c where c.parent_id = '" . (int)$current_category_id . "'  and c.categories_status='1' ");
+				$lis="'" . (int)$current_category_id . "', ";
+				while ($cat= $categories_query->fetchAssoc() ){ $lis .="'".$cat['categories_id']."',"; }
+				$categories->list=$list= $current_category_id;
+
+				$categories->products_total=(isset($count_p)? $count_p : 0 );
+				$categories->contents_total=(isset($count_c)?$count_c:0);
+				$categories->categories_total=(isset($count_cat)?$count_cat:0);
+
+				unset($count_p,$count_c,$count_cat);
+				/**
+					Stock la categories en cours
+					@param array (categories_name, categories_description, categories_image, list,products_total,contents_total,categories_total )
+				*/
+				$page->add_var_page('categories',$categories);
+				$page->add_var_page('category_depth',$category_depth);
+
+				// var use in draw master detail listing
+				$obj = new stdClass();
+				$obj->image = $categories->categories_image;
+				$obj->name = $categories->categories_name;
+				$obj->description = $categories->categories_description;
+				$page->add_var_page('RootListing',$obj);
+			break;
+
+
+			case 'unique':
+
+			break;
+
+		}
+		return ;
+	}
+
+
+}
+?>

Added: trunk/catalog/common/classes/datatype_drivers/Data_content.php
===================================================================
--- trunk/catalog/common/classes/datatype_drivers/Data_content.php	                        (rev 0)
+++ trunk/catalog/common/classes/datatype_drivers/Data_content.php	2012-03-20 22:23:13 UTC (rev 4084)
@@ -0,0 +1,121 @@
+<?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  16/03/2012, 16:16
+    @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+    @encode UTF-8
+*/
+
+class Data_content {
+
+
+	/**
+		@var DataType string
+	*/
+	public $DataType = 'content';
+
+	/**
+		@var DataType array reg for seo class 
+	*/
+	public $reg_anchors = array(
+			'content' 		=> 't' 
+		);
+
+
+	function __construct(){
+	}
+
+	/**
+		@brief test si al page est du type produits
+		@param $mode le type de control (page/cpath/seo)
+	*/
+	function is_type($mode='unique'){
+		switch(strtolower($mode)){
+			case 'listing':
+				$page = page::getInstance();
+				if( $page->GetVar('category_depth') == $this->DataType )
+					return true;
+			break;
+			case 'cpath':
+				if( isset($_GET['content']) && is_numeric($_GET['content']) )
+					return true;
+			break;
+			case 'unique':
+// 			default:
+				if(isset($_GET['content']) && ( is_int($_GET['content']) || is_numeric($_GET['content'])) )
+					return true;
+			break;
+		}
+		return false;
+	}
+
+
+	/**
+		@brief calcul du cpath specifique a ce tyep de donnée
+	*/
+	function GetcPath(){
+		return content::get_content_path($_GET['content']);
+	}
+
+	/**
+		@brief Prepare an retrun result Seo request 
+		@param $mode string anchor key used 
+		@param $subtype Not used
+		@param $id integer current id 
+		@param $language_id integer  current language id
+		@return array (
+							ID		=> '',
+							tName => '',
+							head_desc_tag => '',
+							head_keywords_tag =>''
+						)
+	*/
+	public function SeoGetQuery($mode, $subtype, $id, $language_id){
+		$DB=Database::getInstance();
+
+		switch($mode){
+			case 't':
+			default:
+				$sql = "select ft.page_id as ID, head_title_tag as tName, head_desc_tag, head_keywords_tag from " . TABLE_FULL_TAG . " ft, "  . TABLE_FULL_TAG_DESCRIPTION .  " ftd where ft.tag_id=ftd.tag_id and ft.page_type='".$this->DataType."' and ftd.language_id = '" . (int)$language_id. "' Limit 1";
+				$rsql = $DB->query($sql);
+				if(!$rsql->__get('numRows')) {
+					$sql = "select c.content_id as ID, content_title as tName from " . TABLE_CONTENT . " c LEFT JOIN "  . TABLE_CONTENT_DESCRIPTION .  " cd ON(c.content_id=cd.content_id) where c.content_status = '1' and c.content_id='".(int)$id."' and cd.language_id='".(int)$language_id."' Limit 1" ;
+					$rsql = $DB->query($sql);
+				}
+				$result = $rsql->fetchAssoc();
+				$result['head_desc_tag']=(isset($result['head_desc_tag'])?$result['head_desc_tag']:'');
+				$result['head_keywords_tag']=(isset($result['head_keywords_tag'])?$result['head_keywords_tag']:'');
+
+				$result['sql']=$sql;
+		}
+
+		return $result;
+	}
+
+
+	/**
+		@brief calcul du cpath specifique a ce tyep de donnée
+	*/
+	function FO_load_page(){
+		global $aca_product,$product_info, $page_content, $language, $cPath;
+
+		$page = page::getInstance();
+		$DB=Database::getInstance();
+
+    $page->init('content.php',$language);
+    $breadcrumb=$page->return_object('breadcrumb');
+
+		// call transversal load in other modules
+		DataTypes::transversal('transversal');
+
+    $page_content = $page->force_content('content.php');
+
+		return $page_content;
+	}
+
+
+}
+?>

Added: trunk/catalog/common/classes/datatype_drivers/Data_customer.php
===================================================================
--- trunk/catalog/common/classes/datatype_drivers/Data_customer.php	                        (rev 0)
+++ trunk/catalog/common/classes/datatype_drivers/Data_customer.php	2012-03-20 22:23:13 UTC (rev 4084)
@@ -0,0 +1,81 @@
+<?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  16/03/2012, 16:16
+    @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+    @encode UTF-8
+For active public customer page , delete false
+*/
+
+class Data_customer {
+
+
+	/**
+		@var DataType string
+	*/
+	public $DataType = 'customer';
+
+	/**
+		@var DataType array reg for seo class 
+	*/
+	public $reg_anchors = array(
+			'customers_id' 		=> 'u' 
+		);
+
+
+	function __construct(){
+	}
+
+	/**
+		@brief test si al page est du type produits
+		@param $mode le type de control (page/cpath/seo)
+	*/
+	function is_type($mode='unique'){
+		switch(strtolower($mode)){
+			case 'unique':
+// 			default:
+				if( _cst_bool('CUSTOMER_PUBLIC_PROFIL') &&  isset($_GET['customers_id'])  )
+					return true;
+			break;
+		}
+		return false;
+	}
+
+
+	/**
+		@brief calcul du cpath specifique a ce tyep de donnée
+	*/
+	function GetcPath(){
+		return '';
+	}
+
+
+	/**
+		@brief calcul du cpath specifique a ce tyep de donnée
+	*/
+	function FO_load_page(){
+		global $aca_product,$product_info, $page_content, $language, $cPath;
+
+		$page = page::getInstance();
+		$DB=Database::getInstance();
+
+    $page->init('customers.php',$language);
+    $breadcrumb=$page->return_object('breadcrumb');
+
+    $aca_account=$account=$page->new_class('account',$customer_id);
+    $account=$page->_call('customer','the_customer');
+
+		$page->add_var_page('user_id',$aca_account);
+		$page->add_var_page('user',$aca_account);
+
+    $page_content = $page->force_content('customers.php');
+
+		return $page_content;
+	}
+
+
+}
+?>

Added: trunk/catalog/common/classes/datatype_drivers/Data_diver.php
===================================================================
--- trunk/catalog/common/classes/datatype_drivers/Data_diver.php	                        (rev 0)
+++ trunk/catalog/common/classes/datatype_drivers/Data_diver.php	2012-03-20 22:23:13 UTC (rev 4084)
@@ -0,0 +1,143 @@
+<?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  16/03/2012, 16:16
+    @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+    @encode UTF-8
+    @brief Use gabarit static html in dir content
+	  Or form
+	  OR module aca action and exec
+*/
+
+class Data_diver {
+
+
+	/**
+		@var DataType string
+	*/
+	public $DataType = 'diver';
+
+	/**
+		@var DataType array reg for seo class 
+	*/
+	public $reg_anchors = array(
+			'divers' 		=> 'd' 
+		);
+
+
+	function __construct(){
+	}
+
+	/**
+		@brief test si al page est du type produits
+		@param $mode le type de control (page/cpath/seo)
+	*/
+	function is_type($mode='unique'){
+		switch($mode){
+			case 'unique':
+// 			default:
+				if( (isset($_GET['d']) && $_GET['d'] !='home.php') || isset($_GET['content']) || isset($_GET['aca_mod']) )
+					return true;
+			break;
+		}
+		return false;
+	}
+
+
+	/**
+		@brief calcul du cpath specifique a ce tyep de donnée
+	*/
+	function GetcPath(){
+		return '';
+	}
+
+	/**
+		@brief Prepare an retrun result Seo request 
+		@param $mode string anchor key used 
+		@param $subtype Not used
+		@param $id is string base name  current id 
+		@param $language_id integer  current language id
+		@return array (
+							ID		=> '',
+							tName => '',
+							head_desc_tag => '',
+							head_keywords_tag =>''
+						)
+	*/
+	public function SeoGetQuery($mode, $subtype, $id_string, $language_id){
+		$DB=Database::getInstance();
+
+		switch($mode){
+			default:
+				$sql = "select head_title_tag as tName, head_desc_tag, head_keywords_tag from " . TABLE_FULL_TAG . " ft, "  . TABLE_FULL_TAG_DESCRIPTION .  " ftd where ft.tag_id=ftd.tag_id and ft.page_type='page' and  ft.page_id = '" . basename($id_string). "' and ftd.language_id = '" . (int)$language_id. "' Limit 1";
+				$rsql = $DB->query($sql);
+				$result = $rsql->fetchAssoc();
+				$result['head_desc_tag']='';
+				$result['head_keywords_tag']='';
+
+				$result['sql']=$sql;
+		}
+
+		return $result;
+	}
+
+
+	/**
+		@brief calcul du cpath specifique a ce tyep de donnée
+	*/
+	function FO_load_page(){
+		global $aca_product,$product_info, $page_content, $language, $cPath;
+
+		$page = page::getInstance();
+		$DB=Database::getInstance();
+
+
+   $p=(string)tep_db_prepare_input(basename($_GET['d']));
+
+    $page->init($p,$language);
+    $breadcrumb=$page->return_object('breadcrumb');
+
+		switch ($p){
+	// 	    case 'form.php':
+				case 'contact.php':
+					$pp=substr($p, 0, -strlen($page->ext));
+					$page->new_class($pp);
+					$page_content = $page->force_content($pp.'_'.$page->_call($pp,'the_form').$page->ext);
+					if (isset($_GET['action'])) $page->_call($pp,'action');
+			break;
+			default:
+
+				/** Module aca */
+				if (isset($_GET['aca_mod']) && !is_numeric($_GET['aca_mod']) && isset($_GET['aca_type']) &&  isset($_GET['aca_action'])){
+					$module=(string)tep_db_prepare_input($_GET['aca_mod']);
+					$type=(string)tep_db_prepare_input($_GET['aca_type']);
+					$aca=$page->new_class($type);
+					$aca_module=$page->_call($type,'ret_modules');
+					/* cf content/page.php */
+					$page_content =$page->force_content('unique'.$page->ext);
+
+					if (isset($_GET['action']) ) {
+						$action=(string)tep_db_prepare_input($_GET['action']);
+						if ($aca_module[$module]->check_action($action) ) {
+							/** Exe == true */
+							$aca_module[$module]->after_check_action($action);
+							//               tep_redirect(tep_href_link('product_info.php', tep_get_all_get_params(array('action'))));
+						}
+					}
+
+			}
+			else {
+				if(defined('NAVBAR_TITLE'))
+					$breadcrumb->add(NAVBAR_TITLE, tep_href_link($p));
+			}
+		}
+
+		return $page_content;
+	}
+
+
+}
+?>

Added: trunk/catalog/common/classes/datatype_drivers/Data_error.php
===================================================================
--- trunk/catalog/common/classes/datatype_drivers/Data_error.php	                        (rev 0)
+++ trunk/catalog/common/classes/datatype_drivers/Data_error.php	2012-03-20 22:23:13 UTC (rev 4084)
@@ -0,0 +1,93 @@
+<?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  16/03/2012, 16:16
+    @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+    @encode UTF-8
+    @brief Use gabarit static html in dir content
+	  Or form
+	  OR module aca action and exec
+*/
+
+class Data_error {
+
+
+	/**
+		@var DataType string
+	*/
+	public $DataType = 'error';
+
+	/**
+		@var DataType array reg for seo class 
+	*/
+	public $reg_anchors = array(
+		);
+
+
+	function __construct(){
+	}
+
+	/**
+		@brief test si al page est du type produits
+		@param $mode le type de control (page/cpath/seo)
+	*/
+	function is_type($mode='unique'){
+		switch(strtolower($mode)){
+			case 'error':
+				if( isset($_GET['ServerError']) )
+					return true;
+			break;
+		}
+		return false;
+	}
+
+
+	/**
+		@brief calcul du cpath specifique a ce tyep de donnée
+	*/
+	function GetcPath(){
+		return '';
+	}
+
+
+	/**
+		@brief calcul du cpath specifique a ce tyep de donnée
+	*/
+	function FO_load_page(){
+		global $aca_product,$product_info, $page_content, $language, $cPath;
+
+		$page = page::getInstance();
+		$DB=Database::getInstance();
+
+
+		switch((int)$_GET['ServerError']){
+			case 404:
+				$page->init('404.php',$language);
+				$breadcrumb=$page->return_object('breadcrumb');
+				$page_content = $page->force_content('404.php');
+			break;
+
+			default:
+				/**
+				@remarks Alert and log
+				*/
+				//! gestionnaire d'erreur
+				$errorHandler = osC_ErrorHandler::start();
+				// fichier de log d'erreur http
+				$errorHandler->attachFileWriter(DIR_FS_ROOT_DOCS.'public/logs/server-http.log');
+				trigger_error(sprintf(__FILE__.'::'.__LINE__.' Error type %s :  SERVER: %s', (int)$_GET['ServerError'], print_r($_SERVER, true) ) , E_USER_ERROR);
+
+				header("HTTP/1.0 301 Moved Permanently");
+				tep_redirect(tep_href_link(''));
+		}
+
+
+		return ''/*$page_content*/;
+	}
+
+
+}
+?>

Added: trunk/catalog/common/classes/datatype_drivers/Data_home.php
===================================================================
--- trunk/catalog/common/classes/datatype_drivers/Data_home.php	                        (rev 0)
+++ trunk/catalog/common/classes/datatype_drivers/Data_home.php	2012-03-20 22:23:13 UTC (rev 4084)
@@ -0,0 +1,74 @@
+<?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  16/03/2012, 16:16
+    @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+    @encode UTF-8
+    @brief Use gabarit static html in dir content
+	  Or form
+	  OR module aca action and exec
+*/
+
+class Data_home {
+
+
+	/**
+		@var DataType string
+	*/
+	public $DataType = 'home';
+
+	/**
+		@var DataType array reg for seo class 
+	*/
+	public $reg_anchors = array(
+		);
+
+
+	function __construct(){
+	}
+
+	/**
+		@brief test si al page est du type produits
+		@param $mode le type de control (page/cpath/seo)
+	*/
+	function is_type($mode='unique'){
+		switch(strtolower($mode)){
+			case 'unique':
+				if( !DataTypes::GetForceChilds() )
+					return true;
+			break;
+		}
+		return false;
+	}
+
+
+	/**
+		@brief calcul du cpath specifique a ce tyep de donnée
+	*/
+	function GetcPath(){
+		return '';
+	}
+
+
+	/**
+		@brief calcul du cpath specifique a ce tyep de donnée
+	*/
+	function FO_load_page(){
+		global $aca_product,$product_info, $page_content, $language, $cPath;
+
+		$page = page::getInstance();
+		$DB=Database::getInstance();
+
+
+		$page->init('home.php',$language);
+		$breadcrumb=$page->return_object('breadcrumb');
+
+		return 'home.php';
+	}
+
+
+}
+?>

Added: trunk/catalog/common/classes/datatype_drivers/Data_manufacturer.php
===================================================================
--- trunk/catalog/common/classes/datatype_drivers/Data_manufacturer.php	                        (rev 0)
+++ trunk/catalog/common/classes/datatype_drivers/Data_manufacturer.php	2012-03-20 22:23:13 UTC (rev 4084)
@@ -0,0 +1,171 @@
+<?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  16/03/2012, 16:16
+    @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+    @encode UTF-8
+
+*/
+
+class Data_manufacturer {
+
+	/**
+		@var DataType string
+	*/
+	public $DataType = 'manufacturer';
+
+	/**
+		@var DataType array reg for seo class 
+	*/
+	public $reg_anchors = array(
+			'manufacturers_id' 		=> 'm' 
+		);
+
+	/**
+		@var DataType root listing
+			Use  for generate listing based on current data type precised in array
+	*/
+	public $RootListing = array('product');
+
+
+	function __construct(){
+	}
+
+	/**
+		@brief test si al page est du type produits
+		@param $mode le type de control (page/cpath/seo)
+	*/
+	public function is_type($mode='unique'){
+
+
+		if( isset($_GET['manufacturers_id']) )
+			switch(strtolower($mode)){
+
+				case 'preload_root':
+					$page = page::getInstance();
+
+					$category_depth = $page->GetVar('category_depth');
+
+					if($category_depth == 'top'){
+						$category_depth = 'products';
+						$page->add_var_page('category_depth',$category_depth);
+					}
+				break;
+
+				case 'transversal':
+						return true;
+				break;
+				case 'listing':
+						return true;
+				break;
+				// listing mode, block home page
+				case 'unique':
+						DataTypes::ForceChilds($this->DataType, 'product');
+				break;
+			}
+		return false;
+	}
+
+
+	/**
+		@brief calcul du cpath specifique a ce tyep de donnée
+	*/
+	function GetcPath(){
+		return false;
+	}
+
+	/**
+		@brief Prepare an retrun result Seo request 
+		@param $mode string anchor key used 
+		@param $subtype Not used
+		@param $id integer current id 
+		@param $language_id integer  current language id
+		@return array (
+							ID		=> '',
+							tName => '',
+							head_desc_tag => '',
+							head_keywords_tag =>''
+						)
+	*/
+	public function SeoGetQuery($mode, $subtype, $id, $language_id){
+		$DB=Database::getInstance();
+
+		switch($mode){
+			default:
+				$sql = "SELECT manufacturers_id as ID , manufacturers_name as tName FROM ".TABLE_MANUFACTURERS." WHERE manufacturers_id='".(int)$id."' LIMIT 1";
+				$rsql = $DB->query($sql);
+				$result = $rsql->fetchAssoc();
+				$result['head_desc_tag']='';
+				$result['head_keywords_tag']='';
+
+				$result['sql']=$sql;
+		}
+
+		return $result;
+	}
+
+	/**
+		@brief chargement des données transversal
+	*/
+	function FO_load_listing($type){
+		global $current_category_id, $languages_id;
+		$page = page::getInstance();
+		$category_depth = $page->GetVar('category_depth');
+
+			$this->ChildsType  = $type;
+
+			switch(strtolower($type)){
+					case 'product':
+							$this->listing_sql = "select DISTINCT p.products_id from ".TABLE_PRODUCTS." p, " . TABLE_PRODUCTS_DESCRIPTION . " pd,  " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c, " . TABLE_CATEGORIES . " c WHERE  p.products_status > 0 AND c.categories_id=p2c.categories_id and c.categories_status='1' AND  pd.products_id = p.products_id and pd.language_id = '" . (int)$languages_id . "' and p.products_id = p2c.products_id and manufacturers_id = '" . (int)$_GET['manufacturers_id'] . "' ";
+
+					break;
+			}
+	}
+
+
+
+	/**
+		@brief calcul du cpath specifique a ce tyep de donnée
+	*/
+	function FO_load_page($mode='unique'){
+		global $aca_product,$product_info, $page_content, $language, $cPath;
+
+		$page = page::getInstance();
+		$DB=Database::getInstance();
+
+		switch($mode){
+			case 'transversal':
+			case 'listing':
+			case 'unique':
+
+				/// get the categorie name and put it on the header
+				if (isset($_GET['manufacturers_id'])) {
+
+					$man=$DB->query("select * from " . TABLE_MANUFACTURERS . " m  where m.manufacturers_id = '" . (int)$_GET['manufacturers_id'] . "' ");
+					$manuf= $man->fetchAssoc();
+					tep_db_free_result($man);
+					$image = $manuf['manufacturers_image'];
+					$page->breadcrumb->add($manuf['manufacturers_name'], tep_href_link(FILENAME_DEFAULT, 'manufacturers_id=' . $_GET['manufacturers_id']));
+
+
+					$page->add_var_page('manufacturers',$manuf);
+
+					// var use in draw master detail listing
+					$obj = new stdClass();
+					$obj->image = $manuf['manufacturers_image'];
+					$obj->name = $manuf['manufacturers_name'];
+					$obj->description = false;
+					$page->add_var_page('RootListing',$obj);
+				}
+			break;
+		}
+
+		return $page_content;
+	}
+
+
+}
+?>

Added: trunk/catalog/common/classes/datatype_drivers/Data_product.php
===================================================================
--- trunk/catalog/common/classes/datatype_drivers/Data_product.php	                        (rev 0)
+++ trunk/catalog/common/classes/datatype_drivers/Data_product.php	2012-03-20 22:23:13 UTC (rev 4084)
@@ -0,0 +1,169 @@
+<?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  16/03/2012, 16:16
+    @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+    @encode UTF-8
+*/
+
+class Data_product {
+
+	/**
+		@var DataType string
+	*/
+	public $DataType = 'product';
+
+	/**
+		@var DataType array reg for seo class 
+	*/
+	public $reg_anchors = array(
+			'pID' 				=> 'pi', // popup image product
+			'products_id' => 'p' // unique page prodcuts
+		);
+
+
+
+	function __construct(){
+// 		$this->mode_active = false;
+	}
+
+	/**
+		@brief test si al page est du type produits
+		@param $mode le type de control (page/cpath/seo)
+	*/
+	function is_type($mode='unique'){
+		switch($mode){
+// 			case 'listing':
+// 				$page = page::getInstance();
+// 				if( $page->GetVar('category_depth') == $this->DataType.'s' )
+// 					return true;
+// 			break;
+			case 'cpath':
+				if(isset($_GET['products_id']) && !isset($_GET['manufacturers_id']) )
+					return true;
+			break;
+			case 'unique':
+				if(isset($_GET['products_id']))
+					return true;
+			break;
+		}
+		return false;
+	}
+
+	/**
+		@brief calcul du cpath specifique a ce type de donnée
+		@note this method is called if is_type cpath is true
+	*/
+	function GetcPath(){
+		return product::get_product_path($_GET['products_id']);
+	}
+
+	/**
+		@brief Prepare an retrun result Seo request 
+		@param $mode string anchor key used 
+		@param $subtype Not used
+		@param $id integer current id 
+		@param $language_id integer  current language id
+		@return array (
+							ID		=> '',
+							tName => '',
+							head_desc_tag => '',
+							head_keywords_tag =>''
+						)
+	*/
+	public function SeoGetQuery($mode, $subtype, $id, $language_id){
+		$DB=Database::getInstance();
+
+		switch($mode){
+			case 'pi':
+			case 'p':
+			default:
+			if( _test_bool('SEO_ADD_CAT_PARENT') ){
+				$sql = "SELECT products_name as tName, categories_name as cName FROM ".TABLE_PRODUCTS_DESCRIPTION." p LEFT JOIN ".TABLE_PRODUCTS_TO_CATEGORIES." cd2 ON p.products_id=cd2.products_id JOIN ".TABLE_CATEGORIES_DESCRIPTION." cd ON cd.categories_id = cd2.categories_id AND cd.language_id='".(int)$language_id."'   WHERE p.products_id='".(int)$id."' AND p.language_id='".(int)$language_id."' LIMIT 1";
+				$rsql = $DB->query($sql);
+				$result = $rsql->fetchAssoc();
+				$result['tName']=$result['cName'].'-'.$result['tName'];
+				$result['head_desc_tag']='';
+				$result['head_keywords_tag']='';
+				$result['sql']=$sql;
+			}
+			else{
+				$sql = "SELECT  products_name as tName FROM ".TABLE_PRODUCTS_DESCRIPTION." WHERE products_id='".(int)$id."' AND language_id='".(int)$language_id."' LIMIT 1";
+				$rsql = $DB->query($sql);
+				$result = $rsql->fetchAssoc();
+				$result['head_desc_tag']='';
+				$result['head_keywords_tag']='';
+				$result['sql']=$sql;
+			}
+		}
+
+		return $result;
+	}
+
+
+	/**
+		@brief Unique page Content
+	*/
+	function FO_load_page(){
+		global $aca_product,$product_info, $page_content, $language, $cPath, $languages_id;
+
+		$page = page::getInstance();
+		$DB=Database::getInstance();
+
+
+    $page->init('product_info.php',$language);
+    $breadcrumb=$page->return_object('breadcrumb');
+
+		// call transversal load in other modules
+		DataTypes::transversal('transversal');
+
+    /** init aca module */
+    $aca_product=$page->new_class('product',true);
+
+    if (isset($_GET['action'])) {
+				$action=(string)tep_db_prepare_input($_GET['action']);
+        if ($aca_product->check_action('',$action) ) {
+          $aca_product->after_check_action('',$action);
+          tep_redirect(tep_href_link('product_info.php', tep_get_all_get_params(array('action'))));
+        }
+    }
+
+    //! produit nom trouvé
+    if  ( ($obj_product_info =product_info((int)$_GET['products_id'])) ==false ) tep_redirect(tep_href_link(FILENAME_DEFAULT) );
+    $product_info=arrayInfo($obj_product_info);
+    $page->add_var_page('product_info',$product_info);
+
+    $page->title=$product_info['title'];
+    $breadcrumb->add($product_info['title'], tep_href_link('product_info.php', 'products_id=' . (int)$_GET['products_id'].'&amp;cPath=' . $cPath . ''));
+
+    /**
+      Incremente nbr de vus du produits
+    */
+    $DB->query("update " . TABLE_PRODUCTS_DESCRIPTION . " set products_viewed = products_viewed+1 where products_id = '" . (int)$_GET['products_id'] . "' and language_id = '" . (int)$languages_id . "'");
+
+    /**
+    Specifique au bloite récement vu. Enregistrement désactivier si OSCSS__B_RECENTLY_VIEWED et a false
+    */
+    if($page->_conf_value('OSCSS__B_RECENTLY_VIEWED')) {
+			$recently_viewed = '';
+      if (!tep_session_is_registered('recently_viewed')){
+        tep_session_register('recently_viewed');
+        $recently_viewed = (int)$_GET['products_id'] . ';';
+      }
+      $check_not_duplicate = (int)$_GET['products_id'];
+      $temp_recent = $recently_viewed;
+      if (preg_match('/'.$check_not_duplicate.'/', $temp_recent ) )  $recently_viewed = preg_replace('/'.$check_not_duplicate.'/',"",$temp_recent);
+      $recently_viewed = (int)$_GET['products_id'] . ';' . $recently_viewed ;
+    }
+    $page->product->pile_img[]=$product_info['products_image'];
+    $page_content = $page->force_content('product_info.php');
+
+		return $page_content;
+	}
+
+
+}
+?>

Modified: trunk/catalog/common/classes/seo_url.php
===================================================================
--- trunk/catalog/common/classes/seo_url.php	2012-03-16 12:20:09 UTC (rev 4083)
+++ trunk/catalog/common/classes/seo_url.php	2012-03-20 22:23:13 UTC (rev 4084)
@@ -210,21 +210,12 @@
     $this->timestamp = 0;
 
 
-    // respecter l'ordre
-    $this->reg_anchors= array(
-	    'pID'				=> 'pi',
-	    'products_id' 		=> 'p',
-	    'cPath' 				=> 'c',
-	    'manufacturers_id' 	=> 'm',
-	    'content' 			=> 't',
-	    'divers' 			=> 'd',
-	    'lID' 				=> 'l',
-	    'customers_id' 		=> 'u',
-	    'type_object' 		=> 'to',
-				    );
+		// call childs reg_anchors by datatyep module
+		$this->reg_anchors = DataTypes::GetRegAnchor(array());
+// 	    'type_object' 		=> 'to',
+		$this->reg_anchors['type_object'] = 'to';
 
 
-
     /**
       @remarks mask pour reecriture
       %1$s => key
@@ -256,13 +247,20 @@
 	$this->cache_file = 'seo_urls_v2_';
 	$this->cache_gc();
 
+
+	/**
+		TODO 
+			Prendre en charge un calcul de seuil , au dela duquel le cache se desactive 
+			Rendre ces option de configuration en non editable 
+			Lancer la genertaion du cache de  de maniere systematique 
+	*/
 	if ( _test_bool(self::$USE_SEO_CACHE_PRODUCTS )) $this->generate_products_cache();
 	if ( _test_bool(self::$USE_SEO_CACHE_CATEGORIES)) $this->generate_categories_cache();
     //       if ( _test_bool($this->attributes['USE_SEO_CACHE_MANUFACTURERS'] ) ) $this->generate_manufacturers_cache();
     //       if ( _test_bool($this->attributes['USE_SEO_CACHE_ARTICLES'] ) && defined('TABLE_ARTICLES_DESCRIPTION'))
     //  $this->generate_articles_cache();
 	if ( _test_bool(self::$USE_SEO_CACHE_TOPICS) && defined('TABLE_CONTENT_DESCRIPTION')) $this->generate_topics_cache();
-	$this->generate_divers_cache();
+		$this->generate_divers_cache();
 	if ( _test_bool(self::$USE_SEO_CACHE_LINKS) ) $this->generate_links_cache();
     }
 
@@ -298,17 +296,23 @@
 
   }
 
+	/**
+		@brief singelton 
+	*/
   public static function getInstance($languages_id='') {
     if(empty($languages_id)) global $languages_id;
     if(self::$_instance == null)  self::$_instance = new self($languages_id);
     return self::$_instance;
   }
 
-  public static function resetInstance($languages_id='') {
-    if(empty($languages_id)) global $languages_id;
-    self::$_instance = null;
-    return self::getInstance($languages_id);
-  }
+	/**
+		@brief Reset 
+	*/
+//   public static function resetInstance($languages_id='') {
+//     if(empty($languages_id)) global $languages_id;
+//     self::$_instance = null;
+//     return self::getInstance($languages_id);
+//   }
 
   /**
    * \brief Function to return SEO URL link SEO'd with stock generattion for error fallback
@@ -338,13 +342,13 @@
     $this->performance['TOTAL_TIME'] += $time;
     switch($this->attributes['SEO_URLS_USE_W3C_VALID']){
       case ('true'):
-	if (!isset($_SESSION['customer_id']) && _cst_bool('ENABLE_PAGE_CACHE')) return $link;
-	  else {
-	  return htmlentities($link);
-	}
+				if (!isset($_SESSION['customer_id']) && _cst_bool('ENABLE_PAGE_CACHE')) return $link;
+					else {
+					return htmlentities($link);
+				}
       break;
       case ('false'):
-	return $link;
+				return $link;
       break;
     }
   }
@@ -499,27 +503,22 @@
 
     foreach ($p3 as $key => $value){
         $url='';
-
+			if(!empty($key))
         switch ($key){
 
             case (in_array((string)$key, (array)$check0)):
 							$key = $this->reg_anchors[$key];
 
             case (in_array($key, $check)):
-                $function = 'GetName_'.$key;
+							$resultarray = $this->GetName_generic($key, $value);
 
-                if(method_exists($this,$function)) {
+							if(self::$htexe)
+								$this->transph_header_tag($resultarray);
 
-								$resultarray = $this->$function($value);
 
-								if(self::$htexe)
-									$this->transph_header_tag($resultarray);
+							$url = $this->make_url($page, @$resultarray['tName'], $arflip[$key], $value,  $separator);
 
-
-                $url = $this->make_url($page, $resultarray['tName'], $arflip[$key], $value,  $separator);
-
-                $this->ValidateName($url, $arflip[$key], $value, $connection, $separator);
-                }
+							$this->ValidateName($url, $arflip[$key], $value, $connection, $separator);
 						break;
 
             default:
@@ -530,13 +529,12 @@
                       $id=AbstractHeader_tags::get_prio_cms('home');
                       //! home by cms
                       if(is_int($id)) {
-                          $url = $this->make_url($page, $this->GetName_t($id), "content", $id,  $separator);
+                          $url = $this->make_url($page, DataTypes::Getseoquery('t', '', $id, $this->languages_id) , "content", $id,  $separator);
                           $this->ValidateName($url, "t", $id, $connection, $separator);
                       }
                       //! home  by page content
                       else {
-// 								$url = ''; //
-                          $url = $this->make_url('home', $this->GetName_d('home'), 'divers', 'home',  $separator);
+                          $url = $this->make_url('home', DataTypes::Getseoquery('d', '', 'home', $this->languages_id), 'divers', 'home',  $separator);
                           $this->ValidateName($url, "d", 'home', $connection, $separator);
                       }
                   break;
@@ -646,38 +644,40 @@
     return $current_page;
   }
 
+
   /**
    * \brief Function to get the product name. Use evaluated cache, per page cache, or database query in that order of precedent
-   * @param $pID integer
+   * @param $anchor string key anchor
+   * @param $id integer current id data
    * @return string Stripped anchor text
   */
-  protected function GetName_d($pID){
+  protected function GetName_generic($anchor, $id){
+		$type = DataTypes::GetTypeForAnchor($anchor);
+		$TYPE = strtoupper($type);
+
+			
     switch(true){
-      case (_test_bool(self::$USE_SEO_CACHE_GLOBAL) && isset($this->cache['DIVERS'][$pID])):
+      case (_test_bool(self::$USE_SEO_CACHE_GLOBAL) && isset($this->cache[$TYPE][$id])):
 				$this->performance['CACHE_QUERY_SAVINGS']++;
-				$result = $this->get_cache_id($pID,'','DIVERS');
+				$result = $this->get_cache_id($id,'',$TYPE);
 
-				$result['tName'] = (isset($result['tName'])? $this->strip($result['tName']): $this->strip($pID));
+				$result['tName'] = (isset($result['tName'])? $this->strip($result['tName']): $this->strip($id));
       break;
 
       default:
-			$this->performance['NUMBER_QUERIES']++;
-			$sql = "select head_title_tag as tName, head_desc_tag, head_keywords_tag from " . TABLE_FULL_TAG . " ft, "  . TABLE_FULL_TAG_DESCRIPTION .  " ftd where ft.tag_id=ftd.tag_id and ft.page_type='page' and  ft.page_id = '" . basename($pID). "' and ftd.language_id = '" . (int)$this->languages_id. "' Limit 1";
-				$query=$this->DB->query( $sql );
+				$this->performance['NUMBER_QUERIES']++;
 
-				if ($query->__get('numRows')>0) $result =$query->fetchAssoc();
-				else $result['tName'] = $this->strip($pID);
+				$result = DataTypes::Getseoquery($anchor, '', $id, (int)$this->languages_id );
 
-				$this->get_cache_id($pID,'','DIVERS');
-				$this->performance['QUERIES']['DIVERS'][] = $sql;
-
-			break;
+				$this->get_cache_id($id,$result,$TYPE);
+				$this->performance['QUERIES'][$TYPE][] = $result['sql'];
     }
 
 
     return $result;
   }
 
+
   /**
    * \brief Mise en cache de la table des type page,  / table TABLE_FULL_TAG
    * @return array
@@ -689,36 +689,8 @@
     }
   }
 
-  /**
-   * \brief Function to get the product name. Use evaluated cache, per page cache, or database query in that order of precedent
-   * @author Bobby Easland
-   * @version 1.1
-   * @param $pID integer
-   * @return string Stripped anchor text
-  */
-  private function GetName_l($pID){
-    switch(true){
-      case (_test_bool(self::$USE_SEO_CACHE_GLOBAL) && isset($this->cache['LINKS'][$pID]) ):
-				$this->performance['CACHE_QUERY_SAVINGS']++;
-				$result = $this->get_cache_id($pID,'','LINKS');
-				$result['tName'] = (isset($result['tName'])? $this->strip($result['tName']): $this->strip($pID));
-      break;
-      default:
-				$this->performance['NUMBER_QUERIES']++;
-				$query=$this->DB->query( "select nav_name as tName, l.nav_link_id as ID from " . TABLE_NAVIGATION_LINKS . " l, "  . TABLE_NAVIGATION_LINKS_DESCRIPTION .  " ld where l.nav_link_id=ld.nav_link_id l.nav_link_id = '" . $pID. "' and ld.language_id = '" . (int)$this->languages_id. "' Limit 1" );
-				if ($query->__get('numRows')>0) $result =$query->fetchAssoc();
-				else $result['tName'] = $this->strip($pID);
-				$this->get_cache_id($pID,'','LINKS');
-				$this->performance['QUERIES']['LINKS'][] = $query;
 
-			break;
-    }
 
-
-    return $result;
-  }
-
-
   /**
    * \brief Mise en cache de la table des type page,  / table TABLE_FULL_TAG
    * @return array
@@ -730,61 +702,9 @@
     }
   }
 
-  /**
-   * \brief Alias GetName_p();
-  */
-  private function GetName_pi($pID){
-    return $this->GetName_p($pID);
-  }
 
 
   /**
-   * \brief Function to get the product name. Use evaluated cache, per page cache, or database query in that order of precedent
-   * @author Bobby Easland
-   * @version 1.1
-   * @param $pID integer
-   * @return string Stripped anchor text
-  */
-  private function GetName_p($pID){
-    switch(true){
-//       case (_test_bool(self::$USE_SEO_CACHE_GLOBAL) && isset($this->cache['PRODUCTS'][$pID]) ):
-// 	$this->performance['CACHE_QUERY_SAVINGS']++;
-// 	$result = $this->get_cache_id($pID,'','PRODUCTS');
-// 	$return = (isset($result['tName'])? $this->strip($result['tName']): '');
-//  if(self::$htexe)  $this->transph_header_tag($result);
-//       break;
-      default:
-				$this->performance['NUMBER_QUERIES']++;
-				switch(true){
-					case (_test_bool($this->attributes['SEO_ADD_CAT_PARENT'])):
-
-
-						$rsql = $this->DB->query("SELECT products_name as tName, categories_name as cName FROM ".TABLE_PRODUCTS_DESCRIPTION." p LEFT JOIN ".TABLE_PRODUCTS_TO_CATEGORIES." cd2 ON p.products_id=cd2.products_id JOIN ".TABLE_CATEGORIES_DESCRIPTION." cd ON cd.categories_id = cd2.categories_id AND cd.language_id='".(int)$this->languages_id."'   WHERE p.products_id='".(int)$pID."' AND p.language_id='".(int)$this->languages_id."' LIMIT 1");
-						$result = $rsql->fetchAssoc();
-						$cName = $result['cName'];
-
-						$result['tName']=$result['cName'].'-'.$result['tName'];
-						break;
-					default:
-						$rsql = $this->DB->query("SELECT products_name as tName FROM ".TABLE_PRODUCTS_DESCRIPTION." WHERE products_id='".(int)$pID."' AND language_id='".(int)$this->languages_id."' LIMIT 1");
-						$result = $rsql->fetchAssoc();
-						$cName = $result['tName'];
-						break;
-				}
-				$this->get_cache_id($pID,$result,'PRODUCTS');
-				$this->performance['QUERIES']['PRODUCTS'][] = $rsql;
-
-				$result['tName'] = $this->strip( $result['tName'] );
-			break;
-    }
-
-		if(self::$htexe)
-			$this->transph_header_tag($result);
-
-    return $result;
-  }
-
-  /**
    * \brief Mise en cache des element produits / table TABLE_FULL_TAG
    * @return array
   */
@@ -816,67 +736,18 @@
 				$list = explode('_',$result['categories_cpath']);
 
 				foreach($list as $row )
-					$path .= $this->GetName_c($row).'-';
+					$path .= DataTypes::Getseoquery('c', '', $row, $this->languages_id).'-';
 			}
 
 				$result['path']= $path . ((isset($result['url']) && !empty($result['url']) )?  $result['url'] :  $result['tName']) ;
 
-				$this->get_cache_id($result['ID'],$result,'PRODUCTS');
+				$this->get_cache_i...
 
[truncated message content]

[Oscss-commit] SF.net SVN: oscss:[4083] trunk/catalog/includes

[<os...@us...>]

Revision: 4083
          http://oscss.svn.sourceforge.net/oscss/?rev=4083&view=rev
Author:   oscim
Date:     2012-03-16 12:20:09 +0000 (Fri, 16 Mar 2012)
Log Message:
-----------
correction 

Modified Paths:
--------------
    trunk/catalog/includes/classes/AbstractAcaModule.php
    trunk/catalog/includes/classes/core_page/generic.php
    trunk/catalog/includes/database_tables.php

Modified: trunk/catalog/includes/classes/AbstractAcaModule.php
===================================================================
--- trunk/catalog/includes/classes/AbstractAcaModule.php	2012-03-15 19:40:40 UTC (rev 4082)
+++ trunk/catalog/includes/classes/AbstractAcaModule.php	2012-03-16 12:20:09 UTC (rev 4083)
@@ -4,7 +4,7 @@
   @portion code Copyright (c) 2002 osCommerce
   @package osCSS-2 <www http://www.oscss.org>
   @version 2.1.1
-  @date  01/01/2012, 18:17
+  @date  14/03/2012, 18:17
   @author oscim <mail aur...@os...> <www http://www.oscim.fr>
   @encode UTF-8
   \file AbstractAcaModule.php
@@ -111,8 +111,9 @@
     $list_mod=array();
 
     if(defined($cst)){
-// var_dump($cst);
-      $files_array=explode (';',str_replace(';;',';',constant($cst)));
+			$clean = str_replace(';;',';',constant($cst));
+			if(substr($clean, 0,1) ==';') $clean = substr($clean, 1);
+      $files_array=explode (';',$clean);
       if (tep_not_null($files_array[0])) {
 					reset ($files_array);
 					while (list ($key, $file) = each ($files_array)) {

Modified: trunk/catalog/includes/classes/core_page/generic.php
===================================================================
--- trunk/catalog/includes/classes/core_page/generic.php	2012-03-15 19:40:40 UTC (rev 4082)
+++ trunk/catalog/includes/classes/core_page/generic.php	2012-03-16 12:20:09 UTC (rev 4083)
@@ -1,10 +1,10 @@
 <?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
 /**
-  @licence GPL 2005-2010  The osCSS developers - osCSS Open Source E-commerce
+  @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  23/09/10, 21:46
+  @version 2.1.1
+  @date  14/03/2012, 21:46
   @author oscim <mail aur...@os...> <www http://www.oscim.fr>
   @encode UTF-8
   @class generic
@@ -33,16 +33,18 @@
     foreach(parent::initialise_type('MODULE_GENERIC_INSTALLED','generic') as $class){
       $cl[$class]=new $class ();
       $list_mod[$class] = $cl[$class]->sort_order;
-      asort($list_mod);
-      foreach($list_mod as $class=>$s){
-	$this->modules[$class] =$cl[$class];
-      }
-      unset($cl);unset($list_mod);
     }
+
+		asort($list_mod);
+		foreach($list_mod as $class=>$s){
+			$this->modules[$class] =$cl[$class];
+		}
+		unset($cl);unset($list_mod);
+
   }
 
   /**
-   * \fn getInstance($full=false) 
+   * \fn getInstance($full=false)
    * @param $full
    */
   public static function getInstance($full=false) {
@@ -61,11 +63,11 @@
 
  /**
   * \fn display_view($pID,$class='')
-  * \brief 
+  * \brief
     Affiche module elemennt html
 
     Block principal d'affichage, liste ou vue des élément. Block principal de page
-   
+
   *  @param $pID  int le Id du produits
   *  @param $class string le nom de la class appelé, ou vide pour toutes les class enfants
   */
@@ -120,7 +122,7 @@
   /**
    * \fn display_titre($cID,$format='$s')
    * \brief Affiche bock titre client notifié
-   * @param $cID int 
+   * @param $cID int
    * @param $format string for sprintf
   */
   public function display_titre($cID,$format='$s'){

Modified: trunk/catalog/includes/database_tables.php
===================================================================
--- trunk/catalog/includes/database_tables.php	2012-03-15 19:40:40 UTC (rev 4082)
+++ trunk/catalog/includes/database_tables.php	2012-03-16 12:20:09 UTC (rev 4083)
@@ -94,13 +94,13 @@
   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_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_VIRTUAL',  DB_TABLE_PREFIX .'products_virtual');
 
   define('TABLE_SEO_CACHE', DB_TABLE_PREFIX .  'seo_cache');
   define('TABLE_STATUS',DB_TABLE_PREFIX.'status');

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Oscss-commit] SF.net SVN: oscss:[4082] trunk/catalog/admin/includes/gabarit/products/ desc_base/display_edit.edit.gab

[<os...@us...>]

Revision: 4082
          http://oscss.svn.sourceforge.net/oscss/?rev=4082&view=rev
Author:   oscim
Date:     2012-03-15 19:40:40 +0000 (Thu, 15 Mar 2012)
Log Message:
-----------
mise a niveau du code

Modified Paths:
--------------
    trunk/catalog/admin/includes/gabarit/products/desc_base/display_edit.edit.gab

Modified: trunk/catalog/admin/includes/gabarit/products/desc_base/display_edit.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/products/desc_base/display_edit.edit.gab	2012-03-15 19:39:42 UTC (rev 4081)
+++ trunk/catalog/admin/includes/gabarit/products/desc_base/display_edit.edit.gab	2012-03-15 19:40:40 UTC (rev 4082)
@@ -1,10 +1,10 @@
 <?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
   @package osCSS-2 <www http://www.oscss.org>
-  @version 2.1.0
-  @date  28/12/10, 17:37
+  @version 2.1.1
+  @date  13/03/2012, 17:37
   @author oscim <mail aur...@os...> <www http://www.oscim.fr>
   @encode UTF-8
 */
@@ -14,7 +14,7 @@
   <ul>
     <?php for ($i=0, $n=sizeof($languages); $i<$n; $i++): ?>
       <li>
-	<a href="#products_desc-<?php echo ($i+1) ?>" ><?php echo tep_image(DIR_WS_CATALOG_LANGUAGES . $languages[$i]['directory'] . '/images/' . $languages[$i]['image'], $languages[$i]['name']) . '&nbsp;' . $languages[$i]['name'] ?></a>
+	<a href="#products_desc-<?php echo ($i+1) ?>" ><?php echo tep_language_image( $languages[$i]['directory'] . '/images/' . $languages[$i]['image'], $languages[$i]['name']) . '&nbsp;' . $languages[$i]['name'] ?></a>
       </li>
     <?php endfor; ?>
   </ul>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Oscss-commit] SF.net SVN: oscss:[4081] trunk/catalog

[<os...@us...>]

Revision: 4081
          http://oscss.svn.sourceforge.net/oscss/?rev=4081&view=rev
Author:   oscim
Date:     2012-03-15 19:39:42 +0000 (Thu, 15 Mar 2012)
Log Message:
-----------
correction coquille 
reliquat

Modified Paths:
--------------
    trunk/catalog/admin/includes/classes/menu.php
    trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css

Modified: trunk/catalog/admin/includes/classes/menu.php
===================================================================
--- trunk/catalog/admin/includes/classes/menu.php	2012-03-14 07:16:59 UTC (rev 4080)
+++ trunk/catalog/admin/includes/classes/menu.php	2012-03-15 19:39:42 UTC (rev 4081)
@@ -1,10 +1,10 @@
 <?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
 /**
-  @licence GPL 2005-2010  The osCSS developers - osCSS Open Source E-commerce
+  @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  10/06/10, 09:08
+  @version 2.1.1
+  @date  13/03/2012, 09:08
   @author oscim <mail aur...@os...> <www http://www.oscim.fr>
   @encode UTF-8
   @brief
@@ -18,7 +18,7 @@
     Si $option['for_user'] est precisé alors groupe_id = $option['for_user'], sinon  tep_session_register('login_group_id')
 
  */
-error_reporting(E_ALL);
+
 class menu  {
 
   protected static $exclude=array();

Modified: trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css
===================================================================
--- trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css	2012-03-14 07:16:59 UTC (rev 4080)
+++ trunk/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/sample.css	2012-03-15 19:39:42 UTC (rev 4081)
@@ -61,7 +61,7 @@
 
 /* reset */
 * { margin: 0; padding: 0; }
-b r.clear {height:0; width:0;}**         *
+br.clear {height:0; width:0;}**         *
 /* render html5 elements as block */
 header,
 footer,
@@ -92,6 +92,8 @@
 /* Standard width*/
 #main_container {width:960px;}
 
+
+
 .messageStack *{list-style:none; margin:0; padding:0;}
 .messageStack {margin:5px 0; padding:0;}
 .messageStack li{padding:5px 12px;}
@@ -126,10 +128,10 @@
 form label {width:35%; display:block; float:left;padding:0 1em;}
 form span.inputvalue{display:block; float:left;white-space: nowrap;}
 form select,
-	form input[type=checkbox] ,
-		form input[type=radio] ,
-			form input[type=password] ,
-				form input[type=text] {width:250px;}
+form input[type=checkbox] ,
+form input[type=radio] ,
+form input[type=password] ,
+form input[type=text] {width:250px;}
 
 
 
@@ -141,11 +143,11 @@
 
 				#content {
 					float: right;
-					width: 71.3%;
+					width: 74%;
 					margin:10px 0 10px 0;
-					padding:5px 12px 0 12px;
-
+					padding:5px 0 0 0;
 				}
+				.Type_checkout #content {width:100%; padding-right:0; padding-left:0;}
 
 				aside {
 					float: left;
@@ -153,6 +155,7 @@
 					margin:0;
 					padding:0;
 				}
+				.Type_checkout aside {width:0; display:none;}
 
 				/* article */
 
@@ -181,7 +184,7 @@
 				/* sidebar */
 				aside section {
 					margin: 10px 12px 0 0;
-					padding: 10px 15px;
+					padding: 10px 15px 10px 0;
 				}
 
 				aside section ul {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Oscss-commit] SF.net SVN: oscss:[4080] trunk/catalog/admin/includes/classes

[<os...@us...>]

Revision: 4080
          http://oscss.svn.sourceforge.net/oscss/?rev=4080&view=rev
Author:   oscim
Date:     2012-03-14 07:16:59 +0000 (Wed, 14 Mar 2012)
Log Message:
-----------
correction coquille 

Modified Paths:
--------------
    trunk/catalog/admin/includes/classes/categorieUtility.php

Added Paths:
-----------
    trunk/catalog/admin/includes/classes/drivers/sqlcategoriesextra.php

Modified: trunk/catalog/admin/includes/classes/categorieUtility.php
===================================================================
--- trunk/catalog/admin/includes/classes/categorieUtility.php	2012-03-13 20:51:13 UTC (rev 4079)
+++ trunk/catalog/admin/includes/classes/categorieUtility.php	2012-03-14 07:16:59 UTC (rev 4080)
@@ -1,10 +1,10 @@
 <?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
 /**
-  @licence GPL 2005-2011  The osCSS developers - osCSS Open Source E-commerce
+  @licence GPL 2005-2012  The osCSS developers - osCSS Open Source E-commerce
   @portion code Copyright (c) 2002 osCommerce
   @package osCSS-2 <www http://www.oscss.org>
   @version 2.1.1
-  @date  02/10/11, 10:01
+  @date  13/03/2012, 10:01
   @author oscim <mail aur...@os...> <www http://www.oscim.fr>
   @encode UTF-8
   @class categorieUtility
@@ -184,7 +184,7 @@
     @param $include_deactivated boolean true = status products 1 | false status products null
     @return integer count child products in catg
   */
-  function products_in_category_count($categories_id, $include_deactivated = false) {
+  public static function products_in_category_count($categories_id, $include_deactivated = false) {
     $products_count = 0;
 
     if ($include_deactivated)  $products_query = tep_db_query("select count(*) as total from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c where p.products_id = p2c.products_id and p2c.categories_id = '" . (int)$categories_id . "'");
@@ -206,7 +206,7 @@
     @param $include_deactivated boolean true = status content 1 | false status content null
     @return integer count child content in catg
   */
-  function cms_in_category_count($categories_id, $include_deactivated = false) {
+  public static function cms_in_category_count($categories_id, $include_deactivated = false) {
     $products_count = 0;
 
     if ($include_deactivated)  $products_query = tep_db_query("select count(*) as total from " . TABLE_CONTENT . " p, " . TABLE_CONTENT_TO_CATEGORIES . " p2c where p.content_id = p2c.content_id and p2c.categories_id = '" . (int)$categories_id . "'");

Added: trunk/catalog/admin/includes/classes/drivers/sqlcategoriesextra.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlcategoriesextra.php	                        (rev 0)
+++ trunk/catalog/admin/includes/classes/drivers/sqlcategoriesextra.php	2012-03-14 07:16:59 UTC (rev 4080)
@@ -0,0 +1,171 @@
+<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
+/**
+  @licence GPL 2005-2011  The osCSS developers - osCSS Open Source E-commerce
+  @portion code Copyright (c) 2002 osCommerce
+  @package osCSS-2 <www http://www.oscss.org>
+  @version 2.1.1
+  @date  22/09/11, 20:11
+  @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+  @encode UTF-8
+
+*/
+
+
+
+
+class sqlcategoriesextra
+  implements ModSqlDataDriver{
+
+
+  /**
+    @brief create new ligne in table configuration
+  */
+  public static function create($option){
+
+//     if(!isset($option['key'])) return 'key';
+
+    if(isset($option['id'])) 							$sql_data_array['categories_id'] = $option['id'];
+    if(isset($option['key'])) 						$sql_data_array['cat_key'] = strtoupper($option['key']);
+    if(isset($option['value'])) 			$sql_data_array['cat_value '] = $option['value'];
+
+
+    $res=tep_db_perform(TABLE_CATEGORIES_EXTRA, $sql_data_array);
+
+    if(!$res)
+      return $res;
+    else
+      return $res->__get('insertId');
+  }
+
+
+
+  /**
+    @brief update ligne in table configuration
+  */
+  public static function update($option){
+
+    if(!isset($option['id'])) return ' id';
+
+    $where ='';
+    if(isset($option['id'])) $where .="AND categories_id = '".(int)$option['id']."' ";
+    if(isset($option['key'])) $where .="AND cat_key = '".(string)strtoupper(tep_db_input($option['key']))."' ";
+
+    if(isset($option['id'])) 							$sql_data_array['categories_id'] = $option['id'];
+    if(isset($option['key'])) 						$sql_data_array['cat_key'] = $option['key'];
+    if(isset($option['value'])) 			$sql_data_array['cat_value '] = $option['value'];
+
+
+
+
+    $res=tep_db_perform(TABLE_CATEGORIES_EXTRA, $sql_data_array, 'update' , substr($where,3) );
+
+    return $res;
+  }
+
+  /**
+    @brief load ligne in table configuration
+    @param option array
+		  id => row id int (configuration_id)
+		  key => string key (configuration_key)
+		  group_id => group_id int (configuration_group_id)
+
+    @return
+
+      object(stdClass)[13]
+	public 'id' => string '1' (length=1)
+
+      OR
+	array(
+	object(stdClass)[13]
+	  ...
+	object(stdClass)[13]
+	  ..
+	)
+
+  */
+  public static function fetch($option,$shortkey=false){
+    $DB=Database::getInstance();
+
+    $sql ="";
+    if(isset($option['id'])) $sql .="AND categories_id = '".(int)$option['id']."' ";
+    if(isset($option['key'])) $sql .="AND cat_key = '".(string)strtoupper(tep_db_input($option['key']))."' ";
+
+   $sql ="SELECT * FROM ".TABLE_CATEGORIES_EXTRA." WHERE ".substr($sql,3);
+
+    $res=$DB->query($sql);
+
+    $num = $res->__get('numRows');
+
+    if($num == 1){
+      $result=$res->fetchAssoc();
+      return ((!$shortkey)? $result : self::CleanKey($result));
+    }
+    elseif($num > 1){
+      $array=array();
+
+      foreach($res->fetchAllAssoc() as $result)
+	$array[]= ((!$shortkey)? $result : self::CleanKey($result));
+
+      return $array;
+    }
+
+    return false;
+  }
+
+  /**
+    @brief delete row
+  */
+  public static function delete($option){
+    $DB=Database::getInstance();
+
+    $sql ="";
+    if(isset($option['id'])) $sql .="AND categories_id = '".(int)$option['id']."' ";
+    if(isset($option['key'])) $sql .="AND cat_key = '".(string)tep_db_input($option['key'])."' ";
+
+    if(strlen($sql)==0)
+      return false;
+
+    $sql ="DELETE FROM ".TABLE_CATEGORIES_EXTRA." WHERE ".substr($sql,3);
+
+    $res=$DB->query($sql);
+
+    return $res;
+  }
+
+  /**
+    @fn CleanKey()
+    @brief Clean string name key
+  */
+  private static function CleanKey($array){
+
+      $object= new stdclass();
+
+      foreach($array as $key=>$value){
+
+				$object->$key = $value;
+      }
+
+      return $object;
+  }
+
+  /**
+    @brief
+    @return array empty
+  */
+  public static function Specimen($shortkey=false){
+
+    $par = array(
+	      'categories_id'							=>-1,
+	      'cat_key'						=>'',
+	      'cat_value'			=>'',
+
+	      );
+
+    return ((!$shortkey)? $par : self::CleanKey($par));
+  }
+
+}
+
+
+
+?>
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Oscss-commit] SF.net SVN: oscss:[4079] trunk/catalog

[<os...@us...>]

Revision: 4079
          http://oscss.svn.sourceforge.net/oscss/?rev=4079&view=rev
Author:   oscim
Date:     2012-03-13 20:51:13 +0000 (Tue, 13 Mar 2012)
Log Message:
-----------
correction coquille 

Modified Paths:
--------------
    trunk/catalog/admin/includes/classes/drivers/sqlcategorie.php
    trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.edit.gab
    trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.new.gab
    trunk/catalog/admin/includes/modules/configuration/modprodextra.php
    trunk/catalog/admin/includes/template/oscss/stylesheet-1.css
    trunk/catalog/includes/classes/drivers/data/product.php

Modified: trunk/catalog/admin/includes/classes/drivers/sqlcategorie.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlcategorie.php	2012-03-13 16:58:33 UTC (rev 4078)
+++ trunk/catalog/admin/includes/classes/drivers/sqlcategorie.php	2012-03-13 20:51:13 UTC (rev 4079)
@@ -312,7 +312,7 @@
 
     if ($duplicate_image['total'] < 2) {
       if (file_exists(DIR_FS_CATALOG_IMAGES . $category_image['categories_image'])) {
-	@unlink(DIR_FS_CATALOG_IMAGES . $category_image['categories_image']);
+				@unlink(DIR_FS_CATALOG_IMAGES . $category_image['categories_image']);
       }
     }
 
@@ -321,8 +321,9 @@
 
     // child tables cats
     $DB->query("delete from " . TABLE_CATEGORIES_DESCRIPTION . " where categories_id = '" . (int)$_id . "'");
-    $DB->query("delete from " . TABLE_CATEGORIES_EXTRA . " where categories_id = '" . (int)$_id . "'");
 
+		sqlcategoriesextra::delete(array('id'=>(int)$_id));
+
     // master table cats
     $DB->query("delete from " . TABLE_CATEGORIES . " where categories_id = '" . (int)$_id . "'");
 
@@ -449,9 +450,9 @@
 
 
     foreach($cat as $k => $v)
-      if($cat[(int)$v] == $k){
-	$DB->query("UPDATE " . TABLE_CATEGORIES . " SET parent_id = ".ORPHELIN_COLLECTOR."  WHERE categories_id = '" . (int)$k . "' ");
-	$DB->query("UPDATE " . TABLE_CATEGORIES . " SET parent_id = ".ORPHELIN_COLLECTOR."  WHERE categories_id = '" . (int)$v . "' ");
+      if(isset($cat[(int)$v]) && $cat[(int)$v] == $k){
+				$DB->query("UPDATE " . TABLE_CATEGORIES . " SET parent_id = ".ORPHELIN_COLLECTOR."  WHERE categories_id = '" . (int)$k . "' ");
+				$DB->query("UPDATE " . TABLE_CATEGORIES . " SET parent_id = ".ORPHELIN_COLLECTOR."  WHERE categories_id = '" . (int)$v . "' ");
       }
   }
 
@@ -465,10 +466,10 @@
       $object= new stdclass();
 
       foreach($array as $key=>$value){
-	if( strpos($key,'categories_') ===0)
-	  $key=substr($key,11);
+				if( strpos($key,'categories_') ===0)
+					$key=substr($key,11);
 
-	$object->$key = $value;
+				$object->$key = $value;
       }
 
       return $object;

Modified: trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.edit.gab	2012-03-13 16:58:33 UTC (rev 4078)
+++ trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.edit.gab	2012-03-13 20:51:13 UTC (rev 4079)
@@ -10,7 +10,6 @@
   @brief gabarit for listing extra fields products
 
 */
-
 global $action, $languages;
 ?>
 	<div class="box_unique">
@@ -20,7 +19,7 @@
 
       <p>
 				<?php echo    tep_draw_hidden_field('value_list','value_list', (((int)modprodextra::$cInfo->epf_uses_value_list==1)? '1' : '0')) ?>
-				<?php echo    tep_draw_hidden_field('epf_active_for_language','epf_active_for_language', (((int)modprodextra::$cInfo->epf_active_value_language==1)? '1' : '0')) ?>
+				<?php echo    tep_draw_hidden_field('epf_active_value_language','epf_active_value_language', (((int)modprodextra::$cInfo->epf_active_value_language==1)? '1' : '0')) ?>
       </p>
 
 

Modified: trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.new.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.new.gab	2012-03-13 16:58:33 UTC (rev 4078)
+++ trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.new.gab	2012-03-13 20:51:13 UTC (rev 4079)
@@ -42,9 +42,9 @@
 
 
       <p class="block_input">
-				<label for="epf_active_for_language" title="<?php echo __('ENTRY_ACTIVE_HELP') ?>"><?php echo __('ENTRY_ACTIVE') ?></label>
-				<?php echo  tep_draw_radio_field('epf_active_for_language' ,'epf_active_for_language' , '1',  (((int)modprodextra::$cInfo->epf_active_value_language==1)? true : false)  ) . '&nbsp;' . __('text yes') .
-	    '&nbsp;' . tep_draw_radio_field('epf_active_for_language' ,'epf_active_for_language', '0', (((int)modprodextra::$cInfo->epf_active_value_language==0)? true : false) ) . '&nbsp;' . __('text no'); ?>
+				<label for="epf_active_value_language" title="<?php echo __('ENTRY_ACTIVE_HELP') ?>"><?php echo __('ENTRY_ACTIVE') ?></label>
+				<?php echo  tep_draw_radio_field('epf_active_value_language' ,'epf_active_value_language' , '1',  (((int)modprodextra::$cInfo->epf_active_value_language==1)? true : false)  ) . '&nbsp;' . __('text yes') .
+	    '&nbsp;' . tep_draw_radio_field('epf_active_value_language' ,'epf_active_value_language', '0', (((int)modprodextra::$cInfo->epf_active_value_language==0)? true : false) ) . '&nbsp;' . __('text no'); ?>
       </p>
 
 

Modified: trunk/catalog/admin/includes/modules/configuration/modprodextra.php
===================================================================
--- trunk/catalog/admin/includes/modules/configuration/modprodextra.php	2012-03-13 16:58:33 UTC (rev 4078)
+++ trunk/catalog/admin/includes/modules/configuration/modprodextra.php	2012-03-13 20:51:13 UTC (rev 4079)
@@ -86,7 +86,7 @@
 
 						$value_list =(int)$_POST['epf_input_type'];
 
-						$lactive = ($_POST['epf_active_for_language'] == '0') ? 0 : 1;
+					$lactive = (!isset($_POST['epf_active_value_language']) || (int)$_POST['epf_active_value_language'] ==0) ? 0 : 1;
 				}
 				catch(Exception $e){
 					$messageStack->add($e->getMessage(), 'error');
@@ -94,7 +94,7 @@
 				}
 
 
-				self::$eid = sqlproductsextrafields::create(array('input_type' => $value_list, 'status'=>0));
+				self::$eid = sqlproductsextrafields::create(array('input_type' => $value_list, 'status'=>0, 'active_value_language'=>$lactive ));
 
 
 				tep_redirect(tep_href_link(self::FILENAME,FILENAME_CFG_34.'&action=edit&eid=' . self::$eid));
@@ -145,7 +145,7 @@
 					}
 
 // 					if (!isset($_POST['epf_active_for_language'])) throw new Exception(ERROR_ENTRY_REQUIRED . ENTRY_ACTIVE );
-					$lactive = (!isset($_POST['active_value_language'])) ? 0 : 1;
+					$lactive = (!isset($_POST['epf_active_value_language']) || (int)$_POST['epf_active_value_language'] ==0) ? 0 : 1;
 
 					sqlproductsextrafields::Specimen();
 					$specimen = sqlproductsextrafieldslabels::Specimen();

Modified: trunk/catalog/admin/includes/template/oscss/stylesheet-1.css
===================================================================
--- trunk/catalog/admin/includes/template/oscss/stylesheet-1.css	2012-03-13 16:58:33 UTC (rev 4078)
+++ trunk/catalog/admin/includes/template/oscss/stylesheet-1.css	2012-03-13 20:51:13 UTC (rev 4079)
@@ -382,8 +382,9 @@
 #central form p select,
 #central form p input[type="text"] { margin:5px 15px; min-width:200px; }
 /* #central form p input[type="radio"], */
-#central form p input[type="checkbox"] { float:right; margin:5px 15px; width:20px; }
+/* #central form p input[type="checkbox"] { float:right; /*margin:5px 15px; width:20px;*/ } */
 
+#central form .input-multi input[type="checkbox"],
 #central form .input-multi input[type="radio"]{float:none;}
 
 #central form#configuration p input[type="text"] { margin:5px 15px;width:60%; }
@@ -521,6 +522,8 @@
 .adminBlock,
 .box {float:left;margin:10px;background:#e4e4e4 url(../../../images/back.jpg) repeat-x;}
 
+.box ol {padding-left:25px;}
+
 div.box table.dataTableBase tr th {    height: 20px; line-height: 20px;}
 .adminBlock h3,
 .box h3 { margin: 0;height:15px; background:transparent url(img/1/menu_bg.jpg) repeat-x ; padding:0.3em;}

Modified: trunk/catalog/includes/classes/drivers/data/product.php
===================================================================
--- trunk/catalog/includes/classes/drivers/data/product.php	2012-03-13 16:58:33 UTC (rev 4078)
+++ trunk/catalog/includes/classes/drivers/data/product.php	2012-03-13 20:51:13 UTC (rev 4079)
@@ -164,7 +164,7 @@
   public static function get_attributes_weight($products_id, $attributes=array()) {return productData::get_attributes_weight($products_id, $attributes); }
 //   public static function get_product_path($id){ return productData::get_product_path($id); }
 
-  public static function get_extra_product($products_id) {return productData::get_extra_product($products_id); }
+  public static function get_extra_product($products_id, $key='') {return productData::get_extra_product($products_id, $key); }
 }
 
 
@@ -335,14 +335,15 @@
                 )
 	)
   */
-  public static function get_extra_product($product_id){
+  public static function get_extra_product($product_id, $key=''){
     $array= array();
 
-    if(isset(self::$object_data[(int)$product_id]) && isset(self::$object_data[(int)$product_id]->extra) )$array= self::$object_data[(int)$product_id]->extra;
+    if(isset(self::$object_data[(int)$product_id]) && isset(self::$object_data[(int)$product_id]->extra) && empty($key) )$array= self::$object_data[(int)$product_id]->extra;
     else {
       $DB=Database::getInstance();
       $array=array();
-      $epf_query = $DB->query("SELECT e.epf_id, e.epf_input_type,e.epf_key, epf_show_in_listing, epf_advanced_search, e.epf_active_value_language , l.epf_label, l.epf_format as input_format,  p2epf.products_extra_fields_value as value FROM " . TABLE_PRODUCTS_TO_PRODUCTS_EXTRA_FIELDS . " p2epf , " . TABLE_PRODUCTS_EXTRA_FIELDS . " e JOIN " . TABLE_PRODUCTS_EXTRA_FIELDS_LABELS . " l ON e.epf_id = l.epf_id  WHERE p2epf.products_extra_fields_id=e.epf_id AND products_id = '" . (int)$product_id . "' AND l.languages_id='".self::$lg_id."' AND epf_special_mod=''  ");
+			$sql = "SELECT e.epf_id, e.epf_input_type,e.epf_key, epf_show_in_listing, epf_advanced_search, e.epf_active_value_language , l.epf_label, l.epf_format as input_format,  p2epf.products_extra_fields_value as value FROM " . TABLE_PRODUCTS_TO_PRODUCTS_EXTRA_FIELDS . " p2epf , " . TABLE_PRODUCTS_EXTRA_FIELDS . " e JOIN " . TABLE_PRODUCTS_EXTRA_FIELDS_LABELS . " l ON e.epf_id = l.epf_id  WHERE p2epf.products_extra_fields_id=e.epf_id AND products_id = '" . (int)$product_id . "' AND l.languages_id='".self::$lg_id."' AND epf_special_mod='".$key."'  " ; 
+      $epf_query = $DB->query($sql);
 
       while( $e = $epf_query->fetchAssoc() ) {
 
@@ -408,7 +409,7 @@
 
 		$a = explode(',',$values);
 		foreach($a as $r)
-			if(!empty($r))$val .=$r.",";
+			if(!empty($r))$val .=(int)$r.",";
 
 		if(strlen($val) <= 0)
 			return '';
@@ -417,7 +418,7 @@
 		$result = $val->fetchAllAssoc();
 
 		foreach($result as $r)
-			$s .=$r .$separator;
+			$s .=$r['value'] .$separator;
 
 		return substr($s, 0, -1);
 	}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Oscss-commit] SF.net SVN: oscss:[4078] trunk/catalog

[<os...@us...>]

Revision: 4078
          http://oscss.svn.sourceforge.net/oscss/?rev=4078&view=rev
Author:   oscim
Date:     2012-03-13 16:58:33 +0000 (Tue, 13 Mar 2012)
Log Message:
-----------
correction coquille 
reorganisation du menu de configuration et developpement d'un niveau supplementaire 
Ajustement de la config lors de l'installation 
re-utilisation de la colonne group_group_id , 0 : lien , 1 : ss menu
Ajustement du dashbord et widget pour le nouveau menu option des produits et centralisation des config des produits

Modified Paths:
--------------
    trunk/catalog/Documents/admin/data/dashboard.xml
    trunk/catalog/admin/includes/boxes/01_configuration.php
    trunk/catalog/admin/includes/functions/lib.configuration.php
    trunk/catalog/admin/includes/languages/fr_FR/boxes/01_configuration.php
    trunk/catalog/admin/includes/languages/fr_FR/widget/HelpConfig.txt
    trunk/catalog/admin/includes/languages/fr_FR/widget/SsMenuConfig.txt
    trunk/catalog/admin/includes/modules/configuration/modstatus.php
    trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration_group.sql

Removed Paths:
-------------
    trunk/catalog/admin/includes/modules/configuration/cfg_35.php

Modified: trunk/catalog/Documents/admin/data/dashboard.xml
===================================================================
--- trunk/catalog/Documents/admin/data/dashboard.xml	2012-03-12 20:44:03 UTC (rev 4077)
+++ trunk/catalog/Documents/admin/data/dashboard.xml	2012-03-13 16:58:33 UTC (rev 4078)
@@ -60,6 +60,14 @@
     </right>
   </configuration>
 
+	<config_35>
+    <left>
+			<widget>HelpConfig</widget>
+    </left>
+    <right>
+    	<widget>SsMenuConfig</widget>
+    </right>
+  </config_35>
   
   <config_100>
     <left>

Modified: trunk/catalog/admin/includes/boxes/01_configuration.php
===================================================================
--- trunk/catalog/admin/includes/boxes/01_configuration.php	2012-03-12 20:44:03 UTC (rev 4077)
+++ trunk/catalog/admin/includes/boxes/01_configuration.php	2012-03-13 16:58:33 UTC (rev 4078)
@@ -1,18 +1,57 @@
 <?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  23/10/11, 17:06
+  @date  13/03/2012, 17:06
   @author oscim <mail aur...@os...> <www http://www.oscim.fr>
   @encode UTF-8
 */
-  $configuration_groups_query = tep_db_query("SELECT configuration_group_id AS cgID, configuration_group_title AS cgTitle ,configuration_group_parentid AS gparentID from " . TABLE_CONFIGURATION_GROUP . " ORDER BY configuration_group_parentid ,  sort_order ASC");
 
-  while ($configuration_groups = tep_db_fetch_array($configuration_groups_query)) {
-      if ($configuration_groups['gparentID'] =='0') $tabl_link[$configuration_groups['cgID']]= array('ss_menu', $configuration_groups['cgTitle'], 'config_'.$configuration_groups['cgID'], @$img['config_'.$configuration_groups['cgID']]);
-      else $tabl_link[$configuration_groups['gparentID']][4][]= array(FILENAME_CONFIGURATION.'?gparentID=' . $configuration_groups['gparentID'].'&amp;gID=' . $configuration_groups['cgID'], $configuration_groups['cgTitle'], 'config_'.$configuration_groups['cgID'], @$img['config_'.$configuration_groups['cgID']]);
+/* Construct menu based on table configuration_group */
+  $_query = tep_db_query("SELECT configuration_group_id AS cgID, configuration_group_title AS cgTitle ,configuration_group_parentid AS gparentID, configuration_group_group_id as is_sub_menu from " . TABLE_CONFIGURATION_GROUP . " ORDER BY configuration_group_parentid ASC ,  sort_order ASC");
+
+	// construct structur and hierarchie
+	foreach($_query->fetchAllAssoc() as $row){
+		$trace[$row['cgID']] = $row['gparentID'];
+		if ((int)$row['gparentID'] ==0) 
+			$tabl_link[$row['cgID']]= array(
+																	'ss_menu', 
+																	$row['cgTitle'], 
+																	'config_'.$row['cgID'], 
+																	@$img['config_'.$row['cgID']]
+																);
+		elseif((int)$row['is_sub_menu'] ==1 /*&&*/ ){
+				$tabl_link[$row['gparentID']][4][$row['cgID']]= array(
+																							'ss_menu',
+																							$row['cgTitle'], 
+																							'config_'.$row['cgID'], 
+																							@$img['config_'.$row['cgID']]
+																						);
+			}
+		
+	}
+
+	// peuple by link page 
+	foreach($_query->fetchAllAssoc() as $row){
+		if((int)$row['is_sub_menu'] !=1 && (int)$row['gparentID'] !=0) {
+				if( (int)$trace[$row['gparentID']] == 0 ) 
+					$tabl_link[$row['gparentID']][4][$row['cgID']]= array(
+																								FILENAME_CONFIGURATION.'?gparentID=' . $row['gparentID'].'&amp;gID=' . $row['cgID'], 
+																								$row['cgTitle'], 
+																								'config_'.$row['cgID'], 
+																								@$img['config_'.$row['cgID']] 
+																							);
+				else
+					$tabl_link[(int)$trace[$row['gparentID']]][4][(int)$row['gparentID']][4][]= array(
+																											FILENAME_CONFIGURATION.'?gparentID='. $row['gparentID'] . '&amp;gID=' . $row['cgID'],
+																											$row['cgTitle'], 
+																											'config_'.$row['cgID'], 
+																											@$img['config_'.$row['cgID']] 
+																										);
+
+		}
   }
 
 /* taxe et zone de taxe*/
@@ -21,4 +60,5 @@
   $tabl_link[130][4][]= array(FILENAME_GEO_ZONES, 'BOX_TAXES_GEO_ZONES', 'taxes_geo_zone');
   $tabl_link[130][4][]= array(FILENAME_TAX_CLASSES, 'BOX_TAXES_TAX_CLASSES', 'taxes_classes');
 
+
 ?>
\ No newline at end of file

Modified: trunk/catalog/admin/includes/functions/lib.configuration.php
===================================================================
--- trunk/catalog/admin/includes/functions/lib.configuration.php	2012-03-12 20:44:03 UTC (rev 4077)
+++ trunk/catalog/admin/includes/functions/lib.configuration.php	2012-03-13 16:58:33 UTC (rev 4078)
@@ -4,18 +4,20 @@
   @portion code Copyright (c) 2002 osCommerce
   @package osCSS-2 <www http://www.oscss.org>
   @version 2.1.1
-  @date  12/03/2012, 23:12
+  @date  13/03/2012, 23:12
   @author oscim <mail aur...@os...> <www http://www.oscim.fr>
   @encode UTF-8
 */
 
 /**
-  Construction d'un sous menu des page de configuration, s'appuiyant sur la valeur de l'id parent.
+  @brief Construction d'un sous menu des page de configuration, s'appuiyant sur la valeur de l'id parent.
+	@param $parent_id int  parent id
+	@param $option array  other option
 */
 function tep_ssmenu_configuration($parent_id,$option=''){
   $format_line_ssmenu= (isset($option['format_line_ssmenu']))  ? $option['format_line_ssmenu'] : "%1\$s"; //'<li class="'."%2\$s".'">'."%1\$s".'</li>' ."\n";
   $link='';
-  $configuration_groups_query = tep_db_query("SELECT configuration_group_id AS cgID, configuration_group_title AS cgTitle from " . TABLE_CONFIGURATION_GROUP . " WHERE configuration_group_group_id LIKE '".$_SESSION['login_groups_id']."' AND configuration_group_parentid  ='".$parent_id."' ORDER BY configuration_group_parentid ,  sort_order ASC");
+  $configuration_groups_query = tep_db_query("SELECT configuration_group_id AS cgID, configuration_group_title AS cgTitle from " . TABLE_CONFIGURATION_GROUP . " WHERE  configuration_group_parentid  ='".$parent_id."' ORDER BY configuration_group_parentid ,  sort_order ASC");
 
   while ($configuration_groups = tep_db_fetch_array($configuration_groups_query)) {
       $link .=sprintf($format_line_ssmenu,

Modified: trunk/catalog/admin/includes/languages/fr_FR/boxes/01_configuration.php
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/boxes/01_configuration.php	2012-03-12 20:44:03 UTC (rev 4077)
+++ trunk/catalog/admin/includes/languages/fr_FR/boxes/01_configuration.php	2012-03-13 16:58:33 UTC (rev 4078)
@@ -60,8 +60,7 @@
 define('BOX_HEADING_CONF_TEMPLATE',"Template" );
 define('BOX_HEADING_CONF_BOX_CONFIGURATION_ENVIRONEMENT',"Environement" );
 define('BOX_HEADING_CONF_TITLE_BOX_CONFIGURATION_ENVIRONEMENT',"Environement" );
-
 define('BOX_HEADING_CONF_CONFIGURATION_ORDERS',"Option des commandes" );
-
 define('BOX_HEADING_CONF_BOX_CONFIGURATION_ABONNEMENT',"Option des Abonnements" );
+define('BOX_HEADING_CONF_OPTION_PRODUCTS',"Option des produits" );
 ?>
\ No newline at end of file

Modified: trunk/catalog/admin/includes/languages/fr_FR/widget/HelpConfig.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/widget/HelpConfig.txt	2012-03-12 20:44:03 UTC (rev 4077)
+++ trunk/catalog/admin/includes/languages/fr_FR/widget/HelpConfig.txt	2012-03-13 16:58:33 UTC (rev 4078)
@@ -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  25/10/11, 11:00
+  @date  13/03/2012, 11:00
   @author oscim <mail aur...@os...> <www http://www.oscim.fr>
   @encode UTF-8
 */
 
+$lang['widget help config config_35']="Configuration des produits" ;
 $lang['widget help config config_110']="Configuration de base" ;
 $lang['widget help config config_100']="Configuration de l'apparence" ;
 $lang['widget help config config_120']="Configuration avancée" ;

Modified: trunk/catalog/admin/includes/languages/fr_FR/widget/SsMenuConfig.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/widget/SsMenuConfig.txt	2012-03-12 20:44:03 UTC (rev 4077)
+++ trunk/catalog/admin/includes/languages/fr_FR/widget/SsMenuConfig.txt	2012-03-13 16:58:33 UTC (rev 4078)
@@ -1,13 +1,14 @@
 <?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  25/10/11, 11:00
+  @date  13/03/2012, 11:00
   @author oscim <mail aur...@os...> <www http://www.oscim.fr>
   @encode UTF-8
 */
+$lang['widget ssmenuconfig config_35']="Menu" ;
 $lang['widget ssmenuconfig config_110']="Menu" ;
 $lang['widget ssmenuconfig config_100']="Menu" ;
 $lang['widget ssmenuconfig config_120']="Menu" ;

Deleted: trunk/catalog/admin/includes/modules/configuration/cfg_35.php
===================================================================
--- trunk/catalog/admin/includes/modules/configuration/cfg_35.php	2012-03-12 20:44:03 UTC (rev 4077)
+++ trunk/catalog/admin/includes/modules/configuration/cfg_35.php	2012-03-13 16:58:33 UTC (rev 4078)
@@ -1,102 +0,0 @@
-<?php
-/**
-  @licence GPL 2005-2010  The osCSS developers - osCSS Open Source E-commerce
-  @package oscss-2 <www http://www.oscss.org>
-  @version 2.1.0
-  @date  15/11/10, 11:28
-  @author oscim <mail aur...@os...> <www http://www.oscim.fr>
-  @encode UTF-8
-
-  @class cfg_35
-
-  Gestion des textes pour les commentaire et detail lors des reponses au retour
-
-*/
-
-Class cfg_35{
-
-  public static $languages;
-
-  public static $textes;
-
-  /**
-    Le contructeur, init la class, et ce charge de l'appel vers le fichier de langues
-  */
-  function __construct(){
-
-    $this->code='cfg_35';
-
-    global $messageStack, $language,$oscss;
-
-    $oscss->pile_file_lang(DIR_FS_ADMIN.DIR_WS_LANGUAGES.$language.'/modules/configuration/'.$this->code.'.txt');
-
-    self::$languages = tep_get_languages();
-  }
-
-
-  /**
-    Action en remplacement des action par defaut
-  */
-  public function draw_action(){
-    global $action,$messageStack,$oscss;
-
-    $row = $this->load_db_values();
-    $DB=Database::getInstance();
-
-    switch ($action) {
-    case 'save':
-        for ($i=0, $n=sizeof(self::$languages); $i<=$n; $i++) {
-	  $aboutus = tep_db_prepare_input($_POST['aboutus'][$i]);
-          $check = $DB->query("replace into " . TABLE_RETURNS_TEXT . " values (1, '" . $i . "', '"  . $aboutus ."')");
-        }
-
-        if (!$check) $messageStack->add(ERROR_ERROR_DB, 'error');
-        else tep_redirect(tep_href_link(FILENAME_RETURNS_TEXT));
-    break;
-    default:
-      $oscss->_add_ext(BO_WISIWYG_SELECTED,'editeur/');
-      for ($i=0, $n=sizeof(self::$languages); $i<$n; $i++) {
-        echo $oscss->_call(BO_WISIWYG_SELECTED,'_top','aboutus[' . self::$languages[$i]['id'] . ']','600','400');
-      }
-    }
-
-  }
-
-  /**
-    Ce charge appel db pour recuperer les valeurs
-  */
-  public function load_db_values(){
-    global $action,$languages_id;
-      $DB=Database::getInstance();
-      $sql=$DB->query("SELECT * FROM ".TABLE_RETURNS_TEXT." where return_text_id = '1' ");
-      for ($i=0, $n=sizeof(self::$languages); $i<$n; $i++) {
-        $row[$i]=$sql->fetchAssoc();
-      }
-    return $row;
-  }
-
-  /**
-    Appelé dans le header de page
-  */
-  public static function draw_header(){
-    echo '<script type="text/javascript"><!--'."\n".
-    '$(function() {'."\n".
-      "$('.tabs_lang').tabs().find('.ui-tabs-nav').sortable({axis:'x'});"."\n".
-    '});'."\n".
-    '// --></script>'."\n";
-  }
-
-  /**
-    Contenu central
-  */
-  public function draw(){
-    global $action,$gparentID,$current_theme, $oscss;
-    self::$textes = $this->load_db_values();
-
-    return tep_get_include_contents(__CLASS__.'.form');
-
-  }
-}
-
-
-?>
\ No newline at end of file

Modified: trunk/catalog/admin/includes/modules/configuration/modstatus.php
===================================================================
--- trunk/catalog/admin/includes/modules/configuration/modstatus.php	2012-03-12 20:44:03 UTC (rev 4077)
+++ trunk/catalog/admin/includes/modules/configuration/modstatus.php	2012-03-13 16:58:33 UTC (rev 4078)
@@ -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  27/09/11, 18:21
+  @date  13/03/2012, 18:21
   @author oscim <mail aur...@os...> <www http://www.oscim.fr>
   @encode UTF-8
   @class modstatus
@@ -454,7 +454,7 @@
 
 	$languages = tep_get_languages();
 	for ($i=0, $n=sizeof($languages); $i<$n; $i++) {
-	  $contents[] = array('class' => 'block_input','text' => tep_image(DIR_WS_CATALOG_LANGUAGES . $languages[$i]['directory'] . '/images/' . $languages[$i]['image'], $languages[$i]['name']) . '&nbsp;' . tep_draw_input_field('status_name[' . $languages[$i]['id'] . ']'));
+	  $contents[] = array('class' => 'block_input','text' => tep_language_image( $languages[$i]['directory'] . '/images/' . $languages[$i]['image'], $languages[$i]['name']) . '&nbsp;' . tep_draw_input_field('status_name[' . $languages[$i]['id'] . ']'));
 	}
 
 	$contents[] = array('class' => 'block_input','text' =>  __('utiliser une couleur', __CLASS__) . tep_draw_input_field('status_hexacolor','colorpicker',''));
@@ -472,7 +472,7 @@
 	$languages = tep_get_languages();
 	for ($i=0, $n=sizeof($languages); $i<$n; $i++) {
 	  $txt=(isset($oInfo->name[$languages[$i]['id']]) ?$oInfo->name[$languages[$i]['id']] : '');
-	  $contents[] = array('class' => 'block_input','text' => tep_image(DIR_WS_CATALOG_LANGUAGES . $languages[$i]['directory'] . '/images/' . $languages[$i]['image'], $languages[$i]['name']) . '&nbsp;' . tep_draw_input_field('status_name[' . $languages[$i]['id'] . ']','', $txt));
+	  $contents[] = array('class' => 'block_input','text' => tep_language_image( $languages[$i]['directory'] . '/images/' . $languages[$i]['image'], $languages[$i]['name']) . '&nbsp;' . tep_draw_input_field('status_name[' . $languages[$i]['id'] . ']','', $txt));
 	}
 
 	$contents[] = array('class' => 'block_input','text' =>  __('utiliser une couleur', __CLASS__) . tep_draw_input_field('status_hexacolor','colorpicker',$oInfo->status_color));

Modified: trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration_group.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration_group.sql	2012-03-12 20:44:03 UTC (rev 4077)
+++ trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration_group.sql	2012-03-13 16:58:33 UTC (rev 4078)
@@ -13,42 +13,75 @@
 
 
 -- Preserver les ID
-insert into osc_configuration_group values (19, 'PAGE_PRODUCT_DETAIL', NULL, 0, 1, 100, '1', 'CG_PAGE_PRODUCT_DETAIL');
-insert into osc_configuration_group values (2,  'VALUE_MINI', NULL, 0, 1, 110, '1', 'CG_VALUE_MINI');
--- insert into osc_configuration_group values (3,  'VALUE_MAXI', NULL, 0, 1, 110, '1', 'CG_VALUE_MAXI');
-insert into osc_configuration_group values (4,  'IMAGES', NULL, 0, 1, 100, '1', 'MODIMAGES');
-insert into osc_configuration_group values (7,  'EXPEDITION_EMBALLAGE', NULL, 0, 1, 127, '1', 'MODEXPEDITION');
-insert into osc_configuration_group values (8,  'LIST_PRODUTCS', NULL, 0, 1, 100, '1', 'CG_LIST_PRODUTCS');
-insert into osc_configuration_group values (9,  'STOCK', NULL, 0, 1, 127, '1', 'MODSTOCK');
-insert into osc_configuration_group values (10, 'LOGGING', NULL, 0, 1, 120, '1', 'CG_LOGGING');
-insert into osc_configuration_group values (11, 'OPTION_CATALOG', NULL, 0, 1, 127, '1', 'CG_OPTION_CATALOG');
-insert into osc_configuration_group values (12, 'OPTION_MAIL', NULL, 0, 1, 120, '1', 'MODMAIL');
-insert into osc_configuration_group values (13, 'DOWNLOADS', NULL, 0, 1, 127, '1', 'MODDOWNLOADS');
-insert into osc_configuration_group values (14, 'COMPRESSION', NULL, 0, 1, 120, '1', 'CG_COMPRESSION');
-insert into osc_configuration_group values (15, 'SESSION', NULL, 0, 1, 120, '1', 'CG_SESSION');
-insert into osc_configuration_group values (17, 'QUICK_UPDATE', NULL, 0, 1, 126, '1', 'MODADMINCONFIG');
-insert into osc_configuration_group values (16, 'SEO_URL', NULL, 0, 1, 120, '1', 'MODSEOURL');
-insert into osc_configuration_group values (1, 	'MY_BOUTIQUE', NULL, 0, 1, 110, '1', 'CG_MY_BOUTIQUE');
-insert into osc_configuration_group values (100,'APPARENCE', NULL, 0, 1, 0, '1', 'CG_APPARENCE');
-insert into osc_configuration_group values (110,'CONFIGURATION', NULL, 0, 1, 0, '1', 'CG_CONFIGURATION');
-insert into osc_configuration_group values (120,'CONFIG_AVANCE', NULL, 0, 1, 0, '1', 'CG_CONFIG_AVANCE');
-insert into osc_configuration_group values (126,'ESPACE_ADMIN', NULL, 0, 1, 0, '1', 'CG_ESPACE_ADMIN');
-insert into osc_configuration_group values (127,'CONFIG_COMM', NULL, 0, 1, 0, '1', 'CG_CONFIG_COMM');
-insert into osc_configuration_group values (6, 	'OPTION_MODULES', NULL, 0, 1, 120, '1', 'CG_OPTION_MODULES');
-insert into osc_configuration_group values (20, 'PRODUCT_ATTENTE', NULL, 0, 1, 126, '1', 'CG_PRODUCT_ATTENTE');
-insert into osc_configuration_group values (21, 'OPEN_BOX', NULL, 0, 1, 100, '1', 'CG_OPEN_BOX');
-insert into osc_configuration_group values (22, 'RECOVER_CART_SALES', NULL,  0, 1, 126, '1', 'CG_RECOVER_CART_SALES');
-insert into osc_configuration_group values (24 , 'CG_CIP_MANAGER', NULL, 0 , 1, 120, '1', 'CG_CIP_MANAGER');
-insert into osc_configuration_group values (25 , 'NEW_PRODUCTS', NULL, 0 , 1, 110, '1', 'CG_NEW_PRODUCTS');
--- insert into osc_configuration_group values (26,  'ATTRIBUTE_PRODUCT', NULL,0 , 1, 120, '1', 'CG_ATTRIBUTE_PRODUCT');
-insert into osc_configuration_group values (27 , 'APPARENCE_GENERAL', NULL, 0 , 1, 100, '1', 'CG_APPARENCE_GENERAL');
-insert into osc_configuration_group values (28 , 'MEMBRES_DETAIL', NULL, 0 , 1, 110, '1', 'MODMEMBRES');
-insert into osc_configuration_group values (29 , 'BOX_CONFIGURATION_TEMPLATE', NULL, 0 , 1, 100, '1', 'MODTEMPLATE');
-insert into osc_configuration_group values (30 , 'BOX_LOCALIZATION_ORDERS_STATUS', NULL, 0 , 1, 110, '1', 'MODSTATUS');
-insert into osc_configuration_group values (31 , 'BOX_LOCALIZATION_LANGUAGES', NULL, 0 , 1, 110, '1', 'MODLANGUE');
-insert into osc_configuration_group values (33 , 'BOX_CONFIGURATION_EXTRA_FIELDS', NULL, 0 , 1, 120, '1', 'MODCUSTEXTRA');
-insert into osc_configuration_group values (34 , 'BOX_CONFIGURATION_PRODUCTS_EXTRA_FIELDS', NULL, 0 , 1, 120, '1', 'MODPRODEXTRA');
-insert into osc_configuration_group values (128,'BOX_CONFIGURATION_ENVIRONEMENT', NULL, 0, 1, 120, '1', 'CFG_ENVIRONEMENT');
-insert into osc_configuration_group values (129,'CONFIGURATION_ORDERS', NULL, 0, 1, 127, '1', 'MODORDER');
-#insert into osc_configuration_group values (130,'CONFIGURATION_DATATYPES', NULL, 0, 1, 127, '1', 'MODDATATYPE');
 
+insert into osc_configuration_group values (100,'APPARENCE', NULL, 2, 1, 0, '1', 'CG_APPARENCE');
+	insert into osc_configuration_group values (19, 'PAGE_PRODUCT_DETAIL', NULL, 0, 1, 100, '0', 'CG_PAGE_PRODUCT_DETAIL');
+	insert into osc_configuration_group values (4,  'IMAGES', NULL, 0, 1, 100, '0', 'MODIMAGES');
+	insert into osc_configuration_group values (8,  'LIST_PRODUTCS', NULL, 0, 1, 100, '0', 'CG_LIST_PRODUTCS');
+	insert into osc_configuration_group values (21, 'OPEN_BOX', NULL, 0, 1, 100, '0', 'CG_OPEN_BOX');
+	insert into osc_configuration_group values (27 , 'APPARENCE_GENERAL', NULL, 0 , 1, 100, '0', 'CG_APPARENCE_GENERAL');
+	insert into osc_configuration_group values (29 , 'BOX_CONFIGURATION_TEMPLATE', NULL, 0 , 1, 100, '0', 'MODTEMPLATE');
+
+insert into osc_configuration_group values (110,'CONFIGURATION', NULL, 1, 1, 0, '1', 'CG_CONFIGURATION');
+-- insert into osc_configuration_group values (3,  'VALUE_MAXI', NULL, 0, 1, 110, '0', 'CG_VALUE_MAXI');
+	insert into osc_configuration_group values (2,  'VALUE_MINI', NULL, 0, 1, 110, '0', 'CG_VALUE_MINI');
+	insert into osc_configuration_group values (1, 	'MY_BOUTIQUE', NULL, 0, 1, 110, '0', 'CG_MY_BOUTIQUE');
+	insert into osc_configuration_group values (25 , 'NEW_PRODUCTS', NULL, 0 , 1, 110, '0', 'CG_NEW_PRODUCTS');
+	insert into osc_configuration_group values (28 , 'MEMBRES_DETAIL', NULL, 0 , 1, 110, '0', 'MODMEMBRES');
+	insert into osc_configuration_group values (30 , 'BOX_LOCALIZATION_ORDERS_STATUS', NULL, 0 , 1, 110, '0', 'MODSTATUS');
+	insert into osc_configuration_group values (31 , 'BOX_LOCALIZATION_LANGUAGES', NULL, 0 , 1, 110, '0', 'MODLANGUE');
+
+insert into osc_configuration_group values (120,'CONFIG_AVANCE', NULL, 4, 1, 0, '1', 'CG_CONFIG_AVANCE');
+	insert into osc_configuration_group values (24 , 'CG_CIP_MANAGER', NULL, 0 , 1, 120, '0', 'CG_CIP_MANAGER');
+	insert into osc_configuration_group values (33 , 'BOX_CONFIGURATION_EXTRA_FIELDS', NULL, 0 , 1, 120, '0', 'MODCUSTEXTRA');
+
+-- insert into osc_configuration_group values (26,  'ATTRIBUTE_PRODUCT', NULL,0 , 1, 120, '0', 'CG_ATTRIBUTE_PRODUCT');
+	insert into osc_configuration_group values (128,'BOX_CONFIGURATION_ENVIRONEMENT', NULL, 0, 1, 120, '0', 'CFG_ENVIRONEMENT');
+
+insert into osc_configuration_group values (126,'ESPACE_ADMIN', NULL, 5, 1, 0, '1', 'CG_ESPACE_ADMIN');
+	insert into osc_configuration_group values (17, 'QUICK_UPDATE', NULL, 0, 1, 126, '0', 'MODADMINCONFIG');
+	insert into osc_configuration_group values (20, 'PRODUCT_ATTENTE', NULL, 0, 1, 126, '0', 'CG_PRODUCT_ATTENTE');
+	insert into osc_configuration_group values (22, 'RECOVER_CART_SALES', NULL,  0, 1, 126, '0', 'CG_RECOVER_CART_SALES');
+
+insert into osc_configuration_group values (127,'CONFIG_COMM', NULL, 3, 1, 0, '1', 'CG_CONFIG_COMM');
+	insert into osc_configuration_group values (7,  'EXPEDITION_EMBALLAGE', NULL, 0, 1, 127, '0', 'MODEXPEDITION');
+	insert into osc_configuration_group values (9,  'STOCK', NULL, 0, 1, 127, '0', 'MODSTOCK');
+	insert into osc_configuration_group values (11, 'OPTION_CATALOG', NULL, 0, 1, 127, '0', 'CG_OPTION_CATALOG');
+
+	insert into osc_configuration_group values (10, 'LOGGING', NULL, 0, 1, 120, '1', 'CG_LOGGING');
+	insert into osc_configuration_group values (12, 'OPTION_MAIL', NULL, 0, 1, 120, '0', 'MODMAIL');
+	insert into osc_configuration_group values (14, 'COMPRESSION', NULL, 0, 1, 120, '0', 'CG_COMPRESSION');
+	insert into osc_configuration_group values (15, 'SESSION', NULL, 0, 1, 120, '0', 'CG_SESSION');
+	insert into osc_configuration_group values (16, 'SEO_URL', NULL, 0, 1, 120, '0', 'MODSEOURL');
+	insert into osc_configuration_group values (6, 	'OPTION_MODULES', NULL, 0, 1, 120, '0', 'CG_OPTION_MODULES');
+	insert into osc_configuration_group values (129,'CONFIGURATION_ORDERS', NULL, 0, 1, 127, '0', 'MODORDER');
+-- insert into osc_configuration_group values (130,'CONFIGURATION_DATATYPES', NULL, 0, 1, 127, '0', 'MODDATATYPE');
+
+	insert into osc_configuration_group values (35 , 'OPTION_PRODUCTS', NULL, 0 , 1, 127, '1', 'OPTION_PRODUCTS');
+		insert into osc_configuration_group values (13, 'DOWNLOADS', NULL, 0, 1, 35, '0', 'MODDOWNLOADS');
+		insert into osc_configuration_group values (34 , 'BOX_CONFIGURATION_PRODUCTS_EXTRA_FIELDS', NULL, 0 , 1, 35, '0', 'MODPRODEXTRA');
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Oscss-commit] SF.net SVN: oscss:[4077] trunk/catalog

[<os...@us...>]

Revision: 4077
          http://oscss.svn.sourceforge.net/oscss/?rev=4077&view=rev
Author:   oscim
Date:     2012-03-12 20:44:03 +0000 (Mon, 12 Mar 2012)
Log Message:
-----------
suite correction coquille  et erreur de notice  php 
report correction oubli?\195?\169
force attribut download enabled a false lors install
correction module item 

Modified Paths:
--------------
    trunk/catalog/admin/includes/gabarit/configuration/modcustextra/draw.edit.gab
    trunk/catalog/admin/includes/gabarit/configuration/modorder.listing.gab
    trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.edit.gab
    trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.new.gab
    trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modprodextra.txt
    trunk/catalog/admin/includes/modules/configuration/modprodextra.php
    trunk/catalog/includes/modules/shipping/item.php
    trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql

Modified: trunk/catalog/admin/includes/gabarit/configuration/modcustextra/draw.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/modcustextra/draw.edit.gab	2012-03-12 19:10:17 UTC (rev 4076)
+++ trunk/catalog/admin/includes/gabarit/configuration/modcustextra/draw.edit.gab	2012-03-12 20:44:03 UTC (rev 4077)
@@ -13,7 +13,7 @@
 ?>
 <h3><?php echo __('text heading edit field') ?></h3>
 
-<?php echo tep_draw_form('update', modcustextra::FILENAME, FILENAME_CFG_33.((!empty(modcustextra::$fInfo->fields_id )?'&cID=' . modcustextra::$fInfo->fields_id . '&action=update' :'&action=insert') ), 'post') ?>
+<?php echo tep_draw_form('update', modcustextra::FILENAME, FILENAME_CFG_33.(((modcustextra::$fInfo->fields_id > 0 )?'&cID=' . modcustextra::$fInfo->fields_id . '&action=update' :'&action=insert') ), 'post') ?>
 <div class="block_form">
 
   <p>

Modified: trunk/catalog/admin/includes/gabarit/configuration/modorder.listing.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/modorder.listing.gab	2012-03-12 19:10:17 UTC (rev 4076)
+++ trunk/catalog/admin/includes/gabarit/configuration/modorder.listing.gab	2012-03-12 20:44:03 UTC (rev 4077)
@@ -31,7 +31,7 @@
 
     <div id="tabs-1" class="tabPage">
 
-<?php echo tep_draw_form('configuration', FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&amp;gID=' . $_GET['gID'] . '&amp;action=save_mutli') ?>
+<?php echo tep_draw_form('configuration', FILENAME_CONFIGURATION, FILENAME_CFG_129.'gID=' . $_GET['gID'] . '&amp;action=save_mutli') ?>
 
 			<fieldset class="block_field">
 
@@ -122,7 +122,7 @@
 					</ul>
 				</fieldset>
 				<fieldset class="block_field button_nav">
-          <?php print tep_image_submit('button_copy.gif', IMAGE_UPDATE) .tep_js_back(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&amp;gID=' . $_GET['gID'] )) ; ?>
+          <?php print tep_image_submit('button_copy.gif', IMAGE_UPDATE) .tep_js_back(tep_href_link(FILENAME_CONFIGURATION, FILENAME_CFG_129.'gID=' . $_GET['gID'] )) ; ?>
 				</fieldset>
 </form>
 			</div>
@@ -132,7 +132,7 @@
     <?php /** Liste des moduel de livraison  */ ?>
 
 	  <div id="modorder-module" class="block_form">
-	    <h4 class="main-title"><?php echo __('modorder heading modules shipping'); ?></h4>
+	    <h4 class="main-title"><?php echo __('modorder heading modules orders'); ?></h4>
 
 
 		<table class="dataTable">
@@ -157,11 +157,7 @@
 						<?php echo modorder::GetStatusMod_ot($row); ?>
 					</td>
 		      <td class="tright">
-<?php
-  if($row->status) {
- echo ' <a href="' . tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&amp;gID=' . $_GET['gID'] . '&amp;action=modules-edit&amp;mod='.$row->content->code.'' ) . '"> Config </a>' ;
-}
- ?>
+						<?php echo modorder::get_item_action($row); ?>
 		      </td>
 		    </tr>
 	      <?php endforeach; ?>
@@ -174,13 +170,13 @@
 
       <?php if(isset(modorder::$moduleEdit)): ?>
 
-	<?php echo tep_draw_form('configuration', FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&amp;gID=' . $_GET['gID'] . '&amp;mod='.$_GET['mod'].'&amp;action=modules-save') ?>
+	<?php echo tep_draw_form('configuration', FILENAME_CONFIGURATION, FILENAME_CFG_129.'gID=' . $_GET['gID'] . '&amp;mod='.$_GET['mod'].'&amp;action=modules-save') ?>
 	    <fieldset class="block_field">
 	      <legend><?php echo __('modorder heading Configuration du modules') ?></legend>
 	    <?php echo modorder::$moduleEdit; ?>
 
 	      <div class="button_nav">
-		<?php print tep_image_submit('button_copy.gif', IMAGE_UPDATE) .tep_js_back(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $_GET['gparentID'].'&amp;gID=' . $_GET['gID'] )) ; ?>
+		<?php print tep_image_submit('button_copy.gif', IMAGE_UPDATE) .tep_js_back(tep_href_link(FILENAME_CONFIGURATION, FILENAME_CFG_129.'gID=' . $_GET['gID'] )) ; ?>
 	      </div>
 	  </fieldset>
 	</form>

Modified: trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.edit.gab	2012-03-12 19:10:17 UTC (rev 4076)
+++ trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.edit.gab	2012-03-12 20:44:03 UTC (rev 4077)
@@ -14,13 +14,13 @@
 global $action, $languages;
 ?>
 	<div class="box_unique">
-	  <h4><?php echo (($action != 'edit')? __('heading new') : __('heading edit')   ) ?></h4>
-	  <?php echo tep_draw_form('field_entry',FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','eid','confirm')). 'action=' . (($action == 'new') ? 'insert' : 'update') . '&confirm=yes&eid=' . modprodextra::$eid , 'post'); ?>
+	  <h4><?php echo  __('heading edit')  ?></h4>
+	  <?php echo tep_draw_form('field_entry',FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','eid','confirm')). 'action=update' . '&confirm=yes&eid=' . modprodextra::$eid , 'post'); ?>
 
 
       <p>
-				<?php echo    tep_draw_hidden_field('value_list','value_list', (((int)modprodextra::$cInfo['epf_uses_value_list']==1)? '1' : '0')) ?>
-				<?php echo    tep_draw_hidden_field('epf_active_for_language','epf_active_for_language', (((int)modprodextra::$cInfo['epf_active_for_language']==1)? '1' : '0')) ?>
+				<?php echo    tep_draw_hidden_field('value_list','value_list', (((int)modprodextra::$cInfo->epf_uses_value_list==1)? '1' : '0')) ?>
+				<?php echo    tep_draw_hidden_field('epf_active_for_language','epf_active_for_language', (((int)modprodextra::$cInfo->epf_active_value_language==1)? '1' : '0')) ?>
       </p>
 
 
@@ -31,18 +31,18 @@
 					<?php } ?>
         </ul>
 
-				<?php for ($i=0, $n=sizeof($languages); $i<$n; $i++) { ?>
+				<?php reset($languages); for ($i=0, $n=sizeof($languages); $i<$n; $i++) {  ?>
 					<ul id="<?php echo 'products_name-'.($i+1) ?>">
 						<li>
 							<p  class="block_input">
-								<label  for="<?php echo 'label_' . $languages[$i]['id'] ?>"  title="<?php echo __('entry label help') ?>"><?php echo  __('entry label') .  tep_image(DIR_WS_ICONS . 'icon_help.gif');  ?></label>
-								<?php echo  tep_draw_input_field('label_' . $languages[$i]['id'],'label_' . $languages[$i]['id'], modprodextra::$pInfo[$languages[$i]['id']]['epf_label'], "size=64 maxlength=64") ?>
+								<label  for="<?php echo 'label_' . $languages[$i]['id'] ?>"  title="<?php echo __('entry label help') ?>"><?php echo  __('entry label') ;  ?></label>
+								<?php echo  tep_draw_input_field('label_' . $languages[$i]['id'],'label_' . $languages[$i]['id'], modprodextra::$cInfo->lg[$languages[$i]['id']]->epf_label, "size=64 maxlength=64") ?>
 							</p>
 						</li>
 						<li>
 							<p  class="block_input">
-								<label  for="<?php echo 'format_' . $languages[$i]['id'] ?>" title="<?php echo __('entry label help') ?>"><?php echo  __('entry label format')  .  tep_image(DIR_WS_ICONS . 'icon_help.gif');  ?></label>
-								<?php echo  tep_draw_input_field('format_' . $languages[$i]['id'],'format_' . $languages[$i]['id'], modprodextra::$pInfo[$languages[$i]['id']]['epf_format'], "size=64 maxlength=64") ?>
+								<label  for="<?php echo 'format_' . $languages[$i]['id'] ?>" title="<?php echo __('entry label help') ?>"><?php echo  __('entry label format') ;  ?></label>
+								<?php echo  tep_draw_input_field('format_' . $languages[$i]['id'],'format_' . $languages[$i]['id'], modprodextra::$cInfo->lg[$languages[$i]['id']]->epf_format, "size=64 maxlength=64") ?>
 							</p>
 						</li>
 					</ul>
@@ -53,15 +53,15 @@
       <fieldset class="block_field">
 				<p class="block_input">
 					<label  for="search" title="<?php echo __('entry search help') ?>"><?php echo __('entry search');  ?></label>
-					<?php echo tep_draw_radio_field('search','search', '1', (((int)modprodextra::$cInfo['epf_advanced_search']==1)? true : false) ). '&nbsp;' .__('text yes'). '&nbsp;' . tep_draw_radio_field('search','search', '0', (((int)modprodextra::$cInfo['epf_advanced_search']==0)? true : false) ) . '&nbsp;' .__('text no'); ?>
+					<?php echo tep_draw_radio_field('search','search', '1', (((int)modprodextra::$cInfo->epf_advanced_search==1)? true : false) ). '&nbsp;' .__('text yes'). '&nbsp;' . tep_draw_radio_field('search','search', '0', (((int)modprodextra::$cInfo->epf_advanced_search==0)? true : false) ) . '&nbsp;' .__('text no'); ?>
 				</p>
 				<p class="block_input">
 					<label><?php echo __('ENTRY_LISTING') ?></label>
-					<?php echo  tep_draw_radio_field('listing','listing',  '1', (((int)modprodextra::$cInfo['epf_show_in_listing']==1)? true : false) ) . '&nbsp;' .__('text yes'). '&nbsp;' . tep_draw_radio_field('listing','listing',  '0', (((int)modprodextra::$cInfo['epf_show_in_listing']==0)? true : false) ) . '&nbsp;' .__('text no'); ?>
+					<?php echo  tep_draw_radio_field('listing','listing',  '1', (((int)modprodextra::$cInfo->epf_show_in_listing==1)? true : false) ) . '&nbsp;' .__('text yes'). '&nbsp;' . tep_draw_radio_field('listing','listing',  '0', (((int)modprodextra::$cInfo->epf_show_in_listing==0)? true : false) ) . '&nbsp;' .__('text no'); ?>
 				</p>
 				<p class="block_input">
 					<label><?php echo __('ENTRY_META') ?></label>
-					<?php echo  tep_draw_radio_field('meta','meta', '1',(((int)modprodextra::$cInfo['epf_use_as_meta_keyword']==1)? true : false) ) . '&nbsp;' .__('text yes'). '&nbsp;' . tep_draw_radio_field('meta','meta', '0',  (((int)modprodextra::$cInfo['epf_use_as_meta_keyword']==0)? true : false) ) . '&nbsp;' .__('text no'); ?>
+					<?php echo  tep_draw_radio_field('meta','meta', '1',(((int)modprodextra::$cInfo->epf_use_as_meta_keyword==1)? true : false) ) . '&nbsp;' .__('text yes'). '&nbsp;' . tep_draw_radio_field('meta','meta', '0',  (((int)modprodextra::$cInfo->epf_use_as_meta_keyword==0)? true : false) ) . '&nbsp;' .__('text no'); ?>
 				</p>
       </fieldset>
 
@@ -69,45 +69,45 @@
       <fieldset class="block_field">
 				<p class="block_input">
 					<label><?php echo __('ENTRY_ORDER') ?></label>
-					<?php echo  tep_draw_input_field('sort_order','sort_order', (!empty(modprodextra::$cInfo['epf_order'])? modprodextra::$cInfo['epf_order'] : '0' ) ); ?>
+					<?php echo  tep_draw_input_field('sort_order','sort_order', (!empty(modprodextra::$cInfo->epf_order)? modprodextra::$cInfo->epf_order : '0' ) ); ?>
 				</p>
 
 
 				<p class="block_input">
 					<label for="epf_key" title="<?php echo __('ENTRY_UNIQ_KEY_HELP') ?>"><?php echo __('ENTRY_UNIQ_KEY'). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
-					<?php echo  tep_draw_input_field('epf_key','epf_key', modprodextra::$cInfo['epf_key']); ?>
+					<?php echo  tep_draw_input_field('epf_key','epf_key', modprodextra::$cInfo->epf_key); ?>
 				</p>
 
 				<p class="block_input">
 					<label><?php echo __('ENTRY_USE_ADMIN')  ?></label>
-					<?php echo   tep_draw_radio_field('epf_admin','epf_admin', '1', (((int)modprodextra::$cInfo['epf_admin']==1)? true : false) ) . '&nbsp;' .__('text yes'). '&nbsp;' . tep_draw_radio_field('epf_admin','epf_admin', '0', (((int)modprodextra::$cInfo['epf_admin']==0)? true : false) ) . '&nbsp;' .__('text no'); ?>
+					<?php echo   tep_draw_radio_field('epf_admin','epf_admin', '1', (((int)modprodextra::$cInfo->epf_admin==1)? true : false) ) . '&nbsp;' .__('text yes'). '&nbsp;' . tep_draw_radio_field('epf_admin','epf_admin', '0', (((int)modprodextra::$cInfo->epf_admin==0)? true : false) ) . '&nbsp;' .__('text no'); ?>
 				</p>
 				<p class="block_input">
 					<label for="epf_special_mod" title="<?php echo __('ENTRY_SPECIFIQUE_MODULE_HELP') ?>"><?php echo __('ENTRY_SPECIFIQUE_MODULE'). tep_image(DIR_WS_ICONS . 'icon_help.gif');   ?></label>
-					<?php echo  tep_draw_input_field('epf_special_mod','epf_special_mod', modprodextra::$cInfo['epf_special_mod']); ?>
+					<?php echo  tep_draw_input_field('epf_special_mod','epf_special_mod', modprodextra::$cInfo->epf_special_mod); ?>
 				</p>
 				<p class="block_input">
 					<label><?php echo __('ENTRY_CHAIN')  ?></label>
-					<?php echo   tep_draw_radio_field('chain','chain', '1', (((int)modprodextra::$cInfo['epf_show_parent_chain']==1)? true : false) ) . '&nbsp;' .__('text yes'). '&nbsp;' . tep_draw_radio_field('chain','chain', '0',  (((int)modprodextra::$cInfo['epf_show_parent_chain']==0)? true : false)) . '&nbsp;' .__('text no'); ?>
+					<?php echo   tep_draw_radio_field('chain','chain', '1', (((int)modprodextra::$cInfo->epf_show_parent_chain==1)? true : false) ) . '&nbsp;' .__('text yes'). '&nbsp;' . tep_draw_radio_field('chain','chain', '0',  (((int)modprodextra::$cInfo->epf_show_parent_chain==0)? true : false)) . '&nbsp;' .__('text no'); ?>
 				</p>
 
       </fieldset>
 
 
-	    <?php if ($action == 'new' || (!modprodextra::$cInfo['epf_uses_value_list']) ) : ?>
+	    <?php if ($action == 'new' || (!modprodextra::$cInfo->epf_uses_value_list) ) : ?>
 				<fieldset class="block_field">
 					<p class="block_input">
 						<label for="restrict" title="<?php echo __('ENTRY_RESTRICT_HELP') ?>"><?php echo __('ENTRY_RESTRICT'). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
-						<?php echo   tep_draw_radio_field('restrict','restrict', '1',(((int)modprodextra::$cInfo['epf_use_to_restrict_listings']==1)? true : false)) . '&nbsp;' .__('text yes'). '&nbsp;' . tep_draw_radio_field('restrict','restrict', '0',(((int)modprodextra::$cInfo['epf_use_to_restrict_listings']==0)? true : false) ) . '&nbsp;' .__('text no'); ?>
+						<?php echo   tep_draw_radio_field('restrict','restrict', '1',(((int)modprodextra::$cInfo->epf_use_to_restrict_listings==1)? true : false)) . '&nbsp;' .__('text yes'). '&nbsp;' . tep_draw_radio_field('restrict','restrict', '0',(((int)modprodextra::$cInfo->epf_use_to_restrict_listings==0)? true : false) ) . '&nbsp;' .__('text no'); ?>
 					</p>
 
 					<p class="block_input">
 						<label for="size" title="<?php echo __('ENTRY_SIZE_HELP') ?>"><?php echo __('ENTRY_SIZE'). tep_image(DIR_WS_ICONS . 'icon_help.gif') ?></label>
-						<?php echo  tep_draw_input_field('size','size', modprodextra::$cInfo['epf_size'],'',true); ?>
+						<?php echo  tep_draw_input_field('size','size', modprodextra::$cInfo->epf_size,'',true); ?>
 					</p>
 				</fieldset>
 	    <?php else: ?>
-	      <p><?php echo   tep_draw_hidden_field('size','size', modprodextra::$cInfo['epf_size'] ) .tep_draw_hidden_field('restrict','restrict', modprodextra::$cInfo['restrict'],(((int)modprodextra::$cInfo['restrict']==1)? '1' : '0'))   ?></p>
+	      <p><?php echo   tep_draw_hidden_field('size','size', modprodextra::$cInfo->epf_size ) .tep_draw_hidden_field('restrict','restrict', modprodextra::$cInfo->restrict,(((int)modprodextra::$cInfo->restrict==1)? '1' : '0'))   ?></p>
 	    <?php endif; ?>
 
 

Modified: trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.new.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.new.gab	2012-03-12 19:10:17 UTC (rev 4076)
+++ trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.new.gab	2012-03-12 20:44:03 UTC (rev 4077)
@@ -13,7 +13,7 @@
 global $action, $languages;
 ?>
 	<div class="box_unique">
-	  <h4><?php echo (($action == 'edit')? __('HEADING_NEW') : __('HEADING_EDIT') . modprodextra::$eid  ) ?></h4>
+	  <h4><?php echo (($action != 'edit')? __('heading extra fields list add value') : __('heading extra fields list edit value') . modprodextra::$eid  ) ?></h4>
 
 	  <?php echo tep_draw_form('field_entry',FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','eid','confirm')). 'action=insert', 'post'); ?>
 
@@ -21,27 +21,30 @@
 
 
 
-	<div class="block_input">
+	<fieldset class="block_field">
 	  <label><?php echo __('entry type input') ?></label>
 	  <?php //echo    tep_draw_radio_field('value_list','value_list', '1',(((int)modprodextra::$cInfo->epf_uses_value_list==1)? true : false)) . '&nbsp;' .__('TEXT_YES'). '&nbsp;' . tep_draw_radio_field('value_list','value_list', '0',(((int)modprodextra::$cInfo->epf_uses_value_list==0)? true : false)) . '&nbsp;' .__('TEXT_NO'); ?>
 
-					<ul>
+					<ul class="block_input">
 						<li><?php echo tep_draw_radio_field('epf_input_type','epf_input_type', 0, (modprodextra::$cInfo->epf_input_type==0) ? true : false) . __('entry list type input') ?></li>
 						<li><?php echo tep_draw_radio_field('epf_input_type','epf_input_type', 1, (modprodextra::$cInfo->epf_input_type==1) ? true : false) . __('entry list type textarea') ?></li>
 						<li><?php echo tep_draw_radio_field('epf_input_type','epf_input_type', 2, (modprodextra::$cInfo->epf_input_type==2) ? true : false) . __('entry list type radio') ?></li>
+						<li><?php echo tep_draw_radio_field('epf_input_type','epf_input_type', 5, (modprodextra::$cInfo->epf_input_type==5) ? true : false) . __('entry list type hidden') ?></li>
+					</ul>
+
+					<ul class="block_input">
 						<li><?php echo tep_draw_radio_field('epf_input_type','epf_input_type', 3, (modprodextra::$cInfo->epf_input_type==3) ? true : false) . __('entry list type checkbox') ?></li>
 						<li><?php echo tep_draw_radio_field('epf_input_type','epf_input_type', 7, (modprodextra::$cInfo->epf_input_type==7) ? true : false) . __('entry list type checkbox multi') ?></li>
 						<li><?php echo tep_draw_radio_field('epf_input_type','epf_input_type', 4, (modprodextra::$cInfo->epf_input_type==4) ? true : false) . __('entry list type select') ?></li>
-						<li><?php echo tep_draw_radio_field('epf_input_type','epf_input_type', 6, (modprodextra::$cInfo->epf_input_type==6) ? true : false) . __('entry list type select mutli') ?></li>
-						<li><?php echo tep_draw_radio_field('epf_input_type','epf_input_type', 5, (modprodextra::$cInfo->epf_input_type==5) ? true : false) . __('entry list type hidden') ?></li>
+						<li><?php echo tep_draw_radio_field('epf_input_type','epf_input_type', 6, (modprodextra::$cInfo->epf_input_type==6) ? true : false) . __('entry list type select multi') ?></li>
 					</ul>
-	</div>
+	</fieldset>
 
 
       <p class="block_input">
-				<label for="epf_active_for_language" title="<?php echo __('ENTRY_ACTIVE_HELP') ?>"><?php echo __('ENTRY_ACTIVE'). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></label>
-				<?php echo  tep_draw_radio_field('epf_active_for_language' ,'epf_active_for_language' , '1',  (((int)modprodextra::$cInfo->epf_active_for_language==1)? true : false)  ) . '&nbsp;' . __('TEXT_YES') .
-	    '&nbsp;' . tep_draw_radio_field('epf_active_for_language' ,'epf_active_for_language', '0', (((int)modprodextra::$cInfo->epf_active_for_language==0)? true : false) ) . '&nbsp;' . __('TEXT_NO'); ?>
+				<label for="epf_active_for_language" title="<?php echo __('ENTRY_ACTIVE_HELP') ?>"><?php echo __('ENTRY_ACTIVE') ?></label>
+				<?php echo  tep_draw_radio_field('epf_active_for_language' ,'epf_active_for_language' , '1',  (((int)modprodextra::$cInfo->epf_active_value_language==1)? true : false)  ) . '&nbsp;' . __('text yes') .
+	    '&nbsp;' . tep_draw_radio_field('epf_active_for_language' ,'epf_active_for_language', '0', (((int)modprodextra::$cInfo->epf_active_value_language==0)? true : false) ) . '&nbsp;' . __('text no'); ?>
       </p>
 
 

Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modprodextra.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modprodextra.txt	2012-03-12 19:10:17 UTC (rev 4076)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/modprodextra.txt	2012-03-12 20:44:03 UTC (rev 4077)
@@ -37,7 +37,7 @@
 	$lang['entry label format help']="Le format vous permet de definir l'ordonancement du label et du champs lors de l'affichage de ce champs " ;
 	$lang['entry search']="Actif dans la recherche: " ;
 	$lang['entry search help']="Rend actif ce champ dans la recherche avancée " ;
-	$lang['entry type input']="Type de champ : " ;
+	$lang['entry type input']="Type de champ" ;
 
 	$lang['ENTRY_ACTIVE']="Mode language : " ;
 	$lang['ENTRY_ACTIVE_HELP']="Ce champs contient une valeur internationalisable , une par langue. Aussi vous pourrez insérer une valeur personnalisée par langue" ;
@@ -68,6 +68,7 @@
 	$lang['entry value sort help']="" ;
 	$lang['entry value value']="Valeur : " ;
 	$lang['entry value value help']="" ;
+	$lang['modprodextra extra label add']="Creer ce champs" ;
 
 /* value delete */
 	$lang['heading delete value']="Supprimer cette valeur du champs" ;

Modified: trunk/catalog/admin/includes/modules/configuration/modprodextra.php
===================================================================
--- trunk/catalog/admin/includes/modules/configuration/modprodextra.php	2012-03-12 19:10:17 UTC (rev 4076)
+++ trunk/catalog/admin/includes/modules/configuration/modprodextra.php	2012-03-12 20:44:03 UTC (rev 4077)
@@ -418,7 +418,7 @@
 					$result = $r ;
 
 				foreach($result as $row)
-					$fields['lg'][$row['languages_id']] = new objectInfo($row);
+					if(isset($row['languages_id']))$fields['lg'][$row['languages_id']] = new objectInfo($row);
 
 				return new objectInfo($fields);
       break;

Modified: trunk/catalog/includes/modules/shipping/item.php
===================================================================
--- trunk/catalog/includes/modules/shipping/item.php	2012-03-12 19:10:17 UTC (rev 4076)
+++ trunk/catalog/includes/modules/shipping/item.php	2012-03-12 20:44:03 UTC (rev 4077)
@@ -1,32 +1,42 @@
 <?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
   @package osCSS-2 <www http://www.oscss.org>
-  @version 2.0.9
-  @date  20/06/10, 15:01
+  @version 2.1.1
+  @date  12/03/2012, 15:01
   @author oscim <mail aur...@os...> <www http://www.oscim.fr>
   @encode UTF-8
 */
 class item
-  implements InterfaceModule,InterfaceAcaShipping {
-  var $code, $title, $description, $icon, $enabled;
+  implements 
+		InterfaceModule,
+		InterfaceAcaShipping 
+	{
 
+  public $code;
+	public $title;
+	public $description;
+	public $icon;
+	public $enabled;
+
 // class constructor
   public function __construct() {
     $this->code = 'item';
     $this->title = __('module shipping item text title');
     $this->description = __('module shipping item text description');
-    $this->sort_order = (defined('MODULE_SHIPPING_ITEM_SORT_ORDER;')? MODULE_SHIPPING_ITEM_SORT_ORDER: 0);
-    $this->icon = (tep_not_null('MODULE_SHIPPING_ITEM_ICON')? substr(MODULE_SHIPPING_ITEM_ICON,strlen(DIR_WS_CATALOG)) : '');
-    $this->tax_class = MODULE_SHIPPING_ITEM_TAX_CLASS;
+    $this->sort_order = (defined('MODULE_SHIPPING_ITEM_SORT_ORDER')? MODULE_SHIPPING_ITEM_SORT_ORDER: 0);
+    $this->icon = ( (defined('MODULE_SHIPPING_ITEM_ICON') && tep_not_null('MODULE_SHIPPING_ITEM_ICON'))? substr(MODULE_SHIPPING_ITEM_ICON,strlen(DIR_WS_CATALOG)) : '');
+    $this->tax_class = (defined('MODULE_SHIPPING_ITEM_TAX_CLASS')? MODULE_SHIPPING_ITEM_TAX_CLASS : -1 );
     $this->enabled =  true ;
 
     global $order;
     if (is_object($order)) $this->update_status($order);
   }
 
+
 /** Interface InterfaceAcaShipping */
+
   public function quote($method = '') {
     global $order, $total_count;
 
@@ -48,15 +58,16 @@
 
     return $this->quotes;
   }
+
   /**
   */
   public function update_status($order) {
     if ($this->enabled == true ) {
       $this->enabled = false;
       if ( ((int)MODULE_SHIPPING_ITEM_ZONE > 0) && ((int)MODULE_SHIPPING_ITEM_ZONE == shipping::getGeoZoneID($order->delivery['country']['id'], $order->delivery['zone_id'])) )
-	$this->enabled = true;
+				$this->enabled = true;
       elseif ((int)MODULE_SHIPPING_ITEM_ZONE == 0)
-	$this->enabled = true;
+				$this->enabled = true;
     }
   }
 
@@ -69,8 +80,8 @@
       $check_query = $DB->query("select configuration_value from " . TABLE_CONFIGURATION . " where configuration_key LIKE 'MODULE_SHIPPING_ITEM%' ");
       if( $check_query->__get('numRows') ==  count($this->keys()) ) $this->_check=true;
       else {
-	$this->remove();
-	$this->_check=false;
+				$this->remove();
+				$this->_check=false;
       }
     }
     return $this->_check;
@@ -83,7 +94,14 @@
   }
 
   public function keys() {
-    return array( 'MODULE_SHIPPING_ITEM_COST', 'MODULE_SHIPPING_ITEM_HANDLING', 'MODULE_SHIPPING_ITEM_TAX_CLASS', 'MODULE_SHIPPING_ITEM_ZONE', 'MODULE_SHIPPING_ITEM_SORT_ORDER','MODULE_SHIPPING_ITEM_ICON');
+    return array( 
+			'MODULE_SHIPPING_ITEM_COST', 
+			'MODULE_SHIPPING_ITEM_HANDLING', 
+			'MODULE_SHIPPING_ITEM_TAX_CLASS', 
+			'MODULE_SHIPPING_ITEM_ZONE', 
+			'MODULE_SHIPPING_ITEM_SORT_ORDER',
+			'MODULE_SHIPPING_ITEM_ICON'
+		);
   }
 }
 ?>
\ No newline at end of file

Modified: trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql
===================================================================
--- trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql	2012-03-12 19:10:17 UTC (rev 4076)
+++ trunk/catalog/install/includes/sql/mysql/data/91_osc_configuration.sql	2012-03-12 20:44:03 UTC (rev 4077)
@@ -200,7 +200,7 @@
 
 
 -- 13 downloads
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('DOWNLOAD_ENABLED_S', 'DOWNLOAD_ENABLED', 'true', 'DOWNLOAD_ENABLED_L', '13', '1', NOW(), NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),');
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('DOWNLOAD_ENABLED_S', 'DOWNLOAD_ENABLED', 'false', 'DOWNLOAD_ENABLED_L', '13', '1', NOW(), NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),');
 insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('DOWNLOAD_BY_REDIRECT_S', 'DOWNLOAD_BY_REDIRECT', 'false', 'DOWNLOAD_BY_REDIRECT_L', '13', '2', NOW(), NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),');
 insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('DOWNLOAD_MAX_DAYS_S', 'DOWNLOAD_MAX_DAYS', '7', 'DOWNLOAD_MAX_DAYS_L', '13', '3', NOW(), NOW(), NULL, '');
 insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) values ('DOWNLOAD_MAX_COUNT_S', 'DOWNLOAD_MAX_COUNT', '5', 'DOWNLOAD_MAX_COUNT_L', '13', '4', NOW(), NOW(), NULL, '');
@@ -342,7 +342,7 @@
 insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('CUSTOMER_PUBLIC_PROFIL_S', 'CUSTOMER_PUBLIC_PROFIL', 'true', 'CUSTOMER_PUBLIC_PROFIL_L', '28', '21', NULL, NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),','3');
 
 -- 128 General environement
-insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('USE_LOCAL_GENERAT_PDF_S', 'USE_LOCAL_GENERAT_PDF', '10', 'USE_LOCAL_GENERAT_PDF_L', '128', '5', NULL, NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),','3');
+insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('USE_LOCAL_GENERAT_PDF_S', 'USE_LOCAL_GENERAT_PDF', 'true', 'USE_LOCAL_GENERAT_PDF_L', '128', '5', NULL, NOW(), 'tep_value_for_humain', 'tep_cfg_select_option(array(\'true\', \'false\'),','3');
 insert into osc_configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function, configuration_type) values ('USE_MODELE_PDF_S', 'USE_MODELE_PDF', 'harry', 'USE_MODELE_PDF_L', '128', '5', NULL, NOW(), NULL, '','2');
 
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Oscss-commit] SF.net SVN: oscss:[4076] trunk/catalog/admin/includes

[<os...@us...>]

Revision: 4076
          http://oscss.svn.sourceforge.net/oscss/?rev=4076&view=rev
Author:   oscim
Date:     2012-03-12 19:10:17 +0000 (Mon, 12 Mar 2012)
Log Message:
-----------
report de la suppression des element associ?\195?\169 a une commande shipping/services
Ajustement formulaire de suppression et var post a prendre en charge

Modified Paths:
--------------
    trunk/catalog/admin/includes/classes/drivers/sqlorder.php
    trunk/catalog/admin/includes/gabarit/orders/display_view.delete.gab
    trunk/catalog/admin/includes/languages/fr_FR/modules/pages/orders.txt
    trunk/catalog/admin/includes/modules/pages/orders.php

Modified: trunk/catalog/admin/includes/classes/drivers/sqlorder.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlorder.php	2012-03-12 17:41:10 UTC (rev 4075)
+++ trunk/catalog/admin/includes/classes/drivers/sqlorder.php	2012-03-12 19:10:17 UTC (rev 4076)
@@ -1,10 +1,10 @@
 <?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
 /**
-  @licence GPL 2005-2011  The osCSS developers - osCSS Open Source E-commerce
+  @licence GPL 2005-2012  The osCSS developers - osCSS Open Source E-commerce
   @portion code Copyright (c) 2002 osCommerce
   @package osCSS-2 <www http://www.oscss.org>
   @version 2.1.1
-  @date  16/12/11, 20:11
+  @date  12/03/2012, 20:11
   @author oscim <mail aur...@os...> <www http://www.oscim.fr>
   @encode UTF-8
   @class sqlorder
@@ -107,7 +107,7 @@
     @note le tableau fournis ($option) Doit correspondre a la forme des orders !!! idem Specimen
   */
   public static function update($option){
-error_reporting(E_ALL);
+
     self::getInstance();
 
     /**
@@ -384,6 +384,13 @@
 
   /**
     @brief delete row
+		@param $option array(
+											id => (int)
+											[cid] => (int)
+											[restock] => (boolean)
+											[del_shipping] => (boolean)
+											[del_services] => (boolean)
+												)
   */
   public static function delete($option){
     $DB=Database::getInstance();
@@ -410,7 +417,12 @@
     if(isset($option['restock']))
       tep_products_restock($_oID,$cid);
 
+    if(isset($option['del_shipping']))
+      sqlshipping::delete(array('orders_id'=>$_oID));
 
+    if(isset($option['del_services']))
+      sqlservices::delete(array('orders_id'=>$_oID));
+
     $sql = substr($sql,3);
 
     $DB->query("delete from " . TABLE_ORDERS_PRODUCTS . " where ".$sql);
@@ -433,10 +445,10 @@
       $object= new stdclass();
 
       foreach($array as $key=>$value){
-	if( strpos($key,'orders_') ===0)
-	  $key=substr($key,7);
+				if( strpos($key,'orders_') ===0)
+					$key=substr($key,7);
 
-	$object->$key = $value;
+				$object->$key = $value;
       }
 
       return $object;

Modified: trunk/catalog/admin/includes/gabarit/orders/display_view.delete.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/orders/display_view.delete.gab	2012-03-12 17:41:10 UTC (rev 4075)
+++ trunk/catalog/admin/includes/gabarit/orders/display_view.delete.gab	2012-03-12 19:10:17 UTC (rev 4076)
@@ -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  15/05/11, 09:53
+  @version 2.1.1
+  @date  12/03/2012, 19:33
   @author oscim <mail aur...@os...> <www http://www.oscim.fr>
   @encode UTF-8
 */
@@ -13,9 +13,30 @@
 <h3><?php echo __('text info heading delete order'); ?></h3>
 
 <?php echo tep_draw_form('orders', orders::FILENAME, 'oID=' . orders::$oInfo->orders_id . '&amp;action=deleteconfirm'); ?>
+
   <p><?php echo __('text info delete intro'); ?></p>
-  <p><?php echo tep_draw_checkbox_field('restock','','',true) . __('text info restock product quantity'); ?></p>
-  <div class="button_nav">
-    <?php echo tep_image_submit('button_delete.gif', IMAGE_DELETE) . tep_js_back(tep_href_link(orders::FILENAME), IMAGE_CANCEL); ?>
+
+    <div class="box_uniq">
+      <fieldset class="block_field" >
+
+				<p class="block_input">
+					<?php echo tep_draw_checkbox_field('restock','','',true) . __('text info restock product quantity'); ?>
+				</p>
+
+				<p class="block_input">
+					<?php echo tep_draw_checkbox_field('delete_shipping','','',false) . __('text info delete shipping'); ?>
+				</p>
+
+				<p class="block_input">
+					<?php echo tep_draw_checkbox_field('delete_service','','',false) . __('text info delete service'); ?>
+				</p>
+
+			</fieldset>
+
+		<div class="button_nav">
+			<?php echo tep_image_submit('button_delete.gif', IMAGE_DELETE) . tep_js_back(tep_href_link(orders::FILENAME), IMAGE_CANCEL); ?>
+		</div>
+
+
   </div>
 </form>
\ No newline at end of file

Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/pages/orders.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/pages/orders.txt	2012-03-12 17:41:10 UTC (rev 4075)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/orders.txt	2012-03-12 19:10:17 UTC (rev 4076)
@@ -4,7 +4,7 @@
   @portion code Copyright (c) 2002 osCommerce
   @package osCSS-2 <www http://www.oscss.org>
   @version 2.1.1
-  @date  19/02/2012, 16:07
+  @date  12/03/2012, 19:33
   @author oscim <mail aur...@os...> <www http://www.oscim.fr>
   @encode UTF-8
 */
@@ -103,6 +103,9 @@
 $lang['text info heading delete order']="Supprimer la commande" ;
 $lang['text info delete intro']="Êtes-vous sûr de vouloir supprimer cette commande ?" ;
 $lang['text info restock product quantity']="Restaurer la valeur de stock" ;
+$lang['text info delete shipping']="Supprimer les livraisons associées " ;
+$lang['text info delete service']="Supprimer les services associés" ;
+
 $lang['text date order created']="Date de création :" ;
 $lang['text date order last modified']="Dernière modification :" ;
 $lang['text info payment method']="Méthode de paiement :" ;

Modified: trunk/catalog/admin/includes/modules/pages/orders.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/orders.php	2012-03-12 17:41:10 UTC (rev 4075)
+++ trunk/catalog/admin/includes/modules/pages/orders.php	2012-03-12 19:10:17 UTC (rev 4076)
@@ -4,7 +4,7 @@
   @portion code Copyright (c) 2002 osCommerce
   @package osCSS-2 <www http://www.oscss.org>
   @version 2.1.1
-  @date  18/02/2012, 22:42
+  @date  12/03/2012, 22:42
   @author oscim <mail aur...@os...> <www http://www.oscim.fr>
   @encode UTF-8
   @class orders
@@ -381,7 +381,13 @@
     */
       case 'deleteconfirm':
 
-				if(!sqlorder::delete(array('id'=>(int)$_GET['oID'])))
+				$param = array('id'=>(int)$_GET['oID']);
+
+				if(isset($_POST['restock'])) $param['restock'] = true;
+				if(isset($_POST['delete_shipping'])) $param['del_shipping'] = true;
+				if(isset($_POST['delete_service'])) $param['del_services'] = true;
+
+				if(!sqlorder::delete($param))
 					$messageStack->add_session(__('error order not delete'), 'warning');
 				else
 					$messageStack->add_session(__('success order delete'), 'success');

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Oscss-commit] SF.net SVN: oscss:[4075] trunk/catalog

[<os...@us...>]

Revision: 4075
          http://oscss.svn.sourceforge.net/oscss/?rev=4075&view=rev
Author:   oscim
Date:     2012-03-12 17:41:10 +0000 (Mon, 12 Mar 2012)
Log Message:
-----------
correction coquille 

Modified Paths:
--------------
    trunk/catalog/admin/includes/functions/lib.configuration.php

Added Paths:
-----------
    trunk/catalog/Documents/.htaccess
    trunk/catalog/Documents/docs/.htaccess
    trunk/catalog/admin/includes/gabarit/adminUsers/
    trunk/catalog/admin/includes/gabarit/adminUsers/display_view.edit.gab
    trunk/catalog/admin/includes/gabarit/adminUsers/display_view.listing.gab

Removed Paths:
-------------
    trunk/catalog/admin/includes/gabarit/address_book.form.gab
    trunk/catalog/admin/includes/gabarit/adminUsers.listing.gab

Added: trunk/catalog/Documents/.htaccess
===================================================================
--- trunk/catalog/Documents/.htaccess	                        (rev 0)
+++ trunk/catalog/Documents/.htaccess	2012-03-12 17:41:10 UTC (rev 4075)
@@ -0,0 +1,2 @@
+order deny,allow
+deny from all
\ No newline at end of file

Added: trunk/catalog/Documents/docs/.htaccess
===================================================================
--- trunk/catalog/Documents/docs/.htaccess	                        (rev 0)
+++ trunk/catalog/Documents/docs/.htaccess	2012-03-12 17:41:10 UTC (rev 4075)
@@ -0,0 +1,2 @@
+order deny,allow
+deny from all
\ No newline at end of file

Modified: trunk/catalog/admin/includes/functions/lib.configuration.php
===================================================================
--- trunk/catalog/admin/includes/functions/lib.configuration.php	2012-03-11 17:43:51 UTC (rev 4074)
+++ trunk/catalog/admin/includes/functions/lib.configuration.php	2012-03-12 17:41:10 UTC (rev 4075)
@@ -1,10 +1,10 @@
 <?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
   @package osCSS-2 <www http://www.oscss.org>
   @version 2.1.1
-  @date  20/10/11, 23:12
+  @date  12/03/2012, 23:12
   @author oscim <mail aur...@os...> <www http://www.oscim.fr>
   @encode UTF-8
 */
@@ -410,8 +410,7 @@
   $result=$DB->query("select cip_id, cip_installed from ".TABLE_CIP. " where cip_folder_name='".$cip_name."'; ");
   $installed=$result->fetchAssoc();
 
-  //! Register CIP in database:
-  if (!isset($installed['cip_id'])) $DB->query("insert into ".TABLE_CIP." (cip_id, cip_folder_name, cip_installed, cip_ident, cip_version) values ('', '".$cip_name."', '1', '".$Ident."','".$Version."')");
-  else $DB->query("update ".TABLE_CIP." set  cip_installed='1' WHERE cip_folder_name= '".$cip_name."' AND cip_ident= '".$Ident."' AND cip_version='".$Version."' ");
+  if (isset($installed['cip_id']))
+		$DB->query("update ".TABLE_CIP." set  cip_installed='1' WHERE cip_folder_name= '".$cip_name."' AND cip_ident= '".$Ident."' AND cip_version='".$Version."' ");
 }
 ?>
\ No newline at end of file

Deleted: trunk/catalog/admin/includes/gabarit/address_book.form.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/address_book.form.gab	2012-03-11 17:43:51 UTC (rev 4074)
+++ trunk/catalog/admin/includes/gabarit/address_book.form.gab	2012-03-12 17:41:10 UTC (rev 4075)
@@ -1,81 +0,0 @@
-<?php
-/**
-  @licence GPL 2005-2010  The osCSS developers - osCSS Open Source E-commerce
-  @portion code Copyright (c) 2002 osCommerce
-  @package osCSS-2 <www http://www.oscss.org>
-  @version 2.0.9
-  @date  22/06/10, 18:12
-  @author oscim <mail aur...@os...> <www http://www.oscim.fr>
-  @encode UTF-8
-*/
-global $processed;
-?>
-
-<?php if (_cst_bool('ACCOUNT_COMPANY')): ?>
-  <fieldset class="block_field">
-    <legend><?php echo __('category company') ?></legend>
-    <p class="block_input">
-      <label for="entry_company"><?php echo __('entry compagny') ?></label>
-      <?php echo tep_result_up_field(address_book::$cInfo,'entry_company','',''); ?>
-    </p>
-    <p class="block_input">
-      <label for="entry_company"><?php echo __('entry compagny tax id') ?></label>
-      <?php echo tep_result_up_field(address_book::$cInfo,'entry_company_tax_id','',''); ?>
-    </p>
-  </fieldset>
-<?php endif; ?>
-
-<fieldset class="block_field">
-  <legend><?php echo __('category address') ?></legend>
-
-  <?php echo tep_draw_hidden_field('customers_default_address_id','customers_default_address_id', address_book::$cInfo->customers_default_address_id); ?>
-
-  <p class="block_input">
-    <label for="entry_street_address"><?php echo __('Adresse :') ?></label>
-    <?php echo tep_result_up_field(address_book::$cInfo,'entry_street_address','','64'); ?>
-  </p>
-
-  <p class="block_input">
-    <?php if (_cst_bool('ACCOUNT_SUBURB')): ?>
-      <label for="entry_suburb"><?php echo __('entry suburb') ?></label>
-      <?php echo tep_result_up_field(address_book::$cInfo,'entry_suburb'); ?>
-    <?php endif; ?>
-  </p>
-
-  <p class="block_input">
-    <label for="entry_postcode"><?php echo __('entry post code') ?></label>
-    <?php echo tep_result_up_field(address_book::$cInfo,'entry_postcode','','8'); ?>
-  </p>
-
-  <p class="block_input">
-    <label for="entry_city"><?php echo __('entry city') ?></label>
-    <?php echo tep_result_up_field(address_book::$cInfo,'entry_city'); ?>
-  </p>
-
-  <?php if (_cst_bool('ACCOUNT_STATE')): ?>
-    <?php  //$entry_state = tep_get_zone_name(address_book::$cInfo->entry_country_id, address_book::$cInfo->entry_zone_id, address_book::$cInfo->entry_state); ?>
-
-    <p class="block_input">
-      <label for="entry_state"><?php echo __('entry state') ?></label>
-    <?php
-      if ($processed) echo worldUtility::get_zone_name(address_book::$cInfo->entry_country_id, address_book::$cInfo->entry_zone_id, address_book::$cInfo->entry_state) . tep_draw_hidden_field('entry_zone_id') . tep_draw_hidden_field('entry_state') ;
-      else{
-	$zones_array = array();
-	$zones_query = tep_db_query("select zone_name from " . TABLE_ZONES . " where zone_country_id = '" . tep_db_input(address_book::$cInfo->entry_country_id) . "' order by zone_name");
-	while ($zones_values = tep_db_fetch_array($zones_query)) {
-	  $zones_array[] = array('id' => $zones_values['zone_name'], 'text' => $zones_values['zone_name']);
-	}
-	echo  tep_draw_pull_down_menu('entry_state', $zones_array,address_book::$cInfo->entry_state);
-      }
-    ?>
-    </p>
-  <?php endif; ?>
-
-  <p class="block_input">
-    <label for="entry_country_id"><?php echo __('entry country') ?></label>
-    <?php
-      if ($processed) echo worldUtility::get_country_name(address_book::$cInfo->entry_country_id) . tep_draw_hidden_field('entry_country_id')  ;
-      else echo  tep_draw_pull_down_menu('entry_country_id', worldUtility::get_countries(),address_book::$cInfo->entry_country_id);
-    ?>
-  </p>
-</fieldset>

Added: trunk/catalog/admin/includes/gabarit/adminUsers/display_view.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/adminUsers/display_view.edit.gab	                        (rev 0)
+++ trunk/catalog/admin/includes/gabarit/adminUsers/display_view.edit.gab	2012-03-12 17:41:10 UTC (rev 4075)
@@ -0,0 +1,63 @@
+<?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  12/03/2012, 19:33
+  @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(adminUsers::FILENAME, 'action=new_member') . '">' .tep_image(DIR_WS_ICONS . 'icon_add_new.png',IMAGE_NEW_MEMBER). IMAGE_NEW_MEMBER . '</a>'; ?>
+  </div>
+
+<div class="box_uniq">
+  <div class="box_left">
+
+    <table class="dataTable">
+	<thead>
+	  <tr>
+	    <th><?php echo __('table heading name'); ?></th>
+	    <th><?php echo __('table heading email'); ?></th>
+	    <th class="tcenter"><?php echo __('table heading groups'); ?></th>
+	    <th class="tcenter"><?php echo __('table heading lognum'); ?></th>
+	    <th class="row_action"><?php echo __('table heading action'); ?></th>
+	  </tr>
+	</thead>
+<?php /*	<tfoot>
+	  <tr>
+	    <td colspan="2"><?php echo $db_admin_split->display_count($db_admin_query_numrows, MAX_DISPLAY_SEARCH_RESULTS, $page, TEXT_DISPLAY_NUMBER_OF_MEMBERS); ?></td>
+	    <td colspan="2"><?php echo $db_admin_split->display_links($db_admin_query_numrows, MAX_DISPLAY_SEARCH_RESULTS, MAX_DISPLAY_PAGE_LINKS, $page); ?></td>
+	  </tr>
+	</tfoot> */ ?>
+	<tbody>
+	  <?php foreach(adminUsers::$list as $admin){  ?>
+	    <tr class="view parent dataTableRow <?php if ((!isset($_GET['mID'])) || ($_GET['mID'] == $admin['admin_id']) ) echo "Selected"; ?>" >
+	      <td><?php echo $admin['admin_firstname'].' '.$admin['admin_lastname']; ?></td>
+	      <td><?php echo $admin['admin_email_address']; ?></td>
+	      <td class="tcenter"><?php echo $admin['admin_groups_name']; ?></td>
+	      <td class="tcenter"><?php echo $admin['admin_lognum']; ?></td>
+	      <td class="row_action">
+		  <span class="view fils fleft">
+		  <?php
+		      echo ' <a class="buttonimg" href="' . tep_href_link(adminUsers::FILENAME, 'mID=' . $admin['admin_id'] . '&amp;action=edit') . '">' . tep_image(DIR_WS_ICONS . 'icon_edit.png',IMAGE_EDIT ). '</a> <a  class="buttonimg" href="' . tep_href_link(adminUsers::FILENAME, 'mID=' . $admin['admin_id'] . '&amp;action=del_member') . '">' . tep_image(DIR_WS_ICONS . 'icon_delete.png',IMAGE_DELETE).'</a>&nbsp;&nbsp;&nbsp;'; ?>
+		  </span>
+		  <span class="fright">
+		      <?php if ( (is_object(adminUsers::$mInfo)) && ($admin['admin_id'] == adminUsers::$mInfo->admin_id) ) { echo tep_image(DIR_WS_ICONS . 'icon_arrow_right.gif'); }
+		      else { echo '<a href="' . tep_href_link(adminUsers::FILENAME, 'mID=' . $admin['admin_id']) . '">' . tep_image(DIR_WS_ICONS . 'icon_info.gif', IMAGE_ICON_INFO) . '</a>'; } ?>
+		  </span>
+	      </td>
+	    </tr>
+	  <?php } ?>
+      </tbody>
+    </table>
+  </div>
+
+  <div class="box_right">
+    <?php echo adminUsers::get_right_bar(); ?>
+  </div>
+</div>
\ No newline at end of file

Copied: trunk/catalog/admin/includes/gabarit/adminUsers/display_view.listing.gab (from rev 4069, trunk/catalog/admin/includes/gabarit/adminUsers.listing.gab)
===================================================================
--- trunk/catalog/admin/includes/gabarit/adminUsers/display_view.listing.gab	                        (rev 0)
+++ trunk/catalog/admin/includes/gabarit/adminUsers/display_view.listing.gab	2012-03-12 17:41:10 UTC (rev 4075)
@@ -0,0 +1,63 @@
+<?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  12/03/2012, 19:33
+  @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(adminUsers::FILENAME, 'action=new_member') . '">' .tep_image(DIR_WS_ICONS . 'icon_add_new.png',IMAGE_NEW_MEMBER). IMAGE_NEW_MEMBER . '</a>'; ?>
+  </div>
+
+<div class="box_uniq">
+  <div class="box_left">
+
+    <table class="dataTable">
+	<thead>
+	  <tr>
+	    <th><?php echo __('table heading name'); ?></th>
+	    <th><?php echo __('table heading email'); ?></th>
+	    <th class="tcenter"><?php echo __('table heading groups'); ?></th>
+	    <th class="tcenter"><?php echo __('table heading lognum'); ?></th>
+	    <th class="row_action"><?php echo __('table heading action'); ?></th>
+	  </tr>
+	</thead>
+<?php /*	<tfoot>
+	  <tr>
+	    <td colspan="2"><?php echo $db_admin_split->display_count($db_admin_query_numrows, MAX_DISPLAY_SEARCH_RESULTS, $page, TEXT_DISPLAY_NUMBER_OF_MEMBERS); ?></td>
+	    <td colspan="2"><?php echo $db_admin_split->display_links($db_admin_query_numrows, MAX_DISPLAY_SEARCH_RESULTS, MAX_DISPLAY_PAGE_LINKS, $page); ?></td>
+	  </tr>
+	</tfoot> */ ?>
+	<tbody>
+	  <?php foreach(adminUsers::$list as $admin){  ?>
+	    <tr class="view parent dataTableRow <?php if ((!isset($_GET['mID'])) || ($_GET['mID'] == $admin['admin_id']) ) echo "Selected"; ?>" >
+	      <td><?php echo $admin['admin_firstname'].' '.$admin['admin_lastname']; ?></td>
+	      <td><?php echo $admin['admin_email_address']; ?></td>
+	      <td class="tcenter"><?php echo $admin['admin_groups_name']; ?></td>
+	      <td class="tcenter"><?php echo $admin['admin_lognum']; ?></td>
+	      <td class="row_action">
+		  <span class="view fils fleft">
+		  <?php
+		      echo ' <a class="buttonimg" href="' . tep_href_link(adminUsers::FILENAME, 'mID=' . $admin['admin_id'] . '&amp;action=edit') . '">' . tep_image(DIR_WS_ICONS . 'icon_edit.png',IMAGE_EDIT ). '</a> <a  class="buttonimg" href="' . tep_href_link(adminUsers::FILENAME, 'mID=' . $admin['admin_id'] . '&amp;action=del_member') . '">' . tep_image(DIR_WS_ICONS . 'icon_delete.png',IMAGE_DELETE).'</a>&nbsp;&nbsp;&nbsp;'; ?>
+		  </span>
+		  <span class="fright">
+		      <?php if ( (is_object(adminUsers::$mInfo)) && ($admin['admin_id'] == adminUsers::$mInfo->admin_id) ) { echo tep_image(DIR_WS_ICONS . 'icon_arrow_right.gif'); }
+		      else { echo '<a href="' . tep_href_link(adminUsers::FILENAME, 'mID=' . $admin['admin_id']) . '">' . tep_image(DIR_WS_ICONS . 'icon_info.gif', IMAGE_ICON_INFO) . '</a>'; } ?>
+		  </span>
+	      </td>
+	    </tr>
+	  <?php } ?>
+      </tbody>
+    </table>
+  </div>
+
+  <div class="box_right">
+    <?php echo adminUsers::get_right_bar(); ?>
+  </div>
+</div>
\ No newline at end of file

Deleted: trunk/catalog/admin/includes/gabarit/adminUsers.listing.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/adminUsers.listing.gab	2012-03-11 17:43:51 UTC (rev 4074)
+++ trunk/catalog/admin/includes/gabarit/adminUsers.listing.gab	2012-03-12 17:41:10 UTC (rev 4075)
@@ -1,63 +0,0 @@
-<?php
-/**
-  @licence GPL 2005-2011  The osCSS developers - osCSS Open Source E-commerce
-  @portion code Copyright (c) 2002 osCommerce
-  @package osCSS-2 <www http://www.oscss.org>
-  @version 2.1.1
-  @date  02/10/11, 19:33
-  @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(adminUsers::FILENAME, 'action=new_member') . '">' .tep_image(DIR_WS_ICONS . 'icon_add_new.png',IMAGE_NEW_MEMBER). IMAGE_NEW_MEMBER . '</a>'; ?>
-  </div>
-
-<div class="box_uniq">
-  <div class="box_left">
-
-    <table class="dataTable">
-	<thead>
-	  <tr>
-	    <th><?php echo __('table heading name'); ?></th>
-	    <th><?php echo __('table heading email'); ?></th>
-	    <th class="tcenter"><?php echo __('table heading groups'); ?></th>
-	    <th class="tcenter"><?php echo __('table heading lognum'); ?></th>
-	    <th class="row_action"><?php echo __('table heading action'); ?></th>
-	  </tr>
-	</thead>
-<?php /*	<tfoot>
-	  <tr>
-	    <td colspan="2"><?php echo $db_admin_split->display_count($db_admin_query_numrows, MAX_DISPLAY_SEARCH_RESULTS, $page, TEXT_DISPLAY_NUMBER_OF_MEMBERS); ?></td>
-	    <td colspan="2"><?php echo $db_admin_split->display_links($db_admin_query_numrows, MAX_DISPLAY_SEARCH_RESULTS, MAX_DISPLAY_PAGE_LINKS, $page); ?></td>
-	  </tr>
-	</tfoot> */ ?>
-	<tbody>
-	  <?php foreach(adminUsers::$list as $admin){  ?>
-	    <tr class="view parent dataTableRow <?php if ((!isset($_GET['mID'])) || ($_GET['mID'] == $admin['admin_id']) ) echo "Selected"; ?>" >
-	      <td><?php echo $admin['admin_firstname'].' '.$admin['admin_lastname']; ?></td>
-	      <td><?php echo $admin['admin_email_address']; ?></td>
-	      <td class="tcenter"><?php echo $admin['admin_groups_name']; ?></td>
-	      <td class="tcenter"><?php echo $admin['admin_lognum']; ?></td>
-	      <td class="row_action">
-		  <span class="view fils fleft">
-		  <?php
-		      echo ' <a class="buttonimg" href="' . tep_href_link(adminUsers::FILENAME, 'mID=' . $admin['admin_id'] . '&amp;action=edit_member') . '">' . tep_image(DIR_WS_ICONS . 'icon_edit.png',IMAGE_EDIT ). '</a> <a  class="buttonimg" href="' . tep_href_link(adminUsers::FILENAME, 'mID=' . $admin['admin_id'] . '&amp;action=del_member') . '">' . tep_image(DIR_WS_ICONS . 'icon_delete.png',IMAGE_DELETE).'</a>&nbsp;&nbsp;&nbsp;'; ?>
-		  </span>
-		  <span class="fright">
-		      <?php if ( (is_object(adminUsers::$mInfo)) && ($admin['admin_id'] == adminUsers::$mInfo->admin_id) ) { echo tep_image(DIR_WS_ICONS . 'icon_arrow_right.gif'); }
-		      else { echo '<a href="' . tep_href_link(adminUsers::FILENAME, 'mID=' . $admin['admin_id']) . '">' . tep_image(DIR_WS_ICONS . 'icon_info.gif', IMAGE_ICON_INFO) . '</a>'; } ?>
-		  </span>
-	      </td>
-	    </tr>
-	  <?php } ?>
-      </tbody>
-    </table>
-  </div>
-
-  <div class="box_right">
-    <?php echo adminUsers::get_right_bar(); ?>
-  </div>
-</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.

[Oscss-commit] SF.net SVN: oscss:[4074] trunk/catalog

[<os...@us...>]

Revision: 4074
          http://oscss.svn.sourceforge.net/oscss/?rev=4074&view=rev
Author:   oscim
Date:     2012-03-11 17:43:51 +0000 (Sun, 11 Mar 2012)
Log Message:
-----------
correction coquille et erreur de notice

Modified Paths:
--------------
    trunk/catalog/admin/includes/classes/drivers/sqlproductoption.php
    trunk/catalog/admin/includes/gabarit/attributes/display_view.options.edit.gab
    trunk/catalog/admin/includes/modules/pages/attributes.php
    trunk/catalog/includes/classes/drivers/data/product.php

Modified: trunk/catalog/admin/includes/classes/drivers/sqlproductoption.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlproductoption.php	2012-03-08 18:39:08 UTC (rev 4073)
+++ trunk/catalog/admin/includes/classes/drivers/sqlproductoption.php	2012-03-11 17:43:51 UTC (rev 4074)
@@ -1,10 +1,10 @@
 <?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
 /**
-  @licence GPL 2005-2011  The osCSS developers - osCSS Open Source E-commerce
+  @licence GPL 2005-2012  The osCSS developers - osCSS Open Source E-commerce
   @portion code Copyright (c) 2002 osCommerce
   @package osCSS-2 <www http://www.oscss.org>
   @version 2.1.1
-  @date  01/11/11, 09:50
+  @date  11/03/2012, 09:50
   @author oscim <mail aur...@os...> <www http://www.oscim.fr>
   @encode UTF-8
   @class manage link table configuration
@@ -120,7 +120,7 @@
       $array=array();
 
       foreach($res->fetchAllAssoc() as $result)
-	$array[]= ((!$shortkey)? $result : self::CleanKey($result));
+				$array[]= ((!$shortkey)? $result : self::CleanKey($result));
 
       return $array;
     }
@@ -156,11 +156,11 @@
       $object= new stdclass();
 
       foreach($array as $key=>$value){
-	if( strpos($key,'products_options_') ===0)
-	  $key=substr($key,17);
+				if( strpos($key,'products_options_') ===0)
+					$key=substr($key,17);
 
 
-	$object->$key = $value;
+				$object->$key = $value;
       }
 
       return $object;
@@ -170,22 +170,28 @@
     @brief
     @return array empty
   */
-  public static function Specimen(){
+  public static function Specimen($shortkey=false){
     global $languages_id;
-    $par = array(
+    $result = array(
 		  'products_options_id'=>'',
-		  'language_id'=>$languages_id,
-		  'products_options_name'=>'',
+// 		  'language_id'=>$languages_id,
+// 		  'products_options_name'=>'',
 		  'products_options_track_stock'=>'',
 		  'products_options_sort_order'=>'',
 		  'products_options_images_enabled'=>'',
 		  'products_options_type'=>'',
 		  'products_options_length'=>'',
-		  'products_options_comment'=>'',
+// 		  'products_options_comment'=>'',
 		  'products_options_condition'=>'',
 			);
 
-    return self::CleanKey($par);
+		foreach(tep_get_languages() as $lg){
+			$result['products_options_name'][$lg['id']] = '';
+			$result['products_options_comment'][$lg['id']] = '';
+			$result['language_id'][$lg['id']] = $lg['id'];
+		}
+
+    return ((!$shortkey)? $result : self::CleanKey($result));
   }
 
   /**

Modified: trunk/catalog/admin/includes/gabarit/attributes/display_view.options.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/attributes/display_view.options.edit.gab	2012-03-08 18:39:08 UTC (rev 4073)
+++ trunk/catalog/admin/includes/gabarit/attributes/display_view.options.edit.gab	2012-03-11 17:43:51 UTC (rev 4074)
@@ -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  07/02/11, 19:22
+  @version 2.1.1
+  @date  11/03/2012, 19:22
   @author oscim <mail aur...@os...> <www http://www.oscim.fr>
   @encode UTF-8
 */
@@ -15,7 +15,7 @@
     <fieldset class="tabs_lang block_field">
       <ul>
       <?php for ($i=0, $n=sizeof(attributes::$languages); $i<$n; $i++) { ?>
-	<li><?php echo '<a href="#_name-' . ($i+1).'" >' . tep_image(DIR_WS_CATALOG_LANGUAGES . attributes::$languages[$i]['directory'] . '/images/' . attributes::$languages[$i]['image'], attributes::$languages[$i]['name']) . '&nbsp;' . attributes::$languages[$i]['name'] . '</a>'  ?></li>
+	<li><?php echo '<a href="#_name-' . ($i+1).'" >' . tep_language_image(attributes::$languages[$i]['directory'] . '/images/' . attributes::$languages[$i]['image'], attributes::$languages[$i]['name']) . '&nbsp;' . attributes::$languages[$i]['name'] . '</a>'  ?></li>
       <?php } ?>
       </ul>
       <?php for ($i=0, $n=sizeof(attributes::$languages); $i<$n; $i++) { ?>

Modified: trunk/catalog/admin/includes/modules/pages/attributes.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/attributes.php	2012-03-08 18:39:08 UTC (rev 4073)
+++ trunk/catalog/admin/includes/modules/pages/attributes.php	2012-03-11 17:43:51 UTC (rev 4074)
@@ -1,10 +1,10 @@
 <?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
 /**
-  @licence GPL 2005-2011  The osCSS developers - osCSS Open Source E-commerce
+  @licence GPL 2005-2012  The osCSS developers - osCSS Open Source E-commerce
   @portion code Copyright (c) 2002 osCommerce
   @package osCSS-2 <www http://www.oscss.org>
   @version 2.1.1
-  @date  28/12/11, 21:49
+  @date  11/03/2012, 21:49
   @author oscim <mail aur...@os...> <www http://www.oscim.fr>
   @encode UTF-8
   @class attributes
@@ -88,7 +88,7 @@
   public function check_action($actions){
     global $messageStack;
 
-error_reporting(E_ALL);
+
     self::$action=$actions;
 
     switch (self::$action) {
@@ -181,11 +181,13 @@
       break;
 
       case 'new':
-					$res=array();
+					$res=sqlproductoption::Specimen();
+
 					for ($i=0, $n=sizeof(self::$languages); $i<$n; $i++) {
 						$res['products_options_values_name'][self::$languages[$i]['id']] = "";
 						$res['products_options_values_thumbnail'][self::$languages[$i]['id']] = "";
 					}
+
 					self::$poIDInfo= new objectInfo($res);
       break;
     }
@@ -454,12 +456,11 @@
  /** static InterfacedInnerHtml */
 
   public static function detail_row_page($id){
-// error_reporting(E_ALL);
 
     self::$poID=(int)$id;
     self::$type='values_for_option';
     self::load_db_values((int)$id);
-// var_dump(MGabCont::CallGab('option.inline','display_view',__CLASS__));
+
     return MGabCont::CallGab('options.inline','display_view',__CLASS__);
   }
 

Modified: trunk/catalog/includes/classes/drivers/data/product.php
===================================================================
--- trunk/catalog/includes/classes/drivers/data/product.php	2012-03-08 18:39:08 UTC (rev 4073)
+++ trunk/catalog/includes/classes/drivers/data/product.php	2012-03-11 17:43:51 UTC (rev 4074)
@@ -410,6 +410,9 @@
 		foreach($a as $r)
 			if(!empty($r))$val .=$r.",";
 
+		if(strlen($val) <= 0)
+			return '';
+
 		$val = $DB->query( $sql ="SELECT  epf_value as value FROM " . TABLE_PRODUCTS_EXTRA_FIELDS_VALUES . " p2epf   WHERE value_id IN (".substr($val, 0, -1).") AND epf_id = '" . (int)$epfid . "' AND languages_id='".(int) $languages_id."' ORDER BY  sort_order ");
 		$result = $val->fetchAllAssoc();
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Oscss-commit] SF.net SVN: oscss:[4073] trunk/catalog

[<os...@us...>]

Revision: 4073
          http://oscss.svn.sourceforge.net/oscss/?rev=4073&view=rev
Author:   oscim
Date:     2012-03-08 18:39:08 +0000 (Thu, 08 Mar 2012)
Log Message:
-----------
correction coquille 
ajout d'un icone pour les action de held_orders

Modified Paths:
--------------
    trunk/catalog/admin/includes/gabarit/shipping/display_view.edit.gab
    trunk/catalog/admin/includes/modules/pages/held_orders.php
    trunk/catalog/admin/includes/modules/pages/shipping.php
    trunk/catalog/admin/includes/template/oscss/data/icon_set.xml
    trunk/catalog/common/classes/osCSS_pdf.php

Modified: trunk/catalog/admin/includes/gabarit/shipping/display_view.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/shipping/display_view.edit.gab	2012-03-07 19:34:46 UTC (rev 4072)
+++ trunk/catalog/admin/includes/gabarit/shipping/display_view.edit.gab	2012-03-08 18:39:08 UTC (rev 4073)
@@ -131,7 +131,7 @@
 					<?php else: ?>
 						<tr>
 							<td  colspan="3">&nbsp;</td>
-							<td><?php if(!_cst_bool('USE_LOCAL_GENERAT_PDF')) echo '<a class="button" href="' .  tep_href_link(FILENAME_SHIPPING, tep_get_all_get_params(array('page_admin','action')).'action=pdf&forceview=pdf&amp;file_type=delivery&id='.$_GET['oID']) . '" >' .  __('pdf generate') . '</a>' ; ?> </td>
+							<td><?php if(!_cst_bool('USE_LOCAL_GENERAT_PDF')) echo '<a class="button" href="' .  tep_href_link(FILENAME_SHIPPING, tep_get_all_get_params(array('page_admin','action','oID')).'action=pdf&forceview=pdf&amp;file_type=delivery&id='.$_GET['oID']) . '" >' .  __('pdf generate') . '</a>' ; ?> </td>
 						</tr>
 					<?php endif; ?>
 		</table>

Modified: trunk/catalog/admin/includes/modules/pages/held_orders.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/held_orders.php	2012-03-07 19:34:46 UTC (rev 4072)
+++ trunk/catalog/admin/includes/modules/pages/held_orders.php	2012-03-08 18:39:08 UTC (rev 4073)
@@ -1,10 +1,10 @@
 <?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
 /**
-  @licence GPL 2005-2011  The osCSS developers - osCSS Open Source E-commerce
+  @licence GPL 2005-2012  The osCSS developers - osCSS Open Source E-commerce
   @portion code Copyright (c) 2002 osCommerce
   @package osCSS-2 <www http://www.oscss.org>
   @version 2.1.1
-  @date  26/11/11, 22:33
+  @date  08/03/2012, 22:33
   @author oscim <mail aur...@os...> <www http://www.oscim.fr>
   @encode UTF-8
   @class held_orders
@@ -252,7 +252,7 @@
     return  sprintf(
 		  CsrtAction::getFormat('row_action'),
 		  '' ,
-		  sprintf(CsrtAction::getLink('row_action_right',  __('image recup help order'), 'recup_order'), 'fancy',  tep_href_link(self::FILENAME,  'oID=' . $orders['oID'] . '&amp;action=recup_order') ,'' ).
+		  sprintf(CsrtAction::getLink('row_action_right',  __('image recup help order'), 'heldorder'), 'fancy',  tep_href_link(self::FILENAME,  'oID=' . $orders['oID'] . '&amp;action=recup_order') ,'' ).
 		  sprintf(CsrtAction::getLink('row_action_right', IMAGE_DELETE, 'delete'), 'fancy',  tep_href_link(self::FILENAME,  'oID=' . $orders['oID'] . '&amp;action=delete') ,'' )
 	      );
   }

Modified: trunk/catalog/admin/includes/modules/pages/shipping.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/shipping.php	2012-03-07 19:34:46 UTC (rev 4072)
+++ trunk/catalog/admin/includes/modules/pages/shipping.php	2012-03-08 18:39:08 UTC (rev 4073)
@@ -207,74 +207,68 @@
 			/**
 				@remarks pdf  generate for all docs 
 			*/
-// 			case 'pdf':
-// 
-// 				if( _cst_bool('USE_LOCAT_GENERAT_PDF') )
-// 					$messageStack->add_session(__('warning pdf not generat by this core, please adjust configuration'), 'warning');
-// 				else {
-// 					$ID=(int)$_REQUEST['id'];
-// 					$type=$_REQUEST['file_type'] ;
-// 					global $pdf, $currencies;
-// 					osCSS_pdf::getInstance();
-// 
-// 					/// force encode for fdpf is in iso8859
-// 					header("Content-Type: text/html; charset=utf-8");
-// 					self::$shipping_statuses = array_merge(tep_get_status_array('shipping'),array(array('id'=>'','text'=>TEXT_NONE)));
-// 					self::$file_type_array= osCSS_pdf::get_module();
-// 
-// 					$pdf=osCSS_pdf::OutputInit($type);
-// 					$DF = new DatasFiles;
-// 
-// 					switch($type){
-// 						case 'delivery':
-// 							global $obj_shipping;
-// 							$obj_shipping = sqlshipping::fetch(array('id'=>$ID), true);
-// 							$oID = $obj_shipping->shipping_id;
-// 							$order = new order($obj_shipping->shipping_id);
-// 						break;
-// 						case 'packingslip':
-// 						case 'invoice':
-// 						default:
-// 							$oID = $ID;
-// 							$order = new order($ID);
-// 					}
-// 
-// 					osCSS_pdf::OutputAddPage();
-// 
-// 					include(osCSS_pdf::getPathModele());
-// 
-// 					$file=$DF->GetDoc(osCSS_pdf::GetPdfType(),$ID);
-// 
-// 					if(file_exists($file))
-// 						unlink($file);
-// 
-// 					$pdf=osCSS_pdf::SaveEnd($file);
-// 
-// 					/// @remarks draw and exit;
-// 	// 				$pdf=osCSS_pdf::OutputEnd();
-// 				}
-// 				if(!isset($_GET['forceajax']))
-// 					tep_redirect(tep_href_link(self::FILENAME,  'oID='.$oID.'&action=edit'));
-// 			break;
+			case 'pdf':
 
+				if( _cst_bool('USE_LOCAT_GENERAT_PDF') )
+					$messageStack->add_session(__('warning pdf not generat by this core, please adjust configuration'), 'warning');
+				else {
+					$ID=(int)$_REQUEST['oID'];
+					$type=$_REQUEST['file_type'] ;
+					global $pdf, $currencies;
+					osCSS_pdf::getInstance();
+
+					/// force encode for fdpf is in iso8859
+					header("Content-Type: text/html; charset=utf-8");
+					self::$shipping_statuses = array_merge(tep_get_status_array('shipping'),array(array('id'=>'','text'=>TEXT_NONE)));
+					self::$file_type_array= osCSS_pdf::get_module();
+
+					$pdf=osCSS_pdf::OutputInit($type);
+					$DF = new DatasFiles;
+
+					switch($type){
+						case 'delivery':
+							global $obj_shipping;
+							$obj_shipping = sqlshipping::fetch(array('id'=>$ID), true);
+							$oID = $obj_shipping->row_id;
+							$order = new order($obj_shipping->orders_id);
+						break;
+					}
+
+					osCSS_pdf::OutputAddPage();
+
+					include(osCSS_pdf::getPathModele());
+
+					$file=$DF->GetDoc(osCSS_pdf::GetPdfType(),$ID);
+
+					if(file_exists($file))
+						unlink($file);
+
+					$pdf=osCSS_pdf::SaveEnd($file);
+
+					/// @remarks draw and exit;
+	// 				$pdf=osCSS_pdf::OutputEnd();
+				}
+				if(!isset($_GET['forceajax']))
+					tep_redirect(tep_href_link(self::FILENAME,  'oID='.$oID.'&action=edit'));
+			break;
+
 			/**
 				@remarks pdf  generate
 			*/
-// 			case 'deletefile':
-// 				$oID=(int)$_REQUEST['oID'];
-// 				$ID=(int)$_REQUEST['id'];
-// 				$type=$_REQUEST['file_type'] ;
-// 
-// 				$datadocs=new DatasFiles;
-// 
-// 				if(( $filepath=$datadocs->GetDoc($type, $ID)) && file_exists($filepath))
-// 					unlink($filepath);
-// 
-// 				if(!isset($_GET['forceajax']))
-// 					tep_redirect(tep_href_link(self::FILENAME,  'oID='.$oID.'&action=edit'));
-// 			break;
+			case 'deletefile':
+				$ID=(int)$_REQUEST['id'];
+				$type=$_REQUEST['file_type'] ;
 
+				$datadocs=new DatasFiles;
 
+				if(( $filepath=$datadocs->GetDoc($type, $ID)) && file_exists($filepath))
+					unlink($filepath);
+
+				if(!isset($_GET['forceajax']))
+					tep_redirect(tep_href_link(self::FILENAME,  'oID='.$ID.'&action=edit'));
+			break;
+
+
 			/**
 				@remarks Action mutliple
 			*/

Modified: trunk/catalog/admin/includes/template/oscss/data/icon_set.xml
===================================================================
--- trunk/catalog/admin/includes/template/oscss/data/icon_set.xml	2012-03-07 19:34:46 UTC (rev 4072)
+++ trunk/catalog/admin/includes/template/oscss/data/icon_set.xml	2012-03-08 18:39:08 UTC (rev 4073)
@@ -35,31 +35,31 @@
 			<trash>icon_trash.gif</trash>
 			<refresh>refresh.png</refresh>
 			<config>settings.png</config>
-			
+			<heldorder>arrow_switch.png</heldorder>
 			<!--       <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>
+			<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>
+			<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>
+			<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>
+			<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>

Modified: trunk/catalog/common/classes/osCSS_pdf.php
===================================================================
--- trunk/catalog/common/classes/osCSS_pdf.php	2012-03-07 19:34:46 UTC (rev 4072)
+++ trunk/catalog/common/classes/osCSS_pdf.php	2012-03-08 18:39:08 UTC (rev 4073)
@@ -34,7 +34,7 @@
   private function __construct(){
 
     define('BATCH_PRINT_INC', DIR_WS_MODULES . 'template_pdf/');
-    define('BATCH_PDF_DIR', DIR_FS_ROOT_DOCS . 'tmp/');
+    define('BATCH_PDF_DIR', DIR_FS_ROOT_DOCS . 'admin/tmp/');
     define('FPDF_FONTPATH',DIR_FS_CATALOG.DIR_WS_COMMON_FONTS);
 
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Oscss-commit] SF.net SVN: oscss:[4072] trunk/catalog/admin/includes

[<os...@us...>]

Revision: 4072
          http://oscss.svn.sourceforge.net/oscss/?rev=4072&view=rev
Author:   oscim
Date:     2012-03-07 19:34:46 +0000 (Wed, 07 Mar 2012)
Log Message:
-----------
correction coquille liens sur les widget 
amelioration widget notifications
suite shipping page 
categories fr ajout element manquant

Modified Paths:
--------------
    trunk/catalog/admin/includes/gabarit/shipping/display_view.edit.gab
    trunk/catalog/admin/includes/languages/fr_FR/modules/pages/categories.txt
    trunk/catalog/admin/includes/languages/fr_FR/modules/pages/shipping.txt
    trunk/catalog/admin/includes/modules/pages/shipping.php
    trunk/catalog/admin/includes/widget/Notification.php
    trunk/catalog/admin/includes/widget/orderLastservice.php
    trunk/catalog/admin/includes/widget/orderLastshipp.php

Modified: trunk/catalog/admin/includes/gabarit/shipping/display_view.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/shipping/display_view.edit.gab	2012-03-06 20:59:08 UTC (rev 4071)
+++ trunk/catalog/admin/includes/gabarit/shipping/display_view.edit.gab	2012-03-07 19:34:46 UTC (rev 4072)
@@ -10,7 +10,6 @@
 */
 global $price;
 
-// print_r(shipping::$shipping);
 ?>
 <div class="box_uniq block_form main-shipping">
   <div id="tabs">
@@ -92,6 +91,53 @@
 
 
 
+
+
+
+  <div class="main-orders block fleft w_50 padd_w">
+	</div>
+
+
+	<?php
+  /**
+    DRAW BLOCK DOCS EXISTS OR LINK PDF CREATE
+  */
+	$datadocs=new DatasFiles;   ?>
+  <div class="main-orders block fleft w_50 padd_w">
+		<h4><?php echo __('heading documents') ?></h4>
+
+		<table class="main-orders docs">
+			<thead>
+			<tr>
+				<th><?php echo __('shipping table pdf heading file') ?></th>
+				<th><?php echo __('shipping table pdf heading weight') ?></th>
+				<th><?php echo __('shipping table pdf heading date') ?></th>
+				<th>&nbsp;</th>
+			</tr>
+			</thead>
+
+			<tr>
+				<th colspan="3"><?php echo __('image shipping delivery') ?></th>
+				<th></th>
+			</tr>
+
+					<?php if(( $filepath=$datadocs->GetDoc('delivery', $_GET['oID'])) && file_exists($filepath)): ?>
+						<tr>
+							<td><a href="<?php echo tep_href_link('document.php', 'mod=delivery&id='.$_GET['oID']) ?>"><?php echo basename($filepath) ?></a></td>
+							<td><?php echo round((filesize($filepath)/1000),1).' Ko' ; ?></td>
+							<td><?php echo tep_datetime_short(date('Y-m-d H:i:s',filemtime($filepath))) ; ?></td>
+							<td><?php echo sprintf(CsrtAction::getLink('row_action_right', IMAGE_DELETE, 'trash'), '',  tep_href_link(shipping::FILENAME,  'file_type=delivery&amp;action=deletefile&id='.$_GET['oID'].'&oID='.shipping::$shipping->orders_id) ,'' ) ; ?></td>
+						</tr>
+					<?php else: ?>
+						<tr>
+							<td  colspan="3">&nbsp;</td>
+							<td><?php if(!_cst_bool('USE_LOCAL_GENERAT_PDF')) echo '<a class="button" href="' .  tep_href_link(FILENAME_SHIPPING, tep_get_all_get_params(array('page_admin','action')).'action=pdf&forceview=pdf&amp;file_type=delivery&id='.$_GET['oID']) . '" >' .  __('pdf generate') . '</a>' ; ?> </td>
+						</tr>
+					<?php endif; ?>
+		</table>
+	</div>
+
+
     <div class="button_nav">
       <?php echo tep_js_back(tep_href_link(shipping::FILENAME), IMAGE_CANCEL);?>
     </div>

Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/pages/categories.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/pages/categories.txt	2012-03-06 20:59:08 UTC (rev 4071)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/categories.txt	2012-03-07 19:34:46 UTC (rev 4072)
@@ -52,6 +52,7 @@
 $lang['text categories image']="Image de la catégorie :" ;
 $lang['text sort order']="Ordre de tri :" ;
 $lang['text products']="Produits : " ;
+$lang['txt categories']="Positions de cette categorie (choix du parent) : " ;
 $lang['text cms']="Page : " ;
 $lang['tab products data']="Caractéristiques" ;
 $lang['text choose img']="Choix de l'image " ;

Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/pages/shipping.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/pages/shipping.txt	2012-03-06 20:59:08 UTC (rev 4071)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/shipping.txt	2012-03-07 19:34:46 UTC (rev 4072)
@@ -42,10 +42,16 @@
 		$lang['table heading id']="id" ;
 		$lang['table heading products']="Produits" ;
 		$lang['table heading qt expedie']="Qté." ;
-// 		$lang['table heading products']="Produits" ;
-	
 
 
+		$lang['heading documents']="Documents" ;
+		$lang['shipping table pdf heading weight']="Poids" ;
+		$lang['shipping table pdf heading date']="Date" ;
+		$lang['shipping table pdf heading file']="Fichier" ;
+		$lang['image shipping delivery']="Bon de livraison" ;
+		$lang['pdf generate']="Generer" ;	
+
+
 /* Value list */
 	/* status */
 	$lang['shipping opened']="Ouverte" ;

Modified: trunk/catalog/admin/includes/modules/pages/shipping.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/shipping.php	2012-03-06 20:59:08 UTC (rev 4071)
+++ trunk/catalog/admin/includes/modules/pages/shipping.php	2012-03-07 19:34:46 UTC (rev 4072)
@@ -409,6 +409,12 @@
 					tep_redirect(tep_href_link(self::FILENAME, tep_get_all_get_params(array('action','sID','setflag','auto_retry','flag'), false)  .'action=edit' ));
 			break;
 
+			case 'edit':
+				if(!sqlshipping::fetch(array('id'=>(int)$_GET['oID']), true) ) {
+					$messageStack->add_session(__('error shipping id not found'), 'warning');
+					tep_redirect(tep_href_link(self::FILENAME));
+				}
+			break;
    }
 
     return self::$action;

Modified: trunk/catalog/admin/includes/widget/Notification.php
===================================================================
--- trunk/catalog/admin/includes/widget/Notification.php	2012-03-06 20:59:08 UTC (rev 4071)
+++ trunk/catalog/admin/includes/widget/Notification.php	2012-03-07 19:34:46 UTC (rev 4072)
@@ -11,18 +11,26 @@
 */
 if(!class_exists('adminNotif'))require_once(DIR_WS_MODULES.'pages/adminNotif.php');
 
-if(count(adminNotif::$list)<=0)
-	return false;
+if(count(adminNotif::$list) > 0 ) :
 ?>
-<div id="Notification" class="<?php echo $widg['class'] ?>">
- <h3><a href="<?php echo tep_href_link(FILENAME_ADMINNOTIF) ?>"><?php echo __('heading notification') ;?></a></h3>
-  <ul>
-    <?php foreach(adminNotif::$list as $p) { ?>
-	<li>
-	    <?php echo tep_datetime_short($p['notif_date']) ;?> <strong> <a href="<?php echo tep_href_link(FILENAME_ADMINNOTIF, 'action=view&amp;nID='.$p['notif_id']) ?>" ><?php echo $p['notif_key'] ?></a> </strong>
-	</li>
-    <?php } ?>
-  </ul>
+	<div id="Notification" class="<?php echo $widg['class'] ?>">
+	<h3><a href="<?php echo tep_href_link(FILENAME_ADMINNOTIF) ?>"><?php echo __('heading notification') ;?></a></h3>
 
- <div class="separator"></div>
-</div>
+		<table class="dataTableBase">
+			<tr>
+				<th><?php echo __('orderLastinvoice box reference'); ?></th>
+				<th><?php echo __('orderLastinvoice box date'); ?></th>
+<!-- 				<th><?php //echo __('orderLastinvoice box status'); ?></th> -->
+			</tr>
+			<?php foreach(adminNotif::$list as $row) :  ?>
+			<tr>
+				<td><strong><a href="<?php echo tep_href_link(FILENAME_ADMINNOTIF, 'action=view&amp;nID='.$row['notif_id']) ?>"><?php echo $row['notif_key'] ?></strong></td>
+				<td class="tcenter"><?php echo tep_datetime_short($row['notif_date']) ?></td>
+<!-- 				<td><?php //echo $row['status_name'] ?></td> -->
+			</tr>
+			<?php endforeach; ?>
+		</table>
+
+	<div class="separator"></div>
+	</div>
+<?php endif; ?>

Modified: trunk/catalog/admin/includes/widget/orderLastservice.php
===================================================================
--- trunk/catalog/admin/includes/widget/orderLastservice.php	2012-03-06 20:59:08 UTC (rev 4071)
+++ trunk/catalog/admin/includes/widget/orderLastservice.php	2012-03-07 19:34:46 UTC (rev 4072)
@@ -30,11 +30,11 @@
 	</tr>
 	<?php foreach($_query->fetchAllAssoc() as $row) :  ?>
 	<tr>
-		<td><strong><a href="<?php echo tep_href_link('services.php', 'oID='.$row['orders_id'].'&action=edit') ?>"><?php echo $row['service_id'] ?></strong></td>
+		<td class="tcenter"><strong><a href="<?php echo tep_href_link('services.php', 'oID='.$row['service_id'].'&action=edit') ?>"><?php echo $row['service_id'] ?></strong></td>
 		<td style="width:200px;"><?php echo tep_customers_row_action($row['customers_id'], array()) ?></td>
 		<td><?php echo tep_date_short($row['date_added']) ?></td>
-		<td><?php echo tep_date_short($row['date_start'])  ?></td>
-		<td><?php echo $row['status']  ?></td>
+		<td class="tcenter"><?php echo tep_date_short($row['date_start'])  ?></td>
+		<td class="tcenter"><?php echo $row['status']  ?></td>
 	</tr>
 	<?php endforeach; ?>
 </table>

Modified: trunk/catalog/admin/includes/widget/orderLastshipp.php
===================================================================
--- trunk/catalog/admin/includes/widget/orderLastshipp.php	2012-03-06 20:59:08 UTC (rev 4071)
+++ trunk/catalog/admin/includes/widget/orderLastshipp.php	2012-03-07 19:34:46 UTC (rev 4072)
@@ -30,14 +30,14 @@
 	</tr>
 	<?php foreach($_query->fetchAllAssoc() as $row) :  ?>
 	<tr>
-		<td class="tcenter"><strong><a href="<?php echo tep_href_link('shipping.php', 'oID='.$row['orders_id'].'&action=edit') ?>"><?php echo $row['shipping_id'] ?></strong></td>
+		<td class="tcenter"><strong><a href="<?php echo tep_href_link('shipping.php', 'oID='.$row['shipping_id'].'&action=edit') ?>"><?php echo $row['shipping_id'] ?></strong></td>
 		<td>
 				<?php if(( $filepath=$datadocs->GetDoc('delivery', $row['shipping_id'] )) && file_exists($filepath)):  ?>
 					<a href="<?php echo tep_href_link('document.php', 'mod=delivery&id='. $row['shipping_id']) ?>"><?php echo basename($filepath) ?></a>
 				<?php endif; ?>
 		</td>
 		<td style="width:200px;"><?php echo tep_customers_row_action($row['customers_id'], array()) ?></td>
-		<td><?php echo tep_date_short($row['date_expedition']) ?></td>
+		<td class="tcenter"><?php echo tep_date_short($row['date_expedition']) ?></td>
 		<td><?php //echo $row['status_name'] ?></td>
 	</tr>
 	<?php endforeach; ?>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Oscss-commit] SF.net SVN: oscss:[4071] trunk/catalog

[<os...@us...>]

Revision: 4071
          http://oscss.svn.sourceforge.net/oscss/?rev=4071&view=rev
Author:   oscim
Date:     2012-03-06 20:59:08 +0000 (Tue, 06 Mar 2012)
Log Message:
-----------
ajustement dashbord
correction FS#956

Modified Paths:
--------------
    trunk/catalog/Documents/admin/data/dashboard.xml
    trunk/catalog/Documents/admin/data/notification_src.xml
    trunk/catalog/admin/includes/classes/drivers/sqlcategorie.php
    trunk/catalog/admin/includes/gabarit/categories/display_view.edit.gab

Modified: trunk/catalog/Documents/admin/data/dashboard.xml
===================================================================
--- trunk/catalog/Documents/admin/data/dashboard.xml	2012-03-06 19:49:48 UTC (rev 4070)
+++ trunk/catalog/Documents/admin/data/dashboard.xml	2012-03-06 20:59:08 UTC (rev 4071)
@@ -35,6 +35,8 @@
 			<widget>ContentLastModified</widget>
     </left>
     <right>
+<!-- 			<widget>ImagesLastAdded</widget> -->
+			<widget>CategorieLast</widget>
       <widget>quickview</widget>
     </right>
   </cms>

Modified: trunk/catalog/Documents/admin/data/notification_src.xml
===================================================================
--- trunk/catalog/Documents/admin/data/notification_src.xml	2012-03-06 19:49:48 UTC (rev 4070)
+++ trunk/catalog/Documents/admin/data/notification_src.xml	2012-03-06 20:59:08 UTC (rev 4071)
@@ -9,12 +9,15 @@
     <action>checkout_process</action>
     <action>contact_us</action>
     <action>cronjob</action>
-    <action>returns</action>
+		<action>returns</action>
+    <action>services</action>
+		<action>shipping</action>
+		<action>payment</action>
   </metier>
 
   <method>
     <mode>sql</mode>
     <mode>email</mode>
-    <mode>auto</mode>
+<!--     <mode>auto</mode> -->
   </method>
 </root>
\ No newline at end of file

Modified: trunk/catalog/admin/includes/classes/drivers/sqlcategorie.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlcategorie.php	2012-03-06 19:49:48 UTC (rev 4070)
+++ trunk/catalog/admin/includes/classes/drivers/sqlcategorie.php	2012-03-06 20:59:08 UTC (rev 4071)
@@ -4,7 +4,7 @@
   @portion code Copyright (c) 2002 osCommerce
   @package osCSS-2 <www http://www.oscss.org>
   @version 2.1.1
-  @date  01/01/12, 20:11
+  @date  06/03/2012, 20:11
   @author oscim <mail aur...@os...> <www http://www.oscim.fr>
   @encode UTF-8
   @class sqlcategorie
@@ -367,11 +367,11 @@
     @brief
     @return array empty
   */
-  public static function Specimen(){
+  public static function Specimen($shortkey=false){
 
     $list_languages=tep_get_languages();
 
-    $par = array(
+    $result = array(
 		  'parent_id'=>0,
 		  'sort_order'=>0,
 		  'categories_id'=>null,
@@ -380,11 +380,11 @@
 		  'categories_hidden'=>null,
 			);
     for ($i=0, $n=sizeof($list_languages); $i<$n; $i++) {
-	$par['categories_name'][$list_languages[$i]['id']] = '';
-	$par['categories_description'][$list_languages[$i]['id']] = '';
+			$result['categories_name'][$list_languages[$i]['id']] = '';
+			$result['categories_description'][$list_languages[$i]['id']] = '';
     }
 
-    return self::CleanKey($par);
+    return  ((!$shortkey)? $result : self::CleanKey($result));
   }
 
 

Modified: trunk/catalog/admin/includes/gabarit/categories/display_view.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/categories/display_view.edit.gab	2012-03-06 19:49:48 UTC (rev 4070)
+++ trunk/catalog/admin/includes/gabarit/categories/display_view.edit.gab	2012-03-06 20:59:08 UTC (rev 4071)
@@ -4,7 +4,7 @@
   @portion code Copyright (c) 2002 osCommerce
   @package osCSS-2 <www http://www.oscss.org>
   @version 2.1.1
-  @date  01/01/12, 23:13
+  @date  06/03/2012, 20:11
   @author oscim <mail aur...@os...> <www http://www.oscim.fr>
   @encode UTF-8
 */

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Oscss-commit] SF.net SVN: oscss:[4070] trunk/catalog/admin/includes

[<os...@us...>]

Revision: 4070
          http://oscss.svn.sourceforge.net/oscss/?rev=4070&view=rev
Author:   oscim
Date:     2012-03-06 19:49:48 +0000 (Tue, 06 Mar 2012)
Log Message:
-----------
Ajout de widget catgeorie et image 
ajout fichier manquant pour shipping 
correction des liens pour la prise en charge page shipping 
ajsuteemnt filename

Modified Paths:
--------------
    trunk/catalog/admin/includes/filenames.php
    trunk/catalog/admin/includes/gabarit/orders/display_view.edit.gab
    trunk/catalog/admin/includes/languages/fr_FR/modules/pages/shipping.txt
    trunk/catalog/admin/includes/modules/pages/shipping.php

Added Paths:
-----------
    trunk/catalog/admin/includes/gabarit/shipping/display_view.edit.gab
    trunk/catalog/admin/includes/gabarit/shipping/display_view.multi.gab
    trunk/catalog/admin/includes/languages/fr_FR/widget/CategorieLast.txt
    trunk/catalog/admin/includes/languages/fr_FR/widget/ImagesLastAdded.txt
    trunk/catalog/admin/includes/widget/CategorieLast.php
    trunk/catalog/admin/includes/widget/ImagesLastAdded.php

Modified: trunk/catalog/admin/includes/filenames.php
===================================================================
--- trunk/catalog/admin/includes/filenames.php	2012-03-05 20:54:24 UTC (rev 4069)
+++ trunk/catalog/admin/includes/filenames.php	2012-03-06 19:49:48 UTC (rev 4070)
@@ -61,6 +61,10 @@
 define('FILENAME_SPECIALS', 'specials.php');
 define('FILENAME_STATS', 'stats.php');
 define('FILENAME_STOCK', 'stock.php');
+
+define('FILENAME_SERVICES', 'services.php');
+define('FILENAME_SHIPPING', 'shipping.php');
+
 define('FILENAME_TAX_CLASSES', 'tax_classes.php');
 define('FILENAME_TEMPLATES', 'templates.php');
 define('FILENAME_WHOS_ONLINE', 'stats.php?module=whos_online');

Modified: trunk/catalog/admin/includes/gabarit/orders/display_view.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/orders/display_view.edit.gab	2012-03-05 20:54:24 UTC (rev 4069)
+++ trunk/catalog/admin/includes/gabarit/orders/display_view.edit.gab	2012-03-06 19:49:48 UTC (rev 4070)
@@ -437,6 +437,14 @@
 
 
 
+
+
+	<?php
+		/**
+			Liste and manage shipping 
+		*/
+	?>
+
 	<?php if(orders::$order->display_shipping): ?>
 		<div id="tabs-4" class="tabPage">
 
@@ -456,7 +464,7 @@
 					<?php if(isset($ashipping->row_id)): ?>
 					<tr>
 						<td class="tcenter">
-								<?php echo $ashipping->row_id; ?>
+								<a href="<?php echo tep_href_link(FILENAME_SHIPPING,'action=edit&oID='.$ashipping->row_id); ?>"><?php echo $ashipping->row_id; ?></a>
 						</td>
 						<td class="tcenter">
 								<?php echo tep_datetime_short($ashipping->date_expedition); ?>

Added: trunk/catalog/admin/includes/gabarit/shipping/display_view.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/shipping/display_view.edit.gab	                        (rev 0)
+++ trunk/catalog/admin/includes/gabarit/shipping/display_view.edit.gab	2012-03-06 19:49:48 UTC (rev 4070)
@@ -0,0 +1,100 @@
+<?php
+/**
+  @licence GPL 2005-2012  The osCSS developers - osCSS Open Source E-commerce
+  @portion code Copyright (c) 2002 osCommerce
+  @package osCSS-2 <www http://www.oscss.org>
+  @version 2.1.1
+  @date  04/03/2012, 11:35
+  @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+  @encode UTF-8
+*/
+global $price;
+
+// print_r(shipping::$shipping);
+?>
+<div class="box_uniq block_form main-shipping">
+  <div id="tabs">
+      <ul>
+        <li><a href="#tabs-1"><?php echo __('tab shipping briefs'); ?></a></li>
+        <li><a href="#tabs-2"><?php echo __('tab shipping details'); ?></a></li>
+      </ul>
+
+    <div id="tabs-1" class="tabPage">
+
+			<ul class="fleft w_30">
+	<li style="font-size:13px;">
+<span class="label" style="font-weight:bold;"><?php echo __('shipping date expedition'); ?></span>
+<span class="value"><?php echo tep_date_short(shipping::$shipping->date_expedition); ?></span>
+</li>
+
+	<li style="font-size:13px;">
+<span class="label" style="font-weight:bold;"><?php echo __('shipping method'); ?></span>
+<span class="value"><?php echo shipping::$shipping->method; ?></span>
+</li>
+
+			</ul>
+
+			<ul class="fleft w_30">
+	<li style="font-size:13px;">
+<span class="label" style="font-weight:bold;"><?php echo __('shipping status'); ?></span>
+<span class="value"><?php echo shipping::$shipping->status; ?></span>
+</li>
+
+	<li style="font-size:13px;">
+<span class="label" style="font-weight:bold;"><?php echo __('shipping tracking url'); ?></span>
+<span class="value"><a href="<?php echo shipping::$shipping->tracking_url; ?>"><?php echo shipping::$shipping->tracking; ?></a></span>
+</li>
+			</ul>
+
+<br />
+<br />
+
+
+			<table class="dataTableBase orders shipping allshipping">
+				<thead>
+					<tr>
+						<th><?php echo __('table heading id'); ?></th>
+						<th><?php echo __('table heading products'); ?></th>
+						<th><?php echo __('table heading qt expedie'); ?></th>
+						<th><?php echo __('table heading methode'); ?></th>
+					</tr>
+				</thead>
+				<tbody>
+				<?php $i = 0; foreach(shipping::$shipping->products as $item): $i++; /*print_r($item);*/?>
+					<tr>
+						<td class="tcenter">
+								<?php echo $item->shipping_id; ?>
+						</td>
+						<td class="tcenter">
+								<a href="<?php echo tep_href_link(FILENAME_PRODUCTS,'action=edit&pID='.$item->products_id); ?>"><?php echo $item->products_name; ?></a>
+						</td>
+						<td class="tcenter">
+								<?php echo $item->qt_expedie; ?>
+						</td>
+
+						<td class="tcenter">
+						</td>
+					</tr>
+				<?php endforeach; ?>
+			</tbody>
+
+		</table>
+		
+
+		</div>
+
+
+    <div id="tabs-2" class="tabPage">
+		not implemented in this version
+		</div>
+
+	</div>
+
+
+
+    <div class="button_nav">
+      <?php echo tep_js_back(tep_href_link(shipping::FILENAME), IMAGE_CANCEL);?>
+    </div>
+
+
+</div>

Added: trunk/catalog/admin/includes/gabarit/shipping/display_view.multi.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/shipping/display_view.multi.gab	                        (rev 0)
+++ trunk/catalog/admin/includes/gabarit/shipping/display_view.multi.gab	2012-03-06 19:49:48 UTC (rev 4070)
@@ -0,0 +1,45 @@
+<?php
+/**
+  @licence GPL 2005-2012  The osCSS developers - osCSS Open Source E-commerce
+  @portion code Copyright (c) 2002 osCommerce
+  @package osCSS-2 <www http://www.oscss.org>
+  @version 2.1.1
+  @date  04/03/2012, 11:35
+  @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+  @encode UTF-8
+*/
+global $price, $current_theme;
+?>
+<div class="box_uniq block_form main-shipping">
+
+<?php echo  tep_draw_form('orders', shipping::FILENAME, tep_get_all_get_params(array('oID', 'action','forceajax','forceview')) .'action=multi-action'); ?>
+  <div>
+
+	Not implemented in this current version
+
+
+	<ul class="block_input">
+    <?php if(isset($_POST['action_multi']) && is_array($_POST['action_multi']) )
+	  foreach($_POST['action_multi'] as $oid=>$txt ): ?>
+      <li><?php echo tep_draw_checkbox_field('action_multi['.$oid.']', 'action_multi_'.$oid.'', $oid, true).sprintf(__('shipping update n %s') , $txt ) ?></li>
+    <?php endforeach; ?>
+	</ul>
+
+		<p class="block_input">
+			<label for="notify"><?php echo  __('text info multi notify'); ?></label>
+			<?php echo  tep_draw_checkbox_field('notify','','',false); ?>
+		</p>
+
+
+
+	</div>
+
+
+
+	<div class="button_nav">
+		<?php echo tep_image_submit('button_delete.gif', __('image modify multi'), ' onclick="$.fancybox.close();" ') ;?>
+		<?php echo tep_js_back(tep_href_link(shipping::FILENAME), IMAGE_CANCEL);?>
+	</div>
+
+</form>
+</div>

Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/pages/shipping.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/pages/shipping.txt	2012-03-05 20:54:24 UTC (rev 4069)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/shipping.txt	2012-03-06 19:49:48 UTC (rev 4070)
@@ -30,8 +30,22 @@
 		$lang['text info multi notify']="informer le client de ce changement " ;
 		$lang['image modify multi']="Valider" ;
 
+	/* edit */
+		$lang['tab shipping briefs']="Description" ;
+		$lang['tab shipping details']="Détails livraison" ;
 
+		$lang['shipping date expedition']="Expedition le : " ;
+		$lang['shipping method']="Méthode" ;
+		$lang['shipping status']="État" ;
+		$lang['shipping tracking url']="liens de tracking : " ;
 
+		$lang['table heading id']="id" ;
+		$lang['table heading products']="Produits" ;
+		$lang['table heading qt expedie']="Qté." ;
+// 		$lang['table heading products']="Produits" ;
+	
+
+
 /* Value list */
 	/* status */
 	$lang['shipping opened']="Ouverte" ;

Added: trunk/catalog/admin/includes/languages/fr_FR/widget/CategorieLast.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/widget/CategorieLast.txt	                        (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/widget/CategorieLast.txt	2012-03-06 19:49:48 UTC (rev 4070)
@@ -0,0 +1,20 @@
+<?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  0203/2012, 20:02
+  @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+  @encode UTF-8
+*/
+$lang['CategorieLast heading']="Catégories ajoutées/modifiées" ;
+
+$lang['CategorieLast tab added']="Crées" ;
+$lang['CategorieLast tab updated']="Modifiées" ;
+
+$lang['CategorieLast box reference']="Réf." ;
+$lang['CategorieLast box name']="Catégories" ;
+$lang['CategorieLast box date']="ajouté le" ;
+$lang['CategorieLast box status']="Etat" ;
+?>
\ No newline at end of file

Added: trunk/catalog/admin/includes/languages/fr_FR/widget/ImagesLastAdded.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/widget/ImagesLastAdded.txt	                        (rev 0)
+++ trunk/catalog/admin/includes/languages/fr_FR/widget/ImagesLastAdded.txt	2012-03-06 19:49:48 UTC (rev 4070)
@@ -0,0 +1,17 @@
+<?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  0203/2012, 20:02
+  @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+  @encode UTF-8
+*/
+$lang['ImagesLastAdded heading']="dernières images ajoutées" ;
+
+$lang['ImagesLastAdded box reference']="Réf." ;
+$lang['ImagesLastAdded box file']="Fichier" ;
+$lang['ImagesLastAdded box date']="Ajouté le" ;
+$lang['ImagesLastAdded box width_height']="Dim." ;
+?>
\ No newline at end of file

Modified: trunk/catalog/admin/includes/modules/pages/shipping.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/shipping.php	2012-03-05 20:54:24 UTC (rev 4069)
+++ trunk/catalog/admin/includes/modules/pages/shipping.php	2012-03-06 19:49:48 UTC (rev 4070)
@@ -32,7 +32,7 @@
   /**
     @var object $order
   */
-  public static $order;
+  public static $shipping;
   /**
     @var int Id order
   */
@@ -450,6 +450,8 @@
 
 					$res= sqlshipping::fetch(array('id'=>(int)self::$oID ), true); 
 
+// 					$res->lines=sqlshipping::fetch(array('id'=>(int)self::$oID ), true); 
+
 				return $res;
 			break;
 
@@ -596,7 +598,7 @@
       break;
 
       case 'edit':
-				self::$order= self::GetDBValue();
+				self::$shipping= self::GetDBValue();
 
 				return MGabCont::CallGab(parent::$action,__FUNCTION__,__CLASS__);
       break;
@@ -786,804 +788,4 @@
   function keys() { return false; }
 }
 
-?><?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  04/03/2012, 22:42
-  @author oscim <mail aur...@os...> <www http://www.oscim.fr>
-  @encode UTF-8
-  @class services
-  @brief manage services, listing and edit status
-*/
-
-
-
-class services
-  extends ModTwo /// new abstract class for nextgen module
-    implements
-	    InterfaceModule,
-	    IntModTwo, /// new interface module for nextgen module
-	    InterfacedInnerHtml {
-
-  /**
-    @var const
-  */
-  const FILENAME = 'services.php';
-
-  /**
-    @var array list, utilisé dans les gabarits, list des services
-  */
-  public static $list=array();
-  /**
-    @var object $order
-  */
-  public static $order;
-  /**
-    @var int Id order
-  */
-  public static $oID;
-  /**
-    @var bool $update autorise mise a jour status
-  */
-  public static $update;
-  /**
-    @var array $services_status_array
-  */
-  public static $services_status_array=array();
-  /**
-    @var array $services_statuses
-  */
-  public static $services_statuses=array();
-  /**
-    @var object $oInfo
-  */
-  public static $oInfo;
-  /**
-    @var object $cInfo detail du client
-  */
-  public static $cInfo;
-  /**
-    @var object $export
-  */
-  public static $export;
-  /**
-    @var string $view for select filter view
-  */
-  public static $view;
-  /**
-    @var object internal trans objet method check_action vs display_view
-  */
-  private static $internal;
-  /**
-    @var requis pour generation pdf
-  */
-	public static $file_type_array ;
-
-  /**
-    @brief class constructor
-  */
-  public function __construct() {
-    self::GetConf();
-  }
-
-  /**
-    @brief Load , adjust and define var environement exe for module
-	Is use in module and class abstract for init value config this module
-  */
-  public static function GetConf(){
-    global $languages_id;
-
-    self::$code=__CLASS__;
-
-    self::$action=(isset($_REQUEST['action'])? (string)$_REQUEST['action'] : 'listing' );
-    self::$view=(isset($_REQUEST['view'])? (string)$_REQUEST['view'] : '' );
-    self::$oID=(isset($_REQUEST['oID'])? $_REQUEST['oID'] : '' );
-
-    $status=(isset($_REQUEST['status'])? (string)$_REQUEST['status'] : '' );
-
-    self::$export= new export(__CLASS__);
-
-    /**
-      @remarks define var execution  sql in GetDBValue()
-    */
-		if( !isset(self::$InitInfo['adjust']) )
-				self::$InitInfo['adjust']=array(
-						'languages_id'=>$languages_id,
-						'page'=>1,
-						'rowbyp'=>10,
-						'sOrder'=>'',
-						'sWhere'=>'',
-						);
-
-
-
-    /**
-      @remarks not load if not first init
-    */
-    if(defined('JSONSTATMENT')) return;
-
-    //! active datatable in ajax, precise les GET necessaire
-    define('JSONSTATMENT', 'mod=page&type='.self::$code.
-			      (isset(parent::$action)?'&action='.parent::$action : '' ).
-			      (isset(self::$oID)?'&oID='.self::$oID : '' ).
-			      (isset(self::$view)?'&view='.self::$view : '' ).
-			      (isset($status)?'&status='.$status : '' )
-			    );
-
-    //! detail item in ajax
-    define('AJAXSTATMENTDETAIL', 'mod=page&type='.self::$code);
-
-
-    /**
-      @remarks this define col theader title, and ajust html code
-	Just for Edit listing
-    */
-    self::$InitInfo['theader']['listing']=array(
-      0 =>array('width'=>'2%', 'class'=>'tcenter', 'txt'=>'&nbsp;' ),
-      1 =>array('width'=>'2%', 'class'=>'tcenter', 'txt'=>'&nbsp;' ),
-      2 =>array('width'=>'8%', 'class'=>'tcenter', 'txt'=>__('table heading service id') ),
-      3 =>array('width'=>'8%', 'class'=>'tcenter', 'txt'=>__('table heading order id') ),
-      4 =>array('width'=>'30%','class'=>'tcenter', 'txt'=>__('table heading customers')),
-      5 =>array('width'=>'10%', 'txt'=>__('table heading date start')),
-//       5 =>array('width'=>'150px','class'=>'tcenter', 'txt'=>__('table heading order total')),
-      6 =>array('width'=>'8%', 'txt'=>__('table heading auto_retry')),
-      7 =>array('width'=>'8%', 'txt'=>__('table heading status')),
-//       7 =>array('width'=>'10%', 'txt'=>__('table heading status')),
-      8 =>array('width'=>'10%','class'=>'row_action', 'txt'=>__('table heading action')),
-    );
-
-//     self::$InitInfo['tfooter']['listing']=array(
-//       0 =>array('width'=>'2%', 'class'=>'tcenter', 'txt'=>tep_draw_hidden_field('xx','xxx','','class="search_init" ') ),
-//       1 =>array('width'=>'2%', 'class'=>'tcenter', 'txt'=>tep_draw_hidden_field('xxx','xxx','','class="search_init" ') ),
-//       2 =>array('width'=>'8%', 'class'=>'tcenter', 'txt'=>tep_draw_input_field('o.services_id','services_id',__('table heading order id'),'style="width:98%" class="search_init"') ),
-//       3 =>array('width'=>'40%','class'=>'tcenter', 'txt'=>tep_draw_input_field('o.customers_name','customers_name',__('table heading customers'),'style="width:98%" class="search_init"') ),
-//       4 =>array('width'=>'150px','class'=>'tcenter', 'txt'=>tep_draw_input_field('ot.text','text',__('table heading order total'),'style="width:98%" class="search_init"') ),
-//       5 =>array('width'=>'10%', 'txt'=>tep_draw_input_field('o.date_purchased','date_purchased',__('table heading date purchased'),'style="width:98%" class="search_init"')),
-//       6 =>array('width'=>'8%', 'txt'=>tep_draw_input_field('o.payment_method','payment_method',__('table heading status'),'style="width:98%" class="search_init"')),
-//       7 =>array('width'=>'10%', 'txt'=>tep_draw_input_field('s.status_name','status_name',__('table heading status'),'style="width:98%" class="search_init"')),
-//       8 =>array('width'=>'10%','class'=>'row_action', 'txt'=>'&nbsp;'),
-//     );
-
-    /**
-      @remarks this define col in table, and if is possible sort
-				Just for Edit listing
-    */
-    self::$InitInfo['modele']['listing']=array(
-						0 =>false,
-						1 =>false,
-						'services_id'=>true,
-						'orders_id'=>true,
-						'customers_id'=>true,
-						'date_start'=>true,
-						'auto_retry'=>true,
-						'status'=>true,
-						'action' =>false
-					);
-
-
-    $DB=Database::getInstance();
-//     self::$services_statuses=array();
-//     $services_status_query = $DB->query("select status_id, status_name from " . TABLE_STATUS . " where status_type='services' and language_id = '" . (int)$languages_id . "'");
-//     while ($services_status = $services_status_query->fetchAssoc()) {
-//       self::$services_statuses[] = array('id' => $services_status['status_id'], 'text' => $services_status['status_name']);
-//       self::$services_status_array[$services_status['status_id']] = $services_status['status_name'];
-//     }
-
-
-
-
-    global $oscss;
-    $oscss->_add_ext(BO_WISIWYG_SELECTED,'editeur/');
-    echo $oscss->_call(BO_WISIWYG_SELECTED,'_top','comments','800','400');
-
-    return true;
-  }
-
-
-  public function check_action($actions){
-    global $messageStack,$page_module;
-
-    self::$action=$actions;
-
-		self::$internal = new stdClass;
-
-    switch (self::$action) {
-
-			/**
-				@remarks pdf  generate for all docs 
-			*/
-// 			case 'pdf':
-// 
-// 				if( _cst_bool('USE_LOCAT_GENERAT_PDF') )
-// 					$messageStack->add_session(__('warning pdf not generat by this core, please adjust configuration'), 'warning');
-// 				else {
-// 					$ID=(int)$_REQUEST['id'];
-// 					$type=$_REQUEST['file_type'] ;
-// 					global $pdf, $currencies;
-// 					osCSS_pdf::getInstance();
-// 
-// 					/// force encode for fdpf is in iso8859
-// 					header("Content-Type: text/html; charset=utf-8");
-// 					self::$services_statuses = array_merge(tep_get_status_array('services'),array(array('id'=>'','text'=>TEXT_NONE)));
-// 					self::$file_type_array= osCSS_pdf::get_module();
-// 
-// 					$pdf=osCSS_pdf::OutputInit($type);
-// 					$DF = new DatasFiles;
-// 
-// 					switch($type){
-// 						case 'delivery':
-// 							global $obj_shipping;
-// 							$obj_shipping = sqlshipping::fetch(array('id'=>$ID), true);
-// 							$oID = $obj_shipping->services_id;
-// 							$order = new order($obj_shipping->services_id);
-// 						break;
-// 						case 'packingslip':
-// 						case 'invoice':
-// 						default:
-// 							$oID = $ID;
-// 							$order = new order($ID);
-// 					}
-// 
-// 					osCSS_pdf::OutputAddPage();
-// 
-// 					include(osCSS_pdf::getPathModele());
-// 
-// 					$file=$DF->GetDoc(osCSS_pdf::GetPdfType(),$ID);
-// 
-// 					if(file_exists($file))
-// 						unlink($file);
-// 
-// 					$pdf=osCSS_pdf::SaveEnd($file);
-// 
-// 					/// @remarks draw and exit;
-// 	// 				$pdf=osCSS_pdf::OutputEnd();
-// 				}
-// 				if(!isset($_GET['forceajax']))
-// 					tep_redirect(tep_href_link(self::FILENAME,  'oID='.$oID.'&action=edit'));
-// 			break;
-
-			/**
-				@remarks pdf  generate
-			*/
-// 			case 'deletefile':
-// 				$oID=(int)$_REQUEST['oID'];
-// 				$ID=(int)$_REQUEST['id'];
-// 				$type=$_REQUEST['file_type'] ;
-// 
-// 				$datadocs=new DatasFiles;
-// 
-// 				if(( $filepath=$datadocs->GetDoc($type, $ID)) && file_exists($filepath))
-// 					unlink($filepath);
-// 
-// 				if(!isset($_GET['forceajax']))
-// 					tep_redirect(tep_href_link(self::FILENAME,  'oID='.$oID.'&action=edit'));
-// 			break;
-
-
-			/**
-				@remarks Action mutliple
-			*/
-      case 'multiconfirm':
-        $res=array();
-
-        $status = tep_db_prepare_input(@$_POST['status_multi']);
-// 	$modeexport = tep_db_prepare_input(@$_POST['modeexport']);
-        $notify =(isset($_POST['notify'])) ? tep_db_prepare_input($_POST['notify']): '';
-        $comments= (isset($_POST['comments'])) ? tep_db_prepare_input($_POST['comments']) :'';
-        if(isset($_POST['action_multi']) && is_array($_POST['action_multi']) ) {
-
-// 	    if(isset($_POST['status_multi'])){
-// 	      foreach($_POST['action_multi'] as $oID )
-// 					if (up_status_order($oID, array('status'=>$status,'comments'=>'', 'notify'=>$notify, 'comments'=> $comments)  ) ) $res[]=true;
-// 					else $res[]=false;
-// 	    }
-
-
-// 	    if(isset($_POST['modeexport'])){
-// 
-// 	      $modeexport=tep_db_prepare_input($_POST['modeexport']);
-// 	      $encodage=tep_db_prepare_input($_POST['encodage']);
-// 	      $export_type=tep_db_prepare_input($_POST['export_type']);
-// 	      $od=array();
-// 
-// 	      self::$export->pre_export(array( 'mode' => $modeexport, 'encodage'=>$encodage, 'export_type'=>$export_type, 'page_admin'=>$page_module));
-// 
-// 	      foreach($_POST['action_multi'] as $oID ){
-// 
-// 					$order = new order((int)$oID);
-// 					$qer=tep_db_query("SELECT countries_iso_code_2 FROM  " . TABLE_COUNTRIES . " WHERE countries_name='".$order->customer['country']."' ");
-// 					$c=tep_db_fetch_array($qer);
-// 
-// 					$od[]=array('IDExpedition'=>$oID,
-// 								'IDCustomer'=>$order->customer['id'],
-// 								'Namecustomer'=>self::$export->decodage($order->customer['name']),
-// 								'Compagnycustomer'=>self::$export->decodage($order->customer['company']),
-// 								'Streetadress'=>self::$export->decodage($order->delivery['street_address']),
-// 								'Streetadress2'=>self::$export->decodage($order->delivery['suburb']) ,
-// 								'Cityshipping'=>self::$export->decodage($order->delivery['city']),
-// 								'Stateshipping'=>self::$export->decodage($order->customer['state']) ,
-// 								'telephone'=>self::$export->decodage($order->customer['telephone']),
-// 								'postcode'=>self::$export->decodage($order->delivery['postcode']),
-// 								'codecountryiso'=>$c['countries_iso_code_2'],
-// 								'weight'=>round($order->info['total_weight'],3),
-// 								'Contreremb'=>'');
-// 							}
-// 
-// 							print self::$export->op_export($od);
-// 						}
-        }
-
-        if (in_array(false,$res))  $messageStack->add_session(__('success order updated'), 'success');
-        else  $messageStack->add_session(__('warning order not updated'), 'warning');
-
-        tep_redirect(tep_href_link(self::FILENAME));
-      break;
-
-
-
-			/**
-				@remarks Adjust Virtual product Service
-			*/
-      case 'setflag':
-				$redirect = false;
-				if (isset($_GET['sID'])){
-
-					/// Activate / Desactivate
-					if (isset($_GET['flag']) && ( ($_GET['flag'] == '0') || ($_GET['flag'] == '1') ) ) {
-						$res = sqlservices::fetch(array('id'=>(int)$_GET['sID']), true);
-
-						if($res !=false){
-
-							$myarray = array(
-							'id'=>(int)$_GET['sID'],
-							'status'=>(int)$_GET['flag'] ,
-							);
-
-// 							if(substr($res->date_start,0,4) <'2000')
-// 								$myarray['date_start']=date('Y-m-d H:i:s') ;
-
-							if( ! sqlservices::update($myarray) ) {
-								self::$internal->status = $res->status;
-								$redirect = true;
-								$messageStack->add_session(__('error order not update status'), 'warning');
-							}
-							else{
-								self::$internal->status = (int)$_GET['flag'] ;
-								if(!isset($_GET['forceajax']))
-									$messageStack->add_session(__('success order update status'), 'success');
-							}
-						}
-						else {
-							$messageStack->add_session(__('error order id not found'), 'warning');
-							$redirect = true;
-						}
-					}
-
-					/// Auto - retry force activate service
-					elseif ( isset($_GET['auto_retry']) && ( ($_GET['auto_retry']  == '0' )  || ($_GET['auto_retry'] == '1') ) ){
-
-						$res = sqlservices::fetch(array('id'=>(int)$_GET['sID']), true);
-
-						if($res !=false){
-
-							$myarray = array(
-							'id'=>(int)$_GET['sID'],
-							'auto_retry'=>(int)$_GET['auto_retry'] ,
-							);
-
-							if( ! sqlservices::update($myarray) ){
-								self::$internal->auto_retry = $res->auto_retry;
-								$redirect = true;
-								$messageStack->add_session(__('error order not update auto_retry'), 'warning');
-							}
-							else{
-								self::$internal->auto_retry = (int)$_GET['auto_retry'] ;
-								if(!isset($_GET['forceajax']))
-									$messageStack->add_session(__('success order update auto_retry'), 'success');
-							}
-						}
-						else {
-							$messageStack->add_session(__('error order id not found'), 'warning');
-							$redirect = true;
-						}
-					}
-
-				}
-
-				if(!isset($_GET['forceajax']) || $redirect )
-					tep_redirect(tep_href_link(self::FILENAME, tep_get_all_get_params(array('action','sID','setflag','auto_retry','flag'), false)  .'action=edit' ));
-			break;
-
-   }
-
-    return self::$action;
-  }
-
-	/**
-		@fn get_header()
-		@brief load js and call childs module
-		@return no return
-	*/
-  public function get_header(){
-		tep_include_file(DIR_WS_JS . "modules/pages/".__CLASS__.".js.php",true);
-
-		/** aca */ //self::$modules->get_header_js();
-
-  }
-
-
-
-  /**
-    @fn ::GetDBValue();
-    @brief return DB value adapted for current action
-      Use self::action for determine switch
-    @return
-  */
-  public static function GetDBValue(){
-    global $languages_id;
-
-    $arg=((func_num_args()>0) ? func_get_args() : array() );
-
-    $DB=Database::getInstance();
-    $res=array();
-
-    switch (self::$action) {
-      case 'export';
-      break;
-
-			case 'edit':
-
-					$res= sqlservices::fetch(array('id'=>(int)self::$oID ), true); 
-
-				return $res;
-			break;
-
-
-      case 'new':
-				$select_adress = array();
-
-				$cID = (int)tep_db_prepare_input($_REQUEST['cID']);
-				$res=sqlcustomer::fetch(array('id'=>$cID), true);
-
-				/**
-					@remarks choose address book if active module adress book
-				*/
-				if(isset($res->mod['address_book'])) {
-					foreach($res->mod['address_book'] as $row)
-					$select_adress[] =  array('id'=>$row->book_id , 'text'=>  tep_address_format($row->format_id, $row, false, '', " - ") );
-				}
-				else{
-					$adrr = new stdClass();
-					$adrr->book_id = $res->default_address_id;
-					$adrr->gender = $res->gender;
-					$adrr->company = $res->company;
-					$adrr->company_tax_id = $res->company_tax_id;
-					$adrr->firstname = $res->firstname;
-					$adrr->lastname = $res->lastname;
-					$adrr->street_address = $res->street_address;
-					$adrr->suburb = $res->suburb;
-					$adrr->postcode = $res->postcode;
-					$adrr->city = $res->city;
-					$adrr->state = $res->state;
-					$adrr->country_id = $res->country_id;
-					$adrr->zone_id = $res->zone_id;
-					$adrr->zone_name = $res->zone_name;
-					$adrr->countries_id = $res->countries_id;
-					$adrr->countries_name = $res->countries_name;
-					$adrr->countries_iso_code_2 = $res->countries_iso_code_2;
-					$adrr->format_id = $res->address_format_id;
-
-					$select_adress[] =  array('id'=>$adrr->book_id , 'text'=>  tep_address_format($adrr->format_id, $adrr, false, '', "\n") );
-				}
-
-
-				$res->select_adress = $select_adress;
-
-				return $res;
-      break;
-
-
-      case 'listing';
-				/**
-					@remarks retrun object load one inventaire
-				*/
-				global $query_numrows;
-				$adjust=new objectInfo(self::$InitInfo['adjust']);
-
-
-
-				$wh=' WHERE ';
-				if(self::$view =='opened')
-					$wh .=" status = '1'  ";
-				if(self::$view =='closed')
-					$wh .=" status = '0'  ";
-
-
-				if(tep_not_null($adjust->sWhere)){
-// 					$adjust->sWhere=str_replace(
-// 																						array('services_id', 'order_total', 'customers_id', 'services_status_name'),
-// 																						array('o.services_id', ' ot.text', 'o.customers_name', 's.status_name'),
-// 																						$adjust->sWhere
-// 																					);
-
-					$wh .= ( (strlen($wh) >7)? " AND ": "" )." ".$adjust->sWhere." ";
-				}
-
-				if(strlen($wh) <=7)
-					$wh='';
-
-
-				$query_raw = "SELECT DISTINCT s.* FROM " . TABLE_SERVICES . " s JOIN " . TABLE_ORDERS . " o on (o.orders_id = s.orders_id) ".$wh." ORDER BY  ".((!empty($adjust->sOrder)) ? $adjust->sOrder : 's.row_id DESC');
-
-				$_split = new splitPageResults($adjust->page, $adjust->rowbyp,  $query_raw, $query_numrows);
-
-				$_query = $DB->query($query_raw);
-
-				$res=self::FormatDBValue($_query);
-
-				return $res;
-      break;
-
-      case 'delete';
-      default:
-
-// 				$services_query_raw = "select distinct o.services_id,o.services_prefix,  o.customers_id,o.customers_name,  o.payment_method, o.date_purchased, o.last_modified, o.currency, o.currency_value, s.status_name as services_status_name, s.status_color as services_status_color,ot.text as order_total from " . TABLE_ORDERS . " o left join " . TABLE_ORDERS_TOTAL . " ot on (o.services_id = ot.services_id), " . TABLE_STATUS . " s where o.services_status = s.status_id and s.status_type='services'  and s.language_id = '" . (int)$languages_id . "' and ot.class = 'ot_total' and o.services_id='".self::$oID."' ";
-
-// 				$currency_query = $DB->query($services_query_raw);
-
-// 				return new objectInfo($currency_query->fetchAssoc() );
-
-    }
-  }
-
-
-
-
-  public function display_view(){
-
-    switch (self::$action) {
-
-			/**
-				@remarks Ajax View result
-			*/
-      case 'setflag':
-				if(isset($_GET['flag']))
-					return self::GetServiceStatus(array('status'=>(int)self::$internal->status, 'row_id'=>(int)$_GET['sID']), false);
-				elseif(isset($_GET['auto_retry']))
-					return self::GetServiceStatus(array('auto_retry'=>(int)self::$internal->auto_retry, 'row_id'=>(int)$_GET['sID']), false);
-      break;
-
-			/**
-				@remarks Normal View Page
-			*/
-      case 'delete':
-					self::$oInfo=self::GetDBValue();
-					return MGabCont::CallGab(parent::$action,__FUNCTION__,__CLASS__);
-      break;
-      case 'multi':
-				return MGabCont::CallGab(parent::$action,__FUNCTION__,__CLASS__);
-      break;
-
-      case 'new':
-				self::$cInfo=self::GetDBValue();
-
-				return MGabCont::CallGab(parent::$action,__FUNCTION__,__CLASS__);
-      break;
-
-      case 'edit':
-				self::$order= self::GetDBValue();
-
-				return MGabCont::CallGab(parent::$action,__FUNCTION__,__CLASS__);
-      break;
-      default:
-				self::load_db_values();
-				/// use master gabarit
-				MGabCont::SetCurrentName(__CLASS__);
-				return MGabCont::CallGab('listing',__FUNCTION__,self::MASTER);
-    }
-  }
-
-
-
-/** Interne public module */
-
-  /**
-    @brief Construct array list type module for pull down menu
-    @param $type string type
-    @return array (array(id=>'', value=>''))
-  */
-//   public static function PrepaPullDownType($type){
-//     if(isset(sqlorder::$modules_type->$type)) {
-//       $r = array();
-// 
-//       foreach(sqlorder::$modules_type->$type->modules as $key => $row){
-// 				$r[] = array('id'=>$key,'text'=>$row->title);
-//       }
-//     }
-// 
-//     return $r;
-//   }
-
-
-
-
-
-
-  /**
-    @fn get_item_action($services)
-    @brief fonction qui construit l'affichage de la colonne action
-      La mise en forme est contenu dans les ressource xml du template en cours
-    @param $services array
-    @return string
-  */
-  private static function get_item_action($services){
-    return  sprintf(
-		  CsrtAction::getFormat('row_action'),
-		  '' ,
-		  sprintf(CsrtAction::getLink('row_action_right', IMAGE_EDIT, 'edit'), '',  tep_href_link(self::FILENAME, 'oID=' . $services['oID'] . '&amp;action=edit') ,'' )
-// 		  .sprintf(CsrtAction::getLink('row_action_right', IMAGE_DELETE, 'delete'), 'fancy',  tep_href_link(self::FILENAME, 'oID=' . $services['oID'] . '&amp;action=delete') ,'' )
-		);
-  }
-
-  /**
-    @brief load listing array, for use format retrun by JSON
-  */
-  public static function tep_get_list($page=1,$rowbyp=10,$sOrder='',$sWhere='',$options=''){
-    /// @remarks force load conf
-   self::GetConf();
-
-    $res=array();
-
-    /**
-      @remarks adjust param for sql requete
-    */
-    self::$InitInfo['adjust']['page']=$page;
-    self::$InitInfo['adjust']['rowbyp']=$rowbyp;
-    self::$InitInfo['adjust']['sOrder']=$sOrder;
-    self::$InitInfo['adjust']['sWhere']=$sWhere;
-    self::$InitInfo['adjust']['options']=$options;
-
-    $res = self::load_db_values();
-
-    return  self::$list=self::CheckResult($res);
-  }
-
-  public static function tep_get_modele(){
-    self::GetConf();
-    $action=(empty(self::$action)? 'listing' :self::$action);
-
-    return (isset(self::$InitInfo['modele'][$action]) ? self::$InitInfo['modele'][$action] : array() );
-  }
-
-  /**
-    @brief Redefine Parent method
-  */
-//   public static function DTFootTable($mutli=false){
-//     /**
-//       @remarks mutli action specific line
-//     */
-//     if($mutli) {
-//       $col=count(self::DTheaderTable());
-//       return array(
-// 		  0 => self::$InitInfo['tfooter']['listing'] ,
-// 		  1 =>array( array('colspan'=>$col, 'class'=>'tleft', 'txt'=>'<span class="fleft">'.__('action multiple') . ' ' . tep_draw_pull_down_menu('status_multi', array_merge(array(array('id' => '', 'text' => __('text action multiple services'))), services::$services_statuses) ) . __('export: ') . tep_draw_pull_down_menu('modeexport', services::$export->mode ).'</span> <span class="fleft" style="margin-left:50px;"> '. tep_image_submit('button_confirm.gif', IMAGE_CONFIRM, '' ).'</span>' ) )
-// 	      ) ;
-//     }
-//     else
-//     /**
-//       @remarks No tfoot specific,use equal theader
-//     */
-//       return array( 0 =>self::DTheaderTable());
-//   }
-
-  /**
-    @brief format db value for display page
-    @param $_query ressource db sql
-    @return array
-  */
-  private static function FormatDBValue($_query){
-    $DB=Database::getInstance();
-    $res=array();
-
-    switch (parent::$action) {
-      case 'listing':
-				while ($services = $_query->fetchAssoc()) {
-						$ord['oID']=$services['row_id'];
-						$ord['services_id']=$services['row_id'];
-						$ord['orders_id']=$services['orders_id'];
-						$ord['customers_id']=tep_customers_row_action($services['customers_id'], array('origin'=>self::FILENAME));
-						$ord['date_start']=tep_datetime_short($services['date_start']);
-						$ord['auto_retry']=self::GetServiceAutoRetry($services, false);
-						$ord['status']=self::GetServiceStatus($services, false);
-						$ord[0]=$services['row_id'];
-						$ord[1]=tep_draw_checkbox_field('action_multi['.$services['row_id'].']','action_mutli_'.$services['row_id'],$services['row_id']);
-						$ord['action']=self::get_item_action($ord);
-						$res[]=$ord;
-				}
-      break;
-    }
-    return $res;
-  }
-
-
- /** static InterfacedInnerHtml */
-
-  public static function detail_row_page($id){
-    self::$list=self::load_status_history($id);
-    return MGabCont::CallGab('inline','display_view',__CLASS__);
-  }
-
-
-/** Interne module  */
-
-	/**
-		@brief falg for activate / desactivate and indicate current status for service(virtual product)
-		@param $row array current rows
-		@param $justlink boolean for mode return
-		@return string
-			link for action ($justlink=true)
-			or full html entite "a" normlised by current template
-	*/
-  private static function GetServiceStatus($row, $justlink=true){
-    $exclude=array('action','oID','sID','forceajax','type','class', 'flag', 'function','funct', 'mod');
-    $query_s='action=setflag&amp;sID=' . $row['row_id'].'&amp;flag=';
-
-		if($justlink){
-			if ($row['status'] == '1')
-				return  tep_href_link('services.php', tep_get_all_get_params($exclude).$query_s.'0' );
-			else
-				return  tep_href_link('services.php', tep_get_all_get_params($exclude).$query_s.'1' );
-		}
-		else
-			return '<a class="ajaxinline" href="' . tep_href_link(self::FILENAME,  tep_get_all_get_params($exclude).$query_s.(($row['status'] == '1')? '0' : '1') ) . '">'.
-					sprintf(
-					CsrtAction::getFormat('row_etat'),
-					(int)$row['status'],
-					( ($row['status'] == '1')? IMAGE_ICON_STATUS_GREEN : IMAGE_ICON_STATUS_RED)
-					).
-				'</a>';
-  }
-
-  private static function GetServiceAutoRetry($row, $justlink=true){
-    $exclude=array('action','oID','sID','forceajax','type','class', 'auto_retry', 'function','funct', 'mod');
-    $query_s='action=setflag&amp;sID=' . $row['row_id'].'&amp;auto_retry=';
-
-		if($justlink){
-			if ($row['auto_retry'] == '1')
-				return  tep_href_link('services.php', tep_get_all_get_params($exclude).$query_s.'0' );
-			else
-				return  tep_href_link('services.php', tep_get_all_get_params($exclude).$query_s.'1' );
-		}
-		else
-			return '<a class="ajaxinline" href="' . tep_href_link(self::FILENAME,  tep_get_all_get_params($exclude).$query_s.(($row['auto_retry'] == '1')? '0' : '1') ) . '">'.
-					sprintf(
-					CsrtAction::getFormat('row_etat'),
-					(int)$row['auto_retry'],
-					( ($row['auto_retry'] == '1')? IMAGE_ICON_STATUS_GREEN : IMAGE_ICON_STATUS_RED)
-					).
-				'</a>';
-  }
-
-
-
-
-  /**
-    @brief return Filename
-  */
-  public static function GetFILENAME(){
-    return self::FILENAME;
-  }
-
-  /**
-    @depend InterfaceModule
-  */
-  function check() { return false; }
-  function install() { return false; }
-  function remove() { return false;  }
-  function keys() { return false; }
-}
-
 ?>
\ No newline at end of file

Added: trunk/catalog/admin/includes/widget/CategorieLast.php
===================================================================
--- trunk/catalog/admin/includes/widget/CategorieLast.php	                        (rev 0)
+++ trunk/catalog/admin/includes/widget/CategorieLast.php	2012-03-06 19:49:48 UTC (rev 4070)
@@ -0,0 +1,75 @@
+<?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  0203/2012, 20:02
+  @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+  @encode UTF-8
+*/
+global $languages_id;
+
+$DB=Database::getInstance();
+$_query=$DB->query("SELECT distinct p.*,pd.categories_name FROM  " . TABLE_CATEGORIES . " p, " . TABLE_CATEGORIES_DESCRIPTION . " pd  WHERE p.categories_id = pd.categories_id and pd.language_id = '" . (int)$languages_id . "' ORDER BY  p.date_added DESC LIMIT 7");
+
+$_query2=$DB->query("SELECT distinct p.*,pd.categories_name FROM  " . TABLE_CATEGORIES . " p, " . TABLE_CATEGORIES_DESCRIPTION . " pd  WHERE p.categories_id = pd.categories_id and pd.language_id = '" . (int)$languages_id . "' ORDER BY  p.last_modified DESC LIMIT 7");
+
+// if
+$new = ( !$_query->__get('numRows') ) ? false : true ;
+$up = ( !$_query2->__get('numRows') ) ? false : true ;
+
+if( !$up && !$new )
+	return false;
+
+$res = $_query->fetchAllAssoc();
+$res2 = $_query2->fetchAllAssoc();
+?>
+<div id="<?php echo __FILE__ ?>" class="<?php echo $widg['class'] ?>" >
+  <h3><?php echo __('CategorieLast heading') ;?></h3>
+
+  <div id="tabs">
+      <ul>
+        <li><a href="#tabs-1"><?php echo __('CategorieLast tab added'); ?></a></li>
+        <li><a href="#tabs-2"><?php echo __('CategorieLast tab updated'); ?></a></li>
+      </ul>
+
+    <div id="tabs-1" class="tabPage">
+			<table class="dataTableBase">
+				<tr>
+					<th><?php echo __('CategorieLast box reference'); ?></th>
+					<th><?php echo __('CategorieLast box name'); ?></th>
+					<th><?php echo __('CategorieLast box date'); ?></th>
+					<th><?php echo __('CategorieLast box status'); ?></th>
+				</tr>
+				<?php foreach($res as $row) :   ?>
+				<tr>
+					<td class="tcenter"><strong><a href="<?php echo tep_href_link(FILENAME_PRODUCTS, 'pID='.$row['categories_id'].'&action=edit') ?>"><?php echo $row['categories_id'] ?></strong></td>
+					<td style="width:200px;"><?php echo $row['categories_name']  ?></td>
+					<td class="tcenter"><?php echo tep_date_short($row['date_added']) ?></td>
+					<td  class="tcenter"><?php echo $row['categories_status'] ?></td>
+				</tr>
+				<?php endforeach; ?>
+			</table>
+		</div>
+
+    <div id="tabs-2" class="tabPage">
+			<table class="dataTableBase">
+				<tr>
+					<th><?php echo __('CategorieLast box reference'); ?></th>
+					<th><?php echo __('CategorieLast box name'); ?></th>
+					<th><?php echo __('CategorieLast box date'); ?></th>
+					<th><?php echo __('CategorieLast box status'); ?></th>
+				</tr>
+				<?php foreach($res2 as $row) :   ?>
+				<tr>
+					<td class="tcenter"><strong><a href="<?php echo tep_href_link(FILENAME_PRODUCTS, 'pID='.$row['categories_id'].'&action=edit') ?>"><?php echo $row['categories_id'] ?></strong></td>
+					<td style="width:200px;"><?php echo $row['categories_name']  ?></td>
+					<td class="tcenter"><?php echo tep_date_short($row['date_added']) ?></td>
+					<td  class="tcenter"><?php echo $row['categories_status'] ?></td>
+				</tr>
+				<?php endforeach; ?>
+			</table>
+		</div>
+	</div>
+</div>
\ No newline at end of file

Added: trunk/catalog/admin/includes/widget/ImagesLastAdded.php
===================================================================
--- trunk/catalog/admin/includes/widget/ImagesLastAdded.php	                        (rev 0)
+++ trunk/catalog/admin/includes/widget/ImagesLastAdded.php	2012-03-06 19:49:48 UTC (rev 4070)
@@ -0,0 +1,42 @@
+<?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  0203/2012, 20:02
+  @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+  @encode UTF-8
+*/
+global $languages_id;
+
+$DB=Database::getInstance();
+$_query=$DB->query("SELECT * FROM  " . TABLE_IMAGES . "   ORDER BY  date_added DESC LIMIT 7");
+
+
+if( !$_query->__get('numRows') )
+	return false;
+
+$res = $_query->fetchAllAssoc();
+?>
+<div id="<?php echo __FILE__ ?>" class="<?php echo $widg['class'] ?>" >
+  <h3><?php echo __('ImagesLastAdded heading') ;?></h3>
+
+<table class="dataTableBase">
+	<tr>
+		<th><?php echo __('ImagesLastAdded box reference'); ?></th>
+		<th><?php echo __('ImagesLastAdded box file'); ?></th>
+		<th><?php echo __('ImagesLastAdded box date'); ?></th>
+		<th><?php echo __('ImagesLastAdded box width_height'); ?></th>
+	</tr>
+	<?php foreach($res as $row) :   ?>
+	<tr>
+		<td class="tcenter"><strong><a href="<?php echo tep_href_link(FILENAME_PRODUCTS, 'pID='.$row['rowid'].'&action=edit') ?>"><?php echo $row['rowid'] ?></strong></td>
+		<td style="width:200px;"><?php echo $row['file']  ?></td>
+		<td class="tcenter"><?php echo tep_date_short($row['date_added']) ?></td>
+		<td  class="tcenter"><?php echo $row['width'] .' x '. $row['height'] ?></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.