Index: gtranslate.module
===================================================================
--- gtranslate.module	(.../trunk/sites/default/modules/gtrans)	(revision 16137)
+++ gtranslate.module	(.../tags/2010-08-06-B/sites/default/modules/gtrans)	(revision 16137)
@@ -19,12 +19,6 @@
 } // function gtranslate_perm
 
 function gtranslate_block($op = 'list', $delta = 0) {
-
-    global $language;
-    
-    $from_language = $language->language ? $language->language : variable_get('gtranslate_main_lang', 'en');
-    $module_dir = base_path() . drupal_get_path('module', 'gtranslate');
-
     if ($op == 'list') {
         $block[0]['info'] = t('GTranslate');
         return $block;
@@ -50,7 +44,7 @@
             $block_content .= '<script type="text/javascript">';
             $block_content .= 'function googleTranslateElementInit() {';
             $block_content .= 'new google.translate.TranslateElement({';
-            $block_content .= "pageLanguage: '".$from_language."',";
+            $block_content .= "pageLanguage: '".variable_get('gtranslate_main_lang', 'en')."',";
             $block_content .= "includedLanguages: '".$includedLanguages."'";
             $block_content .= "}, 'google_translate_element');";
             $block_content .= '}';
@@ -60,10 +54,10 @@
         } else {
 
             if(variable_get('gtranslate_method', 'google-default') == 'on-fly') {
-                $block_content .= '<script type="text/javascript" src="' . $module_dir . '/gtranslate_files/jquery-translate.js"></script>';
+                $block_content .= '<script type="text/javascript" src="'.base_path().'/sites/all/modules/gtrans/gtranslate_files/jquery-translate.js"></script>';
                 $block_content .= '<script type="text/javascript">'."\n";
                 $block_content .= "//<![CDATA[\n";
-                $block_content .= "if(jQuery.cookie('glang') && jQuery.cookie('glang') != '".$from_language."') jQuery(function(\$){\$('body').translate('".$from_language."', \$.cookie('glang'), {not:'script'});});\n";
+                $block_content .= "if(jQuery.cookie('glang') && jQuery.cookie('glang') != '".variable_get('gtranslate_main_lang', 'en')."') jQuery(function(\$){\$('body').translate('".variable_get('gtranslate_main_lang', 'en')."', \$.cookie('glang'), {not:'script'});});\n";
                 $block_content .= "//]]>\n";
                 $block_content .= '</script>';
             }
@@ -72,25 +66,25 @@
             $block_content .= "//<![CDATA[\n";
 
             if(variable_get('gtranslate_method', 'google-default') == 'on-fly') {
-                $block_content .= "function doTranslate(lang_pair) {if(lang_pair.value)lang_pair=lang_pair.value;var lang=lang_pair.split('|')[1];if(lang=='pt')lang='pt-PT';jQuery.cookie('glang', lang);jQuery(function(\$){\$('body').translate('".$from_language."', lang, {not:'script'})});}";
+                $block_content .= "function doTranslate(lang_pair) {if(lang_pair.value)lang_pair=lang_pair.value;var lang=lang_pair.split('|')[1];if(lang=='pt')lang='pt-PT';jQuery.cookie('glang', lang);jQuery(function(\$){\$('body').translate('".variable_get('gtranslate_main_lang', 'en')."', lang, {not:'script'})});}";
             } else {
                 if(variable_get('gtranslate_new_window', 0)) {
                     $block_content .= "function openTab(url) {var form=document.createElement('form');form.method='post';form.action=url;form.target='_blank';document.body.appendChild(form);form.submit();}";
                     if(variable_get('gtranslate_pro', 0)) {
-                        $block_content .= "function doTranslate(lang_pair) {if(lang_pair.value)lang_pair=lang_pair.value;var lang=lang_pair.split('|')[1];var plang=location.pathname.split('/')[1];if(plang.length !=2 && plang != 'zh-CN' && plang != 'zh-TW')plang='".$from_language."';if(lang == '".$from_language."')openTab(location.protocol+'//'+location.host+location.pathname.replace('/'+plang, '')+location.search);else openTab(location.protocol+'//'+location.host+'/'+lang+location.pathname.replace('/'+plang, '')+location.search);}";
+                        $block_content .= "function doTranslate(lang_pair) {if(lang_pair.value)lang_pair=lang_pair.value;var lang=lang_pair.split('|')[1];var plang=location.pathname.split('/')[1];if(plang.length !=2 && plang != 'zh-CN' && plang != 'zh-TW')plang='".variable_get('gtranslate_main_lang', 'en')."';if(lang == '".variable_get('gtranslate_main_lang', 'en')."')openTab(location.protocol+'//'+location.host+location.pathname.replace('/'+plang, '')+location.search);else openTab(location.protocol+'//'+location.host+'/'+lang+location.pathname.replace('/'+plang, '')+location.search);}";
                     } else {
                         $block_content .= "if(top.location!=self.location)top.location=self.location;";
                         $block_content .= "window['_tipoff']=function(){};window['_tipon']=function(a){};";
-                        $block_content .= "function doTranslate(lang_pair) {if(lang_pair.value)lang_pair=lang_pair.value;if(location.hostname=='".$_SERVER['HTTP_HOST']."' && lang_pair=='".$from_language."|".$from_language."')return;else if(location.hostname!='".$_SERVER['HTTP_HOST']."' && lang_pair=='".$from_language."|<?php echo $mainlang; ?>')openTab(unescape(gfg('u')));else if(location.hostname=='".$_SERVER['HTTP_HOST']."' && lang_pair!='".$from_language."|".$from_language."')openTab('http://translate.google.com/translate?client=tmpg&hl=en&langpair='+lang_pair+'&u='+escape(location.href));else openTab('http://translate.google.com/translate?client=tmpg&hl=en&langpair='+lang_pair+'&u='+unescape(gfg('u')));}";
+                        $block_content .= "function doTranslate(lang_pair) {if(lang_pair.value)lang_pair=lang_pair.value;if(location.hostname=='".$_SERVER['HTTP_HOST']."' && lang_pair=='".variable_get('gtranslate_main_lang', 'en')."|".variable_get('gtranslate_main_lang', 'en')."')return;else if(location.hostname!='".$_SERVER['HTTP_HOST']."' && lang_pair=='".variable_get('gtranslate_main_lang', 'en')."|<?php echo $mainlang; ?>')openTab(unescape(gfg('u')));else if(location.hostname=='".$_SERVER['HTTP_HOST']."' && lang_pair!='".variable_get('gtranslate_main_lang', 'en')."|".variable_get('gtranslate_main_lang', 'en')."')openTab('http://translate.google.com/translate?client=tmpg&hl=en&langpair='+lang_pair+'&u='+escape(location.href));else openTab('http://translate.google.com/translate?client=tmpg&hl=en&langpair='+lang_pair+'&u='+unescape(gfg('u')));}";
                         $block_content .= 'function gfg(name) {name=name.replace(/[\[]/,"\\\[").replace(/[\]]/,"\\\]");var regexS="[\\?&]"+name+"=([^&#]*)";var regex=new RegExp(regexS);var results=regex.exec(location.href);if(results==null)return "";return results[1];}';
                     }
                 } else {
                     if(variable_get('gtranslate_pro', 0)) {
-                        $block_content .= "function doTranslate(lang_pair) {if(lang_pair.value)lang_pair=lang_pair.value;var lang=lang_pair.split('|')[1];var plang=location.pathname.split('/')[1];if(plang.length !=2 && plang != 'zh-CN' && plang != 'zh-TW')plang='".$from_language."';if(lang == '".$from_language."')location.pathname=location.pathname.replace('/'+plang, '');else location.pathname='/'+lang+location.pathname.replace('/'+plang, '');}";
+                        $block_content .= "function doTranslate(lang_pair) {if(lang_pair.value)lang_pair=lang_pair.value;var lang=lang_pair.split('|')[1];var plang=location.pathname.split('/')[1];if(plang.length !=2 && plang != 'zh-CN' && plang != 'zh-TW')plang='".variable_get('gtranslate_main_lang', 'en')."';if(lang == '".variable_get('gtranslate_main_lang', 'en')."')location.pathname=location.pathname.replace('/'+plang, '');else location.pathname='/'+lang+location.pathname.replace('/'+plang, '');}";
                     } else {
                         $block_content .= "if(top.location!=self.location)top.location=self.location;";
                         $block_content .= "window['_tipoff']=function(){};window['_tipon']=function(a){};";
-                        $block_content .= "function doTranslate(lang_pair) {if(lang_pair.value)lang_pair=lang_pair.value;if(location.hostname=='".$_SERVER['HTTP_HOST']."' && lang_pair=='".$from_language."|".$from_language."')return;else if(location.hostname!='".$_SERVER['HTTP_HOST']."' && lang_pair=='".$from_language."|".$from_language."')location.href=unescape(gfg('u'));else if(location.hostname=='".$_SERVER['HTTP_HOST']."' && lang_pair!='".$from_language."|".$from_language."')location.href='http://translate.google.com/translate?client=tmpg&hl=en&langpair='+lang_pair+'&u='+escape(location.href);else location.href='http://translate.google.com/translate?client=tmpg&hl=en&langpair='+lang_pair+'&u='+unescape(gfg('u'));}";
+                        $block_content .= "function doTranslate(lang_pair) {if(lang_pair.value)lang_pair=lang_pair.value;if(location.hostname=='".$_SERVER['HTTP_HOST']."' && lang_pair=='".variable_get('gtranslate_main_lang', 'en')."|".variable_get('gtranslate_main_lang', 'en')."')return;else if(location.hostname!='".$_SERVER['HTTP_HOST']."' && lang_pair=='".variable_get('gtranslate_main_lang', 'en')."|".variable_get('gtranslate_main_lang', 'en')."')location.href=unescape(gfg('u'));else if(location.hostname=='".$_SERVER['HTTP_HOST']."' && lang_pair!='".variable_get('gtranslate_main_lang', 'en')."|".variable_get('gtranslate_main_lang', 'en')."')location.href='http://translate.google.com/translate?client=tmpg&hl=en&langpair='+lang_pair+'&u='+escape(location.href);else location.href='http://translate.google.com/translate?client=tmpg&hl=en&langpair='+lang_pair+'&u='+unescape(gfg('u'));}";
                         $block_content .= 'function gfg(name) {name=name.replace(/[\[]/,"\\\[").replace(/[\]]/,"\\\]");var regexS="[\\?&]"+name+"=([^&#]*)";var regex=new RegExp(regexS);var results=regex.exec(location.href);if(results==null)return "";return results[1];}';
                     }
                 }
@@ -103,8 +97,8 @@
                 case 'both': {
                     $block_content .= '<style type="text/css">'."\n";
                     $block_content .= "<!--\n";
-                    $block_content .= "a.flag {background-image:url('" . $module_dir . "/gtranslate_files/".variable_get('gtranslate_flag_size', '16')."a.png');}\n";
-                    $block_content .= "a.flag:hover {background-image:url('" . $module_dir . "/gtranslate_files/".variable_get('gtranslate_flag_size', '16').".png');}\n";
+                    $block_content .= "a.flag {background-image:url('".base_path()."/sites/all/modules/gtrans/gtranslate_files/".variable_get('gtranslate_flag_size', '16')."a.png');}\n";
+                    $block_content .= "a.flag:hover {background-image:url('".base_path()."/sites/all/modules/gtrans/gtranslate_files/".variable_get('gtranslate_flag_size', '16').".png');}\n";
                     $block_content .= "-->\n";
                     $block_content .= '</style>';
 
@@ -117,7 +111,7 @@
                                 default: break;
                             }
 
-                            $block_content .= '<a href="javascript:doTranslate(\''.$from_language.'|'.$lang.'\')" title="'.$lang_name.'" class="flag" style="font-size:'.variable_get('gtranslate_flag_size', '16').'px;padding:1px 0;background-repeat:no-repeat;background-position:-'.($i*100).'px -'.($j*100).'px;"><img src="' . $module_dir . '/gtranslate_files/blank.png" height="'.variable_get('gtranslate_flag_size', '16').'" width="'.variable_get('gtranslate_flag_size', '16').'" style="border:0;vertical-align:top;" alt="'.$lang_name.'" /></a> ';
+                            $block_content .= '<a href="javascript:doTranslate(\''.variable_get('gtranslate_main_lang', 'en').'|'.$lang.'\')" title="'.$lang_name.'" class="flag" style="font-size:'.variable_get('gtranslate_flag_size', '16').'px;padding:1px 0;background-repeat:no-repeat;background-position:-'.($i*100).'px -'.($j*100).'px;"><img src="'.base_path().'/sites/all/modules/gtrans/gtranslate_files/blank.png" height="'.variable_get('gtranslate_flag_size', '16').'" width="'.variable_get('gtranslate_flag_size', '16').'" style="border:0;vertical-align:top;" alt="'.$lang_name.'" /></a> ';
                         }
 
                         if($i == 7) {
@@ -140,7 +134,7 @@
                                 default: break;
                             }
 
-                            $block_content .= '<option value="'.$from_language.'|'.$lang.'" style="'.($lang == $from_language ? 'font-weight:bold;' : '').'background:url(\'' . $module_dir . '/gtranslate_files/16l.png\') no-repeat scroll 0 -'.($i*16).'px;padding-left:18px;">'.$lang_name.'</option>';
+                            $block_content .= '<option value="'.variable_get('gtranslate_main_lang', 'en').'|'.$lang.'" style="'.($lang == variable_get('gtranslate_main_lang', 'en') ? 'font-weight:bold;' : '').'background:url(\''.base_path().'/sites/all/modules/gtrans/gtranslate_files/16l.png\') no-repeat scroll 0 -'.($i*16).'px;padding-left:18px;">'.$lang_name.'</option>';
                         }
 
                         $i++;
@@ -152,8 +146,8 @@
                 case 'flags': {
                     $block_content .= '<style type="text/css">'."\n";
                     $block_content .= "<!--\n";
-                    $block_content .= "a.flag {background-image:url('" . $module_dir . "/gtranslate_files/".variable_get('gtranslate_flag_size', '16')."a.png');}\n";
-                    $block_content .= "a.flag:hover {background-image:url('" . $module_dir . "/gtranslate_files/".variable_get('gtranslate_flag_size', '16').".png');}\n";
+                    $block_content .= "a.flag {background-image:url('".base_path()."/sites/all/modules/gtrans/gtranslate_files/".variable_get('gtranslate_flag_size', '16')."a.png');}\n";
+                    $block_content .= "a.flag:hover {background-image:url('".base_path()."/sites/all/modules/gtrans/gtranslate_files/".variable_get('gtranslate_flag_size', '16').".png');}\n";
                     $block_content .= "-->\n";
                     $block_content .= '</style>';
 
@@ -166,7 +160,7 @@
                                 default: break;
                             }
 
-                            $block_content .= '<a href="javascript:doTranslate(\''.$from_language.'|'.$lang.'\')" title="'.$lang_name.'" class="flag" style="font-size:'.variable_get('gtranslate_flag_size', '16').'px;padding:1px 0;background-repeat:no-repeat;background-position:-'.($i*100).'px -'.($j*100).'px;"><img src="' . $module_dir . '/gtranslate_files/blank.png" height="'.variable_get('gtranslate_flag_size', '16').'" width="'.variable_get('gtranslate_flag_size', '16').'" style="border:0;vertical-align:top;" alt="'.$lang_name.'" /></a> ';
+                            $block_content .= '<a href="javascript:doTranslate(\''.variable_get('gtranslate_main_lang', 'en').'|'.$lang.'\')" title="'.$lang_name.'" class="flag" style="font-size:'.variable_get('gtranslate_flag_size', '16').'px;padding:1px 0;background-repeat:no-repeat;background-position:-'.($i*100).'px -'.($j*100).'px;"><img src="'.base_path().'/sites/all/modules/gtrans/gtranslate_files/blank.png" height="'.variable_get('gtranslate_flag_size', '16').'" width="'.variable_get('gtranslate_flag_size', '16').'" style="border:0;vertical-align:top;" alt="'.$lang_name.'" /></a> ';
                         }
 
                         if($i == 7) {
@@ -191,7 +185,7 @@
                                 default: break;
                             }
 
-                            $block_content .= '<option value="'.$from_language.'|'.$lang.'" style="'.($lang == $from_language ? 'font-weight:bold;' : '').'background:url(\'' . $module_dir . '/gtranslate_files/16l.png\') no-repeat scroll 0 -'.($i*16).'px;padding-left:18px;">'.$lang_name.'</option>';
+                            $block_content .= '<option value="'.variable_get('gtranslate_main_lang', 'en').'|'.$lang.'" style="'.($lang == variable_get('gtranslate_main_lang', 'en') ? 'font-weight:bold;' : '').'background:url(\''.base_path().'/sites/all/modules/gtrans/gtranslate_files/16l.png\') no-repeat scroll 0 -'.($i*16).'px;padding-left:18px;">'.$lang_name.'</option>';
                         }
 
                         $i++;