Changeset 742

Timestamp:

11/14/2012 01:18:07 AM (6 months ago)

Author:

ofer

Message:

Grand revision of the way options are defined, should enable adding of options quicker and with less effort (hopefully), many mistakes were found in the process and corrected,

Location:

trunk/WordPress/plugin/transposh

Files:

• transposh.php (modified) (33 diffs)
• wp/transposh_3rdparty.php (modified) (3 diffs)
• wp/transposh_admin.php (modified) (27 diffs)
• wp/transposh_backup.php (modified) (3 diffs)
• wp/transposh_db.php (modified) (2 diffs)
• wp/transposh_options.php (modified) (8 diffs)
• wp/transposh_postpublish.php (modified) (4 diffs)
• wp/transposh_widget.php (modified) (1 diff)

trunk/WordPress/plugin/transposh/transposh.php

@@ -140 +140 @@
         add_filter('query_vars', array(&$this, 'parameter_queryvars'));
         add_filter('rewrite_rules_array', array(&$this, 'update_rewrite_rules'));
-        if ($this->options->get_enable_url_translate()) {
+        if ($this->options->enable_url_translate) {
             add_filter('request', array(&$this, 'request_filter'));
         }
@@ -192 +192 @@
         //TODO comment_row_actions (filter)
         // Intergrating with the gettext interface
-        if ($this->options->get_transposh_gettext_integration()) {
+        if ($this->options->transposh_gettext_integration) {
             add_filter('gettext', array(&$this, 'transposh_gettext_filter'), 10, 3);
             add_filter('gettext_with_context', array(&$this, 'transposh_gettext_filter'), 10, 3);
@@ -271 +271 @@
         $this->clean_url = transposh_utils::cleanup_url($_SERVER['REQUEST_URI'], $this->home_url, true);
         // we need this if we are using url translations
-        if ($this->options->get_enable_url_translate()) {
+        if ($this->options->enable_url_translate) {
             $this->clean_url = transposh_utils::get_original_url($this->clean_url, '', $this->target_language, array($this->database, 'fetch_original'));
         }
@@ -322 +322 @@
         }
         // Don't translate the default language unless specifically allowed to...
-        elseif ($this->options->is_default_language($this->target_language) && !$this->options->get_enable_default_translate()) {
+        elseif ($this->options->is_default_language($this->target_language) && !$this->options->enable_default_translate) {
             logger("Skipping translation for default language {$this->target_language}", 3);
         } else {
@@ -349 +349 @@
             $parse->might_json = $this->attempt_json;
             $parse->is_auto_translate = $this->is_auto_translate_permitted();
-            $parse->allow_ad = $this->options->get_widget_remove_logo();
+            $parse->allow_ad = $this->options->widget_remove_logo;
             // TODO - check this!
             if (stripos($_SERVER['REQUEST_URI'], '/feed/') !== FALSE) {
@@ -379 +379 @@
         // the wp_rewrite is not available earlier so we can only set the enable_permalinks here
         if (is_object($GLOBALS['wp_rewrite'])) {
-            if ($GLOBALS['wp_rewrite']->using_permalinks() && $this->options->get_enable_permalinks()) {
+            if ($GLOBALS['wp_rewrite']->using_permalinks() && $this->options->enable_permalinks) {
                 logger("enabling permalinks");
                 $this->enable_permalinks_rewrite = TRUE;
@@ -415 +415 @@
         logger("Enter update_rewrite_rules");
 
-        if (!$this->options->get_enable_permalinks()) {
+        if (!$this->options->enable_permalinks) {
             logger("Not touching rewrite rules - permalinks modification disabled by admin");
             return $rules;
@@ -456 +456 @@
     }
 
+    //function flush_transposh_rewrite_rules() {
+        //add_filter('rewrite_rules_array', array(&$this, 'update_rewrite_rules'));
+//        $GLOBALS['wp_rewrite']->flush_rules();        
+    //}
+    
+    
     /**
      * Let WordPress know which parameters are of interest to us.
@@ -483 +489 @@
         /*        $this->target_language = (isset($wp->query_vars[LANG_PARAM])) ? $wp->query_vars[LANG_PARAM] : '';
           if (!$this->target_language)
-          $this->target_language = $this->options->get_default_language();
+          $this->target_language = $this->options->default_language;
           logger("requested language: {$this->target_language}"); */
         // TODO TOCHECK!!!!!!!!!!!!!!!!!!!!!!!!!!1
@@ -494 +500 @@
         }
         if (!$this->target_language)
-                $this->target_language = $this->options->get_default_language();
+                $this->target_language = $this->options->default_language;
         logger("requested language: {$this->target_language}");
 
@@ -507 +513 @@
         //  and this is not a special page or one that is refered by our site
         // bots can skip this altogether
-        if (($this->options->get_enable_detect_language() || $this->options->get_widget_allow_set_default_language()) &&
+        if (($this->options->enable_detect_redirect || $this->options->widget_allow_set_deflang) &&
                 !($this->is_special_page($_SERVER['REQUEST_URI']) || (isset($_SERVER['HTTP_REFERER']) && strpos($_SERVER['HTTP_REFERER'], $this->home_url) !== false)) &&
                 !(transposh_utils::is_bot())) {
@@ -518 +524 @@
                 $_SESSION['TR_REDIRECTED'] = true;
                 // redirect according to stored lng cookie, and than according to detection
-                if (isset($_COOKIE['TR_LNG']) && $this->options->get_widget_allow_set_default_language()) {
+                if (isset($_COOKIE['TR_LNG']) && $this->options->widget_allow_set_deflang) {
                     if ($_COOKIE['TR_LNG'] != $this->target_language) {
                         $url = transposh_utils::rewrite_url_lang_param($_SERVER["REQUEST_URI"], $this->home_url, $this->enable_permalinks_rewrite, $_COOKIE['TR_LNG'], $this->edit_mode);
@@ -529 +535 @@
                     }
                 } else {
-                    $bestlang = transposh_utils::prefered_language(explode(',', $this->options->get_viewable_langs()), $this->options->get_default_language());
+                    $bestlang = transposh_utils::prefered_language(explode(',', $this->options->viewable_languages), $this->options->default_language);
                     // we won't redirect if we should not, or this is a presumable bot
-                    if ($bestlang && $bestlang != $this->target_language && $this->options->get_enable_detect_language()) {
+                    if ($bestlang && $bestlang != $this->target_language && $this->options->enable_detect_redirect) {
                         $url = transposh_utils::rewrite_url_lang_param($_SERVER['REQUEST_URI'], $this->home_url, $this->enable_permalinks_rewrite, $bestlang, $this->edit_mode);
                         if ($this->options->is_default_language($bestlang))
@@ -548 +554 @@
         // TODO - it has a bug of returning to original language following search, which can be resolved by removing search from widget urls, but maybe later...
         if (isset($wp->query_vars['s'])) {
-            if ($this->options->get_enable_search_translate()) {
+            if ($this->options->enable_search_translate) {
                 add_action('pre_get_posts', array(&$this, 'pre_post_search'));
                 add_action('posts_where_request', array(&$this, 'posts_where_request'));
@@ -581 +587 @@
     function is_translator() {
         //if anonymous translation is allowed - let anyone enjoy it
-        if ($this->options->get_anonymous_translation()) {
+        if ($this->options->allow_anonymous_translation) {
             return TRUE;
         }
@@ -597 +603 @@
 
         $this->database->setup_db();
-        // is it needed? the filter is already there? // TODO
-        add_filter('rewrite_rules_array', array(&$this, 'update_rewrite_rules'));
+        // this handles the permalink rewrite
         $GLOBALS['wp_rewrite']->flush_rules();
 
@@ -617 +622 @@
         logger("plugin_deactivate enter: " . dirname(__FILE__));
 
-        // is it needed? the filter is already there? // TODO
-        add_filter('rewrite_rules_array', array(&$this, 'update_rewrite_rules'));
+        // this handles the permalink rewrite
         $GLOBALS['wp_rewrite']->flush_rules();
 
@@ -714 +718 @@
     function add_transposh_js() {
         //not in any translation mode - no need for any js.
-        if (!($this->edit_mode || $this->is_auto_translate_permitted() || is_admin() || $this->options->get_widget_allow_set_default_language()))
+        if (!($this->edit_mode || $this->is_auto_translate_permitted() || is_admin() || $this->options->widget_allow_set_deflang))
             // TODO: need to include if allowing of setting default language - but smaller!
                 return; // TODO, check just for settings page admin and pages with our translate
-        wp_register_script('transposh', $this->transposh_plugin_url . '/' . TRANSPOSH_DIR_JS . '/transposh.js', array('jquery'), TRANSPOSH_PLUGIN_VER);
+        wp_register_script('transposh', $this->transposh_plugin_url . '/' . TRANSPOSH_DIR_JS . '/transposh.js', array('jquery'), TRANSPOSH_PLUGIN_VER, $this->options->enable_footer_scripts);
         // true -> 1, false -> nothing
         $script_params = array(
@@ -723 +727 @@
             'plugin_url' => $this->transposh_plugin_url,
             'lang' => $this->target_language,
-            'olang' => $this->options->get_default_language(),
+            'olang' => $this->options->default_language,
             // those two options show if the script can support said engines
             'prefix' => SPAN_PREFIX,
-            'preferred' => $this->options->get_preferred_translator()
+            'preferred' => $this->options->preferred_translator,
         );
 
@@ -732 +736 @@
         if (!$this->target_language || in_array($this->target_language, transposh_consts::$bing_languages)) {
             $script_params['msn'] = 1;
-            if ($this->options->get_msn_key()) {
-                $script_params['msn_key'] = $this->options->get_msn_key();
+            if ($this->options->msn_key) {
+                $script_params['msn_key'] = $this->options->msn_key;
             }
         }
         // FIX BACKEND
         if (!$this->target_language || in_array($this->target_language, transposh_consts::$google_languages)) {
-            if ($this->options->get_google_key()) {
-                $script_params['google_key'] = $this->options->get_google_key();
-            }
-            if ($this->options->get_google_key() || function_exists('curl_init'))
+            if ($this->options->google_key) {
+                $script_params['google_key'] = $this->options->google_key;
+            }
+            if ($this->options->google_key || function_exists('curl_init'))
                     $script_params['google'] = 1;
         }
         if (in_array($this->target_language, transposh_consts::$apertium_languages))
                 $script_params['apertium'] = 1;
-        if ($this->options->get_oht_id() && $this->options->get_oht_key() && in_array($this->target_language, transposh_consts::$oht_languages) && current_user_can('manage_options'))
+        if ($this->options->oht_id && $this->options->oht_key && in_array($this->target_language, transposh_consts::$oht_languages) && current_user_can('manage_options'))
                 $script_params['oht'] = 1;
-        if ($this->options->get_widget_progressbar())
+        if ($this->options->widget_progressbar)
                 $script_params['progress'] = 1;
-        if (!$this->options->get_enable_auto_translate())
+        if (!$this->options->enable_autotranslate)
                 $script_params['noauto'] = 1;
 
@@ -761 +765 @@
         }
         // set theme when it is needed
-        if ($this->options->get_widget_progressbar() || $this->edit_mode) {
-            $script_params['theme'] = $this->options->get_widget_theme();
+        if ($this->options->widget_progressbar || $this->edit_mode) {
+            $script_params['theme'] = $this->options->widget_theme;
         }
 
@@ -768 +772 @@
         wp_localize_script('transposh', 't_jp', $script_params);
         // only enqueue on real pages, other admin scripts that need this will register a dependency
-        if (($this->edit_mode || $this->is_auto_translate_permitted() || $this->options->get_widget_allow_set_default_language()) && !is_admin()) {
+        if (($this->edit_mode || $this->is_auto_translate_permitted() || $this->options->widget_allow_set_deflang) && !is_admin()) {
             wp_enqueue_script('transposh');
         }
@@ -798 +802 @@
         if (!$this->is_translator()) return false;
         // and only on the non-default lang (unless strictly specified)
-        if (!$this->options->get_enable_default_translate() && $this->options->is_default_language($this->target_language))
+        if (!$this->options->enable_default_translate && $this->options->is_default_language($this->target_language))
                 return false;
 
@@ -814 +818 @@
         logger("checking auto translatability", 4);
 
-        if (!$this->options->get_enable_auto_translate()) return false;
+        if (!$this->options->enable_autotranslate) return false;
         // auto translate is not enabled for default target language when enable default is disabled
-        if (!$this->options->get_enable_default_translate() && $this->options->is_default_language($this->target_language))
+        if (!$this->options->enable_default_translate && $this->options->is_default_language($this->target_language))
                 return false;
 
@@ -891 +895 @@
 
         // we don't really know, but we sometime rewrite urls when we are in the default language (canonicals?), so just clean them up
-        if ($this->target_language == $this->options->get_default_language()) 
+ //       if ($this->target_language == $this->options->default_language) 
+        if ($this->options->is_default_language($this->target_language)) 
         {
             $href = transposh_utils::cleanup_url($href, $this->home_url);
@@ -899 +904 @@
         // some hackery needed for url translations
         // first cut home
-        if ($this->options->get_enable_url_translate()) {
+        if ($this->options->enable_url_translate) {
             $href = transposh_utils::translate_url($href, $this->home_url, $this->target_language, array(&$this->database, 'fetch_translation'));
         }
@@ -1035 +1040 @@
             $text = "<span lang =\"$comment_lang\">" . $text . "</span>";
             if (strpos($text, '<a href="' . $this->home_url) !== FALSE) {
-                $text = str_replace('<a href="' . $this->home_url, '<a lang="' . $this->options->get_default_language() . '" href="' . $this->home_url, $text);
+                $text = str_replace('<a href="' . $this->home_url, '<a lang="' . $this->options->default_language . '" href="' . $this->home_url, $text);
             }
         }
@@ -1054 +1059 @@
             $text = "<span lang =\"$lang\">" . $text . "</span>";
             if (strpos($text, '<a href="' . $this->home_url) !== FALSE) {
-                $text = str_replace('<a href="' . $this->home_url, '<a lang="' . $this->options->get_default_language() . '" href="' . $this->home_url, $text);
+                $text = str_replace('<a href="' . $this->home_url, '<a lang="' . $this->options->default_language . '" href="' . $this->home_url, $text);
             }
         }
@@ -1114 +1119 @@
      */
     function transposh_gettext_filter($translation, $orig, $domain) {
-        if ($this->is_special_page($_SERVER['REQUEST_URI']) || ($this->options->is_default_language($this->tgl) && !$this->options->get_enable_default_translate())) {
+        if ($this->is_special_page($_SERVER['REQUEST_URI']) || ($this->options->is_default_language($this->tgl) && !$this->options->enable_default_translate)) {
             return $translation;
         }
@@ -1136 +1141 @@
      */
     function transposh_ngettext_filter($translation, $single, $plural, $domain) {
-        if ($this->is_special_page($_SERVER['REQUEST_URI']) || ($this->options->is_default_language($this->tgl) && !$this->options->get_enable_default_translate()))
+        if ($this->is_special_page($_SERVER['REQUEST_URI']) || ($this->options->is_default_language($this->tgl) && !$this->options->enable_default_translate))
                 return $translation;
         logger("($translation, $single, $plural, $domain)");
@@ -1159 +1164 @@
         }
         if (!$lang) {
-            if (!$this->options->get_transposh_default_locale_override()) {
+            if (!$this->options->transposh_locale_override) {
                 return $locale;
             }
-            $lang = $this->options->get_default_language();
+            $lang = $this->options->default_language;
         }
         list ($l, $n, $f, $locale) = explode(',', transposh_consts::$languages[$lang]);
@@ -1379 +1384 @@
         $oht = get_option(TRANSPOSH_OPTIONS_OHT, array());
         if (!isset($_GET['orglang']))
-                $_GET['orglang'] = $this->options->get_default_language();
+                $_GET['orglang'] = $this->options->default_language;
         $key = $_GET['token'] . '@' . $_GET['lang'] . '@' . $_GET['orglang'];
         if (isset($oht[$key])) {
@@ -1418 +1423 @@
         }
         $ohtbody['pid'] = $projectid;
-        $ohtbody['id'] = $this->options->get_oht_id();
-        $ohtbody['key'] = $this->options->get_oht_key();
+        $ohtbody['id'] = $this->options->oht_id;
+        $ohtbody['key'] = $this->options->oht_key;
         $ohtbody['callback'] = admin_url('admin-ajax.php');
         $ohtbody['homeurl'] = $this->home_url;

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

@@ -43 +43 @@
 
         // google analyticator
-        if ($this->transposh->options->get_transposh_collect_stats()) {
+        if ($this->transposh->options->transposh_collect_stats) {
             add_action('google_analyticator_extra_js_after', array(&$this, 'add_analyticator_tracking'));
         }
@@ -102 +102 @@
         //TODO - check using get_clean_url
         $uri = transposh_utils::cleanup_url($uri, $this->transposh->home_url);
-        if ($this->transposh->options->get_enable_url_translate()) {
+        if ($this->transposh->options->enable_url_translate) {
             $uri = transposh_utils::get_original_url($uri, '', $lang, array($this->transposh->database, 'fetch_original'));
         }
@@ -186 +186 @@
         $sm_page->SetProprity(max($sm_page->GetPriority() - 0.2, 0));
 
-        $viewable_langs = explode(',', $this->transposh->options->get_viewable_langs());
+        /* <xhtml:link 
+          rel="alternate"
+          hreflang="de"
+          href="http://www.example.com/de" /> */
+
+        $viewable_langs = explode(',', $this->transposh->options->viewable_languages());
         $orig_url = $sm_page->GetUrl();
         foreach ($viewable_langs as $lang) {
             if (!$this->transposh->options->is_default_language($lang)) {
                 $newloc = $orig_url;
-                if ($this->transposh->options->get_enable_url_translate()) {
+                if ($this->transposh->options->enable_url_translate) {
                     $newloc = transposh_utils::translate_url($newloc, $this->transposh->home_url, $lang, array(&$this->transposh->database, 'fetch_translation'));
                 }

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

@@ -75 +75 @@
         if ($role_name != 'anonymous') {
             $role = $GLOBALS['wp_roles']->get_role($role_name);
-            if (isset($role) && $role->has_cap(TRANSLATOR))
-                    return 'checked="checked"';
-        }
-        else
-                return ($this->transposh->options->get_anonymous_translation()) ? 'checked="checked"' : '';
+            if (isset($role) && $role->has_cap(TRANSLATOR)) return true;
+        }
+        else return $this->transposh->options->allow_anonymous_translation;
     }
 
@@ -94 +92 @@
                 $editable_langs = array();
 
-                //update roles and capabilities
-                foreach ($GLOBALS['wp_roles']->get_names() as $role_name => $something) {
-                    $role = $GLOBALS['wp_roles']->get_role($role_name);
-                    if ($_POST[$role_name] == "1") $role->add_cap(TRANSLATOR);
-                    else $role->remove_cap(TRANSLATOR);
-                }
-
-                // anonymous needs to be handled differently as it does not have a role
-                $this->transposh->options->set_anonymous_translation($_POST['anonymous']);
-
+                logger($$_POST['anonymous']);
                 // first set the default language
                 list ($langcode, $viewable, $translateable) = explode(",", $_POST['languages'][0]);
-                $this->transposh->options->set_default_language($langcode);
+                $this->transposh->options->default_language = $langcode;
                 unset($_POST['languages'][0]);
 
@@ -125 +114 @@
                 }
 
-                $this->transposh->options->set_viewable_langs(implode(',', $viewable_langs));
-                $this->transposh->options->set_editable_langs(implode(',', $editable_langs));
-                $this->transposh->options->set_sorted_langs(implode(',', $sorted_langs));
+                $this->transposh->options->viewable_languages = implode(',', $viewable_langs);
+                $this->transposh->options->editable_languages = implode(',', $editable_langs);
+                $this->transposh->options->sorted_languages = implode(',', $sorted_langs);
                 break;
             case "tp_settings":
-                if ($this->transposh->options->get_enable_permalinks() != $_POST[ENABLE_PERMALINKS]) {
-                    $this->transposh->options->set_enable_permalinks($_POST[ENABLE_PERMALINKS]);
-                    // rewrite rules - refresh. - because we want them set or unset upon this change
-                    // TODO - need to check if its even needed
-                    add_filter('rewrite_rules_array', array(&$this->transposh, 'update_rewrite_rules'));
+                //update roles and capabilities
+                foreach ($GLOBALS['wp_roles']->get_names() as $role_name => $something) {
+                    $role = $GLOBALS['wp_roles']->get_role($role_name);
+                    if ($_POST[$role_name] == "1") $role->add_cap(TRANSLATOR);
+                    else $role->remove_cap(TRANSLATOR);
+                }
+
+                // anonymous needs to be handled differently as it does not have a role
+                $this->transposh->options->allow_anonymous_translation = $_POST['anonymous'];
+
+                $this->transposh->options->enable_default_translate = TP_FROM_POST;
+                $this->transposh->options->enable_search_translate = TP_FROM_POST;
+                $this->transposh->options->transposh_gettext_integration = TP_FROM_POST;
+                $this->transposh->options->transposh_locale_override = TP_FROM_POST;
+
+                // We will need to refresh rewrite rules for the case someone enabled in wordpress first after transposh
+                // install and then went on to transposh and enabled, and this keeps us safe ;)
+                if ($this->transposh->options->enable_permalinks != $_POST[$this->transposh->options->enable_permalinks->get_name()]) {
+                    $this->transposh->options->enable_permalinks = TP_FROM_POST;
                     $GLOBALS['wp_rewrite']->flush_rules();
                 }
 
-                $this->transposh->options->set_enable_footer_scripts($_POST[ENABLE_FOOTER_SCRIPTS]);
-                $this->transposh->options->set_enable_detect_language($_POST[ENABLE_DETECT_LANG_AND_REDIRECT]);
-                $this->transposh->options->set_transposh_collect_stats($_POST[TRANSPOSH_COLLECT_STATS]);
-                $this->transposh->options->set_enable_default_translate($_POST[ENABLE_DEFAULT_TRANSLATE]);
-                $this->transposh->options->set_enable_search_translate($_POST[ENABLE_SEARCH_TRANSLATE]);
-                $this->transposh->options->set_transposh_gettext_integration($_POST[TRANSPOSH_GETTEXT_INTEGRATION]);
-                $this->transposh->options->set_transposh_default_locale_override($_POST[TRANSPOSH_DEFAULT_LOCALE_OVERRIDE]);
-                $this->transposh->options->set_transposh_key($_POST[TRANSPOSH_KEY]);
-                // frontend stuff
-                // handle change of schedule for backup to daily
-                //if ($_POST[TRANSPOSH_BACKUP_SCHEDULE] != $this->transposh->options->get_transposh_backup_schedule()) {
+                $this->transposh->options->enable_footer_scripts = TP_FROM_POST;
+                $this->transposh->options->enable_detect_redirect = TP_FROM_POST;
+                $this->transposh->options->transposh_collect_stats = TP_FROM_POST;
+
+                $this->transposh->options->transposh_backup_schedule = TP_FROM_POST;
+
+                // handle the backup change, create the hook
                 wp_clear_scheduled_hook('transposh_backup_event');
-                if ($_POST[TRANSPOSH_BACKUP_SCHEDULE] == 1 || $_POST[TRANSPOSH_BACKUP_SCHEDULE] == 2)
+                if ($this->transposh->options->transposh_backup_schedule)
                         wp_schedule_event(time(), 'daily', 'transposh_backup_event');
-                //}
-                $this->transposh->options->set_transposh_backup_schedule($_POST[TRANSPOSH_BACKUP_SCHEDULE]);
+
+                $this->transposh->options->transposh_key = TP_FROM_POST;
                 break;
             case "tp_engines":
-                $this->transposh->options->set_enable_auto_translate($_POST[ENABLE_AUTO_TRANSLATE]);
-                $this->transposh->options->set_enable_auto_post_translate($_POST[ENABLE_AUTO_POST_TRANSLATE]);
-                $this->transposh->options->set_msn_key($_POST[MSN_TRANSLATE_KEY]);
-                $this->transposh->options->set_google_key($_POST[GOOGLE_TRANSLATE_KEY]);
-                $this->transposh->options->set_preferred_translator($_POST[PREFERRED_TRANSLATOR]);
-                $this->transposh->options->set_oht_id($_POST[OHT_TRANSLATE_ID]);
-                $this->transposh->options->set_oht_key($_POST[OHT_TRANSLATE_KEY]);
+                $this->transposh->options->enable_autotranslate = TP_FROM_POST;
+                $this->transposh->options->enable_autoposttranslate = TP_FROM_POST;
+                $this->transposh->options->msn_key = TP_FROM_POST;
+                $this->transposh->options->google_key = TP_FROM_POST;
+                $this->transposh->options->preferred_translator = TP_FROM_POST;
+                $this->transposh->options->oht_id = TP_FROM_POST;
+                $this->transposh->options->oht_key = TP_FROM_POST;
                 break;
             case "tp_widget":
-                $this->transposh->options->set_widget_progressbar($_POST[WIDGET_PROGRESSBAR]);
-                $this->transposh->options->set_widget_allow_set_default_language($_POST[WIDGET_ALLOW_SET_DEFLANG]);
-                $this->transposh->options->set_widget_remove_logo($_POST[WIDGET_REMOVE_LOGO_FOR_AD]);
-                $this->transposh->options->set_widget_theme($_POST[WIDGET_THEME]);
+                $this->transposh->options->widget_progressbar = TP_FROM_POST;
+                $this->transposh->options->widget_allow_set_deflang = TP_FROM_POST;
+                $this->transposh->options->widget_remove_logo = TP_FROM_POST;
+                $this->transposh->options->widget_theme = TP_FROM_POST;
                 break;
             case "tp_advanced":
-                $this->transposh->options->set_enable_url_translate($_POST[ENABLE_URL_TRANSLATE]);
+                $this->transposh->options->enable_url_translate = TP_FROM_POST;
                 break;
         }
@@ -336 +335 @@
 
     // extend the admin menu
-   // function on_admin_menu() {
-        //add our own option page, you can also add it to different sections or use your own one
+    // function on_admin_menu() {
+    //add our own option page, you can also add it to different sections or use your own one
 //        $this->pagehook = add_options_page(__('Transposh control center', TRANSPOSH_TEXT_DOMAIN), __('Transposh', TRANSPOSH_TEXT_DOMAIN), 'manage_options', TRANSPOSH_ADMIN_PAGE_NAME, array(&$this, 'on_show_page'));
-        // register callback gets call prior your own page gets rendered
+    // register callback gets call prior your own page gets rendered
 //        add_action('load-' . $this->pagehook, array(&$this, 'on_load_page'));
-   // }
+    // }
 
     function on_load_comments_page() {
@@ -508 +507 @@
 
         // this is the default language location
-        list ($langname, $langorigname, $flag) = explode(",", transposh_consts::$languages[$this->transposh->options->get_default_language()]);
+        list ($langname, $langorigname, $flag) = explode(",", transposh_consts::$languages[$this->transposh->options->default_language]);
         echo '<div id="default_lang" style="overflow:auto;padding-bottom:10px;"><h3>';
         echo __('Default Language (drag another language here to make it default)', TRANSPOSH_TEXT_DOMAIN);
-        echo '</h3><ul id="default_list"><li id="' . $this->transposh->options->get_default_language() . '" class="languages">'
+        echo '</h3><ul id="default_list"><li id="' . $this->transposh->options->default_language . '" class="languages">'
         . transposh_utils::display_flag("{$this->transposh->transposh_plugin_url}/img/flags", $flag, $langorigname, false/* $this->transposh->options->get_widget_css_flags() */)
-        . '<input type="hidden" name="languages[]" value="' . $this->transposh->options->get_default_language() . '" />'
+        . '<input type="hidden" name="languages[]" value="' . $this->transposh->options->default_language . '" />'
         . '&nbsp;<span class="langname">' . $langorigname . '</span><span class="langname hidden">' . $langname . '</span></li>';
         echo '</ul></div>';
@@ -547 +546 @@
         echo '<li><a href="#" id="sortname">' . __('Sort by language name', TRANSPOSH_TEXT_DOMAIN) . '</a></li>';
         echo '<li><a href="#" id="sortiso">' . __('Sort by lSO code', TRANSPOSH_TEXT_DOMAIN) . '</a></li></ul>';
-        echo __('Legend:', TRANSPOSH_TEXT_DOMAIN) . ' ' . __('Green - active', TRANSPOSH_TEXT_DOMAIN) . ', <span id="yellowcolor"' . ($this->transposh->options->get_anonymous_translation() ? ' class ="hidden"' : '') . '>' . __('Yellow - translateable (only translators will see this language)', TRANSPOSH_TEXT_DOMAIN) . ', </span>' . __('blank - inactive', TRANSPOSH_TEXT_DOMAIN);
+        echo __('Legend:', TRANSPOSH_TEXT_DOMAIN) . ' ' . __('Green - active', TRANSPOSH_TEXT_DOMAIN) . ', <span id="yellowcolor"' . ($this->transposh->options->allow_anonymous_translation ? ' class ="hidden"' : '') . '>' . __('Yellow - translateable (only translators will see this language)', TRANSPOSH_TEXT_DOMAIN) . ', </span>' . __('blank - inactive', TRANSPOSH_TEXT_DOMAIN);
         echo '</div>';
     }
@@ -563 +562 @@
         //display known roles and their permission to translate
         foreach ($GLOBALS['wp_roles']->get_names() as $role_name => $something) {
-            echo '<input type="checkbox" value="1" name="' . $role_name . '" ' . $this->can_translate($role_name) .
+            echo '<input type="checkbox" value="1" name="' . $role_name . '" ' . checked($this->can_translate($role_name), true, false) .
             '/> ' . _x(ucfirst($role_name), 'User role') . '&nbsp;&nbsp;&nbsp;';
         }
         //Add our own custom role
-        echo '<input id="tr_anon" type="checkbox" value="1" name="anonymous" ' . $this->can_translate('anonymous') . '/> ' . __('Anonymous', TRANSPOSH_TEXT_DOMAIN);
+        echo '<input id="tr_anon" type="checkbox" value="1" name="anonymous" ' . checked($this->can_translate('anonymous'), true, false) . '/> ' . __('Anonymous', TRANSPOSH_TEXT_DOMAIN);
 
         /*
@@ -573 +572 @@
          * Disabled by default.
          */
-        $this->checkbox(ENABLE_DEFAULT_TRANSLATE, $this->transposh->options->get_enable_default_translate(), __('Enable default language translation', TRANSPOSH_TEXT_DOMAIN), __('Allow translation of default language - useful for sites with more than one major language', TRANSPOSH_TEXT_DOMAIN));
+        $this->checkbox($this->transposh->options->enable_default_translate_o, __('Enable default language translation', TRANSPOSH_TEXT_DOMAIN), __('Allow translation of default language - useful for sites with more than one major language', TRANSPOSH_TEXT_DOMAIN));
 
         /**
@@ -580 +579 @@
          * @since 0.3.6
          */
-        $this->checkbox(ENABLE_SEARCH_TRANSLATE, $this->transposh->options->get_enable_search_translate(), __('Enable search in translated languages', TRANSPOSH_TEXT_DOMAIN), __('Allow search of translated languages (and the original language)', TRANSPOSH_TEXT_DOMAIN));
+        $this->checkbox($this->transposh->options->enable_search_translate_o, __('Enable search in translated languages', TRANSPOSH_TEXT_DOMAIN), __('Allow search of translated languages (and the original language)', TRANSPOSH_TEXT_DOMAIN));
 
 
@@ -588 +587 @@
          * @since 0.6.4
          */
-        $this->checkbox(TRANSPOSH_GETTEXT_INTEGRATION, $this->transposh->options->get_transposh_gettext_integration(), __('Enable gettext integration', TRANSPOSH_TEXT_DOMAIN), __('Enable integration of Transposh with existing gettext interface (.po/.mo files)', TRANSPOSH_TEXT_DOMAIN));
+        $this->checkbox($this->transposh->options->transposh_gettext_integration_o, __('Enable gettext integration', TRANSPOSH_TEXT_DOMAIN), __('Enable integration of Transposh with existing gettext interface (.po/.mo files)', TRANSPOSH_TEXT_DOMAIN));
 
         /**
@@ -595 +594 @@
          * @since 0.7.5
          */
-        $this->checkbox(TRANSPOSH_DEFAULT_LOCALE_OVERRIDE, $this->transposh->options->get_transposh_default_locale_override(), __('Enable override for default locale', TRANSPOSH_TEXT_DOMAIN), __('Enable overriding the default locale that is set in WP_LANG on default languages pages (such as untranslated pages and admin pages)', TRANSPOSH_TEXT_DOMAIN));
+        $this->checkbox($this->transposh->options->transposh_locale_override_o, __('Enable override for default locale', TRANSPOSH_TEXT_DOMAIN), __('Enable overriding the default locale that is set in WP_LANG on default languages pages (such as untranslated pages and admin pages)', TRANSPOSH_TEXT_DOMAIN));
         echo '</div>';
         echo '<h2>' . __('General settings', TRANSPOSH_TEXT_DOMAIN) . '</h2>';
@@ -603 +602 @@
          * When disabled only parameters will be used to identify the current language.
          */
-        $this->checkbox(ENABLE_PERMALINKS, $this->transposh->options->get_enable_permalinks(), __('Rewrite URLs', TRANSPOSH_TEXT_DOMAIN), __('Rewrite URLs to be search engine friendly, ' .
+        $this->checkbox($this->transposh->options->enable_permalinks_o, __('Rewrite URLs', TRANSPOSH_TEXT_DOMAIN), __('Rewrite URLs to be search engine friendly, ' .
                         'e.g.  (http://transposh.org/<strong>en</strong>). ' .
                         'Requires that permalinks will be enabled.', TRANSPOSH_TEXT_DOMAIN));
@@ -611 +610 @@
          * Works on wordpress 2.8 and up (but we no longer care...)
          */
-        $this->checkbox(ENABLE_FOOTER_SCRIPTS, $this->transposh->options->get_enable_footer_scripts(), __('Add scripts to footer', TRANSPOSH_TEXT_DOMAIN), __('Push transposh scripts to footer of page instead of header, makes pages load faster. ' .
+        $this->checkbox($this->transposh->options->enable_footer_scripts_o, __('Add scripts to footer', TRANSPOSH_TEXT_DOMAIN), __('Push transposh scripts to footer of page instead of header, makes pages load faster. ' .
                         'Requires that your theme should have proper footer support.', TRANSPOSH_TEXT_DOMAIN));
 
@@ -617 +616 @@
          * Insert the option to enable/disable language auto-detection
          * @since 0.3.8 */
-        $this->checkbox(ENABLE_DETECT_LANG_AND_REDIRECT, $this->transposh->options->get_enable_detect_language(), __('Auto detect language for users', TRANSPOSH_TEXT_DOMAIN), __('This enables auto detection of language used by the user as defined in the ACCEPT_LANGUAGES they send. ' .
+        $this->checkbox($this->transposh->options->enable_detect_redirect_o, __('Auto detect language for users', TRANSPOSH_TEXT_DOMAIN), __('This enables auto detection of language used by the user as defined in the ACCEPT_LANGUAGES they send. ' .
                         'This will redirect the first page accessed in the session to the same page with the detected language.', TRANSPOSH_TEXT_DOMAIN));
 
@@ -623 +622 @@
          * Insert the option to enable/disable statics collection
          * @since 0.7.6 */
-        $this->checkbox(TRANSPOSH_COLLECT_STATS, $this->transposh->options->get_transposh_collect_stats(), __('Allow collecting usage statistics', TRANSPOSH_TEXT_DOMAIN), __('This option enables collection of statistics by transposh that will be used to improve the product.', TRANSPOSH_TEXT_DOMAIN));
+        $this->checkbox($this->transposh->options->transposh_collect_stats_o, __('Allow collecting usage statistics', TRANSPOSH_TEXT_DOMAIN), __('This option enables collection of statistics by transposh that will be used to improve the product.', TRANSPOSH_TEXT_DOMAIN));
 
         /* WIP2
@@ -630 +629 @@
         echo '<h2>' . __('Backup service settings', TRANSPOSH_TEXT_DOMAIN) . '</h2>';
         echo '<div class="col-wrap">';
-        echo '<input type="radio" value="1" name="' . TRANSPOSH_BACKUP_SCHEDULE . '" ' . $this->checked($this->transposh->options->get_transposh_backup_schedule() == 1) . '/>' . __('Enable daily backup', TRANSPOSH_TEXT_DOMAIN) . '<br/>';
-        echo '<input type="radio" value="2" name="' . TRANSPOSH_BACKUP_SCHEDULE . '" ' . $this->checked($this->transposh->options->get_transposh_backup_schedule() == 2) . '/>' . __('Enable live backup', TRANSPOSH_TEXT_DOMAIN) . '<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)', TRANSPOSH_TEXT_DOMAIN) . '<br/>';
-        echo __('Service Key:', TRANSPOSH_TEXT_DOMAIN) . ' <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?', TRANSPOSH_TEXT_DOMAIN) . '</a><br/>';
+        echo '<input type="radio" value="1" name="' . $this->transposh->options->transposh_backup_schedule_o->get_name() . '" ' . checked($this->transposh->options->transposh_backup_schedule, 1, false) . '/>' . __('Enable daily backup', TRANSPOSH_TEXT_DOMAIN) . '<br/>';
+        echo '<input type="radio" value="2" name="' . $this->transposh->options->transposh_backup_schedule_o->get_name() . '" ' . checked($this->transposh->options->transposh_backup_schedule, 2, false) . '/>' . __('Enable live backup', TRANSPOSH_TEXT_DOMAIN) . '<br/>';
+        echo '<input type="radio" value="0" name="' . $this->transposh->options->transposh_backup_schedule_o->get_name() . '" ' . checked($this->transposh->options->transposh_backup_schedule, 0, false) . '/>' . __('Disable backup (Can be run manually by clicking the button below)', TRANSPOSH_TEXT_DOMAIN) . '<br/>';
+        echo __('Service Key:', TRANSPOSH_TEXT_DOMAIN) . ' <input type="text" size="32" class="regular-text" ' . $this->transposh->options->transposh_key_o->post_value_id_name() . '/><a target="_blank" href="http://transposh.org/faq/#restore">' . __('How to restore?', TRANSPOSH_TEXT_DOMAIN) . '</a><br/>';
         echo '</div>';
     }
@@ -646 +645 @@
          * Enabled by default.
          */
-        $this->checkbox(ENABLE_AUTO_TRANSLATE, $this->transposh->options->get_enable_auto_translate(), __('Enable automatic translation', TRANSPOSH_TEXT_DOMAIN), __('Allow automatic translation of pages', TRANSPOSH_TEXT_DOMAIN));
+        $this->checkbox($this->transposh->options->enable_autotranslate_o, __('Enable automatic translation', TRANSPOSH_TEXT_DOMAIN), __('Allow automatic translation of pages', TRANSPOSH_TEXT_DOMAIN));
 
         /**
@@ -652 +651 @@
          * Disabled by default.
          *  @since 0.3.5 */
-        $this->checkbox(ENABLE_AUTO_POST_TRANSLATE, $this->transposh->options->get_enable_auto_post_translate(), __('Enable automatic translation after posting', TRANSPOSH_TEXT_DOMAIN), __('Do automatic translation immediately after a post has been published', TRANSPOSH_TEXT_DOMAIN));
+        $this->checkbox($this->transposh->options->enable_autoposttranslate_o, __('Enable automatic translation after posting', TRANSPOSH_TEXT_DOMAIN), __('Do automatic translation immediately after a post has been published', TRANSPOSH_TEXT_DOMAIN));
 
         /**
@@ -658 +657 @@
          */
         echo '<h3>' . "<img src=\"{$this->transposh->transposh_plugin_url}/img/bingicon.png\"> " . __('MSN API key', TRANSPOSH_TEXT_DOMAIN) . '</h3>';
-        echo __('API Key', TRANSPOSH_TEXT_DOMAIN) . ': <input type="text" size="35" class="regular-text" value="' . $this->transposh->options->get_msn_key() . '" id="' . MSN_TRANSLATE_KEY . '" name="' . MSN_TRANSLATE_KEY . '"/>';
+        echo __('API Key', TRANSPOSH_TEXT_DOMAIN) . ': <input type="text" size="35" class="regular-text" ' . $this->transposh->options->msn_key_o->post_value_id_name() . '/>';
 
         /**
@@ -664 +663 @@
          */
         echo '<h3>' . "<img src=\"{$this->transposh->transposh_plugin_url}/img/googleicon.png\"> " . __('Google API key', TRANSPOSH_TEXT_DOMAIN) . '</h3>';
-        echo __('API Key', TRANSPOSH_TEXT_DOMAIN) . ': <input type="text" size="35" class="regular-text" value="' . $this->transposh->options->get_google_key() . '" id="' . GOOGLE_TRANSLATE_KEY . '" name="' . GOOGLE_TRANSLATE_KEY . '"/>';
+        echo __('API Key', TRANSPOSH_TEXT_DOMAIN) . ': <input type="text" size="35" class="regular-text" ' . $this->transposh->options->google_key_o->post_value_id_name() . '/>';
 
         /*
@@ -670 +669 @@
          */
         echo '<h3>' . __('Select preferred auto translation engine', TRANSPOSH_TEXT_DOMAIN) . '</h3>';
-        echo '<label for="' . PREFERRED_TRANSLATOR . '">' . __('Translation engine:', TRANSPOSH_TEXT_DOMAIN) .
-        '<select name="' . PREFERRED_TRANSLATOR . '">' .
-        '<option value="1"' . ($this->transposh->options->get_preferred_translator() == 1 ? ' selected="selected"' : '') . '>' . __('Google', TRANSPOSH_TEXT_DOMAIN) . '</option>' .
-        '<option value="2"' . ($this->transposh->options->get_preferred_translator() == 2 ? ' selected="selected"' : '') . '>' . __('Bing', TRANSPOSH_TEXT_DOMAIN) . '</option>' .
+        echo '<label for="' . $this->transposh->options->preferred_translator_o->get_name() . '">' . __('Translation engine:', TRANSPOSH_TEXT_DOMAIN) .
+        '<select name="' . $this->transposh->options->preferred_translator_o->get_name() . '">' .
+        '<option value="1"' . selected($this->transposh->options->preferred_translator, 1, false) . '>' . __('Google', TRANSPOSH_TEXT_DOMAIN) . '</option>' .
+        '<option value="2"' . selected($this->transposh->options->preferred_translator, 2, false) . '>' . __('Bing', TRANSPOSH_TEXT_DOMAIN) . '</option>' .
         '</select>' .
         '</label>';
@@ -685 +684 @@
         echo __('One Hour Translation provides high-quality, fast professional translation to/from any language, and has specific domain expertise in SW localization, technical, business, and legal translations.', TRANSPOSH_TEXT_DOMAIN);
         echo '<h3>' . "<img src=\"{$this->transposh->transposh_plugin_url}/img/ohticon.png\"> " . __('One Hour Translation account ID', TRANSPOSH_TEXT_DOMAIN) . '</h3>';
-        echo __('Account ID', TRANSPOSH_TEXT_DOMAIN) . ': <input type="text" size="35" class="regular-text" value="' . $this->transposh->options->get_oht_id() . '" id="' . OHT_TRANSLATE_ID . '" name="' . OHT_TRANSLATE_ID . '"/>';
+        echo __('Account ID', TRANSPOSH_TEXT_DOMAIN) . ': <input type="text" size="35" class="regular-text" ' . $this->transposh->options->oht_id_o->post_value_id_name() . '/>';
 
         /**
@@ -691 +690 @@
          */
         echo '<h3>' . "<img src=\"{$this->transposh->transposh_plugin_url}/img/ohticon.png\"> " . __('One Hour Translation secret key', TRANSPOSH_TEXT_DOMAIN) . '</h3>';
-        echo __('API Key', TRANSPOSH_TEXT_DOMAIN) . ': <input type="text" size="35" class="regular-text" value="' . $this->transposh->options->get_oht_key() . '" id="' . OHT_TRANSLATE_KEY . '" name="' . OHT_TRANSLATE_KEY . '"/>';
+        echo __('API Key', TRANSPOSH_TEXT_DOMAIN) . ': <input type="text" size="35" class="regular-text" ' . $this->transposh->options->oht_key_o->post_value_id_name() . '/>';
 
         $oht = get_option(TRANSPOSH_OPTIONS_OHT, array());
@@ -710 +709 @@
         $this->contains_settings = true;
 
-        $this->checkbox(WIDGET_PROGRESSBAR, $this->transposh->options->get_widget_progressbar(), __('Show progress bar', TRANSPOSH_TEXT_DOMAIN), __('Show progress bar when a client triggers automatic translation', TRANSPOSH_TEXT_DOMAIN));
-
-        $this->checkbox(WIDGET_ALLOW_SET_DEFLANG, $this->transposh->options->get_widget_allow_set_default_language(), __('Allow user to set current language as default', TRANSPOSH_TEXT_DOMAIN), __('Widget will allow setting this language as user default', TRANSPOSH_TEXT_DOMAIN));
-
-        $this->checkbox(WIDGET_REMOVE_LOGO_FOR_AD, $this->transposh->options->get_widget_remove_logo(), __('Remove transposh logo (see <a href="http://transposh.org/logoterms">terms</a>)', TRANSPOSH_TEXT_DOMAIN), __('Transposh logo will not appear on widget', TRANSPOSH_TEXT_DOMAIN));
+        $this->checkbox($this->transposh->options->widget_progressbar_o, __('Show progress bar', TRANSPOSH_TEXT_DOMAIN), __('Show progress bar when a client triggers automatic translation', TRANSPOSH_TEXT_DOMAIN));
+
+        $this->checkbox($this->transposh->options->widget_allow_set_deflang_o, __('Allow user to set current language as default', TRANSPOSH_TEXT_DOMAIN), __('Widget will allow setting this language as user default', TRANSPOSH_TEXT_DOMAIN));
+
+        $this->checkbox($this->transposh->options->widget_remove_logo_o, __('Remove transposh logo (see <a href="http://transposh.org/logoterms">terms</a>)', TRANSPOSH_TEXT_DOMAIN), __('Transposh logo will not appear on widget', TRANSPOSH_TEXT_DOMAIN));
 
         echo '<h3>' . __('Edit interface (and progress bar) theme:', TRANSPOSH_TEXT_DOMAIN) . '</h3>';
-        echo '<label for="' . WIDGET_THEME . '">' . __('Edit interface (and progress bar) theme:', TRANSPOSH_TEXT_DOMAIN) .
-        '<select id="transposh-style" name="' . WIDGET_THEME . '">';
+        echo '<label for="' . $this->transposh->options->widget_theme_o->get_name() . '">' . __('Edit interface (and progress bar) theme:', TRANSPOSH_TEXT_DOMAIN) .
+        '<select id="transposh-style" name="' . $this->transposh->options->widget_theme_o->get_name() . '">';
         foreach (transposh_consts::$jqueryui_themes as $theme) {
-            $selected = ($this->transposh->options->get_widget_theme() == $theme) ? ' selected="selected"' : '';
-            echo "<option value=\"$theme\"$selected>{$theme}</option>";
+          //  $selected = ($this->transposh->options->widget_theme == $theme) ? ' selected="selected"' : '';
+            echo '<option value="' . $theme . '" ' . selected($this->transposh->options->widget_theme, $theme, false) . '>' . $theme . '</option>';
         }
         echo '</select>' .
@@ -734 +733 @@
          * @since 0.5.3
          */
-        $this->checkbox(ENABLE_URL_TRANSLATE, $this->transposh->options->get_enable_url_translate(), __('Enable url translation', TRANSPOSH_TEXT_DOMAIN) . ' (' . __('experimental', TRANSPOSH_TEXT_DOMAIN) . ')', __('Allow translation of permalinks and urls', TRANSPOSH_TEXT_DOMAIN));
+        $this->checkbox($this->transposh->options->enable_url_translate_o, __('Enable url translation', TRANSPOSH_TEXT_DOMAIN) . ' (' . __('experimental', TRANSPOSH_TEXT_DOMAIN) . ')', __('Allow translation of permalinks and urls', TRANSPOSH_TEXT_DOMAIN));
     }
 
@@ -855 +854 @@
      * @return string used for checkboxes
      */
-
     /** UTILITY FUNCTIONS * */
-    private function checked($eval) {
-        return $eval ? 'checked="checked"' : '';
-    }
-
-    private function checkbox($id, $value, $head, $text) {
+    //private function checked($eval) {
+//        return $eval ? 'checked="checked"' : '';
+//    }
+
+    /*    private function checkbox($id, $value, $head, $text) {
+      echo '<h3>' . $head . '</h3>';
+      echo '<input type="checkbox" value="1" name="' . $id . '" ' . checked($value, true, false) . '/> ' . $text;
+      } */
+
+    /**
+     * @param transposh_option $tpo A transposh option boolean object
+     */
+    private function checkbox($tpo, $head, $text) {
         echo '<h3>' . $head . '</h3>';
-        echo '<input type="checkbox" value="1" name="' . $id . '" ' . $this->checked($value) . '/> ' . $text;
+        echo '<input type="checkbox" value="1" name="' . $tpo->get_name() . '" ' . checked($tpo->get_value(), true, false) . '/> ' . $text;
     }
 
@@ -945 +951 @@
 
 }
-
 ?>

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

@@ -34 +34 @@
         $body = array();
         $body['home_url'] = $this->transposh->home_url;
-        $body['key'] = $this->transposh->options->get_transposh_key();
+        $body['key'] = $this->transposh->options->transposh_key;
         $body['v'] = '2';
         $body['tpv'] = '%VERSION%';
@@ -59 +59 @@
             return;
         }
-        if ($this->transposh->options->get_transposh_key() == "") {
-            $this->transposh->options->set_transposh_key($result['headers']['transposh-key']);
+        if ($this->transposh->options->transposh_key == "") {
+            $this->transposh->options->transposh_key = $result['headers']['transposh-key'];
             // TODO: deliever new gottenkey to client side?
-            //echo $this->transposh->options->get_transposh_key();
             $this->transposh->options->update_options();
         }
@@ -119 +118 @@
         $body['to'] = time(); //TODO: fix this to get from DB
         $body['home_url'] = $this->transposh->home_url;
-        $body['key'] = $this->transposh->options->get_transposh_key();
+        $body['key'] = $this->transposh->options->transposh_key;
         $result = wp_remote_get(TRANSPOSH_RESTORE_SERVICE_URL . "?to={$body['to']}&key={$body['key']}&home_url={$body['home_url']}"); // gotta be a better way...
         $lines = split("[\n|\r]", $result['body']);

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

@@ -328 +328 @@
         }
         if (!$by && !($all_editable &&
-                ($this->transposh->is_translator() || ($source > 0 && $this->transposh->options->get_enable_auto_translate())))) {
+                ($this->transposh->is_translator() || ($source > 0 && $this->transposh->options->enable_autotranslate)))) {
             logger("Unauthorized translation attempt " . $_SERVER['REMOTE_ADDR'], 1);
             header("HTTP/1.0 401 Unauthorized translation");
@@ -448 +448 @@
         // TODO: move this to an action
         // Should we backup now?
-        if ($backup_immidiate_possible && $this->transposh->options->get_transposh_backup_schedule() == 2) {
+        if ($backup_immidiate_possible && $this->transposh->options->transposh_backup_schedule == 2) {
             $this->transposh->run_backup();
         }

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

@@ -12 +12 @@
  */
 
-// OLD Options - To be removed
-// removed real old options support, no migration from 0.3.9 anymore
-// @since 0.5.6
-//Option defining transposh widget appearance
-define('OLD_WIDGET_STYLE', 'widget_style');
-//Use CSS sprites for flags if available
-define('OLD_WIDGET_CSS_FLAGS', 'widget_css_flags');
-//Wrap widget elements in an unordered list per #63 @since 0.3.7
-define('OLD_WIDGET_IN_LIST', 'widget_in_list');
-//Option to enable/disable msn translation
-define('OLD_ENABLE_MSN_TRANSLATE', 'enable_msntranslate');
-//Option defining transposh widget file used @since 0.5.6
-define('OLD_WIDGET_FILE', 'widget_file'); //unset!!!
-//Option to store the msn API key
-define('MSN_TRANSLATE_KEY', 'msn_key');
-//Option to store the msn API key
-define('GOOGLE_TRANSLATE_KEY', 'google_key');
-//Option to store the msn API key
-define('OHT_TRANSLATE_ID', 'oht_id');
-//Option to store the msn API key
-define('OHT_TRANSLATE_KEY', 'oht_key');
-
-//defines are used to avoid typos
-//Option defining whether anonymous translation is allowed.
-define('ANONYMOUS_TRANSLATION', 'allow_anonymous_translation');
-//Option defining the list of currentlly viewable languages
-define('VIEWABLE_LANGS', 'viewable_languages');
-//Option defining the list of currentlly editable languages
-define('EDITABLE_LANGS', 'editable_languages');
-//Option defining the ordered list of languages @since 0.3.9
-define('SORTED_LANGS', 'sorted_languages');
-//Option to enable/disable auto translation
-define('ENABLE_AUTO_TRANSLATE', 'enable_autotranslate');
-//Option to enable/disable auto translation
-define('ENABLE_AUTO_POST_TRANSLATE', 'enable_autoposttranslate');
-//Option to store translator preference @since 0.4.2
-define('PREFERRED_TRANSLATOR', 'preferred_translator');
-//Option to enable/disable default language translation
-define('ENABLE_DEFAULT_TRANSLATE', 'enable_default_translate');
-//Option to enable/disable default language translation @since 0.3.6
-define('ENABLE_SEARCH_TRANSLATE', 'enable_search_translate');
-//Option to enable/disable url translation @since 0.5.3
-define('ENABLE_URL_TRANSLATE', 'enable_url_translate');
-//Make the gettext interface optional (@since 0.6.4)
-define('TRANSPOSH_GETTEXT_INTEGRATION', 'transposh_gettext_integration');
-//Allow override for default locale (@since 0.7.5)
-define('TRANSPOSH_DEFAULT_LOCALE_OVERRIDE', 'transposh_locale_override');
-//Option to enable/disable rewrite of permalinks
-define('ENABLE_PERMALINKS', 'enable_permalinks');
-//Option to enable/disable footer scripts (2.8 and up)
-define('ENABLE_FOOTER_SCRIPTS', 'enable_footer_scripts');
-//Option to enable detect and redirect language @since 0.3.8
-define('ENABLE_DETECT_LANG_AND_REDIRECT', 'enable_detect_redirect');
-//Option defining the default language
-define('DEFAULT_LANG', 'default_language');
-//Option allowing progress bar display
-define('WIDGET_PROGRESSBAR', 'widget_progressbar');
-//Allows user to set his default language per #63 @since 0.3.8
-define('WIDGET_ALLOW_SET_DEFLANG', 'widget_allow_set_deflang');
-//Allows removing of transposh logo in exchange for an ad @since 0.6.0
-define('WIDGET_REMOVE_LOGO_FOR_AD', 'widget_remove_logo');
-//Allows theming of the progressbar and edit window @since 0.7.0
-define('WIDGET_THEME', 'widget_theme');
-//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');
-//Stores hidden warnings (@since 0.7.6)
-define('TRANSPOSH_ADMIN_HIDE_WARNINGS', 'transposh_admin_hide_warnings');
-//Should I allow collecting of anonymous stats (@since 0.7.6)
-define('TRANSPOSH_COLLECT_STATS', 'transposh_admin_hide_warnings');
-
+// This magic value will cause the option to be set from post
+define('TP_FROM_POST', 'tp_post_1x');
+// types of options
+define('TP_OPT_BOOLEAN', 0);
+define('TP_OPT_STRING', 1);
+define('TP_OPT_OTHER', 2);
+
+/**
+ * @property string $desc Description
+ */
+class transposh_option {
+
+    private $name;
+    private $value;
+    private $type;
+
+    public function __construct($name, $value = '', $type = '') {
+        $this->name = $name;
+        $this->value = $value;
+        $this->type = $type;
+    }
+
+    function __toString() {
+        return (string) $this->value;
+    }
+
+    function set_value($value) {
+        $this->value = $value;
+    }
+
+    function from_post() {
+        $this->value = $_POST[$this->name];
+    }
+
+    function get_name() {
+        return $this->name;
+    }
+
+    function get_value() {
+        return $this->value;
+    }
+
+    function get_type() {
+        return $this->type;
+    }
+
+    function post_value_id_name() {
+        return 'value="' . $this->value . '" id="' . $this->name . '" name="' . $this->name . '"';
+    }
+
+}
+
+/**
+ * Used properties for code completion - we'll try to keep them in same order as admin screens
+ * 
+ * Language tab
+ * @property string           $default_language      Option defining the default language
+ * @property transposh_option $default_language_o 
+ * @property string           $viewable_languages    Option defining the list of currently viewable languages
+ * @property transposh_option $viewable_languages_o 
+ * @property string           $editable_languages    Option defining the list of currently editable languages
+ * @property transposh_option $editable_languages_o 
+ * @property string           $sorted_languages      Option defining the ordered list of languages @since 0.3.9
+ * @property transposh_option $sorted_languages_o 
+ * 
+ * Settings
+ * 
+ * @property boolean          $allow_anonymous_translation   Option defining whether anonymous translation is allowed
+ * @property transposh_option $allow_anonymous_translation_o
+ * @property boolean          $enable_default_translate      Option to enable/disable default language translation
+ * @property transposh_option $enable_default_translate_o
+ * @property boolean          $enable_search_translate       Option to enable/disable default language translation @since 0.3.6
+ * @property transposh_option $enable_search_translate_o
+ * @property boolean          $transposh_gettext_integration Make the gettext interface optional (@since 0.6.4)
+ * @property transposh_option $transposh_gettext_integration_o
+ * @property boolean          $transposh_locale_override     Allow override for default locale (@since 0.7.5)
+ * @property transposh_option $transposh_locale_override_o
+ * 
+ * @property boolean          $enable_permalinks             Option to enable/disable rewrite of permalinks
+ * @property transposh_option $enable_permalinks_o
+ * @property boolean          $enable_footer_scripts         Option to enable/disable footer scripts (2.8 and up)
+ * @property transposh_option $enable_footer_scripts_o
+ * @property boolean          $enable_detect_redirect        Option to enable detect and redirect language @since 0.3.8
+ * @property transposh_option $enable_detect_redirect_o
+ * @property boolean          $transposh_collect_stats       Should I allow collecting of anonymous stats (@since 0.7.6)
+ * @property transposh_option $transposh_collect_stats_o
+ * 
+ * @property int              $transposh_backup_schedule     Stores the schedule for the backup service, 0-none, 1-daily, 2-live (backup @since 0.5.0)
+ * @property transposh_option $transposh_backup_schedule_o  
+ * @property string           $transposh_key                 Stores the site key to transposh services (backup @since 0.5.0)
+ * @property transposh_option $transposh_key_o
+ * 
+ * Engines
+ * 
+ * @property boolean          $enable_autotranslate          Option to enable/disable auto translation
+ * @property transposh_option $enable_autotranslate_o
+ * @property boolean          $enable_autoposttranslate      Option to enable/disable auto translation of posts
+ * @property transposh_option $enable_autoposttranslate_o
+ * @property string           $msn_key                       Option to store the msn API key
+ * @property transposh_option $msn_key_o
+ * @property string           $google_key                    Option to store the msn Google key
+ * @property transposh_option $google_key_o
+ * @property int              $preferred_translator          Option to store translator preference @since 0.4.2
+ * @property transposh_option $preferred_translator_o
+ * @property string           $oht_id                        Option to store the oht ID
+ * @property transposh_option $oht_id_o
+ * @property string           $oht_key                       Option to store the oht key;
+ * @property transposh_option $oht_key_o
+ * 
+ * Widget
+ * 
+ * @property boolean          $widget_progressbar            Option allowing progress bar display
+ * @property transposh_option $widget_progressbar_o
+ * @property boolean          $widget_allow_set_deflang      Allows user to set his default language per #63 @since 0.3.8
+ * @property transposh_option $widget_allow_set_deflang_o
+ * @property boolean          $widget_remove_logo            Allows removing of transposh logo in exchange for an ad @since 0.6.0
+ * @property transposh_option $widget_remove_logo_o
+ * @property string           $widget_theme                  Allows theming of the progressbar and edit window @since 0.7.0
+ * @property transposh_option $widget_theme_o
+ * 
+ * Advanced
+ * 
+ * @property boolean          $enable_url_translate          Option to enable/disable url translation @since 0.5.3
+ * @property transposh_option $enable_url_translate_o
+ * 
+ * Hidden
+ * 
+ * @property transposh_option $transposh_admin_hide_warnings Stores hidden warnings (@since 0.7.6)
+ * 
+ */
 class transposh_plugin_options {
 
@@ -91 +149 @@
     /** @var boolean set to true if any option was changed */
     private $changed = false;
+    private $vars = array();
 
     function set_default_option_value($option, $value = '') {
@@ -96 +155 @@
     }
 
-    function transposh_plugin_options() {
+    // private $vars array() = (1,2,3);
+
+    function register_option($name, $type, $default_value = '') {
+        if (!isset($this->options[$name]))
+                $this->options[$name] = $default_value;
+        logger($name . ' ' . $this->options[$name]);
+        $this->vars[$name] = new transposh_option($name, $this->options[$name], $type);
+    }
+
+    function __get($name) {
+        if (substr($name, -2) === "_o")
+                return $this->vars[substr($name, 0, -2)];
+//        logger($this->vars[$name]->get_value());
+        return $this->vars[$name]->get_value();
+    }
+
+    function __set($name, $value) {
+        if ($value == TP_FROM_POST) {
+            $value = $_POST[$name];
+        }
+
+        if (TP_OPT_BOOLEAN == $this->vars[$name]->get_type()) {
+            $value = ($value) ? 1 : 0;
+        }
+
+        if ($this->vars[$name]->get_value() != $value) {
+            logger("option '$name' value set: $value");
+            $this->vars[$name]->set_value($value);
+            $this->changed = true;
+        }
+    }
+
+    function __construct() {
+
+
         logger("creating options");
         // load them here
         $this->options = get_option(TRANSPOSH_OPTIONS);
-        $this->set_default_option_value(ANONYMOUS_TRANSLATION, 1);
-        $this->set_default_option_value(ENABLE_SEARCH_TRANSLATE, 1);
-        $this->set_default_option_value(ENABLE_AUTO_TRANSLATE, 1);
-        $this->set_default_option_value(PREFERRED_TRANSLATOR, 1);
-        $this->set_default_option_value(TRANSPOSH_GETTEXT_INTEGRATION, 1);
-        $this->set_default_option_value(TRANSPOSH_DEFAULT_LOCALE_OVERRIDE, 1);
-        $this->set_default_option_value(VIEWABLE_LANGS);
-        $this->set_default_option_value(EDITABLE_LANGS);
-        //$this->set_default_option_value(SORTED_LANGS);
-        $this->set_default_option_value(ENABLE_AUTO_POST_TRANSLATE);
-        $this->set_default_option_value(ENABLE_DEFAULT_TRANSLATE);
-        $this->set_default_option_value(ENABLE_SEARCH_TRANSLATE);
-        $this->set_default_option_value(ENABLE_URL_TRANSLATE);
-        $this->set_default_option_value(ENABLE_PERMALINKS);
-        $this->set_default_option_value(ENABLE_FOOTER_SCRIPTS);
-        $this->set_default_option_value(ENABLE_DETECT_LANG_AND_REDIRECT);
-        $this->set_default_option_value(DEFAULT_LANG);
-        $this->set_default_option_value(WIDGET_PROGRESSBAR);
-        $this->set_default_option_value(WIDGET_ALLOW_SET_DEFLANG);
-        $this->set_default_option_value(WIDGET_REMOVE_LOGO_FOR_AD);
-        $this->set_default_option_value(WIDGET_THEME, 'ui-lightness');
-        $this->set_default_option_value(MSN_TRANSLATE_KEY);
-        $this->set_default_option_value(GOOGLE_TRANSLATE_KEY);
-        $this->set_default_option_value(OHT_TRANSLATE_ID);
-        $this->set_default_option_value(OHT_TRANSLATE_KEY);
-        $this->set_default_option_value(TRANSPOSH_KEY);
-        $this->set_default_option_value(TRANSPOSH_BACKUP_SCHEDULE, 2);
-        $this->set_default_option_value(TRANSPOSH_ADMIN_HIDE_WARNINGS);
-        $this->set_default_option_value(TRANSPOSH_COLLECT_STATS, 1);
-        $this->migrate_old_config();
+//        logger($this->options);
+
+        $this->register_option('default_language', TP_OPT_STRING); // default?
+        $this->register_option('viewable_languages', TP_OPT_STRING);
+        $this->register_option('editable_languages', TP_OPT_STRING);
+        $this->register_option('sorted_languages', TP_OPT_STRING);
+
+        $this->register_option('allow_anonymous_translation', TP_OPT_BOOLEAN, 1);
+        $this->register_option('enable_default_translate', TP_OPT_BOOLEAN, 0);
+        $this->register_option('enable_search_translate', TP_OPT_BOOLEAN, 1);
+        $this->register_option('transposh_gettext_integration', TP_OPT_BOOLEAN, 1);
+        $this->register_option('transposh_locale_override', TP_OPT_BOOLEAN, 1);
+
+        $this->register_option('enable_permalinks', TP_OPT_BOOLEAN, 0);
+        $this->register_option('enable_footer_scripts', TP_OPT_BOOLEAN, 0);
+        $this->register_option('enable_detect_redirect', TP_OPT_BOOLEAN, 0);
+        $this->register_option('transposh_collect_stats', TP_OPT_BOOLEAN, 1);
+
+        $this->register_option('transposh_backup_schedule', TP_OPT_OTHER, 2);
+        $this->register_option('transposh_key', TP_OPT_STRING);
+
+        $this->register_option('enable_autotranslate', TP_OPT_BOOLEAN, 1);
+        $this->register_option('enable_autoposttranslate', TP_OPT_BOOLEAN, 1);
+        $this->register_option('msn_key', TP_OPT_STRING);
+        $this->register_option('google_key', TP_OPT_STRING);
+        $this->register_option('preferred_translator', TP_OPT_OTHER, 1); // 1 is Google, 2 is MSN
+        $this->register_option('oht_id', TP_OPT_STRING);
+        $this->register_option('oht_key', TP_OPT_STRING);
+
+
+        $this->register_option('widget_progressbar', TP_OPT_BOOLEAN);
+        $this->register_option('widget_allow_set_deflang', TP_OPT_BOOLEAN);
+        $this->register_option('widget_remove_logo', TP_OPT_BOOLEAN);
+        $this->register_option('widget_theme', TP_OPT_STRING, 'ui-lightness');
+
+        $this->register_option('enable_url_translate', TP_OPT_BOOLEAN);
+
+        $this->register_option('transposh_admin_hide_warnings', TP_OPT_OTHER);
+
+
+        // Fix default language if needed, only done once now, and since this was being done constantly, we gain
+        //logger($this->default_language->get_value());
+
+        if (!isset(transposh_consts::$languages[$this->default_language])) {
+            if (defined('WPLANG') && isset(transposh_consts::$languages[WPLANG])) {
+                $this->default_language = WPLANG;
+            } else {
+                $this->default_language = "en";
+            }
+        }
+
         logger($this->options, 4);
-    }
-
-    // TODO: remove this function in a few versions (fix css, db version..., css flag
-    private function migrate_old_config() {
-        logger("in migration");
-        if (isset($this->options[OLD_WIDGET_STYLE])) {          
-            unset($this->options[OLD_WIDGET_CSS_FLAGS]);
-            unset($this->options[OLD_WIDGET_IN_LIST]);
-            unset($this->options[OLD_WIDGET_STYLE]);
-            unset($this->options[OLD_ENABLE_MSN_TRANSLATE]);
-            logger($this->options);
-            update_option(TRANSPOSH_OPTIONS, $this->options);
-        }
-    }
-
-    function get_anonymous_translation() {
-        return $this->options[ANONYMOUS_TRANSLATION];
-    }
-
-    function get_viewable_langs() {
-        return $this->options[VIEWABLE_LANGS];
-    }
-
-    function get_editable_langs() {
-        return $this->options[EDITABLE_LANGS];
     }
 
@@ -164 +253 @@
      */
     function get_sorted_langs() {
-        if (isset($this->options[SORTED_LANGS]))
-                return array_merge(array_flip(explode(",", $this->options[SORTED_LANGS])), transposh_consts::$languages);
+        if (isset($this->sorted_languages))
+                return array_merge(array_flip(explode(",", $this->sorted_languages)), transposh_consts::$languages);
         return transposh_consts::$languages;
     }
 
-    function get_widget_progressbar() {
-        return $this->options[WIDGET_PROGRESSBAR];
-    }
-
-    function get_widget_remove_logo() {
-        return $this->options[WIDGET_REMOVE_LOGO_FOR_AD];
-    }
-
-    /**
-     * return theme
-     * @since 0.7.0
-     * @return string 
-     */
-    function get_widget_theme() {
-        return $this->options[WIDGET_THEME];
-    }
-
-    function get_widget_allow_set_default_language() {
-        return $this->options[WIDGET_ALLOW_SET_DEFLANG];
-    }
-
-    function get_enable_permalinks() {
-        return $this->options[ENABLE_PERMALINKS];
-    }
-
-    function get_enable_footer_scripts() {
-        return $this->options[ENABLE_FOOTER_SCRIPTS];
-    }
-
-    function get_enable_detect_language() {
-        return $this->options[ENABLE_DETECT_LANG_AND_REDIRECT];
-    }
-
-    function get_enable_default_translate() {
-        return $this->options[ENABLE_DEFAULT_TRANSLATE];
-    }
-
-    function get_enable_search_translate() {
-        return $this->options[ENABLE_SEARCH_TRANSLATE];
-    }
-
-    function get_enable_url_translate() {
-        return $this->options[ENABLE_URL_TRANSLATE];
-    }
-
-    function get_enable_auto_translate() {
-        // default is true
-        return $this->options[ENABLE_AUTO_TRANSLATE];
-    }
-
-    function get_msn_key() {
-        return $this->options[MSN_TRANSLATE_KEY];
-    }
-
-    function get_google_key() {
-        return $this->options[GOOGLE_TRANSLATE_KEY];
-    }
-
-    function get_oht_id() {
-        return $this->options[OHT_TRANSLATE_ID];
-    }
-
-    function get_oht_key() {
-        return $this->options[OHT_TRANSLATE_KEY];
-    }
-
-    function get_enable_auto_post_translate() {
-        return $this->options[ENABLE_AUTO_POST_TRANSLATE];
-    }
-
-    function get_preferred_translator() {
-        // default is google(1) (2 is msn)
-        return $this->options[PREFERRED_TRANSLATOR];
-    }
-
-    /**
-     * Gets the default language setting, i.e. the source language which normally should not be translated.
-     * @return string Default language
-     */
-    function get_default_language() {
-        $default = $this->options[DEFAULT_LANG];
-        if (!isset(transposh_consts::$languages[$default])) {
-            if (defined('WPLANG') && isset(transposh_consts::$languages[WPLANG])) {
-                $default = WPLANG;
-            } else {
-                $default = "en";
-            }
-        }
-        return $default;
-    }
-
-    function get_transposh_key() {
-        return $this->options[TRANSPOSH_KEY];
-    }
-
-    function get_transposh_backup_schedule() {
-        return $this->options[TRANSPOSH_BACKUP_SCHEDULE];
-    }
-
-    function get_transposh_gettext_integration() {
-        return $this->options[TRANSPOSH_GETTEXT_INTEGRATION];
-    }
-
-    function get_transposh_default_locale_override() {
-        return $this->options[TRANSPOSH_DEFAULT_LOCALE_OVERRIDE];
-    }
-
     function get_transposh_admin_hide_warning($id) {
-        return strpos($this->options[TRANSPOSH_ADMIN_HIDE_WARNINGS], $id . ',') !== false;
-    }
-
-    function get_transposh_collect_stats() {
-        return $this->options[TRANSPOSH_COLLECT_STATS];
-    }
-
-    /**
-     * Sets a value at the options array
-     * @param mixed $val
-     * @param pointer $option Points to the option in the options array
-     */
-    private function set_value($val, &$option) {
-        if ($val !== $option) {
-            $option = $val;
-            $this->changed = true;
-        }
-    }
-
-    function set_anonymous_translation($val) {
-        $val = ($val) ? 1 : 0;
-        $this->set_value($val, $this->options[ANONYMOUS_TRANSLATION]);
-    }
-
-    function set_viewable_langs($val) {
-        $this->set_value($val, $this->options[VIEWABLE_LANGS]);
-    }
-
-    function set_editable_langs($val) {
-        $this->set_value($val, $this->options[EDITABLE_LANGS]);
-    }
-
-    function set_sorted_langs($val) {
-        $this->set_value($val, $this->options[SORTED_LANGS]);
-    }
-
-    function set_widget_progressbar($val) {
-        $val = ($val) ? 1 : 0;
-        $this->set_value($val, $this->options[WIDGET_PROGRESSBAR]);
-    }
-
-    function set_widget_remove_logo($val) {
-        $val = ($val) ? 1 : 0;
-        $this->set_value($val, $this->options[WIDGET_REMOVE_LOGO_FOR_AD]);
-    }
-
-    /**
-     * Set the widget theme
-     * @since 0.7.0
-     * @param string $val
-     */
-    function set_widget_theme($val) {
-        $this->set_value($val, $this->options[WIDGET_THEME]);
-    }
-
-    function set_widget_allow_set_default_language($val) {
-        $val = ($val) ? 1 : 0;
-        $this->set_value($val, $this->options[WIDGET_ALLOW_SET_DEFLANG]);
-    }
-
-    function set_enable_permalinks($val) {
-        $val = ($val) ? 1 : 0;
-        $this->set_value($val, $this->options[ENABLE_PERMALINKS]);
-    }
-
-    function set_enable_detect_language($val) {
-        $val = ($val) ? 1 : 0;
-        $this->set_value($val, $this->options[ENABLE_DETECT_LANG_AND_REDIRECT]);
-    }
-
-    function set_enable_footer_scripts($val) {
-        $val = ($val) ? 1 : 0;
-        $this->set_value($val, $this->options[ENABLE_FOOTER_SCRIPTS]);
-    }
-
-    function set_enable_default_translate($val) {
-        $val = ($val) ? 1 : 0;
-        $this->set_value($val, $this->options[ENABLE_DEFAULT_TRANSLATE]);
-    }
-
-    function set_enable_search_translate($val) {
-        $val = ($val) ? 1 : 0;
-        $this->set_value($val, $this->options[ENABLE_SEARCH_TRANSLATE]);
-    }
-
-    function set_enable_url_translate($val) {
-        $val = ($val) ? 1 : 0;
-        $this->set_value($val, $this->options[ENABLE_URL_TRANSLATE]);
-    }
-
-    function set_enable_auto_translate($val) {
-        $val = ($val) ? 1 : 0;
-        $this->set_value($val, $this->options[ENABLE_AUTO_TRANSLATE]);
-    }
-
-    function set_msn_key($val) {
-        $this->set_value($val, $this->options[MSN_TRANSLATE_KEY]);
-    }
-
-    function set_google_key($val) {
-        $this->set_value($val, $this->options[GOOGLE_TRANSLATE_KEY]);
-    }
-
-    function set_oht_id($val) {
-        $this->set_value($val, $this->options[OHT_TRANSLATE_ID]);
-    }
-
-    function set_oht_key($val) {
-        $this->set_value($val, $this->options[OHT_TRANSLATE_KEY]);
-    }
-
-    function set_enable_auto_post_translate($val) {
-        $val = ($val) ? 1 : 0;
-        $this->set_value($val, $this->options[ENABLE_AUTO_POST_TRANSLATE]);
-    }
-
-    function set_preferred_translator($val) {
-        $this->set_value($val, $this->options[PREFERRED_TRANSLATOR]);
-    }
-
-    /**
-     * Sets the default language setting, i.e. the source language which
-     * should not be translated.
-     * @param string $val Language set as default
-     */
-    function set_default_language($val) {
-        if (!transposh_consts::$languages[$val]) {
-            $val = "en";
-        }
-        $this->set_value($val, $this->options[DEFAULT_LANG]);
-    }
-
-    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]);
-    }
-
-    function set_transposh_gettext_integration($val) {
-        $val = ($val) ? 1 : 0;
-        $this->set_value($val, $this->options[TRANSPOSH_GETTEXT_INTEGRATION]);
-    }
-
-    function set_transposh_default_locale_override($val) {
-        $val = ($val) ? 1 : 0;
-        $this->set_value($val, $this->options[TRANSPOSH_DEFAULT_LOCALE_OVERRIDE]);
+        return strpos($this->transposh_admin_hide_warnings, $id . ',') !== false;
     }
 
     function set_transposh_admin_hide_warning($id) {
         if (!$this->get_transposh_admin_hide_warning($id)) {
-            $this->set_value($this->options[TRANSPOSH_ADMIN_HIDE_WARNINGS] . $id . ',', $this->options[TRANSPOSH_ADMIN_HIDE_WARNINGS]);
-        }
-    }
-
-    function set_transposh_collect_stats($val) {
-        $val = ($val) ? 1 : 0;
-        $this->set_value($val, $this->options[TRANSPOSH_COLLECT_STATS]);
+            $this->transposh_admin_hide_warnings = $this->transposh_admin_hide_warnings . $id . ',';
+        }
     }
 
@@ -443 +273 @@
     function update_options() {
         if ($this->changed) {
+            foreach ($this->vars as $name => $var) {
+                $this->options[$name] = $var->get_value();
+            }
             update_option(TRANSPOSH_OPTIONS, $this->options);
+            $this->changed = false;
         } else {
             logger("no changes and no updates done");
         }
-        $this->changed = false;
     }
 
@@ -455 +288 @@
      * @return boolean Is this the default language?
      */
-    function is_default_language($language) {
-        return ($this->get_default_language() == $language || '' == $language);
+    function is_default_language($language) { // XXXX
+        return ($this->default_language == $language || '' == $language);
     }
 
@@ -465 +298 @@
     function is_editable_language($language) {
         if ($this->is_default_language($language)) return true;
-        return (strpos($this->get_editable_langs().',', $language.',') !== false);
+        return (strpos($this->editable_languages . ',', $language . ',') !== false);
     }
 
@@ -474 +307 @@
     function is_viewable_language($language) {
         if ($this->is_default_language($language)) return true;
-        return (strpos($this->get_viewable_langs().',', $language.',') !== false);
+        return (strpos($this->viewable_languages . ',', $language . ',') !== false);
     }
 

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

@@ -35 +35 @@
         $this->transposh = &$transposh;
         // we'll only do something if so configured to do
-        if ($this->transposh->options->get_enable_auto_post_translate()) {
+        if ($this->transposh->options->enable_autoposttranslate) {
             add_action('edit_post', array(&$this, 'on_edit'));
             // add_action('publish_post',array(&$this, 'on_publish'));
@@ -124 +124 @@
 
             // Add phrases from permalink
-            if ($this->transposh->options->get_enable_url_translate()) {
+            if ($this->transposh->options->enable_url_translate) {
                 $permalink = get_permalink($postID);
                 $permalink = substr($permalink, strlen($this->transposh->home_url) + 1);
@@ -141 +141 @@
 
         foreach ($phrases as $key) {
-            foreach (explode(',', $this->transposh->options->get_editable_langs()) as $lang) {
+            foreach (explode(',', $this->transposh->options->editable_languages) as $lang) {
                 // if this isn't the default language or we specifically allow default language translation, we will seek this out...
                 // as we don't normally want to auto-translate the default language -FIX THIS to include only correct stuff, how?
-                if (!$this->transposh->options->is_default_language($lang) || $this->transposh->options->get_enable_default_translate()) {
+                if (!$this->transposh->options->is_default_language($lang) || $this->transposh->options->enable_default_translate) {
                     // There is no point in returning phrases, languages pairs that cannot be translated
                     if (in_array($lang, transposh_consts::$bing_languages) ||
@@ -217 +217 @@
             update_post_meta($postID, 'tp_language', $_POST['transposh_tp_language']);
             // if a language is set for a post, default language translate must be enabled, so we enable it
-            if (!$this->transposh->options->get_enable_default_translate()) {
-                $this->transposh->options->set_enable_default_translate(true);
+            if (!$this->transposh->options->enable_default_translate) {
+                $this->transposh->options->enable_default_translate = true;
                 $this->transposh->options->update_options();
             }

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

@@ -219 +219 @@
                     ($this->transposh->options->is_default_language($code))) {
                 // now we alway do this... maybe cache this to APC/Memcache
-                if ($this->transposh->options->get_enable_url_translate() && !$this->transposh->options->is_default_language($code)) {
+                if ($this->transposh->options->enable_url_translate && !$this->transposh->options->is_default_language($code)) {
                     $page_url = transposh_utils::translate_url($clean_page_url, '', $code, array(&$this->transposh->database, 'fetch_translation'));
                 } else {