summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Pemberton <mpemberton5@gmail.com>2011-05-16 00:35:31 -0400
committerMark Pemberton <mpemberton5@gmail.com>2011-05-16 00:35:31 -0400
commit10214c43b51e99cc3f8f58a4c4e8893eb2480e62 (patch)
tree16f51f136146ed09d9e9a27e2b9a781be716e8b7
parent16791766dee4f9c03700b7c817063071e4d0ed33 (diff)
downloadsemanticscuttle-10214c43b51e99cc3f8f58a4c4e8893eb2480e62.tar.gz
semanticscuttle-10214c43b51e99cc3f8f58a4c4e8893eb2480e62.tar.bz2
Updated 'Generate New Key' button to use ajax if javascript enabled.
-rw-r--r--data/templates/editprofile.tpl.php4
-rw-r--r--src/SemanticScuttle/Service/Bookmark.php11
-rw-r--r--www/profile.php1
3 files changed, 10 insertions, 6 deletions
diff --git a/data/templates/editprofile.tpl.php b/data/templates/editprofile.tpl.php
index 76f608a..258e864 100644
--- a/data/templates/editprofile.tpl.php
+++ b/data/templates/editprofile.tpl.php
@@ -33,7 +33,9 @@ $this->includeTemplate($GLOBALS['top_include']);
<td><input type="checkbox" id="pEnablePrivateKey" name="pEnablePrivateKey" value="true" <?php echo $privateKeyIsEnabled;?> />
<label for="pEnablePrivateKey"><?php echo T_('Enable'); ?></label>&nbsp;&nbsp;&nbsp;
<input type="text" id="pPrivateKey" name="pPrivateKey" size="40" value="<?php echo $privateKey;?>" readonly="readonly" />
- <input type="submit" name="submittedPK" value="<?php echo T_('Generate New Key'); ?>" />
+ <!--<input type="button" name="submittedPK" value="<?php echo T_('Generate New Key'); ?>" />-->
+
+ <a onClick="getNewPrivateKey(this); return false;"><button type="submit" name="submittedPK" value="1"><?php echo T_('Generate New Key'); ?></button></a>
</td>
</tr>
</table>
diff --git a/src/SemanticScuttle/Service/Bookmark.php b/src/SemanticScuttle/Service/Bookmark.php
index 57d0b2e..9a075be 100644
--- a/src/SemanticScuttle/Service/Bookmark.php
+++ b/src/SemanticScuttle/Service/Bookmark.php
@@ -728,14 +728,15 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService
$privacy = ' AND B.bStatus = 0';
}
+ $tagcount = 0;
// Set up the tags, if need be.
- if (!is_array($tags) && !is_null($tags)) {
+ if (!is_array($tags) && !is_null($tags) && $tags<>"") {
$tags = explode('+', trim($tags));
- }
- $tagcount = count($tags);
- for ($i = 0; $i < $tagcount; $i ++) {
- $tags[$i] = trim($tags[$i]);
+ $tagcount = count($tags);
+ for ($i = 0; $i < $tagcount; $i ++) {
+ $tags[$i] = trim($tags[$i]);
+ }
}
// Set up the SQL query.
diff --git a/www/profile.php b/www/profile.php
index e6894d0..63f4da8 100644
--- a/www/profile.php
+++ b/www/profile.php
@@ -23,6 +23,7 @@ require_once 'www-header.php';
/* Service creation: only useful services are created */
// No specific services
+$tplVars['loadjs'] = true;
/* Managing all possible inputs */
isset($_POST['submittedPK']) ? define('POST_SUBMITTEDPK', $_POST['submittedPK']): define('POST_SUBMITTEDPK', '');