From svnnotify ＠ sourceforge.jp  Sun May  1 00:55:21 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sun, 01 May 2011 00:55:21 +0900
Subject: [Smartupload-svn] =?utf-8?b?WzIzXSAg44Ot44Kw44Kk44Oz5qmf6IO96L+9?=
 =?utf-8?b?5Yqg77yI44Om44O844K25oOF5aCx44Gu44OB44Kn44OD44Kv44Gv5pyq5a6f?=
 =?utf-8?b?6KOF77yJ?=
Message-ID: <1304178921.438304.14874.nullmailer@users.sourceforge.jp>

Revision: 23
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=23
Author:   hryksbt
Date:     2011-05-01 00:55:21 +0900 (Sun, 01 May 2011)

Log Message:
-----------
ログイン機能追加（ユーザ情報のチェックは未実装）

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


-------------- next part --------------
Modified: trunk/SmartUpload/main.php
===================================================================
--- trunk/SmartUpload/main.php	2011-04-28 10:08:56 UTC (rev 22)
+++ trunk/SmartUpload/main.php	2011-04-30 15:55:21 UTC (rev 23)
@@ -19,34 +19,43 @@
 
 	require_once("include/database.php");
 
+	function login_form() {
+?>
+		<!-- ログインフォーム（非ログイン時に表示） -->
+		<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="login"/>
+		</form>
+<?php
+	}
 
-	if( $_REQUEST["logout"] == "do_logout" ) {
+	if( $_REQUEST["cmd"] == "logout" ) {
+
 		unset( $_SESSION["id"] );
+		login_form();
+
 	} else {
 
 		//ログインチェック
-		if( $_REQUEST["cmd"] == "do_login" ) {
-		$_SESSION["id"] = $_REQUEST["id"];
+		if( $_REQUEST["cmd"] == "login" ) {
 
+			$_SESSION["id"] = $_REQUEST["id"];
+
 			// ログイン済みの場合アカウントIDを表示
-			print ($_REQUEST["id"]."さん"." ");
+			//print ($_REQUEST["id"]."さん");
 ?>
-			<form　name="loout_form" action="main.php" method="post">
-				<input type="submit"  name="logout" value="ログアウト">
-				<input type="hidden" name="cmd" value="do_logout"/>
+			<form name="logout_form" action="main.php" method="post">
+				<input type="submit"  value="ログアウト">
+				<input type="hidden" name="cmd" value="logout"/>
 			</form>
 <?php
 
 		} 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
+
+			login_form();
+
 		}
 	}
 ?>
\ No newline at end of file

From svnnotify ＠ sourceforge.jp  Sun May  1 01:14:17 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sun, 01 May 2011 01:14:17 +0900
Subject: [Smartupload-svn] [24]
Message-ID: <1304180057.898620.5205.nullmailer@users.sourceforge.jp>

Revision: 24
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=24
Author:   hryksbt
Date:     2011-05-01 01:14:17 +0900 (Sun, 01 May 2011)

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


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


-------------- next part --------------
Modified: trunk/SmartUpload/main.php
===================================================================
--- trunk/SmartUpload/main.php	2011-04-30 15:55:21 UTC (rev 23)
+++ trunk/SmartUpload/main.php	2011-04-30 16:14:17 UTC (rev 24)
@@ -19,8 +19,21 @@
 
 	require_once("include/database.php");
 
-	function login_form() {
+	//ログインチェック
+	if( $_REQUEST["cmd"] == "login" ) {
+
+		// ログイン済みの場合アカウントIDとログアウトボタンを表示
+		print ($_REQUEST["id"]."さん");
 ?>
+		<form name="logout_form" action="main.php" method="post">
+			<input type="submit"  value="ログアウト">
+			<input type="hidden" name="cmd" value="logout"/>
+		</form>
+<?php
+
+	} else {
+
+?>
 		<!-- ログインフォーム（非ログイン時に表示） -->
 		<form name="login_form" action="main.php" method="post">
 			ID（アカウント）	：<input type="text" name="id">
@@ -29,33 +42,5 @@
 			<input type="hidden" name="cmd" value="login"/>
 		</form>
 <?php
-	}
-
-	if( $_REQUEST["cmd"] == "logout" ) {
-
-		unset( $_SESSION["id"] );
-		login_form();
-
-	} else {
-
-		//ログインチェック
-		if( $_REQUEST["cmd"] == "login" ) {
-
-			$_SESSION["id"] = $_REQUEST["id"];
-
-			// ログイン済みの場合アカウントIDを表示
-			//print ($_REQUEST["id"]."さん");
-?>
-			<form name="logout_form" action="main.php" method="post">
-				<input type="submit"  value="ログアウト">
-				<input type="hidden" name="cmd" value="logout"/>
-			</form>
-<?php
-
-		} else {
-
-			login_form();
-
 		}
-	}
 ?>
\ No newline at end of file

From svnnotify ＠ sourceforge.jp  Mon May  2 01:58:37 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 02 May 2011 01:58:37 +0900
Subject: [Smartupload-svn] =?utf-8?b?WzI1XSAg44Ot44Kw44Kk44Oz44OB44Kn44OD?=
 =?utf-8?b?44Kv44GM44GG44G+44GP6KGM44Gj44Gm44Gq44GE44GR44Gp44CC44CC44CC?=
Message-ID: <1304269117.997768.9291.nullmailer@users.sourceforge.jp>

Revision: 25
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=25
Author:   hryksbt
Date:     2011-05-02 01:58:37 +0900 (Mon, 02 May 2011)

Log Message:
-----------
ログインチェックがうまく行ってないけど。。。

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


-------------- next part --------------
Modified: trunk/SmartUpload/main.php
===================================================================
--- trunk/SmartUpload/main.php	2011-04-30 16:14:17 UTC (rev 24)
+++ trunk/SmartUpload/main.php	2011-05-01 16:58:37 UTC (rev 25)
@@ -22,14 +22,28 @@
 	//ログインチェック
 	if( $_REQUEST["cmd"] == "login" ) {
 
-		// ログイン済みの場合アカウントIDとログアウトボタンを表示
-		print ($_REQUEST["id"]."さん");
+		//ユーザ名&パスワードチェック
+		$stmt = $db->prepare( "SELECT * FROM userinfo WHERE userid = ? AND password= ? ");
+		$stmt->bindParam(1,$_REQUEST[id]);
+		$stmt->bindParam(2,$_REQUEST[pass]);
+		$stmt->execute();
+
+		// 検索結果が取れた場合(つまり、ログインに成功した場合)以下の if 文に入る。
+		foreach ($db->query($stmt) as $row) {
+
+			$_SESSION["id"] = $_REQUEST["id"];
+			$_SESSION["name"] = $row["name"];
+			$is_login = 1;
+
+			// ログイン済みの場合アカウントIDとログアウトボタンを表示
+			print ($_REQUEST["id"]."さん");
 ?>
-		<form name="logout_form" action="main.php" method="post">
-			<input type="submit"  value="ログアウト">
-			<input type="hidden" name="cmd" value="logout"/>
-		</form>
+			<form name="logout_form" action="main.php" method="post">
+				<input type="submit"  value="ログアウト">
+				<input type="hidden" name="cmd" value="logout"/>
+			</form>
 <?php
+		}
 
 	} else {
 

From svnnotify ＠ sourceforge.jp  Tue May  3 03:21:17 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 03 May 2011 03:21:17 +0900
Subject: [Smartupload-svn] =?utf-8?b?WzI2XSAg44OV44Op44Kw44Gu5aSJ5pWw44KS?=
 =?utf-8?b?55u044GZ5b+F6KaB44GC44KK?=
Message-ID: <1304360477.832699.17069.nullmailer@users.sourceforge.jp>

Revision: 26
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=26
Author:   hryksbt
Date:     2011-05-03 03:21:17 +0900 (Tue, 03 May 2011)

Log Message:
-----------
フラグの変数を直す必要あり

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


-------------- next part --------------
Modified: trunk/SmartUpload/main.php
===================================================================
--- trunk/SmartUpload/main.php	2011-05-01 16:58:37 UTC (rev 25)
+++ trunk/SmartUpload/main.php	2011-05-02 18:21:17 UTC (rev 26)
@@ -3,7 +3,7 @@
 /*
  * SmartUpload/main.php
  * @author Hiroyuki Shibata
- * 2011/04/28
+ * 2011/05/3
  * Rev 1.0
  *
  */
@@ -19,42 +19,62 @@
 
 	require_once("include/database.php");
 
+	$userid = $_REQUEST['id'];
+	$password = $_REQUEST['pass'];
+
+	function login_form() {
+?>
+		<!-- ログインフォーム -->
+		<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="login"/>
+		</form>
+<?php
+	}
+
 	//ログインチェック
 	if( $_REQUEST["cmd"] == "login" ) {
 
-		//ユーザ名&パスワードチェック
-		$stmt = $db->prepare( "SELECT * FROM userinfo WHERE userid = ? AND password= ? ");
-		$stmt->bindParam(1,$_REQUEST[id]);
-		$stmt->bindParam(2,$_REQUEST[pass]);
-		$stmt->execute();
+		// ログインに失敗した時のエラー表示
+		if( $login == 0 ) {
 
-		// 検索結果が取れた場合(つまり、ログインに成功した場合)以下の if 文に入る。
-		foreach ($db->query($stmt) as $row) {
+			print("ログインに失敗しました。");
+			login_form();
 
-			$_SESSION["id"] = $_REQUEST["id"];
-			$_SESSION["name"] = $row["name"];
-			$is_login = 1;
+		} else {
 
-			// ログイン済みの場合アカウントIDとログアウトボタンを表示
-			print ($_REQUEST["id"]."さん");
+			//ユーザ名&パスワードチェック
+			$stmt = $db->prepare(
+				"SELECT * FROM user_info WHERE userid= ? AND password= ? "
+			);
+			$login = 0;
+
+			// ログインに成功した場合、以下の if 文に入る。
+			if($stmt->execute(array($userid, $password))) {
+
+				while($row = $stmt->fetch(PDO::FETCH_ASSOC)){
+
+				$_SESSION["id"] = $_REQUEST["id"];
+				$login = 1;
+
+				print ($row["fullname"]."さん");
 ?>
-			<form name="logout_form" action="main.php" method="post">
-				<input type="submit"  value="ログアウト">
-				<input type="hidden" name="cmd" value="logout"/>
-			</form>
+				<!-- ログアウトボタン -->
+				<form name="logout_form" action="main.php" method="post">
+					<input type="submit"  value="ログアウト">
+					<input type="hidden" name="cmd" value="logout"/>
+				</form>
 <?php
+ 				}
+			}
 		}
 
 	} 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="login"/>
-		</form>
-<?php
-		}
+		session_destroy();
+		login_form();
+
+	}
 ?>
\ No newline at end of file

From svnnotify ＠ sourceforge.jp  Wed May  4 02:37:16 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 04 May 2011 02:37:16 +0900
Subject: [Smartupload-svn] =?utf-8?b?WzI3XSAg44GC44Go5bCR44GX44GnbWFpbiAu?=
 =?utf-8?b?IHBocOOBjOOBoeOCg+OCk+OBqOWLleOBj+OBqOaAneOBhuOAguOAguOAgg==?=
Message-ID: <1304444236.414787.20392.nullmailer@users.sourceforge.jp>

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

Log Message:
-----------
あと少しでmain.phpがちゃんと動くと思う。。。

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


-------------- next part --------------
Modified: trunk/SmartUpload/download_file.php
===================================================================
--- trunk/SmartUpload/download_file.php	2011-05-02 18:21:17 UTC (rev 26)
+++ trunk/SmartUpload/download_file.php	2011-05-03 17:37:16 UTC (rev 27)
@@ -42,4 +42,6 @@
 
 	}
 
-	?>
\ No newline at end of file
+	?>
+</body>
+</html>
\ No newline at end of file

Modified: trunk/SmartUpload/main.php
===================================================================
--- trunk/SmartUpload/main.php	2011-05-02 18:21:17 UTC (rev 26)
+++ trunk/SmartUpload/main.php	2011-05-03 17:37:16 UTC (rev 27)
@@ -3,7 +3,7 @@
 /*
  * SmartUpload/main.php
  * @author Hiroyuki Shibata
- * 2011/05/3
+ * 2011/05/4
  * Rev 1.0
  *
  */
@@ -14,7 +14,7 @@
 <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
 <title>SmartUpload</title>
 </head>
-
+<body>
 <?php
 
 	require_once("include/database.php");
@@ -34,47 +34,54 @@
 <?php
 	}
 
