[Fusionforge-commits] r10690 - in trunk/src: common/include common/widget www/include

Roland Mas lolando at libremir.placard.fr.eu.org
Sat Sep 25 17:29:08 CEST 2010


Author: lolando
Date: 2010-09-25 17:29:08 +0200 (Sat, 25 Sep 2010)
New Revision: 10690

Added:
   trunk/src/common/include/plugins_utils.php
Removed:
   trunk/src/www/include/plugins_utils.php
Modified:
   trunk/src/common/widget/WidgetLayoutManager.class.php
   trunk/src/common/widget/Widget_MyBookmarks.class.php
Log:
Also moved plugins_utils, and fixed a few includes

Copied: trunk/src/common/include/plugins_utils.php (from rev 10689, trunk/src/www/include/plugins_utils.php)
===================================================================
--- trunk/src/common/include/plugins_utils.php	                        (rev 0)
+++ trunk/src/common/include/plugins_utils.php	2010-09-25 15:29:08 UTC (rev 10690)
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright 2010 (c) Mélanie Le Bail
+ * http://fusionforge.org
+ *
+ * This file is part of FusionForge.
+ *
+ * FusionForge is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * FusionForge is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FusionForge; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+$GLOBALS['mailman_bin_dir'] =  '/usr/lib/mailman/bin';
+$GLOBALS['mailman_lib_dir'] = '/var/lib/mailman';
+$GLOBALS['forumml_arch'] = '/var/lib/mailman/archives';
+$GLOBALS['forumml_tmp'] = '/var/spool/forumml';
+$GLOBALS['forumml_dir'] = '/var/lib/gforge/forumml';
+$GLOBALS['sys_lf'] = "\n"; 
+
+function isLogged(){
+        
+        return session_loggedin();
+}
+
+function htmlRedirect($url) {
+        session_redirect($url);
+}
+function htmlIframe($url,$poub) {
+        if (isset($poub['id'])) {
+                $id=$poub['id'];
+        }
+        else {
+                $id='';
+        }
+        echo ('<iframe src= "'.$url.'" id="'.$id.'" width=100% height=500px></iframe>');
+}
+    
+function helpButton($help) {
+
+}
+function getIcon($url,$w=16,$h=16,$args=array()) {
+        echo html_image($url,$w,$h,$args); 
+}   
+function getImage($img) {
+        echo util_make_url($GLOBALS['HTML']->imgroot.$img);
+
+}
+function get_server_url() {
+        return util_make_url();
+}
+?>

Modified: trunk/src/common/widget/WidgetLayoutManager.class.php
===================================================================
--- trunk/src/common/widget/WidgetLayoutManager.class.php	2010-09-25 15:22:22 UTC (rev 10689)
+++ trunk/src/common/widget/WidgetLayoutManager.class.php	2010-09-25 15:29:08 UTC (rev 10690)
@@ -20,7 +20,7 @@
 
 require_once('common/widget/WidgetLayout.class.php');
 require_once('common/widget/Widget.class.php');
-require_once('preplugins.php');
+require_once $gfcommon.'include/preplugins.php';
 /**
  * WidgetLayoutManager
  * 

Modified: trunk/src/common/widget/Widget_MyBookmarks.class.php
===================================================================
--- trunk/src/common/widget/Widget_MyBookmarks.class.php	2010-09-25 15:22:22 UTC (rev 10689)
+++ trunk/src/common/widget/Widget_MyBookmarks.class.php	2010-09-25 15:29:08 UTC (rev 10690)
@@ -19,7 +19,7 @@
  */
 
 require_once('Widget.class.php');
-require_once('plugins_utils.php');
+require_once $gfcommon.'include/plugins_utils.php';
 
 /**
 * Widget_MyBookmarks

Deleted: trunk/src/www/include/plugins_utils.php
===================================================================
--- trunk/src/www/include/plugins_utils.php	2010-09-25 15:22:22 UTC (rev 10689)
+++ trunk/src/www/include/plugins_utils.php	2010-09-25 15:29:08 UTC (rev 10690)
@@ -1,61 +0,0 @@
-<?php
-/**
- * Copyright 2010 (c) Mélanie Le Bail
- * http://fusionforge.org
- *
- * This file is part of FusionForge.
- *
- * FusionForge is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * FusionForge is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with FusionForge; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-$GLOBALS['mailman_bin_dir'] =  '/usr/lib/mailman/bin';
-$GLOBALS['mailman_lib_dir'] = '/var/lib/mailman';
-$GLOBALS['forumml_arch'] = '/var/lib/mailman/archives';
-$GLOBALS['forumml_tmp'] = '/var/spool/forumml';
-$GLOBALS['forumml_dir'] = '/var/lib/gforge/forumml';
-$GLOBALS['sys_lf'] = "\n"; 
-
-function isLogged(){
-        
-        return session_loggedin();
-}
-
-function htmlRedirect($url) {
-        session_redirect($url);
-}
-function htmlIframe($url,$poub) {
-        if (isset($poub['id'])) {
-                $id=$poub['id'];
-        }
-        else {
-                $id='';
-        }
-        echo ('<iframe src= "'.$url.'" id="'.$id.'" width=100% height=500px></iframe>');
-}
-    
-function helpButton($help) {
-
-}
-function getIcon($url,$w=16,$h=16,$args=array()) {
-        echo html_image($url,$w,$h,$args); 
-}   
-function getImage($img) {
-        echo util_make_url($GLOBALS['HTML']->imgroot.$img);
-
-}
-function get_server_url() {
-        return util_make_url();
-}
-?>




More information about the Fusionforge-commits mailing list