Merge branch 'master' of https://github.com/friendica/red

doc/install/sample-nginx.conf

@@ -59,6 +59,8 @@ server {
   ssl_ciphers ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv3:+EXP;
   ssl_prefer_server_ciphers on;
 
+  fastcgi_param HTTPS on;
+
   index index.php;
   charset utf-8;
   root /var/www/red;

include/text.php

@@ -705,12 +705,22 @@ function contact_block() {
 	if($shown == 0)
 		return;
 
+
+	$is_owner = ((local_user() && local_user() == $a->profile['uid']) ? true : false);
+
+	$abook_flags = ABOOK_FLAG_PENDING|ABOOK_FLAG_SELF;
+	$xchan_flags = XCHAN_FLAGS_ORPHAN|XCHAN_FLAGS_DELETED;
+	if(! $is_owner) {
+		$abook_flags = $abook_flags | ABOOK_FLAGS_HIDDEN;
+		$xchan_flags = $xchan_flags | XCHAN_FLAGS_HIDDEN;
+	}
+
 	if((! is_array($a->profile)) || ($a->profile['hide_friends']))
 		return $o;
 	$r = q("SELECT COUNT(abook_id) AS total FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d and not ( abook_flags & %d ) and not (xchan_flags & %d)",
 			intval($a->profile['uid']),
-			intval(ABOOK_FLAG_HIDDEN|ABOOK_FLAG_PENDING|ABOOK_FLAG_SELF),
+			intval($abook_flags),
-			intval(XCHAN_FLAGS_HIDDEN|XCHAN_FLAGS_ORPHAN|XCHAN_FLAGS_DELETED)
+			intval($xchan_flags)
 	);
 	if(count($r)) {
 		$total = intval($r[0]['total']);
@@ -723,8 +733,8 @@ function contact_block() {
 
 		$r = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash WHERE abook_channel = %d AND not ( abook_flags & %d) and not (xchan_flags & %d ) ORDER BY RAND() LIMIT %d",
 				intval($a->profile['uid']),
-				intval(ABOOK_FLAG_HIDDEN|ABOOK_FLAG_PENDING|ABOOK_FLAG_SELF),
+				intval($abook_flags),
-				intval(XCHAN_FLAGS_HIDDEN|XCHAN_FLAGS_ORPHAN|XCHAN_FLAGS_DELETED),
+				intval($xchan_flags),
 				intval($shown)
 		);
 

index.php

@@ -55,6 +55,17 @@ if(! $a->install) {
 	call_hooks('init_1');
 	
 	load_translation_table($a->language);
+	// Force the cookie to be secure (https only) if this site is SSL enabled. Must be done before session_start().
+
+	if(intval($a->config['system']['ssl_cookie_protection'])) {
+		$arr = session_get_cookie_params();
+		session_set_cookie_params(
+			((isset($arr['lifetime']))  ? $arr['lifetime'] : 60*5),
+			((isset($arr['path']))      ? $arr['path']     : '/'),
+			((isset($arr['domain']))    ? $arr['domain']   : $a->get_hostname()),
+			((isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') ? true : false),
+			((isset($arr['httponly']))  ? $arr['httponly'] : true));
+	}
 }
 else {
 	// load translations but do not check plugins as we have no database
@@ -73,15 +84,6 @@ else {
  *
  */
 
-// Force the cookie to be secure (https only) if this site is SSL enabled. Must be done before session_start().
-
-$arr = session_get_cookie_params();
-session_set_cookie_params(
-	((isset($arr['lifetime']))  ? $arr['lifetime'] : 60*5),
-	((isset($arr['path']))      ? $arr['path']     : '/'),
-	((isset($arr['domain']))    ? $arr['domain']   : $a->get_hostname()),
-	((isset($_SERVER['HTTPS'])) ? true             : false),
-	((isset($arr['httponly']))  ? $arr['httponly'] : true));
 session_start();
 
 /**

mod/events.php

@@ -158,8 +158,17 @@ function events_content(&$a) {
 	}
 
 
+		$plaintext = true;
+
+		if(feature_enabled(local_user(),'richtext'))
+			$plaintext = false;
+
+
 	$htpl = get_markup_template('event_head.tpl');
-	$a->page['htmlhead'] .= replace_macros($htpl,array('$baseurl' => $a->get_baseurl()));
+	$a->page['htmlhead'] .= replace_macros($htpl,array(
+		'$baseurl' => $a->get_baseurl(),
+		'$editselect' => (($plaintext) ? 'none' : 'textareas')
+	));
 
 	$o ="";
 	// tabs
@@ -400,7 +409,6 @@ function events_content(&$a) {
 		if($orig_event['event_xchan'])
 			$sh_checked .= ' disabled="disabled" ';
 
-		$tpl = get_markup_template('event_form.tpl');
 
 		$sdt = ((x($orig_event)) ? $orig_event['start'] : 'now');
 		$fdt = ((x($orig_event)) ? $orig_event['finish'] : 'now');
@@ -439,6 +447,7 @@ function events_content(&$a) {
 			'deny_gid' => $channel['channel_deny_gid']
 		); 
 
+		$tpl = get_markup_template('event_form.tpl');
 
 
 		$o .= replace_macros($tpl,array(

mod/viewconnections.php

@@ -28,11 +28,19 @@ function viewconnections_content(&$a) {
 		return;
 	} 
 
+	$is_owner = ((local_user() && local_user() == $a->profile['uid']) ? true : false);
+
+	$abook_flags = ABOOK_FLAG_PENDING|ABOOK_FLAG_SELF;
+	$xchan_flags = XCHAN_FLAGS_ORPHAN|XCHAN_FLAGS_DELETED;
+	if(! $is_owner) {
+		$abook_flags = $abook_flags | ABOOK_FLAGS_HIDDEN;
+		$xchan_flags = $xchan_flags | XCHAN_FLAGS_HIDDEN;
+	}
 
 	$r = q("SELECT count(*) as total FROM abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and not (abook_flags & %d ) and not ( xchan_flags & %d ) ",
 		intval($a->profile['uid']),
-		intval(ABOOK_FLAG_HIDDEN|ABOOK_FLAG_PENDING|ABOOK_FLAG_SELF),
+		intval($abook_flags),
-		intval(XCHAN_FLAGS_HIDDEN|XCHAN_FLAGS_ORPHAN|XCHAN_FLAGS_DELETED)
+		intval($xchan_flags)
 	);
 	if($r) {
 		$a->set_pager_total($r[0]['total']);
@@ -40,8 +48,8 @@ function viewconnections_content(&$a) {
 
 	$r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and not ( abook_flags & %d ) and not ( xchan_flags & %d ) order by xchan_name LIMIT %d , %d ",
 		intval($a->profile['uid']),
-		intval(ABOOK_FLAG_HIDDEN|ABOOK_FLAG_PENDING|ABOOK_FLAG_SELF),
+		intval($abook_flags),
-		intval(XCHAN_FLAGS_HIDDEN|XCHAN_FLAGS_ORPHAN|XCHAN_FLAGS_DELETED),
+		intval($xchan_flags),
 		intval($a->pager['start']),
 		intval($a->pager['itemspage'])
 	);

version.inc

@@ -1 +1 @@
-2014-05-07.668
+2014-05-08.669

view/css/conversation.css

@@ -57,7 +57,7 @@
 /* conversation */
 
 .thread-wrapper.toplevel_item {
-	margin-bottom: 10px;
+	margin-bottom: 20px;
 }
 
 /* conv_item */

view/css/mod_events.css

@@ -0,0 +1,3 @@
+#event-desc-textarea, #event-location-textarea {
+	width: 400px;
+}

view/theme/redbasic/css/style.css

@@ -1911,18 +1911,24 @@ img.mail-list-sender-photo {
 .wall-item-content-wrapper:hover {
 	z-index:99;
 }
-
+/* 
+.comment .wall-item-body {
+padding-left: 42px;
+}
+ */
 .hide-comments-outer,
 .wall-item-content-wrapper.comment {
 	background-color: $comment_item_colour;
-	border-left: 3px solid $comment_border_colour;
+	border-left: 1px solid $comment_border_colour;
+	border-right: 1px solid $comment_border_colour;
+	border-bottom: 1px solid $comment_border_colour;
 	border-radius: 0px;
 	padding: 7px 10px 7px 7px;
 }
 
 .wall-item-comment-wrapper {
 	background-color: $comment_item_colour;
-	border-left: 3px solid $item_colour;
+	border: 1px solid $item_colour;
 	border-radius: 0px;
 	border-bottom-right-radius: $radiuspx;
 	border-bottom-left-radius: $radiuspx;
@@ -2329,6 +2335,7 @@ blockquote {
 
 	.thread-wrapper.toplevel_item {
 		width: 100%;
+		border:1px;
 	}
 
 	.wall-item-photo {

view/tpl/event_form.tpl

@@ -13,14 +13,18 @@
 <div id="event-start-text">{{$s_text}}</div>
 {{$s_dsel}} {{$s_tsel}}
 
+<div class="clear"></div><br />
+
+<input type="checkbox" name="nofinish" value="1" id="event-nofinish-checkbox" {{$n_checked}} /> <div id="event-nofinish-text">{{$n_text}}</div>
+
+<div id="event-nofinish-break"></div>
+
+
 <div id="event-finish-text">{{$f_text}}</div>
 {{$f_dsel}} {{$f_tsel}}
 
 <div id="event-datetime-break"></div>
 
-<input type="checkbox" name="nofinish" value="1" id="event-nofinish-checkbox" {{$n_checked}} /> <div id="event-nofinish-text">{{$n_text}}</div>
-
-<div id="event-nofinish-break"></div>
 
 <input type="checkbox" name="adjust" value="1" id="event-adjust-checkbox" {{$a_checked}} /> <div id="event-adjust-text">{{$a_text}}</div>
 
@@ -36,6 +40,7 @@
 
 <div id="event-location-text">{{$l_text}}</div>
 <textarea id="event-location-textarea" name="location">{{$l_orig}}</textarea>
+<br />
 
 <input type="checkbox" name="share" value="1" id="event-share-checkbox" {{$sh_checked}} /> <div id="event-share-text">{{$sh_text}}</div>
 <div id="event-share-break"></div>

view/tpl/event_head.tpl

@@ -73,7 +73,7 @@
 	});
 </script>
 
-
+{{if $editselect != 'none'}}
 <script language="javascript" type="text/javascript"
           src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
 <script language="javascript" type="text/javascript">
@@ -81,7 +81,7 @@
 
 	tinyMCE.init({
 		theme : "advanced",
-		mode : "textareas",
+		mode : "{{$editselect}}",
 		plugins : "bbcode,paste",
 		theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
 		theme_advanced_buttons2 : "",
@@ -107,6 +107,7 @@
 
 	});
 
+	{{/if}}
 
 	$(document).ready(function() {