diff options
| -rwxr-xr-x | bin/backend.php | 6 | ||||
| -rwxr-xr-x | bin/jsonapi.php | 5 | ||||
| -rwxr-xr-x | bin/vdr.php | 41 |
3 files changed, 40 insertions, 12 deletions
diff --git a/bin/backend.php b/bin/backend.php index 8619c89..9be4b28 100755 --- a/bin/backend.php +++ b/bin/backend.php @@ -96,11 +96,7 @@ switch ($action) break; case ("editTimer"): - $id = $_REQUEST['id']; - if (id) - $tree = file_get_contents("textfiles/editTimer.txt"); - else - $tree = file_get_contents("textfiles/addTimer.txt"); + $tree = editTimer($_REQUEST['id'], $_REQUEST['name'], $_REQUEST['active'], $_REQUEST['channumber'], $_REQUEST['date'], $_REQUEST['starttime'], $_REQUEST['endtime']); print $tree; break; diff --git a/bin/jsonapi.php b/bin/jsonapi.php index 8f144d9..d4f96ac 100755 --- a/bin/jsonapi.php +++ b/bin/jsonapi.php @@ -142,7 +142,12 @@ function delTimer($id) return json_encode($ret); } +function editTimer($id, $name, $active, $channumber, $date, $starttime, $endtime) +{ + $ret = vdrsettimer($id, $channumber, $date, $starttime, $endtime, $name, $active); + return json_encode($ret); +} function getRunningSessions() { diff --git a/bin/vdr.php b/bin/vdr.php index d0df102..4253856 100755 --- a/bin/vdr.php +++ b/bin/vdr.php @@ -371,26 +371,53 @@ function vdrdeltimer($timer) { $ret = array(); - $ret['status'] = "ok"; - $ret['message'] = vdrsendcommand("DELT " .$timer); + $message = vdrsendcommand("DELT " .$timer); + + if ($message == 'Timer "' .$timer .'" deleted') + { + $ret['status'] = "Ok"; + $ret['message'] = "Timer successfully deleted"; + } + else + { + $ret['status'] = "Error"; + $ret['message'] = $message; + } return $ret; } -function vdrsettimer($prevtimer, $channame, $date, $stime, $etime, $desc, $active) +function vdrsettimer($prevtimer, $channum, $date, $stime, $etime, $desc, $active) { - $channum = vdrgetchannum($channame); - if ($active) + $ret = array(); + + if ($active == 'on') $type = "1"; else $type = "0"; - if ($prevtimer == -1) + if ($prevtimer == "") $command = "NEWT " .$type .":" .$channum .":" .$date .":" .$stime .":" .$etime .":99:99:" .$desc; else $command = "MODT " .$prevtimer ." " .$type .":" .$channum .":" .$date .":" .$stime .":" .$etime .":99:99:" .$desc; - return vdrsendcommand($command); + $message = vdrsendcommand($command); + + if (is_numeric(substr($message, 0, 1))) + { + $ret['status'] = "Ok"; + if ($prevtimer == "") + $ret['message'] = "Timer created successfully"; + else + $ret['message'] = "Timer edited successfully"; + } + else + { + $ret['status'] = "Error"; + $ret['message'] = $message; + } + + return $ret; } ?> |