Changeset 755

Timestamp:

12/09/2012 02:49:53 AM (6 months ago)

Author:

ofer

Message:

Allow to reset configuration in utils, closing warnings will work again

Location:

trunk/WordPress/plugin/transposh

Files:

• js/admin/utils.js (modified) (2 diffs)
• js/admin/warningclose.js (modified) (1 diff)
• transposh.php (modified) (1 diff)
• wp/transposh_admin.php (modified) (12 diffs)
• wp/transposh_options.php (modified) (2 diffs)

trunk/WordPress/plugin/transposh/js/admin/utils.js

@@ -9 +9 @@
         $.ajaxSetup({
             cache: false
+        });
+
+        $("#transposh-reset-options").click(function() {
+            if (!confirm("Are you sure you want to do this?")) return false;
+            if (!confirm("Are you REALLY sure you want to do this, your configuration will be reset?")) return false;
+            $.post(ajaxurl, {
+                action: 'tp_reset'
+            });
         });
 
@@ -51 +59 @@
             return false;
         };
+        
         $("#transposh-clean-auto").click(function() {
             cleanautoclick(0,$(this));

trunk/WordPress/plugin/transposh/js/admin/warningclose.js

@@ -2 +2 @@
     $(function() {
         $(".warning-close").click(function() {
-            $(this).parent().hide();
+            $(this).parents('div:first').hide();
             $.post(ajaxurl, {
                 action: 'tp_close_warning',

trunk/WordPress/plugin/transposh/transposh.php

@@ -398 +398 @@
         // this is an ajax special case, currently crafted and tested on buddy press, lets hope this won't make hell break loose.
         // it basically sets language based on referred when accessing wp-load.php (which is the way bp does ajax)
-        tp_logger(substr($_SERVER['SCRIPT_FILENAME'], -11), 4);
+        tp_logger(substr($_SERVER['SCRIPT_FILENAME'], -11), 5);
         if (substr($_SERVER['SCRIPT_FILENAME'], -11) == 'wp-load.php') {
             $this->target_language = transposh_utils::get_language_from_url($_SERVER['HTTP_REFERER'], $this->home_url);

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

@@ -30 +30 @@
     private $pages = array();
     private $contains_settings = false;
+    private $page = '';
 
     // constructor of class, PHP4 compatible construction for backward compatibility
@@ -44 +45 @@
         // register ajax callbacks
         add_action('wp_ajax_tp_close_warning', array(&$this, 'on_ajax_tp_close_warning'));
+        add_action('wp_ajax_tp_reset', array(&$this, 'on_ajax_tp_reset'));
         add_action('wp_ajax_tp_backup', array(&$this, 'on_ajax_tp_backup'));
         add_action('wp_ajax_tp_restore', array(&$this, 'on_ajax_tp_restore'));
@@ -63 +65 @@
             'tp_support' => array(__('Support', TRANSPOSH_TEXT_DOMAIN)),
         );
+        if (isset($_GET['page']) && isset($this->pages[$_GET['page']])) $this->page = $_GET['page'];
     }
 
@@ -227 +230 @@
      */
     function admin_print_scripts() {
-        switch ($_GET['page']) {
+        switch ($this->page) {
             case 'tp_main':
                 wp_enqueue_script('common');
@@ -274 +277 @@
             // retrieve the function output and set it as tab content
             'content' => $this->on_contextual_help()));
-        if ($_GET['page'] == 'tp_main') {
+        if ($this->page == 'tp_main') {
             add_screen_option('layout_columns', array('max' => 4, 'default' => 2));
             add_meta_box('transposh-sidebox-about', __('About this plugin', TRANSPOSH_TEXT_DOMAIN), array(&$this, 'on_sidebox_about_content'), '', 'side', 'core');
@@ -287 +290 @@
         echo '<form action="admin-post.php" method="post">';
         echo '<input type="hidden" name="action" value="save_transposh"/>';
-        echo '<input type="hidden" name="page" value="' . $_GET['page'] . '"/>';
+        echo '<input type="hidden" name="page" value="' . $this->page . '"/>';
         echo wp_nonce_field(TR_NONCE);
         screen_icon('transposh-logo');
@@ -293 +296 @@
         echo '<h2 class="nav-tab-wrapper">';
         foreach ($this->pages as $slug => $titles) {
-            $active = ($slug === $_GET['page']) ? ' nav-tab-active' : '';
+            $active = ($slug === $this->page) ? ' nav-tab-active' : '';
             echo '<a href="admin.php?page=' . $slug . '" class="nav-tab' . $active . '">';
             echo esc_html($titles[0]);
@@ -300 +303 @@
         echo '</h2>';
 
-        // TODO: look at this...
-        call_user_func(array(&$this, $_GET['page']));
+        if ($this->page) call_user_func(array(&$this, $this->page));
 
         // Add submission for pages that can be modified
@@ -573 +575 @@
          * Insert buttons allowing removal of automated translations from database and maintenence
          */
+        echo '<div style="margin:10px 0"><a id="transposh-reset-options" href="#" nonce="' . wp_create_nonce('transposh-clean') . '" class="button">' . __('Reset configuration to default (saves keys)', TRANSPOSH_TEXT_DOMAIN) . '</a></div>';
         echo '<div style="margin:10px 0"><a id="transposh-clean-auto" href="#" nonce="' . wp_create_nonce('transposh-clean') . '" class="button">' . __('Delete all automated translations', TRANSPOSH_TEXT_DOMAIN) . '</a></div>';
         echo '<div style="margin:10px 0"><a id="transposh-clean-auto14" href="#" nonce="' . wp_create_nonce('transposh-clean') . '" class="button">' . __('Delete automated translations older than 14 days', TRANSPOSH_TEXT_DOMAIN) . '</a></div>';
@@ -738 +741 @@
         }
 
-        if (!(class_exists('Memcache') /* !!&& $this->memcache->connect(TP_MEMCACHED_SRV, TP_MEMCACHED_PORT) */) && !function_exists('apc_fetch') && !function_exists('xcache_get') && !function_exists('eaccelerator_get')) {
+        if ($this->page && !(class_exists('Memcache') /* !!&& $this->memcache->connect(TP_MEMCACHED_SRV, TP_MEMCACHED_PORT) */) && !function_exists('apc_fetch') && !function_exists('xcache_get') && !function_exists('eaccelerator_get')) {
             $this->add_warning('tp_cache_warning', __('We were not able to find a supported in-memory caching engine, installing one can improve performance.', TRANSPOSH_TEXT_DOMAIN) . ' <a href="http://transposh.org/faq#performance">' . __('Check Transposh FAQs', TRANSPOSH_TEXT_DOMAIN) . '</a>', 'updated');
         }
@@ -746 +749 @@
         if (!$this->transposh->options->get_transposh_admin_hide_warning($id)) {
             //$this->add_warning_script();
-            wp_enqueue_script('transposh_warningclose', $this->transposh->transposh_plugin_url . '/' . TRANSPOSH_DIR_JS . '/warningclose.js', array('jquery'), TRANSPOSH_PLUGIN_VER, true);
+            wp_enqueue_script('transposh_warningclose', $this->transposh->transposh_plugin_url . '/' . TRANSPOSH_DIR_JS . '/admin/warningclose.js', array('jquery'), TRANSPOSH_PLUGIN_VER, true);
             echo '<div class="' . $level . '"><p>&#9888;&nbsp;' .
             $message .
@@ -770 +773 @@
         $this->transposh->options->update_options();
         die(); // this is required to return a proper result
+    }
+
+    function on_ajax_tp_reset() {
+        $this->transposh->options->reset_options();
+        die();
     }
 

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

@@ -188 +188 @@
             $value = $_POST[$name];
         }
-
+        
         if (TP_OPT_BOOLEAN == $this->vars[$name]->get_type()) {
             $value = ($value) ? 1 : 0;
         }
-
-        if ($this->vars[$name]->get_value() != $value) {
+        
+        if ($this->vars[$name]->get_value() !== $value) {
             tp_logger("option '$name' value set: $value");
             $this->vars[$name]->set_value($value);
@@ -306 +306 @@
 
     /**
+     * Resets all options except keys
+     */
+    function reset_options() {
+        $this->options = array();
+        foreach (array('msn_key', 'google_key', 'oht_id', 'oht_key','transposh_key') as $key) {
+            $this->options[$key] = $this->vars[$key]->get_value();
+        }
+            update_option(TRANSPOSH_OPTIONS, $this->options);
+    }
+
+    /**
      * Determine if the given language code is the default language
      * @param string $language