Changeset 1351860

Timestamp:

02/16/2016 01:54:50 PM (10 years ago)

Author:

markusklems

Message:

Added support and bugtracking features for customized or shared WordPress installations where central php configs might not be at the default paths.

Location:

cloudwok-file-upload/trunk

Files:

• admin.php (modified) (4 diffs)
• cloudwok.php (modified) (5 diffs)
• readme.txt (modified) (2 diffs)

cloudwok-file-upload/trunk/admin.php

@@ -1 +1 @@
 <?php
     define( 'BLOCK_LOAD', true );
-    require_once( $_SERVER['DOCUMENT_ROOT'] . '/wp-config.php' );
-    require_once( $_SERVER['DOCUMENT_ROOT'] . '/wp-includes/wp-db.php' );
+    define('MYPATH', dirname(__FILE__));
+    if ( file_exists( $_SERVER['DOCUMENT_ROOT'] . '/wp-config.php') ) {
+      require_once( $_SERVER['DOCUMENT_ROOT'] . '/wp-config.php' );
+    } else {
+      // trying probable locations of wp-config.php
+      if (file_exists( MYPATH . '/../../../wp-config.php' )) {
+        require_once( MYPATH . '/../../../wp-config.php' );
+      } elseif (file_exists( MYPATH . '/../../wp-config.php' )) {
+        require_once( MYPATH . '/../../wp-config.php' );
+      } elseif (file_exists( MYPATH . '/../wp-config.php' )) {
+        require_once( MYPATH . '/../wp-config.php' );
+      } elseif (file_exists( MYPATH . '/wp-config.php' )) {
+        require_once( MYPATH . '/wp-config.php' );
+      } else {
+        // shit, could not find wp-config.php
+        die();
+      }
+    }
+    if (file_exists($_SERVER['DOCUMENT_ROOT'] . '/wp-includes/wp-db.php') ) {
+      require_once( $_SERVER['DOCUMENT_ROOT'] . '/wp-includes/wp-db.php' );
+    } else {
+      // trying probable locations of wp-config.php
+      if (file_exists( MYPATH . '/../../../wp-includes/wp-db.php' )) {
+        require_once( MYPATH . '/../../../wp-includes/wp-db.php' );
+      } elseif (file_exists( MYPATH . '/../../wp-includes/wp-db.php' )) {
+        require_once( MYPATH . '/../../wp-includes/wp-db.php' );
+      } elseif (file_exists( MYPATH . '/../wp-includes/wp-db.php' )) {
+        require_once( MYPATH . '/../wp-includes/wp-db.php' );
+      } elseif (file_exists( MYPATH . '/wp-includes/wp-db.php' )) {
+        require_once( MYPATH . '/wp-includes/wp-db.php' );
+      } else {
+        // shit, could not find wp-includes/wp-db.php
+        die();
+      }
+    }
 
     global $wpdb;
