[Fusionforge-commits] FusionForge branch master updated. f016f3c879123d7483fa957034b3b95aba12e337

Franck Villaume nerville at fusionforge.org
Sun Oct 19 19:59:26 CEST 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  f016f3c879123d7483fa957034b3b95aba12e337 (commit)
      from  94035e01d055194a2004d60107bb8e088d320e23 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f016f3c879123d7483fa957034b3b95aba12e337
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sun Oct 19 19:57:12 2014 +0200

    deprecated function: htmlRedirect: use native session_redirect

diff --git a/src/common/include/plugins_utils.php b/src/common/include/plugins_utils.php
index 61b13a9..9163fbd 100644
--- a/src/common/include/plugins_utils.php
+++ b/src/common/include/plugins_utils.php
@@ -31,6 +31,8 @@ function isLogged(){
 	return session_loggedin();
 }
 
+
+// DEPRECATED: use session_redirect
 function htmlRedirect($url) {
 	session_redirect($url);
 }
@@ -51,7 +53,6 @@ function htmlIframe($url,$poub) {
 			jQuery(\'#'.$id.'\').iframeAutoHeight({heightOffset: 50});
 			jQuery(\'#'.$id.'\').load(function (){
 					if (this.contentWindow.location.href == "'.util_make_url('/projects/'.$project->getUnixName()).'/") {
-						console.log(this.contentWindow.location.href);
 						window.location.href = this.contentWindow.location.href;
 					};
 				});
diff --git a/src/plugins/forumml/www/index.php b/src/plugins/forumml/www/index.php
index 9bbccf4..da04e3e 100644
--- a/src/plugins/forumml/www/index.php
+++ b/src/plugins/forumml/www/index.php
@@ -54,7 +54,7 @@ if ($p && $plugin_manager->isPluginAvailable($p) && $p->isAllowed()) {
 		exit_error(_('Error'),_('No list specified'));
 	} else {
 		$list_id = $request->get('list');
-$list = new MailmanList($group_id,$list_id);
+		$list = new MailmanList($group_id,$list_id);
 		if (!isLogged() || ($list->isPublic()!=1 && !$current_user->isMember($group_id))) {
 			exit_error(_('Error'),_('You are not allowed to access this page'));
 		}
@@ -75,7 +75,7 @@ $list = new MailmanList($group_id,$list_id);
 			$return = plugin_forumml_process_mail($p);
 			if ($return) {
 				$feedback .=_('There can be some delay before to see the message in the archives.')._(' Redirecting to archive page, please wait ...');
-				//htmlRedirect('/plugins/forumml/message.php?'. http_build_query(array(
+				//session_redirect('/plugins/forumml/message.php?'. http_build_query(array(
 				//    'group_id' => $group_id,
 				//    'list'     => $list_id,
 				    //'topic'    => 0
@@ -131,5 +131,5 @@ $list = new MailmanList($group_id,$list_id);
 	mail_footer($params);
 
 } else {
-	header('Location: '.get_server_url());
+	session_redirect(get_server_url());
 }
diff --git a/src/plugins/forumml/www/message.php b/src/plugins/forumml/www/message.php
index 5a323b1..c1523de 100644
--- a/src/plugins/forumml/www/message.php
+++ b/src/plugins/forumml/www/message.php
@@ -115,7 +115,7 @@ if ($p && $plugin_manager->isPluginAvailable($p) && $p->isAllowed()) {
 		$ret = plugin_forumml_process_mail($p,true);
 		if ($ret) {
 			$feedback .=_('Email succefully sent. It can take some time before being displayed');
-			//htmlRedirect('/plugins/forumml/message.php?'. http_build_query(array(
+			//session_redirect('/plugins/forumml/message.php?'. http_build_query(array(
 			//    'group_id' => $group_id,
 			//    'list'     => $list_id,
 			//    'topic'    => $topic
@@ -215,5 +215,5 @@ if ($p && $plugin_manager->isPluginAvailable($p) && $p->isAllowed()) {
 	mail_footer($params);
 
 } else {
-	header('Location: '.get_server_url());
+	session_redirect(get_server_url());
 }
diff --git a/src/plugins/forumml/www/upload.php b/src/plugins/forumml/www/upload.php
index 9ab5ef5..8d12548 100644
--- a/src/plugins/forumml/www/upload.php
+++ b/src/plugins/forumml/www/upload.php
@@ -84,7 +84,7 @@ echo $attch['file_path'];
     } else {
 		$feedback.= _('Error: Missing parameter');
     }
-    htmlRedirect('/plugins/forumml/message.php?group_id='.$groupId.'&list='.$list_id.'&topic='.$topic);
+    session_redirect('/plugins/forumml/message.php?group_id='.$groupId.'&list='.$list_id.'&topic='.$topic);
 } else {
-	header('Location: '.get_server_url());
+	session_redirect(get_server_url());
 }
diff --git a/src/plugins/mailman/include/MailmanList.class.php b/src/plugins/mailman/include/MailmanList.class.php
index 8bbfe57..3c0564c 100644
--- a/src/plugins/mailman/include/MailmanList.class.php
+++ b/src/plugins/mailman/include/MailmanList.class.php
@@ -372,7 +372,7 @@ class MailmanList extends Error {
 				$this->setError(_('Update failed')._(': ').db_error());
 				return false;
 			}
-			htmlRedirect('/plugins/mailman/index.php?group_id='.$this->Group->getId());
+			session_redirect('/plugins/mailman/index.php?group_id='.$this->Group->getId());
 		}
 
 	}
