Skip to content

Commit

Permalink
0.7.2
Browse files Browse the repository at this point in the history
Url Encode titles, folders, etc
  • Loading branch information
jheizer committed Dec 4, 2015
1 parent 2436dd0 commit 47ac10a
Show file tree
Hide file tree
Showing 16 changed files with 1,096 additions and 29 deletions.
Binary file added .vs/MobileMyth/v14/.suo
Binary file not shown.
1,038 changes: 1,038 additions & 0 deletions .vs/config/applicationhost.config

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions MobileMyth.sln
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.30501.0
# Visual Studio 14
VisualStudioVersion = 14.0.23107.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "MobileMyth", "MobileMyth\", "{0BB60F7E-4758-4518-AE0D-922C478FD45C}"
ProjectSection(WebsiteProperties) = preProject
Expand Down
Binary file modified MobileMyth.v12.suo
Binary file not shown.
18 changes: 10 additions & 8 deletions MobileMyth/App_Code/SiteSettings.vb
Expand Up @@ -68,14 +68,16 @@ Public Class SiteSettings

End Get
Set(ByVal value As String)
Dim St As XElement = (From s In Data.Descendants(Name)
Select s).FirstOrDefault
If St Is Nothing Then
St = New XElement(Name)
Data.Add(St)
End If
St.Value = value
Data.Save(Path)
SyncLock (LockObj)
Dim St As XElement = (From s In Data.Descendants(Name)
Select s).FirstOrDefault
If St Is Nothing Then
St = New XElement(Name)
Data.Add(St)
End If
St.Value = value
Data.Save(Path)
End SyncLock
End Set
End Property

Expand Down
7 changes: 7 additions & 0 deletions MobileMyth/App_Data/settings/frontends.xml
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<frontends>
<!--
<frontend name="Friendly Name for Frontend" address="10.0.0.111" mac="48:5b:39:a7:aa:aa"/>
-->

</frontends>
23 changes: 23 additions & 0 deletions MobileMyth/App_Data/settings/settings.xml
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<settings>
<Frontends>
<Frontend name="::1">
<UIType>desktop</UIType>
<Resolution>NoTranscode</Resolution>
<UseAnyStream>False</UseAnyStream>
<ProxyVideo>True</ProxyVideo>
<ShowRecentRecordings>True</ShowRecentRecordings>
<ShowRecentVideos>True</ShowRecentVideos>
<ShowConflicts>False</ShowConflicts>
<ShowDiskSpace>True</ShowDiskSpace>
<ShowEncoders>True</ShowEncoders>
<ShowUpcoming>False</ShowUpcoming>
<NoImages>False</NoImages>
</Frontend>
</Frontends>
<MythServiceAPIAddress>10.0.0.197</MythServiceAPIAddress>
<MythServiceAPIPort>6544</MythServiceAPIPort>
<MythWebUrl>http://10.0.0.197/mythweb/</MythWebUrl>
<DateFormat>MM/DD/YYYY</DateFormat>
<DeviceList>True</DeviceList>
</settings>
5 changes: 0 additions & 5 deletions MobileMyth/App_Data/transcode.xml

This file was deleted.

4 changes: 2 additions & 2 deletions MobileMyth/admin/default.aspx
Expand Up @@ -76,10 +76,10 @@

<br />
<br />
Current Version: v.7.1<br />
Current Version: v.7.2<br />
<a href="http://mobilemyth.net">MobileMyth Home Page</a><br />
GNU General Public License.<br />
Copyright 2012-2014 Jonathan Heizer jheizer@gmail.com
Copyright 2012-2015 Jonathan Heizer jheizer@gmail.com
</asp:Content>

<asp:Content ID="Content3" ContentPlaceHolderID="AfterFirstPage" Runat="Server">
Expand Down
4 changes: 2 additions & 2 deletions MobileMyth/tablet/episodes.aspx.vb
Expand Up @@ -31,7 +31,7 @@ Partial Class recordings
Dim Programs As List(Of Program) = Array.FindAll(Recordings.Programs, Function(p) p.Recording.StorageGroup <> "Deleted" AndAlso p.Recording.StorageGroup <> "LiveTV").ToList

If Not Request.QueryString("title") Is Nothing Then 'If we are only suppose to show a single Title filter that now
Title = Request.QueryString("title")
Title = HttpUtility.UrlDecode(Request.QueryString("title"))
Programs = Programs.FindAll(Function(p) p.Title = Title)
End If

Expand Down Expand Up @@ -77,7 +77,7 @@ Partial Class recordings

Dim Lnk As New HyperLink
If Not String.IsNullOrEmpty(Title) Then
Lnk.NavigateUrl = "episodes.aspx?title=" & Title & "&pg=" & StartPg + 1
Lnk.NavigateUrl = "episodes.aspx?title=" & HttpUtility.UrlEncode(Title) & "&pg=" & StartPg + 1
Else
Lnk.NavigateUrl = "episodes.aspx?pg=" & StartPg + 1
End If
Expand Down
8 changes: 4 additions & 4 deletions MobileMyth/tablet/gallery.aspx.vb
Expand Up @@ -33,7 +33,7 @@ Partial Class tablet_gallery
Dim Folder As String = ""

