clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added spaces (coding convention) 

Signed-off-by: Roland Häder <roland@mxchange.org>
This commit is contained in:
Roland Häder 2017-01-27 11:53:56 +01:00 committed by Roland Haeder
parent 951006dd10
commit c2d8738285
No known key found for this signature in database
GPG Key ID: B72F8185C6C7BD78
11 changed files with 336 additions and 330 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
object/BaseObject.php
View File

@ -1,6 +1,7 @@
<?php
if(class_exists('BaseObject'))
if (class_exists('BaseObject')) {
return;
}
require_once('boot.php');
@ -18,8 +19,9 @@ class BaseObject {
* Same as get_app from boot.php
*/
public function get_app() {
if(self::$app)
if (self::$app) {
return self::$app;
}
self::$app = get_app();

25
object/Conversation.php
View File

@ -1,6 +1,7 @@
<?php
if(class_exists('Conversation'))
if (class_exists('Conversation')) {
return;
}
require_once('boot.php');
require_once('object/BaseObject.php');
@ -28,7 +29,7 @@ class Conversation extends BaseObject {
* Set the mode we'll be displayed on
*/
private function set_mode($mode) {
if($this->get_mode() == $mode)
if ($this->get_mode() == $mode)
return;
$a = $this->get_app();
@ -92,11 +93,11 @@ class Conversation extends BaseObject {
*/
public function add_thread($item) {
$item_id = $item->get_id();
if(!$item_id) {
if (!$item_id) {
logger('[ERROR] Conversation::add_thread : Item has no ID!!', LOGGER_DEBUG);
return false;
}
if($this->get_thread($item->get_id())) {
if ($this->get_thread($item->get_id())) {
logger('[WARN] Conversation::add_thread : Thread already exists ('. $item->get_id() .').', LOGGER_DEBUG);
return false;
}
@ -104,11 +105,11 @@ class Conversation extends BaseObject {
/*
* Only add will be displayed
*/
if($item->get_data_value('network') === NETWORK_MAIL && local_user() != $item->get_data_value('uid')) {
if ($item->get_data_value('network') === NETWORK_MAIL && local_user() != $item->get_data_value('uid')) {
logger('[WARN] Conversation::add_thread : Thread is a mail ('. $item->get_id() .').', LOGGER_DEBUG);
return false;
}
if($item->get_data_value('verb') === ACTIVITY_LIKE || $item->get_data_value('verb') === ACTIVITY_DISLIKE) {
if ($item->get_data_value('verb') === ACTIVITY_LIKE || $item->get_data_value('verb') === ACTIVITY_DISLIKE) {
logger('[WARN] Conversation::add_thread : Thread is a (dis)like ('. $item->get_id() .').', LOGGER_DEBUG);
return false;
}
@ -132,13 +133,14 @@ class Conversation extends BaseObject {
$i = 0;
foreach($this->threads as $item) {
if($item->get_data_value('network') === NETWORK_MAIL && local_user() != $item->get_data_value('uid'))
foreach ($this->threads as $item) {
if ($item->get_data_value('network') === NETWORK_MAIL && local_user() != $item->get_data_value('uid')) {
continue;
}
$item_data = $item->get_template_data($conv_responses);
if(!$item_data) {
if (!$item_data) {
logger('[ERROR] Conversation::get_template_data : Failed to get item template data ('. $item->get_id() .').', LOGGER_DEBUG);
return false;
}
@ -156,10 +158,11 @@ class Conversation extends BaseObject {
* _ false on failure
*/
private function get_thread($id) {
foreach($this->threads as $item) {
if($item->get_id() == $id)
foreach ($this->threads as $item) {
if ($item->get_id() == $id) {
return $item;
}
}
return false;
}

23
object/Item.php
View File

@ -1,6 +1,7 @@
<?php
if(class_exists('Item'))
if (class_exists('Item')) {
return;
}
require_once('object/BaseObject.php');
require_once('include/text.php');
@ -181,19 +182,19 @@ class Item extends BaseObject {
$location = ((strlen($locate['html'])) ? $locate['html'] : render_location_dummy($locate));
$searchpath = "search?tag=";
$tags=array();
$tags = array();
$hashtags = array();
$mentions = array();
/*foreach(explode(',',$item['tag']) as $tag){
/*foreach (explode(',',$item['tag']) as $tag){
$tag = trim($tag);
if ($tag!="") {
$t = bbcode($tag);
$tags[] = $t;
if($t[0] == '#')
if ($t[0] == '#')
$hashtags[] = $t;
elseif($t[0] == '@')
elseif ($t[0] == '@')
$mentions[] = $t;
}
}*/
@ -258,7 +259,7 @@ class Item extends BaseObject {
}
$tagger = '';
if(feature_enabled($conv->get_profile_owner(),'commtag')) {
if (feature_enabled($conv->get_profile_owner(),'commtag')) {
$tagger = array(
'add' => t("add tag"),
'class' => "",
@ -503,7 +504,7 @@ class Item extends BaseObject {
*/
protected function set_parent($item) {
$parent = $this->get_parent();
if($parent) {
if ($parent) {
$parent->remove_child($this);
}
$this->parent = $item;
@ -734,9 +735,9 @@ class Item extends BaseObject {
$conv = $this->get_conversation();
$this->wall_to_wall = false;
if($this->is_toplevel()) {
if($conv->get_mode() !== 'profile') {
if($this->get_data_value('wall') AND !$this->get_data_value('self')) {
if ($this->is_toplevel()) {
if ($conv->get_mode() !== 'profile') {
if ($this->get_data_value('wall') AND !$this->get_data_value('self')) {
// On the network page, I am the owner. On the display page it will be the profile owner.
// This will have been stored in $a->page_contact by our calling page.
// Put this person as the wall owner of the wall-to-wall notice.
@ -745,7 +746,7 @@ class Item extends BaseObject {
$this->owner_photo = $a->page_contact['thumb'];
$this->owner_name = $a->page_contact['name'];
$this->wall_to_wall = true;
} elseif($this->get_data_value('owner-link')) {
} elseif ($this->get_data_value('owner-link')) {
$owner_linkmatch = (($this->get_data_value('owner-link')) && link_compare($this->get_data_value('owner-link'),$this->get_data_value('author-link')));
$alias_linkmatch = (($this->get_data_value('alias')) && link_compare($this->get_data_value('alias'),$this->get_data_value('author-link')));

16
tests/get_tags_test.php
View File

@ -44,23 +44,23 @@ function q($sql) {
$args=func_get_args();
//last parameter is always (in this test) uid, so, it should be 11
if($args[count($args)-1]!=11) {
if ($args[count($args)-1]!=11) {
return;
}
if(3==count($args)) {
if (3==count($args)) {
//first call in handle_body, id only
if($result[0]['id']==$args[1]) {
if ($result[0]['id']==$args[1]) {
return $result;
}
//second call in handle_body, name
if($result[0]['name']===$args[1]) {
if ($result[0]['name']===$args[1]) {
return $result;
}
}
//third call in handle_body, nick or attag
if($result[0]['nick']===$args[2] || $result[0]['attag']===$args[1]) {
if ($result[0]['nick']===$args[2] || $result[0]['attag']===$args[1]) {
return $result;
}
}
@ -108,7 +108,7 @@ class GetTagsTest extends PHPUnit_Framework_TestCase {
$inform='';
$str_tags='';
foreach($tags as $tag) {
foreach ($tags as $tag) {
handle_tag($this->a, $text, $inform, $str_tags, 11, $tag);
}
@ -197,7 +197,7 @@ class GetTagsTest extends PHPUnit_Framework_TestCase {
$inform='';
$str_tags='';
foreach($tags as $tag) {
foreach ($tags as $tag) {
handle_tag($this->a, $text, $inform, $str_tags, 11, $tag);
}
@ -257,7 +257,7 @@ class GetTagsTest extends PHPUnit_Framework_TestCase {
$inform='';
$str_tags='';
foreach($tags as $tag) {
foreach ($tags as $tag) {
handle_tag($this->a, $text, $inform, $str_tags, 11, $tag);
}

6
tests/template_test.php
View File

@ -13,19 +13,19 @@ class TemplateMockApp {
public $theme_info=array();
}
if(!function_exists('current_theme')) {
if (!function_exists('current_theme')) {
function current_theme() {
return 'clean';
}
}
if(!function_exists('x')) {
if (!function_exists('x')) {
function x($s,$k = NULL) {
return false;
}
}
if(!function_exists('get_app')) {
if (!function_exists('get_app')) {
function get_app() {
return new TemplateMockApp();
}

32
view/theme/frio/php/PHPColors/Color.php
View File

@ -33,9 +33,9 @@ class Color {
$color = str_replace("#", "", $hex);
// Make sure it's 6 digits
if( strlen($color) === 3 ) {
if ( strlen($color) === 3 ) {
$color = $color[0].$color[0].$color[1].$color[1].$color[2].$color[2];
} else if( strlen($color) != 6 ) {
} else if ( strlen($color) != 6 ) {
throw new Exception("HEX color needs to be 6 or 3 digits long");
}
@ -112,19 +112,19 @@ class Color {
*/
public static function hslToHex( $hsl = array() ){
// Make sure it's HSL
if(empty($hsl) || !isset($hsl["H"]) || !isset($hsl["S"]) || !isset($hsl["L"]) ) {
if (empty($hsl) || !isset($hsl["H"]) || !isset($hsl["S"]) || !isset($hsl["L"]) ) {
throw new Exception("Param was not an HSL array");
}
list($H,$S,$L) = array( $hsl['H']/360,$hsl['S'],$hsl['L'] );
if( $S == 0 ) {
if ( $S == 0 ) {
$r = $L * 255;
$g = $L * 255;
$b = $L * 255;
} else {
if($L<0.5) {
if ($L<0.5) {
$var_2 = $L*(1+$S);
} else {
$var_2 = ($L+$S) - ($S*$L);
@ -183,7 +183,7 @@ class Color {
*/
public static function rgbToHex( $rgb = array() ){
// Make sure it's RGB
if(empty($rgb) || !isset($rgb["R"]) || !isset($rgb["G"]) || !isset($rgb["B"]) ) {
if (empty($rgb) || !isset($rgb["R"]) || !isset($rgb["G"]) || !isset($rgb["B"]) ) {
throw new Exception("Param was not an RGB array");
}
@ -244,7 +244,7 @@ class Color {
*/
public function makeGradient( $amount = self::DEFAULT_ADJUST ) {
// Decide which color needs to be made
if( $this->isLight() ) {
if ( $this->isLight() ) {
$lightColor = $this->_hex;
$darkColor = $this->darken($amount);
} else {
@ -387,7 +387,7 @@ class Color {
*/
private function _darken( $hsl, $amount = self::DEFAULT_ADJUST){
// Check if we were provided a number
if( $amount ) {
if ( $amount ) {
$hsl['L'] = ($hsl['L'] * 100) - $amount;
$hsl['L'] = ($hsl['L'] < 0) ? 0:$hsl['L']/100;
} else {
@ -406,7 +406,7 @@ class Color {
*/
private function _lighten( $hsl, $amount = self::DEFAULT_ADJUST){
// Check if we were provided a number
if( $amount ) {
if ( $amount ) {
$hsl['L'] = ($hsl['L'] * 100) + $amount;
$hsl['L'] = ($hsl['L'] > 100) ? 1:$hsl['L']/100;
} else {
@ -446,23 +446,23 @@ class Color {
* @return int
*/
private static function _huetorgb( $v1,$v2,$vH ) {
if( $vH < 0 ) {
if ( $vH < 0 ) {
$vH += 1;
}
if( $vH > 1 ) {
if ( $vH > 1 ) {
$vH -= 1;
}
if( (6*$vH) < 1 ) {
if ( (6*$vH) < 1 ) {
return ($v1 + ($v2 - $v1) * 6 * $vH);
}
if( (2*$vH) < 1 ) {
if ( (2*$vH) < 1 ) {
return $v2;
}
if( (3*$vH) < 2 ) {
if ( (3*$vH) < 2 ) {
return ($v1 + ($v2-$v1) * ( (2/3)-$vH ) * 6);
}
@ -481,9 +481,9 @@ class Color {
$color = str_replace("#", "", $hex);
// Make sure it's 6 digits
if( strlen($color) == 3 ) {
if ( strlen($color) == 3 ) {
$color = $color[0].$color[0].$color[1].$color[1].$color[2].$color[2];
} else if( strlen($color) != 6 ) {
} else if ( strlen($color) != 6 ) {
throw new Exception("HEX color needs to be 6 or 3 digits long");
}

4
view/theme/frio/theme.php
View File

@ -78,12 +78,12 @@ function frio_item_photo_links(App $a, &$body_info) {
$occurence = 1;
$p = bb_find_open_close($body_info['html'], "<a", ">");
while($p !== false && ($occurence++ < 500)) {
while ($p !== false && ($occurence++ < 500)) {
$link = substr($body_info['html'], $p['start'], $p['end'] - $p['start']);
$matches = array();
preg_match("/\/photos\/[\w]+\/image\/([\w]+)/", $link, $matches);
if($matches) {
if ($matches) {
// Replace the link for the photo's page with a direct link to the photo itself
$newlink = str_replace($matches[0], "/photo/{$matches[1]}", $link);

4
view/theme/frost/theme.php
View File

@ -49,12 +49,12 @@ function frost_item_photo_links(App $a, &$body_info) {
$occurence = 1;
$p = bb_find_open_close($body_info['html'], "<a", ">");
while($p !== false && ($occurence++ < 500)) {
while ($p !== false && ($occurence++ < 500)) {
$link = substr($body_info['html'], $p['start'], $p['end'] - $p['start']);
$matches = array();
preg_match("/\/photos\/[\w]+\/image\/([\w]+)/", $link, $matches);
if($matches) {
if ($matches) {
// Replace the link for the photo's page with a direct link to the photo itself
$newlink = str_replace($matches[0], "/photo/{$matches[1]}", $link);