-	//ログインチェック
-	if( $_REQUEST["cmd"] == "login" ) {
+	// ログインチェック
 
-		// ログインに失敗した時のエラー表示
-		if( $login == 0 ) {
+	if( $_REQUEST['cmd'] == "login" ) {
 
-			print("ログインに失敗しました。");
-			login_form();
+		// ユーザ名＆パスワードチェック
 
-		} else {
+		$stmt = $db->prepare(
+			"SELECT * FROM user_info WHERE userid= ? AND password= ? "
+		);
 
-			//ユーザ名&パスワードチェック
-			$stmt = $db->prepare(
-				"SELECT * FROM user_info WHERE userid= ? AND password= ? "
-			);
-			$login = 0;
+		$stmt->execute(array($userid, $password));
 
-			// ログインに成功した場合、以下の if 文に入る。
-			if($stmt->execute(array($userid, $password))) {
+		while($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
 
-				while($row = $stmt->fetch(PDO::FETCH_ASSOC)){
+			// ログイン成功時
+			if($row['userid'] == $_REQUEST['id']) {
 
 				$_SESSION["id"] = $_REQUEST["id"];
-				$login = 1;
 
 				print ($row["fullname"]."さん");
+
 ?>
 				<!-- ログアウトボタン -->
 				<form name="logout_form" action="main.php" method="post">
 					<input type="submit"  value="ログアウト">
 					<input type="hidden" name="cmd" value="logout"/>
+<?php
+				session_destroy();
+?>
 				</form>
 <?php
- 				}
+			} else {
+
+				// ログイン失敗時
+				print ("ログインに失敗しました");
+				login_form();
+
 			}
+
 		}
 
+	// 未ログインの場合
+
 	} else {
 
-		session_destroy();
 		login_form();
 
 	}
-?>
\ No newline at end of file
+?>
+</body>
+</html>
\ No newline at end of file

From svnnotify ＠ sourceforge.jp  Wed May  4 23:10:12 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 04 May 2011 23:10:12 +0900
Subject: [Smartupload-svn] [28]
Message-ID: <1304518212.316694.30641.nullmailer@users.sourceforge.jp>

Revision: 28
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=28
Author:   hryksbt
Date:     2011-05-04 23:10:11 +0900 (Wed, 04 May 2011)

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


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

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


-------------- next part --------------
Added: trunk/SmartUpload/login.php
===================================================================
--- trunk/SmartUpload/login.php	                        (rev 0)
+++ trunk/SmartUpload/login.php	2011-05-04 14:10:11 UTC (rev 28)
@@ -0,0 +1,77 @@
+<?php
+	session_start();
+/*
+ * SmartUpload/main.php
+ * @author Hiroyuki Shibata
+ * 2011/05/4
+ * Rev 1.0
+ *
+ */
+?>
+
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+<title>SmartUpload</title>
+</head>
+<body>
+
+<?php
+	require_once("include/database.php");
+
+	$userid = $_REQUEST['id'];
+	$password = $_REQUEST['pass'];
+
+	function login_form() {
+?>
+		<!-- ログインフォーム -->
+		<form name="login_form" action="login.php" method="post">
+			ID（アカウント）	：<input type="text" name="id">
+			パスワード	：<input type="password" name="pass">
+			<input type="submit"  value="ログイン" />
+			<input type="hidden" name="cmd" value="login"/>
+		</form>
+<?php
+	}
+
+	if( $_REQUEST['cmd'] == "login" ) {
+
+		// ユーザ名＆パスワードチェック
+		$stmt = $db->prepare("SELECT * FROM user_info WHERE userid= ? AND password= ? ");
+		$stmt->execute(array($userid, $password));
+
+		if ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
+
+			// ログイン成功時
+			$_SESSION["id"] = $_REQUEST["id"];
+			print ($row["fullname"]."さん");
+?>
+			<!-- ログアウトボタン -->
+				<form name="logout_form" action="login.php" method="post">
+					<input type="submit"  value="ログアウト">
+					<input type="hidden" name="cmd" value="logout"/>
+				</form>
+<?php
+		} else {
+
+			// ログイン失敗時
+			print ("ログインに失敗しました");
+			login_form();
+
+		}
+
+	} else if( $_REQUEST['cmd'] == "logout" ) {
+
+		print ("ログアウトしました");
+		session_destroy();
+		login_form();
+
+	} else {
+
+		// 未ログインの場合
+		login_form();
+
+	}
+?>
+</body>
+</html>
\ No newline at end of file

Deleted: trunk/SmartUpload/main.php
===================================================================
--- trunk/SmartUpload/main.php	2011-05-03 17:37:16 UTC (rev 27)
+++ trunk/SmartUpload/main.php	2011-05-04 14:10:11 UTC (rev 28)
@@ -1,87 +0,0 @@
-<?php
-	session_start();
-/*
- * SmartUpload/main.php
- * @author Hiroyuki Shibata
- * 2011/05/4
- * Rev 1.0
- *
- */
-?>
-
-<html>
-<head>
-<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-<title>SmartUpload</title>
-</head>
-<body>
-<?php
-
-	require_once("include/database.php");
-
-	$userid = $_REQUEST['id'];
-	$password = $_REQUEST['pass'];
-
-	function login_form() {
-?>
-		<!-- ログインフォーム -->
-		<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="login"/>
-		</form>
-<?php
-	}
-
-	// ログインチェック
-
-	if( $_REQUEST['cmd'] == "login" ) {
-
-		// ユーザ名＆パスワードチェック
-
-		$stmt = $db->prepare(
-			"SELECT * FROM user_info WHERE userid= ? AND password= ? "
-		);
-
-		$stmt->execute(array($userid, $password));
-
-		while($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-
-			// ログイン成功時
-			if($row['userid'] == $_REQUEST['id']) {
-
-				$_SESSION["id"] = $_REQUEST["id"];
-
-				print ($row["fullname"]."さん");
-
-?>
-				<!-- ログアウトボタン -->
-				<form name="logout_form" action="main.php" method="post">
-					<input type="submit"  value="ログアウト">
-					<input type="hidden" name="cmd" value="logout"/>
-<?php
-				session_destroy();
-?>
-				</form>
-<?php
-			} else {
-
-				// ログイン失敗時
-				print ("ログインに失敗しました");
-				login_form();
-
-			}
-
-		}
-
-	// 未ログインの場合
-
-	} else {
-
-		login_form();
-
-	}
-?>
-</body>
-</html>
\ No newline at end of file

From svnnotify ＠ sourceforge.jp  Wed May  4 23:24:06 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 04 May 2011 23:24:06 +0900
Subject: [Smartupload-svn] =?utf-8?b?WzI5XSAg6KqN6Ki85qmf6IO95a6M5LqG?=
Message-ID: <1304519046.162141.13820.nullmailer@users.sourceforge.jp>

Revision: 29
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=29
Author:   hryksbt
Date:     2011-05-04 23:24:06 +0900 (Wed, 04 May 2011)

Log Message:
-----------
認証機能完了

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


-------------- next part --------------
Copied: trunk/SmartUpload/auth.php (from rev 28, trunk/SmartUpload/login.php)
===================================================================
--- trunk/SmartUpload/auth.php	                        (rev 0)
+++ trunk/SmartUpload/auth.php	2011-05-04 14:24:06 UTC (rev 29)
@@ -0,0 +1,78 @@
+<?php
+	session_start();
+/*
+ * SmartUpload/auth.php
+ * @author Hiroyuki Shibata
+ * 2011/05/4
+ * Rev 1.0
+ *
+ */
+?>
+
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+<title>SmartUpload</title>
+</head>
+<body>
+
+<?php
+	require_once("include/database.php");
+
+	$userid = $_REQUEST['id'];
+	$password = $_REQUEST['pass'];
+
+	function login_form() {
+?>
+		<!-- ログインフォーム -->
+		<form name="login_form" action="auth.php" method="post">
+			ID（アカウント）	：<input type="text" name="id">
+			パスワード	：<input type="password" name="pass">
+			<input type="submit"  value="ログイン" />
+			<input type="hidden" name="cmd" value="login"/>
+		</form>
+<?php
+	}
+
+	if( $_REQUEST['cmd'] == "login" ) {
+
+		// ユーザ名＆パスワードチェック
+		$stmt = $db->prepare("SELECT * FROM user_info WHERE userid= ? AND password= ? ");
+		$stmt->execute(array($userid, $password));
+
+		if ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
+
+			// ログイン成功時
+			$_SESSION["id"] = $_REQUEST["id"];
+			print ($row["fullname"]."さん");
+?>
+			<!-- ログアウトボタン -->
+				<form name="logout_form" action="auth.php" method="post">
+					<input type="submit"  value="ログアウト">
+					<input type="hidden" name="cmd" value="logout"/>
+				</form>
+<?php
+		} else {
+
+			// ログイン失敗時
+			print ("ログインに失敗しました");
+			login_form();
+
+		}
+
+	} else if( $_REQUEST['cmd'] == "logout" ) {
+
+		// ログアウト完了後
+		print ("ログアウトしました");
+		session_destroy();
+		login_form();
+
+	} else {
+
+		// 未ログインの場合
+		login_form();
+
+	}
+?>
+</body>
+</html>
\ No newline at end of file

From svnnotify ＠ sourceforge.jp  Thu May  5 00:25:07 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 05 May 2011 00:25:07 +0900
Subject: [Smartupload-svn] =?utf-8?b?WzMwXSBzZXNzaW9uX3N0YXJ0KCk7IOOBrg==?=
 =?utf-8?b?6KGM44Gu5pu444GN5L2N572u44KS5aSJ5pu0?=
Message-ID: <1304522707.048277.19571.nullmailer@users.sourceforge.jp>

Revision: 30
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=30
Author:   hryksbt
Date:     2011-05-05 00:25:06 +0900 (Thu, 05 May 2011)

Log Message:
-----------
session_start();の行の書き位置を変更

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

Removed Paths:
-------------
    trunk/SmartUpload/login.php


-------------- next part --------------
Modified: trunk/SmartUpload/auth.php
===================================================================
--- trunk/SmartUpload/auth.php	2011-05-04 14:24:06 UTC (rev 29)
+++ trunk/SmartUpload/auth.php	2011-05-04 15:25:06 UTC (rev 30)
@@ -1,5 +1,4 @@
 <?php
-	session_start();
 /*
  * SmartUpload/auth.php
  * @author Hiroyuki Shibata
@@ -7,6 +6,7 @@
  * Rev 1.0
  *
  */
+	session_start();
 ?>
 
 <html>

Modified: trunk/SmartUpload/download_file.php
===================================================================
--- trunk/SmartUpload/download_file.php	2011-05-04 14:24:06 UTC (rev 29)
+++ trunk/SmartUpload/download_file.php	2011-05-04 15:25:06 UTC (rev 30)
@@ -6,6 +6,7 @@
  * Rev 1.0
  *
  */
+	session_start();
 ?>
 <html>
 <head>

Deleted: trunk/SmartUpload/login.php
===================================================================
--- trunk/SmartUpload/login.php	2011-05-04 14:24:06 UTC (rev 29)
+++ trunk/SmartUpload/login.php	2011-05-04 15:25:06 UTC (rev 30)
@@ -1,77 +0,0 @@
-<?php
-	session_start();
-/*
- * SmartUpload/main.php
- * @author Hiroyuki Shibata
- * 2011/05/4
- * Rev 1.0
- *
- */
-?>
-
-<html>
-<head>
-<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-<title>SmartUpload</title>
-</head>
-<body>
-
-<?php
-	require_once("include/database.php");
-
-	$userid = $_REQUEST['id'];
-	$password = $_REQUEST['pass'];
-
-	function login_form() {
-?>
-		<!-- ログインフォーム -->
-		<form name="login_form" action="login.php" method="post">
-			ID（アカウント）	：<input type="text" name="id">
-			パスワード	：<input type="password" name="pass">
-			<input type="submit"  value="ログイン" />
-			<input type="hidden" name="cmd" value="login"/>
-		</form>
-<?php
-	}
-
-	if( $_REQUEST['cmd'] == "login" ) {
-
-		// ユーザ名＆パスワードチェック
-		$stmt = $db->prepare("SELECT * FROM user_info WHERE userid= ? AND password= ? ");
-		$stmt->execute(array($userid, $password));
-
-		if ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-
-			// ログイン成功時
-			$_SESSION["id"] = $_REQUEST["id"];
-			print ($row["fullname"]."さん");
-?>
-			<!-- ログアウトボタン -->
-				<form name="logout_form" action="login.php" method="post">
-					<input type="submit"  value="ログアウト">
-					<input type="hidden" name="cmd" value="logout"/>
-				</form>
-<?php
-		} else {
-
-			// ログイン失敗時
-			print ("ログインに失敗しました");
-			login_form();
-
-		}
-
-	} else if( $_REQUEST['cmd'] == "logout" ) {
-
-		print ("ログアウトしました");
-		session_destroy();
-		login_form();
-
-	} else {
-
-		// 未ログインの場合
-		login_form();
-
-	}
-?>
-</body>
-</html>
\ No newline at end of file

Modified: trunk/SmartUpload/upload_file.php
===================================================================
--- trunk/SmartUpload/upload_file.php	2011-05-04 14:24:06 UTC (rev 29)
+++ trunk/SmartUpload/upload_file.php	2011-05-04 15:25:06 UTC (rev 30)
@@ -6,6 +6,7 @@
  * Rev 1.0
  *
  */
+	session_start();
 ?>
 <html>
 <head>
@@ -17,7 +18,6 @@
 		<b>File Uploader</b>
 	</p>
 	<?php
-	//session_start();
 
 	// メイン処理 //
 

Modified: trunk/SmartUpload/upload_form.php
===================================================================
--- trunk/SmartUpload/upload_form.php	2011-05-04 14:24:06 UTC (rev 29)
+++ trunk/SmartUpload/upload_form.php	2011-05-04 15:25:06 UTC (rev 30)
@@ -6,6 +6,7 @@
  * Rev 1.0
  *
  */
+	session_start();
 ?>
 
 <html>

Modified: trunk/SmartUpload/user_add.php
===================================================================
--- trunk/SmartUpload/user_add.php	2011-05-04 14:24:06 UTC (rev 29)
+++ trunk/SmartUpload/user_add.php	2011-05-04 15:25:06 UTC (rev 30)
@@ -6,6 +6,7 @@
  * Rev 1.0
  *
  */
+	session_start();
 ?>
 <html>
 <head>

Modified: trunk/SmartUpload/user_form.php
===================================================================
--- trunk/SmartUpload/user_form.php	2011-05-04 14:24:06 UTC (rev 29)
+++ trunk/SmartUpload/user_form.php	2011-05-04 15:25:06 UTC (rev 30)
@@ -6,6 +6,7 @@
  * Rev 1.0
  *
  */
+	session_start();
 ?>
 <html>
 <head>

From svnnotify ＠ sourceforge.jp  Thu May  5 02:05:28 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 05 May 2011 02:05:28 +0900
Subject: [Smartupload-svn] =?utf-8?b?WzMxXSBkb3dubG9hZF9maWxlLiBwaHDjgas=?=
 =?utf-8?b?44Kz44Oh44Oz44OI6KGo56S644KS6L+95Yqg44GX44CB6KGo44Gn44Gu6KGo?=
 =?utf-8?b?56S644Gr5aSJ5pu0?=
Message-ID: <1304528728.941088.12468.nullmailer@users.sourceforge.jp>

Revision: 31
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=31
Author:   hryksbt
Date:     2011-05-05 02:05:28 +0900 (Thu, 05 May 2011)

Log Message:
-----------
download_file.phpにコメント表示を追加し、表での表示に変更

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

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


-------------- next part --------------
Modified: trunk/SmartUpload/download_file.php
===================================================================
--- trunk/SmartUpload/download_file.php	2011-05-04 15:25:06 UTC (rev 30)
+++ trunk/SmartUpload/download_file.php	2011-05-04 17:05:28 UTC (rev 31)
@@ -2,7 +2,7 @@
 /*
  * SmartUpload/download_file.php
  * @author Hiroyuki Shibata
- * 2011/04/26
+ * 2011/05/04
  * Rev 1.0
  *
  */
@@ -15,7 +15,7 @@
 </head>
 <body>
 	<p>
-		<b>File Downloader</b>
+		<b>ダウンロード</b>
 	</p>
 	<?php
 
@@ -26,23 +26,28 @@
 	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>");
-
+	$sql = $db->prepare('select * from data_info');
+	$sql->execute();
+	?>
+		<table border>
+			<tr>
+				<th>ファイル名</th>
+				<th>アップロード年月日＆時刻</th>
+				<th>サイズ</th>
+				<th>コメント</th>
+			</tr>
+	<?php
+		while($row = $sql->fetch(PDO::FETCH_ASSOC)) {
+	?>
+			<tr>
+				<td><a href="./data/ <?php print($row['filename']); ?> "><?php print($row['filename']); ?></a></td>
+				<td><?php print($row['uploaddate']); ?></td>
+				<td><?php print($row['data_size']); ?>	</td>
+				<td><?php print($row["comment"]); ?></td>
+			</tr>
+	<?php
 	}
-
 	?>
+		</table>
 </body>
 </html>
\ No newline at end of file

Added: trunk/SmartUpload/main.php
===================================================================
--- trunk/SmartUpload/main.php	                        (rev 0)
+++ trunk/SmartUpload/main.php	2011-05-04 17:05:28 UTC (rev 31)
@@ -0,0 +1,10 @@
+<?php
+/*
+ * SmartUpload/main.php
+ * @author Hiroyuki Shibata
+ * 2011/05/4
+ * Rev 1.0
+ *
+ */
+	session_start();
+?>
\ No newline at end of file

Modified: trunk/SmartUpload/upload_form.php
===================================================================
--- trunk/SmartUpload/upload_form.php	2011-05-04 15:25:06 UTC (rev 30)
+++ trunk/SmartUpload/upload_form.php	2011-05-04 17:05:28 UTC (rev 31)
@@ -2,7 +2,7 @@
 /*
  * SmartUpload/upload_form.php
  * @author Hiroyuki Shibata
- * 2011/04/26
+ * 2011/05/4
  * Rev 1.0
  *
  */
@@ -15,9 +15,17 @@
 <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="アップロード">
+	<p>
+		<b>アップロード</b>
+	</p>
+	<form method="post" enctype="multipart/form-data" action="upload_file.php">
+	<pre>
+コンテンツ名	：<input type="text" name="mail"> ※ 全角32文字以内<br>
+カテゴリ		：<input type="text" name="mail"><br>
+コメント		：<input type="text" name="mail"> ※ 全角512文字以内<br>
+ファイル		：<input type="file" name="upfile"><br>
+<input type="submit" value="アップロード"> <input type="reset" value="リセット">
+	</pre>
 	</form>
 </body>
 </html>

Modified: trunk/SmartUpload/user_form.php
===================================================================
--- trunk/SmartUpload/user_form.php	2011-05-04 15:25:06 UTC (rev 30)
+++ trunk/SmartUpload/user_form.php	2011-05-04 17:05:28 UTC (rev 31)
@@ -2,7 +2,7 @@
 /*
  * SmartUpload/user_form.php
  * @author Hiroyuki Shibata
- * 2011/04/26
+ * 2011/05/01
  * Rev 1.0
  *
  */
@@ -19,10 +19,9 @@
 	</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"> ※ 64文字以内<br>
-
+ID（アカウント）	：<input type="text" name="id"> ※ 半角32文字以内<br>
+パスワード	：<input type="password" name="pass"> ※ 半角英数字32文字以内<br>
+氏名		：<input type="text" name="name"> ※ 全角32文字以内（半角64文字以内）<br>
 国		：<select name="country">
 	<option value="001">アメリカ</option>
 	<option value="002">日本</option>
@@ -31,12 +30,11 @@
 	<option value="005">インドネシア</option>
 	<option value="006">ブラジル</option>
 </select>
-
 <br>
-メールアドレス	：<input type="text" name="mail"> ※ 64文字以内<br>
+メールアドレス	：<input type="text" name="mail"> ※ 半角64文字以内<br>
+
+<input type="submit" class="update" value="登録" /> <input type="reset" value="リセット">
 </pre>
-		<input type="submit" class="update" value="登録" /> <input type="reset"
-			value="リセット">
 	</form>
 </body>
 </html>

From svnnotify ＠ sourceforge.jp  Fri May  6 01:54:14 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 06 May 2011 01:54:14 +0900
Subject: [Smartupload-svn] =?utf-8?b?WzMyXSAg44OV44Kp44O844Og44Gu6aCF55uu?=
 =?utf-8?b?44KS44GE44GP44Gk44GL6L+95Yqg?=
