throw an exception rather than die()

[quix0rs-gnu-social.git] / lib / theme.php

diff --git a/lib/theme.php b/lib/theme.php
index bef660cbf538183dc6ac14e8ad0b77eee9415f07..2fe6ab69b7799cc19fd683a5e6c27adbfb2f96ad 100644 (file)
--- a/lib/theme.php
+++ b/lib/theme.php
@@ -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;
+}