[Phpfreechat-svn] SF.net SVN: phpfreechat: [822] trunk

[<ke...@us...>]

Revision: 822
          http://svn.sourceforge.net/phpfreechat/?rev=822&view=rev
Author:   kerphi
Date:     2006-10-05 23:35:09 -0700 (Thu, 05 Oct 2006)

Log Message:
-----------
remive useless themeurl stuff : only themepath is necessary since proxy.php is used

Modified Paths:
--------------
    trunk/demo/demo21_with_hardcoded_urls.php
    trunk/src/pfcglobalconfig.class.php

Modified: trunk/demo/demo21_with_hardcoded_urls.php
===================================================================
--- trunk/demo/demo21_with_hardcoded_urls.php	2006-10-04 20:10:12 UTC (rev 821)
+++ trunk/demo/demo21_with_hardcoded_urls.php	2006-10-06 06:35:09 UTC (rev 822)
@@ -10,8 +10,6 @@
 $params["data_public_url"]   = "../data/public";
 $params["client_script_url"] = "./demo21_with_hardcoded_urls.php";
 $params["server_script_url"] = "./demo21_with_hardcoded_urls.php";
-$params["themeurl"]          = "../themes";
-$params["themeurl_default"]  = "../themes";
 
 // setup paths
 $params["container_type"]         = "File";

Modified: trunk/src/pfcglobalconfig.class.php
===================================================================
--- trunk/src/pfcglobalconfig.class.php	2006-10-04 20:10:12 UTC (rev 821)
+++ trunk/src/pfcglobalconfig.class.php	2006-10-06 06:35:09 UTC (rev 822)
@@ -87,9 +87,7 @@
   
   var $theme               = "default";
   var $themepath           = "";
-  var $themeurl            = "";
   var $themepath_default   = "";
-  var $themeurl_default    = "";
 
   var $language            = "";      // could be something in i18n/* directory ("" means the language is guess from the server config)
   var $output_encoding     = "UTF-8"; // could be ISO-8859-1 or anything else (which must be supported by iconv php module)
@@ -364,11 +362,6 @@
     // copy the themes into the public directory
     //    $this->errors = array_merge($this->errors, @install_dir($this->themepath_default, $this->data_public_path."/themes"));
     //    $this->errors = array_merge($this->errors, @install_dir($this->themepath,         $this->data_public_path."/themes"));
-    // calculate the corresponding theme url
-    if ($this->themeurl_default == "")
-      $this->themeurl_default = relativePath($this->client_script_path, $this->data_public_path."/themes");
-    if ($this->themeurl == "")
-      $this->themeurl         = relativePath($this->client_script_path, $this->data_public_path."/themes");
 
     
     // ---
@@ -463,7 +456,7 @@
         continue;
       else if (preg_match("/^([a-z_\-0-9]*(\.gif|\.png))(.*)$/i",$line,$res))
       {
-        $smiley_file = 'smileys/'.$res[1];//$this->getFileUrlFromTheme('smileys/'.$res[1]);
+        $smiley_file = 'smileys/'.$res[1];
         $smiley_str = trim($res[3])."\n";
         $smiley_str = str_replace("\n", "", $smiley_str);
         $smiley_str = str_replace("\t", " ", $smiley_str);
@@ -583,18 +576,7 @@
       else
 	die(_pfc("Error: '%s' could not be found, please check your themepath '%s' and your theme '%s' are correct", $file, $this->themepath, $this->theme));
   }
-  
-  function getFileUrlFromTheme($file)
-  {
-    if (file_exists($this->themepath."/".$this->theme."/".$file))
-      return $this->themeurl."/".$this->theme."/".$file;
-    else
-      if (file_exists($this->themepath_default."/default/".$file))
-	return $this->themeurl_default."/default/".$file;
-      else
-	die(_pfc("Error: '%s' could not be found, please check your themepath '%s' and your theme '%s' are correct", $file, $this->themepath, $this->theme));
-  }
-  
+    
   function getFilePathFromTheme($file)
   {
     if (file_exists($this->themepath."/".$this->theme."/".$file))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.