feature 2633 added: ability to select default size

git-svn-id: http://piwigo.org/svn/trunk@15299 68402e56-0260-453c-a942-63ccdbb3a9ee
Piwigo · May 24, 2012 · b205058 · b205058
1 parent dcd6efb
commit b205058
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/include/config_default.inc.php b/include/config_default.inc.php
@@ -760,4 +760,7 @@
 $conf['derivative_url_style']=0;
 
 $conf['chmod_value']= substr_compare(PHP_SAPI, 'apa', 0, 3)==0 ? 0777 : 0755;
+
+// 'small', 'medium' or 'large'
+$conf['derivative_default_size'] = 'medium';
 ?>
diff --git a/picture.php b/picture.php
@@ -149,6 +149,8 @@
 // this is the default handler that generates the display for the element
 function default_picture_content($content, $element_info)
 {
+  global $conf;
+
   if ( !empty($content) )
   {// someone hooked us - so we skip;
     return $content;
@@ -162,7 +164,7 @@ function default_picture_content($content, $element_info)
     }
     setcookie('picture_deriv', false, 0, cookie_path() );
   }
-  $deriv_type = pwg_get_session_var('picture_deriv', IMG_LARGE);
+  $deriv_type = pwg_get_session_var('picture_deriv', $conf['derivative_default_size']);
   $selected_derivative = $element_info['derivatives'][$deriv_type];
 
   $unique_derivatives = array();
@@ -938,10 +940,20 @@ function default_picture_content($content, $element_info)
     and $picture['next']['src_image']->is_original()
     and strpos($_SERVER['HTTP_USER_AGENT'], 'Chrome/') === false)
 {
-  $template->assign('U_PREFETCH', $picture['next']['derivatives'][pwg_get_session_var('picture_deriv', IMG_LARGE)]->get_url() );
+  $template->assign(
+    'U_PREFETCH',
+    $picture['next']['derivatives'][pwg_get_session_var('picture_deriv', $conf['derivative_default_size'])]->get_url()
+    );
 }
 
-$template->assign('U_CANONICAL', make_picture_url( array('image_id'=>$picture['current']['id'], 'image_file'=>$picture['current']['file']) ) );
+$template->assign(
+  'U_CANONICAL',
+  make_picture_url(
+    array(
+      'image_id' => $picture['current']['id'],
+      'image_file' => $picture['current']['file'])
+    )
+  );
 
 // +-----------------------------------------------------------------------+
 // |                               sub pages                               |