Completed
Push — master ( d208aa...25518b )
by Lars
12:37
created
src/intraface.dk/demo/main.tpl.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@
 block discarded – undo
8 8
         <style type="text/css">
9 9
         <?php foreach ($context->document()->styles() as $style) : ?>
10 10
             @import "<?php e($style); ?>";
11
-        <?php endforeach;?>
11
+        <?php endforeach; ?>
12 12
         </style>
13 13
      </head>
14 14
 
Please login to merge, or discard this patch.
src/intraface.dk/demo/Demo/CMS/Show.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
 
21 21
     function renderHtml()
22 22
     {
23
-        return get_class($this) . ' intentionally left blank';
23
+        return get_class($this).' intentionally left blank';
24 24
     }
25 25
 
26 26
     public function getPathToTemplate($template)
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
             "private_key" => $this->context->getPrivateKey(),
35 35
             "session_id" => md5($this->session()->sessionId()));
36 36
         $debug = true;
37
-        $client = new IntrafacePublic_CMS_Client_XMLRPC($credentials, $this->name(), $debug, INTRAFACE_XMLPRC_SERVER_PATH . "cms/server0300.php");
37
+        $client = new IntrafacePublic_CMS_Client_XMLRPC($credentials, $this->name(), $debug, INTRAFACE_XMLPRC_SERVER_PATH."cms/server0300.php");
38 38
         return new IntrafacePublic_CMS($client, $this->cache);
39 39
     }
40 40
 }
Please login to merge, or discard this patch.
src/Intraface/Page.php 2 patches
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -227,20 +227,20 @@
 block discarded – undo
