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

Jarrett Jordaan
2 parents 219d4e66 33b20eaf
Showing 2 changed files with 16 additions and 2 deletions
plugins/MyDropDocumentsPlugin/MyDropDocumentsPage.php
sql/mysql/install/data.sql
@@ -265,6 +265,7 @@ class MyDropDocumentsPage extends KTStandardDispatcher {
     function getUsersDocument($sUserName, $iDropDocsFolderID)
     {
         $oUser = $this->oUser;
+
         $oDropDocsFolder = Folder::get($iDropDocsFolderID);
         $fullPath = $oDropDocsFolder->getFullPath() . '/' . $sUserName;
@@ -337,7 +338,20 @@ class MyDropDocumentsPage extends KTStandardDispatcher {
             }
         }
-        $location = 'browse.php?fFolderId='.$iMyDocsFolderID;
+        $sUserName = (string)$this->oUser->getUserName();
+        $subFolders = Folder::getByParentId($iDropDocsFolderID);
+
+        $myDropFolder = false;
+        foreach ($subFolders as $sub){
+            if($sub->getName() == $sUserName){
+                $myDropFolder = $sub;
+                break;
+            }
+        }
+
+        $iMyDropDocsFolderID = $myDropFolder->getID();
+
+        $location = 'browse.php?fFolderId='.$iMyDropDocsFolderID;
         $sReturnTable .= '</tbody>'.
         '</table>'.
         '<br>'.
@@ -1377,7 +1377,7 @@ INSERT INTO `scheduler_tasks` VALUES
 (9,'Refresh Index Statistics','search2/bin/cronIndexStats.php','',0,'1min','2007-10-01',NULL,0,'enabled'),
 (10,'Refresh Resource Dependancies','search2/bin/cronResources.php','',0,'1min','2007-10-01',NULL,0,'enabled'),
 (11,'Bulk Download Queue','bin/ajaxtasks/downloadTask.php','',0,'1min','2007-10-01',NULL,0,'system'),
-(12,'Call Home','bin/system_info.php','',0,'daily','2009-10-01',NULL,0,'system');
+(12,'Call Home','bin/system_info.php','',1,'half_hourly','2009-10-01',NULL,0,'system');
 /*!40000 ALTER TABLE `scheduler_tasks` ENABLE KEYS */;
 UNLOCK TABLES;