mango r156 - in trunk: . docs/sql lib www

[ovitters svn gnome org]

Author: ovitters
Date: Fri May 23 12:35:23 2008
New Revision: 156
URL: http://svn.gnome.org/viewvc/mango?rev=156&view=rev

Log:
	Allow membership committee to specify the GNOME userid for each
	foundation member.
	* docs/sql/foundationmembers.sql:
	* lib/foundationmember.php:
	* www/new_foundationmember.php:
	* www/new_foundationmember.xsl:
	* www/update_foundationmember.php:
	* www/update_foundationmember.xsl:



Modified:
   trunk/ChangeLog
   trunk/docs/sql/foundationmembers.sql
   trunk/lib/foundationmember.php
   trunk/www/new_foundationmember.php
   trunk/www/new_foundationmember.xsl
   trunk/www/update_foundationmember.php
   trunk/www/update_foundationmember.xsl

Modified: trunk/docs/sql/foundationmembers.sql
==============================================================================
--- trunk/docs/sql/foundationmembers.sql	(original)
+++ trunk/docs/sql/foundationmembers.sql	Fri May 23 12:35:23 2008
@@ -17,6 +17,7 @@
   `firstname` varchar(50) default NULL,
   `lastname` varchar(50) default NULL,
   `email` varchar(50) default NULL,
+  `userid` varchar(15) default NULL,
   `comments` text,
   `first_added` date NOT NULL,
   `last_renewed_on` timestamp NOT NULL,

Modified: trunk/lib/foundationmember.php
==============================================================================
--- trunk/lib/foundationmember.php	(original)
+++ trunk/lib/foundationmember.php	Fri May 23 12:35:23 2008
@@ -11,12 +11,13 @@
     var $firstname;
     var $lastname;
     var $email;
+    var $userid;            // GNOME userid
     var $comments;
     var $renew;             // denotes that member's membership is renewed.
     var $first_added;
     var $need_to_renew;
     var $last_renewed_on;
-    var $last_update;   
+    var $last_update;
     var $resigned_on;   // denotes time when a member retired
         
     function absorb($record) {
@@ -26,6 +27,7 @@
         $member->lastname = $record->lastname;
         $member->email = $record->email;
         $member->comments = $record->comments;
+        $member->userid = $record->userid;
         $member->renew = false;
         $member->first_added = DateField::from_sql($record->first_added);
         $member->last_renewed_on = DateField::from_sql($record->last_renewed_on);
@@ -91,12 +93,13 @@
         
         // Prepare query
         $query = "INSERT INTO foundationmembers (";
-        $query .= "firstname, lastname, email, comments, first_added, last_renewed_on, last_update";
+        $query .= "firstname, lastname, email, comments, userid, first_added, last_renewed_on, last_update";
         $query .= ") VALUES (";
         $query .= MySQLUtil::escape_string($this->firstname).", ";
         $query .= MySQLUtil::escape_string($this->lastname).", ";
         $query .= MySQLUtil::escape_string($this->email).", ";
         $query .= MySQLUtil::escape_string($this->comments).", ";
+        $query .= MySQLUtil::escape_string($this->userid).", ";
         $query .= MySQLUtil::escape_date($aboutnow).", ";
         $query .= MySQLUtil::escape_date($this->last_renewed_on).", ";
         $query .= MySQLUtil::escape_date($aboutnow);
@@ -169,6 +172,10 @@
             $sql .= ", comments = ".MySQLUtil::escape_string($this->comments);
             $changes[] = "comments";
         }
