xtne6f氏の調整を反映

xtne6f/EDCB@c00fab7

HttpPublic/api/AutoAddEPGAddChgKey

@@ -6,7 +6,7 @@ AssertCsrf(post)
 
 aa={}
 lastRecSetting=nil
-aa.dataID=0+(mg.get_var(mg.request_info.query_string, 'id') or 0)
+aa.dataID=tonumber(mg.get_var(mg.request_info.query_string, 'id')) or 0
 if aa.dataID~=0 then
   for i,v in ipairs(edcb.EnumAutoAdd()) do
     if v.dataID==aa.dataID then
@@ -17,21 +17,21 @@ if aa.dataID~=0 then
 end
 modified=false
 if post and (aa.dataID==0 or lastRecSetting) then
-  presetID=mg.get_var(post, 'presetID')
-  recMode=mg.get_var(post, 'recMode')
-  tuijyuuFlag=mg.get_var(post, 'tuijyuuFlag')
-  priority=mg.get_var(post, 'priority')
-  pittariFlag=mg.get_var(post, 'pittariFlag')
-  suspendMode=mg.get_var(post, 'suspendMode')
+  presetID=tonumber(mg.get_var(post, 'presetID'))
+  recMode=tonumber(mg.get_var(post, 'recMode'))
+  tuijyuuFlag=tonumber(mg.get_var(post, 'tuijyuuFlag')) or 0
+  priority=tonumber(mg.get_var(post, 'priority'))
+  pittariFlag=tonumber(mg.get_var(post, 'pittariFlag')) or 0
+  suspendMode=tonumber(mg.get_var(post, 'suspendMode'))
   rebootFlag=mg.get_var(post, 'rebootFlag')
   useDefMarginFlag=mg.get_var(post, 'useDefMarginFlag')
-  startMargin=mg.get_var(post, 'startMargin')
-  endMargin=mg.get_var(post, 'endMargin')
+  startMargin=tonumber(mg.get_var(post, 'startMargin'))
+  endMargin=tonumber(mg.get_var(post, 'endMargin'))
   serviceMode=mg.get_var(post, 'serviceMode')
   serviceMode_1=mg.get_var(post, 'serviceMode_1')
   serviceMode_2=mg.get_var(post, 'serviceMode_2')
   continueRecFlag=mg.get_var(post, 'continueRecFlag')
-  tunerID=mg.get_var(post, 'tunerID')
+  tunerID=tonumber(mg.get_var(post, 'tunerID'))
   partialRecFlag=mg.get_var(post, 'partialRecFlag')
   if presetID and
      recMode and
@@ -41,21 +41,21 @@ if post and (aa.dataID==0 or lastRecSetting) then
   then
     aa.recSetting=lastRecSetting or {}
     rs=aa.recSetting
-    rs.recMode=0+recMode
-    rs.tuijyuuFlag=0+(tuijyuuFlag or 0)~=0
-    rs.priority=0+priority
-    rs.pittariFlag=0+(pittariFlag or 0)~=0
-    rs.suspendMode=0+suspendMode
+    rs.recMode=recMode
+    rs.tuijyuuFlag=tuijyuuFlag~=0
+    rs.priority=priority
+    rs.pittariFlag=pittariFlag~=0
+    rs.suspendMode=suspendMode
     rs.rebootFlag=rebootFlag~=nil
     rs.startMargin=nil
     rs.endMargin=nil
     if not useDefMarginFlag then
-      rs.startMargin=0+startMargin
-      rs.endMargin=0+endMargin
+      rs.startMargin=startMargin
+      rs.endMargin=endMargin
     end
     rs.serviceMode=serviceMode and 0 or 1+(serviceMode_1 and 16 or 0)+(serviceMode_2 and 32 or 0)
     rs.continueRecFlag=continueRecFlag~=nil
-    rs.tunerID=0+tunerID
+    rs.tunerID=tunerID
     rs.partialRecFlag=partialRecFlag and 1 or 0
     rs.batFilePath=mg.get_var(post, 'batFilePath')
     rs.recFolderList={}
