Merged revisons 3687-3748 from 3.0.5 stable branch.

tbrehm

2013-01-03 10b4c85a7686da07bddb5779f8ceea48acdf412e

 interface/web/sites/webdav_user_edit.php

@@ -78,14 +78,11 @@

      if ($this->dataRecord['username'] != "") {
         /* REMOVE the restriction */
         $app->tpl->setVar("username", str_replace($webdavuser_prefix , '', $this->dataRecord['username']));
         $app->tpl->setVar("username", $app->tools_sites->removePrefix($this->dataRecord['username'], $this->dataRecord['username_prefix'], $webdavuser_prefix));
      }
      if($_SESSION["s"]["user"]["typ"] == 'admin' || $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
         $app->tpl->setVar("username_prefix", $global_config['webdavuser_prefix']);
      } else {
         $app->tpl->setVar("username_prefix", $webdavuser_prefix);
      }

        
        $app->tpl->setVar("username_prefix", $app->tools_sites->getPrefix($this->dataRecord['username_prefix'], $webdavuser_prefix, $global_config['webdavuser_prefix']));
		
      if($this->id > 0) {
         //* we are editing a existing record
         $app->tpl->setVar("edit_disabled", 1);
@@ -131,6 +128,8 @@
         $global_config = $app->getconf->get_global_config('sites');
         $webdavuser_prefix = $app->tools_sites->replacePrefix($global_config['webdavuser_prefix'], $this->dataRecord);

            $this->dataRecord['username_prefix'] = $webdavuser_prefix;
            
         /* restrict the names */
         $this->dataRecord['username'] = $webdavuser_prefix . $this->dataRecord['username'];

@@ -167,6 +166,7 @@
      $data = $app->db->queryOneRecord("SELECT * FROM webdav_user WHERE webdav_user_id = ".$app->functions->intval($this->id));
      $this->dataRecord["username"] = $data['username'];
      $this->dataRecord["dir"]      = $data['dir'];
      $this->dataRecord['username_prefix'] = $data['username_prefix'];
      $passwordOld = $data['password'];

      /*