Changeset 387

Timestamp:

03/19/2010 02:07:09 AM (23 months ago)

Author:

ofer

Message:

Backup code to out google app is here, no restore yet

Location:

trunk/WordPress/plugin/transposh

Files:

• js/transposhcontrol.js (modified) (1 diff)
• transposh.php (modified) (3 diffs)
• wp/transposh_admin.php (modified) (3 diffs)
• wp/transposh_ajax.php (modified) (1 diff)
• wp/transposh_backup.php (added)
• wp/transposh_db.php (modified) (2 diffs)
• wp/transposh_options.php (modified) (3 diffs)

trunk/WordPress/plugin/transposh/js/transposhcontrol.js

@@ -122 +122 @@
 
     // backup button
-    jQuery("#transposh-backup").click(function () {
-        jQuery.get(t_jp.post_url + "?backup=" + Math.random());
+    backupclick = function () {
+        jQuery("#transposh-backup").click(function(){
+            return false
+            }).text("Backup In Progress");
+        jQuery.get(t_jp.post_url + "?backup=" + Math.random(),function(data) {
+            var color = 'red';
+            if (data[0] == '2') color = 'green';
+            jQuery('#backup_result').html(data).css('color',color);
+            jQuery("#transposh-backup").click(backupclick).text("Do Backup Now");
+        });
         return false;
-    });
+    };
+    jQuery("#transposh-backup").click(backupclick);
 
     // translate all button

trunk/WordPress/plugin/transposh/transposh.php

@@ -44 +44 @@
 require_once("wp/transposh_options.php");
 require_once("wp/transposh_postpublish.php");
+require_once("wp/transposh_backup.php");
 
 /**
@@ -118 +119 @@
 //        add_action('wp_head', array(&$this,'add_transposh_async'));
         add_action("sm_addurl",array(&$this,'add_sm_transposh_urls'));
+        add_action('transposh_backup_event', array(&$this,'run_backup'));
+
         register_activation_hook(__FILE__, array(&$this,'plugin_activate'));
         register_deactivation_hook(__FILE__,array(&$this,'plugin_deactivate'));
@@ -701 +704 @@
         }
     }
+
+    /**
+     * Runs a scheduled backup
+     */
+    function run_backup() {
+        logger ("backup run..");
+        $my_transposh_backup = new transposh_backup($this);
+        $my_transposh_backup->do_backup();
+    }
 }
+
 $my_transposh_plugin = new transposh_plugin();
 

trunk/WordPress/plugin/transposh/wp/transposh_admin.php

@@ -119 +119 @@
         $this->transposh->options->set_preferred_translator($_POST[PREFERRED_TRANSLATOR]);
         $this->transposh->options->set_msn_key($_POST[MSN_TRANSLATE_KEY]);
+        $this->transposh->options->set_transposh_key($_POST[TRANSPOSH_KEY]);
+
+        // handle change of schedule for backup to daily
+        if ($_POST[TRANSPOSH_BACKUP_SCHEDULE] != $this->transposh->options->get_transposh_backup_schedule()) {
+            wp_clear_scheduled_hook('transposh_backup_event');
+            if ($_POST[TRANSPOSH_BACKUP_SCHEDULE] == 1)
+                wp_schedule_event(time(), 'daily', 'transposh_backup_event');
+        }
+        $this->transposh->options->set_transposh_backup_schedule($_POST[TRANSPOSH_BACKUP_SCHEDULE]);
+
         $this->transposh->options->update_options();
     }
@@ -201 +211 @@
         //add a 3rd content box now for demonstration purpose, boxes added at start of page rendering can't be switched on/off,
         //may be needed to ensure that a special box is always available
-        add_meta_box('transposh-contentbox-community', 'Transposh community features (upcoming)', array(&$this, 'on_contentbox_community_content'), $this->pagehook, 'normal', 'core');
+        add_meta_box('transposh-contentbox-community', 'Transposh community features', array(&$this, 'on_contentbox_community_content'), $this->pagehook, 'normal', 'core');
         //define some data can be given to each metabox during rendering - not used now
         //$data = array('My Data 1', 'My Data 2', 'Available Data 1');
