Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-23 16:00:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Continued with coding convention:

Browse source 
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- rewrote a code block so if dbm::is_result() fails it will abort, else the id
  is fetched from INSERT statement
- made some SQL keywords upper-cased and added back-ticks to columns/table names

Signed-off-by: Roland Haeder <roland@mxchange.org>
This commit is contained in:
Roland Haeder 2016-12-20 21:16:01 +01:00
parent d6e57f0348
commit 013f8a4139
No known key found for this signature in database
GPG key ID: B72F8185C6C7BD78
3 changed files with 55 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
view/theme/frio/theme.php
View file

@ -271,7 +271,7 @@ function frio_remote_nav($a,&$nav) {
* We use this to give the data to textcomplete and have a filter function at the * We use this to give the data to textcomplete and have a filter function at the
* contact page. * contact page.
* *
* @param App $a The app data * @param App $a The app data @TODO Unused
* @param array $results The array with the originals from acl_lookup() * @param array $results The array with the originals from acl_lookup()
*/ */
function frio_acl_lookup($a, &$results) { function frio_acl_lookup($a, &$results) {
@ -290,8 +290,9 @@ function frio_acl_lookup($a, &$results) {
} }
$sql_extra .= (($searching) ? " AND (`attag` LIKE '%%".dbesc($search_txt)."%%' OR `name` LIKE '%%".dbesc($search_txt)."%%' OR `nick` LIKE '%%".dbesc($search_txt)."%%') " : ""); $sql_extra .= (($searching) ? " AND (`attag` LIKE '%%".dbesc($search_txt)."%%' OR `name` LIKE '%%".dbesc($search_txt)."%%' OR `nick` LIKE '%%".dbesc($search_txt)."%%') " : "");
if($nets) if ($nets) {
$sql_extra .= sprintf(" AND network = '%s' ", dbesc($nets)); $sql_extra .= sprintf(" AND network = '%s' ", dbesc($nets));
}
$sql_extra2 = ((($sort_type > 0) && ($sort_type <= CONTACT_IS_FRIEND)) ? sprintf(" AND `rel` = %d ",intval($sort_type)) : ''); $sql_extra2 = ((($sort_type > 0) && ($sort_type <= CONTACT_IS_FRIEND)) ? sprintf(" AND `rel` = %d ",intval($sort_type)) : '');

49
view/theme/vier/theme.php
View file

@ -316,55 +316,72 @@ function vier_community_info() {
//connectable services //connectable services
if ($show_services) { if ($show_services) {
/// @TODO This whole thing is hard-coded, better rewrite to Intercepting Filter Pattern (future-todo)
$r = array(); $r = array();
if (plugin_enabled("appnet")) if (plugin_enabled("appnet")) {
$r[] = array("photo" => "images/appnet.png", "name" => "App.net"); $r[] = array("photo" => "images/appnet.png", "name" => "App.net");
}
if (plugin_enabled("buffer")) if (plugin_enabled("buffer")) {
$r[] = array("photo" => "images/buffer.png", "name" => "Buffer"); $r[] = array("photo" => "images/buffer.png", "name" => "Buffer");
}
if (plugin_enabled("blogger")) if (plugin_enabled("blogger")) {
$r[] = array("photo" => "images/blogger.png", "name" => "Blogger"); $r[] = array("photo" => "images/blogger.png", "name" => "Blogger");
}
if (plugin_enabled("dwpost")) if (plugin_enabled("dwpost")) {
$r[] = array("photo" => "images/dreamwidth.png", "name" => "Dreamwidth"); $r[] = array("photo" => "images/dreamwidth.png", "name" => "Dreamwidth");
}
if (plugin_enabled("fbpost")) if (plugin_enabled("fbpost")) {
$r[] = array("photo" => "images/facebook.png", "name" => "Facebook"); $r[] = array("photo" => "images/facebook.png", "name" => "Facebook");
}
if (plugin_enabled("ifttt")) if (plugin_enabled("ifttt")) {
$r[] = array("photo" => "addon/ifttt/ifttt.png", "name" => "IFTTT"); $r[] = array("photo" => "addon/ifttt/ifttt.png", "name" => "IFTTT");
}
if (plugin_enabled("statusnet")) if (plugin_enabled("statusnet")) {
$r[] = array("photo" => "images/gnusocial.png", "name" => "GNU Social"); $r[] = array("photo" => "images/gnusocial.png", "name" => "GNU Social");
}
if (plugin_enabled("gpluspost")) if (plugin_enabled("gpluspost")) {
$r[] = array("photo" => "images/googleplus.png", "name" => "Google+"); $r[] = array("photo" => "images/googleplus.png", "name" => "Google+");
}
//if (plugin_enabled("ijpost")) //if (plugin_enabled("ijpost")) {
// $r[] = array("photo" => "images/", "name" => ""); // $r[] = array("photo" => "images/", "name" => "");
//}
if (plugin_enabled("libertree")) if (plugin_enabled("libertree")) {
$r[] = array("photo" => "images/libertree.png", "name" => "Libertree"); $r[] = array("photo" => "images/libertree.png", "name" => "Libertree");
}
//if (plugin_enabled("ljpost")) //if (plugin_enabled("ljpost")) {
// $r[] = array("photo" => "images/", "name" => ""); // $r[] = array("photo" => "images/", "name" => "");
//}
if (plugin_enabled("pumpio")) if (plugin_enabled("pumpio")) {
$r[] = array("photo" => "images/pumpio.png", "name" => "pump.io"); $r[] = array("photo" => "images/pumpio.png", "name" => "pump.io");
}
if (plugin_enabled("tumblr")) if (plugin_enabled("tumblr")) {
$r[] = array("photo" => "images/tumblr.png", "name" => "Tumblr"); $r[] = array("photo" => "images/tumblr.png", "name" => "Tumblr");
}
if (plugin_enabled("twitter")) if (plugin_enabled("twitter")) {
$r[] = array("photo" => "images/twitter.png", "name" => "Twitter"); $r[] = array("photo" => "images/twitter.png", "name" => "Twitter");
}
if (plugin_enabled("wppost")) if (plugin_enabled("wppost")) {
$r[] = array("photo" => "images/wordpress.png", "name" => "Wordpress"); $r[] = array("photo" => "images/wordpress.png", "name" => "Wordpress");
}
if(function_exists("imap_open") AND !get_config("system","imap_disabled") AND !get_config("system","dfrn_only")) if (function_exists("imap_open") AND !get_config("system","imap_disabled") AND !get_config("system","dfrn_only")) {
$r[] = array("photo" => "images/mail.png", "name" => "E-Mail"); $r[] = array("photo" => "images/mail.png", "name" => "E-Mail");
}
$tpl = get_markup_template('ch_connectors.tpl'); $tpl = get_markup_template('ch_connectors.tpl');