Changeset 5727 for extensions/PWG_Stuffs/include

Timestamp:

Apr 9, 2010, 12:26:04 AM (14 years ago)

Author:

patdenice

Message:

2.1 ready!

Location:

extensions/PWG_Stuffs/include

Files:

• class.inc.php (modified) (2 diffs)
• stuffs.inc.php (modified) (4 diffs)

extensions/PWG_Stuffs/include/class.inc.php

@@ -95 +95 @@
         $block['U_EDIT'] = PHPWG_ROOT_PATH.'admin.php?page=plugin&section='.STUFFS_DIR.'%2Fadmin%2Fadd_module.php&type='.$module['type'].'&edit='.$module['id'];
       }
-      $block['TEMPLATE'] = realpath($this->get_template($module['type'].'.tpl'));
+      $block['TEMPLATE'] = 'stuffs_'.$module['type'].'.tpl';
         $this->set_tpl_block($block, $module);
     }
@@ -169 +169 @@
         }
 
-  /* Return template for user template/theme*/
-  function get_template($file)
-  {
-    global $user, $template;
-
-    $dir = STUFFS_PATH . 'template/';
-    $theme_file = $dir.$user['template'].'/'.$user['theme'].'/'.$file;
-    $template_file = $dir.$user['template'].'/'.$file;
-
-    if (file_exists($theme_file))
-    {
-      return $theme_file;
-    }
-    elseif (file_exists($template_file))
-    {
-      return $template_file;
-    }
-    else
-    {
-      return $dir.$file;
-    }
+  static function prefilter_index_css($source, &$smarty)
+  {
+    $css = array(
+      '<link rel="stylesheet" type="text/css" href="{$ROOT_URL}plugins/PWG_Stuffs/theme/stuffs_index.css">'
+    );
+
+    foreach ($smarty->get_template_vars('themes') as $theme)
+    {
+      if (file_exists(PHPWG_THEMES_DIR.$theme['id'].'/stuffs_index.css'))
+      {
+        array_push($css, '<link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/'.$theme['id'].'/stuffs_index.css">');
+      }
+    }
+
+    $source = str_replace("\n</head>", "\n".implode( "\n", $css )."\n</head>", $source);
+
+    return $source;
+  }
+
+  static function prefilter_picture_css($source, &$smarty)
+  {
+    $css = array(
+      '<link rel="stylesheet" type="text/css" href="{$ROOT_URL}plugins/PWG_Stuffs/theme/stuffs_picture.css">'
+    );
+
+    foreach ($smarty->get_template_vars('themes') as $theme)
+    {
+      if (file_exists(PHPWG_THEMES_DIR.$theme['id'].'/stuffs_picture.css'))
+      {
+        array_push($css, '<link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/'.$theme['id'].'/stuffs_picture.css">');
+      }
+    }
+
+    if (!empty($css))
+    {
+      $source = str_replace("\n</head>", "\n".implode( "\n", $css )."\n</head>", $source);
+    }
+
+    return $source;
   }
 }

extensions/PWG_Stuffs/include/stuffs.inc.php

@@ -10 +10 @@
 $stuffs = new stuffs();
 
-$template->set_filename('stuffs', realpath($stuffs->get_template('blocks.tpl')));
+$template->set_template_dir(STUFFS_PATH.'theme/template/');
+$template->set_filename('stuffs', 'stuffs_blocks.tpl');
 
 if (script_basename() == 'index')
@@ -16 +17 @@
   $begin = 'PLUGIN_INDEX_CONTENT_BEFORE';
   $end = 'PLUGIN_INDEX_CONTENT_AFTER';
-  $css_file = 'index.css';
+  $template->set_prefilter( 'header', array('stuffs', 'prefilter_index_css') );
 }
 else
@@ -22 +23 @@
   $begin = 'PLUGIN_PICTURE_BEFORE';
   $end = 'PLUGIN_PICTURE_AFTER';
-  $css_file = 'picture.css';
+  $template->set_prefilter('header', array('stuffs', 'prefilter_picture_css'));
   pwgs_picture_special_sections();
 }
@@ -37 +38 @@
 }
 
-$template->block_html_head('', '<link rel="stylesheet" type="text/css" href="'.get_root_url().ltrim($stuffs->get_template($css_file), '/\\.').'">', $smarty, $repeat);
-
 ?>