bump version

baseURI not supported by IE11
removed leftover closing tag

octoserve/dvb.c

@@ -528,6 +528,29 @@ static int tune_terr2(struct dvbfe *fe)
 	return 0;
 }
 
+static int tune_isdbt(struct dvbfe *fe)
+{
+	struct dtv_property p[] = {
+		{ .cmd = DTV_CLEAR },
+		{ .cmd = DTV_FREQUENCY, .u.data = fe->param[PARAM_FREQ] * 1000 },
+		{ .cmd = DTV_BANDWIDTH_HZ, .u.data = fe->param[PARAM_BW_HZ] },
+		{ .cmd = DTV_TUNE },
+	};		
+	struct dtv_properties c;
+	int ret;
+
+	set_property(fe->fd, DTV_DELIVERY_SYSTEM, SYS_ISDBT);
+
+	c.num = ARRAY_SIZE(p);
+	c.props = p;
+	ret = ioctl(fe->fd, FE_SET_PROPERTY, &c);
+	if (ret < 0) {
+		fprintf(stderr, "FE_SET_PROPERTY returned %d\n", ret);
+		return -1;
+	}
+	return 0;
+}
+
 static int tune(struct dvbfe *fe)
 {
 	int ret;
@@ -551,6 +574,9 @@ static int tune(struct dvbfe *fe)
 	case SYS_DVBC2:
 		ret = tune_c2(fe);
 		break;
+	case SYS_ISDBT:
+		ret = tune_isdbt(fe);
+		break;
 	default:
 		break;
 	}

octoserve/var/www/systeminfo.lua

@@ -40,8 +40,9 @@ function GetBoxName()
    local boxname = ""
    local tmp = io.open("/config/boxname")
    if tmp then
+      local pat = "OctopusNet:";
       boxname = tmp:read("*l")
-      boxname = boxname:gsub("OctopusNet:","",1);
+      boxname = boxname:gsub(pat:gsub(".","%."),"",1);
       tmp:close()
    end
    return boxname

octoserve/var/www/systemsettings.lua

@@ -74,8 +74,9 @@ function GetBoxName()
    local boxname = ""
    local tmp = io.open("/config/boxname")
    if tmp then
+      local pat = "OctopusNet:";
       boxname = tmp:read("*l")
-      boxname = boxname:gsub("OctopusNet:","",1);
+      boxname = boxname:gsub(pat:gsub(".","%."),"",1);
       tmp:close()
    end
    return boxname

octoserve/var/www/wait.html

@@ -24,7 +24,7 @@ function Wait()
 
 function OnLoad()
 {
-  var param = document.baseURI.match(/\d+$/);
+  var param = document.URL.match(/\d+$/);
   
   WaitCounter = 5;
   if( param ) WaitCounter = parseInt(param);
@@ -48,7 +48,7 @@ function OnLoad()
   </td></tr>
   <tr><td class="maintd" colspan="2">&nbsp;</td></tr>
   <tr>
-    <td class="maintd"></script></td>
+    <td class="maintd"></td>
     <td class="content">
       <div>
         <!-- Begin Content -->                

octoserve/version.h

@@ -19,5 +19,5 @@
 
 #ifndef _OCTOSERVE_VERSION_
 #define _OCTOSERVE_VERSION_
-#define OCTOSERVE_VERSION "1.0.78"
+#define OCTOSERVE_VERSION "1.0.81"
 #endif