Changeset 19460 for extensions/Panoramas/AS_Panorama.php

Timestamp:

Dec 16, 2012, 8:19:28 PM (11 years ago)

Author:

Klarsfeld

Message:

Upgrade for Piwigo 2.4.5
Only languages en-UK and fr-FR upgraded

File:

• extensions/Panoramas/AS_Panorama.php (modified) (2 diffs)

extensions/Panoramas/AS_Panorama.php

@@ -12 +12 @@
                   global $conf, $template, $page;
                   $asp = & $conf['AS_panorama'];
-                  if ( !stristr($image['name'], $asp['in_mode_360']) 
-                   and !stristr($image['name'], $asp['in_mode_180']) ) return $content;
-                  if (!isset($image['image_url'])) return $content;
-                  if ( isset($page['slideshow']) and $page['slideshow'] ) return $content;
-                  if (isset($image['width']) and $image['width'] < $asp['min_viewport_width']) return $content;
-                  $asp['image_name'] = $image['name'];
-                  $asp['width'] = $image['width'];
-                  $asp['height'] = $image['height'];
-                  if (stristr($image['name'], $asp['in_mode_180'])) {
-                        $asp['mode_360'] = 'false';
-                        $asp['name'] = str_replace($asp['in_mode_180'],'', $image['name']);
-                  }
-                  else  {
-                        $asp['name'] = str_replace($asp['in_mode_360'],'', $image['name']);
-                  }
-                  $template->set_filenames(
-                        array('AS_panorama_content' => dirname(__FILE__) . '/template/AS_panorama_content.tpl') );
-                  $asp['Path'] = embellish_url($template->get_template_vars('ROOT_URL').ASP_PATH);
-                  $asp['content'] = $content;
-                  $template->assign( array( 'ASP' => $asp, ) );
-                  return $template->parse('AS_panorama_content', true);
-                }
-  }
+        //echo "<pre>"; print_r($template); echo "</pre>"; exit;
+        
+        if (isset($template->files['slideshow'])) return $content;
+        if ( !stristr($image['name'], $asp['in_mode_360']) and !stristr($image['name'], $asp['in_mode_180']) ) return $content;
+        if (!isset($image['path'])) return $content;
+        if ( isset($page['slideshow']) and $page['slideshow'] ) return $content;
+        if (isset($image['width']) and $image['width'] < $asp['min_viewport_width']) return $content;
+
+        $divtag = "<img src=\"";
+        $divtag.= str_replace( "./", "", $image['path'])."\" width=\"".$image['width']."\" ";
+        $divtag.= "height=\"".$image['height']."\" ";
+        $divtag.= "alt=\"".$image['file']."\" id=\"theMainImage\" ";
+        
+        if ($image['height'] > $asp['viewport_height']) {
+                $ratio = $image['width'] / $image['height'];
+                $image['height'] = $asp['viewport_height'];
+                $image['width'] = $asp['viewport_height'] * $ratio;
+        }
+
+        $asp['image_name'] = $image['name'];
+        $asp['width'] = $image['width'];
+        $asp['height'] = $image['height'];
+        if (stristr($image['name'], $asp['in_mode_180'])) {
+                $asp['mode_360'] = 'false';
+                $asp['name'] = str_replace($asp['in_mode_180'],'', $image['name']);
+        }
+        else  {
+                $asp['name'] = str_replace($asp['in_mode_360'],'', $image['name']);
+        }
+        
+        $template->set_filenames(
+        array('AS_panorama_content' => dirname(__FILE__) . '/template/AS_panorama_content.tpl') );
+        $asp['Path'] = embellish_url($template->get_template_vars('ROOT_URL').ASP_PATH);
+        $asp['content'] = $divtag;
+        $template->assign( array( 'ASP' => $asp, ) );
+        return $template->parse('AS_panorama_content', true);
+}
+}
 }
 
 if ( !function_exists( 'AS_panorama_title' ) ) {
-  if ( $conf['AS_panorama']['In_name_display_removal'] ) {
-    add_event_handler('loc_end_picture', 'AS_panorama_title');
-    function AS_panorama_title()
-    {
-      global $conf, $template;
-      $asp = & $conf['AS_panorama'];
-      $picture = $template->get_template_vars('current');
-          if ( isset($asp['name']) ) {
-                  $picture['TITLE'] = $asp['name'];
-                  $template->assign('current', $picture);
-                  $template->assign( array( 'ASP' => $asp, ) );
-          }
-    }
-  }
+        if ( $conf['AS_panorama']['In_name_display_removal'] ) {
+                add_event_handler('loc_end_picture', 'AS_panorama_title');
+                function AS_panorama_title()
+                {
+                        global $conf, $template;
+                        $asp = & $conf['AS_panorama'];
+                        $picture = $template->get_template_vars('current');
+                        if ( isset($asp['name']) ) {
+                        $picture['TITLE'] = $asp['name'];
+                        $template->assign('current', $picture);
+                        $template->assign( array( 'ASP' => $asp, ) );
+                        }
+                }
+        }
 }
 
@@ -57 +72 @@
         if ( defined('IN_ADMIN') and IN_ADMIN ) {
                 add_event_handler('get_admin_plugin_menu_links', 'AS_panorama_menu');
-    function AS_panorama_menu($menu)
-    {
-        array_push($menu,
-            array(
-                'NAME' => 'Panoramas',
-                'URL' => get_admin_plugin_menu_link(dirname(__FILE__).'/AS_Panorama_admin.php')
-            )
-        );
-        return $menu;
-    }
-  }
+                function AS_panorama_menu($menu)
+                {
+                        array_push($menu,
+                                array(
+                                        'NAME' => 'Panoramas',
+                                        'URL' => get_admin_plugin_menu_link(dirname(__FILE__).'/AS_Panorama_admin.php')
+                                        )
+                        );
+                return $menu;
+                }
+        }
 }
 ?>