[Tikiwiki-cvs] tiki setup_smarty.php, 1.38, 1.39 tiki-admin_include_general.php, 1.50, 1.51 tiki-setup.php, 1.378, 1.379 tiki-switch_theme.php, 1.3, 1.4 tiki-tc.php, 1.12, 1.13

[<mo...@us...>]

Update of /cvsroot/tikiwiki/tiki
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21327

Modified Files:
	setup_smarty.php tiki-admin_include_general.php tiki-setup.php 
	tiki-switch_theme.php tiki-tc.php 
Log Message:
[FIX] style: trying to rationalize styles setup

Index: setup_smarty.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/setup_smarty.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- setup_smarty.php	28 Dec 2006 23:41:27 -0000	1.38
+++ setup_smarty.php	31 Dec 2006 08:11:36 -0000	1.39
@@ -36,9 +36,9 @@
 	}
 
 	function _smarty_include($params) {
-		global $style, $style_base, $tikidomain;
+		global $style_base, $tikidomain;
 
-		if (isset($style) && isset($style_base)) {
+		if (isset($style_base)) {
 			if ($tikidomain and file_exists("templates/$tikidomain/styles/$style_base/".$params['smarty_include_tpl_file'])) {
 				$params['smarty_include_tpl_file'] = "$tikidomain/styles/$style_base/".$params['smarty_include_tpl_file'];
 			} elseif ($tikidomain and file_exists("templates/$tikidomain/".$params['smarty_include_tpl_file'])) {
@@ -51,9 +51,9 @@
 	}
 
 	function fetch($_smarty_tpl_file, $_smarty_cache_id = null, $_smarty_compile_id = null, $_smarty_display = false) {
-		global $language, $style, $style_base, $tikidomain;
+		global $language, $style_base, $tikidomain;
 
-		if (isset($style) && isset($style_base)) {
+		if (isset($style_base)) {
 			if ($tikidomain and file_exists("templates/$tikidomain/styles/$style_base/$_smarty_tpl_file")) {
 				$_smarty_tpl_file = "$tikidomain/styles/$style_base/$_smarty_tpl_file";
 			} elseif ($tikidomain and file_exists("templates/$tikidomain/$_smarty_tpl_file")) {

Index: tiki-admin_include_general.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_include_general.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- tiki-admin_include_general.php	22 Dec 2006 01:03:13 -0000	1.50
+++ tiki-admin_include_general.php	31 Dec 2006 08:11:36 -0000	1.51
@@ -14,8 +14,9 @@
 
 if (isset($_REQUEST["change_style"])) {
 	check_ticket('admin-inc-general');
-	byref_set_value("site_style", "style");
-	if ($style != $user_style) {
+	simple_set_value('style');
+	//byref_set_value("site_style", "style");
+	if ($site_style != $user_style) {
 		header('Location: tiki-admin.php?page=general');
 		die;
 	}
@@ -89,6 +90,7 @@
         "short_time_format",
         "siteTitle",
         "slide_style",
+        "style",
         "tikiIndex",
 	"https"
     );
@@ -98,7 +100,7 @@
     }
 
     // Set value(s) with alternate pref name
-    byref_set_value("site_style", "style");
+    //byref_set_value("site_style", "style");
 
     // Special handling for tied fields: tikiIndex, urlIndex and useUrlIndex
     if (!empty($_REQUEST["urlIndex"]) && isset($_REQUEST["useUrlIndex"]) && $_REQUEST["useUrlIndex"] == 'on') {

Index: tiki-setup.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-setup.php,v
retrieving revision 1.378
retrieving revision 1.379
diff -u -d -r1.378 -r1.379
--- tiki-setup.php	28 Dec 2006 20:11:41 -0000	1.378
+++ tiki-setup.php	31 Dec 2006 08:11:36 -0000	1.379
@@ -229,7 +229,7 @@
 global $elapsed_in_db;
 $num_queries=0;
 $elapsed_in_db=0.0;
-
+if(!isset($section)) $section = '';
 $tikifeedback = array();
 
 $feature_referer_highlight = 'n';
@@ -1227,13 +1227,8 @@
 	}
 }
 
-if (!empty($_SESSION['language']))
+if (!empty($_SESSION['language'])) {
 	$saveLanguage = $_SESSION['language']; // if register_globals is on variable and _SESSION are the same
-if (isset($_SESSION['style']))
-	$style = $_SESSION['style'];
-
-if (isset($_COOKIE['tiki-theme']) ) {
-	$style = $_COOKIE['tiki-theme'];
 }
 
 if ($error_reporting_level == 1) {
@@ -1367,20 +1362,6 @@
 $user_dbl = 'y';
 $diff_versions = 'n';
 
-$user_style = $site_style = $style;
-
-if( isset($_COOKIE['tiki-theme']) ) {
-	$user_style = $_COOKIE['tiki-theme'];
-}
-if (isset($_REQUEST['switchLang'])) {
-	if ($change_language != 'y'
-		|| !preg_match("/[a-zA-Z-_]*$/", $_REQUEST['switchLang'])
-		|| !file_exists('lang/'.$_REQUEST['switchLang'].'/language.php')
-		|| ($available_languages && !in_array($_REQUEST['switchLang'], unserialize($available_languages))) ) {
-			unset($_REQUEST['switchLang']);
-	}
-}
-
 if (isset($_REQUEST['switchLang'])) {
 	if ($change_language != 'y'
 		|| !preg_match("/[a-zA-Z-_]*$/", $_REQUEST['switchLang'])
@@ -1393,14 +1374,23 @@
 	}
 }
 
+$user_style = $site_style = $style;
+
+if (isset($_SESSION['style'])) {
+	$user_style = $_SESSION['style'];
+}
+
 if ($feature_userPreferences == 'y') {
 	if ($user) {
 		$user_dbl = $tikilib->get_user_preference($user, 'user_dbl', 'y');
 		$diff_versions = $tikilib->get_user_preference($user, 'diff_versions', 'n');
+		if (isset($_REQUEST['style'])) {
+			$site_style = $_REQUEST['style'];
+		}
 		if ($change_theme == 'y') {
 			$user_style = $tikilib->get_user_preference($user, 'theme', $style);
 			if ($user_style and (is_file("styles/$user_style") or is_file("styles/$tikidomain/$user_style"))) {
-				$style = $user_style;
+				$site_style = $user_style;
 			}
 		}
 		if ($change_language == 'y') {
@@ -1415,27 +1405,29 @@
 			}
 		}
 	} else {
-		$style = $user_style;
+		$site_style = $user_style;
 	}
 	$smarty->assign('language', $language);
 } else {
-	$style = $user_style;
+	$site_style = $user_style;
 }
 
-if (!is_file("styles/$style") and !is_file("styles/$tikidomain/$style")) {
-	$style = 'tikineat.css';
+if (!is_file("styles/$site_style") and !is_file("styles/$tikidomain/$site_style")) {
+	$site_style = 'tikineat.css';
 }
-if ($tikidomain and is_file("styles/$tikidomain/$style")) {
-	$style = "$tikidomain/$style";
+if ($tikidomain and is_file("styles/$tikidomain/$site_style")) {
+	$site_style = "$tikidomain/$site_style";
 }
-$smarty->assign('style', $style);
-$smarty->assign('site_style', $site_style);
-$smarty->assign('user_style', $user_style);
+
+$smarty->assign('style', $style);           // that is the pref
+$smarty->assign('site_style', $site_style); // that is the effective site style
+$smarty->assign('user_style', $user_style); // that is the user-chosen style
 include_once("csslib.php");
-$transition_style = $csslib->transition_css('styles/'.$style);
+$transition_style = $csslib->transition_css('styles/'.$site_style);
 $headerlib->add_cssfile('styles/transitions/'.$transition_style,50);
-$headerlib->add_cssfile('styles/'.$style,51);
-
+$headerlib->add_cssfile('styles/'.$site_style,51);
+$stlstl = split("-|\.", $site_style);
+$style_base = $stlstl[0];
 
 if (!$user) {
 	if (isset($_REQUEST['switchLang'])) {
@@ -1448,9 +1440,6 @@
 	}
 }
 
-$stlstl = split("-|\.", $style);
-$style_base = $stlstl[0];
-
 if ($lang_use_db != 'y') {
     // check if needed!!!
     global $lang;

Index: tiki-switch_theme.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-switch_theme.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- tiki-switch_theme.php	19 Sep 2004 19:36:25 -0000	1.3
+++ tiki-switch_theme.php	31 Dec 2006 08:11:36 -0000	1.4
@@ -12,10 +12,10 @@
 
 if (isset($_GET['theme'])){
 	$new_theme = $_GET['theme'];
-	if($feature_userPreferences == 'y' && $user && $change_theme == 'y') {  
+	if ($feature_userPreferences == 'y' && $user && $change_theme == 'y') {  
 		$tikilib->set_user_preference($user,'theme',$new_theme);
 	} else {
-		$a = setcookie('tiki-theme', $new_theme, time()+3600*24*30*12);
+		$_SESSION['style'] = $new_theme;
 	}
 }
 

Index: tiki-tc.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-tc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- tiki-tc.php	3 Dec 2006 14:59:55 -0000	1.12
+++ tiki-tc.php	31 Dec 2006 08:11:36 -0000	1.13
@@ -52,15 +52,17 @@
 										
 	if ($tc_theme) {
 		if ($tikidomain and is_file("styles/$tikidomain/$tc_theme")) {
-			$smarty->assign('style', "$tikidomain/$tc_theme");
-			$headerlib->drop_cssfile('styles/'.$tikidomain.'/'.$style);
+			$smarty->assign('site_style', "$tikidomain/$tc_theme");
+			$headerlib->drop_cssfile('styles/'.$tikidomain.'/'.$site_style);
 			$headerlib->add_cssfile('styles/'.$tikidomain.'/'.$tc_theme,50);
 		} else {
-			$smarty->assign('style', $style);
-			$headerlib->drop_cssfile('styles/'.$style);
+			$smarty->assign('style', $site_style);
+			$headerlib->drop_cssfile('styles/'.$site_style);
 			$headerlib->add_cssfile('styles/'.$tc_theme,50);
 		}
-		$smarty->assign('style_base', strtok($tc_theme,'.'));
+		$stlstl = split("-|\.",$tc_theme);
+		$style_base = $stlstl[0];
+		$smarty->assign('style_base', $style_base);
 	}
 }