From c7d334c4782dd4bc07e5bda8bb364d62e5537d1e Mon Sep 17 00:00:00 2001 From: Arun Persaud Date: Mon, 26 Apr 2010 23:13:32 -0700 Subject: Added about page --- include/output.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/output.php b/include/output.php index a4b84a0..88cbf6b 100644 --- a/include/output.php +++ b/include/output.php @@ -418,7 +418,7 @@ function output_footer() echo "\n\n"; echo "
\n"; - echo "

copyright 2006,2007,2008,2009,2010 Arun Persaud, Lance Thornton(graphics), Jeff Zerger(database support)
\n". + echo "

copyright 2006,2007,2008,2009,2010 Arun Persaud, et al.
\n". " Verwendung der [deutschen] Kartenbilder mit Genehmigung
der Spielkartenfabrik Altenburg GmbH,(c) ASS Altenburger
\n". " - ASS Altenburger Spielkarten - Spielkartenfabrik Altenburg GmbH
\n". " a Carta Mundi Company Email: info@spielkarten.com Internet: www.spielkarten.com

\n"; -- cgit v1.2.3-18-g5258 From b9c5f3e252ab1f5725d653528cc8a719e6822f6d Mon Sep 17 00:00:00 2001 From: Arun Persaud Date: Mon, 26 Apr 2010 23:35:41 -0700 Subject: added an About page --- include/about.php | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ include/output.php | 6 ++--- 2 files changed, 70 insertions(+), 3 deletions(-) create mode 100644 include/about.php (limited to 'include') diff --git a/include/about.php b/include/about.php new file mode 100644 index 0000000..bcf7760 --- /dev/null +++ b/include/about.php @@ -0,0 +1,67 @@ + + * + * This file is part of e-DoKo. + * + * e-DoKo is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * e-DoKo is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with e-DoKo. If not, see . + * + */ + +/* make sure that we are not called from outside the scripts, + * use a variable defined in config.php to check this + */ +if(!isset($HOST)) + exit; + +echo ' +
+ +
+

Coding

+
    +
  • Arun Persaud
    • +
  • Sean Brennan
    • +
+
+ +
+

Database support

+
    +
  • Arun Persaud
    • +
  • Jeff Zerger
    • +
+
+ +
+

Graphics

+
    +
  • Lance Thornton
    • +
  • Frances Allen
    • +
  • Arun Persaud
    • +
+
+ +
+

Translation

+
    +
  • German +
      +
    • Arun Persaud
      • +
    +
    • +
+
+
+' +?> diff --git a/include/output.php b/include/output.php index 88cbf6b..729452a 100644 --- a/include/output.php +++ b/include/output.php @@ -376,7 +376,7 @@ function output_header() e-Doko - + @@ -414,11 +414,11 @@ function output_header() function output_footer() { - global $REV,$PREF; + global $REV, $PREF, $INDEX; echo "
\n\n"; echo "
\n"; - echo "

copyright 2006,2007,2008,2009,2010 Arun Persaud, et al.
\n". + echo "

copyright 2006,2007,2008,2009,2010 Arun Persaud, et al.
\n". " Verwendung der [deutschen] Kartenbilder mit Genehmigung
der Spielkartenfabrik Altenburg GmbH,(c) ASS Altenburger
\n". " - ASS Altenburger Spielkarten - Spielkartenfabrik Altenburg GmbH
\n". " a Carta Mundi Company Email: info@spielkarten.com Internet: www.spielkarten.com

