Changeset 691 for trunk

Timestamp:

Mar 19, 2010, 9:46:30 PM (14 years ago)

Author:

george

Message:

• Opraveno: Generování pěkného pro další stránky.

Location:

trunk

Files:

• inc/player.php (modified) (6 diffs)
• index.php (modified) (3 diffs)
• pages/online-hraci.php (modified) (3 diffs)
• pages/realmlist.php (modified) (2 diffs)
• pages/spolek.php (modified) (3 diffs)
• pages/spolky.php (modified) (2 diffs)
• pages/ucet.php (modified) (2 diffs)

trunk/inc/player.php

@@ -17 +17 @@
     
     if($err == 0) echo('<img src="'.$html->Link('/imgs/inc/on.gif').'">&nbsp;<font color="#234303" size="4">'.$text.'</font><br />');
-      else echo('<img src="'.$html->Link('imgs/inc/off.gif').'">&nbsp;<font color="#990000" size="4\">'.$text.'</font><br />');
+      else echo('<img src="'.$html->Link('/imgs/inc/off.gif').'">&nbsp;<font color="#990000" size="4\">'.$text.'</font><br />');
   }
 
@@ -37 +37 @@
     {
       $this->Msg('Zadané jmnéno účtu již existuje', 1);
-      $this->Recall(3);
     }      
   }
@@ -55 +54 @@
       $_SESSION['UserName'] = $username;
       $this->Msg('Přihlášení úspěšné', 0);
-      $this->Recall(1);
     } else
     {
       $this->Msg('Přihlášení neúspěšné', 1);
-      $this->Recall(3);
     }
   }
@@ -68 +65 @@
     $_SESSION['UserName'] = '';
     $this->Msg('Odhlášení úspěšné', 0);
-    $this->Recall(1);
   }
 
@@ -329 +325 @@
   }
 
-  public function Recall($time)
-  {
-    global $Config;
-      
-    if(isset($_SERVER['HTTP_REFERER']))
-    {
-      $link = parse_url($_SERVER['HTTP_REFERER']);
-      if(($link['host'] == $Config['Web']['WoWServerAddr']) or ($link['host'] == 'localhost'))
-      {
-        echo('<meta http-equiv="refresh" content="'.$time.';?'.$link['query'].'">');
-      } else
-      {
-        echo('<meta http-equiv="refresh" content="'.$time.';">');
-      }
-    }
-  }
-
   public function CharsOnAcc($accid)
   {
-    global $Config, $System;
+    global $Config, $System, $html;
     
     echo('<table class="BaseTable">
@@ -366 +345 @@
         '<td>'.$row['name'].'</td>'.
         '<td>'.$this->GetPlayerLvl($row['guid']).'</td>'.
-        '<td><img src="imgs/icons/'.$row['race'].'-'.$gender.'.gif" alt="rasa" /></td>'.
-        '<td><img src="imgs/icons/'.$row['class'].'.gif" alt="trida" /></td>'.
+        '<td><img src="'.$html->Link('imgs/icons/'.$row['race'].'-'.$gender.'.gif').'" alt="rasa" /></td>'.
+        '<td><img src="'.$html->Link('/imgs/icons/'.$row['class'].'.gif').'" alt="trida" /></td>'.
         '<td>'.round($row['totaltime'] / 3600).' h</td>'.
         '</tr>');

trunk/index.php

@@ -10 +10 @@
   $_SERVER['QUERY_STRING'] = substr($_SERVER['REQUEST_URI'], strpos($_SERVER['REQUEST_URI'], '?') + 1);
   else $_SERVER['QUERY_STRING'] = '';
-echo(phpinfo());
+//echo(phpinfo());
 
 if(count($QueryItems) > 0)
@@ -19 +19 @@
   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'];
-}
 
 session_start();
@@ -51 +41 @@
 $html->Start();
 $_GET = $html->GetQueryStringArray();
+
+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'];
+}
 
 if(isset($_COOKIE['hof-random']) and $_COOKIE['hof-random'] == 'no') $num_headers = 1;

trunk/pages/online-hraci.php

@@ -5 +5 @@
 $order_dir = ($dir == 'up') ? 'ASC' :'DESC';
 $dir = ($dir == 'down') ? 'up' : 'down';
-$dir_img = ($dir == 'down') ? '<img src="imgs/inc/up.gif" alt="vzestupně" />' : '<img src="imgs/inc/down.gif" alt="sestupně"/>';
+$dir_img = ($dir == 'down') ? '<img src="'.$html->Link('/imgs/inc/up.gif').'" alt="vzestupně" />' : '<img src="'.$html->Link('/imgs/inc/down.gif').'" alt="sestupně"/>';
 
 function MakeLink($show, $sort)
 {
-  global $dir, $dir_img;
+  global $dir, $dir_img, $html;
+  
   if(isset($_GET['order']) and $_GET['order'] == $sort)
   {
@@ -18 +19 @@
     $arrow = '';
   }
-  return($arrow.'<a href="?page=online&amp;order='.$sort.'&amp;dir='.$dir.'">'.$show.'</a>');
+  return($arrow.'<a href="'.$html->Link('/online-hraci/?order='.$sort.'&amp;dir='.$dir).'">'.$show.'</a>');
 }
 
