Changeset 8420

Timestamp:

Jan 1, 2011, 11:16:52 AM (14 years ago)

Author:

rub

Message:

Facebook_Integration plugin is inactivated when FacebookPlug is activating
Get representative image for category or random picture (and not only first picture)
Allow Facebook to access private index page

Location:

extensions/FacebookPlug/Plugin

Files:

• include/header.inc.php (modified) (1 diff)
• include/index.inc.php (modified) (2 diffs)
• include/picture.inc.php (modified) (1 diff)
• maintain.inc.php (modified) (2 diffs)

extensions/FacebookPlug/Plugin/include/header.inc.php

@@ -119 +119 @@
   ;
 }
-add_event_handler('fbp_do_facebook_init', 'fbp_do_facebook_init');
+
+function fbp_is_facebook_ip()
+{
+  foreach (array(
+    FBP_IP_FB, 
+    //~ '127.0',
+      ) as $ip_fb)
+  {
+    if (preg_match('/'.$ip_fb. '/', $_SERVER["REMOTE_ADDR"]))
+    {
+      return true;
+    }
+  }
+  return false;
+}
+
+function ftp_loc_end_section_init()
+{
+  global $conf, $page, $user;
+
+  // No restristion for facebook user
+  if (
+      $page['fbp']['do_facebook_init']
+      and 
+      is_a_guest()
+      and
+      $conf['fbp']['allow_fb_access_private_page']
+      and
+      fbp_is_facebook_ip()
+    )
+  {
+    global $user, $header_notes;
+
+    // Notes
+    $header_notes[] = 'Facebook robot detected, guest can access private page';
+    // Allow guest access
+    $conf['guest_access'] = true;
+    // No forbidden categorie
+    $user['forbidden_categories'] = '';
+    $user['level'] = max($conf['available_permission_levels']);
+    switch (script_basename())
+    {
+      case 'picture':
+        if (isset($page['image_id']))
+        {
+          $page['rank_of'][$page['image_id']] = 0;
+          $page['items'] = array_flip($page['rank_of']);
+        }
+        break;
+      case 'index':
+        if (isset($page['category']['representative_picture_id']))
+        {
+          fbp_loc_begin_index_category_thumbnails(array($page['category']));
+        }
+      break;
+    }
+    //~ else if $page['category']['id']
+  }
+}
 
 add_event_handler('init', 'fbp_init');
 add_event_handler('loc_end_page_header', 'fbp_loc_end_page_header');
+add_event_handler('fbp_do_facebook_init', 'fbp_do_facebook_init');
+add_event_handler('loc_end_section_init', 'ftp_loc_end_section_init');
 
 ?>

extensions/FacebookPlug/Plugin/include/index.inc.php

@@ -82 +82 @@
   global $page;
 
-  if (count($categories) > 0)
+  $C = count($categories);
+  if ($C > 0)
   {
     include_once(PHPWG_ROOT_PATH.'include/functions_picture.inc.php');
-    $category = reset($categories);
-    $query = '
+    //~ $category = reset($categories);
+    $category = $categories[rand(0, $C-1)];
+    if (is_numeric($category['representative_picture_id']))
+    {
+      $query = '
 SELECT id, path, tn_ext
 FROM '.IMAGES_TABLE.'
 WHERE id = '.$category['representative_picture_id'].'
 ;';
-    $result = pwg_query($query);
-    if($row = pwg_db_fetch_assoc($result))
-    {
-      set_make_full_url();
-      $page['fbp']['url_image'] = get_thumbnail_url($row);
-      unset_make_full_url();
+      $result = pwg_query($query);
+      if($row = pwg_db_fetch_assoc($result))
+      {
+        set_make_full_url();
+        $page['fbp']['url_image'] = get_thumbnail_url($row);
+        unset_make_full_url();
+      }
     }
   }
@@ -105 +110 @@
   global $page;
 
-  if (count($pictures) > 0)
+  if (isset($page['category']['representative_picture_id']))
   {
-    include_once(PHPWG_ROOT_PATH.'include/functions_picture.inc.php');
-    $picture = reset($pictures);
-    set_make_full_url();
-    $page['fbp']['url_image'] = get_thumbnail_url($picture);
-    unset_make_full_url();
+    fbp_loc_begin_index_category_thumbnails(array($page['category']));
+  }
+  else
+  {
+    $C = count($pictures);
+    if ($C > 0)
+    {
+      include_once(PHPWG_ROOT_PATH.'include/functions_picture.inc.php');
+      $picture = reset($pictures);
+      $picture = $pictures[rand(0, $C-1)];
+      set_make_full_url();
+      $page['fbp']['url_image'] = get_thumbnail_url($picture);
+      unset_make_full_url();
+    }
   }
 }

extensions/FacebookPlug/Plugin/include/picture.inc.php

@@ -90 +90 @@
 }
 
-function ftp_loc_end_section_init()
-{
-  global $conf, $page;
-
-  //~ if ($conf['fbp']['social_plugin_like_button']['enabled'] or $conf['fbp']['social_plugin_comments']['enabled'])
-  if ($page['fbp']['do_facebook_init'])
-  {
-    if ($conf['fbp']['allow_fb_access_private_page'])
-    {
-      global $user, $page;
-
-      // No restristion for facebook user
-      if (preg_match('/'.FBP_IP_FB. '/', $_SERVER["REMOTE_ADDR"]))
-      {
-        //Allow guest access
-        $conf['guest_access'] = true;
-        // No forbidden categorie
-        $user['forbidden_categories'] = '';
-        $user['level'] = max($conf['available_permission_levels']);
-        $page['rank_of'][$page['image_id']] = 0;
-        $page['items'] = array_flip($page['rank_of']);
-      }
-    }
-  }
-}
-
 add_event_handler('render_element_content', 'fbp_render_element_content', EVENT_HANDLER_PRIORITY_NEUTRAL+1 /*in order to have picture content*/, 2);
-add_event_handler('loc_end_section_init', 'ftp_loc_end_section_init');
 
 ?>

extensions/FacebookPlug/Plugin/maintain.inc.php

@@ -26 +26 @@
 function plugin_install()
 {
+  // Update configuration
   $query = '
 replace into '.CONFIG_TABLE.'
@@ -40 +41 @@
 }
 
+function plugin_activate()
+{
+  // Inactivate plugins
+  $plugins = array('Facebook_Integration');
+    $query = '
+update '.PLUGINS_TABLE.'
+set STATE=\'inactive\'
+where ID in (\'' . implode('\',\'', $plugins) . '\')
+;';
+    pwg_query($query);
+
+}
+
 function plugin_uninstall()
 {
+  // Delete configuration
   $query = '
 delete from '.CONFIG_TABLE.'