\n"; -- cgit v1.2.3-18-g5258 From 11823f4dd6a5b231893b84ca94861e3e6ba57f1d Mon Sep 17 00:00:00 2001 From: Arun Persaud Date: Tue, 4 May 2010 19:39:51 -0700 Subject: added BK as translator --- include/about.php | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/about.php b/include/about.php index bcf7760..ad39eaf 100644 --- a/include/about.php +++ b/include/about.php @@ -58,6 +58,7 @@ echo '
  • German
    • Arun Persaud
      • +
    • BK
    • -- cgit v1.2.3-18-g5258 From 5e3f5fe45c7d05a85f5e36637b3dd937e1ac3596 Mon Sep 17 00:00:00 2001 From: Arun Persaud Date: Tue, 4 May 2010 21:44:30 -0700 Subject: improved jquery on user home page the text will now say either show or hide not both depending on the situation. --- include/output.php | 18 +++++++++++++++--- include/user.php | 7 ++++--- 2 files changed, 19 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/output.php b/include/output.php index 729452a..13bc6f7 100644 --- a/include/output.php +++ b/include/output.php @@ -376,24 +376,36 @@ function output_header() e-Doko - - + + -- cgit v1.2.3-18-g5258 From 615fb7c0fec9ec6f187a3c568cf1e2e6c1572b1e Mon Sep 17 00:00:00 2001 From: Arun Persaud Date: Tue, 21 Sep 2010 20:10:00 -0700 Subject: TRANSLATION: some more strings and updated po.de --- include/output.php | 16 ++++++------- include/preferences.php | 60 ++++++++++++++++++++++++------------------------- include/user.php | 30 +++++++++++++------------ 3 files changed, 54 insertions(+), 52 deletions(-) (limited to 'include') diff --git a/include/output.php b/include/output.php index 23c9199..3ad0552 100644 --- a/include/output.php +++ b/include/output.php @@ -219,14 +219,14 @@ function output_check_for_sickness($me,$mycards) echo ''; echo ' '._('Do you want to play solo?').''; echo ' '; echo '
    '; diff --git a/include/preferences.php b/include/preferences.php index 3a841c3..0485d9e 100644 --- a/include/preferences.php +++ b/include/preferences.php @@ -337,12 +337,12 @@ if($PREF['vacation_start']) $value = substr($PREF['vacation_start'],0,10); else $value = ''; -echo " start:\n"; +echo " "._('start').":\n"; if($PREF['vacation_stop']) $value = substr($PREF['vacation_stop'],0,10); else $value = ''; -echo " stop:\n"; +echo " "._('stop').":\n"; if($PREF['vacation_comment']) $value = $PREF['vacation_comment']; else @@ -351,8 +351,8 @@ echo ' '._('comment:')."\n"; -echo "use YYYY-MM-DDuse '-' in start field to unset vacation\n"; -echo " Notification: \n"; +echo ''._('use YYYY-MM-DD').''._("use '-' in start field to unset vacation")."\n"; +echo ' '._('Notification').": \n"; echo " "; if($changed_notify) echo _('changed'); echo " \n"; -echo " Digest: \n"; +echo ' '._('Digest').": \n"; echo " \n"; if($PREF['autosetup']=="yes") { @@ -440,33 +440,33 @@ if($PREF['sorting']=="high-low") echo " "; if($changed_sorting) echo _('changed'); echo " \n"; -echo " Open for new games: \n"; +echo ' '._('Open for new games').": \n"; echo " "; if($changed_openforgames) echo _('changed'); echo " \n"; -echo " Card set: \n"; +echo ' '.('Card set').": \n"; echo " "; if($changed_cards) echo _('changed'); @@ -474,45 +474,45 @@ echo " \n"; echo " \n"; echo " \n"; echo "
    \n"; -echo " Personal\n"; +echo ' '._('Personal')."\n"; echo " \n"; -echo " \n"; -echo " \n"; +echo ' \n"; -echo " \n"; -echo " \n"; -echo " \n"; -echo " \n"; echo "
    Email: $email
    Timezone: \n"; +echo '
    '._('Email').": $email
    '._('Timezone').": \n"; output_select_timezone("timezone",$timezone); if($changed_timezone) echo _('changed'); echo "
    Language: \n"; +echo '
    '._('Language').": \n"; output_select_language("language",$PREF['language']); if($changed_language == 1) echo _('changed'); echo "
    Password(old): ", +echo '
    '._('Password(old)').": ", ""; switch($changed_password) { case '-3': - echo "The new passwords is not long enough (you need at least 4 characters)."; + echo _('The new passwords is not long enough (you need at least 4 characters).'); break; case '-2': - echo "The new passwords don't match."; + echo _('The new passwords don\'t match.'); break; case '-1': - echo "The old password is not correct."; + echo _('The old password is not correct.'); break; case '1': echo _('changed'); break; } echo "
    Password(new): ", +echo '
    '._('Password(new)').": ", "", "
    Password(new, retype): ", +echo '
    '._('Password(new, retype)').": ", "", "
    \n"; echo "
    \n"; echo "
    \n"; -echo " OpenID\n"; +echo ' '._('OpenID')."\n"; $openids = array(); $openids = DB_GetOpenIDsByUser($myid); @@ -531,14 +531,14 @@ if(sizeof($openids)) echo " \n"; } -echo " add OpenID: ", +echo ' '._('add OpenID').': ', ""; if($changed_openid) - echo " Deleted some OpenIDs!
    \n"; + echo ' '._('Deleted some OpenIDs!')."
    \n"; echo "
    \n"; -echo "
    Submit
    \n"; +echo '
    '._('Submit')."
    \n"; echo " \n"; -echo "

    E-DoKo uses gravatars as icons.

    "; +echo '

    '._('E-DoKo uses gravatars as icons.').'

    '; echo "
    \n"; return; diff --git a/include/user.php b/include/user.php index 3046b34..e8d38f7 100644 --- a/include/user.php +++ b/include/user.php @@ -25,20 +25,22 @@ if(!isset($HOST)) exit; /* test id and password, should really be done in one step */ -if(!isset($_SESSION["name"])) +if(!isset($_SESSION['name'])) { - $email = $_REQUEST["email"]; - $password = $_REQUEST["password"]; + $email = $_REQUEST['email']; + $password = $_REQUEST['password']; } else { - $name = $_SESSION["name"]; + $name = $_SESSION['name']; $email = DB_get_email('name',$name); $password = DB_get_passwd_by_name($name); }; +global $ADMIN_NAME; + /* user has forgotten his password */ -if(myisset("forgot")) +if(myisset('forgot')) { /* check if player is in the database */ $ok = 1; @@ -55,16 +57,16 @@ if(myisset("forgot")) /* if less than N recent ones, add a new one and send out email */ if( $number < 5 ) { - echo "Ok, I send you a new password.
    "; + echo _('Ok, I will send you a new password.').'
    '; if($number >1) 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 _('The new password will be valid for one day, make sure you reset it to something else.').'
    '; echo "Back to the main page."; /* create temporary password, use the fist 8 letters of a md5 hash */ $TIME = (string) time(); /* to avoid collisions */ - $hash = md5("Anewpassword".$email.$TIME); + $hash = md5('Anewpassword'.$email.$TIME); $newpw = substr($hash,1,8); $message = "Someone (hopefully you) requested a new password. \n". @@ -83,8 +85,8 @@ if(myisset("forgot")) { /* make it so that people (or a robot) can request thousands of passwords within a short time * and spam a user this way */ - 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 _('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."; } } @@ -97,7 +99,7 @@ if(myisset("forgot")) "Please try again."; else /* default error message */ echo "Couldn't find a player with this email!
    ". - "Please contact Arun, if you think this is a mistake
    ". + "Please contact $ADMIN_NAME, if you think this is a mistake
    ". "or else try again."; } } @@ -117,7 +119,7 @@ else { /* user information is ok */ $myname = DB_get_name('email',$email); - $_SESSION["name"] = $myname; + $_SESSION['name'] = $myname; $PREF = DB_get_PREF($myid); @@ -126,7 +128,7 @@ else display_user_menu($myid); /* display all games the user has played */ - echo "
    "; + echo '
    '; if($myvacation = check_vacation($myid)) { @@ -327,7 +329,7 @@ else } else { - echo "
    Sorry email and password don't match. Please try again.
    "; + echo '
    '."Sorry email and password don't match. Please try again.".'
    '; } }; ?> \ No newline at end of file -- cgit v1.2.3-18-g5258 From f94dd2d6d58f37306d1da0f6bb12f5276883cd6b Mon Sep 17 00:00:00 2001 From: Arun Persaud Date: Tue, 21 Sep 2010 20:27:12 -0700 Subject: NEW FEATURE: pre select card to play if there is only one option --- include/game.php | 34 +++++++++++++++++++++++++++++++++- include/output.php | 9 ++++++--- 2 files changed, 39 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/game.php b/include/game.php index eb66a98..04df162 100644 --- a/include/game.php +++ b/include/game.php @@ -1990,6 +1990,38 @@ switch($mystatus) if(have_suit($mycards,$firstcard)) $followsuit = 1; + /* count how many cards we can play, so that we can pre-select it if there is only one */ + $howmanycards = 0; + foreach($mycards as $card) + { + if($howmanycard>1) + break; + + /* display only cards that the player is allowed to play as links, the rest just display normal + * also check if we have both schweinchen, in that case only display on of them as playable + */ + if( ($followsuit && !same_type($card,$firstcard)) || + ( (int)($card)==19 && + !$GAME['schweinchen-first'] && + ( $RULES['schweinchen']=='second' || + ( $RULES['schweinchen']=='secondaftercall' && + (DB_get_call_by_hash($GAME['schweinchen-who']) || + DB_get_partner_call_by_hash($GAME['schweinchen-who']) ) + ) + ) && + $GAME['schweinchen-who']==$me && + in_array($gametype,array('normal','wedding','trump','silent')) + ) + ) + continue ; + else + $howmanycards++; + } + if($howmanycards==1) + $howmanycards=1; + else + $howmanycards=0; + foreach($mycards as $card) { /* display only cards that the player is allowed to play as links, the rest just display normal @@ -2010,7 +2042,7 @@ switch($mystatus) ) display_card($card,$PREF['cardset']); else - display_link_card($card,$PREF['cardset']); + display_link_card($card,$PREF['cardset'],$selected=$howmanycards); } } else if($mystatus=='play' ) diff --git a/include/output.php b/include/output.php index 3ad0552..0c2ff96 100644 --- a/include/output.php +++ b/include/output.php @@ -202,12 +202,15 @@ function display_card($card,$dir="english") return; } -function display_link_card($card,$dir="english",$type="card") +function display_link_card($card,$dir="english",$type="card", $selected=0) { + if($selected) + $selected = 'selected="selected"'; + if( $card/2 - (int)($card/2) == 0.5) - echo "
    \"".DB_get_card_name($card)."\"
    \n"; + echo "
    \"".DB_get_card_name($card)."\"
    \n"; else - echo "
    \"".DB_get_card_name($card-1)."\"
    \n"; + echo "
    \"".DB_get_card_name($card-1)."\"
    \n"; return; } -- cgit v1.2.3-18-g5258