Peter M. Groen / knowledgetree

Commit c25dd6c8d2057ca705673e1d3080561dd9d3cb28

Authored by Mark Holtzhausen
2 parents 01238db5 c389d347

Merge branch 'edge' of github.com:ktgit/knowledgetree into edge

Inline Side-by-side
Showing 75 changed files with 530 additions and 289 deletions
dmsctl.bat
  View file @c25dd6c
... ... @@ -100,7 +100,6 @@ IF EXIST "%INSTALL_PATH%\var\bin\officeinstall.bat" echo The Open Office automat
100 100 IF EXIST "%INSTALL_PATH%\var\bin\schedulerinstall.bat" call "%INSTALL_PATH%\var\bin\schedulerinstall.bat"
101 101 IF EXIST "%INSTALL_PATH%\var\bin\schedulerinstall.bat" echo The Scheduler automatic service was successfully installed.
102 102 IF EXIST "%INSTALL_PATH%\var\bin\luceneinstall.bat" call "%INSTALL_PATH%\var\bin\luceneinstall.bat"
103   -IF EXIST "%INSTALL_PATH%\var\bin\luceneinstall.bat" echo The Lucene automatic service was successfully installed.
104 103 goto end
105 104  
106 105 :end
... ...
dmsctl.sh
  View file @c25dd6c
