Renamed ifSqlHasZeroNums() to ifSqlHasZeroNumRows() and improved some queries.

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

diff --git a/inc/modules/admin/what-unlock_emails.php b/inc/modules/admin/what-unlock_emails.php
index 4fbd9eeebec660c873bccac6b904e7bb0e67585e..848c797aaf538c72bfb6db90bb053c510373a3a8 100644 (file)
--- a/inc/modules/admin/what-unlock_emails.php
+++ b/inc/modules/admin/what-unlock_emails.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *

- * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2015 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 *


@@ -61,7 +61,7 @@ WHERE
 ORDER BY
        `timestamp` ASC", __FILE__, __LINE__);
 
 ORDER BY
        `timestamp` ASC", __FILE__, __LINE__);
 

-if ((!ifSqlHasZeroNums($result_main)) || (isFormSent('lock'))) {
+if ((!ifSqlHasZeroNumRows($result_main)) || (isFormSent('lock'))) {

        if (isFormSent('accept')) {
                if (ifPostContainsSelections()) {
                        // Accept mail orders
        if (isFormSent('accept')) {
                if (ifPostContainsSelections()) {
                        // Accept mail orders


@@ -73,7 +73,7 @@ if ((!ifSqlHasZeroNums($result_main)) || (isFormSent('lock'))) {
                                $content = getPoolDataFromId($id);
 
                                // Found some data?
                                $content = getPoolDataFromId($id);
 
                                // Found some data?

-                               if (count($content) > 0) {
+                               if (isFilledArray($content)) {

                                        // Is the surfbar installed?
                                        // @TODO Rewrite these if-blocks to a filter
                                        if ((isExtensionActive('surfbar')) && (getConfig('surfbar_migrate_order') == 'Y')) {
                                        // Is the surfbar installed?
                                        // @TODO Rewrite these if-blocks to a filter
                                        if ((isExtensionActive('surfbar')) && (getConfig('surfbar_migrate_order') == 'Y')) {