intraface / intraface.dk

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

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
     {
         $this->value['search'] = $this->parameter->get('search');
         $this->value['number'] = $this->parameter->get('number');
-        $twitterSearch  = new Zend_Service_Twitter_Search('json');
+        $twitterSearch = new Zend_Service_Twitter_Search('json');
         $this->value['results'] = serialize($twitterSearch->search($this->parameter->get('search'), array('rpp' => $this->parameter->get('number'))));
     }
 

src/Intraface/modules/cms/SectionGateway.php

Spacing +5 added lines, -5 removed lines

@@ -15,7 +15,7 @@ 
     {
         // validering p� value // kun v�re gyldige elementtyper
         // object skal vre cmspage
-        $class = $this->class_prefix . ucfirst($type);
+        $class = $this->class_prefix.ucfirst($type);
         return new $class($page);
     }
 
@@ -25,12 +25,12 @@ 
         $cms_module = $this->kernel->getModule('cms');
         $section_types = $cms_module->getSetting('section_types');
 
-        $this->db->query("SELECT id, page_id, type_key FROM cms_section WHERE id = " . $id . " AND intranet_id = " . $this->kernel->intranet->get('id'));
+        $this->db->query("SELECT id, page_id, type_key FROM cms_section WHERE id = ".$id." AND intranet_id = ".$this->kernel->intranet->get('id'));
 
         if (!$this->db->nextRecord()) {
             return false;
         }
-        $class = $this->class_prefix . ucfirst($section_types[$this->db->f('type_key')]);
+        $class = $this->class_prefix.ucfirst($section_types[$this->db->f('type_key')]);
         return new $class(CMS_Page::factory($this->kernel, 'id', $this->db->f('page_id')), $this->db->f('id'));
 
     }
@@ -41,11 +41,11 @@ 
         $cms_module = $this->kernel->getModule('cms');
         $section_types = $cms_module->getSetting('section_types');
 
-        $this->db->query("SELECT id, page_id, type_key FROM cms_section WHERE id = " . $id . " AND intranet_id = " . $this->kernel->intranet->get('id'));
+        $this->db->query("SELECT id, page_id, type_key FROM cms_section WHERE id = ".$id." AND intranet_id = ".$this->kernel->intranet->get('id'));
         if (!$this->db->nextRecord()) {
             return false;
         }
-        $class = $this->class_prefix . ucfirst($section_types[$this->db->f('type_key')]);
+        $class = $this->class_prefix.ucfirst($section_types[$this->db->f('type_key')]);
         return new $class($page, $this->db->f('id'));
     }
 

src/Intraface/modules/cms/MainCms.php

Indentation +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
 

         $this->addPreloadFile('Section.php');

 

-         $this->includeSettingFile('settings.php');

