duplicator_file_location_patch.diff

Index: define.php
===================================================================
--- define.php	(revision 1461678)
+++ define.php	(working copy)
@@ -3,62 +3,130 @@
 if (function_exists('plugin_dir_url')) 
 {		
     define('DUPLICATOR_VERSION',        '1.1.15');
-    define("DUPLICATOR_HOMEPAGE",       "http://lifeinthegrid.com/labs/duplicator");
-    define("DUPLICATOR_GIVELINK",       "http://lifeinthegrid.com/partner");
-    define("DUPLICATOR_HELPLINK",       "http://lifeinthegrid.com/duplicator-docs");
-    define("DUPLICATOR_CERTIFIED",      "http://lifeinthegrid.com/duplicator-hosts");
+    define('DUPLICATOR_HOMEPAGE',       'http://lifeinthegrid.com/labs/duplicator');
+    define('DUPLICATOR_GIVELINK',       'http://lifeinthegrid.com/partner');
+    define('DUPLICATOR_HELPLINK',       'http://lifeinthegrid.com/duplicator-docs');
+    define('DUPLICATOR_CERTIFIED',      'http://lifeinthegrid.com/duplicator-hosts');
     define('DUPLICATOR_PLUGIN_URL',     plugin_dir_url(__FILE__));
 	define('DUPLICATOR_SITE_URL',		get_site_url());
 	
-    /* Paths should ALWAYS read "/"
+    /* Paths should ALWAYS read '/'
       uni: /home/path/file.txt
       win:  D:/home/path/file.txt
       SSDIR = SnapShot Directory */
-    if (!defined('ABSPATH')) {
-		define('ABSPATH', dirname(__FILE__));
+    if ( ! defined('ABSPATH') ) {
+		define('ABSPATH', dirname( __FILE__ ) );
     }
 	
 	//PATH CONSTANTS
-	define("DUPLICATOR_SSDIR_NAME",     'wp-snapshots');
-	define('DUPLICATOR_PLUGIN_PATH',    str_replace("\\", "/", plugin_dir_path(__FILE__)));
-    define('DUPLICATOR_WPROOTPATH',     str_replace("\\", "/", ABSPATH));
-    define("DUPLICATOR_SSDIR_PATH",     str_replace("\\", "/", DUPLICATOR_WPROOTPATH . DUPLICATOR_SSDIR_NAME));
-	define("DUPLICATOR_SSDIR_PATH_TMP", DUPLICATOR_SSDIR_PATH . '/tmp');
-	define("DUPLICATOR_SSDIR_URL",      DUPLICATOR_SITE_URL . "/" . DUPLICATOR_SSDIR_NAME);
-    define("DUPLICATOR_INSTALL_PHP",    'installer.php');
-	define("DUPLICATOR_INSTALL_BAK",    'installer-backup.php');
-    define("DUPLICATOR_INSTALL_SQL",    'installer-data.sql');
-    define("DUPLICATOR_INSTALL_LOG",    'installer-log.txt');
-	define("DUPLICATOR_INSTALL_DB",     'database.sql');
+	if ( ! defined( 'DUPLICATOR_SSDIR_NAME' ) ) {  
+		define('DUPLICATOR_SSDIR_NAME',     'wp-snapshots' ); 
+	}
+
+	if ( ! defined( 'DUPLICATOR_PLUGIN_PATH' ) ) {
+		define( 'DUPLICATOR_PLUGIN_PATH',    str_replace( '\\', '/', plugin_dir_path(__FILE__) ) );
+	}
+
+    if ( ! defined( 'DUPLICATOR_WPROOTPATH' ) ) {
+
+		define('DUPLICATOR_WPROOTPATH',     str_replace('\\', '/', ABSPATH ) );
+	}
+    
+	if ( ! defined( 'DUPLICATOR_SSDIR_PATH' ) ) {
+		define( 'DUPLICATOR_SSDIR_PATH',     str_replace('\\', '/', DUPLICATOR_WPROOTPATH . DUPLICATOR_SSDIR_NAME ) );
+	}
+
+	if ( ! defined( 'DUPLICATOR_SSDIR_PATH_TMP' ) ) { 
+		define( 'DUPLICATOR_SSDIR_PATH_TMP', DUPLICATOR_SSDIR_PATH . '/tmp' ); 
+	}
+
+	if ( ! defined( 'DUPLICATOR_SSDIR_URL' ) ) {  
+		define( 'DUPLICATOR_SSDIR_URL',      DUPLICATOR_SITE_URL . '/' . DUPLICATOR_SSDIR_NAME );
+	}
+
+    if ( ! defined( 'DUPLICATOR_INSTALL_PHP' ) ) { 
+		define( 'DUPLICATOR_INSTALL_PHP',    'installer.php' );
+	}
+
+	if ( ! defined( 'DUPLICATOR_INSTALL_BAK ' ) ) {
+		define( 'DUPLICATOR_INSTALL_BAK',    'installer-backup.php' );
+	}
+    
+	if ( ! defined( 'DUPLICATOR_INSTALL_SQL ' ) ) { 
+		define( 'DUPLICATOR_INSTALL_SQL',    'installer-data.sql' );
+	}
+
+    if ( ! defined( 'DUPLICATOR_INSTALL_LOG ' ) ) { 
+		define( 'DUPLICATOR_INSTALL_LOG',    'installer-log.txt' );
+	}
+
+	if ( ! defined( 'DUPLICATOR_INSTALL_DB ' ) ) { 
+		define('DUPLICATOR_INSTALL_DB',     'database.sql' );
+	}
 	
 	//GENERAL CONSTRAINTS
-    define("DUPLICATOR_PHP_MAX_MEMORY",  '2048M');
-    define("DUPLICATOR_DB_MAX_TIME",     5000);
-	define("DUPLICATOR_DB_EOF_MARKER",   'DUPLICATOR_MYSQLDUMP_EOF');
+    if ( ! defined( 'DUPLICATOR_PHP_MAX_MEMORY' ) ) {
+		define( 'DUPLICATOR_PHP_MAX_MEMORY',  '2048M' );
+	}
+
+   	if ( ! defined( 'DUPLICATOR_DB_MAX_TIME' ) ) { 
+		define('DUPLICATOR_DB_MAX_TIME',     5000 );
+	}
+	
+	if ( ! defined( 'DUPLICATOR_DB_EOF_MARKER' ) ) { 
+ 		define('DUPLICATOR_DB_EOF_MARKER',   'DUPLICATOR_MYSQLDUMP_EOF' );
+	}
+	
 	//SCANNER CONSTRAINTS 
-	define("DUPLICATOR_SCAN_SITE",			157286400);	//150MB
-	define("DUPLICATOR_SCAN_WARNFILESIZE",	3145728);	//3MB
-	define("DUPLICATOR_SCAN_CACHESIZE",		524288);	//512K
-	define("DUPLICATOR_SCAN_DB_ALL_ROWS",	1000000);	//1 rows million per DB
-	define("DUPLICATOR_SCAN_DB_ALL_SIZE",	52428800);	//50MB DB
-	define("DUPLICATOR_SCAN_DB_TBL_ROWS",	100000);    //100K rows per table
-	define("DUPLICATOR_SCAN_DB_TBL_SIZE",	10485760);  //10MB Table
-	define("DUPLICATOR_SCAN_TIMEOUT",		150);		//Seconds
-	define("DUPLICATOR_SCAN_MIN_WP", "3.9.0");
+	if ( ! defined( 'DUPLICATOR_SCAN_SITE' ) ) { 
+		define('DUPLICATOR_SCAN_SITE',			157286400 );	//150MB
+	}
+
+	if ( ! defined( 'DUPLICATOR_SCAN_WARNFILESIZE' ) ) { 
+		define('DUPLICATOR_SCAN_WARNFILESIZE',	3145728 );	//3MB
+	}
+
+	if ( ! defined( 'DUPLICATOR_SCAN_CACHESIZE' ) ) { 
+		define('DUPLICATOR_SCAN_CACHESIZE',		524288 );	//512K
+	}
+
+	if ( ! defined( 'DUPLICATOR_SCAN_DB_ALL_ROWS' ) ) { 
+		define('DUPLICATOR_SCAN_DB_ALL_ROWS',	1000000 );	//1 rows million per DB
+	}
 	
+	if ( ! defined( 'DUPLICATOR_SCAN_DB_ALL_SIZE' ) ) { 
+		define('DUPLICATOR_SCAN_DB_ALL_SIZE',	52428800 );	//50MB DB
+	}
+	
+	if ( ! defined( 'DUPLICATOR_SCAN_DB_TBL_ROWS' ) ) { 
+		define('DUPLICATOR_SCAN_DB_TBL_ROWS',	100000 );    //100K rows per table
+	}
+	
+	if ( ! defined( 'DUPLICATOR_SCAN_DB_TBL_SIZE' ) ) { 
+		define( 'DUPLICATOR_SCAN_DB_TBL_SIZE',	10485760 );  //10MB Table
+	}
+	
+	if ( ! defined( 'DUPLICATOR_SCAN_TIMEOUT' ) ) { 
+		define('DUPLICATOR_SCAN_TIMEOUT',		150 );		//Seconds
+	}
+	
+	define('DUPLICATOR_SCAN_MIN_WP', '3.9.0');
+	
     $GLOBALS['DUPLICATOR_SERVER_LIST'] = array('Apache','LiteSpeed', 'Nginx', 'Lighttpd', 'IIS', 'WebServerX', 'uWSGI');
 	$GLOBALS['DUPLICATOR_OPTS_DELETE'] = array('duplicator_ui_view_state', 'duplicator_package_active', 'duplicator_settings');
 	
 	/* Used to flush a response every N items. 
 	 * Note: This value will cause the Zip file to double in size durning the creation process only*/
-	define("DUPLICATOR_ZIP_FLUSH_TRIGGER", 1000);
+	if ( ! defined( 'DUPLICATOR_ZIP_FLUSH_TRIGGER' ) ) { 
+		define( 'DUPLICATOR_ZIP_FLUSH_TRIGGER', 1000 );
+	}
 
 } else {
     error_reporting(0);
-    $port = (!empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] != "off") ? "https://" : "http://";
-    $url = $port . $_SERVER["HTTP_HOST"];
-    header("HTTP/1.1 404 Not Found", true, 404);
-    header("Status: 404 Not Found");
+    $port = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off') ? 'https://' : 'http://';
+    $url = $port . $_SERVER['HTTP_HOST'];
+    header('HTTP/1.1 404 Not Found', true, 404);
+    header('Status: 404 Not Found');
     exit();
 }
 ?>
Index: duplicator.php
===================================================================
--- duplicator.php	(revision 1461678)
+++ duplicator.php	(working copy)
@@ -50,7 +50,9 @@
     function duplicator_activate() {
 
         global $wpdb;
+     	$wp_path = get_home_path();
 
+
         //Only update database on version update
         if (DUPLICATOR_VERSION != get_option("duplicator_version_plugin")) {
             $table_name = $wpdb->prefix . "duplicator_packages";
@@ -66,7 +68,7 @@
 			   `package`	MEDIUMBLOB		NOT NULL,
 			    KEY `hash` (`hash`))";
 
-            require_once(DUPLICATOR_WPROOTPATH . 'wp-admin/includes/upgrade.php');
+            require_once( $wp_path . 'wp-admin/includes/upgrade.php' );
             @dbDelta($sql);
         }