Changeset 868335

Timestamp:

03/03/2014 04:38:12 AM (12 years ago)

Author:

paulgpetty

Message:

fix label issue for offsite provider

Location:

wp-time-machine/trunk

Files:

• css/wp-time-machine.css (modified) (3 diffs)
• includes/wpTimeMachineCore.php (modified) (52 diffs)

wp-time-machine/trunk/css/wp-time-machine.css

@@ -132 +132 @@
 }
 
+#wpTimeMachine label.offsite_provider {
+width:auto;
+}
+
 #wpTimeMachine input {
 width:205px;
@@ -251 +255 @@
 }
 
-a.wpTM_checked:hover, 
+a.wpTM_checked:hover,
 a.wpTM_unchecked {
 padding-left:25px;
@@ -257 +261 @@
 }
 
-a.wpTM_unchecked:hover, 
+a.wpTM_unchecked:hover,
 a.wpTM_checked {
 padding-left:25px;

wp-time-machine/trunk/includes/wpTimeMachineCore.php

@@ -41 +41 @@
         $wpTimeMachineOptionsStorage['use_post_pub'] = $_GET['use_post_pub'];
     }
-    
+
     if (isset($_GET['use_timestamp_dir'])) {
         $wpTimeMachineOptionsStorage['use_timestamp_dir'] = $_GET['use_timestamp_dir'];
@@ -79 +79 @@
         }
     }
-    
+
     if ( $_GET['set_offsite'] == 1 ) {
-    
+
         $wpTimeMachineOptionsStorage['offsite'] = $_GET['offsite'];
-        
+
         echo "set offsite to: " . $_GET['offsite'];
-    
-    }
-    
+
+    }
+
     update_option(adminOptionsName, $wpTimeMachineOptionsStorage);
-    
+
     if ( $_GET['ajax_settings_only'] == 1 ) {
-    
+
         exit;
-    
+
     }
 
@@ -118 +118 @@
 
     wpTimeMachine_clean( $files );
-    
+
     if ($_GET['clean'] == 1) {
-    
+
         exit;
-    
+
     }
-                
+
     if ($wpTimeMachineOptionsStorage['use_timestamp_dir'] == "true") {
         $timestamp = date("Y-m-d");
@@ -149 +149 @@
         // Wordpress
         wpTimeMachine_logger( $use_log,  "---     Wordpress: ". wp_version );
-        
+
         // WP_ALLOW_MULTISITE info if applicable
-        if (WP_ALLOW_MULTISITE) {       
+        if (WP_ALLOW_MULTISITE) {
             wpTimeMachine_logger( $use_log,  "---     WP_ALLOW_MULTISITE: true" );
             wpTimeMachine_logger( $use_log,  "---     DOMAIN_CURRENT_SITE: ".DOMAIN_CURRENT_SITE );
@@ -177 +177 @@
         }
         wpTimeMachine_logger( $use_log,  '---     Current Offsite Provider: '.$offsite );
-    
+
     }
 
@@ -200 +200 @@
             echo "#Info {display:none; } ";
         }
-    
+
         if ($wpTimeMachineOptionsStorage['show_options'] == "true") {
             echo ".wpTimeMachineOptions {display:block;} ";
@@ -206 +206 @@
             echo ".wpTimeMachineOptions {display:none; } ";
         }
-    
+
         ?>
 
@@ -224 +224 @@
                 echo "\n\t\t\"\"\n\t);";
             }
-        
+
             $js_offsite = $wpTimeMachineOptionsStorage['offsite'];
-        
+
         ?>
 
@@ -240 +240 @@
 
             <?php
-            
+
             foreach ($offsites as $provider) {
             echo "
@@ -252 +252 @@
                     break;";
             }
-            
+
             ?>
-            
+
                 default:
                     // need to add error logging for this... or maybe just re-use FTP or Dropbox
@@ -261 +261 @@
 
         }
-    
+
         var use_log_labels = new Array(
-            "<?php echo $wpTimeMachineText['use_log_labels'][0]; ?>", 
+            "<?php echo $wpTimeMachineText['use_log_labels'][0]; ?>",
             "<?php echo $wpTimeMachineText['use_log_labels'][1]; ?>"
         );
