Merge branch 'feature/379-multiple-format'

1 files changed, 33 insertions, 2 deletions

diff --git a/action.php b/action.php
index 4b92e056c..c26df65e5 100644
--- a/action.php
+++ b/action.php
@@ -57,11 +57,34 @@ function do_error( $code, $str )
   exit();
 }
 
+if ($conf['enable_formats'] and isset($_GET['format']))
+{
+  check_input_parameter('format', $_GET, false, PATTERN_ID);
+
+  $query = '
+SELECT
+    *
+  FROM '.IMAGE_FORMAT_TABLE.'
+  WHERE format_id = '.$_GET['format'].'
+;';
+  $formats = query2array($query);
+
+  if (count($formats) == 0)
+  {
+    do_error(400, 'Invalid request - format');
+  }
+
+  $format = $formats[0];
+
+  $_GET['id'] = $format['image_id'];
+  $_GET['part'] = 'f'; // "f" for "format"
+}
+
 
 if (!isset($_GET['id'])
     or !is_numeric($_GET['id'])
     or !isset($_GET['part'])
-    or !in_array($_GET['part'], array('e','r') ) )
+    or !in_array($_GET['part'], array('e','r','f') ) )
 {
   do_error(400, 'Invalid request - id/part');
 }
@@ -116,6 +139,10 @@ switch ($_GET['part'])
   case 'r':
     $file = original_to_representative( get_element_path($element_info), $element_info['representative_ext'] );
     break;
+  case 'f' :
+    $file = original_to_format(get_element_path($element_info), $format['ext']);
+    $element_info['file'] = get_filename_wo_extension($element_info['file']).'.'.$format['ext'];
+    break;
 }
 
 if ( empty($file) )
@@ -130,6 +157,10 @@ else if ($_GET['part'] == 'e')
 {
   pwg_log($_GET['id'], 'other');
 }
+else if ($_GET['part'] == 'f')
+{
+  pwg_log($_GET['id'], 'high', $format['format_id']);
+}
 
 $http_headers = array();
 
@@ -155,7 +186,7 @@ if (!url_is_remote($file))
   // HTTP/1.1 only
   $http_headers[] = 'Cache-Control: private, must-revalidate, max-age='.$max_age;*/
 
-  if ( isset( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) )
+  if ('f' != $_GET['part'] and isset( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) )
   {
     set_status_header(304);
     foreach ($http_headers as $header)