Merge pull request #587 from PennyDreadfulMTG/dependabot/composer/sen…

…try/sentry-4.3.1 Bump sentry/sentry from 4.3.0 to 4.3.1
PennyDreadfulMTG · Dec 25, 2023 · 5acbf67 · 5acbf67
2 parents 0de46ff + 0d817a5
commit 5acbf67
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 18 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/gatherling/admin/updateDecks.php b/gatherling/admin/updateDecks.php
@@ -38,7 +38,7 @@
                 $stmt->execute() or exit($stmt->error);
                 echo '<a href="deck.php?mode=view&id='.$deck->id.'">'.$deck->name.'</a> Deck ID: '.$deck->id.' Sucessfully updated<br />';
                 $successUpdatedDecks++;
-                //if ($decksChecked > 10) { die; }
+            //if ($decksChecked > 10) { die; }
             } else {
                 echo  $deck->id.' Has no data in entries, missing playername, no player association. Deck will be deleted<br />';
                 $failedUpdatedDecks++;

diff --git a/gatherling/authdebug.php b/gatherling/authdebug.php
@@ -24,7 +24,7 @@
 } elseif (!isset($_GET['code'])) {
     send_to_discord();
 
-    // Check given state against previously stored one to mitigate CSRF attack
+// Check given state against previously stored one to mitigate CSRF attack
 } elseif (empty($_GET['state']) || ($_GET['state'] !== $_SESSION['oauth2state'])) {
     unset($_SESSION['oauth2state']);
     exit('Invalid state');

diff --git a/gatherling/models/Format.php b/gatherling/models/Format.php
@@ -988,8 +988,8 @@ public function getTribe($deckID)
             asort($tribesTied); // sorts tribe size by value from low to high for tie breaker
             reset($tribesTied);
             $underdogKey = key($tribesTied);
-            // get first key, which should be lowest from sort
-            // Smallest Tribe is then selected
+        // get first key, which should be lowest from sort
+        // Smallest Tribe is then selected
         } else {
             reset($subTypeCount);
             $underdogKey = key($subTypeCount); // get first key, which should highest from sort
@@ -1080,8 +1080,8 @@ public function getTribe($deckID)
             asort($tribesTied); // sorts tribe size by value from low to high for tie breaker
             reset($tribesTied);
             $tribeKey = key($tribesTied);
-            // get first key, which should be lowest from sort
-            // Smallest Tribe is then selected
+        // get first key, which should be lowest from sort
+        // Smallest Tribe is then selected
         } else {
             reset($subTypeCount);
             $tribeKey = key($subTypeCount); // get first key, which should highest from sort

diff --git a/gatherling/models/Pagination.php b/gatherling/models/Pagination.php
@@ -536,7 +536,7 @@ public function render($return_output = false)
                 $output .= $this->_show_next().$this->_show_pages().$this->_show_previous();
             }
 
-            // if we're showing records in natural order
+        // if we're showing records in natural order
         } else {
             // if "next page" and "previous page" links are to be shown to the left of the links to individual pages
             if ($this->_properties['navigation_position'] == 'left') {
@@ -721,8 +721,8 @@ private function _build_uri($page)
                     $this->_properties['base_url']
                 ));
 
-                // if the current page is not yet in the URL, set it, unless we're on the first page
-                // case in which we don't set it in order to avoid duplicate content
+            // if the current page is not yet in the URL, set it, unless we're on the first page
+            // case in which we don't set it in order to avoid duplicate content
             } else {
                 $url = rtrim($this->_properties['base_url'], '/').'/'.($this->_properties['variable_name'].$page);
             }
@@ -744,7 +744,7 @@ private function _build_uri($page)
             // return the built string also appending the query string, if any
             return $url.($query != '' ? '?'.$query : '');
 
-            // if page propagation is to be done through GET
+        // if page propagation is to be done through GET
         } else {
             // if values in the query string - other than those set through base_url() - are not to be preserved
             // preserve only those set initially
@@ -834,7 +834,7 @@ private function _show_pages()
                     '</a></li>';
             }
 
-            // if the total number of pages is greater than the number of selectable pages
+        // if the total number of pages is greater than the number of selectable pages
         } else {
             // start with a link to the first or last page, depending if we're displaying links in reverse order or not
             $output .= '<li><a href="'.$this->_build_uri($this->_properties['reverse'] ? $this->_properties['total_pages'] : 1).'" '.

diff --git a/gatherling/models/Player.php b/gatherling/models/Player.php
@@ -128,7 +128,7 @@ public static function getClientIPAddress()
         // Test if it is a shared client
         if (!empty($_SERVER['HTTP_CLIENT_IP'])) {
             $ip = $_SERVER['HTTP_CLIENT_IP'];
-            //Is it a proxy address
+        //Is it a proxy address
         } elseif (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
             $ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
         } else {