-    
+
         var format_labels = new Array(
-            "<?php echo $wpTimeMachineText['format_labels'][0]; ?>", 
+            "<?php echo $wpTimeMachineText['format_labels'][0]; ?>",
             "<?php echo $wpTimeMachineText['format_labels'][1]; ?>"
         );
-    
+
         var use_post_pub_labels = new Array(
-            "<?php echo $wpTimeMachineText['use_post_pub_labels'][0]; ?>", 
+            "<?php echo $wpTimeMachineText['use_post_pub_labels'][0]; ?>",
             "<?php echo $wpTimeMachineText['use_post_pub_labels'][1]; ?>"
         );
-        
+
         var use_timestamp_dir_labels = new Array(
-            "<?php echo $wpTimeMachineText['use_timestamp_dir_labels'][0]; ?>", 
+            "<?php echo $wpTimeMachineText['use_timestamp_dir_labels'][0]; ?>",
             "<?php echo $wpTimeMachineText['use_timestamp_dir_labels'][1]; ?>"
         );
-    
+
         var exclude_cache_labels = new Array(
-            "<?php echo $wpTimeMachineText['exclude_cache_labels'][0]; ?>", 
+            "<?php echo $wpTimeMachineText['exclude_cache_labels'][0]; ?>",
             "<?php echo $wpTimeMachineText['exclude_cache_labels'][1]; ?>"
         );
-    
+
         var remote_pass_storage_labels = new Array(
-            "<?php echo $wpTimeMachineText['remote_pass_storage_labels'][0]; ?>", 
+            "<?php echo $wpTimeMachineText['remote_pass_storage_labels'][0]; ?>",
             "<?php echo $wpTimeMachineText['remote_pass_storage_labels'][1]; ?>"
         );
-    
+
     </script>
-    
+
     <script type="text/javascript" src="<?php echo wpcontent_url; ?>/plugins/wp-time-machine/javascript/wp-time-machine.js"></script>
 
@@ -301 +301 @@
 
         <?php
-    
+
         if ($wpTimeMachineOptionsStorage['recent_archive_name'] != "") {
-    
+
             echo "<div id=\"RecentInfo\">";
             echo "<h3>Recent Archive Information:</h3>";
@@ -310 +310 @@
             echo "<p><a href='javascript:;' onclick='jQuery(\"#RecentInfo\").toggle()' class=\"close\">Close this</a></p>";
             echo "</div>";
-    
+
         } else {
-    
+
             echo "<div id=\"RecentInfo\">";
             echo "<h3>Your Archive Information:</h3>";
@@ -318 +318 @@
             echo "<p><a href='javascript:;' onclick='jQuery(\"#RecentInfo\").toggle()' class=\"close\">Close this</a></p>";
             echo "</div>";
-    
+
         }
-    
+
         ?>
-        
+
         <p>
 
@@ -419 +419 @@
 
                     <?php
-                
+
                     if ($offsite != "") {
                     ?>
@@ -443 +443 @@
                     foreach ($offsites as $provider) {
                         echo "<input class=\"rd\" type=\"radio\" name=\"offsite\" value=\"".$provider['offsite_short']."\" id=\"offsite_radio_".$provider['offsite_short']."\"> ";
-                        echo "<label for=\"offsite_radio_".$provider['offsite_short']."\">".$provider['offsite_name']."</label> ";
+                        echo "<label class=\"offsite_provider\" for=\"offsite_radio_".$provider['offsite_short']."\">".$provider['offsite_name']."</label> ";
                     }
-                    
+
                     ?>
 
@@ -458 +458 @@
                         <?php
                     }
-                
+
                     ?>
 
@@ -478 +478 @@
                         <p id="wpTimeMachine_learn_about_formats" class="help" style="display:none">
 
-                        By default File Formats is set to generate all of your archives as ZIP (.zip) files; since that seems to be the most commonly used archive format on most 
+                        By default File Formats is set to generate all of your archives as ZIP (.zip) files; since that seems to be the most commonly used archive format on most
                         operating systems (which means you probably already have the software needed to extract Zip files).  That said, tar files (or .tar.gz) provide better
