Fixed empty API message/status in primera and wernis extensions

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

diff --git a/inc/modules/admin/what-list_wernis.php b/inc/modules/admin/what-list_wernis.php
index 0997be5da541e0e10310905017935ef766611d8f..722d9bb252bb43c1c5a2af40adf334933e9fd123 100644 (file)
--- a/inc/modules/admin/what-list_wernis.php
+++ b/inc/modules/admin/what-list_wernis.php
@@ -32,13 +32,13 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN())) {
+if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR("admin", __FILE__);
 
 // Check for entries
 $result = SQL_QUERY("SELECT id, userid, wernis_account, wernis_amount, wernis_timestamp, wernis_type, wernis_api_message, wernis_api_status FROM "._MYSQL_PREFIX."_user_wernis ORDER BY wernis_timestamp DESC, id DESC",
@@ -57,6 +57,10 @@ if (SQL_NUMROWS($result) > 0) {
                $content['raw_type']                    = strtolower($content['wernis_type']);
                $content['wernis_type']                 = WERNIS_TRANSFER_STATUS($content['wernis_type']);
 
+               // Fix empty message and status
+               if (empty($content['wernis_api_message'])) $content['wernis_api_message'] = "---";
+               if (empty($content['wernis_api_status']))  $content['wernis_api_status']  = "OK";
+
                // Append it and switch colors
                $OUT .= LOAD_TEMPLATE("admin_list_wernis_row", true, $content);
                $SW = 3 - $SW;
@@ -66,7 +70,7 @@ if (SQL_NUMROWS($result) > 0) {
        LOAD_TEMPLATE("admin_list_wernis_main", false, $OUT);
 } else {
        // Nothing to display!
-       LOAD_TEMPLATE("admin_setting_saved", false, WERNIS_ADMIN_NO_TRANSFERS);
+       LOAD_TEMPLATE("admin_settings_saved", false, WERNIS_ADMIN_NO_TRANSFERS);
 }
 
 // Free the result