From 05eebb8c9d35372291db1fa94aed342cccf1b3e6 Mon Sep 17 00:00:00 2001
From: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
Date: Wed, 12 Sep 2007 10:31:22 -0400
Subject: [PATCH] WEBSITE: Oops, fix index.php. Use the good filename in
get_git_hash() + protect.
Structure update (page_build, page_discuss, Build.txt).
Update Build.txt
---
doc/Build.txt | 22 ++++++++--------------
www/index.php | 7 +++++++
www/sflphone.funcs.php | 2 +-
www/templates/page_build.php | 2 --
www/templates/page_discuss.php | 1 -
5 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/doc/Build.txt b/doc/Build.txt
index 3debaf2426..cde1429c16 100644
--- a/doc/Build.txt
+++ b/doc/Build.txt
@@ -2,22 +2,15 @@
Build notes
------------
+===========
sflphoned
-~~~~~~~~~
+---------
Instructions to build `sflphoned`:
----------------------------------
-autoreconf --install
-make
-sudo make install
----------------------------------
-
-
dbus-c++-bindings
-^^^^^^^^^^^^^^^^^
+~~~~~~~~~~~~~~~~~
Go to `libs/dbus` and run:
@@ -32,7 +25,7 @@ NOTE: If you have `colorgcc`, configure will *fail* on `libeXpat`. Issue an `uns
libiax2
-^^^^^^^
+~~~~~~~
Go to `libs/libiax2` and run:
@@ -43,11 +36,12 @@ sudo make install
-------------------------
the daemon
-^^^^^^^^^^
+~~~~~~~~~~
Then, go to the root of the repository, and run:
---------------------------------------------------
+autoreconf --install
./configure --prefix=/usr (or whatever your prefix)
make
sudo make install
@@ -55,13 +49,13 @@ sudo make install
sflphone-qt
-~~~~~~~~~~~
+-----------
`sflphone-qt` is *deprecated* and should not be built anymore.
sflphone-gtk
-~~~~~~~~~~~~
+------------
Compile `sflphone-gtk` by running:
diff --git a/www/index.php b/www/index.php
index f9c3c09650..cec9d06402 100644
--- a/www/index.php
+++ b/www/index.php
@@ -30,6 +30,13 @@ if (isset($_REQUEST['img'])) {
exit();
}
+if (isset($_REQUEST['file'])) {
+ include("header.php");
+ show_page($_REQUEST['file']);
+ include("footer.php");
+ exit();
+}
+
$module = '';
// Default module: home
diff --git a/www/sflphone.funcs.php b/www/sflphone.funcs.php
index 026125334e..ba285613f2 100644
--- a/www/sflphone.funcs.php
+++ b/www/sflphone.funcs.php
@@ -241,7 +241,7 @@ function get_git_hash($file) {
$output = array();
- $cmd = "cd $GIT_REPOS; git-ls-tree $branch \"".git_filename($file)."\"";
+ $cmd = "cd $GIT_REPOS; git-ls-tree $branch \"".git_filename($split[0])."\"";
$string = exec($cmd, $output);
diff --git a/www/templates/page_build.php b/www/templates/page_build.php
index 9f90e9ffff..f225c12ceb 100644
--- a/www/templates/page_build.php
+++ b/www/templates/page_build.php
@@ -1,3 +1 @@
-<h1>Build instructions</h1>
-
<?php show_page('Build.txt'); ?>
diff --git a/www/templates/page_discuss.php b/www/templates/page_discuss.php
index 4681de8f7f..ab46cdfed0 100644
--- a/www/templates/page_discuss.php
+++ b/www/templates/page_discuss.php
@@ -1,6 +1,5 @@
<?php show_page('MailingLists.txt'); ?>
-
<?php show_page('IRC.txt'); ?>
--
GitLab