Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

12 files changed, 87 insertions, 3 deletions

diff --git a/actions/all.php b/actions/all.php
index b03ad7ec3..d75d1b946 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -42,6 +42,9 @@ class AllAction extends Action
         if (!$this->page) {
             $this->page = 1;
         }
+        
+        common_set_returnto($this->selfUrl());
+        
         return true;
     }
 
diff --git a/actions/favorited.php b/actions/favorited.php
index 4155b3a23..fd5ff413c 100644
--- a/actions/favorited.php
+++ b/actions/favorited.php
@@ -104,6 +104,9 @@ class FavoritedAction extends Action
     {
         parent::prepare($args);
         $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
+        
+        common_set_returnto($this->selfUrl());
+        
         return true;
     }
 
diff --git a/actions/noticesearch.php b/actions/noticesearch.php
index 630fb8857..c0c238120 100644
--- a/actions/noticesearch.php
+++ b/actions/noticesearch.php
@@ -48,6 +48,16 @@ require_once INSTALLDIR.'/lib/searchaction.php';
  */
 class NoticesearchAction extends SearchAction
 {
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        common_set_returnto($this->selfUrl());
+
+        return true;
+    }
+    
     /**
      * Get instructions
      * 
diff --git a/actions/public.php b/actions/public.php
index cfdc99bb3..cc6537f74 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -73,6 +73,9 @@ class PublicAction extends Action
     {
         parent::prepare($args);
         $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
+        
+        common_set_returnto($this->selfUrl());
+        
         return true;
     }
 
diff --git a/actions/replies.php b/actions/replies.php
index 9ec373a96..7eff74a66 100644
--- a/actions/replies.php
+++ b/actions/replies.php
@@ -83,6 +83,8 @@ class RepliesAction extends Action
 
         $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
 
+        common_set_returnto($this->selfUrl());
+        
         return true;
     }
 
diff --git a/actions/showfavorites.php b/actions/showfavorites.php
index bb68f8d94..31479e1a7 100644
--- a/actions/showfavorites.php
+++ b/actions/showfavorites.php
@@ -112,6 +112,8 @@ class ShowfavoritesAction extends Action
             $this->page = 1;
         }
 
+        common_set_returnto($this->selfUrl());
+        
         return true;
     }
 
diff --git a/actions/showgroup.php b/actions/showgroup.php
index 468990e7b..7bc68fbc6 100644
--- a/actions/showgroup.php
+++ b/actions/showgroup.php
@@ -129,6 +129,8 @@ class ShowgroupAction extends Action
             return false;
         }
 
+        common_set_returnto($this->selfUrl());
+
         return true;
     }
 
diff --git a/actions/showstream.php b/actions/showstream.php
index 4b1679969..224bbce9f 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -110,6 +110,8 @@ class ShowstreamAction extends Action
 
         $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
 
+        common_set_returnto($this->selfUrl());
+        
         return true;
     }
 
diff --git a/actions/tag.php b/actions/tag.php
index 803026e62..4401f892a 100644
--- a/actions/tag.php
+++ b/actions/tag.php
@@ -37,6 +37,9 @@ class TagAction extends Action
         }
 
         $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
+        
+        common_set_returnto($this->selfUrl());
+        
         return true;
     }
 
diff --git a/db/laconica_pg.sql b/db/laconica_pg.sql
index c3efd9daa..9882d091a 100644
--- a/db/laconica_pg.sql
+++ b/db/laconica_pg.sql
@@ -50,7 +50,7 @@ create table "user" (
     emailnotifyfav integer default 1 /* comment 'Notify by email of favorites' */,

     emailnotifynudge integer default 1 /* comment 'Notify by email of nudges' */,

     emailnotifymsg integer default 1 /* comment 'Notify by email of direct messages' */,

-emailmicroid integer default 1 /* comment 'whether to publish email microid' */,

+    emailmicroid integer default 1 /* comment 'whether to publish email microid' */,

     language varchar(50) /* comment 'preferred language' */,

     timezone varchar(50) /* comment 'timezone' */,

     emailpost integer default 1 /* comment 'Post by email' */,