Message-ID: <1304614454.212447.19807.nullmailer@users.sourceforge.jp>

Revision: 32
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=32
Author:   hryksbt
Date:     2011-05-06 01:54:13 +0900 (Fri, 06 May 2011)

Log Message:
-----------
フォームの項目をいくつか追加
ログインに対するエラーチェックを追加

Modified Paths:
--------------
    trunk/SmartUpload/main.php
    trunk/SmartUpload/upload_file.php
    trunk/SmartUpload/upload_form.php
    trunk/SmartUpload/user_add.php
    trunk/SmartUpload/user_form.php

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


-------------- next part --------------
Modified: trunk/SmartUpload/main.php
===================================================================
--- trunk/SmartUpload/main.php	2011-05-04 17:05:28 UTC (rev 31)
+++ trunk/SmartUpload/main.php	2011-05-05 16:54:13 UTC (rev 32)
@@ -7,4 +7,12 @@
  *
  */
 	session_start();
-?>
\ No newline at end of file
+?>
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+<title>SmartUpload</title>
+</head>
+<body>
+</body>
+</html>
\ No newline at end of file

Added: trunk/SmartUpload/mod_user.php
===================================================================
--- trunk/SmartUpload/mod_user.php	                        (rev 0)
+++ trunk/SmartUpload/mod_user.php	2011-05-05 16:54:13 UTC (rev 32)
@@ -0,0 +1,18 @@
+<?php
+/*
+ * SmartUpload/mod_user.php
+ * @author Hiroyuki Shibata
+ * 2011/05/5
+ * Rev 1.0
+ *
+ */
+	session_start();
+?>
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+<title>SmartUpload</title>
+</head>
+<body>
+</body>
+</html>
\ No newline at end of file

Modified: trunk/SmartUpload/upload_file.php
===================================================================
--- trunk/SmartUpload/upload_file.php	2011-05-04 17:05:28 UTC (rev 31)
+++ trunk/SmartUpload/upload_file.php	2011-05-05 16:54:13 UTC (rev 32)
@@ -2,7 +2,7 @@
 /*
  * SmartUpload/upload_file.php
  * @author Hiroyuki Shibata
- * 2011/04/26
+ * 2011/05/05
  * Rev 1.0
  *
  */
@@ -25,8 +25,12 @@
 
 	$updir = "./data/";
 
+	$contentname = $_REQUEST["category"];
 	$filename = $_FILES['upfile']['name'];
 	$filesize = filesize($_FILES['upfile']['tmp_name']);
+	$username = $_SESSION["id"];
+	$category = $_REQUEST["category"];
+	$commnet = $_REQUEST["comment"];
 
 	if(move_uploaded_file($_FILES['upfile']['tmp_name'], $updir.$filename)==FALSE) {
 
@@ -40,24 +44,40 @@
 
 		// データベース処理
 		$stmt = $db->prepare(
-			"INSERT INTO data_info (filename, uploaddate, data_size) VALUES(? ,now() ,?)");
+			"INSERT INTO data_info (
+				contentname,
+				filename,
+				uploaddate,
+				username,
+				data_size,
+				category,
+				comment
+			) VALUES (?, ? ,now() ,? ,? ,? ,?)");
 
-		$stmt->bindParam(1,$filename);
-		$stmt->bindParam(2,$filesize);
+		$stmt->bindParam(1, $contentname);
+		$stmt->bindParam(2, $filename);
+		$stmt->bindParam(3, $username);
+		$stmt->bindParam(4, $filesize);
+		$stmt->bindParam(5, $category);
+		$stmt->bindParam(6, $commnet);
 		$stmt->execute();
 
 		print('<br>');
 
-		$sql ='select * from data_info';
+		/*
+		$sql = $db->prepare('select * from data_info where filename = ?');
+		$sql->execute(array($filename));
+		$row = $sql->fetch(PDO::FETCH_ASSOC);
 
-		foreach ($db->query($sql) as $row) {
+		print($row['contentname']." ");
+		print($row['filename']." ");
+		print($row['uploaddate']." ");
+		print($row['username']." ");
+		print($row['data_size']." ");
+		print($row['category']." ");
+		print($row['comment'].'<br />');
+		*/
 
-			print($row['filename']." ");
-			print($row['uploaddate']." ");
-			print($row['data_size'].'<br />');
-
-		}
-
 	}
 
 	?>

Modified: trunk/SmartUpload/upload_form.php
===================================================================
--- trunk/SmartUpload/upload_form.php	2011-05-04 17:05:28 UTC (rev 31)
+++ trunk/SmartUpload/upload_form.php	2011-05-05 16:54:13 UTC (rev 32)
@@ -2,7 +2,7 @@
 /*
  * SmartUpload/upload_form.php
  * @author Hiroyuki Shibata
- * 2011/05/4
+ * 2011/05/5
  * Rev 1.0
  *
  */
@@ -21,8 +21,25 @@
 	<form method="post" enctype="multipart/form-data" action="upload_file.php">
 	<pre>
 コンテンツ名	：<input type="text" name="mail"> ※ 全角32文字以内<br>
-カテゴリ		：<input type="text" name="mail"><br>
-コメント		：<input type="text" name="mail"> ※ 全角512文字以内<br>
+カテゴリ		：<select name="category">
+<?php
+	require_once("include/database.php");
+
+	$value = 0;
+
+	$stmt = $db->prepare("SELECT * FROM category");
+	$stmt->execute();
+
+	while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
+?>
+		<option value="<?php print($row["cat_number"]); ?>">
+			<?php print($row["cat_name"]); ?>
+		</option>
+<?php
+	}
+?>
+				 </select>
+コメント		：<textarea name="comment" rows=3 cols=50 wrap="virtual"></textarea> ※ 全角512文字以内<br>
 ファイル		：<input type="file" name="upfile"><br>
 <input type="submit" value="アップロード"> <input type="reset" value="リセット">
 	</pre>

Modified: trunk/SmartUpload/user_add.php
===================================================================
--- trunk/SmartUpload/user_add.php	2011-05-04 17:05:28 UTC (rev 31)
+++ trunk/SmartUpload/user_add.php	2011-05-05 16:54:13 UTC (rev 32)
@@ -2,7 +2,7 @@
 /*
  * SmartUpload/user_add.php
  * @author Hiroyuki Shibata
- * 2011/04/26
+ * 2011/05/05
  * Rev 1.0
  *
  */
@@ -14,43 +14,51 @@
 <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)"
-		);
+		if ($_SESSION["id"]) {
 
-		$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();
+			print("すでにログインしています");
 
-		// 登録成功を表示 //
-		$sql ='select userid from user_info';
+		} else {
+	?>
+	<p>
+		<b>登録完了</b>
+	</p>
+	<?php
+			// DBに登録 //
+			$stmt = $db->prepare(
+				"INSERT INTO user_info (
+					userid,
+					password,
+					fullname,
+					country_code,
+					add_date,
+					email,
+					frag
+				) VALUES ( ?, ?, ?, ?, now(), ?, 0)"
+			);
 
-		foreach ($db->query($sql) as $row) {
+			$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();
 
-			print($row['userid']." "."が登録されました。");
+			// 登録成功を表示 //
+			$sql ='select userid from user_info';
 
+			foreach ($db->query($sql) as $row) {
+
+				print($row['userid']." "."が登録されました。");
+			}
 		}
 
 	} catch (PDOException $e) {

Modified: trunk/SmartUpload/user_form.php
===================================================================
--- trunk/SmartUpload/user_form.php	2011-05-04 17:05:28 UTC (rev 31)
+++ trunk/SmartUpload/user_form.php	2011-05-05 16:54:13 UTC (rev 32)
@@ -2,11 +2,11 @@
 /*
  * SmartUpload/user_form.php
  * @author Hiroyuki Shibata
- * 2011/05/01
+ * 2011/05/05
  * Rev 1.0
  *
  */
-	session_start();
+session_start();
 ?>
 <html>
 <head>
@@ -14,11 +14,18 @@
 <title>SmartUpload</title>
 </head>
 <body>
-	<p>
-		<b>ユーザー登録</b>
-	</p>
-	<form name="user_form" action="./user_add.php" method="post">
-<pre>
+	<?php
+	if ($_SESSION["id"]) {
+
+		print("すでにログインしています");
+
+	} else {
+	?>
+		<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文字以内（半角64文字以内）<br>
@@ -33,8 +40,12 @@
 <br>
 メールアドレス	：<input type="text" name="mail"> ※ 半角64文字以内<br>
 
-<input type="submit" class="update" value="登録" /> <input type="reset" value="リセット">
-</pre>
-	</form>
+<input type="submit" class="update" value="登録" /> <input type="reset"
+				value="リセット">
+			</pre>
+		</form>
+	<?php
+	}
+	?>
 </body>
 </html>

From svnnotify ＠ sourceforge.jp  Fri May  6 01:54:58 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 06 May 2011 01:54:58 +0900
Subject: [Smartupload-svn] =?utf-8?b?WzMzXSAg44OG44K544OI44OH44O844K/6L+9?=
 =?utf-8?b?5Yqg?=
Message-ID: <1304614498.752012.20240.nullmailer@users.sourceforge.jp>

Revision: 33
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=33
Author:   hryksbt
Date:     2011-05-06 01:54:58 +0900 (Fri, 06 May 2011)

Log Message:
-----------
テストデータ追加

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


-------------- next part --------------
Added: trunk/SmartUpload/data/test2.txt
===================================================================
--- trunk/SmartUpload/data/test2.txt	                        (rev 0)
+++ trunk/SmartUpload/data/test2.txt	2011-05-05 16:54:58 UTC (rev 33)
@@ -0,0 +1,122 @@
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
\ No newline at end of file


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

From svnnotify ＠ sourceforge.jp  Fri May  6 01:58:44 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 06 May 2011 01:58:44 +0900
Subject: [Smartupload-svn] =?utf-8?b?WzM0XSAgbXlzcWxkdW1w44OH44O844K/5pu0?=
 =?utf-8?b?5paw?=
Message-ID: <1304614724.499693.25018.nullmailer@users.sourceforge.jp>

Revision: 34
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=34
Author:   hryksbt
Date:     2011-05-06 01:58:44 +0900 (Fri, 06 May 2011)

Log Message:
-----------
mysqldumpデータ更新

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

Added Paths:
-----------
    trunk/SmartUpload/data/aaa.jpg.r0
    trunk/SmartUpload/data/aaa.jpg.r7


-------------- next part --------------
Modified: trunk/Database/dump.sql
===================================================================
--- trunk/Database/dump.sql	2011-05-05 16:54:58 UTC (rev 33)
+++ trunk/Database/dump.sql	2011-05-05 16:58:44 UTC (rev 34)
@@ -1,75 +1,117 @@
-?-- phpMyAdmin SQL Dump
--- version 3.2.4
--- http://www.phpmyadmin.net
+-- MySQL dump 10.13  Distrib 5.1.41, for Win32 (ia32)
 --
--- ホスト: localhost
--- 生成時間: 2011 年 4 月 26 日 23:45
--- サーバのバージョン: 5.1.41
--- PHP のバージョン: 5.3.1
+-- Host: localhost    Database: upload
+-- ------------------------------------------------------
+-- Server version	5.1.41
 
-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 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 
 --
--- データベース: `upload`
+-- Table structure for table `category`
 --
-CREATE DATABASE `upload` DEFAULT CHARACTER SET latin1 COLLATE latin1_swedish_ci;
-USE `upload`;
 
--- --------------------------------------------------------
+DROP TABLE IF EXISTS `category`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `category` (
+  `cat_number` smallint(6) NOT NULL AUTO_INCREMENT,
+  `cat_name` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
+  PRIMARY KEY (`cat_number`),
+  UNIQUE KEY `index_cat_name` (`cat_name`)
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- テーブルの構造 `data_info`
+-- Dumping data for table `category`
 --
 
-CREATE TABLE IF NOT EXISTS `data_info` (
+LOCK TABLES `category` WRITE;
+/*!40000 ALTER TABLE `category` DISABLE KEYS */;
+INSERT INTO `category` VALUES (3,'application'),(1,'music'),(2,'photo');
+/*!40000 ALTER TABLE `category` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `data_info`
+--
+
+DROP TABLE IF EXISTS `data_info`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `data_info` (
+  `num` bigint(20) NOT NULL AUTO_INCREMENT,
+  `contentname` varchar(64) NOT NULL,
   `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,
+  `username` varchar(64) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT 'a',
   `data_size` int(10) NOT NULL,
   `rank` int(3) DEFAULT NULL,
+  `category` smallint(6) NOT NULL,
+  `comment` varchar(1024) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
+  PRIMARY KEY (`num`),
   UNIQUE KEY `index_filename` (`filename`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=5 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- テーブルのデータをダンプしています `data_info`
+-- Dumping data for table `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);
+LOCK TABLES `data_info` WRITE;
+/*!40000 ALTER TABLE `data_info` DISABLE KEYS */;
+INSERT INTO `data_info` VALUES (1,'','aaa.jpg','2011-04-18 00:00:00','a',666,NULL,0,'ああああああああ'),(2,'','bbb','2011-04-18 23:49:46','',777,NULL,0,''),(3,'','test.txt','2011-04-26 00:50:36','',20,NULL,0,''),(4,'3','test2.txt','2011-05-06 01:35:08','a',9092,NULL,3,'test2');
+/*!40000 ALTER TABLE `data_info` ENABLE KEYS */;
+UNLOCK TABLES;
 
--- --------------------------------------------------------
-
 --
--- テーブルの構造 `user_info`
+-- Table structure for table `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,
+DROP TABLE IF EXISTS `user_info`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `user_info` (
+  `num` bigint(20) NOT NULL AUTO_INCREMENT,
+  `userid` varchar(32) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+  `password` varchar(32) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+  `fullname` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin 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;
+  `charge` tinyint(1) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`num`),
+  UNIQUE KEY `index_email` (`email`)
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- テーブルのデータをダンプしています `user_info`
+-- Dumping data for table `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);
+LOCK TABLES `user_info` WRITE;
+/*!40000 ALTER TABLE `user_info` DISABLE KEYS */;
+INSERT INTO `user_info` VALUES (1,'b','bbb','BBB',1,'2011-05-01 00:29:57',NULL,'',0,0),(2,'a','aaa','AAA',1,'2011-04-26 23:34:00',NULL,'aaa',0,0);
+/*!40000 ALTER TABLE `user_info` ENABLE KEYS */;
+UNLOCK TABLES;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
 /*!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 */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+-- Dump completed on 2011-05-06  1:56:05

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


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

From svnnotify ＠ sourceforge.jp  Fri May  6 02:00:02 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 06 May 2011 02:00:02 +0900
Subject: [Smartupload-svn] [35]
Message-ID: <1304614802.035220.26142.nullmailer@users.sourceforge.jp>

Revision: 35
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=35
Author:   hryksbt
Date:     2011-05-06 02:00:01 +0900 (Fri, 06 May 2011)

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


Removed Paths:
-------------
    trunk/SmartUpload/data/aaa.jpg.r0
    trunk/SmartUpload/data/aaa.jpg.r7


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

From svnnotify ＠ sourceforge.jp  Fri May  6 23:35:10 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 06 May 2011 23:35:10 +0900
Subject: [Smartupload-svn] [36]
Message-ID: <1304692510.658047.13282.nullmailer@users.sourceforge.jp>

Revision: 36
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=36
Author:   hryksbt
Date:     2011-05-06 23:35:10 +0900 (Fri, 06 May 2011)

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


Modified Paths:
--------------
    trunk/SmartUpload/auth.php
    trunk/SmartUpload/download_file.php
    trunk/SmartUpload/upload_file.php
    trunk/SmartUpload/user_add.php
    trunk/SmartUpload/user_form.php


-------------- next part --------------
Modified: trunk/SmartUpload/auth.php
===================================================================
--- trunk/SmartUpload/auth.php	2011-05-05 17:00:01 UTC (rev 35)
+++ trunk/SmartUpload/auth.php	2011-05-06 14:35:10 UTC (rev 36)
@@ -2,7 +2,7 @@
 /*
  * SmartUpload/auth.php
  * @author Hiroyuki Shibata
- * 2011/05/4
+ * 2011/05/6
  * Rev 1.0
  *
  */
@@ -22,9 +22,9 @@
 	$userid = $_REQUEST['id'];
 	$password = $_REQUEST['pass'];
 
+	// ログインフォームを関数化
 	function login_form() {
 ?>
-		<!-- ログインフォーム -->
 		<form name="login_form" action="auth.php" method="post">
 			ID（アカウント）	：<input type="text" name="id">
 			パスワード	：<input type="password" name="pass">
@@ -34,15 +34,17 @@
 <?php
 	}
 
+	// メイン処理
+
 	if( $_REQUEST['cmd'] == "login" ) {
 
 		// ユーザ名＆パスワードチェック
 		$stmt = $db->prepare("SELECT * FROM user_info WHERE userid= ? AND password= ? ");
 		$stmt->execute(array($userid, $password));
 
+		// ログイン成功時
 		if ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
 
-			// ログイン成功時
 			$_SESSION["id"] = $_REQUEST["id"];
 			print ($row["fullname"]."さん");
 ?>
@@ -52,17 +54,17 @@
 					<input type="hidden" name="cmd" value="logout"/>
 				</form>
 <?php
+		// ログイン失敗時
 		} else {
 
-			// ログイン失敗時
 			print ("ログインに失敗しました");
 			login_form();
 
 		}
 
+	// ログアウト完了後
 	} else if( $_REQUEST['cmd'] == "logout" ) {
 
-		// ログアウト完了後
 		print ("ログアウトしました");
 		session_destroy();
 		login_form();

Modified: trunk/SmartUpload/download_file.php
===================================================================
--- trunk/SmartUpload/download_file.php	2011-05-05 17:00:01 UTC (rev 35)
+++ trunk/SmartUpload/download_file.php	2011-05-06 14:35:10 UTC (rev 36)
@@ -2,7 +2,7 @@
 /*
  * SmartUpload/download_file.php
  * @author Hiroyuki Shibata
- * 2011/05/04
+ * 2011/05/06
  * Rev 1.0
  *
  */
@@ -19,32 +19,30 @@
 	</p>
 	<?php
 
-	//session_start();
-
 	// メイン処理 //
 
 	require_once ("include/database.php");
-	//session_start();
 
 	$sql = $db->prepare('select * from data_info');
 	$sql->execute();
 	?>
-		<table border>
-			<tr>
-				<th>ファイル名</th>
-				<th>アップロード年月日＆時刻</th>
-				<th>サイズ</th>
-				<th>コメント</th>
-			</tr>
+	<!-- ダウンロードファイルリスト -->
+	<table border>
+		<tr>
+			<th>ファイル名</th>
+			<th>アップロード年月日＆時刻</th>
+			<th>サイズ</th>
+			<th>コメント</th>
+		</tr>
 	<?php
-		while($row = $sql->fetch(PDO::FETCH_ASSOC)) {
+	while($row = $sql->fetch(PDO::FETCH_ASSOC)) {
 	?>
-			<tr>
-				<td><a href="./data/ <?php print($row['filename']); ?> "><?php print($row['filename']); ?></a></td>
-				<td><?php print($row['uploaddate']); ?></td>
-				<td><?php print($row['data_size']); ?>	</td>
-				<td><?php print($row["comment"]); ?></td>
-			</tr>
+		<tr>
+			<td><a href="./data/ <?php print($row['filename']); ?> "><?php print($row['filename']); ?></a></td>
+			<td><?php print($row['uploaddate']); ?></td>
+			<td><?php print($row['data_size']); ?>	</td>
+			<td><?php print($row["comment"]); ?></td>
+		</tr>
 	<?php
 	}
 	?>

Modified: trunk/SmartUpload/upload_file.php
===================================================================
--- trunk/SmartUpload/upload_file.php	2011-05-05 17:00:01 UTC (rev 35)
+++ trunk/SmartUpload/upload_file.php	2011-05-06 14:35:10 UTC (rev 36)
@@ -2,7 +2,7 @@
 /*
  * SmartUpload/upload_file.php
  * @author Hiroyuki Shibata
- * 2011/05/05
+ * 2011/05/06
  * Rev 1.0
  *
  */
@@ -64,20 +64,6 @@
 
 		print('<br>');
 
-		/*
-		$sql = $db->prepare('select * from data_info where filename = ?');
-		$sql->execute(array($filename));
-		$row = $sql->fetch(PDO::FETCH_ASSOC);
-
-		print($row['contentname']." ");
-		print($row['filename']." ");
-		print($row['uploaddate']." ");
-		print($row['username']." ");
-		print($row['data_size']." ");
-		print($row['category']." ");
-		print($row['comment'].'<br />');
-		*/
-
 	}
 
 	?>

Modified: trunk/SmartUpload/user_add.php
===================================================================
--- trunk/SmartUpload/user_add.php	2011-05-05 17:00:01 UTC (rev 35)
+++ trunk/SmartUpload/user_add.php	2011-05-06 14:35:10 UTC (rev 36)
@@ -2,7 +2,7 @@
 /*
  * SmartUpload/user_add.php
  * @author Hiroyuki Shibata
- * 2011/05/05
+ * 2011/05/06
  * Rev 1.0
  *
  */
@@ -26,6 +26,11 @@
 
 			print("すでにログインしています");
 
+		} elseif ($_REQUEST["id"]=="") {
+
+			print('Error:');
+			die();
+
 		} else {
 	?>
 	<p>
@@ -33,6 +38,7 @@
 	</p>
 	<?php
 			// DBに登録 //
+
 			$stmt = $db->prepare(
 				"INSERT INTO user_info (
 					userid,
@@ -53,17 +59,21 @@
 			$stmt->execute();
 
 			// 登録成功を表示 //
-			$sql ='select userid from user_info';
 
-			foreach ($db->query($sql) as $row) {
+			$stmt = $db->prepare('select fullname from user_info where userid = ?');
+			$stmt->execute(array($_REQUEST["id"]));
 
-				print($row['userid']." "."が登録されました。");
-			}
+			$row = $stmt->fetch(PDO::FETCH_ASSOC);
+
+			print($row['fullname']." "."さんのユーザ登録が完了しました。");
+
 		}
 
 	} catch (PDOException $e) {
+
 		print('Error:'.$e->getMessage());
 		die();
+
 	}
 
 	?>

Modified: trunk/SmartUpload/user_form.php
===================================================================
--- trunk/SmartUpload/user_form.php	2011-05-05 17:00:01 UTC (rev 35)
+++ trunk/SmartUpload/user_form.php	2011-05-06 14:35:10 UTC (rev 36)
@@ -6,7 +6,7 @@
  * Rev 1.0
  *
  */
-session_start();
+	session_start();
 ?>
 <html>
 <head>

From svnnotify ＠ sourceforge.jp  Mon May  9 00:36:31 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 09 May 2011 00:36:31 +0900
Subject: [Smartupload-svn] =?utf-8?b?WzM3XSAgbWFpbueUu+mdouS9nOaIkA==?=
Message-ID: <1304868991.143207.26463.nullmailer@users.sourceforge.jp>

Revision: 37
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=37
Author:   hryksbt
Date:     2011-05-09 00:36:30 +0900 (Mon, 09 May 2011)

Log Message:
-----------
main画面作成
⇒アップロードが正常に出来てないので修正が必要

Modified Paths:
--------------
    trunk/SmartUpload/auth.php
    trunk/SmartUpload/download_file.php
    trunk/SmartUpload/main.php
    trunk/SmartUpload/upload_form.php
    trunk/SmartUpload/user_add.php
    trunk/SmartUpload/user_form.php


-------------- next part --------------
Modified: trunk/SmartUpload/auth.php
===================================================================
--- trunk/SmartUpload/auth.php	2011-05-06 14:35:10 UTC (rev 36)
+++ trunk/SmartUpload/auth.php	2011-05-08 15:36:30 UTC (rev 37)
@@ -31,6 +31,9 @@
 			<input type="submit"  value="ログイン" />
 			<input type="hidden" name="cmd" value="login"/>
 		</form>
+		<form action="user_form.php" >
+			<input type="submit" value="ユーザ登録">
+		</form>
 <?php
 	}
 

