Changeset 13736

Timestamp:

Mar 26, 2012, 6:07:03 AM (12 years ago)

Author:

rvelices

Message:

• small js fixes on index/picture
• i.php does not use derivatives.dat file anymore (obsolete file)
• better selection of derivatives in picture.php
• larger sharpen real range in image.class.php

Location:

trunk

Files:

• admin/include/image.class.php (modified) (1 diff)
• i.php (modified) (5 diffs)
• include/derivative_std_params.inc.php (modified) (2 diffs)
• picture.php (modified) (1 diff)
• themes/default/template/index.tpl (modified) (4 diffs)
• themes/default/template/picture.tpl (modified) (1 diff)

trunk/admin/include/image.class.php

@@ -266 +266 @@
   static function get_sharpen_matrix($amount)
   {
-                // Amount should be in the range of 24-10
-                $amount = round(abs(-24 + ($amount * 0.14)), 2);
+                // Amount should be in the range of 28-10
+                $amount = round(abs(-28 + ($amount * 0.18)), 2);
 
                 $matrix = array

trunk/i.php

@@ -29 +29 @@
 defined('PWG_DERIVATIVE_DIR') or define('PWG_DERIVATIVE_DIR', $conf['data_location'].'i/');
 
+@include(PHPWG_ROOT_PATH.PWG_LOCAL_DIR .'config/database.inc.php');
+
+
 function trigger_action() {}
 function get_extension( $filename )
@@ -373 +376 @@
 }
 
+include_once(PHPWG_ROOT_PATH .'include/dblayer/functions_'.$conf['dblayer'].'.inc.php');
 include_once( PHPWG_ROOT_PATH .'/include/derivative_params.inc.php');
 include_once( PHPWG_ROOT_PATH .'/include/derivative_std_params.inc.php');
 
-ImageStdParams::load_from_file();
+try
+{
+  $pwg_db_link = pwg_db_connect($conf['db_host'], $conf['db_user'],
+                                $conf['db_password'], $conf['db_base']);
+}
+catch (Exception $e)
+{
+  ilog("db error", $e->getMessage());
+}
+list($conf['derivatives']) = pwg_db_fetch_row(pwg_query('SELECT value FROM '.$prefixeTable.'config WHERE param=\'derivatives\''));
+ImageStdParams::load_from_db();
 
 
@@ -429 +443 @@
     && strpos($page['src_location'], 'plugins/')===false)
 {
-  @include(PHPWG_ROOT_PATH.PWG_LOCAL_DIR .'config/database.inc.php');
-  include(PHPWG_ROOT_PATH .'include/dblayer/functions_'.$conf['dblayer'].'.inc.php');
   try
   {
-    $pwg_db_link = pwg_db_connect($conf['db_host'], $conf['db_user'],
-                                  $conf['db_password'], $conf['db_base']);
     $query = 'SELECT coi, width, height FROM '.$prefixeTable.'images WHERE path=\''.$page['src_location'].'\'';
     if ( ($row=pwg_db_fetch_assoc(pwg_query($query))) )
@@ -444 +454 @@
       $page['coi'] = $row['coi'];
     }
-    mysql_close($pwg_db_link);
     if (!$row)
     {
@@ -455 +464 @@
   }
 }
+mysql_close($pwg_db_link);
 
 try_switch_source($params, $src_mtime);

trunk/include/derivative_std_params.inc.php

@@ -118 +118 @@
   }
 
-  static function load_from_file()
-  {
-    global $conf;
-    $arr = @unserialize(@file_get_contents(PHPWG_ROOT_PATH.$conf['data_location'].'derivatives.dat'));
-    if (false!==$arr)
-    {
-      self::$type_map = $arr['d'];
-      self::$watermark = @$arr['w'];
-      if (!self::$watermark) self::$watermark = new WatermarkParams();
-      self::$custom = @$arr['c'];
-      if (!self::$custom) self::$custom = array();
-    }
-    else
-    {
-      self::make_default();
-    }
-    self::build_maps();
-  }
-
   static function set_watermark($watermark)
   {
@@ -159 +140 @@
       ) );
     conf_update_param('derivatives', addslashes($ser) );
-    file_put_contents(PHPWG_ROOT_PATH.$conf['data_location'].'derivatives.dat', $ser);
   }
 