@@ -146,7 +146,6 @@ create table fave (
     notice_id integer not null /* comment 'notice that is the favorite' */ references notice (id),

     user_id integer not null /* comment 'user who likes this notice' */ references "user" (id) ,

     modified timestamp not null /* comment 'date this record was modified' */,

-

     primary key (notice_id, user_id)

 

 );

@@ -288,6 +287,7 @@ create table foreign_link (
      credentials varchar(255) /* comment 'authc credentials, typically a password' */,

      noticesync int not null default 1 /* comment 'notice synchronisation, bit 1 = sync outgoing, bit 2 = sync incoming, bit 3 = filter local replies' */,

      friendsync int not null default 2 /* comment 'friend synchronisation, bit 1 = sync outgoing, bit 2 = sync incoming */, 

+     profilesync int not null default 1 /* comment 'profile synchronization, bit 1 = sync outgoing, bit 2 = sync incoming' */,

      created timestamp not null /* comment 'date this record was created' */,

      modified timestamp not null /* comment 'date this record was modified' */,

 

@@ -367,6 +367,59 @@ create table profile_block (
 

 );

 

+create table user_group (

+

+    id serial primary key /* comment 'unique identifier' */,

+

+    nickname varchar(64) unique /* comment 'nickname for addressing' */,

+    fullname varchar(255) /* comment 'display name' */,

+    homepage varchar(255) /* comment 'URL, cached so we dont regenerate' */,

+    description varchar(140) /* comment 'descriptive biography' */,

+    location varchar(255) /* comment 'related physical location, if any' */,

+

+    original_logo varchar(255) /* comment 'original size logo' */,

+    homepage_logo varchar(255) /* comment 'homepage (profile) size logo' */,

+    stream_logo varchar(255) /* comment 'stream-sized logo' */,

+    mini_logo varchar(255) /* comment 'mini logo' */,

+

+    created timestamp not null /* comment 'date this record was created' */,

+    modified timestamp /* comment 'date this record was modified' */

+

+);

+create index user_group_nickname_idx on user_group using btree(nickname);

+

+create table group_member (

+

+    group_id integer not null /* comment 'foreign key to user_group' */ references user_group (id),

+    profile_id integer not null /* comment 'foreign key to profile table' */ references profile (id),

+    is_admin integer default 0 /* comment 'is this user an admin?' */,

+

+    created timestamp not null /* comment 'date this record was created' */,

+    modified timestamp /* comment 'date this record was modified' */,

+

+    primary key (group_id, profile_id)

+);

+

+create table related_group (

+

+    group_id integer not null /* comment 'foreign key to user_group' */ references user_group (id) ,

+    related_group_id integer not null /* comment 'foreign key to user_group' */ references user_group (id),

+

+    created timestamp not null /* comment 'date this record was created' */,

+

+    primary key (group_id, related_group_id)

+

+);

+

+create table group_inbox (

+    group_id integer not null /* comment 'group receiving the message' references user_group (id) */,

+    notice_id integer not null /* comment 'notice received' references notice (id) */,

+    created timestamp not null /* comment 'date the notice was created' */,

+

+    primary key (group_id, notice_id)

+);

+create index group_inbox_created_idx on group_inbox using btree(created);

+

 /* Textsearch stuff */

 

 create index textsearch_idx on profile using gist(textsearch);

diff --git a/lib/mailbox.php b/lib/mailbox.php
index 8d5d44e49..e8323dc28 100644
--- a/lib/mailbox.php
+++ b/lib/mailbox.php
@@ -63,6 +63,8 @@ class MailboxAction extends PersonalAction
             $this->page = 1;
         }
 
+        common_set_returnto($this->selfUrl());
+
         return true;
     }
 
diff --git a/lib/personal.php b/lib/personal.php
index 900df0257..e46350c63 100644
--- a/lib/personal.php
+++ b/lib/personal.php
@@ -55,7 +55,6 @@ class PersonalAction extends Action
     function handle($args)
     {
         parent::handle($args);
-        common_set_returnto($this->selfUrl());
     }
 
 }