Merge remote-tracking branch 'upstream/develop' into rewrites/coding-convention-split2-6-2

Signed-off-by: Roland Häder <roland@mxchange.org>

view/templates/display-head.tpl

@@ -1,4 +1,4 @@
-
+{{if $alternate}}<link href='{{$alternate}}' rel='alternate' type='application/atom+xml'>{{/if}}
 <script>
 $(document).ready(function() {
 	$(".comment-edit-wrapper textarea").editor_autocomplete(baseurl+"/acl");
@@ -6,4 +6,3 @@ $(document).ready(function() {
 	$(".wall-item-comment-wrapper textarea").editor_autocomplete(baseurl+"/acl");
 });
 </script>
-

view/templates/htconfig.tpl

@@ -1,14 +1,16 @@
 <?php
 
 /* ********************************************************************
- *  The following configuration has to be within the .htconfig file
- *  and will not be overruled by decisions made in the admin panel.
- * 
+ *  The following configuration has to be within the .htconfig.php
+ *  file and will not be overruled by decisions made in the admin panel.
+ *
  *  See below for variables that may be overruled by the admin panel.
  * ********************************************************************/
 
 // Set the following for your MySQL installation
-// Copy or rename this file to .htconfig.php
+//
+// If you need to specify a port for reacing the database, you can do so by
+// adding ":portnumber" after "your.mysqlhost.com" in the $db_host config.
 
 $db_host = '{{$dbhost}}';
 $db_user = '{{$dbuser}}';
@@ -43,7 +45,7 @@ $a->config['system']['allowed_link_protocols'] = array('ftp', 'ftps', 'mailto',
  *  Changes made below will only have an effect if the database does
  *  not contain any configuration for the friendica system.
  * *********************************************************************/
- 
+
 // Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
 // It can be changed later and only applies to timestamps for anonymous viewers.
 
@@ -98,7 +100,7 @@ $a->config['system']['no_regfullname'] = true;
 //$a->config['system']['block_local_dir'] = false;
 
 // Location of the global directory
-$a->config['system']['directory'] = 'http://dir.friendi.ca';
+$a->config['system']['directory'] = 'http://dir.friendica.social';
 
 // Authentication cookie lifetime, in days
 $a->config['system']['auth_cookie_lifetime'] = 7;

view/theme/duepuntozero/theme.php

@@ -37,19 +37,11 @@ function insertFormatting(BBcode, id) {
 	if (document.selection) {
 		textarea.focus();
 		selected = document.selection.createRange();
-		if (BBcode == "url") {
-			selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
-		} else {
-			selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
-		}
+		selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
 	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
 		var start = textarea.selectionStart;
 		var end = textarea.selectionEnd;
-		if (BBcode == "url") {
-			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-		} else {
-			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-		}
+		textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
 	}
 
 	return true;

view/theme/frio/README.md

@@ -13,11 +13,11 @@ I conentrated on 3 topics:
 * if you update the theme you should disable and enable the theme again from the admin panel (to apply possible new hooks)
 
 **Note:**
-This theme is marked as experimental. While it is doing its job very well in the most cases there still much work to do to get it marked as stable. So some important templates are still missing and will be added in future versions.
+While Frio is doing its job very well in most cases, there still is some work to do. Some templates are still missing and will be added in future versions.
 
 Some insights into my motivation for starting coding this theme:
 This theme should be the start of a discussion in the friendica community (users and developers) about UI/UX in friendica.
-What frameworks do we want to use? How should default friendica look like? And how do we want to use friendica? What do we need in the core code (At the present time some stuff in this is done with ugly javascript hacks and own php code)?
+What frameworks do we want to use? How should default friendica look like? And how do we want to use friendica? What do we need in the core code (At the present time some stuff this is done with ugly javascript hacks and own php code)?
 
 Coding a theme is much work but you will get a really good insight of the limitations of friendica and can start a discussion about doing things differently.
 So join the discussion at the friendica forums ;-)

view/theme/frio/css/mod_events.css

@@ -22,7 +22,7 @@
 #fc-header-right {
     margin-top: -4px;
 }
-#fc-header-right button {
+#fc-header-right .dropdown > button {
     color: inherit;
 }
 #event-calendar-title {

view/theme/frio/js/mod_display.js

@@ -4,9 +4,8 @@
 
 // Catch the GUID from the URL
 var itemGuid = window.location.pathname.split("/").pop();
-var itemGuidSafe = itemGuid.replace(/%.*/, '');
 
 $(window).load(function(){
 	// Scroll to the Item by its GUID
-	scrollToItem('item-' + itemGuidSafe);
+	scrollToItem('item-' + itemGuid);
 });

view/theme/frio/js/textedit.js

@@ -3,7 +3,7 @@
  */
 
 
-function insertFormatting(BBcode,id) {
+function insertFormatting(BBcode, id) {
 	var tmpStr = $("#comment-edit-text-" + id).val();
 	if (tmpStr == '') {
 		$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
@@ -11,23 +11,15 @@ function insertFormatting(BBcode,id) {
 		openMenu("comment-edit-submit-wrapper-" + id);
 	}
 
-	textarea = document.getElementById("comment-edit-text-" +id);
+	textarea = document.getElementById("comment-edit-text-" + id);
 	if (document.selection) {
 		textarea.focus();
 		selected = document.selection.createRange();
-		if (BBcode == "url") {
-			selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
-		} else {
-			selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
-		}
+		selected.text = "[" + BBcode + "]" + selected.text + "[/" + BBcode + "]";
 	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
 		var start = textarea.selectionStart;
 		var end = textarea.selectionEnd;
-		if (BBcode == "url") {
-			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-		} else {
-			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-		}
+		textarea.value = textarea.value.substring(0, start) + "[" + BBcode + "]" + textarea.value.substring(start, end) + "[/" + BBcode + "]" + textarea.value.substring(end, textarea.value.length);
 	}
 
 	$(textarea).trigger('change');
@@ -62,7 +54,7 @@ function commentExpand(id) {
 	return true;
 }
 
-function commentClose(obj,id) {
+function commentClose(obj, id) {
 	if (obj.value == '') {
 		$("#comment-edit-text-" + id).removeClass("comment-edit-text-full");
 		$("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
@@ -74,10 +66,9 @@ function commentClose(obj,id) {
 }
 
 function showHideCommentBox(id) {
-	if( $('#comment-edit-form-' + id).is(':visible')) {
+	if ($('#comment-edit-form-' + id).is(':visible')) {
 		$('#comment-edit-form-' + id).hide();
-	}
-	else {
+	} else {
 		$('#comment-edit-form-' + id).show();
 	}
 }
@@ -86,8 +77,8 @@ function commentOpenUI(obj, id) {
 	$("#comment-edit-text-" + id).addClass("comment-edit-text-full").removeClass("comment-edit-text-empty");
 	// Choose an arbitrary tab index that's greater than what we're using in jot (3 of them)
 	// The submit button gets tabindex + 1
-	$("#comment-edit-text-" + id).attr('tabindex','9');
-	$("#comment-edit-submit-" + id).attr('tabindex','10');
+	$("#comment-edit-text-" + id).attr('tabindex', '9');
+	$("#comment-edit-submit-" + id).attr('tabindex', '10');
 	$("#comment-edit-submit-wrapper-" + id).show();
 	// initialize autosize for this comment
 	autosize($("#comment-edit-text-" + id + ".text-autosize"));
@@ -120,7 +111,7 @@ function jotTextCloseUI(obj) {
 	}
 }
 
-function commentOpen(obj,id) {
+function commentOpen(obj, id) {
 	if (obj.value == '') {
 		$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
 		$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
@@ -131,7 +122,7 @@ function commentOpen(obj,id) {
 	return false;
 }
 
-function commentInsert(obj,id) {
+function commentInsert(obj, id) {
 	var tmpStr = $("#comment-edit-text-" + id).val();
 	if (tmpStr == '') {
 		$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
@@ -139,14 +130,14 @@ function commentInsert(obj,id) {
 		openMenu("comment-edit-submit-wrapper-" + id);
 	}
 	var ins = $(obj).html();
-	ins = ins.replace('&lt;','<');
-	ins = ins.replace('&gt;','>');
-	ins = ins.replace('&amp;','&');
-	ins = ins.replace('&quot;','"');
+	ins = ins.replace('&lt;', '<');
+	ins = ins.replace('&gt;', '>');
+	ins = ins.replace('&amp;', '&');
+	ins = ins.replace('&quot;', '"');
 	$("#comment-edit-text-" + id).val(tmpStr + ins);
 }
 
-function qCommentInsert(obj,id) {
+function qCommentInsert(obj, id) {
 	var tmpStr = $("#comment-edit-text-" + id).val();
 	if (tmpStr == '') {
 		$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
@@ -154,15 +145,17 @@ function qCommentInsert(obj,id) {
 		openMenu("comment-edit-submit-wrapper-" + id);
 	}
 	var ins = $(obj).val();
-	ins = ins.replace('&lt;','<');
-	ins = ins.replace('&gt;','>');
-	ins = ins.replace('&amp;','&');
-	ins = ins.replace('&quot;','"');
+	ins = ins.replace('&lt;', '<');
+	ins = ins.replace('&gt;', '>');
+	ins = ins.replace('&amp;', '&');
+	ins = ins.replace('&quot;', '"');
 	$("#comment-edit-text-" + id).val(tmpStr + ins);
 	$(obj).val('');
 }
 
-function confirmDelete() { return confirm(aStr.delitem); }
+function confirmDelete() {
+	return confirm(aStr.delitem);
+}
 
 /**
  * Hide and removes an item element from the DOM after the deletion url is

view/theme/frio/php/frio_boot.php

@@ -15,9 +15,9 @@ use Friendica\App;
  * @todo Check if this is really needed.
  */
 function load_page(App $a) {
-	if(isset($_GET["mode"]) AND ($_GET["mode"] == "minimal")) {
+	if(isset($_GET["mode"]) && ($_GET["mode"] == "minimal")) {
 		require "view/theme/frio/minimal.php";
-	} elseif((isset($_GET["mode"]) AND ($_GET["mode"] == "none"))) {
+	} elseif((isset($_GET["mode"]) && ($_GET["mode"] == "none"))) {
 		require "view/theme/frio/none.php";
 	} else {
 		$template = 'view/theme/' . current_theme() . '/'

view/theme/frio/theme.php

@@ -2,7 +2,7 @@
 /*
  * Name: frio
  * Description: Bootstrap V3 theme. The theme is currently under construction, so it is far from finished. For further information have a look at the <a href="https://github.com/friendica/friendica/tree/develop/view/theme/frio/README.md">ReadMe</a>.
- * Version: V.0.7
+ * Version: V.0.8
  * Author: Rabuzarus <https://friendica.kommune4.de/profile/rabuzarus>
  *
  */

view/theme/frost-mobile/js/theme.js

@@ -423,19 +423,11 @@ function insertFormatting(BBcode, id) {
 	if (document.selection) {
 		textarea.focus();
 		selected = document.selection.createRange();
-		if (BBcode == "url") {
-			selected.text = "["+BBcode+"=http://]" +  selected.text + "[/"+BBcode+"]";
-		} else {
-			selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
-		}
+		selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
 	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
 		var start = textarea.selectionStart;
 		var end = textarea.selectionEnd;
-		if (BBcode == "url") {
-			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"=http://]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-		} else {
-			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-		}
+		textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
 	}
 
 	return true;

view/theme/frost/js/theme.js

@@ -603,19 +603,11 @@ function insertFormatting(BBcode, id) {
 	if (document.selection) {
 		textarea.focus();
 		selected = document.selection.createRange();
-		if (BBcode == "url") {
-			selected.text = "["+BBcode+"=http://]" +  selected.text + "[/"+BBcode+"]";
-		} else {
-			selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
-		}
+		selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
 	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
 		var start = textarea.selectionStart;
 		var end = textarea.selectionEnd;
-		if (BBcode == "url") {
-			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"=http://]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-		} else {
-			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-		}
+		textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
 	}
 
 	return true;

view/theme/quattro/js/quattro.js

@@ -71,19 +71,11 @@ function insertFormatting(BBcode, id) {
 	if (document.selection) {
 		textarea.focus();
 		selected = document.selection.createRange();
-		if (BBcode == "url") {
-			selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
-		} else {
-			selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
-		}
+		selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
 	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
 		var start = textarea.selectionStart;
 		var end = textarea.selectionEnd;
-		if (BBcode == "url") {
-			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-		} else {
-			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-		}
+		textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
 	}
 
 	return true;

view/theme/smoothly/templates/bottom.tpl

@@ -20,23 +20,13 @@ function insertFormatting(BBcode, id) {
 	if (document.selection) {
 		textarea.focus();
 		selected = document.selection.createRange();
-		if (BBcode == "url") {
-			selected.text = "["+BBcode+"]" + "http://" + selected.text + "[/"+BBcode+"]";
-		} else {
-			selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
-		}
+		selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
 	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
 		var start = textarea.selectionStart;
 		var end = textarea.selectionEnd;
-		if (BBcode == "url") {
-			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]"
-				+ "http://" + textarea.value.substring(start, end)
-				+ "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-		} else {
-			textarea.value = textarea.value.substring(0, start)
-				+ "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]"
-				+ textarea.value.substring(end, textarea.value.length);
-		}
+		textarea.value = textarea.value.substring(0, start)
+			+ "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]"
+			+ textarea.value.substring(end, textarea.value.length);
 	}
 
 	return true;

view/theme/smoothly/theme.php

@@ -33,19 +33,11 @@ function insertFormatting(BBcode, id) {
 	if (document.selection) {
 		textarea.focus();
 		selected = document.selection.createRange();
-		if (BBcode == "url") {
-			selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
-		} else {
-			selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
-		}
+		selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
 	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
 		var start = textarea.selectionStart;
 		var end = textarea.selectionEnd;
-		if (BBcode == "url") {
-			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-		} else {
-			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-		}
+		textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
 	}
 
 	return true;

view/theme/vier/style.php

@@ -46,7 +46,7 @@ if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) || isset($_SERVER['HTTP_IF_NONE_MA
 	$cached_etag = str_replace(array('"', "-gzip"), array('', ''),
 				stripslashes($_SERVER['HTTP_IF_NONE_MATCH']));
 
-	if (($cached_modified == $modified) AND ($cached_etag == $etag)) {
+	if (($cached_modified == $modified) && ($cached_etag == $etag)) {
 		header('HTTP/1.1 304 Not Modified');
 		exit();
 	}

view/theme/vier/theme.php

@@ -21,7 +21,7 @@ function vier_init(App $a) {
 
 	set_template_engine($a, 'smarty3');
 
-	if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()) {
+	if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] || $a->argv[0] === "network" && local_user()) {
 		vier_community_info();
 
 		$a->page['htmlhead'] .= "<link rel='stylesheet' type='text/css' href='view/theme/vier/wide.css' media='screen and (min-width: 1300px)'/>\n";
@@ -50,19 +50,11 @@ function insertFormatting(BBcode, id) {
 	if (document.selection) {
 		textarea.focus();
 		selected = document.selection.createRange();
-		if (BBcode == "url") {
-			selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
-		} else {
-			selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
-		}
+		selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
 	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
 		var start = textarea.selectionStart;
 		var end = textarea.selectionEnd;
-		if (BBcode == "url") {
-			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-		} else {
-			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-		}
+		textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
 	}
 
 	return true;
@@ -104,14 +96,14 @@ EOT;
 
 	// Hide the left menu bar
 	/// @TODO maybe move this static array out where it should belong?
-	if (($a->page['aside'] == "") AND in_array($a->argv[0], array("community", "events", "help", "manage", "notifications",
+	if (($a->page['aside'] == "") && in_array($a->argv[0], array("community", "events", "help", "manage", "notifications",
 			"probe", "webfinger", "login", "invite", "credits"))) {
 		$a->page['htmlhead'] .= "<link rel='stylesheet' href='view/theme/vier/hide.css' />";
 	}
 }
 
 function get_vier_config($key, $default = false, $admin = false) {
-	if (local_user() AND !$admin) {
+	if (local_user() && !$admin) {
 		$result = get_pconfig(local_user(), "vier", $key);
 		if ($result !== false) {
 			return $result;
@@ -194,7 +186,7 @@ function vier_community_info() {
 	}
 
 	//right_aside FIND FRIENDS
-	if ($show_friends AND local_user()) {
+	if ($show_friends && local_user()) {
 		$nv = array();
 		$nv['title'] = array("", t('Find Friends'), "", "");
 		$nv['directory'] = array('directory', t('Local Directory'), "", "");
@@ -214,7 +206,7 @@ function vier_community_info() {
 	}
 
 	//Community_Pages at right_aside
-	if ($show_pages AND local_user()) {
+	if ($show_pages && local_user()) {
 
 		require_once 'include/ForumManager.php';
 
@@ -380,7 +372,7 @@ function vier_community_info() {
 			$r[] = array("photo" => "images/wordpress.png", "name" => "Wordpress");
 		}
 
-		if (function_exists("imap_open") AND !get_config("system","imap_disabled") AND !get_config("system","dfrn_only")) {
+		if (function_exists("imap_open") && !get_config("system","imap_disabled") && !get_config("system","dfrn_only")) {
 			$r[] = array("photo" => "images/mail.png", "name" => "E-Mail");
 		}