- add browseable folder dashlet

- add search dashlet - correct NBM's understanding of boolean association: NOT x IN [y] == (NOT X) in [y] != NOT (x in [y]) git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5004 c91229c3-7414-0410-bfa2-8a42b809f60b

- add browseable folder dashlet
- add search dashlet - correct NBM's understanding of boolean association: NOT x IN [y] == (NOT X) in [y] != NOT (x in [y]) git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5004 c91229c3-7414-0410-bfa2-8a42b809f60b
Brad Shuttleworth
1 parent 20f4bc35
Showing 7 changed files with 134 additions and 2 deletions
lib/browse/browseutil.inc.php
plugins/browseabledashlet/BrowseableDashlet.php
plugins/browseabledashlet/BrowseableDashletPlugin.php
plugins/ktstandard/SearchDashlet.php
plugins/ktstandard/SearchDashletPlugin.php
resources/css/kt-framing.css
templates/ktstandard/searchdashlet/dashlet.smarty
@@ -294,11 +294,14 @@ class KTBrowseUtil {
      */
     function getBrowseableFolders($oUser) {
         $aPermissionDescriptors = KTPermissionUtil::getPermissionDescriptorsForUser($oUser);
+        
+        
+        
         if (empty($aPermissionDescriptors)) {
             return array();
         }
         $sPermissionDescriptors = DBUtil::paramArray($aPermissionDescriptors);
-
+        
         $sFoldersTable = KTUtil::getTableName('folders');
         $sPLTable = KTUtil::getTableName('permission_lookups');
         $sPLATable = KTUtil::getTableName('permission_lookup_assignments');
@@ -310,9 +313,10 @@ class KTBrowseUtil {
                 LEFT JOIN $sPLTable AS PL2 ON F2.permission_lookup_id = PL2.id LEFT JOIN $sPLATable AS PLA2 ON PLA2.permission_lookup_id = PL2.id AND PLA2.permission_id = ?
             WHERE
                 PLA.permission_descriptor_id IN ($sPermissionDescriptors)
-                AND NOT PLA2.permission_descriptor_id IN ($sPermissionDescriptors)";
+                AND NOT (PLA2.permission_descriptor_id IN ($sPermissionDescriptors))";
         $aParams = array_merge(array($oPermission->getId(), $oPermission->getId()), $aPermissionDescriptors, $aPermissionDescriptors);
         $res = DBUtil::getResultArrayKey(array($sQuery, $aParams), 'id');
+        
         if (PEAR::isError($res)) {
             return $res;
         }
+<?php
+
+require_once(KT_LIB_DIR . '/browse/browseutil.inc.php');
+
+class BrowseableFolderDashlet extends KTBaseDashlet {
+	var $oUser;
+	
+	function is_active($oUser) {
+		$this->oUser = $oUser;
+		
+		return true;
+	}
+	
+    function render() {
+        $oTemplating =& KTTemplating::getSingleton();
+        $oTemplate = $oTemplating->loadTemplate('browseabledashlet/dashlet');
+
+        $aFolders = KTBrowseUtil::getBrowseableFolders($this->oUser);
+        if (PEAR::isError($aFolders)) { 
+            // just hide it.
+            $aFolders = array();
+        }
+        
+        $aTemplateData = array(
+            'folders' => $aFolders,
+        );
+        return $oTemplate->render($aTemplateData);
+    }
+}
+
+?>
 \ No newline at end of file
+<?php
+
+require_once(KT_LIB_DIR . '/plugins/plugin.inc.php');
+require_once(KT_LIB_DIR . '/plugins/pluginregistry.inc.php');
+
+class BrowseableDashletPlugin extends KTPlugin {
+    var $sNamespace = "nbm.browseable.plugin";
+
+    function setup() {
+        $this->registerDashlet('BrowseableFolderDashlet', 'nbm.browseable.dashlet', 'BrowseableDashlet.php');
+
+        require_once(KT_LIB_DIR . "/templating/templating.inc.php");
+        $oTemplating =& KTTemplating::getSingleton();
+        $oTemplating->addLocation('browseabledashlet', '/plugins/browseabledashlet/templates');
+    }
+}
+
+$oPluginRegistry =& KTPluginRegistry::getSingleton();
+$oPluginRegistry->registerPlugin('BrowseableDashletPlugin', 'nbm.browseable.plugin', __FILE__);
+?>
+<?php
+
+
+class SearchDashlet extends KTBaseDashlet {
+    function render() {
+        $oTemplating =& KTTemplating::getSingleton();
+        $oTemplate = $oTemplating->loadTemplate('ktstandard/searchdashlet/dashlet');
+
+        $aSearches = KTSavedSearch::getSearches();
+        // empty on error.
+        if (PEAR::isError($aSearches)) {
+            $aSearches = array();
+        }
+
+        
+        $aTemplateData = array(
+            'savedsearches' => $aSearches,
+        );
+        return $oTemplate->render($aTemplateData);
+    }
+}
+
+?>
 \ No newline at end of file
+<?php
+
+require_once(KT_LIB_DIR . '/plugins/plugin.inc.php');
+require_once(KT_LIB_DIR . '/plugins/pluginregistry.inc.php');
+
+class SearchDashletPlugin extends KTPlugin {
+    var $sNamespace = "nbm.searchdashlet.plugin";
+
+    function setup() {
+        $this->registerDashlet('SearchDashlet', 'nbm.searchdashlet.dashlet', 'SearchDashlet.php');
+
+        require_once(KT_LIB_DIR . "/templating/templating.inc.php");
+        $oTemplating =& KTTemplating::getSingleton();
+        $oTemplating->addLocation('searchdashlet', '/plugins/searchdashlet/templates');
+    }
+}
+
+$oPluginRegistry =& KTPluginRegistry::getSingleton();
+$oPluginRegistry->registerPlugin('SearchDashletPlugin', 'nbm.searchdashlet.plugin', __FILE__);
+?>
@@ -680,6 +680,15 @@ a.main_nav_item {
     padding-left: 17px;
 }
+#dashlet-search-text {
+    border: 1px solid black;
+    background: white url(../../resources/graphics/search-button.png) center left no-repeat;
+    margin: 0.5em 0.5em 0.5em 0;
+    padding: 3px;
+    padding-left: 17px;
+    width: 80%;
+}
+
 .searchbutton {
     border: 1px solid black;
     margin: 0.5em;
+<fieldset>
+<legend>{i18n}Search{/i18n}</legend>
+
+<form action="{ktLink base="search/simpleSearch.php"}" method="GET">
+<input type="text" name="fSearchableText" id="dashlet-search-text"
+size="15" /><input type="submit" value="{i18n}search{/i18n}"
+class="searchbutton frontpage" />
+</form>
+
+<a href="{$rootUrl}/search/booleanSearch.php">{i18n}Advanced
+Search{/i18n}</a>
+
+{if (!empty($saved_searches))}
+<h3>Saved Searches</h3>
+
+{foreach item=oSearch from=$saved_searches}
+<span class="descriptiveText">Saved Search: </span><a
+href="{"booleanSearch"|generateControllerUrl}&qs[action]=performSearch&qs[fSavedSearchId]={$oSearch->getId()}">{$oSearch->getName()}</a><br />
+{/foreach}
+
+<hr />
+{/if}
+
+
+</fieldset>
 \ No newline at end of file