Peter M. Groen / knowledgetree

Commit ea3d036486df4610527effc7037fe3badcc1821d

Authored by Paul Barrett
2 parents f208a446 61ade212

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

Inline Side-by-side
Showing 25 changed files with 249 additions and 158 deletions
bin/schedulerTask.sh deleted
View file @f208a44
1   -#!/bin/sh
2   -cd /var/www/installers/knowledgetree/bin/
3   -while true; do
4   -php -Cq scheduler.php
5   -sleep 30
6   -done
7 0 \ No newline at end of file
ktapi/ktapi.inc.php
  View file @ea3d036
... ... @@ -3280,7 +3280,7 @@ class KTAPI
3280 3280 $url = $download_manager->allow_download($document);
3281 3281  
3282 3282 $response['status_code'] = 0;
3283   - $response['results'] = $url;
  3283 + $response['results'] = urlencode($url);
3284 3284  
3285 3285 return $response;
3286 3286 }
... ...
setup/wizard/lib/helpers/phpinfo.php 0 → 100644
  View file @ea3d036
  1 +<?php echo phpinfo(); ?>
0 2 \ No newline at end of file
... ...
setup/wizard/lib/services/unixScheduler.php
  View file @ea3d036
... ... @@ -95,7 +95,7 @@ class unixScheduler extends unixService {
95 95 }
96 96  
97 97 function writeSchedulerTask() {
98   - $fp = fopen($this->getSchedulerDir().$this->getSchedulerSource(), "w+");
  98 + $fp = @fopen($this->getSchedulerDir().$this->getSchedulerSource(), "w+");
99 99 $content = "#!/bin/sh\n";
100 100 $content .= "cd ".$this->getSchedulerDir()."\n";
101 101 $content .= "while true; do\n";
... ... @@ -103,8 +103,9 @@ class unixScheduler extends unixService {
103 103 $content .= "php -Cq scheduler.php\n";
104 104 $content .= "sleep 30\n";
105 105 $content .= "done";
106   - fwrite($fp, $content);
107   - fclose($fp);
  106 + @fwrite($fp, $content);
  107 + @fclose($fp);
  108 + @chmod($this->getSchedulerDir().$this->getSchedulerSource(), '644');
108 109 }
109 110  
110 111 function install() {
... ... @@ -146,6 +147,8 @@ class unixScheduler extends unixService {
146 147 }
147 148  
148 149 function start() {
  150 + // TODO : Write sh on the fly? Not sure the reasoning here
  151 + $this->writeSchedulerTask();
149 152 $source = $this->getSchedulerSourceLoc();
150 153 if($source) { // Source
151 154 $cmd = "nohup ".$source." > ".SYS_LOG_DIR."scheduler.log 2>&1 & echo $!";
... ...
setup/wizard/path.php
  View file @ea3d036
... ... @@ -102,7 +102,8 @@
102 102 define('PHP_DIR', $zendsys."ZendServer".DS."bin".DS);
103 103 } else {
104 104 $modules = get_loaded_extensions();
105   - if(in_array('Zend Monitor', $modules)) { // TODO: Dirty
  105 + // TODO: Dirty
  106 + if(in_array('Zend Download Server', $modules) || in_array('Zend Monitor', $modules) || in_array('Zend Utils', $modules) || in_array('Zend Page Cache', $modules)) {
106 107 define('INSTALL_TYPE', 'Zend');
107 108 define('PHP_DIR', '');
108 109 } else {
... ...
setup/wizard/resources/wizard.css
  View file @ea3d036
... ... @@ -176,7 +176,7 @@ select {
176 176  
177 177 .error {
178 178 font-weight: bold;
179   - color: #9F0000;
  179 + color: red;
180 180 }
181 181  
182 182 .errors {
... ... @@ -264,4 +264,8 @@ input#dname {
264 264  
265 265 #section {
266 266 /*border:1px solid;*/
  267 +}
  268 +
  269 +sup {
  270 + font-size: 11px;
267 271 }
268 272 \ No newline at end of file
... ...
setup/wizard/resources/wizard.js
  View file @ea3d036
... ... @@ -7,27 +7,6 @@ wizard.prototype.doFormCheck = function() {
7 7 w.addReadOnly();
8 8 }
9 9  
10   -// Disable DnD on element
11   -// Element has to have a readOnly status set to readonly
12   -wizard.prototype.disableDnd = function(el_id) {
13   -// el = document.getElementById(el_id);
14   -// el.removeAttribute('readOnly');
15   -}
16   -
17   -// Add readOnly access on all inputs of a form
18   -wizard.prototype.addReadOnly = function() {
19   - inputs = document.getElementsByTagName('input');
20   - for(i=0;i<inputs.length;i++) {
21   - var input_id = inputs[i].id;
22   - if(input_id != '') {
23   -// inputs[i].setAttribute('readOnly', 'readonly');
24   -// inputs[i].setAttribute('onfocus', "javascript:{w.disableDnd('"+ input_id +"')}");
25   -// inputs[i].focus();
26   -// w.focusElement(inputs[i]);
27   - }
28   - }
29   -}
30   -
31 10 // Toggle Advance Database options
32 11 wizard.prototype.toggleClass = function(el) {
33 12 var el = document.getElementsByClassName(el); //adv_options|php_details|php_ext_details|php_con_details
... ... @@ -150,4 +129,83 @@ wizard.prototype.onSubmitValidate = function(silent) {
150 129 }
151 130 }
152 131 return true;
  132 +}
  133 +
  134 +// Validate Registration Page
  135 +wizard.prototype.validateRegistration = function() {
  136 + var first = document.getElementById('first');
  137 + var last = document.getElementById('last');
  138 + var email = document.getElementById('email');
  139 + if(first.value < 2) {
  140 +
  141 + return false;
  142 + }
  143 + if(last.value < 2) {
  144 +
  145 +
  146 + }
  147 + if(w.emailCheck(email.value)) {
  148 +
  149 + }
  150 +
  151 + return false;
  152 +}
  153 +
  154 +// Validate Registration Page Courtesy of SmartWebby.com (http://www.smartwebby.com/dhtml/)
  155 +wizard.prototype.emailCheck = function() {
  156 + var at="@";
  157 + var dot=".";
  158 + var lat=str.indexOf(at);
  159 + var lstr=str.length;
  160 + var ldot=str.indexOf(dot);
  161 + if (str.indexOf(at)==-1) {
  162 + // alert("Invalid E-mail ID")
  163 + return false;
  164 + }
  165 + if (str.indexOf(at)==-1 || str.indexOf(at)==0 || str.indexOf(at)==lstr) {
  166 + // alert("Invalid E-mail ID")
  167 + return false;
  168 + }
  169 + if (str.indexOf(dot)==-1 || str.indexOf(dot)==0 || str.indexOf(dot)==lstr) {
  170 + // alert("Invalid E-mail ID")
  171 + return false;
  172 + }
  173 + if (str.indexOf(at,(lat+1))!=-1) {
  174 + // alert("Invalid E-mail ID")
  175 + return false;
  176 + }
  177 + if (str.substring(lat-1,lat)==dot || str.substring(lat+1,lat+2)==dot){
  178 + // alert("Invalid E-mail ID")
  179 + return false;
  180 + }
  181 + if (str.indexOf(dot,(lat+2))==-1){
  182 + // alert("Invalid E-mail ID")
  183 + return false;
  184 + }
  185 + if (str.indexOf(" ")!=-1){
  186 + // alert("Invalid E-mail ID")
  187 + return false;
  188 + }
  189 + return true;
  190 +}
  191 +
  192 +// Disable DnD on element
  193 +// Element has to have a readOnly status set to readonly
  194 +wizard.prototype.disableDnd = function(el_id) {
  195 +// el = document.getElementById(el_id);
  196 +// el.removeAttribute('readOnly');
  197 +}
  198 +
  199 +// Add readOnly access on all inputs of a form
  200 +wizard.prototype.addReadOnly = function() {
  201 + inputs = document.getElementsByTagName('input');
  202 + for(i=0;i<inputs.length;i++) {
  203 + var input_id = inputs[i].id;
  204 + if(input_id != '') {
  205 +// inputs[i].setAttribute('readOnly', 'readonly');
  206 +// inputs[i].setAttribute('onfocus', "javascript:{w.disableDnd('"+ input_id +"')}");
  207 +// inputs[i].focus();
  208 +// w.focusElement(inputs[i]);
  209 + }
  210 + }
153 211 }
154 212 \ No newline at end of file
... ...
setup/wizard/steps/complete.php
  View file @ea3d036
... ... @@ -143,8 +143,9 @@ class complete extends Step {
143 143 $this->temp_variables['docLocation'] = '<td><div class="cross_orange"></div></td>'
144 144 . '<td class="warning" colspan="2">Your document directory is set to the default, which is inside the web root. '
145 145 . 'This may present a security problem if your documents can be accessed from the web, '
146   - . 'working around the permission system in KnowledgeTree.</td>';
  146 + . 'working around the permission system in KnowledgeTree<sup>&#174;</sup>.</td>';
147 147 $this->paths_check = 'cross_orange';
  148 + $this->warnings[] = 'Move var directory';
148 149 }
149 150 else {
150 151 $this->temp_variables['docLocation'] = sprintf($html, 'tick', '', 'Your document directory is outside the web root.');
... ...
setup/wizard/steps/database.php
  View file @ea3d036
... ... @@ -202,7 +202,7 @@ class database extends Step
202 202 * @access public
203 203 * @var array
204 204 */
205   - public $temp_variables = array("step_name"=>"database");
  205 + public $temp_variables = array();
206 206  
207 207 /**
208 208 * List of errors encountered
... ...
setup/wizard/steps/dependencies.php
  View file @ea3d036
... ... @@ -259,7 +259,7 @@ class dependencies extends Step
259 259  
260 260 if($phpversion6 != 1){
261 261 $this->done = false;
262   - $check['version'] = "KnowledgeTree is not supported on PHP 6.0 and higher. You are running version <b>{$phpversion}</b>.";
  262 + $check['version'] = "KnowledgeTree<sup>&#174;</sup> is not supported on PHP 6.0 and higher. You are running version <b>{$phpversion}</b>.";
263 263 return $check;
264 264 }
265 265 $check['class'] = 'tick';
... ...
setup/wizard/steps/registration.php
  View file @ea3d036
... ... @@ -42,13 +42,16 @@
42 42  
43 43 class registration extends Step
44 44 {
  45 +
  46 + public $temp_variables = array("step_name"=>"registration");
  47 +
45 48 /**
46 49 * Initialise the registration step
47 50 *
48 51 * @author KnowledgeTree Team
49 52 * @access public
50 53 */
51   - public function configure()
  54 + public function __construct()
52 55 {
53 56 $this->temp_variables = array("step_name"=>"registration");
54 57 }
... ... @@ -430,7 +433,8 @@ class registration extends Step
430 433 'RO' => 'ROMANIA',
431 434 'RU' => 'RUSSIAN FEDERATION',
432 435 'RW' => 'RWANDA',
433   - 'BL' => 'SAINT BARTH�LEMY',
  436 +// TODO: Special Character for the e
  437 + 'BL' => 'SAINT BARTHELEMY',
434 438 'SH' => 'SAINT HELENA',
435 439 'KN' => 'SAINT KITTS AND NEVIS',
436 440 'LC' => 'SAINT LUCIA',
... ...
setup/wizard/steps/services.php
  View file @ea3d036
... ... @@ -89,6 +89,24 @@ class services extends Step
89 89 private $alreadyInstalled = false;
90 90  
91 91 /**
  92 + * Flag if services are already Installed
  93 + *
  94 + * @author KnowledgeTree Team
  95 + * @access private
  96 + * @var mixed
  97 + */
  98 + private $luceneInstalled = false;
  99 +
  100 + /**
  101 + * Flag if services are already Installed
  102 + *
  103 + * @author KnowledgeTree Team
  104 + * @access private
  105 + * @var mixed
  106 + */
  107 + private $schedulerInstalled = false;
  108 +
  109 + /**
92 110 * PHP Installed
93 111 *
94 112 * @author KnowledgeTree Team
... ... @@ -302,6 +320,7 @@ class services extends Step
302 320 return true;
303 321 }
304 322  
  323 +
305 324 /**
306 325 * Do some basic checks to help the user overcome java problems
307 326 *
... ... @@ -759,9 +778,12 @@ class services extends Step
759 778 */
760 779 private function storeSilent() {
761 780 $this->temp_variables['alreadyInstalled'] = $this->alreadyInstalled;
  781 + $this->temp_variables['luceneInstalled'] = $this->luceneInstalled;
  782 + $this->temp_variables['schedulerInstalled'] = $this->schedulerInstalled;
762 783 $this->temp_variables['javaExeError'] = $this->javaExeError;
763 784 $this->temp_variables['javaCheck'] = $this->javaCheck;
764 785 $this->temp_variables['javaExtCheck'] = $this->javaExtCheck;
  786 + // TODO : PHP detection
765 787 $this->temp_variables['phpCheck'] = 'tick';//$this->phpCheck;
766 788 $this->temp_variables['phpExeError'] = '';//$this->phpExeError;
767 789 $this->temp_variables['serviceCheck'] = $this->serviceCheck;
... ...
setup/wizard/templates/complete.tpl
  View file @ea3d036
1 1 <h1>Installation Completed</h1>
2 2  
3   -<h2>KnowledgeTree post-configuration checkup</h2>
  3 +<h2>KnowledgeTree<sup>&#174;</sup> post-configuration checkup</h2>
4 4  
5   -<p>This allows you to check that your KnowledgeTree configuration is set
  5 +<p>This allows you to check that your KnowledgeTree<sup>&#174;</sup> configuration is set
6 6 up correctly. You can run this at any time after configuration to check
7 7 that things are still set up correctly.</p>
8 8  
9 9 <?php
10 10 if($errors || $warnings){
11 11 echo '<div>'
12   - . '<a href="http://wiki.knowledgetree.com/Web_Based_Installer#PHP_Dependencies" target="_blank">'
13   - . 'Click Here for help on overcoming dependency issues</a></div><br/>';
  12 + . '<a href="http://wiki.knowledgetree.com/Web_Based_Installer#Post_Install" target="_blank">'
  13 + . 'Click Here for help on overcoming post install issues</a></div><br/>';
14 14 }
15 15 ?>
16 16  
... ... @@ -80,7 +80,7 @@ if($errors || $warnings){
80 80 <form>
81 81 <div class="buttons">
82 82 <!-- <a href="index.php?step_name=complete&step=previous" class="previous">Previous</a>-->
83   -<!-- <a href="">Refresh</a>-->
  83 + <a href="">Refresh</a>
84 84 <a href="../../">Goto Login</a>
85 85 <?php
86 86 if (INSTALL_TYPE == 'Zend') {
... ...
setup/wizard/templates/configuration.tpl
  View file @ea3d036
1 1 <h1>System Configuration</h1>
2 2  
3 3 <p class="description">
4   -This check ensures that KnowledgeTree is correctly configured to run.
  4 +This check ensures that KnowledgeTree<sup>&#174;</sup> is correctly configured to run.
5 5 </p>
6 6  
7 7 <form action="index.php?step_name=configuration" method="post">
... ... @@ -9,7 +9,7 @@ This check ensures that KnowledgeTree is correctly configured to run.
9 9 <h3>Server Settings</h3>
10 10  
11 11 <p class="description">
12   -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.
  12 +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<sup>&#174;</sup>. The Root Url is only needed if your installation is in a directory off the main web server root.
13 13 </p>
14 14  
15 15 <div class="error">
... ... @@ -55,7 +55,7 @@ The settings below have been drawn from the system information. The host and por
55 55 <div class="paths_perms" style="display:none">
56 56 <?php } ?>
57 57 <p class="description">
58   -The following folders must be writable for KnowledgeTree to be able to run. The permissions on the configuration file may be reset to read-only once the installation has completed.
  58 +The following folders must be writable for KnowledgeTree<sup>&#174;</sup> to be able to run. The permissions on the configuration file may be reset to read-only once the installation has completed.
59 59 </p>
60 60 <table>
61 61 <?php
... ...
setup/wizard/templates/database.tpl
  View file @ea3d036
... ... @@ -12,10 +12,14 @@
12 12 user on the database server are required in order to be able to configure and install the installation database.
13 13 </div>
14 14 <table class="dbconf">
  15 +<!-- TODO: Different Databases-->
15 16 <tr><td>Your current database type is: </td>
16 17 <?php if($dtypes) {
17 18 foreach($dtypes as $k=>$v) {
18   - ?><td><input type="hidden" name="dtype" value="<?php echo $v; ?>" <?php if(!$k)echo 'checked="checked"'; ?>/>&nbsp;&nbsp;<?php echo ucwords($v); ?></td>
  19 + ?><td>
  20 + <?php echo ucwords($v);?>
  21 +<!-- <input type="hidden" name="dtype" value="<?php //echo $v; ?>" <?php //if(!$k)echo 'checked="checked"'; ?>/>&nbsp;&nbsp;<?php //echo ucwords($v); ?>-->
  22 + </td>
19 23 <?php }
20 24 }
21 25 ?>
... ...
setup/wizard/templates/database_confirm.tpl
  View file @ea3d036
... ... @@ -3,11 +3,10 @@
3 3 <div class="description">
4 4 Please confirm that your database settings have been entered correctly before proceeding with the installation.
5 5 </div>
6   -<div id="section">
7   -<h3>Database Settings</h3>
  6 +<!--<div id="section">-->
8 7  
9 8 <form action="index.php?step_name=<?php echo $step_name; ?>" method="post">
10   -
  9 +<h3><b>Database Settings</b></h3>
11 10 <table width="20%" class="dbconf">
12 11 <?php
13 12 if($dtypes) {
... ... @@ -17,24 +16,24 @@ if($dtypes) {
17 16 }
18 17 ?>
19 18 <tr>
20   - <td><b>Database type: </b></td>
  19 + <td>Database type: </td>
21 20 <td><?php echo $type; ?></td>
22 21 </tr>
23 22 <?php } ?>
24 23 <tr>
25   - <td><b>Name: </b></td>
  24 + <td>Name: </td>
26 25 <td><?php echo $dname; ?></td>
27 26 </tr>
28 27 <tr>
29   - <td><b>Root Username: </b></td>
  28 + <td>Root Username: </td>
30 29 <td><?php echo $duname; ?></td>
31 30 </tr>
32 31 <tr>
33   - <td><b>Root Username: </b></td>
  32 + <td>Root Username: </td>
34 33 <td><?php echo $duname; ?></td>
35 34 </tr>
36 35 <tr>
37   - <td><b>Root Password: </b></td>
  36 + <td>Root Password: </td>
38 37 <td><?php echo $dpassword; ?></td>
39 38 </tr>
40 39 <?php if($ddrop) { ?>
... ... @@ -43,51 +42,51 @@ if($dtypes) {
43 42 </tr>
44 43 <?php } ?>
45 44 </table>
46   -</div>
47   -<h3>Advanced Settings</h3>
  45 +<!--</div>-->
  46 +<h3><b>Advanced Settings</b></h3>
48 47  
49   -<table width="46%" class="dbconf">
  48 +<table width="23%" class="dbconf">
50 49 <tr>
51   - <td><b>Host: </b></td>
  50 + <td>Host: </td>
52 51 <td><?php echo $dhost; ?></td>
53 52 </tr>
54 53 <tr>
55   - <td><b>Port: </b></td>
  54 + <td>Port: </td>
56 55 <td><?php echo $dport; ?></td>
57 56 </tr>
58 57 <tr>
59   - <td><b>Mysql Binary: </b></td>
  58 + <td>Mysql Binary: </td>
60 59 <td><?php echo $dbbinary; ?></td>
61 60 </tr>
62 61 <?php if (!$silent) { ?>
63 62 <tr>
64   - <td><b>Table Prefix: </b></td>
  63 + <td><b>Table Prefix: </td>
65 64 <td><?php echo $tprefix; ?></td>
66 65 </tr>
67 66 <?php } ?>
68 67 </table>
69 68  
70   -<h3>Database Users</h3>
  69 +<h3><b>Database Users</b></h3>
71 70  
72   -<table width="46%" class="dbconf">
  71 +<table width="23%" class="dbconf">
73 72 <?php //if (!$silent) { ?>
74 73 <tr>
75   - <td><b>DMS Admin Username: </b></td>
  74 + <td>DMS Admin Username: </td>
76 75 <td><?php echo $dmsname; ?></td>
77 76 </tr>
78 77 <?php //} ?>
79 78 <tr>
80   - <td><b>DMS Admin Password: </b></td>
  79 + <td>DMS Admin Password: </td>
81 80 <td><?php echo $dmspassword; ?></td>
82 81 </tr>
83 82 <?php //if (!$silent) { ?>
84 83 <tr>
85   - <td><b>DMS User Username: </b></td>
  84 + <td>DMS User Username: </td>
86 85 <td><?php echo $dmsusername; ?></td>
87 86 </tr>
88 87 <?php //} ?>
89 88 <tr>
90   - <td><b>DMS User Password: </b></td>
  89 + <td>DMS User Password: </td>
91 90 <td><?php echo $dmsuserpassword; ?></td>
92 91 </tr>
93 92 </table>
... ...
setup/wizard/templates/dependencies.tpl
  View file @ea3d036
1 1 <h1>PHP Dependencies Check</h1>
2 2  
3 3 <p class="description">
4   -This checkup ensures that your environment is ready to support a KnowledgeTree installation. <br/>
  4 +This checkup ensures that your environment is ready to support a KnowledgeTree<sup>&#174;</sup> installation. <br/>
5 5 Settings marked in green are available, settings marked in orange are optional and settings marked in red are required.
6 6 </p>
7 7  
... ... @@ -32,7 +32,7 @@ if($silent) { ?&gt;
32 32 <div class="php_ext_details" style="display:none">
33 33 <?php } ?>
34 34 <p class="description">
35   -The following determines your PHP installation environment. The extensions are required for KnowledgeTree to perform at an optimal level.
  35 +The following determines your PHP installation environment. The extensions are required for KnowledgeTree<sup>&#174;</sup> to perform at an optimal level.
36 36 </p>
37 37 <table>
38 38 <?php
... ... @@ -69,7 +69,7 @@ if($silent) { ?&gt;
69 69 <div class="php_con_details" style="display:none">
70 70 <?php } ?>
71 71 <p class="description">
72   -The following is the recommended PHP configuration for KnowledgeTree to perform at an optimal level.
  72 +The following is the recommended PHP configuration for KnowledgeTree<sup>&#174;</sup> to perform at an optimal level.
73 73 </p>
74 74 <table>
75 75 <tr>
... ... @@ -88,6 +88,8 @@ The following is the recommended PHP configuration for KnowledgeTree to perform
88 88 }
89 89 ?>
90 90 </table>
  91 +<br/>
  92 +B = Bytes, K = Kilobytes, M = Megabytes, G = Gigabytes
91 93 <?php if($silent) { ?>
92 94 </div>
93 95 <?php } ?>
... ...
setup/wizard/templates/error.tpl
  View file @ea3d036
1 1 <head>
2   - <title>KnowledgeTree Installer</title>
  2 + <title>KnowledgeTree&#174; Installer</title>
3 3 <script type="text/javascript" src="resources/wizard.js"></script>
4 4 <link rel="stylesheet" type="text/css" href="resources/wizard.css">
5 5 </head><body onload="w.doFormCheck();">
... ... @@ -11,7 +11,7 @@
11 11 <div id="wrapper">
12 12 <div id="container">
13 13 <div id="content">
14   - <h1>Welcome to the KnowledgeTree Setup Wizard</h1>
  14 + <h1>Welcome to the KnowledgeTree<sup>&#174;</sup> Setup Wizard</h1>
15 15  
16 16 <div style="width: 800px;">
17 17 <?php if(isset($error)) echo '';echo "<div class='error'>".$error."</div>"; ?>
... ...
setup/wizard/templates/errors.tpl
  View file @ea3d036
1   -<h1>Welcome to the KnowledgeTree Setup Wizard</h1>
  1 +<h1>Welcome to the KnowledgeTree<sup>&#174;</sup> Setup Wizard</h1>
2 2  
3 3 <div style="width: 800px;">
4 4 <?php if(isset($error)) echo $error; ?>
... ...
setup/wizard/templates/license.tpl
  View file @ea3d036
1 1 <h1>License Agreement</h1>
2 2  
3   -<div class="errors">
  3 +<div class="error">
4 4 <?php if(isset($errors)) {
5 5 foreach($errors as $k=>$e) {
6 6 echo $e;
... ... @@ -14,7 +14,7 @@ Please read and accept the license agreement below before continuing with the se
14 14  
15 15 <form action="index.php?step_name=license" method="POST">
16 16 <div style="overflow: scroll; height: 500px; width:800px; overflow-x:hidden;">
17   -<h2>KnowledgeTree On-premise Commercial End-User</h2>
  17 +<h2>KnowledgeTree<sup>&#174;</sup> On-premise Commercial End-User</h2>
18 18 <p>
19 19 License Agreement Version 2.3
20 20 </p>
... ... @@ -25,9 +25,9 @@ THIS AGREEMENT AND THAT YOU HAVE THE NECESSARY AUTHORITY TO BIND THE COMPANY TO
25 25 THE AGREEMENT, DO NOT INSTALL OR USE THE SOFTWARE.
26 26 </p>
27 27 <p>
28   -This is an agreement entered into by and between you (the "Company") and KnowledgeTree Inc. and
  28 +This is an agreement entered into by and between you (the "Company") and KnowledgeTree<sup>&#174;</sup> and
29 29 its subsidiaries ("KT"). This Agreement states the terms and conditions upon which KT offers to
30   -license the KnowledgeTree Commercial Editions software provided in this package together with all
  30 +license the KnowledgeTree<sup>&#174;</sup> Commercial Editions software provided in this package together with all
31 31 related documentation and accompanying items including, but not limited to, the executable programs,
32 32 drivers, libraries and data files associated with such programs (collectively, the "Software").
33 33 </p>
... ... @@ -134,9 +134,9 @@ User accounts cannot be shared or used by more than one individual End User but
134 134 new End Users replacing former End Users.
135 135 </p>
136 136 <p>
137   -License fee: The Company shall pay to KT an amount specified on the KnowledgeTree website for the
  137 +License fee: The Company shall pay to KT an amount specified on the KnowledgeTree<sup>&#174;</sup> website for the
138 138 number of End Users that Company selects. Payment of the license fee shall be due and payable as set
139   -forth in the terms and conditions on the KnowledgeTree website. All fees paid to KT are non-
  139 +forth in the terms and conditions on the KnowledgeTree<sup>&#174;</sup> website. All fees paid to KT are non-
140 140 refundable. The Company will also pay all applicable taxes, including sales, use, personal property,
141 141 value-added, excise, customs fees, import duties, stamp duties and any other similar taxes and duties,
142 142 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
309 309 <p>
310 310 <h3>CONTRACTOR/MANUFACTURER</h3>
311 311 The Contractor/Manufacturer for the Software is:
312   -KnowledgeTree Inc.
  312 +KnowledgeTree<sup>&#174;</sup>
313 313 c/o DLA Piper US LLP
314 314 2000 University Avenue
315 315 East Palo Alto, CA 94303
... ...
setup/wizard/templates/registration.tpl
  View file @ea3d036
1   -<h1>Register your KnowledgeTree Installation</h1>
  1 +<h1>Register your KnowledgeTree<sup>&#174;</sup> Installation</h1>
2 2  
3   -<div class="errors">
  3 +<div class="error">
4 4 <?php if(isset($errors)) {
5 5 foreach($errors as $k=>$e) {
6 6 echo $e;
... ... @@ -9,23 +9,23 @@
9 9 </div>
10 10  
11 11 <p>
12   -Register your KnowledgeTree Installation and receive the KnowledgeTree Drop Box for Windows software, a drag and drop tool that makes
13   -placing documents into KnowledgeTree even easier.
  12 +Register your KnowledgeTree<sup>&#174;</sup> Installation and receive the KnowledgeTree<sup>&#174;</sup> Drop Box for Windows software, a drag and drop tool that makes
  13 +placing documents into KnowledgeTree<sup>&#174;</sup> even easier.
14 14 </p>
15 15  
16 16 <p class='disclaimer'>
17   -We will not share your information with 3rd-parties, nor will we send you information not directly related to KnowledgeTree Inc.'s products
18   -and services. Please see our <a href="http://www.knowledgetree.com/about/legal">Privacy and Data Retention policies</a> for more information.
  17 +We will not share your information with 3rd-parties, nor will we send you information not directly related to KnowledgeTree<sup>&#174;</sup>'s products
  18 +and services. Please see our <a href="http://www.knowledgetree.com/about/legal" target="_blank">Privacy and Data Retention policies</a> for more information.
19 19 </p>
20   -
21   -<form action="index.php?step_name=registration" method="post">
  20 +<!--<form action="index.php?step_name=registration" method="post">-->
  21 +<form id="registration" action="index.php?step_name=<?php echo $step_name; ?>" method="post" onsubmit="w.validateRegistration();return false;">
22 22 <p>
23 23  
24 24 <table>
25 25 <tr>
26 26 <td><label for='first'>First Name</label></td>
27 27 <td rowspan='6' width='5%'>&nbsp;</td>
28   - <td><input name='submitted[first_name]' id='first' size='44' /></td>
  28 + <td><input name='submitted[first_name]' id='first' size='37' /></td>
29 29 <td rowspan='6' width='5%'>&nbsp;</td>
30 30 <td rowspan='6'>
31 31 <img src='resources/graphics/dropbox.png' />
... ... @@ -33,11 +33,11 @@ and services. Please see our &lt;a href=&quot;http://www.knowledgetree.com/about/legal&quot;&gt;
33 33 </tr>
34 34 <tr>
35 35 <td><label for='last'>Last Name</label></td>
36   - <td><input name='submitted[last_name]' id='last' size='44' /></td>
  36 + <td><input name='submitted[last_name]' id='last' size='37' /></td>
37 37 </tr>
38 38 <tr>
39 39 <td><label for='email'>Email Address</label></td>
40   - <td><input name='submitted[email_address]' id='email' size='44' /></td>
  40 + <td><input name='submitted[email_address]' id='email' size='37' /></td>
41 41 </tr>
42 42 <tr>
43 43 <td><label for='country'>Country</label></td>
... ...
setup/wizard/templates/registration_confirm.tpl
  View file @ea3d036
1 1 <h1>Thank you for registering</h1>
2 2  
3   -<div class="errors">
  3 +<div class="error">
4 4 <?php if(isset($errors)) {
5 5 foreach($errors as $k=>$e) {
6 6 echo $e;
... ... @@ -9,7 +9,7 @@
9 9 </div>
10 10  
11 11 <p>
12   -Thank you for signing up. You'll receive an email from us shortly with download instructions for the KnowledgeTree Drop Box software.
  12 +Thank you for signing up. You'll receive an email from us shortly with download instructions for the KnowledgeTree<sup>&#174;</sup> Drop Box software.
13 13 </p>
14 14  
15 15 <form action="index.php?step_name=registration" method="post">
... ...
setup/wizard/templates/services.tpl
  View file @ea3d036
... ... @@ -2,72 +2,71 @@
2 2 <h1>Services Dependencies Check</h1>
3 3  
4 4 <p class="description">
5   -This checkup ensures that your environment is ready to support KnowledgeTree's background services.
  5 +This checkup ensures that your environment is ready to support KnowledgeTree<sup>&#174;</sup>'s background services.
6 6 </p>
7 7 <?php
8 8 if($errors || $warnings){
9 9 echo '<div>'
10 10 . '<a href="http://wiki.knowledgetree.com/Web_Based_Installer#Service_Dependencies" target="_blank">'
11   - . 'Click Here for help on overcoming service issues</a></div><br/>';
  11 + . 'Click Here for help on overcoming services issues</a></div><br/>';
12 12 }
13 13 ?>
14 14 <?php if(!$alreadyInstalled) { ?>
15   -<?php if($javaExeError != '') { ?>
16   -Specify the location of your Java executable
17   -<br />
18   -<input name='java' id='port' size='25' value='<?php echo $java['location']; ?>'/>
19   -&nbsp;&nbsp;&nbsp;
20   -<?php if($javaExeError != true) { ?><span class="error"><?php echo $javaExeError; ?></span><?php } ?>
21   -<?php } ?>
22   -<?php if($phpExeError != '') { ?>
23   -<br />
24   -Specify the location of your PHP executable
25   -<br />
26   -<?php if($php['location'] == '') { ?>
27   - <input name='php' id='port' size='25' value='<?php echo $php['location']; ?>'/>
28   -<?php } else {?>
29   - <input type="hidden" name='php' id='port' size='25' value='<?php echo $php['location']; ?>'/>
30   -<?php } ?>
31   -&nbsp;&nbsp;&nbsp;
32   -<?php if($phpExeError != true) { ?><span class="error"><?php echo $phpExeError; ?></span><?php } ?>
33   -<?php } ?>
34   -<?php if($javaExeError != '' || $phpExeError != '') { ?>
35   -<br />
36   -<input type="submit" name="Refresh" value="Submit"/>
37   -<?php } ?>
38   -<h3><?php echo "<span class='{$javaCheck}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Java Check</h3>
39   -<?php if($silent) { ?>
40   - <div id="options" class="onclick" onclick="javascript:{w.toggleClass('java_details');}">Show Details</div>
41   - <div class="java_details" style="display:none">
42   -<?php } ?>
43   -<p class="description">
44   -The Java version must be higher than 1.5.
45   -</p>
46   -<?php echo "<span class='{$step_vars['java']['class']}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>{$step_vars['java']['found']}"; ?>
47   -<br/>
48   -<?php echo "<span class='{$step_vars['version']['class']}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>{$step_vars['version']['found']}"; ?>
49   -<?php if($silent) { ?>
50   - </div>
51   -<?php } ?>
52   -<?php if (!$disableExtension) {?>
53   -<h3><?php echo "<span class='{$javaExtCheck}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Java Extensions</h3>
54   -<?php if($silent) { ?>
55   - <div id="options" class="onclick" onclick="javascript:{w.toggleClass('java_ext_details');}">Show Details</div>
56   - <div class="java_ext_details" style="display:none">
57   -<?php } ?>
58   -<p class="description">
59   -A PHP Java Bridge is required for KnowledgeTree to perform at an optimal level.
60   -</p>
61   -<?php echo "<span class='{$step_vars['extensions']['class']}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>{$step_vars['extensions']['found']}"; ?>
62   -<br />
63   -<?php if($silent) { ?>
64   - </div>
65   -<?php } ?>
66   -<?php } ?>
  15 + <?php if($javaExeError != '') { ?>
  16 + Specify the location of your Java executable
  17 + &nbsp;&nbsp;&nbsp;
  18 + <input name='java' id='port' size='25' value='<?php echo $java['location']; ?>'/>
  19 + &nbsp;&nbsp;&nbsp;
  20 + <?php if($javaExeError != true) { ?><span class="error"><?php echo $javaExeError; ?></span><?php } ?>
  21 + <?php } ?>
  22 + <?php if($phpExeError != '') { ?>
  23 + <br />
  24 + Specify the location of your PHP executable
  25 + <br />
  26 + <?php if($php['location'] == '') { ?>
  27 + <input name='php' id='port' size='25' value='<?php echo $php['location']; ?>'/>
  28 + <?php } else { ?>
  29 + <input type="hidden" name='php' id='port' size='25' value='<?php echo $php['location']; ?>'/>
  30 + <?php } ?>
  31 + &nbsp;&nbsp;&nbsp;
  32 + <?php if($phpExeError != true) { ?><span class="error"><?php echo $phpExeError; ?></span><?php } ?>
  33 + <?php } ?>
  34 + <?php if($javaExeError != '' || $phpExeError != '') { ?>
  35 + <input type="submit" name="Refresh" value="Submit"/>
  36 + <?php } ?>
  37 + <h3><?php echo "<span class='{$javaCheck}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Java Check</h3>
  38 + <?php if($silent) { ?>
  39 + <div id="options" class="onclick" onclick="javascript:{w.toggleClass('java_details');}">Show Details</div>
  40 + <div class="java_details" style="display:none">
  41 + <?php } ?>
  42 + <p class="description">
  43 + The Java version must be higher than 1.5.
  44 + </p>
  45 + <?php echo "<span class='{$step_vars['java']['class']}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>{$step_vars['java']['found']}"; ?>
  46 + <br/>
  47 + <?php echo "<span class='{$step_vars['version']['class']}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>{$step_vars['version']['found']}"; ?>
  48 + <?php if($silent) { ?>
  49 + </div>
  50 + <?php } ?>
  51 + <?php if (!$disableExtension) { ?>
  52 + <h3><?php echo "<span class='{$javaExtCheck}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Java Extensions</h3>
  53 + <?php if($silent) { ?>
  54 + <div id="options" class="onclick" onclick="javascript:{w.toggleClass('java_ext_details');}">Show Details</div>
  55 + <div class="java_ext_details" style="display:none">
  56 + <?php } ?>
  57 + <p class="description">
  58 + A PHP Java Bridge is required for KnowledgeTree<sup>&#174;</sup> to perform at an optimal level.
  59 + </p>
  60 + <?php echo "<span class='{$step_vars['extensions']['class']}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>{$step_vars['extensions']['found']}"; ?>
  61 + <br />
  62 + <?php if($silent) { ?>
  63 + </div>
  64 + <?php } ?>
  65 + <?php } ?>
67 66 <?php } else { ?>
68   -<p class="description">
69   -All services are already installed.
70   -</p>
  67 + <p class="description">
  68 + All services are already installed.
  69 + </p>
71 70 <?php } ?>
72 71 <h3><?php echo "<span class='{$serviceCheck}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Services Check</h3>
73 72 <?php if($silent) { ?>
... ... @@ -89,10 +88,9 @@ if($step_vars){
89 88 <?php if($silent) { ?>
90 89 </div>
91 90 <?php } ?>
92   -
93 91 <div class="buttons">
94 92 <input type="submit" name="Previous" value="Previous"/>
95   - <input type="submit" name="Refresh" value="Refresh"/>
96 93 <input type="submit" name="Next" value="Next"/>
  94 + <input type="submit" name="Refresh" value="Refresh"/>
97 95 </div>
98 96 </form>
99 97 \ No newline at end of file
... ...
setup/wizard/templates/welcome.tpl
  View file @ea3d036
1   -<h1>Welcome to the KnowledgeTree Setup Wizard</h1>
  1 +<h1>Welcome to the KnowledgeTree<sup>&#174;</sup> Setup Wizard</h1>
2 2  
3 3 <div style='width:800px;'>
4 4 <p>
5   -KnowledgeTree<sup>TM</sup> is document management made simple - easily share, track, secure, and manage the documents and records your organization depends on.
  5 +KnowledgeTree<sup>&#174;</sup> is document management made simple - easily share, track, secure, and manage the documents and records your organization depends on.
6 6 </p>
7 7 <p>
8   -KnowledgeTree provides an easy-to-use, production-ready, enterprise document management solution for use by corporations, government institutions, medium
9   -to small businesses, and many other types of organizations. KnowledgeTree's open source architecture allows organizations to easily customize and
  8 +KnowledgeTree<sup>&#174;</sup> provides an easy-to-use, production-ready, enterprise document management solution for use by corporations, government institutions, medium
  9 +to small businesses, and many other types of organizations. KnowledgeTree<sup>&#174;</sup>'s open source architecture allows organizations to easily customize and
10 10 integrate the document management system with their existing infrastructure, providing a more flexible, cost-effective alternative to proprietary
11 11 applications.
12 12 </p>
... ...
setup/wizard/templates/wizard.tpl
  View file @ea3d036
1 1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
2 2 <html>
3 3 <head>
4   - <title>KnowledgeTree Installer</title>
  4 + <title>KnowledgeTree&#174; Installer</title>
5 5 <script type="text/javascript" src="resources/wizard.js" ></script>
6 6 <link rel="stylesheet" type="text/css" href="resources/wizard.css" />
7 7 </head>
... ...