BOINC / boinc

drupal/sites/default/boinc/modules/contrib/elysia_cron/elysia_cron.admin.inc

Braces +8 added lines, -16 removed lines

@@ -570,8 +570,7 @@ 
       $rule = explode('=', $rule);
       if (empty($rule[1])) {
         form_set_error('elysia_cron_default_rules', t('Invalid rule: %rule', array('%rule' => $rule[0])));
-      } 
-      elseif (!preg_match('/^\\s*([0-9*,\/-]+[ ]+[0-9*,\/-]+[ ]+[0-9*,\/-]+[ ]+[0-9*,\/-]+[ ]+[0-9*,\/-]+)\\s*$/', trim($rule[1]))) {
+      } elseif (!preg_match('/^\\s*([0-9*,\/-]+[ ]+[0-9*,\/-]+[ ]+[0-9*,\/-]+[ ]+[0-9*,\/-]+[ ]+[0-9*,\/-]+)\\s*$/', trim($rule[1]))) {
         form_set_error('elysia_cron_default_rules', t('Invalid rule: %rule', array('%rule' => $rule[0])));
       }
     }
@@ -602,15 +601,13 @@ 
     if (!preg_match('/^_elysia_cron_([^_]+_[^_]+)_(.*)$/', $key, $r)) {
       if ($op == t('Reset to defaults') || ($key != 'cron_safe_threshold' && !$value)) {
         variable_del($key);
-      }
-      elseif ($key != 'elysia_cron_default_rules') {
+      } elseif ($key != 'elysia_cron_default_rules') {
         if (is_array($value) && isset($form_values['array_filter'])) {
           $value = array_keys(array_filter($value));
         }
         variable_set($key, $value);
       }
-    }
-    else {
+    } else {
       $nullvalue = $r[1] != 'job_weight' ? !$value : !$value && $value !== '0';
 
       //dprint($r[1].' '.$r[1].' '.$r[2]);
@@ -635,8 +632,7 @@ 
             elysia_cron_reset_channel_rule($r[2]);
             break;
         }
-      }
-      else {
+      } else {
         switch ($r[1]) {
           case 'job_channel':
             elysia_cron_set_job_channel($r[2], $value);
@@ -650,8 +646,7 @@ 
             if ($value != 'custom') {
               if ($value == 'default') {
                 elysia_cron_reset_job_rule($r[2]);
-              }
-              else {
+              } else {
                 elysia_cron_set_job_rule($r[2], $value);
               }
             }
@@ -675,8 +670,7 @@ 
   }
   if ($op == t('Reset to defaults')) {
     drupal_set_message(t('The configuration options have been reset to their default values.'));
-  }
-  else {
+  } else {
     drupal_set_message(t('The configuration options have been saved.'));
   }
 }
@@ -702,8 +696,7 @@ 
   // Run cron manually from Cron form.
   if (elysia_cron_run()) {
     drupal_set_message(t('Cron run successfully.'));
-  }
-  else {
+  } else {
     drupal_set_message(t('Cron run failed.'), 'error');
   }
 
@@ -722,8 +715,7 @@ 
   if (elysia_cron_is_job_running($job, false)) {
     if (time() - elysia_cron_get_job_last_run($job, 0) > variable_get('elysia_cron_stuck_time', 3600)) {
       drupal_set_message(t('Job %job already running, but is probably stuck, so i consider it as terminated', array('%job' => $job)));
-    }
-    else {
+    } else {
       drupal_set_message(t('Job %job already running', array('%job' => $job)));
       $running = true;
     }

drupal/sites/default/boinc/modules/contrib/elysia_cron/elysia_drupalconv.php

Braces +15 added lines, -10 removed lines

@@ -16,8 +16,9 @@ 
 
 function _dcf_hook_menu($items, $maycache) {
   $new_items = array();
-  foreach ($items as $k => $v)
-    $new_items[_dcf_internal_path($k)] = $v;
+  foreach ($items as $k => $v) {
+      $new_items[_dcf_internal_path($k)] = $v;
+  }
   return $new_items;
 }
 
@@ -28,23 +29,26 @@ 
   }
   if (!empty($a['#type']) && $a['#type'] == 'actions')
     unset($a['#type']);
