Peter M. Groen / knowledgetree

Commit 87be5e7f5796a954764b091f0c1edfa54c4c7f70

Authored by Mark Holtzhausen
2 parents 030216c1 080fcbe2

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

Inline Side-by-side
Showing 4 changed files with 7 additions and 5 deletions
sql/mysql/install/data.sql
  View file @87be5e7
... ... @@ -1780,7 +1780,8 @@ INSERT INTO `upgrades` VALUES
1780 1780 (234,'upgrade*3.7.0.2*99*upgrade3.7.0.2','Upgrade from version 3.7.0.1 to 3.7.0.2','2009-11-19 00:00:00',1,'upgrade*3.7.0.2*99*upgrade3.7.0.2'),
1781 1781 (235,'sql*3.7.0.3*0*3.7.0.3/clienttools_config.sql','Database upgrade to version 3.7.0.3: Clienttools Config','2009-12-10 00:00:00',1,'upgrade*3.7.0.3*99*upgrade3.7.0.3'),
1782 1782 (236,'sql*3.7.0.3*0*3.7.0.3/uploaded_files.sql','Database upgrade to version 3.7.0.3: Uploaded Files','2009-12-10 00:00:00',1,'upgrade*3.7.0.3*99*upgrade3.7.0.3'),
1783   -(237,'upgrade*3.7.0.3*99*upgrade3.7.0.3','Upgrade from version 3.7.0.2 to 3.7.0.3','2009-12-14 00:00:00',1,'upgrade*3.7.0.3*99*upgrade3.7.0.3');
  1783 +(237,'sql*3.7.0.3*0*3.7.0.3/active_sessions_ip.sql','Database upgrade to version 3.7.0.3: Active Sessions Ip','2009-12-10 00:00:00',1,'upgrade*3.7.0.3*99*upgrade3.7.0.3'),
  1784 +(238,'upgrade*3.7.0.3*99*upgrade3.7.0.3','Upgrade from version 3.7.0.2 to 3.7.0.3','2009-12-14 00:00:00',1,'upgrade*3.7.0.3*99*upgrade3.7.0.3');
1784 1785 /*!40000 ALTER TABLE `upgrades` ENABLE KEYS */;
1785 1786 UNLOCK TABLES;
1786 1787  
... ...
sql/mysql/install/structure.sql
  View file @87be5e7
