Changeset 2218 for trunk/picture.php

Timestamp:

Feb 27, 2008, 9:25:18 PM (16 years ago)

Author:

rub

Message:

Resolved issue 0000807: New slideshow features

File:

• trunk/picture.php (modified) (8 diffs)

trunk/picture.php

@@ -3 +3 @@
 // | PhpWebGallery - a PHP based picture gallery                           |
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
 // | file          : $Id$
@@ -79 +79 @@
     );
 
-  if ( !isset($page['slideshow']) and isset($element_info['high_url']) )
+  if ( !$page['slideshow'] and isset($element_info['high_url']) )
   {
     $uuid = uniqid(rand());
@@ -425 +425 @@
 ;
 
-$url_slide = add_url_params(
-  $picture['current']['url'],
-  array( 'slideshow'=>$conf['slideshow_period'] )
-  );
-
-
-$template->set_filename('picture', 'picture.tpl');
-if ( isset( $_GET['slideshow'] ) )
-{
-  $page['meta_robots']=array('noindex'=>1, 'nofollow'=>1);
+$slideshow_params = array();
+$slideshow_url_params = array();
+
+if (isset($_GET['slideshow']))
+{
   $page['slideshow'] = true;
-  if ( $conf['light_slideshow'] )
-  { // Change template file
-    // Add local-slideshow.css file if exists
-    $template->set_filename('picture', 'slideshow.tpl');
-    $css = get_root_url() . get_themeconf('template_dir') . '/theme/'
-         . get_themeconf('theme') . '/local-slideshow.css';
-    if (file_exists($css))
-    {
-      $template->assign_block_vars('slideshow', array());
-    }
-  }
-  if ( isset($page['next_item']) )
-  {
-    // $redirect_msg, $refresh, $url_link and $title are required for creating
-    // an automated refresh page in header.tpl
-    $refresh= $_GET['slideshow'];
-    $url_link = add_url_params(
-        $picture['next']['url'],
-        array('slideshow'=>$refresh)
-      );
-    $redirect_msg = nl2br(l10n('redirect_msg'));
+  $page['meta_robots'] = array('noindex'=>1, 'nofollow'=>1);
+
+  $slideshow_params = decode_slideshow_params($_GET['slideshow']);
+  $slideshow_url_params['slideshow'] = encode_slideshow_params($slideshow_params);
+
+  if ($slideshow_params['play'])
+  {
+    $id_pict_redirect = '';
+    if (isset($page['next_item']))
+    {
+      $id_pict_redirect = 'next';
+    }
+    else
+    {
+      if ($slideshow_params['repeat'] and isset($page['first_item']))
+      {
+        $id_pict_redirect = 'first';
+      }
+    }
+
+    if (!empty($id_pict_redirect))
+    {
+      // $redirect_msg, $refresh, $url_link and $title are required for creating
+      // an automated refresh page in header.tpl
+      $refresh = $slideshow_params['period'];
+      $url_link = add_url_params(
+          $picture[$id_pict_redirect]['url'],
+          $slideshow_url_params
+        );
+      $redirect_msg = nl2br(l10n('redirect_msg'));
+    }
+  }
+}
+else
+{
+  $page['slideshow'] = false;
+}
+
+$template->set_filenames(
+  array(
+    'picture' =>
+      (($page['slideshow'] and $conf['light_slideshow']) ? 'slideshow.tpl' : 'picture.tpl'),
+    'nav_buttons' => 'picture_nav_buttons.tpl'));
+
+if ($page['slideshow'])
+{
+  // Add local-slideshow.css file if exists
+  // Not only for ligth
+  $css = get_root_url() . get_themeconf('template_dir') . '/theme/'
+       . get_themeconf('theme') . '/local-slideshow.css';
+  if (file_exists($css))
+  {
+    $template->assign_block_vars('slideshow', array());
   }
 }
@@ -515 +542 @@
         'TITLE_IMG' => $picture[$which_image]['name'],
         'IMG' => $picture[$which_image]['thumbnail'],
-        'U_IMG' => $picture[$which_image]['url'],
+        // Params slideshow was transmit to navigation buttons
+        'U_IMG' =>
+          add_url_params(
+            $picture[$which_image]['url'], $slideshow_url_params)
         )
       );
@@ -526 +556 @@
       );
   }
+}
+
+
+if ($page['slideshow'])
+{
+  //slideshow end
+  $template->assign_block_vars(
+    'stop_slideshow',
+    array(
+      'U_SLIDESHOW' => $picture['current']['url'],
+      )
+    );
+
+  foreach (array('repeat', 'play') as $p)
+  {
+    $template->assign_block_vars(
+      ($slideshow_params[$p] ? 'stop' : 'start').'_'.$p,
+      array(
+        // Params slideshow was transmit to navigation buttons
+        'U_IMG' =>
+          add_url_params(
+            $picture['current']['url'],
+            array('slideshow' =>
+              encode_slideshow_params(
+                array_merge($slideshow_params, 
+                  array($p => ! $slideshow_params[$p]))
+                  )
+                )
+              )
+          )
+      );
+  }
+
+  foreach (array('dec', 'inc') as $op)
+  {
+    $new_period = $slideshow_params['period'] + ((($op == 'dec') ? -1 : 1) * $conf['slideshow_period_step']);
+    $new_slideshow_params =
+      correct_slideshow_params(
+        array_merge($slideshow_params, 
+                  array('period' => $new_period)));
+    $block_period = $op.'_period';
+
+    if ($new_slideshow_params['period'] === $new_period)
+    {
+      $template->assign_block_vars(
+        $block_period,
+        array(
+          // Params slideshow was transmit to navigation buttons
+          'U_IMG' =>
+            add_url_params(
+              $picture['current']['url'],
+              array('slideshow' => encode_slideshow_params($new_slideshow_params)
+                  )
+                )
+              )
+          );
+    }
+    else
+    {
+      $template->assign_block_vars(
+        $block_period.'_unactive',
+        array()
+        );
+    }
+  }
+}
+else
+{
+  $template->assign_block_vars(
+    'start_slideshow',
+    array(
+      'U_SLIDESHOW' =>
+        add_url_params(
+          $picture['current']['url'],
+          array( 'slideshow'=>''))
+      )
+    );
+  $template->assign_block_vars(
+    'thumbnails',array('U_UP' => $url_up));
 }
 
@@ -538 +647 @@
 
     'U_HOME' => make_index_url(),
-    'U_UP' => $url_up,
     'U_METADATA' => $url_metadata,
     'U_ADMIN' => $url_admin,
-    'U_SLIDESHOW'=> $url_slide,
     'U_ADD_COMMENT' => $url_self,
     )
@@ -643 +750 @@
 
 //--------------------------------------------------------- picture information
-$header_infos = array();        //for html header use
+$header_infos = array(); //for html header use
 // legend
 if (isset($picture['current']['comment'])
@@ -790 +897 @@
 }
 
-//slideshow end
-if (isset($_GET['slideshow']))
-{
-  if (!is_numeric($_GET['slideshow']))
-  {
-    $_GET['slideshow'] = $conf['slideshow_period'];
-  }
-
-  $template->assign_block_vars(
-    'stop_slideshow',
-    array(
-      'U_SLIDESHOW' => $picture['current']['url'],
-      )
-    );
-}
+// assign tpl picture_nav_buttons
+$template->assign_var_from_handle('NAV_BUTTONS', 'nav_buttons');
 
 // maybe someone wants a special display (call it before page_header so that