... ... @@ -267,8 +267,9 @@ stop_lucene() {
267 267 get_lucene_pid
268 268 cd $INSTALL_PATH/search2/indexing/bin
269 269 $ZEND_DIR/bin/php shutdown.php positive &> $INSTALL_PATH/var/log/dmsctl.log
  270 + exit=$?
270 271 sleep 5
271   - if [ $? -eq 0 ]; then
  272 + if [ $exit -eq 0 ]; then
272 273 echo "$0 $ARG: lucene stopped"
273 274 else
274 275 echo "$0 $ARG: lucene could not be stopped"
... ...
plugins/ktstandard/documentpreview/documentPreview.php
  View file @c25dd6c
1 1 <?php
2   -/*
  2 +/**
3 3 * $Id: $
4 4 *
5   - * The contents of this file are subject to the KnowledgeTree
6   - * Commercial Editions On-Premise License ("License");
7   - * You may not use this file except in compliance with the License.
8   - * You may obtain a copy of the License at
9   - * http://www.knowledgetree.com/about/legal/
10   - * The terms of this license may change from time to time and the latest
11   - * license will be published from time to time at the above Internet address.
  5 + * KnowledgeTree Community Edition
  6 + * Document Management Made Simple
  7 + * Copyright (C) 2008, 2009 KnowledgeTree Inc.
  8 + *
  9 + *
  10 + * This program is free software; you can redistribute it and/or modify it under
  11 + * the terms of the GNU General Public License version 3 as published by the
  12 + * Free Software Foundation.
  13 + *
  14 + * This program is distributed in the hope that it will be useful, but WITHOUT
  15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  16 + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
  17 + * details.
  18 + *
  19 + * You should have received a copy of the GNU General Public License
  20 + * along with this program. If not, see <http://www.gnu.org/licenses/>.
12 21 *
13   - * This edition of the KnowledgeTree software
14   - * is NOT licensed to you under Open Source terms.
15   - * You may not redistribute this source code.
16   - * For more information please see the License above.
  22 + * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
  23 + * California 94120-7775, or email info@knowledgetree.com.
17 24 *
18   - * (c) 2008 KnowledgeTree Inc.
19   - * Portions copyright The Jam Warehouse Software (Pty) Ltd;
20   - * All Rights Reserved.
  25 + * The interactive user interfaces in modified source and object code versions
  26 + * of this program must display Appropriate Legal Notices, as required under
  27 + * Section 5 of the GNU General Public License version 3.
21 28 *
  29 + * In accordance with Section 7(b) of the GNU General Public License version 3,
  30 + * these Appropriate Legal Notices must retain the display of the "Powered by
  31 + * KnowledgeTree" logo and retain the original copyright notice. If the display of the
  32 + * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
  33 + * must display the words "Powered by KnowledgeTree" and retain the original
  34 + * copyright notice.
  35 + * Contributor( s): ______________________________________
22 36 */
23 37  
24 38 $kt_dir = $_REQUEST['kt_dir'];
... ...
plugins/ktstandard/documentpreview/documentPreviewPlugin.php
  View file @c25dd6c
1 1 <?php
2   -/*
  2 +/**
3 3 * $Id: $
4 4 *
5   - * The contents of this file are subject to the KnowledgeTree
6   - * Commercial Editions On-Premise License ("License");
7   - * You may not use this file except in compliance with the License.
8   - * You may obtain a copy of the License at
9   - * http://www.knowledgetree.com/about/legal/
10   - * The terms of this license may change from time to time and the latest
11   - * license will be published from time to time at the above Internet address.
  5 + * KnowledgeTree Community Edition
  6 + * Document Management Made Simple
  7 + * Copyright (C) 2008, 2009 KnowledgeTree Inc.
12 8 *
13   - * This edition of the KnowledgeTree software
14   - * is NOT licensed to you under Open Source terms.
15   - * You may not redistribute this source code.
16   - * For more information please see the License above.
17 9 *
18   - * (c) 2008 KnowledgeTree Inc.
19   - * Portions copyright The Jam Warehouse Software (Pty) Ltd;
20   - * All Rights Reserved.
  10 + * This program is free software; you can redistribute it and/or modify it under
  11 + * the terms of the GNU General Public License version 3 as published by the
  12 + * Free Software Foundation.
21 13 *
  14 + * This program is distributed in the hope that it will be useful, but WITHOUT
  15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  16 + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
  17 + * details.
  18 + *
  19 + * You should have received a copy of the GNU General Public License
  20 + * along with this program. If not, see <http://www.gnu.org/licenses/>.
  21 + *
  22 + * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
  23 + * California 94120-7775, or email info@knowledgetree.com.
  24 + *
  25 + * The interactive user interfaces in modified source and object code versions
  26 + * of this program must display Appropriate Legal Notices, as required under
  27 + * Section 5 of the GNU General Public License version 3.
  28 + *
  29 + * In accordance with Section 7(b) of the GNU General Public License version 3,
  30 + * these Appropriate Legal Notices must retain the display of the "Powered by
  31 + * KnowledgeTree" logo and retain the original copyright notice. If the display of the
  32 + * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
  33 + * must display the words "Powered by KnowledgeTree" and retain the original
  34 + * copyright notice.
  35 + * Contributor( s): ______________________________________
22 36 */
23 37  
24 38 require_once(KT_LIB_DIR . '/plugins/plugin.inc.php');
... ...
plugins/pdfConverter/pdfConverter.php
  View file @c25dd6c
1 1 <?php
2   -/*
  2 +/**
3 3 * $Id: $
4 4 *
5   - * The contents of this file are subject to the KnowledgeTree
6   - * Commercial Editions On-Premise License ("License");
7   - * You may not use this file except in compliance with the License.
8   - * You may obtain a copy of the License at
9   - * http://www.knowledgetree.com/about/legal/
10   - * The terms of this license may change from time to time and the latest
11   - * license will be published from time to time at the above Internet address.
  5 + * KnowledgeTree Community Edition
  6 + * Document Management Made Simple
  7 + * Copyright (C) 2008, 2009 KnowledgeTree Inc.
  8 + *
  9 + *
  10 + * This program is free software; you can redistribute it and/or modify it under
  11 + * the terms of the GNU General Public License version 3 as published by the
  12 + * Free Software Foundation.
  13 + *
  14 + * This program is distributed in the hope that it will be useful, but WITHOUT
  15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  16 + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
  17 + * details.
  18 + *
  19 + * You should have received a copy of the GNU General Public License
  20 + * along with this program. If not, see <http://www.gnu.org/licenses/>.
12 21 *
13   - * This edition of the KnowledgeTree software
14   - * is NOT licensed to you under Open Source terms.
15   - * You may not redistribute this source code.
16   - * For more information please see the License above.
  22 + * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
  23 + * California 94120-7775, or email info@knowledgetree.com.
17 24 *
18   - * (c) 2008 KnowledgeTree Inc.
19   - * Portions copyright The Jam Warehouse Software (Pty) Ltd;
20   - * All Rights Reserved.
  25 + * The interactive user interfaces in modified source and object code versions
  26 + * of this program must display Appropriate Legal Notices, as required under
  27 + * Section 5 of the GNU General Public License version 3.
21 28 *
  29 + * In accordance with Section 7(b) of the GNU General Public License version 3,
  30 + * these Appropriate Legal Notices must retain the display of the "Powered by
  31 + * KnowledgeTree" logo and retain the original copyright notice. If the display of the
  32 + * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
  33 + * must display the words "Powered by KnowledgeTree" and retain the original
  34 + * copyright notice.
  35 + * Contributor( s): ______________________________________
22 36 */
23 37  
24 38 require_once(KT_DIR . '/search2/documentProcessor/documentProcessor.inc.php');
... ...
plugins/pdfConverter/pdfConverterPlugin.php
  View file @c25dd6c
1 1 <?php
  2 +
2 3 /**
3   - * $Id: $
  4 + * $Id$
  5 + *
  6 + * KnowledgeTree Community Edition
  7 + * Document Management Made Simple
  8 + * Copyright (C) 2008, 2009 KnowledgeTree Inc.
  9 + *
  10 + *
  11 + * This program is free software; you can redistribute it and/or modify it under
  12 + * the terms of the GNU General Public License version 3 as published by the
  13 + * Free Software Foundation.
  14 + *
  15 + * This program is distributed in the hope that it will be useful, but WITHOUT
  16 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  17 + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
  18 + * details.
4 19 *
5   - * The contents of this file are subject to the KnowledgeTree
6   - * Commercial Editions On-Premise License ("License");
7   - * You may not use this file except in compliance with the License.
8   - * You may obtain a copy of the License at
9   - * http://www.knowledgetree.com/about/legal/
10   - * The terms of this license may change from time to time and the latest
11   - * license will be published from time to time at the above Internet address.
  20 + * You should have received a copy of the GNU General Public License
  21 + * along with this program. If not, see <http://www.gnu.org/licenses/>.
12 22 *
13   - * This edition of the KnowledgeTree software
14   - * is NOT licensed to you under Open Source terms.
15   - * You may not redistribute this source code.
16   - * For more information please see the License above.
  23 + * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
  24 + * California 94120-7775, or email info@knowledgetree.com.
17 25 *
18   - * (c) 2008 KnowledgeTree Inc.
19   - * Portions copyright The Jam Warehouse Software (Pty) Ltd;
20   - * All Rights Reserved.
  26 + * The interactive user interfaces in modified source and object code versions
  27 + * of this program must display Appropriate Legal Notices, as required under
  28 + * Section 5 of the GNU General Public License version 3.
21 29 *
  30 + * In accordance with Section 7(b) of the GNU General Public License version 3,
  31 + * these Appropriate Legal Notices must retain the display of the "Powered by
  32 + * KnowledgeTree" logo and retain the original copyright notice. If the display of the
  33 + * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
  34 + * must display the words "Powered by KnowledgeTree" and retain the original
  35 + * copyright notice.
  36 + * Contributor( s): ______________________________________
22 37 */
23 38  
24 39 require_once(KT_LIB_DIR . '/plugins/plugin.inc.php');
... ...
plugins/search2/reporting/RescheduleDocuments.php
  View file @c25dd6c
... ... @@ -5,7 +5,7 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright (C) 2008, 2009 KnowledgeTree Inc.
8   - *
  8 + *
9 9 *
10 10 * This program is free software; you can redistribute it and/or modify it under
11 11 * the terms of the GNU General Public License version 3 as published by the
... ... @@ -41,7 +41,8 @@ require_once(KT_LIB_DIR . &#39;/templating/templating.inc.php&#39;);
41 41  
42 42 class RescheduleDocumentsDispatcher extends KTAdminDispatcher
43 43 {
44   - function check() {
  44 + function check()
  45 + {
45 46 $this->aBreadcrumbs[] = array(
46 47 'url' => $_SERVER['PHP_SELF'],
47 48 'name' => _kt('Reschedule all documents'),
... ... @@ -49,28 +50,34 @@ class RescheduleDocumentsDispatcher extends KTAdminDispatcher
49 50 return parent::check();
50 51 }
51 52  
52   - function do_main() {
53   -
54   - //registerTypes registers the mime types and populates the needed tables.
55   - $indexer = Indexer::get();
56   - $indexer->registerTypes();
57   -
  53 + function do_main()
  54 + {
58 55 $oTemplating =& KTTemplating::getSingleton();
59 56 $oTemplate =& $oTemplating->loadTemplate('ktcore/search2/reporting/rescheduledocuments');
60 57  
  58 + $rescheduleDone = ($_REQUEST['rescheduleDone'] == 'true') ? 'true' : 'false';
  59 + $reprocessDone = ($_REQUEST['reprocessDone'] == 'true') ? 'true' : 'false';
  60 +
61 61 if ($_REQUEST['rescheduleValue'] == 'reschedule')
62 62 {
  63 + //registerTypes registers the mime types and populates the needed tables.
  64 + $indexer = Indexer::get();
  65 + $indexer->registerTypes();
  66 +
63 67 Indexer::indexAll();
64   - $oTemplate->setData(array(
65   - 'context' => $this,
66   - 'rescheduleDone' => true
67   - ));
68   - return $oTemplate;
  68 + $rescheduleDone = 'true';
  69 + }
  70 +
  71 + if ($_REQUEST['rescheduleValue'] == 'reprocess')
  72 + {
  73 + Indexer::processAll();
  74 + $reprocessDone = 'true';
69 75 }
70 76  
71 77 $oTemplate->setData(array(
72 78 'context' => $this,
73   - 'rescheduleDone' => false
  79 + 'rescheduleDone' => $rescheduleDone,
  80 + 'reprocessDone' => $reprocessDone
74 81  
75 82 ));
76 83 return $oTemplate;
... ...
plugins/thumbnails/thumbnails.php
  View file @c25dd6c
1 1 <?php
2   -/*
  2 +/**
3 3 * $Id: $
4 4 *
5   - * The contents of this file are subject to the KnowledgeTree
6   - * Commercial Editions On-Premise License ("License");
7   - * You may not use this file except in compliance with the License.
8   - * You may obtain a copy of the License at
9   - * http://www.knowledgetree.com/about/legal/
10   - * The terms of this license may change from time to time and the latest
11   - * license will be published from time to time at the above Internet address.
  5 + * KnowledgeTree Community Edition
  6 + * Document Management Made Simple
  7 + * Copyright (C) 2008, 2009 KnowledgeTree Inc.
  8 + *
  9 + *
  10 + * This program is free software; you can redistribute it and/or modify it under
  11 + * the terms of the GNU General Public License version 3 as published by the
  12 + * Free Software Foundation.
  13 + *
  14 + * This program is distributed in the hope that it will be useful, but WITHOUT
  15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  16 + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
  17 + * details.
  18 + *
  19 + * You should have received a copy of the GNU General Public License
  20 + * along with this program. If not, see <http://www.gnu.org/licenses/>.
12 21 *
13   - * This edition of the KnowledgeTree software
14   - * is NOT licensed to you under Open Source terms.
15   - * You may not redistribute this source code.
16   - * For more information please see the License above.
  22 + * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
  23 + * California 94120-7775, or email info@knowledgetree.com.
17 24 *
18   - * (c) 2008 KnowledgeTree Inc.
19   - * Portions copyright The Jam Warehouse Software (Pty) Ltd;
20   - * All Rights Reserved.
  25 + * The interactive user interfaces in modified source and object code versions
  26 + * of this program must display Appropriate Legal Notices, as required under
  27 + * Section 5 of the GNU General Public License version 3.
21 28 *
  29 + * In accordance with Section 7(b) of the GNU General Public License version 3,
  30 + * these Appropriate Legal Notices must retain the display of the "Powered by
  31 + * KnowledgeTree" logo and retain the original copyright notice. If the display of the
  32 + * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
  33 + * must display the words "Powered by KnowledgeTree" and retain the original
  34 + * copyright notice.
  35 + * Contributor( s): ______________________________________
22 36 */
23 37  
24 38 require_once(KT_LIB_DIR . "/actions/documentviewlet.inc.php");
... ...
plugins/thumbnails/thumbnailsPlugin.php
  View file @c25dd6c
1 1 <?php
  2 +
2 3 /**
3   - * $Id: $
  4 + * $Id$
  5 + *
  6 + * KnowledgeTree Community Edition
  7 + * Document Management Made Simple
  8 + * Copyright (C) 2008, 2009 KnowledgeTree Inc.
  9 + *
4 10 *
5   - * The contents of this file are subject to the KnowledgeTree
6   - * Commercial Editions On-Premise License ("License");
7   - * You may not use this file except in compliance with the License.
8   - * You may obtain a copy of the License at
9   - * http://www.knowledgetree.com/about/legal/
10   - * The terms of this license may change from time to time and the latest
11   - * license will be published from time to time at the above Internet address.
  11 + * This program is free software; you can redistribute it and/or modify it under
  12 + * the terms of the GNU General Public License version 3 as published by the
  13 + * Free Software Foundation.
12 14 *
13   - * This edition of the KnowledgeTree software
14   - * is NOT licensed to you under Open Source terms.
15   - * You may not redistribute this source code.
16   - * For more information please see the License above.
  15 + * This program is distributed in the hope that it will be useful, but WITHOUT
  16 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  17 + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
  18 + * details.
17 19 *
18   - * (c) 2008 KnowledgeTree Inc.
19   - * Portions copyright The Jam Warehouse Software (Pty) Ltd;
20   - * All Rights Reserved.
  20 + * You should have received a copy of the GNU General Public License
  21 + * along with this program. If not, see <http://www.gnu.org/licenses/>.
21 22 *
  23 + * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
  24 + * California 94120-7775, or email info@knowledgetree.com.
  25 + *
  26 + * The interactive user interfaces in modified source and object code versions
  27 + * of this program must display Appropriate Legal Notices, as required under
  28 + * Section 5 of the GNU General Public License version 3.
  29 + *
  30 + * In accordance with Section 7(b) of the GNU General Public License version 3,
  31 + * these Appropriate Legal Notices must retain the display of the "Powered by
  32 + * KnowledgeTree" logo and retain the original copyright notice. If the display of the
  33 + * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
  34 + * must display the words "Powered by KnowledgeTree" and retain the original
  35 + * copyright notice.
  36 + * Contributor( s): ______________________________________
22 37 */
23 38  
24 39 require_once(KT_LIB_DIR . '/plugins/plugin.inc.php');
... ... @@ -49,7 +64,7 @@ class thumbnailsPlugin extends KTPlugin {
49 64 require_once(KT_LIB_DIR . '/templating/templating.inc.php');
50 65 $oTemplating =& KTTemplating::getSingleton();
51 66 $oTemplating->addLocation('thumbnails', $plugin_dir.'templates', 'thumbnails.generator.processor.plugin');
52   -
  67 +
53 68 // check for existing config settings entry and only add if not already present
54 69 $sql = 'SELECT id FROM `config_settings` WHERE group_name = "externalBinary" AND item = "convertPath"';
55 70 $result = DBUtil::getOneResult($sql);
... ...
search2/indexing/indexerCore.inc.php
  View file @c25dd6c
... ... @@ -700,6 +700,17 @@ abstract class Indexer
700 700 DBUtil::runQuery($sql);
701 701 }
702 702  
  703 + public static function processAll()
  704 + {
  705 + // Empty the queue
  706 + $sql = "DELETE FROM process_queue";
  707 + DBUtil::runQuery($sql);
  708 +
  709 + // Add all documents to the queue
  710 + $sql = "INSERT INTO process_queue(document_id, date_added) SELECT id, now() FROM documents WHERE status_id=1 and id not in (select document_id from process_queue)";
  711 + DBUtil::runQuery($sql);
  712 + }
  713 +
703 714 public static function indexFolder($folder)
704 715 {
705 716 $userid=$_SESSION['userID'];
... ...
setup/migrate/migrateUtil.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ...
setup/migrate/session.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ...
setup/migrate/step.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ... @@ -429,6 +428,20 @@ class Step
429 428 public function setErrors($error) {
430 429 $this->error = $error;
431 430 }
  431 +
  432 + /**
  433 + * Is the installation
  434 + *
  435 + * @author KnowledgeTree Team
  436 + * @param none
  437 + * @access public
  438 + * @return string
  439 + */
  440 + public function isCe() {
  441 + if($this->util->getVersionType() == "community")
  442 + return true;
  443 + return false;
  444 + }
432 445 }
433 446  
434 447 ?>
435 448 \ No newline at end of file
... ...
setup/migrate/steps/migrateComplete.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ...
setup/migrate/steps/migrateDatabase.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ... @@ -103,7 +102,7 @@ class migrateDatabase extends Step
103 102 } else if($this->previous()) {
104 103 return 'previous';
105 104 }
106   -
  105 + $this->storeSilent();
107 106 return 'landing';
108 107 }
109 108  
... ... @@ -171,7 +170,7 @@ class migrateDatabase extends Step
171 170 $cmd = $exe.' -u"'.$dbAdminUser.'" -p"'.$dbAdminPass.'" --port="'.$port.'" '.$dbName.' > '.$sqlFile;
172 171 if($noFile) {
173 172 $this->error[]['error'] = "The KnowledgeTree Setup Wizard was unable to connect to your KnowledgeTree 3.6.1 database.";
174   - $this->error[]['msg'] = "Please ensure that your KnowledgeTree Mysql service is running.";
  173 + $this->error[]['msg'] = "Ensure that your KnowledgeTree Mysql service is running.";
175 174 $this->error[]['cmd'] = "Click <b>Next</b> after resolving the above errors.";
176 175 $this->temp_variables['manual_export'] = "";
177 176 } else {
... ... @@ -209,6 +208,9 @@ class migrateDatabase extends Step
209 208 private function setDetails() {
210 209 $this->createMigrateFile(); // create lock file to indicate migration mode
211 210 $database = $this->getDataFromSession("database");
  211 + $installation = $this->getDataFromSession("installation"); // Get installation directory
  212 + $location = $installation['location'];
  213 + $this->temp_variables['location'] = $location;
212 214 if(isset($database['dumpLocation'])) {
213 215 if(!empty($database['dumpLocation'])) {
214 216 if(file_exists($database['dumpLocation'])) { // Maybe file has been deleted by tmp
... ... @@ -220,7 +222,8 @@ class migrateDatabase extends Step
220 222 $this->temp_variables['duname'] = $this->getPostSafe('duname');
221 223 $this->temp_variables['dpassword'] = $this->getPostSafe('dpassword');
222 224 $this->temp_variables['dumpLocation'] = $this->getPostSafe('dumpLocation');
223   -
  225 +
  226 +
224 227 return true;
225 228 }
226 229  
... ...
setup/migrate/steps/migrateErrors.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ...
setup/migrate/steps/migrateInstallation.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ... @@ -220,7 +219,7 @@ class migrateInstallation extends step
220 219 $this->error[] = "KnowledgeTree installation configuration file not found";
221 220 }
222 221 } else {
223   - $this->error[] = "Please Enter a Location";
  222 + $this->error[] = "Enter a Location";
224 223 }
225 224  
226 225 return false;
... ...
setup/migrate/steps/migrateServices.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ... @@ -294,7 +293,7 @@ class migrateServices extends Step
294 293 $state = 'cross';
295 294 $this->error[] = "Service : {$serv->getName()} could not be uninstalled.<br/>";
296 295 $this->serviceCheck = 'cross';
297   - $this->temp_variables['services'][$serv->getName()]['msg'] = "Service Stopped, please uninstall service";
  296 + $this->temp_variables['services'][$serv->getName()]['msg'] = "Service Stopped, uninstall service";
298 297 } else {
299 298 $state = 'tick';
300 299 $this->temp_variables['services'][$serv->getName()]['msg'] = "Service has been uninstalled";
... ... @@ -402,7 +401,7 @@ class migrateServices extends Step
402 401 private function storeSilent() {
403 402 $this->temp_variables['alreadyUninstalled'] = $this->alreadyUninstalled;
404 403 $this->temp_variables['serviceCheck'] = $this->serviceCheck;
405   - $this->temp_variables['msg'] = "Please turn off KnowledgeTree Mysql Instance.";
  404 + $this->temp_variables['msg'] = "Turn off KnowledgeTree Mysql Instance.";
406 405 }
407 406 }
408 407 ?>
409 408 \ No newline at end of file
... ...
setup/migrate/templates/complete.tpl
  View file @c25dd6c
1 1 <form action="index.php?step_name=<?php echo $step_name; ?>" method="post" id="<?php echo $step_name; ?>">
2 2 <p class="title">Migration Completed</p>
3 3  
4   - <p class="description">Your database migration was successfully completed. Please check the section below for details of the migration and final instructions</p>
  4 + <p class="description">Your database migration was successfully completed. Check the section below for details of the migration and final instructions</p>
5 5 <div id="step_content_<?php echo $step_name; ?>" class="step">
6 6  
7 7 <!-- SQL -->
... ... @@ -9,13 +9,35 @@
9 9 <span class='<?php echo $sql['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><?php echo $sql['msg']; ?>
10 10 <br /><br />
11 11 <h3>Start new MySQL service</h3>
12   - In order to complete the upgrade process please start the Zend Server MySQL service and then click <b>Next</b> to continue (<a href="http://wiki.knowledgetree.com/Web_Based_Migrater#Complete" target="_blank">Click here for help</a>).
13   - <br /><br />
  12 + In order to complete the upgrade process, start the Zend Server MySQL service and then click <b>Next</b> to continue (<a href="http://wiki.knowledgetree.com/Web_Based_Migrater#Complete" target="_blank">Click here for help</a>).
  13 + <br />
  14 + <br />
14 15 <?php if(!empty($errors)) { ?>
15 16 <span class='<?php echo $zmysql['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
16 17 <?php echo $zmysql['name']; ?>
17 18 <?php echo $zmysql['msg']; ?>
  19 + <br />
  20 + <br />
18 21 <?php } ?>
  22 +
  23 +<p class="disclaimer">
  24 + <?php if(WINDOWS_OS) { ?>
  25 + [START MENU] => [Programs] => [KnowledgeTree 3.7.x] => [Mysql]
  26 + <br/>
  27 + Right-Click and run [Start Mysql] as administrator, if applicable, or
  28 + <br/>
  29 + Click [Start Mysql]
  30 + <?php } else { ?>
  31 + #Ubuntu
  32 + <br/>
  33 + sudo /etc/init.d/mysql start
  34 + <br/>
  35 + #RedHat
  36 + <br/>
  37 + sudo /etc/init.d/mysqld start
  38 + <?php } ?>
  39 +</p>
  40 +<br />
19 41 </div>
20 42 <!-- <input class="button_next" type="submit" value="Continue Installation" name="BInstall"/>-->
21 43 <input class="button_next" type="submit" value="Next" name="Next"/>
... ...
setup/migrate/templates/database.tpl
  View file @c25dd6c
... ... @@ -6,43 +6,123 @@
6 6 </div>
7 7 <div id="step_content_<?php echo $step_name; ?>" class="step">
8 8 <?php if(empty($errors)) { ?>
9   -<p class="description">The Setup Wizard will now export your existing database in preparation for the migration to the new KnowledgeTree Stack.</p><br />
10   - <span class="error">Please ensure that your database is backed up before proceeding. If you need assistance with backing up see the &nbsp;<a class="description_click" target="_blank" href="http://wiki.knowledgetree.com/Backing_up_and_restoring_KnowledgeTree">'Backing up and restoring KnowledgeTree'</a>&nbsp; wiki entry.
  9 +<p class="description">The Setup Wizard will now export your existing database in preparation for the migration to the new KnowledgeTree Stack.</p>
  10 +<br />
  11 +<p class="description">
  12 + Ensure that the new Mysql server installed from your operating system's repository is not running
  13 +</p>
  14 +<br />
  15 +<p class="disclaimer">
  16 + <?php if(WINDOWS_OS) { ?>
  17 + [START MENU] => [Programs] => [KnowledgeTree 3.7.x] => [Mysql]
  18 + <br/>
  19 + Right-Click and run [Stop Mysql] as administrator, if applicable, or
  20 + <br/>
  21 + Click [Stop Mysql]
  22 + <?php } else { ?>
  23 + #Ubuntu
  24 + <br/>
  25 + sudo /etc/init.d/mysql stop
  26 + <br/>
  27 + #RedHat
  28 + <br/>
  29 + sudo /etc/init.d/mysqld stop
  30 + <?php } ?>
  31 +</p>
  32 +<br/>
  33 +<p class="description">
  34 + Ensure that the old KnowledgeTree 3.6.1 Mysql server is running
  35 +</p>
  36 +<p class="disclaimer">
  37 + <?php if(WINDOWS_OS) { ?>
  38 + [START MENU] => [Programs] => [KnowledgeTree 3.6.x] => [Control]
  39 + <br/>
  40 + Right-Click and run [Start Services] as administrator, if applicable, or
  41 + <br/>
  42 + Click [Start Services]
  43 + <?php } else { ?>
  44 + sudo <?php echo $location.DS; ?>dmsctl.sh start mysql
  45 + <?php } ?>
  46 +</p>
  47 +<br/>
  48 +<span class="error">
  49 + Ensure that your database is backed up before proceeding. If you need assistance with backing up see the &nbsp;
  50 + <a class="description_click" target="_blank" href="http://wiki.knowledgetree.com/Backing_up_and_restoring_KnowledgeTree">'Backing up and restoring KnowledgeTree'</a>&nbsp; wiki entry.
11 51 </span>
12   - <br /><br />
13   - <p class="description">Click <b>Next</b> to continue.</p>
  52 + <br />
  53 + <br />
  54 + <p class="description">Click <b>Next</b> to continue.</p>
14 55 <?php } ?>
15 56 <!--Handle a failed dump-->
16   - <?php if(isset($errors)) { ?>
17   - <?php
18   - foreach ($errors as $error) {
  57 +<?php if(!empty($errors)) { ?>
  58 + <?php
  59 + foreach ($errors as $error) {
  60 + ?>
  61 + <span class="error">
  62 + <?php
  63 + if(isset($error['error'])) {
  64 + echo $error['error'];
19 65 ?>
20   - <span class="error">
21   - <?php
22   - if(isset($error['error'])) {
23   - echo $error['error'];
24   - ?>
25   - <br/><br/>
26   - <?php
27   - }
28   - ?>
29   - </span>
30   - <?php
31   - if(isset($error['msg'])) {
32   - echo $error['msg'];
33   - ?>
34   - <br/><br/>
35   - <?php
36   - }
37   - ?>
38   -
39   - <?php
40   - if(isset($error['cmd'])) {
41   - echo $error['cmd'];
42   - }
43   - }
  66 + <br/><br/>
  67 + <?php
44 68 }
45   - ?>
  69 + ?>
  70 + </span>
  71 + <?php
  72 + //if(isset($error['msg'])) {
  73 + //echo $error['msg'];
  74 + ?>
  75 +<!-- <br/><br/>-->
  76 + <?php
  77 + //}
  78 + ?>
  79 + <?php
  80 + //if(isset($error['cmd'])) {
  81 +// echo $error['cmd'];
  82 + // }
  83 + }
  84 +?>
  85 +<p class="description">
  86 + Ensure that the new Mysql server installed from your operating system's repository is not running
  87 +</p>
  88 +<p class="disclaimer">
  89 + <?php if(WINDOWS_OS) { ?>
  90 + [START MENU] => [Programs] => [KnowledgeTree 3.7.x] => [Mysql]
  91 + <br/>
  92 + Right-Click and run [Stop Mysql] as administrator, if applicable, or
  93 + <br/>
  94 + Click [Stop Mysql]
  95 + <?php } else { ?>
  96 + #Ubuntu
  97 + <br/>
  98 + sudo /etc/init.d/mysql stop
  99 + <br/>
  100 + #RedHat
  101 + <br/>
  102 + sudo /etc/init.d/mysqld stop
  103 + <?php } ?>
  104 +</p>
  105 +<br/>
  106 +<p class="description">
  107 + Ensure that the old KnowledgeTree 3.6.1 Mysql server is running
  108 +</p>
  109 +<p class="disclaimer">
  110 + <?php if(WINDOWS_OS) { ?>
  111 + [START MENU] => [Programs] => [KnowledgeTree 3.6.x] => [Control]
  112 + <br/>
  113 + Right-Click and run [Start Services] as administrator, if applicable, or
  114 + <br/>
  115 + Click [Start Services]
  116 + <?php } else { ?>
  117 + sudo <?php echo $location.DS; ?>dmsctl.sh start mysql
  118 + <?php } ?>
  119 +</p>
  120 +<br/>
  121 +<?php
  122 + }
  123 + ?>
  124 +
  125 +
46 126 <br/>
47 127 </div>
48 128 </div>
... ...
setup/migrate/templates/installation.tpl
  View file @c25dd6c
... ... @@ -20,7 +20,7 @@
20 20 </p>
21 21  
22 22 <p class="description">
23   - Please enter the full path of the installation you wish to upgrade:
  23 + Enter the full path of the installation you wish to upgrade:
24 24 </p>
25 25  
26 26 <input id="location" name="location" type="text" style="width:430px; float:left" value="<?php if($location) echo $location; ?>">
... ...
setup/migrate/templates/installation_confirm.tpl
  View file @c25dd6c
... ... @@ -5,7 +5,7 @@
5 5 if(!$errors && !$warnings) {
6 6 ?>
7 7 <span class='big_ok'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
8   - Installation has been detected. Please confirm system settings.
  8 + Installation has been detected. Confirm system settings.
9 9 <br/><br/>
10 10 <?php
11 11 }
... ... @@ -27,7 +27,7 @@
27 27 <!--Content-->
28 28 <div id="step_content_<?php echo $step_name; ?>" class="step">
29 29 <p class="empty_space">
30   - Please verify your current installation settings.
  30 + Verify your current installation settings.
31 31 </p>
32 32 <h3>Installation Settings</h3>
33 33 <table class="conf_paths">
... ...
setup/migrate/templates/services.tpl
  View file @c25dd6c
... ... @@ -9,7 +9,7 @@
9 9 if(!$errors && !$warnings) {
10 10 ?>
11 11 <span class='big_ok'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
12   - All services have been shut down. Please click next to continue.
  12 + All services have been shut down. Click next to continue.
13 13 <br/><br/>
14 14 <?php
15 15 }
... ... @@ -38,7 +38,7 @@
38 38 <?php } else { ?>
39 39 All services are uninstalled.
40 40 <?php } ?>
41   - <h3><?php echo "<span class='{$serviceCheck}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Please shutdown the following services</h3>
  41 + <h3><?php echo "<span class='{$serviceCheck}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Shutdown the following services</h3>
42 42 <?php if($silent) { ?>
43 43 <?php if($serviceCheck != 'tick') {
44 44 $details = 'Hide Details';
... ...
setup/upgrade/session.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ...
setup/upgrade/step.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ... @@ -476,6 +475,20 @@ class Step
476 475 protected function storeSilent() {
477 476  
478 477 }
  478 +
  479 + /**
  480 + * Is the installation
  481 + *
  482 + * @author KnowledgeTree Team
  483 + * @param none
  484 + * @access public
  485 + * @return string
  486 + */
  487 + public function isCe() {
  488 + if($this->util->getVersionType() == "community")
  489 + return true;
  490 + return false;
  491 + }
479 492 }
480 493  
481 494 ?>
482 495 \ No newline at end of file
... ...
setup/upgrade/steps/upgradeBackup.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ...
setup/upgrade/steps/upgradeComplete.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ...
setup/upgrade/steps/upgradeDatabase.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ...
setup/upgrade/steps/upgradeErrors.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ...
setup/upgrade/steps/upgradeInstallation.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ...
setup/upgrade/steps/upgradeRestore.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ...
setup/upgrade/steps/upgradeWelcome.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ...
setup/upgrade/upgradeUtil.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ...
setup/wizard/installUtil.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ...
setup/wizard/lib/helpers/htmlHelper.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ...
setup/wizard/lib/services/service.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ...
setup/wizard/lib/services/unixAgent.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ...
setup/wizard/lib/services/unixLucene.php
  View file @c25dd6c
1 1 <?php
2 2 /**
3   -* Unix Lucene Service Controller.
  3 +* Unix Lucene Service Controller.
4 4 *
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ... @@ -51,7 +50,7 @@ class unixLucene extends unixService {
51 50 private $javaXmx;
52 51 public $name = "KTLucene";
53 52 public $hrname = "KnowledgeTree Indexer Service";
54   -
  53 +
55 54 /**
56 55 * Load defaults needed by service
57 56 *
... ... @@ -70,76 +69,76 @@ class unixLucene extends unixService {
70 69 $this->setLuceneSourceLoc("ktlucene.jar");
71 70 $this->setShutdownScript("shutdown.php");
72 71 }
73   -
74   -
  72 +
  73 +
75 74 public function setIndexerDir($indexerDir) {
76 75 $this->indexerDir = $indexerDir;
77 76 }
78   -
  77 +
79 78 private function getIndexerDir() {
80 79 return $this->indexerDir;
81 80 }
82   -
  81 +
83 82 private function setShutdownScript($shutdownScript) {
84 83 $this->shutdownScript = $shutdownScript;
85 84 }
86   -
  85 +
87 86 public function getShutdownScript() {
88 87 return $this->shutdownScript;
89 88 }
90   -
  89 +
91 90 private function setLucenePidFile($lucenePidFile) {
92 91 $this->lucenePidFile = $lucenePidFile;
93 92 }
94   -
  93 +
95 94 private function getLucenePidFile() {
96 95 return $this->lucenePidFile;
97 96 }
98   -
  97 +
99 98 private function setLuceneDir($luceneDir) {
100 99 $this->luceneDir = $luceneDir;
101 100 }
102   -
  101 +
103 102 public function getLuceneDir() {
104 103 return $this->luceneDir;
105 104 }
106   -
  105 +
107 106 private function setJavaXms($javaXms) {
108 107 $this->javaXms = "-Xms$javaXms";
109 108 }
110   -
  109 +
111 110 public function getJavaXms() {
112 111 return $this->javaXms;
113 112 }
114   -
  113 +
115 114 private function setJavaXmx($javaXmx) {
116 115 $this->javaXmx = "-Xmx$javaXmx";
117 116 }
118   -
  117 +
119 118 public function getJavaXmx() {
120 119 return $this->javaXmx;
121 120 }
122   -
  121 +
123 122 private function setLuceneSource($luceneSource) {
124 123 $this->luceneSource = $luceneSource;
125 124 }
126   -
  125 +
127 126 public function getLuceneSource() {
128 127 return $this->luceneSource;
129 128 }
130   -
  129 +
131 130 private function setLuceneSourceLoc($luceneSourceLoc) {
132 131 $this->luceneSourceLoc = $this->getLuceneDir().$luceneSourceLoc;
133 132 }
134   -
  133 +
135 134 public function getLuceneSourceLoc() {
136 135 return $this->luceneSourceLoc;
137 136 }
138   -
  137 +
139 138 public function getJavaOptions() {
140 139 return " {$this->getJavaXmx()} {$this->getJavaXmx()} -jar ";
141 140 }
142   -
  141 +
143 142 /**
144 143 * Stop Service
145 144 *
... ... @@ -157,7 +156,7 @@ class unixLucene extends unixService {
157 156 }
158 157 return $state;
159 158 }
160   -
  159 +
161 160 public function install() {
162 161 $status = $this->status();
163 162 if($status == '') {
... ... @@ -166,7 +165,7 @@ class unixLucene extends unixService {
166 165 return $status;
167 166 }
168 167 }
169   -
  168 +
170 169 public function status() {
171 170 $cmd = "ps ax | grep ".$this->getLuceneSource();
172 171 $response = $this->util->pexec($cmd);
... ... @@ -183,14 +182,14 @@ class unixLucene extends unixService {
183 182 return '';
184 183 }
185 184 }
186   -
  185 +
187 186 return '';
188 187 }
189   -
  188 +
190 189 public function uninstall() {
191 190 $this->stop();
192 191 }
193   -
  192 +
194 193 /**
195 194 * Start Service
196 195 *
... ... @@ -213,26 +212,26 @@ class unixLucene extends unixService {
213 212 // return false;
214 213 // }
215 214 //$response = $this->util->pexec($cmd);
216   -
  215 +
217 216 // return $response;
218 217 return false;
219 218 }
220   -
  219 +
221 220 return true;
222 221 }
223   -
  222 +
224 223 public function getName() {
225 224 return $this->name;
226 225 }
227   -
  226 +
228 227 public function getHRName() {
229 228 return $this->hrname;
230 229 }
231   -
  230 +
232 231 public function getStopMsg($installDir) {
233 232 return "";//"Execute from terminal : $installDir/dmsctl.sh stop";
234 233 }
235   -
  234 +
236 235 /**
237 236 * Write Lucene Service property file
238 237 *
... ... @@ -243,7 +242,7 @@ class unixLucene extends unixService {
243 242 */
244 243 private function writeLuceneProperties() {
245 244 // Check if bin is readable and writable
246   - $fileLoc = $this->getluceneDir()."KnowledgeTreeIndexer.properties";
  245 + $fileLoc = $this->getluceneDir(). "KnowledgeTreeIndexer.properties";
247 246 $fp = fopen($fileLoc, "w+");
248 247 $content = "server.port=8875\n";
249 248 $content .= "server.paranoid=false\n";
... ... @@ -251,7 +250,7 @@ class unixLucene extends unixService {
251 250 $content .= "server.deny=\n";
252 251 $conf = $this->util->getDataFromSession('configuration');
253 252 $varDirectory = $conf['paths']['varDirectory']['path'];
254   - $content .= "indexer.directory=$varDirectory\n";
  253 + $content .= "indexer.directory=$varDirectory" . DS . "indexes\n";
255 254 $content .= "indexer.analyzer=org.apache.lucene.analysis.standard.StandardAnalyzer\n";
256 255 fwrite($fp, $content);
257 256 fclose($fp);
... ...
setup/wizard/lib/services/unixOpenOffice.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ...
setup/wizard/lib/services/unixScheduler.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ...
setup/wizard/lib/services/unixService.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ...
setup/wizard/lib/services/windowsAgent.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ...
setup/wizard/lib/services/windowsLucene.php
  View file @c25dd6c
... ... @@ -5,7 +5,7 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright (C) 2008,2009 KnowledgeTree Inc.
8   -*
  8 +*
9 9 *
10 10 * This program is free software; you can redistribute it and/or modify it under
11 11 * the terms of the GNU General Public License version 3 as published by the
... ... @@ -135,7 +135,7 @@ class windowsLucene extends windowsService {
135 135 public $hrname = "KnowledgeTree Indexer Service. (KTLucene)";
136 136  
137 137 public $description = "KnowledgeTree Indexer Service.";
138   -
  138 +
139 139 /**
140 140 * Load defaults needed by service
141 141 *
... ... @@ -464,15 +464,15 @@ class windowsLucene extends windowsService {
464 464  
465 465 return '';
466 466 }
467   -
  467 +
468 468 public function getHRName() {
469 469 return $this->hrname;
470 470 }
471   -
  471 +
472 472 public function getStopMsg($installDir) {
473 473 return "";//"Execute from command prompt : $installDir/dmsctl.bat stop";
474 474 }
475   -
  475 +
476 476 /**
477 477 * Write Lucene Service property file
478 478 *
... ... @@ -483,7 +483,7 @@ class windowsLucene extends windowsService {
483 483 */
484 484 private function writeLuceneProperties() {
485 485 // Check if bin is readable and writable
486   - $fileLoc = $this->getluceneDir()."KnowledgeTreeIndexer.properties";
  486 + $fileLoc = $this->getluceneDir(). DS ."KnowledgeTreeIndexer.properties";
487 487 $fp = fopen($fileLoc, "w+");
488 488 $content = "server.port=8875\n";
489 489 $content .= "server.paranoid=false\n";
... ... @@ -491,7 +491,8 @@ class windowsLucene extends windowsService {
491 491 $content .= "server.deny=\n";
492 492 $conf = $this->util->getDataFromSession('configuration');
493 493 $varDirectory = $conf['paths']['varDirectory']['path'];
494   - $content .= "indexer.directory=$varDirectory\n";
  494 + // on Windows the path needs to be escaped or the Java Lucene code cannot understand it
  495 + $content .= "indexer.directory=" . str_replace('\\', '/', $varDirectory . DS . "indexes") . "\n";
495 496 $content .= "indexer.analyzer=org.apache.lucene.analysis.standard.StandardAnalyzer\n";
496 497 fwrite($fp, $content);
497 498 fclose($fp);
... ...
setup/wizard/lib/services/windowsOpenOffice.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ...
setup/wizard/lib/services/windowsService.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ...
setup/wizard/lib/tests/configurationStep.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ...
setup/wizard/lib/tests/databaseStep.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ...
setup/wizard/lib/tests/servicesStep.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ...
setup/wizard/lib/tests/tests.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ...
setup/wizard/lib/validation/luceneValidation.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ...
setup/wizard/lib/validation/openofficeValidation.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ...
setup/wizard/lib/validation/schedulerValidation.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ...
setup/wizard/lib/validation/serviceValidation.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ...
setup/wizard/resources/js/wizard.js
  View file @c25dd6c
... ... @@ -85,27 +85,27 @@ wizard.prototype.valRegHelper = function() {
85 85 var last = $("#last");
86 86 var email = $("#email");
87 87 if(first.attr('value').length < 1) {
88   - $("#reg_error").html('Please enter a First Name');
  88 + $("#reg_error").html('Enter a First Name');
89 89 w.focusElement(first);
90 90 return false;
91 91 }
92 92 if(!w.nameCheck(first.attr('value'))) {
93   - $("#reg_error").html('Please enter a valid First Name');
  93 + $("#reg_error").html('Enter a valid First Name');
94 94 w.focusElement(first);
95 95 return false;
96 96 }
97 97 if(last.attr('value').length < 1) {
98   - $("#reg_error").html('Please enter a Last Name');
  98 + $("#reg_error").html('Enter a Last Name');
99 99 w.focusElement(last);
100 100 return false;
101 101 }
102 102 if(!w.nameCheck(last.attr('value'))) {
103   - $("#reg_error").html('Please enter a valid Last Name');
  103 + $("#reg_error").html('Enter a valid Last Name');
104 104 w.focusElement(last);
105 105 return false;
106 106 }
107 107 if(!w.emailCheck(email.attr('value'))) {
108   - $("#reg_error").html('Please enter a valid email address');
  108 + $("#reg_error").html('Enter a valid email address');
109 109 w.focusElement(email);
110 110 return false;
111 111 }
... ...
setup/wizard/session.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ...
setup/wizard/step.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ... @@ -104,10 +103,15 @@ class Step
104 103 */
105 104 protected $silent = false;
106 105  
  106 + /**
  107 + * Flag if step needs to show confirm page first
  108 + *
  109 + * @author KnowledgeTree Team
  110 + * @access public
  111 + * @var boolean
  112 + */
107 113 public $displayFirst = false;
108 114  
109   - private $salt = 'installers';
110   -
111 115 /**
112 116 * Reference to utility object
113 117 *
... ... @@ -116,10 +120,20 @@ class Step
116 120 * @var object
117 121 */
118 122 public $util;
  123 +
  124 + /**
  125 + * Session salt
  126 + *
  127 + * @author KnowledgeTree Team
  128 + * @access public
  129 + * @var boolean
  130 + */
  131 + private $salt = 'installers';
119 132  
120 133 public function __construct() {
121 134 $this->util = new InstallUtil();
122 135 }
  136 +
123 137 /**
124 138 * Returns step state
125 139 *
... ... @@ -445,6 +459,21 @@ class Step
445 459 public function setErrors($error) {
446 460 $this->error = $error;
447 461 }
  462 +
  463 + /**
  464 + * Is the installation
  465 + *
  466 + * @author KnowledgeTree Team
  467 + * @param none
  468 + * @access public
  469 + * @return string
  470 + */
  471 + public function isCe() {
  472 + if($this->util->getVersionType() == "community")
  473 + return true;
  474 + return false;
  475 + }
  476 +
448 477 }
449 478  
450 479 ?>
451 480 \ No newline at end of file
... ...
setup/wizard/steps/complete.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ...
setup/wizard/steps/configuration.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ... @@ -408,15 +407,14 @@ class configuration extends Step
408 407 $server['host'] = array('name' => 'Host', 'setting' => 'server_name', 'where' => 'db', 'value' => $host);
409 408 $server['port'] = array('name' => 'Port', 'setting' => 'server_port', 'where' => 'db', 'value' => $port);
410 409 $server['ssl_enabled'] = array('name' => 'SSL Enabled', 'section' => 'KnowledgeTree', 'setting' => 'sslEnabled', 'where' => 'file', 'value' => $ssl_enabled);
411   -
412 410 if(empty($server['host']['value']))
413   - $this->error[] = 'Please enter the servers host name';
  411 + $this->error[] = 'Enter the servers host name';
414 412  
415 413 if(empty($server['port']['value']))
416   - $this->error[] = 'Please enter the servers port';
  414 + $this->error[] = 'Enter the servers port';
417 415  
418 416 if(empty($server['file_system_root']['value']))
419   - $this->error[] = 'Please enter the file system root';
  417 + $this->error[] = 'Enter the file system root';
420 418  
421 419 return $server;
422 420 }
... ...
setup/wizard/steps/database.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ... @@ -311,11 +310,11 @@ class database extends Step
311 310 }
312 311 $this->util->dbUtilities->load($this->dhost, $this->dport, $this->duname, $this->dpassword, $this->dname);
313 312 if (!$this->util->dbUtilities->getDatabaseLink()) {
314   - $this->error['con'] = "Could not connect to the database, please check username and password";
  313 + $this->error['con'] = "Could not connect to the database, check username and password";
315 314 return false;
316 315 } else {
317 316 if ($this->dbExists()) { // Check if database Exists
318   - $this->error['dname'] = 'Database Already Exists, please specify a different name'; // Reset usage errors
  317 + $this->error['dname'] = 'Database Already Exists, specify a different name'; // Reset usage errors
319 318 return false;
320 319 } else {
321 320 $this->error = array(); // Reset usage errors
... ...
setup/wizard/steps/dependencies.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ... @@ -360,7 +359,7 @@ class dependencies extends Step
360 359 */
361 360 private function getConfigurations()
362 361 {
363   - return array(
  362 + $conf = array(
364 363 array('name' => 'Safe Mode', 'configuration' => 'safe_mode', 'recommended' => 'OFF', 'type' => 'bool'),
365 364 array('name' => 'Display Errors', 'configuration' => 'display_errors', 'recommended' => 'OFF', 'type' => 'bool'),
366 365 array('name' => 'Display Startup Errors', 'configuration' => 'display_startup_errors', 'recommended' => 'OFF', 'type' => 'bool'),
... ... @@ -375,6 +374,11 @@ class dependencies extends Step
375 374 array('name' => 'Open base directory', 'configuration' => 'open_basedir', 'recommended' => 'unset', 'type' => 'empty'),
376 375 array('name' => 'Default MIME type', 'configuration' => 'default_mimetype', 'recommended' => 'text/html', 'type' => 'string'),
377 376 );
  377 + if(!WINDOWS_OS) { // Remove linux settings
  378 + unset($conf[1]);
  379 + unset($conf[2]);
  380 + }
  381 + return $conf;
378 382 }
379 383  
380 384 /**
... ...
setup/wizard/steps/errors.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ...
setup/wizard/steps/install.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ... @@ -105,10 +104,15 @@ class install extends step
105 104 {
106 105 $this->callHome();
107 106 if ($this->util->isMigration()) { // copy indexing directory if this is a migration
108   - $migrateSessionData = $this->getDataFromPackage('migrate', 'installation');
109   - $configSessionData = $this->getDataFromSession('configuration');
  107 + $migrateSessionData = $this->getDataFromPackage('migrate', 'installation');
  108 + $configSessionData = $this->getDataFromSession('configuration');
110 109 $src = $migrateSessionData['location'] . DS . 'var' . DS . 'indexes';
111   - $dst = $configSessionData['paths']['varDirectory']['path'] . DS . 'indexes';
  110 +
  111 + if(WINDOWS_OS){
  112 + $dst = $configSessionData['paths']['varDirectory']['path'] . DS . 'indexes';
  113 + }else{
  114 + $dst = $configSessionData['paths']['varDirectory']['path'];
  115 + }
112 116 $this->util->copyDirectory($src, $dst);
113 117 }
114 118 }
... ... @@ -126,11 +130,11 @@ class install extends step
126 130 }
127 131 $this->temp_variables['ce_check'] = $this->ce_check;
128 132 }
129   -
  133 +
130 134 function registerPlugins() {
131   -
  135 +
132 136 }
133   -
  137 +
134 138 public function callHome() {
135 139 $conf = $this->getDataFromSession("install"); // retrieve database information from session
136 140 $dbconf = $this->getDataFromSession("database");
... ... @@ -143,7 +147,7 @@ class install extends step
143 147 $this->util->dbUtilities->query($query);
144 148 $this->util->dbUtilities->close(); // close the database connection
145 149 }
146   -
147   -
  150 +
  151 +
148 152 }
149 153 ?>
150 154 \ No newline at end of file
... ...
setup/wizard/steps/installtype.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ...
setup/wizard/steps/license.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ... @@ -76,11 +75,11 @@ class license extends step {
76 75 if($_POST['license']) {
77 76 return true;
78 77 } else {
79   - $this->error[] = "Please accept the license agreement";
  78 + $this->error[] = "Accept the license agreement";
80 79 return false;
81 80 }
82 81 }
83   - $this->error[] = "Please accept the license agreement";
  82 + $this->error[] = "Accept the license agreement";
84 83 return false;
85 84 }
86 85  
... ...
setup/wizard/steps/registration.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ...
setup/wizard/steps/services.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ...
setup/wizard/steps/welcome.php
  View file @c25dd6c
... ... @@ -5,7 +5,6 @@
5 5 * KnowledgeTree Community Edition
6 6 * Document Management Made Simple
7 7 * Copyright(C) 2008,2009 KnowledgeTree Inc.
8   -* Portions copyright The Jam Warehouse Software(Pty) Limited
9 8 *
10 9 * This program is free software; you can redistribute it and/or modify it under
11 10 * the terms of the GNU General Public License version 3 as published by the
... ...
setup/wizard/templates/configuration.tpl
  View file @c25dd6c
... ... @@ -9,7 +9,7 @@
9 9 if(!$errors && !$warnings) {
10 10 ?>
11 11 <span class='big_ok'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
12   - All configuration settings are correctly set. Please click next to continue.
  12 + All configuration settings are correctly set. Click next to continue.
13 13 <br/><br/>
14 14 <?php
15 15 }
... ...
setup/wizard/templates/configuration_confirm.tpl
  View file @c25dd6c
... ... @@ -4,7 +4,7 @@
4 4 <?php
5 5 if(!$errors && !$warnings) {
6 6 ?>
7   - <span class='big_ok'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class='continue_message'>All configuration settings are correctly set. Please click next to continue.</span><br/><br/>
  7 + <span class='big_ok'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class='continue_message'>All configuration settings are correctly set. Click next to continue.</span><br/><br/>
8 8 <?php
9 9 }
10 10 ?>
... ...
setup/wizard/templates/database.tpl
  View file @c25dd6c
... ... @@ -68,12 +68,12 @@
68 68 </tr>
69 69 <tr>
70 70 <td> <label for='dport'>Port: </label> </td>
71   - <td> <div id="tooltips" title="The port on which your database server is listening, if it is a non-standard port please enter the number here">&nbsp;</div> </td>
  71 + <td> <div id="tooltips" title="The port on which your database server is listening, if it is a non-standard port enter the number here">&nbsp;</div> </td>
72 72 <td> <input type="text" value="<?php echo $dport?>" id="dport" name="dport" size='10' class="textinput" style="float:left"/> </td>
73 73 </tr>
74 74 <tr>
75 75 <td> <label for='dbbinary'>Socket: </label> </td>
76   - <td> <div id="tooltips" title="The path to the database binary. If it is not on your system path then please enter it here">&nbsp;</div> </td>
  76 + <td> <div id="tooltips" title="The path to the database binary. If it is not on your system path then enter it here">&nbsp;</div> </td>
77 77 <td> <input type="text" value="<?php echo $dbbinary?>" id="dbbinary" name="dbbinary" size='<?php echo $input_size; ?>' class="textinput"/> </td>
78 78 </tr>
79 79 </table>
... ... @@ -96,17 +96,17 @@ An administrative user is required for creating tables within the database.
96 96 <tr style="<?php if ($silent) echo 'display:none' ;?>">
97 97 <td><label for='dmsname'>Enter the name of the Database Administrative User: </label></td>
98 98 <td><input type='text' value="<?php echo $dmsname; ?>" id='dmsname' name='dmsname' size='40' /></td>
99   - <td id="error_1_2" class="error" style="display:none">Please Enter A Username</td>
  99 + <td id="error_1_2" class="error" style="display:none">Enter A Username</td>
100 100 </tr>
101 101 <tr>
102 102 <td><label for='dmspassword'>Enter a password for the Administrative User: </label></td>
103 103 <td><input type='password' value="<?php echo $dmspassword; ?>" id='dmspassword' name='dmspassword' size='40' /></td>
104   - <td id="error_2_2" class="error" style="display:none">Please Enter A Password</td>
  104 + <td id="error_2_2" class="error" style="display:none">Enter A Password</td>
105 105 </tr>
106 106 <tr>
107   - <td><label for='dmspassword2'>Please confirm the password: </label></td>
  107 + <td><label for='dmspassword2'>Confirm the password: </label></td>
108 108 <td><input type='password' value="<?php echo $dmspassword; ?>" id='dmspassword2' name='dmspassword2' size='40' /></td>
109   - <td id="error_3_2" class="error" style="display:none">Please Confirm Password</td>
  109 + <td id="error_3_2" class="error" style="display:none">Confirm Password</td>
110 110 <td id="error_4_2" class="error" style="display:none">Passwords Do Not Match</td>
111 111 </tr>
112 112 </table>
... ... @@ -125,17 +125,17 @@ An second user is required for normal database interaction, the reading and writ
125 125 <tr style="<?php if ($silent) echo 'display:none' ;?>">
126 126 <td><label for='dmsusername'>Enter a name for the User: </label></td>
127 127 <td><input type='text' value="<?php echo $dmsusername; ?>" id='dmsusername' name='dmsusername' size='40' /></td>
128   - <td id="error_1_3" class="error" style="display:none">Please Enter A Username</td>
  128 + <td id="error_1_3" class="error" style="display:none">Enter A Username</td>
129 129 </tr>
130 130 <tr>
131 131 <td><label for='dmsuserpassword'>Enter a password: </label></td>
132 132 <td><input type='password' value="<?php echo $dmsuserpassword?>" id='dmsuserpassword' name='dmsuserpassword' size='40' /></td>
133   - <td id="error_2_3" class="error" style="display:none">Please Enter A Password</td>
  133 + <td id="error_2_3" class="error" style="display:none">Enter A Password</td>
134 134 </tr>
135 135 <tr>
136   - <td><label for='dmsuserpassword2'>Please confirm the password: </label></td>
  136 + <td><label for='dmsuserpassword2'>Confirm the password: </label></td>
137 137 <td><input type='password' value="<?php echo $dmsuserpassword?>" id='dmsuserpassword2' name='dmsuserpassword2' size='40' /></td>
138   - <td id="error_3_3" class="error" style="display:none">Please Confirm Password</td>
  138 + <td id="error_3_3" class="error" style="display:none">Confirm Password</td>
139 139 <td id="error_4_3" class="error" style="display:none">Passwords Do Not Match</td>
140 140 </tr>
141 141 </table>
... ...
setup/wizard/templates/database_confirm.tpl
  View file @c25dd6c
... ... @@ -2,7 +2,7 @@
2 2 <p class="title">Confirming Database Configurations</p>
3 3  
4 4 <div class="description">
5   - Please confirm whether KnowledgeTree has correctly determined your database settings before proceeding. Print this page for future use. <a href="javascript:window.print()">Click to Print This Page</a>
  5 + Confirm whether KnowledgeTree has correctly determined your database settings before proceeding. Print this page for future use. <a href="javascript:window.print()">Click to Print This Page</a>
6 6 </div>
7 7 <div id="step_content_<?php echo $step_name; ?>_confirm" class="step">
8 8 <h3><b>Database Settings</b></h3>
... ...
setup/wizard/templates/license.tpl
  View file @c25dd6c
... ... @@ -6,7 +6,7 @@
6 6 }
7 7 }?>
8 8 <p class="description_1">
9   -Please read and accept the license agreement below before continuing with the setup.
  9 +Read and accept the license agreement below before continuing with the setup.
10 10 </p>
11 11  
12 12 <?php if(!empty($errors)) { ?>
... ...
setup/wizard/templates/registration.tpl
  View file @c25dd6c
... ... @@ -21,7 +21,7 @@
21 21 <input type="hidden" id="state" name="" />
22 22 <p class='disclaimer'>
23 23 We will not share your information with 3rd-parties, nor will we send you information not directly related to KnowledgeTree's products
24   - and services. Please see our <a href="http://www.knowledgetree.com/about/legal" target="_blank">Privacy and Data Retention policies</a> for more information.
  24 + and services. See our <a href="http://www.knowledgetree.com/about/legal" target="_blank">Privacy and Data Retention policies</a> for more information.
25 25 </p>
26 26 <br/>
27 27 <div id="step_content_<?php echo $step_name; ?>" class="step">
... ...
setup/wizard/templates/services.tpl
  View file @c25dd6c
... ... @@ -15,7 +15,7 @@
15 15 if(!$errors && !$warnings) {
16 16 ?>
17 17 <span class='big_ok'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
18   - All service dependencies are met. Please click next to continue.
  18 + All service dependencies are met. Click next to continue.
19 19 <br/><br/>
20 20 <?php
21 21 }
... ...
templates/ktcore/search2/reporting/rescheduledocuments.smarty
  View file @c25dd6c
... ... @@ -4,12 +4,25 @@
4 4  
5 5 <form name="rescheduleAllDocs" action="{$smarty.server.PHP_SELF}" method="POST">
6 6 <br>
7   -{if $rescheduleDone == true}
8   -<p>Documents Rescheduled</p>
9   -<p>You can view the schedule queue <a href=admin.php?kt_path_info=search/pendingdocuments>here</a></p>
  7 +<h4>{i18n}Reschedule All Documents for Indexing{/i18n}</h4>
  8 +<p class='descriptiveText'>{i18n}Schedule all documents in the repository to be indexed.{/i18n}</p>
  9 +{if $rescheduleDone == 'true'}
  10 +<p style="padding-top: 5px;">{i18n}All documents have been rescheduled for indexing.{/i18n}</p>
  11 +<p><a href=admin.php?kt_path_info=search/pendingdocuments>{i18n}View the indexing queue.{/i18n}</a></p>
  12 +{/if}
10 13 <br>
  14 +<input type="submit" name="Reschedule" value="{i18n}Reschedule All{/i18n}" onclick="document.getElementById('rescheduleValue').value='reschedule';" />
  15 +
  16 +<br><br><br>
  17 +<h4>{i18n}Reschedule All Documents for Processing{/i18n}</h4>
  18 +<p class='descriptiveText'>{i18n}Schedule all documents in the repository to be processed. Processing involves the conversion of documents into PDF format and the generation of thumbnails.{/i18n}</p>
  19 +{if $reprocessDone == 'true'}
  20 +<p style="padding-top: 5px;">{i18n}All documents have been rescheduled for processing.{/i18n}</p>
11 21 {/if}
12   -<input type="submit" name="Reschedule" value="{i18n}Reschedule All{/i18n}" />
13   -<input type="hidden" name="rescheduleValue" id="rescheduleValue" value="reschedule" />
  22 +<br>
  23 +<input type="submit" name="Reprocess" value="{i18n}Reschedule All{/i18n}" onclick="document.getElementById('rescheduleValue').value='reprocess';" />
14 24  
  25 +<input type="hidden" name="rescheduleDone" id="rescheduleDone" value="{$rescheduleDone}" />
  26 +<input type="hidden" name="reprocessDone" id="reprocessDone" value="{$reprocessDone}" />
  27 +<input type="hidden" name="rescheduleValue" id="rescheduleValue" value="reschedule" />
15 28 </form>
16 29 \ No newline at end of file
... ...