[pLog-svn] r3971 - plugins/branches/lifetype-1.1/sociable

[oscar at devel.lifetype.net]

Author: oscar
Date: 2006-09-15 18:50:08 +0000 (Fri, 15 Sep 2006)
New Revision: 3971

Modified:
   plugins/branches/lifetype-1.1/sociable/pluginsociable.class.php
Log:
fixed a problem with the '&' character being encoded twice when using plain URLs (see http://forums.lifetype.net/viewtopic.php?t=5039) as well as a problem with the links to images.


Modified: plugins/branches/lifetype-1.1/sociable/pluginsociable.class.php
===================================================================
--- plugins/branches/lifetype-1.1/sociable/pluginsociable.class.php	2006-09-15 05:50:06 UTC (rev 3970)
+++ plugins/branches/lifetype-1.1/sociable/pluginsociable.class.php	2006-09-15 18:50:08 UTC (rev 3971)
@@ -30,7 +30,7 @@
 
 	class PluginSociable extends PluginBase
 	{
-		var $pluginEnabled;
+		var $pluginEnabled;
 
 		
 		function PluginSociable()
@@ -77,7 +77,7 @@
     
                $rg = $this->blogInfo->getBlogRequestGenerator();
 
-	           $str .=  '<link rel="stylesheet" type="text/css" media="screen" href="' . $rg->blogLink() .'/plugins/sociable/class/sociable/sociable.css" />';
+	           $str .=  '<link rel="stylesheet" type="text/css" media="screen" href="' . $rg->getBaseUrl() .'/plugins/sociable/class/sociable/sociable.css" />';
             
             }	
             
@@ -88,10 +88,10 @@
 	    
 	    function show($postId)
 	    {
-            global $sociable_builtin_known_sites;
+            global $sociable_builtin_known_sites;
             
             global $sociable_plugin_extra_sites;
-        
+        
             
             include( PLOG_CLASS_PATH."plugins/sociable/class/sociable/sociable.php" );
         	include( PLOG_CLASS_PATH."plugins/sociable/class/extra/pluginsociableextrasites.inc.php" );
@@ -106,6 +106,7 @@
     
     
                 $rg = $this->blogInfo->getBlogRequestGenerator();
+				$rg->setXHTML( false );
                 $post = $articles->getBlogArticle($postId);
 	            $blogSettings = $this->blogInfo->getSettings();
    			    $locale =& $this->blogInfo->getLocale();
@@ -131,11 +132,11 @@
                     $url = str_replace('BLOGNAME', $blogname, $url);
  
                     $str .= "<a href=\"$url\" title=\"$sitename\">";
-                    $str .= '<img src="'. $rg->blogLink() .'/plugins/sociable/class/sociable/images/' . $site['favicon'] . '" alt="' . $sitename .'" />';
+                    $str .= '<img src="'. $rg->getBaseUrl() .'/plugins/sociable/class/sociable/images/' . $site['favicon'] . '" alt="' . $sitename .'" />';
                     $str .= "</a></li>\n";
 
                 }                
-
+
 		        foreach($sociable_plugin_extra_sites as $sitename=>$site)
 		        {
                     $siteEnabled = $blogSettings->getValue("plugin_sociable_" . $sitename . "_enabled");
@@ -149,7 +150,7 @@
                     $url = str_replace('BLOGNAME', $blogname, $url);
  
                     $str .= "<a href=\"$url\" title=\"$sitename\">";
-                    $str .= '<img src="'. $rg->blogLink() .'/plugins/sociable/class/extra/images/' . $site['favicon'] . '" alt="' . $sitename .'" />';
+                    $str .= '<img src="'. $rg->getBaseUrl() .'/plugins/sociable/class/extra/images/' . $site['favicon'] . '" alt="' . $sitename .'" />';
                     $str .= "</a></li>\n";
                 }                
              	$str .= "</ul></div>\n";
@@ -160,11 +161,11 @@
 		
 		function showAdmin()
 		{
-		      global $sociable_builtin_known_sites;
+		      global $sociable_builtin_known_sites;
 		      
 		      global $sociable_plugin_extra_sites;
 
-        	include( PLOG_CLASS_PATH."plugins/sociable/class/sociable/sociable.php" );
+        	include( PLOG_CLASS_PATH."plugins/sociable/class/sociable/sociable.php" );
             
         	include( PLOG_CLASS_PATH."plugins/sociable/class/extra/pluginsociableextrasites.inc.php" );
 
@@ -181,7 +182,7 @@
 		          $str .= '<div class="field">';
 		          $str .= '<label for="'. $sitename . '">'.$sitename .'</label>';
                   $str .= '<div class="formHelp">';
-                  $str .= '<img src="'. $rg->blogLink() .'/plugins/sociable/class/sociable/images/' . $site['favicon'] . '" alt="' . $sitename .'" />';
+                  $str .= '<img src="'. $rg->getBaseUrl() .'/plugins/sociable/class/sociable/images/' . $site['favicon'] . '" alt="' . $sitename .'" />';
                   $str .= '<input class="checkbox" type="checkbox" name="'. strtr($sitename, ".", "_") .'" id="'. strtr($sitename, ".", "_") .'"';
                   
                   $siteEnabled = $blogSettings->getValue("plugin_sociable_" . $sitename . "_enabled");
@@ -199,7 +200,7 @@
 		          $str .= '<div class="field">';
 		          $str .= '<label for="'. $sitename . '">'.$sitename .'</label>';
                   $str .= '<div class="formHelp">';
-                  $str .= '<img src="'. $rg->blogLink() .'/plugins/sociable/class/extra/images/' . $site['favicon'] . '" alt="' . $sitename .'" />';
+                  $str .= '<img src="'. $rg->getBaseUrl() .'/plugins/sociable/class/extra/images/' . $site['favicon'] . '" alt="' . $sitename .'" />';
                   $str .= '<input class="checkbox" type="checkbox" name="'. strtr($sitename, ".", "_") .'" id="'. strtr($sitename, ".", "_") .'"';
                   
                   $siteEnabled = $blogSettings->getValue("plugin_sociable_" . $sitename . "_enabled");