Changed Console view to display disk space.

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@977 e3e1d417-86f3-4887-817a-d78f3d33393f

web/zm_funcs.php

@@ -20,7 +20,7 @@
 
 function userLogin( $username, $password )
 {
-	global $user, $HTTP_SESSION_VARS;
+	global $user, $HTTP_SESSION_VARS, $HTTP_SERVER_VARS;
 
 	$sql = "select * from Users where Username = '$username' and Password = password('$password') and Enabled = 1";
 	$result = mysql_query( $sql );
@@ -28,6 +28,7 @@ function userLogin( $username, $password )
 		echo mysql_error();
 	$HTTP_SESSION_VARS['username'] = $username;
 	$HTTP_SESSION_VARS['password'] = $password;
+	$HTTP_SESSION_VARS['remote_addr'] = $HTTP_SERVER_VARS['REMOTE_ADDR']; // To help prevent session hijacking
 	if ( $db_user = mysql_fetch_assoc( $result ) )
 	{
 		$HTTP_SESSION_VARS['user'] = $user = $db_user;
@@ -587,4 +588,22 @@ function parseFilter()
 	}
 	$filter_sql = " and ( $filter_sql )";
 }
+
+function getLoad()
+{
+	$uptime = shell_exec( 'uptime' );
+	$load = '';
+	if ( preg_match( '/load average: ([\d.]+)/', $uptime, $matches ) )
+		$load = $matches[1];
+	return( $load );
+}
+
+function getSpace()
+{
+	$df = shell_exec( 'df '.ZM_DIR_EVENTS );
+	$load = '';
+	if ( preg_match( '/\s(\d+%)/ms', $df, $matches ) )
+		$space = $matches[1];
+	return( $space );
+}
 ?>

web/zm_html_view_console.php

