Changeset 1882

Timestamp:

03/09/07 04:37:56 (6 years ago)

Author:

rvelices

Message:

plugins only:
- fix in category_default.inc.php (action parameters were wrong if show_nb_comments was true)
- refactor actions and events in picture.php in order to give more flexibility to plugins
- added some variables in index.tpl (not used by pwg itself) to allow plugins to add their own content

Location:

trunk

Files:

• include/category_default.inc.php (modified) (1 diff)
• picture.php (modified) (7 diffs)
• template/yoga/index.tpl (modified) (3 diffs)

trunk/include/category_default.inc.php

@@ -156 +156 @@
     AND validated = \'true\'
 ;';
-    $row = mysql_fetch_array(pwg_query($query));
+    list($row['nb_comments']) = mysql_fetch_array(pwg_query($query));
     $template->assign_block_vars(
       'thumbnails.line.thumbnail.nb_comments',

trunk/picture.php

@@ -71 +71 @@
   }
 
-  global $user, $page;
-
-  $my_template = new Template(
-    PHPWG_ROOT_PATH.'template/'.$user['template'],
-    $user['theme']
-    );
-  $my_template->set_filenames(
+  global $user, $page, $template;
+
+  $template->set_filenames(
     array('default_content'=>'picture_content.tpl')
     );
@@ -84 +80 @@
   {
     $uuid = uniqid(rand());
-    $my_template->assign_block_vars(
+    $template->assign_block_vars(
       'high',
       array(
@@ -92 +88 @@
       );
   }
-  $my_template->assign_vars( array(
+  $template->assign_vars( array(
       'SRC_IMG' => $element_info['image_url'],
       'ALT_IMG' => $element_info['file'],
@@ -99 +95 @@
       )
     );
-  return $my_template->parse( 'default_content', true);
+  return $template->parse( 'default_content', true);
 }
 
@@ -483 +479 @@
 $page['body_id'] = 'thePicturePage';
 
-// maybe someone wants a special display (call it before page_header so that
-// they can add stylesheets)
-$element_content = trigger_event(
-  'render_element_content',
-  '',
-  $picture['current']
-  );
+// allow plugins to change what we computed before passing data to template
+$picture = trigger_event('picture_pictures_data', $picture);
+
 
 if (isset($picture['next']['image_url'])
@@ -531 +523 @@
     'PHOTO' => $title_nb,
     'TITLE' => $picture['current']['name'],
-    'ELEMENT_CONTENT' => $element_content,
 
     'LEVEL_SEPARATOR' => $conf['level_separator'],
@@ -802 +793 @@
 }
 
+// maybe someone wants a special display (call it before page_header so that
+// they can add stylesheets)
+$element_content = trigger_event(
+  'render_element_content',
+  '',
+  $picture['current']
+  );
+$template->assign_var( 'ELEMENT_CONTENT', $element_content );
+
 // +-----------------------------------------------------------------------+
 // |                               sub pages                               |

trunk/template/yoga/index.tpl

@@ -42 +42 @@
       <li><a href="{mode_created.URL}" title="{lang:mode_created_hint}" rel="nofollow"><img src="{pwg_root}{themeconf:icon_dir}/calendar_created.png" class="button" alt="{lang:mode_created_hint}"></a></li>
       <!-- END mode_created -->
+      {PLUGIN_INDEX_ACTIONS}
     </ul>
 
@@ -63 +64 @@
   </div> <!-- titrePage -->
 
+{PLUGIN_INDEX_CONTENT_BEGIN}
 <!-- BEGIN calendar -->
 <!-- BEGIN navbar -->
@@ -105 +107 @@
 <!-- END related_tags -->
 
-
+{PLUGIN_INDEX_CONTENT_END}
 </div> <!-- content -->