Changeset 16639 for extensions/piwishack/include/class.inc.php
- Timestamp:
- Jul 12, 2012, 12:39:58 PM (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/piwishack/include/class.inc.php
r9114 r16639 85 85 if (empty($list) and !empty($page['items'])) 86 86 { 87 $rank_of = array_flip($page['items']); 87 88 $query = ' 88 89 SELECT * … … 95 96 while ($row = mysql_fetch_assoc($result)) 96 97 { 97 $row['rank'] = $ page['rank_of'][ $row['id'] ];98 $row['rank'] = $rank_of[ $row['id'] ]; 98 99 array_push($list, $row); 99 100 } … … 119 120 'image_file' => $row['file'], 120 121 )).'\" target=_blank><img src=\"'. 121 str_replace('/./', '/', get_thumbnail_url($row)).'\" /></a>';122 str_replace('/./', '/', DerivativeImage::thumb_url($row)).'\" /></a>'; 122 123 $S .= '\n\n'; 123 124 } … … 163 164 if (empty($list) and !empty($page['items'])) 164 165 { 166 $rank_of = array_flip($page['items']); 165 167 $query = ' 166 168 SELECT * … … 173 175 while ($row = mysql_fetch_assoc($result)) 174 176 { 175 $row['rank'] = $ page['rank_of'][ $row['id'] ];177 $row['rank'] = $rank_of[ $row['id'] ]; 176 178 array_push($list, $row); 177 179 } … … 197 199 'image_file' => $row['file'], 198 200 )).'][img]'. 199 str_replace('/./', '/', get_thumbnail_url($row)).'[/img][/url]';201 str_replace('/./', '/', DerivativeImage::thumb_url($row)).'[/img][/url]'; 200 202 $S .= '\n\n'; 201 203 } … … 241 243 if (empty($list) and !empty($page['items'])) 242 244 { 245 $rank_of = array_flip($page['items']); 243 246 $query = ' 244 247 SELECT * … … 251 254 while ($row = mysql_fetch_assoc($result)) 252 255 { 253 $row['rank'] = $ page['rank_of'][ $row['id'] ];256 $row['rank'] = $rank_of[ $row['id'] ]; 254 257 array_push($list, $row); 255 258 } … … 269 272 <a href="{$ROOT_WAY}{$current.U_IMG}" target=_blank><img src="{$ROOT_WAY}{$SRC_IMG|@replace:'./':''}" /></a> 270 273 */ 271 if (strpos( get_image_url($row), get_absolute_root_url() ) === false) { 272 $abs_root_img= get_absolute_root_url(). str_replace('./', '', get_image_url($row)) ; 274 $src_image = new SrcImage($row); 275 if (strpos( $image_url = DerivativeImage::url(IMG_MEDIUM, $src_image), get_absolute_root_url() ) === false) { 276 $abs_root_img= get_absolute_root_url(). str_replace('./', '', $image_url = DerivativeImage::url(IMG_MEDIUM, $src_image)) ; 273 277 } else { 274 $abs_root_img= get_image_url($row) ;278 $abs_root_img= DerivativeImage::url(IMG_MEDIUM, $src_image) ; 275 279 } 276 280 $S .= '<a href=\"'. … … 323 327 if (empty($list) and !empty($page['items'])) 324 328 { 329 $rank_of = array_flip($page['items']); 325 330 $query = ' 326 331 SELECT * … … 333 338 while ($row = mysql_fetch_assoc($result)) 334 339 { 335 $row['rank'] = $ page['rank_of'][ $row['id'] ];340 $row['rank'] = $rank_of[ $row['id'] ]; 336 341 array_push($list, $row); 337 342 } … … 351 356 [url={$ROOT_WAY}{$current.U_IMG}][img]{$ROOT_WAY}{$SRC_IMG|@replace:'./':''}[/img][/url] 352 357 */ 353 if (strpos( get_image_url($row), get_absolute_root_url() ) === false) { 354 $abs_root_img= get_absolute_root_url(). str_replace('./', '', get_image_url($row)) ; 358 $src_image = new SrcImage($row); 359 if (strpos( $image_url = DerivativeImage::url(IMG_MEDIUM, $src_image), get_absolute_root_url() ) === false) { 360 $abs_root_img= get_absolute_root_url(). str_replace('./', '', $image_url = DerivativeImage::url(IMG_MEDIUM, $src_image)) ; 355 361 } else { 356 $abs_root_img= get_image_url($row) ;362 $abs_root_img= DerivativeImage::url(IMG_MEDIUM, $src_image) ; 357 363 } 358 364 $S .= '[url='. … … 405 411 if (empty($list) and !empty($page['items'])) 406 412 { 413 $rank_of = array_flip($page['items']); 407 414 $query = ' 408 415 SELECT * … … 415 422 while ($row = mysql_fetch_assoc($result)) 416 423 { 417 $row['rank'] = $ page['rank_of'][ $row['id'] ];424 $row['rank'] = $rank_of[ $row['id'] ]; 418 425 array_push($list, $row); 419 426 } … … 427 434 428 435 $page_name = script_basename(); 429 if ( $page_name == 'picture')430 {431 436 foreach ($list as $row) 432 437 { … … 436 441 {$ROOT_WAY}{$SRC_IMG|@replace:'./':''} 437 442 */ 438 $S .= get_absolute_root_url().439 str_replace('./', '', get_image_url($row));443 $src_image = new SrcImage($row); 444 $S .= $image_url = DerivativeImage::url(IMG_MEDIUM, $src_image); 440 445 $S .= '\n\n'; 441 446 } … … 443 448 unset_make_full_url(); 444 449 } 445 else446 {447 foreach ($list as $row)448 {449 /*450 Affichage du chemin en clair du lien vers la vue normale.451 EXEMPLE452 {$ROOT_WAY}{$SRC_IMG|@replace:'./':''}453 */454 $S .= get_image_url($row);455 $S .= '\n\n';456 }457 }458 459 unset_make_full_url();460 }461 462 450 463 451 return $S; … … 498 486 if (empty($list) and !empty($page['items'])) 499 487 { 488 $rank_of = array_flip($page['items']); 500 489 $query = ' 501 490 SELECT * … … 508 497 while ($row = mysql_fetch_assoc($result)) 509 498 { 510 $row['rank'] = $ page['rank_of'][ $row['id'] ];499 $row['rank'] = $rank_of[ $row['id'] ]; 511 500 array_push($list, $row); 512 501 } … … 527 516 */ 528 517 518 $src_image = new SrcImage($row); 529 519 $S .= '<h6 style=\"text-align: center;\"><a href=\"'. // Arguments à transmettre 530 520 duplicate_picture_url( // Lien Piwigo vers la page de la vue normale … … 534 524 )). 535 525 '\" target=\"_blank\"><img class=\"aligncenter\" style=\"width: 100%; height: 100%;\" src=\"'. // Arguments à transmettre 536 get_absolute_root_url().str_replace('./', '', get_image_url($row)). // Liens direct vers la vue normale526 get_absolute_root_url().str_replace('./', '', $image_url = DerivativeImage::url(IMG_MEDIUM, $src_image)). // Liens direct vers la vue normale 537 527 '\" alt=\"'. // Arguments à transmettre 538 528 $row['file']. // Noms du fichier … … 583 573 if (empty($list) and !empty($page['items'])) 584 574 { 575 $rank_of = array_flip($page['items']); 585 576 $query = ' 586 577 SELECT * … … 593 584 while ($row = mysql_fetch_assoc($result)) 594 585 { 595 $row['rank'] = $ page['rank_of'][ $row['id'] ];586 $row['rank'] = $rank_of[ $row['id'] ]; 596 587 array_push($list, $row); 597 588 } … … 610 601 $S .= '*** '.(!empty($row['name']) ? $row['name'] : $row['file']).' ***\n'; 611 602 $S .= '[(('. 612 str_replace('/./', '/', get_thumbnail_url($row)).'))|'.603 str_replace('/./', '/', DerivativeImage::thumb_url($row)).'))|'. 613 604 duplicate_picture_url( 614 605 array(
Note: See TracChangeset
for help on using the changeset viewer.