diff --git a/addon/randplace/randplace.css b/addon/randplace/randplace.css
new file mode 100644
index 0000000000..bd7af6d749
--- /dev/null
+++ b/addon/randplace/randplace.css
@@ -0,0 +1,14 @@
+
+
+
+#randplace-enable-label {
+ float: left;
+ width: 200px;
+ margin-bottom: 25px;
+}
+
+#randplace-checkbox {
+ float: left;
+}
+
+
diff --git a/addon/randplace/randplace.php b/addon/randplace/randplace.php
new file mode 100644
index 0000000000..e14ae74c7c
--- /dev/null
+++ b/addon/randplace/randplace.php
@@ -0,0 +1,179 @@
+config['system']['addon'] = 'plugin1,plugin2,etc.';
+ *
+ * When registration is detected, the system calls the plugin
+ * name_install() function, located in 'addon/name/name.php',
+ * where 'name' is the name of the addon.
+ * If the addon is removed from the configuration list, the
+ * system will call the name_uninstall() function.
+ *
+ */
+
+
+function randplace_install() {
+
+ /**
+ *
+ * Our demo plugin will attach in three places.
+ * The first is just prior to storing a local post.
+ *
+ */
+
+ register_hook('post_local', 'addon/randplace/randplace.php', 'randplace_post_hook');
+
+ /**
+ *
+ * Then we'll attach into the settings page, on both the
+ * form and post hooks so that we can create and update
+ * user preferences.
+ *
+ */
+
+ register_hook('settings_form', 'addon/randplace/randplace.php', 'randplace_settings');
+ register_hook('settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post');
+
+ logger("installed randplace");
+}
+
+
+function randplace_uninstall() {
+
+ /**
+ *
+ * uninstall unregisters any hooks created with register_hook
+ * during install. It may also delete configuration settings
+ * and any other cleanup.
+ *
+ */
+
+ unregister_hook('post_local', 'addon/randplace/randplace.php', 'randplace_post_hook');
+ unregister_hook('settings_form', 'addon/randplace/randplace.php', 'randplace_settings');
+ unregister_hook('settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post');
+
+
+ logger("removed randplace");
+}
+
+
+
+function randplace_post_hook($a, &$item) {
+
+ /**
+ *
+ * An item was posted on the local system.
+ * We are going to look for specific items:
+ * - A status post by a profile owner
+ * - The profile owner must have allowed our plugin
+ *
+ */
+
+ logger('randplace invoked');
+
+ if(! local_user()) /* non-zero if this is a logged in user of this system */
+ return;
+
+ if(local_user() != $item['uid']) /* Does this person own the post? */
+ return;
+
+ if($item['parent']) /* If the item has a parent, this is a comment or something else, not a status post. */
+ return;
+
+ /* Retrieve our personal config setting */
+
+ $active = get_pconfig(local_user(), 'randplace', 'enable');
+
+ if(! $active)
+ return;
+
+ /**
+ *
+ * OK, we're allowed to do our stuff.
+ * Here's what we are going to do:
+ * load the list of timezone names, and use that to generate a list of world cities.
+ * Then we'll pick one of those at random and put it in the "location" field for the post.
+ *
+ */
+
+ $cities = array();
+ $zones = timezone_identifiers_list();
+ foreach($zones as $zone) {
+ if(strpos($zone,'/'))
+ $cities[] = str_replace('_', ' ',substr($zone,strpos($zone,'/') + 1));
+ }
+
+ if(! count($cities))
+ return;
+ $city = array_rand($cities,1);
+ $item['location'] = $cities[$city];
+
+ 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 randplace_settings_post($a,$post) {
+ if(! local_user())
+ return;
+ set_pconfig(local_user(),'randplace','enable',intval($_POST['randplace']));
+}
+
+
+/**
+ * Called from the end of the settings form.
+ * Add our own settings info to the page.
+ *
+ */
+
+
+
+function randplace_settings(&$a,&$s) {
+
+ if(! local_user())
+ return;
+
+ /* Add our stylesheet so we can match the page layout */
+
+ $a->page['htmlhead'] .= '' . "\r\n";
+
+ /* Get the current state of our config variable */
+
+ $enabled = get_pconfig(local_user(),'randplace','enable');
+
+ $checked = (($enabled) ? ' checked="checked" ' : '');
+
+ /* Add some HTML to the form */
+
+ $s .= '
' . t('Randplace Settings') . '
';
+ $s .= '
';
+ $s .= '';
+ $s .= '';
+ $s .= '
';
+
+ /* provide another submit button */
+
+ $s .= '';
+
+}
\ No newline at end of file
diff --git a/boot.php b/boot.php
index 57d69a5e1f..c340028093 100644
--- a/boot.php
+++ b/boot.php
@@ -1199,11 +1199,12 @@ function set_pconfig($uid,$family,$key,$value) {
return $ret;
}
$ret = q("UPDATE `pconfig` SET `v` = '%s' WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1",
- intval($uid),
dbesc($value),
+ intval($uid),
dbesc($family),
dbesc($key)
);
+
if($ret)
return $value;
return $ret;
@@ -2046,6 +2047,14 @@ function profile_sidebar($profile) {
if(! function_exists('register_hook')) {
function register_hook($hook,$file,$function) {
+ $r = q("SELECT FROM `hook` WHERE `hook` = '%s' AND `file` = '%s' AND `function` = '%s' LIMIT 1",
+ dbesc($hook),
+ dbesc($file),
+ dbesc($function)
+ );
+ if(count($r))
+ return true;
+
$r = q("INSERT INTO `hook` (`hook`, `file`, `function`) VALUES ( '%s', '%s', '%s' ) ",
dbesc($hook),
dbesc($file),
@@ -2079,7 +2088,7 @@ function load_hooks() {
if(! function_exists('call_hooks')) {
-function call_hooks($name, $data = null) {
+function call_hooks($name, &$data = null) {
$a = get_app();
if(count($a->hooks)) {
diff --git a/mod/settings.php b/mod/settings.php
index 6eaa17ad0c..b10f9e3fc0 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -111,7 +111,9 @@ function settings_post(&$a) {
$openidserver = $a->user['openidserver'];
- if($openid != $a->user['openid']) {
+ // If openid has changed or if there's an openid but no openidserver, try and discover it.
+
+ if($openid != $a->user['openid'] || (strlen($openid) && (! strlen($openidserver)))) {
logger('updating openidserver');
require_once('library/openid.php');
$open_id_obj = new LightOpenID;
diff --git a/util/typo.php b/util/typo.php
index 67fa7dc90d..be5307ab31 100644
--- a/util/typo.php
+++ b/util/typo.php
@@ -20,3 +20,7 @@
$files = glob('include/*.php');
foreach($files as $file)
include_once($file);
+
+ $files = glob('addon/*.php');
+ foreach($files as $file)
+ include_once($file);
diff --git a/view/en/settings.tpl b/view/en/settings.tpl
index b29398a625..594ce73fc4 100644
--- a/view/en/settings.tpl
+++ b/view/en/settings.tpl
@@ -49,8 +49,8 @@ $theme
-