Relocate folders

the old "www/layout/<admin/frontend>/<template name>/..." layout is
deprecated.

new layout:

www/layout/<admin|frontend>/<cache/css/images/javascript>/
The layout/<admin/frontend> is symlinked to www/<admin|frontend>/layout

templates and lang are moved to includes
www/includes/template/<admin/frontend>
www/includes/lang/<admin/frontend>

and no longer symlinked to any public facing folders

The language po files have already been moved to
4dev/lang/<admin|frontend>/

www/configs/config.inc

@@ -82,8 +82,6 @@ DEFINE('TEMPLATES_FRONTEND', 'templates_frontend'.DS);
 DEFINE('USE_DEPRECATED_TEMPLATE_FOLDERS', false);
 // default template
 DEFINE('DEFAULT_TEMPLATE', 'default'.DS);
-// default template file
-DEFINE('DEFAULT_TEMPLATE_FILE', 'default.tpl');
 
 /************* HASH / ACL DEFAULT / ERROR SETTINGS / SMARTY *************/
 // default hash type

www/configs/config.php

@@ -10,7 +10,7 @@
 define('CONFIG_PATH', 'configs'.DIRECTORY_SEPARATOR);
 // config path prefix search, start with 0, got down each level __DIR__ has, if nothing found -> bail
 $CONFIG_PATH_PREFIX = '';