@@ -81,22 +81,22 @@ if post and (aa.dataID==0 or lastRecSetting) then
     si=aa.searchInfo
     si.andKey=(mg.get_var(post, 'disableFlag') and '^!{999}' or '')..(mg.get_var(post, 'andKey') or '')
     si.notKey=mg.get_var(post, 'notKey') or ''
-    si.regExpFlag=0+(mg.get_var(post, 'regExpFlag') or 0)~=0
-    si.titleOnlyFlag=0+(mg.get_var(post, 'titleOnlyFlag') or 0)~=0
-    si.aimaiFlag=0+(mg.get_var(post, 'aimaiFlag') or 0)~=0
-    si.notContetFlag=0+(mg.get_var(post, 'notContetFlag') or 0)~=0
-    si.notDateFlag=0+(mg.get_var(post, 'notDateFlag') or 0)~=0
-    si.freeCAFlag=0+(mg.get_var(post, 'freeCAFlag') or 0)
-    si.chkRecEnd=0+(mg.get_var(post, 'chkRecEnd') or 0)~=0
-    si.chkRecDay=0+(mg.get_var(post, 'chkRecDay') or 0)
-    si.chkRecNoService=0+(mg.get_var(post, 'chkRecNoService') or 0)~=0
-    si.chkDurationMin=0+(mg.get_var(post, 'chkDurationMin') or 0)
-    si.chkDurationMax=0+(mg.get_var(post, 'chkDurationMax') or 0)
+    si.regExpFlag=(tonumber(mg.get_var(post, 'regExpFlag')) or 0)~=0
+    si.titleOnlyFlag=(tonumber(mg.get_var(post, 'titleOnlyFlag')) or 0)~=0
+    si.aimaiFlag=(tonumber(mg.get_var(post, 'aimaiFlag')) or 0)~=0
+    si.notContetFlag=(tonumber(mg.get_var(post, 'notContetFlag')) or 0)~=0
+    si.notDateFlag=(tonumber(mg.get_var(post, 'notDateFlag')) or 0)~=0
+    si.freeCAFlag=tonumber(mg.get_var(post, 'freeCAFlag')) or 0
+    si.chkRecEnd=(tonumber(mg.get_var(post, 'chkRecEnd')) or 0)~=0
+    si.chkRecDay=tonumber(mg.get_var(post, 'chkRecDay')) or 0
+    si.chkRecNoService=(tonumber(mg.get_var(post, 'chkRecNoService')) or 0)~=0
+    si.chkDurationMin=tonumber(mg.get_var(post, 'chkDurationMin')) or 0
+    si.chkDurationMax=tonumber(mg.get_var(post, 'chkDurationMax')) or 0
     si.contentList={}
     for i=0,10000 do
       v=mg.get_var(post, 'contentList', i)
       if not v then break end
-      table.insert(si.contentList, {content_nibble=0+v})
+      table.insert(si.contentList, {content_nibble=tonumber(v) or 0})
     end
     si.serviceList={}
     for i=0,10000 do

HttpPublic/api/AutoAddEPGDelKey

@@ -7,7 +7,7 @@ post=ReadPost()
 AssertCsrf(post)
 
 if post then
-  edcb.DelAutoAdd(0+(mg.get_var(mg.request_info.query_string,'id') or 0))
+  edcb.DelAutoAdd(tonumber(mg.get_var(mg.request_info.query_string,'id')) or 0))
   ct=ct..'<success>EPG自動予約を削除しました</success></entry>'
 else
   ct=ct..'<err>EPG自動予約を削除できませんでした</err></entry>'

HttpPublic/api/EnumAutoAdd

@@ -1,5 +1,5 @@
 path='Setting\\HttpPublic.ini'
-option=0+edcb.GetPrivateProfile('SET','option',false,path)~=0
+option=tonumber(edcb.GetPrivateProfile('SET','option',false,path))~=0
 
 edcb.htmlEscape=15
 a=edcb.EnumAutoAdd()

HttpPublic/api/EnumEventInfo

@@ -9,9 +9,9 @@ ct={'<?xml version="1.0" encoding="UTF-8" ?'..'>'}
 if not a then
   table.insert(ct, '<entry><err>EPGデータを読み込み中、または存在しません</err></entry>')
 else
-  basic=0+(mg.get_var(mg.request_info.query_string,'basic') or 1)~=0
-  index=math.max(0+(mg.get_var(mg.request_info.query_string,'index') or 0),0)
-  count=math.max(0+(mg.get_var(mg.request_info.query_string,'count') or 200),0)
+  basic=(tonumber(mg.get_var(mg.request_info.query_string,'basic')) or 1)~=0
+  index=math.max(tonumber(mg.get_var(mg.request_info.query_string,'index')) or 0),0)
+  count=math.max(tonumber(mg.get_var(mg.request_info.query_string,'count')) or 200),0)
   countTo=math.min(index+count,#a)
   table.insert(ct, '<entry><total>'..#a..'</total><index>'..index..'</index><count>'..math.max(countTo-index,0)..'</count><items>\r\n')
   for i=index+1,countTo do

HttpPublic/api/EnumRecPreset

@@ -1,5 +1,5 @@
 path='Setting\\HttpPublic.ini'
-option=0+edcb.GetPrivateProfile('SET','option',false,path)~=0
+option=tonumber(edcb.GetPrivateProfile('SET','option',false,path))~=0
 
 edcb.htmlEscape=15
 a=edcb.EnumRecPresetInfo()

HttpPublic/api/EnumReserveInfo

@@ -1,5 +1,5 @@
 path='Setting\\HttpPublic.ini'
-option=0+edcb.GetPrivateProfile('SET','option',false,path)~=0
+option=tonumber(edcb.GetPrivateProfile('SET','option',false,path))~=0
 
 edcb.htmlEscape=15
 a=edcb.GetReserveData()

HttpPublic/api/Library

@@ -2,7 +2,7 @@
 dofile(mg.document_root..'\\api\\util.lua')
 
 path='Setting\\HttpPublic.ini'
-LibraryPath=0+edcb.GetPrivateProfile('SET','LibraryPath',0,path)~=0 and path or 'Common.ini'
+LibraryPath=tonumber(edcb.GetPrivateProfile('SET','LibraryPath',0,path))~=0 and path or 'Common.ini'
 
 ct={'<?xml version="1.0" encoding="UTF-8" ?'..'><entry>'}
 
@@ -43,7 +43,7 @@ if status then
 
   table.insert(ct, '<dir><name>ホーム</name><id>home</id>')
 
-  count=0+edcb.GetPrivateProfile('SET','RecFolderNum',0,LibraryPath)-1
+  count=tonumber(edcb.GetPrivateProfile('SET','RecFolderNum',0,LibraryPath))-1
   for i=0,count do
     dir=edcb.GetPrivateProfile('SET','RecFolderPath'..i,'',LibraryPath)
     Public=NativeToDocumentPath(dir)

HttpPublic/api/Movie

@@ -9,7 +9,7 @@ ffmpeg=edcb.GetPrivateProfile('SET','ffmpeg','Tools\\ffmpeg',path)
 readex=edcb.GetPrivateProfile('SET','readex','Tools\\readex',path)
 
 -- トランスコードするかどうか
-XCODE=0+(mg.get_var(mg.request_info.query_string, 'xcode') and 0 or 1)~=0
+XCODE=tonumber(mg.get_var(mg.request_info.query_string, 'xcode') and 0 or 1)~=0
 -- 変換コマンド
 quality=mg.get_var(mg.request_info.query_string, 'quality') or nil
 
@@ -22,7 +22,7 @@ XCMD=ffmpeg..' -i pipe:0 '..XOPT
 -- 変換後の拡張子
 XEXT='.webm'
 -- 転送開始前に変換しておく量(bytes)
-XPREPARE=0+edcb.GetPrivateProfile('SET','xprepare',48128,path)
+XPREPARE=tonumber(edcb.GetPrivateProfile('SET','xprepare',48128,path))
 
 fname=mg.get_var(mg.request_info.query_string,'fname') or nil
 
@@ -50,7 +50,7 @@ elseif v then
 end
 
 -- 転送開始位置(99分率)(容量確保録画には未対応)
-offset=0+(mg.get_var(mg.request_info.query_string,'offset') or 0)
+offset=tonumber(mg.get_var(mg.request_info.query_string,'offset')) or 0
 
 f=nil
 if fname then

HttpPublic/api/OneClickAdd

@@ -1,10 +1,10 @@
 dofile(mg.document_root..'\\api\\util.lua')
 
 added=false
-onid=0+(mg.get_var(mg.request_info.query_string,'onid') or 0)
-tsid=0+(mg.get_var(mg.request_info.query_string,'tsid') or 0)
-sid=0+(mg.get_var(mg.request_info.query_string,'sid') or 0)
-eid=0+(mg.get_var(mg.request_info.query_string,'eid') or 0)
+onid=tonumber(mg.get_var(mg.request_info.query_string,'onid')) or 0
+tsid=tonumber(mg.get_var(mg.request_info.query_string,'tsid')) or 0
+sid=tonumber(mg.get_var(mg.request_info.query_string,'sid')) or 0
+eid=tonumber(mg.get_var(mg.request_info.query_string,'eid')) or 0
 
 edcb.htmlEscape=15
   r={}

HttpPublic/api/RecInfoDel

@@ -7,7 +7,7 @@ post=ReadPost()
 AssertCsrf(post)
 
 if post then
-  edcb.DelRecFileInfo(0+(mg.get_var(mg.request_info.query_string,'id') or 0))
+  edcb.DelRecFileInfo(tonumber(mg.get_var(mg.request_info.query_string,'id')) or 0)
   ct=ct..'<success>録画情報を削除しました</success></entry>'
 else
   ct=ct..'<err>録画情報を削除できませんでした</err></entry>'

HttpPublic/api/ReserveAdd

@@ -7,25 +7,25 @@ AssertCsrf(post)
 added=false
 if post then
   r={recSetting={}}
-  r.onid=0+(mg.get_var(post, 'onid') or 0)
-  r.tsid=0+(mg.get_var(post, 'tsid') or 0)
-  r.sid=0+(mg.get_var(post, 'sid') or 0)
-  r.eid=0+(mg.get_var(post, 'eid') or 0)
-  presetID=mg.get_var(post, 'presetID')
-  recMode=mg.get_var(post, 'recMode')
-  tuijyuuFlag=mg.get_var(post, 'tuijyuuFlag')
-  priority=mg.get_var(post, 'priority')
-  pittariFlag=mg.get_var(post, 'pittariFlag')
-  suspendMode=mg.get_var(post, 'suspendMode')
+  r.onid=tonumber(mg.get_var(post, 'onid')) or 0
+  r.tsid=tonumber(mg.get_var(post, 'tsid')) or 0
+  r.sid=tonumber(mg.get_var(post, 'sid')) or 0
+  r.eid=tonumber(mg.get_var(post, 'eid')) or 0
+  presetID=tonumber(mg.get_var(post, 'presetID'))
+  recMode=tonumber(mg.get_var(post, 'recMode'))
+  tuijyuuFlag=tonumber(mg.get_var(post, 'tuijyuuFlag'))
+  priority=tonumber(mg.get_var(post, 'priority'))
+  pittariFlag=tonumber(mg.get_var(post, 'pittariFlag'))
+  suspendMode=tonumber(mg.get_var(post, 'suspendMode'))
   rebootFlag=mg.get_var(post, 'rebootFlag')
   useDefMarginFlag=mg.get_var(post, 'useDefMarginFlag')
-  startMargin=mg.get_var(post, 'startMargin')
-  endMargin=mg.get_var(post, 'endMargin')
+  startMargin=tonumber(mg.get_var(post, 'startMargin'))
+  endMargin=tonumber(mg.get_var(post, 'endMargin'))
   serviceMode=mg.get_var(post, 'serviceMode')
   serviceMode_1=mg.get_var(post, 'serviceMode_1')
   serviceMode_2=mg.get_var(post, 'serviceMode_2')
   continueRecFlag=mg.get_var(post, 'continueRecFlag')
-  tunerID=mg.get_var(post, 'tunerID')
+  tunerID=tonumber(mg.get_var(post, 'tunerID'))
   partialRecFlag=mg.get_var(post, 'partialRecFlag')
   eventInfo=edcb.SearchEpg(r.onid, r.tsid, r.sid, r.eid)
   if eventInfo and eventInfo.startTime and eventInfo.durationSecond and
@@ -66,19 +66,19 @@ if post then
         recNamePlugIn=mg.get_var(post, 'partialrecNamePlugIn', i)..(mg.get_var(post, 'partialrecName', i) and #mg.get_var(post, 'partialrecName', i)>0 and '?'..mg.get_var(post, 'partialrecName', i) or '') or ''
       } )
     end
-    rs.recMode=0+recMode
-    rs.tuijyuuFlag=0+(tuijyuuFlag or 0)~=0
-    rs.priority=0+priority
-    rs.pittariFlag=0+(pittariFlag or 0)~=0
-    rs.suspendMode=0+suspendMode
+    rs.recMode=recMode
+    rs.tuijyuuFlag=tuijyuuFlag~=0
+    rs.priority=priority
+    rs.pittariFlag=pittariFlag~=0
+    rs.suspendMode=suspendMode
     rs.rebootFlag=rebootFlag~=nil
     if not useDefMarginFlag then
-      rs.startMargin=0+startMargin
-      rs.endMargin=0+endMargin
+      rs.startMargin=startMargin
+      rs.endMargin=endMargin
     end
     rs.serviceMode=serviceMode and 0 or 1+(serviceMode_1 and 16 or 0)+(serviceMode_2 and 32 or 0)
     rs.continueRecFlag=continueRecFlag~=nil
-    rs.tunerID=0+tunerID
+    rs.tunerID=tunerID
     rs.partialRecFlag=partialRecFlag and 1 or 0
     added=edcb.AddReserveData(r)
   end

HttpPublic/api/ReserveChg

@@ -5,23 +5,23 @@ post=ReadPost()
 AssertCsrf(post)
 
 changed=false
-r=edcb.GetReserveData(0+(mg.get_var(mg.request_info.query_string, 'id') or 0))
+r=edcb.GetReserveData(tonumber(mg.get_var(mg.request_info.query_string, 'id')) or 0)
 if post and r then
-  presetID=mg.get_var(post, 'presetID')
-  recMode=mg.get_var(post, 'recMode')
-  tuijyuuFlag=mg.get_var(post, 'tuijyuuFlag')
-  priority=mg.get_var(post, 'priority')
-  pittariFlag=mg.get_var(post, 'pittariFlag')
-  suspendMode=mg.get_var(post, 'suspendMode')
+  presetID=tonumber(mg.get_var(post, 'presetID'))
+  recMode=tonumber(mg.get_var(post, 'recMode'))
+  tuijyuuFlag=tonumber(mg.get_var(post, 'tuijyuuFlag'))
+  priority=tonumber(mg.get_var(post, 'priority'))
+  pittariFlag=tonumber(mg.get_var(post, 'pittariFlag'))
+  suspendMode=tonumber(mg.get_var(post, 'suspendMode'))
   rebootFlag=mg.get_var(post, 'rebootFlag')
   useDefMarginFlag=mg.get_var(post, 'useDefMarginFlag')
-  startMargin=mg.get_var(post, 'startMargin')
-  endMargin=mg.get_var(post, 'endMargin')
+  startMargin=tonumber(mg.get_var(post, 'startMargin'))
+  endMargin=tonumber(mg.get_var(post, 'endMargin'))
   serviceMode=mg.get_var(post, 'serviceMode')
   serviceMode_1=mg.get_var(post, 'serviceMode_1')
   serviceMode_2=mg.get_var(post, 'serviceMode_2')
   continueRecFlag=mg.get_var(post, 'continueRecFlag')
-  tunerID=mg.get_var(post, 'tunerID')
+  tunerID=tonumber(mg.get_var(post, 'tunerID'))
   partialRecFlag=mg.get_var(post, 'partialRecFlag')
   if presetID and
      recMode and
@@ -49,21 +49,21 @@ if post and r then
         recNamePlugIn=mg.get_var(post, 'partialrecNamePlugIn', i)..(mg.get_var(post, 'partialrecName', i) and #mg.get_var(post, 'partialrecName', i)>0 and '?'..mg.get_var(post, 'partialrecName', i) or '') or ''
       } )
     end
-    rs.recMode=0+recMode
-    rs.tuijyuuFlag=0+(tuijyuuFlag or 0)~=0
-    rs.priority=0+priority
-    rs.pittariFlag=0+(pittariFlag or 0)~=0
-    rs.suspendMode=0+suspendMode
+    rs.recMode=recMode
+    rs.tuijyuuFlag=tuijyuuFlag~=0
+    rs.priority=priority
+    rs.pittariFlag=pittariFlag~=0
+    rs.suspendMode=suspendMode
     rs.rebootFlag=rebootFlag~=nil
     rs.startMargin=nil
     rs.endMargin=nil
     if not useDefMarginFlag then
-      rs.startMargin=0+startMargin
-      rs.endMargin=0+endMargin
+      rs.startMargin=startMargin
+      rs.endMargin=endMargin
     end
     rs.serviceMode=serviceMode and 0 or 1+(serviceMode_1 and 16 or 0)+(serviceMode_2 and 32 or 0)
     rs.continueRecFlag=continueRecFlag~=nil
-    rs.tunerID=0+tunerID
+    rs.tunerID=tunerID
     rs.partialRecFlag=partialRecFlag and 1 or 0
     changed=edcb.ChgReserveData(r)
   end

HttpPublic/api/ReserveDel

@@ -5,7 +5,7 @@ post=ReadPost()
 AssertCsrf(post)
 
 if post then
