Merged revisions 3960-4065 from stable branch.

tbrehm

2013-07-31 615a0a96618fa99e7e452523145d6c0f238d4473

 interface/web/sites/shell_user_edit.php

@@ -121,7 +121,7 @@
      $blacklist = file(ISPC_LIB_PATH.'/shelluser_blacklist');
      foreach($blacklist as $line) {
         if(strtolower(trim($line)) == strtolower(trim($this->dataRecord['username']))){
            $app->tform->errorMessage .= 'The username is not allowed.';
            $app->tform->errorMessage .= $app->tform->lng('username_not_allowed_txt');
         }
      }
      unset($blacklist);
@@ -138,6 +138,8 @@
            $this->dataRecord['username_prefix'] = $shelluser_prefix;
         /* restrict the names */
         $this->dataRecord['username'] = $shelluser_prefix . $this->dataRecord['username'];
			
         if(strlen($this->dataRecord['username']) > 32) $app->tform->errorMessage .= $app->tform->lng("username_must_not_exceed_32_chars_txt");
      }
      parent::onBeforeInsert();
   }
@@ -166,7 +168,7 @@
      $blacklist = file(ISPC_LIB_PATH.'/shelluser_blacklist');
      foreach($blacklist as $line) {
         if(strtolower(trim($line)) == strtolower(trim($this->dataRecord['username']))){
            $app->tform->errorMessage .= 'The username is not allowed.';
            $app->tform->errorMessage .= $app->tform->lng('username_not_allowed_txt');
         }
      }
      unset($blacklist);
@@ -188,6 +190,8 @@
            
         /* restrict the names */
         $this->dataRecord['username'] = $shelluser_prefix . $this->dataRecord['username'];
			
         if(strlen($this->dataRecord['username']) > 32) $app->tform->errorMessage .= $app->tform->lng("username_must_not_exceed_32_chars_txt");
      }
   }