Changeset 663 for branches/new

Timestamp:

Dec 21, 2009, 1:19:51 PM (15 years ago)

Author:

Bidi

Message:

Větev NEW: Smazáno RealmMenu & náhodný header (příprava na třídu Menu). Opraveny varování a poznámky PHP.

Location:

branches/new

Files:

• inc/server.php (modified) (2 diffs)
• index.php (modified) (4 diffs)

branches/new/inc/server.php

@@ -2 +2 @@
 
 include_once(dirname(__FILE__).'/module.php');
-
-function NullErrorHandler()
-{
-}
 
 class Server extends Module
@@ -223 +219 @@
   }
   
-  function RealmSelection($FormNameSufix = '')
-  {
-    $Output = '';
-    if(count($this->Config['Mangos']['RealmList']) > 1)
-    { 
-      if(array_key_exists('page', $_GET)) $Target = '?page='.$_GET['page'];
-        else $Target = '';
-      $Output .= '<div style="text-align: center;"><form id="RealmSelection'.$FormNameSufix.'" action="'.$Target.'" method="post">'.
-      '<div>Výběr světa <select name="RealmIndex" onchange="document.getElementById(\'RealmSelection'.$FormNameSufix.'\').submit()">';
-      foreach($this->Config['Mangos']['RealmList'] as $Index => $Realm)
-      {
-        if($_COOKIE['RealmIndex'] == $Index) $Selected = ' selected="selected"';
-         else $Selected = '';
-        $Output .= '<option value="'.$Index.'"'.$Selected.'>'.$Realm['Name'].'</option>';
-      }
-      $Output .= '</select></div>'.
-      '</form></div>';
-    }
-    return($Output);
-  }
 }
 

branches/new/index.php

@@ -1 @@
-<?php
+<?php
+session_start();
 
 // SQL injection hack protection
@@ -5 +6 @@
 foreach($_GET as $Index => $Item) $_GET[$Index] = addslashes($Item);
 
-if(file_exists('inc/config.php')) include_once('inc/config.php');
+if(file_exists('inc/config.php')) require_once('inc/config.php');
   else die('Nenalezen soubor inc/config.php. Vytvořte jej z předlohy config.sample.php.');
-
-if(array_key_exists('RealmIndex', $_POST))
-{
-  setcookie('RealmIndex', $_POST['RealmIndex']);
-  $_COOKIE['RealmIndex'] = $_POST['RealmIndex'];
-}
-if(array_key_exists('RealmIndex', $_GET))
-{
-  setcookie('RealmIndex', $_GET['RealmIndex']);
-  $_COOKIE['RealmIndex'] = $_GET['RealmIndex'];
-}
-$RealmList = $Config['Mangos']['RealmList'];
-$FirstRealm = array_shift($RealmList);
-if(!array_key_exists('RealmIndex', $_COOKIE)) $_COOKIE['RealmIndex'] = $FirstRealm['Id'];
-  else 
-  {
-    if(!array_key_exists($_COOKIE['RealmIndex'], $Config['Mangos']['RealmList']))
-      $_COOKIE['RealmIndex'] = $FirstRealm['Id'];
-  }
   
-session_start();
-include_once('inc/error.php');
-include_once('inc/database.php');
-include_once('inc/html.php');
-include_once('inc/system.php');
-include_once('inc/player.php');
-include_once('inc/server.php');
-include_once('inc/realm.php');
+require_once('inc/error.php');
+require_once('inc/database.php');
+require_once('inc/html.php');
+require_once('inc/system.php');
+require_once('inc/player.php');
+require_once('inc/server.php');
+require_once('inc/realm.php');
 
 // classes start
@@ -43 +24 @@
 $html = new Html(0, $db);
 $html->Start();
-if(isset($_COOKIE['hof-random']) and $_COOKIE['hof-random'] == 'no') $num_headers = 1;
-  else $num_headers = 8;
 
 echo('<div id="page">'.
-  '<div id="header" style="background-image: url(imgs/web/headers/header'.rand(0, $num_headers - 1).'.jpg);"></div>'.
+  '<div id="header" style="background-image: url(imgs/web/headers/header0.jpg);"></div>'.
   '<div id="top"></div>'.
   '<div id="menu">');
@@ -72 +51 @@
 );
 
-$RealmMenuItems = array(
-  array('link' => '?page=online', 'Text' => 'Online hráči'),
-  array('link' => '#', 'Text' => 'Mapa hráčů', 'OnClick' => "popup('../minimanager/pomm/pomm.php?realmid=".$_COOKIE['RealmIndex']."', 1000, 800); return false;"),
-  array('link' => '?page=tophraci', 'Text' => 'Nej hráči'),
-  array('link' => '?page=guildy', 'Text' => 'Spolky'),
-  array('link' => 'armory/', 'Text' => 'Armory'),
-  array('link' => '?page=gh', 'Text' => 'Domky spolků'),
-  array('link' => '?page=arena', 'Text' => 'Arény'),
-  array('link' => '?page=events', 'Text' => 'Události'),
-  //array('link' => '?page=gmlog', 'Text' => 'GM log'),
-  array('link' => '?page=commands', 'Text' => 'Příkazy'),
-);
-
 echo('<br /><br />');
 echo('<div class="mainmenu">');
 foreach($ServerMenuItems as $Item)
-{
-  if(array_key_exists('OnClick', $Item)) $OnClick = ' onclick="'.$Item['OnClick'].'"';
-    else $OnClick = '';
-  if(array_key_exists('Target', $Item)) $Target = ' target="'.$Item['Target'].'"';
-    else $Target = '';
-
-  echo('<a href="'.$Item['link'].'"'.$OnClick.$Target.'>'.$Item['Text'].'</a><br />');
-}
-echo('</div>');
-
-echo($server->RealmSelection('Menu'));
-
-echo('<br /><br />');
-echo('<div class="mainmenu">');
-foreach($RealmMenuItems as $Item)
 {
   if(array_key_exists('OnClick', $Item)) $OnClick = ' onclick="'.$Item['OnClick'].'"';