-  foreach ($a as $k => &$v) 
-    if (is_array($v))
+  foreach ($a as $k => &$v) {
+      if (is_array($v))
       _dcf_convert_render_array($v);
-}
+  }
+  }
 
 function _dcr_render_array($output) {
-  foreach ($output as $k => &$v)
-    if ((is_numeric($k) || $k{0} != '#') && is_string($v))
+  foreach ($output as $k => &$v) {
+      if ((is_numeric($k) || $k{0} != '#') && is_string($v))
       $v = array( '#type' => 'markup', '#value' => $v, '#weight' => -1 );
+  }
   _dcf_convert_render_array($output);
   return drupal_render($output);
 }
 
 function _dcr_form(&$form) {
-  foreach ($form as $k => &$v)
-    if ((is_numeric($k) || $k{0} != '#') && is_string($v))
+  foreach ($form as $k => &$v) {
+      if ((is_numeric($k) || $k{0} != '#') && is_string($v))
       $v = array( '#type' => 'markup', '#value' => $v, '#weight' => -1 );
+  }
   _dcf_convert_render_array($form);
   return $form;
 }
@@ -61,7 +65,8 @@ 
   return t($string);
 }
 
-function _dco_watchdog($type, $message, $variables = array(), $severity = WATCHDOG_NOTICE, $link = NULL) { // WARN d7 changed WATCHDOG_ costants
+function _dco_watchdog($type, $message, $variables = array(), $severity = WATCHDOG_NOTICE, $link = NULL) {
+// WARN d7 changed WATCHDOG_ costants
   return watchdog($type, $message, $variables, $severity, $link);
 }
 

drupal/sites/default/boinc/modules/contrib/elysia_cron/elysia_cron.ctools.inc

Braces +5 added lines, -10 removed lines

@@ -28,8 +28,7 @@ 
     
     if (EC_DRUPAL_VERSION >= 7) {
       $object = db_query("select " . implode(", ", $GLOBALS['_ec_columns']) . " from {elysia_cron} where name = :name", array(':name' => $name))->fetch();
-    }
-    else {
+    } else {
       $object = db_fetch_object(db_query("select " . implode(", ", $GLOBALS['_ec_columns']) . " from {elysia_cron} where name = '%s'", $name));
     }
     $default_objects = _ctools_export_get_defaults('elysia_cron', $export);
@@ -37,12 +36,10 @@ 
     if ($object) {
       if (isset($default_objects[$name])) {
         return _elysia_cron_ctools_export_load_object_db_and_code($object, $default_objects[$name], $export);
-      }
-      else {
+      } else {
         return _elysia_cron_ctools_export_load_object_db($object, $export);
       }
-    }
-    elseif (isset($default_objects[$name])) {
+    } elseif (isset($default_objects[$name])) {
       return _elysia_cron_ctools_export_load_object_code($default_objects[$name], $export);
     }
   }
