From 1b87c9e119410f6618f2fe176be2abb871460dd0 Mon Sep 17 00:00:00 2001
From: stan <stan@e3e1d417-86f3-4887-817a-d78f3d33393f>
Date: Wed, 17 Mar 2004 22:54:29 +0000
Subject: [PATCH] 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             | 21 ++++++++++++++++++++-
 web/zm_html_view_console.php |  7 +------
 web/zm_lang_de_de.php        |  3 ++-
 web/zm_lang_en_gb.php        |  3 ++-
 web/zm_lang_fr_fr.php        |  3 ++-
 web/zm_lang_ja_jp.php        |  3 ++-
 web/zm_lang_nl_nl.php        |  3 ++-
 web/zm_lang_pl_pl.php        |  3 ++-
 web/zm_lang_ru_ru.php        |  3 ++-
 9 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/web/zm_funcs.php b/web/zm_funcs.php
index faa68fac8..3663380f9 100644
--- a/web/zm_funcs.php
+++ b/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 );
+}
 ?>
diff --git a/web/zm_html_view_console.php b/web/zm_html_view_console.php
index c91ba4750..06f12a22a 100644
--- a/web/zm_html_view_console.php
+++ b/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
-$uptime = shell_exec( 'uptime' );
-$load = '';
-preg_match( '/load average: ([\d.]+)/', $uptime, $matches );
-?>
-<td class="smallhead" align="right"><?= $zmSlangServerLoad ?>: <?= $matches[1] ?></td>
+<td class="smallhead" align="right"><?= $zmSlangLoad ?>: <?= getLoad() ?> / <?= $zmSlangDisk ?>: <?= getSpace() ?></td>
 </tr>
 <tr>
 <td class="smallhead" align="left">
diff --git a/web/zm_lang_de_de.php b/web/zm_lang_de_de.php
index 7b22cff19..2f812cc4e 100644
--- a/web/zm_lang_de_de.php
+++ b/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';
diff --git a/web/zm_lang_en_gb.php b/web/zm_lang_en_gb.php
index 27cd5fd78..968cbb589 100644
--- a/web/zm_lang_en_gb.php
+++ b/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';
diff --git a/web/zm_lang_fr_fr.php b/web/zm_lang_fr_fr.php
index 6d3262f75..55c752a77 100644
--- a/web/zm_lang_fr_fr.php
+++ b/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';
diff --git a/web/zm_lang_ja_jp.php b/web/zm_lang_ja_jp.php
index b42363af3..6df242a36 100644
--- a/web/zm_lang_ja_jp.php
+++ b/web/zm_lang_ja_jp.php
@@ -143,6 +143,7 @@ $zmSlangDeviceChannel        = '
 $zmSlangDeviceFormat         = '���޲� ̫�ϯ� (0=PAL,1=NTSC �� )';
 $zmSlangDeviceNumber         = '���޲��ԍ� (/dev/video?)';
 $zmSlangDimensions           = '���@';
+$zmSlangDisk                 = 'Disk';
 $zmSlangDuration             = '�p������';
 $zmSlangEdit                 = '�ҏW';
 $zmSlangEmail                = 'Ұ�';
@@ -187,6 +188,7 @@ $zmSlangInclude              = '
 $zmSlangInverted             = '���]';
 $zmSlangLanguage             = '����';
 $zmSlangLast                 = '�ŏI';
+$zmSlangLoad                 = 'Load';
 $zmSlangLocal                = '۰��';
 $zmSlangLoggedInAs           = '۸޲ݍς�:';
 $zmSlangLoggingIn            = '۸޲ݒ�';
@@ -287,7 +289,6 @@ $zmSlangScale                = '
 $zmSlangScore                = '����';
 $zmSlangSecs                 = '�b';
 $zmSlangSectionlength        = '����';
-$zmSlangServerLoad           = '���ް ���S��';
 $zmSlangSetLearnPrefs        = 'Set Learn Prefs'; // �V�����ݒ�̎����ۑ��@This can be ignored for now
 $zmSlangSetNewBandwidth      = '�V�����ш敝�̐ݒ�';
 $zmSlangSettings             = '�ݒ�';
diff --git a/web/zm_lang_nl_nl.php b/web/zm_lang_nl_nl.php
index 575bb9f96..21e0fe47f 100644
--- a/web/zm_lang_nl_nl.php
+++ b/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';
diff --git a/web/zm_lang_pl_pl.php b/web/zm_lang_pl_pl.php
index 3ce20a907..8b6101bb7 100644
--- a/web/zm_lang_pl_pl.php
+++ b/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';
diff --git a/web/zm_lang_ru_ru.php b/web/zm_lang_ru_ru.php
index c49c60bd8..21a4ee5d8 100644
--- a/web/zm_lang_ru_ru.php
+++ b/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             = '���������';