Changeset 15551

Timestamp:

Jun 5, 2012, 8:06:53 PM (12 years ago)

Author:

rvelices

Message:

multisize - avoid php warning for rotation_angle; better error logging; javascript avoid navigation to empty # anchor

Location:

trunk

Files:

• admin/include/image.class.php (modified) (2 diffs)
• admin/themes/default/template/configuration.tpl (modified) (2 diffs)
• i.php (modified) (3 diffs)
• themes/default/template/picture.tpl (modified) (1 diff)

trunk/admin/include/image.class.php

@@ -276 +276 @@
   static function get_rotation_angle_from_code($rotation_code)
   {
-    switch($rotation_code)
+    switch($rotation_code%4)
     {
       case 0: return 0;
@@ -624 +624 @@
     if (is_array($returnarray) && (count($returnarray)>0) )
     {
-      ilog($returnarray);
+      ilog('ERROR', $returnarray);
     }
     return is_array($returnarray);

trunk/admin/themes/default/template/configuration.tpl

@@ -294 +294 @@
     jQuery("#sizeEdit-"+sizeName).toggle();
     jQuery(this).hide();
+                return false;
   });
 
@@ -491 +492 @@
   jQuery(".addWatermarkOpen").click(function(){
     jQuery("#addWatermark, #selectWatermark").toggle();
+                return false;
   });
 });

trunk/i.php

@@ -117 +117 @@
   //todo improve
   echo $msg;
+  ilog('ERROR', $code, $msg, $_SERVER['REQUEST_URI']);
   exit;
 }
@@ -487 +488 @@
   }
 }
+else
+{
+  $page['rotation_angle'] = 0;
+}
 mysql_close($pwg_db_link);
 
@@ -505 +510 @@
 
 // rotate
-if (0 != (int)$page['rotation_angle'])
+if (0 != $page['rotation_angle'])
 {
   $image->rotate($page['rotation_angle']);

trunk/themes/default/template/picture.tpl

@@ -258 +258 @@
                                                 e = document.getElementById("ratingCount");
                                                 if (e) {ldelim}
-                                                        if (rating.count == 1) {ldelim}
+                                                        if (rating.count == 1)
                                                                 e.innerHTML = "({'%d rate'|@translate|@escape:'javascript'})".replace( "%d", rating.count);
-                                                        {rdelim}
-                                                        else {ldelim}
+                                                        else
                                                                 e.innerHTML = "({'%d rates'|@translate|@escape:'javascript'})".replace( "%d", rating.count);
-                                                        {rdelim}
                                                 {rdelim}
                                         {rdelim}{rdelim} );