Merged revisions 3960-4065 from stable branch.

tbrehm

2013-07-31 615a0a96618fa99e7e452523145d6c0f238d4473

 interface/web/sites/shell_user_edit.php

@@ -79,13 +79,10 @@
      
      if ($this->dataRecord['username'] != ""){
         /* REMOVE the restriction */
         $app->tpl->setVar("username", preg_replace('/'.$shelluser_prefix.'/', '', $this->dataRecord['username'], 1));
         $app->tpl->setVar("username", $app->tools_sites->removePrefix($this->dataRecord['username'], $this->dataRecord['username_prefix'], $shelluser_prefix));
      }
      if($_SESSION["s"]["user"]["typ"] == 'admin' || $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
         $app->tpl->setVar("username_prefix", $global_config['shelluser_prefix']);
      } else {
         $app->tpl->setVar("username_prefix", $shelluser_prefix);
      }
        
        $app->tpl->setVar("username_prefix", $app->tools_sites->getPrefix($this->dataRecord['username_prefix'], $shelluser_prefix, $global_config['shelluser_prefix']));
      
      if($this->id > 0) {
         //* we are editing a existing record
@@ -124,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,8 +135,11 @@
         $global_config = $app->getconf->get_global_config('sites');
         $shelluser_prefix = $app->tools_sites->replacePrefix($global_config['shelluser_prefix'], $this->dataRecord);
         
            $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();
   }
@@ -168,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);
@@ -184,8 +184,14 @@
         $global_config = $app->getconf->get_global_config('sites');
         $shelluser_prefix = $app->tools_sites->replacePrefix($global_config['shelluser_prefix'], $this->dataRecord);
         
            $old_record = $app->tform->getDataRecord($this->id);
            $shelluser_prefix = $app->tools_sites->getPrefix($old_record['username_prefix'], $shelluser_prefix);
            $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");
      }
   }