diff --git a/COPYING b/COPYING index caeca07..88798ab 120000 --- a/COPYING +++ b/COPYING @@ -1 +1 @@ -/usr/share/automake-1.14/COPYING \ No newline at end of file +/usr/share/automake-1.15/COPYING \ No newline at end of file diff --git a/ChangeLog b/ChangeLog index e13f517..2dbb743 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2017-03-03 14:06 + + * [r30] COPYING, ChangeLog, INSTALL, html/index.php: + fix typo + +2017-03-02 17:29 + + * [r29] html/index.php: + fix base path behind proxy + 2017-03-01 19:37 * [r28] ChangeLog, etc/authentication.php, html/index.php: diff --git a/INSTALL b/INSTALL index f812f5a..ddcdb76 120000 --- a/INSTALL +++ b/INSTALL @@ -1 +1 @@ -/usr/share/automake-1.14/INSTALL \ No newline at end of file +/usr/share/automake-1.15/INSTALL \ No newline at end of file diff --git a/html/index.php b/html/index.php index 26a5c1b..def8797 100644 --- a/html/index.php +++ b/html/index.php @@ -158,7 +158,7 @@ function linkorselect($link, $img, $filename) { echo ''; echo ''; } else { - makelink($link, $img, $filename); + makelink($link, $img, $filename, 'class="thumbnail"'); } } if (!isset($_REQUEST['secret'])) { @@ -234,6 +234,8 @@ if (!isset($_REQUEST['secret'])) {
+ +
-

Gallery:

+

Gallery:

←
'; @@ -327,45 +329,45 @@ if (!isset($_REQUEST['secret'])) { 0) - echo 'previous'; - echo '↑'; - if ($posnext'; - echo '
'.urlencode($imgfile).'
'; - if ($pos!==NULL) { - $lower = max(0, $pos-floor(((int)$preview_num)/2)); - $higher = min(count($objects['files']), $lower+((int)$preview_num)); - for ($i=$lower; $i<$higher; ++$i) - makelink('?path='.urlencode($subpath).'&file='.urlencode($objects['files'][$i]).'&view', '?path='.urlencode($subpath).'&file='.urlencode($objects['files'][$i]).'&thumb', $objects['files'][$i], 'style="width: '.round(100/($higher-$lower), 3).'%"'); - } - } else { // gallery view - if (isset($_REQUEST['select'])) { - echo 'Normal-Modus'; - echo '
'; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - } else { - echo 'Auswahl-Modus'; - } - echo '
'; - if (preg_match('/\//', $subpath)) { - echo '↑'; - } elseif ($subpath!="") { - echo '↑'; - } - $objects = extractDir($imagepath); - foreach ($objects['dirs'] as $f) - makelink('?path='.urlencode($subpath.($subpath!=""?'/':'').$f), '?path='.urlencode($subpath).'&folder='.urlencode($f), $f); + makelink('?path='.urlencode($subpath).'&file='.urlencode($f).'&view', '?path='.urlencode($subpath).'&file='.urlencode($f).'&thumb', $f, 'class="thumbnail"'); + } else { + if (isset($_REQUEST['view'])) { // view single image + $objects = extractDir($imagepath); + $pos = array_search($imgfile, $objects['files']); + if ($pos>0) + echo 'previous'; + echo 'up'; + if ($posnext'; + echo ''.urlencode($imgfile).''; + if ($pos!==NULL) { + $lower = max(0, $pos-floor(((int)$preview_num)/2)); + $higher = min(count($objects['files']), $lower+((int)$preview_num)); + for ($i=$lower; $i<$higher; ++$i) + makelink('?path='.urlencode($subpath).'&file='.urlencode($objects['files'][$i]).'&view', '?path='.urlencode($subpath).'&file='.urlencode($objects['files'][$i]).'&thumb', $objects['files'][$i], 'style="width: '.round(100/($higher-$lower), 3).'%" class="thumbnail"'); + } + } else { // gallery view + if (isset($_REQUEST['select'])) { + echo 'Normal-Modus'; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + } else { + echo 'Auswahl-Modus'; + } + echo '
'; + if (preg_match('/\//', $subpath)) { + echo '↑'; + } elseif ($subpath!="") { + echo '↑'; + } + $objects = extractDir($imagepath); + foreach ($objects['dirs'] as $f) + makelink('?path='.urlencode($subpath.($subpath!=""?'/':'').$f), '?path='.urlencode($subpath).'&folder='.urlencode($f), $f, 'class="folder"'); echo '
'; foreach ($objects['files'] as $f) linkorselect('?path='.urlencode($subpath).'&file='.urlencode($f).'&view', '?path='.urlencode($subpath).'&file='.urlencode($f).'&thumb', $f); diff --git a/html/makefile.am b/html/makefile.am index 695005c..4d49db5 100644 --- a/html/makefile.am +++ b/html/makefile.am @@ -11,7 +11,7 @@ EXTRA_DIST = configuration.php.in wwwdir = ${pkgdatadir}/html -dist_www_DATA = folder.png .htaccess index.php +dist_www_DATA = folder.png .htaccess index.php style.css www_DATA = configuration.php MAINTAINERCLEANFILES = makefile.in