Added merge-script (rudimentary) and fixes from EL brancH

diff --git a/DOCS/merge-exp.sh b/DOCS/merge-exp.sh
new file mode 100755 (executable)
index 0000000..efc97a9
--- /dev/null
+++ b/DOCS/merge-exp.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+svn merge --dry-run http://www.mxchange.org/repos/mailer/branches/0.2.1-FINAL-expression_language_BROKEN/ http://www.mxchange.org/repos/mailer/branches/0.2.1-FINAL .

diff --git a/inc/classes/cachesystem.class.php b/inc/classes/cachesystem.class.php
index 1c3950bbd0964ca75c3cc98c5a44888bc40d3677..5892900b3d8c7ec4f5344386e7061a9f8a28a05c 100644 (file)
--- a/inc/classes/cachesystem.class.php
+++ b/inc/classes/cachesystem.class.php
@@ -114,7 +114,7 @@ class CacheSystem {
                        fwrite($this->pointer, "<?php\n");
                } else {
                        // Cannot create file
-                       addFatalMessage(__METHOD__, __LINE__, '(<font color="#0000aa">' . __LINE__ . '</font>): ' . getMessage('CACHE_PROBLEMS_DETECTED'));
+                       addFatalMessage(__METHOD__, __LINE__, '(<font color="#0000aa">' . __LINE__ . '</font>): {--CACHE_PROBLEMS_DETECTED');
                }
        }
 
@@ -196,7 +196,7 @@ class CacheSystem {
                        } // END - foreach
                } else {
                        // Cannot create file
-                       addFatalMessage(__METHOD__, __LINE__, '(<font color="#0000aa">' . __LINE__ . '</font>): ' . getMessage('CACHE_PROBLEMS_DETECTED'));
+                       addFatalMessage(__METHOD__, __LINE__, '(<font color="#0000aa">' . __LINE__ . '</font>): {--CACHE_PROBLEMS_DETECTED');
                }
        }
 
@@ -347,7 +347,7 @@ class CacheSystem {
                        }
                } else {
                        // Cannot write to cache!
-                       addFatalMessage(__METHOD__, __LINE__, '(<font color="#0000aa">' . __LINE__ . '</font>): ' . getMessage('CACHE_PROBLEMS_DETECTED'));
+                       addFatalMessage(__METHOD__, __LINE__, '(<font color="#0000aa">' . __LINE__ . '</font>): {--CACHE_PROBLEMS_DETECTED');
                }
        }
 
@@ -371,7 +371,7 @@ class CacheSystem {
                        } // END - foreach
                } else {
                        // Cannot write array!
-                       addFatalMessage(__METHOD__, __LINE__, '(<font color="#0000aa">' . __LINE__ . '</font>): ' . getMessage('CACHE_PROBLEMS_DETECTED'));
+                       addFatalMessage(__METHOD__, __LINE__, '(<font color="#0000aa">' . __LINE__ . '</font>): {--CACHE_PROBLEMS_DETECTED');
                }
        }
 
@@ -408,7 +408,7 @@ class CacheSystem {
                        } // END - if
                } else {
                        // Cannot write to cache!
-                       addFatalMessage(__METHOD__, __LINE__, '(<font color="#0000aa">' . __LINE__ . '</font>): ' . getMessage('CACHE_PROBLEMS_DETECTED'));
+                       addFatalMessage(__METHOD__, __LINE__, '(<font color="#0000aa">' . __LINE__ . '</font>): {--CACHE_PROBLEMS_DETECTED');
                }
        }
 
@@ -430,7 +430,7 @@ class CacheSystem {
                        //* DEBUG: */ outputHtml(__METHOD__ . '(<font color="#0000aa">' . __LINE__."</font>): {$this->name} - {$ext_name}={$ext_ver}<br />");
                } else {
                        // Cannot create file
-                       addFatalMessage(__METHOD__, __LINE__, '(<font color="#0000aa">' . __LINE__ . '</font>): ' . getMessage('CACHE_PROBLEMS_DETECTED'));
+                       addFatalMessage(__METHOD__, __LINE__, '(<font color="#0000aa">' . __LINE__ . '</font>): {--CACHE_PROBLEMS_DETECTED');
                }
        }
 
