From: <ny...@us...> - 2008-07-17 08:14:24
|
Revision: 13691 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=13691&view=rev Author: nyloth Date: 2008-07-17 08:14:30 +0000 (Thu, 17 Jul 2008) Log Message: ----------- [FIX] smarty security: remove {php} tag that was used to handle phplayers int header.tpl (now handled through lib/setup/phplayers.php). Modified Paths: -------------- trunk/templates/footer.tpl trunk/templates/header.tpl trunk/templates/styles/tikineat/header.tpl Added Paths: ----------- trunk/lib/setup/phplayers.php Added: trunk/lib/setup/phplayers.php =================================================================== --- trunk/lib/setup/phplayers.php (rev 0) +++ trunk/lib/setup/phplayers.php 2008-07-17 08:14:30 UTC (rev 13691) @@ -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); Modified: trunk/templates/footer.tpl =================================================================== --- trunk/templates/footer.tpl 2008-07-16 11:14:13 UTC (rev 13690) +++ trunk/templates/footer.tpl 2008-07-17 08:14:30 UTC (rev 13691) @@ -15,7 +15,8 @@ {/if} {if $prefs.feature_phplayers eq 'y'} -{php}global $LayersMenu; if (isset($LayersMenu)) {$LayersMenu->printHeader();$LayersMenu->printFooter();}{/php} + {$phplayers_LayersMenu->printHeader()} + {$phplayers_LayersMenu->printFooter()} {/if} {if $lastup} Modified: trunk/templates/header.tpl =================================================================== --- trunk/templates/header.tpl 2008-07-16 11:14:13 UTC (rev 13690) +++ trunk/templates/header.tpl 2008-07-17 08:14:30 UTC (rev 13691) @@ -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: trunk/templates/styles/tikineat/header.tpl =================================================================== --- trunk/templates/styles/tikineat/header.tpl 2008-07-16 11:14:13 UTC (rev 13690) +++ trunk/templates/styles/tikineat/header.tpl 2008-07-17 08:14:30 UTC (rev 13691) @@ -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> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ny...@us...> - 2008-07-17 08:21:25
|
Revision: 13695 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=13695&view=rev Author: nyloth Date: 2008-07-17 08:21:30 +0000 (Thu, 17 Jul 2008) Log Message: ----------- [MOD] remove 'pref_syntax' pref for TikiWiki 3.x since it's now obsolete. Modified Paths: -------------- trunk/lib/setup/js_detect.php trunk/lib/setup/prefs.php trunk/templates/tiki-admin-include-general.tpl trunk/tiki-admin_include_general.php Modified: trunk/lib/setup/js_detect.php =================================================================== --- trunk/lib/setup/js_detect.php 2008-07-17 08:19:58 UTC (rev 13694) +++ trunk/lib/setup/js_detect.php 2008-07-17 08:21:30 UTC (rev 13695) @@ -16,9 +16,3 @@ // Set a session var to be able to generate non-javascript code if there is no javascript, when noscript tag is not useful enough $headerlib->add_js("setSessionVar('javascript_enabled','y');"); } - -if ($prefs['pref_syntax'] == '1.9') { - $javascript_enabled = $prefs['javascript_enabled']; - $smarty->assign('javascript_enabled', $prefs['javascript_enabled']); -} - Modified: trunk/lib/setup/prefs.php =================================================================== --- trunk/lib/setup/prefs.php 2008-07-17 08:19:58 UTC (rev 13694) +++ trunk/lib/setup/prefs.php 2008-07-17 08:21:30 UTC (rev 13695) @@ -1027,7 +1027,6 @@ $prefs['wiki_3d_adjust_camera'] = ''; $prefs['wiki_3d_autoload'] = ''; $prefs['feature_sefurl'] = 'n'; - $prefs['pref_syntax'] = '2.0'; $prefs['feature_mootools'] = 'n'; $prefs['javascript_enabled'] = 'n'; $prefs['feature_comments_post_as_anonymous'] = 'n'; @@ -1099,9 +1098,3 @@ $maxRecords = $prefs['maxRecords']; $smarty->assign_by_ref('maxRecords', $maxRecords); -// DEPRECATED: Use $prefs array instead of each global vars to access prefs ; this will be removed soon -if ($prefs['pref_syntax'] == '1.9') { - extract($prefs); - foreach ($prefs as $k=>$v) $smarty->assign($k, $v); -} - Modified: trunk/templates/tiki-admin-include-general.tpl =================================================================== --- trunk/templates/tiki-admin-include-general.tpl 2008-07-17 08:19:58 UTC (rev 13694) +++ trunk/templates/tiki-admin-include-general.tpl 2008-07-17 08:21:30 UTC (rev 13695) @@ -341,14 +341,6 @@ </div> </td> </tr> -<tr> -<td class="form"><label for="site_nav_seper">{tr}Preference syntax{/tr}:</label></td> -<td><select name="pref_syntax"> -<option value="1.9" {if $prefs.pref_syntax eq '1.9'}selected="selected"{/if}>1.9 - $feature_foobar</option> -<option value="2.0" {if $prefs.pref_syntax eq '2.0'}selected="selected"{/if}>2.0 - $prefs.feature_foobar, $prefs['feature_foobar']</option> -</select></td> -</tr> - <tr> <td class="button" colspan='2'> <input type="submit" name="new_prefs" value="{tr}Change preferences{/tr}" /> Modified: trunk/tiki-admin_include_general.php =================================================================== --- trunk/tiki-admin_include_general.php 2008-07-17 08:19:58 UTC (rev 13694) +++ trunk/tiki-admin_include_general.php 2008-07-17 08:21:30 UTC (rev 13695) @@ -61,7 +61,6 @@ "site_closed_msg", "helpurl", "tiki_version_check_frequency", - "pref_syntax", ); foreach ($pref_simple_values as $svitem) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sy...@us...> - 2008-07-17 10:56:27
|
Revision: 13696 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=13696&view=rev Author: sylvieg Date: 2008-07-17 10:56:25 +0000 (Thu, 17 Jul 2008) Log Message: ----------- [MOD]tracker: possibilty like in items link to specify more than one field to be displayed in item list Modified Paths: -------------- trunk/lib/trackers/trackerlib.php trunk/templates/tracker_item_field_value.tpl trunk/tiki-view_tracker_item.php Modified: trunk/lib/trackers/trackerlib.php =================================================================== --- trunk/lib/trackers/trackerlib.php 2008-07-17 08:21:30 UTC (rev 13695) +++ trunk/lib/trackers/trackerlib.php 2008-07-17 10:56:25 UTC (rev 13696) @@ -815,7 +815,8 @@ case 'l': if ( isset($fopt['options_array'][2]) && isset($fil[$fopt['options_array'][2]]) && ($lst = $fil[$fopt['options_array'][2]]) && isset($fopt['options_array'][3])) { $opts[1] = split(':', $fopt['options_array'][1]); - $fopt['links'] = $this->get_join_values($itemId, array_merge(array($fopt['options_array'][2]), array($fopt['options_array'][1]), array($fopt['options_array'][3]))); + $finalFields = explode('|', $fopt['options_array'][3]); + $fopt['links'] = $this->get_join_values($itemId, array_merge(array($fopt['options_array'][2]), array($fopt['options_array'][1]), array($finalFields[0])), $fopt['options_array'][0], $finalFields); $fopt['trackerId'] = $fopt['options_array'][0]; } if (isset($fopt['links']) && count($fopt['links']) == 1) { //if a computed field use it @@ -1439,7 +1440,6 @@ if (($header = fgetcsv($csvHandle,100000, $csvDelimiter)) === FALSE) { return 'Illegal first line'; } - $max = count($header); for ($i = 0; $i < $max; $i++) { if ($encoding == 'ISO-8859-1') { @@ -1492,7 +1492,6 @@ $replace = false; } $need_reindex[] = $itemId; - if (!empty($cats)) { foreach ($cats as $c) { $this->categorized_item($trackerId, $itemId, "item $itemId", $cats); @@ -2549,7 +2548,8 @@ } return $emails; } - function get_join_values($itemId, $fieldIds) { + function get_join_values($itemId, $fieldIds, $finalTrackerId='', $finalFields='', $separator=' ') { + global $smarty; $select[] = "`tiki_tracker_item_fields` t0"; $where[] = " t0.`itemId`=?"; $bindVars[] = $itemId; @@ -2568,7 +2568,22 @@ $result = $this->query($query, $bindVars); $ret = array(); while ($res = $result->fetchRow()) { - $ret[$res['itemId']] = $res['value']; + $field_value = $this->get_tracker_field($res['fieldId']); + $field_value['value'] = $res['value']; + $smarty->assign('field_value', $field_value); + $ret[$res['itemId']] = $smarty->fetch('tracker_item_field_value.tpl'); + if (is_array($finalFields) && count($finalFields)) { + $i = 0; + foreach ($finalFields as $f) { + if (!$i++) + continue; + $field_value = $this->get_tracker_field($f); + $ff = $this->get_item_value($finalTrackerId, $res['itemId'], $f);; + $field_value['value'] = $ff; + $smarty->assign('field_value', $field_value); + $ret[$res['itemId']] .= $separator.$smarty->fetch('tracker_item_field_value.tpl'); + } + } } return $ret; } Modified: trunk/templates/tracker_item_field_value.tpl =================================================================== --- trunk/templates/tracker_item_field_value.tpl 2008-07-17 08:21:30 UTC (rev 13695) +++ trunk/templates/tracker_item_field_value.tpl 2008-07-17 10:56:25 UTC (rev 13696) @@ -46,15 +46,8 @@ {if $field_value.options_array[4] eq '1' and $showlinks ne 'n' and $list_mode ne 'csv'} <a href="tiki-view_tracker_item.php?itemId={$tid}&trackerId={$field_value.options_array[0]}"> {/if} - {if isset($field_value.otherField)} - {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'} + {$tlabel} + {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: trunk/tiki-view_tracker_item.php =================================================================== --- trunk/tiki-view_tracker_item.php 2008-07-17 08:21:30 UTC (rev 13695) +++ trunk/tiki-view_tracker_item.php 2008-07-17 10:56:25 UTC (rev 13696) @@ -786,7 +786,8 @@ } elseif ($fields["data"][$i]["type"] == 'l') { if (isset($fields["data"][$i]["options_array"][3])) { $l = split(':', $fields["data"][$i]["options_array"][1]); - $ins_fields["data"][$i]['links'] = $trklib->get_join_values($_REQUEST['itemId'], array_merge(array($fields["data"][$i]["options_array"][2]), $l, array($fields["data"][$i]["options_array"][3]))); + $finalFields = explode('|', $fields['data'][$i]['options_array'][3]); + $ins_fields["data"][$i]['links'] = $trklib->get_join_values($_REQUEST['itemId'], array_merge(array($fields["data"][$i]["options_array"][2]), $l, array($fields["data"][$i]["options_array"][3])), $fields["data"][$i]["options_array"][0], $finalFields); if (count($ins_fields["data"][$i]['links']) == 1) { foreach ($ins_fields["data"][$i]['links'] as $linkItemId=>$linkValue) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ny...@us...> - 2008-07-18 15:33:16
|
Revision: 13718 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=13718&view=rev Author: nyloth Date: 2008-07-18 15:32:45 +0000 (Fri, 18 Jul 2008) Log Message: ----------- [FIX] fixes to make TikiWiki work on quite hostile environments (e.g. french ISP 'free.fr') where, for example, the path can't be modified (thx to Cyril Chaboisseau). Modified Paths: -------------- trunk/lib/ical/File.php trunk/lib/webmail/mimeDecode.php trunk/lib/webmail/net_pop3.php trunk/setup_smarty.php Modified: trunk/lib/ical/File.php =================================================================== --- trunk/lib/ical/File.php 2008-07-18 15:31:48 UTC (rev 13717) +++ trunk/lib/ical/File.php 2008-07-18 15:32:45 UTC (rev 13718) @@ -26,7 +26,7 @@ /** * Requires PEAR */ -require_once 'PEAR.php'; +require_once 'lib/pear/PEAR.php'; /** * The default number of bytes for reading Modified: trunk/lib/webmail/mimeDecode.php =================================================================== --- trunk/lib/webmail/mimeDecode.php 2008-07-18 15:31:48 UTC (rev 13717) +++ trunk/lib/webmail/mimeDecode.php 2008-07-18 15:32:45 UTC (rev 13718) @@ -16,7 +16,7 @@ // +----------------------------------------------------------------------+ // | Authors: Richard Heyes <ri...@ph...> | // +----------------------------------------------------------------------+ -require_once ('PEAR.php'); +require_once ('lib/pear/PEAR.php'); //this script may only be included - so its better to die if called directly. if (strpos($_SERVER["SCRIPT_NAME"],basename(__FILE__)) !== false) { Modified: trunk/lib/webmail/net_pop3.php =================================================================== --- trunk/lib/webmail/net_pop3.php 2008-07-18 15:31:48 UTC (rev 13717) +++ trunk/lib/webmail/net_pop3.php 2008-07-18 15:32:45 UTC (rev 13718) @@ -35,7 +35,7 @@ // // $Id: net_pop3.php,v 1.4 2005-08-08 22:44:53 rlpowell Exp $ -require_once('Net/Socket.php'); +require_once('lib/pear/Net/Socket.php'); @@ -185,7 +185,7 @@ function _raiseError($msg, $code =-1) { - include_once 'PEAR.php'; + include_once 'lib/pear/PEAR.php'; return PEAR::raiseError($msg, $code); } Modified: trunk/setup_smarty.php =================================================================== --- trunk/setup_smarty.php 2008-07-18 15:31:48 UTC (rev 13717) +++ trunk/setup_smarty.php 2008-07-18 15:32:45 UTC (rev 13718) @@ -65,7 +65,9 @@ if ( ($tpl = $this->get_template_vars('mid')) && ( $_smarty_tpl_file == 'tiki.tpl' || $_smarty_tpl_file == 'tiki-print.tpl' || $_smarty_tpl_file == 'tiki_full.tpl' ) ) { // Set the last mid template to be used by AJAX to simulate a 'BACK' action - $this->assign('last_mid_template', $_SESSION['last_mid_template']); + if ( isset($_SESSION['last_mid_template']) ) { + $this->assign('last_mid_template', $_SESSION['last_mid_template']); + } $_SESSION['last_mid_template'] = $tpl; // Enable Template Zoom This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ny...@us...> - 2008-07-18 16:09:15
|
Revision: 13716 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=13716&view=rev Author: nyloth Date: 2008-07-18 15:21:03 +0000 (Fri, 18 Jul 2008) Log Message: ----------- [FIX] fixes to make TikiWiki work on quite hostile environments (e.g. french ISP 'free.fr') where, for example, the path can't be modified (thx to Cyril Chaboisseau). Modified Paths: -------------- trunk/db/tiki-db.php trunk/lib/pear/Auth/Container/Array.php trunk/lib/pear/Auth/Container/File.php trunk/lib/pear/Auth/Container/IMAP.php trunk/lib/pear/Auth/Container/KADM5.php trunk/lib/pear/Auth/Container/LDAP.php trunk/lib/pear/Auth/Container/Multiple.php trunk/lib/pear/Auth/Container/POP3.php trunk/lib/pear/Auth/Container/SAP.php trunk/lib/pear/Auth/Container/SMBPasswd.php trunk/lib/pear/Auth/Container/SOAP.php trunk/lib/pear/Auth/Container/SOAP5.php trunk/lib/pear/Auth/Container/vpopmail.php trunk/lib/pear/Auth.php trunk/lib/pear/DB/common.php trunk/lib/pear/DB.php trunk/lib/pear/Date/Span.php trunk/lib/pear/Date.php trunk/lib/pear/HTTP/Request.php trunk/lib/pear/NNTP.php trunk/lib/pear/Net/DIME.php trunk/lib/pear/Net/Socket.php trunk/lib/pear/PEAR/ChannelFile.php trunk/lib/pear/PEAR/Command/Common.php trunk/lib/pear/PEAR/Command.php trunk/lib/pear/PEAR/Common.php trunk/lib/pear/PEAR/Config.php trunk/lib/pear/PEAR/Dependency.php trunk/lib/pear/PEAR/DependencyDB.php trunk/lib/pear/PEAR/ErrorStack.php trunk/lib/pear/PEAR/PackageFile/Generator/v2.php trunk/lib/pear/PEAR/REST.php trunk/lib/pear/PEAR/Registry.php trunk/lib/pear/PEAR/Remote.php trunk/lib/pear/PEAR/RunTest.php trunk/lib/pear/PEAR/Task/Common.php trunk/lib/pear/PEAR/XMLParser.php trunk/lib/pear/System.php trunk/lib/pear/XML/Dump.php trunk/lib/pear/XML/RPC.php trunk/lib/pear/XML/Server.php trunk/tiki-install.php Modified: trunk/db/tiki-db.php =================================================================== --- trunk/db/tiki-db.php 2008-07-18 15:16:43 UTC (rev 13715) +++ trunk/db/tiki-db.php 2008-07-18 15:21:03 UTC (rev 13716) @@ -55,7 +55,7 @@ */ if (!isset($local_php) or !is_file($local_php)) { - $local_php = 'local.php'; + $local_php = 'db/local.php'; } else { $local_php = preg_replace(array('/\.\./','/^db\//'),array('',''),$local_php); } @@ -70,12 +70,13 @@ } } if (isset($multi)) { - $local_php = "$multi/local.php"; + $local_php = "db/$multi/local.php"; $tikidomain = $multi; } } -$re = include_once('db/'.$local_php); -if ( $re === FALSE) { +$re = false; +if ( is_file($local_php) ) $re = include_once($local_php); +if ( $re === false ) { print '<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> @@ -116,8 +117,8 @@ define('ADODB_FORCE_NULLS', 1); define('ADODB_ASSOC_CASE', 2); define('ADODB_CASE_ASSOC', 2); // typo in adodb's driver for sybase? - require_once ('adodb.inc.php'); - include_once ('adodb-pear.inc.php'); + require_once ('lib/adodb/adodb.inc.php'); + include_once ('lib/adodb/adodb-pear.inc.php'); //include_once('adodb-error.inc.php'); //include_once('adodb-errorhandler.inc.php'); //include_once('adodb-errorpear.inc.php'); @@ -136,7 +137,7 @@ // ADODB_FETCH_BOTH appears to be buggy for null values } else { // Database connection for the tiki system - include_once ('DB.php'); + include_once ('lib/pear/DB.php'); } //doesn't work with adodb. adodb doesn't let you inherit Modified: trunk/lib/pear/Auth/Container/Array.php =================================================================== --- trunk/lib/pear/Auth/Container/Array.php 2008-07-18 15:16:43 UTC (rev 13715) +++ trunk/lib/pear/Auth/Container/Array.php 2008-07-18 15:21:03 UTC (rev 13716) @@ -25,11 +25,11 @@ /** * Include Auth_Container base class */ -require_once "Auth/Container.php"; +require_once "lib/pear/Auth/Container.php"; /** * Include PEAR package for error handling */ -require_once "PEAR.php"; +require_once "lib/pear/PEAR.php"; /** * Storage driver for fetching authentication data from a PHP Array Modified: trunk/lib/pear/Auth/Container/File.php =================================================================== --- trunk/lib/pear/Auth/Container/File.php 2008-07-18 15:16:43 UTC (rev 13715) +++ trunk/lib/pear/Auth/Container/File.php 2008-07-18 15:21:03 UTC (rev 13716) @@ -28,15 +28,15 @@ /** * Include PEAR File_Passwd package */ -require_once "File/Passwd.php"; +require_once "lib/pear/File/Passwd.php"; /** * Include Auth_Container base class */ -require_once "Auth/Container.php"; +require_once "lib/pear/Auth/Container.php"; /** * Include PEAR package for error handling */ -require_once "PEAR.php"; +require_once "lib/pear/PEAR.php"; /** * Storage driver for fetching login data from an encrypted password file. Modified: trunk/lib/pear/Auth/Container/IMAP.php =================================================================== --- trunk/lib/pear/Auth/Container/IMAP.php 2008-07-18 15:16:43 UTC (rev 13715) +++ trunk/lib/pear/Auth/Container/IMAP.php 2008-07-18 15:21:03 UTC (rev 13716) @@ -26,12 +26,12 @@ /** * Include Auth_Container base class */ -require_once "Auth/Container.php"; +require_once "lib/pear/Auth/Container.php"; /** * Include PEAR class for error handling */ -require_once "PEAR.php"; +require_once "lib/pear/PEAR.php"; /** * Storage driver for fetching login data from an IMAP server Modified: trunk/lib/pear/Auth/Container/KADM5.php =================================================================== --- trunk/lib/pear/Auth/Container/KADM5.php 2008-07-18 15:16:43 UTC (rev 13715) +++ trunk/lib/pear/Auth/Container/KADM5.php 2008-07-18 15:21:03 UTC (rev 13716) @@ -26,11 +26,11 @@ /** * Include Auth_Container base class */ -require_once 'Auth/Container.php'; +require_once 'lib/pear/Auth/Container.php'; /** * Include PEAR for error handling */ -require_once 'PEAR.php'; +require_once 'lib/pear/PEAR.php'; /** * Storage driver for Authentication on a Kerberos V server. Modified: trunk/lib/pear/Auth/Container/LDAP.php =================================================================== --- trunk/lib/pear/Auth/Container/LDAP.php 2008-07-18 15:16:43 UTC (rev 13715) +++ trunk/lib/pear/Auth/Container/LDAP.php 2008-07-18 15:21:03 UTC (rev 13716) @@ -26,11 +26,11 @@ /** * Include Auth_Container base class */ -require_once "Auth/Container.php"; +require_once "lib/pear/Auth/Container.php"; /** * Include PEAR package for error handling */ -require_once "PEAR.php"; +require_once "lib/pear/PEAR.php"; /** * Storage driver for fetching login data from LDAP Modified: trunk/lib/pear/Auth/Container/Multiple.php =================================================================== --- trunk/lib/pear/Auth/Container/Multiple.php 2008-07-18 15:16:43 UTC (rev 13715) +++ trunk/lib/pear/Auth/Container/Multiple.php 2008-07-18 15:21:03 UTC (rev 13716) @@ -24,11 +24,11 @@ /** * Include Auth_Container base class */ -require_once "Auth/Container.php"; +require_once "lib/pear/Auth/Container.php"; /** * Include PEAR package for error handling */ -require_once "PEAR.php"; +require_once "lib/pear/PEAR.php"; /** * Storage driver for using multiple storage drivers in a fall through fashion Modified: trunk/lib/pear/Auth/Container/POP3.php =================================================================== --- trunk/lib/pear/Auth/Container/POP3.php 2008-07-18 15:16:43 UTC (rev 13715) +++ trunk/lib/pear/Auth/Container/POP3.php 2008-07-18 15:21:03 UTC (rev 13716) @@ -28,15 +28,15 @@ /** * Include Auth_Container base class */ -require_once 'Auth/Container.php'; +require_once 'lib/pear/Auth/Container.php'; /** * Include PEAR package for error handling */ -require_once 'PEAR.php'; +require_once 'lib/pear/PEAR.php'; /** * Include PEAR Net_POP3 package */ -require_once 'Net/POP3.php'; +require_once 'lib/pear/Net/POP3.php'; /** * Storage driver for Authentication on a POP3 server. Modified: trunk/lib/pear/Auth/Container/SAP.php =================================================================== --- trunk/lib/pear/Auth/Container/SAP.php 2008-07-18 15:16:43 UTC (rev 13715) +++ trunk/lib/pear/Auth/Container/SAP.php 2008-07-18 15:21:03 UTC (rev 13716) @@ -28,11 +28,11 @@ /** * Include Auth_Container base class */ -require_once 'Auth/Container.php'; +require_once 'lib/pear/Auth/Container.php'; /** * Include PEAR for error handling */ -require_once 'PEAR.php'; +require_once 'lib/pear/PEAR.php'; /** * Performs authentication against a SAP system using the SAPRFC PHP extension. Modified: trunk/lib/pear/Auth/Container/SMBPasswd.php =================================================================== --- trunk/lib/pear/Auth/Container/SMBPasswd.php 2008-07-18 15:16:43 UTC (rev 13715) +++ trunk/lib/pear/Auth/Container/SMBPasswd.php 2008-07-18 15:21:03 UTC (rev 13716) @@ -26,15 +26,15 @@ /** * Include PEAR File_SMBPasswd */ -require_once "File/SMBPasswd.php"; +require_once "lib/pear/File/SMBPasswd.php"; /** * Include Auth_Container Base file */ -require_once "Auth/Container.php"; +require_once "lib/pear/Auth/Container.php"; /** * Include PEAR class for error handling */ -require_once "PEAR.php"; +require_once "lib/pear/PEAR.php"; /** * Storage driver for fetching login data from an SAMBA smbpasswd file. Modified: trunk/lib/pear/Auth/Container/SOAP.php =================================================================== --- trunk/lib/pear/Auth/Container/SOAP.php 2008-07-18 15:16:43 UTC (rev 13715) +++ trunk/lib/pear/Auth/Container/SOAP.php 2008-07-18 15:21:03 UTC (rev 13716) @@ -26,15 +26,15 @@ /** * Include Auth_Container base class */ -require_once "Auth/Container.php"; +require_once "lib/pear/Auth/Container.php"; /** * Include PEAR package for error handling */ -require_once "PEAR.php"; +require_once "lib/pear/PEAR.php"; /** * Include PEAR SOAP_Client */ -require_once 'SOAP/Client.php'; +require_once 'lib/pear/SOAP/Client.php'; /** * Storage driver for fetching login data from SOAP Modified: trunk/lib/pear/Auth/Container/SOAP5.php =================================================================== --- trunk/lib/pear/Auth/Container/SOAP5.php 2008-07-18 15:16:43 UTC (rev 13715) +++ trunk/lib/pear/Auth/Container/SOAP5.php 2008-07-18 15:21:03 UTC (rev 13716) @@ -26,11 +26,11 @@ /** * Include Auth_Container base class */ -require_once "Auth/Container.php"; +require_once "lib/pear/Auth/Container.php"; /** * Include PEAR package for error handling */ -require_once "PEAR.php"; +require_once "lib/pear/PEAR.php"; /** * Storage driver for fetching login data from SOAP using the PHP5 Builtin SOAP Modified: trunk/lib/pear/Auth/Container/vpopmail.php =================================================================== --- trunk/lib/pear/Auth/Container/vpopmail.php 2008-07-18 15:16:43 UTC (rev 13715) +++ trunk/lib/pear/Auth/Container/vpopmail.php 2008-07-18 15:21:03 UTC (rev 13716) @@ -26,11 +26,11 @@ /** * Include Auth_Container base class */ -require_once "Auth/Container.php"; +require_once "lib/pear/Auth/Container.php"; /** * Include PEAR package for error handling */ -require_once "PEAR.php"; +require_once "lib/pear/PEAR.php"; /** * Storage driver for fetching login data from vpopmail Modified: trunk/lib/pear/Auth.php =================================================================== --- trunk/lib/pear/Auth.php 2008-07-18 15:16:43 UTC (rev 13715) +++ trunk/lib/pear/Auth.php 2008-07-18 15:21:03 UTC (rev 13716) @@ -319,7 +319,7 @@ @session_start(); if(!session_id()) { // Throw error - include_once 'PEAR.php'; + include_once 'lib/pear/PEAR.php'; PEAR::throwError('Session could not be started by Auth, ' .'possibly headers are already sent, try putting ' .'ob_start in the beginning of your script'); Modified: trunk/lib/pear/DB/common.php =================================================================== --- trunk/lib/pear/DB/common.php 2008-07-18 15:16:43 UTC (rev 13715) +++ trunk/lib/pear/DB/common.php 2008-07-18 15:21:03 UTC (rev 13716) @@ -27,7 +27,7 @@ /** * Obtain the PEAR class so it can be extended from */ -require_once 'PEAR.php'; +require_once 'lib/pear/PEAR.php'; /** * DB_common is the base class from which each database driver class extends Modified: trunk/lib/pear/DB.php =================================================================== --- trunk/lib/pear/DB.php 2008-07-18 15:16:43 UTC (rev 13715) +++ trunk/lib/pear/DB.php 2008-07-18 15:21:03 UTC (rev 13716) @@ -27,7 +27,7 @@ /** * Obtain the PEAR class so it can be extended from */ -require_once 'PEAR.php'; +require_once 'lib/pear/PEAR.php'; // {{{ constants Modified: trunk/lib/pear/Date/Span.php =================================================================== --- trunk/lib/pear/Date/Span.php 2008-07-18 15:16:43 UTC (rev 13715) +++ trunk/lib/pear/Date/Span.php 2008-07-18 15:21:03 UTC (rev 13716) @@ -47,12 +47,12 @@ /** * Get the Date class */ -require_once 'Date.php'; +require_once 'lib/pear/Date.php'; /** * Get the Date_Calc class */ -require_once 'Date/Calc.php'; +require_once 'lib/pear/Date/Calc.php'; // }}} // {{{ Constants @@ -1101,4 +1101,4 @@ * c-hanging-comment-ender-p: nil * End: */ -?> \ No newline at end of file +?> Modified: trunk/lib/pear/Date.php =================================================================== --- trunk/lib/pear/Date.php 2008-07-18 15:16:43 UTC (rev 13715) +++ trunk/lib/pear/Date.php 2008-07-18 15:21:03 UTC (rev 13716) @@ -61,12 +61,12 @@ // }}} // {{{ Includes -require_once 'PEAR.php'; +require_once 'lib/pear/PEAR.php'; /** * Load Date_TimeZone */ -require_once 'Date/TimeZone.php'; +require_once 'lib/pear/Date/TimeZone.php'; /** * Load Date_Calc @@ -5860,4 +5860,4 @@ * c-hanging-comment-ender-p: nil * End: */ -?> \ No newline at end of file +?> Modified: trunk/lib/pear/HTTP/Request.php =================================================================== --- trunk/lib/pear/HTTP/Request.php 2008-07-18 15:16:43 UTC (rev 13715) +++ trunk/lib/pear/HTTP/Request.php 2008-07-18 15:21:03 UTC (rev 13716) @@ -47,7 +47,7 @@ /** * PEAR and PEAR_Error classes (for error handling) */ -require_once 'PEAR.php'; +require_once 'lib/pear/PEAR.php'; /** * Socket class */ Modified: trunk/lib/pear/NNTP.php =================================================================== --- trunk/lib/pear/NNTP.php 2008-07-18 15:16:43 UTC (rev 13715) +++ trunk/lib/pear/NNTP.php 2008-07-18 15:21:03 UTC (rev 13716) @@ -20,7 +20,7 @@ // // Id: NNTP.php,v 1.4 2007/02/04 20:09:41 mose Exp -require_once 'PEAR.php'; +require_once 'lib/pear/PEAR.php'; define('PEAR_NNTP_ALL', 0); define('PEAR_NNTP_NAMES', 1); Modified: trunk/lib/pear/Net/DIME.php =================================================================== --- trunk/lib/pear/Net/DIME.php 2008-07-18 15:16:43 UTC (rev 13715) +++ trunk/lib/pear/Net/DIME.php 2008-07-18 15:21:03 UTC (rev 13716) @@ -20,7 +20,7 @@ // Id: DIME.php,v 1.5 2002/09/29 01:55:16 shane Exp // -require_once 'PEAR.php'; +require_once 'lib/pear/PEAR.php'; /** * * DIME Encoding/Decoding @@ -626,4 +626,4 @@ return NULL; } } -?> \ No newline at end of file +?> Modified: trunk/lib/pear/Net/Socket.php =================================================================== --- trunk/lib/pear/Net/Socket.php 2008-07-18 15:16:43 UTC (rev 13715) +++ trunk/lib/pear/Net/Socket.php 2008-07-18 15:21:03 UTC (rev 13716) @@ -19,7 +19,7 @@ // // Id: Socket.php,v 1.31 2007/05/04 04:30:29 chagenbu Exp -require_once 'PEAR.php'; +require_once 'lib/pear/PEAR.php'; define('NET_SOCKET_READ', 1); define('NET_SOCKET_WRITE', 2); Modified: trunk/lib/pear/PEAR/ChannelFile.php =================================================================== --- trunk/lib/pear/PEAR/ChannelFile.php 2008-07-18 15:16:43 UTC (rev 13715) +++ trunk/lib/pear/PEAR/ChannelFile.php 2008-07-18 15:21:03 UTC (rev 13716) @@ -23,9 +23,9 @@ /** * Needed for error handling */ -require_once 'PEAR/ErrorStack.php'; -require_once 'PEAR/XMLParser.php'; -require_once 'PEAR/Common.php'; +require_once 'lib/pear/PEAR/ErrorStack.php'; +require_once 'lib/pear/PEAR/XMLParser.php'; +require_once 'lib/pear/PEAR/Common.php'; /** * Error code if the channel.xml <channel> tag does not contain a valid version @@ -393,7 +393,7 @@ { if (!file_exists($descfile) || !is_file($descfile) || !is_readable($descfile) || (!$fp = fopen($descfile, 'r'))) { - require_once 'PEAR.php'; + require_once 'lib/pear/PEAR.php'; return PEAR::raiseError("Unable to open $descfile"); } @@ -429,7 +429,7 @@ } } if (PEAR::isError($info)) { - require_once 'PEAR.php'; + require_once 'lib/pear/PEAR.php'; return PEAR::raiseError($info); } } Modified: trunk/lib/pear/PEAR/Command/Common.php =================================================================== --- trunk/lib/pear/PEAR/Command/Common.php 2008-07-18 15:16:43 UTC (rev 13715) +++ trunk/lib/pear/PEAR/Command/Common.php 2008-07-18 15:21:03 UTC (rev 13716) @@ -24,7 +24,7 @@ /** * base class */ -require_once 'PEAR.php'; +require_once 'lib/pear/PEAR.php'; /** * PEAR commands base class Modified: trunk/lib/pear/PEAR/Command.php =================================================================== --- trunk/lib/pear/PEAR/Command.php 2008-07-18 15:16:43 UTC (rev 13715) +++ trunk/lib/pear/PEAR/Command.php 2008-07-18 15:21:03 UTC (rev 13716) @@ -24,9 +24,9 @@ /** * Needed for error handling */ -require_once 'PEAR.php'; -require_once 'PEAR/Frontend.php'; -require_once 'PEAR/XMLParser.php'; +require_once 'lib/pear/PEAR.php'; +require_once 'lib/pear/PEAR/Frontend.php'; +require_once 'lib/pear/PEAR/XMLParser.php'; /** * List of commands and what classes they are implemented in. Modified: trunk/lib/pear/PEAR/Common.php =================================================================== --- trunk/lib/pear/PEAR/Common.php 2008-07-18 15:16:43 UTC (rev 13715) +++ trunk/lib/pear/PEAR/Common.php 2008-07-18 15:21:03 UTC (rev 13716) @@ -26,7 +26,7 @@ /** * Include error handling */ -require_once 'PEAR.php'; +require_once 'lib/pear/PEAR.php'; // {{{ constants and globals @@ -1123,4 +1123,4 @@ } require_once 'PEAR/Config.php'; require_once 'PEAR/PackageFile.php'; -?> \ No newline at end of file +?> Modified: trunk/lib/pear/PEAR/Config.php =================================================================== --- trunk/lib/pear/PEAR/Config.php 2008-07-18 15:16:43 UTC (rev 13715) +++ trunk/lib/pear/PEAR/Config.php 2008-07-18 15:21:03 UTC (rev 13716) @@ -24,11 +24,11 @@ /** * Required for error handling */ -require_once 'PEAR.php'; -require_once 'PEAR/Registry.php'; -require_once 'PEAR/Installer/Role.php'; -require_once 'System.php'; -require_once 'PEAR/Remote.php'; +require_once 'lib/pear/PEAR.php'; +require_once 'lib/pear/PEAR/Registry.php'; +require_once 'lib/pear/PEAR/Installer/Role.php'; +require_once 'lib/pear/System.php'; +require_once 'lib/pear/PEAR/Remote.php'; /** * Last created PEAR_Config instance. Modified: trunk/lib/pear/PEAR/Dependency.php =================================================================== --- trunk/lib/pear/PEAR/Dependency.php 2008-07-18 15:16:43 UTC (rev 13715) +++ trunk/lib/pear/PEAR/Dependency.php 2008-07-18 15:21:03 UTC (rev 13716) @@ -20,8 +20,8 @@ // THIS FILE IS DEPRECATED IN FAVOR OF DEPENDENCY2.PHP, AND IS NOT USED IN THE INSTALLER // Id: Dependency.php,v 1.42 2006/03/26 23:25:56 cellog Exp -require_once "PEAR.php"; -require_once "OS/Guess.php"; +require_once "lib/pear/PEAR.php"; +require_once "lib/pear/OS/Guess.php"; define('PEAR_DEPENDENCY_MISSING', -1); define('PEAR_DEPENDENCY_CONFLICT', -2); Modified: trunk/lib/pear/PEAR/DependencyDB.php =================================================================== --- trunk/lib/pear/PEAR/DependencyDB.php 2008-07-18 15:16:43 UTC (rev 13715) +++ trunk/lib/pear/PEAR/DependencyDB.php 2008-07-18 15:21:03 UTC (rev 13716) @@ -24,8 +24,8 @@ /** * Needed for error handling */ -require_once 'PEAR.php'; -require_once 'PEAR/Config.php'; +require_once 'lib/pear/PEAR.php'; +require_once 'lib/pear/PEAR/Config.php'; $GLOBALS['_PEAR_DEPENDENCYDB_INSTANCE'] = array(); /** @@ -704,4 +704,4 @@ } } } -?> \ No newline at end of file +?> Modified: trunk/lib/pear/PEAR/ErrorStack.php =================================================================== --- trunk/lib/pear/PEAR/ErrorStack.php 2008-07-18 15:16:43 UTC (rev 13715) +++ trunk/lib/pear/PEAR/ErrorStack.php 2008-07-18 15:21:03 UTC (rev 13716) @@ -975,7 +975,7 @@ */ function raiseError() { - require_once 'PEAR.php'; + require_once 'lib/pear/PEAR.php'; $args = func_get_args(); return call_user_func_array(array('PEAR', 'raiseError'), $args); } Modified: trunk/lib/pear/PEAR/PackageFile/Generator/v2.php =================================================================== --- trunk/lib/pear/PEAR/PackageFile/Generator/v2.php 2008-07-18 15:16:43 UTC (rev 13715) +++ trunk/lib/pear/PEAR/PackageFile/Generator/v2.php 2008-07-18 15:21:03 UTC (rev 13716) @@ -23,7 +23,7 @@ /** * file/dir manipulation routines */ -require_once 'System.php'; +require_once 'lib/pear/System.php'; /** * This class converts a PEAR_PackageFile_v2 object into any output format. * @@ -1522,8 +1522,8 @@ */ function raiseError($msg, $code) { - require_once 'PEAR.php'; + require_once 'lib/pear/PEAR.php'; return PEAR::raiseError($msg, $code); } } -?> \ No newline at end of file +?> Modified: trunk/lib/pear/PEAR/REST.php =================================================================== --- trunk/lib/pear/PEAR/REST.php 2008-07-18 15:16:43 UTC (rev 13715) +++ trunk/lib/pear/PEAR/REST.php 2008-07-18 15:21:03 UTC (rev 13716) @@ -23,8 +23,8 @@ /** * For downloading xml files */ -require_once 'PEAR.php'; -require_once 'PEAR/XMLParser.php'; +require_once 'lib/pear/PEAR.php'; +require_once 'lib/pear/PEAR/XMLParser.php'; /** * Intelligently retrieve data, following hyperlinks if necessary, and re-directing Modified: trunk/lib/pear/PEAR/Registry.php =================================================================== --- trunk/lib/pear/PEAR/Registry.php 2008-07-18 15:16:43 UTC (rev 13715) +++ trunk/lib/pear/PEAR/Registry.php 2008-07-18 15:21:03 UTC (rev 13716) @@ -25,8 +25,8 @@ /** * for PEAR_Error */ -require_once 'PEAR.php'; -require_once 'PEAR/DependencyDB.php'; +require_once 'lib/pear/PEAR.php'; +require_once 'lib/pear/PEAR/DependencyDB.php'; define('PEAR_REGISTRY_ERROR_LOCK', -2); define('PEAR_REGISTRY_ERROR_FORMAT', -3); Modified: trunk/lib/pear/PEAR/Remote.php =================================================================== --- trunk/lib/pear/PEAR/Remote.php 2008-07-18 15:16:43 UTC (rev 13715) +++ trunk/lib/pear/PEAR/Remote.php 2008-07-18 15:21:03 UTC (rev 13716) @@ -24,8 +24,8 @@ /** * needed for PEAR_Error */ -require_once 'PEAR.php'; -require_once 'PEAR/Config.php'; +require_once 'lib/pear/PEAR.php'; +require_once 'lib/pear/PEAR/Config.php'; /** * This is a class for doing remote operations against the central Modified: trunk/lib/pear/PEAR/RunTest.php =================================================================== --- trunk/lib/pear/PEAR/RunTest.php 2008-07-18 15:16:43 UTC (rev 13715) +++ trunk/lib/pear/PEAR/RunTest.php 2008-07-18 15:21:03 UTC (rev 13716) @@ -24,8 +24,8 @@ /** * for error handling */ -require_once 'PEAR.php'; -require_once 'PEAR/Config.php'; +require_once 'lib/pear/PEAR.php'; +require_once 'lib/pear/PEAR/Config.php'; define('DETAILED', 1); putenv("PHP_PEAR_RUNTESTS=1"); Modified: trunk/lib/pear/PEAR/Task/Common.php =================================================================== --- trunk/lib/pear/PEAR/Task/Common.php 2008-07-18 15:16:43 UTC (rev 13715) +++ trunk/lib/pear/PEAR/Task/Common.php 2008-07-18 15:21:03 UTC (rev 13716) @@ -201,8 +201,8 @@ function throwError($msg, $code = -1) { - include_once 'PEAR.php'; + include_once 'lib/pear/PEAR.php'; return PEAR::raiseError($msg, $code); } } -?> \ No newline at end of file +?> Modified: trunk/lib/pear/PEAR/XMLParser.php =================================================================== --- trunk/lib/pear/PEAR/XMLParser.php 2008-07-18 15:16:43 UTC (rev 13715) +++ trunk/lib/pear/PEAR/XMLParser.php 2008-07-18 15:21:03 UTC (rev 13716) @@ -80,7 +80,7 @@ function parse($data) { if (!extension_loaded('xml')) { - include_once 'PEAR.php'; + include_once 'lib/pear/PEAR.php'; return PEAR::raiseError("XML Extension not found", 1); } $this->_valStack = array(); @@ -107,7 +107,7 @@ $msg = xml_error_string(xml_get_error_code($xp)); $line = xml_get_current_line_number($xp); xml_parser_free($xp); - include_once 'PEAR.php'; + include_once 'lib/pear/PEAR.php'; return PEAR::raiseError("XML Error: '$msg' on line '$line'", 2); } xml_parser_free($xp); @@ -258,4 +258,4 @@ $this->_dataStack[$this->_depth] .= $cdata; } } -?> \ No newline at end of file +?> Modified: trunk/lib/pear/System.php =================================================================== --- trunk/lib/pear/System.php 2008-07-18 15:16:43 UTC (rev 13715) +++ trunk/lib/pear/System.php 2008-07-18 15:21:03 UTC (rev 13716) @@ -23,8 +23,8 @@ /** * base class */ -require_once 'PEAR.php'; -require_once 'Console/Getopt.php'; +require_once 'lib/pear/PEAR.php'; +require_once 'lib/pear/Console/Getopt.php'; $GLOBALS['_System_temp_files'] = array(); Modified: trunk/lib/pear/XML/Dump.php =================================================================== --- trunk/lib/pear/XML/Dump.php 2008-07-18 15:16:43 UTC (rev 13715) +++ trunk/lib/pear/XML/Dump.php 2008-07-18 15:21:03 UTC (rev 13716) @@ -19,7 +19,7 @@ /** * Pull in the XML_RPC class */ -require_once 'XML/RPC.php'; +require_once 'lib/pear/XML/RPC.php'; /** @@ -70,7 +70,7 @@ function generateDump($value, $nLevel = 0) { if (!is_object($value) && get_class($value) != 'xml_rpc_value') { - require_once 'PEAR.php'; + require_once 'lib/pear/PEAR.php'; PEAR::raiseError('Tried to dump non-XML_RPC_Value variable' . "\r\n", 0, PEAR_ERROR_PRINT); if (is_object($value)) { @@ -93,7 +93,7 @@ $ret = $this->genScalar($value->scalarval(), $nLevel); break; default: - require_once 'PEAR.php'; + require_once 'lib/pear/PEAR.php'; PEAR::raiseError('Illegal type "' . $value->kindOf() . '" in XML_RPC_Value' . "\r\n", 0, PEAR_ERROR_PRINT); Modified: trunk/lib/pear/XML/RPC.php =================================================================== --- trunk/lib/pear/XML/RPC.php 2008-07-18 15:16:43 UTC (rev 13715) +++ trunk/lib/pear/XML/RPC.php 2008-07-18 15:21:03 UTC (rev 13716) @@ -38,7 +38,7 @@ if (!function_exists('xml_parser_create')) { - include_once 'PEAR.php'; + include_once 'lib/pear/PEAR.php'; PEAR::loadExtension('xml'); } @@ -591,7 +591,7 @@ */ function raiseError($msg, $code) { - include_once 'PEAR.php'; + include_once 'lib/pear/PEAR.php'; if (is_object(@$this)) { return PEAR::raiseError(get_class($this) . ': ' . $msg, $code); } else { Modified: trunk/lib/pear/XML/Server.php =================================================================== --- trunk/lib/pear/XML/Server.php 2008-07-18 15:16:43 UTC (rev 13715) +++ trunk/lib/pear/XML/Server.php 2008-07-18 15:21:03 UTC (rev 13716) @@ -40,7 +40,7 @@ /** * Pull in the XML_RPC class */ -require_once 'XML/RPC.php'; +require_once 'lib/pear/XML/RPC.php'; /** Modified: trunk/tiki-install.php =================================================================== --- trunk/tiki-install.php 2008-07-18 15:16:43 UTC (rev 13715) +++ trunk/tiki-install.php 2008-07-18 15:21:03 UTC (rev 13716) @@ -51,7 +51,7 @@ TikiInit::prependIncludePath('lib/pear'); include_once("db/local.php"); - include_once ('adodb.inc.php'); + include_once('lib/adodb/adodb.inc.php'); $dbTiki = &ADONewConnection($db_tiki); if( ! $dbTiki->Connect( $host_tiki, $user_tiki, $pass_tiki, $dbs_tiki ) ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lph...@us...> - 2008-07-18 23:06:35
|
Revision: 13743 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=13743&view=rev Author: lphuberdeau Date: 2008-07-18 23:06:43 +0000 (Fri, 18 Jul 2008) Log Message: ----------- [MRG] Automatic merge, branches/2.0 13653 to 13737 Modified Paths: -------------- trunk/_htaccess trunk/db/tiki-2.0-mysql.sql trunk/db/tiki-2.0-mysqli.sql trunk/db/tiki-2.0-oci8.sql trunk/db/tiki-2.0-pgsql.sql trunk/db/tiki-2.0-sqlite.sql trunk/db/tiki-2.0-sybase.sql trunk/db/tiki-secdb_2.0_mysql.sql trunk/db/tiki.sql trunk/lang/pt-br/language.php trunk/lib/setup/prefs.php trunk/lib/setup/twversion.class.php trunk/lib/smarty_tiki/block.self_link.php trunk/lib/tikilib.php trunk/lib/wiki-plugins/wikiplugin_tracker.php trunk/lib/wiki-plugins/wikiplugin_trackerlist.php trunk/styles/tikineat.css trunk/templates/comments.tpl trunk/templates/tiki-user_menu.tpl trunk/templates/tiki-view_blog.tpl trunk/templates/tiki-view_blog_post.tpl trunk/tiki-file_galleries_rss.php Removed Paths: ------------- trunk/lib/wiki-plugins/wikiplugin_posts.php trunk/templates/tiki-list_blog_posts.tpl Modified: trunk/_htaccess =================================================================== --- trunk/_htaccess 2008-07-18 23:03:05 UTC (rev 13742) +++ trunk/_htaccess 2008-07-18 23:06:43 UTC (rev 13743) @@ -15,6 +15,7 @@ deny from all </FilesMatch> +<IfModule mod_rewrite.c> RewriteEngine On # direct one-word access @@ -80,3 +81,5 @@ # how to redierct to a wiki page on a not found error: take away the comment + adapt the pagename # ErrorDocument 404 tiki-index.php?page=Page+not+found +</IfModule> +# End of rewrite rules Modified: trunk/db/tiki-2.0-mysql.sql =================================================================== --- trunk/db/tiki-2.0-mysql.sql 2008-07-18 23:03:05 UTC (rev 13742) +++ trunk/db/tiki-2.0-mysql.sql 2008-07-18 23:06:43 UTC (rev 13743) @@ -2268,6 +2268,7 @@ name varchar(200) NOT NULL default '', description text, type char(1) default NULL, + icon varchar(200) default NULL, PRIMARY KEY (menuId) ) ENGINE=MyISAM AUTO_INCREMENT=1 ; # -------------------------------------------------------- Modified: trunk/db/tiki-2.0-mysqli.sql =================================================================== --- trunk/db/tiki-2.0-mysqli.sql 2008-07-18 23:03:05 UTC (rev 13742) +++ trunk/db/tiki-2.0-mysqli.sql 2008-07-18 23:06:43 UTC (rev 13743) @@ -2268,6 +2268,7 @@ name varchar(200) NOT NULL default '', description text, type char(1) default NULL, + icon varchar(200) default NULL, PRIMARY KEY (menuId) ) ENGINE=MyISAM AUTO_INCREMENT=1 ; # -------------------------------------------------------- Modified: trunk/db/tiki-2.0-oci8.sql =================================================================== --- trunk/db/tiki-2.0-oci8.sql 2008-07-18 23:03:05 UTC (rev 13742) +++ trunk/db/tiki-2.0-oci8.sql 2008-07-18 23:06:43 UTC (rev 13743) @@ -2811,6 +2811,7 @@ "name" varchar(200) default '' NOT NULL, "description" clob, "type" char(1) default NULL, + "icon" varchar(200) default NULL, PRIMARY KEY (menuId) ) ENGINE=MyISAM ; Modified: trunk/db/tiki-2.0-pgsql.sql =================================================================== --- trunk/db/tiki-2.0-pgsql.sql 2008-07-18 23:03:05 UTC (rev 13742) +++ trunk/db/tiki-2.0-pgsql.sql 2008-07-18 23:06:43 UTC (rev 13743) @@ -2641,6 +2641,7 @@ "name" varchar(200) NOT NULL default '', "description" text, "type" char(1) default NULL, + "icon" varchar(200) default NULL, PRIMARY KEY ("menuId") ) ENGINE=MyISAM ; Modified: trunk/db/tiki-2.0-sqlite.sql =================================================================== --- trunk/db/tiki-2.0-sqlite.sql 2008-07-18 23:03:05 UTC (rev 13742) +++ trunk/db/tiki-2.0-sqlite.sql 2008-07-18 23:06:43 UTC (rev 13743) @@ -2650,6 +2650,7 @@ "name" varchar(200) NOT NULL default '', "description" text, "type" char(1) default NULL, + "icon" varchar(200) default NULL, PRIMARY KEY (menuId) ) ENGINE=MyISAM ; Modified: trunk/db/tiki-2.0-sybase.sql =================================================================== --- trunk/db/tiki-2.0-sybase.sql 2008-07-18 23:03:05 UTC (rev 13742) +++ trunk/db/tiki-2.0-sybase.sql 2008-07-18 23:06:43 UTC (rev 13743) @@ -3487,6 +3487,7 @@ "name" varchar(200) default '' NOT NULL, "description" text default '', "type" char(1) default NULL NULL, + "icon" varchar(200) default NULL NULL, PRIMARY KEY (menuId) ) ENGINE=MyISAM go Modified: trunk/db/tiki-secdb_2.0_mysql.sql =================================================================== --- trunk/db/tiki-secdb_2.0_mysql.sql 2008-07-18 23:03:05 UTC (rev 13742) +++ trunk/db/tiki-secdb_2.0_mysql.sql 2008-07-18 23:06:43 UTC (rev 13743) @@ -1,2029 +1,2034 @@ -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('fab2588a046522a85149b2d5b8e2e2c0', './db/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('ff3e4a668ea84b79decd9f7dc641c46d', './db/oracle/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('acce8338f0537cb5a292aa2f33484750', './db/convertscripts/mysql3tosqlite.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('96f9345583603f8333a48e86efdc1716', './db/convertscripts/mysql3tooci8.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('c1cdd5b40f66fd478fd4aef6f3c37891', './db/convertscripts/mysql3tosybase.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('981226b2822bdbc810cf839f969bc6c3', './db/convertscripts/mysql3topgsql72.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('b84d0e93b84ee54b3ec2c01a3edb9ec8', './db/convertscripts/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('758fe7e1b2d65e5e201ac82cf0dfc032', './db/case_patch.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('b84d0e93b84ee54b3ec2c01a3edb9ec8', './db/profiles/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('9a710ba0ff1a932e2a7e713428569e4c', './db/tiki-db.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('9959b81fff4b39e86f328c598b572e3b', './tiki-wiki3d.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('ec75c5fa3f718c640767be649417a5b7', './bin/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('98b156560ae47141e5f06afb531787ca', './doc/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('642192a280220fb484477817d0fd4afa', './doc/devtools/tiki-show_raw_links.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('d5f98e6c1ffeb11e9724212e130c51a2', './doc/devtools/tiki-create_md5.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('ca6989660ea083dbcdec83c93138ca8e', './doc/devtools/fckpackager.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('5f712f151c33cd66a8096ef73a11412b', './doc/devtools/convert_templates_prefs-1.10.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('a2102e195d7b845fe3aec9184da4ca1c', './doc/devtools/extract-img-db-to-fs.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('3514b40bf6f4151f3b19c05bb84d82b9', './doc/devtools/restorehelp.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('84545819812b922d3463c53f0ecdba9f', './doc/devtools/search_smarty_prefs-1.10.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('993788daae4188dc07ff036874f7970e', './doc/devtools/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('a7855a353c3c38f68f769f06f334afd4', './doc/devtools/sync.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('2c450afc683c36483abc8e9e4ea2e999', './doc/devtools/securitycheck.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('da8a55568ec35d0130d764a5976a0f94', './doc/devtools/usergeo.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('3bd515c5bd89e945caf9e08b59fe7619', './doc/devtools/ggg-trace.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('b9c6185e71811671e4549264502b82bb', './doc/devtools/cleanCatTrackers.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('112a6d18e92b63c6463a3db8ed5d8c2e', './doc/devtools/parse_tiki.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('e4f65c095b094f9bd60a11c191b95a68', './img/icn/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('67a447e1617b272089af7a2e84855ad8', './img/tiki/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('7d8390e7c547041a7161901a690ba2ac', './img/wiki/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('2906db7e1abbd5c3ed3ecc2d191685d0', './img/flags/flagnames.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('22bf51530fb705aa22e1f2b3ecbf39b7', './img/flags/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('1f7dfd42b8552677a3853a2bf7a6ddac', './img/icons/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('f1f841fad35e53602411a0d298640463', './img/custom/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('62e1f5586a189d6157828d7b50300ab9', './img/icons2/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('b8f39d8cc7ec125c12c27429dbdb1221', './img/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('a81ec8f70e6bfb91f04a00f8dd3d547d', './img/mytiki/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('9049496e6ffb5220b37c9c244db6702a', './img/smiles/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('cf8a1a166b85563dc538483b4405e0b7', './img/webmail/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('72349be9d8730e019f32349f18118c71', './img/avatars/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('7ae15492ff707ed43c42291f56a217c6', './img/wiki_up/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('5e5b4d8ee5db315ac0d36ab197a9414b', './img/trackers/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('bfc3faa37b498df6e03beb1e301d2f93', './lib/x/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('caafb52dbf89c488a97d61fbed231827', './lib/db/tikitable.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('0184c887eada64d4bd7a662f0cd45da2', './lib/db/tiki_registration_fields.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('8ee79fe4c9705c61dc526156fc5d856f', './lib/ban/banlib.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('1b3fdd97ecadb197e8806d3138c2ed6a', './lib/ban/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('9935e69a1566b1a77e167151fb211f91', './lib/dcs/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('17d66419d1ff042d5e1cf4a7e90a18d0', './lib/dcs/dcslib.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('4e68e7ecd35a6180a2764c7582423c01', './lib/map/maplib.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('a734127180dc0cbf6cf89b0244d158c4', './lib/map/usermap.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('00702d2837ee02790d3878f671b754b5', './lib/map/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('a7104f11673caa4f289d88ac6b87de5c', './lib/map/map_query.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('6010daf30b5f81776e33fab0bd616822', './lib/rss/rsslib.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('32d7ae7cc42abdc99ebf7adefb4fb00d', './lib/rss/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('7d6cc4810cea3d9dbb3ba811c3bc12e7', './lib/ajax/xajaxCompress.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('9c05a39fb5eae61213a387a32f50570a', './lib/ajax/xajax.inc.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('5b3689129349efd63672f0d946eebec9', './lib/ajax/xajaxResponse.inc.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('d48f2e1347104d84cf914b93b5fc3f1d', './lib/ajax/ajaxlib.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('4bdf3fa1044d81cd6fed81c63b6b61bb', './lib/diff/renderer_character.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('cb46f5f1c56b406fd1a448b06437d329', './lib/diff/renderer_sidebyside.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('53d664a0cd71ed45362312e9c40e6a49', './lib/diff/Renderer.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('a78c93b7099c2ed88957f28f5cbc7541', './lib/diff/renderer_character_inline.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('12d7bf22c09c35d39757d3a4908f5e4a', './lib/diff/renderer_inline.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('4f248d6c65d93c786e465ec8b1714804', './lib/diff/renderer_unified.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('568dc52cd13372f6426d2bbf1fffdf27', './lib/diff/renderer_htmldiff.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('f9f447dddf579ef624e2e94b96f69c8c', './lib/diff/Diff.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('b25008f2091dd0bc68d16d30ca1a8fbd', './lib/diff/difflib.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('a99615e44ce799b57a811617c4900b87', './lib/diff/renderer_bytes.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('5dd8579216a7721a2ffafcfb310a54d1', './lib/faqs/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('906c51bff3d0d2f2e841bc8cf092a590', './lib/faqs/faqlib.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('86b093609886e74d270a6039f2be78b3', './lib/ical/iCal/Property.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('2c6d3daf4904d54036bc216da05a1df6', './lib/ical/iCal/Event.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('7301fbc1c03bc1fff84af79fc8a72326', './lib/ical/iCal/Alarm.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('ae4c55f120bd5ef60db36d05a9129ead', './lib/ical/iCal/Parser/iCalendar.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('190c81a2cf93a2b4e893ef201d575ba2', './lib/ical/iCal/iCalendar.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('7db4455608e9034b0abc4fa578e95699', './lib/ical/iCal/Recurrence.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('038d7407ffbdaae53b5bdd702e3051ae', './lib/ical/iCal/Attendee.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('d18be1c54b5b86026402c495a5cd58cf', './lib/ical/iCal/Parameter.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('640a5220946a10bee73654c60fe76052', './lib/ical/iCal/ContentLine.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('8aa6216a419cd6cb10ceb7d0d1cb92d2', './lib/ical/iCal/ExceptionRule.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('1f695d3cfcf5d350e15ea8329c7e2fe4', './lib/ical/iCal/ValueDataType.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('dcaf39e93944bf3f98cf9e45da6d7180', './lib/ical/iCal/Component.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('4f76e707e8cef3ba13a34e3eae70f9d3', './lib/ical/iCal/BaseComponent.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('5451d8173ba63fd06a346b95184b2977', './lib/ical/iCal/ToDo.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('c5f4e3f2e0698b396f396965ef2917ed', './lib/ical/iCal/TimeZone.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('f05bc392c12c47d441ec26f4611feba5', './lib/ical/iCal/FreeBusy.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('5eb92e304bdb8e26befc9c40d2377c52', './lib/ical/File.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('ffa86ab4a5a66300273992fa8657f76e', './lib/ical/iCal.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('98192c01592b07e58b655077dc2976a4', './lib/init/tra.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('b85afb9ee11102d1f4ddb113469b4b79', './lib/init/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('6bf8edf13d361d4a8c96d1e4312e4487', './lib/init/setup_inc.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('c4d622af02c571e711305ee5abb838c0', './lib/init/initlib.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('3ece6a1f959fb2309294fd619814c3dc', './lib/mail/maillib.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('01e8b27e515ac4cc4b684cd1ff4af116', './lib/mail/mimelib.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('c057282ce51293ae3afb5e80d19ef42c', './lib/logs/logslib.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('713bc89f7f4890adf33e00d01c736f32', './lib/mime/mimeextensions.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('c37c5ced2a11f7952eb2446b2ecd3365', './lib/mime/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('19b23f502a8411b76f1aee28bed73548', './lib/mime/mimetypes.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('4da4961d8b1ee59143092314c47b3f31', './lib/mime/mimelib.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('c569fcc183a3fdd452ec156c26b8ba10', './lib/mods/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('c5c8c7d157ef716b436db583c132d70b', './lib/mods/modslib.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('9905e2b2bd49a275b76794e822ec80dc', './lib/pear/DB/fbsql.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('c3c9df9c0f934e493308fa2304525277', './lib/pear/DB/msql.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('fbe9ed03b937998e2716712ab2e2ffdf', './lib/pear/DB/sqlite.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('ecf586e9fc113b5e0fbf5067d82ae80c', './lib/pear/DB/ibase.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('e8d1bc5b7e757a8879bf8726c79d3a29', './lib/pear/DB/mssql.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('56aff0b4a2ad06d59564abba40ba1b07', './lib/pear/DB/storage.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('4ab966ea009c1e23d7c076c133d4e98b', './lib/pear/DB/dbase.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('e9feb3abea0be7eee7b5df5ec33d936d', './lib/pear/DB/mysql4.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('db7f8f393ec17982a2240eec034f575e', './lib/pear/DB/mysqli.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('80ae5a2bed8b96fe36f85dcf5ae73432', './lib/pear/DB/sybase.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('ceea5ced9b5eb2e2f3c33a6508fd02f9', './lib/pear/DB/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('1b6120ab0510a5eda70434009ebc9206', './lib/pear/DB/oci8.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('3b15c50dd94405da91c5e27ce5e41c6c', './lib/pear/DB/ifx.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('ff1ca5a2d0ec383c12b3f36a6e14036c', './lib/pear/DB/pgsql.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('1fbdb44bc60337b790eb22dd3beb8efc', './lib/pear/DB/mysql.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('bf4600cbc3b3d7447a961828dbb21390', './lib/pear/DB/odbc.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('9860844b00ebfef6670d9aba0c1dea39', './lib/pear/DB/common.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('9ca81e3efacc58b11f6abf28fc16e170', './lib/pear/OS/Guess.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('92232cd2fc5e1cc1377ef8a0a9e0bc35', './lib/pear/Net/DNS/RR/CNAME.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('3bd6d557dd0eda20a9999245aecbd2e1', './lib/pear/Net/DNS/RR/A.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('e8a44f5f773f8f3990dbb62ed21962f4', './lib/pear/Net/DNS/RR/MX.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('dd8cb8b9b7d29144e67014955371ec58', './lib/pear/Net/DNS/RR/NS.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('e6ba4e35dcfbb389a78dfe78f7f57cde', './lib/pear/Net/DNS/RR/SOA.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('c9aedf777c33388ba25b4dbff5148d17', './lib/pear/Net/DNS/RR/SRV.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('a68c4cbee7d724de4a9cd80784b16829', './lib/pear/Net/DNS/RR/TXT.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('0ff95e75841e10d3c796b406e75b85d9', './lib/pear/Net/DNS/RR/AAAA.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('349b96830a67b09a96d512c8aa645165', './lib/pear/Net/DNS/RR/HINFO.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('494de46414b44de8e93559145f1afdba', './lib/pear/Net/DNS/RR/NAPTR.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('7d56c6b283c1e5cfee863583c574c30e', './lib/pear/Net/DNS/RR/TSIG.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('2a481f218048f9f995740cdabfaa583d', './lib/pear/Net/DNS/RR/PTR.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('f5f9ee71dd6b1d5913619a9522f47eed', './lib/pear/Net/DNS/RR.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('8cb9639f0e28ae1440b93f1790ae4e03', './lib/pear/Net/DNS/Question.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('bddc375c1a7dc4050153fc032ac53de0', './lib/pear/Net/DNS/Resolver.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('1999a958b762c2d3c5a88e59053f6d61', './lib/pear/Net/DNS/Header.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('87bc38b5b0746b80298613b0227298cb', './lib/pear/Net/DNS/Packet.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('2e9880aef8741aef23f8acd88a1acb67', './lib/pear/Net/DNS.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('e4507f7e2230889c7b38b84a2fa70a15', './lib/pear/Net/Socket.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('c93e4ca980402c5ed87af9d80b9ecb70', './lib/pear/Net/URL.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('4c38c70a1a861bafa0caacf0ebdb7805', './lib/pear/Net/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('8ba64d808659934afbdedab0ca7219d1', './lib/pear/Net/DIME.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('aace5be2f848110b2b304a2b7b236d37', './lib/pear/XML/RPC.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('fc8aececd0f8f2f0d55329a9da8e9472', './lib/pear/XML/Server.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('dd4f92500eebc0fc8e94634ceb872d26', './lib/pear/XML/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('0ef9e1c81d362d36ebffcb5e6534b34f', './lib/pear/XML/Dump.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('5e5e820181b0bed6b9d9f90ac7d35efe', './lib/pear/Auth/Container/File.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('83f8144d57fad225b4ee9a27ed3c5823', './lib/pear/Auth/Container/SAP.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('2f21ddd9b12d9b2897febabdd2e2f3f3', './lib/pear/Auth/Container/Array.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('0e6bf20e2f6c63014ba5bdc0478492d2', './lib/pear/Auth/Container/IMAP.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('6b6b9dc23e4a9b10d6aa4d2cbf69afca', './lib/pear/Auth/Container/MDB.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('cf72017455ef818075e142b8c2cab275', './lib/pear/Auth/Container/KADM5.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('b276953e43141fc0f74ce1e7a217a312', './lib/pear/Auth/Container/MDB2.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('b9fb221a858c593c9bd5b21781636874', './lib/pear/Auth/Container/PEAR.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('91e80f6ea9cf99ba5ad1065216e203d9', './lib/pear/Auth/Container/SOAP.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('c734d6ee8f72e4b3388e41877da3a9d7', './lib/pear/Auth/Container/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('8ff28bb21efe6a3af1b0d8de74d2bbcb', './lib/pear/Auth/Container/SMBPasswd.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('626b19981170d6776731303bdaa26053', './lib/pear/Auth/Container/LDAP.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('a17801b2eaa4b2c890ec7b5805bc68b5', './lib/pear/Auth/Container/SOAP5.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('fe516feed650f62b52f866fd10cdcf21', './lib/pear/Auth/Container/DBLite.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('b942bf340c2f848672b9d5c5213c688b', './lib/pear/Auth/Container/vpopmail.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('d7f3b26113654ee28d189fb3219900b9', './lib/pear/Auth/Container/POP3.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('00e55dc33dff486833496a24075d6906', './lib/pear/Auth/Container/Multiple.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('6101309b3f0c660712b7f56fdae406af', './lib/pear/Auth/Container/RADIUS.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('ece1c8ff85a6606ea08b3d0749fa4ff4', './lib/pear/Auth/Container/DB.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('4bcddbac9c56dd93ff75203153520fc0', './lib/pear/Auth/Yadis/XRDS.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('94fe207c995bd278ae92346749013349', './lib/pear/Auth/Yadis/XRI.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('1d594ad53e183edae35965fd14c2f7b0', './lib/pear/Auth/Yadis/ParseHTML.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('c2ed8945aeef0ad05f718424e9563ff3', './lib/pear/Auth/Yadis/HTTPFetcher.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('65f6877b06ce7289e853dac0a069c921', './lib/pear/Auth/Yadis/Misc.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('c312563353152ef4f1c272025976fa30', './lib/pear/Auth/Yadis/ParanoidHTTPFetcher.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('9a3d99d44087ae694ead98ec130a41b2', './lib/pear/Auth/Yadis/Yadis.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('b0dccb27f25c4106ef97d2e807badb8d', './lib/pear/Auth/Yadis/XRIRes.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('ee7de67f71efe67d93e435e62eb7431f', './lib/pear/Auth/Yadis/Manager.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('09f171fc182d23b1c509980e3f6d6869', './lib/pear/Auth/Yadis/XML.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('6d0f86d774c115ec98c97d8712c2c2de', './lib/pear/Auth/Yadis/PlainHTTPFetcher.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('46073a7cd20c0ae74c2b1d2ae487949d', './lib/pear/Auth/OpenID/MySQLStore.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('5aaedef83cce12729a78a33ad7339b3c', './lib/pear/Auth/OpenID/Extension.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('27387317c5df36ca99bff5e88bce6dbf', './lib/pear/Auth/OpenID/Nonce.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('a22497b37513f5e7301f3779f5d97b87', './lib/pear/Auth/OpenID/Consumer.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('627604fa8e424b1aecfffa637bb65c3e', './lib/pear/Auth/OpenID/CryptUtil.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('29d29b55d83598a79dad4bed1b3ebb4e', './lib/pear/Auth/OpenID/SQLStore.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('3c7ccd97db1be63a8f6cbe77dd0cd17a', './lib/pear/Auth/OpenID/KVForm.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('d29d03e6efb5639e8e6457b98ad920c1', './lib/pear/Auth/OpenID/ServerRequest.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('ab0f024b356039a33f7e8ea3901d65ca', './lib/pear/Auth/OpenID/FileStore.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('388b08056e916312880d45f805df8abc', './lib/pear/Auth/OpenID/URINorm.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('d9d35878336c476fcf03eb3143c90f1c', './lib/pear/Auth/OpenID/Server.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('ae70925cef5709603201e300e9b9407f', './lib/pear/Auth/OpenID/SReg.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('ca9434290112f08d5cc8987a9ed6ef55', './lib/pear/Auth/OpenID/HMACSHA1.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('421b2e9dc95dbb8ff3fd6502f733422e', './lib/pear/Auth/OpenID/Interface.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('b5669db1fe88247603b459346a935443', './lib/pear/Auth/OpenID/Discover.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('28c95f10a969f1126bae5d52527f1795', './lib/pear/Auth/OpenID/Parse.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('660df7e89c5513d948537f5af1870931', './lib/pear/Auth/OpenID/DatabaseConnection.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('e840ade5c66779de28d2983f744c12e9', './lib/pear/Auth/OpenID/DumbStore.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('6a9b2ce5b33a378dfdbc58aab9bc6f9c', './lib/pear/Auth/OpenID/TrustRoot.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('45dc4a65d1d3bd6e10ba06841c779676', './lib/pear/Auth/OpenID/DiffieHellman.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('4855020fe55f579df8f99247977bd1d1', './lib/pear/Auth/OpenID/SQLiteStore.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('d9881c6ea945693a3770828c96349152', './lib/pear/Auth/OpenID/Association.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('0c5cb71785f5d083595c3a2fc4b1387b', './lib/pear/Auth/OpenID/Message.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('db8c4c5803b358e58e4936ab3818654b', './lib/pear/Auth/OpenID/MemcachedStore.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('e5865a3cf23c9273db99607250d6a431', './lib/pear/Auth/OpenID/PAPE.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('cd44fb875c4e686a216ef76c3050c212', './lib/pear/Auth/OpenID/PostgreSQLStore.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('b68edf987cc93f58e24d53e96e84fcbb', './lib/pear/Auth/OpenID/AX.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('a56dc458f1ef222812912f79ec393b4a', './lib/pear/Auth/OpenID/BigMath.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('75325f187ae203cd863c760238e30d6c', './lib/pear/Auth/OpenID.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('2e649d4cc396b000ab7ed52f645d64cb', './lib/pear/Auth/Frontend/Html.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('5a203556d10ea3c68d62d57a2cdfe591', './lib/pear/Auth/Controller.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('28df1f321a9377209758aef9fa38ed95', './lib/pear/Auth/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('01905f153e9356534b978b019e68b9fa', './lib/pear/Auth/Container.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('2056a1008679d8dc2a9098a0c962622a', './lib/pear/Auth/Anonymous.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('b6749a9c4bae7ace3d122ac54d7f923a', './lib/pear/Auth/Auth.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('f4b06ba56d19c8ff69be2ad145fa214d', './lib/pear/Date/Calc.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('19de73ea9672d6ca8248480c45377913', './lib/pear/Date/Human.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('bc3076d290d70309334e51099a5b9c32', './lib/pear/Date/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('1efd48fbfa04fa460bb1e2bea1496dc8', './lib/pear/Date/Span.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('4453316b96873b26ead2822f4d589591', './lib/pear/Date/TimeZone.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('ce18584968bde4ed5117e4750062d021', './lib/pear/HTTP/docs/example.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('1c6c27e31ee2cde67364c3b83250512a', './lib/pear/HTTP/docs/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('23b2f51eb8b8d99b61c676023663627d', './lib/pear/HTTP/Request.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('39a6707035051dbfc03d13200d674b08', './lib/pear/HTTP/Request/Listener.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('8a1d80d63a28005a1d6e5c6aff46363d', './lib/pear/HTTP/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('0b159ec45a5a706604a9fa0de0186998', './lib/pear/PEAR/REST/10.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('aab56f6f27b3cab2ecfeeac47e7c9e34', './lib/pear/PEAR/REST/11.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('f58b0ab73750429987f314f7053fe9ee', './lib/pear/PEAR/REST/13.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('c54e33e2b718b2e8912a81dc62d3e61c', './lib/pear/PEAR/Task/Windowseol.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('e72267c770a9f88d01ac06f0dc7c5dee', './lib/pear/PEAR/Task/Replace.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('7391884d1e5ef03d95851fd84dff640b', './lib/pear/PEAR/Task/Replace/rw.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('fddcac1523d082ba61b2dd7fd671f585', './lib/pear/PEAR/Task/Postinstallscript.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('288d2f1e1fc3551785e346f4387e87f2', './lib/pear/PEAR/Task/Unixeol.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('bc5dca669538b06a69f07e2d8adcd71d', './lib/pear/PEAR/Task/Windowseol/rw.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('d68ba93b34891a1d4433eaf78d08aec8', './lib/pear/PEAR/Task/Common.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('8c3e953b9f9a81fa0f2463c38ffb9765', './lib/pear/PEAR/Task/Postinstallscript/rw.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('ed1222c8198f1f88899b832b9a298d79', './lib/pear/PEAR/Task/Unixeol/rw.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('d1b07a8ebf4db686fd3fded4b65fb65b', './lib/pear/PEAR/Downloader.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('e07fcb2e1b36f0ec964a89f1de9798c0', './lib/pear/PEAR/Validator/PECL.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('fc586586593b29db1612ea22026be75d', './lib/pear/PEAR/Builder.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('febec893787a57f9b1010d95bddfc549', './lib/pear/PEAR/Installer.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('7c6d5c09bc29141ce0920d1b61b149ab', './lib/pear/PEAR/ErrorStack.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('ead9a6ea7824631d2241f1a48518493f', './lib/pear/PEAR/ChannelFile.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('e5892abe81521f5edd1845a31a0091a5', './lib/pear/PEAR/Downloader/Package.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('74d82b20b21f54787260a51309ef9d71', './lib/pear/PEAR/Frontend.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('416db6b77398e5e9055bed82638ccffb', './lib/pear/PEAR/Dependency.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('bbd8c9e6c44a1c1a83a87eeefad0a357', './lib/pear/PEAR/Remote.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('4cb1e73f9e29c4c8e50f6128f1fd0431', './lib/pear/PEAR/Config.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('e7081a97d34ead8f8bdcee998cf91119', './lib/pear/PEAR/Command/Test.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('6f12784592a5b17d38d6de700bc388a4', './lib/pear/PEAR/Command/Remote.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('b6378096e74b6af9a76bedc6153acc9b', './lib/pear/PEAR/Command/Config.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('8d522efb1f9dac5267b4875c964d495a', './lib/pear/PEAR/Command/Build.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('34de61a3a97bbc1157549b694f29d615', './lib/pear/PEAR/Command/Pickle.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('0afd51f8d34de4def1fb4ab1fc63937d', './lib/pear/PEAR/Command/Registry.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('a941e1bf3669340122b77e35960214f8', './lib/pear/PEAR/Command/Channels.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('f131f6e88e5d199aa50195e268cf093d', './lib/pear/PEAR/Command/Mirror.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('eba49e95ed6308d641d75b1be5f299df', './lib/pear/PEAR/Command/Common.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('dd2541402e1c750233ae0b724f91a8c7', './lib/pear/PEAR/Command/Install.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('ccc9a40f0ee06112bee7eb8e0d8f7554', './lib/pear/PEAR/Command/Package.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('1a7d580921ef848d6e4a599a228ddf4a', './lib/pear/PEAR/Command/Auth.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('665248a21424a9f5eb11c4000743be2f', './lib/pear/PEAR/Validate.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('a91985f454b9e012a00165a0adb5fed6', './lib/pear/PEAR/XMLParser.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('686bd6aa5d6764583a0b3818662d0510', './lib/pear/PEAR/Frontend/CLI.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('327ff6fccde43852ed59fede703a91d0', './lib/pear/PEAR/Registry.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('a2bfd5e599139bf2a76421c9e37aeae3', './lib/pear/PEAR/Exception.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('c5e9ec07c539c065c3274caaa0b74780', './lib/pear/PEAR/Packager.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('1bb322bda9af789074f5521e6010bc85', './lib/pear/PEAR/RunTest.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('edf44fd2faac12e6bbb01d393a9b6564', './lib/pear/PEAR/Installer/Role/Test.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('de3e00e9c2797757447352a4e07d84f8', './lib/pear/PEAR/Installer/Role/Php.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('cc39757e202d33bc01f8564af7f788d9', './lib/pear/PEAR/Installer/Role/Doc.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('c0bc7186707061e834192453bf3f35bd', './lib/pear/PEAR/Installer/Role/Script.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('cf18c76b383da43538219e361f10bf7f', './lib/pear/PEAR/Installer/Role/Src.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('be524dfee409680da002a3b6835209a8', './lib/pear/PEAR/Installer/Role/Ext.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('ab2d18979154bdc62729a8e44d5934ad', './lib/pear/PEAR/Installer/Role/Data.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('4e37444943bb601fb33f098e71bb34bf', './lib/pear/PEAR/Installer/Role/Common.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('2423c8662af9af64c83e247099ab15c0', './lib/pear/PEAR/Installer/Role.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('8222da2fcc9b571045348ea3c02d7ac1', './lib/pear/PEAR/ChannelFile/Parser.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('a76d14908798b7683c9e9013290eb100', './lib/pear/PEAR/REST.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('e02a2d46c8b116c073e26782651a7d85', './lib/pear/PEAR/DependencyDB.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('2fa82108b4526c73c7929e7bc46ce5f1', './lib/pear/PEAR/Common.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('47d78817811f5694ad70b6b7141e0ccd', './lib/pear/PEAR/PackageFile/v2/Validator.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('80e428bb5c1acce49d37176b48fb73a8', './lib/pear/PEAR/PackageFile/v2/rw.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('5e1ff681fd93b1cde04b08527cf3fd38', './lib/pear/PEAR/PackageFile/Generator/v1.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('fd0f214a154c4b0fca5f47cf322ed5b5', './lib/pear/PEAR/PackageFile/Generator/v2.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('70676cca54cf93921cb3c1657887f97f', './lib/pear/PEAR/PackageFile/Parser/v1.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('79189560d5b119a4aff3ea662b42b178', './lib/pear/PEAR/PackageFile/Parser/v2.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('aa7c8a7e46e9b3f8ae3deb239f40ed3d', './lib/pear/PEAR/PackageFile/v1.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('c766904fd7927ab51dd3ce43085bcbe0', './lib/pear/PEAR/PackageFile/v2.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('91ae716f31f5f73622991641c49bbeda', './lib/pear/PEAR/Command.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('917f3071135c9865a96e4d59376d3caa', './lib/pear/PEAR/Dependency2.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('6f89b3d08357892c75a3eb89614be9bc', './lib/pear/PEAR/PackageFile.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('7384f642030240aae790516d7103f008', './lib/pear/System.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('6f91fe81dbe036ee6297bc8ec1a10f6d', './lib/pear/PEAR.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('3a3f85ce303837c3f9929050ce194b81', './lib/pear/Services/JSON.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('a336be6cadf18bc16d83cf46ca42ea6e', './lib/pear/NNTP.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('5b0386f0adc9f868f21957d6c08833bb', './lib/pear/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('6b48ff95fd02266788c855a0b0e31bf6', './lib/pear/Date.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('0463bc738128413a596937ade91f1902', './lib/pear/Auth.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('5948fcc1a73a623d1cb098ccd225dc24', './lib/pear/DB.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('ddc282726a9516788704bd498680ca35', './lib/tabs/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('b9593375c99ac187fd44a5338e4fcfdd', './lib/tail/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('1c3c149fd70addb7a07a6070ea787da5', './lib/tree/tree.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('868285e51c5119cde22a0a453848ef3a', './lib/tree/categ_browse_tree.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('246e2b2835142d7565e9b1c3b8eaea06', './lib/tree/categ_admin_tree.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('2e1a392fe39bd881fee6bc6c0b20a5cf', './lib/tree/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('27fe8d76a05356507ecb6249b998a5bf', './lib/wiki/quantifylib.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('2a4d725ae4856e0cb46c6310df02c49c', './lib/wiki/wikilib.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('21d988eb3fd60f6d00211b178a37c2d7', './lib/wiki/wiki-ajax.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('8d854b2ee5269a46841495b2d0db63ee', './lib/wiki/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('605dc272817537bf6ad72dd9b3c06ad2', './lib/wiki/exportlib.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('ba45953bab8f40bd0092f0ed9e506042', './lib/wiki/histlib.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('9a704e15ad4f86a1d88f8672e28a62fb', './lib/wiki/pluginslib.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('d11693c0912dfc244b3d6a7503205531', './lib/structures/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('ca0d3e84f3acec1f838b10c624302d04', './lib/structures/structlib.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('451fe6451dfa13a84fbdcf382b73353d', './lib/equation/tmp/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('6912105a98d3cfb85db749b109dbc40d', './lib/equation/pictures/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('292e7b12fafe7b86a607519f69d5a210', './lib/equation/class.latexrender.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('a0d8764a14a9ca4f65fc4f210475ad63', './lib/bablotron.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('797660b7c34c07378cb8ac72a4877d2b', './lib/htmlpages/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('395020beeb3f52d40fcabd621da89073', './lib/htmlpages/htmlpageslib.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('996225b3d52660e3f9288e8ff29a6c63', './lib/tikilib.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('46a21a3bb37d30c8b985ba9208873fc3', './lib/diff.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('e6d8134958f379dcb5a8fc2e522a5b80', './lib/live_support/lslib.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('edabc749c11e32e4762902d2dd32a2ef', './lib/live_support/index.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('f51cf5d518a54d18d7caf6be26e6ecab', './lib/live_support/lsadminlib.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('f6cd764c871e1004d5ef9553e828ded5', './lib/Horde/Yaml/Loader.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('5708a9a233c09cf03fe9f37cecd6619f', './lib/Horde/Yaml/Exception.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('1515261fc34e2a763337f936b49f00c6', './lib/Horde/Yaml/Node.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('92e19794b66466dccf9e271ae81496ea', './lib/Horde/Yaml/Dumper.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('809658c6425f35b50bd4bacb6d0b1673', './lib/Horde/Yaml.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('ab36ed38f9fb02d94aa1a87e04780a92', './lib/graph-engine/graph.bar.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('874c7ccecf71aa980810027ce630d60a', './lib/graph-engine/graph.pie.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('a4072ced11a928532c22bfbac934599d', './lib/graph-engine/gd.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('49958376c9c8500f92a0fc42c13201c4', './lib/graph-engine/abstract.gridbased.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('f7af35438ed663e4c7711fd03ecc7112', './lib/graph-engine/core.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('5d64f8fb40bdd36d7ff7bdf54ec3f020', './lib/graph-engine/pdflib.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('86957f05668498c05d712ae24c0c442e', './lib/graph-engine/ps.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('efb0fac8e679437836c4e94652489a67', './lib/graph-engine/graph.multiline.php', '2.0', 0); -INSERT INTO `tiki_secdb` (`md5_value`, `filename`, `tiki_version`, `severity`) VALUES('69904613e0d8e253a3a1a7a9107eb855', './li... [truncated message content] |
From: <chi...@us...> - 2008-07-19 11:00:16
|
Revision: 13747 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=13747&view=rev Author: chibaguy Date: 2008-07-19 11:00:23 +0000 (Sat, 19 Jul 2008) Log Message: ----------- [FIX] fullscreen body id interfered with CSS menus. Modified Paths: -------------- trunk/styles/darkroom.css trunk/styles/feb12.css trunk/styles/thenews.css trunk/styles/tikinewt.css trunk/templates/header.tpl Modified: trunk/styles/darkroom.css =================================================================== --- trunk/styles/darkroom.css 2008-07-19 10:55:56 UTC (rev 13746) +++ trunk/styles/darkroom.css 2008-07-19 11:00:23 UTC (rev 13747) @@ -17,7 +17,7 @@ font-family: "Trebuchet MS", "Bitstream Vera Sans", sans-serif} html>body {font-size: 74% !important} -body#fullscreen { } +body.fullscreen { } a, a:visited { @@ -228,7 +228,7 @@ text-align: left; font-size: 1em} -#fullscreen #col1 { +.fullscreen #col1 { margin-left: 30px !important; margin-right: 30px !important} @@ -401,7 +401,7 @@ .tellafriend a:hover {} -#fullscreen .tellafriend { +.fullscreen .tellafriend { margin-right: 100px; margin-top: 2px} Modified: trunk/styles/feb12.css =================================================================== --- trunk/styles/feb12.css 2008-07-19 10:55:56 UTC (rev 13746) +++ trunk/styles/feb12.css 2008-07-19 11:00:23 UTC (rev 13747) @@ -11,7 +11,7 @@ background: #fff url(feb12/pagebg.jpg) repeat-x} html>body {font-size: 75% !important} -body#fullscreen {background: #fff url(feb12/pagebg.jpg) repeat-x 0 -137px} +body.fullscreen {background: #fff url(feb12/pagebg.jpg) repeat-x 0 -137px} a, a:visited { background: inherit; @@ -206,7 +206,7 @@ #c1c2 #wrapper {} -#fullscreen #col1 { +.fullscreen #col1 { margin-left: 30px !important; margin-right: 30px !important} @@ -388,7 +388,7 @@ font-size: 80%; text-align: right} -#fullscreen .tellafriend { +.fullscreen .tellafriend { margin-right: 100px; margin-top: 2px} Modified: trunk/styles/thenews.css =================================================================== --- trunk/styles/thenews.css 2008-07-19 10:55:56 UTC (rev 13746) +++ trunk/styles/thenews.css 2008-07-19 11:00:23 UTC (rev 13747) @@ -25,7 +25,7 @@ text-align: left; } -body#fullscreen {} +body.fullscreen {} a, a:visited { @@ -344,7 +344,7 @@ } -#fullscreen #col1 { +.fullscreen #col1 { margin-left: 30px !important; margin-right: 30px !important; } @@ -391,7 +391,7 @@ text-decoration: none; } -#fullscreen .tellafriend { +.fullscreen .tellafriend { margin-right: 100px; margin-top: 2px; } Modified: trunk/styles/tikinewt.css =================================================================== --- trunk/styles/tikinewt.css 2008-07-19 10:55:56 UTC (rev 13746) +++ trunk/styles/tikinewt.css 2008-07-19 11:00:23 UTC (rev 13747) @@ -322,7 +322,7 @@ background-color: transparent; } -#fullscreen #col1 { +.fullscreen #col1 { margin-left: 30px !important; margin-right: 30px !important; } @@ -2689,7 +2689,7 @@ color: #225566; } -#fullscreen .tellafriend { +.fullscreen .tellafriend { margin-right: 100px; margin-top: 2px; } Modified: trunk/templates/header.tpl =================================================================== --- trunk/templates/header.tpl 2008-07-19 10:55:56 UTC (rev 13746) +++ trunk/templates/header.tpl 2008-07-19 11:00:23 UTC (rev 13747) @@ -187,9 +187,9 @@ </head> <body {if isset($section) and $section eq 'wiki page' and $prefs.user_dbl eq 'y' and $dblclickedit eq 'y' and $tiki_p_edit eq 'y'}ondblclick="location.href='tiki-editpage.php?page={$page|escape:"url"}';"{/if} -onload="{if $prefs.feature_tabs eq 'y'}tikitabs({if $cookietab neq ''}{$cookietab}{else}1{/if},5);{/if}{if $msgError} javascript:location.hash='msgError'{/if}" -{if $section} class="tiki_{$section}"{/if} -{if $smarty.session.fullscreen eq 'y'} id="fullscreen"{/if}> + onload="{if $prefs.feature_tabs eq 'y'}tikitabs({if $cookietab neq ''}{$cookietab}{else}1{/if},5);{/if}{if $msgError} javascript:location.hash='msgError'{/if}" +{if $section or $smarty.session.fullscreen eq 'y'}class=" +{if $section}tiki_{$section}{/if} {if $smarty.session.fullscreen eq 'y'}fullscreen{/if}"{/if}> <ul class="jumplinks"> <li><a href="#tiki-center">{tr}Jump to Content{/tr}</a></li> {*<li><a href="#nav">{tr}Jump to Navigation{/tr}</a></li> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <m_...@us...> - 2008-07-19 23:58:17
|
Revision: 13749 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=13749&view=rev Author: m_stef Date: 2008-07-19 23:57:28 +0000 (Sat, 19 Jul 2008) Log Message: ----------- [ENH] added support for paged posts in tiki blog RSS. Modified Paths: -------------- trunk/db/profiles/default-inserts.sql trunk/db/tiki_1.9to2.0.sql trunk/templates/tiki-admin-include-rss.tpl trunk/tiki-admin_include_rss.php trunk/tiki-blogs_rss.php Modified: trunk/db/profiles/default-inserts.sql =================================================================== --- trunk/db/profiles/default-inserts.sql 2008-07-19 11:02:34 UTC (rev 13748) +++ trunk/db/profiles/default-inserts.sql 2008-07-19 23:57:28 UTC (rev 13749) @@ -229,6 +229,7 @@ INSERT INTO tiki_preferences VALUES ('max_rss_articles','10'); INSERT INTO tiki_preferences VALUES ('max_rss_blog','10'); INSERT INTO tiki_preferences VALUES ('max_rss_blogs','10'); +INSERT INTO tiki_preferences VALUES ('summary_rss_blogs','n'); INSERT INTO tiki_preferences VALUES ('max_rss_file_galleries','10'); INSERT INTO tiki_preferences VALUES ('max_rss_file_gallery','10'); INSERT INTO tiki_preferences VALUES ('max_rss_forum','10'); Modified: trunk/db/tiki_1.9to2.0.sql =================================================================== --- trunk/db/tiki_1.9to2.0.sql 2008-07-19 11:02:34 UTC (rev 13748) +++ trunk/db/tiki_1.9to2.0.sql 2008-07-19 23:57:28 UTC (rev 13749) @@ -1788,3 +1788,6 @@ #2008-07-11 nyloth UPDATE `tiki_preferences` SET `value`='n' WHERE `name`='feature_wysiwyg' AND `value`='default'; + +#2008-07-20 mstef +insert into tiki_preferences (name, value) values ('summary_rss_blogs','n'); Modified: trunk/templates/tiki-admin-include-rss.tpl =================================================================== --- trunk/templates/tiki-admin-include-rss.tpl 2008-07-19 11:02:34 UTC (rev 13748) +++ trunk/templates/tiki-admin-include-rss.tpl 2008-07-19 23:57:28 UTC (rev 13749) @@ -22,7 +22,7 @@ <td width="20"><input type="checkbox" name="rss_blogs" onclick="flip('blogsrss');"{if $prefs.rss_blogs eq 'y'} checked="checked"{/if}{if $prefs.feature_blogs ne 'y'} disabled="disabled"{/if} /></td> <td class="form" colspan="2">{if $prefs.rss_blogs eq 'y'}<a href="tiki-blogs_rss.php" title="{tr}Feed for blogs{/tr}.">{/if}{tr}Blogs{/tr}{if $prefs.rss_blogs eq 'y'}</a>{/if} {if $prefs.feature_blogs ne 'y'} ({tr}Feature is disabled.{/tr} <a href="tiki-admin.php?page=features" title="{tr}Features{/tr}">{tr}Enable now{/tr}</a>.){/if} <div id="blogsrss" style="display:{if ($prefs.rss_blogs eq 'y') and ($prefs.feature_blogs eq 'y')}block{else}none{/if};"> - <p>{tr}Title{/tr}: <input type="text" name="title_rss_blogs" size="20" maxlength="255" style="width:95%" value='{$prefs.title_rss_blogs|escape}' /><br />{tr}Description{/tr}: <textarea name="desc_rss_blogs" style="width:95%" cols="20" rows="2">{$prefs.desc_rss_blogs|escape}</textarea><br />{tr}Maximum number of items to display{/tr}:<input type="text" name="max_rss_blogs" size="5" value="{$prefs.max_rss_blogs|escape}" /></p> + <p>{tr}Title{/tr}: <input type="text" name="title_rss_blogs" size="20" maxlength="255" style="width:95%" value='{$prefs.title_rss_blogs|escape}' /><br />{tr}Description{/tr}: <textarea name="desc_rss_blogs" style="width:95%" cols="20" rows="2">{$prefs.desc_rss_blogs|escape}</textarea><br />{tr}Maximum number of items to display{/tr}:<input type="text" name="max_rss_blogs" size="5" value="{$prefs.max_rss_blogs|escape}" /><br />{tr}Only first page{/tr}:<input type="checkbox" name="summary_rss_blogs" onclick="flip('summaryrssblogs');"{if $prefs.summary_rss_blogs eq 'y'} checked="checked"{/if} /></p> </div> </td> </tr> Modified: trunk/tiki-admin_include_rss.php =================================================================== --- trunk/tiki-admin_include_rss.php 2008-07-19 11:02:34 UTC (rev 13748) +++ trunk/tiki-admin_include_rss.php 2008-07-19 23:57:28 UTC (rev 13749) @@ -34,6 +34,7 @@ simple_set_value('rssfeed_webmaster'); simple_set_value('rss_cache_time'); simple_set_value('rssfeed_img'); + simple_set_toggle('summary_rss_blogs'); } ask_ticket('admin-inc-rss'); Modified: trunk/tiki-blogs_rss.php =================================================================== --- trunk/tiki-blogs_rss.php 2008-07-19 11:02:34 UTC (rev 13748) +++ trunk/tiki-blogs_rss.php 2008-07-19 23:57:28 UTC (rev 13749) @@ -43,7 +43,12 @@ $changes = $bloglib -> list_all_blog_posts(0, $prefs['max_rss_blogs'], $dateId.'_desc', '', $now); $tmp = array(); foreach ($changes["data"] as $data) { - $data["$descId"] = $tikilib->parse_data($data["$descId"]); + global $bloglib; + if($prefs['summary_rss_blogs'] == "y") { + $data["$descId"] = $tikilib->parse_data($bloglib->get_page($data["$descId"],1)); + } else { + $data["$descId"] = $tikilib->parse_data($data["$descId"]); + } $tmp[] = $data; } $changes["data"] = $tmp; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Marc L. <ma...@ma...> - 2008-07-20 12:20:56
|
Hi! 1- Since this is in trunk (and will be part of 3.0), shouldn't trunk/db/tiki_2.0to3.0.sql be modified instead of trunk/db/tiki_1.9to2.0.sql? 2- Is trunk/db/profiles/default-inserts.sql still useful with the recent changes (now that we have lib/setup/prefs.php)? Thanks! -- M ;-) ////////////////////////////////////////////////////////////////////// / / / Marc Laporte <|> http://marclaporte.com / / Avantech.net <|> http://avantech.net / / TikiWiki CMS/Groupware <|> http://tikiwiki.org/UserPagemarclaporte / / / ////////////////////////////////////////////////////////////////////// -----Original Message----- From: m_...@us... [mailto:m_...@us...] Sent: July 19, 2008 7:58 PM To: tik...@li... Subject: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[13749] trunk Revision: 13749 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=13749&view=rev Author: m_stef Date: 2008-07-19 23:57:28 +0000 (Sat, 19 Jul 2008) Log Message: ----------- [ENH] added support for paged posts in tiki blog RSS. Modified Paths: -------------- trunk/db/profiles/default-inserts.sql trunk/db/tiki_1.9to2.0.sql trunk/templates/tiki-admin-include-rss.tpl trunk/tiki-admin_include_rss.php trunk/tiki-blogs_rss.php Modified: trunk/db/profiles/default-inserts.sql =================================================================== --- trunk/db/profiles/default-inserts.sql 2008-07-19 11:02:34 UTC (rev 13748) +++ trunk/db/profiles/default-inserts.sql 2008-07-19 23:57:28 UTC (rev 13749) @@ -229,6 +229,7 @@ INSERT INTO tiki_preferences VALUES ('max_rss_articles','10'); INSERT INTO tiki_preferences VALUES ('max_rss_blog','10'); INSERT INTO tiki_preferences VALUES ('max_rss_blogs','10'); +INSERT INTO tiki_preferences VALUES ('summary_rss_blogs','n'); INSERT INTO tiki_preferences VALUES ('max_rss_file_galleries','10'); INSERT INTO tiki_preferences VALUES ('max_rss_file_gallery','10'); INSERT INTO tiki_preferences VALUES ('max_rss_forum','10'); Modified: trunk/db/tiki_1.9to2.0.sql =================================================================== --- trunk/db/tiki_1.9to2.0.sql 2008-07-19 11:02:34 UTC (rev 13748) +++ trunk/db/tiki_1.9to2.0.sql 2008-07-19 23:57:28 UTC (rev 13749) @@ -1788,3 +1788,6 @@ #2008-07-11 nyloth UPDATE `tiki_preferences` SET `value`='n' WHERE `name`='feature_wysiwyg' AND `value`='default'; + +#2008-07-20 mstef +insert into tiki_preferences (name, value) values +('summary_rss_blogs','n'); Modified: trunk/templates/tiki-admin-include-rss.tpl =================================================================== --- trunk/templates/tiki-admin-include-rss.tpl 2008-07-19 11:02:34 UTC (rev 13748) +++ trunk/templates/tiki-admin-include-rss.tpl 2008-07-19 23:57:28 UTC (rev 13749) @@ -22,7 +22,7 @@ <td width="20"><input type="checkbox" name="rss_blogs" onclick="flip('blogsrss');"{if $prefs.rss_blogs eq 'y'} checked="checked"{/if}{if $prefs.feature_blogs ne 'y'} disabled="disabled"{/if} /></td> <td class="form" colspan="2">{if $prefs.rss_blogs eq 'y'}<a href="tiki-blogs_rss.php" title="{tr}Feed for blogs{/tr}.">{/if}{tr}Blogs{/tr}{if $prefs.rss_blogs eq 'y'}</a>{/if} {if $prefs.feature_blogs ne 'y'} ({tr}Feature is disabled.{/tr} <a href="tiki-admin.php?page=features" title="{tr}Features{/tr}">{tr}Enable now{/tr}</a>.){/if} <div id="blogsrss" style="display:{if ($prefs.rss_blogs eq 'y') and ($prefs.feature_blogs eq 'y')}block{else}none{/if};"> - <p>{tr}Title{/tr}: <input type="text" name="title_rss_blogs" size="20" maxlength="255" style="width:95%" value='{$prefs.title_rss_blogs|escape}' /><br />{tr}Description{/tr}: <textarea name="desc_rss_blogs" style="width:95%" cols="20" rows="2">{$prefs.desc_rss_blogs|escape}</textarea><br />{tr}Maximum number of items to display{/tr}:<input type="text" name="max_rss_blogs" size="5" value="{$prefs.max_rss_blogs|escape}" /></p> + <p>{tr}Title{/tr}: <input type="text" + name="title_rss_blogs" size="20" maxlength="255" style="width:95%" value='{$prefs.title_rss_blogs|escape}' /><br />{tr}Description{/tr}: <textarea name="desc_rss_blogs" style="width:95%" cols="20" rows="2">{$prefs.desc_rss_blogs|escape}</textarea><br />{tr}Maximum number of items to display{/tr}:<input type="text" name="max_rss_blogs" size="5" value="{$prefs.max_rss_blogs|escape}" /><br />{tr}Only first page{/tr}:<input type="checkbox" name="summary_rss_blogs" onclick="flip('summaryrssblogs');"{if $prefs.summary_rss_blogs eq 'y'} checked="checked"{/if} /></p> </div> </td> </tr> Modified: trunk/tiki-admin_include_rss.php =================================================================== --- trunk/tiki-admin_include_rss.php 2008-07-19 11:02:34 UTC (rev 13748) +++ trunk/tiki-admin_include_rss.php 2008-07-19 23:57:28 UTC (rev 13749) @@ -34,6 +34,7 @@ simple_set_value('rssfeed_webmaster'); simple_set_value('rss_cache_time'); simple_set_value('rssfeed_img'); + simple_set_toggle('summary_rss_blogs'); } ask_ticket('admin-inc-rss'); Modified: trunk/tiki-blogs_rss.php =================================================================== --- trunk/tiki-blogs_rss.php 2008-07-19 11:02:34 UTC (rev 13748) +++ trunk/tiki-blogs_rss.php 2008-07-19 23:57:28 UTC (rev 13749) @@ -43,7 +43,12 @@ $changes = $bloglib -> list_all_blog_posts(0, $prefs['max_rss_blogs'], $dateId.'_desc', '', $now); $tmp = array(); foreach ($changes["data"] as $data) { - $data["$descId"] = $tikilib->parse_data($data["$descId"]); + global $bloglib; + if($prefs['summary_rss_blogs'] == "y") { + $data["$descId"] = $tikilib->parse_data($bloglib->get_page($data["$descId"],1)); + } else { + $data["$descId"] = $tikilib->parse_data($data["$descId"]); + } $tmp[] = $data; } $changes["data"] = $tmp; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------- This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ _______________________________________________ Tikiwiki-cvs mailing list Tik...@li... https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs |
From: <lph...@us...> - 2008-07-20 15:54:04
|
Revision: 13762 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=13762&view=rev Author: lphuberdeau Date: 2008-07-20 15:54:12 +0000 (Sun, 20 Jul 2008) Log Message: ----------- [FIX] Only display urgent translation request when page is in a translation set Modified Paths: -------------- trunk/templates/tiki-editpage.tpl trunk/tiki-editpage.php Modified: trunk/templates/tiki-editpage.tpl =================================================================== --- trunk/templates/tiki-editpage.tpl 2008-07-20 15:41:41 UTC (rev 13761) +++ trunk/templates/tiki-editpage.tpl 2008-07-20 15:54:12 UTC (rev 13762) @@ -317,14 +317,16 @@ {/if} </td></tr> {else} -<tr class="formcolor"> - <td>{tr}Translation request{/tr}:</td> - <td> - <input type="hidden" name="lang" value="{$lang|escape}"/> - <input type="checkbox" name="translation_critical" id="translation_critical"{if $translation_critical} checked="checked"{/if}/> - <label for="translation_critical">{tr}Send urgent translation request.{/tr}</label> - </td> -</tr> + {if $trads|@count > 1} + <tr class="formcolor"> + <td>{tr}Translation request{/tr}:</td> + <td> + <input type="hidden" name="lang" value="{$lang|escape}"/> + <input type="checkbox" name="translation_critical" id="translation_critical"{if $translation_critical} checked="checked"{/if}/> + <label for="translation_critical">{tr}Send urgent translation request.{/tr}</label> + </td> + </tr> + {/if} {/if} {/if} {if $page|lower neq 'sandbox'} Modified: trunk/tiki-editpage.php =================================================================== --- trunk/tiki-editpage.php 2008-07-20 15:41:41 UTC (rev 13761) +++ trunk/tiki-editpage.php 2008-07-20 15:54:12 UTC (rev 13762) @@ -1233,6 +1233,13 @@ } } +if( $prefs['feature_multilingual'] == 'y' ) { + global $multilinguallib; + include_once('lib/multilingual/multilinguallib.php'); + $trads = $multilinguallib->getTranslations('wiki page', $info['page_id'], $page, $info['lang']); + $smarty->assign('trads', $trads); +} + // Get edit session timeout in minutes $smarty->assign('edittimeout', (ini_get('session.gc_maxlifetime') / 60 )); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lph...@us...> - 2008-07-20 15:58:08
|
Revision: 13763 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=13763&view=rev Author: lphuberdeau Date: 2008-07-20 15:58:16 +0000 (Sun, 20 Jul 2008) Log Message: ----------- [MRG] Automatic merge, branches/2.0 13737 to 13755 Modified Paths: -------------- trunk/lib/tikilib.php trunk/templates/tiki-calendar_listmode.tpl trunk/templates/tiki-upload_image.tpl trunk/tiki-calendars_rss.php Added Paths: ----------- trunk/lib/smarty_tiki/modifier.compactisodate.php Removed Paths: ------------- trunk/templates/tiki-view_irc.tpl Copied: trunk/lib/smarty_tiki/modifier.compactisodate.php (from rev 13755, branches/2.0/lib/smarty_tiki/modifier.compactisodate.php) =================================================================== --- trunk/lib/smarty_tiki/modifier.compactisodate.php (rev 0) +++ trunk/lib/smarty_tiki/modifier.compactisodate.php 2008-07-20 15:58:16 UTC (rev 13763) @@ -0,0 +1,15 @@ +<?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; +} + +// this returns the compact ISO 8601 date for microformats +function smarty_modifier_compactisodate($string) { + global $tikilib; + return $tikilib->get_compact_iso8601_datetime($string); +} + +?> Modified: trunk/lib/tikilib.php =================================================================== --- trunk/lib/tikilib.php 2008-07-20 15:54:12 UTC (rev 13762) +++ trunk/lib/tikilib.php 2008-07-20 15:58:16 UTC (rev 13763) @@ -7332,6 +7332,11 @@ return $this->date_format('%Y-%m-%dT%H:%M:%S%O', $timestamp, $user); } + function get_compact_iso8601_datetime($timestamp, $user = false) { + // no dashes and no tz info - latter should be fixed + return $this->date_format('%Y%m%dT%H%M%S', $timestamp, $user); + } + function list_languages($path = false, $short=null, $all=false) { $languages = array(); Modified: trunk/templates/tiki-calendar_listmode.tpl =================================================================== --- trunk/templates/tiki-calendar_listmode.tpl 2008-07-20 15:54:12 UTC (rev 13762) +++ trunk/templates/tiki-calendar_listmode.tpl 2008-07-20 15:58:16 UTC (rev 13763) @@ -11,11 +11,11 @@ {section name=w loop=$listevents} <tr class="{cycle}{if $listevents[w].start <= $smarty.now and $listevents[w].end >= $smarty.now} selected{/if} vevent"> <td> -<abbr class="dtstart" title="{$listevents[w].startTimeStamp|isodate}"><a href="{$myurl}?todate={$listevents[w].start}" title="{tr}Change Focus{/tr}">{$listevents[w].start|tiki_short_date}</a></abbr><br /> +<abbr class="dtstart" title="{$listevents[w].start|compactisodate}"><a href="{$myurl}?todate={$listevents[w].start}" title="{tr}Change Focus{/tr}">{$listevents[w].start|tiki_short_date}</a></abbr><br /> {$listevents[w].start|tiki_short_time} </td> <td> -{if $listevents[w].start|tiki_short_date ne $listevents[w].end|tiki_short_date}<a href="{$myurl}?todate={$listevents[w].end}" title="{tr}Change Focus{/tr}">{$listevents[w].end|tiki_short_date}</a>{/if}<br /> +{if $listevents[w].start|tiki_short_date ne $listevents[w].end|tiki_short_date}<abbr class="dtend" title="{$listevents[w].end|compactisodate}"><a href="{$myurl}?todate={$listevents[w].end}" title="{tr}Change Focus{/tr}">{$listevents[w].end|tiki_short_date}</a></abbr> {/if}<br /> {if $listevents[w].start ne $listevents[w].end}{$listevents[w].end|tiki_short_time}{/if} </td> <td> Modified: trunk/templates/tiki-upload_image.tpl =================================================================== --- trunk/templates/tiki-upload_image.tpl 2008-07-20 15:54:12 UTC (rev 13762) +++ trunk/templates/tiki-upload_image.tpl 2008-07-20 15:58:16 UTC (rev 13763) @@ -114,7 +114,7 @@ </div> {else} {icon _id=exclamation alt="{tr}Error{/tr}" style="vertical-align:middle;"} {tr}No gallery available.{/tr} {tr}You have to create a gallery first!{/tr} - <p><a class="linkbut" href="tiki-galleries.php">{tr}Create New Gallery{/tr}</a></p> + <p><a class="linkbut" href="tiki-galleries.php?edit_mode=1&galleryId=0">{tr}Create New Gallery{/tr}</a></p> {/if} Deleted: trunk/templates/tiki-view_irc.tpl =================================================================== --- trunk/templates/tiki-view_irc.tpl 2008-07-20 15:54:12 UTC (rev 13762) +++ trunk/templates/tiki-view_irc.tpl 2008-07-20 15:58:16 UTC (rev 13763) @@ -1,78 +0,0 @@ -{* $Id$ -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. -*} - -<h1><a class="pagetitle" href="tiki-view_irc.php"> -{tr}IRC log{/tr} {$irc_log_channel} {$irc_log_time|tiki_long_date} -</a> -</h1> -<div> -<form method="get" action="tiki-view_irc.php"> -<table> -<tr> - <td valign='bottom'>{tr}Select{/tr}</td> - <td class="findtable" valign='top'> - <select name="log" onchange="this.form.submit()"> - {html_options options="$irc_log_options" selected="$irc_log_selected"} - </select> - <input type="submit" value="{tr}Display{/tr}" /> - </td> - - <td valign='bottom'>{tr}Filter{/tr}</td> - <td class="findtable" valign='top'> - <input type="text" name="filter" value="{$filter}" /> - </td> - - <td valign='bottom'>{tr}Show All{/tr}</td> - <td class="findtable" valign='top'> - <input type="hidden" name="showall" value="" /> - <input type="checkbox" name="showall" {if $showall > ''}checked="checked"{/if} /> - {*html_checkboxes name="showall" options=$showall_options checked=$showall*} - </td> - -{* - <td valign='bottom'>{tr}Maximum Rows{/tr}</td> - <td class="findtable" valign='top'> - <select name="maxrows" onchange="this.form.submit()"> - {html_options options="$max_row_options" selected="$maxrows"} - </select> - </td> - <td valign='bottom'>{tr}Refresh Every{/tr}</td> - <td class="findtable" valign='top'> - <select name="refresh" onchange="this.form.submit()"> - {html_options options="$refresh_options" selected="$refresh"} - </select> - </td> - <td valign='bottom'>{tr}Seconds{/tr}</td> -*} -</tr> -</table> -</form> -</div> - -{cycle values="#dedede,#eeeeee" print=false} -<div class="simplebox"> -{section name=b loop=$irc_log_rows} -{* \TODO {$irc_log_rows[b].localtime|tiki_short_time} *} -{$irc_log_rows[b].name} -{if $irc_log_rows[b].action eq 'a'} - <div style="color:#563514;background-color:{cycle};padding:1px;"> - <tt>{$irc_log_rows[b].time} </tt><i><b>{$irc_log_rows[b].nick}</b> {$irc_log_rows[b].data}</i> - </div> -{elseif $irc_log_rows[b].action eq 'v'} - {if $showall > ''} - <div style="color:#898989;background-color:{cycle};padding:1px;"> - <tt>{$irc_log_rows[b].time} {$irc_log_rows[b].data} - </div> - {/if} -{else} - <div style="background-color:{cycle};padding:1px;"> - <tt>{$irc_log_rows[b].time} </tt><b>{$irc_log_rows[b].nick}</b> {$irc_log_rows[b].data} - </div> -{/if} -{/section} -</div> - -<br clear="all" /> Modified: trunk/tiki-calendars_rss.php =================================================================== --- trunk/tiki-calendars_rss.php 2008-07-20 15:54:12 UTC (rev 13762) +++ trunk/tiki-calendars_rss.php 2008-07-20 15:58:16 UTC (rev 13763) @@ -81,12 +81,12 @@ $cur_time = explode(',', $tikilib->date_format('%Y,%m,%d,%H,%M,%S', $publishDate)); $items = $calendarlib->list_raw_items($calendars, "", $tikilib->now, $tikilib->make_time($cur_time[3], $cur_time[4], $cur_time[5], $cur_time[1], $cur_time[2], $cur_time[0]+1), 0, $maxCalEntries); - require_once("lib/smarty_tiki/modifier.tiki_long_datetime.php"); - require_once("lib/smarty_tiki/modifier.isodate.php"); + require_once("lib/smarty_tiki/modifier.tiki_short_datetime.php"); + require_once("lib/smarty_tiki/modifier.compactisodate.php"); for ($i = 0; $i < sizeof($items); $i++) { - $start_d = smarty_modifier_isodate($items[$i]["start"]); - $end_d = smarty_modifier_isodate($items[$i]["end"]); + $start_d = smarty_modifier_compactisodate($items[$i]["start"]); + $end_d = smarty_modifier_compactisodate($items[$i]["end"]); $items[$i]["body"] = "<div class=\"vevent\"> <span class=\"summary\">" . $items[$i]["name"] . "</span>"."<br />\n"; $items[$i]["body"] .= "<abbr class=\"dtstart\" title=\"" .$start_d ."\">" .tra("Start:") . " " .smarty_modifier_tiki_long_datetime($items[$i]["start"]) . "</abbr>" ."<br />\n"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <m_...@us...> - 2008-07-20 18:17:23
|
Revision: 13769 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=13769&view=rev Author: m_stef Date: 2008-07-20 18:17:30 +0000 (Sun, 20 Jul 2008) Log Message: ----------- [ENH] RSS Authentication, http://dev.tikiwiki.org/tiki-view_tracker_item.php?itemId=1515&trackerId=5&show=view Modified Paths: -------------- trunk/lib/setup/prefs.php trunk/lib/tikiaccesslib.php trunk/templates/tiki-admin-include-rss.tpl trunk/tiki-admin_include_rss.php trunk/tiki-articles_rss.php trunk/tiki-blogs_rss.php trunk/tiki-calendars_rss.php trunk/tiki-directories_rss.php trunk/tiki-file_galleries_rss.php trunk/tiki-forums_rss.php trunk/tiki-image_galleries_rss.php trunk/tiki-map_rss.php trunk/tiki-wiki_rss.php Modified: trunk/lib/setup/prefs.php =================================================================== --- trunk/lib/setup/prefs.php 2008-07-20 18:01:52 UTC (rev 13768) +++ trunk/lib/setup/prefs.php 2008-07-20 18:17:30 UTC (rev 13769) @@ -604,6 +604,7 @@ $prefs['rssfeed_css'] = 'y'; $prefs['rssfeed_publisher'] = ''; $prefs['rssfeed_img'] = 'img/tiki.jpg'; + $prefs['rss_basic_auth'] = 'n'; # maps $prefs['feature_maps'] = 'n'; Modified: trunk/lib/tikiaccesslib.php =================================================================== --- trunk/lib/tikiaccesslib.php 2008-07-20 18:01:52 UTC (rev 13768) +++ trunk/lib/tikiaccesslib.php 2008-07-20 18:17:30 UTC (rev 13769) @@ -237,6 +237,72 @@ exit(); } + /** + * Authorizes access to Tiki RSS feeds via user/password embedded in a URL + * e.g. https://joe:secret@localhost/tiki/tiki-calendars_rss.php?ver=2 + * ~~~~~~~~~~ + * + * @param array the permissions that needs to be checked against (e.g. tiki_p_view) + * + * @return null if authorized, otherwise an array(msg,header) + * where msg can be displayed, and header decides whether to + * send 401 Unauthorized headers. + */ + + function authorize_rss($rssrights) { + global $tikilib, $userlib, $user, $prefs; + $result=array('msg' => tra("Permission denied you cannot view this section"), 'header' => 'n'); + + // allow admin + print $tiki_p_admin; + if($userlib->user_has_permission($user,'tiki_p_admin')) { + return; + } + + // if current user has appropriate rights, allow. + foreach($rssrights as $perm) { + if($userlib->user_has_permission($user,$perm)) { + return; + } + } + + // deny if no basic auth allowed. + if($prefs['rss_basic_auth'] != 'y') { + return $result; + } + + //login is needed to access the contents + $https_mode = isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on'; + + //refuse to authenticate in plaintext if https_login_required. + if ($prefs['https_login_required'] == 'y' && !$https_mode) { + $result['msg']=tra("For the security of your password direct access to the feed is only available via https"); + return $result; + } + + //http basic auth headers if no user specified in http header. + if (empty($_SERVER['PHP_AUTH_USER'])) { + $result['header']='y'; + return $result; + } + + $user = $_SERVER['PHP_AUTH_USER'] ; + $pass = $_SERVER['PHP_AUTH_PW'] ; + list($res,$rest)=$userlib->validate_user_tiki($user, $pass, false, false); + if ($res==USER_VALID) { + $perms = $userlib->get_user_permissions($user); + foreach ($rssrights as $perm) { + if (in_array($perm, $perms)) { + // if user/password and the appropriate rights are correct, allow. + return; + } + } + } + + //try to (re)authenticate the user + $result['header']='y'; + return $result; + } } $access = new TikiAccessLib($dbTiki); Modified: trunk/templates/tiki-admin-include-rss.tpl =================================================================== --- trunk/templates/tiki-admin-include-rss.tpl 2008-07-20 18:01:52 UTC (rev 13768) +++ trunk/templates/tiki-admin-include-rss.tpl 2008-07-20 18:17:30 UTC (rev 13769) @@ -198,6 +198,12 @@ {remarksbox type="tip" title="{tr}Tip{/tr}"}{tr}Enabling caching will override existing permissions - all content will be public. Enable this option <strong>only</strong> if your syndicated content should be public.{/tr}{/remarksbox} </td> </tr> + <tr> + <td class="form">{tr}Allow Basic Authentication for RSS feeds{/tr}</td> + <td> + <input type="checkbox" name="rss_basic_auth" onclick="flip('rssbasicauth');"{if $prefs.rss_basic_auth eq 'y'} checked="checked"{/if} />{remarksbox type="comment" title="{tr}Comment{/tr}"}{tr}This potentially leaks passwords over unencrypted links, it is intended for private and enterprise settings, you should consider to also set https_login=required.{/tr}{/remarksbox} + </td> + </tr> <tr><td colspan="2"> </td></tr> <tr> <td colspan="2" class="button"><input type="submit" name="rss" value="{tr}Apply{/tr}" /></td> Modified: trunk/tiki-admin_include_rss.php =================================================================== --- trunk/tiki-admin_include_rss.php 2008-07-20 18:01:52 UTC (rev 13768) +++ trunk/tiki-admin_include_rss.php 2008-07-20 18:17:30 UTC (rev 13769) @@ -35,6 +35,7 @@ simple_set_value('rss_cache_time'); simple_set_value('rssfeed_img'); simple_set_toggle('summary_rss_blogs'); + simple_set_toggle('rss_basic_auth'); } ask_ticket('admin-inc-rss'); Modified: trunk/tiki-articles_rss.php =================================================================== --- trunk/tiki-articles_rss.php 2008-07-20 18:01:52 UTC (rev 13768) +++ trunk/tiki-articles_rss.php 2008-07-20 18:17:30 UTC (rev 13769) @@ -14,10 +14,14 @@ require_once ('tiki-rss_error.php'); } -if ($tiki_p_read_article != 'y') { - $smarty->assign('errortype', 401); - $errmsg=tra("Permission denied you cannot view this section"); - require_once ('tiki-rss_error.php'); +$res=$access->authorize_rss(array('tiki_p_read_article','tiki_p_admin_cms')); +if($res) { + if($res['header'] == 'y') { + header('WWW-Authenticate: Basic realm="'.$tikidomain.'"'); + header('HTTP/1.0 401 Unauthorized'); + } + $errmsg=$res['msg']; + require_once ('tiki-rss_error.php'); } $feed = "articles"; Modified: trunk/tiki-blogs_rss.php =================================================================== --- trunk/tiki-blogs_rss.php 2008-07-20 18:01:52 UTC (rev 13768) +++ trunk/tiki-blogs_rss.php 2008-07-20 18:17:30 UTC (rev 13769) @@ -15,9 +15,14 @@ require_once ('tiki-rss_error.php'); } -if ($tiki_p_read_blog != 'y') { - $errmsg=tra("Permission denied you cannot view this section"); - require_once ('tiki-rss_error.php'); +$res=$access->authorize_rss(array('tiki_p_read_blog','tiki_p_blog_admin')); +if($res) { + if($res['header'] == 'y') { + header('WWW-Authenticate: Basic realm="'.$tikidomain.'"'); + header('HTTP/1.0 401 Unauthorized'); + } + $errmsg=$res['msg']; + require_once ('tiki-rss_error.php'); } $feed = "blogs"; Modified: trunk/tiki-calendars_rss.php =================================================================== --- trunk/tiki-calendars_rss.php 2008-07-20 18:01:52 UTC (rev 13768) +++ trunk/tiki-calendars_rss.php 2008-07-20 18:17:30 UTC (rev 13769) @@ -15,10 +15,14 @@ require_once ('tiki-rss_error.php'); } -if ($tiki_p_view_calendar != 'y') { - $smarty->assign('errortype', 401); - $errmsg=tra("Permission denied you cannot view this section"); - require_once ('tiki-rss_error.php'); +$res=$access->authorize_rss(array('tiki_p_view_calendar','tiki_p_admin_calendar')); +if($res) { + if($res['header'] == 'y') { + header('WWW-Authenticate: Basic realm="'.$tikidomain.'"'); + header('HTTP/1.0 401 Unauthorized'); + } + $errmsg=$res['msg']; + require_once ('tiki-rss_error.php'); } $feed = "calendar"; Modified: trunk/tiki-file_galleries_rss.php =================================================================== --- trunk/tiki-file_galleries_rss.php 2008-07-20 18:01:52 UTC (rev 13768) +++ trunk/tiki-file_galleries_rss.php 2008-07-20 18:17:30 UTC (rev 13769) @@ -14,10 +14,14 @@ require_once ('tiki-rss_error.php'); } -if ($tiki_p_view_file_gallery != 'y') { - $smarty->assign('errortype', 401); - $errmsg=tra("Permission denied you cannot view this section"); - require_once ('tiki-rss_error.php'); +$res=$access->authorize_rss(array('tiki_p_view_file_gallery','tiki_p_admin_file_galleries')); +if($res) { + if($res['header'] == 'y') { + header('WWW-Authenticate: Basic realm="'.$tikidomain.'"'); + header('HTTP/1.0 401 Unauthorized'); + } + $errmsg=$res['msg']; + require_once ('tiki-rss_error.php'); } $feed = "filegals"; Modified: trunk/tiki-forums_rss.php =================================================================== --- trunk/tiki-forums_rss.php 2008-07-20 18:01:52 UTC (rev 13768) +++ trunk/tiki-forums_rss.php 2008-07-20 18:17:30 UTC (rev 13769) @@ -14,10 +14,14 @@ require_once ('tiki-rss_error.php'); } -if($tiki_p_admin_forum != 'y' && $tiki_p_forum_read != 'y') { - $smarty->assign('errortype', 401); - $errmsg=tra("Permission denied you cannot view this section"); - require_once ('tiki-rss_error.php'); +$res=$access->authorize_rss(array('tiki_p_admin_forum','tiki_p_forum_read')); +if($res) { + if($res['header'] == 'y') { + header('WWW-Authenticate: Basic realm="'.$tikidomain.'"'); + header('HTTP/1.0 401 Unauthorized'); + } + $errmsg=$res['msg']; + require_once ('tiki-rss_error.php'); } $feed = "forums"; Modified: trunk/tiki-image_galleries_rss.php =================================================================== --- trunk/tiki-image_galleries_rss.php 2008-07-20 18:01:52 UTC (rev 13768) +++ trunk/tiki-image_galleries_rss.php 2008-07-20 18:17:30 UTC (rev 13769) @@ -15,10 +15,14 @@ require_once ('tiki-rss_error.php'); } -if ($tiki_p_view_image_gallery != 'y') { - $smarty->assign('errortype', 401); - $errmsg=tra("Permission denied you cannot view this section"); - require_once ('tiki-rss_error.php'); +$res=$access->authorize_rss(array('tiki_p_view_image_gallery','tiki_p_admin_galleries')); +if($res) { + if($res['header'] == 'y') { + header('WWW-Authenticate: Basic realm="'.$tikidomain.'"'); + header('HTTP/1.0 401 Unauthorized'); + } + $errmsg=$res['msg']; + require_once ('tiki-rss_error.php'); } $feed = "imggal"; Modified: trunk/tiki-map_rss.php =================================================================== --- trunk/tiki-map_rss.php 2008-07-20 18:01:52 UTC (rev 13768) +++ trunk/tiki-map_rss.php 2008-07-20 18:17:30 UTC (rev 13769) @@ -15,10 +15,14 @@ require_once ('tiki-rss_error.php'); } -if($tiki_p_map_view != 'y') { - $smarty->assign('errortype', 401); - $errmsg=tra("Permission denied you cannot view this section"); - require_once ('tiki-rss_error.php'); +$res=$access->authorize_rss(array('tiki_p_map_view')); +if($res) { + if($res['header'] == 'y') { + header('WWW-Authenticate: Basic realm="'.$tikidomain.'"'); + header('HTTP/1.0 401 Unauthorized'); + } + $errmsg=$res['msg']; + require_once ('tiki-rss_error.php'); } $feed = "map"; Modified: trunk/tiki-wiki_rss.php =================================================================== --- trunk/tiki-wiki_rss.php 2008-07-20 18:01:52 UTC (rev 13768) +++ trunk/tiki-wiki_rss.php 2008-07-20 18:17:30 UTC (rev 13769) @@ -15,10 +15,14 @@ require_once ('tiki-rss_error.php'); } -if ($tiki_p_view != 'y') { - $smarty->assign('errortype', 401); - $errmsg=tra("Permission denied you cannot view this section"); - require_once ('tiki-rss_error.php'); +$res=$access->authorize_rss(array('tiki_p_view')); +if($res) { + if($res['header'] == 'y') { + header('WWW-Authenticate: Basic realm="'.$tikidomain.'"'); + header('HTTP/1.0 401 Unauthorized'); + } + $errmsg=$res['msg']; + require_once ('tiki-rss_error.php'); } $feed = "wiki"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chi...@us...> - 2008-07-21 05:39:57
|
Revision: 13775 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=13775&view=rev Author: chibaguy Date: 2008-07-21 05:39:59 +0000 (Mon, 21 Jul 2008) Log Message: ----------- [ENH] Deprecated img border=0 and other inline styles replaced with CSS. Modified Paths: -------------- trunk/styles/transitions/1.9to2.0.css trunk/templates/tiki-bot_bar.tpl Modified: trunk/styles/transitions/1.9to2.0.css =================================================================== --- trunk/styles/transitions/1.9to2.0.css 2008-07-21 05:16:14 UTC (rev 13774) +++ trunk/styles/transitions/1.9to2.0.css 2008-07-21 05:39:59 UTC (rev 13775) @@ -513,6 +513,15 @@ font-size: 7pt; } +#power_icons { + text-align: center +} + +#power_icons img { + border: 0; + vertical-align: middle +} + #fullscreenbutton { float: right; position: absolute; Modified: trunk/templates/tiki-bot_bar.tpl =================================================================== --- trunk/templates/tiki-bot_bar.tpl 2008-07-21 05:16:14 UTC (rev 13774) +++ trunk/templates/tiki-bot_bar.tpl 2008-07-21 05:39:59 UTC (rev 13775) @@ -5,18 +5,18 @@ </div> {/if} {if $prefs.feature_bot_bar_icons eq 'y'} - <div id="power_icons" style="text-align: center"> - <a href="http://tikiwiki.org/" title="Tikiwiki"><img style="border: 0; vertical-align: middle" alt="{tr}Powered by{/tr} Tikiwiki" src="img/tiki/tikibutton2.png" /></a> - <a href="http://www.php.net/" title="PHP"><img style="border: 0; vertical-align: middle" alt="{tr}Powered by{/tr} PHP" src="img/php.png" /></a> - <a href="http://smarty.php.net/" title="Smarty"><img style="border: 0; vertical-align: middle" alt="{tr}Powered by{/tr} Smarty" src="img/smarty.gif" /></a> - <a href="http://adodb.sourceforge.net/" title="ADOdb"><img style="border: 0; vertical-align: middle" alt="{tr}Powered by{/tr} ADOdb" src="img/adodb.png" /></a> - <a href="http://www.w3.org/Style/CSS/" title="CSS"><img style="border: 0; vertical-align: middle" alt="{tr}Made with{/tr} CSS" src="img/css1.png" /></a> - <a href="http://www.w3.org/RDF/" title="RDF"><img style="border: 0; vertical-align: middle" alt="{tr}Powered by{/tr} RDF" src="img/rdf.gif" /></a> + <div id="power_icons"> + <a href="http://tikiwiki.org/" title="Tikiwiki"><img alt="{tr}Powered by{/tr} Tikiwiki" src="img/tiki/tikibutton2.png" /></a> + <a href="http://www.php.net/" title="PHP"><img alt="{tr}Powered by{/tr} PHP" src="img/php.png" /></a> + <a href="http://smarty.php.net/" title="Smarty"><img alt="{tr}Powered by{/tr} Smarty" src="img/smarty.gif" /></a> + <a href="http://adodb.sourceforge.net/" title="ADOdb"><img alt="{tr}Powered by{/tr} ADOdb" src="img/adodb.png" /></a> + <a href="http://www.w3.org/Style/CSS/" title="CSS"><img alt="{tr}Made with{/tr} CSS" src="img/css1.png" /></a> + <a href="http://www.w3.org/RDF/" title="RDF"><img alt="{tr}Powered by{/tr} RDF" src="img/rdf.gif" /></a> {if $prefs.feature_phplayers eq 'y'} - <a href="http://phplayersmenu.sourceforge.net/" title="PHP Layers Menu"><img style="border: 0; vertical-align: middle" alt="{tr}powered by{/tr} The PHP Layers Menu System" src="lib/phplayers/LOGOS/powered_by_phplm.png" /></a> + <a href="http://phplayersmenu.sourceforge.net/" title="PHP Layers Menu"><img alt="{tr}powered by{/tr} The PHP Layers Menu System" src="lib/phplayers/LOGOS/powered_by_phplm.png" /></a> {/if} {if $prefs.feature_mobile eq 'y'} - <a href="http://www.hawhaw.de/" title="HAWHAW"><img style="border: 0; vertical-align: middle" alt="{tr}powered by{/tr} HAWHAW" src="img/poweredbyhawhaw.gif" /></a> + <a href="http://www.hawhaw.de/" title="HAWHAW"><img alt="{tr}powered by{/tr} HAWHAW" src="img/poweredbyhawhaw.gif" /></a> {/if} </div> {/if} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sy...@us...> - 2008-07-21 13:47:57
|
Revision: 13779 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=13779&view=rev Author: sylvieg Date: 2008-07-21 13:48:05 +0000 (Mon, 21 Jul 2008) Log Message: ----------- [MOD]registration: If a user has chosen a group at registration, send the group to the admin validation mail Modified Paths: -------------- trunk/lib/userslib.php trunk/templates/mail/moderate_validation_mail.tpl trunk/tiki-register.php Modified: trunk/lib/userslib.php =================================================================== --- trunk/lib/userslib.php 2008-07-21 13:43:30 UTC (rev 13778) +++ trunk/lib/userslib.php 2008-07-21 13:48:05 UTC (rev 13779) @@ -2580,7 +2580,7 @@ while ($res = $result->fetchRow()) { $ret[] = $res['type']; } return $ret; } - function send_validation_email($name, $apass, $email, $again='', $second='') { + function send_validation_email($name, $apass, $email, $again='', $second='', $chosenGroup='') { global $tikilib, $prefs, $smarty; $foo = parse_url($_SERVER['REQUEST_URI']); $foo1 = str_replace('tiki-register', 'tiki-login_validate',$foo['path']); @@ -2604,6 +2604,9 @@ return false; } } elseif ($prefs['validateRegistration'] == 'y') { + if (!empty($chosenGroup)) { + $smarty->assign_by_ref('chosenGroup', $chosenGroup); + } $mail_data = $smarty->fetch('mail/moderate_validation_mail.tpl'); $mail_subject = $smarty->fetch('mail/moderate_validation_mail_subject.tpl'); if ($prefs['sender_email'] == NULL or !$prefs['sender_email']) { Modified: trunk/templates/mail/moderate_validation_mail.tpl =================================================================== --- trunk/templates/mail/moderate_validation_mail.tpl 2008-07-21 13:43:30 UTC (rev 13778) +++ trunk/templates/mail/moderate_validation_mail.tpl 2008-07-21 13:48:05 UTC (rev 13779) @@ -4,6 +4,7 @@ {tr}{$mail_user} <{$mail_email}> has requested a new password on {$mail_site}, but you need to validate his account first{/tr} {else} {$mail_user} <{$mail_email}> {tr}has requested an account on{/tr} {$mail_site} +{if isset($chosenGroup)}{tr}Group:{/tr} {$chosenGroup}{/if} {/if} {tr}To validate that account, please follow the link:{/tr} Modified: trunk/tiki-register.php =================================================================== --- trunk/tiki-register.php 2008-07-21 13:43:30 UTC (rev 13778) +++ trunk/tiki-register.php 2008-07-21 13:48:05 UTC (rev 13779) @@ -178,7 +178,7 @@ } if($prefs['validateUsers'] == 'y' || (isset($prefs['validateRegistration']) && $prefs['validateRegistration'] == 'y')) { $apass = addslashes(md5($tikilib->genPass())); - $userlib->send_validation_email($_REQUEST['name'], $apass, $_REQUEST['email']); + $userlib->send_validation_email($_REQUEST['name'], $apass, $_REQUEST['email'], '', '', isset($_REQUEST['chosenGroup'])?$_REQUEST['chosenGroup']:''); $userlib->add_user($_REQUEST["name"],$apass,$_REQUEST["email"],$_REQUEST["pass"], false, 'n', $openid_url); if (isset($_REQUEST['chosenGroup']) && $userlib->get_registrationChoice($_REQUEST['chosenGroup']) == 'y') { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lph...@us...> - 2008-07-21 22:30:07
|
Revision: 13797 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=13797&view=rev Author: lphuberdeau Date: 2008-07-21 22:30:15 +0000 (Mon, 21 Jul 2008) Log Message: ----------- [MRG] Automatic merge, branches/2.0 13755 to 13786 Modified Paths: -------------- trunk/lib/setup/prefs.php trunk/templates/messu-compose.tpl trunk/templates/modules/mod-login_box.tpl trunk/templates/tiki-admin-include-wiki.tpl trunk/templates/tiki-bot_bar.tpl trunk/tiki-install.php trunk/tiki-user_preferences.php Modified: trunk/lib/setup/prefs.php =================================================================== --- trunk/lib/setup/prefs.php 2008-07-21 20:50:10 UTC (rev 13796) +++ trunk/lib/setup/prefs.php 2008-07-21 22:30:15 UTC (rev 13797) @@ -95,7 +95,7 @@ $prefs['feature_wiki_userpage'] = 'y'; $prefs['feature_wiki_userpage_prefix'] = 'UserPage'; $prefs['feature_wiki_usrlock'] = 'n'; - $prefs['feature_wiki_save_draft'] = 'y'; + $prefs['feature_wiki_save_draft'] = 'n'; // Broken in 2.0 RC2 http://dev.tikiwiki.org/wish1888 $prefs['feature_wikiwords'] = 'y'; $prefs['feature_wikiwords_usedash'] = 'y'; $prefs['mailin_autocheck'] = 'n'; @@ -157,7 +157,7 @@ $prefs['wikiapproval_prefix'] = '*'; $prefs['wikiapproval_delete_staging'] = 'n'; $prefs['wikiapproval_master_group'] = ''; - $prefs['wiki_edit_section'] = 'n'; + $prefs['wiki_edit_section'] = 'y'; # wysiwyg $prefs['feature_wysiwyg'] = 'n'; @@ -430,7 +430,7 @@ $prefs['lowercase_username'] = 'n'; $prefs['max_username_length'] = '50'; $prefs['min_username_length'] = '1'; - $prefs['users_prefs_allowMsgs'] = 'n'; + $prefs['users_prefs_allowMsgs'] = 'y'; $prefs['users_prefs_country'] = ''; $prefs['users_prefs_diff_versions'] = 'n'; $prefs['users_prefs_display_timezone'] = 'Local'; @@ -441,7 +441,7 @@ $prefs['users_prefs_mess_archiveAfter'] = '0'; $prefs['users_prefs_mess_maxRecords'] = '10'; $prefs['users_prefs_mess_sendReadStatus'] = 'n'; - $prefs['users_prefs_minPrio'] = '6'; + $prefs['users_prefs_minPrio'] = '3'; $prefs['users_prefs_mytiki_blogs'] = 'y'; $prefs['users_prefs_mytiki_gals'] = 'y'; $prefs['users_prefs_mytiki_items'] = 'y'; @@ -463,7 +463,7 @@ $prefs['messu_mailbox_size'] = '0'; $prefs['messu_archive_size'] = '200'; $prefs['messu_sent_size'] = '200'; - $prefs['allowmsg_by_default'] = 'n'; + $prefs['allowmsg_by_default'] = 'y'; $prefs['allowmsg_is_optional'] = 'y'; # newsreader @@ -564,14 +564,14 @@ $prefs['feature_charts'] = 'n'; # rss - $prefs['rss_forums'] = 'y'; - $prefs['rss_forum'] = 'y'; - $prefs['rss_directories'] = 'y'; - $prefs['rss_articles'] = 'y'; - $prefs['rss_blogs'] = 'y'; - $prefs['rss_image_galleries'] = 'y'; - $prefs['rss_file_galleries'] = 'y'; - $prefs['rss_wiki'] = 'y'; + $prefs['rss_forums'] = 'n'; + $prefs['rss_forum'] = 'n'; + $prefs['rss_directories'] = 'n'; + $prefs['rss_articles'] = 'n'; + $prefs['rss_blogs'] = 'n'; + $prefs['rss_image_galleries'] = 'n'; + $prefs['rss_file_galleries'] = 'n'; + $prefs['rss_wiki'] = 'n'; $prefs['rss_image_gallery'] = 'n'; $prefs['rss_file_gallery'] = 'n'; $prefs['rss_blog'] = 'n'; @@ -798,7 +798,7 @@ # layout $prefs['feature_left_column'] = 'y'; $prefs['feature_right_column'] = 'y'; - $prefs['feature_top_bar'] = 'y'; + $prefs['feature_top_bar'] = 'n'; $prefs['feature_bot_bar'] = 'y'; $prefs['feature_bot_bar_icons'] = 'n'; $prefs['feature_bot_bar_debug'] = 'n'; @@ -966,7 +966,7 @@ $prefs['bot_logo_code'] = ''; $prefs['feature_blogposts_pings'] = ''; - $prefs['feature_create_webhelp'] = ''; + $prefs['feature_create_webhelp'] = 'n'; $prefs['feature_forums_search'] = ''; $prefs['feature_forums_tiki_search'] = ''; $prefs['feature_trackbackpings'] = 'n'; Modified: trunk/templates/messu-compose.tpl =================================================================== --- trunk/templates/messu-compose.tpl 2008-07-21 20:50:10 UTC (rev 13796) +++ trunk/templates/messu-compose.tpl 2008-07-21 22:30:15 UTC (rev 13797) @@ -23,7 +23,6 @@ {/if} {if (!$sent) or ((strstr($message, '{tr}ERROR{/tr}')) or (strstr($message, '{tr}Invalid{/tr}')))} -{remarksbox type="tip" title="{tr}Tip{/tr}"}{tr}Use "watches" to monitor wiki pages or other objects.{/tr} {tr}Watch new items by clicking the {icon _id=eye} button on specific pages.{/tr}{/remarksbox} <form action="messu-compose.php" method="post"> <table class="normal" > Modified: trunk/templates/modules/mod-login_box.tpl =================================================================== --- trunk/templates/modules/mod-login_box.tpl 2008-07-21 20:50:10 UTC (rev 13796) +++ trunk/templates/modules/mod-login_box.tpl 2008-07-21 22:30:15 UTC (rev 13797) @@ -28,7 +28,7 @@ <input type="text" name="username" id="login-switchuser" size="{if empty($module_params.input_size)}15{else}{$module_params.input_size}{/if}" /> {if $prefs.feature_help eq 'y'} <sup><a class="linkmodule tikihelp" href="tiki-admin_modules.php" - title="{tr}Paramaters{/tr}: $input_size {tr}applicable for this item{/tr}"><small><strong>?</strong></small></a></sup> + title="{tr}Parameters{/tr}: $input_size {tr}applicable for this item{/tr}"><small><strong>?</strong></small></a></sup> {/if} <div style="text-align: center"><button type="submit" name="actsu">{tr}Switch{/tr}</button></div> </fieldset> Modified: trunk/templates/tiki-admin-include-wiki.tpl =================================================================== --- trunk/templates/tiki-admin-include-wiki.tpl 2008-07-21 20:50:10 UTC (rev 13796) +++ trunk/templates/tiki-admin-include-wiki.tpl 2008-07-21 22:30:15 UTC (rev 13797) @@ -551,7 +551,7 @@ <tr><td class="form">{tr}Similar:{/tr}</td><td><input type="checkbox" name="feature_likePages" {if $prefs.feature_likePages eq 'y'}checked="checked"{/if}/></td></tr> <tr><td class="form">{tr}Rankings:{/tr}</td><td><input type="checkbox" name="feature_wiki_rankings" {if $prefs.feature_wiki_rankings eq 'y'}checked="checked"{/if}/></td></tr> <tr><td class="form">{tr}Undo:{/tr}</td><td><input type="checkbox" name="feature_wiki_undo" {if $prefs.feature_wiki_undo eq 'y'}checked="checked"{/if}/></td></tr> - <tr><td class="form">{tr}Save Draft:{/tr}</td><td><input type="checkbox" name="feature_wiki_save_draft" {if $prefs.feature_wiki_save_draft eq 'y'}checked="checked"{/if}/></td></tr> + <tr><td class="form">{tr}Save Draft:{/tr} ({tr}Requires AJAX{/tr}) ({tr}Experimental{/tr}) </td><td><input type="checkbox" name="feature_wiki_save_draft" {if $prefs.feature_wiki_save_draft eq 'y'}checked="checked"{/if}/></td></tr> <tr><td class="form">{tr}MultiPrint:{/tr}</td><td><input type="checkbox" name="feature_wiki_multiprint" {if $prefs.feature_wiki_multiprint eq 'y'}checked="checked"{/if}/></td></tr> {* <tr><td class="form">{tr}PDF generation:{/tr}</td><td><input type="checkbox" name="feature_wiki_pdf" {if $prefs.feature_wiki_pdf eq 'y'}checked="checked"{/if}/></td></tr> *} <tr><td class="form">{tr}Comments:{/tr}</td><td><input type="checkbox" name="feature_wiki_comments" {if $prefs.feature_wiki_comments eq 'y'}checked="checked"{/if}/></td></tr> Modified: trunk/templates/tiki-bot_bar.tpl =================================================================== --- trunk/templates/tiki-bot_bar.tpl 2008-07-21 20:50:10 UTC (rev 13796) +++ trunk/templates/tiki-bot_bar.tpl 2008-07-21 22:30:15 UTC (rev 13797) @@ -6,12 +6,12 @@ {/if} {if $prefs.feature_bot_bar_icons eq 'y'} <div id="power_icons"> - <a href="http://tikiwiki.org/" title="Tikiwiki"><img alt="{tr}Powered by{/tr} Tikiwiki" src="img/tiki/tikibutton2.png" /></a> - <a href="http://www.php.net/" title="PHP"><img alt="{tr}Powered by{/tr} PHP" src="img/php.png" /></a> - <a href="http://smarty.php.net/" title="Smarty"><img alt="{tr}Powered by{/tr} Smarty" src="img/smarty.gif" /></a> - <a href="http://adodb.sourceforge.net/" title="ADOdb"><img alt="{tr}Powered by{/tr} ADOdb" src="img/adodb.png" /></a> - <a href="http://www.w3.org/Style/CSS/" title="CSS"><img alt="{tr}Made with{/tr} CSS" src="img/css1.png" /></a> - <a href="http://www.w3.org/RDF/" title="RDF"><img alt="{tr}Powered by{/tr} RDF" src="img/rdf.gif" /></a> + <a href="http://tikiwiki.org/" title="Tikiwiki"><img style="border: 0; vertical-align: middle" alt="{tr}Powered by{/tr} Tikiwiki" src="img/tiki/tikibutton2.png" /></a> + <a href="http://www.php.net/" title="PHP"><img style="border: 0; vertical-align: middle" alt="{tr}Powered by{/tr} PHP" src="img/php.png" /></a> + <a href="http://smarty.php.net/" title="Smarty"><img style="border: 0; vertical-align: middle" alt="{tr}Powered by{/tr} Smarty" src="img/smarty.gif" /></a> + <a href="http://adodb.sourceforge.net/" title="ADOdb"><img style="border: 0; vertical-align: middle" alt="{tr}Powered by{/tr} ADOdb" src="img/adodb.png" /></a> + <a href="http://www.w3.org/Style/CSS/" title="CSS"><img style="border: 0; vertical-align: middle" alt="{tr}Made with{/tr} CSS" src="img/css1.png" /></a> + <a href="http://www.w3.org/RDF/" title="RDF"><img style="border: 0; vertical-align: middle" alt="{tr}Powered by{/tr} RDF" src="img/rdf.gif" /></a> {if $prefs.feature_phplayers eq 'y'} <a href="http://phplayersmenu.sourceforge.net/" title="PHP Layers Menu"><img alt="{tr}powered by{/tr} The PHP Layers Menu System" src="lib/phplayers/LOGOS/powered_by_phplm.png" /></a> {/if} @@ -73,8 +73,16 @@ {if $prefs.feature_babelfish eq 'y' or $prefs.feature_babelfish_logo eq 'y'} {include file="babelfish.tpl"} {/if} +<<<<<<< .working +======= + +<div id="power"> + {tr}Powered by{/tr} <a target="_blank" href="http://info.tikiwiki.org" title="{tr}This is{/tr} TikiWiki CMS/Groupware © 2002–2008, {tr}The TikiWiki community{/tr}">{tr}TikiWiki CMS/Groupware{/tr}</a> +</div> + +>>>>>>> .merge-right.r13786 {if $prefs.feature_bot_bar_debug eq 'y'} <div id="loadstats" style="text-align: center"> - <small>[ {tr}Execution time{/tr}: {elapsed} {tr}secs{/tr} ] [ {tr}Memory usage{/tr}: {memusage} ] [ {$num_queries} {tr}database queries used in {/tr} {$elapsed_in_db|truncate:3:''} secs ] [ GZIP {$gzip} ] [ {tr}Server load{/tr}: {$server_load} ]</small> + <small>[ {tr}Execution time{/tr}: {elapsed} {tr}secs{/tr} ] [ {tr}Memory usage{/tr}: {memusage} ] [ GZIP {$gzip} ] [ {tr}Server load{/tr}: {$server_load} ]</small> </div> {/if} Modified: trunk/tiki-install.php =================================================================== --- trunk/tiki-install.php 2008-07-21 20:50:10 UTC (rev 13796) +++ trunk/tiki-install.php 2008-07-21 22:30:15 UTC (rev 13797) @@ -100,15 +100,11 @@ $admin_acc = 'y'; include_once("installer/tiki-installer.php"); } else { -print "<html><body> -<h1>Security Alert!</h1> -<p>The Tiki installer can be used only by a site adminstrator. Please <a href='tiki-login.php'>login as an administrator</a> first.</p> -</body></html>"; -exit; -/* - header( 'Location: index.php' ); + print "<html><body> + <h1>Security Alert!</h1> + <p>The Tiki installer can be used only by a site adminstrator. Please <a href='tiki-login.php'>login as an administrator</a> first.</p> + </body></html>"; exit; -*/ } ?> Modified: trunk/tiki-user_preferences.php =================================================================== --- trunk/tiki-user_preferences.php 2008-07-21 20:50:10 UTC (rev 13796) +++ trunk/tiki-user_preferences.php 2008-07-21 22:30:15 UTC (rev 13797) @@ -377,7 +377,7 @@ $tikilib->get_user_preference($userwatch, 'mess_archiveAfter', 0); $tikilib->get_user_preference($userwatch, 'mess_sendReadStatus', 0); $tikilib->get_user_preference($userwatch, 'allowMsgs', 'y'); -$tikilib->get_user_preference($userwatch, 'minPrio', 6); +$tikilib->get_user_preference($userwatch, 'minPrio', 3); $tikilib->get_user_preference($userwatch, 'theme', ''); $tikilib->get_user_preference($userwatch, 'language', $prefs['language']); $tikilib->get_user_preference($userwatch, 'realName', ''); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chi...@us...> - 2008-07-22 04:35:43
|
Revision: 13802 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=13802&view=rev Author: chibaguy Date: 2008-07-22 04:35:52 +0000 (Tue, 22 Jul 2008) Log Message: ----------- [ENH] Site title and subtitle text can be input on Look & Feel admin page, to display in logo area of site header. New div#sitetitle and div#sitesubtitle selectors added to transitions CSS. More fine-tuning of styling probably necessary. Modified Paths: -------------- trunk/styles/transitions/1.9to2.0.css trunk/templates/tiki-admin-include-look.tpl trunk/templates/tiki-site_header.tpl trunk/tiki-admin_include_look.php Modified: trunk/styles/transitions/1.9to2.0.css =================================================================== --- trunk/styles/transitions/1.9to2.0.css 2008-07-22 04:11:23 UTC (rev 13801) +++ trunk/styles/transitions/1.9to2.0.css 2008-07-22 04:35:52 UTC (rev 13802) @@ -532,3 +532,11 @@ padding: 0 4px; cursor: pointer; } + +#sitetitle { + font-size: 2.4em; +} + +#sitesubtitle { + font-size:1.6em; +} Modified: trunk/templates/tiki-admin-include-look.tpl =================================================================== --- trunk/templates/tiki-admin-include-look.tpl 2008-07-22 04:11:23 UTC (rev 13801) +++ trunk/templates/tiki-admin-include-look.tpl 2008-07-22 04:35:52 UTC (rev 13802) @@ -121,9 +121,9 @@ </table> </fieldset> - {* --- Customize Site Logo --- *} + {* --- Customize Site Logo and Site Titile--- *} <fieldset> - <legend><a href="#"><span>{tr}Site Logo{/tr}</span></a></legend> + <legend><a href="#"><span>{tr}Site Logo and Title{/tr}</span></a></legend> <table class="admin"> @@ -159,7 +159,14 @@ <tr> <td class="form"><label for="sitelogo_alt">{tr}Alt. description (e.g. for text browsers){/tr}:</label></td> <td><input type="text" name="sitelogo_alt" id="sitelogo_alt" value="{$prefs.sitelogo_alt}" size="50" maxlength="50" /></td> + <tr> + <td class="form"><label for="sitetitle">{tr}Site title{/tr}:</label></td> + <td><input type="text" name="sitetitle" id="sitetitle" value="{$prefs.sitetitle}" size="50" maxlength="50" /></td> </tr> + <tr> + <td class="form"><label for="sitesubtitle">{tr}Site subtitle{/tr}:</label></td> + <td><input type="text" name="sitesubtitle" id="sitesubtitle" value="{$prefs.sitesubtitle}" size="50" maxlength="50" /></td> + </tr> </table> </fieldset> Modified: trunk/templates/tiki-site_header.tpl =================================================================== --- trunk/templates/tiki-site_header.tpl 2008-07-22 04:11:23 UTC (rev 13801) +++ trunk/templates/tiki-site_header.tpl 2008-07-22 04:35:52 UTC (rev 13802) @@ -24,6 +24,8 @@ {/if} <div id="sitelogo" class="floatleft" {if $prefs.sitelogo_bgcolor ne ''}style="background-color: {$prefs.sitelogo_bgcolor};"{/if}> <a href="./" title="{$prefs.sitelogo_title}"><img src="{$prefs.sitelogo_src}" alt="{$prefs.sitelogo_alt}" style="border: none" /></a> + <div id="sitetitle"><a href="index.php">{$prefs.sitetitle}</a></div> + <div id="sitesubtitle">{$prefs.sitesubtitle}</div> </div> {/if} {if $prefs.feature_sitelogo eq 'y' and $prefs.sitelogo_align eq 'right'} @@ -32,6 +34,8 @@ {/if} <div id="sitelogo" class="floatright"{if $prefs.sitelogo_bgcolor ne ''} style="background-color: {$prefs.sitelogo_bgcolor};" {/if}> <a href="./" title="{$prefs.sitelogo_title}"><img src="{$prefs.sitelogo_src}" alt="{$prefs.sitelogo_alt}" style="border: none" /></a> + <div id="sitetitle"><a href="index.php">{$prefs.sitetitle}</a></div> + <div id="sitesubtitle">{$prefs.sitesubtitle}</div> </div> {/if} </div> @@ -46,6 +50,8 @@ <div id="sitead" class="floatleft" {*style="width: 300px"*}>{eval var=$prefs.sitead}</div> {/if} <div id="sitelogo"{if $prefs.sitelogo_bgcolor ne ''} style="background-color: {$prefs.sitelogo_bgcolor};" {/if}><a href="./" title="{$prefs.sitelogo_title}"><img src="{$prefs.sitelogo_src}" alt="{$prefs.sitelogo_alt}" style="border: none" /></a> + <div id="sitetitle"><a href="index.php">{$prefs.sitetitle}</a></div> + <div id="sitesubtitle">{$prefs.sitesubtitle}</div> </div> </div> {/if} Modified: trunk/tiki-admin_include_look.php =================================================================== --- trunk/tiki-admin_include_look.php 2008-07-22 04:11:23 UTC (rev 13801) +++ trunk/tiki-admin_include_look.php 2008-07-22 04:35:52 UTC (rev 13802) @@ -35,6 +35,8 @@ "feature_siteidentity", "feature_siteloclabel", "feature_sitelogo", + "feature_sitetitle", + "feature_sitesubtitle", "feature_sitenav", "feature_sitead", "feature_sitesearch", @@ -68,6 +70,8 @@ "sitelogo_bgstyle", "sitelogo_title", "sitelogo_alt", + "sitetitle", + "sitesubtitle", "sitemycode", "sitead", "site_favicon", This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ny...@us...> - 2008-07-23 16:08:17
|
Revision: 13842 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=13842&view=rev Author: nyloth Date: 2008-07-23 16:08:24 +0000 (Wed, 23 Jul 2008) Log Message: ----------- [MOD] jscalendar: only display jscalendar if javascript has been detected + remove 'use_jscalendar' smarty var that is not used anymore. Modified Paths: -------------- trunk/templates/tiki-calendar_edit_item.tpl trunk/templates/tiki-calendar_nav.tpl trunk/templates/tiki-show_calendar.tpl trunk/tiki-calendar_export_ical.php trunk/tiki-jscalendar.php trunk/tiki-setup.php trunk/tiki-view_tracker.php trunk/tiki-view_tracker_item.php Modified: trunk/templates/tiki-calendar_edit_item.tpl =================================================================== --- trunk/templates/tiki-calendar_edit_item.tpl 2008-07-23 15:47:38 UTC (rev 13841) +++ trunk/templates/tiki-calendar_edit_item.tpl 2008-07-23 16:08:24 UTC (rev 13842) @@ -64,12 +64,12 @@ {if $edit} <table cellpadding="0" cellspacing="0" border="0" style="border:0;"> <tr><td style="border:0;padding-top:2px;vertical-align:middle"> -{if $prefs.feature_jscalendar ne 'y'} +{if $prefs.feature_jscalendar neq 'y' or $prefs.javascript_enabled neq 'y'} <a href="#" onclick="document.f.Time_Hour.selectedIndex=(document.f.Time_Hour.selectedIndex+1);">{icon _id='plus_small' align='left' width='11' height='8'}</a> {/if} </td> <td rowspan="2" style="border:0;padding-top:2px;vertical-align:middle"> -{if $prefs.feature_jscalendar eq 'y'} +{if $prefs.feature_jscalendar eq 'y' and $prefs.javascript_enabled eq 'y'} {jscalendar id="start" date=$calitem.start fieldname="save[date_start]" align="Bc" showtime='n'} {else} {html_select_date prefix="start_date_" time=$calitem.start field_order=$prefs.display_field_order start_year=$prefs.calendar_start_year end_year=$prefs.calendar_end_year} @@ -85,7 +85,7 @@ <a href="#" onclick="document.f.start_Minute.selectedIndex=(document.f.start_Minute.selectedIndex+1);">{icon _id='plus_small' align='left' width='11' height='8'}</a> </td></tr> <tr><td style="border:0;vertical-align:middle"> -{if $prefs.feature_jscalendar ne 'y'} +{if $prefs.feature_jscalendar neq 'y' or $prefs.javascript_enabled neq 'y'} <a href="#" onclick="document.f.Time_Hour.selectedIndex=(document.f.Time_Hour.selectedIndex-1);">{icon _id='minus_small' align='left' width='11' height='8'}</a> {/if} </td><td style="border:0;vertical-align:middle"> @@ -105,12 +105,12 @@ <input type="hidden" name="save[end_or_duration]" value="end" id="end_or_duration" /> <table cellpadding="0" cellspacing="0" border="0" style="border:0;display:block;" id="end_date"> <tr><td style="border:0;padding-top:2px;vertical-align:middle"> -{if $prefs.feature_jscalendar ne 'y'} +{if $prefs.feature_jscalendar neq 'y' or $prefs.javascript_enabled neq 'y'} <a href="#" onclick="document.f.Time_Hour.selectedIndex=(document.f.Time_Hour.selectedIndex+1);">{icon _id='plus_small' align='left' width='11' height='8'}</a> {/if} </td> <td rowspan="2" style="border:0;vertical-align:middle"> -{if $prefs.feature_jscalendar eq 'y'} +{if $prefs.feature_jscalendar eq 'y' and $prefs.javascript_enabled eq 'y'} {jscalendar id="end" date=$calitem.end fieldname="save[date_end]" align="Bc" showtime='n'} {else} {html_select_date prefix="end_date_" time=$calitem.end field_order=$prefs.display_field_order start_year=$prefs.calendar_start_year end_year=$prefs.calendar_end_year} @@ -128,7 +128,7 @@ <td rowspan="2" style="border:0;padding-top:2px;vertical-align:middle"><a href="#" onclick="document.getElementById('end_or_duration').value='duration';flip('end_duration');flip('end_date');return false;">{tr}Duration{/tr}</a></td> </tr> <tr><td style="border:0;vertical-align:middle"> -{if $prefs.feature_jscalendar ne 'y'} +{if $prefs.feature_jscalendar neq 'y' or $prefs.javascript_enabled neq 'y'} <a href="#" onclick="document.f.Time_Hour.selectedIndex=(document.f.Time_Hour.selectedIndex-1);">{icon _id='minus_small' align='left' width='11' height='8'}</a> {/if} </td><td style="border:0;vertical-align:middle"> Modified: trunk/templates/tiki-calendar_nav.tpl =================================================================== --- trunk/templates/tiki-calendar_nav.tpl 2008-07-23 15:47:38 UTC (rev 13841) +++ trunk/templates/tiki-calendar_nav.tpl 2008-07-23 16:08:24 UTC (rev 13842) @@ -10,7 +10,7 @@ <a href="{$myurl}?viewmode=year" class="viewmode{if $viewmode eq 'year'}on{else}off{/if}" title="{tr}Year{/tr}"><img src="img/icons/cal_year.gif" width="30" height="24" border="0" alt="{tr}Year{/tr}" /></a> </div> -{if $prefs.feature_jscalendar eq 'y'} +{if $prefs.feature_jscalendar eq 'y' && $prefs.javascript_enabled eq 'y'} <div class="jscalrow"> <form action="{$myurl}" method="post" name="f"> {jscalendar date="$focusdate" id="trig" goto="$jscal_url" align="Bc"} Modified: trunk/templates/tiki-show_calendar.tpl =================================================================== --- trunk/templates/tiki-show_calendar.tpl 2008-07-23 15:47:38 UTC (rev 13841) +++ trunk/templates/tiki-show_calendar.tpl 2008-07-23 16:08:24 UTC (rev 13842) @@ -2,7 +2,7 @@ <div class="tabrow"> <table cellpadding="0" cellspacing="0" border="0"> <tr><td class="middle" nowrap="nowrap" rowspan="2"> -{if $prefs.feature_jscalendar eq 'y'} +{if $prefs.feature_jscalendar eq 'y' and $prefs.javascript_enabled eq 'y'} <form action="tiki-calendar.php" method="post" name="f"> <span title="{tr}Date Selector{/tr}" id="datrigger" class="daterow" >{$focusdate|tiki_long_date}</span> <span class="date"><- {tr}Click to Navigate{/tr}</span> Modified: trunk/tiki-calendar_export_ical.php =================================================================== --- trunk/tiki-calendar_export_ical.php 2008-07-23 15:47:38 UTC (rev 13841) +++ trunk/tiki-calendar_export_ical.php 2008-07-23 16:08:24 UTC (rev 13842) @@ -39,7 +39,7 @@ $calendars["data"][$i]["individual"] = $userlib->object_has_one_permission($i, 'calendar'); } $smarty->assign('calendars',$calendars["data"]); -$smarty->assign('uses_jscalendar','y'); + // export calendar // if (isset($_REQUEST["calendarId"]) && $_REQUEST["calendarId"] && $_REQUEST["export"]=='y') { // get calendar events Modified: trunk/tiki-jscalendar.php =================================================================== --- trunk/tiki-jscalendar.php 2008-07-23 15:47:38 UTC (rev 13841) +++ trunk/tiki-jscalendar.php 2008-07-23 16:08:24 UTC (rev 13842) @@ -5,13 +5,11 @@ exit; } -if (isset($prefs['feature_jscalendar']) and $prefs['feature_jscalendar'] == 'y') { +if ( $prefs['feature_jscalendar'] == 'y' && $prefs['javascript_enabled'] == 'y' ) { $jslang['en'] = "en"; $jslang['fr'] = "fr-utf8"; $jslang['pt-br'] = "br-utf8"; $jslang['es'] = "es-utf8"; - $smarty->assign('uses_jscalendar', 'y'); - $smarty->assign('feature_jscalendar', 'y'); if (isset($prefs['language']) and isset($jslang[$prefs['language']])) { $smarty->assign('jscalendar_langfile', $jslang[$prefs['language']]); } else { Modified: trunk/tiki-setup.php =================================================================== --- trunk/tiki-setup.php 2008-07-23 15:47:38 UTC (rev 13841) +++ trunk/tiki-setup.php 2008-07-23 16:08:24 UTC (rev 13842) @@ -130,7 +130,6 @@ $smarty->assign('edit_page', 'n'); $smarty->assign('forum_mode', 'n'); $smarty->assign('uses_tabs', 'n'); -$smarty->assign('uses_jscalendar', 'n'); $smarty->assign('uses_phplayers', 'n'); $smarty->assign('wiki_extras', 'n'); Modified: trunk/tiki-view_tracker.php =================================================================== --- trunk/tiki-view_tracker.php 2008-07-23 15:47:38 UTC (rev 13841) +++ trunk/tiki-view_tracker.php 2008-07-23 16:08:24 UTC (rev 13842) @@ -763,9 +763,6 @@ include_once('tiki-section_options.php'); $smarty->assign('uses_tabs', 'y'); -if ($prefs['feature_jscalendar']) { - $smarty->assign('uses_jscalendar', 'y'); -} $smarty->assign('show_filters', 'n'); if(count($fields['data'])>0) { foreach ($fields['data'] as $it) { Modified: trunk/tiki-view_tracker_item.php =================================================================== --- trunk/tiki-view_tracker_item.php 2008-07-23 15:47:38 UTC (rev 13841) +++ trunk/tiki-view_tracker_item.php 2008-07-23 16:08:24 UTC (rev 13842) @@ -1187,10 +1187,6 @@ $smarty->assign('uses_tabs', 'y'); -if ($prefs['feature_jscalendar']) { - $smarty->assign('uses_jscalendar', 'y'); -} - ask_ticket('view-trackers-items'); if ( $prefs['feature_ajax'] == 'y' ) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lph...@us...> - 2008-07-23 16:28:16
|
Revision: 13844 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=13844&view=rev Author: lphuberdeau Date: 2008-07-23 16:28:23 +0000 (Wed, 23 Jul 2008) Log Message: ----------- [MRG] Automatic merge, branches/2.0 13786 to 13840 Modified Paths: -------------- trunk/db/tiki-db.php trunk/installer/tiki-installer.php trunk/lang/ca/language.php trunk/lang/de/language.php trunk/lang/es/language.php trunk/lang/fr/language.php trunk/lib/Galaxia/src/common/Base.php trunk/lib/csslib.php trunk/lib/tikihelp/index.html trunk/lib/tikilib.php trunk/lib/wiki-plugins/wikiplugin_tracker.php trunk/styles/tikineat.css trunk/templates/tiki-mytiki_mootabs.tpl trunk/tiki-admin.php trunk/tiki-calendar_setup.php trunk/tiki-install.php trunk/tiki-setup.php trunk/tiki-setup_base.php Added Paths: ----------- trunk/doc/devtools/convert_templates_prefs-2.0.php trunk/doc/devtools/search_smarty_prefs-2.0.php Removed Paths: ------------- trunk/doc/devtools/convert_templates_prefs-1.10.php trunk/doc/devtools/search_smarty_prefs-1.10.php trunk/doc/devtools/tikimerge_110to111.sh Modified: trunk/db/tiki-db.php =================================================================== --- trunk/db/tiki-db.php 2008-07-23 16:13:17 UTC (rev 13843) +++ trunk/db/tiki-db.php 2008-07-23 16:28:23 UTC (rev 13844) @@ -74,9 +74,8 @@ $tikidomain = $multi; } } -$re = false; -if ( is_file($local_php) ) $re = include_once($local_php); -if ( $re === false ) { +$re = include('db/'.$local_php); +if ( $re === FALSE) { print '<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> @@ -108,6 +107,9 @@ '; exit; } + +if ( $dbversion_tiki == '1.10' ) $dbversion_tiki = '2.0'; + if (preg_match('/^adodb$/i', $api_tiki)) { TikiInit::prependIncludePath('lib/adodb'); if (strpos(ini_get('include_path'),'lib/pear') !== 0) Deleted: trunk/doc/devtools/convert_templates_prefs-1.10.php =================================================================== --- trunk/doc/devtools/convert_templates_prefs-1.10.php 2008-07-23 16:13:17 UTC (rev 13843) +++ trunk/doc/devtools/convert_templates_prefs-1.10.php 2008-07-23 16:28:23 UTC (rev 13844) @@ -1,65 +0,0 @@ -<?php -require_once('tiki-setup.php'); - -/* - * This script convert templates with the old preferences $truc to $pref.truc by getting the currently existing prefs keys. - * Use with caution ! - * Copy it to the root of you're tiki, and run it with: - * php convert_templates_prefs-1.10.php - */ - -/* customize this to the directory you want to convert */ -$dirtoscan='templates'; - -/*****************/ - -/* defines functions scandir and file_out_contents if running PHP<5 */ -if (!function_exists('scandir')) { - function scandir($dir) { - $dh = opendir($dir); - while (false !== ($filename = readdir($dh))) { - $files[] = $filename; - } - sort($files); - - return $files; - } -} -if (!function_exists('file_put_contents')) { - function file_put_contents($filename, $data) { - $f = @fopen($filename, 'w'); - if (!$f) { - return false; - } else { - $bytes = fwrite($f, $data); - fclose($f); - return $bytes; - } - } -} - -$src=array(); -$dst=array(); - -foreach(array_keys($prefs) as $k => $v) { - $src[$k]='$'.$v; - $dst[$k]='$prefs.'.$v; -} - -$elems=scandir($dirtoscan); - -foreach($elems as $filename) { - if (preg_match('/.tpl$/', $filename)) { - echo "$filename... "; - $content_src=file_get_contents($dirtoscan.'/'.$filename); - $content_dst=str_replace($src, $dst, $content_src); - if ($content_dst != $content_src) { - file_put_contents($dirtoscan.'/'.$filename, $content_dst); - echo " modified\n"; - } else { - echo " no\n"; - } - } -} - -?> \ No newline at end of file Copied: trunk/doc/devtools/convert_templates_prefs-2.0.php (from rev 13840, branches/2.0/doc/devtools/convert_templates_prefs-2.0.php) =================================================================== --- trunk/doc/devtools/convert_templates_prefs-2.0.php (rev 0) +++ trunk/doc/devtools/convert_templates_prefs-2.0.php 2008-07-23 16:28:23 UTC (rev 13844) @@ -0,0 +1,65 @@ +<?php +require_once('tiki-setup.php'); + +/* + * This script convert templates with the old preferences $truc to $pref.truc by getting the currently existing prefs keys. + * Use with caution ! + * Copy it to the root of you're tiki, and run it with: + * php convert_templates_prefs-2.0.php + */ + +/* customize this to the directory you want to convert */ +$dirtoscan='templates'; + +/*****************/ + +/* defines functions scandir and file_out_contents if running PHP<5 */ +if (!function_exists('scandir')) { + function scandir($dir) { + $dh = opendir($dir); + while (false !== ($filename = readdir($dh))) { + $files[] = $filename; + } + sort($files); + + return $files; + } +} +if (!function_exists('file_put_contents')) { + function file_put_contents($filename, $data) { + $f = @fopen($filename, 'w'); + if (!$f) { + return false; + } else { + $bytes = fwrite($f, $data); + fclose($f); + return $bytes; + } + } +} + +$src=array(); +$dst=array(); + +foreach(array_keys($prefs) as $k => $v) { + $src[$k]='$'.$v; + $dst[$k]='$prefs.'.$v; +} + +$elems=scandir($dirtoscan); + +foreach($elems as $filename) { + if (preg_match('/.tpl$/', $filename)) { + echo "$filename... "; + $content_src=file_get_contents($dirtoscan.'/'.$filename); + $content_dst=str_replace($src, $dst, $content_src); + if ($content_dst != $content_src) { + file_put_contents($dirtoscan.'/'.$filename, $content_dst); + echo " modified\n"; + } else { + echo " no\n"; + } + } +} + +?> Deleted: trunk/doc/devtools/search_smarty_prefs-1.10.php =================================================================== --- trunk/doc/devtools/search_smarty_prefs-1.10.php 2008-07-23 16:13:17 UTC (rev 13843) +++ trunk/doc/devtools/search_smarty_prefs-1.10.php 2008-07-23 16:28:23 UTC (rev 13844) @@ -1,43 +0,0 @@ -<?php -require_once('tiki-setup.php'); - -/* - * This script search in php files every $smarty->assign("truc" where truc is a preference key - * Copy it to the root of you're tiki, and run it with: - * php search_smarty_prefs-1.10.php - */ - -/* customize this to the directory you want to scan */ -$dirtoscan='.'; - -/*****************/ -$kprefs=array(); -foreach($prefs as $k => $v) $kprefs[]=preg_quote($k); - -// split the array in smaller array, because preg_match have some limitations -$src=array(); -for ($i=0; $i<count($kprefs); $i+=500) { - $src[]='/\$smarty->assign\([\'"]('.implode('|', array_slice($kprefs, $i, 500)).')[\'"]/'; -} -$elems=scandir($dirtoscan); - -foreach($elems as $filename) { - if (preg_match('/.php$/', $filename)) { - $content_src=file_get_contents($dirtoscan.'/'.$filename); - $gmatchs=array(); - foreach($src as $regexp) { - $matchs=array(); - $count=preg_match_all($regexp, $content_src, $matchs); - if ($count === false) die("error: $regexp"); - if ($count) { - foreach($matchs[1] as $v) $gmatchs[]=$v; - } - } - if (count($gmatchs)) { - //var_dump($matchs); - echo "$filename: ".implode(', ', $gmatchs)."\n"; - } - } -} - -?> \ No newline at end of file Copied: trunk/doc/devtools/search_smarty_prefs-2.0.php (from rev 13840, branches/2.0/doc/devtools/search_smarty_prefs-2.0.php) =================================================================== --- trunk/doc/devtools/search_smarty_prefs-2.0.php (rev 0) +++ trunk/doc/devtools/search_smarty_prefs-2.0.php 2008-07-23 16:28:23 UTC (rev 13844) @@ -0,0 +1,43 @@ +<?php +require_once('tiki-setup.php'); + +/* + * This script search in php files every $smarty->assign("truc" where truc is a preference key + * Copy it to the root of you're tiki, and run it with: + * php search_smarty_prefs-2.0.php + */ + +/* customize this to the directory you want to scan */ +$dirtoscan='.'; + +/*****************/ +$kprefs=array(); +foreach($prefs as $k => $v) $kprefs[]=preg_quote($k); + +// split the array in smaller array, because preg_match have some limitations +$src=array(); +for ($i=0; $i<count($kprefs); $i+=500) { + $src[]='/\$smarty->assign\([\'"]('.implode('|', array_slice($kprefs, $i, 500)).')[\'"]/'; +} +$elems=scandir($dirtoscan); + +foreach($elems as $filename) { + if (preg_match('/.php$/', $filename)) { + $content_src=file_get_contents($dirtoscan.'/'.$filename); + $gmatchs=array(); + foreach($src as $regexp) { + $matchs=array(); + $count=preg_match_all($regexp, $content_src, $matchs); + if ($count === false) die("error: $regexp"); + if ($count) { + foreach($matchs[1] as $v) $gmatchs[]=$v; + } + } + if (count($gmatchs)) { + //var_dump($matchs); + echo "$filename: ".implode(', ', $gmatchs)."\n"; + } + } +} + +?> Deleted: trunk/doc/devtools/tikimerge_110to111.sh =================================================================== --- trunk/doc/devtools/tikimerge_110to111.sh 2008-07-23 16:13:17 UTC (rev 13843) +++ trunk/doc/devtools/tikimerge_110to111.sh 2008-07-23 16:28:23 UTC (rev 13844) @@ -1,153 +0,0 @@ -#!/bin/sh -# $Id$ -# -# NOTE: Since 1.9.8 release, the 1.9 branch is frozen and merges are done manualy -# merge now only concerns BRANCH-1-10 to HEAD -# -# That script is done for fast merging fixes that are done on branch -# refer to http://tikiwiki.org/tiki-index.php?page=CvsBranch18 -# for explanaitoin of the process -# -# ! ! ! ! W A R N I N G ! ! ! ! -# this script is very experimental and is not very clean nor finished. -# use it only if you know what all means -# remove echo if you are confident in automation -# but keep in mind that environment preservation requires consideration -# so : Don't break the CVS !! :) -# -# -- mose -# -# ! ! ! ! ! ! ! ! ! ! ! ! -# -# run it in branch to merge change to head instantly - -# Use it giving file name(s) as arguments: file name(s) can be particular files -# or "." (default) for all files - -if [ -z $EXCLUDE_FROM_MERGE ]; then - EXCLUDE_FROM_MERGE="lang" -fi - -if [ -z $MERGE_LOGDIR ]; then - MERGE_LOGDIR="." -fi - -if [ -z $MERGE_LOGFILE ]; then - MERGE_LOGFILE="tikimerge.log.`date +%s`" -fi - -MERGELOG="$MERGE_LOGDIR/$MERGE_LOGFILE" - -if [ ! -f $MERGELOG ]; then - touch $MERGELOG -fi - - -if [ -z $1 ]; then - FILES="." -else - FILES=$* -fi - -echo "# Start of block you can just copy-paste" -echo "# or adapt (especially comment of commit)" -echo "" -echo "# the merge should be done on tiki and not tikiwiki" -echo "" - -echo "-------" >> $MERGELOG -echo `date` >> $MERGELOG -echo >> $MERGELOG - -echo "tikimerge -? Launch an update of your local repository?" -echo -n "tikimerge -> [ press enter to proceed, ctrl-c to halt ] " -read - -echo "tikimerge -$ cvs -q up -d -r BRANCH-1-10 $FILES" -if [ "$FILES" = "." ]; then - echo "tikimerge -> (please wait, this can take a while ...)" -fi -# ------------------------------------------------------ -cvs -q up -d -r BRANCH-1-10 $FILES >> $MERGELOG -# -echo "tikimerge -> cvs update done." -echo - -echo "tikimerge -? Move the merge tag ?" -echo -n "tikimerge -> [ press enter to proceed, ctrl-c to halt ] " -read - -echo "tikimerge -$ cvs -q tag -r BRANCH-1-10 -F BRANCH-1-10-HEAD $FILES" -# ------------------------------------------------------ -cvs -q tag -r BRANCH-1-10 -F BRANCH-1-10-HEAD $FILES >> $MERGELOG -# -echo "tikimerge -> Tag moved done." -echo - -echo "tikimerge -? Grab the cvs HEAD ?" -echo -n "tikimerge -> [ press enter to proceed, ctrl-c to halt ] " -read - -echo "tikimerge -$ cvs -q up -dA $FILES" -if [ "$FILES" = "." ]; then - echo "tikimerge -> (please wait, this can take a while too ...)" -fi -# ------------------------------------------------------ -cvs -q up -dA $FILES >> $MERGELOG -# -echo "tikimerge -> cvs updated to HEAD." -echo - -echo "tikimerge -? Merge the files from BRANCH-1-10 ?" -echo -n "tikimerge -> [ press enter to proceed, ctrl-c to halt ] " -read - -for i in $FILES; do - echo "tikimerge -$ cvs -q up -dkk -j MERGE-1-10-HEAD -j BRANCH-1-10-HEAD $i" - # ------------------------------------------------------ - cvs -q up -dkk -j MERGE-1-10-HEAD -j BRANCH-1-10-HEAD $i >> $MERGELOG - # -done -if [ "$FILES" = "." ]; then - echo "tikimerge -> Excluded from merges : $EXCLUDE" - for i in $EXCLUDE; do - echo "tikimerge -$ rm -rf $i && cvs -q up -dA $i" - # ------------------------------------------------------ - rm -rf $i && cvs -q up -dA $i >> $MERGELOG - # - done -fi - -echo "tikimerge -$ grep -r '<<<<<<<' $FILES" -# ------------------------------------------------------ -grep -r '<<<<<<<' $FILES >> $MERGELOG -# -echo "tikimerge -> Now get some fun fixing the conflicts if any are listed above." -echo -n "tikimerge -> [ press enter when done, ctrl-c to halt ] " -read - -echo -echo "tikimerge -? Commit the merged files to HEAD ?" -echo "tikimerge -> [ Type the one-line comment of your commit(or nothing for the default message), then press enter to proceed ] " -read COMMENT - -if [ -z "$COMMENT" ]; then - COMMENT="Merge from 1.10" -fi - -echo "tikimerge -$ cvs ci -m\"[MERGED] $COMMENT\" $FILES" -# ------------------------------------------------------ -cvs ci -m"[MERGED] $COMMENT" $FILES >> $MERGELOG -# -echo "tikimerge -> Auto-moving the floating tag to updated version." -echo "tikimerge -$ cvs -q tag -r BRANCH-1-10-HEAD -F MERGE-1-10-HEAD $FILES" - -echo "cvs -q up -dA -r BRANCH-1-10 $FILES" -cvs -q up -dA -r BRANCH-1-10 $FILES - -echo -echo "tikimerge -> All Done. Check $MERGELOG for detailed log." -echo - -exit 0 - Modified: trunk/installer/tiki-installer.php =================================================================== --- trunk/installer/tiki-installer.php 2008-07-23 16:13:17 UTC (rev 13843) +++ trunk/installer/tiki-installer.php 2008-07-23 16:28:23 UTC (rev 13844) @@ -589,6 +589,7 @@ } else { // include the file to get the variables include ($local); + if ( $dbversion_tiki == '1.10' ) $dbversion_tiki = '2.0'; if (!isset($db_tiki)) { //upgrade from 1.7.X Modified: trunk/lang/ca/language.php =================================================================== --- trunk/lang/ca/language.php 2008-07-23 16:13:17 UTC (rev 13843) +++ trunk/lang/ca/language.php 2008-07-23 16:28:23 UTC (rev 13844) @@ -202,7 +202,7 @@ "Content Templates" => "Plantilles de contingut", "Control by category" => "Control per categoria", "Control by Object" => "Control per Objecte", -"Crea page:" => "Crea la plana:", +"Crea page:" => "Crea la pàgina:", "Create a tag for the current wiki" => "Crear una marca per al wiki actual", "Create/edit extwiki" => "Create/edit extwiki", "Create/edit Faq" => "Crear/editar Puf", @@ -314,7 +314,7 @@ "Index page" => "Pàgina índex", "Information:" => "Informació:", "In parent page" => "In parent page", -"Insert articles into a wikipage" => "Inserta articles a una plana wiki", +"Insert articles into a wikipage" => "Inserta articles a una pàgina wiki", "Ins" => "Ins", "Invalid password. You current password is required to change your email address." => "Contrasenya incorrecte. La teva Contrasenya és necessària per canviar la teva adreça de correu.", "JoinCapitalizedWords" => "AjuntarParaulesEnMajuscules", @@ -451,7 +451,7 @@ "The following file was succesfully uploaded" => "El següent arxiu ha estat pujat satisfactòriament", "The following image was succesfully edited" => "La següent imatge ja ha estat editada satisfactòriament", "The following image was succesfully uploaded" => "La següent imatge s'ha rebut satisfactòriament", -"The new page content is:" => "El nou contingut de la plana és:", +"The new page content is:" => "El nou contingut de la pàgina és:", "The passwords didn't match" => "Els mots de pas no coincideixen", "The passwords dont match" => "Els mots de pas no coincideixen", "There are inddividual permissions set for this blog" => "Aquesta bitàcola té especificats permisos individuals", @@ -525,12 +525,12 @@ "xx" => "xx", "xxx" => "xxx", "You are not permitted to edit someone else\\'s post!" => "No tens permís per editar la publicació d'algú altre!", -"You can edit the page following this link:" => "Pots editar la plana seguint aquest enllaç:", +"You can edit the page following this link:" => "Pots editar la pàgina seguint aquest enllaç:", "You can include the image in an HTML or Tiki page using" => "Pots incloure aquesta imatge en una pàgina HTML o Tiki emprant", "You can include the image in an HTML/Tiki page using" => "Pots incloure aquesta imatge en una pàgina HTML/Tiki emprant", "You cant download files" => "No pots baixar arxius", "You cant use the same password again" => "Pots emprar la mateixa contrasenya un altre cop", -"You can view the page following this link:" => "Pots veure la plana seguint aquest enllaç:", +"You can view the page following this link:" => "Pots veure la pàgina seguint aquest enllaç:", "You do not have permission to use this feature." => "No tens permís per emprar aquesta característica.", "You dont have permissions to edit banners" => "No té permís per editar banners", "You dont have permission to delete the mapfile" => "No tens permís per esborrar fitxer del mapa", @@ -566,7 +566,7 @@ "Center" => "Centra", "Will display the text centered" => "Mostra el text centrat", "Insert Module Output" => "Inserta la sortida del Mòdul", -"{literal}{MODULE(module=>some_module)}text{MODULE}{/literal} can be used to insert the output of module \"some_module\" into your Wiki page. See <a href=\"{\$helpurl}PluginModule\">PluginModule</a> for more information. " => "{literal}{MODULE(module=>algun mòdul)}text{MODULE}{/literal} pot ser emprat per insertar la sortida del mòdul \"algun mòdul\" a la teva plana Wiki. Mira <a href=\"{\$helpurl}PluginModule\">PluginModule</a> per més informació. ", +"{literal}{MODULE(module=>some_module)}text{MODULE}{/literal} can be used to insert the output of module \"some_module\" into your Wiki page. See <a href=\"{\$helpurl}PluginModule\">PluginModule</a> for more information. " => "{literal}{MODULE(module=>algun mòdul)}text{MODULE}{/literal} pot ser emprat per insertar la sortida del mòdul \"algun mòdul\" a la teva pàgina Wiki. Mira <a href=\"{\$helpurl}PluginModule\">PluginModule</a> per més informació. ", "Rendering Program Code" => "Interpreta Codi de Programa", "New blog post: {\$mail_title}: {\$title} by {\$mail_user} at {\$mail_date|tiki_short_datetime}" => "Nova entrada a la bitàcola: {\$mail_title}: {\$title} per {\$mail_user} el {\$mail_date|tiki_short_datetime}", "Jukebox" => "Jukebox", @@ -588,11 +588,11 @@ " line " => " línia ", "permission." => "permís.", "Error: Invalid" => "Error: Invàlid", -"Error: Call to hw_page_fetch_by_id failed!" => "Error: ha fallat la crida a la recuperació de la plana per id!", +"Error: Call to hw_page_fetch_by_id failed!" => "Error: ha fallat la crida a la recuperació de la pàgina per id!", "no description" => "sense descripció", "Updated" => "Actualitzat", "Renders a graph, with linked pages navigation visually figured.\n" => "Produeix un gràfic, amb navegació de mode visual per les planes enllaçades.\n", -"the number of hops the graph follows\n" => "segueix el nombre de salts de la plana\n", +"the number of hops the graph follows\n" => "segueix el nombre de salts de la pàgina\n", "the title of the map\n" => "el títol del mapa\n", "the space between nodes\n" => "l'espai entre nodes\n", "Left to Right, the direction of graph\n" => "D'esquerra a dreta, la direcció del graph\n", @@ -632,9 +632,9 @@ "Save Grades" => "Desa Avaluacions", "Grade for" => "Avalua a", "Personal Learning Folder" => "ePortfolio Personal de l'usuari/a", -"The page {\$mail_page} was changed by {\$mail_user} at\n{\$mail_date|tiki_short_datetime}" => "La plana {\$mail_page} va ser canviada per {\$mail_user} el\n{\$mail_date|tiki_short_datetime}", -"You can view the page by following this link:\n {\$mail_machine}/tiki-index.php?page={\$mail_page|escape:\"url\"}" => "Pots veure la plana si segueixes aquest enllaç:\n {\$mail_machine}/tiki-index.php?page={\$mail_page|escape:\"url\"}", -"You can edit the page by following this link:\n {\$mail_machine}/tiki-editpage.php?page={\$mail_page|escape:\"url\"}" => "Pots editar la plana seguint aquest enllaç:\n {\$mail_machine}/tiki-editpage.php?page={\$mail_page|escape:\"url\"}", +"The page {\$mail_page} was changed by {\$mail_user} at\n{\$mail_date|tiki_short_datetime}" => "La pàgina {\$mail_page} va ser canviada per {\$mail_user} el\n{\$mail_date|tiki_short_datetime}", +"You can view the page by following this link:\n {\$mail_machine}/tiki-index.php?page={\$mail_page|escape:\"url\"}" => "Pots veure la pàgina si segueixes aquest enllaç:\n {\$mail_machine}/tiki-index.php?page={\$mail_page|escape:\"url\"}", +"You can edit the page by following this link:\n {\$mail_machine}/tiki-editpage.php?page={\$mail_page|escape:\"url\"}" => "Pots editar la pàgina seguint aquest enllaç:\n {\$mail_machine}/tiki-editpage.php?page={\$mail_page|escape:\"url\"}", "You can view a diff back to the previous version by following\nthis link:\n {\$mail_machine}/tiki-pagehistory.php?page={\$mail_page|escape:\"url\"}&diff2={\$mail_last_version}" => "Pots veure un diff a la versió prèvia seguint\naquest enllaç:\n {\$mail_machine}/tiki-pagehistory.php?page={\$mail_page|escape:\"url\"}&diff2={\$mail_last_version}", "Confirmation required" => "Confirmació requerida", "Wiki quick help" => "Ajuda ràpida Wiki", @@ -656,7 +656,7 @@ "ver" => "versió", "sort order" => "criteri d'ordenació", "Edit selection" => "Edita la selecció", -"Error: This page is being edited by another user." => "Error: aquesta plana està essent editada per un altra persona usuària.", +"Error: This page is being edited by another user." => "Error: aquesta pàgina està essent editada per un altra persona usuària.", "updated by the phpwiki import process" => "actualitzat pel procés d'importació de phpwiki", "created from phpwiki import" => "creada des de phpwiki import", "Security check failed!" => "Verificació de seguretat fallida!", @@ -906,7 +906,7 @@ "change" => "canviar", "Manage attachment preferences" => "Gestiona les preferències dels adjunts", "HTML in Wiki Pages" => "HTML en Planes Wiki", -"Wiki syntax used when a page contains HTML" => "Sintaxi Wiki emprada quan una plana contè HTML", +"Wiki syntax used when a page contains HTML" => "Sintaxi Wiki emprada quan una pàgina contè HTML", "full" => "sencer", "partial" => "parcial", "Search and replace" => "Cerca i reemplaça", @@ -1157,7 +1157,7 @@ "remove from this page" => "Esborrar d'aquesta pàgina", "remove from this structure" => "Esborrar d'aquesta estructura", "No individual permissions; category or global permissions apply" => "Cap permís local (individual); s'aplicaran els permisos de la categoria o els globals", -"this page" => "aquesta plana", +"this page" => "aquesta pàgina", "this structure" => "aquesta estructura", "Current permissions for categories that this page belongs to" => "Permisos actuals per categories a les quals pertany aquesta pàgina", "Send email notifications when this page changes to" => "Envia notificacions email quan aquesta pàgina canvii a", @@ -1212,8 +1212,8 @@ "remove image" => "elimina imatge", "add contacts" => "afegeix contactes", "DATE-of" => "de", -"You cannot edit this page because it is a user personal page" => "No pots editar aquesta pàgina, ja que és una plana personal d'un usuari", -"Permission denied you cannot assign permissions for this page" => "No tens autorització per assignar permisos en aquesta plana", +"You cannot edit this page because it is a user personal page" => "No pots editar aquesta pàgina, ja que és una pàgina personal d'un usuari", +"Permission denied you cannot assign permissions for this page" => "No tens autorització per assignar permisos en aquesta pàgina", "Cannot read file" => "No es pot llegir l'arxiu", "Permission denied you cannot upload files" => "Permís denegat, no podeu pujar fitxers", "cannot process upload" => "no s'ha pogut processar la pujada", @@ -1285,7 +1285,7 @@ "Tiki preferences value field in db is set to be max. 250 characters long by default until now. That applies for the custom code content too. Check this field if you want to update your preferences database table to support more than 250 chars (although it was tested and works fine with mysql, it's recommended to backup your data manually before any database update)" => "El valor del camp de les preferències Tiki a la base de dades està fixat en com a màxim 250 caracters de llarg (per defecte fins ara). Això té validesa també sobre sobre el contingut del codi adaptat. Marca aquesta casella si vols actualitzar la taula de preferències de la teva base dades per permetre més de 250 caracters (malgrat ha estat provat i funciona bé amb mysql, és recomanable fer una còpia de seguretat de la base de dades manualment abans de qualsevol actualització de la base de dades)", "Users & groups" => "Usuaris & grups", "private" => "privat", -"This page is to configure settings of RSS feeds generated/exported by Tiki. To read/import RSS feeds, look for \"RSS modules\" on the application menu, or" => "Aquesta plana és per configurar els paràmetres de les alimentacions RSS generades/exportades per Tiki. Per llegir/importar alimenacions RSS, cerca \"Mòduls RSS\" en el menú principal de l'aplicació, o", +"This page is to configure settings of RSS feeds generated/exported by Tiki. To read/import RSS feeds, look for \"RSS modules\" on the application menu, or" => "Aquesta pàgina és per configurar els paràmetres de les alimentacions RSS generades/exportades per Tiki. Per llegir/importar alimenacions RSS, cerca \"Mòduls RSS\" en el menú principal de l'aplicació, o", "<b>Feed</b>" => "<b>Alimentació</b>", "<b>enable/disable</b>" => "<b>habilita/deshabilita</b>", "<b>Max number of items</b>" => "<b>Quantitat màxima d'ítems</b>", @@ -1347,12 +1347,12 @@ "PDF Settings" => "Configuració de PDF", "Select Wiki Pages" => "Seleccionar les Pàgines Wiki", "Remove Page" => "Eliminar pàgina", -"Use ...page... to separate pages in a multi-page article" => "Empra ...page... per separar planes en un article multi-plana", +"Use ...page... to separate pages in a multi-page article" => "Empra ...page... per separar planes en un article multi-pàgina", "answer" => "resposta", "Use this section to set the language of the version you are currently working on." => "Empra aquesta secció per especificar l'idioma de la versió en la qual estàs treballant actualment.", "Set of Translations" => "Conjunt de Tranduccions", "Translation of:" => "Traducció de:", -"Enter the name of the page for which the current page is the translation." => "Introdueix el nom de la plana per a la cual aquesta és la traducció.", +"Enter the name of the page for which the current page is the translation." => "Introdueix el nom de la pàgina per a la cual aquesta és la traducció.", "Add to the Set" => "Afegeix al conjunt", "graph" => "gràfica", "icon" => "icona", @@ -1464,10 +1464,10 @@ "sql queries" => "crides sql", "\$title" => "\$title", "Request failed for %s" => "La petició per %s ha fallat", -"Insert a Mediawiki/Wikipedia-type contents link box on a wiki page, using maketoc." => "Inserta un requadre amb enllaços de taula de continguts del tipus Mediawiki/Wikipedia en una plana Wiki, emprant maketoc.", -"Redirects you to another wiki page" => "Redirecciona a una altra plana Wiki", +"Insert a Mediawiki/Wikipedia-type contents link box on a wiki page, using maketoc." => "Inserta un requadre amb enllaços de taula de continguts del tipus Mediawiki/Wikipedia en una pàgina Wiki, emprant maketoc.", +"Redirects you to another wiki page" => "Redirecciona a una altra pàgina Wiki", "Inserts a Mediawiki/Wikipedia-look thumbnail with caption that links to a full-size image." => "Inserta un contacte estil Mediawiki/Wikipedia amb un peu de figura que enllaça a la imatge sencera.", -"Insert a Tikipedia-look box on wiki page" => "Inserta una caixa estil Tikipedia en una plana Wiki", +"Insert a Tikipedia-look box on wiki page" => "Inserta una caixa estil Tikipedia en una pàgina Wiki", "group not found" => "No s'ha trobat el grup", "group already exist" => "El grup ja existeix", "user not found" => "usuari no trobat", @@ -1577,13 +1577,13 @@ "User Selector: use options for automatic field feeding : you can use 1 for author login or 2 for modificator login." => "Selector d'usuari: empra opcions per a alimentació automàtica del camp: pots emprar 1 per al nom d'usuari/a de l'autor/a o 2 per al nom d'usuari/a de la persona modificadora.", "Category options: parentId" => "Opcions de categories options: parentId (Id del pare dels ítems de la categoria a incloure)", "Item Link options: trackerId,fieldId,linkToItem links to item from trackerId which fieldId matches the content of that field. linkToItem 1|0 to create a link to the item in view mode and listing" => "Opcions d'enllaç de l'ítem: IdFormulari,IdCamp,enllaç_a_Item enllaça a l'ítem de l'IdFormulari en el qual l'IdCamp coincideix amb el contingut d'aquell camp. enllaç_a_Item pot ser 1 ó 0 per crear, o no, l'enllaç a l'ítem en el mode de visualització i llistat", -"~np~{~/np~ARTICLES(max=>3,topic=>topicName,type=>type,categId=>Category parent ID)}{ARTICLES} Insert articles into a wikipage" => "~np~{~/np~ARTICLES(max=>3,topic=>NomdelTopic,type=>tipus,categId=>ID de categoria pare/mare)}{ARTICLES} Inserta els articles a una plana Wiki", -"no such attachment on this page" => "no hi ha aquest adjunt en aquesta plana", +"~np~{~/np~ARTICLES(max=>3,topic=>topicName,type=>type,categId=>Category parent ID)}{ARTICLES} Insert articles into a wikipage" => "~np~{~/np~ARTICLES(max=>3,topic=>NomdelTopic,type=>tipus,categId=>ID de categoria pare/mare)}{ARTICLES} Inserta els articles a una pàgina Wiki", +"no such attachment on this page" => "no hi ha aquest adjunt en aquesta pàgina", "num is optional and is the order number of the attachment in the list. If not provided, a list of all attachments is displayed. Inline makes the comment be the text of the link." => "num és opcional i és el número d'ordre de l'adjunt a la llista. Si no s'especifica, es mostra una llista de tots els adjunts. Enlinia fa que el comentari sigui el text de l'enllaç.", -"~np~{~/np~EVENTS(calendarid=>id1+id2,maxdays=>365,max=>-1,datetime=>0|1,desc=>0|1)}{EVENTS} Insert rss feed output into a wikipage" => "~np~{~/np~EVENTS(calendarid=>id1+id2,maxdays=>365,max=>-1,datetime=>0|1,desc=>0|1)}{EVENTS} Inserta el resultat de l'alimentació rss en una plana Wiki", -"~np~{~/np~RSS(id=>feedId+feedId2,max=>3,date=>1,desc=>1,author=>1)}{RSS} Insert rss feed output into a wikipage" => "~np~{~/np~RSS(id=>feedId+feedId2,max=>3,date=>1,desc=>1,author=>1)}{RSS} Inserta el resultat d'una o vàries alimentacions rss en una plana Wiki", +"~np~{~/np~EVENTS(calendarid=>id1+id2,maxdays=>365,max=>-1,datetime=>0|1,desc=>0|1)}{EVENTS} Insert rss feed output into a wikipage" => "~np~{~/np~EVENTS(calendarid=>id1+id2,maxdays=>365,max=>-1,datetime=>0|1,desc=>0|1)}{EVENTS} Inserta el resultat de l'alimentació rss en una pàgina Wiki", +"~np~{~/np~RSS(id=>feedId+feedId2,max=>3,date=>1,desc=>1,author=>1)}{RSS} Insert rss feed output into a wikipage" => "~np~{~/np~RSS(id=>feedId+feedId2,max=>3,date=>1,desc=>1,author=>1)}{RSS} Inserta el resultat d'una o vàries alimentacions rss en una pàgina Wiki", "move %s in %s" => "mou %s a %s", -"You are about to leave this page. If you have made any changes without Saving, your changes will be lost. Are you sure you want to exit this page?" => "Estàs a punt de marxa d'aquestya pàgina. Si has fet canvis sense guardar-los, es perdran els teus canvis. Segur que vols deixar aquesta plana?", +"You are about to leave this page. If you have made any changes without Saving, your changes will be lost. Are you sure you want to exit this page?" => "Estàs a punt de marxa d'aquestya pàgina. Si has fet canvis sense guardar-los, es perdran els teus canvis. Segur que vols deixar aquesta pàgina?", "Please notify the admin that the \"sender email\" option in the General configuration section has not been set. An internal Tiki message has been sent to the admin to validate your registration request. An email should arrive shortly after you have been validated, with information on how to login for the first time into this site" => "Si us plau, notifica a l'administrador que la opció del \"correu-e de l'enviador\" a la secció de configuració General no ha estat especificada. S'ha enviat un missatge intern Tiki a l'administrador per validar la teva petició de registre. T'hauria d'arribar un correu-e just després de que s'hagi validat la teva petició, amb informació sobre com connectar-te per primera vegada en aquest lloc", "TikiWiki Assistant" => "Assitent de TikiWiki", "Thank you for installing TikiWiki CMS/Groupware" => "Gràcies per instal·lar TikiWiki CMS/Groupware", @@ -1614,7 +1614,7 @@ "While classic trackers are mature, mirror table trackers are an experimental feature. Many bugs have been reported when using plugins, etc. <b>Do NOT use mirror trackers unless you know what you are doing</b> and are ready to participate to development and debugging. Mirror trackers could even eventually be discontinued from Tiki." => "Així com els formularis clàssics are madurs, els formularis amb taules mirall són una funcionalitat experimental. S'ha descrit molts errors en emprar connectors de formularis amb ells, etc. <b>NO empris taules mirall a no ser que sàpigues què estàs fent</b> i estiguis preparat a participar en el seu desenvolupament i depuració d'errors. Formularis amb taules mirall podrien ser descontinuats de Tiki.", "Moved to:" => "Mogut/s a:", "A new version of TikiWiki, <b>{\$tiki_release}</b>, is available. You are currently running <b>{\$tiki_version}</b>. Please visit <a href=\"http://tikiwiki.org/Download\">http://tikiwiki.org/Download</a>." => "Hi ha disponible una nova versió de Tikiwiki: <b>{\$tiki_release}</b>. Estàs funcionanat actualment amb la versió <b>{\$tiki_version}</b>. Si us plau, visita <a href=\"http://tikiwiki.org/Download\">http://tikiwiki.org/Download</a>.", -"Click and scroll up to the top of the page" => "Clica i puja la barra de desplaçament fins a dalt de la plana", +"Click and scroll up to the top of the page" => "Clica i puja la barra de desplaçament fins a dalt de la pàgina", "subscription" => "subscripció", "admin charts template" => "administra plantilla de sondejos (charts)", "Managing content templates" => "Gestiona les plantilles de continguts", @@ -1727,7 +1727,7 @@ "Created account %s <%s>." => "Compte %s <%s> creada.", "New %s created with %s %s (%s)." => "Nou/va %s creat/da amb %s %s (%s).", "Site No validated yet" => "Lloc encara no validat", -"No permission to view the page" => "No tens permís per veure aquesta plana", +"No permission to view the page" => "No tens permís per veure aquesta pàgina", "This feature is disabled: feature_forums" => "Aquesta funcionalitat està desactivada: feature_forums", "Please create a directory to hold your map files:" => "Si us plau, crea un directori per contenir els teus arxius de mapes:", "An error occurred." => "Ha ocorregut un error.", @@ -1746,7 +1746,7 @@ "Use in HTML pages" => "Fes servir en pàgines HTML", "Refresh rate (if dynamic) [secs]" => "Temps de refresc (si és dinàmic) [seg]", "Create Zone" => "Crear zona", -"use square brackets for an external link: [URL] or [URL|link_description] or [URL|description|nocache] (that last form prevents the local Wiki from caching the page; please use that form for large pages!)." => "empra corxets per a un enllaç extern: [URL] o [URL|descripció de l'enllaç] o [URL|descripció|nocache] (aquest darrer evita que el Wiki local guardi una còpia temporal de la plana en memòria cau page; empri-ho, si us plau, per planes grans!).", +"use square brackets for an external link: [URL] or [URL|link_description] or [URL|description|nocache] (that last form prevents the local Wiki from caching the page; please use that form for large pages!)." => "empra corxets per a un enllaç extern: [URL] o [URL|descripció de l'enllaç] o [URL|descripció|nocache] (aquest darrer evita que el Wiki local guardi una còpia temporal de la pàgina en memòria cau page; empri-ho, si us plau, per planes grans!).", "Last ver" => "Darrera ver", "A new major release branch is available." => "Hi ha disponible una nova branca major.", "A new major release branch is also available." => "Hi ha també disponible una nova branca major.", @@ -1803,7 +1803,6 @@ "Site-wide" => "Arreu del lloc", "Technical" => "Tècniques", "UI enhancement" => "Millores d'IU", -"Experimental" => "Experimentals", "Major Features" => "Funcionalitats Majors", "Minor Features" => "Funcionalitats Menors", "Site-wide Features" => "Funcionalitats emprables arreu del Lloc", @@ -1849,8 +1848,8 @@ "Hold down CTRL to select multiple" => "Manté premuda la tecla CTRL per fer seleccions múltiples", "lowercase only" => "només minúscules", "Save as draft" => "Desa-ho com a esborrany", -"You can include the file in an Wiki page using" => "Pots incloure l'arxiu en una plana Wiki emprant", -"You can include the file in an HTML page using" => "Pots incloure l'arxiu en un aplana HTML emprant", +"You can include the file in an Wiki page using" => "Pots incloure l'arxiu en una pàgina Wiki emprant", +"You can include the file in an HTML page using" => "Pots incloure l'arxiu en una pàgina HTML emprant", "Insert new item" => "Inserta un nou ítem", "Edit fields" => "Edita els camps", "View item" => "Visualitza punt", @@ -1894,7 +1893,7 @@ "Pictures" => "Fotos", "Use page description" => "Empra descripció de la pàgina", "Show page title" => "Mostra el títol de la pàgina", -"Show page ID" => "Mostra ID de plana", +"Show page ID" => "Mostra ID de pàgina", "Cache wiki pages (global)" => "Posar les planes wiki en memòria cau (global)", "Individual cache" => "Caxé Individual", "Footnotes" => "Notes al peu", @@ -1906,7 +1905,7 @@ "But still create line breaks within paragraphs" => "Però encara crea salts de línia entre paràgrafs", "Automonospaced text" => "Text Automonoespaiat", "Tables syntax" => "Sintaxi de taules", -"Open page as structure" => "Obre la plana com una estructura", +"Open page as structure" => "Obre la pàgina com una estructura", "Make structure from page" => "Fes estructura a partir de la pàgina", "Categorize structure pages together" => "Categoritza les pàgines de l'estructura totes juntes", "Create webhelp from structure" => "Crea ajuda web a partir de l'estructura", @@ -1990,14 +1989,26 @@ "Disable the installation script and enter TikiWiki" => "Deshabilita la seqüència d'instal·lació i entra a Tikiwiki", "Recommended" => "Recomanat", "Enter TikiWiki <em>without</em> disabling the installation script" => "Entra a TikiWiki <em>sense</em> deshabilitar la seqüència d'instal·lació", +"Required" => "Requerit", +"Paramaters" => "Paràmetres", +"To use these links, you must assign the featured_links <a class=\"rbox-link\" href=\"tiki-admin_modules.php\"> module</a>." => "Per utilitzar aquests enllaços cal assignar el <a class=\"rbox-link\" href=\"tiki-admin_modules.php\">mòdul</a> enllaços_destacats.", +"bad type name" => "el nom del tipus és incorrecte", +"Can edit categorized items" => "Pot editar ítems classificats", +"component class not found" => "no s'ha trobat la classe de l'element", +"component name is invalid" => "el nom de l'element no és vàlid", +"Name is empty" => "El nom és buit", +"Parameter not found :" => "No s'ha trobat el paràmetre:", +"This is the default text<br />---(version 3)-----------------------------<br />This is version 3 info<br />---(version 2)-----------------------------<br />This is version 2 info<br />---(version 1)-----------------------------<br />This is version 1 info" => "Aquest és el text per defecte<br />---(versió 3)-----------------------------<br />Això és informació de la versió 3<br />---(versió 2)-----------------------------<br />Això és informació de la versió 2<br />---(versió 1)-----------------------------<br />Això és informació de la versió 1", +"type class not found" => "no s'ha trobat la classe del tipus", +"United_Nations_Organization" => "Organització_de_les_Nacions_Unides", +"window not found" => "no s'ha trobat la finestra", +"You are not the owner of this page" => "No ets el propietari d'aquesta pàgina", +"You cannot have more than one windows of this type." => "No pots tenir més d'una finestra d'aquest tipus.", +"You do not have permission to view this part of content" => "No tens permisos per veure aquesta part del contingut", // ### end of unused words // ### start of untranslated words // ### uncomment value pairs as you translate -// "Cookies must be allowed to vote" => "Cookies must be allowed to vote", -// "This forum is flat and doesn't allow replies to other replies" => "This forum is flat and doesn't allow replies to other replies", -// "Uploaded" => "Uploaded", -// "Explorer" => "Explorer", // "Guernsey" => "Guernsey", // "Isle of Man" => "Isle of Man", // "Philippines" => "Philippines", @@ -2005,37 +2016,18 @@ // "Fijian" => "Fijian", // "Pijin Solomon" => "Pijin Solomon", // "Tuvaluan" => "Tuvaluan", -// "Error line: %d" => "Error line: %d", -// "(not registered)" => "(not registered)", -// "Tiki Link - Insert internal link" => "Tiki Link - Insert internal link", -// "Select a Wiki page to link to:" => "Select a Wiki page to link to:", -// "unknown destination directory. Please set it up in <a href='tiki-admin.php?page=galleries'>tiki-admin.php?page=galleries</a>" => "unknown destination directory. Please set it up in <a href='tiki-admin.php?page=galleries'>tiki-admin.php?page=galleries</a>", -// "unlink failed" => "unlink failed", -// "Contributions" => "Contributions", // "You can only use optionId = 0 to create a new option or optionId equal an id that already belongs to the menu to update it." => "You can only use optionId = 0 to create a new option or optionId equal an id that already belongs to the menu to update it.", // "menu" => "menu", -// "The content retrieved at %s is not a list of mods" => "The content retrieved at %s is not a list of mods", // "Can't chdir to '%s'" => "Can't chdir to '%s'", -// "%s impossible to remove" => "%s impossible to remove", -// "section edit" => "section edit", // "Feed provided by %s. Click to visit." => "Feed provided by %s. Click to visit.", -// "Simple" => "Simple", -// "Advanced" => "Advanced", // "Fast Next" => "Fast Next", -// "Fast Prev" => "Fast Prev", // "First {\$params['itemname']}" => "First {\$params['itemname']}", // "Last {\$params['itemname']}" => "Last {\$params['itemname']}", // "Next {\$params['itemname']}" => "Next {\$params['itemname']}", // "Prev {\$params['itemname']}" => "Prev {\$params['itemname']}", // "Help page:" => "Help page:", // "View tpl:" => "View tpl:", -// "Invert Sort" => "Invert Sort", -// "sec" => "sec", // "Edit Section" => "Edit Section", -// "You are not allowed to upload this type of file." => "You are not allowed to upload this type of file.", -// "The file you are trying upload was only partially uploaded." => "The file you are trying upload was only partially uploaded.", -// "You must select a file." => "You must select a file.", -// "Upload was not successful. Duplicate file content ?" => "Upload was not successful. Duplicate file content ?", // "Field is not a link to mp3 in the gallery" => "Field is not a link to mp3 in the gallery", // "Field is not a link to FLV in the gallery" => "Field is not a link to FLV in the gallery", // "Field is not a link to FLV or MP3 in the gallery" => "Field is not a link to FLV or MP3 in the gallery", @@ -2043,39 +2035,13 @@ // "Country Selector options: name/flag, sortorder - name/flag is 0,1 or 2 where 1 shows only country name, 2 shows only country flag, 0 shows both (default). sortorder is 0 or 1 where 0 sorts according to translated text (default) and 1 sorts according to english country names even if country names are translated" => "Country Selector options: name/flag, sortorder - name/flag is 0,1 or 2 where 1 shows only country name, 2 shows only country flag, 0 shows both (default). sortorder is 0 or 1 where 0 sorts according to translated text (default) and 1 sorts according to english country names even if country names are translated", // "user preference" => "user preference", // "listview=nst, n to see name/t to see type/s to see type/u to see user in list mode" => "listview=nst, n to see name/t to see type/s to see type/u to see user in list mode", -// "Personal Phone" => "Personal Phone", -// "Personal Mobile" => "Personal Mobile", -// "Personal Fax" => "Personal Fax", -// "Work Phone" => "Work Phone", -// "Work Mobile" => "Work Mobile", -// "Work Fax" => "Work Fax", -// "Company" => "Company", -// "Organization" => "Organization", -// "Department" => "Department", -// "Division" => "Division", -// "Job Title" => "Job Title", -// "Street Address" => "Street Address", -// "City" => "City", -// "Zip Code" => "Zip Code", // "Save changes to annotations" => "Save changes to annotations", // "Creates an annotation block for an image." => "Creates an annotation block for an image.", -// "No such attachment on this page" => "No such attachment on this page", -// "Gives the name of the attached file to link to" => "Gives the name of the attached file to link to", -// "Same as name" => "Same as name", -// "Gives the name of another page the attached file is on. The file on that page is linked to instead. Only works with wiki pages" => "Gives the name of another page the attached file is on. The file on that page is linked to instead. Only works with wiki pages", -// "Shows the description as the link text instead of the file name" => "Shows the description as the link text instead of the file name", // "Makes the list of attachments a bulleted list" => "Makes the list of attachments a bulleted list", -// "Says that this file is an image, and should be displayed inline using the img tag" => "Says that this file is an image, and should be displayed inline using the img tag", // "Puts the stuff between {ATTACH} tags as the link text instead of the file name or description" => "Puts the stuff between {ATTACH} tags as the link text instead of the file name or description", -// "Shows all attachments from the whole wiki" => "Shows all attachments from the whole wiki", -// "Gives the number, in the list of attachments, of the attachment to link to" => "Gives the number, in the list of attachments, of the attachment to link to", -// "Gives the actual id of the attachment to link in. You probably should never use this" => "Gives the actual id of the attachment to link in. You probably should never use this", -// "Puts the number of downloads in the alt comment" => "Puts the number of downloads in the alt comment", -// "Shows a file icon" => "Shows a file icon", // "Chart as PDF" => "Chart as PDF", // "Chart as PostScript" => "Chart as PostScript", // "Renders an equation written in LaTeX syntax as a png. Optional parameter size defaults to 100 and is the percentage of the normal size, i.e., size=200 indicates an equation 2x the normal size" => "Renders an equation written in LaTeX syntax as a png. Optional parameter size defaults to 100 and is the percentage of the normal size, i.e., size=200 indicates an equation 2x the normal size", -// "equation" => "equation", // "~np~{~/np~EVENTS(calendarid=1|2,maxdays=365,max=-1,datetime=1,desc=1)}{EVENTS} Insert rss feed output into a wikipage" => "~np~{~/np~EVENTS(calendarid=1|2,maxdays=365,max=-1,datetime=1,desc=1)}{EVENTS} Insert rss feed output into a wikipage", // "The last_mod plugin replaces itself with last modification time of the named wiki page, or the current page if no name given" => "The last_mod plugin replaces itself with last modification time of the named wiki page, or the current page if no name given", // "List wiki pages." => "List wiki pages.", @@ -2085,17 +2051,11 @@ // "~np~{POSTS(max=>5, blogId=>id)}{POSTS}~/np~" => "~np~{POSTS(max=>5, blogId=>id)}{POSTS}~/np~", // "Displays a comment, tip, note or warning box" => "Displays a comment, tip, note or warning box", // "remarks text" => "remarks text", -// "You need to specify a RSS Id" => "You need to specify a RSS Id", -// "RSS Id incorrect:" => "RSS Id incorrect:", -// "List top scoring users" => "List top scoring users", // "Translate a string" => "Translate a string", -// "Incorrect fieldId:" => "Incorrect fieldId:", // "You do not have permission to modify an item" => "You do not have permission to modify an item", // "Wiki text" => "Wiki text", // "Displays the value of a tracker item field or the wiki text if the value of the field is set or has a value(if itemId not specified, use the itemId of the url or the user tracker)." => "Displays the value of a tracker item field or the wiki text if the value of the field is set or has a value(if itemId not specified, use the itemId of the url or the user tracker).", // "Displays a button to link to a page with a tracker plugin with prefilled tracker fields." => "Displays a button to link to a page with a tracker plugin with prefilled tracker fields.", -// "Displays some stat of a tracker content, fields are indicated with numeric ids." => "Displays some stat of a tracker content, fields are indicated with numeric ids.", -// "incorrect fieldId" => "incorrect fieldId", // "This is the default text" => "This is the default text", // "(version 3)" => "(version 3)", // "This is version 3 info" => "This is version 3 info", @@ -2114,265 +2074,59 @@ // "a valid regex-expression (PCRE)" => "a valid regex-expression (PCRE)", // "non-valid custom regex" => "non-valid custom regex", // "Missing parameter movie to the youtube plugin" => "Missing parameter movie to the youtube plugin", -// "Display youtube video in a wiki page" => "Display youtube video in a wiki page", // "rollback version " => "rollback version ", -// "Page locked" => "Page locked", -// "Page unlocked" => "Page unlocked", -// "list topics with links to the articles" => "list topics with links to the articles", -// "Categorize %s in %s" => "Categorize %s in %s", // "This module requires parameters trackerId and name set" => "This module requires parameters trackerId and name set", -// "Cookie not found" => "Cookie not found", // "Admin live support system" => "Admin live support system", -// "Administrator, can admin banners" => "Administrator, can admin banners", -// "Administrator, can create channels remove channels etc" => "Administrator, can create channels remove channels etc", -// "Administrator, can manage users groups and permissions, Hotwords and all the weblog features" => "Administrator, can manage users groups and permissions, Hotwords and all the weblog features", -// "Can receive tasks from other users" => "Can receive tasks from other users", -// "Can abort a process instance" => "Can abort a process instance", -// "Can access site when closed" => "Can access site when closed", -// "Can add and change ratings on wiki pages" => "Can add and change ratings on wiki pages", -// "Can add events in the calendar" => "Can add events in the calendar", -// "Can admin any mypage" => "Can admin any mypage", -// "Can admin attachments to wiki pages" => "Can admin attachments to wiki pages", -// "Can admin blogs" => "Can admin blogs", -// "Can admin categories" => "Can admin categories", -// "Can admin charts" => "Can admin charts", -// "Can admin contributions" => "Can admin contributions", -// "Can admin cookies" => "Can admin cookies", -// "Can admin directory categories" => "Can admin directory categories", -// "Can admin directory sites" => "Can admin directory sites", -// "Can admin drawings" => "Can admin drawings", -// "Can admin faqs" => "Can admin faqs", -// "Can admin file galleries" => "Can admin file galleries", -// "Can admin forums" => "Can admin forums", +// "Can admin article topics" => "Can admin article topics", +// "Can admin article types" => "Can admin article types", +// "Can admin comments" => "Can admin comments", +// "Can admin content templates" => "Can admin content templates", // "Can admin freetags" => "Can admin freetags", -// "Can admin games" => "Can admin games", -// "Can admin Image Galleries" => "Can admin Image Galleries", // "Can admin integrator repositories and rules" => "Can admin integrator repositories and rules", -// "Can admin mail-in accounts" => "Can admin mail-in accounts", -// "Can admin newsletters" => "Can admin newsletters", -// "Can admin public tasks" => "Can admin public tasks", // "Can admin quicktags" => "Can admin quicktags", -// "Can admin quizzes" => "Can admin quizzes", -// "Can admin received articles" => "Can admin received articles", -// "Can admin received pages" => "Can admin received pages", -// "Can admin rss modules" => "Can admin rss modules", -// "Can admin sheet" => "Can admin sheet", // "Can admin shoutbox (Edit/remove msgs)" => "Can admin shoutbox (Edit/remove msgs)", -// "Can admin surveys" => "Can admin surveys", // "Can admin the cms" => "Can admin the cms", -// "Can admin the directory" => "Can admin the directory", -// "Can admin the dynamic content system" => "Can admin the dynamic content system", // "Can admin the TikiTests" => "Can admin the TikiTests", -// "Can admin the wiki" => "Can admin the wiki", -// "Can admin trackers" => "Can admin trackers", -// "Can admin users" => "Can admin users", -// "Can admin workflow processes" => "Can admin workflow processes", -// "Can approve submissions" => "Can approve submissions", -// "Can assign perms to blog" => "Can assign perms to blog", -// "Can assign perms to file gallery" => "Can assign perms to file gallery", // "Can assign perms to image gallery" => "Can assign perms to image gallery", -// "Can assign perms to mypage" => "Can assign perms to mypage", -// "Can assign perms to wiki pages" => "Can assign perms to wiki pages", -// "Can attach files to tracker items" => "Can attach files to tracker items", -// "Can attach files to wiki pages" => "Can attach files to wiki pages", -// "Can attach to forum posts" => "Can attach to forum posts", // "Can ban users or ips" => "Can ban users or ips", -// "Can broadcast messages to all user" => "Can broadcast messages to all user", -// "Can broadcast messages to groups" => "Can broadcast messages to groups", // "Can browse freetags" => "Can browse freetags", // "Can browse the calendar" => "Can browse the calendar", // "Can cache user bookmarks" => "Can cache user bookmarks", -// "Can change events in the calendar" => "Can change events in the calendar", -// "Can change tracker items" => "Can change tracker items", -// "Can clean cache" => "Can clean cache", -// "Can configure modules" => "Can configure modules", -// "Can create a blog" => "Can create a blog", -// "Can create and edit sheets" => "Can create and edit sheets", -// "Can create and edit structures" => "Can create and edit structures", -// "Can create file galleries" => "Can create file galleries", -// "Can create image galleries" => "Can create image galleries", -// "Can create items in personal menu" => "Can create items in personal menu", // "Can create new css suffixed with -user" => "Can create new css suffixed with -user", -// "Can create new items for trackers" => "Can create new items for trackers", // "Can create new mapfile" => "Can create new mapfile", -// "Can create user bookmarks" => "Can create user bookmarks", -// "Can create/admin calendars" => "Can create/admin calendars", // "Can declare an instance as exception" => "Can declare an instance as exception", -// "Can delete comments" => "Can delete comments", // "Can delete mapfiles" => "Can delete mapfiles", -// "Can download files" => "Can download files", -// "Can edit a gallery file" => "Can edit a gallery file", -// "Can edit all comments" => "Can edit all comments", -// "Can edit any mypage" => "Can edit any mypage", -// "Can edit articles" => "Can edit articles", -// "Can edit content templates" => "Can edit content templates", -// "Can edit copyright notices" => "Can edit copyright notices", -// "Can edit drawings" => "Can edit drawings", -// "Can edit dynamic variables" => "Can edit dynamic variables", -// "Can edit HTML pages" => "Can edit HTML pages", // "Can edit items in categories" => "Can edit items in categories", // "Can edit mapfiles" => "Can edit mapfiles", -// "Can edit menu" => "Can edit menu", -// "Can edit menu option" => "Can edit menu option", -// "Can edit object permissions" => "Can edit object permissions", -// "Can edit own forum posts" => "Can edit own forum posts", -// "Can edit pages" => "Can edit pages", -// "Can edit site templates" => "Can edit site templates", -// "Can edit submissions" => "Can edit submissions", // "Can edit TikiTests" => "Can edit TikiTests", -// "Can edit translations and create new languages" => "Can edit translations and create new languages", -// "Can execute workflow activities" => "Can execute workflow activities", // "Can export wiki pages using the export feature" => "Can export wiki pages using the export feature", -// "Can insert comments for tracker items" => "Can insert comments for tracker items", -// "Can list file galleries" => "Can list file galleries", -// "Can list image galleries" => "Can list image galleries", -// "Can list mypages" => "Can list mypages", -// "Can list registered users" => "Can list registered users", -// "Can list trackers" => "Can list trackers", -// "Can lock pages" => "Can lock pages", -// "Can participate to rating of wiki pages" => "Can participate to rating of wiki pages", -// "Can play games" => "Can play games", -// "Can post in forums" => "Can post in forums", // "Can post messages in shoutbox" => "Can post messages in shoutbox", -// "Can post new comments" => "Can post new comments", -// "Can post to a blog" => "Can post to a blog", -// "Can read a topic (Applies only to individual topic perms)" => "Can read a topic (Applies only to individual topic perms)", // "Can read article headings" => "Can read article headings", -// "Can read articles" => "Can read articles", -// "Can read blogs" => "Can read blogs", -// "Can read comments" => "Can read comments", -// "Can read forums" => "Can read forums", -// "Can remove" => "Can remove", -// "Can remove articles" => "Can remove articles", -// "Can remove association between two pages in a translation set" => "Can remove association between two pages in a translation set", -// "Can remove submissions" => "Can remove submissions", -// "Can rename pages" => "Can rename pages", // "Can replay the TikiTests" => "Can replay the TikiTests", -// "Can report a link to the webmaster" => "Can report a link to the webmaster", -// "Can report msgs to moderator" => "Can report msgs to moderator", // "Can rollback pages" => "Can rollback pages", -// "Can save as minor edit" => "Can save as minor edit", -// "Can search" => "Can search", -// "Can send a link to a friend" => "Can send a link to a friend", -// "Can send articles to other sites" => "Can send articles to other sites", -// "Can send articles to this site" => "Can send articles to this site", // "Can send instances after completion" => "Can send instances after completion", -// "Can send newsletters" => "Can send newsletters", -// "Can send pages to other sites" => "Can send pages to other sites", -// "Can send pages to this site" => "Can send pages to this site", -// "Can send tasks to other users" => "Can send tasks to other users", -// "Can start threads in forums" => "Can start threads in forums", -// "Can submit articles" => "Can submit articles", -// "Can submit sites to the directory" => "Can submit sites to the directory", -// "Can subscribe any email to newsletters" => "Can subscribe any email to newsletters", -// "Can subscribe many e-mails at once (requires tiki_p_subscribe email)" => "Can subscribe many e-mails at once (requires tiki_p_subscribe email)", -// "Can subscribe to groups" => "Can subscribe to groups", -// "Can subscribe to newsletters" => "Can subscribe to newsletters", -// "Can suggest faq questions" => "Can suggest faq questions", -// "Can suggest items" => "Can suggest items", -// "Can tag objects" => "Can ta... [truncated message content] |
From: <ny...@us...> - 2008-07-23 18:10:32
|
Revision: 13850 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=13850&view=rev Author: nyloth Date: 2008-07-23 18:10:41 +0000 (Wed, 23 Jul 2008) Log Message: ----------- [FIX] default prefs: move feature_siteidentity default value from _default.prf to lib/setup/prefs.php Modified Paths: -------------- trunk/db/profiles/_default.prf trunk/lib/setup/prefs.php Modified: trunk/db/profiles/_default.prf =================================================================== --- trunk/db/profiles/_default.prf 2008-07-23 18:08:12 UTC (rev 13849) +++ trunk/db/profiles/_default.prf 2008-07-23 18:10:41 UTC (rev 13850) @@ -1,2 +1 @@ # Default installation profile -INSERT INTO tiki_preferences VALUES ('feature_siteidentity','y'); Modified: trunk/lib/setup/prefs.php =================================================================== --- trunk/lib/setup/prefs.php 2008-07-23 18:08:12 UTC (rev 13849) +++ trunk/lib/setup/prefs.php 2008-07-23 18:10:41 UTC (rev 13850) @@ -762,7 +762,7 @@ $prefs['feature_custom_home'] = 'n'; # site identity - $prefs['feature_siteidentity'] = 'n'; + $prefs['feature_siteidentity'] = 'y'; $prefs['site_crumb_seper'] = '>'; $prefs['site_nav_seper'] = '|'; $prefs['feature_sitemycode'] = 'n'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ny...@us...> - 2008-07-23 21:49:05
|
Revision: 13857 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=13857&view=rev Author: nyloth Date: 2008-07-23 21:49:13 +0000 (Wed, 23 Jul 2008) Log Message: ----------- [MOD] css: add support for 3.0 transition styles and remove those for 1.8 Modified Paths: -------------- trunk/lib/setup/theme.php trunk/templates/tiki-admin-include-look.tpl Added Paths: ----------- trunk/styles/transitions/1.9to3.0.css trunk/styles/transitions/2.0to3.0.css Removed Paths: ------------- trunk/styles/transitions/1.8to1.9.css trunk/styles/transitions/1.8to2.0.css Modified: trunk/lib/setup/theme.php =================================================================== --- trunk/lib/setup/theme.php 2008-07-23 20:47:42 UTC (rev 13856) +++ trunk/lib/setup/theme.php 2008-07-23 21:49:13 UTC (rev 13857) @@ -23,9 +23,9 @@ $prefs['style'] = $userlib->get_user_group_theme($user); include_once("lib/csslib.php"); -if ($prefs['transition_style_ver'] && $prefs['transition_style_ver'] == 'css_specified_only') { +if ( $prefs['transition_style_ver'] == 'css_specified_only' ) { $transition_style = $csslib->transition_css('styles/'.$prefs['style'], ''); -} elseif ($prefs['transition_style_ver'] && $prefs['transition_style_ver'] != 'none') { +} elseif ( $prefs['transition_style_ver'] != '' && $prefs['transition_style_ver'] != 'none') { $transition_style = $csslib->transition_css('styles/'.$prefs['style'], $prefs['transition_style_ver']); } else { $transition_style = ''; Deleted: trunk/styles/transitions/1.8to1.9.css =================================================================== --- trunk/styles/transitions/1.8to1.9.css 2008-07-23 20:47:42 UTC (rev 13856) +++ trunk/styles/transitions/1.8to1.9.css 2008-07-23 21:49:13 UTC (rev 13857) @@ -1,184 +0,0 @@ -/* -$Header: /cvsroot/tikiwiki/tiki/styles/transitions/1.8to1.9.css,v 1.10 2007-03-06 19:30:38 sylvieg Exp $ - -The following CSS classes were added to Tiki between v1.8.5 and v1.9.0 -They should be added to themes (possibly with tweaks) to make the theme v1.9 ready -*/ - -/* wiki diff styles */ -.diff td { - border: 1px solid #A9B8C2; -} -.diff div { - border-top : 1px solid #A9B8C2; -} -.diffheader { - background-color : #A9B8C2; - font-weight: bold; -} -.diffadded { - background-color : #CCFFCC; -} -.diffdeleted { - background-color : #FFCCCC; -} -.diffinldel { - background-color : #FFCCCC; - text-decoration : line-through; -} -.diffbody { - background-color : #F2F4F5; -} -.diffchar { - color : red; -} - - -/** rbox: remarks box (note/warning/tip/comment) */ -/* split, so that it works with firefox and IE */ -.rbox { - margin-left: 10px; - margin-right: 10px; - margin-top: 10px; -} -.rbox-title { - padding: 0 10px; - font-size: small; - position: relative; - display: inline; - margin: 0; - font-weight: bold; - background-color: #EEEE9C; -} -.rbox-title[name="warning"] { - border-radius-topright : 1ex; - -moz-border-radius-topright : 1ex; - -khtml-border-radius-topright : 1ex; - font-size: small; - padding: 0 10px; - position: relative; - display: inline; - margin: 0; - font-weight: bold; - background-color: #EEEE9C; -} -.rbox-title[name="note"] { - background-color: #EEEE9C; -} -.rbox-title[name="comment"], .rbox-title[name="tip"] { - background-color: #EEEE9C; -} - -.rbox-data { - padding: 2px; - margin: 1px; - font-size: small; - background-color: #EEEE9C; - border: 1px solid #DDCCCC; -} -.rbox-data[name="warning"] { - background-color: #EFECEC; - border: 1px solid #DDCCCC; -} -.rbox-data[name="note"] { - background-color: #ECECEF; - border: 1px solid #CCCCDD; -} -.rbox-data[name="comment"], .rbox-data[name="tip"] { - background-color: #EEEE9C; - border: 1px solid #DDCCCC; -} - -/* (module) box styles */ -div.box-title table { - width: 100%; - padding: 0px; - margin: 0px; - border-spacing: 0; -} - -div.box-title table td { - text-align: center; -} - -.box-flipimage, .flipmodimage { - border: 0px; - float: right; - margin-left: 0px; -} -/* these don't need defaults -span.box-titletext, a.flipmodtitle {} - */ - - -/** site identity styles */ -/* these don't need defaults: - * div#sitenavbar, div#sitelogo, div#sitead, div#sitesearchbar {} - */ - -/** default size for text in Location bar when it isn't a title */ -div#sitelocbar, a.crumblink { - font-size: medium; -} - -/* a generic div to enclose the linkbut buttons at the top of a page to avoid the <br /><br /> after the buttons */ -div.navbar, div#navbar {margin-bottom: 20px;} - -/* a generic div to enclose the description at the top of a page to avoid small and <br /><br /> after the description*/ -/** style designers: by default make font style identical to H2 */ -div.description, div#description { - font-size: 18px; -} - -/* changes to tikihelp */ -a.tikihelp { - vertical-align: text-top; -} - -/* TOC: fancy toc */ -.fancytoclevel { - list-style-image: url(../img/icons/footprint.gif); -} - -DIV.heading { - margin: 3px 2px; -} - -/* TikiSheet Default Style {{{1 */ -table.default thead td, table.default tfoot td -{ - font-weight: bold; - text-align: center; -} - -table.default td -{ - border-style: solid; - border-width: 1px; - border-color: #000000; -} -/* }}}1 */ - -/* on the {maketoc} global ul -.toc {} -*/ - -.searchresults{ - text-align: left; -} - -/*** style for 'advanced feature' divs ***/ -.advanced { - margin: 20px; - padding: 5px; - border-color: black; - border-width: 1px; - border-style: solid; -} - -.advanced:before { content:url(../img/icons/mini_blue_diamond.gif)" "; } - -div.menuSection div.menuSection, div.menuSection div.separator { - padding-left: 5px; -} -/* end of css file */ Deleted: trunk/styles/transitions/1.8to2.0.css =================================================================== --- trunk/styles/transitions/1.8to2.0.css 2008-07-23 20:47:42 UTC (rev 13856) +++ trunk/styles/transitions/1.8to2.0.css 2008-07-23 21:49:13 UTC (rev 13857) @@ -1,8 +0,0 @@ -/* -$Header: /cvsroot/tikiwiki/tiki/styles/transitions/1.8to1.10.css,v 1.1 2005-12-15 22:31:05 sylvieg Exp $ - -The following CSS classes were added to Tiki between v1.9 and v1.10 -They should be added to themes (possibly with tweaks) to make the theme v1.10 ready -*/ -@import "1.8to1.9.css"; -@import "1.9to2.0.css"; Added: trunk/styles/transitions/1.9to3.0.css =================================================================== --- trunk/styles/transitions/1.9to3.0.css (rev 0) +++ trunk/styles/transitions/1.9to3.0.css 2008-07-23 21:49:13 UTC (rev 13857) @@ -0,0 +1,8 @@ +/* +$Header: /cvsroot/tikiwiki/tiki/styles/transitions/1.8to1.10.css,v 1.1 2005-12-15 22:31:05 sylvieg Exp $ + +The following CSS classes were added to Tiki between v1.9 and v3.0 +They should be added to themes (possibly with tweaks) to make the theme v3.0 ready +*/ +@import "1.9to2.0.css"; +@import "2.0to3.0.css"; Added: trunk/styles/transitions/2.0to3.0.css =================================================================== --- trunk/styles/transitions/2.0to3.0.css (rev 0) +++ trunk/styles/transitions/2.0to3.0.css 2008-07-23 21:49:13 UTC (rev 13857) @@ -0,0 +1,5 @@ +/* +The following CSS classes were added to Tiki between v2.0 and v3.0 +They should be added to themes (possibly with tweaks) to make the theme v3.0 ready +*/ + Modified: trunk/templates/tiki-admin-include-look.tpl =================================================================== --- trunk/templates/tiki-admin-include-look.tpl 2008-07-23 20:47:42 UTC (rev 13856) +++ trunk/templates/tiki-admin-include-look.tpl 2008-07-23 21:49:13 UTC (rev 13857) @@ -56,8 +56,8 @@ <td><select name="transition_style_ver" id="transition_style_ver"> <option value="none" {if $prefs.transition_style_ver eq 'none'}selected="selected"{/if}>{tr}Never use transition css{/tr}</option> <option value="css_specified_only" {if $prefs.transition_style_ver eq 'css_specified_only'}selected="selected"{/if}>{tr}Use @version:x.x specified in theme css or none if not specified{/tr}</option> - <option value="1.8" {if $prefs.transition_style_ver eq '1.8'}selected="selected"{/if}>{tr}Use @version:x.x specified in theme css or 1.8 if not specified{/tr}</option> <option value="1.9" {if $prefs.transition_style_ver eq '1.9'}selected="selected"{/if}>{tr}Use @version:x.x specified in theme css or 1.9 if not specified{/tr}</option> + <option value="2.0" {if $prefs.transition_style_ver eq '2.0'}selected="selected"{/if}>{tr}Use @version:x.x specified in theme css or 2.0 if not specified{/tr}</option> </select></td> </tr><tr> <td class="form"> {if $prefs.feature_help eq 'y'}<a href="{$prefs.helpurl}Edit+CSS" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ny...@us...> - 2008-07-23 21:50:52
|
Revision: 13858 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=13858&view=rev Author: nyloth Date: 2008-07-23 21:51:01 +0000 (Wed, 23 Jul 2008) Log Message: ----------- [MOD] installer: add tiki2.0to3.0 update script in the installer + revert sort on update script list to have the most useful scripts at the top. Modified Paths: -------------- trunk/installer/tiki-installer.php trunk/templates/tiki-install.tpl Modified: trunk/installer/tiki-installer.php =================================================================== --- trunk/installer/tiki-installer.php 2008-07-23 21:49:13 UTC (rev 13857) +++ trunk/installer/tiki-installer.php 2008-07-23 21:51:01 UTC (rev 13858) @@ -125,7 +125,7 @@ $smarty->assign_by_ref('failedcommands', $failedcommands); } -function write_local_php($dbb_tiki,$host_tiki,$user_tiki,$pass_tiki,$dbs_tiki,$dbversion_tiki="2.0") { +function write_local_php($dbb_tiki,$host_tiki,$user_tiki,$pass_tiki,$dbs_tiki,$dbversion_tiki="3.0") { global $local; global $db_tiki; if ($dbs_tiki and $user_tiki) { @@ -455,13 +455,13 @@ //echo $dbversion_tiki . "---"; while ($file = readdir($h)) { - if (preg_match('#1\..*to.*\.sql$#',$file) || preg_match('#secdb#',$file)) { + if (preg_match('#\d\..*to.*\.sql$#',$file) || preg_match('#secdb#',$file)) { $files[] = $file; } } closedir ($h); - sort($files); + rsort($files); reset($files); $smarty->assign('files', $files); } @@ -592,8 +592,6 @@ if ( $dbversion_tiki == '1.10' ) $dbversion_tiki = '2.0'; if (!isset($db_tiki)) { - //upgrade from 1.7.X - //$db_tiki="mysql"; //upgrade from 2.0 : if no db is specified, use the first db that this php installation can handle $db_tiki = reset($dbservers); write_local_php($db_tiki,$host_tiki,$user_tiki,$pass_tiki,$dbs_tiki); Modified: trunk/templates/tiki-install.tpl =================================================================== --- trunk/templates/tiki-install.tpl 2008-07-23 21:49:13 UTC (rev 13857) +++ trunk/templates/tiki-install.tpl 2008-07-23 21:51:01 UTC (rev 13858) @@ -191,6 +191,10 @@ <tr><td> <table class="normal" cellpadding="5"> <tr><th>{tr}To upgrade from{/tr}:</th><th>{tr}Use this script{/tr}:</th></tr> + <tr class="even"> + <td>3.0.x</td> + <td>tiki_2.0to3.0</td> + </tr> <tr class="odd"> <td>2.0.x</td> <td>tiki_1.9to2.0</td> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ny...@us...> - 2008-07-24 15:31:54
|
Revision: 13865 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=13865&view=rev Author: nyloth Date: 2008-07-24 15:31:59 +0000 (Thu, 24 Jul 2008) Log Message: ----------- [FIX] filegals manager: now filegals_manager param contains either nothing if not used (before, it was 'n') or the name of the textarea it refers to (before, it was 'y' and was only using hardcoded 'editwiki' textarea). This allows filegals_manager quicktag to work in pages with more than one textarea with quicktags (e.g. articles feature). This also fix filegal manager for newsletters. Modified Paths: -------------- trunk/lib/tiki-js.js trunk/templates/browse_file_gallery.tpl trunk/templates/duplicate_file_gallery.tpl trunk/templates/edit_file_gallery.tpl trunk/templates/fgal_context_menu.tpl trunk/templates/find.tpl trunk/templates/header.tpl trunk/templates/list_file_gallery.tpl trunk/templates/list_file_gallery_content.tpl trunk/templates/setup_fckeditor.tpl trunk/templates/styles/darkroom/tiki-site_header.tpl trunk/templates/styles/feb12/tiki-site_header.tpl trunk/templates/styles/thenews/tiki-site_header.tpl trunk/templates/styles/tikineat/header.tpl trunk/templates/styles/tikineat/tiki-site_header.tpl trunk/templates/tiki-edit_help_tool.tpl trunk/templates/tiki-editpage.tpl trunk/templates/tiki-file_galleries.tpl trunk/templates/tiki-list_file_gallery.tpl trunk/templates/tiki-objectpermissions.tpl trunk/templates/tiki-site_header.tpl trunk/templates/tiki-top_bar.tpl trunk/templates/tiki-upload_file.tpl trunk/tiki-list_file_gallery.php trunk/tiki-objectpermissions.php trunk/tiki-upload_file.php Modified: trunk/lib/tiki-js.js =================================================================== --- trunk/lib/tiki-js.js 2008-07-24 15:12:52 UTC (rev 13864) +++ trunk/lib/tiki-js.js 2008-07-24 15:31:59 UTC (rev 13865) @@ -1224,9 +1224,9 @@ /* Function to add image from filegals in non wysiwyg editor */ /* must be here when ajax is activated */ -function SetUrl(url) { +function SetMyUrl(area, url) { str = "{img src=" + url + " }\n"; - insertAt('editwiki', str); + insertAt(area, str); } /* Count the number of words (spearated with space) */ function wordCount(maxSize, source, cpt, message) { Modified: trunk/templates/browse_file_gallery.tpl =================================================================== --- trunk/templates/browse_file_gallery.tpl 2008-07-24 15:12:52 UTC (rev 13864) +++ trunk/templates/browse_file_gallery.tpl 2008-07-24 15:31:59 UTC (rev 13865) @@ -60,10 +60,14 @@ {* build link *} {capture assign=link}{strip} {if $files[changes].isgal eq 1} - href="tiki-list_file_gallery.php?galleryId={$files[changes].id}{if $filegals_manager eq 'y'}&filegals_manager=y{/if}&view=browse" + href="tiki-list_file_gallery.php?galleryId={$files[changes].id}{if $filegals_manager neq ''}&filegals_manager={$filegals_manager|escape}{/if}&view=browse" {else} - {if $filegals_manager eq 'y'} - href="javascript:window.opener.SetUrl('{$url_path}tiki-download_file.php?fileId={$files[changes].id}&display');javascript:window.close() ;" + {if $filegals_manager neq ''} + {assign var=seturl value="`$url_path`tiki-download_file.php?fileId=`$files[changes].id`&display"} + + {* Note: When using this code inside FCKeditor, SetMyUrl function is not defined and we use FCKeditor SetUrl native function *} + href="javascript:if (typeof window.opener.SetMyUrl != 'undefined') window.opener.SetMyUrl('{$filegals_manager|escape}','{$seturl}'); else window.opener.SetUrl('{$seturl}'); javascript:window.close();" + {elseif $tiki_p_download_files eq 'y'} {if $gal_info.type eq 'podcast' or $gal_info.type eq 'vidcast'} href="{$download_path}{$files[changes].path}" @@ -82,7 +86,7 @@ <div class="thumbimagecontener" style="width:{$thumbnail_size}px; height:{$thumbnailcontener_size}px"> <div class="thumbimage"> <div class="thumbimagesub" style="width:{$thumbnail_size}px;">{assign var=key_type value=$files[changes].type|truncate:9:'':true} - <a {$link}{if $prefs.feature_shadowbox eq 'y'} rel="shadowbox[gallery];type={if $key_type eq 'image/png' or $key_type eq 'image/jpe' or $key_type eq 'image/gif'}img{else}iframe{/if}" title="{if $files[changes].name neq ''}{$files[changes].name|escape}{/if}{if $files[changes].description neq ''} ({$files[changes].description|escape}){/if}"{/if}{if $over_infos neq ''} {popup fullhtml="1" text=$over_infos|escape:"javascript"|escape:"html"}{/if}> + <a {$link}{if $prefs.feature_shadowbox eq 'y' && $filegals_manager eq ''} rel="shadowbox[gallery];type={if $key_type eq 'image/png' or $key_type eq 'image/jpe' or $key_type eq 'image/gif'}img{else}iframe{/if}" title="{if $files[changes].name neq ''}{$files[changes].name|escape}{/if}{if $files[changes].description neq ''} ({$files[changes].description|escape}){/if}"{/if}{if $over_infos neq ''} {popup fullhtml="1" text=$over_infos|escape:"javascript"|escape:"html"}{/if}> <img src="tiki-download_file.php?fileId={$files[changes].id}&thumbnail&max={$thumbnail_size}" /> </a> </div> Modified: trunk/templates/duplicate_file_gallery.tpl =================================================================== --- trunk/templates/duplicate_file_gallery.tpl 2008-07-24 15:12:52 UTC (rev 13864) +++ trunk/templates/duplicate_file_gallery.tpl 2008-07-24 15:31:59 UTC (rev 13865) @@ -1,7 +1,7 @@ {* $Id$ *} {if $tiki_p_create_file_galleries eq 'y'} <h2>{tr}Duplicate File Gallery{/tr}</h2> -<form action="tiki-list_file_gallery.php{if $filegals_manager eq 'y'}?filegals_manager=y{/if}" method="post"> +<form action="tiki-list_file_gallery.php{if $filegals_manager neq ''}?filegals_manager={$filegals_manager}{/if}" method="post"> <table class="normal"> <tr class="formcolor"><td>{tr}Name{/tr}</td><td><input type="text" size="50" name="name" value="{$name|escape}" /></td></tr> <tr class="formcolor"><td>{tr}Description{/tr}</td><td><textarea name="description" rows="4" cols="40">{$description|escape}</textarea></td></tr> Modified: trunk/templates/edit_file_gallery.tpl =================================================================== --- trunk/templates/edit_file_gallery.tpl 2008-07-24 15:12:52 UTC (rev 13864) +++ trunk/templates/edit_file_gallery.tpl 2008-07-24 15:31:59 UTC (rev 13865) @@ -4,7 +4,7 @@ <br /><a class="fgallink" href="tiki-objectpermissions.php?objectName={$name|escape:"url"}&objectType=file+gallery&permType=file+galleries&objectId={$galleryId}">{tr}There are individual permissions set for this file gallery{/tr}</a> {/if} <div> - <form class="admin" action="tiki-list_file_gallery.php{if $filegals_manager eq 'y'}?filegals_manager=y{/if}" method="post"> + <form class="admin" action="tiki-list_file_gallery.php{if $filegals_manager neq ''}?filegals_manager={$filegals_manager|escape}{/if}" method="post"> <input type="hidden" name="galleryId" value="{$galleryId|escape}" /> Modified: trunk/templates/fgal_context_menu.tpl =================================================================== --- trunk/templates/fgal_context_menu.tpl 2008-07-24 15:12:52 UTC (rev 13864) +++ trunk/templates/fgal_context_menu.tpl 2008-07-24 15:31:59 UTC (rev 13865) @@ -10,11 +10,11 @@ {/if} {if $files[changes].perms.tiki_p_upload_files eq 'y' and ( $files[changes].perms.tiki_p_admin_file_galleries eq 'y' or ($user and $files[changes].user eq $user) or $files[changes].public eq 'y' ) } - <a href="tiki-upload_file.php?galleryId={$files[changes].id}{if $filegals_manager eq 'y'}&filegals_manager=y{/if}">{icon _menu_text=$menu_text _menu_icon=$menu_icon _id='upload'}</a> + <a href="tiki-upload_file.php?galleryId={$files[changes].id}{if $filegals_manager neq ''}&filegals_manager={$filegals_manager|escape}{/if}">{icon _menu_text=$menu_text _menu_icon=$menu_icon _id='upload'}</a> {/if} {if $files[changes].perms.tiki_p_assign_perm_file_gallery eq 'y'} - <a href="tiki-objectpermissions.php?objectName={$files[changes].name|escape:"url"}&objectType=file+gallery&permType=file+galleries&objectId={$files[changes].id}{if $filegals_manager eq 'y'}&filegals_manager=y{/if}"> + <a href="tiki-objectpermissions.php?objectName={$files[changes].name|escape:"url"}&objectType=file+gallery&permType=file+galleries&objectId={$files[changes].id}{if $filegals_manager neq ''}&filegals_manager={$filegals_manager|escape}{/if}"> {if $files[changes].public neq 'y'} {icon _menu_text=$menu_text _menu_icon=$menu_icon _id='key_private' alt='{tr}Private Gallery{/tr}'} {elseif $files[changes].perms.has_special_perm eq 'y'} @@ -34,7 +34,7 @@ {* This form tag is needed when placed in a popup box through overlib. If placed in a column, there is already a form tag around the whole table *} - <form class="upform" name="form{$files[changes].fileId}" method="post" action="{$smarty.server.PHP_SELF}?galleryId={$gal_info.galleryId}{if $filegals_manager eq 'y'}&filegals_manager=y{/if}{if $prefs.fgal_asynchronous_indexing eq 'y'}&fast{/if}" enctype="multipart/form-data"> + <form class="upform" name="form{$files[changes].fileId}" method="post" action="{$smarty.server.PHP_SELF}?galleryId={$gal_info.galleryId}{if $filegals_manager neq ''}&filegals_manager={$filegals_manager|escape}{/if}{if $prefs.fgal_asynchronous_indexing eq 'y'}&fast{/if}" enctype="multipart/form-data"> {/if} {if $menu_text neq 'y'} @@ -63,7 +63,7 @@ {if $gal_info.archives gt -1} {if $files[changes].nbArchives gt 0} {assign var=nb_archives value=$files[changes].nbArchives} - <a href="tiki-file_archives.php?fileId={$files[changes].fileId}{if $filegals_manager eq 'y'}&filegals_manager=y{/if}">{icon _menu_text=$menu_text _menu_icon=$menu_icon _id='disk_multiple' alt="{tr}Archives{/tr} ($nb_archives)"}</a> + <a href="tiki-file_archives.php?fileId={$files[changes].fileId}{if $filegals_manager neq ''}&filegals_manager={$filegals_manager|escape}{/if}">{icon _menu_text=$menu_text _menu_icon=$menu_icon _id='disk_multiple' alt="{tr}Archives{/tr} ($nb_archives)"}</a> {else} {icon _menu_text=$menu_text _menu_icon=$menu_icon _id='disk_multiple_gray' alt='{tr}Archives{/tr}'} {/if} @@ -93,11 +93,11 @@ {else} {* for the moment, no-javascript version is simply a link to the edit page where you can also upload *} - <a href="tiki-upload_file.php?galleryId={$gal_info.galleryId}&fileId={$files[changes].id}{if $filegals_manager eq 'y'}&filegals_manager=y{/if}">{icon _menu_text=$menu_text _menu_icon=$menu_icon _id='database_refresh' alt='{tr}Upload New Version{/tr}'}</a> + <a href="tiki-upload_file.php?galleryId={$gal_info.galleryId}&fileId={$files[changes].id}{if $filegals_manager neq ''}&filegals_manager={$filegals_manager|escape}{/if}">{icon _menu_text=$menu_text _menu_icon=$menu_icon _id='database_refresh' alt='{tr}Upload New Version{/tr}'}</a> {/if} - <a href="tiki-upload_file.php?galleryId={$gal_info.galleryId}&fileId={$files[changes].id}{if $filegals_manager eq 'y'}&filegals_manager=y{/if}">{icon _menu_text=$menu_text _menu_icon=$menu_icon _id='page_edit' alt='{tr}Properties{/tr}'}</a> + <a href="tiki-upload_file.php?galleryId={$gal_info.galleryId}&fileId={$files[changes].id}{if $filegals_manager neq ''}&filegals_manager={$filegals_manager|escape}{/if}">{icon _menu_text=$menu_text _menu_icon=$menu_icon _id='page_edit' alt='{tr}Properties{/tr}'}</a> {/if} {if $gal_info.lockable eq 'y' and $files[changes].isgal neq 1} Modified: trunk/templates/find.tpl =================================================================== --- trunk/templates/find.tpl 2008-07-24 15:12:52 UTC (rev 13864) +++ trunk/templates/find.tpl 2008-07-24 15:31:59 UTC (rev 13865) @@ -3,7 +3,7 @@ {* parameters used in this template: - * filegals_manager : If value = 'y' adds hidden input filegals_manager value=y + * filegals_manager : If value not empty, adds hidden input filegals_manager value=$filegals_manager * _sort_mode : If value = 'y' adds hidden input sort_mode value=$sort_mode * what : Change form title. Default value (if $what empty) is "Find". If $what is not empty, the text presented is $what content @@ -24,7 +24,7 @@ <div class="findtable"> <form method="post" action="{$smarty.server.PHP_SELF}"> -{if $filegals_manager eq 'y'}<input type="hidden" name="filegals_manager" value="y" />{/if} +{if $filegals_manager neq ''}<input type="hidden" name="filegals_manager" value="{$filegals_manager|escape}" />{/if} {if $_sort_mode eq 'y'}<input type="hidden" name="sort_mode" value="{$sort_mode|escape}" />{/if} {query _type='form_input' maxRecords='NULL' type='NULL' find='NULL' topic='NULL' lang='NULL' exact_match='NULL' categId='NULL' filegals_manager='NULL' save='NULL'} Modified: trunk/templates/header.tpl =================================================================== --- trunk/templates/header.tpl 2008-07-24 15:12:52 UTC (rev 13864) +++ trunk/templates/header.tpl 2008-07-24 15:31:59 UTC (rev 13865) @@ -200,7 +200,7 @@ {/if} {if $prefs.feature_community_mouseover eq 'y'}{popup_init src="lib/overlib.js"}{/if} -{if $prefs.feature_fullscreen eq 'y' and $filegals_manager ne 'y' and $print_page ne 'y'} +{if $prefs.feature_fullscreen eq 'y' and $filegals_manager eq '' and $print_page ne 'y'} {if $smarty.session.fullscreen eq 'y'} <a href="{$smarty.server.SCRIPT_NAME}{if $fsquery}?{$fsquery}&{else}?{/if}fullscreen=n" class="menulink" id="fullscreenbutton">{icon _id=application_put alt="{tr}Cancel Fullscreen{/tr}"}</a> {else} Modified: trunk/templates/list_file_gallery.tpl =================================================================== --- trunk/templates/list_file_gallery.tpl 2008-07-24 15:12:52 UTC (rev 13864) +++ trunk/templates/list_file_gallery.tpl 2008-07-24 15:31:59 UTC (rev 13865) @@ -44,7 +44,7 @@ {/if} <div style="padding:1px; overflow-x:auto; overflow-y:hidden;"> - <form name="fgalformid" id="fgalform" method="post" action="{$smarty.server.PHP_SELF}{if $filegals_manager eq 'y'}?filegals_manager=y{/if}"> + <form name="fgalformid" id="fgalform" method="post" action="{$smarty.server.PHP_SELF}{if $filegals_manager neq ''}?filegals_manager={$filegals_manager|escape}{/if}"> <input type="hidden" name="galleryId" value="{$gal_info.galleryId|escape}" /> <input type="hidden" name="find" value="{$find|escape}" /> Modified: trunk/templates/list_file_gallery_content.tpl =================================================================== --- trunk/templates/list_file_gallery_content.tpl 2008-07-24 15:12:52 UTC (rev 13864) +++ trunk/templates/list_file_gallery_content.tpl 2008-07-24 15:31:59 UTC (rev 13865) @@ -186,10 +186,14 @@ {* build link *} {capture assign=link}{strip} {if $files[changes].isgal eq 1} - href="tiki-list_file_gallery.php?galleryId={$files[changes].id}{if $filegals_manager eq 'y'}&filegals_manager=y{/if}" + href="tiki-list_file_gallery.php?galleryId={$files[changes].id}{if $filegals_manager neq ''}&filegals_manager={$filegals_manager|escape}{/if}" {else} - {if $filegals_manager eq 'y'} - href="javascript:window.opener.SetUrl('{$url_path}tiki-download_file.php?fileId={$files[changes].id}&display');javascript:window.close() ;" title="{tr}Download{/tr}" + {if $filegals_manager neq ''} + {assign var=seturl value="`$url_path`tiki-download_file.php?fileId=`$files[changes].id`&display"} + + {* Note: When using this code inside FCKeditor, SetMyUrl function is not defined and we use FCKeditor SetUrl native function *} + href="javascript:if (typeof window.opener.SetMyUrl != 'undefined') window.opener.SetMyUrl('{$filegals_manager|escape}','{$seturl}'); else window.opener.SetUrl('{$seturl}'); javascript:window.close();" title="{tr}Download{/tr}" + {elseif $tiki_p_download_files eq 'y'} {if $gal_info.type eq 'podcast' or $gal_info.type eq 'vidcast'} href="{$download_path}{$files[changes].path}" title="{tr}Download{/tr}" Modified: trunk/templates/setup_fckeditor.tpl =================================================================== --- trunk/templates/setup_fckeditor.tpl 2008-07-24 15:12:52 UTC (rev 13864) +++ trunk/templates/setup_fckeditor.tpl 2008-07-24 15:31:59 UTC (rev 13865) @@ -32,7 +32,7 @@ FCKConfig.FormatOutput = true ; {if $prefs.feature_filegals_manager eq 'y'} -FCKConfig.ImageBrowserURL = _TikiRoot + 'tiki-list_file_gallery.php?filegals_manager=y'; +FCKConfig.ImageBrowserURL = _TikiRoot + 'tiki-list_file_gallery.php?filegals_manager=txtUrl'; {else} FCKConfig.ImageBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Image&Connector=../../connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ; {/if} Modified: trunk/templates/styles/darkroom/tiki-site_header.tpl =================================================================== --- trunk/templates/styles/darkroom/tiki-site_header.tpl 2008-07-24 15:12:52 UTC (rev 13864) +++ trunk/templates/styles/darkroom/tiki-site_header.tpl 2008-07-24 15:31:59 UTC (rev 13865) @@ -56,8 +56,8 @@ {eval var=$prefs.sitead}</div> {/if} {/if} -{if $filegals_manager ne 'y' and $print_page ne 'y'} +{if $filegals_manager eq '' and $print_page ne 'y'} {if $prefs.feature_site_login eq 'y'} {include file="tiki-site_header_login.tpl"} {/if} -{/if} \ No newline at end of file +{/if} Modified: trunk/templates/styles/feb12/tiki-site_header.tpl =================================================================== --- trunk/templates/styles/feb12/tiki-site_header.tpl 2008-07-24 15:12:52 UTC (rev 13864) +++ trunk/templates/styles/feb12/tiki-site_header.tpl 2008-07-24 15:31:59 UTC (rev 13865) @@ -53,8 +53,8 @@ {/if} {/if} {/if} -{if $filegals_manager ne 'y' and $print_page ne 'y'} +{if $filegals_manager eq '' and $print_page ne 'y'} {if $prefs.feature_site_login eq 'y'} {include file="tiki-site_header_login.tpl"} {/if} -{/if} \ No newline at end of file +{/if} Modified: trunk/templates/styles/thenews/tiki-site_header.tpl =================================================================== --- trunk/templates/styles/thenews/tiki-site_header.tpl 2008-07-24 15:12:52 UTC (rev 13864) +++ trunk/templates/styles/thenews/tiki-site_header.tpl 2008-07-24 15:31:59 UTC (rev 13865) @@ -53,8 +53,8 @@ {/if} {/if} {/if} -{if $filegals_manager ne 'y' and $print_page ne 'y'} +{if $filegals_manager eq '' and $print_page ne 'y'} {if $prefs.feature_site_login eq 'y'} {include file="tiki-site_header_login.tpl"} {/if} -{/if} \ No newline at end of file +{/if} Modified: trunk/templates/styles/tikineat/header.tpl =================================================================== --- trunk/templates/styles/tikineat/header.tpl 2008-07-24 15:12:52 UTC (rev 13864) +++ trunk/templates/styles/tikineat/header.tpl 2008-07-24 15:31:59 UTC (rev 13865) @@ -194,14 +194,14 @@ {/if} {if $prefs.feature_community_mouseover eq 'y'}{popup_init src="lib/overlib.js"}{/if} -{if $prefs.feature_siteidentity eq 'y' and $filegals_manager ne 'y'} +{if $prefs.feature_siteidentity eq 'y' and $filegals_manager eq ''} {* Site identity header section *} <div id="siteheader"> {include file="tiki-site_header.tpl"} </div> {/if} -{if $prefs.feature_fullscreen eq 'y' and $filegals_manager ne 'y' and $print_page ne 'y'} +{if $prefs.feature_fullscreen eq 'y' and $filegals_manager eq '' and $print_page ne 'y'} {if $smarty.session.fullscreen eq 'y'} <a href="{$smarty.server.SCRIPT_NAME}{if $fsquery}?{$fsquery}&{else}?{/if}fullscreen=n" class="menulink" id="fullscreenbutton"> {icon _id=application_put alt="{tr}Cancel Fullscreen{/tr}"} Modified: trunk/templates/styles/tikineat/tiki-site_header.tpl =================================================================== --- trunk/templates/styles/tikineat/tiki-site_header.tpl 2008-07-24 15:12:52 UTC (rev 13864) +++ trunk/templates/styles/tikineat/tiki-site_header.tpl 2008-07-24 15:31:59 UTC (rev 13865) @@ -1,6 +1,6 @@ {* $Id$ *} {* Template for Tikiwiki site identity header *} -{if $filegals_manager ne 'y' and $print_page ne 'y'} +{if $filegals_manager eq '' and $print_page ne 'y'} {if $prefs.feature_sitemycode eq 'y' && ($prefs.sitemycode_publish eq 'y' or $tiki_p_admin eq 'y')} {eval var=$prefs.sitemycode}{* here will be parsed the custom site header code *} {/if} Modified: trunk/templates/tiki-edit_help_tool.tpl =================================================================== --- trunk/templates/tiki-edit_help_tool.tpl 2008-07-24 15:12:52 UTC (rev 13864) +++ trunk/templates/tiki-edit_help_tool.tpl 2008-07-24 15:31:59 UTC (rev 13865) @@ -79,7 +79,7 @@ {/section} {if $prefs.feature_filegals_manager eq 'y'} - <a title="{tr}Add another image{/tr}" href="#" onclick="javascript:needToConfirm = false;javascript:window.open('{$url_path}tiki-list_file_gallery.php?gallery_id=0&filegals_manager=y','_blank','menubar=1,scrollbars=1,resizable=1,height=400,width=800');return false;">{icon _id='image' alt='{tr}Add another image{/tr}'}</a> + <a title="{tr}Add another image{/tr}" href="#" onclick="javascript:needToConfirm = false;javascript:window.open('{$url_path}tiki-list_file_gallery.php?gallery_id=0&filegals_manager={$area_name}','_blank','menubar=1,scrollbars=1,resizable=1,height=400,width=800');return false;">{icon _id='image' alt='{tr}Add another image{/tr}'}</a> {if (!isset($zoom_mode) || $zoom_mode eq 'n') and $prefs.quicktags_over_textarea neq 'y'}{cycle name='cycle'|cat:$qtnum}{/if} {/if} Modified: trunk/templates/tiki-editpage.tpl =================================================================== --- trunk/templates/tiki-editpage.tpl 2008-07-24 15:12:52 UTC (rev 13864) +++ trunk/templates/tiki-editpage.tpl 2008-07-24 15:31:59 UTC (rev 13865) @@ -380,7 +380,7 @@ {if $prefs.feature_wiki_pictures eq 'y' and $tiki_p_upload_picture eq 'y'} <tr class="formcolor"><td>{tr}Upload picture{/tr}:</td><td> {if $prefs.feature_filegals_manager eq 'y'} -<input type="submit" class="wikiaction" value="{tr}Add another image{/tr}" onclick="javascript:needToConfirm = false;javascript:window.open('{$url_path}tiki-file_galleries.php?filegals_manager=y','_blank','menubar=1,scrollbars=1,resizable=1,height=400,width=800');return false;" /> +<input type="submit" class="wikiaction" value="{tr}Add another image{/tr}" onclick="javascript:needToConfirm = false;javascript:window.open('{$url_path}tiki-file_galleries.php?filegals_manager=editwiki','_blank','menubar=1,scrollbars=1,resizable=1,height=400,width=800');return false;" /> {else} <input type="hidden" name="MAX_FILE_SIZE" value="1000000000" /> <input type="hidden" name="hasAlreadyInserted" value="" /> Modified: trunk/templates/tiki-file_galleries.tpl =================================================================== --- trunk/templates/tiki-file_galleries.tpl 2008-07-24 15:12:52 UTC (rev 13864) +++ trunk/templates/tiki-file_galleries.tpl 2008-07-24 15:31:59 UTC (rev 13865) @@ -1,32 +1,32 @@ {* $Id$ *} {popup_init src="lib/overlib.js"} -<h1><a class="pagetitle" href="tiki-file_galleries.php{if $galleryId}?galleryId={$galleryId}{if isset($edit_mode) and $edit_mode ne 'n'}&edit_mode=1{/if}{if $filegals_manager eq 'y'}&filegals_manager=y{/if}{else}{if $filegals_manager eq 'y'}?filegals_manager=y{/if}{/if}">{tr}File Galleries{/tr}</a> +<h1><a class="pagetitle" href="tiki-file_galleries.php{if $galleryId}?galleryId={$galleryId}{if isset($edit_mode) and $edit_mode ne 'n'}&edit_mode=1{/if}{if $filegals_manager neq ''}&filegals_manager={$filegals_manager|escape}{/if}{else}{if $filegals_manager neq ''}?filegals_manager={$filegals_manager|escape}{/if}{/if}">{tr}File Galleries{/tr}</a> {if $prefs.feature_help eq 'y'} <a href="{$prefs.helpurl}File+Galleries" target="tikihelp" class="tikihelp" title="{tr}File Galleries{/tr}">{icon _id='help'}</a> {/if} {if $prefs.feature_view_tpl eq 'y'} -<a href="tiki-edit_templates.php?template=tiki-file_galleries.tpl{if $filegals_manager eq 'y'}?filegals_manager=y{/if}" target="tikihelp" class="tikihelp" title="{tr}View tpl{/tr}: {tr}File Galleries tpl{/tr}"> +<a href="tiki-edit_templates.php?template=tiki-file_galleries.tpl{if $filegals_manager neq ''}?filegals_manager={$filegals_manager|escape}{/if}" target="tikihelp" class="tikihelp" title="{tr}View tpl{/tr}: {tr}File Galleries tpl{/tr}"> {icon _id='shape_square_edit' alt='{tr}Edit template{/tr}'}</a> {/if} -{if $tiki_p_admin eq 'y' and $filegals_manager ne 'y'} +{if $tiki_p_admin eq 'y' and $filegals_manager eq ''} <a href="tiki-admin.php?page=fgal">{icon _id='wrench' alt="{tr}Admin Feature{/tr}"}</a> {/if} </h1> -{if $filegals_manager eq 'y'} +{if $filegals_manager neq ''} {remarksbox type="tip" title="{tr}Tip{/tr}"}{tr}Be careful to set the right permissions on the files you link to{/tr}.{/remarksbox} {/if} <div class="navbar"> {if $edit_mode eq 'y' or $dup_mode eq 'y'} -<a class="linkbut" href="tiki-file_galleries.php{if $filegals_manager eq 'y'}?filegals_manager=y{/if}">{tr}List Galleries{/tr}</a> -{if $galleryId}<a class="linkbut" href="tiki-list_file_gallery.php?galleryId={$galleryId}{if $filegals_manager eq 'y'}&filegals_manager=y{/if}">{tr}Browse Gallery{/tr}</a>{/if} +<a class="linkbut" href="tiki-file_galleries.php{if $filegals_manager neq ''}?filegals_manager={$filegals_manager|escape}{/if}">{tr}List Galleries{/tr}</a> +{if $galleryId}<a class="linkbut" href="tiki-list_file_gallery.php?galleryId={$galleryId}{if $filegals_manager neq ''}&filegals_manager={$filegals_manager|escape}{/if}">{tr}Browse Gallery{/tr}</a>{/if} {/if} {if $tiki_p_create_file_galleries eq 'y'and $edit_mode ne 'y'} -<a class="linkbut" href="tiki-file_galleries.php?edit_mode=1&galleryId=0{if $filegals_manager eq 'y'}&filegals_manager=y{/if}">{tr}Create New File Gallery{/tr}</a> +<a class="linkbut" href="tiki-file_galleries.php?edit_mode=1&galleryId=0{if $filegals_manager neq ''}&filegals_manager={$filegals_manager|escape}{/if}">{tr}Create New File Gallery{/tr}</a> {/if} {if $tiki_p_create_file_galleries eq 'y'and $dup_mode ne 'y'} -<a class="linkbut" href="tiki-file_galleries.php?dup_mode=1{if $filegals_manager eq 'y'}&filegals_manager=y{/if}">{tr}Duplicate File Gallery{/tr}</a> +<a class="linkbut" href="tiki-file_galleries.php?dup_mode=1{if $filegals_manager neq ''}&filegals_manager={$filegals_manager|escape}{/if}">{tr}Duplicate File Gallery{/tr}</a> {/if} </div> Modified: trunk/templates/tiki-list_file_gallery.tpl =================================================================== --- trunk/templates/tiki-list_file_gallery.tpl 2008-07-24 15:12:52 UTC (rev 13864) +++ trunk/templates/tiki-list_file_gallery.tpl 2008-07-24 15:31:59 UTC (rev 13865) @@ -2,7 +2,7 @@ {popup_init src="lib/overlib.js"} -<h1><a class="pagetitle" href="tiki-list_file_gallery.php?galleryId={$galleryId}{if $filegals_manager eq 'y'}&filegals_manager=y{/if}">{strip} +<h1><a class="pagetitle" href="tiki-list_file_gallery.php?galleryId={$galleryId}{if $filegals_manager neq ''}&filegals_manager={$filegals_manager|escape}{/if}">{strip} {if $edit_mode eq 'y'} {if $galleryId eq 0} {tr}Create a file gallery{/tr} @@ -18,10 +18,10 @@ <a href="{$prefs.helpurl}File+Galleries" target="tikihelp" class="tikihelp" title="{tr}File Galleries{/tr}">{icon _id='help'}</a> {/if} {if $prefs.feature_view_tpl eq 'y'} -<a href="tiki-edit_templates.php?template=tiki-list_file_gallery.tpl{if $filegals_manager eq 'y'}?filegals_manager=y{/if}" target="tikihelp" class="tikihelp" title="{tr}View tpl{/tr}: {tr}File Galleries tpl{/tr}"> +<a href="tiki-edit_templates.php?template=tiki-list_file_gallery.tpl{if $filegals_manager neq ''}?filegals_manager={$filegals_manager|escape}{/if}" target="tikihelp" class="tikihelp" title="{tr}View tpl{/tr}: {tr}File Galleries tpl{/tr}"> {icon _id='shape_square_edit' alt='{tr}Edit template{/tr}'}</a> {/if} -{if $tiki_p_admin eq 'y' and $filegals_manager ne 'y'} +{if $tiki_p_admin eq 'y' and $filegals_manager eq ''} <a href="tiki-admin.php?page=fgal">{icon _id='wrench' alt="{tr}Admin Feature{/tr}"}</a> {/if} </h1> @@ -38,9 +38,9 @@ {if $user and $prefs.feature_user_watches eq 'y'} {if $user_watching_file_gallery eq 'n'} - <a href="tiki-list_file_gallery.php?galleryId={$galleryId|escape:"url"}&galleryName={$name|escape:"url"}&watch_event=file_gallery_changed&watch_object={$galleryId|escape:"url"}&watch_action=add"{if $filegals_manager eq 'y'}&filegals_manager=y{/if}>{icon _id='eye' align='right' alt="{tr}Monitor this Gallery{/tr}"}</a> + <a href="tiki-list_file_gallery.php?galleryId={$galleryId|escape:"url"}&galleryName={$name|escape:"url"}&watch_event=file_gallery_changed&watch_object={$galleryId|escape:"url"}&watch_action=add"{if $filegals_manager neq ''}&filegals_manager={$filegals_manager|escape}{/if}>{icon _id='eye' align='right' alt="{tr}Monitor this Gallery{/tr}"}</a> {else} - <a href="tiki-list_file_gallery.php?galleryId={$galleryId|escape:"url"}&galleryName={$name|escape:"url"}&watch_event=file_gallery_changed&watch_object={$galleryId|escape:"url"}&watch_action=remove{if $filegals_manager eq 'y'}&filegals_manager=y{/if}">{icon _id='no_eye' align='right' alt="{tr}Stop Monitoring this Gallery{/tr}"}</a> + <a href="tiki-list_file_gallery.php?galleryId={$galleryId|escape:"url"}&galleryName={$name|escape:"url"}&watch_event=file_gallery_changed&watch_object={$galleryId|escape:"url"}&watch_action=remove{if $filegals_manager neq ''}&filegals_manager={$filegals_manager|escape}{/if}">{icon _id='no_eye' align='right' alt="{tr}Stop Monitoring this Gallery{/tr}"}</a> {/if} {/if} {if $prefs.rss_file_gallery eq 'y'} @@ -60,45 +60,45 @@ {/if} {/if} - {if $tiki_p_list_file_galleries eq 'y' or (!isset($tiki_p_list_file_galleries) and $tiki_p_view_file_gallery eq 'y')}<a href="tiki-list_file_gallery.php{if $filegals_manager eq 'y'}?filegals_manager=y{/if}" class="linkbut" title="{tr}List Galleries{/tr}">{tr}List Galleries{/tr}</a>{/if} + {if $tiki_p_list_file_galleries eq 'y' or (!isset($tiki_p_list_file_galleries) and $tiki_p_view_file_gallery eq 'y')}<a href="tiki-list_file_gallery.php{if $filegals_manager neq ''}?filegals_manager={$filegals_manager|escape}{/if}" class="linkbut" title="{tr}List Galleries{/tr}">{tr}List Galleries{/tr}</a>{/if} {if $tiki_p_admin_file_galleries eq 'y' or $user eq $gal_info.user} {if $edit_mode eq 'y' or $dup_mode eq 'y'} - <a class="linkbut" href="tiki-list_file_gallery.php?galleryId={$galleryId}{if $filegals_manager eq 'y'}&filegals_manager=y{/if}">{tr}Browse Gallery{/tr}</a> + <a class="linkbut" href="tiki-list_file_gallery.php?galleryId={$galleryId}{if $filegals_manager neq ''}&filegals_manager={$filegals_manager|escape}{/if}">{tr}Browse Gallery{/tr}</a> {else} - <a href="tiki-list_file_gallery.php?edit_mode=1&galleryId={$galleryId}{if $filegals_manager eq 'y'}&filegals_manager=y{/if}" class="linkbut" title="{tr}Edit Gallery{/tr}">{tr}Edit Gallery{/tr}</a> + <a href="tiki-list_file_gallery.php?edit_mode=1&galleryId={$galleryId}{if $filegals_manager neq ''}&filegals_manager={$filegals_manager|escape}{/if}" class="linkbut" title="{tr}Edit Gallery{/tr}">{tr}Edit Gallery{/tr}</a> {if $view eq 'browse'} - <a href="tiki-list_file_gallery.php?view=list&galleryId={$galleryId}{if $filegals_manager eq 'y'}&filegals_manager=y{/if}" class="linkbut" title="{tr}List Gallery{/tr}">{tr}List Gallery{/tr}</a> + <a href="tiki-list_file_gallery.php?view=list&galleryId={$galleryId}{if $filegals_manager neq ''}&filegals_manager={$filegals_manager|escape}{/if}" class="linkbut" title="{tr}List Gallery{/tr}">{tr}List Gallery{/tr}</a> {else} - <a href="tiki-list_file_gallery.php?view=browse&galleryId={$galleryId}{if $filegals_manager eq 'y'}&filegals_manager=y{/if}" class="linkbut" title="{tr}Browse Images{/tr}">{tr}Browse Images{/tr}</a> + <a href="tiki-list_file_gallery.php?view=browse&galleryId={$galleryId}{if $filegals_manager neq ''}&filegals_manager={$filegals_manager|escape}{/if}" class="linkbut" title="{tr}Browse Images{/tr}">{tr}Browse Images{/tr}</a> {/if} {/if} {/if} {if $tiki_p_assign_perm_file_gallery eq 'y'} - <a class="linkbut" href="tiki-objectpermissions.php?objectName={$name|escape:"url"}&objectType=file+gallery&permType=file+galleries&objectId={$galleryId}{if $filegals_manager eq 'y'}&filegals_manager=y{/if}">{tr}Permissions{/tr}</a> + <a class="linkbut" href="tiki-objectpermissions.php?objectName={$name|escape:"url"}&objectType=file+gallery&permType=file+galleries&objectId={$galleryId}{if $filegals_manager neq ''}&filegals_manager={$filegals_manager|escape}{/if}">{tr}Permissions{/tr}</a> {/if} {if $tiki_p_admin_file_galleries eq 'y' or $user eq $gal_info.user or $gal_info.public eq 'y'} {if $tiki_p_upload_files eq 'y'} - <a href="tiki-upload_file.php?galleryId={$galleryId}{if $filegals_manager eq 'y'}&filegals_manager=y{/if}" class="linkbut">{tr}Upload File{/tr}</a> + <a href="tiki-upload_file.php?galleryId={$galleryId}{if $filegals_manager neq ''}&filegals_manager={$filegals_manager|escape}{/if}" class="linkbut">{tr}Upload File{/tr}</a> {/if} {if $prefs.feature_file_galleries_batch eq "y" and $tiki_p_batch_upload_file_dir eq 'y'} - <a href="tiki-batch_upload_files.php?galleryId={$galleryId}{if $filegals_manager eq 'y'}&filegals_manager=y{/if}" class="linkbut">{tr}Directory batch{/tr}</a> + <a href="tiki-batch_upload_files.php?galleryId={$galleryId}{if $filegals_manager neq ''}&filegals_manager={$filegals_manager|escape}{/if}" class="linkbut">{tr}Directory batch{/tr}</a> {/if} {/if} {else} {if $edit_mode eq 'y' or $dup_mode eq 'y'} - <a class="linkbut" href="tiki-list_file_gallery.php{if $filegals_manager eq 'y'}?filegals_manager=y{/if}">{tr}List Galleries{/tr}</a> + <a class="linkbut" href="tiki-list_file_gallery.php{if $filegals_manager neq ''}?filegals_manager={$filegals_manager|escape}{/if}">{tr}List Galleries{/tr}</a> {/if} {if $tiki_p_create_file_galleries eq 'y' and $edit_mode ne 'y'} - <a class="linkbut" href="tiki-list_file_gallery.php?edit_mode=1&galleryId=0{if $filegals_manager eq 'y'}&filegals_manager=y{/if}">{tr}Create New File Gallery{/tr}</a> + <a class="linkbut" href="tiki-list_file_gallery.php?edit_mode=1&galleryId=0{if $filegals_manager neq ''}&filegals_manager={$filegals_manager|escape}{/if}">{tr}Create New File Gallery{/tr}</a> {/if} {if $tiki_p_create_file_galleries eq 'y' and $dup_mode ne 'y'} - <a class="linkbut" href="tiki-list_file_gallery.php?dup_mode=1{if $filegals_manager eq 'y'}&filegals_manager=y{/if}">{tr}Duplicate File Gallery{/tr}</a> + <a class="linkbut" href="tiki-list_file_gallery.php?dup_mode=1{if $filegals_manager neq ''}&filegals_manager={$filegals_manager|escape}{/if}">{tr}Duplicate File Gallery{/tr}</a> {/if} {/if} @@ -109,13 +109,13 @@ </div> -{if $filegals_manager eq 'y'} +{if $filegals_manager neq ''} {remarksbox type="tip" title="{tr}Tip{/tr}"}{tr}Be careful to set the right permissions on the files you link to{/tr}.{/remarksbox} {/if} {if isset($fileChangedMessage) and $fileChangedMessage neq ''} {remarksbox type="note" title="{tr}Note{/tr}"} {$fileChangedMessage} - <form method="post" action="{$smarty.server.PHP_SELF}{if $filegals_manager eq 'y'}?filegals_manager=y{/if}"> + <form method="post" action="{$smarty.server.PHP_SELF}{if $filegals_manager neq ''}?filegals_manager={$filegals_manager|escape}{/if}"> <input type="hidden" name="galleryId" value="{$galleryId|escape}" /> <input type="hidden" name="fileId" value="{$fileId|escape}" /> {tr}Your comment{/tr} ({tr}optional{/tr}): <input type="text" name="comment" size="40" /> Modified: trunk/templates/tiki-objectpermissions.tpl =================================================================== --- trunk/templates/tiki-objectpermissions.tpl 2008-07-24 15:12:52 UTC (rev 13864) +++ trunk/templates/tiki-objectpermissions.tpl 2008-07-24 15:31:59 UTC (rev 13865) @@ -1,5 +1,5 @@ {* $Id$ *} -<h1><a href="tiki-objectpermissions.php?objectName={$objectName|escape:url}&objectType={$objectType|escape:url}&objectId={$objectId|escape:url}&permType={$permType|escape:url}{if $filegals_manager eq 'y'}&filegals_manager=y{/if}">{tr}Assign permissions to {/tr}{tr}{$objectType|escape}{/tr}: {$objectName|escape}</a></h1> +<h1><a href="tiki-objectpermissions.php?objectName={$objectName|escape:url}&objectType={$objectType|escape:url}&objectId={$objectId|escape:url}&permType={$permType|escape:url}{if $filegals_manager neq ''}&filegals_manager={$filegals_manager|escape}{/if}">{tr}Assign permissions to {/tr}{tr}{$objectType|escape}{/tr}: {$objectName|escape}</a></h1> <div class="navbar"> <a href="{$referer}" class="linkbut">{tr}Back{/tr}</a> </div> @@ -15,7 +15,7 @@ {if $prefs.feature_tabs neq 'y'} <legend class="heading"><a href="#"><span>{tr}View Permissions{/tr}</span></a></legend> {/if} -{if $filegals_manager ne 'y'} +{if $filegals_manager eq ''} {remarksbox type="warning" title="{tr}Warning{/tr}"}{tr}These permissions override any global permissions or category permissions affecting this object.{/tr}<br /> {if $tiki_p_admin eq 'y'}{tr}To edit global permissions <a class="rbox-link" href="tiki-admingroups.php">click here</a>.{/tr}{/if} {/remarksbox} @@ -70,8 +70,8 @@ {if $prefs.feature_tabs neq 'y'} <legend class="heading"><a href="#"><span>{tr}Edit Permissions{/tr}</span></a></legend> {/if} -<form method="post" action="tiki-objectpermissions.php{if $filegals_manager eq 'y'}?filegals_manager=y{/if}"> -{if $filegals_manager ne 'y'} +<form method="post" action="tiki-objectpermissions.php{if $filegals_manager neq ''}?filegals_manager={$filegals_manager|escape}{/if}"> +{if $filegals_manager eq ''} {remarksbox type="warning" title="{tr}Warning{/tr}"}{tr}These permissions override any global permissions or category permissions affecting this object.{/tr}<br /> {if $tiki_p_admin eq 'y'}{tr}To edit global permissions <a class="rbox-link" href="tiki-admingroups.php">click here</a>.{/tr}{/if} {/remarksbox} @@ -95,7 +95,7 @@ <td class="{cycle advance=false}"> {$page_perms[pg].groupName} </td> -<td class="{cycle advance=true}"><a class="link" href="tiki-objectpermissions.php?referer={$referer|escape:"url"}&action=remove&objectName={$objectName}&objectId={$objectId}&objectType={$objectType}&permType={$permType}&page={$page|escape:"url"}&perm={$page_perms[pg].permName}&group={$page_perms[pg].groupName}{if $filegals_manager eq 'y'}&filegals_manager=y{/if}" title="{tr}Delete{/tr}">{icon _id='cross' alt="{tr}Delete{/tr}"}</a></td></tr> +<td class="{cycle advance=true}"><a class="link" href="tiki-objectpermissions.php?referer={$referer|escape:"url"}&action=remove&objectName={$objectName}&objectId={$objectId}&objectType={$objectType}&permType={$permType}&page={$page|escape:"url"}&perm={$page_perms[pg].permName}&group={$page_perms[pg].groupName}{if $filegals_manager neq ''}&filegals_manager={$filegals_manager|escape}{/if}" title="{tr}Delete{/tr}">{icon _id='cross' alt="{tr}Delete{/tr}"}</a></td></tr> {sectionelse} <tr><td colspan="4" class="odd">{if !empty($categ_perms)}{tr}No individual permissions, category permissions apply{/tr}{else}{tr}No individual permissions, category permissions apply{/tr}{/if}</td></tr> {/section} Modified: trunk/templates/tiki-site_header.tpl =================================================================== --- trunk/templates/tiki-site_header.tpl 2008-07-24 15:12:52 UTC (rev 13864) +++ trunk/templates/tiki-site_header.tpl 2008-07-24 15:31:59 UTC (rev 13865) @@ -1,4 +1,4 @@ -{* $Id: tiki-site_header.tpl 12965 2008-05-26 02:22:25Z chibaguy $ *} +{* $Id$ *} {* Template for Tikiwiki site identity header *} <div id="header-top"> {if $prefs.feature_sitemycode eq 'y' && ($prefs.sitemycode_publish eq 'y' or $tiki_p_admin eq 'y')} @@ -63,7 +63,7 @@ {eval var=$prefs.sitead}</div> {/if} {/if} -{if $filegals_manager ne 'y' and $print_page ne 'y'} +{if $filegals_manager eq '' and $print_page ne 'y'} {if $prefs.feature_site_login eq 'y'} {include file="tiki-site_header_login.tpl"} {/if} @@ -78,4 +78,4 @@ <div class="clearfix" id="topbar_custom_code"> {eval var=$prefs.feature_topbar_custom_code} </div> -{/if} \ No newline at end of file +{/if} Modified: trunk/templates/tiki-top_bar.tpl =================================================================== --- trunk/templates/tiki-top_bar.tpl 2008-07-24 15:12:52 UTC (rev 13864) +++ trunk/templates/tiki-top_bar.tpl 2008-07-24 15:31:59 UTC (rev 13865) @@ -1,6 +1,6 @@ -{if $filegals_manager ne 'y' and $print_page ne 'y'} +{if $filegals_manager eq '' and $print_page ne 'y'} {if $prefs.feature_sitesearch eq 'y' and $prefs.feature_search eq 'y' and $tiki_p_search eq 'y'} - <div id="sitesearchbar"{if $prefs.feature_sitemycode neq 'y' and $prefs.feature_sitelogo neq 'y' and $prefs.feature_sitead neq 'y' and $prefs.feature_fullscreen eq 'y' and $filegals_manager ne 'y' and $print_page ne 'y'}{if $smarty.session.fullscreen neq 'y'}style="margin-right: 80px"{/if}{/if}> + <div id="sitesearchbar"{if $prefs.feature_sitemycode neq 'y' and $prefs.feature_sitelogo neq 'y' and $prefs.feature_sitead neq 'y' and $prefs.feature_fullscreen eq 'y' and $filegals_manager eq '' and $print_page ne 'y'}{if $smarty.session.fullscreen neq 'y'}style="margin-right: 80px"{/if}{/if}> {if $prefs.feature_search_fulltext eq 'y'} {include file="tiki-searchresults.tpl" searchNoResults="false" @@ -55,4 +55,4 @@ </div>{* bar with location indicator *} {if $trail}{breadcrumbs type="desc" loc="site" crumbs=$trail}{ else}{breadcrumbs type="desc" loc="site" crumbs=$crumbs}{/if} -{/if} \ No newline at end of file +{/if} Modified: trunk/templates/tiki-upload_file.tpl =================================================================== --- trunk/templates/tiki-upload_file.tpl 2008-07-24 15:12:52 UTC (rev 13864) +++ trunk/templates/tiki-upload_file.tpl 2008-07-24 15:31:59 UTC (rev 13865) @@ -1,10 +1,10 @@ {* $Id$ *} -<h1><a href="tiki-upload_file.php{if !empty($galleryId)}?galleryId={$galleryId}{if $editFileId}&fileId={$editFileId}{/if}{/if}{if $filegals_manager eq 'y'}&filegals_manager=y{/if}" class="pagetitle">{if $editFileId}{tr}Edit File:{/tr} {$fileInfo.filename}{else}{tr}Upload File{/tr}{/if}</a></h1> +<h1><a href="tiki-upload_file.php{if !empty($galleryId)}?galleryId={$galleryId}{if $editFileId}&fileId={$editFileId}{/if}{/if}{if $filegals_manager neq ''}&filegals_manager={$filegals_manager|escape}{/if}" class="pagetitle">{if $editFileId}{tr}Edit File:{/tr} {$fileInfo.filename}{else}{tr}Upload File{/tr}{/if}</a></h1> {if count($galleries) > 0 || $editFileId} {if !empty($galleryId)} - <div class="navbar"><a href="tiki-list_file_gallery.php?galleryId={$galleryId}{if $filegals_manager eq 'y'}&filegals_manager=y{/if}" class="linkbut">{tr}Browse gallery{/tr}</a>{if count($uploads) > 0} + <div class="navbar"><a href="tiki-list_file_gallery.php?galleryId={$galleryId}{if $filegals_manager neq ''}&filegals_manager={$filegals_manager|escape}{/if}" class="linkbut">{tr}Browse gallery{/tr}</a>{if count($uploads) > 0} <a href="#upload" class="linkbut" title="{tr}Upload File{/tr}">{tr}Upload File{/tr}</a>{/if} </div> {/if} @@ -65,7 +65,7 @@ {if !$editFileId} {if $prefs.feature_file_galleries_batch eq 'y'} - {remarksbox type="tip" title="{tr}Tip{/tr}"}{tr}Upload big files (e.g. PodCast files) here:{/tr} <a class="rbox-link" href="tiki-batch_upload_files.php?galleryId={$galleryId}{if $filegals_manager eq 'y'}&filegals_manager=y{/if}">{tr}Directory batch{/tr}</a>{/remarksbox} + {remarksbox type="tip" title="{tr}Tip{/tr}"}{tr}Upload big files (e.g. PodCast files) here:{/tr} <a class="rbox-link" href="tiki-batch_upload_files.php?galleryId={$galleryId}{if $filegals_manager neq ''}&filegals_manager={$filegals_manager|escape}{/if}">{tr}Directory batch{/tr}</a>{/remarksbox} {/if} {elseif isset($fileInfo.lockedby) and $fileInfo.lockedby neq ''} {remarksbox type="note" title="{tr}Info{/tr}" icon="lock"} @@ -78,7 +78,7 @@ {/if} <div align="center"> - <form enctype="multipart/form-data" action="tiki-upload_file.php{if $filegals_manager eq 'y'}?filegals_manager=y{/if}" method="post"> + <form enctype="multipart/form-data" action="tiki-upload_file.php{if $filegals_manager neq ''}?filegals_manager={$filegals_manager|escape}{/if}" method="post"> <table id="upload" class="normal"> <tr><td class="formcolor">{tr}File Title{/tr}:</td><td class="formcolor"><input type="text" name="name" {if $fileInfo.name}value="{$fileInfo.name}"{/if} size="40" /> {if $gal_info.type eq "podcast" or $gal_info.type eq "vidcast"} ({tr}required field for podcasts{/tr}){/if}</td></tr> <tr><td class="formcolor">{tr}File Description{/tr}:</td><td class="formcolor"><textarea rows="5" cols="40" name="description">{if $fileInfo.description}{$fileInfo.description}{/if}</textarea> {if $gal_info.type eq "podcast" or $gal_info.type eq "vidcast"} ({tr}required field for podcasts{/tr}){/if}</td></tr> @@ -150,7 +150,7 @@ {else} {icon _id=exclamation alt="{tr}Error{/tr}" style="vertical-align:middle;"} {tr}No gallery available.{/tr} {tr}You have to create a gallery first!{/tr} - <p><a class="linkbut" href="tiki-file_galleries.php{if $filegals_manager eq 'y'}?filegals_manager=y{/if}">{tr}Create New Gallery{/tr}</a></p> + <p><a class="linkbut" href="tiki-file_galleries.php{if $filegals_manager neq ''}?filegals_manager={$filegals_manager|escape}{/if}">{tr}Create New Gallery{/tr}</a></p> {/if} Modified: trunk/tiki-list_file_gallery.php =================================================================== --- trunk/tiki-list_file_gallery.php 2008-07-24 15:12:52 UTC (rev 13864) +++ trunk/tiki-list_file_gallery.php 2008-07-24 15:31:59 UTC (rev 13865) @@ -841,7 +841,7 @@ $gallery_path_str = ''; foreach ( $gallery_path as $dir_id ) { if ( $gallery_path_str != '' ) $gallery_path_str .= ' > '; - $gallery_path_str .= '<a href="tiki-list_file_gallery.php?galleryId='.$dir_id[0].( isset($_REQUEST['filegals_manager']) ? '&filegals_manager=y' : '').'">'.$dir_id[1].'</a>'; + $gallery_path_str .= '<a href="tiki-list_file_gallery.php?galleryId='.$dir_id[0].( ( isset($_REQUEST['filegals_manager']) && $_REQUEST['filegals_manager'] != '' ) ? '&filegals_manager='.urlencode($_REQUEST['filegals_manager']) : '').'">'.$dir_id[1].'</a>'; } } @@ -871,8 +871,8 @@ include_once('fgal_listing_conf.php'); // Display the template -if ( isset($_REQUEST['filegals_manager']) && $_REQUEST['filegals_manager'] == 'y' ) { - $smarty->assign('filegals_manager','y'); +if ( isset($_REQUEST['filegals_manager']) && $_REQUEST['filegals_manager'] != '' ) { + $smarty->assign('filegals_manager', $_REQUEST['filegals_manager']); $smarty->display('tiki_full.tpl'); } else { $smarty->display('tiki.tpl'); Modified: trunk/tiki-objectpermissions.php =================================================================== --- trunk/tiki-objectpermissions.php 2008-07-24 15:12:52 UTC (rev 13864) +++ trunk/tiki-objectpermissions.php 2008-07-24 15:31:59 UTC (rev 13865) @@ -195,8 +195,8 @@ // Display the template $smarty->assign('mid','tiki-objectpermissions.tpl'); -if ( isset($_REQUEST['filegals_manager']) && $_REQUEST['filegals_manager'] == 'y' ) { - $smarty->assign('filegals_manager','y'); +if ( isset($_REQUEST['filegals_manager']) && $_REQUEST['filegals_manager'] != '' ) { + $smarty->assign('filegals_manager', $_REQUEST['filegals_manager']); $smarty->display("tiki-print.tpl"); } else { $smarty->display("tiki.tpl"); Modified: trunk/tiki-upload_file.php =================================================================== --- trunk/tiki-upload_file.php 2008-07-24 15:12:52 UTC (rev 13864) +++ trunk/tiki-upload_file.php 2008-07-24 15:31:59 UTC (rev 13865) @@ -374,8 +374,8 @@ // Display the template $smarty->assign('mid','tiki-upload_file.tpl'); -if ( isset($_REQUEST['filegals_manager']) && $_REQUEST['filegals_manager'] == 'y' ) { - $smarty->assign('filegals_manager','y'); +if ( isset($_REQUEST['filegals_manager']) && $_REQUEST['filegals_manager'] != '' ) { + $smarty->assign('filegals_manager', $_REQUEST['filegals_manager']); $smarty->display("tiki-print.tpl"); } else { $smarty->display("tiki.tpl"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sy...@us...> - 2008-07-24 18:15:18
|
Revision: 13870 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=13870&view=rev Author: sylvieg Date: 2008-07-24 18:15:26 +0000 (Thu, 24 Jul 2008) Log Message: ----------- [MOD]categ: multiple checkbox Modified Paths: -------------- trunk/templates/tiki-categpermissions.tpl trunk/tiki-categpermissions.php Modified: trunk/templates/tiki-categpermissions.tpl =================================================================== --- trunk/templates/tiki-categpermissions.tpl 2008-07-24 17:24:44 UTC (rev 13869) +++ trunk/templates/tiki-categpermissions.tpl 2008-07-24 18:15:26 UTC (rev 13870) @@ -10,12 +10,24 @@ <div class="simplebox highlight">{tr}Categories checking is not done in the database search.{/tr}</div> {/if} <br /> + <h2>{tr}Current permissions for this category{/tr}:</h2> +<form name="checkboxes_on" method="post" action="{$smarty.server.PHP_SELF}"> +<input type="hidden" name="categId" value="{$catId|escape}" /> <table class="normal"> -<tr><th class="heading">{tr}Group{/tr}</th><th class="heading">{tr}Permission{/tr}</th><th class="heading">{tr}Action{/tr}</th></tr> +<tr> + <th class="heading"> + {if $prefs.javascript_enabled eq 'y'} + <input name="switcher" id="clickall" type="checkbox" title="Select All" onclick="switchCheckboxes(this.form,'checked[]',this.checked)"/> + {/if} + <th class="heading">{tr}Group{/tr}</th> + <th class="heading">{tr}Permission{/tr}</th> + <th class="heading">{tr}Action{/tr}</th> +</tr> {cycle print=false values="even,odd"} {section name=pg loop=$category_perms} <tr> + <td class="{cycle advance=false}"><input type="checkbox" name="checked[]" value="{$catId} {$category_perms[pg].permName} {$category_perms[pg].groupName|escape}" /></td> <td class="{cycle advance=false}">{$category_perms[pg].groupName}</td> <td class="{cycle advance=false}">{$category_perms[pg].permName}</td> <td class="{cycle}"> @@ -23,10 +35,26 @@ (<a class="link" href="tiki-categpermissions.php?referer={$referer}&action=remove_all&objectName={$objectName}&objectId={$objectId}&objectType={$objectType}&permType={$permType}&categId={$catId}&perm={$category_perms[pg].permName}&group={$category_perms[pg].groupName}">{tr}Remove from this Category & all its Children{/tr}</a>) </td></tr> {sectionelse} -<tr><td class="odd" colspan="3">{tr}No individual permissions. Global permissions apply.{/tr}</td></tr> +<tr><td class="odd" colspan="4">{tr}No individual permissions. Global permissions apply.{/tr}</td></tr> {/section} </table> +{tr}Perform action with checked{/tr}: +<select name="submit_mult" onchange="this.form.submit();"> + <option value="" selected="selected">...</option> + <option value="remove" >{tr}Remove{/tr}</option> +</select> +<script type='text/javascript'> +<!-- + // Fake js to allow the use of the <noscript> tag (so non-js-users can still submit) + //--> +</script> + +<noscript> + <input type="submit" value="{tr}OK{/tr}" /> +</noscript> +</form> <br /> + <h2>{tr}Assign permissions{/tr}</h2> <form method="post" action="tiki-categpermissions.php" class="form"> {tr}Assign{/tr} Modified: trunk/tiki-categpermissions.php =================================================================== --- trunk/tiki-categpermissions.php 2008-07-24 17:24:44 UTC (rev 13869) +++ trunk/tiki-categpermissions.php 2008-07-24 18:15:26 UTC (rev 13870) @@ -78,6 +78,15 @@ } } } +if ( !empty($_REQUEST['submit_mult']) && isset($_REQUEST['checked'])) { + $action = $_REQUEST['submit_mult']; + check_ticket('categpermissions'); + foreach ($_REQUEST['checked'] as $check) { + $where = split(' ', $check, 3); + $userlib->remove_object_permission($where[2], $where[0], 'category', $where[1]); + } + +} // Now we have to get the individual page permissions if any $category_perms = $userlib->get_object_permissions($categId, 'category'); @@ -99,6 +108,7 @@ // Get the category path $path = $categlib->get_category_path($categId); $smarty->assign_by_ref('path', $path); +ask_ticket('categpermission'); $smarty->assign('mid', 'tiki-categpermissions.tpl'); $smarty->display("tiki.tpl"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lph...@us...> - 2008-07-25 14:18:28
|
Revision: 13881 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=13881&view=rev Author: lphuberdeau Date: 2008-07-25 14:18:35 +0000 (Fri, 25 Jul 2008) Log Message: ----------- [MRG] Automatic merge, branches/2.0 13840 to 13877 Modified Paths: -------------- trunk/lib/Galaxia/src/common/Base.php trunk/lib/setup/prefs.php trunk/lib/trackers/trackerlib.php trunk/lib/wiki-plugins/wikiplugin_trackeritemfield.php trunk/styles/darkroom.css trunk/styles/feb12.css trunk/styles/thenews.css trunk/styles/tikineat.css trunk/styles/tikinewt.css trunk/templates/browse_file_gallery.tpl trunk/templates/comment-body.tpl trunk/templates/comment-header.tpl trunk/templates/tiki-admin-include-list-sections.tpl trunk/templates/tiki-assignpermission.tpl trunk/templates/tiki-install.tpl trunk/templates/tracker_item_field_value.tpl Modified: trunk/lib/Galaxia/src/common/Base.php =================================================================== --- trunk/lib/Galaxia/src/common/Base.php 2008-07-25 14:12:39 UTC (rev 13880) +++ trunk/lib/Galaxia/src/common/Base.php 2008-07-25 14:18:35 UTC (rev 13881) @@ -1,5 +1,10 @@ <?php +if (strpos($_SERVER["SCRIPT_NAME"],basename(__FILE__)) !== false) { + header("location: index.php"); + exit; +} include_once(GALAXIA_LIBRARY.'/src/common/Observable.php'); + //!! Abstract class representing the base of the API //! An abstract class representing the API base Modified: trunk/lib/setup/prefs.php =================================================================== --- trunk/lib/setup/prefs.php 2008-07-25 14:12:39 UTC (rev 13880) +++ trunk/lib/setup/prefs.php 2008-07-25 14:18:35 UTC (rev 13881) @@ -631,7 +631,7 @@ $prefs['rememberme'] = 'disabled'; $prefs['remembertime'] = 7200; $prefs['feature_clear_passwords'] = 'n'; - $prefs['feature_crypt_passwords'] = 'tikihash'; + $prefs['feature_crypt_passwords'] = 'crypt-md5'; $prefs['feature_challenge'] = 'n'; $prefs['min_user_length'] = 1; $prefs['min_pass_length'] = 1; Modified: trunk/lib/trackers/trackerlib.php =================================================================== --- trunk/lib/trackers/trackerlib.php 2008-07-25 14:12:39 UTC (rev 13880) +++ trunk/lib/trackers/trackerlib.php 2008-07-25 14:18:35 UTC (rev 13881) @@ -1024,6 +1024,11 @@ } } + // Normalize on/y on a checkbox + if ($ins_fields["data"][$i]["type"] == 'c' && $ins_fields['data'][$i]['value'] == 'on') { + $ins_fields['data'][$i]['value'] = 'y'; + } + if ( $ins_fields["data"][$i]["type"] == 'M' && $ins_fields["data"][$i]["options_array"][0] >= '3' && isset($ins_fields["data"][$i]['value'])) { $itId = $itemId ? $itemId : $new_itemId; $old_file = $this->get_item_value($trackerId, $itemId, $ins_fields["data"][$i]['fieldId']); Modified: trunk/lib/wiki-plugins/wikiplugin_trackeritemfield.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_trackeritemfield.php 2008-07-25 14:12:39 UTC (rev 13880) +++ trunk/lib/wiki-plugins/wikiplugin_trackeritemfield.php 2008-07-25 14:18:35 UTC (rev 13881) @@ -110,6 +110,12 @@ $test = false; if (($val = $trklib->get_item_value($trackerId, $itemId, $fieldId)) !== false) { + if ($field['type'] == 'c' && !empty($value)) { + if (strtolower($value) == 'on') + $value = 'y'; + if (strtolower($val) == 'on') + $val = 'y'; + } if ($test && empty($val)) { return $dataelse; } elseif ($test && !empty($value) && $value == $val) { Modified: trunk/styles/darkroom.css =================================================================== --- trunk/styles/darkroom.css 2008-07-25 14:12:39 UTC (rev 13880) +++ trunk/styles/darkroom.css 2008-07-25 14:18:35 UTC (rev 13881) @@ -1584,6 +1584,7 @@ width: 100%} * html .post .postbody {font-size: 11px} +*:first-child+html .postbody { width: 55em } #col1 .post .postbody .content { color: #D8D8D8; @@ -1738,6 +1739,8 @@ border: 1px solid #ff0000; text-align: center; font-weight: bold} + +textarea#editpost2 {font-size: 1em} /***** Categories *****/ Modified: trunk/styles/feb12.css =================================================================== --- trunk/styles/feb12.css 2008-07-25 14:12:39 UTC (rev 13880) +++ trunk/styles/feb12.css 2008-07-25 14:18:35 UTC (rev 13881) @@ -11,8 +11,11 @@ background: #fff url(feb12/pagebg.jpg) repeat-x} html>body {font-size: 75% !important} -body.fullscreen {background: #fff url(feb12/pagebg.jpg) repeat-x 0 -137px} +*:first-child+html body {font-size: 74% !important} + +body#fullscreen {background: #fff url(feb12/pagebg.jpg) repeat-x 0 -137px} + a, a:visited { background: inherit; color: #4A6493; @@ -117,9 +120,10 @@ .button input, input[type=reset] { vertical-align: middle; - font-weight: bold; margin: 2px; vertical-align: middle} + +*:first-child+html input { font-weight: normal } button:hover, input[type=submit]:hover, @@ -137,6 +141,7 @@ select[multiple] {height: 10em} select[name="theme"] {width: 165px} +select#general-timezone {width: 380px} #col1 select[type=file] {font-size: .95em} small {font-size: 0.8em} label {margin: 0 2px} @@ -421,6 +426,7 @@ margin: 0} * html .horbaritem a, +* html .horbaritem a:link, * html .horbaritem a:visited {font-size: 1.3em } .horbaritem a:hover { @@ -441,6 +447,9 @@ visibility: hidden; margin-top: 10px} +* html .mdksubmenu {margin-top: 0} +*:first-child+html .mdksubmenu { margin-top: 0 } + .mdksubmenu table { width: auto} @@ -1302,9 +1311,11 @@ margin-top: 5px; padding: 0; background: #F9FCFF; - font-size: 1.1em} + font-size: 1em; + font-weight: normal} * html .post .postbody {font-size: 1em} +*:first-child+html .postbody {width: 50em !important} .postbody-content {padding: 8px } @@ -1317,11 +1328,12 @@ padding-top: 2px} .post .postbody-title .checkbox { float: left} +*:first-child+html .postbody { width: 45em } .post .postbody-title .title { float: left; color: #29677B; - font-weight: bold; + /*font-weight: bold;*/ font-size: 1.2em; margin-left: 5px; margin-top: 3px; @@ -1452,7 +1464,7 @@ .subcomment { margin-left: 10px} div.commentsedithelp { background: #ffcfcf; color: black; border: 1px solid #ff0000; text-align: center; font-weight: bold} - +textarea#editpost2 {font-size: .9em} /***** Categories *****/ table.tcategpath {} Modified: trunk/styles/thenews.css =================================================================== --- trunk/styles/thenews.css 2008-07-25 14:12:39 UTC (rev 13880) +++ trunk/styles/thenews.css 2008-07-25 14:18:35 UTC (rev 13881) @@ -21,7 +21,7 @@ html>body { - font: 84.5% Georgia, serif; + font: /*84.5%*/74%; text-align: left; } @@ -144,6 +144,8 @@ background: #E6E6F8; } +#col2 input { width: 100px } + input[type=checkbox] {border: 0;} * html .findtable input { font-size: 1em;} @@ -169,23 +171,16 @@ label { cursor: pointer; } + +/* ul, ol { } -* html ul, -* html ol { - -} - li { -} +}*/ -* html li { - height:1%; -} - /***** Pasic Page Layout Including Site Header *****/ @@ -749,7 +744,8 @@ border: 1px solid transparent; background: #fff} -* html #col3 .box:hover a.flipmodtitle img {right: 30px} +* html #col2 a.flipmodtitle img {right: 8px} +* html #col3 a.flipmodtitle img {right: 20px} * html .box a.flipmodtitle img {border: none} a.flipmodtitle:hover img {border: 1px solid #AAAAAA !important} @@ -767,8 +763,18 @@ } .box-data ol, -.box-data ul {padding-right: 1em} +.box-data ul {padding-right: .6em} +.box-data ol {padding-left: 2em; margin-top: 0; margin-bottom: 0;} +.box-data ul {padding-left: 0; margin-top: 0; margin-bottom: 0} +/* IE */ +* html .box-data ol {margin-left: 0em} +* html .box-data ul {margin-left: 1em} +/* IE7 */ +*:first-child+html .box-data ol {margin-left: 0} +*:first-child+html .box-data ul {margin-left: 1em} + + .box-data ul li { list-style: square; } @@ -1157,6 +1163,8 @@ line-height: 1.5em; } +* body .wikitext { font-size: 100% } + .wikitext h1, .wikitext h2, .wikitext h3, @@ -1623,9 +1631,9 @@ table.commentinfo {} /* forums new */ + .post .postbody { clear: both; - width: 100%; border: solid 1px #E7EAED; border-top: solid 1px gray; margin: 0; @@ -1634,6 +1642,8 @@ background-color: #F9FCFF; font-size: 1.1em;} * html .post .postbody {font-size: 11px} +*:first-child+html .postbody { width: 55em } + .post .postbody-title { display: block; background-color: #E0EAF4; @@ -2221,7 +2231,8 @@ a.admbox { border: 1px solid #AAAAAA; - background-color: #6C6C6C} + background-color: #6C6C6C; + color: white} a.admbox:hover, a.admbox:focus, a.admbox:active { background-color: #B2B2B2; Modified: trunk/styles/tikineat.css =================================================================== --- trunk/styles/tikineat.css 2008-07-25 14:12:39 UTC (rev 13880) +++ trunk/styles/tikineat.css 2008-07-25 14:18:35 UTC (rev 13881) @@ -179,7 +179,7 @@ /*********************** SITE IDENTITY HEADER ************************************/ -#sitesearchbar { +#sitesearchbar, #siteloginbar { font-size: 10px; padding: 5px; text-align: right; @@ -343,6 +343,10 @@ color: black; } +#power { + font-size: 10px; +} + /* When modules display a list of items each item is enclosed in a cell with the following style */ TD.module { font-size : 10px; Modified: trunk/styles/tikinewt.css =================================================================== --- trunk/styles/tikinewt.css 2008-07-25 14:12:39 UTC (rev 13880) +++ trunk/styles/tikinewt.css 2008-07-25 14:18:35 UTC (rev 13881) @@ -10,10 +10,15 @@ font-family: Verdana, Helvetica, Geneva, Arial, sans-serif; margin: 0; padding: 0; - font-size: 62.5%; + font-size: 60% !important; color: #000; } +*:first-child+html +body { + font-size: 70% !important; +} + #main { background: transparent url("tikinewt/bg_vertline.png") right top repeat-y; } @@ -42,27 +47,27 @@ margin-bottom: 3px; } h1 { - font-size: 260%; + font-size: 220%; color: #436976; } h2 { - font-size: 200%; + font-size: 180%; color: #234956; } h3 { - font-size: 160%; + font-size: 140%; color: #032936; } h4 { - font-size: 130%; + font-size: 120%; color: #032936; } h5 { - font-size: 120%; + font-size: 110%; color: #032936; } h6 { - font-size: 110%; + font-size: 100%; color: #032936; } @@ -99,7 +104,6 @@ input, textarea, select { - font-size: 1.2em; color: #112233; margin: 1px; } @@ -361,7 +365,7 @@ padding-left: 5px; padding-bottom: 0; border-left: 1px solid #8CACBB; - font-size: .9em; +/* font-size: .9em;*/ } /* IE */ @@ -380,9 +384,7 @@ #c1c2 #col2 { background-color: transparent; width: 180px; - text-align: left;/* - border-right: 1px solid #8CACBB;*/ - font-size: 1.1em + text-align: left; } #col2 .content { @@ -572,6 +574,7 @@ div#edithelpzone {display: none;} #rules-copy-panel {display: none;} .clear, #clear {clear: both;} +br.clear {clear: both; height: 0} .clearfix:after { content: "."; display: block; @@ -717,11 +720,16 @@ overflow: hidden; } -.box-data ol, -.box-data ul { - padding-right: 1em; - overflow: hidden} +.box-data ol {padding-left: 2em; margin-top: 0; margin-bottom: 0;} +.box-data ul {padding-left: 0; margin-top: 0; margin-bottom: 0; list-style:none;} +/* IE */ +* html .box-data ol {margin-left: 0em;} +* html .box-data ul {margin-left: 0em;} +/* IE7 */ +*:first-child+html .box-data ol {margin-left: 0em;} +*:first-child+html .box-data ul {margin-left: 0em;} + td.module { font-size: .95em; color: black; @@ -829,12 +837,14 @@ td { color: #000000; - font-size: 1em;/* - _font-size: 11px;*/ + font-size: 1em; vertical-align: top; text-align: left; } +* html td, +* html th { font-size: 11px } + th { color: black; background: #DEE7EC; @@ -1045,6 +1055,7 @@ text-align: center; } +* html td.third { font-size: 13px } /** Tabs **/ /* Style for tikitabs */ .tabs { @@ -1133,10 +1144,10 @@ margin: 10px 1px 0 0 !important; padding: 0 !important; } - +/* div.content { padding: 3px; -} +}*/ div.content .tabs { margin: 0; @@ -1667,7 +1678,6 @@ div.posthead { color: black; - overflow: hidden; padding: 0 10px; } @@ -1688,15 +1698,12 @@ .blogt { } -div.postbody { - overflow: hidden; +.blogpost .postbody { border-top: 1px solid #AEAEAE; border-bottom: 1px solid #AEAEAE; font-size: .95em; color: black; - padding: 10px; - width: auto; -} + padding: 10px} /***** Forums *****/ @@ -1790,42 +1797,56 @@ /* forums new */ .post .postbody { clear: both; - width: 100%; border: solid 1px #E7EAED; border-top: solid 1px gray; margin: 0; margin-top: 5px; - padding: 3px 0px 3px 0px; + padding: 0; background-color: #F9FCFF; - font-size: 1.1em; - _font-size: 11px; + /*font-size: 1.1em;*/ } + * html .post .postbody {font-size: 11px} -.post .postbody-title { +*:first-child+html .post .postbody {width: 67em !important} + +.postbody-title { display: block; + clear: both; background-color: #E0EAF4; - border-bottom: 1px solid #ACCCDD; - margin-bottom: 4px; - height: 100%; - overflow: auto; - padding-top: 2px; + border-top: 1px solid #8CACBB; + border-bottom: 1px solid #8CACBB; + padding-bottom: 4px; } + .post .postbody-title .checkbox { float: left; } .post .postbody-title .title { - float: left; + /*float: left;*/ color: #29677B; font-weight: bold; font-size: 1em; margin-left: 5px; margin-top: 3px; } +#col1 .post .postbody .content { + color: #000000; + background: #E7E9EA !important; + height: 100%;/* + padding: 0 3px 3px;*/ + text-align: left; + width: 100%} + .post .author { - text-align: right; + float: left; + text-align: left; vertical-align: top; + width: 25%; + height: 100%; + background:#F7F9FA; + border-right: 1px solid #8CACBB; + border-bottom: 1px solid #8CACBB; } .post .author_post_info { display: block; - background-color: #E0EAF4; padding: 0 2px 2px 2px; } .post .author_info .icons { display: block; } @@ -1833,26 +1854,27 @@ .post .author_post_info_on { font-style: italic; } .post .author_info { - float: right; - background-color: #F0F8FF; + display: block; + /*background-color: #F0F8FF;*/ padding: 0 2px 2px 2px; margin-left: 5px; - border-left: 1px solid #D7E5F3; - border-bottom: 1px solid #D7E5F3; + /*border-left: 1px solid #D7E5F3; + border-bottom: 1px solid #D7E5F3;*/ } .commentStyle_headers .author_info { float: left; } .post .postbody-title .actions { float: right; font-size: 1em; } -.post .postbody .content { - float: left; - padding: 0px 3px 3px 3px; - width: 100%; - height: 100%; - text-align: left; - color: #000000; -} + +.postbody-content { + float: right; + width: 73%; + min-height: 4em; + margin: 2px} + +/*.postbody .content .quoteheader {} +.postbody .content .quotebody {display: block}*/ .post .postbody .attachments { clear: both; border-top: 1px dotted #D9D9D9; @@ -1876,13 +1898,10 @@ padding: 0 2px 0 2px; } .post .avatar { - float: right; margin-bottom: 5px; margin-left: 4px; - padding: 3px; - border: 1px solid #ACCCDD; - background-color: #E0EAF4; -} + padding: 3px} + .sub_comment { padding-left: 20px; } .sub_comment_area { clear: both; @@ -1953,6 +1972,8 @@ font-weight: bold; } +textarea#editpost2 {font-size: .97em} + /***** Categories *****/ table.tcategpath { Modified: trunk/templates/browse_file_gallery.tpl =================================================================== --- trunk/templates/browse_file_gallery.tpl 2008-07-25 14:12:39 UTC (rev 13880) +++ trunk/templates/browse_file_gallery.tpl 2008-07-25 14:18:35 UTC (rev 13881) @@ -86,7 +86,7 @@ <div class="thumbimagecontener" style="width:{$thumbnail_size}px; height:{$thumbnailcontener_size}px"> <div class="thumbimage"> <div class="thumbimagesub" style="width:{$thumbnail_size}px;">{assign var=key_type value=$files[changes].type|truncate:9:'':true} - <a {$link}{if $prefs.feature_shadowbox eq 'y' && $filegals_manager eq ''} rel="shadowbox[gallery];type={if $key_type eq 'image/png' or $key_type eq 'image/jpe' or $key_type eq 'image/gif'}img{else}iframe{/if}" title="{if $files[changes].name neq ''}{$files[changes].name|escape}{/if}{if $files[changes].description neq ''} ({$files[changes].description|escape}){/if}"{/if}{if $over_infos neq ''} {popup fullhtml="1" text=$over_infos|escape:"javascript"|escape:"html"}{/if}> + <a {$link}{if $prefs.feature_shadowbox eq 'y' && $filegals_manager neq 'y'} rel="shadowbox[gallery];type={if $key_type eq 'image/png' or $key_type eq 'image/jpe' or $key_type eq 'image/gif'}img{else}iframe{/if}" title="{if $files[changes].name neq ''}{$files[changes].name|escape}{/if}{if $files[changes].description neq ''} ({$files[changes].description|escape}){/if}"{/if}{if $over_infos neq ''} {popup fullhtml="1" text=$over_infos|escape:"javascript"|escape:"html"}{/if}> <img src="tiki-download_file.php?fileId={$files[changes].id}&thumbnail&max={$thumbnail_size}" /> </a> </div> Modified: trunk/templates/comment-body.tpl =================================================================== --- trunk/templates/comment-body.tpl 2008-07-25 14:12:39 UTC (rev 13880) +++ trunk/templates/comment-body.tpl 2008-07-25 14:18:35 UTC (rev 13881) @@ -1,7 +1,7 @@ {* $Id$ *} <div class="clearfix content"> - <div class="author"> + <div class="clearfix author"> {if $thread_style != 'commentStyle_headers'} {if $forum_info.ui_avatar eq 'y' and $comment.userName|avatarize} Modified: trunk/templates/comment-header.tpl =================================================================== --- trunk/templates/comment-header.tpl 2008-07-25 14:12:39 UTC (rev 13880) +++ trunk/templates/comment-header.tpl 2008-07-25 14:18:35 UTC (rev 13881) @@ -91,4 +91,5 @@ {if $thread_style eq 'commentStyle_headers'} {include file="comment-footer.tpl" comment=$comments_coms[rep]} {/if} + <br class="clear" /> </div> Modified: trunk/templates/tiki-admin-include-list-sections.tpl =================================================================== --- trunk/templates/tiki-admin-include-list-sections.tpl 2008-07-25 14:12:39 UTC (rev 13880) +++ trunk/templates/tiki-admin-include-list-sections.tpl 2008-07-25 14:18:35 UTC (rev 13881) @@ -13,7 +13,7 @@ {tr}{$crumbs[$crumb]->description}{/tr} {help crumb=$crumbs[$crumb]} </div> - <div class="cbox-data"> + <div class="clearfix cbox-data"> <a href="tiki-admin.php?page=general" class="admbox" style="background-image: url('pics/large/icon-configuration48x48.png')"> <img src="pics/trans.png" alt="{tr}General{/tr}" title="{tr}General{/tr}" /><span>{tr}General{/tr}</span> </a> Modified: trunk/templates/tiki-assignpermission.tpl =================================================================== --- trunk/templates/tiki-assignpermission.tpl 2008-07-25 14:12:39 UTC (rev 13880) +++ trunk/templates/tiki-assignpermission.tpl 2008-07-25 14:18:35 UTC (rev 13881) @@ -121,6 +121,5 @@ <input type="submit" name="allper" value="{tr}Update{/tr}" /> </form> </div> -</div> <br /> </form> Modified: trunk/templates/tiki-install.tpl =================================================================== --- trunk/templates/tiki-install.tpl 2008-07-25 14:12:39 UTC (rev 13880) +++ trunk/templates/tiki-install.tpl 2008-07-25 14:18:35 UTC (rev 13881) @@ -325,7 +325,7 @@ <p> </p> <h2>{tr}Entering TikiWiki{/tr}</h2> <ul> - <li><a href="tiki-change_password.php?user=admin" class="link">{tr}Change the administrator password{/tr}</a>. {tr}Old password{/tr}: <em>admin</em></li> + <li><a href="tiki-change_password.php?user=admin" class="link">{tr}Login as the administrator{/tr}</a><br />{tr}You will be prompted to select a new administrator password.{/tr} {tr}Old password{/tr}: <em>admin</em></li> </ul> <p> </p> <h3>{tr}Continue in installer{/tr}</h3> Modified: trunk/templates/tracker_item_field_value.tpl =================================================================== --- trunk/templates/tracker_item_field_value.tpl 2008-07-25 14:12:39 UTC (rev 13880) +++ trunk/templates/tracker_item_field_value.tpl 2008-07-25 14:18:35 UTC (rev 13881) @@ -46,8 +46,15 @@ {if $field_value.options_array[4] eq '1' and $showlinks ne 'n' and $list_mode ne 'csv'} <a href="tiki-view_tracker_item.php?itemId={$tid}&trackerId={$field_value.options_array[0]}"> {/if} - {$tlabel} - {if $field_value.options_array[4] eq '1' and $showlinks ne 'n'and $list_mode ne 'csv'} + {if isset($field_value.otherField)} + {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'} </a> {/if} {if $list_mode ne 'csv' and count($field_value.links) > 1} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sy...@us...> - 2008-07-25 14:55:33
|
Revision: 13884 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=13884&view=rev Author: sylvieg Date: 2008-07-25 14:55:43 +0000 (Fri, 25 Jul 2008) Log Message: ----------- [MOD]mysql search: new perm tiki_p_search_caetgorized to be able to limit search on some categorized object: still to do in tiki search Modified Paths: -------------- trunk/db/tiki_2.0to3.0.sql trunk/lib/categories/categlib.php trunk/lib/searchlib.php Modified: trunk/db/tiki_2.0to3.0.sql =================================================================== --- trunk/db/tiki_2.0to3.0.sql 2008-07-25 14:47:44 UTC (rev 13883) +++ trunk/db/tiki_2.0to3.0.sql 2008-07-25 14:55:43 UTC (rev 13884) @@ -14,3 +14,9 @@ # # You may execute this command as often as you like, # and may safely ignore any error messages that appear. + +#2008-07-24 sylvieg +SET @fgcant=0; +SELECT (@fgcant:=count(*)) FROM users_permissions WHERE permName = 'tiki_p_search_categorized'; +INSERT INTO users_permissions (permName, permDesc, level, type) VALUES ('tiki_p_search_categorized', 'Can search on objects of this category', 'basic', 'category'); +INSERT INTO `users_objectpermissions` (groupName, permName, objectType, objectId) SELECT groupName, 'tiki_p_search_categorized', objectType , objectId FROM `users_objectpermissions` WHERE permName = 'tiki_p_view_categorized' AND @fgcant = 0; \ No newline at end of file Modified: trunk/lib/categories/categlib.php =================================================================== --- trunk/lib/categories/categlib.php 2008-07-25 14:47:44 UTC (rev 13883) +++ trunk/lib/categories/categlib.php 2008-07-25 14:55:43 UTC (rev 13884) @@ -1186,7 +1186,7 @@ } // Gets a list of categories that will block objects to be seen by user, recursive - function list_forbidden_categories($parentId=0, $parentAllowed='') { + function list_forbidden_categories($parentId=0, $parentAllowed='', $perm='tiki_p_view_categorized') { global $user, $userlib; if (empty($parentAllowed)) { global $tiki_p_view_categorized; @@ -1201,17 +1201,17 @@ while ($row = $result->fetchRow()) { $child = $row['categId']; if ($userlib->object_has_one_permission($child, 'category')) { - if ($userlib->object_has_permission($user, $child, 'category', 'tiki_p_view_categorized')) { - $forbidden = array_merge($forbidden, $this->list_forbidden_categories($child, 'y')); + if ($userlib->object_has_permission($user, $child, 'category', $perm)) { + $forbidden = array_merge($forbidden, $this->list_forbidden_categories($child, 'y', $perm)); } else { $forbidden[] = $child; - $forbidden = array_merge($forbidden, $this->list_forbidden_categories($child, 'n')); + $forbidden = array_merge($forbidden, $this->list_forbidden_categories($child, 'n', $perm)); } } else { if ($parentAllowed != 'y') { $forbidden[] = $child; } - $forbidden = array_merge($forbidden, $this->list_forbidden_categories($child, $parentAllowed)); + $forbidden = array_merge($forbidden, $this->list_forbidden_categories($child, $parentAllowed, $perm)); } } return $forbidden; Modified: trunk/lib/searchlib.php =================================================================== --- trunk/lib/searchlib.php 2008-07-25 14:47:44 UTC (rev 13883) +++ trunk/lib/searchlib.php 2008-07-25 14:55:43 UTC (rev 13884) @@ -162,7 +162,8 @@ $bindJoin[] = $objType; - $forbiddenCatList = $categlib->list_forbidden_categories(); + $forbiddenCatList = $categlib->list_forbidden_categories(0, '', 'tiki_p_search_categorized'); + $forbiddenCatStr = ''; if (count($forbiddenCatList) > 0) { $forbiddenCatStr = '?' . str_repeat(',?',count($forbiddenCatList)-1); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |