From: Arun Persaud Date: Mon, 17 Dec 2007 09:17:50 +0000 (+0100) Subject: BUGFIX: use of local web links now possible X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad48a970a52fc44b65176b951a15b9846a290bab;p=e-DoKo.git BUGFIX: use of local web links now possible before I used a lot of http:// requests although the files were in the same domain, now local links with absolute paths are used. --- diff --git a/INSTALL b/INSTALL index a30d26c..86b65d4 100644 --- a/INSTALL +++ b/INSTALL @@ -23,7 +23,9 @@ Installation Copy config.php_template to config.php and edit it. These variables need to be set: - $host: for example "http://localhost/index.php", note: include the index.php here + $HOST: for example "http://localhost" + $INDEX: the absolute web path to your index.php file e.g. "/mypath/index.php" + $STATS: the absolute web path to your stats.php file e.g. "/mypath/stast.php" database info: diff --git a/config.php_template b/config.php_template index 761d889..0ccd540 100644 --- a/config.php_template +++ b/config.php_template @@ -27,8 +27,10 @@ /* used as the reply email in each email */ $EMAIL_REPLY=""; - /* this should point to your index.file, probably without the http:// to avoid extra requests */ - $host = "http://.../index.php" + /* this should point to your index.file and to your domain*/ + $INDEX = "/index.php"; + $HOST = "http://www.example.com"; + /* the default timezone for you domain */ $defaulttimezone = date_default_timezone_get(); ?> \ No newline at end of file diff --git a/functions.php b/functions.php index b1ed09f..0ce3104 100644 --- a/functions.php +++ b/functions.php @@ -640,7 +640,7 @@ function can_call($what,$hash) function display_table () { - global $gameid, $GT, $debug,$host,$defaulttimezone; + global $gameid, $GT, $debug,$INDEX,$defaulttimezone; $result = mysql_query("SELECT User.fullname as name,". " Hand.position as position, ". @@ -677,7 +677,7 @@ function display_table () if(!$debug) echo " $name \n"; else - echo " $name\n"; + echo " $name\n"; /* add hints for poverty, wedding, solo, etc */ if($GT=="poverty" && $party=="re") @@ -785,9 +785,9 @@ function display_table () function display_user_menu() { - global $wiki,$myid,$host; + global $wiki,$myid,$INDEX,$STATS; echo "
\n". - " Go to my user page "; + " Go to my user page "; $result = mysql_query("SELECT Hand.hash,Hand.game_id,Game.player from Hand". " LEFT JOIN Game On Hand.game_id=Game.id". @@ -800,15 +800,15 @@ function display_user_menu() while( $r = mysql_fetch_array($result,MYSQL_NUM)) { - echo "game ".DB_format_gameid($r[1])."
\n"; + echo "game ".DB_format_gameid($r[1])."
\n"; } - echo "
Start a new game\n"; + echo "
Start a new game\n"; - echo "
Statistics\n"; + echo "
Statistics\n"; echo - "
Report bugs in the wiki\n"; + "
Report bugs in the wiki\n"; echo "
\n"; return; } diff --git a/index.php b/index.php index de6cdfe..bfa517c 100644 --- a/index.php +++ b/index.php @@ -30,7 +30,7 @@ if(myisset("logout")) session_destroy(); $_SESSION = array(); echo "
You are now logged out!
\n". - "(This will take you back to the home-page)
"; + "(This will take you back to the home-page)"; } else if(myisset("new")) { @@ -45,7 +45,7 @@ else if(myisset("new")) } else { - echo "
Please log in.
"; + echo "
Please log in.
"; } } /*check if everything is ready to set up a new game */ @@ -182,7 +182,7 @@ else if(myisset("new")) "$PlayerC\n". "$PlayerD\n\n". "If you want to join this game, please follow this link:\n\n". - "".$host."?me="; + "".$HOST.$INDEX."?me="; mymail($EmailA,"You are invited to a game of DoKo","Hello $PlayerA,\n".$message.$hashA); mymail($EmailB,"You are invited to a game of DoKo","Hello $PlayerB,\n".$message.$hashB); @@ -204,7 +204,7 @@ else if(myisset("cancle","me")) if(!$myid) { echo "Can't find you in the database, please check the url.
\n"; - echo "perhaps the game has been cancled, check by login in here."; + echo "perhaps the game has been cancled, check by login in here."; output_footer(); DB_close(); exit(); @@ -253,7 +253,7 @@ else if(myisset("remind","me")) if(!$myid) { echo "Can't find you in the database, please check the url.
\n"; - echo "perhaps the game has been cancled, check by login in here."; + echo "perhaps the game has been cancled, check by login in here."; output_footer(); DB_close(); exit(); @@ -278,7 +278,7 @@ else if(myisset("remind","me")) "It's your turn in game ".DB_format_gameid($gameid)." \n". "Actually everyone else is waiting for you for more than a week now ;)\n\n". "Please visit this link now to continue: \n". - " ".$host."?me=".$userhash."\n\n" ; + " ".$HOST.$INDEX."?me=".$userhash."\n\n" ; if(DB_get_reminder($r[1],$gameid)>0) { @@ -307,7 +307,7 @@ else if(myisset("me")) if(!$myid) { echo "Can't find you in the database, please check the url.
\n"; - echo "perhaps the game has been cancled, check by login in here."; + echo "perhaps the game has been cancled, check by login in here."; output_footer(); DB_close(); exit(); @@ -383,7 +383,7 @@ else if(myisset("me")) if($hash == $me) echo "$i \n"; else - echo "$i \n"; + echo "$i \n"; $i++; } echo "\n"; @@ -421,7 +421,7 @@ else if(myisset("me")) */ if( !myisset("in") ) { - echo "