Modified: trunk/SmartUpload/download_file.php
===================================================================
--- trunk/SmartUpload/download_file.php	2011-05-06 14:35:10 UTC (rev 36)
+++ trunk/SmartUpload/download_file.php	2011-05-08 15:36:30 UTC (rev 37)
@@ -14,9 +14,7 @@
 <title>SmartUpload</title>
 </head>
 <body>
-	<p>
-		<b>ダウンロード</b>
-	</p>
+	<h2>ダウンロード</h2>
 	<?php
 
 	// メイン処理 //

Modified: trunk/SmartUpload/main.php
===================================================================
--- trunk/SmartUpload/main.php	2011-05-06 14:35:10 UTC (rev 36)
+++ trunk/SmartUpload/main.php	2011-05-08 15:36:30 UTC (rev 37)
@@ -14,5 +14,9 @@
 <title>SmartUpload</title>
 </head>
 <body>
+	<h1>Smart Upload</h1>
+	<iframe src=./auth.php scrolling=no frameborder=0 width=800 height=90></iframe>
+	<iframe src=./download_file.php scrolling=auto frameborder=0 width=800 height=200></iframe>
+	<iframe src=./upload_form.php scrolling=no frameborder=0 width=800 height=280></iframe>
 </body>
 </html>
\ No newline at end of file

Modified: trunk/SmartUpload/upload_form.php
===================================================================
--- trunk/SmartUpload/upload_form.php	2011-05-06 14:35:10 UTC (rev 36)
+++ trunk/SmartUpload/upload_form.php	2011-05-08 15:36:30 UTC (rev 37)
@@ -15,9 +15,7 @@
 <title>SmartUpload</title>
 </head>
 <body>
-	<p>
-		<b>アップロード</b>
-	</p>
+	<h2>アップロード</h2>
 	<form method="post" enctype="multipart/form-data" action="upload_file.php">
 	<pre>
 コンテンツ名	：<input type="text" name="mail"> ※ 全角32文字以内<br>

Modified: trunk/SmartUpload/user_add.php
===================================================================
--- trunk/SmartUpload/user_add.php	2011-05-06 14:35:10 UTC (rev 36)
+++ trunk/SmartUpload/user_add.php	2011-05-08 15:36:30 UTC (rev 37)
@@ -24,8 +24,10 @@
 
 		if ($_SESSION["id"]) {
 
-			print("すでにログインしています");
-
+			print("すでにログインしています<br>");
+	?>
+			<input type="button" value="戻る" onClick="history.back()">
+	<?php
 		} elseif ($_REQUEST["id"]=="") {
 
 			print('Error:');
@@ -66,6 +68,11 @@
 			$row = $stmt->fetch(PDO::FETCH_ASSOC);
 
 			print($row['fullname']." "."さんのユーザ登録が完了しました。");
+	?>
+			<form action="main.php" >
+				<input type="submit" value="戻る">
+			</form>
+	<?php
 
 		}
 

Modified: trunk/SmartUpload/user_form.php
===================================================================
--- trunk/SmartUpload/user_form.php	2011-05-06 14:35:10 UTC (rev 36)
+++ trunk/SmartUpload/user_form.php	2011-05-08 15:36:30 UTC (rev 37)
@@ -2,7 +2,7 @@
 /*
  * SmartUpload/user_form.php
  * @author Hiroyuki Shibata
- * 2011/05/05
+ * 2011/05/06
  * Rev 1.0
  *
  */
@@ -17,31 +17,40 @@
 	<?php
 	if ($_SESSION["id"]) {
 
-		print("すでにログインしています");
-
+		print("すでにログインしています<br>");
+	?>
+		<input type="button" value="戻る" onClick="history.back()">
+	<?php
 	} else {
 	?>
-		<p>
-			<b>ユーザー登録</b>
-		</p>
+		<h2>ユーザー登録</h2>
 		<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文字以内（半角64文字以内）<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>
+	<?php
+	require_once("include/database.php");
+
+	$value = 0;
+
+	$stmt = $db->prepare("SELECT * FROM country");
+	$stmt->execute();
+
+	while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
+	?>
+		<option value="<?php print($row["num"]); ?>">
+			<?php print($row["country_name"]); ?>
+		</option>
+	<?php
+	}
+	?>
 </select>
 <br>
 メールアドレス	：<input type="text" name="mail"> ※ 半角64文字以内<br>
 
-<input type="submit" class="update" value="登録" /> <input type="reset"
-				value="リセット">
+<input type="submit" class="update" value="登録" /> <input type="reset"  value="リセット">
 			</pre>
 		</form>
 	<?php

From svnnotify ＠ sourceforge.jp  Tue May 10 00:36:54 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 10 May 2011 00:36:54 +0900
Subject: [Smartupload-svn] =?utf-8?b?WzM4XSAg44Ki44OD44OX44Ot44O844OJ44OV?=
 =?utf-8?b?44Kh44Kk44Or44GMRELjgavnmbvpjLLjgZXjgozjgarjgYTjg5DjgrDjgpI=?=
 =?utf-8?b?5L+u5q2j?=
Message-ID: <1304955414.119928.1060.nullmailer@users.sourceforge.jp>

Revision: 38
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=38
Author:   hryksbt
Date:     2011-05-10 00:36:53 +0900 (Tue, 10 May 2011)

Log Message:
-----------
アップロードファイルがDBに登録されないバグを修正

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


-------------- next part --------------
Modified: trunk/SmartUpload/upload_file.php
===================================================================
--- trunk/SmartUpload/upload_file.php	2011-05-08 15:36:30 UTC (rev 37)
+++ trunk/SmartUpload/upload_file.php	2011-05-09 15:36:53 UTC (rev 38)
@@ -2,7 +2,7 @@
 /*
  * SmartUpload/upload_file.php
  * @author Hiroyuki Shibata
- * 2011/05/06
+ * 2011/05/09
  * Rev 1.0
  *
  */
@@ -25,19 +25,19 @@
 
 	$updir = "./data/";
 
-	$contentname = $_REQUEST["category"];
+	$contentname = $_REQUEST["contents"];
 	$filename = $_FILES['upfile']['name'];
-	$filesize = filesize($_FILES['upfile']['tmp_name']);
+	$filesize = $_FILES['upfile']['size'];
 	$username = $_SESSION["id"];
 	$category = $_REQUEST["category"];
-	$commnet = $_REQUEST["comment"];
+	$comment = $_REQUEST["comment"];
 
-	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 {
+	} elseif ($_SESSION["id"]) {
 
 		print("<b> $filename </b> is uploaded.<br />");
 		print("size = "."$filesize"." bytes<br />");
@@ -52,18 +52,43 @@
 				data_size,
 				category,
 				comment
-			) VALUES (?, ? ,now() ,? ,? ,? ,?)");
+			) VALUES (?, ?, now(),? ,? ,? ,? )");
 
 		$stmt->bindParam(1, $contentname);
 		$stmt->bindParam(2, $filename);
 		$stmt->bindParam(3, $username);
 		$stmt->bindParam(4, $filesize);
 		$stmt->bindParam(5, $category);
-		$stmt->bindParam(6, $commnet);
+		$stmt->bindParam(6, $comment);
 		$stmt->execute();
 
 		print('<br>');
 
+	} else {
+
+		print("<b> $filename </b> is uploaded.<br />");
+		print("size = "."$filesize"." bytes<br />");
+
+		// データベース処理
+		$stmt = $db->prepare(
+			"INSERT INTO data_info (
+				contentname,
+				filename,
+				uploaddate,
+				data_size,
+				category,
+				comment
+			) VALUES (?, ?, now() ,? ,? ,? )");
+
+		$stmt->bindParam(1, $contentname);
+		$stmt->bindParam(2, $filename);
+		$stmt->bindParam(3, $filesize);
+		$stmt->bindParam(4, $category);
+		$stmt->bindParam(5, $comment);
+		$stmt->execute();
+
+		print('<br>');
+
 	}
 
 	?>

Modified: trunk/SmartUpload/upload_form.php
===================================================================
--- trunk/SmartUpload/upload_form.php	2011-05-08 15:36:30 UTC (rev 37)
+++ trunk/SmartUpload/upload_form.php	2011-05-09 15:36:53 UTC (rev 38)
@@ -2,7 +2,7 @@
 /*
  * SmartUpload/upload_form.php
  * @author Hiroyuki Shibata
- * 2011/05/5
+ * 2011/05/09
  * Rev 1.0
  *
  */
@@ -18,7 +18,7 @@
 	<h2>アップロード</h2>
 	<form method="post" enctype="multipart/form-data" action="upload_file.php">
 	<pre>
-コンテンツ名	：<input type="text" name="mail"> ※ 全角32文字以内<br>
+コンテンツ名	：<input type="text" name="contents"> ※ 全角32文字以内<br>
 カテゴリ		：<select name="category">
 <?php
 	require_once("include/database.php");

From svnnotify ＠ sourceforge.jp  Tue May 10 00:56:06 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 10 May 2011 00:56:06 +0900
Subject: [Smartupload-svn] =?utf-8?b?WzM5XSAgRELjga7liIfmlq3jgpLov73liqA=?=
Message-ID: <1304956566.988939.22662.nullmailer@users.sourceforge.jp>

