From svnnotify ＠ sourceforge.jp  Mon Apr 11 23:20:18 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 11 Apr 2011 23:20:18 +0900
Subject: [Smartupload-svn] [1]
Message-ID: <1302531618.179798.28009.nullmailer@users.sourceforge.jp>

Revision: 1
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=1
Author:   hryksbt
Date:     2011-04-11 23:20:17 +0900 (Mon, 11 Apr 2011)

Log Message:
-----------


Added Paths:
-----------
    trunk/
    trunk/Documents/
    trunk/Documents/proposal/
    trunk/Documents/proposal/DigitalContentsUp&Down.ppt


-------------- next part --------------
Added: trunk/Documents/proposal/DigitalContentsUp&Down.ppt
===================================================================
(Binary files differ)


Property changes on: trunk/Documents/proposal/DigitalContentsUp&Down.ppt
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

From svnnotify ＠ sourceforge.jp  Sun Apr 17 08:56:00 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sun, 17 Apr 2011 08:56:00 +0900
Subject: [Smartupload-svn] [2]
Message-ID: <1302998160.235988.26049.nullmailer@users.sourceforge.jp>

Revision: 2
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=2
Author:   hryksbt
Date:     2011-04-17 08:55:59 +0900 (Sun, 17 Apr 2011)

Log Message:
-----------


Added Paths:
-----------
    trunk/SmartUpload/
    trunk/SmartUpload/.buildpath
    trunk/SmartUpload/.project
    trunk/SmartUpload/.settings/
    trunk/SmartUpload/.settings/org.eclipse.php.core.prefs
    trunk/SmartUpload/data/
    trunk/SmartUpload/data/06c69f2a.jpg
    trunk/SmartUpload/include/
    trunk/SmartUpload/include/database.php
    trunk/SmartUpload/main.php
    trunk/SmartUpload/upload_file.php
    trunk/SmartUpload/upload_form.php


-------------- next part --------------
Added: trunk/SmartUpload/.buildpath
===================================================================
--- trunk/SmartUpload/.buildpath	                        (rev 0)
+++ trunk/SmartUpload/.buildpath	2011-04-16 23:55:59 UTC (rev 2)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<buildpath>
+	<buildpathentry kind="src" path=""/>
+	<buildpathentry kind="con" path="org.eclipse.php.core.LANGUAGE"/>
+</buildpath>

Added: trunk/SmartUpload/.project
===================================================================
--- trunk/SmartUpload/.project	                        (rev 0)
+++ trunk/SmartUpload/.project	2011-04-16 23:55:59 UTC (rev 2)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>SmartUpload</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.dltk.core.scriptbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.php.core.PHPNature</nature>
+	</natures>
+</projectDescription>

Added: trunk/SmartUpload/.settings/org.eclipse.php.core.prefs
===================================================================
--- trunk/SmartUpload/.settings/org.eclipse.php.core.prefs	                        (rev 0)
+++ trunk/SmartUpload/.settings/org.eclipse.php.core.prefs	2011-04-16 23:55:59 UTC (rev 2)
@@ -0,0 +1,5 @@
+#Sun Apr 17 00:12:11 JST 2011
+eclipse.preferences.version=1
+include_path=0;/SmartUpload
+phpVersion=php5.3
+use_asp_tags_as_php=false

Added: trunk/SmartUpload/data/06c69f2a.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/SmartUpload/data/06c69f2a.jpg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/SmartUpload/include/database.php
===================================================================
--- trunk/SmartUpload/include/database.php	                        (rev 0)
+++ trunk/SmartUpload/include/database.php	2011-04-16 23:55:59 UTC (rev 2)
@@ -0,0 +1,24 @@
+<?php
+	// MDB2 ライブラリの読み込み
+	require_once("MDB2.php");
+
+	// エラー発生時の処理
+	PEAR::setErrorHandling( PEAR_ERROR_CALLBACK, "handleError" );
+	function handleError( $error )
+	{
+	    die("エラーが発生しました。管理者までお問い合わせ下さい。");
+	}
+
+	// データベースへの接続
+	$dsn = array(
+	    "phptype"  => "mysql",
+	    "username" => "root",
+	    "password" => "san59shi",
+	    "hostspec" => "localhost",
+	    "database" => "upload",
+	);
+	$mdb2 =& MDB2::connect( $dsn, $options );
+
+	// 文字コードの指定
+	$mdb2->setCharset( "utf8" );
+?>
\ No newline at end of file

Added: trunk/SmartUpload/main.php
===================================================================
--- trunk/SmartUpload/main.php	                        (rev 0)
+++ trunk/SmartUpload/main.php	2011-04-16 23:55:59 UTC (rev 2)
@@ -0,0 +1,3 @@
+<?php
+
+?>
\ No newline at end of file

Added: trunk/SmartUpload/upload_file.php
===================================================================
--- trunk/SmartUpload/upload_file.php	                        (rev 0)
+++ trunk/SmartUpload/upload_file.php	2011-04-16 23:55:59 UTC (rev 2)
@@ -0,0 +1,47 @@
+<?php
+/*
+ * SmartUpload/upload.php
+ * @author Hiroyuki Shibata
+ * 2011/04/17
+ * Rev 1.0
+ *
+ */
+?>
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+<title>SmartUpload</title>
+</head>
+<body>
+<p> file uploader </p>
+<?php
+	require_once("include/database.php");
+	//session_start();
+
+	$updir = "./data/";
+	$filename = $_FILES['upfile']['name'];
+	if(move_uploaded_file($_FILES['upfile']['tmp_name'], $updir.$filename)==FALSE){
+		print("Upload failed");
+		print($_FILES['upfile']['error']);
+	}
+	else {
+		print("<b> $filename </b> uploaded");
+
+		//データベースに記録
+		$sql = "INSERT INTO datainfo ( filename, uploaddate, data_size, )";
+		$sql .= "VALUES( ";
+		$sql .= "?,";
+		$sql .= "now(),";
+		$sql .= "?)";
+		$stmt = $mdb2->prepare( $sql );
+		$stmt->execute(
+			array(
+				$_REQUEST["customer_code"],
+				$_REQUEST["name"],
+			)
+		);
+	}
+
+?>
+</body>
+</html>
\ No newline at end of file

Added: trunk/SmartUpload/upload_form.php
===================================================================
--- trunk/SmartUpload/upload_form.php	                        (rev 0)
+++ trunk/SmartUpload/upload_form.php	2011-04-16 23:55:59 UTC (rev 2)
@@ -0,0 +1,20 @@
+<?php
+/*
+ * SmartUpload/upload.php
+ * @author Hiroyuki Shibata
+ * 2011/04/17
+ * Rev 1.0
+ *
+ */
+?>
+<html>
+<head><meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+<title>SmartUpload</title>
+</head>
+<body>
+<form method="post" enctype="multipart/form-data" action="upload_file.php">
+	<input type="file" name="upfile">
+	<input type="submit" value="アップロードする">
+</form>
+</body>
+</html>

From svnnotify ＠ sourceforge.jp  Mon Apr 18 01:56:22 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 18 Apr 2011 01:56:22 +0900
Subject: [Smartupload-svn] [3]
Message-ID: <1303059382.041158.8494.nullmailer@users.sourceforge.jp>

Revision: 3
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=3
Author:   hryksbt
Date:     2011-04-18 01:56:21 +0900 (Mon, 18 Apr 2011)

Log Message:
-----------


Modified Paths:
--------------
    trunk/SmartUpload/upload_file.php
    trunk/SmartUpload/upload_form.php

Added Paths:
-----------
    trunk/SmartUpload/09_02_fileup.php


-------------- next part --------------
Added: trunk/SmartUpload/09_02_fileup.php
===================================================================
--- trunk/SmartUpload/09_02_fileup.php	                        (rev 0)
+++ trunk/SmartUpload/09_02_fileup.php	2011-04-17 16:56:21 UTC (rev 3)
@@ -0,0 +1,39 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html lang="ja"><head>
+<meta http-equiv="Content-type" content="text/html; charset=UTF-8">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<link rel="stylesheet" href="./style.css">
+<title>ファイルアップローダー</title></head>
+<body><div class="file2">
+<form method="post" enctype="multipart/form-data" action="09_02_fileup.php">
+<input type="file" name="updata" size="30">
+<input type="submit" value="表示！"></form>
+<?php
+error_reporting(1);
+$updir = "./data/";
+$filename = $_FILES['updata']['name'];
+
+if(file_exists($_FILES['updata']['tmp_name'])){
+	$filesize = filesize($_FILES['updata']['tmp_name']);
+	if($filesize <= 100000){
+		//if(ereg("(^[a-zA-Z0-9_-]+)\.(jpg)|(^[a-zA-Z0-9_-]+)\.(gif)",$filename)){
+			move_uploaded_file($_FILES['updata']['tmp_name'], $updir.$filename);
+			echo "ファイル名　" . $filename . " アップロード成功！";
+			echo "$filesize"."bytes";
+			//echo $_FILES['updata']['error'];
+			echo  "<br><br>";
+			echo "<img src='./data/$filename'>";
+
+		//} else {
+		//echo "jpg かgif のファイルしかアップできません。或いはハイフン以外の記号があります。";
+		//}
+	} else {
+		echo "$filesize Byte ファイルサイズが大きすぎます。<br>100000 Byte 以下にしてください。";
+	}
+} else {
+echo "参照で画像ファイルを指定して、表示をクリック！";
+}
+?>
+</div>
+</body>
+</html>
\ No newline at end of file

Modified: trunk/SmartUpload/upload_file.php
===================================================================
--- trunk/SmartUpload/upload_file.php	2011-04-16 23:55:59 UTC (rev 2)
+++ trunk/SmartUpload/upload_file.php	2011-04-17 16:56:21 UTC (rev 3)
@@ -13,33 +13,39 @@
 <title>SmartUpload</title>
 </head>
 <body>
-<p> file uploader </p>
+<p> File Uploader </p>
 <?php
 	require_once("include/database.php");
-	//session_start();
+	// session_start();
 
 	$updir = "./data/";
 	$filename = $_FILES['upfile']['name'];
+	$filesize = filesize($_FILES['upfile']['tmp_name']);
 	if(move_uploaded_file($_FILES['upfile']['tmp_name'], $updir.$filename)==FALSE){
 		print("Upload failed");
 		print($_FILES['upfile']['error']);
 	}
 	else {
-		print("<b> $filename </b> uploaded");
+		print("<b> $filename </b> is uploaded.<br />");
+		print("size = "."$filesize"." bytes<br />");
 
-		//データベースに記録
-		$sql = "INSERT INTO datainfo ( filename, uploaddate, data_size, )";
-		$sql .= "VALUES( ";
-		$sql .= "?,";
-		$sql .= "now(),";
-		$sql .= "?)";
-		$stmt = $mdb2->prepare( $sql );
+		// データベースに記録
+		$sql  = "INSERT INTO data_info ( filename, uploaddate, datasize )";
+		$sql .= " VALUES ( ";
+		$sql .= " ?, ";
+		$sql .= " now(), ";
+		$sql .= " ? ) ";
+
+		echo $sql."<br />";
+
+		$stmt=$db->prepare("$sql");
 		$stmt->execute(
-			array(
-				$_REQUEST["customer_code"],
-				$_REQUEST["name"],
+			array (
+				$filename,
+				$filesize
 			)
 		);
+
 	}
 
 ?>

Modified: trunk/SmartUpload/upload_form.php
===================================================================
--- trunk/SmartUpload/upload_form.php	2011-04-16 23:55:59 UTC (rev 2)
+++ trunk/SmartUpload/upload_form.php	2011-04-17 16:56:21 UTC (rev 3)
@@ -7,6 +7,7 @@
  *
  */
 ?>
+
 <html>
 <head><meta http-equiv="content-type" content="text/html; charset=UTF-8" />
 <title>SmartUpload</title>
@@ -14,7 +15,7 @@
 <body>
 <form method="post" enctype="multipart/form-data" action="upload_file.php">
 	<input type="file" name="upfile">
-	<input type="submit" value="アップロードする">
+	<input type="submit" value="アップロード">
 </form>
 </body>
 </html>

From svnnotify ＠ sourceforge.jp  Tue Apr 19 00:46:26 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 19 Apr 2011 00:46:26 +0900
Subject: [Smartupload-svn] [4]
Message-ID: <1303141586.733263.3490.nullmailer@users.sourceforge.jp>

Revision: 4
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=4
Author:   hryksbt
Date:     2011-04-19 00:46:26 +0900 (Tue, 19 Apr 2011)

Log Message:
-----------


Modified Paths:
--------------
    trunk/SmartUpload/upload_file.php


-------------- next part --------------
Modified: trunk/SmartUpload/upload_file.php
===================================================================
--- trunk/SmartUpload/upload_file.php	2011-04-17 16:56:21 UTC (rev 3)
+++ trunk/SmartUpload/upload_file.php	2011-04-18 15:46:26 UTC (rev 4)
@@ -29,22 +29,31 @@
 		print("<b> $filename </b> is uploaded.<br />");
 		print("size = "."$filesize"." bytes<br />");
 
+// ↓↓↓↓↓↓↓　データベース管理　↓↓↓↓↓↓↓
+
+		//↓↓↓test↓↓↓
+		/* $conn = mysql_connect( "localhost", "root", "san59shi" );
+		mysql_set_charset("utf8");
+		mysql_select_db( "upload" );
+		*/
+
+		$abc = "select * from data_info";
+		$res = "mysql_query( $abc ))";
+
+		while( $row = mysql_fetch_array($res)){
+			print( $row["filename"  ]."<br />" );
+			print( $row["uploaddate"]."<br />" );
+			print( $row["data_size" ]          );
+		}
+		//↑↑↑test↑↑↑
+
 		// データベースに記録
-		$sql  = "INSERT INTO data_info ( filename, uploaddate, datasize )";
-		$sql .= " VALUES ( ";
-		$sql .= " ?, ";
-		$sql .= " now(), ";
-		$sql .= " ? ) ";
+		$sql  = "INSERT INTO data_info ( filename, uploaddate, data_size ) VALUES ( 'a', now(),1 ) ";
 
 		echo $sql."<br />";
 
 		$stmt=$db->prepare("$sql");
-		$stmt->execute(
-			array (
-				$filename,
-				$filesize
-			)
-		);
+		$stmt->execute( array( $filename, $filesize ) );
 
 	}
 

From svnnotify ＠ sourceforge.jp  Tue Apr 19 00:47:41 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 19 Apr 2011 00:47:41 +0900
Subject: [Smartupload-svn] [5]
Message-ID: <1303141661.355820.4739.nullmailer@users.sourceforge.jp>

Revision: 5
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=5
Author:   hryksbt
Date:     2011-04-19 00:47:41 +0900 (Tue, 19 Apr 2011)

Log Message:
-----------


Modified Paths:
--------------
    trunk/SmartUpload/upload_file.php


-------------- next part --------------
Modified: trunk/SmartUpload/upload_file.php
===================================================================
--- trunk/SmartUpload/upload_file.php	2011-04-18 15:46:26 UTC (rev 4)
+++ trunk/SmartUpload/upload_file.php	2011-04-18 15:47:41 UTC (rev 5)
@@ -32,7 +32,7 @@
 // ↓↓↓↓↓↓↓　データベース管理　↓↓↓↓↓↓↓
 
 		//↓↓↓test↓↓↓
-		/* $conn = mysql_connect( "localhost", "root", "san59shi" );
+		/* $conn = mysql_connect( "localhost", "root", "******" );
 		mysql_set_charset("utf8");
 		mysql_select_db( "upload" );
 		*/

From svnnotify ＠ sourceforge.jp  Sun Apr 24 23:35:01 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sun, 24 Apr 2011 23:35:01 +0900
Subject: [Smartupload-svn] [6]
Message-ID: <1303655701.200266.24963.nullmailer@users.sourceforge.jp>

Revision: 6
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=6
Author:   hryksbt
Date:     2011-04-24 23:35:01 +0900 (Sun, 24 Apr 2011)

Log Message:
-----------


Modified Paths:
--------------
    trunk/SmartUpload/include/database.php
    trunk/SmartUpload/upload_file.php

Added Paths:
-----------
    trunk/SmartUpload/data/aaa.jpg
    trunk/SmartUpload/data/mopera.txt
    trunk/SmartUpload/test.php


-------------- next part --------------
Added: trunk/SmartUpload/data/aaa.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/SmartUpload/data/aaa.jpg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/SmartUpload/data/mopera.txt
===================================================================
--- trunk/SmartUpload/data/mopera.txt	                        (rev 0)
+++ trunk/SmartUpload/data/mopera.txt	2011-04-24 14:35:01 UTC (rev 6)
@@ -0,0 +1,16 @@
+ID: kyc6twgy
+PW: ekybutj2
+
+DNS 220.159.212.201
+DNS 220.159.212.201
+
+moperau ????+
+ID: d6uv788c
+APN: mopera.net
+PW: kaz34612
+
+151 1 4
+
+?????
+00:80:87:19:DE:1C


