Changeset 3843 for extensions

Timestamp:

Sep 13, 2009, 8:00:47 PM (15 years ago)

Author:

vdigital

Message:

Don't forget to adapt category name selection mask (<!--Book--> by default)
'ak_categories' is active. (bug 1160)

Location:

extensions/akBookStyle/trunk

Files:

• admin.php (modified) (1 diff)
• default_values.inc.php (modified) (1 diff)
• include/akContent.class.php (modified) (2 diffs)
• public.php (modified) (1 diff)

extensions/akBookStyle/trunk/admin.php

@@ -37 +37 @@
   if (!empty($_POST['ak_categories']) && $_POST['ak_categories']!=$me->ak_categories) {
     $me->ak_categories = $_POST['ak_categories'];
+    if ( $_POST['ak_categories'] == '') $me->ak_categories = '<!--Book-->';
     array_push($GLOBALS['page']['infos'], $lang['ak_categories_changed']);
     $save_config = true;

extensions/akBookStyle/trunk/default_values.inc.php

@@ -24 +24 @@
   die('Hacking attempt!');
 }
-$default_values['ak_categories'] = '<!--Book-->';
+$default_values['ak_categories'] = '<!--Book-->';
 $default_values['ak_by_page'] = 10;
 $default_values['ak_by_line'] = 2;

extensions/akBookStyle/trunk/include/akContent.class.php

@@ -34 +34 @@
     $this->next_picture = null;
     $this->previous_picture = null;
+    $this->applicable = false;
   }
 
-  public function user_force() {
-    $GLOBALS['user']['nb_image_page'] = $this->plugin_config->ak_by_page;
+  public function page_force() {
+    global $page;
+    if ( isset($page['category']) ) {
+      $cat_filter = $this->plugin_config->ak_categories;
+      $this->applicable = (stripos($page['category']['name'], $cat_filter) > 0) ? true:false;
+      if ( $this->applicable ) { 
+        $page['nb_image_page'] = $this->plugin_config->ak_by_page;
+      }
+    }
   }
 
   public function loc_begin_index_thumbnails($images) {
     global $template;
+    if ($this->applicable === false) return;
     $this->category_url = make_index_url(array('section' => 'category',
                  'category' => $GLOBALS['page']['category'],
@@ -69 +78 @@
 
   public function loc_end_index_thumbnails($tpl_vars, $images) {
+    if ($this->applicable === false) return $tpl_vars;
     foreach ($tpl_vars as &$tpl_var) {
       $tpl_var['AK_URL'] = $this->makeAkUrl($tpl_var);

extensions/akBookStyle/trunk/public.php

@@ -28 +28 @@
 
 $public_content = new akContent($plugin_config);
-
+    /* Only on category request */
 add_event_handler('loc_begin_index_thumbnails', 
-                  array($public_content, 'loc_begin_index_thumbnails')
-                  );
+                        array($public_content, 'loc_begin_index_thumbnails')
+                        );
 add_event_handler('loc_end_index_thumbnails', 
-                  array($public_content, 'loc_end_index_thumbnails'),
-                  EVENT_HANDLER_PRIORITY_NEUTRAL,
-                  2            
-                  );
-add_event_handler('init', 
-                  array($public_content, 'user_force')
-                  );
+                        array($public_content, 'loc_end_index_thumbnails'),
+                        EVENT_HANDLER_PRIORITY_NEUTRAL,
+                        2              
+                );
+add_event_handler('loc_begin_index', 
+                        array($public_content, 'page_force')
+                        );
 ?>