Rewrote 'we' word a little, rewrote mail order to use SQL_INSERTID() instead of anoth...

[mailer.git] / inc / loader / load-admins.php

diff --git a/inc/loader/load-admins.php b/inc/loader/load-admins.php
index c7111d689d3bca89ec7cc563ca87703c74c41b88..c34f9585bed3616ce8d942263334b8de87321a47 100644 (file)
--- a/inc/loader/load-admins.php
+++ b/inc/loader/load-admins.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *

- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *

  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *


@@ -57,7 +57,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile('admin')) && ($GLOBALS['cache_ins
                        foreach ($GLOBALS['cache_array']['admin']['login'] as $idx => $admin) {
                                // Rewrite all entries
                                foreach ($GLOBALS['cache_array']['admin'] as $key => $entry) {
                        foreach ($GLOBALS['cache_array']['admin']['login'] as $idx => $admin) {
                                // Rewrite all entries
                                foreach ($GLOBALS['cache_array']['admin'] as $key => $entry) {

-                                       // Do we have login or regular entries?
+                                       // Is there login or regular entries?

                                        if ($key == 'admin_id') {
                                                // Admin id, so use login
                                                $admins[$key][$GLOBALS['cache_array']['admin']['login'][$idx]] = $entry[$idx];
                                        if ($key == 'admin_id') {
                                                // Admin id, so use login
                                                $admins[$key][$GLOBALS['cache_array']['admin']['login'][$idx]] = $entry[$idx];


@@ -128,10 +128,10 @@ if (isExtensionInstalledAndNewer('admins', '0.3')) {
                                foreach ($GLOBALS['cache_array']['admin_acls']['admin_id'] as $idx => $admin) {
                                        // Rewrite all entries
                                        foreach ($GLOBALS['cache_array']['admin_acls'] as $key => $entry) {
                                foreach ($GLOBALS['cache_array']['admin_acls']['admin_id'] as $idx => $admin) {
                                        // Rewrite all entries
                                        foreach ($GLOBALS['cache_array']['admin_acls'] as $key => $entry) {

-                                               // Do we have 'admin_id' or regular entries?
+                                               // Is there 'admin_id' or regular entries?

                                                if ($key != 'admin_id') {
                                                        // Regular entry so use id
                                                if ($key != 'admin_id') {
                                                        // Regular entry so use id

-                                                       $admins[$key][$GLOBALS['cache_array']['admin_acls']['admin_id'][$idx]][] = $entry[$idx];
+                                                       array_push($admins[$key][$GLOBALS['cache_array']['admin_acls']['admin_id'][$idx]], $entry[$idx]);

                                                } // END - if
                                        } // END - foreach
                                } // END - foreach
                                                } // END - if
                                        } // END - foreach
                                } // END - foreach