Revision: 39
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=39
Author:   hryksbt
Date:     2011-05-10 00:56:06 +0900 (Tue, 10 May 2011)

Log Message:
-----------
DBの切断を追加

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

Added Paths:
-----------
    trunk/SmartUpload/data/OpenSangoksuhi.apk


-------------- next part --------------
Modified: trunk/SmartUpload/auth.php
===================================================================
--- trunk/SmartUpload/auth.php	2011-05-09 15:36:53 UTC (rev 38)
+++ trunk/SmartUpload/auth.php	2011-05-09 15:56:06 UTC (rev 39)
@@ -2,7 +2,7 @@
 /*
  * SmartUpload/auth.php
  * @author Hiroyuki Shibata
- * 2011/05/6
+ * 2011/05/09
  * Rev 1.0
  *
  */
@@ -78,6 +78,8 @@
 		login_form();
 
 	}
+
+	$pdo = null;
 ?>
 </body>
 </html>
\ No newline at end of file

Added: trunk/SmartUpload/data/OpenSangoksuhi.apk
===================================================================
(Binary files differ)


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

Modified: trunk/SmartUpload/download_file.php
===================================================================
--- trunk/SmartUpload/download_file.php	2011-05-09 15:36:53 UTC (rev 38)
+++ trunk/SmartUpload/download_file.php	2011-05-09 15:56:06 UTC (rev 39)
@@ -2,7 +2,7 @@
 /*
  * SmartUpload/download_file.php
  * @author Hiroyuki Shibata
- * 2011/05/06
+ * 2011/05/09
  * Rev 1.0
  *
  */
@@ -43,6 +43,8 @@
 		</tr>
 	<?php
 	}
+
+	$pdo = null;
 	?>
 		</table>
 </body>

Modified: trunk/SmartUpload/upload_file.php
===================================================================
--- trunk/SmartUpload/upload_file.php	2011-05-09 15:36:53 UTC (rev 38)
+++ trunk/SmartUpload/upload_file.php	2011-05-09 15:56:06 UTC (rev 39)
@@ -91,6 +91,7 @@
 
 	}
 
+	$pdo = null;
 	?>
 </body>
 </html>

Modified: trunk/SmartUpload/upload_form.php
===================================================================
--- trunk/SmartUpload/upload_form.php	2011-05-09 15:36:53 UTC (rev 38)
+++ trunk/SmartUpload/upload_form.php	2011-05-09 15:56:06 UTC (rev 39)
@@ -35,6 +35,8 @@
 		</option>
 <?php
 	}
+
+	$pdo = null;
 ?>
 				 </select>
 コメント		：<textarea name="comment" rows=3 cols=50 wrap="virtual"></textarea> ※ 全角512文字以内<br>

Modified: trunk/SmartUpload/user_add.php
===================================================================
--- trunk/SmartUpload/user_add.php	2011-05-09 15:36:53 UTC (rev 38)
+++ trunk/SmartUpload/user_add.php	2011-05-09 15:56:06 UTC (rev 39)
@@ -2,7 +2,7 @@
 /*
  * SmartUpload/user_add.php
  * @author Hiroyuki Shibata
- * 2011/05/06
+ * 2011/05/09
  * Rev 1.0
  *
  */
@@ -83,6 +83,7 @@
 
 	}
 
+	$pdo = null;
 	?>
 </body>
 </html>
\ No newline at end of file

Modified: trunk/SmartUpload/user_form.php
===================================================================
--- trunk/SmartUpload/user_form.php	2011-05-09 15:36:53 UTC (rev 38)
+++ trunk/SmartUpload/user_form.php	2011-05-09 15:56:06 UTC (rev 39)
@@ -2,7 +2,7 @@
 /*
  * SmartUpload/user_form.php
  * @author Hiroyuki Shibata
- * 2011/05/06
+ * 2011/05/09
  * Rev 1.0
  *
  */
@@ -31,20 +31,20 @@
 氏名		：<input type="text" name="name"> ※ 全角32文字以内（半角64文字以内）<br>
 国		：<select name="country">
 	<?php
-	require_once("include/database.php");
+		require_once("include/database.php");
 
-	$value = 0;
+		$value = 0;
 
-	$stmt = $db->prepare("SELECT * FROM country");
-	$stmt->execute();
+		$stmt = $db->prepare("SELECT * FROM country");
+		$stmt->execute();
 
-	while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
+		while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
 	?>
-		<option value="<?php print($row["num"]); ?>">
-			<?php print($row["country_name"]); ?>
-		</option>
+			<option value="<?php print($row["num"]); ?>">
+				<?php print($row["country_name"]); ?>
+			</option>
 	<?php
-	}
+		}
 	?>
 </select>
 <br>
@@ -54,6 +54,8 @@
 			</pre>
 		</form>
 	<?php
+		$pdo = null;
+
 	}
 	?>
 </body>

From svnnotify ＠ sourceforge.jp  Tue May 10 01:19:45 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 10 May 2011 01:19:45 +0900
Subject: [Smartupload-svn] =?utf-8?b?WzQwXSAg6KGo56S644K144Kk44K644KS5L+u?=
 =?utf-8?b?5q2j?=
Message-ID: <1304957985.397909.19764.nullmailer@users.sourceforge.jp>

Revision: 40
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=40
Author:   hryksbt
Date:     2011-05-10 01:19:45 +0900 (Tue, 10 May 2011)

Log Message:
-----------
表示サイズを修正

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


-------------- next part --------------
Modified: trunk/SmartUpload/main.php
===================================================================
--- trunk/SmartUpload/main.php	2011-05-09 15:56:06 UTC (rev 39)
+++ trunk/SmartUpload/main.php	2011-05-09 16:19:45 UTC (rev 40)
@@ -17,6 +17,6 @@
 	<h1>Smart Upload</h1>
 	<iframe src=./auth.php scrolling=no frameborder=0 width=800 height=90></iframe>
 	<iframe src=./download_file.php scrolling=auto frameborder=0 width=800 height=200></iframe>
-	<iframe src=./upload_form.php scrolling=no frameborder=0 width=800 height=280></iframe>
+	<iframe src=./upload_form.php scrolling=no frameborder=0 width=800 height=290></iframe>
 </body>
 </html>
\ No newline at end of file

From svnnotify ＠ sourceforge.jp  Mon May 16 00:01:17 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 16 May 2011 00:01:17 +0900
Subject: [Smartupload-svn] =?utf-8?b?WzQxXSAg44Gh44KH44Gj44Go44GX44Gf44K7?=
 =?utf-8?b?44Kt44Ol44Oq44OG44Kj44Ki44OD44OX44OH44O844OI?=
Message-ID: <1305471677.492708.17548.nullmailer@users.sourceforge.jp>

Revision: 41
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=41
Author:   hryksbt
Date:     2011-05-16 00:01:17 +0900 (Mon, 16 May 2011)

Log Message:
-----------
ちょっとしたセキュリティアップデート

Modified Paths:
--------------
    trunk/SmartUpload/auth.php
    trunk/SmartUpload/download_file.php
    trunk/SmartUpload/upload_file.php
    trunk/SmartUpload/user_add.php
    trunk/SmartUpload/user_form.php


-------------- next part --------------
Modified: trunk/SmartUpload/auth.php
===================================================================
--- trunk/SmartUpload/auth.php	2011-05-09 16:19:45 UTC (rev 40)
+++ trunk/SmartUpload/auth.php	2011-05-15 15:01:17 UTC (rev 41)
@@ -2,7 +2,7 @@
 /*
  * SmartUpload/auth.php
  * @author Hiroyuki Shibata
- * 2011/05/09
+ * 2011/05/15
  * Rev 1.0
  *
  */
@@ -19,8 +19,8 @@
 <?php
 	require_once("include/database.php");
 
-	$userid = $_REQUEST['id'];
-	$password = $_REQUEST['pass'];
+	$userid = $_POST['id'];
+	$password = $_POST['pass'];
 
 	// ログインフォームを関数化
 	function login_form() {
@@ -39,7 +39,7 @@
 
 	// メイン処理
 
-	if( $_REQUEST['cmd'] == "login" ) {
+	if( $_POST['cmd'] == "login" ) {
 
 		// ユーザ名＆パスワードチェック
 		$stmt = $db->prepare("SELECT * FROM user_info WHERE userid= ? AND password= ? ");
@@ -48,8 +48,8 @@
 		// ログイン成功時
 		if ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
 
-			$_SESSION["id"] = $_REQUEST["id"];
-			print ($row["fullname"]."さん");
+			$_SESSION["id"] = $_POST["id"];
+			print (htmlspecialchars($row["fullname"]."さん"));
 ?>
 			<!-- ログアウトボタン -->
 				<form name="logout_form" action="auth.php" method="post">
@@ -60,15 +60,15 @@
 		// ログイン失敗時
 		} else {
 
-			print ("ログインに失敗しました");
+			print (htmlspecialchars("ログインに失敗しました", ENT_QUOTES));
 			login_form();
 
 		}
 
 	// ログアウト完了後
-	} else if( $_REQUEST['cmd'] == "logout" ) {
+	} else if( $_POST['cmd'] == "logout" ) {
 
-		print ("ログアウトしました");
+		print (htmlspecialchars("ログアウトしました", ENT_QUOTES));
 		session_destroy();
 		login_form();
 

Modified: trunk/SmartUpload/download_file.php
===================================================================
--- trunk/SmartUpload/download_file.php	2011-05-09 16:19:45 UTC (rev 40)
+++ trunk/SmartUpload/download_file.php	2011-05-15 15:01:17 UTC (rev 41)
@@ -2,7 +2,7 @@
 /*
  * SmartUpload/download_file.php
  * @author Hiroyuki Shibata
- * 2011/05/09
+ * 2011/05/15
  * Rev 1.0
  *
  */
@@ -36,10 +36,12 @@
 	while($row = $sql->fetch(PDO::FETCH_ASSOC)) {
 	?>
 		<tr>
-			<td><a href="./data/ <?php print($row['filename']); ?> "><?php print($row['filename']); ?></a></td>
-			<td><?php print($row['uploaddate']); ?></td>
-			<td><?php print($row['data_size']); ?>	</td>
-			<td><?php print($row["comment"]); ?></td>
+			<td><a href="./data/ <?php print(htmlspecialchars($row['filename'], ENT_QUOTES)); ?> ">
+				<?php print(htmlspecialchars($row['filename'], ENT_QUOTES)); ?></a>
+			</td>
+			<td><?php print(htmlspecialchars($row['uploaddate'], ENT_QUOTES)); ?></td>
+			<td><?php print(htmlspecialchars($row['data_size'], ENT_QUOTES)); ?>	</td>
+			<td><?php print(htmlspecialchars($row["comment"], ENT_QUOTES)); ?></td>
 		</tr>
 	<?php
 	}

Modified: trunk/SmartUpload/upload_file.php
===================================================================
--- trunk/SmartUpload/upload_file.php	2011-05-09 16:19:45 UTC (rev 40)
+++ trunk/SmartUpload/upload_file.php	2011-05-15 15:01:17 UTC (rev 41)
@@ -2,7 +2,7 @@
 /*
  * SmartUpload/upload_file.php
  * @author Hiroyuki Shibata
- * 2011/05/09
+ * 2011/05/15
  * Rev 1.0
  *
  */
@@ -23,23 +23,51 @@
 
 	require_once("include/database.php");
 
+	// ファイル保存先のパス
 	$updir = "./data/";
 
-	$contentname = $_REQUEST["contents"];
+	$contentname = $_POST["contents"];
 	$filename = $_FILES['upfile']['name'];
 	$filesize = $_FILES['upfile']['size'];
 	$username = $_SESSION["id"];
-	$category = $_REQUEST["category"];
-	$comment = $_REQUEST["comment"];
+	$category = $_POST["category"];
+	$comment = $_POST["comment"];
 
+	// ファイルをアップロードできなかったとき
 	if(move_uploaded_file($_FILES['upfile']['tmp_name'], $updir."$filename")==FALSE) {
 
 		print("Upload failed");
-		print($_FILES['upfile']['error']);
+	?>
+		<h2>アップロード</h2>
+		<form method="post" enctype="multipart/form-data" action="upload_file.php">
+		<pre>
+コンテンツ名	：<input type="text" name="contents"> ※ 全角32文字以内<br>
+カテゴリ		：<select name="category">
+	<?php
+		$value = 0;
 
+		$stmt = $db->prepare("SELECT * FROM category");
+		$stmt->execute();
+
+		while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
+	?>
+			<option value="<?php print($row["cat_number"]); ?>">
+				<?php print($row["cat_name"]); ?>
+			</option>
+	<?php
+		}
+	?>
+				 </select>
+コメント		：<textarea name="comment" rows=3 cols=50 wrap="virtual"></textarea> ※ 全角512文字以内<br>
+ファイル		：<input type="file" name="upfile"><br>
+<input type="submit" value="アップロード"> <input type="reset" value="リセット">
+	</pre>
+	</form>
+	<?php
+	// ログイン済みのユーザがアップロードした場合
 	} elseif ($_SESSION["id"]) {
 
-		print("<b> $filename </b> is uploaded.<br />");
+		print("<b>$filename</b> is uploaded.<br />");
 		print("size = "."$filesize"." bytes<br />");
 
 		// データベース処理
@@ -64,9 +92,10 @@
 
 		print('<br>');
 
-	} else {
+	// ログインをしていないユーザがアップロードした場合
+	} elseif ($_SESSION["id"]=="") {
 
-		print("<b> $filename </b> is uploaded.<br />");
+		print("<b>$filename</b> is uploaded.<br />");
 		print("size = "."$filesize"." bytes<br />");
 
 		// データベース処理

Modified: trunk/SmartUpload/user_add.php
===================================================================
--- trunk/SmartUpload/user_add.php	2011-05-09 16:19:45 UTC (rev 40)
+++ trunk/SmartUpload/user_add.php	2011-05-15 15:01:17 UTC (rev 41)
@@ -2,7 +2,7 @@
 /*
  * SmartUpload/user_add.php
  * @author Hiroyuki Shibata
- * 2011/05/09
+ * 2011/05/15
  * Rev 1.0
  *
  */
@@ -28,12 +28,14 @@
 	?>
 			<input type="button" value="戻る" onClick="history.back()">
 	<?php
-		} elseif ($_REQUEST["id"]=="") {
+		} elseif ($_POST["id"]=="") {
 
-			print('Error:');
+			print('Error: ');
+			print('ID（アカウント）が未入力です。');
 			die();
 
 		} else {
+
 	?>
 	<p>
 		<b>登録完了</b>
@@ -53,29 +55,28 @@
 				) 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->bindParam(1,$_POST["id"]);
+			$stmt->bindParam(2,$_POST["pass"]);
+			$stmt->bindParam(3,$_POST["name"]);
+			$stmt->bindParam(4,$_POST["country"]);
+			$stmt->bindParam(5,$_POST["mail"]);
 			$stmt->execute();
 
 			// 登録成功を表示 //
 
 			$stmt = $db->prepare('select fullname from user_info where userid = ?');
-			$stmt->execute(array($_REQUEST["id"]));
+			$stmt->execute(array($_POST["id"]));
 
 			$row = $stmt->fetch(PDO::FETCH_ASSOC);
 
-			print($row['fullname']." "."さんのユーザ登録が完了しました。");
+			print(htmlspecialchars($row['fullname']." "."さんのユーザ登録が完了しました。", ENT_QUOTES));
 	?>
 			<form action="main.php" >
 				<input type="submit" value="戻る">
 			</form>
 	<?php
+			}
 
