Commit 8eb94e4a authored by redflo's avatar redflo

merged to head. check your latest changes!

parent 80af67d9
......@@ -374,6 +374,7 @@ tiki/db/tiki_sybase.sql -text
tiki/display_banner.php -text
tiki/doc/devtools/README.txt -text
tiki/doc/devtools/lastcvs.sh -text
tiki/doc/devtools/tikirelease.sh -text
tiki/doc/devtools/tikiwiki.spec -text
tiki/doc/htaccess -text
tiki/doc/htaccess.readme -text
......
......@@ -7,6 +7,7 @@ tiki/img/wiki_up/*
tiki/lib/Galaxia/processes/*
tiki/modules/cache
tiki/modules/cache/*
tiki/phpmyadmin
tiki/temp/dbg-watch.*
tiki/templates_c
tiki/templates_c/%%*
......
......@@ -3,3 +3,4 @@ templates_c
var
.project
.htaccess
phpmyadmin
......@@ -12,7 +12,7 @@ DOCUMENTATION
documentation, in pdf format (350 pages) (outdated at the time of this writing):
http://tikiwiki.org/tiki.pdf
* details about the 1.7 release are at http://tikiwiki.org/ReleaseNotes17
* details about the 1.7.1.1 release are at http://tikiwiki.org/ReleaseNotes171
* TikiWiki is also a live community on irc.freenode.net channel #tikiwiki
......
......@@ -8,6 +8,59 @@ Version 1.8 --
* [NEW] Added Real-time IRC (Internet Relay Chat) logging
Version 1.7.1.1 -Eta Carinae-
* [FIX] fixed a blocking bug that prevents wiki pages from being saved in some cases
Version 1.7.1 -Eta Carinae-
<http://tikiwiki.org/ReleaseProcess171>
* [FIX] fixed bug where special chars in site search resulted in warning notices
* [FIX] fixed smtp error on tiki-webmail.php
* [NEW] language : ru, nl, da and de updated
* [FIX] fixed bug with undefined variable and bugged form when creating a calendar
* [FIX] fixed bug where users could not create file galleries even when granted tiki_p_create_file_galleries
* [FIX] fixed bug where wiki quicklinks and quickhelp don't correspond to the wiki table syntax setting
* [FIX] fixed 'quote' bug in debugger console command line
* [FIX] fixed email-validator in case servers disallow identical FROM and TO addresses which may have prevented some users from registering
* [FIX] the page description in category page will stay the page description (instead of the page data) after updating the page
* [FIX] themes list is now sorted
* [FIX] fixed bug where browsing to forum threads using the forum modules results in errors on subsequent forum actions
* [NEW] updated to stable and official HAWHAW V5.1
* [FIX] fixed bug where the lastLogin and currentLogin time stored in Tiki DB are always the same, the currentLogin time
* [FIX] page names will now keeps the original capitalization even if linked to with another kind of capitalization
* [FIX] inserted a lot of spaces to help give the site a consistant look
* [FIX] fixed bug where hotwords at the beginning of a line don't work; fixed other strange behaviors
* [FIX] allow user to confirm his email and bypass validation in case the mail server does not work with Tiki's validation methods
* [FIX] fixed bug where user information and data was left in a dozen DB tables after the user is deleted
* [FIX] fixed some Galaxia graphing problems due to typo's: /Processes/ should be /processes/
* [FIX] fixed comments and attachment styles in geo and trollparty themes
* [FIX] fixed display of categories in select : it now displays the full path
* [FIX] fixed bug where SSL login sends user to a bad URL if tikiIndex is more than just a filename on the same Tiki site
* [FIX] fixed bug where games did not load in tiki-list_games.php
* [FIX] fixed a blocking bug occuring with Galaxia and php prior to 4.2
* [FIX] fixed bug where auth failed when !$userTikiPresent && $userAuthPresent; should be !$userTikiPresent && !$userAuthPresent
* [FIX] fixed bug where user cannot be created in Tiki even if authenticated via LDAP
* [FIX] fixed bug with ext link caching when URL contains parameters
* [FIX] fixed challenge/response auth; user now has to input their email; quick hack until tiki auth is overhauled for 1.8
* [FIX] fixed bug where tiki-user_information.php?view_user=smith shows your personal theme rather than site theme if smith has not set a theme
* [FIX] fixed PDF remove page bug
* [FIX] fixed bug in img gal where thumbnails are not created when extensions are written in captial letters
* [FIX] fixed bug where stylesheet is not used for blog_rss
* [FIX] forum moderator and reply action toolbars are hidden if there are no replies
* [FIX] performing moderator actions without selecting any replies no longer results in errors
* [FIX] fixed broken filter function in Galaxia/workflow
* [FIX] fixed erratic behavior of hotwords
* [FIX] hotwords now take precedence over WikiWord? links
* [FIX] Tiki no longer tries to cache URLs containing some common binary file extensions
* [FIX] fixed bug where tiki was not displaying 'random_image' modules
* [FIX] fixed bug where wiki edit preview screws up html special chars
* [FIX] fixed bug "forum rss feed is a security hole", fixed for all rss feeds
* [FIX] fixed bug "Tiki Forum RSS: Faulty tiki-forums_rss.php"
* [FIX] fixed bug with wiki plugin parameter syntax => being encoded
* [NEW] added TikiHelp? links to many pages
Version 1.7 -Eta Carinae-
<http://tikiwiki.org/tiki-index.php?page=ReleaseProcess1.7>
......@@ -251,6 +304,7 @@ Version 1.7 -Eta Carinae-
http://ex.com/tiki-index.php?page=HomePage => http://ex.com/HomePage,
http://ex.com/tiki-view_blog.php?blogId=1 => http://ex.com/blog/1, etc.
Version 1.6 -Tau Ceti-
* [NEW] Install script added, unzip the files and point your browser to
......
#!/bin/sh
# $Id: tikirelease.sh,v 1.2 2003-08-21 00:51:21 redflo Exp $
# TODO
# - put release number as variable
# - add a chown / chmod before tarball
VER="1.7"
RELTAG="REL-1-7"
#RELTAG="release_eta_carinea_rc1"
CVSROOT=":ext:[email protected]:/cvsroot/tikiwiki"
WORKDIR="/home/mose/tikipack"
OLDIR=`pwd`
cd $WORKDIR
mkdir $VER
cd $VER
cvs -z3 -q -d $CVSROOT co -d tikiwiki_$VER -r $RELTAG tiki
find tikiwiki_$VER -name CVS -type d | xargs -- rm -rf
find tikiwiki_$VER -name .cvsignore -type f -exec rm -f {} \;
find tikiwiki_$VER -name Thumbs.db -exec rm -f {} \;
rm -rf tikilight_$VER/tests
tar -czf tikiwiki_$VER.tar.gz tikiwiki_$VER
tar --bzip2 -cf tikiwiki_$VER.tar.bz2 tikiwiki_$VER
#cp -rp tikiwiki_$VER tikilight_$VER
#find tikilight_$VER/img/avatars/ -type f -name '*.gif' | grep -v 000 | xargs -- rm -f
#rm -rf tikilight_$VER/img/custom
#find tikilight_$VER/lang -type f -name language.php | grep -v "/en/" | xargs -- rm -rf
#rm -rf tikilight_$VER/lib/Galaxia/docs
#rm -rf tikilight_$VER/calendar/iCal
#rm -rf tikilight_$VER/lib/pear/SOAP/example
#find tikilight_$VER/lib/pdflib/fonts -type f -name "*.afm" | grep -v php_Helvetica | grep -v php_Courier | xargs -- rm -f
#find tikilight_$VER/templates/styles/* -type d | grep -v elegant | grep -v moreneat | xargs -- rm -rf
#find tikilight_$VER/styles/* -type d | grep -v elegant | grep -v moreneat | xargs -- rm -rf
#find tikilight_$VER/styles/ -type f -name "*.css" | grep -v elegant | grep -v moreneat | xargs -- rm -f
#tar -czf tikiwiki_$VER.light.tar.gz tikilight_$VER
#tar --bzip2 -cf tikiwiki_$VER.light.tar.bz2 tikilight_$VER
#echo "lftp -u anonymous,[email protected] -e 'cd incoming;put tikiwiki_$VER.tar.gz;put tikiwiki_$VER.tar.bz2;put tikiwiki_$VER.light.tar.gz;put tikiwiki_$VER.light.tar.bz2;quit;' upload.sf.net"
echo "lftp -u anonymous,[email protected] -e 'cd incoming;put tikiwiki_$VER.tar.gz;put tikiwiki_$VER.tar.bz2;quit;' upload.sf.net"
cd $OLDIR
echo "Done."
......@@ -317,7 +317,7 @@ $lang=Array(
"completed" => "erledigt",
"compose" => "Erstellen",
"Compose" => "Erstellen",
"coms" => "Coms",
"coms" => "Kommentare",
"Configure modules" => "Module konfigurieren",//perhaps not used
"Configure news servers" => "Newsserver-Konfiguration",
"Configure this page" => "Diese Seite konfigurieren",
......@@ -1633,19 +1633,19 @@ $lang=Array(
"User information" => "Benutzerangaben",
"User Information" => "Benutzer-Information",
"User Messages" => "Benutzer-Nachrichten",
"User Modules" => "Benutzer Module",
"User Notepad" => "Benutzer Notizblock",
"User Pages" => "Benutzerseiten",
"User Preferences Screen" => "Benutzereinstellungsseite",
"User Modules" => "Benutzer-Module",
"User Notepad" => "Benutzer-Notizblock",
"User Pages" => "Benutzer-Seiten",
"User Preferences Screen" => "Benutzer-Einstellungsseite",
"user preferences" => "Benutzereinstellungen",//perhaps not used
"User preferences" => "Benutzereinstellungen",
"User prefs" => "Benutzereinst.",
"User prefs" => "Benutzereinstellungen",
"User registration and login" => "Benutzerregistrierung und -login",
"user selector" => "Nutzerauswahl",
"User Stats" => "Benutzer-Statistik",
"User tasks" => "Benutzer-Aufgaben",
"User Tasks" => "Benutzer-Aufgaben",
"User versions" => "Benutzer Versionen",//perhaps not used
"User versions" => "Benutzer-Versionen",//perhaps not used
"user" => "Benutzer",
"User" => "Benutzer",
"User_versions_for" => "Benutzer_Versionen_fuer",
......@@ -1752,7 +1752,7 @@ $lang=Array(
"You can include the image in an HTML/Tiki page using" => "Sie k&ouml;nnen das Bild in eine HTML-/Tiki-Seite einf&uuml;gen",
"You can view this image in your browser using" => "Sie k&ouml;nnen dieses Bild in Ihrem Browser betrachten",
"You cannot admin blogs" => "Sie k&ouml;nnen Blogs nicht administrieren",
"You cannot edit this page because it is a user personal page" => "Sie k&ouml;nnen diese Seite nicht bearbeiten, da es sich um eine pers&ouml;nliche Benutzerseite handelt.",
"You cannot edit this page because it is a user personal page" => "Sie k&ouml;nnen diese Seite nicht bearbeiten, da es sich um eine pers&ouml;nliche Benutzer-Seite handelt.",
"You cannot take this quiz twice" => "Sie k&ouml;nnen dieses Quiz nicht zweimal durchf&uuml;hren",
"You cannot take this survey twice" => "Sie k&ouml;nnen nicht zweimal an dieser Umfrage teilnehmen",
"You cant download files" => "Sie k&ouml;nnen keine Dateien herunterladen",//perhaps not used
......@@ -1802,13 +1802,13 @@ $lang=Array(
"min" => "Min.",
"Edit this page" => "&Auml;ndere diese Seite",
"
\n<b>Note 1</b>: if you allow your users to configure modules then assigned
\nmodules won't be reflected in the screen until you configure them
\nfrom MyTiki->modules.<br/>
\n<b>Note 2</b>: If you assign modules to groups make sure that you
\nhave turned off the option 'display modules to all groups always'
\nfrom Admin->General
\n" => "
<b>Note 1</b>: if you allow your users to configure modules then assigned
modules won't be reflected in the screen until you configure them
from MyTiki->modules.<br/>
<b>Note 2</b>: If you assign modules to groups make sure that you
have turned off the option 'display modules to all groups always'
from Admin->General
" => "
\n<b>Bemerkung 1</b>: Wenn sie den Benutzern erlauben, Module zu konfigurieren,
\ndann werden die hier zugewiesenen Module f&uuml;r die Benuzer erst sichtbar,
\nwenn sie sie in MeinTiki->Module konfigurieren.<br/>
......@@ -2402,10 +2402,10 @@ $lang=Array(
"All posted" => "All posted", // TODO
"Queue anonymous posts" => "Queue anonymous posts", // TODO
"Queue all posts" => "Queue all posts", // TODO
"No attachments" => "Keine Anh&auml;nge",
"Everybody can attach" => "Jeder darf Dateien anh&auml;ngen",
"Only users with attach permission" => "Nur Benutzer mit Anhangserlaubnis",
"Moderators and admin can attach" => "Nur Moderatoren und Admin",
"No attachments" => "keine Anh&auml;nge",
"Everybody can attach" => "jeder darf Dateien anh&auml;ngen",
"Only users with attach permission" => "nur Benutzer mit Anhangserlaubnis",
"Moderators and admin can attach" => "nur Moderatoren und Admin",
"Store attachments in:" => "Anh&auml;nge speichern in:",
"Database" => "Datenbank",
"Directory (include trailing slash)" => "Verzeichnis (mit / abschlie&szlig;en!)",
......@@ -3056,7 +3056,7 @@ $lang=Array(
"Date and Time Format Help" => "Hilfe zum Datums- und Zeitformat",
"unknown" => "unbekannt",
"Assign new module" => "Neues Modul hinzuf&uuml;gen",
"Create new user module" => "Neues Benutzermodul erstellen",
"Create new user module" => "Neues Benutzer-Modul erstellen",
"User can Configure Modules" => "Benutzer darf Module konfigurieren",
"Add new category" => "Neue Kategorie hinzuf&uuml;gen",
"Child categories" => "Unterkategorien",
......@@ -3072,5 +3072,13 @@ $lang=Array(
"Create new template" => "Neue Vorlage erstellen",
"Create new HTML page" => "Neue HTML-Seite erstellen",
"Path to where the dumped files are (relative to tiki basedir with trailing slash ex: dump/)" => "Verzeichnis, in dem die gesicherten Exporte liegen (relativ zum Tiki-Hauptverzeichnis mit abschlie&szlig;endem Slash, z.B. dump/)",
"Create New Forum" => "Neues Forum erstellen",
"Attachments" => "Anh&auml;nge",
"Approval type" => "Best&auml;tigung n&ouml;tig f&uuml;r",
"All posted" => "keine Nachricht",
"Queue anonymous posts" => "anonyme Nachrichten",
"Queue all posts" => "alle Nachrichten",
"Edit this Forum:" => "Dieses Forum bearbeiten:",
"Edit this user module:" => "Dieses Benutzer-Modul bearbeiten:",
"##end###" => "###end###");
?>
......@@ -2070,7 +2070,7 @@ $lang=Array(
"activity" => "activité",
"Articles listing configuration" => "Configuration de l'affichage des articles",
"Workflow engine" => "Moteur de workflow",
"User watches" => "Surveillants utilisateur",
"User watches" => "Surveillants utilisateur",//perhaps not used
"Live support system" => "Système d'assistance en ligne",
"Banning system" => "Système d'interdiction",
"please read" => "lisez SVP",
......@@ -2911,16 +2911,13 @@ $lang=Array(
"HTML Pages" => "Pages HTML",
"Show Category Path" => "Montrer l'arborescence des catégories",
"Show Category Objects" => "Montrer les objets de la catégorie",
"Edit Templates" => "Modifier les gabarits",
"Custom Home" => "Custom Home",
"Hotwords in New Windows" => "Mot/liens automatiques dans une nouvelle fenêtre",
"Dynamic Content System" => "Système de contenu dynamique",
"Allow Smileys" => "Permettre les binettes",
"Banning System" => "Système d'interdiction",
"PHPOpenTracker" => "PHPOpenTracker",
"Referer Stats" => "Statistiques des origines",
"Contact Us" => "Nous contacter",
"Theme Control" => "Contrôle des thèmes",
"User Preferences Screen" => "Ecrans des préférences utilisateur",
"User can Configure Modules" => "L'utilisateur peut configurer les modules",
"Users can Configure Modules" => "Les utilisateurs peuvent configurer les modules",
......
......@@ -17,7 +17,7 @@ class GUI extends Base {
{
$sort_mode = str_replace("_"," ",$sort_mode);
if($find) {
$mid=" and ((name like '%".$find."%') or (description like '%".$find."%'))";
$mid=" and ((gp.name like '%".$find."%') or (gp.description like '%".$find."%'))";
} else {
$mid="";
}
......
This diff is collapsed.
......@@ -683,7 +683,7 @@ closeon="!a|!map|!area|!strong|!sup|!font|!i|!b|!u|!tt|!img|!s|!big|!small|!stri
endtag="present"
pictureforedit="tags/tag.gif"
comment="Map"
closeon="!area"
[ par="name" ]
>
......
......@@ -311,7 +311,7 @@ class ImageGalsLib extends TikiLib {
//imagick can read everything ... we assume
return true;
} else if ($this->uselib == "gd") {
switch ($imagetype) {
switch (strtolower($imagetype)) {
case 'jpeg':
case 'pjpeg':
case 'jpg':
......@@ -401,8 +401,9 @@ class ImageGalsLib extends TikiLib {
//determine filetype and dimensions
$this->getfileinfo($tmpDir . "/" . $file);
$exp = substr($file, strlen($file) - 3, 3);
$foo=explode(".",$file);
$exp=end($foo);
// read image and delete it after
$this->readimagefromfile($tmpDir . "/" . $file);
unlink ($tmpDir . "/" . $file);
......
......@@ -1499,7 +1499,7 @@ class TikiLib {
$mid = "";
}
$query = "select * from `tiki_comments`,`tiki_forums` where `object`=md5(concat('forum',$forumId)) and `parentId`=0 $mid order by $sort_mode limit $offset,$maxRecords";
$query = "select * from `tiki_comments`,`tiki_forums` where `forumId`=$forumId `object`=md5(concat('forum',$forumId)) and `parentId`=0 $mid order by $sort_mode limit $offset,$maxRecords";
$query_cant = "select count(*) from `tiki_comments`,`tiki_forums` where `object`=md5(concat('forum',$forumId)) and `parentId`=0 $mid order by $sort_mode limit $offset,$maxRecords";
$result = $this->query($query);
$cant = $this->getOne($query_cant);
......@@ -2588,6 +2588,41 @@ class TikiLib {
$res[] = $parts[0];
}
}
// avoid caching URLs with common binary file extensions
$extension = substr($parts[0], -4);
$binary = array(
'.arj',
'.asf',
'.avi',
'.bz2',
'.dat',
'.doc',
'.exe',
'.hqx',
'.mov',
'.mp3',
'.mpg',
'.ogg',
'.pdf',
'.ram',
'.rar',
'.rpm',
'.rtf',
'.sea',
'.sit',
'.tar',
'.tgz',
'.wav',
'.wmv',
'.xls',
'.zip',
'ar.Z', // .tar.Z
'r.gz' // .tar.gz
);
if (in_array($extension, $binary)) {
$res[] = $parts[0];
}
}
$links = array_unique($res);
......@@ -3659,9 +3694,13 @@ class TikiLib {
$arguments = array();
foreach ($params as $param) {
$parts = explode('=>', $param);
// the following str_replace line is to decode the &gt; char when html is turned off
// perhaps the plugin syntax should be changed in 1.8 not to use any html special chars
$decoded_param = str_replace('&gt;', '>', $param);
$parts = explode( '=>', $decoded_param );
if (isset($parts[0]) && isset($parts[1])) {
$parts = explode('=>', $param);
$name = trim($parts[0]);
$arguments[$name] = trim($parts[1]);
......@@ -3702,11 +3741,9 @@ class TikiLib {
// Replace Hotwords
if ($feature_hotwords == 'y') {
foreach ($words as $word => $url) {
// The "space" char is included in the non-alpha-numerical set below I think
// $line = preg_replace("/(^$word| $word) /i"," <a class=\"wiki\" href=\"$url\" $hotw_nw>$word</a> ",$line);
// Why do we ever want a special char immediately in front of a hotword?
// $line = preg_replace("/([^A-Za-z0-9])$word /i","$1<a class=\"wiki\" href=\"$url\" $hotw_nw>$word</a> ",$line);
$line = preg_replace("/(^$word| $word)([^A-Za-z0-9])/i"," <a class=\"wiki\" href=\"$url\" $hotw_nw>$word</a>$2",$line);
// \b is a word boundary, \s is a space char
$line = preg_replace("/^$word(\b)/i","<a class=\"wiki\" href=\"$url\" $hotw_nw>$word</a>$1",$line);
$line = preg_replace("/\s$word(\b)/i"," <a class=\"wiki\" href=\"$url\" $hotw_nw>$word</a>$1",$line);
}
}
......@@ -4004,8 +4041,9 @@ class TikiLib {
if ($feature_wikiwords == 'y') {
// The first part is now mandatory to prevent [Foo|MyPage] from being converted!
preg_match_all("/([ \n\t\r\,\;]|^)([A-Z][a-z0-9_\-]+[A-Z][a-z0-9_\-]+[A-Za-z0-9\-_]*)($|[ \n\t\r\,\;\.])/", $data, $pages);
$words = $this->get_hotwords();
foreach (array_unique($pages[2])as $page_parse) {
if (!array_key_exists($page_parse, $words)) {
if ($desc = $this->page_exists_desc($page_parse)) {
$repl = '<a title="' . $desc . '" href="tiki-index.php?page=' . urlencode($page_parse). '" class="wiki">' . $page_parse . '</a>';
} elseif ($feature_wiki_plurals == 'y' && $this->get_locale() == 'en_US') {
......@@ -4023,7 +4061,7 @@ class TikiLib {
if($desc = $this->page_exists_desc($plural_tmp)) {
$repl = "<a title='".$desc."' href='tiki-index.php?page=$plural_tmp' class='wiki'>$page_parse</a>";
} else {
$repl = "$page_parse<a href='tiki-editpage.php?page=$page_parse' class='wiki'>?</a>";
$repl = "$page_parse<a href='tiki-editpage.php?page=".urlencode($page_parse)."' class='wiki'>?</a>";
}
} else {
$repl = "$page_parse<a href='tiki-editpage.php?page=" . urlencode($page_parse). "' class='wiki'>?</a>";
......@@ -4032,6 +4070,7 @@ class TikiLib {
$data = preg_replace("/([ \n\t\r\,\;]|^)$page_parse($|[ \n\t\r\,\;\.])/", "$1" . "$repl" . "$2", $data);
//$data = str_replace($page_parse,$repl,$data);
}
}
}
$data = preg_replace("/([ \n\t\r\,\;]|^)\)\)([^\(]+)\(\(($|[ \n\t\r\,\;\.])/", "$1" . "$2" . "$3", $data);
......
......@@ -9,6 +9,7 @@
<img border='0' src='img/icons/info.gif' alt='{tr}edit template{/tr}' /></a>
{/if}
<br /><br />
{include file=tiki-mytiki_bar.tpl}
{include file="messu-nav.tpl"}
</br>
......@@ -56,4 +57,4 @@
</table>
</form>
{/if}
<br /><br />
\ No newline at end of file
<br /><br />
{tr}This is{/tr} Tiki v1.7 -Eta Carinae- (c)2002-2003 {tr}by the{/tr} Tiki community. {$smarty.now|tiki_short_datetime}
\ No newline at end of file
{tr}This is{/tr} Tiki v1.7.1.1 -Eta Carinae- (c)2002-2003 {tr}by the{/tr} Tiki community. {$smarty.now|tiki_short_datetime}
\ No newline at end of file
......@@ -205,5 +205,3 @@
{/if}
</div>
</div>
......@@ -99,4 +99,3 @@
{/if}
</div>
</div>
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-admin_drawings.tpl,v 1.7 2003-08-15 04:16:30 dgdaniels Exp $ *}
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-admin_drawings.tpl,v 1.8 2003-08-21 00:51:21 redflo Exp $ *}
<a class="pagetitle" href="tiki-admin_drawings.php">{tr}Admin drawings{/tr}</a>
<!-- the help link info --->
......
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-admin_modules.tpl,v 1.16 2003-08-15 01:36:51 dgdaniels Exp $ *}
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-admin_modules.tpl,v 1.17 2003-08-21 00:51:21 redflo Exp $ *}
<a class="pagetitle" href="tiki-admin_modules.php">{tr}Admin Modules{/tr}</a>
<!-- the help link info --->
......
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-admin_topics.tpl,v 1.9 2003-08-15 17:18:25 dgdaniels Exp $ *}
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-admin_topics.tpl,v 1.10 2003-08-21 00:51:21 redflo Exp $ *}
<a class="pagetitle" href="tiki-admin_topics.php">{tr}Admin Topics{/tr}</a>
......
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-admingroups.tpl,v 1.15 2003-08-15 21:15:09 mose Exp $ *}
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-admingroups.tpl,v 1.16 2003-08-21 00:51:21 redflo Exp $ *}
<a class="pagetitle" href="tiki-admingroups.php">{tr}Admin groups{/tr}</a><br /><br />
{if $feature_help eq 'y'}
<a href="http://tikiwiki.org/tiki-index.php?page=PermissionAdmin" target="tikihelp" class="tikihelp" title="{tr}Tikiwiki.org help{/tr}: {tr}admin groups{/tr}">
......
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-adminusers.tpl,v 1.22 2003-08-15 01:14:52 dgdaniels Exp $ *}
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-adminusers.tpl,v 1.23 2003-08-21 00:51:21 redflo Exp $ *}
<a href="tiki-adminusers.php" class="pagetitle">{tr}Admin users{/tr}</a>
<!-- the help link info --->
......
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-assignpermission.tpl,v 1.36 2003-08-17 23:10:05 dgdaniels Exp $ *}
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-assignpermission.tpl,v 1.37 2003-08-21 00:51:21 redflo Exp $ *}
{ *TODO: Must fix even/odd table rows detection byusing Smarty 'cycle' *}
......
......@@ -72,11 +72,9 @@
<input type="submit" name="clearpages" value="{tr}reset{/tr}" />
</td><td class="normal" align="center">
<select name="rempageName[]" size="10" multiple="multiple">
{section name=ix loop=$convertpages}
{if isset($convertpages[ix])}
<option value="{$convertpages[ix]|escape}">{$convertpages[ix]}</option>
{/if}
{/section}
{foreach from=$convertpages item=ix}
<option value="{$ix|escape}">{$ix}</option>
{/foreach}
</select>
</td></tr>
</table>
......
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-file_galleries.tpl,v 1.19 2003-08-15 21:35:32 mose Exp $ *}
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-file_galleries.tpl,v 1.20 2003-08-21 00:51:21 redflo Exp $ *}
<a class="pagetitle" href="tiki-file_galleries.php?galleryId={$galleryId}">{tr}File Galleries{/tr}</a>
......
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-list_articles.tpl,v 1.12 2003-08-15 21:40:17 mose Exp $ *}
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-list_articles.tpl,v 1.13 2003-08-21 00:51:21 redflo Exp $ *}
<a class="pagetitle" href="tiki-list_articles.php">{tr}Articles{/tr}</a><br/><br/>
......
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-received_articles.tpl,v 1.10 2003-08-15 21:43:33 mose Exp $ *}
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-received_articles.tpl,v 1.11 2003-08-21 00:51:21 redflo Exp $ *}
<a class="pagetitle" href="tiki-received_articles.php">{tr}Received articles{/tr}</a><br/><br/>
{if $feature_help eq 'y'}
......
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-shoutbox.tpl,v 1.9 2003-08-17 22:27:10 dgdaniels Exp $ *}
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-shoutbox.tpl,v 1.10 2003-08-21 00:51:21 redflo Exp $ *}
<a class="pagetitle" href="tiki-shoutbox.php">{tr}Tiki Shoutbox{/tr}!</a>
{if $feature_help eq 'y'}
......
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-upload_image.tpl,v 1.12 2003-08-15 21:51:08 mose Exp $ *}
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-upload_image.tpl,v 1.13 2003-08-21 00:51:21 redflo Exp $ *}
<a href="tiki-upload_image.php?galleryId={$galleryId}" class="pagetitle">{tr}Upload Image{/tr}</a><br /><br />
{if $feature_help eq 'y'}
......
......@@ -195,7 +195,7 @@ a moderator approves it.{/tr}</small>
{/if}
<tr>
<td class="forumform">{tr}Comment{/tr}</td>
<td class="forumform"><textarea id='editpost' name="comments_data" rows="8" cols="60">{$comment_data|escape}</textarea></td>
<td class="forumform"><textarea id='editpost' name="comments_data" rows="20" cols="80">{$comment_data|escape}</textarea></td>
</tr>
{if ($forum_info.att eq 'att_all') or ($forum_info.att eq 'att_admin' and $tiki_p_admin_form eq 'y') or ($forum_info.att eq 'att_perm' and $tiki_p_forum_attach eq 'y')}
<tr>
......
......@@ -271,6 +271,8 @@ a moderator approves it.{/tr}</small>
<br/><br/>
{/if}
{/if}
{if $replies_cant > 0}
<!-- TOOLBAR -->
<div class="forumtoolbar">
<form method="post" action="tiki-view_forum_thread.php">
......@@ -335,6 +337,7 @@ a moderator approves it.{/tr}</small>
<input type="hidden" name="topics_sort_mode" value="{$smarty.request.topics_sort_mode|escape}" />
<input type="hidden" name="topics_threshold" value="{$smarty.request.topics_threshold|escape}" />
<input type="hidden" name="forumId" value="{$forumId|escape}" />
{if $tiki_p_admin_forum eq 'y'}
<table class="normal">
<tr>
......@@ -371,6 +374,7 @@ a moderator approves it.{/tr}</small>
<td class="forumheading">{tr}author{/tr}</td>
<td class="forumheading">{tr}message{/tr}</td>
</tr>
{/if}
{cycle values="odd,even" print=false}
{section name=ix loop=$comments_coms}
<tr>
......
<?php
// $Header: /cvsroot/tikiwiki/tiki/tiki-articles_rss.php,v 1.12 2003-08-07 04:33:56 rossta Exp $
// $Header: /cvsroot/tikiwiki/tiki/tiki-articles_rss.php,v 1.13 2003-08-21 00:51:19 redflo Exp $
// Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
// All Rights Reserved. See copyright.txt for details and a complete list of authors.
......@@ -9,28 +9,31 @@ require_once ('tiki-setup.php');
require_once ('lib/tikilib.php'); # httpScheme()
if ($rss_articles != 'y') {
die;
}
header ("content-type: text/xml");
$foo = parse_url($_SERVER["REQUEST_URI"]);
$foo1 = str_replace("tiki-articles_rss.php", $tikiIndex, $foo["path"]);
$foo2 = str_replace("tiki-articles_rss.php", "img/tiki.jpg", $foo["path"]);
$foo3 = str_replace("tiki-articles_rss.php", "tiki-read_article.php", $foo["path"]);
$foo4 = str_replace("tiki-articles_rss.php", "lib/rss/rss-style.css", $foo["path"]);
$home = httpPrefix(). $foo1;
$img = httpPrefix(). $foo2;
$read = httpPrefix(). $foo3;
$css = httpPrefix(). $foo4;
$title = "Tiki RSS feed for articles";
$desc = "Last articles.";
$now = date("U");
$changes = $tikilib->list_articles(0, $max_rss_articles, 'publishDate_desc', '', $now, $user);
print '<?xml version="1.0" encoding="UTF-8"?>' . "\n";
print '<?xml-stylesheet href="' . $css . '" type="text/css"?>' . "\n";
if($rss_articles != 'y') {
die;
}
if($tiki_p_read_article != 'y') {
$smarty->assign('msg',tra("Permission denied you cannot view this section"));
$smarty->display("styles/$style_base/error.tpl");
die;
}
header("content-type: text/xml");
$foo = parse_url($_SERVER["REQUEST_URI"]);
$foo1=str_replace("tiki-articles_rss.php",$tikiIndex,$foo["path"]);
$foo2=str_replace("tiki-articles_rss.php","img/tiki.jpg",$foo["path"]);
$foo3=str_replace("tiki-articles_rss.php","tiki-read_article.php",$foo["path"]);
$foo4=str_replace("tiki-articles_rss.php","lib/rss/rss-style.css",$foo["path"]);
$home = httpPrefix().$foo1;
$img = httpPrefix().$foo2;
$read = httpPrefix().$foo3;
$css = httpPrefix().$foo4;
$title = "Tiki RSS feed for articles";
$desc = "Last articles.";
$now = date("U");
$changes = $tikilib->list_articles(0,$max_rss_articles,'publishDate_desc', '', $now,$user);
?>
......@@ -112,4 +115,4 @@ print '<?xml-stylesheet href="' . $css . '" type="text/css"?>' . "\n";
?>
</rdf:RDF>
\ No newline at end of file
</rdf:RDF>
<?php
// $Header: /cvsroot/tikiwiki/tiki/tiki-blog_rss.php,v 1.12 2003-08-07 04:33:56 rossta Exp $
// $Header: /cvsroot/tikiwiki/tiki/tiki-blog_rss.php,v 1.13 2003-08-21 00:51:20 redflo Exp $
// Copyright (c) 2002-2003, 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.
require_once ('tiki-setup.php');
require_once ('lib/tikilib.php');
include_once ('lib/blogs/bloglib.php');
header ("content-type: text/xml");
$foo = parse_url($_SERVER["REQUEST_URI"]);
if ($rss_blog != 'y') {
die;
}
if (!isset($_REQUEST["blogId"])) {
die;
}
$foo1 = str_replace("tiki-blog_rss.php", $tikiIndex, $foo["path"]);
$foo2 = str_replace("tiki-blog_rss.php", "img/tiki.jpg", $foo["path"]);
$foo3 = str_replace("tiki-blog_rss", "tiki-view_blog", $foo["path"]);
$foo4 = str_replace("tiki-blogs_rss.php", "lib/rss/rss-style.css", $foo["path"]);
$home = httpPrefix(). $foo1;
$img = httpPrefix(). $foo2;
$read = httpPrefix(). $foo3;
$css = httpPrefix(). $foo4;
$title = $tikilib->get_preference("title", "Tiki RSS feed for the weblog:");
$now = date("U");
$changes = $bloglib->list_blog_posts($_REQUEST["blogId"], 0, $max_rss_blog, 'created_desc', '', $now);
$info = $tikilib->get_blog($_REQUEST["blogId"]);
$blogtitle = $info["title"];
$blogdesc = $info["description"];
require_once('tiki-setup.php');
require_once('lib/tikilib.php');
include_once('lib/blogs/bloglib.php');
header("content-type: text/xml");
$foo = parse_url($_SERVER["REQUEST_URI"]);
if($rss_blog != 'y') {
die;
}
if($tiki_p_read_blog != 'y') {
$smarty->assign('msg',tra("Permission denied you can not view this section"));
$smarty->display("styles/$style_base/error.tpl");
die;
}
if(!isset($_REQUEST["blogId"])) {
die;
}
$foo1=str_replace("tiki-blog_rss.php",$tikiIndex,$foo["path"]);
$foo2=str_replace("tiki-blog_rss.php","img/tiki.jpg",$foo["path"]);
$foo3=str_replace("tiki-blog_rss","tiki-view_blog",$foo["path"]);
$foo4=str_replace("tiki-blog_rss.php","lib/rss/rss-style.css",$foo["path"]);
$home = httpPrefix().$foo1;