librefm-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Librefm-commits] [1298] rename id to gid since $id is apparently being


From: Clint Adams
Subject: [Librefm-commits] [1298] rename id to gid since $id is apparently being used for something else, and reenable group mods until usernames can be converted to uniqueid joins
Date: Fri, 08 May 2009 00:46:08 +0000

Revision: 1298
          http://svn.sv.gnu.org/viewvc/?view=rev&root=librefm&revision=1298
Author:   clint
Date:     2009-05-08 00:46:07 +0000 (Fri, 08 May 2009)
Log Message:
-----------
rename id to gid since $id is apparently being used for something else, and 
reenable group mods until usernames can be converted to uniqueid joins

Modified Paths:
--------------
    trunk/nixtape/data/Group.php
    trunk/nixtape/data/User.php
    trunk/nixtape/edit_group.php

Modified: trunk/nixtape/data/Group.php
===================================================================
--- trunk/nixtape/data/Group.php        2009-05-08 00:42:37 UTC (rev 1297)
+++ trunk/nixtape/data/Group.php        2009-05-08 00:46:07 UTC (rev 1298)
@@ -34,7 +34,7 @@
  */
 class Group {
 
-       public $id, $name, $owner, $fullname, $bio, $homepage, $count, 
$grouptype, $avatar_uri, $users;
+       public $id, $gid $name, $owner, $fullname, $bio, $homepage, $count, 
$grouptype, $id, $avatar_uri, $users;
 
        /**
         * User constructor
@@ -65,7 +65,7 @@
                }
                        
                if (is_array($row)) {
-                       $this->id         = $row['id'];
+                       $this->gid          = $row['id'];
                        $this->name         = $row['groupname'];
                        $this->fullname     = $row['fullname'];
                        $this->homepage     = $row['homepage'];
@@ -329,7 +329,7 @@
                
                global $mdb2;
                $res = $mdb2->query(sprintf("INSERT INTO Group_Members (grp, 
member, joined) VALUES (%s, %s, %d)",
-                       $mdb2->quote($this->id, 'integer'),
+                       $mdb2->quote($this->gid, 'integer'),
                        $mdb2->quote($user->name, 'text'),
                        time()));
                
@@ -352,7 +352,7 @@
                
                global $mdb2;
                $res = $mdb2->query(sprintf("DELETE FROM Group_Members WHERE 
grp=%s AND member=%s",
-                       $mdb2->quote($this->id, 'integer'),
+                       $mdb2->quote($this->gid, 'integer'),
                        $mdb2->quote($user->name, 'text')));
                
                if(PEAR::isError($res))

Modified: trunk/nixtape/data/User.php
===================================================================
--- trunk/nixtape/data/User.php 2009-05-08 00:42:37 UTC (rev 1297)
+++ trunk/nixtape/data/User.php 2009-05-08 00:46:07 UTC (rev 1298)
@@ -75,6 +75,7 @@
                        $this->acctid       = $this->getURL() . '#acct';
                        $this->created      = $row["created"];
                        $this->modified     = $row["modified"];
+                       $this->uniqueid     = $row["uniqueid"];
                        
                        $this->has_identica = 
preg_match('#^http://identi\.ca/#i', $this->laconica_profile);
                        

Modified: trunk/nixtape/edit_group.php
===================================================================
--- trunk/nixtape/edit_group.php        2009-05-08 00:42:37 UTC (rev 1297)
+++ trunk/nixtape/edit_group.php        2009-05-08 00:46:07 UTC (rev 1298)
@@ -31,11 +31,6 @@
        $smarty->assign('details', 'Not logged in! You shouldn\'t be here!');
        $smarty->display('error.tpl');
        die();
-} else {
-       $smarty->assign('error', 'Error!');
-       $smarty->assign('details', 'Group modifications are disabled 
temporarily.');
-       $smarty->display('error.tpl');
-       die();
 }
 
 if ($_REQUEST['group']=='new')





reply via email to

[Prev in Thread] Current Thread [Next in Thread]