Commit 5dd8d0dc authored by lphuberdeau's avatar lphuberdeau

[MRG] Automatic merge, branches/2.0 13653 to 13737

parent e24bd091
......@@ -2771,7 +2771,6 @@ lib/wiki-plugins/wikiplugin_myspace.php -text
lib/wiki-plugins/wikiplugin_objecthits.php -text
lib/wiki-plugins/wikiplugin_pluginmanager.php -text
lib/wiki-plugins/wikiplugin_poll.php -text
lib/wiki-plugins/wikiplugin_posts.php -text
lib/wiki-plugins/wikiplugin_quote.php -text
lib/wiki-plugins/wikiplugin_remarksbox.php -text
lib/wiki-plugins/wikiplugin_rss.php -text
......@@ -3874,7 +3873,6 @@ templates/tiki-lastchanges.tpl -text
templates/tiki-likepages.tpl -text
templates/tiki-list_articles.tpl -text
templates/tiki-list_banners.tpl -text
templates/tiki-list_blog_posts.tpl -text
templates/tiki-list_blogs.tpl -text
templates/tiki-list_cache.tpl -text
templates/tiki-list_comments.tpl -text
......
......@@ -15,6 +15,7 @@
deny from all
</FilesMatch>
<IfModule mod_rewrite.c>
RewriteEngine On
# direct one-word access
......@@ -80,3 +81,5 @@ RewriteRule ^([^/\.]+)$ tiki-index.php?page=$1 [QSA,L]
# 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
......@@ -2268,6 +2268,7 @@ CREATE TABLE tiki_menus (
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 ;
# --------------------------------------------------------
......
......@@ -2268,6 +2268,7 @@ CREATE TABLE tiki_menus (
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 ;
# --------------------------------------------------------
......
......@@ -2811,6 +2811,7 @@ CREATE TABLE "tiki_menus" (
"name" varchar(200) default '' NOT NULL,
"description" clob,
"type" char(1) default NULL,
"icon" varchar(200) default NULL,
PRIMARY KEY (menuId)
) ENGINE=MyISAM ;
......
......@@ -2641,6 +2641,7 @@ CREATE TABLE "tiki_menus" (
"name" varchar(200) NOT NULL default '',
"description" text,
"type" char(1) default NULL,
"icon" varchar(200) default NULL,
PRIMARY KEY ("menuId")
) ENGINE=MyISAM ;
......
......@@ -2650,6 +2650,7 @@ CREATE TABLE 'tiki_menus' (
"name" varchar(200) NOT NULL default '',
"description" text,
"type" char(1) default NULL,
"icon" varchar(200) default NULL,
PRIMARY KEY (menuId)
) ENGINE=MyISAM ;
......
......@@ -3487,6 +3487,7 @@ CREATE TABLE "tiki_menus" (
"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
......
This diff is collapsed.
......@@ -2268,6 +2268,7 @@ CREATE TABLE tiki_menus (
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 ;
# --------------------------------------------------------
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -636,7 +636,7 @@ if ( ! $_SESSION['need_reload_prefs'] ) {
$prefs['pass_chr_num'] = 'n';
$prefs['pass_due'] = -1;
$prefs['email_due'] = -1;
$prefs['unsuccessful_logins'] = -1;
$prefs['unsuccessful_logins'] = 20;
$prefs['rnd_num_reg'] = 'n';
$prefs['generate_password'] = 'n';
$prefs['auth_method'] = 'tiki';
......
......@@ -83,7 +83,8 @@ class TWVersion {
15=>'1.9.10',
16=>'1.9.10.1',
17=>'1.10.0b1',
18=>'2.0',
18=>'2.0RC1',
18=>'2.0RC2',
);
}
......
......@@ -49,7 +49,8 @@ function smarty_block_self_link($params, $content, &$smarty, $repeat = false) {
// Complete _script path if needed
if ( isset($params['_script']) ) {
if ( $params['_script'] != '' && $_SERVER['PHP_SELF'][0] == '/' && strpos($params['_script'], '/') === false ) {
$params['_script'] = ( $_SERVER['PHP_SELF'] == '/' ? '' : dirname($_SERVER['PHP_SELF']) ).'/'.$params['_script'];
$self_dir = dirname($_SERVER['PHP_SELF']);
$params['_script'] = ( $self_dir == '/' ? '' : $self_dir ).'/'.$params['_script'];
}
if ( $params['_script'] == $_SERVER['PHP_SELF'] ) {
$params['_script'] = '';
......
......@@ -1990,7 +1990,7 @@ function add_pageview() {
// FILE GALLERIES ////
/*shared*/
function list_files($offset, $maxRecords, $sort_mode, $find) {
return $this->get_files($offset, $maxRecords, $sort_mode, $find);
return $this->get_files($offset, $maxRecords, $sort_mode, $find,$recursive=true);
}
/*shared*/
......
<?php
function wikiplugin_posts_help() {
$help = tra("Includes blog posts listing into a wiki page");
$help .= "<br />";
$help .= tra("~np~{POSTS(max=>5, blogId=>id)}{POSTS}~/np~");
return $help;
}
function wikiplugin_posts($data,$params) {
global $smarty, $prefs, $tiki_p_read_blog, $tikilib;
include_once ('lib/blogs/bloglib.php');
extract($params,EXTR_SKIP);
if (($prefs['feature_blogs'] != 'y') || ($tiki_p_read_blog != 'y')) {
// the feature is disabled or the user can't read blogs
return('');
}
if (!isset($blogId)) {
return tra('blogId is mandatory');
}
if (!isset($max))
$max='5';
$blog = $tikilib->get_blog($blogId);
$posts = $bloglib->list_blog_posts($blogId, '', $max);
$smarty->assign('blog_title', $blog['title']);
$smarty->assign('posts', $posts['data']);
return "~np~ ".$smarty->fetch('tiki-list_blog_posts.tpl')." ~/np~";
}
?>
......@@ -597,8 +597,10 @@ function wikiplugin_tracker($data, $params) {
}
}
if (!empty($tpl)) {
$smarty->security = true;
$back .= $smarty->fetch($tpl);
} elseif (!empty($wiki)) {
$smarty->security = true;
$back .= $smarty->fetch('wiki:'.$wiki);
}
if ($prefs['feature_antibot'] == 'y' && empty($user)) {
......
......@@ -357,6 +357,8 @@ function wikiplugin_trackerlist($data, $params) {
} elseif (empty($tpl)) {
$tpl = '';
}
if (!empty($tpl))
$smarty->security = true;
$smarty->assign('tpl', $tpl);
$smarty->assign_by_ref('max', $max);
......
......@@ -2184,4 +2184,7 @@ span.minichat_nick {
margin-right: 2px;
}
#sitelogo {
background-color: white;
}
/* end of css file */
......@@ -234,10 +234,15 @@
{/section}
<table class="normal">
{if empty($user)}
<tr>
<td class="formcolor">{tr}Your name{/tr}:</td>
<td class="formcolor"><input type="text" maxlength="50" size="50" id="anonymous_name" name="anonymous_name" /></td>
</tr>
{/if}
<tr>
<td class="formcolor">
<label for="comments-title">{tr}Title{/tr}: </label>
<div class="attention">{tr}Required{/tr}</div>
<label for="comments-title">{tr}Title{/tr} <span class="attention">({tr}required{/tr})</span>: </label>
</td>
<td class="formcolor">
<input type="text" size="50" name="comments_title" id="comments-title" value="{$comment_title|escape}" />
......@@ -328,9 +333,6 @@
</td>
<td class="formcolor">
{if empty($user)}
{tr}Enter your name{/tr}:&nbsp;<input type="text" maxlength="50" size="12" id="anonymous_name" name="anonymous_name" />
{/if}
<input type="submit" name="comments_previewComment" value="{tr}Preview{/tr}" {if empty($user)}onclick="setCookie('anonymous_name',document.getElementById('anonymous_name').value);"{/if} />
<input type="submit" name="comments_postComment" value="{tr}Post{/tr}" {if empty($user)}onclick="setCookie('anonymous_name',document.getElementById('anonymous_name').value);"{/if} />
{if !empty($user) && $prefs.feature_comments_post_as_anonymous eq 'y'}
......
<div class="posts">
<h2>{$blog_title}</h2>
{foreach from=$posts item=post}
{$post.created|tiki_date_format:"%m/%d/%Y"} <a href="tiki-view_blog_post.php?blogId={$post.blogId}&postId={$post.postId}">{$post.title}</a><br />
{/foreach}
</div>
\ No newline at end of file
......@@ -9,19 +9,14 @@
{if $opensec > 0}
{assign var=sectionType value=$chdata.type}
{php}
global $smarty;
$opensec = $smarty->get_template_vars('opensec');
$sectionType= $smarty->get_template_vars('sectionType');
if ($sectionType == 's' or $sectionType == 'r') {
$sectionType = 0;
}
while ($opensec > $sectionType) {
--$opensec;
echo '</div>';
}
$smarty->assign('opensec', $opensec);
{/php}
{if $sectionType eq 's' or $sectionType eq 'r'}{assign var=sectionType value=0}{/if}
{if $opensec > $sectionType}
{assign var=m value=$opensec-$sectionType}
{section loop=$menu_channels name=close max=$m}
</div>
{/section}
{assign var=opensec value=$sectionType}
{/if}
{/if}
<div class="separator{$sep}">
......@@ -78,14 +73,10 @@ $smarty->assign('opensec', $opensec);
{/foreach}
{if $opensec > 0}
{php}
global $smarty;
$opensec = $smarty->get_template_vars('opensec');
while ($opensec) {
--$opensec;
echo '</div>';
}
{/php}
{section loop=$menu_channels name=close max=$opensec}
</div>
{/section}
{assign var=opensec value=0}
{/if}
{* --------------------Dynamic menus *}
......
......@@ -122,12 +122,9 @@
<tr>
<td>
<small>
<a class="link" href="tiki-view_blog_post.php?blogId={$blogId}&amp;postId={$listpages[ix].postId}">
{tr}Permalink{/tr}
</a>
<a class="link" href="tiki-view_blog_post.php?blogId={$blogId}&amp;postId={$listpages[ix].postId}">{tr}Permalink{/tr}</a>
{if $allow_comments eq 'y' and $prefs.feature_blogposts_comments eq 'y'}
{$listpages[ix].comments} {tr}comments{/tr}
[<a class="link" href="tiki-view_blog_post.php?find={$find}&amp;blogId={$blogId}&amp;offset={$offset}&amp;sort_mode={$sort_mode}&amp;postId={$listpages[ix].postId}&amp;show_comments=1">{tr}View Comments{/tr}</a>]
<a class="link" href="tiki-view_blog_post.php?find={$find}&amp;blogId={$blogId}&amp;offset={$offset}&amp;sort_mode={$sort_mode}&amp;postId={$listpages[ix].postId}&amp;show_comments=1">{$listpages[ix].comments} {tr}comments{/tr}</a>
{/if}
</small>
</td>
......
......@@ -60,7 +60,12 @@
<tr><td>
<small>
<a class="link" href="tiki-view_blog_post.php?blogId={$blogId}&amp;postId={$postId}">{tr}Permalink{/tr}</a>
({tr}referenced by{/tr}: {$post_info.trackbacks_from_count} {tr}Posts{/tr} {tr}references{/tr}: {$post_info.trackbacks_to_count} {tr}Posts{/tr})
{if $post_info.trackbacks_from_count}
({tr}referenced by{/tr}: {$post_info.trackbacks_from_count}
{/if}
{if $post_info.trackbacks_to_count}
{tr}Posts{/tr} {tr}references{/tr}: {$post_info.trackbacks_to_count} {tr}Posts{/tr})
{/if}
{if $allow_comments eq 'y' and $prefs.feature_blogposts_comments eq 'y'}
{$listpages[ix].comments} {tr}comments{/tr}
[<a class="link" href="tiki-view_blog_post.php?find={$find}&amp;blogId={$blogId}&amp;offset={$offset}&amp;sort_mode={$sort_mode}&amp;postId={$listpages[ix].postId}">{tr}View Comments{/tr}</a>]
......
......@@ -29,8 +29,8 @@ if ($output["data"]=="EMPTY") {
$desc = (!empty($desc_rss_file_galleries)) ? $desc_rss_file_galleries : tra("Last files uploaded to the file galleries.");
$id = "fileId";
$descId = "description";
$dateId = "lastModif";
$authorId = "user";
$dateId = "lastmodif";
$authorId = "lastModifUser";
$titleId = "filename";
$readrepl = "tiki-download_file.php?$id=%s";
......
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