-  edcb.DelReserveData(0+(mg.get_var(mg.request_info.query_string,'id') or 0))
+  edcb.DelReserveData(tonumber(mg.get_var(mg.request_info.query_string,'id')) or 0)
   del=true
 end
 ct='<?xml version="1.0" encoding="UTF-8" ?'..'><entry>'

HttpPublic/api/ReserveToggle

@@ -1,6 +1,6 @@
 dofile(mg.document_root..'\\api\\util.lua')
 
-id=0+(mg.get_var(mg.request_info.query_string, 'id') or 0)
+id=tonumber(mg.get_var(mg.request_info.query_string, 'id')) or 0
 
 changed=false
 

HttpPublic/api/SaveSettings

@@ -36,15 +36,15 @@ elseif post then
 
   AssertCsrf(post)
 
-  tkntrec=0+(mg.get_var(post, 'tkntrec') or 0)~=0
-  option=0+(mg.get_var(post, 'option') or 0)~=0
-  Roboto=0+(mg.get_var(post, 'Roboto') or 0)~=0
+  tkntrec=tonumber(mg.get_var(post, 'tkntrec')) or 0~=0
+  option=tonumber(mg.get_var(post, 'option')) or 0~=0
+  Roboto=tonumber(mg.get_var(post, 'Roboto')) or 0~=0
   subGenreoption=(mg.get_var(post, 'subGenreoption') or '')
   PAGE_COUNT=(mg.get_var(post, 'PAGE_COUNT') or '')
 
