13 files changed, 39 insertions, 536 deletions
diff --git a/Zotlabs/Daemon/Queue.php b/Zotlabs/Daemon/Queue.php
index 1bab582bc..8f529ff13 100644
--- a/Zotlabs/Daemon/Queue.php
+++ b/Zotlabs/Daemon/Queue.php
@@ -16,7 +16,7 @@ class Queue {
 		if($argc > 1)
 			$queue_id = $argv[1];
 		else
-			$queue_id = 0;
+			$queue_id = EMPTY_STR;
 
 		logger('queue: start');
 
diff --git a/Zotlabs/Module/Connections.php b/Zotlabs/Module/Connections.php
index f42ff9b84..255731c9c 100644
--- a/Zotlabs/Module/Connections.php
+++ b/Zotlabs/Module/Connections.php
@@ -232,7 +232,7 @@ class Connections extends \Zotlabs\Web\Controller {
 				if($rr['xchan_url']) {
 
 					if(($rr['vcard']) && is_array($rr['vcard']['tels']) && $rr['vcard']['tels'][0]['nr'])
-						$phone = ((\App::$is_mobile || \App::$is_tablet) ? $rr['vcard']['tels'][0]['nr'] : '');
+						$phone = $rr['vcard']['tels'][0]['nr'];
 					else
 						$phone = '';
 	
diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php
index e23a751d9..f359175c1 100644
--- a/Zotlabs/Module/Connedit.php
+++ b/Zotlabs/Module/Connedit.php
@@ -895,7 +895,6 @@ class Connedit extends \Zotlabs\Web\Controller {
 				'$permnote_self'  => t('Some permissions may be inherited from your channel\'s <a href="settings"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can change those settings here but they wont have any impact unless the inherited setting changes.'),
 				'$lastupdtext'    => t('Last update:'),
 				'$last_update'    => relative_date($contact['abook_connected']),
-				'$is_mobile'      => ((\App::$is_mobile || \App::$is_tablet) ? true : false),
 				'$profile_select' => contact_profile_assign($contact['abook_profile']),
 				'$multiprofs'     => $multiprofs,
 				'$contact_id'     => $contact['abook_id'],
diff --git a/Zotlabs/Module/Settings/Display.php b/Zotlabs/Module/Settings/Display.php
index e1ea0e3e5..340b3c0bb 100644
--- a/Zotlabs/Module/Settings/Display.php
+++ b/Zotlabs/Module/Settings/Display.php
@@ -21,7 +21,7 @@ class Display {
 		if(! $theme)
 			$theme = 'redbasic';
 
-		$mobile_theme      = ((x($_POST,'mobile_theme')) ? notags(trim($_POST['mobile_theme']))  : '');
+
 		$preload_images    = ((x($_POST,'preload_images')) ? intval($_POST['preload_images'])  : 0);
 		$channel_menu      = ((x($_POST,'channel_menu')) ? intval($_POST['channel_menu'])  : 0);
 		$user_scalable     = ((x($_POST,'user_scalable')) ? intval($_POST['user_scalable'])  : 0);
@@ -47,11 +47,6 @@ class Display {
 		if($itemspage > 100)
 			$itemspage = 100;
 
-		if ($mobile_theme == "---")
-			del_pconfig(local_channel(),'system','mobile_theme');
-		else {
-			set_pconfig(local_channel(),'system','mobile_theme',$mobile_theme);
-		}
 
 		set_pconfig(local_channel(),'system','preload_images',$preload_images);
 		set_pconfig(local_channel(),'system','user_scalable',$user_scalable);
@@ -114,10 +109,6 @@ class Display {
 
 		$theme = (($existing_theme) ? $existing_theme : $default_theme);
 
-		$default_mobile_theme = get_config('system','mobile_theme');
-		if(! $mobile_default_theme)
-			$mobile_default_theme = 'none';
-
 		$allowed_themes_str = get_config('system','allowed_themes');
 		$allowed_themes_raw = explode(',',$allowed_themes_str);
 		$allowed_themes = array();
@@ -135,26 +126,19 @@ class Display {
 
 				$info = get_theme_info($th);
 				$compatible = check_plugin_versions($info);
-				if(!$compatible) {
-					$mobile_themes[$f] = $themes[$f] = sprintf(t('%s - (Incompatible)'), $f);
+				if(! $compatible) {
+					$themes[$f] = sprintf(t('%s - (Incompatible)'), $f);
 					continue;
 				}
 
 				$is_experimental = file_exists('view/theme/' . $th . '/experimental');
 				$unsupported = file_exists('view/theme/' . $th . '/unsupported');
-				$is_mobile = file_exists('view/theme/' . $th . '/mobile');
 				$is_library = file_exists('view/theme/'. $th . '/library');
-				$mobile_themes['---'] = t("No special theme for mobile devices");
 
 				if (!$is_experimental or ($is_experimental && (get_config('experimentals','exp_themes')==1 or get_config('experimentals','exp_themes')===false))){
 					$theme_name = (($is_experimental) ?  sprintf(t('%s - (Experimental)'), $f) : $f);
 					if (! $is_library) {
-						if($is_mobile) {
-							$mobile_themes[$f] = $themes[$f] = $theme_name . ' (' . t('mobile') . ')';
-						}
-						else {
-							$mobile_themes[$f] = $themes[$f] = $theme_name;
-						}
+						$themes[$f] = $theme_name;
 					}
 				}
 			}
@@ -166,7 +150,6 @@ class Display {
 			$theme_selected = explode(':', $theme_selected)[0];
 		}
 
-		$mobile_theme_selected = (!x($_SESSION,'mobile_theme')? $default_mobile_theme : $_SESSION['mobile_theme']);
 
 		$preload_images = get_pconfig(local_channel(),'system','preload_images');
 		$preload_images = (($preload_images===false)? '0': $preload_images); // default if not set: 0
@@ -213,7 +196,6 @@ class Display {
 			'$theme'	=> (($themes) ? array('theme', t('Display Theme:'), $theme_selected, '', $themes, 'preview') : false),
 			'$schema'   => array('schema', t('Select scheme'), $existing_schema, '' , $schemas),
 
-			'$mobile_theme' => (($mobile_themes) ? array('mobile_theme', t('Mobile Theme:'), $mobile_theme_selected, '', $mobile_themes, '') : false),
 			'$preload_images' => array('preload_images', t("Preload images before rendering the page"), $preload_images, t("The subjective page load time will be longer but the page will be ready when displayed"), $yes_no),
 			'$user_scalable' => array('user_scalable', t("Enable user zoom on mobile devices"), $user_scalable, '', $yes_no),
 			'$ajaxint'   => array('browser_update',  t("Update browser every xx seconds"), $browser_update, t('Minimum of 10 seconds, no maximum')),
diff --git a/Zotlabs/Render/Theme.php b/Zotlabs/Render/Theme.php
index 09cc7a4d4..0eebba1ba 100644
--- a/Zotlabs/Render/Theme.php
+++ b/Zotlabs/Render/Theme.php
@@ -8,10 +8,8 @@ use App;
 class Theme {
 
 	static $system_theme = null;
-	static $system_mobile_theme = null;
 
 	static $session_theme = null;
-	static $session_mobile_theme = null;
 
 	/**
 	 * @brief Array with base or fallback themes.
@@ -32,10 +30,6 @@ class Theme {
 			? \App::$config['system']['theme'] : '');
 		self::$session_theme = ((isset($_SESSION) && x($_SESSION, 'theme'))
 			? $_SESSION['theme'] : self::$system_theme);
-		self::$system_mobile_theme = ((isset(\App::$config['system']['mobile_theme']))
-			? \App::$config['system']['mobile_theme'] : '');
-		self::$session_mobile_theme = ((isset($_SESSION) && x($_SESSION, 'mobile_theme'))
-			? $_SESSION['mobile_theme'] : self::$system_mobile_theme);
 
 		$page_theme = null;
 
@@ -55,30 +49,12 @@ class Theme {
 		if(array_key_exists('theme', \App::$layout) && \App::$layout['theme'])
 			$page_theme = \App::$layout['theme'];
 
-		// If the viewer is on a mobile device, ensure that we're using a mobile
-		// theme of some kind or whatever the viewer's preference is for mobile
-		// viewing (if applicable)
+		$chosen_theme = self::$session_theme;
 
-		if(\App::$is_mobile || \App::$is_tablet) {
-			if(isset($_SESSION['show_mobile']) && (! $_SESSION['show_mobile'])) {
-				$chosen_theme = self::$session_theme;
-			}
-			else {
-				$chosen_theme = self::$session_mobile_theme;
-
-				if($chosen_theme === '' || $chosen_theme === '---' ) {
-					// user has selected to have the mobile theme be the same as the normal one
-					$chosen_theme = self::$session_theme;
-				}
-			}
+		if($page_theme) {
+			$chosen_theme = $page_theme;
 		}
-		else {
-			$chosen_theme = self::$session_theme;
 
-			if($page_theme) {
-				$chosen_theme = $page_theme;
-			}
-		}
 		if(array_key_exists('theme_preview', $_GET))
 			$chosen_theme = $_GET['theme_preview'];
 
diff --git a/boot.php b/boot.php
index e7a8ff97c..184ff6ea2 100755
--- a/boot.php
+++ b/boot.php
@@ -38,7 +38,6 @@ require_once('include/datetime.php');
 require_once('include/language.php');
 require_once('include/nav.php');
 require_once('include/permissions.php');
-require_once('library/Mobile_Detect/Mobile_Detect.php');
 require_once('include/features.php');
 require_once('include/taxonomy.php');
 require_once('include/channel.php');
@@ -788,9 +787,7 @@ class App {
 	public static  $theme_info = array();
 	public static  $is_sys = false;
 	public static  $nav_sel;
-	public static $is_mobile = false;
-	public static $is_tablet = false;
-	public static $comanche;
+	public static  $comanche;
 
 
 	public static $channel_links;
@@ -961,14 +958,6 @@ class App {
 		self::$pager['total'] = 0;
 
 		/*
-		 * Detect mobile devices
-		 */
-
-		$mobile_detect = new Mobile_Detect();
-		self::$is_mobile = $mobile_detect->isMobile();
-		self::$is_tablet = $mobile_detect->isTablet();
-
-		/*
 		 * register template engines
 		 */
 
@@ -2198,22 +2187,6 @@ function construct_page() {
 		}
 	}
 
-	if(App::$is_mobile || App::$is_tablet) {
-		if(isset($_SESSION['show_mobile']) && !$_SESSION['show_mobile']) {
-			$link = z_root() . '/toggle_mobile?f=&address=' . curPageURL();
-		}
-		else {
-			$link = z_root() . '/toggle_mobile?f=&off=1&address=' . curPageURL();
-		}
-		if ((isset($_SESSION) && $_SESSION['mobile_theme'] !='' && $_SESSION['mobile_theme'] !='---' ) ||
-			(isset(App::$config['system']['mobile_theme']) && !isset($_SESSION['mobile_theme']))) {
-			App::$page['footer'] .= replace_macros(get_markup_template("toggle_mobile_footer.tpl"), array(
-				'$toggle_link' => $link,
-				'$toggle_text' => t('toggle mobile')
-			));
-		}
-	}
-
 	$page    = App::$page;
 	$profile = App::$profile;
 
diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 4e203074b..bada3e528 100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -5,104 +5,9 @@
  * @package acl_selectors
  */
 
-/**
- * @brief
- *
- * @param string $selname
- * @param string $selclass
- * @param mixed $preselected
- * @param number $size
- * @return string
- */
-function group_select($selname, $selclass, $preselected = false, $size = 4) {
-
-	$o = '';
-
-	$o .= "<select name=\"{$selname}[]\" id=\"$selclass\" class=\"$selclass\" multiple=\"multiple\" size=\"$size\">\r\n";
-
-	$r = q("SELECT * FROM groups WHERE deleted = 0 AND uid = %d ORDER BY gname ASC",
-		intval(local_channel())
-	);
-
-
-	$arr = array('group' => $r, 'entry' => $o);
-
-	// e.g. 'network_pre_group_deny', 'profile_pre_group_allow'
-
-	call_hooks(App::$module . '_pre_' . $selname, $arr);
-
-	if($r) {
-		foreach($r as $rr) {
-			if((is_array($preselected)) && in_array($rr['id'], $preselected))
-				$selected = " selected=\"selected\" ";
-			else
-				$selected = '';
-			$trimmed = mb_substr($rr['gname'],0,12);
-
-			$o .= "<option value=\"{$rr['id']}\" $selected title=\"{$rr['name']}\" >$trimmed</option>\r\n";
-		}
-
-	}
-	$o .= "</select>\r\n";
-
-	call_hooks(App::$module . '_post_' . $selname, $o);
-
-	return $o;
-}
-
-function contact_select($selname, $selclass, $preselected = false, $size = 4, $privmail = false, $celeb = false, $privatenet = false, $tabindex = null) {
-
-	$o = '';
-
-	// When used for private messages, we limit correspondence to mutual DFRN/Friendica friends and the selector
-	// to one recipient. By default our selector allows multiple selects amongst all contacts.
-
-	$sql_extra = '';
-
-	$tabindex = ($tabindex > 0 ? 'tabindex="$tabindex"' : '');
-
-	if($privmail)
-		$o .= "<select name=\"$selname\" id=\"$selclass\" class=\"$selclass\" size=\"$size\" $tabindex >\r\n";
-	else
-		$o .= "<select name=\"{$selname}[]\" id=\"$selclass\" class=\"$selclass\" multiple=\"multiple\" size=\"$size\" $tabindex>\r\n";
-
-	$r = q("SELECT abook_id, xchan_name, xchan_url, xchan_photo_s from abook left join xchan on abook_xchan = xchan_hash
-		where abook_self = 0 and abook_channel = %d
-		$sql_extra
-		ORDER BY xchan_name ASC",
-		intval(local_channel())
-	);
-
-
-	$arr = array('contact' => $r, 'entry' => $o);
-
-	// e.g. 'network_pre_contact_deny', 'profile_pre_contact_allow'
-
-	call_hooks(App::$module . '_pre_' . $selname, $arr);
-
-	if($r) {
-		foreach($r as $rr) {
-			if((is_array($preselected)) && in_array($rr['id'], $preselected))
-				$selected = ' selected="selected" ';
-			else
-				$selected = '';
-
-			$trimmed = mb_substr($rr['xchan_name'], 0, 20);
-
-			$o .= "<option value=\"{$rr['abook_id']}\" $selected title=\"{$rr['xchan_name']}|{$rr['xchan_url']}\" >$trimmed</option>\r\n";
-		}
-	}
-
-	$o .= "</select>\r\n";
-
-	call_hooks(App::$module . '_post_' . $selname, $o);
-
-	return $o;
-}
-
 
 function fixacl(&$item) {
-	$item = str_replace(array('<', '>'), array('', ''), $item);
+	$item = str_replace( [ '<', '>' ], [ '', '' ], $item);
 }
 
 /**
diff --git a/include/crypto.php b/include/crypto.php
index b990b18d9..105c1c54f 100644
--- a/include/crypto.php
+++ b/include/crypto.php
@@ -31,19 +31,6 @@ function rsa_verify($data,$sig,$key,$alg = 'sha256') {
 	return (($verify > 0) ? true : false);
 }
 
-function pkcs5_pad ($text, $blocksize)
-{
-    $pad = $blocksize - (strlen($text) % $blocksize);
-    return $text . str_repeat(chr($pad), $pad);
-}
-
-function pkcs5_unpad($text)
-{
-    $pad = ord($text{strlen($text)-1});
-    if ($pad > strlen($text)) return false;
-    if (strspn($text, chr($pad), strlen($text) - $pad) != $pad) return false;
-    return substr($text, 0, -1 * $pad);
-} 
 
 function AES256CBC_encrypt($data,$key,$iv) {
 
@@ -282,37 +269,6 @@ function new_keypair($bits) {
 
 }
 
-function pkcs1to8($oldkey,$len) {
-
-	if($len == 4096)
-		$c = 'g';
-	if($len == 2048)
-		$c = 'Q';
-
-	if(strstr($oldkey,'BEGIN PUBLIC'))
-		return $oldkey;
-
-	$oldkey = str_replace('-----BEGIN RSA PUBLIC KEY-----', '', $oldkey);
-	$oldkey = trim(str_replace('-----END RSA PUBLIC KEY-----', '', $oldkey));
-	$key = 'MIICIjANBgkqhkiG9w0BAQEFAAOCA' . $c . '8A' . str_replace("\n", '', $oldkey);
-	$key = "-----BEGIN PUBLIC KEY-----\n" . wordwrap($key, 64, "\n", true) . "\n-----END PUBLIC KEY-----";
-	return $key;
-}
-
-function pkcs8to1($oldkey,$len) {
-
-	if(strstr($oldkey,'BEGIN RSA'))
-		return $oldkey;
-
-	$oldkey = str_replace('-----BEGIN PUBLIC KEY-----', '', $oldkey);
-	$oldkey = trim(str_replace('-----END PUBLIC KEY-----', '', $oldkey));
-	$key = str_replace("\n",'',$oldkey);
-	$key = substr($key,32);
-	$key = "-----BEGIN RSA PUBLIC KEY-----\n" . wordwrap($key, 64, "\n", true) . "\n-----END RSA PUBLIC KEY-----";
-	return $key;
-}
-
-
 function DerToPem($Der, $Private=false)
 {
     //Encode:
diff --git a/include/datetime.php b/include/datetime.php
index 0fcd957be..1e9a1fa51 100644
--- a/include/datetime.php
+++ b/include/datetime.php
@@ -93,16 +93,6 @@ function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d
 		return $d->format($fmt);
 	}
 
-	// Slight hackish adjustment so that 'zero' datetime actually returns what is intended
-	// otherwise we end up with -0001-11-30 ...
-	// add 32 days so that we at least get year 00, and then hack around the fact that
-	// months and days always start with 1.
-
-//	if(substr($s,0,10) == '0000-00-00') {
-//		$d = new DateTime($s . ' + 32 days', new DateTimeZone('UTC'));
-//		return str_replace('1', '0', $d->format($fmt));
-//	}
-
 	try {
 		$from_obj = new DateTimeZone($from);
 	} catch(Exception $e) {
@@ -135,70 +125,20 @@ function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d
  */
 function dob($dob) {
 
-	list($year, $month, $day) = sscanf($dob, '%4d-%2d-%2d');
-	$f = get_config('system', 'birthday_input_format');
-	if (! $f)
-		$f = 'ymd';
-
 	if ($dob === '0000-00-00')
 		$value = '';
 	else
 		$value = (($year) ? datetime_convert('UTC','UTC',$dob,'Y-m-d') : datetime_convert('UTC','UTC',$dob,'m-d'));
 
-	$o = replace_macros(get_markup_template("field_input.tpl"), array('$field' => array(
-		'dob',
-		t('Birthday'),
-		$value,
-		((intval($value)) ? t('Age: ') . age($value,App::$user['timezone'],App::$user['timezone']) : ''),
-		'',
-		'placeholder="' . t('YYYY-MM-DD or MM-DD') .'"'
-	)));
-
+	$o = replace_macros(get_markup_template("field_input.tpl"), [
+		'$field' => [ 'dob', t('Birthday'), $value, ((intval($value)) ? t('Age: ') . age($value,App::$user['timezone'],App::$user['timezone']) : ''), '', 'placeholder="' . t('YYYY-MM-DD or MM-DD') .'"' ]
+	]);
 
-//	if ($dob && $dob != '0000-00-00')
-//		$o = datesel($f,mktime(0,0,0,0,0,1900),mktime(),mktime(0,0,0,$month,$day,$year),'dob');
-//	else
-//		$o = datesel($f,mktime(0,0,0,0,0,1900),mktime(),false,'dob');
 
 	return $o;
 }
 
 /**
- * @brief Returns a date selector.
- *
- * @see datetimesel()
- * @param string $format
- *   format string, e.g. 'ymd' or 'mdy'. Not currently supported
- * @param DateTime $min
- *   unix timestamp of minimum date
- * @param DateTime $max
- *   unix timestap of maximum date
- * @param DateTime $default
- *   unix timestamp of default date
- * @param string $id
- *   id and name of datetimepicker (defaults to "datetimepicker")
- */
-function datesel($format, $min, $max, $default, $id = 'datepicker') {
-	return datetimesel($format, $min, $max, $default, '', $id, true, false, '', '');
-}
-
-/**
- * @brief Returns a time selector.
- *
- * @param string $format
- *   format string, e.g. 'ymd' or 'mdy'. Not currently supported
- * @param string $h
- *   already selected hour
- * @param string $m
- *  already selected minute
- * @param string $id
- *  id and name of datetimepicker (defaults to "timepicker")
- */
-function timesel($format, $h, $m, $id='timepicker') {
-	return datetimesel($format, new DateTime(), new DateTime(), new DateTime("$h:$m"), '', $id, false, true);
-}
-
-/**
  * @brief Returns a datetime selector.
  *
  * @param string $format
@@ -449,12 +389,7 @@ function cal($y = 0, $m = 0, $links = false, $class='') {
 
 	// month table - start at 1 to match human usage.
 
-	$mtab = array(' ',
-		'January','February','March',
-		'April','May','June',
-		'July','August','September',
-		'October','November','December'
-	);
+	$mtab = [ ' ', 'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December' ];
 
 	$thisyear = datetime_convert('UTC',date_default_timezone_get(),'now','Y');
 	$thismonth = datetime_convert('UTC',date_default_timezone_get(),'now','m');
@@ -463,7 +398,7 @@ function cal($y = 0, $m = 0, $links = false, $class='') {
 	if (! $m)
 		$m = intval($thismonth);
 
-	$dn = array('Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday');
+	$dn = [ 'Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday' ];
 	$f = get_first_dim($y, $m);
 	$l = get_dim($y, $m);
 	$d = 1;
@@ -569,17 +504,17 @@ function update_birthdays() {
 			if (! perm_is_allowed($rr['abook_channel'], $rr['xchan_hash'], 'send_stream'))
 				continue;
 
-			$ev = array();
-			$ev['uid'] = $rr['abook_channel'];
-			$ev['account'] = $rr['abook_account'];
-			$ev['event_xchan'] = $rr['xchan_hash'];
-			$ev['dtstart'] = datetime_convert('UTC', 'UTC', $rr['abook_dob']);
-			$ev['dtend'] = datetime_convert('UTC', 'UTC', $rr['abook_dob'] . ' + 1 day ');
-			$ev['adjust'] = intval(feature_enabled($rr['abook_channel'],'smart_birthdays'));
-			$ev['summary'] = sprintf( t('%1$s\'s birthday'), $rr['xchan_name']);
-			$ev['description'] = sprintf( t('Happy Birthday %1$s'),
-				'[zrl=' . $rr['xchan_url'] . ']' . $rr['xchan_name'] . '[/zrl]') ;
-			$ev['etype'] = 'birthday';
+			$ev = [
+				'uid'         => $rr['abook_channel'],
+				'account'     => $rr['abook_account'],
+				'event_xchan' => $rr['xchan_hash'],
+				'dtstart'     => datetime_convert('UTC', 'UTC', $rr['abook_dob']),
+				'dtend'       => datetime_convert('UTC', 'UTC', $rr['abook_dob'] . ' + 1 day '),
+				'adjust'      => intval(feature_enabled($rr['abook_channel'],'smart_birthdays')),
+				'summary'     => sprintf( t('%1$s\'s birthday'), $rr['xchan_name']),
+				'description' => sprintf( t('Happy Birthday %1$s'), '[zrl=' . $rr['xchan_url'] . ']' . $rr['xchan_name'] . '[/zrl]'),
+				'etype'       => 'birthday',
+			];
 
 			$z = event_store_event($ev);
 			if ($z) {
diff --git a/include/feedutils.php b/include/feedutils.php
index 504f65092..644e205a6 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -487,7 +487,7 @@ function get_atom_elements($feed, $item) {
 		}
 	}
 
-	$ostatus_protocol = (($ostatus_conversation) ? true : false);
+	$ostatus_protocol = (($ostatus_conversation || $res['verb']) ? true : false);
 
 	$mastodon = (($item->get_item_tags('http://mastodon.social/schema/1.0','scope')) ? true : false);
 	if($mastodon) {
@@ -496,6 +496,8 @@ function get_atom_elements($feed, $item) {
 			$res['item_private'] = 1;
 	}
 
+	logger('ostatus_protocol: ' . intval($ostatus_protocol));
+
 	$apps = $item->get_item_tags(NAMESPACE_STATUSNET, 'notice_info');
 	if($apps && $apps[0]['attribs']['']['source']) {
 		$res['app'] = strip_tags(unxmlify($apps[0]['attribs']['']['source']));
@@ -599,9 +601,8 @@ function get_atom_elements($feed, $item) {
 		);
 	}
 
-	// turn Mastodon content warning into a #nsfw hashtag
-	if($mastodon && $summary) {
-		$res['body'] = $summary . "\n\n" . $res['body'] . "\n\n#ContentWarning\n";
+	if($summary && $res['body']) {
+		$res['body'] = '[summary]' . $summary . '[/summary]' . $res['body'];
 	}
 
 
@@ -802,7 +803,7 @@ function get_atom_elements($feed, $item) {
 	 */
 	call_hooks('parse_atom', $arr);
 
-	logger('result: ' .print_r($arr['result'], true), LOGGER_DATA);
+	logger('result: ' . print_r($arr['result'], true), LOGGER_DATA);
 
 	return $arr['result'];
 }
@@ -1001,9 +1002,9 @@ function process_feed_tombstones($feed,$importer,$contact,$pass) {
  * @param string $xml
  *   The (atom) feed to consume - RSS isn't as fully supported but may work for simple feeds.
  * @param array $importer
- *   The contact_record (joined to user_record) of the local user who owns this
+ *   The channel record of the local user who owns this
  *   relationship. It is this person's stuff that is going to be updated.
- * @param[in,out] array $contact
+ * @param[in,out] array $contact (abook record joined to xchan record)
  *   The person who is sending us stuff. If not set, we MAY be processing a "follow" activity
  *   from an external network and MAY create an appropriate contact record. Otherwise, we MUST
  *   have a contact record.
diff --git a/library/Mobile_Detect/Mobile_Detect.php b/library/Mobile_Detect/Mobile_Detect.php
deleted file mode 100644
index 4b8c9fecb..000000000
--- a/library/Mobile_Detect/Mobile_Detect.php
+++ /dev/null
@@ -1,221 +0,0 @@
-<?php
-/**
- * Mobile Detect
- * $Id: Mobile_Detect.php 49 2012-06-06 20:46:30Z serbanghita@gmail.com $
- * 
- * @usage      require_once 'Mobile_Detect.php';
- *             $detect = new Mobile_Detect();
- *             $detect->isMobile() or $detect->isTablet()
- * 
- *             For more specific usage see the documentation navigate to:
- *             http://code.google.com/p/php-mobile-detect/wiki/Mobile_Detect
- * 
- * @license    http://www.opensource.org/licenses/mit-license.php The MIT License
- */
-
-class Mobile_Detect {
-    
-    protected $detectionRules;
-    protected $userAgent = null;
-    protected $accept = null;
-    // Assume the visitor has a desktop environment.
-    protected $isMobile = false;
-    protected $isTablet = false;
-    protected $phoneDeviceName = null;
-    protected $tabletDevicename = null;
-    protected $operatingSystemName = null;
-    protected $userAgentName = null;
-    // List of mobile devices (phones)
-    protected $phoneDevices = array(     
-            'iPhone'        => '(iPhone.*Mobile|iPod|iTunes)',
-            'BlackBerry'    => 'BlackBerry|rim[0-9]+',
-            'HTC'           => 'HTC|HTC.*(6800|8100|8900|A7272|S510e|C110e|Legend|Desire|T8282)|APX515CKT|Qtek9090|APA9292KT',
-            'Nexus'         => 'Nexus One|Nexus S|Galaxy.*Nexus|Android.*Nexus',
-            'Dell'          => 'Dell.*Streak|Dell.*Aero|Dell.*Venue|DELL.*Venue Pro|Dell Flash|Dell Smoke|Dell Mini 3iX|XCD28|XCD35',
-            'Motorola'      => '\bDroid\b.*Build|DROIDX|HRI39|MOT\-|A1260|A1680|A555|A853|A855|A953|A955|A956|Motorola.*ELECTRIFY|Motorola.*i1|i867|i940|MB200|MB300|MB501|MB502|MB508|MB511|MB520|MB525|MB526|MB611|MB612|MB632|MB810|MB855|MB860|MB861|MB865|MB870|ME501|ME502|ME511|ME525|ME600|ME632|ME722|ME811|ME860|ME863|ME865|MT620|MT710|MT716|MT720|MT810|MT870|MT917|Motorola.*TITANIUM|WX435|WX445|XT300|XT301|XT311|XT316|XT317|XT319|XT320|XT390|XT502|XT530|XT531|XT532|XT535|XT603|XT610|XT611|XT615|XT681|XT701|XT702|XT711|XT720|XT800|XT806|XT860|XT862|XT875|XT882|XT883|XT894|XT909|XT910|XT912|XT928',
-            'Samsung'       => 'Samsung|BGT-S5230|GT-B2100|GT-B2700|GT-B2710|GT-B3210|GT-B3310|GT-B3410|GT-B3730|GT-B3740|GT-B5510|GT-B5512|GT-B5722|GT-B6520|GT-B7300|GT-B7320|GT-B7330|GT-B7350|GT-B7510|GT-B7722|GT-B7800|GT-C3010|GT-C3011|GT-C3060|GT-C3200|GT-C3212|GT-C3212I|GT-C3222|GT-C3300|GT-C3300K|GT-C3303|GT-C3303K|GT-C3310|GT-C3322|GT-C3330|GT-C3350|GT-C3500|GT-C3510|GT-C3530|GT-C3630|GT-C3780|GT-C5010|GT-C5212|GT-C6620|GT-C6625|GT-C6712|GT-E1050|GT-E1070|GT-E1075|GT-E1080|GT-E1081|GT-E1085|GT-E1087|GT-E1100|GT-E1107|GT-E1110|GT-E1120|GT-E1125|GT-E1130|GT-E1160|GT-E1170|GT-E1175|GT-E1180|GT-E1182|GT-E1200|GT-E1210|GT-E1225|GT-E1230|GT-E1390|GT-E2100|GT-E2120|GT-E2121|GT-E2152|GT-E2220|GT-E2222|GT-E2230|GT-E2232|GT-E2250|GT-E2370|GT-E2550|GT-E2652|GT-E3210|GT-E3213|GT-I5500|GT-I5503|GT-I5700|GT-I5800|GT-I5801|GT-I6410|GT-I6420|GT-I7110|GT-I7410|GT-I7500|GT-I8000|GT-I8150|GT-I8160|GT-I8320|GT-I8330|GT-I8350|GT-I8530|GT-I8700|GT-I8703|GT-I8910|GT-I9000|GT-I9001|GT-I9003|GT-I9010|GT-I9020|GT-I9023|GT-I9070|GT-I9100|GT-I9103|GT-I9220|GT-I9250|GT-I9300|GT-I9300 |GT-M3510|GT-M5650|GT-M7500|GT-M7600|GT-M7603|GT-M8800|GT-M8910|GT-N7000|GT-P6810|GT-P7100|GT-S3110|GT-S3310|GT-S3350|GT-S3353|GT-S3370|GT-S3650|GT-S3653|GT-S3770|GT-S3850|GT-S5210|GT-S5220|GT-S5229|GT-S5230|GT-S5233|GT-S5250|GT-S5253|GT-S5260|GT-S5263|GT-S5270|GT-S5300|GT-S5330|GT-S5350|GT-S5360|GT-S5363|GT-S5369|GT-S5380|GT-S5380D|GT-S5560|GT-S5570|GT-S5600|GT-S5603|GT-S5610|GT-S5620|GT-S5660|GT-S5670|GT-S5690|GT-S5750|GT-S5780|GT-S5830|GT-S5839|GT-S6102|GT-S6500|GT-S7070|GT-S7200|GT-S7220|GT-S7230|GT-S7233|GT-S7250|GT-S7500|GT-S7530|GT-S7550|GT-S8000|GT-S8003|GT-S8500|GT-S8530|GT-S8600|SCH-A310|SCH-A530|SCH-A570|SCH-A610|SCH-A630|SCH-A650|SCH-A790|SCH-A795|SCH-A850|SCH-A870|SCH-A890|SCH-A930|SCH-A950|SCH-A970|SCH-A990|SCH-I100|SCH-I110|SCH-I400|SCH-I405|SCH-I500|SCH-I510|SCH-I515|SCH-I600|SCH-I730|SCH-I760|SCH-I770|SCH-I830|SCH-I910|SCH-I920|SCH-LC11|SCH-N150|SCH-N300|SCH-R100|SCH-R300|SCH-R351|SCH-R400|SCH-R410|SCH-T300|SCH-U310|SCH-U320|SCH-U350|SCH-U360|SCH-U365|SCH-U370|SCH-U380|SCH-U410|SCH-U430|SCH-U450|SCH-U460|SCH-U470|SCH-U490|SCH-U540|SCH-U550|SCH-U620|SCH-U640|SCH-U650|SCH-U660|SCH-U700|SCH-U740|SCH-U750|SCH-U810|SCH-U820|SCH-U900|SCH-U940|SCH-U960|SCS-26UC|SGH-A107|SGH-A117|SGH-A127|SGH-A137|SGH-A157|SGH-A167|SGH-A177|SGH-A187|SGH-A197|SGH-A227|SGH-A237|SGH-A257|SGH-A437|SGH-A517|SGH-A597|SGH-A637|SGH-A657|SGH-A667|SGH-A687|SGH-A697|SGH-A707|SGH-A717|SGH-A727|SGH-A737|SGH-A747|SGH-A767|SGH-A777|SGH-A797|SGH-A817|SGH-A827|SGH-A837|SGH-A847|SGH-A867|SGH-A877|SGH-A887|SGH-A897|SGH-A927|SGH-B100|SGH-B130|SGH-B200|SGH-B220|SGH-C100|SGH-C110|SGH-C120|SGH-C130|SGH-C140|SGH-C160|SGH-C170|SGH-C180|SGH-C200|SGH-C207|SGH-C210|SGH-C225|SGH-C230|SGH-C417|SGH-C450|SGH-D307|SGH-D347|SGH-D357|SGH-D407|SGH-D415|SGH-D780|SGH-D807|SGH-D980|SGH-E105|SGH-E200|SGH-E315|SGH-E316|SGH-E317|SGH-E335|SGH-E590|SGH-E635|SGH-E715|SGH-E890|SGH-F300|SGH-F480|SGH-I200|SGH-I300|SGH-I320|SGH-I550|SGH-I577|SGH-I600|SGH-I607|SGH-I617|SGH-I627|SGH-I637|SGH-I677|SGH-I700|SGH-I717|SGH-I727|SGH-I777|SGH-I780|SGH-I827|SGH-I847|SGH-I857|SGH-I896|SGH-I897|SGH-I900|SGH-I907|SGH-I917|SGH-I927|SGH-I937|SGH-I997|SGH-J150|SGH-J200|SGH-L170|SGH-L700|SGH-M110|SGH-M150|SGH-M200|SGH-N105|SGH-N500|SGH-N600|SGH-N620|SGH-N625|SGH-N700|SGH-N710|SGH-P107|SGH-P207|SGH-P300|SGH-P310|SGH-P520|SGH-P735|SGH-P777|SGH-Q105|SGH-R210|SGH-R220|SGH-R225|SGH-S105|SGH-S307|SGH-T109|SGH-T119|SGH-T139|SGH-T209|SGH-T219|SGH-T229|SGH-T239|SGH-T249|SGH-T259|SGH-T309|SGH-T319|SGH-T329|SGH-T339|SGH-T349|SGH-T359|SGH-T369|SGH-T379|SGH-T409|SGH-T429|SGH-T439|SGH-T459|SGH-T469|SGH-T479|SGH-T499|SGH-T509|SGH-T519|SGH-T539|SGH-T559|SGH-T589|SGH-T609|SGH-T619|SGH-T629|SGH-T639|SGH-T659|SGH-T669|SGH-T679|SGH-T709|SGH-T719|SGH-T729|SGH-T739|SGH-T746|SGH-T749|SGH-T759|SGH-T769|SGH-T809|SGH-T819|SGH-T839|SGH-T919|SGH-T929|SGH-T939|SGH-T959|SGH-T989|SGH-U100|SGH-U200|SGH-U800|SGH-V205|SGH-V206|SGH-X100|SGH-X105|SGH-X120|SGH-X140|SGH-X426|SGH-X427|SGH-X475|SGH-X495|SGH-X497|SGH-X507|SGH-X600|SGH-X610|SGH-X620|SGH-X630|SGH-X700|SGH-X820|SGH-X890|SGH-Z130|SGH-Z150|SGH-Z170|SGH-ZX10|SGH-ZX20|SHW-M110|SPH-A120|SPH-A400|SPH-A420|SPH-A460|SPH-A500|SPH-A560|SPH-A600|SPH-A620|SPH-A660|SPH-A700|SPH-A740|SPH-A760|SPH-A790|SPH-A800|SPH-A820|SPH-A840|SPH-A880|SPH-A900|SPH-A940|SPH-A960|SPH-D600|SPH-D700|SPH-D710|SPH-D720|SPH-I300|SPH-I325|SPH-I330|SPH-I350|SPH-I500|SPH-I600|SPH-I700|SPH-L700|SPH-M100|SPH-M220|SPH-M240|SPH-M300|SPH-M305|SPH-M320|SPH-M330|SPH-M350|SPH-M360|SPH-M370|SPH-M380|SPH-M510|SPH-M540|SPH-M550|SPH-M560|SPH-M570|SPH-M580|SPH-M610|SPH-M620|SPH-M630|SPH-M800|SPH-M810|SPH-M850|SPH-M900|SPH-M910|SPH-M920|SPH-M930|SPH-N100|SPH-N200|SPH-N240|SPH-N300|SPH-N400|SPH-Z400|SWC-E100',
-            'Sony'          => 'E10i|SonyEricsson|SonyEricssonLT15iv',
-            'Asus'          => 'Asus.*Galaxy',
-            'Palm'          => 'PalmSource|Palm', // avantgo|blazer|elaine|hiptop|plucker|xiino ; @todo - complete the regex.
-	        'Vertu'         => 'Vertu|Vertu.*Ltd|Vertu.*Ascent|Vertu.*Ayxta|Vertu.*Constellation(F|Quest)?|Vertu.*Monika|Vertu.*Signature', // Just for fun ;)
-            'GenericPhone'  => '(mmp|pocket|psp|symbian|Smartphone|smartfon|treo|up.browser|up.link|vodafone|wap|nokia|Series40|Series60|S60|SonyEricsson|N900|PPC;|MAUI.*WAP.*Browser|LG-P500)'
-    );
-    // List of tablet devices.
-    protected $tabletDevices = array(
-        'BlackBerryTablet'  => 'PlayBook|RIM Tablet',
-        'iPad'              => 'iPad|iPad.*Mobile', // @todo: check for mobile friendly emails topic.
-        'Kindle'            => 'Kindle|Silk.*Accelerated',
-        'SamsungTablet'     => 'SAMSUNG.*Tablet|Galaxy.*Tab|GT-P1000|GT-P1010|GT-P6210|GT-P6800|GT-P6810|GT-P7100|GT-P7300|GT-P7310|GT-P7500|GT-P7510|SCH-I800|SCH-I815|SCH-I905|SGH-I957|SGH-I987|SGH-T849|SGH-T859|SGH-T869|SPH-P100|GT-P1000|GT-P3100|GT-P3110|GT-P5100|GT-P5110|GT-P6200|GT-P7300|GT-P7320|GT-P7500|GT-P7510|GT-P7511',
-        'HTCtablet'         => 'HTC Flyer|HTC Jetstream|HTC-P715a|HTC EVO View 4G|PG41200',
-	    'MotorolaTablet'    => 'xoom|sholest|MZ615|MZ605|MZ505|MZ601|MZ602|MZ603|MZ604|MZ606|MZ607|MZ608|MZ609|MZ615|MZ616|MZ617',
-        'AsusTablet'        => 'Transformer|TF101',
-        'NookTablet'        => 'NookColor|nook browser|BNTV250A|LogicPD Zoom2',
-        'AcerTablet'        => 'Android.*\b(A100|A101|A200|A500|A501|A510|W500|W500P|W501|W501P)\b',
-	    'YarvikTablet'      => 'Android.*(TAB210|TAB211|TAB224|TAB250|TAB260|TAB264|TAB310|TAB360|TAB364|TAB410|TAB411|TAB420|TAB424|TAB450|TAB460|TAB461|TAB464|TAB465|TAB467|TAB468)',
-        'GenericTablet'     => 'Tablet(?!.*PC)|ViewPad7|LG-V909|MID7015|BNTV250A|LogicPD Zoom2|\bA7EB\b|CatNova8|A1_07|CT704|CT1002|\bM721\b',
-    );
-    // List of mobile Operating Systems.
-    protected $operatingSystems = array(
-        'AndroidOS'         => '(android.*mobile|android(?!.*mobile))',
-        'BlackBerryOS'      => '(blackberry|rim tablet os)',
-        'PalmOS'            => '(avantgo|blazer|elaine|hiptop|palm|plucker|xiino)',
-        'SymbianOS'         => 'Symbian|SymbOS|Series60|Series40|\bS60\b',
-        'WindowsMobileOS'   => 'IEMobile|Windows Phone|Windows CE.*(PPC|Smartphone)|MSIEMobile|Window Mobile|XBLWP7',
-        'iOS'               => '(iphone|ipod|ipad)',
-        'FlashLiteOS'       => '',
-        'JavaOS'            => '',
-        'NokiaOS'           => '',
-        'webOS'             => '',
-        'badaOS'            => '\bBada\b',
-        'BREWOS'            => '',
-    );
-    // List of mobile User Agents.
-    protected $userAgents = array(      
-      'Chrome'          => '\bCrMo\b|Chrome\/[.0-9]* Mobile',
-      'Dolfin'          => '\bDolfin\b',
-      'Opera'           => 'Opera.*Mini|Opera.*Mobi|Android.*Opera',
-      'Skyfire'         => 'skyfire',
-      'IE'              => 'IEMobile|MSIEMobile',
-      'Firefox'         => 'fennec|firefox.*maemo|(Mobile|Tablet).*Firefox|Firefox.*Mobile',
-      'Bolt'            => 'bolt',
-      'TeaShark'        => 'teashark',
-      'Blazer'          => 'Blazer',
-      'Safari'          => 'Mobile.*Safari|Safari.*Mobile',
-      'Midori'          => 'midori',
-      'GenericBrowser'  => 'NokiaBrowser|OviBrowser|SEMC.*Browser'
-    );
-    
-    function __construct(){
-        
-        // Merge all rules together.
-        $this->detectionRules = array_merge(
-                                            $this->phoneDevices, 
-                                            $this->tabletDevices, 
-                                            $this->operatingSystems, 
-                                            $this->userAgents
-                                            );
-        $this->userAgent    = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : null;
-        $this->accept       = isset($_SERVER['HTTP_ACCEPT']) ? $_SERVER['HTTP_ACCEPT'] : null;
-        
-        if (
-		isset($_SERVER['HTTP_X_WAP_PROFILE']) ||
-        isset($_SERVER['HTTP_X_WAP_CLIENTID']) ||
-        isset($_SERVER['HTTP_WAP_CONNECTION']) ||
-		isset($_SERVER['HTTP_PROFILE']) ||
-		isset($_SERVER['HTTP_X_OPERAMINI_PHONE_UA']) || // Reported by Nokia devices (eg. C3)
-        isset($_SERVER['HTTP_X_NOKIA_IPADDRESS']) ||
-        isset($_SERVER['HTTP_X_NOKIA_GATEWAY_ID']) ||
-        isset($_SERVER['HTTP_X_ORANGE_ID']) ||
-        isset($_SERVER['HTTP_X_VODAFONE_3GPDPCONTEXT']) ||
-        isset($_SERVER['HTTP_X_HUAWEI_USERID']) ||
-        isset($_SERVER['HTTP_UA_OS']) || // Reported by Windows Smartphones
-        (isset($_SERVER['HTTP_UA_CPU']) && $_SERVER['HTTP_UA_CPU'] == 'ARM') // Seen this on a HTC
-		) {
-                $this->isMobile = true;
-        } elseif (!empty($this->accept) && (strpos($this->accept, 'text/vnd.wap.wml') !== false || strpos($this->accept, 'application/vnd.wap.xhtml+xml') !== false)) {
-                $this->isMobile = true;
-        } else {
-                $this->_detect();
-        }        
-        
-    }
-	
-    public function getRules()
-    {
-        return $this->detectionRules;
-    }
-    
-    /**
-     * Magic overloading method.
-     * 
-     * @method boolean is[...]()
-     * @param string $name
-     * @param array $arguments
-     * @return mixed 
-     */
-    public function __call($name, $arguments)
-    {
-                
-        $key = substr($name, 2);
-        return $this->_detect($key);
-        
-    }
-    
-    /**
-     * Private method that does the detection of the 
-     * mobile devices.
-     * 
-     * @param string $key
-     * @return boolean|null 
-     */
-    private function _detect($key='')
-    {
-
-        if(empty($key)){ 
-
-            // Begin general search.
-            foreach($this->detectionRules as $_regex){
-                if(empty($_regex)){ continue; }
-                if(preg_match('/'.$_regex.'/is', $this->userAgent)){
-                    $this->isMobile = true;
-                    return true;
-                } 
-            }
-            return false;
-
-        } else {
-            
-            // Search for a certain key.
-            // Make the keys lowecase so we can match: isIphone(), isiPhone(), isiphone(), etc.
-            $key = strtolower($key);
-            $_rules = array_change_key_case($this->detectionRules);
-            
-            if(array_key_exists($key, $_rules)){
-                if(empty($_rules[$key])){ return null; }
-                if(preg_match('/'.$_rules[$key].'/is', $this->userAgent)){
-                    $this->isMobile = true;
-                    return true;
-                } else {
-                    return false;
-                }           
-            } else {
-                trigger_error("Method $key is not defined", E_USER_WARNING);
-            }
-            
-            return false;
-
-        }
-
-    }
-        
-    /**
-    * Check if the device is mobile.
-    * Returns true if any type of mobile device detected, including special ones
-    * @return bool
-    */
-    public function isMobile()
-    {
-	    return $this->isMobile;
-    } 
-    
-    /**
-    * Check if the device is a tablet.
-    * Return true if any type of tablet device is detected.
-    * @return boolean 
-    */
-    public function isTablet()
-    {
-
-	foreach($this->tabletDevices as $_regex){
-	    if(preg_match('/'.$_regex.'/is', $this->userAgent)){
-		$this->isTablet = true;
-		return true;
-	    }
-	}
-
-	return false;        
-
-    }
-    
-    
-}
-\ No newline at end of file
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 81c182e1b..d72258fa0 100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -215,7 +215,7 @@
 					<span id="vcard-preview-{{$vcard.id}}" class="vcard-preview">
 						{{if $vcard.fn}}<span class="vcard-fn-preview">{{$vcard.fn}}</span>{{/if}}
 						{{if $vcard.emails.0.address}}<span class="vcard-email-preview d-none d-md-table-cell"><a href="mailto:{{$vcard.emails.0.address}}">{{$vcard.emails.0.address}}</a></span>{{/if}}
-						{{if $vcard.tels.0}}<span class="vcard-tel-preview d-none d-md-table-cell">{{$vcard.tels.0.nr}}{{if $is_mobile}} <a class="btn btn-outline-secondary btn-sm" href="tel:{{$vcard.tels.0.nr}}"><i class="fa fa-phone connphone"></i></a>{{/if}}</span>{{/if}}
+						{{if $vcard.tels.0}}<span class="vcard-tel-preview d-none d-md-table-cell">{{$vcard.tels.0.nr}} <a class="btn btn-outline-secondary btn-sm" href="tel:{{$vcard.tels.0.nr}}"><i class="fa fa-phone connphone"></i></a></span>{{/if}}
 					</span>
 					<input id="vcard-fn-{{$vcard.id}}" class="vcard-fn" type="text" name="fn" value="{{$vcard.fn}}" size="{{$vcard.fn|count_characters:true}}" placeholder="{{$name_label}}">
 				</div>
diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl
index d1e6e0609..b0751eb5f 100755
--- a/view/tpl/settings_display.tpl
+++ b/view/tpl/settings_display.tpl
@@ -6,7 +6,7 @@
 		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 
 		<div class="panel-group" id="settings" role="tablist" aria-multiselectable="true">
-			{{if $theme || $mobile_theme}}
+			{{if $theme}}
 			<div class="panel">
 				<div class="section-subtitle-wrapper" role="tab" id="theme-settings-title">
 					<h3>
@@ -23,9 +23,6 @@
 						{{if $schema}}
 							{{include file="field_select.tpl" field=$schema}}
 						{{/if}}
-						{{if $mobile_theme}}
-							{{include file="field_themeselect.tpl" field=$mobile_theme}}
-						{{/if}}
 						<div class="settings-submit-wrapper" >
 							<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
 						</div>
@@ -41,7 +38,7 @@
 						</a>
 					</h3>
 				</div>
-				<div id="custom-settings-content" class="collapse{{if !$theme && !$mobile_theme}} in{{/if}}" role="tabpanel" aria-labelledby="custom-settings">
+				<div id="custom-settings-content" class="collapse{{if !$theme}} in{{/if}}" role="tabpanel" aria-labelledby="custom-settings">
 					<div class="section-content-tools-wrapper">
 						{{if $theme_config}}
 							{{$theme_config}}
@@ -57,7 +54,7 @@
 						</a>
 					</h3>
 				</div>
-				<div id="content-settings-content" class="collapse{{if !$theme && !$mobile_theme && !$theme_config}} in{{/if}}" role="tabpanel" aria-labelledby="content-settings">
+				<div id="content-settings-content" class="collapse{{if !$theme && !$theme_config}} in{{/if}}" role="tabpanel" aria-labelledby="content-settings">
 					<div class="section-content-wrapper">
 						{{include file="field_input.tpl" field=$ajaxint}}
 						{{include file="field_input.tpl" field=$itemspage}}