... ... @@ -59,7 +59,7 @@ CREATE TABLE `active_sessions` (
59 59 `user_id` int(11) default NULL,
60 60 `session_id` varchar(32) default NULL,
61 61 `lastused` datetime default NULL,
62   - `ip` varchar(15) default NULL,
  62 + `ip` varchar(50) default NULL,
63 63 `apptype` varchar(15) default 'webapp' NOT NULL,
64 64 PRIMARY KEY (`id`),
65 65 KEY `user_id` (`user_id`),
... ...
sql/mysql/upgrade/3.7.0.3/active_sessions_ip.sql 0 → 100644
  View file @87be5e7
  1 +ALTER TABLE active_sessions CHANGE COLUMN ip ip VARCHAR(50);
0 2 \ No newline at end of file
... ...
webservice/clienttools/services/0.9/kt.php
  View file @87be5e7
... ... @@ -250,7 +250,7 @@ class kt extends client_service {
250 250  
251 251 private function _processItemInclusion_folderContents($item, $class, $qtip) {
252 252 $this->logTrace ((__METHOD__.'('.__FILE__.' '.__LINE__.')'), 'Enter Function' );
253   - return array ('text' => htmlspecialchars ( $item ['title'] ), 'originaltext' => $item ['title'], 'id' => ($item ['item_type'] == 'F' ? $item ['item_type'] . "_" : "") . $item ['id'], 'filename' => $item ['filename'], 'cls' => $class, 'leaf' => ($item ['item_type'] == 'D'), 'document_type' => $item ['document_type'], 'item_type' => $item ['item_type'], 'permissions' => $item ['permissions'], 'content_id' => $item ['content_id'], 'checked_out_by' => $item ['checked_out_by'], 'qtip' => $qtip );
  253 + return array ('text' => htmlspecialchars ( $item ['title'] ), 'originaltext' => $item ['title'], 'id' => ($item ['item_type'] == 'F' ? $item ['item_type'] . "_" : "") . $item ['id'], 'filename' => $item ['filename'], 'cls' => $class, 'leaf' => ($item ['item_type'] == 'D'), 'document_type' => $item ['document_type'], 'item_type' => $item ['item_type'], 'permissions' => $item ['permissions'], 'content_id' => $item ['content_id'], 'checked_out_by' => $item ['checked_out_by'], 'qtip' => $qtip, 'is_immutable' => $item ['is_immutable'] );
254 254 }
255 255  
256 256 private function _processItemInclusion_search($item, $class, $qtip) {
... ... @@ -258,7 +258,7 @@ class kt extends client_service {
258 258 if ($item ['filesize'] == 'n/a') {
259 259 $item ['filesize'] = - 1;
260 260 }
261   - return array ('text' => htmlspecialchars ( $item ['title'] ), 'originaltext' => $item ['title'], 'id' => $item ['document_id'], 'filename' => $item ['filename'], 'cls' => $class, 'leaf' => true, 'document_type' => $item ['document_type'], 'item_type' => 'D', 'permissions' => $item ['permissions'], 'content_id' => $item ['content_id'], 'filesize' => $item ['filesize'], 'modified' => $item ['modified_date'], 'created_date' => $item ['created_date'], 'checked_out_by' => $item ['checked_out_by'], 'relevance' => $item ['relevance'], 'qtip' => $qtip, 'version' => $item ['version'] );
  261 + return array ('text' => htmlspecialchars ( $item ['title'] ), 'originaltext' => $item ['title'], 'id' => $item ['document_id'], 'filename' => $item ['filename'], 'cls' => $class, 'leaf' => true, 'document_type' => $item ['document_type'], 'item_type' => 'D', 'permissions' => $item ['permissions'], 'content_id' => $item ['content_id'], 'filesize' => $item ['filesize'], 'modified' => $item ['modified_date'], 'created_date' => $item ['created_date'], 'checked_out_by' => $item ['checked_out_by'], 'relevance' => $item ['relevance'], 'qtip' => $qtip, 'version' => $item ['version'], 'is_immutable' => $item ['is_immutable'] );
262 262 }
263 263  
264 264 private function _processItemInclusion_grid($item, $class, $qtip) {
... ... @@ -270,7 +270,7 @@ class kt extends client_service {
270 270 $item ['filesize'] = - 1;
271 271 }
272 272  
273   - return array ('text' => htmlspecialchars ( $item ['title'] ), 'originaltext' => $item ['title'], 'id' => $item ['id'], 'filename' => $item ['filename'], 'cls' => $class, 'owner' => $item ['created_by'], 'document_type' => $item ['document_type'], 'item_type' => $item ['item_type'], 'permissions' => $item ['permissions'], 'created_date' => $item ['created_date'], 'content_id' => $item ['content_id'], 'filesize' => $item ['filesize'], 'modified' => $item ['modified_date'], 'checked_out_by' => $item ['checked_out_by'], 'version' => $item ['version'] );
  273 + return array ('text' => htmlspecialchars ( $item ['title'] ), 'originaltext' => $item ['title'], 'id' => $item ['id'], 'filename' => $item ['filename'], 'cls' => $class, 'owner' => $item ['created_by'], 'document_type' => $item ['document_type'], 'item_type' => $item ['item_type'], 'permissions' => $item ['permissions'], 'created_date' => $item ['created_date'], 'content_id' => $item ['content_id'], 'filesize' => $item ['filesize'], 'modified' => $item ['modified_date'], 'checked_out_by' => $item ['checked_out_by'], 'version' => $item ['version'], 'is_immutable' => $item ['is_immutable'] );
274 274 }
275 275  
276 276 public function get_metadata($params) {
... ...