Merge branch 'stable-3.1'

Marius Burkard

2016-07-10 e1ceb050e19c7574bca146a8da7047ee4ff456b5

 interface/web/login/login_as.php

@@ -92,13 +92,14 @@
   '.$wb['login_2_txt'].'<br />
   <div style="visibility:hidden">
      <input type="text" name="username" value="' . $dbData['username'] . '" />
      <input type="password" name="passwort" value="' . $dbData['passwort'] .'" />
      <input type="password" name="password" value="' . $dbData['passwort'] .'" />
   </div>
   <input type="hidden" name="s_mod" value="login" />
   <input type="hidden" name="s_pg" value="index" />
   <input type="hidden" name="s_mod" value="dashboard" />
   <input type="hidden" name="s_pg" value="dashboard" />
   <input type="hidden" name="login_as" value="1" />
    <div class="wf_actions buttons">
      <button class="positive iconstxt icoPositive" type="button" value="'.$wb['btn_yes_txt'].'" onclick="submitLoginForm(' . "'pageForm'" . ');"><span>'.$wb['btn_yes_txt'].'</span></button>
      <button class="negative iconstxt icoNegative" type="button" value="'.$wb['btn_back_txt'].'" data-load-content="'.$backlink.'"><span>'.$wb['btn_back_txt'].'</span></button>
      <button class="btn btn-default formbutton-success" type="button" value="'.$wb['btn_yes_txt'].'" data-submit-form="pageForm" data-form-action="/login/index.php"><span>'.$wb['btn_yes_txt'].'</span></button>
      <button class="btn btn-default formbutton-default" value="'.$wb['btn_back_txt'].'" data-load-content="'.$backlink.'"><span>'.$wb['btn_back_txt'].'</span></button>
    </div>
';
?>