Completed
Push — develop ( 475872...d49321 )
by Patrick
34s
created
Settings.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -72,7 +72,7 @@
 block discarded – undo
72 72
     public function getDataSetData($dataSetName)
73 73
     {
74 74
         if(!isset(\FlipsideSettings::$dataset) || !isset(\FlipsideSettings::$dataset[$dataSetName]))
75
-	{
75
+        {
76 76
             return false;
77 77
         }
78 78
         return \FlipsideSettings::$dataset[$dataSetName];
Please login to merge, or discard this patch.
Log/LogService.php 1 patch
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -27,9 +27,11 @@
 block discarded – undo
27 27
     {
28 28
         // build a replacement array with braces around the context keys
29 29
         $replace = array();
30
-        foreach ($context as $key => $val) {
30
+        foreach ($context as $key => $val)
31
+        {
31 32
             // check that the value can be casted to string
32
-            if (!is_array($val) && (!is_object($val) || method_exists($val, '__toString'))) {
33
+            if (!is_array($val) && (!is_object($val) || method_exists($val, '__toString')))
34
+            {
33 35
                 $replace['{' . $key . '}'] = $val;
34 36
             }
35 37
         }
Please login to merge, or discard this patch.
Data/CSVDataTable.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
20 20
     public function count($filter = false)
21 21
     {
22 22
         if($filter)
23
-	{
23
+        {
24 24
             $res = $this->data;
25 25
 	    $res = $filter->filter_array($res);
26 26
 	    return count($res);
Please login to merge, or discard this patch.
Data/FilterClause.php 1 patch
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -140,9 +140,9 @@
 block discarded – undo
140 140
             $case = true;
141 141
         }
142 142
         if($case)
143
-	{
143
+        {
144 144
             if(class_exists('MongoRegex'))
145
-	    {
145
+            {
146 146
                 return array($field=>array('$regex'=>new \MongoRegex('/'.$this->var2.'/i')));
147 147
             }
148 148
             else
Please login to merge, or discard this patch.
Data/MongoDataSet.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -141,9 +141,12 @@
 block discarded – undo
141 141
     {
142 142
         $namespace = $this->db_name.'.'.$collectionName;
143 143
         $dbWrite = new \MongoDB\Driver\BulkWrite();
144
-        try {
144
+        try
145
+        {
145 146
             $dbWrite->update($criteria, $new_object, $options);
146
-        } catch(\MongoDB\Driver\Exception\InvalidArgumentException $e) {
147
+        }
148
+        catch(\MongoDB\Driver\Exception\InvalidArgumentException $e)
149
+        {
147 150
             if(isset($new_object['$set']['']))
148 151
             {
149 152
                 unset($new_object['$set']['']);
Please login to merge, or discard this patch.
Data/Filter.php 1 patch
Braces   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
 	for($i = 0; $i < $count; $i++)
146 146
 	{
147 147
             if($this->children[$i] === 'and' || $this->children[$i] === 'or')
148
-	    {
148
+            {
149 149
                 array_push($res, $this->children[$i]);
150 150
 	    }
151 151
 	    else
@@ -161,14 +161,14 @@  discard block
 block discarded – undo
161 161
 	while($count >= 3)
162 162
 	{
163 163
 	    if($res[1] === 'and')
164
-            {
164
+	    {
165 165
                 $var1 = array_shift($res);
166 166
                 array_shift($res);
167 167
                 $var2 = array_shift($res);
168 168
 	        $res = array_merge(array($var1 && $var2), $res);
169 169
             }
170
-	    else if($res[1] === 'or')
171
-            {
170
+            else if($res[1] === 'or')
171
+	    {
172 172
                 $var1 = array_shift($res);
173 173
                 array_shift($res);
174 174
                 $var2 = array_shift($res);
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
     public function filter_array(&$array)
183 183
     {
184 184
         if(is_array($array))
185
-	{
185
+        {
186 186
             $res = array_filter($array, array($this, 'filterElement'));
187 187
             return array_values($res);
188 188
         }
Please login to merge, or discard this patch.
Http/WebErrorHandler.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,7 +16,8 @@
 block discarded – undo
16 16
         {
17 17
             return $response->withJson($exception, 400);
18 18
         }
19
-        if (php_sapi_name() !== "cli") {
19
+        if (php_sapi_name() !== "cli")
20
+        {
20 21
           error_log($exception->__toString());
21 22
         }
22 23
         return $response
Please login to merge, or discard this patch.
Http/WebPage.php 1 patch
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
 
23 23
         $twigSettings = array();
24 24
         if(\file_exists('/var/php_cache/twig'))
25
-    	{	
25
+        {
26 26
         	$twigCache = $this->settings->getGlobalSetting('twig_cache', '/var/php_cache/twig');
27 27
         	$twigSettings['cache'] = $twigCache;
28 28
 		    //$twigSettings = array('cache' => $twigCache, 'debug' => true);
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
         $this->content['urls']['logoutUrl'] = $this->logoutUrl;
71 71
 
72 72
 	if($this->user === false || $this->user === null)
73
-        {
73
+	{
74 74
             if(isset($_SERVER['REQUEST_URI']) && strstr($_SERVER['REQUEST_URI'], 'logout.php') === false)
75 75
             {
76 76
                 $this->addLink('Login', $this->loginUrl);
Please login to merge, or discard this patch.
Email/AmazonSES.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -42,10 +42,13 @@  discard block
 block discarded – undo
42 42
             $args = array();
43 43
             $args['RawMessage'] = array();
44 44
             $args['RawMessage']['Data'] = $email->getRawMessage();
45
-            try {
45
+            try
46
+            {
46 47
                 $res = $this->ses->sendRawEmail($args);
47 48
                 return $res;
48
-            } catch(\Exception $e) {
49
+            }
50
+            catch(\Exception $e)
51
+            {
49 52
                 return false;
50 53
             }
51 54
         }
@@ -66,9 +69,12 @@  discard block
 block discarded – undo
66 69
             $args['Message']['Body']['Text']['Data'] = $email->getTextBody();
67 70
             $args['Message']['Body']['Html']['Data'] = $email->getHtmlBody();
68 71
             $args['ReplyToAddresses'] = array($email->getReplyTo());
69
-            try {
72
+            try
73
+            {
70 74
                 return $this->ses->sendEmail($args);
71
-            } catch(\Exception $e) {
75
+            }
76
+            catch(\Exception $e)
77
+            {
72 78
                 return false;
73 79
             }
74 80
         }
Please login to merge, or discard this patch.