@@ -39,27 +39,39 @@ discard block |
||
| 39 | 39 | switch ($req){
|
| 40 | 40 | case 'lang': |
| 41 | 41 | if($_SESSION['multilang']) {
|
| 42 | - if ($return) return $_SESSION['multilang']; |
|
| 42 | + if ($return) {
|
|
| 43 | + return $_SESSION['multilang']; |
|
| 44 | + } |
|
| 43 | 45 | echo $_SESSION['multilang']; |
| 44 | 46 | break; |
| 45 | 47 | } |
| 46 | - if ($return) return multilang::$lang; |
|
| 48 | + if ($return) {
|
|
| 49 | + return multilang::$lang; |
|
| 50 | + } |
|
| 47 | 51 | echo multilang::$lang; |
| 48 | 52 | break; |
| 49 | 53 | case 'dir&lang': |
| 50 | - if ($return) return multilang::get("dir", 1).multilang::get("lang",1).".php";
|
|
| 54 | + if ($return) {
|
|
| 55 | + return multilang::get("dir", 1).multilang::get("lang",1).".php";
|
|
| 56 | + } |
|
| 51 | 57 | echo multilang::get("dir",1).multilang::get("lang",1).".php";
|
| 52 | 58 | break; |
| 53 | 59 | case 'dir': |
| 54 | - if ($return) return multilang::$dir; |
|
| 60 | + if ($return) {
|
|
| 61 | + return multilang::$dir; |
|
| 62 | + } |
|
| 55 | 63 | echo multilang::$dir; |
| 56 | 64 | break; |
| 57 | 65 | case 'log': |
| 58 | - if ($return) return multilang::$log; |
|
| 66 | + if ($return) {
|
|
| 67 | + return multilang::$log; |
|
| 68 | + } |
|
| 59 | 69 | echo multilang::$log; |
| 60 | 70 | break; |
| 61 | 71 | case 'log_last': |
| 62 | - if ($return) return end(multilang::$log); |
|
| 72 | + if ($return) {
|
|
| 73 | + return end(multilang::$log); |
|
| 74 | + } |
|
| 63 | 75 | echo end(multilang::$log); |
| 64 | 76 | break; |
| 65 | 77 | } |
@@ -93,9 +105,15 @@ discard block |
||
| 93 | 105 | $langPHP_html = '<div class="multilang">'; |
| 94 | 106 | $openDir = opendir(multilang::get("dir", 1));
|
| 95 | 107 | while (($file = readdir($openDir)) != FALSE ) {
|
| 96 | - if ($file =='.' || $file == '..' || is_file($file) || substr($language, -4, 4) == '.php') continue; |
|
| 97 | - if ($returnType == "array") $langPHP_array[basename($file, ".php")] = $file; |
|
| 98 | - if ($returnType == "html") $langPHP_html .= sprintf(' <a href="?lang=%s" title="language %s">%s</a> ', basename($file, ".php"), $file, $file);
|
|
| 108 | + if ($file =='.' || $file == '..' || is_file($file) || substr($language, -4, 4) == '.php') {
|
|
| 109 | + continue; |
|
| 110 | + } |
|
| 111 | + if ($returnType == "array") {
|
|
| 112 | + $langPHP_array[basename($file, ".php")] = $file; |
|
| 113 | + } |
|
| 114 | + if ($returnType == "html") {
|
|
| 115 | + $langPHP_html .= sprintf(' <a href="?lang=%s" title="language %s">%s</a> ', basename($file, ".php"), $file, $file);
|
|
| 116 | + } |
|
| 99 | 117 | } |
| 100 | 118 | $langPHP_html .= '</div>'; |
| 101 | 119 | closedir($openDir); |
@@ -113,16 +131,18 @@ discard block |
||
| 113 | 131 | |
| 114 | 132 | public static function setup() {
|
| 115 | 133 | global $_GET, $_SESSION, $LANG; |
| 116 | - if (session_status() == PHP_SESSION_NONE) session_start(); |
|
| 134 | + if (session_status() == PHP_SESSION_NONE) {
|
|
| 135 | + session_start(); |
|
| 136 | + } |
|
| 117 | 137 | if ($_GET && $_GET['lang']) {
|
| 118 | 138 | if (multilang::ctrl($_GET['lang'])) {
|
| 119 | 139 | multilang::set("lang", $_GET['lang']);
|
| 120 | 140 | require_once(multilang::get("dir&lang", 1));
|
| 121 | 141 | multilang::set("log", sprintf("Language file loading (%s.php)", multilang::get("dir&lang", 1)));
|
| 122 | - }else {
|
|
| 142 | + } else {
|
|
| 123 | 143 | multilang::set("log", sprintf("Language file not found (%s.php)", multilang::$dir.$_GET['lang']));
|
| 124 | 144 | } |
| 125 | - }else {
|
|
| 145 | + } else {
|
|
| 126 | 146 | require_once(multilang::get("dir&lang", 1));
|
| 127 | 147 | multilang::set("log", sprintf("Language file loading (%s.php)", multilang::get("dir&lang", 1)));
|
| 128 | 148 | } |