-		}
-
 	} catch (PDOException $e) {
 
 		print('Error:'.$e->getMessage());

Modified: trunk/SmartUpload/user_form.php
===================================================================
--- trunk/SmartUpload/user_form.php	2011-05-09 16:19:45 UTC (rev 40)
+++ trunk/SmartUpload/user_form.php	2011-05-15 15:01:17 UTC (rev 41)
@@ -26,7 +26,7 @@
 		<h2>ユーザー登録</h2>
 		<form name="user_form" action="./user_add.php" method="post">
 			<pre>
-ID（アカウント）	：<input type="text" name="id"> ※ 半角32文字以内<br>
+ID（アカウント）	：<input type="text" name="id"> ※ 半角英数字32文字以内<br>
 パスワード	：<input type="password" name="pass"> ※ 半角英数字32文字以内<br>
 氏名		：<input type="text" name="name"> ※ 全角32文字以内（半角64文字以内）<br>
 国		：<select name="country">

From svnnotify ＠ sourceforge.jp  Mon May 16 14:00:02 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 16 May 2011 14:00:02 +0900
Subject: [Smartupload-svn] =?utf-8?b?WzQyXSAg5Li744Gr44OV44Kh44Kk44Or44Ki?=
 =?utf-8?b?44OD44OX44Ot44O844OJ44Gu44K944O844K544KS5pW055CG?=
Message-ID: <1305522002.085266.19699.nullmailer@users.sourceforge.jp>

Revision: 42
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=42
Author:   hryksbt
Date:     2011-05-16 14:00:01 +0900 (Mon, 16 May 2011)

Log Message:
-----------
主にファイルアップロードのソースを整理

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

Added Paths:
-----------
    trunk/SmartUpload/data/dump.sql


-------------- next part --------------
Added: trunk/SmartUpload/data/dump.sql
===================================================================
--- trunk/SmartUpload/data/dump.sql	                        (rev 0)
+++ trunk/SmartUpload/data/dump.sql	2011-05-16 05:00:01 UTC (rev 42)
@@ -0,0 +1,117 @@
+-- MySQL dump 10.13  Distrib 5.1.41, for Win32 (ia32)
+--
+-- Host: localhost    Database: upload
+-- ------------------------------------------------------
+-- Server version	5.1.41
+
+/*!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 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+--
+-- Table structure for table `category`
+--
+
+DROP TABLE IF EXISTS `category`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `category` (
+  `cat_number` smallint(6) NOT NULL AUTO_INCREMENT,
+  `cat_name` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
+  PRIMARY KEY (`cat_number`),
+  UNIQUE KEY `index_cat_name` (`cat_name`)
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `category`
+--
+
+LOCK TABLES `category` WRITE;
+/*!40000 ALTER TABLE `category` DISABLE KEYS */;
+INSERT INTO `category` VALUES (3,'application'),(1,'music'),(2,'photo');
+/*!40000 ALTER TABLE `category` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `data_info`
+--
+
+DROP TABLE IF EXISTS `data_info`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `data_info` (
+  `num` bigint(20) NOT NULL AUTO_INCREMENT,
+  `contentname` varchar(64) NOT NULL,
+  `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 NOT NULL DEFAULT 'a',
+  `data_size` int(10) NOT NULL,
+  `rank` int(3) DEFAULT NULL,
+  `category` smallint(6) NOT NULL,
+  `comment` varchar(1024) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
+  PRIMARY KEY (`num`),
+  UNIQUE KEY `index_filename` (`filename`)
+) ENGINE=MyISAM AUTO_INCREMENT=5 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `data_info`
+--
+
+LOCK TABLES `data_info` WRITE;
+/*!40000 ALTER TABLE `data_info` DISABLE KEYS */;
+INSERT INTO `data_info` VALUES (1,'','aaa.jpg','2011-04-18 00:00:00','a',666,NULL,0,'ああああああああ'),(2,'','bbb','2011-04-18 23:49:46','',777,NULL,0,''),(3,'','test.txt','2011-04-26 00:50:36','',20,NULL,0,''),(4,'3','test2.txt','2011-05-06 01:35:08','a',9092,NULL,3,'test2');
+/*!40000 ALTER TABLE `data_info` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `user_info`
+--
+
+DROP TABLE IF EXISTS `user_info`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `user_info` (
+  `num` bigint(20) NOT NULL AUTO_INCREMENT,
+  `userid` varchar(32) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+  `password` varchar(32) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+  `fullname` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin 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',
+  `charge` tinyint(1) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`num`),
+  UNIQUE KEY `index_email` (`email`)
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `user_info`
+--
+
+LOCK TABLES `user_info` WRITE;
+/*!40000 ALTER TABLE `user_info` DISABLE KEYS */;
+INSERT INTO `user_info` VALUES (1,'b','bbb','BBB',1,'2011-05-01 00:29:57',NULL,'',0,0),(2,'a','aaa','AAA',1,'2011-04-26 23:34:00',NULL,'aaa',0,0);
+/*!40000 ALTER TABLE `user_info` ENABLE KEYS */;
+UNLOCK TABLES;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!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 */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+-- Dump completed on 2011-05-06  1:56:05

Modified: trunk/SmartUpload/download_file.php
===================================================================
--- trunk/SmartUpload/download_file.php	2011-05-15 15:01:17 UTC (rev 41)
+++ trunk/SmartUpload/download_file.php	2011-05-16 05:00:01 UTC (rev 42)
@@ -41,7 +41,7 @@
 			</td>
 			<td><?php print(htmlspecialchars($row['uploaddate'], ENT_QUOTES)); ?></td>
 			<td><?php print(htmlspecialchars($row['data_size'], ENT_QUOTES)); ?>	</td>
-			<td><?php print(htmlspecialchars($row["comment"], ENT_QUOTES)); ?></td>
+			<td><?php print(htmlspecialchars($row['comment'], ENT_QUOTES)); ?></td>
 		</tr>
 	<?php
 	}

Modified: trunk/SmartUpload/upload_file.php
===================================================================
--- trunk/SmartUpload/upload_file.php	2011-05-15 15:01:17 UTC (rev 41)
+++ trunk/SmartUpload/upload_file.php	2011-05-16 05:00:01 UTC (rev 42)
@@ -19,25 +19,12 @@
 	</p>
 	<?php
 
-	// メイン処理 //
+	// アップロードフォームを関数化
+	function upload() {
 
-	require_once("include/database.php");
+		require_once("include/database.php");
 
-	// ファイル保存先のパス
-	$updir = "./data/";
-
-	$contentname = $_POST["contents"];
-	$filename = $_FILES['upfile']['name'];
-	$filesize = $_FILES['upfile']['size'];
-	$username = $_SESSION["id"];
-	$category = $_POST["category"];
-	$comment = $_POST["comment"];
-
-	// ファイルをアップロードできなかったとき
-	if(move_uploaded_file($_FILES['upfile']['tmp_name'], $updir."$filename")==FALSE) {
-
-		print("Upload failed");
-	?>
+		?>
 		<h2>アップロード</h2>
 		<form method="post" enctype="multipart/form-data" action="upload_file.php">
 		<pre>
@@ -64,63 +51,94 @@
 	</pre>
 	</form>
 	<?php
-	// ログイン済みのユーザがアップロードした場合
-	} elseif ($_SESSION["id"]) {
+		$pdo = null;
 
-		print("<b>$filename</b> is uploaded.<br />");
-		print("size = "."$filesize"." bytes<br />");
+	}
 
-		// データベース処理
-		$stmt = $db->prepare(
-			"INSERT INTO data_info (
-				contentname,
-				filename,
-				uploaddate,
-				username,
-				data_size,
-				category,
-				comment
-			) VALUES (?, ?, now(),? ,? ,? ,? )");
+	// ファイル保存先のパス
+	$updir = "./data/";
 
-		$stmt->bindParam(1, $contentname);
-		$stmt->bindParam(2, $filename);
-		$stmt->bindParam(3, $username);
-		$stmt->bindParam(4, $filesize);
-		$stmt->bindParam(5, $category);
-		$stmt->bindParam(6, $comment);
-		$stmt->execute();
+	// アップロードされたファイルの情報
+	$contentname = htmlspecialchars($_POST["contents"]);
+	$filename = htmlspecialchars($_FILES['upfile']['name']);
+	$filesize = htmlspecialchars($_FILES['upfile']['size']);
+	$category = $_POST["category"];
+	$comment = htmlspecialchars($_POST["comment"]);
 
-		print('<br>');
+	if ($_FILES['upfile']['name']==null) {
 
-	// ログインをしていないユーザがアップロードした場合
-	} elseif ($_SESSION["id"]=="") {
+		print("アップロードは失敗しました。");
+		upload();
 
-		print("<b>$filename</b> is uploaded.<br />");
-		print("size = "."$filesize"." bytes<br />");
+	} else {
 
-		// データベース処理
-		$stmt = $db->prepare(
-			"INSERT INTO data_info (
-				contentname,
-				filename,
-				uploaddate,
-				data_size,
-				category,
-				comment
-			) VALUES (?, ?, now() ,? ,? ,? )");
+		// ログインされてない場合
+		if (htmlspecialchars($_SESSION['id']=="", ENT_QUOTES)) {
 
-		$stmt->bindParam(1, $contentname);
-		$stmt->bindParam(2, $filename);
-		$stmt->bindParam(3, $filesize);
-		$stmt->bindParam(4, $category);
-		$stmt->bindParam(5, $comment);
-		$stmt->execute();
+			require_once("include/database.php");
 
-		print('<br>');
+			print("<b>$filename</b> is uploaded.<br />");
+			print("size = "."$filesize"." bytes<br />");
 
+			// データベース処理
+			$stmt = $db->prepare(
+				"INSERT INTO data_info (
+					contentname,
+					filename,
+					uploaddate,
+					data_size,
+					category,
+					comment
+				) VALUES (?, ?, now() ,? ,? ,? )");
+
+			$stmt->bindParam(1, $contentname);
+			$stmt->bindParam(2, $filename);
+			$stmt->bindParam(3, $filesize);
+			$stmt->bindParam(4, $category);
+			$stmt->bindParam(5, $comment);
+			$stmt->execute();
+
+			print('<br>');
+
+			$pdo = null;
+
+		// ログイン済みの場合
+		} else {
+
+			require_once("include/database.php");
+
+			$username = $_SESSION["id"];
+
+			print("<b>$filename</b> is uploaded.<br />");
+			print("size = "."$filesize"." bytes<br />");
+
+			// データベース処理
+			$stmt = $db->prepare(
+				"INSERT INTO data_info (
+					contentname,
+					filename,
+					uploaddate,
+					username,
+					data_size,
+					category,
+					comment
+				) VALUES (?, ?, now(),? ,? ,? ,? )");
+
+			$stmt->bindParam(1, $contentname);
+			$stmt->bindParam(2, $filename);
+			$stmt->bindParam(3, $username);
+			$stmt->bindParam(4, $filesize);
+			$stmt->bindParam(5, $category);
+			$stmt->bindParam(6, $comment);
+			$stmt->execute();
+
+			print('<br>');
+
+			$pdo = null;
+
+		}
+
 	}
-
-	$pdo = null;
 	?>
 </body>
 </html>

From svnnotify ＠ sourceforge.jp  Mon May 16 14:04:21 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 16 May 2011 14:04:21 +0900
Subject: [Smartupload-svn] =?utf-8?b?WzQzXSAg44KC44GGMeWbnuOCouODg+ODlw==?=
 =?utf-8?b?44Ot44O844OJ44KS5pW055CG?=
Message-ID: <1305522261.535053.25596.nullmailer@users.sourceforge.jp>

Revision: 43
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=43
Author:   hryksbt
Date:     2011-05-16 14:04:21 +0900 (Mon, 16 May 2011)

Log Message:
-----------
もう1回アップロードを整理

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


-------------- next part --------------
Modified: trunk/SmartUpload/upload_file.php
===================================================================
--- trunk/SmartUpload/upload_file.php	2011-05-16 05:00:01 UTC (rev 42)
+++ trunk/SmartUpload/upload_file.php	2011-05-16 05:04:21 UTC (rev 43)
@@ -19,42 +19,6 @@
 	</p>
 	<?php
 
-	// アップロードフォームを関数化
-	function upload() {
-
-		require_once("include/database.php");
-
-		?>
-		<h2>アップロード</h2>
-		<form method="post" enctype="multipart/form-data" action="upload_file.php">
-		<pre>
-コンテンツ名	：<input type="text" name="contents"> ※ 全角32文字以内<br>
-カテゴリ		：<select name="category">
-	<?php
-		$value = 0;
-
-		$stmt = $db->prepare("SELECT * FROM category");
-		$stmt->execute();
-
-		while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-	?>
-			<option value="<?php print($row["cat_number"]); ?>">
-				<?php print($row["cat_name"]); ?>
-			</option>
-	<?php
-		}
-	?>
-				 </select>
-コメント		：<textarea name="comment" rows=3 cols=50 wrap="virtual"></textarea> ※ 全角512文字以内<br>
-ファイル		：<input type="file" name="upfile"><br>
-<input type="submit" value="アップロード"> <input type="reset" value="リセット">
-	</pre>
-	</form>
-	<?php
-		$pdo = null;
-
-	}
-
 	// ファイル保存先のパス
 	$updir = "./data/";
 
@@ -68,7 +32,7 @@
 	if ($_FILES['upfile']['name']==null) {
 
 		print("アップロードは失敗しました。");
-		upload();
+		require_once("upload_form.php");
 
 	} else {
 

From svnnotify ＠ sourceforge.jp  Mon May 16 14:09:28 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 16 May 2011 14:09:28 +0900
Subject: [Smartupload-svn] =?utf-8?b?WzQ0XSAg44Ki44OD44OX44Ot44O844OJ44OV?=
 =?utf-8?b?44Kp44O844Og44Gu44Kr44OG44K044Oq44Gu5Lim44Gz6aCG44KST1JERVIg?=
 =?utf-8?b?QlnjgavlpInmm7Q=?=
Message-ID: <1305522568.144274.30723.nullmailer@users.sourceforge.jp>

Revision: 44
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=44
Author:   hryksbt
Date:     2011-05-16 14:09:28 +0900 (Mon, 16 May 2011)

Log Message:
-----------
アップロードフォームのカテゴリの並び順をORDER BYに変更

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


-------------- next part --------------
Modified: trunk/SmartUpload/upload_form.php
===================================================================
--- trunk/SmartUpload/upload_form.php	2011-05-16 05:04:21 UTC (rev 43)
+++ trunk/SmartUpload/upload_form.php	2011-05-16 05:09:28 UTC (rev 44)
@@ -25,13 +25,13 @@
 
 	$value = 0;
 
-	$stmt = $db->prepare("SELECT * FROM category");
+	$stmt = $db->prepare("SELECT * FROM category ORDER BY cat_number");
 	$stmt->execute();
 
 	while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
 ?>
-		<option value="<?php print($row["cat_number"]); ?>">
-			<?php print($row["cat_name"]); ?>
+		<option value="<?php print($row['cat_number']); ?>">
+			<?php print($row['cat_name']); ?>
 		</option>
 <?php
 	}

From svnnotify ＠ sourceforge.jp  Mon May 16 17:57:36 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 16 May 2011 17:57:36 +0900
Subject: [Smartupload-svn] =?utf-8?b?WzQ1XSBtYWluLiBwaHDjga7jg6zjgqTjgqI=?=
 =?utf-8?b?44Km44OI5L+u5q2j?=
Message-ID: <1305536256.779983.13615.nullmailer@users.sourceforge.jp>

Revision: 45
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=45
Author:   hryksbt
Date:     2011-05-16 17:57:36 +0900 (Mon, 16 May 2011)

Log Message:
-----------
main.phpのレイアウト修正
ユーザ登録IDとパスワードの入力チェック⇒文字数チェックと、入力補完を追加予定

Modified Paths:
--------------
    trunk/SmartUpload/auth.php
    trunk/SmartUpload/download_file.php
    trunk/SmartUpload/main.php
    trunk/SmartUpload/upload_file.php
    trunk/SmartUpload/upload_form.php
    trunk/SmartUpload/user_add.php
    trunk/SmartUpload/user_form.php


-------------- next part --------------
Modified: trunk/SmartUpload/auth.php
===================================================================
--- trunk/SmartUpload/auth.php	2011-05-16 05:09:28 UTC (rev 44)
+++ trunk/SmartUpload/auth.php	2011-05-16 08:57:36 UTC (rev 45)
@@ -31,9 +31,6 @@
 			<input type="submit"  value="ログイン" />
 			<input type="hidden" name="cmd" value="login"/>
 		</form>
-		<form action="user_form.php" >
-			<input type="submit" value="ユーザ登録">
-		</form>
 <?php
 	}
 

Modified: trunk/SmartUpload/download_file.php
===================================================================
--- trunk/SmartUpload/download_file.php	2011-05-16 05:09:28 UTC (rev 44)
+++ trunk/SmartUpload/download_file.php	2011-05-16 08:57:36 UTC (rev 45)
@@ -2,7 +2,7 @@
 /*
  * SmartUpload/download_file.php
  * @author Hiroyuki Shibata
- * 2011/05/15
+ * 2011/05/16
  * Rev 1.0
  *
  */

Modified: trunk/SmartUpload/main.php
===================================================================
--- trunk/SmartUpload/main.php	2011-05-16 05:09:28 UTC (rev 44)
+++ trunk/SmartUpload/main.php	2011-05-16 08:57:36 UTC (rev 45)
@@ -2,7 +2,7 @@
 /*
  * SmartUpload/main.php
  * @author Hiroyuki Shibata
- * 2011/05/4
+ * 2011/05/16
  * Rev 1.0
  *
  */
