From: hickert Date: Wed, 13 Oct 2010 12:05:56 +0000 (+0000) Subject: Updated FolderWidget X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a8c06d0057bb230f1f0fea4a2827e58dc8c77df4;p=gosa.git Updated FolderWidget -Fixed baseSelection -Allow to select root folder, e.g. shared/technik git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@20029 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-plugins/groupware/personal/groupware/FolderWidget/class_FolderWidget.inc b/gosa-plugins/groupware/personal/groupware/FolderWidget/class_FolderWidget.inc index af296f4f5..85f56d24f 100644 --- a/gosa-plugins/groupware/personal/groupware/FolderWidget/class_FolderWidget.inc +++ b/gosa-plugins/groupware/personal/groupware/FolderWidget/class_FolderWidget.inc @@ -185,6 +185,11 @@ class FolderWidget extends plugin $entryPath = (empty($entryPath)) ? $pathName : "{$entryPath}{$this->pathSeparator}{$pathName}"; $entryBase = $this->pathToDn($entryPath); + if(!preg_match("/".preg_quote($this->accountPrefix,'/')."/", $entryPath)){ + echo "Skipped {$entryPath}
"; + continue; + } + // Add eventually missing subFolders, to enable the navigation // into these folders via the management lists. if(!isset($current[$entryPath])){ diff --git a/gosa-plugins/groupware/personal/groupware/FolderWidget/class_FolderWidgetListing.inc b/gosa-plugins/groupware/personal/groupware/FolderWidget/class_FolderWidgetListing.inc index c1c114656..283b8465d 100644 --- a/gosa-plugins/groupware/personal/groupware/FolderWidget/class_FolderWidgetListing.inc +++ b/gosa-plugins/groupware/personal/groupware/FolderWidget/class_FolderWidgetListing.inc @@ -98,7 +98,7 @@ class FolderWidgetListing extends management */ function renderList() { - $this->folderSelector->setBases($this->getSimpleFolderList($this->folderList['recursive'])); + $this->folderSelector->setBases($this->getSimpleFolderList($this->folderList['recursive']['/']['children'])); $this->folderSelector->update(true); $headpage = $this->getHeadpage();