diff --git a/extras/extra_modules/html/modules/XUpgrade/admin/class/UpgradeProcessor.class.php b/extras/extra_modules/html/modules/XUpgrade/admin/class/UpgradeProcessor.class.php
index 3e7731568..795f93a93 100644
--- a/extras/extra_modules/html/modules/XUpgrade/admin/class/UpgradeProcessor.class.php
+++ b/extras/extra_modules/html/modules/XUpgrade/admin/class/UpgradeProcessor.class.php
@@ -178,20 +178,20 @@ function _portConfigs()
 		$category =& $handler->get(XOOPS_CONF_USER);
 		if (is_object($category)) {
 			if ($handler->delete($category)) {
-				$this->mLog->add(XCube_Utils::formatMessage(_MI_XUPGRADE_MESSAGE_DELETED_CATEGORY, _MI_XUPGRADE_LANG_USER_CATEGORY));
+				$this->mLog->add(XCube_Utils::formatString(_MI_XUPGRADE_MESSAGE_DELETED_CATEGORY, _MI_XUPGRADE_LANG_USER_CATEGORY));
 			}
 			else {
-				$this->mLog->addError(XCube_Utils::formatMessage(_MI_XUPGRADE_ERROR_DELETED_CATEGORY, _MI_XUPGRADE_LANG_USER_CATEGORY));
+				$this->mLog->addError(XCube_Utils::formatString(_MI_XUPGRADE_ERROR_DELETED_CATEGORY, _MI_XUPGRADE_LANG_USER_CATEGORY));
 			}
 		}
 		
 		$category =& $handler->get(XOOPS_CONF_METAFOOTER);
 		if (is_object($category)) {
 			if ($handler->delete($category)) {
-				$this->mLog->add(XCube_Utils::formatMessage(_MI_XUPGRADE_MESSAGE_DELETED_CATEGORY, _MI_XUPGRADE_LANG_METEFOOTER_CATEGORY));
+				$this->mLog->add(XCube_Utils::formatString(_MI_XUPGRADE_MESSAGE_DELETED_CATEGORY, _MI_XUPGRADE_LANG_METEFOOTER_CATEGORY));
 			}
 			else {
-				$this->mLog->addError(XCube_Utils::formatMessage(_MI_XUPGRADE_ERROR_DELETED_CATEGORY, _MI_XUPGRADE_LANG_METEFOOTER_CATEGORY));
+				$this->mLog->addError(XCube_Utils::formatString(_MI_XUPGRADE_ERROR_DELETED_CATEGORY, _MI_XUPGRADE_LANG_METEFOOTER_CATEGORY));
 			}
 		}
 	}
@@ -245,10 +245,10 @@ function _portTemplates()
 					$desc_tplfileArr[$key]->Source->set('tpl_source', $src_tplfile->Source->get('tpl_source'));
 					
 					if ($handler->insert($desc_tplfileArr[$key])) {
-						$this->mLog->add(XCube_Utils::formatMessage(_MI_XUPGRADE_MESSAGE_PORTED_TEMPLATE, $src_tplfile->get('tpl_file'), $src_tplfile->get('tpl_tplset')));
+						$this->mLog->add(XCube_Utils::formatString(_MI_XUPGRADE_MESSAGE_PORTED_TEMPLATE, $src_tplfile->get('tpl_file'), $src_tplfile->get('tpl_tplset')));
 					}
 					else {
-						$this->mLog->add(XCube_Utils::formatMessage(_MI_XUPGRADE_ERROR_PORTED_TEMPLATE, $src_tplfile->get('tpl_file'), $src_tplfile->get('tpl_tplset')));
+						$this->mLog->add(XCube_Utils::formatString(_MI_XUPGRADE_ERROR_PORTED_TEMPLATE, $src_tplfile->get('tpl_file'), $src_tplfile->get('tpl_tplset')));
 					}
 				}
 			}
@@ -316,7 +316,7 @@ function &_getCubeConfigs($dirname)
 	function _copy(&$oldConfig, &$cubeConfig, $dirname)
 	{
 		if (!is_object($oldConfig) || !is_object($cubeConfig)) {
-			$this->mLog->addError(XCube_Utils::formatMessage(_MI_XUPGRADE_ERROR_CONFIGS_WRONG));
+			$this->mLog->addError(XCube_Utils::formatString(_MI_XUPGRADE_ERROR_CONFIGS_WRONG));
 			return;
 		}
 		
@@ -326,17 +326,17 @@ function _copy(&$oldConfig, &$cubeConfig, $dirname)
 		}
 		$cubeConfig->setConfValueForInput($value);
 		if ($this->mConfigHandler->insertConfig($cubeConfig)) {
-			$this->mLog->add(XCube_Utils::formatMessage(_MI_XUPGRADE_MESSAGE_PORTED_CONFIG, $cubeConfig->get('conf_name'), 'user'));
+			$this->mLog->add(XCube_Utils::formatString(_MI_XUPGRADE_MESSAGE_PORTED_CONFIG, $cubeConfig->get('conf_name'), 'user'));
 		}
 		else {
-			$this->mLog->addError(XCube_Utils::formatMessage(_MI_XUPGRADE_ERROR_PORTED_CONFIG, $cubeConfig->get('conf_name'), 'user'));
+			$this->mLog->addError(XCube_Utils::formatString(_MI_XUPGRADE_ERROR_PORTED_CONFIG, $cubeConfig->get('conf_name'), 'user'));
 		}
 		
 		if ($this->mConfigHandler->deleteConfig($oldConfig)) {
-			$this->mLog->add(XCube_Utils::formatMessage(_MI_XUPGRADE_MESSAGE_DELETED_CONFIG, $oldConfig->get('conf_name')));
+			$this->mLog->add(XCube_Utils::formatString(_MI_XUPGRADE_MESSAGE_DELETED_CONFIG, $oldConfig->get('conf_name')));
 		}
 		else {
-			$this->mLog->addError(XCube_Utils::formatMessage(_MI_XUPGRADE_ERROR_DELETED_CONFIG, $oldConfig->get('conf_name')));
+			$this->mLog->addError(XCube_Utils::formatString(_MI_XUPGRADE_ERROR_DELETED_CONFIG, $oldConfig->get('conf_name')));
 		}
 	}
 	
