BOINC / boinc

drupal/sites/default/boinc/modules/boincstats/includes/pchart/class/pSurface.class.php

Braces +35 added lines, -72 removed lines

@@ -22,24 +22,21 @@ 
  define("LABEL_POSITION_BOTTOM"	, 880004);
 
  /* pStock class definition */
- class pSurface
-  {
+ class pSurface {
    var $pChartObject;
    var $GridSizeX;
    var $GridSizeY;
    var $Points;
 
    /* Class creator */
-   function pSurface($pChartObject)
-    {
+   function pSurface($pChartObject) {
      $this->pChartObject = $pChartObject;
      $this->GridSize     = 10;
      $this->Points       = "";
     }
 
    /* Define the grid size and initialise the 2D matrix */
-   function setGrid($XSize=10,$YSize=10)
-    {
+   function setGrid($XSize=10,$YSize=10) {
      for($X=0; $X<=$XSize; $X++) { for($Y=0; $Y<=$YSize; $Y++) { $this->Points[$X][$Y]=UNKNOWN; } } 
 
      $this->GridSizeX = $XSize;
@@ -47,8 +44,7 @@ 
     }
 
    /* Add a point on the grid */
-   function addPoint($X,$Y,$Value,$Force=TRUE)
-    {
+   function addPoint($X,$Y,$Value,$Force=TRUE) {
      if ( $X < 0 || $X >$this->GridSizeX ) { return(0); }
      if ( $Y < 0 || $Y >$this->GridSizeY ) { return(0); }
 
@@ -61,8 +57,7 @@ 
     }
 
    /* Write the X labels */
-   function writeXLabels($Format="")
-    {
+   function writeXLabels($Format="") {
      $R			= isset($Format["R"]) ? $Format["R"] : $this->pChartObject->FontColorR;
      $G			= isset($Format["G"]) ? $Format["G"] : $this->pChartObject->FontColorG;
      $B			= isset($Format["B"]) ? $Format["B"] : $this->pChartObject->FontColorB;
@@ -79,23 +74,18 @@ 
      $XSize = ($this->pChartObject->GraphAreaX2 - $this->pChartObject->GraphAreaX1) / ($this->GridSizeX+1);
 
      $Settings = array("Angle"=>$Angle,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
-     if ( $Position == LABEL_POSITION_TOP )
-      {
+     if ( $Position == LABEL_POSITION_TOP ) {
        $YPos  = $this->pChartObject->GraphAreaY1 - $Padding;
        if ($Angle == 0 ) { $Settings["Align"] = TEXT_ALIGN_BOTTOMMIDDLE; }
        if ($Angle != 0 ) { $Settings["Align"] = TEXT_ALIGN_MIDDLELEFT; }
-      }
-     elseif ( $Position == LABEL_POSITION_BOTTOM )
-      {
+      } elseif ( $Position == LABEL_POSITION_BOTTOM ) {
        $YPos  = $this->pChartObject->GraphAreaY2 + $Padding;
        if ($Angle == 0 ) { $Settings["Align"] = TEXT_ALIGN_TOPMIDDLE; }
        if ($Angle != 0 ) { $Settings["Align"] = TEXT_ALIGN_MIDDLERIGHT; }
-      }
-     else
+      } else
       return(-1);
 
-     for($X=0;$X<=$this->GridSizeX;$X++)
-      {
+     for($X=0;$X<=$this->GridSizeX;$X++) {
        $XPos = floor($X0+$X*$XSize + $XSize/2);
 
        if( $Labels == NULL || !isset($Labels[$X]) )
@@ -108,8 +98,7 @@ 
     }
 
    /* Write the Y labels */
-   function writeYLabels($Format="")
-    {
+   function writeYLabels($Format="") {
      $R			= isset($Format["R"]) ? $Format["R"] : $this->pChartObject->FontColorR;
      $G			= isset($Format["G"]) ? $Format["G"] : $this->pChartObject->FontColorG;
      $B			= isset($Format["B"]) ? $Format["B"] : $this->pChartObject->FontColorB;
@@ -127,14 +116,11 @@ 
 
      $Settings = array("Angle"=>$Angle,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
      if ( $Position == LABEL_POSITION_LEFT )
-      { $XPos  = $this->pChartObject->GraphAreaX1 - $Padding; $Settings["Align"] = TEXT_ALIGN_MIDDLERIGHT; }
-     elseif ( $Position == LABEL_POSITION_RIGHT )
-      { $XPos  = $this->pChartObject->GraphAreaX2 + $Padding; $Settings["Align"] = TEXT_ALIGN_MIDDLELEFT; }
-     else
+      { $XPos  = $this->pChartObject->GraphAreaX1 - $Padding; $Settings["Align"] = TEXT_ALIGN_MIDDLERIGHT; } elseif ( $Position == LABEL_POSITION_RIGHT )
+      { $XPos  = $this->pChartObject->GraphAreaX2 + $Padding; $Settings["Align"] = TEXT_ALIGN_MIDDLELEFT; } else
       return(-1);
 
-     for($Y=0;$Y<=$this->GridSizeY;$Y++)
-      {
+     for($Y=0;$Y<=$this->GridSizeY;$Y++) {
        $YPos = floor($Y0+$Y*$YSize + $YSize/2);
 
        if( $Labels == NULL || !isset($Labels[$Y]) )
@@ -147,8 +133,7 @@ 
     }
 
    /* Draw the area arround the specified Threshold */
-   function drawContour($Threshold,$Format="")
-    {
+   function drawContour($Threshold,$Format="") {
      $R		= isset($Format["R"]) ? $Format["R"] : 0;
      $G		= isset($Format["G"]) ? $Format["G"] : 0;
      $B		= isset($Format["B"]) ? $Format["B"] : 0;
@@ -163,14 +148,11 @@ 
 
      $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks);
 
-     for($X=0;$X<=$this->GridSizeX;$X++)
-      {
-       for($Y=0;$Y<=$this->GridSizeY;$Y++)
-        {
+     for($X=0;$X<=$this->GridSizeX;$X++) {
+       for($Y=0;$Y<=$this->GridSizeY;$Y++) {
          $Value = $this->Points[$X][$Y];
 
-         if ( $Value != UNKNOWN && $Value != IGNORED && $Value >= $Threshold)
-          {
+         if ( $Value != UNKNOWN && $Value != IGNORED && $Value >= $Threshold) {
            $X1 = floor($X0+$X*$XSize)+$Padding;
            $Y1 = floor($Y0+$Y*$YSize)+$Padding;
            $X2 = floor($X0+$X*$XSize+$XSize);
@@ -190,8 +172,7 @@ 
     }
 
    /* Draw the surface chart */
-   function drawSurface($Format="")
-    {
+   function drawSurface($Format="") {
      $Palette		= isset($Format["Palette"]) ? $Format["Palette"] : NULL;
      $ShadeR1		= isset($Format["ShadeR1"]) ? $Format["ShadeR1"] : 77;
      $ShadeG1		= isset($Format["ShadeG1"]) ? $Format["ShadeG1"] : 205;
@@ -213,28 +194,22 @@ 
      $XSize = ($this->pChartObject->GraphAreaX2 - $this->pChartObject->GraphAreaX1) / ($this->GridSizeX+1);
      $YSize = ($this->pChartObject->GraphAreaY2 - $this->pChartObject->GraphAreaY1) / ($this->GridSizeY+1);
 
-     for($X=0;$X<=$this->GridSizeX;$X++)
-      {
-       for($Y=0;$Y<=$this->GridSizeY;$Y++)
-        {
+     for($X=0;$X<=$this->GridSizeX;$X++) {
+       for($Y=0;$Y<=$this->GridSizeY;$Y++) {
          $Value = $this->Points[$X][$Y];
 
-         if ( $Value != UNKNOWN && $Value != IGNORED )
-          {
+         if ( $Value != UNKNOWN && $Value != IGNORED ) {
            $X1 = floor($X0+$X*$XSize)+$Padding;
            $Y1 = floor($Y0+$Y*$YSize)+$Padding;
            $X2 = floor($X0+$X*$XSize+$XSize);
            $Y2 = floor($Y0+$Y*$YSize+$YSize);
 
-           if ( $Palette != NULL )
-            {
+           if ( $Palette != NULL ) {
              if ( isset($Palette[$Value]) && isset($Palette[$Value]["R"]) ) { $R = $Palette[$Value]["R"]; } else { $R = 0; }
              if ( isset($Palette[$Value]) && isset($Palette[$Value]["G"]) ) { $G = $Palette[$Value]["G"]; } else { $G = 0; }
              if ( isset($Palette[$Value]) && isset($Palette[$Value]["B"]) ) { $B = $Palette[$Value]["B"]; } else { $B = 0; }
              if ( isset($Palette[$Value]) && isset($Palette[$Value]["Alpha"]) ) { $Alpha = $Palette[$Value]["Alpha"]; } else { $Alpha = 1000; }
-            }
-           else
-            {
+            } else {
              $R = (($ShadeR2-$ShadeR1)/100)*$Value + $ShadeR1;
              $G = (($ShadeG2-$ShadeG1)/100)*$Value + $ShadeG1;
              $B = (($ShadeB2-$ShadeB1)/100)*$Value + $ShadeB1;
@@ -252,36 +227,28 @@ 
     }
 
    /* Compute the missing points */
-   function computeMissing()
-    {
+   function computeMissing() {
      $Missing = "";
-     for($X=0;$X<=$this->GridSizeX;$X++)
-      {
-       for($Y=0;$Y<=$this->GridSizeY;$Y++)
-        {
+     for($X=0;$X<=$this->GridSizeX;$X++) {
+       for($Y=0;$Y<=$this->GridSizeY;$Y++) {
          if ( $this->Points[$X][$Y] == UNKNOWN )
           $Missing[] = $X.",".$Y;
         }
       }
      shuffle($Missing);
      
-     foreach($Missing as $Key => $Pos)
-      {
+     foreach($Missing as $Key => $Pos) {
        $Pos = preg_split("/,/",$Pos);
        $X   = $Pos[0];
        $Y   = $Pos[1];
 
-       if ( $this->Points[$X][$Y] == UNKNOWN )
-        {
+       if ( $this->Points[$X][$Y] == UNKNOWN ) {
          $NearestNeighbor = $this->getNearestNeighbor($X,$Y);
 
          $Value = 0; $Points = 0;
-         for($Xi=$X-$NearestNeighbor;$Xi<=$X+$NearestNeighbor;$Xi++)
-          {
-           for($Yi=$Y-$NearestNeighbor;$Yi<=$Y+$NearestNeighbor;$Yi++)
-            {
-             if ($Xi >=0 && $Yi >= 0 && $Xi <= $this->GridSizeX && $Yi <= $this->GridSizeY && $this->Points[$Xi][$Yi] != UNKNOWN && $this->Points[$Xi][$Yi] != IGNORED)
-              {
+         for($Xi=$X-$NearestNeighbor;$Xi<=$X+$NearestNeighbor;$Xi++) {
+           for($Yi=$Y-$NearestNeighbor;$Yi<=$Y+$NearestNeighbor;$Yi++) {
+             if ($Xi >=0 && $Yi >= 0 && $Xi <= $this->GridSizeX && $Yi <= $this->GridSizeY && $this->Points[$Xi][$Yi] != UNKNOWN && $this->Points[$Xi][$Yi] != IGNORED) {
                $Value = $Value + $this->Points[$Xi][$Yi]; $Points++;
               }
             }
@@ -293,15 +260,11 @@ 
     }
 
    /* Return the nearest Neighbor distance of a point */
-   function getNearestNeighbor($Xp,$Yp)
-    {
+   function getNearestNeighbor($Xp,$Yp) {
      $Nearest = UNKNOWN;
-     for($X=0;$X<=$this->GridSizeX;$X++)
-      {
-       for($Y=0;$Y<=$this->GridSizeY;$Y++)
-        {
-         if ( $this->Points[$X][$Y] != UNKNOWN && $this->Points[$X][$Y] != IGNORED )
-          {
+     for($X=0;$X<=$this->GridSizeX;$X++) {
+       for($Y=0;$Y<=$this->GridSizeY;$Y++) {
+         if ( $this->Points[$X][$Y] != UNKNOWN && $this->Points[$X][$Y] != IGNORED ) {
            $DistanceX = max($Xp,$X)-min($Xp,$X);
            $DistanceY = max($Yp,$Y)-min($Yp,$Y);
            $Distance  = max($DistanceX,$DistanceY);

drupal/sites/default/boinc/modules/boincstats/includes/pchart/class/pBarcode128.class.php

Braces +14 added lines, -29 removed lines

@@ -14,8 +14,7 @@ 
  */
 
  /* pData class definition */
- class pBarcode128
-  {
+ class pBarcode128 {
    var $Codes;
    var $Reverse;
    var $Result;
@@ -23,8 +22,7 @@ 
    var $CRC;
 
    /* Class creator */
-   function pBarcode128($BasePath="")
-    {
+   function pBarcode128($BasePath="") {
      $this->Codes   = "";
      $this->Reverse = "";
 
@@ -32,8 +30,7 @@ 
 
      if (!$FileHandle) { die("Cannot find barcode database (".$BasePath."128B.db)."); }
 
-     while (!feof($FileHandle))
-      {
+     while (!feof($FileHandle)) {
        $Buffer = fgets($FileHandle,4096);
        $Buffer = str_replace(chr(10),"",$Buffer);
        $Buffer = str_replace(chr(13),"",$Buffer);
@@ -48,8 +45,7 @@ 
     }
 
    /* Return the projected size of a barcode */
-   function getSize($TextString,$Format="")
-    {
+   function getSize($TextString,$Format="") {
      $Angle		= isset($Format["Angle"]) ? $Format["Angle"] : 0;
      $ShowLegend	= isset($Format["ShowLegend"]) ? $Format["ShowLegend"] : FALSE;
      $LegendOffset	= isset($Format["LegendOffset"]) ? $Format["LegendOffset"] : 5;
@@ -76,17 +72,14 @@ 
      return(array("Width"=>$AreaWidth,"Height"=>$AreaHeight));
     }
 
-   function encode128($Value,$Format="")
-    {
+   function encode128($Value,$Format="") {
      $this->Result  = "11010010000";
      $this->CRC     = 104;
      $TextString    = "";
 
-     for($i=1;$i<=strlen($Value);$i++)
-      {
+     for($i=1;$i<=strlen($Value);$i++) {
        $CharCode = ord($this->mid($Value,$i,1));
-       if ( isset($this->Codes[$CharCode]) )
-        {
+       if ( isset($this->Codes[$CharCode]) ) {
          $this->Result = $this->Result.$this->Codes[$CharCode]["Code"];
          $this->CRC = $this->CRC + $i*$this->Codes[$CharCode]["ID"];
          $TextString = $TextString.chr($CharCode);
@@ -101,8 +94,7 @@ 
     }
 
    /* Create the encoded string */
-   function draw($Object,$Value,$X,$Y,$Format="")
-    {
+   function draw($Object,$Value,$X,$Y,$Format="") {
      $this->pChartObject = $Object;
 
      $R			= isset($Format["R"]) ? $Format["R"] : 0;
@@ -123,21 +115,17 @@ 
 
      $TextString = $this->encode128($Value);
 
-     if ( $DrawArea )
-      {
+     if ( $DrawArea ) {
        $X1 = $X + cos(($Angle-135) * PI / 180) * 10;
        $Y1 = $Y + sin(($Angle-135) * PI / 180) * 10;
 
        $X2 = $X1 + cos($Angle * PI / 180) * (strlen($this->Result)+20);
        $Y2 = $Y1 + sin($Angle * PI / 180) * (strlen($this->Result)+20);
 
-       if ( $ShowLegend )
-        {
+       if ( $ShowLegend ) {
          $X3 = $X2 + cos(($Angle+90) * PI / 180) * ($Height+$LegendOffset+$this->pChartObject->FontSize+10);
          $Y3 = $Y2 + sin(($Angle+90) * PI / 180) * ($Height+$LegendOffset+$this->pChartObject->FontSize+10);
-        }
-       else
-        {
+        } else {
          $X3 = $X2 + cos(($Angle+90) * PI / 180) * ($Height+20);
          $Y3 = $Y2 + sin(($Angle+90) * PI / 180) * ($Height+20);
         }
@@ -150,10 +138,8 @@ 
        $this->pChartObject->drawPolygon($Polygon,$Settings);
       }
 
-     for($i=1;$i<=strlen($this->Result);$i++)
-      {
-       if ( $this->mid($this->Result,$i,1) == 1 )
-        {
+     for($i=1;$i<=strlen($this->Result);$i++) {
+       if ( $this->mid($this->Result,$i,1) == 1 ) {
          $X1 = $X + cos($Angle * PI / 180) * $i;
          $Y1 = $Y + sin($Angle * PI / 180) * $i;
          $X2 = $X1 + cos(($Angle+90) * PI / 180) * $Height;
@@ -164,8 +150,7 @@ 
         }
       }
 
-     if ( $ShowLegend )
-      {
+     if ( $ShowLegend ) {
        $X1 = $X + cos($Angle * PI / 180) * (strlen($this->Result)/2);
        $Y1 = $Y + sin($Angle * PI / 180) * (strlen($this->Result)/2);
 

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

Braces +29 added lines, -41 removed lines

@@ -20,11 +20,12 @@ 
   }
 
   $roles = user_roles();
-  if (isset($tid)) {  // edit
+  if (isset($tid)) {
+// edit
     $template_tid = variable_get('forum_access_default_template_tid', 0);
     $settings = _forum_access_get_settings($tid);
-  }
-  else {  // create
+  } else {
+// create
     $template_tid = variable_get('forum_access_new_template_tid', NULL);
     $settings = _forum_access_get_settings($template_tid);
   }
@@ -208,9 +209,11 @@ 
   drupal_add_css(drupal_get_path('module', 'forum_access') .'/forum_access.css');
 
   // Find our moderator ACL:
-  if (isset($tid)) {  // edit, not new
+  if (isset($tid)) {
+// edit, not new
     $acl_id = acl_get_id_by_number('forum_access', $tid);
-    if (!$acl_id) { // create one
+    if (!$acl_id) {
+// create one
       $acl_id = acl_create_new_acl('forum_access', NULL, $tid);
       // update every existing node in this forum to use this acl.
       $result = db_query("SELECT nid FROM {term_node} WHERE tid = %d", $tid);
@@ -288,8 +291,7 @@ 
           $form['forum_access']['interference']['by_content_access'][] = array(
             '#value' => '<div>'. t("Unless you really know what you're doing, we recommend that you go to the !link page and clear all checkboxes. This will instruct @Content_Access to leave the %content_type nodes alone. However, if you put nodes of other content types into forums as well, then these content types will continue to have this problem.", $variables) .'</div>',
           );
-        }
-        else {
+        } else {
           $form['forum_access']['interference']['by_content_access'][] = array(
             '#value' => '<div>'. t("The priority of @Content_Access ($ca_priority) is higher than the priority of !Forum_Access ($fa_priority), which means the latter is <strong>completely disabled</strong> for the %content_type type! Unless you really know what you're doing, we recommend that you go to the !link page, change the priority (under %Advanced) to 0, and clear all checkboxes.", $variables) .'</div>',
           );
@@ -297,8 +299,7 @@ 
         $form['forum_access']['interference']['by_content_access'][] = array(
           '#value' => '<div>'. t("Alternatively, you can give !Forum_Access priority over @Content_Access by either raising the priority of !Forum_Access in every forum above the priority of @Content_Access, or by lowering the priority of @Content_Access for the content types in question below the priority of !Forum_Access.", $variables) .'</div>',
         );
-      }
-      else {
+      } else {
         $form['forum_access']['interference'][] = array(
           '#value' => '<p>'. t('Note: You have installed the !Content_Access module, which has the capability to grant access to content that would otherwise be protected by !Forum_Access. Be careful when configuring @Content_Access!', $variables) .'</p>',
         );
@@ -445,21 +446,17 @@ 
       $element[$rid]['#suffix'] = "</span>";
       $element[$rid]['#default_value'] = TRUE;
       $element[$rid]['#disabled'] = TRUE;
-    }
-    elseif ($element['#parents'][1] == 'create') {
+    } elseif ($element['#parents'][1] == 'create') {
       // Do nothing (Post is always mutable).
-    }
-    elseif ($element['#parents'][1] == 'comment_create') {
-    }
-    elseif ($element['#parents'][1] == 'view' && isset($permissions[$rid]['administer forums'])) {
+    } elseif ($element['#parents'][1] == 'comment_create') {
+    } elseif ($element['#parents'][1] == 'view' && isset($permissions[$rid]['administer forums'])) {
       $element[$rid]['#title'] = '<em>'. $element[$rid]['#title'] .'</em>';
       $element[$rid]['#prefix'] = '<span title="'. t("This role has the '@administer_forums' permission, and granting '@View' enables the role holders to change the settings on this page, including @Access_control!", array('@administer_forums' => $tr('administer forums'), '@View' => t('View'), '@Access_control' => t('Access control'))) .'">';
       if (isset($permissions[$rid]['administer nodes'])) {
         $element[$rid]['#prefix'] = str_replace('">', ' '. t("Because the role also has the '@administer_nodes' permission, it has full access to all nodes either way.", array('@administer_nodes' => $tr('administer nodes'))) .'">', $element[$rid]['#prefix']);
       }
       $element[$rid]['#suffix'] = "</span>";
-    }
-    elseif (isset($permissions[$rid]['administer nodes'])) {
+    } elseif (isset($permissions[$rid]['administer nodes'])) {
       $element[$rid]['#disabled'] = TRUE;
       $element[$rid]['#default_value'] = TRUE;
       $element[$rid]['#prefix'] = '<span title="'. ($rid != $moderator_rid
@@ -515,8 +512,7 @@ 
     if ($settings['priority'] != 0) {
       $form['interference']['advanced']['#collapsed'] = FALSE;
     }
-  }
-  elseif (is_array(reset($form_state['values']['forum_access']['template']['taxonomy']))) {
+  } elseif (is_array(reset($form_state['values']['forum_access']['template']['taxonomy']))) {
       $imv = reset($form_state['values']['forum_access']['template']['taxonomy']);
     $template_tid = reset($imv);
   }
@@ -549,14 +545,12 @@ 
   $template_tid = reset(array_values($access['template']['taxonomy']));
   if ($access['template']['select_by_default']) {
     variable_set('forum_access_default_template_tid', $template_tid);
-  }
-  elseif (variable_get('forum_access_default_template_tid', 0) == $template_tid) {
+  } elseif (variable_get('forum_access_default_template_tid', 0) == $template_tid) {
     variable_del('forum_access_default_template_tid');
   }
   if ($access['template']['load_for_new']) {
     variable_set('forum_access_new_template_tid', $template_tid);
-  }
-  elseif (variable_get('forum_access_new_template_tid', 0) == $template_tid) {
+  } elseif (variable_get('forum_access_new_template_tid', 0) == $template_tid) {
     variable_del('forum_access_new_template_tid');
   }
   module_load_include('node.inc', 'forum_access');
@@ -598,8 +592,7 @@ 
       // We prefer not to save records for node administrators, because these have access anyway.
       if (isset($permissions[$rid]['administer forums']) && $access['view'][$rid]) {
         // For forum administrators, View needs to be saved, ...
-      }
-      else {
+      } else {
         // ... otherwise forget View.
         $access['view'][$rid] = FALSE;
       }
@@ -607,8 +600,7 @@ 
         db_query("INSERT INTO {forum_access} (tid, rid, grant_view, grant_update, grant_delete, grant_create, grant_comment_create, priority) VALUES (%d, %d, %d, %d, %d, %d, %d, %d)",
         $tid, $rid, !empty($access['view'][$rid]), 0, 0, !empty($access['create'][$rid]), !empty($access['comment_create'][$rid]), $fa_priority);
       }
-    }
-    else {
+    } else {
       db_query("INSERT INTO {forum_access} (tid, rid, grant_view, grant_update, grant_delete, grant_create, grant_comment_create, priority) VALUES (%d, %d, %d, %d, %d, %d, %d, %d)",
       $tid, $rid, (bool) $checked, !empty($access['update'][$rid]), !empty($access['delete'][$rid]), !empty($access['create'][$rid]), !empty($access['comment_create'][$rid]), $fa_priority);
     }
@@ -620,8 +612,7 @@ 
   if (!$is_new && $form_state['values']['form_id'] != 'forum_form_container') {
     if (!isset($access['update_choice']) || $access['update_choice'] == 2) {
       node_access_needs_rebuild(TRUE);
-    }
-    elseif ($access['update_choice'] == 0) {
+    } elseif ($access['update_choice'] == 0) {
       // update immediately (but use the batch functions anyway
       $save_redirect = $form_state['redirect'];
       $form_state['redirect'] = $_GET['q'];
@@ -632,13 +623,13 @@ 
       _forum_access_update_batch_operation($tid, 999999, 1, $context);
       $pending_error_messages = drupal_get_messages('error', TRUE);       // still alive, get and clear all 'error' messages
       unset($pending_error_messages['error'][$our_error_message_index]);  // remove our error message
-      foreach ($pending_error_messages['error'] as $message) {            // replay any others
+      foreach ($pending_error_messages['error'] as $message) {
+// replay any others
         drupal_set_message($message, 'error');
       }
       _forum_access_update_batch_finished(TRUE, array(), array());
       $form_state['redirect'] = $save_redirect;
-    }
-    else {
+    } else {
       // mass update in batch mode, modeled after node.module
       $limit = $access['update_limit'];
       $count = db_result(db_query("SELECT COUNT(DISTINCT n.nid) FROM {node} n INNER JOIN {term_node} tn ON tn.vid = n.vid WHERE tn.tid = %d", $tid));
@@ -698,8 +689,7 @@ 
   if ($success) {
     drupal_set_message(t('The content access permissions have been updated.'));
     cache_clear_all();
-  }
-  else {
+  } else {
     drupal_set_message(t('The content access permissions have not been properly updated.'), 'error');
   }
 }
@@ -744,8 +734,7 @@ 
     $return['view'] = array(DRUPAL_ANONYMOUS_RID, DRUPAL_AUTHENTICATED_RID);
     $return['create'] = array(DRUPAL_AUTHENTICATED_RID);
     $return['comment_create'] = array(DRUPAL_AUTHENTICATED_RID);
-  }
-  else {
+  } else {
     $result = db_query("SELECT * FROM {forum_access} where tid = %d", $tid);
     while ($access = db_fetch_object($result)) {
       if ($access->grant_view) {
@@ -763,7 +752,8 @@ 
       if ($access->grant_comment_create) {
         $return['comment_create'][] = $access->rid;
       }
-      if ($access->rid == DRUPAL_AUTHENTICATED_RID) {  // this is our reference
+      if ($access->rid == DRUPAL_AUTHENTICATED_RID) {
+// this is our reference
         $return['priority'] = $access->priority;
       }
     }
@@ -831,8 +821,7 @@ 
     drupal_set_message(t('Note: In Drupal, access can only be granted, not taken away. Whatever access you grant here will not be reflected in the !Forum_Access_link settings, but !Forum_Access can only allow <i>more</i> access, not less.', $variables)
       .'<br /><span class="error">'. t('Specifically, any rights granted to the %anonymous_user and/or the %authenticated_user will <b>override</b> the settings of !Forum_Access!', $variables) .'</span>'
       .'<br />'. t('To avoid conflicts with !Forum_Access settings, you may want to lower the priority of !Content_Access (under %Advanced below) below the priority of !Forum_Access for the content types that you want to be controlled by !Forum_Access.', $variables), 'warning');
-  }
-  else {
+  } else {
     $vid = _forum_access_get_vid();
     $vocabulary = taxonomy_vocabulary_load($vid);
     if (isset($vocabulary->nodes[arg(3)])) {
@@ -926,8 +915,7 @@ 
       }
       watchdog('user', $msg, NULL, WATCHDOG_NOTICE);
       return $rid;
-    }
-    else {
+    } else {
       $msg = t('!Forum_Access cannot create the %role role!', $variables);
       watchdog('user', $msg, NULL, WATCHDOG_WARNING);
       drupal_set_message($msg .' '. t('Is it already in use?'), 'error');

drupal/sites/default/boinc/modules/contrib/forum_access/forum_access.module

Braces +24 added lines, -36 removed lines

@@ -38,8 +38,7 @@ 
   if (isset($node->comment_target_nid)) {
     if ($changed_tid = _forum_access_changed_tid()) {
       $tid = $changed_tid; // the topic node hasn't been saved yet!
-    }
-    else {
+    } else {
       $node = node_load($node->comment_target_nid);
       $tid = _forum_access_get_tid($node);
     }
@@ -91,7 +90,8 @@ 
         return; // disable comment access control
       }
       if ((arg(1) == 'edit' || arg(1) == 'delete') && !user_access('administer comments')) {
-        if (is_numeric($cid = arg(2))) { // comment/edit/%, comment/delete/%
+        if (is_numeric($cid = arg(2))) {
+// comment/edit/%, comment/delete/%
           $access[] = (arg(1) == 'edit' ? 'update' : 'delete');
           $comment = _comment_load($cid);
           $nid = $comment->nid;
@@ -107,7 +107,8 @@ 
 
     case 'node':
       if (is_numeric(arg(1))) {
-        if (arg(2) == 'edit' && !user_access('administer nodes')) { // node/%/edit
+        if (arg(2) == 'edit' && !user_access('administer nodes')) {
+// node/%/edit
           $access[] = 'update';
           $nid = arg(1);
           // If the node turns out to be in a forum where we have update/delete
@@ -118,13 +119,15 @@ 
           // We won't provide full Administrator access, though: we'll remove
           // author and timestamp, for example.
         }
-        if (arg(2) == 'delete' && !user_access('administer nodes')) { // node/%/delete
+        if (arg(2) == 'delete' && !user_access('administer nodes')) {
+// node/%/delete
           $access = array();
           $nid = arg(1);
           // This is the delete confirmation page. We don't need any
           // additional permissions, but we'll assert 'view' access below.
         }
-        if (arg(2) == NULL && !user_access('administer comments')) { // node/%
+        if (arg(2) == NULL && !user_access('administer comments')) {
+// node/%
           $access[] = 'update';
           $nid = arg(1);
           // If the node turns out to be in a forum where we have update/delete
@@ -190,44 +193,34 @@ 
   if (isset($form['type']['#value']) && $form['type']['#value'] .'_node_form' == $form_id) {
     module_load_include('node.inc', 'forum_access');
     _forum_access_node_form($form, $form_state);
-  }
-  elseif ($form_id == 'comment_form' && !variable_get('forum_access_D5_legacy_mode', FALSE)) {
+  } elseif ($form_id == 'comment_form' && !variable_get('forum_access_D5_legacy_mode', FALSE)) {
     module_load_include('node.inc', 'forum_access');
     _forum_access_comment_form($form, $form_state);
-  }
-  elseif ($form_id == 'forum_overview') {
+  } elseif ($form_id == 'forum_overview') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_forum_overview($form, $form_state);
-  }
-  elseif ($form_id == 'forum_form_container') {
+  } elseif ($form_id == 'forum_form_container') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_forum_form($form, $form_state, TRUE);
-  }
-  elseif ($form_id == 'forum_form_forum') {
+  } elseif ($form_id == 'forum_form_forum') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_forum_form($form, $form_state, FALSE);
-  }
-  elseif ($form_id == 'forum_admin_settings') {
+  } elseif ($form_id == 'forum_admin_settings') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_forum_admin_settings_form($form, $form_state);
-  }
-  elseif ($form_id == 'user_admin_role') {
+  } elseif ($form_id == 'user_admin_role') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_user_admin_role_form($form, $form_state);
-  }
-  elseif ($form_id == 'content_access_admin_settings' && empty($_POST)) {
+  } elseif ($form_id == 'content_access_admin_settings' && empty($_POST)) {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_content_access_admin_form();
-  }
-  elseif ($form_id == 'user_admin_perm') {
+  } elseif ($form_id == 'user_admin_perm') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_user_admin_perm_form($form, $form_state);
-  }
-  elseif ($form_id == 'user_admin_account') {
+  } elseif ($form_id == 'user_admin_account') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_user_admin_account_form($form, $form_state);
-  }
-  elseif ($form_id == 'user_profile_form') {
+  } elseif ($form_id == 'user_profile_form') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_user_profile_form($form, $form_state);
   }
@@ -252,8 +245,7 @@ 
       }
       if (strpos($_GET['q'], 'node/add/forum') !== FALSE) {
         $required_access = 'create';
-      }
-      else {
+      } else {
         $required_access = 'view';
       }
       $roles = implode(', ', array_keys($user->roles));
@@ -424,8 +416,7 @@ 
           unset($links['quote']);
       }
     }
-  }
-  else {
+  } else {
     // Check links for the comment.
     $required_keys = array(
       'comment_create' => 'comment_reply',
@@ -436,8 +427,7 @@ 
       if (!forum_access_access($tid, $access) && !($access == 'update' && comment_access('edit', $comment))) {
         unset($links[$required_keys[$access]]);
         unset($required_keys[$access]);
-      }
-      elseif (!array_key_exists($key, $links)) {
+      } elseif (!array_key_exists($key, $links)) {
         $link_is_missing = TRUE;
       }
     }
@@ -566,15 +556,13 @@ 
 
     if ($result) {
       $cache[$account->uid][$tid][$type] = 1;
-    }
-    else {
+    } else {
       // check our moderators too
       $acl_id = acl_get_id_by_number('forum_access', $tid);
       $result = db_result(db_query("SELECT uid FROM {acl_user} WHERE acl_id = %d AND uid = %d", $acl_id, $account->uid));
       if ($result) {
         $cache[$account->uid][$tid][$type] = 2;
-      }
-      else {
+      } else {
         $cache[$account->uid][$tid][$type] = FALSE;
       }
     }

drupal/sites/default/boinc/modules/contrib/bbcode/bbcode-filter.inc

Braces +18 added lines, -13 removed lines

@@ -22,8 +22,7 @@ 
         // Strip preformatted code blocks from text during line break processing, replaced below
         $body = str_replace($code_tag[0], "***pRe_sTrInG$i***", $body);
         $pre[$i++] = '<pre class="bb-code-block">'. $code_tag[1] .'</pre>';
-      }
-      else
+      } else
         $body = str_replace($code_tag[0], '<pre class="bb-code-block">'. $code_tag[1] .'</pre>', $body);
     }
   }
@@ -34,7 +33,8 @@ 
     if ($mode == 1) 	// Line breaks only (starting with PHP 4.0.5, nl2br() is XHTML compliant)
       $body = nl2br($body);
 
-    if ($mode == 2) {	// Line and paragraph breaks (may not always be XHTML compliant)
+    if ($mode == 2) {
+// Line and paragraph breaks (may not always be XHTML compliant)
       $body  = preg_replace("/(\r\n|\n|\r)/", "\n", $body);
       $body  = preg_replace("/\n\n+/", "\n\n", $body);
       $parts = explode("\n\n", $body);
@@ -51,8 +51,9 @@ 
     }
 
     // Reinsert preformatted code blocks
-    foreach ($pre as $i => $code_tag) 
-       $body = str_replace("***pRe_sTrInG$i***", $code_tag, $body);
+    foreach ($pre as $i => $code_tag) {
+           $body = str_replace("***pRe_sTrInG$i***", $code_tag, $body);
+    }
   }
   
   // Replace any improper quote tags with proper quote tags
@@ -83,7 +84,8 @@ 
   }
 
   // begin processing for [size] 
-  if (stristr($body, '[size=') !== FALSE) { // prevent useless processing
+  if (stristr($body, '[size=') !== FALSE) {
+// prevent useless processing
     $arr = array(
       'tag'         => 'size',
       'pattern'     => '#\[\x07=([\d]+)(?::\w+)?\]([^\x07]*)\[/\x07(?::\w+)?\]#esi',
@@ -93,7 +95,8 @@ 
   } // end processing for [size]
 
   // begin processing for [color]
-  if (stristr($body, '[color=') !== FALSE) { // prevent useless processing
+  if (stristr($body, '[color=') !== FALSE) {
+// prevent useless processing
     $arr = array(
       'tag'         => 'color',
       'pattern'     => '#\[\x07=([\#\w]+)(?::\w+)?\]([^\x07]*)\[/\x07(?::\w+)?\]#si',
@@ -103,7 +106,8 @@ 
   } // end processing for [color]
 
   // begin processing for [font]
-  if (stristr($body, '[font=') !== FALSE) { // prevent useless processing
+  if (stristr($body, '[font=') !== FALSE) {
+// prevent useless processing
     $arr = array(
       'tag'         => 'font',
       'pattern'     => '#\[\x07=([\w\s]+)(?::\w+)?\]([^\x07]*)\[/\x07(?::\w+)?\]#si',
@@ -113,7 +117,8 @@ 
   } // end processing for [font]
 
   // begin processing for [list] and [*]
-  if (stristr($body, '[list') !== FALSE) { // prevent useless processing
+  if (stristr($body, '[list') !== FALSE) {
+// prevent useless processing
     $l_type = array(
       NULL   => array('style' => 'circle', 'tag' => 'ul'),
       'c'    => array('style' => 'circle', 'tag' => 'ul'),
@@ -235,8 +240,7 @@ 
     // Replacing email addresses with encoded html
     $body = preg_replace_callback('#\[email(?::\w+)?\]([\w\.\-\+~@]+)\[/email(?::\w+)?\]#si', '_bbcode_encode_mailto', $body);
     $body = preg_replace_callback('#\[email=(.*?)(?::\w+)?\](.*?)\[/email(?::\w+)?\]#si', '_bbcode_encode_mailto', $body);
-  }
-  else {
+  } else {
     $body = preg_replace(
       array('#\[email(?::\w+)?\](.*?)\[/email(?::\w+)?\]#si','#\[email=(.*?)(?::\w+)?\]([\w\s]+)\[/email(?::\w+)?\]#si'),
       array('<a href="mailto:\\1" class="bb-email">\\1</a>', '<a href="mailto:\\1" class="bb-email">\\2</a>'),
@@ -330,8 +334,9 @@ 
     $link = 'document.write(\'<a href="mailto:' . $matches[1] . '" class="bb-email">' . (isset($matches[2]) ? $matches[2] : $matches[1]) . '</a>\');';
 
   $js_encode = '';
-  for ($x = 0; $x < strlen($link); $x++) 
-    $js_encode .= '%' . bin2hex($link{$x});
+  for ($x = 0; $x < strlen($link); $x++) {
+      $js_encode .= '%' . bin2hex($link{$x});
+  }
 
   $link = '<script type="text/javascript">eval(unescape(\''.$js_encode.'\'))</script>';
   if (isset($matches[3]))

drupal/sites/default/boinc/modules/contrib/bbcode/bbcode.module

Braces +2 added lines, -4 removed lines

@@ -10,8 +10,7 @@ 
   if ($long) {
     include_once(drupal_get_path('module', 'bbcode') .'/bbcode-help.inc');
     return _bbcode_filter_tip();
-  }
-  else {
+  } else {
     # D5: $output = t('You can use !BBCode tags in the text.', array('!BBCode' =>  l(t('BBCode'), "filter/tips/$format", NULL, NULL, 'filter-bbcode-' . $delta)));
     $output = t('You can use !BBCode (opens in new window) tags in the text.',
       array(
@@ -50,8 +49,7 @@ 
         $elapsed += $timing_stop[0] - $timing_start[0];
         $ret .= '<hr />'. l('BBCode', "filter/tips/$format") .' parsed on '.date('r').'<br />Execution time: '.$elapsed.' seconds.<hr />';
         return $ret;
-      }
-      else 
+      } else 
         return _bbcode_filter_process($text, $format);
 
     case 'settings':

drupal/sites/default/boinc/modules/contrib/content_profile/content_profile.module

Braces +6 added lines, -11 removed lines

@@ -91,7 +91,7 @@ 
   // Else user may view the page when they are going to create their own profile
   // or have permission to create it for others.
   global $user;
-  if ($user->uid == $account->uid || user_access('administer nodes') ){
+  if ($user->uid == $account->uid || user_access('administer nodes') ) {
     return node_access('create', $type);
   }
   return FALSE;
@@ -270,8 +270,7 @@ 
       '#title' => t('Use this content type as a content profile for users'),
       '#default_value' => variable_get('content_profile_use_'. $form['#node_type']->type, FALSE),
     );
-  }
-  elseif (isset($form['#node']) && $form['#node']->type .'_node_form' == $form_id && is_content_profile($form['#node'])) {
+  } elseif (isset($form['#node']) && $form['#node']->type .'_node_form' == $form_id && is_content_profile($form['#node'])) {
     // Customize the redirect target and buttons of our own node forms.
     if (arg(0) == 'user' && is_numeric(arg(1)) && arg(2) == 'edit' || arg(2) == 'profile') {
       $form['buttons']['preview']['#access'] = FALSE;
@@ -382,8 +381,7 @@ 
       // This node already exists, redirect to edit page
       drupal_goto('node/'. $nid .'/edit', 'destination=user/'. $node->uid);
     }
-  }
-  elseif ($op == 'validate' && is_content_profile($node) && user_access('administer nodes')) {
+  } elseif ($op == 'validate' && is_content_profile($node) && user_access('administer nodes')) {
     $form = $a3;
     // Only validate if the user-name changed or we add a new node
     if (!empty($node->nid) && $form['author']['name']['#default_value'] == $node->name) {
@@ -394,8 +392,7 @@ 
     if ($uid && content_profile_profile_exists($node, $uid)) {
       form_set_error('name', t('This user already has a content profile of this type. You can only create one profile per user.'));
     }
-  }
-  elseif ($op == 'prepare translation' && is_content_profile($node->translation_source)) {
+  } elseif ($op == 'prepare translation' && is_content_profile($node->translation_source)) {
     // Make sure the translated profile belongs to the same user.
     $node->uid = $node->translation_source->uid;
     $node->name = $node->translation_source->name;
@@ -504,8 +501,7 @@ 
         $node = content_profile_load($type, $arg[1]);
         if ($node) {
           return node_help('node/%/edit', array(1 => $node->nid));
-        }
-        else {
+        } else {
           return node_help('node/add/'. $type, array('node', 'add', $type));
         }
       }
@@ -537,8 +533,7 @@ 
 
       // Working around the bug described at http://drupal.org/node/302873
       module_load_include('inc', 'content_profile', 'content_profile.theme');
-    }
-    elseif (user_access('create '. $type .' content') && content_profile_get_settings($type, 'add_link') && !$node && ($uid == $user->uid || user_access('administer nodes'))) {
+    } elseif (user_access('create '. $type .' content') && content_profile_get_settings($type, 'add_link') && !$node && ($uid == $user->uid || user_access('administer nodes'))) {
       $content['content_profile_'. $type] = array(
         '#admin' => $uid != $user->uid,
         '#theme' => 'content_profile_display_add_link',

drupal/sites/default/boinc/modules/contrib/content_profile/modules/content_profile_registration.module

Braces +6 added lines, -11 removed lines

@@ -21,8 +21,7 @@ 
     foreach ($form['#content_profile_registration_use_types'] as $type => $typename) {
       content_profile_registration_add_profile_form($type, $form, $form_state);
     }
-  }
-  elseif ($form_id == 'content_profile_admin_settings') {
+  } elseif ($form_id == 'content_profile_admin_settings') {
     $type = $form_state['type'];
     // Let other modules add registration child elements before us!
     $form += array('registration' => array());
@@ -133,8 +132,7 @@ 
     // Set this to the values of one node, as it might be need by some #ahah callbacks
     $form_add['#node'] = $node_form['#node'];
     $form_add['type'] = $node_form['type'];
-  }
-  else {
+  } else {
     foreach (array('uid', 'name', 'author', 'buttons', 'language', '#theme', 'options') as $key) {
       unset($node_form[$key]);
     }
@@ -148,8 +146,7 @@ 
       if (count(element_children($form_add[$group_name])) == 0) {
         unset($form_add[$group_name]);
       }
-    }
-    else {
+    } else {
       unset($form_add[$field_name]);
     }
   }
@@ -175,7 +172,7 @@ 
   }
 
   // Set the enctype, if necessary.
-  if (isset($node_form['#attributes']['enctype'])){
+  if (isset($node_form['#attributes']['enctype'])) {
     $form['#attributes']['enctype'] = $node_form['#attributes']['enctype'];
   }
 }
@@ -213,8 +210,7 @@ 
 
     if (!in_array('other', content_profile_get_settings($type, 'registration_hide'))) {
       node_validate($node, $form);
-    }
-    elseif (module_exists('content')) {
+    } elseif (module_exists('content')) {
       content_validate($node);
     }
 
@@ -232,8 +228,7 @@ 
 function _content_profile_registration_remove_values($key, $element, &$form_state) {
   if ((isset($element['#input']) || !empty($element['#tree'])) && isset($form_state['values'][$key])) {
     unset($form_state['values'][$key]);
-  }
-  elseif (empty($element['#input']) && empty($element['#tree'])) {
+  } elseif (empty($element['#input']) && empty($element['#tree'])) {
     foreach (element_children($element) as $key) {
       _content_profile_registration_remove_values($key, $element[$key], $form_state);
     }

drupal/sites/default/boinc/modules/contrib/cck/modules/nodereference/nodereference.module

Braces +9 added lines, -18 removed lines

@@ -96,8 +96,7 @@ 
           if ($view->base_table == 'node' && !empty($view->display['default']->display_options['fields'])) {
             if ($view->type == 'Default') {
               $views[t('Default Views')][$view->name] = $view->name;
-            }
-            else {
+            } else {
               $views[t('Existing Views')][$view->name] = $view->name;
             }
           }
@@ -125,8 +124,7 @@ 
             '#required' => FALSE,
             '#description' => t('Provide a comma separated list of arguments to pass to the view.'),
           );
-        }
-        else {
+        } else {
           $form['advanced']['no_view_help'] = array(
             '#value' => t('<p>The list of nodes that can be referenced can be based on a "Views module" view but no appropriate views were found. <br />Note:</p>') .
               t('<ul><li>Only views that have fields will work for this purpose.</li><li>This will discard the "Content types" settings above. Use the view\'s "filters" section instead.</li><li>Use the view\'s "fields" section to display additional informations about candidate nodes on node creation/edition form.</li><li>Use the view\'s "sort criteria" section to determine the order in which candidate nodes will be displayed.</li></ul>'),
@@ -212,8 +210,7 @@ 
         if (is_array($item) && !empty($item['nid'])) {
           if (is_numeric($item['nid'])) {
             $ids[] = $item['nid'];
-          }
-          else {
+          } else {
             $error_element = isset($item['_error_element']) ? $item['_error_element'] : '';
             if (is_array($item) && isset($item['_error_element'])) unset($item['_error_element']);
             form_set_error($error_element, t("%name: invalid input.", array('%name' => t($field['widget']['label']))));
@@ -487,8 +484,7 @@ 
           '#element_validate' => array('_element_validate_integer_positive'),
           '#required' => TRUE,
         );
-      }
-      else {
+      } else {
         $form['autocomplete_match'] = array('#type' => 'hidden', '#value' => $match);
         $form['size'] = array('#type' => 'hidden', '#value' => $size);
       }
@@ -736,14 +732,12 @@ 
       if (!empty($title) && ($n = node_load($nid)) && trim($title) != trim($n->title)) {
         form_error($element[$field_key], t('%name: title mismatch. Please check your selection.', array('%name' => t($field['widget']['label']))));
       }
-    }
-    else {
+    } else {
       // No explicit nid.
       $reference = _nodereference_potential_references($field, $value, 'equals', NULL, 1);
       if (empty($reference)) {
         form_error($element[$field_key], t('%name: found no valid post with that title.', array('%name' => t($field['widget']['label']))));
-      }
-      else {
+      } else {
         // TODO:
         // the best thing would be to present the user with an additional form,
         // allowing the user to choose between valid candidates with the same title
@@ -868,8 +862,7 @@ 
     if (!empty($field['advanced_view_args'])) {
       // TODO: Support Tokens using token.module ?
       $view_args = array_map('trim', explode(',', $field['advanced_view_args']));
-    }
-    else {
+    } else {
       $view_args = array();
     }
 
@@ -894,8 +887,7 @@ 
 
     // Get the results.
     $result = $view->execute_display($display, $view_args);
-  }
-  else {
+  } else {
     $result = FALSE;
   }
 
@@ -933,8 +925,7 @@ 
     );
     $where[] = 'n.title '. (isset($match_clauses[$match]) ? $match_clauses[$match] : $match_clauses['contains']);
     $args[] = $string;
-  }
-  elseif ($ids) {
+  } elseif ($ids) {
     $where[] = 'n.nid IN (' . db_placeholders($ids) . ')';
     $args = array_merge($args, $ids);
   }