@@ -15,8 +15,13 @@
 </head>
 <body>
 	<h1>Smart Upload</h1>
-	<iframe src=./auth.php scrolling=no frameborder=0 width=800 height=90></iframe>
-	<iframe src=./download_file.php scrolling=auto frameborder=0 width=800 height=200></iframe>
-	<iframe src=./upload_form.php scrolling=no frameborder=0 width=800 height=290></iframe>
+	<?php require_once 'auth.php';?>
+	<form action="user_form.php" >
+		<input type="submit" value="ユーザ登録">
+	</form>
+	<?php
+		require_once 'download_file.php';
+		require_once 'upload_form.php';
+	?>
 </body>
 </html>
\ No newline at end of file

Modified: trunk/SmartUpload/upload_file.php
===================================================================
--- trunk/SmartUpload/upload_file.php	2011-05-16 05:09:28 UTC (rev 44)
+++ trunk/SmartUpload/upload_file.php	2011-05-16 08:57:36 UTC (rev 45)
@@ -2,7 +2,7 @@
 /*
  * SmartUpload/upload_file.php
  * @author Hiroyuki Shibata
- * 2011/05/15
+ * 2011/05/16
  * Rev 1.0
  *
  */

Modified: trunk/SmartUpload/upload_form.php
===================================================================
--- trunk/SmartUpload/upload_form.php	2011-05-16 05:09:28 UTC (rev 44)
+++ trunk/SmartUpload/upload_form.php	2011-05-16 08:57:36 UTC (rev 45)
@@ -2,7 +2,7 @@
 /*
  * SmartUpload/upload_form.php
  * @author Hiroyuki Shibata
- * 2011/05/09
+ * 2011/05/16
  * Rev 1.0
  *
  */

Modified: trunk/SmartUpload/user_add.php
===================================================================
--- trunk/SmartUpload/user_add.php	2011-05-16 05:09:28 UTC (rev 44)
+++ trunk/SmartUpload/user_add.php	2011-05-16 08:57:36 UTC (rev 45)
@@ -2,7 +2,7 @@
 /*
  * SmartUpload/user_add.php
  * @author Hiroyuki Shibata
- * 2011/05/15
+ * 2011/05/16
  * Rev 1.0
  *
  */
