Complete rewrite and debug message surpressed:

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

diff --git a/inc/modules/admin/what-list_yoomedia_tm.php b/inc/modules/admin/what-list_yoomedia_tm.php
index 8457e3d09f07ca8b54533ef20d4eff7bbd3898ea..dd4e2303af607e7cfa5c8fab397fe3853182cc19 100644 (file)
--- a/inc/modules/admin/what-list_yoomedia_tm.php
+++ b/inc/modules/admin/what-list_yoomedia_tm.php
@@ -40,10 +40,10 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif (!EXT_IS_ACTIVE('yoomedia')) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('yoomedia'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('yoomedia'));
        return;
 } elseif (!EXT_IS_ACTIVE('bonus')) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('bonus'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('bonus'));
        return;
 }
 
@@ -85,10 +85,19 @@ if ((!is_array($result)) || (count($result) == 0) || (!isset($result[0]['id'])))
        return false;
 } elseif (count($result[0]) < 7) {
        // Error received so prepare error code
-       $code = explode(" ", $result[0]['id']);
-       $code = $code[0];
-       $code = explode("<br />", $code);
-       $code = $code[0];
+       $codeArray = explode(" ", $result[0]['id']);
+       $code = $codeArray[0];
+       $codeArray = explode("<br />", $code);
+       $code = $codeArray[0];
+       $codeArray = explode("<br>", $code);
+       $code = $codeArray[0];
+
+       // Remove all new-line characters
+       $codeArray = explode("\n", $code);
+       $code = $codeArray[0];
+
+       // Remove carrige-return
+       $code = str_replace("\n", '', $code);
 
        // Output message
        LOAD_TEMPLATE('admin_yoomedia_error', false, sprintf("{--ADMIN_YOOMEDIA_ERROR_%s--}", strtoupper(yoomediaTranslateError($code))));