From 83ac15e5829ae7a13bffcb5c24d990e37c41bf2b Mon Sep 17 00:00:00 2001
From: Max Pozdeev <maxpozdeev@gmail.com>
Date: Fri, 18 Sep 2020 23:02:45 +0300
Subject: [PATCH] Move langs to /content/lang/ folder

---
 buildzip.php                              | 4 ++--
 src/content/index.php                     | 2 ++
 src/{includes => content}/lang/.htaccess  | 0
 src/{includes => content}/lang/bg.json    | 0
 src/{includes => content}/lang/ca.json    | 0
 src/{includes => content}/lang/cns.json   | 0
 src/{includes => content}/lang/cz.json    | 0
 src/{includes => content}/lang/da.json    | 0
 src/{includes => content}/lang/de.json    | 0
 src/{includes => content}/lang/el.json    | 0
 src/{includes => content}/lang/en.json    | 0
 src/{includes => content}/lang/es-mx.json | 0
 src/{includes => content}/lang/es.json    | 0
 src/{includes => content}/lang/fa.json    | 0
 src/{includes => content}/lang/fr.json    | 0
 src/{includes => content}/lang/he.json    | 0
 src/{includes => content}/lang/hu.json    | 0
 src/{includes => content}/lang/it.json    | 0
 src/{includes => content}/lang/ja.json    | 0
 src/{includes => content}/lang/lt.json    | 0
 src/{includes => content}/lang/mk.json    | 0
 src/{includes => content}/lang/nl.json    | 0
 src/{includes => content}/lang/no.json    | 0
 src/{includes => content}/lang/pl.json    | 0
 src/{includes => content}/lang/pt-br.json | 0
 src/{includes => content}/lang/pt-pt.json | 0
 src/{includes => content}/lang/ro.json    | 0
 src/{includes => content}/lang/ru.json    | 0
 src/{includes => content}/lang/sk.json    | 0
 src/{includes => content}/lang/sl.json    | 0
 src/{includes => content}/lang/sr.json    | 0
 src/{includes => content}/lang/sv.json    | 0
 src/{includes => content}/lang/th.json    | 0
 src/{includes => content}/lang/tr.json    | 0
 src/{includes => content}/lang/uk.json    | 0
 src/{includes => content}/lang/vi.json    | 0
 src/{includes => content}/lang/zh-tw.json | 0
 src/includes/.htaccess                    | 1 +
 src/includes/class.lang.php               | 2 +-
 src/includes/jquery/index.html            | 1 -
 src/init.php                              | 4 +++-
 src/settings.php                          | 2 +-
 42 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 src/content/index.php
 rename src/{includes => content}/lang/.htaccess (100%)
 rename src/{includes => content}/lang/bg.json (100%)
 rename src/{includes => content}/lang/ca.json (100%)
 rename src/{includes => content}/lang/cns.json (100%)
 rename src/{includes => content}/lang/cz.json (100%)
 rename src/{includes => content}/lang/da.json (100%)
 rename src/{includes => content}/lang/de.json (100%)
 rename src/{includes => content}/lang/el.json (100%)
 rename src/{includes => content}/lang/en.json (100%)
 rename src/{includes => content}/lang/es-mx.json (100%)
 rename src/{includes => content}/lang/es.json (100%)
 rename src/{includes => content}/lang/fa.json (100%)
 rename src/{includes => content}/lang/fr.json (100%)
 rename src/{includes => content}/lang/he.json (100%)
 rename src/{includes => content}/lang/hu.json (100%)
 rename src/{includes => content}/lang/it.json (100%)
 rename src/{includes => content}/lang/ja.json (100%)
 rename src/{includes => content}/lang/lt.json (100%)
 rename src/{includes => content}/lang/mk.json (100%)
 rename src/{includes => content}/lang/nl.json (100%)
 rename src/{includes => content}/lang/no.json (100%)
 rename src/{includes => content}/lang/pl.json (100%)
 rename src/{includes => content}/lang/pt-br.json (100%)
 rename src/{includes => content}/lang/pt-pt.json (100%)
 rename src/{includes => content}/lang/ro.json (100%)
 rename src/{includes => content}/lang/ru.json (100%)
 rename src/{includes => content}/lang/sk.json (100%)
 rename src/{includes => content}/lang/sl.json (100%)
 rename src/{includes => content}/lang/sr.json (100%)
 rename src/{includes => content}/lang/sv.json (100%)
 rename src/{includes => content}/lang/th.json (100%)
 rename src/{includes => content}/lang/tr.json (100%)
 rename src/{includes => content}/lang/uk.json (100%)
 rename src/{includes => content}/lang/vi.json (100%)
 rename src/{includes => content}/lang/zh-tw.json (100%)
 create mode 100644 src/includes/.htaccess
 delete mode 100644 src/includes/jquery/index.html

