aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Weiske <cweiske@cweiske.de>2012-09-18 07:41:31 +0200
committerChristian Weiske <cweiske@cweiske.de>2012-09-18 07:41:31 +0200
commit3367fca1c9cdeb70c95154f20011b268d4d080a4 (patch)
tree2c193268b58209dc7f10a9313eacf0f0562364ca
parent46e5ed5df53911bd2ae3584ef35f86e5d3094fb3 (diff)
downloadphorkie-3367fca1c9cdeb70c95154f20011b268d4d080a4.tar.gz
phorkie-3367fca1c9cdeb70c95154f20011b268d4d080a4.zip
rename "secure" config setting to "securityLevel"
-rw-r--r--data/config.default.php2
-rw-r--r--www/www-security.php8
2 files changed, 5 insertions, 5 deletions
diff --git a/data/config.default.php b/data/config.default.php
index da16241..0c9ec69 100644
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -13,7 +13,7 @@ $GLOBALS['phorkie']['cfg'] = array(
'index' => 'new'//"new" or "list"
);
$GLOBALS['phorkie']['auth'] = array(
- 'secure' => 0, // 0 = public, no authentication, 1 = protect adds/edits/deletes, 2 = use authentication
+ 'securityLevel' => 0, // 0 = public, no authentication, 1 = protect adds/edits/deletes, 2 = require authentication
'userlist' => false, // true = user must be explicitly defined, false = anyone allowed, but they must authenticate
'anonymousName' => 'Anonymous', // Email for non-authenticated commits
'anonymousEmail' => 'anonymous@phorkie' // Email for non-authenticated commits
diff --git a/www/www-security.php b/www/www-security.php
index 9fae87b..e9fdab7 100644
--- a/www/www-security.php
+++ b/www/www-security.php
@@ -4,12 +4,12 @@ namespace phorkie;
* security levels + login requirement:
*/
-if (!isset($GLOBALS['phorkie']['auth']['secure'])) {
+if (!isset($GLOBALS['phorkie']['auth']['securityLevel'])) {
//not set? highest level of security
- $GLOBALS['phorkie']['auth']['secure'] = 2;
+ $GLOBALS['phorkie']['auth']['securityLevel'] = 2;
}
-if ($GLOBALS['phorkie']['auth']['secure'] == 0) {
+if ($GLOBALS['phorkie']['auth']['securityLevel'] == 0) {
//everyone may do everything
return;
}
@@ -26,7 +26,7 @@ if (!isset($_SESSION['identity'])) {
$logged_in = true;
}
-if ($secureAtLevel >= $GLOBALS['phorkie']['auth']['secure']) {
+if ($secureAtLevel >= $GLOBALS['phorkie']['auth']['securityLevel']) {
if ($logged_in) {
return;
}