@@ -389,7 +389,7 @@ class MailmanList extends Error {
 			$this->setError(_('Update failed')._(': ').db_error());
 			return false;
 		}
-		htmlRedirect('/plugins/mailman/index.php?group_id='.$this->Group->getId());
+		session_redirect('/plugins/mailman/index.php?group_id='.$this->Group->getId());
 	}
 	/**
 	 *	isMonitoring - See if the current user is in the list of people monitoring the forum.
diff --git a/src/plugins/mailman/include/MailmanListFactory.class.php b/src/plugins/mailman/include/MailmanListFactory.class.php
index 6756cda..511a5d8 100644
--- a/src/plugins/mailman/include/MailmanListFactory.class.php
+++ b/src/plugins/mailman/include/MailmanListFactory.class.php
@@ -166,7 +166,7 @@ class MailmanListFactory extends Error {
 		if (!$result) {
 			return false;
 		}
-		htmlRedirect('/plugins/mailman/index.php?group_id='.$this->Group->getId());
+		session_redirect('/plugins/mailman/index.php?group_id='.$this->Group->getId());
 		return $result;
 	}
 
diff --git a/src/plugins/mailman/www/admin/index.php b/src/plugins/mailman/www/admin/index.php
index 02f1b6d..4397ebe 100644
--- a/src/plugins/mailman/www/admin/index.php
+++ b/src/plugins/mailman/www/admin/index.php
@@ -54,7 +54,7 @@ if ($group_id) {
 		}
 		$mailingList->recreate();
 		$feedback .=_('List re-created');
-		htmlRedirect('/plugins/mailman/index.php?group_id='.$group_id);
+		session_redirect('/plugins/mailman/index.php?group_id='.$group_id);
 
 	}
 
diff --git a/src/www/widgets/updatelayout.php b/src/www/widgets/updatelayout.php
index 090e385..d741768 100644
--- a/src/www/widgets/updatelayout.php
+++ b/src/www/widgets/updatelayout.php
@@ -122,5 +122,5 @@ if ($owner) {
 	}
 }
 if (!$request->isAjax()) {
-	htmlRedirect($redirect);
+	session_redirect($redirect);
 }
diff --git a/src/www/widgets/widget.php b/src/www/widgets/widget.php
index 8c08ca7..6002c14 100644
--- a/src/www/widgets/widget.php
+++ b/src/www/widgets/widget.php
@@ -111,5 +111,5 @@ if ($request->valid($vOwner)) {
 	}
 }
 if (!$request->isAjax()) {
-	htmlRedirect($redirect);
+	session_redirect($redirect);
 }

-----------------------------------------------------------------------

Summary of changes:
 src/common/include/plugins_utils.php                     |    3 ++-
 src/plugins/forumml/www/index.php                        |    6 +++---
 src/plugins/forumml/www/message.php                      |    4 ++--
 src/plugins/forumml/www/upload.php                       |    4 ++--
 src/plugins/mailman/include/MailmanList.class.php        |    4 ++--
 src/plugins/mailman/include/MailmanListFactory.class.php |    2 +-
 src/plugins/mailman/www/admin/index.php                  |    2 +-
 src/www/widgets/updatelayout.php                         |    2 +-
 src/www/widgets/widget.php                               |    2 +-
 9 files changed, 15 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list