Completed
Branch master (4b970b)
by Michael
05:13
created
generator/field/AdminPageFramework_Form_View___Generate_FlatFieldName.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@
 block discarded – undo
31 31
      * @return      string      The generated field name model.
32 32
      */
33 33
     public function getModel() {
34
-        return $this->get() . '|' . $this->sIndexMark;
34
+        return $this->get().'|'.$this->sIndexMark;
35 35
     }
36 36
         
37 37
         /**
Please login to merge, or discard this patch.
field/AdminPageFramework_Form_View___Generate_FlatFieldInputName.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@
 block discarded – undo
38 38
             '',
39 39
             "|{$this->sIndex}"
40 40
         );                
41
-        return $this->_getFiltered( $this->_getFlatFieldName() . $_sIndex );
41
+        return $this->_getFiltered( $this->_getFlatFieldName().$_sIndex );
42 42
         
43 43
     }
44 44
  
Please login to merge, or discard this patch.
generator/section/AdminPageFramework_Form_View___Generate_SectionName.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -25,26 +25,26 @@
 block discarded – undo
25 25
         return $this->_getFiltered( $this->_getSectionName() );
26 26
     }
27 27
         
28
-    public function getModel()     {
29
-        return $this->get() . '[' . $this->sIndexMark . ']';
28
+    public function getModel() {
29
+        return $this->get().'['.$this->sIndexMark.']';
30 30
     }
31 31
         
32 32
         /**
33 33
          * @return      string
34 34
          */
