BOINC / boinc

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

Spacing +39 added lines, -39 removed lines

@@ -35,7 +35,7 @@ 
   // Call our custom authentication function to check for an existing BOINC user
   if (!boincuser_login_authenticate($form_state['values'])) {
     // Authentication failed; set an error accordingly
-    form_set_error('name', bts('Sorry, unrecognized email address or password.', array(), NULL, 'boinc:forgot-password') . ' ' . l(bts('Have you forgotten your password?', array(), NULL, 'boinc:forgot-password'), 'user/password'));
+    form_set_error('name', bts('Sorry, unrecognized email address or password.', array(), NULL, 'boinc:forgot-password').' '.l(bts('Have you forgotten your password?', array(), NULL, 'boinc:forgot-password'), 'user/password'));
   }
 }
 
@@ -84,7 +84,7 @@ 
   } else {
     // Create a Drupal user from the BOINC user
     if ($user = boincuser_register_make_drupal_user($boinc_user)) {
-      watchdog('user', 'New external user: %email using module %module.', array('%email' => $email_addr, '%module' => $module), WATCHDOG_NOTICE, l(t('edit'), 'user/'. $user->uid .'/edit'));
+      watchdog('user', 'New external user: %email using module %module.', array('%email' => $email_addr, '%module' => $module), WATCHDOG_NOTICE, l(t('edit'), 'user/'.$user->uid.'/edit'));
     }
   }
 }
@@ -394,14 +394,14 @@ 
     // set email address lower-case
     $edit['mail'] = strtolower($edit['mail']);
 
-    $boinc_user_already_exists = ( BoincUser::lookup_email_addr($edit['mail']) || BoincUser::lookup_prev_email_addr($edit['mail']) );
+    $boinc_user_already_exists = (BoincUser::lookup_email_addr($edit['mail']) || BoincUser::lookup_prev_email_addr($edit['mail']));
     if ($boinc_user_already_exists) {
       form_set_error('mail', bts('A BOINC account already exists for @email.', array('@email' => $edit['mail']), NULL, 'boinc:add-new-user'));
     }
 
     // Check email has not been changed in last X days (default X=7).