@@ -22,18 +22,49 @@
 
 	try{
 
+		function check_string($value){
+
+			if(preg_match("/[a-zA-Z0-9\.#_-]/", $value)) {
+
+				return(TRUE);
+
+			}
+
+		}
+
 		if ($_SESSION["id"]) {
 
 			print("すでにログインしています<br>");
 	?>
 			<input type="button" value="戻る" onClick="history.back()">
 	<?php
-		} elseif ($_POST["id"]=="") {
+		// id（アカウント）チェック
+		} elseif (!check_string($_POST["id"])) {
 
 			print('Error: ');
-			print('ID（アカウント）が未入力です。');
-			die();
+			print("ID（アカウント）が不正です。<br>");
+			print("※　ID（アカウント）には、半角英数字と、「-」ハイフン、「_」アンダースコアが利用できます");
+			require_once ("user_form.php");
 
+		// パスワードチェック
+		} elseif (!check_string($_POST["pass"])) {
+
+			print('Error: ');
+			print("パスワードが不正です。<br>");
+			print("※パスワードには、半角英数字と、「-」ハイフン、「_」アンダースコアが利用できます");
+			require_once ("user_form.php");
+
+		// メールアドレスチェック
+		} elseif (!preg_match(
+
+			"/^([a-zA-Z0-9])+([a-zA-Z0-9\._-])*@([a-zA-Z0-9_-])+([a-zA-Z0-9\._-]+)+$/", $_POST["mail"]
+
+		)) {
+
+			print('Error: ');
+			print ("メールアドレスが不正です。");
+			require_once ("user_form.php");
+
 		} else {
 
 	?>
@@ -75,7 +106,7 @@
 				<input type="submit" value="戻る">
 			</form>
 	<?php
-			}
+		}
 
 	} catch (PDOException $e) {
 

Modified: trunk/SmartUpload/user_form.php
===================================================================
--- trunk/SmartUpload/user_form.php	2011-05-16 05:09:28 UTC (rev 44)
+++ trunk/SmartUpload/user_form.php	2011-05-16 08:57:36 UTC (rev 45)
@@ -2,7 +2,7 @@
 /*
  * SmartUpload/user_form.php
  * @author Hiroyuki Shibata
- * 2011/05/09
+ * 2011/05/16
  * Rev 1.0
  *
  */
@@ -26,8 +26,8 @@
 		<h2>ユーザー登録</h2>
 		<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>
+ID（アカウント）	：<input type="text" name="id"> ※ 半角英数字または「-」ハイフンと「_」アンダースコアを利用できます。（32文字以内）<br>
+パスワード	：<input type="password" name="pass"> ※ 半角英数字または「-」ハイフンと「_」アンダースコアを利用できます。（32文字以内）<br>
 氏名		：<input type="text" name="name"> ※ 全角32文字以内（半角64文字以内）<br>
 国		：<select name="country">
 	<?php
@@ -35,7 +35,7 @@
 
 		$value = 0;
 
-		$stmt = $db->prepare("SELECT * FROM country");
+		$stmt = $db->prepare("SELECT * FROM country ORDER BY num");
 		$stmt->execute();
 
 		while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {

From svnnotify ＠ sourceforge.jp  Tue May 17 16:33:42 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 17 May 2011 16:33:42 +0900
Subject: [Smartupload-svn] =?utf-8?b?WzQ2XSAg5paH5a2X5pWw44OB44Kn44OD44Kv?=
 =?utf-8?b?44KS6L+95Yqg?=
Message-ID: <1305617622.843040.10107.nullmailer@users.sourceforge.jp>

Revision: 46
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=46
Author:   hryksbt
Date:     2011-05-17 16:33:42 +0900 (Tue, 17 May 2011)

Log Message:
-----------
文字数チェックを追加

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


-------------- next part --------------
Modified: trunk/SmartUpload/user_add.php
===================================================================
--- trunk/SmartUpload/user_add.php	2011-05-16 08:57:36 UTC (rev 45)
+++ trunk/SmartUpload/user_add.php	2011-05-17 07:33:42 UTC (rev 46)
@@ -2,7 +2,7 @@
 /*
  * SmartUpload/user_add.php
  * @author Hiroyuki Shibata
- * 2011/05/16
+ * 2011/05/17
  * Rev 1.0
  *
  */
@@ -22,7 +22,8 @@
 
 	try{
 
-		function check_string($value){
+		// 文字チェック関数
+		function check_string($value) {
 
 			if(preg_match("/[a-zA-Z0-9\.#_-]/", $value)) {
 
@@ -32,28 +33,65 @@
 
 		}
 
+		// 文字数チェック関数
+		function count_string($str) {
+
+			if (strlen($str) <= 32) {
+
+				return (TRUE);
+
+			}
+
+		}
+
+	// メイン処理 //
+
 		if ($_SESSION["id"]) {
 
 			print("すでにログインしています<br>");
 	?>
 			<input type="button" value="戻る" onClick="history.back()">
 	<?php
-		// id（アカウント）チェック
+		// id（アカウント）の入力文字チェック
 		} elseif (!check_string($_POST["id"])) {
 
 			print('Error: ');
-			print("ID（アカウント）が不正です。<br>");
-			print("※　ID（アカウント）には、半角英数字と、「-」ハイフン、「_」アンダースコアが利用できます");
+			print("ID（アカウント）に不正な文字が含まれています。<br>");
+			print("※　ID（アカウント）には、半角英数字と、「-」ハイフン、「_」アンダースコアが利用できます。");
 			require_once ("user_form.php");
 
-		// パスワードチェック
+		// id（アカウント）の文字数チェック
+		} elseif (!count_string($_POST["id"])) {
+
+			print('Error: ');
+			print("ID（アカウント）の文字数オーバーです。<br>");
+			print("※　ID（アカウント）は、半角32文字以内です。");
+			require_once ("user_form.php");
+
+		// パスワードの入力文字チェック
 		} elseif (!check_string($_POST["pass"])) {
 
 			print('Error: ');
-			print("パスワードが不正です。<br>");
-			print("※パスワードには、半角英数字と、「-」ハイフン、「_」アンダースコアが利用できます");
+			print("パスワードに不正な文字が含まれています。<br>");
+			print("※　パスワードには、半角英数字と、「-」ハイフン、「_」アンダースコアが利用できます。");
 			require_once ("user_form.php");
 
+		// パスワードの文字数チェック
+		} elseif (!count_string($_POST["pass"])) {
+
+			print('Error: ');
+			print("パスワードの文字数オーバーです。<br>");
+			print("※　パスワードは、半角32文字以内です。");
+			require_once ("user_form.php");
+
+		// 氏名の文字数チェック
+		} elseif (strlen($_POST["name"]) > 64) {
+
+			print('Error: ');
+			print("氏名の文字数オーバーです。<br>");
+			print("※　氏名は、全角32文字以内（半角64文字以内です。");
+			require_once ("user_form.php");
+
 		// メールアドレスチェック
 		} elseif (!preg_match(
 

From svnnotify ＠ sourceforge.jp  Tue May 17 17:25:17 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 17 May 2011 17:25:17 +0900
Subject: [Smartupload-svn] =?utf-8?b?WzQ3XSAg5YWl5Yqb44Of44K55pmC44Gu6Ieq?=
 =?utf-8?b?5YuV6KOc5a6M44KS6L+95Yqg?=
Message-ID: <1305620717.604282.9831.nullmailer@users.sourceforge.jp>

Revision: 47
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=47
Author:   hryksbt
Date:     2011-05-17 17:25:17 +0900 (Tue, 17 May 2011)

Log Message:
-----------
入力ミス時の自動補完を追加

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


-------------- next part --------------
Modified: trunk/SmartUpload/user_form.php
===================================================================
--- trunk/SmartUpload/user_form.php	2011-05-17 07:33:42 UTC (rev 46)
+++ trunk/SmartUpload/user_form.php	2011-05-17 08:25:17 UTC (rev 47)
@@ -2,7 +2,7 @@
 /*
  * SmartUpload/user_form.php
  * @author Hiroyuki Shibata
- * 2011/05/16
+ * 2011/05/17
  * Rev 1.0
  *
  */
@@ -15,48 +15,72 @@
 </head>
 <body>
 	<?php
+
+	// ログイン済みの場合
 	if ($_SESSION["id"]) {
 
 		print("すでにログインしています<br>");
 	?>
 		<input type="button" value="戻る" onClick="history.back()">
 	<?php
+
+// メイン処理 //
 	} else {
 	?>
 		<h2>ユーザー登録</h2>
 		<form name="user_form" action="./user_add.php" method="post">
 			<pre>
-ID（アカウント）	：<input type="text" name="id"> ※ 半角英数字または「-」ハイフンと「_」アンダースコアを利用できます。（32文字以内）<br>
+ID（アカウント）	：<input type="text" name="id" value="<?php print ($_POST['id']); ?>"> ※ 半角英数字または「-」ハイフンと「_」アンダースコアを利用できます。（32文字以内）<br>
 パスワード	：<input type="password" name="pass"> ※ 半角英数字または「-」ハイフンと「_」アンダースコアを利用できます。（32文字以内）<br>
-氏名		：<input type="text" name="name"> ※ 全角32文字以内（半角64文字以内）<br>
-国		：<select name="country">
+氏名		：<input type="text" name="name" value="<?php print ($_POST['name']); ?>"> ※ 全角32文字以内（半角64文字以内）<br>
+国		：<select name="country" >
+
 	<?php
+
 		require_once("include/database.php");
 
-		$value = 0;
+		if ($_POST) {
 
-		$stmt = $db->prepare("SELECT * FROM country ORDER BY num");
-		$stmt->execute();
+			$stmt = $db->prepare("SELECT * FROM country where num = ?");
+			$stmt->execute(array($_POST['country']));
 
-		while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
+			$row = $stmt->fetch(PDO::FETCH_ASSOC);
 	?>
 			<option value="<?php print($row["num"]); ?>">
 				<?php print($row["country_name"]); ?>
 			</option>
 	<?php
+
+		} else {
+
+			$stmt = $db->prepare("SELECT * FROM country ORDER BY num");
+			$stmt->execute();
+
+			while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
+	?>
+			<option value="<?php print($row["num"]); ?>">
+				<?php print($row["country_name"]); ?>
+			</option>
+	<?php
+
+			}
+
 		}
+
 	?>
 </select>
 <br>
-メールアドレス	：<input type="text" name="mail"> ※ 半角64文字以内<br>
+メールアドレス	：<input type="text" name="mail" value="<?php print ($_POST['mail']); ?>"> ※ 半角64文字以内<br>
 
 <input type="submit" class="update" value="登録" /> <input type="reset"  value="リセット">
 			</pre>
 		</form>
 	<?php
-		$pdo = null;
 
 	}
+
+	$pdo = null;
+
 	?>
 </body>
 </html>

From svnnotify ＠ sourceforge.jp  Tue May 17 17:56:22 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 17 May 2011 17:56:22 +0900
Subject: [Smartupload-svn] =?utf-8?b?WzQ4XSB1c2VyX2Zvcm0uIHBocCAtIOWbvQ==?=
 =?utf-8?b?5ZCN6Ieq5YuV6KOc5a6M6L+95Yqg?=
Message-ID: <1305622582.491660.15644.nullmailer@users.sourceforge.jp>

Revision: 48
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=48
Author:   hryksbt
Date:     2011-05-17 17:56:22 +0900 (Tue, 17 May 2011)

Log Message:
-----------
user_form.php - 国名自動補完追加
user_add.php - 入力チェック実装中

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


-------------- next part --------------
Modified: trunk/SmartUpload/user_add.php
===================================================================
--- trunk/SmartUpload/user_add.php	2011-05-17 08:25:17 UTC (rev 47)
+++ trunk/SmartUpload/user_add.php	2011-05-17 08:56:22 UTC (rev 48)
@@ -6,7 +6,7 @@
  * Rev 1.0
  *
  */
-	session_start();
+session_start();
 ?>
 <html>
 <head>
@@ -14,6 +14,7 @@
 <title>SmartUpload</title>
 </head>
 <body>
+
 	<?php
 
 	// メイン処理 //
@@ -22,7 +23,7 @@
 
 	try{
 
-		// 文字チェック関数
+	// 文字チェック関数
 		function check_string($value) {
 
 			if(preg_match("/[a-zA-Z0-9\.#_-]/", $value)) {
@@ -30,10 +31,9 @@
 				return(TRUE);
 
 			}
-
 		}
 
-		// 文字数チェック関数
+	// 文字数チェック関数
 		function count_string($str) {
 
 			if (strlen($str) <= 32) {
@@ -41,109 +41,135 @@
 				return (TRUE);
 
 			}
-
 		}
 
 	// メイン処理 //
-
 		if ($_SESSION["id"]) {
 
 			print("すでにログインしています<br>");
 	?>
-			<input type="button" value="戻る" onClick="history.back()">
+		<input type="button" value="戻る" onClick="history.back()">
 	<?php
+
+		} else {
+
+			$error = 0;
+
 		// id（アカウント）の入力文字チェック
-		} elseif (!check_string($_POST["id"])) {
+			if (!check_string($_POST["id"])) {
 
-			print('Error: ');
-			print("ID（アカウント）に不正な文字が含まれています。<br>");
-			print("※　ID（アカウント）には、半角英数字と、「-」ハイフン、「_」アンダースコアが利用できます。");
-			require_once ("user_form.php");
+				print('Error: ');
+				print("ID（アカウント）に不正な文字が含まれています。<br>");
+				print("※　ID（アカウント）には、半角英数字と、「-」ハイフン、「_」アンダースコアが利用できます。<br>");
 
+				$error =1;
+
+			}
+
 		// id（アカウント）の文字数チェック
-		} elseif (!count_string($_POST["id"])) {
+			if (!count_string($_POST["id"])) {
 
-			print('Error: ');
-			print("ID（アカウント）の文字数オーバーです。<br>");
-			print("※　ID（アカウント）は、半角32文字以内です。");
-			require_once ("user_form.php");
+				print('Error: ');
+				print("ID（アカウント）の文字数オーバーです。<br>");
+				print("※　ID（アカウント）は、半角32文字以内です。<br>");
 
+				$error =1;
+
+			}
+
 		// パスワードの入力文字チェック
-		} elseif (!check_string($_POST["pass"])) {
+			if (!check_string($_POST["pass"])) {
 
-			print('Error: ');
-			print("パスワードに不正な文字が含まれています。<br>");
-			print("※　パスワードには、半角英数字と、「-」ハイフン、「_」アンダースコアが利用できます。");
-			require_once ("user_form.php");
+				print('Error: ');
+				print("パスワードに不正な文字が含まれています。<br>");
+				print("※　パスワードには、半角英数字と、「-」ハイフン、「_」アンダースコアが利用できます。<br>");
 
+				$error =1;
+
+			}
+
 		// パスワードの文字数チェック
-		} elseif (!count_string($_POST["pass"])) {
+			if (!count_string($_POST["pass"])) {
 
-			print('Error: ');
-			print("パスワードの文字数オーバーです。<br>");
-			print("※　パスワードは、半角32文字以内です。");
-			require_once ("user_form.php");
+				print('Error: ');
+				print("パスワードの文字数オーバーです。<br>");
+				print("※　パスワードは、半角32文字以内です。<br>");
 
+				$error =1;
+
+			}
+
 		// 氏名の文字数チェック
-		} elseif (strlen($_POST["name"]) > 64) {
 
-			print('Error: ');
-			print("氏名の文字数オーバーです。<br>");
-			print("※　氏名は、全角32文字以内（半角64文字以内です。");
-			require_once ("user_form.php");
+			if (strlen($_POST["name"]) > 64) {
 
-		// メールアドレスチェック
-		} elseif (!preg_match(
+				print('Error: ');
+				print("氏名の文字数オーバーです。<br>");
+				print("※　氏名は、全角32文字以内（半角64文字以内です。<br>");
 
-			"/^([a-zA-Z0-9])+([a-zA-Z0-9\._-])*@([a-zA-Z0-9_-])+([a-zA-Z0-9\._-]+)+$/", $_POST["mail"]
+				$error =1;
 
-		)) {
+			// メールアドレスチェック
+				if (!preg_match(
 
-			print('Error: ');
-			print ("メールアドレスが不正です。");
-			require_once ("user_form.php");
+					"/^([a-zA-Z0-9])+([a-zA-Z0-9\._-])*@([a-zA-Z0-9_-])+([a-zA-Z0-9\._-]+)+$/", $_POST["mail"]
 
-		} else {
+				)) {
 
+					print('Error: ');
+					print ("メールアドレスが不正です。<br>");
+
+					$error =1;
+
+				}
+			}
+
+			if ($error = 1) {
+
+				require_once ("user_form.php");
+
+			} else {
 	?>
-	<p>
-		<b>登録完了</b>
-	</p>
+				<p>
+					<b>登録完了</b>
+				</p>
 	<?php
+
 			// DBに登録 //
+				$stmt = $db->prepare(
+					"INSERT INTO user_info (
+						userid,
+						password,
+						fullname,
+						country_code,
+						add_date,
+						email,
+						frag
+					) VALUES ( ?, ?, ?, ?, now(), ?, 0)"
+				);
 
-			$stmt = $db->prepare(
-				"INSERT INTO user_info (
-					userid,
-					password,
-					fullname,
-					country_code,
-					add_date,
-					email,
-					frag
-				) VALUES ( ?, ?, ?, ?, now(), ?, 0)"
-			);
+				$stmt->bindParam(1,$_POST["id"]);
+				$stmt->bindParam(2,$_POST["pass"]);
+				$stmt->bindParam(3,$_POST["name"]);
+				$stmt->bindParam(4,$_POST["country"]);
+				$stmt->bindParam(5,$_POST["mail"]);
+				$stmt->execute();
 
-			$stmt->bindParam(1,$_POST["id"]);
-			$stmt->bindParam(2,$_POST["pass"]);
-			$stmt->bindParam(3,$_POST["name"]);
-			$stmt->bindParam(4,$_POST["country"]);
-			$stmt->bindParam(5,$_POST["mail"]);
-			$stmt->execute();
-
 			// 登録成功を表示 //
+				$stmt = $db->prepare('select fullname from user_info where userid = ?');
+				$stmt->execute(array($_POST["id"]));
 
-			$stmt = $db->prepare('select fullname from user_info where userid = ?');
-			$stmt->execute(array($_POST["id"]));
+				$row = $stmt->fetch(PDO::FETCH_ASSOC);
 
-			$row = $stmt->fetch(PDO::FETCH_ASSOC);
+				print(htmlspecialchars($row['fullname']." "."さんのユーザ登録が完了しました。", ENT_QUOTES));
 
-			print(htmlspecialchars($row['fullname']." "."さんのユーザ登録が完了しました。", ENT_QUOTES));
 	?>
-			<form action="main.php" >
+			<form action="main.php">
 				<input type="submit" value="戻る">
 			</form>
 	<?php
+
+			}
 		}
 
 	} catch (PDOException $e) {
@@ -154,6 +180,8 @@
 	}
 
 	$pdo = null;
+
 	?>
+
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: trunk/SmartUpload/user_form.php
===================================================================
--- trunk/SmartUpload/user_form.php	2011-05-17 08:25:17 UTC (rev 47)
+++ trunk/SmartUpload/user_form.php	2011-05-17 08:56:22 UTC (rev 48)
@@ -68,13 +68,13 @@
 		}
 
 	?>
-</select>
-<br>
-メールアドレス	：<input type="text" name="mail" value="<?php print ($_POST['mail']); ?>"> ※ 半角64文字以内<br>
+		</select>
 
+メールアドレス	：<input type="text" name="mail" value="<?php print ($_POST['mail']); ?>"> ※ 半角64文字以内
+
 <input type="submit" class="update" value="登録" /> <input type="reset"  value="リセット">
-			</pre>
-		</form>
+		</pre>
+	</form>
 	<?php
 
 	}

From svnnotify ＠ sourceforge.jp  Tue May 17 19:35:22 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 17 May 2011 19:35:22 +0900
Subject: [Smartupload-svn] =?utf-8?b?WzQ5XSB1c2VyX2FkZC4gcGhwIC0g5YWl5Yqb?=
 =?utf-8?b?44OB44Kn44OD44Kv5a6M5oiQ?=
Message-ID: <1305628522.826033.4207.nullmailer@users.sourceforge.jp>

Revision: 49
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=49
Author:   hryksbt
Date:     2011-05-17 19:35:22 +0900 (Tue, 17 May 2011)

Log Message:
-----------
user_add.php - 入力チェック完成
user_form.php - 国名の初期値設定に課題あり（自動補完した値しかリストされない）

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


-------------- next part --------------
Modified: trunk/SmartUpload/user_add.php
===================================================================
--- trunk/SmartUpload/user_add.php	2011-05-17 08:56:22 UTC (rev 48)
+++ trunk/SmartUpload/user_add.php	2011-05-17 10:35:22 UTC (rev 49)
@@ -55,72 +55,118 @@
 
 			$error = 0;
 
-		// id（アカウント）の入力文字チェック
-			if (!check_string($_POST["id"])) {
+		// id（アカウント）の未入力チェック
+			if (!($_POST["id"])) {
 
 				print('Error: ');
-				print("ID（アカウント）に不正な文字が含まれています。<br>");
-				print("※　ID（アカウント）には、半角英数字と、「-」ハイフン、「_」アンダースコアが利用できます。<br>");
+				print("ID（アカウント）が入力されてません。<br>");
 
 				$error =1;
 
-			}
+			} else {
 
-		// id（アカウント）の文字数チェック
-			if (!count_string($_POST["id"])) {
+			// id（アカウント）の入力文字チェック
+				if (!check_string($_POST["id"])) {
 
-				print('Error: ');
-				print("ID（アカウント）の文字数オーバーです。<br>");
-				print("※　ID（アカウント）は、半角32文字以内です。<br>");
+					print('Error: ');
+					print("ID（アカウント）に不正な文字が含まれています。<br>");
+					print("※　ID（アカウント）には、半角英数字と、「-」ハイフン、「_」アンダースコアが利用できます。<br>");
+					print("<br>");
 
-				$error =1;
+					$error =1;
 
-			}
+				}
 
-		// パスワードの入力文字チェック
-			if (!check_string($_POST["pass"])) {
+			// id（アカウント）の文字数チェック
+				if (!count_string($_POST["id"])) {
 
-				print('Error: ');
-				print("パスワードに不正な文字が含まれています。<br>");
-				print("※　パスワードには、半角英数字と、「-」ハイフン、「_」アンダースコアが利用できます。<br>");
+					print('Error: ');
+					print("ID（アカウント）の文字数オーバーです。<br>");
+					print("※　ID（アカウント）は、半角32文字以内です。<br>");
+					print("<br>");
 
-				$error =1;
+					$error =1;
 
+				}
 			}
 
-		// パスワードの文字数チェック
-			if (!count_string($_POST["pass"])) {
+		// パスワードの未入力チェック
+			if (!($_POST["pass"])) {
 
 				print('Error: ');
-				print("パスワードの文字数オーバーです。<br>");
-				print("※　パスワードは、半角32文字以内です。<br>");
+				print("パスワード`が入力されていません。<br>");
 
 				$error =1;
 
+			} else {
+
+			// パスワードの入力文字チェック
+				if (!check_string($_POST["pass"])) {
+
+					print('Error: ');
+					print("パスワードに不正な文字が含まれています。<br>");
+					print("※　パスワードには、半角英数字と、「-」ハイフン、「_」アンダースコアが利用できます。<br>");
+					print("<br>");
+
+					$error =1;
+
+				}
+
+			// パスワードの文字数チェック
+				if (!count_string($_POST["pass"])) {
+
+					print('Error: ');
+					print("パスワードの文字数オーバーです。<br>");
+					print("※　パスワードは、半角32文字以内です。<br>");
+					print("<br>");
+
+					$error =1;
+
+				}
 			}
 
-		// 氏名の文字数チェック
+		// 氏名の未入力チェック
+			if (!($_POST["name"])) {
 
-			if (strlen($_POST["name"]) > 64) {
-
 				print('Error: ');
-				print("氏名の文字数オーバーです。<br>");
-				print("※　氏名は、全角32文字以内（半角64文字以内です。<br>");
+				print("氏名が入力されていません<br>");
 
 				$error =1;
 
-			// メールアドレスチェック
-				if (!preg_match(
+			} else {
 
-					"/^([a-zA-Z0-9])+([a-zA-Z0-9\._-])*@([a-zA-Z0-9_-])+([a-zA-Z0-9\._-]+)+$/", $_POST["mail"]
+			// 氏名の文字数チェック
+				if (strlen($_POST["name"]) > 64) {
 
-				)) {
+					print('Error: ');
+					print("氏名の文字数オーバーです。<br>");
+					print("※　氏名は、全角32文字以内（半角64文字以内です。<br>");
+					print("<br>");
 
+					$error =1;
+
+				}
+
+			// メールアドレス入力チェック
+				if (!($_POST["mail"])) {
+
 					print('Error: ');
-					print ("メールアドレスが不正です。<br>");
+					print ("メールアドレスが入力されていません。<br>");
 
 					$error =1;
 
+				} else {
+
+				// メールアドレスチェック
+					if (!preg_match("/^([a-zA-Z0-9])+([a-zA-Z0-9\._-])*@([a-zA-Z0-9_-])+([a-zA-Z0-9\._-]+)+$/", $_POST["mail"])) {
+
+						print('Error: ');
+						print ("メールアドレスに不正な文字が含まれています。<br>");
+						print("<br>");
+
+						$error =1;
+
+					}
 				}
 			}
 
@@ -128,7 +174,7 @@
 
 				require_once ("user_form.php");
 
-			} else {
+			} elseif ($error == 0) {
 	?>
 				<p>
 					<b>登録完了</b>

From svnnotify ＠ sourceforge.jp  Sat May 28 23:28:14 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sat, 28 May 2011 23:28:14 +0900
Subject: [Smartupload-svn] =?utf-8?b?WzUwXSB1c2VyX2Zvcm0uIHBocCAtIOeZuw==?=
 =?utf-8?b?6Yyy44Of44K544Gu6Zqb44Gu44CB5Zu944Gu5Yid5pyf6KGo56S644KS5L+u?=
 =?utf-8?b?5q2j?=
Message-ID: <1306592894.458433.10578.nullmailer@users.sourceforge.jp>

Revision: 50
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=50
Author:   hryksbt
Date:     2011-05-28 23:28:14 +0900 (Sat, 28 May 2011)

Log Message:
-----------
user_form.php - 登録ミスの際の、国の初期表示を修正

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

Added Paths:
-----------
    trunk/SmartUpload/data/Opening.xml


-------------- next part --------------
Added: trunk/SmartUpload/data/Opening.xml
===================================================================
--- trunk/SmartUpload/data/Opening.xml	                        (rev 0)
+++ trunk/SmartUpload/data/Opening.xml	2011-05-28 14:28:14 UTC (rev 50)
@@ -0,0 +1,26 @@
+?<?xml version="1.0" encoding="utf-8"?>
+<AbsoluteLayout
+android:id="@+id/widget32"
+android:layout_width="fill_parent"
+android:layout_height="fill_parent"
+xmlns:android="http://schemas.android.com/apk/res/android"
+>
+<Button
+android:id="@+id/Start_Button"
+android:layout_width="wrap_content"
+android:layout_height="wrap_content"
+android:text="開始"
+android:layout_x="130px"
+android:layout_y="312px"
+>
+</Button>
+<ImageView
+android:id="@+id/widget40"
+android:layout_width="wrap_content"
+android:layout_height="wrap_content"
+android:src="C:\Documents and Settings\Admin\デスクトップ\Sangokushi\trunk\images\logo.gif"
+android:layout_x="140px"
+android:layout_y="102px"
+>
+</ImageView>
+</AbsoluteLayout>


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

Modified: trunk/SmartUpload/user_form.php
===================================================================
--- trunk/SmartUpload/user_form.php	2011-05-17 10:35:22 UTC (rev 49)
+++ trunk/SmartUpload/user_form.php	2011-05-28 14:28:14 UTC (rev 50)
@@ -2,7 +2,7 @@
 /*
  * SmartUpload/user_form.php
  * @author Hiroyuki Shibata
- * 2011/05/17
+ * 2011/05/28
  * Rev 1.0
  *
  */
@@ -41,16 +41,29 @@
 
 		if ($_POST) {
 
+		// 選択されたリスト項目
 			$stmt = $db->prepare("SELECT * FROM country where num = ?");
 			$stmt->execute(array($_POST['country']));
 
 			$row = $stmt->fetch(PDO::FETCH_ASSOC);
 	?>
-			<option value="<?php print($row["num"]); ?>">
+			<option value="<?php print($row["num"]); ?>" selected>
 				<?php print($row["country_name"]); ?>
 			</option>
 	<?php
+		// 選択されなかったリスト項目
 
+			$stmt2 = $db->prepare("SELECT * FROM country where not num = ? ORDER BY num");
+			$stmt2->execute(array($_POST['country']));
+
+			while ($row2 = $stmt2->fetch(PDO::FETCH_ASSOC)) {
+	?>
+				<option value="<?php print($row2["num"]); ?>">
+					<?php print($row2["country_name"]); ?>
+				</option>
+	<?php
+			}
+
 		} else {
 
 			$stmt = $db->prepare("SELECT * FROM country ORDER BY num");
@@ -58,15 +71,12 @@
 
 			while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
 	?>
-			<option value="<?php print($row["num"]); ?>">
-				<?php print($row["country_name"]); ?>
-			</option>
+				<option value="<?php print($row["num"]); ?>">
+					<?php print($row["country_name"]); ?>
+				</option>
 	<?php
-
 			}
-
 		}
-
 	?>
 		</select>
 
@@ -76,7 +86,6 @@
 		</pre>
 	</form>
 	<?php
-
 	}
 
 	$pdo = null;

From svnnotify ＠ sourceforge.jp  Tue May 31 23:58:06 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 31 May 2011 23:58:06 +0900
Subject: [Smartupload-svn] =?utf-8?b?WzUxXSAg5ZCE5Zu944Gu44K144O844OT44K5?=
 =?utf-8?b?44Go5pel5pys5Zu95YaF44K144O844OT44K544Gr6Zai44GZ44KL6KiA5Y+K?=
 =?utf-8?b?44KS6L+96KiY?=
Message-ID: <1306853886.782350.3833.nullmailer@users.sourceforge.jp>

Revision: 51
          http://sourceforge.jp/projects/smartupload/svn/view?view=rev&revision=51
Author:   hryksbt
Date:     2011-05-31 23:58:06 +0900 (Tue, 31 May 2011)

Log Message:
-----------
各国のサービスと日本国内サービスに関する言及を追記

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


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