BurningFlipside / VolunteerSystem

api/v1/class.ShiftAPI.php

Braces +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
     protected function canUpdate($request, $entity)
     {
  	if($this->isVolunteerAdmin($request))
-        {
+ 	{
             return true;
         }
         return $this->isUserDepartmentLead($entity['departmentID'], $this->user);

Doc Comments +5 added lines

@@ -221,6 +221,11 @@
         return $response->withJSON($res, 500);
     }
 
+    /**
+     * @param string $status
+     * @param Data\Filter $filter
+     * @param Data\DataTable $dataTable
+     */
     protected function doSignup($uid, $status, $entity, $filter, $dataTable)
     {
         if(isset($entity['earlyLate']) && $entity['earlyLate'] !== '-1')

Indentation +9 added lines, -9 removed lines

@@ -32,7 +32,7 @@ 
 
     protected function canUpdate($request, $entity)
     {
- 	if($this->isVolunteerAdmin($request))
+        if($this->isVolunteerAdmin($request))
         {
             return true;
         }
@@ -52,13 +52,13 @@ 
         }
         if(!isset($obj['departmentID']))
         {
-             return false;
+                return false;
         }
         if(isset($obj['unbounded']) && $obj['unbounded'])
         {
             if(!isset($obj['minShifts']) || $obj['minShifts'] === 0 || $obj['minShifts'] === '')
             {
-                 $obj['minShifts'] = '1';
+                    $obj['minShifts'] = '1';
             }
         }
         return $this->isUserDepartmentLead($obj['departmentID'], $this->user);
@@ -159,8 +159,8 @@ 
             $ret = $dataTable->update($filter, $entArray[$i]);
             if($ret === false)
             {
-               $myRet = false;
-               array_push($errors, $array[$i]);
+                $myRet = false;
+                array_push($errors, $array[$i]);
             }
         }
         if($myRet)
@@ -265,7 +265,7 @@ 
         $entity = $this->processShift($entity, $request);
         if(isset($entity['minShifts']) && $entity['minShifts'] > 0)
         {
-          $shift->makeCopy($dataTable);
+            $shift->makeCopy($dataTable);
         }
         if(isset($entity['overlap']) && $entity['overlap'])
         {
@@ -331,7 +331,7 @@ 
         $entity['status'] = 'unfilled';
         if(isset($entity['needEEApproval']))
         {
-          unset($entity['needEEApproval']);
+            unset($entity['needEEApproval']);
         }
         return $response->withJSON($dataTable->update($filter, $entity));
     }
@@ -528,7 +528,7 @@ 
         $entity['status'] = 'unfilled';
         if(isset($entity['needEEApproval']))
         {
-          unset($entity['needEEApproval']);
+            unset($entity['needEEApproval']);
         }
         $ret = $dataTable->update($filter, $entity);
         if($ret)
@@ -563,7 +563,7 @@ 
         $entity['status'] = 'unfilled';
         if(isset($entity['needEEApproval']))
         {
-          unset($entity['needEEApproval']);
+            unset($entity['needEEApproval']);
         }
         return $response->withJSON($dataTable->update($filter, $entity));
     }

api/v1/class.ParticipantAPI.php

Braces +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
     protected function canUpdate($request, $entity)
     {
  	if($this->isVolunteerAdmin($request))
-        {
+ 	{
             return true;
         }       
         //TODO give access to department lead

Spacing +10 added lines, -10 removed lines

@@ -106,24 +106,24 @@
         if($format === false || $format === 'text/calendar')
         {
             $text = "BEGIN:VCALENDAR\r\n";
-            $text.= "VERSION:2.0\r\n";
-            $text.= "PRODID:-//hacksw/handcal//NONSGML v1.0//EN\r\n";
+            $text .= "VERSION:2.0\r\n";
+            $text .= "PRODID:-//hacksw/handcal//NONSGML v1.0//EN\r\n";
             $count = count($shifts);
             for($i = 0; $i < $count; $i++)
             {
-                $text.= "BEGIN:VEVENT\r\n";
-                $text.= "UID:".$this->user->mail."\r\n";
+                $text .= "BEGIN:VEVENT\r\n";
+                $text .= "UID:".$this->user->mail."\r\n";
                 $d = new DateTime($shifts[$i]['startTime']);
                 $d->setTimezone(new \DateTimeZone('UTC'));
-                $text.= "DTSTAMP:".$d->format('Ymd\THis\Z')."\r\n";
-                $text.= "DTSTART:".$d->format('Ymd\THis\Z')."\r\n";
+                $text .= "DTSTAMP:".$d->format('Ymd\THis\Z')."\r\n";
+                $text .= "DTSTART:".$d->format('Ymd\THis\Z')."\r\n";
                 $d = new DateTime($shifts[$i]['endTime']);
                 $d->setTimezone(new \DateTimeZone('UTC'));
-                $text.= "DTEND:".$d->format('Ymd\THis\Z')."\r\n";
-                $text.= "SUMMARY:".$shifts[$i]['roleID'].' '.$shifts[$i]['name']."\r\n";
-                $text.= "END:VEVENT\r\n";
+                $text .= "DTEND:".$d->format('Ymd\THis\Z')."\r\n";
+                $text .= "SUMMARY:".$shifts[$i]['roleID'].' '.$shifts[$i]['name']."\r\n";
+                $text .= "END:VEVENT\r\n";
             }
-            $text.= "END:VCALENDAR\r\n";
+            $text .= "END:VCALENDAR\r\n";
             $response = $response->withHeader('Content-type', 'text/calendar');
             $response = $response->withHeader('Content-Disposition', 'attachment; filename="MyShifts.ics"');
             $body = $response->getBody();

Indentation +4 added lines, -4 removed lines

@@ -32,7 +32,7 @@ 
 
     protected function canUpdate($request, $entity)
     {
- 	if($this->isVolunteerAdmin($request))
+        if($this->isVolunteerAdmin($request))
         {
             return true;
         }       
@@ -89,7 +89,7 @@ 
         $odata = $request->getAttribute('odata', new \ODataParams(array()));
         $filter = $this->getFilterForPrimaryKey($uid);
         $areas = $dataTable->read($filter, $odata->select, $odata->top,
-                                  $odata->skip, $odata->orderby);
+                                    $odata->skip, $odata->orderby);
         if(empty($areas))
         {
             return $response->withStatus(404);
@@ -160,7 +160,7 @@ 
         $odata = $request->getAttribute('odata', new \ODataParams(array()));
         $filter = $this->getFilterForPrimaryKey($uid);
         $areas = $dataTable->read($filter, array('certs'), $odata->top,
-                                  $odata->skip, $odata->orderby);
+                                    $odata->skip, $odata->orderby);
         if(empty($areas))
         {
             return $response->withStatus(404);
@@ -194,7 +194,7 @@ 
         $user = $users[0];
         if(!isset($user['certs']))
         {
-             $user['certs'] = array();
+                $user['certs'] = array();
         }
         $files = $request->getUploadedFiles();
         $file = $files['file'];

api/v1/class.EventAPI.php

Indentation +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
 
     protected function canUpdate($request, $entity)
     {
- 	if($this->isVolunteerAdmin($request))
+        if($this->isVolunteerAdmin($request))
         {
             return true;
         }       
@@ -96,7 +96,7 @@ 
             }
         }
         $shifts = $dataTable->read($filter, $odata->select, $odata->top,
-                                  $odata->skip, $odata->orderby);
+                                    $odata->skip, $odata->orderby);
         if($shifts === false)
         {
             $shifts = array();

Braces +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
     protected function canUpdate($request, $entity)
     {
  	if($this->isVolunteerAdmin($request))
-        {
+ 	{
             return true;
         }       
         return false;

app/VolunteerAutoload.php

Braces +11 added lines, -11 removed lines

@@ -1,29 +1,29 @@
 <?php

-function VolunteerAutoload($classname)

-{

+function VolunteerAutoload($classname)
+{
     $classname = str_replace('/', '\\', $classname);

     $classname = ltrim($classname, '\\');

     $filename  = '';

     $namespace = '';

-    if($lastNsPos = strrpos($classname, '\\'))

-    {

+    if($lastNsPos = strrpos($classname, '\\'))
+    {
         $namespace = substr($classname, 0, $lastNsPos);

         $classname = substr($classname, $lastNsPos + 1);

         $filename  = str_replace('\\', DIRECTORY_SEPARATOR, $namespace).DIRECTORY_SEPARATOR;

     }

     $filename = __DIR__.DIRECTORY_SEPARATOR.$filename.'class.'.$classname.'.php';

-    if(is_readable($filename))

-    {

+    if(is_readable($filename))
+    {
         require $filename;

     }

 }

 

-if(version_compare(PHP_VERSION, '5.3.0', '>='))

-{

+if(version_compare(PHP_VERSION, '5.3.0', '>='))
+{
     spl_autoload_register('VolunteerAutoload', true, true);

-}

-else

-{

+}
+else
+{
     spl_autoload_register('VolunteerAutoload');

 }

 /* vim: set tabstop=4 shiftwidth=4 expandtab: */

app/Schedules/class.GridSchedule.php

Indentation +17 added lines, -17 removed lines

@@ -46,17 +46,17 @@ 
         {
             for($j = 0; $j < $rowCount; $j++)
             {
-                 $cell = $sheat->getCellByColumnAndRow($i+2, $j+4);
-                 if($cell->isInMergeRange())
-                 {
-                      continue;
-                 }
-                 else
-                 {
-                     $style = $cell->getStyle();
-                     $style->getBorders()->getAllBorders()->setBorderStyle(false);
-                     $style->getFill()->setFillType(\PhpOffice\PhpSpreadsheet\Style\Fill::FILL_PATTERN_LIGHTGRAY);
-                 }
+                    $cell = $sheat->getCellByColumnAndRow($i+2, $j+4);
+                    if($cell->isInMergeRange())
+                    {
+                        continue;
+                    }
+                    else
+                    {
+                        $style = $cell->getStyle();
+                        $style->getBorders()->getAllBorders()->setBorderStyle(false);
+                        $style->getFill()->setFillType(\PhpOffice\PhpSpreadsheet\Style\Fill::FILL_PATTERN_LIGHTGRAY);
+                    }
             }
         }
     }
@@ -86,15 +86,15 @@ 
             $shifts[$i]['length'] = $diff->h;
             if(!isset($roles[$shifts[$i]['roleID']]))
             {
-                 $roles[$shifts[$i]['roleID']] = $shifts[$i]['length'];
-                 $roles2[$shifts[$i]['roleID']] = array();
+                    $roles[$shifts[$i]['roleID']] = $shifts[$i]['length'];
+                    $roles2[$shifts[$i]['roleID']] = array();
             }
             else
             {
-                 if($roles[$shifts[$i]['roleID']] < $shifts[$i]['length'])
-                 {
-                     $roles[$shifts[$i]['roleID']] = $shifts[$i]['length'];
-                 }
+                    if($roles[$shifts[$i]['roleID']] < $shifts[$i]['length'])
+                    {
+                        $roles[$shifts[$i]['roleID']] = $shifts[$i]['length'];
+                    }
             }
             array_push($roles2[$shifts[$i]['roleID']], array('start'=>$start, 'end'=>$end));
         }

Spacing +12 added lines, -12 removed lines

@@ -51,7 +51,7 @@ 
         {
             for($j = 0; $j < $rowCount; $j++)
             {
-                 $cell = $sheat->getCellByColumnAndRow($i+2, $j+4);
+                 $cell = $sheat->getCellByColumnAndRow($i + 2, $j + 4);
                  if($cell->isInMergeRange())
                  {
                       continue;
@@ -93,7 +93,7 @@ 
 
     protected function createShiftCell($sheat, $col, $row, $shift)
     {
-        $sheat->mergeCellsByColumnAndRow($col, $row, $col+$shift['length']-1, $row);
+        $sheat->mergeCellsByColumnAndRow($col, $row, $col + $shift['length'] - 1, $row);
         $this->setShiftNameInCell($sheat, $col, $row, $shift);
     }
 
@@ -101,21 +101,21 @@ 
     {
         $i = 1;
         $firstRow = array_search($roleID, $rows);
-        $cell = $sheat->getCellByColumnAndRow($col, $firstRow+4);
+        $cell = $sheat->getCellByColumnAndRow($col, $firstRow + 4);
         if($cell->isInMergeRange())
         {
-            while($rows[$firstRow+$i] === $roleID)
+            while($rows[$firstRow + $i] === $roleID)
             {
-                $cell = $sheat->getCellByColumnAndRow($col, $firstRow+4+$i);
+                $cell = $sheat->getCellByColumnAndRow($col, $firstRow + 4 + $i);
                 if(!$cell->isInMergeRange())
                 {
                     break;
                 }
                 $i++;
             }
-            return $firstRow+4+$i;
+            return $firstRow + 4 + $i;
         }
-        return $firstRow+4;
+        return $firstRow + 4;
     }
 
     protected function createSpreadSheet()
@@ -162,7 +162,7 @@ 
         $start = date_parse($str);
         $lastShift = $shifts[$count - 1];
         $interval = $lastShift['endTime']->diff($shifts[0]['startTime']);
-        $hourCount = ($interval->d*24) + $interval->h;
+        $hourCount = ($interval->d * 24) + $interval->h;
         $tmp = $this->getHoursArrays($start['hour'], $hourCount);
         $simpleHours = $tmp[0];
         $militaryHours = $tmp[1];
@@ -232,13 +232,13 @@ 
         while($shift)
         {
             $timeDiff = $originalStartTime->diff($shift['startTime']);
-            $hoursFromStart = ($timeDiff->d*24)+$timeDiff->h;
-            $rowForShift = $this->getRowForShift($shift['roleID'], $rows, $hoursFromStart+2, $sheat);
-            $this->createShiftCell($sheat, $hoursFromStart+2, $rowForShift, $shift);
+            $hoursFromStart = ($timeDiff->d * 24) + $timeDiff->h;
+            $rowForShift = $this->getRowForShift($shift['roleID'], $rows, $hoursFromStart + 2, $sheat);
+            $this->createShiftCell($sheat, $hoursFromStart + 2, $rowForShift, $shift);
             $shift = array_shift($shifts);
         }
         $rowCount = count($rows);
-        $style = $sheat->getStyleByColumnAndRow(2, 4, 1+count($simpleHours), 3 + $rowCount);
+        $style = $sheat->getStyleByColumnAndRow(2, 4, 1 + count($simpleHours), 3 + $rowCount);
         $style->getBorders()->getAllBorders()->setBorderStyle(\PhpOffice\PhpSpreadsheet\Style\Border::BORDER_THIN);
         $hourCount = count($simpleHours);
         $this->grayOutUnused($hourCount, $rowCount, $sheat);

api/v1/class.Processor.php

Doc Comments +6 added lines

@@ -12,6 +12,9 @@ 
 
     protected abstract function isVolunteerAdmin($request);
 
+    /**
+     * @param VolunteerProfile|null $user
+     */
     public function canUserDoRole($user, $role)
     {
         static $certs = null;
@@ -155,6 +158,9 @@ 
         return !in_array($deptId, $privateDepts);
     }
 
+    /**
+     * @param VolunteerShift $shift
+     */
     protected function doShiftTimeChecks($shift, $entry)
     {
         $now = new DateTime();

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
             try {
                 $profile = new \VolunteerProfile($uid);
                 $uids[$uid] = $profile->getDisplayName();
-            } catch (Exception $e) {
+            } catch(Exception $e) {
                 $uids[$uid] = $uid;
             }
         }

Braces +5 added lines, -2 removed lines

@@ -60,10 +60,13 @@
         static $uids = array();
         if(!isset($uids[$uid]))
         {
-            try {
+            try
+            {
                 $profile = new \VolunteerProfile($uid);
                 $uids[$uid] = $profile->getDisplayName();
-            } catch (Exception $e) {
+            }
+            catch (Exception $e)
+            {
                 $uids[$uid] = $uid;
             }
         }

Indentation +8 added lines, -8 removed lines

@@ -47,10 +47,10 @@ 
         }
         for($i = 0; $i < $certCount; $i++)
         {
-             if($this->certCheck($requirements, $userCerts, $certs[$i]['certID']))
-             {
-                 return array('whyClass' => 'CERT', 'whyMsg' => 'Shift requires '.$certs[$i]['name'].' and you do not have that certification');
-             }
+                if($this->certCheck($requirements, $userCerts, $certs[$i]['certID']))
+                {
+                    return array('whyClass' => 'CERT', 'whyMsg' => 'Shift requires '.$certs[$i]['name'].' and you do not have that certification');
+                }
         }
         return true;
     }
@@ -192,20 +192,20 @@ 
             $tmp = $dataTable->read();
             foreach($tmp as $role)
             {
-               $roles[$role['short_name']] = $role;
+                $roles[$role['short_name']] = $role;
             }
         }
         if(isset($entry['volunteer']))
         {
-          unset($entry['volunteer']);
+            unset($entry['volunteer']);
         }
         if(isset($entry['why']))
         {
-          unset($entry['why']);
+            unset($entry['why']);
         }
         if(isset($entry['whyClass']))
         {
-          unset($entry['whyClass']);
+            unset($entry['whyClass']);
         }
         $shift = new \VolunteerShift(false, $entry);
         $entry['isAdmin'] = $this->isAdminForShift($entry, $this->user);

app/Emails/class.PendingRejectedEmail.php

Doc Comments +3 added lines

@@ -3,6 +3,9 @@
 
 class PendingRejectedEmail extends VolunteerEmail
 {
+    /**
+     * @param \VolunteerProfile $userProfile
+     */
     public function __construct($userProfile)
     {
         parent::__construct($userProfile);

api/v1/class.DepartmentAPI.php

Indentation +2 added lines, -2 removed lines

@@ -77,7 +77,7 @@ 
         $filter = new \Data\Filter("departmentID eq '$deptId'");
         $odata = $request->getAttribute('odata', new \ODataParams(array()));
         $roles = $dataTable->read($filter, $odata->select, $odata->top,
-                                  $odata->skip, $odata->orderby);
+                                    $odata->skip, $odata->orderby);
         if($roles === false)
         {
             $roles = array();
@@ -114,7 +114,7 @@ 
             }
         }
         $shifts = $dataTable->read($filter, $odata->select, $odata->top,
-                                  $odata->skip, $odata->orderby);
+                                    $odata->skip, $odata->orderby);
         if($shifts === false)
         {
             $shifts = array();

groupSignup.php

Indentation +25 added lines, -25 removed lines

@@ -9,9 +9,9 @@ 
 
 if(!isset($_GET['id']))
 {
-  $page->body .= 'Error! Missing Group ID. You must have followed a bad link!';
-  $page->printPage();
-  return;
+    $page->body .= 'Error! Missing Group ID. You must have followed a bad link!';
+    $page->printPage();
+    return;
 }
 
 $groupID = $_GET['id'];
@@ -20,9 +20,9 @@ 
 $shifts = $dataTable->read($filter);
 if(empty($shifts))
 {
-  $page->body .= 'Error! Could not locate shifts. You must have followed an old link!';
-  $page->printPage();
-  return;
+    $page->body .= 'Error! Could not locate shifts. You must have followed an old link!';
+    $page->printPage();
+    return;
 }
 
 $filled = array();
@@ -32,35 +32,35 @@ 
 $count = count($shifts);
 for($i = 0; $i < $count; $i++)
 {
-  $shifts[$i] = new \VolunteerShift(false, $shifts[$i]);
-  if($shifts[$i]->status === 'filled' || $shifts[$i]->status === 'pending')
-  {
-      array_push($filled, $shifts[$i]);
-      if($page->user && $shifts[$i]->participant === $page->user->uid)
-      {
-          $alreadySignedUp = true;
-      }
-  }
-  else
-  {
-      array_push($available, $shifts[$i]);
-  }
+    $shifts[$i] = new \VolunteerShift(false, $shifts[$i]);
+    if($shifts[$i]->status === 'filled' || $shifts[$i]->status === 'pending')
+    {
+        array_push($filled, $shifts[$i]);
+        if($page->user && $shifts[$i]->participant === $page->user->uid)
+        {
+            $alreadySignedUp = true;
+        }
+    }
+    else
+    {
+        array_push($available, $shifts[$i]);
+    }
 }
 $page->body .= '<div class="row"><h3>Filled Shifts</h3></div><div class="row"><table class="table"><tr><th>Role</th><th>Participant</th></tr>';
 foreach($filled as $shift)
 {
-  $page->body.= '<tr><td>'.$shift->role->display_name.'</td><td>'.$shift->webParticipantName.'</td></tr>';
+    $page->body.= '<tr><td>'.$shift->role->display_name.'</td><td>'.$shift->webParticipantName.'</td></tr>';
 }
 $page->body .= '</table></div>';
 $page->body .= '<div class="row"><h3>Unfilled Shifts</h3></div><div class="row"><table class="table"><tr><th>Role</th><th>Sign Up</th></tr>';
 foreach($available as $shift)
 {
-  $cell = '<i>You already have a shift!</i>';
-  if($alreadySignedUp === false)
-  {
+    $cell = '<i>You already have a shift!</i>';
+    if($alreadySignedUp === false)
+    {
     $cell = '<button type="button" class="btn btn-primary" onClick="signUp(\''.$shift->_id.'\');">Sign Up</button>';
-  } 
-  $page->body.= '<tr><td>'.$shift->role->display_name.'</td><td>'.$cell.'</td></tr>';
+    } 
+    $page->body.= '<tr><td>'.$shift->role->display_name.'</td><td>'.$cell.'</td></tr>';
 }
 $page->body .= '</table></div>';
 $page->printPage();

Spacing +2 added lines, -2 removed lines

@@ -49,7 +49,7 @@ 
 $page->body .= '<div class="row"><h3>Filled Shifts</h3></div><div class="row"><table class="table"><tr><th>Role</th><th>Participant</th></tr>';
 foreach($filled as $shift)
 {
-  $page->body.= '<tr><td>'.$shift->role->display_name.'</td><td>'.$shift->webParticipantName.'</td></tr>';
+  $page->body .= '<tr><td>'.$shift->role->display_name.'</td><td>'.$shift->webParticipantName.'</td></tr>';
 }
 $page->body .= '</table></div>';
 $page->body .= '<div class="row"><h3>Unfilled Shifts</h3></div><div class="row"><table class="table"><tr><th>Role</th><th>Sign Up</th></tr>';
@@ -60,7 +60,7 @@ 
   {
     $cell = '<button type="button" class="btn btn-primary" onClick="signUp(\''.$shift->_id.'\');">Sign Up</button>';
   } 
-  $page->body.= '<tr><td>'.$shift->role->display_name.'</td><td>'.$cell.'</td></tr>';
+  $page->body .= '<tr><td>'.$shift->role->display_name.'</td><td>'.$cell.'</td></tr>';
 }
 $page->body .= '</table></div>';
 $page->printPage();