Ticket #986: 986-plugins.diff

wp-content/plugins/hello.php

@@ -6 +6 @@
 Author: Matt Mullenweg
 Version: 1.5
 Author URI: http://photomatt.net/
-*/ 
+*/
 
 // These are the lyrics to Hello Dolly
 $lyrics = "Hello, Dolly

wp-content/plugins/wp-db-backup.php

@@ -11 +11 @@
 in turn was derived from phpMyAdmin.
 
 Many thanks to Owen (http://asymptomatic.net/wp/) for his patch
-   http://dev.wp-plugins.org/ticket/219
+http://dev.wp-plugins.org/ticket/219
 */
 
-// CHANGE THIS IF YOU WANT TO USE A 
+// CHANGE THIS IF YOU WANT TO USE A
 // DIFFERENT BACKUP LOCATION
 
 $rand = substr( md5( md5( DB_PASSWORD ) ), -5 );
@@ -332 +332 @@
         /////////////////////////////////////////////////////////
         function sql_addslashes($a_string = '', $is_like = FALSE)
         {
-                /*
-                        Better addslashes for SQL queries.
-                        Taken from phpMyAdmin.
-                */
-            if ($is_like) {
-                $a_string = str_replace('\\', '\\\\\\\\', $a_string);
-            } else {
-                $a_string = str_replace('\\', '\\\\', $a_string);
-            }
-            $a_string = str_replace('\'', '\\\'', $a_string);
+                /*
+                        Better addslashes for SQL queries.
+                        Taken from phpMyAdmin.
+                */
+                if ($is_like) {
+                        $a_string = str_replace('\\', '\\\\\\\\', $a_string);
+                } else {
+                        $a_string = str_replace('\\', '\\\\', $a_string);
+                }
+                $a_string = str_replace('\'', '\\\'', $a_string);
 
-            return $a_string;
+                return $a_string;
         } // function sql_addslashes($a_string = '', $is_like = FALSE)
 
         ///////////////////////////////////////////////////////////
         function backquote($a_name)
         {
-                /*
-                        Add backqouotes to tables and db-names in
-                        SQL queries. Taken from phpMyAdmin.
-                */
-            if (!empty($a_name) && $a_name != '*') {
-                if (is_array($a_name)) {
-                     $result = array();
-                     reset($a_name);
-                     while(list($key, $val) = each($a_name)) {
-                         $result[$key] = '`' . $val . '`';
-                     }
-                     return $result;
-                } else {
-                    return '`' . $a_name . '`';
-                }
-            } else {
-                return $a_name;
-            }
+                /*
+                        Add backqouotes to tables and db-names in
+                        SQL queries. Taken from phpMyAdmin.
+                */
+                if (!empty($a_name) && $a_name != '*') {
+                        if (is_array($a_name)) {
+                                $result = array();
+                                reset($a_name);
+                                while(list($key, $val) = each($a_name)) {
+                                        $result[$key] = '`' . $val . '`';
+                                }
+                                return $result;
+                        } else {
+                                return '`' . $a_name . '`';
+                        }
+                } else {
+                        return $a_name;
+                }
         } // function backquote($a_name, $do_it = TRUE)
 
         /////////////
@@ -421 +421 @@
                 Alain Wolf, Zurich - Switzerland
                 Website: http://restkultur.ch/personal/wolf/scripts/db_backup/
 
-                Modified by Scott Merril (http://www.skippy.net/) 
+                Modified by Scott Merril (http://www.skippy.net/)
                 to use the WordPress $wpdb object
                 */
 
@@ -441 +441 @@
                         $this->stow("\n");
                         $this->stow("DROP TABLE IF EXISTS " . $this->backquote($table) . ";\n");
 
-                        // 
+                        //
                         //Table structure
                         // Comment in SQL-file
                         $this->stow("\n\n");
@@ -539 +539 @@
         } // end backup_table()
 
         function return_bytes($val) {
-           $val = trim($val);
-           $last = strtolower($val{strlen($val)-1});
-           switch($last) {
-               // The 'G' modifier is available since PHP 5.1.0
-               case 'g':
-                   $val *= 1024;
-               case 'm':
-                   $val *= 1024;
-               case 'k':
-                   $val *= 1024;
-           }
+                $val = trim($val);
+                $last = strtolower($val{strlen($val)-1});
+                switch($last) {
+                        // The 'G' modifier is available since PHP 5.1.0
+                        case 'g':
+                                $val *= 1024;
+                        case 'm':
+                                $val *= 1024;
+                        case 'k':
+                                $val *= 1024;
+                }
 
-           return $val;
+                return $val;
         }
 
         ////////////////////////////
@@ -635 +635 @@
                         $randomish = md5(time());
                         $boundary = "==WPBACKUP-BY-SKIPPY-$randomish";
                         $fp = fopen($diskfile,"rb");
-                        $file = fread($fp,filesize($diskfile)); 
+                        $file = fread($fp,filesize($diskfile));
                         $this->close($fp);
                         $data = chunk_split(base64_encode($file));
                         $headers = "MIME-Version: 1.0\n";
@@ -645 +645 @@
                         $message = sprintf(__("Attached to this email is\n   %1s\n   Size:%2s kilobytes\n"), $filename, round(filesize($diskfile)/1024));
                         // Add a multipart boundary above the plain message
                         $message = "This is a multi-part message in MIME format.\n\n" .
-                                "--{$boundary}\n" .
+                                "--{$boundary}\n" .
                                 "Content-Type: text/plain; charset=\"utf-8\"\n" .
                                 "Content-Transfer-Encoding: 7bit\n\n" .
                                 $message . "\n\n";
@@ -859 +859 @@
 
                 $schedule = intval(get_option('wp_cron_backup_schedule'));
                 if (0 == $schedule) {
-                        // Scheduled backup is disabled
-                        return;
+                        // Scheduled backup is disabled
+                        return;
                 }
 
                 global $wpdb;
@@ -884 +884 @@
 
 function wpdbBackup_init() {
         global $mywpdbbackup;
-        $mywpdbbackup = new wpdbBackup();       
+        $mywpdbbackup = new wpdbBackup();
 }
 
 add_action('plugins_loaded', 'wpdbBackup_init');