Permalink
Browse files

deleted files and folders as requested by DJPhil. and merged in chang…

…es sent.
  • Loading branch information...
1 parent e69af66 commit bd03d378940d30cc47f51ada332e2485864a1c6b @keverw keverw committed Apr 22, 2013
Showing with 65 additions and 5,559 deletions.
  1. +0 −35 www/app/google_map/data/map.php
  2. BIN www/app/google_map/default.jpg
  3. +0 −3 www/app/google_map/docs/How to get your Google API key.url
  4. 0 www/app/google_map/index.html
  5. +0 −16 www/app/google_map/index.php
  6. +0 −43 www/app/google_map/style.css
  7. +0 −139 www/app/google_map/url.js
  8. +0 −111 www/app/management/region-generate.php
  9. +0 −327 www/app/management/uuid.inc.php
  10. +0 −903 www/app/map/effects.js
  11. BIN www/app/map/images/b_pan_d.png
  12. BIN www/app/map/images/b_pan_l.png
  13. BIN www/app/map/images/b_pan_r.png
  14. BIN www/app/map/images/b_pan_u.png
  15. BIN www/app/map/images/center.gif
  16. BIN www/app/map/images/center.png
  17. BIN www/app/map/images/close_new.gif
  18. BIN www/app/map/images/corner_vert.gif
  19. BIN www/app/map/images/go_there.gif
  20. 0 www/app/map/images/index.html
  21. BIN www/app/map/images/info.gif
  22. BIN www/app/map/images/loading.gif
  23. BIN www/app/map/images/pan_down.gif
  24. BIN www/app/map/images/pan_down.png
  25. BIN www/app/map/images/pan_left.gif
  26. BIN www/app/map/images/pan_left.png
  27. BIN www/app/map/images/pan_off.png
  28. BIN www/app/map/images/pan_right.gif
  29. BIN www/app/map/images/pan_right.png
  30. BIN www/app/map/images/pan_up.gif
  31. BIN www/app/map/images/pan_up.png
  32. BIN www/app/map/images/person.gif
  33. BIN www/app/map/images/region_down.gif
  34. BIN www/app/map/images/region_nodata.jpg
  35. BIN www/app/map/images/water.jpg
  36. BIN www/app/map/images/white.jpg
  37. BIN www/app/map/images/zoom_in.gif
  38. BIN www/app/map/images/zoom_in.png
  39. BIN www/app/map/images/zoom_in_grey.gif
  40. BIN www/app/map/images/zoom_in_grey.png
  41. BIN www/app/map/images/zoom_out.gif
  42. BIN www/app/map/images/zoom_out.png
  43. BIN www/app/map/images/zoom_out_grey.gif
  44. BIN www/app/map/images/zoom_out_grey.png
  45. +0 −245 www/app/map/index.php
  46. +0 −14 www/app/map/map.css
  47. +0 −1,753 www/app/map/mapapi.js
  48. 0 www/app/map/maptiles/index.html
  49. BIN www/app/map/maptiles/no-mapimage.jpg
  50. +0 −1,793 www/app/map/prototype.js
  51. +3 −3 www/languages/lang_de.php
  52. +3 −3 www/languages/lang_en.php
  53. +2 −2 www/languages/lang_es.php
  54. +3 −3 www/languages/lang_fi.php
  55. +3 −3 www/languages/lang_fr.php
  56. +3 −3 www/languages/lang_gr.php
  57. +3 −3 www/languages/lang_it.php
  58. +3 −3 www/languages/lang_nl.php
  59. +3 −3 www/languages/lang_pt.php
  60. +3 −3 www/languages/lang_slo.php
  61. +28 −0 www/map/index.php
  62. BIN www/map/logo.png
  63. +8 −5 www/map/slmapapi.css
  64. BIN www/map/teleport_btn.gif
  65. +0 −57 www/sites/modules/gridinstatushome.php
  66. 0 www/sites/modules/{gridstatus_horizontal.php → gridstatuslarge.php}
  67. 0 www/sites/modules/{gridstatus.php → gridstatusmini.php}
  68. +0 −6 www/sites/modules/homeadmin.php
  69. +0 −3 www/sites/modules/homeusers.php
  70. +0 −3 www/sites/modules/homevisitor.php
  71. +0 −74 www/sites/modules/slideshow_old.php
@@ -1,35 +0,0 @@
-<?
-include("../../../settings/config.php");
-include("../../../settings/mysql.php");
-
-//Creates XML string and XML document using the DOM
-$dom = new DomDocument('1.0', "UTF-8");
-
-$map = $dom->appendChild($dom->createElement('Map'));
-
-$DbLink = new DB;
-$DbLink->query("SELECT UUID,regionName,locX,locY FROM ".C_REGIONS_TBL);
- while(list($UUID,$regionName,$locX,$locY) = $DbLink->next_record())
- {
- $grid = $map->appendChild($dom->createElement('Grid'));
-
- $uuid = $grid->appendChild($dom->createElement('Uuid'));
- $uuid->appendChild($dom->createTextNode($UUID));
-
- $region = $grid->appendChild($dom->createElement('RegionName'));
- $region->appendChild($dom->createTextNode($regionName));
-
- $locationX = $grid->appendChild($dom->createElement('LocX'));
- $locationX->appendChild($dom->createTextNode($locX));
-
- $locationY = $grid->appendChild($dom->createElement('LocY'));
- $locationY->appendChild($dom->createTextNode($locY));
- }
-
-$dom->formatOutput = true; // set the formatOutput attribute of
- // domDocument to true
-// save XML as string or file
-$test1 = $dom->saveXML(); // put string in test1
-echo $test1;
-
-?>
Deleted file not rendered
@@ -1,3 +0,0 @@
-[InternetShortcut]
-URL=http://code.google.com/apis/maps/signup.html
-Modified=E0CAE6F8A658C90150
No changes.
@@ -1,16 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
- <title>WorldMap for OSgrid</title>
- <script type="text/javascript" src="http://maps.google.com/maps?file=api&v=2"></script>
- <script type="text/javascript" src="url.js"></script>
- <link rel="stylesheet" type="text/css" href="style.css" />
-
- </head>
- <body onload="load()" onunload="GUnload()">
- <div id="content">
- <table><tr><td align="center"><div id="map" style="width:100%;height:100%;"></div></td></tr></table>
- </div>
- </body>
-</html>
@@ -1,43 +0,0 @@
-body {font-family: Verdana, Arial, Helvetica, sans-serif;font-size: 11px;}
-td {text-align:center;}
-#head{height:70px;text-align:center;}
-#title{font-size:22px;font-weight:bold;}
-td#title{text-align:left;white-space:nowrap;}
-#info{font-size:9px;}
-#name{font-size:12px;}
-#log{text-align:left;}
-#img{border:1px solid #000000;width:120px;}
-#menu{font-weight:bold;}
-#tips{font-weight:normal;}
-.cpy {color:#ffffff;}
-#cover {
- display:none;
- position:absolute;
- left:0px;
- top:0px;
- width:100%;
- height:100%;
- background:#000000;
- filter:alpha(opacity=80);
- opacity:0.8;
- -moz-opacity:0.8;
- -khtml-opacity:0.8;
-}
-#dialog {
- display:none;
- width:350px;
- height:380px;
- position:absolute;
- z-index:100;
- background:white;
- padding:2px;
- border:1px solid black;
- padding:5px 25px 0 25px;
-}
-#diattl{font-size:12px;font-weight:bold;}
-#diatbl{width:100%;}
-#diatbl td{text-align:left;height:25px;}
-.diainf{font-size:9px;color:#808080;}
-#error{font-size:9px;color:red;}
-#xml{width:350px;height:200px;font-size:12px;}
-#loader{text-align:center;display:none;margin-top:50px;}
@@ -1,139 +0,0 @@
-var __items;
-function load(){
- if (GBrowserIsCompatible()){
- var div = document.getElementById("map");
- if(div==null){return;}
- if(window.innerWidth){
- div.style.width = (window.innerWidth - 20) + "px";
- div.style.height = (window.innerHeight - 30) + "px";
- }else{
- div.style.width = (document.documentElement.clientWidth - 20) + "px";
- div.style.height = (document.documentElement.clientHeight - 30) + "px";
- }
- var copyCollection = new GCopyrightCollection('<span class="cpy">OSgrid Map</span>');
- var copyright = new GCopyright(1, new GLatLngBounds(new GLatLng(0, 0), new GLatLng(20, 10)), 0, "<span class='cpy'>&copy; 2008 Osgrid.org</span>");
- copyCollection.addCopyright(copyright);
- var tilelayers = [new GTileLayer(copyCollection, 5, 9)];
- tilelayers[0].getTileUrl = function CustomGetTileUrl(a,b){
- return "default.jpg";
- }
- var custommap = new GMapType(tilelayers, new GMercatorProjection(10), "OSGrid Map", {errorMessage:"no data"});
- var map = new GMap2(div)
- map.addControl(new GLargeMapControl());
- map.enableScrollWheelZoom();
- map.addMapType(custommap);
- map.removeMapType(G_NORMAL_MAP);
- map.removeMapType(G_SATELLITE_MAP);
- map.removeMapType(G_HYBRID_MAP);
- map.setCenter(new GLatLng(10,10),6);
- GEvent.addListener(map,"click", function(overlay,point){
- if(overlay){return;}
- var x = point.lng();
- if(x < 0) x--;
- var str = x.toString();
- str = str.substring(0, str.indexOf(".", 0));
- x = 990 + parseInt(str);
- var y = point.lat();
- if(y < 0) y--;
- str = y.toString();
- str = str.substring(0, str.indexOf(".", 0));
- y = 990 + parseInt(str);
- if(isOutOfBounds(x,y)){return;}
- //show info popup if a region exist
- var content = getRegionInfos(x,y);
- if(content!=""){
- msg = content;
- map.openInfoWindowHtml(point, msg);
- }
- }
- );
- var request = getHTTPObject();
- if(request){
- request.onreadystatechange = function(){
- parseMapResponse(request,map);
- };
- request.open("GET","data/map.php",true);
- request.send(null);
- }
- }
-}
-function parseMapResponse(request,map){
- if(request.readyState == 4){
- if(request.status == 200 || request.status == 304){
- var data=parseIEBug(request);
- var root=data.getElementsByTagName('Map')[0];
- if(root==null){return;}
- __items=root.getElementsByTagName("Grid");
- if(__items==null){return;}
- for(var i=0;i<__items.length;i++){
- if(__items[i].nodeType == 1){
- var xmluuid=__items[i].getElementsByTagName("Uuid")[0].firstChild.nodeValue;
- var xmlregionname=__items[i].getElementsByTagName("RegionName")[0].firstChild.nodeValue;
- var xmllocX=__items[i].getElementsByTagName("LocX")[0].firstChild.nodeValue;
- var xmllocY=__items[i].getElementsByTagName("LocY")[0].firstChild.nodeValue;
- xmllocX=xmllocX - 990;
- xmllocY=xmllocY - 990;
- boundaries=new GLatLngBounds(new GLatLng(xmllocY,xmllocX), new GLatLng(xmllocY+1,xmllocX+1));
- var rx=new RegExp("(-)", "g");
- xmluuid = xmluuid.replace(rx,"");
- layer=new GGroundOverlay('data/regions/' + xmluuid + '.jpg', boundaries);
- map.addOverlay(layer);
- }
- }
- }
- }
-}
-function getRegionInfos(x,y){
- if(__items==null){return;}
- var response="";
- for(var i=0;i<__items.length;i++){
- if(__items[i].nodeType == 1){
- var xmllocX=__items[i].getElementsByTagName("LocX")[0].firstChild.nodeValue;
- var xmllocY=__items[i].getElementsByTagName("LocY")[0].firstChild.nodeValue;
- if(xmllocX==x&&xmllocY==y){
- var xmluuid=__items[i].getElementsByTagName("Uuid")[0].firstChild.nodeValue;
- var xmlregionname=__items[i].getElementsByTagName("RegionName")[0].firstChild.nodeValue;
- var rx=new RegExp("(-)", "g");
- xmluuid = xmluuid.replace(rx,"");
- response="<table>";
- response+="<tr><td><span id='name'><b>" + xmlregionname + "</b></span><br /></td></tr>";
- response+="<tr><td><span id='loc'>" + xmllocX + " / " + xmllocY + "</span></td></tr>";
- response+="<tr><td><a class=\"add\" href=\"opensim://osgrid.org:8002/"+xmlregionname+"/"+xmllocX+"/"+xmllocY+"/\">Teleport to this location</a><br /></td></tr>";
- }
- }
- }
- return response;
-}
-function isOutOfBounds(x,y){
-if(x<970||x>1030){return true;}
-if(y<970||y>1030){return true;}
-return false;
-}
-function parseIEBug(request){
-if (document.implementation && document.implementation.createDocument){
-xmlDoc = request.responseXML;
-}else if (window.ActiveXObject){
-var testandoAppend = document.createElement('xml');
-testandoAppend.setAttribute('innerHTML',request.responseText);
-testandoAppend.setAttribute('id','_formjAjaxRetornoXML');
-document.body.appendChild(testandoAppend);
-document.getElementById('_formjAjaxRetornoXML').innerHTML = request.responseText;
-xmlDoc = document.getElementById('_formjAjaxRetornoXML');
-}
-return xmlDoc;
-}
-function getHTTPObject(){
-var xhr = false;
-if(window.XMLHttpRequest){
-var xhr = new XMLHttpRequest();
-}else if(window.ActiveXObject) {
-try{
-var xhr = new ActiveXObject("Msxml2.XMLHTTP");
-}catch(e){
-try{
-var xhr = new ActiveXObject("Microsoft.XMLHTTP");
-}catch(e){xhr=false;}
-}
-}
-return xhr;
-}
@@ -1,111 +0,0 @@
-<?
-if($_SESSION[USERID] == "")
-{
-echo "<script language='javascript'>
-<!--
-window.location.href='index.php?page=home';
-// -->
-</script>";
-}
-else
-{
-require_once("uuid.inc.php");
-
- if($_POST[makefile])
- {
- // Checking if the coords that the user gave already has a region settled
- $query = "SELECT COUNT(*) FROM ".C_REGIONS_TBL." where locX='".$_POST[region_location_x]."' and locY='".$_POST[region_location_y]."'";
- $DbLink->query($query);
- list($count) = $DbLink->next_record();
- if ($count > 0)
- {
- $GENERATED = "There is already a region at the coordinates ".$_POST[region_location_x].", ".$_POST[region_location_y].". ini couldn't be made";
- }
- else
- {
- $GENERATED = '['.$_POST[region_name].']RegionUUID="'.$_POST[region_uuid].'" Location="'.$_POST[region_location_x].','.$_POST[region_location_y].'" InternalAddress="0.0.0.0" InternalPort="'.$_POST[region_ip_port].'" AllowAlternatePorts="false" ExternalHostName="'.$_POST[region_ip_hostname].'"';
- }
- }
-?>
-<div style="height:100%">
-<br />
-<table width="80%" border="0" align="center" cellpadding="3" cellspacing="0" bgcolor="#CCCC00">
- <tr>
- <td><table width="100%" border="0" cellspacing="0" cellpadding="10">
- <tr>
- <td bgcolor="#FFFFFF">
- <div align="center"><b>Generate a new region file<br></b></div></td>
- </tr>
- </table></td>
- </tr>
-</table>
-<br />
-<?
-if($GENERATED)
-{
-?>
-<table width="80%" border="0" align="center" cellpadding="3" cellspacing="0" bgcolor="#CCCC00">
- <tr>
- <td><table width="100%" border="0" cellspacing="0" cellpadding="10">
- <tr>
- <td bgcolor="#FFFFFF">
- <div align="center"><b>This is your region ini file:</b></div></td>
- </tr>
- <tr>
- <td bgcolor="#FFFFFF">
- <div align="center"><textarea cols=120 rows=6><?=$GENERATED?></textarea></div></td>
- </tr>
- </table></td>
- </tr>
-</table>
-<BR>
-<?
-}
-?>
-<form name="form1" method="POST" action="index.php?page=region-generate">
-<TABLE width="80%" border=0 align=center cellpadding="0" cellspacing="0">
- <TR>
- <TD width="221" height="40" align="center" valign="bottom" background="images/main/regions_middle.jpg"><b>Region UUID</b></TD>
- <TD width="221" height="40" align="center" valign="bottom" background="images/main/regions_middle.jpg"><b><input type=text name=region_uuid size=80 readonly value=<?$str = UUID::generate(UUID::UUID_TIME, UUID::FMT_STRING, "osgrid");echo $str;?>></b></TD>
- </TR>
- <TR style='BACKGROUND-COLOR: #e8eff5'>
- <TD width="221" height="40" align="center" valign="middle" bgcolor="#FFFFFF"><b>Region - Name</b></TD>
- <TD width="221" height="40" align="center" valign="middle" bgcolor="#FFFFFF"><input type=text name=region_name size=80></TD>
- </TR>
- <TR style='BACKGROUND-COLOR: #e8eff5'>
- <TD width="221" height="40" align="center" valign="middle" bgcolor="#FFFFFF"><b>Region - Location X</b></TD>
- <TD width="221" height="40" align="center" valign="middle" bgcolor="#FFFFFF"><input type=text name=region_location_x size=80></TD>
- </TR>
- <TR style='BACKGROUND-COLOR: #e8eff5'>
- <TD width="221" height="40" align="center" valign="middle" bgcolor="#FFFFFF"><b>Region - Location Y</b></TD>
- <TD width="221" height="40" align="center" valign="middle" bgcolor="#FFFFFF"><input type=text name=region_location_y size=80></TD>
- </TR>
- <TR style='BACKGROUND-COLOR: #e8eff5'>
- <TD width="221" height="40" align="center" valign="middle" bgcolor="#FFFFFF"><b>Region - IP Port</b></TD>
- <TD width="221" height="40" align="center" valign="middle" bgcolor="#FFFFFF"><input type=text name=region_ip_port size=80></TD>
- </TR>
- <TR style='BACKGROUND-COLOR: #e8eff5'>
- <TD width="221" height="40" align="center" valign="middle" bgcolor="#FFFFFF"><b>Region - External Hostname</b></TD>
- <TD width="221" height="40" align="center" valign="middle" bgcolor="#FFFFFF"><input type=text name=region_ip_hostname size=80></TD>
- </TR>
- <?
- $DbLink->query("SELECT FirstName,LastName FROM ".C_USERS_TBL." where PrincipalID='".$_SESSION[USERID]."'");
- list($first,$last) = $DbLink->next_record();
- ?>
- <TR style='BACKGROUND-COLOR: #e8eff5'>
- <TD width="221" height="40" align="center" valign="middle" bgcolor="#FFFFFF"><b>Region Owner - First Name</b></TD>
- <TD width="221" height="40" align="center" valign="middle" bgcolor="#FFFFFF"><input type=text name=region_master_first readonly size=80 value=<?echo $first?>></TD>
- </TR>
- <TR style='BACKGROUND-COLOR: #e8eff5'>
- <TD width="221" height="40" align="center" valign="middle" bgcolor="#FFFFFF"><b>Region Owner - Last Name</b></TD>
- <TD width="221" height="40" align="center" valign="middle" bgcolor="#FFFFFF"><input type=text name=region_master_last readonly size=80 value=<?echo $last?>></TD>
- </TR>
- <TR style='BACKGROUND-COLOR: #e8eff5'>
- <TD colspan=2 width="221" height="40" align="center" valign="middle" bgcolor="#FFFFFF"><input type=submit name=makefile value="Make the file"></TD>
- </TR>
-</TABLE>
-</form>
-</div>
-<?
-}
-?>
Oops, something went wrong.

0 comments on commit bd03d37

Please sign in to comment.