make storage limit service classes apply to accounts, not channels. Also include a css file that was missing from work yesterday.

7 files changed, 26 insertions, 17 deletions

diff --git a/include/attach.php b/include/attach.php
index b48dd211a..c05c39020 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -330,8 +330,8 @@ function attach_store($channel,$observer_hash,$options = '',$arr = null) {
 
 		$limit = service_class_fetch($channel_id,'attach_upload_limit');
 		if($limit !== false) {
-			$r = q("select sum(filesize) as total from attach where uid = %d ",
-				intval($channel_id)
+			$r = q("select sum(filesize) as total from attach where aid = %d ",
+				intval($channel['channel_account_id'])
 			);
 			if(($r) &&  (($r[0]['total'] + $filesize) > ($limit - $existing_size))) {
 				$ret['message'] = upgrade_message(true).sprintf(t("You have reached your limit of %1$.0f Mbytes attachment storage."),$limit / 1024000);
diff --git a/include/photos.php b/include/photos.php
index e41d1059a..e4367bf95 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -102,12 +102,10 @@ function photo_upload($channel, $observer, $args) {
 
 	$imagedata = @file_get_contents($src);
 
-	$r = q("select sum(size) as total from photo where uid = %d and scale = 0 ",
-		intval($channel_id)
+	$r = q("select sum(size) as total from photo where aid = %d and scale = 0 ",
+		intval($account_id)
 	);
 
-// FIXME service class limits should probably apply to accounts and not channels
-
 	$limit = service_class_fetch($channel_id,'photo_upload_limit');
 
 	if(($r) && ($limit !== false) && (($r[0]['total'] + strlen($imagedata)) > $limit)) {
diff --git a/include/reddav.php b/include/reddav.php
index 05a93b9f8..3bf670711 100644
--- a/include/reddav.php
+++ b/include/reddav.php
@@ -160,8 +160,8 @@ class RedDirectory extends DAV\Node implements DAV\ICollection {
 
 		$limit = service_class_fetch($c[0]['channel_id'],'attach_upload_limit');
 		if($limit !== false) {
-			$x = q("select sum(filesize) as total from attach where uid = %d ",
-				intval($c[0]['channel_id'])
+			$x = q("select sum(filesize) as total from attach where aid = %d ",
+				intval($c[0]['channel_account_id'])
 			);
 			if(($x) &&  ($x[0]['total'] + $r[0]['filesize'] > $limit)) {
 				q("delete from attach where hash = '%s' and uid = %d limit 1",
@@ -359,8 +359,8 @@ class RedFile extends DAV\Node implements DAV\IFile {
 
 		$limit = service_class_fetch($c[0]['channel_id'],'attach_upload_limit');
 		if($limit !== false) {
-			$x = q("select sum(filesize) as total from attach where uid = %d ",
-				intval($c[0]['channel_id'])
+			$x = q("select sum(filesize) as total from attach where aid = %d ",
+				intval($c[0]['channel_account_id'])
 			);
 			if(($x) &&  ($x[0]['total'] + $r[0]['filesize'] > $limit)) {
 				q("delete from attach where hash = '%s' and uid = %d limit 1",
diff --git a/mod/filestorage.php b/mod/filestorage.php
index b774cf756..0d92c0d2a 100644
--- a/mod/filestorage.php
+++ b/mod/filestorage.php
@@ -42,10 +42,11 @@ function filestorage_content(&$a) {
 		return;
 	}
 
-	$r = q("select channel_id from channel where channel_address = '%s'",
+	$r = q("select * from channel where channel_address = '%s'",
 		dbesc($which)
 	);
 	if($r) {
+		$channel = $r[0];
 		$owner = intval($r[0]['channel_id']);
 	}
 
@@ -146,8 +147,8 @@ function filestorage_content(&$a) {
 	}
 
 	$limit = service_class_fetch ($owner,'attach_upload_limit'); 
-		$r = q("select sum(filesize) as total from attach where uid = %d ",
-		intval($owner)
+		$r = q("select sum(filesize) as total from attach where aid = %d ",
+		intval($channel['channel_account_id'])
 	);
 	$used = $r[0]['total'];
 
diff --git a/mod/photos.php b/mod/photos.php
index 5afde49ef..4a0fb01b8 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -687,8 +687,8 @@ function photos_content(&$a) {
 
 		/* Show space usage */
 
-		$r = q("select sum(size) as total from photo where uid = %d and scale = 0 ",
-			intval($a->data['channel']['channel_id'])
+		$r = q("select sum(size) as total from photo where aid = %d and scale = 0 ",
+			intval($a->data['channel']['channel_account_id'])
 		);
 
 
diff --git a/version.inc b/version.inc
index fe1a4447d..fa2bfeab0 100644
--- a/version.inc
+++ b/version.inc
@@ -1,2 +1 @@
-2014-01-06.549
-
+2014-01-07.550
diff --git a/view/css/mod_filestorage.css b/view/css/mod_filestorage.css
new file mode 100644
index 000000000..19e8ddd42
--- /dev/null
+++ b/view/css/mod_filestorage.css
@@ -0,0 +1,11 @@
+#attach-edit-backlink, #cut-paste-link {
+	margin-bottom: 10px;
+}
+
+#attach-edit-submit {
+	margin-top: 20px;
+}
+
+#cutpasteinput {
+	width: 600px;
+}
\ No newline at end of file