From 71f00eaf5f4e2d76dd200e4965afa04dc1dead3f Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <ben.lort@gmail.com>
Date: Fri, 3 Mar 2017 01:00:52 -0500
Subject: [PATCH 001/120] Turn action links into buttons

- Turns <a role="button"> into <button type="button"> for responses and
dropdown menu in wall_thread.tpl
- Removes extraneous decorations
- Updates dropdown style to prevent hover shenanigans
- Add theme color to active "btn-default" buttons
- Add margin top to comment box that was stuck to the action buttons
---
 view/theme/frio/css/style.css             | 61 +++++++++++++----------
 view/theme/frio/templates/wall_thread.tpl | 45 +++++++----------
 2 files changed, 51 insertions(+), 55 deletions(-)

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index df9585d070..40e275ae00 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -185,6 +185,12 @@ a#item-delete-selected {
     outline: 0;
     background: $btn_primary_hover_color !important;
 }
+.btn-default:active, .btn-default.active {
+    color: $link_color;
+}
+.btn-default:active:hover, .btn-default.active:hover {
+    color: $link_hover_color;
+}
 .btn-primary.active.focus, .btn-primary.active:focus, .btn-primary.active:hover,
 .btn-primary:active.focus, .btn-primary:active:focus, .btn-primary:active:hover,
 .open>.dropdown-toggle.btn-primary.focus, .open>.dropdown-toggle.btn-primary:focus,
@@ -835,41 +841,41 @@ nav.navbar a {
 .contact-photo-wrapper .dropdown-menu li {
     border-left: 3px solid $nav_bg;
 }
-.nav-pills .dropdown-menu li a,
-.nav-tabs .dropdown-menu li a,
-.account .dropdown-menu li a,
-.contact-photo-wrapper .dropdown-menu li a {
+.nav-pills .dropdown-menu li a, .nav-pills .dropdown-menu li .btn-link,
+.nav-tabs .dropdown-menu li a, .nav-tabs .dropdown-menu li .btn-link,
+.account .dropdown-menu li a, .account .dropdown-menu li .btn-link,
+.contact-photo-wrapper .dropdown-menu li a, .contact-photo-wrapper .dropdown-menu li .btn-link {
     color: $nav_icon_color;
     font-weight: 400;
     font-size: 13px;
     padding: 4px 15px;
     text-transform: capitalize;
 }
-.nav-pills .dropdown-menu li a i,
-.nav-tabs .dropdown-menu li a i,
-.account .dropdown-menu li a i,
-.contact-photo-wrapper .dropdown-menu li a i {
+.nav-pills .dropdown-menu li a i, .nav-pills .dropdown-menu li .btn-link i,
+.nav-tabs .dropdown-menu li a i, .nav-tabs .dropdown-menu li .btn-link i,
+.account .dropdown-menu li a i, .account .dropdown-menu li .btn-link i,
+.contact-photo-wrapper .dropdown-menu li a i, .contact-photo-wrapper .dropdown-menu li .btn-link i {
     margin-right: 5px;
     font-size: 14px;
     display: inline-block;
     width: 14px
 }
-.nav-pills .dropdown-menu li a:hover,
-.nav-tabs .dropdown-menu li a:hover,
-.account .dropdown-menu li a:hover,
-.contact-photo-wrapper .dropdown-menu li a:hover,
-.nav-pills .dropdown-menu li a:visited,
-.nav-tabs .dropdown-menu li a:visited,
-.account .dropdown-menu li a:visited,
-.contact-photo-wrapper .dropdown-menu li a:visited,
-.nav-pills .dropdown-menu li a:hover,
-.nav-tabs .dropdown-menu li a:hover,
-.account .dropdown-menu li a:hover,
-.contact-photo-wrapper .dropdown-menu li a:hover,
-.nav-pills .dropdown-menu li a:focus,
-.nav-tabs .dropdown-menu li a:focus,
-.account .dropdown-menu li a:focus,
-.contact-photo-wrapper .dropdown-menu li a:focus {
+.nav-pills .dropdown-menu li a:hover, .nav-pills .dropdown-menu li .btn-link:hover,
+.nav-tabs .dropdown-menu li a:hover, .nav-tabs .dropdown-menu li .btn-link:hover,
+.account .dropdown-menu li a:hover, .account .dropdown-menu li .btn-link:hover,
+.contact-photo-wrapper .dropdown-menu li a:hover, .contact-photo-wrapper .dropdown-menu li .btn-link:hover,
+.nav-pills .dropdown-menu li a:visited, .nav-pills .dropdown-menu li .btn-link:visited,
+.nav-tabs .dropdown-menu li a:visited, .nav-tabs .dropdown-menu li .btn-link:visited,
+.account .dropdown-menu li a:visited, .account .dropdown-menu li .btn-link:visited,
+.contact-photo-wrapper .dropdown-menu li a:visited, .contact-photo-wrapper .dropdown-menu li .btn-link:visited,
+.nav-pills .dropdown-menu li a:hover, .nav-pills .dropdown-menu li .btn-link:hover,
+.nav-tabs .dropdown-menu li a:hover, .nav-tabs .dropdown-menu li .btn-link:hover,
+.account .dropdown-menu li a:hover, .account .dropdown-menu li .btn-link:hover,
+.contact-photo-wrapper .dropdown-menu li a:hover, .contact-photo-wrapper .dropdown-menu li .btn-link:hover,
+.nav-pills .dropdown-menu li a:focus, .nav-pills .dropdown-menu li .btn-link:focus,
+.nav-tabs .dropdown-menu li a:focus, .nav-tabs .dropdown-menu li .btn-link:focus,
+.account .dropdown-menu li a:focus, .account .dropdown-menu li .btn-link:focus,
+.contact-photo-wrapper .dropdown-menu li a:focus, .contact-photo-wrapper .dropdown-menu li .btn-link:focus {
     background: 0 0
 }
 .nav-pills .dropdown-menu li:hover,
@@ -1314,7 +1320,7 @@ section #jotOpen {
 }
 
 .toplevel_item:hover .fakelink, .wall-item-container:hover .fakelink,
-.toplevel_item:hover .wall-item-container:hover .btn-link,
+.toplevel_item:hover .wall-item-container:hover :not(.dropdown):not([role=menuitem]) > .btn-link,
 .toplevel_item:hover .wall-item-container:hover .wall-item-responses a,
 .toplevel_item:hover .wall-item-content a,
 .toplevel_item:hover .wall-item-name,
@@ -1563,8 +1569,6 @@ code > .hl-main {
 .wall-item-actions .button-comments,
 .wall-item-actions .button-votes,
 .wall-item-actions .button-likes {
-    padding-left: 0px;
-    padding-right: 0px;
     text-transform: capitalize;
 }
 
@@ -1638,6 +1642,9 @@ code > .hl-main {
 /*
 * Comment Box
 */
+.wall-item-comment-wrapper {
+	margin-top: 10px;
+}
 .thread_level_2 .wall-item-comment-wrapper {
     padding-right: 5px;
 }
diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl
index e71dc7b84c..6f7de795fc 100644
--- a/view/theme/frio/templates/wall_thread.tpl
+++ b/view/theme/frio/templates/wall_thread.tpl
@@ -80,7 +80,7 @@ as the value of $top_child_total (this is done at the end of this file)
 
 			{{if $item.plink || $item.drop.dropping || $item.edpost || $item.ignore || $item.tagger || $item.star || $item.filer}}
 			<li class="dropdown">
-				<a class="dropdown-toggle" data-toggle="dropdown" id="dropdownMenuTools-{{$item.id}}" role="button" aria-haspopup="true" aria-expanded="false"><i class="fa fa-angle-down"></i></a>
+				<button type="button" class="btn-link dropdown-toggle" data-toggle="dropdown" id="dropdownMenuTools-{{$item.id}}" aria-haspopup="true" aria-expanded="false"><i class="fa fa-angle-down"></i></button>
 
 				<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dropdownMenuTools-{{$item.id}}">
 					{{if $item.plink}}	{{*link to the original source of the item *}}
@@ -91,26 +91,26 @@ as the value of $top_child_total (this is done at the end of this file)
 
 					{{if $item.edpost}} {{* edit the posting *}}
 					<li role="menuitem">
-						<a onclick="editpost('{{$item.edpost.0}}?mode=none'); return false;" title="{{$item.edpost.1}}" class="navicon pencil"><i class="fa fa-pencil"></i> {{$item.edpost.1}}</a>
+						<button type="button" onclick="editpost('{{$item.edpost.0}}?mode=none'); return false;" title="{{$item.edpost.1}}" class="btn-link navicon pencil"><i class="fa fa-pencil"></i> {{$item.edpost.1}}</button>
 					</li>
 					{{/if}}
 
 					{{if $item.tagger}} {{* tag the post *}}
 					<li role="menuitem">
-						<a id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="{{$item.tagger.class}}" title="{{$item.tagger.add}}"><i class="fa fa-tag"></i> {{$item.tagger.add}}</a>
+						<button type="button" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="btn-link {{$item.tagger.class}}" title="{{$item.tagger.add}}"><i class="fa fa-tag"></i> {{$item.tagger.add}}</button>
 					</li>
 					{{/if}}
 
 					{{if $item.filer}}
 					<li role="menuitem">
-						<a id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon" title="{{$item.filer}}"><i class="fa fa-folder"></i>&nbsp;{{$item.filer}}</a>
+						<button type="button" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="btn-link filer-item filer-icon" title="{{$item.filer}}"><i class="fa fa-folder"></i>&nbsp;{{$item.filer}}</button>
 					</li>
 					{{/if}}
 
 					{{if $item.star}}
 					<li role="menuitem">
-						<a id="star-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="{{$item.star.classdo}}" title="{{$item.star.do}}"><i class="fa fa-star-o"></i>&nbsp;{{$item.star.do}}</a>
-						<a id="unstar-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="{{$item.star.classundo}}" title="{{$item.star.undo}}"><i class="fa fa-star"></i>&nbsp;{{$item.star.undo}}</a>
+						<button type="button" id="star-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="btn-link {{$item.star.classdo}}" title="{{$item.star.do}}"><i class="fa fa-star-o"></i>&nbsp;{{$item.star.do}}</button>
+						<button type="button" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="btn-link {{$item.star.classundo}}" title="{{$item.star.undo}}"><i class="fa fa-star"></i>&nbsp;{{$item.star.undo}}</button>
 					</li>
 					{{/if}}
 
@@ -120,16 +120,16 @@ as the value of $top_child_total (this is done at the end of this file)
 
 					{{if $item.ignore}}
 						<li role="menuitem">
-							<a id="ignore-{{$item.id}}" onclick="doignore({{$item.id}}); return false;" class="{{$item.ignore.classdo}}" title="{{$item.ignore.do}}"><i class="fa fa-eye-slash"></i> {{$item.ignore.do}}</a>
+							<button type="button" id="ignore-{{$item.id}}" onclick="doignore({{$item.id}}); return false;" class="btn-link {{$item.ignore.classdo}}" title="{{$item.ignore.do}}"><i class="fa fa-eye-slash"></i> {{$item.ignore.do}}</button>
 						</li>
 						<li role="menuitem">
-							<a id="unignore-{{$item.id}}" onclick="doignore({{$item.id}}); return false;"  class="{{$item.ignore.classundo}}"  title="{{$item.ignore.undo}}"><i class="fa fa-eye"></i> {{$item.ignore.undo}}</a>
+							<button type="button" id="unignore-{{$item.id}}" onclick="doignore({{$item.id}}); return false;" class="btn-link {{$item.ignore.classundo}}"  title="{{$item.ignore.undo}}"><i class="fa fa-eye"></i> {{$item.ignore.undo}}</button>
 						</li>
 					{{/if}}
 
 					{{if $item.drop.dropping}}
 					<li role="menuitem">
-						<a class="navicon delete" onclick="dropItem('item/drop/{{$item.id}}', '#item-{{$item.guid}}'); return false;" title="{{$item.drop.delete}}"><i class="fa fa-trash"></i> {{$item.drop.delete}}</a>
+						<button type="button" class="btn-link navicon delete" onclick="dropItem('item/drop/{{$item.id}}', '#item-{{$item.guid}}'); return false;" title="{{$item.drop.delete}}"><i class="fa fa-trash"></i> {{$item.drop.delete}}</button>
 					</li>
 					{{/if}}
 				</ul>
@@ -287,34 +287,23 @@ as the value of $top_child_total (this is done at the end of this file)
 				{{* Buttons for like and dislike *}}
 				{{if $item.vote}}
 					{{if $item.vote.like}}
-					<a role="button" class="button-likes{{if $item.responses.like.self}} active{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false;"><i class="fa fa-thumbs-up"></i>&nbsp;{{$item.vote.like.1}}</a>
+					<button type="button" class="btn btn-xs btn-default button-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false;" data-toggle="button"><i class="fa fa-thumbs-up"></i>&nbsp;{{$item.vote.like.1}}</button>
 					{{/if}}
-
-					{{if $item.vote.like AND $item.vote.dislike}}
-					<span role="presentation" class="separator">&nbsp;•&nbsp;</span>
-					{{/if}}
-
 					{{if $item.vote.dislike}}
-					<a role="button" class="button-likes{{if $item.responses.dislike.self}} active{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false;"><i class="fa fa-thumbs-down"></i>&nbsp;{{$item.vote.dislike.1}}</a>
+					<button type="button" class="btn btn-xs btn-default button-likes{{if $item.responses.dislike.self}} active" aria-pressed="true{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false;" data-toggle="button"><i class="fa fa-thumbs-down"></i>&nbsp;{{$item.vote.dislike.1}}</button>
 					{{/if}}
 
-					{{if ($item.vote.like OR $item.vote.dislike) AND $item.comment}}
-					<span role="presentation" class="separator">&nbsp;•&nbsp;</span>
-					{{/if}}
 				{{/if}}
 
-				{{* Butten to open the comment text field *}}
+				{{* Button to open the comment text field *}}
 				{{if $item.comment}}
-				<a role="button" class="button-comments" id="comment-{{$item.id}}" title="{{$item.switchcomment}}" {{if $item.thread_level != 1}}onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});" {{else}} onclick="showHide('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"{{/if}}><i class="fa fa-commenting"></i>&nbsp;{{$item.switchcomment}}</a>
+				<button type="button" class="btn btn-xs btn-default button-comments" id="comment-{{$item.id}}" title="{{$item.switchcomment}}" {{if $item.thread_level != 1}}onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});" {{else}} onclick="showHide('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"{{/if}}><i class="fa fa-commenting"></i>&nbsp;{{$item.switchcomment}}</button>
 				{{/if}}
 
 				{{* Button for sharing the item *}}
 				{{if $item.vote}}
-					{{if ($item.vote.like OR $item.vote.dislike OR $item.comment) AND $item.vote.share}}
-					<span role="presentation" class="separator">&nbsp;•&nbsp;</span>
-					{{/if}}
 					{{if $item.vote.share}}
-					<a role="button" class="button-votes" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false;"><i class="fa fa-retweet"></i>&nbsp;{{$item.vote.share.1}}</a>
+					<button type="button" class="btn btn-xs btn-default button-votes" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false;"><i class="fa fa-retweet"></i>&nbsp;{{$item.vote.share.1}}</a>
 					{{/if}}
 				{{/if}}
 			</div>
@@ -323,9 +312,9 @@ as the value of $top_child_total (this is done at the end of this file)
 				{{* Event attendance buttons *}}
 				{{if $item.isevent}}
 				<div class="vote-event">
-					<a role="button" class="button-event{{if $item.responses.attendyes.self}} active{{/if}}" id="attendyes-{{$item.id}}" title="{{$item.attend.0}}" onclick="dolike({{$item.id}},'attendyes'); return false;"><i class="fa fa-check"><span class="sr-only">{{$item.attend.0}}</span></i></a>
-					<a role="button" class="button-event{{if $item.responses.attendno.self}} active{{/if}}" id="attendno-{{$item.id}}" title="{{$item.attend.1}}" onclick="dolike({{$item.id}},'attendno'); return false;"><i class="fa fa-times"><span class="sr-only">{{$item.attend.1}}</span></i></a>
-					<a role="button" class="button-event{{if $item.responses.attendmaybe.self}} active{{/if}}" id="attendmaybe-{{$item.id}}" title="{{$item.attend.2}}" onclick="dolike({{$item.id}},'attendmaybe'); return false;"><i class="fa fa-question"><span class="sr-only">{{$item.attend.2}}</span></i></a>
+					<button type="button" class="btn btn-xs btn-default button-event{{if $item.responses.attendyes.self}} active" aria-pressed="true{{/if}}" id="attendyes-{{$item.id}}" title="{{$item.attend.0}}" onclick="dolike({{$item.id}},'attendyes'); return false;"><i class="fa fa-check"><span class="sr-only">{{$item.attend.0}}</span></i></button>
+					<button type="button" class="btn btn-xs btn-default button-event{{if $item.responses.attendno.self}} active" aria-pressed="true{{/if}}" id="attendno-{{$item.id}}" title="{{$item.attend.1}}" onclick="dolike({{$item.id}},'attendno'); return false;"><i class="fa fa-times"><span class="sr-only">{{$item.attend.1}}</span></i></button>
+					<button type="button" class="btn btn-xs btn-default button-event{{if $item.responses.attendmaybe.self}} active" aria-pressed="true{{/if}}" id="attendmaybe-{{$item.id}}" title="{{$item.attend.2}}" onclick="dolike({{$item.id}},'attendmaybe'); return false;"><i class="fa fa-question"><span class="sr-only">{{$item.attend.2}}</span></i></button>
 				</div>
 				{{/if}}
 

From cb49bcdb04f819b6a0314941f4762c70b621a997 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <ben.lort@gmail.com>
Date: Fri, 3 Mar 2017 01:19:49 -0500
Subject: [PATCH 002/120] Turn actions links into buttons (nav, search)

- Mirrored the changes from wall_thread to search_item
- Replaced a navbar link with a button with according CSS
---
 view/theme/frio/css/style.css             |  5 +-
 view/theme/frio/templates/nav.tpl         |  5 +-
 view/theme/frio/templates/search_item.tpl | 73 ++++++++++-------------
 3 files changed, 35 insertions(+), 48 deletions(-)

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index 40e275ae00..4e189b11fe 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -553,9 +553,8 @@ nav.navbar .nav>li>a:focus{
 #topbar-first .dropdown-footer {
     margin: 10px 10px 5px
 }
-#topbar-first a,
-nav.navbar a {
-    /*color: #fff*/
+#topbar-first a, #topbar-first .btn-link,
+nav.navbar a, nav.navbar .btn-link {
     color: $nav_icon_color;
 }
 #topbar-first .caret {
diff --git a/view/theme/frio/templates/nav.tpl b/view/theme/frio/templates/nav.tpl
index fc66403019..ef96249ea4 100644
--- a/view/theme/frio/templates/nav.tpl
+++ b/view/theme/frio/templates/nav.tpl
@@ -119,7 +119,7 @@
 					{{* The user dropdown menu *}}
 					{{if $nav.userinfo}}
 					<li role="menu" id="nav-user-linkmenu" class="dropdown account nav-menu hidden-xs">
-						<a href="#" id="main-menu" class="dropdown-toggle nav-avatar " data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
+						<button id="main-menu" class="btn-link dropdown-toggle nav-avatar" data-toggle="dropdown" type="button" aria-haspopup="true" aria-expanded="false">
 							<div class="user-title pull-left hidden-xs hidden-sm hidden-md">
 								<strong>{{$nav.userinfo.name}}</strong><br>
 								{{if $nav.remote}}<span class="trunctate">{{$nav.remote}}</span>{{/if}}
@@ -127,8 +127,7 @@
 
 							<img  id="avatar" src="{{$nav.userinfo.icon}}" alt="{{$nav.userinfo.name}}">
 							<span class="caret"></span>
-
-						</a>
+						</button>
 
 						{{* The list of available usermenu links *}}
 						<ul id="nav-user-menu" class="dropdown-menu pull-right menu-popup" role="group" aria-labelledby="main-menu">
diff --git a/view/theme/frio/templates/search_item.tpl b/view/theme/frio/templates/search_item.tpl
index 90fbe03bbc..bf90f8606b 100644
--- a/view/theme/frio/templates/search_item.tpl
+++ b/view/theme/frio/templates/search_item.tpl
@@ -1,7 +1,7 @@
 <!-- TODO => Unknow block -->
 <div class="wall-item-decor" style="display:none;">
 	<span class="icon s22 star {{$item.isstarred}}" id="starred-{{$item.id}}" title="{{$item.star.starred}}">{{$item.star.starred}}</span>
-	{{if $item.lock}}<span class="navicon lock fakelink" onclick="lockview(event,{{$item.id}});" title="{{$item.lock}}"></span><span class="fa fa-lock"></span>{{/if}}
+	{{if $item.lock}}<span class="navicon lock fakelink" onclick="lockview(event, {{$item.id}});" title="{{$item.lock}}"></span><span class="fa fa-lock"></span>{{/if}}
 	<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
 </div>
 <!-- ./TODO => Unknow block -->
@@ -17,44 +17,44 @@
 
 				{{if $item.plink || $item.star || $item.drop.dropping || $item.edpost}}
 				<li class="dropdown">
-					<a class="dropdown-toggle" data-toggle="dropdown"  href="#" id="dropdownMenuTools-{{$item.id}}" role="button" aria-haspopup="true" aria-expanded="false"><i class="fa fa-angle-down"></i></a>
+					<button class="btn-link dropdown-toggle" data-toggle="dropdown" id="dropdownMenuTools-{{$item.id}}" type="button" aria-haspopup="true" aria-expanded="false"><i class="fa fa-angle-down"></i></button>
 
 					<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dropdownMenuTools-{{$item.id}}">
 						{{if $item.plink}}      {{*link to the original source of the item *}}
-	                                        <li role="menuitem">
-	                                                <a title="{{$item.plink.title}}" href="{{$item.plink.href}}" class="navicon plink"><i class="fa fa-external-link"></i> {{$item.plink.title}}</a>
-	                                        </li>
-	                                        {{/if}}
+						<li role="menuitem">
+							<a title="{{$item.plink.title}}" href="{{$item.plink.href}}" class="navicon plink"><i class="fa fa-external-link"></i> {{$item.plink.title}}</a>
+						</li>
+						{{/if}}
 
 						{{if $item.edpost}} {{* edit the posting *}}
 						<li role="menuitem">
-							<a href="#" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}" class="navicon pencil"><i class="fa fa-pencil"></i> {{$item.edpost.1}}</a>
+							<button type="button" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}" class="btn-link navicon pencil"><i class="fa fa-pencil"></i> {{$item.edpost.1}}</button>
 						</li>
 						{{/if}}
 
 						{{if $item.tagger}} {{* tag the post *}}
 						<li role="menuitem">
-							<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="{{$item.tagger.class}}" title="{{$item.tagger.add}}"><i class="fa fa-tag"></i> {{$item.tagger.add}}</a>
+							<button type="button" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="btn-link {{$item.tagger.class}}" title="{{$item.tagger.add}}"><i class="fa fa-tag"></i> {{$item.tagger.add}}</button>
 						</li>
 						{{/if}}
 
 						{{if $item.filer}}
 						<li role="menuitem">
-							<a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon" title="{{$item.filer}}"><i class="fa fa-folder"></i>&nbsp;{{$item.filer}}</a>
+							<button type="button" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="btn-link filer-item filer-icon" title="{{$item.filer}}"><i class="fa fa-folder"></i>&nbsp;{{$item.filer}}</button>
 						</li>
 						{{/if}}
 
 						{{if $item.star}}
 						<li role="menuitem">
-							<a href="#" id="star-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="{{$item.star.classdo}}" title="{{$item.star.do}}"><i class="fa fa-star-o"></i>&nbsp;{{$item.star.do}}</a>
-							<a href="#" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="{{$item.star.classundo}}" title="{{$item.star.undo}}"><i class="fa fa-star"></i>&nbsp;{{$item.star.undo}}</a>
+							<button type="button" id="star-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="btn-link {{$item.star.classdo}}" title="{{$item.star.do}}"><i class="fa fa-star-o"></i>&nbsp;{{$item.star.do}}</button>
+							<button type="button" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="btn-link {{$item.star.classundo}}" title="{{$item.star.undo}}"><i class="fa fa-star"></i>&nbsp;{{$item.star.undo}}</button>
 						</li>
 						{{/if}}
 
 						{{if $item.drop.dropping}}
 						<li role="separator" class="divider"></li>
 						<li role="menuitem">
-							<a class="navicon delete" onclick="dropItem('item/drop/{{$item.id}}', '#item-{{$item.guid}}'); return false;" title="{{$item.drop.delete}}"><i class="fa fa-trash"></i> {{$item.drop.delete}}</a>
+							<button type="button" class="btn-link navicon delete" onclick="dropItem('item/drop/{{$item.id}}', '#item-{{$item.guid}}'); return false;" title="{{$item.drop.delete}}"><i class="fa fa-trash"></i> {{$item.drop.delete}}</button>
 						</li>
 						{{/if}}
 					</ul>
@@ -85,7 +85,7 @@
 			<div role="heading " class="contact-info hidden-sm hidden-xs media-body"><!-- <= For computer -->
 				<h4 class="media-heading"><a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo"><span class="wall-item-name btn-link {{$item.sparkle}}">{{$item.name}}</span></a>
 					{{if $item.owner_url}}{{$item.via}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link userinfo"><span class="wall-item-name{{$item.osparkle}} btn-link" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
-					{{if $item.lock}}<span class="navicon lock fakelink" onClick="lockview(event,{{$item.id}});" title="{{$item.lock}}">&nbsp;<small><i class="fa fa-lock"></i></small></span>{{/if}}
+					{{if $item.lock}}<span class="navicon lock fakelink" onClick="lockview(event, {{$item.id}});" title="{{$item.lock}}">&nbsp;<small><i class="fa fa-lock"></i></small></span>{{/if}}
 
 					<div class="additional-info text-muted">
 						<div id="wall-item-ago-{{$item.id}}" class="wall-item-ago">
@@ -137,19 +137,19 @@
 				</div>
 				<div class="wall-item-tags">
 					{{foreach $item.hashtags as $tag}}
-						<span class='tag label btn-info sm'>{{$tag}} <i class="fa fa-bolt"></i></span>
+						<span class="tag label btn-info sm">{{$tag}} <i class="fa fa-bolt"></i></span>
 					{{/foreach}}
 
 					{{foreach $item.mentions as $tag}}
-						<span class='mention label btn-warning sm'>{{$tag}} <i class="fa fa-user"></i></span>
+						<span class="mention label btn-warning sm">{{$tag}} <i class="fa fa-user"></i></span>
 					{{/foreach}}
 
 					{{foreach $item.folders as $cat}}
-						<span class='folder label btn-danger sm'>{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
+						<span class="folder label btn-danger sm">{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
 					{{/foreach}}
 
 					{{foreach $item.categories as $cat}}
-						<span class='category label btn-success sm'>{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
+						<span class="category label btn-success sm">{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
 					{{/foreach}}
 				</div>
 					{{if $item.edited}}<div class="itemedited text-muted">{{$item.edited['label']}} (<span title="{{$item.edited['date']}}">{{$item.edited['relative']}}</span>)</div>{{/if}}
@@ -170,34 +170,23 @@
 					{{* Buttons for like and dislike *}}
 					{{if $item.vote}}
 						{{if $item.vote.like}}
-						<a role="button" href="#" class="button-likes{{if $item.responses.like.self}} active{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false;">{{$item.vote.like.0}}</a>
-						{{/if}}
-
-						{{if $item.vote.like AND $item.vote.dislike}}
-						<span role="presentation" class="separator">&nbsp;•&nbsp;</span>
+						<button type="button" class="btn btn-defaultbutton-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}}, 'like'); return false;">{{$item.vote.like.0}}</button>
 						{{/if}}
 
 						{{if $item.vote.dislike}}
-						<a role="button" href="#" class="button-likes{{if $item.responses.like.self}} active{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false;">{{$item.vote.dislike.0}}</a>
-						{{/if}}
-
-						{{if ($item.vote.like OR $item.vote.dislike) AND $item.comment}}
-						<span role="presentation" class="separator">&nbsp;•&nbsp;</span>
+						<button type="button" class="btn btn-defaultbutton-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}}, 'dislike'); return false;">{{$item.vote.dislike.0}}</button>
 						{{/if}}
 					{{/if}}
 
-					{{* Butten to open the comment text field *}}
+					{{* Button to open the comment text field *}}
 					{{if $item.comment}}
-					<a role="button" class="" id="comment-{{$item.id}}" title="{{$item.switchcomment}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});">{{$item.switchcomment}} </a>
+					<button type="button" class="btn btn-default" id="comment-{{$item.id}}" title="{{$item.switchcomment}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});">{{$item.switchcomment}}</button>
 					{{/if}}
 
 					{{* Button for sharing the item *}}
 					{{if $item.vote}}
-						{{if ($item.vote.like OR $item.vote.dislike OR $item.comment) AND $item.vote.share}}
-						<span role="presentation" class="separator">&nbsp;•&nbsp;</span>
-						{{/if}}
 						{{if $item.vote.share}}
-						<a role="button" href="#" class="" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false;"><i class="fa fa-retweet"></i>&nbsp;{{$item.vote.share.0}}</a>
+						<button type="button" class="btn btn-default" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false;"><i class="fa fa-retweet"></i>&nbsp;{{$item.vote.share.0}}</button>
 						{{/if}}
 					{{/if}}
 				</div>
@@ -207,9 +196,9 @@
 					{{* Event attendance buttons *}}
 					{{if $item.isevent}}
 					<div class="vote-event">
-						<a role="button" href="#" class="button-event{{if $item.responses.attendyes.self}} active{{/if}}" id="attendyes-{{$item.id}}" title="{{$item.attend.0}}" onclick="dolike({{$item.id}},'attendyes'); return false;"><i class="fa fa-check"><span class="sr-only">{{$item.attend.0}}</span></i></a>
-						<a role="button" href="#" class="button-event{{if $item.responses.attendno.self}} active{{/if}}" id="attendno-{{$item.id}}" title="{{$item.attend.1}}" onclick="dolike({{$item.id}},'attendno'); return false;"><i class="fa fa-times"><span class="sr-only">{{$item.attend.1}}</span></i></a>
-						<a role="button" href="#" class="button-event{{if $item.responses.attendmaybe.self}} active{{/if}}" id="attendmaybe-{{$item.id}}" title="{{$item.attend.2}}" onclick="dolike({{$item.id}},'attendmaybe'); return false;"><i class="fa fa-question"><span class="sr-only">{{$item.attend.2}}</span></i></a>
+						<button type="button" class="btn btn-defaultbutton-event{{if $item.responses.attendyes.self}} active" aria-pressed="true{{/if}}" id="attendyes-{{$item.id}}" title="{{$item.attend.0}}" onclick="dolike({{$item.id}}, 'attendyes'); return false;"><i class="fa fa-check"><span class="sr-only">{{$item.attend.0}}</span></i></button>
+						<button type="button" class="btn btn-defaultbutton-event{{if $item.responses.attendno.self}} active" aria-pressed="true{{/if}}" id="attendno-{{$item.id}}" title="{{$item.attend.1}}" onclick="dolike({{$item.id}}, 'attendno'); return false;"><i class="fa fa-times"><span class="sr-only">{{$item.attend.1}}</span></i></button>
+						<button type="button" class="btn btn-defaultbutton-event{{if $item.responses.attendmaybe.self}} active" aria-pressed="true{{/if}}" id="attendmaybe-{{$item.id}}" title="{{$item.attend.2}}" onclick="dolike({{$item.id}}, 'attendmaybe'); return false;"><i class="fa fa-question"><span class="sr-only">{{$item.attend.2}}</span></i></button>
 					</div>
 					{{/if}}
 
@@ -225,16 +214,16 @@
 
 					{{* Display likes, dislike and attendance stats *}}
 			{{if $item.responses}}
-				<div class="wall-item-responses">
-					{{foreach $item.responses as $verb=>$response}}
-					<div class="wall-item-{{$verb}}" id="wall-item-{{$verb}}-{{$item.id}}">{{$response.output}}</div>
-					{{/foreach}}
-				</div>
+			<div class="wall-item-responses">
+				{{foreach $item.responses as $verb=>$response}}
+				<div class="wall-item-{{$verb}}" id="wall-item-{{$verb}}-{{$item.id}}">{{$response.output}}</div>
+				{{/foreach}}
+			</div>
 			{{/if}}
 
 			<div class="wall-item-conv" id="wall-item-conv-{{$item.id}}" >
 			{{if $item.conv}}
-					<a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>
+				<a href="{{$item.conv.href}}" id="context-{{$item.id}}" title="{{$item.conv.title}}">{{$item.conv.title}}</a>
 			{{/if}}
 			</div>
 		</div><!--./media>-->

From 7cb44ae25aac88da850a09c089cf2bae6706e8bf Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <ben.lort@gmail.com>
Date: Tue, 14 Mar 2017 23:47:02 -0400
Subject: [PATCH 003/120] Turn all the action <a> tags into buttons - Add CSS
 changes to support both <a> and <button class="btn btn-link"> - Removed
 unnecessary "return false" in onclick attributes - Simplified tabs in profile
 page to native Bootstrap behavior

---
 view/theme/frio/css/style.css                 |  47 +-
 view/theme/frio/js/hovercard.js               |  60 +--
 view/theme/frio/templates/comment_item.tpl    |  33 +-
 view/theme/frio/templates/common_tabs.tpl     |  10 +-
 view/theme/frio/templates/contact_edit.tpl    |  18 +-
 .../theme/frio/templates/contact_template.tpl |  42 +-
 .../frio/templates/contacts-template.tpl      |  10 +-
 view/theme/frio/templates/event.tpl           |   2 +-
 view/theme/frio/templates/event_form.tpl      |  78 ++--
 view/theme/frio/templates/events_js.tpl       |  14 +-
 view/theme/frio/templates/filebrowser.tpl     |  16 +-
 view/theme/frio/templates/group_side.tpl      |   2 +-
 view/theme/frio/templates/jot.tpl             |  50 ++-
 view/theme/frio/templates/nav.tpl             |   4 +-
 .../theme/frio/templates/profile_advanced.tpl | 420 +++++++++---------
 view/theme/frio/templates/profile_edit.tpl    |   8 +-
 view/theme/frio/templates/profile_vcard.tpl   |  12 +-
 view/theme/frio/templates/prv_message.tpl     |  32 +-
 view/theme/frio/templates/search_item.tpl     |  24 +-
 view/theme/frio/templates/settings.tpl        |   4 +-
 .../frio/templates/threaded_conversation.tpl  |   4 +-
 view/theme/frio/templates/wall_thread.tpl     |  28 +-
 22 files changed, 452 insertions(+), 466 deletions(-)

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index ec3bc69aff..3f95fb484f 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -819,6 +819,19 @@ nav.navbar a, nav.navbar .btn-link {
 }
 
 /* Dropdown Menus */
+.nav-pills > li > .btn-link {
+	border-radius: 4px;
+}
+.dropdown-menu > li > :focus,
+.dropdown-menu > li > :hover {
+	background-color: #e8e8e8;
+    background-image: -webkit-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);
+    background-image: -o-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);
+    background-image: -webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#e8e8e8));
+    background-image: linear-gradient(to bottom,#f5f5f5 0,#e8e8e8 100%);
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);
+    background-repeat: repeat-x;
+}
 .nav-pills .dropdown-menu,
 .nav-tabs .dropdown-menu,
 .account .dropdown-menu,
@@ -849,6 +862,8 @@ nav.navbar a, nav.navbar .btn-link {
     font-size: 13px;
     padding: 4px 15px;
     text-transform: capitalize;
+	width: 100%;
+    text-align: left;
 }
 .nav-pills .dropdown-menu li a i, .nav-pills .dropdown-menu li .btn-link i,
 .nav-tabs .dropdown-menu li a i, .nav-tabs .dropdown-menu li .btn-link i,
@@ -1655,8 +1670,8 @@ code > .hl-main {
     padding-top: 5px !important;
     padding-bottom: 5px !important;
 }
-.comment-icon-list a.icon,
-.comment-icon-list a.icon:hover {
+.comment-icon-list .icon,
+.comment-icon-list .icon:hover {
     color: #555;
     background-color: transparent;
 }
@@ -1786,12 +1801,14 @@ ul.dropdown-menu li:hover {
 
 
 /* Dropdown Menu */
-.dropdown-menu li a {
+.dropdown-menu li a,
+.dropdown-menu li .btn-link {
     font-size: 13px!important;
     font-weight: 600!important;
 }
-.dropdown-menu li a:hover, .dropdown-menu li a:visited,
-.dropdown-menu li a:hover, .dropdown-menu li a:focus {
+.dropdown-menu li > :hover,
+.dropdown-menu li > :visited,
+.dropdown-menu li > :focus {
     background: 0 0;
 }
 
@@ -2003,22 +2020,22 @@ ul.viewcontact_wrapper > li {
 .contact-wrapper .contact-actions {
     display: flex;
 }
-.contact-wrapper a.contact-action-link {
+.contact-wrapper .contact-action-link,
+.contact-wrapper .contact-action-link:hover,
+.textcomplete-item .contact-wrapper .contact-action-link {
+    padding: 0 5px;
+    color: #555;
+	border: 0;
+}
+.contact-wrapper .contact-action-link {
     opacity: 0.1;
     transition: all 0.25s ease-in-out;
 }
-.contact-wrapper a.contact-action-link,
-.contact-wrapper a.contact-action-link:hover,
-.textcomplete-item .contact-wrapper a.contact-action-link {
-    padding-right: 5px;
-    padding-left: 5px;
-    color: #555;
-}
-ul li:hover .contact-wrapper a.contact-action-link {
+ul li:hover .contact-wrapper .contact-action-link {
     opacity: 0.8;
     transition: all 0.25s ease-in-out;
 }
-ul li:hover .contact-wrapper a.contact-action-link:hover {
+ul li:hover .contact-wrapper .contact-action-link:hover {
     opacity: 1;
 }
 #contacts-search-wrapper,
diff --git a/view/theme/frio/js/hovercard.js b/view/theme/frio/js/hovercard.js
index d9f9429164..c3396b7626 100644
--- a/view/theme/frio/js/hovercard.js
+++ b/view/theme/frio/js/hovercard.js
@@ -1,11 +1,11 @@
-/* 
+/*
  * The javascript for friendicas hovercard. Bootstraps popover is needed.
- * 
- * Much parts of the code are from Hannes Mannerheims <h@nnesmannerhe.im> 
+ *
+ * Much parts of the code are from Hannes Mannerheims <h@nnesmannerhe.im>
  * qvitter code (https://github.com/hannesmannerheim/qvitter)
- * 
+ *
  * It is licensed under the GNU Affero General Public License <http://www.gnu.org/licenses/>
- * 
+ *
  */
 $(document).ready(function(){
 	// Elements with the class "userinfo" will get a hover-card.
@@ -164,7 +164,7 @@ function getContactData(purl, url, actionOnSuccess) {
 			// The nurl will be the identifier in the object
 			if(data.nurl.length > 0) {
 				// Test if the contact is allready connected with the user (if url containing
-				// the expression ("redir/") We will store different cache keys 
+				// the expression ("redir/") We will store different cache keys
 				if((data.url.search("redir/")) >= 0 ) {
 					var key = data.url;
 				} else {
@@ -212,7 +212,7 @@ function getHoverCardContent(purl, url, callback) {
 	});
 
 // This is interisting. this pice of code ajax request are done asynchron.
-// To make it work getHOverCardTemplate() and getHOverCardData have to return it's 
+// To make it work getHOverCardTemplate() and getHOverCardData have to return it's
 // data (no succes handler for each of this). I leave it here, because it could be useful.
 // https://lostechies.com/joshuaflanagan/2011/10/20/coordinating-multiple-ajax-requests-with-jquery-when/
 //	$.when(
@@ -283,49 +283,3 @@ function getHoverCardVariables(object) {
 
 	return variables;
 }
-
-// This is the html template for the hover-card
-// Since we grab the original hovercard.tpl we don't
-// need it anymore
-function hovercard_template() {
-	var tempate = '\
-	<div class="basic-content" >\
-		<div class="hover-card-details">\
-			<div class="hover-card-header left-align">\
-				<div class="hover-card-pic left-align">\
-					<span class="image-wrapper medium">\
-						<a href="{{$profile.url}}" title="{{$profile.name}}"><img href="" class="left-align thumbnail" src="{{$profile.thumb}}"></a>\
-					</span>\
-				</div>\
-				<div class="hover-card-content">\
-					<div class="profile-entry-name">\
-						<h4 class="left-align1"><a href="{{$profile.url}}">{{$profile.name}}</a></h4>{{if $profile.account_type}}<span>{{$profile.account_type}}</span>{{/if}}\
-					</div>\
-					<div class="profile-details">\
-						<span class="profile-addr">{{$profile.addr}}</span>\
-						{{if $profile.network}}<span class="profile-network"> ({{$profile.network}})</span>{{/if}}\
-					</div>\
-					{{*{{if $profile.about}}<div class="profile-details profile-about">{{$profile.about}}</div>{{/if}}*}}\
-\
-				</div>\
-				<div class="hover-card-actions  right-aligned">\
-					{{* here are the differnt actions like privat message, poke, delete and so on *}}\
-					{{* @todo we have two different photo menus one for contacts and one for items at the network stream. We currently use the contact photo menu, so the items options are missing We need to move them *}}\
-					<div class="hover-card-actions-social">\
-						{{if $profile.actions.pm}}<a class="btn btn-labeled btn-primary btn-sm" onclick="addToModal("{{$profile.actions.pm.1}}")" title="{{$profile.actions.pm.0}}"><i class="fa fa-envelope" aria-hidden="true"></i></a>{{/if}}\
-						{{if $profile.actions.poke}}<a class="btn btn-labeled btn-primary btn-sm" onclick="addToModal("{{$profile.actions.poke.1}}")" title="{{$profile.actions.poke.0}}"><i class="fa fa-heartbeat" aria-hidden="true"></i></a>{{/if}}\
-					</div>\
-					<div class="hover-card-actions-connection">\
-						{{if $profile.actions.edit}}<a class="btn btn-labeled btn-primary btn-sm" href="{{$profile.actions.edit.1}}" title="{{$profile.actions.edit.0}}"><i class="fa fa-pencil" aria-hidden="true"></i></a>{{/if}}\
-						{{if $profile.actions.drop}}<a class="btn btn-labeled btn-primary btn-sm" href="{{$profile.actions.drop.1}}" title="{{$profile.actions.drop.0}}"><i class="fa fa-user-times" aria-hidden="true"></i></a>{{/if}}\
-						{{if $profile.actions.follow}}<a class="btn btn-labeled btn-primary btn-sm" href="{{$profile.actions.follow.1}}" title="{{$profile.actions.follow.0}}"><i class="fa fa-user-plus" aria-hidden="true"></i></a>{{/if}}\
-					</div>\
-				</div>\
-			</div>\
-\
-			<div class="clearfix"></div>\
-\
-		</div>\
-	</div>\
-	{{if $profile.tags}}<div class="hover-card-footer">{{$profile.tags}}</div>{{/if}}';
-}
diff --git a/view/theme/frio/templates/comment_item.tpl b/view/theme/frio/templates/comment_item.tpl
index a195c4dc04..cd201dbad6 100644
--- a/view/theme/frio/templates/comment_item.tpl
+++ b/view/theme/frio/templates/comment_item.tpl
@@ -27,52 +27,51 @@
 
 		<div class="comment-edit-text-end clear"></div>
 		<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;">
-			<button class="btn btn-primary btn-sm" type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" name="submit"><i class="fa fa-envelope"></i> {{$submit}}</button>
+			<button class="btn btn-primary btn-sm" type="submit" onclick="post_comment({{$id}});" id="comment-edit-submit-{{$id}}" name="submit"><i class="fa fa-envelope"></i> {{$submit}}</button>
 			{{if $preview}}
 				<button class="btn btn-defaul btn-sm" type="button" onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}"><i class="fa fa-eye"></i> {{$preview}}</button>
 			{{/if}}
 			<ul class="comment-edit-bb-{{$id}} comment-icon-list nav nav-pills pull-right">
 				<li>
-					<a class="icon" style="cursor: pointer;" title="{{$edimg}}" data-role="insert-formatting" data-bbcode="img" data-id="{{$id}}">
+					<button type="button" class="btn btn-link icon" style="cursor: pointer;" title="{{$edimg}}" data-role="insert-formatting" data-bbcode="img" data-id="{{$id}}">
 						<i class="fa fa-picture-o"></i>
-					</a>
+					</button>
 				</li>
 				<li>
-					<a class="icon bb-url" style="cursor: pointer;" title="{{$edurl}}" onclick="insertFormatting('url',{{$id}});">
+					<button type="button" class="btn btn-link icon bb-url" style="cursor: pointer;" title="{{$edurl}}" onclick="insertFormatting('url',{{$id}});">
 						<i class="fa fa-link"></i>
-					</a>
+					</button>
 				</li>
 				<li>
-					<a class="icon bb-video" style="cursor: pointer;" title="{{$edvideo}}" onclick="insertFormatting('video',{{$id}});">
+					<button type="button" class="btn btn-link icon bb-video" style="cursor: pointer;" title="{{$edvideo}}" onclick="insertFormatting('video',{{$id}});">
 						<i class="fa fa-video-camera"></i>
-					</a>
+					</button>
 				</li>
 
 				<li>
-					<a class="icon underline" style="cursor: pointer;" title="{{$eduline}}" onclick="insertFormatting('u',{{$id}});">
+					<button type="button" class="btn btn-link icon underline" style="cursor: pointer;" title="{{$eduline}}" onclick="insertFormatting('u',{{$id}});">
 						<i class="fa fa-underline"></i>
-					</a>
+					</button>
 				</li>
 				<li>
-					<a class="icon italic" style="cursor: pointer;" title="{{$editalic}}" onclick="insertFormatting('i',{{$id}});">
+					<button type="button" class="btn btn-link icon italic" style="cursor: pointer;" title="{{$editalic}}" onclick="insertFormatting('i',{{$id}});">
 						<i class="fa fa-italic"></i>
-					</a>
+					</button>
 				</li>
 				<li>
-					<a class="icon bold" style="cursor: pointer;"  title="{{$edbold}}" onclick="insertFormatting('b',{{$id}});">
+					<button type="button" class="btn btn-link icon bold" style="cursor: pointer;"  title="{{$edbold}}" onclick="insertFormatting('b',{{$id}});">
 						<i class="fa fa-bold"></i>
-					</a>
+					</button>
 				</li>
 				<li>
-					<a class="icon quote" style="cursor: pointer;" title="{{$edquote}}" onclick="insertFormatting('quote',{{$id}});">
+					<button type="button" class="btn btn-link icon quote" style="cursor: pointer;" title="{{$edquote}}" onclick="insertFormatting('quote',{{$id}});">
 						<i class="fa fa-quote-left"></i>
-					</a>
+					</button>
 				</li>
 			</ul>
-			<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
 		</div>
 
 		<div class="comment-edit-end clear"></div>
 	</form>
-
+	<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
 </div>
diff --git a/view/theme/frio/templates/common_tabs.tpl b/view/theme/frio/templates/common_tabs.tpl
index 7cfd63528a..b0be33b6c5 100644
--- a/view/theme/frio/templates/common_tabs.tpl
+++ b/view/theme/frio/templates/common_tabs.tpl
@@ -12,13 +12,13 @@
 		</li>
 
 		{{* The extended dropdown menu - this would be shown if the tab menu points
-			dosn't fit in the available space. This is done through flexMenu.js *}}
+			doesn't fit in the available space. This is done through flexMenu.js *}}
 		<li class="pull-right">
 			<ul class="tabs tabs-extended" role="menu">
 				<li role="menuitem" class="dropdown flex-target">
-					<a class="dropdown-toggle" type="button" id="dropdownMenuTools" data-toggle="dropdown" aria-expanded="true">
+					<button type="button" class="btn-link dropdown-toggle" id="dropdownMenuTools" data-toggle="dropdown" aria-expanded="true">
 					<i class="fa fa-chevron-down"></i>
-					</a>
+					</button>
 				</li>
 			 </ul>
 		</li>
@@ -45,9 +45,9 @@
 		<li class="pull-right">
 			<ul class="tabs tabs-extended">
 				<li class="dropdown">
-					<a class="dropdown-toggle" type="button" id="dropdownMenuTools" data-toggle="dropdown" aria-expanded="true">
+					<button type="button" class="btn-link dropdown-toggle" id="dropdownMenuTools" data-toggle="dropdown" aria-expanded="true">
 						<i class="fa fa-chevron-down"></i>
-					</a>
+					</button>
 					<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dropdownMenuTools">
 						{{foreach $exttabs as $tab}}
 						<li id="{{$tab.id}}" role="menuitem" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}><a href="{{$tab.url}}" {{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li>
diff --git a/view/theme/frio/templates/contact_edit.tpl b/view/theme/frio/templates/contact_edit.tpl
index 4836a47429..1173830f72 100644
--- a/view/theme/frio/templates/contact_edit.tpl
+++ b/view/theme/frio/templates/contact_edit.tpl
@@ -14,18 +14,20 @@
 				{{* This is the Action menu where contact related actions like 'ignore', 'hide' can be performed *}}
 				<ul id="contact-edit-actions" class="nav nav-pills preferences">
 					<li class="dropdown pull-right">
-						<a class="btn btn-link btn-sm dropdown-toggle" type="button" id="contact-edit-actions-button" data-toggle="dropdown" aria-expanded="true">
+						<button type="button" class="btn btn-link btn-sm dropdown-toggle" id="contact-edit-actions-button" data-toggle="dropdown" aria-expanded="true">
 							<i class="fa fa-angle-down"></i>&nbsp;{{$contact_action_button}}
-						</a>
+						</button>
 
 						<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="contact-edit-actions-button" aria-haspopup="true" id="contact-actions-menu" >
-							{{if $lblsuggest}}<li role="menuitem"><a  href="#" title="{{$contact_actions.suggest.title}}" onclick="window.location.href='{{$contact_actions.suggest.url}}'; return false;">{{$contact_actions.suggest.label}}</a></li>{{/if}}
-							{{if $poll_enabled}}<li role="menuitem"><a  href="#" title="{{$contact_actions.update.title}}" onclick="window.location.href='{{$contact_actions.update.url}}'; return false;">{{$contact_actions.update.label}}</a></li>{{/if}}
+							{{if $lblsuggest}}<li role="menuitem"><a href="{{$contact_actions.suggest.url}}" title="{{$contact_actions.suggest.title}}">{{$contact_actions.suggest.label}}</a></li>{{/if}}
+							{{if $poll_enabled}}<li role="menuitem"><a href="{{$contact_actions.update.url}}" title="{{$contact_actions.update.title}}">{{$contact_actions.update.label}}</a></li>{{/if}}
+							{{if $lblsuggest || $poll_enabled}}
 							<li class="divider"></li>
-							<li role="menuitem"><a  href="#" title="{{$contact_actions.block.title}}" onclick="window.location.href='{{$contact_actions.block.url}}'; return false;">{{$contact_actions.block.label}}</a></li>
-							<li role="menuitem"><a  href="#" title="{{$contact_actions.ignore.title}}" onclick="window.location.href='{{$contact_actions.ignore.url}}'; return false;">{{$contact_actions.ignore.label}}</a></li>
-							<li role="menuitem"><a  href="#" title="{{$contact_actions.archive.title}}" onclick="window.location.href='{{$contact_actions.archive.url}}'; return false;">{{$contact_actions.archive.label}}</a></li>
-							<li role="menuitem"><a  href="#" title="{{$contact_actions.delete.title}}" onclick="addToModal('{{$contact_actions.delete.url}}?confirm=1'); return false;">{{$contact_actions.delete.label}}</a></li>
+							{{/if}}
+							<li role="menuitem"><a href="{{$contact_actions.block.url}}" title="{{$contact_actions.block.title}}">{{$contact_actions.block.label}}</a></li>
+							<li role="menuitem"><a href="{{$contact_actions.ignore.url}}" title="{{$contact_actions.ignore.title}}">{{$contact_actions.ignore.label}}</a></li>
+							<li role="menuitem"><a href="{{$contact_actions.archive.url}}" title="{{$contact_actions.archive.title}}">{{$contact_actions.archive.label}}</a></li>
+							<li role="menuitem"><button type="button" class="btn-link" title="{{$contact_actions.delete.title}}" onclick="addToModal('{{$contact_actions.delete.url}}?confirm=1');">{{$contact_actions.delete.label}}</button></li>
 						</ul>
 					</li>
 				</ul>
diff --git a/view/theme/frio/templates/contact_template.tpl b/view/theme/frio/templates/contact_template.tpl
index 264e5a4c61..29801d8be7 100644
--- a/view/theme/frio/templates/contact_template.tpl
+++ b/view/theme/frio/templates/contact_template.tpl
@@ -5,7 +5,7 @@
 		<div class="contact-photo-wrapper dropdown pull-left" >
 			<div class="contact-entry-photo mframe" id="contact-entry-photo-{{$contact.id}}" >
 
-				<a class="dropdown-toggle" id="contact-photo-menu-{{$contact.id}}" type="button"  data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" >
+				<button type="button" class="btn btn-link dropdown-toggle" id="contact-photo-menu-{{$contact.id}}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" >
 					<div class="contact-photo-image-wrapper hidden-xs">
 						<img class="contact-photo media-object xl" src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" />
 
@@ -24,7 +24,7 @@
 							<span class="contact-photo-overlay-content overlay-xs"><i class="fa fa-angle-down"></i></span>
 						</div>
 					</div>
-				</a>
+				</button>
 
 
 				{{if $contact.photo_menu}}
@@ -33,7 +33,7 @@
 					{{if $c.2}}
 					<li role="menuitem"><a target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
 					{{elseif $c.3}}
-					<li role="menuitem"><a onclick="addToModal('{{$c.1}}')">{{$c.0}}</a></li>
+					<li role="menuitem"><button type="button" class="btn-link" onclick="addToModal('{{$c.1}}')">{{$c.0}}</button></li>
 					{{else}}
 					<li role="menuitem"><a href="{{$c.1}}">{{$c.0}}</a></li>
 					{{/if}}
@@ -48,13 +48,13 @@
 		<div class="media-body">
 			{{* The contact actions like private mail, delete contact, edit contact and so on *}}
 			<div class="contact-actions pull-right nav-pills preferences hidden-xs">
-				{{if $contact.photo_menu.pm}}<a class="contact-action-link" onclick="addToModal('{{$contact.photo_menu.pm.1}}')" data-toggle="tooltip" title="{{$contact.photo_menu.pm.0}}"><i class="fa fa-envelope" aria-hidden="true"></i></a>{{/if}}
-				{{if $contact.photo_menu.poke}}<a class="contact-action-link" onclick="addToModal('{{$contact.photo_menu.poke.1}}')" data-toggle="tooltip" title="{{$contact.photo_menu.poke.0}}"><i class="fa fa-heartbeat" aria-hidden="true"></i></a>{{/if}}
-				{{if $contact.photo_menu.network}}<a class="contact-action-link" href="{{$contact.photo_menu.network.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.network.0}}"><i class="fa fa-cloud" aria-hidden="true"></i></a>{{/if}}
-				{{if $contact.photo_menu.edit}}<a class="contact-action-link" href="{{$contact.photo_menu.edit.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.edit.0}}"><i class="fa fa-pencil" aria-hidden="true"></i></a>{{/if}}
-				{{if $contact.photo_menu.drop}}<a class="contact-action-link" onclick="addToModal('{{$contact.photo_menu.drop.1}}')" data-toggle="tooltip" title="{{$contact.photo_menu.drop.0}}"><i class="fa fa-user-times" aria-hidden="true"></i></a>{{/if}}
-				{{if $contact.photo_menu.follow}}<a class="contact-action-link" href="{{$contact.photo_menu.follow.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.follow.0}}"><i class="fa fa-user-plus" aria-hidden="true"></i></a>{{/if}}
-				{{if $contact.photo_menu.hide}}<a class="contact-action-link" href="{{$contact.photo_menu.hide.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.hide.0}}"><i class="fa fa-times" aria-hidden="true"></i></a>{{/if}}
+				{{if $contact.photo_menu.pm     }}<button type="button" class="contact-action-link btn-link" onclick="addToModal('{{$contact.photo_menu.pm.1}}')" data-toggle="tooltip" title="{{$contact.photo_menu.pm.0}}"><i class="fa fa-envelope" aria-hidden="true"></i></button>{{/if}}
+				{{if $contact.photo_menu.poke   }}<button type="button" class="contact-action-link btn-link" onclick="addToModal('{{$contact.photo_menu.poke.1}}')" data-toggle="tooltip" title="{{$contact.photo_menu.poke.0}}"><i class="fa fa-heartbeat" aria-hidden="true"></i></button>{{/if}}
+				{{if $contact.photo_menu.network}}<a class="contact-action-link btn-link" href="{{$contact.photo_menu.network.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.network.0}}"><i class="fa fa-cloud" aria-hidden="true"></i></a>{{/if}}
+				{{if $contact.photo_menu.edit   }}<a class="contact-action-link btn-link" href="{{$contact.photo_menu.edit.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.edit.0}}"><i class="fa fa-pencil" aria-hidden="true"></i></a>{{/if}}
+				{{if $contact.photo_menu.drop   }}<button type="button" class="contact-action-link btn-link" onclick="addToModal('{{$contact.photo_menu.drop.1}}')" data-toggle="tooltip" title="{{$contact.photo_menu.drop.0}}"><i class="fa fa-user-times" aria-hidden="true"></i></button>{{/if}}
+				{{if $contact.photo_menu.follow }}<a class="contact-action-link btn-link" href="{{$contact.photo_menu.follow.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.follow.0}}"><i class="fa fa-user-plus" aria-hidden="true"></i></a>{{/if}}
+				{{if $contact.photo_menu.hide   }}<a class="contact-action-link btn-link" href="{{$contact.photo_menu.hide.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.hide.0}}"><i class="fa fa-times" aria-hidden="true"></i></a>{{/if}}
 			</div>
 
 			{{* The contact description (e.g. Name, Network, kind of connection and so on *}}
@@ -85,8 +85,8 @@
 
 </div>
 
-		
-{{* the following part is a nearly a copy of the part above but it is modyfied for working with js.
+
+{{* the following part is a nearly a copy of the part above but it is modified for working with js.
 We use this part to filter the contacts with jquery.textcomplete *}}
 <div class="javascript-template" rel="contact-template" style="display: none">
 	<div class="contact-wrapper media" id="contact-entry-wrapper-{$id}" >
@@ -95,7 +95,7 @@ We use this part to filter the contacts with jquery.textcomplete *}}
 			<div class="contact-photo-wrapper dropdown pull-left" >
 				<div class="contact-entry-photo mframe" id="contact-entry-photo-{$id}" >
 
-					<a class="dropdown-toggle" id="contact-photo-menu-{$id}" type="button"  data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" >
+					<button type="button" class="btn btn-link dropdown-toggle" id="contact-photo-menu-{$id}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" >
 						<div class="contact-photo-image-wrapper hidden-xs">
 							<img class="contact-photo media-object xl" src="{$thumb}" {11} alt="{$name}" />
 
@@ -114,7 +114,7 @@ We use this part to filter the contacts with jquery.textcomplete *}}
 								<span class="contact-photo-overlay-content overlay-xs"><i class="fa fa-angle-down"></i></span>
 							</div>
 						</div>
-					</a>
+					</button>
 
 
 					{if $photo_menu}
@@ -123,7 +123,7 @@ We use this part to filter the contacts with jquery.textcomplete *}}
 						{if $c.2}
 						<li role="menuitem"><a target="redir" href="{$c.1}">{$c.0}</a></li>
 						{elseif $c.3}
-						<li role="menuitem"><a onclick="addToModal('{$c.1}')">{$c.0}</a></li>
+						<li role="menuitem"><button type="button" class="btn-link" onclick="addToModal('{$c.1}')">{$c.0}</button></li>
 						{else}
 						<li role="menuitem"><a href="{$c.1}">{$c.0}</a></li>
 						{/if}
@@ -138,12 +138,12 @@ We use this part to filter the contacts with jquery.textcomplete *}}
 			<div class="media-body">
 				{{* The contact actions like private mail, delete contact, edit contact and so on *}}
 				<div class="contact-actions pull-right nav-pills preferences hidden-xs">
-					{if $photo_menu.pm}<a class="contact-action-link" onclick="addToModal('{$photo_menu.pm.1}')" data-toggle="tooltip" title="{$photo_menu.pm.0}"><i class="fa fa-envelope" aria-hidden="true"></i></a>{/if}
-					{if $photo_menu.poke}<a class="contact-action-link" onclick="addToModal('{$photo_menu.poke.1}')" data-toggle="tooltip" title="{$photo_menu.poke.0}"><i class="fa fa-heartbeat" aria-hidden="true"></i></a>{/if}
-					{if $photo_menu.network}<a class="contact-action-link" href="{$photo_menu.network.1}" data-toggle="tooltip" title="{$photo_menu.network.0}"><i class="fa fa-cloud" aria-hidden="true"></i></a>{/if}
-					{if $photo_menu.edit}<a class="contact-action-link" href="{$photo_menu.edit.1}" data-toggle="tooltip" title="{$photo_menu.edit.0}"><i class="fa fa-pencil" aria-hidden="true"></i></a>{/if}
-					{if $photo_menu.drop}<a class="contact-action-link" href="{$photo_menu.drop.1}" data-toggle="tooltip" title="{$photo_menu.drop.0}"><i class="fa fa-user-times" aria-hidden="true"></i></a>{/if}
-					{if $photo_menu.follow}<a class="contact-action-link" href="{$photo_menu.follow.1}" data-toggle="tooltip" title="{$photo_menu.follow.0}"><i class="fa fa-user-plus" aria-hidden="true"></i></a>{/if}
+					{if $photo_menu.pm     }<button type="button" class="contact-action-link btn-link" onclick="addToModal('{$photo_menu.pm.1}')" data-toggle="tooltip" title="{$photo_menu.pm.0}"><i class="fa fa-envelope" aria-hidden="true"></i></a>{/if}
+					{if $photo_menu.poke   }<button type="button" class="contact-action-link btn-link" onclick="addToModal('{$photo_menu.poke.1}')" data-toggle="tooltip" title="{$photo_menu.poke.0}"><i class="fa fa-heartbeat" aria-hidden="true"></i></a>{/if}
+					{if $photo_menu.network}<a class="contact-action-link btn-link" href="{$photo_menu.network.1}" data-toggle="tooltip" title="{$photo_menu.network.0}"><i class="fa fa-cloud" aria-hidden="true"></i></a>{/if}
+					{if $photo_menu.edit   }<a class="contact-action-link btn-link" href="{$photo_menu.edit.1}" data-toggle="tooltip" title="{$photo_menu.edit.0}"><i class="fa fa-pencil" aria-hidden="true"></i></a>{/if}
+					{if $photo_menu.drop   }<a class="contact-action-link btn-link" href="{$photo_menu.drop.1}" data-toggle="tooltip" title="{$photo_menu.drop.0}"><i class="fa fa-user-times" aria-hidden="true"></i></a>{/if}
+					{if $photo_menu.follow }<a class="contact-action-link btn-link" href="{$photo_menu.follow.1}" data-toggle="tooltip" title="{$photo_menu.follow.0}"><i class="fa fa-user-plus" aria-hidden="true"></i></a>{/if}
 				</div>
 
 				{{* The contact description (e.g. Name, Network, kind of connection and so on *}}
diff --git a/view/theme/frio/templates/contacts-template.tpl b/view/theme/frio/templates/contacts-template.tpl
index d51298038b..43330edc95 100644
--- a/view/theme/frio/templates/contacts-template.tpl
+++ b/view/theme/frio/templates/contacts-template.tpl
@@ -36,14 +36,14 @@
 		{{* We put the contact batch actions in a dropdown menu *}}
 		<ul class="nav nav-pills preferences">
 			<li class="dropdown pull-right">
-				<a class="btn btn-link btn-sm dropdown-toggle" type="button" id="BatchActionDropdownMenuTools" data-toggle="dropdown" aria-expanded="true">
+				<button type="button" class="btn btn-link btn-sm dropdown-toggle" id="BatchActionDropdownMenuTools" data-toggle="dropdown" aria-expanded="true">
 					<i class="fa fa-angle-down"></i>&nbsp;{{$h_batch_actions}}
-				</a>
+				</button>
 				<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="BatchActionDropdownMenuTools">
 				{{foreach $batch_actions as $n=>$l}}
 					<li role="menuitem">
 						{{* call the js batch_submit_handler. Have a look at the buttom of this file *}}
-						<a onclick="batch_submit_handler('{{$n}}', '{{$l}}')">{{$l}}</a>
+						<button type="button" class="btn-link" onclick="batch_submit_handler('{{$n}}', '{{$l}}')">{{$l}}</button>
 					</li>
 				{{/foreach}}
 				</ul>
@@ -75,7 +75,7 @@
      return false;
     }
   });
- 
+
   // add javascript confirm dialog to "drop" links. Plain html url have "?confirm=1" to show confirmation form, we need to remove it
   $(".drop").each(function() {
    $(this).attr('href', $(this).attr('href').replace("confirm=1","") );
@@ -87,7 +87,7 @@
      return false;
     }
    });
-   
+
   });
  });
 
diff --git a/view/theme/frio/templates/event.tpl b/view/theme/frio/templates/event.tpl
index ee28756866..38f061d9a4 100644
--- a/view/theme/frio/templates/event.tpl
+++ b/view/theme/frio/templates/event.tpl
@@ -18,7 +18,7 @@
 
 			<div class="event-buttons pull-right">
 				{{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" class="btn "><i class="fa fa-external-link" aria-hidden="true"></i></a>{{/if}}
-				{{if $event.edit}}<a onclick="eventEdit('{{$event.edit.0}}')" title="{{$event.edit.1}}" class="btn"><i class="fa fa-pencil" aria-hidden="true"></i></a>{{/if}}
+				{{if $event.edit}}<button type="button" class="btn" onclick="eventEdit('{{$event.edit.0}}')" title="{{$event.edit.1}}"><i class="fa fa-pencil" aria-hidden="true"></i></button>{{/if}}
 			</div>
 			<div class="clear"></div>
 		</div>
diff --git a/view/theme/frio/templates/event_form.tpl b/view/theme/frio/templates/event_form.tpl
index 42d0bb3754..ebbf83785f 100644
--- a/view/theme/frio/templates/event_form.tpl
+++ b/view/theme/frio/templates/event_form.tpl
@@ -7,12 +7,24 @@
 	<ul id="event-nav" class="nav nav-tabs event-nav" role="menubar" data-tabs="tabs">
 		{{* Mark the first list entry as active because it is the first which is active after opening
 			the modal. Changing of the activity status is done by js in event_head.tpl *}}
-		<li class="active" role="menuitem"><a id="event-edit-lnk" onclick="eventEditActive(); return false;">{{$basic}}</a></li>
-		<li role="menuitem"><a id="event-desc-lnk" onclick="eventDescActive(); return false;">{{$advanced}}</a></li>
-		{{if $acl}}<li role="menuitem" {{if !$sh_checked}} style="display: none"{{/if}}><a id="event-perms-lnk" onclick="eventAclActive();return false;">{{$permissions}}</a></li>{{/if}}
-		{{if $preview}}<li role="menuitem"><a id="event-preview-lnk" onclick="eventPreviewActive();return false;">{{$preview}}</a></li>{{/if}}
+		<li class="active" role="menuitem">
+			<button type="button" class="btn btn-link" id="event-edit-lnk" onclick="eventEditActive();">{{$basic}}</button>
+		</li>
+		<li role="menuitem">
+			<button type="button" class="btn btn-link" id="event-desc-lnk" onclick="eventDescActive();">{{$advanced}}</button>
+		</li>
+		{{if $acl}}
+		<li role="menuitem" {{if !$sh_checked}} style="display: none"{{/if}}>
+			<button type="button" class="btn btn-link" id="event-perms-lnk" onclick="eventAclActive();">{{$permissions}}</button>
+		</li>
+		{{/if}}
+		{{if $preview}}
+		<li role="menuitem">
+			<button type="button" class="btn btn-link" id="event-preview-lnk" onclick="eventPreviewActive();">{{$preview}}</button>
+		</li>
+		{{/if}}
 		{{* commented out because it isn't implemented yet
-		<li role="menuitem"><a id="event-preview-link" onclick="fbrowserActive(); return false;"> Browser </a></li>
+		<li role="menuitem"><button type="button" class="btn btn-link" id="event-preview-link" onclick="fbrowserActive();"> Browser </button></li>
 		*}}
 	</ul>
 
@@ -66,41 +78,41 @@
 				<ul id="event-desc-text-edit-bb" class="comment-edit-bb comment-icon-list nav nav-pills hidden-xs pull-left">
 					{{* commented out because it isn't implemented yet
 					<li>
-						<a class="icon" style="cursor: pointer;" title="{{$edimg|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="desc">
+						<button type="button" class="btn btn-link icon" style="cursor: pointer;" title="{{$edimg|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="desc">
 							<i class="fa fa-picture-o"></i>
-						</a>
+						</button>
 					</li>
 					*}}
 					<li>
-						<a class="icon bb-url" style="cursor: pointer;" title="{{$edurl|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="url" data-id="desc">
+						<button type="button" class="btn btn-link icon bb-url" style="cursor: pointer;" title="{{$edurl|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="url" data-id="desc">
 							<i class="fa fa-link"></i>
-						</a>
+						</button>
 					</li>
 					<li>
-						<a class="icon bb-video" style="cursor: pointer;" title="{{$edvideo|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="video" data-id="desc">
+						<button type="button" class="btn btn-link icon bb-video" style="cursor: pointer;" title="{{$edvideo|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="video" data-id="desc">
 							<i class="fa fa-video-camera"></i>
-						</a>
+						</button>
 					</li>
 
 					<li>
-						<a class="icon underline" style="cursor: pointer;" title="{{$eduline|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="u" data-id="desc">
+						<button type="button" class="btn btn-link icon underline" style="cursor: pointer;" title="{{$eduline|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="u" data-id="desc">
 							<i class="fa fa-underline"></i>
-						</a>
+						</button>
 					</li>
 					<li>
-						<a class="icon italic" style="cursor: pointer;" title="{{$editalic|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="i" data-id="desc">
+						<button type="button" class="btn btn-link icon italic" style="cursor: pointer;" title="{{$editalic|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="i" data-id="desc">
 							<i class="fa fa-italic"></i>
-						</a>
+						</button>
 					</li>
 					<li>
-						<a class="icon bold" style="cursor: pointer;"  title="{{$edbold|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="b" data-id="desc">
+						<button type="button" class="btn btn-link icon bold" style="cursor: pointer;"  title="{{$edbold|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="b" data-id="desc">
 							<i class="fa fa-bold"></i>
-						</a>
+						</button>
 					</li>
 					<li>
-						<a class="icon quote" style="cursor: pointer;" title="{{$edquote|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="quote" data-id="desc">
+						<button type="button" class="btn btn-link icon quote" style="cursor: pointer;" title="{{$edquote|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="quote" data-id="desc">
 							<i class="fa fa-quote-left"></i>
-						</a>
+						</button>
 					</li>
 				</ul>
 				<div class="clear"></div>
@@ -113,41 +125,41 @@
 				<ul id="comment-tools-loc" class="comment-edit-bb comment-icon-list nav nav-pills hidden-xs pull-left">
 					{{* commented out because it isn't implemented yet
 					<li>
-						<a class="icon" style="cursor: pointer;" title="{{$edimg|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="loc">
+						<button type="button" class="btn btn-link icon" style="cursor: pointer;" title="{{$edimg|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="loc">
 							<i class="fa fa-picture-o"></i>
-						</a>
+						</button>
 					</li>
 					*}}
 					<li>
-						<a class="icon bb-url" style="cursor: pointer;" title="{{$edurl|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="url" data-id="loc">
+						<button type="button" class="btn btn-link icon bb-url" style="cursor: pointer;" title="{{$edurl|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="url" data-id="loc">
 							<i class="fa fa-link"></i>
-						</a>
+						</button>
 					</li>
 					<li>
-						<a class="icon bb-video" style="cursor: pointer;" title="{{$edvideo|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="video" data-id="loc">
+						<button type="button" class="btn btn-link icon bb-video" style="cursor: pointer;" title="{{$edvideo|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="video" data-id="loc">
 							<i class="fa fa-video-camera"></i>
-						</a>
+						</button>
 					</li>
 
 					<li>
-						<a class="icon underline" style="cursor: pointer;" title="{{$eduline|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="u" data-id="loc">
+						<button type="button" class="btn btn-link icon underline" style="cursor: pointer;" title="{{$eduline|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="u" data-id="loc">
 							<i class="fa fa-underline"></i>
-						</a>
+						</button>
 					</li>
 					<li>
-						<a class="icon italic" style="cursor: pointer;" title="{{$editalic|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="i" data-id="loc">
+						<button type="button" class="btn btn-link icon italic" style="cursor: pointer;" title="{{$editalic|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="i" data-id="loc">
 							<i class="fa fa-italic"></i>
-						</a>
+						</button>
 					</li>
 					<li>
-						<a class="icon bold" style="cursor: pointer;"  title="{{$edbold|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="b" data-id="loc">
+						<button type="button" class="btn btn-link icon bold" style="cursor: pointer;"  title="{{$edbold|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="b" data-id="loc">
 							<i class="fa fa-bold"></i>
-						</a>
+						</button>
 					</li>
 					<li>
-						<a class="icon quote" style="cursor: pointer;" title="{{$edquote|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="quote" data-id="loc">
+						<button type="button" class="btn btn-link icon quote" style="cursor: pointer;" title="{{$edquote|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="quote" data-id="loc">
 							<i class="fa fa-quote-left"></i>
-						</a>
+						</button>
 					</li>
 				</ul>
 				<div class="clear"></div>
diff --git a/view/theme/frio/templates/events_js.tpl b/view/theme/frio/templates/events_js.tpl
index dec47aed24..8f7b3add06 100644
--- a/view/theme/frio/templates/events_js.tpl
+++ b/view/theme/frio/templates/events_js.tpl
@@ -3,7 +3,7 @@
 	{{include file="section_title.tpl" title=$title}}
 
 	{{* The link to create a new event *}}
-	<div id="new-event-link"><a onclick="addToModal('{{$new_event.0}}')" >{{$new_event.1}}</a></div>
+	<div id="new-event-link"><button type="button" class="btn btn-link" onclick="addToModal('{{$new_event.0}}')" >{{$new_event.1}}</button></div>
 
 	{{* We create our own fullcallendar header (with title & calendar view *}}
 	<div id="fc-header">
@@ -11,21 +11,21 @@
 			{{* The dropdown to change the callendar view *}}
 			<ul class="nav nav-pills">
 				<li class="dropdown pull-right">
-					<a class="btn btn-link btn-sm dropdown-toggle" type="button" id="event-calendar-views" data-toggle="dropdown" aria-expanded="true">
+					<button type="button" class="btn btn-link btn-sm dropdown-toggle" type="button" id="event-calendar-views" data-toggle="dropdown" aria-expanded="true">
 						<i class="fa fa-angle-down"></i> {{$view}}
-					</a>
+					</button>
 					<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="event-calendar-views">
 						<li role="menuitem">
-							<a onclick="changeView('changeView', 'month');$('#events-calendar').fullCalendar('option', {contentHeight: '', aspectRatio: 1});">{{$month}}</a>
+							<button type="button" class="btn-link" onclick="changeView('changeView', 'month');$('#events-calendar').fullCalendar('option', {contentHeight: '', aspectRatio: 1});">{{$month}}</button>
 						</li>
 						<li role="menuitem">
-							<a onclick="changeView('changeView', 'agendaWeek');$('#events-calendar').fullCalendar('option', 'contentHeight', 'auto');">{{$week}}</a>
+							<button type="button" class="btn-link" onclick="changeView('changeView', 'agendaWeek');$('#events-calendar').fullCalendar('option', 'contentHeight', 'auto');">{{$week}}</button>
 						</li>
 						<li role="menuitem">
-							<a onclick="changeView('changeView', 'agendaDay');$('#events-calendar').fullCalendar('option', 'contentHeight', 'auto');">{{$day}}</a>
+							<button type="button" class="btn-link" onclick="changeView('changeView', 'agendaDay');$('#events-calendar').fullCalendar('option', 'contentHeight', 'auto');">{{$day}}</button>
 						</li>
 						<li role="menuitem">
-							<a onclick="changeView('changeView', 'listMonth');$('#events-calendar').fullCalendar('option', 'contentHeight', 'auto');">{{$list}}</a>
+							<button type="button" class="btn-link" onclick="changeView('changeView', 'listMonth');$('#events-calendar').fullCalendar('option', 'contentHeight', 'auto');">{{$list}}</button>
 						</li>
 					</ul>
 				</li>
diff --git a/view/theme/frio/templates/filebrowser.tpl b/view/theme/frio/templates/filebrowser.tpl
index 55cecabb8f..3fede8f7c9 100644
--- a/view/theme/frio/templates/filebrowser.tpl
+++ b/view/theme/frio/templates/filebrowser.tpl
@@ -12,17 +12,17 @@
 	<input id="fb-type" type="hidden" name="type" value="{{$type}}" />
 
 	<div class="error hidden">
-		<span></span> <a href="#" class='close'>X</a>
+		<span></span> <button type="button" class="btn btn-link" class="close">X</a>
 	</div>
 
 	<div class="path">
-		{{foreach $path as $p}}<a href="#" data-folder="{{$p.0}}">{{$p.1}}</a>{{/foreach}}
+		{{foreach $path as $p}}<button type="button" class="btn-link" data-folder="{{$p.0}}">{{$p.1}}</button>{{/foreach}}
 	</div>
 
 	{{if $folders }}
 	<div class="folders">
 		<ul>
-			{{foreach $folders as $f}}<li><a href="#" data-folder="{{$f.0}}">{{$f.1}}</a></li>{{/foreach}}
+			{{foreach $folders as $f}}<li><button type="button" class="btn-link" data-folder="{{$f.0}}">{{$f.1}}</button></li>{{/foreach}}
 		</ul>
 	</div>
 	{{/if}}
@@ -30,10 +30,10 @@
 	<div class="list">
 		{{foreach $files as $f}}
 		<div class="photo-album-image-wrapper">
-			<a href="#" class="photo-album-photo-link" data-link="{{$f.0}}" data-filename="{{$f.1}}" data-img="{{$f.2}}">
+			<button type="button" class="btn btn-link" class="photo-album-photo-link" data-link="{{$f.0}}" data-filename="{{$f.1}}" data-img="{{$f.2}}">
 				<img src="{{$f.2}}">
 				<p>{{$f.1}}</p>
-			</a>
+			</button>
 		</div>
 		{{/foreach}}
 	</div>
@@ -42,9 +42,3 @@
 		<button id="upload-{{$type}}"><img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait|escape:'html'}}" style="display: none;" /> {{"Upload"|t}}</button>
 	</div>
 </div>
-
-<script>
-    $(document).ready(function(){
-
-	});
-</script>
\ No newline at end of file
diff --git a/view/theme/frio/templates/group_side.tpl b/view/theme/frio/templates/group_side.tpl
index e892c9bed0..688ad28190 100644
--- a/view/theme/frio/templates/group_side.tpl
+++ b/view/theme/frio/templates/group_side.tpl
@@ -34,7 +34,7 @@
 	{{if $newgroup}}
 	<div id="sidebar-new-group">
 		{{* show the input field by clicking "new group" *}}
-		<a onclick="javascript:$('#group-new-form').fadeIn('fast');return false;">{{$createtext}}</a>
+		<button type="button" class="btn btn-link" onclick="javascript:$('#group-new-form').fadeIn('fast');">{{$createtext}}</button>
 		<form id="group-new-form" action="group/new" method="post" style="display:none;">
 			<div class="form-group">
 				<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
diff --git a/view/theme/frio/templates/jot.tpl b/view/theme/frio/templates/jot.tpl
index 90d17f6c47..edab2a0745 100644
--- a/view/theme/frio/templates/jot.tpl
+++ b/view/theme/frio/templates/jot.tpl
@@ -1,6 +1,6 @@
 
 {{* The button to open the jot - in This theme we move the button with js to the second nav bar *}}
-<button class="btn btn-sm btn-main pull-right" id="jotOpen" onclick="jotShow(); return false;"><i class="fa fa-pencil-square-o fa-2x"></i></button>
+<button class="btn btn-sm btn-main pull-right" id="jotOpen" onclick="jotShow();"><i class="fa fa-pencil-square-o fa-2x"></i></button>
 
 
 <div id="jot-content">
@@ -15,10 +15,22 @@
 			<ul class="nav nav-tabs hidden-xs jot-nav" role="menubar" data-tabs="tabs">
 				{{* Mark the first list entry as active because it is the first which is active after opening
 					the modal. Changing of the activity status is done by js in jot.tpl-header *}}
-				<li class="active" role="menuitem"><a id="jot-text-lnk" class="jot-text-lnk" onclick="jotActive(); return false;">{{$message}}</a></li>
-				{{if $acl}}<li role="menuitem"><a id="jot-perms-lnk" class="jot-perms-lnk" onclick="aclActive();return false;">{{$shortpermset}}</a></li>{{/if}}
-				{{if $preview}}<li role="menuitem"><a id="jot-preview-lnk" class="jot-preview-lnk" onclick="previewActive();return false;">{{$preview}}</a></li>{{/if}}
-				<li role="menuitem"><a id="jot-browser-link" onclick="fbrowserActive(); return false;">{{$browser}}</a></li>
+				<li class="active" role="menuitem">
+					<button type="button" class="btn btn-link jot-text-lnk" id="jot-text-lnk" onclick="jotActive();">{{$message}}</button>
+				</li>
+				{{if $acl}}
+				<li role="menuitem">
+					<button type="button" class="btn btn-link jot-perms-lnk" id="jot-perms-lnk" onclick="aclActive();">{{$shortpermset}}</button>
+				</li>
+				{{/if}}
+				{{if $preview}}
+				<li role="menuitem">
+					<button type="button" class="btn btn-link jot-preview-lnk" id="jot-preview-lnk" onclick="previewActive();">{{$preview}}</button>
+				</li>
+				{{/if}}
+				<li role="menuitem">
+					<button type="button" class="btn btn-link" id="jot-browser-link" onclick="fbrowserActive();">{{$browser}}</button>
+				</li>
 			</ul>
 
 			<div class="dropdown dropdown-head dropdown-mobile-jot jot-nav hidden-lg hidden-md hidden-sm" role="menubar" data-tabs="tabs" style="float: left;">
@@ -26,9 +38,19 @@
 				<ul class="dropdown-menu nav nav-pills">
 					{{* mark the first list entry as active because it is the first which is active after opening
 					the modal. Changing of the activity status is done by js in jot.tpl-header *}}
-					<li role="menuitem" style="display: none;"><a id="jot-text-lnk-mobile" class="jot-text-lnk" onclick="jotActive(); return false;">{{$message}}</a></li>
-					{{if $acl}}<li role="menuitem"><a id="jot-perms-lnk-mobile" class="jot-perms-lnk" onclick="aclActive();return false;">{{$shortpermset}}</a></li>{{/if}}
-					{{if $preview}}<li role="menuitem"><a id="jot-preview-lnk-mobile" class="jot-preview-lnk" onclick="previewActive();return false;">{{$preview}}</a></li>{{/if}}
+					<li role="menuitem" style="display: none;">
+						<button type="button" class="btn btn-link jot-text-lnk" id="jot-text-lnk-mobile" onclick="jotActive();">{{$message}}</button>
+					</li>
+					{{if $acl}}
+					<li role="menuitem">
+						<button type="button" class="btn btn-link jot-perms-lnk" id="jot-perms-lnk-mobile" onclick="aclActive();">{{$shortpermset}}</button>
+					</li>
+					{{/if}}
+					{{if $preview}}
+					<li role="menuitem">
+						<button type="button" class="btn btn-link jot-preview-lnk" id="jot-preview-lnk-mobile" onclick="previewActive();">{{$preview}}</button>
+					</li>
+					{{/if}}
 				</ul>
 			</div>
 			<button type="button" class="close hidden-lg hidden-md hidden-sm" data-dismiss="modal" style="float: right;">&times;</button>
@@ -69,13 +91,13 @@
 						{{* uncomment the button for "wall-immage-upload" because we have integrated it directly in the jot modal
 						<li><a href="#" id="wall-image-upload" title="{{$upload}}"><i class="fa fa-picture-o"></i></a></li>
 						*}}
-						<li><a href="#" onclick="return false;" id="wall-file-upload"  title="{{$attach}}"><i class="fa fa-paperclip"></i></a></li>
-						<li><a id="profile-link"  ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="{{$weblink}}"><i class="fa fa-link"></i></a></li>
-						<li><a id="profile-video" onclick="jotVideoURL();return false;" title="{{$video}}"><i class="fa fa-film"></i></a></li>
-						<li><a id="profile-audio" onclick="jotAudioURL();return false;" title="{{$audio}}"><i class="fa fa-music"></i></a></li>
-						<li><a id="profile-location" onclick="jotGetLocation();return false;" title="{{$setloc}}"><i class="fa fa-map-marker"></i></a></li>
+						<li><button type="button" class="btn btn-link" id="wall-file-upload" title="{{$attach}}"><i class="fa fa-paperclip"></i></button></li>
+						<li><button type="button" class="btn btn-link" id="profile-link"  ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink();" title="{{$weblink}}"><i class="fa fa-link"></i></button></li>
+						<li><button type="button" class="btn btn-link" id="profile-video" onclick="jotVideoURL();" title="{{$video}}"><i class="fa fa-film"></i></button></li>
+						<li><button type="button" class="btn btn-link" id="profile-audio" onclick="jotAudioURL();" title="{{$audio}}"><i class="fa fa-music"></i></button></li>
+						<li><button type="button" class="btn btn-link" id="profile-location" onclick="jotGetLocation();" title="{{$setloc}}"><i class="fa fa-map-marker"></i></button></li>
 						<!-- TODO: waiting for a better placement
-						<li><a id="profile-nolocation" onclick="jotClearLocation();return false;" title="{{$noloc}}">{{$shortnoloc}}</a></li>
+						<li><button type="button" class="btn btn-link" id="profile-nolocation" onclick="jotClearLocation();" title="{{$noloc}}">{{$shortnoloc}}</button></li>
 						-->
 
 						<li class="pull-right"><button class="btn btn-primary" id="jot-submit" type="submit" id="profile-jot-submit" name="submit" ><i class="fa fa-slideshare fa-fw"></i> {{$share}}</button></li>
diff --git a/view/theme/frio/templates/nav.tpl b/view/theme/frio/templates/nav.tpl
index ef96249ea4..7a4c4b04af 100644
--- a/view/theme/frio/templates/nav.tpl
+++ b/view/theme/frio/templates/nav.tpl
@@ -20,7 +20,7 @@
 	<div class="container">
 		<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 no-padding"><!-- div for navbar width-->
 			<!-- Brand and toggle get grouped for better mobile display -->
-			<div class="topbar-nav" role=”navigation”>
+			<div class="topbar-nav" role="navigation">
 
 				{{* Buttons for the mobile view *}}
 				<button role="menu" type="button" class="navbar-toggle collapsed pull-right" data-toggle="offcanvas" data-target="#myNavmenu">
@@ -84,7 +84,7 @@
 									<div class="arrow"></div>
 									{{$nav.notifications.1}}
 									<div class="dropdown-header-link">
-										<a href="#" onclick="notifyMarkAll(); return false;" data-toggle="tooltip" title="{{$nav.notifications.mark.3}}" class="">{{$nav.notifications.mark.1}}</a>
+										<button type="button" class="btn btn-link" onclick="notifyMarkAll();" data-toggle="tooltip" title="{{$nav.notifications.mark.3}}">{{$nav.notifications.mark.1}}</button>
 									</div>
 
 								</li>
diff --git a/view/theme/frio/templates/profile_advanced.tpl b/view/theme/frio/templates/profile_advanced.tpl
index 7c9a7bef1a..694d5c75df 100644
--- a/view/theme/frio/templates/profile_advanced.tpl
+++ b/view/theme/frio/templates/profile_advanced.tpl
@@ -1,23 +1,3 @@
-
-<script language="javascript" type="text/javascript">
-	// the following functions show/hide the specific profile page content 
-	// in dependence of the selected nav
-	function profileStandardActive() {
-		$("#profile-content-advanced").hide();
-		$("#profile-content-standard").show();
-		$("#profile-tab-advanced-link").parent("li").removeClass("active");
-		$("#profile-tab-standard-link").parent("li").addClass("active");
-	}
-
-	function profileAdvancedActive() {
-		$("#profile-content-standard").hide();
-		$("#profile-content-advanced").show();
-		$("#profile-tab-standard-link").parent("li").removeClass("active");
-		$("#profile-tab-advanced-link").parent("li").addClass("active");
-	}
-
-</script>
-
 <div id="profile-page" class="generic-page-wrapper">
 	<h3 class="">{{$title}}</h3>
 
@@ -34,208 +14,214 @@
 	{{/if}}
 
 	{{* Frio does split the profile information in "standard" and "advanced". This is the tab menu for swithching between this modes *}}
-	<ul id="profile-menu" class="nav nav-tabs" role="menubar" data-tabs="tabs">
-		<li class="active" role="menuitem"><a id="profile-tab-standard-link" onclick="profileStandardActive(); return false;">{{$basic}}</a></li>
-		<li role="menuitem"><a id="profile-tab-advanced-link" onclick="profileAdvancedActive(); return false;">{{$advanced}}</a></li>
+	<ul id="profile-menu" class="nav nav-tabs" role="tablist">
+		<li role="presentation" class="active">
+			<a href="#profile-content-standard" aria-controls="profile-content-standard" role="tab" data-toggle="tab">{{$basic}}</a>
+		</li>
+		<li role="presentation">
+			<a href="#profile-content-advanced" aria-controls="profile-content-advanced" role="tab" data-toggle="tab">{{$advanced}}</a>
+		</li>
 	</ul>
 
-	<div id="profile-content-standard">
-		<div id="aprofile-fullname" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-			<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.fullname.0}}</div>
-			<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.fullname.1}}</div>
+	<div class="tab-content">
+		<div role="tabpanel" class="tab-pane active" id="profile-content-standard">
+			<div id="aprofile-fullname" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.fullname.0}}</div>
+				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.fullname.1}}</div>
+			</div>
+
+			{{if $profile.gender}}
+			<div id="aprofile-gender" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+				<hr class="profile-separator">
+				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.gender.0}}</div>
+				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.gender.1}}</div>
+			</div>
+			{{/if}}
+
+			{{if $profile.birthday}}
+			<div id="aprofile-birthday" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+				<hr class="profile-separator">
+				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.birthday.0}}</div>
+				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.birthday.1}}</div>
+			</div>
+			{{/if}}
+
+			{{if $profile.age}}
+			<div id="aprofile-age" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+				<hr class="profile-separator">
+				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.age.0}}</div>
+				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.age.1}}</div>
+			</div>
+			{{/if}}
+
+			{{if $profile.hometown}}
+			<div id="aprofile-hometown" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+				<hr class="profile-separator">
+				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.hometown.0}}</div>
+				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.hometown.1}}</div>
+			</div>
+			{{/if}}
+
+			{{if $profile.marital}}
+			<div id="aprofile-marital" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+				<hr class="profile-separator">
+				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted"><span class="heart">&hearts;</span>  {{$profile.marital.0}}</div>
+				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.marital.1}}{{if $profile.marital.with}} ({{$profile.marital.with}}){{/if}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}</div>
+			</div>
+			{{/if}}
+
+			{{if $profile.homepage}}
+			<div id="aprofile-homepage" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+				<hr class="profile-separator">
+				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.homepage.0}}</div>
+				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.homepage.1}}</div>
+			</div>
+			{{/if}}
+
+			{{if $profile.about}}
+			<div id="aprofile-about" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+				<hr class="profile-separator">
+				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.about.0}}</div>
+				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.about.1}}</div>
+			</div>
+			{{/if}}
+
+			{{if $profile.pub_keywords}}
+			<div id="aprofile-tags" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+				<hr class="profile-separator">
+				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.pub_keywords.0}}</div>
+				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.pub_keywords.1}}</div>
+			</div>
+			{{/if}}
 		</div>
 
-		{{if $profile.gender}}
-		<div id="aprofile-gender" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+		<div role="tabpanel" class="tab-pane advanced" id="profile-content-advanced">
+			{{if $profile.sexual}}
+			<div id="aprofile-sexual" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+				<hr class="profile-separator">
+				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.sexual.0}}</div>
+				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.sexual.1}}</div>
+			</div>
+			{{/if}}
+
+			{{if $profile.politic}}
+			<div id="aprofile-politic" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+				<hr class="profile-separator">
+				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.politic.0}}</div>
+				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.politic.1}}</div>
+			</div>
+			{{/if}}
+
+			{{if $profile.religion}}
+			<div id="aprofile-religion" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+				<hr class="profile-separator">
+				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.religion.0}}</div>
+				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.religion.1}}</div>
+			</div>
+			{{/if}}
+
+
+			{{if $profile.interest}}
+			<div id="aprofile-interest" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+				<hr class="profile-separator">
+				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.interest.0}}</div>
+				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.interest.1}}</div>
+			</div>
+			{{/if}}
+
+			{{if $profile.likes}}
+			<div id="aprofile-likes" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+				<hr class="profile-separator">
+				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.likes.0}}</div>
+				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.likes.1}}</div>
+			</div>
+			{{/if}}
+
+			{{if $profile.dislikes}}
+			<div id="aprofile-dislikes" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+				<hr class="profile-separator">
+				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.dislikes.0}}</div>
+				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.dislikes.1}}</div>
+			</div>
+			{{/if}}
+
+			{{if $profile.contact}}
+			<div id="aprofile-contact" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+				<hr class="profile-separator">
+				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.contact.0}}</div>
+				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.contact.1}}</div>
+			</div>
+			{{/if}}
+
+
+			{{if $profile.music}}
+			<div id="aprofile-music" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+				<hr class="profile-separator">
+				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.music.0}}</div>
+				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.music.1}}</div>
+			</div>
+			{{/if}}
+
+
+			{{if $profile.book}}
+			<div id="aprofile-book" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+				<hr class="profile-separator">
+				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.book.0}}</div>
+				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.book.1}}</div>
+			</div>
+			{{/if}}
+
+
+			{{if $profile.tv}}
+			<div id="aprofile-tv" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+				<hr class="profile-separator">
+				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.tv.0}}</div>
+				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.tv.1}}</div>
+			</div>
+			{{/if}}
+
+
+			{{if $profile.film}}
+			<div id="aprofile-film" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+				<hr class="profile-separator">
+				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.film.0}}</div>
+				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.film.1}}</div>
+			</div>
+			{{/if}}
+
+
+			{{if $profile.romance}}
+			<div id="aprofile-romance" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+				<hr class="profile-separator">
+				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.romance.0}}</div>
+				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.romance.1}}</div>
+			</div>
+			{{/if}}
+
+
+			{{if $profile.work}}
+			<div id="aprofile-work" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
 			<hr class="profile-separator">
-			<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.gender.0}}</div>
-			<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.gender.1}}</div>
+			<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.work.0}}</div>
+			<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.work.1}}</div>
+			</div>
+			{{/if}}
+
+			{{if $profile.education}}
+			<div id="aprofile-education" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+				<hr class="profile-separator">
+				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.education.0}}</div>
+				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.education.1}}</div>
+			</div>
+			{{/if}}
+
+			{{if $profile.forumlist}}
+			<div id="aprofile-forumlist" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+				<hr class="profile-separator">
+				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.forumlist.0}}</div>
+				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.forumlist.1}}</div>
+			</div>
+			{{/if}}
 		</div>
-		{{/if}}
-
-		{{if $profile.birthday}}
-		<div id="aprofile-birthday" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-			<hr class="profile-separator">
-			<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.birthday.0}}</div>
-			<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.birthday.1}}</div>
-		</div>
-		{{/if}}
-
-		{{if $profile.age}}
-		<div id="aprofile-age" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-			<hr class="profile-separator">
-			<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.age.0}}</div>
-			<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.age.1}}</div>
-		</div>
-		{{/if}}
-
-		{{if $profile.hometown}}
-		<div id="aprofile-hometown" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-			<hr class="profile-separator">
-			<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.hometown.0}}</div>
-			<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.hometown.1}}</div>
-		</div>
-		{{/if}}
-
-		{{if $profile.marital}}
-		<div id="aprofile-marital" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-			<hr class="profile-separator">
-			<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted"><span class="heart">&hearts;</span>  {{$profile.marital.0}}</div>
-			<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.marital.1}}{{if $profile.marital.with}} ({{$profile.marital.with}}){{/if}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}</div>
-		</div>
-		{{/if}}
-
-		{{if $profile.homepage}}
-		<div id="aprofile-homepage" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-			<hr class="profile-separator">
-			<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.homepage.0}}</div>
-			<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.homepage.1}}</div>
-		</div>
-		{{/if}}
-
-		{{if $profile.about}}
-		<div id="aprofile-about" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-			<hr class="profile-separator">
-			<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.about.0}}</div>
-			<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.about.1}}</div>
-		</div>
-		{{/if}}
-
-		{{if $profile.pub_keywords}}
-		<div id="aprofile-tags" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-			<hr class="profile-separator">
-			<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.pub_keywords.0}}</div>
-			<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.pub_keywords.1}}</div>
-		</div>
-		{{/if}}
-	</div>
-
-	<div id="profile-content-advanced" style="display: none">
-				{{if $profile.sexual}}
-		<div id="aprofile-sexual" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-			<hr class="profile-separator">
-			<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.sexual.0}}</div>
-			<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.sexual.1}}</div>
-		</div>
-		{{/if}}
-
-		{{if $profile.politic}}
-		<div id="aprofile-politic" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-			<hr class="profile-separator">
-			<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.politic.0}}</div>
-			<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.politic.1}}</div>
-		</div>
-		{{/if}}
-
-		{{if $profile.religion}}
-		<div id="aprofile-religion" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-			<hr class="profile-separator">
-			<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.religion.0}}</div>
-			<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.religion.1}}</div>
-		</div>
-		{{/if}}
-
-
-		{{if $profile.interest}}
-		<div id="aprofile-interest" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-			<hr class="profile-separator">
-			<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.interest.0}}</div>
-			<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.interest.1}}</div>
-		</div>
-		{{/if}}
-
-		{{if $profile.likes}}
-		<div id="aprofile-likes" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-			<hr class="profile-separator">
-			<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.likes.0}}</div>
-			<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.likes.1}}</div>
-		</div>
-		{{/if}}
-
-		{{if $profile.dislikes}}
-		<div id="aprofile-dislikes" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-			<hr class="profile-separator">
-			<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.dislikes.0}}</div>
-			<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.dislikes.1}}</div>
-		</div>
-		{{/if}}
-
-		{{if $profile.contact}}
-		<div id="aprofile-contact" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-			<hr class="profile-separator">
-			<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.contact.0}}</div>
-			<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.contact.1}}</div>
-		</div>
-		{{/if}}
-
-
-		{{if $profile.music}}
-		<div id="aprofile-music" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-			<hr class="profile-separator">
-			<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.music.0}}</div>
-			<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.music.1}}</div>
-		</div>
-		{{/if}}
-
-
-		{{if $profile.book}}
-		<div id="aprofile-book" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-			<hr class="profile-separator">
-			<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.book.0}}</div>
-			<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.book.1}}</div>
-		</div>
-		{{/if}}
-
-
-		{{if $profile.tv}}
-		<div id="aprofile-tv" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-			<hr class="profile-separator">
-			<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.tv.0}}</div>
-			<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.tv.1}}</div>
-		</div>
-		{{/if}}
-
-
-		{{if $profile.film}}
-		<div id="aprofile-film" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-			<hr class="profile-separator">
-			<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.film.0}}</div>
-			<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.film.1}}</div>
-		</div>
-		{{/if}}
-
-
-		{{if $profile.romance}}
-		<div id="aprofile-romance" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-			<hr class="profile-separator">
-			<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.romance.0}}</div>
-			<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.romance.1}}</div>
-		</div>
-		{{/if}}
-
-
-		{{if $profile.work}}
-		<div id="aprofile-work" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-		<hr class="profile-separator">
-		<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.work.0}}</div>
-		<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.work.1}}</div>
-		</div>
-		{{/if}}
-
-		{{if $profile.education}}
-		<div id="aprofile-education" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-			<hr class="profile-separator">
-			<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.education.0}}</div>
-			<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.education.1}}</div>
-		</div>
-		{{/if}}
-
-		{{if $profile.forumlist}}
-		<div id="aprofile-forumlist" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-			<hr class="profile-separator">
-			<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.forumlist.0}}</div>
-			<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.forumlist.1}}</div>
-		</div>
-		{{/if}}
 	</div>
 </div>
diff --git a/view/theme/frio/templates/profile_edit.tpl b/view/theme/frio/templates/profile_edit.tpl
index 74ee1a05d6..0e20bf2135 100644
--- a/view/theme/frio/templates/profile_edit.tpl
+++ b/view/theme/frio/templates/profile_edit.tpl
@@ -6,12 +6,12 @@
 	<div id="profile-edit-links">
 		<ul class="nav nav-pills preferences">
 			<li class="dropdown pull-right">
-				<a class="btn btn-link btn-sm dropdown-toggle" type="button" id="profile-edit-links-dropdown" data-toggle="dropdown" aria-expanded="true">
-							<i class="fa fa-angle-down"  aria-hidden="true"></i>&nbsp;{{$profile_action}}
-				</a>
+				<button type="button" class="btn btn-link btn-sm dropdown-toggle" id="profile-edit-links-dropdown" data-toggle="dropdown" aria-expanded="true">
+					<i class="fa fa-angle-down"  aria-hidden="true"></i>&nbsp;{{$profile_action}}
+				</button>
 				<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="profile-edit-links-dropdown">
 					<li role="menuitem"><a href="profile_photo" id="profile-photo_upload-link" title="{{$profpic|escape:'html'}}"><i class="fa fa-user"  aria-hidden="true"></i>&nbsp;{{$profpic}}</a></li>
-					<li role="menuitem"><a id="profile-photo_upload-link" title="{{$profpic|escape:'html'}}" onclick="openClose('profile-photo-upload-section');"><i class="fa fa-user"  aria-hidden="true"></i>&nbsp;{{$profpic}}</a></li>
+					<li role="menuitem"><button type="button" class="btn-link" id="profile-photo_upload-link" title="{{$profpic|escape:'html'}}" onclick="openClose('profile-photo-upload-section');"><i class="fa fa-user" aria-hidden="true"></i>&nbsp;{{$profpic}}</button></li>
 					{{if ! $is_default}}
 					<li class="nav-item"><a href="profperm/{{$profile_id}}" id="profile-edit-visibility-link" title="{{$editvis}}"><i class="fa fa-pencil"  aria-hidden="true"></i>&nbsp;{{$editvis}}</a>
 					</li>
diff --git a/view/theme/frio/templates/profile_vcard.tpl b/view/theme/frio/templates/profile_vcard.tpl
index 1fc3ccf207..831c47171d 100644
--- a/view/theme/frio/templates/profile_vcard.tpl
+++ b/view/theme/frio/templates/profile_vcard.tpl
@@ -17,7 +17,7 @@
 				{{/if}}
 			{{/if}}
 			</div>
-		
+
 		</div>
 
 	{{* The short information which will appended to the second navbar by scrollspy *}}
@@ -61,20 +61,20 @@
 				{{/if}}
 				{{if $wallmessage}}
 				<div id="wallmessage-link-botton">
-					<a id="wallmessage-link" class="btn btn-labeled btn-primary btn-sm" onclick="openWallMessage('{{$wallmessage_link}}')">
+					<button type="button" id="wallmessage-link" class="btn btn-labeled btn-primary btn-sm" onclick="openWallMessage('{{$wallmessage_link}}')">
 						<span class=""><i class="fa fa-envelope"></i></span>
 						<span class="">{{$wallmessage}}</span>
-					</a>
+					</button>
 				</div>
 				{{/if}}
-			
+
 		</div>
 
 		<div class="clear"></div>
 
 		{{if $location}}
 			<div class="location detail">
-				<span class="location-label icon"><i class="fa fa-map-marker"></i></span> 
+				<span class="location-label icon"><i class="fa fa-map-marker"></i></span>
 				<span class="adr">
 					{{if $profile.address}}<span class="street-address p-street-address">{{$profile.address}}</span>{{/if}}
 					<span class="city-state-zip">
@@ -89,7 +89,7 @@
 
 		{{if $profile.xmpp}}
 			<div class="xmpp">
-				<span class="xmpp-label icon"><i class="fa fa-comments"></i></span> 
+				<span class="xmpp-label icon"><i class="fa fa-comments"></i></span>
 				<span class="xmpp-data">{{$profile.xmpp}}</span>
 			</div>
 		{{/if}}
diff --git a/view/theme/frio/templates/prv_message.tpl b/view/theme/frio/templates/prv_message.tpl
index 5d39996841..436a453c4b 100644
--- a/view/theme/frio/templates/prv_message.tpl
+++ b/view/theme/frio/templates/prv_message.tpl
@@ -1,7 +1,7 @@
 
 <div id="prvmail-wrapper">
 <form id="prvmail-form" action="message" method="post" >
-	
+
 	{{* Disable the header. We will see if we will need it
 	<h3>{{$header}}</h3>
 	*}}
@@ -33,43 +33,43 @@
 
 	<ul id="prvmail-text-edit-bb" class="comment-edit-bb comment-icon-list nav nav-pills hidden-xs pull-left">
 				<li>
-					<a class="icon" style="cursor: pointer;" title="{{$edimg|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="input">
+					<button type="button" class="btn btn-link icon" style="cursor: pointer;" title="{{$edimg|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="input">
 						<i class="fa fa-picture-o"></i>
-					</a>
+					</button>
 				</li>
 				<li>
-					<a class="icon bb-url" style="cursor: pointer;" title="{{$edurl|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="url" data-id="input">
+					<button type="button" class="btn btn-link icon bb-url" style="cursor: pointer;" title="{{$edurl|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="url" data-id="input">
 						<i class="fa fa-link"></i>
-					</a>
+					</button>
 				</li>
 				<li>
-					<a class="icon bb-video" style="cursor: pointer;" title="{{$edvideo|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="video" data-id="input">
+					<button type="button" class="btn btn-link icon bb-video" style="cursor: pointer;" title="{{$edvideo|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="video" data-id="input">
 						<i class="fa fa-video-camera"></i>
-					</a>
+					</button>
 				</li>
 
 				<li>
-					<a class="icon underline" style="cursor: pointer;" title="{{$eduline|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="u" data-id="input">
+					<button type="button" class="btn btn-link icon underline" style="cursor: pointer;" title="{{$eduline|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="u" data-id="input">
 						<i class="fa fa-underline"></i>
-					</a>
+					</button>
 				</li>
 				<li>
-					<a class="icon italic" style="cursor: pointer;" title="{{$editalic|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="i" data-id="input">
+					<button type="button" class="btn btn-link icon italic" style="cursor: pointer;" title="{{$editalic|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="i" data-id="input">
 						<i class="fa fa-italic"></i>
-					</a>
+					</button>
 				</li>
 				<li>
-					<a class="icon bold" style="cursor: pointer;"  title="{{$edbold|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="b" data-id="input">
+					<button type="button" class="btn btn-link icon bold" style="cursor: pointer;"  title="{{$edbold|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="b" data-id="input">
 						<i class="fa fa-bold"></i>
-					</a>
+					</button>
 				</li>
 				<li>
-					<a class="icon quote" style="cursor: pointer;" title="{{$edquote|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="quote" data-id="input">
+					<button type="button" class="btn btn-link icon quote" style="cursor: pointer;" title="{{$edquote|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="quote" data-id="input">
 						<i class="fa fa-quote-left"></i>
-					</a>
+					</button>
 				</li>
 			</ul>
-	
+
 	<div id="prvmail-text-bb-end"></div>
 
 	{{* The submit button *}}
diff --git a/view/theme/frio/templates/search_item.tpl b/view/theme/frio/templates/search_item.tpl
index 2faa31475c..a546adf576 100644
--- a/view/theme/frio/templates/search_item.tpl
+++ b/view/theme/frio/templates/search_item.tpl
@@ -17,7 +17,7 @@
 
 				{{if $item.plink || $item.star || $item.drop.dropping || $item.edpost}}
 				<li class="dropdown">
-					<button class="btn-link dropdown-toggle" data-toggle="dropdown" id="dropdownMenuTools-{{$item.id}}" type="button" aria-haspopup="true" aria-expanded="false"><i class="fa fa-angle-down"></i></button>
+					<button type="button" class="btn-link dropdown-toggle" data-toggle="dropdown" id="dropdownMenuTools-{{$item.id}}" aria-haspopup="true" aria-expanded="false"><i class="fa fa-angle-down"></i></button>
 
 					<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dropdownMenuTools-{{$item.id}}">
 						{{if $item.plink}}      {{*link to the original source of the item *}}
@@ -34,27 +34,27 @@
 
 						{{if $item.tagger}} {{* tag the post *}}
 						<li role="menuitem">
-							<button type="button" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="btn-link {{$item.tagger.class}}" title="{{$item.tagger.add}}"><i class="fa fa-tag"></i> {{$item.tagger.add}}</button>
+							<button type="button" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}});" class="btn-link {{$item.tagger.class}}" title="{{$item.tagger.add}}"><i class="fa fa-tag"></i> {{$item.tagger.add}}</button>
 						</li>
 						{{/if}}
 
 						{{if $item.filer}}
 						<li role="menuitem">
-							<button type="button" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="btn-link filer-item filer-icon" title="{{$item.filer}}"><i class="fa fa-folder"></i>&nbsp;{{$item.filer}}</button>
+							<button type="button" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}});" class="btn-link filer-item filer-icon" title="{{$item.filer}}"><i class="fa fa-folder"></i>&nbsp;{{$item.filer}}</button>
 						</li>
 						{{/if}}
 
 						{{if $item.star}}
 						<li role="menuitem">
-							<button type="button" id="star-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="btn-link {{$item.star.classdo}}" title="{{$item.star.do}}"><i class="fa fa-star-o"></i>&nbsp;{{$item.star.do}}</button>
-							<button type="button" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="btn-link {{$item.star.classundo}}" title="{{$item.star.undo}}"><i class="fa fa-star"></i>&nbsp;{{$item.star.undo}}</button>
+							<button type="button" id="star-{{$item.id}}" onclick="dostar({{$item.id}});" class="btn-link {{$item.star.classdo}}" title="{{$item.star.do}}"><i class="fa fa-star-o"></i>&nbsp;{{$item.star.do}}</button>
+							<button type="button" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}});" class="btn-link {{$item.star.classundo}}" title="{{$item.star.undo}}"><i class="fa fa-star"></i>&nbsp;{{$item.star.undo}}</button>
 						</li>
 						{{/if}}
 
 						{{if $item.drop.dropping}}
 						<li role="separator" class="divider"></li>
 						<li role="menuitem">
-							<button type="button" class="btn-link navicon delete" onclick="dropItem('item/drop/{{$item.id}}', 'item-{{$item.guid}}'); return false;" title="{{$item.drop.delete}}"><i class="fa fa-trash"></i> {{$item.drop.delete}}</button>
+							<button type="button" class="btn-link navicon delete" onclick="dropItem('item/drop/{{$item.id}}', 'item-{{$item.guid}}');" title="{{$item.drop.delete}}"><i class="fa fa-trash"></i> {{$item.drop.delete}}</button>
 						</li>
 						{{/if}}
 					</ul>
@@ -170,11 +170,11 @@
 					{{* Buttons for like and dislike *}}
 					{{if $item.vote}}
 						{{if $item.vote.like}}
-						<button type="button" class="btn btn-defaultbutton-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}}, 'like'); return false;">{{$item.vote.like.0}}</button>
+						<button type="button" class="btn btn-defaultbutton-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}}, 'like');">{{$item.vote.like.0}}</button>
 						{{/if}}
 
 						{{if $item.vote.dislike}}
-						<button type="button" class="btn btn-defaultbutton-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}}, 'dislike'); return false;">{{$item.vote.dislike.0}}</button>
+						<button type="button" class="btn btn-defaultbutton-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}}, 'dislike');">{{$item.vote.dislike.0}}</button>
 						{{/if}}
 					{{/if}}
 
@@ -186,7 +186,7 @@
 					{{* Button for sharing the item *}}
 					{{if $item.vote}}
 						{{if $item.vote.share}}
-						<button type="button" class="btn btn-default" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false;"><i class="fa fa-retweet"></i>&nbsp;{{$item.vote.share.0}}</button>
+						<button type="button" class="btn btn-default" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}});"><i class="fa fa-retweet"></i>&nbsp;{{$item.vote.share.0}}</button>
 						{{/if}}
 					{{/if}}
 				</div>
@@ -196,9 +196,9 @@
 					{{* Event attendance buttons *}}
 					{{if $item.isevent}}
 					<div class="vote-event">
-						<button type="button" class="btn btn-defaultbutton-event{{if $item.responses.attendyes.self}} active" aria-pressed="true{{/if}}" id="attendyes-{{$item.id}}" title="{{$item.attend.0}}" onclick="dolike({{$item.id}}, 'attendyes'); return false;"><i class="fa fa-check"><span class="sr-only">{{$item.attend.0}}</span></i></button>
-						<button type="button" class="btn btn-defaultbutton-event{{if $item.responses.attendno.self}} active" aria-pressed="true{{/if}}" id="attendno-{{$item.id}}" title="{{$item.attend.1}}" onclick="dolike({{$item.id}}, 'attendno'); return false;"><i class="fa fa-times"><span class="sr-only">{{$item.attend.1}}</span></i></button>
-						<button type="button" class="btn btn-defaultbutton-event{{if $item.responses.attendmaybe.self}} active" aria-pressed="true{{/if}}" id="attendmaybe-{{$item.id}}" title="{{$item.attend.2}}" onclick="dolike({{$item.id}}, 'attendmaybe'); return false;"><i class="fa fa-question"><span class="sr-only">{{$item.attend.2}}</span></i></button>
+						<button type="button" class="btn btn-defaultbutton-event{{if $item.responses.attendyes.self}} active" aria-pressed="true{{/if}}" id="attendyes-{{$item.id}}" title="{{$item.attend.0}}" onclick="dolike({{$item.id}}, 'attendyes');"><i class="fa fa-check"><span class="sr-only">{{$item.attend.0}}</span></i></button>
+						<button type="button" class="btn btn-defaultbutton-event{{if $item.responses.attendno.self}} active" aria-pressed="true{{/if}}" id="attendno-{{$item.id}}" title="{{$item.attend.1}}" onclick="dolike({{$item.id}}, 'attendno');"><i class="fa fa-times"><span class="sr-only">{{$item.attend.1}}</span></i></button>
+						<button type="button" class="btn btn-defaultbutton-event{{if $item.responses.attendmaybe.self}} active" aria-pressed="true{{/if}}" id="attendmaybe-{{$item.id}}" title="{{$item.attend.2}}" onclick="dolike({{$item.id}}, 'attendmaybe');"><i class="fa fa-question"><span class="sr-only">{{$item.attend.2}}</span></i></button>
 					</div>
 					{{/if}}
 
diff --git a/view/theme/frio/templates/settings.tpl b/view/theme/frio/templates/settings.tpl
index 6eed613ddd..bd81c986cd 100644
--- a/view/theme/frio/templates/settings.tpl
+++ b/view/theme/frio/templates/settings.tpl
@@ -196,9 +196,9 @@
 							{{include file="field_checkbox.tpl" field=$email_textonly}}
 
 
-							{{* commented out because it was commented out in the original template 
+							{{* commented out because it was commented out in the original template
 							<div class="field">
-							 <button onclick="javascript:Notification.requestPermission(function(perm){if(perm === 'granted')alert('{{$desktop_notifications_success_message}}');});return false;">{{$desktop_notifications}}</button>
+							 <button type="button" onclick="javascript:Notification.requestPermission(function(perm){if(perm === 'granted')alert('{{$desktop_notifications_success_message}}');});">{{$desktop_notifications}}</button>
 							 <span class="field_help">{{$desktop_notifications_note}}</span>
 							</div>
 							*}}
diff --git a/view/theme/frio/templates/threaded_conversation.tpl b/view/theme/frio/templates/threaded_conversation.tpl
index a5402ede5d..8fb608eca2 100644
--- a/view/theme/frio/templates/threaded_conversation.tpl
+++ b/view/theme/frio/templates/threaded_conversation.tpl
@@ -19,8 +19,8 @@
 <div id="conversation-end"></div>
 
 {{if $dropping}}
-<a id="item-delete-selected" class="" href="#" title="{{$dropping}}" onclick="deleteCheckedItems();return false;" data-toggle="tooltip">
+<button type="button" id="item-delete-selected" class="btn btn-link" title="{{$dropping}}" onclick="deleteCheckedItems();" data-toggle="tooltip">
 	<i class="fa fa-trash" aria-hidden="true"></i>
-</a>
+<button>
 <img id="item-delete-selected-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" />
 {{/if}}
diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl
index 4024ce7810..923186ffa3 100644
--- a/view/theme/frio/templates/wall_thread.tpl
+++ b/view/theme/frio/templates/wall_thread.tpl
@@ -91,26 +91,26 @@ as the value of $top_child_total (this is done at the end of this file)
 
 					{{if $item.edpost}} {{* edit the posting *}}
 					<li role="menuitem">
-						<button type="button" onclick="editpost('{{$item.edpost.0}}?mode=none'); return false;" title="{{$item.edpost.1}}" class="btn-link navicon pencil"><i class="fa fa-pencil"></i> {{$item.edpost.1}}</button>
+						<button type="button" onclick="editpost('{{$item.edpost.0}}?mode=none');" title="{{$item.edpost.1}}" class="btn-link navicon pencil"><i class="fa fa-pencil"></i> {{$item.edpost.1}}</button>
 					</li>
 					{{/if}}
 
 					{{if $item.tagger}} {{* tag the post *}}
 					<li role="menuitem">
-						<button type="button" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="btn-link {{$item.tagger.class}}" title="{{$item.tagger.add}}"><i class="fa fa-tag"></i> {{$item.tagger.add}}</button>
+						<button type="button" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}});" class="btn-link {{$item.tagger.class}}" title="{{$item.tagger.add}}"><i class="fa fa-tag"></i> {{$item.tagger.add}}</button>
 					</li>
 					{{/if}}
 
 					{{if $item.filer}}
 					<li role="menuitem">
-						<button type="button" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="btn-link filer-item filer-icon" title="{{$item.filer}}"><i class="fa fa-folder"></i>&nbsp;{{$item.filer}}</button>
+						<button type="button" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}});" class="btn-link filer-item filer-icon" title="{{$item.filer}}"><i class="fa fa-folder"></i>&nbsp;{{$item.filer}}</button>
 					</li>
 					{{/if}}
 
 					{{if $item.star}}
 					<li role="menuitem">
-						<button type="button" id="star-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="btn-link {{$item.star.classdo}}" title="{{$item.star.do}}"><i class="fa fa-star-o"></i>&nbsp;{{$item.star.do}}</button>
-						<button type="button" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="btn-link {{$item.star.classundo}}" title="{{$item.star.undo}}"><i class="fa fa-star"></i>&nbsp;{{$item.star.undo}}</button>
+						<button type="button" id="star-{{$item.id}}" onclick="dostar({{$item.id}});" class="btn-link {{$item.star.classdo}}" title="{{$item.star.do}}"><i class="fa fa-star-o"></i>&nbsp;{{$item.star.do}}</button>
+						<button type="button" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}});" class="btn-link {{$item.star.classundo}}" title="{{$item.star.undo}}"><i class="fa fa-star"></i>&nbsp;{{$item.star.undo}}</button>
 					</li>
 					{{/if}}
 
@@ -120,16 +120,16 @@ as the value of $top_child_total (this is done at the end of this file)
 
 					{{if $item.ignore}}
 						<li role="menuitem">
-							<button type="button" id="ignore-{{$item.id}}" onclick="doignore({{$item.id}}); return false;" class="btn-link {{$item.ignore.classdo}}" title="{{$item.ignore.do}}"><i class="fa fa-eye-slash"></i> {{$item.ignore.do}}</button>
+							<button type="button" id="ignore-{{$item.id}}" onclick="doignore({{$item.id}});" class="btn-link {{$item.ignore.classdo}}" title="{{$item.ignore.do}}"><i class="fa fa-eye-slash"></i> {{$item.ignore.do}}</button>
 						</li>
 						<li role="menuitem">
-							<button type="button" id="unignore-{{$item.id}}" onclick="doignore({{$item.id}}); return false;" class="btn-link {{$item.ignore.classundo}}"  title="{{$item.ignore.undo}}"><i class="fa fa-eye"></i> {{$item.ignore.undo}}</button>
+							<button type="button" id="unignore-{{$item.id}}" onclick="doignore({{$item.id}});" class="btn-link {{$item.ignore.classundo}}"  title="{{$item.ignore.undo}}"><i class="fa fa-eye"></i> {{$item.ignore.undo}}</button>
 						</li>
 					{{/if}}
 
 					{{if $item.drop.dropping}}
 					<li role="menuitem">
-						<button type="button" class="btn-link navicon delete" onclick="dropItem('item/drop/{{$item.id}}', 'item-{{$item.guid}}'); return false;" title="{{$item.drop.delete}}"><i class="fa fa-trash"></i> {{$item.drop.delete}}</button>
+						<button type="button" class="btn-link navicon delete" onclick="dropItem('item/drop/{{$item.id}}', 'item-{{$item.guid}}');" title="{{$item.drop.delete}}"><i class="fa fa-trash"></i> {{$item.drop.delete}}</button>
 					</li>
 					{{/if}}
 				</ul>
@@ -287,10 +287,10 @@ as the value of $top_child_total (this is done at the end of this file)
 				{{* Buttons for like and dislike *}}
 				{{if $item.vote}}
 					{{if $item.vote.like}}
-					<button type="button" class="btn btn-xs btn-default button-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false;" data-toggle="button"><i class="fa fa-thumbs-up"></i>&nbsp;{{$item.vote.like.1}}</button>
+					<button type="button" class="btn btn-xs btn-default button-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like');" data-toggle="button"><i class="fa fa-thumbs-up"></i>&nbsp;{{$item.vote.like.1}}</button>
 					{{/if}}
 					{{if $item.vote.dislike}}
-					<button type="button" class="btn btn-xs btn-default button-likes{{if $item.responses.dislike.self}} active" aria-pressed="true{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false;" data-toggle="button"><i class="fa fa-thumbs-down"></i>&nbsp;{{$item.vote.dislike.1}}</button>
+					<button type="button" class="btn btn-xs btn-default button-likes{{if $item.responses.dislike.self}} active" aria-pressed="true{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike');" data-toggle="button"><i class="fa fa-thumbs-down"></i>&nbsp;{{$item.vote.dislike.1}}</button>
 					{{/if}}
 
 				{{/if}}
@@ -303,7 +303,7 @@ as the value of $top_child_total (this is done at the end of this file)
 				{{* Button for sharing the item *}}
 				{{if $item.vote}}
 					{{if $item.vote.share}}
-					<button type="button" class="btn btn-xs btn-default button-votes" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false;"><i class="fa fa-retweet"></i>&nbsp;{{$item.vote.share.1}}</a>
+					<button type="button" class="btn btn-xs btn-default button-votes" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}});"><i class="fa fa-retweet"></i>&nbsp;{{$item.vote.share.1}}</a>
 					{{/if}}
 				{{/if}}
 			</div>
@@ -312,9 +312,9 @@ as the value of $top_child_total (this is done at the end of this file)
 				{{* Event attendance buttons *}}
 				{{if $item.isevent}}
 				<div class="vote-event">
-					<button type="button" class="btn btn-xs btn-default button-event{{if $item.responses.attendyes.self}} active" aria-pressed="true{{/if}}" id="attendyes-{{$item.id}}" title="{{$item.attend.0}}" onclick="dolike({{$item.id}},'attendyes'); return false;"><i class="fa fa-check"><span class="sr-only">{{$item.attend.0}}</span></i></button>
-					<button type="button" class="btn btn-xs btn-default button-event{{if $item.responses.attendno.self}} active" aria-pressed="true{{/if}}" id="attendno-{{$item.id}}" title="{{$item.attend.1}}" onclick="dolike({{$item.id}},'attendno'); return false;"><i class="fa fa-times"><span class="sr-only">{{$item.attend.1}}</span></i></button>
-					<button type="button" class="btn btn-xs btn-default button-event{{if $item.responses.attendmaybe.self}} active" aria-pressed="true{{/if}}" id="attendmaybe-{{$item.id}}" title="{{$item.attend.2}}" onclick="dolike({{$item.id}},'attendmaybe'); return false;"><i class="fa fa-question"><span class="sr-only">{{$item.attend.2}}</span></i></button>
+					<button type="button" class="btn btn-xs btn-default button-event{{if $item.responses.attendyes.self}} active" aria-pressed="true{{/if}}" id="attendyes-{{$item.id}}" title="{{$item.attend.0}}" onclick="dolike({{$item.id}},'attendyes');"><i class="fa fa-check"><span class="sr-only">{{$item.attend.0}}</span></i></button>
+					<button type="button" class="btn btn-xs btn-default button-event{{if $item.responses.attendno.self}} active" aria-pressed="true{{/if}}" id="attendno-{{$item.id}}" title="{{$item.attend.1}}" onclick="dolike({{$item.id}},'attendno');"><i class="fa fa-times"><span class="sr-only">{{$item.attend.1}}</span></i></button>
+					<button type="button" class="btn btn-xs btn-default button-event{{if $item.responses.attendmaybe.self}} active" aria-pressed="true{{/if}}" id="attendmaybe-{{$item.id}}" title="{{$item.attend.2}}" onclick="dolike({{$item.id}},'attendmaybe');"><i class="fa fa-question"><span class="sr-only">{{$item.attend.2}}</span></i></button>
 				</div>
 				{{/if}}
 

From 30049d862ca36f716b5888cc8970c2aed0857b21 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <ben.lort@gmail.com>
Date: Wed, 15 Mar 2017 07:07:06 -0400
Subject: [PATCH 004/120] Fix comment double-posting

---
 view/theme/frio/templates/comment_item.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/view/theme/frio/templates/comment_item.tpl b/view/theme/frio/templates/comment_item.tpl
index cd201dbad6..e4ff8c03de 100644
--- a/view/theme/frio/templates/comment_item.tpl
+++ b/view/theme/frio/templates/comment_item.tpl
@@ -27,9 +27,9 @@
 
 		<div class="comment-edit-text-end clear"></div>
 		<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;">
-			<button class="btn btn-primary btn-sm" type="submit" onclick="post_comment({{$id}});" id="comment-edit-submit-{{$id}}" name="submit"><i class="fa fa-envelope"></i> {{$submit}}</button>
+			<button type="submit" class="btn btn-primary btn-sm" id="comment-edit-submit-{{$id}}" name="submit"><i class="fa fa-envelope"></i> {{$submit}}</button>
 			{{if $preview}}
-				<button class="btn btn-defaul btn-sm" type="button" onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}"><i class="fa fa-eye"></i> {{$preview}}</button>
+				<button type="button" class="btn btn-defaul btn-sm" onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}"><i class="fa fa-eye"></i> {{$preview}}</button>
 			{{/if}}
 			<ul class="comment-edit-bb-{{$id}} comment-icon-list nav nav-pills pull-right">
 				<li>

From 82ce1a449bfcfa5ccac56a8ceb235dd20b0e8877 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <ben.lort@gmail.com>
Date: Wed, 15 Mar 2017 07:24:14 -0400
Subject: [PATCH 005/120] Revert jot tabs to links due to Bootstrap not
 supporting button styling

---
 view/theme/frio/templates/jot.tpl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/view/theme/frio/templates/jot.tpl b/view/theme/frio/templates/jot.tpl
index edab2a0745..c3fbbcbe8f 100644
--- a/view/theme/frio/templates/jot.tpl
+++ b/view/theme/frio/templates/jot.tpl
@@ -16,20 +16,20 @@
 				{{* Mark the first list entry as active because it is the first which is active after opening
 					the modal. Changing of the activity status is done by js in jot.tpl-header *}}
 				<li class="active" role="menuitem">
-					<button type="button" class="btn btn-link jot-text-lnk" id="jot-text-lnk" onclick="jotActive();">{{$message}}</button>
+					<a class="jot-text-lnk" id="jot-text-lnk" onclick="jotActive(); return false;">{{$message}}</a>
 				</li>
 				{{if $acl}}
 				<li role="menuitem">
-					<button type="button" class="btn btn-link jot-perms-lnk" id="jot-perms-lnk" onclick="aclActive();">{{$shortpermset}}</button>
+					<a class="btn btn-link jot-perms-lnk" id="jot-perms-lnk" onclick="aclActive(); return false;">{{$shortpermset}}</a>
 				</li>
 				{{/if}}
 				{{if $preview}}
 				<li role="menuitem">
-					<button type="button" class="btn btn-link jot-preview-lnk" id="jot-preview-lnk" onclick="previewActive();">{{$preview}}</button>
+					<a class="btn btn-link jot-preview-lnk" id="jot-preview-lnk" onclick="previewActive(); return false;">{{$preview}}</a>
 				</li>
 				{{/if}}
 				<li role="menuitem">
-					<button type="button" class="btn btn-link" id="jot-browser-link" onclick="fbrowserActive();">{{$browser}}</button>
+					<a class="btn btn-link" id="jot-browser-link" onclick="fbrowserActive(); return false;">{{$browser}}</a>
 				</li>
 			</ul>
 

From 214c76fec79e2507e8de61cc683502d5f7cf2356 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <ben.lort@gmail.com>
Date: Wed, 15 Mar 2017 22:00:07 -0400
Subject: [PATCH 006/120] Reverted original display for item action links + jot
 bbcode buttons - Cleaned useless CSS

---
 view/theme/frio/css/style.css             | 16 ++++++-------
 view/theme/frio/templates/event_form.tpl  | 26 ++++++++++----------
 view/theme/frio/templates/jot.tpl         | 12 +++++-----
 view/theme/frio/templates/search_item.tpl |  6 ++---
 view/theme/frio/templates/wall_thread.tpl | 29 +++++++++++++++--------
 5 files changed, 49 insertions(+), 40 deletions(-)

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index 3f95fb484f..b272e3f0de 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -51,7 +51,10 @@ body a[name]:not([href]) {
     visibility: hidden;
 }
 
-body a:hover, body a:focus, body a:active, body a.active, body .btn-link:hover{
+body a:hover, body .btn-link:hover,
+body a:focus, body .btn-link:focus,
+body a:active, body .btn-link:active,
+body a.active, body .btn-link.active {
     /*color: #59d6e4;*/
     color: $link_hover_color;
     text-decoration: none;
@@ -1322,8 +1325,6 @@ section #jotOpen {
 .wall-item-container a,
 .wall-item-container .fakelink,
 .toplevel_item .fakelink,
-.toplevel_item .wall-item-container .btn-link,
-.wall-item-container .btn-link,
 .toplevel_item .wall-item-container .wall-item-responses a {
     color: #555;
     -webkit-transition: all 0.25s ease-in-out;
@@ -1334,7 +1335,6 @@ section #jotOpen {
 }
 
 .toplevel_item:hover .fakelink, .wall-item-container:hover .fakelink,
-.toplevel_item:hover .wall-item-container:hover :not(.dropdown):not([role=menuitem]) > .btn-link,
 .toplevel_item:hover .wall-item-container:hover .wall-item-responses a,
 .toplevel_item:hover .wall-item-content a,
 .toplevel_item:hover .wall-item-name,
@@ -1550,19 +1550,19 @@ code > .hl-main {
 }
 
 /* item social action buttons */
-.wall-item-actions, .wall-item-actions a {
+.wall-item-actions, .wall-item-actions a, .wall-item-actions button {
     font-size: 13px;
     color: #555;
     margin-top: 15px;
     margin-bottom: 0;
 }
-.wall-item-actions a.active {
+.wall-item-actions .active {
     font-weight: bold;
 }
-.wall-item-actions a:hover {
+.wall-item-actions :hover {
     color: #555;
 }
-.wall-item-actions a.active:hover {
+.wall-item-actions .active:hover {
     color: $link_color;
 }
 .wall-item-actions-left {
diff --git a/view/theme/frio/templates/event_form.tpl b/view/theme/frio/templates/event_form.tpl
index ebbf83785f..749218e918 100644
--- a/view/theme/frio/templates/event_form.tpl
+++ b/view/theme/frio/templates/event_form.tpl
@@ -84,33 +84,33 @@
 					</li>
 					*}}
 					<li>
-						<button type="button" class="btn btn-link icon bb-url" style="cursor: pointer;" title="{{$edurl|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="url" data-id="desc">
+						<button type="button" class="btn-link icon bb-url" style="cursor: pointer;" title="{{$edurl|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="url" data-id="desc">
 							<i class="fa fa-link"></i>
 						</button>
 					</li>
 					<li>
-						<button type="button" class="btn btn-link icon bb-video" style="cursor: pointer;" title="{{$edvideo|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="video" data-id="desc">
+						<button type="button" class="btn-link icon bb-video" style="cursor: pointer;" title="{{$edvideo|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="video" data-id="desc">
 							<i class="fa fa-video-camera"></i>
 						</button>
 					</li>
 
 					<li>
-						<button type="button" class="btn btn-link icon underline" style="cursor: pointer;" title="{{$eduline|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="u" data-id="desc">
+						<button type="button" class="btn-link icon underline" style="cursor: pointer;" title="{{$eduline|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="u" data-id="desc">
 							<i class="fa fa-underline"></i>
 						</button>
 					</li>
 					<li>
-						<button type="button" class="btn btn-link icon italic" style="cursor: pointer;" title="{{$editalic|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="i" data-id="desc">
+						<button type="button" class="btn-link icon italic" style="cursor: pointer;" title="{{$editalic|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="i" data-id="desc">
 							<i class="fa fa-italic"></i>
 						</button>
 					</li>
 					<li>
-						<button type="button" class="btn btn-link icon bold" style="cursor: pointer;"  title="{{$edbold|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="b" data-id="desc">
+						<button type="button" class="btn-link icon bold" style="cursor: pointer;"  title="{{$edbold|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="b" data-id="desc">
 							<i class="fa fa-bold"></i>
 						</button>
 					</li>
 					<li>
-						<button type="button" class="btn btn-link icon quote" style="cursor: pointer;" title="{{$edquote|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="quote" data-id="desc">
+						<button type="button" class="btn-link icon quote" style="cursor: pointer;" title="{{$edquote|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="quote" data-id="desc">
 							<i class="fa fa-quote-left"></i>
 						</button>
 					</li>
@@ -125,39 +125,39 @@
 				<ul id="comment-tools-loc" class="comment-edit-bb comment-icon-list nav nav-pills hidden-xs pull-left">
 					{{* commented out because it isn't implemented yet
 					<li>
-						<button type="button" class="btn btn-link icon" style="cursor: pointer;" title="{{$edimg|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="loc">
+						<button type="button" class="btn-link icon" style="cursor: pointer;" title="{{$edimg|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="loc">
 							<i class="fa fa-picture-o"></i>
 						</button>
 					</li>
 					*}}
 					<li>
-						<button type="button" class="btn btn-link icon bb-url" style="cursor: pointer;" title="{{$edurl|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="url" data-id="loc">
+						<button type="button" class="btn-link icon bb-url" style="cursor: pointer;" title="{{$edurl|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="url" data-id="loc">
 							<i class="fa fa-link"></i>
 						</button>
 					</li>
 					<li>
-						<button type="button" class="btn btn-link icon bb-video" style="cursor: pointer;" title="{{$edvideo|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="video" data-id="loc">
+						<button type="button" class="btn-link icon bb-video" style="cursor: pointer;" title="{{$edvideo|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="video" data-id="loc">
 							<i class="fa fa-video-camera"></i>
 						</button>
 					</li>
 
 					<li>
-						<button type="button" class="btn btn-link icon underline" style="cursor: pointer;" title="{{$eduline|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="u" data-id="loc">
+						<button type="button" class="btn-link icon underline" style="cursor: pointer;" title="{{$eduline|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="u" data-id="loc">
 							<i class="fa fa-underline"></i>
 						</button>
 					</li>
 					<li>
-						<button type="button" class="btn btn-link icon italic" style="cursor: pointer;" title="{{$editalic|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="i" data-id="loc">
+						<button type="button" class="btn-link icon italic" style="cursor: pointer;" title="{{$editalic|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="i" data-id="loc">
 							<i class="fa fa-italic"></i>
 						</button>
 					</li>
 					<li>
-						<button type="button" class="btn btn-link icon bold" style="cursor: pointer;"  title="{{$edbold|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="b" data-id="loc">
+						<button type="button" class="btn-link icon bold" style="cursor: pointer;"  title="{{$edbold|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="b" data-id="loc">
 							<i class="fa fa-bold"></i>
 						</button>
 					</li>
 					<li>
-						<button type="button" class="btn btn-link icon quote" style="cursor: pointer;" title="{{$edquote|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="quote" data-id="loc">
+						<button type="button" class="btn-link icon quote" style="cursor: pointer;" title="{{$edquote|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="quote" data-id="loc">
 							<i class="fa fa-quote-left"></i>
 						</button>
 					</li>
diff --git a/view/theme/frio/templates/jot.tpl b/view/theme/frio/templates/jot.tpl
index c3fbbcbe8f..f439f477ce 100644
--- a/view/theme/frio/templates/jot.tpl
+++ b/view/theme/frio/templates/jot.tpl
@@ -91,13 +91,13 @@
 						{{* uncomment the button for "wall-immage-upload" because we have integrated it directly in the jot modal
 						<li><a href="#" id="wall-image-upload" title="{{$upload}}"><i class="fa fa-picture-o"></i></a></li>
 						*}}
-						<li><button type="button" class="btn btn-link" id="wall-file-upload" title="{{$attach}}"><i class="fa fa-paperclip"></i></button></li>
-						<li><button type="button" class="btn btn-link" id="profile-link"  ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink();" title="{{$weblink}}"><i class="fa fa-link"></i></button></li>
-						<li><button type="button" class="btn btn-link" id="profile-video" onclick="jotVideoURL();" title="{{$video}}"><i class="fa fa-film"></i></button></li>
-						<li><button type="button" class="btn btn-link" id="profile-audio" onclick="jotAudioURL();" title="{{$audio}}"><i class="fa fa-music"></i></button></li>
-						<li><button type="button" class="btn btn-link" id="profile-location" onclick="jotGetLocation();" title="{{$setloc}}"><i class="fa fa-map-marker"></i></button></li>
+						<li><button type="button" class="btn-link" id="wall-file-upload" title="{{$attach}}"><i class="fa fa-paperclip"></i></button></li>
+						<li><button type="button" class="btn-link" id="profile-link"  ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink();" title="{{$weblink}}"><i class="fa fa-link"></i></button></li>
+						<li><button type="button" class="btn-link" id="profile-video" onclick="jotVideoURL();" title="{{$video}}"><i class="fa fa-film"></i></button></li>
+						<li><button type="button" class="btn-link" id="profile-audio" onclick="jotAudioURL();" title="{{$audio}}"><i class="fa fa-music"></i></button></li>
+						<li><button type="button" class="btn-link" id="profile-location" onclick="jotGetLocation();" title="{{$setloc}}"><i class="fa fa-map-marker"></i></button></li>
 						<!-- TODO: waiting for a better placement
-						<li><button type="button" class="btn btn-link" id="profile-nolocation" onclick="jotClearLocation();" title="{{$noloc}}">{{$shortnoloc}}</button></li>
+						<li><button type="button" class="btn-link" id="profile-nolocation" onclick="jotClearLocation();" title="{{$noloc}}">{{$shortnoloc}}</button></li>
 						-->
 
 						<li class="pull-right"><button class="btn btn-primary" id="jot-submit" type="submit" id="profile-jot-submit" name="submit" ><i class="fa fa-slideshare fa-fw"></i> {{$share}}</button></li>
diff --git a/view/theme/frio/templates/search_item.tpl b/view/theme/frio/templates/search_item.tpl
index a546adf576..51a9017c2b 100644
--- a/view/theme/frio/templates/search_item.tpl
+++ b/view/theme/frio/templates/search_item.tpl
@@ -83,8 +83,8 @@
 
 			{{* contact info header*}}
 			<div role="heading " class="contact-info hidden-sm hidden-xs media-body"><!-- <= For computer -->
-				<h4 class="media-heading"><a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo"><span class="wall-item-name btn-link {{$item.sparkle}}">{{$item.name}}</span></a>
-					{{if $item.owner_url}}{{$item.via}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link userinfo"><span class="wall-item-name{{$item.osparkle}} btn-link" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
+				<h4 class="media-heading"><a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo"><span class="wall-item-name {{$item.sparkle}}">{{$item.name}}</span></a>
+					{{if $item.owner_url}}{{$item.via}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link userinfo"><span class="wall-item-name {{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
 					{{if $item.lock}}<span class="navicon lock fakelink" onClick="lockview(event, {{$item.id}});" title="{{$item.lock}}">&nbsp;<small><i class="fa fa-lock"></i></small></span>{{/if}}
 
 					<div class="additional-info text-muted">
@@ -161,7 +161,7 @@
 				<div class="wall-item-actions-left pull-left">
 					<!--comment this out to try something different {{if $item.threaded}}{{if $item.comment}}
 					<div id="button-reply" class="pull-left">
-						<span class="btn-link" id="comment-{{$item.id}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"><i class="fa fa-reply" title="{{$item.switchcomment}}"></i> </span>
+						<button type="button" class="btn-link" id="comment-{{$item.id}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"><i class="fa fa-reply" title="{{$item.switchcomment}}"></i> </span>
 					</div>
 					{{/if}}{{/if}}-->
 
diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl
index 923186ffa3..f276ee6f06 100644
--- a/view/theme/frio/templates/wall_thread.tpl
+++ b/view/theme/frio/templates/wall_thread.tpl
@@ -40,11 +40,11 @@ as the value of $top_child_total (this is done at the end of this file)
 
 	{{if $item.thread_level<3}}
 		<div class="hide-comments-outer-wrapper">
-			<div class="hide-comments-outer btn-link" onclick="showHideComments({{$item.id}});">
+			<div class="hide-comments-outer fakelink" onclick="showHideComments({{$item.id}});">
 				<span id="hide-comments-total-{{$item.id}}"
 					class="hide-comments-total">{{$item.num_comments}}</span>
 				<span id="hide-comments-{{$item.id}}"
-					class="hide-comments fakelink">{{$item.hide_text}}</span>
+					class="hide-comments">{{$item.hide_text}}</span>
 			</div>
 			<hr />
 		</div>
@@ -184,8 +184,8 @@ as the value of $top_child_total (this is done at the end of this file)
 		{{* contact info header*}}
 		{{if $item.thread_level==1}}
 		<div role="heading " aria-level="{{$item.thread_level}}" class="contact-info hidden-sm hidden-xs media-body"><!-- <= For computer -->
-			<h4 class="media-heading"><a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo"><span class="wall-item-name btn-link {{$item.sparkle}}">{{$item.name}}</span></a>
-			{{if $item.owner_url}}{{$item.via}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link userinfo"><span class="wall-item-name{{$item.osparkle}} btn-link" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
+			<h4 class="media-heading"><a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo"><span class="wall-item-name {{$item.sparkle}}">{{$item.name}}</span></a>
+			{{if $item.owner_url}}{{$item.via}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link userinfo"><span class="wall-item-name {{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
 			{{if $item.lock}}<span class="navicon lock fakelink" onClick="lockview(event,{{$item.id}});" title="{{$item.lock}}" data-toggle="tooltip">&nbsp;<small><i class="fa fa-lock"></i></small></span>{{/if}}
 			</h4>
 
@@ -220,7 +220,7 @@ as the value of $top_child_total (this is done at the end of this file)
 		<div class="media-body">{{*this is the media body for comments - this div must be closed at the end of the file *}}
 		<div role="heading " aria-level="{{$item.thread_level}}" class="contact-info-comment">
 			<h5 class="media-heading">
-				<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo"><span class="btn-link">{{$item.name}}</span></a>
+				<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo"><span class="fakelink">{{$item.name}}</span></a>
 				<span class="text-muted">
 					<small><span title="{{$item.localtime}}" data-toggle="tooltip">{{$item.ago}}</span> {{if $item.location}}&nbsp;&mdash;&nbsp;({{$item.location}}){{/if}}</small>
 				</span>
@@ -278,7 +278,7 @@ as the value of $top_child_total (this is done at the end of this file)
 			<div class="wall-item-actions-left pull-left">
 				<!--comment this out to try something different {{if $item.threaded}}{{if $item.comment}}
 				<div id="button-reply" class="pull-left">
-					<span class="btn-link" id="comment-{{$item.id}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"><i class="fa fa-reply" title="{{$item.switchcomment}}"></i> </span>
+					<button type="button" class="btn-link" id="comment-{{$item.id}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"><i class="fa fa-reply" title="{{$item.switchcomment}}"></i> </span>
 				</div>
 				{{/if}}{{/if}}-->
 
@@ -287,23 +287,32 @@ as the value of $top_child_total (this is done at the end of this file)
 				{{* Buttons for like and dislike *}}
 				{{if $item.vote}}
 					{{if $item.vote.like}}
-					<button type="button" class="btn btn-xs btn-default button-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like');" data-toggle="button"><i class="fa fa-thumbs-up"></i>&nbsp;{{$item.vote.like.1}}</button>
+					<button type="button" class="btn-link button-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like');" data-toggle="button"><i class="fa fa-thumbs-up"></i>&nbsp;{{$item.vote.like.1}}</button>
+					{{/if}}
+					{{if $item.vote.like AND $item.vote.dislike}}
+					<span role="presentation" class="separator">•</span>
 					{{/if}}
 					{{if $item.vote.dislike}}
-					<button type="button" class="btn btn-xs btn-default button-likes{{if $item.responses.dislike.self}} active" aria-pressed="true{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike');" data-toggle="button"><i class="fa fa-thumbs-down"></i>&nbsp;{{$item.vote.dislike.1}}</button>
+					<button type="button" class="btn-link button-likes{{if $item.responses.dislike.self}} active" aria-pressed="true{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike');" data-toggle="button"><i class="fa fa-thumbs-down"></i>&nbsp;{{$item.vote.dislike.1}}</button>
 					{{/if}}
 
+					{{if ($item.vote.like OR $item.vote.dislike) AND $item.comment}}
+					<span role="presentation" class="separator">•</span>
+					{{/if}}
 				{{/if}}
 
 				{{* Button to open the comment text field *}}
 				{{if $item.comment}}
-				<button type="button" class="btn btn-xs btn-default button-comments" id="comment-{{$item.id}}" title="{{$item.switchcomment}}" {{if $item.thread_level != 1}}onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});" {{else}} onclick="showHide('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"{{/if}}><i class="fa fa-commenting"></i>&nbsp;{{$item.switchcomment}}</button>
+				<button type="button" class="btn-link button-comments" id="comment-{{$item.id}}" title="{{$item.switchcomment}}" {{if $item.thread_level != 1}}onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});" {{else}} onclick="showHide('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"{{/if}}><i class="fa fa-commenting"></i>&nbsp;{{$item.switchcomment}}</button>
 				{{/if}}
 
 				{{* Button for sharing the item *}}
 				{{if $item.vote}}
 					{{if $item.vote.share}}
-					<button type="button" class="btn btn-xs btn-default button-votes" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}});"><i class="fa fa-retweet"></i>&nbsp;{{$item.vote.share.1}}</a>
+						{{if $item.vote.like OR $item.vote.dislike OR $item.comment}}
+					<span role="presentation" class="separator">•</span>
+						{{/if}}
+					<button type="button" class="btn-link button-votes" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}});"><i class="fa fa-retweet"></i>&nbsp;{{$item.vote.share.1}}</a>
 					{{/if}}
 				{{/if}}
 			</div>

From 802897c0abf4b0ccfca7cfffc628aa2d8fbf02e0 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <ben.lort@gmail.com>
Date: Wed, 15 Mar 2017 22:00:37 -0400
Subject: [PATCH 007/120] Restored tabs display until a more complete CSS
 solution is worked out

---
 view/theme/frio/templates/event_form.tpl | 10 +++++-----
 view/theme/frio/templates/jot.tpl        | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/view/theme/frio/templates/event_form.tpl b/view/theme/frio/templates/event_form.tpl
index 749218e918..d4b455b234 100644
--- a/view/theme/frio/templates/event_form.tpl
+++ b/view/theme/frio/templates/event_form.tpl
@@ -8,23 +8,23 @@
 		{{* Mark the first list entry as active because it is the first which is active after opening
 			the modal. Changing of the activity status is done by js in event_head.tpl *}}
 		<li class="active" role="menuitem">
-			<button type="button" class="btn btn-link" id="event-edit-lnk" onclick="eventEditActive();">{{$basic}}</button>
+			<a id="event-edit-lnk" onclick="eventEditActive(); return false;">{{$basic}}</a>
 		</li>
 		<li role="menuitem">
-			<button type="button" class="btn btn-link" id="event-desc-lnk" onclick="eventDescActive();">{{$advanced}}</button>
+			<a id="event-desc-lnk" onclick="eventDescActive(); return false;">{{$advanced}}</a>
 		</li>
 		{{if $acl}}
 		<li role="menuitem" {{if !$sh_checked}} style="display: none"{{/if}}>
-			<button type="button" class="btn btn-link" id="event-perms-lnk" onclick="eventAclActive();">{{$permissions}}</button>
+			<a id="event-perms-lnk" onclick="eventAclActive(); return false;">{{$permissions}}</a>
 		</li>
 		{{/if}}
 		{{if $preview}}
 		<li role="menuitem">
-			<button type="button" class="btn btn-link" id="event-preview-lnk" onclick="eventPreviewActive();">{{$preview}}</button>
+			<a id="event-preview-lnk" onclick="eventPreviewActive(); return false;">{{$preview}}</a>
 		</li>
 		{{/if}}
 		{{* commented out because it isn't implemented yet
-		<li role="menuitem"><button type="button" class="btn btn-link" id="event-preview-link" onclick="fbrowserActive();"> Browser </button></li>
+		<li role="menuitem"><a id="event-preview-link" onclick="fbrowserActive(); return false;"> Browser </a></li>
 		*}}
 	</ul>
 
diff --git a/view/theme/frio/templates/jot.tpl b/view/theme/frio/templates/jot.tpl
index f439f477ce..71fdae7cd3 100644
--- a/view/theme/frio/templates/jot.tpl
+++ b/view/theme/frio/templates/jot.tpl
@@ -20,16 +20,16 @@
 				</li>
 				{{if $acl}}
 				<li role="menuitem">
-					<a class="btn btn-link jot-perms-lnk" id="jot-perms-lnk" onclick="aclActive(); return false;">{{$shortpermset}}</a>
+					<a class="jot-perms-lnk" id="jot-perms-lnk" onclick="aclActive(); return false;">{{$shortpermset}}</a>
 				</li>
 				{{/if}}
 				{{if $preview}}
 				<li role="menuitem">
-					<a class="btn btn-link jot-preview-lnk" id="jot-preview-lnk" onclick="previewActive(); return false;">{{$preview}}</a>
+					<a class="jot-preview-lnk" id="jot-preview-lnk" onclick="previewActive(); return false;">{{$preview}}</a>
 				</li>
 				{{/if}}
 				<li role="menuitem">
-					<a class="btn btn-link" id="jot-browser-link" onclick="fbrowserActive(); return false;">{{$browser}}</a>
+					<a class="jot-browser-lnk" id="jot-browser-link" onclick="fbrowserActive(); return false;">{{$browser}}</a>
 				</li>
 			</ul>
 
@@ -39,16 +39,16 @@
 					{{* mark the first list entry as active because it is the first which is active after opening
 					the modal. Changing of the activity status is done by js in jot.tpl-header *}}
 					<li role="menuitem" style="display: none;">
-						<button type="button" class="btn btn-link jot-text-lnk" id="jot-text-lnk-mobile" onclick="jotActive();">{{$message}}</button>
+						<a class="jot-text-lnk" id="jot-text-lnk-mobile" onclick="jotActive(); return false;">{{$message}}</a>
 					</li>
 					{{if $acl}}
 					<li role="menuitem">
-						<button type="button" class="btn btn-link jot-perms-lnk" id="jot-perms-lnk-mobile" onclick="aclActive();">{{$shortpermset}}</button>
+						<a class="jot-perms-lnk" id="jot-perms-lnk-mobile" onclick="aclActive(); return false;">{{$shortpermset}}</a>
 					</li>
 					{{/if}}
 					{{if $preview}}
 					<li role="menuitem">
-						<button type="button" class="btn btn-link jot-preview-lnk" id="jot-preview-lnk-mobile" onclick="previewActive();">{{$preview}}</button>
+						<a class="jot-preview-lnk" id="jot-preview-lnk-mobile" onclick="previewActive(); return false;">{{$preview}}</a>
 					</li>
 					{{/if}}
 				</ul>

From 67c40bf030cf3e890e69e416d4416aa5b37685ae Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Thu, 16 Mar 2017 22:19:27 -0400
Subject: [PATCH 008/120] Fix "Mark all as seen" button display

---
 view/theme/frio/css/style.css     | 2 +-
 view/theme/frio/templates/nav.tpl | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index b272e3f0de..3d05e5ee27 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -556,7 +556,7 @@ nav.navbar .nav>li>a:focus{
 #topbar-first .dropdown-footer {
     margin: 10px 10px 5px
 }
-#topbar-first a, #topbar-first .btn-link,
+#topbar-first a,
 nav.navbar a, nav.navbar .btn-link {
     color: $nav_icon_color;
 }
diff --git a/view/theme/frio/templates/nav.tpl b/view/theme/frio/templates/nav.tpl
index 7a4c4b04af..f438714929 100644
--- a/view/theme/frio/templates/nav.tpl
+++ b/view/theme/frio/templates/nav.tpl
@@ -70,7 +70,7 @@
 					{{* The notifications dropdown *}}
 					{{if $nav.notifications}}
 						<li id="nav-notification" class="nav-segment hidden-xs" role="presentation">
-							<a role="menuitem" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" data-toggle="tooltip" data-toggle="tooltip" title="{{$nav.notifications.1}}" class="btn-link" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+							<a role="menuitem" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" data-toggle="tooltip" data-toggle="tooltip" title="{{$nav.notifications.1}}" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 								<i class="fa fa-exclamation-circle fa-lg"></i>
 								<span class="sr-only">{{$nav.notifications.1}}</span>
 								<span id="notify-update" class="nav-notify-badge badge nav-notify dropdown" data-toggle="dropdown"></span>
@@ -84,7 +84,7 @@
 									<div class="arrow"></div>
 									{{$nav.notifications.1}}
 									<div class="dropdown-header-link">
-										<button type="button" class="btn btn-link" onclick="notifyMarkAll();" data-toggle="tooltip" title="{{$nav.notifications.mark.3}}">{{$nav.notifications.mark.1}}</button>
+										<button type="button" class="btn-link" onclick="notifyMarkAll();" data-toggle="tooltip" title="{{$nav.notifications.mark.3}}">{{$nav.notifications.mark.1}}</button>
 									</div>
 
 								</li>

From 8ac8d779f6dd2bc0f9b47cfa49b2164186283b69 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Thu, 16 Mar 2017 22:19:45 -0400
Subject: [PATCH 009/120] Fix bulk drop button

---
 view/theme/frio/templates/threaded_conversation.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/theme/frio/templates/threaded_conversation.tpl b/view/theme/frio/templates/threaded_conversation.tpl
index 8fb608eca2..fc0e2558d7 100644
--- a/view/theme/frio/templates/threaded_conversation.tpl
+++ b/view/theme/frio/templates/threaded_conversation.tpl
@@ -21,6 +21,6 @@
 {{if $dropping}}
 <button type="button" id="item-delete-selected" class="btn btn-link" title="{{$dropping}}" onclick="deleteCheckedItems();" data-toggle="tooltip">
 	<i class="fa fa-trash" aria-hidden="true"></i>
-<button>
+</button>
 <img id="item-delete-selected-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" />
 {{/if}}

From 29936060cf32c8adcebdd5058b826ac05ca6a41f Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Fri, 17 Mar 2017 20:26:40 -0400
Subject: [PATCH 010/120] Fix filebrowser display

---
 view/global.css                           | 10 +++++-----
 view/theme/frio/js/filebrowser.js         |  4 ++--
 view/theme/frio/templates/filebrowser.tpl |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/view/global.css b/view/global.css
index 3fb31a30cc..b8fe5723f2 100644
--- a/view/global.css
+++ b/view/global.css
@@ -273,19 +273,19 @@ img.acpopup-img {
 
 /* plain text editor upload/select popup */
 
-.fbrowser .path a { padding: 5px; }
-.fbrowser .path a:before { content: "/"; padding-right: 5px;}
+.fbrowser .path a, .fbrowser .path .btn-link { padding: 5px; }
+.fbrowser .path a:before, .fbrowser .path .btn-link:before { content: "/"; padding-right: 5px;}
 .fbrowser .folders ul { list-style-type: none; padding-left: 10px;}
 .fbrowser .list { height: auto; overflow-y: hidden; margin: 10px 0px; }
 .fbrowser.image .photo-album-image-wrapper { float: left; }
-.fbrowser.image a img { height: 48px; }
-.fbrowser.image a p { display: none;}
+.fbrowser.image a img, .fbrowser.image .btn-link img { height: 48px; }
+.fbrowser.image a p, .fbrowser.image .btn-link p { display: none;}
 .fbrowser.file .photo-album-image-wrapper { float:none;  white-space: nowrap; }
 .fbrowser.file img { display: inline; }
 .fbrowser.file p  { display: inline; white-space: nowrap; }
 .fbrowser .upload { clear: both; padding-top: 1em;}
 .fbrowser .error { background: #ffeeee; border: 1px solid #994444; color: #994444; padding: 0.5em;}
-.fbrowser .error a.close { float: right; font-weight: bold; }
+.fbrowser .error .close { float: right; font-weight: bold; }
 .fbrowser .error.hidden { display: none; }
 
 a {
diff --git a/view/theme/frio/js/filebrowser.js b/view/theme/frio/js/filebrowser.js
index 6856d12ba2..c267de4c5d 100644
--- a/view/theme/frio/js/filebrowser.js
+++ b/view/theme/frio/js/filebrowser.js
@@ -88,12 +88,12 @@ var FileBrowser = {
 
 		console.log("FileBrowser:", nickname, type,FileBrowser.event, FileBrowser.id );
 
-		$(".error a.close").on("click", function(e) {
+		$(".error .close").on("click", function(e) {
 			e.preventDefault();
 			$(".error").addClass("hidden");
 		});
 
-		$(".folders a, .path a").on("click", function(e) {
+		$(".folders a, .path a, .folders button, .path button").on("click", function(e) {
 			e.preventDefault();
 			var url = baseurl + "/fbrowser/" + FileBrowser.type + "/" + this.dataset.folder + "?mode=none";
 
diff --git a/view/theme/frio/templates/filebrowser.tpl b/view/theme/frio/templates/filebrowser.tpl
index 3fede8f7c9..3b0b24b5df 100644
--- a/view/theme/frio/templates/filebrowser.tpl
+++ b/view/theme/frio/templates/filebrowser.tpl
@@ -30,7 +30,7 @@
 	<div class="list">
 		{{foreach $files as $f}}
 		<div class="photo-album-image-wrapper">
-			<button type="button" class="btn btn-link" class="photo-album-photo-link" data-link="{{$f.0}}" data-filename="{{$f.1}}" data-img="{{$f.2}}">
+			<button type="button" class="btn btn-link photo-album-photo-link" data-link="{{$f.0}}" data-filename="{{$f.1}}" data-img="{{$f.2}}">
 				<img src="{{$f.2}}">
 				<p>{{$f.1}}</p>
 			</button>

From 92a755f688dfc708954689afbbb67434033efd99 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Fri, 17 Mar 2017 20:27:17 -0400
Subject: [PATCH 011/120] Fix event display

---
 view/theme/frio/css/mod_events.css      | 2 +-
 view/theme/frio/templates/events_js.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/view/theme/frio/css/mod_events.css b/view/theme/frio/css/mod_events.css
index 5ca2230015..6512d1bbec 100644
--- a/view/theme/frio/css/mod_events.css
+++ b/view/theme/frio/css/mod_events.css
@@ -25,7 +25,7 @@
 #event-calendar-title {
     vertical-align: middle;
 }
-a#event-calendar-views {
+#event-calendar-views {
     padding: 6px 9px;
     font-size: 14px
 }
diff --git a/view/theme/frio/templates/events_js.tpl b/view/theme/frio/templates/events_js.tpl
index 8f7b3add06..48a75639a2 100644
--- a/view/theme/frio/templates/events_js.tpl
+++ b/view/theme/frio/templates/events_js.tpl
@@ -3,7 +3,7 @@
 	{{include file="section_title.tpl" title=$title}}
 
 	{{* The link to create a new event *}}
-	<div id="new-event-link"><button type="button" class="btn btn-link" onclick="addToModal('{{$new_event.0}}')" >{{$new_event.1}}</button></div>
+	<div id="new-event-link"><button type="button" class="btn-link" onclick="addToModal('{{$new_event.0}}')" >{{$new_event.1}}</button></div>
 
 	{{* We create our own fullcallendar header (with title & calendar view *}}
 	<div id="fc-header">

From 03700d4ae5a801f11f5ac0c4665da448721e4bfa Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Fri, 17 Mar 2017 20:27:31 -0400
Subject: [PATCH 012/120] Fix contact display

---
 view/theme/frio/templates/contact_edit.tpl      | 2 +-
 view/theme/frio/templates/contacts-template.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/view/theme/frio/templates/contact_edit.tpl b/view/theme/frio/templates/contact_edit.tpl
index 1173830f72..aa9abdc9b5 100644
--- a/view/theme/frio/templates/contact_edit.tpl
+++ b/view/theme/frio/templates/contact_edit.tpl
@@ -14,7 +14,7 @@
 				{{* This is the Action menu where contact related actions like 'ignore', 'hide' can be performed *}}
 				<ul id="contact-edit-actions" class="nav nav-pills preferences">
 					<li class="dropdown pull-right">
-						<button type="button" class="btn btn-link btn-sm dropdown-toggle" id="contact-edit-actions-button" data-toggle="dropdown" aria-expanded="true">
+						<button type="button" class="btn-link btn-sm dropdown-toggle" id="contact-edit-actions-button" data-toggle="dropdown" aria-expanded="true">
 							<i class="fa fa-angle-down"></i>&nbsp;{{$contact_action_button}}
 						</button>
 
diff --git a/view/theme/frio/templates/contacts-template.tpl b/view/theme/frio/templates/contacts-template.tpl
index 43330edc95..13617692b8 100644
--- a/view/theme/frio/templates/contacts-template.tpl
+++ b/view/theme/frio/templates/contacts-template.tpl
@@ -36,7 +36,7 @@
 		{{* We put the contact batch actions in a dropdown menu *}}
 		<ul class="nav nav-pills preferences">
 			<li class="dropdown pull-right">
-				<button type="button" class="btn btn-link btn-sm dropdown-toggle" id="BatchActionDropdownMenuTools" data-toggle="dropdown" aria-expanded="true">
+				<button type="button" class="btn-link btn-sm dropdown-toggle" id="BatchActionDropdownMenuTools" data-toggle="dropdown" aria-expanded="true">
 					<i class="fa fa-angle-down"></i>&nbsp;{{$h_batch_actions}}
 				</button>
 				<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="BatchActionDropdownMenuTools">

From d1a1dfe8796956f49dcf517ba9afb1763a5fcc79 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Fri, 17 Mar 2017 20:27:43 -0400
Subject: [PATCH 013/120] Fix profile display

---
 view/theme/frio/templates/profile_edit.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/theme/frio/templates/profile_edit.tpl b/view/theme/frio/templates/profile_edit.tpl
index 0e20bf2135..3c79127b51 100644
--- a/view/theme/frio/templates/profile_edit.tpl
+++ b/view/theme/frio/templates/profile_edit.tpl
@@ -6,7 +6,7 @@
 	<div id="profile-edit-links">
 		<ul class="nav nav-pills preferences">
 			<li class="dropdown pull-right">
-				<button type="button" class="btn btn-link btn-sm dropdown-toggle" id="profile-edit-links-dropdown" data-toggle="dropdown" aria-expanded="true">
+				<button type="button" class="btn-link btn-sm dropdown-toggle" id="profile-edit-links-dropdown" data-toggle="dropdown" aria-expanded="true">
 					<i class="fa fa-angle-down"  aria-hidden="true"></i>&nbsp;{{$profile_action}}
 				</button>
 				<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="profile-edit-links-dropdown">

From 80510ef4caba24556ef7fe4c075ececcddbf49e3 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Fri, 17 Mar 2017 20:28:00 -0400
Subject: [PATCH 014/120] Fix group_side display

---
 view/theme/frio/templates/group_side.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/theme/frio/templates/group_side.tpl b/view/theme/frio/templates/group_side.tpl
index 688ad28190..2f8c6a1480 100644
--- a/view/theme/frio/templates/group_side.tpl
+++ b/view/theme/frio/templates/group_side.tpl
@@ -34,7 +34,7 @@
 	{{if $newgroup}}
 	<div id="sidebar-new-group">
 		{{* show the input field by clicking "new group" *}}
-		<button type="button" class="btn btn-link" onclick="javascript:$('#group-new-form').fadeIn('fast');">{{$createtext}}</button>
+		<button type="button" class="btn-link" onclick="javascript:$('#group-new-form').fadeIn('fast');">{{$createtext}}</button>
 		<form id="group-new-form" action="group/new" method="post" style="display:none;">
 			<div class="form-group">
 				<input type="hidden" name="form_security_token" value="{{$form_security_token}}">

From 2e17885eb39eea005dd0284d01db67389edde4e6 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Fri, 17 Mar 2017 20:28:09 -0400
Subject: [PATCH 015/120] Fix jot display

---
 view/theme/frio/templates/jot.tpl | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/view/theme/frio/templates/jot.tpl b/view/theme/frio/templates/jot.tpl
index 71fdae7cd3..28cf173a5d 100644
--- a/view/theme/frio/templates/jot.tpl
+++ b/view/theme/frio/templates/jot.tpl
@@ -91,13 +91,13 @@
 						{{* uncomment the button for "wall-immage-upload" because we have integrated it directly in the jot modal
 						<li><a href="#" id="wall-image-upload" title="{{$upload}}"><i class="fa fa-picture-o"></i></a></li>
 						*}}
-						<li><button type="button" class="btn-link" id="wall-file-upload" title="{{$attach}}"><i class="fa fa-paperclip"></i></button></li>
-						<li><button type="button" class="btn-link" id="profile-link"  ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink();" title="{{$weblink}}"><i class="fa fa-link"></i></button></li>
-						<li><button type="button" class="btn-link" id="profile-video" onclick="jotVideoURL();" title="{{$video}}"><i class="fa fa-film"></i></button></li>
-						<li><button type="button" class="btn-link" id="profile-audio" onclick="jotAudioURL();" title="{{$audio}}"><i class="fa fa-music"></i></button></li>
-						<li><button type="button" class="btn-link" id="profile-location" onclick="jotGetLocation();" title="{{$setloc}}"><i class="fa fa-map-marker"></i></button></li>
+						<li><button type="button" class="btn btn-link" id="wall-file-upload" title="{{$attach}}"><i class="fa fa-paperclip"></i></button></li>
+						<li><button type="button" class="btn btn-link" id="profile-link"  ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink();" title="{{$weblink}}"><i class="fa fa-link"></i></button></li>
+						<li><button type="button" class="btn btn-link" id="profile-video" onclick="jotVideoURL();" title="{{$video}}"><i class="fa fa-film"></i></button></li>
+						<li><button type="button" class="btn btn-link" id="profile-audio" onclick="jotAudioURL();" title="{{$audio}}"><i class="fa fa-music"></i></button></li>
+						<li><button type="button" class="btn btn-link" id="profile-location" onclick="jotGetLocation();" title="{{$setloc}}"><i class="fa fa-map-marker"></i></button></li>
 						<!-- TODO: waiting for a better placement
-						<li><button type="button" class="btn-link" id="profile-nolocation" onclick="jotClearLocation();" title="{{$noloc}}">{{$shortnoloc}}</button></li>
+						<li><button type="button" class="btn btn-link" id="profile-nolocation" onclick="jotClearLocation();" title="{{$noloc}}">{{$shortnoloc}}</button></li>
 						-->
 
 						<li class="pull-right"><button class="btn btn-primary" id="jot-submit" type="submit" id="profile-jot-submit" name="submit" ><i class="fa fa-slideshare fa-fw"></i> {{$share}}</button></li>

From 20406aacec498d8d07961c5552baef50e0abba70 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Fri, 17 Mar 2017 20:28:31 -0400
Subject: [PATCH 016/120] All-around CSS display fixes

---
 view/theme/frio/css/style.css | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index 3d05e5ee27..5706d515c7 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -204,6 +204,7 @@ a#item-delete-selected {
 }
 
 .btn-link {
+    border: 0;
     color: $link_color;
 }
 .btn-link:focus, .btn-link:hover {
@@ -556,7 +557,7 @@ nav.navbar .nav>li>a:focus{
 #topbar-first .dropdown-footer {
     margin: 10px 10px 5px
 }
-#topbar-first a,
+#topbar-first a, #topbar-first .btn-link,
 nav.navbar a, nav.navbar .btn-link {
     color: $nav_icon_color;
 }
@@ -822,6 +823,17 @@ nav.navbar a, nav.navbar .btn-link {
 }
 
 /* Dropdown Menus */
+.nav > li > .btn-link:not(.nav-avatar):focus,
+.nav > li > .btn-link:not(.nav-avatar):hover {
+    text-decoration: none;
+    background-color: #eee;
+}
+.nav .open > .btn-link:not(.nav-avatar),
+.nav .open > .btn-link:not(.nav-avatar):focus,
+.nav .open > .btn-link:not(.nav-avatar):hover {
+    background-color: #eee;
+    border-color: #337ab7;
+}
 .nav-pills > li > .btn-link {
 	border-radius: 4px;
 }
@@ -1193,8 +1205,8 @@ section #jotOpen {
 .jothidden {
     /*display: none;*/
 }
-#jot-modal .modal-header a,
-#profile-jot-submit-wrapper a {
+#jot-modal .modal-header a, #jot-modal .modal-header .btn-link,
+#profile-jot-submit-wrapper a, #profile-jot-submit-wrapper .btn-link {
     color: #555;
     text-transform: capitalize;
 }

From 8d6d008d2844f55889392f8087de123a88c8349d Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Fri, 17 Mar 2017 20:46:31 -0400
Subject: [PATCH 017/120] Fix frio style.css indentation

---
 view/theme/frio/css/style.css | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index 5706d515c7..596705e6b8 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -704,7 +704,7 @@ nav.navbar a, nav.navbar .btn-link {
 @media screen and (max-width: 767px) {
     #topbar-second > .container,
     #topbar-second #navbar-button {
-	padding: 0;
+    padding: 0;
     }
 }
 #topbar-second .dropdown-menu {
@@ -835,11 +835,11 @@ nav.navbar a, nav.navbar .btn-link {
     border-color: #337ab7;
 }
 .nav-pills > li > .btn-link {
-	border-radius: 4px;
+    border-radius: 4px;
 }
 .dropdown-menu > li > :focus,
 .dropdown-menu > li > :hover {
-	background-color: #e8e8e8;
+    background-color: #e8e8e8;
     background-image: -webkit-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);
     background-image: -o-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);
     background-image: -webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#e8e8e8));
@@ -877,7 +877,7 @@ nav.navbar a, nav.navbar .btn-link {
     font-size: 13px;
     padding: 4px 15px;
     text-transform: capitalize;
-	width: 100%;
+    width: 100%;
     text-align: left;
 }
 .nav-pills .dropdown-menu li a i, .nav-pills .dropdown-menu li .btn-link i,
@@ -1516,8 +1516,8 @@ section #jotOpen {
 @media screen and (max-width: 767px) {
     .shared-wrapper,
     .vevent {
-	margin-left: 0px;
-	margin-right: 0px;
+    margin-left: 0px;
+    margin-right: 0px;
     }
 }
 .shared-wrapper:hover,
@@ -1669,7 +1669,7 @@ code > .hl-main {
 * Comment Box
 */
 .wall-item-comment-wrapper {
-	margin-top: 10px;
+    margin-top: 10px;
 }
 .thread_level_2 .wall-item-comment-wrapper {
     padding-right: 5px;
@@ -2037,7 +2037,7 @@ ul.viewcontact_wrapper > li {
 .textcomplete-item .contact-wrapper .contact-action-link {
     padding: 0 5px;
     color: #555;
-	border: 0;
+    border: 0;
 }
 .contact-wrapper .contact-action-link {
     opacity: 0.1;

From 830af774d314df8bdc760ae2093cd40229a32802 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Wed, 25 Jan 2017 15:59:27 +0100
Subject: [PATCH 018/120] added more curly braces + a bit more usage of
 dbm::is_result()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 include/dfrn.php     | 233 +++++++++++++++++++++++++++----------------
 mod/dfrn_confirm.php |  13 +--
 mod/profiles.php     |   5 +-
 update.php           |   2 +-
 util/po2php.php      |   2 +-
 5 files changed, 159 insertions(+), 96 deletions(-)

diff --git a/include/dfrn.php b/include/dfrn.php
index 25f8c9358e..eadc374555 100644
--- a/include/dfrn.php
+++ b/include/dfrn.php
@@ -637,18 +637,24 @@ class dfrn {
 			$entry = $doc->createElement($element);
 
 			$r = parse_xml_string($activity, false);
-			if(!$r)
+			if (!$r) {
 				return false;
-			if($r->type)
+			}
+			if ($r->type) {
 				xml::add_element($doc, $entry, "activity:object-type", $r->type);
-			if($r->id)
+			}
+			if ($r->id) {
 				xml::add_element($doc, $entry, "id", $r->id);
-			if($r->title)
+			}
+			if ($r->title) {
 				xml::add_element($doc, $entry, "title", $r->title);
-			if($r->link) {
-				if(substr($r->link,0,1) == '<') {
-					if(strstr($r->link,'&') && (! strstr($r->link,'&amp;')))
+			}
+
+			if ($r->link) {
+				if (substr($r->link,0,1) == '<') {
+					if (strstr($r->link,'&') && (! strstr($r->link,'&amp;'))) {
 						$r->link = str_replace('&','&amp;', $r->link);
+					}
 
 					$r->link = preg_replace('/\<link(.*?)\"\>/','<link$1"/>',$r->link);
 
@@ -657,8 +663,9 @@ class dfrn {
 					if (is_object($data)) {
 						foreach ($data->link AS $link) {
 							$attributes = array();
-							foreach ($link->attributes() AS $parameter => $value)
+							foreach ($link->attributes() AS $parameter => $value) {
 								$attributes[$parameter] = $value;
+							}
 							xml::add_element($doc, $entry, "link", "", $attributes);
 						}
 					}
@@ -667,8 +674,9 @@ class dfrn {
 					xml::add_element($doc, $entry, "link", "", $attributes);
 				}
 			}
-			if($r->content)
+			if ($r->content) {
 				xml::add_element($doc, $entry, "content", bbcode($r->content), array("type" => "html"));
+			}
 
 			return $entry;
 		}
@@ -687,20 +695,22 @@ class dfrn {
 	 */
 	private static function get_attachment($doc, $root, $item) {
 		$arr = explode('[/attach],',$item['attach']);
-		if(count($arr)) {
-			foreach($arr as $r) {
+		if (count($arr)) {
+			foreach ($arr as $r) {
 				$matches = false;
 				$cnt = preg_match('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"|',$r,$matches);
-				if($cnt) {
+				if ($cnt) {
 					$attributes = array("rel" => "enclosure",
 							"href" => $matches[1],
 							"type" => $matches[3]);
 
-					if(intval($matches[2]))
+					if (intval($matches[2])) {
 						$attributes["length"] = intval($matches[2]);
+					}
 
-					if(trim($matches[4]) != "")
+					if (trim($matches[4]) != "") {
 						$attributes["title"] = trim($matches[4]);
+					}
 
 					xml::add_element($doc, $root, "link", "", $attributes);
 				}
@@ -724,20 +734,22 @@ class dfrn {
 
 		$mentioned = array();
 
-		if(!$item['parent'])
+		if (!$item['parent']) {
 			return;
+		}
 
-		if($item['deleted']) {
+		if ($item['deleted']) {
 			$attributes = array("ref" => $item['uri'], "when" => datetime_convert('UTC','UTC',$item['edited'] . '+00:00',ATOM_TIME));
 			return xml::create_element($doc, "at:deleted-entry", "", $attributes);
 		}
 
 		$entry = $doc->createElement("entry");
 
-		if($item['allow_cid'] || $item['allow_gid'] || $item['deny_cid'] || $item['deny_gid'])
+		if ($item['allow_cid'] || $item['allow_gid'] || $item['deny_cid'] || $item['deny_gid']) {
 			$body = fix_private_photos($item['body'],$owner['uid'],$item,$cid);
-		else
+		} else {
 			$body = $item['body'];
+		}
 
 		// Remove the abstract element. It is only locally important.
 		$body = remove_abstract($body);
@@ -745,8 +757,9 @@ class dfrn {
 		if ($type == 'html') {
 			$htmlbody = $body;
 
-			if ($item['title'] != "")
+			if ($item['title'] != "") {
 				$htmlbody = "[b]".$item['title']."[/b]\n\n".$htmlbody;
+			}
 
 			$htmlbody = bbcode($htmlbody, false, false, 7);
 		}
@@ -757,7 +770,7 @@ class dfrn {
 		$dfrnowner = self::add_entry_author($doc, "dfrn:owner", $item["owner-link"], $item);
 		$entry->appendChild($dfrnowner);
 
-		if(($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || (($item['thr-parent'] !== '') && ($item['thr-parent'] !== $item['uri']))) {
+		if (($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || (($item['thr-parent'] !== '') && ($item['thr-parent'] !== $item['uri']))) {
 			$parent = q("SELECT `guid` FROM `item` WHERE `id` = %d", intval($item["parent"]));
 			$parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']);
 			$attributes = array("ref" => $parent_item, "type" => "text/html",
@@ -785,26 +798,33 @@ class dfrn {
 
 		// "comment-allow" is some old fashioned stuff for old Friendica versions.
 		// It is included in the rewritten code for completeness
-		if ($comment)
+		if ($comment) {
 			xml::add_element($doc, $entry, "dfrn:comment-allow", intval($item['last-child']));
+		}
 
-		if($item['location'])
+		if ($item['location']) {
 			xml::add_element($doc, $entry, "dfrn:location", $item['location']);
+		}
 
-		if($item['coord'])
+		if ($item['coord']) {
 			xml::add_element($doc, $entry, "georss:point", $item['coord']);
+		}
 
-		if(($item['private']) || strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid']))
+		if (($item['private']) || strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid'])) {
 			xml::add_element($doc, $entry, "dfrn:private", (($item['private']) ? $item['private'] : 1));
+		}
 
-		if($item['extid'])
+		if ($item['extid']) {
 			xml::add_element($doc, $entry, "dfrn:extid", $item['extid']);
+		}
 
-		if($item['bookmark'])
+		if ($item['bookmark']) {
 			xml::add_element($doc, $entry, "dfrn:bookmark", "true");
+		}
 
-		if($item['app'])
+		if ($item['app']) {
 			xml::add_element($doc, $entry, "statusnet:notice_info", "", array("local_id" => $item['id'], "source" => $item['app']));
+		}
 
 		xml::add_element($doc, $entry, "dfrn:diaspora_guid", $item["guid"]);
 
@@ -817,46 +837,56 @@ class dfrn {
 
 		xml::add_element($doc, $entry, "activity:verb", construct_verb($item));
 
-		if ($item['object-type'] != "")
+		if ($item['object-type'] != "") {
 			xml::add_element($doc, $entry, "activity:object-type", $item['object-type']);
-		elseif ($item['id'] == $item['parent'])
+		} elseif ($item['id'] == $item['parent']) {
 			xml::add_element($doc, $entry, "activity:object-type", ACTIVITY_OBJ_NOTE);
-		else
+		} else {
 			xml::add_element($doc, $entry, "activity:object-type", ACTIVITY_OBJ_COMMENT);
+		}
 
 		$actobj = self::create_activity($doc, "activity:object", $item['object']);
-		if ($actobj)
+		if ($actobj) {
 			$entry->appendChild($actobj);
+		}
 
 		$actarg = self::create_activity($doc, "activity:target", $item['target']);
-		if ($actarg)
+		if ($actarg) {
 			$entry->appendChild($actarg);
+		}
 
 		$tags = item_getfeedtags($item);
 
-		if(count($tags)) {
-			foreach($tags as $t)
-				if (($type != 'html') OR ($t[0] != "@"))
+		if( count($tags)) {
+			foreach ($tags as $t) {
+				if (($type != 'html') OR ($t[0] != "@")) {
 					xml::add_element($doc, $entry, "category", "", array("scheme" => "X-DFRN:".$t[0].":".$t[1], "term" => $t[2]));
+				}
+			}
 		}
 
-		if(count($tags))
-			foreach($tags as $t)
-				if ($t[0] == "@")
+		if (count($tags)) {
+			foreach($tags as $t) {
+				if ($t[0] == "@") {
 					$mentioned[$t[1]] = $t[1];
+				}
+			}
+		}
 
 		foreach ($mentioned AS $mention) {
 			$r = q("SELECT `forum`, `prv` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s'",
 				intval($owner["uid"]),
 				dbesc(normalise_link($mention)));
-			if ($r[0]["forum"] OR $r[0]["prv"])
+
+			if ($r[0]["forum"] OR $r[0]["prv"]) {
 				xml::add_element($doc, $entry, "link", "", array("rel" => "mentioned",
 											"ostatus:object-type" => ACTIVITY_OBJ_GROUP,
 											"href" => $mention));
-			else
+			} else {
 				xml::add_element($doc, $entry, "link", "", array("rel" => "mentioned",
 											"ostatus:object-type" => ACTIVITY_OBJ_PERSON,
 											"href" => $mention));
+			}
 		}
 
 		self::get_attachment($doc, $entry, $item);
@@ -880,16 +910,20 @@ class dfrn {
 
 		$idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']);
 
-		if($contact['duplex'] && $contact['dfrn-id'])
+		if ($contact['duplex'] && $contact['dfrn-id']) {
 			$idtosend = '0:' . $orig_id;
-		if($contact['duplex'] && $contact['issued-id'])
+		}
+		if ($contact['duplex'] && $contact['issued-id']) {
 			$idtosend = '1:' . $orig_id;
-
+		}
 
 		$rino = get_config('system','rino_encrypt');
 		$rino = intval($rino);
+
 		// use RINO1 if mcrypt isn't installed and RINO2 was selected
-		if ($rino==2 and !function_exists('mcrypt_create_iv')) $rino=1;
+		if ($rino==2 and !function_exists('mcrypt_create_iv')) {
+			$rino=1;
+		}
 
 		logger("Local rino version: ". $rino, LOGGER_DEBUG);
 
@@ -928,10 +962,11 @@ class dfrn {
 
 		logger('dfrn_deliver: ' . $xml, LOGGER_DATA);
 
-		if(! $xml)
+		if (! $xml) {
 			return 3;
+		}
 
-		if(strpos($xml,'<?xml') === false) {
+		if (strpos($xml,'<?xml') === false) {
 			logger('dfrn_deliver: no valid XML returned');
 			logger('dfrn_deliver: returned XML: ' . $xml, LOGGER_DATA);
 			return 3;
@@ -939,8 +974,9 @@ class dfrn {
 
 		$res = parse_xml_string($xml);
 
-		if((intval($res->status) != 0) || (! strlen($res->challenge)) || (! strlen($res->dfrn_id)))
+		if ((intval($res->status) != 0) || (! strlen($res->challenge)) || (! strlen($res->dfrn_id))) {
 			return (($res->status) ? $res->status : 3);
+		}
 
 		$postvars     = array();
 		$sent_dfrn_id = hex2bin((string) $res->dfrn_id);
@@ -952,13 +988,14 @@ class dfrn {
 
 		logger("Remote rino version: ".$rino_remote_version." for ".$contact["url"], LOGGER_DEBUG);
 
-		if($owner['page-flags'] == PAGE_PRVGROUP)
+		if ($owner['page-flags'] == PAGE_PRVGROUP) {
 			$page = 2;
+		}
 
 		$final_dfrn_id = '';
 
-		if($perm) {
-			if((($perm == 'rw') && (! intval($contact['writable'])))
+		if ($perm) {
+			if ((($perm == 'rw') && (! intval($contact['writable'])))
 				|| (($perm == 'r') && (intval($contact['writable'])))) {
 				q("update contact set writable = %d where id = %d",
 					intval(($perm == 'rw') ? 1 : 0),
@@ -968,7 +1005,7 @@ class dfrn {
 			}
 		}
 
-		if(($contact['duplex'] && strlen($contact['pubkey']))
+		if (($contact['duplex'] && strlen($contact['pubkey']))
 			|| ($owner['page-flags'] == PAGE_COMMUNITY && strlen($contact['pubkey']))
 			|| ($contact['rel'] == CONTACT_IS_SHARING && strlen($contact['pubkey']))) {
 			openssl_public_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['pubkey']);
@@ -980,10 +1017,11 @@ class dfrn {
 
 		$final_dfrn_id = substr($final_dfrn_id, 0, strpos($final_dfrn_id, '.'));
 
-		if(strpos($final_dfrn_id,':') == 1)
+		if (strpos($final_dfrn_id,':') == 1) {
 			$final_dfrn_id = substr($final_dfrn_id,2);
+		}
 
-		if($final_dfrn_id != $orig_id) {
+		if ($final_dfrn_id != $orig_id) {
 			logger('dfrn_deliver: wrong dfrn_id.');
 			// did not decode properly - cannot trust this site
 			return 3;
@@ -991,11 +1029,12 @@ class dfrn {
 
 		$postvars['dfrn_id']      = $idtosend;
 		$postvars['dfrn_version'] = DFRN_PROTOCOL_VERSION;
-		if($dissolve)
+		if ($dissolve) {
 			$postvars['dissolve'] = '1';
+		}
 
 
-		if((($contact['rel']) && ($contact['rel'] != CONTACT_IS_SHARING) && (! $contact['blocked'])) || ($owner['page-flags'] == PAGE_COMMUNITY)) {
+		if ((($contact['rel']) && ($contact['rel'] != CONTACT_IS_SHARING) && (! $contact['blocked'])) || ($owner['page-flags'] == PAGE_COMMUNITY)) {
 			$postvars['data'] = $atom;
 			$postvars['perm'] = 'rw';
 		} else {
@@ -1005,11 +1044,12 @@ class dfrn {
 
 		$postvars['ssl_policy'] = $ssl_policy;
 
-		if($page)
+		if ($page) {
 			$postvars['page'] = $page;
+		}
 
 
-		if($rino>0 && $rino_remote_version>0 && (! $dissolve)) {
+		if ($rino>0 && $rino_remote_version>0 && (! $dissolve)) {
 			logger('rino version: '. $rino_remote_version);
 
 			switch($rino_remote_version) {
@@ -1047,23 +1087,25 @@ class dfrn {
 			$postvars['rino'] = $rino_remote_version;
 			$postvars['data'] = bin2hex($data);
 
-			#logger('rino: sent key = ' . $key, LOGGER_DEBUG);
+			//logger('rino: sent key = ' . $key, LOGGER_DEBUG);
 
 
-			if($dfrn_version >= 2.1) {
-				if(($contact['duplex'] && strlen($contact['pubkey']))
+			if ($dfrn_version >= 2.1) {
+				if (($contact['duplex'] && strlen($contact['pubkey'])) {
 					|| ($owner['page-flags'] == PAGE_COMMUNITY && strlen($contact['pubkey']))
 					|| ($contact['rel'] == CONTACT_IS_SHARING && strlen($contact['pubkey'])))
 
 					openssl_public_encrypt($key,$postvars['key'],$contact['pubkey']);
-				else
+				} else {
 					openssl_private_encrypt($key,$postvars['key'],$contact['prvkey']);
+				}
 
 			} else {
-				if(($contact['duplex'] && strlen($contact['prvkey'])) || ($owner['page-flags'] == PAGE_COMMUNITY))
+				if (($contact['duplex'] && strlen($contact['prvkey'])) || ($owner['page-flags'] == PAGE_COMMUNITY)) {
 					openssl_private_encrypt($key,$postvars['key'],$contact['prvkey']);
-				else
+				} else {
 					openssl_public_encrypt($key,$postvars['key'],$contact['pubkey']);
+				}
 
 			}
 
@@ -1088,7 +1130,7 @@ class dfrn {
 			return -10;
 		}
 
-		if(strpos($xml,'<?xml') === false) {
+		if (strpos($xml,'<?xml') === false) {
 			logger('dfrn_deliver: phase 2: no valid XML returned');
 			logger('dfrn_deliver: phase 2: returned XML: ' . $xml, LOGGER_DATA);
 			return 3;
@@ -1165,7 +1207,8 @@ class dfrn {
 				`name`, `nick`, `about`, `location`, `keywords`, `xmpp`, `bdyear`, `bd`, `hidden`, `contact-type`
 				FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `network` != '%s'",
 			intval($importer["uid"]), dbesc(normalise_link($author["link"])), dbesc(NETWORK_STATUSNET));
-		if ($r) {
+
+		if (dbm::is_result($r)) {
 			$contact = $r[0];
 			$author["contact-id"] = $r[0]["id"];
 			$author["network"] = $r[0]["network"];
@@ -1186,15 +1229,19 @@ class dfrn {
 			$href = "";
 			$width = 0;
 			foreach($avatar->attributes AS $attributes) {
-				if ($attributes->name == "href")
+				if ($attributes->name == "href") {
 					$href = $attributes->textContent;
-				if ($attributes->name == "width")
+				}
+				if ($attributes->name == "width") {
 					$width = $attributes->textContent;
-				if ($attributes->name == "updated")
+				}
+				if ($attributes->name == "updated") {
 					$contact["avatar-date"] = $attributes->textContent;
+				}
 			}
-			if (($width > 0) AND ($href != ""))
+			if (($width > 0) AND ($href != "")) {
 				$avatarlist[$width] = $href;
+			}
 		}
 		if (count($avatarlist) > 0) {
 			krsort($avatarlist);
@@ -1208,40 +1255,50 @@ class dfrn {
 
 			// When was the last change to name or uri?
 			$name_element = $xpath->query($element."/atom:name", $context)->item(0);
-			foreach($name_element->attributes AS $attributes)
-				if ($attributes->name == "updated")
+			foreach ($name_element->attributes AS $attributes) {
+				if ($attributes->name == "updated") {
 					$poco["name-date"] = $attributes->textContent;
+				}
+			}
 
 			$link_element = $xpath->query($element."/atom:link", $context)->item(0);
-			foreach($link_element->attributes AS $attributes)
-				if ($attributes->name == "updated")
+			foreach ($link_element->attributes AS $attributes) {
+				if ($attributes->name == "updated") {
 					$poco["uri-date"] = $attributes->textContent;
+				}
+			}
 
 			// Update contact data
 			$value = $xpath->evaluate($element."/dfrn:handle/text()", $context)->item(0)->nodeValue;
-			if ($value != "")
+			if ($value != "") {
 				$poco["addr"] = $value;
+			}
 
 			$value = $xpath->evaluate($element."/poco:displayName/text()", $context)->item(0)->nodeValue;
-			if ($value != "")
+			if ($value != "") {
 				$poco["name"] = $value;
+			}
 
 			$value = $xpath->evaluate($element."/poco:preferredUsername/text()", $context)->item(0)->nodeValue;
-			if ($value != "")
+			if ($value != "") {
 				$poco["nick"] = $value;
+			}
 
 			$value = $xpath->evaluate($element."/poco:note/text()", $context)->item(0)->nodeValue;
-			if ($value != "")
+			if ($value != "") {
 				$poco["about"] = $value;
+			}
 
 			$value = $xpath->evaluate($element."/poco:address/poco:formatted/text()", $context)->item(0)->nodeValue;
-			if ($value != "")
+			if ($value != "") {
 				$poco["location"] = $value;
+			}
 
 			/// @todo Only search for elements with "poco:type" = "xmpp"
 			$value = $xpath->evaluate($element."/poco:ims/poco:value/text()", $context)->item(0)->nodeValue;
-			if ($value != "")
+			if ($value != "") {
 				$poco["xmpp"] = $value;
+			}
 
 			/// @todo Add support for the following fields that we don't support by now in the contact table:
 			/// - poco:utcOffset
@@ -1257,17 +1314,20 @@ class dfrn {
 
 			// If the contact isn't searchable then set the contact to "hidden".
 			// Problem: This can be manually overridden by the user.
-			if ($hide)
+			if ($hide) {
 				$contact["hidden"] = true;
+			}
 
 			// Save the keywords into the contact table
 			$tags = array();
 			$tagelements = $xpath->evaluate($element."/poco:tags/text()", $context);
-			foreach($tagelements AS $tag)
+			foreach ($tagelements AS $tag) {
 				$tags[$tag->nodeValue] = $tag->nodeValue;
+			}
 
-			if (count($tags))
+			if (count($tags)) {
 				$poco["keywords"] = implode(", ", $tags);
+			}
 
 			// "dfrn:birthday" contains the birthday converted to UTC
 			$old_bdyear = $contact["bdyear"];
@@ -1297,13 +1357,15 @@ class dfrn {
 
 			$contact = array_merge($contact, $poco);
 
-			if ($old_bdyear != $contact["bdyear"])
+			if ($old_bdyear != $contact["bdyear"]) {
 				self::birthday_event($contact, $birthday);
+			}
 
 			// Get all field names
 			$fields = array();
-			foreach ($r[0] AS $field => $data)
+			foreach ($r[0] AS $field => $data) {
 				$fields[$field] = $data;
+			}
 
 			unset($fields["id"]);
 			unset($fields["uid"]);
@@ -1368,8 +1430,9 @@ class dfrn {
 	 * @return string XML string
 	 */
 	private static function transform_activity($xpath, $activity, $element) {
-		if (!is_object($activity))
+		if (!is_object($activity)) {
 			return "";
+		}
 
 		$obj_doc = new DOMDocument("1.0", "utf-8");
 		$obj_doc->formatOutput = true;
diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index e2ce806275..7e14610e33 100644
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -586,17 +586,18 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
 			dbesc($decrypted_source_url),
 			intval($local_uid)
 		);
-		if(! count($ret)) {
-			if(strstr($decrypted_source_url,'http:'))
+		if (!dbm::is_result($ret)) {
+			if (strstr($decrypted_source_url,'http:')) {
 				$newurl = str_replace('http:','https:',$decrypted_source_url);
-			else
+			} else {
 				$newurl = str_replace('https:','http:',$decrypted_source_url);
+			}
 
 			$ret = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d LIMIT 1",
 				dbesc($newurl),
 				intval($local_uid)
 			);
-			if(! count($ret)) {
+			if (!dbm::is_result($ret)) {
 				// this is either a bogus confirmation (?) or we deleted the original introduction.
 				$message = t('Contact record was not found for you on our site.');
 				xml_status(3,$message);
@@ -611,7 +612,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
 		$foreign_pubkey = $ret[0]['site-pubkey'];
 		$dfrn_record    = $ret[0]['id'];
 
-		if(! $foreign_pubkey) {
+		if (! $foreign_pubkey) {
 			$message = sprintf( t('Site public key not available in contact record for URL %s.'), $newurl);
 			xml_status(3,$message);
 		}
@@ -619,7 +620,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
 		$decrypted_dfrn_id = "";
 		openssl_public_decrypt($dfrn_id,$decrypted_dfrn_id,$foreign_pubkey);
 
-		if(strlen($aes_key)) {
+		if (strlen($aes_key)) {
 			$decrypted_aes_key = "";
 			openssl_private_decrypt($aes_key,$decrypted_aes_key,$my_prvkey);
 			$dfrn_pubkey = openssl_decrypt($public_key,'AES-256-CBC',$decrypted_aes_key);
diff --git a/mod/profiles.php b/mod/profiles.php
index 4e82ceaacd..378900a880 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -263,13 +263,12 @@ function profiles_post(App $a) {
 				}
 				else {
 					$newname = $lookup;
-/*					if(strstr($lookup,' ')) {
+/*					if (strstr($lookup,' ')) {
 						$r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
 							dbesc($newname),
 							intval(local_user())
 						);
-					}
-					else {
+					} else {
 						$r = q("SELECT * FROM `contact` WHERE `nick` = '%s' AND `uid` = %d LIMIT 1",
 							dbesc($lookup),
 							intval(local_user())
diff --git a/update.php b/update.php
index 3bce492682..106bf4b867 100644
--- a/update.php
+++ b/update.php
@@ -310,7 +310,7 @@ function update_1031() {
 	$r = q("SELECT `id`, `object` FROM `item` WHERE `object` != '' ");
 	if($r && dbm::is_result($r)) {
 		foreach ($r as $rr) {
-			if(strstr($rr['object'],'type=&quot;http')) {
+			if (strstr($rr['object'],'type=&quot;http')) {
 				q("UPDATE `item` SET `object` = '%s' WHERE `id` = %d",
 					dbesc(str_replace('type=&quot;http','href=&quot;http',$rr['object'])),
 					intval($rr['id'])
diff --git a/util/po2php.php b/util/po2php.php
index 30d77342bf..5d3429796e 100644
--- a/util/po2php.php
+++ b/util/po2php.php
@@ -12,7 +12,7 @@ function po2php_run(&$argv, &$argc) {
 	$pofile = $argv[1];
 	$outfile = dirname($pofile)."/strings.php";
 
-	if(strstr($outfile,'util'))
+	if (strstr($outfile,'util'))
 		$lang = 'en';
 	else
 		$lang = str_replace('-','_',basename(dirname($pofile)));

From ddb5a8ea78985f37ff45adf6bf6262e1774c21f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 26 Jan 2017 09:38:52 +0100
Subject: [PATCH 019/120] Continued: - added missing space/curly braces - added
 TODOs for later adding a lot type-hints, without these (and they are   long
 time around in PHP) anything can be handled over to the method/function.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 include/dfrn.php | 437 ++++++++++++++++++++++++++++++-----------------
 1 file changed, 282 insertions(+), 155 deletions(-)

diff --git a/include/dfrn.php b/include/dfrn.php
index eadc374555..8b230f03d9 100644
--- a/include/dfrn.php
+++ b/include/dfrn.php
@@ -41,6 +41,7 @@ class dfrn {
 	 * @param array $owner Owner record
 	 *
 	 * @return string DFRN entries
+	 * @todo Add type-hints
 	 */
 	public static function entries($items,$owner) {
 
@@ -49,10 +50,11 @@ class dfrn {
 
 		$root = self::add_header($doc, $owner, "dfrn:owner", "", false);
 
-		if(! count($items))
+		if (! count($items)) {
 			return trim($doc->saveXML());
+		}
 
-		foreach($items as $item) {
+		foreach ($items as $item) {
 			$entry = self::entry($doc, "text", $item, $owner, $item["entry:comment-allow"], $item["entry:cid"]);
 			$root->appendChild($entry);
 		}
@@ -82,14 +84,17 @@ class dfrn {
 		$starred     = false;   // not yet implemented, possible security issues
 		$converse    = false;
 
-		if($public_feed && $a->argc > 2) {
-			for($x = 2; $x < $a->argc; $x++) {
-				if($a->argv[$x] == 'converse')
+		if ($public_feed && $a->argc > 2) {
+			for ($x = 2; $x < $a->argc; $x++) {
+				if ($a->argv[$x] == 'converse') {
 					$converse = true;
-				if($a->argv[$x] == 'starred')
+				}
+				if ($a->argv[$x] == 'starred') {
 					$starred = true;
-				if($a->argv[$x] == 'category' && $a->argc > ($x + 1) && strlen($a->argv[$x+1]))
+				}
+				if ($a->argv[$x] == 'category' && $a->argc > ($x + 1) && strlen($a->argv[$x+1])) {
 					$category = $a->argv[$x+1];
+				}
 			}
 		}
 
@@ -115,7 +120,7 @@ class dfrn {
 
 		$sql_post_table = "";
 
-		if(! $public_feed) {
+		if (! $public_feed) {
 
 			$sql_extra = '';
 			switch($direction) {
@@ -148,12 +153,13 @@ class dfrn {
 			require_once('include/security.php');
 			$groups = init_groups_visitor($contact['id']);
 
-			if(count($groups)) {
-				for($x = 0; $x < count($groups); $x ++)
+			if (count($groups)) {
+				for ($x = 0; $x < count($groups); $x ++)
 					$groups[$x] = '<' . intval($groups[$x]) . '>' ;
 				$gs = implode('|', $groups);
-			} else
+			} else {
 				$gs = '<<>>' ; // Impossible to match
+			}
 
 			$sql_extra = sprintf("
 				AND ( `allow_cid` = '' OR     `allow_cid` REGEXP '<%d>' )
@@ -168,23 +174,26 @@ class dfrn {
 			);
 		}
 
-		if($public_feed)
+		if ($public_feed) {
 			$sort = 'DESC';
-		else
+		} else {
 			$sort = 'ASC';
+		}
 
-		if(! strlen($last_update))
+		if (! strlen($last_update)) {
 			$last_update = 'now -30 days';
+		}
 
-		if(isset($category)) {
+		if (isset($category)) {
 			$sql_post_table = sprintf("INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ",
 					dbesc(protect_sprintf($category)), intval(TERM_OBJ_POST), intval(TERM_CATEGORY), intval($owner_id));
 			//$sql_extra .= file_tag_file_query('item',$category,'category');
 		}
 
-		if($public_feed) {
-			if(! $converse)
+		if ($public_feed) {
+			if (! $converse) {
 				$sql_extra .= " AND `contact`.`self` = 1 ";
+			}
 		}
 
 		$check_date = datetime_convert('UTC','UTC',$last_update,'Y-m-d H:i:s');
@@ -207,6 +216,11 @@ class dfrn {
 			dbesc($sort)
 		);
 
+		if (!dbm::is_result($r)) {
+			/// @TODO Some logging?
+			killme();
+		}
+
 		// Will check further below if this actually returned results.
 		// We will provide an empty feed if that is the case.
 
@@ -217,13 +231,15 @@ class dfrn {
 
 		$alternatelink = $owner['url'];
 
-		if(isset($category))
+		if (isset($category)) {
 			$alternatelink .= "/category/".$category;
+		}
 
-		if ($public_feed)
+		if ($public_feed) {
 			$author = "dfrn:owner";
-		else
+		} else {
 			$author = "author";
+		}
 
 		$root = self::add_header($doc, $owner, $author, $alternatelink, true);
 
@@ -238,21 +254,24 @@ class dfrn {
 			return $atom;
 		}
 
-		foreach($items as $item) {
+		foreach ($items as $item) {
 
 			// prevent private email from leaking.
-			if($item['network'] == NETWORK_MAIL)
+			if ($item['network'] == NETWORK_MAIL) {
 				continue;
+			}
 
 			// public feeds get html, our own nodes use bbcode
 
-			if($public_feed) {
+			if ($public_feed) {
 				$type = 'html';
 				// catch any email that's in a public conversation and make sure it doesn't leak
-				if($item['private'])
+				if ($item['private']) {
 					continue;
-			} else
+				}
+			} else {
 				$type = 'text';
+			}
 
 			$entry = self::entry($doc, $type, $item, $owner, true);
 			$root->appendChild($entry);
@@ -273,6 +292,7 @@ class dfrn {
 	 * @param array $owner Owner record
 	 *
 	 * @return string DFRN mail
+	 * @todo Add type-hints
 	 */
 	public static function mail($item, $owner) {
 		$doc = new DOMDocument('1.0', 'utf-8');
@@ -307,6 +327,7 @@ class dfrn {
 	 * @param array $owner Owner record
 	 *
 	 * @return string DFRN suggestions
+	 * @todo Add type-hints
 	 */
 	public static function fsuggest($item, $owner) {
 		$doc = new DOMDocument('1.0', 'utf-8');
@@ -334,12 +355,13 @@ class dfrn {
 	 * @param int $uid User ID
 	 *
 	 * @return string DFRN relocations
+	 * @todo Add type-hints
 	 */
 	public static function relocate($owner, $uid) {
 
 		/* get site pubkey. this could be a new installation with no site keys*/
 		$pubkey = get_config('system','site_pubkey');
-		if(! $pubkey) {
+		if (! $pubkey) {
 			$res = new_keypair(1024);
 			set_config('system','site_prvkey', $res['prvkey']);
 			set_config('system','site_pubkey', $res['pubkey']);
@@ -350,8 +372,9 @@ class dfrn {
 		$photos = array();
 		$ext = Photo::supportedTypes();
 
-		foreach($rp as $p)
+		foreach ($rp as $p) {
 			$photos[$p['scale']] = app::get_baseurl().'/photo/'.$p['resource-id'].'-'.$p['scale'].'.'.$ext[$p['type']];
+		}
 
 		unset($rp, $ext);
 
@@ -390,11 +413,13 @@ class dfrn {
 	 * @param bool $public Is it a header for public posts?
 	 *
 	 * @return object XML root object
+	 * @todo Add type-hints
 	 */
 	private static function add_header($doc, $owner, $authorelement, $alternatelink = "", $public = false) {
 
-		if ($alternatelink == "")
+		if ($alternatelink == "") {
 			$alternatelink = $owner['url'];
+		}
 
 		$root = $doc->createElementNS(NAMESPACE_ATOM1, 'feed');
 		$doc->appendChild($root);
@@ -437,8 +462,9 @@ class dfrn {
 		}
 
 		// For backward compatibility we keep this element
-		if ($owner['page-flags'] == PAGE_COMMUNITY)
+		if ($owner['page-flags'] == PAGE_COMMUNITY) {
 			xml::add_element($doc, $root, "dfrn:community", 1);
+		}
 
 		// The former element is replaced by this one
 		xml::add_element($doc, $root, "dfrn:account_type", $owner["account-type"]);
@@ -461,6 +487,7 @@ class dfrn {
 	 * @param string $authorelement Element name for the author
 	 *
 	 * @return object XML author object
+	 * @todo Add type-hints
 	 */
 	private static function add_author($doc, $owner, $authorelement, $public) {
 
@@ -468,10 +495,11 @@ class dfrn {
 		$r = q("SELECT `id` FROM `profile` INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
 				WHERE (`hidewall` OR NOT `net-publish`) AND `user`.`uid` = %d",
 			intval($owner['uid']));
-		if ($r)
+		if (dbm::is_result($r)) {
 			$hidewall = true;
-		else
+		} else {
 			$hidewall = false;
+		}
 
 		$author = $doc->createElement($authorelement);
 
@@ -479,10 +507,11 @@ class dfrn {
 		$uridate = datetime_convert('UTC', 'UTC', $owner['uri-date'].'+00:00', ATOM_TIME);
 		$picdate = datetime_convert('UTC', 'UTC', $owner['avatar-date'].'+00:00', ATOM_TIME);
 
-		if (!$public OR !$hidewall)
+		$attributes = array();
+
+		if (!$public OR !$hidewall) {
 			$attributes = array("dfrn:updated" => $namdate);
-		else
-			$attributes = array();
+		}
 
 		xml::add_element($doc, $author, "name", $owner["name"], $attributes);
 		xml::add_element($doc, $author, "uri", app::get_baseurl().'/profile/'.$owner["nickname"], $attributes);
@@ -491,20 +520,23 @@ class dfrn {
 		$attributes = array("rel" => "photo", "type" => "image/jpeg",
 					"media:width" => 175, "media:height" => 175, "href" => $owner['photo']);
 
-		if (!$public OR !$hidewall)
+		if (!$public OR !$hidewall) {
 			$attributes["dfrn:updated"] = $picdate;
+		}
 
 		xml::add_element($doc, $author, "link", "", $attributes);
 
 		$attributes["rel"] = "avatar";
 		xml::add_element($doc, $author, "link", "", $attributes);
 
-		if ($hidewall)
+		if ($hidewall) {
 			xml::add_element($doc, $author, "dfrn:hide", "true");
+		}
 
 		// The following fields will only be generated if the data isn't meant for a public feed
-		if ($public)
+		if ($public) {
 			return $author;
+		}
 
 		$birthday = feed_birthday($owner['uid'], $owner['timezone']);
 
@@ -519,7 +551,7 @@ class dfrn {
 				INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
 				WHERE `profile`.`is-default` AND NOT `user`.`hidewall` AND `user`.`uid` = %d",
 			intval($owner['uid']));
-		if ($r) {
+		if (dbm::is_result($r)) {
 			$profile = $r[0];
 
 			xml::add_element($doc, $author, "poco:displayName", $profile["name"]);
@@ -547,8 +579,9 @@ class dfrn {
 			if (trim($profile["pub_keywords"]) != "") {
 				$keywords = explode(",", $profile["pub_keywords"]);
 
-				foreach ($keywords AS $keyword)
+				foreach ($keywords AS $keyword) {
 					xml::add_element($doc, $author, "poco:tags", trim($keyword));
+				}
 
 			}
 
@@ -565,14 +598,17 @@ class dfrn {
 
 				xml::add_element($doc, $element, "poco:formatted", formatted_location($profile));
 
-				if (trim($profile["locality"]) != "")
+				if (trim($profile["locality"]) != "") {
 					xml::add_element($doc, $element, "poco:locality", $profile["locality"]);
+				}
 
-				if (trim($profile["region"]) != "")
+				if (trim($profile["region"]) != "") {
 					xml::add_element($doc, $element, "poco:region", $profile["region"]);
+				}
 
-				if (trim($profile["country-name"]) != "")
+				if (trim($profile["country-name"]) != "") {
 					xml::add_element($doc, $element, "poco:country", $profile["country-name"]);
+				}
 
 				$author->appendChild($element);
 			}
@@ -590,6 +626,7 @@ class dfrn {
 	 * @param array $items Item elements
 	 *
 	 * @return object XML author object
+	 * @todo Add type-hints
 	 */
 	private static function add_entry_author($doc, $element, $contact_url, $item) {
 
@@ -630,10 +667,11 @@ class dfrn {
 	 * @param string $activity activity value
 	 *
 	 * @return object XML activity object
+	 * @todo Add type-hints
 	 */
 	private static function create_activity($doc, $element, $activity) {
 
-		if($activity) {
+		if ($activity) {
 			$entry = $doc->createElement($element);
 
 			$r = parse_xml_string($activity, false);
@@ -692,6 +730,7 @@ class dfrn {
 	 * @param array $item Item element
 	 *
 	 * @return object XML attachment object
+	 * @todo Add type-hints
 	 */
 	private static function get_attachment($doc, $root, $item) {
 		$arr = explode('[/attach],',$item['attach']);
@@ -729,6 +768,7 @@ class dfrn {
 	 * @param int $cid Contact ID of the recipient
 	 *
 	 * @return object XML entry object
+	 * @todo Add type-hints
 	 */
 	private static function entry($doc, $type, $item, $owner, $comment = false, $cid = 0) {
 
@@ -857,7 +897,7 @@ class dfrn {
 
 		$tags = item_getfeedtags($item);
 
-		if( count($tags)) {
+		if (count($tags)) {
 			foreach ($tags as $t) {
 				if (($type != 'html') OR ($t[0] != "@")) {
 					xml::add_element($doc, $entry, "category", "", array("scheme" => "X-DFRN:".$t[0].":".$t[1], "term" => $t[2]));
@@ -866,7 +906,7 @@ class dfrn {
 		}
 
 		if (count($tags)) {
-			foreach($tags as $t) {
+			foreach ($tags as $t) {
 				if ($t[0] == "@") {
 					$mentioned[$t[1]] = $t[1];
 				}
@@ -878,6 +918,11 @@ class dfrn {
 				intval($owner["uid"]),
 				dbesc(normalise_link($mention)));
 
+			if (!dbm::is_result($r)) {
+				/// @TODO Maybe some logging?
+				killme();
+			}
+
 			if ($r[0]["forum"] OR $r[0]["prv"]) {
 				xml::add_element($doc, $entry, "link", "", array("rel" => "mentioned",
 											"ostatus:object-type" => ACTIVITY_OBJ_GROUP,
@@ -903,6 +948,7 @@ class dfrn {
 	 * @param bool $dissolve (to be documented)
 	 *
 	 * @return int Deliver status. -1 means an error.
+	 * @todo Add array type-hint for $owner, $contact
 	 */
 	public static function deliver($owner,$contact,$atom, $dissolve = false) {
 
@@ -1152,7 +1198,7 @@ class dfrn {
 	 *
 	 * @param array $contact Contact record
 	 * @param string $birthday Birthday of the contact
-	 *
+	 * @todo Add array type-hint for $contact
 	 */
 	private static function birthday_event($contact, $birthday) {
 
@@ -1196,6 +1242,7 @@ class dfrn {
 	 * @param bool $onlyfetch Should the data only be fetched or should it update the contact record as well
 	 *
 	 * @return Returns an array with relevant data of the author
+	 * @todo Find good type-hints for all parameter
 	 */
 	private static function fetchauthor($xpath, $context, $importer, $element, $onlyfetch, $xml = "") {
 
@@ -1213,8 +1260,9 @@ class dfrn {
 			$author["contact-id"] = $r[0]["id"];
 			$author["network"] = $r[0]["network"];
 		} else {
-			if (!$onlyfetch)
+			if (!$onlyfetch) {
 				logger("Contact ".$author["link"]." wasn't found for user ".$importer["uid"]." XML: ".$xml, LOGGER_DEBUG);
+			}
 
 			$author["contact-id"] = $importer["id"];
 			$author["network"] = $importer["network"];
@@ -1225,10 +1273,11 @@ class dfrn {
 		$avatarlist = array();
 		/// @todo check if "avatar" or "photo" would be the best field in the specification
 		$avatars = $xpath->query($element."/atom:link[@rel='avatar']", $context);
-		foreach($avatars AS $avatar) {
+		foreach ($avatars AS $avatar) {
 			$href = "";
 			$width = 0;
-			foreach($avatar->attributes AS $attributes) {
+			foreach ($avatar->attributes AS $attributes) {
+				/// @TODO Rewrite these similar if() to one switch
 				if ($attributes->name == "href") {
 					$href = $attributes->textContent;
 				}
@@ -1248,7 +1297,7 @@ class dfrn {
 			$author["avatar"] = current($avatarlist);
 		}
 
-		if ($r AND !$onlyfetch) {
+		if (dbm::is_result($r) AND !$onlyfetch) {
 			logger("Check if contact details for contact ".$r[0]["id"]." (".$r[0]["nick"].") have to be updated.", LOGGER_DEBUG);
 
 			$poco = array("url" => $contact["url"]);
@@ -1376,17 +1425,19 @@ class dfrn {
 
 			// Update check for this field has to be done differently
 			$datefields = array("name-date", "uri-date");
-			foreach ($datefields AS $field)
+			foreach ($datefields AS $field) {
 				if (strtotime($contact[$field]) > strtotime($r[0][$field])) {
 					logger("Difference for contact ".$contact["id"]." in field '".$field."'. New value: '".$contact[$field]."', old value '".$r[0][$field]."'", LOGGER_DEBUG);
 					$update = true;
 				}
+			}
 
-			foreach ($fields AS $field => $data)
+			foreach ($fields AS $field => $data) {
 				if ($contact[$field] != $r[0][$field]) {
 					logger("Difference for contact ".$contact["id"]." in field '".$field."'. New value: '".$contact[$field]."', old value '".$r[0][$field]."'", LOGGER_DEBUG);
 					$update = true;
 				}
+			}
 
 			if ($update) {
 				logger("Update contact data for contact ".$contact["id"]." (".$contact["nick"].")", LOGGER_DEBUG);
@@ -1428,6 +1479,7 @@ class dfrn {
 	 * @param text $element element name
 	 *
 	 * @return string XML string
+	 * @todo Find good type-hints for all parameter
 	 */
 	private static function transform_activity($xpath, $activity, $element) {
 		if (!is_object($activity)) {
@@ -1443,21 +1495,26 @@ class dfrn {
 		xml::add_element($obj_doc, $obj_element, "type", $activity_type);
 
 		$id = $xpath->query("atom:id", $activity)->item(0);
-		if (is_object($id))
+		if (is_object($id)) {
 			$obj_element->appendChild($obj_doc->importNode($id, true));
+		}
 
 		$title = $xpath->query("atom:title", $activity)->item(0);
-		if (is_object($title))
+		if (is_object($title)) {
 			$obj_element->appendChild($obj_doc->importNode($title, true));
+		}
 
 		$links = $xpath->query("atom:link", $activity);
-		if (is_object($links))
-			foreach ($links AS $link)
+		if (is_object($links)) {
+			foreach ($links AS $link) {
 				$obj_element->appendChild($obj_doc->importNode($link, true));
+			}
+		}
 
 		$content = $xpath->query("atom:content", $activity)->item(0);
-		if (is_object($content))
+		if (is_object($content)) {
 			$obj_element->appendChild($obj_doc->importNode($content, true));
+		}
 
 		$obj_doc->appendChild($obj_element);
 
@@ -1474,11 +1531,13 @@ class dfrn {
 	 * @param object $xpath XPath object
 	 * @param object $mail mail elements
 	 * @param array $importer Record of the importer user mixed with contact of the content
+	 * @todo Find good type-hints for all parameter
 	 */
 	private static function process_mail($xpath, $mail, $importer) {
 
 		logger("Processing mails");
 
+		/// @TODO Rewrite this to one statement
 		$msg = array();
 		$msg["uid"] = $importer["importer_uid"];
 		$msg["from-name"] = $xpath->query("dfrn:sender/dfrn:name/text()", $mail)->item(0)->nodeValue;
@@ -1498,7 +1557,7 @@ class dfrn {
 		$r = dbq("INSERT INTO `mail` (`".implode("`, `", array_keys($msg))."`) VALUES (".implode(", ", array_values($msg)).")");
 
 		// send notifications.
-
+		/// @TODO Arange this mess
 		$notif_params = array(
 			"type" => NOTIFY_MAIL,
 			"notify_flags" => $importer["notify-flags"],
@@ -1525,12 +1584,14 @@ class dfrn {
 	 * @param object $xpath XPath object
 	 * @param object $suggestion suggestion elements
 	 * @param array $importer Record of the importer user mixed with contact of the content
+	 * @todo Find good type-hints for all parameter
 	 */
 	private static function process_suggestion($xpath, $suggestion, $importer) {
 		$a = get_app();
 
 		logger("Processing suggestions");
 
+		/// @TODO Rewrite this to one statement
 		$suggest = array();
 		$suggest["uid"] = $importer["importer_uid"];
 		$suggest["cid"] = $importer["id"];
@@ -1547,8 +1608,10 @@ class dfrn {
 			dbesc(normalise_link($suggest["url"])),
 			intval($suggest["uid"])
 		);
-		if (dbm::is_result($r))
+		/// @TODO Really abort on valid result??? Maybe missed ! here?
+		if (dbm::is_result($r)) {
 			return false;
+		}
 
 		// Do we already have an fcontact record for this person?
 
@@ -1566,10 +1629,12 @@ class dfrn {
 				intval($suggest["uid"]),
 				intval($fid)
 			);
-			if (dbm::is_result($r))
+			/// @TODO Really abort on valid result??? Maybe missed ! here?
+			if (dbm::is_result($r)) {
 				return false;
+			}
 		}
-		if(!$fid)
+		if (!$fid)
 			$r = q("INSERT INTO `fcontact` (`name`,`url`,`photo`,`request`) VALUES ('%s', '%s', '%s', '%s')",
 			dbesc($suggest["name"]),
 			dbesc($suggest["url"]),
@@ -1581,11 +1646,12 @@ class dfrn {
 			dbesc($suggest["name"]),
 			dbesc($suggest["request"])
 		);
-		if (dbm::is_result($r))
+		if (dbm::is_result($r)) {
 			$fid = $r[0]["id"];
-		else
+		} else {
 			// database record did not get created. Quietly give up.
-			return false;
+			killme();
+		}
 
 
 		$hash = random_string();
@@ -1627,11 +1693,13 @@ class dfrn {
 	 * @param object $xpath XPath object
 	 * @param object $relocation relocation elements
 	 * @param array $importer Record of the importer user mixed with contact of the content
+	 * @todo Find good type-hints for all parameter
 	 */
 	private static function process_relocation($xpath, $relocation, $importer) {
 
 		logger("Processing relocations");
 
+		/// @TODO Rewrite this to one statement
 		$relocate = array();
 		$relocate["uid"] = $importer["importer_uid"];
 		$relocate["cid"] = $importer["id"];
@@ -1648,18 +1716,22 @@ class dfrn {
 		$relocate["poll"] = $xpath->query("dfrn:poll/text()", $relocation)->item(0)->nodeValue;
 		$relocate["sitepubkey"] = $xpath->query("dfrn:sitepubkey/text()", $relocation)->item(0)->nodeValue;
 
-		if (($relocate["avatar"] == "") AND ($relocate["photo"] != ""))
+		if (($relocate["avatar"] == "") AND ($relocate["photo"] != "")) {
 			$relocate["avatar"] = $relocate["photo"];
+		}
 
-		if ($relocate["addr"] == "")
+		if ($relocate["addr"] == "") {
 			$relocate["addr"] = preg_replace("=(https?://)(.*)/profile/(.*)=ism", "$3@$2", $relocate["url"]);
+		}
 
 		// update contact
 		$r = q("SELECT `photo`, `url` FROM `contact` WHERE `id` = %d AND `uid` = %d;",
 			intval($importer["id"]),
 			intval($importer["importer_uid"]));
-		if (!$r)
-			return false;
+
+		if (!dbm::is_result($r)) {
+			killme();
+		}
 
 		$old = $r[0];
 
@@ -1715,8 +1787,9 @@ class dfrn {
 
 		update_contact_avatar($relocate["avatar"], $importer["importer_uid"], $importer["id"], true);
 
-		if ($x === false)
+		if ($x === false) {
 			return false;
+		}
 
 		// update items
 		/// @todo This is an extreme performance killer
@@ -1731,7 +1804,7 @@ class dfrn {
 					$n, dbesc($f[0]),
 					intval($importer["importer_uid"]));
 
-			if ($r) {
+			if (dbm::is_result($r)) {
 				$x = q("UPDATE `item` SET `%s` = '%s' WHERE `%s` = '%s' AND `uid` = %d",
 						$n, dbesc($f[1]),
 						$n, dbesc($f[0]),
@@ -1780,12 +1853,13 @@ class dfrn {
 
 			$changed = true;
 
-			if ($entrytype == DFRN_REPLY_RC)
+			if ($entrytype == DFRN_REPLY_RC) {
 				proc_run(PRIORITY_HIGH, "include/notifier.php","comment-import", $current["id"]);
+			}
 		}
 
 		// update last-child if it changes
-		if($item["last-child"] AND ($item["last-child"] != $current["last-child"])) {
+		if ($item["last-child"] AND ($item["last-child"] != $current["last-child"])) {
 			$r = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d",
 				dbesc(datetime_convert()),
 				dbesc($item["parent-uri"]),
@@ -1817,8 +1891,9 @@ class dfrn {
 				$sql_extra = "";
 				$community = true;
 				logger("possible community action");
-			} else
+			} else {
 				$sql_extra = " AND `contact`.`self` AND `item`.`wall` ";
+			}
 
 			// was the top-level post for this action written by somebody on this site?
 			// Specifically, the recipient?
@@ -1842,8 +1917,9 @@ class dfrn {
 					dbesc($r[0]["parent-uri"]),
 					intval($importer["importer_uid"])
 				);
-				if (dbm::is_result($r))
+				if (dbm::is_result($r)) {
 					$is_a_remote_action = true;
+				}
 			}
 
 			// Does this have the characteristics of a community or private group action?
@@ -1851,20 +1927,22 @@ class dfrn {
 			// valid community action. Also forum_mode makes it valid for sure.
 			// If neither, it's not.
 
-			if($is_a_remote_action && $community) {
-				if((!$r[0]["forum_mode"]) && (!$r[0]["wall"])) {
+			if ($is_a_remote_action && $community) {
+				if ((!$r[0]["forum_mode"]) && (!$r[0]["wall"])) {
 					$is_a_remote_action = false;
 					logger("not a community action");
 				}
 			}
 
-			if ($is_a_remote_action)
+			if ($is_a_remote_action) {
 				return DFRN_REPLY_RC;
-			else
+			} else {
 				return DFRN_REPLY;
+			}
 
-		} else
+		} else {
 			return DFRN_TOP_LEVEL;
+		}
 
 	}
 
@@ -1877,14 +1955,15 @@ class dfrn {
 	 */
 	private static function do_poke($item, $importer, $posted_id) {
 		$verb = urldecode(substr($item["verb"],strpos($item["verb"], "#")+1));
-		if(!$verb)
+		if (!$verb) {
 			return;
+		}
 		$xo = parse_xml_string($item["object"],false);
 
-		if(($xo->type == ACTIVITY_OBJ_PERSON) && ($xo->id)) {
+		if (($xo->type == ACTIVITY_OBJ_PERSON) && ($xo->id)) {
 
 			// somebody was poked/prodded. Was it me?
-			foreach($xo->link as $l) {
+			foreach ($xo->link as $l) {
 				$atts = $l->attributes();
 				switch($atts["rel"]) {
 					case "alternate":
@@ -1943,22 +2022,22 @@ class dfrn {
 
 			// Big question: Do we need these functions? They were part of the "consume_feed" function.
 			// This function once was responsible for DFRN and OStatus.
-			if(activity_match($item["verb"],ACTIVITY_FOLLOW)) {
+			if (activity_match($item["verb"],ACTIVITY_FOLLOW)) {
 				logger("New follower");
 				new_follower($importer, $contact, $item, $nickname);
 				return false;
 			}
-			if(activity_match($item["verb"],ACTIVITY_UNFOLLOW))  {
+			if (activity_match($item["verb"],ACTIVITY_UNFOLLOW))  {
 				logger("Lost follower");
 				lose_follower($importer, $contact, $item);
 				return false;
 			}
-			if(activity_match($item["verb"],ACTIVITY_REQ_FRIEND)) {
+			if (activity_match($item["verb"],ACTIVITY_REQ_FRIEND)) {
 				logger("New friend request");
 				new_follower($importer, $contact, $item, $nickname, true);
 				return false;
 			}
-			if(activity_match($item["verb"],ACTIVITY_UNFRIEND))  {
+			if (activity_match($item["verb"],ACTIVITY_UNFRIEND))  {
 				logger("Lost sharer");
 				lose_sharer($importer, $contact, $item);
 				return false;
@@ -1980,8 +2059,9 @@ class dfrn {
 					dbesc($item["verb"]),
 					dbesc($item["parent-uri"])
 				);
-				if (dbm::is_result($r))
+				if (dbm::is_result($r)) {
 					return false;
+				}
 
 				$r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `author-link` = '%s' AND `verb` = '%s' AND `thr-parent` = '%s' AND NOT `deleted` LIMIT 1",
 					intval($item["uid"]),
@@ -1989,28 +2069,31 @@ class dfrn {
 					dbesc($item["verb"]),
 					dbesc($item["parent-uri"])
 				);
-				if (dbm::is_result($r))
+				if (dbm::is_result($r)) {
 					return false;
-			} else
+				}
+			} else {
 				$is_like = false;
+			}
 
-			if(($item["verb"] == ACTIVITY_TAG) && ($item["object-type"] == ACTIVITY_OBJ_TAGTERM)) {
+			if (($item["verb"] == ACTIVITY_TAG) && ($item["object-type"] == ACTIVITY_OBJ_TAGTERM)) {
 
 				$xo = parse_xml_string($item["object"],false);
 				$xt = parse_xml_string($item["target"],false);
 
-				if($xt->type == ACTIVITY_OBJ_NOTE) {
+				if ($xt->type == ACTIVITY_OBJ_NOTE) {
 					$r = q("SELECT `id`, `tag` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
 						dbesc($xt->id),
 						intval($importer["importer_uid"])
 					);
 
-					if (!dbm::is_result($r))
-						return false;
+					if (!dbm::is_result($r)) {
+						killme();
+					}
 
 					// extract tag, if not duplicate, add to parent item
-					if($xo->content) {
-						if(!(stristr($r[0]["tag"],trim($xo->content)))) {
+					if ($xo->content) {
+						if (!(stristr($r[0]["tag"],trim($xo->content)))) {
 							q("UPDATE `item` SET `tag` = '%s' WHERE `id` = %d",
 								dbesc($r[0]["tag"] . (strlen($r[0]["tag"]) ? ',' : '') . '#[url=' . $xo->id . ']'. $xo->content . '[/url]'),
 								intval($r[0]["id"])
@@ -2029,6 +2112,7 @@ class dfrn {
 	 *
 	 * @param object $links link elements
 	 * @param array $item the item record
+	 * @todo Add type-hints
 	 */
 	private static function parse_links($links, &$item) {
 		$rel = "";
@@ -2037,17 +2121,23 @@ class dfrn {
 		$length = "0";
 		$title = "";
 		foreach ($links AS $link) {
-			foreach($link->attributes AS $attributes) {
-				if ($attributes->name == "href")
+			foreach ($link->attributes AS $attributes) {
+				/// @TODO Rewrite these repeated (same) if() statements to a switch()
+				if ($attributes->name == "href") {
 					$href = $attributes->textContent;
-				if ($attributes->name == "rel")
+				}
+				if ($attributes->name == "rel") {
 					$rel = $attributes->textContent;
-				if ($attributes->name == "type")
+				}
+				if ($attributes->name == "type") {
 					$type = $attributes->textContent;
-				if ($attributes->name == "length")
+				}
+				if ($attributes->name == "length") {
 					$length = $attributes->textContent;
-				if ($attributes->name == "title")
+				}
+				if ($attributes->name == "title") {
 					$title = $attributes->textContent;
+				}
 			}
 			if (($rel != "") AND ($href != ""))
 				switch($rel) {
@@ -2056,8 +2146,9 @@ class dfrn {
 						break;
 					case "enclosure":
 						$enclosure = $href;
-						if(strlen($item["attach"]))
+						if (strlen($item["attach"])) {
 							$item["attach"] .= ",";
+						}
 
 						$item["attach"] .= '[attach]href="'.$href.'" length="'.$length.'" type="'.$type.'" title="'.$title.'"[/attach]';
 						break;
@@ -2072,6 +2163,7 @@ class dfrn {
 	 * @param object $xpath XPath object
 	 * @param object $entry entry elements
 	 * @param array $importer Record of the importer user mixed with contact of the content
+	 * @todo Add type-hints
 	 */
 	private static function process_entry($header, $xpath, $entry, $importer) {
 
@@ -2122,7 +2214,7 @@ class dfrn {
 		$item["body"] = limit_body_size($item["body"]);
 
 		/// @todo Do we really need this check for HTML elements? (It was copied from the old function)
-		if((strpos($item['body'],'<') !== false) && (strpos($item['body'],'>') !== false)) {
+		if ((strpos($item['body'],'<') !== false) && (strpos($item['body'],'>') !== false)) {
 
 			$item['body'] = reltoabs($item['body'],$base_url);
 
@@ -2151,21 +2243,24 @@ class dfrn {
 		$item["location"] = $xpath->query("dfrn:location/text()", $entry)->item(0)->nodeValue;
 
 		$georsspoint = $xpath->query("georss:point", $entry);
-		if ($georsspoint)
+		if ($georsspoint) {
 			$item["coord"] = $georsspoint->item(0)->nodeValue;
+		}
 
 		$item["private"] = $xpath->query("dfrn:private/text()", $entry)->item(0)->nodeValue;
 
 		$item["extid"] = $xpath->query("dfrn:extid/text()", $entry)->item(0)->nodeValue;
 
-		if ($xpath->query("dfrn:bookmark/text()", $entry)->item(0)->nodeValue == "true")
+		if ($xpath->query("dfrn:bookmark/text()", $entry)->item(0)->nodeValue == "true") {
 			$item["bookmark"] = true;
+		}
 
 		$notice_info = $xpath->query("statusnet:notice_info", $entry);
 		if ($notice_info AND ($notice_info->length > 0)) {
-			foreach($notice_info->item(0)->attributes AS $attributes) {
-				if ($attributes->name == "source")
+			foreach ($notice_info->item(0)->attributes AS $attributes) {
+				if ($attributes->name == "source") {
 					$item["app"] = strip_tags($attributes->textContent);
+				}
 			}
 		}
 
@@ -2173,21 +2268,24 @@ class dfrn {
 
 		// We store the data from "dfrn:diaspora_signature" in a different table, this is done in "item_store"
 		$dsprsig = unxmlify($xpath->query("dfrn:diaspora_signature/text()", $entry)->item(0)->nodeValue);
-		if ($dsprsig != "")
+		if ($dsprsig != "") {
 			$item["dsprsig"] = $dsprsig;
+		}
 
 		$item["verb"] = $xpath->query("activity:verb/text()", $entry)->item(0)->nodeValue;
 
-		if ($xpath->query("activity:object-type/text()", $entry)->item(0)->nodeValue != "")
+		if ($xpath->query("activity:object-type/text()", $entry)->item(0)->nodeValue != "") {
 			$item["object-type"] = $xpath->query("activity:object-type/text()", $entry)->item(0)->nodeValue;
+		}
 
 		$object = $xpath->query("activity:object", $entry)->item(0);
 		$item["object"] = self::transform_activity($xpath, $object, "object");
 
 		if (trim($item["object"]) != "") {
 			$r = parse_xml_string($item["object"], false);
-			if (isset($r->type))
+			if (isset($r->type)) {
 				$item["object-type"] = $r->type;
+			}
 		}
 
 		$target = $xpath->query("activity:target", $entry)->item(0);
@@ -2198,12 +2296,14 @@ class dfrn {
 			foreach ($categories AS $category) {
 				$term = "";
 				$scheme = "";
-				foreach($category->attributes AS $attributes) {
-					if ($attributes->name == "term")
+				foreach ($category->attributes AS $attributes) {
+					if ($attributes->name == "term") {
 						$term = $attributes->textContent;
+					}
 
-					if ($attributes->name == "scheme")
+					if ($attributes->name == "scheme") {
 						$scheme = $attributes->textContent;
+					}
 				}
 
 				if (($term != "") AND ($scheme != "")) {
@@ -2212,8 +2312,9 @@ class dfrn {
 						$termhash = array_shift($parts);
 						$termurl = implode(":", $parts);
 
-						if(strlen($item["tag"]))
+						if (strlen($item["tag"])) {
 							$item["tag"] .= ",";
+						}
 
 						$item["tag"] .= $termhash."[url=".$termurl."]".$term."[/url]";
 					}
@@ -2224,37 +2325,46 @@ class dfrn {
 		$enclosure = "";
 
 		$links = $xpath->query("atom:link", $entry);
-		if ($links)
+		if ($links) {
 			self::parse_links($links, $item);
+		}
 
 		// Is it a reply or a top level posting?
 		$item["parent-uri"] = $item["uri"];
 
 		$inreplyto = $xpath->query("thr:in-reply-to", $entry);
-		if (is_object($inreplyto->item(0)))
-			foreach($inreplyto->item(0)->attributes AS $attributes)
-				if ($attributes->name == "ref")
+		if (is_object($inreplyto->item(0))) {
+			foreach ($inreplyto->item(0)->attributes AS $attributes) {
+				if ($attributes->name == "ref") {
 					$item["parent-uri"] = $attributes->textContent;
+				}
+			}
+		}
 
 		// Get the type of the item (Top level post, reply or remote reply)
 		$entrytype = self::get_entry_type($importer, $item);
 
 		// Now assign the rest of the values that depend on the type of the message
 		if (in_array($entrytype, array(DFRN_REPLY, DFRN_REPLY_RC))) {
-			if (!isset($item["object-type"]))
+			if (!isset($item["object-type"])) {
 				$item["object-type"] = ACTIVITY_OBJ_COMMENT;
+			}
 
-			if ($item["contact-id"] != $owner["contact-id"])
+			if ($item["contact-id"] != $owner["contact-id"]) {
 				$item["contact-id"] = $owner["contact-id"];
+			}
 
-			if (($item["network"] != $owner["network"]) AND ($owner["network"] != ""))
+			if (($item["network"] != $owner["network"]) AND ($owner["network"] != "")) {
 				$item["network"] = $owner["network"];
+			}
 
-			if ($item["contact-id"] != $author["contact-id"])
+			if ($item["contact-id"] != $author["contact-id"]) {
 				$item["contact-id"] = $author["contact-id"];
+			}
 
-			if (($item["network"] != $author["network"]) AND ($author["network"] != ""))
+			if (($item["network"] != $author["network"]) AND ($author["network"] != "")) {
 				$item["network"] = $author["network"];
+			}
 
 			// This code was taken from the old DFRN code
 			// When activated, forums don't work.
@@ -2270,14 +2380,15 @@ class dfrn {
 			$item["type"] = "remote-comment";
 			$item["wall"] = 1;
 		} elseif ($entrytype == DFRN_TOP_LEVEL) {
-			if (!isset($item["object-type"]))
+			if (!isset($item["object-type"])) {
 				$item["object-type"] = ACTIVITY_OBJ_NOTE;
+			}
 
 			// Is it an event?
 			if ($item["object-type"] == ACTIVITY_OBJ_EVENT) {
 				logger("Item ".$item["uri"]." seems to contain an event.", LOGGER_DEBUG);
 				$ev = bbtoevent($item["body"]);
-				if((x($ev, "desc") || x($ev, "summary")) && x($ev, "start")) {
+				if ((x($ev, "desc") || x($ev, "summary")) && x($ev, "start")) {
 					logger("Event in item ".$item["uri"]." was found.", LOGGER_DEBUG);
 					$ev["cid"] = $importer["id"];
 					$ev["uid"] = $importer["uid"];
@@ -2290,8 +2401,9 @@ class dfrn {
 						dbesc($item["uri"]),
 						intval($importer["uid"])
 					);
-					if (dbm::is_result($r))
+					if (dbm::is_result($r)) {
 						$ev["id"] = $r[0]["id"];
+					}
 
 					$event_id = event_store($ev);
 					logger("Event ".$event_id." was stored", LOGGER_DEBUG);
@@ -2307,10 +2419,11 @@ class dfrn {
 
 		// Update content if 'updated' changes
 		if (dbm::is_result($current)) {
-			if (self::update_content($r[0], $item, $importer, $entrytype))
+			if (self::update_content($r[0], $item, $importer, $entrytype)) {
 				logger("Item ".$item["uri"]." was updated.", LOGGER_DEBUG);
-			else
+			} else {
 				logger("Item ".$item["uri"]." already existed.", LOGGER_DEBUG);
+			}
 			return;
 		}
 
@@ -2318,7 +2431,7 @@ class dfrn {
 			$posted_id = item_store($item);
 			$parent = 0;
 
-			if($posted_id) {
+			if ($posted_id) {
 
 				logger("Reply from contact ".$item["contact-id"]." was stored with id ".$posted_id, LOGGER_DEBUG);
 
@@ -2333,7 +2446,7 @@ class dfrn {
 					$parent_uri = $r[0]["parent-uri"];
 				}
 
-				if(!$is_like) {
+				if (!$is_like) {
 					$r1 = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `uid` = %d AND `parent` = %d",
 						dbesc(datetime_convert()),
 						intval($importer["importer_uid"]),
@@ -2347,7 +2460,7 @@ class dfrn {
 					);
 				}
 
-				if($posted_id AND $parent AND ($entrytype == DFRN_REPLY_RC)) {
+				if ($posted_id AND $parent AND ($entrytype == DFRN_REPLY_RC)) {
 					logger("Notifying followers about comment ".$posted_id, LOGGER_DEBUG);
 					proc_run(PRIORITY_HIGH, "include/notifier.php", "comment-import", $posted_id);
 				}
@@ -2355,7 +2468,7 @@ class dfrn {
 				return true;
 			}
 		} else { // $entrytype == DFRN_TOP_LEVEL
-			if(!link_compare($item["owner-link"],$importer["url"])) {
+			if (!link_compare($item["owner-link"],$importer["url"])) {
 				// The item owner info is not our contact. It's OK and is to be expected if this is a tgroup delivery,
 				// but otherwise there's a possible data mixup on the sender's system.
 				// the tgroup delivery code called from item_store will correct it if it's a forum,
@@ -2366,7 +2479,7 @@ class dfrn {
 				$item["owner-avatar"] = $importer["thumb"];
 			}
 
-			if(($importer["rel"] == CONTACT_IS_FOLLOWER) && (!tgroup_check($importer["importer_uid"], $item))) {
+			if (($importer["rel"] == CONTACT_IS_FOLLOWER) && (!tgroup_check($importer["importer_uid"], $item))) {
 				logger("Contact ".$importer["id"]." is only follower and tgroup check was negative.", LOGGER_DEBUG);
 				return;
 			}
@@ -2395,19 +2508,23 @@ class dfrn {
 
 		logger("Processing deletions");
 
-		foreach($deletion->attributes AS $attributes) {
-			if ($attributes->name == "ref")
+		foreach ($deletion->attributes AS $attributes) {
+			if ($attributes->name == "ref") {
 				$uri = $attributes->textContent;
-			if ($attributes->name == "when")
+			}
+			if ($attributes->name == "when") {
 				$when = $attributes->textContent;
+			}
 		}
-		if ($when)
+		if ($when) {
 			$when = datetime_convert("UTC", "UTC", $when, "Y-m-d H:i:s");
-		else
+		} else {
 			$when = datetime_convert("UTC", "UTC", "now", "Y-m-d H:i:s");
+		}
 
-		if (!$uri OR !$importer["id"])
+		if (!$uri OR !$importer["id"]) {
 			return false;
+		}
 
 		/// @todo Only select the used fields
 		$r = q("SELECT `item`.*, `contact`.`self` FROM `item` INNER JOIN `contact` on `item`.`contact-id` = `contact`.`id`
@@ -2425,22 +2542,23 @@ class dfrn {
 
 			$entrytype = self::get_entry_type($importer, $item);
 
-			if(!$item["deleted"])
+			if (!$item["deleted"]) {
 				logger('deleting item '.$item["id"].' uri='.$uri, LOGGER_DEBUG);
-			else
+			} else {
 				return;
+			}
 
-			if($item["object-type"] == ACTIVITY_OBJ_EVENT) {
+			if ($item["object-type"] == ACTIVITY_OBJ_EVENT) {
 				logger("Deleting event ".$item["event-id"], LOGGER_DEBUG);
 				event_delete($item["event-id"]);
 			}
 
-			if(($item["verb"] == ACTIVITY_TAG) && ($item["object-type"] == ACTIVITY_OBJ_TAGTERM)) {
+			if (($item["verb"] == ACTIVITY_TAG) && ($item["object-type"] == ACTIVITY_OBJ_TAGTERM)) {
 
 				$xo = parse_xml_string($item["object"],false);
 				$xt = parse_xml_string($item["target"],false);
 
-				if($xt->type == ACTIVITY_OBJ_NOTE) {
+				if ($xt->type == ACTIVITY_OBJ_NOTE) {
 					$i = q("SELECT `id`, `contact-id`, `tag` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
 						dbesc($xt->id),
 						intval($importer["importer_uid"])
@@ -2453,15 +2571,18 @@ class dfrn {
 						$author_remove = (($item["origin"] && $item["self"]) ? true : false);
 						$author_copy = (($item["origin"]) ? true : false);
 
-						if($owner_remove && $author_copy)
+						if ($owner_remove && $author_copy) {
 							return;
-						if($author_remove || $owner_remove) {
+						}
+						if ($author_remove || $owner_remove) {
 							$tags = explode(',',$i[0]["tag"]);
 							$newtags = array();
-							if(count($tags)) {
-								foreach($tags as $tag)
-									if(trim($tag) !== trim($xo->body))
+							if (count($tags)) {
+								foreach ($tags as $tag) {
+									if (trim($tag) !== trim($xo->body)) {
 										$newtags[] = trim($tag);
+									}
+								}
 							}
 							q("UPDATE `item` SET `tag` = '%s' WHERE `id` = %d",
 								dbesc(implode(',',$newtags)),
@@ -2602,25 +2723,30 @@ class dfrn {
 			);
 
 		$mails = $xpath->query("/atom:feed/dfrn:mail");
-		foreach ($mails AS $mail)
+		foreach ($mails AS $mail) {
 			self::process_mail($xpath, $mail, $importer);
+		}
 
 		$suggestions = $xpath->query("/atom:feed/dfrn:suggest");
-		foreach ($suggestions AS $suggestion)
+		foreach ($suggestions AS $suggestion) {
 			self::process_suggestion($xpath, $suggestion, $importer);
+		}
 
 		$relocations = $xpath->query("/atom:feed/dfrn:relocate");
-		foreach ($relocations AS $relocation)
+		foreach ($relocations AS $relocation) {
 			self::process_relocation($xpath, $relocation, $importer);
+		}
 
 		$deletions = $xpath->query("/atom:feed/at:deleted-entry");
-		foreach ($deletions AS $deletion)
+		foreach ($deletions AS $deletion) {
 			self::process_deletion($xpath, $deletion, $importer);
+		}
 
 		if (!$sort_by_date) {
 			$entries = $xpath->query("/atom:feed/atom:entry");
-			foreach ($entries AS $entry)
+			foreach ($entries AS $entry) {
 				self::process_entry($header, $xpath, $entry, $importer);
+			}
 		} else {
 			$newentries = array();
 			$entries = $xpath->query("/atom:feed/atom:entry");
@@ -2632,8 +2758,9 @@ class dfrn {
 			// Now sort after the publishing date
 			ksort($newentries);
 
-			foreach ($newentries AS $entry)
+			foreach ($newentries AS $entry) {
 				self::process_entry($header, $xpath, $entry, $importer);
+			}
 		}
 		logger("Import done for user ".$importer["uid"]." from contact ".$importer["id"], LOGGER_DEBUG);
 	}

From f173322539fe17eb151550db6f16b0f271e80f2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 26 Jan 2017 14:28:43 +0100
Subject: [PATCH 020/120] added missing spaces/curly braces
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 boot.php     | 458 ++++++++++++++++++++++++++++++---------------------
 index.php    |  87 +++++-----
 testargs.php |   5 +-
 update.php   |   4 +-
 4 files changed, 317 insertions(+), 237 deletions(-)

diff --git a/boot.php b/boot.php
index 6f036d846e..12b68cb6af 100644
--- a/boot.php
+++ b/boot.php
@@ -560,12 +560,12 @@ class App {
 	 * beyond are used.
 	 */
 	public	$theme = array(
-		'sourcename' => '',
-		'videowidth' => 425,
-		'videoheight' => 350,
+		'sourcename'      => '',
+		'videowidth'      => 425,
+		'videoheight'     => 350,
 		'force_max_items' => 0,
-		'thread_allow' => true,
-		'stylesheet' => '',
+		'thread_allow'    => true,
+		'stylesheet'      => '',
 		'template_engine' => 'smarty3',
 	);
 
@@ -654,7 +654,7 @@ class App {
 
 
 		$this->scheme = 'http';
-		if((x($_SERVER,'HTTPS') && $_SERVER['HTTPS']) ||
+		if ((x($_SERVER,'HTTPS') && $_SERVER['HTTPS']) ||
 		   (x($_SERVER['HTTP_FORWARDED']) && preg_match("/proto=https/", $_SERVER['HTTP_FORWARDED'])) ||
 		   (x($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https') ||
 		   (x($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on') ||
@@ -662,12 +662,12 @@ class App {
 		   (x($_SERVER,'SERVER_PORT') && (intval($_SERVER['SERVER_PORT']) == 443)) // XXX: reasonable assumption, but isn't this hardcoding too much?
 		   ) {
 			$this->scheme = 'https';
-		   }
+		}
 
-		if(x($_SERVER,'SERVER_NAME')) {
+		if (x($_SERVER,'SERVER_NAME')) {
 			$this->hostname = $_SERVER['SERVER_NAME'];
 
-			if(x($_SERVER,'SERVER_PORT') && $_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443)
+			if (x($_SERVER,'SERVER_PORT') && $_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443)
 				$this->hostname .= ':' . $_SERVER['SERVER_PORT'];
 			/*
 			 * Figure out if we are running at the top of a domain
@@ -675,7 +675,7 @@ class App {
 			 */
 
 			$path = trim(dirname($_SERVER['SCRIPT_NAME']),'/\\');
-			if(isset($path) && strlen($path) && ($path != $this->path))
+			if (isset($path) && strlen($path) && ($path != $this->path))
 				$this->path = $path;
 		}
 
@@ -711,7 +711,6 @@ class App {
 		// fix query_string
 		$this->query_string = str_replace($this->cmd."&",$this->cmd."?", $this->query_string);
 
-
 		// unix style "homedir"
 
 		if (substr($this->cmd,0,1) === '~') {
@@ -742,11 +741,10 @@ class App {
 
 		$this->argv = explode('/',$this->cmd);
 		$this->argc = count($this->argv);
-		if((array_key_exists('0',$this->argv)) && strlen($this->argv[0])) {
+		if ((array_key_exists('0',$this->argv)) && strlen($this->argv[0])) {
 			$this->module = str_replace(".", "_", $this->argv[0]);
 			$this->module = str_replace("-", "_", $this->module);
-		}
-		else {
+		} else {
 			$this->argc = 1;
 			$this->argv = array('home');
 			$this->module = 'home';
@@ -760,8 +758,9 @@ class App {
 		$this->pager['page'] = ((x($_GET,'page') && intval($_GET['page']) > 0) ? intval($_GET['page']) : 1);
 		$this->pager['itemspage'] = 50;
 		$this->pager['start'] = ($this->pager['page'] * $this->pager['itemspage']) - $this->pager['itemspage'];
-		if($this->pager['start'] < 0)
+		if ($this->pager['start'] < 0) {
 			$this->pager['start'] = 0;
+		}
 		$this->pager['total'] = 0;
 
 		/*
@@ -793,14 +792,17 @@ class App {
 
 		$basepath = get_config("system", "basepath");
 
-		if ($basepath == "")
+		if ($basepath == "") {
 			$basepath = dirname(__FILE__);
+		}
 
-		if ($basepath == "")
+		if ($basepath == "") {
 			$basepath = $_SERVER["DOCUMENT_ROOT"];
+		}
 
-		if ($basepath == "")
+		if ($basepath == "") {
 			$basepath = $_SERVER["PWD"];
+		}
 
 		return($basepath);
 	}
@@ -864,7 +866,7 @@ class App {
 	function set_baseurl($url) {
 		$parsed = @parse_url($url);
 
-		if($parsed) {
+		if ($parsed) {
 			$this->scheme = $parsed['scheme'];
 
 			$hostname = $parsed['host'];
@@ -876,7 +878,7 @@ class App {
 			}
 
 			if (file_exists(".htpreconfig.php")) {
-				@include(".htpreconfig.php");
+				include(".htpreconfig.php");
 			}
 
 			if (get_config('config', 'hostname') != '') {
@@ -890,8 +892,9 @@ class App {
 	}
 
 	function get_hostname() {
-		if (get_config('config','hostname') != "")
+		if (get_config('config','hostname') != "") {
 			$this->hostname = get_config('config','hostname');
+		}
 
 		return $this->hostname;
 	}
@@ -926,44 +929,49 @@ class App {
 		$interval = ((local_user()) ? get_pconfig(local_user(),'system','update_interval') : 40000);
 
 		// If the update is "deactivated" set it to the highest integer number (~24 days)
-		if ($interval < 0)
+		if ($interval < 0) {
 			$interval = 2147483647;
+		}
 
-		if($interval < 10000)
+		if ($interval < 10000) {
 			$interval = 40000;
+		}
 
 		// compose the page title from the sitename and the
 		// current module called
-		if (!$this->module=='')
-		{
-		    $this->page['title'] = $this->config['sitename'].' ('.$this->module.')';
+		if (!$this->module=='') {
+			$this->page['title'] = $this->config['sitename'].' ('.$this->module.')';
 		} else {
-		    $this->page['title'] = $this->config['sitename'];
+			$this->page['title'] = $this->config['sitename'];
 		}
 
 		/* put the head template at the beginning of page['htmlhead']
 		 * since the code added by the modules frequently depends on it
 		 * being first
 		 */
-		if(!isset($this->page['htmlhead']))
+		if (!isset($this->page['htmlhead'])) {
 			$this->page['htmlhead'] = '';
+		}
 
 		// If we're using Smarty, then doing replace_macros() will replace
 		// any unrecognized variables with a blank string. Since we delay
 		// replacing $stylesheet until later, we need to replace it now
 		// with another variable name
-		if($this->theme['template_engine'] === 'smarty3')
+		if ($this->theme['template_engine'] === 'smarty3') {
 			$stylesheet = $this->get_template_ldelim('smarty3') . '$stylesheet' . $this->get_template_rdelim('smarty3');
-		else
+		} else {
 			$stylesheet = '$stylesheet';
+		}
 
 		$shortcut_icon = get_config("system", "shortcut_icon");
-		if ($shortcut_icon == "")
+		if ($shortcut_icon == "") {
 			$shortcut_icon = "images/friendica-32.png";
+		}
 
 		$touch_icon = get_config("system", "touch_icon");
-		if ($touch_icon == "")
+		if ($touch_icon == "") {
 			$touch_icon = "images/friendica-128.png";
+		}
 
 		// get data wich is needed for infinite scroll on the network page
 		$invinite_scroll = infinite_scroll_data($this->module);
@@ -985,8 +993,9 @@ class App {
 	}
 
 	function init_page_end() {
-		if(!isset($this->page['end']))
+		if (!isset($this->page['end'])) {
 			$this->page['end'] = '';
+		}
 		$tpl = get_markup_template('end.tpl');
 		$this->page['end'] = replace_macros($tpl,array(
 			'$baseurl' => $this->get_baseurl() // FIXME for z_path!!!!
@@ -1022,13 +1031,13 @@ class App {
 
 		// The following code is deactivated. It doesn't seem to make any sense and it slows down the system.
 		/*
-		if($this->cached_profile_image[$avatar_image])
+		if ($this->cached_profile_image[$avatar_image])
 			return $this->cached_profile_image[$avatar_image];
 
 		$path_parts = explode("/",$avatar_image);
 		$common_filename = $path_parts[count($path_parts)-1];
 
-		if($this->cached_profile_picdate[$common_filename]){
+		if ($this->cached_profile_picdate[$common_filename]){
 			$this->cached_profile_image[$avatar_image] = $avatar_image . $this->cached_profile_picdate[$common_filename];
 		} else {
 			$r = q("SELECT `contact`.`avatar-date` AS picdate FROM `contact` WHERE `contact`.`thumb` like '%%/%s'",
@@ -1083,7 +1092,7 @@ class App {
 	function register_template_engine($class, $name = '') {
 		if ($name===""){
 			$v = get_class_vars( $class );
-			if(x($v,"name")) $name = $v['name'];
+			if (x($v,"name")) $name = $v['name'];
 		}
 		if ($name===""){
 			echo "template engine <tt>$class</tt> cannot be registered without a name.\n";
@@ -1112,7 +1121,7 @@ class App {
 		}
 
 		if (isset($this->template_engines[$template_engine])){
-			if(isset($this->template_engine_instance[$template_engine])){
+			if (isset($this->template_engine_instance[$template_engine])){
 				return $this->template_engine_instance[$template_engine];
 			} else {
 				$class = $this->template_engines[$template_engine];
@@ -1141,7 +1150,7 @@ class App {
 
 		switch($engine) {
 			case 'smarty3':
-				if(is_writable('view/smarty3/'))
+				if (is_writable('view/smarty3/'))
 					$this->theme['template_engine'] = 'smarty3';
 				break;
 			default:
@@ -1159,8 +1168,9 @@ class App {
 	}
 
 	function save_timestamp($stamp, $value) {
-		if (!isset($this->config['system']['profiler']) || !$this->config['system']['profiler'])
+		if (!isset($this->config['system']['profiler']) || !$this->config['system']['profiler']) {
 			return;
+		}
 
 		$duration = (float)(microtime(true)-$stamp);
 
@@ -1242,8 +1252,9 @@ class App {
 		array_shift($trace);
 
 		$callstack = array();
-		foreach ($trace AS $func)
+		foreach ($trace AS $func) {
 			$callstack[] = $func["function"];
+		}
 
 		return implode(", ", $callstack);
 	}
@@ -1265,31 +1276,33 @@ class App {
 	 * @return bool Is it a known backend?
 	 */
 	function is_backend() {
-		$backend = array();
-		$backend[] = "_well_known";
-		$backend[] = "api";
-		$backend[] = "dfrn_notify";
-		$backend[] = "fetch";
-		$backend[] = "hcard";
-		$backend[] = "hostxrd";
-		$backend[] = "nodeinfo";
-		$backend[] = "noscrape";
-		$backend[] = "p";
-		$backend[] = "poco";
-		$backend[] = "post";
-		$backend[] = "proxy";
-		$backend[] = "pubsub";
-		$backend[] = "pubsubhubbub";
-		$backend[] = "receive";
-		$backend[] = "rsd_xml";
-		$backend[] = "salmon";
-		$backend[] = "statistics_json";
-		$backend[] = "xrd";
+		static $backend = array(
+			"_well_known",
+			"api",
+			"dfrn_notify",
+			"fetch",
+			"hcard",
+			"hostxrd",
+			"nodeinfo",
+			"noscrape",
+			"p",
+			"poco",
+			"post",
+			"proxy",
+			"pubsub",
+			"pubsubhubbub",
+			"receive",
+			"rsd_xml",
+			"salmon",
+			"statistics_json",
+			"xrd",
+		);
 
-		if (in_array($this->module, $backend))
+		if (in_array($this->module, $backend)) {
 			return(true);
-		else
+		} else {
 			return($this->backend);
+		}
 	}
 
 	/**
@@ -1302,13 +1315,15 @@ class App {
 		if ($this->is_backend()) {
 			$process = "backend";
 			$max_processes = get_config('system', 'max_processes_backend');
-			if (intval($max_processes) == 0)
+			if (intval($max_processes) == 0) {
 				$max_processes = 5;
+			}
 		} else {
 			$process = "frontend";
 			$max_processes = get_config('system', 'max_processes_frontend');
-			if (intval($max_processes) == 0)
+			if (intval($max_processes) == 0) {
 				$max_processes = 20;
+			}
 		}
 
 		$processlist = dbm::processlist();
@@ -1333,13 +1348,15 @@ class App {
 		if ($this->is_backend()) {
 			$process = "backend";
 			$maxsysload = intval(get_config('system', 'maxloadavg'));
-			if ($maxsysload < 1)
+			if ($maxsysload < 1) {
 				$maxsysload = 50;
+			}
 		} else {
 			$process = "frontend";
 			$maxsysload = intval(get_config('system','maxloadavg_frontend'));
-			if ($maxsysload < 1)
+			if ($maxsysload < 1) {
 				$maxsysload = 50;
+			}
 		}
 
 		$load = current_load();
@@ -1362,6 +1379,7 @@ class App {
 		// This should prevent the forking of masses of workers.
 		$cachekey = "app:proc_run:started";
 		$result = Cache::get($cachekey);
+		/// @TODO maybe merge these both into one if() ?
 		if (!is_null($result)) {
 			if ((time() - $result) < 10) {
 				return;
@@ -1375,16 +1393,17 @@ class App {
 		// add baseurl to args. cli scripts can't construct it
 		$args[] = $this->get_baseurl();
 
-		for($x = 0; $x < count($args); $x ++)
+		for ($x = 0; $x < count($args); $x ++) {
 			$args[$x] = escapeshellarg($args[$x]);
+		}
 
 		$cmdline = implode($args," ");
 
-		if(get_config('system','proc_windows'))
+		if (get_config('system','proc_windows')) {
 			proc_close(proc_open('cmd /c start /b ' . $cmdline,array(),$foo,dirname(__FILE__)));
-		else
+		} else {
 			proc_close(proc_open($cmdline." &",array(),$foo,dirname(__FILE__)));
-
+		}
 	}
 
 	/**
@@ -1461,17 +1480,17 @@ function get_app() {
  * @return bool|int
  */
 function x($s,$k = NULL) {
-	if($k != NULL) {
-		if((is_array($s)) && (array_key_exists($k,$s))) {
-			if($s[$k])
+	if ($k != NULL) {
+		if ((is_array($s)) && (array_key_exists($k,$s))) {
+			if ($s[$k]) {
 				return (int) 1;
+			}
 			return (int) 0;
-	}
+		}
 		return false;
-	}
-	else {
-		if(isset($s)) {
-			if($s) {
+	} else {
+		if (isset($s)) {
+			if ($s) {
 				return (int) 1;
 			}
 			return (int) 0;
@@ -1499,8 +1518,9 @@ function clean_urls() {
 function z_path() {
 	$base = App::get_baseurl();
 
-	if(! clean_urls())
+	if (! clean_urls()) {
 		$base .= '/?q=';
+	}
 
 	return $base;
 }
@@ -1525,8 +1545,9 @@ function z_root() {
  * @return string
  */
 function absurl($path) {
-	if(strpos($path,'/') === 0)
+	if (strpos($path,'/') === 0) {
 		return z_path() . $path;
+	}
 	return $path;
 }
 
@@ -1542,12 +1563,13 @@ function is_ajax() {
 function check_db() {
 
 	$build = get_config('system','build');
-	if(! x($build)) {
+	if (! x($build)) {
 		set_config('system','build',DB_UPDATE_VERSION);
 		$build = DB_UPDATE_VERSION;
 	}
-	if($build != DB_UPDATE_VERSION)
+	if ($build != DB_UPDATE_VERSION) {
 		proc_run(PRIORITY_CRITICAL, 'include/dbupdate.php');
+	}
 
 }
 
@@ -1566,10 +1588,12 @@ function check_url(App $a) {
 	// and www.example.com vs example.com.
 	// We will only change the url to an ip address if there is no existing setting
 
-	if(! x($url))
+	if (! x($url)) {
 		$url = set_config('system','url',App::get_baseurl());
-	if((! link_compare($url,App::get_baseurl())) && (! preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/",$a->get_hostname)))
+	}
+	if ((! link_compare($url,App::get_baseurl())) && (! preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/",$a->get_hostname))) {
 		$url = set_config('system','url',App::get_baseurl());
+	}
 
 	return;
 }
@@ -1580,13 +1604,14 @@ function check_url(App $a) {
  */
 function update_db(App $a) {
 	$build = get_config('system','build');
-	if(! x($build))
+	if (! x($build)) {
 		$build = set_config('system','build',DB_UPDATE_VERSION);
+	}
 
-	if($build != DB_UPDATE_VERSION) {
+	if ($build != DB_UPDATE_VERSION) {
 		$stored = intval($build);
 		$current = intval(DB_UPDATE_VERSION);
-		if($stored < $current) {
+		if ($stored < $current) {
 			Config::load('database');
 
 			// We're reporting a different version than what is currently installed.
@@ -1596,12 +1621,13 @@ function update_db(App $a) {
 			// updating right this very second and the correct version of the update.php
 			// file may not be here yet. This can happen on a very busy site.
 
-			if(DB_UPDATE_VERSION == UPDATE_VERSION) {
+			if (DB_UPDATE_VERSION == UPDATE_VERSION) {
 				// Compare the current structure with the defined structure
 
 				$t = get_config('database','dbupdate_'.DB_UPDATE_VERSION);
-				if($t !== false)
+				if ($t !== false) {
 					return;
+				}
 
 				set_config('database','dbupdate_'.DB_UPDATE_VERSION, time());
 
@@ -1609,15 +1635,18 @@ function update_db(App $a) {
 				// conflits with new routine)
 				for ($x = $stored; $x < NEW_UPDATE_ROUTINE_VERSION; $x++) {
 					$r = run_update_function($x);
-					if (!$r) break;
+					if (!$r) {
+						break;
+					}
+				}
+				if ($stored < NEW_UPDATE_ROUTINE_VERSION) {
+					$stored = NEW_UPDATE_ROUTINE_VERSION;
 				}
-				if ($stored < NEW_UPDATE_ROUTINE_VERSION) $stored = NEW_UPDATE_ROUTINE_VERSION;
-
 
 				// run new update routine
 				// it update the structure in one call
 				$retval = update_structure(false, true);
-				if($retval) {
+				if ($retval) {
 					update_fail(
 						DB_UPDATE_VERSION,
 						$retval
@@ -1628,9 +1657,11 @@ function update_db(App $a) {
 				}
 
 				// run any left update_nnnn functions in update.php
-				for($x = $stored; $x < $current; $x ++) {
+				for ($x = $stored; $x < $current; $x ++) {
 					$r = run_update_function($x);
-					if (!$r) break;
+					if (!$r) {
+						break;
+					}
 				}
 			}
 		}
@@ -1640,7 +1671,7 @@ function update_db(App $a) {
 }
 
 function run_update_function($x) {
-	if(function_exists('update_' . $x)) {
+	if (function_exists('update_' . $x)) {
 
 		// There could be a lot of processes running or about to run.
 		// We want exactly one process to run the update command.
@@ -1651,8 +1682,9 @@ function run_update_function($x) {
 		// delete the config entry to try again.
 
 		$t = get_config('database','update_' . $x);
-		if($t !== false)
+		if ($t !== false) {
 			return false;
+		}
 		set_config('database','update_' . $x, time());
 
 		// call the specific update
@@ -1660,7 +1692,7 @@ function run_update_function($x) {
 		$func = 'update_' . $x;
 		$retval = $func();
 
-		if($retval) {
+		if ($retval) {
 			//send the administrator an e-mail
 			update_fail(
 				$x,
@@ -1693,39 +1725,40 @@ function run_update_function($x) {
  *
  * @param App $a
  *
-	 */
+ */
 function check_plugins(App $a) {
 
 	$r = q("SELECT * FROM `addon` WHERE `installed` = 1");
-	if (dbm::is_result($r))
+	if (dbm::is_result($r)) {
 		$installed = $r;
-	else
+	} else {
 		$installed = array();
+	}
 
 	$plugins = get_config('system','addon');
 	$plugins_arr = array();
 
-	if($plugins)
+	if ($plugins) {
 		$plugins_arr = explode(',',str_replace(' ', '',$plugins));
+	}
 
 	$a->plugins = $plugins_arr;
 
 	$installed_arr = array();
 
-	if(count($installed)) {
-		foreach($installed as $i) {
-			if(! in_array($i['name'],$plugins_arr)) {
+	if (count($installed)) {
+		foreach ($installed as $i) {
+			if (! in_array($i['name'],$plugins_arr)) {
 				uninstall_plugin($i['name']);
-			}
-			else {
+			} else {
 				$installed_arr[] = $i['name'];
 			}
 		}
 	}
 
-	if(count($plugins_arr)) {
-		foreach($plugins_arr as $p) {
-			if(! in_array($p,$installed_arr)) {
+	if (count($plugins_arr)) {
+		foreach ($plugins_arr as $p) {
+			if (! in_array($p,$installed_arr)) {
 				install_plugin($p);
 			}
 		}
@@ -1785,10 +1818,9 @@ function login($register = false, $hiddens=false) {
 
 	$dest_url = $a->query_string;
 
-	if(local_user()) {
+	if (local_user()) {
 		$tpl = get_markup_template("logout.tpl");
-	}
-	else {
+	} else {
 		$a->page['htmlhead'] .= replace_macros(get_markup_template("login_head.tpl"),array(
 			'$baseurl'		=> $a->get_baseurl(true)
 		));
@@ -1800,29 +1832,29 @@ function login($register = false, $hiddens=false) {
 
 	$o .= replace_macros($tpl, array(
 
-		'$dest_url'	=> $dest_url,
-		'$logout'	=> t('Logout'),
-		'$login'	=> t('Login'),
+		'$dest_url'     => $dest_url,
+		'$logout'       => t('Logout'),
+		'$login'        => t('Login'),
 
-		'$lname'	=> array('username', t('Nickname or Email: ') , '', ''),
-		'$lpassword' 	=> array('password', t('Password: '), '', ''),
-		'$lremember'	=> array('remember', t('Remember me'), 0,  ''),
+		'$lname'        => array('username', t('Nickname or Email: ') , '', ''),
+		'$lpassword'    => array('password', t('Password: '), '', ''),
+		'$lremember'    => array('remember', t('Remember me'), 0,  ''),
 
-		'$openid'	=> !$noid,
-		'$lopenid'	=> array('openid_url', t('Or login using OpenID: '),'',''),
+		'$openid'       => !$noid,
+		'$lopenid'      => array('openid_url', t('Or login using OpenID: '),'',''),
 
-		'$hiddens'	=> $hiddens,
+		'$hiddens'      => $hiddens,
 
-		'$register'	=> $reg,
+		'$register'     => $reg,
 
 		'$lostpass'     => t('Forgot your password?'),
 		'$lostlink'     => t('Password Reset'),
 
-		'$tostitle'	=> t('Website Terms of Service'),
-		'$toslink'	=> t('terms of service'),
+		'$tostitle'     => t('Website Terms of Service'),
+		'$toslink'      => t('terms of service'),
 
-		'$privacytitle'	=> t('Website Privacy Policy'),
-		'$privacylink'	=> t('privacy policy'),
+		'$privacytitle' => t('Website Privacy Policy'),
+		'$privacylink'  => t('privacy policy'),
 
 	));
 
@@ -1836,8 +1868,9 @@ function login($register = false, $hiddens=false) {
  */
 function killme() {
 
-	if (!get_app()->is_backend())
+	if (!get_app()->is_backend()) {
 		session_write_close();
+	}
 
 	exit;
 }
@@ -1846,8 +1879,9 @@ function killme() {
  * @brief Redirect to another URL and terminate this process.
  */
 function goaway($s) {
-	if (!strstr(normalise_link($s), "http://"))
+	if (!strstr(normalise_link($s), "http://")) {
 		$s = App::get_baseurl()."/".$s;
+	}
 
 	header("Location: $s");
 	killme();
@@ -1895,8 +1929,9 @@ function public_contact() {
  * @return int|bool visitor_id or false
  */
 function remote_user() {
-	if((x($_SESSION,'authenticated')) && (x($_SESSION,'visitor_id')))
+	if ((x($_SESSION,'authenticated')) && (x($_SESSION,'visitor_id'))) {
 		return intval($_SESSION['visitor_id']);
+	}
 	return false;
 }
 
@@ -1909,9 +1944,12 @@ function remote_user() {
  */
 function notice($s) {
 	$a = get_app();
-	if(! x($_SESSION,'sysmsg'))	$_SESSION['sysmsg'] = array();
-	if($a->interactive)
+	if (! x($_SESSION,'sysmsg')) {
+		$_SESSION['sysmsg'] = array();
+	}
+	if ($a->interactive) {
 		$_SESSION['sysmsg'][] = $s;
+	}
 }
 
 /**
@@ -1924,12 +1962,16 @@ function notice($s) {
 function info($s) {
 	$a = get_app();
 
-	if (local_user() AND get_pconfig(local_user(),'system','ignore_info'))
+	if (local_user() AND get_pconfig(local_user(),'system','ignore_info')) {
 		return;
+	}
 
-	if(! x($_SESSION,'sysmsg_info')) $_SESSION['sysmsg_info'] = array();
-	if($a->interactive)
+	if (! x($_SESSION,'sysmsg_info')) {
+		$_SESSION['sysmsg_info'] = array();
+	}
+	if ($a->interactive) {
 		$_SESSION['sysmsg_info'][] = $s;
+	}
 }
 
 
@@ -1991,8 +2033,9 @@ function proc_run($cmd){
 	$arr = array('args' => $args, 'run_cmd' => true);
 
 	call_hooks("proc_run", $arr);
-	if (!$arr['run_cmd'] OR !count($args))
+	if (!$arr['run_cmd'] OR !count($args)) {
 		return;
+	}
 
 	$priority = PRIORITY_MEDIUM;
 	$dont_fork = get_config("system", "worker_dont_fork");
@@ -2015,12 +2058,13 @@ function proc_run($cmd){
 	$found = q("SELECT `id` FROM `workerqueue` WHERE `parameter` = '%s'",
 		dbesc($parameters));
 
-	if (!$found)
+	if (!dbm::is_result($found)) {
 		q("INSERT INTO `workerqueue` (`parameter`, `created`, `priority`)
 			VALUES ('%s', '%s', %d)",
 			dbesc($parameters),
 			dbesc(datetime_convert()),
 			intval($priority));
+	}
 
 	// Should we quit and wait for the poller to be called as a cronjob?
 	if ($dont_fork) {
@@ -2033,12 +2077,14 @@ function proc_run($cmd){
 	// Get number of allowed number of worker threads
 	$queues = intval(get_config("system", "worker_queues"));
 
-	if ($queues == 0)
+	if ($queues == 0) {
 		$queues = 4;
+	}
 
 	// If there are already enough workers running, don't fork another one
-	if ($workers[0]["workers"] >= $queues)
+	if ($workers[0]["workers"] >= $queues) {
 		return;
+	}
 
 	// Now call the poller to execute the jobs that we just added to the queue
 	$args = array("include/poller.php", "no_cron");
@@ -2055,20 +2101,22 @@ function current_theme(){
 
 	// Find the theme that belongs to the user whose stuff we are looking at
 
-	if($a->profile_uid && ($a->profile_uid != local_user())) {
+	if ($a->profile_uid && ($a->profile_uid != local_user())) {
 		$r = q("select theme from user where uid = %d limit 1",
 			intval($a->profile_uid)
 		);
-		if (dbm::is_result($r))
+		if (dbm::is_result($r)) {
 			$page_theme = $r[0]['theme'];
+		}
 	}
 
 	// Allow folks to over-rule user themes and always use their own on their own site.
 	// This works only if the user is on the same server
 
-	if($page_theme && local_user() && (local_user() != $a->profile_uid)) {
-		if(get_pconfig(local_user(),'system','always_my_theme'))
+	if ($page_theme && local_user() && (local_user() != $a->profile_uid)) {
+		if (get_pconfig(local_user(),'system','always_my_theme')) {
 			$page_theme = null;
+		}
 	}
 
 //		$mobile_detect = new Mobile_Detect();
@@ -2089,38 +2137,44 @@ function current_theme(){
 			}
 			$theme_name = ((isset($_SESSION) && x($_SESSION,'mobile-theme')) ? $_SESSION['mobile-theme'] : $system_theme);
 
-			if($theme_name === '---') {
+			if ($theme_name === '---') {
 				// user has selected to have the mobile theme be the same as the normal one
 				$system_theme = $standard_system_theme;
 				$theme_name = $standard_theme_name;
 
-				if($page_theme)
+				if ($page_theme) {
 					$theme_name = $page_theme;
+				}
 			}
 		}
-	}
-	else {
+	} else {
 		$system_theme = $standard_system_theme;
 		$theme_name = $standard_theme_name;
 
-		if($page_theme)
+		if ($page_theme) {
 			$theme_name = $page_theme;
+		}
 	}
 
-	if($theme_name &&
+	if ($theme_name &&
 			(file_exists('view/theme/' . $theme_name . '/style.css') ||
-					file_exists('view/theme/' . $theme_name . '/style.php')))
+					file_exists('view/theme/' . $theme_name . '/style.php'))) {
 		return($theme_name);
+	}
 
-	foreach($app_base_themes as $t) {
-		if(file_exists('view/theme/' . $t . '/style.css')||
-				file_exists('view/theme/' . $t . '/style.php'))
+	foreach ($app_base_themes as $t) {
+		if (file_exists('view/theme/' . $t . '/style.css') ||
+				file_exists('view/theme/' . $t . '/style.php')) {
 			return($t);
+		}
 	}
 
 	$fallback = array_merge(glob('view/theme/*/style.css'),glob('view/theme/*/style.php'));
-	if(count($fallback))
+	if (count($fallback)) {
 		return (str_replace('view/theme/','', substr($fallback[0],0,-10)));
+	}
+
+	/// @TODO No final return statement?
 
 }
 
@@ -2137,8 +2191,9 @@ function current_theme_url() {
 	$t = current_theme();
 
 	$opts = (($a->profile_uid) ? '?f=&puid=' . $a->profile_uid : '');
-	if (file_exists('view/theme/' . $t . '/style.php'))
+	if (file_exists('view/theme/' . $t . '/style.php')) {
 		return('view/theme/'.$t.'/style.pcss'.$opts);
+	}
 
 	return('view/theme/'.$t.'/style.css');
 }
@@ -2167,8 +2222,9 @@ function feed_birthday($uid,$tz) {
 
 	$birthday = '';
 
-	if(! strlen($tz))
+	if (! strlen($tz)) {
 		$tz = 'UTC';
+	}
 
 	$p = q("SELECT `dob` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
 			intval($uid)
@@ -2176,13 +2232,14 @@ function feed_birthday($uid,$tz) {
 
 	if (dbm::is_result($p)) {
 		$tmp_dob = substr($p[0]['dob'],5);
-		if(intval($tmp_dob)) {
+		if (intval($tmp_dob)) {
 			$y = datetime_convert($tz,$tz,'now','Y');
 			$bd = $y . '-' . $tmp_dob . ' 00:00';
 			$t_dob = strtotime($bd);
 			$now = strtotime(datetime_convert($tz,$tz,'now'));
-			if($t_dob < $now)
+			if ($t_dob < $now) {
 				$bd = $y + 1 . '-' . $tmp_dob . ' 00:00';
+			}
 			$birthday = datetime_convert($tz,'UTC',$bd,ATOM_TIME);
 		}
 	}
@@ -2200,8 +2257,8 @@ function is_site_admin() {
 
 	$adminlist = explode(",", str_replace(" ", "", $a->config['admin_email']));
 
-	//if(local_user() && x($a->user,'email') && x($a->config,'admin_email') && ($a->user['email'] === $a->config['admin_email']))
-	if(local_user() && x($a->user,'email') && x($a->config,'admin_email') && in_array($a->user['email'], $adminlist))
+	//if (local_user() && x($a->user,'email') && x($a->config,'admin_email') && ($a->user['email'] === $a->config['admin_email']))
+	if (local_user() && x($a->user,'email') && x($a->config,'admin_email') && in_array($a->user['email'], $adminlist))
 		return true;
 	return false;
 }
@@ -2216,16 +2273,16 @@ function is_site_admin() {
  */
 function build_querystring($params, $name=null) {
 	$ret = "";
-	foreach($params as $key=>$val) {
-		if(is_array($val)) {
-			if($name==null) {
+	foreach ($params as $key=>$val) {
+		if (is_array($val)) {
+			if ($name==null) {
 				$ret .= build_querystring($val, $key);
 			} else {
 				$ret .= build_querystring($val, $name."[$key]");
 			}
 		} else {
 			$val = urlencode($val);
-			if($name!=null) {
+			if ($name!=null) {
 				$ret.=$name."[$key]"."=$val&";
 			} else {
 				$ret.= "$key=$val&";
@@ -2237,7 +2294,7 @@ function build_querystring($params, $name=null) {
 
 function explode_querystring($query) {
 	$arg_st = strpos($query, '?');
-	if($arg_st !== false) {
+	if ($arg_st !== false) {
 		$base = substr($query, 0, $arg_st);
 		$arg_st += 1;
 	} else {
@@ -2246,13 +2303,14 @@ function explode_querystring($query) {
 	}
 
 	$args = explode('&', substr($query, $arg_st));
-	foreach($args as $k=>$arg) {
-		if($arg === '')
+	foreach ($args as $k=>$arg) {
+		if ($arg === '') {
 			unset($args[$k]);
+		}
 	}
 	$args = array_values($args);
 
-	if(!$base) {
+	if (!$base) {
 		$base = $args[0];
 		unset($args[0]);
 		$args = array_values($args);
@@ -2271,7 +2329,9 @@ function explode_querystring($query) {
 */
 function curPageURL() {
 	$pageURL = 'http';
-	if ($_SERVER["HTTPS"] == "on") {$pageURL .= "s";}
+	if ($_SERVER["HTTPS"] == "on") {
+		$pageURL .= "s";
+	}
 	$pageURL .= "://";
 	if ($_SERVER["SERVER_PORT"] != "80" && $_SERVER["SERVER_PORT"] != "443") {
 		$pageURL .= $_SERVER["SERVER_NAME"].":".$_SERVER["SERVER_PORT"].$_SERVER["REQUEST_URI"];
@@ -2283,7 +2343,7 @@ function curPageURL() {
 
 function random_digits($digits) {
 	$rn = '';
-	for($i = 0; $i < $digits; $i++) {
+	for ($i = 0; $i < $digits; $i++) {
 		$rn .= rand(0,9);
 	}
 	return $rn;
@@ -2292,8 +2352,9 @@ function random_digits($digits) {
 function get_server() {
 	$server = get_config("system", "directory");
 
-	if ($server == "")
+	if ($server == "") {
 		$server = "http://dir.friendi.ca";
+	}
 
 	return($server);
 }
@@ -2301,8 +2362,9 @@ function get_server() {
 function get_cachefile($file, $writemode = true) {
 	$cache = get_itemcachepath();
 
-	if ((! $cache) || (! is_dir($cache)))
+	if ((! $cache) || (! is_dir($cache))) {
 		return("");
+	}
 
 	$subfolder = $cache."/".substr($file, 0, 2);
 
@@ -2324,24 +2386,29 @@ function clear_cache($basepath = "", $path = "") {
 		$path = $basepath;
 	}
 
-	if (($path == "") OR (!is_dir($path)))
+	if (($path == "") OR (!is_dir($path))) {
 		return;
+	}
 
-	if (substr(realpath($path), 0, strlen($basepath)) != $basepath)
+	if (substr(realpath($path), 0, strlen($basepath)) != $basepath) {
 		return;
+	}
 
 	$cachetime = (int)get_config('system','itemcache_duration');
-	if ($cachetime == 0)
+	if ($cachetime == 0) {
 		$cachetime = 86400;
+	}
 
 	if (is_writable($path)){
 		if ($dh = opendir($path)) {
 			while (($file = readdir($dh)) !== false) {
 				$fullpath = $path."/".$file;
-				if ((filetype($fullpath) == "dir") and ($file != ".") and ($file != ".."))
+				if ((filetype($fullpath) == "dir") and ($file != ".") and ($file != "..")) {
 					clear_cache($basepath, $fullpath);
-				if ((filetype($fullpath) == "file") and (filectime($fullpath) < (time() - $cachetime)))
+				}
+				if ((filetype($fullpath) == "file") and (filectime($fullpath) < (time() - $cachetime))) {
 					unlink($fullpath);
+				}
 			}
 			closedir($dh);
 		}
@@ -2351,8 +2418,9 @@ function clear_cache($basepath = "", $path = "") {
 function get_itemcachepath() {
 	// Checking, if the cache is deactivated
 	$cachetime = (int)get_config('system','itemcache_duration');
-	if ($cachetime < 0)
+	if ($cachetime < 0) {
 		return "";
+	}
 
 	$itemcache = get_config('system','itemcache');
 	if (($itemcache != "") AND App::directory_usable($itemcache)) {
@@ -2363,7 +2431,7 @@ function get_itemcachepath() {
 
 	if ($temppath != "") {
 		$itemcache = $temppath."/itemcache";
-		if(!file_exists($itemcache) && !is_dir($itemcache)) {
+		if (!file_exists($itemcache) && !is_dir($itemcache)) {
 			mkdir($itemcache);
 		}
 
@@ -2455,7 +2523,7 @@ function set_template_engine(App $a, $engine = 'internal') {
 	$a->set_template_engine($engine);
 }
 
-if(!function_exists('exif_imagetype')) {
+if (!function_exists('exif_imagetype')) {
 	function exif_imagetype($file) {
 		$size = getimagesize($file);
 		return($size[2]);
@@ -2467,37 +2535,42 @@ function validate_include(&$file) {
 
 	$file = realpath($file);
 
-	if (strpos($file, getcwd()) !== 0)
+	if (strpos($file, getcwd()) !== 0) {
 		return false;
+	}
 
 	$file = str_replace(getcwd()."/", "", $file, $count);
-	if ($count != 1)
+	if ($count != 1) {
 		return false;
+	}
 
-	if ($orig_file !== $file)
+	if ($orig_file !== $file) {
 		return false;
+	}
 
 	$valid = false;
-	if (strpos($file, "include/") === 0)
+	if (strpos($file, "include/") === 0) {
 		$valid = true;
+	}
 
-	if (strpos($file, "addon/") === 0)
+	if (strpos($file, "addon/") === 0) {
 		$valid = true;
+	}
 
-	if (!$valid)
-		return false;
-
-	return true;
+	// Simply return flag
+	return ($valid);
 }
 
 function current_load() {
-	if (!function_exists('sys_getloadavg'))
+	if (!function_exists('sys_getloadavg')) {
 		return false;
+	}
 
 	$load_arr = sys_getloadavg();
 
-	if (!is_array($load_arr))
+	if (!is_array($load_arr)) {
 		return false;
+	}
 
 	return max($load_arr[0], $load_arr[1]);
 }
@@ -2518,8 +2591,9 @@ function argc() {
  * @return string Value of the argv key
  */
 function argv($x) {
-	if(array_key_exists($x,get_app()->argv))
+	if (array_key_exists($x,get_app()->argv)) {
 		return get_app()->argv[$x];
+	}
 
 	return '';
 }
diff --git a/index.php b/index.php
index 7408f495cd..d3310ba1aa 100644
--- a/index.php
+++ b/index.php
@@ -28,17 +28,17 @@ $a->backend = false;
 /**
  *
  * Load the configuration file which contains our DB credentials.
- * Ignore errors. If the file doesn't exist or is empty, we are running in installation mode.
+ * Ignore errors. If the file doesn't exist or is empty, we are running in
+ * installation mode.
  *
  */
 
 $install = ((file_exists('.htconfig.php') && filesize('.htconfig.php')) ? false : true);
 
-@include(".htconfig.php");
-
-
-
-
+// Only load config if found, don't surpress errors
+if (!$install) {
+	include(".htconfig.php");
+}
 
 /**
  *
@@ -48,7 +48,7 @@ $install = ((file_exists('.htconfig.php') && filesize('.htconfig.php')) ? false
 
 require_once("include/dba.php");
 
-if(!$install) {
+if (!$install) {
 	$db = new dba($db_host, $db_user, $db_pass, $db_data, $install);
 	    unset($db_host, $db_user, $db_pass, $db_data);
 
@@ -117,12 +117,12 @@ if (x($_SESSION,'authenticated') && !x($_SESSION,'language')) {
 	if (dbm::is_result($r)) $_SESSION['language'] = $r[0]['language'];
 }
 
-if((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) {
+if ((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) {
 	$lang = $_SESSION['language'];
 	load_translation_table($lang);
 }
 
-if((x($_GET,'zrl')) && (!$install && !$maintenance)) {
+if ((x($_GET,'zrl')) && (!$install && !$maintenance)) {
 	// Only continue when the given profile link seems valid
 	// Valid profile links contain a path with "/profile/" and no query parameters
 	if ((parse_url($_GET['zrl'], PHP_URL_QUERY) == "") AND
@@ -223,7 +223,7 @@ if ((local_user()) || (! $privateapps === "1")) {
  * further processing.
  */
 
-if(strlen($a->module)) {
+if (strlen($a->module)) {
 
 	/**
 	 *
@@ -233,12 +233,14 @@ if(strlen($a->module)) {
 	 */
 
 	// Compatibility with the Android Diaspora client
-	if ($a->module == "stream")
+	if ($a->module == "stream") {
 		$a->module = "network";
+	}
 
 	// Compatibility with the Firefox App
-	if (($a->module == "users") AND ($a->cmd == "users/sign_in"))
+	if (($a->module == "users") AND ($a->cmd == "users/sign_in")) {
 		$a->module = "login";
+	}
 
 	$privateapps = get_config('config','private_addons');
 
@@ -246,11 +248,11 @@ if(strlen($a->module)) {
 		//Check if module is an app and if public access to apps is allowed or not
 		if ((!local_user()) && plugin_is_app($a->module) && $privateapps === "1") {
 			info( t("You must be logged in to use addons. "));
-		}
-		else {
+		} else {
 			include_once("addon/{$a->module}/{$a->module}.php");
-			if(function_exists($a->module . '_module'))
+			if (function_exists($a->module . '_module')) {
 				$a->module_loaded = true;
+			}
 		}
 	}
 
@@ -320,29 +322,29 @@ if (!$install && !$maintenance) {
  * Call module functions
  */
 
-if($a->module_loaded) {
+if ($a->module_loaded) {
 	$a->page['page_title'] = $a->module;
 	$placeholder = '';
 
-	if(function_exists($a->module . '_init')) {
+	if (function_exists($a->module . '_init')) {
 		call_hooks($a->module . '_mod_init', $placeholder);
 		$func = $a->module . '_init';
 		$func($a);
 	}
 
-	if(function_exists(str_replace('-','_',current_theme()) . '_init')) {
+	if (function_exists(str_replace('-','_',current_theme()) . '_init')) {
 		$func = str_replace('-','_',current_theme()) . '_init';
 		$func($a);
 	}
 //	elseif (x($a->theme_info,"extends") && file_exists("view/theme/".$a->theme_info["extends"]."/theme.php")) {
 //		require_once("view/theme/".$a->theme_info["extends"]."/theme.php");
-//		if(function_exists(str_replace('-','_',$a->theme_info["extends"]) . '_init')) {
+//		if (function_exists(str_replace('-','_',$a->theme_info["extends"]) . '_init')) {
 //			$func = str_replace('-','_',$a->theme_info["extends"]) . '_init';
 //			$func($a);
 //		}
 //	}
 
-	if(($_SERVER['REQUEST_METHOD'] === 'POST') && (! $a->error)
+	if (($_SERVER['REQUEST_METHOD'] === 'POST') && (! $a->error)
 		&& (function_exists($a->module . '_post'))
 		&& (! x($_POST,'auth-params'))) {
 		call_hooks($a->module . '_mod_post', $_POST);
@@ -350,13 +352,13 @@ if($a->module_loaded) {
 		$func($a);
 	}
 
-	if((! $a->error) && (function_exists($a->module . '_afterpost'))) {
+	if ((! $a->error) && (function_exists($a->module . '_afterpost'))) {
 		call_hooks($a->module . '_mod_afterpost',$placeholder);
 		$func = $a->module . '_afterpost';
 		$func($a);
 	}
 
-	if((! $a->error) && (function_exists($a->module . '_content'))) {
+	if ((! $a->error) && (function_exists($a->module . '_content'))) {
 		$arr = array('content' => $a->page['content']);
 		call_hooks($a->module . '_mod_content', $arr);
 		$a->page['content'] = $arr['content'];
@@ -366,7 +368,7 @@ if($a->module_loaded) {
 		$a->page['content'] .= $arr['content'];
 	}
 
-	if(function_exists(str_replace('-','_',current_theme()) . '_content_loaded')) {
+	if (function_exists(str_replace('-','_',current_theme()) . '_content_loaded')) {
 		$func = str_replace('-','_',current_theme()) . '_content_loaded';
 		$func($a);
 	}
@@ -392,18 +394,20 @@ $a->init_page_end();
 
 // If you're just visiting, let javascript take you home
 
-if(x($_SESSION,'visitor_home'))
+if (x($_SESSION,'visitor_home')) {
 	$homebase = $_SESSION['visitor_home'];
-elseif(local_user())
+} elseif (local_user()) {
 	$homebase = 'profile/' . $a->user['nickname'];
+}
 
-if(isset($homebase))
+if (isset($homebase)) {
 	$a->page['content'] .= '<script>var homebase="' . $homebase . '" ; </script>';
+}
 
 // now that we've been through the module content, see if the page reported
 // a permission problem and if so, a 403 response would seem to be in order.
 
-if(stristr( implode("",$_SESSION['sysmsg']), t('Permission denied'))) {
+if (stristr( implode("",$_SESSION['sysmsg']), t('Permission denied'))) {
 	header($_SERVER["SERVER_PROTOCOL"] . ' 403 ' . t('Permission denied.'));
 }
 
@@ -413,13 +417,13 @@ if(stristr( implode("",$_SESSION['sysmsg']), t('Permission denied'))) {
  *
  */
 
-/*if(x($_SESSION,'sysmsg')) {
+/*if (x($_SESSION,'sysmsg')) {
 	$a->page['content'] = "<div id=\"sysmsg\" class=\"error-message\">{$_SESSION['sysmsg']}</div>\r\n"
 		. ((x($a->page,'content')) ? $a->page['content'] : '');
 	$_SESSION['sysmsg']="";
 	unset($_SESSION['sysmsg']);
 }
-if(x($_SESSION,'sysmsg_info')) {
+if (x($_SESSION,'sysmsg_info')) {
 	$a->page['content'] = "<div id=\"sysmsg_info\" class=\"info-message\">{$_SESSION['sysmsg_info']}</div>\r\n"
 		. ((x($a->page,'content')) ? $a->page['content'] : '');
 	$_SESSION['sysmsg_info']="";
@@ -437,7 +441,7 @@ call_hooks('page_end', $a->page['content']);
  *
  */
 
-if($a->module != 'install' && $a->module != 'maintenance') {
+if ($a->module != 'install' && $a->module != 'maintenance') {
 	nav($a);
 }
 
@@ -445,27 +449,27 @@ if($a->module != 'install' && $a->module != 'maintenance') {
  * Add a "toggle mobile" link if we're using a mobile device
  */
 
-if($a->is_mobile || $a->is_tablet) {
-	if(isset($_SESSION['show-mobile']) && !$_SESSION['show-mobile']) {
+if ($a->is_mobile || $a->is_tablet) {
+	if (isset($_SESSION['show-mobile']) && !$_SESSION['show-mobile']) {
 		$link = 'toggle_mobile?address=' . curPageURL();
-	}
-	else {
+	} else {
 		$link = 'toggle_mobile?off=1&address=' . curPageURL();
 	}
 	$a->page['footer'] = replace_macros(get_markup_template("toggle_mobile_footer.tpl"), array(
-				'$toggle_link' => $link,
-				'$toggle_text' => t('toggle mobile')
-			 ));
+		'$toggle_link' => $link,
+		'$toggle_text' => t('toggle mobile')
+	));
 }
 
 /**
  * Build the page - now that we have all the components
  */
 
-if(!$a->theme['stylesheet'])
+if (!$a->theme['stylesheet']) {
 	$stylesheet = current_theme_url();
-else
+} else {
 	$stylesheet = $a->theme['stylesheet'];
+}
 
 $a->page['htmlhead'] = str_replace('{{$stylesheet}}',$stylesheet,$a->page['htmlhead']);
 //$a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array('$stylesheet' => $stylesheet));
@@ -499,8 +503,9 @@ if (isset($_GET["mode"]) AND ($_GET["mode"] == "raw")) {
 
 	echo substr($target->saveHTML(), 6, -8);
 
-	if (!$a->is_backend())
+	if (!$a->is_backend()) {
 		session_write_close();
+	}
 	exit;
 
 }
@@ -519,7 +524,7 @@ if (isset($_GET["mode"])) {
 }
 
 // If there is no page template use the default page template
-if(!$template) {
+if (!$template) {
 	$template = theme_include("default.php");
 }
 
diff --git a/testargs.php b/testargs.php
index a6042f8eb9..a0ddea3452 100644
--- a/testargs.php
+++ b/testargs.php
@@ -15,7 +15,8 @@
  */
 
 
-if(($_SERVER["argc"] > 1) && isset($_SERVER["argv"][1]))
+if (($_SERVER["argc"] > 1) && isset($_SERVER["argv"][1])) {
 	echo $_SERVER["argv"][1];
-else
+} else {
 	echo '';
+}
diff --git a/update.php b/update.php
index 106bf4b867..1668df6eb5 100644
--- a/update.php
+++ b/update.php
@@ -148,7 +148,7 @@ function update_1014() {
 	if (dbm::is_result($r)) {
 		foreach ($r as $rr) {
 			$ph = new Photo($rr['data']);
-			if($ph->is_valid()) {
+			if ($ph->is_valid()) {
 				$ph->scaleImage(48);
 				$ph->store($rr['uid'],$rr['contact-id'],$rr['resource-id'],$rr['filename'],$rr['album'],6,(($rr['profile']) ? 1 : 0));
 			}
@@ -1671,7 +1671,7 @@ function update_1190() {
 		$plugins = get_config('system','addon');
 		$plugins_arr = array();
 
-		if($plugins) {
+		if ($plugins) {
 			$plugins_arr = explode(",",str_replace(" ", "",$plugins));
 
 			$idx = array_search($plugin, $plugins_arr);

From 991b62784a12fcaa1acd540fbb4f6014bbd92f41 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Tue, 21 Mar 2017 22:39:29 -0400
Subject: [PATCH 021/120] Remove spaces confusing jSmart in contact_template

- Fix two missing button closing tags
---
 view/theme/frio/templates/contact_template.tpl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/view/theme/frio/templates/contact_template.tpl b/view/theme/frio/templates/contact_template.tpl
index 29801d8be7..5ae4fd4f79 100644
--- a/view/theme/frio/templates/contact_template.tpl
+++ b/view/theme/frio/templates/contact_template.tpl
@@ -138,12 +138,12 @@ We use this part to filter the contacts with jquery.textcomplete *}}
 			<div class="media-body">
 				{{* The contact actions like private mail, delete contact, edit contact and so on *}}
 				<div class="contact-actions pull-right nav-pills preferences hidden-xs">
-					{if $photo_menu.pm     }<button type="button" class="contact-action-link btn-link" onclick="addToModal('{$photo_menu.pm.1}')" data-toggle="tooltip" title="{$photo_menu.pm.0}"><i class="fa fa-envelope" aria-hidden="true"></i></a>{/if}
-					{if $photo_menu.poke   }<button type="button" class="contact-action-link btn-link" onclick="addToModal('{$photo_menu.poke.1}')" data-toggle="tooltip" title="{$photo_menu.poke.0}"><i class="fa fa-heartbeat" aria-hidden="true"></i></a>{/if}
+					{if $photo_menu.pm}<button type="button" class="contact-action-link btn-link" onclick="addToModal('{$photo_menu.pm.1}')" data-toggle="tooltip" title="{$photo_menu.pm.0}"><i class="fa fa-envelope" aria-hidden="true"></i></button>{/if}
+					{if $photo_menu.poke}<button type="button" class="contact-action-link btn-link" onclick="addToModal('{$photo_menu.poke.1}')" data-toggle="tooltip" title="{$photo_menu.poke.0}"><i class="fa fa-heartbeat" aria-hidden="true"></i></button>{/if}
 					{if $photo_menu.network}<a class="contact-action-link btn-link" href="{$photo_menu.network.1}" data-toggle="tooltip" title="{$photo_menu.network.0}"><i class="fa fa-cloud" aria-hidden="true"></i></a>{/if}
-					{if $photo_menu.edit   }<a class="contact-action-link btn-link" href="{$photo_menu.edit.1}" data-toggle="tooltip" title="{$photo_menu.edit.0}"><i class="fa fa-pencil" aria-hidden="true"></i></a>{/if}
-					{if $photo_menu.drop   }<a class="contact-action-link btn-link" href="{$photo_menu.drop.1}" data-toggle="tooltip" title="{$photo_menu.drop.0}"><i class="fa fa-user-times" aria-hidden="true"></i></a>{/if}
-					{if $photo_menu.follow }<a class="contact-action-link btn-link" href="{$photo_menu.follow.1}" data-toggle="tooltip" title="{$photo_menu.follow.0}"><i class="fa fa-user-plus" aria-hidden="true"></i></a>{/if}
+					{if $photo_menu.edit}<a class="contact-action-link btn-link" href="{$photo_menu.edit.1}" data-toggle="tooltip" title="{$photo_menu.edit.0}"><i class="fa fa-pencil" aria-hidden="true"></i></a>{/if}
+					{if $photo_menu.drop}<a class="contact-action-link btn-link" href="{$photo_menu.drop.1}" data-toggle="tooltip" title="{$photo_menu.drop.0}"><i class="fa fa-user-times" aria-hidden="true"></i></a>{/if}
+					{if $photo_menu.follow}<a class="contact-action-link btn-link" href="{$photo_menu.follow.1}" data-toggle="tooltip" title="{$photo_menu.follow.0}"><i class="fa fa-user-plus" aria-hidden="true"></i></a>{/if}
 				</div>
 
 				{{* The contact description (e.g. Name, Network, kind of connection and so on *}}

From f5227c016d8ff4945e981a3aabf249d5ab96a305 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 23 Mar 2017 20:48:48 +0100
Subject: [PATCH 022/120] replaced some tabs -> spaces + added curly braces
 #3254

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 boot.php | 121 ++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 71 insertions(+), 50 deletions(-)

diff --git a/boot.php b/boot.php
index 12b68cb6af..cf14fdd863 100644
--- a/boot.php
+++ b/boot.php
@@ -669,6 +669,7 @@ class App {
 
 			if (x($_SERVER,'SERVER_PORT') && $_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443)
 				$this->hostname .= ':' . $_SERVER['SERVER_PORT'];
+			}
 			/*
 			 * Figure out if we are running at the top of a domain
 			 * or in a sub-directory and adjust accordingly
@@ -677,10 +678,12 @@ class App {
 			$path = trim(dirname($_SERVER['SCRIPT_NAME']),'/\\');
 			if (isset($path) && strlen($path) && ($path != $this->path))
 				$this->path = $path;
+			}
 		}
 
-		if ($hostname != "")
+		if ($hostname != "") {
 			$this->hostname = $hostname;
+		}
 
 		if (is_array($_SERVER["argv"]) && $_SERVER["argc"]>1 && substr(end($_SERVER["argv"]), 0, 4)=="http" ) {
 			$this->set_baseurl(array_pop($_SERVER["argv"]) );
@@ -1090,11 +1093,12 @@ class App {
 	 * @param string $name
 	 */
 	function register_template_engine($class, $name = '') {
-		if ($name===""){
+		/// @TODO Really === and not just == ?
+		if ($name === "") {
 			$v = get_class_vars( $class );
 			if (x($v,"name")) $name = $v['name'];
 		}
-		if ($name===""){
+		if ($name === "") {
 			echo "template engine <tt>$class</tt> cannot be registered without a name.\n";
 			killme();
 		}
@@ -1110,8 +1114,9 @@ class App {
 	 * @param strin $name Template engine name
 	 * @return object Template Engine instance
 	 */
-	function template_engine($name = ''){
-		if ($name!=="") {
+	function template_engine($name = '') {
+		/// @TODO really type-check included?
+		if ($name !== "") {
 			$template_engine = $name;
 		} else {
 			$template_engine = 'smarty3';
@@ -1276,27 +1281,26 @@ class App {
 	 * @return bool Is it a known backend?
 	 */
 	function is_backend() {
-		static $backend = array(
-			"_well_known",
-			"api",
-			"dfrn_notify",
-			"fetch",
-			"hcard",
-			"hostxrd",
-			"nodeinfo",
-			"noscrape",
-			"p",
-			"poco",
-			"post",
-			"proxy",
-			"pubsub",
-			"pubsubhubbub",
-			"receive",
-			"rsd_xml",
-			"salmon",
-			"statistics_json",
-			"xrd",
-		);
+		$backend = array();
+		$backend[] = "_well_known";
+		$backend[] = "api";
+		$backend[] = "dfrn_notify";
+		$backend[] = "fetch";
+		$backend[] = "hcard";
+		$backend[] = "hostxrd";
+		$backend[] = "nodeinfo";
+		$backend[] = "noscrape";
+		$backend[] = "p";
+		$backend[] = "poco";
+		$backend[] = "post";
+		$backend[] = "proxy";
+		$backend[] = "pubsub";
+		$backend[] = "pubsubhubbub";
+		$backend[] = "receive";
+		$backend[] = "rsd_xml";
+		$backend[] = "salmon";
+		$backend[] = "statistics_json";
+		$backend[] = "xrd";
 
 		if (in_array($this->module, $backend)) {
 			return(true);
@@ -1404,6 +1408,7 @@ class App {
 		} else {
 			proc_close(proc_open($cmdline." &",array(),$foo,dirname(__FILE__)));
 		}
+
 	}
 
 	/**
@@ -1777,8 +1782,9 @@ function get_guid($size=16, $prefix = "") {
 		$prefix = hash("crc32", $a->get_hostname());
 	}
 
-	while (strlen($prefix) < ($size - 13))
+	while (strlen($prefix) < ($size - 13)) {
 		$prefix .= mt_rand();
+	}
 
 	if ($size >= 24) {
 		$prefix = substr($prefix, 0, $size - 22);
@@ -1822,7 +1828,7 @@ function login($register = false, $hiddens=false) {
 		$tpl = get_markup_template("logout.tpl");
 	} else {
 		$a->page['htmlhead'] .= replace_macros(get_markup_template("login_head.tpl"),array(
-			'$baseurl'		=> $a->get_baseurl(true)
+			'$baseurl' => $a->get_baseurl(true)
 		));
 
 		$tpl = get_markup_template("login.tpl");
@@ -1912,11 +1918,11 @@ function public_contact() {
 		if (x($_SESSION, 'my_address')) {
 			// Local user
 			$public_contact_id = intval(get_contact($_SESSION['my_address'], 0));
-		} else if (x($_SESSION, 'visitor_home')) {
+		} elseif (x($_SESSION, 'visitor_home')) {
 			// Remote user
 			$public_contact_id = intval(get_contact($_SESSION['visitor_home'], 0));
 		}
-	} else if (!x($_SESSION, 'authenticated')) {
+	} elseif (!x($_SESSION, 'authenticated')) {
 		$public_contact_id = false;
 	}
 
@@ -2175,7 +2181,6 @@ function current_theme(){
 	}
 
 	/// @TODO No final return statement?
-
 }
 
 /**
@@ -2257,9 +2262,10 @@ function is_site_admin() {
 
 	$adminlist = explode(",", str_replace(" ", "", $a->config['admin_email']));
 
-	//if (local_user() && x($a->user,'email') && x($a->config,'admin_email') && ($a->user['email'] === $a->config['admin_email']))
-	if (local_user() && x($a->user,'email') && x($a->config,'admin_email') && in_array($a->user['email'], $adminlist))
+	//if(local_user() && x($a->user,'email') && x($a->config,'admin_email') && ($a->user['email'] === $a->config['admin_email']))
+	if (local_user() && x($a->user,'email') && x($a->config,'admin_email') && in_array($a->user['email'], $adminlist)) {
 		return true;
+	}
 	return false;
 }
 
@@ -2271,21 +2277,24 @@ function is_site_admin() {
  *
  * @return string
  */
-function build_querystring($params, $name=null) {
+function build_querystring($params, $name = null) {
 	$ret = "";
-	foreach ($params as $key=>$val) {
+	foreach ($params as $key => $val) {
 		if (is_array($val)) {
-			if ($name==null) {
+			/// @TODO maybe not compare against null, use is_null()
+			if ($name == null) {
 				$ret .= build_querystring($val, $key);
 			} else {
 				$ret .= build_querystring($val, $name."[$key]");
 			}
 		} else {
 			$val = urlencode($val);
-			if ($name!=null) {
-				$ret.=$name."[$key]"."=$val&";
+			/// @TODO maybe not compare against null, use is_null()
+			if ($name != null) {
+				/// @TODO two string concated, can be merged to one
+				$ret .= $name . "[$key]" . "=$val&";
 			} else {
-				$ret.= "$key=$val&";
+				$ret .= "$key=$val&";
 			}
 		}
 	}
@@ -2303,7 +2312,8 @@ function explode_querystring($query) {
 	}
 
 	$args = explode('&', substr($query, $arg_st));
-	foreach ($args as $k=>$arg) {
+	foreach ($args as $k => $arg) {
+		/// @TODO really compare type-safe here?
 		if ($arg === '') {
 			unset($args[$k]);
 		}
@@ -2332,7 +2342,9 @@ function curPageURL() {
 	if ($_SERVER["HTTPS"] == "on") {
 		$pageURL .= "s";
 	}
+
 	$pageURL .= "://";
+
 	if ($_SERVER["SERVER_PORT"] != "80" && $_SERVER["SERVER_PORT"] != "443") {
 		$pageURL .= $_SERVER["SERVER_NAME"].":".$_SERVER["SERVER_PORT"].$_SERVER["REQUEST_URI"];
 	} else {
@@ -2344,6 +2356,7 @@ function curPageURL() {
 function random_digits($digits) {
 	$rn = '';
 	for ($i = 0; $i < $digits; $i++) {
+		/// @TODO rand() is different to mt_rand() and maybe lesser "random"
 		$rn .= rand(0,9);
 	}
 	return $rn;
@@ -2366,9 +2379,9 @@ function get_cachefile($file, $writemode = true) {
 		return("");
 	}
 
-	$subfolder = $cache."/".substr($file, 0, 2);
+	$subfolder = $cache . "/" . substr($file, 0, 2);
 
-	$cachepath = $subfolder."/".$file;
+	$cachepath = $subfolder . "/" . $file;
 
 	if ($writemode) {
 		if (!is_dir($subfolder)) {
@@ -2377,6 +2390,7 @@ function get_cachefile($file, $writemode = true) {
 		}
 	}
 
+	/// @TODO no need to put braces here
 	return($cachepath);
 }
 
@@ -2497,8 +2511,10 @@ function get_temppath() {
 	if (($temppath != "") AND App::directory_usable($temppath)) {
 		// To avoid any interferences with other systems we create our own directory
 		$new_temppath .= "/".$a->get_hostname();
-		if (!is_dir($new_temppath))
+		if (!is_dir($new_temppath)) {
+			/// @TODO There is a mkdir()+chmod() upwards, maybe generalize this (+ configurable) into a function/method?
 			mkdir($new_temppath);
+		}
 
 		if (App::directory_usable($new_temppath)) {
 			// The new path is usable, we are happy
@@ -2519,6 +2535,7 @@ function get_temppath() {
 function set_template_engine(App $a, $engine = 'internal') {
 /// @note This function is no longer necessary, but keep it as a wrapper to the class method
 /// to avoid breaking themes again unnecessarily
+/// @TODO maybe output a warning here so the theme developer can see it? PHP won't show such warnings like Java does.
 
 	$a->set_template_engine($engine);
 }
@@ -2617,20 +2634,24 @@ function infinite_scroll_data($module) {
 		AND ($module == "network") AND ($_GET["mode"] != "minimal")) {
 
 		// get the page number
-		if (is_string($_GET["page"]))
+		if (is_string($_GET["page"])) {
 			$pageno = $_GET["page"];
-		else
+		} else {
 			$pageno = 1;
+		}
 
 		$reload_uri = "";
 
 		// try to get the uri from which we load the content
-		foreach ($_GET AS $param => $value)
-			if (($param != "page") AND ($param != "q"))
-				$reload_uri .= "&".$param."=".urlencode($value);
+		foreach ($_GET AS $param => $value) {
+			if (($param != "page") AND ($param != "q")) {
+				$reload_uri .= "&" . $param . "=" . urlencode($value);
+			}
+		}
 
-		if (($a->page_offset != "") AND !strstr($reload_uri, "&offset="))
-			$reload_uri .= "&offset=".urlencode($a->page_offset);
+		if (($a->page_offset != "") AND !strstr($reload_uri, "&offset=")) {
+			$reload_uri .= "&offset=" . urlencode($a->page_offset);
+		}
 
 		$arr = array("pageno" => $pageno, "reload_uri" => $reload_uri);
 

From 221cfa8c22b724228ed24618569cabcae582d331 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 23 Mar 2017 21:39:03 +0100
Subject: [PATCH 023/120] added curly braces #3254

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 util/po2php.php | 98 +++++++++++++++++++++++++++++--------------------
 1 file changed, 59 insertions(+), 39 deletions(-)

diff --git a/util/po2php.php b/util/po2php.php
index 5d3429796e..4b801a6de4 100644
--- a/util/po2php.php
+++ b/util/po2php.php
@@ -12,12 +12,11 @@ function po2php_run(&$argv, &$argc) {
 	$pofile = $argv[1];
 	$outfile = dirname($pofile)."/strings.php";
 
-	if (strstr($outfile,'util'))
+	if (strstr($outfile, 'util')) {
 		$lang = 'en';
-	else
+	} else {
 		$lang = str_replace('-','_',basename(dirname($pofile)));
-
-
+	}
 
 	if (!file_exists($pofile)){
 		print "Unable to find '$pofile'\n";
@@ -26,14 +25,14 @@ function po2php_run(&$argv, &$argc) {
 
 	print "Out to '$outfile'\n";
 
-	$out="<?php\n\n";
+	$out = "<?php\n\n";
 
 	$infile = file($pofile);
-	$k="";
-	$v="";
-	$arr = False;
-	$ink = False;
-	$inv = False;
+	$k = "";
+	$v = "";
+	$arr = false;
+	$ink = false;
+	$inv = false;
 	$escape_s_exp = '|[^\\\\]\$[a-z]|';
 	function escape_s($match){
 		return str_replace('$','\$',$match[0]);
@@ -41,9 +40,11 @@ function po2php_run(&$argv, &$argc) {
 	foreach ($infile as $l) {
 		$l = str_replace('\"', DQ_ESCAPE, $l);
 		$len = strlen($l);
-		if ($l[0]=="#") $l="";
-		if (substr($l,0,15)=='"Plural-Forms: '){
-			$match=Array();
+		if ($l[0] == "#") {
+			$l = "";
+		}
+		if (substr($l,0,15) == '"Plural-Forms: ') {
+			$match = array();
 			preg_match("|nplurals=([0-9]*); *plural=(.*)[;\\\\]|", $l, $match);
 			$cond = str_replace('n','$n',$match[2]);
 			// define plural select function if not already defined
@@ -54,27 +55,36 @@ function po2php_run(&$argv, &$argc) {
 			$out .= '}}'."\n";
 		}
 
+		if ($k != "" && substr($l,0,7) == "msgstr ") {
+			if ($ink) {
+				$ink = false;
+				$out .= '$a->strings["' . $k . '"] = ';
+			}
+			if ($inv) {
+				$inv = false;
+				$out .= '"' . $v . '"';
+			}
 
-
-
-		if ($k!="" && substr($l,0,7)=="msgstr "){
-			if ($ink) { $ink = False; $out .= '$a->strings["'.$k.'"] = '; }
-			if ($inv) { $inv = False; $out .= '"'.$v.'"'; }
-
-			$v = substr($l,8,$len-10);
-			$v = preg_replace_callback($escape_s_exp,'escape_s',$v);
-			$inv = True;
+			$v = substr($l, 8, $len - 10);
+			$v = preg_replace_callback($escape_s_exp, 'escape_s', $v);
+			$inv = true;
 			//$out .= $v;
 		}
-		if ($k!="" && substr($l,0,7)=="msgstr["){
-			if ($ink) { $ink = False; $out .= '$a->strings["'.$k.'"] = '; }
-			if ($inv) {	$inv = False; $out .= '"'.$v.'"'; }
+		if ($k != "" && substr($l, 0, 7) == "msgstr[") {
+			if ($ink) {
+				$ink = false;
+				$out .= '$a->strings["' . $k . '"] = ';
+			}
+			if ($inv) {
+				$inv = false;
+				$out .= '"' . $v . '"';
+			}
 
 			if (!$arr) {
 				$arr=True;
 				$out .= "array(\n";
 			}
-			$match=Array();
+			$match = array();
 			preg_match("|\[([0-9]*)\] (.*)|", $l, $match);
 			$out .= "\t".
 				preg_replace_callback($escape_s_exp,'escape_s',$match[1])
@@ -91,10 +101,15 @@ function po2php_run(&$argv, &$argc) {
 			//$out .= '$a->strings['.$k.'] = ';
 		}
 
-		if (substr($l,0,6)=="msgid "){
-			if ($inv) {	$inv = False; $out .= '"'.$v.'"'; }
-			if ($k!="") $out .= $arr?");\n":";\n";
-			$arr=False;
+		if (substr($l, 0, 6) == "msgid ") {
+			if ($inv) {
+				$inv = false;
+				$out .= '"'.$v.'"';
+			}
+			if ($k != "") {
+				$out .= $arr?");\n":";\n";
+			}
+			$arr = false;
 			$k = str_replace("msgid ","",$l);
 			if ($k != '""' ) {
 				$k = trim($k,"\"\r\n");
@@ -102,27 +117,32 @@ function po2php_run(&$argv, &$argc) {
 				$k = "";
 			}
 
-			$k = preg_replace_callback($escape_s_exp,'escape_s',$k);
-			$ink = True;
+			$k = preg_replace_callback($escape_s_exp, 'escape_s', $k);
+			$ink = true;
 		}
 
-		if ($inv && substr($l,0,6)!="msgstr") {
-			$v .= trim($l,"\"\r\n");
-			$v = preg_replace_callback($escape_s_exp,'escape_s',$v);
+		if ($inv && substr($l, 0, 6) != "msgstr") {
+			$v .= trim($l, "\"\r\n");
+			$v = preg_replace_callback($escape_s_exp, 'escape_s', $v);
 			//$out .= '$a->strings['.$k.'] = ';
 		}
 
 
 	}
 
-	if ($inv) {	$inv = False; $out .= '"'.$v.'"'; }
-	if ($k!="") $out .= $arr?");\n":";\n";
+	if ($inv) {
+		$inv = false;
+		$out .= '"' . $v . '"';
+	}
+	if ($k != "") {
+		$out .= ($arr ? ");\n" : ";\n");
+	}
 
 	$out = str_replace(DQ_ESCAPE, '\"', $out);
 	file_put_contents($outfile, $out);
 
 }
 
-if (array_search(__file__,get_included_files())===0){
-  po2php_run($_SERVER["argv"],$_SERVER["argc"]);
+if (array_search(__FILE__, get_included_files()) === 0) {
+	po2php_run($_SERVER["argv"],$_SERVER["argc"]);
 }

From 47602577f38992bb9d5f428553dfabb97709924f Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 23 Mar 2017 21:45:00 +0100
Subject: [PATCH 024/120] Opps, missed one ...

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 boot.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/boot.php b/boot.php
index cf14fdd863..3070005d4c 100644
--- a/boot.php
+++ b/boot.php
@@ -675,8 +675,8 @@ class App {
 			 * or in a sub-directory and adjust accordingly
 			 */
 
-			$path = trim(dirname($_SERVER['SCRIPT_NAME']),'/\\');
-			if (isset($path) && strlen($path) && ($path != $this->path))
+			$path = trim(dirname($_SERVER['SCRIPT_NAME']), '/\\');
+			if (isset($path) && strlen($path) && ($path != $this->path)) {
 				$this->path = $path;
 			}
 		}

From f85e6d2aacd9071047b86cd7b45c73c532218057 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 23 Mar 2017 21:46:49 +0100
Subject: [PATCH 025/120] No parantheses here + no @ (which surpresses warnings
 and such) #3254

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 boot.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/boot.php b/boot.php
index 3070005d4c..e660cb3ede 100644
--- a/boot.php
+++ b/boot.php
@@ -611,8 +611,9 @@ class App {
 
 		$hostname = "";
 
-		if (file_exists(".htpreconfig.php"))
-			@include(".htpreconfig.php");
+		if (file_exists(".htpreconfig.php")) {
+			include ".htpreconfig.php";
+		}
 
 		$this->timezone = ((x($default_timezone)) ? $default_timezone : 'UTC');
 
@@ -881,7 +882,7 @@ class App {
 			}
 
 			if (file_exists(".htpreconfig.php")) {
-				include(".htpreconfig.php");
+				include ".htpreconfig.php";
 			}
 
 			if (get_config('config', 'hostname') != '') {

From 9521f39ebea7603098e4f96f5edb6c85a40fc646 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 23 Mar 2017 22:08:33 +0100
Subject: [PATCH 026/120] added more spaces #3254

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 boot.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/boot.php b/boot.php
index e660cb3ede..a3f25d059f 100644
--- a/boot.php
+++ b/boot.php
@@ -896,8 +896,8 @@ class App {
 	}
 
 	function get_hostname() {
-		if (get_config('config','hostname') != "") {
-			$this->hostname = get_config('config','hostname');
+		if (get_config('config', 'hostname') != "") {
+			$this->hostname = get_config('config', 'hostname');
 		}
 
 		return $this->hostname;
@@ -908,7 +908,7 @@ class App {
 	}
 
 	function set_path($p) {
-		$this->path = trim(trim($p),'/');
+		$this->path = trim(trim($p), '/');
 	}
 
 	function get_path() {
@@ -943,8 +943,8 @@ class App {
 
 		// compose the page title from the sitename and the
 		// current module called
-		if (!$this->module=='') {
-			$this->page['title'] = $this->config['sitename'].' ('.$this->module.')';
+		if (!$this->module == '') {
+		    $this->page['title'] = $this->config['sitename'] . ' (' . $this->module . ')';
 		} else {
 			$this->page['title'] = $this->config['sitename'];
 		}

From 480871d371f8f1235240fe6b439f04d4d391b5a8 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 23 Mar 2017 22:10:37 +0100
Subject: [PATCH 027/120] removed no longer old stuff, let's don't stuff code
 with commented-out code

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 boot.php | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/boot.php b/boot.php
index a3f25d059f..87fce11ec8 100644
--- a/boot.php
+++ b/boot.php
@@ -1032,29 +1032,6 @@ class App {
 
 	function get_cached_avatar_image($avatar_image){
 		return $avatar_image;
-
-		// The following code is deactivated. It doesn't seem to make any sense and it slows down the system.
-		/*
-		if ($this->cached_profile_image[$avatar_image])
-			return $this->cached_profile_image[$avatar_image];
-
-		$path_parts = explode("/",$avatar_image);
-		$common_filename = $path_parts[count($path_parts)-1];
-
-		if ($this->cached_profile_picdate[$common_filename]){
-			$this->cached_profile_image[$avatar_image] = $avatar_image . $this->cached_profile_picdate[$common_filename];
-		} else {
-			$r = q("SELECT `contact`.`avatar-date` AS picdate FROM `contact` WHERE `contact`.`thumb` like '%%/%s'",
-				$common_filename);
-			if (! dbm::is_result($r)) {
-				$this->cached_profile_image[$avatar_image] = $avatar_image;
-			} else {
-				$this->cached_profile_picdate[$common_filename] = "?rev=".urlencode($r[0]['picdate']);
-				$this->cached_profile_image[$avatar_image] = $avatar_image.$this->cached_profile_picdate[$common_filename];
-			}
-		}
-		return $this->cached_profile_image[$avatar_image];
-		*/
 	}
 
 

From 11d3fd163a8e42df0d8d09f79e2a24ee2cf0d7d8 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 23 Mar 2017 22:12:51 +0100
Subject: [PATCH 028/120] yet another one removed, thanks to @Hypolite for CR

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 boot.php | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/boot.php b/boot.php
index 87fce11ec8..4101469dd5 100644
--- a/boot.php
+++ b/boot.php
@@ -1128,18 +1128,6 @@ class App {
 
 	function set_template_engine($engine = 'smarty3') {
 		$this->theme['template_engine'] = $engine;
-		/*
-		$this->theme['template_engine'] = 'smarty3';
-
-		switch($engine) {
-			case 'smarty3':
-				if (is_writable('view/smarty3/'))
-					$this->theme['template_engine'] = 'smarty3';
-				break;
-			default:
-				break;
-		}
-		*/
 	}
 
 	function get_template_ldelim($engine = 'smarty3') {

From 843b7a003ccac424827c2327ae8412153715e098 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 23 Mar 2017 22:16:04 +0100
Subject: [PATCH 029/120] closed internal TODO, merged 2 if() to one + added
 spaces

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 boot.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/boot.php b/boot.php
index 4101469dd5..5df8c6c4d9 100644
--- a/boot.php
+++ b/boot.php
@@ -1349,12 +1349,11 @@ class App {
 		// This should prevent the forking of masses of workers.
 		$cachekey = "app:proc_run:started";
 		$result = Cache::get($cachekey);
-		/// @TODO maybe merge these both into one if() ?
-		if (!is_null($result)) {
-			if ((time() - $result) < 10) {
-				return;
-			}
+
+		if (!is_null($result) AND (time() - $result) < 10) {
+			return;
 		}
+
 		// Set the timestamp of the last proc_run
 		Cache::set($cachekey, time(), CACHE_MINUTE);
 
@@ -1363,16 +1362,17 @@ class App {
 		// add baseurl to args. cli scripts can't construct it
 		$args[] = $this->get_baseurl();
 
+		/// @TODO let's replace these with a foreach($key => $value) loop
 		for ($x = 0; $x < count($args); $x ++) {
 			$args[$x] = escapeshellarg($args[$x]);
 		}
 
-		$cmdline = implode($args," ");
+		$cmdline = implode($args, " ");
 
-		if (get_config('system','proc_windows')) {
-			proc_close(proc_open('cmd /c start /b ' . $cmdline,array(),$foo,dirname(__FILE__)));
+		if (get_config('system', 'proc_windows')) {
+			proc_close(proc_open('cmd /c start /b ' . $cmdline, array(), $foo, dirname(__FILE__)));
 		} else {
-			proc_close(proc_open($cmdline." &",array(),$foo,dirname(__FILE__)));
+			proc_close(proc_open($cmdline . " &", array(), $foo, dirname(__FILE__)));
 		}
 
 	}

From dad6a61be4b7d23bcf5c19dd782e80aa4886b3a3 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 23 Mar 2017 22:19:10 +0100
Subject: [PATCH 030/120] it is space-season ... ;-) #3254

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 include/dfrn.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/dfrn.php b/include/dfrn.php
index 8b230f03d9..f0b702edd4 100644
--- a/include/dfrn.php
+++ b/include/dfrn.php
@@ -689,15 +689,15 @@ class dfrn {
 			}
 
 			if ($r->link) {
-				if (substr($r->link,0,1) == '<') {
-					if (strstr($r->link,'&') && (! strstr($r->link,'&amp;'))) {
-						$r->link = str_replace('&','&amp;', $r->link);
+				if (substr($r->link, 0, 1) == '<') {
+					if (strstr($r->link, '&') && (! strstr($r->link, '&amp;'))) {
+						$r->link = str_replace('&', '&amp;', $r->link);
 					}
 
-					$r->link = preg_replace('/\<link(.*?)\"\>/','<link$1"/>',$r->link);
+					$r->link = preg_replace('/\<link(.*?)\"\>/', '<link$1"/>', $r->link);
 
 					// XML does need a single element as root element so we add a dummy element here
-					$data = parse_xml_string("<dummy>".$r->link."</dummy>", false);
+					$data = parse_xml_string("<dummy>" . $r->link . "</dummy>", false);
 					if (is_object($data)) {
 						foreach ($data->link AS $link) {
 							$attributes = array();

From 16c405b387960dc2899b3b1a3c8fdf02bf480e8f Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 23 Mar 2017 22:22:18 +0100
Subject: [PATCH 031/120] more spaces added (CR by @Hypolite)

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 mod/dfrn_notify.php | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index d34c959f1f..e9ccf4195d 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -143,7 +143,7 @@ function dfrn_notify_post(App $a) {
 	$rino = get_config('system','rino_encrypt');
 	$rino = intval($rino);
 	// use RINO1 if mcrypt isn't installed and RINO2 was selected
-	if ($rino==2 and !function_exists('mcrypt_create_iv')) $rino=1;
+	if ($rino == 2 and !function_exists('mcrypt_create_iv')) $rino=1;
 
 	logger("Local rino version: ". $rino, LOGGER_DEBUG);
 
@@ -290,24 +290,24 @@ function dfrn_notify_content(App $a) {
 
 		logger("Remote rino version: ".$rino_remote." for ".$r[0]["url"], LOGGER_DEBUG);
 
-		$challenge = '';
+		$challenge    = '';
 		$encrypted_id = '';
-		$id_str = $my_id . '.' . mt_rand(1000,9999);
+		$id_str       = $my_id . '.' . mt_rand(1000,9999);
 
 		$prv_key = trim($r[0]['prvkey']);
 		$pub_key = trim($r[0]['pubkey']);
-		$dplx = intval($r[0]['duplex']);
+		$dplx    = intval($r[0]['duplex']);
 
-		if((($dplx) && (strlen($prv_key))) || ((strlen($prv_key)) && (!(strlen($pub_key))))) {
-			openssl_private_encrypt($hash,$challenge,$prv_key);
-			openssl_private_encrypt($id_str,$encrypted_id,$prv_key);
-		}
-		elseif(strlen($pub_key)) {
-			openssl_public_encrypt($hash,$challenge,$pub_key);
-			openssl_public_encrypt($id_str,$encrypted_id,$pub_key);
-		}
-		else
+		if ((($dplx) && (strlen($prv_key))) || ((strlen($prv_key)) && (!(strlen($pub_key))))) {
+			openssl_private_encrypt($hash, $challenge, $prv_key);
+			openssl_private_encrypt($id_str, $encrypted_id, $prv_key);
+		} elseif (strlen($pub_key)) {
+			openssl_public_encrypt($hash, $challenge, $pub_key);
+			openssl_public_encrypt($id_str, $encrypted_id, $pub_key);
+		} else {
+			/// @TODO these kind of else-blocks are making the code harder to understand
 			$status = 1;
+		}
 
 		$challenge    = bin2hex($challenge);
 		$encrypted_id = bin2hex($encrypted_id);
@@ -316,18 +316,22 @@ function dfrn_notify_content(App $a) {
 		$rino = get_config('system','rino_encrypt');
 		$rino = intval($rino);
 		// use RINO1 if mcrypt isn't installed and RINO2 was selected
-		if ($rino==2 and !function_exists('mcrypt_create_iv')) $rino=1;
+		/// @TODO Define a code-standard: and/AND/&& are around
+		if ($rino == 2 and !function_exists('mcrypt_create_iv')) {
+			$rino = 1;
+		}
 
 		logger("Local rino version: ". $rino, LOGGER_DEBUG);
 
 		// if requested rino is lower than enabled local rino, lower local rino version
 		// if requested rino is higher than enabled local rino, reply with local rino
-		if ($rino_remote < $rino) $rino = $rino_remote;
+		if ($rino_remote < $rino) {
+			$rino = $rino_remote;
+		}
 
 		if((($r[0]['rel']) && ($r[0]['rel'] != CONTACT_IS_SHARING)) || ($r[0]['page-flags'] == PAGE_COMMUNITY)) {
 			$perm = 'rw';
-		}
-		else {
+		} else {
 			$perm = 'r';
 		}
 

From 09ab141404a4d9ddf30ec100006fb204a2848ebc Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 23 Mar 2017 22:26:07 +0100
Subject: [PATCH 032/120] better comment added by @Hypolite

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 include/dfrn.php | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/include/dfrn.php b/include/dfrn.php
index f0b702edd4..aa8c0b5ecd 100644
--- a/include/dfrn.php
+++ b/include/dfrn.php
@@ -1608,7 +1608,14 @@ class dfrn {
 			dbesc(normalise_link($suggest["url"])),
 			intval($suggest["uid"])
 		);
-		/// @TODO Really abort on valid result??? Maybe missed ! here?
+
+		/*
+		 * The valid result means the friend we're about to send a friend
+		 * suggestion already has them in their contact, which means no further
+		 * action is required.
+		 *
+		 * @see https://github.com/friendica/friendica/pull/3254#discussion_r107315246
+		 */
 		if (dbm::is_result($r)) {
 			return false;
 		}
@@ -1629,30 +1636,33 @@ class dfrn {
 				intval($suggest["uid"]),
 				intval($fid)
 			);
+
 			/// @TODO Really abort on valid result??? Maybe missed ! here?
 			if (dbm::is_result($r)) {
 				return false;
 			}
 		}
-		if (!$fid)
+		if (!$fid) {
 			$r = q("INSERT INTO `fcontact` (`name`,`url`,`photo`,`request`) VALUES ('%s', '%s', '%s', '%s')",
-			dbesc($suggest["name"]),
-			dbesc($suggest["url"]),
-			dbesc($suggest["photo"]),
-			dbesc($suggest["request"])
-		);
+				dbesc($suggest["name"]),
+				dbesc($suggest["url"]),
+				dbesc($suggest["photo"]),
+				dbesc($suggest["request"])
+			);
+		}
 		$r = q("SELECT `id` FROM `fcontact` WHERE `url` = '%s' AND `name` = '%s' AND `request` = '%s' LIMIT 1",
 			dbesc($suggest["url"]),
 			dbesc($suggest["name"]),
 			dbesc($suggest["request"])
 		);
-		if (dbm::is_result($r)) {
-			$fid = $r[0]["id"];
-		} else {
+
+		// This way a useless else-block is being spared, resulting in easier code.
+		if (!dbm::is_result($r)) {
 			// database record did not get created. Quietly give up.
 			killme();
 		}
 
+		$fid = $r[0]["id"];
 
 		$hash = random_string();
 

From d8eee2be554441ef825249ec89d6fa4ad95c6f11 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 23 Mar 2017 22:33:12 +0100
Subject: [PATCH 033/120] added curely branches + reverted back to old
 behaviour (may come back one day)

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 include/dfrn.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/include/dfrn.php b/include/dfrn.php
index aa8c0b5ecd..71ffd886b6 100644
--- a/include/dfrn.php
+++ b/include/dfrn.php
@@ -1740,7 +1740,12 @@ class dfrn {
 			intval($importer["importer_uid"]));
 
 		if (!dbm::is_result($r)) {
+			/*
+			 * @TODO maybe one day:
+			logger("Query failed to execute, no result returned in " . __FUNCTION__);
 			killme();
+			*/
+			return false;
 		}
 
 		$old = $r[0];

From 66366b2804fb3f94016663b107a32993ae084dfa Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 23 Mar 2017 22:43:46 +0100
Subject: [PATCH 034/120] added more spaces and curely braces killed ?> as it
 is discouraged

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 include/dfrn.php | 37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/include/dfrn.php b/include/dfrn.php
index 71ffd886b6..1e6cc6e71d 100644
--- a/include/dfrn.php
+++ b/include/dfrn.php
@@ -2037,28 +2037,28 @@ class dfrn {
 
 			// Big question: Do we need these functions? They were part of the "consume_feed" function.
 			// This function once was responsible for DFRN and OStatus.
-			if (activity_match($item["verb"],ACTIVITY_FOLLOW)) {
+			if (activity_match($item["verb"], ACTIVITY_FOLLOW)) {
 				logger("New follower");
 				new_follower($importer, $contact, $item, $nickname);
 				return false;
 			}
-			if (activity_match($item["verb"],ACTIVITY_UNFOLLOW))  {
+			if (activity_match($item["verb"], ACTIVITY_UNFOLLOW))  {
 				logger("Lost follower");
 				lose_follower($importer, $contact, $item);
 				return false;
 			}
-			if (activity_match($item["verb"],ACTIVITY_REQ_FRIEND)) {
+			if (activity_match($item["verb"], ACTIVITY_REQ_FRIEND)) {
 				logger("New friend request");
 				new_follower($importer, $contact, $item, $nickname, true);
 				return false;
 			}
-			if (activity_match($item["verb"],ACTIVITY_UNFRIEND))  {
+			if (activity_match($item["verb"], ACTIVITY_UNFRIEND))  {
 				logger("Lost sharer");
 				lose_sharer($importer, $contact, $item);
 				return false;
 			}
 		} else {
-			if(($item["verb"] == ACTIVITY_LIKE)
+			if (($item["verb"] == ACTIVITY_LIKE)
 				|| ($item["verb"] == ACTIVITY_DISLIKE)
 				|| ($item["verb"] == ACTIVITY_ATTEND)
 				|| ($item["verb"] == ACTIVITY_ATTENDNO)
@@ -2331,7 +2331,7 @@ class dfrn {
 							$item["tag"] .= ",";
 						}
 
-						$item["tag"] .= $termhash."[url=".$termurl."]".$term."[/url]";
+						$item["tag"] .= $termhash . "[url=" . $termurl . "]" . $term . "[/url]";
 					}
 				}
 			}
@@ -2381,6 +2381,7 @@ class dfrn {
 				$item["network"] = $author["network"];
 			}
 
+			/// @TODO maybe remove this old-lost code then?
 			// This code was taken from the old DFRN code
 			// When activated, forums don't work.
 			// And: Why should we disallow commenting by followers?
@@ -2405,6 +2406,7 @@ class dfrn {
 				$ev = bbtoevent($item["body"]);
 				if ((x($ev, "desc") || x($ev, "summary")) && x($ev, "start")) {
 					logger("Event in item ".$item["uri"]." was found.", LOGGER_DEBUG);
+					/// @TODO Mixure of "/' ahead ...
 					$ev["cid"] = $importer["id"];
 					$ev["uid"] = $importer["uid"];
 					$ev["uri"] = $item["uri"];
@@ -2654,7 +2656,7 @@ class dfrn {
 				}
 				// if this is a relayed delete, propagate it to other recipients
 
-				if($entrytype == DFRN_REPLY_RC) {
+				if ($entrytype == DFRN_REPLY_RC) {
 					logger("Notifying followers about deletion of post ".$item["id"], LOGGER_DEBUG);
 					proc_run(PRIORITY_HIGH, "include/notifier.php","drop", $item["id"]);
 				}
@@ -2671,10 +2673,11 @@ class dfrn {
 	 */
 	public static function import($xml,$importer, $sort_by_date = false) {
 
-		if ($xml == "")
+		if ($xml == "") {
 			return;
+		}
 
-		if($importer["readonly"]) {
+		if ($importer["readonly"]) {
 			// We aren't receiving stuff from this person. But we will quietly ignore them
 			// rather than a blatant "go away" message.
 			logger('ignoring contact '.$importer["id"]);
@@ -2707,35 +2710,40 @@ class dfrn {
 		// Update the contact table if the data has changed
 
 		// The "atom:author" is only present in feeds
-		if ($xpath->query("/atom:feed/atom:author")->length > 0)
+		if ($xpath->query("/atom:feed/atom:author")->length > 0) {
 			self::fetchauthor($xpath, $doc->firstChild, $importer, "atom:author", false, $xml);
+		}
 
 		// Only the "dfrn:owner" in the head section contains all data
-		if ($xpath->query("/atom:feed/dfrn:owner")->length > 0)
+		if ($xpath->query("/atom:feed/dfrn:owner")->length > 0) {
 			self::fetchauthor($xpath, $doc->firstChild, $importer, "dfrn:owner", false, $xml);
+		}
 
-		logger("Import DFRN message for user ".$importer["uid"]." from contact ".$importer["id"], LOGGER_DEBUG);
+		logger("Import DFRN message for user " . $importer["uid"] . " from contact " . $importer["id"], LOGGER_DEBUG);
 
 		// The account type is new since 3.5.1
 		if ($xpath->query("/atom:feed/dfrn:account_type")->length > 0) {
 			$accounttype = intval($xpath->evaluate("/atom:feed/dfrn:account_type/text()", $context)->item(0)->nodeValue);
 
-			if ($accounttype != $importer["contact-type"])
+			if ($accounttype != $importer["contact-type"]) {
+				/// @TODO this way is the norm or putting ); at the end of the line?
 				q("UPDATE `contact` SET `contact-type` = %d WHERE `id` = %d",
 					intval($accounttype),
 					intval($importer["id"])
 				);
+			}
 		}
 
 		// is it a public forum? Private forums aren't supported with this method
 		// This is deprecated since 3.5.1
 		$forum = intval($xpath->evaluate("/atom:feed/dfrn:community/text()", $context)->item(0)->nodeValue);
 
-		if ($forum != $importer["forum"])
+		if ($forum != $importer["forum"]) {
 			q("UPDATE `contact` SET `forum` = %d WHERE `forum` != %d AND `id` = %d",
 				intval($forum), intval($forum),
 				intval($importer["id"])
 			);
+		}
 
 		$mails = $xpath->query("/atom:feed/dfrn:mail");
 		foreach ($mails AS $mail) {
@@ -2780,4 +2788,3 @@ class dfrn {
 		logger("Import done for user ".$importer["uid"]." from contact ".$importer["id"], LOGGER_DEBUG);
 	}
 }
-?>

From f94a10bf00de699a5f3d22ea74665053a5661175 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 23 Mar 2017 22:49:05 +0100
Subject: [PATCH 035/120] old behaviour restored

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 include/dfrn.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/include/dfrn.php b/include/dfrn.php
index 1e6cc6e71d..1e1b82e39b 100644
--- a/include/dfrn.php
+++ b/include/dfrn.php
@@ -2103,7 +2103,12 @@ class dfrn {
 					);
 
 					if (!dbm::is_result($r)) {
+						/*
+						 * @TODO maybe one day:
+						logger("Query failed to execute, no result returned in " . __FUNCTION__);
 						killme();
+						*/
+						return false;
 					}
 
 					// extract tag, if not duplicate, add to parent item
@@ -2551,7 +2556,7 @@ class dfrn {
 				intval($importer["id"])
 			);
 		if (!dbm::is_result($r)) {
-			logger("Item with uri ".$uri." from contact ".$importer["id"]." for user ".$importer["uid"]." wasn't found.", LOGGER_DEBUG);
+			logger("Item with uri " . $uri . " from contact " . $importer["id"] . " for user " . $importer["uid"] . " wasn't found.", LOGGER_DEBUG);
 			return;
 		} else {
 

From e4ad359f5a91a01fa18d3ad09ca6bc868e9c373c Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 23 Mar 2017 22:51:52 +0100
Subject: [PATCH 036/120] added curely braces + TODO for maybe avoiding
 multi-lined if() blocks as it confuses #3254

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 include/dfrn.php    |  7 ++++---
 include/ostatus.php | 26 +++++++++++++++++---------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/include/dfrn.php b/include/dfrn.php
index 1e1b82e39b..34cd33c339 100644
--- a/include/dfrn.php
+++ b/include/dfrn.php
@@ -2159,8 +2159,8 @@ class dfrn {
 					$title = $attributes->textContent;
 				}
 			}
-			if (($rel != "") AND ($href != ""))
-				switch($rel) {
+			if (($rel != "") AND ($href != "")) {
+				switch ($rel) {
 					case "alternate":
 						$item["plink"] = $href;
 						break;
@@ -2170,9 +2170,10 @@ class dfrn {
 							$item["attach"] .= ",";
 						}
 
-						$item["attach"] .= '[attach]href="'.$href.'" length="'.$length.'" type="'.$type.'" title="'.$title.'"[/attach]';
+						$item["attach"] .= '[attach]href="' . $href . '" length="' . $length . '" type="' . $type . '" title="' . $title . '"[/attach]';
 						break;
 				}
+			}
 		}
 	}
 
diff --git a/include/ostatus.php b/include/ostatus.php
index 2c4b677a53..6061ef9e11 100644
--- a/include/ostatus.php
+++ b/include/ostatus.php
@@ -411,43 +411,51 @@ class ostatus {
 						if ($attributes->name == "title")
 							$title = $attributes->textContent;
 					}
-					if (($rel != "") AND ($href != ""))
-						switch($rel) {
+					if (($rel != "") AND ($href != "")) {
+						switch ($rel) {
 							case "alternate":
 								$item["plink"] = $href;
+								/// @TODO These multi-lines can confuse, let's avoid them
 								if (($item["object-type"] == ACTIVITY_OBJ_QUESTION) OR
-									($item["object-type"] == ACTIVITY_OBJ_EVENT))
+									($item["object-type"] == ACTIVITY_OBJ_EVENT)) {
 									$item["body"] .= add_page_info($href);
+								}
 								break;
 							case "ostatus:conversation":
 								$conversation = $href;
 								break;
 							case "enclosure":
 								$enclosure = $href;
-								if(strlen($item["attach"]))
+								if (strlen($item["attach"])) {
 									$item["attach"] .= ',';
+								}
 
-								$item["attach"] .= '[attach]href="'.$href.'" length="'.$length.'" type="'.$type.'" title="'.$title.'"[/attach]';
+								$item["attach"] .= '[attach]href="' . $href . '" length="' . $length . '" type="' . $type . '" title="' . $title . '"[/attach]';
 								break;
 							case "related":
 								if ($item["object-type"] != ACTIVITY_OBJ_BOOKMARK) {
-									if (!isset($item["parent-uri"]))
+									if (!isset($item["parent-uri"])) {
 										$item["parent-uri"] = $href;
+									}
 
-									if ($related == "")
+									if ($related == "") {
 										$related = $href;
-								} else
+									}
+								} else {
 									$item["body"] .= add_page_info($href);
+								}
 								break;
 							case "self":
 								$self = $href;
 								break;
 							case "mentioned":
 								// Notification check
-								if ($importer["nurl"] == normalise_link($href))
+								if ($importer["nurl"] == normalise_link($href)) {
 									$mention = true;
+								}
 								break;
 						}
+					}
 				}
 			}
 

From 247093090256d3a9af7e0788772aa88297f06059 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 23 Mar 2017 23:01:04 +0100
Subject: [PATCH 037/120] Continued #3254: - thrown out old lost-code - add
 curly braces (not curely ;-) ) and spaces - exit is not a keyword, it is a
 function, so use () here

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 index.php | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/index.php b/index.php
index d3310ba1aa..326d8dc2fd 100644
--- a/index.php
+++ b/index.php
@@ -417,24 +417,8 @@ if (stristr( implode("",$_SESSION['sysmsg']), t('Permission denied'))) {
  *
  */
 
-/*if (x($_SESSION,'sysmsg')) {
-	$a->page['content'] = "<div id=\"sysmsg\" class=\"error-message\">{$_SESSION['sysmsg']}</div>\r\n"
-		. ((x($a->page,'content')) ? $a->page['content'] : '');
-	$_SESSION['sysmsg']="";
-	unset($_SESSION['sysmsg']);
-}
-if (x($_SESSION,'sysmsg_info')) {
-	$a->page['content'] = "<div id=\"sysmsg_info\" class=\"info-message\">{$_SESSION['sysmsg_info']}</div>\r\n"
-		. ((x($a->page,'content')) ? $a->page['content'] : '');
-	$_SESSION['sysmsg_info']="";
-	unset($_SESSION['sysmsg_info']);
-}*/
-
-
-
 call_hooks('page_end', $a->page['content']);
 
-
 /**
  *
  * Add the navigation (menu) template
@@ -489,7 +473,6 @@ if (isset($_GET["mode"]) AND (($_GET["mode"] == "raw") OR ($_GET["mode"] == "min
 	$list = $xpath->query("//*[contains(@id,'tread-wrapper-')]");  /* */
 
 	foreach ($list as $item) {
-
 		$item = $target->importNode($item, true);
 
 		// And then append it to the target
@@ -520,7 +503,7 @@ header("Content-type: text/html; charset=utf-8");
 // to load another page template than the default one
 // The page templates are located in /view/php/ or in the theme directory
 if (isset($_GET["mode"])) {
-		$template = theme_include($_GET["mode"].'.php');
+	$template = theme_include($_GET["mode"].'.php');
 }
 
 // If there is no page template use the default page template
@@ -530,6 +513,7 @@ if (!$template) {
 
 require_once($template);
 
-if (!$a->is_backend())
+if (!$a->is_backend()) {
 	session_write_close();
-exit;
+}
+exit();

From c4b82133e96a38809e99f767e7a151a3df5f4bc5 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 23 Mar 2017 23:05:53 +0100
Subject: [PATCH 038/120] added more curly braces + spaces for #3254

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 mod/profiles.php | 109 ++++++++++++++++++++++-------------------------
 1 file changed, 51 insertions(+), 58 deletions(-)

diff --git a/mod/profiles.php b/mod/profiles.php
index 378900a880..0aea672021 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -260,26 +260,14 @@ function profiles_post(App $a) {
 							}
 						}
 					}
-				}
-				else {
+				} else {
 					$newname = $lookup;
-/*					if (strstr($lookup,' ')) {
-						$r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
-							dbesc($newname),
-							intval(local_user())
-						);
-					} else {
-						$r = q("SELECT * FROM `contact` WHERE `nick` = '%s' AND `uid` = %d LIMIT 1",
-							dbesc($lookup),
-							intval(local_user())
-						);
-					}*/
 
 					$r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
 						dbesc($newname),
 						intval(local_user())
 					);
-					if(! $r) {
+					if (! dbm::is_result($r)) {
 						$r = q("SELECT * FROM `contact` WHERE `nick` = '%s' AND `uid` = %d LIMIT 1",
 							dbesc($lookup),
 							intval(local_user())
@@ -291,10 +279,11 @@ function profiles_post(App $a) {
 					}
 				}
 
-				if($prf) {
-					$with = str_replace($lookup,'<a href="' . $prf . '">' . $newname	. '</a>', $with);
-					if(strpos($with,'@') === 0)
-						$with = substr($with,1);
+				if ($prf) {
+					$with = str_replace($lookup,'<a href="' . $prf . '">' . $newname . '</a>', $with);
+					if (strpos($with,'@') === 0) {
+						$with = substr($with, 1);
+					}
 				}
 			}
 			else
@@ -332,61 +321,61 @@ function profiles_post(App $a) {
 
 		$changes = array();
 		$value = '';
-		if($is_default) {
-			if($marital != $orig[0]['marital']) {
+		if ($is_default) {
+			if ($marital != $orig[0]['marital']) {
 				$changes[] = '[color=#ff0000]&hearts;[/color] ' . t('Marital Status');
 				$value = $marital;
 			}
-			if($withchanged) {
+			if ($withchanged) {
 				$changes[] = '[color=#ff0000]&hearts;[/color] ' . t('Romantic Partner');
 				$value = strip_tags($with);
 			}
-			if($likes != $orig[0]['likes']) {
+			if ($likes != $orig[0]['likes']) {
 				$changes[] = t('Likes');
 				$value = $likes;
 			}
-			if($dislikes != $orig[0]['dislikes']) {
+			if ($dislikes != $orig[0]['dislikes']) {
 				$changes[] = t('Dislikes');
 				$value = $dislikes;
 			}
-			if($work != $orig[0]['work']) {
+			if ($work != $orig[0]['work']) {
 				$changes[] = t('Work/Employment');
 			}
-			if($religion != $orig[0]['religion']) {
+			if ($religion != $orig[0]['religion']) {
 				$changes[] = t('Religion');
 				$value = $religion;
 			}
-			if($politic != $orig[0]['politic']) {
+			if ($politic != $orig[0]['politic']) {
 				$changes[] = t('Political Views');
 				$value = $politic;
 			}
-			if($gender != $orig[0]['gender']) {
+			if ($gender != $orig[0]['gender']) {
 				$changes[] = t('Gender');
 				$value = $gender;
 			}
-			if($sexual != $orig[0]['sexual']) {
+			if ($sexual != $orig[0]['sexual']) {
 				$changes[] = t('Sexual Preference');
 				$value = $sexual;
 			}
-			if($xmpp != $orig[0]['xmpp']) {
+			if ($xmpp != $orig[0]['xmpp']) {
 				$changes[] = t('XMPP');
 				$value = $xmpp;
 			}
-			if($homepage != $orig[0]['homepage']) {
+			if ($homepage != $orig[0]['homepage']) {
 				$changes[] = t('Homepage');
 				$value = $homepage;
 			}
-			if($interest != $orig[0]['interest']) {
+			if ($interest != $orig[0]['interest']) {
 				$changes[] = t('Interests');
 				$value = $interest;
 			}
-			if($address != $orig[0]['address']) {
+			if ($address != $orig[0]['address']) {
 				$changes[] = t('Address');
 				// New address not sent in notifications, potential privacy issues
 				// in case this leaks to unintended recipients. Yes, it's in the public
 				// profile but that doesn't mean we have to broadcast it to everybody.
 			}
-			if($locality != $orig[0]['locality'] || $region != $orig[0]['region']
+			if ($locality != $orig[0]['locality'] || $region != $orig[0]['region']
 				|| $country_name != $orig[0]['country-name']) {
  				$changes[] = t('Location');
 				$comma1 = ((($locality) && ($region || $country_name)) ? ', ' : ' ');
@@ -472,11 +461,13 @@ function profiles_post(App $a) {
 			intval(local_user())
 		);
 
-		if($r)
+		/// @TODO decide to use dbm::is_result() here and check $r
+		if ($r) {
 			info( t('Profile updated.') . EOL);
+		}
 
 
-		if($namechanged && $is_default) {
+		if ($namechanged && $is_default) {
 			$r = q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s' WHERE `self` = 1 AND `uid` = %d",
 				dbesc($name),
 				dbesc(datetime_convert()),
@@ -488,7 +479,7 @@ function profiles_post(App $a) {
 			);
 		}
 
-		if($is_default) {
+		if ($is_default) {
 			$location = formatted_location(array("locality" => $locality, "region" => $region, "country-name" => $country_name));
 
 			q("UPDATE `contact` SET `about` = '%s', `location` = '%s', `keywords` = '%s', `gender` = '%s' WHERE `self` AND `uid` = %d",
@@ -518,14 +509,17 @@ function profiles_post(App $a) {
 function profile_activity($changed, $value) {
 	$a = get_app();
 
-	if(! local_user() || ! is_array($changed) || ! count($changed))
+	if (! local_user() || ! is_array($changed) || ! count($changed)) {
 		return;
+	}
 
-	if($a->user['hidewall'] || get_config('system','block_public'))
+	if ($a->user['hidewall'] || get_config('system','block_public')) {
 		return;
+	}
 
-	if(! get_pconfig(local_user(),'system','post_profilechange'))
+	if (! get_pconfig(local_user(),'system','post_profilechange')) {
 		return;
+	}
 
 	require_once('include/items.php');
 
@@ -533,8 +527,9 @@ function profile_activity($changed, $value) {
 		intval(local_user())
 	);
 
-	if(! count($self))
+	if (! dbm::is_result($self)) {
 		return;
+	}
 
 	$arr = array();
 
@@ -558,12 +553,13 @@ function profile_activity($changed, $value) {
 	$changes = '';
 	$t = count($changed);
 	$z = 0;
-	foreach($changed as $ch) {
-		if(strlen($changes)) {
-			if ($z == ($t - 1))
+	foreach ($changed as $ch) {
+		if (strlen($changes)) {
+			if ($z == ($t - 1)) {
 				$changes .= t(' and ');
-			else
+			} else {
 				$changes .= ', ';
+			}
 		}
 		$z ++;
 		$changes .= $ch;
@@ -571,12 +567,12 @@ function profile_activity($changed, $value) {
 
 	$prof = '[url=' . $self[0]['url'] . '?tab=profile' . ']' . t('public profile') . '[/url]';
 
-	if($t == 1 && strlen($value)) {
+	if ($t == 1 && strlen($value)) {
 		$message = sprintf( t('%1$s changed %2$s to &ldquo;%3$s&rdquo;'), $A, $changes, $value);
 		$message .= "\n\n" . sprintf( t(' - Visit %1$s\'s %2$s'), $A, $prof);
-	}
-	else
+	} else {
 		$message = 	sprintf( t('%1$s has an updated %2$s, changing %3$s.'), $A, $prof, $changes);
+	}
 
 
 	$arr['body'] = $message;
@@ -609,7 +605,7 @@ function profiles_content(App $a) {
 
 	$o = '';
 
-	if(($a->argc > 1) && (intval($a->argv[1]))) {
+	if (($a->argc > 1) && (intval($a->argv[1]))) {
 		$r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 			intval($a->argv[1]),
 			intval(local_user())
@@ -656,7 +652,7 @@ function profiles_content(App $a) {
 
 		$is_default = (($r[0]['is-default']) ? 1 : 0);
 		$tpl = get_markup_template("profile_edit.tpl");
-		$o .= replace_macros($tpl,array(
+		$o .= replace_macros($tpl, array(
 			'$personal_account' => $personal_account,
 			'$detailled_profile' => $detailled_profile,
 
@@ -665,7 +661,7 @@ function profiles_content(App $a) {
 				t('Show more profile fields:'), //Label
 				$detailled_profile, //Value
 				'', //Help string
-				array(t('No'),t('Yes')) //Off - On strings
+				array(t('No'), t('Yes')) //Off - On strings
 			),
 
 			'$multi_profiles'		=> feature_enabled(local_user(),'multi_profiles'),
@@ -747,15 +743,11 @@ function profiles_content(App $a) {
 		call_hooks('profile_edit', $arr);
 
 		return $o;
-	}
+	} else {
 
-	//Profiles list.
-	else {
-
-		//If we don't support multi profiles, don't display this list.
-		if(!feature_enabled(local_user(),'multi_profiles')){
-			$r = q(
-				"SELECT * FROM `profile` WHERE `uid` = %d AND `is-default`=1",
+		// If we don't support multi profiles, don't display this list.
+		if (!feature_enabled(local_user(),'multi_profiles')){
+			$r = q("SELECT * FROM `profile` WHERE `uid` = %d AND `is-default`=1",
 				local_user()
 			);
 			if (dbm::is_result($r)){
@@ -766,6 +758,7 @@ function profiles_content(App $a) {
 
 		$r = q("SELECT * FROM `profile` WHERE `uid` = %d",
 			local_user());
+
 		if (dbm::is_result($r)) {
 
 			$tpl = get_markup_template('profile_entry.tpl');

From a410f86e9cc2faa1f84853604657d870a9ed10e5 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 23 Mar 2017 23:07:29 +0100
Subject: [PATCH 039/120] Continued with #3254: - added curly braces + spaces -
 converted multiple single-line comments to one multi-line comment

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 update.php | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/update.php b/update.php
index 1668df6eb5..8404f5bf26 100644
--- a/update.php
+++ b/update.php
@@ -308,7 +308,7 @@ function update_1030() {
 function update_1031() {
 	// Repair any bad links that slipped into the item table
 	$r = q("SELECT `id`, `object` FROM `item` WHERE `object` != '' ");
-	if($r && dbm::is_result($r)) {
+	if (dbm::is_result($r)) {
 		foreach ($r as $rr) {
 			if (strstr($rr['object'],'type=&quot;http')) {
 				q("UPDATE `item` SET `object` = '%s' WHERE `id` = %d",
@@ -326,22 +326,23 @@ function update_1032() {
 
 function update_1033() {
 	q("CREATE TABLE IF NOT EXISTS `cache` (
- 		`k` CHAR( 255 ) NOT NULL PRIMARY KEY ,
- 		`v` TEXT NOT NULL,
- 		`updated` DATETIME NOT NULL
-		) ENGINE = MYISAM DEFAULT CHARSET=utf8 ");
+		`k` CHAR( 255 ) NOT NULL PRIMARY KEY ,
+		`v` TEXT NOT NULL,
+		`updated` DATETIME NOT NULL
+		) DEFAULT CHARSET=utf8 ");
 }
 
 
 function update_1034() {
 
-	// If you have any of these parent-less posts they can cause problems, and
-	// we need to delete them. You can't see them anyway.
-	// Legitimate items will usually get re-created on the next
-	// pull from the hub.
-	// But don't get rid of a post that may have just come in
-	// and may not yet have the parent id set.
-
+	/*
+	 * If you have any of these parent-less posts they can cause problems, and
+	 * we need to delete them. You can't see them anyway.
+	 * Legitimate items will usually get re-created on the next
+	 * pull from the hub.
+	 * But don't get rid of a post that may have just come in
+	 * and may not yet have the parent id set.
+	 */
 	q("DELETE FROM `item` WHERE `parent` = 0 AND `created` < UTC_TIMESTAMP() - INTERVAL 2 MINUTE");
 
 }

From db1c2e40416ac1add2e9d10de4c87c4c5a3d8bf2 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 23 Mar 2017 23:37:58 +0100
Subject: [PATCH 040/120] fixed comment and explained one

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 include/dfrn.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/include/dfrn.php b/include/dfrn.php
index 34cd33c339..9413b4d3af 100644
--- a/include/dfrn.php
+++ b/include/dfrn.php
@@ -1637,7 +1637,13 @@ class dfrn {
 				intval($fid)
 			);
 
-			/// @TODO Really abort on valid result??? Maybe missed ! here?
+			/*
+			 * The valid result means the friend we're about to send a friend
+			 * suggestion already has them in their contact, which means no further
+			 * action is required.
+			 *
+			 * @see https://github.com/friendica/friendica/pull/3254#discussion_r107315246
+			 */
 			if (dbm::is_result($r)) {
 				return false;
 			}
@@ -1656,7 +1662,10 @@ class dfrn {
 			dbesc($suggest["request"])
 		);
 
-		// This way a useless else-block is being spared, resulting in easier code.
+		/*
+		 * If no record in fcontact is found, below INSERT statement will not
+		 * link an introduction to it.
+		 */
 		if (!dbm::is_result($r)) {
 			// database record did not get created. Quietly give up.
 			killme();

From 87bf6d39dd284b97a3e2ac4a3af4a19fced141a4 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Thu, 23 Mar 2017 22:45:40 -0400
Subject: [PATCH 041/120] More display fixes

See
https://github.com/friendica/friendica/pull/3204#issuecomment-288908490
---
 view/theme/frio/css/style.css              | 48 +++++++++++++---------
 view/theme/frio/templates/comment_item.tpl | 14 +++----
 view/theme/frio/templates/event_form.tpl   |  2 +-
 view/theme/frio/templates/jot.tpl          | 12 +++---
 view/theme/frio/templates/prv_message.tpl  | 14 +++----
 5 files changed, 49 insertions(+), 41 deletions(-)

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index 3762e14945..45243a3b01 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -51,13 +51,14 @@ body a[name]:not([href]) {
     visibility: hidden;
 }
 
-body a:hover, body .btn-link:hover,
-body a:focus, body .btn-link:focus,
-body a:active, body .btn-link:active,
-body a.active, body .btn-link.active {
+body a:hover, .btn-link:hover,
+body a:focus, .btn-link:focus,
+body a:active, .btn-link:active,
+body a.active, .btn-link.active {
     /*color: #59d6e4;*/
     color: $link_hover_color;
     text-decoration: none;
+    outline: none;
 }
 
 .wall-item-container a:hover {
@@ -206,6 +207,8 @@ a#item-delete-selected {
 .btn-link {
     border: 0;
     color: $link_color;
+    padding-left: 0;
+    padding-right: 0;
 }
 .btn-link:focus, .btn-link:hover {
     color: #23527c;
@@ -404,7 +407,8 @@ header #banner #logo-img,
     top: 2px;
     right: 10px
 }
-.topbar .dropdown-header .dropdown-header-link a {
+.topbar .dropdown-header .dropdown-header-link a,
+.topbar .dropdown-header .dropdown-header-link .btn-link {
     /*color: #6fdbe8!important;*/
     color: $link_color !important;
     font-size: 12px;
@@ -652,10 +656,10 @@ nav.navbar a, nav.navbar .btn-link {
 #myNavmenu li.nav-sitename {
     font-weight: bold;
 }
-#topbar-first .dropdown.account>a,
-#topbar-first .dropdown.account.open>a,
-#topbar-first .dropdown.account>a:hover,
-#topbar-first .dropdown.account.open>a:hover {
+#topbar-first .dropdown.account > a,
+#topbar-first .dropdown.account.open > a,
+#topbar-first .dropdown.account > :hover,
+#topbar-first .dropdown.account.open > :hover {
     background-color: $nav_bg;
 }
 #topbar-first .dropdown.account li#nav-sitename {
@@ -823,14 +827,19 @@ nav.navbar a, nav.navbar .btn-link {
 }
 
 /* Dropdown Menus */
-.nav > li > .btn-link:not(.nav-avatar):focus,
-.nav > li > .btn-link:not(.nav-avatar):hover {
+.nav > li > .btn-link {
+    position: relative;
+    display: block;
+    padding: 10px 15px;
+}
+.nav > li > .btn-link:focus,
+.nav > li > .btn-link:hover {
     text-decoration: none;
     background-color: #eee;
 }
-.nav .open > .btn-link:not(.nav-avatar),
-.nav .open > .btn-link:not(.nav-avatar):focus,
-.nav .open > .btn-link:not(.nav-avatar):hover {
+.nav .open > .btn-link,
+.nav .open > .btn-link:focus,
+.nav .open > .btn-link:hover {
     background-color: #eee;
     border-color: #337ab7;
 }
@@ -1562,18 +1571,17 @@ code > .hl-main {
 }
 
 /* item social action buttons */
+.wall-item-actions {
+    margin-top: 15px;
+}
 .wall-item-actions, .wall-item-actions a, .wall-item-actions button {
     font-size: 13px;
     color: #555;
-    margin-top: 15px;
     margin-bottom: 0;
 }
 .wall-item-actions .active {
     font-weight: bold;
 }
-.wall-item-actions :hover {
-    color: #555;
-}
 .wall-item-actions .active:hover {
     color: $link_color;
 }
@@ -1682,8 +1690,8 @@ code > .hl-main {
     padding-top: 5px !important;
     padding-bottom: 5px !important;
 }
-.comment-icon-list .icon,
-.comment-icon-list .icon:hover {
+.comment-icon-list > li > .icon,
+.comment-icon-list > li > .icon:hover {
     color: #555;
     background-color: transparent;
 }
diff --git a/view/theme/frio/templates/comment_item.tpl b/view/theme/frio/templates/comment_item.tpl
index e4ff8c03de..8ce7805bbd 100644
--- a/view/theme/frio/templates/comment_item.tpl
+++ b/view/theme/frio/templates/comment_item.tpl
@@ -33,38 +33,38 @@
 			{{/if}}
 			<ul class="comment-edit-bb-{{$id}} comment-icon-list nav nav-pills pull-right">
 				<li>
-					<button type="button" class="btn btn-link icon" style="cursor: pointer;" title="{{$edimg}}" data-role="insert-formatting" data-bbcode="img" data-id="{{$id}}">
+					<button type="button" class="btn-link icon" style="cursor: pointer;" title="{{$edimg}}" data-role="insert-formatting" data-bbcode="img" data-id="{{$id}}">
 						<i class="fa fa-picture-o"></i>
 					</button>
 				</li>
 				<li>
-					<button type="button" class="btn btn-link icon bb-url" style="cursor: pointer;" title="{{$edurl}}" onclick="insertFormatting('url',{{$id}});">
+					<button type="button" class="btn-link icon bb-url" style="cursor: pointer;" title="{{$edurl}}" onclick="insertFormatting('url',{{$id}});">
 						<i class="fa fa-link"></i>
 					</button>
 				</li>
 				<li>
-					<button type="button" class="btn btn-link icon bb-video" style="cursor: pointer;" title="{{$edvideo}}" onclick="insertFormatting('video',{{$id}});">
+					<button type="button" class="btn-link icon bb-video" style="cursor: pointer;" title="{{$edvideo}}" onclick="insertFormatting('video',{{$id}});">
 						<i class="fa fa-video-camera"></i>
 					</button>
 				</li>
 
 				<li>
-					<button type="button" class="btn btn-link icon underline" style="cursor: pointer;" title="{{$eduline}}" onclick="insertFormatting('u',{{$id}});">
+					<button type="button" class="btn-link icon underline" style="cursor: pointer;" title="{{$eduline}}" onclick="insertFormatting('u',{{$id}});">
 						<i class="fa fa-underline"></i>
 					</button>
 				</li>
 				<li>
-					<button type="button" class="btn btn-link icon italic" style="cursor: pointer;" title="{{$editalic}}" onclick="insertFormatting('i',{{$id}});">
+					<button type="button" class="btn-link icon italic" style="cursor: pointer;" title="{{$editalic}}" onclick="insertFormatting('i',{{$id}});">
 						<i class="fa fa-italic"></i>
 					</button>
 				</li>
 				<li>
-					<button type="button" class="btn btn-link icon bold" style="cursor: pointer;"  title="{{$edbold}}" onclick="insertFormatting('b',{{$id}});">
+					<button type="button" class="btn-link icon bold" style="cursor: pointer;"  title="{{$edbold}}" onclick="insertFormatting('b',{{$id}});">
 						<i class="fa fa-bold"></i>
 					</button>
 				</li>
 				<li>
-					<button type="button" class="btn btn-link icon quote" style="cursor: pointer;" title="{{$edquote}}" onclick="insertFormatting('quote',{{$id}});">
+					<button type="button" class="btn-link icon quote" style="cursor: pointer;" title="{{$edquote}}" onclick="insertFormatting('quote',{{$id}});">
 						<i class="fa fa-quote-left"></i>
 					</button>
 				</li>
diff --git a/view/theme/frio/templates/event_form.tpl b/view/theme/frio/templates/event_form.tpl
index d4b455b234..c34fadc8ad 100644
--- a/view/theme/frio/templates/event_form.tpl
+++ b/view/theme/frio/templates/event_form.tpl
@@ -78,7 +78,7 @@
 				<ul id="event-desc-text-edit-bb" class="comment-edit-bb comment-icon-list nav nav-pills hidden-xs pull-left">
 					{{* commented out because it isn't implemented yet
 					<li>
-						<button type="button" class="btn btn-link icon" style="cursor: pointer;" title="{{$edimg|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="desc">
+						<button type="button" class="btn-link icon" style="cursor: pointer;" title="{{$edimg|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="desc">
 							<i class="fa fa-picture-o"></i>
 						</button>
 					</li>
diff --git a/view/theme/frio/templates/jot.tpl b/view/theme/frio/templates/jot.tpl
index 28cf173a5d..71fdae7cd3 100644
--- a/view/theme/frio/templates/jot.tpl
+++ b/view/theme/frio/templates/jot.tpl
@@ -91,13 +91,13 @@
 						{{* uncomment the button for "wall-immage-upload" because we have integrated it directly in the jot modal
 						<li><a href="#" id="wall-image-upload" title="{{$upload}}"><i class="fa fa-picture-o"></i></a></li>
 						*}}
-						<li><button type="button" class="btn btn-link" id="wall-file-upload" title="{{$attach}}"><i class="fa fa-paperclip"></i></button></li>
-						<li><button type="button" class="btn btn-link" id="profile-link"  ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink();" title="{{$weblink}}"><i class="fa fa-link"></i></button></li>
-						<li><button type="button" class="btn btn-link" id="profile-video" onclick="jotVideoURL();" title="{{$video}}"><i class="fa fa-film"></i></button></li>
-						<li><button type="button" class="btn btn-link" id="profile-audio" onclick="jotAudioURL();" title="{{$audio}}"><i class="fa fa-music"></i></button></li>
-						<li><button type="button" class="btn btn-link" id="profile-location" onclick="jotGetLocation();" title="{{$setloc}}"><i class="fa fa-map-marker"></i></button></li>
+						<li><button type="button" class="btn-link" id="wall-file-upload" title="{{$attach}}"><i class="fa fa-paperclip"></i></button></li>
+						<li><button type="button" class="btn-link" id="profile-link"  ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink();" title="{{$weblink}}"><i class="fa fa-link"></i></button></li>
+						<li><button type="button" class="btn-link" id="profile-video" onclick="jotVideoURL();" title="{{$video}}"><i class="fa fa-film"></i></button></li>
+						<li><button type="button" class="btn-link" id="profile-audio" onclick="jotAudioURL();" title="{{$audio}}"><i class="fa fa-music"></i></button></li>
+						<li><button type="button" class="btn-link" id="profile-location" onclick="jotGetLocation();" title="{{$setloc}}"><i class="fa fa-map-marker"></i></button></li>
 						<!-- TODO: waiting for a better placement
-						<li><button type="button" class="btn btn-link" id="profile-nolocation" onclick="jotClearLocation();" title="{{$noloc}}">{{$shortnoloc}}</button></li>
+						<li><button type="button" class="btn-link" id="profile-nolocation" onclick="jotClearLocation();" title="{{$noloc}}">{{$shortnoloc}}</button></li>
 						-->
 
 						<li class="pull-right"><button class="btn btn-primary" id="jot-submit" type="submit" id="profile-jot-submit" name="submit" ><i class="fa fa-slideshare fa-fw"></i> {{$share}}</button></li>
diff --git a/view/theme/frio/templates/prv_message.tpl b/view/theme/frio/templates/prv_message.tpl
index 436a453c4b..4079bb3926 100644
--- a/view/theme/frio/templates/prv_message.tpl
+++ b/view/theme/frio/templates/prv_message.tpl
@@ -33,38 +33,38 @@
 
 	<ul id="prvmail-text-edit-bb" class="comment-edit-bb comment-icon-list nav nav-pills hidden-xs pull-left">
 				<li>
-					<button type="button" class="btn btn-link icon" style="cursor: pointer;" title="{{$edimg|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="input">
+					<button type="button" class="btn-link icon" style="cursor: pointer;" title="{{$edimg|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="input">
 						<i class="fa fa-picture-o"></i>
 					</button>
 				</li>
 				<li>
-					<button type="button" class="btn btn-link icon bb-url" style="cursor: pointer;" title="{{$edurl|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="url" data-id="input">
+					<button type="button" class="btn-link icon bb-url" style="cursor: pointer;" title="{{$edurl|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="url" data-id="input">
 						<i class="fa fa-link"></i>
 					</button>
 				</li>
 				<li>
-					<button type="button" class="btn btn-link icon bb-video" style="cursor: pointer;" title="{{$edvideo|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="video" data-id="input">
+					<button type="button" class="btn-link icon bb-video" style="cursor: pointer;" title="{{$edvideo|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="video" data-id="input">
 						<i class="fa fa-video-camera"></i>
 					</button>
 				</li>
 
 				<li>
-					<button type="button" class="btn btn-link icon underline" style="cursor: pointer;" title="{{$eduline|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="u" data-id="input">
+					<button type="button" class="btn-link icon underline" style="cursor: pointer;" title="{{$eduline|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="u" data-id="input">
 						<i class="fa fa-underline"></i>
 					</button>
 				</li>
 				<li>
-					<button type="button" class="btn btn-link icon italic" style="cursor: pointer;" title="{{$editalic|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="i" data-id="input">
+					<button type="button" class="btn-link icon italic" style="cursor: pointer;" title="{{$editalic|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="i" data-id="input">
 						<i class="fa fa-italic"></i>
 					</button>
 				</li>
 				<li>
-					<button type="button" class="btn btn-link icon bold" style="cursor: pointer;"  title="{{$edbold|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="b" data-id="input">
+					<button type="button" class="btn-link icon bold" style="cursor: pointer;"  title="{{$edbold|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="b" data-id="input">
 						<i class="fa fa-bold"></i>
 					</button>
 				</li>
 				<li>
-					<button type="button" class="btn btn-link icon quote" style="cursor: pointer;" title="{{$edquote|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="quote" data-id="input">
+					<button type="button" class="btn-link icon quote" style="cursor: pointer;" title="{{$edquote|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="quote" data-id="input">
 						<i class="fa fa-quote-left"></i>
 					</button>
 				</li>

From 85144908fa9cf12594b568f4f0b2d37fa21b6be1 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Thu, 23 Mar 2017 22:47:56 -0400
Subject: [PATCH 042/120] Improve display feedback on like actions

- Move rotator in sight
- Preventively change display class before next item update
---
 view/theme/frio/js/theme.js               | 21 +++++++++++++++++++++
 view/theme/frio/templates/search_item.tpl | 14 +++++++-------
 view/theme/frio/templates/wall_thread.tpl | 16 ++++++++--------
 3 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/view/theme/frio/js/theme.js b/view/theme/frio/js/theme.js
index 62cd85df9b..4e8ede07fd 100644
--- a/view/theme/frio/js/theme.js
+++ b/view/theme/frio/js/theme.js
@@ -617,3 +617,24 @@ function htmlToText(htmlString) {
 
 	return text;
 }
+
+/**
+ * Sends a /like API call and updates the display of the relevant action button
+ * before the update reloads the item.
+ *
+ * @param {string} ident The id of the relevant item
+ * @param {string} verb The verb of the action
+ * @returns {undefined}
+ */
+function doLikeAction(ident, verb) {
+	unpause();
+
+	if (verb.indexOf('attend') === 0) {
+		$('.item-' + ident + ' .button-event:not(#' + verb + '-' + ident + ')').removeClass('active');
+	}
+	$('#' + verb + '-' + ident).toggleClass('active');
+	$('#like-rotator-' + ident.toString()).show();
+	$.get('like/' + ident.toString() + '?verb=' + verb, NavUpdate );
+	liking = 1;
+	force_update = true;
+}
\ No newline at end of file
diff --git a/view/theme/frio/templates/search_item.tpl b/view/theme/frio/templates/search_item.tpl
index 51a9017c2b..095b38968b 100644
--- a/view/theme/frio/templates/search_item.tpl
+++ b/view/theme/frio/templates/search_item.tpl
@@ -2,12 +2,11 @@
 <div class="wall-item-decor" style="display:none;">
 	<span class="icon s22 star {{$item.isstarred}}" id="starred-{{$item.id}}" title="{{$item.star.starred}}">{{$item.star.starred}}</span>
 	{{if $item.lock}}<span class="navicon lock fakelink" onclick="lockview(event, {{$item.id}});" title="{{$item.lock}}"></span><span class="fa fa-lock"></span>{{/if}}
-	<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
 </div>
 <!-- ./TODO => Unknow block -->
 
 
-<div class="panel" id="item-{{$item.guid}}">
+<div class="panel item-{{$item.id}}" id="item-{{$item.guid}}">
 	<div class="wall-item-container panel-body{{$item.indent}} {{$item.shiny}} {{$item.previewing}}" >
 		<div class="media">
 			{{* Put additional actions in a top-right dropdown menu *}}
@@ -170,11 +169,11 @@
 					{{* Buttons for like and dislike *}}
 					{{if $item.vote}}
 						{{if $item.vote.like}}
-						<button type="button" class="btn btn-defaultbutton-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}}, 'like');">{{$item.vote.like.0}}</button>
+						<button type="button" class="btn btn-defaultbutton-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="doLikeAction({{$item.id}}, 'like');">{{$item.vote.like.0}}</button>
 						{{/if}}
 
 						{{if $item.vote.dislike}}
-						<button type="button" class="btn btn-defaultbutton-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}}, 'dislike');">{{$item.vote.dislike.0}}</button>
+						<button type="button" class="btn btn-defaultbutton-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="doLikeAction({{$item.id}}, 'dislike');">{{$item.vote.dislike.0}}</button>
 						{{/if}}
 					{{/if}}
 
@@ -189,6 +188,7 @@
 						<button type="button" class="btn btn-default" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}});"><i class="fa fa-retweet"></i>&nbsp;{{$item.vote.share.0}}</button>
 						{{/if}}
 					{{/if}}
+                    <img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
 				</div>
 
 
@@ -196,9 +196,9 @@
 					{{* Event attendance buttons *}}
 					{{if $item.isevent}}
 					<div class="vote-event">
-						<button type="button" class="btn btn-defaultbutton-event{{if $item.responses.attendyes.self}} active" aria-pressed="true{{/if}}" id="attendyes-{{$item.id}}" title="{{$item.attend.0}}" onclick="dolike({{$item.id}}, 'attendyes');"><i class="fa fa-check"><span class="sr-only">{{$item.attend.0}}</span></i></button>
-						<button type="button" class="btn btn-defaultbutton-event{{if $item.responses.attendno.self}} active" aria-pressed="true{{/if}}" id="attendno-{{$item.id}}" title="{{$item.attend.1}}" onclick="dolike({{$item.id}}, 'attendno');"><i class="fa fa-times"><span class="sr-only">{{$item.attend.1}}</span></i></button>
-						<button type="button" class="btn btn-defaultbutton-event{{if $item.responses.attendmaybe.self}} active" aria-pressed="true{{/if}}" id="attendmaybe-{{$item.id}}" title="{{$item.attend.2}}" onclick="dolike({{$item.id}}, 'attendmaybe');"><i class="fa fa-question"><span class="sr-only">{{$item.attend.2}}</span></i></button>
+						<button type="button" class="btn btn-defaultbutton-event{{if $item.responses.attendyes.self}} active" aria-pressed="true{{/if}}" id="attendyes-{{$item.id}}" title="{{$item.attend.0}}" onclick="doLikeAction({{$item.id}}, 'attendyes');"><i class="fa fa-check"><span class="sr-only">{{$item.attend.0}}</span></i></button>
+						<button type="button" class="btn btn-defaultbutton-event{{if $item.responses.attendno.self}} active" aria-pressed="true{{/if}}" id="attendno-{{$item.id}}" title="{{$item.attend.1}}" onclick="doLikeAction({{$item.id}}, 'attendno');"><i class="fa fa-times"><span class="sr-only">{{$item.attend.1}}</span></i></button>
+						<button type="button" class="btn btn-defaultbutton-event{{if $item.responses.attendmaybe.self}} active" aria-pressed="true{{/if}}" id="attendmaybe-{{$item.id}}" title="{{$item.attend.2}}" onclick="doLikeAction({{$item.id}}, 'attendmaybe');"><i class="fa fa-question"><span class="sr-only">{{$item.attend.2}}</span></i></button>
 					</div>
 					{{/if}}
 
diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl
index f276ee6f06..08057a1a95 100644
--- a/view/theme/frio/templates/wall_thread.tpl
+++ b/view/theme/frio/templates/wall_thread.tpl
@@ -68,9 +68,9 @@ as the value of $top_child_total (this is done at the end of this file)
 
 {{* Use a different div container in dependence max thread-level = 7 *}}
 {{if $item.thread_level<7}}
-<div class="wall-item-container {{$item.indent}} {{$item.shiny}} {{$item.network}} thread_level_{{$item.thread_level}} {{if $item.thread_level==1}}panel-body h-entry{{else}}u-comment h-cite{{/if}}" id="item-{{$item.guid}}"><!-- wall-item-container -->
+<div class="item-{{$item.id}} wall-item-container {{$item.indent}} {{$item.shiny}} {{$item.network}} thread_level_{{$item.thread_level}} {{if $item.thread_level==1}}panel-body h-entry{{else}}u-comment h-cite{{/if}}" id="item-{{$item.guid}}"><!-- wall-item-container -->
 {{else}}
-<div class="wall-item-container {{$item.indent}} {{$item.shiny}} {{$item.network}} thread_level_7 u-comment h-cite" id="item-{{$item.guid}}">
+<div class="item-{{$item.id}} wall-item-container {{$item.indent}} {{$item.shiny}} {{$item.network}} thread_level_7 u-comment h-cite" id="item-{{$item.guid}}">
  {{/if}}
 	<div class="media">
 		{{* Put addional actions in a top-right dropdown menu *}}
@@ -192,7 +192,6 @@ as the value of $top_child_total (this is done at the end of this file)
 			<div class="additional-info text-muted">
 				<div id="wall-item-ago-{{$item.id}}" class="wall-item-ago">
 					<small><a href="{{$item.plink.orig}}"><span class="time" title="{{$item.localtime}}" data-toggle="tooltip"><time class="dt-published" datetime="{{$item.localtime}}">{{$item.ago}}</time></span></a></small>
-					<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
 				</div>
 
 				{{if $item.location}}
@@ -287,13 +286,13 @@ as the value of $top_child_total (this is done at the end of this file)
 				{{* Buttons for like and dislike *}}
 				{{if $item.vote}}
 					{{if $item.vote.like}}
-					<button type="button" class="btn-link button-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like');" data-toggle="button"><i class="fa fa-thumbs-up"></i>&nbsp;{{$item.vote.like.1}}</button>
+					<button type="button" class="btn-link button-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="doLikeAction({{$item.id}},'like');" data-toggle="button"><i class="fa fa-thumbs-up"></i>&nbsp;{{$item.vote.like.1}}</button>
 					{{/if}}
 					{{if $item.vote.like AND $item.vote.dislike}}
 					<span role="presentation" class="separator">•</span>
 					{{/if}}
 					{{if $item.vote.dislike}}
-					<button type="button" class="btn-link button-likes{{if $item.responses.dislike.self}} active" aria-pressed="true{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike');" data-toggle="button"><i class="fa fa-thumbs-down"></i>&nbsp;{{$item.vote.dislike.1}}</button>
+					<button type="button" class="btn-link button-likes{{if $item.responses.dislike.self}} active" aria-pressed="true{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="doLikeAction({{$item.id}},'dislike');" data-toggle="button"><i class="fa fa-thumbs-down"></i>&nbsp;{{$item.vote.dislike.1}}</button>
 					{{/if}}
 
 					{{if ($item.vote.like OR $item.vote.dislike) AND $item.comment}}
@@ -315,15 +314,16 @@ as the value of $top_child_total (this is done at the end of this file)
 					<button type="button" class="btn-link button-votes" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}});"><i class="fa fa-retweet"></i>&nbsp;{{$item.vote.share.1}}</a>
 					{{/if}}
 				{{/if}}
+                <img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
 			</div>
 
 			<div class="wall-item-actions-right pull-right">
 				{{* Event attendance buttons *}}
 				{{if $item.isevent}}
 				<div class="vote-event">
-					<button type="button" class="btn btn-xs btn-default button-event{{if $item.responses.attendyes.self}} active" aria-pressed="true{{/if}}" id="attendyes-{{$item.id}}" title="{{$item.attend.0}}" onclick="dolike({{$item.id}},'attendyes');"><i class="fa fa-check"><span class="sr-only">{{$item.attend.0}}</span></i></button>
-					<button type="button" class="btn btn-xs btn-default button-event{{if $item.responses.attendno.self}} active" aria-pressed="true{{/if}}" id="attendno-{{$item.id}}" title="{{$item.attend.1}}" onclick="dolike({{$item.id}},'attendno');"><i class="fa fa-times"><span class="sr-only">{{$item.attend.1}}</span></i></button>
-					<button type="button" class="btn btn-xs btn-default button-event{{if $item.responses.attendmaybe.self}} active" aria-pressed="true{{/if}}" id="attendmaybe-{{$item.id}}" title="{{$item.attend.2}}" onclick="dolike({{$item.id}},'attendmaybe');"><i class="fa fa-question"><span class="sr-only">{{$item.attend.2}}</span></i></button>
+					<button type="button" class="btn btn-xs btn-default button-event{{if $item.responses.attendyes.self}} active" aria-pressed="true{{/if}}" id="attendyes-{{$item.id}}" title="{{$item.attend.0}}" onclick="doLikeAction({{$item.id}},'attendyes');"><i class="fa fa-check"><span class="sr-only">{{$item.attend.0}}</span></i></button>
+					<button type="button" class="btn btn-xs btn-default button-event{{if $item.responses.attendno.self}} active" aria-pressed="true{{/if}}" id="attendno-{{$item.id}}" title="{{$item.attend.1}}" onclick="doLikeAction({{$item.id}},'attendno');"><i class="fa fa-times"><span class="sr-only">{{$item.attend.1}}</span></i></button>
+					<button type="button" class="btn btn-xs btn-default button-event{{if $item.responses.attendmaybe.self}} active" aria-pressed="true{{/if}}" id="attendmaybe-{{$item.id}}" title="{{$item.attend.2}}" onclick="doLikeAction({{$item.id}},'attendmaybe');"><i class="fa fa-question"><span class="sr-only">{{$item.attend.2}}</span></i></button>
 				</div>
 				{{/if}}
 

From d45e79dfe95c150d6846ecbdca271bd5577cefc5 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Fri, 24 Mar 2017 20:39:00 +0100
Subject: [PATCH 043/120] Continued: - converted multiple single-line comments
 into one multi-line comment (please   stop abusing programming languages!) -
 added more TODO tags for type-hints (upcoming rewrite) - opps, one space was
 only fixed in develop branch, not in this PR branch

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 include/dfrn.php | 111 +++++++++++++++++++++++++++--------------------
 1 file changed, 64 insertions(+), 47 deletions(-)

diff --git a/include/dfrn.php b/include/dfrn.php
index 9413b4d3af..887dba9a11 100644
--- a/include/dfrn.php
+++ b/include/dfrn.php
@@ -967,8 +967,8 @@ class dfrn {
 		$rino = intval($rino);
 
 		// use RINO1 if mcrypt isn't installed and RINO2 was selected
-		if ($rino==2 and !function_exists('mcrypt_create_iv')) {
-			$rino=1;
+		if ($rino == 2 and !function_exists('mcrypt_create_iv')) {
+			$rino = 1;
 		}
 
 		logger("Local rino version: ". $rino, LOGGER_DEBUG);
@@ -976,7 +976,7 @@ class dfrn {
 		$ssl_val = intval(get_config('system','ssl_policy'));
 		$ssl_policy = '';
 
-		switch($ssl_val){
+		switch ($ssl_val) {
 			case SSL_POLICY_FULL:
 				$ssl_policy = 'full';
 				break;
@@ -1095,13 +1095,13 @@ class dfrn {
 		}
 
 
-		if ($rino>0 && $rino_remote_version>0 && (! $dissolve)) {
+		if ($rino > 0 && $rino_remote_version > 0 && (! $dissolve)) {
 			logger('rino version: '. $rino_remote_version);
 
-			switch($rino_remote_version) {
+			switch ($rino_remote_version) {
 				case 1:
 					// Deprecated rino version!
-					$key = substr(random_string(),0,16);
+					$key = substr(random_string(), 0, 16);
 					$data = aes_encrypt($postvars['data'],$key);
 					break;
 				case 2:
@@ -1298,19 +1298,19 @@ class dfrn {
 		}
 
 		if (dbm::is_result($r) AND !$onlyfetch) {
-			logger("Check if contact details for contact ".$r[0]["id"]." (".$r[0]["nick"].") have to be updated.", LOGGER_DEBUG);
+			logger("Check if contact details for contact " . $r[0]["id"] . " (" . $r[0]["nick"] . ") have to be updated.", LOGGER_DEBUG);
 
 			$poco = array("url" => $contact["url"]);
 
 			// When was the last change to name or uri?
-			$name_element = $xpath->query($element."/atom:name", $context)->item(0);
+			$name_element = $xpath->query($element . "/atom:name", $context)->item(0);
 			foreach ($name_element->attributes AS $attributes) {
 				if ($attributes->name == "updated") {
 					$poco["name-date"] = $attributes->textContent;
 				}
 			}
 
-			$link_element = $xpath->query($element."/atom:link", $context)->item(0);
+			$link_element = $xpath->query($element . "/atom:link", $context)->item(0);
 			foreach ($link_element->attributes AS $attributes) {
 				if ($attributes->name == "updated") {
 					$poco["uri-date"] = $attributes->textContent;
@@ -1318,33 +1318,33 @@ class dfrn {
 			}
 
 			// Update contact data
-			$value = $xpath->evaluate($element."/dfrn:handle/text()", $context)->item(0)->nodeValue;
+			$value = $xpath->evaluate($element . "/dfrn:handle/text()", $context)->item(0)->nodeValue;
 			if ($value != "") {
 				$poco["addr"] = $value;
 			}
 
-			$value = $xpath->evaluate($element."/poco:displayName/text()", $context)->item(0)->nodeValue;
+			$value = $xpath->evaluate($element . "/poco:displayName/text()", $context)->item(0)->nodeValue;
 			if ($value != "") {
 				$poco["name"] = $value;
 			}
 
-			$value = $xpath->evaluate($element."/poco:preferredUsername/text()", $context)->item(0)->nodeValue;
+			$value = $xpath->evaluate($element . "/poco:preferredUsername/text()", $context)->item(0)->nodeValue;
 			if ($value != "") {
 				$poco["nick"] = $value;
 			}
 
-			$value = $xpath->evaluate($element."/poco:note/text()", $context)->item(0)->nodeValue;
+			$value = $xpath->evaluate($element . "/poco:note/text()", $context)->item(0)->nodeValue;
 			if ($value != "") {
 				$poco["about"] = $value;
 			}
 
-			$value = $xpath->evaluate($element."/poco:address/poco:formatted/text()", $context)->item(0)->nodeValue;
+			$value = $xpath->evaluate($element . "/poco:address/poco:formatted/text()", $context)->item(0)->nodeValue;
 			if ($value != "") {
 				$poco["location"] = $value;
 			}
 
 			/// @todo Only search for elements with "poco:type" = "xmpp"
-			$value = $xpath->evaluate($element."/poco:ims/poco:value/text()", $context)->item(0)->nodeValue;
+			$value = $xpath->evaluate($element . "/poco:ims/poco:value/text()", $context)->item(0)->nodeValue;
 			if ($value != "") {
 				$poco["xmpp"] = $value;
 			}
@@ -1357,9 +1357,9 @@ class dfrn {
 			/// - poco:country
 
 			// If the "hide" element is present then the profile isn't searchable.
-			$hide = intval($xpath->evaluate($element."/dfrn:hide/text()", $context)->item(0)->nodeValue == "true");
+			$hide = intval($xpath->evaluate($element . "/dfrn:hide/text()", $context)->item(0)->nodeValue == "true");
 
-			logger("Hidden status for contact ".$contact["url"].": ".$hide, LOGGER_DEBUG);
+			logger("Hidden status for contact " . $contact["url"] . ": " . $hide, LOGGER_DEBUG);
 
 			// If the contact isn't searchable then set the contact to "hidden".
 			// Problem: This can be manually overridden by the user.
@@ -1369,7 +1369,7 @@ class dfrn {
 
 			// Save the keywords into the contact table
 			$tags = array();
-			$tagelements = $xpath->evaluate($element."/poco:tags/text()", $context);
+			$tagelements = $xpath->evaluate($element . "/poco:tags/text()", $context);
 			foreach ($tagelements AS $tag) {
 				$tags[$tag->nodeValue] = $tag->nodeValue;
 			}
@@ -1381,7 +1381,7 @@ class dfrn {
 			// "dfrn:birthday" contains the birthday converted to UTC
 			$old_bdyear = $contact["bdyear"];
 
-			$birthday = $xpath->evaluate($element."/dfrn:birthday/text()", $context)->item(0)->nodeValue;
+			$birthday = $xpath->evaluate($element . "/dfrn:birthday/text()", $context)->item(0)->nodeValue;
 
 			if (strtotime($birthday) > time()) {
 				$bd_timestamp = strtotime($birthday);
@@ -1390,7 +1390,7 @@ class dfrn {
 			}
 
 			// "poco:birthday" is the birthday in the format "yyyy-mm-dd"
-			$value = $xpath->evaluate($element."/poco:birthday/text()", $context)->item(0)->nodeValue;
+			$value = $xpath->evaluate($element . "/poco:birthday/text()", $context)->item(0)->nodeValue;
 
 			if (!in_array($value, array("", "0000-00-00"))) {
 				$bdyear = date("Y");
@@ -1427,20 +1427,20 @@ class dfrn {
 			$datefields = array("name-date", "uri-date");
 			foreach ($datefields AS $field) {
 				if (strtotime($contact[$field]) > strtotime($r[0][$field])) {
-					logger("Difference for contact ".$contact["id"]." in field '".$field."'. New value: '".$contact[$field]."', old value '".$r[0][$field]."'", LOGGER_DEBUG);
+					logger("Difference for contact " . $contact["id"] . " in field '" . $field . "'. New value: '" . $contact[$field] . "', old value '" . $r[0][$field] . "'", LOGGER_DEBUG);
 					$update = true;
 				}
 			}
 
 			foreach ($fields AS $field => $data) {
 				if ($contact[$field] != $r[0][$field]) {
-					logger("Difference for contact ".$contact["id"]." in field '".$field."'. New value: '".$contact[$field]."', old value '".$r[0][$field]."'", LOGGER_DEBUG);
+					logger("Difference for contact " . $contact["id"] . " in field '" . $field . "'. New value: '" . $contact[$field] . "', old value '" . $r[0][$field] . "'", LOGGER_DEBUG);
 					$update = true;
 				}
 			}
 
 			if ($update) {
-				logger("Update contact data for contact ".$contact["id"]." (".$contact["nick"].")", LOGGER_DEBUG);
+				logger("Update contact data for contact " . $contact["id"] . " (" . $contact["nick"] . ")", LOGGER_DEBUG);
 
 				q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `about` = '%s', `location` = '%s',
 					`addr` = '%s', `keywords` = '%s', `bdyear` = '%s', `bd` = '%s', `hidden` = %d,
@@ -1456,10 +1456,12 @@ class dfrn {
 			update_contact_avatar($author["avatar"], $importer["uid"], $contact["id"],
 						(strtotime($contact["avatar-date"]) > strtotime($r[0]["avatar-date"])));
 
-			// The generation is a sign for the reliability of the provided data.
-			// It is used in the socgraph.php to prevent that old contact data
-			// that was relayed over several servers can overwrite contact
-			// data that we received directly.
+			/*
+			 * The generation is a sign for the reliability of the provided data.
+			 * It is used in the socgraph.php to prevent that old contact data
+			 * that was relayed over several servers can overwrite contact
+			 * data that we received directly.
+			 */
 
 			$poco["generation"] = 2;
 			$poco["photo"] = $author["avatar"];
@@ -1811,6 +1813,7 @@ class dfrn {
 
 		update_contact_avatar($relocate["avatar"], $importer["importer_uid"], $importer["id"], true);
 
+		/// @TODO decide to use dbm::is_result() here
 		if ($x === false) {
 			return false;
 		}
@@ -1822,7 +1825,7 @@ class dfrn {
 			'author-link' => array($old["url"], $relocate["url"]),
 			//'owner-avatar' => array($old["photo"], $relocate["photo"]),
 			//'author-avatar' => array($old["photo"], $relocate["photo"]),
-			);
+		);
 		foreach ($fields as $n=>$f) {
 			$r = q("SELECT `id` FROM `item` WHERE `%s` = '%s' AND `uid` = %d LIMIT 1",
 					$n, dbesc($f[0]),
@@ -1833,8 +1836,11 @@ class dfrn {
 						$n, dbesc($f[1]),
 						$n, dbesc($f[0]),
 						intval($importer["importer_uid"]));
-					if ($x === false)
+
+					/// @TODO decide to use dbm::is_result() here
+					if ($x === false) {
 						return false;
+					}
 			}
 		}
 
@@ -1853,6 +1859,7 @@ class dfrn {
 	 * @param array $item the new item record
 	 * @param array $importer Record of the importer user mixed with contact of the content
 	 * @param int $entrytype Is it a toplevel entry, a comment or a relayed comment?
+	 * @todo set proper type-hints (array?)
 	 */
 	private static function update_content($current, $item, $importer, $entrytype) {
 		$changed = false;
@@ -1860,8 +1867,9 @@ class dfrn {
 		if (edited_timestamp_is_newer($current, $item)) {
 
 			// do not accept (ignore) an earlier edit than one we currently have.
-			if(datetime_convert("UTC","UTC",$item["edited"]) < $current["edited"])
+			if (datetime_convert("UTC","UTC",$item["edited"]) < $current["edited"]) {
 				return(false);
+			}
 
 			$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s', `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d",
 				dbesc($item["title"]),
@@ -1906,12 +1914,13 @@ class dfrn {
 	 * @param array $item the new item record
 	 *
 	 * @return int Is it a toplevel entry, a comment or a relayed comment?
+	 * @todo set proper type-hints (array?)
 	 */
 	private static function get_entry_type($importer, $item) {
 		if ($item["parent-uri"] != $item["uri"]) {
 			$community = false;
 
-			if($importer["page-flags"] == PAGE_COMMUNITY || $importer["page-flags"] == PAGE_PRVGROUP) {
+			if ($importer["page-flags"] == PAGE_COMMUNITY || $importer["page-flags"] == PAGE_PRVGROUP) {
 				$sql_extra = "";
 				$community = true;
 				logger("possible community action");
@@ -1946,11 +1955,14 @@ class dfrn {
 				}
 			}
 
-			// Does this have the characteristics of a community or private group action?
-			// If it's an action to a wall post on a community/prvgroup page it's a
-			// valid community action. Also forum_mode makes it valid for sure.
-			// If neither, it's not.
+			/*
+			 * Does this have the characteristics of a community or private group action?
+			 * If it's an action to a wall post on a community/prvgroup page it's a
+			 * valid community action. Also forum_mode makes it valid for sure.
+			 * If neither, it's not.
+			 */
 
+			/// @TODO Maybe merge these if() blocks into one?
 			if ($is_a_remote_action && $community) {
 				if ((!$r[0]["forum_mode"]) && (!$r[0]["wall"])) {
 					$is_a_remote_action = false;
@@ -1963,7 +1975,6 @@ class dfrn {
 			} else {
 				return DFRN_REPLY;
 			}
-
 		} else {
 			return DFRN_TOP_LEVEL;
 		}
@@ -1976,6 +1987,7 @@ class dfrn {
 	 * @param array $item the new item record
 	 * @param array $importer Record of the importer user mixed with contact of the content
 	 * @param int $posted_id The record number of item record that was just posted
+	 * @todo set proper type-hints (array?)
 	 */
 	private static function do_poke($item, $importer, $posted_id) {
 		$verb = urldecode(substr($item["verb"],strpos($item["verb"], "#")+1));
@@ -1989,7 +2001,7 @@ class dfrn {
 			// somebody was poked/prodded. Was it me?
 			foreach ($xo->link as $l) {
 				$atts = $l->attributes();
-				switch($atts["rel"]) {
+				switch ($atts["rel"]) {
 					case "alternate":
 						$Blink = $atts["href"];
 						break;
@@ -1998,7 +2010,7 @@ class dfrn {
 				}
 			}
 
-			if($Blink && link_compare($Blink,App::get_baseurl()."/profile/".$importer["nickname"])) {
+			if ($Blink && link_compare($Blink, App::get_baseurl() . "/profile/" . $importer["nickname"])) {
 
 				// send a notification
 				notification(array(
@@ -2032,6 +2044,7 @@ class dfrn {
 	 * @param bool $is_like Is the verb a "like"?
 	 *
 	 * @return bool Should the processing of the entries be continued?
+	 * @todo set proper type-hints (array?)
 	 */
 	private static function process_verbs($entrytype, $importer, &$item, &$is_like) {
 
@@ -2141,7 +2154,7 @@ class dfrn {
 	 *
 	 * @param object $links link elements
 	 * @param array $item the item record
-	 * @todo Add type-hints
+	 * @todo set proper type-hints
 	 */
 	private static function parse_links($links, &$item) {
 		$rel = "";
@@ -2501,10 +2514,12 @@ class dfrn {
 			}
 		} else { // $entrytype == DFRN_TOP_LEVEL
 			if (!link_compare($item["owner-link"],$importer["url"])) {
-				// The item owner info is not our contact. It's OK and is to be expected if this is a tgroup delivery,
-				// but otherwise there's a possible data mixup on the sender's system.
-				// the tgroup delivery code called from item_store will correct it if it's a forum,
-				// but we're going to unconditionally correct it here so that the post will always be owned by our contact.
+				/*
+				 * The item owner info is not our contact. It's OK and is to be expected if this is a tgroup delivery,
+				 * but otherwise there's a possible data mixup on the sender's system.
+				 * the tgroup delivery code called from item_store will correct it if it's a forum,
+				 * but we're going to unconditionally correct it here so that the post will always be owned by our contact.
+				 */
 				logger('Correcting item owner.', LOGGER_DEBUG);
 				$item["owner-name"]   = $importer["senderName"];
 				$item["owner-link"]   = $importer["url"];
@@ -2535,6 +2550,7 @@ class dfrn {
 	 * @param object $xpath XPath object
 	 * @param object $deletion deletion elements
 	 * @param array $importer Record of the importer user mixed with contact of the content
+	 * @todo set proper type-hints
 	 */
 	private static function process_deletion($xpath, $deletion, $importer) {
 
@@ -2617,7 +2633,7 @@ class dfrn {
 								}
 							}
 							q("UPDATE `item` SET `tag` = '%s' WHERE `id` = %d",
-								dbesc(implode(',',$newtags)),
+								dbesc(implode(',', $newtags)),
 								intval($i[0]["id"])
 							);
 							create_tags_from_item($i[0]["id"]);
@@ -2626,7 +2642,7 @@ class dfrn {
 				}
 			}
 
-			if($entrytype == DFRN_TOP_LEVEL) {
+			if ($entrytype == DFRN_TOP_LEVEL) {
 				$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s',
 						`body` = '', `title` = ''
 					WHERE `parent-uri` = '%s' AND `uid` = %d",
@@ -2672,7 +2688,7 @@ class dfrn {
 				// if this is a relayed delete, propagate it to other recipients
 
 				if ($entrytype == DFRN_REPLY_RC) {
-					logger("Notifying followers about deletion of post ".$item["id"], LOGGER_DEBUG);
+					logger("Notifying followers about deletion of post " . $item["id"], LOGGER_DEBUG);
 					proc_run(PRIORITY_HIGH, "include/notifier.php","drop", $item["id"]);
 				}
 			}
@@ -2685,6 +2701,7 @@ class dfrn {
 	 * @param text $xml The DFRN message
 	 * @param array $importer Record of the importer user mixed with contact of the content
 	 * @param bool $sort_by_date Is used when feeds are polled
+	 * @todo set proper type-hints
 	 */
 	public static function import($xml,$importer, $sort_by_date = false) {
 
@@ -2800,6 +2817,6 @@ class dfrn {
 				self::process_entry($header, $xpath, $entry, $importer);
 			}
 		}
-		logger("Import done for user ".$importer["uid"]." from contact ".$importer["id"], LOGGER_DEBUG);
+		logger("Import done for user " . $importer["uid"] . " from contact " . $importer["id"], LOGGER_DEBUG);
 	}
 }

From ccd1e2cc6a894d93ff3f6e3d1bfcc591702cbdf6 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Fri, 24 Mar 2017 20:50:10 +0100
Subject: [PATCH 044/120] fixed parser error

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 boot.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/boot.php b/boot.php
index 5df8c6c4d9..05e1172821 100644
--- a/boot.php
+++ b/boot.php
@@ -665,10 +665,10 @@ class App {
 			$this->scheme = 'https';
 		}
 
-		if (x($_SERVER,'SERVER_NAME')) {
+		if (x($_SERVER, 'SERVER_NAME')) {
 			$this->hostname = $_SERVER['SERVER_NAME'];
 
-			if (x($_SERVER,'SERVER_PORT') && $_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443)
+			if (x($_SERVER, 'SERVER_PORT') && $_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443) {
 				$this->hostname .= ':' . $_SERVER['SERVER_PORT'];
 			}
 			/*
@@ -676,6 +676,7 @@ class App {
 			 * or in a sub-directory and adjust accordingly
 			 */
 
+			/// @TODO This kind of escaping breaks syntax-highlightning on CoolEdit (Midnight Commander)
 			$path = trim(dirname($_SERVER['SCRIPT_NAME']), '/\\');
 			if (isset($path) && strlen($path) && ($path != $this->path)) {
 				$this->path = $path;
@@ -686,11 +687,12 @@ class App {
 			$this->hostname = $hostname;
 		}
 
-		if (is_array($_SERVER["argv"]) && $_SERVER["argc"]>1 && substr(end($_SERVER["argv"]), 0, 4)=="http" ) {
-			$this->set_baseurl(array_pop($_SERVER["argv"]) );
+		if (is_array($_SERVER["argv"]) && $_SERVER["argc"] > 1 && substr(end($_SERVER["argv"]), 0, 4) == "http" ) {
+			$this->set_baseurl(array_pop($_SERVER["argv"]));
 			$_SERVER["argc"] --;
 		}
 
+		/// @TODO no longer needed?
 		#set_include_path("include/$this->hostname" . PATH_SEPARATOR . get_include_path());
 
 		if ((x($_SERVER,'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'],0,9) === "pagename=") {

From b5b3451b31b7a45595345baf77e78a144426cc5c Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Fri, 24 Mar 2017 20:57:52 +0100
Subject: [PATCH 045/120] Continued: - marked commented-out code as possible
 old-lost - added more curly braces - used more dbm::is_result() where SELECT
 is stated - ! added quotes in array element, else (here) >thumb< (without
 quotes) is   considered as a constant and causes an E_NOTICE

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 mod/install.php |  1 +
 mod/manage.php  | 27 ++++++++++++++++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/mod/install.php b/mod/install.php
index fa952a79bc..f58345e3a9 100755
--- a/mod/install.php
+++ b/mod/install.php
@@ -485,6 +485,7 @@ function check_funcs(&$checks) {
 		$ck_funcs[6]['help'] = t('Error, XML PHP module required but not installed.');
 	}
 
+	/// @TODO old-lost code here?
 	/*if((x($_SESSION,'sysmsg')) && is_array($_SESSION['sysmsg']) && count($_SESSION['sysmsg']))
 		notice( t('Please see the file "INSTALL.txt".') . EOL);*/
 }
diff --git a/mod/manage.php b/mod/manage.php
index 4beb8e46c6..10fc7c7e64 100644
--- a/mod/manage.php
+++ b/mod/manage.php
@@ -72,16 +72,19 @@ function manage_post(App $a) {
 	unset($_SESSION['return_url']);
 	if(x($_SESSION,'submanage'))
 		unset($_SESSION['submanage']);
-	if(x($_SESSION,'sysmsg'))
+	if (x($_SESSION,'sysmsg')) {
 		unset($_SESSION['sysmsg']);
-	if(x($_SESSION,'sysmsg_info'))
+	}
+	if (x($_SESSION,'sysmsg_info')) {
 		unset($_SESSION['sysmsg_info']);
+	}
 
 	require_once('include/security.php');
-	authenticate_success($r[0],true,true);
+	authenticate_success($r[0], true, true);
 
-	if($limited_id)
+	if ($limited_id) {
 		$_SESSION['submanage'] = $original_id;
+	}
 
 	$ret = array();
 	call_hooks('home_init',$ret);
@@ -113,26 +116,32 @@ function manage_content(App $a) {
 			dbesc($id['uid'])
 		);
 
-		$identities[$key][thumb] = $thumb[0][thumb];
+		$identities[$key]['thumb'] = $thumb[0]['thumb'];
 
-		$identities[$key]['selected'] = (($id['nickname'] === $a->user['nickname']) ? true : false);
+		$identities[$key]['selected'] = ($id['nickname'] === $a->user['nickname']);
 
 		$notifications = 0;
 
 		$r = q("SELECT DISTINCT(`parent`) FROM `notify` WHERE `uid` = %d AND NOT `seen` AND NOT (`type` IN (%d, %d))",
 			intval($id['uid']), intval(NOTIFY_INTRO), intval(NOTIFY_MAIL));
-		if ($r)
+
+		if (dbm::is_result($r)) {
 			$notifications = sizeof($r);
+		}
 
 		$r = q("SELECT DISTINCT(`convid`) FROM `mail` WHERE `uid` = %d AND NOT `seen`",
 			intval($id['uid']));
-		if ($r)
+
+		if (dbm::is_result($r)) {
 			$notifications = $notifications + sizeof($r);
+		}
 
 		$r = q("SELECT COUNT(*) AS `introductions` FROM `intro` WHERE NOT `blocked` AND NOT `ignore` AND `uid` = %d",
 			intval($id['uid']));
-		if ($r)
+
+		if (dbm::is_result($r)) {
 			$notifications = $notifications + $r[0]["introductions"];
+		}
 
 		$identities[$key]['notifications'] = $notifications;
 	}

From 0e19fdfc71954889be54a08ea100fe24a88d753c Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Fri, 24 Mar 2017 21:05:08 +0100
Subject: [PATCH 046/120] removed parentheses + added TODO about a small
 rewrite

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 boot.php | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/boot.php b/boot.php
index 05e1172821..1e936a2c65 100644
--- a/boot.php
+++ b/boot.php
@@ -253,7 +253,6 @@ define ( 'NETWORK_PHANTOM',          'unkn');    // Place holder
  * and existing allocations MUST NEVER BE CHANGED
  * OR RE-ASSIGNED! You may only add to them.
  */
-
 $netgroup_ids = array(
 	NETWORK_DFRN     => (-1),
 	NETWORK_ZOT      => (-2),
@@ -503,6 +502,7 @@ function startup() {
  */
 class App {
 
+	/// @TODO decide indending as a colorful mixure is ahead ...
 	public  $module_loaded = false;
 	public  $query_string;
 	public  $config;
@@ -810,11 +810,11 @@ class App {
 			$basepath = $_SERVER["PWD"];
 		}
 
-		return($basepath);
+		return $basepath;
 	}
 
 	function get_scheme() {
-		return($this->scheme);
+		return $this->scheme;
 	}
 
 	/**
@@ -1048,7 +1048,7 @@ class App {
 
 		// Is the function called statically?
 		if (!(isset($this) && get_class($this) == __CLASS__)) {
-			return(self::$a->remove_baseurl($orig_url));
+			return self::$a->remove_baseurl($orig_url);
 		}
 
 		// Remove the hostname from the url if it is an internal link
@@ -1233,11 +1233,11 @@ class App {
 	}
 
 	function get_useragent() {
-		return(FRIENDICA_PLATFORM." '".FRIENDICA_CODENAME."' ".FRIENDICA_VERSION."-".DB_UPDATE_VERSION."; ".$this->get_baseurl());
+		return (FRIENDICA_PLATFORM." '".FRIENDICA_CODENAME."' ".FRIENDICA_VERSION."-".DB_UPDATE_VERSION."; ".$this->get_baseurl());
 	}
 
 	function is_friendica_app() {
-		return($this->is_friendica_app);
+		return $this->is_friendica_app;
 	}
 
 	/**
@@ -1249,6 +1249,7 @@ class App {
 	 * @return bool Is it a known backend?
 	 */
 	function is_backend() {
+		/// @Should be made static to speedup things
 		$backend = array();
 		$backend[] = "_well_known";
 		$backend[] = "api";
@@ -1270,6 +1271,7 @@ class App {
 		$backend[] = "statistics_json";
 		$backend[] = "xrd";
 
+		/// @TODO Maybe rewrite this part: return (in_array() || $this->backend); ?
 		if (in_array($this->module, $backend)) {
 			return(true);
 		} else {
@@ -2359,7 +2361,7 @@ function get_cachefile($file, $writemode = true) {
 	}
 
 	/// @TODO no need to put braces here
-	return($cachepath);
+	return $cachepath;
 }
 
 function clear_cache($basepath = "", $path = "") {
@@ -2511,7 +2513,7 @@ function set_template_engine(App $a, $engine = 'internal') {
 if (!function_exists('exif_imagetype')) {
 	function exif_imagetype($file) {
 		$size = getimagesize($file);
-		return($size[2]);
+		return $size[2];
 	}
 }
 

From 084dbd68593bebcbc1ed2a94258618be941f6945 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Fri, 24 Mar 2017 21:08:03 +0100
Subject: [PATCH 047/120] Continued: - some spaces added - removed parentheses
 as requested by @Hypolite - added really important TODO as remote-inclusion
 is not what you want

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 index.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/index.php b/index.php
index 326d8dc2fd..3108e57cf2 100644
--- a/index.php
+++ b/index.php
@@ -496,14 +496,14 @@ if (isset($_GET["mode"]) AND ($_GET["mode"] == "raw")) {
 $page    = $a->page;
 $profile = $a->profile;
 
-header("X-Friendica-Version: ".FRIENDICA_VERSION);
+header("X-Friendica-Version: " . FRIENDICA_VERSION);
 header("Content-type: text/html; charset=utf-8");
 
 // We use $_GET["mode"] for special page templates. So we will check if we have 
 // to load another page template than the default one
 // The page templates are located in /view/php/ or in the theme directory
 if (isset($_GET["mode"])) {
-	$template = theme_include($_GET["mode"].'.php');
+	$template = theme_include($_GET["mode"] . '.php');
 }
 
 // If there is no page template use the default page template
@@ -511,7 +511,8 @@ if (!$template) {
 	$template = theme_include("default.php");
 }
 
-require_once($template);
+/// @TODO Looks unsafe (remote-inclusion), is maybe not but theme_include() uses file_exists() but does not escape anything
+require_once $template;
 
 if (!$a->is_backend()) {
 	session_write_close();

From c0be733d6d5318f333514430a5b1ad11821d2f3d Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Fri, 24 Mar 2017 21:15:14 +0100
Subject: [PATCH 048/120] Opps, became lazy here, thanks to @Hypolite finding
 it.

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 mod/dfrn_notify.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index e9ccf4195d..caa27b8690 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -143,7 +143,9 @@ function dfrn_notify_post(App $a) {
 	$rino = get_config('system','rino_encrypt');
 	$rino = intval($rino);
 	// use RINO1 if mcrypt isn't installed and RINO2 was selected
-	if ($rino == 2 and !function_exists('mcrypt_create_iv')) $rino=1;
+	if ($rino == 2 and !function_exists('mcrypt_create_iv')) {
+		$rino = 1;
+	}
 
 	logger("Local rino version: ". $rino, LOGGER_DEBUG);
 

From daa32d49cf3c35f6549d7df2e7c746b993e3351f Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Fri, 24 Mar 2017 21:17:00 +0100
Subject: [PATCH 049/120] killme() does the same here + added curly braces

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 boot.php  |  2 +-
 index.php | 20 ++++++++------------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/boot.php b/boot.php
index 1e936a2c65..a00fa5c50c 100644
--- a/boot.php
+++ b/boot.php
@@ -1848,7 +1848,7 @@ function killme() {
 		session_write_close();
 	}
 
-	exit;
+	exit();
 }
 
 /**
diff --git a/index.php b/index.php
index 3108e57cf2..19f283039c 100644
--- a/index.php
+++ b/index.php
@@ -466,6 +466,7 @@ if (isset($_GET["mode"]) AND (($_GET["mode"] == "raw") OR ($_GET["mode"] == "min
 
 	$content = mb_convert_encoding($a->page["content"], 'HTML-ENTITIES', "UTF-8");
 
+	/// @TODO one day, kill those error-surpressing @ stuff, or PHP should ban it
 	@$doc->loadHTML($content);
 
 	$xpath = new DomXPath($doc);
@@ -486,11 +487,7 @@ if (isset($_GET["mode"]) AND ($_GET["mode"] == "raw")) {
 
 	echo substr($target->saveHTML(), 6, -8);
 
-	if (!$a->is_backend()) {
-		session_write_close();
-	}
-	exit;
-
+	killme();
 }
 
 $page    = $a->page;
@@ -499,9 +496,11 @@ $profile = $a->profile;
 header("X-Friendica-Version: " . FRIENDICA_VERSION);
 header("Content-type: text/html; charset=utf-8");
 
-// We use $_GET["mode"] for special page templates. So we will check if we have 
-// to load another page template than the default one
-// The page templates are located in /view/php/ or in the theme directory
+/*
+ * We use $_GET["mode"] for special page templates. So we will check if we have 
+ * to load another page template than the default one.
+ * The page templates are located in /view/php/ or in the theme directory.
+ */
 if (isset($_GET["mode"])) {
 	$template = theme_include($_GET["mode"] . '.php');
 }
@@ -514,7 +513,4 @@ if (!$template) {
 /// @TODO Looks unsafe (remote-inclusion), is maybe not but theme_include() uses file_exists() but does not escape anything
 require_once $template;
 
-if (!$a->is_backend()) {
-	session_write_close();
-}
-exit();
+killme();

From be717649a4c2d7da7804ddaaba21523b90b14b0a Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Fri, 24 Mar 2017 22:33:57 +0100
Subject: [PATCH 050/120] added more curly braces/spaces

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 mod/profiles.php | 60 ++++++++++++++++++++++++++----------------------
 1 file changed, 32 insertions(+), 28 deletions(-)

diff --git a/mod/profiles.php b/mod/profiles.php
index 0aea672021..dbbdfc83f9 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -171,12 +171,12 @@ function profiles_post(App $a) {
 
 	call_hooks('profile_post', $_POST);
 
-	if(($a->argc > 1) && ($a->argv[1] !== "new") && intval($a->argv[1])) {
+	if (($a->argc > 1) && ($a->argv[1] !== "new") && intval($a->argv[1])) {
 		$orig = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 			intval($a->argv[1]),
 			intval(local_user())
 		);
-		if(! count($orig)) {
+		if (! dbm::is_result($orig)) {
 			notice( t('Profile not found.') . EOL);
 			return;
 		}
@@ -186,7 +186,7 @@ function profiles_post(App $a) {
 		$is_default = (($orig[0]['is-default']) ? 1 : 0);
 
 		$profile_name = notags(trim($_POST['profile_name']));
-		if(! strlen($profile_name)) {
+		if (! strlen($profile_name)) {
 			notice( t('Profile Name is required.') . EOL);
 			return;
 		}
@@ -194,18 +194,21 @@ function profiles_post(App $a) {
 		$dob = $_POST['dob'] ? escape_tags(trim($_POST['dob'])) : '0000-00-00'; // FIXME: Needs to be validated?
 
 		$y = substr($dob,0,4);
-		if((! ctype_digit($y)) || ($y < 1900))
+		if ((! ctype_digit($y)) || ($y < 1900)) {
 			$ignore_year = true;
-		else
+		} else {
 			$ignore_year = false;
-		if($dob != '0000-00-00') {
-			if(strpos($dob,'0000-') === 0) {
+		}
+		if ($dob != '0000-00-00') {
+			if (strpos($dob,'0000-') === 0) {
 				$ignore_year = true;
-				$dob = substr($dob,5);
+				$dob = substr($dob, 5);
 			}
-			$dob = datetime_convert('UTC','UTC',(($ignore_year) ? '1900-' . $dob : $dob),(($ignore_year) ? 'm-d' : 'Y-m-d'));
-			if($ignore_year)
+			$dob = datetime_convert('UTC', 'UTC', (($ignore_year) ? '1900-' . $dob : $dob), (($ignore_year) ? 'm-d' : 'Y-m-d'));
+
+			if ($ignore_year) {
 				$dob = '0000-' . $dob;
+			}
 		}
 
 		$name = notags(trim($_POST['name']));
@@ -214,10 +217,9 @@ function profiles_post(App $a) {
 			$name = '[No Name]';
 		}
 
-		if($orig[0]['name'] != $name)
+		if ($orig[0]['name'] != $name) {
 			$namechanged = true;
-
-
+		}
 
 		$pdesc = notags(trim($_POST['pdesc']));
 		$gender = notags(trim($_POST['gender']));
@@ -242,20 +244,21 @@ function profiles_post(App $a) {
 
 		$withchanged = false;
 
-		if(strlen($with)) {
-			if($with != strip_tags($orig[0]['with'])) {
+		if (strlen($with)) {
+			if ($with != strip_tags($orig[0]['with'])) {
 				$withchanged = true;
 				$prf = '';
 				$lookup = $with;
-				if(strpos($lookup,'@') === 0)
-					$lookup = substr($lookup,1);
+				if (strpos($lookup,'@') === 0) {
+					$lookup = substr($lookup, 1);
+				}
 				$lookup = str_replace('_',' ', $lookup);
-				if(strpos($lookup,'@') || (strpos($lookup,'http://'))) {
+				if (strpos($lookup, '@') || (strpos($lookup, 'http://'))) {
 					$newname = $lookup;
 					$links = @Probe::lrdd($lookup);
-					if(count($links)) {
-						foreach($links as $link) {
-							if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page') {
+					if (count($links)) {
+						foreach ($links as $link) {
+							if ($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page') {
 								$prf = $link['@attributes']['href'];
 							}
 						}
@@ -280,16 +283,17 @@ function profiles_post(App $a) {
 				}
 
 				if ($prf) {
-					$with = str_replace($lookup,'<a href="' . $prf . '">' . $newname . '</a>', $with);
-					if (strpos($with,'@') === 0) {
+					$with = str_replace($lookup, '<a href="' . $prf . '">' . $newname . '</a>', $with);
+					if (strpos($with, '@') === 0) {
 						$with = substr($with, 1);
 					}
 				}
-			}
-			else
+			} else {
 				$with = $orig[0]['with'];
+			}
 		}
 
+		/// @TODO Not flexible enough for later expansion, let's have more OOP here
 		$sexual = notags(trim($_POST['sexual']));
 		$xmpp = notags(trim($_POST['xmpp']));
 		$homepage = notags(trim($_POST['homepage']));
@@ -463,7 +467,7 @@ function profiles_post(App $a) {
 
 		/// @TODO decide to use dbm::is_result() here and check $r
 		if ($r) {
-			info( t('Profile updated.') . EOL);
+			info(t('Profile updated.') . EOL);
 		}
 
 
@@ -513,11 +517,11 @@ function profile_activity($changed, $value) {
 		return;
 	}
 
-	if ($a->user['hidewall'] || get_config('system','block_public')) {
+	if ($a->user['hidewall'] || get_config('system', 'block_public')) {
 		return;
 	}
 
-	if (! get_pconfig(local_user(),'system','post_profilechange')) {
+	if (! get_pconfig(local_user(), 'system', 'post_profilechange')) {
 		return;
 	}
 

From caad9f5214f9f8c94e487629007b0f33c1b2008d Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Fri, 24 Mar 2017 22:36:13 +0100
Subject: [PATCH 051/120] added more spaces (CR request)

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 mod/profiles.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/mod/profiles.php b/mod/profiles.php
index dbbdfc83f9..ccd6cb2c73 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -321,7 +321,7 @@ function profiles_post(App $a) {
 
 		$hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0);
 
-		set_pconfig(local_user(),'system','detailled_profile', (($_POST['detailled_profile'] == 1) ? 1: 0));
+		set_pconfig(local_user(),'system', 'detailled_profile', (($_POST['detailled_profile'] == 1) ? 1: 0));
 
 		$changes = array();
 		$value = '';
@@ -496,7 +496,7 @@ function profiles_post(App $a) {
 
 			// Update global directory in background
 			$url = $_SESSION['my_url'];
-			if ($url && strlen(get_config('system','directory'))) {
+			if ($url && strlen(get_config('system', 'directory'))) {
 				proc_run(PRIORITY_LOW, "include/directory.php", $url);
 			}
 
@@ -648,11 +648,12 @@ function profiles_content(App $a) {
 		$personal_account = !(in_array($a->user["page-flags"],
 					array(PAGE_COMMUNITY, PAGE_PRVGROUP)));
 
-		$detailled_profile = (get_pconfig(local_user(),'system','detailled_profile') AND $personal_account);
+		$detailled_profile = (get_pconfig(local_user(),'system', 'detailled_profile') AND $personal_account);
 
-		$f = get_config('system','birthday_input_format');
-		if(! $f)
+		$f = get_config('system', 'birthday_input_format');
+		if (! $f) {
 			$f = 'ymd';
+		}
 
 		$is_default = (($r[0]['is-default']) ? 1 : 0);
 		$tpl = get_markup_template("profile_edit.tpl");

From 239dfea4e63061bb2e7c31ce058f74ac10d46a5a Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Fri, 24 Mar 2017 22:40:25 +0100
Subject: [PATCH 052/120] it is space-time! ;-)

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 mod/profiles.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/mod/profiles.php b/mod/profiles.php
index ccd6cb2c73..233b276a37 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -321,7 +321,7 @@ function profiles_post(App $a) {
 
 		$hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0);
 
-		set_pconfig(local_user(),'system', 'detailled_profile', (($_POST['detailled_profile'] == 1) ? 1: 0));
+		set_pconfig(local_user(), 'system', 'detailled_profile', (($_POST['detailled_profile'] == 1) ? 1: 0));
 
 		$changes = array();
 		$value = '';
@@ -648,7 +648,7 @@ function profiles_content(App $a) {
 		$personal_account = !(in_array($a->user["page-flags"],
 					array(PAGE_COMMUNITY, PAGE_PRVGROUP)));
 
-		$detailled_profile = (get_pconfig(local_user(),'system', 'detailled_profile') AND $personal_account);
+		$detailled_profile = (get_pconfig(local_user(), 'system', 'detailled_profile') AND $personal_account);
 
 		$f = get_config('system', 'birthday_input_format');
 		if (! $f) {
@@ -669,10 +669,10 @@ function profiles_content(App $a) {
 				array(t('No'), t('Yes')) //Off - On strings
 			),
 
-			'$multi_profiles'		=> feature_enabled(local_user(),'multi_profiles'),
+			'$multi_profiles'		=> feature_enabled(local_user(), 'multi_profiles'),
 			'$form_security_token'		=> get_form_security_token("profile_edit"),
 			'$form_security_token_photo'	=> get_form_security_token("profile_photo"),
-			'$profile_clone_link'		=> ((feature_enabled(local_user(),'multi_profiles')) ? 'profiles/clone/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_clone") : ""),
+			'$profile_clone_link'		=> ((feature_enabled(local_user(), 'multi_profiles')) ? 'profiles/clone/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_clone") : ""),
 			'$profile_drop_link'		=> 'profiles/drop/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_drop"),
 
 			'$profile_action' => t('Profile Actions'),
@@ -751,13 +751,13 @@ function profiles_content(App $a) {
 	} else {
 
 		// If we don't support multi profiles, don't display this list.
-		if (!feature_enabled(local_user(),'multi_profiles')){
+		if (!feature_enabled(local_user(), 'multi_profiles')) {
 			$r = q("SELECT * FROM `profile` WHERE `uid` = %d AND `is-default`=1",
 				local_user()
 			);
-			if (dbm::is_result($r)){
+			if (dbm::is_result($r)) {
 				//Go to the default profile.
-				goaway('profiles/'.$r[0]['id']);
+				goaway('profiles/' . $r[0]['id']);
 			}
 		}
 

From 566cfb8418196bc0afd1d54cc6bf2deddf1ab027 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Fri, 24 Mar 2017 22:44:18 +0100
Subject: [PATCH 053/120] space-time season continues ...

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 util/po2php.php | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/util/po2php.php b/util/po2php.php
index 4b801a6de4..199d79ed3b 100644
--- a/util/po2php.php
+++ b/util/po2php.php
@@ -18,7 +18,7 @@ function po2php_run(&$argv, &$argc) {
 		$lang = str_replace('-','_',basename(dirname($pofile)));
 	}
 
-	if (!file_exists($pofile)){
+	if (!file_exists($pofile)) {
 		print "Unable to find '$pofile'\n";
 		return;
 	}
@@ -34,7 +34,7 @@ function po2php_run(&$argv, &$argc) {
 	$ink = false;
 	$inv = false;
 	$escape_s_exp = '|[^\\\\]\$[a-z]|';
-	function escape_s($match){
+	function escape_s($match) {
 		return str_replace('$','\$',$match[0]);
 	}
 	foreach ($infile as $l) {
@@ -43,19 +43,19 @@ function po2php_run(&$argv, &$argc) {
 		if ($l[0] == "#") {
 			$l = "";
 		}
-		if (substr($l,0,15) == '"Plural-Forms: ') {
+		if (substr($l, 0, 15) == '"Plural-Forms: ') {
 			$match = array();
 			preg_match("|nplurals=([0-9]*); *plural=(.*)[;\\\\]|", $l, $match);
-			$cond = str_replace('n','$n',$match[2]);
+			$cond = str_replace('n', '$n', $match[2]);
 			// define plural select function if not already defined
 			$fnname = 'string_plural_select_' . $lang;
-			$out .= 'if(! function_exists("'.$fnname.'")) {'."\n";
-			$out .= 'function '. $fnname . '($n){'."\n";
-			$out .= '	return '.$cond.';'."\n";
-			$out .= '}}'."\n";
+			$out .= 'if(! function_exists("' . $fnname . '")) {' . "\n";
+			$out .= 'function '. $fnname . '($n){' . "\n";
+			$out .= '	return ' . $cond . ';' . "\n";
+			$out .= '}}' . "\n";
 		}
 
-		if ($k != "" && substr($l,0,7) == "msgstr ") {
+		if ($k != "" && substr($l, 0, 7) == "msgstr ") {
 			if ($ink) {
 				$ink = false;
 				$out .= '$a->strings["' . $k . '"] = ';
@@ -92,8 +92,10 @@ function po2php_run(&$argv, &$argc) {
 				.preg_replace_callback($escape_s_exp,'escape_s',$match[2]) .",\n";
 		}
 
-		if (substr($l,0,6)=="msgid_") { $ink = False; $out .= '$a->strings["'.$k.'"] = '; };
-
+		if (substr($l, 0, 6) == "msgid_") {
+			$ink = false;
+			$out .= '$a->strings["' . $k . '"] = ';
+		}
 
 		if ($ink) {
 			$k .= trim($l,"\"\r\n");
@@ -107,12 +109,13 @@ function po2php_run(&$argv, &$argc) {
 				$out .= '"'.$v.'"';
 			}
 			if ($k != "") {
-				$out .= $arr?");\n":";\n";
+				/// @TODO Maybe add parentheses here?
+				$out .= $arr ? ");\n" : ";\n";
 			}
 			$arr = false;
 			$k = str_replace("msgid ","",$l);
-			if ($k != '""' ) {
-				$k = trim($k,"\"\r\n");
+			if ($k != '""') {
+				$k = trim($k, "\"\r\n");
 			} else {
 				$k = "";
 			}

From 689b81171ec1ee156ccd6111c062b4777054a531 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 25 Mar 2017 12:43:07 +0100
Subject: [PATCH 054/120] added spaces, removed parentheses. there is more
 ahead than just this one.

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 index.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/index.php b/index.php
index 19f283039c..19eb5bff74 100644
--- a/index.php
+++ b/index.php
@@ -37,7 +37,7 @@ $install = ((file_exists('.htconfig.php') && filesize('.htconfig.php')) ? false
 
 // Only load config if found, don't surpress errors
 if (!$install) {
-	include(".htconfig.php");
+	include ".htconfig.php";
 }
 
 /**
@@ -46,11 +46,11 @@ if (!$install) {
  *
  */
 
-require_once("include/dba.php");
+require_once "include/dba.php";
 
 if (!$install) {
 	$db = new dba($db_host, $db_user, $db_pass, $db_data, $install);
-	    unset($db_host, $db_user, $db_pass, $db_data);
+	unset($db_host, $db_user, $db_pass, $db_data);
 
 	/**
 	 * Load configs from db. Overwrite configs from .htconfig.php
@@ -59,13 +59,13 @@ if (!$install) {
 	Config::load();
 
 	if ($a->max_processes_reached() OR $a->maxload_reached()) {
-		header($_SERVER["SERVER_PROTOCOL"].' 503 Service Temporarily Unavailable');
+		header($_SERVER["SERVER_PROTOCOL"] . ' 503 Service Temporarily Unavailable');
 		header('Retry-After: 120');
-		header('Refresh: 120; url='.App::get_baseurl()."/".$a->query_string);
+		header('Refresh: 120; url=' . App::get_baseurl() . "/" . $a->query_string);
 		die("System is currently unavailable. Please try again later");
 	}
 
-	if (get_config('system','force_ssl') AND ($a->get_scheme() == "http") AND
+	if (get_config('system', 'force_ssl') AND ($a->get_scheme() == "http") AND
 		(intval(get_config('system','ssl_policy')) == SSL_POLICY_FULL) AND
 		(substr(App::get_baseurl(), 0, 8) == "https://")) {
 		header("HTTP/1.1 302 Moved Temporarily");

From 506af8b556015a13251344cb7739b896e30cc0e9 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 25 Mar 2017 12:47:31 +0100
Subject: [PATCH 055/120] changed "and" -> && according to CR

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 mod/dfrn_notify.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index caa27b8690..e8a08661d9 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -143,7 +143,7 @@ function dfrn_notify_post(App $a) {
 	$rino = get_config('system','rino_encrypt');
 	$rino = intval($rino);
 	// use RINO1 if mcrypt isn't installed and RINO2 was selected
-	if ($rino == 2 and !function_exists('mcrypt_create_iv')) {
+	if ($rino == 2 && !function_exists('mcrypt_create_iv')) {
 		$rino = 1;
 	}
 
@@ -319,7 +319,7 @@ function dfrn_notify_content(App $a) {
 		$rino = intval($rino);
 		// use RINO1 if mcrypt isn't installed and RINO2 was selected
 		/// @TODO Define a code-standard: and/AND/&& are around
-		if ($rino == 2 and !function_exists('mcrypt_create_iv')) {
+		if ($rino == 2 && !function_exists('mcrypt_create_iv')) {
 			$rino = 1;
 		}
 

From a70a2381c98671d778e514f7bf495a44fe44d576 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 25 Mar 2017 12:49:09 +0100
Subject: [PATCH 056/120] removed old-lost code

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 boot.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/boot.php b/boot.php
index a00fa5c50c..782b2e798d 100644
--- a/boot.php
+++ b/boot.php
@@ -692,9 +692,6 @@ class App {
 			$_SERVER["argc"] --;
 		}
 
-		/// @TODO no longer needed?
-		#set_include_path("include/$this->hostname" . PATH_SEPARATOR . get_include_path());
-
 		if ((x($_SERVER,'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'],0,9) === "pagename=") {
 			$this->query_string = substr($_SERVER['QUERY_STRING'],9);
 			// removing trailing / - maybe a nginx problem

From bd4cee8c2188ed6a9784a36c96d68ecd707b3c4b Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 25 Mar 2017 12:53:01 +0100
Subject: [PATCH 057/120] added spaces/curly braces and TODO for better using
 trim()

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 boot.php | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/boot.php b/boot.php
index 782b2e798d..57d265711d 100644
--- a/boot.php
+++ b/boot.php
@@ -655,12 +655,13 @@ class App {
 
 
 		$this->scheme = 'http';
-		if ((x($_SERVER,'HTTPS') && $_SERVER['HTTPS']) ||
+		/// @TODO x() should be better used here ...
+		if ((x($_SERVER, 'HTTPS') && $_SERVER['HTTPS']) ||
 		   (x($_SERVER['HTTP_FORWARDED']) && preg_match("/proto=https/", $_SERVER['HTTP_FORWARDED'])) ||
 		   (x($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https') ||
 		   (x($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on') ||
 		   (x($_SERVER['FRONT_END_HTTPS']) && $_SERVER['FRONT_END_HTTPS'] == 'on') ||
-		   (x($_SERVER,'SERVER_PORT') && (intval($_SERVER['SERVER_PORT']) == 443)) // XXX: reasonable assumption, but isn't this hardcoding too much?
+		   (x($_SERVER, 'SERVER_PORT') && (intval($_SERVER['SERVER_PORT']) == 443)) // XXX: reasonable assumption, but isn't this hardcoding too much?
 		   ) {
 			$this->scheme = 'https';
 		}
@@ -692,22 +693,26 @@ class App {
 			$_SERVER["argc"] --;
 		}
 
-		if ((x($_SERVER,'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'],0,9) === "pagename=") {
+		if ((x($_SERVER, 'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'], 0, 9) === "pagename=") {
 			$this->query_string = substr($_SERVER['QUERY_STRING'],9);
 			// removing trailing / - maybe a nginx problem
-			if (substr($this->query_string, 0, 1) == "/")
+			/// @TODO can be shortened by trim($str, '/') !
+			if (substr($this->query_string, 0, 1) == "/") {
 				$this->query_string = substr($this->query_string, 1);
-		} elseif ((x($_SERVER,'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'],0,2) === "q=") {
+			}
+		} elseif ((x($_SERVER, 'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'], 0, 2) === "q=") {
 			$this->query_string = substr($_SERVER['QUERY_STRING'],2);
 			// removing trailing / - maybe a nginx problem
-			if (substr($this->query_string, 0, 1) == "/")
+			/// @TODO can be shortened by trim($str, '/') !
+			if (substr($this->query_string, 0, 1) == "/") {
 				$this->query_string = substr($this->query_string, 1);
+			}
 		}
 
-		if (x($_GET,'pagename')) {
-			$this->cmd = trim($_GET['pagename'],'/\\');
-		} elseif (x($_GET,'q')) {
-			$this->cmd = trim($_GET['q'],'/\\');
+		if (x($_GET, 'pagename')) {
+			$this->cmd = trim($_GET['pagename'], '/\\');
+		} elseif (x($_GET, 'q')) {
+			$this->cmd = trim($_GET['q'], '/\\');
 		}
 
 
@@ -715,9 +720,8 @@ class App {
 		$this->query_string = str_replace($this->cmd."&",$this->cmd."?", $this->query_string);
 
 		// unix style "homedir"
-
-		if (substr($this->cmd,0,1) === '~') {
-			$this->cmd = 'profile/' . substr($this->cmd,1);
+		if (substr($this->cmd, 0, 1) === '~') {
+			$this->cmd = 'profile/' . substr($this->cmd, 1);
 		}
 
 		// Diaspora style profile url

From d64dafec636dca15c374d0af616c2b1a4b9a7b4a Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 25 Mar 2017 12:55:13 +0100
Subject: [PATCH 058/120] removed parentheses and indended it for better
 readability

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 boot.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/boot.php b/boot.php
index 57d265711d..0efd4a2069 100644
--- a/boot.php
+++ b/boot.php
@@ -1234,7 +1234,12 @@ class App {
 	}
 
 	function get_useragent() {
-		return (FRIENDICA_PLATFORM." '".FRIENDICA_CODENAME."' ".FRIENDICA_VERSION."-".DB_UPDATE_VERSION."; ".$this->get_baseurl());
+		return
+			FRIENDICA_PLATFORM . " '" .
+			FRIENDICA_CODENAME . "' " .
+			FRIENDICA_VERSION . "-" .
+			DB_UPDATE_VERSION . "; " .
+			$this->get_baseurl();
 	}
 
 	function is_friendica_app() {

From 1514fdaead46043823d297f546a54234a5883a1e Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 25 Mar 2017 12:59:37 +0100
Subject: [PATCH 059/120] rewrote to static approach and if() condition can be
 simplified.

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 boot.php | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/boot.php b/boot.php
index 0efd4a2069..2a6e9b4ca5 100644
--- a/boot.php
+++ b/boot.php
@@ -1255,8 +1255,7 @@ class App {
 	 * @return bool Is it a known backend?
 	 */
 	function is_backend() {
-		/// @Should be made static to speedup things
-		$backend = array();
+		static $backend = array();
 		$backend[] = "_well_known";
 		$backend[] = "api";
 		$backend[] = "dfrn_notify";
@@ -1277,12 +1276,8 @@ class App {
 		$backend[] = "statistics_json";
 		$backend[] = "xrd";
 
-		/// @TODO Maybe rewrite this part: return (in_array() || $this->backend); ?
-		if (in_array($this->module, $backend)) {
-			return(true);
-		} else {
-			return($this->backend);
-		}
+		// Check if current module is in backend or backend flag is set
+		return (in_array($this->module, self::$backend) || $this->backend);
 	}
 
 	/**

From 2f5c796886495e21c09e4fbe550525dd90650689 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 25 Mar 2017 13:01:41 +0100
Subject: [PATCH 060/120] removed TODO, one day this all needs refacturizing
 ...

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 include/dfrn.php | 2 --
 mod/profiles.php | 1 -
 2 files changed, 3 deletions(-)

diff --git a/include/dfrn.php b/include/dfrn.php
index 887dba9a11..1064d7bd82 100644
--- a/include/dfrn.php
+++ b/include/dfrn.php
@@ -1813,7 +1813,6 @@ class dfrn {
 
 		update_contact_avatar($relocate["avatar"], $importer["importer_uid"], $importer["id"], true);
 
-		/// @TODO decide to use dbm::is_result() here
 		if ($x === false) {
 			return false;
 		}
@@ -1837,7 +1836,6 @@ class dfrn {
 						$n, dbesc($f[0]),
 						intval($importer["importer_uid"]));
 
-					/// @TODO decide to use dbm::is_result() here
 					if ($x === false) {
 						return false;
 					}
diff --git a/mod/profiles.php b/mod/profiles.php
index 233b276a37..a034f670ea 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -465,7 +465,6 @@ function profiles_post(App $a) {
 			intval(local_user())
 		);
 
-		/// @TODO decide to use dbm::is_result() here and check $r
 		if ($r) {
 			info(t('Profile updated.') . EOL);
 		}

From 47ae5a9a4762794b36ffaa296b5bac266ad0f4f4 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 25 Mar 2017 13:07:19 +0100
Subject: [PATCH 061/120] removed parentheses, added curly ...

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 include/dfrn.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/dfrn.php b/include/dfrn.php
index 1064d7bd82..ca2c2393e7 100644
--- a/include/dfrn.php
+++ b/include/dfrn.php
@@ -1866,7 +1866,7 @@ class dfrn {
 
 			// do not accept (ignore) an earlier edit than one we currently have.
 			if (datetime_convert("UTC","UTC",$item["edited"]) < $current["edited"]) {
-				return(false);
+				return false;
 			}
 
 			$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s', `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d",

From fd468f20fd4f5bc54db3659a8567301007c0c1cc Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 25 Mar 2017 13:08:38 +0100
Subject: [PATCH 062/120] merged 2 if() into one, closes internal TODO

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 include/dfrn.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/include/dfrn.php b/include/dfrn.php
index ca2c2393e7..877b529bad 100644
--- a/include/dfrn.php
+++ b/include/dfrn.php
@@ -1961,11 +1961,9 @@ class dfrn {
 			 */
 
 			/// @TODO Maybe merge these if() blocks into one?
-			if ($is_a_remote_action && $community) {
-				if ((!$r[0]["forum_mode"]) && (!$r[0]["wall"])) {
-					$is_a_remote_action = false;
-					logger("not a community action");
-				}
+			if ($is_a_remote_action && $community && (!$r[0]["forum_mode"]) && (!$r[0]["wall"])) {
+				$is_a_remote_action = false;
+				logger("not a community action");
 			}
 
 			if ($is_a_remote_action) {

From c1287df6556ad8e285d82455f5fb7d050b5db5ce Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 25 Mar 2017 13:12:25 +0100
Subject: [PATCH 063/120] removed old-lost code + internal TODO closed

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 mod/install.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/mod/install.php b/mod/install.php
index f58345e3a9..6db79dca28 100755
--- a/mod/install.php
+++ b/mod/install.php
@@ -484,10 +484,6 @@ function check_funcs(&$checks) {
 		$ck_funcs[6]['status'] = false;
 		$ck_funcs[6]['help'] = t('Error, XML PHP module required but not installed.');
 	}
-
-	/// @TODO old-lost code here?
-	/*if((x($_SESSION,'sysmsg')) && is_array($_SESSION['sysmsg']) && count($_SESSION['sysmsg']))
-		notice( t('Please see the file "INSTALL.txt".') . EOL);*/
 }
 
 

From 67707247c81ac8f5a259806d6e1334dbf70d50ff Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 25 Mar 2017 13:14:50 +0100
Subject: [PATCH 064/120] Continued: - added curly braces/spaces - changed
 lower-case SQL keywords to upper-case - used dbm::is_result() instead of
 count() (avoids warning in case of false is   returned)

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 mod/manage.php | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/mod/manage.php b/mod/manage.php
index 10fc7c7e64..e85561acfb 100644
--- a/mod/manage.php
+++ b/mod/manage.php
@@ -22,34 +22,34 @@ function manage_post(App $a) {
 		}
 	}
 
-	$r = q("select * from manage where uid = %d",
+	$r = q("SELECT * FROM `manage` WHERE `uid` = %d",
 		intval($uid)
 	);
 
 	$submanage = $r;
 
 	$identity = ((x($_POST['identity'])) ? intval($_POST['identity']) : 0);
-	if(! $identity)
+	if (! $identity) {
 		return;
+	}
 
 	$limited_id = 0;
 	$original_id = $uid;
 
-	if(count($submanage)) {
-		foreach($submanage as $m) {
-			if($identity == $m['mid']) {
+	if (dbm::is_result($submanage)) {
+		foreach ($submanage as $m) {
+			if ($identity == $m['mid']) {
 				$limited_id = $m['mid'];
 				break;
 			}
 		}
 	}
 
-	if($limited_id) {
+	if ($limited_id) {
 		$r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
 			intval($limited_id)
 		);
-	}
-	else {
+	} else {
 		$r = q("SELECT * FROM `user` WHERE `uid` = %d AND `email` = '%s' AND `password` = '%s' LIMIT 1",
 			intval($identity),
 			dbesc($orig_record['email']),
@@ -70,12 +70,13 @@ function manage_post(App $a) {
 	unset($_SESSION['mobile-theme']);
 	unset($_SESSION['page_flags']);
 	unset($_SESSION['return_url']);
-	if(x($_SESSION,'submanage'))
+	if (x($_SESSION, 'submanage')) {
 		unset($_SESSION['submanage']);
-	if (x($_SESSION,'sysmsg')) {
+	}
+	if (x($_SESSION, 'sysmsg')) {
 		unset($_SESSION['sysmsg']);
 	}
-	if (x($_SESSION,'sysmsg_info')) {
+	if (x($_SESSION, 'sysmsg_info')) {
 		unset($_SESSION['sysmsg_info']);
 	}
 

From e503141b0c9cd3c48d467be7fc15c289cc930d31 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 25 Mar 2017 13:18:28 +0100
Subject: [PATCH 065/120] added spaces and curly braces

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 mod/profiles.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mod/profiles.php b/mod/profiles.php
index a034f670ea..708179692d 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -193,14 +193,14 @@ function profiles_post(App $a) {
 
 		$dob = $_POST['dob'] ? escape_tags(trim($_POST['dob'])) : '0000-00-00'; // FIXME: Needs to be validated?
 
-		$y = substr($dob,0,4);
+		$y = substr($dob, 0, 4);
 		if ((! ctype_digit($y)) || ($y < 1900)) {
 			$ignore_year = true;
 		} else {
 			$ignore_year = false;
 		}
 		if ($dob != '0000-00-00') {
-			if (strpos($dob,'0000-') === 0) {
+			if (strpos($dob, '0000-') === 0) {
 				$ignore_year = true;
 				$dob = substr($dob, 5);
 			}
@@ -235,10 +235,10 @@ function profiles_post(App $a) {
 
 		$with = ((x($_POST,'with')) ? notags(trim($_POST['with'])) : '');
 
-		if(! strlen($howlong)) {
+		if (! strlen($howlong)) {
 			$howlong = NULL_DATE;
 		} else {
-			$howlong = datetime_convert(date_default_timezone_get(),'UTC',$howlong);
+			$howlong = datetime_convert(date_default_timezone_get(), 'UTC', $howlong);
 		}
 		// linkify the relationship target if applicable
 
@@ -249,7 +249,7 @@ function profiles_post(App $a) {
 				$withchanged = true;
 				$prf = '';
 				$lookup = $with;
-				if (strpos($lookup,'@') === 0) {
+				if (strpos($lookup, '@') === 0) {
 					$lookup = substr($lookup, 1);
 				}
 				$lookup = str_replace('_',' ', $lookup);

From 177a0c8320e53e52f7771ec23cdc4296e023ef8c Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 25 Mar 2017 13:22:39 +0100
Subject: [PATCH 066/120] Continued: - used dbm::is_result() to avoid E_WARNING
 when false is returned - added curly braces + some spaces

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 mod/profiles.php | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/mod/profiles.php b/mod/profiles.php
index 708179692d..b73c46e71c 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -10,7 +10,7 @@ function profiles_init(App $a) {
 		return;
 	}
 
-	if(($a->argc > 2) && ($a->argv[1] === "drop") && intval($a->argv[2])) {
+	if (($a->argc > 2) && ($a->argv[1] === "drop") && intval($a->argv[2])) {
 		$r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d AND `is-default` = 0 LIMIT 1",
 			intval($a->argv[2]),
 			intval(local_user())
@@ -34,24 +34,22 @@ function profiles_init(App $a) {
 			intval($a->argv[2]),
 			intval(local_user())
 		);
-		if($r)
+		if (dbm::is_result($r)) {
 			info(t('Profile deleted.').EOL);
+		}
 
 		goaway('profiles');
 		return; // NOTREACHED
 	}
 
-
-
-
-
-	if(($a->argc > 1) && ($a->argv[1] === 'new')) {
+	if (($a->argc > 1) && ($a->argv[1] === 'new')) {
 
 		check_form_security_token_redirectOnErr('/profiles', 'profile_new', 't');
 
 		$r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
 			intval(local_user()));
-		$num_profiles = count($r0);
+
+		$num_profiles = (dbm::is_result($r0) ? count($r0) : 0);
 
 		$name = t('Profile-') . ($num_profiles + 1);
 
@@ -73,19 +71,21 @@ function profiles_init(App $a) {
 		);
 
 		info( t('New profile created.') . EOL);
-		if(count($r3) == 1)
-			goaway('profiles/'.$r3[0]['id']);
+		if (dbm::is_result($r3) && count($r3) == 1) {
+			goaway('profiles/' . $r3[0]['id']);
+		}
 
 		goaway('profiles');
 	}
 
-	if(($a->argc > 2) && ($a->argv[1] === 'clone')) {
+	if (($a->argc > 2) && ($a->argv[1] === 'clone')) {
 
 		check_form_security_token_redirectOnErr('/profiles', 'profile_clone', 't');
 
 		$r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
 			intval(local_user()));
-		$num_profiles = count($r0);
+
+		$num_profiles = (dbm::is_result($r0) ? count($r0) : 0);
 
 		$name = t('Profile-') . ($num_profiles + 1);
 		$r1 = q("SELECT * FROM `profile` WHERE `uid` = %d AND `id` = %d LIMIT 1",
@@ -116,8 +116,9 @@ function profiles_init(App $a) {
 			dbesc($name)
 		);
 		info( t('New profile created.') . EOL);
-		if ((dbm::is_result($r3)) && (count($r3) == 1))
+		if ((dbm::is_result($r3)) && (count($r3) == 1)) {
 			goaway('profiles/'.$r3[0]['id']);
+		}
 
 		goaway('profiles');
 
@@ -125,7 +126,7 @@ function profiles_init(App $a) {
 	}
 
 
-	if(($a->argc > 1) && (intval($a->argv[1]))) {
+	if (($a->argc > 1) && (intval($a->argv[1]))) {
 		$r = q("SELECT id FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 			intval($a->argv[1]),
 			intval(local_user())
@@ -136,7 +137,7 @@ function profiles_init(App $a) {
 			return;
 		}
 
-		profile_load($a,$a->user['nickname'],$r[0]['id']);
+		profile_load($a,$a->user['nickname'], $r[0]['id']);
 	}
 
 
@@ -144,15 +145,16 @@ function profiles_init(App $a) {
 }
 
 function profile_clean_keywords($keywords) {
-	$keywords = str_replace(","," ",$keywords);
+	$keywords = str_replace(",", " ", $keywords);
 	$keywords = explode(" ", $keywords);
 
 	$cleaned = array();
 	foreach ($keywords as $keyword) {
 		$keyword = trim(strtolower($keyword));
 		$keyword = trim($keyword, "#");
-		if ($keyword != "")
+		if ($keyword != "") {
 			$cleaned[] = $keyword;
+		}
 	}
 
 	$keywords = implode(", ", $cleaned);
@@ -213,7 +215,7 @@ function profiles_post(App $a) {
 
 		$name = notags(trim($_POST['name']));
 
-		if(! strlen($name)) {
+		if (! strlen($name)) {
 			$name = '[No Name]';
 		}
 

From 1d48801d70100378d22a9f3858249f16e988c4f8 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 25 Mar 2017 13:25:33 +0100
Subject: [PATCH 067/120] Continued: - added spaces - made a code block even

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 util/po2php.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/util/po2php.php b/util/po2php.php
index 199d79ed3b..f26e93e510 100644
--- a/util/po2php.php
+++ b/util/po2php.php
@@ -86,10 +86,11 @@ function po2php_run(&$argv, &$argc) {
 			}
 			$match = array();
 			preg_match("|\[([0-9]*)\] (.*)|", $l, $match);
-			$out .= "\t".
-				preg_replace_callback($escape_s_exp,'escape_s',$match[1])
-				." => "
-				.preg_replace_callback($escape_s_exp,'escape_s',$match[2]) .",\n";
+			$out .= "\t"
+				. preg_replace_callback($escape_s_exp, 'escape_s', $match[1])
+				. " => "
+				. preg_replace_callback($escape_s_exp, 'escape_s', $match[2])
+				. ",\n";
 		}
 
 		if (substr($l, 0, 6) == "msgid_") {
@@ -99,7 +100,7 @@ function po2php_run(&$argv, &$argc) {
 
 		if ($ink) {
 			$k .= trim($l,"\"\r\n");
-			$k = preg_replace_callback($escape_s_exp,'escape_s',$k);
+			$k = preg_replace_callback($escape_s_exp, 'escape_s', $k);
 			//$out .= '$a->strings['.$k.'] = ';
 		}
 

From b830d839f0ad886cd861ccd5f5b45fa853845b8e Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 25 Mar 2017 13:27:38 +0100
Subject: [PATCH 068/120] added a space

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 util/po2php.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/util/po2php.php b/util/po2php.php
index f26e93e510..34142c6691 100644
--- a/util/po2php.php
+++ b/util/po2php.php
@@ -99,7 +99,7 @@ function po2php_run(&$argv, &$argc) {
 		}
 
 		if ($ink) {
-			$k .= trim($l,"\"\r\n");
+			$k .= trim($l, "\"\r\n");
 			$k = preg_replace_callback($escape_s_exp, 'escape_s', $k);
 			//$out .= '$a->strings['.$k.'] = ';
 		}
@@ -107,14 +107,14 @@ function po2php_run(&$argv, &$argc) {
 		if (substr($l, 0, 6) == "msgid ") {
 			if ($inv) {
 				$inv = false;
-				$out .= '"'.$v.'"';
+				$out .= '"' . $v . '"';
 			}
 			if ($k != "") {
 				/// @TODO Maybe add parentheses here?
 				$out .= $arr ? ");\n" : ";\n";
 			}
 			$arr = false;
-			$k = str_replace("msgid ","",$l);
+			$k = str_replace("msgid ", "", $l);
 			if ($k != '""') {
 				$k = trim($k, "\"\r\n");
 			} else {

From 48a1d97f4697cf57a9a12aad9d1d3db49f5f3b62 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 25 Mar 2017 13:30:12 +0100
Subject: [PATCH 069/120] closed internal TODO, added parentheses as this is a
 minimized if/else block

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 util/po2php.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/util/po2php.php b/util/po2php.php
index 34142c6691..75442406a1 100644
--- a/util/po2php.php
+++ b/util/po2php.php
@@ -110,8 +110,7 @@ function po2php_run(&$argv, &$argc) {
 				$out .= '"' . $v . '"';
 			}
 			if ($k != "") {
-				/// @TODO Maybe add parentheses here?
-				$out .= $arr ? ");\n" : ";\n";
+				$out .= ($arr) ? ");\n" : ";\n";
 			}
 			$arr = false;
 			$k = str_replace("msgid ", "", $l);

From 83dec2f8151138acfc6c1ae166c232a2ecd612f6 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 25 Mar 2017 13:33:15 +0100
Subject: [PATCH 070/120] fixed indending + closed own internal todo: better
 usage of x()

removed todo

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 boot.php | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/boot.php b/boot.php
index 2a6e9b4ca5..474cb82057 100644
--- a/boot.php
+++ b/boot.php
@@ -655,14 +655,14 @@ class App {
 
 
 		$this->scheme = 'http';
-		/// @TODO x() should be better used here ...
+
 		if ((x($_SERVER, 'HTTPS') && $_SERVER['HTTPS']) ||
-		   (x($_SERVER['HTTP_FORWARDED']) && preg_match("/proto=https/", $_SERVER['HTTP_FORWARDED'])) ||
-		   (x($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https') ||
-		   (x($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on') ||
-		   (x($_SERVER['FRONT_END_HTTPS']) && $_SERVER['FRONT_END_HTTPS'] == 'on') ||
-		   (x($_SERVER, 'SERVER_PORT') && (intval($_SERVER['SERVER_PORT']) == 443)) // XXX: reasonable assumption, but isn't this hardcoding too much?
-		   ) {
+				(x($_SERVER, 'HTTP_FORWARDED') && preg_match("/proto=https/", $_SERVER['HTTP_FORWARDED'])) ||
+				(x($_SERVER, 'HTTP_X_FORWARDED_PROTO') && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https') ||
+				(x($_SERVER, 'HTTP_X_FORWARDED_SSL') && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on') ||
+				(x($_SERVER, 'FRONT_END_HTTPS') && $_SERVER['FRONT_END_HTTPS'] == 'on') ||
+				(x($_SERVER, 'SERVER_PORT') && (intval($_SERVER['SERVER_PORT']) == 443)) // XXX: reasonable assumption, but isn't this hardcoding too much?
+				) {
 			$this->scheme = 'https';
 		}
 
@@ -1367,7 +1367,6 @@ class App {
 		// add baseurl to args. cli scripts can't construct it
 		$args[] = $this->get_baseurl();
 
-		/// @TODO let's replace these with a foreach($key => $value) loop
 		for ($x = 0; $x < count($args); $x ++) {
 			$args[$x] = escapeshellarg($args[$x]);
 		}

From 6d5826e1880d2b4c21ea3044c6931d59027e8576 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 25 Mar 2017 13:37:15 +0100
Subject: [PATCH 071/120] PHP5 does not support native type-hints, except
 `array` + used dbm::is_result()

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 include/dfrn.php | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/include/dfrn.php b/include/dfrn.php
index 877b529bad..9192e94303 100644
--- a/include/dfrn.php
+++ b/include/dfrn.php
@@ -216,13 +216,10 @@ class dfrn {
 			dbesc($sort)
 		);
 
-		if (!dbm::is_result($r)) {
-			/// @TODO Some logging?
-			killme();
-		}
-
-		// Will check further below if this actually returned results.
-		// We will provide an empty feed if that is the case.
+		/*
+		 * Will check further below if this actually returned results.
+		 * We will provide an empty feed if that is the case.
+		 */
 
 		$items = $r;
 
@@ -243,10 +240,10 @@ class dfrn {
 
 		$root = self::add_header($doc, $owner, $author, $alternatelink, true);
 
-		// This hook can't work anymore
+		/// @TODO This hook can't work anymore
 		//	call_hooks('atom_feed', $atom);
 
-		if (!count($items) OR $onlyheader) {
+		if (!dbm::is_result($items) OR $onlyheader) {
 			$atom = trim($doc->saveXML());
 
 			call_hooks('atom_feed_end', $atom);

From 89bd080e7ec815ffc7e327c5512587a339ab6a94 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 25 Mar 2017 13:40:43 +0100
Subject: [PATCH 072/120] don't kill when no result is found, this may break
 communication, thanks to @annando explaining it

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 include/dfrn.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/include/dfrn.php b/include/dfrn.php
index 9192e94303..555fa57f21 100644
--- a/include/dfrn.php
+++ b/include/dfrn.php
@@ -915,12 +915,7 @@ class dfrn {
 				intval($owner["uid"]),
 				dbesc(normalise_link($mention)));
 
-			if (!dbm::is_result($r)) {
-				/// @TODO Maybe some logging?
-				killme();
-			}
-
-			if ($r[0]["forum"] OR $r[0]["prv"]) {
+			if (dbm::is_result($r) AND ($r[0]["forum"] OR $r[0]["prv"])) {
 				xml::add_element($doc, $entry, "link", "", array("rel" => "mentioned",
 											"ostatus:object-type" => ACTIVITY_OBJ_GROUP,
 											"href" => $mention));

From a391ab9a9937b71a07ec26ab57ba70c13857b294 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 25 Mar 2017 13:46:28 +0100
Subject: [PATCH 073/120] was a bit confusing for me or I was not sleeping to
 much ...

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 include/dfrn.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/include/dfrn.php b/include/dfrn.php
index 555fa57f21..4593380d13 100644
--- a/include/dfrn.php
+++ b/include/dfrn.php
@@ -1743,11 +1743,7 @@ class dfrn {
 			intval($importer["importer_uid"]));
 
 		if (!dbm::is_result($r)) {
-			/*
-			 * @TODO maybe one day:
 			logger("Query failed to execute, no result returned in " . __FUNCTION__);
-			killme();
-			*/
 			return false;
 		}
 
@@ -2113,11 +2109,7 @@ class dfrn {
 					);
 
 					if (!dbm::is_result($r)) {
-						/*
-						 * @TODO maybe one day:
 						logger("Query failed to execute, no result returned in " . __FUNCTION__);
-						killme();
-						*/
 						return false;
 					}
 

From 4d731dd83871c4e9907bec40a863605fd6e0e39a Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 25 Mar 2017 13:56:56 +0100
Subject: [PATCH 074/120] Convention: - comment blocks with 2 stars at beinging
 are doc-tags, with only star is a   regular multi-line comment - added curly
 braces + spaces - removed TODO, there needs to be a way of writing this
 better than using @

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 index.php | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/index.php b/index.php
index 19eb5bff74..349e1cc607 100644
--- a/index.php
+++ b/index.php
@@ -336,6 +336,7 @@ if ($a->module_loaded) {
 		$func = str_replace('-','_',current_theme()) . '_init';
 		$func($a);
 	}
+/// @TODO commented out? old-lost again? :-)
 //	elseif (x($a->theme_info,"extends") && file_exists("view/theme/".$a->theme_info["extends"]."/theme.php")) {
 //		require_once("view/theme/".$a->theme_info["extends"]."/theme.php");
 //		if (function_exists(str_replace('-','_',$a->theme_info["extends"]) . '_init')) {
@@ -376,27 +377,25 @@ if ($a->module_loaded) {
 
 /*
  * Create the page head after setting the language
- * and getting any auth credentials
+ * and getting any auth credentials.
  *
  * Moved init_pagehead() and init_page_end() to after
  * all the module functions have executed so that all
- * theme choices made by the modules can take effect
+ * theme choices made by the modules can take effect.
  */
 
 $a->init_pagehead();
 
-/**
+/*
  * Build the page ending -- this is stuff that goes right before
  * the closing </body> tag
  */
-
 $a->init_page_end();
 
 // If you're just visiting, let javascript take you home
-
-if (x($_SESSION,'visitor_home')) {
+if (x($_SESSION, 'visitor_home')) {
 	$homebase = $_SESSION['visitor_home'];
-} elseif (local_user()) {
+] elseif (local_user()) {
 	$homebase = 'profile/' . $a->user['nickname'];
 }
 
@@ -404,35 +403,35 @@ if (isset($homebase)) {
 	$a->page['content'] .= '<script>var homebase="' . $homebase . '" ; </script>';
 }
 
+<<<<<<< HEAD
 // now that we've been through the module content, see if the page reported
 // a permission problem and if so, a 403 response would seem to be in order.
 
+=======
+/*
+ * now that we've been through the module content, see if the page reported
+ * a permission problem and if so, a 403 response would seem to be in order.
+ */
+>>>>>>> 29f1028... Convention:
 if (stristr( implode("",$_SESSION['sysmsg']), t('Permission denied'))) {
 	header($_SERVER["SERVER_PROTOCOL"] . ' 403 ' . t('Permission denied.'));
 }
 
-/**
- *
+/*
  * Report anything which needs to be communicated in the notification area (before the main body)
- *
  */
-
 call_hooks('page_end', $a->page['content']);
 
-/**
- *
+/*
  * Add the navigation (menu) template
- *
  */
-
 if ($a->module != 'install' && $a->module != 'maintenance') {
 	nav($a);
 }
 
-/**
+/*
  * Add a "toggle mobile" link if we're using a mobile device
  */
-
 if ($a->is_mobile || $a->is_tablet) {
 	if (isset($_SESSION['show-mobile']) && !$_SESSION['show-mobile']) {
 		$link = 'toggle_mobile?address=' . curPageURL();

From 006b4b88b2a90cdf63229191fc3ed5462e14c9e8 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 25 Mar 2017 14:07:26 +0100
Subject: [PATCH 075/120] Continued: - added curly braces/spaces - converted
 multiple single-line comments into one multi-line comment

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 mod/dfrn_notify.php | 67 ++++++++++++++++++++++++---------------------
 1 file changed, 36 insertions(+), 31 deletions(-)

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index e8a08661d9..5f4fc3a1fa 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -28,14 +28,14 @@ function dfrn_notify_post(App $a) {
 	$prv   = (($page == 2) ? 1 : 0);
 
 	$writable = (-1);
-	if($dfrn_version >= 2.21) {
+	if ($dfrn_version >= 2.21) {
 		$writable = (($perm === 'rw') ? 1 : 0);
 	}
 
 	$direction = (-1);
-	if(strpos($dfrn_id,':') == 1) {
-		$direction = intval(substr($dfrn_id,0,1));
-		$dfrn_id = substr($dfrn_id,2);
+	if (strpos($dfrn_id, ':') == 1) {
+		$direction = intval(substr($dfrn_id, 0, 1));
+		$dfrn_id = substr($dfrn_id, 2);
 	}
 
 	$r = q("SELECT * FROM `challenge` WHERE `dfrn-id` = '%s' AND `challenge` = '%s' LIMIT 1",
@@ -70,9 +70,11 @@ function dfrn_notify_post(App $a) {
 			break; // NOTREACHED
 	}
 
-	// be careful - $importer will contain both the contact information for the contact
-	// sending us the post, and also the user information for the person receiving it.
-	// since they are mixed together, it is easy to get them confused.
+	/*
+	 * be careful - $importer will contain both the contact information for the contact
+	 * sending us the post, and also the user information for the person receiving it.
+	 * since they are mixed together, it is easy to get them confused.
+	 */
 
 	$r = q("SELECT	`contact`.*, `contact`.`uid` AS `importer_uid`,
 					`contact`.`pubkey` AS `cpubkey`,
@@ -100,15 +102,16 @@ function dfrn_notify_post(App $a) {
 
 	logger("Remote rino version: ".$rino_remote." for ".$importer["url"], LOGGER_DEBUG);
 
-	if((($writable != (-1)) && ($writable != $importer['writable'])) || ($importer['forum'] != $forum) || ($importer['prv'] != $prv)) {
+	if ((($writable != (-1)) && ($writable != $importer['writable'])) || ($importer['forum'] != $forum) || ($importer['prv'] != $prv)) {
 		q("UPDATE `contact` SET `writable` = %d, forum = %d, prv = %d WHERE `id` = %d",
 			intval(($writable == (-1)) ? $importer['writable'] : $writable),
 			intval($forum),
 			intval($prv),
 			intval($importer['id'])
 		);
-		if($writable != (-1))
+		if ($writable != (-1)) {
 			$importer['writable'] = $writable;
+		}
 		$importer['forum'] = $page;
 	}
 
@@ -120,7 +123,7 @@ function dfrn_notify_post(App $a) {
 	logger('dfrn_notify: received notify from ' . $importer['name'] . ' for ' . $importer['username']);
 	logger('dfrn_notify: data: ' . $data, LOGGER_DATA);
 
-	if($dissolve == 1) {
+	if ($dissolve == 1) {
 
 		/*
 		 * Relationship is dissolved permanently
@@ -133,7 +136,7 @@ function dfrn_notify_post(App $a) {
 
 	}
 
-
+	/// @TODO remove this old-lost code then?
 	// If we are setup as a soapbox we aren't accepting input from this person
 	// This behaviour is deactivated since it really doesn't make sense to even disallow comments
 	// The check if someone is a friend or simply a follower is done in a later place so it needn't to be done here
@@ -149,7 +152,7 @@ function dfrn_notify_post(App $a) {
 
 	logger("Local rino version: ". $rino, LOGGER_DEBUG);
 
-	if(strlen($key)) {
+	if (strlen($key)) {
 
 		// if local rino is lower than remote rino, abort: should not happen!
 		// but only for $remote_rino > 1, because old code did't send rino version
@@ -162,19 +165,16 @@ function dfrn_notify_post(App $a) {
 		logger('rino: md5 raw key: ' . md5($rawkey));
 		$final_key = '';
 
-		if($dfrn_version >= 2.1) {
-			if((($importer['duplex']) && strlen($importer['cprvkey'])) || (! strlen($importer['cpubkey']))) {
+		if ($dfrn_version >= 2.1) {
+			if ((($importer['duplex']) && strlen($importer['cprvkey'])) || (! strlen($importer['cpubkey']))) {
 				openssl_private_decrypt($rawkey,$final_key,$importer['cprvkey']);
-			}
-			else {
+			} else {
 				openssl_public_decrypt($rawkey,$final_key,$importer['cpubkey']);
 			}
-		}
-		else {
-			if((($importer['duplex']) && strlen($importer['cpubkey'])) || (! strlen($importer['cprvkey']))) {
+		} else {
+			if ((($importer['duplex']) && strlen($importer['cpubkey'])) || (! strlen($importer['cprvkey']))) {
 				openssl_public_decrypt($rawkey,$final_key,$importer['cpubkey']);
-			}
-			else {
+			} else {
 				openssl_private_decrypt($rawkey,$final_key,$importer['cprvkey']);
 			}
 		}
@@ -184,19 +184,23 @@ function dfrn_notify_post(App $a) {
 		switch($rino_remote) {
 			case 0:
 			case 1:
-				// we got a key. old code send only the key, without RINO version.
-				// we assume RINO 1 if key and no RINO version
+				/*
+				 * we got a key. old code send only the key, without RINO version.
+				 * we assume RINO 1 if key and no RINO version
+				 */
 				$data = aes_decrypt(hex2bin($data),$final_key);
 				break;
 			case 2:
 				try {
 					$data = Crypto::decrypt(hex2bin($data),$final_key);
 				} catch (InvalidCiphertext $ex) { // VERY IMPORTANT
-					// Either:
-					//   1. The ciphertext was modified by the attacker,
-					//   2. The key is wrong, or
-					//   3. $ciphertext is not a valid ciphertext or was corrupted.
-					// Assume the worst.
+					/*
+					 * Either:
+					 *   1. The ciphertext was modified by the attacker,
+					 *   2. The key is wrong, or
+					 *   3. $ciphertext is not a valid ciphertext or was corrupted.
+					 * Assume the worst.
+					 */
 					logger('The ciphertext has been tampered with!');
 					xml_status(0,'The ciphertext has been tampered with!');
 				} catch (Ex\CryptoTestFailed $ex) {
@@ -227,8 +231,10 @@ function dfrn_notify_content(App $a) {
 
 	if(x($_GET,'dfrn_id')) {
 
-		// initial communication from external contact, $direction is their direction.
-		// If this is a duplex communication, ours will be the opposite.
+		/*
+		 * initial communication from external contact, $direction is their direction.
+		 * If this is a duplex communication, ours will be the opposite.
+		 */
 
 		$dfrn_id = notags(trim($_GET['dfrn_id']));
 		$dfrn_version = (float) $_GET['dfrn_version'];
@@ -318,7 +324,6 @@ function dfrn_notify_content(App $a) {
 		$rino = get_config('system','rino_encrypt');
 		$rino = intval($rino);
 		// use RINO1 if mcrypt isn't installed and RINO2 was selected
-		/// @TODO Define a code-standard: and/AND/&& are around
 		if ($rino == 2 && !function_exists('mcrypt_create_iv')) {
 			$rino = 1;
 		}

From 73ee28521281ba3abe1096bf49eb5a3d0e959d61 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 25 Mar 2017 14:32:49 +0100
Subject: [PATCH 076/120] rewrote for() loop to foreach() + added curly
 braces/spaces

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 index.php      | 10 ++-----
 mod/photos.php | 78 +++++++++++++++++++++++++++-----------------------
 2 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/index.php b/index.php
index 349e1cc607..8560f8c277 100644
--- a/index.php
+++ b/index.php
@@ -395,7 +395,7 @@ $a->init_page_end();
 // If you're just visiting, let javascript take you home
 if (x($_SESSION, 'visitor_home')) {
 	$homebase = $_SESSION['visitor_home'];
-] elseif (local_user()) {
+} elseif (local_user()) {
 	$homebase = 'profile/' . $a->user['nickname'];
 }
 
@@ -403,17 +403,11 @@ if (isset($homebase)) {
 	$a->page['content'] .= '<script>var homebase="' . $homebase . '" ; </script>';
 }
 
-<<<<<<< HEAD
-// now that we've been through the module content, see if the page reported
-// a permission problem and if so, a 403 response would seem to be in order.
-
-=======
 /*
  * now that we've been through the module content, see if the page reported
  * a permission problem and if so, a 403 response would seem to be in order.
  */
->>>>>>> 29f1028... Convention:
-if (stristr( implode("",$_SESSION['sysmsg']), t('Permission denied'))) {
+if (stristr(implode("", $_SESSION['sysmsg']), t('Permission denied'))) {
 	header($_SERVER["SERVER_PROTOCOL"] . ' 403 ' . t('Permission denied.'));
 }
 
diff --git a/mod/photos.php b/mod/photos.php
index 27d8499c28..4b3dc46b75 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1325,16 +1325,17 @@ function photos_content(App $a) {
 			dbesc($datum)
 		);
 
-		if (! count($ph)) {
+		if (! dbm::is_result($ph)) {
 			$ph = q("SELECT `id` FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s'
 				LIMIT 1",
 				intval($owner_uid),
 				dbesc($datum)
 			);
-			if (count($ph))
-				notice( t('Permission denied. Access to this item may be restricted.'));
-			else
-				notice( t('Photo not available') . EOL );
+			if (dbm::is_result($ph)) {
+				notice(t('Permission denied. Access to this item may be restricted.'));
+			} else {
+				notice(t('Photo not available') . EOL );
+			}
 			return;
 		}
 
@@ -1356,15 +1357,17 @@ function photos_content(App $a) {
 				intval($owner_uid)
 			);
 
-			if (count($prvnxt)) {
-				for($z = 0; $z < count($prvnxt); $z++) {
-					if ($prvnxt[$z]['resource-id'] == $ph[0]['resource-id']) {
+			if (dbm::is_result($prvnxt)) {
+				foreach ($prvnxt as $z => $entry) {
+					if ($entry['resource-id'] == $ph[0]['resource-id']) {
 						$prv = $z - 1;
 						$nxt = $z + 1;
-						if ($prv < 0)
+						if ($prv < 0) {
 							$prv = count($prvnxt) - 1;
-						if ($nxt >= count($prvnxt))
+						}
+						if ($nxt >= count($prvnxt)) {
 							$nxt = 0;
+						}
 						break;
 					}
 				}
@@ -1387,8 +1390,8 @@ function photos_content(App $a) {
 		}
 
 		$album_link = 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($ph[0]['album']);
- 		$tools = Null;
- 		$lock = Null;
+ 		$tools = null;
+ 		$lock = null;
 
 		if ($can_post && ($ph[0]['uid'] == $owner_uid)) {
 			$tools = array(
@@ -1426,8 +1429,9 @@ function photos_content(App $a) {
 			'filename' => $hires['filename'],
 		);
 
-		if ($nextlink)
+		if ($nextlink) {
 			$nextlink = array($nextlink, '<div class="icon next"></div>');
+		}
 
 
 		// Do we have an item for this photo?
@@ -1444,8 +1448,9 @@ function photos_content(App $a) {
 
 		$map = null;
 
-		if (count($linked_items)) {
+		if (dbm::is_result($linked_items)) {
 			$link_item = $linked_items[0];
+
 			$r = qu("SELECT COUNT(*) AS `total`
 				FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
 				WHERE `parent-uri` = '%s' AND `uri` != '%s' AND `item`.`deleted` = 0 and `item`.`moderated` = 0
@@ -1458,8 +1463,9 @@ function photos_content(App $a) {
 
 			);
 
-			if (dbm::is_result($r))
+			if (dbm::is_result($r)) {
 				$a->set_pager_total($r[0]['total']);
+			}
 
 
 			$r = qu("SELECT `item`.*, `item`.`id` AS `item_id`,
@@ -1493,15 +1499,16 @@ function photos_content(App $a) {
 			}
 		}
 
-		$tags=Null;
+		$tags = null;
 
 		if (count($linked_items) && strlen($link_item['tag'])) {
 			$arr = explode(',',$link_item['tag']);
 			// parse tags and add links
 			$tag_str = '';
 			foreach ($arr as $t) {
-				if (strlen($tag_str))
+				if (strlen($tag_str)) {
 					$tag_str .= ', ';
+				}
 				$tag_str .= bbcode($t);
 			}
 			$tags = array(t('Tags: '), $tag_str);
@@ -1518,21 +1525,25 @@ function photos_content(App $a) {
 
 			// Private/public post links for the non-JS ACL form
 			$private_post = 1;
-			if ($_REQUEST['public'])
+			if ($_REQUEST['public']) {
 				$private_post = 0;
+			}
 
 			$query_str = $a->query_string;
-			if (strpos($query_str, 'public=1') !== false)
+			if (strpos($query_str, 'public=1') !== false) {
 				$query_str = str_replace(array('?public=1', '&public=1'), array('', ''), $query_str);
+			}
 
-			// I think $a->query_string may never have ? in it, but I could be wrong
-			// It looks like it's from the index.php?q=[etc] rewrite that the web
-			// server does, which converts any ? to &, e.g. suggest&ignore=61 for suggest?ignore=61
-			if (strpos($query_str, '?') === false)
+			/*
+			 * I think $a->query_string may never have ? in it, but I could be wrong
+			 * It looks like it's from the index.php?q=[etc] rewrite that the web
+			 * server does, which converts any ? to &, e.g. suggest&ignore=61 for suggest?ignore=61
+			 */
+			if (strpos($query_str, '?') === false) {
 				$public_post_link = '?public=1';
-			else
+			} else {
 				$public_post_link = '&public=1';
-
+			}
 
 			if ($a->theme['template_engine'] === 'internal') {
 				$album_e = template_escape($ph[0]['album']);
@@ -1596,6 +1607,7 @@ function photos_content(App $a) {
 
 			$comments = '';
 			if (! dbm::is_result($r)) {
+				/// @TODO merge into one if() ?
 				if ($can_post || can_write_wall($a,$owner_uid)) {
 					if ($link_item['last-child']) {
 						$comments .= replace_macros($cmnt_tpl,array(
@@ -1630,8 +1642,6 @@ function photos_content(App $a) {
 				'attendyes' => array('title' => t('Attending','title')), 'attendno' => array('title' => t('Not attending','title')), 'attendmaybe' => array('title' => t('Might attend','title'))
 			);
 
-
-
 			// display comments
 			if (dbm::is_result($r)) {
 
@@ -1642,8 +1652,7 @@ function photos_content(App $a) {
 				$like    = ((x($conv_responses['like'],$link_item['uri'])) ? format_like($conv_responses['like'][$link_item['uri']],$conv_responses['like'][$link_item['uri'] . '-l'],'like',$link_item['id']) : '');
 				$dislike = ((x($conv_responses['dislike'],$link_item['uri'])) ? format_like($conv_responses['dislike'][$link_item['uri']],$conv_responses['dislike'][$link_item['uri'] . '-l'],'dislike',$link_item['id']) : '');
 
-
-
+				/// @TODO merge into one if() ?
 				if ($can_post || can_write_wall($a,$owner_uid)) {
 					if ($link_item['last-child']) {
 						$comments .= replace_macros($cmnt_tpl,array(
@@ -1675,7 +1684,7 @@ function photos_content(App $a) {
 					if (((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE))) && ($item['id'] != $item['parent']))
 						continue;
 
-					$redirect_url = 'redir/' . $item['cid'] ;
+					$redirect_url = 'redir/' . $item['cid'];
 
 
 					if (local_user() && ($item['contact-uid'] == local_user())
@@ -1694,8 +1703,6 @@ function photos_content(App $a) {
 
 					$profile_link = $profile_url;
 
-
-
 					$dropping = (($item['contact-id'] == $contact_id) || ($item['uid'] == local_user()));
 					$drop = array(
 						'dropping' => $dropping,
@@ -1704,7 +1711,6 @@ function photos_content(App $a) {
 						'delete' => t('Delete'),
 					);
 
-
 					if ($a->theme['template_engine'] === 'internal') {
 						$name_e = template_escape($profile_name);
 						$title_e = template_escape($item['title']);
@@ -1729,10 +1735,10 @@ function photos_content(App $a) {
 						'$comment' => $comment
 					));
 
-					if ($can_post || can_write_wall($a,$owner_uid)) {
-
+					/// @TODO merge into one if() ?
+					if ($can_post || can_write_wall($a, $owner_uid)) {
 						if ($item['last-child']) {
-							$comments .= replace_macros($cmnt_tpl,array(
+							$comments .= replace_macros($cmnt_tpl, array(
 								'$return_path' => '',
 								'$jsreload' => $return_url,
 								'$type' => 'wall-comment',

From fccdc63964cb484b8fbcd0f64451295ce9032193 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 25 Mar 2017 14:56:23 +0100
Subject: [PATCH 077/120] Opps, fixed parser error. indending was confusing
 here

+ added much more curly braces

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 include/dfrn.php |   7 +-
 mod/photos.php   | 211 ++++++++++++++++++++++++++++-------------------
 2 files changed, 127 insertions(+), 91 deletions(-)

diff --git a/include/dfrn.php b/include/dfrn.php
index 4593380d13..d9012fe702 100644
--- a/include/dfrn.php
+++ b/include/dfrn.php
@@ -1129,10 +1129,9 @@ class dfrn {
 
 
 			if ($dfrn_version >= 2.1) {
-				if (($contact['duplex'] && strlen($contact['pubkey'])) {
-					|| ($owner['page-flags'] == PAGE_COMMUNITY && strlen($contact['pubkey']))
-					|| ($contact['rel'] == CONTACT_IS_SHARING && strlen($contact['pubkey'])))
-
+				if (($contact['duplex'] && strlen($contact['pubkey']))
+						|| ($owner['page-flags'] == PAGE_COMMUNITY && strlen($contact['pubkey']))
+						|| ($contact['rel'] == CONTACT_IS_SHARING && strlen($contact['pubkey']))) {
 					openssl_public_encrypt($key,$postvars['key'],$contact['pubkey']);
 				} else {
 					openssl_private_encrypt($key,$postvars['key'],$contact['prvkey']);
diff --git a/mod/photos.php b/mod/photos.php
index 4b3dc46b75..e4548bb468 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -14,8 +14,9 @@ use \Friendica\Core\Config;
 
 function photos_init(App $a) {
 
-	if ($a->argc > 1)
+	if ($a->argc > 1) {
 		auto_redir($a, $a->argv[1]);
+	}
 
 	if ((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
 		return;
@@ -29,8 +30,9 @@ function photos_init(App $a) {
 			dbesc($nick)
 		);
 
-		if (! count($user))
+		if (! dbm::is_result($user)) {
 			return;
+		}
 
 		$a->data['user'] = $user[0];
 		$a->profile_uid = $user[0]['uid'];
@@ -59,8 +61,9 @@ function photos_init(App $a) {
 
 		if ($albums) {
 			$a->data['albums'] = $albums;
-			if ($albums_visible)
+			if ($albums_visible) {
 				$ret['success'] = true;
+			}
 
 			$ret['albums'] = array();
 			foreach ($albums as $k => $album) {
@@ -80,24 +83,26 @@ function photos_init(App $a) {
 
 		$albums = $ret;
 
-		if (local_user() && $a->data['user']['uid'] == local_user())
+		if (local_user() && $a->data['user']['uid'] == local_user()) {
 			$can_post = true;
+		}
 
 		if ($albums['success']) {
-			$photo_albums_widget = replace_macros(get_markup_template('photo_albums.tpl'),array(
+			$photo_albums_widget = replace_macros(get_markup_template('photo_albums.tpl'), array(
 				'$nick'     => $a->data['user']['nickname'],
 				'$title'    => t('Photo Albums'),
-				'$recent'    => t('Recent Photos'),
+				'$recent'   => t('Recent Photos'),
 				'$albums'   => $albums['albums'],
 				'$baseurl'  => z_root(),
-				'$upload'   => array( t('Upload New Photos'), 'photos/' . $a->data['user']['nickname'] . '/upload'),
+				'$upload'   => array(t('Upload New Photos'), 'photos/' . $a->data['user']['nickname'] . '/upload'),
 				'$can_post' => $can_post
 			));
 		}
 
 
-		if (! x($a->page,'aside'))
+		if (! x($a->page, 'aside')) {
 			$a->page['aside'] = '';
+		}
 		$a->page['aside'] .= $vcard_widget;
 		$a->page['aside'] .= $photo_albums_widget;
 
@@ -130,9 +135,9 @@ function photos_post(App $a) {
 	$page_owner_uid = $a->data['user']['uid'];
 	$community_page = (($a->data['user']['page-flags'] == PAGE_COMMUNITY) ? true : false);
 
-	if ((local_user()) && (local_user() == $page_owner_uid))
+	if ((local_user()) && (local_user() == $page_owner_uid)) {
 		$can_post = true;
-	else {
+	} else {
 		if ($community_page && remote_user()) {
 			$contact_id = 0;
 			if (is_array($_SESSION['remote'])) {
@@ -295,8 +300,9 @@ function photos_post(App $a) {
 
 					// send the notification upstream/downstream as the case may be
 
-					if ($rr['visible'])
+					if ($rr['visible']) {
 						proc_run(PRIORITY_HIGH, "include/notifier.php", "drop", $drop_id);
+					}
 				}
 			}
 
@@ -371,8 +377,9 @@ function photos_post(App $a) {
 				// Update the photo albums cache
 				photo_albums($page_owner_uid, true);
 
-				if ($i[0]['visible'])
+				if ($i[0]['visible']) {
 					proc_run(PRIORITY_HIGH, "include/notifier.php", "drop", $drop_id);
+				}
 			}
 		}
 
@@ -394,15 +401,16 @@ function photos_post(App $a) {
 
 		$resource_id = $a->argv[2];
 
-		if (! strlen($albname))
+		if (! strlen($albname)) {
 			$albname = datetime_convert('UTC',date_default_timezone_get(),'now', 'Y');
+		}
 
 
 		if ((x($_POST,'rotate') !== false) &&
 		   ( (intval($_POST['rotate']) == 1) || (intval($_POST['rotate']) == 2) )) {
 			logger('rotate');
 
-			$r = q("select * from photo where `resource-id` = '%s' and uid = %d and scale = 0 limit 1",
+			$r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d AND `scale` = 0 LIMIT 1",
 				dbesc($resource_id),
 				intval($page_owner_uid)
 			);
@@ -415,7 +423,7 @@ function photos_post(App $a) {
 					$width  = $ph->getWidth();
 					$height = $ph->getHeight();
 
-					$x = q("update photo set data = '%s', height = %d, width = %d where `resource-id` = '%s' and uid = %d and scale = 0",
+					$x = q("UPDATE `photo` SET `data` = '%s', `height` = %d, `width` = %d WHERE `resource-id` = '%s' AND `uid` = %d AND `scale` = 0",
 						dbesc($ph->imageString()),
 						intval($height),
 						intval($width),
@@ -428,7 +436,7 @@ function photos_post(App $a) {
 						$width  = $ph->getWidth();
 						$height = $ph->getHeight();
 
-						$x = q("update photo set data = '%s', height = %d, width = %d where `resource-id` = '%s' and uid = %d and scale = 1",
+						$x = q("UPDATE `photo` SET `data` = '%s', `height` = %d, `width` = %d WHERE `resource-id` = '%s' AND `uid` = %d AND `scale` = 1",
 							dbesc($ph->imageString()),
 							intval($height),
 							intval($width),
@@ -442,7 +450,7 @@ function photos_post(App $a) {
 						$width  = $ph->getWidth();
 						$height = $ph->getHeight();
 
-						$x = q("update photo set data = '%s', height = %d, width = %d where `resource-id` = '%s' and uid = %d and scale = 2",
+						$x = q("UPDATE `photo` SET `data` = '%s', `height` = %d, `width` = %d WHERE `resource-id` = '%s' AND `uid` = %d AND `scale` = 2",
 							dbesc($ph->imageString()),
 							intval($height),
 							intval($width),
@@ -458,7 +466,7 @@ function photos_post(App $a) {
 			dbesc($resource_id),
 			intval($page_owner_uid)
 		);
-		if (count($p)) {
+		if (dbm::is_result($p)) {
 			$ext = $phototypes[$p[0]['type']];
 			$r = q("UPDATE `photo` SET `desc` = '%s', `album` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s' WHERE `resource-id` = '%s' AND `uid` = %d",
 				dbesc($desc),
@@ -470,6 +478,7 @@ function photos_post(App $a) {
 				dbesc($resource_id),
 				intval($page_owner_uid)
 			);
+
 			// Update the photo albums cache if album name was changed
 			if ($albname !== $origaname) {
 				photo_albums($page_owner_uid, true);
@@ -479,8 +488,9 @@ function photos_post(App $a) {
 		/* Don't make the item visible if the only change was the album name */
 
 		$visibility = 0;
-		if ($p[0]['desc'] !== $desc || strlen($rawtags))
+		if ($p[0]['desc'] !== $desc || strlen($rawtags)) {
 			$visibility = 1;
+		}
 
 		if (! $item_id) {
 
@@ -540,16 +550,18 @@ function photos_post(App $a) {
 			// if the new tag doesn't have a namespace specifier (@foo or #foo) give it a hashtag
 
 			$x = substr($rawtags,0,1);
-			if ($x !== '@' && $x !== '#')
+			if ($x !== '@' && $x !== '#') {
 				$rawtags = '#' . $rawtags;
+			}
 
 			$taginfo = array();
 			$tags = get_tags($rawtags);
 
 			if (count($tags)) {
 				foreach ($tags as $tag) {
-					if (isset($profile))
+					if (isset($profile)) {
 						unset($profile);
+					}
 					if (strpos($tag,'@') === 0) {
 						$name = substr($tag,1);
 						if ((strpos($name,'@')) || (strpos($name,'http://'))) {
@@ -557,13 +569,15 @@ function photos_post(App $a) {
 							$links = @Probe::lrdd($name);
 							if (count($links)) {
 								foreach ($links as $link) {
-									if ($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page')
+									if ($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page') {
 										$profile = $link['@attributes']['href'];
+									}
 									if ($link['@attributes']['rel'] === 'salmon') {
 										$salmon = '$url:' . str_replace(',','%sc',$link['@attributes']['href']);
-										if (strlen($inform))
+										if (strlen($inform)) {
 											$inform .= ',';
-							$inform .= $salmon;
+										}
+										$inform .= $salmon;
 									}
 								}
 							}
@@ -572,8 +586,9 @@ function photos_post(App $a) {
 							$newname = $name;
 							$alias = '';
 							$tagcid = 0;
-							if (strrpos($newname,'+'))
-								$tagcid = intval(substr($newname,strrpos($newname,'+') + 1));
+							if (strrpos($newname,'+')) {
+								$tagcid = intval(substr($newname,strrpos($newname, '+') + 1));
+							}
 
 							if ($tagcid) {
 								$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
@@ -589,7 +604,7 @@ function photos_post(App $a) {
 										intval($page_owner_uid)
 								);
 
-								if (! $r) {
+								if (! dbm::is_result($r)) {
 									//select someone by attag or nick and the name passed in
 									$r = q("SELECT * FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1",
 											dbesc($name),
@@ -598,6 +613,7 @@ function photos_post(App $a) {
 									);
 								}
 							}
+							/// @TODO maybe old-lost code to be removed
 /*							elseif (strstr($name,'_') || strstr($name,' ')) {
 								$newname = str_replace('_',' ',$name);
 								$r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
@@ -615,19 +631,22 @@ function photos_post(App $a) {
 								$newname = $r[0]['name'];
 								$profile = $r[0]['url'];
 								$notify = 'cid:' . $r[0]['id'];
-								if (strlen($inform))
+								if (strlen($inform)) {
 									$inform .= ',';
+								}
 								$inform .= $notify;
 							}
 						}
 						if ($profile) {
-							if (substr($notify,0,4) === 'cid:')
-								$taginfo[] = array($newname,$profile,$notify,$r[0],'@[url=' . str_replace(',','%2c',$profile) . ']' . $newname	. '[/url]');
-							else
-								$taginfo[] = array($newname,$profile,$notify,null,$str_tags .= '@[url=' . $profile . ']' . $newname	. '[/url]');
-							if (strlen($str_tags))
+							if (substr($notify,0,4) === 'cid:') {
+								$taginfo[] = array($newname, $profile, $notify, $r[0], '@[url=' . str_replace(',','%2c',$profile) . ']' . $newname . '[/url]');
+							} else {
+								$taginfo[] = array($newname, $profile, $notify, null, $str_tags .= '@[url=' . $profile . ']' . $newname . '[/url]');
+							}
+							if (strlen($str_tags)) {
 								$str_tags .= ',';
-							$profile = str_replace(',','%2c',$profile);
+							}
+							$profile = str_replace(',', '%2c', $profile);
 							$str_tags .= '@[url='.$profile.']'.$newname.'[/url]';
 						}
 					} elseif (strpos($tag,'#') === 0) {
@@ -638,13 +657,15 @@ function photos_post(App $a) {
 			}
 
 			$newtag = $old_tag;
-			if (strlen($newtag) && strlen($str_tags))
+			if (strlen($newtag) && strlen($str_tags)) {
 				$newtag .= ',';
+			}
 			$newtag .= $str_tags;
 
 			$newinform = $old_inform;
-			if (strlen($newinform) && strlen($inform))
+			if (strlen($newinform) && strlen($inform)) {
 				$newinform .= ',';
+			}
 			$newinform .= $inform;
 
 			$r = q("UPDATE `item` SET `tag` = '%s', `inform` = '%s', `edited` = '%s', `changed` = '%s' WHERE `id` = %d AND `uid` = %d",
@@ -707,8 +728,9 @@ function photos_post(App $a) {
 
 					$arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $tagged[0] . '</title><id>' . $tagged[1] . '/' . $tagged[0] . '</id>';
 					$arr['object'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $tagged[1] . '" />' . "\n");
-					if ($tagged[3])
+					if ($tagged[3]) {
 						$arr['object'] .= xmlify('<link rel="photo" type="'.$p[0]['type'].'" href="' . $tagged[3]['photo'] . '" />' . "\n");
+					}
 					$arr['object'] .= '</link></object>' . "\n";
 
 					$arr['target'] = '<target><type>' . ACTIVITY_OBJ_IMAGE . '</type><title>' . $p[0]['desc'] . '</title><id>'
@@ -720,9 +742,7 @@ function photos_post(App $a) {
 						proc_run(PRIORITY_HIGH, "include/notifier.php", "tag", $item_id);
 					}
 				}
-
 			}
-
 		}
 		goaway($_SESSION['photo_return']);
 		return; // NOTREACHED
@@ -745,33 +765,34 @@ function photos_post(App $a) {
 	logger('mod/photos.php: photos_post(): album= ' . $album . ' newalbum= ' . $newalbum , LOGGER_DEBUG);
 
 	if (! strlen($album)) {
-		if (strlen($newalbum))
+		if (strlen($newalbum)) {
 			$album = $newalbum;
-		else
+		} else {
 			$album = datetime_convert('UTC',date_default_timezone_get(),'now', 'Y');
+		}
 	}
 
-	/**
-	 *
+	/*
 	 * We create a wall item for every photo, but we don't want to
 	 * overwhelm the data stream with a hundred newly uploaded photos.
 	 * So we will make the first photo uploaded to this album in the last several hours
 	 * visible by default, the rest will become visible over time when and if
 	 * they acquire comments, likes, dislikes, and/or tags
-	 *
 	 */
 
 	$r = q("SELECT * FROM `photo` WHERE `album` = '%s' AND `uid` = %d AND `created` > UTC_TIMESTAMP() - INTERVAL 3 HOUR ",
 		dbesc($album),
 		intval($page_owner_uid)
 	);
-	if ((! dbm::is_result($r)) || ($album == t('Profile Photos')))
+	if ((! dbm::is_result($r)) || ($album == t('Profile Photos'))) {
 		$visible = 1;
-	else
+	} else {
 		$visible = 0;
+	}
 
-	if (intval($_REQUEST['not_visible']) || $_REQUEST['not_visible'] === 'true')
+	if (intval($_REQUEST['not_visible']) || $_REQUEST['not_visible'] === 'true') {
 		$visible = 0;
+	}
 
 	$str_group_allow   = perms2str(((is_array($_REQUEST['group_allow']))   ? $_REQUEST['group_allow']   : explode(',',$_REQUEST['group_allow'])));
 	$str_contact_allow = perms2str(((is_array($_REQUEST['contact_allow'])) ? $_REQUEST['contact_allow'] : explode(',',$_REQUEST['contact_allow'])));
@@ -793,7 +814,9 @@ function photos_post(App $a) {
 		$filesize   = intval($_FILES['userfile']['size']);
 		$type       = $_FILES['userfile']['type'];
 	}
-	if ($type=="") $type=guess_image_type($filename);
+	if ($type == "") {
+		$type = guess_image_type($filename);
+	}
 
 	logger('photos: upload: received file: ' . $filename . ' as ' . $src . ' ('. $type . ') ' . $filesize . ' bytes', LOGGER_DEBUG);
 
@@ -823,7 +846,7 @@ function photos_post(App $a) {
 	$limit = service_class_fetch($a->data['user']['uid'],'photo_upload_limit');
 
 	if ($limit) {
-		$r = q("select sum(octet_length(data)) as total from photo where uid = %d and scale = 0 and album != 'Contact Photos' ",
+		$r = q("SELECT SUM(OCTET_LENGTH(`data`)) AS `total` FROM `photo` WHERE `uid` = %d AND `scale` = 0 AND `album` != 'Contact Photos'",
 			intval($a->data['user']['uid'])
 		);
 		$size = $r[0]['total'];
@@ -852,10 +875,12 @@ function photos_post(App $a) {
 	@unlink($src);
 
 	$max_length = get_config('system','max_image_length');
-	if (! $max_length)
+	if (! $max_length) {
 		$max_length = MAX_IMAGE_LENGTH;
-	if ($max_length > 0)
+	}
+	if ($max_length > 0) {
 		$ph->scaleImage($max_length);
+	}
 
 	$width  = $ph->getWidth();
 	$height = $ph->getHeight();
@@ -891,6 +916,7 @@ function photos_post(App $a) {
 
 	$lat = $lon = null;
 
+	/// @TODO merge these 2 if() into one?
 	if ($exif && $exif['GPS']) {
 		if (feature_enabled($channel_id,'photo_location')) {
 			$lat = getGps($exif['GPS']['GPSLatitude'], $exif['GPS']['GPSLatitudeRef']);
@@ -900,8 +926,9 @@ function photos_post(App $a) {
 
 	$arr = array();
 
-	if ($lat && $lon)
+	if ($lat && $lon) {
 		$arr['coord'] = $lat . ' ' . $lon;
+	}
 
 	$arr['guid']          = get_guid(32);
 	$arr['uid']           = $page_owner_uid;
@@ -934,20 +961,21 @@ function photos_post(App $a) {
 	// Update the photo albums cache
 	photo_albums($page_owner_uid, true);
 
-	if ($visible)
+	if ($visible) {
 		proc_run(PRIORITY_HIGH, "include/notifier.php", 'wall-new', $item_id);
+	}
 
 	call_hooks('photo_post_end',intval($item_id));
 
-	// addon uploaders should call "killme()" [e.g. exit] within the photo_post_end hook
-	// if they do not wish to be redirected
+	/*
+	 * addon uploaders should call "killme()" [e.g. exit] within the photo_post_end hook
+	 * if they do not wish to be redirected
+	 */
 
 	goaway($_SESSION['photo_return']);
 	// NOTREACHED
 }
 
-
-
 function photos_content(App $a) {
 
 	// URLs:
@@ -965,7 +993,6 @@ function photos_content(App $a) {
 		return;
 	}
 
-
 	require_once('include/bbcode.php');
 	require_once('include/security.php');
 	require_once('include/conversation.php');
@@ -986,15 +1013,17 @@ function photos_content(App $a) {
 	if ($a->argc > 3) {
 		$datatype = $a->argv[2];
 		$datum = $a->argv[3];
-	} elseif (($a->argc > 2) && ($a->argv[2] === 'upload'))
+	} elseif (($a->argc > 2) && ($a->argv[2] === 'upload')) {
 		$datatype = 'upload';
-	else
+	} else {
 		$datatype = 'summary';
+	}
 
-	if ($a->argc > 4)
+	if ($a->argc > 4) {
 		$cmd = $a->argv[4];
-	else
+	} else {
 		$cmd = 'view';
+	}
 
 	//
 	// Setup permissions structures
@@ -1010,9 +1039,9 @@ function photos_content(App $a) {
 
 	$community_page = (($a->data['user']['page-flags'] == PAGE_COMMUNITY) ? true : false);
 
-	if ((local_user()) && (local_user() == $owner_uid))
+	if ((local_user()) && (local_user() == $owner_uid)) {
 		$can_post = true;
-	else {
+	} else {
 		if ($community_page && remote_user()) {
 			if (is_array($_SESSION['remote'])) {
 				foreach ($_SESSION['remote'] as $v) {
@@ -1063,6 +1092,7 @@ function photos_content(App $a) {
 		}
 	}
 
+	/// @TODO merge these 2 if() into one?
 	if (! $remote_contact) {
 		if (local_user()) {
 			$contact_id = $_SESSION['cid'];
@@ -1089,7 +1119,7 @@ function photos_content(App $a) {
 
 	if ($datatype === 'upload') {
 		if (! ($can_post)) {
-			notice( t('Permission denied.'));
+			notice(t('Permission denied.'));
 			return;
 		}
 
@@ -1103,8 +1133,9 @@ function photos_content(App $a) {
 		$albumselect .= '<option value="" ' . ((! $selname) ? ' selected="selected" ' : '') . '>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</option>';
 		if (count($a->data['albums'])) {
 			foreach ($a->data['albums'] as $album) {
-				if (($album['album'] === '') || ($album['album'] === 'Contact Photos') || ($album['album'] === t('Contact Photos')))
+				if (($album['album'] === '') || ($album['album'] === 'Contact Photos') || ($album['album'] === t('Contact Photos'))) {
 					continue;
+				}
 				$selected = (($selname === $album['album']) ? ' selected="selected" ' : '');
 				$albumselect .= '<option value="' . $album['album'] . '"' . $selected . '>' . $album['album'] . '</option>';
 			}
@@ -1116,7 +1147,6 @@ function photos_content(App $a) {
 				'addon_text' => $uploader,
 				'default_upload' => true);
 
-
 		call_hooks('photo_upload_form',$ret);
 
 		$default_upload_box = replace_macros(get_markup_template('photos_default_uploader_box.tpl'), array());
@@ -1128,31 +1158,34 @@ function photos_content(App $a) {
 		$limit = service_class_fetch($a->data['user']['uid'],'photo_upload_limit');
 		if ($limit !== false) {
 
-			$r = q("select sum(datasize) as total from photo where uid = %d and scale = 0 and album != 'Contact Photos' ",
+			$r = q("SELECT SUM(`datasize`) AS `total` FROM `photo` WHERE `uid` = %d AND `scale` = 0 AND `album` != 'Contact Photos'",
 				intval($a->data['user']['uid'])
 			);
-			$usage_message = sprintf( t("You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."), $r[0]['total'] / 1024000, $limit / 1024000 );
+			$usage_message = sprintf(t("You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."), $r[0]['total'] / 1024000, $limit / 1024000 );
 		}
 
 
 		// Private/public post links for the non-JS ACL form
 		$private_post = 1;
-		if ($_REQUEST['public'])
+		if ($_REQUEST['public']) {
 			$private_post = 0;
+		}
 
 		$query_str = $a->query_string;
-		if (strpos($query_str, 'public=1') !== false)
+		if (strpos($query_str, 'public=1') !== false) {
 			$query_str = str_replace(array('?public=1', '&public=1'), array('', ''), $query_str);
+		}
 
-		// I think $a->query_string may never have ? in it, but I could be wrong
-		// It looks like it's from the index.php?q=[etc] rewrite that the web
-		// server does, which converts any ? to &, e.g. suggest&ignore=61 for suggest?ignore=61
-		if (strpos($query_str, '?') === false)
+		/*
+		 * I think $a->query_string may never have ? in it, but I could be wrong
+		 * It looks like it's from the index.php?q=[etc] rewrite that the web
+		 * server does, which converts any ? to &, e.g. suggest&ignore=61 for suggest?ignore=61
+		 */
+		if (strpos($query_str, '?') === false) {
 			$public_post_link = '?public=1';
-		else
+		} else {
 			$public_post_link = '&public=1';
-
-
+		}
 
 		$tpl = get_markup_template('photos_upload.tpl');
 
@@ -1213,10 +1246,12 @@ function photos_content(App $a) {
 			$a->set_pager_itemspage(20);
 		}
 
-		if ($_GET['order'] === 'posted')
+		/// @TODO I have seen this many times, maybe generalize it script-wide and encapsulate it?
+		if ($_GET['order'] === 'posted') {
 			$order = 'ASC';
-		else
+		} else {
 			$order = 'DESC';
+		}
 
 		$r = q("SELECT `resource-id`, `id`, `filename`, type, max(`scale`) AS `scale`, `desc` FROM `photo` WHERE `uid` = %d AND `album` = '%s'
 			AND `scale` <= 4 $sql_extra GROUP BY `resource-id` ORDER BY `created` $order LIMIT %d , %d",
@@ -1226,7 +1261,7 @@ function photos_content(App $a) {
 			intval($a->pager['itemspage'])
 		);
 
-		//edit album name
+		// edit album name
 		if ($cmd === 'edit') {
 			if (($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) {
 				if ($can_post) {
@@ -1249,6 +1284,7 @@ function photos_content(App $a) {
 				}
 			}
 		} else {
+			/// @TODO merge else+if into elseif and 2 into one?
 			if (($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) {
 				if ($can_post) {
 					$edit = array(t('Edit Album'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '/edit');
@@ -1256,20 +1292,22 @@ function photos_content(App $a) {
 			}
 		}
 
-		if ($_GET['order'] === 'posted')
+		if ($_GET['order'] === 'posted') {
 			$order =  array(t('Show Newest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album));
-		else
+		} else {
 			$order = array(t('Show Oldest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '?f=&order=posted');
+		}
 
 		$photos = array();
 
 		if (dbm::is_result($r))
 			$twist = 'rotright';
 			foreach ($r as $rr) {
-				if ($twist == 'rotright')
+				if ($twist == 'rotright') {
 					$twist = 'rotleft';
-				else
+				} else {
 					$twist = 'rotright';
+				}
 
 				$ext = $phototypes[$rr['type']];
 
@@ -1310,10 +1348,9 @@ function photos_content(App $a) {
 
 	}
 
-	/**
+	/*
 	 * Display one photo
 	 */
-
 	if ($datatype === 'image') {
 
 		//$o = '';

From 0e6b00942592ee328eb0df182326edeb688e9c6b Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 25 Mar 2017 14:57:40 +0100
Subject: [PATCH 078/120] fixed another parser error, opps

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 include/update_gcontact.php | 4 +++-
 mod/photos.php              | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/include/update_gcontact.php b/include/update_gcontact.php
index 08d4149a71..2719044a10 100644
--- a/include/update_gcontact.php
+++ b/include/update_gcontact.php
@@ -21,11 +21,13 @@ function update_gcontact_run(&$argv, &$argc){
 
 	$r = q("SELECT * FROM `gcontact` WHERE `id` = %d", intval($contact_id));
 
-	if (!$r)
+	if (!dbm::_is_result($r)) {
 		return;
+	}
 
 	if (!in_array($r[0]["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS)))
 		return;
+	}
 
 	$data = probe_url($r[0]["url"]);
 
diff --git a/mod/photos.php b/mod/photos.php
index e4548bb468..a54aff326a 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -638,7 +638,7 @@ function photos_post(App $a) {
 							}
 						}
 						if ($profile) {
-							if (substr($notify,0,4) === 'cid:') {
+							if (substr($notify, 0, 4) === 'cid:') {
 								$taginfo[] = array($newname, $profile, $notify, $r[0], '@[url=' . str_replace(',','%2c',$profile) . ']' . $newname . '[/url]');
 							} else {
 								$taginfo[] = array($newname, $profile, $notify, null, $str_tags .= '@[url=' . $profile . ']' . $newname . '[/url]');
@@ -1427,8 +1427,8 @@ function photos_content(App $a) {
 		}
 
 		$album_link = 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($ph[0]['album']);
- 		$tools = null;
- 		$lock = null;
+		$tools = null;
+		$lock = null;
 
 		if ($can_post && ($ph[0]['uid'] == $owner_uid)) {
 			$tools = array(

From 952f2218ed21a0af1ba0acecded8b6da5efd1bd2 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 25 Mar 2017 15:12:24 +0100
Subject: [PATCH 079/120] there is already $this->backend around, needs
 renaming

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 boot.php | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/boot.php b/boot.php
index 474cb82057..92acb1b248 100644
--- a/boot.php
+++ b/boot.php
@@ -1255,29 +1255,29 @@ class App {
 	 * @return bool Is it a known backend?
 	 */
 	function is_backend() {
-		static $backend = array();
-		$backend[] = "_well_known";
-		$backend[] = "api";
-		$backend[] = "dfrn_notify";
-		$backend[] = "fetch";
-		$backend[] = "hcard";
-		$backend[] = "hostxrd";
-		$backend[] = "nodeinfo";
-		$backend[] = "noscrape";
-		$backend[] = "p";
-		$backend[] = "poco";
-		$backend[] = "post";
-		$backend[] = "proxy";
-		$backend[] = "pubsub";
-		$backend[] = "pubsubhubbub";
-		$backend[] = "receive";
-		$backend[] = "rsd_xml";
-		$backend[] = "salmon";
-		$backend[] = "statistics_json";
-		$backend[] = "xrd";
+		static $backends = array();
+		$backends[] = "_well_known";
+		$backends[] = "api";
+		$backends[] = "dfrn_notify";
+		$backends[] = "fetch";
+		$backends[] = "hcard";
+		$backends[] = "hostxrd";
+		$backends[] = "nodeinfo";
+		$backends[] = "noscrape";
+		$backends[] = "p";
+		$backends[] = "poco";
+		$backends[] = "post";
+		$backends[] = "proxy";
+		$backends[] = "pubsub";
+		$backends[] = "pubsubhubbub";
+		$backends[] = "receive";
+		$backends[] = "rsd_xml";
+		$backends[] = "salmon";
+		$backends[] = "statistics_json";
+		$backends[] = "xrd";
 
 		// Check if current module is in backend or backend flag is set
-		return (in_array($this->module, self::$backend) || $this->backend);
+		return (in_array($this->module, self::$backends) || $this->backend);
 	}
 
 	/**

From 66f5e104b162c9d5dca44cf4ea0a423bdec5da29 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 25 Mar 2017 15:13:28 +0100
Subject: [PATCH 080/120] and without self:: ;-(

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 boot.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot.php b/boot.php
index 92acb1b248..1d6772b17c 100644
--- a/boot.php
+++ b/boot.php
@@ -1277,7 +1277,7 @@ class App {
 		$backends[] = "xrd";
 
 		// Check if current module is in backend or backend flag is set
-		return (in_array($this->module, self::$backends) || $this->backend);
+		return (in_array($this->module, $backends) || $this->backend);
 	}
 
 	/**

From 33fa1e79af1a7fe7a5af30ae8788136a1d3999a1 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 25 Mar 2017 18:32:11 +0100
Subject: [PATCH 081/120] some spaces ...

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 include/update_gcontact.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/update_gcontact.php b/include/update_gcontact.php
index 2719044a10..d90b98711b 100644
--- a/include/update_gcontact.php
+++ b/include/update_gcontact.php
@@ -2,11 +2,11 @@
 
 use \Friendica\Core\Config;
 
-function update_gcontact_run(&$argv, &$argc){
+function update_gcontact_run(&$argv, &$argc) {
 	global $a;
 
-	require_once('include/Scrape.php');
-	require_once('include/socgraph.php');
+	require_once 'include/Scrape.php';
+	require_once 'include/socgraph.php';
 
 	logger('update_gcontact: start');
 

From 9ddb032bf217f333671b5b4b54bf397207df6caa Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 25 Mar 2017 18:32:33 +0100
Subject: [PATCH 082/120] strange that this curly brace didn't make it in. now
 it is, thanks to @annando

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 include/update_gcontact.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/update_gcontact.php b/include/update_gcontact.php
index d90b98711b..221c0829f5 100644
--- a/include/update_gcontact.php
+++ b/include/update_gcontact.php
@@ -25,7 +25,7 @@ function update_gcontact_run(&$argv, &$argc) {
 		return;
 	}
 
-	if (!in_array($r[0]["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS)))
+	if (!in_array($r[0]["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) {
 		return;
 	}
 

From b97561e0c40c081bbab4a20b57aa57f5f5570057 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 25 Mar 2017 21:19:52 +0100
Subject: [PATCH 083/120] added spaces

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 boot.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/boot.php b/boot.php
index 1d6772b17c..0ed33ad7ec 100644
--- a/boot.php
+++ b/boot.php
@@ -694,7 +694,7 @@ class App {
 		}
 
 		if ((x($_SERVER, 'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'], 0, 9) === "pagename=") {
-			$this->query_string = substr($_SERVER['QUERY_STRING'],9);
+			$this->query_string = substr($_SERVER['QUERY_STRING'], 9);
 			// removing trailing / - maybe a nginx problem
 			/// @TODO can be shortened by trim($str, '/') !
 			if (substr($this->query_string, 0, 1) == "/") {
@@ -717,7 +717,7 @@ class App {
 
 
 		// fix query_string
-		$this->query_string = str_replace($this->cmd."&",$this->cmd."?", $this->query_string);
+		$this->query_string = str_replace($this->cmd . "&", $this->cmd . "?", $this->query_string);
 
 		// unix style "homedir"
 		if (substr($this->cmd, 0, 1) === '~') {
@@ -725,14 +725,12 @@ class App {
 		}
 
 		// Diaspora style profile url
-
 		if (substr($this->cmd,0,2) === 'u/') {
 			$this->cmd = 'profile/' . substr($this->cmd,2);
 		}
 
 
 		/*
-		 *
 		 * Break the URL path into C style argc/argv style arguments for our
 		 * modules. Given "http://example.com/module/arg1/arg2", $this->argc
 		 * will be 3 (integer) and $this->argv will contain:
@@ -743,12 +741,11 @@ class App {
 		 *
 		 * There will always be one argument. If provided a naked domain
 		 * URL, $this->argv[0] is set to "home".
-		 *
 		 */
 
-		$this->argv = explode('/',$this->cmd);
+		$this->argv = explode('/', $this->cmd);
 		$this->argc = count($this->argv);
-		if ((array_key_exists('0',$this->argv)) && strlen($this->argv[0])) {
+		if ((array_key_exists('0', $this->argv)) && strlen($this->argv[0])) {
 			$this->module = str_replace(".", "_", $this->argv[0]);
 			$this->module = str_replace("-", "_", $this->module);
 		} else {
@@ -762,9 +759,10 @@ class App {
 		 * pagination
 		 */
 
-		$this->pager['page'] = ((x($_GET,'page') && intval($_GET['page']) > 0) ? intval($_GET['page']) : 1);
+		$this->pager['page'] = ((x($_GET, 'page') && intval($_GET['page']) > 0) ? intval($_GET['page']) : 1);
 		$this->pager['itemspage'] = 50;
 		$this->pager['start'] = ($this->pager['page'] * $this->pager['itemspage']) - $this->pager['itemspage'];
+
 		if ($this->pager['start'] < 0) {
 			$this->pager['start'] = 0;
 		}

From fda99e39c147d97e038e1bd8e141a7ea5c64a3ec Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 25 Mar 2017 21:21:50 +0100
Subject: [PATCH 084/120] used ltrim() for removing (any) trailing space

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 boot.php | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/boot.php b/boot.php
index 0ed33ad7ec..c9d3045cad 100644
--- a/boot.php
+++ b/boot.php
@@ -695,18 +695,14 @@ class App {
 
 		if ((x($_SERVER, 'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'], 0, 9) === "pagename=") {
 			$this->query_string = substr($_SERVER['QUERY_STRING'], 9);
+
 			// removing trailing / - maybe a nginx problem
-			/// @TODO can be shortened by trim($str, '/') !
-			if (substr($this->query_string, 0, 1) == "/") {
-				$this->query_string = substr($this->query_string, 1);
-			}
+			$this->query_string = lrim($this->query_string, '/');
 		} elseif ((x($_SERVER, 'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'], 0, 2) === "q=") {
 			$this->query_string = substr($_SERVER['QUERY_STRING'],2);
+
 			// removing trailing / - maybe a nginx problem
-			/// @TODO can be shortened by trim($str, '/') !
-			if (substr($this->query_string, 0, 1) == "/") {
-				$this->query_string = substr($this->query_string, 1);
-			}
+			$this->query_string = lrim($this->query_string, '/');
 		}
 
 		if (x($_GET, 'pagename')) {

From 359c246ef91fd9f7201d3c80dee6697b292d70c8 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Sat, 25 Mar 2017 20:43:33 -0400
Subject: [PATCH 085/120] Various fixes

- Removed superfluous CSS rule
- Fixed whitespace
- Restored separators in search_item.tpl
---
 view/theme/frio/css/style.css             | 12 ++----------
 view/theme/frio/templates/search_item.tpl | 19 ++++++++++++++-----
 view/theme/frio/templates/wall_thread.tpl |  2 +-
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index f50365b2b0..74224d82e3 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -658,6 +658,8 @@ nav.navbar a, nav.navbar .btn-link {
 }
 #topbar-first .dropdown.account > a,
 #topbar-first .dropdown.account.open > a,
+#topbar-first .dropdown.account > button,
+#topbar-first .dropdown.account.open > button,
 #topbar-first .dropdown.account > :hover,
 #topbar-first .dropdown.account.open > :hover {
     background-color: $nav_bg;
@@ -846,16 +848,6 @@ nav.navbar a, nav.navbar .btn-link {
 .nav-pills > li > .btn-link {
     border-radius: 4px;
 }
-.dropdown-menu > li > :focus,
-.dropdown-menu > li > :hover {
-    background-color: #e8e8e8;
-    background-image: -webkit-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);
-    background-image: -o-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);
-    background-image: -webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#e8e8e8));
-    background-image: linear-gradient(to bottom,#f5f5f5 0,#e8e8e8 100%);
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);
-    background-repeat: repeat-x;
-}
 .nav-pills .dropdown-menu,
 .nav-tabs .dropdown-menu,
 .account .dropdown-menu,
diff --git a/view/theme/frio/templates/search_item.tpl b/view/theme/frio/templates/search_item.tpl
index 095b38968b..5918710738 100644
--- a/view/theme/frio/templates/search_item.tpl
+++ b/view/theme/frio/templates/search_item.tpl
@@ -169,26 +169,35 @@
 					{{* Buttons for like and dislike *}}
 					{{if $item.vote}}
 						{{if $item.vote.like}}
-						<button type="button" class="btn btn-defaultbutton-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="doLikeAction({{$item.id}}, 'like');">{{$item.vote.like.0}}</button>
+					<button type="button" class="btn btn-defaultbutton-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="doLikeAction({{$item.id}}, 'like');">{{$item.vote.like.0}}</button>
+						{{/if}}
+						{{if $item.vote.like AND $item.vote.dislike}}
+					<span role="presentation" class="separator">•</span>
 						{{/if}}
 
 						{{if $item.vote.dislike}}
-						<button type="button" class="btn btn-defaultbutton-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="doLikeAction({{$item.id}}, 'dislike');">{{$item.vote.dislike.0}}</button>
+					<button type="button" class="btn btn-defaultbutton-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="doLikeAction({{$item.id}}, 'dislike');">{{$item.vote.dislike.0}}</button>
+						{{/if}}
+						{{if ($item.vote.like OR $item.vote.dislike) AND $item.comment}}
+					<span role="presentation" class="separator">•</span>
 						{{/if}}
 					{{/if}}
 
 					{{* Button to open the comment text field *}}
 					{{if $item.comment}}
-					<button type="button" class="btn btn-default" id="comment-{{$item.id}}" title="{{$item.switchcomment}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});">{{$item.switchcomment}}</button>
+						<button type="button" class="btn btn-default" id="comment-{{$item.id}}" title="{{$item.switchcomment}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});">{{$item.switchcomment}}</button>
 					{{/if}}
 
 					{{* Button for sharing the item *}}
 					{{if $item.vote}}
 						{{if $item.vote.share}}
-						<button type="button" class="btn btn-default" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}});"><i class="fa fa-retweet"></i>&nbsp;{{$item.vote.share.0}}</button>
+						{{if $item.vote.like OR $item.vote.dislike OR $item.comment}}
+					<span role="presentation" class="separator">•</span>
+						{{/if}}
+					<button type="button" class="btn btn-default" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}});"><i class="fa fa-retweet"></i>&nbsp;{{$item.vote.share.0}}</button>
 						{{/if}}
 					{{/if}}
-                    <img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
+					<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
 				</div>
 
 
diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl
index 08057a1a95..f2429a78b7 100644
--- a/view/theme/frio/templates/wall_thread.tpl
+++ b/view/theme/frio/templates/wall_thread.tpl
@@ -314,7 +314,7 @@ as the value of $top_child_total (this is done at the end of this file)
 					<button type="button" class="btn-link button-votes" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}});"><i class="fa fa-retweet"></i>&nbsp;{{$item.vote.share.1}}</a>
 					{{/if}}
 				{{/if}}
-                <img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
+				<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
 			</div>
 
 			<div class="wall-item-actions-right pull-right">

From 5b7c8d86311b847c2a4a89c465ae1c510a58be7b Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Sat, 25 Mar 2017 20:45:03 -0400
Subject: [PATCH 086/120] Fix indent in search_item.tpl

---
 view/theme/frio/templates/search_item.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/view/theme/frio/templates/search_item.tpl b/view/theme/frio/templates/search_item.tpl
index 5918710738..fea94fb508 100644
--- a/view/theme/frio/templates/search_item.tpl
+++ b/view/theme/frio/templates/search_item.tpl
@@ -191,9 +191,9 @@
 					{{* Button for sharing the item *}}
 					{{if $item.vote}}
 						{{if $item.vote.share}}
-						{{if $item.vote.like OR $item.vote.dislike OR $item.comment}}
+							{{if $item.vote.like OR $item.vote.dislike OR $item.comment}}
 					<span role="presentation" class="separator">•</span>
-						{{/if}}
+							{{/if}}
 					<button type="button" class="btn btn-default" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}});"><i class="fa fa-retweet"></i>&nbsp;{{$item.vote.share.0}}</button>
 						{{/if}}
 					{{/if}}

From c01c7ad74624018516a8694c52f3893576adc248 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Sat, 25 Mar 2017 21:28:53 -0400
Subject: [PATCH 087/120] Fix .btn-link hover/focus color

---
 view/theme/frio/css/style.css | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index 74224d82e3..79a7b7b2f5 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -210,9 +210,6 @@ a#item-delete-selected {
     padding-left: 0;
     padding-right: 0;
 }
-.btn-link:focus, .btn-link:hover {
-    color: #23527c;
-}
 .btn-eventnav, btn-eventnav:hover {
     font-size: 16px;
     background: none;

From fa9ce4721a82c6889a891c0f90e1062c1401849a Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Sat, 25 Mar 2017 21:29:13 -0400
Subject: [PATCH 088/120] Fix superfluous comment box top margin

---
 view/theme/frio/css/style.css | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index 79a7b7b2f5..92ffcb346f 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -1677,9 +1677,6 @@ code > .hl-main {
 /*
 * Comment Box
 */
-.wall-item-comment-wrapper {
-    margin-top: 10px;
-}
 .thread_level_2 .wall-item-comment-wrapper {
     padding-right: 5px;
 }

From 8db4437ed7a2663c0cbd2cc54e7e6f5496d04a06 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Sat, 25 Mar 2017 21:33:34 -0400
Subject: [PATCH 089/120] Restores bold text for text dropdown button

---
 view/theme/frio/templates/contact_edit.tpl      | 2 +-
 view/theme/frio/templates/contacts-template.tpl | 2 +-
 view/theme/frio/templates/profile_edit.tpl      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/view/theme/frio/templates/contact_edit.tpl b/view/theme/frio/templates/contact_edit.tpl
index aa9abdc9b5..1173830f72 100644
--- a/view/theme/frio/templates/contact_edit.tpl
+++ b/view/theme/frio/templates/contact_edit.tpl
@@ -14,7 +14,7 @@
 				{{* This is the Action menu where contact related actions like 'ignore', 'hide' can be performed *}}
 				<ul id="contact-edit-actions" class="nav nav-pills preferences">
 					<li class="dropdown pull-right">
-						<button type="button" class="btn-link btn-sm dropdown-toggle" id="contact-edit-actions-button" data-toggle="dropdown" aria-expanded="true">
+						<button type="button" class="btn btn-link btn-sm dropdown-toggle" id="contact-edit-actions-button" data-toggle="dropdown" aria-expanded="true">
 							<i class="fa fa-angle-down"></i>&nbsp;{{$contact_action_button}}
 						</button>
 
diff --git a/view/theme/frio/templates/contacts-template.tpl b/view/theme/frio/templates/contacts-template.tpl
index 13617692b8..43330edc95 100644
--- a/view/theme/frio/templates/contacts-template.tpl
+++ b/view/theme/frio/templates/contacts-template.tpl
@@ -36,7 +36,7 @@
 		{{* We put the contact batch actions in a dropdown menu *}}
 		<ul class="nav nav-pills preferences">
 			<li class="dropdown pull-right">
-				<button type="button" class="btn-link btn-sm dropdown-toggle" id="BatchActionDropdownMenuTools" data-toggle="dropdown" aria-expanded="true">
+				<button type="button" class="btn btn-link btn-sm dropdown-toggle" id="BatchActionDropdownMenuTools" data-toggle="dropdown" aria-expanded="true">
 					<i class="fa fa-angle-down"></i>&nbsp;{{$h_batch_actions}}
 				</button>
 				<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="BatchActionDropdownMenuTools">
diff --git a/view/theme/frio/templates/profile_edit.tpl b/view/theme/frio/templates/profile_edit.tpl
index 3c79127b51..0e20bf2135 100644
--- a/view/theme/frio/templates/profile_edit.tpl
+++ b/view/theme/frio/templates/profile_edit.tpl
@@ -6,7 +6,7 @@
 	<div id="profile-edit-links">
 		<ul class="nav nav-pills preferences">
 			<li class="dropdown pull-right">
-				<button type="button" class="btn-link btn-sm dropdown-toggle" id="profile-edit-links-dropdown" data-toggle="dropdown" aria-expanded="true">
+				<button type="button" class="btn btn-link btn-sm dropdown-toggle" id="profile-edit-links-dropdown" data-toggle="dropdown" aria-expanded="true">
 					<i class="fa fa-angle-down"  aria-hidden="true"></i>&nbsp;{{$profile_action}}
 				</button>
 				<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="profile-edit-links-dropdown">

From 9375438216eb21e43fe43201844a5ebc9106d1ea Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Sat, 25 Mar 2017 22:58:17 -0400
Subject: [PATCH 090/120] Restore separator margins

---
 view/theme/frio/css/style.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index 92ffcb346f..5895ad89f0 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -1606,6 +1606,9 @@ code > .hl-main {
 .wall-item-actions .button-likes {
     text-transform: capitalize;
 }
+.wall-item-actions .separator {
+	margin: 0 .3em;
+}
 
 /* wall item hover effects */
 .wall-item-container .wall-item-links,

From 909439e59fe16e3f3d63dd2a206b7523f01447d2 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Sun, 26 Mar 2017 19:22:19 -0400
Subject: [PATCH 091/120] Fix contacts "View" link color

- Fixed whitespaces in `event.tpl`
---
 view/theme/frio/css/style.css       | 3 +++
 view/theme/frio/templates/event.tpl | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index 5895ad89f0..aee4acd3d7 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -210,6 +210,9 @@ a#item-delete-selected {
     padding-left: 0;
     padding-right: 0;
 }
+.btn {
+	color: inherit;
+}
 .btn-eventnav, btn-eventnav:hover {
     font-size: 16px;
     background: none;
diff --git a/view/theme/frio/templates/event.tpl b/view/theme/frio/templates/event.tpl
index 4189baf316..e73d04eccf 100644
--- a/view/theme/frio/templates/event.tpl
+++ b/view/theme/frio/templates/event.tpl
@@ -16,9 +16,9 @@
 				</div>
 			</div>
 
-			<div class="event-buttons pull-right">				
+			<div class="event-buttons pull-right">
 				{{if $event.edit}}<button type="button" class="btn" onclick="eventEdit('{{$event.edit.0}}')" title="{{$event.edit.1}}"><i class="fa fa-pencil" aria-hidden="true"></i></button>{{/if}}
-        {{if $event.drop}}<a href="{{$event.drop.0}}" onclick="return confirmDelete();" title="{{$event.drop.1}}" class="drop-event-link btn"><i class="fa fa-trash-o" aria-hidden="true"></i></a>{{/if}}
+				{{if $event.drop}}<a href="{{$event.drop.0}}" onclick="return confirmDelete();" title="{{$event.drop.1}}" class="drop-event-link btn"><i class="fa fa-trash-o" aria-hidden="true"></i></a>{{/if}}
 				{{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" class="plink-event-link btn "><i class="fa fa-external-link" aria-hidden="true"></i></a>{{/if}}
 			</div>
 			<div class="clear"></div>

From 0ac1af7300edf9d9f5df7fae75f578b8de0f7333 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 30 Mar 2017 20:22:03 +0200
Subject: [PATCH 092/120] spaces added according code convention and CR + fixed
 tzpo in function name (opps)

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 boot.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/boot.php b/boot.php
index c9d3045cad..3bf85b14f4 100644
--- a/boot.php
+++ b/boot.php
@@ -699,10 +699,10 @@ class App {
 			// removing trailing / - maybe a nginx problem
 			$this->query_string = lrim($this->query_string, '/');
 		} elseif ((x($_SERVER, 'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'], 0, 2) === "q=") {
-			$this->query_string = substr($_SERVER['QUERY_STRING'],2);
+			$this->query_string = substr($_SERVER['QUERY_STRING'], 2);
 
 			// removing trailing / - maybe a nginx problem
-			$this->query_string = lrim($this->query_string, '/');
+			$this->query_string = ltrim($this->query_string, '/');
 		}
 
 		if (x($_GET, 'pagename')) {

From 32da3b2f58607868800794d85f1f07d313537e23 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 30 Mar 2017 20:24:55 +0200
Subject: [PATCH 093/120] removed commented-out by CR request + it is ... SPACE
 TIME! ;-)

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 index.php | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/index.php b/index.php
index 8560f8c277..ebc65cdb01 100644
--- a/index.php
+++ b/index.php
@@ -66,10 +66,10 @@ if (!$install) {
 	}
 
 	if (get_config('system', 'force_ssl') AND ($a->get_scheme() == "http") AND
-		(intval(get_config('system','ssl_policy')) == SSL_POLICY_FULL) AND
+		(intval(get_config('system', 'ssl_policy')) == SSL_POLICY_FULL) AND
 		(substr(App::get_baseurl(), 0, 8) == "https://")) {
 		header("HTTP/1.1 302 Moved Temporarily");
-		header("Location: ".App::get_baseurl()."/".$a->query_string);
+		header("Location: " . App::get_baseurl() . "/" . $a->query_string);
 		exit();
 	}
 
@@ -336,14 +336,6 @@ if ($a->module_loaded) {
 		$func = str_replace('-','_',current_theme()) . '_init';
 		$func($a);
 	}
-/// @TODO commented out? old-lost again? :-)
-//	elseif (x($a->theme_info,"extends") && file_exists("view/theme/".$a->theme_info["extends"]."/theme.php")) {
-//		require_once("view/theme/".$a->theme_info["extends"]."/theme.php");
-//		if (function_exists(str_replace('-','_',$a->theme_info["extends"]) . '_init')) {
-//			$func = str_replace('-','_',$a->theme_info["extends"]) . '_init';
-//			$func($a);
-//		}
-//	}
 
 	if (($_SERVER['REQUEST_METHOD'] === 'POST') && (! $a->error)
 		&& (function_exists($a->module . '_post'))

From e0f4d2204991b7c53268bfa9d0ec855db387ffe3 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 30 Mar 2017 20:26:36 +0200
Subject: [PATCH 094/120] removed old-lost code by CR request + spaces added
 ...

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 mod/dfrn_notify.php | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 5f4fc3a1fa..84d589a217 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -136,21 +136,14 @@ function dfrn_notify_post(App $a) {
 
 	}
 
-	/// @TODO remove this old-lost code then?
-	// If we are setup as a soapbox we aren't accepting input from this person
-	// This behaviour is deactivated since it really doesn't make sense to even disallow comments
-	// The check if someone is a friend or simply a follower is done in a later place so it needn't to be done here
-	//if($importer['page-flags'] == PAGE_SOAPBOX)
-	//	xml_status(0);
-
-	$rino = get_config('system','rino_encrypt');
+	$rino = get_config('system', 'rino_encrypt');
 	$rino = intval($rino);
 	// use RINO1 if mcrypt isn't installed and RINO2 was selected
 	if ($rino == 2 && !function_exists('mcrypt_create_iv')) {
 		$rino = 1;
 	}
 
-	logger("Local rino version: ". $rino, LOGGER_DEBUG);
+	logger("Local rino version: " .  $rino, LOGGER_DEBUG);
 
 	if (strlen($key)) {
 

From 9c056d0bf0a8102b021d8c96d21e7fe1484d0677 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 30 Mar 2017 20:30:23 +0200
Subject: [PATCH 095/120] it is ... SPACE TIME! ;-)

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 mod/dfrn_notify.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 84d589a217..ddb6afe4e4 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -160,15 +160,15 @@ function dfrn_notify_post(App $a) {
 
 		if ($dfrn_version >= 2.1) {
 			if ((($importer['duplex']) && strlen($importer['cprvkey'])) || (! strlen($importer['cpubkey']))) {
-				openssl_private_decrypt($rawkey,$final_key,$importer['cprvkey']);
+				openssl_private_decrypt($rawkey, $final_key, $importer['cprvkey']);
 			} else {
-				openssl_public_decrypt($rawkey,$final_key,$importer['cpubkey']);
+				openssl_public_decrypt($rawkey, $final_key, $importer['cpubkey']);
 			}
 		} else {
 			if ((($importer['duplex']) && strlen($importer['cpubkey'])) || (! strlen($importer['cprvkey']))) {
-				openssl_public_decrypt($rawkey,$final_key,$importer['cpubkey']);
+				openssl_public_decrypt($rawkey, $final_key, $importer['cpubkey']);
 			} else {
-				openssl_private_decrypt($rawkey,$final_key,$importer['cprvkey']);
+				openssl_private_decrypt($rawkey, $final_key, $importer['cprvkey']);
 			}
 		}
 
@@ -181,11 +181,11 @@ function dfrn_notify_post(App $a) {
 				 * we got a key. old code send only the key, without RINO version.
 				 * we assume RINO 1 if key and no RINO version
 				 */
-				$data = aes_decrypt(hex2bin($data),$final_key);
+				$data = aes_decrypt(hex2bin($data), $final_key);
 				break;
 			case 2:
 				try {
-					$data = Crypto::decrypt(hex2bin($data),$final_key);
+					$data = Crypto::decrypt(hex2bin($data), $final_key);
 				} catch (InvalidCiphertext $ex) { // VERY IMPORTANT
 					/*
 					 * Either:
@@ -195,13 +195,13 @@ function dfrn_notify_post(App $a) {
 					 * Assume the worst.
 					 */
 					logger('The ciphertext has been tampered with!');
-					xml_status(0,'The ciphertext has been tampered with!');
+					xml_status(0, 'The ciphertext has been tampered with!');
 				} catch (Ex\CryptoTestFailed $ex) {
 					logger('Cannot safely perform dencryption');
-					xml_status(0,'CryptoTestFailed');
+					xml_status(0, 'CryptoTestFailed');
 				} catch (Ex\CannotPerformOperation $ex) {
 					logger('Cannot safely perform decryption');
-					xml_status(0,'Cannot safely perform decryption');
+					xml_status(0, 'Cannot safely perform decryption');
 				}
 				break;
 			default:

From d0917598888930ab083ab6a52ce72334fa2992c8 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 30 Mar 2017 20:33:38 +0200
Subject: [PATCH 096/120] space to the rescue ... ;-) CR request

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 include/dfrn.php    |  2 +-
 mod/dfrn_notify.php |  2 +-
 mod/photos.php      | 20 ++++++++++----------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/include/dfrn.php b/include/dfrn.php
index d9012fe702..83d76a0ae4 100644
--- a/include/dfrn.php
+++ b/include/dfrn.php
@@ -955,7 +955,7 @@ class dfrn {
 			$idtosend = '1:' . $orig_id;
 		}
 
-		$rino = get_config('system','rino_encrypt');
+		$rino = get_config('system', 'rino_encrypt');
 		$rino = intval($rino);
 
 		// use RINO1 if mcrypt isn't installed and RINO2 was selected
diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index ddb6afe4e4..ddbc9219b1 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -314,7 +314,7 @@ function dfrn_notify_content(App $a) {
 		$encrypted_id = bin2hex($encrypted_id);
 
 
-		$rino = get_config('system','rino_encrypt');
+		$rino = get_config('system', 'rino_encrypt');
 		$rino = intval($rino);
 		// use RINO1 if mcrypt isn't installed and RINO2 was selected
 		if ($rino == 2 && !function_exists('mcrypt_create_iv')) {
diff --git a/mod/photos.php b/mod/photos.php
index a54aff326a..376f8ec7c6 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -18,7 +18,7 @@ function photos_init(App $a) {
 		auto_redir($a, $a->argv[1]);
 	}
 
-	if ((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+	if ((get_config('system', 'block_public')) && (! local_user()) && (! remote_user())) {
 		return;
 	}
 
@@ -562,9 +562,9 @@ function photos_post(App $a) {
 					if (isset($profile)) {
 						unset($profile);
 					}
-					if (strpos($tag,'@') === 0) {
+					if (strpos($tag, '@') === 0) {
 						$name = substr($tag,1);
-						if ((strpos($name,'@')) || (strpos($name,'http://'))) {
+						if ((strpos($name, '@')) || (strpos($name, 'http://'))) {
 							$newname = $name;
 							$links = @Probe::lrdd($name);
 							if (count($links)) {
@@ -573,7 +573,7 @@ function photos_post(App $a) {
 										$profile = $link['@attributes']['href'];
 									}
 									if ($link['@attributes']['rel'] === 'salmon') {
-										$salmon = '$url:' . str_replace(',','%sc',$link['@attributes']['href']);
+										$salmon = '$url:' . str_replace(',', '%sc', $link['@attributes']['href']);
 										if (strlen($inform)) {
 											$inform .= ',';
 										}
@@ -581,13 +581,13 @@ function photos_post(App $a) {
 									}
 								}
 							}
-							$taginfo[] = array($newname,$profile,$salmon);
+							$taginfo[] = array($newname, $profile, $salmon);
 						} else {
 							$newname = $name;
 							$alias = '';
 							$tagcid = 0;
-							if (strrpos($newname,'+')) {
-								$tagcid = intval(substr($newname,strrpos($newname, '+') + 1));
+							if (strrpos($newname, '+')) {
+								$tagcid = intval(substr($newname, strrpos($newname, '+') + 1));
 							}
 
 							if ($tagcid) {
@@ -649,9 +649,9 @@ function photos_post(App $a) {
 							$profile = str_replace(',', '%2c', $profile);
 							$str_tags .= '@[url='.$profile.']'.$newname.'[/url]';
 						}
-					} elseif (strpos($tag,'#') === 0) {
+					} elseif (strpos($tag, '#') === 0) {
 						$tagname = substr($tag, 1);
-						$str_tags .= '#[url='.App::get_baseurl()."/search?tag=".$tagname.']'.$tagname.'[/url]';
+						$str_tags .= '#[url=' . App::get_baseurl() . "/search?tag=" . $tagname . ']' . $tagname . '[/url]';
 					}
 				}
 			}
@@ -988,7 +988,7 @@ function photos_content(App $a) {
 	// photos/name/image/xxxxx/edit
 
 
-	if ((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+	if ((get_config('system', 'block_public')) && (! local_user()) && (! remote_user())) {
 		notice( t('Public access denied.') . EOL);
 		return;
 	}

From 3d595c4dcc57e163400c01129f45d5e99eca16b7 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 30 Mar 2017 21:32:12 +0200
Subject: [PATCH 097/120] Continued a bit: - added spaces / curly braces -
 converted multiple single-line comments into one multi-line comment - used
 more dbm::is_result() - include/require are no functions, let's not abuse
 them ...

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 mod/item.php | 405 ++++++++++++++++++++++++++-------------------------
 1 file changed, 209 insertions(+), 196 deletions(-)

diff --git a/mod/item.php b/mod/item.php
index 6da9ce88e8..1f80719981 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -1,43 +1,44 @@
 <?php
 
-/**
- *
+/*
  * This is the POST destination for most all locally posted
  * text stuff. This function handles status, wall-to-wall status,
  * local comments, and remote coments that are posted on this site
  * (as opposed to being delivered in a feed).
  * Also processed here are posts and comments coming through the
  * statusnet/twitter API.
+ *
  * All of these become an "item" which is our basic unit of
  * information.
+ *
  * Posts that originate externally or do not fall into the above
  * posting categories go through item_store() instead of this function.
- *
  */
 
-require_once('include/crypto.php');
-require_once('include/enotify.php');
-require_once('include/email.php');
-require_once('include/tags.php');
-require_once('include/files.php');
-require_once('include/threads.php');
-require_once('include/text.php');
-require_once('include/items.php');
-require_once('include/Scrape.php');
-require_once('include/diaspora.php');
-require_once('include/Contact.php');
+require_once 'include/crypto.php';
+require_once 'include/enotify.php';
+require_once 'include/email.php';
+require_once 'include/tags.php';
+require_once 'include/files.php';
+require_once 'include/threads.php';
+require_once 'include/text.php';
+require_once 'include/items.php';
+require_once 'include/Scrape.php';
+require_once 'include/diaspora.php';
+require_once 'include/Contact.php';
 
 function item_post(App $a) {
 
-	if((! local_user()) && (! remote_user()) && (! x($_REQUEST,'commenter')))
+	if ((! local_user()) && (! remote_user()) && (! x($_REQUEST,'commenter'))) {
 		return;
+	}
 
 	require_once('include/security.php');
 
 	$uid = local_user();
 
-	if(x($_REQUEST,'dropitems')) {
-		$arr_drop = explode(',',$_REQUEST['dropitems']);
+	if (x($_REQUEST, 'dropitems')) {
+		$arr_drop = explode(',', $_REQUEST['dropitems']);
 		drop_items($arr_drop);
 		$json = array('success' => 1);
 		echo json_encode($json);
@@ -45,34 +46,31 @@ function item_post(App $a) {
 	}
 
 	call_hooks('post_local_start', $_REQUEST);
-//	logger('postinput ' . file_get_contents('php://input'));
+	// logger('postinput ' . file_get_contents('php://input'));
 	logger('postvars ' . print_r($_REQUEST,true), LOGGER_DATA);
 
-	$api_source = ((x($_REQUEST,'api_source') && $_REQUEST['api_source']) ? true : false);
+	$api_source = ((x($_REQUEST, 'api_source') && $_REQUEST['api_source']) ? true : false);
 
-	$message_id = ((x($_REQUEST,'message_id') && $api_source)  ? strip_tags($_REQUEST['message_id'])       : '');
+	$message_id = ((x($_REQUEST, 'message_id') && $api_source) ? strip_tags($_REQUEST['message_id']) : '');
 
-	$return_path = ((x($_REQUEST,'return')) ? $_REQUEST['return'] : '');
-	$preview = ((x($_REQUEST,'preview')) ? intval($_REQUEST['preview']) : 0);
+	$return_path = ((x($_REQUEST, 'return')) ? $_REQUEST['return'] : '');
+	$preview = ((x($_REQUEST, 'preview')) ? intval($_REQUEST['preview']) : 0);
 
-
-	// Check for doubly-submitted posts, and reject duplicates
-	// Note that we have to ignore previews, otherwise nothing will post
-	// after it's been previewed
-	if (!$preview && x($_REQUEST['post_id_random'])) {
-		if (x($_SESSION['post-random']) && $_SESSION['post-random'] == $_REQUEST['post_id_random']) {
+	/*
+	 * Check for doubly-submitted posts, and reject duplicates
+	 * Note that we have to ignore previews, otherwise nothing will post
+	 * after it's been previewed
+	 */
+	if (!$preview && x($_REQUEST, 'post_id_random')) {
+		if (x($_SESSION, 'post-random') && $_SESSION['post-random'] == $_REQUEST['post_id_random']) {
 			logger("item post: duplicate post", LOGGER_DEBUG);
 			item_post_return(App::get_baseurl(), $api_source, $return_path);
-		}
-		else {
+		} else {
 			$_SESSION['post-random'] = $_REQUEST['post_id_random'];
 		}
 	}
 
-	/**
-	 * Is this a reply to something?
-	 */
-
+	// Is this a reply to something?
 	$parent = ((x($_REQUEST,'parent')) ? intval($_REQUEST['parent']) : 0);
 	$parent_uri = ((x($_REQUEST,'parent_uri')) ? trim($_REQUEST['parent_uri']) : '');
 
@@ -133,8 +131,9 @@ function item_post(App $a) {
 				intval($parent_item['contact-id']),
 				intval($uid)
 			);
-			if (dbm::is_result($r))
+			if (dbm::is_result($r)) {
 				$parent_contact = $r[0];
+			}
 
 			// If the contact id doesn't fit with the contact, then set the contact to null
 			$thrparent = q("SELECT `author-link`, `network` FROM `item` WHERE `uri` = '%s' LIMIT 1", dbesc($thr_parent));
@@ -153,16 +152,20 @@ function item_post(App $a) {
 						$parent_contact["addr"] = $probed_contact["addr"];
 					}
 				}
-				logger('no contact found: '.print_r($thrparent, true), LOGGER_DEBUG);
-			} else
-				logger('parent contact: '.print_r($parent_contact, true), LOGGER_DEBUG);
+				logger('no contact found: ' . print_r($thrparent, true), LOGGER_DEBUG);
+			} else {
+				logger('parent contact: ' . print_r($parent_contact, true), LOGGER_DEBUG);
+			}
 
-			if ($parent_contact["nick"] == "")
+			if ($parent_contact["nick"] == "") {
 				$parent_contact["nick"] = $parent_contact["name"];
+			}
 		}
 	}
 
-	if($parent) logger('mod_item: item_post parent=' . $parent);
+	if ($parent) {
+		logger('mod_item: item_post parent=' . $parent);
+	}
 
 	$profile_uid = ((x($_REQUEST,'profile_uid')) ? intval($_REQUEST['profile_uid']) : 0);
 	$post_id     = ((x($_REQUEST,'post_id'))     ? intval($_REQUEST['post_id'])     : 0);
@@ -189,22 +192,23 @@ function item_post(App $a) {
 
 	// First check that the parent exists and it is a wall item.
 
-	if((x($_REQUEST,'commenter')) && ((! $parent) || (! $parent_item['wall']))) {
-		notice( t('Permission denied.') . EOL) ;
-		if(x($_REQUEST,'return'))
+	if ((x($_REQUEST, 'commenter')) && ((! $parent) || (! $parent_item['wall']))) {
+		notice(t('Permission denied.') . EOL) ;
+		if (x($_REQUEST, 'return')) {
 			goaway($return_path);
+		}
 		killme();
 	}
 
-	// Now check that it is a page_type of PAGE_BLOG, and that valid personal details
-	// have been provided, and run any anti-spam plugins
-
-
-
-	if((! can_write_wall($a,$profile_uid)) && (! $allow_moderated)) {
-		notice( t('Permission denied.') . EOL) ;
-		if(x($_REQUEST,'return'))
+	/*
+	 * Now check that it is a page_type of PAGE_BLOG, and that valid personal details
+	 * have been provided, and run any anti-spam plugins
+	 */
+	if ((! can_write_wall($a, $profile_uid)) && (! $allow_moderated)) {
+		notice(t('Permission denied.') . EOL) ;
+		if (x($_REQUEST, 'return')) {
 			goaway($return_path);
+		}
 		killme();
 	}
 
@@ -213,7 +217,7 @@ function item_post(App $a) {
 
 	$orig_post = null;
 
-	if($post_id) {
+	if ($post_id) {
 		$i = q("SELECT * FROM `item` WHERE `uid` = %d AND `id` = %d LIMIT 1",
 			intval($profile_uid),
 			intval($post_id)
@@ -229,10 +233,11 @@ function item_post(App $a) {
 	$r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
 		intval($profile_uid)
 	);
-	if (dbm::is_result($r))
+	if (dbm::is_result($r)) {
 		$user = $r[0];
+	}
 
-	if($orig_post) {
+	if ($orig_post) {
 		$str_group_allow   = $orig_post['allow_gid'];
 		$str_contact_allow = $orig_post['allow_cid'];
 		$str_group_deny    = $orig_post['deny_gid'];
@@ -254,11 +259,13 @@ function item_post(App $a) {
 
 	} else {
 
-		// if coming from the API and no privacy settings are set,
-		// use the user default permissions - as they won't have
-		// been supplied via a form.
+		/*
+		 * if coming from the API and no privacy settings are set,
+		 * use the user default permissions - as they won't have
+		 * been supplied via a form.
+		 */
 
-		if(($api_source)
+		if (($api_source)
 			&& (! array_key_exists('contact_allow',$_REQUEST))
 			&& (! array_key_exists('group_allow',$_REQUEST))
 			&& (! array_key_exists('contact_deny',$_REQUEST))
@@ -267,8 +274,7 @@ function item_post(App $a) {
 			$str_contact_allow = $user['allow_cid'];
 			$str_group_deny    = $user['deny_gid'];
 			$str_contact_deny  = $user['deny_cid'];
-		}
-		else {
+		} else {
 
 			// use the posted permissions
 
@@ -287,26 +293,25 @@ function item_post(App $a) {
 		$network           = notags(trim($_REQUEST['network']));
 		$guid              = get_guid(32);
 
-
 		item_add_language_opt($_REQUEST);
 		$postopts = $_REQUEST['postopts'] ? $_REQUEST['postopts'] : "";
 
-
 		$private = ((strlen($str_group_allow) || strlen($str_contact_allow) || strlen($str_group_deny) || strlen($str_contact_deny)) ? 1 : 0);
 
-
-		if($user['hidewall'])
+		if ($user['hidewall']) {
 			$private = 2;
+		}
 
 		// If this is a comment, set the permissions from the parent.
 
-		if($parent_item) {
+		if ($parent_item) {
 
 			// for non native networks use the network of the original post as network of the item
 			if (($parent_item['network'] != NETWORK_DIASPORA)
 				AND ($parent_item['network'] != NETWORK_OSTATUS)
-				AND ($network == ""))
+				AND ($network == "")) {
 				$network = $parent_item['network'];
+			}
 
 			$str_contact_allow = $parent_item['allow_cid'];
 			$str_group_allow   = $parent_item['allow_gid'];
@@ -315,32 +320,35 @@ function item_post(App $a) {
 			$private           = $parent_item['private'];
 		}
 
-		$pubmail_enable    = ((x($_REQUEST,'pubmail_enable') && intval($_REQUEST['pubmail_enable']) && (! $private)) ? 1 : 0);
+		$pubmail_enable    = ((x($_REQUEST, 'pubmail_enable') && intval($_REQUEST['pubmail_enable']) && (! $private)) ? 1 : 0);
 
 		// if using the API, we won't see pubmail_enable - figure out if it should be set
 
-		if($api_source && $profile_uid && $profile_uid == local_user() && (! $private)) {
+		if ($api_source && $profile_uid && $profile_uid == local_user() && (! $private)) {
 			$mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
-			if(! $mail_disabled) {
+			if (! $mail_disabled) {
 				$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1",
 					intval(local_user())
 				);
-				if (dbm::is_result($r) && intval($r[0]['pubmail']))
+				if (dbm::is_result($r) && intval($r[0]['pubmail'])) {
 					$pubmail_enabled = true;
+				}
 			}
 		}
 
-		if(! strlen($body)) {
-			if($preview)
+		if (! strlen($body)) {
+			if ($preview) {
 				killme();
-			info( t('Empty post discarded.') . EOL );
-			if(x($_REQUEST,'return'))
+			}
+			info(t('Empty post discarded.') . EOL );
+			if (x($_REQUEST, 'return')) {
 				goaway($return_path);
+			}
 			killme();
 		}
 	}
 
-	if(strlen($categories)) {
+	if (strlen($categories)) {
 		// get the "fileas" tags for this post
 		$filedas = file_tag_file_to_list($categories, 'file');
 	}
@@ -348,7 +356,7 @@ function item_post(App $a) {
 	$categories_old = $categories;
 	$categories = file_tag_list_to_file(trim($_REQUEST['category']), 'category');
 	$categories_new = $categories;
-	if(strlen($filedas)) {
+	if (strlen($filedas)) {
 		// append the fileas stuff to the new categories list
 		$categories .= file_tag_list_to_file($filedas, 'file');
 	}
@@ -359,21 +367,20 @@ function item_post(App $a) {
 	$self   = false;
 	$contact_id = 0;
 
-	if((local_user()) && (local_user() == $profile_uid)) {
+	if ((local_user()) && (local_user() == $profile_uid)) {
 		$self = true;
 		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
 			intval($_SESSION['uid']));
-	}
-	elseif(remote_user()) {
-		if(is_array($_SESSION['remote'])) {
-			foreach($_SESSION['remote'] as $v) {
-				if($v['uid'] == $profile_uid) {
+	} elseif(remote_user()) {
+		if (is_array($_SESSION['remote'])) {
+			foreach ($_SESSION['remote'] as $v) {
+				if ($v['uid'] == $profile_uid) {
 					$contact_id = $v['cid'];
 					break;
 				}
 			}
 		}
-		if($contact_id) {
+		if ($contact_id) {
 			$r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
 				intval($contact_id)
 			);
@@ -387,30 +394,28 @@ function item_post(App $a) {
 
 	// get contact info for owner
 
-	if($profile_uid == local_user()) {
+	if ($profile_uid == local_user()) {
 		$contact_record = $author;
-	}
-	else {
+	} else {
 		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
 			intval($profile_uid)
 		);
-		if (dbm::is_result($r))
+		if (dbm::is_result($r)) {
 			$contact_record = $r[0];
+		}
 	}
 
 	$post_type = notags(trim($_REQUEST['type']));
 
-	if($post_type === 'net-comment') {
-		if($parent_item !== null) {
-			if($parent_item['wall'] == 1)
-				$post_type = 'wall-comment';
-			else
-				$post_type = 'remote-comment';
+	if ($post_type === 'net-comment' && $parent_item !== null) {
+		if ($parent_item['wall'] == 1) {
+			$post_type = 'wall-comment';
+		} else {
+			$post_type = 'remote-comment';
 		}
 	}
 
-	/**
-	 *
+	/*
 	 * When a photo was uploaded into the message using the (profile wall) ajax
 	 * uploader, The permissions are initially set to disallow anybody but the
 	 * owner from seeing it. This is because the permissions may not yet have been
@@ -418,14 +423,13 @@ function item_post(App $a) {
 	 * appropriately. But we didn't know the final permissions on the post until
 	 * now. So now we'll look for links of uploaded messages that are in the
 	 * post and set them to the same permissions as the post itself.
-	 *
 	 */
 
 	$match = null;
 
-	if((! $preview) && preg_match_all("/\[img([\=0-9x]*?)\](.*?)\[\/img\]/",$body,$match)) {
+	if ((! $preview) && preg_match_all("/\[img([\=0-9x]*?)\](.*?)\[\/img\]/",$body,$match)) {
 		$images = $match[2];
-		if(count($images)) {
+		if (count($images)) {
 
 			$objecttype = ACTIVITY_OBJ_IMAGE;
 
@@ -466,16 +470,15 @@ function item_post(App $a) {
 	}
 
 
-	/**
+	/*
 	 * Next link in any attachment references we find in the post.
 	 */
-
 	$match = false;
 
-	if((! $preview) && preg_match_all("/\[attachment\](.*?)\[\/attachment\]/",$body,$match)) {
+	if ((! $preview) && preg_match_all("/\[attachment\](.*?)\[\/attachment\]/", $body, $match)) {
 		$attaches = $match[1];
-		if(count($attaches)) {
-			foreach($attaches as $attach) {
+		if (count($attaches)) {
+			foreach ($attaches as $attach) {
 				$r = q("SELECT * FROM `attach` WHERE `uid` = %d AND `id` = %d LIMIT 1",
 					intval($profile_uid),
 					intval($attach)
@@ -499,7 +502,7 @@ function item_post(App $a) {
 
 	$bookmark = 0;
 	$data = get_attachment_data($body);
-        if (preg_match_all("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", $body, $match, PREG_SET_ORDER) OR isset($data["type"])) {
+	if (preg_match_all("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", $body, $match, PREG_SET_ORDER) OR isset($data["type"])) {
 		$objecttype = ACTIVITY_OBJ_BOOKMARK;
 		$bookmark = 1;
 	}
@@ -507,46 +510,39 @@ function item_post(App $a) {
 	$body = bb_translate_video($body);
 
 
-	/**
-	 * Fold multi-line [code] sequences
-	 */
-
-	$body = preg_replace('/\[\/code\]\s*\[code\]/ism',"\n",$body);
+	// Fold multi-line [code] sequences
+	$body = preg_replace('/\[\/code\]\s*\[code\]/ism', "\n", $body);
 
 	$body = scale_external_images($body,false);
 
-
 	// Setting the object type if not defined before
 	if (!$objecttype) {
 		$objecttype = ACTIVITY_OBJ_NOTE; // Default value
 		require_once("include/plaintext.php");
 		$objectdata = get_attached_data($body);
 
-		if ($post["type"] == "link")
+		if ($post["type"] == "link") {
 			$objecttype = ACTIVITY_OBJ_BOOKMARK;
-		elseif ($post["type"] == "video")
+		} elseif ($post["type"] == "video") {
 			$objecttype = ACTIVITY_OBJ_VIDEO;
-		elseif ($post["type"] == "photo")
+		} elseif ($post["type"] == "photo") {
 			$objecttype = ACTIVITY_OBJ_IMAGE;
+		}
 
 	}
 
-	/**
-	 * Look for any tags and linkify them
-	 */
-
+	// Look for any tags and linkify them
 	$str_tags = '';
 	$inform   = '';
 
-
 	$tags = get_tags($body);
 
-	/**
+	/*
 	 * add a statusnet style reply tag if the original post was from there
 	 * and we are replying, and there isn't one already
 	 */
 	if ($parent AND ($parent_contact['network'] == NETWORK_OSTATUS)) {
-		$contact = '@[url='.$parent_contact['url'].']'.$parent_contact['nick'].'[/url]';
+		$contact = '@[url=' . $parent_contact['url'] . ']' . $parent_contact['nick'] . '[/url]';
 
 		if (!in_array($contact,$tags)) {
 			$body = $contact.' '.$body;
@@ -557,39 +553,43 @@ function item_post(App $a) {
 		$toplevel_parent = q("SELECT `contact`.* FROM `contact`
 						INNER JOIN `item` ON `item`.`contact-id` = `contact`.`id` AND `contact`.`url` = `item`.`author-link`
 						WHERE `item`.`id` = `item`.`parent` AND `item`.`parent` = %d", intval($parent));
-		if ($toplevel_parent)
-			$toplevel_contact = '@'.$toplevel_parent[0]['nick'].'+'.$toplevel_parent[0]['id'];
-		else {
+		if (dbm::is_result($toplevel_parent)) {
+			$toplevel_contact = '@' . $toplevel_parent[0]['nick'] . '+' . $toplevel_parent[0]['id'];
+		} else {
 			$toplevel_parent = q("SELECT `author-link`, `author-name` FROM `item` WHERE `id` = `parent` AND `parent` = %d", intval($parent));
 			$toplevel_contact = '@[url='.$toplevel_parent[0]['author-link'].']'.$toplevel_parent[0]['author-name'].'[/url]';
 		}
 
-		if (!in_array($toplevel_contact,$tags))
+		if (!in_array($toplevel_contact, $tags)) [
 			$tags[] = $toplevel_contact;
+		}
 	}
 
 	$tagged = array();
 
 	$private_forum = false;
 
-	if(count($tags)) {
-		foreach($tags as $tag) {
+	if (count($tags)) {
+		foreach ($tags as $tag) {
 
-			if(strpos($tag,'#') === 0)
+			if (strpos($tag, '#') === 0) {
 				continue;
+			}
 
-			// If we already tagged 'Robert Johnson', don't try and tag 'Robert'.
-			// Robert Johnson should be first in the $tags array
-
+			/*
+			 * If we already tagged 'Robert Johnson', don't try and tag 'Robert'.
+			 * Robert Johnson should be first in the $tags array
+			 */
 			$fullnametagged = false;
-			for($x = 0; $x < count($tagged); $x ++) {
-				if(stristr($tagged[$x],$tag . ' ')) {
+			for ($x = 0; $x < count($tagged); $x ++) {
+				if (stristr($tagged[$x],$tag . ' ')) {
 					$fullnametagged = true;
 					break;
 				}
 			}
-			if($fullnametagged)
+			if ($fullnametagged) {
 				continue;
+			}
 
 			$success = handle_tag($a, $body, $inform, $str_tags, (local_user()) ? local_user() : $profile_uid , $tag, $network);
 			if ($success['replaced']) {
@@ -668,11 +668,11 @@ function item_post(App $a) {
 	$datarray['owner-name']    = $contact_record['name'];
 	$datarray['owner-link']    = $contact_record['url'];
 	$datarray['owner-avatar']  = $contact_record['thumb'];
-	$datarray["owner-id"]      = get_contact($datarray["owner-link"], 0);
+	$datarray['owner-id']      = get_contact($datarray['owner-link'], 0);
 	$datarray['author-name']   = $author['name'];
 	$datarray['author-link']   = $author['url'];
 	$datarray['author-avatar'] = $author['thumb'];
-	$datarray["author-id"]     = get_contact($datarray["author-link"], 0);
+	$datarray['author-id']     = get_contact($datarray['author-link'], 0);
 	$datarray['created']       = datetime_convert();
 	$datarray['edited']        = datetime_convert();
 	$datarray['commented']     = datetime_convert();
@@ -707,30 +707,29 @@ function item_post(App $a) {
 							"photo" => $datarray['author-avatar'], "name" => $datarray['author-name']));
 	$datarray['object']        = $object;
 
-	/**
+	/*
 	 * These fields are for the convenience of plugins...
 	 * 'self' if true indicates the owner is posting on their own wall
 	 * If parent is 0 it is a top-level post.
 	 */
-
 	$datarray['parent']        = $parent;
 	$datarray['self']          = $self;
 //	$datarray['prvnets']       = $user['prvnets'];
 
 	$datarray['parent-uri'] = ($parent == 0) ? $uri : $parent_item['uri'];
-	$datarray['plink'] = App::get_baseurl().'/display/'.urlencode($datarray['guid']);
+	$datarray['plink'] = App::get_baseurl() . '/display/' . urlencode($datarray['guid']);
 	$datarray['last-child'] = 1;
 	$datarray['visible'] = 1;
 
-	if($orig_post)
-		$datarray['edit']      = true;
+	if ($orig_post) {
+		$datarray['edit'] = true;
+	}
 
 	// Search for hashtags
 	item_body_set_hashtags($datarray);
 
 	// preview mode - prepare the body for display and send it via json
-
-	if($preview) {
+	if ($preview) {
 		require_once('include/conversation.php');
 		// We set the datarray ID to -1 because in preview mode the dataray
 		// doesn't have an ID.
@@ -741,12 +740,11 @@ function item_post(App $a) {
 		killme();
 	}
 
-
 	call_hooks('post_local',$datarray);
 
-	if(x($datarray,'cancel')) {
+	if (x($datarray, 'cancel')) {
 		logger('mod_item: post cancelled by plugin.');
-		if($return_path) {
+		if ($return_path) {
 			goaway($return_path);
 		}
 
@@ -762,7 +760,7 @@ function item_post(App $a) {
 	// Fill the cache field
 	put_item_in_cache($datarray);
 
-	if($orig_post) {
+	if ($orig_post) {
 		$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `attach` = '%s', `file` = '%s', `rendered-html` = '%s', `rendered-hash` = '%s', `edited` = '%s', `changed` = '%s' WHERE `id` = %d AND `uid` = %d",
 			dbesc($datarray['title']),
 			dbesc($datarray['body']),
@@ -785,13 +783,14 @@ function item_post(App $a) {
 		file_tag_update_pconfig($uid,$categories_old,$categories_new,'category');
 
 		proc_run(PRIORITY_HIGH, "include/notifier.php", 'edit_post', $post_id);
-		if((x($_REQUEST,'return')) && strlen($return_path)) {
+		if ((x($_REQUEST,'return')) && strlen($return_path)) {
 			logger('return: ' . $return_path);
 			goaway($return_path);
 		}
 		killme();
-	} else
+	} else {
 		$post_id = 0;
+	}
 
 	q("COMMIT");
 	q("START TRANSACTION;");
@@ -869,7 +868,7 @@ function item_post(App $a) {
 		dbesc($datarray['plink']),
 		intval($datarray['last-child']),
 		intval($datarray['visible'])
-	       );
+	);
 
 	if (dbm::is_result($r)) {
 		$r = q("SELECT LAST_INSERT_ID() AS `item-id`");
@@ -900,7 +899,7 @@ function item_post(App $a) {
 	// update filetags in pconfig
 	file_tag_update_pconfig($uid,$categories_old,$categories_new,'category');
 
-	if($parent) {
+	if ($parent) {
 
 		// This item is the last leaf and gets the comment box, clear any ancestors
 		$r = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent` = %d AND `last-child` AND `id` != %d",
@@ -916,7 +915,7 @@ function item_post(App $a) {
 			intval($parent)
 		);
 
-		if($contact_record != $author) {
+		if ($contact_record != $author) {
 			notification(array(
 				'type'         => NOTIFY_COMMENT,
 				'notify_flags' => $user['notify-flags'],
@@ -925,7 +924,7 @@ function item_post(App $a) {
 				'to_email'     => $user['email'],
 				'uid'          => $user['uid'],
 				'item'         => $datarray,
-				'link'		=> App::get_baseurl().'/display/'.urlencode($datarray['guid']),
+				'link'         => App::get_baseurl().'/display/'.urlencode($datarray['guid']),
 				'source_name'  => $datarray['author-name'],
 				'source_link'  => $datarray['author-link'],
 				'source_photo' => $datarray['author-avatar'],
@@ -948,7 +947,7 @@ function item_post(App $a) {
 			intval($parent),
 			intval($post_id));
 
-		if($contact_record != $author) {
+		if ($contact_record != $author) {
 			notification(array(
 				'type'         => NOTIFY_WALL,
 				'notify_flags' => $user['notify-flags'],
@@ -957,7 +956,7 @@ function item_post(App $a) {
 				'to_email'     => $user['email'],
 				'uid'          => $user['uid'],
 				'item'         => $datarray,
-				'link'		=> App::get_baseurl().'/display/'.urlencode($datarray['guid']),
+				'link'         => App::get_baseurl().'/display/'.urlencode($datarray['guid']),
 				'source_name'  => $datarray['author-name'],
 				'source_link'  => $datarray['author-link'],
 				'source_photo' => $datarray['author-avatar'],
@@ -969,21 +968,22 @@ function item_post(App $a) {
 
 	call_hooks('post_local_end', $datarray);
 
-	if(strlen($emailcc) && $profile_uid == local_user()) {
+	if (strlen($emailcc) && $profile_uid == local_user()) {
 		$erecips = explode(',', $emailcc);
-		if(count($erecips)) {
-			foreach($erecips as $recip) {
+		if (count($erecips)) {
+			foreach ($erecips as $recip) {
 				$addr = trim($recip);
-				if(! strlen($addr))
+				if (! strlen($addr)) {
 					continue;
+				}
 				$disclaimer = '<hr />' . sprintf( t('This message was sent to you by %s, a member of the Friendica social network.'),$a->user['username'])
 					. '<br />';
 				$disclaimer .= sprintf( t('You may visit them online at %s'), App::get_baseurl() . '/profile/' . $a->user['nickname']) . EOL;
 				$disclaimer .= t('Please contact the sender by replying to this post if you do not wish to receive these messages.') . EOL;
 				if (!$datarray['title']=='') {
-				    $subject = email_header_encode($datarray['title'],'UTF-8');
+					$subject = email_header_encode($datarray['title'], 'UTF-8');
 				} else {
-				    $subject = email_header_encode('[Friendica]' . ' ' . sprintf( t('%s posted an update.'),$a->user['username']),'UTF-8');
+					$subject = email_header_encode('[Friendica]' . ' ' . sprintf( t('%s posted an update.'), $a->user['username']), 'UTF-8');
 				}
 				$link = '<a href="' . App::get_baseurl() . '/profile/' . $a->user['nickname'] . '"><img src="' . $author['thumb'] . '" alt="' . $a->user['username'] . '" /></a><br /><br />';
 				$html    = prepare_body($datarray);
@@ -1032,8 +1032,9 @@ function item_post(App $a) {
 function item_post_return($baseurl, $api_source, $return_path) {
 	// figure out how to return, depending on from whence we came
 
-	if($api_source)
+	if ($api_source) {
 		return;
+	}
 
 	if ($return_path) {
 		goaway($return_path);
@@ -1094,9 +1095,9 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $netwo
 	$r = null;
 
 	//is it a person tag?
-	if (strpos($tag,'@') === 0) {
+	if (strpos($tag, '@') === 0) {
 		//is it already replaced?
-		if (strpos($tag,'[url=')) {
+		if (strpos($tag, '[url=')) {
 			//append tag to str_tags
 			if (!stristr($str_tags,$tag)) {
 				if (strlen($str_tags)) {
@@ -1111,19 +1112,22 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $netwo
 
 				$r = q("SELECT `alias`, `name` FROM `contact` WHERE `nurl` = '%s' AND `alias` != '' AND `uid` = 0",
 					normalise_link($matches[1]));
-				if (!$r)
+				if (!dbm::is_result($r)) {
 					$r = q("SELECT `alias`, `name` FROM `gcontact` WHERE `nurl` = '%s' AND `alias` != ''",
 						normalise_link($matches[1]));
-				if ($r)
+				}
+				if (dbm::is_result($r)) {
 					$data = $r[0];
-				else
+				} else {
 					$data = probe_url($matches[1]);
+				}
 
 				if ($data["alias"] != "") {
-					$newtag = '@[url='.$data["alias"].']'.$data["name"].'[/url]';
-					if(!stristr($str_tags,$newtag)) {
-						if(strlen($str_tags))
+					$newtag = '@[url=' . $data["alias"] . ']' . $data["name"] . '[/url]';
+					if (!stristr($str_tags, $newtag)) {
+						if (strlen($str_tags)) {
 							$str_tags .= ',';
+						}
 						$str_tags .= $newtag;
 					}
 				}
@@ -1133,7 +1137,7 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $netwo
 		}
 		$stat = false;
 		//get the person's name
-		$name = substr($tag,1);
+		$name = substr($tag, 1);
 
 		// Sometimes the tag detection doesn't seem to work right
 		// This is some workaround
@@ -1141,7 +1145,7 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $netwo
 		$name = $nameparts[0];
 
 		// Try to detect the contact in various ways
-		if ((strpos($name,'@')) || (strpos($name,'http://'))) {
+		if ((strpos($name, '@')) || (strpos($name, 'http://'))) {
 			// Is it in format @user@domain.tld or @http://domain.tld/...?
 
 			// First check the contact table for the address
@@ -1155,7 +1159,7 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $netwo
 			);
 
 			// Then check in the contact table for the url
-			if (!$r)
+			if (!dbm::is_result($r)) {
 				$r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network`, `notify` FROM `contact`
 					WHERE `nurl` = '%s' AND `uid` = %d AND
 						(`network` != '%s' OR (`notify` != '' AND `alias` != ''))
@@ -1164,26 +1168,29 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $netwo
 						intval($profile_uid),
 						dbesc(NETWORK_OSTATUS)
 				);
+			}
 
 			// Then check in the global contacts for the address
-			if (!$r)
+			if (!dbm::is_result($r)) {
 				$r = q("SELECT `url`, `nick`, `name`, `alias`, `network`, `notify` FROM `gcontact`
 					WHERE `addr` = '%s' AND (`network` != '%s' OR (`notify` != '' AND `alias` != ''))
 					LIMIT 1",
 						dbesc($name),
 						dbesc(NETWORK_OSTATUS)
 				);
+			}
 
 			// Then check in the global contacts for the url
-			if (!$r)
+			if (!dbm::is_result($r)) {
 				$r = q("SELECT `url`, `nick`, `name`, `alias`, `network`, `notify` FROM `gcontact`
 					WHERE `nurl` = '%s' AND (`network` != '%s' OR (`notify` != '' AND `alias` != ''))
 					LIMIT 1",
 						dbesc(normalise_link($name)),
 						dbesc(NETWORK_OSTATUS)
 				);
+			}
 
-			if (!$r) {
+			if (!dbm::is_result($r)) {
 				$probed = probe_url($name);
 				if ($result['network'] != NETWORK_PHANTOM) {
 					update_gcontact($probed);
@@ -1203,8 +1210,8 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $netwo
 				);
 			}
 
-			//select someone by attag or nick and the name passed in the current network
-			if(!$r AND ($network != ""))
+			// select someone by attag or nick and the name passed in the current network
+			if(!dbm::is_result($r) AND ($network != ""))
 				$r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network` FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `network` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1",
 						dbesc($name),
 						dbesc($name),
@@ -1213,70 +1220,76 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $netwo
 				);
 
 			//select someone from this user's contacts by name in the current network
-			if (!$r AND ($network != ""))
+			if (!dbm::is_result($r) AND ($network != "")) {
 				$r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network` FROM `contact` WHERE `name` = '%s' AND `network` = '%s' AND `uid` = %d LIMIT 1",
 						dbesc($name),
 						dbesc($network),
 						intval($profile_uid)
 				);
+			}
 
-			//select someone by attag or nick and the name passed in
-			if(!$r)
+			// select someone by attag or nick and the name passed in
+			if(!dbm::is_result($r)) {
 				$r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network` FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1",
 						dbesc($name),
 						dbesc($name),
 						intval($profile_uid)
 				);
+			}
 
-
-			//select someone from this user's contacts by name
-			if(!$r)
+			// select someone from this user's contacts by name
+			if(!dbm::is_result($r)) {
 				$r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network` FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
 						dbesc($name),
 						intval($profile_uid)
 				);
+			}
 		}
 
-		if ($r) {
-			if(strlen($inform) AND (isset($r[0]["notify"]) OR isset($r[0]["id"])))
+		if (dbm::is_result($r)) {
+			if (strlen($inform) AND (isset($r[0]["notify"]) OR isset($r[0]["id"]))) {
 				$inform .= ',';
+			}
 
-			if (isset($r[0]["id"]))
+			if (isset($r[0]["id"])) {
 				$inform .= 'cid:' . $r[0]["id"];
-			elseif (isset($r[0]["notify"]))
+			} elseif (isset($r[0]["notify"])) {
 				$inform  .= $r[0]["notify"];
+			}
 
 			$profile = $r[0]["url"];
 			$alias   = $r[0]["alias"];
 			$newname = $r[0]["nick"];
 			if (($newname == "") OR (($r[0]["network"] != NETWORK_OSTATUS) AND ($r[0]["network"] != NETWORK_TWITTER)
-				AND ($r[0]["network"] != NETWORK_STATUSNET) AND ($r[0]["network"] != NETWORK_APPNET)))
+				AND ($r[0]["network"] != NETWORK_STATUSNET) AND ($r[0]["network"] != NETWORK_APPNET))) {
 				$newname = $r[0]["name"];
+			}
 		}
 
 		//if there is an url for this persons profile
 		if (isset($profile) AND ($newname != "")) {
 
 			$replaced = true;
-			//create profile link
+			// create profile link
 			$profile = str_replace(',','%2c',$profile);
 			$newtag = '@[url='.$profile.']'.$newname.'[/url]';
 			$body = str_replace('@'.$name, $newtag, $body);
-			//append tag to str_tags
-			if(! stristr($str_tags,$newtag)) {
-				if(strlen($str_tags))
+			// append tag to str_tags
+			if (! stristr($str_tags,$newtag)) {
+				if (strlen($str_tags)) {
 					$str_tags .= ',';
+				}
 				$str_tags .= $newtag;
 			}
 
 			// Status.Net seems to require the numeric ID URL in a mention if the person isn't
 			// subscribed to you. But the nickname URL is OK if they are. Grrr. We'll tag both.
-
-			if(strlen($alias)) {
+			if (strlen($alias)) {
 				$newtag = '@[url='.$alias.']'.$newname.'[/url]';
-				if(! stristr($str_tags,$newtag)) {
-					if(strlen($str_tags))
+				if (! stristr($str_tags,$newtag)) {
+					if (strlen($str_tags)) {
 						$str_tags .= ',';
+					}
 					$str_tags .= $newtag;
 				}
 			}

From 5bc2ebb267f4dc49957838f5feba16c5bc0fc796 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 30 Mar 2017 21:36:34 +0200
Subject: [PATCH 098/120] Please use x() correctly:

<?php
if (x($someArray, 'element')) {
	// Do something
}
?>

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 mod/admin.php             | 16 ++++++++--------
 mod/network.php           | 28 ++++++++++++++++------------
 view/theme/vier/theme.php | 27 ++++++++++++++-------------
 3 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/mod/admin.php b/mod/admin.php
index b1bc8de5f2..79fcebf47b 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -2017,22 +2017,22 @@ function admin_page_features_post(App $a) {
 	$features = get_features(false);
 
 	foreach ($features as $fname => $fdata) {
-		foreach (array_slice($fdata,1) as $f) {
+		foreach (array_slice($fdata, 1) as $f) {
 			$feature = $f[0];
-			$feature_state = 'feature_'.$feature;
-			$featurelock = 'featurelock_'.$feature;
+			$feature_state = 'feature_' . $feature;
+			$featurelock = 'featurelock_' . $feature;
 
-			if (x($_POST[$feature_state])) {
-				$val = intval($_POST['feature_'.$feature]);
+			if (x($_POST, $feature_state)) {
+				$val = intval($_POST[$feature_state]);
 			} else {
 				$val = 0;
 			}
 			set_config('feature',$feature,$val);
 
-			if (x($_POST[$featurelock])) {
-				set_config('feature_lock',$feature,$val);
+			if (x($_POST, $featurelock)) {
+				set_config('feature_lock', $feature, $val);
 			} else {
-				del_config('feature_lock',$feature);
+				del_config('feature_lock', $feature);
 			}
 		}
 	}
diff --git a/mod/network.php b/mod/network.php
index a1181a74cb..d2c77f19d8 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -6,7 +6,7 @@ function network_init(App $a) {
 	}
 
 	$is_a_date_query = false;
-	if (x($_GET['cid']) && intval($_GET['cid']) != 0) {
+	if (x($_GET, 'cid') && intval($_GET['cid']) != 0) {
 		$cid = $_GET['cid'];
 	}
 
@@ -103,24 +103,27 @@ function network_init(App $a) {
 		}
 	}
 
-	if(x($_GET['nets']) && $_GET['nets'] === 'all')
+	// If nets is set to all, unset it
+	if (x($_GET, 'nets') && $_GET['nets'] === 'all') {
 		unset($_GET['nets']);
+	}
 
 	$group_id = (($a->argc > 1 && is_numeric($a->argv[1])) ? intval($a->argv[1]) : 0);
 
 	set_pconfig(local_user(), 'network.view', 'group.selected', $group_id);
 
-	require_once('include/group.php');
-	require_once('include/contact_widgets.php');
-	require_once('include/items.php');
-	require_once('include/ForumManager.php');
+	require_once 'include/group.php';
+	require_once 'include/contact_widgets.php';
+	require_once 'include/items.php';
+	require_once 'include/ForumManager.php';
 
-	if(! x($a->page,'aside'))
+	if (! x($a->page, 'aside')) {
 		$a->page['aside'] = '';
+	}
 
-	$search = ((x($_GET,'search')) ? escape_tags($_GET['search']) : '');
+	$search = ((x($_GET, 'search')) ? escape_tags($_GET['search']) : '');
 
-	if(x($_GET,'save')) {
+	if (x($_GET, 'save')) {
 		$r = qu("SELECT * FROM `search` WHERE `uid` = %d AND `term` = '%s' LIMIT 1",
 			intval(local_user()),
 			dbesc($search)
@@ -132,7 +135,7 @@ function network_init(App $a) {
 			);
 		}
 	}
-	if(x($_GET,'remove')) {
+	if (x($_GET, 'remove')) {
 		q("DELETE FROM `search` WHERE `uid` = %d AND `term` = '%s'",
 			intval(local_user()),
 			dbesc($search)
@@ -140,7 +143,7 @@ function network_init(App $a) {
 	}
 
 	// search terms header
-	if(x($_GET,'search')) {
+	if (x($_GET, 'search')) {
 		$a->page['content'] .= replace_macros(get_markup_template("section_title.tpl"),array(
 			'$title' => sprintf( t('Results for: %s'), $search)
 		));
@@ -157,8 +160,9 @@ function network_init(App $a) {
 
 function saved_searches($search) {
 
-	if(! feature_enabled(local_user(),'savedsearch'))
+	if (! feature_enabled(local_user(),'savedsearch')) {
 		return '';
+	}
 
 	$a = get_app();
 
diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index a35afa719b..50e8cd377b 100644
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -213,8 +213,9 @@ function vier_community_info() {
 
 		require_once('include/ForumManager.php');
 
-		if (x($_GET['cid']) && intval($_GET['cid']) != 0)
+		if (x($_GET, 'cid') && intval($_GET['cid']) != 0) {
 			$cid = $_GET['cid'];
+		}
 
 		//sort by last updated item
 		$lastitem = true;
@@ -227,18 +228,18 @@ function vier_community_info() {
 
 			$id = 0;
 
-			foreach($contacts as $contact) {
+			foreach ($contacts as $contact) {
 
 				$selected = (($cid == $contact['id']) ? ' forum-selected' : '');
 
 				$entry = array(
-					'url' => 'network?f=&cid=' . $contact['id'],
+					'url'          => 'network?f=&cid=' . $contact['id'],
 					'external_url' => 'redir/' . $contact['id'],
-					'name' => $contact['name'],
-					'cid' => $contact['id'],
-					'selected' 	=> $selected,
-					'micro' => App::remove_baseurl(proxy_url($contact['micro'], false, PROXY_SIZE_MICRO)),
-					'id' => ++$id,
+					'name'         => $contact['name'],
+					'cid'          => $contact['id'],
+					'selected'     => $selected,
+					'micro'        => App::remove_baseurl(proxy_url($contact['micro'], false, PROXY_SIZE_MICRO)),
+					'id'           => ++$id,
 				);
 				$entries[] = $entry;
 			}
@@ -247,12 +248,12 @@ function vier_community_info() {
 			$tpl = get_markup_template('widget_forumlist_right.tpl');
 
 			$page .= replace_macros($tpl,array(
-				'$title'	=> t('Forums'),
-				'$forums'	=> $entries,
-				'$link_desc'	=> t('External link to forum'),
-				'$total'	=> $total,
+				'$title'          => t('Forums'),
+				'$forums'         => $entries,
+				'$link_desc'      => t('External link to forum'),
+				'$total'          => $total,
 				'$visible_forums' => $visible_forums,
-				'$showmore'	=> t('show more'),
+				'$showmore'       => t('show more'),
 			));
 
 			$aside['$page'] = $page;

From f998438d430d8f5081e09c0511528b61e7aa753b Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 30 Mar 2017 21:38:22 +0200
Subject: [PATCH 099/120] removed old-lost code by CR request

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 mod/photos.php | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/mod/photos.php b/mod/photos.php
index 376f8ec7c6..478c954aaa 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -613,20 +613,7 @@ function photos_post(App $a) {
 									);
 								}
 							}
-							/// @TODO maybe old-lost code to be removed
-/*							elseif (strstr($name,'_') || strstr($name,' ')) {
-								$newname = str_replace('_',' ',$name);
-								$r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
-									dbesc($newname),
-									intval($page_owner_uid)
-								);
-							} else {
-								$r = q("SELECT * FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1",
-									dbesc($name),
-									dbesc($name),
-									intval($page_owner_uid)
-								);
-							}*/
+
 							if (dbm::is_result($r)) {
 								$newname = $r[0]['name'];
 								$profile = $r[0]['url'];

From 6b8f581897febed81c830586565747525c2b2156 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 30 Mar 2017 21:42:00 +0200
Subject: [PATCH 100/120] added spaces

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 mod/photos.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/mod/photos.php b/mod/photos.php
index 478c954aaa..ddef07000a 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -781,10 +781,10 @@ function photos_post(App $a) {
 		$visible = 0;
 	}
 
-	$str_group_allow   = perms2str(((is_array($_REQUEST['group_allow']))   ? $_REQUEST['group_allow']   : explode(',',$_REQUEST['group_allow'])));
-	$str_contact_allow = perms2str(((is_array($_REQUEST['contact_allow'])) ? $_REQUEST['contact_allow'] : explode(',',$_REQUEST['contact_allow'])));
-	$str_group_deny    = perms2str(((is_array($_REQUEST['group_deny']))    ? $_REQUEST['group_deny']    : explode(',',$_REQUEST['group_deny'])));
-	$str_contact_deny  = perms2str(((is_array($_REQUEST['contact_deny']))  ? $_REQUEST['contact_deny']  : explode(',',$_REQUEST['contact_deny'])));
+	$str_group_allow   = perms2str(((is_array($_REQUEST['group_allow']))   ? $_REQUEST['group_allow']   : explode(',', $_REQUEST['group_allow'])));
+	$str_contact_allow = perms2str(((is_array($_REQUEST['contact_allow'])) ? $_REQUEST['contact_allow'] : explode(',', $_REQUEST['contact_allow'])));
+	$str_group_deny    = perms2str(((is_array($_REQUEST['group_deny']))    ? $_REQUEST['group_deny']    : explode(',', $_REQUEST['group_deny'])));
+	$str_contact_deny  = perms2str(((is_array($_REQUEST['contact_deny']))  ? $_REQUEST['contact_deny']  : explode(',', $_REQUEST['contact_deny'])));
 
 	$ret = array('src' => '', 'filename' => '', 'filesize' => 0, 'type' => '');
 
@@ -830,7 +830,7 @@ function photos_post(App $a) {
 	$imagedata = @file_get_contents($src);
 
 
-	$limit = service_class_fetch($a->data['user']['uid'],'photo_upload_limit');
+	$limit = service_class_fetch($a->data['user']['uid'], 'photo_upload_limit');
 
 	if ($limit) {
 		$r = q("SELECT SUM(OCTET_LENGTH(`data`)) AS `total` FROM `photo` WHERE `uid` = %d AND `scale` = 0 AND `album` != 'Contact Photos'",
@@ -1142,7 +1142,7 @@ function photos_content(App $a) {
 		));
 
 		$usage_message = '';
-		$limit = service_class_fetch($a->data['user']['uid'],'photo_upload_limit');
+		$limit = service_class_fetch($a->data['user']['uid'], 'photo_upload_limit');
 		if ($limit !== false) {
 
 			$r = q("SELECT SUM(`datasize`) AS `total` FROM `photo` WHERE `uid` = %d AND `scale` = 0 AND `album` != 'Contact Photos'",
@@ -1526,7 +1526,7 @@ function photos_content(App $a) {
 		$tags = null;
 
 		if (count($linked_items) && strlen($link_item['tag'])) {
-			$arr = explode(',',$link_item['tag']);
+			$arr = explode(',', $link_item['tag']);
 			// parse tags and add links
 			$tag_str = '';
 			foreach ($arr as $t) {
@@ -1673,8 +1673,8 @@ function photos_content(App $a) {
 					builtin_activity_puller($item, $conv_responses);
 				}
 
-				$like    = ((x($conv_responses['like'],$link_item['uri'])) ? format_like($conv_responses['like'][$link_item['uri']],$conv_responses['like'][$link_item['uri'] . '-l'],'like',$link_item['id']) : '');
-				$dislike = ((x($conv_responses['dislike'],$link_item['uri'])) ? format_like($conv_responses['dislike'][$link_item['uri']],$conv_responses['dislike'][$link_item['uri'] . '-l'],'dislike',$link_item['id']) : '');
+				$like    = ((x($conv_responses['like'],$link_item['uri'])) ? format_like($conv_responses['like'][$link_item['uri']],$conv_responses['like'][$link_item['uri'] . '-l'], 'like',$link_item['id']) : '');
+				$dislike = ((x($conv_responses['dislike'],$link_item['uri'])) ? format_like($conv_responses['dislike'][$link_item['uri']],$conv_responses['dislike'][$link_item['uri'] . '-l'], 'dislike',$link_item['id']) : '');
 
 				/// @TODO merge into one if() ?
 				if ($can_post || can_write_wall($a,$owner_uid)) {

From 2a480df6fac9dfe2b671f37fa86152ae92d501d5 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 30 Mar 2017 21:44:32 +0200
Subject: [PATCH 101/120] added spaces + removed parentheses (include/require
 are no functions)

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 mod/photos.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/mod/photos.php b/mod/photos.php
index ddef07000a..1467dff343 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1,14 +1,14 @@
 <?php
-require_once('include/Photo.php');
-require_once('include/photos.php');
-require_once('include/items.php');
-require_once('include/acl_selectors.php');
-require_once('include/bbcode.php');
-require_once('include/security.php');
-require_once('include/redir.php');
-require_once('include/tags.php');
-require_once('include/threads.php');
-require_once('include/Probe.php');
+require_once 'include/Photo.php';
+require_once 'include/photos.php';
+require_once 'include/items.php';
+require_once 'include/acl_selectors.php';
+require_once 'include/bbcode.php';
+require_once 'include/security.php';
+require_once 'include/redir.php';
+require_once 'include/tags.php';
+require_once 'include/threads.php';
+require_once 'include/Probe.php';
 
 use \Friendica\Core\Config;
 
@@ -861,7 +861,7 @@ function photos_post(App $a) {
 	$exif = $ph->orient($src);
 	@unlink($src);
 
-	$max_length = get_config('system','max_image_length');
+	$max_length = get_config('system', 'max_image_length');
 	if (! $max_length) {
 		$max_length = MAX_IMAGE_LENGTH;
 	}

From de5125a4c72309d5b167916e905eed1cad8d2679 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 30 Mar 2017 21:45:35 +0200
Subject: [PATCH 102/120] merged 2 if() into one as requested by CR

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 mod/photos.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/mod/photos.php b/mod/photos.php
index 1467dff343..92682f4437 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1271,11 +1271,8 @@ function photos_content(App $a) {
 				}
 			}
 		} else {
-			/// @TODO merge else+if into elseif and 2 into one?
-			if (($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) {
-				if ($can_post) {
-					$edit = array(t('Edit Album'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '/edit');
- 				}
+			if (($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos')) && $can_post) {
+				$edit = array(t('Edit Album'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '/edit');
 			}
 		}
 

From 192f6d7cf43be08b5ac873d0bfbd84494eef3e2f Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 30 Mar 2017 21:48:46 +0200
Subject: [PATCH 103/120] merged 2 if() into one three times

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 mod/photos.php | 117 +++++++++++++++++++++++--------------------------
 1 file changed, 54 insertions(+), 63 deletions(-)

diff --git a/mod/photos.php b/mod/photos.php
index 92682f4437..0f021d55a8 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1628,27 +1628,24 @@ function photos_content(App $a) {
 
 			$comments = '';
 			if (! dbm::is_result($r)) {
-				/// @TODO merge into one if() ?
-				if ($can_post || can_write_wall($a,$owner_uid)) {
-					if ($link_item['last-child']) {
-						$comments .= replace_macros($cmnt_tpl,array(
-							'$return_path' => '',
-							'$jsreload' => $return_url,
-							'$type' => 'wall-comment',
-							'$id' => $link_item['id'],
-							'$parent' => $link_item['id'],
-							'$profile_uid' =>  $owner_uid,
-							'$mylink' => $contact['url'],
-							'$mytitle' => t('This is you'),
-							'$myphoto' => $contact['thumb'],
-							'$comment' => t('Comment'),
-							'$submit' => t('Submit'),
-							'$preview' => t('Preview'),
-							'$sourceapp' => t($a->sourcename),
-							'$ww' => '',
-							'$rand_num' => random_digits(12)
-						));
-					}
+				if (($can_post || can_write_wall($a,$owner_uid)) && $link_item['last-child']) {
+					$comments .= replace_macros($cmnt_tpl,array(
+						'$return_path' => '',
+						'$jsreload' => $return_url,
+						'$type' => 'wall-comment',
+						'$id' => $link_item['id'],
+						'$parent' => $link_item['id'],
+						'$profile_uid' =>  $owner_uid,
+						'$mylink' => $contact['url'],
+						'$mytitle' => t('This is you'),
+						'$myphoto' => $contact['thumb'],
+						'$comment' => t('Comment'),
+						'$submit' => t('Submit'),
+						'$preview' => t('Preview'),
+						'$sourceapp' => t($a->sourcename),
+						'$ww' => '',
+						'$rand_num' => random_digits(12)
+					));
 				}
 			}
 
@@ -1673,27 +1670,24 @@ function photos_content(App $a) {
 				$like    = ((x($conv_responses['like'],$link_item['uri'])) ? format_like($conv_responses['like'][$link_item['uri']],$conv_responses['like'][$link_item['uri'] . '-l'], 'like',$link_item['id']) : '');
 				$dislike = ((x($conv_responses['dislike'],$link_item['uri'])) ? format_like($conv_responses['dislike'][$link_item['uri']],$conv_responses['dislike'][$link_item['uri'] . '-l'], 'dislike',$link_item['id']) : '');
 
-				/// @TODO merge into one if() ?
-				if ($can_post || can_write_wall($a,$owner_uid)) {
-					if ($link_item['last-child']) {
-						$comments .= replace_macros($cmnt_tpl,array(
-							'$return_path' => '',
-							'$jsreload' => $return_url,
-							'$type' => 'wall-comment',
-							'$id' => $link_item['id'],
-							'$parent' => $link_item['id'],
-							'$profile_uid' =>  $owner_uid,
-							'$mylink' => $contact['url'],
-							'$mytitle' => t('This is you'),
-							'$myphoto' => $contact['thumb'],
-							'$comment' => t('Comment'),
-							'$submit' => t('Submit'),
-							'$preview' => t('Preview'),
-							'$sourceapp' => t($a->sourcename),
-							'$ww' => '',
-							'$rand_num' => random_digits(12)
-						));
-					}
+				if (($can_post || can_write_wall($a, $owner_uid)) && $link_item['last-child']) {
+					$comments .= replace_macros($cmnt_tpl,array(
+						'$return_path' => '',
+						'$jsreload' => $return_url,
+						'$type' => 'wall-comment',
+						'$id' => $link_item['id'],
+						'$parent' => $link_item['id'],
+						'$profile_uid' =>  $owner_uid,
+						'$mylink' => $contact['url'],
+						'$mytitle' => t('This is you'),
+						'$myphoto' => $contact['thumb'],
+						'$comment' => t('Comment'),
+						'$submit' => t('Submit'),
+						'$preview' => t('Preview'),
+						'$sourceapp' => t($a->sourcename),
+						'$ww' => '',
+						'$rand_num' => random_digits(12)
+					));
 				}
 
 
@@ -1756,27 +1750,24 @@ function photos_content(App $a) {
 						'$comment' => $comment
 					));
 
-					/// @TODO merge into one if() ?
-					if ($can_post || can_write_wall($a, $owner_uid)) {
-						if ($item['last-child']) {
-							$comments .= replace_macros($cmnt_tpl, array(
-								'$return_path' => '',
-								'$jsreload' => $return_url,
-								'$type' => 'wall-comment',
-								'$id' => $item['item_id'],
-								'$parent' => $item['parent'],
-								'$profile_uid' =>  $owner_uid,
-								'$mylink' => $contact['url'],
-								'$mytitle' => t('This is you'),
-								'$myphoto' => $contact['thumb'],
-								'$comment' => t('Comment'),
-								'$submit' => t('Submit'),
-								'$preview' => t('Preview'),
-								'$sourceapp' => t($a->sourcename),
-								'$ww' => '',
-								'$rand_num' => random_digits(12)
-							));
-						}
+					if (($can_post || can_write_wall($a, $owner_uid)) && $item['last-child']) {
+						$comments .= replace_macros($cmnt_tpl, array(
+							'$return_path' => '',
+							'$jsreload' => $return_url,
+							'$type' => 'wall-comment',
+							'$id' => $item['item_id'],
+							'$parent' => $item['parent'],
+							'$profile_uid' =>  $owner_uid,
+							'$mylink' => $contact['url'],
+							'$mytitle' => t('This is you'),
+							'$myphoto' => $contact['thumb'],
+							'$comment' => t('Comment'),
+							'$submit' => t('Submit'),
+							'$preview' => t('Preview'),
+							'$sourceapp' => t($a->sourcename),
+							'$ww' => '',
+							'$rand_num' => random_digits(12)
+						));
 					}
 				}
 			}

From 16415520e7e538bd8da3993f9b429b51d64fc5b2 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 30 Mar 2017 21:50:19 +0200
Subject: [PATCH 104/120] it is space-time! ;-)

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 boot.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/boot.php b/boot.php
index 3bf85b14f4..b83f494dd7 100644
--- a/boot.php
+++ b/boot.php
@@ -721,8 +721,8 @@ class App {
 		}
 
 		// Diaspora style profile url
-		if (substr($this->cmd,0,2) === 'u/') {
-			$this->cmd = 'profile/' . substr($this->cmd,2);
+		if (substr($this->cmd, 0, 2) === 'u/') {
+			$this->cmd = 'profile/' . substr($this->cmd, 2);
 		}
 
 

From 0bc15efef627d4e4fe1bc5c2b7ee9e697c3127ee Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 30 Mar 2017 21:51:31 +0200
Subject: [PATCH 105/120] whoops, parser error fixed

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 mod/item.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod/item.php b/mod/item.php
index 1f80719981..c4508aca6a 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -560,7 +560,7 @@ function item_post(App $a) {
 			$toplevel_contact = '@[url='.$toplevel_parent[0]['author-link'].']'.$toplevel_parent[0]['author-name'].'[/url]';
 		}
 
-		if (!in_array($toplevel_contact, $tags)) [
+		if (!in_array($toplevel_contact, $tags)) {
 			$tags[] = $toplevel_contact;
 		}
 	}

From 5db963a8356ac34b07f2471b24ecddbe0efc296f Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Fri, 31 Mar 2017 20:05:15 +0200
Subject: [PATCH 106/120] fixed parser error

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 boot.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot.php b/boot.php
index b83f494dd7..f65829ed18 100644
--- a/boot.php
+++ b/boot.php
@@ -697,7 +697,7 @@ class App {
 			$this->query_string = substr($_SERVER['QUERY_STRING'], 9);
 
 			// removing trailing / - maybe a nginx problem
-			$this->query_string = lrim($this->query_string, '/');
+			$this->query_string = ltrim($this->query_string, '/');
 		} elseif ((x($_SERVER, 'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'], 0, 2) === "q=") {
 			$this->query_string = substr($_SERVER['QUERY_STRING'], 2);
 

From d98ac6b42d29912a163db6ee0b6318c1e3d33a78 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Fri, 31 Mar 2017 20:30:21 +0200
Subject: [PATCH 107/120] Continued a bit: - removed parentheses from
 include/require as they are no functions - added type-hint for $a which is
 unused btw.

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 mod/item.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/mod/item.php b/mod/item.php
index c4508aca6a..9e6b3283c0 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -33,7 +33,7 @@ function item_post(App $a) {
 		return;
 	}
 
-	require_once('include/security.php');
+	require_once 'include/security.php';
 
 	$uid = local_user();
 
@@ -142,7 +142,7 @@ function item_post(App $a) {
 				$parent_contact = get_contact_details_by_url($thrparent[0]["author-link"]);
 
 				if (!isset($parent_contact["nick"])) {
-					require_once("include/Scrape.php");
+					require_once 'include/Scrape.php';
 					$probed_contact = probe_url($thrparent[0]["author-link"]);
 					if ($probed_contact["network"] != NETWORK_FEED) {
 						$parent_contact = $probed_contact;
@@ -518,7 +518,7 @@ function item_post(App $a) {
 	// Setting the object type if not defined before
 	if (!$objecttype) {
 		$objecttype = ACTIVITY_OBJ_NOTE; // Default value
-		require_once("include/plaintext.php");
+		require_once 'include/plaintext.php';
 		$objectdata = get_attached_data($body);
 
 		if ($post["type"] == "link") {
@@ -730,7 +730,7 @@ function item_post(App $a) {
 
 	// preview mode - prepare the body for display and send it via json
 	if ($preview) {
-		require_once('include/conversation.php');
+		require_once 'include/conversation.php';
 		// We set the datarray ID to -1 because in preview mode the dataray
 		// doesn't have an ID.
 		$datarray["id"] = -1;
@@ -988,7 +988,7 @@ function item_post(App $a) {
 				$link = '<a href="' . App::get_baseurl() . '/profile/' . $a->user['nickname'] . '"><img src="' . $author['thumb'] . '" alt="' . $a->user['username'] . '" /></a><br /><br />';
 				$html    = prepare_body($datarray);
 				$message = '<html><body>' . $link . $html . $disclaimer . '</body></html>';
-				include_once('include/html2plain.php');
+				include_once 'include/html2plain.php';
 				$params = array (
 				    'fromName' => $a->user['username'],
 				    'fromEmail' => $a->user['email'],
@@ -1041,7 +1041,7 @@ function item_post_return($baseurl, $api_source, $return_path) {
 	}
 
 	$json = array('success' => 1);
-	if (x($_REQUEST,'jsreload') && strlen($_REQUEST['jsreload'])) {
+	if (x($_REQUEST, 'jsreload') && strlen($_REQUEST['jsreload'])) {
 		$json['reload'] = $baseurl . '/' . $_REQUEST['jsreload'];
 	}
 
@@ -1059,7 +1059,7 @@ function item_content(App $a) {
 		return;
 	}
 
-	require_once('include/security.php');
+	require_once 'include/security.php';
 
 	$o = '';
 	if (($a->argc == 3) && ($a->argv[1] === 'drop') && intval($a->argv[2])) {
@@ -1087,9 +1087,9 @@ function item_content(App $a) {
  *
  * @return boolean true if replaced, false if not replaced
  */
-function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $network = "") {
-	require_once("include/Scrape.php");
-	require_once("include/socgraph.php");
+function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $network = "") {
+	require_once 'include/Scrape.php';
+	require_once 'include/socgraph.php';
 
 	$replaced = false;
 	$r = null;
@@ -1099,7 +1099,7 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $netwo
 		//is it already replaced?
 		if (strpos($tag, '[url=')) {
 			//append tag to str_tags
-			if (!stristr($str_tags,$tag)) {
+			if (!stristr($str_tags, $tag)) {
 				if (strlen($str_tags)) {
 					$str_tags .= ',';
 				}

From 6db3d72ee3710d310e8f745b3dac961afbebe371 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Fri, 31 Mar 2017 20:32:52 +0200
Subject: [PATCH 108/120] added spaces (space-time!) and TODO that x() is maybe
 proper way?

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 mod/item.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mod/item.php b/mod/item.php
index 9e6b3283c0..e7bae34958 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -264,12 +264,12 @@ function item_post(App $a) {
 		 * use the user default permissions - as they won't have
 		 * been supplied via a form.
 		 */
-
+		/// @TODO use x($_REQUEST, 'foo') here
 		if (($api_source)
-			&& (! array_key_exists('contact_allow',$_REQUEST))
-			&& (! array_key_exists('group_allow',$_REQUEST))
-			&& (! array_key_exists('contact_deny',$_REQUEST))
-			&& (! array_key_exists('group_deny',$_REQUEST))) {
+			&& (! array_key_exists('contact_allow', $_REQUEST))
+			&& (! array_key_exists('group_allow', $_REQUEST))
+			&& (! array_key_exists('contact_deny', $_REQUEST))
+			&& (! array_key_exists('group_deny', $_REQUEST))) {
 			$str_group_allow   = $user['allow_gid'];
 			$str_contact_allow = $user['allow_cid'];
 			$str_group_deny    = $user['deny_gid'];

From 8824da8962396b89aa42c885242bc2b4852a8eba Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Fri, 31 Mar 2017 20:36:01 +0200
Subject: [PATCH 109/120] Continued a bit: - recommended way is to use
 foreach() instead of own looping through arrays - even when you need the
 index: <?php foreach ($someArray as $key => $value) { 	// Handle $key/$value
 somehow } ?>

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 mod/item.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mod/item.php b/mod/item.php
index e7bae34958..bcf7a4b469 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -513,7 +513,7 @@ function item_post(App $a) {
 	// Fold multi-line [code] sequences
 	$body = preg_replace('/\[\/code\]\s*\[code\]/ism', "\n", $body);
 
-	$body = scale_external_images($body,false);
+	$body = scale_external_images($body, false);
 
 	// Setting the object type if not defined before
 	if (!$objecttype) {
@@ -545,7 +545,7 @@ function item_post(App $a) {
 		$contact = '@[url=' . $parent_contact['url'] . ']' . $parent_contact['nick'] . '[/url]';
 
 		if (!in_array($contact,$tags)) {
-			$body = $contact.' '.$body;
+			$body = $contact . ' ' . $body;
 			$tags[] = $contact;
 		}
 
@@ -557,7 +557,7 @@ function item_post(App $a) {
 			$toplevel_contact = '@' . $toplevel_parent[0]['nick'] . '+' . $toplevel_parent[0]['id'];
 		} else {
 			$toplevel_parent = q("SELECT `author-link`, `author-name` FROM `item` WHERE `id` = `parent` AND `parent` = %d", intval($parent));
-			$toplevel_contact = '@[url='.$toplevel_parent[0]['author-link'].']'.$toplevel_parent[0]['author-name'].'[/url]';
+			$toplevel_contact = '@[url=' . $toplevel_parent[0]['author-link'] . ']' . $toplevel_parent[0]['author-name'] . '[/url]';
 		}
 
 		if (!in_array($toplevel_contact, $tags)) {
@@ -581,8 +581,8 @@ function item_post(App $a) {
 			 * Robert Johnson should be first in the $tags array
 			 */
 			$fullnametagged = false;
-			for ($x = 0; $x < count($tagged); $x ++) {
-				if (stristr($tagged[$x],$tag . ' ')) {
+			foreach ($tagged as $nextTag) {
+				if (stristr($nextTag, $tag . ' ')) {
 					$fullnametagged = true;
 					break;
 				}

From 8bdc906013461464b475c4f10918adff8730dea6 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Fri, 31 Mar 2017 20:41:32 +0200
Subject: [PATCH 110/120] Continued a bit: - added 'array' type-hint which is
 valid for many versions back - added spaces as requested by CR - removed $a =
 get_app(); call, $a was no longer needed here

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 include/items.php | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/include/items.php b/include/items.php
index 24eb1b30fb..c2b3d7d1f5 100644
--- a/include/items.php
+++ b/include/items.php
@@ -1496,17 +1496,19 @@ function item_is_remote_self($contact, &$datarray) {
 	return true;
 }
 
-function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
+function new_follower($importer, $contact, $datarray, $item, $sharing = false) {
 	$url = notags(trim($datarray['author-link']));
 	$name = notags(trim($datarray['author-name']));
 	$photo = notags(trim($datarray['author-avatar']));
 
 	if (is_object($item)) {
 		$rawtag = $item->get_item_tags(NAMESPACE_ACTIVITY,'actor');
-		if ($rawtag && $rawtag[0]['child'][NAMESPACE_POCO]['preferredUsername'][0]['data'])
+		if ($rawtag && $rawtag[0]['child'][NAMESPACE_POCO]['preferredUsername'][0]['data']) {
 			$nick = $rawtag[0]['child'][NAMESPACE_POCO]['preferredUsername'][0]['data'];
-	} else
+		}
+	} else {
 		$nick = $item;
+	}
 
 	if (is_array($contact)) {
 		if (($contact['network'] == NETWORK_OSTATUS && $contact['rel'] == CONTACT_IS_SHARING)
@@ -1544,11 +1546,9 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
 			update_contact_avatar($photo, $importer["uid"], $contact_record["id"], true);
 		}
 
-
 		$r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
 			intval($importer['uid'])
 		);
-		$a = get_app();
 
 		if (dbm::is_result($r) AND !in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE))) {
 
@@ -1567,8 +1567,9 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
 
 			$def_gid = get_default_group($importer['uid'], $contact_record["network"]);
 
-			if (intval($def_gid))
-				group_add_member($importer['uid'],'',$contact_record['id'],$def_gid);
+			if (intval($def_gid)) {
+				group_add_member($importer['uid'], '', $contact_record['id'], $def_gid);
+			}
 
 			if (($r[0]['notify-flags'] & NOTIFY_INTRO) &&
 				in_array($r[0]['page-flags'], array(PAGE_NORMAL))) {
@@ -1599,7 +1600,7 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
 	}
 }
 
-function lose_follower($importer,$contact,$datarray = array(),$item = "") {
+function lose_follower($importer, $contact, array $datarray = array(), $item = "") {
 
 	if (($contact['rel'] == CONTACT_IS_FRIEND) || ($contact['rel'] == CONTACT_IS_SHARING)) {
 		q("UPDATE `contact` SET `rel` = %d WHERE `id` = %d",
@@ -1611,7 +1612,7 @@ function lose_follower($importer,$contact,$datarray = array(),$item = "") {
 	}
 }
 
-function lose_sharer($importer,$contact,$datarray = array(),$item = "") {
+function lose_sharer($importer, $contact, array $datarray = array(), $item = "") {
 
 	if (($contact['rel'] == CONTACT_IS_FRIEND) || ($contact['rel'] == CONTACT_IS_FOLLOWER)) {
 		q("UPDATE `contact` SET `rel` = %d WHERE `id` = %d",
@@ -1623,7 +1624,7 @@ function lose_sharer($importer,$contact,$datarray = array(),$item = "") {
 	}
 }
 
-function subscribe_to_hub($url,$importer,$contact,$hubmode = 'subscribe') {
+function subscribe_to_hub($url, $importer, $contact, $hubmode = 'subscribe') {
 
 	$a = get_app();
 

From eab654dd65ed8008891caa2f632649f2fcfba852 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Fri, 31 Mar 2017 20:44:38 +0200
Subject: [PATCH 111/120] $tagged is being initialized but not written to until
 the foreach() loop is being executed. Maybe here is old-lost code anyway?

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 mod/item.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mod/item.php b/mod/item.php
index bcf7a4b469..3c5fcd9abb 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -581,6 +581,7 @@ function item_post(App $a) {
 			 * Robert Johnson should be first in the $tags array
 			 */
 			$fullnametagged = false;
+			/// @TODO $tagged is initialized above if() block and is not filled, maybe old-lost code?
 			foreach ($tagged as $nextTag) {
 				if (stristr($nextTag, $tag . ' ')) {
 					$fullnametagged = true;

From 9cfcf8f7ca7a602591666ed2b87b205768a3d515 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Fri, 31 Mar 2017 20:47:23 +0200
Subject: [PATCH 112/120] added spaces, marked in todos.txt as usual

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 mod/item.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/mod/item.php b/mod/item.php
index 3c5fcd9abb..34079fa9d6 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -29,7 +29,7 @@ require_once 'include/Contact.php';
 
 function item_post(App $a) {
 
-	if ((! local_user()) && (! remote_user()) && (! x($_REQUEST,'commenter'))) {
+	if ((! local_user()) && (! remote_user()) && (! x($_REQUEST, 'commenter'))) {
 		return;
 	}
 
@@ -71,8 +71,8 @@ function item_post(App $a) {
 	}
 
 	// Is this a reply to something?
-	$parent = ((x($_REQUEST,'parent')) ? intval($_REQUEST['parent']) : 0);
-	$parent_uri = ((x($_REQUEST,'parent_uri')) ? trim($_REQUEST['parent_uri']) : '');
+	$parent = ((x($_REQUEST, 'parent')) ? intval($_REQUEST['parent']) : 0);
+	$parent_uri = ((x($_REQUEST, 'parent_uri')) ? trim($_REQUEST['parent_uri']) : '');
 
 	$parent_item = null;
 	$parent_contact = null;
@@ -85,7 +85,7 @@ function item_post(App $a) {
 
 		$objecttype = ACTIVITY_OBJ_COMMENT;
 
-		if (! x($_REQUEST,'type')) {
+		if (! x($_REQUEST, 'type')) {
 			$_REQUEST['type'] = 'net-comment';
 		}
 
@@ -114,7 +114,7 @@ function item_post(App $a) {
 
 		if (! dbm::is_result($r)) {
 			notice( t('Unable to locate original post.') . EOL);
-			if (x($_REQUEST,'return')) {
+			if (x($_REQUEST, 'return')) {
 				goaway($return_path);
 			}
 			killme();
@@ -167,11 +167,11 @@ function item_post(App $a) {
 		logger('mod_item: item_post parent=' . $parent);
 	}
 
-	$profile_uid = ((x($_REQUEST,'profile_uid')) ? intval($_REQUEST['profile_uid']) : 0);
-	$post_id     = ((x($_REQUEST,'post_id'))     ? intval($_REQUEST['post_id'])     : 0);
-	$app         = ((x($_REQUEST,'source'))      ? strip_tags($_REQUEST['source'])  : '');
-	$extid       = ((x($_REQUEST,'extid'))       ? strip_tags($_REQUEST['extid'])   : '');
-	$object      = ((x($_REQUEST,'object'))      ? $_REQUEST['object']              : '');
+	$profile_uid = ((x($_REQUEST, 'profile_uid')) ? intval($_REQUEST['profile_uid']) : 0);
+	$post_id     = ((x($_REQUEST, 'post_id'))     ? intval($_REQUEST['post_id'])     : 0);
+	$app         = ((x($_REQUEST, 'source'))      ? strip_tags($_REQUEST['source'])  : '');
+	$extid       = ((x($_REQUEST, 'extid'))       ? strip_tags($_REQUEST['extid'])   : '');
+	$object      = ((x($_REQUEST, 'object'))      ? $_REQUEST['object']              : '');
 
 	// Check for multiple posts with the same message id (when the post was created via API)
 	if (($message_id != '') AND ($profile_uid != 0)) {
@@ -648,7 +648,7 @@ function item_post(App $a) {
 	// even if the post arrived via API we are considering that it
 	// originated on this site by default for determining relayability.
 
-	$origin = ((x($_REQUEST,'origin')) ? intval($_REQUEST['origin']) : 1);
+	$origin = ((x($_REQUEST, 'origin')) ? intval($_REQUEST['origin']) : 1);
 
 	$notify_type = (($parent) ? 'comment-new' : 'wall-new' );
 
@@ -750,7 +750,7 @@ function item_post(App $a) {
 		}
 
 		$json = array('cancel' => 1);
-		if (x($_REQUEST,'jsreload') && strlen($_REQUEST['jsreload'])) {
+		if (x($_REQUEST, 'jsreload') && strlen($_REQUEST['jsreload'])) {
 			$json['reload'] = App::get_baseurl() . '/' . $_REQUEST['jsreload'];
 		}
 
@@ -784,7 +784,7 @@ function item_post(App $a) {
 		file_tag_update_pconfig($uid,$categories_old,$categories_new,'category');
 
 		proc_run(PRIORITY_HIGH, "include/notifier.php", 'edit_post', $post_id);
-		if ((x($_REQUEST,'return')) && strlen($return_path)) {
+		if ((x($_REQUEST, 'return')) && strlen($return_path)) {
 			logger('return: ' . $return_path);
 			goaway($return_path);
 		}

From 07a0d300c34e46e12b4bcd6312797bdedeb8557b Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Fri, 31 Mar 2017 20:49:43 +0200
Subject: [PATCH 113/120] added space, marked rest 86 occurrences in todos.txt

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 mod/item.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod/item.php b/mod/item.php
index 34079fa9d6..7f0f48c05c 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -977,7 +977,7 @@ function item_post(App $a) {
 				if (! strlen($addr)) {
 					continue;
 				}
-				$disclaimer = '<hr />' . sprintf( t('This message was sent to you by %s, a member of the Friendica social network.'),$a->user['username'])
+				$disclaimer = '<hr />' . sprintf( t('This message was sent to you by %s, a member of the Friendica social network.'), $a->user['username'])
 					. '<br />';
 				$disclaimer .= sprintf( t('You may visit them online at %s'), App::get_baseurl() . '/profile/' . $a->user['nickname']) . EOL;
 				$disclaimer .= t('Please contact the sender by replying to this post if you do not wish to receive these messages.') . EOL;

From 44a137a8debb437e90813cd282142841c4edbf27 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Fri, 31 Mar 2017 20:51:18 +0200
Subject: [PATCH 114/120] Continued a bit: - converted multiple single-line
 comments into one multi-line comment - added spaces (space-time!)

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 mod/item.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/mod/item.php b/mod/item.php
index 7f0f48c05c..677406be3c 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -1201,9 +1201,9 @@ function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $n
 			}
 		} else {
 			$r = false;
-			if (strrpos($name,'+')) {
+			if (strrpos($name, '+')) {
 				// Is it in format @nick+number?
-				$tagcid = intval(substr($name,strrpos($name,'+') + 1));
+				$tagcid = intval(substr($name, strrpos($name, '+') + 1));
 
 				$r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 						intval($tagcid),
@@ -1276,18 +1276,20 @@ function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $n
 			$newtag = '@[url='.$profile.']'.$newname.'[/url]';
 			$body = str_replace('@'.$name, $newtag, $body);
 			// append tag to str_tags
-			if (! stristr($str_tags,$newtag)) {
+			if (! stristr($str_tags, $newtag)) {
 				if (strlen($str_tags)) {
 					$str_tags .= ',';
 				}
 				$str_tags .= $newtag;
 			}
 
-			// Status.Net seems to require the numeric ID URL in a mention if the person isn't
-			// subscribed to you. But the nickname URL is OK if they are. Grrr. We'll tag both.
+			/*
+			 * Status.Net seems to require the numeric ID URL in a mention if the person isn't
+			 * subscribed to you. But the nickname URL is OK if they are. Grrr. We'll tag both.
+			 */
 			if (strlen($alias)) {
-				$newtag = '@[url='.$alias.']'.$newname.'[/url]';
-				if (! stristr($str_tags,$newtag)) {
+				$newtag = '@[url=' . $alias . ']' . $newname . '[/url]';
+				if (! stristr($str_tags, $newtag)) {
 					if (strlen($str_tags)) {
 						$str_tags .= ',';
 					}

From 18ca141f5c56f962b4fb228c99871b2b831aa189 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Fri, 31 Mar 2017 20:52:32 +0200
Subject: [PATCH 115/120] space-time!

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 mod/item.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mod/item.php b/mod/item.php
index 677406be3c..79633cdc18 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -1272,9 +1272,9 @@ function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $n
 
 			$replaced = true;
 			// create profile link
-			$profile = str_replace(',','%2c',$profile);
-			$newtag = '@[url='.$profile.']'.$newname.'[/url]';
-			$body = str_replace('@'.$name, $newtag, $body);
+			$profile = str_replace(',', '%2c', $profile);
+			$newtag = '@[url=' . $profile . ']' . $newname . '[/url]';
+			$body = str_replace('@' . $name, $newtag, $body);
 			// append tag to str_tags
 			if (! stristr($str_tags, $newtag)) {
 				if (strlen($str_tags)) {

From d4e67338d8b60a0e2cced92e22ec930a2cdb360f Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Fri, 31 Mar 2017 20:55:50 +0200
Subject: [PATCH 116/120] space-time contines ...

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 mod/photos.php | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/mod/photos.php b/mod/photos.php
index 0f021d55a8..32665c8180 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1098,7 +1098,7 @@ function photos_content(App $a) {
 
 	// tabs
 	$is_owner = (local_user() && (local_user() == $owner_uid));
-	$o .= profile_tabs($a,$is_owner, $a->data['user']['nickname']);
+	$o .= profile_tabs($a, $is_owner, $a->data['user']['nickname']);
 
 	/**
 	 * Display upload form
@@ -1616,8 +1616,8 @@ function photos_content(App $a) {
 
 			$likebuttons = '';
 
-			if ($can_post || can_write_wall($a,$owner_uid)) {
-				$likebuttons = replace_macros($like_tpl,array(
+			if ($can_post || can_write_wall($a, $owner_uid)) {
+				$likebuttons = replace_macros($like_tpl, array(
 					'$id' => $link_item['id'],
 					'$likethis' => t("I like this \x28toggle\x29"),
 					'$nolike' => (feature_enabled(local_user(), 'dislike') ? t("I don't like this \x28toggle\x29") : ''),
@@ -1628,8 +1628,8 @@ function photos_content(App $a) {
 
 			$comments = '';
 			if (! dbm::is_result($r)) {
-				if (($can_post || can_write_wall($a,$owner_uid)) && $link_item['last-child']) {
-					$comments .= replace_macros($cmnt_tpl,array(
+				if (($can_post || can_write_wall($a, $owner_uid)) && $link_item['last-child']) {
+					$comments .= replace_macros($cmnt_tpl, array(
 						'$return_path' => '',
 						'$jsreload' => $return_url,
 						'$type' => 'wall-comment',
@@ -1777,9 +1777,10 @@ function photos_content(App $a) {
 
 
 		$response_verbs = array('like');
-		if (feature_enabled($owner_uid,'dislike'))
+		if (feature_enabled($owner_uid, 'dislike')) {
 			$response_verbs[] = 'dislike';
-		$responses = get_responses($conv_responses,$response_verbs,'',$link_item);
+		}
+		$responses = get_responses($conv_responses,$response_verbs, '', $link_item);
 
 		$photo_tpl = get_markup_template('photo_view.tpl');
 
@@ -1789,7 +1790,7 @@ function photos_content(App $a) {
 			$like_e = template_escape($like);
 			$dislike_e = template_escape($dislike);
 		} else {
-			$album_e = array($album_link,$ph[0]['album']);
+			$album_e = array($album_link, $ph[0]['album']);
 			$tags_e = $tags;
 			$like_e = $like;
 			$dislike_e = $dislike;
@@ -1816,11 +1817,11 @@ function photos_content(App $a) {
 			'$paginate' => $paginate,
 		));
 
-		$a->page['htmlhead'] .= "\n".'<meta name="twitter:card" content="photo" />'."\n";
-		$a->page['htmlhead'] .= '<meta name="twitter:title" content="'.$photo["album"].'" />'."\n";
-		$a->page['htmlhead'] .= '<meta name="twitter:image" content="'.$photo["href"].'" />'."\n";
-		$a->page['htmlhead'] .= '<meta name="twitter:image:width" content="'.$photo["width"].'" />'."\n";
-		$a->page['htmlhead'] .= '<meta name="twitter:image:height" content="'.$photo["height"].'" />'."\n";
+		$a->page['htmlhead'] .= "\n" . '<meta name="twitter:card" content="photo" />' . "\n";
+		$a->page['htmlhead'] .= '<meta name="twitter:title" content="' . $photo["album"] . '" />' . "\n";
+		$a->page['htmlhead'] .= '<meta name="twitter:image" content="' . $photo["href"] . '" />' . "\n";
+		$a->page['htmlhead'] .= '<meta name="twitter:image:width" content="' . $photo["width"] . '" />' . "\n";
+		$a->page['htmlhead'] .= '<meta name="twitter:image:height" content="' . $photo["height"] . '" />' . "\n";
 
 		return $o;
 	}

From 60552260e1ea446e097ba2e6b7a4d7cec6fcd33b Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Fri, 31 Mar 2017 21:04:08 +0200
Subject: [PATCH 117/120] Continued with CR: - added spaces as requested -
 removed parentheses from include/require calls as they are no functions

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 mod/photos.php            |  4 ++--
 view/theme/vier/theme.php | 48 +++++++++++++++++++++------------------
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/mod/photos.php b/mod/photos.php
index 32665c8180..ddf0814675 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1667,8 +1667,8 @@ function photos_content(App $a) {
 					builtin_activity_puller($item, $conv_responses);
 				}
 
-				$like    = ((x($conv_responses['like'],$link_item['uri'])) ? format_like($conv_responses['like'][$link_item['uri']],$conv_responses['like'][$link_item['uri'] . '-l'], 'like',$link_item['id']) : '');
-				$dislike = ((x($conv_responses['dislike'],$link_item['uri'])) ? format_like($conv_responses['dislike'][$link_item['uri']],$conv_responses['dislike'][$link_item['uri'] . '-l'], 'dislike',$link_item['id']) : '');
+				$like    = ((x($conv_responses['like'], $link_item['uri'])) ? format_like($conv_responses['like'][$link_item['uri']], $conv_responses['like'][$link_item['uri'] . '-l'], 'like',$link_item['id']) : '');
+				$dislike = ((x($conv_responses['dislike'], $link_item['uri'])) ? format_like($conv_responses['dislike'][$link_item['uri']], $conv_responses['dislike'][$link_item['uri'] . '-l'], 'dislike',$link_item['id']) : '');
 
 				if (($can_post || can_write_wall($a, $owner_uid)) && $link_item['last-child']) {
 					$comments .= replace_macros($cmnt_tpl,array(
diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index 50e8cd377b..a42dfe6e13 100644
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -9,9 +9,9 @@
  * Description: "Vier" is a very compact and modern theme. It uses the font awesome font library: http://fortawesome.github.com/Font-Awesome/
  */
 
-require_once("include/plugin.php");
-require_once("include/socgraph.php");
-require_once("mod/proxy.php");
+require_once "include/plugin.php";
+require_once "include/socgraph.php";
+require_once "mod/proxy.php";
 
 function vier_init(App $a) {
 
@@ -101,8 +101,9 @@ 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",
-									"probe", "webfinger", "login", "invite", "credits"))) {
+			"probe", "webfinger", "login", "invite", "credits"))) {
 		$a->page['htmlhead'] .= "<link rel='stylesheet' href='view/theme/vier/hide.css' />";
 	}
 }
@@ -110,13 +111,15 @@ EOT;
 function get_vier_config($key, $default = false, $admin = false) {
 	if (local_user() AND !$admin) {
 		$result = get_pconfig(local_user(), "vier", $key);
-		if ($result !== false)
+		if ($result !== false) {
 			return $result;
+		}
 	}
 
 	$result = get_config("vier", $key);
-	if ($result !== false)
+	if ($result !== false) {
 		return $result;
+	}
 
 	return $default;
 }
@@ -131,7 +134,7 @@ function vier_community_info() {
 	$show_friends    = get_vier_config("show_friends", 1);
 	$show_lastusers  = get_vier_config("show_lastusers", 1);
 
-	//get_baseurl
+	// get_baseurl
 	$url = App::get_baseurl($ssl_state);
 	$aside['$url'] = $url;
 
@@ -161,7 +164,7 @@ function vier_community_info() {
 
 	// last 9 users
 	if ($show_lastusers) {
-		$publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 ");
+		$publish = (get_config('system', 'publish_all') ? '' : " AND `publish` = 1 ");
 		$order = " ORDER BY `register_date` DESC ";
 
 		$tpl = get_markup_template('ch_directory_item.tpl');
@@ -191,12 +194,12 @@ function vier_community_info() {
 	//right_aside FIND FRIENDS
 	if ($show_friends AND local_user()) {
 		$nv = array();
-		$nv['title'] = Array("", t('Find Friends'), "", "");
-		$nv['directory'] = Array('directory', t('Local Directory'), "", "");
+		$nv['title'] = array("", t('Find Friends'), "", "");
+		$nv['directory'] = array('directory', t('Local Directory'), "", "");
 		$nv['global_directory'] = Array(get_server(), t('Global Directory'), "", "");
-		$nv['match'] = Array('match', t('Similar Interests'), "", "");
-		$nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
-		$nv['invite'] = Array('invite', t('Invite Friends'), "", "");
+		$nv['match'] = array('match', t('Similar Interests'), "", "");
+		$nv['suggest'] = array('suggest', t('Friend Suggestions'), "", "");
+		$nv['invite'] = array('invite', t('Invite Friends'), "", "");
 
 		$nv['search'] = '<form name="simple_bar" method="get" action="dirfind">
 						<span class="sbox_l"></span>
@@ -211,7 +214,7 @@ function vier_community_info() {
 	//Community_Pages at right_aside
 	if ($show_pages AND local_user()) {
 
-		require_once('include/ForumManager.php');
+		require_once 'include/ForumManager.php';
 
 		if (x($_GET, 'cid') && intval($_GET['cid']) != 0) {
 			$cid = $_GET['cid'];
@@ -247,7 +250,7 @@ function vier_community_info() {
 
 			$tpl = get_markup_template('widget_forumlist_right.tpl');
 
-			$page .= replace_macros($tpl,array(
+			$page .= replace_macros($tpl, array(
 				'$title'          => t('Forums'),
 				'$forums'         => $entries,
 				'$link_desc'      => t('External link to forum'),
@@ -259,9 +262,9 @@ function vier_community_info() {
 			$aside['$page'] = $page;
 		}
 	}
-	//END Community Page
+	// END Community Page
 
-	//helpers
+	// helpers
 	if ($show_helpers) {
 		$r = array();
 
@@ -284,14 +287,14 @@ function vier_community_info() {
 		foreach ($r AS $index => $helper)
 			$r[$index]["url"] = zrl($helper["url"]);
 
-		$r[] = Array("url" => "help/Quick-Start-guide", "name" => t("Quick Start"));
+		$r[] = array("url" => "help/Quick-Start-guide", "name" => t("Quick Start"));
 
 		$tpl = get_markup_template('ch_helpers.tpl');
 
 		if ($r) {
 
 			$helpers = array();
-			$helpers['title'] = Array("", t('Help'), "", "");
+			$helpers['title'] = array("", t('Help'), "", "");
 
 			$aside['$helpers_items'] = array();
 
@@ -306,9 +309,9 @@ function vier_community_info() {
 			$aside['$helpers'] = $helpers;
 		}
 	}
-	//end helpers
+	// end helpers
 
-	//connectable services
+	// connectable services
 	if ($show_services) {
 
 		/// @TODO This whole thing is hard-coded, better rewrite to Intercepting Filter Pattern (future-todo)
@@ -346,6 +349,7 @@ function vier_community_info() {
 			$r[] = array("photo" => "images/googleplus.png", "name" => "Google+");
 		}
 
+		/// @TODO old-lost code (and below)?
 		//if (plugin_enabled("ijpost")) {
 		//	$r[] = array("photo" => "images/", "name" => "");
 		//}
@@ -383,7 +387,7 @@ function vier_community_info() {
 		if (dbm::is_result($r)) {
 
 			$con_services = array();
-			$con_services['title'] = Array("", t('Connect Services'), "", "");
+			$con_services['title'] = array("", t('Connect Services'), "", "");
 			$aside['$con_services'] = $con_services;
 
 			foreach ($r as $rr) {

From 3cea176ef238c8d30b0fd74ca86bb73bb00d8bc5 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 1 Apr 2017 21:46:57 +0200
Subject: [PATCH 118/120] added spaces + used x ()

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 boot.php     | 2 +-
 mod/item.php | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/boot.php b/boot.php
index f65829ed18..5f65572d50 100644
--- a/boot.php
+++ b/boot.php
@@ -1450,7 +1450,7 @@ function get_app() {
  */
 function x($s,$k = NULL) {
 	if ($k != NULL) {
-		if ((is_array($s)) && (array_key_exists($k,$s))) {
+		if ((is_array($s)) && (array_key_exists($k, $s))) {
 			if ($s[$k]) {
 				return (int) 1;
 			}
diff --git a/mod/item.php b/mod/item.php
index 79633cdc18..8bf922d97c 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -325,8 +325,9 @@ function item_post(App $a) {
 		// if using the API, we won't see pubmail_enable - figure out if it should be set
 
 		if ($api_source && $profile_uid && $profile_uid == local_user() && (! $private)) {
-			$mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
+			$mail_disabled = ((function_exists('imap_open') && (! get_config('system', 'imap_disabled'))) ? 0 : 1);
 			if (! $mail_disabled) {
+				/// @TODO Check if only pubmail is loaded, * loads all columns
 				$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1",
 					intval(local_user())
 				);
@@ -372,7 +373,7 @@ function item_post(App $a) {
 		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
 			intval($_SESSION['uid']));
 	} elseif(remote_user()) {
-		if (is_array($_SESSION['remote'])) {
+		if (x($_SESSION, 'remote') && is_array($_SESSION['remote'])) {
 			foreach ($_SESSION['remote'] as $v) {
 				if ($v['uid'] == $profile_uid) {
 					$contact_id = $v['cid'];
@@ -544,7 +545,7 @@ function item_post(App $a) {
 	if ($parent AND ($parent_contact['network'] == NETWORK_OSTATUS)) {
 		$contact = '@[url=' . $parent_contact['url'] . ']' . $parent_contact['nick'] . '[/url]';
 
-		if (!in_array($contact,$tags)) {
+		if (!in_array($contact, $tags)) {
 			$body = $contact . ' ' . $body;
 			$tags[] = $contact;
 		}

From 884c75a350af37939ac943938349114e389749e5 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 2 Apr 2017 19:18:11 +0000
Subject: [PATCH 119/120] Issue 3278: Attachments in Reshares should now work

---
 include/ostatus.php | 206 ++++++++++++++++++++++++++------------------
 1 file changed, 122 insertions(+), 84 deletions(-)

diff --git a/include/ostatus.php b/include/ostatus.php
index aad4c1041a..d1193af029 100644
--- a/include/ostatus.php
+++ b/include/ostatus.php
@@ -239,6 +239,23 @@ class ostatus {
 		}
 	}
 
+	/**
+	 * @brief Read attributes from element
+	 *
+	 * @param object $element Element object
+	 *
+	 * @return array attributes
+	 */
+	private static function read_attributes($element) {
+		$attribute = array();
+
+		foreach ($element->attributes AS $attributes) {
+			$attribute[$attributes->name] = $attributes->textContent;
+		}
+
+		return $attribute;
+	}
+
 	/**
 	 * @brief Imports an XML string containing OStatus elements
 	 *
@@ -252,9 +269,9 @@ class ostatus {
 
 		logger("Import OStatus message", LOGGER_DEBUG);
 
-		if ($xml == "")
+		if ($xml == "") {
 			return;
-
+		}
 		//$tempfile = tempnam(get_temppath(), "import");
 		//file_put_contents($tempfile, $xml);
 
@@ -273,13 +290,14 @@ class ostatus {
 
 		$gub = "";
 		$hub_attributes = $xpath->query("/atom:feed/atom:link[@rel='hub']")->item(0)->attributes;
-		if (is_object($hub_attributes))
-			foreach($hub_attributes AS $hub_attribute)
+		if (is_object($hub_attributes)) {
+			foreach ($hub_attributes AS $hub_attribute) {
 				if ($hub_attribute->name == "href") {
 					$hub = $hub_attribute->textContent;
 					logger("Found hub ".$hub, LOGGER_DEBUG);
 				}
-
+			}
+		}
 		$header = array();
 		$header["uid"] = $importer["uid"];
 		$header["network"] = NETWORK_OSTATUS;
@@ -292,11 +310,11 @@ class ostatus {
 		// depending on that, the first node is different
 		$first_child = $doc->firstChild->tagName;
 
-		if ($first_child == "feed")
+		if ($first_child == "feed") {
 			$entries = $xpath->query('/atom:feed/atom:entry');
-		else
+		} else {
 			$entries = $xpath->query('/atom:entry');
-
+		}
 		$conversation = "";
 		$conversationlist = array();
 		$item_id = 0;
@@ -304,25 +322,25 @@ class ostatus {
 		// Reverse the order of the entries
 		$entrylist = array();
 
-		foreach ($entries AS $entry)
+		foreach ($entries AS $entry) {
 			$entrylist[] = $entry;
-
+		}
 		foreach (array_reverse($entrylist) AS $entry) {
 
 			$mention = false;
 
 			// fetch the author
-			if ($first_child == "feed")
+			if ($first_child == "feed") {
 				$author = self::fetchauthor($xpath, $doc->firstChild, $importer, $contact, false);
-			else
+			} else {
 				$author = self::fetchauthor($xpath, $entry, $importer, $contact, false);
-
+			}
 			$value = $xpath->evaluate('atom:author/poco:preferredUsername/text()', $context)->item(0)->nodeValue;
-			if ($value != "")
+			if ($value != "") {
 				$nickname = $value;
-			else
+			} else {
 				$nickname = $author["author-name"];
-
+			}
 			$item = array_merge($header, $author);
 
 			// Now get the item
@@ -330,7 +348,7 @@ class ostatus {
 
 			$r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s'",
 				intval($importer["uid"]), dbesc($item["uri"]));
-			if ($r) {
+			if (dbm::is_result($r)) {
 				logger("Item with uri ".$item["uri"]." for user ".$importer["uid"]." already existed under id ".$r[0]["id"], LOGGER_DEBUG);
 				continue;
 			}
@@ -341,9 +359,9 @@ class ostatus {
 			if (($item["object-type"] == ACTIVITY_OBJ_BOOKMARK) OR ($item["object-type"] == ACTIVITY_OBJ_EVENT)) {
 				$item["title"] = $xpath->query('atom:title/text()', $entry)->item(0)->nodeValue;
 				$item["body"] = $xpath->query('atom:summary/text()', $entry)->item(0)->nodeValue;
-			} elseif ($item["object-type"] == ACTIVITY_OBJ_QUESTION)
+			} elseif ($item["object-type"] == ACTIVITY_OBJ_QUESTION) {
 				$item["title"] = $xpath->query('atom:title/text()', $entry)->item(0)->nodeValue;
-
+			}
 			$item["object"] = $xml;
 			$item["verb"] = $xpath->query('activity:verb/text()', $entry)->item(0)->nodeValue;
 
@@ -387,9 +405,9 @@ class ostatus {
 			}
 
 			// http://activitystrea.ms/schema/1.0/rsvp-yes
-			if (!in_array($item["verb"], array(ACTIVITY_POST, ACTIVITY_LIKE, ACTIVITY_SHARE)))
+			if (!in_array($item["verb"], array(ACTIVITY_POST, ACTIVITY_LIKE, ACTIVITY_SHARE))) {
 				logger("Unhandled verb ".$item["verb"]." ".print_r($item, true));
-
+			}
 			$item["created"] = $xpath->query('atom:published/text()', $entry)->item(0)->nodeValue;
 			$item["edited"] = $xpath->query('atom:updated/text()', $entry)->item(0)->nodeValue;
 			$conversation = $xpath->query('ostatus:conversation/text()', $entry)->item(0)->nodeValue;
@@ -398,28 +416,32 @@ class ostatus {
 
 			$inreplyto = $xpath->query('thr:in-reply-to', $entry);
 			if (is_object($inreplyto->item(0))) {
-				foreach($inreplyto->item(0)->attributes AS $attributes) {
-					if ($attributes->name == "ref")
+				foreach ($inreplyto->item(0)->attributes AS $attributes) {
+					if ($attributes->name == "ref") {
 						$item["parent-uri"] = $attributes->textContent;
-					if ($attributes->name == "href")
+					}
+					if ($attributes->name == "href") {
 						$related = $attributes->textContent;
+					}
 				}
 			}
 
 			$georsspoint = $xpath->query('georss:point', $entry);
-			if ($georsspoint)
+			if ($georsspoint) {
 				$item["coord"] = $georsspoint->item(0)->nodeValue;
-
+			}
 			$categories = $xpath->query('atom:category', $entry);
 			if ($categories) {
 				foreach ($categories AS $category) {
-					foreach($category->attributes AS $attributes)
+					foreach ($category->attributes AS $attributes) {
 						if ($attributes->name == "term") {
 							$term = $attributes->textContent;
-							if(strlen($item["tag"]))
+							if(strlen($item["tag"])) {
 								$item["tag"] .= ',';
+							}
 							$item["tag"] .= "#[url=".App::get_baseurl()."/search?tag=".$term."]".$term."[/url]";
 						}
+					}
 				}
 			}
 
@@ -428,61 +450,54 @@ class ostatus {
 
 			$links = $xpath->query('atom:link', $entry);
 			if ($links) {
-				$rel = "";
-				$href = "";
-				$type = "";
-				$length = "0";
-				$title = "";
 				foreach ($links AS $link) {
-					foreach($link->attributes AS $attributes) {
-						if ($attributes->name == "href")
-							$href = $attributes->textContent;
-						if ($attributes->name == "rel")
-							$rel = $attributes->textContent;
-						if ($attributes->name == "type")
-							$type = $attributes->textContent;
-						if ($attributes->name == "length")
-							$length = $attributes->textContent;
-						if ($attributes->name == "title")
-							$title = $attributes->textContent;
-					}
-					if (($rel != "") AND ($href != ""))
-						switch($rel) {
+					$attribute = self::read_attributes($link);
+
+					if (($attribute['rel'] != "") AND ($attribute['href'] != "")) {
+						switch ($attribute['rel']) {
 							case "alternate":
-								$item["plink"] = $href;
+								$item["plink"] = $attribute['href'];
 								if (($item["object-type"] == ACTIVITY_OBJ_QUESTION) OR
-									($item["object-type"] == ACTIVITY_OBJ_EVENT))
-									$item["body"] .= add_page_info($href);
+									($item["object-type"] == ACTIVITY_OBJ_EVENT)) {
+									$item["body"] .= add_page_info($attribute['href']);
+								}
 								break;
 							case "ostatus:conversation":
-								$conversation = $href;
+								$conversation = $attribute['href'];
 								break;
 							case "enclosure":
-								$enclosure = $href;
-								if(strlen($item["attach"]))
+								$enclosure = $attribute['href'];
+								if (strlen($item["attach"])) {
 									$item["attach"] .= ',';
-
-								$item["attach"] .= '[attach]href="'.$href.'" length="'.$length.'" type="'.$type.'" title="'.$title.'"[/attach]';
+								}
+								if (!isset($attribute['length'])) {
+									$attribute['length'] = "0";
+								}
+								$item["attach"] .= '[attach]href="'.$attribute['href'].'" length="'.$attribute['length'].'" type="'.$attribute['type'].'" title="'.$attribute['title'].'"[/attach]';
 								break;
 							case "related":
 								if ($item["object-type"] != ACTIVITY_OBJ_BOOKMARK) {
-									if (!isset($item["parent-uri"]))
-										$item["parent-uri"] = $href;
-
-									if ($related == "")
-										$related = $href;
-								} else
-									$item["body"] .= add_page_info($href);
+									if (!isset($item["parent-uri"])) {
+										$item["parent-uri"] = $attribute['href'];
+									}
+									if ($related == "") {
+										$related = $attribute['href'];
+									}
+								} else {
+									$item["body"] .= add_page_info($attribute['href']);
+								}
 								break;
 							case "self":
-								$self = $href;
+								$self = $attribute['href'];
 								break;
 							case "mentioned":
 								// Notification check
-								if ($importer["nurl"] == normalise_link($href))
+								if ($importer["nurl"] == normalise_link($attribute['href'])) {
 									$mention = true;
+								}
 								break;
 						}
+					}
 				}
 			}
 
@@ -491,13 +506,16 @@ class ostatus {
 
 			$notice_info = $xpath->query('statusnet:notice_info', $entry);
 			if ($notice_info AND ($notice_info->length > 0)) {
-				foreach($notice_info->item(0)->attributes AS $attributes) {
-					if ($attributes->name == "source")
+				foreach ($notice_info->item(0)->attributes AS $attributes) {
+					if ($attributes->name == "source") {
 						$item["app"] = strip_tags($attributes->textContent);
-					if ($attributes->name == "local_id")
+					}
+					if ($attributes->name == "local_id") {
 						$local_id = $attributes->textContent;
-					if ($attributes->name == "repeat_of")
+					}
+					if ($attributes->name == "repeat_of") {
 						$repeat_of = $attributes->textContent;
+					}
 				}
 			}
 
@@ -508,25 +526,27 @@ class ostatus {
 				if (is_object($activityobjects)) {
 
 					$orig_uri = $xpath->query("activity:object/atom:id", $activityobjects)->item(0)->nodeValue;
-					if (!isset($orig_uri))
+					if (!isset($orig_uri)) {
 						$orig_uri = $xpath->query('atom:id/text()', $activityobjects)->item(0)->nodeValue;
-
+					}
 					$orig_links = $xpath->query("activity:object/atom:link[@rel='alternate']", $activityobjects);
-					if ($orig_links AND ($orig_links->length > 0))
-						foreach($orig_links->item(0)->attributes AS $attributes)
-							if ($attributes->name == "href")
+					if ($orig_links AND ($orig_links->length > 0)) {
+						foreach ($orig_links->item(0)->attributes AS $attributes) {
+							if ($attributes->name == "href") {
 								$orig_link = $attributes->textContent;
-
-					if (!isset($orig_link))
+							}
+						}
+					}
+					if (!isset($orig_link)) {
 						$orig_link = $xpath->query("atom:link[@rel='alternate']", $activityobjects)->item(0)->nodeValue;
-
-					if (!isset($orig_link))
+					}
+					if (!isset($orig_link)) {
 						$orig_link =  self::convert_href($orig_uri);
-
+					}
 					$orig_body = $xpath->query('activity:object/atom:content/text()', $activityobjects)->item(0)->nodeValue;
-					if (!isset($orig_body))
+					if (!isset($orig_body)) {
 						$orig_body = $xpath->query('atom:content/text()', $activityobjects)->item(0)->nodeValue;
-
+					}
 					$orig_created = $xpath->query('atom:published/text()', $activityobjects)->item(0)->nodeValue;
 					$orig_edited = $xpath->query('atom:updated/text()', $activityobjects)->item(0)->nodeValue;
 
@@ -550,8 +570,26 @@ class ostatus {
 					$item["verb"] = $xpath->query('activity:verb/text()', $activityobjects)->item(0)->nodeValue;
 
 					$item["object-type"] = $xpath->query('activity:object/activity:object-type/text()', $activityobjects)->item(0)->nodeValue;
-					if (!isset($item["object-type"]))
+					if (!isset($item["object-type"])) {
 						$item["object-type"] = $xpath->query('activity:object-type/text()', $activityobjects)->item(0)->nodeValue;
+					}
+					// Quickfix to read attachments
+					$enclosures = $xpath->query("atom:link[@rel='alternate']", $activityobjects);
+					if ($enclosures) {
+						foreach ($enclosures AS $link) {
+							$attribute = self::read_attributes($link);
+							if ($href != "") {
+								$enclosure = $attribute['href'];
+								if (strlen($item["attach"])) {
+									$item["attach"] .= ',';
+								}
+								if (!isset($attribute['length'])) {
+									$attribute['length'] = "0";
+								}
+								$item["attach"] .= '[attach]href="'.$attribute['href'].'" length="'.$attribute['length'].'" type="'.$attribute['type'].'" title="'.$attribute['title'].'"[/attach]';
+							}
+						}
+					}
 				}
 			}
 
@@ -579,13 +617,13 @@ class ostatus {
 							intval($importer["uid"]), dbesc($item["parent-uri"]));
 					}
 				}
-				if ($r) {
+				if (dbm::is_result($r)) {
 					$item["type"] = 'remote-comment';
 					$item["gravity"] = GRAVITY_COMMENT;
 				}
-			} else
+			} else {
 				$item["parent-uri"] = $item["uri"];
-
+			}
 			$item_id = self::completion($conversation, $importer["uid"], $item, $self);
 
 			if (!$item_id) {

From c574c317eff1dc40254414bb8b2b14e96fc17402 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 2 Apr 2017 20:43:54 +0000
Subject: [PATCH 120/120] Removed unneeded comment

---
 include/ostatus.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/ostatus.php b/include/ostatus.php
index d1193af029..9b78495093 100644
--- a/include/ostatus.php
+++ b/include/ostatus.php
@@ -573,7 +573,7 @@ class ostatus {
 					if (!isset($item["object-type"])) {
 						$item["object-type"] = $xpath->query('activity:object-type/text()', $activityobjects)->item(0)->nodeValue;
 					}
-					// Quickfix to read attachments
+
 					$enclosures = $xpath->query("atom:link[@rel='alternate']", $activityobjects);
 					if ($enclosures) {
 						foreach ($enclosures AS $link) {