Fixes + asserts

[mailer.git] / inc / modules / admin / admin-inc.php

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 078108d8f464f1e64958f21398e4fb67653857ee..075242b2fddc48f942a013b833b8152235f3e418 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 // Register an administrator account
 function addAdminAccount ($adminLogin, $passHash, $adminEmail, $accessLevel = 'deny') {
        // Only let valid data pass
-       assert(in_array($accessLevel, array('allow', 'deny')));
+       assert(in_array($accessLevel, array('allow', 'deny')), 'accessLevel=' . $accessLevel . ', should be one of allow/deny.');
 
        // Login does already exist
        $ret = 'already';
@@ -1606,7 +1606,7 @@ function doAdminProcessMenuWeightning ($type, $AND) {
 // Function to register first admin
 function registerFirstAdmin () {
        // Make sure that no admin is registered
-       assert(!isAdminRegistered());
+       assert(!isAdminRegistered(), 'isAdminRegistered()=false which is not expected.');
 
        // Admin is not registered so we have to inform the user
        if ((isFormSent('add_first_admin')) && ((!isPostRequestElementSet('admin_login')) || (!isPostRequestElementSet('admin_password1')) || (strlen(postRequestElement('admin_password1')) < getConfig('minium_admin_pass_length')) || (!isPostRequestElementSet('admin_password2')) || (strlen(postRequestElement('admin_password2')) < getConfig('minium_admin_pass_length')) || (postRequestElement('admin_password1') != postRequestElement('admin_password2')))) {