URL format removed from the settings

html/js/base_ts.js

@@ -18,7 +18,7 @@ menuItems.push(new MainMenuItem("log", "{{.mainMenu.item.log}}", "log.png", "{{.
 menuItems.push(new MainMenuItem("logout", "{{.mainMenu.item.logout}}", "logout.png", "{{.mainMenu.headline.logout}}"));
 // Kategorien für die Einstellungen
 var settingsCategory = new Array();
-settingsCategory.push(new SettingsCategoryItem("{{.settings.category.general}}", "xteveAutoUpdate,tuner,epgSource,api,scheme.m3u,scheme.xml"));
+settingsCategory.push(new SettingsCategoryItem("{{.settings.category.general}}", "xteveAutoUpdate,tuner,epgSource,api"));
 settingsCategory.push(new SettingsCategoryItem("{{.settings.category.files}}", "update,files.update,temp.path,cache.images,xepg.replace.missing.images"));
 settingsCategory.push(new SettingsCategoryItem("{{.settings.category.streaming}}", "buffer,buffer.size.kb,buffer.timeout,user.agent,ffmpeg.path,ffmpeg.options,vlc.path,vlc.options"));
 settingsCategory.push(new SettingsCategoryItem("{{.settings.category.backup}}", "backup.path,backup.keep"));

html/js/settings_ts.js

@@ -305,30 +305,6 @@ var SettingsCategory = /** @class */ (function () {
                 setting.appendChild(tdLeft);
                 setting.appendChild(tdRight);
                 break;
-            case "scheme.m3u":
-                var tdLeft = document.createElement("TD");
-                tdLeft.innerHTML = "{{.settings.schemeM3U.title}}" + ":";
-                var tdRight = document.createElement("TD");
-                var text = ["HTTP", "HTTPS"];
-                var values = ["HTTP", "HTTPS"];
-                var select = content.createSelect(text, values, data, settingsKey);
-                select.setAttribute("onchange", "javascript: this.className = 'changed'");
-                tdRight.appendChild(select);
-                setting.appendChild(tdLeft);
-                setting.appendChild(tdRight);
-                break;
-            case "scheme.xml":
-                var tdLeft = document.createElement("TD");
-                tdLeft.innerHTML = "{{.settings.schemeXML.title}}" + ":";
-                var tdRight = document.createElement("TD");
-                var text = ["HTTP", "HTTPS"];
-                var values = ["HTTP", "HTTPS"];
-                var select = content.createSelect(text, values, data, settingsKey);
-                select.setAttribute("onchange", "javascript: this.className = 'changed'");
-                tdRight.appendChild(select);
-                setting.appendChild(tdLeft);
-                setting.appendChild(tdRight);
-                break;
         }
         return setting;
     };
@@ -410,12 +386,6 @@ var SettingsCategory = /** @class */ (function () {
             case "xepg.replace.missing.images":
                 text = "{{.settings.replaceEmptyImages.description}}";
                 break;
-            case "scheme.m3u":
-                text = "{{.settings.schemeM3U.description}}";
-                break;
-            case "scheme.xml":
-                text = "{{.settings.schemeXML.description}}";
-                break;
             default:
                 text = "";
                 break;

html/lang/en.json

@@ -307,14 +307,6 @@
       "title": "Number of Tuners",
       "description": "Number of parallel connections that can be established to the provider.<br>Available for: Plex, Emby (HDHR), M3U (with active buffer).<br>After a change, xTeVe must be delete in the Plex / Emby DVR settings and set up again."
     },
-    "schemeM3U":{
-      "title": "URL protocol for xteve.m3u",
-      "description": "Determines which URL protocol is used for the xTeVe streaming URLs. If you using a reverse proxy over HTTPS, set this to HTTPS."
-    },
-    "schemeXML":{
-      "title": "URL protocol for xteve.xml",
-      "description": "Determines which URL protocol is used for the xTeVe image URLs. If you using a reverse proxy over HTTPS, set this to HTTPS."
-    },
     "filesUpdate": {
       "title": "Updates all files at startup",
       "description": "Updates all playlists, tuner and XMLTV files at startup."

src/config.go

@@ -225,8 +225,6 @@ func StartSystem(updateProviderFiles bool) (err error) {
 		return
 	}
 
-	setURLScheme()
-
 	// Systeminformationen in der Konsole ausgeben
 	showInfo(fmt.Sprintf("UUID:%s", Settings.UUID))
 	showInfo(fmt.Sprintf("Tuner (Plex / Emby):%d", Settings.Tuner))

src/data.go

@@ -56,6 +56,10 @@ func updateServerSettings(request RequestStruct) (settings SettingsStrcut, err e
 
 				}
 
+				if len(newUpdateTimes) == 0 {
+					newUpdateTimes = append(newUpdateTimes, "0000")
+				}
+
 				value = newUpdateTimes
 
 			case "cache.images":
@@ -144,8 +148,6 @@ func updateServerSettings(request RequestStruct) (settings SettingsStrcut, err e
 		return
 	}
 
-	setURLScheme()
-
 	if Settings.AuthenticationWEB == false {
 
 		Settings.AuthenticationAPI = false

src/struct-system.go

@@ -284,8 +284,6 @@ type SettingsStrcut struct {
 	MappingFirstChannel       float64               `json:"mapping.first.channel"`
 	Port                      string                `json:"port"`
 	SSDP                      bool                  `json:"ssdp"`
-	SchemeM3U                 string                `json:"scheme.m3u"`
-	SchemeXML                 string                `json:"scheme.xml"`
 	TempPath                  string                `json:"temp.path"`
 	Tuner                     int                   `json:"tuner"`
 	Update                    []string              `json:"update"`

src/system.go

@@ -138,8 +138,6 @@ func loadSettings() (settings SettingsStrcut, err error) {
 	defaults["version"] = System.DBVersion
 	defaults["xteveAutoUpdate"] = true
 	defaults["temp.path"] = System.Folder.Temp
-	defaults["scheme.M3U"] = "HTTP"
-	defaults["scheme.XML"] = "HTTP"
 
 	// Default Werte setzen
 	for key, value := range defaults {
@@ -254,14 +252,6 @@ func setGlobalDomain(domain string) {
 	return
 }
 
-func setURLScheme() {
-
-	System.ServerProtocol.M3U = strings.ToLower(Settings.SchemeM3U)
-	System.ServerProtocol.XML = strings.ToLower(Settings.SchemeXML)
-
-	return
-}
-
 // UUID generieren
 func createUUID() (uuid string) {
 	uuid = time.Now().Format("2006-01") + "-" + randomString(4) + "-" + randomString(6)

ts/base_ts.ts

@@ -21,8 +21,7 @@ menuItems.push(new MainMenuItem("logout", "{{.mainMenu.item.logout}}", "logout.p
 
 // Kategorien für die Einstellungen
 var settingsCategory = new Array()
-settingsCategory.push(new SettingsCategoryItem("{{.settings.category.general}}", "xteveAutoUpdate,tuner,epgSource,api,scheme.m3u,scheme.xml"))
+settingsCategory.push(new SettingsCategoryItem("{{.settings.category.general}}", "xteveAutoUpdate,tuner,epgSource,api"));settingsCategory.push(new SettingsCategoryItem("{{.settings.category.files}}", "update,files.update,temp.path,cache.images,xepg.replace.missing.images"))
-settingsCategory.push(new SettingsCategoryItem("{{.settings.category.files}}", "update,files.update,temp.path,cache.images,xepg.replace.missing.images"))
 settingsCategory.push(new SettingsCategoryItem("{{.settings.category.streaming}}", "buffer,buffer.size.kb,buffer.timeout,user.agent,ffmpeg.path,ffmpeg.options,vlc.path,vlc.options"))
 settingsCategory.push(new SettingsCategoryItem("{{.settings.category.backup}}", "backup.path,backup.keep"))
 settingsCategory.push(new SettingsCategoryItem("{{.settings.category.authentication}}", "authentication.web,authentication.pms,authentication.m3u,authentication.xml,authentication.api"))

ts/settings_ts.ts

@@ -372,38 +372,6 @@ class SettingsCategory {
         setting.appendChild(tdRight)
         break
 
-      case "scheme.m3u":
-        var tdLeft = document.createElement("TD")
-        tdLeft.innerHTML = "{{.settings.schemeM3U.title}}" + ":"
-
-        var tdRight = document.createElement("TD")
-        var text:any[] = ["HTTP", "HTTPS"]
-        var values:any[] = ["HTTP", "HTTPS"]
-
-        var select = content.createSelect(text, values, data, settingsKey)
-        select.setAttribute("onchange", "javascript: this.className = 'changed'")
-        tdRight.appendChild(select)
-
-        setting.appendChild(tdLeft)
-        setting.appendChild(tdRight)
-        break
-
-      case "scheme.xml":
-        var tdLeft = document.createElement("TD")
-        tdLeft.innerHTML = "{{.settings.schemeXML.title}}" + ":"
-
-        var tdRight = document.createElement("TD")
-        var text:any[] = ["HTTP", "HTTPS"]
-        var values:any[] = ["HTTP", "HTTPS"]
-
-        var select = content.createSelect(text, values, data, settingsKey)
-        select.setAttribute("onchange", "javascript: this.className = 'changed'")
-        tdRight.appendChild(select)
-
-        setting.appendChild(tdLeft)
-        setting.appendChild(tdRight)
-        break
-
     }
 
     return setting
@@ -515,15 +483,6 @@ class SettingsCategory {
         text = "{{.settings.replaceEmptyImages.description}}"
         break
 
-      case "scheme.m3u":
-        text = "{{.settings.schemeM3U.description}}"
-        break
-
-       case "scheme.xml":
-        text = "{{.settings.schemeXML.description}}"
-        break
-
-
       default:
         text = ""
         break

xteve.go

@@ -39,7 +39,7 @@ var GitHub = GitHubStruct{Branch: "master", User: "xteve-project", Repo: "xTeVe-
 const Name = "xTeVe"
 
 // Version : Version, die Build Nummer wird in der main func geparst.
-const Version = "2.1.1.0112"
+const Version = "2.1.1.0114"
 
 // DBVersion : Datanbank Version
 const DBVersion = "2.1.0"
@@ -48,7 +48,7 @@ const DBVersion = "2.1.0"
 const APIVersion = "1.1.0"
 
 // Dev : Aktiviert den Entwicklungsmodus. Für den Webserver werden dann die lokalen Dateien verwendet.
-const Dev = false
+const Dev = true
 
 var homeDirectory = fmt.Sprintf("%s%s.%s%s", src.GetUserHomeDirectory(), string(os.PathSeparator), strings.ToLower(Name), string(os.PathSeparator))
 var samplePath = fmt.Sprintf("%spath%sto%sxteve%s", string(os.PathSeparator), string(os.PathSeparator), string(os.PathSeparator), string(os.PathSeparator))