svnno****@sourc*****
svnno****@sourc*****
2011年 5月 16日 (月) 17:57:36 JST
ForkRevision: 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)) {