Property changes on: trunk/SmartUpload/data/mopera.txt
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Modified: trunk/SmartUpload/include/database.php
===================================================================
--- trunk/SmartUpload/include/database.php	2011-04-18 15:47:41 UTC (rev 5)
+++ trunk/SmartUpload/include/database.php	2011-04-24 14:35:01 UTC (rev 6)
@@ -1,4 +1,5 @@
 <?php
+/*
 	// MDB2 ?????????茯??莨若?
 	require_once("MDB2.php");
 
@@ -21,4 +22,19 @@
 
 	// ????潟???????
 	$mdb2->setCharset( "utf8" );
+*/
+
+//PDO?ф･膓?+try {
+	//DB?御･膓?+	$pdo = new PDO(
+		"mysql:host=localhost;dbname=upload","root","san59shi");
+
+} catch (PDOException $e){
+	var_dump($e->getMessage());
+}
+
+//PDO???
+$pdo = null;
+
 ?>
\ No newline at end of file

Added: trunk/SmartUpload/test.php
===================================================================
--- trunk/SmartUpload/test.php	                        (rev 0)
+++ trunk/SmartUpload/test.php	2011-04-24 14:35:01 UTC (rev 6)
@@ -0,0 +1,24 @@
+<?php
+/*
+ * SmartUpload/upload.php
+ * @author Hiroyuki Shibata
+ * 2011/04/17
+ * Rev 1.0
+ *
+ */
+
+	try {
+    $pdo = new PDO(
+		"mysql:host=localhost; dbname=upload", "root", "san59shi");
+    $stmt = $pdo->query("SELECT * FROM data_info");
+
+    while($row = $stmt->fetch(PDO::FETCH_ASSOC)){
+        echo implode(", ", $row) . PHP_EOL;
+    }
+} catch (PDOException $e){
+    var_dump($e->getMessage());
+}
+
+$pdo = null;
+
+?>
\ No newline at end of file

Modified: trunk/SmartUpload/upload_file.php
===================================================================
--- trunk/SmartUpload/upload_file.php	2011-04-18 15:47:41 UTC (rev 5)
+++ trunk/SmartUpload/upload_file.php	2011-04-24 14:35:01 UTC (rev 6)
@@ -36,7 +36,7 @@
 		mysql_set_charset("utf8");
 		mysql_select_db( "upload" );
 		*/
-
+/*
 		$abc = "select * from data_info";
 		$res = "mysql_query( $abc ))";
 
@@ -45,16 +45,19 @@
 			print( $row["uploaddate"]."<br />" );
 			print( $row["data_size" ]          );
 		}
+*/
 		//?????est????? 
 		// ????帥??若??????+		/*
 		$sql  = "INSERT INTO data_info ( filename, uploaddate, data_size ) VALUES ( 'a', now(),1 ) ";
 
+		//sql??∈茯???鴻?
 		echo $sql."<br />";
 
 		$stmt=$db->prepare("$sql");
 		$stmt->execute( array( $filename, $filesize ) );
-
+*/
 	}
 
 ?>

From svnnotify ＠ sourceforge.jp  Sun Apr 24 23:37:16 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sun, 24 Apr 2011 23:37:16 +0900
Subject: [Smartupload-svn] [7]
Message-ID: <1303655836.482400.28345.nullmailer@users.sourceforge.jp>

Revision: 7
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=7
Author:   hryksbt
Date:     2011-04-24 23:37:16 +0900 (Sun, 24 Apr 2011)

Log Message:
-----------


Modified Paths:
--------------
    trunk/SmartUpload/include/database.php


-------------- next part --------------
Modified: trunk/SmartUpload/include/database.php
===================================================================
--- trunk/SmartUpload/include/database.php	2011-04-24 14:35:01 UTC (rev 6)
+++ trunk/SmartUpload/include/database.php	2011-04-24 14:37:16 UTC (rev 7)
@@ -1,29 +1,5 @@
 <?php
-/*
-	// MDB2 ライブラリの読み込み
-	require_once("MDB2.php");
 
-	// エラー発生時の処理
-	PEAR::setErrorHandling( PEAR_ERROR_CALLBACK, "handleError" );
-	function handleError( $error )
-	{
-	    die("エラーが発生しました。管理者までお問い合わせ下さい。");
-	}
-
-	// データベースへの接続
-	$dsn = array(
-	    "phptype"  => "mysql",
-	    "username" => "root",
-	    "password" => "san59shi",
-	    "hostspec" => "localhost",
-	    "database" => "upload",
-	);
-	$mdb2 =& MDB2::connect( $dsn, $options );
-
-	// 文字コードの指定
-	$mdb2->setCharset( "utf8" );
-*/
-
 //PDOで接続
 try {
 	//DBへ接続
@@ -35,6 +11,6 @@
 }
 
 //PDO切断
-$pdo = null;
+// $pdo = null;
 
 ?>
\ No newline at end of file

From svnnotify ＠ sourceforge.jp  Mon Apr 25 00:01:15 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 25 Apr 2011 00:01:15 +0900
Subject: [Smartupload-svn] [8]
Message-ID: <1303657275.868282.24220.nullmailer@users.sourceforge.jp>

Revision: 8
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=8
Author:   hryksbt
Date:     2011-04-25 00:01:15 +0900 (Mon, 25 Apr 2011)

Log Message:
-----------


Modified Paths:
--------------
    trunk/SmartUpload/include/database.php


-------------- next part --------------
Modified: trunk/SmartUpload/include/database.php
===================================================================
--- trunk/SmartUpload/include/database.php	2011-04-24 14:37:16 UTC (rev 7)
+++ trunk/SmartUpload/include/database.php	2011-04-24 15:01:15 UTC (rev 8)
@@ -1,16 +1,27 @@
 <?php
 
 //PDOで接続
