From 63d3598335e91b7aedc654484a8b3f20b509db18 Mon Sep 17 00:00:00 2001 From: stan Date: Tue, 29 Nov 2005 16:32:06 +0000 Subject: [PATCH] Bug 207 - Minor typos and event directory renaming fix. git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1629 e3e1d417-86f3-4887-817a-d78f3d33393f --- web/zm_actions.php | 10 +++++++++- web/zm_lang_en_gb.php | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/web/zm_actions.php b/web/zm_actions.php index b316af12b..9e732ae38 100644 --- a/web/zm_actions.php +++ b/web/zm_actions.php @@ -1091,7 +1091,15 @@ if ( isset($action) ) simpleQuery( "update Monitors set ".implode( ", ", $changes )." where Id = '$mid'" ); if ( $changes['Name'] ) { - exec( escapeshellcmd( "mv ".ZM_DIR_EVENTS."/".$monitor['Name']." ".ZM_DIR_EVENTS."/".$new_monitor['Name'] ) ); + chdir( ZM_DIR_EVENTS ); + if ( file_exists( $monitor['Name'] ) ) + { + exec( escapeshellcmd( "mv ".$monitor['Name']." ".$new_monitor['Name'] ) ); + } + else + { + symlink( $mid, $new_monitor['Name'] ); + } } } elseif ( !$user['MonitorIds'] ) diff --git a/web/zm_lang_en_gb.php b/web/zm_lang_en_gb.php index f6413710e..5c7f2c48e 100644 --- a/web/zm_lang_en_gb.php +++ b/web/zm_lang_en_gb.php @@ -481,7 +481,7 @@ $zmSlangSave = 'Save'; $zmSlangScale = 'Scale'; $zmSlangScore = 'Score'; $zmSlangSecs = 'Secs'; -$zmSlangSectionlength = 'Section length'; +$zmSlangSectionlength = 'Section Length'; $zmSlangSelect = 'Select'; $zmSlangSetLearnPrefs = 'Set Learn Prefs'; // This can be ignored for now $zmSlangSetNewBandwidth = 'Set New Bandwidth';