@@ -61,8 +58,7 @@ 
     
   if (EC_DRUPAL_VERSION >= 7) {
     $objects = db_query("select " . implode(", ", $GLOBALS['_ec_columns']) . " from {elysia_cron}")->fetchAll();
-  }
-  else {
+  } else {
     $objects = array();
     $rs = db_query("select " . implode(", ", $GLOBALS['_ec_columns']) . " from {elysia_cron}");
     while ($o = db_fetch_object($rs)) {
@@ -92,8 +88,7 @@ 
   foreach ($code_object as $keyd => $value) {
     if (!isset($object->$keyd) || is_null($object->$keyd)) {
       $object->$keyd = $value;
-    }
-    else if ($object->$keyd !== $value) {
+    } else if ($object->$keyd !== $value) {
       $overridden = true;
     }
   }

drupal/sites/default/boinc/modules/contrib/elysia_cron/elysia_cron_update.php

Braces +9 added lines, -18 removed lines

@@ -65,8 +65,7 @@ 
               $vn = 'ecc_' . _ec_get_name($r[1]) . '_laf';
               break;
           }
-        }
-        elseif (preg_match('/^elysia_cron_(.*)_(rule|disabled|context|running|last_run|last_execution_time|execution_count|avg_execution_time|max_execution_time)/', $v->name, $r)) {
+        } elseif (preg_match('/^elysia_cron_(.*)_(rule|disabled|context|running|last_run|last_execution_time|execution_count|avg_execution_time|max_execution_time)/', $v->name, $r)) {
           switch ($r[2]) {
             case 'rule':
               $vn = 'ec_' . _ec_get_name($r[1]) . '_rul';
@@ -99,8 +98,7 @@ 
         }
         if ($vn) {
           variable_set($vn, unserialize($v->value));
-        }
-        else {
+        } else {
           _dco_watchdog('cron', 'Error in update, cant convert %name (value: %value)', array('%name' => $v->name, '%value' => $v->value), WATCHDOG_ERROR);
         }
 
@@ -125,14 +123,12 @@ 
         // Must use "$v" for PHP5.3 running D6 version (detect the error even if it doesn't pass here)
         db_change_field($v = 'elysia_cron', 'disable', 'disabled', array('type' => 'int', 'size' => 'tiny', 'not null' => FALSE));
 
-      }
-      elseif (EC_DRUPAL_VERSION >= 6) {
+      } elseif (EC_DRUPAL_VERSION >= 6) {
         // D6
         $ret = array();
         db_change_field($ret, 'elysia_cron', 'disable', 'disabled', array('type' => 'int', 'size' => 'tiny', 'not null' => FALSE));
       }
-    }
-    else {
+    } else {
       // D5
       switch ($GLOBALS['db_type']) {
         case 'mysqli':
@@ -185,8 +181,7 @@ 
       $name = false;
       if (preg_match('/^ecc_(.+)_(r|d|lr|la|ac|ec|let|aet|met|lst|laf)/', $v->name, $r)) {
         $name = ':' . $r[1];
-      }
-      elseif (preg_match('/^ec_(.+)_(rul|d|c|w|r|lr|let|ec|aet|met)/', $v->name, $r)) {
+      } elseif (preg_match('/^ec_(.+)_(rul|d|c|w|r|lr|let|ec|aet|met)/', $v->name, $r)) {
         $name = $r[1];
       }
       if ($name) {
@@ -275,13 +270,11 @@ 
       // Must use "$v" for PHP5.3 running D6 version (detect the error even if it doesn't pass here)
       db_change_field($v = 'elysia_cron', 'weight', 'weight', array('type' => 'int', 'not null' => FALSE));
 
-    }
-    elseif (EC_DRUPAL_VERSION >= 6) {
+    } elseif (EC_DRUPAL_VERSION >= 6) {
       // D6
       $ret = array();
       db_change_field($ret, 'elysia_cron', 'weight', 'weight', array('type' => 'int', 'not null' => FALSE));
-    }
-    else {
+    } else {
       // D5
       db_query("alter table {elysia_cron} change weight weight int(11)");
     }
@@ -310,13 +303,11 @@ 
       // Must use "$v" for PHP5.3 running D6 version (detect the error even if it doesn't pass here)
       db_change_field($v = 'elysia_cron', 'disabled', 'disable', array('type' => 'int', 'size' => 'tiny', 'not null' => FALSE));
 
-    }
-    elseif (EC_DRUPAL_VERSION >= 6) {
+    } elseif (EC_DRUPAL_VERSION >= 6) {
       // D6
       $ret = array();
       db_change_field($ret, 'elysia_cron', 'disabled', 'disable', array('type' => 'int', 'size' => 'tiny', 'not null' => FALSE));
-    }
-    else {
+    } else {
       // D5
       db_query("alter table {elysia_cron} change disabled disable tinyint(1)");
     }

drupal/sites/default/boinc/modules/contrib/elysia_cron/elysia_cron_scheduler.inc

Braces +3 added lines, -6 removed lines

@@ -50,8 +50,7 @@ 
         $expected_date[$i] -= $ranges[$i][1] + 1;
       }
       $new = $expected_date[$i] + ceil(($date[$i] - $expected_date[$i]) / $r['d']) * $r['d'];
