Fixed some bugs

Author: pH-7

inc/conf.const.php

@@ -22,4 +22,4 @@
 define('DATA_PATH', ROOT_PATH . 'data/');
 
 define('ROOT_URL', PROT_URL . $_SERVER['HTTP_HOST'] . SELF);
-define('STATIC_URL', ROOT_URL . 'static/');
+define('STATIC_URL', RELATIVE . 'static/');

inc/scripts/fns.html.php

@@ -22,7 +22,7 @@ function get_links_html() {
         $sLink = htmlentities(str_replace(array('.tpl', DATA_PATH, LANG . '/'), '', $sLink));
         $sName = ucfirst(str_replace(array('/', '-'), array('', ' '), $sLink));
 
-        $sHtml .= '<li>' . $i++ . ') <a href="' . ROOT_URL . LANG . '/' . $sLink . '" title="' . $sName . '">' . $sName . '</a>.</li>';
+        $sHtml .= '<li>' . $i++ . ') <a href="' . RELATIVE . LANG . '/' . $sLink . '" title="' . $sName . '" data-load="ajax">' . $sName . '</a>.</li>';
     }
 
     $sHtml .= '</ul>';
@@ -41,7 +41,7 @@ function get_langs_html() {
 
     foreach ($aLangs as $sLang) {
         if($sLang === LANG) continue;
-        $sHtml .= '<a href="' . ROOT_URL . substr($sLang,0,2) . '"><img src="' . STATIC_URL . 'img/flags/' . $sLang . '.gif" alt="' . $aLangsList[$sLang] . '" title="' . $aLangsList[$sLang] . '" /></a>';
+        $sHtml .= '<a href="' . RELATIVE . substr($sLang,0,2) . '" data-load="ajax"><img src="' . STATIC_URL . 'img/flags/' . $sLang . '.gif" alt="' . $aLangsList[$sLang] . '" title="' . $aLangsList[$sLang] . '" /></a>&nbsp;';
     }
 
     return $sHtml;

inc/scripts/fns.php

@@ -14,8 +14,8 @@
  * @return string The first two lowercase letter of the browser language.
  */
 function get_browser_lang() {
-         $lang = explode(',' ,@$_SERVER['HTTP_ACCEPT_LANGUAGE']);
-         return htmlspecialchars(strtolower(substr(chop($lang[0]), 0, 2)));
+    $lang = explode(',' ,@$_SERVER['HTTP_ACCEPT_LANGUAGE']);
+    return htmlspecialchars(strtolower(substr(chop($lang[0]), 0, 2)));
 }
 
 /**
@@ -41,7 +41,7 @@ function get_page($sPage) {
  * @return string The text parsed.
  */
 function parse_var($sContent) {
-    $sContent = str_replace('{site_url}', ROOT_URL, $sContent);
+    $sContent = str_replace('{site_url}', RELATIVE, $sContent);
     $sContent = str_replace('{static_url}', STATIC_URL, $sContent);
     $sContent = str_replace('{tpl_name}', TPL, $sContent);
     $sContent = str_replace('{menu_links}', get_links_html(), $sContent);
@@ -90,25 +90,25 @@ function get_current_url() {
  * @return string The language available.
  */
 function set_lang() {
-       if(!empty($_GET['l']) && is_file(DATA_PATH . $_GET['l'] . '/core/welcome.tpl') && is_file(DATA_PATH . $_GET['l'] . '/core/404-error.tpl'))
-       {
-         setcookie('pH7_doc_lang', $_GET['l'], time()+60*60*24*365, null, null, false, true);
-         $sLang = $_GET['l'];
-       }
-       elseif (isset($_COOKIE['pH7_doc_lang']) && is_dir(DATA_PATH . $_COOKIE['pH7_doc_lang'] . '/core/'))
-       {
-         $sLang = $_COOKIE['pH7_doc_lang'];
-       }
-       elseif(is_dir(DATA_PATH . get_browser_lang() . '/core/'))
-       {
-         $sLang = get_browser_lang();
-       }
-       else
-       {
-         $sLang = DEF_LANG;
-       }
+    if(!empty($_GET['l']) && is_file(DATA_PATH . $_GET['l'] . '/core/welcome.tpl') && is_file(DATA_PATH . $_GET['l'] . '/core/404-error.tpl'))
+    {
+        setcookie('pH7_doc_lang', $_GET['l'], time()+60*60*24*365, null, null, false, true);
+        $sLang = $_GET['l'];
+    }
+    elseif (isset($_COOKIE['pH7_doc_lang']) && is_dir(DATA_PATH . $_COOKIE['pH7_doc_lang'] . '/core/'))
+    {
+        $sLang = $_COOKIE['pH7_doc_lang'];
+    }
+    elseif(is_dir(DATA_PATH . get_browser_lang() . '/core/'))
+    {
+        $sLang = get_browser_lang();
+    }
+    else
+    {
+        $sLang = DEF_LANG;
+    }
 
-       return $sLang;
+    return $sLang;
 }
 
 /**

static/js/ajph.js

@@ -19,7 +19,7 @@ $(document).ready(function() {
 });
 
 function doPager() {
- $('article a, footer a, a#logo').click(function(e) {
+ $('a[data-load=ajax]').click(function(e) {
   e.preventDefault();
   $('#ajph').html("<div id='loading'>Loading...</div>");
   loadPage($(this).attr('href'));

themes/base/tpl/header.tpl

@@ -11,7 +11,7 @@
   <div class="center" id="block">
 
          <header>
-           <h1><a id="logo" href="{site_url}">pH</a></h1>
+           <h1><a id="logo" href="{site_url}" data-load="ajax">pH</a></h1>
          </header>
 
       <div id="ajph">