Changeset 18642
- Timestamp:
- Oct 15, 2012, 3:38:31 PM (12 years ago)
- Location:
- extensions/piclens
- Files:
-
- 1 added
- 5 edited
-
admin/rssfeed.php (modified) (1 diff)
-
admin/rssfeed.tpl (modified) (1 diff)
-
generate_rss.php (modified) (12 diffs)
-
icons/rss_icon.png (added)
-
include/config_param.inc.php (modified) (2 diffs)
-
include/default_values.inc.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
extensions/piclens/admin/rssfeed.php
r8780 r18642 113 113 114 114 // Selection des groupes 115 $exts = get_all_exts();116 if (!empty($exts))117 {118 $template->assign('file_types', get_html_exts_selection($exts, 'file_types', $me->my_config['included_file_types']));119 }115 // $exts = get_all_exts(); 116 // if (!empty($exts)) 117 // { 118 // $template->assign('file_types', get_html_exts_selection($exts, 'file_types', $me->my_config['included_file_types'])); 119 // } 120 120 121 121 /* -
extensions/piclens/admin/rssfeed.tpl
r3908 r18642 15 15 16 16 <br/> 17 <div>18 <fieldset>19 <legend>{'piclens_rsscfg_exttitle'|@translate}</legend>20 <TABLE border="0" CELLPADDING="3" ALIGN="LEFT">21 <TR>22 <TD >23 {'piclens_rsscfg_ext'|@translate}24 </TD >25 <td colspan="2">{$file_types}26 </td>27 </TR>28 <TR>29 <TD > 30 </TD >31 <TD colspan="2">32 <i>{'piclens_rsscfg_ext1'|@translate}</i>33 </TD >34 </TR>35 <TR>36 <td colspan="3"><i> {'piclens_rsscfg_ext2'|@translate}</i>37 </td>38 </TR>39 </TABLE>40 </fieldset>41 42 </div>43 17 44 18 <div> -
extensions/piclens/generate_rss.php
r12542 r18642 62 62 $cat = array(); 63 63 $pictures = array(); 64 65 $basic_fields = array( 66 'DISTINCT(img.id)', 67 'img.file', 68 'img.date_available', 69 'img.date_creation', 70 'img.name', 71 'img.comment', 72 'img.author', 73 'img.hit', 74 'img.filesize', 75 'img.rating_score', 76 'img.path', 77 'img.level', 78 ); 64 79 65 80 $forbidden = get_sql_condition_FandF( … … 87 102 array_push($cat, "1"); 88 103 89 $query = 'SELECT DISTINCT(img.id), img.file, img.date_available, img.date_creation, img.tn_ext, img.name, 90 img.comment, img.author, img.hit ,img.filesize, img.rating_score, img.has_high, img.path, 91 img.level ' 92 .' FROM ' . IMAGES_TABLE.' AS img' 93 .' INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON img.id = ic.image_id' 94 .' WHERE 95 img.date_available >= SUBDATE( 96 CURRENT_DATE,INTERVAL '.$user['recent_period'].' DAY) ' 97 .get_sql_condition_FandF 98 ( 99 array('visible_images' => 'id'), 100 'AND' 101 ) 102 .' '.$conf['order_by'].';'; 104 $query = ' 105 SELECT '.implode(',', $basic_fields).' 106 FROM ' . IMAGES_TABLE.' AS img 107 INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON img.id = ic.image_id 108 WHERE img.date_available >= SUBDATE(CURRENT_DATE,INTERVAL '.$user['recent_period'].' DAY) 109 '.get_sql_condition_FandF(array('visible_images' => 'id'), 'AND').' 110 '.$conf['order_by'].' 111 ;'; 103 112 } 104 113 // Plus vues … … 108 117 array_push($cat, "1"); 109 118 110 $query = 'SELECT DISTINCT(img.id), img.file, img.date_available, img.date_creation, img.tn_ext, img.name, 111 img.comment, img.author, img.hit ,img.filesize, img.rating_score, img.has_high, img.path, 112 img.level, ic.category_id, cat.name AS catname, cat.comment AS catcomment, cat.rank, cat.status, 113 cat.visible, cat.uppercats, cat.permalink, cat.dir ' 114 .' FROM ' . IMAGES_TABLE.' AS img' 115 .' INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON img.id = ic.image_id' 116 .' INNER JOIN '.CATEGORIES_TABLE.' AS cat ON ic.category_id = cat.id' 117 .' INNER JOIN '.USER_CACHE_CATEGORIES_TABLE.' ON cat.id = cat_id and user_id = '.$user['id'] 118 .' WHERE date_last >= SUBDATE( 119 CURRENT_DATE,INTERVAL '.$user['recent_period'].' DAY 120 ) 121 '.$forbidden 122 .';'; 119 $query = ' 120 SELECT 121 '.implode(',', $basic_fields).', 122 ic.category_id, 123 cat.name AS catname, 124 cat.comment AS catcomment, 125 cat.rank, 126 cat.status, 127 cat.visible, 128 cat.uppercats, 129 cat.permalink, 130 cat.dir 131 FROM '.IMAGES_TABLE.' AS img 132 INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON img.id = ic.image_id 133 INNER JOIN '.CATEGORIES_TABLE.' AS cat ON ic.category_id = cat.id 134 INNER JOIN '.USER_CACHE_CATEGORIES_TABLE.' ON cat.id = cat_id and user_id = '.$user['id'].' 135 WHERE date_last >= SUBDATE(CURRENT_DATE,INTERVAL '.$user['recent_period'].' DAY) 136 '.$forbidden.' 137 ;'; 123 138 } 124 139 … … 128 143 // $cat need to bo not null... 129 144 array_push($cat, "1"); 130 $query = 'SELECT DISTINCT(img.id), img.file, img.date_available, img.date_creation, img.tn_ext, img.name, 131 img.comment, img.author, img.hit ,img.filesize, img.rating_score, img.has_high, img.path, 132 img.level, ic.category_id, cat.name AS catname, cat.comment AS catcomment, cat.rank, cat.status, 133 cat.visible, cat.uppercats, cat.permalink, cat.dir ' 134 .' FROM ' . IMAGES_TABLE.' AS img' 135 .' INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON img.id = ic.image_id' 136 .' INNER JOIN '.CATEGORIES_TABLE.' AS cat ON ic.category_id = cat.id' 137 .' WHERE img.hit > 0 ' 138 .$forbidden 139 .' ORDER BY hit DESC, file ASC' 140 .' LIMIT 0, '.$conf['top_number'].';'; 141 145 $query = ' 146 SELECT 147 '.implode(',', $basic_fields).', 148 ic.category_id, 149 cat.name AS catname, 150 cat.comment AS catcomment, 151 cat.rank, 152 cat.status, 153 cat.visible, 154 cat.uppercats, 155 cat.permalink, 156 cat.dir 157 FROM '.IMAGES_TABLE.' AS img 158 INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON img.id = ic.image_id 159 INNER JOIN '.CATEGORIES_TABLE.' AS cat ON ic.category_id = cat.id 160 WHERE img.hit > 0 161 '.$forbidden.' 162 ORDER BY hit DESC, file ASC 163 LIMIT 0, '.$conf['top_number'].' 164 ;'; 142 165 } 143 166 // mieux notees … … 147 170 array_push($cat, "1"); 148 171 149 $query = 'SELECT DISTINCT(img.id), img.file, img.date_available, img.date_creation, img.tn_ext, img.name, 150 img.comment, img.author, img.hit ,img.filesize, img.rating_score, img.has_high, img.path, 151 img.level ' 152 .' FROM ' . IMAGES_TABLE.' AS img' 153 .' INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON img.id = ic.image_id' 154 .' WHERE img.rating_score IS NOT NULL ' 155 .get_sql_condition_FandF 156 ( 157 array('visible_images' => 'id'), 158 'AND' 159 ) 160 .' ORDER BY rating_score DESC, id ASC' 161 .' LIMIT 0, '.$conf['top_number'].';'; 172 $query = ' 173 SELECT '.implode(',', $basic_fields).' 174 FROM ' . IMAGES_TABLE.' AS img 175 INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON img.id = ic.image_id 176 WHERE img.rating_score IS NOT NULL 177 '.get_sql_condition_FandF(array('visible_images' => 'id'), 'AND').' 178 ORDER BY rating_score DESC, id ASC 179 LIMIT 0, '.$conf['top_number'].' 180 ;'; 162 181 } 163 182 elseif ($page['section'] == 'favorites') … … 167 186 array_push($cat, "1"); 168 187 169 $query = 'SELECT img.id, img.file, img.date_available, img.date_creation, img.tn_ext, img.name, 170 img.comment, img.author, img.hit ,img.filesize, img.rating_score, img.has_high, img.path, 171 img.level ' 172 .' FROM '.FAVORITES_TABLE.' AS fav ' 173 .' INNER JOIN '.IMAGES_TABLE.' AS img ON fav.image_id = img.id' 174 .' INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON img.id = ic.image_id' 175 .' WHERE user_id = '.$user['id'] 176 .' '.get_sql_condition_FandF 177 ( 178 array('visible_images' => 'id'), 179 'AND' 180 ) 181 .' '.$conf['order_by'].';'; 188 $query = ' 189 SELECT '.implode(',', $basic_fields).' 190 FROM '.FAVORITES_TABLE.' AS fav 191 INNER JOIN '.IMAGES_TABLE.' AS img ON fav.image_id = img.id 192 INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON img.id = ic.image_id 193 WHERE user_id = '.$user['id'].' 194 '.get_sql_condition_FandF(array('visible_images' => 'id'), 'AND').' 195 '.$conf['order_by'].' 196 ;'; 182 197 } 183 198 … … 210 225 // $cat need to bo not null... 211 226 array_push($cat, "1"); 212 $query = 'SELECT distinct(img.id), img.file, img.date_available, img.date_creation, img.tn_ext, img.name, 213 img.comment, img.author, img.hit ,img.filesize, img.rating_score, img.has_high, img.path, 214 img.level ' 215 .' FROM '.IMAGES_TABLE.' AS img ' 216 .' WHERE img.id IN ('.implode(',', $items).') ' 217 218 .' '.get_sql_condition_FandF 219 ( 220 array('visible_images' => 'id'), 221 'AND' 222 ) 223 .' '.$conf['order_by'].';'; 227 $query = ' 228 SELECT '.implode(',', $basic_fields).' 229 FROM '.IMAGES_TABLE.' AS img 230 WHERE img.id IN ('.implode(',', $items).') 231 '.get_sql_condition_FandF(array('visible_images' => 'id'), 'AND').' 232 '.$conf['order_by'].' 233 ;'; 224 234 } 225 235 … … 274 284 } 275 285 276 $query = 'SELECT DISTINCT(img.id), img.file, img.date_available, img.date_creation, img.tn_ext, img.name, 277 img.comment, img.author, img.hit ,img.filesize, img.rating_score, img.has_high, img.path, 278 img.level, ic.category_id, cat.name AS catname, cat.comment AS catcomment, cat.rank, cat.status, 279 cat.visible, cat.uppercats, cat.permalink, cat.dir ' 280 .' FROM ' . IMAGES_TABLE.' AS img' 281 .' INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON img.id = ic.image_id' 282 .' INNER JOIN '.CATEGORIES_TABLE.' AS cat ON ic.category_id = cat.id' 283 .' WHERE ic.category_id IN ('.implode(',', $cat).')' 284 .(sizeof($obj->my_config['included_file_types']) ? ' AND (img.tn_ext IN ('.implode(',', $type_ext).')' : '') 285 .($tn_ext_is_null ? ' OR img.tn_ext IS NULL)' : (sizeof($obj->my_config['included_file_types']) ? ')' : '')) 286 // Verif droits (niveaux) de l'utilisateur sur les images 287 .' AND img.level <='.$user['level'].' ' 288 // Choix du critere de tri d'affichage 289 .$order_list[ $obj->my_config['piclens_order'] ] 290 .$order_sort[ $obj->my_config['piclens_sort'] ]; 291 292 286 $query = ' 287 SELECT 288 '.implode(',', $basic_fields).', 289 ic.category_id, 290 cat.name AS catname, 291 cat.comment AS catcomment, 292 cat.rank, 293 cat.status, 294 cat.visible, 295 cat.uppercats, 296 cat.permalink, 297 cat.dir 298 FROM '.IMAGES_TABLE.' AS img 299 INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON img.id = ic.image_id 300 INNER JOIN '.CATEGORIES_TABLE.' AS cat ON ic.category_id = cat.id 301 WHERE ic.category_id IN ('.implode(',', $cat).') 302 AND img.level <='.$user['level'].' 303 '.$order_list[ $obj->my_config['piclens_order'] ].' 304 '.$order_sort[ $obj->my_config['piclens_sort'] ].' 305 ;'; 293 306 } 294 307 } … … 342 355 } 343 356 344 $query = 'SELECT DISTINCT(img.id), img.file, img.date_available, img.date_creation, img.tn_ext, img.name, 345 img.comment, img.author, img.hit ,img.filesize, img.rating_score, img.has_high, img.path, 346 img.level, ic.category_id, cat.name AS catname, cat.comment AS catcomment, cat.rank, cat.status, 347 cat.visible, cat.uppercats, cat.permalink, cat.dir ' 348 .' FROM ' . IMAGES_TABLE.' AS img' 349 .' INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON img.id = ic.image_id' 350 .' INNER JOIN '.CATEGORIES_TABLE.' AS cat ON ic.category_id = cat.id' 351 .' WHERE ic.category_id IN ('.implode(',', $cat).')' 352 .(sizeof($obj->my_config['included_file_types']) ? ' AND (img.tn_ext IN ('.implode(',', $type_ext).')' : '') 353 .($tn_ext_is_null ? ' OR img.tn_ext IS NULL)' : (sizeof($obj->my_config['included_file_types']) ? ')' : '')) 354 // Verif droits (niveaux) de l'utilisateur sur les images 355 .' AND img.level <='.$user['level'].' ' 356 // Choix du critere de tri d'affichage 357 .$order_list[ $obj->my_config['piclens_order_cat'] ] 358 .$order_sort[ $obj->my_config['piclens_sort_cat'] ]; 357 $query = ' 358 SELECT 359 '.implode(',', $basic_fields).', 360 ic.category_id, 361 cat.name AS catname, 362 cat.comment AS catcomment, 363 cat.rank, 364 cat.status, 365 cat.visible, 366 cat.uppercats, 367 cat.permalink, 368 cat.dir 369 FROM '.IMAGES_TABLE.' AS img 370 INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON img.id = ic.image_id 371 INNER JOIN '.CATEGORIES_TABLE.' AS cat ON ic.category_id = cat.id 372 WHERE ic.category_id IN ('.implode(',', $cat).') 373 AND img.level <='.$user['level'].' 374 '.$order_list[ $obj->my_config['piclens_order_cat'] ].' 375 '.$order_sort[ $obj->my_config['piclens_sort_cat'] ].' 376 ;'; 359 377 360 378 } … … 441 459 .(strlen($obj->my_config['piclens_rss_icon']) 442 460 ? $obj->my_config['piclens_rss_icon'] 443 : $obj->root_site_piclens.' template-common/favicon.ico')461 : $obj->root_site_piclens.'plugins/piclens/icon/rss_icon.png') 444 462 .'</atom:icon>'; 463 445 464 echo "\n"; 446 465 … … 451 470 // Mode de l'image parametre 452 471 $piclens_normal = $obj->my_config['piclens_normal']; 453 454 // si parametrage high et high absente ou utilisateur non habilite, affichage version normale455 if (($piclens_normal == 3) && (!($row['has_high']) || !$user['enabled_high']))456 $piclens_normal = 2; // Normal uniquement pour l'image en cours457 472 458 473 // Get thumbnail url … … 469 484 { 470 485 $link_url = $obj->root_site_piclens.$row['path']; 486 487 $src_image = new SrcImage($row); 488 set_make_full_url(); 489 $thumb_url = DerivativeImage::url(IMG_THUMB, $src_image); 490 $medium_url = DerivativeImage::url(IMG_MEDIUM, $src_image); 491 $high_url = DerivativeImage::url(IMG_XXLARGE, $src_image); 492 unset_make_full_url(); 471 493 472 494 if ( ($obj->my_config['piclens_thumb']) == 2) // Normal 473 $thumbnail_url = (url_is_remote($row['path']) ? $row['path']: embellish_url($obj->root_site_piclens.$row['path'])); 495 { 496 $thumbnail_url = $medium_url; 497 } 474 498 else 475 499 { 476 $path=get_thumbnail_location($row); 477 $thumbnail_url = ( url_is_remote($path) ? $path : embellish_url($obj->root_site_piclens.$path) ); 478 } 479 480 switch ($piclens_normal) 481 { 482 case 1 : // miniature 483 $path=get_thumbnail_location($row); 484 $content_url = ( url_is_remote($path) ? $path : embellish_url($obj->root_site_piclens.$path) ); 485 break; 486 case 2 : // normal 487 $content_url = (url_is_remote($row['path']) ? $row['path']: embellish_url($obj->root_site_piclens.$row['path'])); 488 break; 489 case 3 : 490 $content_url = (url_is_remote($row['path']) ? dirname($row['path']).'/pwg_high/'.basename($row['path']) 491 : embellish_url( $obj->root_site_piclens. dirname($row['path']).'/pwg_high/'.basename($row['path'])) 492 ); 493 break; 494 default : // normal 495 $content_url = (url_is_remote($row['path']) ? $row['path'] : embellish_url($obj->root_site_piclens.$row['path'])); 496 break; 500 $thumbnail_url = $thumb_url; 497 501 } 502 503 if (1 == $piclens_normal) 504 { 505 $content_url = $thumb_url; 506 } 507 elseif (3 == $piclens_normal) 508 { 509 $content_url = $high_url; 510 } 511 else 512 { 513 $content_url = $medium_url; 514 } 498 515 } 499 516 -
extensions/piclens/include/config_param.inc.php
r3900 r18642 27 27 : '' , 28 28 '%I4' => isset($row['author']) ? $row['author'] : '' , 29 '%I5' => isset ($row) ? (get_thumbnail_location($row)) : '' , 30 '%I6' => isset($row['path']) ? $row['path']: '', 31 '%I7' => isset($row['path']) ? 32 ($row['has_high'] and (isset($user['enabled_high']) and $user['enabled_high']) 33 ? dirname($row['path']).'/pwg_high/'.basename($row['path']) 34 : $row['path']) 35 : '', 36 29 '%I5' => isset ($row) ? DerivativeImage::url(IMG_THUMB, new SrcImage($row)) : '', 30 '%I6' => isset($row['path']) ? DerivativeImage::url(IMG_MEDIUM, new SrcImage($row)) : '', 31 '%I7' => isset($row['path']) ? DerivativeImage::url(IMG_XXLARGE, new SrcImage($row)) : '', 37 32 38 33 '%I8' => (isset($row['category_id']) & isset($row['catname'])) ? … … 55 50 , 56 51 57 '%I9' => isset ($row) ? ( url_is_remote(get_thumbnail_location($row)) ? get_thumbnail_location($row) : embellish_url(get_root_url().get_thumbnail_location($row))) : '' , 58 '%IA' => isset($row['path']) ? (url_is_remote($row['path']) ? $row['path']: embellish_url(get_root_url().$row['path'])) : '', 59 '%IB' => isset($row['path']) ? 60 ($row['has_high'] and (isset($user['enabled_high']) and $user['enabled_high']) 61 ? (url_is_remote($row['path']) 62 ? dirname($row['path']).'/pwg_high/'.basename($row['path']) 63 : embellish_url( get_root_url(). dirname($row['path']).'/pwg_high/'.basename($row['path']))) 64 : (url_is_remote($row['path']) ? $row['path']: embellish_url(get_root_url().$row['path'])) 65 ) 66 : '', 52 '%I9' => isset ($row) ? embellish_url(get_root_url().DerivativeImage::url(IMG_THUMB, new SrcImage($row))) : '' , 53 '%IA' => isset($row['path']) ? embellish_url(get_root_url().DerivativeImage::url(IMG_MEDIUM, new SrcImage($row))) : '' , 54 '%IB' => isset($row['path']) ? embellish_url(get_root_url().DerivativeImage::url(IMG_XXLARGE, new SrcImage($row))) : '' , 55 67 56 '%IC' => isset($row['file']) ? $row['file'] : '' , 68 57 '%ID' => isset($row['id']) ? get_comment($row['id'], $nb_comment) : '' , -
extensions/piclens/include/default_values.inc.php
r8780 r18642 83 83 84 84 85 $piclens_default_values['piclens_rss_name'] = " Nom :%I2"; // Nom86 $piclens_default_values['piclens_rss_desc'] = " (%I3)"; // Description85 $piclens_default_values['piclens_rss_name'] = "%I2"; // Nom 86 $piclens_default_values['piclens_rss_desc'] = "%I3"; // Description 87 87 88 88 $piclens_default_values['piclens_exclude_double'] = false; // Suppression des doublons
Note: See TracChangeset
for help on using the changeset viewer.
