intraface / intraface.dk

src/Intraface/modules/cms/Controller/Pages.php

Spacing +4 added lines, -4 removed lines

@@ -92,7 +92,7 @@ 
             'news' => $news
         );
 
-        $tpl = $this->template->create(dirname(__FILE__) . '/templates/pages');
+        $tpl = $this->template->create(dirname(__FILE__).'/templates/pages');
         return $tpl->render($this, $data);
     }
 
@@ -146,7 +146,7 @@ 
             'kernel' => $this->getKernel(),
             'cmspages' => $cmspages);
 
-        $tpl = $this->template->create(dirname(__FILE__) . '/templates/page-edit');
+        $tpl = $this->template->create(dirname(__FILE__).'/templates/page-edit');
         return $tpl->render($this, $data);
     }
 
@@ -158,12 +158,12 @@ 
 
         if ($cmspage->save($_POST)) {
             if (!empty($_POST['choose_file']) && $this->getKernel()->user->hasModuleAccess('filemanager')) {
-                return new k_SeeOther($this->url($cmspage->get('id') . '/filehandler/selectfile', array('images' => 1)));
+                return new k_SeeOther($this->url($cmspage->get('id').'/filehandler/selectfile', array('images' => 1)));
             } elseif (!empty($_POST['close'])) {
                 return new k_SeeOther($this->url($cmspage->get('id')));
             } elseif (!empty($_POST['add_keywords'])) {
                 $keyword_shared = $this->getKernel()->useShared('keyword');
-                return new k_SeeOther($this->url($cmspage->get('id') . '/keyword/connect'));
+                return new k_SeeOther($this->url($cmspage->get('id').'/keyword/connect'));
             } else {
                 return new k_SeeOther($this->url(null, array('type' => $cmspage->get('type'))));
             }

src/Intraface/modules/cms/Controller/Templates.php

Spacing +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
             'templates' => $templates
         );
 
-        $tpl = $this->template->create(dirname(__FILE__) . '/templates/templates');
+        $tpl = $this->template->create(dirname(__FILE__).'/templates/templates');
         return $tpl->render($this, $data);
     }
 
@@ -54,7 +54,7 @@ 
             'translation' => $this->getKernel()->getTranslation()
         );
 
-        $tpl = $this->template->create(dirname(__FILE__) . '/templates/template-edit');
+        $tpl = $this->template->create(dirname(__FILE__).'/templates/template-edit');
         return $tpl->render($this, $data);
     }
 

src/Intraface/modules/cms/HTML/Editor.php

Spacing +3 added lines, -3 removed lines

@@ -24,7 +24,7 @@ 
     function setEditor($editor)
     {
         if (!in_array($editor, $this->implemented_editors)) {
-            throw new Exception($editor . 'editor not implemented');
+            throw new Exception($editor.'editor not implemented');
         }
 
         $this->editor = $editor;
@@ -87,8 +87,8 @@ 
                     }
 
                     if (in_array('a', $this->allowed_tags)) {
-                        $button[]= 'link';
-                        $button[]= 'unlink';
+                        $button[] = 'link';
+                        $button[] = 'unlink';
                     }
 
                     if (in_array('ul', $this->allowed_tags)) {

src/Intraface/modules/cms/HTML_Parser.php

Spacing +4 added lines, -4 removed lines

@@ -58,7 +58,7 @@ 
                 $element['extra_style'] = ' style="'.$element['extra_style'].'"';
             }
 
-            $function =  'parse'.$element['type'] . 'Element';
+            $function = 'parse'.$element['type'].'Element';
             $output = $this->$function($element);
 
             $display .= '<div id="element-'.$element['id'].'"'.$element['extra_class'].$element['extra_style'].'>';
@@ -76,9 +76,9 @@ 
             } else {
                 $display .= '		<li><a href="'.url(null).'?action=move&amp;element_id='.$element['id'].'&amp;id='.$element['section_id'].'">'.$this->t('move').'</a></li>';
             }
