intraface / intraface.dk

src/Intraface/modules/modulepackage/Controller/Process.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
         }
 
         // TODO: we need to find a better solution for this
-        $response = new k_TextResponse('Failure: ' . $action->error->view());
+        $response = new k_TextResponse('Failure: '.$action->error->view());
         $response->setStatus(400);
         return $response;
     }

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;

 

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

Braces +10 added lines, -5 removed lines

@@ -24,7 +24,9 @@ 
         $this->cmspage->kernel->useModule('filemanager');

         $this->value['picture'] = array();

 

-        if ($this->value['pic_id'] == 0) return;

+        if ($this->value['pic_id'] == 0) {
+            return;
+        }
 

 

         $filemanager = new FileHandler($this->cmspage->kernel, $this->value['pic_id']);

@@ -32,8 +34,7 @@ 
         if ($filemanager->get('id') > 0) {

             if ($size == 'original') {

                 $this->value['picture'] = $filemanager->get();

-            }

-            else {

+            } else {

                 $filemanager->createInstance($size);

                 $this->value['picture'] = $filemanager->instance->get();

 

@@ -43,7 +44,9 @@ 
 

     function validate_section(& $var) {

         $validator = new Intraface_Validator($this->error);

-        if (!empty($var['pic_id'])) $validator->isNumeric($var['pic_id'], 'error in pic_id', 'allow_empty');

+        if (!empty($var['pic_id'])) {
+            $validator->isNumeric($var['pic_id'], 'error in pic_id', 'allow_empty');
+        }
 

         if ($this->error->isError()) {

             return 0;

@@ -91,7 +94,9 @@ 
             $var['pic_id'] = $this->parameter->get('pic_id');

         }

         */

-        if (!empty($var['pic_id'])) $this->addParameter('pic_id', $var['pic_id']);

+        if (!empty($var['pic_id'])) {
+            $this->addParameter('pic_id', $var['pic_id']);
+        }
         return 1;

 

     }

src/Intraface/modules/cms/Parameter.php

Spacing +6 added lines, -6 removed lines

@@ -79,7 +79,7 @@ 
     public function save($parameter, $value)

     {

         if ($this->object->get('id') == 0) {

-            throw new Exception('Parameter::save() object cannot be 0 - problems in ' . get_class($this->object));

+            throw new Exception('Parameter::save() object cannot be 0 - problems in '.get_class($this->object));

         }

 

         # mangler noget validering - skal sikkert kunne s�ttes fra elementet?

@@ -91,13 +91,13 @@ 
 

         // hvis parameteren tidligere er oprettet opdateres den!

         if (!empty($old_parameter)) {

-            $db->query("UPDATE cms_parameter SET value='".$value."' WHERE type_key = ".$this->type_key." AND intranet_id = ".$this->object->kernel->intranet->get('id')." AND belong_to_id=". $this->object->get('id') . " AND parameter='".$parameter."'");

+            $db->query("UPDATE cms_parameter SET value='".$value."' WHERE type_key = ".$this->type_key." AND intranet_id = ".$this->object->kernel->intranet->get('id')." AND belong_to_id=".$this->object->get('id')." AND parameter='".$parameter."'");

         } elseif (!empty($value) AND empty($old_parameter)) {

             // hvis parameteren ikke findes oprettes den

             $db->query("INSERT INTO cms_parameter SET type_key=".$this->type_key.", belong_to_id = '".$this->object->get('id')."', parameter='".$parameter."', value='".$value."', intranet_id = ".$this->object->kernel->intranet->get('id'));

         } elseif (empty($value) AND !empty($old_parameter)) {

             // hvis parametervvalue er tom skal den gamle parameter slettes

-            $db->query("DELETE FROM cms_parameter WHERE belong_to_id = '".$this->object->get('id')."' AND parameter='".$parameter."' AND intranet_id = ".$this->object->kernel->intranet->get('id') . " AND type_key =" .$this->type_key);

+            $db->query("DELETE FROM cms_parameter WHERE belong_to_id = '".$this->object->get('id')."' AND parameter='".$parameter."' AND intranet_id = ".$this->object->kernel->intranet->get('id')." AND type_key =".$this->type_key);

         }

 

         $this->load();

@@ -114,14 +114,14 @@ 
     private function load()

     {

         if ($this->object->get('id') == 0) {

-            throw new Exception('Parameter::save() object cannot be 0 - problems with ' . get_class($this->object));

+            throw new Exception('Parameter::save() object cannot be 0 - problems with '.get_class($this->object));

         }

 

         $db = new DB_Sql;

-        $sql = "SELECT parameter, value FROM cms_parameter WHERE intranet_id = ".$this->object->kernel->intranet->get('id')." AND belong_to_id = " . $this->object->get('id') . " AND type_key = " . $this->type_key; //  . " AND parameter = '"  .$parameter . "'"

+        $sql = "SELECT parameter, value FROM cms_parameter WHERE intranet_id = ".$this->object->kernel->intranet->get('id')." AND belong_to_id = ".$this->object->get('id')." AND type_key = ".$this->type_key; //  . " AND parameter = '"  .$parameter . "'"

         $db->query($sql);

 

-        while($db->nextRecord()) {

+        while ($db->nextRecord()) {

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

         }

         $this->loaded = true;

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

Braces +15 added lines, -5 removed lines

@@ -49,9 +49,13 @@ 
     {

         $validator = new Intraface_Validator($this->error);

 

-        if (!empty($var['pic_text'])) $validator->isString($var['pic_text'], 'error in pic_text', '', 'allow_empty');

+        if (!empty($var['pic_text'])) {
+            $validator->isString($var['pic_text'], 'error in pic_text', '', 'allow_empty');
+        }
         //if (!empty($var['pic_id'])) $validator->isNumeric($var['pic_id'], 'error in pic_id', 'allow_empty');

-        if (!empty($var['pic_url'])) $validator->isString($var['pic_url'], 'error in pic_url', 'allow_empty');

+        if (!empty($var['pic_url'])) {
+            $validator->isString($var['pic_url'], 'error in pic_url', 'allow_empty');
+        }
 

         // st�rrelsen skal ogs� valideres

 

@@ -94,9 +98,15 @@ 
         if (isset($var['pic_id'])) {

             $this->parameter->save('pic_id', $var['pic_id']);

         }

-        if (!empty($var['pic_size'])) $this->parameter->save('pic_size', $var['pic_size']);

-        if (!empty($var['pic_text'])) $this->parameter->save('pic_text', $var['pic_text']);

-        if (!empty($var['pic_url'])) $this->parameter->save('pic_url', $var['pic_url']);

+        if (!empty($var['pic_size'])) {
+            $this->parameter->save('pic_size', $var['pic_size']);
+        }
+        if (!empty($var['pic_text'])) {
+            $this->parameter->save('pic_text', $var['pic_text']);
+        }
+        if (!empty($var['pic_url'])) {
+            $this->parameter->save('pic_url', $var['pic_url']);
+        }
 

         return true;

     }

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

Braces +3 added lines, -1 removed lines

@@ -52,7 +52,9 @@
             // @todo this should be avoided

             $filehandler->createInstance();

             // HACK lille hack - til at undg� at vi f�r filer med som ikke har beskrivelser (formentlig slettede filer)

-            if (!$filehandler->get('description')) continue;

+            if (!$filehandler->get('description')) {
+                continue;
+            }
             $this->value['files'][$i] = $filehandler->get();

             $this->value['files'][$i]['append_file_id'] = $append_file_id;

             // $this->value['pictures'][$i]['show_uri'] = $file_uri;

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

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
 

     protected function validate_element($var)

     {

-        if ($this->error->isError()){

+        if ($this->error->isError()) {

             return false;

         }

 

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

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
      */
     protected function validate_element($var)
     {
-        if ($this->error->isError()){
+        if ($this->error->isError()) {
             return false;
         }
 

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>"); ';

Braces +21 added lines, -7 removed lines

@@ -121,13 +121,27 @@
 

     function save_element($var)

     {

-        if (!empty($var['service'])) $this->parameter->save('service', $var['service']);

-        if (!empty($var['text'])) $this->parameter->save('text', $var['text']);

-        if (!empty($var['latitude'])) $this->parameter->save('latitude', $var['latitude']);

-        if (!empty($var['longitude'])) $this->parameter->save('longitude', $var['longitude']);

-        if (!empty($var['height'])) $this->parameter->save('height', $var['height']);

-        if (!empty($var['width'])) $this->parameter->save('width', $var['width']);

-        if (!empty($var['api_key'])) $this->parameter->save('api_key', $var['api_key']);

+        if (!empty($var['service'])) {
+            $this->parameter->save('service', $var['service']);
+        }
+        if (!empty($var['text'])) {
+            $this->parameter->save('text', $var['text']);
+        }
+        if (!empty($var['latitude'])) {
+            $this->parameter->save('latitude', $var['latitude']);
+        }
+        if (!empty($var['longitude'])) {
+            $this->parameter->save('longitude', $var['longitude']);
+        }
+        if (!empty($var['height'])) {
+            $this->parameter->save('height', $var['height']);
+        }
+        if (!empty($var['width'])) {
+            $this->parameter->save('width', $var['width']);
+        }
+        if (!empty($var['api_key'])) {
+            $this->parameter->save('api_key', $var['api_key']);
+        }
         return true;

     }

 }
\ No newline at end of file