+            $this->includeSettingFile('settings.php');

 

         $this->addSetting('status', array(

             1 => 'draft',

src/Intraface/modules/cms/Site.php

Spacing +7 added lines, -7 removed lines

@@ -71,14 +71,14 @@ 
 

         if ($this->id > 0) {

             $sql_type = "UPDATE ";

-            $sql_end = " WHERE id = " . $this->id;

+            $sql_end = " WHERE id = ".$this->id;

         } else {

             $sql_type = "INSERT INTO ";

             $sql_end = " , date_created = NOW()";

         }

 

         $db = new DB_Sql;

-        $db->query($sql_type . " cms_site

+        $db->query($sql_type." cms_site

             SET intranet_id = ".$this->kernel->intranet->get('id').",

             name = '".$var['name']."',

             url = '".$var['url']."',

@@ -88,7 +88,7 @@ 
             $this->id = $db->insertedId();

         }

 

-        $this->kernel->setting->set('intranet', 'cc_license', intval($var['cc_license']), 'site_id_' . $this->id);

+        $this->kernel->setting->set('intranet', 'cc_license', intval($var['cc_license']), 'site_id_'.$this->id);

 

         $this->load();

 

@@ -98,14 +98,14 @@ 
     function load()

     {

         $db = new DB_Sql;

-        $db->query("SELECT id, name, url FROM cms_site WHERE id = " . $this->id . " AND intranet_id = ".$this->kernel->intranet->get('id')." LIMIT 1");

+        $db->query("SELECT id, name, url FROM cms_site WHERE id = ".$this->id." AND intranet_id = ".$this->kernel->intranet->get('id')." LIMIT 1");

         if (!$db->nextRecord()) {

             return 0;

         }

         $this->value['id'] = $db->f('id');

         $this->value['name'] = $db->f('name');

         $this->value['url'] = $db->f('url');

-        $this->value['cc_license'] = $this->kernel->setting->get('intranet', 'cc_license', 'site_id_' . $this->get('id'));

+        $this->value['cc_license'] = $this->kernel->setting->get('intranet', 'cc_license', 'site_id_'.$this->get('id'));

 

     }

 

@@ -116,14 +116,14 @@ 
             return 0;

         }

         $db = new Db_Sql;

-        $db->query("UPDATE cms_site SET active = 0 WHERE intranet_id=".$this->kernel->intranet->get('id')." AND id = " . $this->id);

+        $db->query("UPDATE cms_site SET active = 0 WHERE intranet_id=".$this->kernel->intranet->get('id')." AND id = ".$this->id);

         return 1;

     }

 

     function getList()

     {

         $db = new DB_Sql;

-        $db->query("SELECT id, name FROM cms_site WHERE intranet_id = " . $this->kernel->intranet->get('id'). " AND active = 1");

+        $db->query("SELECT id, name FROM cms_site WHERE intranet_id = ".$this->kernel->intranet->get('id')." AND active = 1");

         $i = 0;

         $sites = array();

         while ($db->nextRecord()) {

src/Intraface/modules/cms/TemplateGateway.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
     function findById($id)
     {
-                $this->db->query("SELECT site_id, id FROM cms_template WHERE id = " . $id . " AND intranet_id = " . $this->kernel->intranet->get('id'));
+                $this->db->query("SELECT site_id, id FROM cms_template WHERE id = ".$id." AND intranet_id = ".$this->kernel->intranet->get('id'));
                 if (!$this->db->nextRecord()) {
                     return false;
                 }

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.
@@ -132,9 +132,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();
         }
@@ -235,11 +235,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 .= "} );";
 
         }
@@ -418,7 +418,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;
                     }
                 }
@@ -449,19 +449,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);
@@ -493,7 +493,7 @@ 
             /**
              * realpath — Returns canonicalized absolute pathname
              */
-            $realPath = realpath( './' ) ;
+            $realPath = realpath('./');
         }
 
         /**
@@ -556,7 +556,7 @@ 
 
                 $val = str_replace($jsonReplaces[0], $jsonReplaces[1], $val);
 
-                return '"' . $val . '"';
+                return '"'.$val.'"';
             }
         }
         $isList = true;
@@ -572,12 +572,12 @@ 
         if ($isList)
         {
             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).' }';
         }
     }
 }

Braces +21 added lines, -26 removed lines

@@ -142,10 +142,11 @@ 
         $_config = $this->configSettings($config, $events);
 
         $js = $this->returnGlobalEvents();
-        if (!empty($_config))
-            $js .= "CKEDITOR.replace('".$name."', ".$this->jsEncode($_config).");";
-        else
-            $js .= "CKEDITOR.replace('".$name."');";
+        if (!empty($_config)) {
+                    $js .= "CKEDITOR.replace('".$name."', ".$this->jsEncode($_config).");";
+        } else {
+                    $js .= "CKEDITOR.replace('".$name."');";
+        }
 
         $out .= $this->script($js);
 
@@ -182,8 +183,7 @@ 
         $js = $this->returnGlobalEvents();
         if (!empty($_config)) {
             $js .= "CKEDITOR.replace('".$id."', ".$this->jsEncode($_config).");";
-        }
-        else {
+        } else {
             $js .= "CKEDITOR.replace('".$id."');";
         }
         $out .= $this->script($js);
@@ -226,12 +226,10 @@ 
         if (empty($_config)) {
             if (empty($className)) {
                 $js .= "CKEDITOR.replaceAll();";
-            }
-            else {
+            } else {
                 $js .= "CKEDITOR.replaceAll('".$className."');";
             }
-        }
-        else {
+        } else {
             $classDetection = "";
             $js .= "CKEDITOR.replaceAll( function(textarea, config) {\n";
             if (!empty($className)) {
@@ -289,8 +287,7 @@ 
     {
         if (!empty($event)) {
             $this->events[$event] = array();
-        }
-        else {
+        } else {
             $this->events = array();
         }
     }
@@ -329,8 +326,7 @@ 
     {
         if (!empty($event)) {
             $this->globalEvents[$event] = array();
-        }
-        else {
+        } else {
             $this->globalEvents = array();
         }
     }
@@ -381,11 +377,9 @@ 
             foreach ($_events as $eventName => $handlers) {
                 if (empty($handlers)) {
                     continue;
-                }
-                else if (count($handlers) == 1) {
+                } else if (count($handlers) == 1) {
                     $_config['on'][$eventName] = '@@'.$handlers[0];
-                }
-                else {
+                } else {
                     $_config['on'][$eventName] = '@@function (ev){';
                     foreach ($handlers as $handler => $code) {
                         $_config['on'][$eventName] .= '('.$code.')(ev);';
@@ -488,8 +482,7 @@ 
          */
         if (isset($_SERVER['SCRIPT_FILENAME'])) {
             $realPath = dirname($_SERVER['SCRIPT_FILENAME']);
-        }
-        else {
+        } else {
             /**
              * realpath — Returns canonicalized absolute pathname
              */
@@ -544,8 +537,7 @@ 
             // Use @@ to not use quotes when outputting string value
             if (strpos($val, '@@') === 0) {
                 return substr($val, 2);
-            }
-            else {
+            } else {
                 // All scalars are converted to strings to avoid indeterminism.
                 // PHP's "1" and 1 are equal for all PHP operators, but
                 // JS's "1" and 1 are not. So if we pass "1" or 1 from the PHP backend,
@@ -571,12 +563,15 @@ 
         $result = array();
         if ($isList)
         {
-            foreach ($val as $v) $result[] = $this->jsEncode($v);
+            foreach ($val as $v) {
+                $result[] = $this->jsEncode($v);
+            }
             return '[ ' . join(', ', $result) . ' ]';
-        }
-        else
+        } else
         {
-            foreach ($val as $k => $v) $result[] = $this->jsEncode($k).': '.$this->jsEncode($v);
+            foreach ($val as $k => $v) {
+                $result[] = $this->jsEncode($k).': '.$this->jsEncode($v);
+            }
             return '{ ' . join(', ', $result) . ' }';
         }
     }

