Changeset 6411 for trunk/include/functions_url.inc.php

Timestamp:

May 28, 2010, 9:58:51 PM (14 years ago)

Author:

rvelices

Message:

merge r6368,6410 from branch-2.1 to trunk

• merged the linkroot integration with the existing gallery_url (unique $confgallery_url used for RSS, mail homepage root in the browse path)
• added an option $confdebug_mail - if set all outgoing mails are saved into local_data_dir

File:

• trunk/include/functions_url.inc.php (modified) (2 diffs)

trunk/include/functions_url.inc.php

@@ -59 +59 @@
   if ($with_scheme)
   {
-    if (isset($_SERVER['HTTPS']) && 
+    if (isset($_SERVER['HTTPS']) &&
         ((strtolower($_SERVER['HTTPS']) == 'on') or ($_SERVER['HTTPS'] == 1)))
     {
@@ -728 +728 @@
 }
 
+/**
+ * Returns the 'home page' of this gallery
+ */
+function get_gallery_home_url()
+{
+  global $conf;
+  if (!empty($conf['gallery_url']))
+  {
+    if (url_is_remote($conf['gallery_url']) or strncmp($conf['gallery_url'], '/', 1)==0)
+    {
+      return $conf['gallery_url'];
+    }
+    return get_root_url().$conf['gallery_url'];
+  }
+  else
+  {
+    return make_index_url();
+  }
+}
 ?>