Peter M. Groen / knowledgetree

Commit aff1257e4fdb1089f8a5b0cc84df71f7a1bd44ed

Authored by Jarrett Jordaan
2 parents 219d4e66 33b20eaf

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

Inline Side-by-side
Showing 2 changed files with 16 additions and 2 deletions
plugins/MyDropDocumentsPlugin/MyDropDocumentsPage.php
  View file @aff1257
... ... @@ -265,6 +265,7 @@ class MyDropDocumentsPage extends KTStandardDispatcher {
265 265 function getUsersDocument($sUserName, $iDropDocsFolderID)
266 266 {
267 267 $oUser = $this->oUser;
  268 +
268 269 $oDropDocsFolder = Folder::get($iDropDocsFolderID);
269 270  
270 271 $fullPath = $oDropDocsFolder->getFullPath() . '/' . $sUserName;
... ... @@ -337,7 +338,20 @@ class MyDropDocumentsPage extends KTStandardDispatcher {
337 338 }
338 339 }
339 340  
340   - $location = 'browse.php?fFolderId='.$iMyDocsFolderID;
  341 + $sUserName = (string)$this->oUser->getUserName();
  342 + $subFolders = Folder::getByParentId($iDropDocsFolderID);
  343 +
  344 + $myDropFolder = false;
  345 + foreach ($subFolders as $sub){
  346 + if($sub->getName() == $sUserName){
  347 + $myDropFolder = $sub;
  348 + break;
  349 + }
  350 + }
  351 +
  352 + $iMyDropDocsFolderID = $myDropFolder->getID();
  353 +
  354 + $location = 'browse.php?fFolderId='.$iMyDropDocsFolderID;
341 355 $sReturnTable .= '</tbody>'.
342 356 '</table>'.
343 357 '<br>'.
... ...
sql/mysql/install/data.sql
  View file @aff1257
... ... @@ -1377,7 +1377,7 @@ INSERT INTO `scheduler_tasks` VALUES
1377 1377 (9,'Refresh Index Statistics','search2/bin/cronIndexStats.php','',0,'1min','2007-10-01',NULL,0,'enabled'),
1378 1378 (10,'Refresh Resource Dependancies','search2/bin/cronResources.php','',0,'1min','2007-10-01',NULL,0,'enabled'),
1379 1379 (11,'Bulk Download Queue','bin/ajaxtasks/downloadTask.php','',0,'1min','2007-10-01',NULL,0,'system'),
1380   -(12,'Call Home','bin/system_info.php','',0,'daily','2009-10-01',NULL,0,'system');
  1380 +(12,'Call Home','bin/system_info.php','',1,'half_hourly','2009-10-01',NULL,0,'system');
1381 1381  
1382 1382 /*!40000 ALTER TABLE `scheduler_tasks` ENABLE KEYS */;
1383 1383 UNLOCK TABLES;
... ...