BOINC / boinc

html/inc/prefs_util.inc

Spacing +29 added lines, -29 removed lines

@@ -42,9 +42,9 @@ 
 }
 
 abstract class PREF {
-    public $desc;       // short description
-    public $tooltip;    // longer description, shown as tooltip
-    public $tag;        // the pref's primary XML tag
+    public $desc; // short description
+    public $tooltip; // longer description, shown as tooltip
+    public $tag; // the pref's primary XML tag
     function __construct($desc, $tooltip, $tag) {
         $this->desc = $desc;
         $this->tooltip = $tooltip;
@@ -122,15 +122,15 @@ 
 
 class PREF_BOOL extends PREF {
     public $default;
-    public $invert;     // show to user in opposite sense
-    function __construct($desc, $tooltip, $tag, $default, $invert=false) {
+    public $invert; // show to user in opposite sense
+    function __construct($desc, $tooltip, $tag, $default, $invert = false) {
         $this->default = $default;
         $this->invert = $invert;
         parent::__construct($desc, $tooltip, $tag);
     }
     function show_value($prefs) {
         $tag = $this->tag;
-        $v = $this->invert?!$prefs->$tag:$prefs->$tag;
+        $v = $this->invert ? !$prefs->$tag : $prefs->$tag;
         echo "<td>".readonly_checkbox($v)."</td>";
     }
     function show_form($prefs, $error) {
@@ -142,7 +142,7 @@ 
         }
         echo "<td ".VALUE_ATTRS.">"
             ."<input type=checkbox name=$this->tag "
-            . ($checked?"checked":"")
+            . ($checked ? "checked" : "")
             ."></td>
         ";
     }
@@ -155,7 +155,7 @@ 
     function xml_string($prefs) {
         $tag = $this->tag;
         return "<$tag>"
-            .($prefs->$tag?"1":"0")
+            .($prefs->$tag ? "1" : "0")
             ."</$tag>\n";
     }
     function xml_parse(&$prefs, $name, $text) {
@@ -175,9 +175,9 @@ 
     public $consent_type_id; // the consent_type_id from the consent_type table
     public $consent_name; // the consent_name to configure
     public $default;
-    public $invert;     // show to user in opposite sense
+    public $invert; // show to user in opposite sense
 
-    function __construct($desc, $tooltip, $tag, $consent_type_id, $consent_name, $default, $invert=false) {
+    function __construct($desc, $tooltip, $tag, $consent_type_id, $consent_name, $default, $invert = false) {
         $this->consent_type_id = $consent_type_id;
         $this->consent_name = $consent_name;
         $this->default = $default;
@@ -231,7 +231,7 @@ 
         } else {
             $value = false;
         }
-        echo "<td>" . readonly_checkbox($value) . "</td>";
+        echo "<td>".readonly_checkbox($value)."</td>";
     }
     function show_form($user, $error) {
         $consent_type_id = $this->consent_type_id;
@@ -247,7 +247,7 @@ 
         }
         echo "<td ".VALUE_ATTRS.">"
             ."<input type=checkbox name=$this->tag "
-            . ($checked?"checked":"")
+            . ($checked ? "checked" : "")
             ."></td>
         ";
     }
@@ -264,8 +264,8 @@ 
         // to this consent type.
         $cr = BoincLatestConsent::lookup("userid={$user->id} AND consent_type_id='${consent_type_id}'");
 
-        if ( (($cr) and ($cr->consent_flag!=$flag)) or
-             (!$cr) ) {
+        if ((($cr) and ($cr->consent_flag != $flag)) or
+             (!$cr)) {
             $rc = consent_to_a_policy($user, $consent_type_id, $flag, 0, 'Webform', time());
             if (!$rc) {
                 error_page(tra("Database error:").BoincDb::error());
@@ -301,7 +301,7 @@ 
         // this is the value if they check the box
     public $scale;
 
-    function __construct($suffix, $min, $max, $default, $scale=1, $default2=0) {
+    function __construct($suffix, $min, $max, $default, $scale = 1, $default2 = 0) {
         $this->suffix = " $suffix";
         $this->min = $min;
         $this->max = $max;
@@ -320,7 +320,7 @@ 
         $v .= "$this->suffix ";
         return $v;
     }
-    function form_str($tag, $v, $had_error, $disabled=false, $id=null) {
+    function form_str($tag, $v, $had_error, $disabled = false, $id = null) {
         if (is_numeric($v)) {
             $v /= $this->scale;
             if (!$had_error && ($v < $this->min || $v > $this->max)) {
@@ -328,7 +328,7 @@ 
             }
         }
         if ($disabled) $v = "";
-        $i = $id?"id=\"$id\"":"";
+        $i = $id ? "id=\"$id\"" : "";
         return '<input type="text" size="5" class="form-control input-sm" name="'.$tag.'" value="'.$v."\" $disabled $i> &nbsp; $this->suffix ";
     }
     function form_convert($in, &$out, &$error) {
@@ -451,8 +451,8 @@ 
         $text_id = $this->tag;
         $default = $this->num_spec->get_default();
         $val = $prefs->$tag;
-        $c = $val?"checked":"";
-        $d = $val?"":"disabled";
+        $c = $val ? "checked" : "";
+        $d = $val ? "" : "disabled";
         echo "<td $attrs>"
             ."<input type=checkbox id=$checkbox_id onClick=\"checkbox_clicked('$checkbox_id', '$text_id', $default)\" $c> &nbsp;"
             .$this->num_spec->form_str($tag, $prefs->$tag, $had_error, $d, $text_id)
@@ -565,8 +565,8 @@ 
 function hour_select($x, $name, $id, $d) {
     $s = "";
     $s .= "<select class=\"selectbox form-control input-sm\" name=$name id=$id $d>\n";
-    for ($i=0; $i<24; $i++) {
-        $sel = ($x == $i)?"selected":"";
+    for ($i = 0; $i < 24; $i++) {
+        $sel = ($x == $i) ? "selected" : "";
         $s .= "<option value=$i $sel> $i:00";
     }
     $s .= "</select>\n";
@@ -667,7 +667,7 @@ 
 
 // row_defs - Display a value for all 4 venues in one row
 //
-function row_defs($pre, $item, $post, $type, $prefs, $tooltip=null) {
+function row_defs($pre, $item, $post, $type, $prefs, $tooltip = null) {
     $gen = $prefs->$item;
     $hom  = (isset($prefs->home) && isset($prefs->home->$item)) ? $prefs->home->$item : "--";
     $schl = (isset($prefs->school) && isset($prefs->school->$item)) ? $prefs->school->$item : "--";
@@ -679,10 +679,10 @@ 
         echo "<tr>";
     }
     echo "<td ".NAME_ATTRS.">$pre</td>";
-    row_field($gen,  $type);
-    row_field($hom,  $type);
+    row_field($gen, $type);
+    row_field($hom, $type);
     row_field($schl, $type);
-    row_field($wrk,  $type);
+    row_field($wrk, $type);
     echo "<td align=left>$post</td></tr>\n";
 }
 
@@ -692,16 +692,16 @@ 
 function row_field($value, $type) {
     echo "<td>";
     $type = $value === "--" ? "--" : $type;
-    switch($type) {
+    switch ($type) {
     case "yesno":
-        echo $value ?tra("yes"):tra("no");
+        echo $value ?tra("yes") : tra("no");
         break;
     case "noyes":
-        echo $value ?tra("no"):tra("yes");
+        echo $value ?tra("no") : tra("yes");
         break;
     case "limit":
         $x = max_bytes_display_mode($value);
-        $y = "$x " . BYTE_ABBR;
+        $y = "$x ".BYTE_ABBR;
         echo $x ? "$y" : tra("no limit");
         break;
     case "minutes":

drupal/sites/default/boinc/modules/boincuser/boincuser.admin.inc

Spacing +13 added lines, -13 removed lines

@@ -120,7 +120,7 @@ 
     '#default_value' => $default['boinc_server_status_url'],
     '#description' => t('An absolute URL or path relative to the site base to the server status page (e.g. %full_url or just %relative_url).',
       array(
-        '%full_url' => $base_url . '/server_status.php',
+        '%full_url' => $base_url.'/server_status.php',
         '%relative_url' => 'server_status.php',
       )
     ),
@@ -131,7 +131,7 @@ 
     '#default_value' => $default['boinc_app_list_url'],
     '#description' => t('An absolute URL or path relative to the site base to the applications page (e.g. %full_url or just %relative_url).',
       array(
-        '%full_url' => $base_url . '/apps.php',
+        '%full_url' => $base_url.'/apps.php',
         '%relative_url' => 'apps.php',
       )
     ),
@@ -354,7 +354,7 @@ 
     '#type' => 'checkbox',
     '#title' => t('Enable create_account.php RPC'),
     '#default_value' => $default['boinc_weboptions_enableaccountcreateRPC'],
-    '#description' => t('If checked, users will be able to create an account remotely using the create_account.php RPC. This option is independent of the user regsitration option found in ') . l(t('User management -> User settings'), '/admin/user/settings') . '. If enabled, user <b>may not be able to see and agree to the terms-of-use</b> to your site\'s privacy and data retention policies!',
+    '#description' => t('If checked, users will be able to create an account remotely using the create_account.php RPC. This option is independent of the user regsitration option found in ').l(t('User management -> User settings'), '/admin/user/settings').'. If enabled, user <b>may not be able to see and agree to the terms-of-use</b> to your site\'s privacy and data retention policies!',
   );
 
   $form['boinc_weboptions_registrationtitle'] = array(
@@ -409,32 +409,32 @@ 
     '#rows' => 8,
     '#description' => t('A list of Drupal URLs/paths to ignore for Terms of Use (ToU). If the option above \'Are existing users forced to agree to the Terms of Use?\' is activated, then some paths need to be ignored when checking if a user has agreed to the ToU. A good example is the logout path, "logout", or else users will not be able to logout!
 <p>There is a default list of paths that must be ignored or else the site will not function. They are not included in this box. Here you may provide additional paths to be ignored, for example the privacy policy page may be accessible so that users may read it before agreeing to the site\'s ToU.
-<p>Paths should be entered one per line. All paths should be <em>lower-case</em> and  should not include a leading \'/\'. Example: account/info/edit will allow the user to visit ' . $base_url . '/account/info/edit without first agreeing to the ToU. Regexp are allowed. Example: account/* will allow the user to visit any path starting with ' . $base_url . '/account/.'),
+<p>Paths should be entered one per line. All paths should be <em>lower-case</em> and  should not include a leading \'/\'. Example: account/info/edit will allow the user to visit ' . $base_url.'/account/info/edit without first agreeing to the ToU. Regexp are allowed. Example: account/* will allow the user to visit any path starting with '.$base_url.'/account/.'),
   );
 
   $form['pathtitle'] = array(
     '#value' => '<h3>Path Options</h3>',
   );
 
-  $form['boinc_weboptions_accountfinish'] = array (
+  $form['boinc_weboptions_accountfinish'] = array(
     '#type' => 'textfield',
     '#title' => t('Path to a custom account_finish.php page, should be a path to a node'),
     '#description' => t('Provide a path to a node which will serve as your site\'s landing page for users create an account using the BOINC client manager. They will be directed to this page after the account is created. If blank, a default account_finish page will be used.<br>Examples: account_finish, content/welcome, node/123'),
     '#default_value' => $default['boinc_weboptions_accountfinish'],
   );
-  $form['boinc_weboptions_moderationpage'] = array (
+  $form['boinc_weboptions_moderationpage'] = array(
     '#type' => 'textfield',
     '#title' => t('Path to the site\'s content moderation info page, should be a path to a node'),
     '#description' => t('Provide a path to a node which will serve as your site\'s page for account/content moderation information. This will be used on the default account_finish page. If blank, no link to a moderation page will be provided. If a path is provided to the custom account_finish.php page (above), this field will be ignored.<br>Examples: moderation, content/moderation, node/456'),
     '#default_value' => $default['boinc_weboptions_moderationpage'],
   );
-  $form['boinc_weboptions_rulespolicies'] = array (
+  $form['boinc_weboptions_rulespolicies'] = array(
     '#type' => 'textfield',
     '#title' => t('Path to the site\'s rule and policies page, should be a path to a node'),
     '#description' => t('Provide a path to a node which will serve as your site\'s rules and policies page. This will be used on the Join page shown to new users. If blank, no link to a rules and policies page will be provided.<br>Examples: rules-and-policies, node/789'),
     '#default_value' => $default['boinc_weboptions_rulespolicies'],
   );
-  $form['boinc_other_frontpage'] = array (
+  $form['boinc_other_frontpage'] = array(
     '#type' => 'textarea',
     '#title' => bts('Message for site\'s Home Page', array(), NULL, 'boinc:admin-boinc-other-options'),
     '#default_value' => $default['boinc_other_frontpage'],
@@ -447,7 +447,7 @@ 
     '#value' => '<h3>Other Options</h3>',
   );
 
-  $form['boinc_weboptions_blacklisted_usernames'] = array (
+  $form['boinc_weboptions_blacklisted_usernames'] = array(
     '#type' => 'textarea',
     '#title' => t('BOINC username blacklist'),
     '#default_value' => $default['boinc_weboptions_blacklisted_usernames'],
@@ -466,17 +466,17 @@ 
   $values = $form_state['values'];
 
   $accountfinish = $values['boinc_weboptions_accountfinish'];
-  if ( ($accountfinish) AND (!drupal_lookup_path('source', $accountfinish)) ) {
+  if (($accountfinish) AND (!drupal_lookup_path('source', $accountfinish))) {
     form_set_error('boinc weboptions_accountfinish', t('Path to custom account finish page not found. Please provide a valid path, or leave blank to unset.'));
   }
 
   $moderationpage = $values['boinc_weboptions_moderationpage'];
-  if ( ($moderationpage) AND (!drupal_lookup_path('source', $moderationpage)) ) {
+  if (($moderationpage) AND (!drupal_lookup_path('source', $moderationpage))) {
     form_set_error('boinc weboptions_moderationpage', t('Path to moderation page not found. Please provide a valid path, or leave blank to unset.'));
   }
 
   $rulespolicies = $values['boinc_weboptions_rulespolicies'];
-  if ( ($rulespolicies) AND (!drupal_lookup_path('source', $rulespolicies)) ) {
+  if (($rulespolicies) AND (!drupal_lookup_path('source', $rulespolicies))) {
     form_set_error('boinc weboptions_rulespolicies', t('Path to rules and policies page not found. Please provide a valid path, or leave blank to unset.'));
   }
 }
@@ -485,5 +485,5 @@ 
   * Submit BOINC other form
   */
 function boincuser_admin_weboptions_submit($form, &$form_state) {
-  drupal_set_message( bts("Status: Drupa-BOINC Web site options have been updated", array(), NULL, 'boinc:admin-boinc-website-options') );
+  drupal_set_message(bts("Status: Drupa-BOINC Web site options have been updated", array(), NULL, 'boinc:admin-boinc-website-options'));
 }

html/inc/user.inc

Spacing +14 added lines, -14 removed lines

@@ -33,7 +33,7 @@ 
 // they've participated in
 //
 function get_other_projects($user) {
-    $cpid = md5($user->cross_project_id . $user->email_addr);
+    $cpid = md5($user->cross_project_id.$user->email_addr);
     $url = "http://boinc.netsoft-online.com/get_user.php?cpid=".$cpid;
 
     // Check the cache for that URL
@@ -174,7 +174,7 @@ 
     }
 
     if (!NO_STATS) {
-        $cpid = md5($user->cross_project_id . $user->email_addr);
+        $cpid = md5($user->cross_project_id.$user->email_addr);
         $x = "";
         shuffle($cpid_stats_sites);
         foreach ($cpid_stats_sites as $site) {
@@ -328,7 +328,7 @@ 
 // if $badge_height is > 0, show badges
 // if $name_limit, limit name to N chars
 //
-function user_links($user, $badge_height=0, $name_limit=0) {
+function user_links($user, $badge_height = 0, $name_limit = 0) {
     BoincForumPrefs::lookup($user);
     if (is_banished($user)) {
         return "(banished: ID $user->id)";
@@ -343,13 +343,13 @@ 
         $name = substr($name, 0, $name_limit)."...";
     }
     $x .= " <a href=\"".url_base()."show_user.php?userid=".$user->id."\">".$name."</a>";
-    if (function_exists("project_user_links")){
+    if (function_exists("project_user_links")) {
         $x .= project_user_links($user);
     }
     if ($badge_height) {
         $x .= badges_string(true, $user, $badge_height);
     }
-    return $name_limit?"<nobr>$x</nobr>":$x;
+    return $name_limit ? "<nobr>$x</nobr>" : $x;
 }
 
 function show_community_private($user) {
@@ -396,7 +396,7 @@ 
 
             // if there's a foundership request, notify the founder
             //
-            if ($user->id==$team->userid && $team->ping_user >0) {
+            if ($user->id == $team->userid && $team->ping_user > 0) {
                 $x .= "<p class=\"text-danger\">".tra("(foundership change request pending)")."</p>";
             }
             row2(tra("Member of team"), $x);
@@ -421,7 +421,7 @@ 
     $x = "<a href=\"user_search.php\">".tra("Find friends")."</a><br/>\n";
     $n = count($friends);
     if ($n) {
-        foreach($friends as $friend) {
+        foreach ($friends as $friend) {
             $fuser = BoincUser::lookup_id($friend->user_dest);
             if (!$fuser) continue;
             $x .= friend_links($fuser);
@@ -464,7 +464,7 @@ 
 // Returns a cacheable community links data object
 // @param user The user to produce a community links object for
 
-function get_community_links_object($user){
+function get_community_links_object($user) {
     $cache_object = new StdClass;
     $cache_object->post_count = total_posts($user);
     $cache_object->user = $user;
@@ -472,7 +472,7 @@ 
     $cache_object->friends = array();
 
     $friends = BoincFriend::enum("user_src=$user->id and reciprocated=1");
-    foreach($friends as $friend) {
+    foreach ($friends as $friend) {
         $fuser = BoincUser::lookup_id($friend->user_dest);
         if (!$fuser) continue;
         $cache_object->friends[] = $fuser;
@@ -480,7 +480,7 @@ 
     return $cache_object;
 }
 
-function community_links($clo, $logged_in_user){
+function community_links($clo, $logged_in_user) {
     $user = $clo->user;
     $team = $clo->team;
     $friends = $clo->friends;
@@ -506,15 +506,15 @@ 
                 "<a href=\"friend.php?action=cancel_confirm&userid=$user->id\">".tra("Cancel friendship")."</a>"
             );
         } else if ($friend) {
-            row2(tra("Friends"),  "<a href=\"friend.php?action=add&userid=$user->id\">".tra("Request pending")."</a>");
+            row2(tra("Friends"), "<a href=\"friend.php?action=add&userid=$user->id\">".tra("Request pending")."</a>");
         } else {
-            row2(tra("Friends"),  "<a href=\"friend.php?action=add&userid=$user->id\">".tra("Add as friend")."</a>");
+            row2(tra("Friends"), "<a href=\"friend.php?action=add&userid=$user->id\">".tra("Add as friend")."</a>");
         }
     }
     
     if ($friends) {
         $x = "";
-        foreach($friends as $friend) {
+        foreach ($friends as $friend) {
             $x .= friend_links($friend);
         }
         row2(tra("Friends")." (".sizeof($friends).")", $x);
@@ -558,6 +558,6 @@ 
 }
 
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 
 ?>

drupal/sites/default/boinc/modules/boincuser/boincuser_delete/boincuser_delete.module

Spacing +11 added lines, -11 removed lines

@@ -93,9 +93,9 @@ 
 function boincuser_delete_form_alter(&$form, $form_state, $form_id) {
   global $user;
 
-  switch($form_id) {
+  switch ($form_id) {
     case 'user_profile_form':
-      if ( user_access('delete own account') AND ($form['#uid'] == $user->uid) AND (arg(3)=='') ) {
+      if (user_access('delete own account') AND ($form['#uid'] == $user->uid) AND (arg(3) == '')) {
         $form['delete'] = array(
           '#type' => 'submit',
           '#value' => bts('Delete Account', array(), null, 'boinc:delete-user-account'),
@@ -105,7 +105,7 @@ 
           '#suffix' => '</li>',
         );
       }
-      else if ( user_access('administer users') ) {
+      else if (user_access('administer users')) {
         $form['delete'] = array(
           '#type' => 'submit',
           '#value' => bts('Delete Account', array(), null, 'boinc:delete-user-account'),
@@ -158,7 +158,7 @@ 
           break;
       }
 
-      $question = 'Are you sure you want to delete the account <em>' . htmlspecialchars($form['_account']['#value']->boincuser_name) . '</em>?';
+      $question = 'Are you sure you want to delete the account <em>'.htmlspecialchars($form['_account']['#value']->boincuser_name).'</em>?';
       drupal_set_title($question);
 
       unset($form['description']);
@@ -177,7 +177,7 @@ 
       );
       $form['main']['fs1']['help'] = array(
         '#value' => bts(
-          "<p>In order to delete your account, you must provide your password below. You will then be sent an email to the email address on record, with a one-time token that expires in 24-hours. Clicking on this link will bring you to a second form where you must enter your password again. After doing so your account will be deleted.</p>" .
+          "<p>In order to delete your account, you must provide your password below. You will then be sent an email to the email address on record, with a one-time token that expires in 24-hours. Clicking on this link will bring you to a second form where you must enter your password again. After doing so your account will be deleted.</p>".
           "<p>If necessary, you may !link first before deleting your account. But you must wait <b>seven (7) days</b> after an email address change before you may delete your account.</p>",
           array(
             '!link' => l(bts('change your email address', array(), NULL, 'boinc:delete-user-account'), '/account/info/edit'),
@@ -189,7 +189,7 @@ 
 
       if ($dtypes == 'user_decides') {
         $form['main']['common'] = array(
-          '#value'  => bts('All choices: ', array(), NULL, 'boinc:delete-user-account') . $common_acts . '<p>' . bts('Disabled means some of your personal data, such as your username and email address, are kept on our systems. Choose \'delete your account\' if you want all personal data to be removed.', array(), NULL, 'boinc:delete-user-account'),
+          '#value'  => bts('All choices: ', array(), NULL, 'boinc:delete-user-account').$common_acts.'<p>'.bts('Disabled means some of your personal data, such as your username and email address, are kept on our systems. Choose \'delete your account\' if you want all personal data to be removed.', array(), NULL, 'boinc:delete-user-account'),
           '#prefix' => "<div id='delete-instructions'>",
           '#suffix' => "</div>",
           '#weight' => 20,
@@ -257,7 +257,7 @@ 
         '#weight' => 1010,
       );
 
-      $form['#redirect'] = 'account/' . $uid;
+      $form['#redirect'] = 'account/'.$uid;
       $form['#validate'] = array('boincuser_delete_validate');
       $form['#submit'] = array('boincuser_delete_submit');
       break;
@@ -317,7 +317,7 @@ 
   global $base_path;
   module_load_include('inc', 'rules', 'modules/system.rules');
   $site_name = variable_get('site_name', 'Drupal-BOINC');
-  $site_url = $base_url . $base_path . "user/login";
+  $site_url = $base_url.$base_path."user/login";
 
   // Perform the requested operation
   $op = $form_state['values']['user_delete_action'];
@@ -364,7 +364,7 @@ 
   );
   rules_action_mail_to_user($account, $settings);
 
-  drupal_set_message(bts("INFO: You have requested account deletion. Please check your email for further instructions.", array(), NULL, 'boinc:delete-user-account'),'info');
+  drupal_set_message(bts("INFO: You have requested account deletion. Please check your email for further instructions.", array(), NULL, 'boinc:delete-user-account'), 'info');
 
   $redirect = variable_get('boincuser_delete_redirect', '<front>');
   // Redirect
@@ -458,7 +458,7 @@ 
     '#weight' => 1002,
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/") . '</li>',
+    '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/").'</li>',
     '#weight' => 1003,
   );
   $form['form control tabs suffix'] = array(
@@ -548,7 +548,7 @@ 
     '#weight' => 1002,
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/") . '</li>',
+    '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/").'</li>',
     '#weight' => 1003,
   );
   $form['form control tabs suffix'] = array(

drupal/sites/default/boinc/modules/boincuser/includes/boincuser.helpers.inc

Spacing +13 added lines, -13 removed lines

@@ -165,8 +165,8 @@ 
       WHERE n.type = 'profile'
       AND n.status = 1
       AND n.moderate = 0
-      " . ($never_been_picked ? " AND bu.uotd_time = 0 " : '') . "
-      " . ($active_users ? " AND bu.boinc_id IN ({$active_users}) " : '') . "
+      " . ($never_been_picked ? " AND bu.uotd_time = 0 " : '')."
+      " . ($active_users ? " AND bu.boinc_id IN ({$active_users}) " : '')."
       ORDER BY RAND()
       LIMIT 1"
     ));
@@ -212,7 +212,7 @@ 
  * this function is called, it may be called with optional parameters
  * new and prev email.
  */
-function _boincuser_send_emailchange($account, $new_email=NULL, $prev_email=NULL, $adminuser=FALSE) {
+function _boincuser_send_emailchange($account, $new_email = NULL, $prev_email = NULL, $adminuser = FALSE) {
   require_boinc('token');
   module_load_include('inc', 'rules', 'modules/system.rules');
 
@@ -303,7 +303,7 @@ 
     // Name is limited to 60 characters, but we want to leave space to add a
     // tally if needed (for users with duplicate names); Limit to 56 chars and
     // replace the middle of the string with "..." if too long
-    $cleaned_name = substr_replace($cleaned_name, '...', 28, ($name_length-56)+3);
+    $cleaned_name = substr_replace($cleaned_name, '...', 28, ($name_length - 56) + 3);
   }
 
   // Determine if there are duplicate names, if so append a number to end.
@@ -373,7 +373,7 @@ 
     // delimiters. Curly brace is not really allowed un URLs, but a
     // more robust function would first check for these curly braces
     // in the path_to_ignore patterms, just in case.
-    if (preg_match('{' . $pi . '}', $path)) {
+    if (preg_match('{'.$pi.'}', $path)) {
       return TRUE;
     }
   }
@@ -499,15 +499,15 @@ 
   elseif (!in_array($_GET['q'], $page_blacklist)) {
     watchdog('boincuser', 'The BOINC scheduling server settings are not yet
         configured. Please !verify for the settings to become effective.',
-          array('!verify' => l(t('verify the default values') . ' <strong>' . 
-            t('and') . '</strong> ' . t('save the configuration'),
+          array('!verify' => l(t('verify the default values').' <strong>'. 
+            t('and').'</strong> '.t('save the configuration'),
             'admin/boinc/scheduler', array('html' => TRUE))
           ), WATCHDOG_WARNING);
     if (user_access('administer site configuration')) {
       drupal_set_message(t('The BOINC scheduling server settings are not yet
           configured. Please !verify for the settings to become effective',
-            array('!verify' => l(t('verify the default values') . ' <strong>' . 
-              t('and') . '</strong> ' . t('save the configuration'),
+            array('!verify' => l(t('verify the default values').' <strong>'. 
+              t('and').'</strong> '.t('save the configuration'),
               'admin/boinc/scheduler', array('html' => TRUE))
             )), 'warning', FALSE);
     }
@@ -569,7 +569,7 @@ 
  */
 function _boincuser_node_profile_delete_submit($form, &$form_state) {
   $node = $form['#node'];
-  $deleteurl = 'node/'. $node->nid .'/delete';
+  $deleteurl = 'node/'.$node->nid.'/delete';
   $afterq = 'destination=account';
   drupal_goto($deleteurl, $afterq);
 }
@@ -599,8 +599,8 @@ 
   $view = views_get_current_view();
   $account_id = $view->args[0];
   $friend_count = flag_friend_get_friend_count($account_id);
-  return '<h2 class="pane-title">' . bts('Friends (@count)', 
-    array('@count' => $friend_count)) . '</h2>';
+  return '<h2 class="pane-title">'.bts('Friends (@count)', 
+    array('@count' => $friend_count)).'</h2>';
 }
 
 /**
@@ -613,7 +613,7 @@ 
   $result = db_query_range("SELECT id,name FROM {user} WHERE name LIKE '%s%'", $string, 0, 10);
   db_set_active('default');
   while ($user = db_fetch_object($result)) {
-      $matches[$user->name . '_' . $user->id] = htmlentities($user->name) . " (" . $user->id . ')';
+      $matches[$user->name.'_'.$user->id] = htmlentities($user->name)." (".$user->id.')';
   }
 
   drupal_json((object)$matches);

html/inc/account.inc

Spacing +3 added lines, -3 removed lines

@@ -100,7 +100,7 @@ 
             tra("Must be at least %1 characters", $min_passwd_length),
             tra("Password")
         ),
-        "passwd", "", "password",'id="passwd"',passwd_visible_checkbox("passwd")
+        "passwd", "", "password", 'id="passwd"', passwd_visible_checkbox("passwd")
     );
     if (USER_COUNTRY) {
         form_select(
@@ -145,9 +145,9 @@ 
     } else {
         $x = tra("Email address:");
     }
-    form_input_text($x, "email_addr", '', 'text', $attrs='autofocus tabindex="1"');
+    form_input_text($x, "email_addr", '', 'text', $attrs = 'autofocus tabindex="1"');
     form_input_text(
-        tra("Password:").'<br><small><a href="get_passwd.php">' . tra("forgot password?") . "</a></small>",
+        tra("Password:").'<br><small><a href="get_passwd.php">'.tra("forgot password?")."</a></small>",
         "passwd",
         "",
         "password",

html/inc/util_basic.inc

Spacing +5 added lines, -5 removed lines

@@ -46,10 +46,10 @@ 
     ";
 }
 
-function xml_error($num, $msg=null, $file=null, $line=null) {
+function xml_error($num, $msg = null, $file = null, $line = null) {
     global $xml_outer_tag;
     if (!$msg) {
-        switch($num) {
+        switch ($num) {
         case -112: $msg = "Invalid XML"; break;
         case -136: $msg = "Not found"; break;
         case -137: $msg = "Name or email address is not unique"; break;
@@ -95,7 +95,7 @@ 
 // If it's a single-tag element, and it's present, just return the tag
 //
 function parse_element($xml, $tag) {
-    $closetag = "</" . substr($tag,1);
+    $closetag = "</".substr($tag, 1);
     $x = strstr($xml, $tag);
     if ($x) {
         if (strstr($tag, "/>")) return $tag;
@@ -111,8 +111,8 @@ 
 
 function parse_next_element($xml, $tag, &$cursor) {
     $element = null;
-    $closetag = "</" . substr($tag,1);
-    $pos = substr($xml,$cursor);
+    $closetag = "</".substr($tag, 1);
+    $pos = substr($xml, $cursor);
     $x = strstr($pos, $tag);
     if ($x) {
         if (strstr($tag, "/>")) return $tag;

html/user/get_project_config.php

Spacing +3 added lines, -3 removed lines

@@ -30,10 +30,10 @@ 
 //
 function show_platforms() {
     $xmlFragment = unserialize(get_cached_data(3600, "project_config_platform_xml"));
-    if ($xmlFragment==false){
+    if ($xmlFragment == false) {
         $platforms = BoincDB::get()->enum_fields("platform, DBNAME.app_version, DBNAME.app", "BoincPlatform", "platform.name, platform.user_friendly_name, plan_class", "app_version.platformid = platform.id and app_version.appid = app.id and app_version.deprecated=0 and app.deprecated=0 group by platform.name, plan_class", "");
         $xmlFragment = "    <platforms>";
-        foreach ($platforms as $platform){
+        foreach ($platforms as $platform) {
             $xmlFragment .= "
             <platform>
                 <platform_name>$platform->name</platform_name>
@@ -115,7 +115,7 @@ 
 if (defined('TERMSOFUSE_FILE')) {
   $tou_file = TERMSOFUSE_FILE;
 } else {
-  $tou_file =  "../../terms_of_use.txt";
+  $tou_file = "../../terms_of_use.txt";
 }
 if (file_exists($tou_file)) {
     $terms_of_use = trim(file_get_contents($tou_file));

html/ops/mass_email_script.php

Spacing +6 added lines, -6 removed lines

@@ -55,7 +55,7 @@ 
 $globals->batch = 1000;
 $globals->lapsed_interval = 60*86400;
 
-for ($i=1; $i<$argc; $i++) {
+for ($i = 1; $i < $argc; $i++) {
     if ($argv[$i] == "--batch") {
         $i++;
         $globals->batch = $argv[$i];
@@ -169,7 +169,7 @@ 
         gmdate('d F Y', $user->create_time),
         number_format($user->total_credit, 0),
         opt_out_url($user),
-        floor((time() - $user->last_rpc_time) / 86400),
+        floor((time() - $user->last_rpc_time)/86400),
     );
     return preg_replace($pat, $rep, $template);
 }
@@ -238,7 +238,7 @@ 
     while ($user = _mysql_fetch_object($result)) {
         handle_user($user);
         $startid = $user->id;
-        fputs($log, $user->id . "\n");
+        fputs($log, $user->id."\n");
         fflush($log);
     }
     _mysql_free_result($result);
@@ -252,7 +252,7 @@ 
     $user = _mysql_fetch_object($result);
     if ($user) {
         handle_user($user);
-        fputs($log, $user->id . "\n");
+        fputs($log, $user->id."\n");
         fflush($log);
     }
     _mysql_free_result($result);
@@ -289,7 +289,7 @@ 
     } else {
         $fid = fopen($id_file, 'r');
         if (!$fid) {
-            echo  $id_file . ' not found - create ID list and run again\n';
+            echo  $id_file.' not found - create ID list and run again\n';
             exit();
         }
         $thisid = 0;
@@ -300,7 +300,7 @@ 
         }
         fclose($fid);
     }
-    echo 'All done!' . "\n";
+    echo 'All done!'."\n";
 }
 
 if (!function_exists('make_php_mailer')) {