BurningFlipside / VolunteerSystem

api/v1/class.DepartmentAPI.php

Doc Comments +3 added lines

@@ -314,6 +314,9 @@
         return $response;
     }
 
+    /**
+     * @param string $type
+     */
     public function generateGridSchedule($dept, $shifts, $request, $response, $type)
     {
         $ssheat = new Spreadsheet();

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
-use PhpOffice\PhpSpreadsheet\Writer\Pdf\Mpdf;
 
 class DepartmentAPI extends Http\Rest\DataTableAPI
 {

Indentation +19 added lines, -19 removed lines

@@ -99,7 +99,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();
@@ -123,7 +123,7 @@ 
         $filter = new \Data\Filter("departmentID eq '$deptId'");
         $odata = $request->getAttribute('odata', new \ODataParams(array()));
         $shifts = $dataTable->read($filter, $odata->select, $odata->top,
-                                  $odata->skip, $odata->orderby);
+                                    $odata->skip, $odata->orderby);
         if($shifts === false)
         {
             $shifts = array();
@@ -337,15 +337,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));
         }
@@ -486,17 +486,17 @@ 
         {
             for($j = 0; $j < count($rows); $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);
+                    }
             }
         }
         $sheat->getColumnDimension('A')->setAutoSize(true);

Spacing +16 added lines, -16 removed lines