@@ -10 +43 @@
     if ($_SERVER['REQUEST_METHOD'] === 'POST') {
       // update
-     if(!array_diff(array('cwnonce','ref','code'), array_keys($_POST)) || ! wp_verify_nonce( $_POST['cwnonce'], $noncetxt ))
+     if(!array_diff(array('cwnonce','ref','code'), array_keys($_POST)) && wp_verify_nonce( $_POST['cwnonce'], $noncetxt ))
      {
           $ref=(int)$_POST['ref'];
@@ -26 +59 @@
           );
           echo "Updated";
-      } else if(!array_diff(array('cwnonce','code'), array_keys($_POST)) || ! wp_verify_nonce( $_POST['cwnonce'], $noncetxt )) {
+      } else if(!array_diff(array('cwnonce','code'), array_keys($_POST)) && wp_verify_nonce( $_POST['cwnonce'], $noncetxt )) {
          // create
         $wpdb->insert(
@@ -70 +103 @@
      parse_str(file_get_contents('php://input'), $_DELETE );
       // delete row
-     if(!array_diff(array('cwnonce','ref'), array_keys($_DELETE)) || ! wp_verify_nonce( $_DELETE['cwnonce'], $noncetxt ))
+     if(!array_diff(array('cwnonce','ref'), array_keys($_DELETE)) && wp_verify_nonce( $_DELETE['cwnonce'], $noncetxt ))
      {
          $ref=(int)$_DELETE['ref'];

cloudwok-file-upload/trunk/cloudwok.php

@@ -4 +4 @@
 Plugin URI: http://www.cloudwok.com
 Description: CloudWok enables you to let your website visitors upload files directly into a Dropbox, Google Drive, Amazon S3, Box.com, or other cloud storage folder that you own.
-Version: 0.5.0
+Version: 0.5.1
 Author: CloudWok
 Author Email: [email protected]
@@ -335 +335 @@
     ) $charset_collate;";
 
-    require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+  if (file_exists( ABSPATH . 'wp-admin/includes/upgrade.php' )) {
+      require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+  } else {
+    // could not find upgrade.php where we expected it to be
+    // trying out some other paths to find it
+    if (file_exists( ABSPATH . '/../wp-admin/includes/upgrade.php' )) {
+      require_once( ABSPATH . '/../wp-admin/includes/upgrade.php' );
+    } elseif (file_exists( ABSPATH . '/../../wp-admin/includes/upgrade.php' )) {
+      require_once( ABSPATH . '/../../wp-admin/includes/upgrade.php' );
+    } elseif (file_exists( ABSPATH . '/../../../wp-admin/includes/upgrade.php' )) {
+      require_once( ABSPATH . '/../../../wp-admin/includes/upgrade.php' );
+    }
+  }
     dbDelta( $sql1 );
 }
@@ -367 +379 @@
   $adminUrl = plugin_dir_url( __FILE__ ) . 'admin.php';
   $nonce = wp_create_nonce( "cWn0Nc€4tW" );
+  // check if wp-config.php and wp-includes/wp-db.php files can be found
+  define('MYPATH', dirname(__FILE__));
+  if (!file_exists( $_SERVER['DOCUMENT_ROOT'] . '/wp-config.php') && !file_exists( MYPATH . '/../../../wp-config.php' ) && !file_exists( MYPATH . '/../../wp-config.php' ) && !file_exists( MYPATH . '/../wp-config.php' ) && !file_exists( MYPATH . '/wp-config.php' )) {
+    echo '<p style="color:red;">Warning: wp-config.php could not be found at ' . $_SERVER['DOCUMENT_ROOT'] . '/wp-config.php' . ' or sub paths of ' . MYPATH . '. The CloudWok settings page might therefore not work correctly. Please send an e-mail with this warning to [email protected] and ask for a solution of the issue.</p>';
+  }
+  if (!file_exists( $_SERVER['DOCUMENT_ROOT'] . '/wp-includes/wp-db.php') && !file_exists( MYPATH . '/../../../wp-includes/wp-db.php' ) && !file_exists( MYPATH . '/../../wp-includes/wp-db.php' ) && !file_exists( MYPATH . '/../wp-includes/wp-db.php' ) && !file_exists( MYPATH . '/wp-includes/wp-db.php' )) {
+    echo '<p style="color:red;">Warning: wp-includes/wp-db.php could not be found at ' . $_SERVER['DOCUMENT_ROOT'] . '/wp-includes/wp-db.php' . ' or sub paths of ' . MYPATH . '. The CloudWok settings page might therefore not work correctly. Please send an e-mail with this warning to [email protected] and ask for a solution of the issue.</p>';
+  }
+  if (!file_exists( ABSPATH . 'wp-admin/includes/upgrade.php' ) && !file_exists( ABSPATH . '/../wp-admin/includes/upgrade.php' ) && !file_exists( ABSPATH . '/../../wp-admin/includes/upgrade.php' ) && !file_exists( ABSPATH . '/../../../wp-admin/includes/upgrade.php' )) {
+    echo '<p style="color:red;">Warning: wp-admin/includes/upgrade.php could not be found at ' . ABSPATH . 'wp-admin/includes/upgrade.php' . ' or sub paths. The CloudWok settings page might therefore not work correctly. Please send an e-mail with this warning to [email protected] and ask for a solution of the issue.</p>';
+  }
+
   // Add bootstrap css and js
   echo '<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">
@@ -449 +473 @@
             jQuery("#editRef").val("");
             jQuery("#cloudwokEmbedCode").val("");
-            console.log(resp);
         }
     });
@@ -504 +527 @@
       appendRefListItem(ref);
     });
-    jQuery("#cloudwokEmbedCode").prop("placeholder","Please enter your embed code here (visit https://www.cloudwok.com/developers to generate your customiezd code)");
+    jQuery("#cloudwokEmbedCode").prop("placeholder","Please enter your embed code here (visit https://www.cloudwok.com/developers to generate your customized code)");
   });';
   echo '</script>';

cloudwok-file-upload/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.0.0
 Tested up to: 4.4.2
-Stable tag: 0.5.0
+Stable tag: 0.5.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -143 +143 @@
 == Changelog ==
 
+= 0.5.1 =
+On some custom WordPress installations the settings page does not work if central php config files cannot be accessed. This update helps tracking down and reporting possible issues that occur in these cases.
 = 0.5.0 =
 New shortcode feature. Create a customized widget via the Settings > CloudWok menu in the admin sidebar. The old shortcode still works but will not be further developed. Please use the new shortcode to customize the CloudWok widget.