-try {
-	//DBへ接続
-	$pdo = new PDO(
-		"mysql:host=localhost;dbname=upload","root","san59shi");
 
-} catch (PDOException $e){
-	var_dump($e->getMessage());
+$dsn = 'mysql:dbname=upload;host=localhost';
+$user = 'root';
+$password = '********';
+
+try{
+	$dbh = new PDO($dsn, $user, $password);
+	print('接続に成功しました。<br>');
+	$dbh->query('SET NAMES sjis');
+	$sql = 'select * from shouhin';
+	foreach ($dbh->query($sql) as $row) {
+		print($row['filename']);
+		print($row['uploaddate'].'<br>');
+	}
+}catch (PDOException $e){
+	print('Error:'.$e->getMessage());
+	die();
 }
+$dbh = null;
 
-//PDO切断
+// PDO切断
 // $pdo = null;
 
 ?>
\ No newline at end of file

From svnnotify ＠ sourceforge.jp  Mon Apr 25 11:08:41 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 25 Apr 2011 11:08:41 +0900
Subject: [Smartupload-svn] [9]
Message-ID: <1303697321.708894.8144.nullmailer@users.sourceforge.jp>

Revision: 9
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=9
Author:   hryksbt
Date:     2011-04-25 11:08:41 +0900 (Mon, 25 Apr 2011)

Log Message:
-----------


Removed Paths:
-------------
    trunk/SmartUpload/data/06c69f2a.jpg
    trunk/SmartUpload/data/aaa.jpg
    trunk/SmartUpload/data/mopera.txt


-------------- next part --------------
Deleted: trunk/SmartUpload/data/06c69f2a.jpg
===================================================================
(Binary files differ)

Deleted: trunk/SmartUpload/data/aaa.jpg
===================================================================
(Binary files differ)

Deleted: trunk/SmartUpload/data/mopera.txt
===================================================================
--- trunk/SmartUpload/data/mopera.txt	2011-04-24 15:01:15 UTC (rev 8)
+++ trunk/SmartUpload/data/mopera.txt	2011-04-25 02:08:41 UTC (rev 9)
@@ -1,16 +0,0 @@
-ID: kyc6twgy
-PW: ekybutj2
-
-DNS 220.159.212.201
-DNS 220.159.212.201
-
-moperau ????-
-ID: d6uv788c
-APN: mopera.net
-PW: kaz34612
-
-151 1 4
-
-?????
-00:80:87:19:DE:1C

From svnnotify ＠ sourceforge.jp  Mon Apr 25 11:24:53 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 25 Apr 2011 11:24:53 +0900
Subject: [Smartupload-svn] [10]
Message-ID: <1303698293.472450.28416.nullmailer@users.sourceforge.jp>

Revision: 10
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=10
Author:   hryksbt
Date:     2011-04-25 11:24:53 +0900 (Mon, 25 Apr 2011)

Log Message:
-----------


Modified Paths:
--------------
    trunk/SmartUpload/include/database.php
    trunk/SmartUpload/test.php


-------------- next part --------------
Modified: trunk/SmartUpload/include/database.php
===================================================================
--- trunk/SmartUpload/include/database.php	2011-04-25 02:08:41 UTC (rev 9)
+++ trunk/SmartUpload/include/database.php	2011-04-25 02:24:53 UTC (rev 10)
@@ -4,12 +4,12 @@
 
 $dsn = 'mysql:dbname=upload;host=localhost';
 $user = 'root';
-$password = '********';
+$password = 'Zaq12wsx';
 
 try{
 	$dbh = new PDO($dsn, $user, $password);
 	print('接続に成功しました。<br>');
-	$dbh->query('SET NAMES sjis');
+	//$dbh->query('SET NAMES utf8');
 	$sql = 'select * from shouhin';
 	foreach ($dbh->query($sql) as $row) {
 		print($row['filename']);

Modified: trunk/SmartUpload/test.php
===================================================================
--- trunk/SmartUpload/test.php	2011-04-25 02:08:41 UTC (rev 9)
+++ trunk/SmartUpload/test.php	2011-04-25 02:24:53 UTC (rev 10)
@@ -9,7 +9,7 @@
 
 	try {
     $pdo = new PDO(
-		"mysql:host=localhost; dbname=upload", "root", "san59shi");
+		"mysql:host=localhost; dbname=upload", "root", "********");
     $stmt = $pdo->query("SELECT * FROM data_info");
 
     while($row = $stmt->fetch(PDO::FETCH_ASSOC)){

From svnnotify ＠ sourceforge.jp  Mon Apr 25 15:24:41 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 25 Apr 2011 15:24:41 +0900
Subject: [Smartupload-svn] [11]
Message-ID: <1303712681.362314.5809.nullmailer@users.sourceforge.jp>

Revision: 11
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=11
Author:   hryksbt
Date:     2011-04-25 15:24:40 +0900 (Mon, 25 Apr 2011)

Log Message:
-----------


Modified Paths:
--------------
    trunk/SmartUpload/include/database.php
    trunk/SmartUpload/upload_file.php


-------------- next part --------------
Modified: trunk/SmartUpload/include/database.php
===================================================================
--- trunk/SmartUpload/include/database.php	2011-04-25 02:24:53 UTC (rev 10)
+++ trunk/SmartUpload/include/database.php	2011-04-25 06:24:40 UTC (rev 11)
@@ -1,27 +1,40 @@
 <?php
-
+/*
+ * SmartUpload/upload.php
+ * @author Hiroyuki Shibata
+ * 2011/04/25
+ * Rev 1.0
+ *
+ */
+?>
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+<title>SmartUpload</title>
+</head>
+<body>
+<?php
 //PDOで接続
 
 $dsn = 'mysql:dbname=upload;host=localhost';
 $user = 'root';
-$password = 'Zaq12wsx';
+$password = '********';
 
 try{
-	$dbh = new PDO($dsn, $user, $password);
+	$db = new PDO($dsn, $user, $password);
 	print('接続に成功しました。<br>');
-	//$dbh->query('SET NAMES utf8');
-	$sql = 'select * from shouhin';
-	foreach ($dbh->query($sql) as $row) {
+	$db->query('SET NAMES utf8');
+/*	$sql = 'select * from data_info';
+	foreach ($db->query($sql) as $row[]) {
 		print($row['filename']);
 		print($row['uploaddate'].'<br>');
-	}
+	}*/
 }catch (PDOException $e){
 	print('Error:'.$e->getMessage());
 	die();
 }
-$dbh = null;
+//$db = null;
 
-// PDO切断
-// $pdo = null;
-
-?>
\ No newline at end of file
+?>
+</body>
+</html>
\ No newline at end of file

Modified: trunk/SmartUpload/upload_file.php
===================================================================
--- trunk/SmartUpload/upload_file.php	2011-04-25 02:24:53 UTC (rev 10)
+++ trunk/SmartUpload/upload_file.php	2011-04-25 06:24:40 UTC (rev 11)
@@ -2,7 +2,7 @@
 /*
  * SmartUpload/upload.php
  * @author Hiroyuki Shibata
- * 2011/04/17
+ * 2011/04/25
  * Rev 1.0
  *
  */
@@ -21,45 +21,33 @@
 	$updir = "./data/";
 	$filename = $_FILES['upfile']['name'];
 	$filesize = filesize($_FILES['upfile']['tmp_name']);
+
 	if(move_uploaded_file($_FILES['upfile']['tmp_name'], $updir.$filename)==FALSE){
 		print("Upload failed");
 		print($_FILES['upfile']['error']);
-	}
-	else {
+	} else {
 		print("<b> $filename </b> is uploaded.<br />");
 		print("size = "."$filesize"." bytes<br />");
 
-// ↓↓↓↓↓↓↓　データベース管理　↓↓↓↓↓↓↓
+		$db = new PDO($dsn, $user, $password);
+		$db->query("show tables".'<br>');
 
-		//↓↓↓test↓↓↓
-		/* $conn = mysql_connect( "localhost", "root", "******" );
-		mysql_set_charset("utf8");
-		mysql_select_db( "upload" );
-		*/
-/*
-		$abc = "select * from data_info";
-		$res = "mysql_query( $abc ))";
+		// データベース
+		$stmt = $db->prepare(
+			"INSERT INTO data_info (filename, uploaddate, data_size)
+				VALUES(? ,now() ,?)");
+		$stmt->bindParam(1,$filename);
+		$stmt->bindParam(2,$filesize);
+		$stmt->execute();
 
-		while( $row = mysql_fetch_array($res)){
-			print( $row["filename"  ]."<br />" );
-			print( $row["uploaddate"]."<br />" );
-			print( $row["data_size" ]          );
+		print('<br>');
+		$sql ='select * from data_info';
+		foreach ($db->query($sql) as $row) {
+			print($row['filename']."<TAB>");
+			print($row['uploaddate'].'<TAB>');
+			print($row['data_size'].'<br />');
 		}
-*/
-		//↑↑↑test↑↑↑
-
-		// データベースに記録
-		/*
-		$sql  = "INSERT INTO data_info ( filename, uploaddate, data_size ) VALUES ( 'a', now(),1 ) ";
-
-		//sqlの確認テスト
-		echo $sql."<br />";
-
-		$stmt=$db->prepare("$sql");
-		$stmt->execute( array( $filename, $filesize ) );
-*/
 	}
-
 ?>
 </body>
 </html>
\ No newline at end of file

From svnnotify ＠ sourceforge.jp  Mon Apr 25 15:25:43 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 25 Apr 2011 15:25:43 +0900
Subject: [Smartupload-svn] [12]
Message-ID: <1303712743.232126.6034.nullmailer@users.sourceforge.jp>

Revision: 12
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=12
Author:   hryksbt
Date:     2011-04-25 15:25:43 +0900 (Mon, 25 Apr 2011)

Log Message:
-----------


Modified Paths:
--------------
    trunk/SmartUpload/upload_file.php


-------------- next part --------------
Modified: trunk/SmartUpload/upload_file.php
===================================================================
--- trunk/SmartUpload/upload_file.php	2011-04-25 06:24:40 UTC (rev 11)
+++ trunk/SmartUpload/upload_file.php	2011-04-25 06:25:43 UTC (rev 12)
@@ -32,7 +32,7 @@
 		$db = new PDO($dsn, $user, $password);
 		$db->query("show tables".'<br>');
 
-		// データベース
+		// データベース処理
 		$stmt = $db->prepare(
 			"INSERT INTO data_info (filename, uploaddate, data_size)
 				VALUES(? ,now() ,?)");

From svnnotify ＠ sourceforge.jp  Tue Apr 26 00:53:50 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 26 Apr 2011 00:53:50 +0900
Subject: [Smartupload-svn] [13]
Message-ID: <1303746830.850678.25366.nullmailer@users.sourceforge.jp>

Revision: 13
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=13
Author:   hryksbt
Date:     2011-04-26 00:53:50 +0900 (Tue, 26 Apr 2011)

Log Message:
-----------


Modified Paths:
--------------
    trunk/SmartUpload/include/database.php
    trunk/SmartUpload/upload_file.php

Removed Paths:
-------------
    trunk/SmartUpload/09_02_fileup.php
    trunk/SmartUpload/main.php
    trunk/SmartUpload/test.php


-------------- next part --------------
Deleted: trunk/SmartUpload/09_02_fileup.php
===================================================================
--- trunk/SmartUpload/09_02_fileup.php	2011-04-25 06:25:43 UTC (rev 12)
+++ trunk/SmartUpload/09_02_fileup.php	2011-04-25 15:53:50 UTC (rev 13)
@@ -1,39 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="ja"><head>
-<meta http-equiv="Content-type" content="text/html; charset=UTF-8">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="stylesheet" href="./style.css">
-<title>ファイルアップローダー</title></head>
-<body><div class="file2">
-<form method="post" enctype="multipart/form-data" action="09_02_fileup.php">
-<input type="file" name="updata" size="30">
-<input type="submit" value="表示！"></form>
-<?php
-error_reporting(1);
-$updir = "./data/";
-$filename = $_FILES['updata']['name'];
-
-if(file_exists($_FILES['updata']['tmp_name'])){
-	$filesize = filesize($_FILES['updata']['tmp_name']);
-	if($filesize <= 100000){
-		//if(ereg("(^[a-zA-Z0-9_-]+)\.(jpg)|(^[a-zA-Z0-9_-]+)\.(gif)",$filename)){
-			move_uploaded_file($_FILES['updata']['tmp_name'], $updir.$filename);
-			echo "ファイル名　" . $filename . " アップロード成功！";
-			echo "$filesize"."bytes";
-			//echo $_FILES['updata']['error'];
-			echo  "<br><br>";
-			echo "<img src='./data/$filename'>";
-
-		//} else {
-		//echo "jpg かgif のファイルしかアップできません。或いはハイフン以外の記号があります。";
-		//}
-	} else {
-		echo "$filesize Byte ファイルサイズが大きすぎます。<br>100000 Byte 以下にしてください。";
-	}
-} else {
-echo "参照で画像ファイルを指定して、表示をクリック！";
-}
-?>
-</div>
-</body>
-</html>
\ No newline at end of file

Modified: trunk/SmartUpload/include/database.php
===================================================================
--- trunk/SmartUpload/include/database.php	2011-04-25 06:25:43 UTC (rev 12)
+++ trunk/SmartUpload/include/database.php	2011-04-25 15:53:50 UTC (rev 13)
@@ -2,7 +2,7 @@
 /*
  * SmartUpload/upload.php
  * @author Hiroyuki Shibata
- * 2011/04/25
+ * 2011/04/26
  * Rev 1.0
  *
  */
@@ -18,22 +18,16 @@
 
 $dsn = 'mysql:dbname=upload;host=localhost';
 $user = 'root';
-$password = '********';
+$password = '******';
 
 try{
 	$db = new PDO($dsn, $user, $password);
 	print('接続に成功しました。<br>');
 	$db->query('SET NAMES utf8');
-/*	$sql = 'select * from data_info';
-	foreach ($db->query($sql) as $row[]) {
-		print($row['filename']);
-		print($row['uploaddate'].'<br>');
-	}*/
-}catch (PDOException $e){
+} catch (PDOException $e) {
 	print('Error:'.$e->getMessage());
 	die();
 }
-//$db = null;
 
 ?>
 </body>

Deleted: trunk/SmartUpload/main.php
===================================================================
--- trunk/SmartUpload/main.php	2011-04-25 06:25:43 UTC (rev 12)
+++ trunk/SmartUpload/main.php	2011-04-25 15:53:50 UTC (rev 13)
@@ -1,3 +0,0 @@
-<?php
-
-?>
\ No newline at end of file

Deleted: trunk/SmartUpload/test.php
===================================================================
--- trunk/SmartUpload/test.php	2011-04-25 06:25:43 UTC (rev 12)
+++ trunk/SmartUpload/test.php	2011-04-25 15:53:50 UTC (rev 13)
@@ -1,24 +0,0 @@
-<?php
-/*
- * SmartUpload/upload.php
- * @author Hiroyuki Shibata
- * 2011/04/17
- * Rev 1.0
- *
- */
-
-	try {
-    $pdo = new PDO(
-		"mysql:host=localhost; dbname=upload", "root", "********");
-    $stmt = $pdo->query("SELECT * FROM data_info");
-
-    while($row = $stmt->fetch(PDO::FETCH_ASSOC)){
-        echo implode(", ", $row) . PHP_EOL;
-    }
-} catch (PDOException $e){
-    var_dump($e->getMessage());
-}
-
-$pdo = null;
-
-?>
\ No newline at end of file

Modified: trunk/SmartUpload/upload_file.php
===================================================================
--- trunk/SmartUpload/upload_file.php	2011-04-25 06:25:43 UTC (rev 12)
+++ trunk/SmartUpload/upload_file.php	2011-04-25 15:53:50 UTC (rev 13)
@@ -2,7 +2,7 @@
 /*
  * SmartUpload/upload.php
  * @author Hiroyuki Shibata
- * 2011/04/25
+ * 2011/04/26
  * Rev 1.0
  *
  */
@@ -29,9 +29,6 @@
 		print("<b> $filename </b> is uploaded.<br />");
 		print("size = "."$filesize"." bytes<br />");
 
-		$db = new PDO($dsn, $user, $password);
-		$db->query("show tables".'<br>');
-
 		// データベース処理
 		$stmt = $db->prepare(
 			"INSERT INTO data_info (filename, uploaddate, data_size)
@@ -43,8 +40,8 @@
 		print('<br>');
 		$sql ='select * from data_info';
 		foreach ($db->query($sql) as $row) {
-			print($row['filename']."<TAB>");
-			print($row['uploaddate'].'<TAB>');
+			print($row['filename']." ");
+			print($row['uploaddate']." ");
 			print($row['data_size'].'<br />');
 		}
 	}

From svnnotify ＠ sourceforge.jp  Tue Apr 26 00:55:22 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 26 Apr 2011 00:55:22 +0900
Subject: [Smartupload-svn] [14]
Message-ID: <1303746922.197832.27519.nullmailer@users.sourceforge.jp>

Revision: 14
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=14
Author:   hryksbt
Date:     2011-04-26 00:55:22 +0900 (Tue, 26 Apr 2011)

Log Message:
-----------


Modified Paths:
--------------
    trunk/SmartUpload/include/database.php
    trunk/SmartUpload/upload_file.php
    trunk/SmartUpload/upload_form.php

Added Paths:
-----------
    trunk/SmartUpload/download_file.php


-------------- next part --------------
Added: trunk/SmartUpload/download_file.php
===================================================================
--- trunk/SmartUpload/download_file.php	                        (rev 0)
+++ trunk/SmartUpload/download_file.php	2011-04-25 15:55:22 UTC (rev 14)
@@ -0,0 +1,9 @@
+<?php
+/*
+ * SmartUpload/download_file.php
+ * @author Hiroyuki Shibata
+ * 2011/04/26
+ * Rev 1.0
+ *
+ */
+?>
\ No newline at end of file

Modified: trunk/SmartUpload/include/database.php
===================================================================
--- trunk/SmartUpload/include/database.php	2011-04-25 15:53:50 UTC (rev 13)
+++ trunk/SmartUpload/include/database.php	2011-04-25 15:55:22 UTC (rev 14)
@@ -1,6 +1,6 @@
 <?php
 /*
- * SmartUpload/upload.php
+ * SmartUpload/databases.php
  * @author Hiroyuki Shibata
  * 2011/04/26
  * Rev 1.0

Modified: trunk/SmartUpload/upload_file.php
===================================================================
--- trunk/SmartUpload/upload_file.php	2011-04-25 15:53:50 UTC (rev 13)
+++ trunk/SmartUpload/upload_file.php	2011-04-25 15:55:22 UTC (rev 14)
@@ -1,6 +1,6 @@
 <?php
 /*
- * SmartUpload/upload.php
+ * SmartUpload/upload_file.php
  * @author Hiroyuki Shibata
  * 2011/04/26
  * Rev 1.0

Modified: trunk/SmartUpload/upload_form.php
===================================================================
--- trunk/SmartUpload/upload_form.php	2011-04-25 15:53:50 UTC (rev 13)
+++ trunk/SmartUpload/upload_form.php	2011-04-25 15:55:22 UTC (rev 14)
@@ -1,6 +1,6 @@
 <?php
 /*
- * SmartUpload/upload.php
+ * SmartUpload/upload_form.php
  * @author Hiroyuki Shibata
  * 2011/04/17
  * Rev 1.0

From svnnotify ＠ sourceforge.jp  Tue Apr 26 01:43:20 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 26 Apr 2011 01:43:20 +0900
Subject: [Smartupload-svn] [15]
Message-ID: <1303749800.280734.14700.nullmailer@users.sourceforge.jp>

Revision: 15
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=15
Author:   hryksbt
Date:     2011-04-26 01:43:20 +0900 (Tue, 26 Apr 2011)

Log Message:
-----------


Modified Paths:
--------------
    trunk/SmartUpload/download_file.php
    trunk/SmartUpload/include/database.php
    trunk/SmartUpload/upload_file.php
    trunk/SmartUpload/upload_form.php


-------------- next part --------------
Modified: trunk/SmartUpload/download_file.php
===================================================================
--- trunk/SmartUpload/download_file.php	2011-04-25 15:55:22 UTC (rev 14)
+++ trunk/SmartUpload/download_file.php	2011-04-25 16:43:20 UTC (rev 15)
@@ -6,4 +6,32 @@
  * Rev 1.0
  *
  */
-?>
\ No newline at end of file
+?>
+<html>
+<head>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+	<title>SmartUpload</title>
+</head>
+<body>
+<p><b>File Downloader</b></p>
+<?php
+
+	// メイン処理 //
+
+	require_once ("include/database.php");
+	//session_start();
+
+	$sql ='select * from data_info';
+
+	foreach ($db->query($sql) as $row) {
+
+		?><a href="./data/<?php print($row['filename']." "); ?> ">
+			<?php print($row['filename']." "); ?>
+		</a>
+		<?php
+		print($row['uploaddate']." ");
+		print($row['data_size']."<br>");
+
+	}
+
+?>

Modified: trunk/SmartUpload/include/database.php
===================================================================
--- trunk/SmartUpload/include/database.php	2011-04-25 15:55:22 UTC (rev 14)
+++ trunk/SmartUpload/include/database.php	2011-04-25 16:43:20 UTC (rev 15)
@@ -6,29 +6,21 @@
  * Rev 1.0
  *
  */
-?>
-<html>
-<head>
-<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-<title>SmartUpload</title>
-</head>
-<body>
-<?php
-//PDOで接続
 
-$dsn = 'mysql:dbname=upload;host=localhost';
-$user = 'root';
-$password = '******';
+	//PDOで接続
 
-try{
-	$db = new PDO($dsn, $user, $password);
-	print('接続に成功しました。<br>');
-	$db->query('SET NAMES utf8');
-} catch (PDOException $e) {
-	print('Error:'.$e->getMessage());
-	die();
-}
+	$dsn = 'mysql:dbname=upload;host=localhost';
+	$user = 'root';
+	$password = '******';
 
+	try{
+
+		$db = new PDO($dsn, $user, $password);
+		$db->query('SET NAMES utf8');
+
+	} catch (PDOException $e) {
+		print('Error:'.$e->getMessage());
+		die();
+	}
+
 ?>
-</body>
-</html>
\ No newline at end of file

Modified: trunk/SmartUpload/upload_file.php
===================================================================
--- trunk/SmartUpload/upload_file.php	2011-04-25 15:55:22 UTC (rev 14)
+++ trunk/SmartUpload/upload_file.php	2011-04-25 16:43:20 UTC (rev 15)
@@ -9,23 +9,30 @@
 ?>
 <html>
 <head>
-<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-<title>SmartUpload</title>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+	<title>SmartUpload</title>
 </head>
 <body>
-<p> File Uploader </p>
+<p><b>File Uploader</b></p>
 <?php
+
+	// メイン処理 //
+
 	require_once("include/database.php");
 	// session_start();
 
 	$updir = "./data/";
+
 	$filename = $_FILES['upfile']['name'];
 	$filesize = filesize($_FILES['upfile']['tmp_name']);
 
-	if(move_uploaded_file($_FILES['upfile']['tmp_name'], $updir.$filename)==FALSE){
+	if(move_uploaded_file($_FILES['upfile']['tmp_name'], $updir.$filename)==FALSE) {
+
 		print("Upload failed");
 		print($_FILES['upfile']['error']);
+
 	} else {
+
 		print("<b> $filename </b> is uploaded.<br />");
 		print("size = "."$filesize"." bytes<br />");
 
@@ -33,18 +40,25 @@
 		$stmt = $db->prepare(
 			"INSERT INTO data_info (filename, uploaddate, data_size)
 				VALUES(? ,now() ,?)");
+
 		$stmt->bindParam(1,$filename);
 		$stmt->bindParam(2,$filesize);
 		$stmt->execute();
 
 		print('<br>');
+
 		$sql ='select * from data_info';
+
 		foreach ($db->query($sql) as $row) {
+
 			print($row['filename']." ");
 			print($row['uploaddate']." ");
 			print($row['data_size'].'<br />');
+
 		}
+
 	}
+
 ?>
 </body>
 </html>
\ No newline at end of file

Modified: trunk/SmartUpload/upload_form.php
===================================================================
--- trunk/SmartUpload/upload_form.php	2011-04-25 15:55:22 UTC (rev 14)
+++ trunk/SmartUpload/upload_form.php	2011-04-25 16:43:20 UTC (rev 15)
@@ -2,15 +2,16 @@
 /*
  * SmartUpload/upload_form.php
  * @author Hiroyuki Shibata
- * 2011/04/17
+ * 2011/04/26
  * Rev 1.0
  *
  */
 ?>
 
 <html>
-<head><meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-<title>SmartUpload</title>
+<head>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+	<title>SmartUpload</title>
 </head>
 <body>
 <form method="post" enctype="multipart/form-data" action="upload_file.php">

From svnnotify ＠ sourceforge.jp  Tue Apr 26 01:47:58 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 26 Apr 2011 01:47:58 +0900
Subject: [Smartupload-svn] [16]
Message-ID: <1303750078.794355.19167.nullmailer@users.sourceforge.jp>

Revision: 16
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=16
Author:   hryksbt
Date:     2011-04-26 01:47:58 +0900 (Tue, 26 Apr 2011)

Log Message:
-----------


Modified Paths:
--------------
    trunk/SmartUpload/download_file.php
    trunk/SmartUpload/upload_file.php
    trunk/SmartUpload/upload_form.php


-------------- next part --------------
Modified: trunk/SmartUpload/download_file.php
===================================================================
--- trunk/SmartUpload/download_file.php	2011-04-25 16:43:20 UTC (rev 15)
+++ trunk/SmartUpload/download_file.php	2011-04-25 16:47:58 UTC (rev 16)
@@ -9,12 +9,14 @@
 ?>
 <html>
 <head>
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-	<title>SmartUpload</title>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+<title>SmartUpload</title>
 </head>
 <body>
-<p><b>File Downloader</b></p>
-<?php
+	<p>
+		<b>File Downloader</b>
+	</p>
+	<?php
 
 	// メイン処理 //
 
@@ -25,13 +27,17 @@
 
 	foreach ($db->query($sql) as $row) {
 
-		?><a href="./data/<?php print($row['filename']." "); ?> ">
+		?>
+		<a href="./data/
 			<?php print($row['filename']." "); ?>
+		">
+			<?php print($row['filename']." "); ?>
 		</a>
 		<?php
-		print($row['uploaddate']." ");
-		print($row['data_size']."<br>");
 
+			print($row['uploaddate']." ");
+			print($row['data_size']."<br>");
+
 	}
 
-?>
+	?>
\ No newline at end of file

Modified: trunk/SmartUpload/upload_file.php
===================================================================
--- trunk/SmartUpload/upload_file.php	2011-04-25 16:43:20 UTC (rev 15)
+++ trunk/SmartUpload/upload_file.php	2011-04-25 16:47:58 UTC (rev 16)
@@ -9,12 +9,14 @@
 ?>
 <html>
 <head>
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-	<title>SmartUpload</title>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+<title>SmartUpload</title>
 </head>
 <body>
-<p><b>File Uploader</b></p>
-<?php
+	<p>
+		<b>File Uploader</b>
+	</p>
+	<?php
 
 	// メイン処理 //
 
@@ -38,8 +40,7 @@
 
 		// データベース処理
 		$stmt = $db->prepare(
-			"INSERT INTO data_info (filename, uploaddate, data_size)
-				VALUES(? ,now() ,?)");
+			"INSERT INTO data_info (filename, uploaddate, data_size) VALUES(? ,now() ,?)");
 
 		$stmt->bindParam(1,$filename);
 		$stmt->bindParam(2,$filesize);
@@ -59,6 +60,6 @@
 
 	}
 
-?>
+	?>
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: trunk/SmartUpload/upload_form.php
===================================================================
--- trunk/SmartUpload/upload_form.php	2011-04-25 16:43:20 UTC (rev 15)
+++ trunk/SmartUpload/upload_form.php	2011-04-25 16:47:58 UTC (rev 16)
@@ -10,13 +10,13 @@
 
 <html>
 <head>
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-	<title>SmartUpload</title>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+<title>SmartUpload</title>
 </head>
 <body>
-<form method="post" enctype="multipart/form-data" action="upload_file.php">
-	<input type="file" name="upfile">
-	<input type="submit" value="アップロード">
-</form>
+	<form method="post" enctype="multipart/form-data"
+		action="upload_file.php">
+		<input type="file" name="upfile"> <input type="submit" value="アップロード">
+	</form>
 </body>
 </html>

From svnnotify ＠ sourceforge.jp  Tue Apr 26 01:48:17 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 26 Apr 2011 01:48:17 +0900
Subject: [Smartupload-svn] [17]
Message-ID: <1303750097.463548.21223.nullmailer@users.sourceforge.jp>

Revision: 17
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=17
Author:   hryksbt
Date:     2011-04-26 01:48:17 +0900 (Tue, 26 Apr 2011)

Log Message:
-----------


Added Paths:
-----------
    trunk/SmartUpload/data/test.txt


-------------- next part --------------
Added: trunk/SmartUpload/data/test.txt
===================================================================
--- trunk/SmartUpload/data/test.txt	                        (rev 0)
+++ trunk/SmartUpload/data/test.txt	2011-04-25 16:48:17 UTC (rev 17)
@@ -0,0 +1 @@
+This is for testing.
\ No newline at end of file


Property changes on: trunk/SmartUpload/data/test.txt
___________________________________________________________________
Added: svn:mime-type
   + text/plain

From svnnotify ＠ sourceforge.jp  Tue Apr 26 18:23:32 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 26 Apr 2011 18:23:32 +0900
Subject: [Smartupload-svn] =?utf-8?b?WzE4XSAgRELjgrPjg43jgq/jg4jjgIHjg4A=?=
 =?utf-8?b?44Km44Oz44Ot44O844OJ44K544Kv44Oq44OX44OI44CB44Ki44OD44OX44Ot?=
 =?utf-8?b?44O844OJ44K544Kv44Oq44OX44OI44CB44Om44O844K255m76Yyy44K544Kv?=
 =?utf-8?b?44Oq44OX44OI44G+44Gn5a6f6KOF?=
Message-ID: <1303809812.348031.5075.nullmailer@users.sourceforge.jp>

Revision: 18
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=18
Author:   hryksbt
Date:     2011-04-26 18:23:31 +0900 (Tue, 26 Apr 2011)

Log Message:
-----------
DBコネクト、ダウンロードスクリプト、アップロードスクリプト、ユーザ登録スクリプトまで実装
（エラーチェックは未実装状態）

Modified Paths:
--------------
    trunk/SmartUpload/download_file.php
    trunk/SmartUpload/upload_file.php

Added Paths:
-----------
    trunk/SmartUpload/user_add.php
    trunk/SmartUpload/user_form.php


-------------- next part --------------
Modified: trunk/SmartUpload/download_file.php
===================================================================
--- trunk/SmartUpload/download_file.php	2011-04-25 16:48:17 UTC (rev 17)
+++ trunk/SmartUpload/download_file.php	2011-04-26 09:23:31 UTC (rev 18)
@@ -18,6 +18,8 @@
 	</p>
 	<?php
 
+	//session_start();
+
 	// メイン処理 //
 
 	require_once ("include/database.php");

Modified: trunk/SmartUpload/upload_file.php
===================================================================
--- trunk/SmartUpload/upload_file.php	2011-04-25 16:48:17 UTC (rev 17)
+++ trunk/SmartUpload/upload_file.php	2011-04-26 09:23:31 UTC (rev 18)
@@ -17,11 +17,11 @@
 		<b>File Uploader</b>
 	</p>
 	<?php
+	//session_start();
 
 	// メイン処理 //
 
 	require_once("include/database.php");
-	// session_start();
 
 	$updir = "./data/";
 

Added: trunk/SmartUpload/user_add.php
===================================================================
--- trunk/SmartUpload/user_add.php	                        (rev 0)
+++ trunk/SmartUpload/user_add.php	2011-04-26 09:23:31 UTC (rev 18)
@@ -0,0 +1,62 @@
+<?php
+/*
+ * SmartUpload/user_add.php
+ * @author Hiroyuki Shibata
+ * 2011/04/26
+ * Rev 1.0
+ *
+ */
+?>
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+<title>SmartUpload</title>
+</head>
+<body>
+	<p>
+		<b>登録完了</b>
+	</p>
+	<?php
+	// メイン処理 //
+
+	require_once("include/database.php");
+
+	try{
+
+		// DBに登録 //
+		$stmt = $db->prepare(
+			"INSERT INTO user_info (
+				userid,
+				password,
+				fullname,
+				country_code,
+				add_date,
+				email,
+				frag
+			) VALUES ( ?, ?, ?, ?, now(), ?, 0)"
+		);
+
+		$stmt->bindParam(1,$_REQUEST["id"]);
+		$stmt->bindParam(2,$_REQUEST["pass"]);
+		$stmt->bindParam(3,$_REQUEST["name"]);
+		$stmt->bindParam(4,$_REQUEST["country"]);
+		$stmt->bindParam(5,$_REQUEST["mail"]);
+		$stmt->execute();
+
+		// 登録成功を表示 //
+		$sql ='select userid from user_info';
+
+		foreach ($db->query($sql) as $row) {
+
+			print($row['userid']." "."が登録されました。");
+
+		}
+
+	} catch (PDOException $e) {
+		print('Error:'.$e->getMessage());
+		die();
+	}
+
+	?>
+</body>
+</html>
\ No newline at end of file

Added: trunk/SmartUpload/user_form.php
===================================================================
--- trunk/SmartUpload/user_form.php	                        (rev 0)
+++ trunk/SmartUpload/user_form.php	2011-04-26 09:23:31 UTC (rev 18)
@@ -0,0 +1,41 @@
+<?php
+/*
+ * SmartUpload/user_form.php
+ * @author Hiroyuki Shibata
+ * 2011/04/26
+ * Rev 1.0
+ *
+ */
+?>
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+<title>SmartUpload</title>
+</head>
+<body>
+	<p>
+		<b>ユーザー登録</b>
+	</p>
+	<form name="user_form" action="./user_add.php" method="post">
+<pre>
+ID（アカウント）	：<input type="text" name="id"> ※ 32文字以内<br>
+パスワード	：<input type="password" name="pass"> ※ 32文字以内<br>
+氏名		：<input type="text" name="name"> ※ 32文字以内<br>
+
+国		：<select name="country">
+	<option value="001">アメリカ</option>
+	<option value="002">日本</option>
+	<option value="003">中国</option>
+	<option value="004">インド</option>
+	<option value="005">インドネシア</option>
+	<option value="006">ブラジル</option>
+</select>
+
+<br>
+メールアドレス	：<input type="text" name="mail"> ※ 64文字以内<br>
+</pre>
+		<input type="submit" class="update" value="登録" /> <input type="reset"
+			value="リセット">
+	</form>
+</body>
+</html>

From svnnotify ＠ sourceforge.jp  Tue Apr 26 23:48:10 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 26 Apr 2011 23:48:10 +0900
Subject: [Smartupload-svn] [19]
Message-ID: <1303829290.525603.24570.nullmailer@users.sourceforge.jp>

Revision: 19
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=19
Author:   hryksbt
Date:     2011-04-26 23:48:09 +0900 (Tue, 26 Apr 2011)

Log Message:
-----------


Added Paths:
-----------
    trunk/Database/
    trunk/Database/dump.sql


-------------- next part --------------
Added: trunk/Database/dump.sql
===================================================================
--- trunk/Database/dump.sql	                        (rev 0)
+++ trunk/Database/dump.sql	2011-04-26 14:48:09 UTC (rev 19)
@@ -0,0 +1,75 @@
+?-- phpMyAdmin SQL Dump
+-- version 3.2.4
+-- http://www.phpmyadmin.net
+--
+-- ホスト: localhost
+-- 生成時間: 2011 年 4 月 26 日 23:45
+-- サーバのバージョン: 5.1.41
+-- PHP のバージョン: 5.3.1
+
+SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
+
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+
+--
+-- データベース: `upload`
+--
+CREATE DATABASE `upload` DEFAULT CHARACTER SET latin1 COLLATE latin1_swedish_ci;
+USE `upload`;
+
+-- --------------------------------------------------------
+
+--
+-- テーブルの構造 `data_info`
+--
+
+CREATE TABLE IF NOT EXISTS `data_info` (
+  `filename` varchar(64) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
+  `uploaddate` datetime NOT NULL,
+  `username` varchar(64) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL,
+  `data_size` int(10) NOT NULL,
+  `rank` int(3) DEFAULT NULL,
+  UNIQUE KEY `index_filename` (`filename`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+--
+-- テーブルのデータをダンプしています `data_info`
+--
+
+INSERT INTO `data_info` (`filename`, `uploaddate`, `username`, `data_size`, `rank`) VALUES
+('aaa.jpg', '2011-04-18 00:00:00', NULL, 666, NULL),
+('bbb', '2011-04-18 23:49:46', NULL, 777, NULL),
+('test.txt', '2011-04-26 00:50:36', NULL, 20, NULL);
+
+-- --------------------------------------------------------
+
+--
+-- テーブルの構造 `user_info`
+--
+
+CREATE TABLE IF NOT EXISTS `user_info` (
+  `userid` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
+  `password` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
+  `fullname` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
+  `country_code` smallint(6) NOT NULL,
+  `add_date` datetime NOT NULL,
+  `change_date` datetime DEFAULT NULL,
+  `email` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
+  `frag` tinyint(1) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`userid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+--
+-- テーブルのデータをダンプしています `user_info`
+--
+
+INSERT INTO `user_info` (`userid`, `password`, `fullname`, `country_code`, `add_date`, `change_date`, `email`, `frag`) VALUES
+('a', 'aaa', 'aaa', 1, '2011-04-26 23:34:00', NULL, 'aaa', 0);
+
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;

From svnnotify ＠ sourceforge.jp  Wed Apr 27 01:38:54 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 27 Apr 2011 01:38:54 +0900
Subject: [Smartupload-svn] =?utf-8?b?WzIwXSAg44Ot44Kw44Kk44Oz5qmf6IO977yI?=
 =?utf-8?b?5L2c5qWt5Lit77yJ?=
Message-ID: <1303835934.524254.21052.nullmailer@users.sourceforge.jp>

Revision: 20
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=20
Author:   hryksbt
Date:     2011-04-27 01:38:54 +0900 (Wed, 27 Apr 2011)

Log Message:
-----------
ログイン機能（作業中）

Modified Paths:
--------------
    trunk/SmartUpload/user_form.php

Added Paths:
-----------
    trunk/SmartUpload/main.php


-------------- next part --------------
Added: trunk/SmartUpload/main.php
===================================================================
--- trunk/SmartUpload/main.php	                        (rev 0)
+++ trunk/SmartUpload/main.php	2011-04-26 16:38:54 UTC (rev 20)
@@ -0,0 +1,39 @@
+<?php
+	session_start();
+/*
+ * SmartUpload/user_form.php
+ * @author Hiroyuki Shibata
+ * 2011/04/26
+ * Rev 1.0
+ *
+ */
+?>
+
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+<title>SmartUpload</title>
+</head>
+
+<?php
+
+	require_once("include/database.php");
+
+	//ログインチェック
+	if ($_SESSION["id"]==""){
+?>
+		<form name="login_form" action="main.php" method="post">
+		<pre>
+ID（アカウント）	：<input type="text" name="id">
+パスワード	：<input type="password" name="pass"><br>
+<input type="submit" class="update" value="ログイン" />
+		</pre>
+		</form>
+<?php
+	}
+
+	if ($_SESSION["id"]!=""){
+		print ("a");
+	}
+
+?>
\ No newline at end of file

Modified: trunk/SmartUpload/user_form.php
===================================================================
--- trunk/SmartUpload/user_form.php	2011-04-26 14:48:09 UTC (rev 19)
+++ trunk/SmartUpload/user_form.php	2011-04-26 16:38:54 UTC (rev 20)
@@ -20,7 +20,7 @@
 <pre>
 ID（アカウント）	：<input type="text" name="id"> ※ 32文字以内<br>
 パスワード	：<input type="password" name="pass"> ※ 32文字以内<br>
-氏名		：<input type="text" name="name"> ※ 32文字以内<br>
+氏名		：<input type="text" name="name"> ※ 64文字以内<br>
 
 国		：<select name="country">
 	<option value="001">アメリカ</option>

From svnnotify ＠ sourceforge.jp  Wed Apr 27 16:16:42 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 27 Apr 2011 16:16:42 +0900
Subject: [Smartupload-svn] [21]
Message-ID: <1303888602.515797.1617.nullmailer@users.sourceforge.jp>

Revision: 21
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=21
Author:   hryksbt
Date:     2011-04-27 16:16:42 +0900 (Wed, 27 Apr 2011)

Log Message:
-----------


Modified Paths:
--------------
    trunk/SmartUpload/main.php


-------------- next part --------------
Modified: trunk/SmartUpload/main.php
===================================================================
--- trunk/SmartUpload/main.php	2011-04-26 16:38:54 UTC (rev 20)
+++ trunk/SmartUpload/main.php	2011-04-27 07:16:42 UTC (rev 21)
@@ -1,7 +1,7 @@
 <?php
 	session_start();
 /*
- * SmartUpload/user_form.php
+ * SmartUpload/main.php
  * @author Hiroyuki Shibata
  * 2011/04/26
  * Rev 1.0
@@ -20,20 +20,20 @@
 	require_once("include/database.php");
 
 	//ログインチェック
-	if ($_SESSION["id"]==""){
+	if (isset($_SESSION["id"])){
+
+		// アカウントIDを表示
+		print ($_REQUEST["id"]);
+
+	} else {
 ?>
+		<!-- ログインフォーム（非ログイン時） -->
 		<form name="login_form" action="main.php" method="post">
-		<pre>
-ID（アカウント）	：<input type="text" name="id">
-パスワード	：<input type="password" name="pass"><br>
-<input type="submit" class="update" value="ログイン" />
-		</pre>
+			ID（アカウント）	：<input type="text" name="id">
+			パスワード	：<input type="password" name="pass">
+			<input type="submit" class="update" value="ログイン" />
 		</form>
 <?php
+print ($_REQUEST["id"]);
 	}
-
-	if ($_SESSION["id"]!=""){
-		print ("a");
-	}
-
 ?>
\ No newline at end of file

From svnnotify ＠ sourceforge.jp  Thu Apr 28 19:08:56 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 28 Apr 2011 19:08:56 +0900
Subject: [Smartupload-svn] =?utf-8?b?WzIyXSAg44GG44G+44GP5YuV44GL44Gq44GE?=
Message-ID: <1303985336.532674.9507.nullmailer@users.sourceforge.jp>

Revision: 22
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=22
Author:   hryksbt
Date:     2011-04-28 19:08:56 +0900 (Thu, 28 Apr 2011)

Log Message:
-----------
うまく動かない

Modified Paths:
--------------
    trunk/SmartUpload/main.php


-------------- next part --------------
Modified: trunk/SmartUpload/main.php
===================================================================
--- trunk/SmartUpload/main.php	2011-04-27 07:16:42 UTC (rev 21)
+++ trunk/SmartUpload/main.php	2011-04-28 10:08:56 UTC (rev 22)
@@ -3,7 +3,7 @@
 /*
  * SmartUpload/main.php
  * @author Hiroyuki Shibata
- * 2011/04/26
+ * 2011/04/28
  * Rev 1.0
  *
  */
@@ -19,21 +19,34 @@
 
 	require_once("include/database.php");
 
-	//ログインチェック
-	if (isset($_SESSION["id"])){
 
-		// アカウントIDを表示
-		print ($_REQUEST["id"]);
+	if( $_REQUEST["logout"] == "do_logout" ) {
+		unset( $_SESSION["id"] );
+	} else {
 
-	} else {
+		//ログインチェック
+		if( $_REQUEST["cmd"] == "do_login" ) {
+		$_SESSION["id"] = $_REQUEST["id"];
+
+			// ログイン済みの場合アカウントIDを表示
+			print ($_REQUEST["id"]."さん"." ");
 ?>
-		<!-- ログインフォーム（非ログイン時） -->
-		<form name="login_form" action="main.php" method="post">
-			ID（アカウント）	：<input type="text" name="id">
-			パスワード	：<input type="password" name="pass">
-			<input type="submit" class="update" value="ログイン" />
-		</form>
+			<form　name="loout_form" action="main.php" method="post">
+				<input type="submit"  name="logout" value="ログアウト">
+				<input type="hidden" name="cmd" value="do_logout"/>
+			</form>
 <?php
-print ($_REQUEST["id"]);
+
+		} else {
+?>
+			<!-- ログインフォーム（非ログイン時に表示） -->
+			<form name="login_form" action="main.php" method="post">
+				ID（アカウント）	：<input type="text" name="id">
+				パスワード	：<input type="password" name="pass">
+				<input type="submit"  value="ログイン" />
+				<input type="hidden" name="cmd" value="do_login"/>
+			</form>
+<?php
+		}
 	}
 ?>
\ No newline at end of file