Completed
Branch dev (ecee14)
by
unknown
35s
created
development/factory/admin_page/_model/AdminPageFramework_FormEmail.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -186,7 +186,7 @@
 block discarded – undo
186 186
                         $sURL
187 187
                     ) );
188 188
                 }
189
-       /**
189
+        /**
190 190
          * Sets the mail content type to HTML.
191 191
          * @since       3.3.0
192 192
          * @since       3.4.2       Moved from the validation class.
Please login to merge, or discard this patch.
factory/_common/utility/wp_utility/AdminPageFramework_WPUtility_URL.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -29,9 +29,9 @@  discard block
 block discarded – undo
29 29
         $sPageURL       = 'on' == @$_SERVER[ "HTTPS" ] ? "https://" : "http://";
30 30
 
31 31
         if ( "80" != $_SERVER[ "SERVER_PORT" ] ) {
32
-            $sPageURL .= $_SERVER[ "SERVER_NAME" ] . ":" . $_SERVER[ "SERVER_PORT" ] . $sRequestURI;
32
+            $sPageURL .= $_SERVER[ "SERVER_NAME" ].":".$_SERVER[ "SERVER_PORT" ].$sRequestURI;
33 33
         } else {
34
-            $sPageURL .= $_SERVER[ "SERVER_NAME" ] . $sRequestURI;
34
+            $sPageURL .= $_SERVER[ "SERVER_NAME" ].$sRequestURI;
35 35
         }
36 36
         return $sPageURL;
37 37
 
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
      * @param string $sSubjectURL ( optional ) The subject url to modify
49 49
      * @return string The modified url.
50 50
      */
