Changeset 1880

Timestamp:

Mar 8, 2007, 2:55:49 AM (18 years ago)

Author:

rvelices

Message:

• plugin administration: small fix during activation phase
• plugins: added 3 actions in category_cats.inc.php and 1 event that allow a plugin to decide if insertion to #history occurs
• added a warning in section_init if script_basename() is not index or picture (I think we'll have issues on some servers with this function)
• web service methods categories.getImages, tags.getImages and images.search return now the image comment

Location:

trunk

Files:

• admin/plugins.php (modified) (1 diff)
• include/category_cats.inc.php (modified) (5 diffs)
• include/functions.inc.php (modified) (1 diff)
• include/section_init.inc.php (modified) (1 diff)
• include/ws_functions.inc.php (modified) (3 diffs)

trunk/admin/plugins.php

@@ -90 +90 @@
       {
         array_push($errors, 'CANNOT '. $_GET['action'] .' - NOT INSTALLED');
+        break;
       }
       if ($crt_db_plugin['state']!='inactive')
       {
         array_push($errors, 'invalid current state '.$crt_db_plugin['state']);
+        break;
       }
       if ( file_exists($file_to_include) )

trunk/include/category_cats.inc.php

@@ -178 +178 @@
     update_cats_with_filtered_data($categories);
   }
-  trigger_action('loc_begin_index_categories');
+  trigger_action('loc_begin_index_category_thumbnails', $categories);
   if ($conf['subcatify'])
   {
@@ -222 +222 @@
           )
         );
+        
+      //plugins need to add/modify sth in this loop ?
+      trigger_action('loc_index_category_thumbnail',
+        $category, 'categories.category' );
     }
 
@@ -253 +257 @@
                                     $category['count_categories'],
                                     true,
-                                    '<BR>'
+                                    '; '
                                   ),
 
@@ -285 +289 @@
         );
 
+      //plugins need to add/modify sth in this loop ?
+      trigger_action('loc_index_category_thumbnail',
+        $category, 'thumbnails.line.thumbnail' );
+
       // create a new line ?
       if (++$row_number == $user['nb_image_line'])
@@ -301 +309 @@
     unset( $template->_tpldata['thumbnails.'] );//maybe write a func for that
   }
+  trigger_action('loc_end_index_category_thumbnails', $categories);
 }
 ?>

trunk/include/functions.inc.php

@@ -414 +414 @@
   global $conf, $user, $page;
 
+  $do_log = true;
   if (!$conf['log'])
   {
-    return false;
-  }
-
+    $do_log = false;
+  }
   if (is_admin() and !$conf['history_admin'])
   {
-    return false;
-  }
-
+    $do_log = false;
+  }
   if ($user['is_the_guest'] and !$conf['history_guest'])
+  {
+    $do_log = false;
+  }
+
+  $do_log = trigger_event('pwg_log_allowed', $do_log, $image_id, $image_type);
+  
+  if (!$do_log)
   {
     return false;

trunk/include/section_init.inc.php

@@ -299 +299 @@
       break;
     }
+    default:
+      trigger_error('script_basename "'.script_basename().'" unknown',
+        E_USER_WARNING);
   }
 }

trunk/include/ws_functions.inc.php

@@ -376 +376 @@
         }
       }
-      foreach ( array('name', 'file') as $k )
+      foreach ( array('file', 'name', 'comment') as $k )
       {
         $image[$k] = $row[$k];
@@ -830 +830 @@
         }
       }
-      foreach ( array('name', 'file') as $k )
+      foreach ( array('file', 'name', 'comment') as $k )
       {
         $image[$k] = $row[$k];
@@ -1036 +1036 @@
         }
       }
-      foreach ( array('name', 'file') as $k )
+      foreach ( array('file', 'name', 'comment') as $k )
       {
         $image[$k] = $row[$k];