From 11c44af35e6e004894cb9c383a53f7793ecfd9e8 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Sun, 9 Mar 2014 23:21:27 +0100
Subject: [PATCH] Remove obsolete requestId

---
 application/views/helpers/RequestId.php | 43 -------------------------
 library/Icinga/Web/Request.php          | 16 ---------
 2 files changed, 59 deletions(-)
 delete mode 100644 application/views/helpers/RequestId.php

diff --git a/application/views/helpers/RequestId.php b/application/views/helpers/RequestId.php
deleted file mode 100644
index 0b9358081..000000000
--- a/application/views/helpers/RequestId.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-// @codingStandardsIgnoreStart
-
-// {{{ICINGA_LICENSE_HEADER}}}
-/**
- * This file is part of Icinga Web 2.
- *
- * Icinga Web 2 - Head for multiple monitoring backends.
- * Copyright (C) 2014 Icinga Development Team
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * @copyright  2014 Icinga Development Team <info@icinga.org>
- * @license    http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2
- * @author     Icinga Development Team <info@icinga.org>
- *
- */
-// {{{ICINGA_LICENSE_HEADER}}}
-
-use \Zend_Controller_Front;
-use \Zend_View_Helper_Abstract;
-
-class Zend_View_Helper_RequestId extends Zend_View_Helper_Abstract
-{
-    public function requestId()
-    {
-        return Zend_Controller_Front::getInstance()->getRequest()->getId();
-    }
-}
-
-// @codingStandardsIgnoreStop
diff --git a/library/Icinga/Web/Request.php b/library/Icinga/Web/Request.php
index 8d6114d8a..95a5a2a37 100644
--- a/library/Icinga/Web/Request.php
+++ b/library/Icinga/Web/Request.php
@@ -63,20 +63,4 @@ class Request extends Zend_Controller_Request_Http
     {
         return $this->user;
     }
-
-    /**
-     * Return a identifier to uniquely identify the request's source
-     *
-     * @return  string
-     */
-    public function getId()
-    {
-        $requestId = $this->getParam('request_id');
-
-        if ($requestId === null) {
-            $requestId = substr('abcdefghijklmnopqrstuvwxyz', mt_rand(0, 25), 1) . substr(md5(time()), -7);
-        }
-
-        return $requestId;
-    }
 }