-                        compression and therefore take up less disk space and take less time to transfer.  
+                        compression and therefore take up less disk space and take less time to transfer.
 
                             <a href="javascript:;" onclick="jQuery(this).parent().hide()" class="close">Close</a>
 
                         </p>
-                    
+
                     </fieldset>
 
@@ -509 +509 @@
 
                         This feature lets you take advantage of WordPress' ability to add events after a post gets published (or updated).  Using this plugin you
-                        can force WordPress to start wp Time Machine every time a publish or update event occurs.  There is a considerable price worth thinking 
-                        about: using this feature will add time to publishing (depending on the size of your blog it may add several seconds, or even minutes). 
-                        
+                        can force WordPress to start wp Time Machine every time a publish or update event occurs.  There is a considerable price worth thinking
+                        about: using this feature will add time to publishing (depending on the size of your blog it may add several seconds, or even minutes).
+
                             <a href="javascript:;" onclick="jQuery(this).parent().hide()" class="close">Close</a>
 
@@ -517 +517 @@
 
                     </fieldset>
-                    
+
                     <fieldset>
 
@@ -582 +582 @@
 
                         <?php
-        
+
                             if ($wpTimeMachineOptionsStorage['use_log'] == "true") {
                                 echo '<a class="full" href="javascript:;" id="use_log" value="true">'.$wpTimeMachineText['use_log_labels'][0].'</a> &nbsp;&nbsp;';
@@ -588 +588 @@
                                 echo '<a class="full" href="javascript:;" id="use_log" value="false">'.$wpTimeMachineText['use_log_labels'][1].'</a> &nbsp;&nbsp;';
                             }
