Commit 070069f9 authored by sylvieg's avatar sylvieg

bad merge

parent 90eacb0e
{* $Header: /cvsroot/tikiwiki/tiki/templates/find.tpl,v 1.3 2007-03-21 19:44:04 sylvieg Exp $ *}
{* $Header: /cvsroot/tikiwiki/tiki/templates/find.tpl,v 1.4 2007-03-21 20:19:48 sylvieg Exp $ *}
<div align="center">
<form method="post" action="{$smarty.server.PHP_SELF}">
......@@ -59,7 +59,7 @@
</td>
{/if}
<td class="findtitle">{tr}Number of lines{/tr}</td><td class="findtitle"><input type="text" name="numrows" value="{$maxRecords|escape}" size="3" /></td>
<td class="findtitle">{tr}Number of lines{/tr}</td><td class="findtitle"><input type="text" name="maxRecords" value="{$maxRecords|escape}" size="3" /></td>
<td class="findtitle"><input type="submit" name="search" value="{tr}find{/tr}" /></td>
</tr>
......
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-listpages.tpl,v 1.45 2007-03-21 19:21:44 sylvieg Exp $ *}
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-listpages.tpl,v 1.46 2007-03-21 20:19:48 sylvieg Exp $ *}
<h1><a href="tiki-listpages.php" class="pagetitle">{tr}Pages{/tr}</a></h1>
{if $tiki_p_admin eq 'y'}
......@@ -11,6 +11,7 @@
<input type="hidden" name="offset" value="{$offset|escape}" />
<input type="hidden" name="sort_mode" value="{$sort_mode|escape}" />
<input type="hidden" name="find" value="{$find|escape}" />
{if !empty($maxRecords)}<input type="hidden" name="maxRecords" value="{$maxRecords}" />{/if}
</form>
<div id="tiki-listpages-content">
......
This diff is collapsed.
<?php
// $Header: /cvsroot/tikiwiki/tiki/tiki-list_articles.php,v 1.31 2007-03-21 19:21:39 sylvieg Exp $
// $Header: /cvsroot/tikiwiki/tiki/tiki-list_articles.php,v 1.32 2007-03-21 20:19:48 sylvieg Exp $
// 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.
......@@ -19,22 +19,13 @@ if ($feature_articles != 'y') {
die;
}
/*
if($feature_listPages != 'y') {
$smarty->assign('msg',tra("This feature is disabled"));
$smarty->display("error.tpl");
die;
}
*/
/*
// Now check permissions to access this page
if($tiki_p_view != 'y') {
if($tiki_p_read_article != 'y') {
$smarty->assign('msg',tra("Permission denied you cannot view pages"));
$smarty->display("error.tpl");
die;
}
*/
if (isset($_REQUEST["remove"])) {
if ($tiki_p_remove_article != 'y') {
......@@ -72,8 +63,11 @@ if (!isset($_REQUEST["offset"])) {
} else {
$offset = $_REQUEST["offset"];
}
$smarty->assign_by_ref('offset', $offset);
if (!empty($_REQUEST['maxRecords'])) {
$maxRecords = $_REQUEST['maxRecords'];
$smarty->assign('maxRecords', $maxRecords);
}
if( ($tiki_p_admin == 'y') || ($tiki_p_admin_cms == 'y') ) {
$pdate = '';
......@@ -122,7 +116,7 @@ $visible_only='y';
if( ($tiki_p_admin == 'y') || ($tiki_p_admin_cms == 'y') ) { $visible_only="n"; }
// Get a list of last changes to the Wiki database
$listpages = $tikilib->list_articles($offset, $maxRecords, $sort_mode, $find, $pdate, $user, $_REQUEST["type"], $_REQUEST["topic"], $visible_only, '', $_REQUEST["categId"], $_REQUEST['lang']);
$listpages = $tikilib->list_articles($offset, $maxRecords, $sort_mode, $find, $pdate, $user, $_REQUEST["type"], $_REQUEST["topic"], $visible_only, '', $_REQUEST["categId"], '', '', $_REQUEST['lang']);
// If there're more records then assign next_offset
$cant_pages = ceil($listpages["cant"] / $maxRecords);
$smarty->assign_by_ref('cant_pages', $cant_pages);
......@@ -154,6 +148,13 @@ if ($feature_categories == 'y') {
$categories = $categlib->get_all_categories_ext();
$smarty->assign_by_ref('categories', $categories);
}
if ($feature_multilingual == 'y') {
$languages = array();
$languages = $tikilib->list_languages(false, 'y');
$smarty->assign_by_ref('languages', $languages);
$avls = unserialize($tikilib->get_preference("available_languages"));
$smarty->assign_by_ref('available_languages', $avls);
}
include_once ('tiki-section_options.php');
......
<?php
// $Header: /cvsroot/tikiwiki/tiki/tiki-listpages.php,v 1.40 2007-03-21 19:46:50 sylvieg Exp $
// $Header: /cvsroot/tikiwiki/tiki/tiki-listpages.php,v 1.41 2007-03-21 20:19:48 sylvieg Exp $
// 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.
......@@ -98,10 +98,10 @@ if ( ! empty($multiprint_pages) ) {
// for the information as the number of
// days to get in the log 1,3,4,etc
// it will default to 1 recovering information for today
if (isset($_REQUEST["numrows"])) {
$maxRecords = $_REQUEST["numrows"];
if (isset($_REQUEST['maxRecords'])) {
$maxRecords = $_REQUEST['maxRecords'];
$smarty->assign('maxRecords', $maxRecords);
}
$smarty->assign('maxRecords', $maxRecords);
if (!isset($_REQUEST["sort_mode"])) {
......
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