Merge branch 'ZoneMinder:master' into patch-771054

Author: IgorA100

web/includes/Filter.php

@@ -1169,7 +1169,7 @@ public function simple_widget() {
           }
           if (isset($term['cookie'])) {
             if ((!$term['val']) and isset($_COOKIE[$term['cookie']])) $term['val'] = $_COOKIE[$term['cookie']];
-            $html .= ' data-cookie="'.$term['cookie'].'"';
+            $html .= ' data-cookie="'.validHtmlStr($term['cookie']).'"';
           }
           $html .= ' value="'.(isset($term['val'])?validHtmlStr(str_replace('T', ' ', $term['val'])):'').'"';
 

web/includes/Monitor.php

@@ -1403,5 +1403,11 @@ public function GetLastEventId() {
     if (!$this->connect()) return false;
     return $this->shared_read('SharedData', 'last_event');
   }
+
+  public function getStreamMode() {
+    $streamMode = getStreamMode(); # from includs/functions.php
+    return $streamMode;
+  }
+
 } // end class Monitor
 ?>

web/lang/ba_ba.php

@@ -402,7 +402,7 @@
     'HasTurboTilt'          => 'Posjeduje turbo nagib',
     'HasWhiteSpeed'         => 'Posjeduje brzo podeš.bijele',
     'HasZoomSpeed'          => 'Posjeduje brzi zoom',
-    'HighBW'                => 'High B/W',
+    'Highband'                => 'High B/W',
     'High'                  => 'veliku',
     'Home'                  => 'Početna',
     'Hostname'				=> 'Hostname',
@@ -438,7 +438,7 @@
     'LoggingIn'             => 'Prijavljujem',
     'Login'                 => 'prijava',
     'Logout'                => 'odjava',
-    'LowBW'                 => 'Low B/W',
+    'Lowband'                 => 'Low B/W',
     'Low'                   => 'nisku',
     'Main'                  => 'Glavno',
     'Man'                   => 'Man',
@@ -469,7 +469,7 @@
     'MaxZoomRange'          => 'Max raspon zumiranja',
     'MaxZoomSpeed'          => 'Max brzina zumiranja',
     'MaxZoomStep'           => 'Max korak zumiranja',
-    'MediumBW'              => 'Medium B/W',
+    'Medband'              => 'Medium B/W',
     'Medium'                => 'srednju',
     'MinAlarmAreaLtMax'     => 'Min područje alarma mora biti manje od maksimalnog',
     'MinAlarmAreaUnset'     => 'Morate zadati minimalni broj alarm piksela',

web/lang/big5_big5.php

@@ -399,7 +399,7 @@
     'HasWhiteSpeed'        => 'Has White Bal. Speed',
     'HasZoomSpeed'         => 'Has Zoom Speed',
     'High'                 => '高',
-    'HighBW'               => 'High B/W',
+    'Highband'               => 'High B/W',
     'Home'                 => 'Home',
     'Hostname'             => 'Hostname',               // Added - 2018-08-30
     'Hour'                 => '時',
@@ -437,7 +437,7 @@
     'Logout'               => '登出',
     'Logs'                 => 'Logs',                   // Added - 2011-06-17
     'Low'                  => '低',
-    'LowBW'                => 'Low B/W',
+    'Lowband'                => 'Low B/W',
     'Main'                 => 'Main',
     'Man'                  => 'Man',
     'Manual'               => 'Manual',
@@ -468,7 +468,7 @@
     'MaxZoomStep'          => 'Max Zoom Step',
     'MaximumFPS'           => '最大每秒框架數 fps',
     'Medium'               => '中',
-    'MediumBW'             => 'Medium B/W',
+    'Medband'             => 'Medium B/W',
     'Message'              => 'Message',                // Added - 2011-06-16
     'MinAlarmAreaLtMax'    => 'Minimum alarm area should be less than maximum',
     'MinAlarmAreaUnset'    => 'You must specify the minimum alarm pixel count',

web/lang/cs_cz.php

@@ -395,7 +395,7 @@
     'HasWhiteSpeed'        => 'Má rychlost vyvážení bílé',
     'HasZoomSpeed'         => 'Má rychlost zoomu',
     'High'                 => 'Rychlá',
-    'HighBW'               => 'Rychlá B/W',
+    'Highband'               => 'Rychlá B/W',
     'Home'                 => 'Domů',
     'Hostname'             => 'Hostname',               // Added - 2018-08-30
     'Hour'                 => 'Hodina',
@@ -433,7 +433,7 @@
     'Logout'               => 'Odhlásit',
     'Logs'                 => 'Logs',                   // Added - 2011-06-17
     'Low'                  => 'Pomalá',
-    'LowBW'                => 'Pomalá B/W',
+    'Lowband'                => 'Pomalá B/W',
     'Main'                 => 'Hlavní',
     'Man'                  => 'Man',
     'Manual'               => 'Manuál',
