Merge branch 'iconnor-updated-console' into storageareas

web/index.php

@@ -138,6 +138,7 @@ else
 
 require_once( 'includes/lang.php' );
 require_once( 'includes/functions.php' );
+$running = daemonCheck();
 
 # Add Cross domain access headers
 CORSHeaders();

web/skins/classic/views/header.php

@@ -18,7 +18,6 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 //
 
-$running = daemonCheck();
 $states = dbFetchAll( "select * from States" );
 $status = $running?translate('Running'):translate('Stopped');
 $run_state = dbFetchOne('select Name from States where  IsActive = 1', 'Name' );