Changeset 1604

Timestamp:

Nov 10, 2006, 2:10:42 AM (17 years ago)

Author:

rvelices

Message:

 

Location:

trunk

Files:

• admin/include/functions_plugins.inc.php (modified) (1 diff)
• admin/rating.php (modified) (2 diffs)
• feed.php (modified) (3 diffs)
• include/functions_plugins.inc.php (modified) (3 diffs)
• include/section_init.inc.php (modified) (1 diff)
• index.php (modified) (3 diffs)

trunk/admin/include/functions_plugins.inc.php

@@ -42 +42 @@
           )
       {
-        $plugin = array('name'=>'?', 'version'=>'0', 'uri'=>'', 'description'=>'');
+        $plugin = array('name'=>$file, 'version'=>'0', 'uri'=>'', 'description'=>'');
         $plg_data = implode( '', file($path.'/main.inc.php') );
 

trunk/admin/rating.php

@@ -213 +213 @@
 $images = array();
 $result = pwg_query($query);
-while ($row = mysql_fetch_array($result))
+while ($row = mysql_fetch_assoc($result))
 {
   array_push($images, $row);
@@ -220 +220 @@
 foreach ($images as $image)
 {
-  $thumbnail_src = get_thumbnail_src($image['path'], $image['tn_ext']);
-
-  /*$image_url = make_picture_url(
-      array(
-        'category' => $image['storage_category_id'],
-        'image_id' => $image['id'],
-        'image_file' => $image['file'],
-      )
-    );*/
+  $thumbnail_src = get_thumbnail_url($image);
+
   $image_url = PHPWG_ROOT_PATH.'admin.php?page=picture_modify'.
             '&image_id='.$image['id'];

trunk/feed.php

@@ -127 +127 @@
 include_once(PHPWG_ROOT_PATH.'include/feedcreator.class.php');
 
-$base_url = 'http://'.$_SERVER["HTTP_HOST"].cookie_path();
+$base_url = get_host_url().cookie_path();
 if ( strrpos($base_url, '/') !== strlen($base_url)-1 )
 {
@@ -190 +190 @@
 $result = pwg_query($query);
 $dates = array();
-while ($row = mysql_fetch_array($result))
+while ($row = mysql_fetch_assoc($result))
 {
   array_push($dates, $row);
@@ -233 +233 @@
 ;';
   $result = pwg_query($query);
-  while ($row = mysql_fetch_array($result))
+  while ($row = mysql_fetch_assoc($result))
   {
-    $tn_src = get_thumbnail_src($row['path'], @$row['tn_ext']);
+    $tn_src = get_thumbnail_url($row);
     $item->description .= '<img src="'.$tn_src.'"/>';
   }

trunk/include/functions_plugins.inc.php

@@ -55 +55 @@
       if ( $handler['function'] == $func )
       {
-        return true;
+        return false;
       }
     }
@@ -231 +231 @@
 
 
+function load_plugin($plugin)
+{
+  $file_name = PHPWG_PLUGINS_PATH.$plugin['id'].'/main.inc.php';
+  if ( file_exists($file_name) )
+  {
+    include_once( $file_name );
+  }
+}
+
 /*loads all the plugins on startup*/
 function load_plugins()
@@ -242 +251 @@
   $plugins = get_db_plugins('active');
   foreach( $plugins as $plugin)
-  {
-    $file_name = PHPWG_PLUGINS_PATH.$plugin['id'].'/main.inc.php';
-    if ( file_exists($file_name) )
-    {
-      include_once( $file_name );
-    }
+  {// include main from a function to avoid using same function context
+    load_plugin($plugin);
   }
   trigger_action('plugins_loaded');

trunk/include/section_init.inc.php

@@ -653 +653 @@
   }
 }
+
+trigger_action('loc_end_section_init');
 ?>

trunk/index.php

@@ -30 +30 @@
 include_once( PHPWG_ROOT_PATH.'include/common.inc.php' );
 include(PHPWG_ROOT_PATH.'include/section_init.inc.php');
+
+trigger_action('loc_begin_index');
 
 // +-----------------------------------------------------------------------+
@@ -240 +242 @@
 }
 //------------------------------------------------------- category informations
-if (
-  $page['navigation_bar'] != ''
-  or (isset($page['comment']) and $page['comment'] != '')
-  )
-{
-  $template->assign_block_vars('cat_infos',array());
-}
+
 // navigation bar
 if ($page['navigation_bar'] != '')
@@ -287 +283 @@
 }
 
-if (isset($page['category']))
-{
-  // category comment
-  if (isset($page['comment']) and $page['comment'] != '')
-  {
-    $template->assign_block_vars(
-      'cat_infos.comment',
-      array(
-        'COMMENTS' => $page['comment']
-        )
-      );
-  }
+// category comment
+if (isset($page['comment']) and $page['comment'] != '')
+{
+  $template->assign_block_vars(
+    'cat_infos.comment',
+    array(
+      'COMMENTS' => $page['comment']
+      )
+    );
 }
 //------------------------------------------------------------ log informations
 pwg_log('category', $page['title']);
 
+trigger_action('loc_end_index');
 $template->parse('index');
 include(PHPWG_ROOT_PATH.'include/page_tail.php');