Lang rewrite and move helpers

Author: poing

third_party/MX/Lang.php

@@ -1,4 +1,6 @@
 <?php (defined('BASEPATH')) OR exit('No direct script access allowed');
+error_reporting(-1);
+ini_set('display_errors', 1);
 /**
  * Modular Extensions Revamped - HMVC-RV
  *
@@ -34,17 +36,71 @@ class MX_Lang extends CI_Lang
 {
 	public function load($langfile, $lang = '', $return = FALSE, $add_suffix = TRUE, $alt_path = '', $_module = '')	
 	{
-		if (is_array($langfile)) 
+		/*if (is_array($langfile)) 
 		{
 			foreach($langfile as $_lang) $this->load($_lang);
 			return $this->language;
+		}*/
+		
+		if (is_array($langfile))
+		{
+			foreach ($langfile as $value)
+			{
+				$this->load($value, $idiom, $return, $add_suffix, $alt_path);
+			}
+
+			return;
+		}
+		
+        // Path Information
+        $elements = Modules::mx_element_pathinfo($langfile, 'lang');
+
+        // Tracking Name
+        $tracking = Modules::mx_element_track($elements);
+
+		//$deft_lang = CI::$APP->config->item('language');
+		//$idiom = ($lang == '') ? $deft_lang : $lang;
+
+		if (empty($idiom) OR ! preg_match('/^[a-z_-]+$/i', $idiom))
+		{
+			$config =& get_config();
+			$idiom = empty($config['language']) ? 'english' : $config['language'];
 		}
-			
-		$deft_lang = CI::$APP->config->item('language');
-		$idiom = ($lang == '') ? $deft_lang : $lang;
+
+
+		if ($return === FALSE && 
+		    isset($this->is_loaded[$tracking]) && 
+		    $this->is_loaded[$tracking] === $idiom)
+		{
+			return;
+		}
+
 
-		if (in_array($langfile.'_lang'.EXT, $this->is_loaded, TRUE))
-			return $this->language;
+		//if (in_array($tracking, $this->is_loaded, TRUE))
+		//	return $this->language;
+
+
+        // Load Languges
+        foreach (array_reverse(Modules::mx_module_paths()) as $path) {
+
+            // Full Path to File
+    $file = Modules::mx_element_path($path,'language/'.$idiom,$elements);
+    		//$basepath = BASEPATH.'language/'.$idiom.'/'.$langfile;
+    		//echo $file . "\r\n";
+
+				if (realpath($file)) {
+                    include(realpath($file));
+                    $found = TRUE;
+                   // break;
+
+                    //include_once(realpath($file));
+                    //continue;
+                   // $this->is_loaded[] = $tracking;
+				}        
+        }
+
+
+/*
 
 		$_module OR $_module = CI::$APP->router->fetch_module();
 		list($path, $_langfile) = Modules::find($langfile.'_lang', $_module, 'language/'.$idiom.'/');
@@ -60,11 +116,141 @@ public function load($langfile, $lang = '', $return = FALSE, $add_suffix = TRUE,
 			{
 				if ($return) return $lang;
 				$this->language = array_merge($this->language, $lang);
-				$this->is_loaded[] = $langfile.'_lang'.EXT;
+				$this->is_loaded[] = $tracking;
 				unset($lang);
 			}
 		}
 		
-		return $this->language;
+		$this->is_loaded[$tracking] = $idiom;
+		//$this->language = array_merge($this->language, $lang);
+
+		log_message('info', 'Language file loaded: language/'.$idiom.'/'.$langfile); */
+		if ($found !== TRUE)
+		{
+			show_error('Unable to load the requested language file: language/'.$idiom.'/'.$langfile);
+		}
+
+		if ( ! isset($lang) OR ! is_array($lang))
+		{
+			log_message('error', 'Language file contains no data: language/'.$idiom.'/'.$langfile);
+
+			if ($return === TRUE)
+			{
+				return array();
+			}
+			return;
+		}
+
+		if ($return === TRUE)
+		{
+			return $lang;
+		}
+
+		$this->is_loaded[$tracking] = $idiom;
+		$this->language = array_merge($this->language, $lang);
+
+        log_message(
+            'info', 
+            'Language file loaded: language/'.$idiom.'/'.$langfile
+        );
+		//print_r(get_instance()->load->get_package_paths(TRUE));
+		return TRUE;
+
+	}
+
+//
+//
+//
+
+	public function xload($langfile, $idiom = '', $return = FALSE, $add_suffix = TRUE, $alt_path = '')
+	{
+		if (is_array($langfile))
+		{
+			foreach ($langfile as $value)
+			{
+				$this->load($value, $idiom, $return, $add_suffix, $alt_path);
+			}
+
+			return;
+		}
+
+		$langfile = str_replace('.php', '', $langfile);
+
+		if ($add_suffix === TRUE)
+		{
+			$langfile = preg_replace('/_lang$/', '', $langfile).'_lang';
+		}
+
+		$langfile .= '.php';
+
+		if (empty($idiom) OR ! preg_match('/^[a-z_-]+$/i', $idiom))
+		{
+			$config =& get_config();
+			$idiom = empty($config['language']) ? 'english' : $config['language'];
+		}
+
+		if ($return === FALSE && isset($this->is_loaded[$langfile]) && $this->is_loaded[$langfile] === $idiom)
+		{
+			return;
+		}
+
+		// Load the base file, so any others found can override it
+		$basepath = BASEPATH.'language/'.$idiom.'/'.$langfile;
+		if (($found = file_exists($basepath)) === TRUE)
+		{
+			include($basepath);
+		}
+
+		// Do we have an alternative path to look in?
+		if ($alt_path !== '')
+		{
+			$alt_path .= 'language/'.$idiom.'/'.$langfile;
+			if (file_exists($alt_path))
+			{
+				include($alt_path);
+				$found = TRUE;
+			}
+		}
+		else
+		{
+			foreach (get_instance()->load->get_package_paths(TRUE) as $package_path)
+			{
+				$package_path .= 'language/'.$idiom.'/'.$langfile;
+				if ($basepath !== $package_path && file_exists($package_path))
+				{
+					include($package_path);
+					$found = TRUE;
+					break;
+				}
+			}
+		}
+
+		if ($found !== TRUE)
+		{
+			show_error('Unable to load the requested language file: language/'.$idiom.'/'.$langfile);
+		}
+
+		if ( ! isset($lang) OR ! is_array($lang))
+		{
+			log_message('error', 'Language file contains no data: language/'.$idiom.'/'.$langfile);
+
+			if ($return === TRUE)
+			{
+				return array();
+			}
+			return;
+		}
+
+		if ($return === TRUE)
+		{
+			return $lang;
+		}
+
+		$this->is_loaded[$langfile] = $idiom;
+		$this->language = array_merge($this->language, $lang);
+
+		log_message('info', 'Language file loaded: language/'.$idiom.'/'.$langfile);
+		return TRUE;
 	}
+
 }