trunk/picture.php

@@ -173 +173 @@
     if ($type==IMG_SQUARE || $type==IMG_THUMB)
       continue;
+    if (!array_key_exists($type, ImageStdParams::get_defined_type_map()))
+      continue;
     $url = $derivative->get_url();
     if (isset($added[$url]))

trunk/themes/default/template/index.tpl

@@ -8 +8 @@
                         <span class="pwg-icon pwg-icon-sort">&nbsp;</span><span class="pwg-button-text">{'Sort order'|@translate}</span>
                 </a>
-                <div id="sortOrderBox" class="switchBox" style="display:none; text-align:left" onclick="toggleSortOrderBox()" onmouseout="e=event.toElement||event.relatedTarget;e.parentNode==this||e==this||toggleSortOrderBox()">
+                <div id="sortOrderBox" class="switchBox" style="display:none; text-align:left" onclick="toggleSortOrderBox()" onmouseout="e=event.toElement||event.relatedTarget;e.parentNode==this||e==this||toggleSortOrderBox(1)">
                         <div class="switchBoxTitle">{'Sort order'|@translate}</div>
                         {foreach from=$image_orders item=image_order name=loop}{if !$smarty.foreach.loop.first}<br>{/if}
@@ -19 +19 @@
                 </div>
                 {footer_script}{literal}
-function toggleSortOrderBox() {
+function toggleSortOrderBox(forceHide) {
         var elt = document.getElementById("sortOrderBox"),
                 ePos = document.getElementById("sortOrderLink");
-        if (elt.style.display==="none") {
+        if (!forceHide && elt.style.display==="none") {
                 elt.style.position = "absolute";
                 elt.style.left = ePos.offsetLeft+"px";
@@ -39 +39 @@
                         <span class="pwg-icon pwg-icon-sizes">&nbsp;</span><span class="pwg-button-text">{'Photo sizes'|@translate}</span>
                 </a>
-                <div id="derivativeSwitchBox" class="switchBox" style="display:none; text-align:left" onclick="toggleImageDerivativesBox()" onmouseout="e=event.toElement||event.relatedTarget;e.parentNode==this||e==this||toggleImageDerivativesBox()">
+                <div id="derivativeSwitchBox" class="switchBox" style="display:none; text-align:left" onclick="toggleImageDerivativesBox()" onmouseout="e=event.toElement||event.relatedTarget;e.parentNode==this||e==this||toggleImageDerivativesBox(1)">
                         <div class="switchBoxTitle">{'Photo sizes'|@translate}</div>
                         {foreach from=$image_derivatives item=image_derivative name=loop}{if !$smarty.foreach.loop.first}<br>{/if}
@@ -50 +50 @@
                 </div>
                 {footer_script}{literal}
-function toggleImageDerivativesBox() {
+function toggleImageDerivativesBox(forceHide) {
         var elt = document.getElementById("derivativeSwitchBox"),
                 ePos = document.getElementById("derivativeChooseLink");
-        if (elt.style.display==="none") {
+        if (!forceHide && elt.style.display==="none") {
                 elt.style.position = "absolute";
                 elt.style.left = ePos.offsetLeft+"px";

trunk/themes/default/template/picture.tpl

@@ -54 +54 @@
 {strip}<a id="derivativeSwitchLink" href="javascript:toggleDerivativeSwitchBox()" title="{'Photo sizes'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
 <span class="pwg-icon pwg-icon-sizes">&nbsp;</span><span class="pwg-button-text">{'Photo sizes'|@translate}</span></a>
-<div id="derivativeSwitchBox" class="switchBox" onclick="toggleDerivativeSwitchBox()" style="display:none" onmouseout="e=event.toElement||event.relatedTarget;e.parentNode==this||e==this||toggleDerivativeSwitchBox()">
+<div id="derivativeSwitchBox" class="switchBox" onclick="toggleDerivativeSwitchBox()" style="display:none" onmouseout="e=event.toElement||event.relatedTarget;e.parentNode==this||e.parentNode.parentNode==this||e==this||toggleDerivativeSwitchBox()">
 <div class="switchBoxTitle">{'Photo sizes'|@translate}</div>
 {foreach from=$current.unique_derivatives item=derivative key=derivative_type}