WordPress.org
Get WordPress

Plugin Directory

Changeset 490353


Ignore:
Timestamp:
01/15/2012 08:20:47 PM (14 years ago)
Author:
fstrack
Message:
 
Location:
dm-albums/trunk
Files:
1 deleted
10 edited

Legend:

Unmodified
Added
Removed

  • dm-albums/trunk/galleria/themes/classic/galleria.classic.css

    r486244 r490353  
    4444    cursor: pointer;
    4545}
    46 
    4746.galleria-thumbnails .active
    4847{
    4948    border-top: 1px solid #DD4814 !important;
    5049}
    51 
    5250.galleria-counter {
    53     position: absolute;
    54     bottom: 10px;
    5551    left: 10px;
    5652    text-align: right;
    … …  
    228224    position: absolute;
    229225    width: 100%;
    230     bottom: 0px;
     226    bottom: 0px;
     227    left: 0px !important;
    231228    padding-top: 10px;
     229    padding-left: 10px;
     230    padding-right: 10px;
    232231    text-align: center;
    233232    background: #000000;
    … …  
    235234    font: 11px helvetica,sans-serif !important;
    236235    font-weight: normal !important;
    237     opacity: 0.5;
     236    opacity: 0.55;
    238237    z-index: 1;
    239     filter: alpha(opacity=50);
     238    filter: alpha(opacity=55);
     239}
     240
     241.galleria-caption p
     242{
     243    width: 90%;
     244    padding-left: 10px;
     245    padding-right: 10px;
    240246}
    241247
    … …  
    274280}
    275281
    276 .dm-albums-slideshow, .dm-albums-fullscreen, .dm-albums-powered-by
     282.dm-albums-slideshow, .dm-albums-fullscreen, .dm-albums-powered-by, .dm-albums-download
    277283{
    278284    font: 9px/1 helvetica;
    … …  
    284290}
    285291
    286 .dm-albums-slideshow div, .dm-albums-fullscreen div
     292.dm-albums-slideshow div, .dm-albums-fullscreen div, .dm-albums-download div
    287293{
    288294    float: left;
    … …  
    290296}
    291297
    292 .dm-albums-slideshow p, .dm-albums-fullscreen p
     298.dm-albums-slideshow p, .dm-albums-fullscreen p, .dm-albums-download p
    293299{
    294300    padding: 0px !important;
    … …  
    309315    height: 17px;
    310316    width: 92px;
     317    margin-right: 10px;
     318}
     319
     320.dm-albums-download
     321{
     322    float: left;
     323    height: 17px;
     324    width: 85px;
    311325}
    312326
    … …  
    336350    height: 17px;
    337351    background: url(fullscreen.png) no-repeat center center;
     352}
     353
     354.dm-albums-download a
     355{
     356    float: right;
     357    display: block;
     358    width: 22px;
     359    height: 17px;
     360    background: url(download.png) no-repeat center center;
    338361}
    339362

  • dm-albums/trunk/javascript/browser.js

    r486244 r490353  
    3737    this.rollovers      = this.browser || this.version >= 3;
    3838   
    39     this.Width          = function() { return ((navigator.appName == "Microsoft Internet Explorer" ? document.body.offsetWidth : window.innerWidth));}
    40     this.Height         = function() { return ((navigator.appName == "Microsoft Internet Explorer" ? document.body.offsetHeight : window.innerHeight));}
     39    this.Width          = function() { return ((navigator.appName == "Microsoft Internet Explorer" ? document.body.offsetWidth : window.innerWidth));};
     40    this.Height         = function() { return ((navigator.appName == "Microsoft Internet Explorer" ? document.body.offsetHeight : window.innerHeight));};
    4141   
    4242    this.toString       = _toString;
    … …  
    4848    this.Decode         = _Decode;
    4949   
    50     this.GetPosition    = _GetAbsolutePosition
     50    this.GetPosition    = _GetAbsolutePosition;
    5151   
    5252    this.DOM            = _DOM;

  • dm-albums/trunk/javascript/dragdrop.js

    r486244 r490353  
    8484        mouseOffset = getMouseOffset(this, ev);
    8585        return false;
    86     }
     86    };
    8787}
    8888
    … …  
    9090    object.onmousedown = function(){
    9191        dragObject = this;
    92     }
     92    };
    9393}

  • dm-albums/trunk/javascript/galleria-common.js

    r487634 r490353  
    11var hash = null;
    22var g_DM_FULLSCREEN_GALLERY_ID = null;
     3
     4function dm_download_file()
     5{
     6    var data = $('#' + g_DM_FULLSCREEN_GALLERY_ID).data('galleria').getData();
     7   
     8    location.href = "?download=yes&file=" + data.big;
     9}
    310
    411function dm_warn_fullscreen(id)
    … …  
    613    dm_set_fullscreen_message("Press \"Esc\" to exit full screen");
    714   
    8     location.href="#full-screen"
     15    location.href="#full-screen";
    916   
    1017    hash = location.hash;
    … …  
    8693    fileref.setAttribute("src", src);
    8794
    88     document.getElementsByTagName("head")[0].appendChild(fileref)
     95    document.getElementsByTagName("head")[0].appendChild(fileref);
    8996}
    9097

  • dm-albums/trunk/javascript/galleria.php

    r486671 r490353  
    11<?php
     2header('Content-type: text/javascript');
    23
    34require_once(dirname(dirname(dirname(dirname(dirname(__FILE__))))) . "/wp-load.php");
    … …  
    1213if($album)
    1314
    14 $root = get_option('siteurl') . "/";
    15 
    16 if(get_option('DM_HOME_DIR') != get_option('DM_ALBUMS_CORE_DEFAULT_HOME_DIR'))  $root = "http://";
     15$root = dm_get_album_root();
    1716
    1817$album_url = $root . ltrim($album, '/'); //"http://" . ltrim($album, '/');

  • dm-albums/trunk/php/includes.php

    r486244 r490353  
    11<?php
    22
    3 error_reporting(0);
     3//error_reporting(0);
    44
    55$DM_ALBUMS_IMAGETYPE_PNG = 0;
    … …  
    1212    if(dm_is_wamp())    define(DM_CACHE_DIRECTORY, "cache");
    1313    else                define(DM_CACHE_DIRECTORY, ".cache");
     14}
     15
     16function dm_get_album_root()
     17{
     18    $rot = get_option('siteurl') . "/";
     19
     20    if(get_option('DM_HOME_DIR') != get_option('DM_ALBUMS_CORE_DEFAULT_HOME_DIR'))  $root = "http://";
     21
     22    return $root;
     23}
     24
     25function dm_download()
     26{
     27    //dm_logerrors("dm_download: ");
     28
     29    $file = basename($_GET["file"]);
     30
     31    //dm_logerrors("dm_download -> file: " . $file);
     32
     33    $currdir = str_replace(dm_get_album_root(), get_option('DM_HOME_DIR'), dirname($_GET["file"]));
     34
     35    //dm_logerrors("dm_download -> curdir: " . $currdir);
     36
     37    $filename = dm_sanitize($currdir, 1) . "/" . $file;
     38
     39    //dm_logerrors("dm_download -> filename: " . $filename);
     40
     41    if(dm_is_image($filename))
     42    {
     43        $filesize = filesize($filename);
     44
     45        header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
     46        header('Content-Description: File Transfer');
     47        header('Content-Type: application/octet-stream');
     48        header('Content-Length: ' . $filesize);
     49        header('Content-Disposition: attachment; filename="' . $file . '"');
     50        readfile($filename);
     51    }
     52}
     53
     54function dm_loadjavascript()
     55{
     56    ?>
     57    <script type='text/javascript' src='http://ajax.googleapis.com/ajax/libs/jquery/1/jquery.js?ver=3.3.1'></script>
     58    <script type='text/javascript' src='<?php echo plugins_url(); ?>/dm-albums/galleria/galleria-1.2.6.min.js?ver=3.3.1'></script>
     59    <script type='text/javascript' src='<?php echo plugins_url(); ?>/dm-albums/javascript/galleria-common.js?ver=3.3.1'></script>
     60    <script type='text/javascript' src='<?php echo plugins_url(); ?>/dm-albums/galleria/themes/classic/galleria.classic.min.js?ver=3.3.1'></script>
     61    <?php
    1462}
    1563
    … …  
    179227    $photoid = "dma-" . basename($directory) . "-" . $picturename . "-caption";
    180228
    181     $caption = get_option($photoid);
     229    $caption = htmlspecialchars(get_option($photoid), ENT_QUOTES);
    182230
    183231    if(!empty($caption))    return $caption;
    … …  
    202250                $caption = trim($matches[2][0]);
    203251
    204                 if(strlen($caption) > 0)    return trim("$caption");
    205                 else                        return trim($caption);
     252                if(strlen($caption) > 0)    return htmlspecialchars(trim("$caption"), ENT_QUOTES);
     253                else                        return htmlspecialchars(trim($caption), ENT_QUOTES);
    206254           }
    207255        }
    … …  
    238286    $photoid = "dma-" . basename($directory) . "-" . $picturename . "-link";
    239287
    240     $caption = get_option($photoid);
     288    $caption = htmlspecialchars(get_option($photoid), ENT_QUOTES);
    241289
    242290    if(!empty($caption))    return $caption;
    … …  
    297345    $albumid = "dma-" . basename($photoalbum) . "-title";
    298346
    299     $ablum_title = get_option($albumid);
     347    $ablum_title = htmlspecialchars(get_option($albumid), ENT_QUOTES); //get_option($albumid);
    300348
    301349    if(!empty($ablum_title))    return $ablum_title;

  • dm-albums/trunk/readme.txt

    r490086 r490353  
    55Requires at least: 2.7
    66Tested up to: 3.3.1
    7 Stable tag: 3.1.3
     7Stable tag: 3.1.3.1
    88
    99DM Albums&#153; is an inline photo album/gallery plugin that displays high quality images and thumbnails perfectly sized to your blog.
    … …  
    7777
    7878== Changelog ==
     79
     80= 3.1.3.1 =
     81        <ul><li>Refresh on code commit to Wordpress SVN; no functional change over 3.1.3</li></ul>
    7982
    8083= 3.1.3 =

  • dm-albums/trunk/wp-dm-albums.php

    r490086 r490353  
    44Description: DM Albums is an inline photo album/gallery plugin that displays high quality images and thumbnails perfectly sized to your blog.
    55Plugin URI:  http://www.dutchmonkey.com/?file=products/dm-albums/dm-albums.html
    6 Version:     3.1.3
     6Version:     3.1.3.1
    77Author:      Frank D. Strack
    88Author URI:  http://www.dutchmonkey.com/
    … …  
    2929Change log:
    3030
     31    3.1.3.1
     32        * Refreshed commit to Wordpress SVN database. No functional change over 3.1.3.
    3133    3.1.3
    3234        * Fixed dm-albums-external.php (you also need to call dm_loadjavascript(); somewhere on your page prior to calling dm_printalbum()
Note: See TracChangeset for help on using the changeset viewer.