-for ($dir_pos = 0, $dir_max = count(explode('/', __DIR__)); $dir_pos <= $dir_max; $dir_pos ++) {
+for ($dir_pos = 0, $dir_max = count(explode(DIRECTORY_SEPARATOR, __DIR__)); $dir_pos <= $dir_max; $dir_pos ++) {
 	$CONFIG_PATH_PREFIX .= '..'.DIRECTORY_SEPARATOR;
 	if (file_exists($CONFIG_PATH_PREFIX.CONFIG_PATH.'config.inc')) {
 		require $CONFIG_PATH_PREFIX.CONFIG_PATH.'config.inc';
@@ -21,5 +21,12 @@ for ($dir_pos = 0, $dir_max = count(explode('/', __DIR__)); $dir_pos <= $dir_max
 if (!defined('DS')) {
 	exit('Base config unloadable');
 }
+// find trigger name "admin/" or "frontend/" in the getcwd() folder
+foreach (array ('admin', 'frontend') as $folder) {
+	if (strstr(getcwd(), DS.$folder)) {
+		define('CONTENT_PATH', $folder.DS);
+		break;
+	}
+}
 
 // __END__

www/frontend/.htaccess

@@ -0,0 +1,7 @@
+RewriteEngine on
+# not a file
+RewriteCond %{REQUEST_FILENAME}       !-f
+# not a directory
+RewriteCond %{REQUEST_FILENAME}       !-d
+# throw the whole path to the url as form parameter
+RewriteRule (.*)                      index.php?path=$1  [QSA,L]

www/frontend/config.php

@@ -0,0 +1 @@
+../configs/config.php

www/frontend/foo/config.php

@@ -0,0 +1 @@
+../../configs/config.php

www/frontend/foo/index.php

@@ -0,0 +1,3 @@
+<?php
+
+require 'config.php';

www/frontend/index.php

@@ -0,0 +1,3 @@
+<?php
+
+require 'config.php';

www/includes/admin_set_paths.inc

@@ -8,136 +8,240 @@
 *********************************************************************/
 
 // template path
-if ($_SESSION['TEMPLATE']) {
-	$TEMPLATE = $_SESSION['TEMPLATE'];
-} elseif ($LOCAL_TEMPLATE) {
-	$TEMPLATE = $LOCAL_TEMPLATE;
-} else {
-	$TEMPLATE = DEFAULT_TEMPLATE;
-}
-$TEMPLATE_DIR = $TEMPLATE;
-// master template
-if (!$MASTER_TEMPLATE_NAME) {
-	$MASTER_TEMPLATE_NAME = MASTER_TEMPLATE_NAME;
-}
-
-// just emergency fallback for language
-// set encoding
-if ($_SESSION['DEFAULT_CHARSET']) {
-	$encoding = $_SESSION['DEFAULT_CHARSET'];
-} elseif (!$encoding) {
-	$encoding = DEFAULT_ENCODING;
-}
-// just emergency fallback for language
-if ($_SESSION['DEFAULT_LANG']) {
-	$lang = $_SESSION['DEFAULT_LANG'];
-} elseif (!$lang) {
-	$lang = defined('SITE_LANG') ? SITE_LANG : DEFAULT_LANG;
-}
-// create the char lang encoding
-$lang_short = substr($lang, 0, 2);
-
-// set include & template names
-$CONTENT_INCLUDE = str_replace(".php", ".tpl", $cms->page_name);
-$FORM_NAME = !isset($FORM_NAME) || !$FORM_NAME ? str_replace(".php", "", $cms->page_name) : $FORM_NAME;
-// set local page title
-$L_TITLE = ucfirst(str_replace('_', ' ', $cms->getPageName(1))).' - '.$G_TITLE;
-// strip tpl and replace it with inc
-// php include file per page
-$cms->INC_TEMPLATE_NAME = str_replace(".tpl", ".inc", $CONTENT_INCLUDE);
-// javascript include per page
-$cms->JS_TEMPLATE_NAME = str_replace(".tpl", ".js", $CONTENT_INCLUDE);
-// css per page
-$cms->CSS_TEMPLATE_NAME = str_replace(".tpl", ".css", $CONTENT_INCLUDE);
-// special CSS file
-$cms->CSS_SPECIAL_TEMPLATE_NAME = @$CSS_NAME;
-// special JS file
-$cms->JS_SPECIAL_TEMPLATE_NAME = @$JS_NAME;
-
-// set basic template path (tmp)
-$cms->template_path = LAYOUT.$TEMPLATE_DIR.TEMPLATES;
-if ($smarty) {
-	$smarty->setTemplateDir($cms->template_path);
-}
-$cms->lang_dir = LAYOUT.$TEMPLATE_DIR.LANG; // no outside
-$cms->includes = BASE.INCLUDES; // no longer in templates, only global
-$cms->javascript = LAYOUT.$TEMPLATE_DIR.JS;
-$cms->css = LAYOUT.$TEMPLATE_DIR.CSS;
-$cms->pictures = LAYOUT.$TEMPLATE_DIR.IMAGES;
-$cms->cache_pictures = LAYOUT.$TEMPLATE_DIR.CACHE;
-$cms->cache_pictures_root = ROOT.$cms->cache_pictures;
-if (!is_dir($cms->cache_pictures_root)) {
-	mkdir($cms->cache_pictures_root);
-}
-$template_set = $TEMPLATE;
-
-// if we don't find the master template, set the template path back AND set the insert template as absolute path
-if (!file_exists(ROOT.$smarty->getTemplateDir()[0].DS.MASTER_TEMPLATE_NAME)) {
-	if (file_exists(ROOT.$smarty->getTemplateDir()[0].DS.$TEMPLATE_NAME)) {
-		$TEMPLATE_NAME = ROOT.$smarty->getTemplateDir()[0].DS.$TEMPLATE_NAME;
-	}
-	$smarty->setTemplateDir(LAYOUT.DEFAULT_TEMPLATE.TEMPLATES);
-	$template_set = DEFAULT_TEMPLATE;
-} elseif (!file_exists(ROOT.$smarty->getTemplateDir()[0].DS.$TEMPLATE_NAME)) {
-	// check if the template exists in the template path, if not, set path to to default
-	$smarty->setTemplateDir(LAYOUT.DEFAULT_TEMPLATE.TEMPLATES);
-	$template_set = DEFAULT_TEMPLATE;
-}
-// check if lang_dir folder exists in the template path, if not fall back to default
-if (!is_dir($cms->lang_dir)) {
-	$cms->lang_dir = LAYOUT.DEFAULT_TEMPLATE.LANG;
-}
-// check if the javascript folder exists in the template path, if not fall back to default
-if (!is_dir($cms->javascript)) {
-	$cms->javascript = LAYOUT.DEFAULT_TEMPLATE.JS;
-}
-// check if css folder exists in the template path, if not fall back to default
-if (!is_dir($cms->css)) {
-	$cms->css = LAYOUT.DEFAULT_TEMPLATE.CSS;
-}
-if (!is_dir($cms->pictures)) {
-	$cms->pictures = LAYOUT.DEFAULT_TEMPLATE.PICTURES;
-}
-if (!is_dir($cms->cache_pictures)) {
-	$cms->cache_pictures = LAYOUT.DEFAULT_TEMPLATE.CACHE;
-	$cms->cache_pictures_root = ROOT.$cms->cache_pictures;
-}
-
-// if the template_dir is != DEFAULT_TEMPLATE, then try to make a lang switch
-// if the default lang is not like the lang given, switch lang
-if (false === strstr(LAYOUT.DEFAULT_TEMPLATE.LANG, $cms->lang_dir) ||
-	strcasecmp(defined('SITE_LANG') ? SITE_LANG : DEFAULT_LANG, $lang)
-) {
-	$cms->debug('LANG', 'Orig: '.LAYOUT.DEFAULT_TEMPLATE.LANG.', New: '.$cms->lang_dir.' | Orig Lang: '.(defined('SITE_LANG') ? SITE_LANG : DEFAULT_LANG).', New Lang: '.$lang);
-	$cms->l->l10nReloadMOfile($lang, $cms->lang_dir);
-		// if we have login class
-	if ($login) {
-		$login->l->l10nReloadMOfile($lang, $cms->lang_dir);
-	}
-	// if we have smarty template class
-	if ($smarty) {
-		$smarty->l10n->l10nReloadMOfile($lang, $cms->lang_dir);
-	}
-}
-
-// javascrip translate data as template for auto translate
-if (!$TEMPLATE_TRANSLATE) {
-	$TEMPLATE_TRANSLATE = 'jsTranslate_'.$lang.'.tpl';
-	$cms->debug('LANG', 'Load lang: '.$lang.', for page file '.$TEMPLATE_TRANSLATE);
-} else {
-	// we assume we have some fixed set
-	// we must add _<$lang>
-	// if .tpl, put before .tpl
-	// if not .tpl, add _<$lang>.tpl
-	if (strpos($TEMPLATE_TRANSLATE, '.tpl')) {
-		$TEMPLATE_TRANSLATE = str_replace('.tpl', '_'.$lang.'.tpl', $TEMPLATE_TRANSLATE);
+if (USE_DEPRECATED_TEMPLATE_FOLDERS === true) {
+	if ($_SESSION['TEMPLATE']) {
+		$TEMPLATE = $_SESSION['TEMPLATE'];
+	} elseif ($LOCAL_TEMPLATE) {
+		$TEMPLATE = $LOCAL_TEMPLATE;
 	} else {
-		$TEMPLATE_TRANSLATE .= '_'.$lang.'.tpl';
+		$TEMPLATE = DEFAULT_TEMPLATE;
+	}
+	$TEMPLATE_DIR = $TEMPLATE;
+
+	// master template
+	if (!$MASTER_TEMPLATE_NAME) {
+		$MASTER_TEMPLATE_NAME = MASTER_TEMPLATE_NAME;
+	}
+
+	// just emergency fallback for language
+	// set encoding
+	if ($_SESSION['DEFAULT_CHARSET']) {
+		$encoding = $_SESSION['DEFAULT_CHARSET'];
+	} elseif (!$encoding) {
+		$encoding = DEFAULT_ENCODING;
+	}
+	// just emergency fallback for language
+	if ($_SESSION['DEFAULT_LANG']) {
+		$lang = $_SESSION['DEFAULT_LANG'];
+	} elseif (!$lang) {
+		$lang = defined('SITE_LANG') ? SITE_LANG : DEFAULT_LANG;
+	}
+	// create the char lang encoding
+	$lang_short = substr($lang, 0, 2);
+
+	// set include & template names
+	$CONTENT_INCLUDE = str_replace(".php", ".tpl", $cms->page_name);
+	$FORM_NAME = !isset($FORM_NAME) || !$FORM_NAME ? str_replace(".php", "", $cms->page_name) : $FORM_NAME;
+	// set local page title
+	$L_TITLE = ucfirst(str_replace('_', ' ', $cms->getPageName(1))).' - '.$G_TITLE;
+	// strip tpl and replace it with inc
+	// php include file per page
+	$cms->INC_TEMPLATE_NAME = str_replace(".tpl", ".inc", $CONTENT_INCLUDE);
+	// javascript include per page
+	$cms->JS_TEMPLATE_NAME = str_replace(".tpl", ".js", $CONTENT_INCLUDE);
+	// css per page
+	$cms->CSS_TEMPLATE_NAME = str_replace(".tpl", ".css", $CONTENT_INCLUDE);
+	// special CSS file
+	$cms->CSS_SPECIAL_TEMPLATE_NAME = @$CSS_NAME;
+	// special JS file
+	$cms->JS_SPECIAL_TEMPLATE_NAME = @$JS_NAME;
+
+	// set basic template path (tmp)
+	$cms->template_path = LAYOUT.$TEMPLATE_DIR.TEMPLATES;
+	if ($smarty) {
+		$smarty->setTemplateDir($cms->template_path);
+	}
+	$cms->lang_dir = LAYOUT.$TEMPLATE_DIR.LANG; // no outside
+	$cms->includes = BASE.INCLUDES; // no longer in templates, only global
+	$cms->javascript = LAYOUT.$TEMPLATE_DIR.JS;
+	$cms->css = LAYOUT.$TEMPLATE_DIR.CSS;
+	$cms->pictures = LAYOUT.$TEMPLATE_DIR.IMAGES;
+	$cms->cache_pictures = LAYOUT.$TEMPLATE_DIR.CACHE;
+	$cms->cache_pictures_root = ROOT.$cms->cache_pictures;
+	if (!is_dir($cms->cache_pictures_root)) {
+		mkdir($cms->cache_pictures_root);
+	}
+
+	// if we don't find the master template, set the template path back AND set the insert template as absolute path
+	if (!file_exists(ROOT.$smarty->getTemplateDir()[0].DS.MASTER_TEMPLATE_NAME)) {
+		if (file_exists(ROOT.$smarty->getTemplateDir()[0].DS.$TEMPLATE_NAME)) {
+			$TEMPLATE_NAME = ROOT.$smarty->getTemplateDir()[0].DS.$TEMPLATE_NAME;
+		}
+		$smarty->setTemplateDir(LAYOUT.DEFAULT_TEMPLATE.TEMPLATES);
+	} elseif (!file_exists(ROOT.$smarty->getTemplateDir()[0].DS.$TEMPLATE_NAME)) {
+		// check if the template exists in the template path, if not, set path to to default
+		$smarty->setTemplateDir(LAYOUT.DEFAULT_TEMPLATE.TEMPLATES);
+	}
+	// check if lang_dir folder exists in the template path, if not fall back to default
+	if (!is_dir($cms->lang_dir)) {
+		$cms->lang_dir = LAYOUT.DEFAULT_TEMPLATE.LANG;
+	}
+	// check if the javascript folder exists in the template path, if not fall back to default
+	if (!is_dir($cms->javascript)) {
+		$cms->javascript = LAYOUT.DEFAULT_TEMPLATE.JS;
+	}
+	// check if css folder exists in the template path, if not fall back to default
+	if (!is_dir($cms->css)) {
+		$cms->css = LAYOUT.DEFAULT_TEMPLATE.CSS;
+	}
+	if (!is_dir($cms->pictures)) {
+		$cms->pictures = LAYOUT.DEFAULT_TEMPLATE.PICTURES;
+	}
+	if (!is_dir($cms->cache_pictures)) {
+		$cms->cache_pictures = LAYOUT.DEFAULT_TEMPLATE.CACHE;
+		$cms->cache_pictures_root = ROOT.$cms->cache_pictures;
+	}
+
+	// if the template_dir is != DEFAULT_TEMPLATE, then try to make a lang switch
+	// if the default lang is not like the lang given, switch lang
+	if (false === strstr(LAYOUT.DEFAULT_TEMPLATE.LANG, $cms->lang_dir) ||
+		strcasecmp(defined('SITE_LANG') ? SITE_LANG : DEFAULT_LANG, $lang)
+	) {
+		$cms->debug('LANG', 'Orig: '.LAYOUT.DEFAULT_TEMPLATE.LANG.', New: '.$cms->lang_dir.' | Orig Lang: '.(defined('SITE_LANG') ? SITE_LANG : DEFAULT_LANG).', New Lang: '.$lang);
+		$cms->l->l10nReloadMOfile($lang, $cms->lang_dir);
+			// if we have login class
+		if ($login) {
+			$login->l->l10nReloadMOfile($lang, $cms->lang_dir);
+		}
+		// if we have smarty template class
+		if ($smarty) {
+			$smarty->l10n->l10nReloadMOfile($lang, $cms->lang_dir);
+		}
+	}
+
+	// javascrip translate data as template for auto translate
+	if (!$TEMPLATE_TRANSLATE) {
+		$TEMPLATE_TRANSLATE = 'jsTranslate_'.$lang.'.tpl';
+		$cms->debug('LANG', 'Load lang: '.$lang.', for page file '.$TEMPLATE_TRANSLATE);
+	} else {
+		// we assume we have some fixed set
+		// we must add _<$lang>
+		// if .tpl, put before .tpl
+		// if not .tpl, add _<$lang>.tpl
+		if (strpos($TEMPLATE_TRANSLATE, '.tpl')) {
+			$TEMPLATE_TRANSLATE = str_replace('.tpl', '_'.$lang.'.tpl', $TEMPLATE_TRANSLATE);
+		} else {
+			$TEMPLATE_TRANSLATE .= '_'.$lang.'.tpl';
+		}
+	}
+	// if we can't find it, dump it
+	if (!file_exists($smarty->getTemplateDir()[0].DS.$TEMPLATE_TRANSLATE)) {
+		unset($TEMPLATE_TRANSLATE);
+	}
+} else {
+	// master template
+	if (!isset($MASTER_TEMPLATE_NAME)) {
+		$MASTER_TEMPLATE_NAME = MASTER_TEMPLATE_NAME;
+	}
+
+	// just emergency fallback for language
+	// set encoding
+	if (isset($_SESSION['DEFAULT_CHARSET'])) {
+		$encoding = $_SESSION['DEFAULT_CHARSET'];
+	} elseif (!isset($encoding)) {
+		$encoding = DEFAULT_ENCODING;
+	}
+	// just emergency fallback for language
+	if (isset($_SESSION['DEFAULT_LANG'])) {
+		$lang = $_SESSION['DEFAULT_LANG'];
+	} elseif (!isset($lang)) {
+		$lang = defined('SITE_LANG') ? SITE_LANG : DEFAULT_LANG;
+	}
+	// create the char lang encoding
+	$lang_short = substr($lang, 0, 2);
+
+	// set include & template names
+	$CONTENT_INCLUDE = str_replace(".php", ".tpl", $cms->page_name);
+	$FORM_NAME = !isset($FORM_NAME) || !$FORM_NAME ? str_replace(".php", "", $cms->page_name) : $FORM_NAME;
+	// set local page title
+	$L_TITLE = ucfirst(str_replace('_', ' ', $cms->getPageName(1))).' - '.$G_TITLE;
+	// strip tpl and replace it with inc
+	// php include file per page
+	$cms->INC_TEMPLATE_NAME = str_replace(".tpl", ".inc", $CONTENT_INCLUDE);
+	// javascript include per page
+	$cms->JS_TEMPLATE_NAME = str_replace(".tpl", ".js", $CONTENT_INCLUDE);
+	// css per page
+	$cms->CSS_TEMPLATE_NAME = str_replace(".tpl", ".css", $CONTENT_INCLUDE);
+	// special CSS file
+	$cms->CSS_SPECIAL_TEMPLATE_NAME = $CSS_NAME;
+	// special JS file
+	$cms->JS_SPECIAL_TEMPLATE_NAME = $JS_NAME;
+
+	// set basic template path (tmp)
+	$cms->includes = BASE.INCLUDES; // no longer in templates, only global
+	$cms->template_path = BASE.INCLUDES.TEMPLATES.CONTENT_PATH;
+	if ($smarty) {
+		$smarty->setTemplateDir($cms->template_path);
+	}
+	if (isset($LANGUAGE_FOLDER)) {
+		$cms->kang_dir = $LANGUAGE_FOLDER;
+	} else {
+		$cms->lang_dir = BASE.INCLUDES.LANG.CONTENT_PATH; // no outside
+	}
+	$cms->javascript = LAYOUT.JS;
+	$cms->css = LAYOUT.CSS;
+	$cms->pictures = LAYOUT.IMAGES;
+	$cms->cache_pictures = LAYOUT.CACHE;
+	$cms->cache_pictures_root = ROOT.$cms->cache_pictures;
+	if (!is_dir($cms->cache_pictures_root)) {
+		mkdir($cms->cache_pictures_root);
+	}
+
+	// check if template names exist
+	if (!file_exists($smarty->getTemplateDir()[0].DS.$MASTER_TEMPLATE_NAME)) {
+		// abort if master template could not be found
+		exit('MASTER TEMPLATE: '.$MASTER_TEMPLATE_NAME.' could not be found');
+	}
+	if (isset($TEMPLATE_NAME) && !file_exists($smarty->getTemplateDir()[0].DS.$TEMPLATE_NAME)) {
+		exit('INCLUDE TEMPLATE: '.$TEMPLATE_NAME.' could not be found');
+	}
+
+	// if the lang folder is different to the default one
+	// if the default lang is not like the lang given, switch lang
+	if (false === strstr(BASE.INCLUDES.LANG.CONTENT_PATH, $cms->lang_dir) ||
+		strcasecmp(defined('SITE_LANG') ? SITE_LANG : DEFAULT_LANG, $lang)
+	) {
+		$cms->debug('LANG', 'Orig Lang: '.(defined('SITE_LANG') ? SITE_LANG : DEFAULT_LANG).', New Lang: '.$lang);
+		$cms->l->l10nReloadMOfile($lang, $cms->lang_dir);
+			// if we have login class
+		if ($login) {
+			$login->l->l10nReloadMOfile($lang, $cms->lang_dir);
+		}
+		// if we have smarty template class
+		if ($smarty) {
+			$smarty->l10n->l10nReloadMOfile($lang, $cms->lang_dir);
+		}
+	}
+
+	// javascrip translate data as template for auto translate
+	if (!$TEMPLATE_TRANSLATE) {
+		$TEMPLATE_TRANSLATE = 'jsTranslate_'.$lang.'.tpl';
+		$cms->debug('LANG', 'Load lang: '.$lang.', for page file '.$TEMPLATE_TRANSLATE);
+	} else {
+		// we assume we have some fixed set
+		// we must add _<$lang>
+		// if .tpl, put before .tpl
+		// if not .tpl, add _<$lang>.tpl
+		if (strpos($TEMPLATE_TRANSLATE, '.tpl')) {
+			$TEMPLATE_TRANSLATE = str_replace('.tpl', '_'.$lang.'.tpl', $TEMPLATE_TRANSLATE);
+		} else {
+			$TEMPLATE_TRANSLATE .= '_'.$lang.'.tpl';
+		}
+	}
+	// if we can't find it, dump it
+	if (!file_exists($smarty->getTemplateDir()[0].DS.$TEMPLATE_TRANSLATE)) {
+		unset($TEMPLATE_TRANSLATE);
 	}
-}
-// if we can't find it, dump it
-if (!file_exists($smarty->getTemplateDir()[0].DS.$TEMPLATE_TRANSLATE)) {
-	unset($TEMPLATE_TRANSLATE);
 }
 
 //	$cms->debug("LANGUAGE", "L: $lang | ".$cms->lang_dir." | MO File: ".$cms->l->mofile);

www/includes/templates/admin/smarty_test.tpl

@@ -6,9 +6,11 @@
 		{html_options options=$drop_down_test selected=$drop_down_test_selected}
 	</select>
 </div>
-<div id="jq-test" class="jp-test">
-	<div id="test-div" class="test-div">
-		Some content ehre or asdfasdfasf
+<div class="jq-container">
+	<div id="jq-test" class="jp-test">
+		<div id="test-div" class="test-div">
+			Some content ehre or asdfasdfasf
+		</div>
 	</div>
 </div>
 {* progresss indicator *}

www/layout/admin/css/smarty_test.css

@@ -1,13 +1,19 @@
 /* smart test CSS */
 
+.jq-container {
+	width: 100%;
+	margin: 0;
+	padding: 0;
+}
+
 .jp-test {
 	width: 100%;
-	margin: 20px;
+	padding: 20px;
 	box-sizing: border-box;
 }
 
 .test-div {
-	margin: 20px;
+	padding: 20px;
 }
 
 /* CORE overlay, progress elements */