BurningFlipside / VolunteerSystem

_admin/class.VolunteerAdminPage.php

Indentation +1 added lines, -1 removed lines

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

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
                 $uid = $this->user->uid;
                 $email = $this->user->mail;
                 $filter = new \Data\Filter("others eq $uid or others eq $email");
-                $dataTable = DataSetFactory::getDataTableByNames('fvs','departments');
+                $dataTable = DataSetFactory::getDataTableByNames('fvs', 'departments');
                 $depts = $dataTable->read($filter);
                 $this->isLead = !empty($depts);
                 $this->is_admin = true;

app/Emails/class.ShiftEmail.php

Indentation +9 added lines, -9 removed lines

@@ -44,15 +44,15 @@
         $start = $this->shift->startTime->format('r');
         $end = $this->shift->endTime->format('r');
         $vars = array(
-          '{$firstName}' => $firstName,
-          '{$lastName}' => $lastName,
-          '{$paperName}' => $paperName,
-          '{$webName}' => $webName,
-          '{$department}' => $department,
-          '{$role}' => $role,
-          '{$event}' => $event,
-          '{$start}' => $start,
-          '{$end}' => $end
+            '{$firstName}' => $firstName,
+            '{$lastName}' => $lastName,
+            '{$paperName}' => $paperName,
+            '{$webName}' => $webName,
+            '{$department}' => $department,
+            '{$role}' => $role,
+            '{$event}' => $event,
+            '{$start}' => $start,
+            '{$end}' => $end
         );
         if(strpos($this->text, '{$newStart}') !== false || strpos($this->text, '{$newEnd}') !== false)
         {

Spacing +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
                 $end = strpos($rawText, "</script>");
                 if($index === 0)
                 {
-                    $rawText = substr($rawText, $end+9);
+                    $rawText = substr($rawText, $end + 9);
                 }
             }
             return strtr(strip_tags($rawText), $vars);

app/Emails/class.CertificationEmail.php

Indentation +6 added lines, -6 removed lines

@@ -48,12 +48,12 @@
         $certType = $this->additionalProps['certType'];
         $rejectReason = $this->additionalProps['reason'];
         $vars = array(
-          '{$firstName}' => $firstName,
-          '{$lastName}' => $lastName,
-          '{$paperName}' => $paperName,
-          '{$webName}' => $webName,
-          '{$certType}' => $certType,
-          '{$rejectReason}' => $rejectReason
+            '{$firstName}' => $firstName,
+            '{$lastName}' => $lastName,
+            '{$paperName}' => $paperName,
+            '{$webName}' => $webName,
+            '{$certType}' => $certType,
+            '{$rejectReason}' => $rejectReason
         );
         if($html === true)
         {

Spacing +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
                 $end = strpos($rawText, "</script>");
                 if($index === 0)
                 {
-                    $rawText = substr($rawText, $end+9);
+                    $rawText = substr($rawText, $end + 9);
                 }
             }
             return strtr(strip_tags($rawText), $vars);

api/v1/class.ShiftAPI.php

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 +8 added lines, -8 removed lines

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

app/class.VolunteerEvent.php

Doc Comments +6 added lines

@@ -6,6 +6,9 @@ 
         parent::__construct($departmentID, $dbData, 'events', '_id');
     }
 
+    /**
+     * @param integer $eeListIndex
+     */
     public function hasVolOnEEList($uid, $eeListIndex)
     {
         if($eeListIndex === 1 || $eeListIndex === 0)
@@ -28,6 +31,9 @@ 
         return false;
     }
 