@@ -124,12 +124,7 @@ newWindow( '<?= $PHP_SELF ?>?view=version', 'zmVersion', <?= $jws['version']['w'
 <tr>
 <td class="smallhead" align="left"><?= date( "D jS M, g:ia" ) ?></td>
 <td class="bighead" align="center"><strong><a href="http://www.zoneminder.com" target="ZoneMinder">ZoneMinder</a> <?= $zmSlangConsole ?> - <?php if ( canEdit( 'System' ) ) { ?><a href="javascript: newWindow( '<?= $PHP_SELF ?>?view=state', 'zmState', <?= $jws['state']['w'] ?>, <?= $jws['state']['h'] ?> );"><?= $status ?></a> - <?php } ?><?= makeLink( "javascript: newWindow( '$PHP_SELF?view=version', 'zmVersion', ".$jws['version']['w'].", ".$jws['version']['h']." );", "v".ZM_VERSION, canEdit( 'System' ) ) ?></strong></td>
-<?php
+<td class="smallhead" align="right"><?= $zmSlangLoad ?>: <?= getLoad() ?> / <?= $zmSlangDisk ?>: <?= getSpace() ?></td>
-$uptime = shell_exec( 'uptime' );
-$load = '';
-preg_match( '/load average: ([\d.]+)/', $uptime, $matches );
-?>
-<td class="smallhead" align="right"><?= $zmSlangServerLoad ?>: <?= $matches[1] ?></td>
 </tr>
 <tr>
 <td class="smallhead" align="left">

web/zm_lang_de_de.php

@@ -143,6 +143,7 @@ $zmSlangDeviceChannel        = 'Ger
 $zmSlangDeviceFormat         = 'Geräte Format (0=PAL,1=NTSC etc)';
 $zmSlangDeviceNumber         = 'Geräte Nummer (/dev/video?)';
 $zmSlangDimensions           = 'Abmaße';
+$zmSlangDisk                 = 'Disk';
 $zmSlangDuration             = 'Dauer';
 $zmSlangEdit                 = 'Bearbeiten';
 $zmSlangEmail                = 'Email';
@@ -187,6 +188,7 @@ $zmSlangInclude              = 'Einschlu
 $zmSlangInverted             = 'Invertiert';
 $zmSlangLanguage             = 'Sprache';
 $zmSlangLast                 = 'Letztes';
+$zmSlangLoad                 = 'Last';
 $zmSlangLocal                = 'Lokal';
 $zmSlangLoggedInAs           = 'Angemeldet als';
 $zmSlangLoggingIn            = 'Amnelden ';
@@ -287,7 +289,6 @@ $zmSlangScale                = 'Skaliere';
 $zmSlangScore                = 'Zähler';
 $zmSlangSecs                 = 'Sekunden';
 $zmSlangSectionlength        = 'Sektions Länge';
-$zmSlangServerLoad           = 'Server Last';
 $zmSlangSetLearnPrefs        = 'Setze Lernmerkmale'; // This can be ignored for now
 $zmSlangSetNewBandwidth      = 'Setze Neue Bandbreite';
 $zmSlangSettings             = 'Einstellungen';

web/zm_lang_en_gb.php

@@ -143,6 +143,7 @@ $zmSlangDeviceChannel        = 'Device Channel';
 $zmSlangDeviceFormat         = 'Device Format (0=PAL,1=NTSC etc)';
 $zmSlangDeviceNumber         = 'Device Number (/dev/video?)';
 $zmSlangDimensions           = 'Dimensions';
+$zmSlangDisk                 = 'Disk';
 $zmSlangDuration             = 'Duration';
 $zmSlangEdit                 = 'Edit';
 $zmSlangEmail                = 'Email';
@@ -187,6 +188,7 @@ $zmSlangInclude              = 'Include';
 $zmSlangInverted             = 'Inverted';
 $zmSlangLanguage             = 'Language';
 $zmSlangLast                 = 'Last';
+$zmSlangLoad                 = 'Load';
 $zmSlangLocal                = 'Local';
 $zmSlangLoggedInAs           = 'Logged In As';
 $zmSlangLoggingIn            = 'Logging In';
@@ -287,7 +289,6 @@ $zmSlangScale                = 'Scale';
 $zmSlangScore                = 'Score';
 $zmSlangSecs                 = 'Secs';
 $zmSlangSectionlength        = 'Section length';
-$zmSlangServerLoad           = 'Server Load';
 $zmSlangSetLearnPrefs        = 'Set Learn Prefs'; // This can be ignored for now
 $zmSlangSetNewBandwidth      = 'Set New Bandwidth';
 $zmSlangSettings             = 'Settings';

web/zm_lang_fr_fr.php

@@ -143,6 +143,7 @@ $zmSlangDeviceChannel        = 'Canal cam
 $zmSlangDeviceFormat         = 'Format caméra (0=PAL,1=NTSC etc)';
 $zmSlangDeviceNumber         = 'Numéro caméra (/dev/video?)';
 $zmSlangDimensions           = 'Dimensions';
+$zmSlangDisk                 = 'Disk';
 $zmSlangDuration             = 'Durée';
 $zmSlangEdit                 = 'Editer';
 $zmSlangEmail                = 'Courriel';
@@ -187,6 +188,7 @@ $zmSlangInclude              = 'Inclure';
 $zmSlangInverted             = 'Inversé';
 $zmSlangLanguage             = 'Langue';
 $zmSlangLast                 = 'Dernier';
+$zmSlangLoad                 = 'Load';
 $zmSlangLocal                = 'Local';
 $zmSlangLoggedInAs           = 'Connecté cô';
 $zmSlangLoggingIn            = 'Connexion';
@@ -287,7 +289,6 @@ $zmSlangScale                = 'Echelle';
 $zmSlangScore                = 'Score';
 $zmSlangSecs                 = 'Secs';
 $zmSlangSectionlength        = 'Longueur section';
-$zmSlangServerLoad           = 'Charge Serveur';
 $zmSlangSetLearnPrefs        = 'Régler préf. apprises'; // This can be ignored for now
 $zmSlangSetNewBandwidth      = 'Régler la bande passante';
 $zmSlangSettings             = 'Réglages';

web/zm_lang_ja_jp.php

@@ -143,6 +143,7 @@ $zmSlangDeviceChannel        = '
 $zmSlangDeviceFormat         = 'ﾃﾞﾊﾞｲｽ ﾌｫｰﾏｯﾄ (0=PAL,1=NTSC 等 )';
 $zmSlangDeviceNumber         = 'ﾃﾞﾊﾞｲｽ番号 (/dev/video?)';
 $zmSlangDimensions           = '寸法';
+$zmSlangDisk                 = 'Disk';
 $zmSlangDuration             = '継続時間';
 $zmSlangEdit                 = '編集';
 $zmSlangEmail                = 'ﾒｰﾙ';
@@ -187,6 +188,7 @@ $zmSlangInclude              = '
 $zmSlangInverted             = '反転';
 $zmSlangLanguage             = '言語';
 $zmSlangLast                 = '最終';
+$zmSlangLoad                 = 'Load';
 $zmSlangLocal                = 'ﾛｰｶﾙ';
 $zmSlangLoggedInAs           = 'ﾛｸﾞｲﾝ済み:';
 $zmSlangLoggingIn            = 'ﾛｸﾞｲﾝ中';
@@ -287,7 +289,6 @@ $zmSlangScale                = '
 $zmSlangScore                = 'ｽｺｱｰ';
 $zmSlangSecs                 = '秒';
 $zmSlangSectionlength        = '長さ';
-$zmSlangServerLoad           = '»°ÊÞ° •‰’S—¦';
 $zmSlangSetLearnPrefs        = 'Set Learn Prefs'; // 新しい設定の自動保存　This can be ignored for now
 $zmSlangSetNewBandwidth      = '新しい帯域幅の設定';
 $zmSlangSettings             = '設定';

web/zm_lang_nl_nl.php

@@ -144,6 +144,7 @@ $zmSlangDeviceChannel        = 'Apparaat kanaal';
 $zmSlangDeviceFormat         = 'Apparaat formaat (0=PAL,1=NTSC etc)';
 $zmSlangDeviceNumber         = 'apparaat nummer (/dev/video?)';
 $zmSlangDimensions           = 'Afmetingen';
+$zmSlangDisk                 = 'Disk';
 $zmSlangDuration             = 'Duur';
 $zmSlangEdit                 = 'Bewerk';
 $zmSlangEmail                = 'Email';
@@ -188,6 +189,7 @@ $zmSlangInclude              = 'voeg in';
 $zmSlangInverted             = 'omgedraaid';
 $zmSlangLanguage             = 'Taal';
 $zmSlangLast                 = 'Laatste';
+$zmSlangLoad                 = 'Load';
 $zmSlangLocal                = 'Lokaal';
 $zmSlangLoggedInAs           = 'Ingelogd als';
 $zmSlangLoggingIn            = 'In loggen';
@@ -288,7 +290,6 @@ $zmSlangScale                = 'Schaal';
 $zmSlangScore                = 'Score';
 $zmSlangSecs                 = 'Secs';
 $zmSlangSectionlength        = 'Sectie lengte';
-$zmSlangServerLoad           = 'Server belasting';
 $zmSlangSetLearnPrefs        = 'Set Learn Prefs'; // This can be ignored for now
 $zmSlangSetNewBandwidth      = 'Set Nieuwe Bandbreedte';
 $zmSlangSettings             = 'Instellingen';

web/zm_lang_pl_pl.php

@@ -144,6 +144,7 @@ $zmSlangDeviceChannel        = 'Numer wej
 $zmSlangDeviceFormat         = 'System TV (0=PAL,1=NTSC itd)';
 $zmSlangDeviceNumber         = 'Numer urz±dzenia (/dev/video?)';
 $zmSlangDimensions           = 'Rozmiary';
+$zmSlangDisk                 = 'Disk';
 $zmSlangDuration             = 'Czas trwania';
 $zmSlangEdit                 = 'Edycja';
 $zmSlangEmail                = 'Email';
@@ -188,6 +189,7 @@ $zmSlangInclude              = 'Do
 $zmSlangInverted             = 'Odwrócony';
 $zmSlangLanguage             = 'Jêzyk';
 $zmSlangLast                 = 'Ostatni';
+$zmSlangLoad                 = 'Load';
 $zmSlangLocal                = 'Lokalny';
 $zmSlangLoggedInAs           = 'Zalogowany jako';
 $zmSlangLoggingIn            = 'Logowanie';
@@ -288,7 +290,6 @@ $zmSlangScale                = 'Skala';
 $zmSlangScore                = 'Wynik';
 $zmSlangSecs                 = 'Sekund';
 $zmSlangSectionlength        = 'D³ugo¶æ sekcji';
-$zmSlangServerLoad           = 'Obci±¿enie serwera';
 $zmSlangSetLearnPrefs        = 'Ustaw preferencje nauki'; // This can be ignored for now
 $zmSlangSetNewBandwidth      = 'Ustaw now± przepustowo¶æ';
 $zmSlangSettings             = 'Ustawienia';

web/zm_lang_ru_ru.php

@@ -144,6 +144,7 @@ $zmSlangDeviceChannel        = '
 $zmSlangDeviceFormat         = 'Формат (0=PAL,1=NTSC и т.д.)';
 $zmSlangDeviceNumber         = 'Номер устройства (/dev/video?)';
 $zmSlangDimensions           = 'Размеры';
+$zmSlangDisk                 = 'Disk';
 $zmSlangDuration             = 'Длительность';
 $zmSlangEdit                 = 'Редактирование';
 $zmSlangEmail                = 'Email';
@@ -188,6 +189,7 @@ $zmSlangInclude              = '
 $zmSlangInverted             = 'Инвертировать';
 $zmSlangLanguage             = 'Язык';
 $zmSlangLast                 = 'Последний';
+$zmSlangLoad                 = 'Load';
 $zmSlangLocal                = 'Локальный';
 $zmSlangLoggedInAs           = 'Пользователь';
 $zmSlangLoggingIn            = 'Вход в систему';
@@ -288,7 +290,6 @@ $zmSlangScale                = '
 $zmSlangScore                = 'Оценка';
 $zmSlangSecs                 = 'Сек.';
 $zmSlangSectionlength        = 'Длина секции (в кадрах)';
-$zmSlangServerLoad           = '愠ﾇﾒﾕﾚﾋﾁ ﾓﾅﾒﾗﾅﾒﾁ';
 $zmSlangSetLearnPrefs        = 'Set Learn Prefs'; // This can be ignored for now
 $zmSlangSetNewBandwidth      = 'Установка новой ширина канала';
 $zmSlangSettings             = 'Настройки';