From 05b76fefb290b442847ed2ac3e9eb61869392419 Mon Sep 17 00:00:00 2001
From: Flat <flatta@outlook.jp>
Date: Mon, 23 Nov 2015 18:40:36 +0900
Subject: [PATCH] Split duplicated functions into web/inc/i18n.php

---
 web/inc/i18n.php   | 47 +++++++++++++++++++++++++++++++++++++++++++
 web/inc/main.php   | 50 ++--------------------------------------------
 web/js/i18n.js.php | 42 +++-----------------------------------
 3 files changed, 52 insertions(+), 87 deletions(-)
 create mode 100644 web/inc/i18n.php

diff --git a/web/inc/i18n.php b/web/inc/i18n.php
new file mode 100644
index 000000000..5e4f71c19
--- /dev/null
+++ b/web/inc/i18n.php
@@ -0,0 +1,47 @@
+<?php
+// Functions for internationalization
+
+/**
+ * Translates string to given language in first parameter, key given in second parameter (dynamically loads required language). Works like spritf from second parameter
+ * @global array $LANG Associative array of language pharses
+ * @return string Translated string
+ */
+function _translate() {
+    global $LANG;
+
+    $args = func_get_args();
+    $l = $args[0];
+
+    if (!$l) return 'NO LANGUAGE DEFINED';
+    $key = $args[1];
+
+    if (!isset($LANG[$l])) {
+        require_once($_SERVER['DOCUMENT_ROOT'].'/inc/i18n/'.$l.'.php');
+    }
+
+    if (!isset($LANG[$l][$key])) {
+        $text=$key;
+    } else {
+        $text=$LANG[$l][$key];
+    }
+
+    array_shift($args);
+    if (count($args)>1) {
+        $args[0] = $text;
+        return call_user_func_array("sprintf",$args);
+    } else {
+        return $text;
+    }
+}
+
+/**
+ * Translates string by a given key in first parameter to current session language. Works like sprintf
+ * @global array $LANG Associative array of language pharses
+ * @return string Translated string
+ * @see _translate()
+ */
+function __() {
+    $args = func_get_args();
+    array_unshift($args,$_SESSION['language']);
+    return call_user_func_array("_translate",$args);
+}
diff --git a/web/inc/main.php b/web/inc/main.php
index 68fbe272a..91e380ff2 100644
--- a/web/inc/main.php
+++ b/web/inc/main.php
@@ -1,6 +1,8 @@
 <?php
 session_start();
 
+require_once($_SERVER['DOCUMENT_ROOT'].'/inc/i18n.php');
+
 // Check system settings
 if ((!isset($_SESSION['VERSION'])) && (!defined('NO_AUTH_REQUIRED'))) {
     session_destroy();
@@ -14,63 +16,15 @@ if ((!isset($_SESSION['user'])) && (!defined('NO_AUTH_REQUIRED'))) {
     $_SESSION['request_uri'] = $_SERVER['REQUEST_URI'];
     header("Location: /login/");
     exit;
-
 }
 
 if (isset($_SESSION['user'])) {
-    require_once($_SERVER['DOCUMENT_ROOT'].'/inc/i18n/'.$_SESSION['language'].'.php');
     if(!isset($_SESSION['token'])){
         $token = uniqid(mt_rand(), true);
         $_SESSION['token'] = $token;
     }
 }
 
-
-/**
- * Translates string by a given key in first parameter to current session language. Works like sprintf
- * @global array $LANG Associative array of language pharses
- * @return string Translated string
- * @see _translate()
- */
-function __() {
-   $args = func_get_args();
-   array_unshift($args,$_SESSION['language']);
-   return call_user_func_array("_translate",$args);
-}
-
-/**
- * Translates string to given language in first parameter, key given in second parameter (dynamically loads required language). Works like spritf from second parameter
- * @global array $LANG Associative array of language pharses
- * @return string Translated string
- */
-function _translate() {
-    global $LANG;
-
-    $args = func_get_args();
-    $l = $args[0];
-
-    if (!$l) return 'NO LANGUAGE DEFINED';
-    $key = $args[1];
-
-    if (!isset($LANG[$l])) {
-        require_once($_SERVER['DOCUMENT_ROOT'].'/inc/i18n/'.$l.'.php');
-    }
-
-    if (!isset($LANG[$l][$key])) {
-        $text=$key;
-    } else {
-        $text=$LANG[$l][$key];
-    }
-
-    array_shift($args);
-    if (count($args)>1) {
-        $args[0] = $text;
-        return call_user_func_array("sprintf",$args);
-    } else {
-        return $text;
-    }
-}
-
 define('VESTA_CMD', '/usr/bin/sudo /usr/local/vesta/bin/');
 
 $i = 0;
diff --git a/web/js/i18n.js.php b/web/js/i18n.js.php
index d84c95801..c3429d402 100644
--- a/web/js/i18n.js.php
+++ b/web/js/i18n.js.php
@@ -1,47 +1,11 @@
 <?php
 session_start();
+
+require_once($_SERVER['DOCUMENT_ROOT'].'/inc/i18n.php');
+
 if (empty($_SESSION['language'])) {
     $_SESSION['language'] = 'en';
 }
-require_once($_SERVER['DOCUMENT_ROOT'].'/inc/i18n/'.$_SESSION['language'].'.php');
-
-if (!function_exists('_translate')) {
-    function _translate() {
-        global $LANG;
-
-        $args = func_get_args();
-        $l = $args[0];
-
-        if (!$l) return 'NO LANGUAGE DEFINED';
-        $key = $args[1];
-
-        if (!isset($LANG[$l])) {
-            require_once($_SERVER['DOCUMENT_ROOT'].'/inc/i18n/'.$l.'.php');
-        }
-
-        if (!isset($LANG[$l][$key])) {
-            $text=$key;
-        } else {
-            $text=$LANG[$l][$key];
-        }
-
-        array_shift($args);
-        if (count($args)>1) {
-            $args[0] = $text;
-            return call_user_func_array("sprintf",$args);
-        } else {
-            return $text;
-        }
-    }
-}
-
-if (!function_exists('__')) {
-    function __() {
-        $args = func_get_args();
-        array_unshift($args,$_SESSION['language']);
-        return call_user_func_array("_translate",$args);
-    }
-}
 ?>
 
 App.i18n.ARE_YOU_SURE                           = '<?=__('Are you sure?')?>';