Changeset 4252

Timestamp:

04/17/12 13:49:32 (13 months ago)

Author:

oscim

Message:

Ajutement changement de path pour les boxes

Files:

• trunk/catalog/includes/classes/core_page/overlay/oscss_boxes.php (modified) (6 diffs)

trunk/catalog/includes/classes/core_page/overlay/oscss_boxes.php

@@ -60 +60 @@
       $cache = page::GetCacheVar();
       if(!isset($cache['boxes'][self::$_key])) {
-        include($path);
-        page::AddCacheVar('boxes',self::$_key,$array);
+                                include($path);
+                                page::AddCacheVar('boxes',self::$_key,$array);
       }
       else $array=$cache['boxes'][self::$_key];
@@ -84 +84 @@
   private function boxes($file_to_display,$type='std',$opt) {
     global $page, $PHP_SELF, $request_type,$language, $lang;
+
     $name_clean=(strchr($file_to_display,'.')==$page->ext)? substr($file_to_display,0,strlen($file_to_display)-4) :$file_to_display ;
+
     if (!is_array($opt)) $opt=array();
 
-    /* Force une taille d'image par defaut pour les images, si aucunne n'est prￜcisￜ */
+    /* Force une taille d'image par defaut pour les images, si aucunne n'est precise */
     if (!isset($opt['img'])) $opt['img']=array('width'=>$page->the_var('SIDEBAR_IMG_WIDTH'),'height'=>$page->the_var('SIDEBAR_IMG_HEIGHT'));
     if (!isset($opt['img']['width'])) $opt['img']['width']=$page->the_var('SIDEBAR_IMG_WIDTH');
@@ -99 +101 @@
     if (page::TestFile(sprintf($filename,'plugins/'))) $path =sprintf($filename,'plugins/');
     elseif (page::TestFile(sprintf($filename,'boxes/'))) $path =sprintf($filename,'boxes/');
-    elseif (page::TestFile(DIR_WS_BOXES . $name_clean.$page->ext)) $path = (DIR_WS_BOXES . $name_clean.$page->ext);
+    elseif (page::TestFile(DIR_WS_TEMPLATES . DEFAULT_TEMPLATE_NAME. '/'.DIR_WS_BOXES . $name_clean.$page->ext)) $path = (DIR_WS_TEMPLATES . DEFAULT_TEMPLATE_NAME .'/'. DIR_WS_BOXES . $name_clean.$page->ext);
     else return false;
 
@@ -126 +128 @@
     if (!is_array($opt)) $opt=array();
 
-    /** Force une taille d'image par defaut pour les images, si aucunne n'est prￜcisￜ */
+    /** Force une taille d'image par defaut pour les images, si aucunne n'est precise */
     if (!isset($opt['img'])) $opt['img']=array('width'=>$page->the_var('SIDEBAR_IMG_WIDTH'),'height'=>$page->the_var('SIDEBAR_IMG_HEIGHT'));
     if (!isset($opt['img']['width'])) $opt['img']['width']=$page->the_var('SIDEBAR_IMG_WIDTH');
@@ -158 +160 @@
     if(!empty($type) && !empty($boxe)) {
       $key=(strchr($boxe,'.')==$page->ext)? substr($boxe,0,strlen($boxe)-4) :$boxe ;
+
       if (isset($page->page['boxes'][$type]) && isset($page->page['boxes']['list'][$key]) &&  isset($page->page['boxes'][$type][$key]) && $page->page['boxes'][$type][$key] !='false')
         return $page->page['boxes']['list'][$key]->path;
-      else return false;
+
+      else 
+                                return false;
     }
     elseif(!empty($type) && empty($boxe)){
       if( isset($page->page['boxes'][$type]) ){
-        foreach($page->page['boxes']['sort'] as $k=>$v)
-          if(isset($page->page['boxes'][$type][$k]))$s[$k]=$page->page['boxes']['list'][$k];
-        return $s;
+                                foreach($page->page['boxes']['sort'] as $k=>$v)
+                                        if(isset($page->page['boxes'][$type][$k]))$s[$k]=$page->page['boxes']['list'][$k];
+                                                return $s;
       }
       else return array();
@@ -172 +177 @@
     elseif(empty($type) && !empty($boxe)) {
       $key=(strchr($boxe,'.')==$page->ext)? substr($boxe,0,strlen($boxe)-4) :$boxe ;
-      if (isset($page->page['boxes']['std'][$key]) && $page->page['boxes']['std'][$key] !='false') return $page->page['boxes']['list'][$key]->path;
+
+      if (isset($page->page['boxes']['std'][$key]) && $page->page['boxes']['std'][$key] !='false') 
+                                return $page->page['boxes']['list'][$key]->path;
 
       foreach($page->page['boxes']['sort'] as $k=>$v)
-        if (isset($page->page['boxes'][$k][$key]) && $page->page['boxes'][$k][$key] !='false') return $page->page['boxes']['list'][$key]->path;
+                                if (isset($page->page['boxes'][$k][$key]) && $page->page['boxes'][$k][$key] !='false') 
+                                        return $page->page['boxes']['list'][$key]->path;
 //       while($r=each($page->page['boxes'])){
 //         if (isset($page->page['boxes'][$r['key']][$key]) && $page->page['boxes'][$r['key']][$key] !='false') return $page->page['boxes']['list'][$key]->path;