Completed
Pull Request — master (#2135)
by Christian
10:38
created
drupal/sites/all/features/spam_controls/spam_controls.features.inc 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -7,8 +7,7 @@
 block discarded – undo
7 7
   list($module, $api) = func_get_args();
8 8
   if ($module == "context" && $api == "context") {
9 9
     return array("version" => 3);
10
-  }
11
-  elseif ($module == "strongarm" && $api == "strongarm") {
10
+  } elseif ($module == "strongarm" && $api == "strongarm") {
12 11
     return array("version" => 1);
13 12
   }
14 13
 }
Please login to merge, or discard this patch.
drupal/sites/all/features/discussion_forums/discussion_forums.features.inc 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -7,8 +7,7 @@
 block discarded – undo
7 7
   list($module, $api) = func_get_args();
8 8
   if ($module == "context" && $api == "context") {
9 9
     return array("version" => 3);
10
-  }
11
-  elseif ($module == "strongarm" && $api == "strongarm") {
10
+  } elseif ($module == "strongarm" && $api == "strongarm") {
12 11
     return array("version" => 1);
13 12
   }
14 13
 }
Please login to merge, or discard this patch.
html/ops/bbcode_convert_response2.php 1 patch
Braces   +4 added lines, -3 removed lines patch added patch discarded remove patch
@@ -43,14 +43,15 @@
 block discarded – undo
43 43
     $profiles = _mysql_query("select * from profile where userid>$start_id order by userid");
44 44
     echo _mysql_error();
45 45
     $i=0;
