ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Removed learn state bits 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2510 e3e1d417-86f3-4887-817a-d78f3d33393f
pull/27/merge
stan 2008-07-14 14:42:20 +00:00
parent 2824cb7355
commit 81065ba6dd
21 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
web/ajax/status.php
View File

@ -124,7 +124,6 @@ $statusData = array(
"Emailed" => true,
"Messaged" => true,
"Executed" => true,
"LearnState" => true,
"Notes" => true,
"MinFrameId" => array( "sql" => "min(Frames.FrameId)", "table" => "Frames", "join" => "Events.Id = Frames.EventId", "group" => "Frames.EventId" ),
"MaxFrameId" => array( "sql" => "max(Frames.FrameId)", "table" => "Frames", "join" => "Events.Id = Frames.EventId", "group" => "Frames.EventId" ),

1
web/includes/config.php.in
View File

@ -81,7 +81,6 @@ define( "CMD_QUERY", 99 );
define( "MAX_EVENTS", 10 ); // The maximum number of events to show in the monitor event listing
define( "RATE_BASE", 100 ); // The additional scaling factor used to help get fractional rates in integer format
define( "SCALE_BASE", 100 ); // The additional scaling factor used to help get fractional scales in integer format
define( "LEARN_MODE", false ); // Currently unimplemented, do not change
//
// Date and time formats, eventually some of these may end up in the language files

1
web/lang/big5_big5.php
View File

@ -549,7 +549,6 @@ $SLANG = array(
'SelectMonitors' => 'Select Monitors',
'Select' => '選取',
'SelfIntersecting' => 'Polygon edges must not intersect',
'SetLearnPrefs' => 'Set Learn Prefs', // This can be ignored for now
'SetNewBandwidth' => '設定新頻寬速度',
'SetPreset' => 'Set Preset',
'Set' => 'Set',

1
web/lang/cs_cz.php
View File

@ -546,7 +546,6 @@ $SLANG = array(
'SelectMonitors' => 'Select Monitors',
'Select' => 'Vybrat',
'SelfIntersecting' => 'Polygon edges must not intersect',
'SetLearnPrefs' => 'Set Learn Prefs', // This can be ignored for now
'Set' => 'Nastavit',
'SetNewBandwidth' => 'Nastavit novou rychlost sítě',
'SetPreset' => 'Nastavit předvolbu',

1
web/lang/de_de.php
View File

@ -546,7 +546,6 @@ $SLANG = array(
'SelectMonitors' => 'Wähle Monitore',
'Select' => 'Auswahl',
'SelfIntersecting' => 'Die Polygonränder dürfen sich nicht überschneiden.',
'SetLearnPrefs' => 'Setze Lernmerkmale', // This can be ignored for now
'SetNewBandwidth' => 'Setze neue Bandbreite',
'SetPreset' => 'Setze Voreinstellung',
'Set' => 'Setze',

1
web/lang/dk_dk.php
View File

@ -547,7 +547,6 @@ $SLANG = array(
'SelectMonitors' => 'Select Monitors',
'Select' => 'Vælg',
'SelfIntersecting' => 'Polygon edges must not intersect',
'SetLearnPrefs' => 'Set Learn Prefs', // This can be ignored for now
'SetNewBandwidth' => 'Sæt Ny Båndbrede',
'SetPreset' => 'Sæt Preset',
'Set' => 'Sæt',

1
web/lang/en_gb.php
View File

@ -548,7 +548,6 @@ $SLANG = array(
'SelectMonitors' => 'Select Monitors',
'Select' => 'Select',
'SelfIntersecting' => 'Polygon edges must not intersect',
'SetLearnPrefs' => 'Set Learn Prefs', // This can be ignored for now
'SetNewBandwidth' => 'Set New Bandwidth',
'SetPreset' => 'Set Preset',
'Set' => 'Set',

1
web/lang/es_ar.php
View File

@ -499,7 +499,6 @@ $SLANG = array(
'Select' => 'Select',
'SelfIntersecting' => 'Polygon edges must not intersect',
'ServerLoad' => 'Carga Servidor',
'SetLearnPrefs' => 'Set Learn Prefs', // This can be ignored for now
'SetNewBandwidth' => 'Nuevo Ancho de Banda',
'SetPreset' => 'Set Preset',
'Set' => 'Set',

1
web/lang/fr_fr.php
View File

@ -546,7 +546,6 @@ $SLANG = array(
'SelectMonitors' => 'Select Monitors',
'Select' => 'Select',
'SelfIntersecting' => 'Polygon edges must not intersect',
'SetLearnPrefs' => 'Régler préf. apprises', // This can be ignored for now
'SetNewBandwidth' => 'Régler la bande passante',
'SetPreset' => 'Set Preset',
'Set' => 'Set',

1
web/lang/he_il.php
View File

@ -547,7 +547,6 @@ $SLANG = array(
'SelectMonitors' => 'áçø îåðéèåøéí',
'SelfIntersecting' => 'Polygon edges must not intersect',
'Set' => '÷áò',
'SetLearnPrefs' => 'Set Learn Prefs', // This can be ignored for now
'SetNewBandwidth' => 'Set New Bandwidth',
'SetPreset' => 'Set Preset',
'Settings' => 'äâãøåú',

1
web/lang/hu_hu.php
View File

@ -555,7 +555,6 @@ $SLANG = array(
'SelectMonitors' => 'Monitorok kiválasztása',
'SelfIntersecting' => 'A sokszög szélei nem kereszteződhetnek',
'Set' => 'Beállít',
'SetLearnPrefs' => 'Set Learn Prefs', // This can be ignored for now
'SetNewBandwidth' => 'Új sávszélesség beállítás',
'SetPreset' => 'Alapértelmezett beállítása',
'Settings' => 'Beállítások',

1
web/lang/it_it.php
View File

@ -559,7 +559,6 @@ $SLANG = array(
'Select' => 'Seleziona',
'SelfIntersecting' => 'I vertici del poligono non devono intersecarsi',
'Set' => 'Imposta',
'SetLearnPrefs' => 'Seleziona le preferenze di autoapprendimento', // This can be ignored for now
'SetNewBandwidth' => 'Imposta nuova Banda',
'SetPreset' => 'Imposta Preset',
'Settings' => 'Impostazioni',

1
web/lang/ja_jp.php
View File

@ -546,7 +546,6 @@ $SLANG = array(
'SelectMonitors' => 'Select Monitors',
'Select' => 'Select',
'SelfIntersecting' => 'Polygon edges must not intersect',
'SetLearnPrefs' => 'Set Learn Prefs', // 新しい設定の自動保存　This can be ignored for now
'SetNewBandwidth' => '新しい帯域幅の設定',
'SetPreset' => 'Set Preset',
'Set' => 'Set',

1
web/lang/nl_nl.php
View File

@ -547,7 +547,6 @@ $SLANG = array(
'SelectMonitors' => 'Select Monitors',
'Select' => 'Select',
'SelfIntersecting' => 'Polygon edges must not intersect',
'SetLearnPrefs' => 'Set Learn Prefs', // This can be ignored for now
'SetNewBandwidth' => 'Zet Nieuwe Bandbreedte',
'SetPreset' => 'Set Preset',
'Set' => 'Set',

1
web/lang/pl_pl.php
View File

@ -547,7 +547,6 @@ $SLANG = array(
'SelectMonitors' => 'Select Monitors',
'Select' => 'Select',
'SelfIntersecting' => 'Polygon edges must not intersect',
'SetLearnPrefs' => 'Ustaw preferencje nauki', // This can be ignored for now
'SetNewBandwidth' => 'Ustaw now± przepustowo¶æ',
'SetPreset' => 'Set Preset',
'Set' => 'Set',

1
web/lang/pt_br.php
View File

@ -486,7 +486,6 @@ $SLANG = array(
'SelectMonitors' => 'Select Monitors',
'Select' => 'Select',
'SelfIntersecting' => 'Polygon edges must not intersect',
'SetLearnPrefs' => 'Set Learn Prefs', // This can be ignored for now
'SetNewBandwidth' => 'Defina Nova L/B',
'SetPreset' => 'Set Preset',
'Set' => 'Set',

1
web/lang/ro_ro.php
View File

@ -516,7 +516,6 @@ $SLANG = array(
'SelectMonitors' => 'Select Monitors',
'Select' => 'Select',
'SelfIntersecting' => 'Polygon edges must not intersect',
'SetLearnPrefs' => 'Set Learn Prefs', // I'm ignoring this... for now.
'SetNewBandwidth' => 'Setare laţime de bandă nouă',
'SetPreset' => 'Set Preset',
'Set' => 'Set',

1
web/lang/ru_ru.php
View File

@ -547,7 +547,6 @@ $SLANG = array(
'SelectMonitors' => 'Select Monitors',
'Select' => 'Select',
'SelfIntersecting' => 'Polygon edges must not intersect',
'SetLearnPrefs' => 'Set Learn Prefs', // This can be ignored for now
'SetNewBandwidth' => 'õÓÔÁÎÏ×ËÁ ÎÏ×ÏÊ ÛÉÒÉÎÁ ËÁÎÁÌÁ',
'SetPreset' => 'Set Preset',
'Set' => 'Set',

1
web/lang/se_se.php
View File

@ -546,7 +546,6 @@ $SLANG = array(
'SelectMonitors' => 'Select Monitors',
'Select' => 'Välj',
'SelfIntersecting' => 'Polygonändarna får inte överlappa',
'SetLearnPrefs' => 'Set Learn Prefs', // This can be ignored for now
'SetNewBandwidth' => 'Ställ in ny bandbredd',
'SetPreset' => 'Ställ in förinställning',
'Set' => 'Ställ in',

3
web/skins/Makefile.am
View File

@ -2,5 +2,4 @@ AUTOMAKE_OPTIONS = gnu
SUBDIRS = \
classic \
mobile \
churchwatch
mobile

2
web/skins/mobile/views/events.php
View File

@ -49,7 +49,7 @@ if ( empty($_REQUEST['sort_asc']) )
$_REQUEST['sort_asc'] = "1";
$countSql = "select count(E.Id) as EventCount from Monitors as M inner join Events as E on (M.Id = E.MonitorId) where";
$eventsSql = "select E.Id,E.MonitorId,M.Name As MonitorName,E.Name,E.StartTime,E.Length,E.Frames,E.AlarmFrames,E.TotScore,E.AvgScore,E.MaxScore,E.Archived,E.LearnState from Monitors as M inner join Events as E on (M.Id = E.MonitorId) where";
$eventsSql = "select E.Id,E.MonitorId,M.Name As MonitorName,E.Name,E.StartTime,E.Length,E.Frames,E.AlarmFrames,E.TotScore,E.AvgScore,E.MaxScore,E.Archived from Monitors as M inner join Events as E on (M.Id = E.MonitorId) where";
if ( $user['MonitorIds'] )
{
$countSql .= " M.Id in (".join( ",", preg_split( '/["\'\s]*,["\'\s]*/', $user['MonitorIds'] ) ).")";