Commit 3f4bbd19 authored by sylvieg's avatar sylvieg

Instant-Auto-Merge from BRANCH-1-9 to HEAD

parent c722443c
......@@ -1809,6 +1809,7 @@ tiki/db/tiki_1.8to1.9.sql -text
tiki/db/tiki_1.9.1to1.9.2.sql -text
tiki/db/tiki_1.9to1.10.sql -text
tiki/db/tiki_1.9to1.9.1.sql -text
tiki/db/tiki_1.9to1.9.2.sql -text
tiki/db/tiki_ddl.sql -text
tiki/db/tiki_mysql.sql -text
tiki/db/tiki_oracle.err.sql -text
......@@ -1824,6 +1825,7 @@ tiki/doc/devtools/cleanCatTrackers.php -text
tiki/doc/devtools/cleanwatch.sh -text
tiki/doc/devtools/csscheck.sh -text
tiki/doc/devtools/cvsup.sh -text
tiki/doc/devtools/diffsql.cmd -text
tiki/doc/devtools/diffsql.sh -text svneol=unset#application/octet-stream
tiki/doc/devtools/extract-img-db-to-fs.php -text
tiki/doc/devtools/findstyledef.pl -text svneol=unset#application/octet-stream
......@@ -4160,6 +4162,7 @@ tiki/templates/map/index.php -text
tiki/templates/map/tiki-map.tpl -text
tiki/templates/map/tiki-map_download.tpl -text
tiki/templates/map/tiki-map_edit.tpl -text
tiki/templates/map/tiki-map_frame.tpl -text
tiki/templates/map/tiki-map_history.tpl -text
tiki/templates/map/tiki-map_upload.tpl -text
tiki/templates/messu-archive.tpl -text
......
......@@ -9,8 +9,8 @@ DOCUMENTATION
* http://tikiwiki.org/InstallTiki for a setup guide
* http://tikiwiki.org/InstallTikiHelp for what to do in case of problems
* 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://prdownloads.sourceforge.net/tikiwiki/tiki16pdfmanual.zip?download
format (350 pages) (outdated at the time of this writing) and a pdf snapshot of doc.tikiwiki.org:
http://sourceforge.net/project/showfiles.php?group_id=64258&package_id=68737
* TikiWiki also has an active IRC channel: #tikiwiki on irc.freenode.net
see http://tikiwiki.org/ConnectingToIRC for how to join the IRC channel
......
......@@ -8,8 +8,10 @@ DOCUMENTATION
* http://tikiwiki.org/InstallTiki for a setup guide
* http://tikiwiki.org/InstallTikiHelp for what to do in case of problems
* 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 (version 1.6 but with many valuable help)
documentation, in pdf format (350 pages) is outdated at the time of this
writing (version 1.6 but with many valuable help). But you can get a
reasonably current PDF-snapshot of doc.tikiwiki.org:
http://sourceforge.net/project/showfiles.php?group_id=64258&package_id=68737
* The documentation for 1.9 version is maintained on http://doc.tikiwiki.org.
You're encouraged to contribute.
......
This source diff could not be displayed because it is too large. You can view the blob instead.
<?php
// $Header: /cvsroot/tikiwiki/tiki/comments.php,v 1.56 2005-10-27 20:12:31 sylvieg Exp $
// $Header: /cvsroot/tikiwiki/tiki/comments.php,v 1.57 2005-11-07 21:42:29 sylvieg Exp $
// Copyright (c) 2002-2005, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
// All Rights Reserved. See copyright.txt for details and a complete list of authors.
......@@ -75,6 +75,8 @@ $smarty->assign_by_ref('comments_request_data', $comments_aux);
if (!isset($_REQUEST['comments_threshold'])) {
$_REQUEST['comments_threshold'] = 0;
} else {
$smarty->assign('comments_threshold_param', '&amp;comments_threshold='.$_REQUEST['comments_threshold']);
}
$smarty->assign('comments_threshold', $_REQUEST['comments_threshold']);
......@@ -189,10 +191,12 @@ if ( ($tiki_p_post_comments == 'y' && (!isset($forum_mode) || $forum_mode == 'n'
$_REQUEST["comments_title"],
$_REQUEST["comments_data"],
$message_id, $in_reply_to );
if ($object[0] != "forum")
if ($object[0] != "forum") {
$smarty->assign("comments_parentId", 0); // to display all the comments
$_REQUEST["comments_reply_threadId"] = 0;
$smarty->assign("comments_reply_threadId", 0); // without the flag
$_REQUEST["comments_parentId"] = 0;
}
$_REQUEST["comments_reply_threadId"] = $_REQUEST["comments_parentId"]; // to have the right re:
$smarty->assign("comments_reply_threadId", $_REQUEST["comments_parentId"]); // without the flag
} else {
$qId = $_REQUEST["comments_threadId"];
if (($tiki_p_edit_comments == 'y' && (!isset($forum_mode) || $forum_mode == 'n'))
......@@ -431,12 +435,14 @@ if (!isset($_REQUEST["comments_style"])) {
// TODO: Make this an option.
$_REQUEST["comments_style"] = 'commentStyle_threaded';
} else {
$smarty->assign('comments_style_param', '&amp;comments_style='.$_REQUEST['comments_style']);
$comments_show = 'y';
}
if (!isset($_REQUEST["comments_sort_mode"])) {
$_REQUEST["comments_sort_mode"] = $comments_default_ordering;
} else {
$smarty->assign('comments_sort_mode_param', '&amp;comments_sort_mode='.$_REQUEST['comments_sort_mode']);
$comments_show = 'y';
}
......
Tiki Copyright
----------------
$Header: /cvsroot/tikiwiki/tiki/copyright.txt,v 1.9 2005-08-29 03:14:43 mose Exp $
$Header: /cvsroot/tikiwiki/tiki/copyright.txt,v 1.10 2005-11-07 21:42:29 sylvieg Exp $
The following list gathers the copyrights holders for tikiwiki
at the state of 1.9.1 version. Each member of that list wrote at
at the state of 1.9.2 version. Each member of that list wrote at
least one line, directly or indirectly, in tikiwiki code source.
The exact proportion of the contribution of each is not an issue,
as any copyright change will involve the agreement of everybody.
......
This source diff could not be displayed because it is too large. You can view the blob instead.
# $Rev$
# $Date: 2005-11-07 18:04:45 $
# $Date: 2005-11-07 21:42:29 $
# $Author: sylvieg $
# $Name: not supported by cvs2svn $
# phpMyAdmin MySQL-Dump
......@@ -2020,6 +2020,7 @@ INSERT INTO tiki_menu_options (menuId,type,name,url,position,section,perm,groupn
INSERT INTO tiki_menu_options (menuId,type,name,url,position,section,perm,groupname) VALUES (42,'o','Categories','tiki-browse_categories.php',25,'feature_categories','tiki_p_view_categories','');
INSERT INTO tiki_menu_options (menuId,type,name,url,position,section,perm,groupname) VALUES (42,'o','Games','tiki-list_games.php',30,'feature_games','tiki_p_play_games','');
INSERT INTO tiki_menu_options (menuId,type,name,url,position,section,perm,groupname) VALUES (42,'o','Calendar','tiki-calendar.php',35,'feature_calendar','tiki_p_view_calendar','');
INSERT INTO tiki_menu_options (menuId,type,name,url,position,section,perm,groupname) VALUES (42,'o','Mobile','tiki-mobile.php',37,'feature_mobile','','');
INSERT INTO tiki_menu_options (menuId,type,name,url,position,section,perm,groupname) VALUES (42,'o','(debug)','javascript:toggle("debugconsole")',40,'feature_debug_console','tiki_p_admin','');
INSERT INTO tiki_menu_options (menuId,type,name,url,position,section,perm,groupname) VALUES (42,'s','MyTiki','tiki-my_tiki.php',50,'','','Registered');
......@@ -2143,7 +2144,7 @@ INSERT INTO tiki_menu_options (menuId,type,name,url,position,section,perm,groupn
INSERT INTO tiki_menu_options (menuId,type,name,url,position,section,perm,groupname) VALUES (42,'o','Admin newsletters','tiki-admin_newsletters.php',910,'feature_newsletters','tiki_p_admin_newsletters','');
INSERT INTO tiki_menu_options (menuId,type,name,url,position,section,perm,groupname) VALUES (42,'s','Ephemerides','tiki-eph.php',950,'feature_eph','','');
INSERT INTO tiki_menu_options (menuId,type,name,url,position,section,perm,groupname) VALUES (42,'o','Admin','tiki-eph_admin.php',955,'feature_eph','tiki_p_eph_admin','');
INSERT INTO tiki_menu_options (menuId,type,name,url,position,section,perm,groupname) VALUES (42,'o','Admin ephemerides','tiki-eph_admin.php',955,'feature_eph','tiki_p_eph_admin','');
INSERT INTO tiki_menu_options (menuId,type,name,url,position,section,perm,groupname) VALUES (42,'s','Charts','tiki-charts.php',1000,'feature_charts','','');
INSERT INTO tiki_menu_options (menuId,type,name,url,position,section,perm,groupname) VALUES (42,'o','Admin charts','tiki-admin_charts.php',1005,'feature_charts','tiki_p_admin_charts','');
......@@ -2942,8 +2943,8 @@ DROP TABLE IF EXISTS tiki_sessions;
CREATE TABLE tiki_sessions (
sessionId varchar(32) NOT NULL default '',
user varchar(40) default NULL,
tikihost varchar(200) default NULL,
timestamp int(14) default NULL,
tikihost varchar(200) default NULL,
PRIMARY KEY (sessionId)
) TYPE=MyISAM;
# --------------------------------------------------------
......@@ -3082,6 +3083,8 @@ CREATE TABLE tiki_submissions (
publishDate int(14) default NULL,
expireDate int(14) default NULL,
created int(14) default NULL,
bibliographical_references text,
resume text,
heading text,
body text,
hash varchar(32) default NULL,
......@@ -4654,6 +4657,7 @@ INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('wiki_top_bar','n');
INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('wiki_uses_slides','n');
INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('wiki_wikisyntax_in_html','full');
INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('default_wiki_diff_style', 'old');
INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('limitedGoGroupHome','y');
# default sizes for mailbox, read box and mail archive
# in messages per user and box (0=unlimited)
......
This diff is collapsed.
This diff is collapsed.
......@@ -850,17 +850,6 @@ CREATE TABLE tiki_featured_links (
) TYPE=MyISAM;
DROP TABLE IF EXISTS tiki_features;
CREATE TABLE tiki_features (
featureId INT NOT NULL AUTO_INCREMENT ,
Name VARCHAR( 200 ) NOT NULL ,
Description text,
Helplink VARCHAR( 200 ) NOT NULL ,
Variable VARCHAR( 200 ) NOT NULL ,
PRIMARY KEY ( featureId )
) TYPE=MyISAM;
DROP TABLE IF EXISTS tiki_file_galleries;
CREATE TABLE tiki_file_galleries (
galleryId int(14) NOT NULL auto_increment,
......
@echo off
rem tool for diffing an old tiki.sql+upgrade script against new tiki.sql.
rem --- temporary table used by this script:
set db=tikisqldiff
rem --- older sql + patch file to newer:
set first=tiki-18.sql
set patch=tiki_1.8to1.9.sql
rem --- newer sql
set second=tiki.sql
rem --- do not edit below this line!
mysqladmin -uroot -f drop %db%
mysqladmin -uroot create %db%
mysql -uroot %db% < %first%
mysql -uroot -f %db% < %patch%
mysqldump -uroot %db% > %first%.dump
mysqladmin -uroot -f drop %db%
mysqladmin -uroot create %db%
mysql -uroot %db% < %second%
mysqldump -uroot %db% > %second%.dump
diff %first%.dump %second%.dump
#!/bin/sh
# $Id: tikirelease.sh,v 1.11 2005-08-29 03:14:44 mose Exp $
# $Id: tikirelease.sh,v 1.12 2005-11-07 21:42:29 sylvieg Exp $
# written and maintained by mose@tikiwiki.org
#
# HOWTO release TikiWiki ?
......@@ -7,14 +7,15 @@
#
#
# pre/
# update changelog.txt (from CVS commit logs)
# update INSTALL
# run doc/devtools/diffsql.sh to make sure tiki.sql and upgrade script from
# previous version give the same db structure
# run db/convertscripts/convertsqls.sh
# update templates/tiki-top_bar.tpl (including templates/styles/*/tiki-top_bar.tpl)
# update templates/tiki-install.tpl
# create the checksum file: copy doc/devtools/tiki-create_md5.php in tiki root and execute it
# - update changelog.txt (from CVS commit logs)
# - update copyright.txt (we _need_ a way to automate this - it was omitted for 1.9.2 release)
# - update INSTALL
# - update README
# - run doc/devtools/diffsql.sh to make sure tiki.sql and upgrade script from
# previous version give the same db structure
# - run db/convertscripts/convertsqls.sh
# - commit your changes
# - create the checksum file: copy doc/devtools/tiki-create_md5.php in tiki root and execute it
#
# 0/ Setup the lines in the configuration section just below with your own
# identity and settings (note that the script could be used on other projects)
......
<?php
/** \file
* $Header: /cvsroot/tikiwiki/tiki/lib/categories/categlib.php,v 1.71 2005-10-16 14:35:09 mose Exp $
* $Header: /cvsroot/tikiwiki/tiki/lib/categories/categlib.php,v 1.72 2005-11-07 21:42:30 sylvieg Exp $
*
* \brief Categories support class
*
......@@ -295,20 +295,10 @@ class CategLib extends TikiLib {
$permMap = $this->map_object_type_to_permission();
$groupList = $this->get_user_groups($user);
// $allowField will return true if user has individual permission on object, in case object has
// individual permissions. It it has not, $allowField will return null, but in this case 'perms'
// will return 0 and we won't check $allowField (that's aliased 'allow' in sql query)
$allowField = " MAX((";
$bindAllow = array();
// 'perms' field in result is the number of individual permissions object has
// $sqlHaving will restrict results considering number of individual permissions 'perms',
// individual permission for user 'allow', and global permissions.
// The condition perms=0 is equivalent to allow is null, but the first one is more didatic, otherwise
// we wouldn't need counting. Does counting reduce performance?
$sqlHaving = " HAVING ((perms=0 AND (o.`type` IN (''";
$bindHaving = array();
$where .= " AND (( u.`objectId` IS NULL AND (o.`type` IN (''";
$allowField = '';
$bindAllow = array();
$addTrackerItem = false;
foreach ($permMap as $objType => $permName) {
if (empty($type) || $type == $objType || ($type == "trackerItem" && $objType == "tracker")) {
......@@ -323,21 +313,19 @@ class CategLib extends TikiLib {
global $$permName;
if ($$permName == 'y' && (empty($type) || $type != "trackerItem")) {
$sqlHaving .= ",?";
$bindHaving[] = $objType;
$where .= ",?";
$bindWhere[] = $objType;
}
if ($objType == "tracker" && $$permName == 'y') {
$addTrackerItem = true;
}
}
}
$sqlHaving .= ")";
$where .= ")";
if ($addTrackerItem) {
$sqlHaving .= " OR o.`type` like ?";
$bindHaving[] .= "tracker %";
$where .= " OR o.`type` like ?";
$bindWhere[] .= "tracker %";
}
$sqlHaving .= ")) OR allow=1) ";
$allowField = preg_replace("/OR $/",") ",$allowField);
$allowField .= " AND u.`groupName` IN (''";
......@@ -346,9 +334,9 @@ class CategLib extends TikiLib {
$bindAllow[] = $grp;
$allowField .= ",?";
}
$allowField .= ")) ";
$where .= ")) OR (($allowField )))";
$bindVars = array_merge($bindAllow, $bindWhere, $bindHaving);
$bindVars = array_merge($bindWhere, $bindAllow);
$orderBy = '';
if ($sort_mode) {
......@@ -357,7 +345,7 @@ class CategLib extends TikiLib {
}
}
$query_cant = "SELECT c.*, o.*, count(u.`objectId`) as perms, $allowField as allow FROM `tiki_category_objects` c,`tiki_categorized_objects` o LEFT JOIN `users_objectpermissions` u ON u.`objectId`=MD5(".$this->db->concat("o.`type`","LOWER(o.`objId`)").") AND u.`objectType`=o.`type` WHERE c.`catObjectId`=o.`catObjectId` $where GROUP BY o.`type`, o.`objId` $sqlHaving";
$query_cant = "SELECT DISTINCT c.*, o.* FROM `tiki_category_objects` c,`tiki_categorized_objects` o LEFT JOIN `users_objectpermissions` u ON u.`objectId`=MD5(".$this->db->concat("o.`type`","LOWER(o.`objId`)").") AND u.`objectType`=o.`type` WHERE c.`catObjectId`=o.`catObjectId` $where";
$query = $query_cant . $orderBy;
$result = $this->query($query,$bindVars,$maxRecords,$offset);
$resultCant = $this->query($query_cant,$bindVars);
......
......@@ -6,7 +6,7 @@ if (strpos($_SERVER["SCRIPT_NAME"],basename(__FILE__)) !== false) {
exit;
}
// $Header: /cvsroot/tikiwiki/tiki/lib/hawhaw/hawtikilib.php,v 1.18 2005-10-27 20:12:32 sylvieg Exp $
// $Header: /cvsroot/tikiwiki/tiki/lib/hawhaw/hawtikilib.php,v 1.19 2005-11-07 21:42:30 sylvieg Exp $
// HAWHAW function library for TikiWiki
......@@ -350,6 +350,61 @@ function HAWTIKI_view_blog($listpages, $blog_data)
die;
}
function HAWTIKI_view_blog_post($blog_post_data)
{
// determine title and url switch for navigation links
if (isset($_REQUEST['frame']) && $_REQUEST['frame'] == 'no')
{
$framearg = '&frame=no';
$title = '';
}
else
{
$framearg = '';
$title = $blog_post_data['title'];
}
// determine url switch for jingle playing at links
if (isset($_REQUEST['jingle']) && $_REQUEST['jingle'] == 'no')
$jinglearg = '&jingle=no';
else
$jinglearg = '';
$nonparsed_text = "";
// post title
if ($blog_post_data['title'])
$nonparsed_text .= "!" . $blog_post_data['title'] . "\n";
// post header
$nonparsed_text .= sprintf("__%s ~np~%s~/np~__\n__%s ~np~%s~/np~__\n",
hawtra("posted on"), date(HAWIKI_DATETIME_LONG, $blog_post_data['created']),
hawtra("by"), $blog_post_data['user']);
// post body
$nonparsed_text .= $blog_post_data['data'];
$blogpost = new HAWIKI_page($nonparsed_text, "tiki-index.php?mode=mobile$framearg$jinglearg&page=", $title, "");
if (!isset($_REQUEST['frame']) || $_REQUEST['frame'] != 'no')
{
// create standard hawiki deck with title and navigation links
$blogpost->set_navlink(tra('Blog'), "tiki-view_blog.php?blogId=".$blog_post_data['blogId']."&mode=mobile", HAWIKI_NAVLINK_TOP | HAWIKI_NAVLINK_BOTTOM);
}
if (!isset($_REQUEST['jingle']) || $_REQUEST['jingle'] != 'no')
{
// play standard jingle before link text is spoken
$blogpost->set_link_jingle("lib/hawhaw/link.wav");
}
$blogpost->set_smiley_dir("img/smiles");
$blogpost->set_hawimconv("lib/hawhaw/hawimconv.php");
$blogpost->display();
die;
}
function HAWTIKI_list_articles($listpages, $tiki_p_read_article, $offset, $maxRecords, $cant)
{
......
// functions to be used in the TikiMaps feature
// xGetElementById, Copyright 2001-2005 Michael Foster (Cross-Browser.com)
// Part of X, a Cross-Browser Javascript Library, Distributed under the terms of the GNU LGPL
// BEGIN: Part of X, a Cross-Browser Javascript Library, Distributed under the terms of the GNU LGPL
var xOp7Up,xOp6Dn,xIE4Up,xIE4,xIE5,xNN4,xUA=navigator.userAgent.toLowerCase();
if(window.opera){
var i=xUA.indexOf('opera');
if(i!=-1){
var v=parseInt(xUA.charAt(i+6));
xOp7Up=v>=7;
xOp6Dn=v<7;
}
}else if(navigator.vendor!='KDE' && document.all && xUA.indexOf('msie')!=-1){
xIE4Up=parseFloat(navigator.appVersion)>=4;
xIE4=xUA.indexOf('msie 4')!=-1;
xIE5=xUA.indexOf('msie 5')!=-1;
}else if(document.layers){
xNN4=true;
}
xMac=xUA.indexOf('mac')!=-1;
function xGetElementById(e)
{
......@@ -12,16 +26,18 @@ function xGetElementById(e)
else e=null;
return e;
}
// xDef, Copyright 2001-2005 Michael Foster (Cross-Browser.com)
// Part of X, a Cross-Browser Javascript Library, Distributed under the terms of the GNU LGPL
function xNum()
{
for(var i=0; i<arguments.length; ++i){if(isNaN(arguments[i]) || typeof(arguments[i])!='number') return false;}
return true;
}
function xDef()
{
for(var i=0; i<arguments.length; ++i){if(typeof(arguments[i])=='undefined') return false;}
return true;
}
// xPageY, Copyright 2001-2005 Michael Foster (Cross-Browser.com)
// Part of X, a Cross-Browser Javascript Library, Distributed under the terms of the GNU LGPL
function xPageY(e)
{
......@@ -34,8 +50,6 @@ function xPageY(e)
// if (xOp7Up) return y - document.body.offsetTop; // v3.14, temporary hack for opera bug 130324 (reported 1nov03)
return y;
}
// xPageX, Copyright 2001-2005 Michael Foster (Cross-Browser.com)
// Part of X, a Cross-Browser Javascript Library, Distributed under the terms of the GNU LGPL
function xPageX(e)
{
......@@ -48,9 +62,144 @@ function xPageX(e)
return x;
}
function map_mousemove(e) {
var X = (e.pageX) ? e.pageX : e.clientX;
var Y = (e.pageY) ? e.pageY : e.clientY;
function xAddEventListener(e,eT,eL,cap)
{
if(!(e=xGetElementById(e))) return;
eT=eT.toLowerCase();
if((!xIE4Up && !xOp7Up) && e==window) {
if(eT=='resize') { window.xPCW=xClientWidth(); window.xPCH=xClientHeight(); window.xREL=eL; xResizeEvent(); return; }
if(eT=='scroll') { window.xPSL=xScrollLeft(); window.xPST=xScrollTop(); window.xSEL=eL; xScrollEvent(); return; }
}
var eh='e.on'+eT+'=eL';
if(e.addEventListener) e.addEventListener(eT,eL,cap);
else if(e.attachEvent) e.attachEvent('on'+eT,eL);
else eval(eh);
}
// called only from the above
function xResizeEvent()
{
if (window.xREL) setTimeout('xResizeEvent()', 250);
var cw = xClientWidth(), ch = xClientHeight();
if (window.xPCW != cw || window.xPCH != ch) { window.xPCW = cw; window.xPCH = ch; if (window.xREL) window.xREL(); }
}
function xScrollEvent()
{
if (window.xSEL) setTimeout('xScrollEvent()', 250);
var sl = xScrollLeft(), st = xScrollTop();
if (window.xPSL != sl || window.xPST != st) { window.xPSL = sl; window.xPST = st; if (window.xSEL) window.xSEL(); }
}
function xClientWidth()
{
var w=0;
if(xOp6Dn) w=window.innerWidth;
else if(document.compatMode == 'CSS1Compat' && !window.opera && document.documentElement && document.documentElement.clientWidth)
w=document.documentElement.clientWidth;
else if(document.body && document.body.clientWidth)
w=document.body.clientWidth;
else if(xDef(window.innerWidth,window.innerHeight,document.height)) {
w=window.innerWidth;
if(document.height>window.innerHeight) w-=16;
}
return w;
}
function xClientHeight()
{
var h=0;
if(xOp6Dn) h=window.innerHeight;
else if(document.compatMode == 'CSS1Compat' && !window.opera && document.documentElement && document.documentElement.clientHeight)
h=document.documentElement.clientHeight;
else if(document.body && document.body.clientHeight)
h=document.body.clientHeight;
else if(xDef(window.innerWidth,window.innerHeight,document.width)) {
h=window.innerHeight;
if(document.width>window.innerWidth) h-=16;
}
return h;
}
function xScrollLeft(e, bWin)
{
var offset=0;
if (!xDef(e) || bWin || e == document || e.tagName.toLowerCase() == 'html' || e.tagName.toLowerCase() == 'body') {
var w = window;
if (bWin && e) w = e;
if(w.document.documentElement && w.document.documentElement.scrollLeft) offset=w.document.documentElement.scrollLeft;
else if(w.document.body && xDef(w.document.body.scrollLeft)) offset=w.document.body.scrollLeft;
}
else {
e = xGetElementById(e);
if (e && xNum(e.scrollLeft)) offset = e.scrollLeft;
}
return offset;
}
function xScrollTop(e, bWin)
{
var offset=0;
if (!xDef(e) || bWin || e == document || e.tagName.toLowerCase() == 'html' || e.tagName.toLowerCase() == 'body') {
var w = window;
if (bWin && e) w = e;
if(w.document.documentElement && w.document.documentElement.scrollTop) offset=w.document.documentElement.scrollTop;
else if(w.document.body && xDef(w.document.body.scrollTop)) offset=w.document.body.scrollTop;
}
else {
e = xGetElementById(e);
if (e && xNum(e.scrollTop)) offset = e.scrollTop;
}
return offset;
}
function xEvent(evt) // object prototype
{
var e = evt || window.event;
if(!e) return;
if(e.type) this.type = e.type;
if(e.target) this.target = e.target;
else if(e.srcElement) this.target = e.srcElement;
// Section B
if (e.relatedTarget) this.relatedTarget = e.relatedTarget;
else if (e.type == 'mouseover' && e.fromElement) this.relatedTarget = e.fromElement;
else if (e.type == 'mouseout') this.relatedTarget = e.toElement;
// End Section B
if(xOp6Dn) { this.pageX = e.clientX; this.pageY = e.clientY; }
else if(xDef(e.pageX,e.pageY)) { this.pageX = e.pageX; this.pageY = e.pageY; }
else if(xDef(e.clientX,e.clientY)) { this.pageX = e.clientX + xScrollLeft(); this.pageY = e.clientY + xScrollTop(); }
// Section A
if (xDef(e.offsetX,e.offsetY)) {
this.offsetX = e.offsetX;
this.offsetY = e.offsetY;
}
else if (xDef(e.layerX,e.layerY)) {
this.offsetX = e.layerX;
this.offsetY = e.layerY;
}
else {
this.offsetX = this.pageX - xPageX(this.target);
this.offsetY = this.pageY - xPageY(this.target);
}
// End Section A
if (e.keyCode) { this.keyCode = e.keyCode; } // for moz/fb, if keyCode==0 use which
else if (xDef(e.which) && e.type.indexOf('key')!=-1) { this.keyCode = e.which; }
this.shiftKey = e.shiftKey;
this.ctrlKey = e.ctrlKey;
this.altKey = e.altKey;
}
// END: Part of X, a Cross-Browser Javascript Library, Distributed under the terms of the GNU LGPL
function map_mousemove(evt) {
var e = new xEvent(evt);
var X = e.pageX;
var Y = e.pageY;
obj=xGetElementById('map');
var imagex = xPageX(obj);
......@@ -58,42 +207,45 @@ function map_mousemove(e) {
var posx=((X-imagex)*(maxx-minx)/(xsize))+minx;
var posy=((ysize-Y+imagey)*(maxy-miny)/(ysize))+miny;
status="x= "+posx+", y= "+posy;
document.getElementById("stat").innerHTML = status;
xGetElementById('xx').value=posx;
xGetElementById('yy').value=posy;
return true;
}
function selectimgzoom(x)
{
var arrimgzoom = new Array(8)
arrimgzoom[0]=document.frmmap.imgzoom0
arrimgzoom[1]=document.frmmap.imgzoom1
arrimgzoom[2]=document.frmmap.imgzoom2
arrimgzoom[3]=document.frmmap.imgzoom3
arrimgzoom[4]=document.frmmap.imgzoom4
arrimgzoom[5]=document.frmmap.imgzoom5
arrimgzoom[6]=document.frmmap.imgzoom6
arrimgzoom[7]=document.frmmap.imgzoom7
var arrimgzoom = new Array(8);
arrimgzoom[0]=xGetElementById('imgzoom0');
arrimgzoom[1]=xGetElementById('imgzoom1');
arrimgzoom[2]=xGetElementById('imgzoom2');
arrimgzoom[3]=xGetElementById('imgzoom3');
arrimgzoom[4]=xGetElementById('imgzoom4');
arrimgzoom[5]=xGetElementById('imgzoom5');
arrimgzoom[6]=xGetElementById('imgzoom6');
arrimgzoom[7]=xGetElementById('imgzoom7');
for(var i=0;i<=7;i++)
{
arrimgzoom[i].border=0
arrimgzoom[i].border=0;
if (i==x)
{
arrimgzoom[i].border=1
arrimgzoom[i].border=1;
}
}
}
function zoomin(x){
document.frmmap.zoom.options[x].selected=true
selectimgzoom(x)
xGetElementById('zoom').options[x].selected=true;
selectimgzoom(x);
}
function cbzoomchange() {
var selected
selected=document.frmmap.zoom.selectedIndex
selectimgzoom(selected)
var selected;
selected=xGetElementById('zoom').selectedIndex;
selectimgzoom(selected);
}
<?php
// CVS: $Id: tikilib.php,v 1.621 2005-11-02 18:23:32 sylvieg Exp $
// CVS: $Id: tikilib.php,v 1.622 2005-11-07 21:42:29 sylvieg Exp $
//this script may only be included - so its better to die if called directly.
if (strpos($_SERVER["SCRIPT_NAME"],basename(__FILE__)) !== false) {
header("location: index.php");
......@@ -4093,6 +4093,7 @@ function add_pageview() {
$params_string = str_replace('&gt;', '>', $params_string);
$params_string = str_replace('&lt;', '<', $params_string);
$params_string = str_replace('&quot;', '"', $params_string);
$params_string = str_replace('&amp;', '&', $params_string);
// Construct argument list array
$params = $this->quotesplit(',', trim($params_string) );
......
......@@ -289,7 +289,7 @@ class TrackerLib extends TikiLib {
return false;
$res = $result->fetchrow();
$query = "select * from `tiki_tracker_item_fields` ttif, `tiki_tracker_fields` ttf where ttif.`fieldid`=ttf.`fieldid` and `itemId`=?";
$query = "select * from `tiki_tracker_item_fields` ttif, `tiki_tracker_fields` ttf where ttif.`fieldId`=ttf.`fieldId` and `itemId`=?";
$result = $this->query($query,array((int) $itemid));
$fields = array();
......