typos in bbcode, add service class restrictions to jot uploads

3 files changed, 14 insertions, 11 deletions

diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index a0d114a37..25edb28d7 100644
--- 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 38d1e658f..2c1c2378f 100644
--- 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 d762e8717..ffa562273 100644
--- 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 : '') ;
 }