diff options
| author | Simon Rettberg | 2015-09-10 15:15:28 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2015-09-10 15:15:28 +0200 |
| commit | 93d1acd95d1bf99d3f428abdd85078d1bac7119f (patch) | |
| tree | 03e6169d4f1839b2a34ba9dd5b572a5de1c553b3 /modules | |
| parent | Allow registration, add support for creating test accounts, rename satellite ... (diff) | |
| download | bwlp-webadmin-93d1acd95d1bf99d3f428abdd85078d1bac7119f.tar.gz bwlp-webadmin-93d1acd95d1bf99d3f428abdd85078d1bac7119f.tar.xz bwlp-webadmin-93d1acd95d1bf99d3f428abdd85078d1bac7119f.zip | |
Adapt to master-server changes (Db scheme)
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/adduser.inc.php | 6 | ||||
| -rw-r--r-- | modules/logout.inc.php | 4 | ||||
| -rw-r--r-- | modules/main.inc.php | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/modules/adduser.inc.php b/modules/adduser.inc.php index f27717b..7bb6c1f 100644 --- a/modules/adduser.inc.php +++ b/modules/adduser.inc.php @@ -47,9 +47,9 @@ class Page_AddUser extends Page if ($ok === false) { Message::addError('Login-Suffix @{{0}} ist ungültig.', $suffix); } else { - Database::exec('INSERT INTO user (login, password, organizationid, firstname, lastname, email) ' - . ' VALUES (:login, :password, :organization, :firstname, :lastname, :email)', array( - 'login' => $login, + Database::exec('INSERT INTO user (userid, password, organizationid, firstname, lastname, email) ' + . ' VALUES (:userid, :password, :organization, :firstname, :lastname, :email)', array( + 'userid' => $login, 'password' => Crypto::hash6($password), 'organization' => $organizationid, 'firstname' => $firstname, diff --git a/modules/logout.inc.php b/modules/logout.inc.php index f1379d6..7351abc 100644 --- a/modules/logout.inc.php +++ b/modules/logout.inc.php @@ -8,9 +8,7 @@ class Page_Logout extends Page if (!User::load()) { Util::redirect('?do=Main'); } - if (User::isLocalOnly()) { - User::logout(); - } + User::logout(); } public function doRender() diff --git a/modules/main.inc.php b/modules/main.inc.php index 3e3aff8..2581a59 100644 --- a/modules/main.inc.php +++ b/modules/main.inc.php @@ -13,7 +13,7 @@ class Page_Main extends Page Render::addTemplate('main/_page'); if (!User::isLoggedIn()) { // Guest - Render::addTemplate('main/guest'); + Render::addTemplate('main/guest', array('prefix' => CONFIG_PREFIX)); return; } // Logged in user -- |