Adding new class LangOperations. Simplifying lang stuff abit.

ListIt2.module.php

@@ -313,26 +313,9 @@ function Uninstall()
 
 	public function ModLang()
 	{	
-		global $CMS_VERSION;
+		$args = func_get_args();
 
-		if(version_compare($CMS_VERSION, '1.99-alpha0', '<')) {
-
-			$this->LoadLangMethods();
-
-			$args = func_get_args();
-			array_unshift($args,'');
-			$args[0] = &$this;
-
-			return call_user_func_array('cms_module_Lang', $args);	
-		}
-		else {
-
-			$args = func_get_args();
-			array_unshift($args,'');
-			$args[0] = $this->GetName();
-
-			return CmsLangOperations::lang_from_realm($args);
-		}
+		return ListIt2LangOperations::lang_from_realm(LISTIT2, $args);
 	}
 
 	public function ModProcessTemplate($tpl_name)

duplicate/024fc70d51074c9f42ee7f917c37b4ed

@@ -478,35 +478,7 @@ EOT;
 	#---------------------
 	# Manipulation methods
 	#--------------------- 	
-
-	public function ModLang()
-	{
-		$mod = cmsms()->GetModuleInstance(LISTIT2);
-		if(!is_object($mod)) 
-			throw new ListIt2Exception('Cannot retrive ListIt2 Object.');
-
-		global $CMS_VERSION;
-
-		if(version_compare($CMS_VERSION, '1.99-alpha0', '<')) {
-
-			$mod->LoadLangMethods();
-
-			$args = func_get_args();
-			array_unshift($args,'');
-			$args[0] = &$mod;
-
-			return call_user_func_array('cms_module_Lang', $args);	
-		}
-		else {
-
-			$args = func_get_args();
-			array_unshift($args,'');
-			$args[0] = $mod->GetName();
-
-			return CmsLangOperations::lang_from_realm($args);
-		}
-	}
-
+
 	public function GetParentPath()
 	{
 		$config = cmsms()->GetConfig();

lang/en_US.php

@@ -4,7 +4,12 @@
 */
 
 if(is_object($modinstance)){
-    $module_name = $modinstance->GetName();
+
+	$module_name = $modinstance->GetName();
+}
+else {
+
+	$module_name = LISTIT2;
 }
 /* -- end of do not edit ------------------------------------------------ */
 

lib/class.ListIt2FielddefBase.php

@@ -468,30 +468,9 @@ public final function GetModuleInstance($caller = false)
 
 	public final function ModLang()
 	{
-		$mod = $this->GetModuleInstance();
-		if(!is_object($mod)) 
-			throw new ListIt2Exception('Could not retrive module instance from originator!'); // <- Send own missing lang string instead of failure?
-		
-		global $CMS_VERSION;
-
-		if(version_compare($CMS_VERSION, '1.99-alpha0', '<')) {
+		$args = func_get_args();
 
-			$mod->LoadLangMethods();
-
-			$args = func_get_args();
-			array_unshift($args,'');
-			$args[0] = &$mod;
-
-			return call_user_func_array('cms_module_Lang', $args);	
-		}
-		else {
-
-			$args = func_get_args();
-			array_unshift($args,'');
-			$args[0] = $mod->GetName();
-
-			return CmsLangOperations::lang_from_realm($args);
-		}		
+		return ListIt2LangOperations::lang_from_realm($this->originator, $args);
 	}
 
 } // end of class

lib/class.ListIt2LangOperations.php

@@ -0,0 +1,67 @@
+<?php
+/**
+ *
+ * Copyright:
+ *
+ * IDT Media - Goran Ilic & Tapio Löytty
+ * Web: www.i-do-this.com
+ * Email: [email protected]
+ *
+ *
+ * Authors:
+ *
+ * Goran Ilic, <[email protected]>
+ * Web: www.ich-mach-das.at
+ * 
+ * Tapio Löytty, <[email protected]>
+ * Web: www.orange-media.fi
+ *
+ * License:
+ *-------------------------------------------------------------------------
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Or read it online: http://www.gnu.org/licenses/licenses.html#GPL
+ *
+ * ------------------------------------------------------------------------- */
+
+class ListIt2LangOperations 
+{
+	private function __construct() {}
+
+	static final public function lang_from_realm($originator, $args)
+	{
+		global $CMS_VERSION;
+
+		if(version_compare($CMS_VERSION, '1.99-alpha0', '<')) {
+
+			$mod = cmsms()->GetModuleInstance($originator);
+			if(!is_object($mod))
+				throw new ListIt2Exception('Could not retrive module instance from originator!');
+
+			$mod->LoadLangMethods();
+			array_unshift($args,'');
+			$args[0] = &$mod;
+
+			return call_user_func_array('cms_module_Lang', $args);	
+		}
+		else {
+
+			array_unshift($args,'');
+			$args[0] = $originator;
+
+			return CmsLangOperations::lang_from_realm($args);
+		}	
+	}
+
+} // end of class