@@ -46 +47 @@
 {
   $aliance = array(1, 3, 4, 7, 11);
-  $frakce = (in_array($row['race'], $aliance)) ? '<img src="imgs/inc/a.gif" alt="aliance"/>' : '<img src="imgs/inc/h.gif" alt="horda" />';
+  $frakce = (in_array($row['race'], $aliance)) ? '<img src="'.$html->Link('/imgs/inc/a.gif').'" alt="aliance"/>' : '<img src="'.$html->Link('/imgs/inc/h.gif').'" alt="horda" />';
   $gender = ($row['gender'] == 0) ? '0' : '1';
   echo('<tr>
       <td align="center">'.$frakce.'</td>
       <td align="center">'.$row['name'].'</td>
-      <td align="center"><img src="imgs/icons/'.$row['race'].'-'.$gender.'.gif" alt="rasa" /></td>
-      <td align="center"><img src="imgs/icons/'.$row['class'].'.gif" alt="třída" /></td>
+      <td align="center"><img src="'.$html->Link('/imgs/icons/'.$row['race'].'-'.$gender.'.gif').'" alt="rasa" /></td>
+      <td align="center"><img src="'.$html->Link('/imgs/icons/'.$row['class'].'.gif').'" alt="třída" /></td>
       <td align="center">'.$row['level'].'</td>
       <td align="center">'.$server->MapName($row['map']).'<br />('.$server->ZoneName($row['zone']).')</td>

trunk/pages/realmlist.php

@@ -19 +19 @@
   {
     $Server = new Server($System, $DbRow['Id']);
-    $Output .= '<div style="text-align: center">'.$DbRow['Name'].' '.$DbRow['ClientVersion'].' - realmlist: <a href="?page=realmlist&amp;Server='.$DbRow['Id'].'">'.$DbRow['Address'];
+    $Output .= '<div style="text-align: center">'.$DbRow['Name'].' '.$DbRow['ClientVersion'].' - realmlist: <a href="'.$html->Link('/realmlist/?Server='.$DbRow['Id']).'">'.$DbRow['Address'];
     if($DbRow['Port'] != 3724) $Output .= ':'.$DbRow['Port'];
     $Output .= '</a></div>';
@@ -35 +35 @@
     {
       $Realm = new Realm($System, $DbRow['Id']);
-      $Output .= '<tr><td><a href="?page=online&amp;RealmIndex='.$Realm->Id.'">'.$Realm->Data['Name'].'</a></td><td>'.$Realm->Data['Rate'].'</td><td>'.$Realm->Data['Type'].'</td><td>'.$Server->OnlineStateImage($Realm->Data['Online']).'</td><td>'.$Realm->OnlineCharactersCount().' / '.$Realm->Data['MaxOnlinePlayers'].' / '.$Realm->CharacterCount().'</td></tr>';
+      $Output .= '<tr><td><a href="'.$html->Link('/online-hraci/?RealmIndex='.$Realm->Id).'">'.$Realm->Data['Name'].'</a></td><td>'.$Realm->Data['Rate'].'</td><td>'.$Realm->Data['Type'].'</td><td>'.$Server->OnlineStateImage($Realm->Data['Online']).'</td><td>'.$Realm->OnlineCharactersCount().' / '.$Realm->Data['MaxOnlinePlayers'].' / '.$Realm->CharacterCount().'</td></tr>';
       $Output .= '<tr><td colspan="5">'.$Realm->Data['Description'].'</td></tr>';
       //if(array_key_exists($Index + 1, $Config['Mangos']['RealmList'])) 

trunk/pages/spolek.php

@@ -16 +16 @@
 {
   $guild_id = $id;
-  $DbResult = $db2->query('SELECT `guildid`, `name`, `createdate` FROM `guild` WHERE `guildid` = '.$guild_id.' LIMIT 1');
+  $DbResult = $db2->query('SELECT `guildid`, `name`, FROM_UNIXTIME(`createdate`) AS `createdate` FROM `guild` WHERE `guildid` = '.$guild_id.' LIMIT 1');
   $guild_data = $DbResult->fetch_assoc();
   $members = $db2->query('SELECT guild_member.guid, guild_member.rank AS mrank, `characters`.name, SUBSTRING_INDEX(SUBSTRING_INDEX(`characters`.`data`, " ", '.$Config['Mangos']['CharacterDataOffset']['Level'].' + 1), " ", -1) AS level, (SELECT rname FROM guild_rank WHERE guildid ='.$guild_id.' AND rid = mrank + 1) AS rname, guild_member.pnote, guild_member.offnote FROM guild_member,`characters` LEFT JOIN guild_member k1 ON k1.`guid`=`characters`.`guid` WHERE guild_member.guildid = '.$guild_id.' AND guild_member.guid=`characters`.guid ORDER BY mrank');
@@ -29 +29 @@
   $time = mktime($time_stp[0], $time_stp[1], $time_stp[2], $date[1], $date[2], $date[0]);
   $human_date = date('d.m.Y H:i:s', $time);
-  echo('<a href="?page=guildy">&lt;- Zpět na výpis</a><br />');
+  echo('<a href="'.$html->Link('/spolky/').'">&lt;- Zpět na výpis</a><br />');
   echo('<table class="BaseTable">
     <tr>
@@ -93 +93 @@
     echo('<tr>'.
       '<td align="center">'.$member[2].'</td>'.
-      '<td align="center"><img src="imgs/icons/'.$online['race'].'-'.$gender.'.gif" alt="pohlaví" /></td>'.
-      '<td align="center"><img src="imgs/icons/'.$online['class'].'.gif" alt="třída" /></td>'.
+      '<td align="center"><img src="'.$html->Link('/imgs/icons/'.$online['race'].'-'.$gender.'.gif').'" alt="pohlaví" /></td>'.
+      '<td align="center"><img src="'.$html->Link('/imgs/icons/'.$online['class'].'.gif').'" alt="třída" /></td>'.
       '<td align="center" style="color: '.$LevelColor.'">'.$Level.'</td>'.
       '<td align="center">'.$member[4].' ('.$member[1].')</td>'.
       '<td align="center" style="color: '.$LogoutTimeColor.'">'.$LogoutTime.'</td>'.
-      '<td align="center">'.(($online['online']) ? '<img src="imgs/inc/on.gif" alt="online" />' : '<img src="imgs/inc/off.gif" alt="offline" />').'</td>'.
+      '<td align="center">'.(($online['online']) ? '<img src="'.$html->Link('/imgs/inc/on.gif').'" alt="online" />' : '<img src="'.$html->Link('/imgs/inc/off.gif').'" alt="offline" />').'</td>'.
       '</tr>');
   }
   echo('</table>');
-} else echo('<meta http-equiv="refresh" content="0;url=?page=guildy">');
+} else echo('<meta http-equiv="refresh" content="0;url='.$html->Link('/spolky/').'">');
  
 ?>

trunk/pages/spolky.php

@@ -49 +49 @@
 $db2 = $Realm->CharactersDatabase;
 
-$sql = $db2->query('SELECT `guild`.name, `guild`.guildid, `guild`.createdate, COUNT(`guild_member`.`guildid`) AS member_count ,`leader`.`race` IN (1, 3, 4, 7, 11) AS fraction , `leader`.`guid` AS leader FROM `guild` JOIN `guild_member` ON `guild_member`.`guildid` = `guild`.`guildid` JOIN `characters` AS `memebers` ON `memebers`.`guid`= `guild_member`.`guid` JOIN `characters` AS `leader` ON `leader`.`guid`= `guild`.`leaderguid` GROUP BY guild.name ORDER BY '.$order_by.' '.$order_dir.';');
+$sql = $db2->query('SELECT `guild`.name, `guild`.guildid, FROM_UNIXTIME(`guild`.`createdate`) AS `createdate`, COUNT(`guild_member`.`guildid`) AS member_count ,`leader`.`race` IN (1, 3, 4, 7, 11) AS fraction , `leader`.`guid` AS leader FROM `guild` JOIN `guild_member` ON `guild_member`.`guildid` = `guild`.`guildid` JOIN `characters` AS `memebers` ON `memebers`.`guid`= `guild_member`.`guid` JOIN `characters` AS `leader` ON `leader`.`guid`= `guild`.`leaderguid` GROUP BY guild.name ORDER BY '.$order_by.' '.$order_dir.';');
 while($row = $sql->fetch_assoc())
 {
@@ -64 +64 @@
   echo('<tr>
     <td align="center">'.FrakceImg($row['fraction']).'</td>
-    <td align="center"><a href="'.$html->Link('/spolek/'.$row['guildid'].'/').'">'.$row['name'].'</a></td>
+    <td align="center"><a href="'.$html->Link('/spolek/?id='.$row['guildid']).'">'.$row['name'].'</a></td>
     <td align="center">'.$row['member_count'].'</td>
     <td align="center">'.$online_mem['online_mem'].'</td>

trunk/pages/ucet.php

@@ -5 +5 @@
 if(array_key_exists('pass', $_POST)) $pass = $_POST['pass']; else $pass = '';
 
-if(isset($_POST['login']) and ($_POST['user'] != '') and ($_POST['pass'] != ''))
+function Menu()
 {
-  $player->Login($user, $pass);
-} else
-{
+  global $html, $player;
+  
   if($player->Check())
   {
@@ -40 +39 @@
     $player->LoginForm();
   }
+
+}
+
+if(isset($_POST['login']) and ($_POST['user'] != '') and ($_POST['pass'] != ''))
+{
+  $player->Login($user, $pass);
+  Menu();
+} else
+{
+  Menu();
 }
 $html->PrgStop();