@@ -98,6 +98,7 @@ discard block |
||
98 | 98 | * @since DEVVER Moved from `AdminPageFramework_FormDefinition`. Changed the name from `formatFields()`. |
99 | 99 | * Added the `$aSectionsets` parameter. |
100 | 100 | * @retuen array |
101 | + * @param string $sCapability |
|
101 | 102 | */ |
102 | 103 | private function _getFieldsetsFormatted( array $aFieldsets, array $aSectionsets, $sCapability ) { |
103 | 104 | |
@@ -271,6 +272,7 @@ discard block |
||
271 | 272 | * |
272 | 273 | * @since 3.0.0 |
273 | 274 | * @since DEVVER Moved from `AdminPageFramework_FormDefinition`. Changed the name from `formatField()`. |
275 | + * @param integer $iCountOfElements |
|
274 | 276 | * @return array|void An array of formatted field definition array. If required keys are not set, nothing will be returned. |
275 | 277 | */ |
276 | 278 | private function _getFieldsetFormatted( $aFieldset, $aSectionsets, $sCapability, $iCountOfElements, $iSubSectionIndex, $bIsSectionRepeatable, $oCallerObject ) { |
@@ -104,10 +104,10 @@ discard block |
||
104 | 104 | private function _getFieldsetsFormatted( array $aFieldsets, array $aSectionsets, $sCapability ) { |
105 | 105 | |
106 | 106 | $_aNewFieldsets = array(); |
107 | - foreach( $aFieldsets as $_sSectionPath => $_aItems ) { |
|
107 | + foreach ( $aFieldsets as $_sSectionPath => $_aItems ) { |
|
108 | 108 | |
109 | 109 | // If the section is not set, skip. |
110 | - if ( ! isset( $aSectionsets[ $_sSectionPath ] ) ) { |
|
110 | + if ( !isset( $aSectionsets[ $_sSectionPath ] ) ) { |
|
111 | 111 | continue; |
112 | 112 | } |
113 | 113 | |
@@ -116,7 +116,7 @@ discard block |
||
116 | 116 | $_aItems, |
117 | 117 | $this->getElement( // 3.6.0+ Get the section's capability |
118 | 118 | $aSectionsets, |
119 | - array( $_sSectionPath, 'capability', ), |
|
119 | + array( $_sSectionPath, 'capability',), |
|
120 | 120 | $sCapability |
121 | 121 | ), |
122 | 122 | $aSectionsets |
@@ -176,16 +176,16 @@ discard block |
||
176 | 176 | */ |
177 | 177 | private function _getNormalFieldsetsFormatted( $aItems, $sCapability, $aSectionsets, $_abSectionRepeatable ) { |
178 | 178 | |
179 | - $_aNewItems = array(); |
|
180 | - foreach( $aItems as $_sFieldID => $_aFieldset ) { |
|
179 | + $_aNewItems = array(); |
|
180 | + foreach ( $aItems as $_sFieldID => $_aFieldset ) { |
|
181 | 181 | |
182 | 182 | // Insert the formatted field definition array. The fields count is needed to set each order value. |
183 | - $_aFieldset = $this->_getFieldsetFormatted( |
|
183 | + $_aFieldset = $this->_getFieldsetFormatted( |
|
184 | 184 | $_aFieldset, |
185 | 185 | $aSectionsets, |
186 | 186 | $sCapability, |
187 | 187 | count( $_aNewItems ), // index of elements - zero based |
188 | - null, // sub-section index |
|
188 | + null, // sub-section index |
|
189 | 189 | $_abSectionRepeatable, |
190 | 190 | $this->oCallerForm |
191 | 191 | ); |
@@ -204,7 +204,7 @@ discard block |
||
204 | 204 | * @return boolean |
205 | 205 | */ |
206 | 206 | private function _isSubSections( $aItems, $_abSectionRepeatable ) { |
207 | - if ( ! empty( $_abSectionRepeatable ) ) { |
|
207 | + if ( !empty( $_abSectionRepeatable ) ) { |
|
208 | 208 | return true; |
209 | 209 | } |
210 | 210 | return ( boolean ) count( $this->getIntegerKeyElements( $aItems ) ); |
@@ -215,9 +215,9 @@ discard block |
||
215 | 215 | private function _getSubSectionsFormatted( $aItems, $sCapability, $aSectionsets, $_abSectionRepeatable ) { |
216 | 216 | |
217 | 217 | $_aNewFieldset = array(); |
218 | - foreach( $this->numerizeElements( $aItems ) as $_iSubSectionIndex => $_aFieldsets ) { |
|
218 | + foreach ( $this->numerizeElements( $aItems ) as $_iSubSectionIndex => $_aFieldsets ) { |
|
219 | 219 | |
220 | - foreach( $_aFieldsets as $_aFieldset ) { |
|
220 | + foreach ( $_aFieldsets as $_aFieldset ) { |
|
221 | 221 | $_iCountElement = count( $this->getElementAsArray( $_aNewFieldset, $_iSubSectionIndex ) ); |
222 | 222 | $_aFieldset = $this->_getFieldsetFormatted( |
223 | 223 | $_aFieldset, |
@@ -231,7 +231,7 @@ discard block |
||
231 | 231 | if ( empty( $_aFieldset ) ) { |
232 | 232 | continue; |
233 | 233 | } |
234 | - $_aNewFieldset[ $_iSubSectionIndex ][ $_aFieldset['field_id'] ] = $_aFieldset; |
|
234 | + $_aNewFieldset[ $_iSubSectionIndex ][ $_aFieldset[ 'field_id' ] ] = $_aFieldset; |
|
235 | 235 | } |
236 | 236 | uasort( $_aNewFieldset[ $_iSubSectionIndex ], array( $this, 'sortArrayByKey' ) ); |
237 | 237 | |
@@ -258,7 +258,7 @@ discard block |
||
258 | 258 | } |
259 | 259 | |
260 | 260 | $_aSortedFields = array(); |
261 | - foreach( $aSectionsets as $_sSectionPath => $_aSecitonset ) { |
|
261 | + foreach ( $aSectionsets as $_sSectionPath => $_aSecitonset ) { |
|
262 | 262 | if ( isset( $aFieldsets[ $_sSectionPath ] ) ) { |
263 | 263 | $_aSortedFields[ $_sSectionPath ] = $aFieldsets[ $_sSectionPath ]; |
264 | 264 | } |
@@ -277,7 +277,7 @@ discard block |
||
277 | 277 | private function _getFieldsetFormatted( $aFieldset, $aSectionsets, $sCapability, $iCountOfElements, $iSubSectionIndex, $bIsSectionRepeatable, $oCallerObject ) { |
278 | 278 | |
279 | 279 | // 3.8.0+ Dropped the check for $aFieldset[ 'type' ] to allow it to be omitted. |
280 | - if ( ! isset( $aFieldset[ 'field_id' ] ) ) { |
|
280 | + if ( !isset( $aFieldset[ 'field_id' ] ) ) { |
|
281 | 281 | return; |
282 | 282 | } |
283 | 283 |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | foreach( $aFieldsets as $_sSectionPath => $_aItems ) { |
108 | 108 | |
109 | 109 | // If the section is not set, skip. |
110 | - if ( ! isset( $aSectionsets[ $_sSectionPath ] ) ) { |
|
110 | + if ( ! isset( $aSectionsets[ $_sSectionPath ] ) ) { |
|
111 | 111 | continue; |
112 | 112 | } |
113 | 113 | |
@@ -258,7 +258,7 @@ discard block |
||
258 | 258 | } |
259 | 259 | |
260 | 260 | $_aSortedFields = array(); |
261 | - foreach( $aSectionsets as $_sSectionPath => $_aSecitonset ) { |
|
261 | + foreach( $aSectionsets as $_sSectionPath => $_aSecitonset ) { |
|
262 | 262 | if ( isset( $aFieldsets[ $_sSectionPath ] ) ) { |
263 | 263 | $_aSortedFields[ $_sSectionPath ] = $aFieldsets[ $_sSectionPath ]; |
264 | 264 | } |
@@ -277,7 +277,7 @@ discard block |
||
277 | 277 | private function _getFieldsetFormatted( $aFieldset, $aSectionsets, $sCapability, $iCountOfElements, $iSubSectionIndex, $bIsSectionRepeatable, $oCallerObject ) { |
278 | 278 | |
279 | 279 | // 3.8.0+ Dropped the check for $aFieldset[ 'type' ] to allow it to be omitted. |
280 | - if ( ! isset( $aFieldset[ 'field_id' ] ) ) { |
|
280 | + if ( ! isset( $aFieldset[ 'field_id' ] ) ) { |
|
281 | 281 | return; |
282 | 282 | } |
283 | 283 |
@@ -30,7 +30,6 @@ |
||
30 | 30 | * Returns the field container attribute array. |
31 | 31 | * |
32 | 32 | * @remark Formatting each sub-field should be performed prior to callign this method. |
33 | - * @param array $aField The (sub-)field definition array. This should have been formatted already. |
|
34 | 33 | * @return array The generated field container attribute array. |
35 | 34 | * @internal |
36 | 35 | * @since 3.5.3 |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | * |
26 | 26 | * @since 3.6.0 |
27 | 27 | */ |
28 | - public $sContext = 'field'; |
|
28 | + public $sContext = 'field'; |
|
29 | 29 | |
30 | 30 | /** |
31 | 31 | * Returns the field container attribute array. |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | protected function _getAttributes() { |
42 | 42 | |
43 | 43 | // 3.8.0+ Supports omitting the `type` argument. |
44 | - $_sFieldTypeSelector = $this->getAOrB( |
|
44 | + $_sFieldTypeSelector = $this->getAOrB( |
|
45 | 45 | $this->aArguments[ 'type' ], |
46 | 46 | " admin-page-framework-field-{$this->aArguments[ 'type' ]}", |
47 | 47 | '' |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | |
67 | 67 | return array( |
68 | 68 | 'id' => $this->aArguments[ '_field_container_id' ], |
69 | - 'data-type' => $this->aArguments[ 'type' ], // referred by the repeatable field JavaScript script. |
|
69 | + 'data-type' => $this->aArguments[ 'type' ], // referred by the repeatable field JavaScript script. |
|
70 | 70 | 'class' => "admin-page-framework-field{$_sFieldTypeSelector}{$_sNestedFieldSelector}{$_sMixedFieldSelector}{$_sChildFieldSelector}" |
71 | 71 | . $this->getAOrB( |
72 | 72 | $this->aArguments[ 'attributes' ][ 'disabled' ], |
@@ -60,6 +60,7 @@ |
||
60 | 60 | * |
61 | 61 | * @since 3.1.0 |
62 | 62 | * @since DEVVER Moved from `AdminPageFramework_Form_View___Fieldset`. |
63 | + * @param string $sHeadingMessage |
|
63 | 64 | * @return string The error string message. An empty value if not found. |
64 | 65 | */ |
65 | 66 | private function _getFieldError( $aErrors, $aSectionPath, $aFieldPath, $sHeadingMessage ) { |
@@ -65,7 +65,7 @@ |
||
65 | 65 | private function _getFieldError( $aErrors, $aSectionPath, $aFieldPath, $sHeadingMessage ) { |
66 | 66 | |
67 | 67 | // If this field has a section and the error element is set |
68 | - $_aErrorPath = array_merge( $aSectionPath, $aFieldPath ); |
|
68 | + $_aErrorPath = array_merge( $aSectionPath, $aFieldPath ); |
|
69 | 69 | if ( $this->_hasFieldError( $aErrors, $_aErrorPath ) ) { |
70 | 70 | return "<span class='field-error'>* " |
71 | 71 | . $sHeadingMessage |
@@ -23,7 +23,6 @@ |
||
23 | 23 | * @internal |
24 | 24 | * @since 3.5.3 |
25 | 25 | * @since 3.6.0 Moved from `AdminPageFramework_FormDefinition`. |
26 | - * @param array $aFieldset a field definition array. |
|
27 | 26 | * @return boolean |
28 | 27 | */ |
29 | 28 | protected function _isSectionSet() { |
@@ -60,6 +60,7 @@ |
||
60 | 60 | /** |
61 | 61 | * Applies the subject string to the set callback filter function. |
62 | 62 | * @since 3.6.0 |
63 | + * @param string $sSubject |
|
63 | 64 | */ |
64 | 65 | protected function _getFiltered( $sSubject ) { |
65 | 66 | return is_callable( $this->hfCallback ) |
@@ -51,9 +51,9 @@ |
||
51 | 51 | $_sIndex = $this->getAOrB( |
52 | 52 | '0' !== $this->sIndex && empty( $this->sIndex ), |
53 | 53 | '', |
54 | - "[" . $this->sIndex . "]" |
|
54 | + "[".$this->sIndex."]" |
|
55 | 55 | ); |
56 | - return $this->_getFiltered( $this->_getFieldName() . $_sIndex ); |
|
56 | + return $this->_getFiltered( $this->_getFieldName().$_sIndex ); |
|
57 | 57 | |
58 | 58 | } |
59 | 59 |
@@ -51,6 +51,7 @@ |
||
51 | 51 | /** |
52 | 52 | * Applies the subject string to the set callback filter function. |
53 | 53 | * @since 3.6.0 |
54 | + * @param string $sSubject |
|
54 | 55 | */ |
55 | 56 | protected function _getFiltered( $sSubject ) { |
56 | 57 | return is_callable( $this->hfCallback ) |
@@ -93,8 +93,8 @@ |
||
93 | 93 | |
94 | 94 | // Extract the first part as it does not have braces |
95 | 95 | $_sName = array_shift( $aParts ); |
96 | - foreach( $aParts as $_sPart ) { |
|
97 | - $_sName .= '[' . $_sPart . ']'; |
|
96 | + foreach ( $aParts as $_sPart ) { |
|
97 | + $_sName .= '['.$_sPart.']'; |
|
98 | 98 | } |
99 | 99 | return $_sName; |
100 | 100 |
@@ -121,6 +121,8 @@ |
||
121 | 121 | } |
122 | 122 | /** |
123 | 123 | * @since DEVVER |
124 | + * @param string $sKey |
|
125 | + * @param string $sValue |
|
124 | 126 | * @return void |
125 | 127 | */ |
126 | 128 | public function addResource( $sKey, $sValue ) { |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | * @param string $sType If empty, the method will check if a message exists in all types. Otherwise, it checks the existence of a message of the specified type. |
46 | 46 | * @return boolean True if a setting notice is set; otherwise, false. |
47 | 47 | */ |
48 | - public function hasSubmitNotice( $sType='' ) { |
|
48 | + public function hasSubmitNotice( $sType = '' ) { |
|
49 | 49 | return $this->oSubmitNotice->hasNotice( $sType ); |
50 | 50 | } |
51 | 51 | |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | * @param boolean $bOverride (optional) If true, only one message will be shown in the next page load. false: do not override when there is a message of the same id. true: override the previous one. |
72 | 72 | * @return void |
73 | 73 | */ |
74 | - public function setSubmitNotice( $sMessage, $sType='error', $asAttributes=array(), $bOverride=true ) { |
|
74 | + public function setSubmitNotice( $sMessage, $sType = 'error', $asAttributes = array(), $bOverride = true ) { |
|
75 | 75 | $this->oSubmitNotice->set( |
76 | 76 | $sMessage, |
77 | 77 | $sType, |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | |
99 | 99 | $this->aSectionsets[ $aSectionset[ 'section_id' ] ] = $aSectionset; |
100 | 100 | $this->aFieldsets[ $aSectionset[ 'section_id' ] ] = $this->getElement( |
101 | - $this->aFieldsets, // subject array |
|
101 | + $this->aFieldsets, // subject array |
|
102 | 102 | $aSectionset[ 'section_id' ], // key |
103 | 103 | array() // default |
104 | 104 | ); |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | */ |
114 | 114 | public function removeSection( $sSectionID ) { |
115 | 115 | |
116 | - if ( '_default' === $sSectionID ){ |
|
116 | + if ( '_default' === $sSectionID ) { |
|
117 | 117 | return; |
118 | 118 | } |
119 | 119 | unset( |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | * @return void |
144 | 144 | */ |
145 | 145 | public function addResource( $sKey, $sValue ) { |
146 | - self::$_aResources[ $sKey ][] = $sValue; |
|
146 | + self::$_aResources[ $sKey ][ ] = $sValue; |
|
147 | 147 | } |
148 | 148 | |
149 | 149 | /** |
@@ -166,7 +166,7 @@ discard block |
||
166 | 166 | public function addField( $asFieldset ) { |
167 | 167 | |
168 | 168 | // If it is a target section, update the property and return. |
169 | - if ( ! $this->_isFieldsetDefinition( $asFieldset ) ) { |
|
169 | + if ( !$this->_isFieldsetDefinition( $asFieldset ) ) { |
|
170 | 170 | $this->_asTargetSectionID = $this->_getTargetSectionID( $asFieldset ); |
171 | 171 | return $this->_asTargetSectionID; |
172 | 172 | } |
@@ -175,13 +175,13 @@ discard block |
||
175 | 175 | |
176 | 176 | // Set the target section ID |
177 | 177 | $this->_asTargetSectionID = $this->getElement( |
178 | - $_aFieldset, // subject array |
|
178 | + $_aFieldset, // subject array |
|
179 | 179 | 'section_id', // key |
180 | 180 | $this->_asTargetSectionID // default |
181 | 181 | ); |
182 | 182 | |
183 | 183 | // Required Keys - 3.8.0+ Now 'type' can be omitted. |
184 | - if ( ! isset( $_aFieldset[ 'field_id' ] ) ) { |
|
184 | + if ( !isset( $_aFieldset[ 'field_id' ] ) ) { |
|
185 | 185 | return null; |
186 | 186 | } |
187 | 187 | |
@@ -284,7 +284,7 @@ discard block |
||
284 | 284 | */ |
285 | 285 | public function removeField( $sFieldID ) { |
286 | 286 | |
287 | - foreach( $this->aFieldsets as $_sSectionID => $_aSubSectionsOrFields ) { |
|
287 | + foreach ( $this->aFieldsets as $_sSectionID => $_aSubSectionsOrFields ) { |
|
288 | 288 | |
289 | 289 | if ( array_key_exists( $sFieldID, $_aSubSectionsOrFields ) ) { |
290 | 290 | unset( $this->aFieldsets[ $_sSectionID ][ $sFieldID ] ); |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | */ |
114 | 114 | public function removeSection( $sSectionID ) { |
115 | 115 | |
116 | - if ( '_default' === $sSectionID ){ |
|
116 | + if ( '_default' === $sSectionID ) { |
|
117 | 117 | return; |
118 | 118 | } |
119 | 119 | unset( |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | ); |
182 | 182 | |
183 | 183 | // Required Keys - 3.8.0+ Now 'type' can be omitted. |
184 | - if ( ! isset( $_aFieldset[ 'field_id' ] ) ) { |
|
184 | + if ( ! isset( $_aFieldset[ 'field_id' ] ) ) { |
|
185 | 185 | return null; |
186 | 186 | } |
187 | 187 |
@@ -391,7 +391,6 @@ discard block |
||
391 | 391 | * |
392 | 392 | * @since DEVVER |
393 | 393 | * @param array $aSavedData |
394 | - * @param boolean $bOnlyFieldsets Whether to format only the fieldsets. The taxonomy field factory uses this parameter. |
|
395 | 394 | */ |
396 | 395 | protected function _formatElementDefinitions( array $aSavedData ) { |
397 | 396 | |
@@ -427,7 +426,6 @@ discard block |
||
427 | 426 | * Changed the name from `_getFieldErrors()`. |
428 | 427 | * @access public The field type class accesses this method to render nested fields. |
429 | 428 | * @internal |
430 | - * @param boolean $bDelete whether or not the transient should be deleted after retrieving it. |
|
431 | 429 | * @return array |
432 | 430 | */ |
433 | 431 | public function getFieldErrors() { |
@@ -43,10 +43,10 @@ discard block |
||
43 | 43 | * @since 3.7.0 |
44 | 44 | * @return array |
45 | 45 | */ |
46 | - public function getSubmittedData( array $aDataToParse, $bExtractFromFieldStructure=true, $bStripSlashes=true ) { |
|
46 | + public function getSubmittedData( array $aDataToParse, $bExtractFromFieldStructure = true, $bStripSlashes = true ) { |
|
47 | 47 | |
48 | 48 | // Extracts the form data from the subject data for parsing |
49 | - $_aSubmittedFormData = $bExtractFromFieldStructure |
|
49 | + $_aSubmittedFormData = $bExtractFromFieldStructure |
|
50 | 50 | ? $this->castArrayContents( |
51 | 51 | $this->getDataStructureFromAddedFieldsets(), // form data (options) structure |
52 | 52 | $aDataToParse // the subject data array, usually $_POST. |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | : $aDataToParse; |
55 | 55 | |
56 | 56 | // 3.6.0 - sorts dynamic eleemnts. |
57 | - $_aSubmittedFormData = $this->getSortedInputs( $_aSubmittedFormData ); |
|
57 | + $_aSubmittedFormData = $this->getSortedInputs( $_aSubmittedFormData ); |
|
58 | 58 | |
59 | 59 | return $bStripSlashes |
60 | 60 | ? stripslashes_deep( $_aSubmittedFormData ) // fixes magic quotes |
@@ -79,12 +79,12 @@ discard block |
||
79 | 79 | array_merge( |
80 | 80 | $this->getElementAsArray( |
81 | 81 | $_POST, |
82 | - '__repeatable_elements_' . $this->aArguments[ 'structure_type' ], |
|
82 | + '__repeatable_elements_'.$this->aArguments[ 'structure_type' ], |
|
83 | 83 | array() |
84 | 84 | ), |
85 | 85 | $this->getElementAsArray( |
86 | 86 | $_POST, |
87 | - '__sortable_elements_' . $this->aArguments[ 'structure_type' ], |
|
87 | + '__sortable_elements_'.$this->aArguments[ 'structure_type' ], |
|
88 | 88 | array() |
89 | 89 | ) |
90 | 90 | ) |
@@ -147,9 +147,9 @@ discard block |
||
147 | 147 | * Changed the name from `getFieldsModel()`. |
148 | 148 | * @return array |
149 | 149 | */ |
150 | - public function getDataStructureFromAddedFieldsets() { |
|
150 | + public function getDataStructureFromAddedFieldsets() { |
|
151 | 151 | |
152 | - $_aFormDataStructure = array(); |
|
152 | + $_aFormDataStructure = array(); |
|
153 | 153 | foreach ( $this->getAsArray( $this->aFieldsets ) as $_sSectionID => $_aFieldsets ) { |
154 | 154 | |
155 | 155 | if ( $_sSectionID != '_default' ) { |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | } |
159 | 159 | |
160 | 160 | // For default field items. |
161 | - foreach( $_aFieldsets as $_sFieldID => $_aFieldset ) { |
|
161 | + foreach ( $_aFieldsets as $_sFieldID => $_aFieldset ) { |
|
162 | 162 | $_aFormDataStructure[ $_aFieldset[ 'field_id' ] ] = $_aFieldset; |
163 | 163 | } |
164 | 164 | |
@@ -190,7 +190,7 @@ discard block |
||
190 | 190 | $aSubject, |
191 | 191 | $this->getElementAsArray( |
192 | 192 | $_POST, |
193 | - '__repeatable_elements_' . $this->aArguments[ 'structure_type' ] |
|
193 | + '__repeatable_elements_'.$this->aArguments[ 'structure_type' ] |
|
194 | 194 | ) |
195 | 195 | ); |
196 | 196 | return $_oFilterRepeatableElements->get(); |
@@ -203,13 +203,13 @@ discard block |
||
203 | 203 | public function _replyToRegisterFormItems() { |
204 | 204 | |
205 | 205 | // Check if the form should be created or not. |
206 | - if ( ! $this->isInThePage() ) { |
|
206 | + if ( !$this->isInThePage() ) { |
|
207 | 207 | return; |
208 | 208 | } |
209 | 209 | |
210 | 210 | // Load field type definitions. |
211 | - $this->_setFieldTypeDefinitions( 'admin_page_framework' ); // site-wide |
|
212 | - $this->_setFieldTypeDefinitions( $this->aArguments[ 'caller_id' ] ); // per class |
|
211 | + $this->_setFieldTypeDefinitions( 'admin_page_framework' ); // site-wide |
|
212 | + $this->_setFieldTypeDefinitions( $this->aArguments[ 'caller_id' ] ); // per class |
|
213 | 213 | |
214 | 214 | // Set the options array |
215 | 215 | $this->aSavedData = $this->_getSavedData( |
@@ -237,7 +237,7 @@ discard block |
||
237 | 237 | $this->aArguments, |
238 | 238 | $this->aFieldsets, |
239 | 239 | self::$_aResources, |
240 | - $this->aFieldTypeDefinitions, // must be called after performing `_setFieldTypeDefinitions()`. |
|
240 | + $this->aFieldTypeDefinitions, // must be called after performing `_setFieldTypeDefinitions()`. |
|
241 | 241 | $this->aCallbacks |
242 | 242 | ); |
243 | 243 | self::$_aResources = $_oFieldResources->get(); // updates the property |
@@ -254,10 +254,10 @@ discard block |
||
254 | 254 | $this->callBack( |
255 | 255 | $this->aCallbacks[ 'handle_form_data' ], |
256 | 256 | array( |
257 | - $this->aSavedData, // 1st parameter |
|
258 | - $this->aArguments, // 2nd parameter |
|
259 | - $this->aSectionsets, // 3rd parameter |
|
260 | - $this->aFieldsets, // 4th parameter |
|
257 | + $this->aSavedData, // 1st parameter |
|
258 | + $this->aArguments, // 2nd parameter |
|
259 | + $this->aSectionsets, // 3rd parameter |
|
260 | + $this->aFieldsets, // 4th parameter |
|
261 | 261 | ) |
262 | 262 | ); |
263 | 263 | |
@@ -271,15 +271,15 @@ discard block |
||
271 | 271 | $this->aSectionsets = $this->callBack( |
272 | 272 | $this->aCallbacks[ 'secitonsets_before_registration' ], |
273 | 273 | array( |
274 | - $this->aSectionsets, // 1st parameter |
|
274 | + $this->aSectionsets, // 1st parameter |
|
275 | 275 | ) |
276 | 276 | ); |
277 | 277 | // Let the main routine modify the fieldsets definition array. |
278 | 278 | $this->aFieldsets = $this->callBack( |
279 | 279 | $this->aCallbacks[ 'fieldsets_before_registration' ], |
280 | 280 | array( |
281 | - $this->aFieldsets, // 1st parameter |
|
282 | - $this->aSectionsets, // 2nd parameter |
|
281 | + $this->aFieldsets, // 1st parameter |
|
282 | + $this->aSectionsets, // 2nd parameter |
|
283 | 283 | ) |
284 | 284 | ); |
285 | 285 |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | array( $this, '_replyToRegisterFormItems' ), |
30 | 30 | 100 // priority - low value is set as meta boxes use the `current_screen` action hook for `setUp()`. |
31 | 31 | ); |
32 | - } else { |
|
32 | + } else { |
|
33 | 33 | add_action( |
34 | 34 | $this->aArguments[ 'action_hook_form_registration' ], |
35 | 35 | array( $this, '_replyToRegisterFormItems' ) |
@@ -147,12 +147,12 @@ discard block |
||
147 | 147 | * Changed the name from `getFieldsModel()`. |
148 | 148 | * @return array |
149 | 149 | */ |
150 | - public function getDataStructureFromAddedFieldsets() { |
|
150 | + public function getDataStructureFromAddedFieldsets() { |
|
151 | 151 | |
152 | 152 | $_aFormDataStructure = array(); |
153 | 153 | foreach ( $this->getAsArray( $this->aFieldsets ) as $_sSectionID => $_aFieldsets ) { |
154 | 154 | |
155 | - if ( $_sSectionID != '_default' ) { |
|
155 | + if ( $_sSectionID != '_default' ) { |
|
156 | 156 | $_aFormDataStructure[ $_sSectionID ] = $_aFieldsets; |
157 | 157 | continue; |
158 | 158 | } |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | * @param array $aSubject The subject array to modify. Usually the saved option data. |
186 | 186 | * @return array The modified options array. |
187 | 187 | */ |
188 | - public function dropRepeatableElements( array $aSubject ) { |
|
188 | + public function dropRepeatableElements( array $aSubject ) { |
|
189 | 189 | $_oFilterRepeatableElements = new AdminPageFramework_Form_Model___Modifier_FilterRepeatableElements( |
190 | 190 | $aSubject, |
191 | 191 | $this->getElementAsArray( |
@@ -231,6 +231,7 @@ discard block |
||
231 | 231 | /** |
232 | 232 | * Returns the system information by section. |
233 | 233 | * @since 3.5.3 |
234 | + * @param integer $iPrintType |
|
234 | 235 | * @return string The system information by section. |
235 | 236 | */ |
236 | 237 | private function _getSystemInfoBySection( $sSectionName, $aData, $iPrintType ) { |
@@ -350,6 +351,8 @@ discard block |
||
350 | 351 | /** |
351 | 352 | * |
352 | 353 | * @since 3.5.12 |
354 | + * @param string $asCategories |
|
355 | + * @param string $asRemovingCategories |
|
353 | 356 | * @return stirng|array |
354 | 357 | */ |
355 | 358 | private function _getDefinedConstants( $asCategories=null, $asRemovingCategories=null ) { |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | * @internal |
145 | 145 | * @return array |
146 | 146 | */ |
147 | - protected function getEnqueuingScripts() { |
|
147 | + protected function getEnqueuingScripts() { |
|
148 | 148 | return array(); |
149 | 149 | } |
150 | 150 | |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | * @return array |
163 | 163 | * @internal |
164 | 164 | */ |
165 | - protected function getEnqueuingStyles() { |
|
165 | + protected function getEnqueuingStyles() { |
|
166 | 166 | return array(); |
167 | 167 | } |
168 | 168 | |
@@ -172,7 +172,7 @@ discard block |
||
172 | 172 | * @internal |
173 | 173 | * @return string |
174 | 174 | */ |
175 | - protected function getScripts() { |
|
175 | + protected function getScripts() { |
|
176 | 176 | return ''; |
177 | 177 | } |
178 | 178 | |
@@ -182,7 +182,7 @@ discard block |
||
182 | 182 | * @internal |
183 | 183 | * @return string |
184 | 184 | */ |
185 | - protected function getIEStyles() { |
|
185 | + protected function getIEStyles() { |
|
186 | 186 | return ''; |
187 | 187 | } |
188 | 188 | |
@@ -223,7 +223,7 @@ discard block |
||
223 | 223 | * @internal |
224 | 224 | * @return string |
225 | 225 | */ |
226 | - protected function getField( $aField ) { |
|
226 | + protected function getField( $aField ) { |
|
227 | 227 | |
228 | 228 | $_aInputAttributes = $aField['attributes']; |
229 | 229 | $_aInputAttributes['class'] .= ' system'; |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | * </code> |
74 | 74 | * @var array |
75 | 75 | */ |
76 | - public $aFieldTypeSlugs = array( 'system', ); |
|
76 | + public $aFieldTypeSlugs = array( 'system',); |
|
77 | 77 | |
78 | 78 | /** |
79 | 79 | * Defines the default key-values of this field type. |
@@ -93,8 +93,8 @@ discard block |
||
93 | 93 | * @remark `$_aDefaultKeys` holds shared default key-values defined in the base class. |
94 | 94 | */ |
95 | 95 | protected $aDefaultKeys = array( |
96 | - 'data' => array(), // [3.2.0+] Stores the data to be displayed |
|
97 | - 'print_type' => 1, // [3.4.6+] 1: readable representation of array. 2: print_r() |
|
96 | + 'data' => array(), // [3.2.0+] Stores the data to be displayed |
|
97 | + 'print_type' => 1, // [3.4.6+] 1: readable representation of array. 2: print_r() |
|
98 | 98 | 'attributes' => array( |
99 | 99 | 'rows' => 60, |
100 | 100 | 'autofocus' => null, |
@@ -233,13 +233,13 @@ discard block |
||
233 | 233 | . "<div class='admin-page-framework-input-label-container'>" |
234 | 234 | . "<label for='{$aField[ 'input_id' ]}'>" |
235 | 235 | . $aField[ 'before_input' ] |
236 | - . ( $aField[ 'label' ] && ! $aField[ 'repeatable' ] |
|
237 | - ? "<span " . $this->getLabelContainerAttributes( $aField, 'admin-page-framework-input-label-string' ) . ">" |
|
236 | + . ( $aField[ 'label' ] && !$aField[ 'repeatable' ] |
|
237 | + ? "<span ".$this->getLabelContainerAttributes( $aField, 'admin-page-framework-input-label-string' ).">" |
|
238 | 238 | . $aField[ 'label' ] |
239 | 239 | . "</span>" |
240 | 240 | : "" |
241 | 241 | ) |
242 | - . "<textarea " . $this->getAttributes( $_aInputAttributes ) . " >" |
|
242 | + . "<textarea ".$this->getAttributes( $_aInputAttributes )." >" |
|
243 | 243 | . esc_textarea( $this->_getSystemInfomation( $aField[ 'value' ], $aField[ 'data' ], $aField[ 'print_type' ] ) ) |
244 | 244 | . "</textarea>" |
245 | 245 | . $aField[ 'after_input' ] |
@@ -254,15 +254,15 @@ discard block |
||
254 | 254 | * @return string The human readable system information. |
255 | 255 | * @internal |
256 | 256 | */ |
257 | - private function _getSystemInfomation( $asValue=null, $asCustomData=null, $iPrintType=1 ) { |
|
257 | + private function _getSystemInfomation( $asValue = null, $asCustomData = null, $iPrintType = 1 ) { |
|
258 | 258 | |
259 | 259 | if ( isset( $asValue ) ) { |
260 | 260 | return $asValue; |
261 | 261 | } |
262 | 262 | |
263 | - $_aOutput = array(); |
|
264 | - foreach( $this->_getFormattedSystemInformation( $asCustomData ) as $_sSection => $_aInfo ) { |
|
265 | - $_aOutput[] = $this->_getSystemInfoBySection( $_sSection, $_aInfo, $iPrintType ); |
|
263 | + $_aOutput = array(); |
|
264 | + foreach ( $this->_getFormattedSystemInformation( $asCustomData ) as $_sSection => $_aInfo ) { |
|
265 | + $_aOutput[ ] = $this->_getSystemInfoBySection( $_sSection, $_aInfo, $iPrintType ); |
|
266 | 266 | } |
267 | 267 | return implode( PHP_EOL, $_aOutput ); |
268 | 268 | |
@@ -277,18 +277,18 @@ discard block |
||
277 | 277 | |
278 | 278 | $_aData = $this->getAsArray( $asCustomData ); |
279 | 279 | $_aData = $_aData + array( |
280 | - 'Admin Page Framework' => isset( $_aData['Admin Page Framework'] ) |
|
280 | + 'Admin Page Framework' => isset( $_aData[ 'Admin Page Framework' ] ) |
|
281 | 281 | ? null |
282 | 282 | : AdminPageFramework_Registry::getInfo(), |
283 | - 'WordPress' => $this->_getSiteInfoWithCache( ! isset( $_aData['WordPress'] ) ), |
|
284 | - 'PHP' => $this->_getPHPInfo( ! isset( $_aData['PHP'] ) ), |
|
285 | - 'PHP Error Log' => $this->_getErrorLogByType( 'php', ! isset( $_aData['PHP Error Log'] ) ), |
|
286 | - 'MySQL' => isset( $_aData['MySQL'] ) |
|
283 | + 'WordPress' => $this->_getSiteInfoWithCache( !isset( $_aData[ 'WordPress' ] ) ), |
|
284 | + 'PHP' => $this->_getPHPInfo( !isset( $_aData[ 'PHP' ] ) ), |
|
285 | + 'PHP Error Log' => $this->_getErrorLogByType( 'php', !isset( $_aData[ 'PHP Error Log' ] ) ), |
|
286 | + 'MySQL' => isset( $_aData[ 'MySQL' ] ) |
|
287 | 287 | ? null |
288 | - : $this->getMySQLInfo(), // defined in the utility class. |
|
289 | - 'MySQL Error Log' => $this->_getErrorLogByType( 'mysql', ! isset( $_aData['MySQL Error Log'] ) ), |
|
290 | - 'Server' => $this->_getWebServerInfo( ! isset( $_aData['Server'] ) ), |
|
291 | - 'Browser' => $this->_getClientInfo( ! isset( $_aData['Browser'] ) ), |
|
288 | + : $this->getMySQLInfo(), // defined in the utility class. |
|
289 | + 'MySQL Error Log' => $this->_getErrorLogByType( 'mysql', !isset( $_aData[ 'MySQL Error Log' ] ) ), |
|
290 | + 'Server' => $this->_getWebServerInfo( !isset( $_aData[ 'Server' ] ) ), |
|
291 | + 'Browser' => $this->_getClientInfo( !isset( $_aData[ 'Browser' ] ) ), |
|
292 | 292 | ); |
293 | 293 | |
294 | 294 | // Dropping empty elements allows the user to remove a section by setting an empty section. |
@@ -305,10 +305,10 @@ discard block |
||
305 | 305 | switch ( $iPrintType ) { |
306 | 306 | default: |
307 | 307 | case 1: // use the framework readable representation of arrays. |
308 | - return $this->getReadableArrayContents( $sSectionName, $aData, 32 ) . PHP_EOL; |
|
308 | + return $this->getReadableArrayContents( $sSectionName, $aData, 32 ).PHP_EOL; |
|
309 | 309 | case 2: // use print_r() |
310 | - return "[{$sSectionName}]" . PHP_EOL |
|
311 | - . print_r( $aData, true ) . PHP_EOL; |
|
310 | + return "[{$sSectionName}]".PHP_EOL |
|
311 | + . print_r( $aData, true ).PHP_EOL; |
|
312 | 312 | } |
313 | 313 | } |
314 | 314 | /** |
@@ -318,17 +318,17 @@ discard block |
||
318 | 318 | * @since 3.4.6 |
319 | 319 | * @since 3.5.3 Added the $bGenerateInfo paramter. This is to reduce conditional statment in the caller method. |
320 | 320 | */ |
321 | - private function _getClientInfo( $bGenerateInfo=true ) { |
|
321 | + private function _getClientInfo( $bGenerateInfo = true ) { |
|
322 | 322 | |
323 | - if ( ! $bGenerateInfo ) { |
|
323 | + if ( !$bGenerateInfo ) { |
|
324 | 324 | return ''; |
325 | 325 | } |
326 | 326 | |
327 | 327 | // Check the browscap value in the ini file first to prevent warnings from being populated |
328 | 328 | $_aBrowser = @ini_get( 'browscap' ) |
329 | - ? get_browser( $_SERVER['HTTP_USER_AGENT'], true ) |
|
329 | + ? get_browser( $_SERVER[ 'HTTP_USER_AGENT' ], true ) |
|
330 | 330 | : array(); |
331 | - unset( $_aBrowser['browser_name_regex'] ); // this element causes output to be blank |
|
331 | + unset( $_aBrowser[ 'browser_name_regex' ] ); // this element causes output to be blank |
|
332 | 332 | return empty( $_aBrowser ) |
333 | 333 | ? __( 'No browser information found.', 'admin-page-framework' ) |
334 | 334 | : $_aBrowser; |
@@ -344,9 +344,9 @@ discard block |
||
344 | 344 | * @param string $sType The error log type. Either 'php' or 'mysql' is accepted. |
345 | 345 | * @param boolean $bGenerateInfo Whether to generate a log. This is for the caller method to reduce a conditinal statement. |
346 | 346 | */ |
347 | - private function _getErrorLogByType( $sType, $bGenerateInfo=true ) { |
|
347 | + private function _getErrorLogByType( $sType, $bGenerateInfo = true ) { |
|
348 | 348 | |
349 | - if ( ! $bGenerateInfo ) { |
|
349 | + if ( !$bGenerateInfo ) { |
|
350 | 350 | return ''; |
351 | 351 | } |
352 | 352 | switch ( $sType ) { |
@@ -378,9 +378,9 @@ discard block |
||
378 | 378 | * @since 3.5.3 Added the $bGenerateInfo paramter. This is to reduce conditional statment in the caller method. |
379 | 379 | * @return array The generated site information array. |
380 | 380 | */ |
381 | - private function _getSiteInfoWithCache( $bGenerateInfo=true ) { |
|
381 | + private function _getSiteInfoWithCache( $bGenerateInfo = true ) { |
|
382 | 382 | |
383 | - if ( ! $bGenerateInfo || isset( self::$_aSiteInfo ) ) { |
|
383 | + if ( !$bGenerateInfo || isset( self::$_aSiteInfo ) ) { |
|
384 | 384 | return self::$_aSiteInfo; |
385 | 385 | } |
386 | 386 | self::$_aSiteInfo = self::_getSiteInfo(); |
@@ -414,8 +414,8 @@ discard block |
||
414 | 414 | 'wp_remote_get()' => $this->_getWPRemoteGetStatus(), |
415 | 415 | __( 'Multibite String Extension', 'admin-page-framework' ) => $this->getAOrB( function_exists( 'mb_detect_encoding' ), $this->oMsg->get( 'enabled' ), $this->oMsg->get( 'disabled' ) ), |
416 | 416 | __( 'WP_CONTENT_DIR Writeable', 'admin-page-framework' ) => $this->getAOrB( is_writable( WP_CONTENT_DIR ), $this->oMsg->get( 'yes' ), $this->oMsg->get( 'no' ) ), |
417 | - __( 'Active Plugins', 'admin-page-framework' ) => PHP_EOL . $this->_getActivePlugins(), |
|
418 | - __( 'Network Active Plugins', 'admin-page-framework' ) => PHP_EOL . $this->_getNetworkActivePlugins(), |
|
417 | + __( 'Active Plugins', 'admin-page-framework' ) => PHP_EOL.$this->_getActivePlugins(), |
|
418 | + __( 'Network Active Plugins', 'admin-page-framework' ) => PHP_EOL.$this->_getNetworkActivePlugins(), |
|
419 | 419 | __( 'Constants', 'admin-page-framework' ) => $this->_getDefinedConstants( 'user' ), |
420 | 420 | ); |
421 | 421 | } |
@@ -425,9 +425,9 @@ discard block |
||
425 | 425 | * @return string|array |
426 | 426 | * @internal |
427 | 427 | */ |
428 | - private function _getDefinedConstants( $asCategories=null, $asRemovingCategories=null ) { |
|
428 | + private function _getDefinedConstants( $asCategories = null, $asRemovingCategories = null ) { |
|
429 | 429 | $_asConstants = $this->getDefinedConstants( $asCategories, $asRemovingCategories ); |
430 | - if ( ! is_array( $_asConstants ) ) { |
|
430 | + if ( !is_array( $_asConstants ) ) { |
|
431 | 431 | return $_asConstants; |
432 | 432 | } |
433 | 433 | if ( isset( $_asConstants[ 'user' ] ) ) { |
@@ -463,13 +463,13 @@ discard block |
||
463 | 463 | private function _getActiveThemeName() { |
464 | 464 | |
465 | 465 | // If the WordPress version is less than 3.4, |
466 | - if ( version_compare( $GLOBALS['wp_version'], '3.4', '<' ) ) { |
|
467 | - $_aThemeData = get_theme_data( get_stylesheet_directory() . '/style.css' ); |
|
468 | - return $_aThemeData['Name'] . ' ' . $_aThemeData['Version']; |
|
466 | + if ( version_compare( $GLOBALS[ 'wp_version' ], '3.4', '<' ) ) { |
|
467 | + $_aThemeData = get_theme_data( get_stylesheet_directory().'/style.css' ); |
|
468 | + return $_aThemeData[ 'Name' ].' '.$_aThemeData[ 'Version' ]; |
|
469 | 469 | } |
470 | 470 | |
471 | 471 | $_oThemeData = wp_get_theme(); |
472 | - return $_oThemeData->Name . ' ' . $_oThemeData->Version; |
|
472 | + return $_oThemeData->Name.' '.$_oThemeData->Version; |
|
473 | 473 | |
474 | 474 | } |
475 | 475 | /** |
@@ -483,10 +483,10 @@ discard block |
||
483 | 483 | $_aPluginList = array(); |
484 | 484 | $_aActivePlugins = get_option( 'active_plugins', array() ); |
485 | 485 | foreach ( get_plugins() as $_sPluginPath => $_aPlugin ) { |
486 | - if ( ! in_array( $_sPluginPath, $_aActivePlugins ) ) { |
|
486 | + if ( !in_array( $_sPluginPath, $_aActivePlugins ) ) { |
|
487 | 487 | continue; |
488 | 488 | } |
489 | - $_aPluginList[] = ' ' . $_aPlugin['Name'] . ': ' . $_aPlugin['Version']; |
|
489 | + $_aPluginList[ ] = ' '.$_aPlugin[ 'Name' ].': '.$_aPlugin[ 'Version' ]; |
|
490 | 490 | } |
491 | 491 | return implode( PHP_EOL, $_aPluginList ); |
492 | 492 | |
@@ -498,17 +498,17 @@ discard block |
||
498 | 498 | */ |
499 | 499 | private function _getNetworkActivePlugins() { |
500 | 500 | |
501 | - if ( ! is_multisite() ) { |
|
501 | + if ( !is_multisite() ) { |
|
502 | 502 | return ''; |
503 | 503 | } |
504 | 504 | $_aPluginList = array(); |
505 | 505 | $_aActivePlugins = get_site_option( 'active_sitewide_plugins', array() ); |
506 | 506 | foreach ( wp_get_active_network_plugins() as $_sPluginPath ) { |
507 | - if ( ! array_key_exists( plugin_basename( $_sPluginPath ), $_aActivePlugins ) ) { |
|
507 | + if ( !array_key_exists( plugin_basename( $_sPluginPath ), $_aActivePlugins ) ) { |
|
508 | 508 | continue; |
509 | 509 | } |
510 | 510 | $_aPlugin = get_plugin_data( $_sPluginPath ); |
511 | - $_aPluginList[] = ' ' . $_aPlugin['Name'] . ' :' . $_aPlugin['Version']; |
|
511 | + $_aPluginList[ ] = ' '.$_aPlugin[ 'Name' ].' :'.$_aPlugin[ 'Version' ]; |
|
512 | 512 | } |
513 | 513 | return implode( PHP_EOL, $_aPluginList ); |
514 | 514 | |
@@ -526,7 +526,7 @@ discard block |
||
526 | 526 | $_vResponse = false === $_vResponse |
527 | 527 | ? wp_remote_post( |
528 | 528 | // 'https://www.paypal.com/cgi-bin/webscr', |
529 | - add_query_arg( $_GET, admin_url( $GLOBALS['pagenow'] ) ), |
|
529 | + add_query_arg( $_GET, admin_url( $GLOBALS[ 'pagenow' ] ) ), |
|
530 | 530 | array( |
531 | 531 | 'sslverify' => false, |
532 | 532 | 'timeout' => 60, |
@@ -549,7 +549,7 @@ discard block |
||
549 | 549 | $_vResponse = $this->getTransient( 'apf_rg_check' ); |
550 | 550 | $_vResponse = false === $_vResponse |
551 | 551 | ? wp_remote_get( |
552 | - add_query_arg( $_GET + array( 'apf_remote_request_test' => '_testing' ), admin_url( $GLOBALS['pagenow'] ) ), |
|
552 | + add_query_arg( $_GET + array( 'apf_remote_request_test' => '_testing' ), admin_url( $GLOBALS[ 'pagenow' ] ) ), |
|
553 | 553 | array( |
554 | 554 | 'sslverify' => false, |
555 | 555 | 'timeout' => 60, |
@@ -574,7 +574,7 @@ discard block |
||
574 | 574 | if ( is_wp_error( $mResponse ) ) { |
575 | 575 | return true; |
576 | 576 | } |
577 | - if ( $mResponse[ 'response'][ 'code' ] < 200 ) { |
|
577 | + if ( $mResponse[ 'response' ][ 'code' ] < 200 ) { |
|
578 | 578 | return true; |
579 | 579 | } |
580 | 580 | if ( $mResponse[ 'response' ][ 'code' ] >= 300 ) { |
@@ -597,13 +597,13 @@ discard block |
||
597 | 597 | * @since 3.4.6 |
598 | 598 | * @since 3.5.3 Added the $bGenerateInfo parameter. This is to reduce conditional statement in the caller method. |
599 | 599 | */ |
600 | - private function _getPHPInfo( $bGenerateInfo=true ) { |
|
600 | + private function _getPHPInfo( $bGenerateInfo = true ) { |
|
601 | 601 | |
602 | - if ( ! $bGenerateInfo || isset( self::$_aPHPInfo ) ) { |
|
602 | + if ( !$bGenerateInfo || isset( self::$_aPHPInfo ) ) { |
|
603 | 603 | return self::$_aPHPInfo; |
604 | 604 | } |
605 | 605 | |
606 | - $_oErrorReporting = new AdminPageFramework_ErrorReporting; |
|
606 | + $_oErrorReporting = new AdminPageFramework_ErrorReporting; |
|
607 | 607 | self::$_aPHPInfo = array( |
608 | 608 | __( 'Version', 'admin-page-framework' ) => phpversion(), |
609 | 609 | __( 'Safe Mode', 'admin-page-framework' ) => $this->getAOrB( @ini_get( 'safe_mode' ), $this->oMsg->get( 'yes' ), $this->oMsg->get( 'no' ) ), |
@@ -614,16 +614,16 @@ discard block |
||
614 | 614 | __( 'Max Execution Time', 'admin-page-framework' ) => @ini_get( 'max_execution_time' ), |
615 | 615 | __( 'Max Input Vars', 'admin-page-framework' ) => @ini_get( 'max_input_vars' ), |
616 | 616 | __( 'Argument Separator', 'admin-page-framework' ) => @ini_get( 'arg_separator.output' ), |
617 | - __( 'Allow URL File Open', 'admin-page-framework' ) => $this->getAOrB( @ini_get( 'allow_url_fopen' ), $this->oMsg->get( 'yes' ), $this->oMsg->get( 'no' ) ), |
|
618 | - __( 'Display Errors', 'admin-page-framework' ) => $this->getAOrB( @ini_get( 'display_errors' ), $this->oMsg->get( 'on' ), $this->oMsg->get( 'off' ) ), |
|
619 | - __( 'Log Errors', 'admin-page-framework' ) => $this->getAOrB( @ini_get( 'log_errors' ), $this->oMsg->get( 'on' ), $this->oMsg->get( 'off' ) ), |
|
617 | + __( 'Allow URL File Open', 'admin-page-framework' ) => $this->getAOrB( @ini_get( 'allow_url_fopen' ), $this->oMsg->get( 'yes' ), $this->oMsg->get( 'no' ) ), |
|
618 | + __( 'Display Errors', 'admin-page-framework' ) => $this->getAOrB( @ini_get( 'display_errors' ), $this->oMsg->get( 'on' ), $this->oMsg->get( 'off' ) ), |
|
619 | + __( 'Log Errors', 'admin-page-framework' ) => $this->getAOrB( @ini_get( 'log_errors' ), $this->oMsg->get( 'on' ), $this->oMsg->get( 'off' ) ), |
|
620 | 620 | __( 'Error log location', 'admin-page-framework' ) => @ini_get( 'error_log' ), |
621 | 621 | __( 'Error Reporting Level', 'admin-page-framework' ) => $_oErrorReporting->getErrorLevel(), |
622 | - __( 'FSOCKOPEN', 'admin-page-framework' ) => $this->getAOrB( function_exists( 'fsockopen' ), $this->oMsg->get( 'supported' ), $this->oMsg->get( 'not_supported' ) ), |
|
623 | - __( 'cURL', 'admin-page-framework' ) => $this->getAOrB( function_exists( 'curl_init' ), $this->oMsg->get( 'supported' ), $this->oMsg->get( 'not_supported' ) ), |
|
624 | - __( 'SOAP', 'admin-page-framework' ) => $this->getAOrB( class_exists( 'SoapClient' ), $this->oMsg->get( 'supported' ), $this->oMsg->get( 'not_supported' ) ), |
|
625 | - __( 'SUHOSIN', 'admin-page-framework' ) => $this->getAOrB( extension_loaded( 'suhosin' ), $this->oMsg->get( 'supported' ), $this->oMsg->get( 'not_supported' ) ), |
|
626 | - 'ini_set()' => $this->getAOrB( function_exists( 'ini_set' ), $this->oMsg->get( 'supported' ), $this->oMsg->get( 'not_supported' ) ), |
|
622 | + __( 'FSOCKOPEN', 'admin-page-framework' ) => $this->getAOrB( function_exists( 'fsockopen' ), $this->oMsg->get( 'supported' ), $this->oMsg->get( 'not_supported' ) ), |
|
623 | + __( 'cURL', 'admin-page-framework' ) => $this->getAOrB( function_exists( 'curl_init' ), $this->oMsg->get( 'supported' ), $this->oMsg->get( 'not_supported' ) ), |
|
624 | + __( 'SOAP', 'admin-page-framework' ) => $this->getAOrB( class_exists( 'SoapClient' ), $this->oMsg->get( 'supported' ), $this->oMsg->get( 'not_supported' ) ), |
|
625 | + __( 'SUHOSIN', 'admin-page-framework' ) => $this->getAOrB( extension_loaded( 'suhosin' ), $this->oMsg->get( 'supported' ), $this->oMsg->get( 'not_supported' ) ), |
|
626 | + 'ini_set()' => $this->getAOrB( function_exists( 'ini_set' ), $this->oMsg->get( 'supported' ), $this->oMsg->get( 'not_supported' ) ), |
|
627 | 627 | ) |
628 | 628 | + $this->getPHPInfo() |
629 | 629 | + array( |
@@ -642,11 +642,11 @@ discard block |
||
642 | 642 | * @since 3.5.3 Added the $bGenerateInfo paramter. This is to reduce conditional statment in the caller method. |
643 | 643 | * @return array|string |
644 | 644 | */ |
645 | - private function _getWebServerInfo( $bGenerateInfo=true ) { |
|
645 | + private function _getWebServerInfo( $bGenerateInfo = true ) { |
|
646 | 646 | |
647 | 647 | return $bGenerateInfo |
648 | 648 | ? array( |
649 | - __( 'Web Server', 'admin-page-framework' ) => $_SERVER['SERVER_SOFTWARE'], |
|
649 | + __( 'Web Server', 'admin-page-framework' ) => $_SERVER[ 'SERVER_SOFTWARE' ], |
|
650 | 650 | 'SSL' => $this->getAOrB( is_ssl(), $this->oMsg->get( 'yes' ), $this->oMsg->get( 'no' ) ), |
651 | 651 | __( 'Session', 'admin-page-framework' ) => $this->getAOrB( isset( $_SESSION ), $this->oMsg->get( 'enabled' ), $this->oMsg->get( 'disabled' ) ), |
652 | 652 | __( 'Session Name', 'admin-page-framework' ) => esc_html( @ini_get( 'session.name' ) ), |