typos in bbcode, add service class restrictions to jot uploads

diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index a0d114a372c551bab912024c607bbb169efa5945..25edb28d7d8dd2eef87f9c4e7467f87e82b57f94 100644 (file)
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -113,7 +113,7 @@ function bb2diaspora($Text,$preserve_nl = false) {
        // to define the closing tag for the list elements. So nested lists
        // are going to be flattened out in Diaspora for now
        $endlessloop = 0;
-       while ((strpos($Text, "[/list]") !== false) && (strpos($Text, "[list") !== false)
+       while ((strpos($Text, "[/list]") !== false) && (strpos($Text, "[list") !== false) &&
               (strpos($Text, "[/ol]") !== false) && (strpos($Text, "[ol]") !== false) && 
               (strpos($Text, "[/ul]") !== false) && (strpos($Text, "[ul]") !== false) && (++$endlessloop < 20)) {
                $Text = preg_replace_callback("/\[list\](.*?)\[\/list\]/is", 'diaspora_ul', $Text);

diff --git a/include/bbcode.php b/include/bbcode.php
index 38d1e658f937116bc13fe46490372a34aadff52e..2c1c2378f1137d68a6e7d505d93e031f74550ad5 100644 (file)
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -162,7 +162,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
 
        // handle nested lists
        $endlessloop = 0;
-       while ((strpos($Text, "[/list]") !== false) && (strpos($Text, "[list") !== false)
+       while ((strpos($Text, "[/list]") !== false) && (strpos($Text, "[list") !== false) &&
               (strpos($Text, "[/ol]") !== false) && (strpos($Text, "[ol]") !== false) && 
               (strpos($Text, "[/ul]") !== false) && (strpos($Text, "[ul]") !== false) && (++$endlessloop < 20)) {
                $Text = preg_replace("/\[list\](.*?)\[\/list\]/ism", '<ul class="listbullet" style="list-style-type: circle;">$1</ul>' ,$Text);

diff --git a/include/plugin.php b/include/plugin.php
index d762e8717f7067e2b0a5f609a26d8a35ca7e7b61..ffa562273fb6b3ee8637148867abe8896aae5308 100644 (file)
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -380,20 +380,23 @@ function service_class_fetch($uid,$property) {
 
 }
 
-function upgrade_link() {
+function upgrade_link($bbcode = false) {
        $l = get_config('service_class','upgrade_link');
-       $t = sprintf('<a href="%s">' . t('Click here to upgrade.') . '</div>', $l);
-       if($l) 
-               return $t;
-       return '';
+       if(! $l)
+               return '';
+       if($bbcode)
+               $t = sprintf('[url=%s]' . t('Click here to upgrade.') . '[/url]', $l);
+       else
+               $t = sprintf('<a href="%s">' . t('Click here to upgrade.') . '</div>', $l);
+       return $t;
 }
 
-function upgrade_message() {
-       $x = upgrade_link();
+function upgrade_message($bbcode = false) {
+       $x = upgrade_link($bbcode);
        return t('This action exceeds the limits set by your subscription plan.') . (($x) ? ' ' . $x : '') ;
 }
 
-function upgrade_bool_message() {
-       $x = upgrade_link();
+function upgrade_bool_message($bbcode = false) {
+       $x = upgrade_link($bbcode);
        return t('This action is not available under your subscription plan.') . (($x) ? ' ' . $x : '') ;
 }

diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index 03d9f51055aa43f9920aa4dcbb7f602bfa4d0483..f179b3ca5078bbb66a717d6b8d5bf2f1875ce0f9 100644 (file)
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -60,6 +60,19 @@ function wall_attach_post(&$a) {
                return;
        }
 
+       $r = q("select sum(octet_length(data)) as total from attach where uid = %d ",
+               intval($page_owner_uid)
+       );
+
+       $limit = service_class_fetch($page_owner_uid,'attach_upload_limit');
+
+       if(($limit !== false) && (($r[0]['total'] + strlen($imagedata)) > $limit)) {
+               echo upgrade_message(true) . EOL ;
+               @unlink($src);
+               killme();
+       }
+
+
        $filedata = @file_get_contents($src);
        $mimetype = z_mime_content_type($filename);
        $hash = random_string();

diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index 4b81f8d1c209564581653bda00178c4035f37c48..5990f28344b92b0c2007538d159e3aac15f6647e 100644 (file)
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -79,6 +79,19 @@ function wall_upload_post(&$a) {
                killme();
        }
 
+       $r = q("select sum(octet_length(data)) as total from photo where uid = %d and scale = 0 and album != 'Contact Photos' ",
+               intval($page_owner_uid)
+       );
+
+       $limit = service_class_fetch($page_owner_uid,'photo_upload_limit');
+
+       if(($limit !== false) && (($r[0]['total'] + strlen($imagedata)) > $limit)) {
+               echo upgrade_message(true) . EOL ;
+               @unlink($src);
+               killme();
+       }
+
+
        $imagedata = @file_get_contents($src);
        $ph = new Photo($imagedata, $filetype);