X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Fdb.php;h=f683beba29402686e4e93a057139cd63787b0bd3;hp=ad6c6f0cfbae967f536e99073f436ef6b9b8d781;hb=be205de31c62e22c4347e2c3514efe945645d946;hpb=c581cd05476d07f0fd17dab41cbb211a443fd57f diff --git a/include/db.php b/include/db.php index ad6c6f0..f683beb 100644 --- a/include/db.php +++ b/include/db.php @@ -1,5 +1,5 @@ +/* Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Arun Persaud * * This file is part of e-DoKo. * @@ -30,7 +30,7 @@ if(!isset($HOST)) function DB_open() { - $version_needed = 2; + $version_needed = 5; global $DB,$DB_user,$DB_host,$DB_database,$DB_password; $DB = @mysql_connect($DB_host,$DB_user, $DB_password); @@ -570,13 +570,31 @@ function DB_get_user_timezone($userid) return "Europe/London"; } -function DB_insert_comment($comment,$playid,$userid) +function DB_insert_comment($comment,$playid,$gameid,$userid) { - DB_query("INSERT INTO Comment VALUES (NULL,NULL,NULL,$userid,$playid, ".DB_quote_smart($comment).")"); + DB_query("INSERT INTO Comment VALUES (NULL,NULL,NULL,$userid,$playid,$gameid, ".DB_quote_smart($comment).")"); return; } +function DB_get_pre_comment($gameid) +{ + $r = DB_query_array_all("SELECT comment, User.fullname FROM Comment". + " LEFT JOIN User ON User.id=user_id". + " WHERE play_id=-1". + " AND game_id=$gameid "); + return $r; +} + +function DB_get_pre_comment_call($gameid) +{ + $r = DB_query_array_all("SELECT comment, User.fullname FROM Comment". + " LEFT JOIN User ON User.id=user_id". + " WHERE play_id=-2". + " AND game_id=$gameid "); + return $r; +} + function DB_insert_note($comment,$gameid,$userid) { DB_query("INSERT INTO Notes VALUES (NULL,NULL,NULL,$userid,$gameid, ".DB_quote_smart($comment).")"); @@ -754,6 +772,18 @@ function DB_get_party_by_gameid_and_userid($gameid,$userid) return NULL; } +function DB_get_party_by_session_and_userid($session,$userid) +{ + /* used in score table by index. gameids are sorted by date, so we need to sort here too! */ + $r = DB_query_array_all("SELECT party FROM Hand". + " LEFT JOIN Game ON Game.id = Hand.game_id". + " WHERE Game.session=".DB_quote_smart($session). + " AND user_id=".DB_quote_smart($userid)."". + " AND Game.status='gameover' ". + " ORDER BY Game.create_date ASC"); + return $r; +} + function DB_set_party_by_hash($hash,$party) { DB_query("UPDATE Hand SET party=".DB_quote_smart($party)." WHERE hash=".DB_quote_smart($hash)); @@ -782,9 +812,6 @@ function DB_get_PREF($myid) switch($pref[0]) { case 'cardset': - /* licence only valid until then */ - if($pref[1]=='altenburg' && (time()-strtotime( '2009-12-31 23:59:59')<0) ) - $PREF['cardset']='altenburg'; break; case 'email': @@ -833,7 +860,7 @@ function DB_get_PREF($myid) break; } } - $_SESSION['language'] = $PREF['language']; + return $PREF; } @@ -921,6 +948,12 @@ function DB_set_recovery_password($user,$newpw) return; } +function DB_delete_recovery_passwords($userid) +{ + DB_query("DELETE FROM Recovery WHERE user_id=".DB_quote_smart($userid)); + return; +} + function DB_get_card_name($card) { if($card==0) @@ -936,16 +969,17 @@ function DB_get_card_name($card) function DB_get_current_playid($gameid) { + /* return playid or -1 for pre-game phase */ $trick = DB_get_max_trickid($gameid); - if(!$trick) return NULL; + if(!$trick) return -1; $r = DB_query_array("SELECT id FROM Play WHERE trick_id='$trick' ORDER BY create_date DESC LIMIT 1"); if($r) return $r[0]; - return ""; + return -1; } function DB_get_call_by_hash($hash) @@ -1032,48 +1066,24 @@ function DB_is_session_active($session) return -1; } -function DB_get_score_by_gameid($gameid) -{ - /* returns the points of a game from the point of the re parth (<0 if they lost) */ - $queryresult = DB_query("SELECT COUNT(*),party FROM Score ". - " WHERE game_id=$gameid ". - " GROUP BY party "); - $re = 0; - $contra = 0; - - while($r = DB_fetch_array($queryresult) ) - { - if($r[1] == "re") - $re += $r[0]; - else if ($r[1] == "contra") - $contra += $r[0]; - }; - - return ($re - $contra); -} - function DB_get_gameids_of_finished_games_by_session($session) { $ids = array (); if($session==0) /* return all games */ - $queryresult = DB_query("SELECT id FROM Game ". - " WHERE status='gameover' ". - " ORDER BY create_date ASC"); + $queryresult = DB_query_array_all("SELECT Game.id,SUM(IF(STRCMP(Score.party,'re'),-1,1)),Game.type FROM Game ". + " LEFT JOIN Score on game_id=Game.id". + " WHERE status='gameover' ". + " GROUP BY Game.id"); else /* return games in a session */ - $queryresult = DB_query("SELECT id FROM Game ". - " WHERE session=$session ". - " AND status='gameover' ". - " ORDER BY create_date ASC"); + $queryresult = DB_query_array_all("SELECT Game.id,SUM(IF(STRCMP(Score.party,'re'),-1,1)),Game.type FROM Game ". + " LEFT JOIN Score on game_id=Game.id". + " WHERE session=$session ". + " AND status='gameover' ". + " GROUP BY Game.id". + " ORDER BY Game.create_date ASC"); - $i=0; - while($r = DB_fetch_array($queryresult) ) - { - $ids[$i] = $r[0]; - $i++; - } - - return $ids; + return $queryresult; } function DB_get_card_value_by_cardid($id) @@ -1235,9 +1245,12 @@ function DB_get_number_of_tricks($gameid,$position) return $r[0]; } -function DB_digest_insert_email($To,$message) +function DB_digest_insert_email($To,$message,$type,$gameid) { - DB_query("INSERT INTO digest_email VALUES (NULL,".DB_quote_smart($To).",NULL,".DB_quote_smart($message).")"); + if($type == GAME_YOUR_TURN) + DB_query("INSERT INTO digest_email VALUES (NULL,".DB_quote_smart($To).",NULL,'your_turn',$gameid,".DB_quote_smart($message).")"); + else + DB_query("INSERT INTO digest_email VALUES (NULL,".DB_quote_smart($To).",NULL,'misc',NULL,".DB_quote_smart($message).")"); return; } @@ -1256,7 +1269,7 @@ function DB_get_digest_message_by_email($email) { $messages = array(); - $result = DB_query("SELECT id,content FROM digest_email Where email='$email'"); + $result = DB_query("SELECT id,content,type,game_id FROM digest_email Where email='$email'"); while($r = DB_fetch_array($result)) $messages[]=$r;