-    }
-    elseif ($r['n']) {
+    } elseif ($r['n']) {
       $new = __cronNextOrEqual($date[$i], $r['n'], $ranges[$i][0], $ranges[$i][1]);
     }
     if ($new != $date[$i]) {
@@ -113,11 +112,9 @@ 
   foreach (explode(',', $rule) as $token) {
     if (preg_match('/^([0-9]+)-([0-9]+)$/', $token, $r)) {
       $result['n'] = array_merge($result['n'], range($r[1], $r[2]));
-    }
-    elseif (preg_match('/^\*\/([0-9]+)$/', $token, $r)) {
+    } elseif (preg_match('/^\*\/([0-9]+)$/', $token, $r)) {
       $result['d'] = $r[1];
-    }
-    elseif (is_numeric($token)) {
+    } elseif (is_numeric($token)) {
       $result['n'][] = $token;
     }
   }

drupal/sites/default/boinc/modules/contrib/elysia_cron/cron.php

Braces +1 added lines, -2 removed lines

@@ -21,7 +21,6 @@
 
 if (function_exists('elysia_cron_run')) {
   elysia_cron_run();
-}
-else {
+} else {
   drupal_cron_run();
 }

html/ops/show_log.php

Braces +3 added lines, -3 removed lines

@@ -27,19 +27,19 @@
     exit("Error: couldn't get log_dir from config file.");
 }
 
-if( isset($_GET["f"]) ){
+if( isset($_GET["f"]) ) {
     $f = $_GET["f"];
     $f = escapeshellcmd($f);
 } else {
     $f = "";
 }
-if( isset($_GET["s"]) ){
+if( isset($_GET["s"]) ) {
     $s = $_GET["s"];
     $s = escapeshellcmd($s);
 } else {
     $s = "";
 }
-if( isset($_GET["l"]) ){
+if( isset($_GET["l"]) ) {
     $l = (int)$_GET["l"];
 } else {
     $l = 0;

drupal/sites/default/boinc/modules/contrib/features/includes/features.user.inc

Braces +1 added lines, -2 removed lines

@@ -90,8 +90,7 @@
     if (isset($permissions[$perm_name])) {
       sort($permissions[$perm_name]);
       $permission['roles'] = $permissions[$perm_name];
-    }
-    else {
+    } else {
       $permission['roles'] = array();
     }
     $perm_identifier = features_var_export($perm_name);

drupal/sites/default/boinc/modules/contrib/features/includes/features.filter.inc

Braces +3 added lines, -6 removed lines

@@ -126,8 +126,7 @@ 
       // The format has no filters and does not exist, use the default input
       // format.
       $filters[$format] = filter_list_format(variable_get('filter_default_format', 1));
-    }
-    else {
+    } else {
       $filters[$format] = array();
       while ($filter = db_fetch_object($result)) {
         $list = module_invoke($filter->module, 'filter', 'list');
@@ -169,8 +168,7 @@ 
   }
   if ($format_id && $format_id == variable_get('filter_default_format', 1)) {
     $format['roles'] = ','. implode(',', array_keys(user_roles())) .',';
-  }
-  else {
+  } else {
     $format['roles'] = ','. implode(',', $format_rids) .',';
   }
 
@@ -178,8 +176,7 @@ 
   if ($format_id) {
     $format['format'] = $format_id;
     drupal_write_record('filter_formats', $format, 'format');
-  }
-  else {
+  } else {
     drupal_write_record('filter_formats', $format);
   }