Peter M. Groen / knowledgetree

Commit 78648bf90f4b36056bdc2da01f4e62e3a9016b3e

Authored by Jarrett Jordaan
1 parent 4abb8efe

Start Upgrade Refactor 

Committed by: Jarrett Jordaan

Reviewed by: Megan Watson
Inline Side-by-side
Showing 1 changed file with 29 additions and 1 deletions
setup/upgrade/steps/upgradeWelcome.php
  View file @78648bf
@@ -40,6 +40,9 @@ @@ -40,6 +40,9 @@
40 * @version Version 0.1 40 * @version Version 0.1
41 */ 41 */
42 42
  43 +require_once('../../config/dmsDefaults.php');
  44 +require_once KT_LIB_DIR . '/authentication/authenticationutil.inc.php';
  45 +
43 class upgradeWelcome extends step { 46 class upgradeWelcome extends step {
44 47
45 protected $silent = false; 48 protected $silent = false;
@@ -63,16 +66,22 @@ class upgradeWelcome extends step { @@ -63,16 +66,22 @@ class upgradeWelcome extends step {
63 // attempt login 66 // attempt login
64 $username = $_REQUEST['username']; 67 $username = $_REQUEST['username'];
65 $password = $_REQUEST['password']; 68 $password = $_REQUEST['password'];
  69 +
66 $authenticated = $this->checkPassword($username, $password); 70 $authenticated = $this->checkPassword($username, $password);
67 - if (!$authenticated) { 71 +
  72 + if (!$authenticated)
  73 + {
68 session_unset(); 74 session_unset();
69 return false; 75 return false;
70 } 76 }
  77 +
71 $_SESSION['setup_user'] = $username; 78 $_SESSION['setup_user'] = $username;
  79 +
72 return true; 80 return true;
73 } 81 }
74 82
75 private function checkPassword($username, $password) { 83 private function checkPassword($username, $password) {
  84 +/*
76 $dconf = $this->getDataFromPackage('installers', 'database'); 85 $dconf = $this->getDataFromPackage('installers', 'database');
77 $this->dbhandler->load($dconf['dhost'], $dconf['duname'], $dconf['dpassword'], $dconf['dname']); 86 $this->dbhandler->load($dconf['dhost'], $dconf['duname'], $dconf['dpassword'], $dconf['dname']);
78 $sQuery = "SELECT count(*) AS match_count FROM users WHERE username = '$username' AND password = '".md5($password)."'"; 87 $sQuery = "SELECT count(*) AS match_count FROM users WHERE username = '$username' AND password = '".md5($password)."'";
@@ -83,6 +92,25 @@ class upgradeWelcome extends step { @@ -83,6 +92,25 @@ class upgradeWelcome extends step {
83 return true; 92 return true;
84 } 93 }
85 return false; 94 return false;
  95 + */
  96 +
  97 + global $default;
  98 +
  99 + $sTable = KTUtil::getTableName('users');
  100 + $sQuery = "SELECT count(*) AS match_count FROM $sTable WHERE username = ? AND password = ?";
  101 + $aParams = array($username, md5($password));
  102 + $res = DBUtil::getOneResultKey(array($sQuery, $aParams), 'match_count');
  103 + if (PEAR::isError($res)) { return false; }
  104 + else {
  105 + $sTable = KTUtil::getTableName('users_groups_link');
  106 + $sQuery = "SELECT count(*) AS match_count FROM $sTable WHERE user_id = ? AND group_id = 1";
  107 + $aParams = array($res);
  108 + $res = DBUtil::getOneResultKey(array($sQuery, $aParams), 'match_count');
  109 + if (PEAR::isError($res)) { return false; }
  110 + else {
  111 + return ($res == 1);
  112 + }
  113 + }
86 } 114 }
87 115
88 } 116 }