Thread: [Oscss-commit] SF.net SVN: oscss:[4513] branches/2.1.1/catalog

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 4513
          http://oscss.svn.sourceforge.net/oscss/?rev=4513&view=rev
Author:   oscim
Date:     2012-07-12 06:49:13 +0000 (Thu, 12 Jul 2012)
Log Message:
-----------
correction coquille 
FS#1094

Modified Paths:
--------------
    branches/2.1.1/catalog/admin/includes/classes/fileUtility.php
    branches/2.1.1/catalog/admin/includes/modules/pages/navigation_links.php
    branches/2.1.1/catalog/includes/triggers/search_suggest.inc
    branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/configuration.php
    branches/2.1.1/catalog/install/includes/language/fr_FR/install.base.txt

Modified: branches/2.1.1/catalog/admin/includes/classes/fileUtility.php
===================================================================

--- branches/2.1.1/catalog/admin/includes/classes/fileUtility.php	2012-07-11 14:08:08 UTC (rev 4512)
+++ branches/2.1.1/catalog/admin/includes/classes/fileUtility.php	2012-07-12 06:49:13 UTC (rev 4513)
@@ -28,7 +28,7 @@
   }
 
   /**
-		@brief block process in other class if result in loop process content error 
+		@brief block process in other class if result in loop process content error
     @param bool true, block messageSatck
   */
   public static function CfgComport($value){
@@ -119,7 +119,7 @@
 		@fn _unlink($source)
 		@brief recusrive delete folder and files
 		@param $source absolute path
-		@return boolean false for error 
+		@return boolean false for error
   */
   public static function _unlink($source){
     if (file_exists($source) && is_writeable($source))
@@ -133,11 +133,13 @@
 		@fn _mkdir($path)
 		@brief recusrive create folder
 		@param $path absolute path
-		@return boolean false for error 
+		@return boolean false for error
   */
   public static function _mkdir($path) {
-		$path =  dirname($path);
 
+		if(strpos($path, '.'))
+			$path =  dirname($path);
+
 		if(strpos($path,DIR_FS_DOCUMENT_ROOT) ===0){
 			$testpath = DIR_FS_DOCUMENT_ROOT;
 			$listdir = str_replace( DIR_FS_DOCUMENT_ROOT, '', $path );
@@ -163,9 +165,10 @@
 			}
 
 // 				if (!is_writeable($testpath))
-				if( self::_chmod($path, '0755') ){
-					self::ComportForError(__CLASS__.'->'.__FUNCTION__.'::'.__LINE__.__('error folder not writable for current user'). $path, 'error');
+				if( ! self::_chmod($path, 0766) ){
+					self::ComportForError(__CLASS__.'->'.__FUNCTION__.'::'.__LINE__.__('error folder not writable for current user').' '. $path, 'error');
 				}
+
 		}
 
     return true;
@@ -174,8 +177,8 @@
   /**
     @fn _chmod($path, $mod=0777)
 		@brief chmod
-		@param $path absolute path 
-		@param $mod 
+		@param $path absolute path
+		@param $mod
 		@return boolean true for ok or false
   */
   public static function _chmod($path, $mod=0777) {
@@ -183,11 +186,11 @@
 
     if (is_dir($path) && $path!='/') {
       self::_chmod(dirname($path));
-      if(!@chmod($path, (int)$mod)) 
+      if(!@chmod($path, (int)$mod))
 				return false;
     }
     elseif(file_exists($path) && $path!='/') {
-      if(!@chmod($path, (int)$mod)) 
+      if(!@chmod($path, (int)$mod))
 				return false;
     }
     return true;
@@ -203,7 +206,7 @@
     while(($file =self::_scandir($d)) !== false) {
       if ($file != "." && $file != "..") {
 				$typepath = $mypath . "/" . $file ;
-				if (filetype ($typepath) == 'dir') 
+				if (filetype ($typepath) == 'dir')
 					self::_chown($typepath, $uid, $gid);
 
 				self::_chmod($typepath, $uid);
@@ -217,7 +220,7 @@
     @brief Copy repertoire recursif
 		@param $src absolute path
 		@param $dst absolute path
-		@return boolean true if ok 
+		@return boolean true if ok
   */
   public static function _copy($src,$dst){
 
@@ -266,9 +269,9 @@
     $arrScanCache=array();
     static $arrScanCache;
 
-		if( ! is_dir($strFolder)) 
+		if( ! is_dir($strFolder))
 			$strFolder = dirname($strFolder);
-    if (substr($strFolder, -1, 1) != '/') 
+    if (substr($strFolder, -1, 1) != '/')
 			$strFolder .= '/';
 
     // Load from cache
@@ -291,7 +294,7 @@
     @return bool
   */
   public static function equal_files($file1, $file2) {
-    if (is_file($file1) && is_file($file2))  
+    if (is_file($file1) && is_file($file2))
 			return (md5_file($file1) == md5_file($file2));
     return false;
   }

Modified: branches/2.1.1/catalog/admin/includes/modules/pages/navigation_links.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/navigation_links.php	2012-07-11 14:08:08 UTC (rev 4512)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/navigation_links.php	2012-07-12 06:49:13 UTC (rev 4513)
@@ -126,14 +126,14 @@
 
 												);
 
-		self::$allfields['c.customers_status'] = array(
-															'sort'=>true,
-															'alias'=>'customers_status',
-															'text'=>__('@tasks table heading customers_status'),
-															'default'=>true,
+// 		self::$allfields['c.customers_status'] = array(
+// 															'sort'=>true,
+// 															'alias'=>'customers_status',
+// 															'text'=>__('@tasks table heading customers_status'),
+// 															'default'=>true,
+// 
+// 												);
 
-												);
-
 		/* Db parent */
 		self::$allfields['c.parent_id'] = array(
 															'sort'=>true,
@@ -522,6 +522,17 @@
 					foreach(self::$InitInfo['modele']['listing'] as $k=>$row)
 						if($k == 'action') $ord[$k]=self::ButtonRowsActions($item);
 						elseif($k == 'status') $ord[$k]=self::RowStatus($item);
+						elseif($k =='customers_status'){
+							$result = sqlstatus::fetch(array(
+																				'type'=>'customers_restrict_access',
+																				'language_id'=>(int)$languages_id,
+																				'status'=>1,
+																				'id'=> $item['customers_status'],
+																				),
+																				true
+																			);
+							$ord[$k]= (( $result !=false) ? $result->name : '' );
+						}
 						else $ord[$k]=$item[$k];
 
 					$res[]=$ord;

Modified: branches/2.1.1/catalog/includes/triggers/search_suggest.inc
===================================================================
--- branches/2.1.1/catalog/includes/triggers/search_suggest.inc	2012-07-11 14:08:08 UTC (rev 4512)
+++ branches/2.1.1/catalog/includes/triggers/search_suggest.inc	2012-07-12 06:49:13 UTC (rev 4513)
@@ -59,7 +59,7 @@
 			if(!$pd ) 
 				continue;
 
-			echo '<a href="'.tep_href_link($pd->href).'">'.$pd->title.'</a>'."\n";
+			echo '<a href="'.$pd->href.'">'.$pd->title.'</a>'."\n";
 
 		}
 		

Modified: branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/configuration.php
===================================================================
--- branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/configuration.php	2012-07-11 14:08:08 UTC (rev 4512)
+++ branches/2.1.1/catalog/install/data/templates/appareil_photo/2cShopHtml5Oscim/cfg/configuration.php	2012-07-12 06:49:13 UTC (rev 4513)
@@ -39,7 +39,7 @@
 ResetConfigKey('PLUGIN_PRODUCT_INSTALLED');
 
 AddConfigInKey('PLUGIN_GENERIC_INSTALLED','lazyload.php');
-AddConfigInKey('PLUGIN_GENERIC_INSTALLED','slider .php');
+AddConfigInKey('PLUGIN_GENERIC_INSTALLED','slider.php');
 AddConfigInKey('PLUGIN_PRODUCT_INSTALLED','slimbox.php');
 AddConfigInKey('PLUGIN_PRODUCT_INSTALLED','uicoretabs.php');
 

Modified: branches/2.1.1/catalog/install/includes/language/fr_FR/install.base.txt
===================================================================
--- branches/2.1.1/catalog/install/includes/language/fr_FR/install.base.txt	2012-07-11 14:08:08 UTC (rev 4512)
+++ branches/2.1.1/catalog/install/includes/language/fr_FR/install.base.txt	2012-07-12 06:49:13 UTC (rev 4513)
@@ -8,6 +8,9 @@
   @encode UTF-8
 */
 
+@setlocale(LC_TIME, 'fr_FR.UTF-8');
+if(function_exists('date_default_timezone_set')) 
+	date_default_timezone_set('Europe/Paris');
 
 // core
 $lang['etape core.base']="Bienvenue" ;

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





Thread: [Oscss-commit] SF.net SVN: oscss:[4513] branches/2.1.1/catalog

E-Commerce Shopping Cart

oscss-commit