Cleaning up code to match coding guidelines

Marius Cramer

2013-11-14 7fe908c50c8dbc5cc05f571dbe11d66141caacd4

 interface/web/login/index.php

@@ -51,7 +51,7 @@
      $app->uses('tpl');
      $app->tpl->newTemplate('form.tpl.htm');

       $error = '';
      $error = '';

      $app->load_language_file('web/login/lib/lang/'.$conf["language"].'.lng');

@@ -72,14 +72,14 @@
         if(!preg_match("/^[\w\.\-\_\@]{1,128}$/", $_POST['username'])) $error = $app->lng('user_regex_error');
         if(!preg_match("/^.{1,64}$/i", $_POST['passwort'])) $error = $app->lng('pw_error_length');

           //** iporting variables
           $ip      = $app->db->quote(ip2long($_SERVER['REMOTE_ADDR']));
           $username = $app->db->quote($_POST['username']);
           $passwort = $app->db->quote($_POST['passwort']);
         //** iporting variables
         $ip    = $app->db->quote(ip2long($_SERVER['REMOTE_ADDR']));
         $username = $app->db->quote($_POST['username']);
         $passwort = $app->db->quote($_POST['passwort']);
         $loginAs  = false;
         $time = time();

           if($username != '' && $passwort != '' && $error == '') {
         if($username != '' && $passwort != '' && $error == '') {
            /*
             *  Check, if there is a "login as" instead of a "normal" login
             */
@@ -108,28 +108,28 @@
               $loginAs = false;
            }

              //* Check if there are already wrong logins
              $sql = "SELECT * FROM `attempts_login` WHERE `ip`= '{$ip}' AND  `login_time` > (NOW() - INTERVAL 1 MINUTE) LIMIT 1";
              $alreadyfailed = $app->db->queryOneRecord($sql);
              //* too many failedlogins
              if($alreadyfailed['times'] > 5) {
                 $error = $app->lng('error_user_too_many_logins');
              } else {
            //* Check if there are already wrong logins
            $sql = "SELECT * FROM `attempts_login` WHERE `ip`= '{$ip}' AND  `login_time` > (NOW() - INTERVAL 1 MINUTE) LIMIT 1";
            $alreadyfailed = $app->db->queryOneRecord($sql);
            //* too many failedlogins
            if($alreadyfailed['times'] > 5) {
               $error = $app->lng('error_user_too_many_logins');
            } else {

               if ($loginAs){
                    $sql = "SELECT * FROM sys_user WHERE USERNAME = '$username' and PASSWORT = '". $passwort. "'";
                  $sql = "SELECT * FROM sys_user WHERE USERNAME = '$username' and PASSWORT = '". $passwort. "'";
                  $user = $app->db->queryOneRecord($sql);
               } else {
                  if(stristr($username,'@')) {
                  if(stristr($username, '@')) {
                     //* mailuser login
                     $sql = "SELECT * FROM mail_user WHERE login = '$username'";
                     $mailuser = $app->db->queryOneRecord($sql);
                     $user = false;
                     if($mailuser) {
                        $saved_password = stripslashes($mailuser['password']);
                        $salt = '$1$'.substr($saved_password,3,8).'$';
                        $salt = '$1$'.substr($saved_password, 3, 8).'$';
                        //* Check if mailuser password is correct
                        if(crypt(stripslashes($passwort),$salt) == $saved_password) {
                        if(crypt(stripslashes($passwort), $salt) == $saved_password) {
                           //* we build a fake user here which has access to the mailuser module only and userid 0
                           $user = array();
                           $user['userid'] = 0;
@@ -155,11 +155,11 @@
                     if($user) {
                        $saved_password = stripslashes($user['passwort']);

                        if(substr($saved_password,0,3) == '$1$') {
                        if(substr($saved_password, 0, 3) == '$1$') {
                           //* The password is crypt-md5 encrypted
                           $salt = '$1$'.substr($saved_password,3,8).'$';
                           $salt = '$1$'.substr($saved_password, 3, 8).'$';

                           if(crypt(stripslashes($passwort),$salt) != $saved_password) {
                           if(crypt(stripslashes($passwort), $salt) != $saved_password) {
                              $user = false;
                           }
                        } else {
@@ -175,8 +175,8 @@
                  }
               }

                  if($user) {
                      if($user['active'] == 1) {
               if($user) {
                  if($user['active'] == 1) {
                     // Maintenance mode - allow logins only when maintenance mode is off or if the user is admin
                     if(!$maintenance_mode || $user['typ'] == 'admin'){
                        // User login right, so attempts can be deleted
@@ -194,34 +194,34 @@
                        $_SESSION["s"]['theme'] = $_SESSION['s']['user']['theme'];

                        if(is_file($_SESSION['s']['user']['startmodule'].'/lib/module.conf.php')) {
                           include_once($_SESSION['s']['user']['startmodule'].'/lib/module.conf.php');
                                    $menu_dir = ISPC_WEB_PATH.'/' . $_SESSION['s']['user']['startmodule'] . '/lib/menu.d';
                           include_once $_SESSION['s']['user']['startmodule'].'/lib/module.conf.php';
                           $menu_dir = ISPC_WEB_PATH.'/' . $_SESSION['s']['user']['startmodule'] . '/lib/menu.d';

                                    if (is_dir($menu_dir)) {
                                        if ($dh = opendir($menu_dir)) {
                                            //** Go through all files in the menu dir
                                            while (($file = readdir($dh)) !== false) {
                                                if ($file != '.' && $file != '..' && substr($file, -9, 9) == '.menu.php' && $file != 'dns_resync.menu.php') {
                                                    include_once($menu_dir . '/' . $file);
                                                }
                                            }
                                        }
                                    }
                           if (is_dir($menu_dir)) {
                              if ($dh = opendir($menu_dir)) {
                                 //** Go through all files in the menu dir
                                 while (($file = readdir($dh)) !== false) {
                                    if ($file != '.' && $file != '..' && substr($file, -9, 9) == '.menu.php' && $file != 'dns_resync.menu.php') {
                                       include_once $menu_dir . '/' . $file;
                                    }
                                 }
                              }
                           }
                           $_SESSION['s']['module'] = $module;
                        }
                                
                                // check if the user theme is valid
                                if($_SESSION['s']['user']['theme'] != 'default') {
                                    $tmp_path = ISPC_THEMES_PATH."/".$_SESSION['s']['user']['theme'];
                                    if(!@is_dir($tmp_path) || !@file_exists($tmp_path."/ispconfig_version") || trim(file_get_contents($tmp_path."/ispconfig_version")) != ISPC_APP_VERSION) {
                                        // fall back to default theme if this one is not compatible with current ispc version
                                        $_SESSION['s']['user']['theme'] = 'default';
                                        $_SESSION['s']['theme'] = 'default';
                                        $_SESSION['show_error_msg'] = $app->lng('theme_not_compatible');
                                    }
                                }

                        $app->plugin->raiseEvent('login',$this);
                        // check if the user theme is valid
                        if($_SESSION['s']['user']['theme'] != 'default') {
                           $tmp_path = ISPC_THEMES_PATH."/".$_SESSION['s']['user']['theme'];
                           if(!@is_dir($tmp_path) || !@file_exists($tmp_path."/ispconfig_version") || trim(file_get_contents($tmp_path."/ispconfig_version")) != ISPC_APP_VERSION) {
                              // fall back to default theme if this one is not compatible with current ispc version
                              $_SESSION['s']['user']['theme'] = 'default';
                              $_SESSION['s']['theme'] = 'default';
                              $_SESSION['show_error_msg'] = $app->lng('theme_not_compatible');
                           }
                        }

                        $app->plugin->raiseEvent('login', $this);

                        //* Save successfull login message to var
                        $authlog = 'Successful login for user \''. $username .'\' from '. long2ip($ip) .' at '. date('Y-m-d H:i:s');
@@ -237,55 +237,55 @@

                        exit;
                     }
                      } else {
                         $error = $app->lng('error_user_blocked');
                      }
                  } else {
                     $error = $app->lng('error_user_blocked');
                  }

                 } else {
                    if(!$alreadyfailed['times'] )
                    {
                       //* user login the first time wrong
                       $sql = "INSERT INTO `attempts_login` (`ip`, `times`, `login_time`) VALUES ('{$ip}', 1, NOW())";
                       $app->db->query($sql);
                    } elseif($alreadyfailed['times'] >= 1) {
                       //* update times wrong
                       $sql = "UPDATE `attempts_login` SET `times`=`times`+1, `login_time`=NOW() WHERE `login_time` >= '{$time}' LIMIT 1";
                       $app->db->query($sql);
                    }
                     //* Incorrect login - Username and password incorrect
                      $error = $app->lng('error_user_password_incorrect');
                      if($app->db->errorMessage != '') $error .= '<br />'.$app->db->errorMessage != '';
               } else {
                  if(!$alreadyfailed['times'] )
                  {
                     //* user login the first time wrong
                     $sql = "INSERT INTO `attempts_login` (`ip`, `times`, `login_time`) VALUES ('{$ip}', 1, NOW())";
                     $app->db->query($sql);
                  } elseif($alreadyfailed['times'] >= 1) {
                     //* update times wrong
                     $sql = "UPDATE `attempts_login` SET `times`=`times`+1, `login_time`=NOW() WHERE `login_time` >= '{$time}' LIMIT 1";
                     $app->db->query($sql);
                  }
                  //* Incorrect login - Username and password incorrect
                  $error = $app->lng('error_user_password_incorrect');
                  if($app->db->errorMessage != '') $error .= '<br />'.$app->db->errorMessage != '';

                  $app->plugin->raiseEvent('login_failed',$this);
                  $app->plugin->raiseEvent('login_failed', $this);

                  //* Save failed login message to var
                  $authlog = 'Failed login for user \''. $username .'\' from '. long2ip($ip) .' at '. date('Y-m-d H:i:s');
                  $authlog_handle = fopen($conf['ispconfig_log_dir'].'/auth.log', 'a');
                  fwrite($authlog_handle, $authlog ."\n");
                  fclose($authlog_handle);
                    }
              }
               }
            }

            } else {
                //* Username or password empty
               if($error == '') $error = $app->lng('error_user_password_empty');
         } else {
            //* Username or password empty
            if($error == '') $error = $app->lng('error_user_password_empty');

            $app->plugin->raiseEvent('login_empty',$this);
           }
            $app->plugin->raiseEvent('login_empty', $this);
         }
      }

      // Maintenance mode - show message when people try to log in and also when people are forcedly logged off
      if($maintenance_mode_error != '') $error = '<strong>'.$maintenance_mode_error.'</strong><br><br>'.$error;
      if($error != ''){
           $error = '<div class="box box_error"><h1>Error</h1>'.$error.'</div>';
         $error = '<div class="box box_error"><h1>Error</h1>'.$error.'</div>';
      }

      $app->tpl->setVar('error', $error);
        $app->tpl->setVar('pw_lost_txt', $app->lng('pw_lost_txt'));
      $app->tpl->setVar('pw_lost_txt', $app->lng('pw_lost_txt'));
      $app->tpl->setVar('username_txt', $app->lng('username_txt'));
      $app->tpl->setVar('password_txt', $app->lng('password_txt'));
      $app->tpl->setVar('login_button_txt', $app->lng('login_button_txt'));
      $app->tpl->setInclude('content_tpl','login/templates/index.htm');
      $app->tpl->setInclude('content_tpl', 'login/templates/index.htm');
      $app->tpl_defaults();

      $this->status = 'OK';
@@ -296,4 +296,4 @@

} // << end class

?>
?>