BOINC / boinc

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

Spacing +38 added lines, -38 removed lines

@@ -15,7 +15,7 @@ 
  */
 function boinctranslate_initialize_languages() {
 
-  require_once(getcwd() . '/includes/locale.inc');
+  require_once(getcwd().'/includes/locale.inc');
 
   $api_base_url = 'https://www.transifex.com/api/2';
   $project_name = variable_get(
@@ -146,7 +146,7 @@ 
           }
         }
         if ($disabled_languages) {
-          drupal_set_message('The following languages were not found in Transifex and were disabled: ' . implode(' ', $disabled_languages));
+          drupal_set_message('The following languages were not found in Transifex and were disabled: '.implode(' ', $disabled_languages));
         }
         if ($process_batches) {
           $batch = array(
@@ -195,7 +195,7 @@ 
  *
  */
 function boinctranslate_export_translations() {
-  require_once(getcwd() . '/includes/locale.inc');
+  require_once(getcwd().'/includes/locale.inc');
   $project_name = variable_get(
     'boinc_translate_transifex_project_name', ''
   );
@@ -297,7 +297,7 @@ 
  *
  */
 function boinctranslate_update_official_boinc_translations() {
-  require_once(getcwd() . '/includes/locale.inc');
+  require_once(getcwd().'/includes/locale.inc');
   $project_name = variable_get(
     'boinc_translate_transifex_standard_name', ''
   );
@@ -405,7 +405,7 @@ 
 
   $url = "{$api_base_url}/{$path}";
   $headers = array(
-    'Authorization' => 'Basic ' . base64_encode($username . ":" . $password),
+    'Authorization' => 'Basic '.base64_encode($username.":".$password),
   );
   $data = NULL;
 
@@ -433,7 +433,7 @@ 
       return json_decode($response->data, TRUE);
     }
     else {
-      return (string) $response->data;
+      return (string)$response->data;
     }
     break;
   case 404:
@@ -456,7 +456,7 @@ 
  */
 function boinctranslate_get_po($langcode, $type = 'standard') {
 
-  require_once(getcwd() . '/includes/locale.inc');
+  require_once(getcwd().'/includes/locale.inc');
 
   $all_languages = language_list();
   $language = $langcode ? $all_languages[$langcode] : NULL;
@@ -515,7 +515,7 @@ 
  */
 function boinctranslate_export_po_generate($language = NULL, $strings = array(), $header = NULL, $type = NULL) {
 
-  require_once(getcwd() . '/includes/locale.inc');
+  require_once(getcwd().'/includes/locale.inc');
   global $user;
 
   // unset $language to indicate template creation
@@ -531,7 +531,7 @@ 
       $header = "# BOINC drupal localization template\n";
       $header .= "# Copyright (C) ".date("Y")." University of California\n";
     }
-    $header .= '# Generated by ' . $user->name . ' <' . $user->mail . ">\n";
+    $header .= '# Generated by '.$user->name.' <'.$user->mail.">\n";
     $header .= "#\n";
     $header .= "# This file is distributed under the same license as BOINC.\n";
     $header .= "#\n";
@@ -543,9 +543,9 @@ 
       $header .= "\"Project-Id-Version: BOINC unknown\\n\"\n"; // TODO: add SHA1 of source checkout here
     }
     $header .= "\"Report-Msgid-Bugs-To: BOINC translation team <boinc_loc@ssl.berkeley.edu>\\n\"\n";
-    $header .= "\"POT-Creation-Date: " . date("Y-m-d H:iO") . "\\n\"\n";
+    $header .= "\"POT-Creation-Date: ".date("Y-m-d H:iO")."\\n\"\n";
     if (isset($language)) {
-      $header .= "\"PO-Revision-Date: " . date("Y-m-d H:iO") . "\\n\"\n";
+      $header .= "\"PO-Revision-Date: ".date("Y-m-d H:iO")."\\n\"\n";
     }
     $header .= "\"Last-Translator: Generated automatically from Drupal translate interface\\n\"\n";
     $header .= "\"MIME-Version: 1.0\\n\"\n";
@@ -554,31 +554,31 @@ 
     if (isset($language)) {
       $header .= "\"Language: ".$language->language."\\n\"";
       if ($language->formula && $language->plurals) {
-        $header .= "\"Plural-Forms: nplurals=" . $language->plurals . "; plural=" . strtr($language->formula, array('$' => '')) . ";\\n\"\n";
+        $header .= "\"Plural-Forms: nplurals=".$language->plurals."; plural=".strtr($language->formula, array('$' => '')).";\\n\"\n";
       }
     }
     $header .= "\"X-Poedit-SourceCharset: utf-8\\n\"\n";
   }
 
-  $output = $header . "\n";
+  $output = $header."\n";
 
   foreach ($strings as $lid => $string) {
     // Only process non-children, children are output below their parent.
     if (!isset($string['child'])) {
       if ($string['comment']) {
-        $output .= '#: ' . $string['comment'] . "\n";
+        $output .= '#: '.$string['comment']."\n";
       }
       if ($string['context']) {
-        $output .= 'msgctxt "' . $string['context'] . "\"\n";
+        $output .= 'msgctxt "'.$string['context']."\"\n";
       }
-      $output .= 'msgid ' . _locale_export_string($string['source']);
+      $output .= 'msgid '._locale_export_string($string['source']);
       if (!empty($string['plural'])) {
         $plural = $string['plural'];
-        $output .= 'msgid_plural ' . _locale_export_string($strings[$plural]['source']);
+        $output .= 'msgid_plural '._locale_export_string($strings[$plural]['source']);
         if (isset($language)) {
           $translation = $string['translation'];
           for ($i = 0; $i < $language->plurals; $i++) {
-            $output .= 'msgstr[' . $i . '] ' . _locale_export_string($translation);
+            $output .= 'msgstr['.$i.'] '._locale_export_string($translation);
             if ($plural) {
               $translation = _locale_export_remove_plural($strings[$plural]['translation']);
               $plural = isset($strings[$plural]['plural']) ? $strings[$plural]['plural'] : 0;
@@ -589,12 +589,12 @@ 
           }
         }
         else {
-          $output .= 'msgstr[0] ""' . "\n";
-          $output .= 'msgstr[1] ""' . "\n";
+          $output .= 'msgstr[0] ""'."\n";
+          $output .= 'msgstr[1] ""'."\n";
         }
       }
       else {
-        $output .= 'msgstr ' . _locale_export_string($string['translation']);
+        $output .= 'msgstr '._locale_export_string($string['translation']);
       }
       $output .= "\n";
     }
@@ -606,7 +606,7 @@ 
  *
  */
 function boinctranslate_refresh_translations() {
-  require_once(getcwd() . '/includes/locale.inc');
+  require_once(getcwd().'/includes/locale.inc');
   $errors = array();
   $languages = locale_language_list();
   $translation_resources = array();
@@ -653,7 +653,7 @@ 
       ),
     );
     // Be sure any strings from the override file are added to the boinc group
-    $override_file = './' . drupal_get_path('module', 'boinctranslate') . '/includes/other-boinc-translation-strings.txt';
+    $override_file = './'.drupal_get_path('module', 'boinctranslate').'/includes/other-boinc-translation-strings.txt';
     $other_strings = file($override_file);
     if ($other_strings) {
       foreach ($other_strings as $string) {
@@ -666,13 +666,13 @@ 
           // Use '|' as delimiter to split string and context info.
           $line = explode("|", $string);
           if ($line) {
-            if (count($line)==1) {
+            if (count($line) == 1) {
               $tl0 = trim($line[0]);
               if ($tl0) {
                 bts($tl0);
               }
             }
-            elseif (count($line)>1) {
+            elseif (count($line) > 1) {
               $tl0 = trim($line[0]);
               $tl1 = trim($line[1]);
               if ($tl0 and $tl1) {
@@ -741,7 +741,7 @@ 
  */
 function boinctranslate_refresh_translations_op($project, $resource, $langcode, $language, $textgroups, $debug_mode, &$context) {
 
-  require_once(getcwd() . '/includes/locale.inc');
+  require_once(getcwd().'/includes/locale.inc');
 
   if ($debug_mode) {
     watchdog(
@@ -772,7 +772,7 @@ 
         $file->filename = basename($file->filepath);
         if (!$file->filepath) {
           $message = 'Unable to create temporary file in '
-            . file_directory_temp() . " for {$language} translation "
+            . file_directory_temp()." for {$language} translation "
             . "resource {$project}:{$resource}";
         }
 
@@ -849,7 +849,7 @@ 
     $context['finished'] = 1;
   }
   else {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -872,7 +872,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
     watchdog(
       'boinctranslate',
       $message,
@@ -893,7 +893,7 @@ 
     @set_time_limit(240);
   }
 
-  require_once(getcwd() . '/includes/locale.inc');
+  require_once(getcwd().'/includes/locale.inc');
 
   // Check if we have the language already in the database.
   if (!db_fetch_object(db_query("SELECT language FROM {languages} WHERE language = '%s'", $langcode))) {
@@ -935,7 +935,7 @@ 
  */
 function _boinctranslate_locale_import_read_po($op, $file, $mode = NULL, $lang = NULL, $group = 'default') {
 
-  require_once(getcwd() . '/includes/locale.inc');
+  require_once(getcwd().'/includes/locale.inc');
 
   $fd = fopen($file->filepath, "rb"); // File will get closed by PHP on return
   if (!$fd) {
@@ -955,7 +955,7 @@ 
   $lineno = 0; // Current line
 
   while (!feof($fd)) {
-    $line = fgets($fd, 10 * 1024); // A line should not be this long
+    $line = fgets($fd, 10*1024); // A line should not be this long
     if ($lineno == 0) {
       // The first line might come with a UTF-8 BOM, which should be removed.
       $line = str_replace("\xEF\xBB\xBF", '', $line);
@@ -1037,7 +1037,7 @@ 
         _locale_import_message('The translation file %filename contains a syntax error on line %line.', $file, $lineno);
         return FALSE;
       }
-      $current["msgid"] = $current["msgid"] . "\0" . $quoted;
+      $current["msgid"] = $current["msgid"]."\0".$quoted;
       $context = "MSGID_PLURAL";
     }
     elseif (!strncmp("msgid", $line, 5)) {
@@ -1190,7 +1190,7 @@ 
  */
 function _boinctranslate_locale_import_one_string($op, $value = NULL, $mode = NULL, $lang = NULL, $file = NULL, $group = 'default') {
 
-  require_once(getcwd() . '/includes/locale.inc');
+  require_once(getcwd().'/includes/locale.inc');
 
   static $report = array(
     'additions' => 0,
@@ -1323,13 +1323,13 @@ 
 
         $lid = $row['lid'];
         // Check of if one or more translations exist for this lid in locales_target table.
-        $exists = (bool) db_result(db_query("SELECT lid FROM {locales_target} WHERE lid = %d AND language = '%s'", $lid, $langcode));
+        $exists = (bool)db_result(db_query("SELECT lid FROM {locales_target} WHERE lid = %d AND language = '%s'", $lid, $langcode));
         if (!$exists) {
           // No translation in this language, insert translation into locales_target table.
           db_query("INSERT INTO {locales_target} (lid, language, translation, plid, plural) VALUES (%d, '%s', '%s', %d, %d)", $lid, $langcode, $translation, $plid, $plural);
           $report['additions']++;
         }
-        else if ( ($mode == LOCALE_IMPORT_OVERWRITE) and (!$ignoreoverwrite) ) {
+        else if (($mode == LOCALE_IMPORT_OVERWRITE) and (!$ignoreoverwrite)) {
           // Translation exists, only overwrite if instructed.
           db_query("UPDATE {locales_target} SET translation = '%s', plid = %d, plural = %d WHERE language = '%s' AND lid = %d", $translation, $plid, $plural, $langcode, $lid);
           $report['updates']++;
@@ -1345,7 +1345,7 @@ 
     // Loop over db results from locales_source table.
     while ($row = db_fetch_array($resource)) {
       $lid = $row['lid'];
-      $exists = (bool) db_result(db_query("SELECT lid FROM {locales_target} WHERE lid = %d AND language = '%s'", $lid, $langcode));
+      $exists = (bool)db_result(db_query("SELECT lid FROM {locales_target} WHERE lid = %d AND language = '%s'", $lid, $langcode));
       if ($exists) {
         // Empty translation, remove existing if instructed.
         db_query("DELETE FROM {locales_target} WHERE language = '%s' AND lid = %d AND plid = %d AND plural = %d", $langcode, $lid, $plid, $plural);
@@ -1403,5 +1403,5 @@ 
  * database.
  */
 function _boinctranslate_supertrim($instr) {
-  return implode("\n", array_map('trim', preg_split('/\r\n|\r|\n/', $instr) ) );
+  return implode("\n", array_map('trim', preg_split('/\r\n|\r|\n/', $instr)));
 }

html/inc/password_compat/password.inc

Spacing +11 added lines, -11 removed lines

@@ -38,14 +38,14 @@ 
                 return null;
             }
             if (is_null($password) || is_int($password)) {
-                $password = (string) $password;
+                $password = (string)$password;
             }
             if (!is_string($password)) {
                 trigger_error("password_hash(): Password must be a string", E_USER_WARNING);
                 return null;
             }
             if (!is_int($algo)) {
-                trigger_error("password_hash() expects parameter 2 to be long, " . gettype($algo) . " given", E_USER_WARNING);
+                trigger_error("password_hash() expects parameter 2 to be long, ".gettype($algo)." given", E_USER_WARNING);
                 return null;
             }
             $resultLength = 0;
@@ -53,7 +53,7 @@ 
                 case PASSWORD_BCRYPT:
                     $cost = PASSWORD_BCRYPT_DEFAULT_COST;
                     if (isset($options['cost'])) {
-                        $cost = (int) $options['cost'];
+                        $cost = (int)$options['cost'];
                         if ($cost < 4 || $cost > 31) {
                             trigger_error(sprintf("password_hash(): Invalid bcrypt cost parameter specified: %d", $cost), E_USER_WARNING);
                             return null;
@@ -79,11 +79,11 @@ 
                     case 'integer':
                     case 'double':
                     case 'string':
-                        $salt = (string) $options['salt'];
+                        $salt = (string)$options['salt'];
                         break;
                     case 'object':
                         if (method_exists($options['salt'], '__tostring')) {
-                            $salt = (string) $options['salt'];
+                            $salt = (string)$options['salt'];
                             break;
                         }
                     case 'array':
@@ -126,13 +126,13 @@ 
                     if ($read >= $raw_salt_len) {
                         $buffer_valid = true;
                     }
-                    $buffer = str_pad($buffer, $raw_salt_len, "\0") ^ str_pad($local_buffer, $raw_salt_len, "\0");
+                    $buffer = str_pad($buffer, $raw_salt_len, "\0")^str_pad($local_buffer, $raw_salt_len, "\0");
                 }
                 if (!$buffer_valid || PasswordCompat\binary\_strlen($buffer) < $raw_salt_len) {
                     $buffer_length = PasswordCompat\binary\_strlen($buffer);
                     for ($i = 0; $i < $raw_salt_len; $i++) {
                         if ($i < $buffer_length) {
-                            $buffer[$i] = $buffer[$i] ^ chr(mt_rand(0, 255));
+                            $buffer[$i] = $buffer[$i]^chr(mt_rand(0, 255));
                         } else {
                             $buffer .= chr(mt_rand(0, 255));
                         }
@@ -153,7 +153,7 @@ 
             }
             $salt = PasswordCompat\binary\_substr($salt, 0, $required_salt_len);
 
-            $hash = $hash_format . $salt;
+            $hash = $hash_format.$salt;
 
             $ret = crypt($password, $hash);
 
@@ -208,12 +208,12 @@ 
          */
         function password_needs_rehash($hash, $algo, array $options = array()) {
             $info = password_get_info($hash);
-            if ($info['algo'] !== (int) $algo) {
+            if ($info['algo'] !== (int)$algo) {
                 return true;
             }
             switch ($algo) {
                 case PASSWORD_BCRYPT:
-                    $cost = isset($options['cost']) ? (int) $options['cost'] : PASSWORD_BCRYPT_DEFAULT_COST;
+                    $cost = isset($options['cost']) ? (int)$options['cost'] : PASSWORD_BCRYPT_DEFAULT_COST;
                     if ($cost !== $info['options']['cost']) {
                         return true;
                     }
@@ -242,7 +242,7 @@ 
 
             $status = 0;
             for ($i = 0; $i < PasswordCompat\binary\_strlen($ret); $i++) {
-                $status |= (ord($ret[$i]) ^ ord($hash[$i]));
+                $status |= (ord($ret[$i])^ord($hash[$i]));
             }
 
             return $status === 0;

html/inc/random_compat/random_bytes_libsodium_legacy.inc

Spacing +2 added lines, -2 removed lines

@@ -70,10 +70,10 @@
                 $n = ($bytes - $i) > 1073741824
                     ? 1073741824
                     : $bytes - $i;
-                $buf .= Sodium::randombytes_buf((int) $n);
+                $buf .= Sodium::randombytes_buf((int)$n);
             }
         } else {
-            $buf .= Sodium::randombytes_buf((int) $bytes);
+            $buf .= Sodium::randombytes_buf((int)$bytes);
         }
 
         if (is_string($buf)) {

html/inc/random_compat/random_int.inc

Spacing +5 added lines, -5 removed lines

@@ -78,7 +78,7 @@ 
         }
 
         if ($max === $min) {
-            return (int) $min;
+            return (int)$min;
         }
 
         /**
@@ -124,12 +124,12 @@ 
              * type juggling
              */
             while ($range > 0) {
-                if ($bits % 8 === 0) {
+                if ($bits%8 === 0) {
                     ++$bytes;
                 }
                 ++$bits;
                 $range >>= 1;
-                $mask = $mask << 1 | 1;
+                $mask = $mask << 1|1;
             }
             $valueShift = $min;
         }
@@ -167,7 +167,7 @@ 
              */
             $val &= 0;
             for ($i = 0; $i < $bytes; ++$i) {
-                $val |= ord($randomByteString[$i]) << ($i * 8);
+                $val |= ord($randomByteString[$i]) << ($i*8);
             }
 
             /**
@@ -185,6 +185,6 @@ 
              */
         } while (!is_int($val) || $val > $max || $val < $min);
 
-        return (int) $val;
+        return (int)$val;
     }
 }

html/inc/random_compat/cast_to_int.inc

Spacing +2 added lines, -2 removed lines

@@ -60,11 +60,11 @@
             &&
             $number < PHP_INT_MAX
         ) {
-            $number = (int) $number;
+            $number = (int)$number;
         }
 
         if (is_int($number)) {
-            return (int) $number;
+            return (int)$number;
         } elseif (!$fail_open) {
             throw new TypeError(
                 'Expected an integer.'

html/inc/random_compat/random.inc

Spacing +11 added lines, -11 removed lines

@@ -34,8 +34,8 @@ 
     $RandomCompatversion = array_map('intval', explode('.', PHP_VERSION));
     define(
         'PHP_VERSION_ID',
-        $RandomCompatversion[0] * 10000
-        + $RandomCompatversion[1] * 100
+        $RandomCompatversion[0]*10000
+        + $RandomCompatversion[1]*100
         + $RandomCompatversion[2]
     );
     $RandomCompatversion = null;
@@ -54,9 +54,9 @@ 
 
 $RandomCompatDIR = dirname(__FILE__);
 
-require_once $RandomCompatDIR . '/byte_safe_strings.inc';
-require_once $RandomCompatDIR . '/cast_to_int.inc';
-require_once $RandomCompatDIR . '/error_polyfill.inc';
+require_once $RandomCompatDIR.'/byte_safe_strings.inc';
+require_once $RandomCompatDIR.'/cast_to_int.inc';
+require_once $RandomCompatDIR.'/error_polyfill.inc';
 
 if (!is_callable('random_bytes')) {
     /**
@@ -76,9 +76,9 @@ 
     if (extension_loaded('libsodium')) {
         // See random_bytes_libsodium.php
         if (PHP_VERSION_ID >= 50300 && is_callable('\\Sodium\\randombytes_buf')) {
-            require_once $RandomCompatDIR . '/random_bytes_libsodium.inc';
+            require_once $RandomCompatDIR.'/random_bytes_libsodium.inc';
         } elseif (method_exists('Sodium', 'randombytes_buf')) {
-            require_once $RandomCompatDIR . '/random_bytes_libsodium_legacy.inc';
+            require_once $RandomCompatDIR.'/random_bytes_libsodium_legacy.inc';
         }
     }
 
@@ -117,7 +117,7 @@ 
             // place, that is not helpful to us here.
 
             // See random_bytes_dev_urandom.php
-            require_once $RandomCompatDIR . '/random_bytes_dev_urandom.inc';
+            require_once $RandomCompatDIR.'/random_bytes_dev_urandom.inc';
         }
         // Unset variables after use
         $RandomCompat_basedir = null;
@@ -159,7 +159,7 @@ 
         extension_loaded('mcrypt')
     ) {
         // See random_bytes_mcrypt.php
-        require_once $RandomCompatDIR . '/random_bytes_mcrypt.inc';
+        require_once $RandomCompatDIR.'/random_bytes_mcrypt.inc';
     }
     $RandomCompatUrandom = null;
 
@@ -184,7 +184,7 @@ 
                 $RandomCompatCOMtest = new COM('CAPICOM.Utilities.1');
                 if (method_exists($RandomCompatCOMtest, 'GetRandom')) {
                     // See random_bytes_com_dotnet.php
-                    require_once $RandomCompatDIR . '/random_bytes_com_dotnet.inc';
+                    require_once $RandomCompatDIR.'/random_bytes_com_dotnet.inc';
                 }
             } catch (com_exception $e) {
                 // Don't try to use it.
@@ -219,7 +219,7 @@ 
 }
 
 if (!is_callable('random_int')) {
-    require_once $RandomCompatDIR . '/random_int.inc';
+    require_once $RandomCompatDIR.'/random_int.inc';
 }
 
 $RandomCompatDIR = null;

html/inc/token.inc

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
     $expiration = $now + $duration;
     $type = BoincDb::escape_string($type);
     $ret = BoincToken::insert("(token,userid,type,create_time,expire_time) values ('$token', $userid, '$type', $now, $expiration)");
-    if ( !$ret ) {
+    if (!$ret) {
         return null;
     }
     return $token;
@@ -39,7 +39,7 @@ 
 
 function is_valid_token($userid, $token, $type) {
     $boincToken = BoincToken::lookup_valid_token($userid, $token, $type);
-    if ( $boincToken == null ) {
+    if ($boincToken == null) {
         return false;
     }
     return true;

html/user/edit_email_action.php

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
             echo tra("Invalid password.");
         } else {
             $passwd_hash = md5($passwd.$email_addr);
-            $database_passwd_hash = password_hash($passwd_hash , PASSWORD_DEFAULT);
+            $database_passwd_hash = password_hash($passwd_hash, PASSWORD_DEFAULT);
             $email_addr = BoincDb::escape_string($email_addr);
             $user->email_addr_change_time = time();
             $result = $user->update(

html/user/recover_email.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
         } else {
             echo tra("Email address has been reverted.")."<br /><br />".tra("You need to reset your password:  ")."<a href=\"".secure_url_base()."get_passwd.php\">".secure_url_base()."get_passwd.php</a>";
 
-            $database_passwd_hash = password_hash(random_string() , PASSWORD_DEFAULT);
+            $database_passwd_hash = password_hash(random_string(), PASSWORD_DEFAULT);
             //Change previous_email
             $result = $tmpuser->update(
                 "email_addr=previous_email_addr, previous_email_addr='', email_addr_change_time=0, passwd_hash='$database_passwd_hash', email_validated=0"