@@ -531 +541 @@
 
     function on_contentbox_community_content($data) {
-   /*     echo '<a tabindex="4" id="transposh-backup" href="/wp-admin/post-new.php?preview=true" class="button">Do Backup Now</a><br/>';
-        //  echo "<p id=\"backup\">Do backup.</p>";
-        echo 'Service Key: <input type="text" size="32" class="regular-text" value="'.$this->transposh->options->get_transposh_key().'" id="'.TRANSPOSH_KEY.'" name="'.TRANSPOSH_KEY.'"/>';
-        echo '
-<script type="text/javascript">
-    //<![CDATA[
-    jQuery(document).ready( function($) {
-        // close postboxes that should be closed
-        $("#backup").click(function () {
-        $.get("'.$this->transposh->post_url.'?backup=" + Math.random());
-        //alert ("hi");
-        });
-    });
-    //]]>
-</script>';*/
-        echo "<p>This space is reserved for the coming community features of Transposh that will help you find translators to help with your site.</p>";
+        echo '<h4>Backup service for human translation</h4>';
+        echo '<input type="radio" value="1" name="'.TRANSPOSH_BACKUP_SCHEDULE.'" '. $this->checked($this->transposh->options->get_transposh_backup_schedule() == 1) . '/>Enable daily backup<br/>';
+        echo '<input type="radio" value="2" name="'.TRANSPOSH_BACKUP_SCHEDULE.'" '. $this->checked($this->transposh->options->get_transposh_backup_schedule() == 2) . '/>Enable live backup<br/>';
+        echo '<input type="radio" value="0" name="'.TRANSPOSH_BACKUP_SCHEDULE.'" '. $this->checked($this->transposh->options->get_transposh_backup_schedule() == 0) . '/>Disable backup (Can be run manually by clicking the button below)<br/>';
+        echo 'Service Key: <input type="text" size="32" class="regular-text" value="'.$this->transposh->options->get_transposh_key().'" id="'.TRANSPOSH_KEY.'" name="'.TRANSPOSH_KEY.'"/> <a target="_blank" href="http://transposh.org/faq/#restore">How to restore?</a><br/>';
+        echo '<div id="backup_result"></div>';
+        echo '<div style="margin:10px 0"><a id="transposh-backup" href="#" class="button">Do Backup Now</a></div>';
     }
 }

trunk/WordPress/plugin/transposh/wp/transposh_ajax.php

@@ -90 +90 @@
 }
 // Start backup on demand
-/*elseif (isset($_GET['backup'])) {
-    $my_transposh_backup = new transposh_backup($my_transposh_plugin);
-    $my_transposh_backup->do_backup();
-}*/
+elseif (isset($_GET['backup'])) {
+    $my_transposh_plugin->run_backup();
+}
 
 ?>

trunk/WordPress/plugin/transposh/wp/transposh_db.php

@@ -172 +172 @@
                 $source = $_POST["sr$i"];
             }
-
+            // should we backup?
+            if ($source ==0) $backup_immidiate_possible = true;
 
             //Here we check we are not redoing stuff
             list($translated_text, $old_source) = $this->fetch_translation($original, $lang);
             if ($translated_text) {
-                if ($source == 1) {
+                if ($source > 0) {
                     logger("Warning auto-translation for already translated: $original $lang", 0);
                     continue;
@@ -220 +221 @@
             logger("Error !!! failed to insert to db $original , $translation, $lang," , 0);
             header("HTTP/1.0 404 Failed to update language database ".mysql_error());
+        }
+
+        // Should we backup now?
+        if ($backup_immidiate_possible && $this->transposh->options->get_transposh_backup_schedule() == 2) {
+            $this->transposh->run_backup();
         }
         // this is a termination for the ajax sequence

trunk/WordPress/plugin/transposh/wp/transposh_options.php

@@ -85 +85 @@
 //Allows user to set his default language per #63 @since 0.3.8
 define("WIDGET_ALLOW_SET_DEFLANG", "widget_allow_set_deflang");
+//Stores the site key to transposh services (backup @since 0.5.0)
+define("TRANSPOSH_KEY","transposh_key");
+//Stores the site key to transposh services (backup @since 0.5.0)
+define("TRANSPOSH_BACKUP_SCHEDULE","transposh_backup_schedule");
 
 
@@ -248 +252 @@
     }
 
+    function get_transposh_key() {
+        return $this->options[TRANSPOSH_KEY];
+    }
+
+    function get_transposh_backup_schedule() {
+        return $this->options[TRANSPOSH_BACKUP_SCHEDULE];
+    }
+
     /**
      * Sets a value at the options array
@@ -361 +373 @@
     }
 
+    function set_transposh_key($val) {
+        $this->set_value($val, $this->options[TRANSPOSH_KEY]);
+    }
+
+    function set_transposh_backup_schedule($val) {
+        $this->set_value($val, $this->options[TRANSPOSH_BACKUP_SCHEDULE]);
+    }
+
     /**
      * Updates options at the wordpress options table if there was a change