Changeset 972

Timestamp:

03/31/09 22:42:16 (14 years ago)

Author:

Moe

Message:

DL Manager 1.1-alpha2:

• moved download counter to (dc_)media (it doesn't work with current Dotclear release)

Location:

plugins/dlManager

Files:

• _admin.php (modified) (2 diffs)
• _define.php (modified) (1 diff)
• _install.php (modified) (2 diffs)
• _public.php (modified) (2 diffs)
• lib.dlManager.php (modified) (2 diffs)

plugins/dlManager/_admin.php

@@ -46 +46 @@
      public static function adminMediaItem($file)
      {
-          $count_dl = unserialize($GLOBALS['core']->blog->settings->dlmanager_count_dl);
+          $count_dl = @unserialize($GLOBALS['core']->blog->settings->dlmanager_count_dl);
           if (!is_array($count_dl))
           {
@@ -70 +70 @@
      public static function adminMediaListItem($file)
      {
-          $count_dl = unserialize($GLOBALS['core']->blog->settings->dlmanager_count_dl);
+          $count_dl = @unserialize($GLOBALS['core']->blog->settings->dlmanager_count_dl);
           if (!is_array($count_dl))
           {

plugins/dlManager/_define.php

@@ -28 +28 @@
      /* Description*/                "Download manager with a public page and a widget",
      /* Author */                    "Moe (http://gniark.net/), Osku and Tomtom (http://blog.zenstyle.fr)",
-     /* Version */                   '1.1-alpha1',
+     /* Version */                   '1.1-alpha2',
      /* Permissions */               'admin'
 );

plugins/dlManager/_install.php

@@ -56 +56 @@
 
 # move download counter to (dc_)media table
-if (version_compare($i_version,'1.1-beta1','<'))
+if (version_compare($i_version,'1.1-alpha2','<'))
 {
      # add media_download column to (dc_)media
@@ -64 +64 @@
      $changes = $si->synchronize($s);
      
-     // fixme : it works with only one blog
-     $count_dl = unserialize($core->blog->settings->dlmanager_count_dl);
-     if (is_array($count_dl))
+     # move download counter from blog settings to (dc_)media
+     $rs = $core->con->select('SELECT setting_value, setting_id, blog_id '.
+          'FROM '.$core->prefix.'setting '.
+          'WHERE ((setting_ns = \'dlmanager\') '.
+          'AND (setting_id = \'dlmanager_count_dl\'));');
+     
+     while($rs->fetch())
      {
-          foreach ($count_dl as $media_id => $dl)
+          $count_dl = @unserialize($rs->setting_value);
+          if (is_array($count_dl))
           {
-               $cur = $core->con->openCursor($core->prefix.'media');
-               $cur->media_download = $dl;
-               $cur->update('WHERE media_id = '.$media_id.';');       
+               foreach ($count_dl as $media_id => $dl)
+               {
+                    $cur = $core->con->openCursor($core->prefix.'media');
+                    $cur->media_download = $dl;
+                    $cur->update('WHERE media_id = '.$media_id.';');
+               }
           }
      }
      
-     $core->blog->settings->drop('dlmanager_count_dl');
+     # delete obsolete blog settings
+     $core->con->execute('DELETE FROM '.$core->prefix.'setting '.
+          'WHERE ((setting_ns = \'dlmanager\') '.
+          'AND (setting_id = \'dlmanager_count_dl\'));');
 }
 

plugins/dlManager/_public.php

@@ -297 +297 @@
                     if ($core->blog->settings->dlmanager_counter)
                     {
-                         $count = unserialize($core->blog->settings->dlmanager_count_dl);
-                         if (!is_array($count)) {$count = array();}
-                         $count[$file->media_id] = array_key_exists($file->media_id,$count)
-                              ? $count[$file->media_id]+1 : 1;
+                         $media_download = $core->con->select(
+                              'SELECT media_download '.
+                              'FROM '.$core->prefix.'media '.
+                              'WHERE media_id = '.$file->media_id.';')->f(0;
                          
-                         $settings =& $core->blog->settings;
+                         $cur = $core->con->openCursor($core->prefix.'media');
+                         $cur->media_download = $media_download + 1;
+                         $cur->update('WHERE media_id = '.$media_id.';');
                          
-                         $settings->setNamespace('dlmanager');
-                         $settings->put('dlmanager_count_dl',serialize($count),'string',
-                              'Download counter');
                          //$core->callBehavior('publicDownloadedFile',(integer)$args);
                     }
@@ -752 +751 @@
      }
      
+     
      /**
      Item icon path

plugins/dlManager/lib.dlManager.php

@@ -164 +164 @@
      {
           global $core;
-          
-          $count_dl = unserialize($core->blog->settings->dlmanager_count_dl);
-          if (!is_array($count_dl))
-          {
-               $count_dl = array();
-          }
-          
+
           $items = array();
                     
@@ -178 +172 @@
                if ($core->blog->settings->dlmanager_counter)
                {
-                    if ((isset($v->media_id))
-                         && (array_key_exists($v->media_id,$count_dl)))
+                    # no download counter for directories
+                    if (isset($v->media_id))
                     {
-                              $dl = $count_dl[$v->media_id];
+                              $dl = $v->media_download;
                     }
                }