ZP-1284 Change tabs to spaces. Released under the Affero GNU General Public...

ZP-1284 Change tabs to spaces. Released under the Affero GNU General Public License (AGPL) version 3.

src/backend/stickynote/create-sticky-tables.sql

 create table note
-	(ordinal int primary key, login text, domain text, 
-	inserted timestamp with time zone default now(), 
-	modified timestamp with time zone default now(),
-	deleted boolean default false, subject text, content text, 
-	categories text);
+    (ordinal int primary key, login text, domain text, 
+    inserted timestamp with time zone default now(), 
+    modified timestamp with time zone default now(),
+    deleted boolean default false, subject text, content text);
 
 create table categories
-	(ordinal int references note(ordinal) on update cascade 
-	on delete cascade, tag text);
+    (ordinal int references note(ordinal) on update cascade 
+    on delete cascade, tag text);
 
 create index note_login on note using btree(login, domain);
 create index tag_ordinal on categories using btree(ordinal);

src/backend/stickynote/stickynote.php

@@ -51,8 +51,8 @@ class BackendStickyNote extends BackendDiff {
             throw new FatalException("BackendStickyNote(): Postgres extension php-pgsql not found", 0, null, LOGLEVEL_FATAL);
         }
 
-	$this->_changessinkinit = false;
-	$this->_sinkdata = 0;
+    $this->_changessinkinit = false;
+    $this->_sinkdata = 0;
     }
 
     /**
@@ -64,22 +64,22 @@ class BackendStickyNote extends BackendDiff {
      * @see IBackend::Logon()
      */
     public function Logon($username, $domain, $password) {
-	if (defined('STICKYNOTE_MUSTNOTBESET'))
-	    throw new FatalException("BackendStickyNote(): Configuration file has not been set up; review REQUIREMENTS and edit config.php.", 0, NULL, LOGLEVEL_FATAL);
+        if (defined('STICKYNOTE_MUSTNOTBESET'))
+            throw new FatalException("BackendStickyNote(): Configuration file has not been set up; review REQUIREMENTS and edit config.php.", 0, NULL, LOGLEVEL_FATAL);
 
         $this->_user = $username;
-	$this->_domain = $domain;
+        $this->_domain = $domain;
 
-	$_connstring = sprintf("host='%s' port='%s' dbname='%s' user='%s' password='%s'", STICKYNOTE_SERVER, STICKYNOTE_PORT, STICKYNOTE_DATABASE, STICKYNOTE_USER, STICKYNOTE_PASSWORD);
+        $_connstring = sprintf("host='%s' port='%s' dbname='%s' user='%s' password='%s'", STICKYNOTE_SERVER, STICKYNOTE_PORT, STICKYNOTE_DATABASE, STICKYNOTE_USER, STICKYNOTE_PASSWORD);
 
         ZLog::Write(LOGLEVEL_DEBUG, sprintf("BackendStickyNote->pg_conn(): '%s'", $_connstring));
 
-	$this->_dbconn = pg_connect($_connstring);
-	if ($this->_dbconn == false)
-	    throw new FatalException("BackendStickyNote(): Connection to Postgres backend failed", 0, NULL, LOGLEVEL_FATAL);
+        $this->_dbconn = pg_connect($_connstring);
+        if ($this->_dbconn == false)
+            throw new FatalException("BackendStickyNote(): Connection to Postgres backend failed", 0, NULL, LOGLEVEL_FATAL);
 
         ZLog::Write(LOGLEVEL_DEBUG, sprintf("BackendStickyNote->Logon(): User '%s' Domain '%s'  accepted on StickyNote", $username, $domain));
-	return true;
+        return true;
     }
 
     /**
@@ -88,15 +88,15 @@ class BackendStickyNote extends BackendDiff {
      * @see IBackend::Logoff()
      */
     public function Logoff() {
-	if ($this->_dbconn != null) {
-		pg_close($this->_dbconn);
-		$this->_dbconn = false;
-	}
+        if ($this->_dbconn != null) {
+            pg_close($this->_dbconn);
+            $this->_dbconn = false;
+        }
         $this->SaveStorages();
 
         ZLog::Write(LOGLEVEL_DEBUG, "BackendStickyNote->Logoff(): disconnected from Postgres server");
 
-	unset($this->_sinkdata);
+        unset($this->_sinkdata);
 
         return true;
     }
