diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4 index 686c800..b54f205 100644 --- a/ax_init_standard_project.m4 +++ b/ax_init_standard_project.m4 @@ -573,6 +573,11 @@ distclean-rpm-targets: 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 AC_DEFUN([AX_USE_SCRIPTS], [ AC_CONFIG_FILES([scripts/makefile]) diff --git a/etc/authentication.php b/etc/authentication.php index d253bd3..04118c7 100644 --- a/etc/authentication.php +++ b/etc/authentication.php @@ -1,9 +1,7 @@ \ No newline at end of file diff --git a/html/index.php b/html/index.php index dabff58..4ccf5f4 100644 --- a/html/index.php +++ b/html/index.php @@ -187,7 +187,7 @@ $secret = decrypt($_REQUEST['secret']) or error_die('bad password', '403 Forbidden'); if (!isset($secret['valid-until'])) error_die('missing validation date'); 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'])Passwort:'; echo ''; echo ''; - echo ''; + echo ''; echo ''; } else { echo 'Auswahl-Modus'; diff --git a/html/makefile.am b/html/makefile.am index 49b9ac6..695005c 100644 --- a/html/makefile.am +++ b/html/makefile.am @@ -12,5 +12,6 @@ EXTRA_DIST = configuration.php.in wwwdir = ${pkgdatadir}/html dist_www_DATA = folder.png .htaccess index.php +www_DATA = configuration.php MAINTAINERCLEANFILES = makefile.in diff --git a/makefile.am b/makefile.am index db5af1f..a881605 100644 --- a/makefile.am +++ b/makefile.am @@ -8,7 +8,7 @@ ## 1 2 3 4 5 6 7 8 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890 -SUBDIRS = html doc +SUBDIRS = etc html doc doc_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog