zikula / core

src/system/UsersModule/Block/OnlineBlock.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
      */
     public function display(array $properties)
     {
-        if (!$this->hasPermission('Onlineblock::', $properties['bid'].'::', ACCESS_READ)) {
+        if (!$this->hasPermission('Onlineblock::', $properties['bid'] . '::', ACCESS_READ)) {
             return '';
         }
 

src/system/UsersModule/Block/LoginBlock.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 {
     public function display(array $properties)
     {
-        if ($this->hasPermission('Loginblock::', $properties['title'].'::', ACCESS_READ)) {
+        if ($this->hasPermission('Loginblock::', $properties['title'] . '::', ACCESS_READ)) {
             if (!$this->get('zikula_users_module.current_user')->isLoggedIn()) {
                 $request = $this->get('request_stack')->getCurrentRequest();
 

src/system/UsersModule/Controller/FileIOController.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
             if ($form->get('download')->isClicked()) {
                 $data = $form->getData();
                 $response = new StreamedResponse();
-                $response->setCallback(function () use ($data) {
+                $response->setCallback(function() use ($data) {
                     $fields = ['uid', 'uname', 'activated', 'email', 'user_regdate', 'lastlogin', 'groups'];
                     foreach ($fields as $k => $field) {
                         if (isset($data[$field]) && !$data[$field]) {

src/system/UsersModule/UsersModuleInstaller.php

Spacing +2 added lines, -2 removed lines

@@ -117,7 +117,7 @@ 
                     UsersConstant::MODVAR_LOGIN_DISPLAY_APPROVAL_STATUS
                 ];
                 foreach ($modvarsToConvertToBool as $modvarToConvert) {
-                    $this->setVar($modvarToConvert, (bool) $this->getVar($modvarToConvert));
+                    $this->setVar($modvarToConvert, (bool)$this->getVar($modvarToConvert));
                 }
                 $this->schemaTool->update(['Zikula\UsersModule\Entity\UserEntity']);
                 $this->delVar('login_redirect');
@@ -290,7 +290,7 @@ 
             $value = in_array($migratedModVarName, [
                 ZAuthConstant::MODVAR_EMAIL_VERIFICATION_REQUIRED,
                 ZAuthConstant::MODVAR_PASSWORD_STRENGTH_METER_ENABLED
-            ]) ? (bool) $value : $value;
+            ]) ? (bool)$value : $value;
             $this->container->get('zikula_extensions_module.api.variable')->set('ZikulaZAuthModule', $migratedModVarName, $value);
         }
     }

src/system/MailerModule/Api/MailerApi.php

Spacing +1 added lines, -1 removed lines

@@ -175,7 +175,7 @@
 
         // add body with formatting
         $bodyFormat = 'text/plain';
-        if (!empty($altBody) || ((bool) $html) || $this->dataValues['html']) {
+        if (!empty($altBody) || ((bool)$html) || $this->dataValues['html']) {
             $bodyFormat = 'text/html';
         }
         if (isset($body)) {

src/system/SecurityCenterModule/Entity/Repository/IntrusionRepository.php

Indentation +6 added lines, -6 removed lines

@@ -108,7 +108,7 @@ 
                 $qb->from('ZikulaUsersModule:UserEntity', 'u');
                 $qb->andWhere($qb->expr()->eq('tbl.user', 'u.uid'));
                 $qb->andWhere($qb->expr()->eq('tbl.user', ':uid'))
-                   ->setParameter('uid', $uid);
+                    ->setParameter('uid', $uid);
             }
         }
 
@@ -117,7 +117,7 @@ 
             $i = 1;
             foreach ($filters as $w_key => $w_value) {
                 $qb->andWhere($qb->expr()->eq('tbl.' . $w_key, '?' . $i))
-                   ->setParameter($i, $w_value);
+                    ->setParameter($i, $w_value);
                 $i++;
             }
         }
@@ -144,12 +144,12 @@ 
 
         if ($fieldName == 'uid') {
             $qb->select('DISTINCT(u.' . $fieldName . ')')
-               ->from('ZikulaUsersModule:UserEntity', 'u')
-               ->where($qb->expr()->eq('tbl.user', 'u.uid'))
-               ->addOrderBy('u.uname', 'ASC');
+                ->from('ZikulaUsersModule:UserEntity', 'u')
+                ->where($qb->expr()->eq('tbl.user', 'u.uid'))
+                ->addOrderBy('u.uname', 'ASC');
         } else {
             $qb->select('DISTINCT(tbl.' . $fieldName . ')')
-               ->addOrderBy('tbl.' . $fieldName, 'ASC');
+                ->addOrderBy('tbl.' . $fieldName, 'ASC');
         }
 
         $query = $qb->getQuery();

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/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 +36 added lines, -18 removed lines

@@ -12,7 +12,8 @@ 
 
 define('NEWLINE', "\n");
 
-class DHTML_Calendar {
+class DHTML_Calendar
+{
     var $calendar_lib_path;
 
     var $calendar_file;
@@ -24,7 +25,8 @@ 
     function DHTML_Calendar($calendar_lib_path = '/calendar/',
                             $lang              = 'en',
                             $theme             = 'calendar-win2k-1',
-                            $stripped          = true) {
+                            $stripped          = true)
+    {
         if ($stripped) {
             $this->calendar_file = 'calendar_stripped.js';
             $this->calendar_setup_file = 'calendar-setup_stripped.js';
@@ -39,15 +41,18 @@ 
                                         'daFormat' => '%Y/%m/%d');
     }
 
-    function set_option($name, $value) {
+    function set_option($name, $value)
+    {
         $this->calendar_options[$name] = $value;
     }
 
-    function load_files() {
+    function load_files()
+    {
         echo $this->get_load_files_code();
     }
 
-    function get_load_files_code() {
+    function get_load_files_code()
+    {
         $code  = ( '<link rel="stylesheet" type="text/css" media="all" href="' .
                    $this->calendar_lib_path . $this->calendar_theme_file .
                    '" />' . NEWLINE );
@@ -63,7 +68,8 @@ 
         return $code;
     }
 
-    function _make_calendar($other_options = array()) {
+    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 .
@@ -71,7 +77,8 @@ 
         return $code;
     }
 
-    function make_input_field($cal_options = array(), $field_attributes = array()) {
+    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),
@@ -88,25 +95,36 @@ 
 
     /// PRIVATE SECTION
 
-    function _field_id($id) { return 'f-calendar-field-' . $id; }
-    function _trigger_id($id) { return 'f-calendar-trigger-' . $id; }
-    function _gen_id() { static $id = 0; return ++$id; }
-
-    function _make_js_hash($array) {
+    function _field_id($id)
+    {
+return 'f-calendar-field-' . $id; }
+    function _trigger_id($id)
+    {
+return 'f-calendar-trigger-' . $id; }
+    function _gen_id()
+    {
+static $id = 0; return ++$id; }
+
+    function _make_js_hash($array)
+    {
         $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;
     }
 
-    function _make_html_attr($array) {
+    function _make_html_attr($array)
+    {
         $attrstr = '';
         reset($array);
         while (list($key, $val) = each($array)) {

src/system/AdminModule/Helper/UpdateCheckHelper.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -208,7 +208,7 @@
             if (!$fp) {
                 return false;
             } else {
-                $out = "GET $path_query? HTTP/1.1\r\n";
+                $out = "get $path_query? HTTP/1.1\r\n";
                 $out .= "User-Agent: $userAgent\r\n";
                 $out .= "Referer: $ref\r\n";
                 $out .= "Host: $urlArray[host]\r\n";