@@ -358,7 +358,7 @@ function _fullCopy(&$oldConfigs, &$cubeConfigs, $dirname)
 				$this->_copy($oldConfigs[$key], $cubeConfigs[$key], $dirname);
 			}
 			else {
-				$this->mLog->addError(XCube_Utils::formatMessage(_MI_XUPGRADE_ERROR_FIND_CONFIG, $key, 'user'));
+				$this->mLog->addError(XCube_Utils::formatString(_MI_XUPGRADE_ERROR_FIND_CONFIG, $key, 'user'));
 			}
 		}
 	}
@@ -374,7 +374,7 @@ function _adjustModules()
 		foreach ($modules as $module) {
 			$module->set('isactive', 1);
 			$handler->insert($module);
-			$log->add(XCube_Utils::formatMessage(_MI_XUPGRADE_MESSAGE_ADJUST_MODULE_ISACTIVE, $module->get('dirname')));
+			$log->add(XCube_Utils::formatString(_MI_XUPGRADE_MESSAGE_ADJUST_MODULE_ISACTIVE, $module->get('dirname')));
 		}
 	}
 }
diff --git a/html/modules/legacy/actions/MiscSslloginAction.class.php b/html/modules/legacy/actions/MiscSslloginAction.class.php
index ee350a497..3a38195d9 100644
--- a/html/modules/legacy/actions/MiscSslloginAction.class.php
+++ b/html/modules/legacy/actions/MiscSslloginAction.class.php
@@ -37,7 +37,7 @@ function executeViewIndex(&$controller, &$xoopsUser, &$render)
 		}
 	
 		$render->setTemplateName("legacy_misc_ssllogin.html");
-		$render->setAttribute("message", XCube_Utils::formatMessage(_MD_LEGACY_MESSAGE_LOGIN_SUCCESS, $xoopsUser->get('uname')));
+		$render->setAttribute("message", XCube_Utils::formatString(_MD_LEGACY_MESSAGE_LOGIN_SUCCESS, $xoopsUser->get('uname')));
 	}
 }
 
diff --git a/html/modules/legacy/admin/actions/ImageUploadAction.class.php b/html/modules/legacy/admin/actions/ImageUploadAction.class.php
index 11b801701..aea6896ad 100644
--- a/html/modules/legacy/admin/actions/ImageUploadAction.class.php
+++ b/html/modules/legacy/admin/actions/ImageUploadAction.class.php
@@ -133,11 +133,11 @@ function _saveTargetImages(&$targetimages, $t_imgcat_id)
 				$save_file_name = uniqid( 'img' ) . '.' . $ext ;
 				$filehandle = fopen( XOOPS_UPLOAD_PATH.'/'.$save_file_name , "w" ) ;
 				if( ! $filehandle ) {
-				$this->_addErrorMessage(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_COULD_NOT_SAVE_IMAGE_FILE, $file_name));
+				$this->_addErrorMessage(XCube_Utils::formatString(_AD_LEGACY_ERROR_COULD_NOT_SAVE_IMAGE_FILE, $file_name));
 				continue ;
 				}
 				if ( !@fwrite($filehandle, $targetimages[$i]['content']) ) {
-				$this->_addErrorMessage(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_COULD_NOT_SAVE_IMAGE_FILE, $file_name));
+				$this->_addErrorMessage(XCube_Utils::formatString(_AD_LEGACY_ERROR_COULD_NOT_SAVE_IMAGE_FILE, $file_name));
 				@fclose( $filehandle ) ;
 				continue;				
 				};
@@ -151,7 +151,7 @@ function _saveTargetImages(&$targetimages, $t_imgcat_id)
 				$image->set('imgcat_id', $t_imgcat_id);
 
 				if (!$imagehandler->insert($image)) {
-					$this->_addErrorMessage(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_COULD_NOT_SAVE_IMAGE_FILE, $file_name));
+					$this->_addErrorMessage(XCube_Utils::formatString(_AD_LEGACY_ERROR_COULD_NOT_SAVE_IMAGE_FILE, $file_name));
 				}
 				unset($image);
 		} //end of for
@@ -178,7 +178,7 @@ function _saveTargetImages(&$targetimages, $t_imgcat_id)
 				$image->mImageBody->set('image_body', $targetimages[$i]['content']);
 
 				if (!$imagehandler->insert($image)) {
-					$this->_addErrorMessage(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_COULD_NOT_SAVE_IMAGE_FILE, $file_name));
+					$this->_addErrorMessage(XCube_Utils::formatString(_AD_LEGACY_ERROR_COULD_NOT_SAVE_IMAGE_FILE, $file_name));
 				}
 				unset($image);
 		} //end of for
diff --git a/html/modules/legacy/admin/actions/SmilesUploadAction.class.php b/html/modules/legacy/admin/actions/SmilesUploadAction.class.php
index 4d0b1a642..d8590e4c3 100644
--- a/html/modules/legacy/admin/actions/SmilesUploadAction.class.php
+++ b/html/modules/legacy/admin/actions/SmilesUploadAction.class.php
@@ -126,11 +126,11 @@ function _saveSmilesImages(&$smilesimages)
 				$save_file_name = uniqid( 'smil' ) . '.' . $ext ;
 				$filehandle = fopen( XOOPS_UPLOAD_PATH.'/'.$save_file_name , "w" ) ;
 				if( ! $filehandle ) {
-				$this->_addErrorMessage(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_COULD_NOT_SAVE_SMILES_FILE, $file_name));
+				$this->_addErrorMessage(XCube_Utils::formatString(_AD_LEGACY_ERROR_COULD_NOT_SAVE_SMILES_FILE, $file_name));
 				continue ;
 				}
 				if ( !@fwrite($filehandle, $smilesimages[$i]['content']) ) {
-				$this->_addErrorMessage(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_COULD_NOT_SAVE_SMILES_FILE, $file_name));
+				$this->_addErrorMessage(XCube_Utils::formatString(_AD_LEGACY_ERROR_COULD_NOT_SAVE_SMILES_FILE, $file_name));
 				@fclose( $filehandle ) ;
 				continue;				
 				};
@@ -143,7 +143,7 @@ function _saveSmilesImages(&$smilesimages)
 				$smiles->set('display', 1);
 
 				if (!$smileshandler->insert($smiles)) {
-					$this->_addErrorMessage(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_COULD_NOT_SAVE_SMILES_FILE, $file_name));
+					$this->_addErrorMessage(XCube_Utils::formatString(_AD_LEGACY_ERROR_COULD_NOT_SAVE_SMILES_FILE, $file_name));
 				}
 				unset($smiles);
 		}