46
-    while ($profile = _mysql_fetch_object($profiles)){
46
+    while ($profile = _mysql_fetch_object($profiles)) {
47 47
         $i++; 
48
-        if ($i%100 == 0) {                      //For every 100 profiles
48
+        if ($i%100 == 0) {
49
+//For every 100 profiles
49 50
             echo $profile->userid.". "; flush();   // print out where we are
50 51
             //usleep(200000);
51 52
         }
52 53
         
53
-        if ($profile->userid > $start_id){
54
+        if ($profile->userid > $start_id) {
54 55
             fix_profile($profile);
55 56
         }
56 57
     }
Please login to merge, or discard this patch.
html/ops/bolt_map.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -243,7 +243,7 @@
 block discarded – undo
243 243
             <td><br></td>
244 244
             <td><br></td>
245 245
         ";
246
-    } else  {
246
+    } else {
247 247
         $c = class_name($class);
248 248
         echo "
249 249
             <td><b>".spaces($level)."$unit->name</b></td>
Please login to merge, or discard this patch.
html/ops/make_emails_lowercase.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -75,8 +75,7 @@  discard block
 block discarded – undo
75 75
   if (!(strcmp($cpid,"0"))) {
76 76
     $newcpid=random_string();
77 77
     echo "Problematic CPID=0 for [$id] $email_addr gets CPID=$newcpid<br/>";
78
-  }
79
-  else
78
+  } else
80 79
     $newcpid=$cpid;
81 80
   
82 81
   if (strcmp($email_addr, $new_email) || strcmp($newcpid,$cpid)) {
@@ -84,8 +83,7 @@  discard block
 block discarded – undo
84 83
     if ($confirm != "yes") {
85 84
       echo "QUERY WOULD BE [$id] $query <br/>[click the link at the bottom to enable]<br/>";
86 85
       $update_needed = TRUE;
87
-    }
88
-    else {
86
+    } else {
89 87
       _mysql_query($update);
90 88
       echo "Doing $update<br/>\n";
91 89
     }
Please login to merge, or discard this patch.
html/ops/manage_special_users.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
37 37
     FROM forum_preferences as prefs, user 
38 38
     WHERE CONVERT(special_user, DECIMAL) > 0 and prefs.userid=user.id"
39 39
 );
40
-for ($i=1; $i<=_mysql_num_rows($result); $i++){
40
+for ($i=1; $i<=_mysql_num_rows($result); $i++) {
41 41
 	$foo = _mysql_fetch_object($result);
42 42
     echo "<form action=\"manage_special_users_action.php\" method=\"POST\">\n";
43 43
     echo "<input type=\"hidden\" name=\"userid\" value=\"$foo->userid\"
Please login to merge, or discard this patch.
html/ops/manage_user.php 1 patch
Braces   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -39,8 +39,8 @@  discard block
 block discarded – undo
39 39
 
40 40
 // Delete a user if they have no credit, results, or posts
41 41
 //
42
-function possibly_delete_user($user){
43
-    if ($user->total_credit > 0.0){
42
+function possibly_delete_user($user) {
43
+    if ($user->total_credit > 0.0) {
44 44
         admin_error_page("Cannot delete user: User has credit.");
45 45
     }  
46 46
 
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
         admin_error_page("Cannot delete user: User has forum posts.");
57 57
     }
58 58
 
59
-    if ($user->teamid){
59
+    if ($user->teamid) {
60 60
         user_quit_team($user);
61 61
     }
62 62
     delete_user($user);
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
 
101 101
             // put a timestamp in wiki to trigger re-validation of credentials
102 102
 
103
-            if (function_exists('touch_wiki_user')){
103
+            if (function_exists('touch_wiki_user')) {
104 104
                 touch_wiki_user($user);  
105 105
             }
106 106
 
Please login to merge, or discard this patch.
html/ops/db_update.php 1 patch
Braces   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -274,7 +274,7 @@  discard block
 block discarded – undo
274 274
     do_query("alter table host add max_results_day integer not null");
275 275
 }
276 276
 
277
-function update_4_20_2005(){
277
+function update_4_20_2005() {
278 278
     do_query("ALTER TABLE `thread` ADD `sticky` TINYINT UNSIGNED DEFAULT '0' NOT NULL");
279 279
     do_query("ALTER TABLE `forum` ADD `post_min_total_credit` INT NOT NULL AFTER `posts`");
280 280
     do_query("ALTER TABLE `forum` ADD `post_min_expavg_credit` INT NOT NULL AFTER `posts`");
@@ -284,7 +284,7 @@  discard block
 block discarded – undo
284 284
     do_query("ALTER TABLE `forum_preferences` ADD `last_post` INT( 14 ) UNSIGNED NOT NULL AFTER `posts`");
285 285
 }
286 286
 
287
-function update_4_30_2005(){
287
+function update_4_30_2005() {
288 288
     do_query("ALTER TABLE `forum_preferences` ADD `ignore_sticky_posts` TINYINT( 1 ) UNSIGNED NOT NULL");
289 289
 }    
290 290
 
@@ -311,7 +311,7 @@  discard block
 block discarded – undo
311 311
     do_query("update user set country='Macedonia' where country='Macedonia, The Former Yugoslav Republic of'");
312 312
 }
313 313
 
314
-function update_11_24_2005(){
314
+function update_11_24_2005() {
315 315
     do_query("ALTER TABLE `forum_preferences` ADD `minimum_wrap_postcount` INT DEFAULT '100' NOT NULL AFTER `high_rating_threshold` ,
316 316
 ADD `display_wrap_postcount` INT DEFAULT '75' NOT NULL AFTER `minimum_wrap_postcount`");
317 317
 }
@@ -616,7 +616,7 @@  discard block
 block discarded – undo
616 616
     ");
617 617
 }
618 618
 
619
-function update_10_05_2008(){
619
+function update_10_05_2008() {
620 620
     do_query("alter table forum_preferences add highlight_special tinyint default '1' not null");
621 621
 }
622 622
 
Please login to merge, or discard this patch.
html/ops/team_import.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -63,8 +63,7 @@  discard block
 block discarded – undo
63 63
             $t->user_postal_code = decode($t->user_postal_code);
64 64
             $t->user_url = decode($t->user_url);
65 65
             return $t;
66
-        }
67
-        else if (strstr($s, '<name>')) $t->name = parse_element($s, '<name>');
66
+        } else if (strstr($s, '<name>')) $t->name = parse_element($s, '<name>');
68 67
         else if (strstr($s, '<url>')) $t->url = parse_element($s, '<url>');
69 68
         else if (strstr($s, '<type>')) $t->type = parse_element($s, '<type>');
70 69
         else if (strstr($s, '<name_html>')) $t->name_html = parse_element($s, '<name_html>');
@@ -73,14 +72,12 @@  discard block
 block discarded – undo
73 72
                 if (strstr($s, '</description>')) break;
74 73
                 $t->description .= $s;
75 74
             }
76
-        }
77
-        else if (strstr($s, '<country>')) $t->country = parse_element($s, '<country>');
75
+        } else if (strstr($s, '<country>')) $t->country = parse_element($s, '<country>');
78 76
         else if (strstr($s, '<id>')) $t->id = parse_element($s, '<id>');
79 77
         else if (strstr($s, '<user_email_munged>')) {
80 78
             $user_email_munged = parse_element($s, '<user_email_munged>');
81 79
             $t->user_email = str_rot13($user_email_munged);
82
-        }
83
-        else if (strstr($s, '<user_name>')) $t->user_name = parse_element($s, '<user_name>');
80
+        } else if (strstr($s, '<user_name>')) $t->user_name = parse_element($s, '<user_name>');
84 81
         else if (strstr($s, '<user_country>')) $t->user_country = parse_element($s, '<user_country>');
85 82
         else if (strstr($s, '<user_postal_code>')) $t->user_postal_code = parse_element($s, '<user_postal_code>');
86 83
         else if (strstr($s, '<user_url>')) $t->user_url = parse_element($s, '<user_url>');
Please login to merge, or discard this patch.