webservices/sharing-gallery
1
0
Fork 0
Code Issues Pull Requests Releases Activity

build fixed

Browse Source
This commit is contained in:
Marc Wäckerlin
2017-02-26 21:28:18 +00:00
parent f088cad616
commit 473aaa322f
7 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ax_init_standard_project.m4
View File

@@ -573,6 +573,11 @@ distclean-rpm-targets:
EOF EOF
]) ])
# use this in configure.ac to support scripts, e.g. bash scripts
AC_DEFUN([AX_USE_ETC], [
AC_CONFIG_FILES([etc/makefile])
])
# use this in configure.ac to support scripts, e.g. bash scripts # use this in configure.ac to support scripts, e.g. bash scripts
AC_DEFUN([AX_USE_SCRIPTS], [ AC_DEFUN([AX_USE_SCRIPTS], [
AC_CONFIG_FILES([scripts/makefile]) AC_CONFIG_FILES([scripts/makefile])

6
etc/authentication.php
View File

@@ -1,9 +1,7 @@
<?php <?php
$realm = "MY REALM HERE"; $realm = "MY REALM HERE";
$ldaphost = "my.ldap.host"; $ldaphost = "my.ldap.host";
$base = "dc=my,dc=server,dc=com"; $ldapbase = "dc=my,dc=server,dc=com";
$userbase = "ou=people,".$base;
$groupbase = "ou=group,".$base;
if (!isset($_SERVER['PHP_AUTH_USER'])) { if (!isset($_SERVER['PHP_AUTH_USER'])) {
header('WWW-Authenticate: Basic realm="'.$REALM.'"'); header('WWW-Authenticate: Basic realm="'.$REALM.'"');
header('HTTP/1.0 401 Unauthorized'); header('HTTP/1.0 401 Unauthorized');
@@ -17,7 +15,7 @@ if (!isset($_SERVER['PHP_AUTH_USER'])) {
or error_die("failed to set LDAP protocol version 3"); or error_die("failed to set LDAP protocol version 3");
ldap_start_tls($ldapconn) ldap_start_tls($ldapconn)
or error_die($ldapconn, "cannot start LDAP TLS"); or error_die($ldapconn, "cannot start LDAP TLS");
$ldapbind = @ldap_bind($ldapconn, 'uid='.$tstusername.','.$userbase, $password) $ldapbind = @ldap_bind($ldapconn, 'uid='.$tstusername.','.$ldapbase, $password)
or error_die("login failed for $username", '403 Forbidden'); or error_die("login failed for $username", '403 Forbidden');
$username = $tstuserbname; $username = $tstuserbname;
} }

2
etc/makefile.am
View File

@@ -8,6 +8,6 @@
## 1 2 3 4 5 6 7 8 ## 1 2 3 4 5 6 7 8
## 45678901234567890123456789012345678901234567890123456789012345678901234567890 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890
pkgsysconfdir = ${sysconfdir}/@PACKAGE_NAME@ pkgsysconfdir = ${PKGSYSCONFDIR}
dist_pkgsysconf_DATA = settings.php authentication.php dist_pkgsysconf_DATA = settings.php authentication.php

6
etc/settings.php
View File

@@ -1,5 +1,5 @@
<?php <?php
$path='/path/to/your/files'; $path = "/path/to/your/files";
$thumbs='/var/tmp/sahring-gallery/thumbnails/'; $thumbs = "/var/tmp/sharing-gallery/thumbnails/";
$max_validity_days=30; $max_validity_days = "30";
?> ?>

4
html/index.php
View File

@@ -187,7 +187,7 @@
$secret = decrypt($_REQUEST['secret']) or error_die('bad password', '403 Forbidden'); $secret = decrypt($_REQUEST['secret']) or error_die('bad password', '403 Forbidden');
if (!isset($secret['valid-until'])) error_die('missing validation date'); if (!isset($secret['valid-until'])) error_die('missing validation date');
if (!isset($max_validity_days)) error_die('maximum validity days not set'); if (!isset($max_validity_days)) error_die('maximum validity days not set');
if (strtotime($secret['valid-until'])>time()+$max_validity_days*86400) error_die('validity limitation not respected'); if (strtotime($secret['valid-until'])>time()+((int)$max_validity_days)*86400) error_die('validity limitation not respected');
if (strtotime($secret['valid-until'])<time()) error_die('sharing request timed out', '410 Gone'); if (strtotime($secret['valid-until'])<time()) error_die('sharing request timed out', '410 Gone');
checkPath($secret['path']); checkPath($secret['path']);
if (isset($secret['file'])) { if (isset($secret['file'])) {
@@ -337,7 +337,7 @@
echo '<label for="password">Passwort:</label>'; echo '<label for="password">Passwort:</label>';
echo '<input type="text" size="5" name="password" value="'.substr(str_shuffle(strtolower(sha1(rand().time()."SeAG6"))),0,4).'">'; echo '<input type="text" size="5" name="password" value="'.substr(str_shuffle(strtolower(sha1(rand().time()."SeAG6"))),0,4).'">';
echo '<label for="valid-until">Gültig bis:</label>'; echo '<label for="valid-until">Gültig bis:</label>';
echo '<input type="date" size="10" name="valid-until" max="'.date('Y-m-d', time()+$max_validity_days*86400).'" value="'.date('Y-m-d', time()+14*86400).'"/>'; echo '<input type="date" size="10" name="valid-until" max="'.date('Y-m-d', time()+((int)$max_validity_days)*86400).'" value="'.date('Y-m-d', time()+14*86400).'"/>';
echo '<input type="submit" name="share" value="Teilen"/>'; echo '<input type="submit" name="share" value="Teilen"/>';
} else { } else {
echo '<a href="?path='.urlencode($subpath).'&select">Auswahl-Modus</a>'; echo '<a href="?path='.urlencode($subpath).'&select">Auswahl-Modus</a>';

1
html/makefile.am
View File

@@ -12,5 +12,6 @@ EXTRA_DIST = configuration.php.in
wwwdir = ${pkgdatadir}/html wwwdir = ${pkgdatadir}/html
dist_www_DATA = folder.png .htaccess index.php dist_www_DATA = folder.png .htaccess index.php
www_DATA = configuration.php
MAINTAINERCLEANFILES = makefile.in MAINTAINERCLEANFILES = makefile.in

2
makefile.am
View File

@@ -8,7 +8,7 @@
## 1 2 3 4 5 6 7 8 ## 1 2 3 4 5 6 7 8
## 45678901234567890123456789012345678901234567890123456789012345678901234567890 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890
SUBDIRS = html doc SUBDIRS = etc html doc
doc_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog doc_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog