add inc_head for account stuff; add confirmation hooks for path alias…

…es; fix boolean test

www/account_path_aliases.php

@@ -27,18 +27,26 @@
 			$ok = 0;
 		}
 
-		if (($ok) && (flickr_users_path_aliases_is_available($new_alias))){
+		if (($ok) && (! flickr_users_path_aliases_is_available($new_alias))){
 			$GLOBALS['smarty']->assign("error", "alias taken");
 			$ok = 0;
 		}
 
 		if ($ok){
 
-			$rsp = flickr_users_path_aliases_create($GLOBALS['cfg']['user'], $new_alias);
+			if (post_str("confirm")){
 
-			if (! $rsp['ok']){
-				$GLOBALS['smarty']->assign("error", "db error");
-				$ok = 0;
+				$rsp = flickr_users_path_aliases_create($GLOBALS['cfg']['user'], $new_alias);
+
+				if (! $rsp['ok']){
+					$GLOBALS['smarty']->assign("error", "db error");
+					$ok = 0;
+				}
+			}
+
+			else {
+				$GLOBALS['smarty']->assign("step", "confirm");
+				$GLOBALS['smarty']->assign("path_alias", $new_alias);
 			}
 		}
 	}

www/css/main.css

@@ -343,3 +343,17 @@ p.message {
     list-style-type: none;
     line-height: 1.5em;
 }
+
+table {
+}
+
+th {
+    color:#999;
+    border-bottom: solid thin;
+    padding-bottom:10px;
+}
+
+td {
+    padding-right: 10px;
+    padding-top: 10px;
+}

www/templates/inc_account_head.txt

@@ -0,0 +1 @@
+{* place-holder *}

www/templates/page_account_backups.txt

@@ -1,5 +1,6 @@
 {capture assign="page_title"}your flickr backups{/capture}
 {include file="inc_head.txt"}
+{include file="inc_account_head.txt"}
 
 <h2>Flickr Backups</h2>
 

www/templates/page_account_delete.txt

@@ -1,5 +1,6 @@
 {assign var='page_title' value="Delete your account"}
 {include file="inc_head.txt"}
+{include file="inc_account_head.txt"}
 
 {if $error_deleting}<p class="error">Something went wrong. Try again later pls.</p>{/if}
 

www/templates/page_account_delete_confirm.txt

@@ -1,5 +1,6 @@
 {assign var='page_title' value="Delete your account"}
 {include file="inc_head.txt"}
+{include file="inc_account_head.txt"}
 
 <p>Are you <strong>really sure</strong> you want to delete your account?</p>
 

www/templates/page_account_password.txt

@@ -1,5 +1,6 @@
 {assign var="page_title" value="Change your password"}
 {include file="inc_head.txt"}
+{include file="inc_account_head.txt"}
 
 {if $error_oldpass_mismatch}	<p class="error">Incorrect old password.</p>{/if}
 {if $error_newpass_empty}	<p class="error">Please choose a new password.</p>{/if}

www/templates/page_account_path_aliases.txt

@@ -1,36 +1,45 @@
+{capture assign="page_title"}your custom URLs{/capture}
 {include file="inc_head.txt"}
+{include file="inc_account_head.txt"}
 
 <form method="POST">
 {$crumb_key|crumb_input}
 
 <h3>Create a new URL</h3>
 
-<input type="text" name="path_alias" value="" size="30" />
-<input type="submit" value="CREATE" />
-
-{if !$aliases|@count}
+{if $error}
+<p class="error">{$error|escape}</p>
+{else}
 
+{if $step=='confirm'}
+<p>Are you sure you want all your photos to live at <strong>{$cfg.abs_root_url}photos/{$path_alias|escape}/</strong> ?</p>
+<input type="hidden" name="confirm" value="1" />
+<input type="hidden" name="path_alias" value="{$path_alias|escape}" />
+<input type="submit" value="I AM SURE, YES" />
 {else}
+<strong>{$cfg.abs_root_url}photos/</strong> <input type="text" name="path_alias" value="" size="30" />
+<input type="submit" value="CREATE" />
+{/if}
+
+{/if}
 
 <h3>Your URLs</h3>
 
 <table>
 	<tr>
-		<th>URL</th>
 		<th>Created</th>
-		<th>Redirects To</th>
+		<th>URL</th>
+		<th style="border:none;"></th>
 	</tr>
 {foreach from=$aliases item="row"}
 	<tr>
-		<td><a href="">{$row.path_alias|escape}</a></td>
-		<td>{$row.created|escape}</td>
-		<td>{if $row.redirect_to}<a href="">{$row.redirect_to|escape}</a>{else}&#8212;{/if}</td>
+		<td>{$row.created|date_format:"%Y-%m-%d"|escape}</td>
+		<td><a href="{$cfg.abs_root_url}photos/{$row.path_alias|escape}/">{$cfg.abs_root_url}photos/{$row.path_alias|escape}/</a></td>
+		<td style="font-size:small;font-style:italic;">{if $aliases|@count > 1 and !$row.redirect_to}⇽ all your other URLs redirect to this one{/if}</td>
 	</tr>
 {/foreach}
 </table>
 
-{/if}
-
 </form>
 
 {include file="inc_foot.txt"}