From 84e809eccd76b3a99b3ef3e6bc674ff27c503adc Mon Sep 17 00:00:00 2001 From: stan Date: Fri, 5 May 2006 10:55:18 +0000 Subject: [PATCH] Bug 318 - Changed config for HTML and xHTML to make base file processing clearer. git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1954 e3e1d417-86f3-4887-817a-d78f3d33393f --- web/Makefile.am | 4 ++ web/zm_config.php.in | 2 +- web/zm_html.php | 46 +----------- web/zm_html_config.php | 152 ++++++++++++++++++++++++++++++++++++++++ web/zm_xhtml.php | 39 ++--------- web/zm_xhtml_config.php | 58 +++++++++++++++ 6 files changed, 222 insertions(+), 79 deletions(-) create mode 100644 web/zm_html_config.php create mode 100644 web/zm_xhtml_config.php diff --git a/web/Makefile.am b/web/Makefile.am index 90bb91dea..8e363827a 100644 --- a/web/Makefile.am +++ b/web/Makefile.am @@ -20,6 +20,7 @@ web_DATA = \ zm_funcs.php \ zm_html.php \ zm_html_styles.css \ + zm_html_config.php \ zm_html_view_bandwidth.php \ zm_html_view_blank.php \ zm_html_view_console.php \ @@ -75,6 +76,7 @@ web_DATA = \ zm_html_view_zones.php \ zm_xhtml.php \ zm_xhtml_styles.css \ + zm_xhtml_config.php \ zm_xhtml_view_console.php \ zm_xhtml_view_error.php \ zm_xhtml_view_eventdetails.php \ @@ -122,6 +124,7 @@ EXTRA_DIST = \ zm_funcs.php \ zm_html.php \ zm_html_styles.css \ + zm_html_config.php \ zm_html_view_bandwidth.php \ zm_html_view_blank.php \ zm_html_view_console.php \ @@ -176,6 +179,7 @@ EXTRA_DIST = \ zm_html_view_zones.php \ zm_xhtml.php \ zm_xhtml_styles.css \ + zm_xhtml_config.php \ zm_xhtml_view_console.php \ zm_xhtml_view_error.php \ zm_xhtml_view_eventdetails.php \ diff --git a/web/zm_config.php.in b/web/zm_config.php.in index ffe57b1bd..784fac66e 100644 --- a/web/zm_config.php.in +++ b/web/zm_config.php.in @@ -29,7 +29,7 @@ while ( !feof($cfg) ) $str = fgets( $cfg, 256 ); if ( preg_match( '/^\s*$/', $str )) { continue; } elseif ( preg_match( '/^\s*#/', $str )) { continue; } - elseif ( preg_match( '/^\s*([^=\s]+)\s*=\s*([^=\s]+)\s*$/', $str, $matches )) + elseif ( preg_match( '/^\s*([^=\s]+)\s*=\s*(.+)\s*$/', $str, $matches )) { define( $matches[1], $matches[2] ); } diff --git a/web/zm_html.php b/web/zm_html.php index 9a8fac5c4..62f805114 100644 --- a/web/zm_html.php +++ b/web/zm_html.php @@ -25,7 +25,7 @@ if ( !$bandwidth ) //ini_set( "magic_quotes_gpc", "Off" ); -require_once( 'zm_config.php' ); +require_once( 'zm_html_config.php' ); if ( ZM_OPT_USE_AUTH ) { @@ -41,50 +41,11 @@ if ( ZM_OPT_USE_AUTH ) } else { - $user = array( - "Username"=>"admin", - "Password"=>"", - "Language"=>"", - "Enabled"=>1, - "Stream"=>'View', - "Events"=>'Edit', - "Control"=>'Edit', - "Monitors"=>'Edit', - "System"=>'Edit', - ); + $user = $default_user; } require_once( 'zm_lang.php' ); - -$bw_array = array( - "high"=>$zmSlangHigh, - "medium"=>$zmSlangMedium, - "low"=>$zmSlangLow -); - -$rates = array( - "10000" => "100x", - "5000" => "50x", - "2500" => "25x", - "1000" => "10x", - "400" => "4x", - "200" => "2x", - "100" => $zmSlangReal, - "50" => "1/2x", - "25" => "1/4x", -); - -$scales = array( - "400" => "4x", - "300" => "3x", - "200" => "2x", - "150" => "1.5x", - "100" => $zmSlangActual, - "75" => "3/4x", - "50" => "1/2x", - "33" => "1/3x", - "25" => "1/4x", -); +require_once( 'zm_funcs.php' ); if ( !isset($user) && ZM_OPT_USE_AUTH ) { @@ -96,7 +57,6 @@ if ( !isset($user) && ZM_OPT_USE_AUTH ) } } -require_once( 'zm_funcs.php' ); require_once( 'zm_actions.php' ); if ( !isset($user) ) diff --git a/web/zm_html_config.php b/web/zm_html_config.php new file mode 100644 index 000000000..280c75410 --- /dev/null +++ b/web/zm_html_config.php @@ -0,0 +1,152 @@ + "100x", + "5000" => "50x", + "2500" => "25x", + "1000" => "10x", + "400" => "4x", + "200" => "2x", + "100" => $zmSlangReal, + "50" => "1/2x", + "25" => "1/4x", +); + +$scales = array( + "400" => "4x", + "300" => "3x", + "200" => "2x", + "150" => "1.5x", + "100" => $zmSlangActual, + "75" => "3/4x", + "50" => "1/2x", + "33" => "1/3x", + "25" => "1/4x", +); + +$bw_array = array( + "high"=>$zmSlangHigh, + "medium"=>$zmSlangMedium, + "low"=>$zmSlangLow +); + +switch ( $bandwidth ) +{ + case "high" : + { + define( "ZM_WEB_REFRESH_MAIN", ZM_WEB_H_REFRESH_MAIN ); // How often (in seconds) the main console window refreshes + define( "ZM_WEB_REFRESH_CYCLE", ZM_WEB_H_REFRESH_CYCLE ); // How often the cycle watch windows swaps to the next monitor + define( "ZM_WEB_REFRESH_IMAGE", ZM_WEB_H_REFRESH_IMAGE ); // How often the watched image is refreshed (if not streaming) + define( "ZM_WEB_REFRESH_STATUS", ZM_WEB_H_REFRESH_STATUS ); // How often the little status frame refreshes itself in the watch window + define( "ZM_WEB_REFRESH_EVENTS", ZM_WEB_H_REFRESH_EVENTS ); // How often the event listing is refreshed in the watch window, only for recent events + define( "ZM_WEB_DEFAULT_SCALE", ZM_WEB_H_DEFAULT_SCALE ); // What the default scaling factor applied to 'live' or 'event' views is (%) + define( "ZM_WEB_DEFAULT_RATE", ZM_WEB_H_DEFAULT_RATE ); // What the default replay rate factor applied to 'event' views is (%) + define( "ZM_WEB_VIDEO_BITRATE", ZM_WEB_H_VIDEO_BITRATE ); // What the bitrate of any streamed video should be + define( "ZM_WEB_VIDEO_MAXFPS", ZM_WEB_H_VIDEO_MAXFPS ); // What the maximum frame rate of any streamed video should be + define( "ZM_WEB_SCALE_THUMBS", ZM_WEB_H_SCALE_THUMBS ); // Image scaling for thumbnails, bandwidth versus cpu in rescaling + define( "ZM_WEB_USE_STREAMS", ZM_WEB_H_USE_STREAMS ); // Whether to use streaming or stills for live and events views + define( "ZM_WEB_EVENTS_VIEW", ZM_WEB_H_EVENTS_VIEW ); // What the default view of multiple events should be. + define( "ZM_WEB_SHOW_PROGRESS", ZM_WEB_H_SHOW_PROGRESS ); // Whether to show the progress of replay in event view. + break; + } + case "medium" : + { + define( "ZM_WEB_REFRESH_MAIN", ZM_WEB_M_REFRESH_MAIN ); // How often (in seconds) the main console window refreshes + define( "ZM_WEB_REFRESH_CYCLE", ZM_WEB_M_REFRESH_CYCLE ); // How often the cycle watch windows swaps to the next monitor + define( "ZM_WEB_REFRESH_IMAGE", ZM_WEB_M_REFRESH_IMAGE ); // How often the watched image is refreshed (if not streaming) + define( "ZM_WEB_REFRESH_STATUS", ZM_WEB_M_REFRESH_STATUS ); // How often the little status frame refreshes itself in the watch window + define( "ZM_WEB_REFRESH_EVENTS", ZM_WEB_M_REFRESH_EVENTS ); // How often the event listing is refreshed in the watch window, only for recent events + define( "ZM_WEB_DEFAULT_SCALE", ZM_WEB_M_DEFAULT_SCALE ); // What the default scaling factor applied to 'live' or 'event' views is (%) + define( "ZM_WEB_DEFAULT_RATE", ZM_WEB_M_DEFAULT_RATE ); // What the default replay rate factor applied to 'event' views is (%) + define( "ZM_WEB_VIDEO_BITRATE", ZM_WEB_M_VIDEO_BITRATE ); // What the bitrate of any streamed video should be + define( "ZM_WEB_VIDEO_MAXFPS", ZM_WEB_M_VIDEO_MAXFPS ); // What the maximum frame rate of any streamed video should be + define( "ZM_WEB_SCALE_THUMBS", ZM_WEB_M_SCALE_THUMBS ); // Image scaling for thumbnails, bandwidth versus cpu in rescaling + define( "ZM_WEB_USE_STREAMS", ZM_WEB_M_USE_STREAMS ); // Whether to use streaming or stills for live and events views + define( "ZM_WEB_EVENTS_VIEW", ZM_WEB_M_EVENTS_VIEW ); // What the default view of multiple events should be. + define( "ZM_WEB_SHOW_PROGRESS", ZM_WEB_M_SHOW_PROGRESS ); // Whether to show the progress of replay in event view. + break; + } + case "low" : + { + define( "ZM_WEB_REFRESH_MAIN", ZM_WEB_L_REFRESH_MAIN ); // How often (in seconds) the main console window refreshes + define( "ZM_WEB_REFRESH_CYCLE", ZM_WEB_L_REFRESH_CYCLE ); // How often the cycle watch windows swaps to the next monitor + define( "ZM_WEB_REFRESH_IMAGE", ZM_WEB_L_REFRESH_IMAGE ); // How often the watched image is refreshed (if not streaming) + define( "ZM_WEB_REFRESH_STATUS", ZM_WEB_L_REFRESH_STATUS ); // How often the little status frame refreshes itself in the watch window + define( "ZM_WEB_REFRESH_EVENTS", ZM_WEB_L_REFRESH_EVENTS ); // How often the event listing is refreshed in the watch window, only for recent events + define( "ZM_WEB_DEFAULT_SCALE", ZM_WEB_L_DEFAULT_SCALE ); // What the default scaling factor applied to 'live' or 'event' views is (%) + define( "ZM_WEB_DEFAULT_RATE", ZM_WEB_L_DEFAULT_RATE ); // What the default replay rate factor applied to 'event' views is (%) + define( "ZM_WEB_VIDEO_BITRATE", ZM_WEB_L_VIDEO_BITRATE ); // What the bitrate of any streamed video should be + define( "ZM_WEB_VIDEO_MAXFPS", ZM_WEB_L_VIDEO_MAXFPS ); // What the maximum frame rate of any streamed video should be + define( "ZM_WEB_SCALE_THUMBS", ZM_WEB_L_SCALE_THUMBS ); // Image scaling for thumbnails, bandwidth versus cpu in rescaling + define( "ZM_WEB_USE_STREAMS", ZM_WEB_L_USE_STREAMS ); // Whether to use streaming or stills for live and events views + define( "ZM_WEB_EVENTS_VIEW", ZM_WEB_L_EVENTS_VIEW ); // What the default view of multiple events should be. + define( "ZM_WEB_SHOW_PROGRESS", ZM_WEB_L_SHOW_PROGRESS ); // Whether to show the progress of replay in event view. + break; + } +} + +// Javascript window sizes +$jws = array( + 'bandwidth' => array( 'w'=>200, 'h'=>90 ), + 'console' => array( 'w'=>750, 'h'=>312 ), + 'control' => array( 'w'=>380, 'h'=>480 ), + 'controlcaps' => array( 'w'=>700, 'h'=>320 ), + 'controlcap' => array( 'w'=>360, 'h'=>440 ), + 'cycle' => array( 'w'=>16, 'h'=>32 ), + 'device' => array( 'w'=>196, 'h'=>164 ), + 'donate' => array( 'w'=>500, 'h'=>280 ), + 'event' => array( 'w'=>96, 'h'=>168 ), + 'eventdetail' => array( 'w'=>400, 'h'=>220 ), + 'events' => array( 'w'=>720, 'h'=>480 ), + 'export' => array( 'w'=>400, 'h'=>340 ), + 'filter' => array( 'w'=>620, 'h'=>250 ), + 'filtersave' => array( 'w'=>560, 'h'=>220 ), + 'frames' => array( 'w'=>500, 'h'=>300 ), + 'function' => array( 'w'=>248, 'h'=>92 ), + 'group' => array( 'w'=>360, 'h'=>150 ), + 'groups' => array( 'w'=>400, 'h'=>220 ), + 'image' => array( 'w'=>48, 'h'=>80 ), + 'login' => array( 'w'=>720, 'h'=>480 ), + 'logout' => array( 'w'=>200, 'h'=>100 ), + 'monitor' => array( 'w'=>360, 'h'=>324 ), + 'monitorpreset' => array( 'w'=>400, 'h'=>200 ), + 'monitorselect' => array( 'w'=>160, 'h'=>200 ), + 'montage' => array( 'w'=>10, 'h'=>20 ), + 'optionhelp' => array( 'w'=>320, 'h'=>284 ), + 'options' => array( 'w'=>780, 'h'=>540 ), + 'preset' => array( 'w'=>240, 'h'=>90 ), + 'restarting' => array( 'w'=>250, 'h'=>150 ), + 'settings' => array( 'w'=>200, 'h'=>225 ), + 'state' => array( 'w'=>300, 'h'=>120 ), + 'stats' => array( 'w'=>740, 'h'=>200 ), + 'timeline' => array( 'w'=>760, 'h'=>500 ), + 'user' => array( 'w'=>280, 'h'=>372 ), + 'version' => array( 'w'=>320, 'h'=>140 ), + 'video' => array( 'w'=>100, 'h'=>80 ), + 'watch' => array( 'w'=>96, 'h'=>384 ), + 'zone' => array( 'w'=>400, 'h'=>450 ), + 'zones' => array( 'w'=>72, 'h'=>232 ), +); + + +?> diff --git a/web/zm_xhtml.php b/web/zm_xhtml.php index 11e7c0044..22e6a7fdb 100644 --- a/web/zm_xhtml.php +++ b/web/zm_xhtml.php @@ -1,6 +1,6 @@ "admin", - "Password"=>"", - "Language"=>"", - "Enabled"=>1, - "Stream"=>'View', - "Events"=>'Edit', - "Control"=>'Edit', - "Monitors"=>'Edit', - "System"=>'Edit', - ); + $user = $default_user; } require_once( 'zm_lang.php' ); +require_once( 'zm_funcs.php' ); noCacheHeaders(); header("Content-type: application/xhtml+xml" ); @@ -61,27 +52,6 @@ echo( ' "50x", - "2000" => "20x", - "500" => "5x", - "200" => "2x", - "100" => $zmSlangReal, - "50" => "1/2x", -); - -$scales = array( - "400" => "4x", - "300" => "3x", - "200" => "2x", - "150" => "1.5x", - "100" => $zmSlangActual, - "75" => "3/4x", - "50" => "1/2x", - "33" => "1/3x", - "25" => "1/4x", -); - if ( !isset($user) && ZM_OPT_USE_AUTH ) { if ( ZM_AUTH_TYPE == "remote" && !empty( $_SERVER['REMOTE_USER'] ) ) @@ -92,7 +62,6 @@ if ( !isset($user) && ZM_OPT_USE_AUTH ) } } -require_once( 'zm_funcs.php' ); require_once( 'zm_actions.php' ); if ( !isset($user) ) diff --git a/web/zm_xhtml_config.php b/web/zm_xhtml_config.php new file mode 100644 index 000000000..2c73795f9 --- /dev/null +++ b/web/zm_xhtml_config.php @@ -0,0 +1,58 @@ + "50x", + "2000" => "20x", + "500" => "5x", + "200" => "2x", + "100" => $zmSlangReal, + "50" => "1/2x", +); + +$scales = array( + "400" => "4x", + "300" => "3x", + "200" => "2x", + "150" => "1.5x", + "100" => $zmSlangActual, + "75" => "3/4x", + "50" => "1/2x", + "33" => "1/3x", + "25" => "1/4x", +); + +switch ( $bandwidth ) +{ + case "phone" : // Very incomplete at present + { + define( "ZM_WEB_DEFAULT_RATE", ZM_WEB_P_DEFAULT_RATE ); // What the default replay rate factor applied to 'event' views is (%) + define( "ZM_WEB_SCALE_THUMBS", ZM_WEB_P_SCALE_THUMBS ); // Image scaling for thumbnails, bandwidth versus cpu in rescaling + break; + } +} + +?>