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

Megan Watson
2 parents 0989bdd4 4833d8b0
Showing 8 changed files with 40 additions and 75 deletions
lib/actions/bulkaction.php
lib/foldermanagement/folderutil.inc.php
lib/import/bulkimport.inc.php
lib/subscriptions/subscriptions.inc.php
lib/users/User.inc
lib/workflow/workflowtriggerinstance.inc.php
setup/upgrade/steps/upgradeWelcome.php
setup/upgrade/templates/welcome.tpl
@@ -49,9 +49,7 @@ require_once(KT_LIB_DIR . &#39;/documentmanagement/documentutil.inc.php&#39;);
 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 != '') {
@@ -77,11 +77,8 @@ class KTFolderUtil {
         return $oFolder;
     }
-     /*
+     /**
       * Folder Add
-      * Author  :   Jarrett Jordaan
-      * Modified    :   28/04/09
-      *
       * @params :   KTDocumentUtil $oParentFolder
       *             string $sFolderName
       *             KTUser $oUser
@@ -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;
@@ -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
@@ -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));
     }
@@ -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); 
@@ -84,50 +84,37 @@ class upgradeWelcome extends step {
         return true;
     }
-    private function checkPassword($username, $password) {
-    	$upgradeOnly = false;
-
-    	if(isset($_POST['upgradeOnly'])) $upgradeOnly = $_POST['upgradeOnly'];
-    	$dconf = $this->getDataFromPackage('installers', 'database'); // Use info from install
-    	if($dconf) { // From Install
-	    	$this->util->dbUtilities->load($dconf['dhost'], $dconf['dport'], $dconf['duname'], $dconf['dpassword'], $dconf['dname']);
-			$sQuery = "SELECT count(*) AS match_count FROM users WHERE username = '$username' AND password = '".md5($password)."'";
-			$res = $this->util->dbUtilities->query($sQuery);
-			$ass = $this->util->dbUtilities->fetchAssoc($res);
-			if($ass[0]['match_count'] == 1)
-				return true;
-    	} elseif($upgradeOnly) {
-    		require_once("../wizard/steps/configuration.php"); // configuration to read the ini path
-    		$wizConfigHandler = new configuration();
-    		$configPath = $wizConfigHandler->readConfigPathIni();
-			$this->util->iniUtilities->load($configPath);
-			$dconf = $this->util->iniUtilities->getSection('db');
-    		$this->util->dbUtilities->load($dconf['dbHost'],$dconf['dbPort'], $dconf['dbUser'], $dconf['dbPass'], $dconf['dbName']);
-			$sQuery = "SELECT count(*) AS match_count FROM users WHERE username = '$username' AND password = '".md5($password)."'";
+	private function checkPassword($username, $password) {
+		$dconf = $this->getDataFromPackage('installers', 'database'); // Use info from install
+		if($dconf) { // From Install
+			$this->util->dbUtilities->load($dconf['dhost'], $dconf['dport'], $dconf['duname'], $dconf['dpassword'], $dconf['dname']);
+		} else { // Upgrade
+			require_once("../wizard/steps/configuration.php"); // configuration to read the ini path
+			$wizConfigHandler = new configuration();
+			$configPath = $wizConfigHandler->readConfigPathIni();
+			if($configPath) {
+				$this->util->iniUtilities->load($configPath);
+				$dconf = $this->util->iniUtilities->getSection('db');
+				$this->util->dbUtilities->load($dconf['dbHost'],$dconf['dbPort'], $dconf['dbUser'], $dconf['dbPass'], $dconf['dbName']);
+			}
+		}
+		$sQuery = "SELECT * FROM users WHERE username = '$username' AND password = '".md5($password)."'";
+		$res = $this->util->dbUtilities->query($sQuery);
+		$ass = $this->util->dbUtilities->fetchAssoc($res);
+		if($ass[0]['id'] != "") {
+			$user_id = $ass[0]['id'];
+			$sQuery = "SELECT count(*) AS match_count FROM users_groups_link WHERE user_id = $user_id AND group_id = 1";
 			$res = $this->util->dbUtilities->query($sQuery);
 			$ass = $this->util->dbUtilities->fetchAssoc($res);
-			if($ass[0]['match_count'] == 1)
+			if($ass[0]['match_count'] == 1) 
 				return true;
-    	} else { // Upgrade
-    		require_once("../wizard/steps/configuration.php"); // configuration to read the ini path
-    		$wizConfigHandler = new configuration();
-    		$configPath = $wizConfigHandler->readConfigPathIni();
-    		if($configPath) {
-				$this->util->iniUtilities->load($configPath);
-				$dconf = $this->util->iniUtilities->getSection('db');
-	    		$this->util->dbUtilities->load($dconf['dbHost'],$dconf['dbPort'], $dconf['dbUser'], $dconf['dbPass'], $dconf['dbName']);
-				$sQuery = "SELECT count(*) AS match_count FROM users WHERE username = '$username' AND password = '".md5($password)."'";
-				$res = $this->util->dbUtilities->query($sQuery);
-				$ass = $this->util->dbUtilities->fetchAssoc($res);
-				if($ass[0]['match_count'] == 1)
-					return true;
-    		}
-    	}
-        $this->error[] = 'Could Not Authenticate User';
-        return false;
-
-    }
-
+			$this->error[] = 'You need Administrative Rights';
+			return false;
+		}
+		$this->error[] = 'Could Not Authenticate User';
+		return false;
+	}
+    
     public function getErrors() {
     	return $this->error;
     }
@@ -11,7 +11,7 @@
             <table>
                 <tr><td>Username</td><td><input id="username" name=username></td></tr>
                 <tr><td>Password</td><td><input name=password type="password"></td></tr>
-                <?php if (!empty($errors)) { ?><tr><td></td><td><span class="error">Could Not Authenticate User</span></td></tr> <?php } ?>
+                <?php if (!empty($errors)) { ?><tr><td></td><td><span class="error"><?php echo $errors[0]; ?></span></td></tr> <?php } ?>
             </table>
         </div>
@@ -30,4 +30,4 @@
 <script type="text/javascript">
 	$('#username').focus();
 </script>
-<?php if (AJAX) { echo $html->js('form.js'); } ?>
 \ No newline at end of file
+<?php if (AJAX) { echo $html->js('form.js'); } ?>