fix error when language is not set

[e-DoKo.git] / include / functions.php

diff --git a/include/functions.php b/include/functions.php
index b476f6de7eb8e6ab151908c61db6c24359edade2..ee02b0a9438c2f6c6c1039dacef3880d4feafbda 100644 (file)
--- a/include/functions.php
+++ b/include/functions.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Arun Persaud <arun@nubati.net>
+/* Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2016 Arun Persaud <arun@nubati.net>
  *
  *   This file is part of e-DoKo.
  *
@@ -329,6 +329,7 @@ function compare_cards($a,$b,$game)
     case "normal":
     case "silent":
     case "trump":
+    case "wedding":
       if($RULES['schweinchen']=='both' && $GAME['schweinchen-who'])
        {
          if($a == 19 || $a == 20 )
@@ -356,6 +357,8 @@ function compare_cards($a,$b,$game)
          /* if not, do nothing and the foxes are just handeled as normal trump */
        }
        ;
+    case "poverty":
+    case "dpoverty":
     case "heart":
     case "spade":
     case "club":
@@ -1070,7 +1073,7 @@ function display_single_user($r,$start=0)
       $lastlogin = strtotime($r[6]);
       date_default_timezone_set($timezone);
       $timenow   = strtotime(date("Y-m-d H:i:s"));
-      $gravatar = "$name<br />\n       <img class=\"gravatar\" title=\"$name\" src=\"http://www.gravatar.com/avatar/".
+      $gravatar = "$name<br />\n       <img class=\"gravatar\" title=\"$name\" src=\"https://www.gravatar.com/avatar/".
        md5(strtolower(trim($email)))."?d=identicon\" alt=\"$name's gravatar\" />";
 
       echo "  <div class=\"table".($pos-1)."\">\n";
@@ -1712,9 +1715,14 @@ function verify_password($email, $password)
 function detectlanguage()
 {
        /* read out browser's prefered language, taken from php-manual*/
-       $langcode = explode(";", $_SERVER['HTTP_ACCEPT_LANGUAGE']);
-       $langcode = explode(",", $langcode['0']);
-       return $langcode['0'];
+  if(isset($_SERVER["HTTP_ACCEPT_LANGUAGE"]))
+    {
+      $langcode = explode(";", $_SERVER['HTTP_ACCEPT_LANGUAGE']);
+      $langcode = explode(",", $langcode['0']);
+      return $langcode['0'];
+    }
+  else
+    return 'en';
 }
 
 function set_language($l,$type='lang')