From 4833d8b062ae5b4d2e6b97edfc62af0bb8fda9fe Mon Sep 17 00:00:00 2001
From: Jarrett Jordaan <jarrett@knowledgetree.com>
Date: Tue, 15 Dec 2009 16:51:23 +0200
Subject: [PATCH] Code cleanup.

---
 lib/actions/bulkaction.php                   |  8 ++++----
 lib/foldermanagement/folderutil.inc.php      |  5 +----
 lib/import/bulkimport.inc.php                |  3 +--
 lib/subscriptions/subscriptions.inc.php      | 10 ++--------
 lib/users/User.inc                           | 14 ++------------
 lib/workflow/workflowtriggerinstance.inc.php |  2 --
 6 files changed, 10 insertions(+), 32 deletions(-)

diff --git a/lib/actions/bulkaction.php b/lib/actions/bulkaction.php
index a36fdf0..9cf11e3 100644
--- a/lib/actions/bulkaction.php
+++ b/lib/actions/bulkaction.php
@@ -49,9 +49,7 @@ require_once(KT_LIB_DIR . '/documentmanagement/documentutil.inc.php');
 require_once(KT_LIB_DIR . '/widgets/forms.inc.php');
 
 require_once(KT_LIB_DIR . "/util/sanitize.inc");
-
-// // Jarrett Jordaan: Deal with bulk action
-require_once(KT_LIB_DIR . '/subscriptions/subscriptions.inc.php');
+require_once(KT_LIB_DIR . '/subscriptions/subscriptions.inc.php'); // Deal with bulk action
 
 class KTBulkAction extends KTStandardDispatcher {
     var $sName;
@@ -603,7 +601,9 @@ class KTBulkAction extends KTStandardDispatcher {
                                         'form' => $this->form_complete()));
     }
 
-    // Jarrett Jordaan: Deal with bulk actions
+    /**
+     * Deal with bulk actions
+     */
     function do_notification($objects, $eventAction, $targetFolder) {
         // Make sure there were documents/folders affected
         if ($targetFolder && count($objects) > 0 && $eventAction != '') {
diff --git a/lib/foldermanagement/folderutil.inc.php b/lib/foldermanagement/folderutil.inc.php
index 00d25f8..c07af57 100644
--- a/lib/foldermanagement/folderutil.inc.php
+++ b/lib/foldermanagement/folderutil.inc.php
@@ -77,11 +77,8 @@ class KTFolderUtil {
         return $oFolder;
     }
 
-     /*
+     /**
       * Folder Add
-      * Author  :   Jarrett Jordaan
-      * Modified    :   28/04/09
-      *
       * @params :   KTDocumentUtil $oParentFolder
       *             string $sFolderName
       *             KTUser $oUser
diff --git a/lib/import/bulkimport.inc.php b/lib/import/bulkimport.inc.php
index e73fc59..1b76a4c 100644
--- a/lib/import/bulkimport.inc.php
+++ b/lib/import/bulkimport.inc.php
@@ -40,8 +40,7 @@
 require_once(KT_LIB_DIR . '/foldermanagement/folderutil.inc.php');
 require_once(KT_LIB_DIR . '/documentmanagement/documentutil.inc.php');
 require_once(KT_LIB_DIR . '/filelike/filelikeutil.inc.php');
-// // Jarrett Jordaan: Deal with bulk action
-require_once(KT_LIB_DIR . '/subscriptions/subscriptions.inc.php');
+require_once(KT_LIB_DIR . '/subscriptions/subscriptions.inc.php'); // Deal with bulk action
 
 class KTBulkImportManager {
     var $oStorage;
diff --git a/lib/subscriptions/subscriptions.inc.php b/lib/subscriptions/subscriptions.inc.php
index 8633362..32cb9ee 100644
--- a/lib/subscriptions/subscriptions.inc.php
+++ b/lib/subscriptions/subscriptions.inc.php
@@ -97,11 +97,8 @@ class SubscriptionEvent {
      * Every attempt is made to be as explicit as possible.
      */
 
-     /*
+     /**
       * Notification of bulk upload
-      * Author  :   Jarrett Jordaan
-      * Date    :   27/04/09
-      *
       * @params :   KTDocumentUtil $oDocObjects
       *             KTFolderUtil $oParentFolder
       */
@@ -115,11 +112,8 @@ class SubscriptionEvent {
         }
     }
 
-     /*
+     /**
       * Bulk upload email notification handler
-      * Author  :    Jarrett Jordaan
-      * Date    :   27/04/09
-      *
       * @params :   User $aUsers
       *             string $eventType
       *             KTDocumentUtil $oDocObjects
diff --git a/lib/users/User.inc b/lib/users/User.inc
index d4d68f2..49cd058 100644
--- a/lib/users/User.inc
+++ b/lib/users/User.inc
@@ -461,10 +461,8 @@ class User extends KTEntity {
         return KTEntityUtil::getList2('User', $sWhereClause);
     }
 
-    /*
-     * Modified : Jarrett Jordaan
-     * Added : Get new users
-     * Date : 24/04/09
+    /**
+     * Get new users
      *
      */
     function getByLastLoginNever() {
@@ -473,17 +471,9 @@ class User extends KTEntity {
         return KTEntityUtil::getList2('User', $sWhereClause, $aOptions);
     }
 
-    /*
-     * Modified : Jarrett Jordaan
-     * Added : Filter out disabled users
-     * Date : 24/04/09
-     * Added : Removed disabled users Filter
-     * Date : 24/04/09
-     */
     function getByLastLoginAfter($dDateTime) {
         return KTEntityUtil::getByDict('User', array(
             'last_login' => array('type' => 'after', 'value' => $dDateTime),
-//            'disabled' => 0,
         ), array('multi' => true));
     }
 
diff --git a/lib/workflow/workflowtriggerinstance.inc.php b/lib/workflow/workflowtriggerinstance.inc.php
index 0fae208..0a1a15d 100644
--- a/lib/workflow/workflowtriggerinstance.inc.php
+++ b/lib/workflow/workflowtriggerinstance.inc.php
@@ -72,8 +72,6 @@ class KTWorkflowTriggerInstance extends KTEntity {
     function &get($iId) { return KTEntityUtil::get('KTWorkflowTriggerInstance', $iId); }
 
     function &createFromArray($aOptions) {
-        // Modified : Jarrett Jordaan
-        // Removed Serialize, since the original is serialized already
         $aOptions['configarraytext'] = $aOptions['config'];
         unset($aOptions['config']);
         return KTEntityUtil::createFromArray('KTWorkflowTriggerInstance', $aOptions); 
--
libgit2 0.21.4