-            $display .= '		<li><a class="confirm" href="' . url(null) . '?delete='.$element['id'].'">'.$this->t('delete').'</a></li>';
-            $display .=     '	</ul>';
-            $display .= '<div>' .           $output . '</div>';
+            $display .= '		<li><a class="confirm" href="'.url(null).'?delete='.$element['id'].'">'.$this->t('delete').'</a></li>';
+            $display .= '	</ul>';
+            $display .= '<div>'.$output.'</div>';
             $display .= '</div>';
         }
         return $display;

src/Intraface/modules/cms/CKEditor.php

Spacing +14 added lines, -14 removed lines

@@ -73,7 +73,7 @@ 
      * When %CKEditor is created with the editor() method, a HTML <textarea> element is created,
      * it will be displayed to anyone with JavaScript disabled or with incompatible browser.
      */
-    public $textareaAttributes = array( "rows" => 8, "cols" => 60 );
+    public $textareaAttributes = array("rows" => 8, "cols" => 60);
     /**
      * A string indicating the creation date of %CKEditor.
      * Do not change it unless you want to force browsers to not use previously cached version of %CKEditor.
@@ -133,9 +133,9 @@ 
     {
         $attr = "";
         foreach ($this->textareaAttributes as $key => $val) {
-            $attr.= " " . $key . '="' . str_replace('"', '"', $val) . '"';
+            $attr .= " ".$key.'="'.str_replace('"', '"', $val).'"';
         }
-        $out = "<textarea name=\"" . $name . "\"" . $attr . ">" . htmlspecialchars($value) . "</textarea>\n";
+        $out = "<textarea name=\"".$name."\"".$attr.">".htmlspecialchars($value)."</textarea>\n";
         if (!$this->initialized) {
             $out .= $this->init();
         }
@@ -234,11 +234,11 @@ 
             $classDetection = "";
             $js .= "CKEDITOR.replaceAll( function(textarea, config) {\n";
             if (!empty($className)) {
-                $js .= "    var classRegex = new RegExp('(?:^| )' + '". $className ."' + '(?:$| )');\n";
+                $js .= "    var classRegex = new RegExp('(?:^| )' + '".$className."' + '(?:$| )');\n";
                 $js .= "    if (!classRegex.test(textarea.className))\n";
                 $js .= "        return false;\n";
             }
-            $js .= "    CKEDITOR.tools.extend(config, ". $this->jsEncode($_config) .", true);";
+            $js .= "    CKEDITOR.tools.extend(config, ".$this->jsEncode($_config).", true);";
             $js .= "} );";
         }
 
@@ -412,7 +412,7 @@ 
                     }
                     // Return only new events
                     if (!in_array($code, $returnedEvents[$eventName])) {
-                        $out .= ($code ? "\n" : "") . "CKEDITOR.on('". $eventName ."', $code);";
+                        $out .= ($code ? "\n" : "")."CKEDITOR.on('".$eventName."', $code);";
                         $returnedEvents[$eventName][] = $code;
                     }
                 }
@@ -443,19 +443,19 @@ 
         $ckeditorPath = $this->ckeditorPath();
 
         if (!empty($this->timestamp) && $this->timestamp != "%"."TIMESTAMP%") {
-            $args = '?t=' . $this->timestamp;
+            $args = '?t='.$this->timestamp;
         }
 
         // Skip relative paths...
         if (strpos($ckeditorPath, '..') !== 0) {
-            $out .= $this->script("window.CKEDITOR_BASEPATH='". $ckeditorPath ."';");
+            $out .= $this->script("window.CKEDITOR_BASEPATH='".$ckeditorPath."';");
         }
 
-        $out .= "<script type=\"text/javascript\" src=\"" . $ckeditorPath . 'ckeditor.js' . $args . "\"></script>\n";
+        $out .= "<script type=\"text/javascript\" src=\"".$ckeditorPath.'ckeditor.js'.$args."\"></script>\n";
 
         $extraCode = "";
         if ($this->timestamp != self::timestamp) {
-            $extraCode .= ($extraCode ? "\n" : "") . "CKEDITOR.timestamp = '". $this->timestamp ."';";
+            $extraCode .= ($extraCode ? "\n" : "")."CKEDITOR.timestamp = '".$this->timestamp."';";
         }
         if ($extraCode) {
             $out .= $this->script($extraCode);
@@ -486,7 +486,7 @@ 
             /**
              * realpath — Returns canonicalized absolute pathname
              */