@@ -485,25 +485,25 @@ class CacheSystem {
                // String or non-string? ;-)
                if (is_string($value)) {
                        // String...
-                       $line = '$this->' . $prefix . "['".$this->name."']['" . $key . "']" . $extender . " = '" . escapeQuotes($value) . "';\n";
+                       $line = '$this->' . $prefix . "['" . $this->name . "']['" . $key . "']" . $extender . " = '" . escapeQuotes($value) . "';\n";
                } elseif (is_null($value)) {
                        // Null
-                       $line = '$this->' . $prefix . "['".$this->name."']['" . $key . "']" . $extender . " = null;\n";
+                       $line = '$this->' . $prefix . "['" . $this->name . "']['" . $key . "']" . $extender . " = null;\n";
                } elseif (is_bool($value)) {
                        // Boolean value
                        if ($value === true) {
                                // True
-                               $line = '$this->' . $prefix . "['".$this->name."']['" . $key . "']" . $extender . " = true;\n";
+                               $line = '$this->' . $prefix . "['" . $this->name . "']['" . $key . "']" . $extender . " = true;\n";
                        } else {
                                // False
-                               $line = '$this->' . $prefix . "['".$this->name."']['" . $key . "']" . $extender . " = false;\n";
+                               $line = '$this->' . $prefix . "['" . $this->name . "']['" . $key . "']" . $extender . " = false;\n";
                        }
                } elseif (isset($value[0])) {
                        // These lines needs fixing
                        debug_report_bug('Invalid entry with [0] found. key=' . $key);
                } else {
                        // Non-string
-                       $line = '$this->' . $prefix . "['".$this->name."']['" . $key . "']" . $extender . " = " . $value . ";\n";
+                       $line = '$this->' . $prefix . "['" . $this->name . "']['" . $key . "']" . $extender . ' = ' . $value . ";\n";
                }
 
                // Return line

diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php
index 14c1e82b4f7e95562045638403c4e63915d04389..8703d98ac301b91b63f17701d6b5f3c7d6aa1021 100644 (file)
--- a/inc/extensions-functions.php
+++ b/inc/extensions-functions.php
@@ -617,7 +617,7 @@ function getExtensionVersion ($ext_name, $force = false) {
        // Extension version should not be invalid
        if (($data['ext_version'] == 'false') && ($force === false)) {
                // Please report this trouble
-               debug_report_bug(sprintf("Extension <strong>%s</strong> has empty version!", $ext_name));
+               debug_report_bug(sprintf("Extension <span class=\"data\">%s</span> has empty version!", $ext_name));
        } // END - if
 
        // Return result
@@ -939,7 +939,7 @@ function isExtensionOlder ($ext_name, $ext_ver) {
 // Creates a new task for updated extension
 function createExtensionUpdateTask ($adminId, $ext_name, $ext_ver, $notes) {
        // Create subject line
-       $subject = '[UPDATE-' . $ext_name . '-' . $ext_ver . ':] {--ADMIN_UPDATE_EXT_SUBJ--}';
+       $subject = '[UPDATE-' . $ext_name . '-' . $ext_ver . ':] {--ADMIN_UPDATE_EXTENSION_SUBJ--}';
 
        // Is the extension there?
        if (isExtensionInstalled($ext_name)) {
@@ -950,7 +950,7 @@ function createExtensionUpdateTask ($adminId, $ext_name, $ext_ver, $notes) {
                } // END - if
        } else {
                // Extension not there! :-(
-               debug_report_bug(sprintf("Extension <strong>%s</strong> not found but should be updated?", $ext_name));
+               debug_report_bug(sprintf("Extension <span class=\"data\">%s</span> not found but should be updated?", $ext_name));
        }
 }
 
@@ -959,7 +959,7 @@ function createNewExtensionTask ($adminId, $subject, $ext) {
        // Not installed and do we have created a task for the admin?
        if ((determineTaskIdBySubject($subject) == '0') && (!isExtensionInstalled($ext))) {
                // Set default message if ext-foo is missing
-               $message = getMaskedMessage('ADMIN_EXT_TEXT_FILE_MISSING', $ext);
+               $message = getMaskedMessage('ADMIN_EXTENSION_TEXT_FILE_MISSING', $ext);
 
                // Template file
                $tpl = sprintf("%stemplates/%s/html/ext/ext_%s.tpl",
@@ -990,7 +990,7 @@ function createExtensionDeactivationTask ($ext) {
        // Not installed and do we have created a task for the admin?
        if ((determineTaskIdBySubject($subject) == '0') && (isExtensionInstalled($ext))) {
                // Task not created so add it
-               createNewTask($subject, SQL_ESCAPE(loadTemplate('task_ext_deactivated', true, $ext)), 'EXTENSION_DEACTIVATION');
+               createNewTask($subject, SQL_ESCAPE(loadTemplate('task_EXTENSION_deactivated', true, $ext)), 'EXTENSION_DEACTIVATION');
        } // END - if
 }
 
@@ -1121,7 +1121,7 @@ function addExtensionNotes ($ver) {
                }
 
                // Load template
-               $out = loadTemplate('admin_ext_notes', true, $content);
+               $out = loadTemplate('admin_EXTENSION_notes', true, $content);
        } // END - if
 
        // Add the notes
@@ -1427,17 +1427,17 @@ function getExtensionNotes () {
 
 // Setter for current extension name
 function setCurrentExtensionName ($ext_name) {
-       $GLOBALS['curr_ext_name'] = (string) trim($ext_name);
+       $GLOBALS['curr_EXTENSION_name'] = (string) trim($ext_name);
 }
 
 // Getter for current extension name
 function getCurrentExtensionName () {
-       if (isset($GLOBALS['curr_ext_name'])) {
-               return $GLOBALS['curr_ext_name'];
+       if (isset($GLOBALS['curr_EXTENSION_name'])) {
+               return $GLOBALS['curr_EXTENSION_name'];
        } // END - if
 
        // Not set!
-       debug_report_bug(__FUNCTION__.": curr_ext_name not initialized. Please execute initExtensionSqls() before calling this function.");
+       debug_report_bug(__FUNCTION__.": curr_EXTENSION_name not initialized. Please execute initExtensionSqls() before calling this function.");
 }
 
 // Init SQLs array for current extension

diff --git a/inc/language/de.php b/inc/language/de.php
index 6f9fde28eac529f8627663d26d0587a39dbb90bb..4c8271b0be2215a3b827b2c4a0db01881d8b725c 100644 (file)
--- a/inc/language/de.php
+++ b/inc/language/de.php
@@ -74,7 +74,7 @@ addMessages(array(
        'LANG_NO_RENDER_DIRECT' => "Sie haben weder 'render' noch 'direct' als Ausgabe-Modus eingestellt.",
        'INSTALLATION' => "Installation des Scriptes",
        'INSTALL_PROBLEMS_DETECTED' => "Es wurden bei der Initialisierung des Installationsvorganges Probleme festgestellt.",
-       'FATAL_NO' => "Fataler Fehler Nr. #",
+       'FATAL_NO' => "Fataler Fehler Nr. ",
        'FATAL_CORRECT_ERRORS' => "Kann nicht fortsetzen! Bitte korregieren Sie erst die obrigen Probleme und versuchen Sie es dann erneut.",
        'YES' => "Ja",
        'NO' => "Nein",