-    $duration = 86400 * 7;
-    if ( (($boinc_user->email_addr_change_time + $duration) > time()) and (!(user_access('administer users'))) ) {
+    $duration = 86400*7;
+    if ((($boinc_user->email_addr_change_time + $duration) > time()) and (!(user_access('administer users')))) {
       form_set_error('email_addr_change_time',
         bts('Your email address was changed within the past seven (7) days. You must wait until !futuredate to change your email again. If you need to reverse this change, please look for an email sent to !prev_email_addr.',
         array(
@@ -422,11 +422,11 @@ 
       unset($_SESSION['reset_pass']);
     }
     else {
-      $given_hash = md5($edit['current_pass'] . strtolower($account->mail));
+      $given_hash = md5($edit['current_pass'].strtolower($account->mail));
       if (!$edit['current_pass']) {
         form_set_error('current_pass', bts('Authentication is required when changing E-mail address or setting new password.', array(), NULL, 'boinc:account-credentials-change'));
       }
-      elseif ( (!password_verify($given_hash, $boinc_user->passwd_hash)) and ($given_hash != $boinc_user->passwd_hash) ) {
+      elseif ((!password_verify($given_hash, $boinc_user->passwd_hash)) and ($given_hash != $boinc_user->passwd_hash)) {
         form_set_error('current_pass', bts('Password entered is not valid. Please verify that it is correct.', array(), NULL, 'boinc:account-credentials-change'));
       }
 
@@ -489,29 +489,29 @@ 
   $project_domain = $headers['Host'];
   $form['heading'] = array(
     '#type' => 'markup',
-    '#value' => '<h3>' . bts("If you forgot your account's email address, or you can't receive email there:", array(), NULL, 'boinc:authenticator-login-page') . '</h3>'
+    '#value' => '<h3>'.bts("If you forgot your account's email address, or you can't receive email there:", array(), NULL, 'boinc:authenticator-login-page').'</h3>'
   );
   $form['instructions'] = array(
     '#type' => 'markup',
-    '#value' => '' .
-      '<p>' . bts("If you have run BOINC under the account, you can still access it. Here's how:", array(), NULL, 'boinc:authenticator-login-page') .
-      '  <ul>' .
-      '    <li>' . bts('Go to the BOINC data directory on your computer (see !boinc_wiki for help finding this).', array('!boinc_wiki' => l(bts('BOINC documentation', array(), NULL, 'boinc:authenticator-login-page'), 'http://boinc.berkeley.edu/wiki/BOINC_Data_directory')), NULL, 'boinc:authenticator-login-page') . '</li>' .
-      '    <li>' . bts('Find your account file for this project; it will have a name like %file (where the project URL is %url).', array('%file' => "account_{$project_domain}.xml", '%url' => "http://{$project_domain}"), NULL, 'boinc:authenticator-login-page') . '</li>' .
-      '    <li>' . bts("Open the file in a text editor like Notepad. You'll see something like:", array(), NULL, 'boinc:authenticator-login-page') .
-      '      <pre>' .
-      '&lt;account&gt;' . "\n" .
-      "  &lt;master_url&gt;http://{$project_domain}/&lt;/master_url&gt;" . "\n" .
-      '  &lt;authenticator&gt;8b8496fdd26df7dc0423ecd43c09a56b&lt;/authenticator&gt;' . "\n" .
-      "  &lt;project_name&gt;{$project_name}&lt;/project_name&gt;" . "\n" .
-      '  ...' . "\n" .
-      '&lt;/account&gt;' .
-      '      </pre>' .
-      '    </li>' .
-      '    <li>' . bts('Select and Copy the string between &lt;authenticator&gt; and &lt;/authenticator&gt; (%auth in the above example).', array('%auth' => '8b8496fdd26df7dc0423ecd43c09a56b'), NULL, 'boinc:authenticator-login-page') . '</li>' .
-      '    <li>' . bts('Paste the string into the field below, and click OK.', array(), NULL, 'boinc:authenticator-login-page') . '</li>' .
-      '    <li>' . bts('You will now be logged in to your account; update the email and password of your account.', array(), NULL, 'boinc:authenticator-login-page') . '</li>' .
-      '  </ul>' .
+    '#value' => ''.
+      '<p>'.bts("If you have run BOINC under the account, you can still access it. Here's how:", array(), NULL, 'boinc:authenticator-login-page').
+      '  <ul>'.
+      '    <li>'.bts('Go to the BOINC data directory on your computer (see !boinc_wiki for help finding this).', array('!boinc_wiki' => l(bts('BOINC documentation', array(), NULL, 'boinc:authenticator-login-page'), 'http://boinc.berkeley.edu/wiki/BOINC_Data_directory')), NULL, 'boinc:authenticator-login-page').'</li>'.
+      '    <li>'.bts('Find your account file for this project; it will have a name like %file (where the project URL is %url).', array('%file' => "account_{$project_domain}.xml", '%url' => "http://{$project_domain}"), NULL, 'boinc:authenticator-login-page').'</li>'.
+      '    <li>'.bts("Open the file in a text editor like Notepad. You'll see something like:", array(), NULL, 'boinc:authenticator-login-page').
+      '      <pre>'.
+      '&lt;account&gt;'."\n".
+      "  &lt;master_url&gt;http://{$project_domain}/&lt;/master_url&gt;"."\n".
+      '  &lt;authenticator&gt;8b8496fdd26df7dc0423ecd43c09a56b&lt;/authenticator&gt;'."\n".
+      "  &lt;project_name&gt;{$project_name}&lt;/project_name&gt;"."\n".
+      '  ...'."\n".
+      '&lt;/account&gt;'.
+      '      </pre>'.
+      '    </li>'.
+      '    <li>'.bts('Select and Copy the string between &lt;authenticator&gt; and &lt;/authenticator&gt; (%auth in the above example).', array('%auth' => '8b8496fdd26df7dc0423ecd43c09a56b'), NULL, 'boinc:authenticator-login-page').'</li>'.
+      '    <li>'.bts('Paste the string into the field below, and click OK.', array(), NULL, 'boinc:authenticator-login-page').'</li>'.
+      '    <li>'.bts('You will now be logged in to your account; update the email and password of your account.', array(), NULL, 'boinc:authenticator-login-page').'</li>'.
+      '  </ul>'.
       '</p>'
   );
   $form['authenticator'] = array(
@@ -536,7 +536,7 @@ 
     '#weight' => 1002,
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), 'user/password') . '</li>',
+    '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), 'user/password').'</li>',
     '#weight' => 1003,
   );
   $form['form control tabs suffix'] = array(
@@ -599,7 +599,7 @@ 
     '#weight' => 1002,
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/{$uid}") . '</li>',
+    '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/{$uid}").'</li>',
     '#weight' => 1003,
   );
   $form['form control tabs suffix'] = array(
@@ -650,7 +650,7 @@ 
     '#weight' => 1002,
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/{$uid}") . '</li>',
+    '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "account/{$uid}").'</li>',
     '#weight' => 1003,
   );
   $form['form control tabs suffix'] = array(
@@ -667,7 +667,7 @@ 
   $uid = $form_state['storage']['ban_user_uid'];
   $reason = $form_state['values']['reason'];
   $duration = $form_state['values']['duration'];
-  if ($duration) $duration = $duration * 24*60*60;
+  if ($duration) $duration = $duration*24*60*60;
   boincuser_moderate_user_ban($uid, $reason, $duration);
 }
 
@@ -694,10 +694,10 @@ 
     drupal_goto();
   }
 
-  drupal_set_message( bts('WARNING: You have not agreed to our terms of use. Please agree to the terms of use before continuing.', array(), NULL, 'boinc:termsofuse-form'), 'warning' );
+  drupal_set_message(bts('WARNING: You have not agreed to our terms of use. Please agree to the terms of use before continuing.', array(), NULL, 'boinc:termsofuse-form'), 'warning');
 
   $form = array();
-  drupal_add_js(drupal_get_path('module', 'boincuser') . '/boincuser.js');
+  drupal_add_js(drupal_get_path('module', 'boincuser').'/boincuser.js');
   $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
 
   // Fieldset to hold all of the form as a container
@@ -710,7 +710,7 @@ 
 
   $form['termsofuse']['title1'] = array(
     '#weight' => -12,
-    '#value' => '<h2>' . bts( variable_get('boinc_weboptions_registrationtitle', 'Please read and acknowledge our terms of use'), array(), NULL, 'project:termsofuse-form' ) . '</h2>',
+    '#value' => '<h2>'.bts(variable_get('boinc_weboptions_registrationtitle', 'Please read and acknowledge our terms of use'), array(), NULL, 'project:termsofuse-form').'</h2>',
     '#prefix' => '<div id="register-title1">',
     '#suffix' => '</div>',
   );
@@ -745,12 +745,12 @@ 
     '#suffix' => '</li>',
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('NO - LOGOUT', array(), NULL, 'boinc:form-cancel'), '/logout') . '</li>',
+    '#value' => '<li class="tab">'.l(bts('NO - LOGOUT', array(), NULL, 'boinc:form-cancel'), '/logout').'</li>',
   );
   if (module_exists('boincuser_delete')) {
-    $deletelink = '/user/' . $user->uid . '/delete';
+    $deletelink = '/user/'.$user->uid.'/delete';
     $form['deleteaccount'] = array(
-      '#value' => '<li class="tab">' . l(bts('NO - DELETE ACCOUNT', array(), NULL, 'boinc:form-delete-user'), $deletelink) . '</li>',
+      '#value' => '<li class="tab">'.l(bts('NO - DELETE ACCOUNT', array(), NULL, 'boinc:form-delete-user'), $deletelink).'</li>',
     );
   }
 
@@ -843,7 +843,7 @@ 
   $form['buttons']['submit']['#suffix'] = '</li>';
   $form['buttons']['submit']['#weight'] = 1002;
   $form['buttons']['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), 'user/info/edit') . '</li>',
+      '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), 'user/info/edit').'</li>',
       '#weight' => 1005,
   );
   $form['buttons']['form control tabs suffix'] = array(
@@ -887,7 +887,7 @@ 
 
   // Set new password based on previous email address and entered
   // password.
-  $new_passwd_hash = password_hash( md5($form_state['values']['pass'].$pem), PASSWORD_DEFAULT);
+  $new_passwd_hash = password_hash(md5($form_state['values']['pass'].$pem), PASSWORD_DEFAULT);
 
   $boinc_user->update("email_addr='${pem}', previous_email_addr='', email_addr_change_time=0, passwd_hash='${new_passwd_hash}'");
 

html/user/register.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 
     $config = get_config();
     $disable_acct = parse_bool($config, "disable_account_creation");
-    page_head("Register",  null, null, null, boinc_recaptcha_get_head_extra());
+    page_head("Register", null, null, null, boinc_recaptcha_get_head_extra());
     echo "<h3>Create an account</h3>";
     form_start("create_account_action.php", "post");
     create_account_form(0, "download_software.php");

html/ops/generate_account_ownership_keys.php

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
 require_once("../inc/util.inc");
 require_once("../inc/account_ownership.inc");
 
-if ( !function_exists('openssl_pkey_new') ) {
+if (!function_exists('openssl_pkey_new')) {
     echo "WARNING: OpenSSL functions not available.  Not generating account ownership keys.\n";
     exit(1);
 }
@@ -73,7 +73,7 @@ 
                 throw new Exception('Failed to generate account ownership keypair.');
             }
         } catch (Exception $e) {
-            echo 'Caught exception during account ownership key generation: ',  $e->getMessage(), "\n";
+            echo 'Caught exception during account ownership key generation: ', $e->getMessage(), "\n";
         }
     } else {
         echo "The private and public keys already exist. Repeat the command with the 'overwrite' parameter to replace the existing ownership keys. \n";

drupal/sites/default/boinc/modules/flag_abuse_reason/flag_abuse_reason.module

Spacing +5 added lines, -5 removed lines

@@ -30,7 +30,7 @@ 
 function flag_abuse_reason_views_api() {
   return array(
     'api' => 2.0,
-    'path' => drupal_get_path('module', 'flag_abuse_reason') . '/includes',
+    'path' => drupal_get_path('module', 'flag_abuse_reason').'/includes',
   );
 }
 
@@ -47,8 +47,8 @@ 
  * Here we change our flag event/action to 'reset'.
  */
 function flag_abuse_reason_preprocess_flag(&$vars) {
-  drupal_add_js(drupal_get_path('module', 'flag_abuse_reason') . "/includes/flag_abuse_reason.js");
-  drupal_add_css(drupal_get_path('module', 'flag_abuse_reason') . "/css/flag_abuse_reason.css");
+  drupal_add_js(drupal_get_path('module', 'flag_abuse_reason')."/includes/flag_abuse_reason.js");
+  drupal_add_css(drupal_get_path('module', 'flag_abuse_reason')."/css/flag_abuse_reason.css");
   $myuser = $vars['user'];
   $metaflags = array('abuse_node_meta', 'abuse_comment_meta', 'abuse_user_meta');
 
@@ -80,7 +80,7 @@ 
       // If there are flags on this content, clear the flags and
       // lock the content.
       if (user_access('reset abuse flags', $myuser)) {
-        if ($count>0) {
+        if ($count > 0) {
           $vars['action'] = 'reset';
           $vars['link_text'] = t('Clear Reports and Lock');
           $vars['link_title'] = t('Remove all flags on this content and prevent any new flagging.');
@@ -152,7 +152,7 @@ 
   // Normal users may cancel their all their reported flags on this
   // content.
   else {
-    if ( ($event=='unflag') && (in_array($flag->name, $metaflags)) ) {
+    if (($event == 'unflag') && (in_array($flag->name, $metaflags))) {
       $allflags = flag_get_user_flags($flag->content_type, $content_id, $account->uid);
       foreach ($allflags as $subflag) {
         $myflag = flag_get_flag(NULL, $subflag->fid);

html/user/create_account.php

Spacing +8 added lines, -8 removed lines

@@ -100,12 +100,12 @@ 
         // Consistency checks
         //
         if (!check_termsofuse()) {
-            error_log("Project configuration error! " .
+            error_log("Project configuration error! ".
                 "Terms of use undefined while 'account_creation_rpc_require_consent' enabled!"
             );
         }
         if (!$checkct) {
-            error_log("Project configuration error! " .
+            error_log("Project configuration error! ".
               "'CONSENT_TYPE_ENROLL' disabled while 'account_creation_rpc_require_consent' enabled!"
             );
         }
@@ -114,9 +114,9 @@ 
         //
         if (is_null($consent_flag) or !$source) {
             xml_error(ERR_ACCT_REQUIRE_CONSENT,
-                "This project requires you to consent to its terms of use. " .
-                "Please update your BOINC software " .
-                "or register via the project's website " .
+                "This project requires you to consent to its terms of use. ".
+                "Please update your BOINC software ".
+                "or register via the project's website ".
                 "or contact your account manager's provider."
             );
         }
@@ -152,13 +152,13 @@ 
         // * not agree.
         //   -> no create account RPC at all
         //
-        if ( (!is_null($consent_flag)) and $source) {
+        if ((!is_null($consent_flag)) and $source) {
             // Record the user giving consent in database - if consent_flag is 0,
             // this is an 'anonymous account' and consent_not_required is
             // set to 1.
-            if ($consent_flag==0) {
+            if ($consent_flag == 0) {
                 $rc = consent_to_a_policy($user, $ctid, 0, 1, $source);
-            } else  {
+            } else {
                 $rc = consent_to_a_policy($user, $ctid, 1, 0, $source);
             }
             if (!$rc) {

html/user/submit_test.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
     $f->mode = "local_staged";
     $f->source = "input";
 
-    for ($i=10; $i<20; $i++) {
+    for ($i = 10; $i < 20; $i++) {
         $job = new StdClass;
         $job->input_files = array($f);
         $job->rsc_fpops_est = $i*1e9;

html/inc/language_names.inc

Spacing +3 added lines, -3 removed lines

@@ -63,13 +63,13 @@ 
     global $language_names;
     $supported_languages = get_supported_languages();
     $supported_languages[] = "en";
-    $sel = $cur_lang_name?"":"selected";
+    $sel = $cur_lang_name ? "" : "selected";
     echo "
         <option $sel value=auto>Language: default
     ";
     foreach ($language_names as $lang) {
         if (!in_array($lang[0], $supported_languages)) continue;
-        $sel = ($cur_lang_name == $lang[0])?"selected":"";
+        $sel = ($cur_lang_name == $lang[0]) ? "selected" : "";
         if ($lang[0] == "en") {
             echo "<option $sel value=".$lang[0].">".$lang[1];
         } else {
@@ -81,7 +81,7 @@ 
 
 // show a menu of supported languages
 //
-function language_form($cur_lang_name=null) {
+function language_form($cur_lang_name = null) {
     echo '
         <form name="language" method="get" action="set_language.php">
         <select class="selectbox form-control" name="lang" onchange="javascript: submit()">

html/user/openid.php

Spacing +64 added lines, -64 removed lines

@@ -69,13 +69,13 @@ 
 
     function __construct()
     {
-        $this->trustRoot = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST'];
+        $this->trustRoot = (!empty($_SERVER['HTTPS']) ? 'https' : 'http').'://'.$_SERVER['HTTP_HOST'];
         $uri = rtrim(preg_replace('#((?<=\?)|&)openid\.[^&]+#', '', $_SERVER['REQUEST_URI']), '?');
-        $this->returnUrl = $this->trustRoot . $uri;
+        $this->returnUrl = $this->trustRoot.$uri;
 
         $this->data = $_POST + $_GET; # OPs may send data as POST or GET.
 
-        if(!function_exists('curl_init') && !in_array('https', stream_get_wrappers())) {
+        if (!function_exists('curl_init') && !in_array('https', stream_get_wrappers())) {
             throw new ErrorException('You must have either https wrappers or curl enabled.');
         }
     }
@@ -84,7 +84,7 @@ 
     {
         switch ($name) {
         case 'identity':
-            if (strlen($value = trim((String) $value))) {
+            if (strlen($value = trim((String)$value))) {
                 if (preg_match('#^xri:/*#i', $value, $m)) {
                     $value = substr($value, strlen($m[0]));
                 } elseif (!preg_match('/^(?:[=@+\$!\(]|https?:)/i', $value)) {
@@ -139,23 +139,23 @@ 
         return !!gethostbynamel($server);
     }
 
-    protected function request_curl($url, $method='GET', $params=array())
+    protected function request_curl($url, $method = 'GET', $params = array())
     {
         $params = http_build_query($params, '', '&');
-        $curl = curl_init($url . ($method == 'GET' && $params ? '?' . $params : ''));
+        $curl = curl_init($url.($method == 'GET' && $params ? '?'.$params : ''));
         curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
         curl_setopt($curl, CURLOPT_HEADER, false);
         curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($curl, CURLOPT_HTTPHEADER, array('Accept: application/xrds+xml, */*'));
 
-        if($this->verify_peer !== null) {
+        if ($this->verify_peer !== null) {
             curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, $this->verify_peer);
-            if($this->capath) {
+            if ($this->capath) {
                 curl_setopt($curl, CURLOPT_CAPATH, $this->capath);
             }
 
-            if($this->cainfo) {
+            if ($this->cainfo) {
                 curl_setopt($curl, CURLOPT_CAINFO, $this->cainfo);
             }
         }
@@ -171,17 +171,17 @@ 
         }
         $response = curl_exec($curl);
 
-        if($method == 'HEAD') {
+        if ($method == 'HEAD') {
             $headers = array();
-            foreach(explode("\n", $response) as $header) {
-                $pos = strpos($header,':');
+            foreach (explode("\n", $response) as $header) {
+                $pos = strpos($header, ':');
                 $name = strtolower(trim(substr($header, 0, $pos)));
-                $headers[$name] = trim(substr($header, $pos+1));
+                $headers[$name] = trim(substr($header, $pos + 1));
             }
 
             # Updating claimed_id in case of redirections.
             $effective_url = curl_getinfo($curl, CURLINFO_EFFECTIVE_URL);
-            if($effective_url != $url) {
+            if ($effective_url != $url) {
                 $this->identity = $this->claimed_id = $effective_url;
             }
 
@@ -195,14 +195,14 @@ 
         return $response;
     }
 
-    protected function request_streams($url, $method='GET', $params=array())
+    protected function request_streams($url, $method = 'GET', $params = array())
     {
-        if(!$this->hostExists($url)) {
+        if (!$this->hostExists($url)) {
             throw new ErrorException('Invalid request.');
         }
 
         $params = http_build_query($params, '', '&');
-        switch($method) {
+        switch ($method) {
         case 'GET':
             $opts = array(
                 'http' => array(
@@ -211,7 +211,7 @@ 
                     'ignore_errors' => true,
                 )
             );
-            $url = $url . ($params ? '?' . $params : '');
+            $url = $url.($params ? '?'.$params : '');
             break;
         case 'POST':
             $opts = array(
@@ -236,31 +236,31 @@ 
                 ))
             );
 
-            $url = $url . ($params ? '?' . $params : '');
-            $headers_tmp = get_headers ($url);
-            if(!$headers_tmp) {
+            $url = $url.($params ? '?'.$params : '');
+            $headers_tmp = get_headers($url);
+            if (!$headers_tmp) {
                 return array();
             }
 
             # Parsing headers.
             $headers = array();
-            foreach($headers_tmp as $header) {
-                $pos = strpos($header,':');
+            foreach ($headers_tmp as $header) {
+                $pos = strpos($header, ':');
                 $name = strtolower(trim(substr($header, 0, $pos)));
-                $headers[$name] = trim(substr($header, $pos+1));
+                $headers[$name] = trim(substr($header, $pos + 1));
 
                 # Following possible redirections. The point is just to have
                 # claimed_id change with them, because get_headers() will
                 # follow redirections automatically.
                 # We ignore redirections with relative paths.
                 # If any known provider uses them, file a bug report.
-                if($name == 'location') {
-                    if(strpos($headers[$name], 'http') === 0) {
+                if ($name == 'location') {
+                    if (strpos($headers[$name], 'http') === 0) {
                         $this->identity = $this->claimed_id = $headers[$name];
-                    } elseif($headers[$name][0] == '/') {
+                    } elseif ($headers[$name][0] == '/') {
                         $parsed_url = parse_url($this->claimed_id);
                         $this->identity =
-                        $this->claimed_id = $parsed_url['scheme'] . '://'
+                        $this->claimed_id = $parsed_url['scheme'].'://'
                                           . $parsed_url['host']
                                           . $headers[$name];
                     }
@@ -272,7 +272,7 @@ 
             return $headers;
         }
 
-        if($this->verify_peer) {
+        if ($this->verify_peer) {
             $opts += array('ssl' => array(
                 'verify_peer' => true,
                 'capath'      => $this->capath,
@@ -280,14 +280,14 @@ 
             ));
         }
 
-        $context = stream_context_create ($opts);
+        $context = stream_context_create($opts);
 
         return file_get_contents($url, false, $context);
     }
 
-    protected function request($url, $method='GET', $params=array())
+    protected function request($url, $method = 'GET', $params = array())
     {
-        if(function_exists('curl_init') && !ini_get('safe_mode') && !ini_get('open_basedir')) {
+        if (function_exists('curl_init') && !ini_get('safe_mode') && !ini_get('open_basedir')) {
             return $this->request_curl($url, $method, $params);
         }
         return $this->request_streams($url, $method, $params);
@@ -296,19 +296,19 @@ 
     protected function build_url($url, $parts)
     {
         if (isset($url['query'], $parts['query'])) {
-            $parts['query'] = $url['query'] . '&' . $parts['query'];
+            $parts['query'] = $url['query'].'&'.$parts['query'];
         }
 
         $url = $parts + $url;
-        $url = $url['scheme'] . '://'
-             . (empty($url['username'])?''
-                 :(empty($url['password'])? "{$url['username']}@"
+        $url = $url['scheme'].'://'
+             . (empty($url['username']) ? ''
+                 :(empty($url['password']) ? "{$url['username']}@"
                  :"{$url['username']}:{$url['password']}@"))
              . $url['host']
-             . (empty($url['port'])?'':":{$url['port']}")
-             . (empty($url['path'])?'':$url['path'])
-             . (empty($url['query'])?'':"?{$url['query']}")
-             . (empty($url['fragment'])?'':"#{$url['fragment']}");
+             . (empty($url['port']) ? '' : ":{$url['port']}")
+             . (empty($url['path']) ? '' : $url['path'])
+             . (empty($url['query']) ? '' : "?{$url['query']}")
+             . (empty($url['fragment']) ? '' : "#{$url['fragment']}");
         return $url;
     }
 
@@ -322,7 +322,7 @@ 
         preg_match_all("#<{$tag}[^>]*$valueName=['\"](.+?)['\"][^>]*$attrName=['\"].*?$attrValue.*?['\"][^>]*/?>#i", $content, $matches2);
 
         $result = array_merge($matches1[1], $matches2[1]);
-        return empty($result)?false:$result[0];
+        return empty($result) ?false:$result[0];
     }
 
     /**
@@ -348,7 +348,7 @@ 
         $yadis = true;
 
         # We'll jump a maximum of 5 times, to avoid endless redirections.
-        for ($i = 0; $i < 5; $i ++) {
+        for ($i = 0; $i < 5; $i++) {
             if ($yadis) {
                 $headers = $this->request($url, 'HEAD');
 
@@ -370,12 +370,12 @@ 
                     $content = $this->request($url, 'GET');
 
                     preg_match_all('#<Service.*?>(.*?)</Service>#s', $content, $m);
-                    foreach($m[1] as $content) {
-                        $content = ' ' . $content; # The space is added, so that strpos doesn't return 0.
+                    foreach ($m[1] as $content) {
+                        $content = ' '.$content; # The space is added, so that strpos doesn't return 0.
 
                         # OpenID 2
                         $ns = preg_quote('http://specs.openid.net/auth/2.0/');
-                        if(preg_match('#<Type>\s*'.$ns.'(server|signon)\s*</Type>#s', $content, $type)) {
+                        if (preg_match('#<Type>\s*'.$ns.'(server|signon)\s*</Type>#s', $content, $type)) {
                             if ($type[1] == 'server') $this->identifier_select = true;
 
                             preg_match('#<URI.*?>(.*)</URI>#', $content, $server);
@@ -384,7 +384,7 @@ 
                                 return false;
                             }
                             # Does the server advertise support for either AX or SREG?
-                            $this->ax   = (bool) strpos($content, '<Type>http://openid.net/srv/ax/1.0</Type>');
+                            $this->ax   = (bool)strpos($content, '<Type>http://openid.net/srv/ax/1.0</Type>');
                             $this->sreg = strpos($content, '<Type>http://openid.net/sreg/1.0</Type>')
                                        || strpos($content, '<Type>http://openid.net/extensions/sreg/1.1</Type>');
 
@@ -498,33 +498,33 @@ 
         if ($this->required || $this->optional) {
             $params['openid.ns.ax'] = 'http://openid.net/srv/ax/1.0';
             $params['openid.ax.mode'] = 'fetch_request';
-            $this->aliases  = array();
+            $this->aliases = array();
             $counts   = array();
             $required = array();
             $optional = array();
-            foreach (array('required','optional') as $type) {
+            foreach (array('required', 'optional') as $type) {
                 foreach ($this->$type as $alias => $field) {
                     if (is_int($alias)) $alias = strtr($field, '/', '_');
-                    $this->aliases[$alias] = 'http://axschema.org/' . $field;
+                    $this->aliases[$alias] = 'http://axschema.org/'.$field;
                     if (empty($counts[$alias])) $counts[$alias] = 0;
                     $counts[$alias] += 1;
                     ${$type}[] = $alias;
                 }
             }
             foreach ($this->aliases as $alias => $ns) {
-                $params['openid.ax.type.' . $alias] = $ns;
+                $params['openid.ax.type.'.$alias] = $ns;
             }
             foreach ($counts as $alias => $count) {
                 if ($count == 1) continue;
-                $params['openid.ax.count.' . $alias] = $count;
+                $params['openid.ax.count.'.$alias] = $count;
             }
 
             # Don't send empty ax.requied and ax.if_available.
             # Google and possibly other providers refuse to support ax when one of these is empty.
-            if($required) {
+            if ($required) {
                 $params['openid.ax.required'] = implode(',', $required);
             }
-            if($optional) {
+            if ($optional) {
                 $params['openid.ax.if_available'] = implode(',', $optional);
             }
         }
@@ -537,8 +537,8 @@ 
         # If we have an openid.delegate that is different from our claimed id,
         # we need to somehow preserve the claimed id between requests.
         # The simplest way is to just send it along with the return_to url.
-        if($this->identity != $this->claimed_id) {
-            $returnUrl .= (strpos($returnUrl, '?') ? '&' : '?') . 'openid.claimed_id=' . $this->claimed_id;
+        if ($this->identity != $this->claimed_id) {
+            $returnUrl .= (strpos($returnUrl, '?') ? '&' : '?').'openid.claimed_id='.$this->claimed_id;
         }
 
         $params = array(
@@ -612,15 +612,15 @@ 
         # by presenting user_setup_url (for 1.1) or reporting
         # mode 'setup_needed' (for 2.0). Also catching all modes other than
         # id_res, in order to avoid throwing errors.
-        if(isset($this->data['openid_user_setup_url'])) {
+        if (isset($this->data['openid_user_setup_url'])) {
             $this->setup_url = $this->data['openid_user_setup_url'];
             return false;
         }
-        if($this->mode != 'id_res') {
+        if ($this->mode != 'id_res') {
             return false;
         }
 
-        $this->claimed_id = isset($this->data['openid_claimed_id'])?$this->data['openid_claimed_id']:$this->data['openid_identity'];
+        $this->claimed_id = isset($this->data['openid_claimed_id']) ? $this->data['openid_claimed_id'] : $this->data['openid_identity'];
         $params = array(
             'openid.assoc_handle' => $this->data['openid_assoc_handle'],
             'openid.signed'       => $this->data['openid_signed'],
@@ -638,7 +638,7 @@ 
             # If it's an OpenID 1 provider, and we've got claimed_id,
             # we have to append it to the returnUrl, like authUrl_v1 does.
             $this->returnUrl .= (strpos($this->returnUrl, '?') ? '&' : '?')
-                             .  'openid.claimed_id=' . $this->claimed_id;
+                             .  'openid.claimed_id='.$this->claimed_id;
         }
 
         if ($this->data['openid_return_to'] != $this->returnUrl) {
@@ -656,8 +656,8 @@ 
             # In such case, validation would fail, since we'd send different data than OP
             # wants to verify. stripslashes() should solve that problem, but we can't
             # use it when magic_quotes is off.
-            $value = $this->data['openid_' . str_replace('.','_',$item)];
-            $params['openid.' . $item] = (version_compare(PHP_VERSION, '5.4.0') < 0 && get_magic_quotes_gpc()) ? stripslashes($value) : $value;
+            $value = $this->data['openid_'.str_replace('.', '_', $item)];
+            $params['openid.'.$item] = (version_compare(PHP_VERSION, '5.4.0') < 0 && get_magic_quotes_gpc()) ? stripslashes($value) : $value;
 
         }
 
@@ -695,18 +695,18 @@ 
 
         $attributes = array();
         foreach ($this->data as $key => $value) {
-            $keyMatch = 'openid_' . $alias . '_value_';
+            $keyMatch = 'openid_'.$alias.'_value_';
             if (substr($key, 0, strlen($keyMatch)) != $keyMatch) {
                 continue;
             }
             $key = substr($key, strlen($keyMatch));
-            if (!isset($this->data['openid_' . $alias . '_type_' . $key])) {
+            if (!isset($this->data['openid_'.$alias.'_type_'.$key])) {
                 # OP is breaking the spec by returning a field without
                 # associated ns. This shouldn't happen, but it's better
                 # to check, than cause an E_NOTICE.
                 continue;
             }
-            $key = substr($this->data['openid_' . $alias . '_type_' . $key],
+            $key = substr($this->data['openid_'.$alias.'_type_'.$key],
                           strlen('http://axschema.org/'));
             $attributes[$key] = $value;
         }

html/user/download_software.php

Spacing +4 added lines, -4 removed lines

@@ -64,7 +64,7 @@ 
 //
 function get_platform($user_agent) {
     if (strstr($user_agent, 'Windows')) {
-        if (strstr($user_agent, 'Win64')||strstr($user_agent, 'WOW64')) {
+        if (strstr($user_agent, 'Win64') || strstr($user_agent, 'WOW64')) {
             return 'windows_x86_64';
         } else {
             return 'windows_intelx86';
@@ -138,7 +138,7 @@ 
         $token,
         $user->id,
         (string)$v->filename,
-        $green?"btn-success":"btn-info",
+        $green ? "btn-success" : "btn-info",
         (string)$v->platform,
         (string)$v->size_mb,
         (string)$v->version_num
@@ -147,7 +147,7 @@ 
 
 function download_button_vbox($v, $project_id, $token, $user) {
     // if no vbox version exists for platform, don't show vbox button
-    if(!$v->vbox_filename) {
+    if (!$v->vbox_filename) {
         return;
     }
     return sprintf(
@@ -436,7 +436,7 @@ 
     handle_get_info();
 } else {
     $dev = get_str("dev", true);
-    $user_agent = get_str("user_agent", true);      // for debugging
+    $user_agent = get_str("user_agent", true); // for debugging
     if (!$user_agent) {
         $user_agent = $_SERVER['HTTP_USER_AGENT'];
     }