clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

More usage of dbm::is_result($r) instead of count($r):

Browse Source 
- count() returns very different results and never a boolean (not even false on
  error condition).
- therefore you should NOT use it in boolean expressions. This still *can* be
  done in PHP because of its lazyness. But it is discouraged if it comes to
  more clean code.

Signed-off-by: Roland Häder <roland@mxchange.org>
This commit is contained in:
Roland Häder
2016-12-13 10:44:13 +01:00
parent 293436e5fd
commit 6a8a36f12d
115 changed files with 439 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/user.php
View File

@@ -130,7 +130,7 @@ function create_user($arr) {
$r = q("SELECT * FROM `user` WHERE `email` = '%s' LIMIT 1",
dbesc($email)
);
if(count($r))
if(dbm::is_result($r))
$result['message'] .= t('Cannot use that email.') . EOL;
}
@@ -143,7 +143,7 @@ function create_user($arr) {
WHERE `nickname` = '%s' LIMIT 1",
dbesc($nickname)
);
if(count($r))
if(dbm::is_result($r))
$result['message'] .= t('Nickname is already registered. Please choose another.') . EOL;
// Check deleted accounts that had this nickname. Doesn't matter to us,
@@ -153,7 +153,7 @@ function create_user($arr) {
WHERE `username` = '%s' LIMIT 1",
dbesc($nickname)
);
if(count($r))
if(dbm::is_result($r))
$result['message'] .= t('Nickname was once registered here and may not be re-used. Please choose another.') . EOL;
if(strlen($result['message'])) {
@@ -222,7 +222,7 @@ function create_user($arr) {
dbesc($username),
dbesc($new_password_encoded)
);
if($r !== false && count($r)) {
if(dbm::is_result($r)) {
$u = $r[0];
$newuid = intval($r[0]['uid']);
}
@@ -302,7 +302,7 @@ function create_user($arr) {
intval($newuid),
dbesc(t('Friends'))
);
if($r && count($r)) {
if(dbm::is_result($r)) {
$def_gid = $r[0]['id'];
q("UPDATE `user` SET `def_gid` = %d WHERE `uid` = %d",