diff options
-rw-r--r-- | default.css | 22 | ||||
-rw-r--r-- | downloads.php | 7 | ||||
-rw-r--r-- | images/TMW-email-temaplate-mailer.png | bin | 0 -> 308999 bytes | |||
-rw-r--r-- | includes/common.php | 44 | ||||
-rw-r--r-- | includes/email.php | 63 | ||||
-rw-r--r-- | includes/news.php | 126 | ||||
-rw-r--r-- | index.php | 27 | ||||
-rw-r--r-- | news-feed.php | 7 | ||||
-rw-r--r-- | registration.php | 32 | ||||
-rw-r--r-- | robots.txt | 1 | ||||
-rw-r--r-- | sitemap.xml | 18 | ||||
-rw-r--r-- | thank_you.php | 11 |
12 files changed, 174 insertions, 184 deletions
diff --git a/default.css b/default.css index 2355684..1dda4b5 100644 --- a/default.css +++ b/default.css @@ -13,7 +13,7 @@ h1 { background-image: url(images/header.png); background-repeat: no-repeat; position: absolute; - width: 600px; + width: 543px; height: 210px; margin: 0px; top: 0px; @@ -257,7 +257,7 @@ h1 { } #contents p, table, pre { - margin: 15px 40px 15px 30px; + margin: 0px 40px 5px 30px; } #contents h4 { @@ -266,7 +266,7 @@ h1 { } #contents ul { - margin: 15px 40px 15px 20px; + margin: 0px 40px 0px 20px; } #contents table { @@ -328,6 +328,22 @@ h1 { height: 16px; } +div.read-more { + text-align:right; +} + +a.more { + display: block; + margin: 0px; + width: auto; + padding: 5px 5px 5px 20px; + margin: 0px; + color: black; + font-style: normal; + font-weight: bold; + color: #2f2e32; +} + /* Gallery style */ #pagenumbers { text-align: center; diff --git a/downloads.php b/downloads.php index 58da5f5..e09ed4b 100644 --- a/downloads.php +++ b/downloads.php @@ -16,7 +16,7 @@ the ManaPlus client, but have a different default skin and will show up as "The Mana World" in the application menu.</p> -<table style="border-width: 0px; width: 600px; margin-bottom: 0px; margin-top: 0px;" border="0" cellpadding="0" cellspacing="0"> +<table style="border-width: 0px; width: 50%; margin-bottom: 0px; margin-top: 0px;" border="0" cellpadding="0" cellspacing="0"> <tbody><tr><td style="border-width: 0px;" width="50%"> <div class="release"><img src="images/ico-win.png"> <a href="http://download.evolonline.org/manaplus/tmw/tmw-win32.exe"><b>Windows installer (ManaPlus)</b></a></div> @@ -25,9 +25,6 @@ <div class="release"><img src="images/ico-deb.png"> <a href="http://packages.debian.org/tmw"><b>Debian package</b></a></div> <div class="release"><img src="images/ico-ubuntu.png"> <a href="http://packages.ubuntu.com/tmw"><b>Ubuntu package</b></a></div> <div class="release"><img src="images/ico-fedora.png"> <a href="https://apps.fedoraproject.org/packages/tmw"><b>Fedora package</b></a></div> - -</td><td style="border-width: 0px;" width="50%" valign="top"> - <div class="release"><img src="images/ico-android.png"> <a href="http://download.evolonline.org/manaplus/download/manaplus.apk"><b>Android App (ManaPlus)</b></a></div> <div class="release"><img src="images/ico-gentoo.png"> <a href="http://packages.gentoo.org/package/games-rpg/tmw"><b>Gentoo eBuild</b></a></div> <div class="release"><img src="images/ico-openbsd.png" width="16" height="16"> <a href="http://openports.se/games/manaplus"><b>OpenBSD port</b></a></div> @@ -39,7 +36,7 @@ <p>For packagers (or for users who're interested), the branding files can be downloaded separately:</p> -<table style="border-width: 0px; width: 600px; margin-bottom: 0px; margin-top: 0px;" border="0" cellpadding="0" cellspacing="0"> +<table style="border-width: 0px; width: 50%; margin-bottom: 0px; margin-top: 0px;" border="0" cellpadding="0" cellspacing="0"> <tbody><tr><td style="border-width: 0px;" width="50%"> <div class="release"><img src="images/ico-src.png"> <a href="http://sourceforge.net/projects/themanaworld/files/tmw-branding/tmw-branding-20120727.tar.gz/download"><b>Branding files</b> 2012-07-27</a></div> </td></tr> diff --git a/images/TMW-email-temaplate-mailer.png b/images/TMW-email-temaplate-mailer.png Binary files differnew file mode 100644 index 0000000..040be9a --- /dev/null +++ b/images/TMW-email-temaplate-mailer.png diff --git a/includes/common.php b/includes/common.php index 609a286..c253cce 100644 --- a/includes/common.php +++ b/includes/common.php @@ -13,7 +13,7 @@ function placeHeader($page_title) "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> - <title>The Mana World</title> + <title>The Mana World - <?php echo $page_title; ?></title> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <meta http-equiv="Content-Style-Type" content="text/css"/> <meta http-equiv="Content-Language" content="en"/> @@ -33,7 +33,7 @@ function placeHeader($page_title) </div> <div id="title"> - <h1><span>The Mana World</span></h1> + <a href="/"><h1><span>The Mana World</span></h1></a> </div> <div id="main_topleft"> @@ -45,17 +45,17 @@ function placeHeader($page_title) <div style="clear: both;"></div> <div id="sidebar"> - <div class="section_topleft"> <div class="section_bottomleft"> <div class="section_topright"> <div class="section_bottomright"> <div class="section"> <ul> - <li><a href="registration.php">Registration</a></li> + <li><a href="registration.php">Create Account</a></li> <li><a href="downloads.php">Downloads</a></li> - <li><a href="index.php">News</a></li> + <li><a href="news-feed.php">News</a></li> <li><a href="about.php">About</a></li> + <li><a href="https://webchat.freenode.net/?channels=#themanaworld">Support (IRC)</a></li> <li><a href="https://wiki.themanaworld.org/index.php/Servers">Servers</a></li> <li><a href="https://wiki.themanaworld.org/">Wiki</a></li> <li><a href="https://forums.themanaworld.org/">Forums</a></li> @@ -65,26 +65,35 @@ function placeHeader($page_title) </div> </div> </div> - + <div class="section_topleft"> + <div class="section_bottomleft"> + <div class="section_topright"> + <div class="section_bottomright"> + <div class="section banners"> + Server status + <iframe src="https://server.themanaworld.org/status.php" width="130" height="30" frameborder="0" scrolling="no"></iframe> + </div> + </div> + </div> + </div> + </div> <div class="section_topleft"> <div class="section_bottomleft"> <div class="section_topright"> <div class="section_bottomright"> <div class="section" style="text-align: center;"> - <a href="http://www.themanaworld.org/wiki/index.php/Screenshots"><img src="images/screenshot-thumb.png" alt="Screenshots" style="border: 1px solid #784f3f;"/></a> + <a href="http://wiki.themanaworld.org/index.php/Screenshots"><img src="images/screenshot-thumb.png" alt="Screenshots" style="border: 1px solid #784f3f;"/></a> </div> </div> </div> </div> </div> - <div class="section_topleft"> <div class="section_bottomleft"> <div class="section_topright"> <div class="section_bottomright"> <div class="section"> <ul> - <li><a href="https://webchat.freenode.net/?channels=#themanaworld">IRC</a></li> <li><a href="https://plus.google.com/114523926767095095371">Google+</a></li> <li><a href="https://www.facebook.com/themanaworld">Facebook</a></li> <li><a href="https://github.com/themanaworld">Github</a></li> @@ -97,26 +106,9 @@ function placeHeader($page_title) </div> </div> </div> - - <div class="section_topleft"> - <div class="section_bottomleft"> - <div class="section_topright"> - <div class="section_bottomright"> - <div class="section banners"> - Server status - <iframe src="https://server.themanaworld.org/status.php" width="130" height="30" frameborder="0" scrolling="no"></iframe> - <a href="registration.php">Register new account</a> - </div> - </div> - </div> - </div> - </div> - <!-- This empty div fixes a rendering issue with IE 7 --> <div></div> - </div> <!-- /sidebar --> - <div id="contents_leftrepeat"> <div id="contents_topleft"> <div id="contents_bottomleft"> diff --git a/includes/email.php b/includes/email.php new file mode 100644 index 0000000..6184d56 --- /dev/null +++ b/includes/email.php @@ -0,0 +1,63 @@ +<?php +// Email Template Header +// Image Mapped for Html Email +// Base/Default Links +function getEmailTemplate($emailText) { + $boundary = uniqid('np'); + $headers .= "MIME-Version: 1.0\r\nContent-type: multipart/alternative;boundary=".$boundary."\r\n"; + $data = "This is a MIME encoded message."; + + $data .= "\r\n\r\n--" . $boundary . "\r\n"; + $data .= "Content-type: text/plain;charset=utf-8\r\n\r\n"; + $data .= "###############################################################\n"; + $data .= "# ___________.__ _____ #\n"; + $data .= "# \__ ___/| |__ ____ / \ ____ ____ ____ #\n"; + $data .= "# | | | | \_/ __ \ / \ / \ \__ \ / __ \ \__ \ #\n"; + $data .= "# | | | Y \ ___/ / Y \/ __ \| | \ \/ __ \_ #\n"; + $data .= "# |____| |___|__/\____> \____|____(______/__| \(______/ #\n"; + $data .= "# __ __ .__ .___ #\n"; + $data .= "# / \ / \___________| | __| _/ #\n"; + $data .= "# \ \/\/ / _ \_ __ \ | / __ | #\n"; + $data .= "# \ ( <_> ) | \/ |__/ /_/ | #\n"; + $data .= "# \__/\ / \____/|__| |____/\____ | #\n"; + $data .= "# \/ \/ #\n"; + $data .= "# #\n"; + $data .= "###############################################################\n"; + $data .= $emailText; + + $data .= "\r\n\r\n--" . $boundary . "\r\n"; + $data .= "Content-type: text/html;charset=utf-8\r\n\r\n"; + + $data .= '<html><body> +<img id="Image-Maps-Com-image-maps-2014-05-22-121954" src="https://www.themanaworld.org/images/TMW-email-temaplate-mailer.png" border="0" width="640" height="272" orgWidth="640" orgHeight="272" usemap="#image-maps-2014-05-22-121954" alt="" /> +<map name="image-maps-2014-05-22-121954" id="ImageMapsCom-image-maps-2014-05-22-121954"> +<area alt="Home Page" title="The Mana World" href="https://www.themanaworld.org/" shape="rect" coords="0,0,197,201" style="outline:none;" target="_self" /> +<area alt="Home Page" title="The Mana World" href="https://www.themanaworld.org/" shape="rect" coords="197,0,465,168" style="outline:none;" target="_self" /> +<area alt="Official Client Mana Plus" title="Official Client Mana Plus" href="http://manaplus.org" shape="rect" coords="465,0,640,168" style="outline:none;" target="_self" /> +<area alt="The Mana World News" title="The Mana World News" href="https://www.themanaworld.org/index.php" shape="rect" coords="196,168,275,201" style="outline:none;" target="_self" /> +<area alt="The Mana World Wiki" title="The Mana World Wiki" href="https://wiki.themanaworld.org/index.php/Main_Page" shape="rect" coords="274,168,375,201" style="outline:none;" target="_self" /> +<area alt="The Mana World Forums" title="The Mana World Forums" href="https://forums.themanaworld.org/" shape="rect" coords="372,168,490,201" style="outline:none;" target="_self" /> +<area alt="The Mana World Support (IRC)" title="The Mana World Support (IRC)" href="https://webchat.freenode.net/?channels=#themanaworld" shape="rect" coords="488,168,640,201" style="outline:none;" target="_self" /> +<area alt="About The Mana World" title="About The Mana World" href="https://www.themanaworld.org/about.php" shape="rect" coords="0,201,84,272" style="outline:none;" target="_self" /> +<area alt="Creative Commons" title="Creative Commons" href="http://creativecommons.org/" shape="rect" coords="84,201,121,272" style="outline:none;" target="_self" /> +<area alt="GNU General Public License" title="GNU General Public License " href="http://www.gnu.org/copyleft/gpl.html" shape="rect" coords="121,201,155,272" style="outline:none;" target="_self" /> +<area alt="Open Source Initiative" title="Open Source Initiative" href="http://opensource.org/" shape="rect" coords="155,202,189,272" style="outline:none;" target="_self" /> +<area alt="The Mana World on Facebook" title="The Mana World on Facebook" href="https://www.facebook.com/themanaworld" shape="rect" coords="191,204,308,272" style="outline:none;" target="_self" /> +<area alt="The Mana World on G+" title="The Mana World on G+" href="https://plus.google.com/+TheManaWorldOrg" shape="rect" coords="310,204,344,272" style="outline:none;" target="_self" /> +<area alt="The Mana World on Youtube" title="The Mana World on Youtube" href="https://www.youtube.com/user/TheManaWorld" shape="rect" coords="345,203,379,271" style="outline:none;" target="_self" /> +<area alt="Official Client Mana Plus" title="Official Client Mana Plus" href="http://manaplus.org" shape="rect" coords="382,203,501,272" style="outline:none;" target="_self" /> +<area alt="Mac OS Downloads" title="Mac OS Downloads" href="http://download.evolonline.org/manaplus/macosx/" shape="rect" coords="502,203,537,272" style="outline:none;" target="_self" /> +<area alt="Windows Installer" title="Windows Installer" href="http://manaplus.org/windowsinstaller" shape="rect" coords="537.8000001907349,202.8000030517578,572.8000001907349,271.8000030517578" style="outline:none;" target="_self" /> +<area alt="Linux Versions" title="Linux Versions" href="http://manaplus.org/" shape="rect" coords="575,203,640,272" style="outline:none;" target="_self" /> +<area shape="rect" coords="638,270,640,272" alt="Image Map" style="outline:none;" title="Image Map" href="http://www.image-maps.com/index.php?aff=mapped_users_0" /> +</map> +'.nl2br($emailText).' +<div style="font-size:10px;"> + © 2004-2014 The Mana World +</div> +</body> +</html>'; + $data .= "\r\n\r\n--" . $boundary . "--"; + return array($headers,$data); +} +?> diff --git a/includes/news.php b/includes/news.php index e1c5311..791e3c4 100644 --- a/includes/news.php +++ b/includes/news.php @@ -1,110 +1,24 @@ <?php -// WARNING: -// This code uses the "DOM XML" extension, which is only available with PHP 4. -// Be sure to update it to use the "XML", "DOM" or "XMLReader" extensions when -// SF upgrades to PHP 5. -// -// The news is cached locally using a cronjob which runs in the 9th minute of -// every hour: -// -// 9 * * * * /home/groups/t/th/themanaworld/htdocs/includes/fetch-news.sh -// - -//$feedurl = "http://sourceforge.net/export/rss2_projnews.php?group_id=106790&rss_fulltext=1"; - -$feedurl = "includes/rss2_projnews.cache"; - -$xml = new XMLReader(); - -if (!$xml) { - echo "Error, no XMLReader.\n"; - exit; -} - -$xml->open($feedurl); -xml_read_rss($xml); -$xml->close(); - -function xml_read_rss($xml) -{ - if ($xml->next("rss")) { - xml_read_channels($xml); - } else { - echo "Error, not an rss feed."; - } -} - -function xml_read_channels($xml) -{ - while ($xml->read()) { - switch ($xml->nodeType) { - case XMLReader::ELEMENT: - if ($xml->name == "channel") { - xml_read_channel($xml); - } else { - xml_read_unknown_element($xml); - } - break; - case XMLReader::END_ELEMENT: - return; - } +// Parses news.html +// returns feed + +function printNews($num='all') { + $count = 0; + $content = ""; + $handle = @fopen("news.html", "r"); + if ($handle) { + while (($buffer = fgets($handle, 4096)) !== false) { + $content .= $buffer; + if (preg_match('/<\/div>/',$buffer)) { + $count++; + } + if ($count == $num && $num != 'all') { + $content .= '<div class="read-more"><a class="more" href="/news-feed.php">More News >></a></div>'; + break 1; + } + } } + fclose($handle); + return $content; } - -function xml_read_channel($xml) -{ - while ($xml->read()) { - switch ($xml->nodeType) { - case XMLReader::ELEMENT: - if ($xml->name == "item") { - xml_read_item($xml); - } else { - xml_read_unknown_element($xml); - } - break; - case XMLReader::END_ELEMENT: - return; - } - } -} - -function xml_read_item($xml) -{ - $newsdata = array(); - - while ($xml->read()) { - switch ($xml->nodeType) { - case XMLReader::ELEMENT: - $newsdata[$xml->name] = $xml->readString(); - xml_read_unknown_element($xml); - break; - case XMLReader::END_ELEMENT: - print_news_item($newsdata); - return; - } - } -} - -function xml_read_unknown_element($xml) -{ - while ($xml->read()) { - switch ($xml->nodeType) { - case XMLReader::ELEMENT: - xml_read_unknown_element($xml); - break; - case XMLReader::END_ELEMENT: - return; - } - } -} - -function print_news_item($newsdata) -{ - echo '<div class="news">'; - echo '<div class="news_date">' . $newsdata['pubDate'] . '</div>'; - echo '<h3>' . $newsdata['title'] . '</h3>'; - echo '<div class="news_body"><p>' . $newsdata['description'] . '</p></div>'; - echo '</div>'; -} - ?> @@ -1,21 +1,16 @@ <?php - include('includes/common.php'); - placeHeader("News"); - +include('includes/common.php'); +include('includes/news.php'); +placeHeader("Home"); ?> -<!-- <div style="background-color: rgb(255,220,220); border: 1px solid rgb(240,150,150); padding: 5px; margin: 5px; -moz-border-radius: 10px; -moz-border-radius: 10px;"> -<b>Notice:</b> New account creation disabled due to excessive abuse of this feature. If you want to sign up, contact thorbjorn or Jaxad0127 on IRC for now. +<div> +<h3>The Mana World Project</h3> +<p style="font-size:14px;">The Mana World (TMW) is a serious effort to create an innovative free and open source MMORPG. TMW uses 2D graphics and aims to create a large and diverse interactive world. It is licensed under the GPL, making sure this game can't ever run away from you. <a class="more" href="/about.php">Read More >></a></p> +</div> +<div> +<h3>Recent News</h3> </div> ---> <?php - - // this is a symlink, now that we're not on Platinum - echo file_get_contents('news.html'); - // echo file_get_contents('http://updates.themanaworld.org/news.html'); - /* - $number = 6; - include('includes/news.php'); - */ - - placeFooter(); +echo printNews(1); +placeFooter(); ?> diff --git a/news-feed.php b/news-feed.php new file mode 100644 index 0000000..ac14b5e --- /dev/null +++ b/news-feed.php @@ -0,0 +1,7 @@ +<?php +include('includes/common.php'); +include('includes/news.php'); +placeHeader("News"); +echo printNews(); +placeFooter(); +?> diff --git a/registration.php b/registration.php index 95a92fb..396ac50 100644 --- a/registration.php +++ b/registration.php @@ -61,13 +61,10 @@ } } } - - include("includes/common.php"); - placeHeader("Registration"); - - if ($showform) { + include("includes/common.php"); + placeHeader("Registration"); ?> <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> @@ -131,15 +128,24 @@ important precaution.</p> <?php + placeFooter(); } // end of showform else { - ?> - <p>Your account was scheduled for creation! In a few minutes you should receive an email with verification of your new account.</p> - - <p><em>If the account doesn't work after five minutes, please ask for help on the forums or IRC. We can make it for you.</em></p> - - <?php } - placeFooter(); + include("includes/email.php"); + $mail_to = $_POST['email']; + $boundary = uniqid('np'); + $subject = "The Mana World Registration"; + $headers = "From: Accounts <passwords@themanaworld.org>\r\nReply-To: Accounts <passwords@themanaworld.org>\r\n"; + $data .= "== Account Created ==\n"; + $data .= " Welcome to The Mana World! Your account should now be enabled. If you have any problems with your login contact The Mana World via the Support (live) or Forums (maybe a delay) for help. Game tips & walkthroughs are available on the Wiki. Our Forums are a great place to ask for advice and discuss possible changes. News is available in the client or on the Home Site. + Godspeed Adventurer, + The Mana World\n"; + $message = getEmailTemplate($data); + $headers .= $message[0]; + + mail($mail_to,$subject,$message[1],$headers); + + header("Location: /thank_you.php"); + } ?> - @@ -3,6 +3,7 @@ disallow: /includes/ disallow: /recaptcha-php/ disallow: /sql/ disallow: /bin/ +disallow: /thank_you.php disallow: /news.html allow: / diff --git a/sitemap.xml b/sitemap.xml index a4c3834..f622383 100644 --- a/sitemap.xml +++ b/sitemap.xml @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"> <url> -<loc>https://www.themanaworld.org</loc> +<loc>https://www.themanaworld.org/</loc> <lastmod>2014-05-20</lastmod> <changefreq>daily</changefreq> <priority>0.5</priority> </url> <url> -<loc>https://www.themanaworld.org/index.php</loc> +<loc>https://www.themanaworld.org/news-feed.php</loc> <lastmod>2014-05-20</lastmod> <changefreq>daily</changefreq> -<priority>1.0</priority> +<priority>0.5</priority> </url> <url> <loc>https://www.themanaworld.org/registration.php</loc> @@ -30,16 +30,4 @@ <changefreq>daily</changefreq> <priority>0.5</priority> </url> -<url> -<loc>https://forums.themanaworld.org/index.php</loc> -<lastmod>2014-05-20</lastmod> -<changefreq>daily</changefreq> -<priority>0.5</priority> -</url> -<url> -<loc>https://wiki.themanaworld.org/index.php/Main_Page</loc> -<lastmod>2014-05-20</lastmod> -<changefreq>daily</changefreq> -<priority>0.5</priority> -</url> </urlset> diff --git a/thank_you.php b/thank_you.php new file mode 100644 index 0000000..67c8ffe --- /dev/null +++ b/thank_you.php @@ -0,0 +1,11 @@ +<?php +include('includes/common.php'); +if (preg_match('/'.$_SERVER['SERVER_NAME'].'/',$_SERVER['HTTP_REFERER']) && preg_match('/registration.php/', $_SERVER['HTTP_REFERER'])) { + placeHeader("Account Created"); + echo "<p>Your account was scheduled for creation! In a few minutes you should receive an email with verification of your new account.</p> +<p><em>If the account doesn't work after five minutes, please ask for help on the <a href='https://forums.themanaworld.org/viewforum.php?f=3'>Forums</a> or <a href='https://webchat.freenode.net/?channels=#themanaworld'>Support (IRC)</a>.</em></p>"; + placeFooter(); +} else { + header("Location: /registration.php"); +} +?> |