Hannesalm / EventCalendar

src/Events/EventController.php

Spacing +3 added lines, -3 removed lines

@@ -28,7 +28,7 @@ 
      * @return void

      */

 

-    public function viewAction(){

+    public function viewAction() {

 

         $this->initialize();

         $calendar = new \Anax\Calendar\CCalendar();

@@ -39,7 +39,7 @@ 
 

         $date = $this->dispatcher->getParam('date');

         $_GET = array();

-        $currentDate = $year ."-". $month ."-". sprintf('%02s',$date);

+        $currentDate = $year."-".$month."-".sprintf('%02s', $date);

 

 

         $events = $this->events->findEventsOfDay($currentDate);

@@ -99,7 +99,7 @@ 
 

     }

 

-    public function addAction(){

+    public function addAction() {

 

         $now = gmdate('Y-m-d H:i:s');

 

src/Events/Event.php

Spacing +8 added lines, -8 removed lines

@@ -34,8 +34,8 @@ 
 

     public function findAllOfMonth($month, $year)

     {

-        $start_date = "showdate >= '".$year ."-".$month ."-01'";

-        $end_date = "showdate <= '".$year ."-".$month ."-31'";

+        $start_date = "showdate >= '".$year."-".$month."-01'";

+        $end_date = "showdate <= '".$year."-".$month."-31'";

 

         $this->db->select()

             ->from($this->getSource())

@@ -46,9 +46,9 @@ 
         return $this->db->fetchAll($this);

     }

 

-    public function findEventsOfDay($date){

+    public function findEventsOfDay($date) {

 

-        $currentDate = "'". $date ."'" ;

+        $currentDate = "'".$date."'";

         $this->db->select()

             ->from($this->getSource())

             ->where('showdate = '.$currentDate)

@@ -61,19 +61,19 @@ 
      *

      * @return array with eventcount per day.

      */

-    public function getEventCountPerDayOfMonth($month,$year = '2016'){

+    public function getEventCountPerDayOfMonth($month, $year = '2016') {

         $eventsPerDayForMonth = [];

 

-        for($i = 1;$i < 32;$i++){

+        for ($i = 1; $i < 32; $i++) {

             $day = sprintf('%02s', $i);

-            $date = "'".$year ."-".$month ."-".$day."'";

+            $date = "'".$year."-".$month."-".$day."'";

             $count = $this->getEventCount($date);

             $eventsPerDayForMonth[$i] = $count;

         }

 

         return $eventsPerDayForMonth;

     }

-    public function getEventCount($date){

+    public function getEventCount($date) {

         $this->db->select()

             ->from($this->getSource())

             ->where('showdate = '.$date)

src/Calendar/CCalendar.php

Indentation +11 added lines, -11 removed lines

@@ -32,27 +32,27 @@
     }

 

     public function prev(){

-      $year = $this->year;

-      $month = $this->month;

+        $year = $this->year;

+        $month = $this->month;

 

         if($month == 1){

             $month = 12;

-          	$year--;

+                $year--;

         } else {

             $month--;

         }

 

-      return ["year" => $year, "month"=>$month];

+        return ["year" => $year, "month"=>$month];

     }

     public function next(){

-      $year = $this->year;

+        $year = $this->year;

         $month = $this->month;

-          if($month == 12){

-              $month = 1;

-              $year++;

-          } else {

-              $month++;

-          }

+            if($month == 12){

+                $month = 1;

+                $year++;

+            } else {

+                $month++;

+            }

         return ["year" => $year, "month"=>$month];

     }

     public function addWeek($week)

Spacing +66 added lines, -66 removed lines

@@ -10,15 +10,15 @@ 
     private $year;

     private $events = array();

 

-    public function setEvents($values = []){

+    public function setEvents($values = []) {

         $this->events = $values;

     }

 

-    public function getValues($year = null, $month = null){

-        if($year && $month){

+    public function getValues($year = null, $month = null) {

+        if ($year && $month) {

             $this->setYear($year)->setMonth($month);

         }

-        else if(isset($_GET['year']) && isset($_GET['month'])){

+        else if (isset($_GET['year']) && isset($_GET['month'])) {

             $this->setYear($_GET['year'])->setMonth($_GET['month']);

         }

         else {

@@ -31,11 +31,11 @@ 
         return $this->weeks;

     }

 

-    public function prev(){

+    public function prev() {

       $year = $this->year;

       $month = $this->month;

 

-        if($month == 1){

+        if ($month == 1) {

             $month = 12;

           	$year--;

         } else {

@@ -44,10 +44,10 @@ 
 

       return ["year" => $year, "month"=>$month];

     }

-    public function next(){

+    public function next() {

       $year = $this->year;

         $month = $this->month;

-          if($month == 12){

+          if ($month == 12) {

               $month = 1;

               $year++;

           } else {

@@ -62,58 +62,58 @@ 
 

     public function setMonth($month)

     {

-        $this->month = (int)$month;

+        $this->month = (int) $month;

         return $this;

     }

 

-    public function getMonthNumber(){

+    public function getMonthNumber() {

         $dateString = strtotime(sprintf('%s-%s-01', $this->year, $this->month));

         return $month = date('m', $dateString);

     }

-    public function getMonthName(){

+    public function getMonthName() {

         $dateString = strtotime(sprintf('%s-%s-01', $this->year, $this->month));

         return $month = date('F', $dateString);

     }

 

-    public function setYear($year){

+    public function setYear($year) {

         $this->year = $year;

         return $this;

     }

-    public function getMonth(){

+    public function getMonth() {

         return $this->month;

     }

-    public function getYear(){

+    public function getYear() {

         return $this->year;

     }

 

-    public function generateCalenderData(){

+    public function generateCalenderData() {

         $daysUsed = 0;

         $dateString = strtotime(sprintf('%s-%s-01', $this->year, $this->month));

         $monthDays = date('t', $dateString);

         $dayOfWeek = date('w', $dateString);

         $firstWeek = new CWeek();

         $emptyDays = $this->getAmountOfEmptyDays($dayOfWeek);

-        for($i = 1; $i<=$emptyDays; $i++){

+        for ($i = 1; $i <= $emptyDays; $i++) {

             $firstWeek->addWeekday(new CDay());

         }

 

-        for($i = 1; $i<=7-$emptyDays;$i++){

+        for ($i = 1; $i <= 7 - $emptyDays; $i++) {

             $dateString = strtotime(sprintf('%s-%s-%s', $this->year, $this->month, $i));

             $day = new CDay();

             $day->setName(date('l', $dateString));

             $day->setDayOfMonthNumber($i);

             $firstWeek->addWeekday($day);

-            $daysUsed ++;

+            $daysUsed++;

         }

 

         $this->addWeek($firstWeek);

         $week = null;

 

-        for($date = $daysUsed+1;$date<=$monthDays;$date++){

+        for ($date = $daysUsed + 1; $date <= $monthDays; $date++) {

             $dateString = strtotime(sprintf('%s-%s-%s', $this->year, $this->month, $date));

             $dayOfWeek = date('w', $dateString);

-            if($dayOfWeek == 1){

-                if($week){

+            if ($dayOfWeek == 1) {

+                if ($week) {

                     $this->addWeek($week);

                 }

                 $week = new CWeek();

@@ -125,9 +125,9 @@ 
             $week->addWeekday($day);

 

         }

-        $extraDays = 7-$week->getLengthOfDayArray();

+        $extraDays = 7 - $week->getLengthOfDayArray();

 

-        for($i = 0;$i<$extraDays;$i++){

+        for ($i = 0; $i < $extraDays; $i++) {

             $week->addWeekday(new CDay());

         }

         $this->addWeek($week);

@@ -135,47 +135,47 @@ 
     }

 

 

-    private function getAmountOfEmptyDays($firstDayOfMonth){

+    private function getAmountOfEmptyDays($firstDayOfMonth) {

         $number = 0;

-        if($firstDayOfMonth == 0){

+        if ($firstDayOfMonth == 0) {

             $number = 6;

         } else {

-            $number = $firstDayOfMonth -1;

+            $number = $firstDayOfMonth - 1;

         }

         return $number;

     }

 

-    public function printCalendar(){

+    public function printCalendar() {

         $prevData = $this->prev();

         $nextData = $this->next();

         $html = "<div class='headerCalendar'>

-                    <p class='year'> $this->year</p><p class='month'>" . $this->getMonthName() . "</p>

+                    <p class='year'> $this->year</p><p class='month'>".$this->getMonthName()."</p>

                  </div>

                  <div>

                  <table class='bordered'>";

 

-        foreach($this->getWeeks() as $week){

+        foreach ($this->getWeeks() as $week) {

             $html .= "<tr>";

-            foreach($week -> getWeekdays() as $day){

+            foreach ($week -> getWeekdays() as $day) {

                 $currentDay = $day->getName();

                 $todaysDay = date('j');

                 $currentMonth = date('m');

                 $html .= "<td>";

 

-                if($currentDay == "Sunday"){

-                    $html .= "<div class='redNumber'>" . $day->getDayOfMonthNumber() . "</div>";

-                    $html .= "<div class='redName'>" . $day->getName() . "</div>";

+                if ($currentDay == "Sunday") {

+                    $html .= "<div class='redNumber'>".$day->getDayOfMonthNumber()."</div>";

+                    $html .= "<div class='redName'>".$day->getName()."</div>";

                 } else {

-                    if($day->getDayOfMonthNumber() == $todaysDay && $this->month == $currentMonth) {

-                        $html .= "<div class='current'><div class='monthNumber'>" . $day->getDayOfMonthNumber() . "</div>";

-                        $html .= "<div class='monthName'>" . $day->getName() . "</div></div>";

+                    if ($day->getDayOfMonthNumber() == $todaysDay && $this->month == $currentMonth) {

+                        $html .= "<div class='current'><div class='monthNumber'>".$day->getDayOfMonthNumber()."</div>";

+                        $html .= "<div class='monthName'>".$day->getName()."</div></div>";

                     } else {

-                        if($this->month == 12 && $day->getDayOfMonthNumber() == 24){

-                            $html .= "<div class='christmas'><div class='monthNumber'>" . $day->getDayOfMonthNumber() . "</div>";

-                            $html .= "<div class='monthName'>" . $day->getName() . "</div></div>";

+                        if ($this->month == 12 && $day->getDayOfMonthNumber() == 24) {

+                            $html .= "<div class='christmas'><div class='monthNumber'>".$day->getDayOfMonthNumber()."</div>";

+                            $html .= "<div class='monthName'>".$day->getName()."</div></div>";

                         } else {

-                            $html .= "<div class='monthNumber'>" . $day->getDayOfMonthNumber() . "</div>";

-                            $html .= "<div class='monthName'>" . $day->getName() . "</div>";

+                            $html .= "<div class='monthNumber'>".$day->getDayOfMonthNumber()."</div>";

+                            $html .= "<div class='monthName'>".$day->getName()."</div>";

                         }

                     }

                 }

@@ -188,37 +188,37 @@ 
         return $html;

     }

 

-    public function printMiniCalendar(){

+    public function printMiniCalendar() {

         $img = $this->month;

         $prevData = $this->prev();

         $nextData = $this->next();

         $html = "

-                 <div class='leftArrow'> <a href='?month=". $prevData["month"] ."&year=" . $prevData["year"] . "'><img src='./img/orangeArrow.png'></a></div>

-                 <div class='rightArrow'> <a href='?month=". $nextData["month"] ."&year=" . $nextData["year"] . "'><img src='./img/orangeArrow.png'></a></div>

+                 <div class='leftArrow'> <a href='?month=". $prevData["month"]."&year=".$prevData["year"]."'><img src='./img/orangeArrow.png'></a></div>

+                 <div class='rightArrow'> <a href='?month=". $nextData["month"]."&year=".$nextData["year"]."'><img src='./img/orangeArrow.png'></a></div>

                  <div class='bordered'>

                  <table>";

 

 

 

 

-        foreach($this -> getWeeks() as $week){

+        foreach ($this -> getWeeks() as $week) {

             $html .= "<tr>";

-            foreach($week -> getWeekdays() as $day){

+            foreach ($week -> getWeekdays() as $day) {

                 $currentDay = $day->getName();

                 $todaysDay = date('j');

                 $currentMonth = date('m');

                 $html .= "<td>";

 

-                if($currentDay == "Sunday"){

-                    $html .= "<div class='redNumber'>" . $day->getDayOfMonthNumber() . "</div>";

+                if ($currentDay == "Sunday") {

+                    $html .= "<div class='redNumber'>".$day->getDayOfMonthNumber()."</div>";

                 } else {

-                    if($day->getDayOfMonthNumber() == $todaysDay && $this->month == $currentMonth) {

-                        $html .= "<div class='current'><div class='monthNumber'>" . $day->getDayOfMonthNumber() . "</div>";

+                    if ($day->getDayOfMonthNumber() == $todaysDay && $this->month == $currentMonth) {

+                        $html .= "<div class='current'><div class='monthNumber'>".$day->getDayOfMonthNumber()."</div>";

                     } else {

-                        if($this->month == 12 && $day->getDayOfMonthNumber() == 24){

-                            $html .= "<div class='christmas'><div class='monthNumber'>" . $day->getDayOfMonthNumber() . "</div>";

+                        if ($this->month == 12 && $day->getDayOfMonthNumber() == 24) {

+                            $html .= "<div class='christmas'><div class='monthNumber'>".$day->getDayOfMonthNumber()."</div>";

                         } else {

-                            $html .= "<div class='monthNumber'>" . $day->getDayOfMonthNumber() . "</div>";

+                            $html .= "<div class='monthNumber'>".$day->getDayOfMonthNumber()."</div>";

                         }

                     }

                 }

@@ -231,18 +231,18 @@ 
         return $html;

     }

 

-    public function printResponsiveCalendar($count){

+    public function printResponsiveCalendar($count) {

         $prevData = $this->prev();

         $nextData = $this->next();

 

         $html = "

                     <div class='page-header'>

-                        <h1 class='text-center'>" . $this->getMonthName() ." ". $this->year ."</h1>

+                        <h1 class='text-center'>" . $this->getMonthName()." ".$this->year."</h1>

                             <button type=\"button\" class=\"btn btn-primary\" data-toggle=\"modal\" data-target=\".bd-example-modal-sm\">Add Event</button>

                             <div class='btn-group '>

 

-                            <a href='?month=". $prevData["month"] ."&year=" . $prevData["year"] . "' class='btn btn-primary btn-md'>Previus</a>

-                            <a href='?month=". $nextData["month"] ."&year=" . $nextData["year"] . "' class='btn btn-primary btn-md'>Next</a>

+                            <a href='?month=". $prevData["month"]."&year=".$prevData["year"]."' class='btn btn-primary btn-md'>Previus</a>

+                            <a href='?month=". $nextData["month"]."&year=".$nextData["year"]."' class='btn btn-primary btn-md'>Next</a>

                         </div>

                     </div>

                     <div class='col-md-8'>

@@ -261,34 +261,34 @@ 
 

 

 

-        foreach($this->getWeeks() as $week){

+        foreach ($this->getWeeks() as $week) {

             $html .= "<ul class='days'>";

-            foreach($week -> getWeekdays() as $day){

-                if($day->getDayOfMonthNumber() == null){

+            foreach ($week -> getWeekdays() as $day) {

+                if ($day->getDayOfMonthNumber() == null) {

                     $id = 0;

 

                 } else {

-                    if($count[$day->getDayOfMonthNumber()] == null){

+                    if ($count[$day->getDayOfMonthNumber()] == null) {

                         $id = 0;

                     }

-                    else{

+                    else {

                     $id = $day->getDayOfMonthNumber();

                     }

 

                 }

-                if($day->getDayOfMonthNumber() == null){

+                if ($day->getDayOfMonthNumber() == null) {

                         $html .= "<li class='day-empty'></li>";

                 } else {

 

                     $html .= "

-                    <a href='calendar?month=".$this->month."&year=".$this->year."&date=". $day->getDayOfMonthNumber() ."'><li class='days'>";

-                        if($id == 0){

+                    <a href='calendar?month=".$this->month."&year=".$this->year."&date=".$day->getDayOfMonthNumber()."'><li class='days'>";

+                        if ($id == 0) {

                             $html .= "<span class='label label-danger label-pill pull-xs-left'></span>";

                         } else {

                             $html .= "<span class='label label-danger label-pill pull-right '>$count[$id]</span>";

                         }

 

-                    $html .="<div class='date'>". $day->getDayOfMonthNumber() ."</div>

+                    $html .= "<div class='date'>".$day->getDayOfMonthNumber()."</div>

                     </li>

                     </a>

                     ";

src/Calendar/CWeek.php

Spacing +3 added lines, -3 removed lines

@@ -5,13 +5,13 @@
     private $weekdays = array();

     private $weekNr;

 

-    public function addWeekday($day){

+    public function addWeekday($day) {

         $this->weekdays[] = $day;

     }

-    public function getWeekdays(){

+    public function getWeekdays() {

         return $this->weekdays;

     }

-    public function getLengthOfDayArray(){

+    public function getLengthOfDayArray() {

         return count($this->weekdays);

     }

 }
\ No newline at end of file

webroot/calendar.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 

 $di->setShared('db', function() {

     $db = new \Mos\Database\CDatabaseBasic();

-    $db->setOptions(require ANAX_APP_PATH . 'config/events_sqlite.php');

+    $db->setOptions(require ANAX_APP_PATH.'config/events_sqlite.php');

     $db->connect();

     return $db;

 });

autoloader.php

Spacing +3 added lines, -3 removed lines

@@ -11,12 +11,12 @@ 
  * @param string $class The fully-qualified class name.
  * @return void
  */
-spl_autoload_register(function ($class) {
+spl_autoload_register(function($class) {
     // project-specific namespace prefix
     //$prefix = 'Foo\\Bar\\';
     $prefix = 'qcode\\eventCalendar\\';
     // base directory for the namespace prefix
-    $base_dir = __DIR__ . '/src/';
+    $base_dir = __DIR__.'/src/';
     // does the class use the namespace prefix?
     $len = strlen($prefix);
     if (strncmp($prefix, $class, $len) !== 0) {
@@ -28,7 +28,7 @@ 
     // replace the namespace prefix with the base directory, replace namespace
     // separators with directory separators in the relative class name, append
     // with .php
-    $file = $base_dir . str_replace('\\', '/', $relative_class) . '.php';
+    $file = $base_dir.str_replace('\\', '/', $relative_class).'.php';
     // if the file exists, require it
     if (file_exists($file)) {
         require $file;

view/view.tpl.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <div>

     <div class="btn-group">

-        <a href='<?=$this->url->create('event/delete/' . $event->id)?>' class="btn btn-default">Delete event</a>

+        <a href='<?=$this->url->create('event/delete/'.$event->id)?>' class="btn btn-default">Delete event</a>

         <a href='<?=$this->url->create('calendar')?>' class="btn btn-info">Back</a>

     </div>

     <div class="jumbotron">

view/calendar.tpl.php

Spacing +2 added lines, -2 removed lines

@@ -6,7 +6,7 @@ 
             <div class="col-md-4">

 

                         <div class="clearfix"></div>

-                <?php if(isset($events)) : ?>

+                <?php if (isset($events)) : ?>

                         <ul class="list-group">

                                 <?php foreach ($events as $event) : ?>

                                     <li class="list-group-item">

@@ -15,7 +15,7 @@ 
                                                 <h4 class="card-title"><?=$event->title?></h4>

                                                 <p class="card-text"><?=$event->content?></p>

                                                 <p class="card-text"><?=$event->id?></p>

-                                            <a href='<?=$this->di->get('url')->create('event/id/' . $event->id) ?>' class="btn btn-primary btn-xs">Show event</a>

+                                            <a href='<?=$this->di->get('url')->create('event/id/'.$event->id) ?>' class="btn btn-primary btn-xs">Show event</a>

                                             </div>

                                         </div>

                                 <?php endforeach; ?>

vendor/composer/autoload_real.php

Spacing +6 added lines, -6 removed lines

@@ -9,7 +9,7 @@ 
     public static function loadClassLoader($class)
     {
         if ('Composer\Autoload\ClassLoader' === $class) {
-            require __DIR__ . '/ClassLoader.php';
+            require __DIR__.'/ClassLoader.php';
         }
     }
 
@@ -25,21 +25,21 @@ 
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION');
         if ($useStaticLoader) {
-            require_once __DIR__ . '/autoload_static.php';
+            require_once __DIR__.'/autoload_static.php';
 
             call_user_func(\Composer\Autoload\ComposerStaticInit7b593c329d00694ef3fa74c9b77a3c76::getInitializer($loader));
         } else {
-            $map = require __DIR__ . '/autoload_namespaces.php';
+            $map = require __DIR__.'/autoload_namespaces.php';
             foreach ($map as $namespace => $path) {
                 $loader->set($namespace, $path);
             }
 
-            $map = require __DIR__ . '/autoload_psr4.php';
+            $map = require __DIR__.'/autoload_psr4.php';
             foreach ($map as $namespace => $path) {
                 $loader->setPsr4($namespace, $path);
             }
 
-            $classMap = require __DIR__ . '/autoload_classmap.php';
+            $classMap = require __DIR__.'/autoload_classmap.php';
             if ($classMap) {
                 $loader->addClassMap($classMap);
             }
@@ -50,7 +50,7 @@ 
         if ($useStaticLoader) {
             $includeFiles = Composer\Autoload\ComposerStaticInit7b593c329d00694ef3fa74c9b77a3c76::$files;
         } else {
-            $includeFiles = require __DIR__ . '/autoload_files.php';
+            $includeFiles = require __DIR__.'/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
             composerRequire7b593c329d00694ef3fa74c9b77a3c76($fileIdentifier, $file);