- Timestamp:
- Mar 26, 2012, 6:07:03 AM (12 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/admin/include/image.class.php
r13426 r13736 266 266 static function get_sharpen_matrix($amount) 267 267 { 268 // Amount should be in the range of 2 4-10269 $amount = round(abs(-2 4 + ($amount * 0.14)), 2);268 // Amount should be in the range of 28-10 269 $amount = round(abs(-28 + ($amount * 0.18)), 2); 270 270 271 271 $matrix = array -
trunk/i.php
r13651 r13736 29 29 defined('PWG_DERIVATIVE_DIR') or define('PWG_DERIVATIVE_DIR', $conf['data_location'].'i/'); 30 30 31 @include(PHPWG_ROOT_PATH.PWG_LOCAL_DIR .'config/database.inc.php'); 32 33 31 34 function trigger_action() {} 32 35 function get_extension( $filename ) … … 373 376 } 374 377 378 include_once(PHPWG_ROOT_PATH .'include/dblayer/functions_'.$conf['dblayer'].'.inc.php'); 375 379 include_once( PHPWG_ROOT_PATH .'/include/derivative_params.inc.php'); 376 380 include_once( PHPWG_ROOT_PATH .'/include/derivative_std_params.inc.php'); 377 381 378 ImageStdParams::load_from_file(); 382 try 383 { 384 $pwg_db_link = pwg_db_connect($conf['db_host'], $conf['db_user'], 385 $conf['db_password'], $conf['db_base']); 386 } 387 catch (Exception $e) 388 { 389 ilog("db error", $e->getMessage()); 390 } 391 list($conf['derivatives']) = pwg_db_fetch_row(pwg_query('SELECT value FROM '.$prefixeTable.'config WHERE param=\'derivatives\'')); 392 ImageStdParams::load_from_db(); 379 393 380 394 … … 429 443 && strpos($page['src_location'], 'plugins/')===false) 430 444 { 431 @include(PHPWG_ROOT_PATH.PWG_LOCAL_DIR .'config/database.inc.php');432 include(PHPWG_ROOT_PATH .'include/dblayer/functions_'.$conf['dblayer'].'.inc.php');433 445 try 434 446 { 435 $pwg_db_link = pwg_db_connect($conf['db_host'], $conf['db_user'],436 $conf['db_password'], $conf['db_base']);437 447 $query = 'SELECT coi, width, height FROM '.$prefixeTable.'images WHERE path=\''.$page['src_location'].'\''; 438 448 if ( ($row=pwg_db_fetch_assoc(pwg_query($query))) ) … … 444 454 $page['coi'] = $row['coi']; 445 455 } 446 mysql_close($pwg_db_link);447 456 if (!$row) 448 457 { … … 455 464 } 456 465 } 466 mysql_close($pwg_db_link); 457 467 458 468 try_switch_source($params, $src_mtime); -
trunk/include/derivative_std_params.inc.php
r13683 r13736 118 118 } 119 119 120 static function load_from_file()121 {122 global $conf;123 $arr = @unserialize(@file_get_contents(PHPWG_ROOT_PATH.$conf['data_location'].'derivatives.dat'));124 if (false!==$arr)125 {126 self::$type_map = $arr['d'];127 self::$watermark = @$arr['w'];128 if (!self::$watermark) self::$watermark = new WatermarkParams();129 self::$custom = @$arr['c'];130 if (!self::$custom) self::$custom = array();131 }132 else133 {134 self::make_default();135 }136 self::build_maps();137 }138 139 120 static function set_watermark($watermark) 140 121 { … … 159 140 ) ); 160 141 conf_update_param('derivatives', addslashes($ser) ); 161 file_put_contents(PHPWG_ROOT_PATH.$conf['data_location'].'derivatives.dat', $ser);162 142 } 163 143 -
trunk/picture.php
r13115 r13736 173 173 if ($type==IMG_SQUARE || $type==IMG_THUMB) 174 174 continue; 175 if (!array_key_exists($type, ImageStdParams::get_defined_type_map())) 176 continue; 175 177 $url = $derivative->get_url(); 176 178 if (isset($added[$url])) -
trunk/themes/default/template/index.tpl
r13729 r13736 8 8 <span class="pwg-icon pwg-icon-sort"> </span><span class="pwg-button-text">{'Sort order'|@translate}</span> 9 9 </a> 10 <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( )">10 <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)"> 11 11 <div class="switchBoxTitle">{'Sort order'|@translate}</div> 12 12 {foreach from=$image_orders item=image_order name=loop}{if !$smarty.foreach.loop.first}<br>{/if} … … 19 19 </div> 20 20 {footer_script}{literal} 21 function toggleSortOrderBox( ) {21 function toggleSortOrderBox(forceHide) { 22 22 var elt = document.getElementById("sortOrderBox"), 23 23 ePos = document.getElementById("sortOrderLink"); 24 if ( elt.style.display==="none") {24 if (!forceHide && elt.style.display==="none") { 25 25 elt.style.position = "absolute"; 26 26 elt.style.left = ePos.offsetLeft+"px"; … … 39 39 <span class="pwg-icon pwg-icon-sizes"> </span><span class="pwg-button-text">{'Photo sizes'|@translate}</span> 40 40 </a> 41 <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( )">41 <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)"> 42 42 <div class="switchBoxTitle">{'Photo sizes'|@translate}</div> 43 43 {foreach from=$image_derivatives item=image_derivative name=loop}{if !$smarty.foreach.loop.first}<br>{/if} … … 50 50 </div> 51 51 {footer_script}{literal} 52 function toggleImageDerivativesBox( ) {52 function toggleImageDerivativesBox(forceHide) { 53 53 var elt = document.getElementById("derivativeSwitchBox"), 54 54 ePos = document.getElementById("derivativeChooseLink"); 55 if ( elt.style.display==="none") {55 if (!forceHide && elt.style.display==="none") { 56 56 elt.style.position = "absolute"; 57 57 elt.style.left = ePos.offsetLeft+"px"; -
trunk/themes/default/template/picture.tpl
r13729 r13736 54 54 {strip}<a id="derivativeSwitchLink" href="javascript:toggleDerivativeSwitchBox()" title="{'Photo sizes'|@translate}" class="pwg-state-default pwg-button" rel="nofollow"> 55 55 <span class="pwg-icon pwg-icon-sizes"> </span><span class="pwg-button-text">{'Photo sizes'|@translate}</span></a> 56 <div id="derivativeSwitchBox" class="switchBox" onclick="toggleDerivativeSwitchBox()" style="display:none" onmouseout="e=event.toElement||event.relatedTarget;e.parentNode==this||e ==this||toggleDerivativeSwitchBox()">56 <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()"> 57 57 <div class="switchBoxTitle">{'Photo sizes'|@translate}</div> 58 58 {foreach from=$current.unique_derivatives item=derivative key=derivative_type}
Note: See TracChangeset
for help on using the changeset viewer.