Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=a355024b9297c8a513142f2d2fdd4fcd252c66ca
commit a355024b9297c8a513142f2d2fdd4fcd252c66ca
Author: PacMiam <pacm...@gmx.fr>
Date: Fri Nov 15 11:38:45 2013 +0100
* Modify rewrite and config
diff --git a/frugalware/.htaccess b/frugalware/.htaccess
index 05fd828..29150f8 100644
--- a/frugalware/.htaccess
+++ b/frugalware/.htaccess
@@ -5,8 +5,8 @@
</Files>
RewriteEngine on
-RewriteCond %{REQUEST_URI} ^/news.php
-RewriteRule .* http://frugalware.org/news
+#RewriteCond %{REQUEST_URI} ^/news.php
+#RewriteRule .* http://frugalware.org/news
RewriteCond %{REQUEST_URI} !^/.*\.php
RewriteCond %{REQUEST_URI} !^/images
RewriteCond %{REQUEST_URI} !^/start
diff --git a/frugalware/header.php b/frugalware/header.php
index 50439b5..6f06590 100644
--- a/frugalware/header.php
+++ b/frugalware/header.php
@@ -15,24 +15,24 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta name="description" content="Frugalware Linux, a general purpose linux
distribution, designed for intermediate users."/>
<meta name="viewport" content="width=device-width; initial-scale=1.0;">
- <link rel="icon" href="/images/favicon.ico" />
+ <link rel="icon" href="<?php echo $fwng_root; ?>images/favicon.ico" />
<!-- RSS -->
- <link rel="alternate" type="application/rss+xml" title="Frugalware news"
href="/rss/news" />
- <link rel="alternate" type="application/rss+xml" title="Frugalware
packages" href="/rss/packages" />
+ <link rel="alternate" type="application/rss+xml" title="Frugalware news"
href="<?php echo $fwng_root; ?>rss/news" />
+ <link rel="alternate" type="application/rss+xml" title="Frugalware
packages" href="<?php echo $fwng_root; ?>rss/packages" />
<!-- CSS -->
- <link rel="stylesheet" type="text/css" media="screen"
href="/static/css/common.css" />
- <link rel="stylesheet" type="text/css" media="screen"
href="/static/css/common_medium.css" />
- <link rel="stylesheet" type="text/css" media="screen"
href="/static/css/common_mobile.css" />
- <link rel="stylesheet" type="text/css" media="screen"
href="/static/css/craftyslide.css" />
+ <link rel="stylesheet" type="text/css" media="screen" href="<?php echo
$fwng_root; ?>static/css/common.css" />
+ <link rel="stylesheet" type="text/css" media="screen" href="<?php echo
$fwng_root; ?>static/css/common_medium.css" />
+ <link rel="stylesheet" type="text/css" media="screen" href="<?php echo
$fwng_root; ?>static/css/common_mobile.css" />
+ <link rel="stylesheet" type="text/css" media="screen" href="<?php echo
$fwng_root; ?>static/css/craftyslide.css" />
- <link rel="stylesheet" href="/static/fancybox/jquery.fancybox-1.3.4.css"
type="text/css" media="screen" />
+ <link rel="stylesheet" href="<?php echo $fwng_root;
?>static/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
<!-- JavaScript -->
- <script type="text/javascript" src="/static/js/jquery.min.js"></script>
- <script type="text/javascript"
src="/static/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
- <script type="text/javascript" src="/static/js/craftyslide.js"></script>
+ <script type="text/javascript" src="<?php echo $fwng_root;
?>static/js/jquery.min.js"></script>
+ <script type="text/javascript" src="<?php echo $fwng_root;
?>static/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
+ <script type="text/javascript" src="<?php echo $fwng_root;
?>static/js/craftyslide.js"></script>
<script type="text/javascript">
$(document).ready(function() {
@@ -60,11 +60,11 @@
if(div.style.display=="none") {
div.style.display="block";
if (mode == 1)
- bouton.innerHTML="<img src=\"/images/icons/less.png\"
class=\"moreandless\" />";
+ bouton.innerHTML="<img src=\"<?php echo $fwng_root;
?>images/icons/less.png\" class=\"moreandless\" />";
} else {
div.style.display="none";
if (mode == 1)
- bouton.innerHTML="<img src=\"/images/icons/more.png\"
class=\"moreandless\" />";
+ bouton.innerHTML="<img src=\"<?php echo $fwng_root;
?>images/icons/more.png\" class=\"moreandless\" />";
}
}
function toggle_complete(bouton,id) {
@@ -83,7 +83,7 @@
<!-- HEADER -->
<header>
<a href="<?php echo $fwng_root; ?>">
- <img src="/images/frugalware.png" />
+ <img src="<?php echo $fwng_root; ?>images/frugalware.png" />
<span class="title"><?php echo $title; ?></span>
<span class="slogan"><?php echo $slogan; ?></span>
</a>
@@ -104,7 +104,7 @@
fwsidebox(gettext("Get Frugalware"), $data['download']);
// Packages
- fwsidebox("<a href=\"/rss/releases\"><img
src=\"/images/icons/rss.png\" width=\"16\" alt=\"\" /></a> " . gettext("Recent
updates"), $data['packages']);
+ fwsidebox("<a href=\"${fwng_root}rss/releases\"><img
src=\"${fwng_root}images/icons/rss.png\" width=\"16\" alt=\"\" /></a> " .
gettext("Recent updates"), $data['packages']);
// IRC
fwsidebox(gettext("IRC"), $data['irc']);
diff --git a/frugalware/lib/config.inc.php b/frugalware/lib/config.inc.php
index cd59812..4829a0b 100644
--- a/frugalware/lib/config.inc.php
+++ b/frugalware/lib/config.inc.php
@@ -12,7 +12,8 @@ $sqldb = "frugalware2";
# FWNG SETTINGS
// $myurl = "https://frugalware.org";;
-$myurl = ".";
+$protocol = strpos(strtolower($_SERVER['SERVER_PROTOCOL']),'https') === FALSE
? 'http' : 'https';
+$myurl = $protocol . "://" . $_SERVER['HTTP_HOST'];
$fwng_root = $myurl."/";
$adodb_path = "/usr/share/php";
$trans_path="/home/ftp/pub/other/translations/";
diff --git a/frugalware/rewrite.php b/frugalware/rewrite.php
index 1e767e4..5a52886 100644
--- a/frugalware/rewrite.php
+++ b/frugalware/rewrite.php
@@ -40,14 +40,14 @@ if(getllang($params[count($params)-1])!="")
// see if there is a page or we should default to news
if((count($params)==0) or (!in_array($params[0], $pages)))
$page="index";
-else
-{
- if($params[0]!="news")
- $page = $params[0];
- else
- $page = "news";
- array_shift($params);
-}
+// else
+// {
+ // if($params[0]!="news")
+ // $page = $params[0];
+ // else
+ // $page = "news";
+ // array_shift($params);
+// }
// do we have any parameter?
if(count($params)>0)
@@ -60,10 +60,10 @@ if(count($params)>0)
else if($page=="download")
// don't use $params[0] since the path can contain slashes
$urlsuffix="?url=".substr(trim(addslashes(stripslashes($_SERVER["PATH_INFO"])),
"/"), 9);
- else if($page=="index")
- {
- $urlsuffix="?id=".$params[0];
- }
+ // else if($page=="index")
+ // {
+ // $urlsuffix="?id=".$params[0];
+ // }
else if($page=="news")
{
$urlsuffix="?id=".$params[0];
@@ -119,7 +119,8 @@ if($_SERVER["QUERY_STRING"]!="")
}
// build the url
-$url="http://"; . $_SERVER["SERVER_NAME"] . "$fwng_root$page.php$urlsuffix";
+// $url="http://"; . $_SERVER["SERVER_NAME"] . "$fwng_root$page.php$urlsuffix";
+$url = $fwng_root . $page . ".php" . $urlsuffix;
if(isset($lang))
$lang = getlang($lang);
diff --git a/frugalware/static/donation.inc.html
b/frugalware/static/donation.inc.html
index 6cee832..1c25920 100644
--- a/frugalware/static/donation.inc.html
+++ b/frugalware/static/donation.inc.html
@@ -1,8 +1,8 @@
<div align="center" class="don">
<span class="banner">
- <a
href="https://www.paypal.com/hu/cgi-bin/webscr?cmd=_flow&SESSION=NRjdRAGhJD_scyU6-m-05HCI02GzLjFQ4s57QMtTJfBqCk1lBf8-D7VmzFS&dispatch=50a222a57771920b6a3d7b606239e4d529b525e0b7e69bf0224adecfb0124e9b61f737ba21b08198dbcfd9e439351aac748846c5173df4f4";
target="_blank"><img src="./images/banner/paypal.png" alt="Donation via
Paypal" title="Donation via Paypal" border="0" /></a>
+ <a
href="https://www.paypal.com/hu/cgi-bin/webscr?cmd=_flow&SESSION=NRjdRAGhJD_scyU6-m-05HCI02GzLjFQ4s57QMtTJfBqCk1lBf8-D7VmzFS&dispatch=50a222a57771920b6a3d7b606239e4d529b525e0b7e69bf0224adecfb0124e9b61f737ba21b08198dbcfd9e439351aac748846c5173df4f4";
target="_blank"><img src="https://frugalware.org/images/banner/paypal.png";
alt="Donation via Paypal" title="Donation via Paypal" border="0" /></a>
</span>
<span class="banner">
- <a
href="http://flattr.com/thing/269195/Frugalware-Linux"; target="_blank"><img
src="./images/banner/flattr.png" alt="Flattr this" title="Flattr this"
border="0" /></a>
+ <a
href="http://flattr.com/thing/269195/Frugalware-Linux"; target="_blank"><img
src="https://frugalware.org/images/banner/flattr.png"; alt="Flattr this"
title="Flattr this" border="0" /></a>
</span>
</div>
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
![https://frugalware.org/images/banner/paypal.png"](https://frugalware.org/images/banner/paypal.png"){kind=link}
![https://frugalware.org/images/banner/flattr.png"](https://frugalware.org/images/banner/flattr.png"){kind=link}