Merged in from DEV trunk...

KTC-436 "500 Internal Server Errors Happen when Uploading Files through KTE or KT Webdav" Fixed. Checked that path is absolute before doing a require(). Committed by: Megan Watson Reviewed by: Jonathan Byrne KTS-3190 ""Import from server location" should also remove the file extension from the document name" Fixed. Document add now drops the extension from the filename if it is used for the document title. Committed by: Megan Watson Reviewed by: Jonathan Byrne KTC-437 "info Box / Document preview" In progress. Added big mimetype icons for the info box. Committed by: Megan Watson Reviewed by: Jalaloedien Abrahams KTS-3201 "Ability to toggle between old 'browse view' search results, and 'search engine' results view" Implemented. Committed By: Conrad Vermeulen Reviewed By: Megan Watson KTS-3112 "Fatal error on new installation when directed to login.php line 168" Removed. The redirection could result in endless loop. Committed By: Conrad Vermeulen Reviewed By: Kevin Fourie KTS-3204 "Search engine results references Score field, which should be Rank" Fixed. Committed By: Conrad Vermeulen Reviewed By: Kevin Fourie KTS-3205 "dmsDefaults refers to KTDIR and not KT_DIR" Fixed. Committed By: Conrad Vermeulen Reviewed By: Megan Watson KTS-3203 " Ensure all entries in config.ini have a default in dmsDefaults.php" Fixed. Added defaults for all items from config that i could see were missing. Committed By: Jonathan Byrne Reviewed By: Jalaloedien Abrahams KTS-3202 "Update search2 widget to persist search results default state" Fixed. Used the session variable to persist state. Committed by: Megan Watson Reviewed by: Jonathan Byrne git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@8313 c91229c3-7414-0410-bfa2-8a42b809f60b

Merged in from DEV trunk...
KTC-436 "500 Internal Server Errors Happen when Uploading Files through KTE or KT Webdav" Fixed. Checked that path is absolute before doing a require(). Committed by: Megan Watson Reviewed by: Jonathan Byrne KTS-3190 ""Import from server location" should also remove the file extension from the document name" Fixed. Document add now drops the extension from the filename if it is used for the document title. Committed by: Megan Watson Reviewed by: Jonathan Byrne KTC-437 "info Box / Document preview" In progress. Added big mimetype icons for the info box. Committed by: Megan Watson Reviewed by: Jalaloedien Abrahams KTS-3201 "Ability to toggle between old 'browse view' search results, and 'search engine' results view" Implemented. Committed By: Conrad Vermeulen Reviewed By: Megan Watson KTS-3112 "Fatal error on new installation when directed to login.php line 168" Removed. The redirection could result in endless loop. Committed By: Conrad Vermeulen Reviewed By: Kevin Fourie KTS-3204 "Search engine results references Score field, which should be Rank" Fixed. Committed By: Conrad Vermeulen Reviewed By: Kevin Fourie KTS-3205 "dmsDefaults refers to KTDIR and not KT_DIR" Fixed. Committed By: Conrad Vermeulen Reviewed By: Megan Watson KTS-3203 " Ensure all entries in config.ini have a default in dmsDefaults.php" Fixed. Added defaults for all items from config that i could see were missing. Committed By: Jonathan Byrne Reviewed By: Jalaloedien Abrahams KTS-3202 "Update search2 widget to persist search results default state" Fixed. Used the session variable to persist state. Committed by: Megan Watson Reviewed by: Jonathan Byrne git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@8313 c91229c3-7414-0410-bfa2-8a42b809f60b
kevin_fourie
1 parent c6132059
Showing 67 changed files with 417 additions and 112 deletions
config/config.ini
config/dmsDefaults.php
lib/documentmanagement/documentutil.inc.php
lib/triggers/triggerregistry.inc.php
login.php
resources/css/kt-framing.css
resources/js/search2widget.js
resources/mimetypes/big/avi.png
resources/mimetypes/big/c.png
resources/mimetypes/big/compressed.png
resources/mimetypes/big/cpp.png
resources/mimetypes/big/css.png
resources/mimetypes/big/deb.png
resources/mimetypes/big/default.png
resources/mimetypes/big/djvu.png
resources/mimetypes/big/doc-alt.png
resources/mimetypes/big/doc-alt2.png
resources/mimetypes/big/doc.png
resources/mimetypes/big/dvi.png
resources/mimetypes/big/exe.png
@@ -279,10 +279,20 @@ df = df
 ; defaults to 25
 resultsPerPage = default
+; The format in which to display the results
+; options are searchengine or browseview
+; defaults to searchengine
+resultsDisplayFormat = default
+
 ; The date format used when making queries using widgets
 ; defaults to Y-m-d
 dateFormat = default
+[browse]
+; The document info box / preview is activated by mousing over or clicking on the icon
+; Options: mouse-over (default); onclick
+previewActivation = default
+
 [indexer]
 ; The core indexing class
 ;coreClass=PHPLuceneIndexer
