Commit 953ec4db authored by redflo's avatar redflo

weekly merge from BRANCH-1-8 to HEAD

parent f3cfefa0
......@@ -1353,6 +1353,7 @@ tiki/img/icons/admin_maps.png -text
tiki/img/icons/admin_metatags.png -text
tiki/img/icons/admin_polls.png -text
tiki/img/icons/admin_rss.png -text
tiki/img/icons/admin_search.png -text
tiki/img/icons/admin_sections.png -text
tiki/img/icons/admin_trackers.png -text
tiki/img/icons/admin_userfiles.png -text
......@@ -3496,6 +3497,7 @@ tiki/templates/tiki-admin-include-maps.tpl -text
tiki/templates/tiki-admin-include-metatags.tpl -text
tiki/templates/tiki-admin-include-polls.tpl -text
tiki/templates/tiki-admin-include-rss.tpl -text
tiki/templates/tiki-admin-include-search.tpl -text
tiki/templates/tiki-admin-include-trackers.tpl -text
tiki/templates/tiki-admin-include-userfiles.tpl -text
tiki/templates/tiki-admin-include-webmail.tpl -text
......@@ -3836,6 +3838,7 @@ tiki/tiki-admin_include_maps.php -text
tiki/tiki-admin_include_metatags.php -text
tiki/tiki-admin_include_polls.php -text
tiki/tiki-admin_include_rss.php -text
tiki/tiki-admin_include_search.php -text
tiki/tiki-admin_include_trackers.php -text
tiki/tiki-admin_include_userfiles.php -text
tiki/tiki-admin_include_webmail.php -text
......@@ -4069,6 +4072,7 @@ tiki/tiki-removepage.php -text
tiki/tiki-rename_page.php -text
tiki/tiki-rollback.php -text
tiki/tiki-rss.php -text
tiki/tiki-rss_error.php -text
tiki/tiki-rss_readcache.php -text
tiki/tiki-search_stats.php -text
tiki/tiki-searchindex.php -text
......
......@@ -4065,6 +4065,12 @@ INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('rss_image_gallery','n')
INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('rss_wiki','y');
INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('sender_email','');
INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('email_encoding','utf-8');
INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('search_refresh_rate','5');
INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('search_min_wordlength','3');
INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('search_max_syllwords','100');
INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('search_lru_purge_rate','5');
INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('search_lru_length','100');
INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('search_syll_age','48');
INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('short_date_format','%a %d of %b, %Y');
INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('short_time_format','%H:%M %Z');
INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('shoutbox_autolink','n');
......
......@@ -6175,6 +6175,24 @@ INSERT INTO "tiki_preferences" ("name","value") VALUES ('sender_email','');
INSERT INTO "tiki_preferences" ("name","value") VALUES ('email_encoding','utf-8');
INSERT INTO "tiki_preferences" ("name","value") VALUES ('search_refresh_rate','5');
INSERT INTO "tiki_preferences" ("name","value") VALUES ('search_min_wordlength','3');
INSERT INTO "tiki_preferences" ("name","value") VALUES ('search_max_syllwords','100');
INSERT INTO "tiki_preferences" ("name","value") VALUES ('search_lru_purge_rate','5');
INSERT INTO "tiki_preferences" ("name","value") VALUES ('search_lru_length','100');
INSERT INTO "tiki_preferences" ("name","value") VALUES ('search_syll_age','48');
INSERT INTO "tiki_preferences" ("name","value") VALUES ('short_date_format','%a %d of %b, %Y');
......
......@@ -6018,6 +6018,24 @@ INSERT INTO "tiki_preferences" ("name","value") VALUES ('sender_email','');
INSERT INTO "tiki_preferences" ("name","value") VALUES ('email_encoding','utf-8');
INSERT INTO "tiki_preferences" ("name","value") VALUES ('search_refresh_rate','5');
INSERT INTO "tiki_preferences" ("name","value") VALUES ('search_min_wordlength','3');
INSERT INTO "tiki_preferences" ("name","value") VALUES ('search_max_syllwords','100');
INSERT INTO "tiki_preferences" ("name","value") VALUES ('search_lru_purge_rate','5');
INSERT INTO "tiki_preferences" ("name","value") VALUES ('search_lru_length','100');
INSERT INTO "tiki_preferences" ("name","value") VALUES ('search_syll_age','48');
INSERT INTO "tiki_preferences" ("name","value") VALUES ('short_date_format','%a %d of %b, %Y');
......
......@@ -6018,6 +6018,24 @@ INSERT INTO "tiki_preferences" ("name","value") VALUES ('sender_email','');
INSERT INTO "tiki_preferences" ("name","value") VALUES ('email_encoding','utf-8');
INSERT INTO "tiki_preferences" ("name","value") VALUES ('search_refresh_rate','5');
INSERT INTO "tiki_preferences" ("name","value") VALUES ('search_min_wordlength','3');
INSERT INTO "tiki_preferences" ("name","value") VALUES ('search_max_syllwords','100');
INSERT INTO "tiki_preferences" ("name","value") VALUES ('search_lru_purge_rate','5');
INSERT INTO "tiki_preferences" ("name","value") VALUES ('search_lru_length','100');
INSERT INTO "tiki_preferences" ("name","value") VALUES ('search_syll_age','48');
INSERT INTO "tiki_preferences" ("name","value") VALUES ('short_date_format','%a %d of %b, %Y');
......
......@@ -7974,6 +7974,36 @@ go
INSERT INTO "tiki_preferences" ("name","value") VALUES ('search_refresh_rate','5')
go
INSERT INTO "tiki_preferences" ("name","value") VALUES ('search_min_wordlength','3')
go
INSERT INTO "tiki_preferences" ("name","value") VALUES ('search_max_syllwords','100')
go
INSERT INTO "tiki_preferences" ("name","value") VALUES ('search_lru_purge_rate','5')
go
INSERT INTO "tiki_preferences" ("name","value") VALUES ('search_lru_length','100')
go
INSERT INTO "tiki_preferences" ("name","value") VALUES ('search_syll_age','48')
go
INSERT INTO "tiki_preferences" ("name","value") VALUES ('short_date_format','%a %d of %b, %Y')
go
......
......@@ -65,6 +65,7 @@ if (file_exists($file)) {
if (preg_match('/^adodb$/i', $api_tiki)) {
TikiInit::prependIncludePath('lib/adodb');
TikiInit::prependIncludePath('lib/pear');
error_reporting (E_ALL); # show any error messages triggered
define('ADODB_FORCE_NULLS', 1);
define('ADODB_ASSOC_CASE', 2);
......
......@@ -4050,6 +4050,12 @@ INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('rss_image_gallery','n')
INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('rss_wiki','y');
INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('sender_email','');
INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('email_encoding','utf-8');
INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('search_refresh_rate','5');
INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('search_min_wordlength','3');
INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('search_max_syllwords','100');
INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('search_lru_purge_rate','5');
INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('search_lru_length','100');
INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('search_syll_age','48');
INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('short_date_format','%a %d of %b, %Y');
INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('short_time_format','%H:%M %Z');
INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('shoutbox_autolink','n');
......
# $Id: tiki_1.7to1.8.sql,v 1.101 2004-01-09 19:47:45 redflo Exp $
# $Id: tiki_1.7to1.8.sql,v 1.102 2004-01-15 09:56:27 redflo Exp $
# The following script will update a tiki database from verion 1.7 to 1.8
#
......@@ -383,18 +383,6 @@ ALTER TABLE `tiki_comments` ADD `comment_rating` TINYINT( 2 ) ;
CREATE INDEX `hash` on `tiki_comments`(`hash`);
CREATE INDEX `in_reply_to` on `tiki_comments`(`in_reply_to`);
# \todo rename to tiki_sessions
# \todo lower case these field names, postgres dislikes non-lowercase fields
# \todo remove UNSIGNED attribute, it is a mysql specific construct
CREATE TABLE /* IF NOT EXISTS */ sessions (
SESSKEY CHAR(32) NOT NULL,
EXPIRY INT(11) UNSIGNED NOT NULL,
DATA TEXT NOT NULL,
PRIMARY KEY (SESSKEY),
KEY (EXPIRY)
);
CREATE TABLE /* IF NOT EXISTS */ tiki_download (
id int(11) NOT NULL auto_increment,
object varchar(255) NOT NULL default '',
......@@ -407,7 +395,7 @@ CREATE TABLE /* IF NOT EXISTS */ tiki_download (
KEY userId (userId),
KEY type (type),
KEY date (date)
);
);
ALTER TABLE `tiki_pages` ADD `wiki_cache` int(10) default 0 AFTER `cache` ;
......@@ -578,15 +566,17 @@ CREATE TABLE tiki_searchindex(
#
# session stored in db
#
DROP TABLE IF EXISTS sessions;
CREATE TABLE sessions(
SESSKEY varchar(32) NOT NULL default '',
EXPIRY int(11) unsigned NOT NULL default '0',
SESSKEY char(32) NOT NULL,
EXPIRY int(11) unsigned NOT NULL,
EXPIREREF varchar(64),
DATA text NOT NULL,
PRIMARY KEY (SESSKEY),
KEY (EXPIRY)
PRIMARY KEY (SESSKEY),
KEY EXPIRY (EXPIRY)
) TYPE=MyISAM;
#
# Changing language code from 'sp' to 'es'
#
......@@ -885,8 +875,14 @@ CREATE TABLE tiki_searchsyllable(
# added on 2004-01-02 by xenfasa (typo in file name)
UPDATE tiki_menu_options set `url`='tiki-browse_categories.php' where `url`='tiki-categories.php';
#added 2004-01-07 sylvie (only because it is in tiki.sql)
ALTER TABLE `sessions`ADD `EXPIREREF` VARCHAR(64) AFTER `EXPIRY`;
# added on 2004-01-08 by Chealer9 (typo reported by xenfasa)
UPDATE tiki_menu_options set `url`='tiki-article_types.php' where `url`='tiki-articles_types.php';
# added on 2004-01-10 by redflo: new search settings for optimal tuning
INSERT /* IGNORE */ INTO tiki_preferences(name,value) VALUES ('search_refresh_rate','5');
INSERT /* IGNORE */ INTO tiki_preferences(name,value) VALUES ('search_min_wordlength','3');
INSERT /* IGNORE */ INTO tiki_preferences(name,value) VALUES ('search_max_syllwords','100');
INSERT /* IGNORE */ INTO tiki_preferences(name,value) VALUES ('search_lru_purge_rate','5');
INSERT /* IGNORE */ INTO tiki_preferences(name,value) VALUES ('search_lru_length','100');
INSERT /* IGNORE */ INTO tiki_preferences(name,value) VALUES ('search_syll_age','48');
# added on 2003-01-08 by Chealer9 (typo reported by xenfasa)
UPDATE tiki_menu_options set `url`='tiki-article_types.php' where `url`='tiki-articles_types.php';
\ No newline at end of file
......@@ -5,11 +5,11 @@ function refresh_search_index() {
session_write_close();
// check if we have to run. Run every n-th click:
$n=5; //todo: make it configurable
//$n=1; //debug
global $search_refresh_rate;
//$search_refresh_rate=1; //debug
list($usec, $sec) = explode(" ",microtime());
srand (ceil($sec+100*$usec));
if(rand(1,$n)==1) {
if(rand(1,$search_refresh_rate)==1) {
// get a random location
$locs=array();
global $feature_wiki;
......
......@@ -84,6 +84,9 @@ class SearchLib extends TikiLib {
}
function &refresh_lru_wordlist($syllable) {
global $search_max_syllwords;
global $search_lru_length;
global $search_lru_purge_rate;
// delete from wordlist and lru list
$this->query("delete from `tiki_searchwords` where `syllable`=?",array($syllable),-1,-1,false);
$this->query("delete from `tiki_searchsyllable` where `syllable`=?",array($syllable),-1,-1,false);
......@@ -91,7 +94,7 @@ class SearchLib extends TikiLib {
$ret=array();
$query="select `searchword`,sum(`count`) as `cnt` from `tiki_searchindex`
where `searchword` like ? group by `searchword` order by `cnt` desc";
$result=$this->query($query,array('%'.$syllable.'%'),100); // 100: how many different searchwords that contain the syllable are taken into account?. Sortet by number of occurences.
$result=$this->query($query,array('%'.$syllable.'%'),$search_max_syllwords); // search_max_syllwords: how many different searchwords that contain the syllable are taken into account?. Sortet by number of occurences.
while ($res = $result->fetchRow()) {
$ret[]=$res["searchword"];
}
......@@ -107,14 +110,13 @@ class SearchLib extends TikiLib {
// at random rate: check length of lru list and purge these that
// have not been used for long time. This is what a lru list
// basically does
$n=5; //todo: make it configurable
list($usec, $sec) = explode(" ",microtime());
srand (ceil($sec+100*$usec));
if(rand(1,$n)==1) {
if(rand(1,$search_lru_purge_rate)==1) {
$lrulength=$this->getOne("select count(*) from `tiki_searchsyllable`",array());
if ($lrulength > 100) { // only purge if lru list is long. todo: make configurable
if ($lrulength > $search_lru_length) { // only purge if lru list is long.
//purge oldest
$diff=$lrulength-100;
$diff=$lrulength-$search_lru_length;
$oldwords=array();
$query="select `syllable` from `tiki_searchsyllable` order by `lastUsed` asc";
$result=$this->query($query,array(),$diff);
......@@ -146,11 +148,12 @@ class SearchLib extends TikiLib {
function &get_wordlist_from_syllables($syllables) {
$ret=array();
global $search_syll_age;
foreach($syllables as $syllable) {
//Have a look at the lru list (tiki_searchsyllable)
$bindvars=array($syllable);
$age=time()-$this->getOne("select `lastUpdated` from `tiki_searchsyllable` where `syllable`=?",$bindvars);
if(!$age || $age>172800) {// older than 2 days. to be configured
if(!$age || $age>($search_syll_age*3600)) {// older than search_syll_age hours
$a=$this->refresh_lru_wordlist($syllable);
$ret=array_merge($ret,$a);
} else {
......@@ -359,9 +362,9 @@ class SearchLib extends TikiLib {
s.`page`=t.`itemId`";
$cant2=$this->getOne($querycant,$words);
while ($res = $result->fetchRow()) {
$href = "tiki-view_tracker_item.php?trackerId=".urlencode($res["tr"])."&itemId=".urlencode($res["pa"]);
$href = "tiki-view_tracker_item.php?trackerId=".urlencode($res["trackerId"])."&itemId=".urlencode($res["page"]);
$ret2[] = array(
'pageName' => $res["pa"],
'pageName' => $res["page"],
'location' => tra("Trackeritem"),
'data' => tra("Unknown"),
'hits' => tra("Unknown"),
......
......@@ -59,6 +59,8 @@ class StatsLib extends TikiLib {
$pageName = $res["pageName"];
$queryc = "select count(*) from `tiki_links` where `toPage`=?";
$cant = $this->getOne($queryc,array($pageName));
$queryc = "select count(*) from `tiki_structures` ts, `tiki_pages` tp where ts.`page_id`=tp.`page_id` and tp.`pageName`=?";
$cant += $this->getOne($queryc,array($pageName));
if ($cant == 0) {
$num_or++;
......
......@@ -2285,9 +2285,9 @@ function update_session($sessionId) {
$now = date("U");
$oldy = $now - (5 * 60);
if ($user) {
$this->query('delete from `tiki_sessions` where `user`=?', array($user), -1, -1, false);
$this->query("delete from `tiki_sessions` where `user`=?", array($user), -1, -1, false);
}
$this->query('delete from `tiki_sessions` where `sessionId`=?', array($sessionId), -1, -1, false);
$this->query("delete from `tiki_sessions` where `sessionId`=?", array($sessionId), -1, -1, false);
$query = "insert into `tiki_sessions`(`sessionId`,`timestamp`,`user`) values(?,?,?)";
$result = $this->query($query, array( $sessionId, (int)$now, $user));
$query = "delete from `tiki_sessions` where `timestamp`<?";
......
<?php
/*
* $Header: /cvsroot/tikiwiki/tiki/lib/wiki-plugins/wikiplugin_category.php,v 1.4 2003-09-08 14:52:23 sylvieg Exp $
* $Header: /cvsroot/tikiwiki/tiki/lib/wiki-plugins/wikiplugin_category.php,v 1.5 2004-01-15 09:56:28 redflo Exp $
*
* Tiki-Wiki CATEGORY plugin.
*
......@@ -207,7 +207,7 @@ function wikiplugin_category($data, $params) {
$out = $smarty->fetch("tiki-simple_plugin.tpl");
}
return $out;
return '~np~'.$out.'~/np~';
}
?>
\ No newline at end of file
......@@ -1232,7 +1232,6 @@ div.articletrailer {
margin-bottom: 20px;
font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
font-size: 11px;
width: 98%;
clear: both;
}
......
{* $Header: /cvsroot/tikiwiki/tiki/templates/module.tpl,v 1.3 2003-12-28 11:41:38 mose Exp $ *}
{* $Header: /cvsroot/tikiwiki/tiki/templates/module.tpl,v 1.4 2004-01-15 09:56:29 redflo Exp $ *}
{* Module layout with controls *}
<div class="box"><div class="box-title">
......@@ -17,9 +17,7 @@
<a title="{tr}Move module to opposite side{/tr}" href="{$current_location|escape}{$mpchar}mc_move={$module_name|escape}"><img src="img/icons2/admin_move.gif" border="0" /></a>
</td>
<td width="16">
&nbsp;&nbsp;<a title="{tr}Unassign this module{/tr}" href="{$current_location|escape}{$mpchar}mc_unassign={$module_name|escape}"
onclick="return confirmTheLink(this,'{tr}Are you sure you want to unassign this module?{/tr}')"
title="{tr}Click here to unassign this module{/tr}"><img border="0" alt="{tr}Remove{/tr}" src="img/icons2/delete.gif" /></a>&nbsp;&nbsp;
<a title="{tr}Unassign this module{/tr}" href="{$current_location|escape}{$mpchar}mc_unassign={$module_name|escape}" onclick="return confirmTheLink(this,'{tr}Are you sure you want to unassign this module?{/tr}')" title="{tr}Click here to unassign this module{/tr}"><img border="0" alt="{tr}Remove{/tr}" src="img/icons2/delete.gif" /></a>
</td>
</tr>
</table>
......
{* $Header: /cvsroot/tikiwiki/tiki/templates/modules/mod-top_images_th.tpl,v 1.10 2003-11-23 19:44:46 gmuslera Exp $ *}
{* $Header: /cvsroot/tikiwiki/tiki/templates/modules/mod-top_images_th.tpl,v 1.11 2004-01-15 09:56:29 redflo Exp $ *}
{if $feature_galleries eq 'y'}
{tikimodule title="{tr}Top Images{/tr}" name="top_images_th"}
......@@ -8,11 +8,11 @@
<tr>
<td align="center">
<a class="linkmodule" href="tiki-browse_image.php?imageId={$modTopImages[ix].imageId}">
<img alt="image" src="show_image.php?id={$modTopImages[ix].imageId}" height="50" width="90" />
<img alt="image" src="show_image.php?id={$modTopImages[ix].imageId}&amp;thumb=1" />
</a>
</td></tr>
</table>
{/if}
{/section}
{/tikimodule}
{/if}
{/if}
\ No newline at end of file
......@@ -164,10 +164,10 @@
{/if}
{if $feature_wiki_comments eq 'y' and $show_page eq 'y'}
<span class="tabbut"><a href="javascript:flip('comzone{if $comments_show eq 'y'}open{/if}');" class="tablink">{if $comments_cant eq 0}{tr}comment{/tr}{elseif $comments_cant eq 1}1 {tr}comment{/tr}{else}{$comments_cant} {tr}comments{/tr}{/if}</a></span>
<span class="tabbut"><a href="javascript:document.location='#comments';flip('comzone{if $comments_show eq 'y'}open{/if}');" class="tablink">{if $comments_cant eq 0}{tr}comment{/tr}{elseif $comments_cant eq 1}1 {tr}comment{/tr}{else}{$comments_cant} {tr}comments{/tr}{/if}</a></span>
{/if}
{if $feature_wiki_attachments eq 'y' and $show_page eq 'y'}
<span class="tabbut"><a href="javascript:flip('attzone{if $atts_show eq 'y'}open{/if}');" class="tablink">{if $atts_count eq 0}{tr}attach file{/tr}{elseif $atts_count eq 1}1 {tr}attachment{/tr}{else}{$atts_count} {tr}attachments{/tr}{/if}</a></span>
<span class="tabbut"><a href="javascript:document.location='#attachments';flip('attzone{if $atts_show eq 'y'}open{/if}');" class="tablink">{if $atts_count eq 0}{tr}attach file{/tr}{elseif $atts_count eq 1}1 {tr}attachment{/tr}{else}{$atts_count} {tr}attachments{/tr}{/if}</a></span>
{/if}
{/if}
......@@ -267,6 +267,7 @@
<br />
{if $feature_wiki_attachments eq 'y'}
{if $tiki_p_wiki_view_attachments eq 'y' or $tiki_p_wiki_admin_attachments eq 'y'}
<a name="attachments"></a>
<div id="attzone">
<table class="normal">
<tr>
......
{tr}This is{/tr} Tiki v1.9CVS (c)2002-2003 {tr}by the{/tr} Tiki community. {$smarty.now|tiki_short_datetime}
{tr}This is{/tr} Tiki v1.9CVS (c)2002-2004 {tr}by the{/tr} Tiki community. {$smarty.now|tiki_short_datetime}
......@@ -136,16 +136,16 @@
{if $show_page eq 'y'}
<span class="tabbut">
{if $comments_cant > 0}
<a href="javascript:flip('comzone{if $comments_show eq 'y'}open{/if}');" class="tablink" style="background: #FFAAAA">{if $comments_cant eq 1}1 {tr}comment{/tr}{else}{$comments_cant} {tr}comments{/tr}{/if}</a></span>
<a href="javascript:document.location='#comments';flip('comzone{if $comments_show eq 'y'}open{/if}');" class="tablink" style="background: #FFAAAA">{if $comments_cant eq 1}1 {tr}comment{/tr}{else}{$comments_cant} {tr}comments{/tr}{/if}</a></span>
{else}
<a href="javascript:flip('comzone{if $comments_show eq 'y'}open{/if}');" class="tablink">{tr}comment{/tr}</a></span>
<a href="javascript:document.location='#comments';flip('comzone{if $comments_show eq 'y'}open{/if}');" class="tablink">{tr}comment{/tr}</a></span>
{/if}
{/if}
{/if}
{if $print_page ne 'y'}
{if $feature_wiki_attachments eq 'y' and $show_page eq 'y'}
<span class="tabbut"><a href="javascript:flip('attzone{if $atts_show eq 'y'}open{/if}');" class="tablink">{if $atts_count eq 0}{tr}attach file{/tr}{elseif $atts_count eq 1}1 {tr}attachment{/tr}{else}{$atts_count} {tr}attachments{/tr}{/if}</a></span>
<span class="tabbut"><a href="javascript:document.location='#attachments';flip('attzone{if $atts_show eq 'y'}open{/if}');" class="tablink">{if $atts_count eq 0}{tr}attach file{/tr}{elseif $atts_count eq 1}1 {tr}attachment{/tr}{else}{$atts_count} {tr}attachments{/tr}{/if}</a></span>
{/if}
{/if}
</div>
......@@ -220,6 +220,7 @@
<br />
{if $feature_wiki_attachments eq 'y'}
{if $tiki_p_wiki_view_attachments eq 'y' or $tiki_p_wiki_admin_attachments eq 'y'}
<a name="attachments"></a>
<div id="attzone">
<table class="normal">
<tr>
......
......@@ -34,3 +34,5 @@
src='img/icons/admin_maps.png' alt='{tr}Maps{/tr}' /></a>
<a href="tiki-admin.php?page=metatags" title="{tr}Meta Tags{/tr}" class="link"><img border='0'
src='img/icons/admin_metatags.png' alt='{tr}Meta Tags{/tr}' /></a>
<a href="tiki-admin.php?page=search" title="{tr}Search{/tr}" class="link"><img border='0'
src='img/icons/admin_search.png' alt='{tr}Search{/tr}' /></a>
......@@ -64,6 +64,9 @@
<td style="text-align:center;"><a href="tiki-admin.php?page=metatags"
class="link"><img border='0' src='img/icons/admin_metatags.png'
alt='icon' /><br/>{tr}Meta Tags{/tr}</a></td>
<td style="text-align:center;"><a href="tiki-admin.php?page=search"
class="link"><img border='0' src='img/icons/admin_search.png'
alt='icon' /><br/>{tr}Search{/tr}</a></td>
</tr></table>
</div>
</div>
<div class="cbox">
<div class="cbox-title">{tr}Search settings{/tr}</div>
<div class"cbox-data">
<div class="simplebox">
{tr}Settings for searching content{/tr}<br />
<form action="tiki-admin.php?page=search" method="post">
<table class="admin"><tr>
<td class="form"><label for="search-refresh">{tr}Search refresh rate{/tr}:</label></td>
<td><input size="5" type="text" name="search_refresh_rate" id="search-refresh"
value="{$search_refresh_rate|escape}" /></td>
</tr><tr>
<td class="form"><label for="search-min_length">{tr}Minimum length of search word{/tr}: </label></td>
<td><input size="5" type="text" name="search_min_wordlength" id="search-min_length"
value="{$search_min_wordlength|escape}" /></td>
</tr><tr>
<td class="form"><label for="search-max_words">{tr}Max. number of words containing a syllable{/tr}: </label></td>
<td><input size="5" type="text" name="search_max_syllwords" id="search-max_words"
value="{$search_max_syllwords|escape}" /></td>
</tr><tr>
<td class="form"><label for="search-cache_age">{tr}Max. age in hours of syllable search cache{/tr}: </label></td>
<td><input size="5" type="text" name="search_syll_age" id="search-cache_age"
value="{$search_syll_age|escape}" /></td>
</tr><tr>
<td class="form"><label for="search-purge">{tr}LRU list purging rate{/tr}: </label></td>
<td><input size="5" type="text" name="search_lru_purge_rate" id="search-purge"
value="{$search_lru_purge_rate|escape}" /></td>
</tr><tr>
<td class="form"><label for="search-list_length">{tr}LRU list length{/tr}: </label></td>
<td><input size="5" type="text" name="search_lru_length" id="search-list_length"
value="{$search_lru_length|escape}" /></td>
</tr><tr>
<td colspan="2" class="button"><input type="submit" name="searchprefs"
value="{tr}Change preferences{/tr}" /></td>
</tr></table>
</form>
</div>
</div>
</div>
\ No newline at end of file
......@@ -7,7 +7,7 @@
{* The rest determines which page to include using "page" GET parameter. Default : list-sections
Add a value in first check when you create a new admin page. *}
{if in_array($smarty.get.page, array("features", "general", "login", "wiki", "gal", "fgal", "cms",
"polls", "polls", "blogs", "forums", "faqs", "trackers", "webmail", "rss", "directory", "userfiles", "maps", "metatags"))}
"polls", "search", "blogs", "forums", "faqs", "trackers", "webmail", "rss", "directory", "userfiles", "maps", "metatags"))}
{assign var="include" value=$smarty.get.page}
{else}
{assign var="include" value="list-sections"}
......
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-admin_categories.tpl,v 1.17 2004-01-09 19:47:48 redflo Exp $ *}
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-admin_categories.tpl,v 1.18 2004-01-15 09:56:29 redflo Exp $ *}
<a class="pagetitle" href="tiki-admin_categories.php">{tr}Admin categories{/tr}</a>
......@@ -122,15 +122,15 @@
<tr>
<td class="heading"><a class="tableheading" href="tiki-admin_categories.php?parentId={$parentId}&amp;offset={$offset}&amp;sort_mode={if $sort_mode eq 'name_desc'}name_asc{else}name_desc{/if}">{tr}name{/tr}</a></td>
<td class="heading"><a class="tableheading" href="tiki-admin_categories.php?parentId={$parentId}&amp;offset={$offset}&amp;sort_mode={if $sort_mode eq 'type_desc'}type_asc{else}type_desc{/if}">{tr}type{/tr}</a></td>
<td class="heading">&nbsp;</td>
<td class="heading">{tr}delete{/tr}</td>
</tr>
{section name=ix loop=$objects}
<tr>
<td class="even"><a class="link" href="{$objects[ix].href}" title="{$objects[ix].name}">{$objects[ix].name|truncate:25:"(...)":true}</a></td>
<td class="even">{$objects[ix].type}</td>
<td class="even">[<a class="link" href="tiki-admin_categories.php?parentId={$parentId}&amp;removeObject={$objects[ix].catObjectId}&amp;fromCateg={$parentId}">
onclick="return confirmTheLink(this,'{tr}Are you sure you want to delete this category?{/tr}')"
title="{tr}Click here to delete this category{/tr}"><img alt="{tr}Remove{/tr}" src="img/icons2/delete2.gif" /></a>]</td>
<td class="even"><a class="link" href="tiki-admin_categories.php?parentId={$parentId}&amp;removeObject={$objects[ix].catObjectId}&amp;fromCateg={$parentId}" title="{tr}Delete item from category?{/tr}">
<!--onclick="return confirmTheLink(this,'{tr}Are you sure you want to delete this category?{/tr}')"-->
<img alt="{tr}Remove{/tr}" src="img/icons2/delete2.gif" /></a></td>
</tr>
{/section}
</table>
......
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-admin_integrator.tpl,v 1.19 2004-01-09 19:47:48 redflo Exp $ *}
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-admin_integrator.tpl,v 1.20 2004-01-15 09:56:29 redflo Exp $ *}
{if $repID > 0}
<h2>{tr}Edit Repository:{/tr} {$name}</h2>
......@@ -93,7 +93,7 @@
</a>
&nbsp;&nbsp;<a href="tiki-admin_integrator.php?action=rm&amp;repID={$repositories[rep].repID|escape}"
onclick="return confirmTheLink(this,'{tr}Are you sure you want to delete this repository?{/tr}')"
title="{tr}Click here to delete this repository{/tr}"><img alt="{tr}Remove{/tr}" src="img/icons2/delete.gif" /></a>&nbsp;&nbsp;
title="{tr}Click here to delete this repository{/tr}"><img alt="{tr}Remove{/tr}" src="img/icons2/delete.gif" border="0" /></a>&nbsp;&nbsp;
</td>
{* Show description as colspaned row if it is not an empty *}
......@@ -104,4 +104,4 @@ title="{tr}Click here to delete this repository{/tr}"><img alt="{tr}Remove{/tr}"
</tr>
{/section}
</table>
<br /><br />
\ No newline at end of file
<br /><br />
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-admingroups.tpl,v 1.27 2004-01-15 08:55:21 mose Exp $ *}
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-admingroups.tpl,v 1.28 2004-01-15 09:56:29 redflo Exp $ *}
{popup_init src="lib/overlib.js"}
<a class="pagetitle" href="tiki-admingroups.php">{tr}Admin groups{/tr}</a>
......
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-adminusers.tpl,v 1.31 2004-01-15 08:56:28 mose Exp $ *}
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-adminusers.tpl,v 1.32 2004-01-15 09:56:29 redflo Exp $ *}
<a href="tiki-adminusers.php" class="pagetitle">{tr}Admin users{/tr}</a>
......
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-article_types.tpl,v 1.12 2004-01-02 23:19:29 mose Exp $ *}
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-article_types.tpl,v 1.13 2004-01-15 09:56:29 redflo Exp $ *}
<a class="pagetitle" href="tiki-article_types.php">{tr}Admin Article Types{/tr}</a>
......@@ -33,23 +33,23 @@
<h3>{tr}List of types{/tr}</h3>
<form enctype="multipart/form-data" action="tiki-article_types.php" method="post">
<table class="normal">
<tr>
<td class="heading">{tr}Name{/tr}</td>
<td class="heading">{tr}Rate{/tr}</td>
<td class="heading">{tr}Show before publish date{/tr}</td>
<td class="heading">{tr}Show after expire date{/tr}</td>
<td class="heading">{tr}Heading only{/tr}</td>
<td class="heading">{tr}Comments{/tr}</td>
<td class="heading">{tr}Comment Can Rate Article{/tr}</td>
<td class="heading">{tr}Show image{/tr}</td>
<td class="heading">{tr}Show avatar{/tr}</td>
<td class="heading">{tr}Show author{/tr}</td>
<td class="heading">{tr}Show publish date{/tr}</td>
<td class="heading">{tr}Show expire date{/tr}</td>
<td class="heading">{tr}Show reads{/tr}</td>
<td class="heading">{tr}Show size{/tr}</td>
<td class="heading">{tr}Creator can edit{/tr}</td>
<td class="heading">{tr}# Articles / Delete{/tr}</td>
<tr class="heading">
<td>{tr}Name{/tr}</td>
<td>{tr}Rate{/tr}</td>
<td>{tr}Show before publish date{/tr}</td>
<td>{tr}Show after expire date{/tr}</td>
<td>{tr}Heading only{/tr}</td>
<td>{tr}Comments{/tr}</td>
<td>{tr}Comment Can Rate Article{/tr}</td>
<td>{tr}Show image{/tr}</td>
<td>{tr}Show avatar{/tr}</td>
<td>{tr}Show author{/tr}</td>
<td>{tr}Show publish date{/tr}</td>
<td>{tr}Show expire date{/tr}</td>
<td>{tr}Show reads{/tr}</td>
<td>{tr}Show size{/tr}</td>
<td>{tr}Creator can edit{/tr}</td>
<td>{tr}Delete{/tr}</td>
</tr>
{cycle print=false values="even,odd"}
{section name=user loop=$types}
......@@ -87,4 +87,4 @@
<br />
<input type="text" name="new_type" /><input type="submit" name="add_type" value="{tr}Create a new type{/tr}" />
</form>
</form>
\ No newline at end of file
......@@ -61,7 +61,8 @@
<a class="gallink" href="tiki-edit_image.php?galleryId={$galleryId}&amp;edit={$images[idx].imageId}" title="{tr}edit{/tr}"><img src='img/icons2/admin_move.gif' border='0' alt='{tr}edit{/tr}' title='{tr}edit{/tr}' /></a>
{/if}
{assign var=desp value=$smarty.section.idx.index}
<a {jspopup href="tiki-browse_image.php?galleryId=$galleryId&amp;sort_mode=$sort_mode&amp;desp=$desp&amp;offset=$offset&amp;imageId=$images[idx].imageId&amp;popup=1"} class="gallink"><img src='img/icons2/admin_unhide.gif' border='0' alt='{tr}popup{/tr}' title='{tr}popup{/tr}' /></a>
{assign var=THEimageId value=$images[idx].imageId}