summaryrefslogtreecommitdiffstats
path: root/application/views
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2012-04-08 23:13:15 +0200
committerFlorian Pritz <bluewind@xinu.at>2012-04-09 20:47:36 +0200
commit3f01ddce9dff69a49493541882de85854cbcebe5 (patch)
tree13c23f0a6893970ca71fbbfe763c3c696c8a0a4b /application/views
parentb18f4e453ecdf3404a107f9fc72d7bd9249401d0 (diff)
start working on users
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'application/views')
-rw-r--r--application/views/file/delete_form.php8
-rw-r--r--application/views/file/header.php10
-rw-r--r--application/views/file/upload_form.php7
-rw-r--r--application/views/file/upload_history.php7
l---------application/views/user/footer.php1
l---------application/views/user/header.php1
-rw-r--r--application/views/user/index.php1
-rw-r--r--application/views/user/login.php18
-rw-r--r--application/views/user/login_successful.php1
9 files changed, 36 insertions, 18 deletions
diff --git a/application/views/file/delete_form.php b/application/views/file/delete_form.php
index f617d25c7..64e0f9cd7 100644
--- a/application/views/file/delete_form.php
+++ b/application/views/file/delete_form.php
@@ -25,13 +25,7 @@
<td class="text"><?php echo $filedata["mimetype"]; ?></td>
</tr>
<?php endif; ?>
- <tr>
- <td class="title">Password</td>
- <td class="text">
- <input type="password" name="password" size="10" />
- <input type="submit" value="Delete" name="process" />
- </td>
- </tr>
</table>
+ <input type="submit" value="Delete" name="process" />
</form>
</div>
diff --git a/application/views/file/header.php b/application/views/file/header.php
index e09f29f61..578ebe428 100644
--- a/application/views/file/header.php
+++ b/application/views/file/header.php
@@ -11,6 +11,16 @@
<body>
<div class="top">
<?php echo anchor('file/index', 'New'); ?>
+
+ <?php if (!isset($username)) { ?>
+ <div style="float: right">
+ <?=form_open("user/login"); ?>
+ <input type="text" name="username" />
+ <input type="password" name="password" />
+ <input type="submit" value="Login" name="process" />
+ </form>
+ </div>
+ <?php } ?>
</div>
<div class="content">
diff --git a/application/views/file/upload_form.php b/application/views/file/upload_form.php
index 34dd5a77b..e1e4313a5 100644
--- a/application/views/file/upload_form.php
+++ b/application/views/file/upload_form.php
@@ -1,10 +1,9 @@
-<? if (false) { ?>
+<? if ($username) { ?>
<div style="margin-top: 100px; text-align:center">
<?php echo form_open_multipart('file/do_upload'); ?>
<p>
File: <input type="file" id="file" name="file" size="30" />
- <input type="submit" value="Upload" id="upload_button" name="process" /><br />
- Optional password (for deletion and search): <input type="password" name="password" size="10" />
+ <input type="submit" value="Upload" id="upload_button" name="process" />
</p>
</form>
<script type="text/javascript">
@@ -34,7 +33,7 @@
<?php endif; ?>. Maximum upload size is <?php echo format_bytes($max_upload_size); ?></p>
<h2>Features</h2>
<p>For shell uploading and download information for the client go to <a href="<?php echo site_url("file/client"); ?>"><?php echo site_url("file/client"); ?></a></p>
-<p>You can use the <?php echo anchor("file/upload_history", "history"); ?> to find old uploads using the password supplied when creating the upload.</p>
+<p>You can use the <?php echo anchor("file/upload_history", "history"); ?> to find old uploads.</p>
<p>How to link your uploads:</p>
<ul>
<li><span class="example">/&lt;ID&gt;/</span> automatically highlight the uploads</li>
diff --git a/application/views/file/upload_history.php b/application/views/file/upload_history.php
index b90d59be8..1dcaa8053 100644
--- a/application/views/file/upload_history.php
+++ b/application/views/file/upload_history.php
@@ -1,10 +1,3 @@
-<?php echo form_open('file/upload_history'); ?>
- <p>
- Password: <input type="password" name="password" size="10" />
- <input type="submit" value="Display" />
- </p>
-</form>
-
<table class="results">
<tr>
<th></th>
diff --git a/application/views/user/footer.php b/application/views/user/footer.php
new file mode 120000
index 000000000..e3a4d3fca
--- /dev/null
+++ b/application/views/user/footer.php
@@ -0,0 +1 @@
+../file/footer.php \ No newline at end of file
diff --git a/application/views/user/header.php b/application/views/user/header.php
new file mode 120000
index 000000000..7b5e4d759
--- /dev/null
+++ b/application/views/user/header.php
@@ -0,0 +1 @@
+../file/header.php \ No newline at end of file
diff --git a/application/views/user/index.php b/application/views/user/index.php
new file mode 100644
index 000000000..891ecc083
--- /dev/null
+++ b/application/views/user/index.php
@@ -0,0 +1 @@
+Momentan eingeloggt als "<?php echo $username; ?>".<br />
diff --git a/application/views/user/login.php b/application/views/user/login.php
new file mode 100644
index 000000000..ca6f01b88
--- /dev/null
+++ b/application/views/user/login.php
@@ -0,0 +1,18 @@
+<?php
+if (isset($login_error)) {
+ echo '<font style="color: rgb(238, 51, 51);">The entered credentials are invalid.</font>';
+} ?>
+
+<?php echo form_open('user/login'); ?>
+ <table>
+ <tr>
+ <td>Username:</td>
+ <td><input type="text" name="username" /></td>
+ </tr>
+ <tr>
+ <td>Password:</td>
+ <td><input type="password" name="password" /></td>
+ </tr>
+ </table>
+ <input type="submit" value="Login" name="process" />
+</form>
diff --git a/application/views/user/login_successful.php b/application/views/user/login_successful.php
new file mode 100644
index 000000000..d6ee74040
--- /dev/null
+++ b/application/views/user/login_successful.php
@@ -0,0 +1 @@
+Login successful.