You need to answer the question.

"; + echo "

You need to answer the question.

"; DB_set_hand_status_by_hash($me,'start'); } else @@ -471,7 +471,7 @@ else if(myisset("me")) * unless a user tries to cheat ;) * can also happen if user reloads the page! */ - echo "

You need to answer the questions.

"; + echo "

You need to answer the questions.

"; DB_set_hand_status_by_hash($me,'init'); } else @@ -486,7 +486,7 @@ else if(myisset("me")) if($Nvorbehalt>1) { echo "

You selected more than one vorbehalt, please go back ". - "and answer the question again.

"; + "and answer the question again.

"; DB_set_hand_status_by_hash($me,'init'); } else @@ -537,7 +537,7 @@ else if(myisset("me")) DB_set_sickness_by_hash($me,"nines"); } - echo " Ok, done with checking, please go to the next step of the setup.

"; + echo " Ok, done with checking, please go to the next step of the setup.

"; /* move on to the next stage*/ DB_set_hand_status_by_hash($me,'poverty'); @@ -567,7 +567,7 @@ else if(myisset("me")) { $message = "Everyone finish the questionary in game ".DB_format_gameid($gameid).", ". "please visit this link now to continue: \n". - " ".$host."?me=".$userhash."\n\n" ; + " ".$HOST.$INDEX."?me=".$userhash."\n\n" ; mymail($To,$EmailName." finished setup in game ".DB_format_gameid($gameid),$message); } }; @@ -776,7 +776,7 @@ else if(myisset("me")) DB_set_party_by_hash($me,"contra"); echo "Whoever will make the first trick will be on the re team.
\n"; - echo " Ok, the game can start now, please finish the setup.
"; + echo " Ok, the game can start now, please finish the setup.
"; DB_set_hand_status_by_hash($me,'play'); break; @@ -838,7 +838,7 @@ else if(myisset("me")) DB_set_player_by_gameid($gameid,$who); $message = "Someone has poverty, it's your turn to decide, if you want to take the trump. Please visit:". - " ".$host."?me=".$userhash."\n\n" ; + " ".$HOST.$INDEX."?me=".$userhash."\n\n" ; mymail($To,$EmailName." poverty (game ".DB_format_gameid($gameid).")",$message); } @@ -919,7 +919,7 @@ else if(myisset("me")) $message = "Someone has poverty, it's your turn to decide, ". "if you want to take the trump. Please visit:". - " ".$host."?me=".$userhash."\n\n" ; + " ".$HOST.$INDEX."?me=".$userhash."\n\n" ; mymail($To,$EmailName." poverty (game ".DB_format_gameid($gameid).")",$message); } } @@ -1064,11 +1064,11 @@ else if(myisset("me")) { /* email startplayer) */ $message = "It's your turn now in game ".DB_format_gameid($gameid).".\n". - "Use this link to play a card: ".$host."?me=".$hash."\n\n" ; + "Use this link to play a card: ".$HOST.$INDEX."?me=".$hash."\n\n" ; mymail($email,$EmailName."ready, set, go... (game ".DB_format_gameid($gameid).") ",$message); } else - echo " Please, start the game.
"; + echo " Please, start the game.
"; } else echo "\n
"; @@ -1448,7 +1448,7 @@ else if(myisset("me")) $message = "A card has been played in game ".DB_format_gameid($gameid).".\n\n". "It's your turn now.\n". - "Use this link to play a card: ".$host."?me=".$next_hash."\n\n" ; + "Use this link to play a card: ".$HOST.$INDEX."?me=".$next_hash."\n\n" ; if( DB_get_email_pref_by_uid($who)!="emailaddict" ) mymail($email,$EmailName."a card has been played in game ".DB_format_gameid($gameid),$message); } @@ -1681,7 +1681,8 @@ else if(myisset("me")) $To = DB_get_email_by_userid($user); $hash = DB_get_hash_from_gameid_and_userid($gameid,$user); - $link = "Use this link to have a look at game ".DB_format_gameid($gameid).": ".$host."?me=".$hash."\n\n" ; + $link = "Use this link to have a look at game ".DB_format_gameid($gameid).": ". + $HOST.$INDEX."?me=".$hash."\n\n" ; if( DB_get_email_pref_by_uid($user) != "emailaddict" ) mymail($To,$EmailName."game over (game ".DB_format_gameid($gameid).") part 2(2)",$link); } @@ -1942,7 +1943,7 @@ else if( myisset("email","password") || isset($_SESSION["name"]) ) echo "N.B. You tried this already $number times during the last day and it will only work ". " 5 times during a day.
"; echo "The new password will be valid for one day, make sure you reset it to something else.
"; - echo "Back to the main page."; + echo "Back to the main page."; $TIME = (string) time(); /* to avoid collisions */ $hash = md5("Anewpassword".$email.$TIME); @@ -1962,18 +1963,18 @@ else if( myisset("email","password") || isset($_SESSION["name"]) ) { echo "Sorry you already tried 5 times during the last 24h.
". "You need to use one of those passwords or wait to get a new one.
"; - echo "Back to the main page."; + echo "Back to the main page."; } } else { if($email=="") echo "You need to give me an email address!
". - "Please try again."; + "Please try again."; else echo "Couldn't find a player with this email!
". "Please contact Arun, if you think this is a mistake
". - "or else try again."; + "or else try again."; } } else @@ -2101,14 +2102,14 @@ else if( myisset("email","password") || isset($_SESSION["name"]) ) } if($r[4]=='pre') { - echo "\n p "; + echo "\n p "; } else if ($r[4]=='gameover') - echo "\n F "; + echo "\n F "; else { - echo "\n P "; + echo "\n P "; } if($r[4] != 'gameover') { @@ -2124,13 +2125,13 @@ else if( myisset("email","password") || isset($_SESSION["name"]) ) if(DB_get_reminder($r[3],$gameid)==0) if(time()-strtotime($r[2]) > 60*60*24*7) echo "". - "Send a reminder."; + "Send a reminder."; echo "(it's $name's turn)\n"; }; } if(time()-strtotime($r[2]) > 60*60*24*30) echo "". - "Cancel?". + "Cancel?". " (clicking here is final and can't be restored)"; } @@ -2144,7 +2145,7 @@ else if( myisset("email","password") || isset($_SESSION["name"]) ) } else { - echo "
Sorry email and password don't match. Please try again.
"; + echo "
Sorry email and password don't match. Please try again.
"; } }; output_footer(); diff --git a/output.php b/output.php index 98bfb9d..19e11eb 100644 --- a/output.php +++ b/output.php @@ -267,7 +267,7 @@ function output_home_page($pre,$game,$done,$avgtime) echo "$done games have been completed on this server. Average time of a game: $avgtime days

"; ?> -

Please register, in case you have not done that yet
+

Please register, in case you have not done that yet
or login with you email-address or name and password here:

diff --git a/register.php b/register.php index 7c3a373..80f569b 100644 --- a/register.php +++ b/register.php @@ -24,6 +24,7 @@ output_header(); /* new user wants to register */ if(myisset("Rfullname","Remail","Rpassword","Rtimezone") ) { + global $HOST,$INDEX; $ok=1; if(DB_get_userid_by_name($_REQUEST["Rfullname"])) { @@ -44,7 +45,7 @@ if(myisset("Rfullname","Remail","Rpassword","Rtimezone") ) if($r) echo " Welcome to e-DoKo, you are now registered, please visit the". - " homepage to continue."; + " homepage to continue."; else echo " something went wrong, couldn't add you to the database, please contact $ADMIN_NAME at $ADMIN_EMAIL."; } diff --git a/stats.php b/stats.php index bab9823..44378d4 100644 --- a/stats.php +++ b/stats.php @@ -29,7 +29,7 @@ if(myisset("logout")) session_destroy(); $_SESSION = array(); echo "
You are now logged out!
\n". - "(This will take you back to the home-page)
"; + "(This will take you back to the home-page)"; } /* user status page */ else if( isset($_SESSION["name"]) ) @@ -228,7 +228,7 @@ else if( isset($_SESSION["name"]) ) { /* send them back to the login page */ echo "
You need to log in!
\n". - "(This will take you back to the login-page)
"; + "(This will take you back to the login-page)"; } output_footer();