Completed
Pull Request — master (#26)
by Lars
10:03
created
src/Intraface/modules/backup/Controller/Index.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@
 block discarded – undo
10 10
 
11 11
     function renderHtml()
12 12
     {
13
-        $tpl = $this->template->create(dirname(__FILE__) . '/templates/index');
13
+        $tpl = $this->template->create(dirname(__FILE__).'/templates/index');
14 14
         return $tpl->render($this);
15 15
     }
16 16
 
Please login to merge, or discard this patch.
src/Intraface/modules/filemanager/Append/File.php 2 patches
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -20,18 +20,18 @@
 block discarded – undo
20 20
         // @todo should add the template for intranet
21 21
         //$this->actAs('Intraface_Doctrine_Template_Intranet');
22 22
         $options = array('created' =>  array('name'          => 'date_created',    // Name of created column
23
-                                             'type'          => 'timestamp',     // Doctrine column data type
24
-                                             'options'       => array(),         // Array of options for column
25
-                                             'format'        => 'Y-m-d H:i:s',   // Format of date used with PHP date() function(default)
26
-                                             'disabled'      => false,           // Disable the created column(default)
27
-                                             'expression'    => 'NOW()'),        // Update column with database expression(default=false)
28
-                         'updated' =>  array('name'          => 'date_updated',    // Name of updated column(default)
29
-                                             'type'          => 'timestamp',     // Doctrine column data type(default)
30
-                                             'options'       => array(),         // Array of options for column(default)
31
-                                             'format'        => 'Y-m-d H:i:s',   // Format of date used with PHP date() function(default)
32
-                                             'disabled'      => false,           // Disable the updated column(default)
33
-                                             'expression'    => 'NOW()',         // Use a database expression to set column(default=false)
34
-                                             'onInsert'      => true));          // Whether or not to set column onInsert(default)
23
+                                                'type'          => 'timestamp',     // Doctrine column data type
24
+                                                'options'       => array(),         // Array of options for column
25
+                                                'format'        => 'Y-m-d H:i:s',   // Format of date used with PHP date() function(default)
26
+                                                'disabled'      => false,           // Disable the created column(default)
27
+                                                'expression'    => 'NOW()'),        // Update column with database expression(default=false)
28
+                            'updated' =>  array('name'          => 'date_updated',    // Name of updated column(default)
29
+                                                'type'          => 'timestamp',     // Doctrine column data type(default)
30
+                                                'options'       => array(),         // Array of options for column(default)
31
+                                                'format'        => 'Y-m-d H:i:s',   // Format of date used with PHP date() function(default)
32
+                                                'disabled'      => false,           // Disable the updated column(default)
33
+                                                'expression'    => 'NOW()',         // Use a database expression to set column(default=false)
34
+                                                'onInsert'      => true));          // Whether or not to set column onInsert(default)
35 35
 
36 36
         $this->actAs('Timestampable', $options);
37 37
 
Please login to merge, or discard this patch.
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -19,19 +19,19 @@
 block discarded – undo