51
-    static public function getQueryAdminURL( $aAddingQueries=array(), $aRemovingQueryKeys=array(), $sSubjectURL='' ) {
51
+    static public function getQueryAdminURL( $aAddingQueries = array(), $aRemovingQueryKeys = array(), $sSubjectURL = '' ) {
52 52
 
53 53
         $_sAdminURL = is_network_admin()
54 54
             ? network_admin_url( AdminPageFramework_WPUtility_Page::getPageNow() )
@@ -94,16 +94,16 @@  discard block
 block discarded – undo
94 94
      * @remark  The parsable path is limited to under the WP_CONTENT_DIR directory.
95 95
      */
96 96
     static public function getSRCFromPath( $sFilePath ) {
97
-        $sFilePath        = str_replace('\\', '/', $sFilePath );
98
-        $_sContentDirPath = str_replace('\\', '/', WP_CONTENT_DIR );
97
+        $sFilePath        = str_replace( '\\', '/', $sFilePath );
98
+        $_sContentDirPath = str_replace( '\\', '/', WP_CONTENT_DIR );
99 99
         if ( false !== strpos( $sFilePath, $_sContentDirPath ) ) {
100
-            $_sRelativePath = AdminPageFramework_Utility::getRelativePath( WP_CONTENT_DIR , $sFilePath );
101
-            $_sRelativePath = preg_replace("/^\.[\/\\\]/", '', $_sRelativePath, 1 );
100
+            $_sRelativePath = AdminPageFramework_Utility::getRelativePath( WP_CONTENT_DIR, $sFilePath );
101
+            $_sRelativePath = preg_replace( "/^\.[\/\\\]/", '', $_sRelativePath, 1 );
102 102
             return content_url( $_sRelativePath );
103 103
         }
104
-        $_sRelativePath = AdminPageFramework_Utility::getRelativePath( ABSPATH , $sFilePath );
105
-        $_sRelativePath = preg_replace("/^\.[\/\\\]/", '', $_sRelativePath, 1 );
106
-        return trailingslashit( get_bloginfo( 'url' ) ) . $_sRelativePath;
104
+        $_sRelativePath = AdminPageFramework_Utility::getRelativePath( ABSPATH, $sFilePath );
105
+        $_sRelativePath = preg_replace( "/^\.[\/\\\]/", '', $_sRelativePath, 1 );
106
+        return trailingslashit( get_bloginfo( 'url' ) ).$_sRelativePath;
107 107
     }
108 108
 
109 109
     /**
@@ -119,9 +119,9 @@  discard block
 block discarded – undo
119 119
      * @param       string      $sSRC
120 120
      * @param       boolean     $bReturnNullIfNotExist
121 121
      */
122
-    static public function getResolvedSRC( $sSRC, $bReturnNullIfNotExist=false ) {
122
+    static public function getResolvedSRC( $sSRC, $bReturnNullIfNotExist = false ) {
123 123
 
124
-        if ( ! self::isResourcePath( $sSRC ) ) {
124
+        if ( !self::isResourcePath( $sSRC ) ) {
125 125
             return $bReturnNullIfNotExist
126 126
                 ? null
127 127
                 : $sSRC;
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
 
135 135
         // If the file exists, it means it is an absolute path. If so, calculate the URL from the path.
136 136
         if ( file_exists( realpath( $sSRC ) ) ) {
137
-            return self::getSRCFromPath( $sSRC );   // url escaping is done in the method
137
+            return self::getSRCFromPath( $sSRC ); // url escaping is done in the method
138 138
         }
139 139
 
140 140
         if ( $bReturnNullIfNotExist ) {
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
          * @param boolean $bReturnNullIfNotExist
152 152
          * @return string
153 153
          */
154
-        static public function resolveSRC( $sSRC, $bReturnNullIfNotExist=false ) {
154
+        static public function resolveSRC( $sSRC, $bReturnNullIfNotExist = false ) {
155 155
             return self::getResolvedSRC( $sSRC, $bReturnNullIfNotExist );
156 156
         }
157 157
 
Please login to merge, or discard this patch.
development/utility/requirement/AdminPageFramework_Requirement.php 1 patch
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -135,12 +135,12 @@  discard block
 block discarded – undo
135 135
      * </ul>
136 136
      * @param       string      $sScriptName        The script name.
137 137
      */
138
-    public function __construct( array $aRequirements=array(), $sScriptName='' ) {
138
+    public function __construct( array $aRequirements = array(), $sScriptName = '' ) {
139 139
 
140 140
         // Avoid undefined index warnings.
141 141
         $aRequirements          = $aRequirements + $this->_aDefaultRequirements;
142 142
         $aRequirements          = array_filter( $aRequirements, 'is_array' );
143
-        foreach( array( 'php', 'mysql', 'wordpress' ) as $_iIndex => $_sName ) {
143
+        foreach ( array( 'php', 'mysql', 'wordpress' ) as $_iIndex => $_sName ) {
144 144
             if ( isset( $aRequirements[ $_sName ] ) ) {
145 145
                 $aRequirements[ $_sName ] = $aRequirements[ $_sName ] + $this->_aDefaultRequirements[ $_sName ];
146 146
             }
@@ -165,9 +165,9 @@  discard block
 block discarded – undo
165 165
         $_aWarnings = array();
166 166
 
167 167
         // PHP, WordPress, MySQL
168
-        $_aWarnings[] = $this->_getWarningByType( 'php' );
169
-        $_aWarnings[] = $this->_getWarningByType( 'wordpress' );
170
-        $_aWarnings[] = $this->_getWarningByType( 'mysql' );
168
+        $_aWarnings[ ] = $this->_getWarningByType( 'php' );
169
+        $_aWarnings[ ] = $this->_getWarningByType( 'wordpress' );
170
+        $_aWarnings[ ] = $this->_getWarningByType( 'mysql' );
171 171
 
172 172
         // Ensure necessary array elements.
173 173
         $this->_aRequirements = $this->_aRequirements + array(
@@ -180,10 +180,10 @@  discard block
 block discarded – undo
180 180
         // Check the rest.
181 181
         $_aWarnings = array_merge(
182 182
             $_aWarnings,
183
-            $this->_checkFunctions( $this->_aRequirements['functions'] ),
184
-            $this->_checkClasses( $this->_aRequirements['classes'] ),
185
-            $this->_checkConstants( $this->_aRequirements['constants'] ),
186
-            $this->_checkFiles( $this->_aRequirements['files'] )
183
+            $this->_checkFunctions( $this->_aRequirements[ 'functions' ] ),
184
+            $this->_checkClasses( $this->_aRequirements[ 'classes' ] ),
185
+            $this->_checkConstants( $this->_aRequirements[ 'constants' ] ),
186
+            $this->_checkFiles( $this->_aRequirements[ 'files' ] )
187 187
         );
188 188
 
189 189
         $this->aWarnings = array_filter( $_aWarnings ); // drop empty elements.
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
197 197
          * @return      string      The warning.
198 198
          */
199 199
         private function _getWarningByType( $sType ) {
200
-            if ( ! isset( $this->_aRequirements[ $sType ][ 'version' ] ) ) {
200
+            if ( !isset( $this->_aRequirements[ $sType ][ 'version' ] ) ) {
201 201
                 return '';
202 202
             }
203 203
             if ( $this->_checkPHPVersion( $this->_aRequirements[ $sType ][ 'version' ] ) ) {
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
          * @internal
227 227
          */
228 228
         private function _checkWordPressVersion( $sWordPressVersion ) {
229
-            return version_compare( $GLOBALS['wp_version'], $sWordPressVersion, ">=" );
229
+            return version_compare( $GLOBALS[ 'wp_version' ], $sWordPressVersion, ">=" );
230 230
         }
231 231
 
232 232
         /**
@@ -298,9 +298,9 @@  discard block
 block discarded – undo
298 298
              */
299 299
             private function _getWarningsByFunctionName( $sFuncName, $aSubjects ) {
300 300
                 $_aWarnings = array();
301
-                foreach( $aSubjects as $_sSubject => $_sWarning ) {
302
-                    if ( ! call_user_func_array( $sFuncName, array( $_sSubject ) ) ) {
303
-                        $_aWarnings[] = sprintf( $_sWarning, $_sSubject );
301
+                foreach ( $aSubjects as $_sSubject => $_sWarning ) {
302
+                    if ( !call_user_func_array( $sFuncName, array( $_sSubject ) ) ) {
303
+                        $_aWarnings[ ] = sprintf( $_sWarning, $_sSubject );
304 304
                     }
305 305
                 }
306 306
                 return $_aWarnings;
@@ -322,7 +322,7 @@  discard block
 block discarded – undo
322 322
          */
323 323
         public function _replyToPrintAdminNotices() {
324 324
 
325
-            $_aWarnings     = array_unique( $this->aWarnings );
325
+            $_aWarnings = array_unique( $this->aWarnings );
326 326
             if ( empty( $_aWarnings ) ) {
327 327
                 return;
328 328
             }
@@ -341,12 +341,12 @@  discard block
 block discarded – undo
341 341
              */
342 342
             private function _getWarnings() {
343 343
 
344
-                $_aWarnings     = array_unique( $this->aWarnings );
344
+                $_aWarnings = array_unique( $this->aWarnings );
345 345
                 if ( empty( $_aWarnings ) ) {
346 346
                     return '';
347 347
                 }
348
-                $_sScripTitle   = $this->_sScriptName
349
-                    ?  "<strong>" . $this->_sScriptName . "</strong>:&nbsp;"
348
+                $_sScripTitle = $this->_sScriptName
349
+                    ? "<strong>".$this->_sScriptName."</strong>:&nbsp;"
350 350
                     : '';
351 351
                 return $_sScripTitle
352 352
                    . implode( '<br />', $_aWarnings );
@@ -361,12 +361,12 @@  discard block
 block discarded – undo
361 361
      * @param       boolean     $bIsOnActivation    Whether it is called upon plugin activation hook.
362 362
      * @return      void
363 363
      */
364
-    public function deactivatePlugin( $sPluginFilePath, $sMessage='', $bIsOnActivation=false ) {
364
+    public function deactivatePlugin( $sPluginFilePath, $sMessage = '', $bIsOnActivation = false ) {
365 365
 
366 366
         add_action( 'admin_notices', array( $this, '_replyToPrintAdminNotices' ) );
367
-        $this->aWarnings[] = '<strong>' . $sMessage . '</strong>';
368
-        if ( ! function_exists( 'deactivate_plugins' ) ) {
369
-            if ( ! @include( ABSPATH . 'wp-admin/includes/plugin.php' ) ) {
367
+        $this->aWarnings[ ] = '<strong>'.$sMessage.'</strong>';
368
+        if ( !function_exists( 'deactivate_plugins' ) ) {
369
+            if ( !@include( ABSPATH.'wp-admin/includes/plugin.php' ) ) {
370 370
                 return;
371 371
             }
372 372
         }
@@ -376,8 +376,8 @@  discard block
 block discarded – undo
376 376
         // Before that, we can display messages to the user.
377 377
         if ( $bIsOnActivation ) {
378 378
 
379
-            $_sPluginListingPage = add_query_arg( array(), $GLOBALS['pagenow'] );
380
-            wp_die( $this->_getWarnings() . "<p><a href='$_sPluginListingPage'>Go back</a>.</p>" );
379
+            $_sPluginListingPage = add_query_arg( array(), $GLOBALS[ 'pagenow' ] );
380
+            wp_die( $this->_getWarnings()."<p><a href='$_sPluginListingPage'>Go back</a>.</p>" );
381 381
 
382 382
         }
383 383
 
Please login to merge, or discard this patch.
admin-page-framework-loader.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -16,9 +16,9 @@  discard block
 block discarded – undo
16 16
  */
17 17
 class AdminPageFrameworkLoader_Registry_Base {
18 18
 
19
-    const VERSION        = '3.8.31';    // <--- DON'T FORGET TO CHANGE THIS AS WELL!!
19
+    const VERSION        = '3.8.31'; // <--- DON'T FORGET TO CHANGE THIS AS WELL!!
20 20
     const NAME           = 'Admin Page Framework - Loader'; // the name is not 'Admin Page Framework' because warning messages gets confusing.
21
-    const SHORTNAME      = 'Admin Page Framework';  // used for a menu title etc.
21
+    const SHORTNAME      = 'Admin Page Framework'; // used for a menu title etc.
22 22
     const DESCRIPTION    = 'Loads Admin Page Framework which facilitates WordPress plugin and theme development.';
23 23
     const URI            = 'http://admin-page-framework.michaeluno.jp/';
24 24
     const AUTHOR         = 'miunosoft (Michael Uno)';
@@ -55,14 +55,14 @@  discard block
 block discarded – undo
55 55
      * @remark      This is also accessed from `uninstall.php` so do not remove.
56 56
      * @remark      Do not exceed 8 characters as a transient name allows 45 characters or less ( 40 for site transients ) so that md5 (32 characters) can be added.
57 57
      */
58
-    const TRANSIENT_PREFIX         = 'APFL_';
58
+    const TRANSIENT_PREFIX = 'APFL_';
59 59
 
60 60
     /**
61 61
      * The hook slug used for the prefix of action and filter hook names.
62 62
      *
63 63
      * @remark      The ending underscore is not necessary.
64 64
      */
65
-    const HOOK_SLUG                = 'admin_page_framework_loader';
65
+    const HOOK_SLUG = 'admin_page_framework_loader';
66 66
 
67 67
     /**
68 68
      * The text domain slug and its path.
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
      */
117 117
     static public $aAdminPages = array(
118 118
         // key => 'page slug'
119
-        'about'     => 'apfl_about',        // the welcome page
119
+        'about'     => 'apfl_about', // the welcome page
120 120
         'addon'     => 'apfl_addons',
121 121
         'tool'      => 'apfl_tools',
122 122
         'help'      => 'apfl_contact',
@@ -154,12 +154,12 @@  discard block
 block discarded – undo
154 154
      * @since       3.5.0
155 155
      * @return      string
156 156
      */
157
-    public static function getPluginURL( $sRelativePath='' ) {
157
+    public static function getPluginURL( $sRelativePath = '' ) {
158 158
         if ( isset( self::$_sPluginURLCache ) ) {
159
-            return self::$_sPluginURLCache . $sRelativePath;
159
+            return self::$_sPluginURLCache.$sRelativePath;
160 160
         }
161 161
         self::$_sPluginURLCache = trailingslashit( plugins_url( '', self::$sFilePath ) );
162
-        return self::$_sPluginURLCache . $sRelativePath;
162
+        return self::$_sPluginURLCache.$sRelativePath;
163 163
     }
164 164
         /**
165 165
          * @since       3.7.9
@@ -189,13 +189,13 @@  discard block
 block discarded – undo
189 189
      * @since       3.5.0
190 190
      * @return      void
191 191
      */
192
-    static public function setAdminNotice( $sMessage, $sClassAttribute='error' ) {
193
-        if ( ! is_admin() ) {
192
+    static public function setAdminNotice( $sMessage, $sClassAttribute = 'error' ) {
193
+        if ( !is_admin() ) {
194 194
             return;
195 195
         }
196
-        self::$_aAdminNotices[] = array(
196
+        self::$_aAdminNotices[ ] = array(
197 197
             'message'           => $sMessage,
198
-            'class_attribute'   => trim( $sClassAttribute ) . ' notice is-dismissible',
198
+            'class_attribute'   => trim( $sClassAttribute ).' notice is-dismissible',
199 199
         );
200 200
         add_action( 'admin_notices', array( __CLASS__, '_replyToSetAdminNotice' ) );
201 201
     }
@@ -205,12 +205,12 @@  discard block
 block discarded – undo
205 205
          * @return      void
206 206
          */
207 207
         static public function _replyToSetAdminNotice() {
208
-            foreach( self::$_aAdminNotices as $_aAdminNotice ) {
209
-                echo "<div class='" . esc_attr( $_aAdminNotice['class_attribute'] ) . " notice is-dismissible'>"
208
+            foreach ( self::$_aAdminNotices as $_aAdminNotice ) {
209
+                echo "<div class='".esc_attr( $_aAdminNotice[ 'class_attribute' ] )." notice is-dismissible'>"
210 210
                         ."<p>"
211 211
                             . sprintf(
212
-                                '<strong>%1$s</strong>: ' . $_aAdminNotice['message'],
213
-                                self::NAME . ' ' . self::VERSION
212
+                                '<strong>%1$s</strong>: '.$_aAdminNotice[ 'message' ],
213
+                                self::NAME.' '.self::VERSION
214 214
                             )
215 215
                         . "</p>"
216 216
                     . "</div>";
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
222 222
 AdminPageFrameworkLoader_Registry::setUp( __FILE__ );
223 223
 
224 224
 // Initial checks. - Do no load if accessed directly, not exiting because the 'uninstall.php' and inclusion list generator will load this file.
225
-if ( ! defined( 'ABSPATH' ) ) {
225
+if ( !defined( 'ABSPATH' ) ) {
226 226
     return;
227 227
 }
228 228
 if ( defined( 'DOING_UNINSTALL' ) && DOING_UNINSTALL ) {
@@ -234,8 +234,8 @@  discard block
 block discarded – undo
234 234
 
235 235
     $_bFrameworkLoaded = class_exists( 'AdminPageFramework_Registry', false );
236 236
     if (
237
-        ! $_bFrameworkLoaded
238
-        || ! defined( 'AdminPageFramework_Registry::VERSION' ) // backward compatibility
237
+        !$_bFrameworkLoaded
238
+        || !defined( 'AdminPageFramework_Registry::VERSION' ) // backward compatibility
239 239
         || version_compare( AdminPageFramework_Registry::VERSION, AdminPageFrameworkLoader_Registry::VERSION, '<' )
240 240
     ) {
241 241
         AdminPageFrameworkLoader_Registry::setAdminNotice(
@@ -253,18 +253,18 @@  discard block
 block discarded – undo
253 253
 add_action( 'admin_init', 'AdminPageFrameworkLoader_Warning' );
254 254
 
255 255
 // Include the library file - the development version will be available if you cloned the GitHub repository.
256
-$_sDevelopmentVersionPath = AdminPageFrameworkLoader_Registry::$sDirPath . '/development/admin-page-framework.php';
256
+$_sDevelopmentVersionPath = AdminPageFrameworkLoader_Registry::$sDirPath.'/development/admin-page-framework.php';
257 257
 $_bDebugMode              = defined( 'WP_DEBUG' ) && WP_DEBUG;
258 258
 $_bLoadDevelopmentVersion = $_bDebugMode && file_exists( $_sDevelopmentVersionPath );
259 259
 include(
260 260
     $_bLoadDevelopmentVersion
261 261
         ? $_sDevelopmentVersionPath
262
-        : AdminPageFrameworkLoader_Registry::$sDirPath . '/library/apf/admin-page-framework.php'
262
+        : AdminPageFrameworkLoader_Registry::$sDirPath.'/library/apf/admin-page-framework.php'
263 263
 );
264 264
 
265 265
 // Include the framework loader plugin components.
266 266
 include( AdminPageFramework_Registry::$aClassFiles[ 'AdminPageFramework_PluginBootstrap' ] );
267
-include( AdminPageFrameworkLoader_Registry::$sDirPath . '/include/class/AdminPageFrameworkLoader_Bootstrap.php' );
267
+include( AdminPageFrameworkLoader_Registry::$sDirPath.'/include/class/AdminPageFrameworkLoader_Bootstrap.php' );
268 268
 new AdminPageFrameworkLoader_Bootstrap(
269 269
     AdminPageFrameworkLoader_Registry::$sFilePath,
270 270
     AdminPageFrameworkLoader_Registry::HOOK_SLUG    // hook prefix
Please login to merge, or discard this patch.