Commit 100e7586 authored by lphuberdeau's avatar lphuberdeau

[MRG] Automatic merge, branches/5.x 27724 to 27798

parent 4faf4ca7
......@@ -1330,6 +1330,7 @@ installer/schema/20100621_pageprefixaliasdata_tiki.sql -text
installer/schema/20100622_pageprefixtrackeritemid_tiki.sql -text
installer/schema/20100623_semantic_to_relation_tiki.php -text
installer/schema/20100623_semantic_to_relation_tiki.sql -text
installer/schema/20100624_banning_index_tiki.sql -text
installer/schema/20100628_payment_user_tiki.sql -text
installer/schema/99999999_image_plugins_kill_tiki.php -text
installer/schema/index.php -text
......@@ -1717,7 +1718,6 @@ lib/fckeditor_tiki/plugins/tikiwiki/lang/en.js -text
lib/fckeditor_tiki/plugins/tikiwiki/lang/pl.js -text
lib/fckeditor_tiki/tikistyles.xml -text
lib/fckeditor_tiki/tikitemplates.xml -text
lib/fckeditor_tiki/web.config -text
lib/featured_links/flinkslib.php -text
lib/featured_links/index.php -text
lib/feedcreator/feedcreator.class.php -text
......@@ -3110,7 +3110,6 @@ maps/index.php -text
modules/.htaccess -text
modules/cache/README -text
modules/cache/index.php -text
modules/cache/web.config -text
modules/index.php -text
modules/mod-func-action_calendar.php -text
modules/mod-func-action_similarcontent.php -text
......@@ -3966,7 +3965,6 @@ temp/index.php -text
temp/mail_attachs/README -text
temp/mail_attachs/index.php -text
temp/public/.htaccess -text
temp/public/web.config -text
temp/web.config -text
templates/.htaccess -text
templates/advanced_search_help.tpl -text
......
......@@ -230,7 +230,8 @@ CREATE TABLE `tiki_banning` (
`use_dates` char(1) default NULL,
`created` int(14) default NULL,
`message` text,
PRIMARY KEY (`banId`)
PRIMARY KEY (`banId`),
INDEX ban(`use_dates`, `date_from`, `date_to`)
) ENGINE=MyISAM AUTO_INCREMENT=1 ;
DROP TABLE IF EXISTS `tiki_banning_sections`;
......
# This file says 2006 but this is a mistake. Since renaming a DB schema modification file is more work (because some have already used it), it stayed as is. Should have no impact but a note is added here in case you wondered. http://tikiwiki.svn.sourceforge.net/viewvc/tikiwiki?view=revision&revision=24792
ALTER TABLE `tiki_file_galleries` ADD COLUMN `show_lastDownload` char(1) default NULL AFTER `show_hits`;
ALTER TABLE `tiki_banning` ADD INDEX ban(`use_dates`, `date_from`, `date_to`);
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<system.webServer>
<rewrite>
<rules>
<rule name="RequestBlockingRule2">
<match url=".*" />
<conditions>
<add input="{URL}" pattern="\.ph(p(3|4)?|tml)$" />
</conditions>
<action type="CustomResponse" statusCode="403" />
</rule>
</rules>
</rewrite>
</system.webServer>
</configuration>
......@@ -635,7 +635,7 @@ class FreetagLib extends ObjectLib
return true;
}
$tagId = $this->find_or_create_tag( $tag, $lang );
$tagId = $this->find_or_create_tag( $tag, $lang, false );
$objectId = $this->add_object($type, $itemId);
......
......@@ -207,7 +207,7 @@ function tiki_error_handling($errno, $errstr, $errfile, $errline) {
case E_USER_NOTICE:
case E_DEPRECATED:
case E_USER_DEPRECATED:
if ( defined('THIRD_PARTY_LIBS_PATTERN') && ! preg_match(THIRD_PARTY_LIBS_PATTERN, $errfile) ) {
if (! defined('THIRD_PARTY_LIBS_PATTERN') || ! preg_match(THIRD_PARTY_LIBS_PATTERN, $errfile) ) {
if ($prefs['smarty_notice_reporting'] != 'y' && strstr($errfile, '.tpl.php'))
break;
$back = "<div class='rbox-data' style='font-size:10px;border:1px solid'>";
......
......@@ -178,9 +178,9 @@ $jq( "#'.$as_id.'" ).ckeditor(CKeditor_OnComplete, {
$headerlib->add_js('
var fckEditorInstances = new Array();
function CKeditor_OnComplete( editorInstance ) {
fckEditorInstances[fckEditorInstances.length] = editorInstance;
// editorInstance.resetDirty(); // doesnt work
function CKeditor_OnComplete() {
fckEditorInstances[fckEditorInstances.length] = this;
this.resetDirty();
};');
} // end both wysiwyg setups
......@@ -262,8 +262,9 @@ var editTimerWarnings = 0;
$js_editconfirm .= "
function confirmExit() {
if (window.needToConfirm && typeof fckEditorInstances != 'undefined' && fckEditorInstances.length > 0) {
var version2 = (typeof CKeditor_OnComplete == 'undefined');
for(var ed = 0; ed < fckEditorInstances.length; ed++) {
if (fckEditorInstances[ed].IsDirty()) {
if ((version2 && fckEditorInstances[ed].IsDirty()) || (!version2 && fckEditorInstances[ed].checkDirty())) {
window.editorDirty = true;
break;
}
......
......@@ -30,10 +30,10 @@ if (strpos($_SERVER["SCRIPT_NAME"],basename(__FILE__)) !== false) {
* Example: {$userinfo.login|userlink:'link':::25}
*/
function smarty_modifier_userlink($other_user,$class='link',$idletime='not_set', $fullname='', $max_length=0) {
function smarty_modifier_userlink($other_user,$class='link',$idletime='not_set', $fullname='', $max_length=0, $popup='y') {
global $tikilib, $userlib, $cachelib, $user, $prefs, $userprefslib, $smarty;
$show_mouseover = $prefs['feature_community_mouseover'] == 'y' && $userlib->get_user_preference($user, 'show_mouseover_user_info','y') == 'y';
$show_mouseover = $popup != 'n' && $prefs['feature_community_mouseover'] == 'y' && $userlib->get_user_preference($user, 'show_mouseover_user_info','y') == 'y';
$show_friends = $prefs['feature_friends'] == 'y' && $tikilib->verify_friendship($user, $other_user);
if( $show_mouseover || $show_friends ) {
......
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<system.webServer>
<rewrite>
<rules>
<rule name="RequestBlockingRule2">
<match url=".*" />
<conditions>
<add input="{URL}" pattern=".*" />
</conditions>
<action type="CustomResponse" statusCode="403" />
</rule>
</rules>
</rewrite>
</system.webServer>
</configuration>
......@@ -984,8 +984,7 @@ body.tiki_cms h1 a.pagetitle:hover {border-bottom: 0}
.postbody-title {
padding: .5em .3em .3em 1em;
position: relative;
/* border: 1px solid #aaa;*/
background: url(fivealive/options/blueberry/header.png) -650px -90px;
background: url(fivealive/options/blueberry/siteheader.jpg) -550px -90px;
color: #222;
font-weight: bold;
font-size: 1.1em;
......
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<system.webServer>
<rewrite>
<rules>
<rule name="RequestBlockingRule2">
<match url=".*" />
<conditions>
<add input="{URL}" pattern=".*" />
</conditions>
<action type="CustomResponse" statusCode="403" />
</rule>
</rules>
</rewrite>
</system.webServer>
</configuration>
......@@ -3,11 +3,8 @@
<system.webServer>
<rewrite>
<rules>
<rule name="RequestBlockingRule2">
<match url=".*" />
<conditions>
<add input="{URL}" pattern=".*" />
</conditions>
<rule name="Block temp">
<match url="public/.*" negate="true" /> <!-- Block temp/ but not temp/public/ -->
<action type="CustomResponse" statusCode="403" />
</rule>
</rules>
......
{strip}
{if isset($close_window) and $close_window eq 'y'}
{jq}
close();
......@@ -107,3 +108,4 @@ close();
{else}
{include file='tiki.tpl'}
{/if}
{/strip}
\ No newline at end of file
......@@ -237,7 +237,7 @@
{* 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('{$tikiroot}{$seturl}'); checkClose();" title="{tr}Click Here to Insert in Wiki Syntax{/tr}"
{elseif $tiki_p_download_files eq 'y'}
{elseif $files[changes].perms.tiki_p_download_files eq 'y'}
{if $gal_info.type eq 'podcast' or $gal_info.type eq 'vidcast'}
href="{$prefs.fgal_podcast_dir}{$files[changes].path}" title="{tr}Download{/tr}"
{else}
......
......@@ -142,7 +142,7 @@
|| $tiki_p_post_comments == 'y'
|| $tiki_p_edit_comments == 'y')
}
<div id="page-bar">
<div id="page-bar" class="clearfix">
{include file=comments_button.tpl}
</div>
{include file=comments.tpl}
......
......@@ -173,6 +173,7 @@
<tr class="formcolor"><td>{tr}Order{/tr}:</td><td><input type="text" size="5" name="position" value="{$position}" /></td></tr>
<tr class="formcolor"><td>{tr}Field is mandatory?{/tr}</td><td><input type="checkbox" name="isMandatory" {if $isMandatory eq 'y'}checked="checked"{/if} /></td></tr>
<tr class="formcolor"><td>{tr}Is column visible when listing tracker items?{/tr}</td><td><input type="checkbox" name="isTblVisible" {if empty($fieldId) || $isTblVisible eq 'y'}checked="checked"{/if} /></td></tr>
<tr class="formcolor"><td colspan="2">{remarksbox type="info" title="{tr}Important note{/tr}"}{tr}The first field in the tracker to have column links to edit/view item (i.e. isMain) will be what is shown as the name of the item in category and search listings{/tr}{/remarksbox}</td></tr>
<tr class="formcolor"><td>{tr}Column links to edit/view item?{/tr}</td><td><input type="checkbox" name="isMain" {if empty($fieldId) ||$isMain eq 'y'}checked="checked"{/if} /></td></tr>
<tr class="formcolor" id='multilabelRow'{if $type neq 'a' && $type neq 't' && $type neq 'o' && $type neq '' && $type neq 'C'} style="display:none;"{/if}><td>{tr}Multilingual content{/tr}:</td><td><input type="checkbox" name="isMultilingual" {if $isMultilingual eq 'y'}checked="checked"{/if} /></td></tr>
<tr class="formcolor"><td>{tr}Column is searchable?{/tr}</td><td><input type="checkbox" name="isSearchable" {if $isSearchable eq 'y'}checked="checked"{/if} /></td></tr>
......
......@@ -186,7 +186,7 @@
|| $tiki_p_post_comments == 'y'
|| $tiki_p_edit_comments == 'y')
}
<div id="page-bar">
<div id="page-bar" class="clearfix">
{include file='comments_button.tpl'}
</div>
{include file='comments.tpl'}
......
......@@ -3,7 +3,7 @@
<p>
<strong>Page: &quot;{$page|escape}&quot;</strong>
</p>
<form enctype="multipart/form-data" method="get" action="tiki-editpage.php?page={$page|escape:'url'}" id='editpageform' name='editpageform'>
<form method="post" action="tiki-editpage.php?page={$page|escape:'url'}" id='editpageform' name='editpageform'>
{* Repeat all arguments from the page creation request *}
{foreach from=$_REQUEST key=request_key item=request_val}
<input type="hidden" name="{$request_key}" value="{$request_val|escape}"/>
......
......@@ -58,7 +58,7 @@
{if strlen($email)>0}
<h2>{tr}Contact us by email{/tr}</h2>
{tr}Click here to send us an email{/tr}: {mailto address="$email" encode="javascript" extra='class="link"'}
{tr}Click here to send us an email{/tr}: {mailto text="$email" address="$email0" encode="javascript" extra='class="link"'}
{else}
<p><a class="link" href="tiki-contact.php">{tr}Send another message{/tr}</a></p>
{/if}
......
......@@ -227,7 +227,7 @@
|| $tiki_p_post_comments == 'y'
|| $tiki_p_edit_comments == 'y')}
<div id="page-bar">
<div id="page-bar" class="clearfix">
{include file='comments_button.tpl'}
</div>
......
......@@ -147,7 +147,7 @@
|| $tiki_p_post_comments == 'y'
|| $tiki_p_edit_comments == 'y')
}
<div id="page-bar">
<div id="page-bar" class="clearfix">
{include file='comments_button.tpl'}
</div>
{include file='comments.tpl'}
......
......@@ -161,7 +161,7 @@
{if $prefs.feature_article_comments == 'y' &&
(($tiki_p_read_comments == 'y' && $comments_cant != 0) || $tiki_p_post_comments == 'y' || $tiki_p_edit_comments == 'y')}
<div id="page-bar">
<div id="page-bar" class="clearfix">
{include file='comments_button.tpl'}
</div>
......
......@@ -2,7 +2,7 @@
{section name=ix loop=$listpages}
<div class="articletitle">
<span class="newsitem">
<a href="tiki-read_article.php?articleId={$listpages[ix].articleId}">{$listpages[ix].title}</a>
<a href="{$listpages[ix].articleId|sefurl:article}">{$listpages[ix].title|escape}</a>
</span>
<br />
</div>
......
......@@ -143,7 +143,7 @@
|| $tiki_p_post_comments == 'y'
|| $tiki_p_edit_comments == 'y')
}
<div id="page-bar">
<div id="page-bar" class="clearfix">
{include file='comments_button.tpl'}
</div>
{include file='comments.tpl'}
......
......@@ -19,8 +19,14 @@ $auto_query_args = array(
);
$access->check_feature('feature_newsletters');
if (!isset($_REQUEST["nlId"])) {
$smarty->assign('msg', tra("No newsletter indicated"));
$smarty->display("error.tpl");
$smarty->assign('msg', tra('No newsletter indicated'));
$smarty->display('error.tpl');
die;
}
$info = $nllib->get_newsletter($_REQUEST["nlId"]);
if (empty($info)) {
$smarty->assign('msg', tra('Newsletter does not exist'));
$smarty->display('error.tpl');
die;
}
$smarty->assign('nlId', $_REQUEST["nlId"]);
......@@ -42,15 +48,7 @@ if ($userlib->object_has_one_permission($_REQUEST["nlId"], 'newsletter')) {
}
}
$access->check_permission('tiki_p_admin_newsletters');
if ($_REQUEST["nlId"]) {
$info = $nllib->get_newsletter($_REQUEST["nlId"]);
} else {
$info = array();
$info["name"] = '';
$info["description"] = '';
$info["allowAnySub"] = 'n';
$info["frequency"] = 7 * 24 * 60 * 60;
}
$smarty->assign('nl_info', $info);
if (isset($_REQUEST["remove"])) {
$access->check_authenticity();
......
......@@ -32,6 +32,11 @@ if ($perms->admin_newsletters != 'y') {
$defaultArticleClipRange = 3600 * 24; // one day
if ($_REQUEST["nlId"]) {
$info = $nllib->get_newsletter($_REQUEST["nlId"]);
if (empty($info)) {
$smarty->assign('msg', tra('Newsletter does not exist'));
$smarty->display('error.tpl');
die;
}
$update = "";
$info["articleClipTypes"] = unserialize($info["articleClipTypes"]);
$info["articleClipRangeDays"] = $info["articleClipRange"] / 3600 / 24;
......
......@@ -87,19 +87,22 @@ foreach( array_reverse( $pages ) as $id => $info )
$renderer = new WikiRenderer( $info, $user );
$renderer->applyPermissions();
$renderer->runSetups();
$comments_per_page = $prefs['wiki_comments_per_page'];
$thread_sort_mode = $prefs['wiki_comments_default_ordering'];
$comments_vars=Array('page');
$comments_objectId = 'wiki page:' . $info['pageName'];
$_REQUEST['page'] = $info['pageName'];
include('comments.php');
if( $tiki_p_view == 'y' ) {
$renderer->runSetups();
$contents[] = $smarty->fetch('tiki-show_page.tpl');
$comments_per_page = $prefs['wiki_comments_per_page'];
$thread_sort_mode = $prefs['wiki_comments_default_ordering'];
$comments_vars=Array('page');
$comments_objectId = 'wiki page:' . $info['pageName'];
$_REQUEST['page'] = $info['pageName'];
include('comments.php');
if( $id === count($pages) - 1 )
$renderer->restoreAll();
$contents[] = $smarty->fetch('tiki-show_page.tpl');
if( $id === count($pages) - 1 )
$renderer->restoreAll();
}
}
$contents = array_reverse( $contents );
......
......@@ -291,7 +291,7 @@ for ($i = 0; $i <= $numberofweeks; $i++) {
foreach ( $organizers as $org ) {
if ( $org == '' ) continue;
if ( $cellorganizers != '' ) $cellorganizers .= ', ';
$cellorganizers .= smarty_modifier_userlink(trim($org));
$cellorganizers .= smarty_modifier_userlink(trim($org), 'link', 'not_set', '', 0, 'n');
}
$smarty->assign('cellorganizers', $cellorganizers);
......@@ -299,7 +299,7 @@ for ($i = 0; $i <= $numberofweeks; $i++) {
foreach ( $le['result']['participants'] as $parti ) {
if ( empty($parti) || $parti['name'] == '' ) continue;
if ( $cellparticipants != '' ) $cellparticipants .= ', ';
$cellparticipants .= smarty_modifier_userlink(trim($parti['name']));
$cellparticipants .= smarty_modifier_userlink(trim($parti['name']), 'link', 'not_set', '', 0, 'n');
}
$smarty->assign('cellparticipants', $cellparticipants);
......
......@@ -22,6 +22,7 @@ $smarty->assign('mid', 'tiki-contact.tpl');
$email = $userlib->get_user_email($prefs['contact_user']);
if ($email == '') $email = $userlib->get_admin_email();
$smarty->assign('email0', $email);
$email = scrambleEmail($email, $tikilib->get_user_preference('admin', "email is public"));
$smarty->assign('email', $email);
......
......@@ -464,6 +464,7 @@ $smarty->assign_by_ref('topics', $topics);
// get list of valid types
$types = $artlib->list_types_byname();
if (empty($article_data)) {
if (array($types)) {
foreach ($types as $type=>$val) {
break;
......@@ -472,6 +473,7 @@ if (array($types)) {
$type = '';
}
$smarty->assign('type', $type);
}
if ($prefs["article_custom_attributes"] == 'y') {
$article_attributes = $artlib->get_article_attributes($_REQUEST["articleId"]);
$smarty->assign('article_attributes', $article_attributes);
......
......@@ -11,6 +11,11 @@ $access->check_feature('feature_newsletters');
if (!empty($_REQUEST['nlId'])) {
$smarty->assign('nlId', $_REQUEST["nlId"]);
$nl_info = $nllib->get_newsletter($_REQUEST["nlId"]);
if (empty($nl_info)) {
$smarty->assign('msg', tra('Newsletter does not exist'));
$smarty->display('error.tpl');
die;
}
$smarty->assign_by_ref('nl_info', $nl_info);
}
if (isset($_REQUEST['remove']) && !empty($_REQUEST['nlId'])) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment