Add support for view-only mode.

diff --git a/inc/base.php b/inc/base.php
index fbc1072a972e5c5821329c3a196e08b7a89a18f8..75a73f7ca4f6670b1ca141296721f0c080168b53 100644 (file)
--- a/inc/base.php
+++ b/inc/base.php
@@ -42,8 +42,15 @@ if(!is_theme_dir_ok($theme_dir . $selected_theme))
 
 $lpass = get_config('login_pass');
 
 
 $lpass = get_config('login_pass');
 

+$rw = true;
+$ro = false;
+if(isset($_SESSION['logged_in']) && ($_SESSION['logged_in'] == "ro")) {
+       $rw = false;
+       $ro = true;
+}
+

 if(!is_null($lpass)&&$lpass!="") {
 if(!is_null($lpass)&&$lpass!="") {

-       if(!isset($_SESSION['logged_in'])||!$_SESSION['logged_in']) {
+       if(!isset($_SESSION['logged_in'])||!$_SESSION['logged_in'] || ($need_rw && !$rw)) {

                if(!isset($no_require_login)) {
                        header("Location: login.php");
                        echo "Wrong password";
                if(!isset($no_require_login)) {
                        header("Location: login.php");
                        echo "Wrong password";


@@ -52,6 +59,7 @@ if(!is_null($lpass)&&$lpass!="") {
        }
 }
 
        }
 }
 

+

 function get_config($name, $default = null) {
        global $config;
        if(isset($config->$name)) {
 function get_config($name, $default = null) {
        global $config;
        if(isset($config->$name)) {

diff --git a/player/command.php b/player/command.php
index 25b2575bb4654f163b5b646177e73ccb26c2f06f..f21034319c62befcf75f8c9833e885c2bea898b4 100644 (file)
--- a/player/command.php
+++ b/player/command.php
@@ -207,7 +207,7 @@
                echo array_to_json($v);
                exit();
        }
                echo array_to_json($v);
                exit();
        }

-       else if(isset($_GET['add'])||isset($_GET['ma'])||isset($_GET['searchadd'])) {
+       else if(isset($_GET['add'])||isset($_GET['ma'])||isset($_GET['searchadd'])&&$rw) {

                /* for automatic playback start */
                try {
                        $s = $pl->getStatus();
                /* for automatic playback start */
                try {
                        $s = $pl->getStatus();


@@ -225,7 +225,7 @@
        if(isset($_GET['playlist'])) {
                $act = $_GET['playlist'];
                try {
        if(isset($_GET['playlist'])) {
                $act = $_GET['playlist'];
                try {

-                       if($act=="move"&&isset($_GET['from'])&&isset($_GET['to'])) {
+                       if($act=="move"&&isset($_GET['from'])&&isset($_GET['to'])&&$rw) {

                                // todo: sanity check
                                $response = null; 
                                if($pl->moveSongId($_GET['from'], $_GET['to'])) 
                                // todo: sanity check
                                $response = null; 
                                if($pl->moveSongId($_GET['from'], $_GET['to'])) 


@@ -253,7 +253,7 @@
                        $json = array ('result' => PF_FAILURE);
                }
        }
                        $json = array ('result' => PF_FAILURE);
                }
        }

-       else if(isset($_GET['rangemove'])&&is_numeric(trim($_GET['rangemove']))&&isset($_GET['elems'])) {
+       else if(isset($_GET['rangemove'])&&is_numeric(trim($_GET['rangemove']))&&isset($_GET['elems'])&&$rw) {

                $res = PF_FAILURE;
                $dest = intval($_GET['rangemove']);
                $pos_offset = 0;
                $res = PF_FAILURE;
                $dest = intval($_GET['rangemove']);
                $pos_offset = 0;


@@ -293,7 +293,7 @@
                $result = "pong";
                $json = array("result" => $result);
        }
                $result = "pong";
                $json = array("result" => $result);
        }

-       else if(isset($_GET['volume'])&&is_numeric(trim($_GET['volume']))) {
+       else if(isset($_GET['volume'])&&is_numeric(trim($_GET['volume']))&&$rw) {

                $res = PF_FAILURE;
                try {
                        $volume = trim($_GET['volume']);
                $res = PF_FAILURE;
                try {
                        $volume = trim($_GET['volume']);


@@ -307,7 +307,7 @@
                $json = array("result" => $res);
        }
        else if(isset($_GET['position'])&&is_numeric(trim($_GET['position']))
                $json = array("result" => $res);
        }
        else if(isset($_GET['position'])&&is_numeric(trim($_GET['position']))

-               && isset($_GET['id']) && is_numeric(trim($_GET['id']))) {
+               && isset($_GET['id']) && is_numeric(trim($_GET['id'])) && $rw) {

                $result = PF_FAILURE;
                try {
                        $pos = trim($_GET['position']);
                $result = PF_FAILURE;
                try {
                        $pos = trim($_GET['position']);


@@ -395,7 +395,7 @@
                }
                $json = array("result" => $res);
        }
                }
                $json = array("result" => $res);
        }

-       else if(isset($_GET['act'])) {
+       else if(isset($_GET['act']) && $rw) {

                $act = trim($_GET['act']);
                $result = "failure";
                try {
                $act = trim($_GET['act']);
                $result = "failure";
                try {


@@ -438,7 +438,7 @@
                }
                $json = array("result" => $result);
        }
                }
                $json = array("result" => $result);
        }

-       else if(isset($_GET['add'])) {
+       else if(isset($_GET['add']) && $rw) {

                $add = $_GET['add'];
                try {
                        $res = PF_FAILURE;
                $add = $_GET['add'];
                try {
                        $res = PF_FAILURE;


@@ -451,7 +451,7 @@
                }
                $json = array("result" => $res);
        }
                }
                $json = array("result" => $res);
        }

-       else if(isset($_GET['remove'])) {
+       else if(isset($_GET['remove']) && $rw) {

                $arr = selection_to_reverse_list($_GET['remove']);
                $res = "ok";
                try {
                $arr = selection_to_reverse_list($_GET['remove']);
                $res = "ok";
                try {


@@ -465,7 +465,7 @@
                }
                $json = array("result" => $res);
        }
                }
                $json = array("result" => $res);
        }

-       else if(isset($_GET['updatedb'])) {
+       else if(isset($_GET['updatedb']) && $rw) {

                $res = PF_FAILURE;
                try {
                        $adm = get_admin();
                $res = PF_FAILURE;
                try {
                        $adm = get_admin();


@@ -478,7 +478,7 @@
                }
                $json = array("result" => $res);
        }
                }
                $json = array("result" => $res);
        }

-       else if(isset($_GET['outputs'])||isset($_GET['output_e'])||isset($_GET['output_d'])) {
+       else if(isset($_GET['outputs'])||isset($_GET['output_e'])||isset($_GET['output_d']) && $rw) {

                $res = PF_FAILURE;
                try {
                        $admin = get_admin();
                $res = PF_FAILURE;
                try {
                        $admin = get_admin();


@@ -495,7 +495,7 @@
                }
                $json = array("result" => $res);
        }
                }
                $json = array("result" => $res);
        }

-       else if(isset($_GET['random'])) {
+       else if(isset($_GET['random'])&&$rw) {

                $res = "failure";
                try {
                        $play = get_playback(); 
                $res = "failure";
                try {
                        $play = get_playback(); 


@@ -510,7 +510,7 @@
                $json = array("result" => $res);
 
        }
                $json = array("result" => $res);
 
        }

-       else if(isset($_GET['repeat'])) {
+       else if(isset($_GET['repeat'])&&$rw) {

                $res = "failure";
                try {
                        $play = get_playback(); 
                $res = "failure";
                try {
                        $play = get_playback(); 


@@ -524,7 +524,7 @@
                }
                $json = array("result" => $res);
        }
                }
                $json = array("result" => $res);
        }

-       else if(isset($_GET['xfade'])&&is_numeric($_GET['xfade'])) {
+       else if(isset($_GET['xfade'])&&is_numeric($_GET['xfade'])&&$rw) {

                $res = PF_FAILURE;
                try {
                        $play = get_playback(); 
                $res = PF_FAILURE;
                try {
                        $play = get_playback(); 


@@ -587,7 +587,7 @@
                                $params["Album"] = $album;
 
 
                                $params["Album"] = $album;
 
 

-                       if(isset($_GET['searchadd'])) {
+                       if(isset($_GET['searchadd'])&&$rw) {

                                if(search_add($db, $pl, $params)) {
                                        $res = "ok";
                                        $something_added = true;
                                if(search_add($db, $pl, $params)) {
                                        $res = "ok";
                                        $something_added = true;


@@ -708,7 +708,7 @@
                }
                $json = array("result" => $res);
        }
                }
                $json = array("result" => $res);
        }

-       else if(isset($_GET['ma'])) {
+       else if(isset($_GET['ma'])&&$rw) {

                /* note to self: should merge single add with this */
                $res = PF_FAILURE;
                if (!isset($HTTP_RAW_POST_DATA))
                /* note to self: should merge single add with this */
                $res = PF_FAILURE;
                if (!isset($HTTP_RAW_POST_DATA))


@@ -755,7 +755,7 @@
                $json = array("result" => $res);
        }
        else if(isset($_GET['playlist_rm'])||isset($_GET['playlist_load'])
                $json = array("result" => $res);
        }
        else if(isset($_GET['playlist_rm'])||isset($_GET['playlist_load'])

-               ||isset($_GET['playlist_save'])||isset($_GET['playlist_add_url'])) {
+               ||isset($_GET['playlist_save'])||isset($_GET['playlist_add_url'])&&$rw) {

 
                $res = false;
                try {
 
                $res = false;
                try {

diff --git a/player/config.php b/player/config.php
index 748156cf8e6166ded6671246fd209e6be22ae08d..7b74547a18f213b521e94762c217e18d0ba57c38 100644 (file)
--- a/player/config.php
+++ b/player/config.php
@@ -44,6 +44,7 @@
 
        $title = "";
        @ob_start();
 
        $title = "";
        @ob_start();

+       $need_rw = true;

        require_once("../inc/base.php");
        require_once("../lang/master.php");
        header("Content-Type: text/html; charset=UTF-8");
        require_once("../inc/base.php");
        require_once("../lang/master.php");
        header("Content-Type: text/html; charset=UTF-8");


@@ -104,7 +105,7 @@
                $config = simplexml_load_string("<?xml version='1.0' ?>\n<root>\n</root>\n");
        }
        if(isset($_POST['submit'])) {
                $config = simplexml_load_string("<?xml version='1.0' ?>\n<root>\n</root>\n");
        }
        if(isset($_POST['submit'])) {

-               $vars = array( 'mpd_host', 'mpd_port', 'mpd_pass', 'login_pass', 'update_delay', 
+               $vars = array( 'mpd_host', 'mpd_port', 'mpd_pass', 'login_pass', 'ro_pass', 'update_delay', 

                                'metadata_disable', 'theme', 'stop_button', 'shout_url', 'pagination', 'lang',
                                'aws_keyid', 'aws_secret');
                foreach ($vars as $var) {
                                'metadata_disable', 'theme', 'stop_button', 'shout_url', 'pagination', 'lang',
                                'aws_keyid', 'aws_secret');
                foreach ($vars as $var) {


@@ -117,7 +118,7 @@
                                        $add = 0;
                                else $add = intval($add);
                        }
                                        $add = 0;
                                else $add = intval($add);
                        }

-                       else if($var=="login_pass"&&strlen($add)>0) {
+                       else if(($var=="login_pass" || $var == "ro_pass") &&strlen($add)>0) {

                                if($add== HASH_PASS)
                                        continue;
                                $add = generate_hash($add);
                                if($add== HASH_PASS)
                                        continue;
                                $add = generate_hash($add);


@@ -206,6 +207,18 @@
        }
 
 ?>' name='login_pass' /></td></tr>
        }
 
 ?>' name='login_pass' /></td></tr>

+       <tr><td><?php echo m("View-only password (optional):");?>
+       </td><td><input type='password' title='<?php echo m("If you want to allow users to view and listen, but not modify, specify a view-only password here");?>' value='<?php 
+       
+       $pass = get_config('ro_pass', '');
+       if(substr($pass,0, 4)=="sha:") {
+               echo HASH_PASS;
+       }
+       else {
+               echo htmlspecialchars($pass);
+       }
+
+?>' name='ro_pass' /></td></tr>

 <tr><td><?php echo m("Theme:");?> </td>
 <td>
 <select name='theme'>
 <tr><td><?php echo m("Theme:");?> </td>
 <td>
 <select name='theme'>

diff --git a/player/index.php b/player/index.php
index fa6d768b141b53b046ab732fa95970f113137896..1044e998e22656a7c86833d24f3273df42fe4dc1 100644 (file)
--- a/player/index.php
+++ b/player/index.php
@@ -68,10 +68,14 @@
 
        <div class='pc_ci' >
                <div class='nomargin'>
 
        <div class='pc_ci' >
                <div class='nomargin'>

+       <? if ($ro) { ?>
+               <b>[<?=m("view only")?>]</b><br>
+       <? } else { ?>

                <img id='previous_button' class='act_button fakelink'/>
                <img id='stop_button' style='display: none; ' class='act_button fakelink' />
                <img id='pp_button' class='act_button fakelink' />
                <img id='next_button' class='act_button fakelink'/>
                <img id='previous_button' class='act_button fakelink'/>
                <img id='stop_button' style='display: none; ' class='act_button fakelink' />
                <img id='pp_button' class='act_button fakelink' />
                <img id='next_button' class='act_button fakelink'/>

+       <? } ?>

                </div>
                <p class='disp'><span id="disp_info"></span></p>
                <input type='text' id='quickadd' value='<?php echo m("Quick add"); ?>' />
                </div>
                <p class='disp'><span id="disp_info"></span></p>
                <input type='text' id='quickadd' value='<?php echo m("Quick add"); ?>' />


@@ -96,6 +100,11 @@
                <li class='menuitem fakelink' title='<?php echo m("Search current playlist"); ?>' 
                                id='playlist_search_btn' ><?php echo m("Search playlist"); ?></li>
                <li class='menuitem' ><a class='pc_other' href='config.php'><?php echo m("Configure"); ?></a></li>
                <li class='menuitem fakelink' title='<?php echo m("Search current playlist"); ?>' 
                                id='playlist_search_btn' ><?php echo m("Search playlist"); ?></li>
                <li class='menuitem' ><a class='pc_other' href='config.php'><?php echo m("Configure"); ?></a></li>

+               <? if ($ro) { ?>
+                       <li class='menuitem' ><a class='pc_other' href='login.php'><?php echo m("Log in"); ?></a></li>
+               <? } else if (isset($_SESSION['logged_in'])) { ?>
+                       <li class='menuitem' ><a class='pc_other' href='login.php?logout'><?php echo m("Log out"); ?></a></li>
+               <? } ?>

 
                <?php 
                if(!is_null(get_config("shout_url"))) 
 
                <?php 
                if(!is_null(get_config("shout_url"))) 

diff --git a/player/login.php b/player/login.php
index 4ad58e281820eb90c6346d2abe112dfdd09bc126..84b1122229fac669cf9c3be12292c72589c4539e 100644 (file)
--- a/player/login.php
+++ b/player/login.php
@@ -19,24 +19,38 @@
        $error = false;
        $no_require_login = "true";
        require_once("../inc/base.php");
        $error = false;
        $no_require_login = "true";
        require_once("../inc/base.php");

-       if(isset($_POST['password'])) {
+       if(isset($_POST['password']) && $_POST['password'] != "") {

                $pass = get_config("login_pass");
                if(substr($pass,0, 4)=="sha:") {
                        if(check_hash($pass, trim($_POST['password']))) {
                $pass = get_config("login_pass");
                if(substr($pass,0, 4)=="sha:") {
                        if(check_hash($pass, trim($_POST['password']))) {

-                               $_SESSION['logged_in'] = true;
+                               $_SESSION['logged_in'] = "rw";

                                header("Location: index.php");
                                exit(); 
                        }
                        $error = "Login failed";
                }
                else if($pass==trim($_POST['password'])) {
                                header("Location: index.php");
                                exit(); 
                        }
                        $error = "Login failed";
                }
                else if($pass==trim($_POST['password'])) {

-                       $_SESSION['logged_in'] = true;
+                       $_SESSION['logged_in'] = "rw";

                        header("Location: index.php");
                        exit(); 
                }
                        header("Location: index.php");
                        exit(); 
                }

-               else {
+               
+               $pass = get_config("ro_pass");
+               if(substr($pass,0, 4)=="sha:") {
+                       if(check_hash($pass, trim($_POST['password']))) {
+                               $_SESSION['logged_in'] = "ro";
+                               header("Location: index.php");
+                               exit(); 
+                       }

                        $error = "Login failed";
                }
                        $error = "Login failed";
                }

+               else if($pass==trim($_POST['password'])) {
+                       $_SESSION['logged_in'] = "ro";
+                       header("Location: index.php");
+                       exit(); 
+               }
+
+               $error = "Login failed";

        }
        else if(isset($_GET['logout'])) {
                session_destroy();
        }
        else if(isset($_GET['logout'])) {
                session_destroy();

diff --git a/std/command.js b/std/command.js
index 8db64d1284fcae5681b98634c3513e3f7bcd556c..e5d293271eb9d943348cc587f6027f975d54e2e8 100644 (file)
--- a/std/command.js
+++ b/std/command.js
@@ -415,15 +415,17 @@ function current_status_handler(info, has_plchanges) {
        if(state!=playing.state) {
                playing.state = state;
                var bt = playing.pp_button;
        if(state!=playing.state) {
                playing.state = state;
                var bt = playing.pp_button;

-               if(state=="play") {
-                       bt.src = IMAGE.BUTTON_PAUSE;
-                       if(typeof(window.streaming_try_autoplay)=='function')
-                               streaming_try_autoplay();
-               }
-               else {
-                       bt.src = IMAGE.BUTTON_PLAY;
-                       if(typeof(window.streaming_try_autostop)=='function')
-                               streaming_try_autostop();
+               if (bt) /* we must be in read write mode to show this */ {
+                       if(state=="play") {
+                               bt.src = IMAGE.BUTTON_PAUSE;
+                               if(typeof(window.streaming_try_autoplay)=='function')
+                                       streaming_try_autoplay();
+                       }
+                       else {
+                               bt.src = IMAGE.BUTTON_PLAY;
+                               if(typeof(window.streaming_try_autostop)=='function')
+                                       streaming_try_autostop();
+                       }

                }
        }
        
                }
        }
        


@@ -595,22 +597,25 @@ function buttons_init() {
        
        /* player control */
        var elem = document.getElementById('pp_button');
        
        /* player control */
        var elem = document.getElementById('pp_button');

-       elem.src = IMAGE.BUTTON_PLAY;
-       add_listener(elem, "click", send_play_pause);
-       if(window.stop_button) {
-               elem = document.getElementById('stop_button');
-               elem.style.display = "";
-               elem.src = IMAGE.BUTTON_STOP;
-               add_listener(elem, "click", send_stop_cmd);
-               elem.parentNode.style.marginLeft = "-15px";
-       }
-
-       elem = document.getElementById("next_button");
-       elem.src = IMAGE.BUTTON_NEXT;
-       add_listener(elem, "click", send_next_song);
-       elem = document.getElementById("previous_button");
-       elem.src = IMAGE.BUTTON_PREVIOUS;
-       add_listener(elem, "click", send_previous_song);
+       if (elem) /* we must be in read write mode to show these buttons */
+       {
+               elem.src = IMAGE.BUTTON_PLAY;
+               add_listener(elem, "click", send_play_pause);
+               if(window.stop_button) {
+                       elem = document.getElementById('stop_button');
+                       elem.style.display = "";
+                       elem.src = IMAGE.BUTTON_STOP;
+                       add_listener(elem, "click", send_stop_cmd);
+                       elem.parentNode.style.marginLeft = "-15px";
+               }
+               
+               elem = document.getElementById("next_button");
+               elem.src = IMAGE.BUTTON_NEXT;
+               add_listener(elem, "click", send_next_song);
+               elem = document.getElementById("previous_button");
+               elem.src = IMAGE.BUTTON_PREVIOUS;
+               add_listener(elem, "click", send_previous_song);
+       }

 
        /* left menu buttons */
        elem = document.getElementById("open_directory_button");
 
        /* left menu buttons */
        elem = document.getElementById("open_directory_button");