From 1a3cf49c0062b79ede1435b49379164f7b92ad63 Mon Sep 17 00:00:00 2001
From: Jokob-sk <jokob.sk@gmail.com>
Date: Wed, 18 Oct 2023 22:35:36 +1100
Subject: [PATCH] =?UTF-8?q?PERMISSIONS,=20MQTT,=20Maintenance=20work?=
 =?UTF-8?q?=E2=A4=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dockerfiles/start.sh                      |  8 ++-
 dockerfiles/user-mapping.sh               |  5 ++
 front/maintenance.php                     | 59 +++++------------------
 front/php/server/util.php                 | 13 +++--
 front/plugins/_publisher_mqtt/config.json |  2 +-
 5 files changed, 34 insertions(+), 53 deletions(-)

diff --git a/dockerfiles/start.sh b/dockerfiles/start.sh
index e13620a5..7da364f3 100755
--- a/dockerfiles/start.sh
+++ b/dockerfiles/start.sh
@@ -30,7 +30,12 @@ echo "[INSTALL] Run setup scripts"
 "$INSTALL_DIR/pialert/install/install_dependencies.sh"
 "$INSTALL_DIR/pialert/install/install_python.sh"
 
-# Chaneg port number if set
+# # executes a new shell session with the user specified in the USER variable.
+# if [ -n "$USER" ]; then
+#     exec su - "${USER}"
+# fi
+
+# Change port number if set
 if [ -n "${PORT}" ]; then  
   sed -ie 's/listen 20211/listen '${PORT}'/g' /etc/nginx/sites-available/default
 fi 
@@ -77,6 +82,7 @@ chmod -R a+rwx $INSTALL_DIR
 chmod -R a+rwx /var/www/html
 chmod -R a+rw $INSTALL_DIR/pialert/front/log
 chmod -R a+rw $INSTALL_DIR/pialert/config
+sudo chgrp -R www-data  $INSTALL_DIR/pialert
 
 FILEDB=$INSTALL_DIR/pialert/db/pialert.db
 
