Completed
Branch master (b13b1d)
by Michael
19:31
created
form/_view/script/AdminPageFramework_Form_View___Script_SectionTab.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -129,7 +129,7 @@
 block discarded – undo
129 129
      */
130 130
     static public function getEnabler() {
131 131
         
132
-        if ( self::$_bLoadedTabEnablerScript ) { 
132
+        if ( self::$_bLoadedTabEnablerScript ) {
133 133
             return ''; 
134 134
         }
135 135
         self::$_bLoadedTabEnablerScript = true;
Please login to merge, or discard this patch.
form/_view/script/AdminPageFramework_Form_View___Script_SortableSection.php 2 patches
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -94,10 +94,10 @@
 block discarded – undo
94 94
      */
95 95
     static public function getEnabler( $sContainerTagID, $aSettings, $oMsg ) {
96 96
         
97
-        if ( empty( $aSettings ) ) { 
97
+        if ( empty( $aSettings ) ) {
98 98
             return ''; 
99 99
         }
100
-        if ( in_array( $sContainerTagID, self::$_aSetContainerIDsForSortableSections ) ) { 
100
+        if ( in_array( $sContainerTagID, self::$_aSetContainerIDsForSortableSections ) ) {
101 101
             return ''; 
102 102
         }
103 103
         self::$_aSetContainerIDsForSortableSections[ $sContainerTagID ] = $sContainerTagID;        
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -105,7 +105,7 @@
 block discarded – undo
105 105
         new self( $oMsg ); 
106 106
         
107 107
         // $aSettings              = $this->getAsArray( $aSettings );        
108
-        $_sScript       = <<<JAVASCRIPTS
108
+        $_sScript = <<<JAVASCRIPTS
109 109
 jQuery( document ).ready( function() {    
110 110
     jQuery( '#{$sContainerTagID}' ).enableAdminPageFrameworkSortableSections( '{$sContainerTagID}' ); 
111 111
 });            
Please login to merge, or discard this patch.
_view/sectionset/AdminPageFramework_Form_View___CollapsibleSectionTitle.php 2 patches
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@
 block discarded – undo
61 61
          */
62 62
         private function _getCollapsibleSectionTitleBlock( array $aCollapsible, $sContainer='sections', $iSectionIndex=null ) {
63 63
 
64
-            if ( $sContainer !== $aCollapsible[ 'container' ] ) { 
64
+            if ( $sContainer !== $aCollapsible[ 'container' ] ) {
65 65
                 return ''; 
66 66
             }
67 67
               
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -18,17 +18,17 @@  discard block
 block discarded – undo
18 18
  */
19 19
 class AdminPageFramework_Form_View___CollapsibleSectionTitle extends AdminPageFramework_Form_View___SectionTitle {
20 20
             
21
-    public $aArguments      = array(
21
+    public $aArguments = array(
22 22
         'title'             => null,
23 23
         'tag'               => null,
24 24
         'section_index'     => null,
25 25
         'collapsible'       => array(),
26 26
         'container_type'    => 'section', // section or sections
27 27
         
28
-        'sectionset'        => array(),  // DEVVER+ sectionset definition array
28
+        'sectionset'        => array(), // DEVVER+ sectionset definition array
29 29
         
30 30
     );
31
-    public $aFieldsets               = array();
31
+    public $aFieldsets = array();
32 32
     public $aSavedData              = array();
33 33
     public $aFieldErrors            = array();
34 34
     public $aFieldTypeDefinitions   = array();
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
          * @param       array|boolean   $aCollapsible       The collapsible argument.
63 63
          * @param       string          $sContainer          The position context. Accepts either 'sections' or 'section'. If the set position in the argument array does not match this value, the method will return an empty string.
64 64
          */
65
-        private function _getCollapsibleSectionTitleBlock( array $aCollapsible, $sContainer='sections', $iSectionIndex=null ) {
65
+        private function _getCollapsibleSectionTitleBlock( array $aCollapsible, $sContainer = 'sections', $iSectionIndex = null ) {
66 66
 
67 67
             if ( $sContainer !== $aCollapsible[ 'container' ] ) { 
68 68
                 return ''; 
@@ -78,10 +78,10 @@  discard block
 block discarded – undo
78 78
             );
79 79
             
80 80
             $_aSectionset        = $this->aArguments[ 'sectionset' ];
81
-            $_sSectionTitleTagID = str_replace( '|', '_', $_aSectionset[ '_section_path' ]  ) . '_' . $iSectionIndex;
81
+            $_sSectionTitleTagID = str_replace( '|', '_', $_aSectionset[ '_section_path' ] ).'_'.$iSectionIndex;
82 82
             
83 83
             return $this->_getCollapsibleSectionsEnablerScript()
84
-                . "<div " . $this->getAttributes(
84
+                . "<div ".$this->getAttributes(
85 85
                     array(
86 86
                         'id'    => $_sSectionTitleTagID,
87 87
                         'class' => $this->getClassAttribute(
@@ -102,11 +102,11 @@  discard block
 block discarded – undo
102 102
                                 'collapsed',
103 103
                                 ''
104 104
                             ),                            
105
-                            'admin-page-framework-collapsible-type-' . $aCollapsible[ 'type' ]
105
+                            'admin-page-framework-collapsible-type-'.$aCollapsible[ 'type' ]
106 106
                         ),
107 107
                     ) 
108 108
                     + $this->getDataAttributeArray( $aCollapsible )
109
-                ) . ">"  
109
+                ).">"  
110 110
                         . $_sSectionTitle
111 111
                     . "</div>";
112 112
             
Please login to merge, or discard this patch.
form/_view/sectionset/AdminPageFramework_Form_View___FieldsetRow.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
 
33 33
         $_aParameters = func_get_args() + array( 
34 34
             $this->aFieldset, 
35
-            $this->aSavedData,    // passed by reference. @todo: examine why it needs to be passed by reference.
35
+            $this->aSavedData, // passed by reference. @todo: examine why it needs to be passed by reference.
36 36
             $this->aFieldErrors, 
37 37
             $this->aFieldTypeDefinitions, 
38 38
             $this->aCallbacks, // field output element callables.        
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
         return $this->_getFieldByContainer( 
72 72
             $aFieldset, 
73 73
             array(
74
-                'open_main'     => "<div " . $_oFieldrowAttribute->get() . ">",
74
+                'open_main'     => "<div ".$_oFieldrowAttribute->get().">",
75 75
                 'close_main'    => "</div>",
76 76
             )
77 77
         ); 
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@
 block discarded – undo
61 61
         
62 62
         $aFieldset = $this->aFieldset;
63 63
 
64
-        if ( 'section_title' === $aFieldset[ 'type' ] ) { 
64
+        if ( 'section_title' === $aFieldset[ 'type' ] ) {
65 65
             return ''; 
66 66
         }
67 67
         
Please login to merge, or discard this patch.
form/_view/sectionset/AdminPageFramework_Form_View___FieldsetRows.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
      * @return      string
58 58
      * @since       DEVVER
59 59
      */
60
-    public function get( $bTableRow=true ) {
60
+    public function get( $bTableRow = true ) {
61 61
         
62 62
         $_sMethodName = $this->getAOrB(
63 63
             $bTableRow,
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
         );
67 67
         
68 68
         $_aOutput = array();
69
-        foreach( $this->aFieldsetsPerSection as $_aFieldset ) {
69
+        foreach ( $this->aFieldsetsPerSection as $_aFieldset ) {
70 70
 
71 71
             $_oFieldsetOutputFormatter = new AdminPageFramework_Form_Model___Format_FieldsetOutput(
72 72
                 $_aFieldset, 
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
                 $this->aFieldTypeDefinitions
75 75
             );        
76 76
             
77
-            $_aOutput[] = call_user_func_array(
77
+            $_aOutput[ ] = call_user_func_array(
78 78
                 array( $this, $_sMethodName ),
79 79
                 array( $_oFieldsetOutputFormatter->get() )
80 80
             );
Please login to merge, or discard this patch.
_abstract/form/_view/sectionset/AdminPageFramework_Form_View___Section.php 2 patches
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -76,15 +76,15 @@  discard block
 block discarded – undo
76 76
         $_oSectionTableBodyAttributes = new AdminPageFramework_Form_View___Attribute_SectionTableBody( $this->aSectionset );
77 77
         
78 78
         $_aOutput       = array();
79
-        $_aOutput[]     = "<table " . $_oSectionTableAttributes->get() . ">"
79
+        $_aOutput[ ]     = "<table ".$_oSectionTableAttributes->get().">"
80 80
                 . $_oTableCaption->get()
81
-                . "<tbody " . $_oSectionTableBodyAttributes->get() . ">"
81
+                . "<tbody ".$_oSectionTableBodyAttributes->get().">"
82 82
                     . $this->_getSectionContent( $_iSectionIndex )
83 83
                 . "</tbody>"
84 84
             . "</table>";
85 85
 
86
-        $_oSectionTableContainerAttributes  = new AdminPageFramework_Form_View___Attribute_SectionTableContainer( $this->aSectionset );
87
-        return "<div " . $_oSectionTableContainerAttributes->get() . ">"
86
+        $_oSectionTableContainerAttributes = new AdminPageFramework_Form_View___Attribute_SectionTableContainer( $this->aSectionset );
87
+        return "<div ".$_oSectionTableContainerAttributes->get().">"
88 88
                 . implode( PHP_EOL, $_aOutput )
89 89
             . "</div>";    
90 90
         
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
                 // Retrieve the formatted sectionsets of the content.
145 145
                 $_sSectionPath = $this->aSectionset[ '_section_path' ];
146 146
                 $_aSectionsets = $this->aStructure[ 'sectionsets' ];
147
-                if ( ! isset( $_aSectionsets[ $_sSectionPath ] ) ) {    // @todo    not sure what this check is for
147
+                if ( !isset( $_aSectionsets[ $_sSectionPath ] ) ) {    // @todo    not sure what this check is for
148 148
                     return '';
149 149
                 }          
150 150
                 
@@ -195,14 +195,14 @@  discard block
 block discarded – undo
195 195
                     $_aNestedSectionPaths = array();
196 196
                     
197 197
                     // List the section paths of the direct children
198
-                    foreach( $aNestedSctionsets as $_aNestedSectionset ) {
199
-                        $_sThisSectionPath = $sSubjectSectionPath . '|' . $_aNestedSectionset[ 'section_id' ];
198
+                    foreach ( $aNestedSctionsets as $_aNestedSectionset ) {
199
+                        $_sThisSectionPath = $sSubjectSectionPath.'|'.$_aNestedSectionset[ 'section_id' ];
200 200
                         $_aNestedSectionPaths[ $_sThisSectionPath ] = $_sThisSectionPath;
201 201
                     }                    
202 202
                     
203 203
                     // Now we need children's children.
204 204
                     $_aChildSectionPaths = array();
205
-                    foreach( $_aNestedSectionPaths as $_sNestedSectionPath ) {
205
+                    foreach ( $_aNestedSectionPaths as $_sNestedSectionPath ) {
206 206
                         $_aNestedSectionsets = $this->getElementAsArray( 
207 207
                             $aSectionsets, 
208 208
                             array( $_sNestedSectionPath, 'content' )
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -144,7 +144,8 @@
 block discarded – undo
144 144
                 // Retrieve the formatted sectionsets of the content.
145 145
                 $_sSectionPath = $this->aSectionset[ '_section_path' ];
146 146
                 $_aSectionsets = $this->aStructure[ 'sectionsets' ];
147
-                if ( ! isset( $_aSectionsets[ $_sSectionPath ] ) ) {    // @todo    not sure what this check is for
147
+                if ( ! isset( $_aSectionsets[ $_sSectionPath ] ) ) {
148
+// @todo    not sure what this check is for
148 149
                     return '';
149 150
                 }          
150 151
                 
Please login to merge, or discard this patch.
form/_view/sectionset/AdminPageFramework_Form_View___SectionCaption.php 2 patches
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -236,7 +236,7 @@
 block discarded – undo
236 236
              */
237 237
             private function _shouldShowCaptionTitle( $aSectionset, $iSectionIndex ) {
238 238
                 
239
-                if ( ! $aSectionset[ 'title' ] ){
239
+                if ( ! $aSectionset[ 'title' ] ) {
240 240
                     return false;
241 241
                 }
242 242
                 if ( $aSectionset[ 'collapsible' ] ) {
Please login to merge, or discard this patch.
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
          */
80 80
         private function _getCaption( array $aSectionset, $iSectionIndex, $aFieldsets, $aFieldErrors, $aFieldTypeDefinitions, $aCallbacks, $oMsg ) {
81 81
             
82
-            if ( ! $aSectionset[ 'description' ] && ! $aSectionset[ 'title' ] ) {
82
+            if ( !$aSectionset[ 'description' ] && !$aSectionset[ 'title' ] ) {
83 83
                 return "<caption class='admin-page-framework-section-caption' style='display:none;'></caption>";
84 84
             }    
85 85
 
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
                     'collapsible'       => $_abCollapsible,
103 103
                     'container_type'    => 'section', // section or sections                    
104 104
                     
105
-                    'sectionset'        => $aSectionset,    // DEVVER+ for tooltip
105
+                    'sectionset'        => $aSectionset, // DEVVER+ for tooltip
106 106
                 ),
107 107
                 $aFieldsets,            
108 108
                 $this->aSavedData,   
@@ -112,15 +112,15 @@  discard block
 block discarded – undo
112 112
                 $aCallbacks // field output element callables.                
113 113
             );            
114 114
             
115
-            $_bShowTitle    = empty( $_abCollapsible ) && ! $aSectionset[ 'section_tab_slug' ];
115
+            $_bShowTitle = empty( $_abCollapsible ) && !$aSectionset[ 'section_tab_slug' ];
116 116
             return 
117
-                "<caption " . $this->getAttributes( 
117
+                "<caption ".$this->getAttributes( 
118 118
                     array(
119 119
                         'class'             => 'admin-page-framework-section-caption',
120 120
                         // data-section_tab is referred by the repeater script to hide/show the title and the description
121 121
                         'data-section_tab'  => $aSectionset[ 'section_tab_slug' ],
122 122
                     ) 
123
-                ) . ">"
123
+                ).">"
124 124
                     . $_oCollapsibleSectionTitle->get()
125 125
                     . $this->getAOrB(
126 126
                         $_bShowTitle,
@@ -174,7 +174,7 @@  discard block
 block discarded – undo
174 174
                         'tag'           => 'h3',
175 175
                         'section_index' => $iSectionIndex,
176 176
                         
177
-                        'sectionset'    => $aSectionset,    // DEVVER+ for tooltip
177
+                        'sectionset'    => $aSectionset, // DEVVER+ for tooltip
178 178
                     ),
179 179
                     $aFieldsets,            
180 180
                     $this->aSavedData,   
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
183 183
                     $this->oMsg,
184 184
                     $this->aCallbacks // field output element callables.
185 185
                 );
186
-                return "<div " . $this->getAttributes(
186
+                return "<div ".$this->getAttributes(
187 187
                         array(
188 188
                             'class' => 'admin-page-framework-section-title',
189 189
                             'style' => $this->getAOrB(
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
                                 'display: none;'
193 193
                             ),
194 194
                         )
195
-                    ). ">" 
195
+                    ).">" 
196 196
                         . $_oSectionTitle->get()
197 197
                     . "</div>";                
198 198
             }
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
                 if ( $aSectionset[ 'collapsible' ] ) {
209 209
                     return '';
210 210
                 }
211
-                if ( ! is_callable( $hfSectionCallback ) ) {
211
+                if ( !is_callable( $hfSectionCallback ) ) {
212 212
                     return '';
213 213
                 }
214 214
                 
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
              */
241 241
             private function _shouldShowCaptionTitle( $aSectionset, $iSectionIndex ) {
242 242
                 
243
-                if ( ! $aSectionset[ 'title' ] ){
243
+                if ( !$aSectionset[ 'title' ] ) {
244 244
                     return false;
245 245
                 }
246 246
                 if ( $aSectionset[ 'collapsible' ] ) {
Please login to merge, or discard this patch.
form/_view/sectionset/AdminPageFramework_Form_View___SectionTitle.php 2 patches
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
  * @since       DEVVER      Changed the name from `AdminPageFramework_FormPart_SectionTitle`.
17 17
  * @internal
18 18
  */
19
-class AdminPageFramework_Form_View___SectionTitle extends AdminPageFramework_Form_View___Section_Base {            
19
+class AdminPageFramework_Form_View___SectionTitle extends AdminPageFramework_Form_View___Section_Base {
20 20
   
21 21
     public $aArguments      = array(
22 22
         'title'         => null,
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
              * @since       3.6.0       Added the `$iSectionIndex` parameter. Added the `$aFieldTypeDefinitions` parameter.
105 105
              * @since       DEVVER      Moved from `AdminPageFramework_FormPart_SectionTitle`.
106 106
              */
107
-            private function _getSectionTitleField( array $aFieldsetsets, $iSectionIndex, $aFieldTypeDefinitions ) {   
107
+            private function _getSectionTitleField( array $aFieldsetsets, $iSectionIndex, $aFieldTypeDefinitions ) {
108 108
             
109 109
                 foreach( $aFieldsetsets as $_aFieldsetset ) {
110 110
                     
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -18,14 +18,14 @@  discard block
 block discarded – undo
18 18
  */
19 19
 class AdminPageFramework_Form_View___SectionTitle extends AdminPageFramework_Form_View___Section_Base {            
20 20
   
21
-    public $aArguments      = array(
21
+    public $aArguments = array(
22 22
         'title'         => null,
23 23
         'tag'           => null,
24 24
         'section_index' => null,
25 25
         
26 26
         'sectionset'    => array(),
27 27
     );
28
-    public $aFieldsets               = array();
28
+    public $aFieldsets = array();
29 29
     public $aSavedData              = array();
30 30
     public $aFieldErrors            = array();
31 31
     public $aFieldTypeDefinitions   = array();
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
         private function _getToolTip() {
84 84
             
85 85
             $_aSectionset        = $this->aArguments[ 'sectionset' ];
86
-            $_sSectionTitleTagID = str_replace( '|', '_', $_aSectionset[ '_section_path' ]  ) . '_' . $this->aArguments[ 'section_index' ];
86
+            $_sSectionTitleTagID = str_replace( '|', '_', $_aSectionset[ '_section_path' ] ).'_'.$this->aArguments[ 'section_index' ];
87 87
             $_oToolTip           = new AdminPageFramework_Form_View___ToolTip(
88 88
                 $_aSectionset[ 'tip' ],
89 89
                 $_sSectionTitleTagID
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
          * @since       DEVVER      Moved from `AdminPageFramework_FormPart_SectionTitle`.
103 103
          * @return      string      The section title output. 
104 104
          */
105
-        protected function _getSectionTitle( $sTitle, $sTag, $aFieldsets, $iSectionIndex=null, $aFieldTypeDefinitions=array(), $aCollapsible=array() ) {
105
+        protected function _getSectionTitle( $sTitle, $sTag, $aFieldsets, $iSectionIndex = null, $aFieldTypeDefinitions = array(), $aCollapsible = array() ) {
106 106
        
107 107
             $_aSectionTitleField = $this->_getSectionTitleField( $aFieldsets, $iSectionIndex, $aFieldTypeDefinitions );
108 108
             return $_aSectionTitleField
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
              */
140 140
             private function _getSectionTitleField( array $aFieldsetsets, $iSectionIndex, $aFieldTypeDefinitions ) {   
141 141
             
142
-                foreach( $aFieldsetsets as $_aFieldsetset ) {
142
+                foreach ( $aFieldsetsets as $_aFieldsetset ) {
143 143
                     
144 144
                     if ( 'section_title' !== $_aFieldsetset[ 'type' ] ) {
145 145
                         continue;
Please login to merge, or discard this patch.
form/_view/sectionset/AdminPageFramework_Form_View___Section_Base.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -54,13 +54,13 @@
 block discarded – undo
54 54
     public function getFieldsetOutput( $aFieldset ) {
55 55
 
56 56
         // Check if the field is visible
57
-        if ( ! $this->isFieldsetVisible( $aFieldset ) ) {          
57
+        if ( !$this->isFieldsetVisible( $aFieldset ) ) {          
58 58
             return '';
59 59
         }
60 60
 
61 61
         $_oFieldset = new AdminPageFramework_Form_View___Fieldset( 
62 62
             $aFieldset, 
63
-            $this->aSavedData,    // passed by reference. @todo: examine why it needs to be passed by reference.
63
+            $this->aSavedData, // passed by reference. @todo: examine why it needs to be passed by reference.
64 64
             $this->aFieldErrors, 
65 65
             $this->aFieldTypeDefinitions, 
66 66
             $this->oMsg,
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@
 block discarded – undo
54 54
     public function getFieldsetOutput( $aFieldset ) {
55 55
 
56 56
         // Check if the field is visible
57
-        if ( ! $this->isFieldsetVisible( $aFieldset ) ) {          
57
+        if ( ! $this->isFieldsetVisible( $aFieldset ) ) {
58 58
             return '';
59 59
         }
60 60
 
Please login to merge, or discard this patch.