diff --git a/html/modules/legacy/admin/class/ModuleInstallUtils.class.php b/html/modules/legacy/admin/class/ModuleInstallUtils.class.php
index 9d183f85f..ae832b143 100644
--- a/html/modules/legacy/admin/class/ModuleInstallUtils.class.php
+++ b/html/modules/legacy/admin/class/ModuleInstallUtils.class.php
@@ -174,7 +174,7 @@ function installSQLAutomatically(&$module, &$log)
 			$scanner->setDirname($module->get('dirname'));
 			
 			if (!$scanner->loadFile($sqlfilepath)) {
-				$log->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_SQL_FILE_NOT_FOUND, $sqlfile));
+				$log->addError(XCube_Utils::formatString(_AD_LEGACY_ERROR_SQL_FILE_NOT_FOUND, $sqlfile));
 				return false;
 			}
 	
@@ -322,10 +322,10 @@ function installModuleTemplate($module, $template, &$log)
 		$tplfile->setVar('tpl_desc', $description, true);
 		
 		if ($tplHandler->insert($tplfile)) {
-			$log->addReport(XCube_Utils::formatMessage(_AD_LEGACY_MESSAGE_TEMPLATE_INSTALLED, $fileName));
+			$log->addReport(XCube_Utils::formatString(_AD_LEGACY_MESSAGE_TEMPLATE_INSTALLED, $fileName));
 		}
 		else {
-			$log->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_COULD_NOT_INSTALL_TEMPLATE, $fileName));
+			$log->addError(XCube_Utils::formatString(_AD_LEGACY_ERROR_COULD_NOT_INSTALL_TEMPLATE, $fileName));
 			return false;
 		}
 	}
@@ -369,7 +369,7 @@ function _uninstallAllOfModuleTemplates(&$module, $tplset, &$log)
 			
 			foreach ($delTemplates as $tpl) {
 				if (!$tplHandler->delete($tpl)) {
-					$log->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_TEMPLATE_UNINSTALLED, $tpl->get('tpl_file')));
+					$log->addError(XCube_Utils::formatString(_AD_LEGACY_ERROR_TEMPLATE_UNINSTALLED, $tpl->get('tpl_file')));
 				}
 			}
 		}
@@ -548,12 +548,12 @@ function installBlock(&$module, &$blockObj, &$block, &$log)
             $autolink = true;
         }
 		if (!$blockHandler->insert($blockObj, $autolink)) {
-			$log->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_COULD_NOT_INSTALL_BLOCK, $blockObj->getVar('name')));
+			$log->addError(XCube_Utils::formatString(_AD_LEGACY_ERROR_COULD_NOT_INSTALL_BLOCK, $blockObj->getVar('name')));
 
 			return false;
 		}
 		else {
-			$log->addReport(XCube_Utils::formatMessage(_AD_LEGACY_MESSAGE_BLOCK_INSTALLED, $blockObj->getVar('name')));
+			$log->addReport(XCube_Utils::formatString(_AD_LEGACY_MESSAGE_BLOCK_INSTALLED, $blockObj->getVar('name')));
 
 			$tplHandler =& xoops_gethandler('tplfile');
 
@@ -566,7 +566,7 @@ function installBlock(&$module, &$blockObj, &$block, &$log)
                 if (!empty($block['show_all_module'])) {
         			$link_sql = "INSERT INTO " . $blockHandler->db->prefix('block_module_link') . " (block_id, module_id) VALUES (".$blockObj->getVar('bid').", 0)";
 		        	if (!$blockHandler->db->query($link_sql)) {
-       					$log->addWarning(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_COULD_NOT_SET_LINK, $blockObj->getVar('name')));
+       					$log->addWarning(XCube_Utils::formatString(_AD_LEGACY_ERROR_COULD_NOT_SET_LINK, $blockObj->getVar('name')));
 		        	}
     			}
    				$gpermHandler =& xoops_gethandler('groupperm');
@@ -582,7 +582,7 @@ function installBlock(&$module, &$blockObj, &$block, &$log)
         				$bperm->setVar('gperm_groupid', $group->getVar('groupid'));
         				$bperm->setNew();
         				if (!$gpermHandler->insert($bperm)) {
-        					$log->addWarning(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_COULD_NOT_SET_BLOCK_PERMISSION, $blockObj->getVar('name')));
+        					$log->addWarning(XCube_Utils::formatString(_AD_LEGACY_ERROR_COULD_NOT_SET_BLOCK_PERMISSION, $blockObj->getVar('name')));
         				}
         			}
 				} else {
@@ -592,7 +592,7 @@ function installBlock(&$module, &$blockObj, &$block, &$log)
         				$bperm->setVar('gperm_groupid', $mygroup);
         				$bperm->setNew();
         				if (!$gpermHandler->insert($bperm)) {
-        					$log->addWarning(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_COULD_NOT_SET_BLOCK_PERMISSION, $blockObj->getVar('name')));
+        					$log->addWarning(XCube_Utils::formatString(_AD_LEGACY_ERROR_COULD_NOT_SET_BLOCK_PERMISSION, $blockObj->getVar('name')));
     				    }
     				}
 				}
@@ -616,7 +616,7 @@ function uninstallBlock(&$block, &$log)
 	{
 		$blockHandler =& xoops_gethandler('block');
 		$blockHandler->delete($block);
-		$log->addReport(XCube_Utils::formatMessage(_AD_LEGACY_MESSAGE_UNINSTALLATION_BLOCK_SUCCESSFUL, $block->get('name')));
+		$log->addReport(XCube_Utils::formatString(_AD_LEGACY_MESSAGE_UNINSTALLATION_BLOCK_SUCCESSFUL, $block->get('name')));
 		
 		//
 		// Deletes permissions
@@ -668,11 +668,11 @@ function installBlockTemplate(&$block, &$module, &$log)
 		$tplfile->set('tpl_lastmodified', time());
 
 		if ($tplHandler->insert($tplfile)) {
-		    $log->addReport(XCube_Utils::formatMessage(_AD_LEGACY_MESSAGE_BLOCK_TEMPLATE_INSTALLED, $block->get('template')));
+		    $log->addReport(XCube_Utils::formatString(_AD_LEGACY_MESSAGE_BLOCK_TEMPLATE_INSTALLED, $block->get('template')));
 			return true;
 		}
 		else {
-			$log->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_BLOCK_TEMPLATE_INSTALL, $block->get('name')));
+			$log->addError(XCube_Utils::formatString(_AD_LEGACY_ERROR_BLOCK_TEMPLATE_INSTALL, $block->get('name')));
 			return false;
 		}
 	}