35
-        protected function _getSectionName( $isIndex=null ) {
35
+        protected function _getSectionName( $isIndex = null ) {
36 36
 
37 37
             $this->aArguments = $this->aArguments + array(
38 38
                 'section_id' => null,
39 39
                 '_index'     => null,
40 40
             );
41
-            if( isset( $isIndex ) ) {
41
+            if ( isset( $isIndex ) ) {
42 42
                 $this->aArguments[ '_index' ] = $isIndex;
43 43
             }
44 44
             
45 45
             $_aNameParts = $this->aArguments[ '_section_path_array' ];
46 46
             if ( isset( $this->aArguments[ 'section_id' ], $this->aArguments[ '_index' ] ) ) {
47
-                $_aNameParts[] = $this->aArguments[ '_index' ];
47
+                $_aNameParts[ ] = $this->aArguments[ '_index' ];
48 48
             }
49 49
             $_sResult = $this->_getInputNameConstructed( $_aNameParts );
50 50
             return $_sResult;
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@
 block discarded – undo
25 25
         return $this->_getFiltered( $this->_getSectionName() );
26 26
     }
27 27
         
28
-    public function getModel()     {
28
+    public function getModel() {
29 29
         return $this->get() . '[' . $this->sIndexMark . ']';
30 30
     }
31 31
         
Please login to merge, or discard this patch.
development/factory/_common/form/AdminPageFramework_Form.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
     /**
39 39
      * Stores section set definitions.
40 40
      */
41
-    public $aSectionsets  = array(
41
+    public $aSectionsets = array(
42 42
         '_default' => array(
43 43
             'section_id'    => '_default',
44 44
         ),
@@ -47,12 +47,12 @@  discard block
 block discarded – undo
47 47
     /**
48 48
      * Stores field set definitions.
49 49
      */    
50
-    public $aFieldsets    = array();
50
+    public $aFieldsets = array();
51 51
     
52 52
     /**
53 53
      * Multi-dimensional array holding the saved form data.
54 54
      */
55
-    public $aSavedData    = array();
55
+    public $aSavedData = array();
56 56
         
57 57
     /**
58 58
      * The capability level of the form.
@@ -62,13 +62,13 @@  discard block
 block discarded – undo
62 62
      * Each secitonset and fieldset has individual capability. If they are not set,
63 63
      * This value will be applied.
64 64
      */            
65
-    public $sCapability = '';       // default - an empty string
65
+    public $sCapability = ''; // default - an empty string
66 66
     
67 67
     /**
68 68
      * Stores callback functions.
69 69
      * Each value will have a callback.
70 70
      */
71
-    public $aCallbacks    = array(
71
+    public $aCallbacks = array(
72 72
     
73 73
         /**
74 74
          * @return      string      The form default capability level.    
Please login to merge, or discard this patch.
development/factory/_common/form/AdminPageFramework_Form_View.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
37 37
             '' // default value
38 38
         );    
39 39
     
40
-        if ( ! $this->canUserView( $this->sCapability ) ) {
40
+        if ( !$this->canUserView( $this->sCapability ) ) {
41 41
             return '';
42 42
         }    
43 43
 
Please login to merge, or discard this patch.
factory/_common/form/notice/AdminPageFramework_Form___SubmitNotice.php 2 patches
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
          * @return      string
41 41
          */
42 42
         private function _getTransientKey() {
43
-            return 'apf_ntc_' . get_current_user_id();
43
+            return 'apf_ntc_'.get_current_user_id();
44 44
         }
45 45
     
46 46
     /**
@@ -52,14 +52,14 @@  discard block
 block discarded – undo
52 52
      * @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.
53 53
      * @return      boolean     True if a setting notice is set; otherwise, false.
54 54
      */
55
-    public function hasNotice( $sType='' ) {
55
+    public function hasNotice( $sType = '' ) {
56 56
                 
57
-        if ( ! $sType ) {
57
+        if ( !$sType ) {
58 58
             return ( boolean ) count( self::$_aNotices );
59 59
         }
60 60
         
61 61
         // Check if there is a message of the type.
62
-        foreach( self::$_aNotices as $_aNotice ) {
62
+        foreach ( self::$_aNotices as $_aNotice ) {
63 63
             $_sClassAttribute = $this->getElement( 
64 64
                 $_aNotice, 
65 65
                 array( 
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
      * @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.
99 99
      * @return       void
100 100
      */
101
-    public function set( $sMessage, $sType='error', $asAttributes=array(), $bOverride=true ) {
101
+    public function set( $sMessage, $sType = 'error', $asAttributes = array(), $bOverride = true ) {
102 102
         
103 103
         // If the array is empty, schedule the task of saving the array at shutdown.
104 104
         if ( empty( self::$_aNotices ) ) {
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
         $_sID = md5( trim( $sMessage ) );
109 109
             
110 110
         // If the override is false and a message is already set, do not add.
111
-        if ( ! $bOverride && isset( self::$_aNotices[ $_sID ] ) ) {
111
+        if ( !$bOverride && isset( self::$_aNotices[ $_sID ] ) ) {
112 112
             return;
113 113
         }
114 114
 
@@ -118,14 +118,14 @@  discard block
 block discarded – undo
118 118
         }
119 119
         
120 120
         $_aAttributes = $this->getAsArray( $asAttributes );
121
-        if ( is_string( $asAttributes ) && ! empty( $asAttributes ) ) {
121
+        if ( is_string( $asAttributes ) && !empty( $asAttributes ) ) {
122 122
             $_aAttributes[ 'id' ] = $asAttributes;
123 123
         }
124 124
         self::$_aNotices[ $_sID ] = array(
125 125
             'sMessage'      => $sMessage,
126 126
             'aAttributes'   => $_aAttributes + array(
127 127
                 'class'     => $sType,
128
-                'id'        => 'form_submit_notice_' . $_sID,
128
+                'id'        => 'form_submit_notice_'.$_sID,
129 129
             ),
130 130
         );
131 131
 
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
         }
167 167
             
168 168
         // By setting false to the 'settings-notice' key, it's possible to disable the notifications set with the framework.
169
-        if ( isset( $_GET[ 'settings-notice' ] ) && ! $_GET[ 'settings-notice' ] ) { 
169
+        if ( isset( $_GET[ 'settings-notice' ] ) && !$_GET[ 'settings-notice' ] ) { 
170 170
             return; 
171 171
         }
172 172
             
Please login to merge, or discard this patch.
Braces   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
          * @return      void
117 117
          */
118 118
         public function _replyToSaveNotices() {
119
-            if ( empty( self::$_aNotices ) ) { 
119
+            if ( empty( self::$_aNotices ) ) {
120 120
                 return; 
121 121
             }
122 122
             $this->setTransient( 
@@ -136,13 +136,13 @@  discard block
 block discarded – undo
136 136
         
137 137
         $_iUserID  = get_current_user_id();
138 138
         $_aNotices = $this->getTransient( "apf_notices_{$_iUserID}" );
139
-        if ( false === $_aNotices ) { 
139
+        if ( false === $_aNotices ) {
140 140
             return; 
141 141
         }
142 142
         $this->deleteTransient( "apf_notices_{$_iUserID}" );
143 143
     
144 144
         // By setting false to the 'settings-notice' key, it's possible to disable the notifications set with the framework.
145
-        if ( isset( $_GET[ 'settings-notice' ] ) && ! $_GET[ 'settings-notice' ] ) { 
145
+        if ( isset( $_GET[ 'settings-notice' ] ) && ! $_GET[ 'settings-notice' ] ) {
146 146
             return; 
147 147
         }
148 148
         
Please login to merge, or discard this patch.
development/factory/_common/utility/AdminPageFramework_ErrorReporting.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 
39 39
     private $_iLevel;
40 40
 
41
-    public function __construct( $iLevel=null ) {
41
+    public function __construct( $iLevel = null ) {
42 42
         $this->_iLevel = null !== $iLevel 
43 43
             ? $iLeevl
44 44
             : error_reporting();
@@ -57,11 +57,11 @@  discard block
 block discarded – undo
57 57
         private function _getIncluded() {
58 58
             
59 59
             $_aIncluded = array();
60
-            foreach( $this->_aLevels as $_iLevel => $iLevelText ) {
60
+            foreach ( $this->_aLevels as $_iLevel => $iLevelText ) {
61 61
                 
62 62
                 // This is where we check if a level was used or not
63 63
                 if ( $this->_iLevel & $_iLevel ) {
64
-                    $_aIncluded[] = $_iLevel;
64
+                    $_aIncluded[ ] = $_iLevel;
65 65
                 }
66 66
                 
67 67
             }
@@ -75,16 +75,16 @@  discard block
 block discarded – undo
75 75
             $_aValues       = array();
76 76
             
77 77
             if ( count( $aIncluded ) > $_iAll / 2 ) {
78
-                $_aValues[] = 'E_ALL';
79
-                foreach( $this->_aLevels as $_iLevel => $iLevelText ) {
80
-                    if ( ! in_array( $_iLevel, $aIncluded ) ) {
81
-                        $_aValues[] = $iLevelText;
78
+                $_aValues[ ] = 'E_ALL';
79
+                foreach ( $this->_aLevels as $_iLevel => $iLevelText ) {
80
+                    if ( !in_array( $_iLevel, $aIncluded ) ) {
81
+                        $_aValues[ ] = $iLevelText;
82 82
                     }
83 83
                 }
84 84
                 return implode( ' & ~', $_aValues );
85 85
             } 
86
-            foreach( $aIncluded as $_iLevel ) {
87
-                $_aValues[] = $this->_aLevels[ $_iLevel ];
86
+            foreach ( $aIncluded as $_iLevel ) {
87
+                $_aValues[ ] = $this->_aLevels[ $_iLevel ];
88 88
             }
89 89
             return implode( ' | ', $_aValues );
90 90
 
Please login to merge, or discard this patch.
development/factory/_common/utility/AdminPageFramework_FrameworkUtility.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -31,8 +31,8 @@  discard block
 block discarded – undo
31 31
             return;
32 32
         }
33 33
 
34
-        foreach( ( array ) $GLOBALS[ '_apf_sub_menus_to_sort' ] as $_sIndex => $_sMenuSlug ) {
35
-            if ( ! isset( $GLOBALS[ 'submenu' ][ $_sMenuSlug ] ) ) {
34
+        foreach ( ( array ) $GLOBALS[ '_apf_sub_menus_to_sort' ] as $_sIndex => $_sMenuSlug ) {
35
+            if ( !isset( $GLOBALS[ 'submenu' ][ $_sMenuSlug ] ) ) {
36 36
                 continue;
37 37
             }       
38 38
             ksort( $GLOBALS[ 'submenu' ][ $_sMenuSlug ] );
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
      * @param       boolean     $bTrimDevVer           Whether the `.dev` suffix should be removed or not.
52 52
      * @return      string
53 53
      */
54
-    static public function getFrameworkVersion( $bTrimDevVer=false ) {
54
+    static public function getFrameworkVersion( $bTrimDevVer = false ) {
55 55
         $_sVersion = AdminPageFramework_Registry::getVersion();
56 56
         return $bTrimDevVer
57 57
             ? self::getSuffixRemoved( $_sVersion, '.dev' )
Please login to merge, or discard this patch.
development/factory/_common/utility/AdminPageFramework_ArrayHandler.php 2 patches
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -21,12 +21,12 @@  discard block
 block discarded – undo
21 21
      * 
22 22
      * @since       3.6.0
23 23
      */
24
-    public $aData            = array();
24
+    public $aData = array();
25 25
     
26 26
     /**
27 27
      * Stores the defaulte values.
28 28
      */
29
-    public $aDefault         = array();
29
+    public $aDefault = array();
30 30
     
31 31
     /**
32 32
      * Sets up properties.
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
         $_aKeys     = func_get_args() + array( null );
55 55
         
56 56
         // If no key is specified, return the whole array.
57
-        if ( ! isset( $_aKeys[ 0 ] ) ) {
57
+        if ( !isset( $_aKeys[ 0 ] ) ) {
58 58
             return $this->uniteArrays(
59 59
                 $this->aData,
60 60
                 $this->aDefault
@@ -69,8 +69,8 @@  discard block
 block discarded – undo
69 69
         
70 70
         // Now either the section ID or field ID is given. 
71 71
         return $this->getArrayValueByArrayKeys( 
72
-            $this->aData,   // subject array
73
-            $_aKeys,        // dimensional keys
72
+            $this->aData, // subject array
73
+            $_aKeys, // dimensional keys
74 74
             $this->getDefaultValue( // default value
75 75
                 $_mDefault, 
76 76
                 $_aKeys 
@@ -98,8 +98,8 @@  discard block
 block discarded – undo
98 98
      */
99 99
     public function set( /* $asKeys, $mValue */ ) {
100 100
         
101
-        $_aParameters   = func_get_args();
102
-        if ( ! isset( $_aParameters[ 0 ], $_aParameters[ 1 ] ) ) {
101
+        $_aParameters = func_get_args();
102
+        if ( !isset( $_aParameters[ 0 ], $_aParameters[ 1 ] ) ) {
103 103
             return;
104 104
         }
105 105
         $_asKeys        = $_aParameters[ 0 ];
@@ -123,8 +123,8 @@  discard block
 block discarded – undo
123 123
      */
124 124
     public function delete( /* $sKey1, $sKey2, $sKey3 ... OR $aKeys */ ) {
125 125
         
126
-        $_aParameters   = func_get_args();
127
-        if ( ! isset( $_aParameters[ 0 ], $_aParameters[ 1 ] ) ) {
126
+        $_aParameters = func_get_args();
127
+        if ( !isset( $_aParameters[ 0 ], $_aParameters[ 1 ] ) ) {
128 128
             return;
129 129
         }
130 130
         $_asKeys        = $_aParameters[ 0 ];
Please login to merge, or discard this patch.
Doc Comments   -14 removed lines patch added patch discarded remove patch
@@ -84,12 +84,6 @@  discard block
 block discarded – undo
84 84
      * Returns the specified option value.
85 85
      * 
86 86
      * @since       3.6.0
87
-     * @param       string|array        $sKey1|$aKeys       The dimensional key or keys of an array of the element to extract its value.
88
-     * If a string is set to the first parameter, the second parameter is also expected to be a string serving as a second dimensional key. 
89
-     * For example, there is a multi-dimensional array, `array( 'a' => array( 'b' => 'bbb' ) )` to extract the value of the 'b' element in the second depth,
90
-     * set the parameter as follows. `get( 'a', 'b' )` or `get( array( 'a', 'b' ) );`
91
-     * @param       string|variant      $sKey2|$vDefault    The second dimensional key or the default value in case the value is not set.
92
-     * @param       string              $sKey3              The third dimensional key and so on.
93 87
      */
94 88
     public function get( /* $sKey1, $sKey2, $sKey3, ... OR $aKeys, $vDefault */ ) {
95 89
         
@@ -139,10 +133,6 @@  discard block
 block discarded – undo
139 133
      * 
140 134
      * @since       3.6.0
141 135
      * @return      void
142
-     * @param       string|array        $asKeys       The key or keys of an array of the element to set its value.
143
-     * If a string is passed, it specifies the element with the set key. If an array is passed, it specifies the element with the dimensional keys.
144
-     * For example, `set( 'a', 'aaa' )` will set a value, `array( 'a' => 'aaa' )` and `set( array( 'a', 'b' ), 'bbb' )` will set `array( 'a' => array( 'b' => 'bbb' ) )`.
145
-     * @param       variant             $mValue       The value to be set.
146 136
      */
147 137
     public function set( /* $asKeys, $mValue */ ) {
148 138
         
@@ -168,10 +158,6 @@  discard block
 block discarded – undo
168 158
      * Removes an element by dimensional keys.
169 159
      * @since       3.6.0
170 160
      * @return      void
171
-     * @param       string|array        $asKeys       The key or keys of an array of the element to set its value.
172
-     * If a string is passed, it specifies the element with the set key. If an array is passed, it specifies the element with the dimensional keys.
173
-     * For example, `delete( 'a' )` will unset an element of `a` in `array( 'a' => 'some value' )` so it becomes `array()`.
174
-     * `delete( array( 'a', 'b' ) )` will unset the element of `b` in `array( 'a' => array( 'b' => 'bbb' ) )`.
175 161
      */
176 162
     public function delete( /* $sKey1, $sKey2, $sKey3 ... OR $aKeys */ ) {
177 163
         
Please login to merge, or discard this patch.