@@ -489,13 +489,20 @@ function catchFatalErrors($p_OnOff=&#39;On&#39;){
             $oKTConfig->setdefaultns('KnowledgeTree', 'execSearchPath', $_SERVER['PATH']);
             $oKTConfig->setdefaultns('KnowledgeTree', 'pathInfoSupport', false);
             $oKTConfig->setdefaultns('KnowledgeTree', 'magicDatabase', KTInit::detectMagicFile());
-
+			$oKTConfig->setdefaultns('KnowledgeTree', 'schedulerInterval', 30);			
+			
             $oKTConfig->setdefaultns('dashboard', 'alwaysShowYCOD', true);
             $oKTConfig->setdefaultns('storage', 'manager', 'KTOnDiskHashedStorageManager');
             $oKTConfig->setdefaultns('config', 'useDatabaseConfiguration', false);
+            $oKTConfig->setdefaultns('urls', 'varDirectory', '${fileSystemRoot}/var');
+            $oKTConfig->setdefaultns('urls', 'logDirectory', '${varDirectory}/log');
+            $oKTConfig->setdefaultns('urls', 'documentRoot', '${varDirectory}/Documents');
+            $oKTConfig->setdefaultns('urls', 'uiDirectory', '${fileSystemRoot}/presentation/lookAndFeel/knowledgeTree');
             $oKTConfig->setdefaultns('urls', 'tmpDirectory', '${varDirectory}/tmp');
+            $oKTConfig->setdefaultns('urls', 'graphicsUrl', '${rootUrl}/graphics');
+            $oKTConfig->setdefaultns('urls', 'uiUrl', '${rootUrl}/presentation/lookAndFeel/knowledgeTree');
             $oKTConfig->setdefaultns('urls', 'stopwordsFile', '${fileSystemRoot}/config/stopwords.txt');
             $oKTConfig->setdefaultns('tweaks', 'browseToUnitFolder', false);
@@ -503,27 +510,74 @@ function catchFatalErrors($p_OnOff=&#39;On&#39;){
             $oKTConfig->setdefaultns('tweaks', 'phpErrorLogFile', false);
             $oKTConfig->setdefaultns('tweaks', 'developmentWindowLog', false);
             $oKTConfig->setdefaultns('tweaks', 'noisyBulkOperations', false);
+            
+            $oKTConfig->setdefaultns('email', 'emailServer', 'none');
+            $oKTConfig->setdefaultns('email', 'emailPort', '');
+            $oKTConfig->setdefaultns('email', 'emailAuthentication', false);
+            $oKTConfig->setdefaultns('email', 'emailUsername', 'username');
+            $oKTConfig->setdefaultns('email', 'emailPassword', 'password');
+            $oKTConfig->setdefaultns('email', 'emailFrom', 'kt@example.org');
+            $oKTConfig->setdefaultns('email', 'emailFromName', 'KnowledgeTree Document Management System');
+            $oKTConfig->setdefaultns('email', 'allowAttachment', false);
+            $oKTConfig->setdefaultns('email', 'allowEmailAddresses', false);
+            $oKTConfig->setdefaultns('email', 'sendAsSystem', false);
+            $oKTConfig->setdefaultns('email', 'onlyOwnGroups', false);
             $oKTConfig->setdefaultns('user_prefs', 'passwordLength', 6);
             $oKTConfig->setdefaultns('user_prefs', 'restrictAdminPasswords', false);
+            $oKTConfig->setdefaultns('user_prefs', 'restrictPreferences', false);
+            $oKTConfig->setdefaultns('session', 'sessionTimeout', 1200);
             $oKTConfig->setdefaultns('session', 'allowAnonymousLogin', false);
+			$oKTConfig->setdefaultns('ui', 'companyLogo', '${rootUrl}/resources/companylogo.png');
+			$oKTConfig->setdefaultns('ui', 'companyLogoWidth', '313px');
+			$oKTConfig->setdefaultns('ui', 'companyLogoTitle', 'ACME Corporation');
             $oKTConfig->setdefaultns('ui', 'ieGIF', true);
             $oKTConfig->setdefaultns('ui', 'alwaysShowAll', false);
+            $oKTConfig->setdefaultns('ui', 'automaticRefresh', false);
             $oKTConfig->setdefaultns('ui', 'condensedAdminUI', false);
+            $oKTConfig->setdefaultns('ui', 'fakeMimetype', false);
+			$oKTConfig->setdefaultns('ui', 'dot', 'dot');
+			$oKTConfig->setdefaultns('ui', 'metadata_sort', true);
+			
+			$oKTConfig->setdefaultns('i18n', 'useLike', false);
             $oKTConfig->setdefaultns(null, 'logLevel', 'INFO');
             $oKTConfig->setdefaultns('import', 'unzip', 'unzip');
+            $oKTConfig->setdefaultns('export', 'zip', 'zip');
+            $oKTConfig->setdefaultns('export', 'encoding', 'UTF-8');
+            
+            $oKTConfig->setdefaultns('externalBinary', 'xls2csv', 'xls2csv');
+            $oKTConfig->setdefaultns('externalBinary', 'pdftotext', 'pdftotext');
+            $oKTConfig->setdefaultns('externalBinary', 'catppt', 'catppt');
+            $oKTConfig->setdefaultns('externalBinary', 'pstotext', 'pstotext');
+            $oKTConfig->setdefaultns('externalBinary', 'catdoc', 'catdoc');
+            $oKTConfig->setdefaultns('externalBinary', 'antiword', 'antiword');
+            $oKTConfig->setdefaultns('externalBinary', 'python', 'python');
+            $oKTConfig->setdefaultns('externalBinary', 'java', 'java');
+            $oKTConfig->setdefaultns('externalBinary', 'php', 'php');
+            $oKTConfig->setdefaultns('externalBinary', 'df', 'df');
+            
             $oKTConfig->setdefaultns('cache', 'cacheDirectory', '${varDirectory}/cache');
             $oKTConfig->setdefaultns('cache', 'cacheEnabled', 'false');
             $oKTConfig->setdefaultns('cache', 'proxyCacheDirectory', '${varDirectory}/proxies');
             $oKTConfig->setdefaultns('cache', 'proxyCacheEnabled', 'true');
-
-            $oKTConfig->setdefaultns('search', 'searchBasePath', '${fileSystemRoot}/search2');
+            $oKTConfig->setdefaultns('cache', 'cachePlugins', 'true');
+            
+            $oKTConfig->setdefaultns('KTWebDAVSettings', 'debug', 'off');
+            $oKTConfig->setdefaultns('KTWebDAVSettings', 'safemode', 'on');
+            
+            $oKTConfig->setdefaultns('BaobabSettings', 'debug', 'off');
+            $oKTConfig->setdefaultns('BaobabSettings', 'safemode', 'on');
+
+            $oKTConfig->setdefaultns('search', 'searchBasePath', KT_DIR . '/search2');
             $oKTConfig->setdefaultns('search', 'fieldsPath', '${searchBasePath}/search/fields');
+            $oKTConfig->setdefaultns('search', 'resultsDisplayFormat', 'searchengine');
             $oKTConfig->setdefaultns('search', 'resultsPerPage', 25);
             $oKTConfig->setdefaultns('search', 'dateFormat', 'Y-m-d');
+            
+            $oKTConfig->setdefaultns('browse', 'previewActivation', 'mouse-over');
             $oKTConfig->setdefaultns('indexer', 'coreClass', 'JavaXMLRPCLuceneIndexer');
             $oKTConfig->setdefaultns('indexer', 'batchDocuments', 20);
@@ -542,6 +596,8 @@ function catchFatalErrors($p_OnOff=&#39;On&#39;){
             $oKTConfig->setdefaultns('webservice', 'uploadExpiry', '30');
             $oKTConfig->setdefaultns('webservice', 'downloadExpiry', '30');
             $oKTConfig->setdefaultns('webservice', 'randomKeyText', 'bkdfjhg23yskjdhf2iu');
+            $oKTConfig->setdefaultns('webservice', 'validateSessionCount', false);
+            $oKTConfig->setdefaultns('webservice', 'useDefaultDocumentTypeIfInvalid', true);
             $oKTConfig->setdefaultns('webservice', 'debug', false);
             $oKTConfig->setdefaultns('clientToolPolicies', 'explorerMetadataCapture', true);
@@ -552,9 +608,11 @@ function catchFatalErrors($p_OnOff=&#39;On&#39;){
             $oKTConfig->setdefaultns('clientToolPolicies', 'captureReasonsCancelCheckout', true);
             $oKTConfig->setdefaultns('clientToolPolicies', 'captureReasonsCopyInKT', true);
             $oKTConfig->setdefaultns('clientToolPolicies', 'captureReasonsMoveInKT', true);
-
             $oKTConfig->setdefaultns('clientToolPolicies', 'allowRememberPassword', true);
+			$oKTConfig->setdefaultns('DiskUsage', 'warningThreshold', 10);
+			$oKTConfig->setdefaultns('DiskUsage', 'urgentThreshold', 5);	            
+
             $res = $this->readConfig();
             if (PEAR::isError($res)) { return $res; }
@@ -645,7 +703,7 @@ require_once(KT_LIB_DIR . &#39;/util/ktutil.inc&#39;);
 require_once(KT_LIB_DIR . '/ktentity.inc');
-$KTInit->catchFatalErrors();
+//$KTInit->catchFatalErrors();
 if (phpversion()<5){
@@ -237,7 +237,13 @@ class KTDocumentUtil {
         //$oContents = KTUtil::arrayGet($aOptions, 'contents');
         $aMetadata = KTUtil::arrayGet($aOptions, 'metadata', null, false);
         $oDocumentType = KTUtil::arrayGet($aOptions, 'documenttype');
-        $sDescription = KTUtil::arrayGet($aOptions, 'description', $sFilename);
+        $sDescription = KTUtil::arrayGet($aOptions, 'description', '');
+
+        if(empty($sDescription)){
+            // If no document name is provided use the filename minus the extension
+            $aFile = pathinfo($sFilename);
+            $sDescription = (isset($aFile['filename']) && !empty($aFile['filename'])) ? $aFile['filename'] : $sFilename;
+        }
         $oUploadChannel =& KTUploadChannel::getSingleton();
@@ -74,7 +74,8 @@ class KTTriggerRegistry {
         {
         	if (!class_exists($trigger[0]))
         	{
-        		require_once($trigger[1]);
+        	    $sPath = (KTUtil::isAbsolutePath($trigger[1])) ? $trigger[1] : KT_DIR.'/'.$trigger[1];
+        		require_once($sPath);
         		if (!class_exists($trigger[0]))
         		{
         			global $default;
@@ -166,12 +166,8 @@ class LoginPageDispatcher extends KTDispatcher {
         $aLanguageNames = $oReg->getLanguages('knowledgeTree');
         $aRegisteredLanguageNames = array();
-        if(empty($aRegisteredLangs)) {
-            $query = "DELETE FROM plugin_helper";
-            DBUtil::runQuery($query);
-            redirect($_SERVER['REQUEST_URI']);
-            exit;
-        } else {
+        if(!empty($aRegisteredLangs))
+        {
             foreach (array_keys($aRegisteredLangs) as $sLang) {
                 $aRegisteredLanguageNames[$sLang] = $aLanguageNames[$sLang];
             }
 /* ------------------ generic ------------------ */
-html { 
+html {
     height: 100%;
 }
 body
 {
     padding: 1em ; border: 0; margin: 0;
-    font-size: smaller; 
+    font-size: smaller;
     font-family: sans-serif;
 }
@@ -38,7 +38,7 @@ body
 	width: 80%;
 	min-height: 200px;
 	position: relative;
-	top:100; 
+	top:100;
 	left:100;
 }
@@ -151,14 +151,14 @@ body
     height: 1.4em;
 }
-#navbar ul li a 
+#navbar ul li a
 {
     color: white;
     text-decoration: none;
     border-bottom: 1px transparent;
 }
-#navbar ul li a:hover 
+#navbar ul li a:hover
 {
     border-bottom: 1px solid white;
 }
@@ -188,7 +188,7 @@ a.main_nav_item {
 /* ------------------ breadcrumbs -------------- */
-#breadcrumbs 
+#breadcrumbs
 {
     margin-top: 0.5em;
     margin-bottom: 1em;
@@ -197,7 +197,7 @@ a.main_nav_item {
     text-transform: lowercase;
 }
-#breadcrumbs .primary 
+#breadcrumbs .primary
 {
     font-weight: bold;
 }
@@ -221,7 +221,7 @@ a.main_nav_item {
     text-decoration: none;
     border-bottom: 1px solid #9d0a0a;
 }
-    
+
 /* ------------------ portlets ----------------- */
 #portletbar
@@ -254,7 +254,7 @@ a.main_nav_item {
     left: 30px;
     height: 30px;
     width: 80%;
-    z-index: -1;  
+    z-index: -1;
     border:0;
 }
@@ -265,13 +265,13 @@ a.main_nav_item {
     right: 0px;
     height: 30px;
     width: 60%;
-    z-index: -1; 
+    z-index: -1;
     border: 0;
 }
 #portletbar .portlet.expanded {
     position: relative;
-    margin: 0 0 1.5em 0;       
+    margin: 0 0 1.5em 0;
     padding: 0 0 0 0;
     background: url(../../resources/graphics/portlet_corner_topleft.png) top left no-repeat;
     border: 0;
@@ -285,7 +285,7 @@ a.main_nav_item {
     left: 30px;
     height: 28px;
     width: 80%;
-    z-index: -1;  
+    z-index: -1;
     border: 0;
 }
@@ -296,7 +296,7 @@ a.main_nav_item {
     right: 0px;
     height: 28px;
     width: 60%;
-    z-index: -1; 
+    z-index: -1;
     border: 0;
 }
@@ -308,7 +308,7 @@ a.main_nav_item {
     border-bottom: 1px solid #ccc;
     border-left: 1px solid #ccc;
     width: 99%;
-    height: 100%;                             
+    height: 100%;
 }
 /* Attempt to contain side portlet containers in MORE containers*/
@@ -343,7 +343,7 @@ a.main_nav_item {
 /* Bottom Portlet borders */
 /*
 #portletbar .portlet .portletbodyBottomLeft {
-    position: absolute;                                           
+    position: absolute;
     bottom: 0px;
     left: 0px;
     width: 10px;
@@ -352,7 +352,7 @@ a.main_nav_item {
 }
 #portletbar .portlet .portletbodyBottomRight {
-    position: absolute;                                                
+    position: absolute;
     bottom: 0px;
     right: 0px;
     width: 10px;
@@ -361,7 +361,7 @@ a.main_nav_item {
 }
 #portletbar .portlet .portletbodyBottom {
-    position: absolute;                                                
+    position: absolute;
     bottom: 0px;
     left: 5px;
     height: 3px;
@@ -372,7 +372,7 @@ a.main_nav_item {
 /* Right-hand side portlet borders */
 /*
 #portletbar .portlet .portletbodyRightTop {
-    position: absolute;                                                
+    position: absolute;
     background: url(../../resources/graphics/portlet_borderright.png) top right repeat-y;
     top: 0px;
     right: 0px;
@@ -381,7 +381,7 @@ a.main_nav_item {
 }
 #portletbar .portlet .portletbodyRightBottom {
-    position: absolute;                                                
+    position: absolute;
     background: url(../../resources/graphics/portlet_borderright.png) top right repeat-y;
     bottom: 0px;
     right: 0px;
@@ -391,7 +391,7 @@ a.main_nav_item {
 #portletbar .portlet .portletbodyRightMiddleTop {
-    position: absolute;                                                
+    position: absolute;
     background: url(../../resources/graphics/portlet_borderright.png) top right repeat-y;
     top: 50%;
     right: 0px;
@@ -400,7 +400,7 @@ a.main_nav_item {
 }
 #portletbar .portlet .portletbodyRightMiddleBottom {
-    position: absolute;                                                
+    position: absolute;
     background: url(../../resources/graphics/portlet_borderright.png) top right repeat-y;
     bottom: 50%;
     right: 0px;
@@ -409,7 +409,7 @@ a.main_nav_item {
 }
 #portletbar .portlet .portletbodyRightQuartTop {
-    position: absolute;                                                
+    position: absolute;
     background: url(../../resources/graphics/portlet_borderright.png) top right repeat-y;
     top: 15%;
     right: 0px;
@@ -418,7 +418,7 @@ a.main_nav_item {
 }
 #portletbar .portlet .portletbodyRightQuartBottom {
-    position: absolute;                                                
+    position: absolute;
     background: url(../../resources/graphics/portlet_borderright.png) top right repeat-y;
     bottom: 25%;
     right: 0px;
@@ -539,8 +539,8 @@ a.main_nav_item {
 #portletbar .portlet .actionlist li {
     display: block;
-    padding: 0 0 0 10px; 
-    margin: 0.5em 0.5em 0.15em 0; 
+    padding: 0 0 0 10px;
+    margin: 0.5em 0.5em 0.15em 0;
     text-align:left;
     background: transparent url(../graphics/leftbullet.png) center left no-repeat;
 }
@@ -553,10 +553,10 @@ a.main_nav_item {
     top: 0;
     z-index: 1;
     width:auto;
-    /*padding: 0 2em 1em 0; 
-    overflow: auto;*/ 
-    padding: 0.25em 2em 0em 0em; 
-    overflow: hidden; 
+    /*padding: 0 2em 1em 0;
+    overflow: auto;*/
+    padding: 0.25em 2em 0em 0em;
+    overflow: hidden;
     min-height: 600px;
 }
@@ -573,7 +573,7 @@ a.main_nav_item {
     display: none;
 }
-#content 
+#content
 {
     line-height: 1.6em;
 }
@@ -595,7 +595,7 @@ a.main_nav_item {
     border-bottom: 1px solid #9d0a0a;
 }
-#content .descriptiveText 
+#content .descriptiveText
 {
     color: #666;
 }
@@ -656,15 +656,15 @@ a.main_nav_item {
 }
 /* unframed (single button) forms */
-#content .noframe fieldset 
-{ 
+#content .noframe fieldset
+{
    border-width: 0px;
    padding: 0;
 }
 #content .noframe .form_actions
-{ 
-   margin-top: 0; 
+{
+   margin-top: 0;
 }
 /* old cancel style */
@@ -708,7 +708,7 @@ a.main_nav_item {
     color: #ffdd80;
 }
-#content .field label 
+#content .field label
 {
     display: block;
     font-weight: bold;
@@ -729,7 +729,7 @@ a.main_nav_item {
     background: transparent url(../../resources/graphics/required.png) center left no-repeat;
 }
-.errorMessage 
+.errorMessage
 {
     font-weight: bold;
 }
@@ -767,7 +767,7 @@ a.main_nav_item {
     font-weight: bold;
 }
-#content .actionmessage 
+#content .actionmessage
 {
     padding-bottom: 0.5em;
     border-bottom: 1px dashed #ccc;
@@ -786,7 +786,7 @@ a.main_nav_item {
 }
 .metadata.versioned dd div {
-    
+
     padding: 0.2em 0.5em;
     border-style: solid;
     border-color: #ccc;
@@ -807,7 +807,7 @@ a.main_nav_item {
 }
 .metadata.versioned dd .current.different {
     background-color: #fff2b8;
-/*    
+/*
     padding-left: 25px;
     background: transparent  url(../../thirdparty/icon-theme/16x16/status/dialog-information.png) center left no-repeat;
 */
@@ -815,7 +815,7 @@ a.main_nav_item {
 .metadata.versioned dd .previous.different {
     background-color: #e9dda8;
-/*    
+/*
     padding-left: 25px;
     background: transparent  url(../../thirdparty/icon-theme/16x16/status/dialog-information.png) center left no-repeat;
 */
@@ -851,8 +851,8 @@ a.main_nav_item {
 .metadatatable td {
     border-bottom: 1px dotted #ccc;
-    vertical-align: top;    
-    padding: 0.5em;    
+    vertical-align: top;
+    padding: 0.5em;
     font-weight: bold;
 }
@@ -1090,7 +1090,7 @@ a.main_nav_item {
     margin-bottom: 20px;
 }
-/* ========== kt actions 
+/* ========== kt actions
 These are used to mark up various different "actions" (e.g. cut, copy, delete).
 Use them as follows:
@@ -1102,7 +1102,7 @@ The text will be hidden for screen view.  The generic fahrner-ish approach comes
 */
-.ktAction { 
+.ktAction {
     display: block;
     text-decoration: none;
     overflow: hidden;
@@ -1115,12 +1115,12 @@ The text will be hidden for screen view.  The generic fahrner-ish approach comes
     width: 16px;
     background-position: top left;
     background-repeat: no-repeat;
-    background-color: transparent;    
+    background-color: transparent;
 }
 .ktActionDescribed {
     float: left;
-    margin-right: 0.5em;    
+    margin-right: 0.5em;
 }
@@ -1132,12 +1132,12 @@ The text will be hidden for screen view.  The generic fahrner-ish approach comes
 }
 .ktAction.ktInline {
-    float: left; 
+    float: left;
     padding-right: 0.5em;
     background-position: top left;
 }
-.ktHelp { 
+.ktHelp {
     background: transparent url(../../thirdparty/icon-theme/16x16/apps/help-browser.png) top left no-repeat;
     float: right;
     display: block;
@@ -1164,6 +1164,7 @@ The text will be hidden for screen view.  The generic fahrner-ish approach comes
 .ktActionLink.ktDenied, .ktAction.ktDenied { background-image: url(../../resources/graphics/denied.png); }
 .ktActionLink.ktMoveUp, .ktAction.ktMoveUp { background-image: url(../../thirdparty/icon-theme/16x16/actions/move-up.png); }
 .ktActionLink.ktMoveDown, .ktAction.ktMoveDown { background-image: url(../../thirdparty/icon-theme/16x16/actions/move-down.png); }
+.ktActionLink.ktPreview, .ktAction.ktPreview { background-image: url(../../resources/tango-icons/system-search.png); }
 /* this is sometimes used separately to get the auto-delete help. */
 .ktDelete { }
@@ -1188,7 +1189,7 @@ The text will be hidden for screen view.  The generic fahrner-ish approach comes
 /* dashboard blocks. */
-#dashboard-container-left { 
+#dashboard-container-left {
     clear: left;
     width: 47%;
     margin-top: 0;
@@ -1319,22 +1320,22 @@ The text will be hidden for screen view.  The generic fahrner-ish approach comes
 }
 .dashboard_block.rolled-up .dashboard_block_rightrepeat_top
-{ 
+{
     display: none;
 }
 .dashboard_block.rolled-up .dashboard_block_rightrepeat_bottom
-{ 
+{
     display: none;
 }
 .dashboard_block.rolled-up .dashboard_block_leftrepeat_top
-{ 
+{
     display: none;
 }
 .dashboard_block.rolled-up .dashboard_block_leftrepeat_bottom
-{ 
+{
     display: none;
 }
@@ -1509,32 +1510,32 @@ The text will be hidden for screen view.  The generic fahrner-ish approach comes
 }
 .dashboard_block.rolled-up .error_dashlet_toprepeat
-{ 
+{
     height: 38px;
 }
 .dashboard_block.rolled-up .error_dashlet_bottomrepeat
-{ 
+{
     height: 20px;
 }
 .dashboard_block.rolled-up .error_dashlet_rightrepeat_top
-{ 
+{
     display: none;
 }
 .dashboard_block.rolled-up .error_dashlet_rightrepeat_bottom
-{ 
+{
     display: none;
 }
 .dashboard_block.rolled-up .error_dashlet_leftrepeat_top
-{ 
+{
     display: none;
 }
 .dashboard_block.rolled-up .error_dashlet_leftrepeat_bottom
-{ 
+{
     display: none;
 }
@@ -1709,32 +1710,32 @@ The text will be hidden for screen view.  The generic fahrner-ish approach comes
 }
 .dashboard_block.rolled-up .info_dashlet_toprepeat
-{ 
+{
     height: 38px;
 }
 .dashboard_block.rolled-up .info_dashlet_bottomrepeat
-{ 
+{
     height: 20px;
 }
 .dashboard_block.rolled-up .info_dashlet_rightrepeat_top
-{ 
+{
     display: none;
 }
 .dashboard_block.rolled-up .info_dashlet_rightrepeat_bottom
-{ 
+{
     display: none;
 }
 .dashboard_block.rolled-up .info_dashlet_leftrepeat_top
-{ 
+{
     display: none;
 }
 .dashboard_block.rolled-up .info_dashlet_leftrepeat_bottom
-{ 
+{
     display: none;
 }
@@ -1813,7 +1814,7 @@ hr {
 #document-views .downloadbox ul li {
     padding-left: 25px;
     padding-top: 0.25em;
-    padding-bottom: 0.25em;    
+    padding-bottom: 0.25em;
     background-repeat: no-repeat;
     background-position: center left;
 }
@@ -1829,8 +1830,8 @@ hr {
 #document-views .viewlet .actionlist li
 {
     display: block;
-    padding: 0 0 0 10px; 
-    margin: 0.5em 0.5em 0.15em 0; 
+    padding: 0 0 0 10px;
+    margin: 0.5em 0.5em 0.15em 0;
     text-align: left;
     background: transparent url(../graphics/leftbullet.png) center left no-repeat;
     border: 0;
@@ -1889,7 +1890,7 @@ hr {
     border-left: 1px solid white;
     border-top: 1px solid white;
     border-right: 1px solid white;
-    border-bottom: 1px solid white;            
+    border-bottom: 1px solid white;
     padding: 0 0 0.5em;
 }
@@ -1939,7 +1940,7 @@ hr {
 /* -------------------------- iframe browse ------------------------ */
-.browse-frame { 
+.browse-frame {
     width: 100%;
     height: 55em;
     border-width: 0px;
@@ -1947,14 +1948,14 @@ hr {
     margin: 0;
 }
-.browse_body { 
+.browse_body {
     padding: 0;
 }
 /* -------------------------- dashboard ------------------------ */
 .dashboard_block_icons
-{ 
+{
     position: absolute;
 	top: 0px;
 	right: 10px;
@@ -1970,12 +1971,12 @@ hr {
 }
 .dashboard_block.rolled-up .dashboard_block_body
-{ 
+{
     display: none;
 }
 .ktBlock .dashboard_block_body
-{ 
+{
     z-index:99;
     margin: 8px 0 10px 0;
     background-color:#FFFFFF;
@@ -1998,8 +1999,8 @@ hr {
     overflow: auto;
 }
-.dashboard_block .dashboard_block_body  .edit_action 
-{ 
+.dashboard_block .dashboard_block_body  .edit_action
+{
     z-index:99;
     background-color:#FFFFFF;
 }
@@ -2007,7 +2008,7 @@ hr {
 /* actions */
 #content .dashboard_block .action
-{ 
+{
     padding: 1em 0.5em;
     border-bottom-width: 0px;
     background-repeat: no-repeat;
@@ -2015,46 +2016,46 @@ hr {
 }
 #content .dashboard_block .action:hover
-{ 
+{
     border-bottom-width: 0px;
 }
-#content .dashboard_block .action_rollup 
-{ 
+#content .dashboard_block .action_rollup
+{
     background-image: url(../graphics/bullet_toggle_minus.png);
 }
-#content .dashboard_block.rolled-up .action_rollup 
-{ 
+#content .dashboard_block.rolled-up .action_rollup
+{
     background-image: url(../graphics/bullet_toggle_plus.png);
 }
-#content .dashboard_block .action_close 
-{ 
+#content .dashboard_block .action_close
+{
     background-image: url(../graphics/bullet_toggle_close.png);
 }
 /* action effects */
-#content .dashboard_block.rolled-up h2 
-{ 
+#content .dashboard_block.rolled-up h2
+{
     border-bottom-width: 0px;
     padding-bottom: 10px;
 }
-#content .ktBlock h2 
-{ 
+#content .ktBlock h2
+{
     border-bottom-width: 0px;
     color: #FFFFFF;
     font-size: small;
 }
-#content .dashboard_block.closed 
-{ 
+#content .dashboard_block.closed
+{
     display: none;
 }
 .addDialogScreen
-{ 
+{
     position: absolute;
     display: block;
     top: 0px;
@@ -2068,7 +2069,7 @@ hr {
 }
 .addDialog
-{ 
+{
     display: block;
     border: 1px solid #ccc;
     background-color: white;
@@ -2081,18 +2082,18 @@ hr {
 .addDialog .dashletLink
-{ 
+{
     color: #666;
     text-decoration: none;
     display: block;
 }
 body #content #add_dashlet
-{ 
+{
     display: none;
     text-decoration: none;
     border-width: 0px;
-    
+
 }
 #add_dashlet
@@ -26,6 +26,18 @@ function onMetadataClick()
 	Ext.example.msg(sSearchTranslations[0], sSearchTranslations[2]); /* Quick Search Options, Searches will now only search metadata */
 }
+function onSearchEngineFormatClick()
+{
+    bResultsFormatSearchEngine = true;
+    document.location=rootURL + "/search2.php?action=searchResults&format=searchengine";
+}
+
+function onBrowseFormatClick()
+{
+    bResultsFormatSearchEngine = false;
+    document.location=rootURL + "/search2.php?action=searchResults&format=browseview";
+}
+
 function onSavedSearchClick(item)
 {
 	id = item.id.substr(11);
@@ -135,6 +147,27 @@ function createSearchBar(div, suffix)
 							})
 						]
 					}
+				},
+				{
+					text: sSearchTranslations[13] , /*Toggle results format*/
+					menu: {
+						items: [
+							new Ext.menu.CheckItem({
+								text: sSearchTranslations[14], /* search engine format */
+								id: 'cbResultsFormatSearchEngine' + suffix,
+								checked: bResultsFormatSearchEngine,
+								group: 'options',
+								handler: onSearchEngineFormatClick
+							}),
+							new Ext.menu.CheckItem({
+								text: sSearchTranslations[15], /* browse view format */
+								id: 'cbBrowseSearchEngine' +  suffix,
+								checked: !bResultsFormatSearchEngine,
+								group: 'options',
+								handler: onBrowseFormatClick
+							})
+						]
+					}
 				}
 			]
 		});
@@ -11,6 +11,122 @@ require_once(KT_LIB_DIR . &quot;/actions/bulkaction.php&quot;);
 require_once(KT_DIR . '/search2/search/search.inc.php');
 require_once(KT_LIB_DIR . '/documentmanagement/Document.inc');
+function search2queryCompare($a, $b)
+{
+	global $search2queryColumn, $search2queryOrder;
+
+
+	if ($a->$search2queryColumn == $b->$search2queryColumn)
+	{
+		return 0;
+	}
+
+	$result = ($a->$search2queryColumn < $b->$search2queryColumn)?-1:1;
+
+	if ($search2queryOrder == 'asc')
+		return $result;
+	else
+		return - $result;
+}
+
+
+/**
+ * Assists with old browse search results
+ *
+ * @param unknown_type $sSortColumn
+ * @param unknown_type $sSortOrder
+ */
+
+function search2QuerySort($sSortColumn, $sSortOrder)
+{
+	$defaultSortColumn = $_SESSION['search2_sort_column'];
+	$defaultSortOrder = $_SESSION['search2_sort_order'];
+
+	if (($defaultSortColumn == $sSortColumn) && ($defaultSortOrder == $sSortOrder))
+	{
+		return;
+	}
+
+	global $search2queryColumn, $search2queryOrder;
+
+	$search2queryOrder = strtolower($sSortOrder);
+
+	switch(strtolower($sSortColumn))
+	{
+		case 'ktcore.columns.title':
+			$search2queryColumn = 'Title';
+			break;
+		case 'ktcore.columns.workflow_state':
+			$search2queryColumn = 'WorkflowAndState';
+			break;
+		case 'ktcore.columns.checkedout_by':
+			$search2queryColumn = 'CheckedOutBy';
+			break;
+		case 'ktcore.columns.creationdate':
+			$search2queryColumn = 'DateCreated';
+			break;
+		case 'ktcore.columns.modificationdate':
+			$search2queryColumn = 'DateModified';
+			break;
+		case 'ktcore.columns.creator':
+			$search2queryColumn = 'CreatedBy';
+			break;
+		case 'ktcore.columns.docid':
+			$search2queryColumn = 'DocumentID';
+			break;
+		case 'ktcore.columns.document_type':
+			$search2queryColumn = 'DocumentType';
+			break;
+		default:
+			return;
+	}
+
+
+	$results = unserialize($_SESSION['search2_results']);
+
+	usort($results, 'search2queryCompare');
+
+	$_SESSION['search2_results'] = serialize($results);
+
+}
+
+/**
+ * Search2Query is used to provide allow the old browse search to work
+ *
+ */
+class Search2Query extends PartialQuery
+{
+    function getFolderCount() { return 0; }
+    function getDocumentCount()
+    {
+    	return count(unserialize($_SESSION['search2_results']));
+    }
+
+    function getFolders($iBatchSize, $iBatchStart, $sSortColumn, $sSortOrder, $sJoinClause = null, $aJoinParams = null)
+  	{
+  		return array();
+  	}
+
+    function getDocuments($iBatchSize, $iBatchStart, $sSortColumn, $sSortOrder, $sJoinClause = null, $aJoinParams = null)
+    {
+    	search2QuerySort($_GET['sort_on'], $_GET['sort_order']);
+    	$results = unserialize($_SESSION['search2_results']);
+
+    	$batch = array();
+
+    	$no_results = count($results);
+    	for($i=0;$i<$no_results;$i++)
+    	{
+			if ($i < $iBatchStart) continue;
+			if ($i > $iBatchStart + $iBatchSize) continue;
+
+			$batch[] = array('id'=>$results[$i]->DocumentID);
+    	}
+
+    	return $batch;
+    }
+}
+
 class SearchDispatcher extends KTStandardDispatcher {
@@ -157,6 +273,56 @@ class SearchDispatcher extends KTStandardDispatcher {
 		$this->processQuery($expr);
     }
+	function do_oldSearchResults()
+	{
+		$this->oPage->setBreadcrumbDetails(_kt("Search Results"));
+        $this->oPage->title = _kt("Search Results");
+
+        $collection = new AdvancedCollection;
+        $oColumnRegistry = KTColumnRegistry::getSingleton();
+        $aColumns = $oColumnRegistry->getColumnsForView('ktcore.views.search');
+        $collection->addColumns($aColumns);
+
+        // set a view option
+        $aTitleOptions = array(
+            'documenturl' => $GLOBALS['KTRootUrl'] . '/view.php',
+            'direct_folder' => true,
+        );
+        $collection->setColumnOptions('ktcore.columns.title', $aTitleOptions);
+
+        // set the selection options
+        $collection->setColumnOptions('ktcore.columns.selection', array(
+            'rangename' => 'selection',
+            'show_folders' => true,
+            'show_documents' => true,
+        ));
+
+
+        $aOptions = $collection->getEnvironOptions(); // extract data from the environment
+
+        $aOptions['empty_message'] = _kt("No documents or folders match this query.");
+        $aOptions['is_browse'] = true;
+		$aOptions['return_url'] = KTUtil::addQueryStringSelf("action=oldSearchResults");
+
+
+        $collection->setOptions($aOptions);
+        $collection->setQueryObject(new Search2Query());
+
+        $oTemplating =& KTTemplating::getSingleton();
+        $oTemplate = $oTemplating->loadTemplate("kt3/browse");
+        $aTemplateData = array(
+            "context" => $this,
+            "collection" => $collection,
+            'isEditable' => true,
+            'bulkactions' => KTBulkActionUtil::getAllBulkActions(),
+            'browseutil' => new KTBrowseUtil(),
+            'returnaction' => 'search2',
+        );
+        return $oTemplate->render($aTemplateData);
+        }
+
+
+
     /**
      * Renders the search results.
      *
@@ -164,7 +330,32 @@ class SearchDispatcher extends KTStandardDispatcher {
      */
     function do_searchResults()
     {
-		$this->oPage->setBreadcrumbDetails(_kt("Search Results"));
+        if (array_key_exists('format', $_GET))
+        {
+            switch ($_GET['format']){
+                case 'searchengine':
+                    $_SESSION['search2resultFormat'] = 'searchengine';
+                    break;
+                case 'browseview':
+                    $_SESSION['search2resultFormat'] = 'browseview';
+                    break;
+            }
+        }
+        else
+        {
+            if(!array_key_exists('search2resultFormat', $_SESSION)){
+                global $default;
+                $_SESSION['search2resultFormat'] = $default->resultsDisplayFormat;
+            }
+        }
+
+        if ($_SESSION['search2resultFormat'] == 'browseview')
+        {
+        	$this->redirectTo('oldSearchResults');
+
+        }
+
+        $this->oPage->setBreadcrumbDetails(_kt("Search Results"));
         $this->oPage->title = _kt("Search Results");
     	$oTemplating =& KTTemplating::getSingleton();
@@ -182,7 +182,7 @@ class JavaXMLRPCLuceneIndexer extends Indexer
     			$document_id 	= $hit->DocumentID;
     			// avoid adding duplicates. If it is in already, it has higher priority.
-    			if (!array_key_exists($document_id, $results) || $score > $results[$document_id]->Score)
+    			if (!array_key_exists($document_id, $results) || $score > $results[$document_id]->Rank)
     			{
     				try
     				{
@@ -112,7 +112,10 @@
 	                            	/* 9  */	"{i18n}content and metadata{/i18n}",
 	                            	/* 10  */	"{i18n}metadata{/i18n}",
 	                            	/* 11  */	"{i18n}search{/i18n}",
-	                            	/* 12  */	"{i18n}Enter search criteria...{/i18n}"
+	                            	/* 12  */	"{i18n}Enter search criteria...{/i18n}",
+	                            	/* 13  */	"{i18n}Toggle search results format{/i18n}",
+	                            	/* 14  */	"{i18n}Search engine format{/i18n}",
+	                            	/* 15  */	"{i18n}Browse view format{/i18n}"
 	                            	];
@@ -124,6 +127,12 @@
 	                            	{assign var=count value=$count+1}
 	                            	{/foreach}
 	                            ];
+
+	                            {if $smarty.session.search2resultFormat != 'searchengine'}
+	                                var bResultsFormatSearchEngine = false;
+	                            {else}
+	                                var bResultsFormatSearchEngine = true;
+	                            {/if}
 	                            </script>
 	                            {literal}