@@ -464,7 +464,7 @@
     'MaxZoomStep'          => 'Max krok zoomu',
     'MaximumFPS'           => 'Maximum FPS',
     'Medium'               => 'Střední',
-    'MediumBW'             => 'Střední B/W',
+    'Medband'             => 'Střední B/W',
     'Message'              => 'Message',                // Added - 2011-06-16
     'MinAlarmAreaLtMax'    => 'Minimum alarm area should be less than maximum',
     'MinAlarmAreaUnset'    => 'You must specify the minimum alarm pixel count',

web/lang/de_de.php

@@ -397,7 +397,7 @@
     'HasWhiteSpeed'        => 'Hat Weiß-Abgleichgeschwindigkeit',
     'HasZoomSpeed'         => 'Hat Zoom-Geschwindigkeit',
     'High'                 => 'hohe',
-    'HighBW'               => 'Hohe B/W',
+    'Highband'               => 'Hohe B/W',
     'Home'                 => 'Home',
     'Hostname'             => 'Hostname',               // Added - 2018-08-30
     'Hour'                 => 'Stunde',
@@ -435,7 +435,7 @@
     'Logout'               => 'Abmelden',
     'Logs'                 => 'Logs',                   // Added - 2011-06-17
     'Low'                  => 'niedrige',
-    'LowBW'                => 'Niedrige B/W',
+    'Lowband'                => 'Niedrige B/W',
     'Main'                 => 'Haupt',
     'Man'                  => 'Man',
     'Manual'               => 'Manual',
@@ -466,7 +466,7 @@
     'MaxZoomStep'          => 'Maximale Zoom-Stufe',
     'MaximumFPS'           => 'Maximale FPS',
     'Medium'               => 'mittlere',
-    'MediumBW'             => 'Mittlere B/W',
+    'Medband'             => 'Mittlere B/W',
     'Message'              => 'Nachricht',                // Added - 2011-06-16
     'MinAlarmAreaLtMax'    => 'Der minimale Alarmbereich sollte kleiner sein als der maximale',
     'MinAlarmAreaUnset'    => 'Sie müssen einen Minimumwert an Alarmflächenpixeln angeben',

web/lang/dk_dk.php

@@ -396,7 +396,7 @@
     'HasWhiteSpeed'         => 'Has White Bal. Speed',
     'HasZoomSpeed'          => 'Has Zoom Speed',
     'High'                  => 'Høj',
-    'HighBW'                => 'High B/W',
+    'Highband'                => 'High B/W',
     'Home'                  => 'Hjemme',
     'Hostname'              => 'Hostname',
     'Hour'                  => 'Time',
@@ -434,7 +434,7 @@
     'Logout'                => 'Logud',
     'Logs'                  => 'Logs',
     'Low'                   => 'Lav',
-    'LowBW'                 => 'Lav B/W',
+    'Lowband'                 => 'Lav B/W',
     'Main'                  => 'Hoved',
     'Man'                   => 'Man',
     'Manual'                => 'Manuel',
@@ -465,7 +465,7 @@
     'MaxZoomStep'           => 'Max Zoom Step',
     'MaximumFPS'            => 'Maximum FPS',
     'Medium'                => 'Medium',
-    'MediumBW'              => 'Medium B/W',
+    'Medband'              => 'Medium B/W',
     'Message'               => 'Meddelelse',
     'MinAlarmAreaLtMax'     => 'Minimum alarm område skal være mindre end maksimum',
     'MinAlarmAreaUnset'     => 'Du skal angive det minimale antal alarm pixels',

web/lang/en_gb.php

@@ -117,6 +117,7 @@
     'AttrTotalScore'        => 'Total Score',
     'AttrStartWeekday'      => 'Start Weekday',
     'AttrEndWeekday'        => 'End Weekday',
+    'Auth'                  => 'Authentication',
     'AutoStopTimeout'       => 'Auto Stop Timeout',
     'AvgBrScore'            => 'Avg.<br/>Score',
     'BackgroundFilter'      => 'Run filter in background',
@@ -251,6 +252,7 @@
     'DeviceNumber'          => 'Device Number',
     'DevicePath'            => 'Device Path',
     'DisableAlarms'         => 'Disable Alarms',
+    'Dnsmasq'               => 'DHCP',
     'DonateAlready'         => 'No, I\'ve already donated',
     'DonateEnticement'      => 'You\'ve been running ZoneMinder for a while now and hopefully are finding it a useful addition to your home or workplace security. Although ZoneMinder is, and will remain, free and open source, it costs money to develop and support. If you would like to help support future development and new features then please consider donating. Donating is, of course, optional but very much appreciated and you can donate as much or as little as you like.<br/><br/>If you would like to donate please select the option below or go to <a href="https://zoneminder.com/donate/" target="_blank">https://zoneminder.com/donate/</a> in your browser.<br/><br/>Thank you for using ZoneMinder and don\'t forget to visit the forums on <a href="https://forums.zoneminder.com">ZoneMinder.com</a> for support or suggestions about how to make your ZoneMinder experience even better.',
     'Donate'                => 'Please Donate',