src/Intraface/modules/cms/SiteGateway.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 
     function getAll()
     {
-        $this->db->query("SELECT id, name FROM cms_site WHERE intranet_id = " . $this->kernel->intranet->get('id'). " AND active = 1");
+        $this->db->query("SELECT id, name FROM cms_site WHERE intranet_id = ".$this->kernel->intranet->get('id')." AND active = 1");
         $i = 0;
         $sites = array();
         while ($this->db->nextRecord()) {

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

Indentation +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
     function map($name)
     {
         if (is_numeric($name)) {
-             return 'Intraface_modules_cms_Controller_TemplateSectionEdit';
+                return 'Intraface_modules_cms_Controller_TemplateSectionEdit';
         } elseif ($name == 'create') {
             return 'Intraface_modules_cms_Controller_TemplateSectionEdit';
         }

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

Spacing +4 added lines, -4 removed lines

@@ -55,7 +55,7 @@ 
             'translation' => $this->getKernel()->getTranslation('cms')
         );
 
-        $tpl = $this->template->create(dirname(__FILE__) . '/templates/section-html-edit');
+        $tpl = $this->template->create(dirname(__FILE__).'/templates/section-html-edit');
         return $tpl->render($this, $data);
     }
 
@@ -72,11 +72,11 @@ 
                 $redirect = Intraface_Redirect::factory($this->getKernel(), 'go');
                 $module_filemanager = $this->getKernel()->useModule('filemanager');
                 if ($element->get('type') == 'picture') {
-                    return new k_SeeOther($this->url($element->get('id') . '/filehandler/selectfile', array('images' => 1)));
+                    return new k_SeeOther($this->url($element->get('id').'/filehandler/selectfile', array('images' => 1)));
                 } elseif ($element->get('type') == 'gallery') {
-                    return new k_SeeOther($this->url($element->get('id') . '/filehandler/selectfile', array('images' => 1, 'multiple_choice' => 'true')));
+                    return new k_SeeOther($this->url($element->get('id').'/filehandler/selectfile', array('images' => 1, 'multiple_choice' => 'true')));
                 } elseif ($element->get('type') == 'filelist') {
-                    return new k_SeeOther($this->url($element->get('id') . '/filehandler/selectfile', array('images' => 0, 'multiple_choice' => 'true')));
+                    return new k_SeeOther($this->url($element->get('id').'/filehandler/selectfile', array('images' => 0, 'multiple_choice' => 'true')));
                 } else {
                     throw new Exception("Det er ikke en gyldig elementtype til at lave redirect fra");
                 }