Changeset 120

Timestamp:

03/29/2009 05:21:39 PM (3 years ago)

Author:

amir

Message:

Some more refactoring. Any wordpress specific code should reside within files prefixed with transposh_ .
Fixed bug in auto translate - broken on previous checkin.
Added a custom header to the translation posted so we can have some better monitoring.

Location:

trunk/WordPress/plugin/transposh

Files:

• parser.php (modified) (2 diffs)
• transposh.php (modified) (4 diffs)
• transposh_db.php (modified) (2 diffs)
• utils.php (added)

trunk/WordPress/plugin/transposh/parser.php

@@ -27 +27 @@
 require_once("constants.php");
 require_once("globals.php");
+require_once("utils.php");
 
 //The html page which starts contains the content being translated
@@ -880 +881 @@
 }
 
-/**
- * Encode a string as base 64 while avoiding characters which should be avoided 
- * in uri, e.g. + is interpeted as a space.
- */
-function base64_url_encode($input) {
-    return strtr(base64_encode($input), '+/=', '-_,');
-}
-
-/**
- * Decode a string previously decoded with base64_url_encode
- */
-function base64_url_decode($input) {
-    return base64_decode(strtr($input, '-_,', '+/='));
+
+/*
+ * Fix links on the page. href needs to be modified to include
+ * lang specifier and editing mode.
+ */
+function process_anchor_tag($start, $end)
+{
+        global $home_url, $home_url_quoted, $lang, $is_edit_mode, $enable_permalinks_rewrite;
+
+        $href = get_attribute($start, $end, 'href');
+
+        if($href == NULL)
+        {
+                return;
+        }
+
+        //Ignore urls not from this site
+        if(stripos($href, $home_url) === FALSE)
+        {
+                return;
+        }
+
+        $use_params = !$enable_permalinks_rewrite;
+
+        //Allow specific override for url rewriting . 
+        if($enable_permalinks_rewrite &&  function_exists('is_url_excluded_from_permalink_rewrite') &&
+           is_url_excluded_from_permalink_rewrite($href))
+        {
+                $use_params = TRUE;
+        }
+        
+        $href = rewrite_url_lang_param($href, $lang, $is_edit_mode, $use_params);
+
+        //rewrite url in translated page
+        update_translated_page($start, $end, $href);
+        logger(__METHOD__ . " $home_url href: $href");
+}
+/*
+ * Return the img tag that will added to enable editing a translatable
+ * item on the page.
+ * param segement_id The id (number) identifying this segment. Needs to be
+ * placed within the img tag for use on client side operation (jquery)
+ */
+function get_img_tag($original, $translation, $source, $segment_id, $is_translated = FALSE)
+{
+        global $plugin_url, $lang, $home_url;
+        $url = $home_url . '/index.php';
+
+        //For use in javascript, make the following changes:
+        //1. Add slashes to escape the inner text
+        //2. Convert the html special characters
+        //The browser will take decode step 2 and pass it to the js engine which decode step 1 - a bit tricky
+        $translation = htmlspecialchars(addslashes($translation));
+        $original    = htmlspecialchars(addslashes($original));
+
+        if ($is_translated)
+        {
+                $add_img = "_fix";
+        }
+
+        if ($source == 1) {
+                $add_img = "_auto";
+        }
+
+        $img = "<img src=\"$plugin_url/translate$add_img.png\" alt=\"translate\" class=\"".IMG_PREFIX."\" id=\"" . IMG_PREFIX . "$segment_id\" ".
+           "onclick=\"translate_dialog('$original','$translation','$segment_id'); return false;\" ".
+           "onmouseover=\"hint('$original'); return true;\" ".
+           "onmouseout=\"nd()\" />";
+
+        return $img;
 }
 

trunk/WordPress/plugin/transposh/transposh.php

@@ -30 +30 @@
 require_once("constants.php");
 require_once("globals.php");
+require_once("utils.php");
 require_once("transposh_db.php");
 require_once("parser.php");
@@ -66 +67 @@
         $page = $buffer;
 
-        if (($wp_query->query_vars[EDIT_PARAM] == "1" ||
-        $wp_query->query_vars[EDIT_PARAM] == "true"))
-        {
-                //Verify that the current language is editable and that the
-                //user has the required permissions
-                $editable_langs = get_option(EDITABLE_LANGS);
-
-                if(is_translator() && strstr($editable_langs, $lang))
-                {
-                        $is_edit_mode = TRUE;
-                }
+        if (($wp_query->query_vars[EDIT_PARAM] == "1" || $wp_query->query_vars[EDIT_PARAM] == "true") &&
+             is_translation_allowed())
+        {
+                $is_edit_mode = TRUE;
         }
 
@@ -93 +87 @@
 
 /*
- * Fix links on the page. href needs to be modified to include
- * lang specifier and editing mode.
- */
-function process_anchor_tag($start, $end)
-{
-        global $home_url, $home_url_quoted, $lang, $is_edit_mode, $enable_permalinks_rewrite;
-
-        $href = get_attribute($start, $end, 'href');
-
-        if($href == NULL)
-        {
+ * Init global variables later used throughout this process. 
+ * Note that at the time that this function is called the wp_query is not initialized, 
+ * which means that query parameters are not accessiable. 
+ */
+function init_global_vars()
+{
+        global $home_url, $home_url_quoted, $plugin_url, $enable_permalinks_rewrite, $wp_rewrite;
+
+        $home_url = get_option('home');
+        $local_dir = preg_replace("/.*\//", "", dirname(__FILE__));
+
+        $plugin_url= $home_url . "/wp-content/plugins/$local_dir";
+        $home_url_quoted = preg_quote($home_url);
+        $home_url_quoted = preg_replace("/\//", "\\/", $home_url_quoted);
+
+        if($wp_rewrite->using_permalinks() && get_option(ENABLE_PERMALINKS_REWRITE))
+        {
+                $enable_permalinks_rewrite = TRUE;
+        }
+}
+
+/*
+ * Gets the default language setting, i.e. the source language which
+ * should not be translated.
+ * Return the default language setting
+ */
+function get_default_lang()
+{
+        global $languages;
+
+        $default = get_option(DEFAULT_LANG);
+        if(!$languages[$default])
+        {
+                $default = "en";
+        }
+
+        return $default;
+}
+
+/*
+ * Setup a buffer that will contain the contents of the html page.
+ * Once processing is completed the buffer will go into the translation process.
+ */
+function on_init()
+{
+        logger(__METHOD__ . $_SERVER['REQUEST_URI']);
+        init_global_vars();
+
+        if ($_POST['translation_posted'])
+        {
+                update_translation();
+        }
+        else
+        {
+                //set the callback for translating the page when it's done
+                ob_start("process_page");
+        }
+}
+
+/*
+ * Page generation completed - flush buffer.
+ */
+function on_shutdown()
+{
+        ob_flush();
+}
+
+/*
+ * Update the url rewrite rules to include language identifier
+ */
+function update_rewrite_rules($rules){
+        logger("Enter update_rewrite_rules");
+
+        if(!get_option(ENABLE_PERMALINKS_REWRITE))
+        {
+                logger("Not touching rewrite rules - permalinks modification disabled by admin");
+                return $rules;
+        }
+
+        $newRules = array();
+        $lang_prefix="([a-z]{2,2}(\-[a-z]{2,2})?)/";
+
+        $lang_parameter= "&" . LANG_PARAM . '=$matches[1]';
+
+        //catch the root url
+        $newRules[$lang_prefix."?$"] = "index.php?lang=\$matches[1]";
+        logger("\t" . $lang_prefix."?$" . "  --->  " . "index.php?lang=\$matches[1]");
+
+        foreach ($rules as $key=>$value) {
+                $original_key = $key;
+                $original_value = $value;
+
+                $key = $lang_prefix . $key;
+
+                //Shift existing matches[i] two step forward as we pushed new elements
+                //in the beginning of the expression
+                for($i = 6; $i > 0; $i--)
+                {
+                        $value = str_replace('['. $i .']', '['. ($i + 2) .']', $value);
+                }
+
+                $value .= $lang_parameter;
+
+                logger("\t" . $key . "  --->  " . $value);
+
+
+                $newRules[$key] = $value;
+                $newRules[$original_key] = $original_value;
+
+                logger("\t" . $original_key . "  --->  " . $original_value);
+        }
+
+        logger("Exit update_rewrite_rules");
+        return $newRules;
+}
+
+/*
+ * Let WordPress which parameters are of interest to us.
+ */
+function parameter_queryvars($qvars)
+{
+        $qvars[] = LANG_PARAM;
+        $qvars[] = EDIT_PARAM;
+
+        return $qvars;
+}
+
+/*
+ * Determine if the current user is allowed to translate.
+ * Return TRUE if allowed to translate otherwise FALSE
+ */
+function is_translator()
+{
+        if(is_user_logged_in())
+        {
+                if(current_user_can(TRANSLATOR))
+                {
+                        return TRUE;
+                }
+        }
+
+        if(get_option(ANONYMOUS_TRANSLATION))
+        {
+                //if anonymous translation is allowed - let anyone enjoy it
+                return TRUE;
+        }
+
+        return FALSE;
+}
+
+/*
+ * Plugin activated.
+ */
+function plugin_activate()
+{
+        global $wp_rewrite;
+        logger("plugin_activate enter: " . dirname(__FILE__));
+
+        setup_db();
+
+        add_filter('rewrite_rules_array', 'update_rewrite_rules');
+        $wp_rewrite->flush_rules();
+
+        logger("plugin_activate exit: " . dirname(__FILE__));
+}
+
+/*
+ * Plugin deactivated.
+ */
+function plugin_deactivate(){
+        global $wp_rewrite;
+        logger("plugin_deactivate enter: " . dirname(__FILE__));
+
+        remove_filter('rewrite_rules_array', 'update_rewrite_rules');
+        $wp_rewrite->flush_rules();
+
+        logger("plugin_deactivate exit: " . dirname(__FILE__));
+}
+
+/*
+ * Callback from admin_notices - display error message to the admin.
+ */
+function plugin_install_error()
+{
+        global $admin_msg;
+        logger("Enter " . __METHOD__, 0);
+
+        echo '<div class="updated"><p>';
+        echo 'Error has occured in the installation process of the translation plugin: <br>';
+
+        echo $admin_msg;
+
+        if (function_exists('deactivate_plugins') ) {
+                deactivate_plugins(get_plugin_name(), "translate.php");
+                echo '<br> This plugin has been automatically deactivated.';
+        }
+
+        echo '</p></div>';
+}
+
+/*
+ * Callback when all plugins have been loaded. Serves as the location
+ * to check that the plugin loaded successfully else trigger notification
+ * to the admin and deactivate plugin.
+ */
+function plugin_loaded()
+{
+        global $admin_msg;
+        logger("Enter " . __METHOD__, 4);
+
+        $db_version = get_option(TRANSPOSH_DB_VERSION);
+
+        if ($db_version != DB_VERSION)
+        {
+                setup_db();
+                //$admin_msg = "Translation database version ($db_version) is not comptabile with this plugin (". DB_VERSION . ")  <br>";
+
+                logger("Updating database in plugin loaded", 0);
+                //Some error occured - notify admin and deactivate plugin
+                //add_action('admin_notices', 'plugin_install_error');
+        }
+
+        if ($db_version != DB_VERSION)
+        {
+                $admin_msg = "Failed to locate the translation table  <em> " . TRANSLATIONS_TABLE . "</em> in local database. <br>";
+
+                logger("Messsage to admin: $admin_msg", 0);
+                //Some error occured - notify admin and deactivate plugin
+                add_action('admin_notices', 'plugin_install_error');
+        }
+}
+
+/*
+ * Gets the plugin name to be used in activation/decativation hooks.
+ * Keep only the file name and its containing directory. Don't use the full
+ * path as it will break when using symbollic links.
+ */
+function get_plugin_name()
+{
+        $file = __FILE__;
+        $file = str_replace('\\','/',$file); // sanitize for Win32 installs
+        $file = preg_replace('|/+|','/', $file); // remove any duplicate slash
+
+        //keep only the file name and its parent directory
+        $file = preg_replace('/.*\/([^\/]+\/[^\/]+)$/', '$1', $file);
+        logger("Plugin path $file", 3);
+        return $file;
+}
+
+/*
+ * Add custom css, i.e. transposh.css
+ */
+function add_transposh_css() {
+        global $plugin_url;
+        
+        if(!is_translation_allowed())
+        {
+                //translation not allowed - no need for the transposh.css       
                 return;
         }
-
-        //Ignore urls not from this site
-        if(stripos($href, $home_url) === FALSE)
-        {
+        //include the transposh.css
+        wp_enqueue_style("transposh","$plugin_url/transposh.css",array(),'1.0.1');
+        logger("Added transposh_css");
+}
+
+/*
+ * Insert references to the javascript files used in the transalted
+ * version of the page.
+ */
+function add_transposh_js() {
+        global $plugin_url, $wp_query, $lang, $home_url,  $enable_auto_translate;
+
+        if(!is_translation_allowed())
+        {
+                //translation not allowed - no need for any js. 
                 return;
         }
-
-        $use_params = !$enable_permalinks_rewrite;
-
-        //Only use params if permalinks are not enabled.
+        
+        $is_edit_param_enabled = $wp_query->query_vars[EDIT_PARAM];
+        $enable_auto_translate = get_option(ENABLE_AUTO_TRANSLATE,1) && is_translation_allowed();
+        
+        if (!$is_edit_param_enabled && !$enable_auto_translate)
+        {
+                //Not in any translation mode - no need for any js.
+                return;
+        }
+
+        $overlib_dir = "$plugin_url/js/overlibmws";
+
+        if($is_edit_param_enabled)
+        {
+                wp_enqueue_script("overlibmws","$overlib_dir/overlibmws.js",array(),'1.0');
+                wp_enqueue_script("overlibmws1","$overlib_dir/overlibmws_filter.js",array("overlibmws"),'1.0');
+                wp_enqueue_script("overlibmws2","$overlib_dir/overlibmws_modal.js",array("overlibmws1"),'1.0');
+                wp_enqueue_script("overlibmws3","$overlib_dir/overlibmws_overtwo.js",array("overlibmws2"),'1.0');
+                wp_enqueue_script("overlibmws4","$overlib_dir/overlibmws_scroll.js",array("overlibmws3"),'1.0');
+                wp_enqueue_script("overlibmws5","$overlib_dir/overlibmws_shadow.js",array("overlibmws4"),'1.0');
+        }
+
+        if($is_edit_param_enabled || $enable_auto_translate)
+        {
+                $post_url = $home_url . '/index.php';
+                wp_enqueue_script("jquerymin","http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js",array(),'1.3.2');
+                wp_enqueue_script("google","http://www.google.com/jsapi",array(),'1');
+                wp_enqueue_script("transposh","$plugin_url/js/transposh.js?post_url=$post_url&lang={$lang}",array("jquerymin"),'1.0');
+        }
+}
+
+
+/**
+ * Determine if the currently selected language (taken from the query parameters) is in the admin's list 
+ * of editable languages and the current user is allowed to translate. 
+ *  
+ * @return TRUE if translation allowed otherwise FALSE
+ */
+function is_translation_allowed()
+{
+        global $wp_query;
+
+        if(!is_translator())
+        {
+                return FALSE;
+        }
+        
+        if (!isset($wp_query->query_vars[LANG_PARAM]))
+        {
+                return FALSE;
+        }
+        
+        $lang = $wp_query->query_vars[LANG_PARAM];
+        return is_editable_lang($lang);
+}
+
+/**
+ * Determine if the given language in on the list of editable languages
+ * @return TRUE if editable othewise FALSE
+ */
+function is_editable_lang($lang)
+{
+        $editable_langs = get_option(EDITABLE_LANGS);
+
+        if(strpos($editable_langs, $lang) === FALSE)
+        {
+                //not an editable language
+                return FALSE;
+        }
+        
+        return TRUE;
+}
+
+/**
+ * Callback from parser allowing to overide the global setting of url rewriting using permalinks.
+ * Some urls should be modified only by adding parameters and should be identified by this 
+ * function.
+ * @param $href
+ * @return TRUE if parameters should be used instead of rewriting as a permalink
+ */
+function is_url_excluded_from_permalink_rewrite($href)
+{
+        $use_params = FALSE;
+        
         //don't fix links pointing to real files as it will cause that the
         //web server will not be able to locate them
@@ -125 +457 @@
                 $use_params = TRUE;
         }
-
-        $href = rewrite_url_lang_param($href, $lang, $is_edit_mode, $use_params);
-
-        //rewrite url in translated page
-        update_translated_page($start, $end, $href);
-        logger(__METHOD__ . " $home_url href: $href");
-}
-
-/*
- * Update the given url to include language params.
- * param url - the original url to rewrite
- * param lang - language code
- * param is_edit - is running in edit mode.
- * param use_params_only - use only parameters as modifiers, i.e. not permalinks
- */
-function rewrite_url_lang_param($url, $lang, $is_edit, $use_params_only=FALSE)
-{
-        global $home_url, $home_url_quoted, $enable_permalinks_rewrite;
-
-        $url = html_entity_decode($url, ENT_NOQUOTES);
-
-        if(!$enable_permalinks_rewrite)
-        {
-                //override the use only params - admin configured system to not touch permalinks
-                $use_params_only = TRUE;
-        }
-
-        if($is_edit)
-        {
-                $params = EDIT_PARAM . '=1&';
-
-        }
-
-        if($use_params_only)
-        {
-                $params .= LANG_PARAM . "=$lang&";
-        }
-        else
-        {
-                $url = preg_replace("/$home_url_quoted\/(..(-..)?\/)?\/?/",
-                                 "$home_url/$lang/",  $url);
-        }
-
-        if($params)
-        {
-                //insert params to url
-                $url = preg_replace("/(.+\/[^\?\#]*[\?]?)/", '$1?' . $params, $url);
-
-                //Cleanup extra &
-                $url = preg_replace("/&&+/", "&", $url);
-
-                //Cleanup extra ?
-                $url = preg_replace("/\?\?+/", "?", $url);
-        }
-
-        // more cleanups
-        $url = preg_replace("/&$/", "", $url);
-        $url = preg_replace("/\?$/", "", $url);
-
-        $url = htmlentities($url, ENT_NOQUOTES);
-
-        return $url;
-}
-/*
- * Return the img tag that will added to enable editing a translatable
- * item on the page.
- * param segement_id The id (number) identifying this segment. Needs to be
- * placed within the img tag for use on client side operation (jquery)
- */
-function get_img_tag($original, $translation, $source, $segment_id, $is_translated = FALSE)
-{
-        global $plugin_url, $lang, $home_url;
-        $url = $home_url . '/index.php';
-
-        //For use in javascript, make the following changes:
-        //1. Add slashes to escape the inner text
-        //2. Convert the html special characters
-        //The browser will take decode step 2 and pass it to the js engine which decode step 1 - a bit tricky
-        $translation = htmlspecialchars(addslashes($translation));
-        $original    = htmlspecialchars(addslashes($original));
-
-        if ($is_translated)
-        {
-                $add_img = "_fix";
-        }
-
-        if ($source == 1) {
-                $add_img = "_auto";
-        }
-
-        $img = "<img src=\"$plugin_url/translate$add_img.png\" alt=\"translate\" class=\"".IMG_PREFIX."\" id=\"" . IMG_PREFIX . "$segment_id\" ".
-           "onclick=\"translate_dialog('$original','$translation','$segment_id'); return false;\" ".
-           "onmouseover=\"hint('$original'); return true;\" ".
-           "onmouseout=\"nd()\" />";
-
-        return $img;
-}
-
-/*
- * Init global variables later used throughout this process
- */
-function init_global_vars()
-{
-        global $home_url, $home_url_quoted, $plugin_url, $enable_auto_translate,
-              $enable_permalinks_rewrite, $wp_rewrite;
-
-        $home_url = get_option('home');
-        $local_dir = preg_replace("/.*\//", "", dirname(__FILE__));
-
-        $plugin_url= $home_url . "/wp-content/plugins/$local_dir";
-        $home_url_quoted = preg_quote($home_url);
-        $home_url_quoted = preg_replace("/\//", "\\/", $home_url_quoted);
-
-        $enable_auto_translate = get_option(ENABLE_AUTO_TRANSLATE,1) && is_translation_allowed();
-
-        if($wp_rewrite->using_permalinks() && get_option(ENABLE_PERMALINKS_REWRITE))
-        {
-                $enable_permalinks_rewrite = TRUE;
-        }
-}
-
-/*
- * Gets the default language setting, i.e. the source language which
- * should not be translated.
- * Return the default language setting
- */
-function get_default_lang()
-{
-        global $languages;
-
-        $default = get_option(DEFAULT_LANG);
-        if(!$languages[$default])
-        {
-                $default = "en";
-        }
-
-        return $default;
-}
-
-/*
- * Setup a buffer that will contain the contents of the html page.
- * Once processing is completed the buffer will go into the translation process.
- */
-function on_init()
-{
-        logger(__METHOD__ . $_SERVER['REQUEST_URI']);
-        init_global_vars();
-
-        if ($_POST['translation_posted'])
-        {
-                update_translation();
-        }
-        else
-        {
-                //set the callback for translating the page when it's done
-                ob_start("process_page");
-        }
-}
-
-/*
- * Page generation completed - flush buffer.
- */
-function on_shutdown()
-{
-        ob_flush();
-}
-
-/*
- * Update the url rewrite rules to include language identifier
- */
-function update_rewrite_rules($rules){
-        logger("Enter update_rewrite_rules");
-
-        if(!get_option(ENABLE_PERMALINKS_REWRITE))
-        {
-                logger("Not touching rewrite rules - permalinks modification disabled by admin");
-                return $rules;
-        }
-
-        $newRules = array();
-        $lang_prefix="([a-z]{2,2}(\-[a-z]{2,2})?)/";
-
-        $lang_parameter= "&" . LANG_PARAM . '=$matches[1]';
-
-        //catch the root url
-        $newRules[$lang_prefix."?$"] = "index.php?lang=\$matches[1]";
-        logger("\t" . $lang_prefix."?$" . "  --->  " . "index.php?lang=\$matches[1]");
-
-        foreach ($rules as $key=>$value) {
-                $original_key = $key;
-                $original_value = $value;
-
-                $key = $lang_prefix . $key;
-
-                //Shift existing matches[i] two step forward as we pushed new elements
-                //in the beginning of the expression
-                for($i = 6; $i > 0; $i--)
-                {
-                        $value = str_replace('['. $i .']', '['. ($i + 2) .']', $value);
-                }
-
-                $value .= $lang_parameter;
-
-                logger("\t" . $key . "  --->  " . $value);
-
-
-                $newRules[$key] = $value;
-                $newRules[$original_key] = $original_value;
-
-                logger("\t" . $original_key . "  --->  " . $original_value);
-        }
-
-        logger("Exit update_rewrite_rules");
-        return $newRules;
-}
-
-/*
- * Let WordPress which parameters are of interest to us.
- */
-function parameter_queryvars($qvars)
-{
-        $qvars[] = LANG_PARAM;
-        $qvars[] = EDIT_PARAM;
-
-        return $qvars;
-}
-
-/*
- * Determine if the current user is allowed to translate.
- * Return TRUE if allowed to translate otherwise FALSE
- */
-function is_translator()
-{
-        if(is_user_logged_in())
-        {
-                if(current_user_can(TRANSLATOR))
-                {
-                        return TRUE;
-                }
-        }
-
-        if(get_option(ANONYMOUS_TRANSLATION))
-        {
-                //if anonymous translation is allowed - let anyone enjoy it
-                return TRUE;
-        }
-
-        return FALSE;
-}
-
-/*
- * Plugin activated.
- */
-function plugin_activate()
-{
-        global $wp_rewrite;
-        logger("plugin_activate enter: " . dirname(__FILE__));
-
-        setup_db();
-
-        add_filter('rewrite_rules_array', 'update_rewrite_rules');
-        $wp_rewrite->flush_rules();
-
-        logger("plugin_activate exit: " . dirname(__FILE__));
-}
-
-/*
- * Plugin deactivated.
- */
-function plugin_deactivate(){
-        global $wp_rewrite;
-        logger("plugin_deactivate enter: " . dirname(__FILE__));
-
-        remove_filter('rewrite_rules_array', 'update_rewrite_rules');
-        $wp_rewrite->flush_rules();
-
-        logger("plugin_deactivate exit: " . dirname(__FILE__));
-}
-
-/*
- * Callback from admin_notices - display error message to the admin.
- */
-function plugin_install_error()
-{
-        global $admin_msg;
-        logger("Enter " . __METHOD__, 0);
-
-        echo '<div class="updated"><p>';
-        echo 'Error has occured in the installation process of the translation plugin: <br>';
-
-        echo $admin_msg;
-
-        if (function_exists('deactivate_plugins') ) {
-                deactivate_plugins(get_plugin_name(), "translate.php");
-                echo '<br> This plugin has been automatically deactivated.';
-        }
-
-        echo '</p></div>';
-}
-
-/*
- * Callback when all plugins have been loaded. Serves as the location
- * to check that the plugin loaded successfully else trigger notification
- * to the admin and deactivate plugin.
- */
-function plugin_loaded()
-{
-        global $admin_msg;
-        logger("Enter " . __METHOD__, 4);
-
-        $db_version = get_option(TRANSPOSH_DB_VERSION);
-
-        if ($db_version != DB_VERSION)
-        {
-                setup_db();
-                //$admin_msg = "Translation database version ($db_version) is not comptabile with this plugin (". DB_VERSION . ")  <br>";
-
-                logger("Updating database in plugin loaded", 0);
-                //Some error occured - notify admin and deactivate plugin
-                //add_action('admin_notices', 'plugin_install_error');
-        }
-
-        if ($db_version != DB_VERSION)
-        {
-                $admin_msg = "Failed to locate the translation table  <em> " . TRANSLATIONS_TABLE . "</em> in local database. <br>";
-
-                logger("Messsage to admin: $admin_msg", 0);
-                //Some error occured - notify admin and deactivate plugin
-                add_action('admin_notices', 'plugin_install_error');
-        }
-}
-
-/*
- * Gets the plugin name to be used in activation/decativation hooks.
- * Keep only the file name and its containing directory. Don't use the full
- * path as it will break when using symbollic links.
- */
-function get_plugin_name()
-{
-        $file = __FILE__;
-        $file = str_replace('\\','/',$file); // sanitize for Win32 installs
-        $file = preg_replace('|/+|','/', $file); // remove any duplicate slash
-
-        //keep only the file name and its parent directory
-        $file = preg_replace('/.*\/([^\/]+\/[^\/]+)$/', '$1', $file);
-        logger("Plugin path $file", 3);
-        return $file;
-}
-
-/*
- * Add custom css, i.e. transposh.css
- */
-function add_transposh_css() {
-        global $plugin_url;
-        
-        if(!is_translation_allowed())
-        {
-                //translation not allowed - no need for the transposh.css       
-                return;
-        }
-        //include the transposh.css
-        wp_enqueue_style("transposh","$plugin_url/transposh.css",array(),'1.0.1');
-        logger("Added transposh_css");
-}
-
-/*
- * Insert references to the javascript files used in the transalted
- * version of the page.
- */
-function add_transposh_js() {
-        global $plugin_url, $wp_query, $lang, $home_url,  $enable_auto_translate;
-
-        if(!is_translation_allowed())
-        {
-                //translation not allowed - no need for any js. 
-                return;
-        }
-        
-        $is_edit_param_enabled = $wp_query->query_vars[EDIT_PARAM];
-        if (!$is_edit_param_enabled && ! $enable_auto_translate)
-        {
-                //Not in any translation mode - no need for any js.
-                return;
-        }
-
-        $overlib_dir = "$plugin_url/js/overlibmws";
-
-        if($is_edit_param_enabled)
-        {
-                wp_enqueue_script("overlibmws","$overlib_dir/overlibmws.js",array(),'1.0');
-                wp_enqueue_script("overlibmws1","$overlib_dir/overlibmws_filter.js",array("overlibmws"),'1.0');
-                wp_enqueue_script("overlibmws2","$overlib_dir/overlibmws_modal.js",array("overlibmws1"),'1.0');
-                wp_enqueue_script("overlibmws3","$overlib_dir/overlibmws_overtwo.js",array("overlibmws2"),'1.0');
-                wp_enqueue_script("overlibmws4","$overlib_dir/overlibmws_scroll.js",array("overlibmws3"),'1.0');
-                wp_enqueue_script("overlibmws5","$overlib_dir/overlibmws_shadow.js",array("overlibmws4"),'1.0');
-        }
-
-        if($is_edit_param_enabled || $enable_auto_translate)
-        {
-                $post_url = $home_url . '/index.php';
-                wp_enqueue_script("jquerymin","http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js",array(),'1.3.2');
-                wp_enqueue_script("google","http://www.google.com/jsapi",array(),'1');
-                wp_enqueue_script("transposh","$plugin_url/js/transposh.js?post_url=$post_url&lang={$lang}",array("jquerymin"),'1.0');
-        }
-}
-
-
-/**
- * Determine if the currently selected language (taken from the query parameters) is in the admin's list 
- * of editable languages and the current user is allowed to translate. 
- *  
- * @return TRUE if translation allowed otherwise FALSE
- */
-function is_translation_allowed()
-{
-        global $wp_query;
-
-        if(!is_translator())
-        {
-                return FALSE;
-        }
-        
-        if (!isset($wp_query->query_vars[LANG_PARAM]))
-        {
-                return FALSE;
-        }
-        
-        $lang = $wp_query->query_vars[LANG_PARAM];
-        return is_editable_lang($lang);
-}
-
-/**
- * Determine if the given language in on the list of editable languages
- * @return TRUE if editable othewise FALSE
- */
-function is_editable_lang($lang)
-{
-        $editable_langs = get_option(EDITABLE_LANGS);
-
-        if(strpos($editable_langs, $lang) === FALSE)
-        {
-                //not an editable language
-                return FALSE;
-        }
-        
-        return TRUE;
+        
+        return $use_params;
 }
 

trunk/WordPress/plugin/transposh/transposh_db.php

@@ -26 +26 @@
 require_once("logging.php");
 require_once("constants.php");
+require_once("utils.php");
 
 //
@@ -117 +118 @@
                 return;
         }
-
+        
+        //add  our own custom header - so we will know that we got here 
+        header("Transposh: version_". DB_VERSION);
+        
         //Check that user is allowed to translate this language
         if(!is_translator() || !is_editable_lang($lang))