zikula / core

src/system/SecurityCenterModule/DependencyInjection/ZikulaSecurityCenterExtension.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
      */
     public function load(array $configs, ContainerBuilder $container)
     {
-        $loader = new YamlFileLoader($container, new FileLocator(realpath(__DIR__.'/../Resources/config')));
+        $loader = new YamlFileLoader($container, new FileLocator(realpath(__DIR__ . '/../Resources/config')));
 
         $loader->load('services.yml');
     }

src/system/AdminModule/Api/AdminApi.php

Spacing +1 added lines, -1 removed lines

@@ -391,7 +391,7 @@
 
         $mpath = ModUtil::getModuleRelativePath($modinfo['name']);
         if ($mpath) {
-            $path = $mpath.'/Resources/public/css';
+            $path = $mpath . '/Resources/public/css';
         }
 
         if ((isset($path) && is_dir($dir = $path))

src/system/AdminModule/DependencyInjection/ZikulaAdminExtension.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
      */
     public function load(array $configs, ContainerBuilder $container)
     {
-        $loader = new YamlFileLoader($container, new FileLocator(realpath(__DIR__.'/../Resources/config')));
+        $loader = new YamlFileLoader($container, new FileLocator(realpath(__DIR__ . '/../Resources/config')));
 
         $loader->load('services.yml');
     }

src/system/AdminModule/Controller/AdminController.php

Spacing +1 added lines, -1 removed lines

@@ -351,7 +351,7 @@
 
                 $linkCollection = $this->get('zikula.link_container_collector')->getLinks($adminModule['name'], 'admin');
                 $links = (false == $linkCollection)
-                    ? (array) ModUtil::apiFunc($adminModule['name'], 'admin', 'getLinks')
+                    ? (array)ModUtil::apiFunc($adminModule['name'], 'admin', 'getLinks')
                     : $linkCollection
                 ;
 

src/system/AdminModule/Controller/AdminInterfaceController.php

Spacing +2 added lines, -2 removed lines

@@ -184,9 +184,9 @@
                     $ldir = dirname(__FILE__);
                     $p = strpos($ldir, DIRECTORY_SEPARATOR . 'system'); // we are in system/AdminModule
                     $b = substr($ldir, 0, $p);
-                    $filePath = $b.'/'.$appDir.'/.htaccess';
+                    $filePath = $b . '/' . $appDir . '/.htaccess';
                 } else {
-                    $filePath = $appDir.'/.htaccess';
+                    $filePath = $appDir . '/.htaccess';
                 }
                 $app_htaccess = file_exists($filePath);
             }

src/javascript/jscalendar/calendar.php

Indentation +13 added lines, -13 removed lines

@@ -49,40 +49,40 @@
 
     function get_load_files_code() {
         $code  = ( '<link rel="stylesheet" type="text/css" media="all" href="' .
-                   $this->calendar_lib_path . $this->calendar_theme_file .
-                   '" />' . NEWLINE );
+                    $this->calendar_lib_path . $this->calendar_theme_file .
+                    '" />' . NEWLINE );
         $code .= ( '<script type="text/javascript" src="' .
-                   $this->calendar_lib_path . $this->calendar_file .
-                   '"></script>' . NEWLINE );
+                    $this->calendar_lib_path . $this->calendar_file .
+                    '"></script>' . NEWLINE );
         $code .= ( '<script type="text/javascript" src="' .
-                   $this->calendar_lib_path . $this->calendar_lang_file .
-                   '"></script>' . NEWLINE );
+                    $this->calendar_lib_path . $this->calendar_lang_file .
+                    '"></script>' . NEWLINE );
         $code .= ( '<script type="text/javascript" src="' .
-                   $this->calendar_lib_path . $this->calendar_setup_file .
-                   '"></script>' );
+                    $this->calendar_lib_path . $this->calendar_setup_file .
+                    '"></script>' );
         return $code;
     }
 
     function _make_calendar($other_options = array()) {
         $js_options = $this->_make_js_hash(array_merge($this->calendar_options, $other_options));
         $code  = ( '<script type="text/javascript">Calendar.setup({' .
-                   $js_options .
-                   '});</script>' );
+                    $js_options .
+                    '});</script>' );
         return $code;
     }
 
     function make_input_field($cal_options = array(), $field_attributes = array()) {
         $id = $this->_gen_id();
         $attrstr = $this->_make_html_attr(array_merge($field_attributes,
-                                                      array('id'   => $this->_field_id($id),
+                                                        array('id'   => $this->_field_id($id),
                                                             'type' => 'text')));
         echo '<input ' . $attrstr .'/>';
         echo '<a href="#" id="'. $this->_trigger_id($id) . '">' .
             '<img align="middle" border="0" src="' . $this->calendar_lib_path . 'img.gif" alt="" /></a>';
 
         $options = array_merge($cal_options,
-                               array('inputField' => $this->_field_id($id),
-                                     'button'     => $this->_trigger_id($id)));
+                                array('inputField' => $this->_field_id($id),
+                                        'button'     => $this->_trigger_id($id)));
         echo $this->_make_calendar($options);
     }
 

