From c2d8738285d24edad48ff04880f236f802fba4be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= Date: Fri, 27 Jan 2017 11:53:56 +0100 Subject: [PATCH] added spaces (coding convention) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- object/BaseObject.php | 6 +- object/Conversation.php | 25 ++- object/Item.php | 23 ++- tests/contains_attribute_test.php | 82 ++++---- tests/expand_acl_test.php | 198 +++++++++--------- tests/get_tags_test.php | 16 +- tests/template_test.php | 260 ++++++++++++------------ tests/xss_filter_test.php | 16 +- view/theme/frio/php/PHPColors/Color.php | 32 +-- view/theme/frio/theme.php | 4 +- view/theme/frost/theme.php | 4 +- 11 files changed, 336 insertions(+), 330 deletions(-) diff --git a/object/BaseObject.php b/object/BaseObject.php index 2666dc1de5..5e0c61f49b 100644 --- a/object/BaseObject.php +++ b/object/BaseObject.php @@ -1,6 +1,7 @@ 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,9 +158,10 @@ 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; diff --git a/object/Item.php b/object/Item.php index b693520b93..ab36069c07 100644 --- a/object/Item.php +++ b/object/Item.php @@ -1,6 +1,7 @@ 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'))); diff --git a/tests/contains_attribute_test.php b/tests/contains_attribute_test.php index b0bb06acfa..b1e87c17a8 100644 --- a/tests/contains_attribute_test.php +++ b/tests/contains_attribute_test.php @@ -1,51 +1,51 @@ assertTrue(attribute_contains($testAttr, "class3")); - $this->assertFalse(attribute_contains($testAttr, "class2")); - } - - /** - * test attribute contains - */ - public function testAttributeContains2() { - $testAttr="class1 not-class2 class3"; - $this->assertTrue(attribute_contains($testAttr, "class3")); - $this->assertFalse(attribute_contains($testAttr, "class2")); - } + /** + * test attribute contains + */ + public function testAttributeContains1() { + $testAttr="class1 notclass2 class3"; + $this->assertTrue(attribute_contains($testAttr, "class3")); + $this->assertFalse(attribute_contains($testAttr, "class2")); + } + + /** + * test attribute contains + */ + public function testAttributeContains2() { + $testAttr="class1 not-class2 class3"; + $this->assertTrue(attribute_contains($testAttr, "class3")); + $this->assertFalse(attribute_contains($testAttr, "class2")); + } /** * test with empty input - */ - public function testAttributeContainsEmpty() { - $testAttr=""; - $this->assertFalse(attribute_contains($testAttr, "class2")); - } + */ + public function testAttributeContainsEmpty() { + $testAttr=""; + $this->assertFalse(attribute_contains($testAttr, "class2")); + } /** * test input with special chars - */ - public function testAttributeContainsSpecialChars() { - $testAttr="--... %\$ä() /(=?}"; - $this->assertFalse(attribute_contains($testAttr, "class2")); + */ + public function testAttributeContainsSpecialChars() { + $testAttr="--... %\$ä() /(=?}"; + $this->assertFalse(attribute_contains($testAttr, "class2")); } } \ No newline at end of file diff --git a/tests/expand_acl_test.php b/tests/expand_acl_test.php index 154bc921db..7059fbc0d7 100644 --- a/tests/expand_acl_test.php +++ b/tests/expand_acl_test.php @@ -8,141 +8,141 @@ /** required, it is the file under test */ require_once('include/text.php'); -/** - * TestCase for the expand_acl function - * - * @author Alexander Kampmann - * @package test.util - */ +/** + * TestCase for the expand_acl function + * + * @author Alexander Kampmann + * @package test.util + */ class ExpandAclTest extends PHPUnit_Framework_TestCase { - /** - * test expand_acl, perfect input - */ - public function testExpandAclNormal() { - $text='<1><2><3>'; - $this->assertEquals(array(1, 2, 3), expand_acl($text)); - } + /** + * test expand_acl, perfect input + */ + public function testExpandAclNormal() { + $text='<1><2><3>'; + $this->assertEquals(array(1, 2, 3), expand_acl($text)); + } /** * test with a big number - */ - public function testExpandAclBigNumber() { - $text='<1><'.PHP_INT_MAX.'><15>'; - $this->assertEquals(array(1, PHP_INT_MAX, 15), expand_acl($text)); - } + */ + public function testExpandAclBigNumber() { + $text='<1><'.PHP_INT_MAX.'><15>'; + $this->assertEquals(array(1, PHP_INT_MAX, 15), expand_acl($text)); + } /** * test with a string in it. * * TODO: is this valid input? Otherwise: should there be an exception? - */ - public function testExpandAclString() { - $text="<1><279012>"; - $this->assertEquals(array(1, 279012), expand_acl($text)); - } + */ + public function testExpandAclString() { + $text="<1><279012>"; + $this->assertEquals(array(1, 279012), expand_acl($text)); + } /** * test with a ' ' in it. * * TODO: is this valid input? Otherwise: should there be an exception? - */ - public function testExpandAclSpace() { - $text="<1><279 012><32>"; - $this->assertEquals(array(1, "279", "32"), expand_acl($text)); - } + */ + public function testExpandAclSpace() { + $text="<1><279 012><32>"; + $this->assertEquals(array(1, "279", "32"), expand_acl($text)); + } /** * test empty input - */ - public function testExpandAclEmpty() { - $text=""; - $this->assertEquals(array(), expand_acl($text)); - } + */ + public function testExpandAclEmpty() { + $text=""; + $this->assertEquals(array(), expand_acl($text)); + } /** * test invalid input, no < at all * * TODO: should there be an exception? - */ - public function testExpandAclNoBrackets() { - $text="According to documentation, that's invalid. "; //should be invalid - $this->assertEquals(array(), expand_acl($text)); - } + */ + public function testExpandAclNoBrackets() { + $text="According to documentation, that's invalid. "; //should be invalid + $this->assertEquals(array(), expand_acl($text)); + } - /** - * test invalid input, just open < - * - * TODO: should there be an exception? - */ - public function testExpandAclJustOneBracket1() { - $text="assertEquals(array(), expand_acl($text)); - } + /** + * test invalid input, just open < + * + * TODO: should there be an exception? + */ + public function testExpandAclJustOneBracket1() { + $text="assertEquals(array(), expand_acl($text)); + } - /** - * test invalid input, just close > - * - * TODO: should there be an exception? - */ - public function testExpandAclJustOneBracket2() { - $text="Another invalid> string"; //should be invalid - $this->assertEquals(array(), expand_acl($text)); - } + /** + * test invalid input, just close > + * + * TODO: should there be an exception? + */ + public function testExpandAclJustOneBracket2() { + $text="Another invalid> string"; //should be invalid + $this->assertEquals(array(), expand_acl($text)); + } - /** - * test invalid input, just close > - * - * TODO: should there be an exception? - */ - public function testExpandAclCloseOnly() { - $text="Another> invalid> string>"; //should be invalid - $this->assertEquals(array(), expand_acl($text)); - } + /** + * test invalid input, just close > + * + * TODO: should there be an exception? + */ + public function testExpandAclCloseOnly() { + $text="Another> invalid> string>"; //should be invalid + $this->assertEquals(array(), expand_acl($text)); + } - /** - * test invalid input, just open < - * - * TODO: should there be an exception? - */ - public function testExpandAclOpenOnly() { - $text="assertEquals(array(), expand_acl($text)); - } + /** + * test invalid input, just open < + * + * TODO: should there be an exception? + */ + public function testExpandAclOpenOnly() { + $text="assertEquals(array(), expand_acl($text)); + } - /** - * test invalid input, open and close do not match - * - * TODO: should there be an exception? - */ - public function testExpandAclNoMatching1() { - $text=" invalid "; //should be invalid - $this->assertEquals(array(), expand_acl($text)); - } + /** + * test invalid input, open and close do not match + * + * TODO: should there be an exception? + */ + public function testExpandAclNoMatching1() { + $text=" invalid "; //should be invalid + $this->assertEquals(array(), expand_acl($text)); + } - /** - * test invalid input, open and close do not match - * - * TODO: should there be an exception? - */ - public function testExpandAclNoMatching2() { - $text="<1>2><3>"; + /** + * test invalid input, open and close do not match + * + * TODO: should there be an exception? + */ + public function testExpandAclNoMatching2() { + $text="<1>2><3>"; // The angles are delimiters which aren't important // the important thing is the numeric content, this returns array(1,2,3) currently // we may wish to eliminate 2 from the results, though it isn't harmful // It would be a better test to figure out if there is any ACL input which can // produce this $text and fix that instead. -// $this->assertEquals(array(), expand_acl($text)); +// $this->assertEquals(array(), expand_acl($text)); } - /** - * test invalid input, empty <> - * - * TODO: should there be an exception? Or array(1, 3) + /** + * test invalid input, empty <> + * + * TODO: should there be an exception? Or array(1, 3) * (This should be array(1,3) - mike) - */ - public function testExpandAclEmptyMatch() { - $text="<1><><3>"; - $this->assertEquals(array(1,3), expand_acl($text)); + */ + public function testExpandAclEmptyMatch() { + $text="<1><><3>"; + $this->assertEquals(array(1,3), expand_acl($text)); } } \ No newline at end of file diff --git a/tests/get_tags_test.php b/tests/get_tags_test.php index 79dcb36a7f..2d49eac24a 100644 --- a/tests/get_tags_test.php +++ b/tests/get_tags_test.php @@ -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); } diff --git a/tests/template_test.php b/tests/template_test.php index 1f9f805313..c6e83572eb 100644 --- a/tests/template_test.php +++ b/tests/template_test.php @@ -1,11 +1,11 @@ assertEquals('Hello Anna!', $text); } - public function testSimpleVariableInt() { - $tpl='There are $num new messages!'; - - $text=replace_macros($tpl, array('$num'=>172)); - - $this->assertEquals('There are 172 new messages!', $text); + public function testSimpleVariableInt() { + $tpl='There are $num new messages!'; + + $text=replace_macros($tpl, array('$num'=>172)); + + $this->assertEquals('There are 172 new messages!', $text); } - public function testConditionalElse() { - $tpl='There{{ if $num!=1 }} are $num new messages{{ else }} is 1 new message{{ endif }}!'; - + public function testConditionalElse() { + $tpl='There{{ if $num!=1 }} are $num new messages{{ else }} is 1 new message{{ endif }}!'; + $text1=replace_macros($tpl, array('$num'=>1)); - $text22=replace_macros($tpl, array('$num'=>22)); - + $text22=replace_macros($tpl, array('$num'=>22)); + $this->assertEquals('There is 1 new message!', $text1); - $this->assertEquals('There are 22 new messages!', $text22); + $this->assertEquals('There are 22 new messages!', $text22); } - public function testConditionalNoElse() { - $tpl='{{ if $num!=0 }}There are $num new messages!{{ endif }}'; - - $text0=replace_macros($tpl, array('$num'=>0)); - $text22=replace_macros($tpl, array('$num'=>22)); - - $this->assertEquals('', $text0); - $this->assertEquals('There are 22 new messages!', $text22); + public function testConditionalNoElse() { + $tpl='{{ if $num!=0 }}There are $num new messages!{{ endif }}'; + + $text0=replace_macros($tpl, array('$num'=>0)); + $text22=replace_macros($tpl, array('$num'=>22)); + + $this->assertEquals('', $text0); + $this->assertEquals('There are 22 new messages!', $text22); } - public function testConditionalFail() { - $tpl='There {{ if $num!=1 }} are $num new messages{{ else }} is 1 new message{{ endif }}!'; - - $text1=replace_macros($tpl, array()); - - //$this->assertEquals('There is 1 new message!', $text1); + public function testConditionalFail() { + $tpl='There {{ if $num!=1 }} are $num new messages{{ else }} is 1 new message{{ endif }}!'; + + $text1=replace_macros($tpl, array()); + + //$this->assertEquals('There is 1 new message!', $text1); } - public function testSimpleFor() { - $tpl='{{ for $messages as $message }} $message {{ endfor }}'; - - $text=replace_macros($tpl, array('$messages'=>array('message 1', 'message 2'))); - - $this->assertEquals(' message 1 message 2 ', $text); + public function testSimpleFor() { + $tpl='{{ for $messages as $message }} $message {{ endfor }}'; + + $text=replace_macros($tpl, array('$messages'=>array('message 1', 'message 2'))); + + $this->assertEquals(' message 1 message 2 ', $text); } - public function testFor() { - $tpl='{{ for $messages as $message }} from: $message.from to $message.to {{ endfor }}'; - - $text=replace_macros($tpl, array('$messages'=>array(array('from'=>'Mike', 'to'=>'Alex'), array('from'=>'Alex', 'to'=>'Mike')))); - - $this->assertEquals(' from: Mike to Alex from: Alex to Mike ', $text); + public function testFor() { + $tpl='{{ for $messages as $message }} from: $message.from to $message.to {{ endfor }}'; + + $text=replace_macros($tpl, array('$messages'=>array(array('from'=>'Mike', 'to'=>'Alex'), array('from'=>'Alex', 'to'=>'Mike')))); + + $this->assertEquals(' from: Mike to Alex from: Alex to Mike ', $text); } - public function testKeyedFor() { - $tpl='{{ for $messages as $from=>$to }} from: $from to $to {{ endfor }}'; - - $text=replace_macros($tpl, array('$messages'=>array('Mike'=>'Alex', 'Sven'=>'Mike'))); - - $this->assertEquals(' from: Mike to Alex from: Sven to Mike ', $text); + public function testKeyedFor() { + $tpl='{{ for $messages as $from=>$to }} from: $from to $to {{ endfor }}'; + + $text=replace_macros($tpl, array('$messages'=>array('Mike'=>'Alex', 'Sven'=>'Mike'))); + + $this->assertEquals(' from: Mike to Alex from: Sven to Mike ', $text); } - public function testForEmpty() { - $tpl='messages: {{for $messages as $message}} from: $message.from to $message.to {{ endfor }}'; - - $text=replace_macros($tpl, array('$messages'=>array())); - - $this->assertEquals('messages: ', $text); + public function testForEmpty() { + $tpl='messages: {{for $messages as $message}} from: $message.from to $message.to {{ endfor }}'; + + $text=replace_macros($tpl, array('$messages'=>array())); + + $this->assertEquals('messages: ', $text); } - public function testForWrongType() { - $tpl='messages: {{for $messages as $message}} from: $message.from to $message.to {{ endfor }}'; - - $text=replace_macros($tpl, array('$messages'=>11)); - - $this->assertEquals('messages: ', $text); + public function testForWrongType() { + $tpl='messages: {{for $messages as $message}} from: $message.from to $message.to {{ endfor }}'; + + $text=replace_macros($tpl, array('$messages'=>11)); + + $this->assertEquals('messages: ', $text); } - public function testForConditional() { - $tpl='new messages: {{for $messages as $message}}{{ if $message.new }} $message.text{{endif}}{{ endfor }}'; - + public function testForConditional() { + $tpl='new messages: {{for $messages as $message}}{{ if $message.new }} $message.text{{endif}}{{ endfor }}'; + $text=replace_macros($tpl, array('$messages'=>array( array('new'=>true, 'text'=>'new message'), - array('new'=>false, 'text'=>'old message')))); - - $this->assertEquals('new messages: new message', $text); + array('new'=>false, 'text'=>'old message')))); + + $this->assertEquals('new messages: new message', $text); } - public function testConditionalFor() { - $tpl='{{ if $enabled }}new messages:{{for $messages as $message}} $message.text{{ endfor }}{{endif}}'; - + public function testConditionalFor() { + $tpl='{{ if $enabled }}new messages:{{for $messages as $message}} $message.text{{ endfor }}{{endif}}'; + $text=replace_macros($tpl, array('$enabled'=>true, - '$messages'=>array( - array('new'=>true, 'text'=>'new message'), - array('new'=>false, 'text'=>'old message')))); - - $this->assertEquals('new messages: new message old message', $text); + '$messages'=>array( + array('new'=>true, 'text'=>'new message'), + array('new'=>false, 'text'=>'old message')))); + + $this->assertEquals('new messages: new message old message', $text); } - public function testFantasy() { - $tpl='Fantasy: {{fantasy $messages}}'; - - $text=replace_macros($tpl, array('$messages'=>'no no')); - - $this->assertEquals('Fantasy: {{fantasy no no}}', $text); + public function testFantasy() { + $tpl='Fantasy: {{fantasy $messages}}'; + + $text=replace_macros($tpl, array('$messages'=>'no no')); + + $this->assertEquals('Fantasy: {{fantasy no no}}', $text); } - public function testInc() { - $tpl='{{inc field_input.tpl with $field=$myvar}}{{ endinc }}'; - - $text=replace_macros($tpl, array('$myvar'=>array('myfield', 'label', 'value', 'help'))); - + public function testInc() { + $tpl='{{inc field_input.tpl with $field=$myvar}}{{ endinc }}'; + + $text=replace_macros($tpl, array('$myvar'=>array('myfield', 'label', 'value', 'help'))); + $this->assertEquals(" \n" ."
\n" ." \n" ." \n" ." help\n" - ."
\n", $text); + ." \n", $text); } - public function testIncNoVar() { - $tpl='{{inc field_input.tpl }}{{ endinc }}'; - - $text=replace_macros($tpl, array('$field'=>array('myfield', 'label', 'value', 'help'))); - - $this->assertEquals(" \n
\n \n" - ." \n" - ." help\n" - ."
\n", $text); + public function testIncNoVar() { + $tpl='{{inc field_input.tpl }}{{ endinc }}'; + + $text=replace_macros($tpl, array('$field'=>array('myfield', 'label', 'value', 'help'))); + + $this->assertEquals(" \n
\n \n" + ." \n" + ." help\n" + ."
\n", $text); } - public function testDoubleUse() { - $tpl='Hello $name! {{ if $enabled }} I love you! {{ endif }}'; - - $text=replace_macros($tpl, array('$name'=>'Anna', '$enabled'=>false)); - + public function testDoubleUse() { + $tpl='Hello $name! {{ if $enabled }} I love you! {{ endif }}'; + + $text=replace_macros($tpl, array('$name'=>'Anna', '$enabled'=>false)); + $this->assertEquals('Hello Anna! ', $text); - $tpl='Hey $name! {{ if $enabled }} I hate you! {{ endif }}'; - - $text=replace_macros($tpl, array('$name'=>'Max', '$enabled'=>true)); - - $this->assertEquals('Hey Max! I hate you! ', $text); + $tpl='Hey $name! {{ if $enabled }} I hate you! {{ endif }}'; + + $text=replace_macros($tpl, array('$name'=>'Max', '$enabled'=>true)); + + $this->assertEquals('Hey Max! I hate you! ', $text); } - public function testIncDouble() { + public function testIncDouble() { $tpl='{{inc field_input.tpl with $field=$var1}}{{ endinc }}' - .'{{inc field_input.tpl with $field=$var2}}{{ endinc }}'; - + .'{{inc field_input.tpl with $field=$var2}}{{ endinc }}'; + $text=replace_macros($tpl, array('$var1'=>array('myfield', 'label', 'value', 'help'), - '$var2'=>array('myfield2', 'label2', 'value2', 'help2'))); - - $this->assertEquals(" \n" - ."
\n" - ." \n" - ." \n" - ." help\n" + '$var2'=>array('myfield2', 'label2', 'value2', 'help2'))); + + $this->assertEquals(" \n" + ."
\n" + ." \n" + ." \n" + ." help\n" ."
\n" ." \n" ."
\n" ." \n" ." \n" ." help2\n" - ."
\n", $text); + ."
\n", $text); } } \ No newline at end of file diff --git a/tests/xss_filter_test.php b/tests/xss_filter_test.php index 3fb6ac3109..9e779f7673 100644 --- a/tests/xss_filter_test.php +++ b/tests/xss_filter_test.php @@ -33,13 +33,13 @@ class AntiXSSTest extends PHPUnit_Framework_TestCase { $this->assertEquals($text, $retext); } - /** - * xmlify and put in a document - */ - public function testXmlifyDocument() { - $tag="I want to break"; + /** + * xmlify and put in a document + */ + public function testXmlifyDocument() { + $tag="I want to break"; $xml=xmlify($tag); - $text=''.$xml.''; + $text=''.$xml.''; $xml_parser=xml_parser_create(); //should be possible to parse it @@ -48,10 +48,10 @@ class AntiXSSTest extends PHPUnit_Framework_TestCase { $this->assertEquals(array('TEXT'=>array(0)), $index); - $this->assertEquals(array(array('tag'=>'TEXT', 'type'=>'complete', 'level'=>1, 'value'=>$tag)), + $this->assertEquals(array(array('tag'=>'TEXT', 'type'=>'complete', 'level'=>1, 'value'=>$tag)), $values); - xml_parser_free($xml_parser); + xml_parser_free($xml_parser); } /** diff --git a/view/theme/frio/php/PHPColors/Color.php b/view/theme/frio/php/PHPColors/Color.php index d1543036c4..91b0180f28 100644 --- a/view/theme/frio/php/PHPColors/Color.php +++ b/view/theme/frio/php/PHPColors/Color.php @@ -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"); } diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php index 7584e0b379..00c475e301 100644 --- a/view/theme/frio/theme.php +++ b/view/theme/frio/theme.php @@ -78,12 +78,12 @@ function frio_item_photo_links(App $a, &$body_info) { $occurence = 1; $p = bb_find_open_close($body_info['html'], ""); - 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); diff --git a/view/theme/frost/theme.php b/view/theme/frost/theme.php index 4c22f0a118..1f2c70c8bc 100644 --- a/view/theme/frost/theme.php +++ b/view/theme/frost/theme.php @@ -49,12 +49,12 @@ function frost_item_photo_links(App $a, &$body_info) { $occurence = 1; $p = bb_find_open_close($body_info['html'], ""); - 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);