@@ -768,10 +768,10 @@ function installPreferenceByInfo(&$info, &$module, &$log)
 		}
 		
 		if ($handler->insertConfig($config)) {
-			$log->addReport(XCube_Utils::formatMessage(_AD_LEGACY_MESSAGE_INSERT_CONFIG, $config->get('conf_name')));
+			$log->addReport(XCube_Utils::formatString(_AD_LEGACY_MESSAGE_INSERT_CONFIG, $config->get('conf_name')));
 		}
 		else {
-			$log->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_COULD_NOT_INSERT_CONFIG, $config->get('conf_name')));
+			$log->addError(XCube_Utils::formatString(_AD_LEGACY_ERROR_COULD_NOT_INSERT_CONFIG, $config->get('conf_name')));
 		}
 	}
 	
@@ -1034,10 +1034,10 @@ function updateBlockByInfo(&$info, &$module, &$log)
 			$blockArr[$idx]->set('template', $info->mTemplate);
 			
 			if ($handler->insert($blockArr[$idx])) {
-				$log->addReport(XCube_Utils::formatMessage('Update {0} block successfully.', $blockArr[$idx]->get('name')));
+				$log->addReport(XCube_Utils::formatString('Update {0} block successfully.', $blockArr[$idx]->get('name')));
 			}
 			else {
-				$log->addError(XCube_Utils::formatMessage('Could not update {0} block.', $blockArr[$idx]->get('name')));
+				$log->addError(XCube_Utils::formatString('Could not update {0} block.', $blockArr[$idx]->get('name')));
 			}
 			
 			Legacy_ModuleInstallUtils::clearBlockTemplateForUpdate($blockArr[$idx], $module, $log);
@@ -1110,10 +1110,10 @@ function updatePreferenceByInfo(&$info, &$module, &$log)
 		}
 
 		if ($handler->insertConfig($config)) {
-			$log->addReport(XCube_Utils::formatMessage("Preference '{0}' is updateded.", $config->get('conf_name')));
+			$log->addReport(XCube_Utils::formatString("Preference '{0}' is updateded.", $config->get('conf_name')));
 		}
 		else {
-			$log->addError(XCube_Utils::formatMessage("Could not update preference '{0}'.", $config->get('conf_name')));
+			$log->addError(XCube_Utils::formatString("Could not update preference '{0}'.", $config->get('conf_name')));
 		}
 	}
 
@@ -1138,7 +1138,7 @@ function updatePreferenceOrderByInfo(&$info, &$module, &$log)
 		$config->set('conf_order', $info->mOrder);
 
 		if (!$handler->insertConfig($config)) {
-			$log->addError(XCube_Utils::formatMessage("Could not update the order of preference '{0}'.", $config->get('conf_name')));
+			$log->addError(XCube_Utils::formatString("Could not update the order of preference '{0}'.", $config->get('conf_name')));
 		}
 	}
 	
@@ -1161,11 +1161,11 @@ function installBlockByInfo(&$info, &$module, &$log)
         $block->set('c_type', 1);
 
         if (!$handler->insert($block)) {
-            $log->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_COULD_NOT_INSTALL_BLOCK, $block->get('name')));
+            $log->addError(XCube_Utils::formatString(_AD_LEGACY_ERROR_COULD_NOT_INSTALL_BLOCK, $block->get('name')));
             return false;
         }
         else {
-            $log->addReport(XCube_Utils::formatMessage(_AD_LEGACY_MESSAGE_BLOCK_INSTALLED, $block->get('name')));
+            $log->addReport(XCube_Utils::formatString(_AD_LEGACY_MESSAGE_BLOCK_INSTALLED, $block->get('name')));
 
             Legacy_ModuleInstallUtils::installBlockTemplate($block, $module, $log);
 
@@ -1187,7 +1187,7 @@ function uninstallBlockByFuncNum($func_num, &$module, &$log)
 		$blockArr =& $handler->getObjects($criteria);
 		foreach (array_keys($blockArr) as $idx) {
 			if ($handler->delete($blockArr[$idx])) {
-				$log->addReport(XCube_Utils::formatMessage(_AD_LEGACY_MESSAGE_UNINSTALLATION_BLOCK_SUCCESSFUL, $blockArr[$idx]->get('name')));
+				$log->addReport(XCube_Utils::formatString(_AD_LEGACY_MESSAGE_UNINSTALLATION_BLOCK_SUCCESSFUL, $blockArr[$idx]->get('name')));
 			}
 			else {
 				// Uninstall fail
@@ -1253,10 +1253,10 @@ function uninstallPreferenceByOrder($order, &$module, &$log)
 		
 		foreach (array_keys($configArr) as $idx) {
 			if ($handler->deleteConfig($configArr[$idx])) {
-				$log->addReport(XCube_Utils::formatMessage("Delete preference '{0}'.", $configArr[$idx]->get('conf_name')));
+				$log->addReport(XCube_Utils::formatString("Delete preference '{0}'.", $configArr[$idx]->get('conf_name')));
 			}
 			else {
-				$log->addError(XCube_Utils::formatMessage("Could not delete preference '{0}'.", $configArr[$idx]->get('conf_name')));
+				$log->addError(XCube_Utils::formatString("Could not delete preference '{0}'.", $configArr[$idx]->get('conf_name')));
 			}
 		}
 	}
diff --git a/html/modules/legacy/admin/class/ModuleInstaller.class.php b/html/modules/legacy/admin/class/ModuleInstaller.class.php
index 98281a4e9..c3a777153 100644
--- a/html/modules/legacy/admin/class/ModuleInstaller.class.php
+++ b/html/modules/legacy/admin/class/ModuleInstaller.class.php
@@ -196,7 +196,7 @@ function _processScript()
             $funcName = 'xoops_module_install_' . $this->_mXoopsModule->get('dirname');
 			
 			if (!preg_match("/^[a-zA-Z_][a-zA-Z0-9_]*$/", $funcName)) {
-				$this->mLog->addError(XCUbe_Utils::formatMessage(_AD_LEGACY_ERROR_FAILED_TO_EXECUTE_CALLBACK, $funcName));
+				$this->mLog->addError(XCube_Utils::formatString(_AD_LEGACY_ERROR_FAILED_TO_EXECUTE_CALLBACK, $funcName));
 				return;
 			}
 			
@@ -206,7 +206,7 @@ function _processScript()
 
 				$result = $funcName($this->_mXoopsModule, new XCube_Ref($this->mLog));                	
 				if (!$result) {
-                    $this->mLog->addError(XCUbe_Utils::formatMessage(_AD_LEGACY_ERROR_FAILED_TO_EXECUTE_CALLBACK, $funcName));
+                    $this->mLog->addError(XCube_Utils::formatString(_AD_LEGACY_ERROR_FAILED_TO_EXECUTE_CALLBACK, $funcName));
                 }
             }
         }
