Peter M. Groen / knowledgetree

Commit 951b4a505d00269a7d518308ec98f404f6aa6af8

Authored by rob
1 parent c16b59fe

no message 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@1143 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 5 additions and 15 deletions
presentation/lookAndFeel/knowledgeTree/search/standardSearchBL.php
  View file @951b4a5
@@ -37,18 +37,14 @@ if (checkSession()) { @@ -37,18 +37,14 @@ if (checkSession()) {
37 require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); 37 require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
38 $oPatternCustom = & new PatternCustom(); 38 $oPatternCustom = & new PatternCustom();
39 $oPatternCustom->setHtml(getPage($fSearchText, $fBrowseType, $fFolderID, $fDocumentID, $fCategoryName, $fDocType, $sFolderString, $fStartIndex, getSQLSearchString($fSearchText))); 39 $oPatternCustom->setHtml(getPage($fSearchText, $fBrowseType, $fFolderID, $fDocumentID, $fCategoryName, $fDocType, $sFolderString, $fStartIndex, getSQLSearchString($fSearchText)));
40 - $main->setCentralPayload($oPatternCustom);  
41 - $main->setFormAction("addFolderBL.php?fFolderID=$fFolderID");  
42 - $main->setHasRequiredFields(true); 40 + $main->setCentralPayload($oPatternCustom);
43 $main->render(); 41 $main->render();
44 } else { 42 } else {
45 $sFolderString = getApprovedFolderString($fFolderID); 43 $sFolderString = getApprovedFolderString($fFolderID);
46 require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); 44 require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
47 $oPatternCustom = & new PatternCustom(); 45 $oPatternCustom = & new PatternCustom();
48 $oPatternCustom->setHtml(getPage($fSearchText, $fBrowseType, $fFolderID, $fDocumentID, $fCategoryName, $fDocType, $sFolderString, $fStartIndex, getSQLSearchString($fSearchText))); 46 $oPatternCustom->setHtml(getPage($fSearchText, $fBrowseType, $fFolderID, $fDocumentID, $fCategoryName, $fDocType, $sFolderString, $fStartIndex, getSQLSearchString($fSearchText)));
49 - $main->setCentralPayload($oPatternCustom);  
50 - $main->setFormAction("addFolderBL.php?fFolderID=$fFolderID");  
51 - $main->setHasRequiredFields(true); 47 + $main->setCentralPayload($oPatternCustom);
52 $main->render(); 48 $main->render();
53 } 49 }
54 break; 50 break;
@@ -61,18 +57,14 @@ if (checkSession()) { @@ -61,18 +57,14 @@ if (checkSession()) {
61 require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); 57 require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
62 $oPatternCustom = & new PatternCustom(); 58 $oPatternCustom = & new PatternCustom();
63 $oPatternCustom->setHtml(getPage($fSearchText, $fBrowseType, $fFolderID, $fDocumentID, $fCategoryName, $fDocType, $sFolderString, $fStartIndex, getSQLSearchString($fSearchText))); 59 $oPatternCustom->setHtml(getPage($fSearchText, $fBrowseType, $fFolderID, $fDocumentID, $fCategoryName, $fDocType, $sFolderString, $fStartIndex, getSQLSearchString($fSearchText)));
64 - $main->setCentralPayload($oPatternCustom);  
65 - $main->setFormAction("addFolderBL.php?fFolderID=$fFolderID");  
66 - $main->setHasRequiredFields(true); 60 + $main->setCentralPayload($oPatternCustom);
67 $main->render(); 61 $main->render();
68 } else { 62 } else {
69 $sFolderString = getApprovedFolderStringFromCategory($fCategoryName); 63 $sFolderString = getApprovedFolderStringFromCategory($fCategoryName);
70 require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); 64 require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
71 $oPatternCustom = & new PatternCustom(); 65 $oPatternCustom = & new PatternCustom();
72 $oPatternCustom->setHtml(getPage($fSearchText, $fBrowseType, $fFolderID, $fDocumentID, $fCategoryName, $fDocType, $sFolderString, $fStartIndex, getSQLSearchString($fSearchText))); 66 $oPatternCustom->setHtml(getPage($fSearchText, $fBrowseType, $fFolderID, $fDocumentID, $fCategoryName, $fDocType, $sFolderString, $fStartIndex, getSQLSearchString($fSearchText)));
73 - $main->setCentralPayload($oPatternCustom);  
74 - $main->setFormAction("addFolderBL.php?fFolderID=$fFolderID");  
75 - $main->setHasRequiredFields(true); 67 + $main->setCentralPayload($oPatternCustom);
76 $main->render(); 68 $main->render();
77 } 69 }
78 break; 70 break;
@@ -86,9 +78,7 @@ if (checkSession()) { @@ -86,9 +78,7 @@ if (checkSession()) {
86 require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); 78 require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
87 $oPatternCustom = & new PatternCustom(); 79 $oPatternCustom = & new PatternCustom();
88 $oPatternCustom->setHtml(getPage($fSearchText, $fBrowseType, $fFolderID, $fDocumentID, $fCategoryName, $fDocType, $sFolderString, $fStartIndex, getSQLSearchString($fSearchText))); 80 $oPatternCustom->setHtml(getPage($fSearchText, $fBrowseType, $fFolderID, $fDocumentID, $fCategoryName, $fDocType, $sFolderString, $fStartIndex, getSQLSearchString($fSearchText)));
89 - $main->setCentralPayload($oPatternCustom);  
90 - $main->setFormAction("addFolderBL.php?fFolderID=$fFolderID");  
91 - $main->setHasRequiredFields(true); 81 + $main->setCentralPayload($oPatternCustom);
92 $main->render(); 82 $main->render();
93 } else { 83 } else {
94 //TODO ONCE DOC TYPE/FOLDERS HAVE BEEN CHANGED 84 //TODO ONCE DOC TYPE/FOLDERS HAVE BEEN CHANGED