Merge pull request #10819 from MrPetovan/task/refactor-notifications

[friendica.git] / src / Core / System.php

diff --git a/src/Core/System.php b/src/Core/System.php
index 8b2c2d500516326108b5c2d61527be6e0ad272a1..c61225e482e92b70a54f2e1b644f38d12a57ef27 100644 (file)
--- a/src/Core/System.php
+++ b/src/Core/System.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -33,16 +33,17 @@ class System
        /**
         * Returns a string with a callstack. Can be used for logging.
         *
-        * @param integer $depth optional, default 4
+        * @param integer $depth  How many calls to include in the stacks after filtering
+        * @param int     $offset How many calls to shave off the top of the stack, for example if
+        *                        this is called from a centralized method that isn't relevant to the callstack
         * @return string
         */
-       public static function callstack($depth = 4)
+       public static function callstack(int $depth = 4, int $offset = 0)
        {
                $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
 
-               // We remove the first two items from the list since they contain data that we don't need.
-               array_shift($trace);
-               array_shift($trace);
+               // We remove at least the first two items from the list since they contain data that we don't need.
+               $trace = array_slice($trace, 2 + $offset);
 
                $callstack = [];
                $previous = ['class' => '', 'function' => '', 'database' => false];
@@ -52,6 +53,12 @@ class System
 
                while ($func = array_pop($trace)) {
                        if (!empty($func['class'])) {
+                               if (in_array($previous['function'], ['insert', 'fetch', 'toArray', 'exists', 'count', 'selectFirst', 'selectToArray',
+                                       'select', 'update', 'delete', 'selectFirstForUser', 'selectForUser'])
+                                       && (substr($previous['class'], 0, 15) === 'Friendica\Model')) {
+                                       continue;
+                               }
+
                                // Don't show multiple calls from the Database classes to show the essential parts of the callstack
                                $func['database'] = in_array($func['class'], ['Friendica\Database\DBA', 'Friendica\Database\Database']);
                                if (!$previous['database'] || !$func['database']) {     
@@ -322,8 +329,6 @@ class System
        function info($s)
        function is_site_admin()
        function get_temppath()
-       function get_cachefile($file, $writemode = true)
-       function get_itemcachepath()
        function get_spoolpath()
        */
 }