From b96c36fd61f5949fd7bb057120e63578b73b6726 Mon Sep 17 00:00:00 2001
From: James Brooks <james@alt-three.com>
Date: Thu, 27 Dec 2018 22:44:00 +0000
Subject: [PATCH] Update Blade files

---
 resources/views/layout/master.blade.php    |  3 -
 resources/views/partials/footer.blade.php  |  6 --
 resources/views/vendor/feed/atom.blade.php | 29 -------
 resources/views/vendor/feed/rss.blade.php  | 89 ----------------------
 4 files changed, 127 deletions(-)
 delete mode 100644 resources/views/vendor/feed/atom.blade.php
 delete mode 100644 resources/views/vendor/feed/rss.blade.php

diff --git a/resources/views/layout/master.blade.php b/resources/views/layout/master.blade.php
index 8278704d..c77e7259 100644
--- a/resources/views/layout/master.blade.php
+++ b/resources/views/layout/master.blade.php
@@ -7,9 +7,6 @@
     <meta name="env" content="{{ app('env') }}">
     <meta name="token" content="{{ csrf_token() }}">
 
-    <link rel="alternate" type="application/atom+xml" href="{{ cachet_route('feed.atom') }}" title="{{ $siteTitle }} - Atom Feed">
-    <link rel="alternate" type="application/rss+xml" href="{{ cachet_route('feed.rss') }}" title="{{ $siteTitle }} - RSS Feed">
-
     <!-- Mobile friendliness -->
     <meta name="HandheldFriendly" content="True">
     <meta name="MobileOptimized" content="320">
diff --git a/resources/views/partials/footer.blade.php b/resources/views/partials/footer.blade.php
index bee52e98..12601f98 100644
--- a/resources/views/partials/footer.blade.php
+++ b/resources/views/partials/footer.blade.php
@@ -26,12 +26,6 @@
                         <a class="btn btn-link" href="{{ cachet_route('auth.logout') }}">{{ trans('dashboard.logout') }}</a>
                     </li>
                     @endif
-                    <li>
-                        <a class="btn btn-link" href="{{ cachet_route('feed.rss') }}">{{ trans('cachet.rss-feed') }}</a>
-                    </li>
-                    <li>
-                        <a class="btn btn-link" href="{{ cachet_route('feed.atom') }}">{{ trans('cachet.atom-feed') }}</a>
-                    </li>
                     @if($enableSubscribers)
                     <li>
                         <a class="btn btn-success btn-outline" href="{{ cachet_route('subscribe') }}">{{ trans('cachet.subscriber.button') }}</a>
