X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fdbase_base.phh;h=66c998fe342c0fb999d2580dfd3706cc58d20f10;hb=c75222f24ff3f47a664f20f5971048d58f20c492;hp=dddd5929f55c33e6b68c2f6e56cc326e1f4927dc;hpb=7f9618888f9963c4a7daebeb9e3d14ef0a56b968;p=brisk.git

diff --git a/web/Obj/dbase_base.phh b/web/Obj/dbase_base.phh
index dddd592..66c998f 100644
--- a/web/Obj/dbase_base.phh
+++ b/web/Obj/dbase_base.phh
@@ -182,9 +182,10 @@ class MailDBItem {
     }
 }
 
-define('USERSNET_FRIEND', 1);
-define('USERSNET_SKILL', 1);
-define('USERSNET_TRUST', 2);
+define('USERSNET_DEF_FRIEND', 2);
+define('USERSNET_DEF_SKILL', 2);
+define('USERSNET_DEF_TRUST', 2);
+
 class UsersNetItem {
     var $owner;
     var $target;
@@ -194,29 +195,34 @@ class UsersNetItem {
 
     var $from_db;
 
-    function UsersNetItem($owner, $target, $friend, $skill, $trust, $from_db)
+    function UsersNetItem($owner, $target, $friend, $skill, $trust,
+                          $widefriend, $narrowfriend, $from_db)
     {
         $this->owner = $owner;
         $this->target = $target;
         $this->friend = $friend;
         $this->skill = $skill;
         $this->trust = $trust;
+        $this->widefriend = $widefriend;
+        $this->narrowfriend = $narrowfriend;
 
         $this->from_db = $from_db;
     }
 
-    static function UsersNetItemFromRecord($rec)
+    static function UsersNetItemFromRecord($rec, $widefriend, $narrowfriend)
     {
         $ret = new UsersNetItem($rec->owner, $rec->target, $rec->friend,
-                               $rec->skill, $rec->trust, TRUE);
+                               $rec->skill, $rec->trust,
+                                $widefriend, $narrowfriend, TRUE);
 
         return ($ret);
     }
 
-    static function UsersNetItemDefaults($owner, $target)
+    static function UsersNetItemDefaults($owner, $target, $widefriend, $narrowfriend)
     {
-        $ret = new UsersNetItem($owner, $target, USERSNET_FRIEND,
-                               USERSNET_SKILL, USERSNET_TRUST, FALSE);
+        $ret = new UsersNetItem($owner, $target, USERSNET_DEF_FRIEND,
+                                USERSNET_DEF_SKILL, USERSNET_DEF_TRUST,
+                                $widefriend, $narrowfriend, FALSE);
 
         return ($ret);
     }