Completed
Pull Request — develop (#44)
by Daniel
07:16
created
app/User.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
     /**
32 32
      * Test if the User is an admin or demo.
33 33
      *
34
-     * @return \Illuminate\Database\Eloquent\Builder
34
+     * @return boolean
35 35
      */
36 36
     public function isAdmin()
37 37
     {
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
      * Test if this user has global read access
43 43
      * these users have a level of 5, 10 or 11 (demo).
44 44
      *
45
-     * @return \Illuminate\Database\Eloquent\Builder
45
+     * @return boolean
46 46
      */
47 47
     public function hasGlobalRead()
48 48
     {
Please login to merge, or discard this patch.
app/Notification.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -42,6 +42,9 @@
 block discarded – undo
42 42
         $this->setAttrib('sticky', $enabled);
43 43
     }
44 44
 
45
+    /**
46
+     * @param string $name
47
+     */
45 48
     private function setAttrib($name, $enabled) {
46 49
         if ($enabled === true) {
47 50
             $read = new NotificationAttrib;
Please login to merge, or discard this patch.
app/Api/Controllers/NotificationController.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -43,10 +43,10 @@
 block discarded – undo
43 43
         }
44 44
 
45 45
         if ($action == 'read') {
46
-           $result = $notification->markRead($enable);
46
+            $result = $notification->markRead($enable);
47 47
         }
48 48
         elseif ($action == 'sticky') {
49
-           $result = $notification->markSticky(false);
49
+            $result = $notification->markSticky(false);
50 50
         }
51 51
 
52 52
         if ($result === false) {
Please login to merge, or discard this patch.
app/Api/Transformers/PortTransformer.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@
 block discarded – undo
35 35
     /**
36 36
      * Include Device
37 37
      *
38
-     * @return League\Fractal\ItemResource
38
+     * @return Fractal\Resource\Item
39 39
      */
40 40
     public function includeDevice(Port $port)
41 41
     {
Please login to merge, or discard this patch.
app/Api/Controllers/APIController.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@
 block discarded – undo
16 16
         $versions['db_schema'] = DB::select('SELECT `version` FROM `dbSchema` LIMIT 1')[0]->version;
17 17
         $versions['php']       = phpversion();
18 18
         $versions['db_driver'] = strtoupper(DB::connection()->getDriverName());
19
-	if ($versions['db_driver'] == 'SQLITE') {
19
+    if ($versions['db_driver'] == 'SQLITE') {
20 20
             $versions['db_version'] = DB::select('SELECT sqlite_version() AS version')[0]->version;
21 21
         }
22 22
         else {
Please login to merge, or discard this patch.
app/DeviceOS.php 1 patch
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,6 @@
 block discarded – undo
5 5
 
6 6
     /**
7 7
      * Load OS Class
8
-     * @param string $os Operating System Identifier
9 8
      * @return DeviceOS
10 9
      */
11 10
     static public function load(Device $device) {
Please login to merge, or discard this patch.
app/OS/Linux.php 1 patch
Indentation   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -7,32 +7,32 @@
 block discarded – undo
7 7
     protected $text      = 'Linux';
8 8
     protected $icon      = 'linux';
9 9
     protected $attrib    = array(
10
-                               'ifXmcbc' => true,
11
-                               'ifname'  => true,
12
-                           );
10
+                                'ifXmcbc' => true,
11
+                                'ifname'  => true,
12
+                            );
13 13
     protected $overlib   = array(
14
-                               array(
15
-                                   'graph' => 'device_processor',
16
-                                   'text'  => 'Processor Usage'
17
-                               ),
18
-                               array(
19
-                                   'graph' => 'device_ucd_memory',
20
-                                   'text'  => 'Memory Usage'
21
-                               ),
22
-                               array(
23
-                                   'graph' => 'device_storage',
24
-                                   'text'  => 'Storage Usage'
25
-                               ),
26
-                           );
14
+                                array(
15
+                                    'graph' => 'device_processor',
16
+                                    'text'  => 'Processor Usage'
17
+                                ),
18
+                                array(
19
+                                    'graph' => 'device_ucd_memory',
20
+                                    'text'  => 'Memory Usage'
21
+                                ),
22
+                                array(
23
+                                    'graph' => 'device_storage',
24
+                                    'text'  => 'Storage Usage'
25
+                                ),
26
+                            );
27 27
     protected $derivates = array(
28
-                               'Debian' => array(
29
-                                              'icon' => 'debian',
30
-                                           ),
31
-                               'CentOS' => array(
32
-                                              'icon' => 'centos',
33
-                                           ),
34
-                               'Ubuntu' => array(
35
-                                              'icon' => 'ubuntu',
36
-                                           ),
37
-                           );
28
+                                'Debian' => array(
29
+                                                'icon' => 'debian',
30
+                                            ),
31
+                                'CentOS' => array(
32
+                                                'icon' => 'centos',
33
+                                            ),
34
+                                'Ubuntu' => array(
35
+                                                'icon' => 'ubuntu',
36
+                                            ),
37
+                            );
38 38
 }
Please login to merge, or discard this patch.