+    /**
+     * @param integer $eeListIndex
+     */
     public function addToEEList($uid, $eeListIndex)
     {
         if(!isset($this->dbData['eeLists']))

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
         if($eeListIndex === 1 || $eeListIndex === 0)
         {
             //Check earlier EE lists too
-            $val = $this->hasVolOnEEList($uid, $eeListIndex+1);
+            $val = $this->hasVolOnEEList($uid, $eeListIndex + 1);
             if($val === true)
             {
                 return true;

signup.php

Indentation +56 added lines, -56 removed lines

@@ -5,19 +5,19 @@ 
 
 class ProcessorUser
 {
-  use Processor;
+    use Processor;
 
-  protected $isAdmin;
+    protected $isAdmin;
 
-  public function __construct($isAdmin)
-  {
-      $this->isAdmin = $isAdmin;
-  }
+    public function __construct($isAdmin)
+    {
+        $this->isAdmin = $isAdmin;
+    }
 
-  protected function isVolunteerAdmin()
-  {
-      return $this->isAdmin;
-  }
+    protected function isVolunteerAdmin()
+    {
+        return $this->isAdmin;
+    }
 }
 
 $page = new VolunteerPage('Burning Flipside - Flipside Volunteer System');
@@ -30,9 +30,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'];
@@ -41,9 +41,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];
 $myShift = new \VolunteerShift(false, $shift);
@@ -52,38 +52,38 @@ 
 
 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>
     ';
-  }
-  if(!isset($shift['participant']) || strlen($shift['participant']) === 0)
-  {
+    }
+    if(!isset($shift['participant']) || strlen($shift['participant']) === 0)
+    {
     $page->body .= '
     <div class="alert alert-info" role="alert">
       You are an administrator for this shift. You can assign someone to the shift, but it is highly recommended to let the users sign up. But if you are sure click <a href="#" onClick="showAdminSignup()" class="alert-link">here</a>.
     </div>
     ';
-  }
+    }
 }
 
 //Is shift already taken?
 if($myShift->isFilled())
 {
-  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>
@@ -91,15 +91,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;
@@ -124,50 +124,50 @@ 
 $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(is_array($canDo) && $processor->isAdminForShift($shift, $page->user))
 {
-  $canDo = true;
+    $canDo = true;
 }
 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;  
+        break;
+    }
+    $page->body .= '</div>';
+    $page->printPage();
+    return;  
 }
 
 $start = new \DateTime($shift['startTime']);
@@ -178,7 +178,7 @@ 
 $page->body .= '<div id="signupContent" ';
 if($overlap)
 {
-  $page->body .= 'class="d-none" ';
+    $page->body .= 'class="d-none" ';
 }
 $page->body .= '/>';
 $page->body .= '
@@ -218,7 +218,7 @@ 
 
 if($processor->isAdminForShift($shift, $page->user) && (!isset($shift['participant']) || strlen($shift['participant']) === 0))
 {
-  $page->body .= '
+    $page->body .= '
   <div class="row d-none" id="adminSignup">
     <div class="alert alert-danger" role="alert">
       First off, make sure you understand what this will do. While it will let you fill out the details for a shift, it will prevent the user from seeing the shift on their list when the log it, it will not be correctly reported for t-shirts or for rock star volunteers, their camp will not be listed on the shift schedule, and the ability to contact past volunteers will not work for anyone signed up in this manner. Basically, doing this removes about 90% of the advantage of using this system. So please only do this if participant in question is unable to sign up on their own.
@@ -235,12 +235,12 @@ 
 //Is group eligible?
 if(isset($shift['groupID']) && isset($roles[0]['groups_allowed']) && $roles[0]['groups_allowed'])
 {
-  $page->body .= '<div id="groupContent" ';
-  if($overlap)
-  {
+    $page->body .= '<div id="groupContent" ';
+    if($overlap)
+    {
     $page->body .= 'class="d-none" ';
-  }
-  $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?

plugin.php

Indentation +3 added lines, -3 removed lines

@@ -4,7 +4,7 @@ 
     function get_secure_menu_entries($page, $user)
     {
         $ret = array(
-          'Volunteer' => $page->secure_root.'fvs/index.php'
+            'Volunteer' => $page->secure_root.'fvs/index.php'
         );
         if($user !== null && $user->isInGroupNamed('VolunteerAdmins'))
         {
@@ -16,8 +16,8 @@ 
     function get_plugin_entry_point()
     {
         return array(
-          'name'=>'Volunteer',
-          'link' => 'fvs/index.php'
+            'name'=>'Volunteer',
+            'link' => 'fvs/index.php'
         );
     }
 }

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
         );
         if($user !== null && $user->isInGroupNamed('VolunteerAdmins'))
         {
-            $ret['Volunteer System Admin']=$page->secure_root.'fvs/_admin/index.php';
+            $ret['Volunteer System Admin'] = $page->secure_root.'fvs/_admin/index.php';
         }
         return $ret;
     }