@@ -215,10 +215,10 @@ function _processScript()
 	function _processReport()
 	{
 		if (!$this->mLog->hasError()) {
-			$this->mLog->add(XCube_Utils::formatMessage(_AD_LEGACY_MESSAGE_INSTALLATION_MODULE_SUCCESSFUL, $this->_mXoopsModule->get('name')));
+			$this->mLog->add(XCube_Utils::formatString(_AD_LEGACY_MESSAGE_INSTALLATION_MODULE_SUCCESSFUL, $this->_mXoopsModule->get('name')));
 		}
 		else {
-			$this->mLog->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_INSTALLATION_MODULE_FAILURE, $this->_mXoopsModule->get('name')));
+			$this->mLog->addError(XCube_Utils::formatString(_AD_LEGACY_ERROR_INSTALLATION_MODULE_FAILURE, $this->_mXoopsModule->get('name')));
 		}
 	}
 
diff --git a/html/modules/legacy/admin/class/ModuleUninstaller.class.php b/html/modules/legacy/admin/class/ModuleUninstaller.class.php
index 009ee1ff4..01004dc0b 100644
--- a/html/modules/legacy/admin/class/ModuleUninstaller.class.php
+++ b/html/modules/legacy/admin/class/ModuleUninstaller.class.php
@@ -116,10 +116,10 @@ function _uninstallTables()
 				$sql = "DROP TABLE " . $t_tableName;
 				
 				if ($db->query($sql)) {
-					$this->mLog->addReport(XCube_Utils::formatMessage(_AD_LEGACY_MESSAGE_DROP_TABLE, $t_tableName));
+					$this->mLog->addReport(XCube_Utils::formatString(_AD_LEGACY_MESSAGE_DROP_TABLE, $t_tableName));
 				}
 				else {
-					$this->mLog->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_DROP_TABLE, $t_tableName));
+					$this->mLog->addError(XCube_Utils::formatString(_AD_LEGACY_ERROR_DROP_TABLE, $t_tableName));
 				}
 			}
 		}
@@ -150,7 +150,7 @@ function _uninstallBlocks()
 		$tplHandler =& xoops_gethandler('tplfile');
 		$criteria =new Criteria('tpl_module', $this->_mXoopsModule->get('dirname'));
 		if(!$tplHandler->deleteAll($criteria)) {
-			$this->mLog->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_COULD_NOT_DELETE_BLOCK_TEMPLATES, $tplHandler->db->error()));
+			$this->mLog->addError(XCube_Utils::formatString(_AD_LEGACY_ERROR_COULD_NOT_DELETE_BLOCK_TEMPLATES, $tplHandler->db->error()));
 		}
 	}
 
@@ -169,13 +169,13 @@ function _processScript()
 			$funcName = 'xoops_module_uninstall_' . $this->_mXoopsModule->get('dirname');
 			
 			if (!preg_match("/^[a-zA-Z_][a-zA-Z0-9_]*$/", $funcName)) {
-				$this->mLog->addError(XCUbe_Utils::formatMessage(_AD_LEGACY_ERROR_FAILED_TO_EXECUTE_CALLBACK, $funcName));
+				$this->mLog->addError(XCube_Utils::formatString(_AD_LEGACY_ERROR_FAILED_TO_EXECUTE_CALLBACK, $funcName));
 				return;
 			}
 			
 			if (function_exists($funcName)) {
 				if (!call_user_func($funcName, $this->_mXoopsModule, new XCube_Ref($this->mLog))) {
-					$this->mLog->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_FAILED_TO_EXECUTE_CALLBACK, $funcName));
+					$this->mLog->addError(XCube_Utils::formatString(_AD_LEGACY_ERROR_FAILED_TO_EXECUTE_CALLBACK, $funcName));
 				}
 			}
 		}
@@ -184,10 +184,10 @@ function _processScript()
 	function _processReport()
 	{
 		if (!$this->mLog->hasError()) {
-			$this->mLog->add(XCube_Utils::formatMessage(_AD_LEGACY_MESSAGE_UNINSTALLATION_MODULE_SUCCESSFUL, $this->_mXoopsModule->get('name')));
+			$this->mLog->add(XCube_Utils::formatString(_AD_LEGACY_MESSAGE_UNINSTALLATION_MODULE_SUCCESSFUL, $this->_mXoopsModule->get('name')));
 		}
 		else {
-			$this->mLog->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_UNINSTALLATION_MODULE_FAILURE, $this->_mXoopsModule->get('name')));
+			$this->mLog->addError(XCube_Utils::formatString(_AD_LEGACY_ERROR_UNINSTALLATION_MODULE_FAILURE, $this->_mXoopsModule->get('name')));
 		}
 	}
 
diff --git a/html/modules/legacy/admin/class/ModuleUpdater.class.php b/html/modules/legacy/admin/class/ModuleUpdater.class.php
index b9f3cc47b..f98a00b01 100644
--- a/html/modules/legacy/admin/class/ModuleUpdater.class.php
+++ b/html/modules/legacy/admin/class/ModuleUpdater.class.php
@@ -284,10 +284,10 @@ function _processScript()
 	function _processReport()
 	{
 		if (!$this->mLog->hasError()) {
-			$this->mLog->add(XCube_Utils::formatMessage(_AD_LEGACY_MESSAGE_UPDATING_MODULE_SUCCESSFUL, $this->_mCurrentXoopsModule->get('name')));
+			$this->mLog->add(XCube_Utils::formatString(_AD_LEGACY_MESSAGE_UPDATING_MODULE_SUCCESSFUL, $this->_mCurrentXoopsModule->get('name')));
 		}
 		else {
-			$this->mLog->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_UPDATING_MODULE_FAILURE, $this->_mCurrentXoopsModule->get('name')));
+			$this->mLog->addError(XCube_Utils::formatString(_AD_LEGACY_ERROR_UPDATING_MODULE_FAILURE, $this->_mCurrentXoopsModule->get('name')));
 		}
 	}
 	
