diff options
-rw-r--r-- | index.php | 2 | ||||
-rw-r--r-- | lib/foldermapper.php | 23 | ||||
-rw-r--r-- | templates/part.folderdialog.php | 6 | ||||
-rw-r--r-- | templates/part.folderlist.php | 3 |
4 files changed, 24 insertions, 10 deletions
@@ -28,7 +28,7 @@ $userid = OCP\USER::getUser(); $foldermapper = new OCA\News\FolderMapper($userid); $allfeeds = $foldermapper->childrenOfWithFeeds(0); //$foldermapper->populate($folder); -$folderforest = $foldermapper->childrenOf(0); //retrieve all the folders +$folderforest = $foldermapper->getFoldersOfUser(0); //retrieve all the folders if ($allfeeds) { $feedid = isset( $_GET['feedid'] ) ? $_GET['feedid'] : null; diff --git a/lib/foldermapper.php b/lib/foldermapper.php index af7d9244a..dbdc8582a 100644 --- a/lib/foldermapper.php +++ b/lib/foldermapper.php @@ -29,6 +29,29 @@ class FolderMapper { } /** + * Returns all folders of a user + * @param $userid + * @return + */ + public function getFoldersOfUser($parentid, $userid = null){ + if($userid === null){ + $userid = $this->userid; + } + $folderlist = array(); + $stmt = \OCP\DB::prepare('SELECT * FROM ' . self::tableName . + ' WHERE user_id = ? AND parent_id = ?'); + $result = $stmt->execute(array($this->userid, $parentid)); + + while( $row = $result->fetchRow()){ + $folderid = $row['id']; + $folder = new Folder($row['name'], $folderid); + $folderlist[] = $folder; + } + + return $folderlist; + } + + /** * @brief Returns the forest (list of trees) of folders children of $parentid * @param * @returns diff --git a/templates/part.folderdialog.php b/templates/part.folderdialog.php index 36a0d9633..e441e90a8 100644 --- a/templates/part.folderdialog.php +++ b/templates/part.folderdialog.php @@ -5,13 +5,7 @@ <td>Add new folder</td> <td> <div class="add_parentfolder"> - <button id="dropdownBtn" onclick="News.DropDownMenu.dropdown(this)"> - <?php echo $l->t('Choose folder'); ?> - </button> <input id="inputfolderid" type="hidden" name="folderid" value="0" /> - <ul class="menu" id="dropdownmenu"> - <?php echo $this->inc("part.folderlist"); ?> - </ul> </div> </td> </tr> diff --git a/templates/part.folderlist.php b/templates/part.folderlist.php index 09b5f8e64..f2da64737 100644 --- a/templates/part.folderlist.php +++ b/templates/part.folderlist.php @@ -3,11 +3,8 @@ function print_folder_list($folderlist, $depth) { foreach($folderlist as $folder) { echo '<li style="margin-left:' . 10*$depth . 'px;" class="menuItem" onclick="News.DropDownMenu.selectItem(this, ' . $folder->getId() . ')">' . $folder->getName() . '</li>'; - $children = $folder->getChildren(); - print_folder_list($children, $depth+1); } } - print_folder_list($_['folderforest'], 0); ?>
\ No newline at end of file |