Remove line counts logic from the error reporting component

We no longer need this as we download js files directly, so the client
has correct filename and line immediatelly.

Signed-off-by: Michal Čihař <michal@cihar.com>

.gitignore

@@ -32,8 +32,6 @@ web.config
 /twig-templates/
 # Backups
 *~
-# Javascript line counts
-/js/line_counts.php
 # API documentation
 /apidoc/
 /doc/linkcheck/

doc/faq.rst

@@ -686,7 +686,7 @@ A list of files and corresponding functionality which degrade gracefully when re
 * :file:`./locale/` folder, or unused subfolders (interface translations)
 * Any unused themes in :file:`./themes/`
 * :file:`./js/vendor/jquery/src/` (included for licensing reasons)
-* :file:`./js/line_counts.php`
+* :file:`./js/line_counts.php` (removed in phpMyAdmin 4.8)
 * :file:`./doc/` (documentation)
 * :file:`./setup/` (setup script)
 * :file:`./examples/`

libraries/classes/ErrorReport.php

@@ -188,89 +188,6 @@ class ErrorReport
         return $response;
     }
 
-    /**
-     * Returns number of lines in given javascript file.
-     *
-     * @param string $filename javascript filename
-     *
-     * @return Number of lines
-     *
-     * @todo Should gracefully handle non existing files
-     */
-    public static function countLines($filename)
-    {
-        /**
-         * The generated file that contains the line numbers for the js files
-         * If you change any of the js files you can run the scripts/line-counts.sh
-         */
-        if (is_readable('js/line_counts.php')) {
-            include_once 'js/line_counts.php';
-        }
-
-        global $LINE_COUNT;
-        if (defined('LINE_COUNTS')) {
-            return $LINE_COUNT[$filename];
-        }
-
-        // ensure that the file is inside the phpMyAdmin folder
-        $depath = 1;
-        foreach (explode('/', $filename) as $part) {
-            if ($part == '..') {
-                $depath--;
-            } elseif ($part != '.' || $part === '') {
-                $depath++;
-            }
-            if ($depath < 0) {
-                return 0;
-            }
-        }
-
-        $linecount = 0;
-        $handle = fopen('./js/' . $filename, 'r');
-        while (!feof($handle)) {
-            $line = fgets($handle);
-            if ($line === false) {
-                break;
-            }
-            $linecount++;
-        }
-        fclose($handle);
-        return $linecount;
-    }
-
-    /**
-     * returns the translated line number and the file name from the cumulative line
-     * number and an array of files
-     *
-     * uses the $LINE_COUNT global array of file names and line numbers
-     *
-     * @param array   $filenames         list of files in order of concatenation
-     * @param Integer $cumulative_number the cumulative line number in the
-     *                                   concatenated files
-     *
-     * @return array the filename and line number
-     * Returns two variables in an array:
-     * - A String $filename the filename where the requested cumulative number
-     *   exists
-     * - Integer $linenumber the translated line number in the returned file
-     */
-    public static function getLineNumber(array $filenames, $cumulative_number)
-    {
-        $cumulative_sum = 0;
-        foreach ($filenames as $filename) {
-            $filecount = self::countLines($filename);
-            if ($cumulative_number <= $cumulative_sum + $filecount + 2) {
-                $linenumber = $cumulative_number - $cumulative_sum;
-                break;
-            }
-            $cumulative_sum += $filecount + 2;
-        }
-        if (! isset($filename)) {
-            $filename = '';
-        }
-        return array($filename, $linenumber);
-    }
-
     /**
      * translates the cumulative line numbers in the stack trace as well as sanitize
      * urls and trim long lines in the context
@@ -287,19 +204,10 @@ class ErrorReport
                     $line = mb_substr($line, 0, 75) . "//...";
                 }
             }
-            if (preg_match("<js/get_scripts.js.php\?(.*)>", $level["url"], $matches)) {
-                parse_str($matches[1], $vars);
-                List($file_name, $line_number) = self::getLineNumber(
-                    $vars["scripts"], $level["line"]
-                );
-                $level["filename"] = $file_name;
-                $level["line"] = $line_number;
-            } else {
-                unset($level["context"]);
-                List($uri, $script_name) = self::sanitizeUrl($level["url"]);
-                $level["uri"] = $uri;
-                $level["scriptname"] = $script_name;
-            }
+            unset($level["context"]);
+            List($uri, $script_name) = self::sanitizeUrl($level["url"]);
+            $level["uri"] = $uri;
+            $level["scriptname"] = $script_name;
             unset($level["url"]);
         }
         unset($level);

scripts/line-counts.sh

@@ -1,33 +0,0 @@
-#!/bin/bash
-
-# Do not run as CGI
-if [ -n "$GATEWAY_INTERFACE" ] ; then
-    echo 'Can not invoke as CGI!'
-    exit 1
-fi
-
-cat > js/line_counts.php <<EOF
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * An autogenerated file that stores the line counts of javascript files
- *
- * @package PhpMyAdmin
- */
-
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-define('LINE_COUNTS', true);
-\$LINE_COUNT = array();
-EOF
-
-php_code=""
-for file in `find js -name '*.js'` ; do
-  lc=`wc -l $file | sed 's/\([0-9]*\).*/\1/'`
-  file=${file:3}
-  entry="\$LINE_COUNT['$file'] = $lc;"
-  php_code="$php_code\n$entry"
-done
-echo -e $php_code >> js/line_counts.php