If Not Request.QueryString("f") Is Nothing Then
Folder = Request.QueryString("f").TrimStart("/")
Folder = HttpUtility.UrlDecode(Request.QueryString("f").TrimStart("/"))
End If

Dim Images As List(Of String)
Expand All @@ -45,7 +45,7 @@ Partial Class tablet_gallery
If Not String.IsNullOrEmpty(Folder) Then
Dim url As String = "gallery.aspx"
If Folder.Contains("/") Then
url &= "?f=" & Folder.Substring(0, Folder.LastIndexOf("/"))
url &= "?f=" & HttpUtility.UrlEncode(Folder.Substring(0, Folder.LastIndexOf("/")))
End If
Dim Li As New GalleryPanel(0, "..", url, "../images/blackfolder.png")
maincontent.Controls.Add(Li)
Expand All @@ -54,13 +54,13 @@ Partial Class tablet_gallery

'Add the folders
For i As Integer = FolderStartIndex To Folders.Count - 1 + FolderStartIndex
Dim Li As New GalleryPanel(i, Folders(i - FolderStartIndex), "gallery.aspx?f=" & Folder & "/" & Folders(i - FolderStartIndex), "../images/blackfolder.png")
Dim Li As New GalleryPanel(i, Folders(i - FolderStartIndex), "gallery.aspx?f=" & HttpUtility.UrlEncode(Folder & "/" & Folders(i - FolderStartIndex)), "../images/blackfolder.png")
maincontent.Controls.Add(Li)
Next

'Add the images
For i As Integer = 0 To Images.Count - 1
Dim Li As New GalleryPanel(i + Folders.Count + FolderStartIndex, "", "gallery_slideshow.aspx?f=" & Folder & "#" & i + 1, Common.ProxyURL("/Content/GetImageFile?StorageGroup=Photographs&FileName=" & Images(i) & "&Height=175"))
Dim Li As New GalleryPanel(i + Folders.Count + FolderStartIndex, "", "gallery_slideshow.aspx?f=" & HttpUtility.UrlEncode(Folder) & "#" & i + 1, Common.ProxyURL("/Content/GetImageFile?StorageGroup=Photographs&FileName=" & Images(i) & "&Height=175"))
maincontent.Controls.Add(Li)
Next

Expand Down
2 changes: 1 addition & 1 deletion MobileMyth/tablet/gallery_slideshow.aspx.vb
Expand Up @@ -33,7 +33,7 @@ Partial Class tablet_gallery_slideshow
Dim Folder As String = ""

If Not Request.QueryString("f") Is Nothing Then
Folder = Request.QueryString("f").TrimStart("/")
Folder = HttpUtility.UrlDecode(Request.QueryString("f").TrimStart("/"))
End If

Dim Images As List(Of String)
Expand Down
2 changes: 1 addition & 1 deletion MobileMyth/tablet/recordings.aspx.vb
Expand Up @@ -42,7 +42,7 @@ Partial Class shows
List.Controls.Add(li)

For Each Rec In Titles
li = New ShowListItem(Rec.Title, Rec.Count, "episodes.aspx?title=" & Rec.Title, Rec.Inetref, 0)
li = New ShowListItem(Rec.Title, Rec.Count, "episodes.aspx?title=" & HttpUtility.UrlEncode(Rec.Title), Rec.Inetref, 0)
List.Controls.Add(li)
Next

Expand Down
4 changes: 2 additions & 2 deletions MobileMyth/tablet/videos.aspx.vb
Expand Up @@ -33,7 +33,7 @@ Partial Class tablet_videos
Dim Folder As String = ""

If Not Request.QueryString("f") Is Nothing Then
Folder = Request.QueryString("f").TrimStart("/")
Folder = HttpUtility.UrlDecode(Request.QueryString("f").TrimStart("/"))
End If

Dim Videos As List(Of iMythVideo.VideoMetadataInfo)
Expand Down Expand Up @@ -81,7 +81,7 @@ Partial Class tablet_videos


For i As Integer = 0 To Folders.Count - 1
Dim Li As New VideoPanel(i, Folders(i), "videos.aspx?f=" & Folder & "/" & Folders(i), "../images/blackfolder.png")
Dim Li As New VideoPanel(i, Folders(i), "videos.aspx?f=" & HttpUtility.UrlEncode(Folder & "/" & Folders(i)), "../images/blackfolder.png")
maincontent.Controls.Add(Li)
Next

Expand Down
6 changes: 4 additions & 2 deletions MobileMyth/website.publishproj
Expand Up @@ -20,8 +20,10 @@ Copyright (C) Microsoft Corporation. All rights reserved.
<SourceWebPhysicalPath>$(MSBuildThisFileDirectory)</SourceWebPhysicalPath>
<SourceWebVirtualPath>/MobileMyth</SourceWebVirtualPath>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<SourceWebProject>C:\Code\MobileMyth\MobileMyth</SourceWebProject>
<SourceWebMetabasePath>/IISExpress/7.5/LM/W3SVC/3/ROOT</SourceWebMetabasePath>
<SourceWebProject>
</SourceWebProject>
<SourceWebMetabasePath>
</SourceWebMetabasePath>
</PropertyGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
Expand Down
Binary file modified release/latest.zip
Binary file not shown.

0 comments on commit 47ac10a

Please sign in to comment.