[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[24646] trunk

[<sy...@us...>]

Revision: 24646
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=24646&view=rev
Author:   sylvieg
Date:     2010-01-25 17:19:36 +0000 (Mon, 25 Jan 2010)

Log Message:
-----------
[NEW]javascript: a new prefs to disable javascript to debug pb in fgal for instance

Modified Paths:
--------------
    trunk/lib/prefs/global.php
    trunk/lib/setup/js_detect.php
    trunk/lib/setup/prefs.php
    trunk/templates/tiki-admin-include-general.tpl

Modified: trunk/lib/prefs/global.php
===================================================================
--- trunk/lib/prefs/global.php	2010-01-25 16:31:47 UTC (rev 24645)
+++ trunk/lib/prefs/global.php	2010-01-25 17:19:36 UTC (rev 24646)
@@ -258,6 +258,11 @@
 			'type' => 'list',
 			'options' => feature_home_pages(),
 		),
+		'disableJavascript' => array(
+			'name' => tra('Disable javascript'),
+			'type' => 'flag',
+			'description' => tra('Disable javascript for testing purpose even if the browser allows it'),
+		),
 	);
 }
 

Modified: trunk/lib/setup/js_detect.php
===================================================================
--- trunk/lib/setup/js_detect.php	2010-01-25 16:31:47 UTC (rev 24645)
+++ trunk/lib/setup/js_detect.php	2010-01-25 17:19:36 UTC (rev 24646)
@@ -13,7 +13,9 @@
 //   (to be able to generate non-javascript code if there is no javascript, when noscript tag is not useful enough)
 //   It uses cookies instead of session vars to keep the correct value after a session timeout
 
-if ( isset($_COOKIE['javascript_enabled']) ) {
+if ($prefs['disableJavascript'] == 'y' ) {
+	$prefs['javascript_enabled'] = 'n';
+} elseif ( isset($_COOKIE['javascript_enabled']) ) {
 	// Update the pref with the cookie value
 	$prefs['javascript_enabled'] = $_COOKIE['javascript_enabled'];
 } else {
@@ -21,7 +23,7 @@
 	$prefs['javascript_enabled'] = 'n';
 }
 
-if ( $prefs['javascript_enabled'] != 'y' ) {
+if ( $prefs['javascript_enabled'] != 'y' && $prefs['disableJavascript'] != 'y' ) {
 	// Set the cookie to 'y', through javascript (will override the above cookie set to 'n' and sent by PHP / HTTP headers) - duration: approx. 1 year
 	$headerlib->add_js("var jsedate = new Date();\njsedate.setTime(" . ( 1000 * ( $tikilib->now + 365 * 24 * 3600 ) ) . ");\nsetCookieBrowser('javascript_enabled', 'y', null, jsedate);");
 
@@ -32,15 +34,16 @@
 	} elseif ( $_COOKIE['runs_before_js_detect'] > 0 ) {
 		$prefs['javascript_enabled'] = 'y';
 		setcookie( 'runs_before_js_detect', $_COOKIE['runs_before_js_detect'] - 1, ( 1000 * ( $tikilib->now + 365 * 24 * 3600 ) ) );
-     	} else {
-		// disable js dependant features
-		$prefs['feature_tabs'] = 'n';
-		$prefs['feature_jquery'] = 'n';
-		$prefs['feature_shadowbox'] = 'n';
-		$prefs['feature_wysiwyg'] = 'n';
-		$prefs['feature_ajax'] = 'n';
 	}
 }
+if ($prefs['javascript_enabled'] == 'n') {
+	// disable js dependant features
+	$prefs['feature_tabs'] = 'n';
+	$prefs['feature_jquery'] = 'n';
+	$prefs['feature_shadowbox'] = 'n';
+	$prefs['feature_wysiwyg'] = 'n';
+	$prefs['feature_ajax'] = 'n';
+}
 
 if ($prefs['javascript_enabled'] == 'y') {	// we have JavaScript
 

Modified: trunk/lib/setup/prefs.php
===================================================================
--- trunk/lib/setup/prefs.php	2010-01-25 16:31:47 UTC (rev 24645)
+++ trunk/lib/setup/prefs.php	2010-01-25 17:19:36 UTC (rev 24646)
@@ -1389,6 +1389,7 @@
 		'log_sql_perf_min' => '0.05',
 		'log_mail' => 'n',
 		'log_tpl' => 'n',
+		'disableJavascript' => 'n',
 
 		'case_patched' => 'n',
 		'site_closed' => 'n',

Modified: trunk/templates/tiki-admin-include-general.tpl
===================================================================
--- trunk/templates/tiki-admin-include-general.tpl	2010-01-25 16:31:47 UTC (rev 24645)
+++ trunk/templates/tiki-admin-include-general.tpl	2010-01-25 17:19:36 UTC (rev 24646)
@@ -98,6 +98,7 @@
 						{preference name=smarty_notice_reporting label="{tr}Include Smarty notices{/tr}"}
 					</div>
 				</div>
+				{preference name=disableJavascript}
 
 				{preference name=log_mail}
 				{preference name=log_sql}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.