From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QhoXV-0006Tc-Sb for garchives@archives.gentoo.org; Fri, 15 Jul 2011 19:59:10 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D37A821C0A6; Fri, 15 Jul 2011 19:59:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A01DB21C0A6 for ; Fri, 15 Jul 2011 19:59:01 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 19A021B4069 for ; Fri, 15 Jul 2011 19:59:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 48BD58003D for ; Fri, 15 Jul 2011 19:59:00 +0000 (UTC) From: "Liam McLoughlin" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Liam McLoughlin" Message-ID: Subject: [gentoo-commits] proj/gentoaster:webui commit in: web/ X-VCS-Repository: proj/gentoaster X-VCS-Files: web/process.php X-VCS-Directories: web/ X-VCS-Committer: hexxeh X-VCS-Committer-Name: Liam McLoughlin X-VCS-Revision: d8ab9fad2e88341c8c6cc7c2913ea74625fbe9d2 Date: Fri, 15 Jul 2011 19:59:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: b7d12caf2e11e874db11cdc018aea492 commit: d8ab9fad2e88341c8c6cc7c2913ea74625fbe9d2 Author: Liam McLoughlin hexxeh net> AuthorDate: Fri Jul 15 19:58:22 2011 +0000 Commit: Liam McLoughlin hexxeh net> CommitDate: Fri Jul 15 19:58:22 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoaster.gi= t;a=3Dcommit;h=3Dd8ab9fad Handle \r\n when building the configuration file --- web/process.php | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/web/process.php b/web/process.php index 149c1b7..1b68d03 100644 --- a/web/process.php +++ b/web/process.php @@ -11,10 +11,10 @@ $root_password =3D escapeshellarg($_POST["rootpassword"]); $packages_list =3D escapeshellarg($_POST["packages"]); $output_format =3D escapeshellarg($_POST["format"]); -=09 -=09 + + $packages_list =3D str_replace("\r\n", " ", $packages_list); $packages_list =3D str_replace("\n", " ", $packages_list); -=09 + $ini_string =3D "[vmconfig] =20 BUILD_ID=3D'$build_id' @@ -36,11 +36,11 @@ OUTPUT_FORMAT=3D$output_format"; $client =3D new GearmanClient(); $client->addServer(); $handle =3D $client->doBackground("invoke_image_build", $ini_string); - =09 + $db =3D mysql_connect("localhost","gentoaster",""); if(!$db) die("Could not connect to database ".mysql_error()); mysql_select_db("gentoaster"); mysql_query("INSERT INTO builds (id, handle) VALUES('".$build_id."','".= $handle."')"); =20 header("Location: finished.php?uuid=3D".$build_id); -?> \ No newline at end of file +?> From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Qs0zl-00047m-8a for garchives@archives.gentoo.org; Fri, 12 Aug 2011 23:18:29 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B517521C20C; Fri, 12 Aug 2011 23:17:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8850121C20C for ; Fri, 12 Aug 2011 23:17:55 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 84E531B4023 for ; Fri, 12 Aug 2011 23:17:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id D253F80044 for ; Fri, 12 Aug 2011 23:17:53 +0000 (UTC) From: "Liam McLoughlin" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Liam McLoughlin" Message-ID: Subject: [gentoo-commits] proj/gentoaster:master commit in: web/ X-VCS-Repository: proj/gentoaster X-VCS-Files: web/process.php X-VCS-Directories: web/ X-VCS-Committer: hexxeh X-VCS-Committer-Name: Liam McLoughlin X-VCS-Revision: d8ab9fad2e88341c8c6cc7c2913ea74625fbe9d2 Date: Fri, 12 Aug 2011 23:17:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: d435fd3b0e60f2dfedc89e4f91ad50f2 Message-ID: <20110812231753.Ux0sRNdBsqJIMmN_IrftHZQzU5j0Mi10bd-sJrAB5XM@z> commit: d8ab9fad2e88341c8c6cc7c2913ea74625fbe9d2 Author: Liam McLoughlin hexxeh net> AuthorDate: Fri Jul 15 19:58:22 2011 +0000 Commit: Liam McLoughlin hexxeh net> CommitDate: Fri Jul 15 19:58:22 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoaster.gi= t;a=3Dcommit;h=3Dd8ab9fad Handle \r\n when building the configuration file --- web/process.php | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/web/process.php b/web/process.php index 149c1b7..1b68d03 100644 --- a/web/process.php +++ b/web/process.php @@ -11,10 +11,10 @@ $root_password =3D escapeshellarg($_POST["rootpassword"]); $packages_list =3D escapeshellarg($_POST["packages"]); $output_format =3D escapeshellarg($_POST["format"]); -=09 -=09 + + $packages_list =3D str_replace("\r\n", " ", $packages_list); $packages_list =3D str_replace("\n", " ", $packages_list); -=09 + $ini_string =3D "[vmconfig] =20 BUILD_ID=3D'$build_id' @@ -36,11 +36,11 @@ OUTPUT_FORMAT=3D$output_format"; $client =3D new GearmanClient(); $client->addServer(); $handle =3D $client->doBackground("invoke_image_build", $ini_string); - =09 + $db =3D mysql_connect("localhost","gentoaster",""); if(!$db) die("Could not connect to database ".mysql_error()); mysql_select_db("gentoaster"); mysql_query("INSERT INTO builds (id, handle) VALUES('".$build_id."','".= $handle."')"); =20 header("Location: finished.php?uuid=3D".$build_id); -?> \ No newline at end of file +?>