diff --git a/dockerfiles/user-mapping.sh b/dockerfiles/user-mapping.sh
index 38abcda1..18c9024c 100755
--- a/dockerfiles/user-mapping.sh
+++ b/dockerfiles/user-mapping.sh
@@ -25,6 +25,11 @@ array=( ${LINE//:/ } )
 # home is 5th element
 USER_HOME=${array[4]}
 
+# print debug output
+echo  USER_ID: ${USER_ID};
+echo  USER_GID: ${USER_GID};
+echo  USER_HOME: ${USER_HOME};
+
 sed -i -e "s/^${USER}:\([^:]*\):[0-9]*:[0-9]*/${USER}:\1:${USER_ID}:${USER_GID}/"  /etc/passwd
 sed -i -e "s/^${USER}:\([^:]*\):[0-9]*/${USER}:\1:${USER_GID}/"  /etc/group
 
diff --git a/front/maintenance.php b/front/maintenance.php
index e717fa13..be9a6547 100755
--- a/front/maintenance.php
+++ b/front/maintenance.php
@@ -420,17 +420,6 @@ $db->close();
                                 </div>
                               </div>
                             </div>
-                        </div>   
-                        <div class="log-area box box-solid box-primary ">
-                            <div class="row logs-row">
-                              <textarea id="nginx_error_log" class="logs" cols="70" rows="10" wrap='off' readonly><?php echo file_get_contents( "/var/log/nginx/error.log" ); ?>
-                              </textarea>
-                            </div>
-                            <div class="row logs-row" >                            
-                              <div>
-                                <div class="log-file">nginx/error.log</div>
-                              </div>
-                            </div>
                         </div> 
                         <div class="log-area box box-solid box-primary">
                             <div class="row logs-row">
@@ -463,44 +452,18 @@ $db->close();
                                 </div>
                               </div>
                             </div>
-                        </div>                         
-                        
-                         <div class="log-area box box-solid box-primary">
-                             
-                             <div class="row logs-row">
-                               <textarea id="pialert_pholus_lastrun_log" class="logs logs-small" cols="70" rows="10" wrap='off' readonly><?php echo file_get_contents( "./log/pialert_pholus_lastrun.log" ); ?>
-                               </textarea>                              
-                             </div>                          
-                             <div class="row logs-row" >
-                               <div> 
-                                 <div class="log-file">pialert_pholus_lastrun.log<div class="logs-size"><?php echo number_format((filesize("./log/pialert_pholus_lastrun.log") / 1000000),2,",",".") . ' MB';?> 
-                                 <span class="span-padding"><a href="./log/pialert_pholus_lastrun.log"><i class="fa fa-download"></i> </a></span>
-                                </div></div>                          
-                                 <div class="log-purge">                                 
-                                   <button class="btn btn-primary" onclick="logManage('pialert_pholus_lastrun.log','cleanLog')"><?= lang('Gen_Purge');?></button> 
-                                 </div>                            
-                               </div>                            
-                             </div>                            
- 
-                         </div>    
-                        <div class="log-area box box-solid box-primary">
-                             
+                        </div>         
+                        <div class="log-area box box-solid box-primary ">
                             <div class="row logs-row">
-                              <textarea id="IP_changes_log" class="logs logs-small" cols="70" rows="10" readonly><?php echo file_get_contents( "./log/IP_changes.log" ); ?>
-                              </textarea>                              
-                            </div>                          
-                            <div class="row logs-row" >
-                              <div> 
-                                <div class="log-file">IP_changes.log<div class="logs-size"><?php echo number_format((filesize("./log/IP_changes.log") / 1000000),2,",",".") . ' MB';?> 
-                                <span class="span-padding"><a href="./log/IP_changes.log"><i class="fa fa-download"></i> </a></span>
-                              </div></div>                          
-                                <div class="log-purge">
-                                  <button class="btn btn-primary" onclick="logManage('IP_changes.log','cleanLog')"><?= lang('Gen_Purge');?></button>
-                                </div>                            
-                              </div>                            
-                            </div>                            
-
-                        </div> 
+                              <textarea id="nginx_error_log" class="logs logs-small" cols="70" rows="10" wrap='off' readonly><?php echo file_get_contents( "/var/log/nginx/error.log" ); ?>
+                              </textarea>
+                            </div>
+                            <div class="row logs-row" >                            
+                              <div>
+                                <div class="log-file" title="/var/log/nginx/error.log">nginx/error.log</div>
+                              </div>
+                            </div>
+                        </div>                                        
                         <div class="log-area box box-solid box-primary">
                             <div class="row logs-row">
                               <textarea id="stdout_log" class="logs logs-small" cols="70" rows="10" wrap='off' readonly><?php echo file_get_contents( "./log/stdout.log" ); ?>
diff --git a/front/php/server/util.php b/front/php/server/util.php
index 991e0238..bc3f50e1 100755
--- a/front/php/server/util.php
+++ b/front/php/server/util.php
@@ -328,9 +328,16 @@ function saveSettings()
   $txt = $txt."#-------------------IMPORTANT INFO-------------------#\n";
 
   // open new file and write the new configuration      
-  $newConfig = fopen($fullConfPath, "w") or die("Unable to open file!"); 
-  fwrite($newConfig, $txt);
-  fclose($newConfig);
+  // Create a temporary file
+  $tempConfPath = $fullConfPath . ".tmp";
+
+  // Write your changes to the temporary file
+  $tempConfig = fopen($tempConfPath, "w") or die("Unable to open file!");
+  fwrite($tempConfig, $txt);
+  fclose($tempConfig);
+
+  // Replace the original file with the temporary file
+  rename($tempConfPath, $fullConfPath);
 
   displayMessage("<br/>Settings saved to the <code>pialert.conf</code> file.<br/><br/>A time-stamped backup of the previous file created. <br/><br/> Reloading...<br/>", 
     FALSE, TRUE, TRUE, TRUE);    
diff --git a/front/plugins/_publisher_mqtt/config.json b/front/plugins/_publisher_mqtt/config.json
index 8b1f2e13..18231835 100755
--- a/front/plugins/_publisher_mqtt/config.json
+++ b/front/plugins/_publisher_mqtt/config.json
@@ -175,7 +175,7 @@
             "localized": ["name"],
             "name":[{
                 "language_code": "en_us",
-                "string" : "N/A"
+                "string" : "Device"
 				}
 				]
         },