Changeset 13736 for trunk/i.php

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

File:

• trunk/i.php (modified) (5 diffs)

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);