-                        
+
                             if ( file_exists( wpTimeMachineLog ) ) {
                                 echo '<a class="full" href="'. wpcontent_url .'/wpTimeMachine_log.txt" target="_blank">'.$wpTimeMachineText['view_log_label'].'</a> &nbsp;&nbsp;';
@@ -618 +618 @@
 
             <div id="Info">
-            
-                <p> 
-                   
-                    This plugin is pretty simple. You can use Dropbox, Amazon's S3, or an FTP account to store WordPress. Need an account? 
-                    Visit: <a href="https://www.dropbox.com/" target="_new">Dropbox</a>. Or, for Amazon's S3 visit: 
-                    <a href="https://s3.amazonaws.com/" target="_new">https://s3.amazonaws.com</a>.  If you decide to use an FTP account, 
+
+                <p>
+
+                    This plugin is pretty simple. You can use Dropbox, Amazon's S3, or an FTP account to store WordPress. Need an account?
+                    Visit: <a href="https://www.dropbox.com/" target="_new">Dropbox</a>. Or, for Amazon's S3 visit:
+                    <a href="https://s3.amazonaws.com/" target="_new">https://s3.amazonaws.com</a>.  If you decide to use an FTP account,
                     it makes a lot of sense to use a remote FTP account on a server that isn't shared with this WordPress installation.
-                                  
-                </p>  
-                  
-                <p>    
-                    
+
+                </p>
+
+                <p>
+
                     The files that get generated for each archive are:
-                                         
+
                     <ol>
                         <li>wpTimeMachine-content-files<?php echo $format; ?></li>
@@ -638 +638 @@
                         <li>wpTimeMachine-Instructions.txt <sup>2</sup></li>
                         <li>wpTimeMachine-RestorationScript.sh <sup>3</sup></li>
-                    </ol> 
-                                           
+                    </ol>
+
                     <em>
                     1: if you're not using .htaccess then no, it won't be created <br />
                     2: if you're ever recovering from a catastrophic WordPress failure, this file will help<br />
                     3: this file is still under development &amp; should be used with caution<br />
-                    </em>  
-                                          
+                    </em>
+
                     <div class="hint">
                     It's a good idea to store the following two items on your own, (in the same place as the files above):<br/>
@@ -651 +651 @@
                     Or, read about how to use <a href="http://wptimemachine.com/-/wordpress-and-subversion/">Subversion for your WordPress implementation</a>.<br/>
                     Your copy of wp-config.php <em>For security purposes this file is not backed up!</em>
-                    </div>  
-                      
-                </p> 
+                    </div>
+
+                </p>
 
                 <p>
@@ -663 +663 @@
                         <li><?php echo wpcontent_url . "/plugins/wp-time-machine/cron.php"; ?></li>
                         <li><?php echo wpcontent_dir . "/plugins/wp-time-machine/cron.php"; ?></li>
-                    </ol> 
-                         
+                    </ol>
+
                     For example, you might use curl:<br />
-                                  
+
                     <code>
                     curl "<?php echo wpcontent_url . "/plugins/wp-time-machine/cron.php"; ?>?generate=1"
                     </code>
-                 
+
                     <div class="hint">
-                    
+
                     Note that it is recommended that you set up a separate cron job to delete the temporary archive files:
-                            
+
                     <code>
                     curl "<?php echo wpcontent_url . "/plugins/wp-time-machine/cron.php"; ?>?clean=1"
                     </code>
-                    
+
                     </div>
-                    
+
                     There are many ways to use the scripts referenced above ... this is just an example, for more information read this:<br />
                     <a href="http://wptimemachine.com/-/scheduling-wp-time-machine-via-cron/" target="_new">http://wptimemachine.com/-/scheduling-wp-time-machine-via-cron/</a>
-                    
+
                 </p>
 
                 <p>
 
-                    Having trouble? Visit the <a href="http://wordpress.org/tags/wp-time-machine?forum_id=10" target="_blank">WordPress forum</a>, and please share 
-                    this URL: <a href="<?php echo wpcontent_url . "/wpTimeMachine_log.txt"; ?>" target="_new"><?php echo wpcontent_url . "/wpTimeMachine_log.txt"; ?></a> 
+                    Having trouble? Visit the <a href="http://wordpress.org/tags/wp-time-machine?forum_id=10" target="_blank">WordPress forum</a>, and please share
+                    this URL: <a href="<?php echo wpcontent_url . "/wpTimeMachine_log.txt"; ?>" target="_new"><?php echo wpcontent_url . "/wpTimeMachine_log.txt"; ?></a>
                     (the log -- if enabled -- contains vital information for trouble shooting).<br />
 
@@ -697 +697 @@
 
             <div class="wpTimeMachine_footer">
-            
-                <ul>                
+
+                <ul>
                 <li class="Twitter"><a href="http://twitter.com/home?status=An awesome WordPress plugin for backups: wp Time Machine: http://wpTimeMachine.com" target="_new">Share on Twitter</a></li>
                 <li class="Facebook"><a href="http://www.facebook.com/sharer.php?u=http://wpTimeMachine.com" target="_new">Share on Facebook</a></li>
                 <li class="Official"><a href="http://wpTimeMachine.com" target="_new" title="Official website for the wp Time Machine">wpTimeMachine.com</a>, version: <?php echo wpTimeMachineVersion; ?></li>
                 </ul>
-            
+
             </div>
 
         </p>
-        
+
         <pre id="output" style="display:none">
 
@@ -713 +713 @@
 
         if ($_GET['generate'] == 1) {
-    
+
             // store start time & begin logging archive process
-    
+
             $start_generate = time();
-    
+
             wpTimeMachine_logger( $use_log,  '--- Start to generate archives...' );
-            
+
             @unlink( wpcontent_archive.".tar.gz" );
             @unlink( wpcontent_archive.".zip" );
-    
+
             // validate referer via nonce
-    
+
             check_admin_referer('wpTimeMachine_nonce');
-    
+
             // instructions text file
 
@@ -734 +734 @@
 
                 include( "wpTimeMachineArchiveRestorationScript.php" );
-            
+
             // generate archives
-    
-            if ($format == "zip") {    
-                $wpcontent_archive = new Archive_Zip( wpcontent_archive.$format );    
-            } else {    
-                $wpcontent_archive = new Archive_Tar( wpcontent_archive.$format );    
+
+            if ($format == "zip") {
+                $wpcontent_archive = new Archive_Zip( wpcontent_archive.$format );
+            } else {
+                $wpcontent_archive = new Archive_Tar( wpcontent_archive.$format );
             }
-            
-            if ($wpTimeMachineOptionsStorage['exclude_cache'] == "true") {          
+
+            if ($wpTimeMachineOptionsStorage['exclude_cache'] == "true") {
                 $wpTimeMachine_excluded = array ( ".", "..", "upgrade", "cache" );
-            } else {            
-                $wpTimeMachine_excluded = array ( ".", "..", "upgrade" );           
+            } else {
+                $wpTimeMachine_excluded = array ( ".", "..", "upgrade" );
             }
-            
+
             $wpTimeMachine_excluded[] = wpTimeMachineOptionsFile;
 
             wpTimeMachine_logger( $use_log,  '---     wpTimeMachine-content-files' . $format . ', will contain: ' );
-            
+
             $dh  = opendir(wpcontent_dir);
             while (false !== ($filename = readdir($dh))) {
                 $wp_content_files[] = $filename;
             }
-            
-            foreach ($wp_content_files as $wp_content_file) {           
-                if ( ! in_array( $wp_content_file, $wpTimeMachine_excluded ) ) {                    
-                    $wpcontent_archive_files[] = wpcontent_dir . "/" .$wp_content_file;                
-                    wpTimeMachine_logger( $use_log,  '---          add: wp-content/' . $wp_content_file );                    
-                }             
+
+            foreach ($wp_content_files as $wp_content_file) {
+                if ( ! in_array( $wp_content_file, $wpTimeMachine_excluded ) ) {
+                    $wpcontent_archive_files[] = wpcontent_dir . "/" .$wp_content_file;
+                    wpTimeMachine_logger( $use_log,  '---          add: wp-content/' . $wp_content_file );
+                }
             }
 
             if ($wpcontent_archive->create( $wpcontent_archive_files ) ) {
-    
+
                 @copy( $_SERVER['DOCUMENT_ROOT'] . "/.htaccess", htaccess_archive );
-    
+
                 wpTimeMachine_logger( $use_log,  '---     wpTimeMachine-htaccess.txt (copy of .htaccess file)' );
-                
+
                 $instructions_handle = fopen(instructions, 'w');
                 fwrite($instructions_handle, $instructions_txt);
                 fclose($instructions_handle);
-    
+
                 wpTimeMachine_logger( $use_log,  '---     wpTimeMachine-Instructions.txt (text instructions)' );
-    
+
                 $restoration_handle = fopen(restoration, 'w');
                 fwrite($restoration_handle, $restoration_shell_script);
                 fclose($restoration_handle);
-    
+
                 wpTimeMachine_logger( $use_log,  '---     wpTimeMachine-RestorationScript.sh (restoration shell script)' );
 
                 $link = mysql_connect(DB_HOST, DB_USER, DB_PASSWORD);
                 mysql_select_db(DB_NAME, $link);
-    
+
                 $tables = array();
                 $result = mysql_query("SHOW TABLES");
-    
+
                 while ($row = mysql_fetch_row($result)) {
                     $tables[] = $row[0];
@@ -795 +795 @@
                 foreach ($tables as $table) {
 
-                    $table_prefix = substr( $table, 0, strlen(wp_table_prefix) ); 
+                    $table_prefix = substr( $table, 0, strlen(wp_table_prefix) );
                     // if the current $table doesn't start with the wp table prefix skip it
-                    if ($table_prefix == wp_table_prefix) {             
-                    
+                    if ($table_prefix == wp_table_prefix) {
+
                         $result = mysql_query('SELECT * FROM '.$table);
                         $num_fields = mysql_num_fields($result);
-        
+
                         $wpTimeMachine_dump.= 'DROP TABLE IF EXISTS '.$table.';';
                         $row2 = mysql_fetch_row(mysql_query('SHOW CREATE TABLE '.$table));
                         $wpTimeMachine_dump.= "\n\n".$row2[1].";\n\n";
-        
+
                         for ($i = 0; $i < $num_fields; $i++) {
                             while ($row = mysql_fetch_row($result)) {
@@ -819 +819 @@
                         }
                         $wpTimeMachine_dump.="\n\n\n";
-                    
+
                     }
 
                 }
-    
+
                 $handle = fopen(wpdata_sql, 'w+');
                 fwrite($handle, $wpTimeMachine_dump);
@@ -833 +833 @@
 
             // start processing the files
-    
+
             wpTimeMachine_logger( $use_log,  '--- Initiate transfer to ' . $offsite );
 
@@ -842 +842 @@
 
             $login_error = false;
-                  
+
             switch ($offsite) {
 
                 case "dropbox":
-                
+
                     $uploader = new DropboxUploader( $POST_remote_user, $POST_remote_pass );
-                        
+
                     wpTimeMachine_logger( $use_log,  '--- Instantiate new DropboxUploader() ' );
 
@@ -856 +856 @@
                         $dropbox_dir = "/" . $POST_remote_path ;
                     }
-                
+
                     if ($timestamp != "") {
                         $dropbox_dir .= "-" . $timestamp;
-                    } 
+                    }
 
                     foreach ($files as $i => $file) {
@@ -867 +867 @@
 
                             try {
-                            
+
                                 $uploader->upload( $file, $remoteDir = $dropbox_dir );
 
@@ -881 +881 @@
 
                         }
-                    }   
+                    }
 
                     $remote_path = $dropbox_dir;
@@ -889 +889 @@
                 case "aws_s3":
                 case "s3":
-                
+
                     if ($POST_remote_path == "") {
                         $bucket = "wpTimeMachine";
@@ -895 +895 @@
                         $bucket = $POST_remote_path ;
                     }
-                        
+
                     if ($timestamp != "") {
                         $bucket .= "-" . $timestamp;
-                    } 
-                                
+                    }
+
                     $bucket = uniqid( $bucket . "-" );
-                    
+
                     $s3 = new S3( $POST_remote_user, $POST_remote_pass );
 
@@ -907 +907 @@
 
                     try {
-                    
+
                         $s3->putBucket( $bucket, S3::ACL_PRIVATE );
 
@@ -919 +919 @@
 
                     }
-                    
+
                     foreach ($files as $i => $file) {
-                    
+
                         if (file_exists($file)) {
-                        
+
                             wpTimeMachine_logger( $use_log,  '--- files loop: ' . $file . ' >> ' .  $bucket  . ' >> ' .  baseName( $file ) );
-                        
+
                             $s3->putObjectFile( $file, $bucket, baseName( $file ), S3::ACL_PRIVATE );
-                        
+
                         }
 
                     }
-                    
+
                     $remote_path = $bucket;
 
@@ -939 +939 @@
 
                     include("wpTimeMachineNonSwitch.php4");
-                    
+
                     break;
-                    
+
                 default:
-                
-                    wpTimeMachine_logger( $use_log,  '--- Error: no offsite set, or recognized.' ); 
+
+                    wpTimeMachine_logger( $use_log,  '--- Error: no offsite set, or recognized.' );
 
             }
@@ -950 +950 @@
 
             if (! $login_error) {
-    
+
                 wpTimeMachine_logger( $use_log,  '--- Transfer has completed, to remote_path: ' . $remote_path );
 
-                // store info about this archive    
+                // store info about this archive
                 $wpTimeMachineOptionsStorage['recent_archive_path']     = $remote_path;
                 $wpTimeMachineOptionsStorage['recent_archive_format']   = $format;
-                $wpTimeMachineOptionsStorage['recent_archive_duration'] = time() - $wpTimeMachine_start;    
+                $wpTimeMachineOptionsStorage['recent_archive_duration'] = time() - $wpTimeMachine_start;
                 update_option(adminOptionsName, $wpTimeMachineOptionsStorage);
-        
+
                 echo "<span id='update'>Your archives are ready, they took about " . $wpTimeMachineOptionsStorage['recent_archive_duration'] . " seconds to create;";
                 echo " and are in your ".$offsite_name." account (in this ".strtolower($remote_path_label).": ".$wpTimeMachineOptionsStorage['recent_archive_path'].").</span>";
-        
+
             } else {
 
                 wpTimeMachine_logger( $use_log,  '--- Transfer not completed' );
-        
+
                 echo "<span id='update'>Archiving failed</span>";
-        
+
             }
 
         }
-    
+
         ?>
 
@@ -989 +989 @@
 } // End function wpTimeMachine_init()
 
-function wpTimeMachine_publish_post($offsites) 
+function wpTimeMachine_publish_post($offsites)
 {
 
@@ -995 +995 @@
 
         shell_exec('curl "http://wptimemachine.com/_wp_/wp-content/plugins/wp-time-machine/cron.php?generate=1"');
-        
+
         wpTimeMachine_logger( $use_log,  '--- wpTimeMachine_publish_post: success!' );
 
     } catch (Exception $e) {
-    
+
         $error = $e->getMessage();
         wpTimeMachine_logger( $use_log,  '--- wpTimeMachine_publish_post: Error: '.$error );
@@ -1005 +1005 @@
 }
 
-function wpTimeMachine_enqueue_scripts() 
+function wpTimeMachine_enqueue_scripts()
 {
-    
+
     wp_deregister_script( 'jquery-form' );
     wp_register_script( 'jquery-form', wpcontent_url . '/plugins/wp-time-machine/javascript/jquery.form.js' );
     wp_enqueue_script( 'jquery-form' );
-    
+
     wp_register_script( 'jquery.validate', wpcontent_url . '/plugins/wp-time-machine/javascript/jquery.validate.js' );
     wp_enqueue_script( 'jquery.validate' );
-    
+
     wp_register_script( 'jquery.simplemodal-1.3.5.min', wpcontent_url . '/plugins/wp-time-machine/javascript/jquery.simplemodal-1.3.5.min.js' );
     wp_enqueue_script( 'jquery.simplemodal-1.3.5.min' );
 
-}   
+}
 
 function wpTimeMachine_head()
-{ 
-    
+{
+
     echo '<link type="text/css" rel="stylesheet" href="' . wpcontent_url . '/plugins/wp-time-machine/css/wp-time-machine.css" />' . "\n";
 
@@ -1031 +1031 @@
 
     if ($use_log != "true") return;
-    
+
     if (wpTimeMachine_apache_log == "true") error_log( $message );
 
@@ -1050 +1050 @@
         @unlink( $file );
     }
-    
+
     // the only file that is $format specific is the wp-content archive
-    // ...so we need to ensure that either format gets deleted 
+    // ...so we need to ensure that either format gets deleted
     @unlink( wpcontent_archive.".tar.gz" );
     @unlink( wpcontent_archive.".zip" );
@@ -1064 +1064 @@
 
     $wpTimeMachineOptionsStorage = get_option(adminOptionsName);
-    
+
     $option_dump  = "";
 
@@ -1080 +1080 @@
         foreach ($wpTimeMachineOptionsStorage as $key => $option) {
             $wpTimeMachineOptions[$key] = $option;
-            
+
             $option_dump .= "$"."wpTimeMachineOptionsStorage['" . $key . "'] = \"" . $option . "\";" . "\n";
-            
+
         }
     }
@@ -1093 +1093 @@
     fwrite($od_handle, $option_dump);
     fclose($od_handle);
-    
+
     return $wpTimeMachineOptions;
 
@@ -1123 +1123 @@
 // Hook to kick off wp Time Machine after publish event hook fires
 
-function wpTimeMachine_post_pub($offsites) 
+function wpTimeMachine_post_pub($offsites)
 {
 
     $wpTimeMachineOptionsStorage = wpTimeMachine_getAdminOptions();
-    
+
     if ($wpTimeMachineOptionsStorage['use_post_pub'] == "false") {
         return;
@@ -1135 +1135 @@
 
         shell_exec('curl "http://wptimemachine.com/_wp_/wp-content/plugins/wp-time-machine/cron.php?generate=1"');
-        
+
         wpTimeMachine_logger( $use_log,  '--- wpTimeMachine_post_pub: success!' );
 
     } catch (Exception $e) {
-    
+
         $error = $e->getMessage();
-        
+
         wpTimeMachine_logger( $use_log,  '--- wpTimeMachine_post_pub: Error: '.$error );
-        
+
     }
 }