-  Light_Mode=0+(mg.get_var(post, 'Light_Mode') or 0)~=0
-  oneseg=0+(mg.get_var(post, 'oneseg') or 0)~=0
-  hover=0+(mg.get_var(post, 'hover') or 0)~=0
+  Light_Mode=tonumber(mg.get_var(post, 'Light_Mode')) or 0~=0
+  oneseg=tonumber(mg.get_var(post, 'oneseg')) or 0~=0
+  hover=tonumber(mg.get_var(post, 'hover')) or 0~=0
   ONE_MIN_PX=(mg.get_var(post, 'ONE_MIN_PX') or '')
   MARGIN_HOUR=(mg.get_var(post, 'MARGIN_HOUR') or '')
   MARGIN_MIN=(mg.get_var(post, 'MARGIN_MIN') or '')
@@ -74,7 +74,7 @@ elseif post then
   none=(mg.get_var(post, 'none') or '')
   nothing=(mg.get_var(post, 'nothing') or '')
 
-  paint=0+(mg.get_var(post, 'paint') or 0)~=0
+  paint=tonumber(mg.get_var(post, 'paint')) or 0~=0
   reserved=(mg.get_var(post, 'reserved') or '')
   disable=(mg.get_var(post, 'disable') or '')
   partially=(mg.get_var(post, 'partially') or '')