]> git.mxchange.org Git - friendica.git/commitdiff
added spaces (coding convention)
authorRoland Häder <roland@mxchange.org>
Fri, 27 Jan 2017 10:53:56 +0000 (11:53 +0100)
committerRoland Haeder <roland@mxchange.org>
Sat, 18 Mar 2017 23:51:54 +0000 (00:51 +0100)
Signed-off-by: Roland Häder <roland@mxchange.org>
object/BaseObject.php
object/Conversation.php
object/Item.php
tests/contains_attribute_test.php
tests/expand_acl_test.php
tests/get_tags_test.php
tests/template_test.php
tests/xss_filter_test.php
view/theme/frio/php/PHPColors/Color.php
view/theme/frio/theme.php
view/theme/frost/theme.php

index 2666dc1de572816a01ec53d4522288392e8c5424..5e0c61f49bbd07e8bac21b65dc716066895ee8d5 100644 (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();
 
index eb5b3b9b486985fe67bc0c8958cb3f33912293c8..9bff7da59220c0a9d5e29e230f5805f4b6b0949b 100644 (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,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;
index b693520b93d8cb2e932af589a6b5da94cb51a46a..ab36069c078ebea1f8fbfbadb8f4ec31cc1d9d44 100644 (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')));
index b0bb06acfa800d2052296faf631dfa02b248d7aa..b1e87c17a80b349ccce9307c9d22d0d2009f8214 100644 (file)
@@ -1,51 +1,51 @@
 <?php
-/**\r
- * this test tests the contains_attribute function\r
- *\r
- * @package test.util\r
- */\r
-\r
-/** required, it is the file under test */\r
-require_once('include/text.php');\r
-\r
-/**\r
- * TestCase for the contains_attribute function\r
- *\r
- * @author Alexander Kampmann\r
- * @package test.util\r
- */\r
+/**
+ * this test tests the contains_attribute function
+ *
+ * @package test.util
+ */
+
+/** required, it is the file under test */
+require_once('include/text.php');
+
+/**
+ * TestCase for the contains_attribute function
+ *
+ * @author Alexander Kampmann
+ * @package test.util
+ */
 class ContainsAttributeTest extends PHPUnit_Framework_TestCase {
-       /**\r
-        * test attribute contains\r
-        */\r
-       public function testAttributeContains1() {\r
-               $testAttr="class1 notclass2 class3";\r
-               $this->assertTrue(attribute_contains($testAttr, "class3"));\r
-               $this->assertFalse(attribute_contains($testAttr, "class2"));\r
-       }\r
-       \r
-       /**\r
-        * test attribute contains\r
-        */\r
-       public function testAttributeContains2() {\r
-               $testAttr="class1 not-class2 class3";\r
-               $this->assertTrue(attribute_contains($testAttr, "class3"));\r
-               $this->assertFalse(attribute_contains($testAttr, "class2"));\r
-       }\r
+       /**
+        * 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
-        */\r
-       public function testAttributeContainsEmpty() {\r
-               $testAttr="";\r
-               $this->assertFalse(attribute_contains($testAttr, "class2"));\r
-       }\r
+        */
+       public function testAttributeContainsEmpty() {
+               $testAttr="";
+               $this->assertFalse(attribute_contains($testAttr, "class2"));
+       }
        
        /**
         * test input with special chars
-        */\r
-       public function testAttributeContainsSpecialChars() {\r
-               $testAttr="--... %\$ä() /(=?}";\r
-               $this->assertFalse(attribute_contains($testAttr, "class2"));\r
+        */
+       public function testAttributeContainsSpecialChars() {
+               $testAttr="--... %\$ä() /(=?}";
+               $this->assertFalse(attribute_contains($testAttr, "class2"));
        }
 }
\ No newline at end of file
index 154bc921db0b8e4c45bc18aa755fe09c083935b2..7059fbc0d7615494066b480a626949d8746532bd 100644 (file)
 /** required, it is the file under test */
 require_once('include/text.php');
 
-/**\r
- * TestCase for the expand_acl function\r
- *\r
- * @author Alexander Kampmann\r
- * @package test.util\r
- */\r
+/**
+ * TestCase for the expand_acl function
+ *
+ * @author Alexander Kampmann
+ * @package test.util
+ */
 class ExpandAclTest extends PHPUnit_Framework_TestCase {
        
-       /**\r
-        * test expand_acl, perfect input\r
-        */\r
-       public function testExpandAclNormal() {\r
-               $text='<1><2><3>';\r
-               $this->assertEquals(array(1, 2, 3), expand_acl($text));\r
-       }\r
+       /**
+        * 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
-        */\r
-       public function testExpandAclBigNumber() {\r
-               $text='<1><'.PHP_INT_MAX.'><15>';\r
-               $this->assertEquals(array(1, PHP_INT_MAX, 15), expand_acl($text));\r
-       }\r
+        */
+       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?
-        */\r
-       public function testExpandAclString() {\r
-               $text="<1><279012><tt>"; \r
-               $this->assertEquals(array(1, 279012), expand_acl($text));\r
-       }\r
+        */
+       public function testExpandAclString() {
+               $text="<1><279012><tt>"; 
+               $this->assertEquals(array(1, 279012), expand_acl($text));
+       }
        
        /**
         * test with a ' ' in it. 
         * 
         * TODO: is this valid input? Otherwise: should there be an exception?
-        */\r
-       public function testExpandAclSpace() {\r
-               $text="<1><279 012><32>"; \r
-               $this->assertEquals(array(1, "279", "32"), expand_acl($text));\r
-       }\r
+        */
+       public function testExpandAclSpace() {
+               $text="<1><279 012><32>"; 
+               $this->assertEquals(array(1, "279", "32"), expand_acl($text));
+       }
        
        /**
         * test empty input
-        */\r
-       public function testExpandAclEmpty() {\r
-               $text=""; \r
-               $this->assertEquals(array(), expand_acl($text));\r
-       }\r
+        */
+       public function testExpandAclEmpty() {
+               $text=""; 
+               $this->assertEquals(array(), expand_acl($text));
+       }
        
        /**
         * test invalid input, no < at all
         * 
         * TODO: should there be an exception?
-        */\r
-       public function testExpandAclNoBrackets() {\r
-               $text="According to documentation, that's invalid. "; //should be invalid\r
-               $this->assertEquals(array(), expand_acl($text));\r
-       }\r
+        */
+       public function testExpandAclNoBrackets() {
+               $text="According to documentation, that's invalid. "; //should be invalid
+               $this->assertEquals(array(), expand_acl($text));
+       }
        
-       /**\r
-        * test invalid input, just open <\r
-        *\r
-        * TODO: should there be an exception?\r
-        */\r
-       public function testExpandAclJustOneBracket1() {\r
-               $text="<Another invalid string"; //should be invalid\r
-               $this->assertEquals(array(), expand_acl($text));\r
-       }\r
+       /**
+        * test invalid input, just open <
+        *
+        * TODO: should there be an exception?
+        */
+       public function testExpandAclJustOneBracket1() {
+               $text="<Another invalid string"; //should be invalid
+               $this->assertEquals(array(), expand_acl($text));
+       }
        
-       /**\r
-        * test invalid input, just close >\r
-        *\r
-        * TODO: should there be an exception?\r
-        */\r
-       public function testExpandAclJustOneBracket2() {\r
-               $text="Another invalid> string"; //should be invalid\r
-               $this->assertEquals(array(), expand_acl($text));\r
-       }\r
+       /**
+        * 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));
+       }
        
-       /**\r
-        * test invalid input, just close >\r
-        *\r
-        * TODO: should there be an exception?\r
-        */\r
-       public function testExpandAclCloseOnly() {\r
-               $text="Another> invalid> string>"; //should be invalid\r
-               $this->assertEquals(array(), expand_acl($text));\r
-       }\r
+       /**
+        * 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));
+       }
        
-       /**\r
-        * test invalid input, just open <\r
-        *\r
-        * TODO: should there be an exception?\r
-        */\r
-       public function testExpandAclOpenOnly() {\r
-               $text="<Another< invalid string<"; //should be invalid\r
-               $this->assertEquals(array(), expand_acl($text));\r
-       }\r
+       /**
+        * test invalid input, just open <
+        *
+        * TODO: should there be an exception?
+        */
+       public function testExpandAclOpenOnly() {
+               $text="<Another< invalid string<"; //should be invalid
+               $this->assertEquals(array(), expand_acl($text));
+       }
        
-       /**\r
-        * test invalid input, open and close do not match\r
-        *\r
-        * TODO: should there be an exception?\r
-        */\r
-       public function testExpandAclNoMatching1() {\r
-               $text="<Another<> invalid <string>"; //should be invalid\r
-               $this->assertEquals(array(), expand_acl($text));\r
-       }\r
+       /**
+        * test invalid input, open and close do not match
+        *
+        * TODO: should there be an exception?
+        */
+       public function testExpandAclNoMatching1() {
+               $text="<Another<> invalid <string>"; //should be invalid
+               $this->assertEquals(array(), expand_acl($text));
+       }
        
-       /**\r
-        * test invalid input, open and close do not match\r
-        *\r
-        * TODO: should there be an exception?\r
-        */\r
-       public function testExpandAclNoMatching2() {\r
-               $text="<1>2><3>";\r
+       /**
+        * 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));\r
+//             $this->assertEquals(array(), expand_acl($text));
        }
        
-       /**\r
-        * test invalid input, empty <>\r
-        *\r
-        * TODO: should there be an exception? Or array(1, 3)\r
+       /**
+        * test invalid input, empty <>
+        *
+        * TODO: should there be an exception? Or array(1, 3)
         * (This should be array(1,3) - mike)
-        */\r
-       public function testExpandAclEmptyMatch() {\r
-               $text="<1><><3>";\r
-               $this->assertEquals(array(1,3), expand_acl($text));\r
+        */
+       public function testExpandAclEmptyMatch() {
+               $text="<1><><3>";
+               $this->assertEquals(array(1,3), expand_acl($text));
        }
 }
\ No newline at end of file
index 79dcb36a7f4c1800b6e84b89fbe73eb63712795a..2d49eac24a434bb3ca3a4a61948b2fe78be514bd 100644 (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);
                }
                
index 1f9f805313ca469a5a0208b51e70cbaf20b7de4c..c6e83572ebaf52c022d4f8beb6459a10856b3c4b 100644 (file)
@@ -1,11 +1,11 @@
 <?php
-/**\r
- * this file contains tests for the template engine\r
- *\r
- * @package test.util\r
- */\r
-\r
-/** required, it is the file under test */\r
+/**
+ * this file contains tests for the template engine
+ *
+ * @package test.util
+ */
+
+/** required, it is the file under test */
 require_once('include/template_processor.php');
 require_once('include/text.php');
 
@@ -13,30 +13,30 @@ class TemplateMockApp {
        public $theme_info=array();
 }
 
-if(!function_exists('current_theme')) {
-function current_theme() {\r
-       return 'clean';\r
+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();
 }
 }
 
-/**\r
- * TestCase for the template engine\r
- *\r
- * @author Alexander Kampmann\r
- * @package test.util\r
- */\r
+/**
+ * TestCase for the template engine
+ *
+ * @author Alexander Kampmann
+ * @package test.util
+ */
 class TemplateTest extends PHPUnit_Framework_TestCase {
 
        public function setUp() {
@@ -58,167 +58,167 @@ class TemplateTest extends PHPUnit_Framework_TestCase {
                $this->assertEquals('Hello Anna!', $text);
        }
 
-       public function testSimpleVariableInt() {\r
-               $tpl='There are $num new messages!';\r
-\r
-               $text=replace_macros($tpl, array('$num'=>172));\r
-\r
-               $this->assertEquals('There are 172 new messages!', $text);\r
+       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() {\r
-               $tpl='There{{ if $num!=1 }} are $num new messages{{ else }} is 1 new message{{ endif }}!';\r
-\r
+       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));\r
-\r
+               $text22=replace_macros($tpl, array('$num'=>22));
+
                $this->assertEquals('There is 1 new message!', $text1);
-               $this->assertEquals('There are 22 new messages!', $text22);\r
+               $this->assertEquals('There are 22 new messages!', $text22);
        }
 
-       public function testConditionalNoElse() {\r
-               $tpl='{{ if $num!=0 }}There are $num new messages!{{ endif }}';\r
-\r
-               $text0=replace_macros($tpl, array('$num'=>0));\r
-               $text22=replace_macros($tpl, array('$num'=>22));\r
-\r
-               $this->assertEquals('', $text0);\r
-               $this->assertEquals('There are 22 new messages!', $text22);\r
+       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() {\r
-               $tpl='There {{ if $num!=1 }} are $num new messages{{ else }} is 1 new message{{ endif }}!';\r
-\r
-               $text1=replace_macros($tpl, array());\r
-\r
-               //$this->assertEquals('There is 1 new message!', $text1);\r
+       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() {\r
-               $tpl='{{ for $messages as $message }} $message {{ endfor }}';\r
-\r
-               $text=replace_macros($tpl, array('$messages'=>array('message 1', 'message 2')));\r
-\r
-               $this->assertEquals(' message 1  message 2 ', $text);\r
+       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() {\r
-               $tpl='{{ for $messages as $message }} from: $message.from to $message.to {{ endfor }}';\r
-\r
-               $text=replace_macros($tpl, array('$messages'=>array(array('from'=>'Mike', 'to'=>'Alex'), array('from'=>'Alex', 'to'=>'Mike'))));\r
-\r
-               $this->assertEquals(' from: Mike to Alex  from: Alex to Mike ', $text);\r
+       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() {\r
-               $tpl='{{ for $messages as $from=>$to }} from: $from to $to {{ endfor }}';\r
-       \r
-               $text=replace_macros($tpl, array('$messages'=>array('Mike'=>'Alex', 'Sven'=>'Mike')));\r
-       \r
-               $this->assertEquals(' from: Mike to Alex  from: Sven to Mike ', $text);\r
+       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() {\r
-               $tpl='messages: {{for $messages as $message}} from: $message.from to $message.to  {{ endfor }}';\r
-\r
-               $text=replace_macros($tpl, array('$messages'=>array()));\r
-\r
-               $this->assertEquals('messages: ', $text);\r
+       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() {\r
-               $tpl='messages: {{for $messages as $message}} from: $message.from to $message.to  {{ endfor }}';\r
-\r
-               $text=replace_macros($tpl, array('$messages'=>11));\r
-\r
-               $this->assertEquals('messages: ', $text);\r
+       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() {\r
-               $tpl='new messages: {{for $messages as $message}}{{ if $message.new }} $message.text{{endif}}{{ endfor }}';\r
-\r
+       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'))));\r
-\r
-               $this->assertEquals('new messages:  new message', $text);\r
+                               array('new'=>false, 'text'=>'old message'))));
+
+               $this->assertEquals('new messages:  new message', $text);
        }
        
-       public function testConditionalFor() {\r
-               $tpl='{{ if $enabled }}new messages:{{for $messages as $message}} $message.text{{ endfor }}{{endif}}';\r
-       \r
+       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(\r
-                               array('new'=>true, 'text'=>'new message'),\r
-                               array('new'=>false, 'text'=>'old message'))));\r
-       \r
-               $this->assertEquals('new messages: new message old message', $text);\r
-       }
-
-       public function testFantasy() {\r
-               $tpl='Fantasy: {{fantasy $messages}}';\r
-\r
-               $text=replace_macros($tpl, array('$messages'=>'no no'));\r
-\r
-               $this->assertEquals('Fantasy: {{fantasy no no}}', $text);\r
-       }
-
-       public function testInc() {\r
-               $tpl='{{inc field_input.tpl with $field=$myvar}}{{ endinc }}';\r
-\r
-               $text=replace_macros($tpl, array('$myvar'=>array('myfield', 'label', 'value', 'help')));\r
-\r
+                               '$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 testInc() {
+               $tpl='{{inc field_input.tpl with $field=$myvar}}{{ endinc }}';
+
+               $text=replace_macros($tpl, array('$myvar'=>array('myfield', 'label', 'value', 'help')));
+
                $this->assertEquals("   \n"
                                ."      <div class='field input'>\n"
                                ."              <label for='id_myfield'>label</label>\n"
                                ."              <input name='myfield' id='id_myfield' value=\"value\">\n"
                                ."              <span class='field_help'>help</span>\n"
-                               ."      </div>\n", $text);\r
+                               ."      </div>\n", $text);
        }
 
-       public function testIncNoVar() {\r
-               $tpl='{{inc field_input.tpl }}{{ endinc }}';\r
-\r
-               $text=replace_macros($tpl, array('$field'=>array('myfield', 'label', 'value', 'help')));\r
-\r
-               $this->assertEquals("   \n      <div class='field input'>\n             <label for='id_myfield'>label</label>\n"\r
-                               ."              <input name='myfield' id='id_myfield' value=\"value\">\n"\r
-                               ."              <span class='field_help'>help</span>\n"\r
-                               ."      </div>\n", $text);\r
+       public function testIncNoVar() {
+               $tpl='{{inc field_input.tpl }}{{ endinc }}';
+
+               $text=replace_macros($tpl, array('$field'=>array('myfield', 'label', 'value', 'help')));
+
+               $this->assertEquals("   \n      <div class='field input'>\n             <label for='id_myfield'>label</label>\n"
+                               ."              <input name='myfield' id='id_myfield' value=\"value\">\n"
+                               ."              <span class='field_help'>help</span>\n"
+                               ."      </div>\n", $text);
        }
        
-       public function testDoubleUse() {\r
-               $tpl='Hello $name! {{ if $enabled }} I love you! {{ endif }}';\r
-       \r
-               $text=replace_macros($tpl, array('$name'=>'Anna', '$enabled'=>false));\r
-       \r
+       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 }}';\r
-               \r
-               $text=replace_macros($tpl, array('$name'=>'Max', '$enabled'=>true));\r
-               \r
-               $this->assertEquals('Hey Max!  I hate you! ', $text);\r
+               $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() {\r
+       public function testIncDouble() {
                $tpl='{{inc field_input.tpl with $field=$var1}}{{ endinc }}'
-               .'{{inc field_input.tpl with $field=$var2}}{{ endinc }}';\r
-       \r
+               .'{{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')));\r
-               \r
-               $this->assertEquals("   \n"\r
-                               ."      <div class='field input'>\n"\r
-                               ."              <label for='id_myfield'>label</label>\n"\r
-                               ."              <input name='myfield' id='id_myfield' value=\"value\">\n"\r
-                               ."              <span class='field_help'>help</span>\n"\r
+                               '$var2'=>array('myfield2', 'label2', 'value2', 'help2')));
+               
+               $this->assertEquals("   \n"
+                               ."      <div class='field input'>\n"
+                               ."              <label for='id_myfield'>label</label>\n"
+                               ."              <input name='myfield' id='id_myfield' value=\"value\">\n"
+                               ."              <span class='field_help'>help</span>\n"
                                ."      </div>\n"
                                ."      \n"
                                ."      <div class='field input'>\n"
                                ."              <label for='id_myfield2'>label2</label>\n"
                                ."              <input name='myfield2' id='id_myfield2' value=\"value2\">\n"
                                ."              <span class='field_help'>help2</span>\n"
-                               ."      </div>\n", $text);\r
+                               ."      </div>\n", $text);
        }
 }
\ No newline at end of file
index 3fb6ac3109daf150c071d7d767b4ecd72a8be5a8..9e779f7673c86adf8eafe1a629bcc63804c65070 100644 (file)
@@ -33,13 +33,13 @@ class AntiXSSTest extends PHPUnit_Framework_TestCase {
                $this->assertEquals($text, $retext);
        }
        
-       /**\r
-        * xmlify and put in a document\r
-        */\r
-       public function testXmlifyDocument() {\r
-               $tag="<tag>I want to break</tag>";\r
+       /**
+        * xmlify and put in a document
+        */
+       public function testXmlifyDocument() {
+               $tag="<tag>I want to break</tag>";
                $xml=xmlify($tag);
-               $text='<text>'.$xml.'</text>'; \r
+               $text='<text>'.$xml.'</text>'; 
                
                $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)),\r
+               $this->assertEquals(array(array('tag'=>'TEXT', 'type'=>'complete', 'level'=>1, 'value'=>$tag)),
                                $values);
                
-               xml_parser_free($xml_parser); \r
+               xml_parser_free($xml_parser); 
        }
 
        /**
index d1543036c485b063f442f6d761296cf79c597329..91b0180f280e8d949dc1e8ebcfcd7b46b6228000 100644 (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");
         }
 
index 7584e0b379962b3ca106db23d4467a0c622f8f33..00c475e30179452ad324fd78a151ae547c5d137a 100644 (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);
 
index 4c22f0a11869664db5a6b58b4b1bfdc172fa0ad3..1f2c70c8bc7171ce7d7f396a571d5031aee49c0d 100644 (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);