@@ -18,14 +18,14 @@ discard block |
||
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 |
||
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 |
||
102 | 102 | * @since 3.7.0 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 | $_sFieldsetsInSectionTitle = $this->_getFieldsetsOutputInSectionTitleArea( $aFieldsets, $iSectionIndex, $aFieldTypeDefinitions ); |
108 | 108 | return $_sFieldsetsInSectionTitle |
@@ -138,14 +138,14 @@ discard block |
||
138 | 138 | private function _getFieldsetsOutputInSectionTitleArea( array $aFieldsets, $iSectionIndex, $aFieldTypeDefinitions ) { |
139 | 139 | |
140 | 140 | $_aFieldsetsInSectionTitle = array(); |
141 | - $_aFieldsetsInSectionTitle[] = $this->_getSectionTitleField( $aFieldsets, $iSectionIndex, $aFieldTypeDefinitions ); |
|
141 | + $_aFieldsetsInSectionTitle[ ] = $this->_getSectionTitleField( $aFieldsets, $iSectionIndex, $aFieldTypeDefinitions ); |
|
142 | 142 | $_aFieldsetsInSectionTitle = array_merge( |
143 | 143 | $_aFieldsetsInSectionTitle, |
144 | 144 | $this->_getFieldsetsInSectionTitleArea( $aFieldsets, $iSectionIndex, $aFieldTypeDefinitions ) |
145 | 145 | ); |
146 | 146 | $_sOutput = ''; |
147 | - foreach( $_aFieldsetsInSectionTitle as $_aFieldset ) { |
|
148 | - if ( empty( $_aFieldset ) ) { |
|
147 | + foreach ( $_aFieldsetsInSectionTitle as $_aFieldset ) { |
|
148 | + if ( empty( $_aFieldset ) ) { |
|
149 | 149 | continue; |
150 | 150 | } |
151 | 151 | $_sOutput .= $this->getFieldsetOutput( $_aFieldset ); |
@@ -161,7 +161,7 @@ discard block |
||
161 | 161 | private function _getFieldsetsInSectionTitleArea( array $aFieldsets, $iSectionIndex, $aFieldTypeDefinitions ) { |
162 | 162 | |
163 | 163 | $_aFieldsetsInSectionTitle = array(); |
164 | - foreach( $aFieldsets as $_aFieldset ) { |
|
164 | + foreach ( $aFieldsets as $_aFieldset ) { |
|
165 | 165 | |
166 | 166 | if ( 'section_title' !== $_aFieldset[ 'placement' ] ) { |
167 | 167 | continue; |
@@ -172,7 +172,7 @@ discard block |
||
172 | 172 | $iSectionIndex, |
173 | 173 | $aFieldTypeDefinitions |
174 | 174 | ); |
175 | - $_aFieldsetsInSectionTitle[] = $_oFieldsetOutputFormatter->get(); |
|
175 | + $_aFieldsetsInSectionTitle[ ] = $_oFieldsetOutputFormatter->get(); |
|
176 | 176 | |
177 | 177 | } |
178 | 178 | return $_aFieldsetsInSectionTitle; |
@@ -191,7 +191,7 @@ discard block |
||
191 | 191 | */ |
192 | 192 | private function _getSectionTitleField( array $aFieldsets, $iSectionIndex, $aFieldTypeDefinitions ) { |
193 | 193 | |
194 | - foreach( $aFieldsets as $_aFieldset ) { |
|
194 | + foreach ( $aFieldsets as $_aFieldset ) { |
|
195 | 195 | |
196 | 196 | if ( 'section_title' !== $_aFieldset[ 'type' ] ) { |
197 | 197 | continue; |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | * @since 3.7.0 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, |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | * @since 3.8.0 |
136 | 136 | * @internal |
137 | 137 | */ |
138 | - private function _getFieldsetsOutputInSectionTitleArea( array $aFieldsets, $iSectionIndex, $aFieldTypeDefinitions ) { |
|
138 | + private function _getFieldsetsOutputInSectionTitleArea( array $aFieldsets, $iSectionIndex, $aFieldTypeDefinitions ) { |
|
139 | 139 | |
140 | 140 | $_aFieldsetsInSectionTitle = array(); |
141 | 141 | $_aFieldsetsInSectionTitle[] = $this->_getSectionTitleField( $aFieldsets, $iSectionIndex, $aFieldTypeDefinitions ); |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | ); |
146 | 146 | $_sOutput = ''; |
147 | 147 | foreach( $_aFieldsetsInSectionTitle as $_aFieldset ) { |
148 | - if ( empty( $_aFieldset ) ) { |
|
148 | + if ( empty( $_aFieldset ) ) { |
|
149 | 149 | continue; |
150 | 150 | } |
151 | 151 | $_sOutput .= $this->getFieldsetOutput( $_aFieldset ); |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | * @since 3.7.0 Moved from `AdminPageFramework_FormPart_SectionTitle`. |
190 | 190 | * @return array|void |
191 | 191 | */ |
192 | - private function _getSectionTitleField( array $aFieldsets, $iSectionIndex, $aFieldTypeDefinitions ) { |
|
192 | + private function _getSectionTitleField( array $aFieldsets, $iSectionIndex, $aFieldTypeDefinitions ) { |
|
193 | 193 | |
194 | 194 | foreach( $aFieldsets as $_aFieldset ) { |
195 | 195 |
@@ -32,7 +32,7 @@ discard block |
||
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. |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | |
61 | 61 | $aFieldset = $this->aFieldset; |
62 | 62 | |
63 | - if ( ! $this->isNormalPlacement( $aFieldset ) ) { |
|
63 | + if ( !$this->isNormalPlacement( $aFieldset ) ) { |
|
64 | 64 | return ''; |
65 | 65 | } |
66 | 66 | |
@@ -71,7 +71,7 @@ discard block |
||
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 | ); |
@@ -183,6 +183,8 @@ |
||
183 | 183 | } |
184 | 184 | /** |
185 | 185 | * Trims a traling sub-string if exists. |
186 | + * @param string $sString |
|
187 | + * @param string $sSuffix |
|
186 | 188 | * @return string |
187 | 189 | * @since 3.7.2 |
188 | 190 | */ |
@@ -36,16 +36,16 @@ discard block |
||
36 | 36 | * @since 3.8.4 When non-true value is passed, `0px` will be returned. |
37 | 37 | * @return string |
38 | 38 | */ |
39 | - static public function getLengthSanitized( $sLength, $sUnit='px' ) { |
|
39 | + static public function getLengthSanitized( $sLength, $sUnit = 'px' ) { |
|
40 | 40 | $sLength = $sLength ? $sLength : 0; |
41 | 41 | return is_numeric( $sLength ) |
42 | - ? $sLength . $sUnit |
|
42 | + ? $sLength.$sUnit |
|
43 | 43 | : $sLength; |
44 | 44 | } |
45 | 45 | /** |
46 | 46 | * @deprecated 3.8.0 Use `getLengthSanitized()` instead. |
47 | 47 | */ |
48 | - static public function sanitizeLength( $sLength, $sUnit='px' ) { |
|
48 | + static public function sanitizeLength( $sLength, $sUnit = 'px' ) { |
|
49 | 49 | return self::getLengthSanitized( $sLength, $sUnit ); |
50 | 50 | } |
51 | 51 | |
@@ -88,9 +88,9 @@ discard block |
||
88 | 88 | * @since 2.0.0 |
89 | 89 | * @return string|integer A numeric value will be returned. |
90 | 90 | */ |
91 | - static public function fixNumber( $nToFix, $nDefault, $nMin='', $nMax='' ) { |
|
91 | + static public function fixNumber( $nToFix, $nDefault, $nMin = '', $nMax = '' ) { |
|
92 | 92 | |
93 | - if ( ! is_numeric( trim( $nToFix ) ) ) { |
|
93 | + if ( !is_numeric( trim( $nToFix ) ) ) { |
|
94 | 94 | return $nDefault; |
95 | 95 | } |
96 | 96 | if ( $nMin !== '' && $nToFix < $nMin ) { |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | */ |
113 | 113 | static public function getCSSMinified( $sCSSRules ) { |
114 | 114 | return str_replace( |
115 | - array( "\r\n", "\r", "\n", "\t", ' ', ' ', ' '), // remove line breaks, tab, and white sspaces. |
|
115 | + array( "\r\n", "\r", "\n", "\t", ' ', ' ', ' ' ), // remove line breaks, tab, and white sspaces. |
|
116 | 116 | '', |
117 | 117 | preg_replace( '!/\*[^*]*\*+([^/][^*]*\*+)*/!', '', $sCSSRules ) // remove comments |
118 | 118 | ); |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | */ |
123 | 123 | static public function minifyCSS( $sCSSRules ) { |
124 | 124 | trigger_error( |
125 | - AdminPageFramework_Registry::NAME . ': ' . sprintf( |
|
125 | + AdminPageFramework_Registry::NAME.': '.sprintf( |
|
126 | 126 | 'The method, %1$s, is deprecated. Use %2$s instead.', |
127 | 127 | 'minifyCSS()', |
128 | 128 | 'getCSSMinified()' |
@@ -151,8 +151,8 @@ discard block |
||
151 | 151 | */ |
152 | 152 | static public function getNumberOfReadableSize( $nSize ) { |
153 | 153 | |
154 | - $_nReturn = substr( $nSize, 0, -1 ); |
|
155 | - switch( strtoupper( substr( $nSize, -1 ) ) ) { |
|
154 | + $_nReturn = substr( $nSize, 0, -1 ); |
|
155 | + switch ( strtoupper( substr( $nSize, -1 ) ) ) { |
|
156 | 156 | case 'P': |
157 | 157 | $_nReturn *= 1024; |
158 | 158 | case 'T': |
@@ -178,7 +178,7 @@ discard block |
||
178 | 178 | $_nLog = log( $nBytes, 1024 ); |
179 | 179 | $_iPower = ( int ) $_nLog; |
180 | 180 | $_iSize = pow( 1024, $_nLog - $_iPower ); |
181 | - return $_iSize . $_aUnits[ $_iPower ]; |
|
181 | + return $_iSize.$_aUnits[ $_iPower ]; |
|
182 | 182 | } |
183 | 183 | |
184 | 184 | /** |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | * @since 3.8.4 When non-true value is passed, `0px` will be returned. |
37 | 37 | * @return string |
38 | 38 | */ |
39 | - static public function getLengthSanitized( $sLength, $sUnit='px' ) { |
|
39 | + static public function getLengthSanitized( $sLength, $sUnit='px' ) { |
|
40 | 40 | $sLength = $sLength ? $sLength : 0; |
41 | 41 | return is_numeric( $sLength ) |
42 | 42 | ? $sLength . $sUnit |
@@ -90,13 +90,13 @@ discard block |
||
90 | 90 | */ |
91 | 91 | static public function fixNumber( $nToFix, $nDefault, $nMin='', $nMax='' ) { |
92 | 92 | |
93 | - if ( ! is_numeric( trim( $nToFix ) ) ) { |
|
93 | + if ( ! is_numeric( trim( $nToFix ) ) ) { |
|
94 | 94 | return $nDefault; |
95 | 95 | } |
96 | - if ( $nMin !== '' && $nToFix < $nMin ) { |
|
96 | + if ( $nMin !== '' && $nToFix < $nMin ) { |
|
97 | 97 | return $nMin; |
98 | 98 | } |
99 | - if ( $nMax !== '' && $nToFix > $nMax ) { |
|
99 | + if ( $nMax !== '' && $nToFix > $nMax ) { |
|
100 | 100 | return $nMax; |
101 | 101 | } |
102 | 102 | return $nToFix; |
@@ -36,11 +36,11 @@ discard block |
||
36 | 36 | */ |
37 | 37 | static public function getInlineCSS( array $aCSSRules ) { |
38 | 38 | $_aOutput = array(); |
39 | - foreach( $aCSSRules as $_sProperty => $_sValue ) { |
|
39 | + foreach ( $aCSSRules as $_sProperty => $_sValue ) { |
|
40 | 40 | if ( is_null( $_sValue ) ) { |
41 | 41 | continue; |
42 | 42 | } |
43 | - $_aOutput[] = $_sProperty . ': ' . $_sValue; |
|
43 | + $_aOutput[ ] = $_sProperty.': '.$_sValue; |
|
44 | 44 | } |
45 | 45 | return implode( '; ', $_aOutput ); |
46 | 46 | } |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | static public function getStyleAttribute( $asInlineCSSes ) { |
72 | 72 | |
73 | 73 | $_aCSSRules = array(); |
74 | - foreach( array_reverse( func_get_args() ) as $_asCSSRules ) { |
|
74 | + foreach ( array_reverse( func_get_args() ) as $_asCSSRules ) { |
|
75 | 75 | |
76 | 76 | // For array, store in the container. |
77 | 77 | if ( is_array( $_asCSSRules ) ) { |
@@ -81,9 +81,9 @@ discard block |
||
81 | 81 | |
82 | 82 | // At this point, it is a string. Break them down to array elements. |
83 | 83 | $__aCSSRules = explode( ';', $_asCSSRules ); |
84 | - foreach( $__aCSSRules as $_sPair ) { |
|
84 | + foreach ( $__aCSSRules as $_sPair ) { |
|
85 | 85 | $_aCSSPair = explode( ':', $_sPair ); |
86 | - if ( ! isset( $_aCSSPair[ 0 ], $_aCSSPair[ 1 ] ) ) { |
|
86 | + if ( !isset( $_aCSSPair[ 0 ], $_aCSSPair[ 1 ] ) ) { |
|
87 | 87 | continue; |
88 | 88 | } |
89 | 89 | $_aCSSRules[ $_aCSSPair[ 0 ] ] = $_aCSSPair[ 1 ]; |
@@ -120,9 +120,9 @@ discard block |
||
120 | 120 | */ |
121 | 121 | static public function getClassAttribute( /* $asClassSelectors1, $asClassSelectors12, ... */ ) { |
122 | 122 | |
123 | - $_aClasses = array(); |
|
124 | - foreach( func_get_args() as $_asClasses ) { |
|
125 | - if ( ! in_array( gettype( $_asClasses ), array( 'array', 'string' ) ) ) { |
|
123 | + $_aClasses = array(); |
|
124 | + foreach ( func_get_args() as $_asClasses ) { |
|
125 | + if ( !in_array( gettype( $_asClasses ), array( 'array', 'string' ) ) ) { |
|
126 | 126 | continue; |
127 | 127 | } |
128 | 128 | $_aClasses = array_merge( |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | : explode( ' ', $_asClasses ) |
133 | 133 | ); |
134 | 134 | } |
135 | - $_aClasses = array_unique( array_filter( $_aClasses ) ); |
|
135 | + $_aClasses = array_unique( array_filter( $_aClasses ) ); |
|
136 | 136 | |
137 | 137 | // @todo examine if it is okay to remove the trim() function below. |
138 | 138 | return trim( implode( ' ', $_aClasses ) ); |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | static public function generateClassAttribute( /* $asClassSelectors1, $asClassSelectors12 ... */ ) { |
149 | 149 | $_aParams = func_get_args(); |
150 | 150 | return call_user_func_array( |
151 | - array( __CLASS__ , 'getClassAttribute' ), |
|
151 | + array( __CLASS__, 'getClassAttribute' ), |
|
152 | 152 | $_aParams |
153 | 153 | ); |
154 | 154 | } |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | static public function getDataAttributeArray( array $aArray ) { |
163 | 163 | |
164 | 164 | $_aNewArray = array(); |
165 | - foreach( $aArray as $sKey => $v ) { |
|
165 | + foreach ( $aArray as $sKey => $v ) { |
|
166 | 166 | if ( in_array( gettype( $v ), array( 'array', 'object' ) ) ) { |
167 | 167 | continue; |
168 | 168 | } |
@@ -59,23 +59,23 @@ discard block |
||
59 | 59 | */ |
60 | 60 | public function get() { |
61 | 61 | |
62 | - $this->aResources[ 'internal_scripts' ] = $this->_getUpdatedInternalItemsByCallback( |
|
62 | + $this->aResources[ 'internal_scripts' ] = $this->_getUpdatedInternalItemsByCallback( |
|
63 | 63 | $this->aResources[ 'internal_scripts' ], |
64 | 64 | 'hfGetScripts' |
65 | 65 | ); |
66 | - $this->aResources[ 'internal_styles' ] = $this->_getUpdatedInternalItemsByCallback( |
|
66 | + $this->aResources[ 'internal_styles' ] = $this->_getUpdatedInternalItemsByCallback( |
|
67 | 67 | $this->aResources[ 'internal_styles' ], |
68 | 68 | 'hfGetStyles' |
69 | 69 | ); |
70 | - $this->aResources[ 'internal_styles_ie' ] = $this->_getUpdatedInternalItemsByCallback( |
|
70 | + $this->aResources[ 'internal_styles_ie' ] = $this->_getUpdatedInternalItemsByCallback( |
|
71 | 71 | $this->aResources[ 'internal_styles_ie' ], |
72 | 72 | 'hfGetIEStyles' |
73 | 73 | ); |
74 | - $this->aResources[ 'src_styles' ] = $this->_getUpdatedEnqueuingItemsByCallback( |
|
74 | + $this->aResources[ 'src_styles' ] = $this->_getUpdatedEnqueuingItemsByCallback( |
|
75 | 75 | $this->aResources[ 'src_styles' ], |
76 | 76 | 'aEnqueueStyles' |
77 | 77 | ); |
78 | - $this->aResources[ 'src_scripts' ] = $this->_getUpdatedEnqueuingItemsByCallback( |
|
78 | + $this->aResources[ 'src_scripts' ] = $this->_getUpdatedEnqueuingItemsByCallback( |
|
79 | 79 | $this->aResources[ 'src_scripts' ], |
80 | 80 | 'aEnqueueScripts' |
81 | 81 | ); |
@@ -89,10 +89,10 @@ discard block |
||
89 | 89 | */ |
90 | 90 | private function _getUpdatedInternalItemsByCallback( array $aSubject, $sKey ) { |
91 | 91 | $_oCallable = $this->getElement( $this->aFieldTypeDefinition, $sKey ); |
92 | - if ( ! is_callable( $_oCallable ) ) { |
|
92 | + if ( !is_callable( $_oCallable ) ) { |
|
93 | 93 | return $aSubject; |
94 | 94 | } |
95 | - $aSubject[] = call_user_func_array( |
|
95 | + $aSubject[ ] = call_user_func_array( |
|
96 | 96 | $_oCallable, |
97 | 97 | array() |
98 | 98 | ); |
@@ -67,7 +67,7 @@ |
||
67 | 67 | . ( $aField[ 'label' ] |
68 | 68 | ? "<span " . $this->getLabelContainerAttributes( $aField, 'admin-page-framework-input-label-string' ) . ">" |
69 | 69 | . $aField[ 'label' ] |
70 | - . "</span>" |
|
70 | + . "</span>" |
|
71 | 71 | : "" |
72 | 72 | ) |
73 | 73 | . "<input " . $this->getAttributes( $aField[ 'attributes' ] ) . " />" |
@@ -60,21 +60,21 @@ |
||
60 | 60 | protected function getField( $aField ) { |
61 | 61 | |
62 | 62 | return |
63 | - $aField['before_label'] |
|
63 | + $aField[ 'before_label' ] |
|
64 | 64 | . "<div class='admin-page-framework-input-label-container'>" |
65 | 65 | . "<label for='{$aField[ 'input_id' ]}'>" |
66 | 66 | . $aField[ 'before_input' ] |
67 | 67 | . ( $aField[ 'label' ] |
68 | - ? "<span " . $this->getLabelContainerAttributes( $aField, 'admin-page-framework-input-label-string' ) . ">" |
|
68 | + ? "<span ".$this->getLabelContainerAttributes( $aField, 'admin-page-framework-input-label-string' ).">" |
|
69 | 69 | . $aField[ 'label' ] |
70 | 70 | . "</span>" |
71 | 71 | : "" |
72 | 72 | ) |
73 | - . "<input " . $this->getAttributes( $aField[ 'attributes' ] ) . " />" |
|
74 | - . $aField['after_input'] |
|
73 | + . "<input ".$this->getAttributes( $aField[ 'attributes' ] )." />" |
|
74 | + . $aField[ 'after_input' ] |
|
75 | 75 | . "</label>" |
76 | 76 | . "</div>" |
77 | - . $aField['after_label']; |
|
77 | + . $aField[ 'after_label' ]; |
|
78 | 78 | |
79 | 79 | } |
80 | 80 |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | protected function setUp() { |
64 | 64 | |
65 | 65 | // If the WordPress version is greater than or equal to 3.5, then load the new WordPress color picker. |
66 | - if ( version_compare( $GLOBALS['wp_version'], '3.5', '>=' ) ) { |
|
66 | + if ( version_compare( $GLOBALS[ 'wp_version' ], '3.5', '>=' ) ) { |
|
67 | 67 | //Both the necessary css and javascript have been registered already by WordPress, so all we have to do is load them with their handle. |
68 | 68 | wp_enqueue_style( 'wp-color-picker' ); |
69 | 69 | wp_enqueue_script( 'wp-color-picker' ); |
@@ -235,9 +235,9 @@ discard block |
||
235 | 235 | protected function getField( $aField ) { |
236 | 236 | |
237 | 237 | // If the value is not set, apply the default value, 'transparent'. |
238 | - $aField['value'] = is_null( $aField['value'] ) |
|
238 | + $aField[ 'value' ] = is_null( $aField[ 'value' ] ) |
|
239 | 239 | ? 'transparent' |
240 | - : $aField['value']; |
|
240 | + : $aField[ 'value' ]; |
|
241 | 241 | |
242 | 242 | $aField[ 'attributes' ] = $this->_getInputAttributes( $aField ); |
243 | 243 | |
@@ -246,20 +246,20 @@ discard block |
||
246 | 246 | . "<div class='admin-page-framework-input-label-container'>" |
247 | 247 | . "<label for='{$aField[ 'input_id' ]}'>" |
248 | 248 | . $aField[ 'before_input' ] |
249 | - . ( $aField[ 'label' ] && ! $aField[ 'repeatable' ] |
|
250 | - ? "<span " . $this->getLabelContainerAttributes( $aField, 'admin-page-framework-input-label-string' ) . ">" |
|
251 | - . $aField['label'] |
|
249 | + . ( $aField[ 'label' ] && !$aField[ 'repeatable' ] |
|
250 | + ? "<span ".$this->getLabelContainerAttributes( $aField, 'admin-page-framework-input-label-string' ).">" |
|
251 | + . $aField[ 'label' ] |
|
252 | 252 | . "</span>" |
253 | 253 | : "" |
254 | 254 | ) |
255 | - . "<input " . $this->getAttributes( $aField[ 'attributes' ] ) . " />" |
|
255 | + . "<input ".$this->getAttributes( $aField[ 'attributes' ] )." />" |
|
256 | 256 | . $aField[ 'after_input' ] |
257 | 257 | . "<div class='repeatable-field-buttons'></div>" // the repeatable field buttons will be replaced with this element. |
258 | 258 | . "</label>" |
259 | 259 | . "<div class='colorpicker' id='color_{$aField[ 'input_id' ]}'></div>" // this div element with this class selector becomes a farbtastic color picker. ( below 3.4.x ) // rel='{$aField['input_id']}' |
260 | 260 | . $this->_getColorPickerEnablerScript( "{$aField[ 'input_id' ]}" ) |
261 | 261 | . "</div>" |
262 | - . $aField['after_label']; |
|
262 | + . $aField[ 'after_label' ]; |
|
263 | 263 | |
264 | 264 | } |
265 | 265 | /** |
@@ -271,13 +271,13 @@ discard block |
||
271 | 271 | private function _getInputAttributes( array $aField ) { |
272 | 272 | |
273 | 273 | return array( |
274 | - 'color' => $aField['value'], |
|
275 | - 'value' => $aField['value'], |
|
274 | + 'color' => $aField[ 'value' ], |
|
275 | + 'value' => $aField[ 'value' ], |
|
276 | 276 | 'data-default' => isset( $aField[ 'default' ] ) |
277 | 277 | ? $aField[ 'default' ] |
278 | 278 | : 'transparent', // used by the repeatable script |
279 | 279 | 'type' => 'text', // it must be text |
280 | - 'class' => trim( 'input_color ' . $aField['attributes']['class'] ), |
|
280 | + 'class' => trim( 'input_color '.$aField[ 'attributes' ][ 'class' ] ), |
|
281 | 281 | ) + $aField[ 'attributes' ]; |
282 | 282 | |
283 | 283 | } |
@@ -554,8 +554,8 @@ discard block |
||
554 | 554 | protected function getField( $aField ) { |
555 | 555 | |
556 | 556 | $_aOutput = array(); |
557 | - foreach( ( array ) $aField[ 'label' ] as $_sKey => $_sLabel ) { |
|
558 | - $_aOutput[] = $this->_getFieldOutputByLabel( |
|
557 | + foreach ( ( array ) $aField[ 'label' ] as $_sKey => $_sLabel ) { |
|
558 | + $_aOutput[ ] = $this->_getFieldOutputByLabel( |
|
559 | 559 | $_sKey, |
560 | 560 | $_sLabel, |
561 | 561 | $aField |
@@ -563,7 +563,7 @@ discard block |
||
563 | 563 | } |
564 | 564 | |
565 | 565 | // the repeatable field buttons will be replaced with this element. |
566 | - $_aOutput[] = "<div class='repeatable-field-buttons'></div>"; |
|
566 | + $_aOutput[ ] = "<div class='repeatable-field-buttons'></div>"; |
|
567 | 567 | return implode( '', $_aOutput ); |
568 | 568 | |
569 | 569 | } |
@@ -584,27 +584,27 @@ discard block |
||
584 | 584 | $aField[ 'rich' ] = $this->getElementByLabel( $aField[ 'rich' ], $sKey, $aField[ 'label' ] ); |
585 | 585 | $aField[ 'attributes' ] = $_bIsArray |
586 | 586 | ? array( |
587 | - 'name' => $aField[ 'attributes' ][ 'name' ] . "[{$sKey}]", |
|
588 | - 'id' => $aField[ 'attributes' ][ 'id' ] . "_{$sKey}", |
|
587 | + 'name' => $aField[ 'attributes' ][ 'name' ]."[{$sKey}]", |
|
588 | + 'id' => $aField[ 'attributes' ][ 'id' ]."_{$sKey}", |
|
589 | 589 | 'value' => $aField[ 'value' ], |
590 | 590 | ) |
591 | 591 | + $aField[ 'attributes' ] |
592 | 592 | : $aField[ 'attributes' ]; |
593 | - $_aOutput = array( |
|
594 | - $this->getElementByLabel( $aField['before_label'], $sKey, $aField[ 'label' ] ), |
|
593 | + $_aOutput = array( |
|
594 | + $this->getElementByLabel( $aField[ 'before_label' ], $sKey, $aField[ 'label' ] ), |
|
595 | 595 | "<div class='admin-page-framework-input-label-container {$_sClassSelector}'>", |
596 | - "<label for='" . $aField[ 'attributes' ][ 'id' ] . "'>", |
|
597 | - $this->getElementByLabel( $aField['before_input'], $sKey, $aField[ 'label' ] ), |
|
596 | + "<label for='".$aField[ 'attributes' ][ 'id' ]."'>", |
|
597 | + $this->getElementByLabel( $aField[ 'before_input' ], $sKey, $aField[ 'label' ] ), |
|
598 | 598 | $_sLabel |
599 | - ? "<span " . $this->getLabelContainerAttributes( $aField, 'admin-page-framework-input-label-string' ) . ">" |
|
599 | + ? "<span ".$this->getLabelContainerAttributes( $aField, 'admin-page-framework-input-label-string' ).">" |
|
600 | 600 | . $_sLabel |
601 | 601 | . "</span>" |
602 | 602 | : '', |
603 | 603 | $this->_getEditor( $aField ), |
604 | - $this->getElementByLabel( $aField['after_input'], $sKey, $aField[ 'label' ] ), |
|
604 | + $this->getElementByLabel( $aField[ 'after_input' ], $sKey, $aField[ 'label' ] ), |
|
605 | 605 | "</label>", |
606 | 606 | "</div>", |
607 | - $this->getElementByLabel( $aField['after_label'], $sKey, $aField[ 'label' ] ), |
|
607 | + $this->getElementByLabel( $aField[ 'after_label' ], $sKey, $aField[ 'label' ] ), |
|
608 | 608 | ); |
609 | 609 | return implode( '', $_aOutput ); |
610 | 610 | |
@@ -619,31 +619,31 @@ discard block |
||
619 | 619 | */ |
620 | 620 | private function _getEditor( $aField ) { |
621 | 621 | |
622 | - unset( $aField['attributes']['value'] ); |
|
622 | + unset( $aField[ 'attributes' ][ 'value' ] ); |
|
623 | 623 | |
624 | 624 | // For no TinyMCE |
625 | - if ( empty( $aField['rich'] ) || ! $this->isTinyMCESupported() ) { |
|
626 | - return "<textarea " . $this->getAttributes( $aField['attributes'] ) . " >" // this method is defined in the base class |
|
627 | - . esc_textarea( $aField['value'] ) |
|
625 | + if ( empty( $aField[ 'rich' ] ) || !$this->isTinyMCESupported() ) { |
|
626 | + return "<textarea ".$this->getAttributes( $aField[ 'attributes' ] )." >" // this method is defined in the base class |
|
627 | + . esc_textarea( $aField[ 'value' ] ) |
|
628 | 628 | . "</textarea>"; |
629 | 629 | } |
630 | 630 | |
631 | 631 | // Rich editor |
632 | 632 | ob_start(); |
633 | 633 | wp_editor( |
634 | - $aField['value'], |
|
635 | - $aField['attributes']['id'], |
|
634 | + $aField[ 'value' ], |
|
635 | + $aField[ 'attributes' ][ 'id' ], |
|
636 | 636 | $this->uniteArrays( |
637 | - ( array ) $aField['rich'], |
|
637 | + ( array ) $aField[ 'rich' ], |
|
638 | 638 | array( |
639 | 639 | 'wpautop' => true, // use wpautop? |
640 | 640 | 'media_buttons' => true, // show insert/upload button(s) |
641 | - 'textarea_name' => $aField['attributes']['name'], |
|
642 | - 'textarea_rows' => $aField['attributes']['rows'], |
|
641 | + 'textarea_name' => $aField[ 'attributes' ][ 'name' ], |
|
642 | + 'textarea_rows' => $aField[ 'attributes' ][ 'rows' ], |
|
643 | 643 | 'tabindex' => '', |
644 | 644 | 'tabfocus_elements' => ':prev,:next', // the previous and next element ID to move the focus to when pressing the Tab key in TinyMCE |
645 | 645 | 'editor_css' => '', // intended for extra styles for both visual and Text editors buttons, needs to include the <style> tags, can use "scoped". |
646 | - 'editor_class' => $aField['attributes']['class'], // add extra class(es) to the editor textarea |
|
646 | + 'editor_class' => $aField[ 'attributes' ][ 'class' ], // add extra class(es) to the editor textarea |
|
647 | 647 | 'teeny' => false, // output the minimal editor config used in Press This |
648 | 648 | 'dfw' => false, // replace the default fullscreen with DFW (needs specific DOM elements and css) |
649 | 649 | 'tinymce' => true, // load TinyMCE, can be used to pass settings directly to TinyMCE using an array() |
@@ -655,7 +655,7 @@ discard block |
||
655 | 655 | ob_end_clean(); |
656 | 656 | |
657 | 657 | return $_sContent |
658 | - . $this->_getScriptForRichEditor( $aField['attributes']['id'] ); |
|
658 | + . $this->_getScriptForRichEditor( $aField[ 'attributes' ][ 'id' ] ); |
|
659 | 659 | |
660 | 660 | } |
661 | 661 |
@@ -37,21 +37,21 @@ |
||
37 | 37 | */ |
38 | 38 | public function _replyToGetField( $aField ) { |
39 | 39 | return |
40 | - $aField['before_label'] |
|
40 | + $aField[ 'before_label' ] |
|
41 | 41 | . "<div class='admin-page-framework-input-label-container'>" |
42 | - . "<label for='{$aField['input_id']}'>" |
|
43 | - . $aField['before_input'] |
|
44 | - . ( $aField['label'] && ! $aField['repeatable'] |
|
45 | - ? "<span " . $this->getLabelContainerAttributes( $aField, 'admin-page-framework-input-label-string' ) . ">" |
|
42 | + . "<label for='{$aField[ 'input_id' ]}'>" |
|
43 | + . $aField[ 'before_input' ] |
|
44 | + . ( $aField[ 'label' ] && !$aField[ 'repeatable' ] |
|
45 | + ? "<span ".$this->getLabelContainerAttributes( $aField, 'admin-page-framework-input-label-string' ).">" |
|
46 | 46 | . $aField[ 'label' ] |
47 | 47 | . "</span>" |
48 | 48 | : "" |
49 | 49 | ) |
50 | - . $aField['value'] |
|
51 | - . $aField['after_input'] |
|
50 | + . $aField[ 'value' ] |
|
51 | + . $aField[ 'after_input' ] |
|
52 | 52 | . "</label>" |
53 | 53 | . "</div>" |
54 | - . $aField['after_label'] |
|
54 | + . $aField[ 'after_label' ] |
|
55 | 55 | ; |
56 | 56 | } |
57 | 57 |