Merge remote-tracking branch 'main/master'

18 files changed, 149 insertions, 45 deletions

diff --git a/mod/admin.php b/mod/admin.php
index a64b26903..53b5ee354 100755
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -583,6 +583,7 @@ function admin_page_plugins(&$a){
 		
 			'$admin_form' => $admin_form,
 			'$function' => 'plugins',
+			'$screenshot' => '',
 			'$readme' => $readme
 		));
 	} 
@@ -738,7 +739,11 @@ function admin_page_themes(&$a){
 		} 
 		
 		$admin_form="";
-		
+
+		$screenshot = array( get_theme_screenshot($theme), t('Screenshot'));
+		if(! stristr($screenshot[0],$theme))
+			$screenshot = null;		
+
 		$t = get_markup_template("admin_plugins_details.tpl");
 		return replace_macros($t, array(
 			'$title' => t('Administration'),
@@ -755,6 +760,7 @@ function admin_page_themes(&$a){
 			'$admin_form' => $admin_form,
 			'$str_author' => t('Author: '),
 			'$str_maintainer' => t('Maintainer: '),			
+			'$screenshot' => $screenshot,
 			'$readme' => $readme
 		));
 	} 
diff --git a/mod/community.php b/mod/community.php
index a98999942..f8cc3305b 100755
--- a/mod/community.php
+++ b/mod/community.php
@@ -41,15 +41,16 @@ function community_content(&$a, $update = 0) {
 
 
 	// Here is the way permissions work in this module...
-	// Only public wall posts can be shown
+	// Only public posts can be shown
 	// OR your own posts if you are a logged in member
 
 
 	$r = q("SELECT COUNT(*) AS `total`
 		FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
 		WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
-		AND `wall` = 1 AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' 
-		AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND `user`.`hidewall` = 0 
+		AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' 
+		AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' 
+		AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0 
 		AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 "
 	);
 
@@ -69,8 +70,9 @@ function community_content(&$a, $update = 0) {
 		FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
 		LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
 		WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
-		AND `wall` = 1 AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' 
-		AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND `user`.`hidewall` = 0 
+		AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' 
+		AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' 
+		AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0 
 		AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
 		ORDER BY `received` DESC LIMIT %d, %d ",
 		intval($a->pager['start']),
diff --git a/mod/contacts.php b/mod/contacts.php
index 78c8d4092..8aa51d00a 100755
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -396,6 +396,11 @@ function contacts_content(&$a) {
 
 	$tabs = array(
 		array(
+			'label' => t('Suggestions'),
+			'url'   => $a->get_baseurl(true) . '/suggest', 
+			'sel'   => '',
+		),
+		array(
 			'label' => t('All Contacts'),
 			'url'   => $a->get_baseurl(true) . '/contacts/all', 
 			'sel'   => ($all) ? 'active' : '',
diff --git a/mod/delegate.php b/mod/delegate.php
index c19df0681..8c5031859 100644
--- a/mod/delegate.php
+++ b/mod/delegate.php
@@ -86,7 +86,7 @@ function delegate_content(&$a) {
 
 	$r = q("select nurl from contact where substring_index(contact.nurl,'/',3) = '%s' 
 		and contact.uid = %d and contact.self = 0 and network = '%s' ",
-		dbesc($a->get_baseurl()),
+		dbesc(normalise_link($a->get_baseurl())),
 		intval(local_user()),
 		dbesc(NETWORK_DFRN)
 	); 
diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 2f4fb7045..efb5be3a4 100644
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -655,7 +655,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 		if(count($r))
 			$photo = $r[0]['photo'];
 		else
-			$photo = $a->get_baseurl() . '/images/default-profile.jpg';
+			$photo = $a->get_baseurl() . '/images/person-175.jpg';
 				
 		require_once("Photo.php");
 
diff --git a/mod/editpost.php b/mod/editpost.php
index 778ac3dcc..2ddba36aa 100755
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -104,7 +104,7 @@ function editpost_content(&$a) {
 		'$wait' => t('Please wait'),
 		'$permset' => t('Permission settings'),
 		'$ptyp' => $itm[0]['type'],
-		'$content' => $itm[0]['body'],
+		'$content' => undo_post_tagging($itm[0]['body']),
 		'$post_id' => $post_id,
 		'$baseurl' => $a->get_baseurl(),
 		'$defloc' => $a->user['default-location'],
diff --git a/mod/friendica.php b/mod/friendica.php
index ab92e31ed..d5dad9448 100755
--- a/mod/friendica.php
+++ b/mod/friendica.php
@@ -51,15 +51,20 @@ function friendica_content(&$a) {
 	$o .= '<p></p>';
 
 	if(count($a->plugins)) {
-		$o .= '<p>' . t('Installed plugins/addons/apps') . '</p>';
-		$o .= '<ul>';
-		foreach($a->plugins as $p)
-			if(strlen($p))
-				$o .= '<li>' . $p . '</li>';
-		$o .= '</ul>';
+		$o .= '<p>' . t('Installed plugins/addons/apps:') . '</p>';
+		$sorted = $a->plugins;
+		$s = '';
+		sort($sorted);
+		foreach($sorted as $p) {
+			if(strlen($p)) {
+				if(strlen($s)) $s .= ', ';
+				$s .= $p;
+			}
+		}
+		$o .= '<div style="margin-left: 25px; margin-right: 25px;">' . $s . '</div>';
 	}
 	else
-		$o .= '<p>' . t('No installed plugins/addons/apps');
+		$o .= '<p>' . t('No installed plugins/addons/apps') . '</p>';
 
 	call_hooks('about_hook', $o); 	
 
diff --git a/mod/invite.php b/mod/invite.php
index d4eb9c5ef..2dbf93c59 100755
--- a/mod/invite.php
+++ b/mod/invite.php
@@ -56,7 +56,7 @@ function invite_post(&$a) {
 		else
 			$nmessage = $message;
 
-		$res = mail($recip, sprintf( t('Please join my network on %s'), $a->config['sitename']), 
+		$res = mail($recip, sprintf( t('Please join us on Friendica'), $a->config['sitename']), 
 			$nmessage, 
 			"From: " . $a->user['email'] . "\n"
 			. 'Content-type: text/plain; charset=UTF-8' . "\n"
@@ -94,15 +94,28 @@ function invite_content(&$a) {
 		}
 	}			
 
+	$dirloc = get_config('system','directory_submit_url');
+	if(strlen($dirloc)) {
+		if($a->config['register_policy'] == REGISTER_CLOSED)
+			$linktxt = sprintf( t('Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks.'), dirname($dirloc) . '/siteinfo');
+		elseif($a->config['register_policy'] != REGISTER_CLOSED)
+			$linktxt = sprintf( t('To accept this invitation, please visit and register at %s or any other public Friendica website.'), $a->get_baseurl())
+			. "\r\n" . "\r\n" . sprintf( t('Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites you can join.'),dirname($dirloc) . '/siteinfo');
+	}
+	else {
+		$o = t('Our apologies. This system is not currently configured to connect with other public sites or invite members.');
+		return $o;
+	}
 
 	$o = replace_macros($tpl, array(
 		'$invite' => t('Send invitations'),
 		'$addr_text' => t('Enter email addresses, one per line:'),
 		'$msg_text' => t('Your message:'),
-		'$default_message' => sprintf(t('Please join my social network on %s'), $a->config['sitename']) . "\r\n" . "\r\n"
-			. t('To accept this invitation, please visit:') . "\r\n" . "\r\n" . $a->get_baseurl()
+		'$default_message' => t('You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web.') . "\r\n" . "\r\n"
+			. $linktxt
 			. "\r\n" . "\r\n" . (($invonly) ? t('You will need to supply this invitation code: $invite_code') . "\r\n" . "\r\n" : '') .t('Once you have registered, please connect with me via my profile page at:') 
-			. "\r\n" . "\r\n" . $a->get_baseurl() . '/profile/' . $a->user['nickname'] ,
+			. "\r\n" . "\r\n" . $a->get_baseurl() . '/profile/' . $a->user['nickname']
+			. "\r\n" . "\r\n" . t('For more information about the Friendica project and why we feel it is important, please visit http://friendica.com') . "\r\n" . "\r\n"  ,
 		'$submit' => t('Submit')
 	));
 
diff --git a/mod/item.php b/mod/item.php
index fe570075f..5baae2bde 100755
--- a/mod/item.php
+++ b/mod/item.php
@@ -177,10 +177,11 @@ function item_post(&$a) {
 		$verb              = $orig_post['verb'];
 		$emailcc           = $orig_post['emailcc'];
 		$app			   = $orig_post['app'];
-
+		$categories        = $orig_post['file'];
 		$body              = escape_tags(trim($_REQUEST['body']));
 		$private           = $orig_post['private'];
 		$pubmail_enable    = $orig_post['pubmail'];
+
 	}
 	else {
 
@@ -213,8 +214,10 @@ function item_post(&$a) {
 		$coord             = notags(trim($_REQUEST['coord']));
 		$verb              = notags(trim($_REQUEST['verb']));
 		$emailcc           = notags(trim($_REQUEST['emailcc']));
-
 		$body              = escape_tags(trim($_REQUEST['body']));
+
+		// $categories = TODO
+
 		$private = ((strlen($str_group_allow) || strlen($str_contact_allow) || strlen($str_group_deny) || strlen($str_contact_deny)) ? 1 : 0);
 
 		if(($parent_item) && 
@@ -242,7 +245,6 @@ function item_post(&$a) {
 			}
 		}
 
-
 		if(! strlen($body)) {
 			if($preview)
 				killme();
@@ -253,6 +255,15 @@ function item_post(&$a) {
 		}
 	}
 
+	// Work around doubled linefeeds in Tinymce 3.5b2
+	// First figure out if it's a status post that would've been
+	// created using tinymce. Otherwise leave it alone. 
+
+	$plaintext = (local_user() ? intval(get_pconfig(local_user(),'system','plaintext')) : 0);
+	if((! $parent) && (! $api_source) && (! $plaintext)) {
+		$body = str_replace("\r\n","\n",$body);
+		$body = str_replace("\n\n","\n",$body);
+	}
 
 
 	// get contact info for poster
@@ -490,6 +501,7 @@ function item_post(&$a) {
 	$datarray['location']      = $location;
 	$datarray['coord']         = $coord;
 	$datarray['tag']           = $str_tags;
+	$datarray['file']          = $categories;
 	$datarray['inform']        = $inform;
 	$datarray['verb']          = $verb;
 	$datarray['allow_cid']     = $str_contact_allow;
@@ -549,9 +561,12 @@ function item_post(&$a) {
 
 
 	if($orig_post) {
-		$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `edited` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1",
-			dbesc($title),
-			dbesc($body),
+		$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `attach` = '%s', `file` = '%s', `edited` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1",
+			dbesc($datarray['title']),
+			dbesc($datarray['body']),
+			dbesc($datarray['tag']),
+			dbesc($datarray['attach']),
+			dbesc($datarray['file']),
 			dbesc(datetime_convert()),
 			intval($post_id),
 			intval($profile_uid)
@@ -609,7 +624,7 @@ function item_post(&$a) {
 		dbesc($datarray['attach']),
 		intval($datarray['bookmark']),
 		intval($datarray['origin']),
-		intval($datarry['moderated'])
+		intval($datarray['moderated'])
 	);
 
 	$r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' LIMIT 1",
diff --git a/mod/lostpass.php b/mod/lostpass.php
index b71398fa4..57e6d6965 100755
--- a/mod/lostpass.php
+++ b/mod/lostpass.php
@@ -3,13 +3,13 @@
 
 function lostpass_post(&$a) {
 
-	$email = notags(trim($_POST['login-name']));
-	if(! $email)
+	$loginame = notags(trim($_POST['login-name']));
+	if(! $loginame)
 		goaway(z_root());
 
 	$r = q("SELECT * FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' ) AND `verified` = 1 AND `blocked` = 0 LIMIT 1",
-		dbesc($email),
-		dbesc($email)
+		dbesc($loginame),
+		dbesc($loginame)
 	);
 
 	if(! count($r)) {
@@ -19,6 +19,7 @@ function lostpass_post(&$a) {
 
 	$uid = $r[0]['uid'];
 	$username = $r[0]['username'];
+	$email = $r[0]['email'];
 
 	$new_password = autoname(12) . mt_rand(100,9999);
 	$new_password_encoded = hash('whirlpool',$new_password);
diff --git a/mod/network.php b/mod/network.php
index 9ec8c23b5..5ca0a8c7d 100755
--- a/mod/network.php
+++ b/mod/network.php
@@ -250,6 +250,20 @@ function network_content(&$a, $update = 0) {
 	if($cid)
 		$def_acl = array('allow_cid' => '<' . intval($cid) . '>');
 
+	if($nets) {
+		$r = q("select id from contact where uid = %d and network = '%s' and self = 0",
+			intval(local_user()),
+			dbesc($nets)
+		);
+
+		$str = '';
+		if(count($r))
+			foreach($r as $rr)
+				$str .= '<' . $rr['id'] . '>';
+		if(strlen($str))
+			$def_acl = array('allow_cid' => $str);
+	}
+
 	if(! $update) {
 		if($group) {
 			if(($t = group_public_members($group)) && (! get_pconfig(local_user(),'system','nowarn_insecure'))) {
@@ -269,9 +283,9 @@ function network_content(&$a, $update = 0) {
 			'allow_location' => $a->user['allow_location'],
 			'default_location' => $a->user['default-location'],
 			'nickname' => $a->user['nickname'],
-			'lockstate' => ((($group) || (is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'),
-			'acl' => populate_acl((($group || $cid) ? $def_acl : $a->user), $celeb),
-			'bang' => (($group || $cid) ? '!' : ''),
+			'lockstate' => ((($group) || ($cid) || ($nets) || (is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'),
+			'acl' => populate_acl((($group || $cid || $nets) ? $def_acl : $a->user), $celeb),
+			'bang' => (($group || $cid || $nets) ? '!' : ''),
 			'visitor' => 'block',
 			'profile_uid' => local_user()
 		);
diff --git a/mod/notifications.php b/mod/notifications.php
index d478b5163..ff131010f 100755
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -143,7 +143,7 @@ function notifications_content(&$a) {
 						'$intro_id' => $rr['intro_id'],
 						'$madeby' => sprintf( t('suggested by %s'),$rr['name']),
 						'$contact_id' => $rr['contact-id'],
-						'$photo' => ((x($rr,'fphoto')) ? $rr['fphoto'] : "images/default-profile.jpg"),
+						'$photo' => ((x($rr,'fphoto')) ? $rr['fphoto'] : "images/person-175.jpg"),
 						'$fullname' => $rr['fname'],
 						'$url' => $rr['furl'],
 						'$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''),
@@ -191,7 +191,7 @@ function notifications_content(&$a) {
 					'$uid' => $_SESSION['uid'],
 					'$intro_id' => $rr['intro_id'],
 					'$contact_id' => $rr['contact-id'],
-					'$photo' => ((x($rr,'photo')) ? $rr['photo'] : "images/default-profile.jpg"),
+					'$photo' => ((x($rr,'photo')) ? $rr['photo'] : "images/person-175.jpg"),
 					'$fullname' => $rr['name'],
 					'$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''),
 					'$activity' => array('activity', t('Post a new friend activity'), 1, t('if applicable')),
diff --git a/mod/photo.php b/mod/photo.php
index c4a93769a..3a7025120 100755
--- a/mod/photo.php
+++ b/mod/photo.php
@@ -23,7 +23,7 @@ function photo_init(&$a) {
 			// NOTREACHED
 	}
 
-	$default = 'images/default-profile.jpg';
+	$default = 'images/person-175.jpg';
 
 	if(isset($type)) {
 
@@ -39,12 +39,12 @@ function photo_init(&$a) {
 				break;
 			case 'micro':
 				$resolution = 6;
-				$default = 'images/default-profile-mm.jpg';
+				$default = 'images/person-48.jpg';
 				break;
 			case 'avatar':
 			default:
 				$resolution = 5;
-				$default = 'images/default-profile-sm.jpg';
+				$default = 'images/person-80.jpg';
 				break;
 		}
 
@@ -115,8 +115,24 @@ function photo_init(&$a) {
 	}
 
 	if(! isset($data)) {
-		killme();
-		// NOTREACHED
+		if(isset($resolution)) {
+			switch($resolution) {
+
+				case 4:
+					$data = file_get_contents('images/person-175.jpg');
+					break;
+				case 5:
+					$data = file_get_contents('images/person-80.jpg');
+					break;
+				case 6:
+					$data = file_get_contents('images/person-48.jpg');
+					break;
+				default:
+					killme();
+					// NOTREACHED
+					break;
+			}
+		}
 	}
 
 	if(isset($customres) && $customres > 0 && $customres < 500) {
diff --git a/mod/pretheme.php b/mod/pretheme.php
new file mode 100644
index 000000000..5a71bbe53
--- /dev/null
+++ b/mod/pretheme.php
@@ -0,0 +1,6 @@
+<?php
+
+function pretheme_init(&$a) {
+	if($_REQUEST['theme']) echo json_encode(array('img' => get_theme_screenshot($_REQUEST['theme'])));
+	killme();
+}
diff --git a/mod/register.php b/mod/register.php
index 388b3e250..6d0e2700b 100755
--- a/mod/register.php
+++ b/mod/register.php
@@ -150,6 +150,16 @@ function register_post(&$a) {
 	if(count($r))
 		$err .= t('Nickname is already registered. Please choose another.') . EOL;
 
+	// Check deleted accounts that had this nickname. Doesn't matter to us,
+	// but could be a security issue for federated platforms.
+
+	$r = q("SELECT * FROM `userd`
+               	WHERE `username` = '%s' LIMIT 1",
+               	dbesc($nickname)
+	);
+	if(count($r))
+		$err .= t('Nickname was once registered here and may not be re-used. Please choose another.') . EOL;
+
 	if(strlen($err)) {
 		notice( $err );
 		return;
diff --git a/mod/regmod.php b/mod/regmod.php
index 17e728ba2..21f41eb01 100755
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -64,6 +64,11 @@ function user_allow($hash) {
 
 }
 
+
+// This does not have to go through user_remove() and save the nickname
+// permanently against re-registration, as the person was not yet
+// allowed to have friends on this system
+
 function user_deny($hash) {
 
 	$register = q("SELECT * FROM `register` WHERE `hash` = '%s' LIMIT 1",
diff --git a/mod/search.php b/mod/search.php
index 386592ea1..50e7a6abc 100755
--- a/mod/search.php
+++ b/mod/search.php
@@ -93,8 +93,9 @@ function search_content(&$a) {
 		return $o;
 
 	// Here is the way permissions work in the search module...
-	// Only public wall posts can be shown
+	// Only public posts can be shown
 	// OR your own posts if you are a logged in member
+	// No items will be shown if the member has a blocked profile wall. 
 
 	$s_regx  = sprintf("AND ( `item`.`body` REGEXP '%s' OR `item`.`tag` REGEXP '%s' )", 
 		dbesc(preg_quote($search)), dbesc('\\]' . preg_quote($search) . '\\['));
@@ -104,7 +105,7 @@ function search_content(&$a) {
 	$r = q("SELECT COUNT(*) AS `total`
 		FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
 		WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
-		AND (( `wall` = 1 AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND `user`.`hidewall` = 0) 
+		AND (( `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND `item`.`private` = 0 AND `user`.`hidewall` = 0) 
 			OR `item`.`uid` = %d )
 		AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
 		$search_alg ",
@@ -127,7 +128,7 @@ function search_content(&$a) {
 		FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
 		LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
 		WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
-		AND (( `wall` = 1 AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND `item`.`private` = 0 AND `user`.`hidewall` = 0 ) 
+		AND (( `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND `item`.`private` = 0 AND `user`.`hidewall` = 0 ) 
 			OR `item`.`uid` = %d )
 		AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
 		$search_alg
diff --git a/mod/settings.php b/mod/settings.php
index 59ede4729..99bf8842d 100755
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -263,7 +263,7 @@ function settings_post(&$a) {
 	$suggestme        = ((x($_POST,'suggestme')) ? intval($_POST['suggestme'])  : 0);  
 	$hide_friends     = (($_POST['hide-friends'] == 1) ? 1: 0);
 	$hidewall         = (($_POST['hidewall'] == 1) ? 1: 0);
-
+	$nosmile          = ((x($_POST,'nosmile')) ? intval($_POST['nosmile'])  : 0);  
 
 	$notify = 0;
 
@@ -347,6 +347,7 @@ function settings_post(&$a) {
 	set_pconfig(local_user(),'system','suggestme', $suggestme);
 	set_pconfig(local_user(),'system','update_interval', $browser_update);
 	set_pconfig(local_user(),'system','itemspage_network', $itemspage_network);
+	set_pconfig(local_user(),'system','no_smilies',$nosmile);
 
 	$r = q("UPDATE `user` SET `username` = '%s', `email` = '%s', `openid` = '%s', `timezone` = '%s',  `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `notify-flags` = %d, `page-flags` = %d, `default-location` = '%s', `allow_location` = %d, `theme` = '%s', `maxreq` = %d, `expire` = %d, `openidserver` = '%s', `blockwall` = %d, `hidewall` = %d, `blocktags` = %d  WHERE `uid` = %d LIMIT 1",
 			dbesc($username),
@@ -674,6 +675,9 @@ function settings_content(&$a) {
 	$itemspage_network = intval(get_pconfig(local_user(), 'system','itemspage_network'));
 	$itemspage_network = (($itemspage_network > 0 && $itemspage_network < 101) ? $itemspage_network : 40); // default if not set: 40 items
 	
+	$nosmile = get_pconfig(local_user(),'system','no_smilies');
+	$nosmile = (($nosmile===false)? '0': $nosmile); // default if not set: 0
+	
 	if(! strlen($a->user['timezone']))
 		$timezone = date_default_timezone_get();
 
@@ -841,6 +845,7 @@ function settings_content(&$a) {
 		'$theme'	=> array('theme', t('Display Theme:'), $theme_selected, '', $themes),
 		'$ajaxint'   => array('browser_update',  t("Update browser every xx seconds"), $browser_update, t('Minimum of 10 seconds, no maximum')),
 		'$itemspage_network'   => array('itemspage_network',  t("Number of items to display on the network page:"), $itemspage_network, t('Maximum of 100 items')),
+		'$nosmile'	=> array('nosmile', t("Don't show emoticons"), $nosmile, ''),
 
 		'$h_prv' 	=> t('Security and Privacy Settings'),