From: Matteo Nastasi (mop) <nastasi@alternativeoutput.it>
Date: Tue, 5 Nov 2013 07:26:49 +0000 (+0100)
Subject: retrieve win and friend login name when id isn't -1 only
X-Git-Tag: v4.10.1~4
X-Git-Url: http://mop.ddnsfree.com/gitweb/?p=brisk.git;a=commitdiff_plain;h=d54d1275506da35236ca65635a92f3c30dd37896

retrieve win and friend login name when id isn't -1 only
---

diff --git a/web/Obj/dbase_pgsql.phh b/web/Obj/dbase_pgsql.phh
index ba8fc60..f7f67cd 100644
--- a/web/Obj/dbase_pgsql.phh
+++ b/web/Obj/dbase_pgsql.phh
@@ -414,8 +414,10 @@ class BriskDB
         $gam_obj = pg_fetch_object($gam_pg, 0);
 
         $table->old_reason = game_description($gam_obj->act, 'html', $gam_obj->mult,
-                                              $gam_obj->asta_win, $users[$gam_obj->asta_win]['login'],
-                                              $gam_obj->friend, $users[$gam_obj->friend]['login'],
+                                              $gam_obj->asta_win, ($gam_obj->asta_win != -1 ?
+                                                                   $users[$gam_obj->asta_win]['login'] : ""),
+                                              $gam_obj->friend, ($gam_obj->friend != -1 ?
+                                                                 $users[$gam_obj->friend]['login'] : ""),
                                               $gam_obj->pnt, $gam_obj->asta_pnt);
 
         return (TRUE);
diff --git a/web/briskin5/Obj/briskin5.phh b/web/briskin5/Obj/briskin5.phh
index b6ef20a..83973bd 100644
--- a/web/briskin5/Obj/briskin5.phh
+++ b/web/briskin5/Obj/briskin5.phh
@@ -633,8 +633,12 @@ class Bin5_table extends Table {
 
         $this->old_friend = $this->friend;
         $this->old_reason = game_description($action, 'html', $this->old_mult,
-                                             $this->old_asta_win, $bri->user[$this->player[$this->old_asta_win]]->name,
-                                             $this->old_friend, $bri->user[$this->player[$this->old_friend]]->name,
+                                             $this->old_asta_win,
+                                             ($this->old_asta_win != -1 ?
+                                              $bri->user[$this->player[$this->old_asta_win]]->name : ""),
+                                             $this->old_friend,
+                                             ($this->old_friend != -1 ?
+                                              $bri->user[$this->player[$this->old_friend]]->name : ""),
                                              $this->old_pnt, $this->old_asta_pnt);
 
 
diff --git a/web/briskin5/stat-day.php b/web/briskin5/stat-day.php
index 0cd4aad..cc54e9c 100644
--- a/web/briskin5/stat-day.php
+++ b/web/briskin5/stat-day.php
@@ -357,8 +357,12 @@ function main_pgsql($from, $to)
                     if ($tmt_obj->minus_one_is_old != -1) {
                         fprintf($fpexp, "<td>%s</td><td>%s</td>", $users[$gam_obj->mazzo]['login'],
                                 xcape( game_description($gam_obj->act, 'plain', $gam_obj->mult,
-                                                        $gam_obj->asta_win, $users[$gam_obj->asta_win]['login'],
-                                                        $gam_obj->friend, $users[$gam_obj->friend]['login'],
+                                                        $gam_obj->asta_win,
+                                                        ($gam_obj->asta_win != -1 ?
+                                                         $users[$gam_obj->asta_win]['login'] : ""),
+                                                        $gam_obj->friend,
+                                                        ($gam_obj->friend != -1 ?
+                                                         $users[$gam_obj->friend]['login'] : ""),
                                                         $gam_obj->pnt, $gam_obj->asta_pnt) )
                                 );
                     }