merge changes from pro 3.31 release

wp-media · May 3, 2016 · 253896c · 253896c · pedro-mendonca · May 3, 2016
1 parent b8e1ad9
commit 253896c
Show file tree

Hide file tree

Showing 29 changed files with 904 additions and 1,042 deletions.
diff --git a/assets/css/backwpup.css b/assets/css/backwpup.css
@@ -200,24 +200,26 @@
 #wpfooter #footer-right {
 	overflow: hidden;
 }
-#wpfooter .mp_logo {
-	background: url('../images/mp_logo_small.png') no-repeat;
-	display: block;
-	float: left;
+#wpfooter .inpsyde_logo {
+	background: url('../images/inpsyde.png') no-repeat;
+	display: inline-block;
+	margin-top: 5px;
 	margin-right: 15px;
-	line-height: 26px;
-	width: 145px;
+	line-height: 25px;
+	height: 25px;
+	width: 80px;
 	text-indent: -9999em;
 }
+#wpfooter .inpsyde_logo:active {
+	text-decoration: none;
+}
 #wpfooter #footer-left .backwpup-get-pro {
-	display: block;
-	float: left;
-	line-height: 36px;
-	margin-right: 15px;
+	display: inline-block;
+	line-height: 25px;
 }
 #wpfooter #footer-upgrade .backwpup-update-footer {
 	display: block;
-	line-height: 36px;
+	line-height: 25px;
 }
 #wpfooter #footer-left #footer-thankyou {
 	clear: both;

diff --git a/assets/css/backwpup.min.css b/assets/css/backwpup.min.css
diff --git a/assets/images/inpsyde.png b/assets/images/inpsyde.png
diff --git a/assets/images/mp_logo_small.png b/assets/images/mp_logo_small.png
diff --git a/assets/js/general.min.js b/assets/js/general.min.js
diff --git a/backwpup.php b/backwpup.php
@@ -1,11 +1,11 @@
 <?php
 /**
  * Plugin Name: BackWPup
- * Plugin URI: https://marketpress.com/product/backwpup-pro/
+ * Plugin URI: http://backwpup.com
  * Description: WordPress Backup Plugin
  * Author: Inpsyde GmbH
  * Author URI: http://inpsyde.com
- * Version: 3.3.1-alpha
+ * Version: 3.3.1
  * Text Domain: backwpup
  * Domain Path: /languages/
  * Network: true
@@ -138,43 +138,27 @@ public static function get_plugin_data( $name = NULL ) {
 			if ( empty( self::$plugin_data ) ) {
 				self::$plugin_data = get_file_data( __FILE__, array(
 																   'name'        => 'Plugin Name',
-																   'pluginuri'   => 'Plugin URI',
-																   'version'     => 'Version',
-																   'description' => 'Description',
-																   'author'      => 'Author',
-																   'authoruri'   => 'Author URI',
-																   'textdomain'  => 'Text Domain',
-																   'domainpath'  => 'Domain Path',
-																   'license'     => 'License',
-																   'licenseuri'  => 'License URI'
+																   'version'     => 'Version'
 															  ), 'plugin' );
-				//Translate some vars
 				self::$plugin_data[ 'name' ]        = trim( self::$plugin_data[ 'name' ] );
-				self::$plugin_data[ 'pluginuri' ]   = trim( self::$plugin_data[ 'pluginuri' ] );
-				self::$plugin_data[ 'description' ] = trim( self::$plugin_data[ 'description' ] );
-				self::$plugin_data[ 'author' ]      = trim( self::$plugin_data[ 'author' ] );
-				self::$plugin_data[ 'authoruri' ]   = trim( self::$plugin_data[ 'authoruri' ] );
 				//set some extra vars
 				self::$plugin_data[ 'basename' ] = plugin_basename( dirname( __FILE__ ) );
 				self::$plugin_data[ 'mainfile' ] = __FILE__ ;
 				self::$plugin_data[ 'plugindir' ] = untrailingslashit( dirname( __FILE__ ) ) ;
 				self::$plugin_data[ 'hash' ] = get_site_option( 'backwpup_cfg_hash' );
 				if ( empty( self::$plugin_data[ 'hash' ] ) || strlen( self::$plugin_data[ 'hash' ] ) < 6 || strlen( self::$plugin_data[ 'hash' ] ) > 12 ) {
-					update_site_option( 'backwpup_cfg_hash', substr( md5( md5( BackWPup::get_plugin_data( "mainfile" ) ) ), 14, 6 ) );
-					self::$plugin_data[ 'hash' ] = get_site_option( 'backwpup_cfg_hash' );
+					self::$plugin_data[ 'hash' ] = substr( md5( md5( __FILE__ ) ), 14, 6 );
+					update_site_option( 'backwpup_cfg_hash', self::$plugin_data[ 'hash' ] );
 				}
 				if ( defined( 'WP_TEMP_DIR' ) && is_dir( WP_TEMP_DIR ) ) {
-					self::$plugin_data[ 'temp' ] = trailingslashit( untrailingslashit( str_replace( '\\', '/', WP_TEMP_DIR ) ) . '/backwpup-' . self::$plugin_data[ 'hash' ] );
+					self::$plugin_data['temp'] = str_replace( '\\', '/', get_temp_dir() ) . 'backwpup-' . self::$plugin_data['hash'] . '/';
 				} else {
-					$upload_dir = wp_upload_dir();
-					self::$plugin_data[ 'temp' ] = trailingslashit( untrailingslashit( str_replace( '\\', '/', $upload_dir[ 'basedir' ] ) ) . '/backwpup-' . self::$plugin_data[ 'hash' ] . '-temp' );
+					$upload_dir                = wp_upload_dir();
+					self::$plugin_data['temp'] = str_replace( '\\', '/', $upload_dir['basedir'] ) . '/backwpup-' . self::$plugin_data['hash'] . '-temp/';
 				}
 				self::$plugin_data[ 'running_file' ] = self::$plugin_data[ 'temp' ] . 'backwpup-working.php';
 				self::$plugin_data[ 'url' ] = plugins_url( '', __FILE__ );
-				self::$plugin_data[ 'cacert' ] = FALSE;
-				if ( file_exists( self::$plugin_data[ 'plugindir' ] . '/vendor/Guzzle/Http/Resources/cacert.pem' ) )
-					self::$plugin_data[ 'cacert' ] = self::$plugin_data[ 'plugindir' ] . '/vendor/Guzzle/Http/Resources/cacert.pem';
-				self::$plugin_data[ 'cacert' ] = apply_filters( 'backwpup_cacert_bundle', self::$plugin_data[ 'cacert' ] );
+				self::$plugin_data[ 'cacert' ] = apply_filters( 'backwpup_cacert_bundle', ABSPATH . WPINC . '/certificates/ca-bundle.crt' );
 				//get unmodified WP Versions
 				include ABSPATH . WPINC . '/version.php';
 				/** @var $wp_version string */