@@ -339,7 +341,7 @@
     'HasTurboTilt'          => 'Has Turbo Tilt',
     'HasWhiteSpeed'         => 'Has White Bal. Speed',
     'HasZoomSpeed'          => 'Has Zoom Speed',
-    'HighBW'                => 'High&nbsp;B/W',
+    'Highband'              => 'High&nbsp;B/W',
     'ImageBufferSize'       => 'Image Buffer Size (frames)',
     'MaxImageBufferCount'   => 'Maximum Image Buffer Size (frames)',
     'InvalidateTokens'      => 'Invalidate all generated tokens',
@@ -350,7 +352,8 @@
     'ListMatches'           => 'List Matches',
     'LoggedInAs'            => 'Logged in as',
     'LoggingIn'             => 'Logging In',
-    'LowBW'                 => 'Low&nbsp;B/W',
+    'Lowband'               => 'Low&nbsp;B/W',
+    'Mail'                  => 'Email',
     'MaxBandwidth'          => 'Max Bandwidth',
     'MaxBrScore'            => 'Max.<br/>Score',
     'MaxFocusRange'         => 'Max Focus Range',
@@ -375,7 +378,7 @@
     'MaxZoomRange'          => 'Max Zoom Range',
     'MaxZoomSpeed'          => 'Max Zoom Speed',
     'MaxZoomStep'           => 'Max Zoom Step',
-    'MediumBW'              => 'Medium&nbsp;B/W',
+    'Medband'               => 'Medium&nbsp;B/W',
     'MessageSavingDataWhenLeavingPage' => 'You are leaving the page.<br>Want to save data?',
     'MetaConfig'            => 'Meta Config',
     'MinAlarmAreaLtMax'     => 'Minimum alarm area should be less than maximum',

web/lang/es_ar.php

@@ -346,7 +346,7 @@
     'HasWhiteSpeed'        => 'Has White Bal. Speed',
     'HasZoomSpeed'         => 'Has Zoom Speed',
     'High'                 => 'Alta',
-    'HighBW'               => 'Alta B/W',
+    'Highband'               => 'Alta B/W',
     'Home'                 => 'Home',
     'Hostname'             => 'Hostname',               // Added - 2018-08-30
     'Hour'                 => 'Hora',
@@ -384,7 +384,7 @@
     'Logout'               => 'Salir',
     'Logs'                 => 'Logs',                   // Added - 2011-06-17
     'Low'                  => 'Baja',
-    'LowBW'                => 'Baja B/W',
+    'Lowband'                => 'Baja B/W',
     'Main'                 => 'Main',
     'Man'                  => 'Man',
     'Manual'               => 'Manual',
@@ -415,7 +415,7 @@
     'MaxZoomStep'          => 'Max Zoom Step',
     'MaximumFPS'           => 'Maximos FPS',
     'Medium'               => 'Media',
-    'MediumBW'             => 'Media B/W',
+    'Medband'             => 'Media B/W',
     'Message'              => 'Message',                // Added - 2011-06-16
     'MinAlarmAreaLtMax'    => 'Minimum alarm area should be less than maximum',
     'MinAlarmAreaUnset'    => 'You must specify the minimum alarm pixel count',

web/lang/es_es.php

@@ -395,7 +395,7 @@
     'HasWhiteSpeed'         => 'Tiene velocidad de balance de blancos',
     'HasZoomSpeed'          => 'Tiene velocidad de zoom',
     'High'                  => 'Alto',
-    'HighBW'                => 'Alto B/B',
+    'Highband'                => 'Alto B/B',
     'Home'                  => 'Inicio',
     'Hostname'             => 'Hostname',               // Added - 2018-08-30
     'Hour'                  => 'Hora',
@@ -433,7 +433,7 @@
     'Logout'                => 'Cerrar sesión',
     'Logs'                  => 'Registros',
     'Low'                   => 'Bajo',
-    'LowBW'                 => 'Bajo B/B',
+    'Lowband'                 => 'Bajo B/B',
     'Main'                  => 'Principal',
     'Man'                   => 'Man',
     'Manual'                => 'Manual',
@@ -464,7 +464,7 @@
     'MaxZoomStep'           => 'Grado de zoom máximo',
     'MaximumFPS'            => 'MPS Máximos',
     'Medium'                => 'Medio',
-    'MediumBW'              => 'Medio B/B',
+    'Medband'              => 'Medio B/B',
     'Message'               => 'Mensaje',
     'MinAlarmAreaLtMax'     => 'El área mínima de alarma debe ser menor que la máxima',
     'MinAlarmAreaUnset'     => 'Debe especificar la mínima cantidad de píxeles de alarma',