Spacing +14 added lines, -14 removed lines

@@ -33,7 +33,7 @@ 
             $this->calendar_setup_file = 'calendar-setup.js';
         }
         $this->calendar_lang_file = 'lang/calendar-' . $lang . '.js';
-        $this->calendar_theme_file = $theme.'.css';
+        $this->calendar_theme_file = $theme . '.css';
         $this->calendar_lib_path = preg_replace('/\/+$/', '/', $calendar_lib_path);
         $this->calendar_options = array('ifFormat' => '%Y/%m/%d',
                                         'daFormat' => '%Y/%m/%d');
@@ -48,26 +48,26 @@ 
     }
 
     function get_load_files_code() {
-        $code  = ( '<link rel="stylesheet" type="text/css" media="all" href="' .
+        $code  = ('<link rel="stylesheet" type="text/css" media="all" href="' .
                    $this->calendar_lib_path . $this->calendar_theme_file .
-                   '" />' . NEWLINE );
-        $code .= ( '<script type="text/javascript" src="' .
+                   '" />' . NEWLINE);
+        $code .= ('<script type="text/javascript" src="' .
                    $this->calendar_lib_path . $this->calendar_file .
-                   '"></script>' . NEWLINE );
-        $code .= ( '<script type="text/javascript" src="' .
+                   '"></script>' . NEWLINE);
+        $code .= ('<script type="text/javascript" src="' .
                    $this->calendar_lib_path . $this->calendar_lang_file .
-                   '"></script>' . NEWLINE );
-        $code .= ( '<script type="text/javascript" src="' .
+                   '"></script>' . NEWLINE);
+        $code .= ('<script type="text/javascript" src="' .
                    $this->calendar_lib_path . $this->calendar_setup_file .
-                   '"></script>' );
+                   '"></script>');
         return $code;
     }
 
     function _make_calendar($other_options = array()) {
         $js_options = $this->_make_js_hash(array_merge($this->calendar_options, $other_options));
-        $code  = ( '<script type="text/javascript">Calendar.setup({' .
+        $code = ('<script type="text/javascript">Calendar.setup({' .
                    $js_options .
-                   '});</script>' );
+                   '});</script>');
         return $code;
     }
 
@@ -76,8 +76,8 @@ 
         $attrstr = $this->_make_html_attr(array_merge($field_attributes,
                                                       array('id'   => $this->_field_id($id),
                                                             'type' => 'text')));
-        echo '<input ' . $attrstr .'/>';
-        echo '<a href="#" id="'. $this->_trigger_id($id) . '">' .
+        echo '<input ' . $attrstr . '/>';
+        echo '<a href="#" id="' . $this->_trigger_id($id) . '">' .
             '<img align="middle" border="0" src="' . $this->calendar_lib_path . 'img.gif" alt="" /></a>';
 
         $options = array_merge($cal_options,
@@ -99,7 +99,7 @@ 
             if (is_bool($val))
                 $val = $val ? 'true' : 'false';
             else if (!is_numeric($val))
-                $val = '"'.$val.'"';
+                $val = '"' . $val . '"';
             if ($jstr) $jstr .= ',';
             $jstr .= '"' . $key . '":' . $val;
         }

Braces +8 added lines, -5 removed lines

@@ -96,11 +96,14 @@
         $jstr = '';
         reset($array);
         while (list($key, $val) = each($array)) {
-            if (is_bool($val))
-                $val = $val ? 'true' : 'false';
-            else if (!is_numeric($val))
-                $val = '"'.$val.'"';
-            if ($jstr) $jstr .= ',';
+            if (is_bool($val)) {
+                            $val = $val ? 'true' : 'false';
+            } else if (!is_numeric($val)) {
+                            $val = '"'.$val.'"';
+            }
+            if ($jstr) {
+                $jstr .= ',';
+            }
             $jstr .= '"' . $key . '":' . $val;
         }
         return $jstr;