From: <ny...@us...> - 2008-07-23 20:11:13
|
Revision: 13854 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=13854&view=rev Author: nyloth Date: 2008-07-23 20:11:18 +0000 (Wed, 23 Jul 2008) Log Message: ----------- [SEC] backport 'smarty security' fixes from trunk to avoid this feature to break tiki. Modified Paths: -------------- branches/2.0/messu-archive.php branches/2.0/messu-mailbox.php branches/2.0/messu-sent.php branches/2.0/setup_fckeditor.php branches/2.0/setup_smarty.php branches/2.0/templates/footer.tpl branches/2.0/templates/header.tpl branches/2.0/templates/styles/darkroom/header.tpl branches/2.0/templates/styles/feb12/header.tpl branches/2.0/templates/styles/simple/header.tpl branches/2.0/templates/styles/thenews/header.tpl branches/2.0/templates/styles/tikinewt/header.tpl branches/2.0/templates/tiki-admin-include-login.tpl branches/2.0/templates/tiki-user_cssmenu.tpl branches/2.0/templates/tracker_item_field_value.tpl branches/2.0/tiki-admin_include_login.php branches/2.0/tiki-setup.php Added Paths: ----------- branches/2.0/lib/setup/phplayers.php branches/2.0/lib/smarty_tiki/compiler.assign.php branches/2.0/lib/smarty_tiki/modifier.explode.php Added: branches/2.0/lib/setup/phplayers.php =================================================================== --- branches/2.0/lib/setup/phplayers.php (rev 0) +++ branches/2.0/lib/setup/phplayers.php 2008-07-23 20:11:18 UTC (rev 13854) @@ -0,0 +1,31 @@ +<?php + +// Copyright (c) 2002-2007, Luis Argerich, Garland Foster, Eduardo Polidor, et. al. +// All Rights Reserved. See copyright.txt for details and a complete list of authors. +// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for +// details. + +//this script may only be included - so its better to die if called directly. +$access->check_script($_SERVER["SCRIPT_NAME"],basename(__FILE__)); + +$phplayers_headers = <<<EOS +<link rel="StyleSheet" href="lib/phplayers/layerstreemenu.css" type="text/css" /> +<link rel="StyleSheet" href="lib/phplayers/layerstreemenu-hidden.css" type="text/css" /> +<script type="text/javascript"> +<!--//--><![CDATA[//><!-- +var numl;var toBeHidden; +EOS; + +$phplayers_headers .= file_get_contents('lib/phplayers/libjs/layersmenu-browser_detection.js'); + +$phplayers_headers .= <<<EOS +//--><!]]> +</script> +<script type="text/javascript" src="lib/phplayers/libjs/layersmenu-library.js"></script> +<script type="text/javascript" src="lib/phplayers/libjs/layersmenu.js"></script> +<script type="text/javascript" src="lib/phplayers/libjs/layerstreemenu-cookies.js"></script> +EOS; + +global $LayersMenu, $TreeMenu, $PHPTreeMenu, $PlainMenu; +$smarty->assign_by_ref('phplayers_LayersMenu', $LayersMenu); +$smarty->assign('phplayers_headers', $phplayers_headers); Added: branches/2.0/lib/smarty_tiki/compiler.assign.php =================================================================== --- branches/2.0/lib/smarty_tiki/compiler.assign.php (rev 0) +++ branches/2.0/lib/smarty_tiki/compiler.assign.php 2008-07-23 20:11:18 UTC (rev 13854) @@ -0,0 +1,50 @@ +<?php +/** + * Smarty plugin + * @package Smarty + * @subpackage plugins + */ + +/** + * Smarty {assign} compiler function plugin + * + * Type: compiler function<br> + * Name: assign<br> + * Purpose: assign a value to a template variable + * @link http://smarty.php.net/manual/en/language.custom.functions.php#LANGUAGE.FUNCTION.ASSIGN {assign} + * (Smarty online manual) + * @author Monte Ohrt <monte at ohrt dot com> (initial author) + * @author messju mohr <messju at lammfellpuschen dot de> (conversion to compiler function) + * @param string containing var-attribute and value-attribute + * @param Smarty_Compiler + */ +function smarty_compiler_assign($tag_attrs, &$compiler) { + + $_params = $compiler->_parse_attrs($tag_attrs); + + if (!isset($_params['var'])) { + $compiler->_syntax_error("assign: missing 'var' parameter", E_USER_WARNING); + return; + } + + if (!isset($_params['value'])) { + $compiler->_syntax_error("assign: missing 'value' parameter", E_USER_WARNING); + return; + } + + // Handle assign value in array + // It transforms the string 'myarray.foo.bar' (the string includes the quotes) into array('myarray', 'foo', 'bar') + // Example: {assign var='myarray.foo.bar' value='example'} + // will put the 'example' value into $myarray['foo']['bar'] + // and will be simply available in smarty as $myarray.foo.bar + // + if ( strpos($_params['var'], '.') !== false ) { + return "\$this->_tpl_vars[".str_replace('.', "']['", $_params['var'])."] = {$_params['value']};"; + } + + return "\$this->assign({$_params['var']}, {$_params['value']});"; +} + +/* vim: set expandtab: */ + +?> Added: branches/2.0/lib/smarty_tiki/modifier.explode.php =================================================================== --- branches/2.0/lib/smarty_tiki/modifier.explode.php (rev 0) +++ branches/2.0/lib/smarty_tiki/modifier.explode.php 2008-07-23 20:11:18 UTC (rev 13854) @@ -0,0 +1,13 @@ +<?php + +//this script may only be included - so its better to die if called directly. +if (strpos($_SERVER["SCRIPT_NAME"],basename(__FILE__)) !== false) { + header("location: index.php"); + exit; +} + +function smarty_modifier_explode($delimiter, $string, $limit = null) { + return explode($delimiter, $string, $limit); +} + +?> Modified: branches/2.0/messu-archive.php =================================================================== --- branches/2.0/messu-archive.php 2008-07-23 19:02:35 UTC (rev 13853) +++ branches/2.0/messu-archive.php 2008-07-23 20:11:18 UTC (rev 13854) @@ -63,9 +63,8 @@ } $smarty->assign_by_ref('items', $items); - header("Content-type: application/download "); - header("Content-Disposition: attachment; filename=tiki-msg-archive-".time("U").".txt "); - $smarty->display("messu-download.tpl"); + header("Content-Disposition: attachment; filename=tiki-msg-archive-".time("U").".txt "); + $smarty->display('messu-download.tpl', null, null, 'application/download'); die; } Modified: branches/2.0/messu-mailbox.php =================================================================== --- branches/2.0/messu-mailbox.php 2008-07-23 19:02:35 UTC (rev 13853) +++ branches/2.0/messu-mailbox.php 2008-07-23 20:11:18 UTC (rev 13854) @@ -102,9 +102,8 @@ } $smarty->assign_by_ref('items', $items); - header("Content-type: application/download "); - header("Content-Disposition: attachment; filename=tiki-msg-mailbox-".time("U").".txt "); - $smarty->display("messu-download.tpl"); + header("Content-Disposition: attachment; filename=tiki-msg-mailbox-".time("U").".txt "); + $smarty->display('messu-download.tpl', null, null, 'application/download'); die; } Modified: branches/2.0/messu-sent.php =================================================================== --- branches/2.0/messu-sent.php 2008-07-23 19:02:35 UTC (rev 13853) +++ branches/2.0/messu-sent.php 2008-07-23 20:11:18 UTC (rev 13854) @@ -78,9 +78,8 @@ } $smarty->assign_by_ref('items', $items); - header("Content-type: application/download "); - header("Content-Disposition: attachment; filename=tiki-msg-sent-".time("U").".txt "); - $smarty->display("messu-download.tpl"); + header("Content-Disposition: attachment; filename=tiki-msg-sent-".time("U").".txt "); + $smarty->display('messu-download.tpl', null, null, 'application/download'); die; } Modified: branches/2.0/setup_fckeditor.php =================================================================== --- branches/2.0/setup_fckeditor.php 2008-07-23 19:02:35 UTC (rev 13853) +++ branches/2.0/setup_fckeditor.php 2008-07-23 20:11:18 UTC (rev 13854) @@ -4,10 +4,8 @@ // -> IE apparently doesn't handle gzip compression on javascript files // (this is why FCKeditor doesn't find the "Tiki" toolbar defined here when compression is activated) $force_no_compression = true; -include 'tiki-setup.php'; +include('tiki-setup.php'); -header('Content-type: application/javascript'); - $fckstyle = 'styles/'.$prefs['style']; $smarty->assign('fckstyle',$fckstyle); @@ -26,5 +24,5 @@ } $smarty->assign('toolbar',$toolbar); -$smarty->display('setup_fckeditor.tpl'); +$smarty->display('setup_fckeditor.tpl', null, null, 'application/javascript'); ?> Modified: branches/2.0/setup_smarty.php =================================================================== --- branches/2.0/setup_smarty.php 2008-07-23 19:02:35 UTC (rev 13853) +++ branches/2.0/setup_smarty.php 2008-07-23 20:11:18 UTC (rev 13854) @@ -180,7 +180,16 @@ $_smarty_compile_id = $prefs['language'] . $_smarty_compile_id; return parent::clear_cache($_smarty_tpl_file, $_smarty_cache_id, $_smarty_compile_id, $_smarty_exp_time); } - function display($resource_name, $cache_id=null, $compile_id = null) { + function display($resource_name, $cache_id=null, $compile_id = null, $content_type = 'text/html; charset=utf-8') { + // + // By default, display is used with text/html content in UTF-8 encoding + // If you want to output other data from smarty, + // - either use fetch() / fetchLang() + // - or set $content_type to '' (empty string) or another content type. + // + if ( $content_type != '' && ! headers_sent() ) { + header('Content-Type: '.$content_type); + } return parent::display($resource_name, $cache_id, $compile_id); } // Returns the file name associated to the template name Modified: branches/2.0/templates/footer.tpl =================================================================== --- branches/2.0/templates/footer.tpl 2008-07-23 19:02:35 UTC (rev 13853) +++ branches/2.0/templates/footer.tpl 2008-07-23 20:11:18 UTC (rev 13854) @@ -14,8 +14,9 @@ {include file="tiki-debug_console.tpl"} {/if} -{if $prefs.feature_phplayers eq 'y'} -{php}global $LayersMenu; if (isset($LayersMenu)) {$LayersMenu->printHeader();$LayersMenu->printFooter();}{/php} +{if $prefs.feature_phplayers eq 'y' and isset($phplayers_LayersMenu)} + {$phplayers_LayersMenu->printHeader()} + {$phplayers_LayersMenu->printFooter()} {/if} {if $lastup} Modified: branches/2.0/templates/header.tpl =================================================================== --- branches/2.0/templates/header.tpl 2008-07-23 19:02:35 UTC (rev 13853) +++ branches/2.0/templates/header.tpl 2008-07-23 20:11:18 UTC (rev 13854) @@ -1,4 +1,4 @@ -{php}header('Content-Type: text/html; charset=utf-8');{/php}{* --- IMPORTANT: If you edit this (or any other TPL file) file via the Tiki built-in TPL editor (tiki-edit_templates.php), all the javascript will be stripped. This will cause problems. (Ex.: menus stop collapsing/expanding). +{* --- IMPORTANT: If you edit this (or any other TPL file) file via the Tiki built-in TPL editor (tiki-edit_templates.php), all the javascript will be stripped. This will cause problems. (Ex.: menus stop collapsing/expanding). You should only modify header.tpl via a text editor through console, or ssh, or FTP edit commands. And only if you know what you are doing ;-) @@ -55,21 +55,7 @@ <!--[if lt IE 7]> <link rel="StyleSheet" href="css/ie6.css" type="text/css" /> <![endif]--> {* --- phplayers block --- *} -{if $prefs.feature_phplayers eq 'y'} -<link rel="StyleSheet" href="lib/phplayers/layerstreemenu.css" type="text/css"></link> -<link rel="StyleSheet" href="lib/phplayers/layerstreemenu-hidden.css" type="text/css" /> -<script type="text/javascript"> -<!--//--><![CDATA[//><!-- -var numl;var toBeHidden; -{php} include_once ("lib/phplayers/libjs/layersmenu-browser_detection.js"); global $LayersMenu, $TreeMenu, $PHPTreeMenu, $PlainMenu;{/php} -//--><!]]> -</script> -<script type="text/javascript" src="lib/phplayers/libjs/layersmenu-library.js"></script> -{* lets try this *} -<script type="text/javascript" src="lib/phplayers/libjs/layersmenu.js"></script> -{* will it work now ? (luci) *} -<script type="text/javascript" src="lib/phplayers/libjs/layerstreemenu-cookies.js"></script> -{/if} +{if isset($phplayers_headers)}{$phplayers_headers}{/if} {*-- css menus block --*} <link rel="StyleSheet" href="css/cssmenu_vert.css" type="text/css"></link> Modified: branches/2.0/templates/styles/darkroom/header.tpl =================================================================== --- branches/2.0/templates/styles/darkroom/header.tpl 2008-07-23 19:02:35 UTC (rev 13853) +++ branches/2.0/templates/styles/darkroom/header.tpl 2008-07-23 20:11:18 UTC (rev 13854) @@ -1,4 +1,4 @@ -{php}header('Content-Type: text/html; charset=utf-8');{/php}{* --- IMPORTANT: If you edit this (or any other TPL file) file via the Tiki built-in TPL editor (tiki-edit_templates.php), all the javascript will be stripped. This will cause problems. (Ex.: menus stop collapsing/expanding). +{* --- IMPORTANT: If you edit this (or any other TPL file) file via the Tiki built-in TPL editor (tiki-edit_templates.php), all the javascript will be stripped. This will cause problems. (Ex.: menus stop collapsing/expanding). You should only modify header.tpl via a text editor through console, or ssh, or FTP edit commands. And only if you know what you are doing ;-) @@ -55,21 +55,7 @@ <!--[if lt IE 7]> <link rel="StyleSheet" href="css/ie6.css" type="text/css" /> <![endif]--> {* --- phplayers block --- *} -{if $prefs.feature_phplayers eq 'y'} -<link rel="StyleSheet" href="lib/phplayers/layerstreemenu.css" type="text/css"></link> -<link rel="StyleSheet" href="lib/phplayers/layerstreemenu-hidden.css" type="text/css" /> -<script type="text/javascript"> -<!--//--><![CDATA[//><!-- -var numl;var toBeHidden; -{php} include_once ("lib/phplayers/libjs/layersmenu-browser_detection.js"); global $LayersMenu, $TreeMenu, $PHPTreeMenu, $PlainMenu;{/php} -//--><!]]> -</script> -<script type="text/javascript" src="lib/phplayers/libjs/layersmenu-library.js"></script> -{* lets try this *} -<script type="text/javascript" src="lib/phplayers/libjs/layersmenu.js"></script> -{* will it work now ? (luci) *} -<script type="text/javascript" src="lib/phplayers/libjs/layerstreemenu-cookies.js"></script> -{/if} +{if isset($phplayers_headers)}{$phplayers_headers}{/if} {*-- css menus block --*} <link rel="StyleSheet" href="css/cssmenu_vert.css" type="text/css"></link> Modified: branches/2.0/templates/styles/feb12/header.tpl =================================================================== --- branches/2.0/templates/styles/feb12/header.tpl 2008-07-23 19:02:35 UTC (rev 13853) +++ branches/2.0/templates/styles/feb12/header.tpl 2008-07-23 20:11:18 UTC (rev 13854) @@ -1,4 +1,4 @@ -{php}header('Content-Type: text/html; charset=utf-8');{/php}{* --- IMPORTANT: If you edit this (or any other TPL file) file via the Tiki built-in TPL editor (tiki-edit_templates.php), all the javascript will be stripped. This will cause problems. (Ex.: menus stop collapsing/expanding). +{* --- IMPORTANT: If you edit this (or any other TPL file) file via the Tiki built-in TPL editor (tiki-edit_templates.php), all the javascript will be stripped. This will cause problems. (Ex.: menus stop collapsing/expanding). You should only modify header.tpl via a text editor through console, or ssh, or FTP edit commands. And only if you know what you are doing ;-) @@ -55,21 +55,7 @@ <!--[if lt IE 7]> <link rel="StyleSheet" href="css/ie6.css" type="text/css" /> <![endif]--> {* --- phplayers block --- *} -{if $prefs.feature_phplayers eq 'y'} -<link rel="StyleSheet" href="lib/phplayers/layerstreemenu.css" type="text/css"></link> -<link rel="StyleSheet" href="lib/phplayers/layerstreemenu-hidden.css" type="text/css" /> -<script type="text/javascript"> -<!--//--><![CDATA[//><!-- -var numl;var toBeHidden; -{php} include_once ("lib/phplayers/libjs/layersmenu-browser_detection.js"); global $LayersMenu, $TreeMenu, $PHPTreeMenu, $PlainMenu;{/php} -//--><!]]> -</script> -<script type="text/javascript" src="lib/phplayers/libjs/layersmenu-library.js"></script> -{* lets try this *} -<script type="text/javascript" src="lib/phplayers/libjs/layersmenu.js"></script> -{* will it work now ? (luci) *} -<script type="text/javascript" src="lib/phplayers/libjs/layerstreemenu-cookies.js"></script> -{/if} +{if isset($phplayers_headers)}{$phplayers_headers}{/if} {*-- css menus block --*} <link rel="StyleSheet" href="css/cssmenu_vert.css" type="text/css"></link> Modified: branches/2.0/templates/styles/simple/header.tpl =================================================================== --- branches/2.0/templates/styles/simple/header.tpl 2008-07-23 19:02:35 UTC (rev 13853) +++ branches/2.0/templates/styles/simple/header.tpl 2008-07-23 20:11:18 UTC (rev 13854) @@ -49,9 +49,6 @@ {* --- jscalendar block --- *} {if $prefs.feature_jscalendar eq 'y' and $uses_jscalendar eq 'y'} <link rel="StyleSheet" href="lib/jscalendar/calendar-system.css" type="text/css"></link> -<script type="text/javascript"><!-- -{if $prefs.feature_phplayers eq 'y'}{php} include_once ("lib/phplayers/libjs/layersmenu-browser_detection.js"); {/php}{/if} -// --></script> <script type="text/javascript" src="lib/jscalendar/calendar.js"></script> {if $jscalendar_langfile} <script type="text/javascript" src="lib/jscalendar/lang/calendar-{$jscalendar_langfile}.js"></script> @@ -62,18 +59,7 @@ {/if} {* --- phplayers block --- *} -{if $prefs.feature_phplayers eq 'y'} -<link rel="StyleSheet" href="lib/phplayers/layerstreemenu.css" type="text/css"></link> -<style type="text/css"><!-- @import url("lib/phplayers/layerstreemenu-hidden.css"); //--></style> -<script type="text/javascript"><!-- -{php} include_once ("lib/phplayers/libjs/layersmenu-browser_detection.js"); {/php} -// --></script> -<script type="text/javascript" src="lib/phplayers/libjs/layersmenu-library.js"></script> -{* -<script type="text/javascript" src="lib/phplayers/libjs/layersmenu.js"></script> -*} -<script type="text/javascript" src="lib/phplayers/libjs/layerstreemenu-cookies.js"></script> -{/if} +{if isset($phplayers_headers)}{$phplayers_headers}{/if} {* --- Firefox RSS icons --- *} {if $prefs.feature_wiki eq 'y' and $prefs.rss_wiki eq 'y'} Modified: branches/2.0/templates/styles/thenews/header.tpl =================================================================== --- branches/2.0/templates/styles/thenews/header.tpl 2008-07-23 19:02:35 UTC (rev 13853) +++ branches/2.0/templates/styles/thenews/header.tpl 2008-07-23 20:11:18 UTC (rev 13854) @@ -1,4 +1,4 @@ -{php}header('Content-Type: text/html; charset=utf-8');{/php}{* --- IMPORTANT: If you edit this (or any other TPL file) file via the Tiki built-in TPL editor (tiki-edit_templates.php), all the javascript will be stripped. This will cause problems. (Ex.: menus stop collapsing/expanding). +{* --- IMPORTANT: If you edit this (or any other TPL file) file via the Tiki built-in TPL editor (tiki-edit_templates.php), all the javascript will be stripped. This will cause problems. (Ex.: menus stop collapsing/expanding). You should only modify header.tpl via a text editor through console, or ssh, or FTP edit commands. And only if you know what you are doing ;-) @@ -55,21 +55,7 @@ <!--[if lt IE 7]> <link rel="StyleSheet" href="css/ie6.css" type="text/css" /> <![endif]--> {* --- phplayers block --- *} -{if $prefs.feature_phplayers eq 'y'} -<link rel="StyleSheet" href="lib/phplayers/layerstreemenu.css" type="text/css"></link> -<link rel="StyleSheet" href="lib/phplayers/layerstreemenu-hidden.css" type="text/css" /> -<script type="text/javascript"> -<!--//--><![CDATA[//><!-- -var numl;var toBeHidden; -{php} include_once ("lib/phplayers/libjs/layersmenu-browser_detection.js"); global $LayersMenu, $TreeMenu, $PHPTreeMenu, $PlainMenu;{/php} -//--><!]]> -</script> -<script type="text/javascript" src="lib/phplayers/libjs/layersmenu-library.js"></script> -{* lets try this *} -<script type="text/javascript" src="lib/phplayers/libjs/layersmenu.js"></script> -{* will it work now ? (luci) *} -<script type="text/javascript" src="lib/phplayers/libjs/layerstreemenu-cookies.js"></script> -{/if} +{if isset($phplayers_headers)}{$phplayers_headers}{/if} {*-- css menus block --*} <link rel="StyleSheet" href="css/cssmenu_vert.css" type="text/css"></link> Modified: branches/2.0/templates/styles/tikinewt/header.tpl =================================================================== --- branches/2.0/templates/styles/tikinewt/header.tpl 2008-07-23 19:02:35 UTC (rev 13853) +++ branches/2.0/templates/styles/tikinewt/header.tpl 2008-07-23 20:11:18 UTC (rev 13854) @@ -1,4 +1,4 @@ -{php}header('Content-Type: text/html; charset=utf-8');{/php}{* --- IMPORTANT: If you edit this (or any other TPL file) file via the Tiki built-in TPL editor (tiki-edit_templates.php), all the javascript will be stripped. This will cause problems. (Ex.: menus stop collapsing/expanding). +{* --- IMPORTANT: If you edit this (or any other TPL file) file via the Tiki built-in TPL editor (tiki-edit_templates.php), all the javascript will be stripped. This will cause problems. (Ex.: menus stop collapsing/expanding). You should only modify header.tpl via a text editor through console, or ssh, or FTP edit commands. And only if you know what you are doing ;-) @@ -55,21 +55,7 @@ <!--[if lt IE 7]> <link rel="StyleSheet" href="css/ie6.css" type="text/css" /> <![endif]--> {* --- phplayers block --- *} -{if $prefs.feature_phplayers eq 'y'} -<link rel="StyleSheet" href="lib/phplayers/layerstreemenu.css" type="text/css"></link> -<link rel="StyleSheet" href="lib/phplayers/layerstreemenu-hidden.css" type="text/css" /> -<script type="text/javascript"> -<!--//--><![CDATA[//><!-- -var numl;var toBeHidden; -{php} include_once ("lib/phplayers/libjs/layersmenu-browser_detection.js"); global $LayersMenu, $TreeMenu, $PHPTreeMenu, $PlainMenu;{/php} -//--><!]]> -</script> -<script type="text/javascript" src="lib/phplayers/libjs/layersmenu-library.js"></script> -{* lets try this *} -<script type="text/javascript" src="lib/phplayers/libjs/layersmenu.js"></script> -{* will it work now ? (luci) *} -<script type="text/javascript" src="lib/phplayers/libjs/layerstreemenu-cookies.js"></script> -{/if} +{if isset($phplayers_headers)}{$phplayers_headers}{/if} {*-- css menus block --*} <link rel="StyleSheet" href="css/cssmenu_vert.css" type="text/css"></link> Modified: branches/2.0/templates/tiki-admin-include-login.tpl =================================================================== --- branches/2.0/templates/tiki-admin-include-login.tpl 2008-07-23 19:02:35 UTC (rev 13853) +++ branches/2.0/templates/tiki-admin-include-login.tpl 2008-07-23 20:11:18 UTC (rev 13854) @@ -35,7 +35,7 @@ <tr><td class="form">{tr}Use tracker for more group information{/tr}:</td><td><input type="checkbox" name="groupTracker" {if $prefs.groupTracker eq 'y'}checked="checked"{/if} /></td></tr> <tr><td class="form">{tr}Request passcode to register{/tr}:</td><td><input type="checkbox" name="useRegisterPasscode" {if $prefs.useRegisterPasscode eq 'y'}checked="checked"{/if}/><input type="text" name="registerPasscode" value="{$prefs.registerPasscode|escape}"/></td></tr> -<tr><td class="form">{tr}Prevent automatic/robot registration{/tr}{php}if (!function_exists("gd_info")){ {/php} {tr} - Php GD library required{/tr}{php}}{/php}:</td><td><input type="checkbox" name="rnd_num_reg" {if $prefs.rnd_num_reg eq 'y'}checked="checked"{/if}/></td></tr> +<tr><td class="form">{tr}Prevent automatic/robot registration:{/tr}</td><td><input type="checkbox" name="rnd_num_reg"{if $gd_lib_found neq 'y'} disabled="disabled"{/if}{if $prefs.rnd_num_reg eq 'y'} checked="checked"{/if}/>{if $gd_lib_found neq 'y'} {tr} - Php GD library required{/tr}{/if}</td></tr> <tr><td class="form">{tr}Use login as email{/tr}:</td><td><input type="checkbox" name="login_is_email" {if $prefs.login_is_email eq 'y'}checked="checked"{/if}/></td></tr> <tr><td class="form">{tr}Validate users by email{/tr}:</td><td><input type="checkbox" name="validateUsers" {if $prefs.validateUsers eq 'y'}checked="checked"{/if}/> {if empty($prefs.sender_email)} Modified: branches/2.0/templates/tiki-user_cssmenu.tpl =================================================================== --- branches/2.0/templates/tiki-user_cssmenu.tpl 2008-07-23 19:02:35 UTC (rev 13853) +++ branches/2.0/templates/tiki-user_cssmenu.tpl 2008-07-23 20:11:18 UTC (rev 13854) @@ -11,20 +11,16 @@ {if $chdata.type ne 'o' and $chdata.type ne '-'} {if $opensec > 0} -{assign var=sectionType value=$chdata.type} -{php} -global $smarty; -$opensec = $smarty->get_template_vars('opensec'); -$sectionType= $smarty->get_template_vars('sectionType'); -if ($sectionType == 's' or $sectionType == 'r') { - $sectionType = 0; -} -while ($opensec > $sectionType) { - --$opensec; - echo '</ul></li>'; -} -$smarty->assign('opensec', $opensec); -{/php} + {if $chdata.type eq 's' or $chdata.type eq 'r'} + {assign var=sectionType value=0} + {else} + {assign var=sectionType value=$chdata.type} + {/if} + {if $opensec > $sectionType} + {assign var=nb_opensec value=$opensec-$sectionType} + {repeat count=$nb_opensec}</ul></li>{/repeat} + {assign var=opensec value=$sectionType} + {/if} {/if} <li class="option{$chdata.optionId} menuSection menuSection{$opensec} menuLevel{$opensec}{if $chdata.selected} selected{/if}{if $chdata.selectedAscendant} selectedAscendant{/if}"> @@ -50,15 +46,9 @@ {/foreach} {if $opensec > 0} -{php} -global $smarty; -$opensec = $smarty->get_template_vars('opensec'); -while ($opensec) { - --$opensec; - echo '</ul></li>'; -} -{/php} + {repeat count=$opensec}</ul></li>{/repeat} + {assign var=opensec value=0} {/if} </ul> -{/if} \ No newline at end of file +{/if} Modified: branches/2.0/templates/tracker_item_field_value.tpl =================================================================== --- branches/2.0/templates/tracker_item_field_value.tpl 2008-07-23 19:02:35 UTC (rev 13853) +++ branches/2.0/templates/tracker_item_field_value.tpl 2008-07-23 20:11:18 UTC (rev 13854) @@ -47,14 +47,14 @@ <a href="tiki-view_tracker_item.php?itemId={$tid}&trackerId={$field_value.options_array[0]}"> {/if} {if isset($field_value.otherField)} - {php}global $smarty; $smarty->_tpl_vars['field_value']['otherField']['value'] = $smarty->_tpl_vars['tlabel'];{/php} + {assign var='field_value.otherField.value' value=$tlabel} {include file="tracker_item_field_value.tpl" field_value=$field_value.otherField showlinks=n} {elseif $list_mode eq 'y'} {$tlabel|truncate:255:"..."} {else} {$tlabel} {/if} - {if $field_value.options_array[4] eq '1' and $showlinks ne 'n'and $list_mode ne 'csv'} + {if $field_value.options_array[4] eq '1' and $showlinks ne 'n' and $list_mode ne 'csv'} </a> {/if} {if $list_mode ne 'csv' and count($field_value.links) > 1} Modified: branches/2.0/tiki-admin_include_login.php =================================================================== --- branches/2.0/tiki-admin_include_login.php 2008-07-23 19:02:35 UTC (rev 13853) +++ branches/2.0/tiki-admin_include_login.php 2008-07-23 20:11:18 UTC (rev 13854) @@ -184,6 +184,7 @@ } $smarty->assign("phpcas_enabled", $phpcas_enabled); +$smarty->assign('gd_lib_found', function_exists('gd_info') ? 'y' : 'n' ); // Get list of available languages $languages = array(); Modified: branches/2.0/tiki-setup.php =================================================================== --- branches/2.0/tiki-setup.php 2008-07-23 19:02:35 UTC (rev 13853) +++ branches/2.0/tiki-setup.php 2008-07-23 20:11:18 UTC (rev 13854) @@ -131,6 +131,7 @@ if ( ! isset($_SESSION['wysiwyg']) ) $_SESSION['wysiwyg'] = 'n'; $smarty->assign_by_ref('wysiwyg', $_SESSION['wysiwyg']); } +if ( $prefs['feature_phplayers'] == 'y' ) require_once('lib/setup/phplayers.php'); $smarty->assign_by_ref('phpErrors', $phpErrors); $smarty->assign_by_ref('num_queries', $num_queries); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |