Updated the website content in several places

* Corrected information about getting the latest development version
  of the client
* Removed the outdated Servers page and link again to the wiki
* Removed some outdated links to external pages
* Removed the empty and unused Screenshots page

Reviewed-by: Thorbjørn Lindeijer

6 files changed, 29 insertions, 120 deletions

diff --git a/downloads.php b/downloads.php
index b075132..3d3c92e 100644
--- a/downloads.php
+++ b/downloads.php
@@ -58,13 +58,14 @@ manually.</p>
 
 <h3>Development version</h3>
 
-<p>The latest versions of our projects are always available from their
-<a href="http://gitorious.org/search?q=category%3Athe-mana-world">Git
-repositories on Gitorious</a>. For checking out the latest development version
-of the client you can use the command:</p>
+<p>The latest version of the client is developed as part of the
+<a href="http://manasource.org/">Mana project</a> and it available from the
+<a href="http://gitorious.org/mana">Git repositories on Gitorious</a>. For
+checking out the latest development version of the client you can use the
+command:</p>
 
 <pre>
-git clone git://gitorious.org/tmw/mainline.git tmw
+git clone git://gitorious.org/mana/mana.git mana
 </pre>
 
 <p>For more instructions and information about other projects like the server
@@ -72,26 +73,6 @@ and the dynamic data, please check our
 <a href="http://wiki.themanaworld.org/index.php/Git_Repository">Git wiki
 page</a>.
 
-<!--
-<a name="repository"></a>
-<h3>Ubuntu repository (out of date)</h3>
-
-<p>For convenience for Ubuntu users, a package repository
-has been set up by Bertram. The repository also contains
-<a href="http://guichan.sourceforge.net/">Guichan</a>, because its latest
-version isn't generally available yet.</p>
-
-<h4>Ubuntu Edgy (i386 and AMD-64)</h4>
-
-<pre>
-deb http://bertram.ifrance.com/ ubuntu edgy
-</pre>
-
-<p>Then to install TMW do:</p>
-
-<p><b>apt-get update<br/>
-apt-get install tmw</b></p>
--->
 <?php
   placeFooter();
 ?>
diff --git a/includes/common.php b/includes/common.php
index 6ce9cc6..9db5c1a 100644
--- a/includes/common.php
+++ b/includes/common.php
@@ -56,7 +56,7 @@ function placeHeader($page_title)
              <div class="section">
               <ul>
                <!-- No newlines after list items because IE 6 can't handle that properly -->
-               <li><a href="index.php">News</a></li><li><a href="about.php">About</a></li><li><a href="downloads.php">Downloads</a></li><li><a href="registration.php">Registration</a></li><li><a href="servers.php">Servers</a></li><li><a href="http://wiki.themanaworld.org/">Wiki</a></li><li><a href="http://forums.themanaworld.org/">Forums</a></li><li><a href="http://mantis.themanaworld.org/">Bug tracker</a></li><li><a href="links.php">Links</a></li></ul>
+               <li><a href="index.php">News</a></li><li><a href="about.php">About</a></li><li><a href="downloads.php">Downloads</a></li><li><a href="registration.php">Registration</a></li><li><a href="http://wiki.themanaworld.org/index.php/Servers">Servers</a></li><li><a href="http://wiki.themanaworld.org/">Wiki</a></li><li><a href="http://forums.themanaworld.org/">Forums</a></li><li><a href="http://mantis.themanaworld.org/">Bug tracker</a></li><li><a href="links.php">Links</a></li></ul>
              </div>
             </div>
            </div>
diff --git a/links.php b/links.php
index c6e5670..0b472d0 100644
--- a/links.php
+++ b/links.php
@@ -7,9 +7,9 @@
 
 <ul>
 <li><a href="http://sourceforge.net/projects/themanaworld/">SouceForge project page</a></li>
-<li><a href="http://platinum.edu.pl/~bjorn/tmw-docs/">Source code documentation</a></li>
-<li><a href="http://themanaworld.org/statcvs/">CVS statistics</a></li>
-<li><a href="http://lists.sourceforge.net/lists/listinfo/themanaworld-commit">Mailing list: Commits</a></li>
+<li><a href="http://doc.manasource.org/">Mana client and server documentation</a></li>
+<li><a href="http://gitorious.org/+tmw-developers">GIT log</a></li>
+<!-- <li><a href="http://lists.sourceforge.net/lists/listinfo/themanaworld-commit">Mailing list: Commits</a></li> -->
 <li><a href="http://lists.sourceforge.net/lists/listinfo/themanaworld-devel">Mailing list: Developers</a></li>
 </ul>
 
@@ -26,20 +26,12 @@
 <li><a href="http://www.zlib.net/">zlib</a> - Compression library</li>
 <li><a href="http://curl.haxx.se/libcurl/">libcurl</a> - File transfer library</li>
 </ul>
-<!--
-<h3>Fansites</h3>
 
-<ul>
-<li><a href="http://www.tmwbrasil.kit.net/">Brazilian fansite</a></li>
-</ul>
--->
 <h3>Other related links</h3>
 
 <ul>
 <li><a href="http://mapeditor.org/">Tiled</a> - Tiled map editor</li>
-<li><a href="http://eathena.deltaanime.net/">eAthena server</a> - Ragnarok Online Server Emulator</li>
-<li><a href="http://rpgdx.net">RPGDX</a> - RPG development community website</li>
-<li><a href="http://digilander.libero.it/eugeniofavalli">Final RPG</a> - Elven's Final RPG project</li>
+<li><a href="http://www.eathena.ws/board/">eAthena server support board</a> - Ragnarok Online Server Emulator</li>
 </ul>
 
 <?php
diff --git a/registration.php b/registration.php
index a845d40..c4c4b95 100644
--- a/registration.php
+++ b/registration.php
@@ -4,7 +4,7 @@
 	require_once('recaptcha-php/recaptchalib.php');
 
 	require_once('recaptcha-php/keys.php');
-	
+
 	$enable_captcha = true;  // modify this in production
 
 	$showform = true;
@@ -18,7 +18,7 @@
 		$acc->setPassword($_POST['password1']);
 		$acc->setEMail($_POST['email']);
 		$acc->setGender($_POST['gender']);
-		
+
 		$val = $acc->validate();
 		if (is_array($val))
 		{
@@ -28,23 +28,23 @@
 			}
 			$showform = true;
 		}
-		
+
 		if ($_POST['password2'] != $_POST['password1'])
 		{
 			$err .= "The given passwords don't match!"; $showform = true;
 		}
-		
+
 		if (TMWAccount::existsUsername( $_POST['username'] ))
 		{
 			$err .= "The username is in use!"; $showform = true;
 		}
-		
+
 		if ($enable_captcha)
 		{
 			// check captcha
 			$resp = recaptcha_check_answer ($privatekey, $_SERVER["REMOTE_ADDR"],
 				$_POST["recaptcha_challenge_field"], $_POST["recaptcha_response_field"]);
-		
+
 			if (!$resp->is_valid)
 			{
 				$err .= "The captcha was incorrect!"; $showform = true;
@@ -61,26 +61,33 @@
 			}
 		}
 	}
-  
+
 	include("includes/common.php");
 	placeHeader("Registration");
-  
-  
+
+
 	if ($showform)
 	{
- 
+
 ?>
 <p>With this form you can register for a new account. <i>We will never give your email to someone else or send you spam! Its only purpose is to be able to send you back whether account creation succeeded.</i></p>
 
 <p><em>This system looks to be broken again. After submitting this form, wait five minutes and then try using the account. If it doesn't work, contact Freeyorp or Jaxad0127 on the forums or IRC. We can make it for you.</em></p>
 
+<p style="background-color: #ede2da; padding: 5px; border: 1px solid
+#9f9894; -moz-border-radius: 10px;"><i>Security warning:</i> Do not use the same username and password on
+two different servers. The server admins can read all of them in clear text and
+nothing stops them from trying them on other servers. It happened a lot in the
+past that users of the official server got "hacked" because they ignored this
+important precaution.</p>
+
 <form action="registration.php" method="post">
 
 	<input type="hidden" name="register" value="true" />
 	<table>
 		<?php if (isset($err))
 		{
-			echo "<tr><td colspan=\"2\" style=\"border: 1px solid red; color: red;\">" . 
+			echo "<tr><td colspan=\"2\" style=\"border: 1px solid red; color: red;\">" .
 				$err . "</td></tr>";
 		}
 		?>
diff --git a/screenshots.php b/screenshots.php
deleted file mode 100644
index 96f13d0..0000000
--- a/screenshots.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-  include("includes/common.php");
-  placeHeader("Screenshots");
-?>
-
-<h3>Screenshots from version 0.0.11</h3>
-
-
-<h3>Screenshots from version 0.0.10</h3>
-
-
-<h3>Screenshots from version 0.0.9</h3>
-
-
-<h3>Older screenshots</h3>
-
-
-<?php
-  placeFooter();
-?>
diff --git a/servers.php b/servers.php
deleted file mode 100644
index 8d493b2..0000000
--- a/servers.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-  include("includes/common.php");
-  placeHeader("Servers");
-?>
-
-<p>There are multiple servers where you can play The Mana World. Each server
-can run a different world. Different servers may be set up for different target
-languages, but also as an entirely separate projects. Below is a non-exhaustive
-list of available servers.</p>
-
-<p style="background-color: #ede2da; padding: 5px; border: 1px solid
-#9f9894; -moz-border-radius: 10px;"><i>Security warning:</i> Do not use the same username and password on
-two different servers. The server admins can read all of them in clear text and
-nothing stops them from trying them on other servers. It happened a lot in the
-past that users of the official server got "hacked" because they ignored this
-important precaution.</p>
-
-<h3>Global The Mana World server (English)</h3>
-
-<p>Address: <b><tt>server.themanaworld.org</tt></b> (port 6901)<br/>
-<a href="http://server.themanaworld.org/">Online player list</a>, <a href="registration.php">Registration</a></p>
-
-<p>This is the official The Mana World server. The current client picks this as
-the default server. One thing to keep in mind is that since it's open to
-everybody, we ask you to speak English when around other people (other
-languages are fine in party or private chat, of course).</p>
-
-<h3>Brazilian The Mana World server (Portugese)</h3>
-
-<p>Address: <b><tt>server.themanaworld.com.br</tt></b> (port 6901)<br/>
-<a href="http://www.themanaworld.com.br/">Forums</a>, <a href="http://code.google.com/p/themanaworld-br/">Website</a></p>
-
-<p>Everybody is welcome to play on this server (though you should probably
-understand Portugese). It features a custom world developed separately from
-the content on the global server, based on the same graphics.</p>
-
-<h3>UFB Mana World</h3>
-
-<p>Address: <b><tt>tmw.ufbteam.com</tt></b> (port 6901)<br/>
-<a href="http://tmw.ufbteam.com/manaworld/">Website</a></p>
-
-<p>A server hosted on a dedicated server in France. All languages are
-accepted in public. Some content is different from the official server.</p>
-
-<h3>More alternative servers</h3>
-
-<p>More servers can be found on the wiki <a href="http://wiki.themanaworld.org/index.php/Servers">Servers</a> page. You may also advertise your own server there!</p>
-
-<?php
-  placeFooter();
-?>