Completed
Pull Request — master (#3788)
by Craig
01:31
created
src/lib/legacy/viewplugins/function.jquery_datepicker.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -229,7 +229,7 @@
 block discarded – undo
229 229
     $html = "<input type=\"text\"{$readOnlyHtml} id=\"{$displayElement}\"{$class} name=\"{$name}\" value=\"{$displayDateString}\" />\n";
230 230
     if (isset($valueStorageElement)) {
231 231
         $name = isset($object) ? "{$object}[{$valueStorageElement}]" : $valueStorageElement;
232
-        $html .= '<input type="hidden" id="'.$valueStorageElement.'" name="'.$name.'" value="'.(($defaultDate) ? $defaultDate->format($valueStorageFormat_dateTime) : '').'" />';
232
+        $html .= '<input type="hidden" id="' . $valueStorageElement . '" name="' . $name . '" value="' . (($defaultDate) ? $defaultDate->format($valueStorageFormat_dateTime) : '') . '" />';
233 233
     }
234 234
 
235 235
     return $html;
Please login to merge, or discard this patch.
src/lib/legacy/viewplugins/function.selector_category.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -82,12 +82,12 @@
 block discarded – undo
82 82
     $cacheKey = "$category[id]||$recurse|$relative|$includeRoot|$includeLeaf|$all|||$attributes|$sortField";
83 83
     if (!isset($catCache[$cacheKey])) {
84 84
         $catCache[$cacheKey] = CategoryUtil::getSubCategoriesForCategory($category, $recurse, $relative, $includeRoot,
85
-                                                                          $includeLeaf, $all, '', '', $attributes, $sortField);
85
+                                                                            $includeLeaf, $all, '', '', $attributes, $sortField);
86 86
     }
87 87
 
88 88
     $html = CategoryUtil::getSelector_Categories($catCache[$cacheKey], $field, $selectedValue, $name, $defaultValue, $defaultText,
89
-                                                  $allValue, $allText, $submit, $displayPath, $doReplaceRootCat, $multipleSize, $fieldIsAttribute, $cssClass, $lang
90
-                                                  );
89
+                                                    $allValue, $allText, $submit, $displayPath, $doReplaceRootCat, $multipleSize, $fieldIsAttribute, $cssClass, $lang
90
+                                                    );
91 91
 
