Completed
Pull Request — develop (#1810)
by
unknown
18:58
created
vendor/paragonie/sodium_compat/src/Core/ChaCha20.php 1 patch
Spacing   +126 added lines, -126 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (class_exists('ParagonIE_Sodium_Core_ChaCha20', false)) {
3
+if ( class_exists( 'ParagonIE_Sodium_Core_ChaCha20', false ) ) {
4 4
     return;
5 5
 }
6 6
 
@@ -18,15 +18,15 @@  discard block
 block discarded – undo
18 18
      * @param int $n
19 19
      * @return int
20 20
      */
21
-    public static function rotate($v, $n)
21
+    public static function rotate( $v, $n )
22 22
     {
23 23
         $v &= 0xffffffff;
24 24
         $n &= 31;
25
-        return (int) (
25
+        return (int)(
26 26
             0xffffffff & (
27
-                ($v << $n)
27
+                ( $v << $n )
28 28
                     |
29
-                ($v >> (32 - $n))
29
+                ( $v >> ( 32 - $n ) )
30 30
             )
31 31
         );
32 32
     }
@@ -42,28 +42,28 @@  discard block
 block discarded – undo
42 42
      * @param int $d
43 43
      * @return array<int, int>
44 44
      */
45
-    protected static function quarterRound($a, $b, $c, $d)
45
+    protected static function quarterRound( $a, $b, $c, $d )
46 46
     {
47 47
         # a = PLUS(a,b); d = ROTATE(XOR(d,a),16);
48 48
         /** @var int $a */
49
-        $a = ($a + $b) & 0xffffffff;
50
-        $d = self::rotate($d ^ $a, 16);
49
+        $a = ( $a + $b ) & 0xffffffff;
50
+        $d = self::rotate( $d ^ $a, 16 );
51 51
 
52 52
         # c = PLUS(c,d); b = ROTATE(XOR(b,c),12);
53 53
         /** @var int $c */
54
-        $c = ($c + $d) & 0xffffffff;
55
-        $b = self::rotate($b ^ $c, 12);
54
+        $c = ( $c + $d ) & 0xffffffff;
55
+        $b = self::rotate( $b ^ $c, 12 );
56 56
 
57 57
         # a = PLUS(a,b); d = ROTATE(XOR(d,a), 8);
58 58
         /** @var int $a */
59
-        $a = ($a + $b) & 0xffffffff;
60
-        $d = self::rotate($d ^ $a, 8);
59
+        $a = ( $a + $b ) & 0xffffffff;
60
+        $d = self::rotate( $d ^ $a, 8 );
61 61
 
62 62
         # c = PLUS(c,d); b = ROTATE(XOR(b,c), 7);
63 63
         /** @var int $c */
64
-        $c = ($c + $d) & 0xffffffff;
65
-        $b = self::rotate($b ^ $c, 7);
66
-        return array((int) $a, (int) $b, (int) $c, (int) $d);
64
+        $c = ( $c + $d ) & 0xffffffff;
65
+        $b = self::rotate( $b ^ $c, 7 );
66
+        return array( (int)$a, (int)$b, (int)$c, (int)$d );
67 67
     }
68 68
 
69 69
     /**
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
         ParagonIE_Sodium_Core_ChaCha20_Ctx $ctx,
81 81
         $message = ''
82 82
     ) {
83
-        $bytes = self::strlen($message);
83
+        $bytes = self::strlen( $message );
84 84
 
85 85
         /*
86 86
         j0 = ctx->input[0];
@@ -100,71 +100,71 @@  discard block
 block discarded – undo
100 100
         j14 = ctx->input[14];
101 101
         j15 = ctx->input[15];
102 102
         */
103
-        $j0  = (int) $ctx[0];
104
-        $j1  = (int) $ctx[1];
105
-        $j2  = (int) $ctx[2];
106
-        $j3  = (int) $ctx[3];
107
-        $j4  = (int) $ctx[4];
108
-        $j5  = (int) $ctx[5];
109
-        $j6  = (int) $ctx[6];
110
-        $j7  = (int) $ctx[7];
111
-        $j8  = (int) $ctx[8];
112
-        $j9  = (int) $ctx[9];
113
-        $j10 = (int) $ctx[10];
114
-        $j11 = (int) $ctx[11];
115
-        $j12 = (int) $ctx[12];
116
-        $j13 = (int) $ctx[13];
117
-        $j14 = (int) $ctx[14];
118
-        $j15 = (int) $ctx[15];
103
+        $j0  = (int)$ctx[ 0 ];
104
+        $j1  = (int)$ctx[ 1 ];
105
+        $j2  = (int)$ctx[ 2 ];
106
+        $j3  = (int)$ctx[ 3 ];
107
+        $j4  = (int)$ctx[ 4 ];
108
+        $j5  = (int)$ctx[ 5 ];
109
+        $j6  = (int)$ctx[ 6 ];
110
+        $j7  = (int)$ctx[ 7 ];
111
+        $j8  = (int)$ctx[ 8 ];
112
+        $j9  = (int)$ctx[ 9 ];
113
+        $j10 = (int)$ctx[ 10 ];
114
+        $j11 = (int)$ctx[ 11 ];
115
+        $j12 = (int)$ctx[ 12 ];
116
+        $j13 = (int)$ctx[ 13 ];
117
+        $j14 = (int)$ctx[ 14 ];
118
+        $j15 = (int)$ctx[ 15 ];
119 119
 
120 120
         $c = '';
121
-        for (;;) {
122
-            if ($bytes < 64) {
123
-                $message .= str_repeat("\x00", 64 - $bytes);
121
+        for ( ;; ) {
122
+            if ( $bytes < 64 ) {
123
+                $message .= str_repeat( "\x00", 64 - $bytes );
124 124
             }
125 125
 
126
-            $x0 =  (int) $j0;
127
-            $x1 =  (int) $j1;
128
-            $x2 =  (int) $j2;
129
-            $x3 =  (int) $j3;
130
-            $x4 =  (int) $j4;
131
-            $x5 =  (int) $j5;
132
-            $x6 =  (int) $j6;
133
-            $x7 =  (int) $j7;
134
-            $x8 =  (int) $j8;
135
-            $x9 =  (int) $j9;
136
-            $x10 = (int) $j10;
137
-            $x11 = (int) $j11;
138
-            $x12 = (int) $j12;
139
-            $x13 = (int) $j13;
140
-            $x14 = (int) $j14;
141
-            $x15 = (int) $j15;
126
+            $x0 = (int)$j0;
127
+            $x1 = (int)$j1;
128
+            $x2 = (int)$j2;
129
+            $x3 = (int)$j3;
130
+            $x4 = (int)$j4;
131
+            $x5 = (int)$j5;
132
+            $x6 = (int)$j6;
133
+            $x7 = (int)$j7;
134
+            $x8 = (int)$j8;
135
+            $x9 = (int)$j9;
136
+            $x10 = (int)$j10;
137
+            $x11 = (int)$j11;
138
+            $x12 = (int)$j12;
139
+            $x13 = (int)$j13;
140
+            $x14 = (int)$j14;
141
+            $x15 = (int)$j15;
142 142
 
143 143
             # for (i = 20; i > 0; i -= 2) {
144
-            for ($i = 20; $i > 0; $i -= 2) {
144
+            for ( $i = 20; $i > 0; $i -= 2 ) {
145 145
                 # QUARTERROUND( x0,  x4,  x8,  x12)
146
-                list($x0, $x4, $x8, $x12) = self::quarterRound($x0, $x4, $x8, $x12);
146
+                list( $x0, $x4, $x8, $x12 ) = self::quarterRound( $x0, $x4, $x8, $x12 );
147 147
 
148 148
                 # QUARTERROUND( x1,  x5,  x9,  x13)
149
-                list($x1, $x5, $x9, $x13) = self::quarterRound($x1, $x5, $x9, $x13);
149
+                list( $x1, $x5, $x9, $x13 ) = self::quarterRound( $x1, $x5, $x9, $x13 );
150 150
 
151 151
                 # QUARTERROUND( x2,  x6,  x10,  x14)
152
-                list($x2, $x6, $x10, $x14) = self::quarterRound($x2, $x6, $x10, $x14);
152
+                list( $x2, $x6, $x10, $x14 ) = self::quarterRound( $x2, $x6, $x10, $x14 );
153 153
 
154 154
                 # QUARTERROUND( x3,  x7,  x11,  x15)
155
-                list($x3, $x7, $x11, $x15) = self::quarterRound($x3, $x7, $x11, $x15);
155
+                list( $x3, $x7, $x11, $x15 ) = self::quarterRound( $x3, $x7, $x11, $x15 );
156 156
 
157 157
                 # QUARTERROUND( x0,  x5,  x10,  x15)
158
-                list($x0, $x5, $x10, $x15) = self::quarterRound($x0, $x5, $x10, $x15);
158
+                list( $x0, $x5, $x10, $x15 ) = self::quarterRound( $x0, $x5, $x10, $x15 );
159 159
 
160 160
                 # QUARTERROUND( x1,  x6,  x11,  x12)
161
-                list($x1, $x6, $x11, $x12) = self::quarterRound($x1, $x6, $x11, $x12);
161
+                list( $x1, $x6, $x11, $x12 ) = self::quarterRound( $x1, $x6, $x11, $x12 );
162 162
 
163 163
                 # QUARTERROUND( x2,  x7,  x8,  x13)
164
-                list($x2, $x7, $x8, $x13) = self::quarterRound($x2, $x7, $x8, $x13);
164
+                list( $x2, $x7, $x8, $x13 ) = self::quarterRound( $x2, $x7, $x8, $x13 );
165 165
 
166 166
                 # QUARTERROUND( x3,  x4,  x9,  x14)
167
-                list($x3, $x4, $x9, $x14) = self::quarterRound($x3, $x4, $x9, $x14);
167
+                list( $x3, $x4, $x9, $x14 ) = self::quarterRound( $x3, $x4, $x9, $x14 );
168 168
             }
169 169
             /*
170 170
             x0 = PLUS(x0, j0);
@@ -185,37 +185,37 @@  discard block
 block discarded – undo
185 185
             x15 = PLUS(x15, j15);
186 186
             */
187 187
             /** @var int $x0 */
188
-            $x0  = ($x0 & 0xffffffff) + $j0;
188
+            $x0  = ( $x0 & 0xffffffff ) + $j0;
189 189
             /** @var int $x1 */
190
-            $x1  = ($x1 & 0xffffffff) + $j1;
190
+            $x1  = ( $x1 & 0xffffffff ) + $j1;
191 191
             /** @var int $x2 */
192
-            $x2  = ($x2 & 0xffffffff) + $j2;
192
+            $x2  = ( $x2 & 0xffffffff ) + $j2;
193 193
             /** @var int $x3 */
194
-            $x3  = ($x3 & 0xffffffff) + $j3;
194
+            $x3  = ( $x3 & 0xffffffff ) + $j3;
195 195
             /** @var int $x4 */
196
-            $x4  = ($x4 & 0xffffffff) + $j4;
196
+            $x4  = ( $x4 & 0xffffffff ) + $j4;
197 197
             /** @var int $x5 */
198
-            $x5  = ($x5 & 0xffffffff) + $j5;
198
+            $x5  = ( $x5 & 0xffffffff ) + $j5;
199 199
             /** @var int $x6 */
200
-            $x6  = ($x6 & 0xffffffff) + $j6;
200
+            $x6  = ( $x6 & 0xffffffff ) + $j6;
201 201
             /** @var int $x7 */
202
-            $x7  = ($x7 & 0xffffffff) + $j7;
202
+            $x7  = ( $x7 & 0xffffffff ) + $j7;
203 203
             /** @var int $x8 */
204
-            $x8  = ($x8 & 0xffffffff) + $j8;
204
+            $x8  = ( $x8 & 0xffffffff ) + $j8;
205 205
             /** @var int $x9 */
206
-            $x9  = ($x9 & 0xffffffff) + $j9;
206
+            $x9  = ( $x9 & 0xffffffff ) + $j9;
207 207
             /** @var int $x10 */
208
-            $x10 = ($x10 & 0xffffffff) + $j10;
208
+            $x10 = ( $x10 & 0xffffffff ) + $j10;
209 209
             /** @var int $x11 */
210
-            $x11 = ($x11 & 0xffffffff) + $j11;
210
+            $x11 = ( $x11 & 0xffffffff ) + $j11;
211 211
             /** @var int $x12 */
212
-            $x12 = ($x12 & 0xffffffff) + $j12;
212
+            $x12 = ( $x12 & 0xffffffff ) + $j12;
213 213
             /** @var int $x13 */
214
-            $x13 = ($x13 & 0xffffffff) + $j13;
214
+            $x13 = ( $x13 & 0xffffffff ) + $j13;
215 215
             /** @var int $x14 */
216
-            $x14 = ($x14 & 0xffffffff) + $j14;
216
+            $x14 = ( $x14 & 0xffffffff ) + $j14;
217 217
             /** @var int $x15 */
218
-            $x15 = ($x15 & 0xffffffff) + $j15;
218
+            $x15 = ( $x15 & 0xffffffff ) + $j15;
219 219
 
220 220
             /*
221 221
             x0 = XOR(x0, LOAD32_LE(m + 0));
@@ -235,22 +235,22 @@  discard block
 block discarded – undo
235 235
             x14 = XOR(x14, LOAD32_LE(m + 56));
236 236
             x15 = XOR(x15, LOAD32_LE(m + 60));
237 237
             */
238
-            $x0  ^= self::load_4(self::substr($message, 0, 4));
239
-            $x1  ^= self::load_4(self::substr($message, 4, 4));
240
-            $x2  ^= self::load_4(self::substr($message, 8, 4));
241
-            $x3  ^= self::load_4(self::substr($message, 12, 4));
242
-            $x4  ^= self::load_4(self::substr($message, 16, 4));
243
-            $x5  ^= self::load_4(self::substr($message, 20, 4));
244
-            $x6  ^= self::load_4(self::substr($message, 24, 4));
245
-            $x7  ^= self::load_4(self::substr($message, 28, 4));
246
-            $x8  ^= self::load_4(self::substr($message, 32, 4));
247
-            $x9  ^= self::load_4(self::substr($message, 36, 4));
248
-            $x10 ^= self::load_4(self::substr($message, 40, 4));
249
-            $x11 ^= self::load_4(self::substr($message, 44, 4));
250
-            $x12 ^= self::load_4(self::substr($message, 48, 4));
251
-            $x13 ^= self::load_4(self::substr($message, 52, 4));
252
-            $x14 ^= self::load_4(self::substr($message, 56, 4));
253
-            $x15 ^= self::load_4(self::substr($message, 60, 4));
238
+            $x0  ^= self::load_4( self::substr( $message, 0, 4 ) );
239
+            $x1  ^= self::load_4( self::substr( $message, 4, 4 ) );
240
+            $x2  ^= self::load_4( self::substr( $message, 8, 4 ) );
241
+            $x3  ^= self::load_4( self::substr( $message, 12, 4 ) );
242
+            $x4  ^= self::load_4( self::substr( $message, 16, 4 ) );
243
+            $x5  ^= self::load_4( self::substr( $message, 20, 4 ) );
244
+            $x6  ^= self::load_4( self::substr( $message, 24, 4 ) );
245
+            $x7  ^= self::load_4( self::substr( $message, 28, 4 ) );
246
+            $x8  ^= self::load_4( self::substr( $message, 32, 4 ) );
247
+            $x9  ^= self::load_4( self::substr( $message, 36, 4 ) );
248
+            $x10 ^= self::load_4( self::substr( $message, 40, 4 ) );
249
+            $x11 ^= self::load_4( self::substr( $message, 44, 4 ) );
250
+            $x12 ^= self::load_4( self::substr( $message, 48, 4 ) );
251
+            $x13 ^= self::load_4( self::substr( $message, 52, 4 ) );
252
+            $x14 ^= self::load_4( self::substr( $message, 56, 4 ) );
253
+            $x15 ^= self::load_4( self::substr( $message, 60, 4 ) );
254 254
 
255 255
             /*
256 256
                 j12 = PLUSONE(j12);
@@ -259,8 +259,8 @@  discard block
 block discarded – undo
259 259
                 }
260 260
              */
261 261
             ++$j12;
262
-            if ($j12 & 0xf0000000) {
263
-                throw new SodiumException('Overflow');
262
+            if ( $j12 & 0xf0000000 ) {
263
+                throw new SodiumException( 'Overflow' );
264 264
             }
265 265
 
266 266
             /*
@@ -281,41 +281,41 @@  discard block
 block discarded – undo
281 281
             STORE32_LE(c + 56, x14);
282 282
             STORE32_LE(c + 60, x15);
283 283
             */
284
-            $block = self::store32_le((int) ($x0  & 0xffffffff)) .
285
-                 self::store32_le((int) ($x1  & 0xffffffff)) .
286
-                 self::store32_le((int) ($x2  & 0xffffffff)) .
287
-                 self::store32_le((int) ($x3  & 0xffffffff)) .
288
-                 self::store32_le((int) ($x4  & 0xffffffff)) .
289
-                 self::store32_le((int) ($x5  & 0xffffffff)) .
290
-                 self::store32_le((int) ($x6  & 0xffffffff)) .
291
-                 self::store32_le((int) ($x7  & 0xffffffff)) .
292
-                 self::store32_le((int) ($x8  & 0xffffffff)) .
293
-                 self::store32_le((int) ($x9  & 0xffffffff)) .
294
-                 self::store32_le((int) ($x10 & 0xffffffff)) .
295
-                 self::store32_le((int) ($x11 & 0xffffffff)) .
296
-                 self::store32_le((int) ($x12 & 0xffffffff)) .
297
-                 self::store32_le((int) ($x13 & 0xffffffff)) .
298
-                 self::store32_le((int) ($x14 & 0xffffffff)) .
299
-                 self::store32_le((int) ($x15 & 0xffffffff));
284
+            $block = self::store32_le( (int)( $x0  & 0xffffffff ) ) .
285
+                 self::store32_le( (int)( $x1  & 0xffffffff ) ) .
286
+                 self::store32_le( (int)( $x2  & 0xffffffff ) ) .
287
+                 self::store32_le( (int)( $x3  & 0xffffffff ) ) .
288
+                 self::store32_le( (int)( $x4  & 0xffffffff ) ) .
289
+                 self::store32_le( (int)( $x5  & 0xffffffff ) ) .
290
+                 self::store32_le( (int)( $x6  & 0xffffffff ) ) .
291
+                 self::store32_le( (int)( $x7  & 0xffffffff ) ) .
292
+                 self::store32_le( (int)( $x8  & 0xffffffff ) ) .
293
+                 self::store32_le( (int)( $x9  & 0xffffffff ) ) .
294
+                 self::store32_le( (int)( $x10 & 0xffffffff ) ) .
295
+                 self::store32_le( (int)( $x11 & 0xffffffff ) ) .
296
+                 self::store32_le( (int)( $x12 & 0xffffffff ) ) .
297
+                 self::store32_le( (int)( $x13 & 0xffffffff ) ) .
298
+                 self::store32_le( (int)( $x14 & 0xffffffff ) ) .
299
+                 self::store32_le( (int)( $x15 & 0xffffffff ) );
300 300
 
301 301
             /* Partial block */
302
-            if ($bytes < 64) {
303
-                $c .= self::substr($block, 0, $bytes);
302
+            if ( $bytes < 64 ) {
303
+                $c .= self::substr( $block, 0, $bytes );
304 304
                 break;
305 305
             }
306 306
 
307 307
             /* Full block */
308 308
             $c .= $block;
309 309
             $bytes -= 64;
310
-            if ($bytes <= 0) {
310
+            if ( $bytes <= 0 ) {
311 311
                 break;
312 312
             }
313
-            $message = self::substr($message, 64);
313
+            $message = self::substr( $message, 64 );
314 314
         }
315 315
         /* end for(;;) loop */
316 316
 
317
-        $ctx[12] = $j12;
318
-        $ctx[13] = $j13;
317
+        $ctx[ 12 ] = $j12;
318
+        $ctx[ 13 ] = $j13;
319 319
         return $c;
320 320
     }
321 321
 
@@ -329,11 +329,11 @@  discard block
 block discarded – undo
329 329
      * @throws SodiumException
330 330
      * @throws TypeError
331 331
      */
332
-    public static function stream($len = 64, $nonce = '', $key = '')
332
+    public static function stream( $len = 64, $nonce = '', $key = '' )
333 333
     {
334 334
         return self::encryptBytes(
335
-            new ParagonIE_Sodium_Core_ChaCha20_Ctx($key, $nonce),
336
-            str_repeat("\x00", $len)
335
+            new ParagonIE_Sodium_Core_ChaCha20_Ctx( $key, $nonce ),
336
+            str_repeat( "\x00", $len )
337 337
         );
338 338
     }
339 339
 
@@ -347,11 +347,11 @@  discard block
 block discarded – undo
347 347
      * @throws SodiumException
348 348
      * @throws TypeError
349 349
      */
350
-    public static function ietfStream($len, $nonce = '', $key = '')
350
+    public static function ietfStream( $len, $nonce = '', $key = '' )
351 351
     {
352 352
         return self::encryptBytes(
353
-            new ParagonIE_Sodium_Core_ChaCha20_IetfCtx($key, $nonce),
354
-            str_repeat("\x00", $len)
353
+            new ParagonIE_Sodium_Core_ChaCha20_IetfCtx( $key, $nonce ),
354
+            str_repeat( "\x00", $len )
355 355
         );
356 356
     }
357 357
 
@@ -366,10 +366,10 @@  discard block
 block discarded – undo
366 366
      * @throws SodiumException
367 367
      * @throws TypeError
368 368
      */
369
-    public static function ietfStreamXorIc($message, $nonce = '', $key = '', $ic = '')
369
+    public static function ietfStreamXorIc( $message, $nonce = '', $key = '', $ic = '' )
370 370
     {
371 371
         return self::encryptBytes(
372
-            new ParagonIE_Sodium_Core_ChaCha20_IetfCtx($key, $nonce, $ic),
372
+            new ParagonIE_Sodium_Core_ChaCha20_IetfCtx( $key, $nonce, $ic ),
373 373
             $message
374 374
         );
375 375
     }
@@ -385,10 +385,10 @@  discard block
 block discarded – undo
385 385
      * @throws SodiumException
386 386
      * @throws TypeError
387 387
      */
388
-    public static function streamXorIc($message, $nonce = '', $key = '', $ic = '')
388
+    public static function streamXorIc( $message, $nonce = '', $key = '', $ic = '' )
389 389
     {
390 390
         return self::encryptBytes(
391
-            new ParagonIE_Sodium_Core_ChaCha20_Ctx($key, $nonce, $ic),
391
+            new ParagonIE_Sodium_Core_ChaCha20_Ctx( $key, $nonce, $ic ),
392 392
             $message
393 393
         );
394 394
     }
Please login to merge, or discard this patch.
includes/widgets/search-widget/templates/search-field-chainedselect.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -19,14 +19,14 @@  discard block
 block discarded – undo
19 19
 }
20 20
 
21 21
 // Make sure that there are choices to display
22
-if( empty( $search_field['choices'] ) ) {
22
+if ( empty( $search_field[ 'choices' ] ) ) {
23 23
 	gravityview()->log->debug( 'search-field-chainedselect.php - No choices for field' );
24 24
 	return;
25 25
 }
26 26
 
27 27
 $form = \GV\GF_Form::from_form( $gravityview_view->getForm() );
28 28
 
29
-$field = \GV\GF_Field::by_id( $form, $search_field['key'] );
29
+$field = \GV\GF_Field::by_id( $form, $search_field[ 'key' ] );
30 30
 
31 31
 /** @var GF_Chained_Field_Select $gf_field */
32 32
 $gf_field = $field->field;
@@ -52,8 +52,8 @@  discard block
 block discarded – undo
52 52
 $gf_field->chainedSelectsAlignment = $gravityview_view->search_layout;
53 53
 ?>
54 54
 <div class="gv-search-box gv-search-field-chainedselect">
55
-	<?php if( ! gv_empty( $search_field['label'], false, false ) ) { ?>
56
-		<label for="search-box-<?php echo esc_attr( $search_field['name'] ); ?>"><?php echo esc_html( $search_field['label'] ); ?></label>
55
+	<?php if ( ! gv_empty( $search_field[ 'label' ], false, false ) ) { ?>
56
+		<label for="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>"><?php echo esc_html( $search_field[ 'label' ] ); ?></label>
57 57
 	<?php
58 58
 	}
59 59
 
@@ -67,13 +67,13 @@  discard block
 block discarded – undo
67 67
 <script>
68 68
 ( function( $ ) {
69 69
 	$( 'select', '.gv-search-field-chainedselect').on( 'change', function( e ) {
70
-		window.gform.doAction( 'gform_input_change', e.target, <?php echo (int) $form->ID; ?>, <?php echo (int) $field->ID; ?> );
70
+		window.gform.doAction( 'gform_input_change', e.target, <?php echo (int)$form->ID; ?>, <?php echo (int)$field->ID; ?> );
71 71
 	});
72 72
 <?php
73 73
 	echo strtr( 'new GFChainedSelects( {form_id}, {field_id}, {hide_inactive}, "{search_layout}" );', array(
74 74
 			'{form_id}'       => $form->ID,
75 75
 			'{field_id}'      => $field->ID,
76
-			'{hide_inactive}' => (int) $hide_inactive,
76
+			'{hide_inactive}' => (int)$hide_inactive,
77 77
 			'{search_layout}' => $gravityview_view->search_layout,
78 78
 	) );
79 79
 ?>
Please login to merge, or discard this patch.
class-gravityview-plugin-hooks-gravity-forms-chainedselects.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -59,17 +59,17 @@  discard block
 block discarded – undo
59 59
 			return $searchable_fields;
60 60
 		}
61 61
 
62
-		foreach( $searchable_fields as $searchable_field ) {
62
+		foreach ( $searchable_fields as $searchable_field ) {
63 63
 
64 64
 			if ( self::INPUT_TYPE !== \GV\Utils::get( $searchable_field, 'input' ) ) {
65 65
 				continue;
66 66
 			}
67 67
 
68
-			$field = GFAPI::get_field( $searchable_field['form_id'], $searchable_field['field'] );
68
+			$field = GFAPI::get_field( $searchable_field[ 'form_id' ], $searchable_field[ 'field' ] );
69 69
 
70
-			foreach( $field->get_entry_inputs() as $input ) {
71
-				$searchable_fields[] = array(
72
-					'field' => $input['id'],
70
+			foreach ( $field->get_entry_inputs() as $input ) {
71
+				$searchable_fields[ ] = array(
72
+					'field' => $input[ 'id' ],
73 73
 				);
74 74
 			}
75 75
 		}
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 	 */
88 88
 	public function print_styles( $search_widget, $search_field ) {
89 89
 
90
-		if( self::INPUT_TYPE !== \GV\Utils::get( $search_field, 'type' ) ) {
90
+		if ( self::INPUT_TYPE !== \GV\Utils::get( $search_field, 'type' ) ) {
91 91
 			return;
92 92
 		}
93 93
 
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
 	 */
139 139
 	public function print_scripts( $search_widget, $search_field ) {
140 140
 
141
-		if( self::INPUT_TYPE !== \GV\Utils::get( $search_field, 'type' ) ) {
141
+		if ( self::INPUT_TYPE !== \GV\Utils::get( $search_field, 'type' ) ) {
142 142
 			return;
143 143
 		}
144 144
 
@@ -178,9 +178,9 @@  discard block
 block discarded – undo
178 178
 		foreach ( $gf_field->get_entry_inputs() as $input ) {
179 179
 
180 180
 			// Inputs are converted from . to _
181
-			$input_url_arg = 'input_' . str_replace( '.', '_', $input['id'] );
181
+			$input_url_arg = 'input_' . str_replace( '.', '_', $input[ 'id' ] );
182 182
 
183
-			$field_values[ $input['id'] ] = \GV\Utils::_REQUEST( $input_url_arg );
183
+			$field_values[ $input[ 'id' ] ] = \GV\Utils::_REQUEST( $input_url_arg );
184 184
 		}
185 185
 
186 186
 		return $field_values;
@@ -205,8 +205,8 @@  discard block
 block discarded – undo
205 205
 	 */
206 206
 	function modify_searchable_fields( $fields, $form_id ) {
207 207
 
208
-		foreach( $fields as $key => $field ) {
209
-			if( 'chainedselect' === $field['type'] && ! empty( $field['parent'] ) ) {
208
+		foreach ( $fields as $key => $field ) {
209
+			if ( 'chainedselect' === $field[ 'type' ] && ! empty( $field[ 'parent' ] ) ) {
210 210
 				unset( $fields[ $key ] );
211 211
 			}
212 212
 		}
@@ -235,7 +235,7 @@  discard block
 block discarded – undo
235 235
 	 *
236 236
 	 * @return string
237 237
 	 */
238
-	public function set_input_type( $input_type, $field_type, $field_id  ) {
238
+	public function set_input_type( $input_type, $field_type, $field_id ) {
239 239
 
240 240
 		if ( ! in_array( $field_type, array( 'chainedselect' ) ) ) {
241 241
 			return $input_type;
Please login to merge, or discard this patch.
includes/class-gravityview-merge-tags.php 1 patch
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -78,12 +78,12 @@  discard block
 block discarded – undo
78 78
 
79 79
 			$non_gv_modifiers = array_diff( $modifiers, array_keys( $gv_modifiers ) );
80 80
 
81
-			$return = $field->get_value_merge_tag( $value, '', array( 'currency' => '' ), array(), implode( '', $non_gv_modifiers ), $raw_value, false, false, 'text', false);
81
+			$return = $field->get_value_merge_tag( $value, '', array( 'currency' => '' ), array(), implode( '', $non_gv_modifiers ), $raw_value, false, false, 'text', false );
82 82
 		}
83 83
 
84 84
 		foreach ( $modifiers as $passed_modifier ) {
85 85
 
86
-			foreach( $gv_modifiers as $gv_modifier => $method ) {
86
+			foreach ( $gv_modifiers as $gv_modifier => $method ) {
87 87
 
88 88
 				// Uses ^ to only match the first modifier, to enforce same order as passed by GF
89 89
 				preg_match( '/^' . $gv_modifier . '/ism', $passed_modifier, $matches );
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
 	 */
133 133
 	private static function modifier_timestamp( $raw_value, $matches ) {
134 134
 
135
-		if( empty( $matches[0] ) ) {
135
+		if ( empty( $matches[ 0 ] ) ) {
136 136
 			return $raw_value;
137 137
 		}
138 138
 
@@ -161,11 +161,11 @@  discard block
 block discarded – undo
161 161
 	 */
162 162
 	private static function modifier_maxwords( $raw_value, $matches, $field = null ) {
163 163
 
164
-		if( ! is_string( $raw_value ) || empty( $matches[1] ) || ! function_exists( 'wp_trim_words' ) ) {
164
+		if ( ! is_string( $raw_value ) || empty( $matches[ 1 ] ) || ! function_exists( 'wp_trim_words' ) ) {
165 165
 			return $raw_value;
166 166
 		}
167 167
 
168
-		$max = intval( $matches[1] );
168
+		$max = intval( $matches[ 1 ] );
169 169
 
170 170
 		$more_placeholder = '[GVMORE]';
171 171
 
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
234 234
 	private static function modifier_explode( $raw_value, $matches, $value, $field = null ) {
235 235
 
236 236
 		// For JSON-encoded arrays
237
-		if( $json_array = json_decode( $raw_value, true ) ) {
237
+		if ( $json_array = json_decode( $raw_value, true ) ) {
238 238
 			return implode( ' ', $json_array );
239 239
 		}
240 240
 
@@ -255,13 +255,13 @@  discard block
 block discarded – undo
255 255
 	 */
256 256
 	private static function modifier_strings( $raw_value, $matches, $value = '', $field = null ) {
257 257
 
258
-		if( empty( $matches[0] ) ) {
258
+		if ( empty( $matches[ 0 ] ) ) {
259 259
 			return $raw_value;
260 260
 		}
261 261
 
262 262
 		$return = $raw_value;
263 263
 
264
-		switch( $matches[0] ) {
264
+		switch ( $matches[ 0 ] ) {
265 265
 			case 'urlencode':
266 266
 				$return = urlencode( $raw_value );
267 267
 				break;
@@ -348,9 +348,9 @@  discard block
 block discarded – undo
348 348
 		 * @internal Fixed $form['title'] in Gravity Forms
349 349
 		 * @see      https://github.com/gravityforms/gravityforms/pull/27/files
350 350
 		 */
351
-		$form['title']  = isset( $form['title'] ) ? $form['title'] : '';
352
-		$form['id']     = isset( $form['id'] ) ? $form['id'] : '';
353
-		$form['fields'] = isset( $form['fields'] ) ? $form['fields'] : array();
351
+		$form[ 'title' ]  = isset( $form[ 'title' ] ) ? $form[ 'title' ] : '';
352
+		$form[ 'id' ]     = isset( $form[ 'id' ] ) ? $form[ 'id' ] : '';
353
+		$form[ 'fields' ] = isset( $form[ 'fields' ] ) ? $form[ 'fields' ] : array();
354 354
 
355 355
 		return GFCommon::replace_variables( $text, $form, $entry, $url_encode, $esc_html, $nl2br, $format, $aux_data );
356 356
 	}
@@ -442,7 +442,7 @@  discard block
 block discarded – undo
442 442
 
443 443
 		$site_url = get_site_url();
444 444
 
445
-		if( $url_encode ) {
445
+		if ( $url_encode ) {
446 446
 			$site_url = urlencode( $site_url );
447 447
 		}
448 448
 
@@ -469,7 +469,7 @@  discard block
 block discarded – undo
469 469
 		// Is there is {gv_entry_link} or {gv_entry_link:[post id]} or {gv_entry_link:[post id]:[action]} merge tag?
470 470
 		preg_match_all( "/{gv_entry_link(?:\:(\d+)\:?(.*?))?}/ism", $original_text, $matches, PREG_SET_ORDER );
471 471
 
472
-		if( empty( $matches ) ) {
472
+		if ( empty( $matches ) ) {
473 473
 			return $original_text;
474 474
 		}
475 475
 
@@ -490,18 +490,18 @@  discard block
 block discarded – undo
490 490
 		 * }
491 491
 		 */
492 492
 		foreach ( $matches as $match ) {
493
-			$full_tag = $match[0];
493
+			$full_tag = $match[ 0 ];
494 494
 
495 495
 			$link_args = array(
496 496
 				'return' => 'url',
497
-				'entry_id' => $entry['id'],
497
+				'entry_id' => $entry[ 'id' ],
498 498
 				'post_id' => \GV\Utils::get( $match, 1, null ),
499 499
 				'action' => \GV\Utils::get( $match, 2, 'read' ),
500 500
 			);
501 501
 
502 502
 			$entry_link = $Shortcode->read_shortcode( $link_args, null, 'gv_entry_link_merge_tag' );
503 503
 
504
-			if( $url_encode ) {
504
+			if ( $url_encode ) {
505 505
 				$entry_link = urlencode( $entry_link );
506 506
 			}
507 507
 
@@ -539,7 +539,7 @@  discard block
 block discarded – undo
539 539
 			'diff' => in_array( 'diff', $exploded ), // {date_created:diff}
540 540
 			'raw' => in_array( 'raw', $exploded ), // {date_created:raw}
541 541
 			'timestamp' => in_array( 'timestamp', $exploded ), // {date_created:timestamp}
542
-			'time' => in_array( 'time', $exploded ),  // {date_created:time}
542
+			'time' => in_array( 'time', $exploded ), // {date_created:time}
543 543
 		);
544 544
 
545 545
 		$formatted_date = GVCommon::format_date( $date_created, $atts );
@@ -616,8 +616,8 @@  discard block
 block discarded – undo
616 616
 			return $original_text;
617 617
 		}
618 618
 
619
-		foreach ( (array) $matches as $match ) {
620
-			$full_tag = $match[0];
619
+		foreach ( (array)$matches as $match ) {
620
+			$full_tag = $match[ 0 ];
621 621
 			$modifier = \GV\Utils::get( $match, 2, 'permalink' );
622 622
 
623 623
 			$replacement = false;
@@ -635,7 +635,7 @@  discard block
 block discarded – undo
635 635
 					$replacement = esc_html( $replacement );
636 636
 				}
637 637
 
638
-				if( $url_encode ) {
638
+				if ( $url_encode ) {
639 639
 					$replacement = urlencode( $replacement );
640 640
 				}
641 641
 
@@ -675,14 +675,14 @@  discard block
 block discarded – undo
675 675
 		preg_match_all( "/{get:(.*?)}/ism", $text, $matches, PREG_SET_ORDER );
676 676
 
677 677
 		// If there are no matches OR the Entry `created_by` isn't set or is 0 (no user)
678
-		if( empty( $matches ) ) {
678
+		if ( empty( $matches ) ) {
679 679
 			return $text;
680 680
 		}
681 681
 
682 682
 		foreach ( $matches as $match ) {
683 683
 
684
-			$full_tag = $match[0];
685
-			$property = $match[1];
684
+			$full_tag = $match[ 0 ];
685
+			$property = $match[ 1 ];
686 686
 
687 687
 			$value = stripslashes_deep( \GV\Utils::_GET( $property ) );
688 688
 
@@ -706,7 +706,7 @@  discard block
 block discarded – undo
706 706
 			 * @since 1.15
707 707
 			 * @param bool $esc_html Whether to esc_html() the value. Default: `true`
708 708
 			 */
709
-			$esc_html = apply_filters('gravityview/merge_tags/get/esc_html/' . $property, true );
709
+			$esc_html = apply_filters( 'gravityview/merge_tags/get/esc_html/' . $property, true );
710 710
 
711 711
 			$value = $esc_html ? esc_html( $value ) : $value;
712 712
 
@@ -717,7 +717,7 @@  discard block
 block discarded – undo
717 717
 			 * @param array $form Gravity Forms form array
718 718
 			 * @param array $entry Entry array
719 719
 			 */
720
-			$value = apply_filters('gravityview/merge_tags/get/value/' . $property, $value, $text, $form, $entry );
720
+			$value = apply_filters( 'gravityview/merge_tags/get/value/' . $property, $value, $text, $form, $entry );
721 721
 
722 722
 			$text = str_replace( $full_tag, $value, $text );
723 723
 		}
Please login to merge, or discard this patch.
includes/class-gravityview-entry-notes.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -67,10 +67,10 @@  discard block
 block discarded – undo
67 67
 		// Make sure the keys are all set
68 68
 		$note = wp_parse_args( $note, $default_note );
69 69
 
70
-		GFFormsModel::add_note( intval( $note['lead_id'] ), intval( $note['user_id'] ), esc_attr( $note['user_name'] ), $note['note'], esc_attr( $note['note_type'] ) );
70
+		GFFormsModel::add_note( intval( $note[ 'lead_id' ] ), intval( $note[ 'user_id' ] ), esc_attr( $note[ 'user_name' ] ), $note[ 'note' ], esc_attr( $note[ 'note_type' ] ) );
71 71
 
72 72
 		// If last_error is empty string, there was no error.
73
-		if( empty( $wpdb->last_error ) ) {
73
+		if ( empty( $wpdb->last_error ) ) {
74 74
 			$return = $wpdb->insert_id;
75 75
 		} else {
76 76
 			$return = new WP_Error( 'gravityview-add-note', $wpdb->last_error );
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 	 */
97 97
 	public static function delete_notes( $note_ids = array() ) {
98 98
 
99
-		if( !is_array( $note_ids ) ) {
99
+		if ( ! is_array( $note_ids ) ) {
100 100
 
101 101
 			gravityview()->log->error( 'Note IDs not an array. Not processing delete request.', array( 'data' => $note_ids ) );
102 102
 
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
 			)
158 158
 		);
159 159
 
160
-		return $results ? $results[0] : false;
160
+		return $results ? $results[ 0 ] : false;
161 161
 	}
162 162
 
163 163
 	/**
@@ -170,8 +170,8 @@  discard block
 block discarded – undo
170 170
 	 */
171 171
 	public static function filter_avatar( $avatar = '', $note = null ) {
172 172
 
173
-		if( 'gravityview' === $note->note_type && -1 === (int)$note->user_id ) {
174
-			$avatar =  sprintf( '<img src="%s" width="48" height="48" alt="GravityView" class="avatar avatar-48 gravityview-avatar" />', esc_url_raw( plugins_url( 'assets/images/floaty-avatar.png', GRAVITYVIEW_FILE ) ) );
173
+		if ( 'gravityview' === $note->note_type && -1 === (int)$note->user_id ) {
174
+			$avatar = sprintf( '<img src="%s" width="48" height="48" alt="GravityView" class="avatar avatar-48 gravityview-avatar" />', esc_url_raw( plugins_url( 'assets/images/floaty-avatar.png', GRAVITYVIEW_FILE ) ) );
175 175
 		}
176 176
 
177 177
 		return $avatar;
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-post-image.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -25,16 +25,16 @@  discard block
 block discarded – undo
25 25
 
26 26
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
27 27
 
28
-		unset ( $field_options['search_filter'] );
28
+		unset ( $field_options[ 'search_filter' ] );
29 29
 
30
-		if( 'edit' === $context ) {
30
+		if ( 'edit' === $context ) {
31 31
 			return $field_options;
32 32
 		}
33 33
 
34
-		$this->add_field_support('link_to_post', $field_options );
34
+		$this->add_field_support( 'link_to_post', $field_options );
35 35
 
36 36
 		// @since 1.5.4
37
-		$this->add_field_support('dynamic_data', $field_options );
37
+		$this->add_field_support( 'dynamic_data', $field_options );
38 38
 
39 39
 		return $field_options;
40 40
 	}
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 		$url = $title = $caption = $description = '';
62 62
 
63 63
 		// If there's a |:| match, process. Otherwise, empty array!
64
-		if( preg_match( '/\|\:\|/', $value ) ) {
64
+		if ( preg_match( '/\|\:\|/', $value ) ) {
65 65
 			list( $url, $title, $caption, $description ) = array_pad( explode( '|:|', $value ), 4, false );
66 66
 		}
67 67
 
@@ -90,8 +90,8 @@  discard block
 block discarded – undo
90 90
 	 */
91 91
 	public function get_field_input( $form, $value = '', $entry = null, GF_Field_Post_Image $field = null ) {
92 92
 
93
-		$id = (int) $field->id;
94
-		$form_id = $form['id'];
93
+		$id = (int)$field->id;
94
+		$form_id = $form[ 'id' ];
95 95
 		$input_name = "input_{$id}";
96 96
 		$field_id = sprintf( 'input_%d_%d', $form_id, $id );
97 97
 		$img_name = null;
@@ -99,16 +99,16 @@  discard block
 block discarded – undo
99 99
 		// Convert |:| to associative array
100 100
 		$img_array = self::explode_value( $value );
101 101
 
102
-		if( ! empty( $img_array['url'] ) ) {
102
+		if ( ! empty( $img_array[ 'url' ] ) ) {
103 103
 
104
-			$img_name = basename( $img_array['url'] );
104
+			$img_name = basename( $img_array[ 'url' ] );
105 105
 
106 106
 			/**
107 107
 			 * Set the $uploaded_files value so that the .ginput_preview renders, and the file upload is hidden
108 108
 			 * @see GF_Field_Post_Image::get_field_input See the `<span class='ginput_preview'>` code
109 109
 			 * @see GFFormsModel::get_temp_filename See the `rgget( $input_name, self::$uploaded_files[ $form_id ] );` code
110 110
 			 */
111
-			if( empty( GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] ) ) {
111
+			if ( empty( GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] ) ) {
112 112
 				GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] = $img_name;
113 113
 			}
114 114
 		}
@@ -137,8 +137,8 @@  discard block
 block discarded – undo
137 137
 		 * @hack
138 138
 		 */
139 139
 		if ( null !== $img_name ) {
140
-			$current_file = sprintf( "<input name='%s' id='%s' type='hidden' value='%s' />", $input_name, $field_id, esc_url_raw( $img_array['url'] ) );
141
-			$gf_post_image_field_output = str_replace('<span class=\'ginput_preview\'>', '<span class=\'ginput_preview\'>'.$current_file, $gf_post_image_field_output );
140
+			$current_file = sprintf( "<input name='%s' id='%s' type='hidden' value='%s' />", $input_name, $field_id, esc_url_raw( $img_array[ 'url' ] ) );
141
+			$gf_post_image_field_output = str_replace( '<span class=\'ginput_preview\'>', '<span class=\'ginput_preview\'>' . $current_file, $gf_post_image_field_output );
142 142
 		}
143 143
 
144 144
 		return $gf_post_image_field_output;
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-post-content.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -26,13 +26,13 @@  discard block
 block discarded – undo
26 26
 
27 27
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
28 28
 
29
-		unset( $field_options['show_as_link'] );
29
+		unset( $field_options[ 'show_as_link' ] );
30 30
 
31
-		if( 'edit' === $context ) {
31
+		if ( 'edit' === $context ) {
32 32
 			return $field_options;
33 33
 		}
34 34
 
35
-		$this->add_field_support('dynamic_data', $field_options );
35
+		$this->add_field_support( 'dynamic_data', $field_options );
36 36
 
37 37
 		return $field_options;
38 38
 	}
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 	 */
50 50
 	public function get_field_input( $form, $value = '', $entry = null, GF_Field_Post_Content $field = null ) {
51 51
 
52
-		$id    = (int) $field->id;
52
+		$id    = (int)$field->id;
53 53
 		$input_name = "input_{$id}";
54 54
 		$class = esc_attr( $field->size );
55 55
 		$tabindex = $field->get_tabindex();
Please login to merge, or discard this patch.
includes/extensions/edit-entry/class-edit-entry.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 
37 37
         self::$file = plugin_dir_path( __FILE__ );
38 38
 
39
-        if( is_admin() ) {
39
+        if ( is_admin() ) {
40 40
             $this->load_components( 'admin' );
41 41
         }
42 42
 
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 
57 57
     static function getInstance() {
58 58
 
59
-        if( empty( self::$instance ) ) {
59
+        if ( empty( self::$instance ) ) {
60 60
             self::$instance = new GravityView_Edit_Entry;
61 61
         }
62 62
 
@@ -82,10 +82,10 @@  discard block
 block discarded – undo
82 82
     private function add_hooks() {
83 83
 
84 84
         // Add front-end access to Gravity Forms delete file action
85
-        add_action( 'wp_ajax_nopriv_rg_delete_file', array( $this, 'delete_file') );
85
+        add_action( 'wp_ajax_nopriv_rg_delete_file', array( $this, 'delete_file' ) );
86 86
 
87 87
         // Make sure this hook is run for non-admins
88
-        add_action( 'wp_ajax_rg_delete_file', array( $this, 'delete_file') );
88
+        add_action( 'wp_ajax_rg_delete_file', array( $this, 'delete_file' ) );
89 89
 
90 90
         add_filter( 'gravityview_blocklist_field_types', array( $this, 'modify_field_blocklist' ), 10, 2 );
91 91
 
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
 	 */
109 109
 	public function add_reserved_arg( $args ) {
110 110
 
111
-		$args[] = 'edit';
111
+		$args[ ] = 'edit';
112 112
 
113 113
 		return $args;
114 114
 	}
@@ -119,8 +119,8 @@  discard block
 block discarded – undo
119 119
 	 */
120 120
 	private function addon_specific_hooks() {
121 121
 
122
-		if( class_exists( 'GFSignature' ) && is_callable( array( 'GFSignature', 'get_instance' ) ) ) {
123
-			add_filter('gform_admin_pre_render', array( GFSignature::get_instance(), 'edit_lead_script'));
122
+		if ( class_exists( 'GFSignature' ) && is_callable( array( 'GFSignature', 'get_instance' ) ) ) {
123
+			add_filter( 'gform_admin_pre_render', array( GFSignature::get_instance(), 'edit_lead_script' ) );
124 124
 		}
125 125
 
126 126
 	}
@@ -207,9 +207,9 @@  discard block
 block discarded – undo
207 207
      */
208 208
     public static function get_edit_link( $entry, $view_id, $post_id = null, $field_values = '' ) {
209 209
 
210
-        $nonce_key = self::get_nonce_key( $view_id, $entry['form_id'], $entry['id']  );
210
+        $nonce_key = self::get_nonce_key( $view_id, $entry[ 'form_id' ], $entry[ 'id' ] );
211 211
 
212
-        $base = gv_entry_link( $entry, $post_id ? : $view_id  );
212
+        $base = gv_entry_link( $entry, $post_id ?: $view_id );
213 213
 
214 214
         $url = add_query_arg( array(
215 215
             'edit' => wp_create_nonce( $nonce_key )
@@ -223,9 +223,9 @@  discard block
 block discarded – undo
223 223
 	     * Allow passing params to dynamically populate entry with values
224 224
 	     * @since 1.9.2
225 225
 	     */
226
-	    if( !empty( $field_values ) ) {
226
+	    if ( ! empty( $field_values ) ) {
227 227
 
228
-		    if( is_array( $field_values ) ) {
228
+		    if ( is_array( $field_values ) ) {
229 229
 			    // If already an array, no parse_str() needed
230 230
 			    $params = $field_values;
231 231
 		    } else {
@@ -273,7 +273,7 @@  discard block
 block discarded – undo
273 273
 	 */
274 274
 	public function modify_field_blocklist( $fields = array(), $context = NULL ) {
275 275
 
276
-		if( empty( $context ) || $context !== 'edit' ) {
276
+		if ( empty( $context ) || $context !== 'edit' ) {
277 277
 			return $fields;
278 278
 		}
279 279
 
@@ -370,15 +370,15 @@  discard block
 block discarded – undo
370 370
         // If they can edit any entries (as defined in Gravity Forms)
371 371
         // Or if they can edit other people's entries
372 372
         // Then we're good.
373
-        if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ), $entry['id'] ) ) {
373
+        if ( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ), $entry[ 'id' ] ) ) {
374 374
 
375 375
             gravityview()->log->debug( 'User has ability to edit all entries.' );
376 376
 
377 377
             $user_can_edit = true;
378 378
 
379
-        } else if( !isset( $entry['created_by'] ) ) {
379
+        } else if ( ! isset( $entry[ 'created_by' ] ) ) {
380 380
 
381
-            gravityview()->log->error( 'Entry `created_by` doesn\'t exist.');
381
+            gravityview()->log->error( 'Entry `created_by` doesn\'t exist.' );
382 382
 
383 383
             $user_can_edit = false;
384 384
 
@@ -387,7 +387,7 @@  discard block
 block discarded – undo
387 387
             $current_user = wp_get_current_user();
388 388
 
389 389
             // User edit is disabled
390
-            if( empty( $user_edit ) ) {
390
+            if ( empty( $user_edit ) ) {
391 391
 
392 392
                 gravityview()->log->debug( 'User Edit is disabled. Returning false.' );
393 393
 
@@ -395,13 +395,13 @@  discard block
 block discarded – undo
395 395
             }
396 396
 
397 397
             // User edit is enabled and the logged-in user is the same as the user who created the entry. We're good.
398
-            else if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
398
+            else if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) {
399 399
 
400 400
                 gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id', $current_user->ID ) );
401 401
 
402 402
                 $user_can_edit = true;
403 403
 
404
-            } else if( ! is_user_logged_in() ) {
404
+            } else if ( ! is_user_logged_in() ) {
405 405
 
406 406
                 gravityview()->log->debug( 'No user defined; edit entry requires logged in user' );
407 407
 
@@ -419,7 +419,7 @@  discard block
 block discarded – undo
419 419
          */
420 420
         $user_can_edit = apply_filters( 'gravityview/edit_entry/user_can_edit_entry', $user_can_edit, $entry, $view_id );
421 421
 
422
-        return (bool) $user_can_edit;
422
+        return (bool)$user_can_edit;
423 423
     }
424 424
 
425 425
 	/**
@@ -430,8 +430,8 @@  discard block
 block discarded – undo
430 430
 	 * @uses   GFForms::delete_file()
431 431
 	 */
432 432
 	public function delete_file() {
433
-		add_filter( 'user_has_cap', function ( $caps ) {
434
-			$caps['gravityforms_delete_entries'] = true;
433
+		add_filter( 'user_has_cap', function( $caps ) {
434
+			$caps[ 'gravityforms_delete_entries' ] = true;
435 435
 
436 436
 			return $caps;
437 437
 
Please login to merge, or discard this patch.
includes/helper-functions.php 1 patch
Spacing   +57 added lines, -57 removed lines patch added patch discarded remove patch
@@ -32,19 +32,19 @@  discard block
 block discarded – undo
32 32
 	// If there's an overriding CSS file in the current template folder, use it.
33 33
 	$template_css_path = trailingslashit( get_stylesheet_directory() ) . 'gravityview/css/' . $css_file;
34 34
 
35
-	if( file_exists( $template_css_path ) ) {
35
+	if ( file_exists( $template_css_path ) ) {
36 36
 		$path = trailingslashit( get_stylesheet_directory_uri() ) . 'gravityview/css/' . $css_file;
37 37
 		gravityview()->log->debug( 'Stylesheet override ({css_file})', array( 'css_file' => esc_attr( $css_file ) ) );
38 38
 	} else {
39 39
 		// Default: use GravityView CSS file
40 40
 
41 41
 		// If no path is provided, assume default plugin templates CSS folder
42
-		if( '' === $dir_path ) {
42
+		if ( '' === $dir_path ) {
43 43
 			$dir_path = GRAVITYVIEW_DIR . 'templates/css/';
44 44
 		}
45 45
 
46 46
 		// plugins_url() expects a path to a file, not directory. We append a file to be stripped.
47
-		$path = plugins_url( $css_file, trailingslashit( $dir_path )  . 'stripped-by-plugin_basename.php' );
47
+		$path = plugins_url( $css_file, trailingslashit( $dir_path ) . 'stripped-by-plugin_basename.php' );
48 48
 	}
49 49
 
50 50
 	return $path;
@@ -82,9 +82,9 @@  discard block
 block discarded – undo
82 82
 
83 83
 	$parsed_permalink = parse_url( get_permalink( $id ) );
84 84
 
85
-	$permalink_args =  isset( $parsed_permalink['query'] ) ? $parsed_permalink['query'] : false;
85
+	$permalink_args = isset( $parsed_permalink[ 'query' ] ) ? $parsed_permalink[ 'query' ] : false;
86 86
 
87
-	if( empty( $permalink_args ) ) {
87
+	if ( empty( $permalink_args ) ) {
88 88
 		return array();
89 89
 	}
90 90
 
@@ -109,15 +109,15 @@  discard block
 block discarded – undo
109 109
 function gv_selected( $value, $current, $echo = true, $type = 'selected' ) {
110 110
 
111 111
 	$output = '';
112
-	if( is_array( $current ) ) {
113
-		if( in_array( $value, $current ) ) {
112
+	if ( is_array( $current ) ) {
113
+		if ( in_array( $value, $current ) ) {
114 114
 			$output = __checked_selected_helper( true, true, false, $type );
115 115
 		}
116 116
 	} else {
117 117
 		$output = __checked_selected_helper( $value, $current, false, $type );
118 118
 	}
119 119
 
120
-	if( $echo ) {
120
+	if ( $echo ) {
121 121
 		echo $output;
122 122
 	}
123 123
 
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 }
126 126
 
127 127
 
128
-if( ! function_exists( 'gravityview_sanitize_html_class' ) ) {
128
+if ( ! function_exists( 'gravityview_sanitize_html_class' ) ) {
129 129
 
130 130
 	/**
131 131
 	 * sanitize_html_class doesn't handle spaces (multiple classes). We remedy that.
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
  */
172 172
 function gravityview_strip_whitespace( $string ) {
173 173
 	$string = normalize_whitespace( $string );
174
-	return preg_replace('/[\r\n\t ]+/', ' ', $string );
174
+	return preg_replace( '/[\r\n\t ]+/', ' ', $string );
175 175
 }
176 176
 
177 177
 /**
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
  * @return string Included file contents
186 186
  */
187 187
 function gravityview_ob_include( $file_path, $object = NULL ) {
188
-	if( ! file_exists( $file_path ) ) {
188
+	if ( ! file_exists( $file_path ) ) {
189 189
 		gravityview()->log->error( 'File path does not exist. {path}', array( 'path' => $file_path ) );
190 190
 		return '';
191 191
 	}
@@ -209,15 +209,15 @@  discard block
 block discarded – undo
209 209
 
210 210
 	$width = $height * 0.7586206897;
211 211
 
212
-	if( function_exists('is_rtl') && is_rtl() ) {
213
-		$style = 'margin:10px 10px 10px 0; height='. $height .'px; width: '. $width .'px;';
212
+	if ( function_exists( 'is_rtl' ) && is_rtl() ) {
213
+		$style = 'margin:10px 10px 10px 0; height=' . $height . 'px; width: ' . $width . 'px;';
214 214
 		$css_class = is_string( $css_class ) ? $css_class : 'alignright';
215 215
 	} else {
216
-		$style = 'margin:10px 10px 10px 0; height='. $height .'px; width: '. $width .'px;';
216
+		$style = 'margin:10px 10px 10px 0; height=' . $height . 'px; width: ' . $width . 'px;';
217 217
 		$css_class = is_string( $css_class ) ? $css_class : 'alignleft';
218 218
 	}
219 219
 
220
-	return '<img src="'. esc_url( plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ) ) .'" class="'. gravityview_sanitize_html_class( $css_class ).'" height="'.intval( $height ).'" width="'.round( $width, 2 ).'" alt="The GravityView Astronaut Says:" style="'.$style.'" />';
220
+	return '<img src="' . esc_url( plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ) ) . '" class="' . gravityview_sanitize_html_class( $css_class ) . '" height="' . intval( $height ) . '" width="' . round( $width, 2 ) . '" alt="The GravityView Astronaut Says:" style="' . $style . '" />';
221 221
 }
222 222
 
223 223
 /**
@@ -241,9 +241,9 @@  discard block
 block discarded – undo
241 241
 function gravityview_number_format( $number, $decimals = '', $separator = true ) {
242 242
 	global $wp_locale;
243 243
 
244
-	if( '' === $decimals ) {
244
+	if ( '' === $decimals ) {
245 245
 
246
-		$decimal_point = isset( $wp_locale ) ? $wp_locale->number_format['decimal_point'] : '.';
246
+		$decimal_point = isset( $wp_locale ) ? $wp_locale->number_format[ 'decimal_point' ] : '.';
247 247
 
248 248
 		/**
249 249
 		 * Calculate the position of the decimal point in the number
@@ -276,7 +276,7 @@  discard block
 block discarded – undo
276 276
 	$parts = parse_url( $value );
277 277
 
278 278
 	// No domain? Strange...show the original text.
279
-	if( empty( $parts['host'] ) ) {
279
+	if ( empty( $parts[ 'host' ] ) ) {
280 280
 		return $value;
281 281
 	}
282 282
 
@@ -289,16 +289,16 @@  discard block
 block discarded – undo
289 289
 	 * @param boolean $enable Whether to strip the scheme. Return false to show scheme. (default: true)\n
290 290
 	 * If true: `http://example.com => example.com`
291 291
 	 */
292
-	if( false === apply_filters('gravityview_anchor_text_striphttp', true) ) {
292
+	if ( false === apply_filters( 'gravityview_anchor_text_striphttp', true ) ) {
293 293
 
294
-		if( isset( $parts['scheme'] ) ) {
295
-			$return .= $parts['scheme'];
294
+		if ( isset( $parts[ 'scheme' ] ) ) {
295
+			$return .= $parts[ 'scheme' ];
296 296
 		}
297 297
 
298 298
 	}
299 299
 
300 300
 	// The domain, which may contain a subdomain
301
-	$domain = $parts['host'];
301
+	$domain = $parts[ 'host' ];
302 302
 
303 303
 	/**
304 304
 	 * @filter `gravityview_anchor_text_stripwww` Strip www from the domain?
@@ -306,10 +306,10 @@  discard block
 block discarded – undo
306 306
 	 * @param boolean $enable Whether to strip www. Return false to show www. (default: true)\n
307 307
 	 * If true: `www.example.com => example.com`
308 308
 	 */
309
-	$strip_www = apply_filters('gravityview_anchor_text_stripwww', true );
309
+	$strip_www = apply_filters( 'gravityview_anchor_text_stripwww', true );
310 310
 
311
-	if( $strip_www ) {
312
-		$domain = str_replace('www.', '', $domain );
311
+	if ( $strip_www ) {
312
+		$domain = str_replace( 'www.', '', $domain );
313 313
 	}
314 314
 
315 315
 	/**
@@ -319,11 +319,11 @@  discard block
 block discarded – undo
319 319
 	 * If true: `http://demo.example.com => example.com` \n
320 320
 	 * If false: `http://demo.example.com => demo.example.com`
321 321
 	 */
322
-	$strip_subdomains = apply_filters('gravityview_anchor_text_nosubdomain', true);
322
+	$strip_subdomains = apply_filters( 'gravityview_anchor_text_nosubdomain', true );
323 323
 
324
-	if( $strip_subdomains ) {
324
+	if ( $strip_subdomains ) {
325 325
 
326
-		$domain = _gravityview_strip_subdomain( $parts['host'] );
326
+		$domain = _gravityview_strip_subdomain( $parts[ 'host' ] );
327 327
 
328 328
 	}
329 329
 
@@ -337,12 +337,12 @@  discard block
 block discarded – undo
337 337
 	 * If true: `http://example.com/sub/directory/page.html => example.com`  \n
338 338
 	 * If false: `http://example.com/sub/directory/page.html => example.com/sub/directory/page.html`
339 339
 	 */
340
-	$root_only = apply_filters('gravityview_anchor_text_rootonly', true);
340
+	$root_only = apply_filters( 'gravityview_anchor_text_rootonly', true );
341 341
 
342
-	if( empty( $root_only ) ) {
342
+	if ( empty( $root_only ) ) {
343 343
 
344
-		if( isset( $parts['path'] ) ) {
345
-			$return .= $parts['path'];
344
+		if ( isset( $parts[ 'path' ] ) ) {
345
+			$return .= $parts[ 'path' ];
346 346
 		}
347 347
 	}
348 348
 
@@ -352,12 +352,12 @@  discard block
 block discarded – undo
352 352
 	 * @param boolean $enable Whether to enable "root only". Return false to show full path. (default: true)\n
353 353
 	 * If true: `http://example.com/?query=example => example.com`
354 354
 	 */
355
-	$strip_query_string = apply_filters('gravityview_anchor_text_noquerystring', true );
355
+	$strip_query_string = apply_filters( 'gravityview_anchor_text_noquerystring', true );
356 356
 
357
-	if( empty( $strip_query_string ) ) {
357
+	if ( empty( $strip_query_string ) ) {
358 358
 
359
-		if( isset( $parts['query'] ) ) {
360
-			$return .= '?'.$parts['query'];
359
+		if ( isset( $parts[ 'query' ] ) ) {
360
+			$return .= '?' . $parts[ 'query' ];
361 361
 		}
362 362
 
363 363
 	}
@@ -374,8 +374,8 @@  discard block
 block discarded – undo
374 374
  */
375 375
 function _gravityview_strip_subdomain( $string_maybe_has_subdomain ) {
376 376
 
377
-	if( preg_match("/(?P<domain>[a-z0-9][a-z0-9\-]{1,63}\.(?:com\.|co\.|net\.|org\.|firm\.|me\.|school\.|law\.|gov\.|mod\.|msk\.|irkutsks\.|sa\.|act\.|police\.|plc\.|ac\.|tm\.|asso\.|biz\.|pro\.|cg\.|telememo\.)?[a-z\.]{2,6})$/i", $string_maybe_has_subdomain, $matches ) ) {
378
-		return $matches['domain'];
377
+	if ( preg_match( "/(?P<domain>[a-z0-9][a-z0-9\-]{1,63}\.(?:com\.|co\.|net\.|org\.|firm\.|me\.|school\.|law\.|gov\.|mod\.|msk\.|irkutsks\.|sa\.|act\.|police\.|plc\.|ac\.|tm\.|asso\.|biz\.|pro\.|cg\.|telememo\.)?[a-z\.]{2,6})$/i", $string_maybe_has_subdomain, $matches ) ) {
378
+		return $matches[ 'domain' ];
379 379
 	} else {
380 380
 		return $string_maybe_has_subdomain;
381 381
 	}
@@ -444,7 +444,7 @@  discard block
 block discarded – undo
444 444
 
445 445
 		if ( in_array( $value, array( 'yes', 'true' ), true ) ) {
446 446
 			$value = true;
447
-		} else if( in_array( $value, array( 'no', 'false' ), true ) ) {
447
+		} else if ( in_array( $value, array( 'no', 'false' ), true ) ) {
448 448
 			$value = false;
449 449
 		}
450 450
 	}
@@ -473,7 +473,7 @@  discard block
 block discarded – undo
473 473
  */
474 474
 function gv_maybe_json_decode( $value, $assoc = false, $depth = 512, $options = 0 ) {
475 475
 
476
-	if( ! is_string( $value ) ) {
476
+	if ( ! is_string( $value ) ) {
477 477
 		return $value;
478 478
 	}
479 479
 
@@ -484,12 +484,12 @@  discard block
 block discarded – undo
484 484
 	}
485 485
 
486 486
 	// There was a JSON error (PHP 5.3+)
487
-	if( function_exists('json_last_error') && JSON_ERROR_NONE !== json_last_error() ) {
487
+	if ( function_exists( 'json_last_error' ) && JSON_ERROR_NONE !== json_last_error() ) {
488 488
 		return $value;
489 489
 	}
490 490
 
491 491
 	// It wasn't JSON (PHP < 5.3 fallback)
492
-	if( is_null( $decoded ) ) {
492
+	if ( is_null( $decoded ) ) {
493 493
 		return $value;
494 494
 	}
495 495
 
@@ -556,7 +556,7 @@  discard block
 block discarded – undo
556 556
 
557 557
 	$exploded = explode( '.', "{$field_id}" );
558 558
 
559
-	return isset( $exploded[1] ) ? intval( $exploded[1] ) : false;
559
+	return isset( $exploded[ 1 ] ) ? intval( $exploded[ 1 ] ) : false;
560 560
 }
561 561
 
562 562
 /**
@@ -597,13 +597,13 @@  discard block
 block discarded – undo
597 597
 	 */
598 598
 	$args = apply_filters( 'gravityview_get_terms_choices_args', $args );
599 599
 
600
-	$terms = get_terms( $args['taxonomy'], $args );
600
+	$terms = get_terms( $args[ 'taxonomy' ], $args );
601 601
 
602 602
 	$choices = array();
603 603
 
604 604
 	if ( is_array( $terms ) ) {
605 605
 		foreach ( $terms as $term_id => $term_name ) {
606
-			$choices[] = array(
606
+			$choices[ ] = array(
607 607
 				'text'  => $term_name,
608 608
 				'value' => $term_id
609 609
 			);
@@ -627,21 +627,21 @@  discard block
 block discarded – undo
627 627
 function _gravityview_process_posted_fields() {
628 628
 	$fields = array();
629 629
 
630
-	if( !empty( $_POST['gv_fields'] ) ) {
631
-		if ( ! is_array( $_POST['gv_fields'] ) ) {
630
+	if ( ! empty( $_POST[ 'gv_fields' ] ) ) {
631
+		if ( ! is_array( $_POST[ 'gv_fields' ] ) ) {
632 632
 
633 633
 			// We are not using parse_str() due to max_input_vars limitation with large View configurations
634 634
 			$fields_holder = array();
635
-			GVCommon::gv_parse_str( stripslashes( $_POST['gv_fields'] ), $fields_holder );
635
+			GVCommon::gv_parse_str( stripslashes( $_POST[ 'gv_fields' ] ), $fields_holder );
636 636
 
637
-			if ( isset( $fields_holder['fields'] ) ) {
638
-				$fields = $fields_holder['fields'];
637
+			if ( isset( $fields_holder[ 'fields' ] ) ) {
638
+				$fields = $fields_holder[ 'fields' ];
639 639
 			} else {
640 640
 				gravityview()->log->error( 'No `fields` key was found after parsing $fields string', array( 'data' => $fields_holder ) );
641 641
 			}
642 642
 
643 643
 		} else {
644
-			$fields = $_POST['gv_fields'];
644
+			$fields = $_POST[ 'gv_fields' ];
645 645
 		}
646 646
 	}
647 647
 
@@ -672,7 +672,7 @@  discard block
 block discarded – undo
672 672
 		return false;
673 673
 	}
674 674
 
675
-	if( false !== strpos( strtolower( $value ), "relative:") ) {
675
+	if ( false !== strpos( strtolower( $value ), "relative:" ) ) {
676 676
 		$value = str_replace( 'relative:', '', $value );
677 677
 
678 678
 		$timestamp = strtotime( $value );
@@ -691,15 +691,15 @@  discard block
 block discarded – undo
691 691
 		return false;
692 692
 	}
693 693
 
694
-	$year  = (int) rgar( $parsed_date, 'year' );
695
-	$month = (int) rgar( $parsed_date, 'month' );
696
-	$day   = (int) rgar( $parsed_date, 'day' );
694
+	$year  = (int)rgar( $parsed_date, 'year' );
695
+	$month = (int)rgar( $parsed_date, 'month' );
696
+	$day   = (int)rgar( $parsed_date, 'day' );
697 697
 
698 698
 	// If the month is greater than 12, it's probably a day (in d/m/Y format). This may be why strtotime() failed.
699 699
 	// Let's correct this by swapping the day and month.
700 700
 	if ( ! checkdate( $month, $day, $year ) ) {
701
-		$day   = (int) rgar( $parsed_date, 'month' );
702
-		$month = (int) rgar( $parsed_date, 'day' );
701
+		$day   = (int)rgar( $parsed_date, 'month' );
702
+		$month = (int)rgar( $parsed_date, 'day' );
703 703
 	}
704 704
 
705 705
 	// Still not valid. Perhaps not a date.
Please login to merge, or discard this patch.