19 19
     {
20 20
         // @todo should add the template for intranet
21 21
         //$this->actAs('Intraface_Doctrine_Template_Intranet');
22
-        $options = array('created' =>  array('name'          => 'date_created',    // Name of created column
23
-                                             'type'          => 'timestamp',     // Doctrine column data type
24
-                                             'options'       => array(),         // Array of options for column
25
-                                             'format'        => 'Y-m-d H:i:s',   // Format of date used with PHP date() function(default)
26
-                                             'disabled'      => false,           // Disable the created column(default)
27
-                                             'expression'    => 'NOW()'),        // Update column with database expression(default=false)
28
-                         'updated' =>  array('name'          => 'date_updated',    // Name of updated column(default)
29
-                                             'type'          => 'timestamp',     // Doctrine column data type(default)
30
-                                             'options'       => array(),         // Array of options for column(default)
31
-                                             'format'        => 'Y-m-d H:i:s',   // Format of date used with PHP date() function(default)
32
-                                             'disabled'      => false,           // Disable the updated column(default)
33
-                                             'expression'    => 'NOW()',         // Use a database expression to set column(default=false)
34
-                                             'onInsert'      => true));          // Whether or not to set column onInsert(default)
22
+        $options = array('created' =>  array('name'          => 'date_created', // Name of created column
23
+                                             'type'          => 'timestamp', // Doctrine column data type
24
+                                             'options'       => array(), // Array of options for column
25
+                                             'format'        => 'Y-m-d H:i:s', // Format of date used with PHP date() function(default)
26
+                                             'disabled'      => false, // Disable the created column(default)
27
+                                             'expression'    => 'NOW()'), // Update column with database expression(default=false)
28
+                         'updated' =>  array('name'          => 'date_updated', // Name of updated column(default)
29
+                                             'type'          => 'timestamp', // Doctrine column data type(default)
30
+                                             'options'       => array(), // Array of options for column(default)
31
+                                             'format'        => 'Y-m-d H:i:s', // Format of date used with PHP date() function(default)
32
+                                             'disabled'      => false, // Disable the updated column(default)
33
+                                             'expression'    => 'NOW()', // Use a database expression to set column(default=false)
34
+                                             'onInsert'      => true)); // Whether or not to set column onInsert(default)
35 35
 
36 36
         $this->actAs('Timestampable', $options);
37 37
 
Please login to merge, or discard this patch.
src/Intraface/modules/filemanager/ImageRandomizer.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -91,7 +91,7 @@
 block discarded – undo
91 91
     public function getRandomImage()
92 92
     {
93 93
         require_once 'Intraface/modules/filemanager/FileHandler.php';
94
-        $key = rand(0, count($this->file_list)-1);
94
+        $key = rand(0, count($this->file_list) - 1);
95 95
         $filehandler = new FileHandler($this->file_manager->getKernel(), $this->file_list[$key]);
96 96
         return $filehandler;
97 97
     }
Please login to merge, or discard this patch.
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
     /**
22 22
      * Constructor
23 23
      *
24
-     * @param object $file_manager file handler
24
+     * @param Intraface_modules_filemanager_FileManager $file_manager file handler
25 25
      * @param array  $keywords     array with keywords
26 26
      *
27 27
      * @return void
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
     /**
71 71
      * returns dbquery
72 72
      *
73
-     * @return object dbquery
73
+     * @return Ilib_DBQuery dbquery
74 74
      */
75 75
     protected function getDBQuery()
76 76
     {
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
     /**
87 87
      * return an file object with random image
88 88
      *
89
-     * @return object file_manager with random image loaded
89
+     * @return FileHandler file_manager with random image loaded
90 90
      */
91 91
     public function getRandomImage()
92 92
     {
Please login to merge, or discard this patch.
src/Intraface/modules/todo/Controller/Index.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@
 block discarded – undo
34 34
             'todo_done' => $todo_done
35 35
         );
36 36
 
37
-        $tpl = $this->template->create(dirname(__FILE__) . '/templates/index');
37
+        $tpl = $this->template->create(dirname(__FILE__).'/templates/index');
38 38
         return $tpl->render($this, $data);
39 39
     }
40 40
 
Please login to merge, or discard this patch.
src/Intraface/modules/payment/Controller/Index.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@
 block discarded – undo
47 47
 
48 48
         $data = array('payments' => $payments, 'gateway' => $gateway);
49 49
 
50
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/index');
50
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/index');
51 51
         return $smarty->render($this, $data);
52 52
     }
53 53
 
Please login to merge, or discard this patch.
src/Intraface/modules/intranetmaintenance/IntranetMaintenance.php 3 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -219,7 +219,7 @@
 block discarded – undo
219 219
             $this->id = $this->db->lastInsertID('intranet', 'id');
220 220
 
221 221
             if (PEAR::isError($this->id)) {
222
-                   throw new Exception("Error in IntranetMaintenance: ".$id->getMessage());
222
+                    throw new Exception("Error in IntranetMaintenance: ".$id->getMessage());
223 223
             }
224 224
             $this->load();
