From 2aa47096b82fd224008d901584f09931c0432c2b Mon Sep 17 00:00:00 2001
From: Brenda Wallace <shiny@cpan.org>
Date: Wed, 22 Jul 2009 13:45:38 +1200
Subject: missing AND in the SQL

---
 classes/File.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/File.php b/classes/File.php
index 68d385d1e..7ee8f6e08 100644
--- a/classes/File.php
+++ b/classes/File.php
@@ -136,7 +136,7 @@ class File extends Memcached_DataObject
             return sprintf(_('A file this large would exceed your user quota of %d bytes.'), common_config('attachments', 'user_quota'));
         }
 
-        $query .= ' month(modified) = month(now()) and year(modified) = year(now())';
+        $query .= ' AND month(modified) = month(now()) and year(modified) = year(now())';
         $this->query($query);
         $this->fetch();
         $total = $this->total + $fileSize;
-- 
cgit v1.2.3-54-g00ecf


From 36754f8323fbd200a97ccdc31e2c148104c7ba66 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <shiny@cpan.org>
Date: Wed, 22 Jul 2009 16:46:32 +1200
Subject: added missing columns in file table

---
 db/laconica_pg.sql | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/db/laconica_pg.sql b/db/laconica_pg.sql
index f5d35f985..71c99f24f 100644
--- a/db/laconica_pg.sql
+++ b/db/laconica_pg.sql
@@ -441,7 +441,6 @@ 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 default CURRENT_TIMESTAMP /* comment 'date the notice was created' */,
-
     primary key (group_id, notice_id)
 );
 create index group_inbox_created_idx on group_inbox using btree(created);
@@ -456,7 +455,9 @@ create table file (
     size integer, 
     title varchar(255), 
     date integer, 
-    protected integer
+    protected integer,
+    filename text /* comment 'if a local file, name of the file' */,
+    modified timestamp default CURRENT_TIMESTAMP /* comment 'date this record was modified'*/
 );
 
 create sequence file_oembed_seq;
-- 
cgit v1.2.3-54-g00ecf


From 28b62f357d80d86e17f9688d65809cb959f4be6c Mon Sep 17 00:00:00 2001
From: Brenda Wallace <shiny@cpan.org>
Date: Wed, 22 Jul 2009 17:05:44 +1200
Subject: fixed SQL in checking for monthly quota - works in postgres and mysql

---
 classes/File.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/File.php b/classes/File.php
index 7ee8f6e08..0c4fbf7e6 100644
--- a/classes/File.php
+++ b/classes/File.php
@@ -122,6 +122,7 @@ class File extends Memcached_DataObject
     }
 
     function isRespectsQuota($user,$fileSize) {
+
         if ($fileSize > common_config('attachments', 'file_quota')) {
             return sprintf(_('No file may be larger than %d bytes ' .
                              'and the file you sent was %d bytes. Try to upload a smaller version.'),
@@ -135,8 +136,7 @@ class File extends Memcached_DataObject
         if ($total > common_config('attachments', 'user_quota')) {
             return sprintf(_('A file this large would exceed your user quota of %d bytes.'), common_config('attachments', 'user_quota'));
         }
-
-        $query .= ' AND month(modified) = month(now()) and year(modified) = year(now())';
+        $query .= ' AND EXTRACT(month FROM file.modified) = EXTRACT(month FROM now()) and EXTRACT(year FROM file.modified) = EXTRACT(year FROM now())';
         $this->query($query);
         $this->fetch();
         $total = $this->total + $fileSize;
-- 
cgit v1.2.3-54-g00ecf