diff --git a/html/modules/legacy/admin/forms/BlockEditForm.class.php b/html/modules/legacy/admin/forms/BlockEditForm.class.php
index abcb12097..296af47e2 100644
--- a/html/modules/legacy/admin/forms/BlockEditForm.class.php
+++ b/html/modules/legacy/admin/forms/BlockEditForm.class.php
@@ -84,7 +84,7 @@ function validateBmodule()
 			foreach ($this->get('bmodule') as $mid) {
 				$module =& $handler->get($mid);
 				if ($mid != -1 && $mid != 0 && !is_object($module)) {
-					$this->addErrorMessage(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_OBJECTEXIST, _AD_LEGACY_LANG_BMODULE));
+					$this->addErrorMessage(XCube_Utils::formatString(_AD_LEGACY_ERROR_OBJECTEXIST, _AD_LEGACY_LANG_BMODULE));
 				}
 			}
 		}
diff --git a/html/modules/legacy/admin/forms/SmilesAdminEditForm.class.php b/html/modules/legacy/admin/forms/SmilesAdminEditForm.class.php
index 714dbb736..7651ba99a 100644
--- a/html/modules/legacy/admin/forms/SmilesAdminEditForm.class.php
+++ b/html/modules/legacy/admin/forms/SmilesAdminEditForm.class.php
@@ -62,7 +62,7 @@ function prepare()
 	function validateSmile_url()
 	{
 		if ($this->_mIsNew && $this->get('smile_url') == null) {
-			$this->addErrorMessage(XCube_Utils::formatMessage(_MD_LEGACY_ERROR_REQUIRED, _AD_LEGACY_LANG_SMILE_URL));
+			$this->addErrorMessage(XCube_Utils::formatString(_MD_LEGACY_ERROR_REQUIRED, _AD_LEGACY_LANG_SMILE_URL));
 		}
 	}
 
diff --git a/html/modules/legacy/forms/ImageUploadForm.class.php b/html/modules/legacy/forms/ImageUploadForm.class.php
index 9b2d584fc..460e9dff8 100644
--- a/html/modules/legacy/forms/ImageUploadForm.class.php
+++ b/html/modules/legacy/forms/ImageUploadForm.class.php
@@ -110,14 +110,14 @@ function validate()
 			// Imagefile width & height check.
 			//
 			if ($formFile->getWidth() > $category->get('imgcat_maxwidth') || $formFile->getHeight() > $category->get('imgcat_maxheight')) {
-				$this->addErrorMessage(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_IMG_SIZE, $category->get('imgcat_maxwidth'), $category->get('imgcat_maxheight')));
+				$this->addErrorMessage(XCube_Utils::formatString(_AD_LEGACY_ERROR_IMG_SIZE, $category->get('imgcat_maxwidth'), $category->get('imgcat_maxheight')));
 			}
 			
 			//
 			// Check file size
 			//
 			if ($formFile->getFilesize() > $category->get('imgcat_maxsize')) {
-				$this->addErrorMessage(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_IMG_FILESIZE, $category->get('imgcat_maxsize')));
+				$this->addErrorMessage(XCube_Utils::formatString(_AD_LEGACY_ERROR_IMG_FILESIZE, $category->get('imgcat_maxsize')));
 			}
 		}
 	}
diff --git a/html/modules/legacy/kernel/Legacy_Controller.class.php b/html/modules/legacy/kernel/Legacy_Controller.class.php
index 9fc089007..f5f51d082 100644
--- a/html/modules/legacy/kernel/Legacy_Controller.class.php
+++ b/html/modules/legacy/kernel/Legacy_Controller.class.php
@@ -1039,7 +1039,7 @@ function checkLogin()
 					}
 				}
 				
-				$this->executeRedirect($url, 1, XCube_Utils::formatMessage(_MD_LEGACY_MESSAGE_LOGIN_SUCCESS, $this->mRoot->mContext->mXoopsUser->get('uname')));
+				$this->executeRedirect($url, 1, XCube_Utils::formatString(_MD_LEGACY_MESSAGE_LOGIN_SUCCESS, $this->mRoot->mContext->mXoopsUser->get('uname')));
 			}
 			else {
 				XCube_DelegateUtils::call('Site.CheckLogin.Fail', new XCube_Ref($this->mRoot->mContext->mXoopsUser));
diff --git a/html/modules/legacy/preload/InstallerChecker.class.php b/html/modules/legacy/preload/InstallerChecker.class.php
index 2ca72abfc..6a4208f02 100644
--- a/html/modules/legacy/preload/InstallerChecker.class.php
+++ b/html/modules/legacy/preload/InstallerChecker.class.php
@@ -33,8 +33,8 @@ function preBlockFilter()
 			$xoopsTpl->assign(array('xoops_sitename' => htmlspecialchars($xoopsConfig['sitename']),
 									   'xoops_themecss' => xoops_getcss(),
 									   'xoops_imageurl' => XOOPS_THEME_URL . '/' . $xoopsConfig['theme_set'] . '/',
-									   'lang_message_confirm' => XCube_Utils::formatMessage(_MD_LEGACY_MESSAGE_INSTALL_COMPLETE_CONFIRM, XOOPS_ROOT_PATH . "/install"),
-                                       'lang_message_warning' => XCube_Utils::formatMessage(_MD_LEGACY_MESSAGE_INSTALL_COMPLETE_WARNING, XOOPS_ROOT_PATH . "/install")
+									   'lang_message_confirm' => XCube_Utils::formatString(_MD_LEGACY_MESSAGE_INSTALL_COMPLETE_CONFIRM, XOOPS_ROOT_PATH . "/install"),
+                                       'lang_message_warning' => XCube_Utils::formatString(_MD_LEGACY_MESSAGE_INSTALL_COMPLETE_WARNING, XOOPS_ROOT_PATH . "/install")
 									   ));
 									   
 			$xoopsTpl->compile_check = true;
diff --git a/html/modules/legacyRender/admin/actions/TplsetUploadAction.class.php b/html/modules/legacyRender/admin/actions/TplsetUploadAction.class.php
index 9a7eed1e6..1ba08d0dc 100644
--- a/html/modules/legacyRender/admin/actions/TplsetUploadAction.class.php
+++ b/html/modules/legacyRender/admin/actions/TplsetUploadAction.class.php
@@ -82,7 +82,7 @@ function execute(&$controller, &$xoopsUser)
 		
 		$handler =& xoops_getmodulehandler('tplset');
 		if ($handler->getCount(new Criteria('tplset_name', $tplsetName)) != 0) {
-			$this->_addErrorMessage(XCube_Utils::formatMessage(_AD_LEGACYRENDER_ERROR_TPLSET_ALREADY_EXISTS, $tplsetName));
+			$this->_addErrorMessage(XCube_Utils::formatString(_AD_LEGACYRENDER_ERROR_TPLSET_ALREADY_EXISTS, $tplsetName));
 			return LEGACYRENDER_FRAME_VIEW_ERROR;
 		}
 		
@@ -126,7 +126,7 @@ function _fetchTemplateFiles(&$tar, &$tplset, &$themeimages)
 				$tplfile->set('tpl_lastimported', time());
 				
 				if (!$handler->insert($tplfile)) {
-					$this->_addErrorMessage(XCube_Utils::formatMessage(_AD_LEGACYRENDER_ERROR_COULD_NOT_SAVE_TPLFILE, $tplfile->get('tpl_file')));
+					$this->_addErrorMessage(XCube_Utils::formatString(_AD_LEGACYRENDER_ERROR_COULD_NOT_SAVE_TPLFILE, $tplfile->get('tpl_file')));
 				}
 				unset($default);
 			}
