From 31f6ceb52bc4422c8a9a0ed8c6b167b3089bb6a6 Mon Sep 17 00:00:00 2001 From: mcramer <m.cramer@pixcept.de> Date: Thu, 30 Aug 2012 12:59:31 -0400 Subject: [PATCH] Changed: tools.inc.php removed from different places and converted to class where neccessary Fixed: Subtemplates can now be given on client creation in remoting (i.e. 10/34/21 for multiple addons) Changed: template applying moved to separate class Fixed: force_suexec was not taken from templates --- interface/web/sites/webdav_user_edit.php | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/interface/web/sites/webdav_user_edit.php b/interface/web/sites/webdav_user_edit.php index 2d7dc41..05756c7 100644 --- a/interface/web/sites/webdav_user_edit.php +++ b/interface/web/sites/webdav_user_edit.php @@ -40,7 +40,6 @@ require_once('../../lib/config.inc.php'); require_once('../../lib/app.inc.php'); -require_once('tools.inc.php'); //* Check permissions for module $app->auth->check_module_permissions('sites'); @@ -73,9 +72,9 @@ * If the names are restricted -> remove the restriction, so that the * data can be edited */ - $app->uses('getconf'); + $app->uses('getconf,tools_sites'); $global_config = $app->getconf->get_global_config('sites'); - $webdavuser_prefix = replacePrefix($global_config['webdavuser_prefix'], $this->dataRecord); + $webdavuser_prefix = $app->tools_sites->replacePrefix($global_config['webdavuser_prefix'], $this->dataRecord); if ($this->dataRecord['username'] != "") { /* REMOVE the restriction */ @@ -128,9 +127,9 @@ */ if ($app->tform->errorMessage == '') { - $app->uses('getconf'); + $app->uses('getconf,tools_sites'); $global_config = $app->getconf->get_global_config('sites'); - $webdavuser_prefix = replacePrefix($global_config['webdavuser_prefix'], $this->dataRecord); + $webdavuser_prefix = $app->tools_sites->replacePrefix($global_config['webdavuser_prefix'], $this->dataRecord); /* restrict the names */ $this->dataRecord['username'] = $webdavuser_prefix . $this->dataRecord['username']; -- Gitblit v1.9.1