From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthieu Moy Subject: [PATCH 2/3] Coding style Date: Thu, 14 Jun 2012 10:57:22 +0200 Message-ID: <1339664243-31952-3-git-send-email-Matthieu.Moy@imag.fr> References: <1339607025-22725-1-git-send-email-simon.cathebras@ensimag.imag.fr> <1339664243-31952-1-git-send-email-Matthieu.Moy@imag.fr> Cc: Simon.Cathebras@ensimag.imag.fr, Julien.Khayat@ensimag.imag.fr, Simon.Perrat@ensimag.imag.fr, Charles.Roussel@ensimag.imag.fr, Guillaume.Sasdy@ensimag.imag.fr, Matthieu Moy To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Thu Jun 14 10:58:03 2012 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Sf5sN-0000VL-6C for gcvg-git-2@plane.gmane.org; Thu, 14 Jun 2012 10:57:59 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755387Ab2FNI5s (ORCPT ); Thu, 14 Jun 2012 04:57:48 -0400 Received: from mx1.imag.fr ([129.88.30.5]:52590 "EHLO shiva.imag.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755028Ab2FNI5o (ORCPT ); Thu, 14 Jun 2012 04:57:44 -0400 Received: from mail-veri.imag.fr (mail-veri.imag.fr [129.88.43.52]) by shiva.imag.fr (8.13.8/8.13.8) with ESMTP id q5E8vb2K029489 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO); Thu, 14 Jun 2012 10:57:37 +0200 Received: from bauges.imag.fr ([129.88.7.32]) by mail-veri.imag.fr with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1Sf5s1-0007N5-59; Thu, 14 Jun 2012 10:57:37 +0200 Received: from moy by bauges.imag.fr with local (Exim 4.72) (envelope-from ) id 1Sf5s1-0008K9-3U; Thu, 14 Jun 2012 10:57:37 +0200 X-Mailer: git-send-email 1.7.11.rc0.57.g84a04c7 In-Reply-To: <1339664243-31952-1-git-send-email-Matthieu.Moy@imag.fr> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.0.1 (shiva.imag.fr [129.88.30.5]); Thu, 14 Jun 2012 10:57:38 +0200 (CEST) X-IMAG-MailScanner-Information: Please contact MI2S MIM for more information X-MailScanner-ID: q5E8vb2K029489 X-IMAG-MailScanner: Found to be clean X-IMAG-MailScanner-SpamCheck: X-IMAG-MailScanner-From: moy@imag.fr MailScanner-NULL-Check: 1340269059.92321@dQOsG8oDzfyRbeBEW95riA Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Signed-off-by: Matthieu Moy --- contrib/mw-to-git/t/install-wiki/db_install.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/contrib/mw-to-git/t/install-wiki/db_install.php b/contrib/mw-to-git/t/install-wiki/db_install.php index 3111c73..b34772a 100644 --- a/contrib/mw-to-git/t/install-wiki/db_install.php +++ b/contrib/mw-to-git/t/install-wiki/db_install.php @@ -10,7 +10,6 @@ * In order to generate a SQLite database file, MediaWiki ask the user * to submit some forms in its web browser. This script simulates this * behavior though the functions and - * */ $argc = $_SERVER['argc']; $argv = $_SERVER['argv']; @@ -22,7 +21,7 @@ $port = $argv[5]; $url = 'http://localhost:'.$port.'/wiki/mw-config/index.php'; $db_dir = urlencode($tmp); -$tmp_cookie = tempnam($tmp,"COOKIE_"); +$tmp_cookie = tempnam($tmp, "COOKIE_"); /* * Fetchs a page with cURL. */ @@ -33,13 +32,13 @@ function get ($page_name = "") { $page_name_add = '?page='.$page_name; } $url = $GLOBALS['url'].$page_name_add; - $tmp_cookie=$GLOBALS['tmp_cookie']; + $tmp_cookie = $GLOBALS['tmp_cookie']; curl_setopt($curl, CURLOPT_COOKIEJAR, $tmp_cookie); curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true); curl_setopt($curl, CURLOPT_COOKIEFILE, $tmp_cookie); curl_setopt($curl, CURLOPT_HEADER, true); - curl_setopt($curl, CURLOPT_URL,$url); + curl_setopt($curl, CURLOPT_URL, $url); $page = curl_exec($curl); curl_close($curl); @@ -75,7 +74,6 @@ function submit($page_name, $option = "") { * submitting forms to generates the database file. * Note this simulation was made for the MediaWiki version 1.19.0, * we can't assume it works with other versions. - * */ $page = get(); -- 1.7.11.rc0.57.g84a04c7