@@ -148,7 +148,7 @@ function _fetchImageset(&$tar, &$tplset, &$themeimages)
 		$imgset->set('imgset_refid', 0);
 		
 		if (!$handler->insert($imgset)) {
-			$this->_addErrorMessage(XCube_Utils::formatMessage(_AD_LEGACYRENDER_ERROR_COULD_NOT_SAVE_IMAGESET, $tplset->get('tplset_name')));
+			$this->_addErrorMessage(XCube_Utils::formatString(_AD_LEGACYRENDER_ERROR_COULD_NOT_SAVE_IMAGESET, $tplset->get('tplset_name')));
 			return false;
 		}
 		
@@ -165,7 +165,7 @@ function _fetchImageset(&$tar, &$tplset, &$themeimages)
 				$image->set('imgsetimg_imgset', $imgset->get('imgset_id'));
 				$image->set('imgsetimg_body', $themeimages[$i]['content'], true);
 				if (!$handler->insert($image)) {
-					$this->_addErrorMessage(XCube_Utils::formatMessage(_AD_LEGACYRENDER_ERROR_COULD_NOT_SAVE_IMAGE_FILE, $image->get('imgsetimg_file')));
+					$this->_addErrorMessage(XCube_Utils::formatString(_AD_LEGACYRENDER_ERROR_COULD_NOT_SAVE_IMAGE_FILE, $image->get('imgsetimg_file')));
 				}
 				unset($image);
 			}
diff --git a/html/modules/legacyRender/admin/forms/BannerAdminEditForm.class.php b/html/modules/legacyRender/admin/forms/BannerAdminEditForm.class.php
index e2910abd9..1462a9afe 100644
--- a/html/modules/legacyRender/admin/forms/BannerAdminEditForm.class.php
+++ b/html/modules/legacyRender/admin/forms/BannerAdminEditForm.class.php
@@ -71,15 +71,15 @@ function validate()
 		//
 		if ($this->get('htmlbanner')) {
 			if (strlen($this->get('htmlcode')) == 0) {
-				$this->addErrorMessage(XCube_Utils::formatMessage(_AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_HTMLCODE));
+				$this->addErrorMessage(XCube_Utils::formatString(_AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_HTMLCODE));
 			}
 		}
 		else {
 			if (strlen($this->get('imageurl')) == 0) {
-				$this->addErrorMessage(XCube_Utils::formatMessage(_AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_IMAGEURL));
+				$this->addErrorMessage(XCube_Utils::formatString(_AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_IMAGEURL));
 			}
 			if (strlen($this->get('clickurl')) == 0) {
-				$this->addErrorMessage(XCube_Utils::formatMessage(_AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_CLICKURL));
+				$this->addErrorMessage(XCube_Utils::formatString(_AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_CLICKURL));
 			}
 		}
 	}
diff --git a/html/modules/legacyRender/admin/forms/BannerclientAdminEditForm.class.php b/html/modules/legacyRender/admin/forms/BannerclientAdminEditForm.class.php
index 269db4d9e..46a077293 100644
--- a/html/modules/legacyRender/admin/forms/BannerclientAdminEditForm.class.php
+++ b/html/modules/legacyRender/admin/forms/BannerclientAdminEditForm.class.php
@@ -81,7 +81,7 @@ function validateLogin()
 	function validatePasswd()
 	{
 		if (strlen($this->get('login')) > 0 && strlen($this->get('passwd')) == 0) {
-			$this->addErrorMessage(XCube_Utils::formatMessage(_AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_PASSWD));
+			$this->addErrorMessage(XCube_Utils::formatString(_AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_PASSWD));
 		}
 	}
 
diff --git a/html/modules/message/admin/class/myUpdater.class.php b/html/modules/message/admin/class/myUpdater.class.php
index 42bb17e1f..9ab2d6fbe 100644
--- a/html/modules/message/admin/class/myUpdater.class.php
+++ b/html/modules/message/admin/class/myUpdater.class.php
@@ -77,7 +77,7 @@ function update041()
     $scanner->setDB_PREFIX(XOOPS_DB_PREFIX);
     $scanner->setDirname($this->_mTargetXoopsModule->get('dirname'));
     if (!$scanner->loadFile($sqlfilepath)) {
-      $this->mLog->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_SQL_FILE_NOT_FOUND, $sqlfile));
+      $this->mLog->addError(XCube_Utils::formatString(_AD_LEGACY_ERROR_SQL_FILE_NOT_FOUND, $sqlfile));
       return false;
     }
   
