Changeset 23162

Timestamp:

Jun 12, 2013, 4:45:36 PM (11 years ago)

Author:

plg

Message:

bug fixed: avoid "Access denied e" if HD is forbidden and XXL is as big as original.

bug fixed: in template use $derivative_type instead of $derivative->get_type() to avoid size=Original

Location:

extensions/download_by_size

Files:

• action.php (modified) (2 diffs)
• picture.tpl (modified) (1 diff)

extensions/download_by_size/action.php

@@ -110 +110 @@
 {
   case 'e':
-    if ( !$user['enabled_high'] )
-    {
-      $deriv = new DerivativeImage(IMG_XXLARGE, new SrcImage($element_info));
-      if ( !$deriv->same_as_source() )
-      {
-        do_error(401, 'Access denied e');
-      }
-    }
-    $file = get_element_path($element_info);
-
     //---- specific download_by_size, start
     if (isset($_GET['size']))
@@ -139 +129 @@
       $file = $deriv->get_path();
     }
+    else
+    {
+    //---- specific download_by_size, end
+    if ( !$user['enabled_high'] )
+    {
+      $deriv = new DerivativeImage(IMG_XXLARGE, new SrcImage($element_info));
+      if ( !$deriv->same_as_source() )
+      {
+        do_error(401, 'Access denied e');
+      }
+    }
+    $file = get_element_path($element_info);
+    //---- specific download_by_size, start
+    }
     //---- specific download_by_size, end
     

extensions/download_by_size/picture.tpl

@@ -26 +26 @@
   <div class="switchBoxTitle">{'Download'|@translate} - {'Photo sizes'|@translate}</div>
   {foreach from=$current.unique_derivatives item=derivative key=derivative_type}
-  <a href="{$DLSIZE_URL}{$derivative->get_type()}" rel="nofollow">
+  <a href="{$DLSIZE_URL}{$derivative_type}" rel="nofollow">
     {$derivative->get_type()|@translate}<span class="downloadSizeDetails"> ({$derivative->get_size_hr()})</span>
   </a><br>