diff --git a/buildzip.php b/buildzip.php
index 7e41af4..ac13a40 100755
--- a/buildzip.php
+++ b/buildzip.php
@@ -63,10 +63,10 @@ replaceVer('./init.php', $ver);
 unlink('./tmp/sessions/empty');
 
 # save only 2 languages
-$dh = opendir('./includes/lang/') or die("Cant opendir lang\n");
+$dh = opendir('./content/lang/') or die("Cant opendir lang\n");
 while (false !== ($f = readdir($dh))) {
 	if (!in_array($f, ['.', '..', '.htaccess', 'en.json', 'ru.json'])) {
-		unlink('./includes/lang/'. $f);
+		unlink('./content/lang/'. $f);
 	}
 }
 closedir($dh);
diff --git a/src/content/index.php b/src/content/index.php
new file mode 100644
index 0000000..a710241
--- /dev/null
+++ b/src/content/index.php
@@ -0,0 +1,2 @@
+<?php
+//empty
diff --git a/src/includes/lang/.htaccess b/src/content/lang/.htaccess
similarity index 100%
rename from src/includes/lang/.htaccess
rename to src/content/lang/.htaccess
diff --git a/src/includes/lang/bg.json b/src/content/lang/bg.json
similarity index 100%
rename from src/includes/lang/bg.json
rename to src/content/lang/bg.json
diff --git a/src/includes/lang/ca.json b/src/content/lang/ca.json
similarity index 100%
rename from src/includes/lang/ca.json
rename to src/content/lang/ca.json
diff --git a/src/includes/lang/cns.json b/src/content/lang/cns.json
similarity index 100%
rename from src/includes/lang/cns.json
rename to src/content/lang/cns.json
diff --git a/src/includes/lang/cz.json b/src/content/lang/cz.json
similarity index 100%
rename from src/includes/lang/cz.json
rename to src/content/lang/cz.json
diff --git a/src/includes/lang/da.json b/src/content/lang/da.json
similarity index 100%
rename from src/includes/lang/da.json
rename to src/content/lang/da.json
diff --git a/src/includes/lang/de.json b/src/content/lang/de.json
similarity index 100%
rename from src/includes/lang/de.json
rename to src/content/lang/de.json
diff --git a/src/includes/lang/el.json b/src/content/lang/el.json
similarity index 100%
rename from src/includes/lang/el.json
rename to src/content/lang/el.json
diff --git a/src/includes/lang/en.json b/src/content/lang/en.json
similarity index 100%
rename from src/includes/lang/en.json
rename to src/content/lang/en.json
diff --git a/src/includes/lang/es-mx.json b/src/content/lang/es-mx.json
similarity index 100%
rename from src/includes/lang/es-mx.json
rename to src/content/lang/es-mx.json
diff --git a/src/includes/lang/es.json b/src/content/lang/es.json
similarity index 100%
rename from src/includes/lang/es.json
rename to src/content/lang/es.json
diff --git a/src/includes/lang/fa.json b/src/content/lang/fa.json
similarity index 100%
rename from src/includes/lang/fa.json
rename to src/content/lang/fa.json
diff --git a/src/includes/lang/fr.json b/src/content/lang/fr.json
similarity index 100%
rename from src/includes/lang/fr.json
rename to src/content/lang/fr.json
diff --git a/src/includes/lang/he.json b/src/content/lang/he.json
similarity index 100%
rename from src/includes/lang/he.json
rename to src/content/lang/he.json
diff --git a/src/includes/lang/hu.json b/src/content/lang/hu.json
similarity index 100%
rename from src/includes/lang/hu.json
rename to src/content/lang/hu.json
diff --git a/src/includes/lang/it.json b/src/content/lang/it.json
similarity index 100%
rename from src/includes/lang/it.json
rename to src/content/lang/it.json
diff --git a/src/includes/lang/ja.json b/src/content/lang/ja.json
similarity index 100%
rename from src/includes/lang/ja.json
rename to src/content/lang/ja.json
diff --git a/src/includes/lang/lt.json b/src/content/lang/lt.json
similarity index 100%
rename from src/includes/lang/lt.json
rename to src/content/lang/lt.json
diff --git a/src/includes/lang/mk.json b/src/content/lang/mk.json
similarity index 100%
rename from src/includes/lang/mk.json
rename to src/content/lang/mk.json
diff --git a/src/includes/lang/nl.json b/src/content/lang/nl.json
similarity index 100%
rename from src/includes/lang/nl.json
rename to src/content/lang/nl.json
diff --git a/src/includes/lang/no.json b/src/content/lang/no.json
similarity index 100%
rename from src/includes/lang/no.json
rename to src/content/lang/no.json
diff --git a/src/includes/lang/pl.json b/src/content/lang/pl.json
similarity index 100%
rename from src/includes/lang/pl.json
rename to src/content/lang/pl.json
diff --git a/src/includes/lang/pt-br.json b/src/content/lang/pt-br.json
similarity index 100%
rename from src/includes/lang/pt-br.json
rename to src/content/lang/pt-br.json
diff --git a/src/includes/lang/pt-pt.json b/src/content/lang/pt-pt.json
similarity index 100%
rename from src/includes/lang/pt-pt.json
rename to src/content/lang/pt-pt.json
diff --git a/src/includes/lang/ro.json b/src/content/lang/ro.json
similarity index 100%
rename from src/includes/lang/ro.json
rename to src/content/lang/ro.json
diff --git a/src/includes/lang/ru.json b/src/content/lang/ru.json
similarity index 100%
rename from src/includes/lang/ru.json
rename to src/content/lang/ru.json
diff --git a/src/includes/lang/sk.json b/src/content/lang/sk.json
similarity index 100%
rename from src/includes/lang/sk.json
rename to src/content/lang/sk.json
diff --git a/src/includes/lang/sl.json b/src/content/lang/sl.json
similarity index 100%
rename from src/includes/lang/sl.json
rename to src/content/lang/sl.json
diff --git a/src/includes/lang/sr.json b/src/content/lang/sr.json
similarity index 100%
rename from src/includes/lang/sr.json
rename to src/content/lang/sr.json
diff --git a/src/includes/lang/sv.json b/src/content/lang/sv.json
similarity index 100%
rename from src/includes/lang/sv.json
rename to src/content/lang/sv.json
diff --git a/src/includes/lang/th.json b/src/content/lang/th.json
similarity index 100%
rename from src/includes/lang/th.json
rename to src/content/lang/th.json
diff --git a/src/includes/lang/tr.json b/src/content/lang/tr.json
similarity index 100%
rename from src/includes/lang/tr.json
rename to src/content/lang/tr.json
diff --git a/src/includes/lang/uk.json b/src/content/lang/uk.json
similarity index 100%
rename from src/includes/lang/uk.json
rename to src/content/lang/uk.json
diff --git a/src/includes/lang/vi.json b/src/content/lang/vi.json
similarity index 100%
rename from src/includes/lang/vi.json
rename to src/content/lang/vi.json
diff --git a/src/includes/lang/zh-tw.json b/src/content/lang/zh-tw.json
similarity index 100%
rename from src/includes/lang/zh-tw.json
rename to src/content/lang/zh-tw.json
diff --git a/src/includes/.htaccess b/src/includes/.htaccess
new file mode 100644
index 0000000..5a928f6
--- /dev/null
+++ b/src/includes/.htaccess
@@ -0,0 +1 @@
+Options -Indexes
diff --git a/src/includes/class.lang.php b/src/includes/class.lang.php
index 14132ef..950f8c8 100644
--- a/src/includes/class.lang.php
+++ b/src/includes/class.lang.php
@@ -9,7 +9,7 @@ class Lang
 	protected static $instance;
 	protected $code = 'en';
 	protected $default = 'en';