227 227
     {
228 228
         return array(
229 229
             1 => array(
230
-              'label' => 'system',
231
-              'dir' => '/system/',
230
+                'label' => 'system',
231
+                'dir' => '/system/',
232 232
                     'name' => 'Web 2.0',
233 233
                     'description' => 'Spr�lsk, vildt og pastel.'
234 234
             ),
235 235
             2 => array(
236
-              'label' => 'newsystem',
237
-              'dir' => '/newsystem/',
236
+                'label' => 'newsystem',
237
+                'dir' => '/newsystem/',
238 238
                     'name' => 'Standard',
239 239
                     'description' => 'Standard.'
240 240
             ),
241 241
             3 => array(
242
-              'label' => 'black',
243
-              'dir' => '/black/',
242
+                'label' => 'black',
243
+                'dir' => '/black/',
244 244
                     'name' => 'Den sorte ridder',
245 245
                     'description' => 'Det gamle tema. Nydeligt og kedeligt.'
246 246
             )
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
         foreach ($res->fetchAll() as $row) {
96 96
             if ($this->kernel->user->hasModuleAccess($row['name'])) {
97 97
                 $this->menu[$i]['name'] = $this->t($row['name'], $row['name']);
98
-                $this->menu[$i]['url'] = url('/core/restricted/module/' . $row["name"]);
98
+                $this->menu[$i]['url'] = url('/core/restricted/module/'.$row["name"]);
99 99
                 $i++;
100 100
             }
101 101
         }
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
 
135 135
                     if ($access) {
136 136
                         $this->submenu[$j]['name'] = $this->t($all_submenu[$i]['label'], $this->primary_module->getName());
137
-                        $this->submenu[$j]['url'] = $this->primary_module->getPath(). $all_submenu[$i]['url'];
137
+                        $this->submenu[$j]['url'] = $this->primary_module->getPath().$all_submenu[$i]['url'];
138 138
                         $j++;
139 139
                     }
140 140
                 }
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
             $javascript = '';
145 145
         if (!empty($this->javascript_path) and count($this->javascript_path) > 0) {
146 146
             for ($i = 0, $max = count($this->javascript_path); $i < $max; $i++) {
147
-                $javascript .= '<script type="text/javascript" src="'.$this->javascript_path[$i].'"></script>' . "\n";
147
+                $javascript .= '<script type="text/javascript" src="'.$this->javascript_path[$i].'"></script>'."\n";
148 148
             }
149 149
         }
150 150
             /*
Please login to merge, or discard this patch.
src/Intraface/NewAddress.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
             throw new Exception('Der er mere end 1 aktiv adresse', FATAL);
123 123
         } elseif ($this->db->nextRecord()) {
124 124
             $this->value['address_id'] = $this->db->f('id');
125
-            for ($i = 0, $max = count($this->fields); $i<$max; $i++) {
125
+            for ($i = 0, $max = count($this->fields); $i < $max; $i++) {
126 126
                 $this->value[$this->fields[$i]] = $this->db->f($this->fields[$i]);
127 127
             }
128 128
             return $this->db->f('id');
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
             $db->query("SELECT * FROM address WHERE id = ".$this->address_id);
150 150
             if ($db->nextRecord()) {
151 151
                 $do_update = 0;
152
-                for ($i = 0, $max = count($this->fields), $sql=''; $i<$max; $i++) {
152
+                for ($i = 0, $max = count($this->fields), $sql = ''; $i < $max; $i++) {
153 153
                     if (array_key_exists($this->fields[$i], $array_var) and isset($array_var[$this->fields[$i]])) {
154 154
                         $sql .= $this->fields[$i]." = '".$array_var[$this->fields[$i]]."', ";
155 155
                         if ($db->f($this->fields[$i]) != $array_var[$this->fields[$i]]) {
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
             } else {
163 163
                 // Kun hvis der rent faktisk gemmes nogle v�rdier opdaterer vi
164 164
                 $do_update = 0;
165
-                for ($i = 0, $max = count($this->fields), $sql = ''; $i<$max; $i++) {
165
+                for ($i = 0, $max = count($this->fields), $sql = ''; $i < $max; $i++) {
166 166
                     if (array_key_exists($this->fields[$i], $array_var) and isset($array_var[$this->fields[$i]])) {
167 167
                         $sql .= $this->fields[$i]." = '".$array_var[$this->fields[$i]]."', ";
168 168
                         $do_update = 1;
@@ -205,7 +205,7 @@  discard block
 block discarded – undo
205 205
         } elseif ($this->id == 0) {
206 206
             throw new Exception("Id kan ikke v�re 0 n�r du fors�ger at gemme adresse", FATAL);
207 207
         } else {
208
-            for ($i = 0, $max = count($this->fields), $sql = ''; $i<$max; $i++) {
208
+            for ($i = 0, $max = count($this->fields), $sql = ''; $i < $max; $i++) {
209 209
                 if (isset($array_var[$this->fields[$i]])) {
210 210
                     $sql .= $this->fields[$i]." = \"".$array_var[$this->fields[$i]]."\", ";
211 211
                 } else {
Please login to merge, or discard this patch.
src/Intraface/functions.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -196,7 +196,7 @@
 block discarded – undo
196 196
 function intrafaceBackendErrorhandler($errno, $errstr, $errfile, $errline, $errcontext)
197 197
 {
198 198
     if (!defined('ERROR_LOG')) {
199
-        define('ERROR_LOG', dirname(__FILE__) . '/../log/error.log');
199
+        define('ERROR_LOG', dirname(__FILE__).'/../log/error.log');
200 200
     }
201 201
     $errorhandler = new ErrorHandler;
202 202
     if (!defined('ERROR_LEVEL_CONTINUE_SCRIPT')) {
Please login to merge, or discard this patch.
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -58,6 +58,7 @@
 block discarded – undo
58 58
     /**
59 59
      * This function is dynamically redefinable.
60 60
      * @see $GLOBALS['_global_function_callback_email']
61
+     * @param string $args
61 62
      */
62 63
     function autoop($args)
63 64
     {
Please login to merge, or discard this patch.
src/Intraface/common.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -10,32 +10,32 @@  discard block
 block discarded – undo
10 10
  * @version @package-version@
11 11
  */
12 12
 // required files
13
-require_once dirname(__FILE__) . '/../../vendor/autoload.php';
13
+require_once dirname(__FILE__).'/../../vendor/autoload.php';
14 14
 require_once 'Intraface/functions.php';
15 15
 
16 16
 // paths
17 17
 if (!defined('PATH_INCLUDE_IHTML')) {
18
-    define('PATH_INCLUDE_IHTML', PATH_ROOT.'Intraface/ihtml' . DIRECTORY_SEPARATOR);
18
+    define('PATH_INCLUDE_IHTML', PATH_ROOT.'Intraface/ihtml'.DIRECTORY_SEPARATOR);
19 19
 }
20 20
 if (!defined('PATH_INCLUDE_MODULE')) {
21
-    define('PATH_INCLUDE_MODULE', PATH_ROOT.'Intraface/modules' . DIRECTORY_SEPARATOR);
21
+    define('PATH_INCLUDE_MODULE', PATH_ROOT.'Intraface/modules'.DIRECTORY_SEPARATOR);
22 22
 }
23 23
 if (!defined('PATH_INCLUDE_SHARED')) {
24
-    define('PATH_INCLUDE_SHARED', PATH_ROOT.'Intraface/shared' . DIRECTORY_SEPARATOR);
24
+    define('PATH_INCLUDE_SHARED', PATH_ROOT.'Intraface/shared'.DIRECTORY_SEPARATOR);
25 25
 }
26 26
 if (!defined('PATH_INCLUDE_CONFIG')) {
27 27
     define('PATH_INCLUDE_CONFIG', PATH_ROOT.'/Intraface/config'.DIRECTORY_SEPARATOR);
28 28
 }
29 29
 if (!defined('PATH_UPLOAD')) {
30
-    define('PATH_UPLOAD', PATH_ROOT . 'upload/'); // Directory for upload of files.
30
+    define('PATH_UPLOAD', PATH_ROOT.'upload/'); // Directory for upload of files.
31 31
 }if (!defined('PATH_UPLOAD_TEMPORARY')) {
32 32
     define('PATH_UPLOAD_TEMPORARY', 'tempdir/'); // Mappen i Upload_path, under intranetid, hvor temp-filer placeres.
33 33
 }if (!defined('PATH_CAPTCHA')) {
34
-    define('PATH_CAPTCHA', PATH_ROOT . 'captcha/'); // remember trailing slash - used for the demo formular
34
+    define('PATH_CAPTCHA', PATH_ROOT.'captcha/'); // remember trailing slash - used for the demo formular
35 35
 }if (!defined('PATH_CACHE')) {
36
-    define('PATH_CACHE', PATH_ROOT . 'cache/'); // remember trailing slash - path to cache
36
+    define('PATH_CACHE', PATH_ROOT.'cache/'); // remember trailing slash - path to cache
37 37
 }if (!defined('PATH_INCLUDE_BACKUP')) {
38
-    define('PATH_INCLUDE_BACKUP', PATH_ROOT . 'backup/');
38
+    define('PATH_INCLUDE_BACKUP', PATH_ROOT.'backup/');
39 39
 }
40 40
 
41 41
 // paths on www
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
     define('PATH_WWW_MODULE', PATH_WWW.'modules/');
45 45
     define('PATH_WWW_SHARED', PATH_WWW.'shared/');
46 46
     // filehandler
47
-    define('FILE_VIEWER', PATH_WWW . 'file');
47
+    define('FILE_VIEWER', PATH_WWW.'file');
48 48
 }
49 49
 
50 50
 // wiring
Please login to merge, or discard this patch.
src/Intraface/Keyword/templates/connect.tpl.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@  discard block
 block discarded – undo
1
-<h1><?php e(t('Add keywords to') . ' ' . $object->get('name')); ?></h1>
1
+<h1><?php e(t('Add keywords to').' '.$object->get('name')); ?></h1>
2 2
 
3 3
 <?php echo $keyword->error->view(); ?>
4 4
 
@@ -16,8 +16,8 @@  discard block
 block discarded – undo
16 16
                 } ?>
