Merge pull request #8 from SansPseudoFix/webdev

Redirections and autofocus

include/html/form/configuration.php

@@ -1,23 +1,23 @@
 <div class="row">
   <div class="col-md-4 col-md-offset-4">
-    
+
     <form id="configuration_form" method="POST" class="panel panel-default">
-      
+
       <div class="panel-heading">
         <h3 class="panel-title">Get the configuration files</h3>
       </div>
-      
+
       <div class="panel-body">
         <div class="form-group">
           <label for="configuration_username">Username</label>
-          <input type="text" id="configuration_username" name="configuration_username" class="form-control" />
+          <input type="text" id="configuration_username" name="configuration_username" class="form-control" autofocus/>
         </div>
-        
+
         <div class="form-group">
           <label for="configuration_pass">Password</label>
           <input type="password" id="configuration_pass" name="configuration_pass" class="form-control" />
         </div>
-        
+
         <div class="form-group">
           <label for="configuration_os">OS</label>
           <select name="configuration_os" id="configuration_os" class="form-control">
@@ -25,11 +25,11 @@
             <option value="windows">Windows</option>
           </select>
         </div>
-        
+
         <input id="configuration_get" name="configuration_get" type="submit" value="Get configuration files" class="btn btn-default" />
       </div>
-      
+
     </form>
-    
+
   </div>
-</div>
+</div>

include/html/form/installation.php

@@ -1,36 +1,36 @@
 <div class="row">
   <div class="col-md-4 col-md-offset-4">
-    
+
     <form id="install_form" method="POST" class="panel panel-default">
-      
+
       <div class="panel-heading">
         <h3 class="panel-title">Installation</h3>
       </div>
-      
+
       <div class="panel-body">
         <div class="form-group">
           <label for="admin_username">Admin username:</label>
-          <input type="text" id="admin_username" name="admin_username" class="form-control" />
+          <input type="text" id="admin_username" name="admin_username" class="form-control" autofocus/>
         </div>
-        
+
         <br /><br />
-        
+
         <div class="form-group">
           <label for="admin_pass">Admin password:</label>
           <input type="password" id="admin_pass" name="admin_pass" class="form-control" />
         </div>
-        
+
         <div class="form-group">
           <label for="repeat_admin_pass">Repeat the admin password:</label>
           <input type="password" id="repeat_admin_pass" name="repeat_admin_pass" class="form-control" />
         </div>
-        
+
         <br /><br />
-        
+
         <input id="install" name="install" type="submit" value="Install" class="btn btn-default" />
       </div>
-      
+
     </form>
-    
+
   </div>
-</div>
+</div>

include/html/form/login.php

@@ -1,27 +1,27 @@
 <div class="row">
   <div class="col-md-2 col-md-offset-5">
-    
+
     <form id="login_form" method="POST" class="panel panel-default">
-      
+
       <div class="panel-heading">
         <h3 class="panel-title">Administrator</h3>
       </div>
-      
+
       <div class="panel-body">
         <div class="form-group">
           <label for="admin_username">Username</label>
-          <input type="text" id="admin_username" name="admin_username" class="form-control" />
+          <input type="text" id="admin_username" name="admin_username" class="form-control" autofocus/>
         </div>
-        
+
         <div class="form-group">
           <label for="admin_pass">Password</label>
           <input type="password" id="admin_pass" name="admin_pass" class="form-control" />
         </div>
-        
+
         <input id="admin_login" name="admin_login" type="submit" value="Login" class="btn btn-default" />
       </div>
-      
+
     </form>
-    
+
   </div>
-</div>
+</div>

index.php

@@ -107,7 +107,8 @@
     // --------------- INSTALLATION ---------------
     if(isset($_GET['installation'])) {
       if(isInstalled($bdd) == true) {
-        printError('OpenVPN-admin is already installed.');
+        printError('OpenVPN-admin is already installed. Redirection.');
+        header( "refresh:3;url=index.php?admin.php" );
         exit -1;
       }
 
@@ -142,7 +143,8 @@
 
         unlink($sql_file);
         rmdir(dirname(__FILE__) . '/sql');
-        printSuccess('Well done, OpenVPN-Admin is installed.');
+        printSuccess('Well done, OpenVPN-Admin is installed. Redirection.');
+        header( "refresh:3;url=index.php?admin.php" );
       }
       // Print the installation form
       else {