Changeset 2521
- Timestamp:
- Sep 12, 2008, 4:17:35 AM (16 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/admin/include/functions_metadata.php
r2299 r2521 29 29 { 30 30 global $conf, $page; 31 31 32 32 $map = $conf['use_iptc_mapping']; 33 33 34 34 $iptc = get_iptc_data($file, $map); 35 35 … … 109 109 array_push($image_ids, $id); 110 110 } 111 111 112 112 $query = ' 113 113 SELECT id … … 119 119 ;'; 120 120 121 $result = pwg_query($query); 122 while ($row = mysql_fetch_array($result)) 123 { 124 array_push($has_high_images, $row['id']); 125 } 121 $has_high_images = array_from_query($query, 'id'); 126 122 127 123 foreach ($files as $id => $file) … … 130 126 $data['id'] = $id; 131 127 $data['filesize'] = floor(filesize($file)/1024); 132 128 133 129 if ($image_size = @getimagesize($file)) 134 130 { … … 143 139 $data['high_filesize'] = floor(filesize($high_file)/1024); 144 140 } 145 141 146 142 if ($conf['use_exif']) 147 143 { … … 162 158 $tags_of[$id] = array(); 163 159 } 164 160 165 161 foreach (explode(',', $iptc[$key]) as $tag_name) 166 162 { … … 179 175 array_push($datas, $data); 180 176 } 181 177 182 178 if (count($datas) > 0) 183 179 { … … 190 186 'date_metadata_update' 191 187 ); 192 188 193 189 if ($conf['use_exif']) 194 190 { … … 199 195 ); 200 196 } 201 197 202 198 if ($conf['use_iptc']) 203 199 { … … 218 214 'update' => array_unique($update_fields) 219 215 ), 220 $datas 216 $datas, 217 MASS_UPDATES_SKIP_EMPTY 221 218 ); 222 219 } … … 235 232 * @return array 236 233 */ 237 function get_filelist($category_id = '', $site_id=1, $recursive = false, 234 function get_filelist($category_id = '', $site_id=1, $recursive = false, 238 235 $only_new = false) 239 236 { 240 237 // filling $cat_ids : all categories required 241 238 $cat_ids = array(); 242 239 243 240 $query = ' 244 241 SELECT id … … 293 290 $files[$row['id']] = $row['path']; 294 291 } 295 292 296 293 return $files; 297 294 } -
trunk/admin/template/yoga/default-layout.css
r2503 r2521 291 291 font-size: 1em; /* <= some browsers don't set it correctly */ 292 292 } 293 UL, DL { text-align: left;}293 UL, DL, OL { text-align: left;} 294 294 TABLE { /* horizontaly centered */ 295 295 margin-left: auto; -
trunk/admin/template/yoga/layout.css
r2390 r2521 1 /* $Id$ */2 1 3 2 /* template css */ 4 @import "menubar.css"; 3 /*@import "menubar.css";*/ 5 4 @import "content.css"; 6 5 @import "thumbnails.css"; -
trunk/admin/template/yoga/theme/admin/theme.css
r2503 r2521 45 45 .content dl, dd { margin:5px; } 46 46 .content div.titrePage { height:55px; } 47 .content ol li { text-align: left; }48 47 .instructions { text-align: left; padding: 20px 20px 0 20px; } 49 48 .throw, td h3 { 50 49 background-image: url(images/fillet.png); background-repeat: repeat-x; } 51 .browsePath a { color: #eee; }52 50 /* borders */ /* TODO */ 53 51 INPUT, SELECT, TEXTAREA { border-left: 2px inset #696969; -
trunk/include/functions.inc.php
r2505 r2521 748 748 if (empty($msg)) 749 749 { 750 $redirect_msg = l10n('redirect_msg'); 751 } 752 else 753 { 754 $redirect_msg = $msg; 755 } 756 $redirect_msg = nl2br($redirect_msg); 750 $msg = nl2br(l10n('redirect_msg')); 751 } 757 752 758 753 $refresh = $refresh_time; … … 765 760 766 761 $template->set_filenames( array( 'redirect' => 'redirect.tpl' ) ); 762 $template->assign('REDIRECT_MSG', $msg); 763 767 764 $template->parse('redirect'); 768 765 -
trunk/include/functions_category.inc.php
r2517 r2521 259 259 { 260 260 global $conf, $page; 261 262 return array( 261 262 return trigger_event('get_category_preferred_image_orders', 263 array( 263 264 array(l10n('default_sort'), '', true), 264 265 array(l10n('Average rate'), 'average_rate DESC', $conf['rate']), … … 270 271 l10n('Rank'), 271 272 'rank ASC', 272 ('categories' == $page['section'] and !isset($page['flat']))273 ('categories' == @$page['section'] and !isset($page['flat'])) 273 274 ) 274 ) ;275 )); 275 276 } 276 277 -
trunk/include/functions_search.inc.php
r2451 r2521 353 353 else 354 354 { 355 if ( strcspn($ch, '%_')==0) 356 {// escape LIKE specials %_ 357 $ch = '\\'.$ch; 358 } 355 359 $crt_token .= $ch; 356 360 } … … 367 371 break; 368 372 default: 373 if ( strcspn($ch, '%_')==0) 374 {// escape LIKE specials %_ 375 $ch = '\\'.$ch; 376 } 369 377 $crt_token .= $ch; 370 378 } -
trunk/include/functions_session.inc.php
r2299 r2521 91 91 } 92 92 93 function get_remote_addr_session_hash() 94 { 95 return vsprintf( "%02X%02X", explode('.',$_SERVER['REMOTE_ADDR']) ); 96 } 97 93 98 /** 94 99 * this function returns … … 103 108 SELECT data 104 109 FROM '.SESSIONS_TABLE.' 105 WHERE id = \''. $session_id.'\'110 WHERE id = \''.get_remote_addr_session_hash().$session_id.'\' 106 111 ;'; 107 112 $result = pwg_query($query); … … 129 134 SET expiration = now(), 130 135 data = \''.$data.'\' 131 WHERE id = \''. $session_id.'\'136 WHERE id = \''.get_remote_addr_session_hash().$session_id.'\' 132 137 ;'; 133 138 pwg_query($query); … … 139 144 INSERT INTO '.SESSIONS_TABLE.' 140 145 (id,data,expiration) 141 VALUES(\''. $session_id.'\',\''.$data.'\',now())146 VALUES(\''.get_remote_addr_session_hash().$session_id.'\',\''.$data.'\',now()) 142 147 ;'; 143 148 mysql_query($query); … … 155 160 DELETE 156 161 FROM '.SESSIONS_TABLE.' 157 WHERE id = \''. $session_id.'\'162 WHERE id = \''.get_remote_addr_session_hash().$session_id.'\' 158 163 ;'; 159 164 pwg_query($query); -
trunk/include/page_header.php
r2299 r2521 70 70 // refresh 71 71 if ( isset( $refresh ) and intval($refresh) >= 0 72 and isset( $url_link ) and isset( $redirect_msg ))72 and isset( $url_link ) ) 73 73 { 74 74 $template->assign( 75 75 array( 76 'REDIRECT_MSG' => $redirect_msg,77 76 'page_refresh' => array( 78 77 'TIME' => $refresh, -
trunk/include/template.class.php
r2513 r2521 63 63 $this->smarty->register_modifier( 'explode', array('Template', 'mod_explode') ); 64 64 $this->smarty->register_block('html_head', array(&$this, 'block_html_head') ); 65 $this->smarty->register_function('known_script', array(&$this, 'func_known_script') , false);65 $this->smarty->register_function('known_script', array(&$this, 'func_known_script') ); 66 66 $this->smarty->register_prefilter( array('Template', 'prefilter_white_space') ); 67 67 if ( $conf['compiled_template_cache_language'] ) -
trunk/include/ws_core.inc.php
r2499 r2521 379 379 if ( is_null($this->_responseEncoder) ) 380 380 { 381 set_status_header( 500);381 set_status_header(400); 382 382 @header("Content-Type: text/plain"); 383 383 echo ("Cannot process your request. Unknown response format. 384 Request format: ".@$this->_requestFormat." handler:".$this->_requestHandler." 385 Response format: ".@$this->_responseFormat." encoder:".$this->_responseEncoder." 386 "); 384 Request format: ".@$this->_requestFormat." Response format: ".@$this->_responseFormat."\n"); 387 385 var_export($this); 388 386 die(0); … … 392 390 { 393 391 $this->sendResponse( 394 new PwgError( 500, 'Unknown request format')392 new PwgError(400, 'Unknown request format') 395 393 ); 396 394 return; -
trunk/include/ws_protocols/rest_handler.php
r2299 r2521 31 31 foreach ($param_array as $name => $value) 32 32 { 33 if ($name=='format' or $name=='partner')33 if ($name=='format') 34 34 continue; // ignore - special keys 35 35 if ($name=='method') … … 46 46 { 47 47 $service->sendResponse( 48 new PwgError( 400, 'Missing "method" name')48 new PwgError(WS_ERR_INVALID_METHOD, 'Missing "method" name') 49 49 ); 50 50 return; -
trunk/install/piwigo_structure.sql
r2518 r2521 37 37 `global_rank` varchar(255) default NULL, 38 38 `image_order` varchar(128) default NULL, 39 `permalink` varchar(64) default NULL,39 `permalink` varchar(64) binary default NULL, 40 40 PRIMARY KEY (`id`), 41 41 UNIQUE KEY `categories_i3` (`permalink`), … … 175 175 CREATE TABLE `piwigo_images` ( 176 176 `id` mediumint(8) unsigned NOT NULL auto_increment, 177 `file` varchar(255) NOT NULL default '',177 `file` varchar(255) binary NOT NULL default '', 178 178 `date_available` datetime NOT NULL default '0000-00-00 00:00:00', 179 179 `date_creation` date default NULL, … … 209 209 CREATE TABLE `piwigo_old_permalinks` ( 210 210 `cat_id` smallint(5) unsigned NOT NULL default '0', 211 `permalink` varchar(64) NOT NULL default '',211 `permalink` varchar(64) binary NOT NULL default '', 212 212 `date_deleted` datetime NOT NULL default '0000-00-00 00:00:00', 213 213 `last_hit` datetime default NULL, -
trunk/picture.php
r2513 r2521 537 537 if (!empty($id_pict_redirect)) 538 538 { 539 // $re direct_msg, $refresh, $url_link and $title are required for creating539 // $refresh, $url_link and $title are required for creating 540 540 // an automated refresh page in header.tpl 541 541 $refresh = $slideshow_params['period']; … … 544 544 $slideshow_url_params 545 545 ); 546 $redirect_msg = nl2br(l10n('redirect_msg'));547 546 } 548 547 } -
trunk/template/yoga/menubar_menu.tpl
r2488 r2521 1 <dt>{ $block->get_title()|@translate}</dt>1 <dt>{'title_menu'|@translate}</dt> 2 2 <dd> 3 <form action="{$ROOT_URL}qsearch.php" method="get" id="quicksearch" >3 <form action="{$ROOT_URL}qsearch.php" method="get" id="quicksearch" onsubmit="return this.q.value!='' && this.q.value!=qsearch_prompt;"> 4 4 <p style="margin:0;padding:0"{*this <p> is for html validation only - does not affect positioning*}> 5 5 <input type="text" name="q" id="qsearchInput" onfocus="if (value==qsearch_prompt) value='';" onblur="if (value=='') value=qsearch_prompt;" style="width:90%"/> -
trunk/template/yoga/redirect.tpl
r2489 r2521 1 1 {* $Id$ *} 2 <h2>{$REDIRECT_MSG}</h2> 3 <p style="text-align:center; margin: 2em"> 2 {html_head} 3 <style type="text/css">#the_page {ldelim}text-align:center;} </style> 4 {/html_head} 5 6 <div> 7 {$REDIRECT_MSG} 8 </div> 9 10 <p style="margin: 2em"> 4 11 <a href="{$page_refresh.U_REFRESH}"> 5 12 {'click_to_redirect'|@translate}
Note: See TracChangeset
for help on using the changeset viewer.