From f7cc55b984d3490c67f6269af944546097e0382b Mon Sep 17 00:00:00 2001
From: Yuriy Pikhtarev <iglix@me.com>
Date: Wed, 24 May 2017 01:23:28 +0300
Subject: [PATCH] Bugsnag integration and some bugfixes in for cycles.

---
 admin/admin_attach_cp.php      |  4 ++--
 admin/admin_extensions.php     |  2 +-
 admin/admin_forumauth.php      |  8 ++++----
 admin/admin_forumauth_list.php | 16 ++++++++--------
 admin/admin_smilies.php        |  2 +-
 admin/admin_user_ban.php       |  8 ++++----
 ajax.php                       |  4 ++--
 common.php                     | 12 +++++++++---
 composer.json                  |  1 +
 library/config.php             |  7 +++++++
 10 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/admin/admin_attach_cp.php b/admin/admin_attach_cp.php
index 6e32a7d17..8be0ef95f 100644
--- a/admin/admin_attach_cp.php
+++ b/admin/admin_attach_cp.php
@@ -398,7 +398,7 @@ if ($view === 'attachments') {
         for ($i = 0, $iMax = count($attachments); $i < $iMax; $i++) {
             $delete_box = '<input type="checkbox" name="delete_id_list[]" value="' . (int)$attachments[$i]['attach_id'] . '" />';
 
-            for ($j = 0, $iMax = count($delete_id_list); $j < $iMax; $j++) {
+            for ($j = 0, $jMax = count($delete_id_list); $j < $jMax; $j++) {
                 if ($delete_id_list[$j] == $attachments[$i]['attach_id']) {
                     $delete_box = '<input type="checkbox" name="delete_id_list[]" value="' . (int)$attachments[$i]['attach_id'] . '" checked="checked" />';
                     break;
@@ -409,7 +409,7 @@ if ($view === 'attachments') {
 
             // Is the Attachment assigned to more than one post ?
             // If it's not assigned to any post, it's an private message thingy. ;)
-            $post_titles = array();
+            $post_titles = [];
 
             $sql = "SELECT *
 			FROM " . BB_ATTACHMENTS . "
diff --git a/admin/admin_extensions.php b/admin/admin_extensions.php
index cb5920f87..b9cea0fa1 100644
--- a/admin/admin_extensions.php
+++ b/admin/admin_extensions.php
@@ -252,7 +252,7 @@ if ($submit && $mode == 'groups') {
     $allowed_list = array();
 
     for ($i = 0, $iMax = count($group_allowed_list); $i < $iMax; $i++) {
-        for ($j = 0, $jMax = count($group_change_list); $j < $iMax; $j++) {
+        for ($j = 0, $jMax = count($group_change_list); $j < $jMax; $j++) {
             if ($group_allowed_list[$i] == $group_change_list[$j]) {
                 $allowed_list[$j] = 1;
             }
diff --git a/admin/admin_forumauth.php b/admin/admin_forumauth.php
index 377b9f3a5..08f8771d7 100644
--- a/admin/admin_forumauth.php
+++ b/admin/admin_forumauth.php
@@ -163,7 +163,7 @@ if (empty($forum_id)) {
     reset($simple_auth_ary);
     foreach ($simple_auth_ary as $key => $auth_levels) {
         $matched = 1;
-        for ($k = 0, $kMax = count($auth_levels); $k < $iMax; $k++) {
+        for ($k = 0, $kMax = count($auth_levels); $k < $kMax; $k++) {
             $matched_type = $key;
 
             if ($forum_rows[0][$forum_auth_fields[$k]] != $auth_levels[$k]) {
@@ -189,7 +189,7 @@ if (empty($forum_id)) {
     if (empty($adv)) {
         $simple_auth = '<select name="simpleauth">';
 
-        for ($j = 0, $jMax = count($simple_auth_types); $j < $iMax; $j++) {
+        for ($j = 0, $jMax = count($simple_auth_types); $j < $jMax; $j++) {
             $selected = ($matched_type == $j) ? ' selected="selected"' : '';
             $simple_auth .= '<option value="' . $j . '"' . $selected . '>' . $simple_auth_types[$j] . '</option>';
         }
@@ -207,10 +207,10 @@ if (empty($forum_id)) {
         // Output values of individual
         // fields
         //
-        for ($j = 0, $jMax = count($forum_auth_fields); $j < $iMax; $j++) {
+        for ($j = 0, $jMax = count($forum_auth_fields); $j < $jMax; $j++) {
             $custom_auth[$j] = '&nbsp;<select name="' . $forum_auth_fields[$j] . '">';
 
-            for ($k = 0, $kMax = count($forum_auth_levels); $k < $iMax; $k++) {
+            for ($k = 0, $kMax = count($forum_auth_levels); $k < $kMax; $k++) {
                 $selected = ($forum_rows[0][$forum_auth_fields[$j]] == $forum_auth_const[$k]) ? ' selected="selected"' : '';
                 $custom_auth[$j] .= '<option value="' . $forum_auth_const[$k] . '"' . $selected . '>' . $lang['FORUM_' . strtoupper($forum_auth_levels[$k])] . '</OPTION>';
             }
diff --git a/admin/admin_forumauth_list.php b/admin/admin_forumauth_list.php
index a00048d12..fac87ab28 100644
--- a/admin/admin_forumauth_list.php
+++ b/admin/admin_forumauth_list.php
@@ -224,7 +224,7 @@ if (empty($forum_id) && empty($cat_id)) {
                 'CAT_URL' => 'admin_forumauth_list.php' . '?' . POST_CAT_URL . '=' . $category_rows[$i]['cat_id'])
         );
 
-        for ($j = 0, $jMax = count($forum_rows); $j < $iMax; $j++) {
+        for ($j = 0, $jMax = count($forum_rows); $j < $jMax; $j++) {
             if ($cat_id == $forum_rows[$j]['cat_id']) {
                 $template->assign_block_vars('cat_row.forum_row', array(
                     'ROW_CLASS' => !($j % 2) ? 'row4' : 'row5',
@@ -232,9 +232,9 @@ if (empty($forum_id) && empty($cat_id)) {
                     'IS_SUBFORUM' => $forum_rows[$j]['forum_parent'],
                 ));
 
-                for ($k = 0, $kMax = count($forum_auth_fields); $k < $iMax; $k++) {
+                for ($k = 0, $kMax = count($forum_auth_fields); $k < $kMax; $k++) {
                     $item_auth_value = $forum_rows[$j][$forum_auth_fields[$k]];
-                    for ($l = 0, $lMax = count($forum_auth_const); $l < $iMax; $l++) {
+                    for ($l = 0, $lMax = count($forum_auth_const); $l < $lMax; $l++) {
                         if ($item_auth_value == $forum_auth_const[$l]) {
                             $item_auth_level = $forum_auth_levels[$l];
                             break;
@@ -283,7 +283,7 @@ if (empty($forum_id) && empty($cat_id)) {
             'CAT_URL' => 'admin_forumauth_list.php?' . POST_CAT_URL . '=' . $cat_id)
     );
 
-    for ($j = 0, $jMax = count($forum_rows); $j < $iMax; $j++) {
+    for ($j = 0, $jMax = count($forum_rows); $j < $jMax; $j++) {
         if ($cat_id == $forum_rows[$j]['cat_id']) {
             $template->assign_block_vars('cat_row.forum_row', array(
                 'ROW_CLASS' => !($j % 2) ? 'row4' : 'row5',
@@ -291,9 +291,9 @@ if (empty($forum_id) && empty($cat_id)) {
                 'IS_SUBFORUM' => $forum_rows[$j]['forum_parent'],
             ));
 
-            for ($k = 0, $kMax = count($forum_auth_fields); $k < $iMax; $k++) {
+            for ($k = 0, $kMax = count($forum_auth_fields); $k < $kMax; $k++) {
                 $item_auth_value = $forum_rows[$j][$forum_auth_fields[$k]];
-                for ($l = 0, $lMax = count($forum_auth_const); $l < $iMax; $l++) {
+                for ($l = 0, $lMax = count($forum_auth_const); $l < $lMax; $l++) {
                     if ($item_auth_value == $forum_auth_const[$l]) {
                         $item_auth_level = $forum_auth_levels[$l];
                         break;
@@ -311,10 +311,10 @@ if (empty($forum_id) && empty($cat_id)) {
     // next generate the information to allow the permissions to be changed
     // note: we always read from the first forum in the category
     //
-    for ($j = 0, $jMax = count($forum_auth_fields); $j < $iMax; $j++) {
+    for ($j = 0, $jMax = count($forum_auth_fields); $j < $jMax; $j++) {
         $custom_auth[$j] = '<select name="' . $forum_auth_fields[$j] . '">';
 
-        for ($k = 0, $kMax = count($forum_auth_levels); $k < $iMax; $k++) {
+        for ($k = 0, $kMax = count($forum_auth_levels); $k < $kMax; $k++) {
             $selected = (!empty($forum_rows) && $forum_rows[0][$forum_auth_fields[$j]] == $forum_auth_const[$k]) ? ' selected="selected"' : '';
             $custom_auth[$j] .= '<option value="' . $forum_auth_const[$k] . '"' . $selected . '>' . $lang['FORUM_' . $forum_auth_levels[$k]] . '</option>';
         }
diff --git a/admin/admin_smilies.php b/admin/admin_smilies.php
index 66b3b1d36..e7012c056 100644
--- a/admin/admin_smilies.php
+++ b/admin/admin_smilies.php
@@ -95,7 +95,7 @@ if (isset($_GET['import_pack']) || isset($_POST['import_pack'])) {
         for ($i = 0, $iMax = count($fcontents); $i < $iMax; $i++) {
             $smile_data = explode($delimeter, trim(addslashes($fcontents[$i])));
 
-            for ($j = 2, $jMax = count($smile_data); $j < $iMax; $j++) {
+            for ($j = 2, $jMax = count($smile_data); $j < $jMax; $j++) {
                 // Replace > and < with the proper html_entities for matching
                 $smile_data[$j] = str_replace('<', '&lt;', $smile_data[$j]);
                 $smile_data[$j] = str_replace('>', '&gt;', $smile_data[$j]);
diff --git a/admin/admin_user_ban.php b/admin/admin_user_ban.php
index ef195c01f..96ac84fa7 100644
--- a/admin/admin_user_ban.php
+++ b/admin/admin_user_ban.php
@@ -100,7 +100,7 @@ if (isset($_POST['submit'])) {
             } elseif (preg_match('/^([\w\-_]\.?){2,}$/is', trim($ip_list_temp[$i]))) {
                 $ip = gethostbynamel(trim($ip_list_temp[$i]));
 
-                for ($j = 0, $jMax = count($ip); $j < $iMax; $j++) {
+                for ($j = 0, $jMax = count($ip); $j < $jMax; $j++) {
                     if (!empty($ip[$j])) {
                         $ip_list[] = encode_ip($ip[$j]);
                     }
@@ -133,7 +133,7 @@ if (isset($_POST['submit'])) {
     $kill_session_sql = '';
     for ($i = 0, $iMax = count($user_list); $i < $iMax; $i++) {
         $in_banlist = false;
-        for ($j = 0, $jMax = count($current_banlist); $j < $iMax; $j++) {
+        for ($j = 0, $jMax = count($current_banlist); $j < $jMax; $j++) {
             if ($user_list[$i] == $current_banlist[$j]['ban_userid']) {
                 $in_banlist = true;
             }
@@ -151,7 +151,7 @@ if (isset($_POST['submit'])) {
 
     for ($i = 0, $iMax = count($ip_list); $i < $iMax; $i++) {
         $in_banlist = false;
-        for ($j = 0, $jMax = count($current_banlist); $j < $iMax; $j++) {
+        for ($j = 0, $jMax = count($current_banlist); $j < $jMax; $j++) {
             if ($ip_list[$i] == $current_banlist[$j]['ban_ip']) {
                 $in_banlist = true;
             }
@@ -183,7 +183,7 @@ if (isset($_POST['submit'])) {
 
     for ($i = 0, $iMax = count($email_list); $i < $iMax; $i++) {
         $in_banlist = false;
-        for ($j = 0, $jMax = count($current_banlist); $j < $iMax; $j++) {
+        for ($j = 0, $jMax = count($current_banlist); $j < $jMax; $j++) {
             if ($email_list[$i] == $current_banlist[$j]['ban_email']) {
                 $in_banlist = true;
             }
diff --git a/ajax.php b/ajax.php
index e17753c90..fb2f9794c 100644
--- a/ajax.php
+++ b/ajax.php
@@ -26,10 +26,10 @@
 define('BB_SCRIPT', 'ajax');
 define('IN_AJAX', true);
 
-$ajax = new TorrentPier\Legacy\Ajax();
-
 require __DIR__ . '/common.php';
 
+$ajax = new TorrentPier\Legacy\Ajax();
+
 $ajax->init();
 
 // Init userdata
diff --git a/common.php b/common.php
index e801cc30d..ab486e922 100644
--- a/common.php
+++ b/common.php
@@ -57,14 +57,20 @@ header('X-Frame-Options: SAMEORIGIN');
 if (!file_exists(__DIR__ . '/vendor/autoload.php')) {
     die('Please <a href="https://getcomposer.org/download/" target="_blank" rel="noreferrer" style="color:#0a25bb;">install composer</a> and run <code style="background:#222;color:#00e01f;padding:2px 6px;border-radius:3px;">composer install</code>');
 }
-
 require_once __DIR__ . '/vendor/autoload.php';
 
 // Get initial config
 require __DIR__ . '/library/config.php';
 
-$server_protocol = ($bb_cfg['cookie_secure']) ? 'https://' : 'http://';
-$server_port = (in_array($bb_cfg['server_port'], array(80, 443))) ? '' : ':' . $bb_cfg['server_port'];
+// Bugsnag error reporting
+if ($bb_cfg['bugsnag']['enabled'] && !empty($bb_cfg['bugsnag']['api_key'])) {
+    /** @var Bugsnag\Handler $bugsnag */
+    $bugsnag = Bugsnag\Client::make($bb_cfg['bugsnag']['api_key']);
+    Bugsnag\Handler::register($bugsnag);
+}
+
+$server_protocol = $bb_cfg['cookie_secure'] ? 'https://' : 'http://';
+$server_port = in_array($bb_cfg['server_port'], array(80, 443), true) ? '' : ':' . $bb_cfg['server_port'];
 define('FORUM_PATH', $bb_cfg['script_path']);
 define('FULL_URL', $server_protocol . $bb_cfg['server_name'] . $server_port . $bb_cfg['script_path']);
 unset($server_protocol, $server_port);
diff --git a/composer.json b/composer.json
index d2a3581fb..a7a350d45 100644
--- a/composer.json
+++ b/composer.json
@@ -42,6 +42,7 @@
   },
   "require": {
     "php": "^5.3 || ^7.0",
+    "bugsnag/bugsnag": "^3.0",
     "gigablah/sphinxphp": "^2.0",
     "google/recaptcha": "^1.0",
     "roave/security-advisories": "dev-master",
diff --git a/library/config.php b/library/config.php
index b72436cf6..360f18b7e 100644
--- a/library/config.php
+++ b/library/config.php
@@ -55,6 +55,7 @@
  * Registration
  * Email
  * Debug
+ * Bugsnag error reporting
  * Special users (dbg_users, unlimited_users, super_admins)
  * Log options
  * Error reporting
@@ -417,6 +418,12 @@ define('SQL_LOG_SLOW_QUERIES', true);     // log sql slow queries
 define('SQL_SLOW_QUERY_TIME', 10);       // slow query in seconds
 define('SQL_PREPEND_SRC_COMM', false);    // prepend source file comment to sql query
 
+// Bugsnag error reporting
+$bb_cfg['bugsnag'] = [
+    'enabled' => false,
+    'api_key' => '',
+];
+
 // Special users
 $bb_cfg['dbg_users'] = array(
 #	user_id => 'name',