From 81065ba6dd449246f8162a24d8f37976c81ae36f Mon Sep 17 00:00:00 2001 From: stan Date: Mon, 14 Jul 2008 14:42:20 +0000 Subject: [PATCH] Removed learn state bits git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2510 e3e1d417-86f3-4887-817a-d78f3d33393f --- web/ajax/status.php | 1 - web/includes/config.php.in | 1 - web/lang/big5_big5.php | 1 - web/lang/cs_cz.php | 1 - web/lang/de_de.php | 1 - web/lang/dk_dk.php | 1 - web/lang/en_gb.php | 1 - web/lang/es_ar.php | 1 - web/lang/fr_fr.php | 1 - web/lang/he_il.php | 1 - web/lang/hu_hu.php | 1 - web/lang/it_it.php | 1 - web/lang/ja_jp.php | 1 - web/lang/nl_nl.php | 1 - web/lang/pl_pl.php | 1 - web/lang/pt_br.php | 1 - web/lang/ro_ro.php | 1 - web/lang/ru_ru.php | 1 - web/lang/se_se.php | 1 - web/skins/Makefile.am | 3 +-- web/skins/mobile/views/events.php | 2 +- 21 files changed, 2 insertions(+), 22 deletions(-) diff --git a/web/ajax/status.php b/web/ajax/status.php index 368f5a5e5..4cb5a72de 100644 --- a/web/ajax/status.php +++ b/web/ajax/status.php @@ -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" ), diff --git a/web/includes/config.php.in b/web/includes/config.php.in index 187083077..5ee2ae0ef 100644 --- a/web/includes/config.php.in +++ b/web/includes/config.php.in @@ -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 diff --git a/web/lang/big5_big5.php b/web/lang/big5_big5.php index 03d1742f3..ca4d4d7af 100644 --- a/web/lang/big5_big5.php +++ b/web/lang/big5_big5.php @@ -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', diff --git a/web/lang/cs_cz.php b/web/lang/cs_cz.php index 696e26f03..c643c10f5 100644 --- a/web/lang/cs_cz.php +++ b/web/lang/cs_cz.php @@ -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 st', 'SetPreset' => 'Nastavit pedvolbu', diff --git a/web/lang/de_de.php b/web/lang/de_de.php index f6428b56a..6f8c2cf56 100644 --- a/web/lang/de_de.php +++ b/web/lang/de_de.php @@ -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', diff --git a/web/lang/dk_dk.php b/web/lang/dk_dk.php index 9967445ca..f05185f0e 100644 --- a/web/lang/dk_dk.php +++ b/web/lang/dk_dk.php @@ -547,7 +547,6 @@ $SLANG = array( 'SelectMonitors' => 'Select Monitors', 'Select' => 'Vlg', 'SelfIntersecting' => 'Polygon edges must not intersect', - 'SetLearnPrefs' => 'Set Learn Prefs', // This can be ignored for now 'SetNewBandwidth' => 'St Ny Bndbrede', 'SetPreset' => 'St Preset', 'Set' => 'St', diff --git a/web/lang/en_gb.php b/web/lang/en_gb.php index f2654b0e4..ed1b26b90 100644 --- a/web/lang/en_gb.php +++ b/web/lang/en_gb.php @@ -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', diff --git a/web/lang/es_ar.php b/web/lang/es_ar.php index e58b3a398..f3af6011f 100644 --- a/web/lang/es_ar.php +++ b/web/lang/es_ar.php @@ -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', diff --git a/web/lang/fr_fr.php b/web/lang/fr_fr.php index 50b352257..d0d6ef60c 100644 --- a/web/lang/fr_fr.php +++ b/web/lang/fr_fr.php @@ -546,7 +546,6 @@ $SLANG = array( 'SelectMonitors' => 'Select Monitors', 'Select' => 'Select', 'SelfIntersecting' => 'Polygon edges must not intersect', - 'SetLearnPrefs' => 'Rgler prf. apprises', // This can be ignored for now 'SetNewBandwidth' => 'Rgler la bande passante', 'SetPreset' => 'Set Preset', 'Set' => 'Set', diff --git a/web/lang/he_il.php b/web/lang/he_il.php index eda27362a..4dc1b912b 100755 --- a/web/lang/he_il.php +++ b/web/lang/he_il.php @@ -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' => '', diff --git a/web/lang/hu_hu.php b/web/lang/hu_hu.php index 4b6d156fd..300f1a7bd 100644 --- a/web/lang/hu_hu.php +++ b/web/lang/hu_hu.php @@ -555,7 +555,6 @@ $SLANG = array( 'SelectMonitors' => 'Monitorok kivlasztsa', 'SelfIntersecting' => 'A sokszg szlei nem keresztezdhetnek', 'Set' => 'Bellt', - 'SetLearnPrefs' => 'Set Learn Prefs', // This can be ignored for now 'SetNewBandwidth' => 'j svszlessg bellts', 'SetPreset' => 'Alaprtelmezett belltsa', 'Settings' => 'Belltsok', diff --git a/web/lang/it_it.php b/web/lang/it_it.php index 9469e16f3..3be4f2e73 100644 --- a/web/lang/it_it.php +++ b/web/lang/it_it.php @@ -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', diff --git a/web/lang/ja_jp.php b/web/lang/ja_jp.php index 379b587d9..066bdbf4b 100644 --- a/web/lang/ja_jp.php +++ b/web/lang/ja_jp.php @@ -546,7 +546,6 @@ $SLANG = array( 'SelectMonitors' => 'Select Monitors', 'Select' => 'Select', 'SelfIntersecting' => 'Polygon edges must not intersect', - 'SetLearnPrefs' => 'Set Learn Prefs', // Vݒ̎ۑ@This can be ignored for now 'SetNewBandwidth' => 'Vш敝̐ݒ', 'SetPreset' => 'Set Preset', 'Set' => 'Set', diff --git a/web/lang/nl_nl.php b/web/lang/nl_nl.php index 4f433d9f7..032d958e1 100644 --- a/web/lang/nl_nl.php +++ b/web/lang/nl_nl.php @@ -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', diff --git a/web/lang/pl_pl.php b/web/lang/pl_pl.php index 4fab00790..55a9b7ffa 100644 --- a/web/lang/pl_pl.php +++ b/web/lang/pl_pl.php @@ -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', diff --git a/web/lang/pt_br.php b/web/lang/pt_br.php index 22a4f37d1..3afce32f4 100644 --- a/web/lang/pt_br.php +++ b/web/lang/pt_br.php @@ -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', diff --git a/web/lang/ro_ro.php b/web/lang/ro_ro.php index b20e6152a..e5113c0b2 100755 --- a/web/lang/ro_ro.php +++ b/web/lang/ro_ro.php @@ -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', diff --git a/web/lang/ru_ru.php b/web/lang/ru_ru.php index a44b95cfc..e7bec4306 100644 --- a/web/lang/ru_ru.php +++ b/web/lang/ru_ru.php @@ -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', diff --git a/web/lang/se_se.php b/web/lang/se_se.php index 9476463a8..9f2633137 100644 --- a/web/lang/se_se.php +++ b/web/lang/se_se.php @@ -546,7 +546,6 @@ $SLANG = array( 'SelectMonitors' => 'Select Monitors', 'Select' => 'Vlj', 'SelfIntersecting' => 'Polygonndarna fr inte verlappa', - 'SetLearnPrefs' => 'Set Learn Prefs', // This can be ignored for now 'SetNewBandwidth' => 'Stll in ny bandbredd', 'SetPreset' => 'Stll in frinstllning', 'Set' => 'Stll in', diff --git a/web/skins/Makefile.am b/web/skins/Makefile.am index 3dd5f726b..d0223abc7 100644 --- a/web/skins/Makefile.am +++ b/web/skins/Makefile.am @@ -2,5 +2,4 @@ AUTOMAKE_OPTIONS = gnu SUBDIRS = \ classic \ - mobile \ - churchwatch + mobile diff --git a/web/skins/mobile/views/events.php b/web/skins/mobile/views/events.php index 1a2589f91..98915d1de 100644 --- a/web/skins/mobile/views/events.php +++ b/web/skins/mobile/views/events.php @@ -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'] ) ).")";