Kill ugly symlinks from banana sources to include/banana.

Also simplify includes: including banana is done by including
banana/hooks.inc.php.

You are highly encouraged to cleanup your working copy by running:
find include/banana/ -type l -delete

WARN: Tested only with the forums, ML moderation and ML archives are
not tested yet (requires list.rpc.py to be started).

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

diff --git a/Makefile b/Makefile
index 7d02b14..bd1093e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -146,16 +146,13 @@ spool/openid/store:
 ## banana
 ##
 
-banana: htdocs/images/banana htdocs/css/banana.css include/banana/banana.inc.php
+banana: htdocs/images/banana htdocs/css/banana.css
 htdocs/images/banana: banana-sub
        cd $(@D) && ln -snf ../../banana/img $(@F)
 
 htdocs/css/banana.css: banana-sub
        cd $(@D) && ln -snf ../../banana/css/style.css $(@F)
 
-include/banana/banana.inc.php: banana-sub
-       cd $(@D) && find ../../banana/banana/ -name '*.php' -exec ln -snf {} . ";"
-
 banana-sub:
        make -C banana
 
@@ -208,5 +205,6 @@ $(JQUERY_UI_PATHES): htdocs/javascript/jquery.ui.%.js: htdocs/javascript/jquery.
 
 ################################################################################
 
-.PHONY: build dist clean core wiki build-wiki banana banana-sub htdocs/images/banana htdocs/css/banana.css include/banana/banana.inc.php http* check test
-
+.PHONY: build dist clean core http* check test
+.PHONY: wiki build-wiki
+.PHONY: banana banana-sub htdocs/images/banana htdocs/css/banana.css

diff --git a/include/banana/.gitignore b/include/banana/.gitignore
deleted file mode 100644 (file)
index 7e05a01..0000000
--- a/include/banana/.gitignore
+++ /dev/null
@@ -1,15 +0,0 @@
-# Ignore banana stuff
-/banana.inc.php
-/feed.inc.php
-/mbox.inc.php
-/message.func.inc.php
-/message.inc.php
-/mimepart.inc.php
-/nntp.inc.php
-/nntpcore.inc.php
-/page.inc.php
-/protocoleinterface.inc.php
-/spool.inc.php
-/text.func.inc.php
-/tree.inc.php
-

diff --git a/include/banana/forum.inc.php b/include/banana/forum.inc.php
index e2f4b2d..0c54f45 100644 (file)
--- a/include/banana/forum.inc.php
+++ b/include/banana/forum.inc.php
@@ -19,7 +19,6 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-require_once 'banana/banana.inc.php';
 require_once 'banana/hooks.inc.php';
 
 function hook_checkcancel($_headers)

diff --git a/include/banana/hooks.inc.php b/include/banana/hooks.inc.php
index cd96304..9d42694 100644 (file)
--- a/include/banana/hooks.inc.php
+++ b/include/banana/hooks.inc.php
@@ -19,7 +19,8 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-require_once 'banana/banana.inc.php';
+require_once dirname(__FILE__) . '/../../banana/banana/banana.inc.php';
+require_once dirname(__FILE__) . '/../../banana/banana/message.func.inc.php';
 
 function hook_formatDisplayHeader($_header, $_text, $in_spool = false)
 {

diff --git a/include/banana/ml.inc.php b/include/banana/ml.inc.php
index e6dd670..2f0b722 100644 (file)
--- a/include/banana/ml.inc.php
+++ b/include/banana/ml.inc.php
@@ -19,7 +19,6 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-require_once 'banana/banana.inc.php';
 require_once 'banana/hooks.inc.php';
 
 class PlatalBananaMLPage extends PlatalBananaPage

diff --git a/include/banana/moderate.inc.php b/include/banana/moderate.inc.php
index cdbf6da..48cc59a 100644 (file)
--- a/include/banana/moderate.inc.php
+++ b/include/banana/moderate.inc.php
@@ -19,8 +19,6 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-require_once 'banana/banana.inc.php';
-require_once 'banana/message.func.inc.php';
 require_once 'banana/hooks.inc.php';
 
 function hook_checkcancel($_headers)

diff --git a/include/common.inc.php b/include/common.inc.php
index fdffbf4..1634dc7 100644 (file)
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -38,7 +38,7 @@ function __autoload($cls)
             include 'validations.inc.php';
             return;
         } else if (substr($cls, 0, 6) == 'banana') {
-            require_once 'banana/banana.inc.php';
+            require_once 'banana/hooks.inc.php';
             Banana::load(substr($cls, 6));
             return;
         }