Peter M. Groen / knowledgetree

Commit 31335e9ffd668b81ee4cecdc4e252f610d82140a

Authored by bshuttle
1 parent 28dafa84

duplicate and correct usage of implode and $default 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5505 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 38 additions and 56 deletions
lib/authentication/DBAuthenticator.inc
  View file @31335e9
... ... @@ -37,7 +37,6 @@ class DBAuthenticator extends Authenticator {
37 37 function checkPassword($userName, $password) {
38 38 global $default;
39 39  
40   - $sql = $default->db;
41 40 $sTable = KTUtil::getTableName('users');
42 41 $sQuery = "SELECT count(*) AS match_count FROM $sTable WHERE username = ? AND password = ?";
43 42 $aParams = array($userName, md5($password));
... ... @@ -58,13 +57,9 @@ class DBAuthenticator extends Authenticator {
58 57 function getUser($sUserName, $aAttributes) {
59 58 global $default;
60 59  
61   - $sql = $default->db;
62 60 $sTable = KTUtil::getTableName('users');
63 61 $sQuery = "SELECT ";/*ok*/
64   - // build select
65   - for ($i=0; $i<count($aAttributes); $i++) {
66   - $sQuery .= $aAttributes[$i] . (( ($i+1) == count($aAttributes) ) ? "" : ", ");
67   - }
  62 + $sQuery .= implode(', ', $aAttributes);
68 63 $sQuery .= " FROM $sTable WHERE username = ?";
69 64 $aParams = array($sUserName);
70 65 $res = DBUtil::getResultArray(array($sQuery, $aParams));
... ... @@ -89,8 +84,6 @@ class DBAuthenticator extends Authenticator {
89 84 * @return array containing the users found
90 85 */
91 86 function searchUsers($sUserNameSearch, $aAttributes) {
92   - global $default;
93   -
94 87 $sTable = KTUtil::getTableName('users');
95 88 $sQuery = "SELECT "; /*ok*/
96 89 $sQuery .= implode(', ', $aAttributes);
... ...
lib/authentication/builtinauthenticationprovider.inc.php
  View file @31335e9
... ... @@ -245,19 +245,16 @@ class BuiltinAuthenticator extends Authenticator {
245 245 function checkPassword($oUser, $password) {
246 246 global $default;
247 247  
248   - $sql = $default->db;
249 248 $userName = $oUser->getUserName();
250   - $sQuery = "SELECT * FROM $default->users_table WHERE username = ? AND password = ?";/*ok*/
  249 + $sTable = KTUtil::getTableName('users');
  250 + $sQuery = "SELECT count(*) AS match_count FROM $sTable WHERE username = ? AND password = ?";
251 251 $aParams = array($userName, md5($password));
252   - if ($sql->query(array($sQuery, $aParams))) {
253   - if ($sql->num_rows($sql) == "1") {
254   - return true;
255   - } else {
256   - return false;
257   - }
258   - } else {
259   - return false;
  252 + $res = DBUtil::getOneResultKey(array($sQuery, $aParams), 'match_count');
  253 + if (PEAR::isError($res)) { return false; }
  254 + else {
  255 + return ($res == 1);
260 256 }
  257 +
261 258 }
262 259  
263 260 /**
... ... @@ -268,28 +265,24 @@ class BuiltinAuthenticator extends Authenticator {
268 265 * @return array containing the users found
269 266 */
270 267 function getUser($sUserName, $aAttributes) {
271   - global $default;
272   -
273   - $sql = $default->db;
  268 + $sTable = KTUtil::getTableName('users');
274 269 $sQuery = "SELECT ";/*ok*/
275   - // build select
276   - for ($i=0; $i<count($aAttributes); $i++) {
277   - $sQuery .= $aAttributes[$i] . (( ($i+1) == count($aAttributes) ) ? "" : ", ");
278   - }
279   - $sQuery .= " FROM $default->users_table WHERE username = ?";
  270 + $sQuery .= implode(', ', $aAttributes);
  271 + $sQuery .= " FROM $sTable WHERE username = ?";
280 272 $aParams = array($sUserName);
281   -
282   - if ($sql->query(array($sQuery, $aParams))) {
283   - $aUserResults = array();
284   - while ($sql->next_record()) {
285   - for ($i=0; $i<count($aAttributes); $i++) {
286   - $aUserResults["$sUserName"]["$aAttributes[$i]"] = $sql->f($aAttributes[$i]);
287   - }
288   - }
289   - return $aUserResults;
290   - } else {
291   - return false;
  273 + $res = DBUtil::getResultArray(array($sQuery, $aParams));
  274 + if (PEAR::isError($res)) {
  275 + return false;
292 276 }
  277 +
  278 + $aUserResults = array();
  279 + foreach ($res as $aRow) {
  280 + foreach ($aAttributes as $sAttrName) {
  281 + $aUserResults[$sUserName][$sAttrName] = $aRow[$sAttrName];
  282 + }
  283 + }
  284 + return $aUserResults;
  285 +
293 286 }
294 287  
295 288 /**
... ... @@ -300,28 +293,24 @@ class BuiltinAuthenticator extends Authenticator {
300 293 * @return array containing the users found
301 294 */
302 295 function searchUsers($sUserNameSearch, $aAttributes) {
303   - global $default;
304   -
305   - $sql = $default->db;
306   - $sQuery = "SELECT ";/*ok*/
307   - // build select
308   - for ($i=0; $i<count($aAttributes); $i++) {
309   - $sQuery .= $aAttributes[$i] . (( ($i+1) == count($aAttributes) ) ? "" : ", ");
  296 + $sTable = KTUtil::getTableName('users');
  297 + $sQuery = "SELECT "; /*ok*/
  298 + $sQuery .= implode(', ', $aAttributes);
  299 + $sQuery .= " FROM $sTable where username like '%" . DBUtil::escapeSimple($sUserNameSearch) . "%'";
  300 +
  301 + $res = DBUtil::getResultArray(array($sQuery, array()));
  302 + if (PEAR::isError($res)) {
  303 + return false; // return $res;
310 304 }
311   - $sQuery .= " FROM $default->users_table where username like '%" . DBUtil::escapeSimple($sUserNameSearch) . "%'";
312   -
313   - if ($sql->query($sQuery)) {
314   - $aUserResults = array();
315   - while ($sql->next_record()) {
316   - $sUserName = $sql->f("username");
317   - for ($i=0; $i<count($aAttributes); $i++) {
318   - $aUserResults["$sUserName"]["$aAttributes[$i]"] = $sql->f($aAttributes[$i]);
319   - }
  305 +
  306 + $aUserResults = array();
  307 + foreach ($res as $aRow) {
  308 + $sUserName = $aRow['username'];
  309 + foreach ($aAttributes as $sAttrName) {
  310 + $aUserResults[$sUserName][$sAttrName] = $aRow[$sAttrName];
320 311 }
321   - return $aUserResults;
322   - } else {
323   - return false;
324 312 }
  313 + return $aUserResults;
325 314 }
326 315 }
327 316  
... ...