@@ -277,7 +277,7 @@ 
             $timeStr = $start->format('g:i A').' till '.$end->format('g:i A');
             if(strlen($shifts[$i]['name']) > 0)
             {
-                $timeStr .=' - <i>'.$shifts[$i]['name'].'</i>';
+                $timeStr .= ' - <i>'.$shifts[$i]['name'].'</i>';
             }
             if(!isset($days[$dateStr]))
             {
@@ -292,22 +292,22 @@ 
         ksort($days);
         foreach($days as $dateStr=>$day)
         {
-            $html .='<h2>'.$dateStr.'</h2>';
+            $html .= '<h2>'.$dateStr.'</h2>';
             uksort($day, array($this, 'groupSort'));
             foreach($day as $shiftStr=>$shifts)
             {
                 usort($shifts, array($this, 'shiftSort'));
-                $html .='<h3>'.$shiftStr.'</h3>';
-                $html .='<table width="100%"><tr><th style="width: 20%">Role</th><th>Volunteer Name</th><th>Volunteer Camp</th></tr>';
+                $html .= '<h3>'.$shiftStr.'</h3>';
+                $html .= '<table width="100%"><tr><th style="width: 20%">Role</th><th>Volunteer Name</th><th>Volunteer Camp</th></tr>';
                 foreach($shifts as $shift)
                 {
                     //TODO Volunteer info for shift...
-                    $html .='<tr><td>'.$this->getRoleNameFromID($shift['roleID']).'</td><td></td><td></td></tr>';
+                    $html .= '<tr><td>'.$this->getRoleNameFromID($shift['roleID']).'</td><td></td><td></td></tr>';
                 }
-                $html .='</table>';
+                $html .= '</table>';
             }
         }
-        $html .='</body>';
+        $html .= '</body>';
         $pdf->setPDFFromHTML($html);
         $response = $response->withHeader('Content-Type', 'application/pdf');
         $response->getBody()->write($pdf->toPDFBuffer());
@@ -356,7 +356,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;
         $simpleHours = array();
         $militaryHours = array();
         $hour = $start['hour'];
@@ -458,35 +458,35 @@ 
         {
             $i = 1;
             $timeDiff = $originalStartTime->diff($shift['startTime']);
-            $hoursFromStart = ($timeDiff->d*24)+$timeDiff->h;
+            $hoursFromStart = ($timeDiff->d * 24) + $timeDiff->h;
             $firstRow = array_search($shift['roleID'], $rows);
-            $cell = $sheat->getCellByColumnAndRow($hoursFromStart+2, $firstRow+4);
+            $cell = $sheat->getCellByColumnAndRow($hoursFromStart + 2, $firstRow + 4);
             if($cell->isInMergeRange())
             {
-                while($rows[$firstRow+$i] === $shift['roleID'])
+                while($rows[$firstRow + $i] === $shift['roleID'])
                 {
-                    $cell = $sheat->getCellByColumnAndRow($hoursFromStart+2, $firstRow+4+$i);
+                    $cell = $sheat->getCellByColumnAndRow($hoursFromStart + 2, $firstRow + 4 + $i);
                     if(!$cell->isInMergeRange())
                     {
                         break;
                     }
                     $i++;
                 }
-                $sheat->mergeCellsByColumnAndRow($hoursFromStart+2, $firstRow+4+$i, $hoursFromStart+1+$shift['length'], $firstRow+4+$i);
+                $sheat->mergeCellsByColumnAndRow($hoursFromStart + 2, $firstRow + 4 + $i, $hoursFromStart + 1 + $shift['length'], $firstRow + 4 + $i);
             }
             else
             {
-                $sheat->mergeCellsByColumnAndRow($hoursFromStart+2, $firstRow+4, $hoursFromStart+1+$shift['length'], $firstRow+4);
+                $sheat->mergeCellsByColumnAndRow($hoursFromStart + 2, $firstRow + 4, $hoursFromStart + 1 + $shift['length'], $firstRow + 4);
             }
             $shift = array_shift($shifts);
         }
-        $style = $sheat->getStyleByColumnAndRow(2, 4, 1+count($simpleHours), 3+count($rows));
+        $style = $sheat->getStyleByColumnAndRow(2, 4, 1 + count($simpleHours), 3 + count($rows));
         $style->getBorders()->getAllBorders()->setBorderStyle(\PhpOffice\PhpSpreadsheet\Style\Border::BORDER_THIN);
         for($i = 0; $i < count($simpleHours); $i++)
         {
             for($j = 0; $j < count($rows); $j++)
             {
-                 $cell = $sheat->getCellByColumnAndRow($i+2, $j+4);
+                 $cell = $sheat->getCellByColumnAndRow($i + 2, $j + 4);
                  if($cell->isInMergeRange())
                  {
                       continue;

api/v1/class.Processor.php

Doc Comments +3 added lines

@@ -1,6 +1,9 @@
 <?php
 trait Processor
 {
+    /**
+     * @param string $certType
+     */
     protected function certCheck($requirements, $certs, $certType)
     {
         if(isset($requirements[$certType]) && $requirements[$certType])

Indentation +1 added lines, -1 removed lines

@@ -261,7 +261,7 @@
             $tmp = $dataTable->read();
             foreach($tmp as $role)
             {
-               $roles[$role['short_name']] = $role;
+                $roles[$role['short_name']] = $role;
             }
         }
         $entry['isAdmin'] = $this->canUpdate($request, $entry);

api/v1/class.ShiftAPI.php

Indentation +4 added lines, -4 removed lines

@@ -40,7 +40,7 @@ 
 
     protected function canUpdate($request, $entity)
     {
- 	if($this->isVolunteerAdmin($request))
+        if($this->isVolunteerAdmin($request))
         {
             return true;
         }
@@ -113,8 +113,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)
@@ -184,7 +184,7 @@ 
             $leads = array();
             for($i = 0; $i < $count; $i++)
             {
-            	$leads = array_merge($leads, $this->getLeadForDepartment($overlaps[$i]['departmentID']));
+                $leads = array_merge($leads, $this->getLeadForDepartment($overlaps[$i]['departmentID']));
                 $overlaps[$i]['status'] = 'pending';
             }
             $leads = array_merge($leads, $this->getLeadForDepartment($entity['departmentID']));

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);

api/v1/class.ParticipantAPI.php

Indentation +2 added lines, -2 removed lines

@@ -35,7 +35,7 @@ 
 
     protected function canUpdate($request, $entity)
     {
- 	if($this->isVolunteerAdmin($request))
+        if($this->isVolunteerAdmin($request))
         {
             return true;
         }       
@@ -83,7 +83,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);

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

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;

signup.php

Indentation +42 added lines, -42 removed lines

@@ -4,7 +4,7 @@ 
 
 class ProcessorUser
 {
-  use Processor;
+    use Processor;
 }
 
 $processor = new ProcessorUser();
@@ -15,9 +15,9 @@ 
 
 if(!isset($_GET['shiftID']))
 {
-  $page->body .= 'Error! Missing Shift ID. You must have followed a bad link!';
-  $page->printPage();
-  return;
+    $page->body .= 'Error! Missing Shift ID. You must have followed a bad link!';
+    $page->printPage();
+    return;
 }
 
 $shiftID = $_GET['shiftID'];
@@ -26,9 +26,9 @@ 
 $shifts = $dataTable->read($filter);
 if(empty($shifts))
 {
-  $page->body .= 'Error! Could not locate shift. You must have followed an old link!';
-  $page->printPage();
-  return;
+    $page->body .= 'Error! Could not locate shift. You must have followed an old link!';
+    $page->printPage();
+    return;
 }
 $shift = $shifts[0];
 
@@ -36,38 +36,38 @@ 
 $profiles = $dataTable->read(new \Data\Filter('uid eq '.$page->user->uid));
 if(empty($profiles))
 {
-  $page->body .= 'Error! Could not locate user profile!';
-  $page->printPage();
-  return;
+    $page->body .= 'Error! Could not locate user profile!';
+    $page->printPage();
+    return;
 }
 $profile = $profiles[0];
 
 if($processor->isAdminForShift($shift, $page->user))
 {
-  if(isset($shift['groupID']) && strlen($shift['groupID'] > 0))
-  {
+    if(isset($shift['groupID']) && strlen($shift['groupID'] > 0))
+    {
     $page->body .= '
     <div class="alert alert-info" role="alert">
       You are an administrator for this shift. You can edit the shift <a href="_admin/shifts.php?shiftID='.$shiftID.'" class="alert-link">here</a>.
       Or you can edit the shift group <a href="_admin/shifts.php?groupID='.$shift['groupID'].'" class="alert-link">here</a>.
     </div>
     ';
-  }
-  else
-  {
+    }
+    else
+    {
     $page->body .= '
     <div class="alert alert-info" role="alert">
       You are an administrator for this shift. You can edit the shift <a href="_admin/shifts.php?shiftID='.$shiftID.'" class="alert-link">here</a>.
     </div>
     ';
-  }
+    }
 }
 
 //Is shift already taken?
 if(isset($entry['status']) && ($entry['status'] === 'pending' || $entry['status'] === 'filled'))
 {
-  if(isset($shift['participant']) && $shift['participant'] === $page->user->uid)
-  {
+    if(isset($shift['participant']) && $shift['participant'] === $page->user->uid)
+    {
     $page->body .= '<div class="alert alert-success" role="alert">
       You already have this shift!
     </div>
@@ -75,15 +75,15 @@ 
       <button type="button" class="btn btn-secondary mr-auto" onClick="window.history.back();">Cancel</button>
       <button type="button" class="btn btn-primary" onclick="abandon();">Abandon Shift</button>
     </div>';
-  }
-  else
-  {
+    }
+    else
+    {
     $page->body .= '<div class="alert alert-danger" role="alert">
       Someone else took this shift!
     </div>';
-  }
-  $page->printPage();
-  return;
+    }
+    $page->printPage();
+    return;
 }
 
 $overlap = false;
@@ -108,47 +108,47 @@ 
 $depts = $dataTable->read(new \Data\Filter('departmentID eq '.$shift['departmentID']));
 if(!empty($depts))
 {
-  $deptName = $depts[0]['departmentName'];
+    $deptName = $depts[0]['departmentName'];
 }
 
 $dataTable = DataSetFactory::getDataTableByNames('fvs', 'events');
 $events = $dataTable->read(new \Data\Filter('_id eq '.$shift['eventID']));
 if(!empty($events))
 {
-  if($events[0]['tickets'])
-  {
+    if($events[0]['tickets'])
+    {
     //TODO... Event requires tickets. Does this account have tickets?
-  }
+    }
 }
 
 $dataTable = DataSetFactory::getDataTableByNames('fvs', 'roles');
 $roles = $dataTable->read(new \Data\Filter('short_name eq '.$shift['roleID']));
 if(!empty($roles))
 {
-  $roleName = $roles[0]['display_name'];
+    $roleName = $roles[0]['display_name'];
 }
 
 //Is user eligible for shift?
 $canDo = $processor->canUserDoRole($profile, $roles[0]);
 if($canDo !== true)
 {
-  $page->body .= '<div class="alert alert-danger" role="alert">';
-  switch($canDo['whyClass'])
-  {
+    $page->body .= '<div class="alert alert-danger" role="alert">';
+    switch($canDo['whyClass'])
+    {
     case 'INVITE':
       $page->body .= 'This shift requires an invite from the department lead. If you think you should have recieved such an invite please <a href="https://www.burningflipside.com/contact" class="alert-link">contact the lead</a>.';
-      break;
+        break;
     case 'CERT':
        $page->body .= $canDo['whyMsg'].' If you have this certification it is not recorded in your profile. You can <a href="certiciation.php" class="alert-link">record that certification</a> to sign up.';
-       break;
+        break;
     default:
       $page->body .= 'You are not eligible for this shift because: '.$canDo['whyMsg'];
-      break;
-  }
-  $page->body .= '</div>';
-  $page->printPage();
-  return;  
-  var_dump($canDo); die();
+        break;
+    }
+    $page->body .= '</div>';
+    $page->printPage();
+    return;  
+    var_dump($canDo); die();
 }
 
 $start = new \DateTime($shift['startTime']);
@@ -159,7 +159,7 @@ 
 $page->body .= '<div id="signupContent" ';
 if($overlap)
 {
-  $page->body .= 'class="d-none" ';
+    $page->body .= 'class="d-none" ';
 }
 $page->body .= '/>';
 $page->body .= '
@@ -200,7 +200,7 @@ 
 //Is group eligible?
 if(isset($shift['groupID']) && isset($roles[0]['groups_allowed']) && $roles[0]['groups_allowed'])
 {
-  $page->body .= '
+    $page->body .= '
   <div class="row">
     <div class="alert alert-primary" role="alert">
       You have selected a group eligible shift. This means you can generate a link for your friends to sign up on the shift with you. Would you like to sign up for the shift and generate that link now?

_admin/class.VolunteerAdminPage.php

Indentation +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
             $this->isLead = $this->user->isInGroupNamed('Leads');
             if($this->isLead)
             {
-                 $this->is_admin = true;
+                    $this->is_admin = true;
             }
         }
     }

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: */