1 files changed, 6 insertions, 90 deletions

diff --git a/include/plugin.php b/include/plugin.php
index c5f57829d..08decc8e3 100755
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -102,7 +102,7 @@ function load_plugin($plugin) {
 		// This way the system won't fall over dead during the update.
 
 		if(file_exists('addon/' . $plugin . '/.hidden')) {
-			q("update addon set hidden = 1 where name = '%s' limit 1",
+			q("update addon set hidden = 1 where name = '%s'",
 				dbesc($plugin)
 			);
 		}
@@ -158,7 +158,7 @@ function reload_plugins() {
 								$func = $pl . '_load';
 								$func();
 							}
-							q("UPDATE `addon` SET `timestamp` = %d WHERE `id` = %d LIMIT 1",
+							q("UPDATE `addon` SET `timestamp` = %d WHERE `id` = %d",
 								intval($t),
 								intval($i['id'])
 							);
@@ -208,7 +208,7 @@ function register_hook($hook, $file, $function, $priority = 0) {
  * @return mixed
  */
 function unregister_hook($hook, $file, $function) {
-	$r = q("DELETE FROM hook WHERE hook = '%s' AND `file` = '%s' AND `function` = '%s' LIMIT 1",
+	$r = q("DELETE FROM hook WHERE hook = '%s' AND `file` = '%s' AND `function` = '%s'",
 		dbesc($hook),
 		dbesc($file),
 		dbesc($function)
@@ -430,93 +430,6 @@ function get_theme_screenshot($theme) {
 }
 
 
-// check service_class restrictions. If there are no service_classes defined, everything is allowed.
-// if $usage is supplied, we check against a maximum count and return true if the current usage is 
-// less than the subscriber plan allows. Otherwise we return boolean true or false if the property
-// is allowed (or not) in this subscriber plan. An unset property for this service plan means 
-// the property is allowed, so it is only necessary to provide negative properties for each plan, 
-// or what the subscriber is not allowed to do. 
-
-
-function service_class_allows($uid,$property,$usage = false) {
-	$a = get_app();
-	if($uid == local_user()) {
-		$service_class = $a->account['account_service_class'];
-	}
-	else {
-		$r = q("select account_service_class as service_class 
-				from channel c, account a 
-				where c.channel_account_id=a.account_id and c.channel_id= %d limit 1",
-			intval($uid)
-		);
-		if($r !== false and count($r)) {
-			$service_class = $r[0]['service_class'];
-		}
-	}
-	if(! x($service_class))
-		return true; // everything is allowed
-
-	$arr = get_config('service_class',$service_class);
-	if(! is_array($arr) || (! count($arr)))
-		return true;
-
-	if($usage === false)
-		return ((x($arr[$property])) ? (bool) $arr['property'] : true);
-	else {
-		if(! array_key_exists($property,$arr))
-			return true;
-		return (((intval($usage)) < intval($arr[$property])) ? true : false);
-	}
-}
-
-
-function service_class_fetch($uid,$property) {
-	$a = get_app();
-	if($uid == local_user()) {
-		$service_class = $a->account['account_service_class'];
-	}
-	else {
-		$r = q("select account_service_class as service_class 
-				from channel c, account a 
-				where c.channel_account_id=a.account_id and c.channel_id= %d limit 1",
-				intval($uid)
-		);
-		if($r !== false and count($r)) {
-			$service_class = $r[0]['service_class'];
-		}
-	}
-	if(! x($service_class))
-		return false; // everything is allowed
-
-	$arr = get_config('service_class',$service_class);
-
-	if(! is_array($arr) || (! count($arr)))
-		return false;
-
-	return((array_key_exists($property,$arr)) ? $arr[$property] : false);
-}
-
-function upgrade_link($bbcode = false) {
-	$l = get_config('service_class','upgrade_link');
-	if(! $l)
-		return '';
-	if($bbcode)
-		$t = sprintf('[zrl=%s]' . t('Click here to upgrade.') . '[/zrl]', $l);
-	else
-		$t = sprintf('<a href="%s">' . t('Click here to upgrade.') . '</div>', $l);
-	return $t;
-}
-
-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($bbcode = false) {
-	$x = upgrade_link($bbcode);
-	return t('This action is not available under your subscription plan.') . (($x) ? ' ' . $x : '') ;
-}
-
 /**
  * @brief add CSS to <head>
  *
@@ -559,6 +472,8 @@ function script_path() {
 		$scheme = 'https';
 	elseif(x($_SERVER,'SERVER_PORT') && (intval($_SERVER['SERVER_PORT']) == 443))
 		$scheme = 'https';
+	elseif (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' || !empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on')
+		$scheme = 'https';
 	else
 		$scheme = 'http';
 
@@ -639,6 +554,7 @@ function theme_include($file, $root = '') {
 	$paths = array(
 		"{$root}view/theme/$theme/$ext/$file",
 		"{$root}view/theme/$parent/$ext/$file",
+		"{$root}view/site/$ext/$file",
 		"{$root}view/$ext/$file",
 	);