+        if($oldrec->userid != $this->userid) {
+            $sql .= ", userid = ".MySQLUtil::escape_string($this->userid);
+            $changes[] = "userid";
+        }
         if($oldrec->last_renewed_on != $this->last_renewed_on) {
             $sql .= ", last_renewed_on = ".MySQLUtil::escape_date($this->last_renewed_on);
             $changes[] = "last_renewed_on";
@@ -214,6 +221,8 @@
         $node->appendChild($dom->createTextNode($this->email));
         $node = $formnode->appendChild($dom->createElement("comments"));
         $node->appendChild($dom->createTextNode($this->comments));
+        $node = $formnode->appendChild($dom->createElement("userid"));
+        $node->appendChild($dom->createTextNode($this->userid));
         DateField::add_to($dom, $formnode, "first_added", $this->first_added);
         DateField::add_to($dom, $formnode, "last_renewed_on", $this->last_renewed_on);
         if ($this->resigned_on == null) {

Modified: trunk/www/new_foundationmember.php
==============================================================================
--- trunk/www/new_foundationmember.php	(original)
+++ trunk/www/new_foundationmember.php	Fri May 23 12:35:23 2008
@@ -123,6 +123,7 @@
         $this->foundationmember->firstname = $_POST['firstname'];
         $this->foundationmember->lastname = $_POST['lastname'];
         $this->foundationmember->email = $_POST['email'];
+        $this->foundationmember->userid = $_POST['userid'];
         $this->foundationmember->comments = $_POST['comments'];
         $this->foundationmember->last_renewed_on = time();
         $this->foundationmember->need_to_renew = false;

Modified: trunk/www/new_foundationmember.xsl
==============================================================================
--- trunk/www/new_foundationmember.xsl	(original)
+++ trunk/www/new_foundationmember.xsl	Fri May 23 12:35:23 2008
@@ -45,6 +45,17 @@
      </tr>
      <tr>
       <th>
+       <xsl:if test="boolean(formerror[ type='userid'])">
+        <xsl:attribute name="class">formerror</xsl:attribute>
+       </xsl:if>
+       GNOME userid
+      </th>
+      <td>
+       <input type="text" name="userid" value="{userid}" size="15"/>
+      </td>
+     </tr>
+     <tr>
+      <th>
        <xsl:if test="boolean(formerror[ type='email'])">
         <xsl:attribute name="class">formerror</xsl:attribute>
        </xsl:if>

Modified: trunk/www/update_foundationmember.php
==============================================================================
--- trunk/www/update_foundationmember.php	(original)
+++ trunk/www/update_foundationmember.php	Fri May 23 12:35:23 2008
@@ -157,6 +157,7 @@
         $this->foundationmember->lastname = $_POST['lastname'];
         $this->foundationmember->email = $_POST['email'];
         $this->foundationmember->comments = $_POST['comments'];
+        $this->foundationmember->userid = $_POST['userid'];
         if (isset($_POST['renew']) && $_POST['renew'] == "on") {
             $this->foundationmember->renew = true;
             $this->foundationmember->last_renewed_on = time();

Modified: trunk/www/update_foundationmember.xsl
==============================================================================
--- trunk/www/update_foundationmember.xsl	(original)
+++ trunk/www/update_foundationmember.xsl	Fri May 23 12:35:23 2008
@@ -47,6 +47,17 @@
      </tr>
      <tr>
       <th>
+       <xsl:if test="boolean(formerror[ type='userid'])">
+        <xsl:attribute name="class">formerror</xsl:attribute>
+       </xsl:if>
+       GNOME userid
+      </th>
+      <td>
+       <input type="text" name="userid" value="{userid}" size="15"/>
+      </td>
+     </tr>
+     <tr>
+      <th>
        <xsl:if test="boolean(formerror[ type='email'])">
         <xsl:attribute name="class">formerror</xsl:attribute>
        </xsl:if>
@@ -93,6 +104,9 @@
     <xsl:when test="@id='email'">
      <p>E-mail address updated</p>
     </xsl:when>
+    <xsl:when test="@id='userid'">
+     <p></p>GNOME userid updated</p>
+    </xsl:when>
     <xsl:when test="@id='last_renewed_on'">
      <p>Last Renewal updated</p>
     </xsl:when>