mirror/php-cimage
1
0
Fork 0
mirror of https://github.com/mosbth/cimage.git synced 2025-08-05 07:37:37 +02:00
Code Issues Releases Wiki Activity

updated versions for single scripts

Browse Source
This commit is contained in:
Mikael Roos
2015-02-10 22:49:17 +01:00
parent c2b037af0d
commit fb9b89a65f
3 changed files with 42 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
webroot/imgd.php
View File

@@ -3011,6 +3011,8 @@ EOD;
* *
*/ */
$version = "v0.7.0-rc.1 (2015-02-10)";
/** /**
@@ -3146,6 +3148,7 @@ if (is_file($configFile)) {
* verbose, v - do a verbose dump of what happens * verbose, v - do a verbose dump of what happens
*/ */
$verbose = getDefined(array('verbose', 'v'), true, false); $verbose = getDefined(array('verbose', 'v'), true, false);
verbose("img.php version = $version");
@@ -3211,12 +3214,21 @@ if ($defaultTimezone) {
* Options decide themself if they require passwords to be used. * Options decide themself if they require passwords to be used.
*/ */
$pwdConfig = getConfig('password', false); $pwdConfig = getConfig('password', false);
$pwdAlways = getConfig('password_always', false);
$pwd = get(array('password', 'pwd'), null); $pwd = get(array('password', 'pwd'), null);
// Check if passwords match, if configured to use passwords // Check if passwords match, if configured to use passwords
$passwordMatch = null; $passwordMatch = null;
if ($pwdConfig && $pwd) { if ($pwdAlways) {
$passwordMatch = ($pwdConfig == $pwd);
$passwordMatch = ($pwdConfig === $pwd);
if (!$passwordMatch) {
errorPage("Password required and does not match or exists.");
}
} elseif ($pwdConfig && $pwd) {
$passwordMatch = ($pwdConfig === $pwd);
} }
verbose("password match = $passwordMatch"); verbose("password match = $passwordMatch");

16
webroot/imgp.php
View File

@@ -3011,6 +3011,8 @@ EOD;
* *
*/ */
$version = "v0.7.0-rc.1 (2015-02-10)";
/** /**
@@ -3146,6 +3148,7 @@ if (is_file($configFile)) {
* verbose, v - do a verbose dump of what happens * verbose, v - do a verbose dump of what happens
*/ */
$verbose = getDefined(array('verbose', 'v'), true, false); $verbose = getDefined(array('verbose', 'v'), true, false);
verbose("img.php version = $version");
@@ -3211,12 +3214,21 @@ if ($defaultTimezone) {
* Options decide themself if they require passwords to be used. * Options decide themself if they require passwords to be used.
*/ */
$pwdConfig = getConfig('password', false); $pwdConfig = getConfig('password', false);
$pwdAlways = getConfig('password_always', false);
$pwd = get(array('password', 'pwd'), null); $pwd = get(array('password', 'pwd'), null);
// Check if passwords match, if configured to use passwords // Check if passwords match, if configured to use passwords
$passwordMatch = null; $passwordMatch = null;
if ($pwdConfig && $pwd) { if ($pwdAlways) {
$passwordMatch = ($pwdConfig == $pwd);
$passwordMatch = ($pwdConfig === $pwd);
if (!$passwordMatch) {
errorPage("Password required and does not match or exists.");
}
} elseif ($pwdConfig && $pwd) {
$passwordMatch = ($pwdConfig === $pwd);
} }
verbose("password match = $passwordMatch"); verbose("password match = $passwordMatch");

16
webroot/imgs.php
View File

@@ -3011,6 +3011,8 @@ EOD;
* *
*/ */
$version = "v0.7.0-rc.1 (2015-02-10)";
/** /**
@@ -3146,6 +3148,7 @@ if (is_file($configFile)) {
* verbose, v - do a verbose dump of what happens * verbose, v - do a verbose dump of what happens
*/ */
$verbose = getDefined(array('verbose', 'v'), true, false); $verbose = getDefined(array('verbose', 'v'), true, false);
verbose("img.php version = $version");
@@ -3211,12 +3214,21 @@ if ($defaultTimezone) {
* Options decide themself if they require passwords to be used. * Options decide themself if they require passwords to be used.
*/ */
$pwdConfig = getConfig('password', false); $pwdConfig = getConfig('password', false);
$pwdAlways = getConfig('password_always', false);
$pwd = get(array('password', 'pwd'), null); $pwd = get(array('password', 'pwd'), null);
// Check if passwords match, if configured to use passwords // Check if passwords match, if configured to use passwords
$passwordMatch = null; $passwordMatch = null;
if ($pwdConfig && $pwd) { if ($pwdAlways) {
$passwordMatch = ($pwdConfig == $pwd);
$passwordMatch = ($pwdConfig === $pwd);
if (!$passwordMatch) {
errorPage("Password required and does not match or exists.");
}
} elseif ($pwdConfig && $pwd) {
$passwordMatch = ($pwdConfig === $pwd);
} }
verbose("password match = $passwordMatch"); verbose("password match = $passwordMatch");