Changeset 26100 for extensions/SocialButtons/main.inc.php

Timestamp:

Dec 23, 2013, 12:44:02 AM (10 years ago)

Author:

mistic100

Message:

update for Piwigo 2.6 and update Facebook options

File:

• extensions/SocialButtons/main.inc.php (modified) (4 diffs)

extensions/SocialButtons/main.inc.php

@@ -11 +11 @@
 defined('PHPWG_ROOT_PATH') or die('Hacking attempt!');
 
-global $prefixeTable;
-
 // +-----------------------------------------------------------------------+
 // | Define plugin constants                                               |
 // +-----------------------------------------------------------------------+
-defined('SOCIALBUTT_ID') or define('SOCIALBUTT_ID', basename(dirname(__FILE__)));
+define('SOCIALBUTT_ID',      basename(dirname(__FILE__)));
 define('SOCIALBUTT_PATH' ,   PHPWG_PLUGINS_PATH . SOCIALBUTT_ID . '/');
 define('SOCIALBUTT_ADMIN',   get_root_url() . 'admin.php?page=plugin-' . SOCIALBUTT_ID);
@@ -34 +32 @@
   function socialbutt_admin_plugin_menu_links($menu) 
   {
-    array_push($menu, array(
+    $menu[] = array(
       'NAME' => 'Social Buttons',
       'URL' => SOCIALBUTT_ADMIN,
-    ));
+      );
     return $menu;
   }
@@ -54 +52 @@
 {
   global $conf, $pwg_loaded_plugins;
-  
-  // apply upgrade if needed
-  if (
-    SOCIALBUTT_VERSION == 'auto' or
-    $pwg_loaded_plugins[SOCIALBUTT_ID]['version'] == 'auto' or
-    version_compare($pwg_loaded_plugins[SOCIALBUTT_ID]['version'], SOCIALBUTT_VERSION, '<')
-  )
-  {
-    // call install function
-    include_once(SOCIALBUTT_PATH . 'include/install.inc.php');
-    socialbutt_install();
-    
-    // update plugin version in database
-    if ( $pwg_loaded_plugins[SOCIALBUTT_ID]['version'] != 'auto' and SOCIALBUTT_VERSION != 'auto' )
-    {
-      $query = '
-UPDATE '. PLUGINS_TABLE .'
-SET version = "'. SOCIALBUTT_VERSION .'"
-WHERE id = "'. SOCIALBUTT_ID .'"';
-      pwg_query($query);
-      
-      $pwg_loaded_plugins[SOCIALBUTT_ID]['version'] = SOCIALBUTT_VERSION;
-      
-      if (defined('IN_ADMIN'))
-      {
-        $_SESSION['page_infos'][] = 'Social Buttons updated to version '. SOCIALBUTT_VERSION;
-      }
-    }
-  }
-  
-  // prepare plugin configuration
+
+  include_once(SOCIALBUTT_PATH . 'maintain.inc.php');
+  $maintain = new SocialButtons_maintain(SOCIALBUTT_ID);
+  $maintain->autoUpdate(SOCIALBUTT_VERSION, 'install');
+
   $conf['SocialButtons'] = unserialize($conf['SocialButtons']);
 }
@@ -147 +119 @@
     if ($conf['SocialButtons'][$service]['enabled'])
     {
+      if ($service=='pinterest' && $basename!='picture')
+      {
+        continue;
+      }
       include_once(SOCIALBUTT_PATH . 'include/'. $service .'.inc.php');
       call_user_func_array('socialbutt_'.$service, array($basename, $root_url, &$tpl_vars, &$buttons));