Menu
▾
▴
[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[31357] branches/experimental/xajax_removal
|
From: <jon...@us...> - 2010-12-10 19:58:42
|
Revision: 31357
http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=31357&view=rev
Author: jonnybradley
Date: 2010-12-10 19:58:32 +0000 (Fri, 10 Dec 2010)
Log Message:
-----------
[KIL] xajax removal: Part 3 - feature_maps (was dependant on xajax)
Also removed lib/x/ old-style JS package only used in maps.
Kept wikiplugin_map.php so as not to break existing pages (now shows an error).
Google maps untouched.
Modified Paths:
--------------
branches/experimental/xajax_removal/db/tiki.sql
branches/experimental/xajax_removal/lib/prefs/default.php
branches/experimental/xajax_removal/lib/prefs/feature.php
branches/experimental/xajax_removal/lib/prefs/feed.php
branches/experimental/xajax_removal/lib/prefs/global.php
branches/experimental/xajax_removal/lib/setup/prefs.php
branches/experimental/xajax_removal/lib/setup/sections.php
branches/experimental/xajax_removal/lib/tikilib.php
branches/experimental/xajax_removal/lib/wiki-plugins/wikiplugin_map.php
branches/experimental/xajax_removal/templates/header.tpl
branches/experimental/xajax_removal/templates/modules/mod-rsslist.tpl
branches/experimental/xajax_removal/templates/styles/fivealive/tiki-bot_bar.tpl
branches/experimental/xajax_removal/templates/tiki-admin_include_anchors.tpl
branches/experimental/xajax_removal/templates/tiki-admin_include_features.tpl
branches/experimental/xajax_removal/templates/tiki-admin_include_list_sections.tpl
branches/experimental/xajax_removal/templates/tiki-bot_bar.tpl
branches/experimental/xajax_removal/templates/tiki-browse_image.tpl
branches/experimental/xajax_removal/templates/tiki-edit_image.tpl
branches/experimental/xajax_removal/templates/tiki-galleries.tpl
branches/experimental/xajax_removal/templates/tiki-upload_image.tpl
branches/experimental/xajax_removal/templates/tiki-user_preferences.tpl
branches/experimental/xajax_removal/tiki-admin_system.php
branches/experimental/xajax_removal/tiki-admin_toolbars.php
branches/experimental/xajax_removal/tiki-edit_image.php
branches/experimental/xajax_removal/tiki-galleries.php
branches/experimental/xajax_removal/tiki-upload_image.php
Removed Paths:
-------------
branches/experimental/xajax_removal/lib/map/
branches/experimental/xajax_removal/lib/prefs/map.php
branches/experimental/xajax_removal/lib/x/
branches/experimental/xajax_removal/templates/mail/user_watch_map_changed.tpl
branches/experimental/xajax_removal/templates/map/
branches/experimental/xajax_removal/templates/tiki-admin_include_maps.tpl
branches/experimental/xajax_removal/tiki-admin_include_maps.php
branches/experimental/xajax_removal/tiki-map.php
branches/experimental/xajax_removal/tiki-map_download.phtml
branches/experimental/xajax_removal/tiki-map_edit.php
branches/experimental/xajax_removal/tiki-map_history.php
branches/experimental/xajax_removal/tiki-map_rss.php
branches/experimental/xajax_removal/tiki-map_upload.php
branches/experimental/xajax_removal/x_maps.php
Modified: branches/experimental/xajax_removal/db/tiki.sql
===================================================================
--- branches/experimental/xajax_removal/db/tiki.sql 2010-12-10 19:35:40 UTC (rev 31356)
+++ branches/experimental/xajax_removal/db/tiki.sql 2010-12-10 19:58:32 UTC (rev 31357)
@@ -1366,9 +1366,6 @@
INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'s','FAQs','tiki-list_faqs.php',650,'feature_faqs','tiki_p_view_faqs','',0);
INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','List FAQs','tiki-list_faqs.php',665,'feature_faqs','tiki_p_view_faqs','',0);
INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Admin FAQs','tiki-list_faqs.php',660,'feature_faqs','tiki_p_admin_faqs','',0);
-INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'s','Maps','tiki-map.php',700,'feature_maps','tiki_p_map_view','',0);
-INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Mapfiles','tiki-map_edit.php',705,'feature_maps','tiki_p_map_view','',0);
-INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Layer Management','tiki-map_upload.php',710,'feature_maps','tiki_p_map_edit','',0);
INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'s','Quizzes','tiki-list_quizzes.php',750,'feature_quizzes','tiki_p_take_quiz','',0);
INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','List Quizzes','tiki-list_quizzes.php',755,'feature_quizzes','tiki_p_take_quiz','',0);
INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Quiz Stats','tiki-quiz_stats.php',760,'feature_quizzes','tiki_p_view_quiz_stats','',0);
@@ -2901,11 +2898,6 @@
INSERT INTO `users_permissions` (`permName`, `permDesc`, `level`, `type`, `admin`, `feature_check`) VALUES('tiki_p_list_users', 'Can list registered users', 'registered', 'user', NULL, 'feature_friends');
INSERT INTO `users_permissions` (`permName`, `permDesc`, `level`, `type`, `admin`, `feature_check`) VALUES('tiki_p_live_support_admin', 'Admin live support system', 'admin', 'support', 'y', 'feature_live_support');
INSERT INTO `users_permissions` (`permName`, `permDesc`, `level`, `type`, `admin`, `feature_check`) VALUES('tiki_p_live_support', 'Can use live support system', 'basic', 'support', NULL, 'feature_live_support');
-INSERT INTO `users_permissions` (`permName`, `permDesc`, `level`, `type`, `admin`, `feature_check`) VALUES('tiki_p_map_create', 'Can create new mapfile', 'admin', 'maps', NULL, 'feature_maps');
-INSERT INTO `users_permissions` (`permName`, `permDesc`, `level`, `type`, `admin`, `feature_check`) VALUES('tiki_p_map_delete', 'Can delete mapfiles', 'admin', 'maps', NULL, 'feature_maps');
-INSERT INTO `users_permissions` (`permName`, `permDesc`, `level`, `type`, `admin`, `feature_check`) VALUES('tiki_p_map_edit', 'Can edit mapfiles', 'editors', 'maps', NULL, 'feature_maps');
-INSERT INTO `users_permissions` (`permName`, `permDesc`, `level`, `type`, `admin`, `feature_check`) VALUES('tiki_p_map_view', 'Can view mapfiles', 'basic', 'maps', NULL, 'feature_maps');
-INSERT INTO `users_permissions` (`permName`, `permDesc`, `level`, `type`, `admin`, `feature_check`) VALUES('tiki_p_map_view_mapfiles', 'Can view contents of mapfiles', 'registered', 'maps', NULL, 'feature_maps');
INSERT INTO `users_permissions` (`permName`, `permDesc`, `level`, `type`, `admin`, `feature_check`) VALUES('tiki_p_use_webmail', 'Can use webmail', 'registered', 'webmail', NULL, 'feature_webmail,feature_contacts');
INSERT INTO `users_permissions` (`permName`, `permDesc`, `level`, `type`, `admin`, `feature_check`) VALUES('tiki_p_use_group_webmail', 'Can use group webmail', 'registered', 'webmail', NULL, 'feature_webmail,feature_contacts');
INSERT INTO `users_permissions` (`permName`, `permDesc`, `level`, `type`, `admin`, `feature_check`) VALUES('tiki_p_admin_group_webmail', 'Can admin group webmail accounts', 'registered', 'webmail', NULL, 'feature_webmail,feature_contacts');
Modified: branches/experimental/xajax_removal/lib/prefs/default.php
===================================================================
--- branches/experimental/xajax_removal/lib/prefs/default.php 2010-12-10 19:35:40 UTC (rev 31356)
+++ branches/experimental/xajax_removal/lib/prefs/default.php 2010-12-10 19:58:32 UTC (rev 31357)
@@ -16,11 +16,6 @@
'iso-8859-1' => tra('iso-8859-1'),
),
),
- 'default_map' => array(
- 'name' => tra('default mapfile'),
- 'type' => 'text',
- 'size' => '50',
- ),
'default_wiki_diff_style' => array(
'name' => tra('Default diff style'),
'type' => 'list',
Modified: branches/experimental/xajax_removal/lib/prefs/feature.php
===================================================================
--- branches/experimental/xajax_removal/lib/prefs/feature.php 2010-12-10 19:35:40 UTC (rev 31356)
+++ branches/experimental/xajax_removal/lib/prefs/feature.php 2010-12-10 19:58:32 UTC (rev 31357)
@@ -202,13 +202,6 @@
'help' => 'Shoutbox',
'type' => 'flag',
),
- 'feature_maps' => array(
- 'name' => tra('Maps'),
- 'description' => tra('Navigable, interactive maps with user-selectable layers'),
- 'help' => 'Maps',
- 'warning' => tra('Requires mapserver'),
- 'type' => 'flag',
- ),
'feature_gmap' => array(
'name' => tra('Google Maps'),
'description' => tra('Interactive use of Google Maps'),
Modified: branches/experimental/xajax_removal/lib/prefs/feed.php
===================================================================
--- branches/experimental/xajax_removal/lib/prefs/feed.php 2010-12-10 19:35:40 UTC (rev 31356)
+++ branches/experimental/xajax_removal/lib/prefs/feed.php 2010-12-10 19:58:32 UTC (rev 31357)
@@ -184,14 +184,6 @@
'feature_directory',
),
),
- 'feed_maps' => array(
- 'name' => tra('Maps'),
- 'description' => tra('RSS feed for maps'),
- 'type' => 'flag',
- 'dependencies' => array(
- 'feature_maps',
- ),
- ),
'feed_shoutbox' => array(
'name' => tra('Shoutbox'),
'description' => tra('RSS feed for shoutbox'),
Modified: branches/experimental/xajax_removal/lib/prefs/global.php
===================================================================
--- branches/experimental/xajax_removal/lib/prefs/global.php 2010-12-10 19:35:40 UTC (rev 31356)
+++ branches/experimental/xajax_removal/lib/prefs/global.php 2010-12-10 19:58:32 UTC (rev 31357)
@@ -112,29 +112,6 @@
'type' => 'text',
'size' => '30',
),
- 'gdaltindex' => array(
- 'name' => tra('Full path to gdaltindex'),
- 'type' => 'text',
- 'size' => '50',
- 'help' => 'Maps',
- 'perspective' => false,
- ),
- 'ogr2ogr' => array(
- 'name' => tra('Full path to ogr2ogr'),
- 'type' => 'text',
- 'size' => '50',
- 'help' => 'Maps',
- 'perspective' => false,
- ),
- 'mapzone' => array(
- 'name' => tra('Map Zone'),
- 'type' => 'list',
- 'help' => 'Maps',
- 'options' => array(
- '180' => tra('[-180 180]'),
- '360' => tra('[0 360]'),
- ),
- ),
'modallgroups' => array(
'name' => tra('Display modules to all groups always'),
'type' => 'flag',
Deleted: branches/experimental/xajax_removal/lib/prefs/map.php
===================================================================
--- branches/experimental/xajax_removal/lib/prefs/map.php 2010-12-10 19:35:40 UTC (rev 31356)
+++ branches/experimental/xajax_removal/lib/prefs/map.php 2010-12-10 19:58:32 UTC (rev 31357)
@@ -1,26 +0,0 @@
-<?php
-// (c) Copyright 2002-2010 by authors of the Tiki Wiki/CMS/Groupware Project
-//
-// 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.
-// $Id$
-
-function prefs_map_list() {
- return array(
- 'map_path' => array(
- 'name' => tra('full path to mapfiles'),
- 'type' => 'text',
- 'size' => '50',
- ),
- 'map_help' => array(
- 'name' => tra('Wiki Page for Help'),
- 'type' => 'text',
- 'size' => '50',
- ),
- 'map_comments' => array(
- 'name' => tra('Wiki Page for Comments'),
- 'type' => 'text',
- 'size' => '25',
- ),
- );
-}
Modified: branches/experimental/xajax_removal/lib/setup/prefs.php
===================================================================
--- branches/experimental/xajax_removal/lib/setup/prefs.php 2010-12-10 19:35:40 UTC (rev 31356)
+++ branches/experimental/xajax_removal/lib/setup/prefs.php 2010-12-10 19:58:32 UTC (rev 31357)
@@ -1081,17 +1081,6 @@
'rss_mapfiles' => 'n',
'title_rss_mapfiles' => '',
-
- // maps
- 'feature_maps' => 'n',
- 'map_path' => '',
- 'default_map' => '',
- 'map_help' => 'MapsHelp',
- 'map_comments' => 'MapsComments',
- 'gdaltindex' => '',
- 'ogr2ogr' => '',
- 'mapzone' => '180',
-
// gmap
'feature_gmap' => 'n',
'gmap_defaultx' => '0',
Modified: branches/experimental/xajax_removal/lib/setup/sections.php
===================================================================
--- branches/experimental/xajax_removal/lib/setup/sections.php 2010-12-10 19:35:40 UTC (rev 31356)
+++ branches/experimental/xajax_removal/lib/setup/sections.php 2010-12-10 19:58:32 UTC (rev 31357)
@@ -142,13 +142,6 @@
'objectType' => 'calendar',
'itemObjectType' => 'event',
),
- // tra('Map')
- 'maps' => array(
- 'feature' => 'feature_maps',
- 'key' => 'mapId',
- 'itemkey' => '',
- 'objectType' => 'map',
- ),
'gmaps' => array(
'feature' => 'feature_gmap',
'key' => '',
Modified: branches/experimental/xajax_removal/lib/tikilib.php
===================================================================
--- branches/experimental/xajax_removal/lib/tikilib.php 2010-12-10 19:35:40 UTC (rev 31356)
+++ branches/experimental/xajax_removal/lib/tikilib.php 2010-12-10 19:58:32 UTC (rev 31357)
@@ -510,9 +510,6 @@
$res['perm']=($this->user_has_perm_on_object($res['user'],$object,'blog','tiki_p_read_blog') ||
$this->user_has_perm_on_object($res['user'],$object,'blog','tiki_p_admin_blog'));
break;
- case 'map_changed':
- $res['perm']=$this->user_has_perm_on_object($res['user'],$object,'map','tiki_p_map_view');
- break;
case 'forum_post_topic':
$res['perm']=($this->user_has_perm_on_object($res['user'],$object,'forum','tiki_p_forum_read') ||
$this->user_has_perm_on_object($res['user'],$object,'forum','tiki_p_admin_forum'));
@@ -570,7 +567,6 @@
case 'wiki_page_changed': $objectType="wiki page"; break;
case 'wiki_page_created': $objectType="wiki page"; break;
case 'blog_post': $objectType="blog"; break;
- case 'map_changed': $objectType="map_changed"; break;
case 'forum_post_topic': $objectType="forum"; break;
case 'forum_post_thread': $objectType="forum"; break;
case 'file_gallery_changed': $objectType="file gallery"; break;
Modified: branches/experimental/xajax_removal/lib/wiki-plugins/wikiplugin_map.php
===================================================================
--- branches/experimental/xajax_removal/lib/wiki-plugins/wikiplugin_map.php 2010-12-10 19:35:40 UTC (rev 31356)
+++ branches/experimental/xajax_removal/lib/wiki-plugins/wikiplugin_map.php 2010-12-10 19:58:32 UTC (rev 31357)
@@ -5,23 +5,15 @@
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// $Id$
-// Displays an inline map
-// Use:
-// {MAP()}
-// (mapfile=>)
-// (extents=>)
+// Removed in Tiki 7
+// TODO replace this with an alias perhaps?
-function wikiplugin_map_help() {
- return tra("Displays a map").":<br />~np~{MAP(mapfile=>,extents=>,size=>,width=>,height=>) /}~/np~";
-}
-
function wikiplugin_map_info() {
return array(
'name' => tra('Map'),
'documentation' => tra('PluginMap'),
- 'description' => tra('Displays a map'),
- 'prefs' => array( 'feature_maps', 'wikiplugin_map' ),
- 'icon' => 'pics/icons/map.png',
+ 'description' => tra('Displays a map (removed in Tiki 7'),
+ 'prefs' => array( 'wikiplugin_map' ),
'params' => array(
'mapfile' => array(
'required' => true,
@@ -53,44 +45,5 @@
}
function wikiplugin_map($data, $params) {
- global $tikilib, $prefs;
-
- extract ($params,EXTR_SKIP);
-
- $mapdata="";
- if (isset($mapfile)) {
- $mapdata='mapfile='.$mapfile.'&';
- }
-
- $extdata="";
- if (isset($extents)) {
- $dataext=explode("|",$extents);
- if (count($dataext)==4) {
- $minx=floatval($dataext[0]);
- $maxx=floatval($dataext[1]);
- $miny=floatval($dataext[2]);
- $maxy=floatval($dataext[3]);
- $extdata="minx=".$minx."&maxx=".$maxx."&miny=".$miny."&maxy=".$maxy."&zoom=1&";
- }
- }
-
- $sizedata="";
- if (isset($size)) {
- $sizedata="size=".intval($size)."&";
- }
- $widthdata="";
- if (isset($width)) {
- $widthdata='width="'.intval($width).'"';
- }
- $heightdata="";
- if (isset($height)) {
- $heightdata='height="'.intval($height).'"';
- }
- if(@$prefs['feature_maps'] != 'y') {
- $map=tra("Feature disabled");
- } else {
- $map='<object border="0" hspace="0" vspace="0" type="text/html" data="tiki-map.php?'.$mapdata.$extdata.$sizedata.'maponly=frame" '.$widthdata.' '.$heightdata.'><a href="tiki-map.php?'.$mapdata.$extdata.$sizedata.'"><img src="tiki-map.php?'.$mapdata.$extdata.$sizedata.'maponly=yes"/></a></object>';
-
- }
- return $map;
+ return tra('Map feature removed in Tiki 7');
}
Modified: branches/experimental/xajax_removal/templates/header.tpl
===================================================================
--- branches/experimental/xajax_removal/templates/header.tpl 2010-12-10 19:35:40 UTC (rev 31356)
+++ branches/experimental/xajax_removal/templates/header.tpl 2010-12-10 19:58:32 UTC (rev 31357)
@@ -121,9 +121,6 @@
{if $prefs.feature_forums eq 'y' and $prefs.feed_forums eq 'y' and $tiki_p_forum_read eq 'y'}
<link rel="alternate" type="application/rss+xml" title='{$prefs.feed_forums_title|escape|default:"{tr}RSS Forums{/tr}"}' href="tiki-forums_rss.php?ver={$prefs.feed_default_version|escape:'url'}" />
{/if}
-{if $prefs.feature_maps eq 'y' and $prefs.rss_mapfiles eq 'y' and $tiki_p_map_view eq 'y'}
- <link rel="alternate" type="application/rss+xml" title='{$prefs.title_rss_mapfiles|escape|default:"{tr}RSS Maps{/tr}"}' href="tiki-map_rss.php?ver={$prefs.feed_default_version|escape:'url'}" />
-{/if}
{if $prefs.feature_directory eq 'y' and $prefs.feed_directories eq 'y' and $tiki_p_view_directory eq 'y'}
<link rel="alternate" type="application/rss+xml" title='{$prefs.feed_directories_title|escape|default:"{tr}RSS Directories{/tr}"}' href="tiki-directories_rss.php?ver={$prefs.feed_default_version|escape:'url'}" />
{/if}
Deleted: branches/experimental/xajax_removal/templates/mail/user_watch_map_changed.tpl
===================================================================
--- branches/experimental/xajax_removal/templates/mail/user_watch_map_changed.tpl 2010-12-10 19:35:40 UTC (rev 31356)
+++ branches/experimental/xajax_removal/templates/mail/user_watch_map_changed.tpl 2010-12-10 19:58:32 UTC (rev 31357)
@@ -1,10 +0,0 @@
-{tr}The map {$mail_page} was changed by {$mail_user|username} at {$mail_date|tiki_short_datetime}{/tr}
-
-{tr}You can view the updated map following this link:{/tr}
-{$mail_machine_raw}/tiki-map.php?mapfile={$mail_page}
-
-{tr}You can edit the map following this link:{/tr}
-{$mail_machine}?mapfile={$mail_page}
-
-{tr}If you don't want to receive these notifications follow this link:{/tr}
-{$mail_machine_raw}/tiki-user_watches.php?id={$watchId}
Modified: branches/experimental/xajax_removal/templates/modules/mod-rsslist.tpl
===================================================================
--- branches/experimental/xajax_removal/templates/modules/mod-rsslist.tpl 2010-12-10 19:35:40 UTC (rev 31356)
+++ branches/experimental/xajax_removal/templates/modules/mod-rsslist.tpl 2010-12-10 19:58:32 UTC (rev 31357)
@@ -36,12 +36,6 @@
</a>
<br />
{/if}
- {if $prefs.feature_maps eq 'y' and $prefs.rss_mapfiles eq 'y' and $tiki_p_map_view eq 'y'}
- <a class="linkmodule" title="{tr}Maps feed{/tr}" href="tiki-map_rss.php?ver={$prefs.feed_default_version}"><img src='pics/icons/feed.png' style='border: 0; vertical-align: text-bottom;' alt="{tr}Feed{/tr}" title="{tr}Feed{/tr}" width='16' height='16' />
- {tr}Maps{/tr}
- </a>
- <br />
- {/if}
{if $prefs.feature_directory eq 'y' and $prefs.feed_directories eq 'y' and $tiki_p_view_directory eq 'y'}
<a class="linkmodule" href="tiki-directories_rss.php?ver={$prefs.feed_default_version}"><img src='pics/icons/feed.png' style='border: 0; vertical-align: text-bottom;' alt="{tr}Feed{/tr}" title="{tr}Feed{/tr}" width='16' height='16' />
{tr}Directories{/tr}
Modified: branches/experimental/xajax_removal/templates/styles/fivealive/tiki-bot_bar.tpl
===================================================================
--- branches/experimental/xajax_removal/templates/styles/fivealive/tiki-bot_bar.tpl 2010-12-10 19:35:40 UTC (rev 31356)
+++ branches/experimental/xajax_removal/templates/styles/fivealive/tiki-bot_bar.tpl 2010-12-10 19:58:32 UTC (rev 31357)
@@ -53,10 +53,6 @@
<a title="{tr}Forums RSS{/tr}" href="tiki-forums_rss.php?ver={$prefs.feed_default_version}">{icon style='vertical-align: text-bottom;' _id='feed' alt="{tr}RSS feed{/tr}"}</a>
<small>{tr}Forums{/tr}</small>
{/if}
- {if $prefs.feature_maps eq 'y' and $prefs.rss_mapfiles eq 'y' and $tiki_p_map_view eq 'y'}
- <a title="{tr}Maps RSS{/tr}" href="tiki-map_rss.php?ver={$prefs.feed_default_version}">{icon style='vertical-align: text-bottom;' _id='feed' alt="{tr}RSS feed{/tr}"}</a>
- <small>{tr}Maps{/tr}</small>
- {/if}
{if $prefs.feature_directory eq 'y' and $prefs.feed_directories eq 'y' and $tiki_p_view_directory eq 'y'}
<a href="tiki-directories_rss.php?ver={$prefs.feed_default_version}">{icon style='vertical-align: text-bottom;' _id='feed' alt="{tr}RSS feed{/tr}"}</a>
<small>{tr}Directories{/tr}</small>
Modified: branches/experimental/xajax_removal/templates/tiki-admin_include_anchors.tpl
===================================================================
--- branches/experimental/xajax_removal/templates/tiki-admin_include_anchors.tpl 2010-12-10 19:35:40 UTC (rev 31356)
+++ branches/experimental/xajax_removal/templates/tiki-admin_include_anchors.tpl 2010-12-10 19:58:32 UTC (rev 31357)
@@ -92,10 +92,6 @@
{self_link page="directory" _class="icon tips" _title="{tr}Directory{/tr}|{tr}Settings and features for directory of links{/tr}"}{icon _id="pics/large/gnome-fs-server.png" alt="{tr}Directory{/tr}" class="reflect" style="vertical-align: middle" width="32" height="32"}{/self_link}
{/if}
-{if $prefs.feature_maps eq 'y'}
-{self_link page="maps" _class="icon tips" _title="{tr}Maps{/tr}|{tr}Settings and features for maps{/tr}"}{icon _id="pics/large/maps.png" alt="{tr}Maps{/tr}" class="reflect" style="vertical-align: middle" width="32" height="32"}{/self_link}
-{/if}
-
{if $prefs.feature_gmap eq 'y'}
{self_link page="gmap" _class="icon tips" _title="{tr}Google Maps{/tr}|{tr}Defaults and API key for Google Maps{/tr}"}{icon _id="pics/large/google_maps.png" alt="{tr}Google Maps{/tr}" class="reflect" style="vertical-align: middle" width="32" height="32"}{/self_link}
{/if}
Modified: branches/experimental/xajax_removal/templates/tiki-admin_include_features.tpl
===================================================================
--- branches/experimental/xajax_removal/templates/tiki-admin_include_features.tpl 2010-12-10 19:35:40 UTC (rev 31356)
+++ branches/experimental/xajax_removal/templates/tiki-admin_include_features.tpl 2010-12-10 19:58:32 UTC (rev 31357)
@@ -45,7 +45,6 @@
{preference name=feature_directory}
{preference name=feature_quizzes}
{preference name=feature_shoutbox}
- {preference name=feature_maps}
{preference name=feature_gmap}
{preference name=feature_live_support}
{preference name=feature_tell_a_friend}
Modified: branches/experimental/xajax_removal/templates/tiki-admin_include_list_sections.tpl
===================================================================
--- branches/experimental/xajax_removal/templates/tiki-admin_include_list_sections.tpl 2010-12-10 19:35:40 UTC (rev 31356)
+++ branches/experimental/xajax_removal/templates/tiki-admin_include_list_sections.tpl 2010-12-10 19:58:32 UTC (rev 31357)
@@ -69,10 +69,8 @@
{self_link page="directory" _class="admbox" _style="background-image: url('pics/large/gnome-fs-server48x48.png')" _selected="'`$prefs.feature_directory`' != 'y'" _selected_class="admbox off"}<img src="pics/trans.png" alt="{tr}Directory{/tr}" title="{tr}Directory{/tr}{if $prefs.feature_directory ne 'y'} ({tr}Disabled{/tr}){/if}" /><span>{tr}Directory{/tr}</span>{/self_link}
- {self_link page="maps" _class="admbox" _style="background-image: url('pics/large/maps48x48.png')" _selected="'`$prefs.feature_maps`' != 'y'" _selected_class="admbox off"}<img src="pics/trans.png" alt="{tr}Maps{/tr}" title="{tr}Maps{/tr}{if $prefs.feature_maps ne 'y'} ({tr}Disabled{/tr}){/if}" /><span>{tr}Maps{/tr}</span>{/self_link}
-
{self_link page="gmap" _ajax="n" _class="admbox" _style="background-image: url('pics/large/google_maps48x48.png')" _selected="'`$prefs.feature_gmap`' != 'y'" _selected_class="admbox off"}<img src="pics/trans.png" alt="{tr}Google Maps{/tr}" title="{tr}Google Maps{/tr}{if $prefs.feature_gmap ne 'y'} ({tr}Disabled{/tr}){/if}" /><span>{tr}Google Maps{/tr}</span>{/self_link}
-{* Google map does not load on ajax page load - white screens *}
+{* Google map does not load on ajax page load - white screens - was fixed in 6.x? *}
{self_link page="copyright" _class="admbox" _style="background-image: url('pics/large/copyright48x48.png')" _selected="'`$prefs.feature_copyright`' != 'y'" _selected_class="admbox off"}<img src="pics/trans.png" alt="{tr}Copyright{/tr}" title="{tr}Copyright{/tr}{if $prefs.feature_copyright ne 'y'} ({tr}Disabled{/tr}){/if}" /><span>{tr}Copyright{/tr}</span>{/self_link}
{self_link page="messages" _class="admbox" _style="background-image: url('pics/large/messages48x48.png')" _selected="'`$prefs.feature_messages`' != 'y'" _selected_class="admbox off"}<img src="pics/trans.png" alt="{tr}Messages{/tr}" title="{tr}Messages{/tr}{if $prefs.feature_messages ne 'y'} ({tr}Disabled{/tr}){/if}" /><span>{tr}Messages{/tr}</span>{/self_link}
Deleted: branches/experimental/xajax_removal/templates/tiki-admin_include_maps.tpl
===================================================================
--- branches/experimental/xajax_removal/templates/tiki-admin_include_maps.tpl 2010-12-10 19:35:40 UTC (rev 31356)
+++ branches/experimental/xajax_removal/templates/tiki-admin_include_maps.tpl 2010-12-10 19:58:32 UTC (rev 31357)
@@ -1,25 +0,0 @@
-<form action="tiki-admin.php?page=maps" method="post">
- <div class="heading input_submit_container" style="text-align: right">
- <input type="submit" name="mapsset" value="{tr}Change preferences{/tr}" />
- </div>
- <fieldset class="admin">
- <legend>{tr}Settings{/tr}</legend>
- <div class="adminoptionbox">
- {if $map_error neq ''}
- {remarksbox type=warning title="{tr}Warning{/tr}"}{$map_error}{/remarksbox}
- {/if}
- {preference name=map_path}
- {preference name=default_map}
- {preference name=map_help}
- {preference name=map_comments}
- {preference name=gdaltindex}
- {preference name=ogr2ogr}
- {preference name=mapzone}
- </div>
-
- <div class="heading input_submit_container" style="text-align: center">
- <input type="submit" name="mapsset" value="{tr}Change preferences{/tr}" />
- <input type="submit" name="mapuser" value="{tr}Generate User Map{/tr}" />
- </div>
- </fieldset>
-</form>
Modified: branches/experimental/xajax_removal/templates/tiki-bot_bar.tpl
===================================================================
--- branches/experimental/xajax_removal/templates/tiki-bot_bar.tpl 2010-12-10 19:35:40 UTC (rev 31356)
+++ branches/experimental/xajax_removal/templates/tiki-bot_bar.tpl 2010-12-10 19:58:32 UTC (rev 31357)
@@ -53,10 +53,6 @@
<a title="{tr}Forums RSS{/tr}" href="tiki-forums_rss.php?ver={$prefs.feed_default_version}">{icon style='vertical-align: text-bottom;' _id='feed' alt="{tr}RSS feed{/tr}"}</a>
<small>{tr}Forums{/tr}</small>
{/if}
- {if $prefs.feature_maps eq 'y' and $prefs.rss_mapfiles eq 'y' and $tiki_p_map_view eq 'y'}
- <a title="{tr}Maps RSS{/tr}" href="tiki-map_rss.php?ver={$prefs.feed_default_version}">{icon style='vertical-align: text-bottom;' _id='feed' alt="{tr}RSS feed{/tr}"}</a>
- <small>{tr}Maps{/tr}</small>
- {/if}
{if $prefs.feature_directory eq 'y' and $prefs.feed_directories eq 'y' and $tiki_p_view_directory eq 'y'}
<a href="tiki-directories_rss.php?ver={$prefs.feed_default_version}">{icon style='vertical-align: text-bottom;' _id='feed' alt="{tr}RSS feed{/tr}"}</a>
<small>{tr}Directories{/tr}</small>
Modified: branches/experimental/xajax_removal/templates/tiki-browse_image.tpl
===================================================================
--- branches/experimental/xajax_removal/templates/tiki-browse_image.tpl 2010-12-10 19:35:40 UTC (rev 31356)
+++ branches/experimental/xajax_removal/templates/tiki-browse_image.tpl 2010-12-10 19:58:32 UTC (rev 31357)
@@ -103,10 +103,6 @@
<tr><td class="even">{tr}Image Scale{/tr}:</td><td class="even">{if $resultscale}{$xsize_scaled}x{$ysize_scaled}{else}{tr}Original Size{/tr}{/if}</td></tr>
<tr><td class="odd">{tr}Hits{/tr}:</td><td class="odd">{$hits}</td></tr>
<tr><td class="even">{tr}Description{/tr}:</td><td class="even">{$description}</td></tr>
- {if $prefs.feature_maps eq 'y' and $gal_info.geographic eq 'y'}
- <tr><td class="odd">{tr}Latitude (WGS84/decimal degrees){/tr}:</td><td class="odd">{$lat|escape}</td></tr>
- <tr><td class="even">{tr}Longitude (WGS84/decimal degrees){/tr}:</td><td class="even">{$lon|escape}</td></tr>
- {/if}
<tr><td class="odd">{tr}Author{/tr}:</td><td class="odd">{$image_user|userlink}</td></tr>
{if $tiki_p_admin_galleries eq 'y' or ($user and $user eq $owner)}
<tr>
Modified: branches/experimental/xajax_removal/templates/tiki-edit_image.tpl
===================================================================
--- branches/experimental/xajax_removal/templates/tiki-edit_image.tpl 2010-12-10 19:35:40 UTC (rev 31356)
+++ branches/experimental/xajax_removal/templates/tiki-edit_image.tpl 2010-12-10 19:58:32 UTC (rev 31357)
@@ -22,10 +22,6 @@
<table class="formcolor">
<tr><td>{tr}Image Name{/tr}:</td><td><input type="text" name="name" value="{$name|escape}" /></td></tr>
<tr><td>{tr}Image Description{/tr}:</td><td><textarea rows="5" cols="40" name="description">{$description|escape}</textarea></td></tr>
-{if $prefs.feature_maps eq 'y' and $gal_info.geographic eq 'y'}
-<tr><td>{tr}Latitude (WGS84/decimal degrees){/tr}:</td><td><input type="text" name="lat" value="{$lat|escape}" /></td></tr>
-<tr><td>{tr}Longitude (WGS84/decimal degrees){/tr}:</td><td><input type="text" name="lon" value="{$lon|escape}" /></td></tr>
-{/if}
{include file='categorize.tpl'}
<tr><td>{tr}Upload from disk to change the image:{/tr}</td><td>{$filename}<br /><input name="userfile" type="file" />
</td></tr>
@@ -42,10 +38,6 @@
<tr><td class="even">{tr}Image Scale{/tr}:</td><td class="even">{if $resultscale}{$xsize_scaled}x{$ysize_scaled}{else}{tr}Original Size{/tr}{/if}</td></tr>
<tr><td class="odd">{tr}Hits{/tr}:</td><td class="odd">{$hits}</td></tr>
<tr><td class="even">{tr}Description{/tr}:</td><td class="even">{$description}</td></tr>
- {if $prefs.feature_maps eq 'y' and $gal_info.geographic eq 'y'}
- <tr><td class="odd">{tr}Latitude (WGS84/decimal degrees){/tr}:</td><td class="odd">{$lat|escape}</td></tr>
- <tr><td class="even">{tr}Longitude (WGS84/decimal degrees){/tr}:</td><td class="even">{$lon|escape}</td></tr>
- {/if}
<tr><td class="odd">{tr}Author{/tr}:</td><td class="odd">{$image_user|userlink}</td></tr>
{if $tiki_p_admin_galleries eq 'y' or ($user and $user eq $owner)}
<tr>
Modified: branches/experimental/xajax_removal/templates/tiki-galleries.tpl
===================================================================
--- branches/experimental/xajax_removal/templates/tiki-galleries.tpl 2010-12-10 19:35:40 UTC (rev 31356)
+++ branches/experimental/xajax_removal/templates/tiki-galleries.tpl 2010-12-10 19:58:32 UTC (rev 31357)
@@ -37,9 +37,6 @@
{else}
<input type="hidden" name="visible" value="on" />
{/if}
- {if $prefs.feature_maps eq 'y'}
- <tr><td>{tr}Geographic{/tr}:</td><td><input type="checkbox" name="geographic" {if $geographic eq 'y'}checked="checked"{/if} /></td></tr>
- {/if}
{if $prefs.preset_galleries_info ne 'y'}
<tr>
<td>{tr}Max Rows per page{/tr}:</td>
@@ -303,6 +300,5 @@
</tr>
{/section}
</table>
- {if $prefs.feature_maps eq 'y'}{$map_error}{/if}
{pagination_links cant=$cant step=$maxRecords offset=$offset}{/pagination_links}
</div>
Modified: branches/experimental/xajax_removal/templates/tiki-upload_image.tpl
===================================================================
--- branches/experimental/xajax_removal/templates/tiki-upload_image.tpl 2010-12-10 19:35:40 UTC (rev 31356)
+++ branches/experimental/xajax_removal/templates/tiki-upload_image.tpl 2010-12-10 19:58:32 UTC (rev 31357)
@@ -82,22 +82,6 @@
{tr}or use filename{/tr}: <input type="checkbox" name="use_filename" />
</td>
</tr>
- {if $prefs.feature_maps eq 'y' && $geogallery eq 'y'}
- <tr>
- <td>{tr}Latitude (WGS84/decimal degrees){/tr}:</td>
- <td>
- <input type="text" name="lat" value="{$lat|escape}" />
- </td>
- </tr>
- <tr>
- <td>
- {tr}Longitude (WGS84/decimal degrees){/tr}:
- </td>
- <td>
- <input type="text" name="lon" value="{$lon|escape}" />
- </td>
- </tr>
- {/if}
<tr>
<td>{tr}Image Description{/tr}:</td>
<td>
Modified: branches/experimental/xajax_removal/templates/tiki-user_preferences.tpl
===================================================================
--- branches/experimental/xajax_removal/templates/tiki-user_preferences.tpl 2010-12-10 19:35:40 UTC (rev 31356)
+++ branches/experimental/xajax_removal/templates/tiki-user_preferences.tpl 2010-12-10 19:58:32 UTC (rev 31357)
@@ -314,7 +314,7 @@
</tr>
{/if}
- {if $prefs.feature_maps eq 'y' or $prefs.feature_gmap eq 'y'}
+ {if $prefs.feature_gmap eq 'y'}
<tr class="{cycle}">
<td>{tr}Longitude:{/tr}</td>
<td>
Deleted: branches/experimental/xajax_removal/tiki-admin_include_maps.php
===================================================================
--- branches/experimental/xajax_removal/tiki-admin_include_maps.php 2010-12-10 19:35:40 UTC (rev 31356)
+++ branches/experimental/xajax_removal/tiki-admin_include_maps.php 2010-12-10 19:58:32 UTC (rev 31357)
@@ -1,51 +0,0 @@
-<?php
-// (c) Copyright 2002-2010 by authors of the Tiki Wiki/CMS/Groupware Project
-//
-// 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.
-// $Id$
-
-//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");
- exit;
-}
-include_once ('lib/map/usermap.php');
-$map_error = "";
-if (isset($_REQUEST["mapuser"])) {
- $map_error = $mapslib->makeusermap();
-}
-// Setting values if needed
-if ((isset($_REQUEST["map_path"])) && (isset($_REQUEST["default_map"])) && (isset($_REQUEST["map_help"])) && (isset($_REQUEST["map_comments"]))) {
- if (($_REQUEST["map_path"] == '') || ($_REQUEST["default_map"] == '') || ($_REQUEST["map_help"] == '') || ($_REQUEST["map_comments"] == '')) {
- $map_error = tra('All Fields except gdaltindex must be filled');
- }
-}
-if (isset($_REQUEST["map_path"])) {
- if (!is_dir($_REQUEST["map_path"])) {
- $map_error = tra("Path to mapfiles is invalid");
- }
-}
-if (isset($_REQUEST["gdaltindex"])) {
- if (function_exists("is_executable")) { //linux
- if (! is_executable($_REQUEST["gdaltindex"])) {
- $map_error = tra("No valid gdaltindex executable");
- }
- } else { //windows
- if (! is_file($_REQUEST["gdaltindex"])) {
- $map_error = tra("No valid gdaltindex executable");
- }
- }
-}
-if (isset($_REQUEST["ogr2ogr"])) {
- if (function_exists("is_executable")) { //linux
- if (! is_executable($_REQUEST["ogr2ogr"])) {
- $map_error = tra("No valid ogr2ogr executable");
- }
- } else { //windows
- if (! is_file($_REQUEST["ogr2ogr"])) {
- $map_error = tra("No valid ogr2ogr executable");
- }
- }
-}
-$smarty->assign('map_error', $map_error);
Modified: branches/experimental/xajax_removal/tiki-admin_system.php
===================================================================
--- branches/experimental/xajax_removal/tiki-admin_system.php 2010-12-10 19:35:40 UTC (rev 31356)
+++ branches/experimental/xajax_removal/tiki-admin_system.php 2010-12-10 19:58:32 UTC (rev 31357)
@@ -67,9 +67,6 @@
$dirs[] = 'img/wiki';
$dirs[] = 'img/wiki_up';
}
-if ($prefs['feature_maps'] && !empty($prefs['map_path'])) {
- $dirs[] = $prefs['map_path'];
-}
$dirs = array_unique($dirs);
$dirsExist = array();
foreach($dirs as $i => $d) {
Modified: branches/experimental/xajax_removal/tiki-admin_toolbars.php
===================================================================
--- branches/experimental/xajax_removal/tiki-admin_toolbars.php 2010-12-10 19:35:40 UTC (rev 31356)
+++ branches/experimental/xajax_removal/tiki-admin_toolbars.php 2010-12-10 19:58:32 UTC (rev 31357)
@@ -33,7 +33,6 @@
if ($prefs['feature_faqs'] == 'y') { $sections2['faqs'] = tra('FAQs'); }
if ($prefs['feature_newsletters'] == 'y') { $sections2['newsletters'] = tra('Newsletters'); }
if ($prefs['feature_forums'] == 'y') { $sections2['forums'] = tra('Forums'); }
-if ($prefs['feature_maps'] == 'y') { $sections2['maps'] = tra('Maps'); }
if ($prefs['feature_sheet'] == 'y') { $sections2['sheet'] = tra('Spreadsheets'); }
asort($sections2);
Modified: branches/experimental/xajax_removal/tiki-edit_image.php
===================================================================
--- branches/experimental/xajax_removal/tiki-edit_image.php 2010-12-10 19:35:40 UTC (rev 31356)
+++ branches/experimental/xajax_removal/tiki-edit_image.php 2010-12-10 19:58:32 UTC (rev 31357)
@@ -67,10 +67,8 @@
$error_msg = '';
// Avoid warnings
- if ($prefs['feature_maps'] != 'y') {
- $_REQUEST['lat'] = '';
- $_REQUEST['lon'] = '';
- }
+ $_REQUEST['lat'] = '';
+ $_REQUEST['lon'] = '';
if (!empty($_FILES['userfile']) && !empty($_FILES['userfile']['name'])) {
if ((!empty($prefs['gal_match_regex']) && !preg_match('/'.$prefs['gal_match_regex'].'/', $_FILES['userfile']['name'], $reqs))
Modified: branches/experimental/xajax_removal/tiki-galleries.php
===================================================================
--- branches/experimental/xajax_removal/tiki-galleries.php 2010-12-10 19:35:40 UTC (rev 31356)
+++ branches/experimental/xajax_removal/tiki-galleries.php 2010-12-10 19:58:32 UTC (rev 31357)
@@ -10,7 +10,6 @@
global $imagegallib; include_once ("lib/imagegals/imagegallib.php");
global $categlib; include_once ('lib/categories/categlib.php');
-include_once ('lib/map/usermap.php');
$access->check_feature('feature_galleries');
if (isset($_REQUEST["find"])) {
@@ -332,29 +331,6 @@
}
$smarty->assign('category_needed', $category_needed);
-if ($prefs['feature_maps'] == 'y') {
-$map_error="";
-if (isset($_REQUEST["make_map"])) {
- if ($_REQUEST["galleryId"] > 0) {
- $info = $imagegallib->get_gallery_info($_REQUEST["galleryId"]);
-
- if ($tiki_p_admin != 'y' || !$user || $info["user"] != $user) {
- $smarty->assign('errortype', 401);
- $smarty->assign('msg', tra("You do not have permission to make the map of this gallery"));
- $smarty->display("error.tpl");
- die;
- }
-
- $tdo = "gal.".strtr(trim($info["name"])," ","_");
- if ($tikidomain) {
- $tdo = "$tikidomain.".$tdo;
- }
- $map_error=$mapslib->makeimagemap($tdo,$_REQUEST["galleryId"]);
- }
-}
-$smarty->assign('map_error', $map_error);
-}
-
if (!isset($_REQUEST["sort_mode"])) {
$sort_mode = 'name_asc';
} else {
Deleted: branches/experimental/xajax_removal/tiki-map.php
===================================================================
--- branches/experimental/xajax_removal/tiki-map.php 2010-12-10 19:35:40 UTC (rev 31356)
+++ branches/experimental/xajax_removal/tiki-map.php 2010-12-10 19:58:32 UTC (rev 31357)
@@ -1,464 +0,0 @@
-<?php
-// (c) Copyright 2002-2010 by authors of the Tiki Wiki/CMS/Groupware Project
-//
-// 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.
-// $Id$
-
-$_SERVER["SCRIPT_NAME"] = basename(__FILE__);
-require_once ('tiki-setup.php');
-
-// was lib/setup/menus.php but only used here
-function setDisplayMenu($name) {
- global $smarty;
- if ( getCookie($name, 'menu', isset($_COOKIE['menu']) ? null : 'o') == 'o' ) {
- $smarty->assign('mnu_'.$name, 'display:block;');
- $smarty->assign('icn_'.$name, 'o');
- } else {
- $smarty->assign('mnu_'.$name, 'display:none;');
- }
-}
-
-setDisplayMenu('nlmenu');
-setDisplayMenu('evmenu');
-setDisplayMenu('chartmenu');
-setDisplayMenu('mymenu');
-setDisplayMenu('wfmenu');
-setDisplayMenu('usrmenu');
-setDisplayMenu('friendsmenu');
-setDisplayMenu('wikimenu');
-setDisplayMenu('homeworkmenu');
-setDisplayMenu('srvmenu');
-setDisplayMenu('trkmenu');
-setDisplayMenu('quizmenu');
-setDisplayMenu('formenu');
-setDisplayMenu('dirmenu');
-setDisplayMenu('admmnu');
-setDisplayMenu('faqsmenu');
-setDisplayMenu('galmenu');
-setDisplayMenu('cmsmenu');
-setDisplayMenu('blogmenu');
-setDisplayMenu('filegalmenu');
-setDisplayMenu('mapsmenu');
-setDisplayMenu('layermenu');
-setDisplayMenu('shtmenu');
-setDisplayMenu('prjmenu');
-// end from lib/setup/menus.php
-
-include_once ('lib/stats/statslib.php');
-include_once ('lib/map/map_query.php');
-if (!function_exists('ms_newMapObj')) {
- $msg = tra("You must first setup MapServer");
- $smarty->assign('msg', $msg);
- $smarty->display('error.tpl');
- die;
-}
-$access->check_feature(array('feature_maps','ajax_xajax'));
-$access->check_permission('tiki_p_map_view');
-//setting up xajax
-require_once ("lib/ajax/xajax/xajax_core/xajaxAIO.inc.php");
-$xajax = new xajax("x_maps.php");
-//$xajax->setFlag('debug',true);
-//$xajax->configure('statusMessages',true);
-$xajax->register(XAJAX_FUNCTION, "map_redraw");
-$smarty->assign('xajax_javascript', $xajax->getJavascript("lib/ajax/xajax"));
-//handling the layer manager menu: visible by default if never used before
-if (getCookie('layermenu', "menu") != 'o' && getCookie('layermenu', "menu") != 'c') {
- $smarty->assign('mnu_layermenu', 'display:block;');
-}
-$smarty->assign('tiki_p_map_edit', $tiki_p_map_edit);
-if (isset($_REQUEST['mapfile'])) {
- // Validate to prevent displaying any file
- if (strstr($_REQUEST["mapfile"], '..')) {
- $smarty->assign('errortype', 401);
- $msg = tra("You do not have permission to do that");
- $smarty->assign('msg', $msg);
- $smarty->display('error.tpl');
- die;
- }
- $mapfile = $_REQUEST['mapfile'];
-} else {
- $mapfile = $prefs['default_map'];
-}
-$map_path = preg_replace("/\/?$/", "/", $prefs['map_path']);
-//checking the mapfile
-if (!is_file($map_path . $mapfile) || preg_match("/(\/\.)/", $map_path . $mapfile)) {
- $msg = tra("invalid mapfile name") . $map_path . $mapfile;
- $smarty->assign('msg', $msg);
- $smarty->display('error.tpl');
- die;
-}
-// user defined error handling function to handle errors in loading mapfile
-function userErrorHandler($errno, $errmsg, $filename, $linenum, $vars) {
- global $smarty;
- global $style_base;
- global $map_path;
- global $mapfile;
- global $tiki_p_map_edit;
- $msg = tra("An error as occured with the mapfile:") . " " . $mapfile . "<br /><br />" . $errmsg . "<br />";
- $pos = strpos($errmsg, ":(");
- if ($errmsg[$pos + 2] == 'l') {
- $line = substr($errmsg, $pos + 6);
- } else {
- $line = substr($errmsg, $pos + 2);
- }
- $pos = strpos($line, ")");
- $line = substr($line, 0, $pos);
- if ($errmsg[$pos + 2] != 'l') $line++;
- $fcontents = file($map_path . $mapfile);
- $msg.= "<pre>";
- if ($line >= 4) {
- $msg.= " " . $fcontents[$line - 4];
- $msg.= " " . $fcontents[$line - 3];
- $msg.= " " . $fcontents[$line - 2];
- }
- $msg.= "-->" . $fcontents[$line - 1];
- if ($line + 3 < count($fcontents)) {
- $msg.= " " . $fcontents[$line + 0];
- $msg.= " " . $fcontents[$line + 1];
- $msg.= " " . $fcontents[$line + 2];
- $msg.= " " . $fcontents[$line + 3];
- }
- $msg.= "<pre/><br />";
- if ($tiki_p_map_edit == 'y') {
- $msg.= '<a class="link" href="tiki-map_edit.php?mapfile=' . $mapfile . '&mode=editing">';
- $msg.= '<img src="pics/icons/wrench.png" alt="' . tra("edit") . '" title="' . tra("edit") . '" width="16" height="16" />';
- $msg.= '</a>';
- }
- $smarty->assign('msg', $msg);
- $smarty->display('error.tpl');
- die;
-}
-$old_error_handler = set_error_handler("userErrorHandler");
-$map = ms_newMapObj($map_path . $mapfile);
-restore_error_handler();
-$page = $map->name . " Map";
-$smarty->assign("page", $page);
-if ($tikilib->page_exists($page)) {
- $pagelink = '<a href="tiki-index.php?page=' . $page . '">' . $page . '</a>';
-} else {
- $pagelink = $page . '<a href="tiki-editpage.php?page=' . $page . '">?</a>';
-}
-$smarty->assign("pagelink", $pagelink);
-$layerbol = FALSE;
-if (isset($_REQUEST['oldsize'])) {
- $layerbol = TRUE;
-}
-if (isset($_REQUEST['size']) && is_numeric($_REQUEST['size']) && ($_REQUEST['size'] > 0) && ($_REQUEST['size'] < 2000)) {
- $xsize = floor($_REQUEST['size']);
- $ysize = floor(($_REQUEST['size'] * $map->height / $map->width));
- $size = $_REQUEST['size'];
-} else {
- $xsize = $map->width;
- $ysize = $map->height;
- $size = $map->width;
-}
-$map->Set("width", $xsize);
-$map->Set("height", $ysize);
-$map->scalebar->Set("width", $xsize);
-//Mapview. Get first view, to check if view is !/empty
-$map_view = $map->getMetaData("VIEW1");
-$smarty->assign('map_view', $map_view);
-$number_of_views = 30;
-$counter = 0;
-$view_name[] = "";
-$view_values[] = 0;
-for ($i = 1; $i < $number_of_views; $i++) {
- $viewdata = $map->getMetaData("VIEW" . $i);
- if (!empty($viewdata)) {
- $v_data = explode(',', $viewdata, 5);
- $view_name[$i] = $v_data[0];
- $v_minx = $v_data[1];
- $v_miny = $v_data[2];
- $v_maxx = $v_data[3];
- $v_maxy = $v_data[4];
- $view_values[$i] = array($v_minx, $v_miny, $v_maxx, $v_maxy);
- $counter++;
- }
-}
-$smarty->assign('view_name', $view_name);
-$smarty->assign('view_values', $view_values);
-if (isset($_REQUEST['minx']) && isset($_REQUEST['miny']) && isset($_REQUEST['maxx']) && isset($_REQUEST['maxy'])) {
- if (isset($_REQUEST['Go'])) {
- if (empty($map_view) || !(in_array($_REQUEST['view'], $view_name)) || empty($_REQUEST['view'])) {
- $my_extent = ms_newrectObj();
- $my_extent->setextent($map->extent->minx, $map->extent->miny, $map->extent->maxx, $map->extent->maxy);
- } else {
- //set view extents
- for ($view_count = 1; $view_count < $counter + 1; $view_count++) {
- if ($_REQUEST['view'] == $view_name[$view_count]) {
- $j = $view_count;
- $view_minx = $view_values[$j][0];
- $view_miny = $view_values[$j][1];
- $view_maxx = $view_values[$j][2];
- $view_maxy = $view_values[$j][3];
- $my_extent = ms_newrectObj();
- $my_extent->setextent($view_minx, $view_miny, $view_maxx, $view_maxy);
- $view = $_REQUEST['view'];
- }
- }
- }
- } else {
- $my_extent = ms_newrectObj();
- $my_extent->setextent($_REQUEST['minx'], $_REQUEST['miny'], $_REQUEST['maxx'], $_REQUEST['maxy']);
- }
-} else {
- if (isset($_REQUEST['view']) && in_array($_REQUEST['view'], $view_name)) {
- //set view extents
- for ($view_count = 1; $view_count < $counter + 1; $view_count++) {
- if ($_REQUEST['view'] == $view_name[$view_count]) {
- // $view=$_REQUEST['view'];
- $j = $view_count;
- $view_minx = $view_values[$j][0];
- $view_miny = $view_values[$j][1];
- $view_maxx = $view_values[$j][2];
- $view_maxy = $view_values[$j][3];
- $my_extent = ms_newrectObj();
- $my_extent->setextent($view_minx, $view_miny, $view_maxx, $view_maxy);
- $view = $_REQUEST['view'];
- }
- }
- } else {
- $my_extent = ms_newrectObj();
- $my_extent->setextent($map->extent->minx, $map->extent->miny, $map->extent->maxx, $map->extent->maxy);
- }
-}
-$query = FALSE;
-if (isset($_REQUEST['zoom'])) {
- $zoom = $_REQUEST['zoom'];
- $my_point = ms_newpointObj();
- if (isset($_REQUEST['x']) && isset($_REQUEST['y']) && $zoom != 0) {
- if (isset($_REQUEST['oldsize'])) {
- $my_point->setXY(floor($_REQUEST['x'] * $size / $_REQUEST['oldsize']), floor($_REQUEST['y'] * $size / $_REQUEST['oldsize']));
- } else {
- $my_point->setXY(floor($_REQUEST['x']), floor($_REQUEST['y']));
- }
- } else {
- $my_point->setXY(($map->width) / 2, ($map->height) / 2);
- }
- if ($zoom == 0) { // It is a query
- $map->zoompoint(1, $my_point, $map->width, $map->height, $my_extent);
- if (isset($_REQUEST['x']) && isset($_REQUEST['y'])) {
- //get the real world coordinates
- $x = $_REQUEST['x'];
- $y = $_REQUEST['y'];
- $width = $map->width - 1;
- $height = $map->height - 1;
- $minx = $map->extent->minx;
- $maxx = $map->extent->maxx;
- $miny = $map->extent->miny;
- $maxy = $map->extent->maxy;
- $dx = $maxx - $minx;
- $dy = $maxy - $miny;
- $factorx = $dx / $width;
- $factory = $dy / $height;
- $corx = $x * $factorx + $minx;
- $cory = $maxy - $y * $factory;
- $query = TRUE;
- }
- } else {
- $map->zoompoint($zoom, $my_point, $map->width, $map->height, $my_extent);
- }
-} else {
- $zoom = 1;
-}
-$count_group = 0;
-//define which layer is visible, has labels and can be queried
-for ($j = 0; $j < $map->numlayers; $j++) {
- $my_layer = $map->getLayer($j);
- if (isset($_REQUEST[str_replace(" ", "_", $my_layer->name) ])) {
- if ($_REQUEST[str_replace(" ", "_", $my_layer->name) ] == 1) {
- $my_layer->Set("status", MS_ON);
- }
- } else {
- // test to see if we are not on the first drawing
- if ($layerbol) {
- $my_layer->Set("status", MS_OFF);
- }
- }
- //Display labels
- if ($my_layer->labelitem != "") {
- $layer_label[$j] = "On";
- if (isset($_REQUEST[str_replace(" ", "_", $my_layer->name) . "_label"])) {
- $my_layers_label_checked[$j] = "checked";
- } else {
- $my_layers_label_checked[$j] = "";
- $my_layer->Set("labelmaxscale", 0);
- }
- } else {
- $layer_label[$j] = "Off";
- }
- if ($my_layer->tolerance != - 1) {
- $layer_query[$j] = "On";
- } else {
- $layer_query[$j] = "Off";
- }
-}
-// We have a query so let's get the results.
-if ($query) {
- $map_querymsg = map_query($map, $corx, $cory);
- $smarty->assign('map_querymsg', $map_querymsg);
-}
-if (@$_REQUEST['maponly'] == 'frame') {
- $scalebar = $map->scalebar;
- $scalebar->set("status", MS_EMBED);
- $scalebar->set("transparent", TRUE);
-}
-$image = $map->drawquery();
-$image_url = $image->saveWebImage();
-//the user wants an image only
-if (isset($_REQUEST['maponly']) && $_REQUEST['maponly'] == 'yes') {
- header("Content-type: image/png");
- $image_file = str_replace($image->imageurl, $image->imagepath, $image_url);
- readfile($image_file);
- $image->free();
- die;
-}
-if (@$_REQUEST['maponly'] != 'frame') {
- $image_ref = $map->drawReferenceMap();
- $image_ref_url = $image_ref->saveWebImage();
- $image_leg = $map->drawLegend();
- $image_leg_url = $image_leg->saveWebImage();
- $image_scale = $map->drawScaleBar();
- $image_scale_url = $image_scale->saveWebImage();
- $image_leg->free();
- $image_ref->free();
- $image_scale->free();
-}
-$image->free();
-$minx = $map->extent->minx;
-$miny = $map->extent->miny;
-$maxx = $map->extent->maxx;
-$maxy = $map->extent->maxy;
-$smarty->assign('mapfile', $mapfile);
-$smarty->assign('image_url', $image_url);
-if (@$_REQUEST['maponly'] != 'frame') {
- $smarty->assign('image_ref_url', $image_ref_url);
- $smarty->assign('image_leg_url', $image_leg_url);
- $smarty->assign('image_scale_url', $image_scale_url);
-}
-$smarty->assign('minx', $minx);
-$smarty->assign('miny', $miny);
-$smarty->assign('maxx', $maxx);
-$smarty->assign('maxy', $maxy);
-$smarty->assign('size', $size);
-$smarty->assign('xsize', $xsize);
-$smarty->assign('ysize', $ysize);
-$smarty->assign('possiblesizes', array(200, 300, 400, 600, 800, 1000));
-$smarty->assign('displaysizes', array(200, 300, 400, 600, 800, 1000));
-$smarty->assign_by_ref('layer_label', $layer_label);
-$smarty->assign_by_ref('my_layers_label_checked', $my_layers_label_checked);
-$smarty->assign_by_ref('layer_query', $layer_query);
-// is the user registered?
-if (isset($_REQUEST['view_user'])) {
- $userwatch = $_REQUEST['view_user'];
-} else {
- if ($user) {
- $userwatch = $user;
- } else {
- $userwatch = "";
- }
-}
-for ($j = 0; $j < $map->numlayers; $j++) {
- $my_layers[$j] = $map->getLayer($j);
- //getting layer by group
- if (!empty($my_layers[$j]->group)) {
- $my_layer_group[$j] = $my_layers[$j]->group;
- $smarty->assign('unique_layer_group', array_unique($my_layer_group));
- }
- //Metadata handling
- $link = $my_layers[$j]->getMetadata("WIKI");
- if ($link != "") {
- if ($tikilib->page_exists($link)) {
- $layer_wiki[$j] = '<a href="tiki-index.php?page=' . $link . '"><small>' . $my_layers[$j]->name . '</small></a>';
- } else {
- $layer_wiki[$j] = '<small>' . $my_layers[$j]->name . '<a href="tiki-editpage.php?page=' . $link . '">?</a></small>';
- }
- } else {
- $layer_wiki[$j] = '<small>' . $my_layers[$j]->name . '</small>';
- }
- if ($userwatch != "") {
- $layer_download[$j] = $my_layers[$j]->getMetadata("DOWNLOAD");
- } else {
- $layer_download[$j] = "";
- }
- //Layer display Handling
- if ($my_layers[$j]->status == MS_ON) {
- $my_layers_checked[$j] = "checked";
- $bolcheck = 1;
- } else {
- $my_layers_checked[$j] = "";
- $bolcheck = 0;
- }
-}
-$smarty->assign_by_ref('my_layers', $my_layers);
-$smarty->assign_by_ref('my_layers_checked', $my_layers_checked);
-$smarty->assign_by_ref('layer_wiki', $layer_wiki);
-$smarty->assign_by_ref('layer_download', $layer_download);
-$smarty->assign('userwatch', $userwatch);
-for ($i = - 2; $i <= 2; $i++) {
- switch ($i) {
- case "-2":
- $zoom_values[] = $i;
- $zoom_display[] = 'Zoom out';
- break;
-
- case "0":
- $zoom_values[] = $i;
- $zoom_display[] = 'query';
- break;
-
- case "1":
- $zoom_values[] = $i;
- $zoom_display[] = 'pan';
- break;
-
- case "2":
- $zoom_values[] = $i;
- $zoom_display[] = 'Zoom in';
- break;
- }
-}
-$smarty->assign('zoom', $zoom);
-$smarty->assign_by_ref('zoom_values', $zoom_values);
-$smarty->assign_by_ref('zoom_display', $zoom_display);
-//add a hit
-$statslib->stats_hit($mapfile, "map");
-//get some stats info
-$data = nl2br(file_get_contents($map_path . $mapfile));
-$ip = "";
-$lastUser = tra("unknown");
-$lastModif = "";
-if (strpos($data, "##TIKIMAPS HEADER: END##") != FALSE) {
- $searchdata = substr($data, 0, strpos($data, "##TIKIMAPS HEADER: END##"));
- if (strpos($searchdata, "#IP: ") != FALSE) {
- $IP = substr($searchdata, strpos($searchdata, "#IP: ") + 4);
- $ip = substr($IP, 0, strpos($IP, "<br"));
- }
- if (strpos($searchdata, "#Modified by: ") != FALSE) {
- $IP = substr($searchdata, strpos($searchdata, "#Modified by: ") + 13);
- $lastUser = substr($IP, 0, strpos($IP, "<br"));
- }
- if (strpos($searchdata, "#GMT Date: ") != FALSE) {
- $IP = substr($searchdata, strpos($searchdata, "#GMT Date: ") + 10);
- $IP = substr($IP, 0, strpos($IP, "<br"));
- $lastModif = gmmktime(substr($IP, 10, 2), substr($IP, 12, 2), substr($IP, 14, 2), substr($IP, 5, 2), substr($IP, 7, 2), substr($IP, 1, 4));
- }
-}
-$smarty->assign('ip', $ip);
-$smarty->assign('lastUser', $lastUser);
-$smarty->assign('lastModif', $lastModif);
-$mapstats = $statslib->object_hits($mapfile, "map");
-$mapstats7days = $statslib->object_hits($mapfile, "map", 7);
-$smarty->assign('mapstats', $mapstats);
-$smarty->assign('mapstats7days', $mapstats7days);
-//display the template
-if (@$_REQUEST['maponly'] != 'frame') {
- $section = 'maps';
- include_once ('tiki-section_options.php');
- $smarty->assign('mid', 'map/tiki-map.tpl');
- $smarty->display("tiki.tpl");
-} else {
- $smarty->assign("maponly", "frame");
- $smarty->display('map/tiki-map_frame.tpl');
-}
Deleted: branches/experimental/xajax_removal/tiki-map_download.phtml
===================================================================
--- branches/experimental/xajax_removal/tiki-map_download.phtml 2010-12-10 19:35:40 UTC (rev 31356)
+++ branches/experimental/xajax_removal/tiki-map_download.phtml 2010-12-10 19:58:32 UTC (rev 31357)
@@ -1,142 +0,0 @@
-<?php
-
-// $Header: /cvsroot/tikiwiki/tiki/tiki-map_download.phtml,v 1.14 2007-03-06 19:29:49 sylvieg Exp $
-
-// Copyright (c) 2002-2007, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
-// All Rights Reserved. See copyright.txt for details and a complete list of authors.
-// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
-require_once ('tiki-setup.php');
-
-if(@$feature_maps != 'y') {
- $smarty->assign('msg',tra("Feature disabled"));
- $smarty->display("error.tpl");
- die;
-}
-
-if (isset($_REQUEST['view_user'])) {
- $userwatch = $_REQUEST['view_user'];
-} else {
- if ($user) {
- $userwatch = $user;
- } else {
- $smarty->assign('msg', tra("You are not logged in and no user indicated"));
- $smarty->display("error.tpl");
- die;
- }
-}
-
-if (!isset($_GET['mapfile']) || !isset($_GET['layer'])){
- $smarty->assign('msg', tra("You have not specified a mapfile and a layer"));
- $smarty->display("error.tpl");
- die;
-} else {
- $smarty->assign('mapfile', $_GET['mapfile']);
- $smarty->assign('layer', $_GET['layer']);
-}
-
-if (!preg_match('/\.map$/i', $_GET['mapfile'])) {
- $smarty->assign('msg', tra("mapfile name incorrect"));
- $smarty->display("error.tpl");
- die;
-}
-
-if (isset($_GET['mapfile'])){
- // Validate to prevent displaying any file
- if (strstr($_GET["mapfile"], '..')) {
- $smarty->assign('errortype', 401);
- $smarty->assign('msg', tra("You do not have permission to do that"));
- $smarty->display('error.tpl');
- die;
- }
- $mapfile = $_GET['mapfile'];
- $map = ms_newMapObj($map_path.$mapfile);
-} else {
- $map = ms_newMapObj($map_path.$default_map);
-}
-
-// process the mapfile to define if the layer can be downloaded...
-for ($j=0;$j<$map->numlayers;$j++){
- $my_layers=$map->getLayer($j);
-
- //Metadata handling
- $download=FALSE;
- if ($my_layers->name==$_GET['layer']){
- if($my_layers->getMetadata("DOWNLOAD")=='T'){
- $download=TRUE;
- if ($my_layers->connection!=""){
- $download_path=$map_path.$my_layers->connection;
- } else {
- $download_path=$map_path.$my_layers->data;
- }
- }
- }
-}
-
-//get the path and the filename without extension
-$extension = array_pop(explode('.', basename($download_path)));
-$file_name = substr(basename($download_path), 0,"-" . (strlen($extension) + 1));
-$file_path = dirname($download_path);
-
-// creates a temporary filename
-$tempfile="TM".date("YmdHis");
-
-// Get all files from the layer reference
-$files = array();
-$h = opendir($file_path);
-
-//first check if there is not a file with NDL extension
-// to stop download
-$nodownload=FALSE;
-while (($file = readdir($h)) !== false) {
- $extension = array_pop(explode('.', basename($file)));
- if (substr(basename($file), 0,"-" . (strlen($extension) + 1))==$file_name){
- if ($extension=="NDL") {
- $nodownload=TRUE;
- }
- }
-}
-closedir ($h);
-$smarty->assign('nodownload', $nodownload);
-
-$DSEP=DIRECTORY_SEPARATOR;
-
-if (!$nodownload) {
- $h = opendir($file_path);
- while (($file = readdir($h)) !== false) {
- $extension = array_pop(explode('.', basename($file)));
- if (substr(basename($file), 0,"-" . (strlen($extension) + 1))==$file_name){
- $files[] = $file;
- copy($file_path.$DSEP.$file,"files".$DSEP.$tempfile.".".$extension);
- $dfiles[]=$tempfile.".".$extension;
- }
- }
- closedir ($h);
-}
-
-//clean the files directory from old files
-$h = opendir("files");
-
-while (($file = readdir($h)) !== false) {
- if (substr($file,0,2)=="TM") {
- $filedate=substr($file,2,14);
- if ($filedate<=date("YmdHis",mktime (0,0,0,date("m"),date("d")-2,date("Y")))) {
- unlink("files".$DSEP.$file);
- }
- }
-}
-closedir ($h);
-
-// record that the user wanted to download some files
-// to be fixed by adding the tiki_download table definitively
-$userid = $userlib->get_user_id($user);
-
-$smarty->assign('nodownload', $nodownload);
-$smarty->assign_by_ref('files',$files);
-$smarty->assign_by_ref('dfiles',$dfiles);
-
-$section = 'maps';
-include_once ('tiki-section_options.php');
-
-$smarty->assign('mid', 'map/tiki-map_download.tpl');
-$smarty->assign('userwatch', $userwatch);
-$smarty->display('tiki.tpl');
Deleted: branches/experimental/xajax_rem...
[truncated message content] |