Changeset 2406 for branches

Timestamp:

Jun 28, 2008, 3:58:35 PM (16 years ago)

Author:

mathiasm

Message:

Bug 817 (metadata display persistency) fixed for branch_1.7

File:

• branches/branch-1_7/picture.php (modified) (7 diffs)

branches/branch-1_7/picture.php

@@ -29 +29 @@
 include(PHPWG_ROOT_PATH.'include/section_init.inc.php');
 include_once(PHPWG_ROOT_PATH.'include/functions_picture.inc.php');
+include_once(PHPWG_ROOT_PATH.'include/functions_session.inc.php');
 
 // Check Access and exit when user status is not ok
@@ -49 +50 @@
     duplicate_index_url()
     );
+}
+
+// There is cookie, so we must handle it at the beginning
+if ( isset($_GET['metadata']) )
+{
+  if ( pwg_get_session_var('show_metadata') == null )
+        {
+                pwg_set_session_var('show_metadata', 1, 86400, cookie_path());
+        } else {
+        pwg_unset_session_var('show_metadata');
+
+        }
+
 }
 
@@ -459 +473 @@
 // metadata
 $url_metadata = duplicate_picture_url();
+$url_metadata = add_url_params( $url_metadata, array('metadata'=>null) );
+
 
 // do we have a plugin that can show metadata for something else than images?
@@ -470 +486 @@
   );
 
-if ($metadata_showable)
-{
-  if ( !isset($_GET['metadata']) )
-  {
-    $url_metadata = add_url_params( $url_metadata, array('metadata'=>null) );
-  }
-  else
-  {
-    $page['meta_robots']=array('noindex'=>1, 'nofollow'=>1);
-  }
-}
+if ( $metadata_showable and pwg_get_session_var('show_metadata') )
+{
+  $page['meta_robots']=array('noindex'=>1, 'nofollow'=>1);
+}
+
 
 $page['body_id'] = 'thePicturePage';
@@ -771 +781 @@
 $template->assign_vars($infos);
 
-
 // related categories
 if ( count($related_categories)==1 and
@@ -778 +787 @@
 { // no need to go to db, we have all the info
   $template->assign_block_vars(
-      'category',
+    'category',
       array('LINE'=>get_cat_display_name( $page['category']['upper_names'] ))
     );
@@ -837 +846 @@
 include(PHPWG_ROOT_PATH.'include/picture_rate.inc.php');
 include(PHPWG_ROOT_PATH.'include/picture_comment.inc.php');
-if ($metadata_showable and isset($_GET['metadata']))
+if ($metadata_showable and pwg_get_session_var('show_metadata') <> null )
 {
   include(PHPWG_ROOT_PATH.'include/picture_metadata.inc.php');