diff --git a/bin/schedulerTask.sh b/bin/schedulerTask.sh deleted file mode 100755 index a2080b4..0000000 --- a/bin/schedulerTask.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -cd /var/www/installers/knowledgetree/bin/ -while true; do -php -Cq scheduler.php -sleep 30 -done \ No newline at end of file diff --git a/ktapi/ktapi.inc.php b/ktapi/ktapi.inc.php index 0d3560e..34360e1 100644 --- a/ktapi/ktapi.inc.php +++ b/ktapi/ktapi.inc.php @@ -3280,7 +3280,7 @@ class KTAPI $url = $download_manager->allow_download($document); $response['status_code'] = 0; - $response['results'] = $url; + $response['results'] = urlencode($url); return $response; } diff --git a/setup/wizard/lib/helpers/phpinfo.php b/setup/wizard/lib/helpers/phpinfo.php new file mode 100644 index 0000000..ccddb96 --- /dev/null +++ b/setup/wizard/lib/helpers/phpinfo.php @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/setup/wizard/lib/services/unixScheduler.php b/setup/wizard/lib/services/unixScheduler.php index f385ac3..699bfc0 100644 --- a/setup/wizard/lib/services/unixScheduler.php +++ b/setup/wizard/lib/services/unixScheduler.php @@ -95,7 +95,7 @@ class unixScheduler extends unixService { } function writeSchedulerTask() { - $fp = fopen($this->getSchedulerDir().$this->getSchedulerSource(), "w+"); + $fp = @fopen($this->getSchedulerDir().$this->getSchedulerSource(), "w+"); $content = "#!/bin/sh\n"; $content .= "cd ".$this->getSchedulerDir()."\n"; $content .= "while true; do\n"; @@ -103,8 +103,9 @@ class unixScheduler extends unixService { $content .= "php -Cq scheduler.php\n"; $content .= "sleep 30\n"; $content .= "done"; - fwrite($fp, $content); - fclose($fp); + @fwrite($fp, $content); + @fclose($fp); + @chmod($this->getSchedulerDir().$this->getSchedulerSource(), '644'); } function install() { @@ -146,6 +147,8 @@ class unixScheduler extends unixService { } function start() { + // TODO : Write sh on the fly? Not sure the reasoning here + $this->writeSchedulerTask(); $source = $this->getSchedulerSourceLoc(); if($source) { // Source $cmd = "nohup ".$source." > ".SYS_LOG_DIR."scheduler.log 2>&1 & echo $!"; diff --git a/setup/wizard/path.php b/setup/wizard/path.php index 844145d..214398a 100644 --- a/setup/wizard/path.php +++ b/setup/wizard/path.php @@ -102,7 +102,8 @@ define('PHP_DIR', $zendsys."ZendServer".DS."bin".DS); } else { $modules = get_loaded_extensions(); - if(in_array('Zend Monitor', $modules)) { // TODO: Dirty + // TODO: Dirty + if(in_array('Zend Download Server', $modules) || in_array('Zend Monitor', $modules) || in_array('Zend Utils', $modules) || in_array('Zend Page Cache', $modules)) { define('INSTALL_TYPE', 'Zend'); define('PHP_DIR', ''); } else { diff --git a/setup/wizard/resources/wizard.css b/setup/wizard/resources/wizard.css index d4deb1b..17227de 100644 --- a/setup/wizard/resources/wizard.css +++ b/setup/wizard/resources/wizard.css @@ -176,7 +176,7 @@ select { .error { font-weight: bold; - color: #9F0000; + color: red; } .errors { @@ -264,4 +264,8 @@ input#dname { #section { /*border:1px solid;*/ +} + +sup { + font-size: 11px; } \ No newline at end of file diff --git a/setup/wizard/resources/wizard.js b/setup/wizard/resources/wizard.js index c581ddd..fce0d9a 100644 --- a/setup/wizard/resources/wizard.js +++ b/setup/wizard/resources/wizard.js @@ -7,27 +7,6 @@ wizard.prototype.doFormCheck = function() { w.addReadOnly(); } -// Disable DnD on element -// Element has to have a readOnly status set to readonly -wizard.prototype.disableDnd = function(el_id) { -// el = document.getElementById(el_id); -// el.removeAttribute('readOnly'); -} - -// Add readOnly access on all inputs of a form -wizard.prototype.addReadOnly = function() { - inputs = document.getElementsByTagName('input'); - for(i=0;itemp_variables['docLocation'] = '
' . 'Your document directory is set to the default, which is inside the web root. ' . 'This may present a security problem if your documents can be accessed from the web, ' - . 'working around the permission system in KnowledgeTree.'; + . 'working around the permission system in KnowledgeTree®.'; $this->paths_check = 'cross_orange'; + $this->warnings[] = 'Move var directory'; } else { $this->temp_variables['docLocation'] = sprintf($html, 'tick', '', 'Your document directory is outside the web root.'); diff --git a/setup/wizard/steps/database.php b/setup/wizard/steps/database.php index 29cacc2..9ed9f7d 100644 --- a/setup/wizard/steps/database.php +++ b/setup/wizard/steps/database.php @@ -202,7 +202,7 @@ class database extends Step * @access public * @var array */ - public $temp_variables = array("step_name"=>"database"); + public $temp_variables = array(); /** * List of errors encountered diff --git a/setup/wizard/steps/dependencies.php b/setup/wizard/steps/dependencies.php index b255d17..9cf76d1 100644 --- a/setup/wizard/steps/dependencies.php +++ b/setup/wizard/steps/dependencies.php @@ -259,7 +259,7 @@ class dependencies extends Step if($phpversion6 != 1){ $this->done = false; - $check['version'] = "KnowledgeTree is not supported on PHP 6.0 and higher. You are running version {$phpversion}."; + $check['version'] = "KnowledgeTree® is not supported on PHP 6.0 and higher. You are running version {$phpversion}."; return $check; } $check['class'] = 'tick'; diff --git a/setup/wizard/steps/registration.php b/setup/wizard/steps/registration.php index 207913f..093af92 100644 --- a/setup/wizard/steps/registration.php +++ b/setup/wizard/steps/registration.php @@ -42,13 +42,16 @@ class registration extends Step { + + public $temp_variables = array("step_name"=>"registration"); + /** * Initialise the registration step * * @author KnowledgeTree Team * @access public */ - public function configure() + public function __construct() { $this->temp_variables = array("step_name"=>"registration"); } @@ -430,7 +433,8 @@ class registration extends Step 'RO' => 'ROMANIA', 'RU' => 'RUSSIAN FEDERATION', 'RW' => 'RWANDA', - 'BL' => 'SAINT BARTH�LEMY', +// TODO: Special Character for the e + 'BL' => 'SAINT BARTHELEMY', 'SH' => 'SAINT HELENA', 'KN' => 'SAINT KITTS AND NEVIS', 'LC' => 'SAINT LUCIA', diff --git a/setup/wizard/steps/services.php b/setup/wizard/steps/services.php index 8884a42..6b6668a 100644 --- a/setup/wizard/steps/services.php +++ b/setup/wizard/steps/services.php @@ -89,6 +89,24 @@ class services extends Step private $alreadyInstalled = false; /** + * Flag if services are already Installed + * + * @author KnowledgeTree Team + * @access private + * @var mixed + */ + private $luceneInstalled = false; + + /** + * Flag if services are already Installed + * + * @author KnowledgeTree Team + * @access private + * @var mixed + */ + private $schedulerInstalled = false; + + /** * PHP Installed * * @author KnowledgeTree Team @@ -302,6 +320,7 @@ class services extends Step return true; } + /** * Do some basic checks to help the user overcome java problems * @@ -759,9 +778,12 @@ class services extends Step */ private function storeSilent() { $this->temp_variables['alreadyInstalled'] = $this->alreadyInstalled; + $this->temp_variables['luceneInstalled'] = $this->luceneInstalled; + $this->temp_variables['schedulerInstalled'] = $this->schedulerInstalled; $this->temp_variables['javaExeError'] = $this->javaExeError; $this->temp_variables['javaCheck'] = $this->javaCheck; $this->temp_variables['javaExtCheck'] = $this->javaExtCheck; + // TODO : PHP detection $this->temp_variables['phpCheck'] = 'tick';//$this->phpCheck; $this->temp_variables['phpExeError'] = '';//$this->phpExeError; $this->temp_variables['serviceCheck'] = $this->serviceCheck; diff --git a/setup/wizard/templates/complete.tpl b/setup/wizard/templates/complete.tpl index 047728e..4385722 100644 --- a/setup/wizard/templates/complete.tpl +++ b/setup/wizard/templates/complete.tpl @@ -1,16 +1,16 @@

Installation Completed

-

KnowledgeTree post-configuration checkup

+

KnowledgeTree® post-configuration checkup

-

This allows you to check that your KnowledgeTree configuration is set +

This allows you to check that your KnowledgeTree® configuration is set up correctly. You can run this at any time after configuration to check that things are still set up correctly.

' - . '' - . 'Click Here for help on overcoming dependency issues
'; + . '' + . 'Click Here for help on overcoming post install issues
'; } ?> @@ -80,7 +80,7 @@ if($errors || $warnings){
- + Refresh Goto Login System Configuration

-This check ensures that KnowledgeTree is correctly configured to run. +This check ensures that KnowledgeTree® is correctly configured to run.

@@ -9,7 +9,7 @@ This check ensures that KnowledgeTree is correctly configured to run.

Server Settings

-The settings below have been drawn from the system information. The host and port should reflect the host and port that will be used to access KnowledgeTree. The Root Url is only needed if your installation is in a directory off the main web server root. +The settings below have been drawn from the system information. The host and port should reflect the host and port that will be used to access KnowledgeTree®. The Root Url is only needed if your installation is in a directory off the main web server root.

@@ -55,7 +55,7 @@ The settings below have been drawn from the system information. The host and por -

Advanced Settings

+ +

Advanced Settings

- +
- + - + - + - +
Host: Host:
Port: Port:
Mysql Binary: Mysql Binary:
Table Prefix: Table Prefix:
-

Database Users

+

Database Users

- +
- + - + - + - +
DMS Admin Username: DMS Admin Username:
DMS Admin Password: DMS Admin Password:
DMS User Username: DMS User Username:
DMS User Password: DMS User Password:
diff --git a/setup/wizard/templates/dependencies.tpl b/setup/wizard/templates/dependencies.tpl index bed18cc..5569f9f 100644 --- a/setup/wizard/templates/dependencies.tpl +++ b/setup/wizard/templates/dependencies.tpl @@ -1,7 +1,7 @@

PHP Dependencies Check

-This checkup ensures that your environment is ready to support a KnowledgeTree installation.
+This checkup ensures that your environment is ready to support a KnowledgeTree® installation.
Settings marked in green are available, settings marked in orange are optional and settings marked in red are required.

@@ -32,7 +32,7 @@ if($silent) { ?> diff --git a/setup/wizard/templates/error.tpl b/setup/wizard/templates/error.tpl index 6f0f7ba..6cad844 100644 --- a/setup/wizard/templates/error.tpl +++ b/setup/wizard/templates/error.tpl @@ -1,5 +1,5 @@ - KnowledgeTree Installer + KnowledgeTree® Installer @@ -11,7 +11,7 @@
-

Welcome to the KnowledgeTree Setup Wizard

+

Welcome to the KnowledgeTree® Setup Wizard

".$error."
"; ?> diff --git a/setup/wizard/templates/errors.tpl b/setup/wizard/templates/errors.tpl index 5eeaaf0..ff2c3fb 100644 --- a/setup/wizard/templates/errors.tpl +++ b/setup/wizard/templates/errors.tpl @@ -1,4 +1,4 @@ -

Welcome to the KnowledgeTree Setup Wizard

+

Welcome to the KnowledgeTree® Setup Wizard

diff --git a/setup/wizard/templates/license.tpl b/setup/wizard/templates/license.tpl index c187cd1..80beb16 100644 --- a/setup/wizard/templates/license.tpl +++ b/setup/wizard/templates/license.tpl @@ -1,6 +1,6 @@

License Agreement

-
+
$e) { echo $e; @@ -14,7 +14,7 @@ Please read and accept the license agreement below before continuing with the se
-

KnowledgeTree On-premise Commercial End-User

+

KnowledgeTree® On-premise Commercial End-User

License Agreement Version 2.3

@@ -25,9 +25,9 @@ THIS AGREEMENT AND THAT YOU HAVE THE NECESSARY AUTHORITY TO BIND THE COMPANY TO THE AGREEMENT, DO NOT INSTALL OR USE THE SOFTWARE.

-This is an agreement entered into by and between you (the "Company") and KnowledgeTree Inc. and +This is an agreement entered into by and between you (the "Company") and KnowledgeTree® and its subsidiaries ("KT"). This Agreement states the terms and conditions upon which KT offers to -license the KnowledgeTree Commercial Editions software provided in this package together with all +license the KnowledgeTree® Commercial Editions software provided in this package together with all related documentation and accompanying items including, but not limited to, the executable programs, drivers, libraries and data files associated with such programs (collectively, the "Software").

@@ -134,9 +134,9 @@ User accounts cannot be shared or used by more than one individual End User but new End Users replacing former End Users.

-License fee: The Company shall pay to KT an amount specified on the KnowledgeTree website for the +License fee: The Company shall pay to KT an amount specified on the KnowledgeTree® website for the number of End Users that Company selects. Payment of the license fee shall be due and payable as set -forth in the terms and conditions on the KnowledgeTree website. All fees paid to KT are non- +forth in the terms and conditions on the KnowledgeTree® website. All fees paid to KT are non- refundable. The Company will also pay all applicable taxes, including sales, use, personal property, value-added, excise, customs fees, import duties, stamp duties and any other similar taxes and duties, including penalties and interest, imposed by any federal, state, provincial or other government entity on @@ -309,7 +309,7 @@ defined in FAR 52.227-14, Rights in Data - General, including Alternate III (Jun

CONTRACTOR/MANUFACTURER

The Contractor/Manufacturer for the Software is: -KnowledgeTree Inc. +KnowledgeTree® c/o DLA Piper US LLP 2000 University Avenue East Palo Alto, CA 94303 diff --git a/setup/wizard/templates/registration.tpl b/setup/wizard/templates/registration.tpl index 9732e06..03470ce 100644 --- a/setup/wizard/templates/registration.tpl +++ b/setup/wizard/templates/registration.tpl @@ -1,6 +1,6 @@ -

Register your KnowledgeTree Installation

+

Register your KnowledgeTree® Installation

-
+
$e) { echo $e; @@ -9,23 +9,23 @@

-Register your KnowledgeTree Installation and receive the KnowledgeTree Drop Box for Windows software, a drag and drop tool that makes -placing documents into KnowledgeTree even easier. +Register your KnowledgeTree® Installation and receive the KnowledgeTree® Drop Box for Windows software, a drag and drop tool that makes +placing documents into KnowledgeTree® even easier.

-We will not share your information with 3rd-parties, nor will we send you information not directly related to KnowledgeTree Inc.'s products -and services. Please see our Privacy and Data Retention policies for more information. +We will not share your information with 3rd-parties, nor will we send you information not directly related to KnowledgeTree®'s products +and services. Please see our Privacy and Data Retention policies for more information.

- - + +

- + - + - + diff --git a/setup/wizard/templates/registration_confirm.tpl b/setup/wizard/templates/registration_confirm.tpl index a403bbb..908342a 100644 --- a/setup/wizard/templates/registration_confirm.tpl +++ b/setup/wizard/templates/registration_confirm.tpl @@ -1,6 +1,6 @@

Thank you for registering

-
+
$e) { echo $e; @@ -9,7 +9,7 @@

-Thank you for signing up. You'll receive an email from us shortly with download instructions for the KnowledgeTree Drop Box software. +Thank you for signing up. You'll receive an email from us shortly with download instructions for the KnowledgeTree® Drop Box software.

diff --git a/setup/wizard/templates/services.tpl b/setup/wizard/templates/services.tpl index 70b8a23..bf62b59 100644 --- a/setup/wizard/templates/services.tpl +++ b/setup/wizard/templates/services.tpl @@ -2,72 +2,71 @@

Services Dependencies Check

-This checkup ensures that your environment is ready to support KnowledgeTree's background services. +This checkup ensures that your environment is ready to support KnowledgeTree®'s background services.

' . '' - . 'Click Here for help on overcoming service issues

'; + . 'Click Here for help on overcoming services issues
'; } ?> - -Specify the location of your Java executable -
-'/> -    - - - -
-Specify the location of your PHP executable -
- - '/> - - '/> - -    - - - -
- - -

     "; ?>Java Check

- -
Show Details
- - - -

     "; ?>Java Extensions

- -
Show Details
- - - + + Specify the location of your Java executable +     + '/> +     + + + +
+ Specify the location of your PHP executable +
+ + '/> + + '/> + +     + + + + + +

     "; ?>Java Check

+ +
Show Details
+ + + +

     "; ?>Java Extensions

+ +
Show Details
+ + + -

-All services are already installed. -

+

+ All services are already installed. +

     "; ?>Services Check

@@ -89,10 +88,9 @@ if($step_vars){ -
- +
\ No newline at end of file diff --git a/setup/wizard/templates/welcome.tpl b/setup/wizard/templates/welcome.tpl index 92c0f0b..6ff3f0d 100644 --- a/setup/wizard/templates/welcome.tpl +++ b/setup/wizard/templates/welcome.tpl @@ -1,12 +1,12 @@ -

Welcome to the KnowledgeTree Setup Wizard

+

Welcome to the KnowledgeTree® Setup Wizard

-KnowledgeTreeTM is document management made simple - easily share, track, secure, and manage the documents and records your organization depends on. +KnowledgeTree® is document management made simple - easily share, track, secure, and manage the documents and records your organization depends on.

-KnowledgeTree provides an easy-to-use, production-ready, enterprise document management solution for use by corporations, government institutions, medium -to small businesses, and many other types of organizations. KnowledgeTree's open source architecture allows organizations to easily customize and +KnowledgeTree® provides an easy-to-use, production-ready, enterprise document management solution for use by corporations, government institutions, medium +to small businesses, and many other types of organizations. KnowledgeTree®'s open source architecture allows organizations to easily customize and integrate the document management system with their existing infrastructure, providing a more flexible, cost-effective alternative to proprietary applications.

diff --git a/setup/wizard/templates/wizard.tpl b/setup/wizard/templates/wizard.tpl index e3e32e9..e57e95a 100644 --- a/setup/wizard/templates/wizard.tpl +++ b/setup/wizard/templates/wizard.tpl @@ -1,7 +1,7 @@ - KnowledgeTree Installer + KnowledgeTree® Installer
    @@ -33,11 +33,11 @@ and services. Please see our