Naming convention on language strings applied, ACL handling fixed:

[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 4542f84670a2b7e28dee17f6f708cc12e98049d4..e34b0cf014f0a22421e43f54ca3c6bae1c479fdc 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -334,7 +334,8 @@ ORDER BY
                                // Do we have entries?
                                if ((ifAdminMenuHasEntries($menu)) && (!SQL_HASZERONUMS($result_what))) {
                                        $GLOBALS['menu']['description'] = array();
-                                       $GLOBALS['menu']['title'] = array(); $SUB = true;
+                                       $GLOBALS['menu']['title'] = array();
+                                       $SUB = true;
                                        $OUT .= '<li class="admin_menu_sub"><ul class="admin_menu_sub">';
                                        // @TODO Rewrite this to $content = SQL_FETCHARRAY()
                                        while (list($what_sub, $title_what, $desc_what) = SQL_FETCHROW($result_what)) {
@@ -489,7 +490,7 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
                // Process only formular field but not submit buttons ;)
                if ($id != 'ok') {
                        // Do not save the ok value
-                       convertSelectionsToTimestamp($postData, $tableData, $id, $skip);
+                       convertSelectionsToEpocheTime($postData, $tableData, $id, $skip);
 
                        // Shall we process this id? It muss not be empty, of course
                        if (($skip === false) && (!empty($id)) && ((!isset($GLOBALS['skip_config'][$id]))) || ($tableName != '_config')) {
@@ -638,7 +639,11 @@ function generateUserProfileLink ($userid, $title = '', $what = 'list_user') {
                $nick = getNickname($userid);
 
                // Is it not empty, use it as title else the userid
-               if (!empty($nick)) $title = $nick . '(' . $userid . ')'; else $title = $userid;
+               if (!empty($nick)) {
+                       $title = $nick . '(' . $userid . ')';
+               } else {
+                       $title = $userid;
+               }
        }
 
        // Return link