X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Foutput.php;h=b0d3f4a87bbf70e0cd4560c368e40d7c0b9a4680;hp=2a743fc51140b5ac2546635245963df7eea25ca2;hb=a83ac7d982fa4f9d49ac3e6dedac8b489f2f7baa;hpb=197cea7c7d2c60f7ca0e8c40b4413ae331cd432c diff --git a/include/output.php b/include/output.php index 2a743fc..b0d3f4a 100644 --- a/include/output.php +++ b/include/output.php @@ -1,5 +1,5 @@ +/* Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2016, 2016 Arun Persaud * * This file is part of e-DoKo. * @@ -130,7 +130,6 @@ function output_form_for_new_game($names) echo ' '; $rand = $_SESSION["name"]; echo "
\n"; - $i++; echo " '; - echo ' '; + echo ' '; echo ' '; echo ' '; echo ' '; echo ' '; echo ' '; - echo ' '; - echo ' '; + echo ' '; + echo ' '; echo ' '; echo '
'; @@ -424,17 +423,17 @@ function output_header() e-Doko - - " /> + + " /> " /> "/> + -
- '._('Welcome to E-Doko').' '; -?> -
"; @@ -447,22 +446,19 @@ function output_footer() echo "
\n\n"; echo "\n\n"; echo ''; echo ''; echo ''; echo ''; + echo ''; echo ''; echo "\n"; @@ -471,13 +467,14 @@ function output_footer() return; } -function output_status() +function output_navbar() { global $defaulttimezone, $INDEX, $WIKI, $RSS; if(isset($_SESSION['name'])) { - $name = $_SESSION['name']; + $name = $_SESSION['name']; + $email = DB_get_email('name',$name); /* last logon time */ $myid = DB_get_userid('name',$name); @@ -492,18 +489,34 @@ function output_status() $token = get_user_token($myid); /* logout info */ - echo "\n
\n"; - echo $name,"\n"; - echo " | "._('mypage')."\n"; - echo " | "._('settings')."\n"; - echo " | "._('new game')."\n"; - echo " | "._('statistics')."\n"; - echo " | "._('wiki/bugs')."\n"; - echo " | "._('atom')."\n"; - echo " |    "._('logout')."\n"; - echo "
\n\n"; - - echo "
"._('last login').": ".date("r",$unixtime)."
\n\n"; + echo "\n\n"; } return; } @@ -636,7 +649,7 @@ function output_robotproof($i) } } -function output_exchanged_cards() +function output_exchanged_cards($gametype) { /* in a poverty game this function will output the exchanged cards * players in the team will see the cards, the other team will see @@ -644,7 +657,7 @@ function output_exchanged_cards() */ /* need some information about the game */ - global $gameid,$mygametype, $PREF,$me,$mystatus, $RULES; + global $gameid,$PREF,$me,$mystatus, $RULES; /* some variables to track where the people with poverty are sitting */ $partnerpos1 = 0; @@ -655,7 +668,7 @@ function output_exchanged_cards() /* only need to do it in a poverty game, this might not be needed, but * just to make sure everything is ok */ - if($mygametype == 'poverty' || $mygametype=='dpoverty') + if($gametype == 'poverty' || $gametype=='dpoverty') { /* find out who has poverty */ for($mypos=1;$mypos<5;$mypos++) @@ -791,7 +804,7 @@ function output_exchanged_cards() } echo " \n"; } - if($mygametype == $usersick) + if($gametype == $usersick) $show = 0; } }