Completed
Push — master ( 048a27...f489d7 )
by Kevin
21:58 queued 09:50
created
html/ops/delete_user.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@
 block discarded – undo
27 27
 
28 28
 die("Delete this line first\n");
29 29
 
30
-$id = (int) $argv[1];
30
+$id = (int)$argv[1];
31 31
 
32 32
 $user = BoincUser::lookup_id($id);
33 33
 if (!$user) die("no such user\n");
Please login to merge, or discard this patch.
html/inc/delete_account.inc 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
 if (!defined("DELETE_DELAY")) define("DELETE_DELAY", 2);
43 43
 
44 44
 function is_delete_account_token_valid($userid, $token) {
45
-    if (!is_valid_token($userid, $token, TOKEN_TYPE_DELETE_ACCOUNT) ) {
45
+    if (!is_valid_token($userid, $token, TOKEN_TYPE_DELETE_ACCOUNT)) {
46 46
         sleep(LOGIN_FAIL_SLEEP_SEC);
47 47
         return false;
48 48
     }
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
 //
127 127
 function is_over_but_not_validated($res) {
128 128
     if ($res->server_state == RESULT_SERVER_STATE_OVER && $res->outcome == RESULT_OUTCOME_SUCCESS &&
129
-            ($res->validate_state == VALIDATE_STATE_INIT || $res->validate_state == VALIDATE_STATE_INCONCLUSIVE) ) {
129
+            ($res->validate_state == VALIDATE_STATE_INIT || $res->validate_state == VALIDATE_STATE_INCONCLUSIVE)) {
130 130
         return true;
131 131
     }    
132 132
     return false;
@@ -144,8 +144,8 @@  discard block
 block discarded – undo
144 144
 //
145 145
 function cancel_results_for_user($user) {
146 146
     $ress = BoincResult::enum("userid = $user->id");
147
-    $cancel_clause="server_state=".RESULT_SERVER_STATE_OVER.", outcome=".RESULT_OUTCOME_CLIENT_DETACHED.", validate_state=".VALIDATE_STATE_INVALID;
148
-    $set_id_clause="hostid=0, userid=0";
147
+    $cancel_clause = "server_state=".RESULT_SERVER_STATE_OVER.", outcome=".RESULT_OUTCOME_CLIENT_DETACHED.", validate_state=".VALIDATE_STATE_INVALID;
148
+    $set_id_clause = "hostid=0, userid=0";
149 149
     foreach ($ress as $res) {
150 150
         if (is_in_progress($res) || is_over_but_not_validated($res)) {
151 151
             $res->update($cancel_clause.", ".$set_id_clause);
@@ -168,12 +168,12 @@  discard block
 block discarded – undo
168 168
 
169 169
     // delete remote submit user
170 170
     //
171
-    delete_remote_submit_user($user);  // from submit_util.inc
171
+    delete_remote_submit_user($user); // from submit_util.inc
172 172
     
173 173
     // remove user's team records
174 174
     //
175
-    user_erase_team_owner($user);      // from team.inc
176
-    user_quit_team($user);        // from team.inc
175
+    user_erase_team_owner($user); // from team.inc
176
+    user_quit_team($user); // from team.inc
177 177
     user_erase_team_delta($user); // from team.inc
178 178
     
179 179
     // Items that do not have logic elsewhere
@@ -198,6 +198,6 @@  discard block
 block discarded – undo
198 198
     BoincHost::delete_for_user($user->id);
199 199
 
200 200
     // final action
201
-    delete_user($user);  //from user_util.inc
201
+    delete_user($user); //from user_util.inc
202 202
     return 0;
203 203
 }
Please login to merge, or discard this patch.
html/inc/common_defs.inc 1 patch
Spacing   +55 added lines, -55 removed lines patch added patch discarded remove patch
@@ -27,72 +27,72 @@
 block discarded – undo
27 27
 define('BATCH_STATE_RETIRED', 4);
28 28
 
29 29
 define('ANON_PLATFORM_UNKNOWN', -1);
30
-define('ANON_PLATFORM_CPU',     -2);
31
-define('ANON_PLATFORM_NVIDIA',  -3);
32
-define('ANON_PLATFORM_ATI',     -4);
33
-define('ANON_PLATFORM_INTEL',   -5);
30
+define('ANON_PLATFORM_CPU', -2);
31
+define('ANON_PLATFORM_NVIDIA', -3);
32
+define('ANON_PLATFORM_ATI', -4);
33
+define('ANON_PLATFORM_INTEL', -5);
34 34
 
35
-define('RESULT_SERVER_STATE_INACTIVE',       1);
36
-define('RESULT_SERVER_STATE_UNSENT',         2);
37
-define('RESULT_SERVER_STATE_IN_PROGRESS',    4);
38
-define('RESULT_SERVER_STATE_OVER',           5);
35
+define('RESULT_SERVER_STATE_INACTIVE', 1);
36
+define('RESULT_SERVER_STATE_UNSENT', 2);
37
+define('RESULT_SERVER_STATE_IN_PROGRESS', 4);
38
+define('RESULT_SERVER_STATE_OVER', 5);
39 39
 
40
-define('RESULT_OUTCOME_INIT',             0);
41
-define('RESULT_OUTCOME_SUCCESS',          1);
42
-define('RESULT_OUTCOME_COULDNT_SEND',     2);
43
-define('RESULT_OUTCOME_CLIENT_ERROR',     3);
44
-define('RESULT_OUTCOME_NO_REPLY',         4);
45
-define('RESULT_OUTCOME_DIDNT_NEED',       5);
46
-define('RESULT_OUTCOME_VALIDATE_ERROR',   6);
47
-define('RESULT_OUTCOME_CLIENT_DETACHED',  7);
40
+define('RESULT_OUTCOME_INIT', 0);
41
+define('RESULT_OUTCOME_SUCCESS', 1);
42
+define('RESULT_OUTCOME_COULDNT_SEND', 2);
43
+define('RESULT_OUTCOME_CLIENT_ERROR', 3);
44
+define('RESULT_OUTCOME_NO_REPLY', 4);
45
+define('RESULT_OUTCOME_DIDNT_NEED', 5);
46
+define('RESULT_OUTCOME_VALIDATE_ERROR', 6);
47
+define('RESULT_OUTCOME_CLIENT_DETACHED', 7);
48 48
 
49
-define('VALIDATE_STATE_INIT',        0);
50
-define('VALIDATE_STATE_VALID',       1);
51
-define('VALIDATE_STATE_INVALID',     2);
52
-define('VALIDATE_STATE_NO_CHECK',    3);
53
-define('VALIDATE_STATE_INCONCLUSIVE',4);
54
-define('VALIDATE_STATE_TOO_LATE',    5);
49
+define('VALIDATE_STATE_INIT', 0);
50
+define('VALIDATE_STATE_VALID', 1);
51
+define('VALIDATE_STATE_INVALID', 2);
52
+define('VALIDATE_STATE_NO_CHECK', 3);
53
+define('VALIDATE_STATE_INCONCLUSIVE', 4);
54
+define('VALIDATE_STATE_TOO_LATE', 5);
55 55
 
56
-define('WU_ERROR_COULDNT_SEND_RESULT',           1);
57
-define('WU_ERROR_TOO_MANY_ERROR_RESULTS',        2);
58
-define('WU_ERROR_TOO_MANY_SUCCESS_RESULTS',      4);
59
-define('WU_ERROR_TOO_MANY_TOTAL_RESULTS',        8);
60
-define('WU_ERROR_CANCELLED',                     16);
61
-define('WU_ERROR_NO_CANONICAL_RESULT',           32);
56
+define('WU_ERROR_COULDNT_SEND_RESULT', 1);
57
+define('WU_ERROR_TOO_MANY_ERROR_RESULTS', 2);
58
+define('WU_ERROR_TOO_MANY_SUCCESS_RESULTS', 4);
59
+define('WU_ERROR_TOO_MANY_TOTAL_RESULTS', 8);
60
+define('WU_ERROR_CANCELLED', 16);
61
+define('WU_ERROR_NO_CANONICAL_RESULT', 32);
62 62
 
63
-define('FILE_DELETE_INIT',       0);
64
-define('FILE_DELETE_READY',      1);
65
-define('FILE_DELETE_DONE',       2);
66
-define('FILE_DELETE_ERROR',      3);
63
+define('FILE_DELETE_INIT', 0);
64
+define('FILE_DELETE_READY', 1);
65
+define('FILE_DELETE_DONE', 2);
66
+define('FILE_DELETE_ERROR', 3);
67 67
 
68
-define('ASSIMILATE_INIT',       0);
69
-define('ASSIMILATE_READY',      1);
70
-define('ASSIMILATE_DONE',       2);
68
+define('ASSIMILATE_INIT', 0);
69
+define('ASSIMILATE_READY', 1);
70
+define('ASSIMILATE_DONE', 2);
71 71
 
72 72
 // from lib/common_defs.h
73 73
 //
74
-define('RESULT_NEW',                 0);
75
-define('RESULT_FILES_DOWNLOADING',   1);
76
-define('RESULT_FILES_DOWNLOADED',    2);
77
-define('RESULT_COMPUTE_ERROR',       3);
78
-define('RESULT_FILES_UPLOADING',     4);
79
-define('RESULT_FILES_UPLOADED',      5);
80
-define('RESULT_ABORTED',             6);
81
-define('RESULT_UPLOAD_FAILED',       7);
74
+define('RESULT_NEW', 0);
75
+define('RESULT_FILES_DOWNLOADING', 1);
76
+define('RESULT_FILES_DOWNLOADED', 2);
77
+define('RESULT_COMPUTE_ERROR', 3);
78
+define('RESULT_FILES_UPLOADING', 4);
79
+define('RESULT_FILES_UPLOADED', 5);
80
+define('RESULT_ABORTED', 6);
81
+define('RESULT_UPLOAD_FAILED', 7);
82 82
 
83 83
 // from lib/error_numbers.h
84 84
 // returned by some web RPCs
85 85
 //
86
-define('ERR_XML_PARSE',               -112);
87
-define('ERR_DB_NOT_FOUND',            -136);
88
-define('ERR_DB_NOT_UNIQUE',           -137);
89
-define('ERR_DB_CANT_CONNECT',         -138);
90
-define('ERR_PROJECT_DOWN',            -183);
91
-define('ERR_BAD_USER_NAME',           -188);
92
-define('ERR_NO_OPTION',               -191);
93
-define('ERR_BAD_EMAIL_ADDR',          -205);
94
-define('ERR_BAD_PASSWD',              -206);
95
-define('ERR_ACCT_CREATION_DISABLED',  -208);
96
-define('ERR_ATTACH_FAIL_INIT',        -209);
97
-define('ERR_ATTACH_FAIL_DOWNLOAD',    -210);
86
+define('ERR_XML_PARSE', -112);
87
+define('ERR_DB_NOT_FOUND', -136);
88
+define('ERR_DB_NOT_UNIQUE', -137);
89
+define('ERR_DB_CANT_CONNECT', -138);
90
+define('ERR_PROJECT_DOWN', -183);
91
+define('ERR_BAD_USER_NAME', -188);
92
+define('ERR_NO_OPTION', -191);
93
+define('ERR_BAD_EMAIL_ADDR', -205);
94
+define('ERR_BAD_PASSWD', -206);
95
+define('ERR_ACCT_CREATION_DISABLED', -208);
96
+define('ERR_ATTACH_FAIL_INIT', -209);
97
+define('ERR_ATTACH_FAIL_DOWNLOAD', -210);
98 98
 ?>
Please login to merge, or discard this patch.