diff --git a/html/modules/user/admin/actions/AvatarUploadAction.class.php b/html/modules/user/admin/actions/AvatarUploadAction.class.php
index 0bf744ba5..8c0a795c8 100644
--- a/html/modules/user/admin/actions/AvatarUploadAction.class.php
+++ b/html/modules/user/admin/actions/AvatarUploadAction.class.php
@@ -126,11 +126,11 @@ function _saveAvatarImages(&$avatarimages)
 				$save_file_name = uniqid( 'savt' ) . '.' . $ext ;
 				$filehandle = fopen( XOOPS_UPLOAD_PATH.'/'.$save_file_name , "w" ) ;
 				if( ! $filehandle ) {
-				$this->_addErrorMessage(XCube_Utils::formatMessage(_AD_USER_ERROR_COULD_NOT_SAVE_AVATAR_FILE, $file_name));
+				$this->_addErrorMessage(XCube_Utils::formatString(_AD_USER_ERROR_COULD_NOT_SAVE_AVATAR_FILE, $file_name));
 				continue ;
 				}
 				if ( !@fwrite($filehandle, $avatarimages[$i]['content']) ) {
-				$this->_addErrorMessage(XCube_Utils::formatMessage(_AD_USER_ERROR_COULD_NOT_SAVE_AVATAR_FILE, $file_name));
+				$this->_addErrorMessage(XCube_Utils::formatString(_AD_USER_ERROR_COULD_NOT_SAVE_AVATAR_FILE, $file_name));
 				@fclose( $filehandle ) ;
 				continue;				
 				};
@@ -145,7 +145,7 @@ function _saveAvatarImages(&$avatarimages)
 				$avatar->set('avatar_mimetype', $this->mAllowedExts[$ext]);
 
 				if (!$avatarhandler->insert($avatar)) {
-					$this->_addErrorMessage(XCube_Utils::formatMessage(_AD_USER_ERROR_COULD_NOT_SAVE_AVATAR_FILE, $file_name));
+					$this->_addErrorMessage(XCube_Utils::formatString(_AD_USER_ERROR_COULD_NOT_SAVE_AVATAR_FILE, $file_name));
 				}
 				unset($avatar);
 		}
diff --git a/html/modules/user/admin/forms/MailjobAdminEditForm.class.php b/html/modules/user/admin/forms/MailjobAdminEditForm.class.php
index 894a971a9..bc9e76002 100644
--- a/html/modules/user/admin/forms/MailjobAdminEditForm.class.php
+++ b/html/modules/user/admin/forms/MailjobAdminEditForm.class.php
@@ -61,7 +61,7 @@ function prepare()
 	function validateFrom_email()
 	{
 		if ($this->get('is_mail') && strlen($this->get('from_email')) == 0) {
-			$this->addErrorMessage(XCube_Utils::formatMessage(_MD_USER_ERROR_REQUIRED, _AD_USER_LANG_FROM_EMAIL));
+			$this->addErrorMessage(XCube_Utils::formatString(_MD_USER_ERROR_REQUIRED, _AD_USER_LANG_FROM_EMAIL));
 		}
 	}
 	
diff --git a/html/modules/user/admin/forms/UserAdminEditForm.class.php b/html/modules/user/admin/forms/UserAdminEditForm.class.php
index 0ee295113..7c6c8ead9 100644
--- a/html/modules/user/admin/forms/UserAdminEditForm.class.php
+++ b/html/modules/user/admin/forms/UserAdminEditForm.class.php
@@ -213,7 +213,7 @@ function validateUrl()
 		$t_url = $this->get('url');
 		if (strlen($t_url) > 0) {
 			if (!preg_match('/^https?(:\/\/[-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)$/', $t_url)) {
-				$this->addErrorMessage(XCube_Utils::formatMessage(_MD_USER_ERROR_INJURY, _MD_USER_LANG_URL));
+				$this->addErrorMessage(XCube_Utils::formatString(_MD_USER_ERROR_INJURY, _MD_USER_LANG_URL));
 			}
 		}
 	}
@@ -244,7 +244,7 @@ function validatePass()
 			}
 		}
 		elseif($this->_mIsNew) {
-				$this->addErrorMessage(XCube_Utils::formatMessage(_MD_USER_ERROR_REQUIRED, _MD_USER_LANG_PASS));
+				$this->addErrorMessage(XCube_Utils::formatString(_MD_USER_ERROR_REQUIRED, _MD_USER_LANG_PASS));
 		}
 	}
 	
@@ -257,10 +257,10 @@ function validateRank()
 			$rank =& $handler->get($t_rank);
 			
 			if (!is_object($rank)) {
-				$this->addErrorMessage(XCube_Utils::formatMessage(_MD_USER_ERROR_INJURY, _AD_USER_LANG_RANK));
+				$this->addErrorMessage(XCube_Utils::formatString(_MD_USER_ERROR_INJURY, _AD_USER_LANG_RANK));
 			}
 			elseif ($rank->get('rank_special') != 1) {
-				$this->addErrorMessage(XCube_Utils::formatMessage(_MD_USER_ERROR_INJURY, _AD_USER_LANG_RANK));
+				$this->addErrorMessage(XCube_Utils::formatString(_MD_USER_ERROR_INJURY, _AD_USER_LANG_RANK));
 			}
 		}
 	}
diff --git a/html/modules/user/forms/AbstractUserEditForm.class.php b/html/modules/user/forms/AbstractUserEditForm.class.php
index 07f14cff4..6b64cb751 100644
--- a/html/modules/user/forms/AbstractUserEditForm.class.php
+++ b/html/modules/user/forms/AbstractUserEditForm.class.php
@@ -100,7 +100,7 @@ function validateUrl()
 		$t_url = $this->get('url');
 		if (strlen($t_url) > 0) {
 			if (!preg_match('/^https?(:\/\/[-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)$/', $t_url)) {
-				$this->addErrorMessage(XCube_Utils::formatMessage(_MD_USER_ERROR_INJURY, _MD_USER_LANG_URL));
+				$this->addErrorMessage(XCube_Utils::formatString(_MD_USER_ERROR_INJURY, _MD_USER_LANG_URL));
 			}
 		}
 	}
@@ -109,7 +109,7 @@ function validatePass()
 	{
 		// precondition check
 		if (strlen($this->get('pass')) > 0 && !preg_match('/^[\x21-\x7e]+$/', $this->get('pass'))) {
-			$this->addErrorMessage(XCube_Utils::formatMessage(_MD_USER_ERROR_INJURY, _MD_USER_LANG_PASSWORD));
+			$this->addErrorMessage(XCube_Utils::formatString(_MD_USER_ERROR_INJURY, _MD_USER_LANG_PASSWORD));
 			$this->set('pass',null); // reset
 			$this->set('vpass',null);
 		}