mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-16 21:08:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

When saving monitor, only turn off error reporting for symlink. Don't delete old symlink unless the name has changed.

Browse Source
This commit is contained in:
Isaac Connor
2022-10-26 13:41:31 -04:00
parent df421cbd4c
commit 6b3768fdf6
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
web/includes/actions/monitor.php
View File

@@ -147,13 +147,13 @@ if ($action == 'save') {
if ($monitor->save($changes)) {
// Groups will be added below
if ( isset($changes['Name']) or isset($changes['StorageId']) ) {
// creating symlinks when symlink already exists reports errors, but is perfectly ok
error_reporting(0);
$OldStorage = $monitor->Storage();
$saferOldName = basename($monitor->Name());
if (file_exists($OldStorage->Path().'/'.$saferOldName))
unlink($OldStorage->Path().'/'.$saferOldName);
if (isset($changes['Name'])) {
$OldStorage = $monitor->Storage();
$saferOldName = basename($monitor->Name());
if (file_exists($OldStorage->Path().'/'.$saferOldName))
unlink($OldStorage->Path().'/'.$saferOldName);
}
$NewStorage = new ZM\Storage($newMonitor['StorageId']);
if (!file_exists($NewStorage->Path().'/'.$mid)) {
@@ -161,10 +161,11 @@ if ($action == 'save') {
ZM\Error('Unable to mkdir '.$NewStorage->Path().'/'.$mid);
}
}
$saferNewName = basename($newMonitor['Name']);
$link_path = $NewStorage->Path().'/'.$saferNewName;
// Use a relative path for the target so the link continues to work from backups or directory changes.
if (!symlink($mid, $link_path)) {
if (!@symlink($mid, $link_path)) {
if (!(file_exists($link_path) and is_link($link_path))) {
ZM\Warning('Unable to symlink ' . $NewStorage->Path().'/'.$mid . ' to ' . $NewStorage->Path().'/'.$saferNewName);
}