From ed30f134234c5c3ce75a80f3298f09f0e9c4121e Mon Sep 17 00:00:00 2001
From: Ravi <rbail2000@gmail.com>
Date: Mon, 22 Jan 2018 16:57:26 +0530
Subject: [PATCH] 1.9.7d equivalent release (d74cc9a)

Not yet tested - forceTVON, cecTvStatus, audio playlist and event
playlist configuration checking from Open-source server
---
 app/controllers/players.js        |  6 ++++--
 app/controllers/server-main.js    |  2 +-
 public/app/partials/settings.html | 12 +++++++-----
 public/app/partials/settings.jade | 12 ++++++------
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/app/controllers/players.js b/app/controllers/players.js
index 5f004536..dc971286 100644
--- a/app/controllers/players.js
+++ b/app/controllers/players.js
@@ -473,8 +473,10 @@ exports.upload = function (cpuId, filename, data) {
             var logData;
             if(filename.indexOf('forever_out') == 0 ){
                 fs.writeFile(config.logStoreDir+'/'+cpuId+'_forever_out.log',data,function(err){
-                    if(err)
-                        console.log("error","Error in writing forever_out log for "+ cpuId);
+                    if(err) {
+                        console.log("error", "Error in writing forever_out log for " + cpuId);
+                        console.log(err);
+                    }
                     // else
                     //     console.log("info","Forever Log file saved for player : "+cpuId);
                 })
diff --git a/app/controllers/server-main.js b/app/controllers/server-main.js
index 7c596acb..0ed5240e 100644
--- a/app/controllers/server-main.js
+++ b/app/controllers/server-main.js
@@ -47,7 +47,7 @@ exports.deploy = function (installation,group, cb) {
             var syncPath = path.join(config.syncDir, installation, group.name),
                 mediaPath = path.join(config.mediaDir);
             fs.mkdir(syncPath, function (err) {
-                console.log("created directory: "+syncPath+","+err)
+                //console.log("created directory: "+syncPath)
                 var filesNotPresent = []
                 async.eachSeries(group.assets,
                     function (file, iterative_cb) {
diff --git a/public/app/partials/settings.html b/public/app/partials/settings.html
index 61f4951a..2c92917c 100644
--- a/public/app/partials/settings.html
+++ b/public/app/partials/settings.html
@@ -67,15 +67,17 @@ <h4>Installation Settings</h4>
         <div class="form-group">
           <div class="checkbox">
             <label class="col-xs-8 col-xs-offset-4">
-              <input type="password" name="sshPassword" ng-model="settings.sshPassword" ng-click="saveSettings()"/><span>SSH Password</span>
+              <input type="checkbox" name="logs" ng-model="settings.enableLog" ng-change="saveSettings()"/><span translate="translate" class="text-warning">Enable log for file play count/details (network intensive, do not enable unless you need it!)</span>
             </label>
           </div>
         </div>
         <div class="form-group">
-          <div class="checkbox">
-            <label class="col-xs-8 col-xs-offset-4">
-              <input type="checkbox" name="logs" ng-model="settings.enableLog" ng-change="saveSettings()"/><span translate="translate" class="text-warning">Enable log for file play count/details (network intensive, do not enable unless you need it!)</span>
-            </label>
+          <label class="col-xs-4 control-label">SSH Password</label>
+          <div class="col-xs-2">
+            <input type="password" name="sshPassword" ng-model="settings.sshPassword"/>
+          </div>
+          <div class="col-xs-2">
+            <button type="submit" ng-click="saveSettings()" class="btn btn-success"> Save</button>
           </div>
         </div>
         <!--.form-group
diff --git a/public/app/partials/settings.jade b/public/app/partials/settings.jade
index b151d52c..070599c7 100644
--- a/public/app/partials/settings.jade
+++ b/public/app/partials/settings.jade
@@ -57,18 +57,18 @@
                             input(type='checkbox',name='forcetvon', ng-model='settings.forceTvOn', ng-click="saveSettings()")
                             span Keep TV on by sending CEC tv-on message every 3 minutes
 
-                .form-group
-                    .checkbox
-                        label.col-xs-8.col-xs-offset-4
-                            input(type='password',name='sshPassword', ng-model='settings.sshPassword', ng-click="saveSettings()")
-                            span SSH Password
-
                 .form-group
                     .checkbox
                         label.col-xs-8.col-xs-offset-4
                             input(type='checkbox',name='logs', ng-model='settings.enableLog', ng-change="saveSettings()")
                             span.text-warning(translate) Enable log for file play count/details (network intensive, do not enable unless you need it!)
 
+                .form-group
+                    label.col-xs-4.control-label SSH Password
+                    .col-xs-2
+                        input(type='password',name='sshPassword', ng-model='settings.sshPassword')
+                    .col-xs-2
+                        button.btn.btn-success(type='submit', ng-click='saveSettings()')  Save
 
                 //.form-group
                     .checkbox