-	protected $langDir = MTTINC. 'lang/';
+	protected $langDir = MTTLANG;
 	protected $strings;
 	
 	public static function instance()
diff --git a/src/includes/jquery/index.html b/src/includes/jquery/index.html
deleted file mode 100644
index d1dd79d..0000000
--- a/src/includes/jquery/index.html
+++ /dev/null
@@ -1 +0,0 @@
-Place for jQuery UI
\ No newline at end of file
diff --git a/src/init.php b/src/init.php
index ac4d41a..066d10c 100644
--- a/src/init.php
+++ b/src/init.php
@@ -14,6 +14,8 @@ if (version_compare(PHP_VERSION, '5.4.0') < 0) {
 
 if(!defined('MTTPATH')) define('MTTPATH', dirname(__FILE__) .'/');
 if(!defined('MTTINC'))  define('MTTINC', MTTPATH. 'includes/');
+if(!defined('MTTCONTENT'))  define('MTTCONTENT', MTTPATH. 'content/');
+if(!defined('MTTLANG'))  define('MTTLANG', MTTCONTENT. 'lang/');
 
 require_once(MTTINC. 'common.php');
 require_once(MTTPATH. 'db/config.php');
@@ -54,7 +56,7 @@ else {
 $db->prefix = Config::get('prefix');
 
 //User can override language setting by cookies
-if(isset($_COOKIE['lang']) && preg_match("/^[a-z-]+$/i", $_COOKIE['lang']) && file_exists(MTTPATH. 'lang/'. $_COOKIE['lang']. '.php')) {
+if(isset($_COOKIE['lang']) && preg_match("/^[a-z-]+$/i", $_COOKIE['lang']) && file_exists(MTTLANG. $_COOKIE['lang']. '.php')) {
 	Config::set('lang', $_COOKIE['lang']);
 }
 
diff --git a/src/settings.php b/src/settings.php
index 6f1fc68..c83f02c 100644
--- a/src/settings.php
+++ b/src/settings.php
@@ -195,7 +195,7 @@ header('Content-type:text/html; charset=utf-8');
 	<select name="lang"><?php echo selectOptionsA(getLangs(), _c('lang')); ?></select> 
 	<?php if ($oldLangs) { ?>
 	<br><br>
-	<b>Notice!</b> You can use old language files after downloading in the new format and copying to the <i>/includes/lang/</i> folder.<br>
+	<b>Notice!</b> You can use old language files after downloading in the new format and copying to the <i>/content/lang/</i> folder.<br>
 	<select id="mtt_old_langs"><?php echo selectOptionsA( $oldLangs, _c('lang'), 'en'); ?></select> 
 	<a id="mtt_old_langs_link" href="<?php mttinfo('mtt_url')?>mytinytodo_lang.php?jsonfile">Download json file</a>
 	<script type="text/javascript">