Changeset 13489 for trunk

Timestamp:

Mar 6, 2012, 9:43:18 PM (12 years ago)

Author:

rvelices

Message:

added event for src image url
simplify js in picture.tpl
action.php fix history saving

Location:

trunk

Files:

• action.php (modified) (4 diffs)
• include/derivative.inc.php (modified) (1 diff)
• themes/default/template/picture.tpl (modified) (3 diffs)

trunk/action.php

@@ -23 +23 @@
 
 define('PHPWG_ROOT_PATH','./');
+session_cache_limiter('public');
 include_once(PHPWG_ROOT_PATH.'include/common.inc.php');
 
@@ -71 +72 @@
 ;';
 
-$result = pwg_query($query);
-$element_info = pwg_db_fetch_assoc($result);
+$element_info = pwg_db_fetch_assoc(pwg_query($query));
 if ( empty($element_info) )
 {
@@ -106 +106 @@
     if ( $user['enabled_high']!='true' )
     {
-      do_error(401, 'Access denied h');
+      do_error(401, 'Access denied e');
     }
     $file = get_element_path($element_info);
@@ -120 +120 @@
 }
 
-if ($_GET['part'] == 'h') {
+if ($_GET['part'] == 'e') {
   pwg_log($_GET['id'], 'high');
 }

trunk/include/derivative.inc.php

@@ -77 +77 @@
   function get_url()
   {
-    return embellish_url(get_root_url().$this->rel_path);
+    $url = get_root_url().$this->rel_path;
+    if ($this->flags & self::IS_ORIGINAL)
+    {
+      $url = trigger_event('get_src_image_url', $url, $this);
+    }
+    return embellish_url($url);
   }
 

trunk/themes/default/template/picture.tpl

@@ -21 +21 @@
 {if count($current.unique_derivatives)>1}
 {footer_script}{literal}
-function changeImgSrc(url,typeSave,typeMap,typeDisplay)
+function changeImgSrc(url,typeSave,typeMap)
 {
         var theImg = document.getElementById("theMainImage");
@@ -28 +28 @@
                 theImg.removeAttribute("width");theImg.removeAttribute("height");
                 theImg.src = url;
-                var elt = document.getElementById("derivativeSwitchLink");
-                /* if (elt) elt.innerHTML = typeDisplay; */
                 theImg.useMap = "#map"+typeMap;
         }
@@ -54 +52 @@
 <div id="derivativeSwitchBox" onclick="toggleDerivativeSwitchBox()" style="display:none">
 {foreach from=$current.unique_derivatives item=derivative key=derivative_type}
-<a href="javascript:changeImgSrc('{$derivative->get_url()|@escape:javascript}','{$derivative_type}','{$derivative->get_type()}','{$derivative->get_type()|@translate|@escape:javascript}')">{$derivative->get_type()|@translate} ({$derivative->get_size_hr()})</a><br>
+<a href="javascript:changeImgSrc('{$derivative->get_url()|@escape:javascript}','{$derivative_type}','{$derivative->get_type()}')">{$derivative->get_type()|@translate} ({$derivative->get_size_hr()})</a><br>
 {/foreach}
 {if isset($U_ORIGINAL)}