X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Ftheme.php;h=08e3e85383b18fc92d5241891d1acb1dff8f57b0;hb=b4b992bca77d34b8643910e8d590b5be7fede94b;hp=bef660cbf538183dc6ac14e8ad0b77eee9415f07;hpb=2341f99224a0809a14bfb2832d9889ca3aceb6e2;p=quix0rs-gnu-social.git

diff --git a/lib/theme.php b/lib/theme.php
index bef660cbf5..08e3e85383 100644
--- a/lib/theme.php
+++ b/lib/theme.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Laconica, the distributed open-source microblogging tool
+ * StatusNet, the distributed open-source microblogging tool
  *
  * Utilities for theme files and paths
  *
@@ -20,15 +20,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @category  Paths
- * @package   Laconica
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
- * @copyright 2008 Control Yourself, Inc.
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
+ * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -43,10 +43,14 @@ if (!defined('LACONICA')) {
 
 function theme_file($relative, $theme=null)
 {
-    if (!$theme) {
+    if (empty($theme)) {
         $theme = common_config('site', 'theme');
     }
-    return INSTALLDIR.'/theme/'.$theme.'/'.$relative;
+    $dir = common_config('theme', 'dir');
+    if (empty($dir)) {
+        $dir = INSTALLDIR.'/theme';
+    }
+    return $dir.'/'.$theme.'/'.$relative;
 }
 
 /**
@@ -60,40 +64,31 @@ function theme_file($relative, $theme=null)
 
 function theme_path($relative, $theme=null)
 {
-    if (!$theme) {
+    if (empty($theme)) {
         $theme = common_config('site', 'theme');
     }
-    $server = common_config('theme', 'server');
-    if ($server) {
-        return 'http://'.$server.'/'.$theme.'/'.$relative;
-    } else {
-        return common_path('theme/'.$theme.'/'.$relative);
-    }
-}
 
-/**
- * Gets the full URL of a file in a skin dir based on its relative name
- *
- * @param string $relative relative path within the theme, skin directory
- * @param string $theme    name of the theme; defaults to current theme
- * @param string $skin    name of the skin; defaults to current theme
- *
- * @return string URL of the file
- */
+    $path = common_config('theme', 'path');
 
-function skin_path($relative, $theme=null, $skin=null)
-{
-    if (!$theme) {
-        $theme = common_config('site', 'theme');
+    if (empty($path)) {
+        $path = common_config('site', 'path') . '/theme/';
     }
-    if (!$skin) {
-        $skin = common_config('site', 'skin');
+
+    if ($path[strlen($path)-1] != '/') {
+        $path .= '/';
+    }
+
+    if ($path[0] != '/') {
+        $path = '/'.$path;
     }
+
     $server = common_config('theme', 'server');
-    if ($server) {
-        return 'http://'.$server.'/'.$theme.'/skin/'.$skin.'/'.$relative;
-    } else {
-        return common_path('theme/'.$theme.'/skin/'.$skin.'/'.$relative);
+
+    if (empty($server)) {
+        $server = common_config('site', 'server');
     }
-}
 
+    // XXX: protocol
+
+    return 'http://'.$server.$path.$theme.'/'.$relative;
+}