@@ -132,8 +132,8 @@ class BackendStickyNote extends BackendDiff {
      */
     public function GetFolderList() {
         $folders = array();
-	$folder = $this->StatFolder("N");
-	$folders[] = $folder;
+        $folder = $this->StatFolder("N");
+        $folders[] = $folder;
         return $folders;
     }
 
@@ -161,7 +161,7 @@ class BackendStickyNote extends BackendDiff {
 // Return the Display Name of the folder.  No parent, as there's only one.
 
         $folder = array();
-	$folder["mod"] = "Notes";
+        $folder["mod"] = "Notes";
         $folder["id"] = $id;
         $folder["parent"] = "0";
         return $folder;
@@ -193,27 +193,27 @@ class BackendStickyNote extends BackendDiff {
         ZLog::Write(LOGLEVEL_DEBUG, sprintf("BackendStickyNote->GetMessageList('%s','%s')", $folderid, $cutoffdate));
         $messages = array();
 
-	$_param = array();
-	if ($cutoffdate) {
-	    array_push($_param, $this->_user, $this->_domain, $cutoffdate);
-	    $this->_result = pg_query_params($this->_dbconn, "select ordinal, extract(epoch from modified)::integer from note where modified <= timestamptz 'epoch' + $3 * interval '1 second' and login=$1 and domain=$2 and deleted is false", $_param);
-	} else {
-	    array_push($_param, $this->_user, $this->_domain);
-	    $this->_result = pg_query_params($this->_dbconn, "select ordinal, extract(epoch from modified)::integer from note where login=$1 and domain=$2 and deleted is false", $_param);
-	}
-	if (pg_result_status($this->_result) != PGSQL_TUPLES_OK) {
+        $_param = array();
+        if ($cutoffdate) {
+            array_push($_param, $this->_user, $this->_domain, $cutoffdate);
+            $this->_result = pg_query_params($this->_dbconn, "select ordinal, extract(epoch from modified)::integer from note where modified <= timestamptz 'epoch' + $3 * interval '1 second' and login=$1 and domain=$2 and deleted is false", $_param);
+        } else {
+            array_push($_param, $this->_user, $this->_domain);
+            $this->_result = pg_query_params($this->_dbconn, "select ordinal, extract(epoch from modified)::integer from note where login=$1 and domain=$2 and deleted is false", $_param);
+        }
+        if (pg_result_status($this->_result) != PGSQL_TUPLES_OK) {
             ZLog::Write(LOGLEVEL_WARN, sprintf("BackendStickyNote->GetMessageList(Failed to return a valid message list from database)"));
-	} else {	
-	    for ($_count = 0; $_count < pg_affected_rows($this->_result); $_count++) {
-	        $message = array();
-	        $message["id"] = pg_fetch_result($this->_result, $_count, 0);
-	        $message["mod"] = pg_fetch_result($this->_result, $_count, 1);
-	        $message["flags"] = 1;	// Always mark as 'seen'
-
-		$messages[] = $message;
-	    }
-	}
-	pg_free_result($this->_result);
+        } else {    
+            for ($_count = 0; $_count < pg_affected_rows($this->_result); $_count++) {
+                $message = array();
+                $message["id"] = pg_fetch_result($this->_result, $_count, 0);
+                $message["mod"] = pg_fetch_result($this->_result, $_count, 1);
+                $message["flags"] = 1;    // Always mark as 'seen'
+
+                $messages[] = $message;
+            }
+        }
+        pg_free_result($this->_result);
         return $messages;
     }
 
@@ -226,49 +226,49 @@ class BackendStickyNote extends BackendDiff {
 
 // Look up the message in the database
 
-	$_params = array();
-	array_push($_params, $id, $this->_user, $this->_domain);
+        $_params = array();
+        array_push($_params, $id, $this->_user, $this->_domain);
 
-	$this->_result = pg_query_params($this->_dbconn, "select *, extract(epoch from modified)::integer as changed from note where ordinal = $1 and login = $2 and domain = $3 and deleted is false", $_params);
-	if (pg_result_status($this->_result) != PGSQL_TUPLES_OK) {
+        $this->_result = pg_query_params($this->_dbconn, "select *, extract(epoch from modified)::integer as changed from note where ordinal = $1 and login = $2 and domain = $3 and deleted is false", $_params);
+        if (pg_result_status($this->_result) != PGSQL_TUPLES_OK) {
             ZLog::Write(LOGLEVEL_ERROR, sprintf("BackendStickyNote->GetMessage(FAILED query for '%s','%s')", $folderid,  $id));
-	    return false;
-	}
-	if (pg_affected_rows($this->_result) != 1) {
+            return false;
+        }
+        if (pg_affected_rows($this->_result) != 1) {
             ZLog::Write(LOGLEVEL_ERROR, sprintf("BackendStickyNote->GetMessage(FAILED lookup for '%s','%s')", $folderid,  $id));
-	    return false;
-	}
+            return false;
+        }
 
 // Build the packet for a StickyNote
 
-	$_content = pg_fetch_result($this->_result, 0, "content");
+        $_content = pg_fetch_result($this->_result, 0, "content");
 
-	$message = new SyncNote();
-	$message->asbody = new SyncBaseBody();
+        $message = new SyncNote();
+        $message->asbody = new SyncBaseBody();
 
-	$message->asbody->type = 2;
-	$message->asbody->estimatedDataSize = strlen($_content);
-	$message->asbody->data = StringStreamWrapper::Open($_content);
-	unset($_content);
-	$message->subject = pg_fetch_result($this->_result, 0, "subject");
-	$message->lastmodified = pg_fetch_result($this->_result, 0, "changed");
-	$message->type = 'IPW.StickyNote';
-	pg_free_result($this->_result);
-	unset($_params);
+        $message->asbody->type = 2;
+        $message->asbody->estimatedDataSize = strlen($_content);
+        $message->asbody->data = StringStreamWrapper::Open($_content);
+        unset($_content);
+        $message->subject = pg_fetch_result($this->_result, 0, "subject");
+        $message->lastmodified = pg_fetch_result($this->_result, 0, "changed");
+        $message->type = 'IPW.StickyNote';
+        pg_free_result($this->_result);
+        unset($_params);
 
 // Get categories, if any, for this note and add them to the SyncObject
 
-	$_params = array();
-	array_push($_params, $id);
-	$this->_result = pg_query_params($this->_dbconn, "select tag from categories where ordinal=$1", $_params);
-	if (pg_affected_rows($this->_result) > 0) {
+        $_params = array();
+        array_push($_params, $id);
+        $this->_result = pg_query_params($this->_dbconn, "select tag from categories where ordinal=$1", $_params);
+        if (pg_affected_rows($this->_result) > 0) {
             $_categories = array();
-	    for ($_count = 0; $_count < pg_affected_rows($this->_result); $_count++) {
-		$_categories[] = pg_fetch_result($this->_result, $_count, 0);
-	    }
-	    $message->categories = $_categories;
-	}
-	pg_free_result($this->_result);
+            for ($_count = 0; $_count < pg_affected_rows($this->_result); $_count++) {
+                $_categories[] = pg_fetch_result($this->_result, $_count, 0);
+            }
+            $message->categories = $_categories;
+        }
+        pg_free_result($this->_result);
 
         return $message;
     }
@@ -281,19 +281,19 @@ class BackendStickyNote extends BackendDiff {
         ZLog::Write(LOGLEVEL_DEBUG, sprintf("BackendStickyNote->StatMessage('%s','%s')", $folderid,  $id));
        
         $message = array();
-	$_params = array();
-	array_push($_params, $id, $this->_user, $this->_domain);
-	$this->_result = pg_query_params($this->_dbconn, "select extract(epoch from modified)::integer from note where ordinal=$1 and login=$2 and domain=$3 and deleted is false", $_params);
-	if (pg_result_status($this->_result) != PGSQL_TUPLES_OK) {
+        $_params = array();
+        array_push($_params, $id, $this->_user, $this->_domain);
+        $this->_result = pg_query_params($this->_dbconn, "select extract(epoch from modified)::integer from note where ordinal=$1 and login=$2 and domain=$3 and deleted is false", $_params);
+        if (pg_result_status($this->_result) != PGSQL_TUPLES_OK) {
             ZLog::Write(LOGLEVEL_ERROR, sprintf("BackendStickyNote->StatMessage(Stat call failed for '%s')", $id));
-	    return $message;
-	} 
-	if (!pg_num_rows($this->_result)) {
+            return $message;
+        } 
+        if (!pg_num_rows($this->_result)) {
             ZLog::Write(LOGLEVEL_DEBUG, sprintf("BackendStickyNote->StatMessage(Stat for empty note '%s')", $id));
-	    return $message;
-	} 
-	$message['mod'] = pg_fetch_result($this->_result, 0, 0);
-	pg_free_result($this->_result);
+            return $message;
+        } 
+        $message['mod'] = pg_fetch_result($this->_result, 0, 0);
+        pg_free_result($this->_result);
         $message['id'] = $id;
         $message['flags'] = "1";
         return $message;
@@ -311,110 +311,110 @@ class BackendStickyNote extends BackendDiff {
 // Then insert into the database and return the stat pointer for it.
 // If we get an ID then it's an update; perform it and return stat pointer.
 // 
-	$_contents = stream_get_contents($message->asbody->data, 1024000);
-	if (!$id) {
-	    $this->_result = pg_query($this->_dbconn, "select nextval('ordinal')");
-	    if (pg_result_status($this->_result) != PGSQL_TUPLES_OK) {
+        $_contents = stream_get_contents($message->asbody->data, 1024000);
+        if (!$id) {
+            $this->_result = pg_query($this->_dbconn, "select nextval('ordinal')");
+            if (pg_result_status($this->_result) != PGSQL_TUPLES_OK) {
                 ZLog::Write(LOGLEVEL_ERROR, sprintf("BackendStickyNote->ChangeMessage('Cannot get new sequence number for item')"));
-	        return false;
-	    } 
-	    $id = pg_fetch_result($this->_result, 0, 0);
-	    pg_free_result($this->_result);
+                return false;
+            } 
+            $id = pg_fetch_result($this->_result, 0, 0);
+            pg_free_result($this->_result);
 
-	    $this->_result = pg_query($this->_dbconn, "Begin");
-	    if (pg_result_status($this->_result) != PGSQL_COMMAND_OK) {
+            $this->_result = pg_query($this->_dbconn, "Begin");
+            if (pg_result_status($this->_result) != PGSQL_COMMAND_OK) {
                 ZLog::Write(LOGLEVEL_ERROR, sprintf("BackendStickyNote->ChangeMessage('Transaction start failure!')"));
-		pg_free_result($this->_result);
-		return false;
-	    }
-	    pg_free_result($this->_result);
+                pg_free_result($this->_result);
+                return false;
+            }
+            pg_free_result($this->_result);
 
             $_params = array();
-	    array_push($_params, $id, $message->subject, $_contents, $this->_user, $this->_domain);
-	    $this->_result = pg_query_params($this->_dbconn, "insert into note (ordinal, subject, content, login, domain) values ($1, $2, $3, $4, $5)", $_params);
-	    if (pg_result_status($this->_result) != PGSQL_COMMAND_OK) {
+            array_push($_params, $id, $message->subject, $_contents, $this->_user, $this->_domain);
+            $this->_result = pg_query_params($this->_dbconn, "insert into note (ordinal, subject, content, login, domain) values ($1, $2, $3, $4, $5)", $_params);
+            if (pg_result_status($this->_result) != PGSQL_COMMAND_OK) {
                 ZLog::Write(LOGLEVEL_ERROR, sprintf("BackendStickyNote->ChangeMessage('Cannot insert new item; fail!')"));
-		pg_free_result($this->_result);
-	        $this->_result = pg_query($this->_dbconn, "Rollback");
-		pg_free_result($this->_result);
-		return false;
-	    }
-	    if (pg_affected_rows($this->_result) == 1) {
+                pg_free_result($this->_result);
+                $this->_result = pg_query($this->_dbconn, "Rollback");
+                pg_free_result($this->_result);
+                return false;
+            }
+            if (pg_affected_rows($this->_result) == 1) {
                 ZLog::Write(LOGLEVEL_DEBUG, sprintf("BackendStickyNote->ChangeMessage('Insert of item %s (subj '%s') succeded')", $id, $message->subject));
-	    } else {
+            } else {
                 ZLog::Write(LOGLEVEL_ERROR, sprintf("BackendStickyNote->ChangeMessage('Insert of item %s (subj '%s') failed')", $id, $message->subject));
-		pg_free_result($this->_result);
-	        $this->_result = pg_query($this->_dbconn, "Rollback");
-		pg_free_result($this->_result);
-		return false;
-	    }
-	    unset ($_params);
-	    pg_free_result($this->_result);
-	    if ($message->categories) {
-		foreach ($message->categories as $_category) {
-	            $_params = array();
-		    array_push($_params, $id, $_category);
-		    $this->_result = pg_query_params($this->_dbconn, "insert into categories (ordinal, tag) values ($1, $2)", $_params);
-		    if (pg_result_status($this->_result) != PGSQL_COMMAND_OK) {
-                	ZLog::Write(LOGLEVEL_ERROR, sprintf("BackendStickyNote->ChangeMessage('Cannot insert category for item; fail!')"));
-			pg_free_result($this->_result);
-	                $this->_result = pg_query($this->_dbconn, "Rollback");
-		        pg_free_result($this->_result);
-			return(false);
-		    }
-		    pg_free_result($this->_result);
-	        }
-		unset ($_category);
-	    }
-	} else {
-	    $_params = array();
-	    array_push($_params, $message->subject, $_contents, $id, $this->_user, $this->_domain);
-	    $this->_result = pg_query_params($this->_dbconn, "update note set subject=$1, content=$2, modified=now() where ordinal=$3 and login=$4 and domain=$5", $_params);
-	    if (pg_result_status($this->_result) != PGSQL_COMMAND_OK) {
+                pg_free_result($this->_result);
+                $this->_result = pg_query($this->_dbconn, "Rollback");
+                pg_free_result($this->_result);
+                return false;
+            }
+            unset ($_params);
+            pg_free_result($this->_result);
+            if ($message->categories) {
+                foreach ($message->categories as $_category) {
+                    $_params = array();
+                    array_push($_params, $id, $_category);
+                    $this->_result = pg_query_params($this->_dbconn, "insert into categories (ordinal, tag) values ($1, $2)", $_params);
+                    if (pg_result_status($this->_result) != PGSQL_COMMAND_OK) {
+                        ZLog::Write(LOGLEVEL_ERROR, sprintf("BackendStickyNote->ChangeMessage('Cannot insert category for item; fail!')"));
+                        pg_free_result($this->_result);
+                        $this->_result = pg_query($this->_dbconn, "Rollback");
+                        pg_free_result($this->_result);
+                        return(false);
+                    }
+                    pg_free_result($this->_result);
+                }
+                unset ($_category);
+            }
+        } else {
+            $_params = array();
+            array_push($_params, $message->subject, $_contents, $id, $this->_user, $this->_domain);
+            $this->_result = pg_query_params($this->_dbconn, "update note set subject=$1, content=$2, modified=now() where ordinal=$3 and login=$4 and domain=$5", $_params);
+            if (pg_result_status($this->_result) != PGSQL_COMMAND_OK) {
                 ZLog::Write(LOGLEVEL_ERROR, sprintf("BackendStickyNote->ChangeMessage('Update of item %s failed!')", $id));
-	    }
-	    if (pg_affected_rows($this->_result) == 1) {
+            }
+            if (pg_affected_rows($this->_result) == 1) {
                 ZLog::Write(LOGLEVEL_DEBUG, sprintf("BackendStickyNote->ChangeMessage('Update of item %s (subj '%s') succeded')", $id, $message->subject));
-	    } else {
+            } else {
                 ZLog::Write(LOGLEVEL_ERROR, sprintf("BackendStickyNote->ChangeMessage('Update of item %s (subj '%s') failed (credential mismatch)')", $id, $message->subject));
-	    }
-	    pg_free_result($this->_result);
-	    unset ($_params);
-	    if ($message->categories) {
-	        $_params = array();
-		array_push($_params, $id);
-		$this->_result = pg_query_params($this->_dbconn, "delete from categories where ordinal=$1", $_params);
-		if (pg_result_status($this->_result) != PGSQL_COMMAND_OK) {
+            }
+            pg_free_result($this->_result);
+            unset ($_params);
+            if ($message->categories) {
+                $_params = array();
+                array_push($_params, $id);
+                $this->_result = pg_query_params($this->_dbconn, "delete from categories where ordinal=$1", $_params);
+                if (pg_result_status($this->_result) != PGSQL_COMMAND_OK) {
                     ZLog::Write(LOGLEVEL_ERROR, sprintf("BackendStickyNote->ChangeMessage('Cannot clear category for item; fail!')"));
-		    pg_free_result($this->_result);
-	            $this->_result = pg_query($this->_dbconn, "Rollback");
-		    pg_free_result($this->_result);
-		    return(false);
-		}
-		unset ($_params);
-		foreach ($message->categories as $_category) {
-	            $_params = array();
-		    array_push($_params, $id, $_category);
-		    $this->_result = pg_query_params($this->_dbconn, "insert into categories (ordinal, tag) values ($1, $2)", $_params);
-		    if (pg_result_status($this->_result) != PGSQL_COMMAND_OK) {
-                	ZLog::Write(LOGLEVEL_ERROR, sprintf("BackendStickyNote->ChangeMessage('Cannot insert category for item; fail!')"));
-			pg_free_result($this->_result);
-	                $this->_result = pg_query($this->_dbconn, "Rollback");
-		        pg_free_result($this->_result);
-			return(false);
-		    }
-		    pg_free_result($this->_result);
-	        }
-		unset ($_category);
-	    }
-	} 
-	$this->_result = pg_query($this->_dbconn, "COMMIT");
-	if (pg_result_status($this->_result) != PGSQL_COMMAND_OK) {
+                    pg_free_result($this->_result);
+                    $this->_result = pg_query($this->_dbconn, "Rollback");
+                    pg_free_result($this->_result);
+                    return(false);
+                }
+                unset ($_params);
+                foreach ($message->categories as $_category) {
+                    $_params = array();
+                    array_push($_params, $id, $_category);
+                    $this->_result = pg_query_params($this->_dbconn, "insert into categories (ordinal, tag) values ($1, $2)", $_params);
+                    if (pg_result_status($this->_result) != PGSQL_COMMAND_OK) {
+                        ZLog::Write(LOGLEVEL_ERROR, sprintf("BackendStickyNote->ChangeMessage('Cannot insert category for item; fail!')"));
+                        pg_free_result($this->_result);
+                        $this->_result = pg_query($this->_dbconn, "Rollback");
+                        pg_free_result($this->_result);
+                        return(false);
+                    }
+                    pg_free_result($this->_result);
+                }
+            unset ($_category);
+            }
+        } 
+        $this->_result = pg_query($this->_dbconn, "COMMIT");
+        if (pg_result_status($this->_result) != PGSQL_COMMAND_OK) {
             ZLog::Write(LOGLEVEL_ERROR, sprintf("BackendStickyNote->ChangeMessage('Transaction commit FAIL!')"));
-	    pg_free_result($this->_result);
-	    return false;
-	}
-	pg_free_result($this->_result);
+            pg_free_result($this->_result);
+            return false;
+        }
+        pg_free_result($this->_result);
         return $this->StatMessage($folderid, $id);
     }
 
@@ -432,29 +432,29 @@ class BackendStickyNote extends BackendDiff {
      */
     public function DeleteMessage($folderid, $id, $contentParameters) {
         ZLog::Write(LOGLEVEL_DEBUG, sprintf("BackendStickyNote->DeleteMessage('%s','%s')", $folderid,  $id));
-	$_params = array();
-	array_push($_params, $id, $this->_user, $this->_domain);
-	if (defined('STICKYNOTE_REALLYDELETE')) {
+        $_params = array();
+        array_push($_params, $id, $this->_user, $this->_domain);
+        if (defined('STICKYNOTE_REALLYDELETE')) {
 //
 // Relation (foreign key) constraint deletes category entries when
 // the parent is removed.
 //
-	    $this->_result = pg_query_params($this->_dbconn, "delete from note where ordinal=$1 and login=$2 and domain=$3");
-	    if (pg_affected_rows($this->_result) != 1) {
+            $this->_result = pg_query_params($this->_dbconn, "delete from note where ordinal=$1 and login=$2 and domain=$3");
+            if (pg_affected_rows($this->_result) != 1) {
                 ZLog::Write(LOGLEVEL_DEBUG, sprintf("BackendStickyNote->DeleteMessage('%s','%s' failed)", $folderid,  $id));
-	        pg_free_result($this->_result);
-	        return false;
-	    }
-	} else {
-	    $this->_result = pg_query_params($this->_dbconn, "update note set deleted = true where ordinal=$1 and login=$2 and domain=$3", $_params);
-	    if (pg_affected_rows($this->_result) != 1) {
+                pg_free_result($this->_result);
+                return false;
+            }
+        } else {
+            $this->_result = pg_query_params($this->_dbconn, "update note set deleted = true where ordinal=$1 and login=$2 and domain=$3", $_params);
+            if (pg_affected_rows($this->_result) != 1) {
                 ZLog::Write(LOGLEVEL_DEBUG, sprintf("BackendStickyNote->DeleteMessage('%s','%s' failed)", $folderid,  $id));
-	        pg_free_result($this->_result);
-	        return false;
-	    }
-	}
-	pg_free_result($this->_result);
-	return true;
+                pg_free_result($this->_result);
+                return false;
+            }
+        }
+        pg_free_result($this->_result);
+        return true;
     }
 
     /**
@@ -480,15 +480,15 @@ class BackendStickyNote extends BackendDiff {
     /*
      * Initialize the sink for a folder (there's only one)
      *
-     * @param string	$folderid
+     * @param string    $folderid
      *
      * @access public
-     * return boolean	Always true since there's only one folder
+     * return boolean    Always true since there's only one folder
      */
     public function ChangesSinkInitialize($folderid) {
         ZLog::Write(LOGLEVEL_DEBUG, sprintf("BackendStickyNote->ChangesSinkInitialize(): folderid '%s'", $folderid));
         $this->_changessinkinit = true;
-	return $this->_changessinkinit;
+        return $this->_changessinkinit;
     }
 
     /*
@@ -496,43 +496,43 @@ class BackendStickyNote extends BackendDiff {
      * If there's nothing to return in changes, wait 30 seconds. Otherwise
      * send back the FolderId -- there's only one.
      *
-     * @param int	$timeout	How long to block if specified
+     * @param int    $timeout    How long to block if specified
      *
      * @access public
      * @return array
      */
     public function ChangesSink($timeout = 30) {
-	$_notifications = array();
+        $_notifications = array();
 
-        // Apparently this can get called before we've initialized, which in
-	// our case wouldn't matter, but for consistency return nothing if
-	// that happens - or if it gets called before the database is connected.
+    // Apparently this can get called before we've initialized, which in
+    // our case wouldn't matter, but for consistency return nothing if
+    // that happens - or if it gets called before the database is connected.
         if ((!$this->_changessinkinit) || ($this->_dbconn == false)) {
             ZLog::Write(LOGLEVEL_DEBUG, sprintf("BackendStickyNote->ChangesSink - Not initialized ChangesSink, sleep and exit"));
             sleep($timeout);
             return $_notifications;
         }
-	$_param = array();
-	array_push($_param, $this->_user, $this->_domain);
-	$this->_result = pg_query_params($this->_dbconn, "select extract(epoch from modified)::integer from note where login=$1 and domain=$2 and deleted is false order by modified desc limit 1", $_param);
-	if (pg_result_status($this->_result) != PGSQL_TUPLES_OK) {
+        $_param = array();
+        array_push($_param, $this->_user, $this->_domain);
+        $this->_result = pg_query_params($this->_dbconn, "select extract(epoch from modified)::integer from note where login=$1 and domain=$2 and deleted is false order by modified desc limit 1", $_param);
+        if (pg_result_status($this->_result) != PGSQL_TUPLES_OK) {
             ZLog::Write(LOGLEVEL_WARN, sprintf("BackendStickyNote->ChangesSink(Failed to return a valid change list)"));
-	} else {	
-	    if (pg_affected_rows($this->_result) == 1) {
+        } else {    
+            if (pg_affected_rows($this->_result) == 1) {
                 ZLog::Write(LOGLEVEL_DEBUG, sprintf("BackendStickyNote->ChangesSink(There are valid notes stored)"));
-		$_lastchange = pg_fetch_result($this->_result, 0, 0);
-		if ($_lastchange != $this->_sinkdata) {
+                $_lastchange = pg_fetch_result($this->_result, 0, 0);
+                if ($_lastchange != $this->_sinkdata) {
                     ZLog::Write(LOGLEVEL_DEBUG, sprintf("BackendStickyNote->ChangesSink(Change noted; tell the upper layers)"));
-	            array_push($_notifications, "N");
-		    $this->_sinkdata = $_lastchange;
-	}
+                    array_push($_notifications, "N");
+                    $this->_sinkdata = $_lastchange;
+                }
             }
-	}
-	pg_free_result($this->_result);
-	if (empty($_notifications)) {
+        }
+        pg_free_result($this->_result);
+        if (empty($_notifications)) {
             sleep($timeout);
-	}
-	return($_notifications);
+        }
+        return($_notifications);
     }
 
     /**