diff --git a/resources/views/vendor/feed/atom.blade.php b/resources/views/vendor/feed/atom.blade.php
deleted file mode 100644
index 78bffe8f..00000000
--- a/resources/views/vendor/feed/atom.blade.php
+++ /dev/null
@@ -1,29 +0,0 @@
-{!! '<'.'?'.'xml version="1.0" encoding="UTF-8" ?>' !!}
-<feed xmlns="http://www.w3.org/2005/Atom"<?php foreach($namespaces as $n) echo " ".$n; ?>>
-    <title type="text">{!! $channel['title'] !!}</title>
-    <subtitle type="html"><![CDATA[{!! $channel['description'] !!}]]></subtitle>
-    <link href="{{ Request::url() }}"></link>
-    <id>{{ $channel['link'] }}</id>
-    <link rel="alternate" type="text/html" href="{{ Request::url() }}" ></link>
-    <link rel="self" type="application/atom+xml" href="{{ $channel['link'] }}" ></link>
-@if (!empty($channel['logo']))
-    <logo>{{ $channel['logo'] }}</logo>
-@endif
-@if (!empty($channel['icon']))
-    <icon>{{ $channel['icon'] }}</icon>
-@endif
-        <updated>{{ $channel['pubdate'] }}</updated>
-@foreach($items as $item)
-        <entry>
-            <author>
-                <name>{{ $item['author'] }}</name>
-            </author>
-            <title type="text"><![CDATA[{!! $item['title'] !!}]]></title>
-            <link rel="alternate" type="text/html" href="{{ $item['link'] }}"></link>
-            <id>{{ $item['link'] }}</id>
-            <summary type="html"><![CDATA[{!! $item['description'] !!}]]></summary>
-            <content type="html"><![CDATA[{!! $item['content'] !!}]]></content>
-            <updated>{{ $item['pubdate'] }}</updated>
-        </entry>
-@endforeach
-</feed>
diff --git a/resources/views/vendor/feed/rss.blade.php b/resources/views/vendor/feed/rss.blade.php
deleted file mode 100644
index 812e9cd5..00000000
--- a/resources/views/vendor/feed/rss.blade.php
+++ /dev/null
@@ -1,89 +0,0 @@
-{!! '<'.'?'.'xml version="1.0" encoding="UTF-8" ?>' !!}
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:webfeeds="http://webfeeds.org/rss/1.0" xmlns:media="http://search.yahoo.com/mrss/"<?php foreach($namespaces as $n) echo " ".$n; ?>>
-    <channel>
-        <title>{!! $channel['title'] !!}</title>
-        <link>{{ Request::url() }}</link>
-        <description><![CDATA[{!! $channel['description'] !!}]]></description>
-        <atom:link href="{{ $channel['link'] }}" rel="self"></atom:link>
-        @if (!empty($channel['copyright']))
-        <copyright>{{ $channel['copyright'] }}</copyright>
-        @endif
-        @if (!empty($channel['color']))
-        <webfeeds:accentColor>{{ $channel['color'] }}</webfeeds:accentColor>
-        @endif
-        @if (!empty($channel['cover']))
-        <webfeeds:cover image="{{ $channel['cover'] }}">
-        @endif
-        @if (!empty($channel['icon']))
-        <webfeeds:icon>{{ $channel['icon'] }}</webfeeds:icon>
-        @endif
-        @if (!empty($channel['logo']))
-        <webfeeds:logo>{{ $channel['logo'] }}</webfeeds:logo>
-        <image>
-            <url>{{ $channel['logo'] }}</url>
-            <title>{{ $channel['title'] }}</title>
-            <link>{{ Request::url() }}</link>
-        </image>
-        @endif
-        @if (!empty($channel['related']))
-        <webfeeds:related layout="card" target="browser">
-        @endif
-        @if (!empty($channel['ga']))
-        <webfeeds:analytics id="{{ $channel['ga'] }}" engine="GoogleAnalytics">
-        @endif
-        <language>{{ $channel['lang'] }}</language>
-        <lastBuildDate>{{ $channel['pubdate'] }}</lastBuildDate>
-        @foreach($items as $item)
-        <item>
-            <title><![CDATA[{!! $item['title'] !!}]]></title>
-            @if (!empty($item['category']))
-            <category>{{ $item['category'] }}</category>
-            @endif
-            <link>{{ $item['link'] }}</link>
-            <guid isPermaLink="true">{{ $item['link'] }}</guid>
-            <description><![CDATA[{!! $item['description'] !!}]]></description>
-            @if (!empty($item['content']))
-            <content:encoded><![CDATA[{!! $item['content'] !!}]]></content:encoded>
-            @endif
-            <dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">{{ $item['author'] }}</dc:creator>
-            <pubDate>{{ $item['pubdate'] }}</pubDate>
-            @if (!empty($item['enclosure']))
-            <enclosure
-            @foreach ($item['enclosure'] as $k => $v)
-            {!! $k.'="'.$v.'" ' !!}
-            @endforeach
-            />
-            @endif
-            @if (!empty($item['media:content']))
-            <media:content
-            @foreach ($item['media:content'] as $k => $v)
-            {!! $k.'="'.$v.'" ' !!}
-            @endforeach
-            />
-            @endif
-            @if (!empty($item['media:thumbnail']))
-            <media:thumbnail
-            @foreach ($item['media:thumbnail'] as $k => $v)
-            {!! $k.'="'.$v.'" ' !!}
-            @endforeach
-            />
-            @endif
-            @if (!empty($item['media:title']))
-            <media:title type="plain">{{ $item['media:title'] }}</media:title>
-            @endif
-            @if (!empty($item['media:description']))
-            <media:description type="plain">{{ $item['media:description'] }}</media:description>
-            @endif
-            @if (!empty($item['media:keywords']))
-            <media:keywords>{{ $item['media:title'] }}</media:keywords>
-            @endif
-            @if (!empty($item['media:rating']))
-            <media:rating>{{ $item['media:rating'] }}</media:rating>
-            @endif
-            @if (!empty($item['creativeCommons:license']))
-            <creativeCommons:license>{{ $item['creativeCommons:license'] }}</creativeCommons:license>
-            @endif
-        </item>
-        @endforeach
-    </channel>
-</rss>