-            $realPath = realpath('./') ;
+            $realPath = realpath('./');
         }
 
         /**
@@ -546,7 +546,7 @@ 
 
                 $val = str_replace($jsonReplaces[0], $jsonReplaces[1], $val);
 
-                return '"' . $val . '"';
+                return '"'.$val.'"';
             }
         }
         $isList = true;
@@ -561,12 +561,12 @@ 
             foreach ($val as $v) {
                 $result[] = $this->jsEncode($v);
             }
-            return '[ ' . join(', ', $result) . ' ]';
+            return '[ '.join(', ', $result).' ]';
         } else {
             foreach ($val as $k => $v) {
                 $result[] = $this->jsEncode($k).': '.$this->jsEncode($v);
             }
-            return '{ ' . join(', ', $result) . ' }';
+            return '{ '.join(', ', $result).' }';
         }
     }
 }

src/Intraface/modules/cms/PageGateway.php

Spacing +7 added lines, -7 removed lines

@@ -40,7 +40,7 @@ 
         if ($this->dbquery) {
             return $this->dbquery;
         }
-        return ($this->dbquery = new Intraface_DBQuery($this->kernel, 'cms_page', 'cms_page.intranet_id = '.$this->kernel->intranet->get('id').' AND cms_page.active = 1 AND site_id = ' . $this->cmssite->get('id')));
+        return ($this->dbquery = new Intraface_DBQuery($this->kernel, 'cms_page', 'cms_page.intranet_id = '.$this->kernel->intranet->get('id').' AND cms_page.active = 1 AND site_id = '.$this->cmssite->get('id')));
     }
 
     function setDBQuery($dbquery)
@@ -50,7 +50,7 @@ 
 
     function findById($id)
     {
-        $this->db->query("SELECT id, site_id FROM cms_page WHERE id = " . (int)$id . " AND intranet_id = " . $this->kernel->intranet->get('id'));
+        $this->db->query("SELECT id, site_id FROM cms_page WHERE id = ".(int)$id." AND intranet_id = ".$this->kernel->intranet->get('id'));
         if (!$this->db->nextRecord()) {
             return false;
         }
@@ -64,13 +64,13 @@ 
         $identifier = strip_tags($identifier);
 
         if (!empty($identifier)) {
-            $this->db->query("SELECT site_id, id FROM cms_page WHERE identifier = '" . $identifier . "' AND intranet_id = " . $this->kernel->intranet->get('id') . " AND active = 1 AND site_id = " . $site_id);
+            $this->db->query("SELECT site_id, id FROM cms_page WHERE identifier = '".$identifier."' AND intranet_id = ".$this->kernel->intranet->get('id')." AND active = 1 AND site_id = ".$site_id);
         } else {
             // @todo choose the default page - vi skal lige have noget med publish og expire date her ogs�
-            $this->db->query("SELECT site_id, id FROM cms_page WHERE intranet_id = " . $this->kernel->intranet->get('id') . " AND active = 1 AND status_key = 1 AND site_id = " . $site_id . " ORDER BY position ASC LIMIT 1");
+            $this->db->query("SELECT site_id, id FROM cms_page WHERE intranet_id = ".$this->kernel->intranet->get('id')." AND active = 1 AND status_key = 1 AND site_id = ".$site_id." ORDER BY position ASC LIMIT 1");
         }
         if (!$this->db->nextRecord()) {
-            $this->db->query("SELECT site_id, id FROM cms_page WHERE id = " . (int)$identifier . " AND intranet_id = " . $this->kernel->intranet->get('id') . " AND active = 1 AND site_id = " . $site_id);
+            $this->db->query("SELECT site_id, id FROM cms_page WHERE id = ".(int)$identifier." AND intranet_id = ".$this->kernel->intranet->get('id')." AND active = 1 AND site_id = ".$site_id);
             if (!$this->db->nextRecord()) {
                 return false;
             }
@@ -211,8 +211,8 @@ 
                 // til google sitemaps
                 // sp�rgsm�let er om vi ikke skal starte et objekt op for hver pages
 
-                $pages[$i]['url'] = $this->cmssite->get('url') . $pages[$i]['identifier'] . '/';
-                $pages[$i]['url_self'] = $pages[$i]['identifier'] . '/';
+                $pages[$i]['url'] = $this->cmssite->get('url').$pages[$i]['identifier'].'/';
+                $pages[$i]['url_self'] = $pages[$i]['identifier'].'/';
                 $pages[$i]['changefreq'] = 'weekly';
                 $pages[$i]['priority'] = 0.5;
 

src/Intraface/modules/cms/element/Map.php

Spacing +3 added lines, -3 removed lines

@@ -35,7 +35,7 @@ 
                 $api = $this->get('api_key');
             }
 
-                $this->value['map']  = '<script type="text/javascript" src="http://api.maps.yahoo.com/ajaxymap?'.htmlentities('v=2.0&appid=' . $api) .'"></script>';
+                $this->value['map'] = '<script type="text/javascript" src="http://api.maps.yahoo.com/ajaxymap?'.htmlentities('v=2.0&appid='.$api).'"></script>';
                 /* flash version
                 $this->value['map'] .= '<script type="text/javascript">';
                 $this->value['map'] .= '    var latlon = new LatLon(' .$a['ResultSet']['Result']['Latitude'] . ', '. $a['ResultSet']['Result']['Longitude'].');';
@@ -51,7 +51,7 @@ 
                 $this->value['map'] .= '		var words = "title";';
                 $this->value['map'] .= '		marker.openSmartWindow(words);';
                 $this->value['map'] .= '	} ';
-                $this->value['map'] .= '	var latlon = new YGeoPoint(' .$this->get('latitude') . ', '. $this->get('longitude').');';
+                $this->value['map'] .= '	var latlon = new YGeoPoint('.$this->get('latitude').', '.$this->get('longitude').');';
                 $this->value['map'] .= '	var mymap = new  YMap(document.getElementById("mapContainer"));';
                 $this->value['map'] .= '	var marker = new YMarker(latlon);';
                 $this->value['map'] .= '	marker.addLabel("<b>A</b>"); ';
@@ -84,7 +84,7 @@ 
                 $this->value['map'] .= '    }';
                 $this->value['map'] .= '}';
                 $this->value['map'] .= 'load();';
-                $this->value['map'] .= '    var latlon = new YGeoPoint(' .$this->get('latitude') . ', '. $this->get('longitude').');';
+                $this->value['map'] .= '    var latlon = new YGeoPoint('.$this->get('latitude').', '.$this->get('longitude').');';
                 $this->value['map'] .= '    var mymap = new  YMap(document.getElementById("mapContainer"));';
                 $this->value['map'] .= '    var marker = new YMarker(latlon);';
                 $this->value['map'] .= '    marker.addLabel("<b>A</b>"); ';

src/Intraface/modules/cms/element/Delicious.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
         $url = parse_url($var['url']);
 
         // cleans up url
-        $var['url'] = $url['scheme'] . '://' . $url['host'] . $url['path'];
+        $var['url'] = $url['scheme'].'://'.$url['host'].$url['path'];
 
         $this->parameter->save('url', $var['url']);
 

src/Intraface/modules/cms/section/Mixed.php

Spacing +2 added lines, -2 removed lines

@@ -52,8 +52,8 @@
         $db = new DB_Sql;
         $db->query("SELECT id FROM cms_element
             WHERE intranet_id = ".$this->kernel->intranet->get('id')."
-                AND section_id = " . $this->id . "
-                AND active = 1 " . $sql_expire . $sql_publish . "
+                AND section_id = " . $this->id."
+                AND active = 1 " . $sql_expire.$sql_publish."
             ORDER BY position ASC");
         $i = 0;