92 92
     /*
93 93
         if ($editLink && !empty($category) && SecurityUtil::checkPermission('ZikulaCategoriesModule::', "$category[id]::", ACCESS_EDIT)) {
Please login to merge, or discard this patch.
src/lib/legacy/viewplugins/function.notifydisplayhooks.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@
 block discarded – undo
43 43
     if ($urlObject && !($urlObject instanceof \Zikula\Core\UrlInterface)) {
44 44
         return trigger_error(__f('Error! "%1$s" must be an instance of %2$s', ['urlobject', '\Zikula\Core\UrlInterface']));
45 45
     }
46
-    $assign  = isset($params['assign']) ? $params['assign'] : false;
46
+    $assign = isset($params['assign']) ? $params['assign'] : false;
47 47
 
48 48
     // create event and notify
49 49
     $hook = new Zikula_DisplayHook($eventname, $id, $urlObject); // @todo Zikula_DisplayHook maintains BC. IN 1.5.0 change to \Zikula\Bundle\HookBundle\Hook\DisplayHook($id, $urlObject);
Please login to merge, or discard this patch.
src/lib/legacy/viewplugins/function.selector_module_tables.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -43,5 +43,5 @@
 block discarded – undo
43 43
     $multipleSize  = isset($params['multipleSize']) ? $params['multipleSize'] : 1;
44 44
 
45 45
     return HtmlUtil::getSelector_ModuleTables($modname, $name, $selectedValue, $defaultValue, $defaultText,
46
-                                               $submit, $remove, $disabled, $nStripChars, $multipleSize);
46
+                                                $submit, $remove, $disabled, $nStripChars, $multipleSize);
47 47
 }
Please login to merge, or discard this patch.
src/lib/legacy/viewplugins/function.zdebug.php 2 patches
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -70,9 +70,9 @@
 block discarded – undo
70 70
 
71 71
         // get the zdebug output
72 72
         $zdebug = $view->assign('zdebugwidth', $width)
73
-                       ->assign('zdebugheight', $height)
74
-                       ->assign('zdebugpopup', $popup)
75
-                       ->_fetch($view->debug_tpl);
73
+                        ->assign('zdebugheight', $height)
74
+                        ->assign('zdebugpopup', $popup)
75
+                        ->_fetch($view->debug_tpl);
76 76
 
77 77
         // restore original values
78 78
         $view->_compile_id = $_compile_id_orig;
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@
 block discarded – undo
43 43
     $thismodule = ModUtil::getName();
44 44
     $skipPermissionCheck = System::isDevelopmentMode() && isset($params['checkpermission']) && !$params['checkpermission'];
45 45
 
46
-    if ($skipPermissionCheck || SecurityUtil::checkPermission($thismodule.'::debug', '::', ACCESS_ADMIN)) {
46
+    if ($skipPermissionCheck || SecurityUtil::checkPermission($thismodule . '::debug', '::', ACCESS_ADMIN)) {
47 47
         // backup and modify the view attributes
48 48
         $_template_dir_orig = $view->template_dir;
49 49
         $_default_resource_type_orig = $view->default_resource_type;
Please login to merge, or discard this patch.
src/lib/legacy/viewplugins/function.selector_object_array.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -46,6 +46,6 @@
 block discarded – undo
46 46
     }
47 47
 
48 48
     return HtmlUtil::$method($modname, $class, $name, $field, $displayField, $where, $sort,
49
-                              $selectedValue, $defaultValue, $defaultText, $allValue, $allText,
50
-                              $displayField2, $submit, $disabled, $fieldSeparator, $multipleSize);
49
+                                $selectedValue, $defaultValue, $defaultText, $allValue, $allText,
50
+                                $displayField2, $submit, $disabled, $fieldSeparator, $multipleSize);
51 51
 }
Please login to merge, or discard this patch.
src/lib/legacy/viewplugins/function.calendarinput.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -121,14 +121,14 @@  discard block
 block discarded – undo
121 121
     }
122 122
 
123 123
     if (isset($params['display']) && $params['display']) {
124
-        $html .= '<span id="'.$displayName.'"'.$params['class'].'>'.$params['defaultstring'].'</span>&nbsp;';
124
+        $html .= '<span id="' . $displayName . '"' . $params['class'] . '>' . $params['defaultstring'] . '</span>&nbsp;';
125 125
     }
126 126
 
127 127
     if (isset($params['hidden']) && $params['hidden']) {
128
-        $html .= '<input type="hidden" name="'.$fieldKey.'" id="'.$params['htmlname'].'" value="'.$params['defaultdate'].'" />';
128
+        $html .= '<input type="hidden" name="' . $fieldKey . '" id="' . $params['htmlname'] . '" value="' . $params['defaultdate'] . '" />';
129 129
     }
130 130
 
131
-    $html .= '<img class="z-calendarimg" src="'.System::getBaseUrl().'javascript/jscalendar/img.gif" id="'.$triggerName.
131
+    $html .= '<img class="z-calendarimg" src="' . System::getBaseUrl() . 'javascript/jscalendar/img.gif" id="' . $triggerName .
132 132
     '" style="cursor: pointer;" title="' . DataUtil::formatForDisplay(__('Date selector')) . '"  alt="' . DataUtil::formatForDisplay(__('Date selector')) . '" />';
133 133
 
134 134
     $i18n = ZI18n::getInstance();
@@ -139,24 +139,24 @@  discard block
 block discarded – undo
139 139
               {";
140 140
 
141 141
     //$html .= 'ifFormat    : "%Y-%m-%d %H:%M:00",'; // universal format, don't change this!
142
-    $html .= 'ifFormat    : "'.$ifformat.'",';
143
-    $html .= 'inputField  : "'.$params['htmlname'].'",';
144
-    $html .= 'displayArea : "'.$displayName.'",';
145
-    $html .= 'daFormat    : "'.$params['dateformat'].'",';
146
-    $html .= 'button      : "'.$triggerName.'",';
147
-    $html .= 'defaultDate : "'.$params['defaultdate'].'",';
148
-    $html .= 'firstDay    : "'.$i18n->locale->getFirstweekday().'",';
142
+    $html .= 'ifFormat    : "' . $ifformat . '",';
143
+    $html .= 'inputField  : "' . $params['htmlname'] . '",';
144
+    $html .= 'displayArea : "' . $displayName . '",';
145
+    $html .= 'daFormat    : "' . $params['dateformat'] . '",';
146
+    $html .= 'button      : "' . $triggerName . '",';
147
+    $html .= 'defaultDate : "' . $params['defaultdate'] . '",';
148
+    $html .= 'firstDay    : "' . $i18n->locale->getFirstweekday() . '",';
149 149
     $html .= 'align       : "Tl",';
150 150
 
151 151
     if (isset($params['defaultdate']) && $params['defaultdate']) {
152 152
         $d = strtotime($params['defaultdate']);
153 153
         $d = date('Y/m/d', $d);
154
-        $html .= 'date : "'.$d.'",';
154
+        $html .= 'date : "' . $d . '",';
155 155
     }
156 156
 
157 157
     if ($inctime) {
158 158
         $html .= 'showsTime  : true,';
159
-        $html .= 'timeFormat : "'.$i18n->locale->getTimeformat().'",';
159
+        $html .= 'timeFormat : "' . $i18n->locale->getTimeformat() . '",';
160 160
     }
161 161
 
162 162
     $html .= "singleClick : true });
Please login to merge, or discard this patch.
src/lib/legacy/viewplugins/outputfilter.asseturls.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@
 block discarded – undo
33 33
 {
34 34
     $url = $m[3];
35 35
     if ($url[0] !== '/') {
36
-        $url = $GLOBALS['__request']->getBasePath().'/'.$url;
36
+        $url = $GLOBALS['__request']->getBasePath() . '/' . $url;
37 37
     }
38 38
 
39 39
     return "$m[1]$m[2]{$url}$m[4]";
Please login to merge, or discard this patch.
src/lib/legacy/viewplugins/formplugins/block.form.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@
 block discarded – undo
36 36
         // if enctype is not set directly, check whenever upload plugins were used;
37 37
         // if so - set proper enctype for file upload
38 38
         if (is_null($enctype)) {
39
-            $uploadPlugins = array_filter($view->plugins, function ($plugin) {
39
+            $uploadPlugins = array_filter($view->plugins, function($plugin) {
40 40
                 return $plugin instanceof Zikula_Form_Plugin_UploadInput;
41 41
             });
42 42
             if (!empty($uploadPlugins)) {
Please login to merge, or discard this patch.