From: <mgu...@us...> - 2011-08-11 19:38:06
|
Revision: 1774 http://nagios.svn.sourceforge.net/nagios/?rev=1774&view=rev Author: mguthrie88 Date: 2011-08-11 19:37:59 +0000 (Thu, 11 Aug 2011) Log Message: ----------- working on initializing gettext support Modified Paths: -------------- nagiosvshell/trunk/vshell/config/vshell.conf nagiosvshell/trunk/vshell/css/style.css nagiosvshell/trunk/vshell/inc.inc.php nagiosvshell/trunk/vshell/index.php nagiosvshell/trunk/vshell/install.sh Added Paths: ----------- nagiosvshell/trunk/vshell/session.inc.php Removed Paths: ------------- nagiosvshell/trunk/vshell/auth.inc.php Deleted: nagiosvshell/trunk/vshell/auth.inc.php =================================================================== --- nagiosvshell/trunk/vshell/auth.inc.php 2011-08-11 18:34:28 UTC (rev 1773) +++ nagiosvshell/trunk/vshell/auth.inc.php 2011-08-11 19:37:59 UTC (rev 1774) @@ -1,32 +0,0 @@ -<?php //user authentication - - -function check_auth() //return $username if logged into nagios -{ - - // HTTP BASIC AUTHENTICATION through Nagios Core or XI - //$remote_user=""; - if(isset($_SERVER["REMOTE_USER"])) - { - $remote_user=$_SERVER["REMOTE_USER"]; - //echo "REMOTE USER is set: $remote_user<br />"; - return $remote_user; - } - //digest authentication - elseif(isset($_SERVER['PHP_AUTH_USER'])) - { - //echo "Auth Digest detected".$_SERVER['PHP_AUTH_USER']; - return $_SERVER['PHP_AUTH_USER']; - } - else - { - echo "Access Denied: No authentication detected."; - return false; - } - -} - - - - -?> \ No newline at end of file Modified: nagiosvshell/trunk/vshell/config/vshell.conf =================================================================== --- nagiosvshell/trunk/vshell/config/vshell.conf 2011-08-11 18:34:28 UTC (rev 1773) +++ nagiosvshell/trunk/vshell/config/vshell.conf 2011-08-11 19:37:59 UTC (rev 1774) @@ -26,6 +26,15 @@ ; Full filesystem path to the Nagios CGI permissions configuration file CGICFG = "/usr/local/nagios/etc/cgi.cfg" +; Full filesystem path to the Nagios command pipe +NAGCMD = "/usr/local/nagios/var/rw/nagios.cmd" + +; Full filesystem path to the Nagios lock file (when Nagios is running) +NAGLOCK = "/usr/local/nagios/var/nagios.lock" + ; The default number of maximum results to display in a table before paging RESULTLIMIT= 100 +;Language Set: usually these options are located in the /usr/lib/locale directory +LANG = "en_GB.utf8" + Modified: nagiosvshell/trunk/vshell/css/style.css =================================================================== --- nagiosvshell/trunk/vshell/css/style.css 2011-08-11 18:34:28 UTC (rev 1773) +++ nagiosvshell/trunk/vshell/css/style.css 2011-08-11 19:37:59 UTC (rev 1774) @@ -89,7 +89,7 @@ a.highlight { color: #097AC7;} /*navigation lists */ -ul.nav { top: 52px; position: absolute; width: 800px; } +ul.nav { top: 52px; position: absolute; width: 850px; } li.nav { list-style: none; padding-left: 10px; float: left; } div.corelink {position: absolute; right: 15px; top: 25px;} Modified: nagiosvshell/trunk/vshell/inc.inc.php =================================================================== --- nagiosvshell/trunk/vshell/inc.inc.php 2011-08-11 18:34:28 UTC (rev 1773) +++ nagiosvshell/trunk/vshell/inc.inc.php 2011-08-11 19:37:59 UTC (rev 1774) @@ -53,7 +53,7 @@ //include files for local directory include(dirname(__FILE__).'/constants.inc.php'); //DO NOT ADD INCLUDES ABOVE THIS LINE -include(dirname(__FILE__).'/auth.inc.php'); +include(dirname(__FILE__).'/session.inc.php'); Modified: nagiosvshell/trunk/vshell/index.php =================================================================== --- nagiosvshell/trunk/vshell/index.php 2011-08-11 18:34:28 UTC (rev 1773) +++ nagiosvshell/trunk/vshell/index.php 2011-08-11 19:37:59 UTC (rev 1774) @@ -56,25 +56,23 @@ ob_start(); include(dirname(__FILE__).'/inc.inc.php'); //master include file + +init_vshell(); + $page_title = 'Nagios Visual Shell'; //check_auth() needs to be revised to include other auth types and contact viewing of hosts -$username = check_auth(); +$username = get_user(); //$username = 'nagiosadmin'; //uncomment this to only use apache authentication methods -set_perms($username); //set global $authorization - if($username) //if logged in, display the page -{ +{ + set_perms($username); //set global $authorization page_router(); } -else -{ - //display a message if not logged in - print "Access Denied"; -} + ob_end_flush(); ?> Modified: nagiosvshell/trunk/vshell/install.sh =================================================================== --- nagiosvshell/trunk/vshell/install.sh 2011-08-11 18:34:28 UTC (rev 1773) +++ nagiosvshell/trunk/vshell/install.sh 2011-08-11 19:37:59 UTC (rev 1774) @@ -48,17 +48,17 @@ ### NEGLIGENCE OR OTHERWISE) OR OTHER ACTION, ARISING FROM, OUT OF OR IN CONNECTION ### WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -set -e + TARGETDIR="/usr/local/vshell" APACHECONF="/etc/httpd/conf.d" -mv config/vshell_apache.conf "$APACHECONF"/vshell.conf -mv config/vshell.conf /etc/ -rmdir config +cp config/vshell_apache.conf "$APACHECONF"/vshell.conf +cp config/vshell.conf /etc/ + mkdir "$TARGETDIR" -mv * "$TARGETDIR"/ +cp -r * "$TARGETDIR"/ rm "$TARGETDIR"/install.sh service httpd restart Added: nagiosvshell/trunk/vshell/session.inc.php =================================================================== --- nagiosvshell/trunk/vshell/session.inc.php (rev 0) +++ nagiosvshell/trunk/vshell/session.inc.php 2011-08-11 19:37:59 UTC (rev 1774) @@ -0,0 +1,50 @@ +<?php //user authentication + +//initializes all session variables as neccessary +function init_vshell() +{ + + + $loc = setlocale(LC_ALL, LANG, "en_GB.utf8"); + if (!isset($loc)) { + echo gettext("Error in setting the correct locale, please report this error with the associated output of 'locale -a' to mgu...@na...")."<br>"; + } + putenv("LC_ALL=".LANG); + putenv("LANG=".LANG); + bindtextdomain(BASEURL, '/usr/lib/locale'); + bind_textdomain_codeset(BASEURL, 'UTF-8'); + textdomain(BASEURL); + + +} + + +function get_user() //return $username if logged into nagios +{ + + // HTTP BASIC AUTHENTICATION through Nagios Core or XI + //$remote_user=""; + if(isset($_SERVER["REMOTE_USER"])) + { + $remote_user=$_SERVER["REMOTE_USER"]; + //echo "REMOTE USER is set: $remote_user<br />"; + return $remote_user; + } + //digest authentication + elseif(isset($_SERVER['PHP_AUTH_USER'])) + { + //echo "Auth Digest detected".$_SERVER['PHP_AUTH_USER']; + return $_SERVER['PHP_AUTH_USER']; + } + else + { + echo "Access Denied: No authentication detected."; + return false; + } + +} + + + + +?> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |