Commit b1b4f445 authored by mose's avatar mose

Instant-Auto-Merge from BRANCH to HEAD

parent d40b392d
......@@ -2,6 +2,9 @@ This directory contains source code to Tiki! The wiki with lot of features!
DOCUMENTATION
-------------------
* official 1.8.x documentation website :
http://doc.tikiwiki.org
* It is highly recommended you refer to the online documentation:
* http://tikiwiki.org/InstallTikiDoc for a setup guide
* http://tikiwiki.org/InstallTikiHelp for what to do in case of problems
......@@ -10,8 +13,13 @@ DOCUMENTATION
format (350 pages) (outdated at the time of this writing): http://tikiwiki.org/tiki.pdf
* Tikiwiki is also a community : irc.freenode.net channel #tikiwiki
INSTALL TIKI WITH POSTGRESQL
----------------------------
refer to http://tikiwiki.org/TikiPostgres
INSTALL TIKI
INSTALL TIKI WITH MYSQL
-----------------------
Before you get started it's a good idea to know:
......@@ -28,8 +36,8 @@ Step one:
Unpack and set the necessary permissions
unpack to the document root of where you want tiki installed, e.g. /var/www/tiki/
bz2 file? Use:
tar xvjf tikiwikiv.xxx
bz2 file Use:
tar xjf tikiwiki-1.8.1.tar.bz2
Step two:
- - - - - - -
......@@ -100,9 +108,10 @@ Next you can configure Tiki to your needs:
* (Optionally) create groups of users that share permissions
* Assign appropriate permissions
Good luck! And come on over to
http://tikiwiki.org/tiki-index.php
and join the team!
Good luck!
ps:
Now you may want to come to http://tikiwiki.org and join the community !
Tiki! The wiki with a lot of features!
version 1.8.1 -Polaris-
DOCUMENTATION
......@@ -10,7 +11,11 @@ DOCUMENTATION
ideas and workarounds
* It might also be helpful to look into the official Manual. Last released
documentation, in pdf format (350 pages) (outdated at the time of this writing):
http://tikiwiki.org/tiki.pdf
http://tikiwiki.org/tiki.pdf (version 1.6)
* The documentation for 1.8 version is under construction at
http://doc.tikiwiki.org,
come and help if you can and wish.
* details about the 1.8 releases are at http://tikiwiki.org/ReleaseNotes18
* TikiWiki is also a live community on irc.freenode.net channel #tikiwiki
......
Tikiwiki Changelog
------------------
$Header: /cvsroot/tikiwiki/tiki/changelog.txt,v 1.149 2004-03-07 23:12:00 mose Exp $
$Header: /cvsroot/tikiwiki/tiki/changelog.txt,v 1.150 2004-03-15 21:27:27 mose Exp $
All developers are invited to add relevant changes in that file as they
apply them to the CVS source. You can optionnaly indicate an identifer
......@@ -22,6 +22,87 @@ Version 1.9
* [MOD] Avoid sending user back to registration page on first login
Version 1.8.1 - Polaris-
<http://tikiwiki.org/ReleaseProcess181>
* [FIX] File and Image Galleries: Directory value shouldn't need "/"
* [MOD] Wiki Forum Discuss Broken with dropdown on Wiki Admin page
* [FIX] Forums : Show posts by age sorting broken
* [FIX] Wiki Split! (both the @@@ and the line breaks in columns)
* [FIX] forum attachment doesn't work
* [FIX] Taglines uploaded display with escapes
* [FIX] Shoutbox module's delete link doesn't work everywhere
* [FIX] WikiSyntax : Center- if colon in-line, centering breaks
* [FIX] search_box with Fulltext Search
* [FIX] Misspelled link in file /lib/calendarlib.php
* [FIX] Incorrectly specified wiki 'h4' heading
* [FIX] Blog Pagination links were out of sync
* [FIX] moreneat debug console has hard to see colours
* [FIX] Forums : individual RSS feeds not working
* [FIX] RSS not properly processing blogId
* [FIX] FANCYTABLE plugin generates wrong TD format
* [FIX] RSS feeds are sent with Wiki Formatting instead of HTML
* [FIX] RSS feed brakes in 1.8 RC3 - httprequest() in tikilib didnt return
any data
* [FIX] Newsletters: Subscribers get same unsubscribe code
* [NEW] topic filtering in wikiplugin_articles
* [FIX] File Gals:IIS REQUEST_URI not set in file download
* [FIX] lastLogin was the same as currentLogin
* [MOD] forums' new icon to show for topics new since last login
* [FIX] ARTICLES plugin wasnt showing the topic images.
* [FIX] mod-who_is_there Fixed missing quote marker
* [FIX] commzone/attzone area JS flip link fixed for all themes (comments and
attachments weren't staying to show in Konqueror) with more accessible
solution
* [FIX] Contact Anonymous fixed
remember to enabled the Contact Us and user Messaging features, set a
contact name on Admin->General and let anonymous use the messaging system
permission
* [FIX] Integrator that was unable to save new repository
* [FIX] iframe width in featured-link feature
* [FIX] Wiki quick help SQL plugin documentation
* [MOD] translation of 'by' and displaying of 'Anonymous' in
last_modif_pages module
* [MOD] translation of 'by' in wiki_last_comments module
* [FIX] breaks in the BOX plug-in
* [NEW] dropdown navigation for backlinks and structures in wiki pages
* [MOD] the module last_modif_pages so it don't display minor changes
* [NEW] Javascript added to shoutbox forms to limit
input to the 255 character table column width
* [MOD] diff to ignore newline characters
* [FIX] missing ?forumId= in tiki-forum(s)_rss.php
* [FIX] SPLIT and BOX plugins to render all wiki syntax properly
* [FIX] diff and source view to display special characters properly
* [FIX] external RSS feeds: first entry was not shown
* [FIX] more XHTML fixes (some ported from 1.7.x branch)
* [NEW] ARTICLES now includes Topic Filtering
* [NEW] new module last_category_items
* [MOD] Spelling Mistakes corrected
also modified the language files to reflect those changes, so not to
break the language translations
* [NEW] Added a check on Tiki Backup to remind you if your file and image
galleries are set to file system storage
German translation
* [NEW] RSS 2.0 output feeds support the author tag now
* [MOD] RSS: better looking stylesheet
* [MOD] RSS: Blogs now show title instead of a timestamp
* [MOD] RSS: if there is an empty item title, it gets replaced with a creation
timestamp of that item
* [MOD] RSS: forums rss shows author names now
* [NEW] avatars: user can choose to have no avatar if he has one currently
* [NEW] Added <>[]|)({}'"_-*#;:& to special character input marclaporte
* [MOD] Replaced the powered by RDF button with better quality one and aligned
all buttons vertically to middle
* [NEW] Belarus now has a tiki flag!
* [NEW] en-uk Language file, mainly because we british love our colour
* [NEW] adding a powered by Tiki logo on bottom bar
* [NEW] Added support for Atom output feeds, details see
http://bitworking.org/rfc/draft-gregorio-07.html
* [NEW] Added support for external Atom feeds, just add them on the rss feeds
page!
* [NEW] Added new module forums_last_posts, that shows the newest posts in
forums. prefixes like Re: or Aw: are removed prior to output
* [FIX] Corrected the alignment in neat theme for wiki page icons
Version 1.8 -Polaris-
<http://tikiwiki.org/ReleaseProcess18>
* [FIX] removed invalid maxlength attribute and added js_maxlength to shoutbox
......
This diff is collapsed.
tiki/img/rdf.gif

1.54 KB | W: | H:

tiki/img/rdf.gif

1.65 KB | W: | H:

tiki/img/rdf.gif
tiki/img/rdf.gif
tiki/img/rdf.gif
tiki/img/rdf.gif
  • 2-up
  • Swipe
  • Onion skin
......@@ -479,6 +479,8 @@ $lang=Array(
"login" => "identification",
"rss feed disabled" => "alimentation rss désactivée",
"Permission denied you cannot view this section" => "Droit d'accès refusé : vous ne pouvez pas afficher cette section",
"Tiki RSS feed for articles" => "Canal de syndication RSS Tiki pour les articles",
"Last articles." => "Derniers articles.",
"Unknown group" => "Groupe inconnu",
"Group doesnt exist" => "Ce groupe n'existe pas",
"Unknown user" => "Utilisateur inconnu",
......@@ -494,6 +496,9 @@ $lang=Array(
"Last posts" => "Derniers articles de blogue",
"Top active blogs" => "Blogues les plus actifs",
"No blogId specified" => "Aucun Id de blogue spécifié",
"Tiki RSS feed for blog: " => "Canal de syndication RSS Tiki pour le blogue : ",
"Tiki RSS feed for weblogs" => "Canal de syndication RSS Tiki pour les blogues",
"Last posts to weblogs." => "Derniers articles des blogues.",
"Permission denied you cannot access this gallery" => "Droit d'accès refusé : vous ne pouvez pas accéder à cette galerie",
"No gallery indicated" => "Aucune galerie indiquée",
"Permission denied you can not view this section" => "Droit d'accès refusé : vous ne pouvez pas afficher cette section",
......@@ -586,7 +591,10 @@ $lang=Array(
"Top visited file galleries" => "Galeries de fichiers les plus visitées",
"Most downloaded files" => "Fichiers les plus téléchargés",
"Last files" => "Derniers fichiers",
"Tiki RSS feed for file galleries" => "Canal de syndication RSS Tiki pour les galeries de fichiers",
"Last files uploaded to the file galleries." => "Derniers fichiers téléchargés dans les galeries de fichiers.",
"No galleryId specified" => "Aucun galleryId spécifié",
"Tiki RSS feed for the file gallery: " => "Canal de syndication RSS Tiki pour la galerie de fichiers : ",
"No forum indicated" => "Aucun forum indiqué",
"Last forum topics" => "Derniers sujets de forum",
"Most read topics" => "Sujets les plus lus",
......@@ -594,6 +602,9 @@ $lang=Array(
"Forum posts" => "Articles de forums",
"Most visited forums" => "Forums les plus visités",
"No forumId specified" => "Aucun ID de forum indiqué",
"Tiki RSS feed for forum: " => "Canal de syndication RSS Tiki pour le forum : ",
"Tiki RSS feed for forums" => "Canal de syndication RSS Tiki pour les forums",
"Last topics in forums." => "Derniers sujets des forums.",
"No process indicated" => "Aucun processus indiqué",
"Activity name already exists" => "Le nom de l'activité existe déjà",
"indicates if the process is active. Invalid processes cant be active" => "indique si le processus est actif. Les processus invalides ne peuvent pas être actifs",
......@@ -674,6 +685,8 @@ $lang=Array(
"You dont have permission to write to the mapfile" => "Droit d'accès refusé : vous ne pouvez pas écrire le fichier-carte",
"You dont have permission to delete the mapfile" => "Droit d'accès refusé : vous ne pouvez effacer le fichier-carte",
"You dont have permission to read the mapfile" => "Droit d'accès refusé : vous ne pouvez lire le fichier-carte",
"Tiki RSS feed for maps" => "Canal de syndication RSS Tiki pour les cartes",
"List of maps available." => "Liste des cartes disponibles.",
"You do not have permissions to view the layers" => "Droit d'accès refusé : vous ne pouvez pas voir les layers",
"Could not upload the file" => "Ne peut pas télécharger le fichier",
"You do not have permissions to delete a file" => "Droit d'accès refusé : vous ne pouvez effacer le fichier",
......@@ -805,6 +818,8 @@ $lang=Array(
"Top pages" => "Pages les plus populaires",
"Last pages" => "Dernières pages",
"Most relevant pages" => "Pages les plus pertinentes",
"Tiki RSS feed for the wiki pages" => "Canal de syndication RSS Tiki pour les pages Wiki",
"Last modifications to the Wiki." => "Dernières pages Wiki modifiées.",
"Anonymous" => "Anonyme",
"WikiDiff::apply: line count mismatch: %s != %s" => "WikiDiff::apply: nombre de lignes diffèrent: %s != %s",
"WikiDiff::_check: failed" => "WikiDiff::_check : a échoué",
......@@ -888,6 +903,7 @@ $lang=Array(
"Wiki last pages" => "Dernières pages Wiki",
"Modified" => "Modifié",
"Forums last topics" => "Derniers sujets de forum",
"Forums last posts" => "Derniers articles de forum",
"Topic date" => "Date du sujet",
"Forums most read topics" => "Forums des sujets les plus lus",
"Forums best topics" => "Forums des sujets les plus populaires",
......@@ -923,6 +939,8 @@ $lang=Array(
"%a %d of %b, %Y" => "%e/%m/%y",
"%a %d of %b, %Y[%H:%M %Z]" => "%e/%m/%y [%Hh%M]",
"%H:%M %Z" => "%Hh%M",
"The text is" => "Le texte est",
"character(s) too long - please edit it." => "caractère(s) trop long - SVP, modifiez le.",
"created from structure" => "créer d'un structure",
"Modification of item \$itemId in tracker \$trackerName" => "Modification de la fiche \$itemId du formulaire \$trackerName",
"New item \$itemId in tracker \$trackerName" => "Nouvelle fiche \$itemId dans le formulaire \$trackerName",
......@@ -3249,6 +3267,7 @@ $lang=Array(
"Show all" => "Montrer tout",
"Avatar Image" => "Image avatar",
"random" => "au hasard",
"no avatar" => "aucun avatar",
"Upload your own avatar" => "Télécharger votre avatar",
"lastModif" => "dernière modif.",
"atts" => "pj",
......
This diff is collapsed.
......@@ -8,7 +8,7 @@
// Version 3.0 developed by Mihai Bazon for InteractiveTools.
// http://students.infoiasi.ro/~mishoo
//
// $Id: htmlarea.js,v 1.1 2003-04-23 15:16:14 lrargerich Exp $
// $Id: htmlarea.js,v 1.2 2004-03-15 21:27:31 mose Exp $
// Creates a new HTMLArea object. Tries to replace the textarea with the given
// ID with it.
......@@ -310,7 +310,7 @@ HTMLArea.prototype._createToolbar = function () {
if (obj.enabled) with (HTMLArea) {
_removeClass(el, "buttonActive");
_removeClass(el, "buttonHover");
editor._buttonClicked(txt);
editor._buttonclicked(txt);
_stopEvent(is_ie ? window.event : ev);
}
});
......@@ -765,7 +765,7 @@ HTMLArea.prototype._insertTable = function() {
***************************************************/
// txt is the name of the button, as in config.toolbar
HTMLArea.prototype._buttonClicked = function(txt) {
HTMLArea.prototype._buttonclicked = function(txt) {
var editor = this; // needed in nested functions
this.focusEditor();
var btn = this.config.btnList[txt];
......
......@@ -973,7 +973,7 @@ class ImageGalsLib extends TikiLib {
$bindvars=array((int)$id,$itype,(int)$xsize);
}
if ($ysize != 0) {
$mid .= "and d.`ysize`=? ";
$mid = "and d.`ysize`=? ";
$bindvars=array((int)$id,$itype,(int)$ysize);
}
if ($xsize != 0 && $ysize != 0) {
......@@ -1156,20 +1156,20 @@ class ImageGalsLib extends TikiLib {
}
function remove_gallery_scale($galleryId, $xsize = 0, $ysize = 0) {
$mid = "";
$bindvars=array((int) $galleryId);
if ($xsize != 0) {
$mid = " and `xsize`=? ";
$bindvars=array((int) $galleryId,(int) $xsize);
}
if ($ysize != 0) {
$mid .= " and `ysize`=? ";
$bindvars=array((int) $galleryId,(int) $ysize);
}
$query = "delete from `tiki_galleries_scales` where
$mid = "";
$bindvars=array((int) $galleryId);
if ($xsize != 0) {
$mid = " and `xsize`=? ";
$bindvars[]=(int) $xsize;
}
if ($ysize != 0) {
$mid .= " and `ysize`=? ";
$bindvars[]=(int) $ysize;
}
$query = "delete from `tiki_galleries_scales` where
`galleryId`=? $mid";
$result = $this->query($query,$bindvars);
}
$result = $this->query($query,$bindvars);
}
function remove_gallery($id) {
global $gal_use_dir;
......
......@@ -844,7 +844,7 @@ function ol_content_caption(text, title, close) {
closing = "";
closeevent = "onMouseOver";
if (o3_closeclick == 1) closeevent = "onClick";
if (o3_closeclick == 1) closeevent = "onclick";
if (o3_capicon != "") o3_capicon = "<IMG SRC=\""+o3_capicon+"\"> ";
if (close != "") {
......
......@@ -79,13 +79,13 @@ class RSSLib extends TikiLib {
function startElementHandler($parser, $name, $attribs) {
if ($this->flag) {
// for Atom <link>s: ignore those with no HREF
if ($name == 'link') {
if ((array_key_exists("href",$attribs)) &&
(array_key_exists("rel",$attribs)) &&
($attribs["rel"] == "alternate")) {
if (($name == 'link') &&
(array_key_exists("href",$attribs)) &&
(array_key_exists("rel",$attribs)) &&
($attribs["rel"] == "alternate"))
{
$this->buffer .= '<' . $name . '>';
$this->buffer .= $attribs["href"];
}
// all tags except <link>:
} else $this->buffer .= '<' . $name . '>';
}
......
......@@ -9,7 +9,7 @@ function smarty_function_helplink($params, &$smarty)
$smarty->trigger_error("assign: missing page parameter");
return;
}
print("<a title='help' href='#' onClick='javascript:window.open(\"tiki-index_p.php?page=$page\",\"\",\"menubar=no,scrollbars=yes,resizable=yes,height=600,width=500\");'><img border='0' src='img/icons/help.gif' alt='".tra("help")."' /></a>");
print("<a title='help' href='#' onclick='javascript:window.open(\"tiki-index_p.php?page=$page\",\"\",\"menubar=no,scrollbars=yes,resizable=yes,height=600,width=500\");'><img border='0' src='img/icons/help.gif' alt='".tra("help")."' /></a>");
}
/* vim: set expandtab: */
......
......@@ -688,7 +688,7 @@ function list_structures($offset, $maxRecords, $sort_mode, $find) {
$dat = preg_replace("/tiki-index.php\?page=([^\'\" ]+)/","$1.html",$dat);
$dat = str_replace('?nocache=1','',$dat);
$cs = '';
$data = "<html><head><script src=\"../js/highlight.js\"></script><link rel=\"StyleSheet\" href=\"../../../styles/$style_base.css\" type=\"text/css\" /><meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" /> <title>".$res["pageName"]."</title></head><body onLoad=\"doProc();\">$cs<div id='tiki-center'><div class='wikitext'>".$dat.'</div></div></body></html>';
$data = "<html><head><script src=\"../js/highlight.js\"></script><link rel=\"StyleSheet\" href=\"../../../styles/$style_base.css\" type=\"text/css\" /><meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" /> <title>".$res["pageName"]."</title></head><body onload=\"doProc();\">$cs<div id='tiki-center'><div class='wikitext'>".$dat.'</div></div></body></html>';
$fw=fopen("$base/pages/".$res['pageName'].'.html','wb+');
fwrite($fw,$data);
fclose($fw);
......
......@@ -276,7 +276,7 @@ function linkFolderHTML(isTextLink)
if (this.hreference)
{
if (USEFRAMES)
docW = docW + "<a onClick='parent.his[parent.his.length]=\"" + this.desc + "|" +this.hreference +"\"' class='menu' href='" + this.hreference + "' TARGET=\"content\" "
docW = docW + "<a onclick='parent.his[parent.his.length]=\"" + this.desc + "|" +this.hreference +"\"' class='menu' href='" + this.hreference + "' TARGET=\"content\" "
else
docW = docW + "<a class='menu' href='" + this.hreference + "' TARGET=_top "
......@@ -285,7 +285,7 @@ function linkFolderHTML(isTextLink)
}
if (browserVersion > 0)
docW = docW + "onClick='javascript:clickOnFolder(\""+this.getID()+"\")'"
docW = docW + "onclick='javascript:clickOnFolder(\""+this.getID()+"\")'"
docW = docW + ">"
}
......@@ -398,7 +398,7 @@ function drawItem(insertAtObj)
var leftSide = leftSideHTML(this.leftSideCoded)
var docW = ""
var fullLink = "href=\""+this.link+"\" target=\""+this.target+"\" onClick=\"parent.his[parent.his.length]='"+this.desc+"|"+this.link+"';clickOnLink('"+this.getID()+"\', '"+this.link+"','"+this.target+"');return false;\"";
var fullLink = "href=\""+this.link+"\" target=\""+this.target+"\" onclick=\"parent.his[parent.his.length]='"+this.desc+"|"+this.link+"';clickOnLink('"+this.getID()+"\', '"+this.link+"','"+this.target+"');return false;\"";
this.isRendered = 1
if (this.level>0)
......
......@@ -20,7 +20,7 @@ for(i=0;i<parent.docs.length;i++) {
var parts = parent.docs[i].split('|');
document.write("<a id='"+
parts[1]+
"' onClick='parent.his[parent.his.length]=\""+parts[0]+"|"+"pages/"+parts[1]+".html"+"\";paint(\""+ parts[1]+"\");' class='result' target='content' href='pages/"+ parts[1]+".html'>" + parts[0] + "</a><br/>");
"' onclick='parent.his[parent.his.length]=\""+parts[0]+"|"+"pages/"+parts[1]+".html"+"\";paint(\""+ parts[1]+"\");' class='result' target='content' href='pages/"+ parts[1]+".html'>" + parts[0] + "</a><br/>");
}
</script>
</body>
......@@ -2,36 +2,36 @@
<script src="js/toolbar.js"></script>
<link rel="StyleSheet" href="css/toolbar.css" type="text/css" />
</head>
<body onLoad="updateSearch();">
<body onload="updateSearch();">
<table width="100%">
<tr>
<td width="80">
<div id="button2" class="button">
<a title="index" class="buttonlink" href="" onClick="javascript:parent.menu.location.href='menu.html';">
<a title="index" class="buttonlink" href="" onclick="javascript:parent.menu.location.href='menu.html';">
<img border="0" src="icons/toc.gif" />Index</a></div>
</td>
<td width="80">
<div id="button2" class="button">
<a title="search" class="buttonlink" href="" onClick="javascript:parent.menu.location.href='results.html';">
<a title="search" class="buttonlink" href="" onclick="javascript:parent.menu.location.href='results.html';">
<img border="0" src="icons/searchicon.gif" />Search</a></div>
</td>
<td width="80">
<div id="button1" class="button">
<a title="print page" class="buttonlink" href="" onClick="parent.content.window.print();">
<a title="print page" class="buttonlink" href="" onclick="parent.content.window.print();">
<img border="0" src="icons/printicon.gif" />Print</a></div>
</td>
<td width="80">
<div id="button1" class="button">
<a title="print page" class="buttonlink" href="" onClick="javascript:parent.menu.location.href='history.html';">
<a title="print page" class="buttonlink" href="" onclick="javascript:parent.menu.location.href='history.html';">
<img border="0" src="icons/history.gif" />History</a></div>
</td>
<td>&nbsp;
</td>
<td width="200" text-align="right">
<form method="get" onSubmit="javascript:doQuery();" />
<form method="get" onsubmit="javascript:doQuery();" />
<input type="text" name="search" id="search" />
<input style="background-color:#10387B;;" type="image" src='icons/wht_go.gif' />
</form>
......
......@@ -42,7 +42,7 @@ class TikiLib extends TikiDB {
function httprequest($url, $reqmethod = HTTP_REQUEST_METHOD_GET) {
global $use_proxy,$proxy_host,$proxy_port;
// test url :
if (!preg_match("/^[-_a-zA-Z0-9:\/\.\?&;=\+]*$/",$url)) return false;
if (!preg_match("/^[-_a-zA-Z0-9:\/\.\?&;=\+~%]*$/",$url)) return false;
// rewrite url if sloppy # added a case for https urls
if ( (substr($url,0,7) <> "http://") and
(substr($url,0,8) <> "https://")
......@@ -52,7 +52,7 @@ function httprequest($url, $reqmethod = HTTP_REQUEST_METHOD_GET) {
// (cdx) params for HTTP_Request.
// The timeout may be defined by a DEFINE("HTTP_TIMEOUT",5) in some file...
$aSettingsRequest=array("method"=>$reqmethod,"timeout"=>5);
if (substr_count($url, "/") < 3) {
$url .= "/";
}
......@@ -2146,7 +2146,16 @@ function fetchtopicId($topic) {
}
/*shared*/
function list_articles($offset = 0, $maxRecords = -1, $sort_mode = 'publishDate_desc', $find = '', $date = '', $user, $type = '', $topicId = '') {
# Returns a topicname from passed topicid
function fetchtopicId($topic) {
$topicId = '';
$query = "select `topicId` from `tiki_topics` where `name` = ?";
$topicId = $this->getOne($query, array($topic) );
return $topicId;
}
/*shared*/
function list_articles($offset = 0, $maxRecords = -1, $sort_mode = 'publishDate_desc', $find = '', $date = '', $user, $type = '', $topicId = '', $visible_only = '') {
global $userlib;
$mid = " where `tiki_articles`.`type` = `tiki_article_types`.`type` and `tiki_articles`.`author` = `users_users`.`login` ";
......@@ -2175,6 +2184,17 @@ function list_articles($offset = 0, $maxRecords = -1, $sort_mode = 'publishDate_
}
if ($visible_only) {
$now = date('U');
$bindvars[]=$now;
$bindvars[]=$now;
if ($mid) {
$mid .= " and (`tiki_articles`.`publishDate`<? or `tiki_article_types`.`show_pre_publ`='y') and (`tiki_articles`.`expireDate`>? or `tiki_article_types`.`show_post_expire`='y')";
} else {
$mid .= " where (`tiki_articles`.`publishDate`<? or `tiki_article_types`.`show_pre_publ`='y') and (`tiki_articles`.`expireDate`>? or `tiki_article_types`.`show_post_expire`='y')";
}
}
$query = "select `tiki_articles`.*,
`users_users`.`avatarLibName`,
`tiki_article_types`.`use_ratings`,
......@@ -4547,7 +4567,7 @@ function parse_data($data) {
// NOTE: That strict math formula (split into 3 areas) gives
// bad visual effects...
// $align = ($align_len < (TEXTAREA_SZ / 3)) ? "left"
// $align = ($align_len < (TEXTAREA_SZ / 3)) ? "left"
// : (($align_len > (2 * TEXTAREA_SZ / 3)) ? "right" : "center");
//
// Going to introduce some heuristic here :)
......@@ -4574,7 +4594,7 @@ function parse_data($data) {
continue;
}
// Replace old styled titlebars
// Replace old styled titlebars
if (strlen($line) != strlen($line = preg_replace("/-=(.+?)=-/", "<div class='titlebar'>$1</div>", $line))) {
$data .= $line;
......
......@@ -11,7 +11,7 @@ class UserPrefsLib extends TikiLib {
function set_user_avatar($user, $type, $avatarLibName, $avatarName, $avatarSize, $avatarType, $avatarData) {
$query = "update `users_users` set `avatarType` = ?, `avatarLibName` = ?, `avatarName` = ?, `avatarSize` = ?, `avatarFileType` = ?, `avatarData` = ? where `login`=?";
$result = $this->query($query,array($type,$avatarLibName,$avatarName,$avatarSize,$avatarType,$avatarData,$user));
$result = $this->query($query,array($type,$avatarLibName,$avatarName,($avatarSize?$avatarSize:NULL),$avatarType,$avatarData,$user));
}
function get_user_avatar_img($user) {
......
......@@ -418,27 +418,27 @@ class UsersLib extends TikiLib {
));
if ($result->numRows()) {
$t = date("U");
// $t = date("U");
//
// Check
$current = $this->getOne("select `currentLogin` from `users_users` where `login`=?", array($user));
if (is_null($current)) {
// First time
$current = $t;
}
$query = "update `users_users` set `lastLogin`=? where `login`=?";
$result = $this->query($query, array(
(int)$current,
$user
));
// $current = $this->getOne("select `currentLogin` from `users_users` where `login`=?", array($user));
//
// if (is_null($current)) {
// // First time
// $current = $t;
// }
// $query = "update `users_users` set `lastLogin`=? where `login`=?";
// $result = $this->query($query, array(
// (int)$current,
// $user
// ));
// check
$query = "update `users_users` set `currentLogin`=? where `login`=?";
$result = $this->query($query, array(
(int)$t,
$user
));
// $query = "update `users_users` set `currentLogin`=? where `login`=?";
// $result = $this->query($query, array(
// (int)$t,
// $user
// ));
return true;
}
......
<?php
// $Header: /cvsroot/tikiwiki/tiki/modules/mod-last_articles.php,v 1.2 2003-10-20 01:13:43 zaufi Exp $
$ranking = $tikilib->list_articles(0,$module_rows,'publishDate_desc', '', date("U"), '', '', '');
// $Header: /cvsroot/tikiwiki/tiki/modules/mod-last_articles.php,v 1.3 2004-03-15 21:27:33 mose Exp $
$ranking = $tikilib->list_articles(0,$module_rows,'publishDate_desc', '', date("U"), '', '', '', 'y');
$smarty->assign('modLastArticles',$ranking["data"]);
$smarty->assign('nonums', isset($module_params["nonums"]) ? $module_params["nonums"] : 'n');
?>
......@@ -28,7 +28,7 @@ function returnSelected() {
<option>the lazy dog.</option>
</select>
<input type="button" value=" Go " onClick="returnSelected()">
<input type="button" value=" Go " onclick="returnSelected()">
</div>
</form>
......
......@@ -200,7 +200,7 @@ function btnOKClick() {
<INPUT ID=txtVertical style="left: 24.92em; top: 11.5596em; width: 4.2em; height: 2.1294em; ime-mode: disabled;" type=text size=3 maxlength=3 value="" tabIndex=30 onfocus="select()">
<BUTTON ID=btnOK style="left: 31.36em; top: 1.0647em; width: 7em; height: 2.2em; " type=submit tabIndex=40>OK</BUTTON>
<BUTTON ID=btnCancel style="left: 31.36em; top: 3.6504em; width: 7em; height: 2.2em; " type=reset tabIndex=45 onClick="window.close();">Cancel</BUTTON>
<BUTTON ID=btnCancel style="left: 31.36em; top: 3.6504em; width: 7em; height: 2.2em; " type=reset tabIndex=45 onclick="window.close();">Cancel</BUTTON>
</BODY>
</HTML>
\ No newline at end of file
This diff is collapsed.
{* $Header: /cvsroot/tikiwiki/tiki/templates/debug/tiki-debug_console_help.tpl,v 1.2 2003-11-10 02:26:53 zaufi Exp $ *}
{* $Header: /cvsroot/tikiwiki/tiki/templates/debug/tiki-debug_console_help.tpl,v 1.3 2004-03-15 21:27:35 mose Exp $ *}
{* Show help for debugger commands *}
{if $command_result.action eq 'one'}
......@@ -6,7 +6,7 @@
{* Show help about single command *}
<table border="0">
<tr>
<td width=15%><code>{$command_result.name}</code></td>
<td width="15%"><code>{$command_result.name}</code></td>
<td>{$command_result.description} </td>
</tr>
<tr><td><br /></td></tr>
......@@ -29,7 +29,7 @@
<table border="0">
{section name=i loop=$command_result[0]}
<tr>
<td width=15%><code>{$command_result[0][i].cmd}</code></td>
<td width="15%"><code>{$command_result[0][i].cmd}</code></td>
<td>{$command_result[0][i].description}</td>
</tr>
{/section}
......
......@@ -28,7 +28,7 @@
{include file="bidi.tpl"}
<title>
{$siteTitle}
{if $page ne ''} : {$page}
{if $page ne ''} : {$page|escape}
{elseif $headtitle} : {$headtitle}
{elseif $title ne ''} : {$title}
{elseif $thread_info.title ne ''} : {$thread_info.title}
......
{* $Header: /cvsroot/tikiwiki/tiki/templates/modules/mod-live_support.tpl,v 1.9 2003-11-23 03:53:04 zaufi Exp $ *}
{* $Header: /cvsroot/tikiwiki/tiki/templates/modules/mod-live_support.tpl,v 1.10 2004-03-15 21:27:35 mose Exp $ *}
{if $feature_live_support eq 'y'}
{tikimodule title="{tr}Live support{/tr}" name="live_support"}
{if $modsupport > 0}
<a href="#" onClick='javascript:window.open("tiki-live_support_client.php","","menubar=,scrollbars=yes,resizable=yes,height=450,width=300");'><img border="0" src="tiki-live_support_server.php?operators_online=1" alt="image" /></a>
<a href="#" onclick='javascript:window.open("tiki-live_support_client.php","","menubar=,scrollbars=yes,resizable=yes,height=450,width=300");'><img border="0" src="tiki-live_support_server.php?operators_online=1" alt="image" /></a>
{else}
<img border="0" src="tiki-live_support_server.php?operators_online=0" alt="image" />
{/if}
......
......@@ -70,7 +70,7 @@
{/foreach}
<input type="submit" name="ticket_action_button" value="{tr}Click here to confirm your action{/tr}" />
</form><br /><br />
<div class="button2"><a href="#" onClick="toggle('details');" class="linkbut">{tr}Details{/tr}</a></div>
<div class="button2"><a href="#" onclick="toggle('details');" class="linkbut">{tr}Details{/tr}</a></div>
<div class="wikitext" id="details" style="display:none;">
{foreach key=kp item=ip from=$smarty.post}
<div>POST {$kp} = {$ip|escape}</div>
......
......@@ -9,7 +9,7 @@
</script>
{/if}
<!--<a {popup sticky="true" trigger="onClick" caption="Special characters help" text="kj"}>foo</a><br />-->
<!--<a {popup sticky="true" trigger="onclick" caption="Special characters help" text="kj"}>foo</a><br />-->
{if $preview}
{include file="tiki-preview.tpl"}
{/if}
......
......@@ -11,7 +11,7 @@
</form>
{/if}
{else}
<form name="loginbox" action="{$login_url}" method="post" {if $feature_challenge eq 'y'}onSubmit="doChallengeResponse()"{/if}>
<form name="loginbox" action="{$login_url}" method="post" {if $feature_challenge eq 'y'}onsubmit="doChallengeResponse()"{/if}>
{if $feature_challenge eq 'y'}
<script language="javascript" type='text/javascript' src="lib/md5.js"></script>