Completed
Branch 1.4 (78c96b)
by Axel
22:13
created
src/system/UsersModule/Api/UserApi.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -52,14 +52,14 @@
 block discarded – undo
52 52
             $ooAccountApiFile = DataUtil::formatForOS("{$modpath}/{$mod['directory']}/Api/Account.php");
53 53
             $ooAccountApiFileOld = DataUtil::formatForOS("{$modpath}/{$mod['directory']}/lib/{$mod['directory']}/Api/Account.php");
54 54
             $legacyAccountApiFile = DataUtil::formatForOS("{$modpath}/{$mod['directory']}/pnaccountapi.php");
55
-            if (null !== $module && class_exists($module->getNamespace().'\\Api\\AccountApi') || file_exists($ooAccountApiFileNs) || file_exists($ooAccountApiFile) || file_exists($ooAccountApiFileOld) || file_exists($legacyAccountApiFile)) {
55
+            if (null !== $module && class_exists($module->getNamespace() . '\\Api\\AccountApi') || file_exists($ooAccountApiFileNs) || file_exists($ooAccountApiFile) || file_exists($ooAccountApiFileOld) || file_exists($legacyAccountApiFile)) {
56 56
                 $items = ModUtil::apiFunc($mod['name'], 'account', 'getAll');
57 57
                 if ($items) {
58 58
                     foreach ($items as $k => $item) {
59 59
                         // check every retured link for permissions
60 60
                         if (SecurityUtil::checkPermission('ZikulaUsersModule::', "$mod[name]::$item[title]", ACCESS_READ)) {
61 61
                             if (!isset($item['module'])) {
62
-                                $item['module']  = $mod['name'];
62
+                                $item['module'] = $mod['name'];
63 63
                             }
64 64
                             // insert the indexed item
65 65
                             $accountlinks["$mod[name]{$k}"] = $item;
Please login to merge, or discard this patch.
src/system/UsersModule/Block/OnlineBlock.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@
 block discarded – undo
25 25
      */
26 26
     public function display(array $properties)
27 27
     {
28
-        if (!$this->hasPermission('Onlineblock::', $properties['bid'].'::', ACCESS_READ)) {
28
+        if (!$this->hasPermission('Onlineblock::', $properties['bid'] . '::', ACCESS_READ)) {
29 29
             return '';
30 30
         }
31 31
 
Please login to merge, or discard this patch.
src/system/UsersModule/Block/LoginBlock.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@
 block discarded – undo
21 21
 {
22 22
     public function display(array $properties)
23 23
     {
24
-        if ($this->hasPermission('Loginblock::', $properties['title'].'::', ACCESS_READ)) {
24
+        if ($this->hasPermission('Loginblock::', $properties['title'] . '::', ACCESS_READ)) {
25 25
             if (!$this->get('zikula_users_module.current_user')->isLoggedIn()) {
26 26
                 $request = $this->get('request_stack')->getCurrentRequest();
27 27
 
Please login to merge, or discard this patch.
src/system/UsersModule/DependencyInjection/ZikulaUsersExtension.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@
 block discarded – undo
26 26
      */
27 27
     public function load(array $configs, ContainerBuilder $container)
28 28
     {
29
-        $loader = new YamlFileLoader($container, new FileLocator(realpath(__DIR__.'/../Resources/config')));
29
+        $loader = new YamlFileLoader($container, new FileLocator(realpath(__DIR__ . '/../Resources/config')));
30 30
 
31 31
         $loader->load('services.yml');
32 32
         $loader->load('helpers.yml');
Please login to merge, or discard this patch.
src/system/UsersModule/Controller/FileIOController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@
 block discarded – undo
46 46
             if ($form->get('download')->isClicked()) {
47 47
                 $data = $form->getData();
48 48
                 $response = new StreamedResponse();
49
-                $response->setCallback(function () use ($data) {
49
+                $response->setCallback(function() use ($data) {
50 50
                     $fields = ['uid', 'uname', 'activated', 'email', 'user_regdate', 'lastlogin', 'groups'];
51 51
                     foreach ($fields as $k => $field) {
52 52
                         if (isset($data[$field]) && !$data[$field]) {
Please login to merge, or discard this patch.
src/system/UsersModule/UsersModuleInstaller.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
                     UsersConstant::MODVAR_LOGIN_DISPLAY_APPROVAL_STATUS
118 118
                 ];
119 119
                 foreach ($modvarsToConvertToBool as $modvarToConvert) {
120
-                    $this->setVar($modvarToConvert, (bool) $this->getVar($modvarToConvert));
120
+                    $this->setVar($modvarToConvert, (bool)$this->getVar($modvarToConvert));
121 121
                 }
122 122
                 $this->schemaTool->update(['Zikula\UsersModule\Entity\UserEntity']);
123 123
                 $this->delVar('login_redirect');
@@ -290,7 +290,7 @@  discard block
 block discarded – undo
290 290
             $value = in_array($migratedModVarName, [
291 291
                 ZAuthConstant::MODVAR_EMAIL_VERIFICATION_REQUIRED,
292 292
                 ZAuthConstant::MODVAR_PASSWORD_STRENGTH_METER_ENABLED
293
-            ]) ? (bool) $value : $value;
293
+            ]) ? (bool)$value : $value;
294 294
             $this->container->get('zikula_extensions_module.api.variable')->set('ZikulaZAuthModule', $migratedModVarName, $value);
295 295
         }
296 296
     }
Please login to merge, or discard this patch.
src/system/MailerModule/Api/MailerApi.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -175,7 +175,7 @@
 block discarded – undo
175 175
 
176 176
         // add body with formatting
177 177
         $bodyFormat = 'text/plain';
178
-        if (!empty($altBody) || ((bool) $html) || $this->dataValues['html']) {
178
+        if (!empty($altBody) || ((bool)$html) || $this->dataValues['html']) {
179 179
             $bodyFormat = 'text/html';
180 180
         }
181 181
         if (isset($body)) {
Please login to merge, or discard this patch.
src/system/MailerModule/DependencyInjection/ZikulaMailerExtension.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@
 block discarded – undo
26 26
      */
27 27
     public function load(array $configs, ContainerBuilder $container)
28 28
     {
29
-        $loader = new YamlFileLoader($container, new FileLocator(realpath(__DIR__.'/../Resources/config')));
29
+        $loader = new YamlFileLoader($container, new FileLocator(realpath(__DIR__ . '/../Resources/config')));
30 30
 
31 31
         $loader->load('services.yml');
32 32
     }
Please login to merge, or discard this patch.
src/system/SecurityCenterModule/SecurityCenterModuleInstaller.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
         $this->setSystemVar('sessionstoretofile', 0);
55 55
         $this->setSystemVar('sessionsavepath', '');
56 56
         $this->setSystemVar('gc_probability', 100);
57
-        $this->setSystemVar('sessioncsrftokenonetime', 1);  // 1 means use same token for entire session
57
+        $this->setSystemVar('sessioncsrftokenonetime', 1); // 1 means use same token for entire session
58 58
         $this->setSystemVar('anonymoussessions', 1); // @deprecated
59 59
         $this->setSystemVar('sessionrandregenerate', 1);
60 60
         $this->setSystemVar('sessionregenerate', 1);
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
         $this->setSystemVar('filtercookievars', 1);
68 68
 
69 69
         // Location of HTML Purifier
70
-        $this->setSystemVar('htmlpurifierlocation', __DIR__.'/vendor/htmlpurifier/');
70
+        $this->setSystemVar('htmlpurifierlocation', __DIR__ . '/vendor/htmlpurifier/');
71 71
 
72 72
         // HTML Purifier cache dir
73 73
         $this->container->get('cache_clearer')->clear('purifier');
@@ -80,13 +80,13 @@  discard block
 block discarded – undo
80 80
         $this->setSystemVar('useids', 0);
81 81
         $this->setSystemVar('idsmail', 0);
82 82
         $this->setSystemVar('idsrulepath', __DIR__ . '/Resources/config/phpids_zikula_default.xml');
83
-        $this->setSystemVar('idssoftblock', 1);                // do not block requests, but warn for debugging
84
-        $this->setSystemVar('idsfilter', 'xml');               // filter type
85
-        $this->setSystemVar('idsimpactthresholdone', 1);       // db logging
86
-        $this->setSystemVar('idsimpactthresholdtwo', 10);      // mail admin
87
-        $this->setSystemVar('idsimpactthresholdthree', 25);    // block request
88
-        $this->setSystemVar('idsimpactthresholdfour', 75);     // kick user, destroy session
89
-        $this->setSystemVar('idsimpactmode', 1);               // per request per default
83
+        $this->setSystemVar('idssoftblock', 1); // do not block requests, but warn for debugging
84
+        $this->setSystemVar('idsfilter', 'xml'); // filter type
85
+        $this->setSystemVar('idsimpactthresholdone', 1); // db logging
86
+        $this->setSystemVar('idsimpactthresholdtwo', 10); // mail admin
87
+        $this->setSystemVar('idsimpactthresholdthree', 25); // block request
88
+        $this->setSystemVar('idsimpactthresholdfour', 75); // kick user, destroy session
89
+        $this->setSystemVar('idsimpactmode', 1); // per request per default
90 90
         $this->setSystemVar('idshtmlfields', ['POST.__wysiwyg']);
91 91
         $this->setSystemVar('idsjsonfields', ['POST.__jsondata']);
92 92
         $this->setSystemVar('idsexceptions', [
Please login to merge, or discard this patch.