17 17
                 />
18 18
                 <label for="k<?php e($k["id"]); ?>">
19
-                    <a href="<?php e(url('../' . $k['id'])); ?>"><?php e($k['keyword']); ?> (#<?php e($k["id"]); ?>)</a></label>
20
-                    - <a href="<?php e(url('../'. $k["id"], array('delete'))); ?>" class="confirm"><?php e(t('delete')); ?></a><br />
19
+                    <a href="<?php e(url('../'.$k['id'])); ?>"><?php e($k['keyword']); ?> (#<?php e($k["id"]); ?>)</a></label>
20
+                    - <a href="<?php e(url('../'.$k["id"], array('delete'))); ?>" class="confirm"><?php e(t('delete')); ?></a><br />
21 21
         <?php                                                                                                                                                                                                                     }
22 22
         ?>
23 23
     </fieldset>
Please login to merge, or discard this patch.
src/Intraface/Log.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -64,12 +64,12 @@
 block discarded – undo
64 64
         $result = $this->db->createTable($this->table_name, $this->table_definition);
65 65
 
66 66
         if (PEAR::isError($result)) {
67
-            throw new Exception('create ' . $result->getMessage());
67
+            throw new Exception('create '.$result->getMessage());
68 68
         }
69 69
 
70 70
         $result = $this->db->createConstraint($this->table_name, 'PRIMARY', $this->definition);
71 71
         if (PEAR::isError($result)) {
72
-            throw new Exception('primary ' . $result->getMessage());
72
+            throw new Exception('primary '.$result->getMessage());
73 73
         }
74 74
     }
75 75
 
Please login to merge, or discard this patch.
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -6,6 +6,9 @@  discard block
 block discarded – undo
6 6
 
7 7
 interface Observer
8 8
 {
9
+    /**
10
+     * @return boolean
11
+     */
9 12
     function update($code, $msg);
10 13
 }
11 14
 
@@ -47,6 +50,9 @@  discard block
 block discarded – undo
47 50
         }
48 51
     }
49 52
 
53
+    /**
54
+     * @param string $table
55
+     */
50 56
     function tableExists($table)
51 57
     {
52 58
         $this->db->loadModule('Manager', null, true);
Please login to merge, or discard this patch.
src/Intraface/Filehandler/templates/ckeditor.tpl.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@
 block discarded – undo
58 58
                 }
59 59
                 echo '<li style="display: inline; margin-left: 20px;"><label for="keyword_'.$value['id'].'"><input type="checkbox" name="keyword[]" value="'.$value['id'].'" id="keyword_'.$value['id'].'" '.$checked.' />&nbsp;'.$value['keyword'].'</label></li>';
60 60
             }
61
-              echo '</ul></div>';
61
+                echo '</ul></div>';
62 62
         }
63 63
     ?>
64 64
 
Please login to merge, or discard this patch.