Merge branch 'master' of git://github.com/friendika/friendika

This commit is contained in:
root 2010-12-24 11:19:31 +01:00
commit 6f8c4169e5
8 changed files with 236 additions and 23 deletions

View File

@ -0,0 +1,14 @@
#randplace-enable-label {
float: left;
width: 200px;
margin-bottom: 25px;
}
#randplace-checkbox {
float: left;
}

View File

@ -0,0 +1,179 @@
<?php
/**
* Sample Friendika plugin/addon
*
* Addon Name: randplace
*
*/
/**
*
* Addons are registered with the system in the
* .htconfig.php file.
*
* $a->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'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/randplace/randplace.css' . '" media="all" />' . "\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 .= '<h3>' . t('Randplace Settings') . '</h3>';
$s .= '<div id="randplace-enable-wrapper">';
$s .= '<label id="randplace-enable-label" for="randplace-checkbox">' . t('Enable Randplace Plugin') . '</label>';
$s .= '<input id="randplace-checkbox" type="checkbox" name="randplace" value="1" ' . $checked . '/>';
$s .= '</div><div class="clear"></div>';
/* provide another submit button */
$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="submit" class="settings-submit" value="' . t('Submit') . '" /></div>';
}

View File

@ -1199,11 +1199,12 @@ function set_pconfig($uid,$family,$key,$value) {
return $ret; return $ret;
} }
$ret = q("UPDATE `pconfig` SET `v` = '%s' WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1", $ret = q("UPDATE `pconfig` SET `v` = '%s' WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1",
intval($uid),
dbesc($value), dbesc($value),
intval($uid),
dbesc($family), dbesc($family),
dbesc($key) dbesc($key)
); );
if($ret) if($ret)
return $value; return $value;
return $ret; return $ret;
@ -2046,6 +2047,14 @@ function profile_sidebar($profile) {
if(! function_exists('register_hook')) { if(! function_exists('register_hook')) {
function register_hook($hook,$file,$function) { 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' ) ", $r = q("INSERT INTO `hook` (`hook`, `file`, `function`) VALUES ( '%s', '%s', '%s' ) ",
dbesc($hook), dbesc($hook),
dbesc($file), dbesc($file),
@ -2079,7 +2088,7 @@ function load_hooks() {
if(! function_exists('call_hooks')) { if(! function_exists('call_hooks')) {
function call_hooks($name, $data = null) { function call_hooks($name, &$data = null) {
$a = get_app(); $a = get_app();
if(count($a->hooks)) { if(count($a->hooks)) {

View File

@ -111,7 +111,9 @@ function settings_post(&$a) {
$openidserver = $a->user['openidserver']; $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'); logger('updating openidserver');
require_once('library/openid.php'); require_once('library/openid.php');
$open_id_obj = new LightOpenID; $open_id_obj = new LightOpenID;

View File

@ -20,3 +20,7 @@
$files = glob('include/*.php'); $files = glob('include/*.php');
foreach($files as $file) foreach($files as $file)
include_once($file); include_once($file);
$files = glob('addon/*.php');
foreach($files as $file)
include_once($file);

View File

@ -49,8 +49,8 @@ $theme
</div> </div>
<div id="settings-theme-end"></div> <div id="settings-theme-end"></div>
<div id="settings-submit-wrapper" > <div class="settings-submit-wrapper" >
<input type="submit" name="submit" id="settings-submit" value="Submit" /> <input type="submit" name="submit" class="settings-submit" value="Submit" />
</div> </div>
@ -87,8 +87,8 @@ $profile_in_net_dir
</div> </div>
<div id="settings-default-perms-end"></div> <div id="settings-default-perms-end"></div>
<div id="settings-submit-wrapper" > <div class="settings-submit-wrapper" >
<input type="submit" name="submit" id="settings-submit" value="Submit" /> <input type="submit" name="submit" class="settings-submit" value="Submit" />
</div> </div>
@ -116,8 +116,8 @@ $profile_in_net_dir
</div> </div>
<div id="settings=notify-end"></div> <div id="settings=notify-end"></div>
<div id="settings-submit-wrapper" > <div class="settings-submit-wrapper" >
<input type="submit" name="submit" id="settings-submit" value="Submit" /> <input type="submit" name="submit" class="settings-submit" value="Submit" />
</div> </div>
@ -145,8 +145,8 @@ Leave password fields blank unless changing
<div id="settings-openid-end" ></div> <div id="settings-openid-end" ></div>
<div id="settings-submit-wrapper" > <div class="settings-submit-wrapper" >
<input type="submit" name="submit" id="settings-submit" value="Submit" /> <input type="submit" name="submit" class="settings-submit" value="Submit" />
</div> </div>
@ -154,8 +154,8 @@ Leave password fields blank unless changing
$pagetype $pagetype
<div id="settings-submit-wrapper" > <div class="settings-submit-wrapper" >
<input type="submit" name="submit" id="settings-submit" value="Submit" /> <input type="submit" name="submit" class="settings-submit" value="Submit" />
</div> </div>

View File

@ -49,8 +49,8 @@ $theme
</div> </div>
<div id="settings-theme-end"></div> <div id="settings-theme-end"></div>
<div id="settings-submit-wrapper" > <div class="settings-submit-wrapper" >
<input type="submit" name="submit" id="settings-submit" value="Aggiorna" /> <input type="submit" name="submit" class="settings-submit" value="Aggiorna" />
</div> </div>
@ -87,8 +87,8 @@ $profile_in_net_dir
</div> </div>
<div id="settings-default-perms-end"></div> <div id="settings-default-perms-end"></div>
<div id="settings-submit-wrapper" > <div class="settings-submit-wrapper" >
<input type="submit" name="submit" id="settings-submit" value="Aggiorna" /> <input type="submit" name="submit" class="settings-submit" value="Aggiorna" />
</div> </div>
@ -116,8 +116,8 @@ $profile_in_net_dir
</div> </div>
<div id="settings=notify-end"></div> <div id="settings=notify-end"></div>
<div id="settings-submit-wrapper" > <div class="settings-submit-wrapper" >
<input type="submit" name="submit" id="settings-submit" value="Aggiorna" /> <input type="submit" name="submit" class="settings-submit" value="Aggiorna" />
</div> </div>
@ -145,8 +145,8 @@ Lascia questi campi in bianco per non effettuare variazioni alla password
<div id="settings-openid-end" ></div> <div id="settings-openid-end" ></div>
<div id="settings-submit-wrapper" > <div class="settings-submit-wrapper" >
<input type="submit" name="submit" id="settings-submit" value="Aggiorna" /> <input type="submit" name="submit" class="settings-submit" value="Aggiorna" />
</div> </div>
@ -154,8 +154,8 @@ Lascia questi campi in bianco per non effettuare variazioni alla password
$pagetype $pagetype
<div id="settings-submit-wrapper" > <div class="settings-submit-wrapper" >
<input type="submit" name="submit" id="settings-submit" value="Aggiorna" /> <input type="submit" name="submit" class="settings-submit" value="Aggiorna" />
</div> </div>

View File

@ -1942,3 +1942,8 @@ a.mail-list-link {
.profile-clear { .profile-clear {
clear: both; clear: both;
} }
.clear {
clear: both;
}