Peter M. Groen / knowledgetree

Commit 733533e9edec130844496662de9c6e693e7d964f

Authored by Megan Watson
2 parents 663be510 87be5e7f

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

Inline Side-by-side
Showing 2 changed files with 7 additions and 4 deletions
webservice/clienttools/services/0.9/auth.php
  View file @733533e
@@ -147,6 +147,7 @@ class auth extends client_service { @@ -147,6 +147,7 @@ class auth extends client_service {
147 session_id($newSessId); 147 session_id($newSessId);
148 $this->Response->setStatus('session_id',$newSessId); 148 $this->Response->setStatus('session_id',$newSessId);
149 $this->setResponse(array('logout'=>true)); 149 $this->setResponse(array('logout'=>true));
  150 + session_destroy();
150 return true; 151 return true;
151 } 152 }
152 153
webservice/clienttools/services/0.9/kt.php
  View file @733533e
@@ -17,7 +17,9 @@ class kt extends client_service { @@ -17,7 +17,9 @@ class kt extends client_service {
17 17
18 if (! empty ( $aRegisteredLangs )) { 18 if (! empty ( $aRegisteredLangs )) {
19 foreach ( array_keys ( $aRegisteredLangs ) as $sLang ) { 19 foreach ( array_keys ( $aRegisteredLangs ) as $sLang ) {
20 - $languages [] = array ('isoCode' => $sLang, 'language' => $aLanguageNames [$sLang] ); 20 + if($sLang=='en') $languages [] = array ('isoCode' => $sLang, 'language' => $aLanguageNames [$sLang] );
  21 + $this->logTrace ((__METHOD__.'('.__FILE__.' '.__LINE__.')'), "Removing Language {$aLanguageNames[$sLang]} from the list because Language Support not Ready." );
  22 +
21 } 23 }
22 } 24 }
23 $response = array ('languages' => $languages, 'count' => count ( $languages ), 'defaultLanguage' => $default->defaultLanguage ); 25 $response = array ('languages' => $languages, 'count' => count ( $languages ), 'defaultLanguage' => $default->defaultLanguage );
@@ -248,7 +250,7 @@ class kt extends client_service { @@ -248,7 +250,7 @@ class kt extends client_service {
248 250
249 private function _processItemInclusion_folderContents($item, $class, $qtip) { 251 private function _processItemInclusion_folderContents($item, $class, $qtip) {
250 $this->logTrace ((__METHOD__.'('.__FILE__.' '.__LINE__.')'), 'Enter Function' ); 252 $this->logTrace ((__METHOD__.'('.__FILE__.' '.__LINE__.')'), 'Enter Function' );
251 - 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'] );
252 } 254 }
253 255
254 private function _processItemInclusion_search($item, $class, $qtip) { 256 private function _processItemInclusion_search($item, $class, $qtip) {
@@ -256,7 +258,7 @@ class kt extends client_service { @@ -256,7 +258,7 @@ class kt extends client_service {
256 if ($item ['filesize'] == 'n/a') { 258 if ($item ['filesize'] == 'n/a') {
257 $item ['filesize'] = - 1; 259 $item ['filesize'] = - 1;
258 } 260 }
259 - 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'] );
260 } 262 }
261 263
262 private function _processItemInclusion_grid($item, $class, $qtip) { 264 private function _processItemInclusion_grid($item, $class, $qtip) {
@@ -268,7 +270,7 @@ class kt extends client_service { @@ -268,7 +270,7 @@ class kt extends client_service {
268 $item ['filesize'] = - 1; 270 $item ['filesize'] = - 1;
269 } 271 }
270 272
271 - 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'] );
272 } 274 }
273 275
274 public function get_metadata($params) { 276 public function get_metadata($params) {