225 225
         } else {
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -288,7 +288,7 @@  discard block
 block discarded – undo
288 288
         $intranet = array();
289 289
         $db = $this->dbquery->getRecordset('DISTINCT(intranet.id), intranet.name');
290 290
         while ($db->nextRecord()) {
291
-            $intranet[$i]['id'] =   $db->f('id');
291
+            $intranet[$i]['id'] = $db->f('id');
292 292
             $intranet[$i]['name'] = $db->f('name');
293 293
             $i++;
294 294
         }
@@ -316,7 +316,7 @@  discard block
 block discarded – undo
316 316
      */
317 317
     function setContact($contact_id)
318 318
     {
319
-        $this->db->query("UPDATE intranet SET contact_id = ".intval($contact_id)." WHERE id = " . intval($this->id));
319
+        $this->db->query("UPDATE intranet SET contact_id = ".intval($contact_id)." WHERE id = ".intval($this->id));
320 320
         return true;
321 321
     }
322 322
 
@@ -333,7 +333,7 @@  discard block
 block discarded – undo
333 333
 
334 334
     private function identifierIsUnique($identifier)
335 335
     {
336
-        $result = $this->db->query("SELECT identifier FROM intranet WHERE identifier = ".$this->db->quote($identifier, 'text')." AND id <> " . intval($this->id));
336
+        $result = $this->db->query("SELECT identifier FROM intranet WHERE identifier = ".$this->db->quote($identifier, 'text')." AND id <> ".intval($this->id));
337 337
         if ($result->numRows() > 1) {
338 338
             return false;
339 339
         }
Please login to merge, or discard this patch.
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
      * Removes the intranets access to a module
117 117
      *
118 118
      * @param mixed module_id either name or id on module
119
-     * @return boolean true on success
119
+     * @return null|boolean true on success
120 120
      */
121 121
     public function removeModuleAccess($module_id)
122 122
     {
@@ -230,6 +230,7 @@  discard block
 block discarded – undo
230 230
 
231 231
     /**
232 232
      * Saves who the intranet is maintained by
233
+     * @return boolean
233 234
      */
234 235
     public function setMaintainedByUser($id, $current_intranet_id)
235 236
     {
@@ -322,8 +323,7 @@  discard block
 block discarded – undo
322 323
     /**
323 324
      * returns the RandomKeyGenerator
324 325
      *
325
-     * @param integer $length the length of the generated key
326
-     * @return object RandomKeyGenerator
326
+     * @return Ilib_RandomKeyGenerator RandomKeyGenerator
327 327
      */
328 328
     private function getRandomKeyGenerator()
329 329
     {
Please login to merge, or discard this patch.
src/Intraface/modules/intranetmaintenance/Controller/Intranet/Index.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
             'intranet_maintenance' => $this->getIntranetmaintenance()
30 30
         );
31 31
 
32
-        $smarty = $this->template->create(dirname(__FILE__) . '/../templates/intranet/index');
32
+        $smarty = $this->template->create(dirname(__FILE__).'/../templates/intranet/index');
33 33
         return $smarty->render($this, $data);
34 34
     }
35 35
 
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
         $modul = $this->getKernel()->module("intranetmaintenance");
41 41
         $translation = $this->getKernel()->getTranslation('intranetmaintenance');
42 42
 
43
-        $smarty = $this->template->create(dirname(__FILE__) . '/../templates/intranet/edit');
43
+        $smarty = $this->template->create(dirname(__FILE__).'/../templates/intranet/edit');
44 44
         return $smarty->render($this);
45 45
     }
46 46
 
Please login to merge, or discard this patch.
src/Intraface/modules/intranetmaintenance/Controller/Modules.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@
 block discarded – undo
15 15
     {
16 16
         $module = $this->getModule();
17 17
 
18
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/modules');
18
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/modules');
19 19
         return $smarty->render($this);
20 20
     }
21 21
 
Please login to merge, or discard this patch.
src/Intraface/modules/intranetmaintenance/Controller/User/Permission.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@
 block discarded – undo
15 15
         $module = $this->getKernel()->module("intranetmaintenance");
16 16
         $translation = $this->getKernel()->getTranslation('intranetmaintenance');
17 17
 
18
-        $smarty = $this->template->create(dirname(__FILE__) . '/../templates/user/permission');
18
+        $smarty = $this->template->create(dirname(__FILE__).'/../templates/user/permission');
19 19
         return $smarty->render($this);
20 20
     }
21 21
 
Please login to merge, or discard this patch.