Changeset 527

Show
Ignore:
Timestamp:
04/18/08 17:13:58 (7 months ago)
Author:
sidtheduck
Message:

+ Fixing thumbnail navigation prefix ids for unique thumbnail filenames and filename paths for preload_album_images()
+ Fixed missing parenthesis from my edit on plog-functions.php

Location:
trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • trunk/lib/plogger/form_setup.php

    r517 r527  
    7373        </tr> 
    7474        <tr> 
    75                 <td class="form_label"><label for="ftp_name">FTP Path to Plogger Folder (from FTP login):</label></td> 
     75                <td class="form_label"><label for="ftp_path">FTP Path to Plogger Folder (from FTP login):</label></td> 
    7676                <td class="form_input"><input type="text" name="ftp_path" id="ftp_path" value="<?=$form['ftp_path']?>" /></td> 
    7777        </tr> 
  • trunk/plog-functions.php

    r525 r527  
    384384              foreach($pic_array as $pic) { 
    385385                      unset($path); 
    386                       $url = generate_thumb($pic["path"],$thumbnail_config[THUMB_LARGE]["prefix"],THUMB_LARGE); 
     386                      $url = generate_thumb($pic['path'],$pic['id'],THUMB_LARGE); 
    387387                      $script .= "\t\timage_url[$i] = '$url'\n"; 
    388388                      $i++; 
     
    502502         
    503503        if (1 == $thumb_config['disabled']) { 
    504                 return $config['baseurl'] . '/images/' . $path; 
     504                return $config['baseurl'] . 'images/' . $path; 
    505505        } 
    506506         
     
    512512        // if thumbnail file already exists and is generated after data for a thumbnail type 
    513513        // has been changed, then we assume that the thumbnail is valid. 
    514         if (file_exists($thumbpath){ 
     514        if (file_exists($thumbpath)){ 
    515515                $thumbnail_timestamp = @filemtime($thumbpath); 
    516516                if ($thumb_config['timestamp'] < $thumbnail_timestamp) { 
     
    21042104                unset($title);unset($img_path);unset($class);unset($link); // php has problems with reassigning via iteration 
    21052105                $title = (!empty($current_thumb_nav["caption"])) ? $current_thumb_nav["caption"] : ""; 
    2106                 $img_path = generate_thumb($current_thumb_nav["path"], $thumbnail_config[THUMB_NAV]['prefix'], THUMB_NAV); 
     2106                $img_path = generate_thumb($current_thumb_nav["path"], $current_thumb_nav['id'], THUMB_NAV); 
    21072107                $class = ($current_thumb_nav["id"] == $GLOBALS["current_picture"]["id"]) ? "current" : ""; 
    21082108                $link = generate_url("picture",$current_thumb_nav["id"]);