@@ -703,7 +703,7 @@ |
||
| 703 | 703 | 'not_owner_only' => 2, |
| 704 | 704 | 'not_admin_only' => 3, |
| 705 | 705 | ), |
| 706 | - function ($row) |
|
| 706 | + function($row) |
|
| 707 | 707 | { |
| 708 | 708 | return array( |
| 709 | 709 | 'colname' => strtr($row['col_name'], array('|' => '', ';' => '')), |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | 'attachments' => $attachments, |
| 81 | 81 | 'attachment_type' => 0, |
| 82 | 82 | ), |
| 83 | - function ($row) |
|
| 83 | + function($row) |
|
| 84 | 84 | { |
| 85 | 85 | logAction( |
| 86 | 86 | 'approve_attach', |
@@ -252,7 +252,7 @@ discard block |
||
| 252 | 252 | 'attachments' => $do_logging, |
| 253 | 253 | 'attachment_type' => 0, |
| 254 | 254 | ), |
| 255 | - function ($row) |
|
| 255 | + function($row) |
|
| 256 | 256 | { |
| 257 | 257 | logAction( |
| 258 | 258 | 'remove_attach', |
@@ -643,7 +643,7 @@ discard block |
||
| 643 | 643 | 'no_thumb' => 0, |
| 644 | 644 | 'substep' => $start, |
| 645 | 645 | ), |
| 646 | - function ($row) |
|
| 646 | + function($row) |
|
| 647 | 647 | { |
| 648 | 648 | return $row['id_attach']; |
| 649 | 649 | } |
@@ -834,7 +834,7 @@ discard block |
||
| 834 | 834 | 'no_msg' => 0, |
| 835 | 835 | 'substep' => $start, |
| 836 | 836 | ), |
| 837 | - function ($row) use ($fix_errors, $to_fix, $modSettings) |
|
| 837 | + function($row) use ($fix_errors, $to_fix, $modSettings) |
|
| 838 | 838 | { |
| 839 | 839 | // If we are repairing remove the file from disk now. |
| 840 | 840 | if ($fix_errors && in_array('avatar_no_member', $to_fix)) |
@@ -896,7 +896,7 @@ discard block |
||
| 896 | 896 | 'no_msg' => 0, |
| 897 | 897 | 'substep' => $start, |
| 898 | 898 | ), |
| 899 | - function ($row) use ($fix_errors, $to_fix) |
|
| 899 | + function($row) use ($fix_errors, $to_fix) |
|
| 900 | 900 | { |
| 901 | 901 | // If we are repairing remove the file from disk now. |
| 902 | 902 | if ($fix_errors && in_array('attachment_no_msg', $to_fix)) |
@@ -999,7 +999,7 @@ discard block |
||
| 999 | 999 | 'not_approved' => 0, |
| 1000 | 1000 | 'attachment_type' => 0, |
| 1001 | 1001 | ), |
| 1002 | - function ($row) |
|
| 1002 | + function($row) |
|
| 1003 | 1003 | { |
| 1004 | 1004 | return $row['id_attach']; |
| 1005 | 1005 | } |
@@ -1107,7 +1107,7 @@ discard block |
||
| 1107 | 1107 | 'items_per_page' => $items_per_page, |
| 1108 | 1108 | 'approve_query' => $approve_query, |
| 1109 | 1109 | ), |
| 1110 | - function ($row) use ($scripturl, $bbc_parser) |
|
| 1110 | + function($row) use ($scripturl, $bbc_parser) |
|
| 1111 | 1111 | { |
| 1112 | 1112 | return array( |
| 1113 | 1113 | 'id' => $row['id_attach'], |
@@ -1675,7 +1675,7 @@ discard block |
||
| 1675 | 1675 | 'is_approved' => 0, |
| 1676 | 1676 | 'attachment_type' => 0, |
| 1677 | 1677 | ), |
| 1678 | - function ($row) |
|
| 1678 | + function($row) |
|
| 1679 | 1679 | { |
| 1680 | 1680 | return $row['id_attach']; |
| 1681 | 1681 | } |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | 'start' => $start, |
| 139 | 139 | 'increment' => $increment - 1, |
| 140 | 140 | ), |
| 141 | - function ($row) |
|
| 141 | + function($row) |
|
| 142 | 142 | { |
| 143 | 143 | return $row['id_msg']; |
| 144 | 144 | } |
@@ -168,7 +168,7 @@ discard block |
||
| 168 | 168 | array( |
| 169 | 169 | 'messages' => $msg, |
| 170 | 170 | ), |
| 171 | - function ($row) use ($scripturl) |
|
| 171 | + function($row) use ($scripturl) |
|
| 172 | 172 | { |
| 173 | 173 | return '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['id_msg'] . '#msg' . $row['id_msg'] . '">' . $row['subject'] . '</a>'; |
| 174 | 174 | } |
@@ -263,7 +263,7 @@ discard block |
||
| 263 | 263 | 'start' => $start, |
| 264 | 264 | 'max_id' => $start + $increment, |
| 265 | 265 | ), |
| 266 | - function ($row) |
|
| 266 | + function($row) |
|
| 267 | 267 | { |
| 268 | 268 | setTopicAttribute($row['id_topic'], array('num_replies' => $row['real_num_replies'])); |
| 269 | 269 | } |
@@ -296,7 +296,7 @@ discard block |
||
| 296 | 296 | 'start' => $start, |
| 297 | 297 | 'max_id' => $start + $increment, |
| 298 | 298 | ), |
| 299 | - function ($row) |
|
| 299 | + function($row) |
|
| 300 | 300 | { |
| 301 | 301 | setTopicAttribute($row['id_topic'], array('unapproved_posts' => $row['real_unapproved_posts'])); |
| 302 | 302 | } |
@@ -488,7 +488,7 @@ discard block |
||
| 488 | 488 | array( |
| 489 | 489 | 'is_not_deleted' => 0, |
| 490 | 490 | ), |
| 491 | - function ($row) |
|
| 491 | + function($row) |
|
| 492 | 492 | { |
| 493 | 493 | updateMemberData($row['id_member'], array('personal_messages' => $row['real_num'])); |
| 494 | 494 | } |
@@ -505,7 +505,7 @@ discard block |
||
| 505 | 505 | 'is_not_deleted' => 0, |
| 506 | 506 | 'is_not_read' => 0, |
| 507 | 507 | ), |
| 508 | - function ($row) |
|
| 508 | + function($row) |
|
| 509 | 509 | { |
| 510 | 510 | updateMemberData($row['id_member'], array('unread_messages' => $row['real_num'])); |
| 511 | 511 | } |
@@ -667,7 +667,7 @@ discard block |
||
| 667 | 667 | array( |
| 668 | 668 | 'id_board' => $id_board, |
| 669 | 669 | ), |
| 670 | - function ($row) |
|
| 670 | + function($row) |
|
| 671 | 671 | { |
| 672 | 672 | return $row['id_topic']; |
| 673 | 673 | } |
@@ -789,7 +789,7 @@ discard block |
||
| 789 | 789 | array( |
| 790 | 790 | 'zero' => 0, |
| 791 | 791 | ), |
| 792 | - function ($row) |
|
| 792 | + function($row) |
|
| 793 | 793 | { |
| 794 | 794 | // Set the post count to zero for any delinquents we may have found |
| 795 | 795 | return $row['id_member']; |
@@ -174,7 +174,7 @@ |
||
| 174 | 174 | { |
| 175 | 175 | // Now loop through the remaining (database-based) settings. |
| 176 | 176 | $this->configVars = array_map( |
| 177 | - function ($configVar) |
|
| 177 | + function($configVar) |
|
| 178 | 178 | { |
| 179 | 179 | // We just saved the file-based settings, so skip their definitions. |
| 180 | 180 | if (!is_array($configVar) || $configVar[2] === 'file') |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | global $context; |
| 104 | 104 | |
| 105 | 105 | $inlinePermissions = array_filter($this->configVars, |
| 106 | - function ($configVar) |
|
| 106 | + function($configVar) |
|
| 107 | 107 | { |
| 108 | 108 | return isset($configVar[0]) && $configVar[0] === 'permissions'; |
| 109 | 109 | } |
@@ -314,7 +314,7 @@ discard block |
||
| 314 | 314 | global $helptxt, $modSettings; |
| 315 | 315 | |
| 316 | 316 | $bbcChoice = array_filter($this->configVars, |
| 317 | - function ($configVar) |
|
| 317 | + function($configVar) |
|
| 318 | 318 | { |
| 319 | 319 | return isset($configVar[0]) && $configVar[0] === 'bbc'; |
| 320 | 320 | } |
@@ -62,7 +62,7 @@ |
||
| 62 | 62 | |
| 63 | 63 | // Load the permission list |
| 64 | 64 | $this->permissionList = array_map( |
| 65 | - function ($permission) |
|
| 65 | + function($permission) |
|
| 66 | 66 | { |
| 67 | 67 | return $permission[1]; |
| 68 | 68 | }, $this->permissions |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | var $portable_hashes; |
| 32 | 32 | var $random_state; |
| 33 | 33 | |
| 34 | - public function __construct( $iteration_count_log2, $portable_hashes ) |
|
| 34 | + public function __construct($iteration_count_log2, $portable_hashes) |
|
| 35 | 35 | { |
| 36 | 36 | $this->itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'; |
| 37 | 37 | |
@@ -218,7 +218,7 @@ discard block |
||
| 218 | 218 | |
| 219 | 219 | public function HashPassword($password) |
| 220 | 220 | { |
| 221 | - if ( strlen( $password ) > 4096 ) |
|
| 221 | + if (strlen($password) > 4096) |
|
| 222 | 222 | return '*'; |
| 223 | 223 | |
| 224 | 224 | $random = ''; |
@@ -256,7 +256,7 @@ discard block |
||
| 256 | 256 | |
| 257 | 257 | public function CheckPassword($password, $stored_hash) |
| 258 | 258 | { |
| 259 | - if ( strlen( $password ) > 4096 ) |
|
| 259 | + if (strlen($password) > 4096) |
|
| 260 | 260 | return false; |
| 261 | 261 | |
| 262 | 262 | $hash = $this->crypt_private($password, $stored_hash); |
@@ -75,8 +75,8 @@ |
||
| 75 | 75 | // may be blocked again in the future) |
| 76 | 76 | if ($settings['strict'] && |
| 77 | 77 | array_key_exists('via', $package['headers']) && |
| 78 | - strpos($package['headers']['via'],'Clearswift') === FALSE && |
|
| 79 | - strpos($ua,'CoralWebPrx') === FALSE) { |
|
| 78 | + strpos($package['headers']['via'], 'Clearswift') === FALSE && |
|
| 79 | + strpos($ua, 'CoralWebPrx') === FALSE) { |
|
| 80 | 80 | return "9c9e4979"; |
| 81 | 81 | } |
| 82 | 82 | |
@@ -6,57 +6,57 @@ |
||
| 6 | 6 | |
| 7 | 7 | function bb2_google($package) |
| 8 | 8 | { |
| 9 | - if (@is_ipv6($package['ip'])) return false; # TODO |
|
| 9 | + if (@is_ipv6($package['ip'])) return false; # TODO |
|
| 10 | 10 | if (match_cidr($package['ip'], array("66.249.64.0/19", "64.233.160.0/19", "72.14.192.0/18", "203.208.32.0/19", "74.125.0.0/16", "216.239.32.0/19", "209.85.128.0/17")) === FALSE) { |
| 11 | - return false; # Soft fail, must pass other screening |
|
| 11 | + return false; # Soft fail, must pass other screening |
|
| 12 | 12 | #return "f1182195"; # Hard fail |
| 13 | 13 | } |
| 14 | 14 | # Disabled due to http://bugs.php.net/bug.php?id=53092 |
| 15 | 15 | # if (!bb2_roundtripdns($package['ip'], "googlebot.com")) { |
| 16 | 16 | # return "f1182195"; |
| 17 | 17 | # } |
| 18 | - return 1; # Real Googlebot; bypass all other checks |
|
| 18 | + return 1; # Real Googlebot; bypass all other checks |
|
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | // Analyze user agents claiming to be msnbot |
| 22 | 22 | |
| 23 | 23 | function bb2_msnbot($package) |
| 24 | 24 | { |
| 25 | - if (@is_ipv6($package['ip'])) return false; # TODO |
|
| 25 | + if (@is_ipv6($package['ip'])) return false; # TODO |
|
| 26 | 26 | if (match_cidr($package['ip'], array("207.46.0.0/16", "65.52.0.0/14", "207.68.128.0/18", "207.68.192.0/20", "64.4.0.0/18", "157.54.0.0/15", "157.60.0.0/16", "157.56.0.0/14", "131.253.21.0/24", "131.253.22.0/23", "131.253.24.0/21", "131.253.32.0/20", "40.76.0.0/14")) === FALSE) { |
| 27 | - return false; # Soft fail, must pass other screening |
|
| 27 | + return false; # Soft fail, must pass other screening |
|
| 28 | 28 | #return "e4de0453"; # Hard fail |
| 29 | 29 | } |
| 30 | 30 | # Disabled due to http://bugs.php.net/bug.php?id=53092 |
| 31 | 31 | # if (!bb2_roundtripdns($package['ip'], "msn.com")) { |
| 32 | 32 | # return "e4de0453"; |
| 33 | 33 | # } |
| 34 | - return 1; # Real msnbot; bypass all other checks |
|
| 34 | + return 1; # Real msnbot; bypass all other checks |
|
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | // Analyze user agents claiming to be Yahoo! |
| 38 | 38 | |
| 39 | 39 | function bb2_yahoo($package) |
| 40 | 40 | { |
| 41 | - if (@is_ipv6($package['ip'])) return false; # TODO |
|
| 41 | + if (@is_ipv6($package['ip'])) return false; # TODO |
|
| 42 | 42 | if (match_cidr($package['ip'], array("202.160.176.0/20", "67.195.0.0/16", "203.209.252.0/24", "72.30.0.0/16", "98.136.0.0/14", "74.6.0.0/16")) === FALSE) { |
| 43 | - return false; # Soft fail, must pass other screening |
|
| 43 | + return false; # Soft fail, must pass other screening |
|
| 44 | 44 | #return '71436a15'; # Hard fail |
| 45 | 45 | } |
| 46 | 46 | # Disabled due to http://bugs.php.net/bug.php?id=53092 |
| 47 | 47 | # if (!bb2_roundtripdns($package['ip'], "crawl.yahoo.net")) { |
| 48 | 48 | # return "71436a15"; |
| 49 | 49 | # } |
| 50 | - return 1; # Real Yahoo bot; bypass all other checks |
|
| 50 | + return 1; # Real Yahoo bot; bypass all other checks |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | // Analyze user agents claiming to be Baidu |
| 54 | 54 | |
| 55 | 55 | function bb2_baidu($package) |
| 56 | 56 | { |
| 57 | - if (@is_ipv6($package['ip'])) return false; # TODO |
|
| 57 | + if (@is_ipv6($package['ip'])) return false; # TODO |
|
| 58 | 58 | if (match_cidr($package['ip'], array("119.63.192.0/21", "123.125.71.0/24", "180.76.0.0/16", "220.181.0.0/16")) === FALSE) { |
| 59 | - return false; # Soft fail, must pass other screening |
|
| 59 | + return false; # Soft fail, must pass other screening |
|
| 60 | 60 | } |
| 61 | - return 1; # Real Baidu bot; bypass all other checks |
|
| 61 | + return 1; # Real Baidu bot; bypass all other checks |
|
| 62 | 62 | } |