diff --git a/privacy_image_cache.tgz b/privacy_image_cache.tgz
new file mode 100644
index 00000000..38a25ff7
Binary files /dev/null and b/privacy_image_cache.tgz differ
diff --git a/privacy_image_cache/privacy_image_cache.php b/privacy_image_cache/privacy_image_cache.php
index c7943954..4e836219 100644
--- a/privacy_image_cache/privacy_image_cache.php
+++ b/privacy_image_cache/privacy_image_cache.php
@@ -62,7 +62,9 @@ function privacy_image_cache_init() {
*/
function privacy_image_cache_is_local_image($url) {
if ($url[0] == '/') return true;
- $baseurl = get_app()->get_baseurl();
+ // links normalised - bug #431
+ $baseurl = normalise_link(get_app()->get_baseurl());
+ $url = normalise_link($url);
return (substr($url, 0, strlen($baseurl)) == $baseurl);
}
@@ -71,7 +73,8 @@ function privacy_image_cache_is_local_image($url) {
* @return string
*/
function privacy_image_cache_img_cb($matches) {
- if (privacy_image_cache_is_local_image($matches[2])) return $matches[2];
+ // following line changed per bug #431
+ if (privacy_image_cache_is_local_image($matches[2])) return $matches[1] . $matches[2] . $matches[3];
return $matches[1] . "/privacy_image_cache/?url=" . escape_tags(addslashes($matches[2])) . $matches[3];
}
diff --git a/public_server.tgz b/public_server.tgz
index c9a67fe3..d970d486 100755
Binary files a/public_server.tgz and b/public_server.tgz differ
diff --git a/public_server/public_server.php b/public_server/public_server.php
index 9d469829..3711854f 100644
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -106,7 +106,7 @@ function public_server_cron($a,$b) {
$flagposts = get_config('public_server','flagposts');
$flagpostsexpire = get_config('public_server','flagpostsexpire');
if ($flagposts && $flagpostsexpire) {
- $r = q("select uid from user where account_expired = 0 and login_date < UTC_TIMESTAMP() - INTERVAL %d DAY and account_expires_on = '0000-00-00 00:00:00' and expire = 0 and 'page-flags' = 0",intval(flagposts));
+ $r = q("select uid from user where account_expired = 0 and login_date < UTC_TIMESTAMP() - INTERVAL %d DAY and account_expires_on = '0000-00-00 00:00:00' and expire = 0 and `page-flags` = 0",intval($flagposts));
if(count($r)) {
foreach($r as $rr)
q("update user set expire = %d where uid = %d limit 1",
diff --git a/smiley_pack.tgz b/smiley_pack.tgz
index 790bc064..2b1296d5 100644
Binary files a/smiley_pack.tgz and b/smiley_pack.tgz differ
diff --git a/smiley_pack/icons/fight/alpha.png b/smiley_pack/icons/fight/alpha.png
new file mode 100644
index 00000000..09e3f233
Binary files /dev/null and b/smiley_pack/icons/fight/alpha.png differ
diff --git a/smiley_pack/icons/sad/sigh.gif b/smiley_pack/icons/sad/sigh.gif
new file mode 100644
index 00000000..68602266
Binary files /dev/null and b/smiley_pack/icons/sad/sigh.gif differ
diff --git a/smiley_pack/smiley_pack.php b/smiley_pack/smiley_pack.php
index ed4d0e65..69257a4e 100644
--- a/smiley_pack/smiley_pack.php
+++ b/smiley_pack/smiley_pack.php
@@ -2,7 +2,7 @@
/*
* Name: Smiley Pack
* Description: Pack of smileys that make master too AOLish.
- * Version: 1.0
+ * Version: 1.02
* Author: Thomas Willingham (based on Mike Macgirvin's Adult Smile template)
* All smileys from sites offering them as Public Domain
*
@@ -204,6 +204,9 @@ function smiley_pack_smilies(&$a,&$b) {
$b['texts'][] = ':prisoner';
$b['icons'][] = '';
+ $b['texts'][] = ':sigh';
+ $b['icons'][] = '
';
+
#Smoking - only one smiley in here, maybe it needs moving elsewhere?
$b['texts'][] = ':smoking';
@@ -295,6 +298,9 @@ function smiley_pack_smilies(&$a,&$b) {
$b['texts'][] = ':alienfight';
$b['icons'][] = '
';
+ $b['texts'][] = ':alpha';
+ $b['icons'][] = '
';
+
$b['texts'][] = ':army';
$b['icons'][] = '
';
@@ -472,7 +478,7 @@ function smiley_pack_smilies(&$a,&$b) {
$b['icons'][] = '
';
$b['texts'][] = ':headdesk';
- $b['icons'][] = '
';
+ $b['icons'][] = '
';
#These two are still in core, so oldcore isn't strictly right, but we don't want too many directories
diff --git a/startpage.tgz b/startpage.tgz
new file mode 100644
index 00000000..67a4ebd0
Binary files /dev/null and b/startpage.tgz differ
diff --git a/startpage/startpage.css b/startpage/startpage.css
new file mode 100644
index 00000000..e78be7ec
--- /dev/null
+++ b/startpage/startpage.css
@@ -0,0 +1,16 @@
+
+
+
+#startpage-page-label {
+ float: left;
+ width: 200px;
+ margin-bottom: 25px;
+}
+
+#startpage-page {
+ float: left;
+}
+
+#startpage-desc {
+ margin-bottom: 10px;
+}
diff --git a/startpage/startpage.php b/startpage/startpage.php
new file mode 100644
index 00000000..85988298
--- /dev/null
+++ b/startpage/startpage.php
@@ -0,0 +1,94 @@
+
+ *
+ */
+
+
+function startpage_install() {
+ register_hook('home_init', 'addon/startpage/startpage.php', 'startpage_home_init');
+ register_hook('plugin_settings', 'addon/startpage/startpage.php', 'startpage_settings');
+ register_hook('plugin_settings_post', 'addon/startpage/startpage.php', 'startpage_settings_post');
+}
+
+
+function startpage_uninstall() {
+ unregister_hook('home_init', 'addon/startpage/startpage.php', 'startpage_home_init');
+ unregister_hook('plugin_settings', 'addon/startpage/startpage.php', 'startpage_settings');
+ unregister_hook('plugin_settings_post', 'addon/startpage/startpage.php', 'startpage_settings_post');
+}
+
+
+
+function startpage_home_init($a, $b) {
+ if(! local_user())
+ return;
+
+ $page = get_pconfig(local_user(),'startpage','startpage');
+ if(strlen($page)) {
+ $slash = ((strpos($page,'/') === 0) ? true : false);
+ if(stristr($page,'://'))
+ goaway($page);
+ goaway($a->get_baseurl() . (($slash) ? '' : '/') . $page);
+ }
+ return;
+}
+
+/**
+ *
+ * Callback from the settings post function.
+ * $post contains the $_POST array.
+ * We will make sure we've got a valid user account
+ * and if so set our configuration setting for this person.
+ *
+ */
+
+function startpage_settings_post($a,$post) {
+ if(! local_user())
+ return;
+ if($_POST['startpage-submit'])
+ set_pconfig(local_user(),'startpage','startpage',strip_tags(trim($_POST['startpage'])));
+}
+
+
+/**
+ *
+ * Called from the Plugin Setting form.
+ * Add our own settings info to the page.
+ *
+ */
+
+
+
+function startpage_settings(&$a,&$s) {
+
+ if(! local_user())
+ return;
+
+ /* Add our stylesheet to the page so we can make our settings look nice */
+
+ $a->page['htmlhead'] .= '' . "\r\n";
+
+ /* Get the current state of our config variable */
+
+ $page = get_pconfig(local_user(),'startpage','startpage');
+
+
+ /* Add some HTML to the existing form */
+
+ $s .= '