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

This commit is contained in:
root 2010-12-25 09:24:24 +01:00
commit c5cf9de32a
13 changed files with 119 additions and 27 deletions

View File

@ -36,13 +36,13 @@ function randplace_install() {
/** /**
* *
* Then we'll attach into the settings page, on both the * Then we'll attach into the plugin settings page, and also the
* form and post hooks so that we can create and update * settings post hook so that we can create and update
* user preferences. * user preferences.
* *
*/ */
register_hook('settings_form', 'addon/randplace/randplace.php', 'randplace_settings'); register_hook('plugin_settings', 'addon/randplace/randplace.php', 'randplace_settings');
register_hook('settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post'); register_hook('settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post');
logger("installed randplace"); logger("installed randplace");
@ -60,7 +60,7 @@ function randplace_uninstall() {
*/ */
unregister_hook('post_local', 'addon/randplace/randplace.php', 'randplace_post_hook'); unregister_hook('post_local', 'addon/randplace/randplace.php', 'randplace_post_hook');
unregister_hook('settings_form', 'addon/randplace/randplace.php', 'randplace_settings'); unregister_hook('plugin_settings', 'addon/randplace/randplace.php', 'randplace_settings');
unregister_hook('settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post'); unregister_hook('settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post');
@ -142,7 +142,8 @@ function randplace_settings_post($a,$post) {
/** /**
* Called from the end of the settings form. *
* Called from the Plugin Setting form.
* Add our own settings info to the page. * Add our own settings info to the page.
* *
*/ */
@ -154,7 +155,7 @@ function randplace_settings(&$a,&$s) {
if(! local_user()) if(! local_user())
return; return;
/* Add our stylesheet so we can match the page layout */ /* Add our stylesheet to the page so we can make our settings look nice */
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/randplace/randplace.css' . '" media="all" />' . "\r\n"; $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/randplace/randplace.css' . '" media="all" />' . "\r\n";
@ -164,7 +165,7 @@ function randplace_settings(&$a,&$s) {
$checked = (($enabled) ? ' checked="checked" ' : ''); $checked = (($enabled) ? ' checked="checked" ' : '');
/* Add some HTML to the form */ /* Add some HTML to the existing form */
$s .= '<h3>' . t('Randplace Settings') . '</h3>'; $s .= '<h3>' . t('Randplace Settings') . '</h3>';
$s .= '<div id="randplace-enable-wrapper">'; $s .= '<div id="randplace-enable-wrapper">';
@ -172,7 +173,7 @@ function randplace_settings(&$a,&$s) {
$s .= '<input id="randplace-checkbox" type="checkbox" name="randplace" value="1" ' . $checked . '/>'; $s .= '<input id="randplace-checkbox" type="checkbox" name="randplace" value="1" ' . $checked . '/>';
$s .= '</div><div class="clear"></div>'; $s .= '</div><div class="clear"></div>';
/* provide another submit button */ /* provide a submit button */
$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="submit" class="settings-submit" value="' . t('Submit') . '" /></div>'; $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="submit" class="settings-submit" value="' . t('Submit') . '" /></div>';

View File

@ -2047,7 +2047,7 @@ 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", $r = q("SELECT * FROM `hook` WHERE `hook` = '%s' AND `file` = '%s' AND `function` = '%s' LIMIT 1",
dbesc($hook), dbesc($hook),
dbesc($file), dbesc($file),
dbesc($function) dbesc($function)

View File

@ -132,17 +132,38 @@ else {
} }
if((x($_POST,'auth-params')) && $_POST['auth-params'] === 'login') { if((x($_POST,'auth-params')) && $_POST['auth-params'] === 'login') {
// process login request
$r = q("SELECT * FROM `user` $addon_auth = array(
WHERE ( `email` = '%s' OR `nickname` = '%s' ) AND `password` = '%s' AND `blocked` = 0 AND `verified` = 1 LIMIT 1", 'name' => trim($_POST['openid_url']),
dbesc(trim($_POST['openid_url'])), 'password' => trim($_POST['password']),
dbesc(trim($_POST['openid_url'])), 'authenticated' => 0
dbesc($encrypted)); );
if(($r === false) || (! count($r))) {
notice( t('Login failed.') . EOL ); /**
goaway($a->get_baseurl()); *
} * A plugin indicates successful login by setting 'authenticated' to non-zero value
* Plugins should never set 'authenticated' except to indicate success - as hooks may be chained
* and later plugins should not interfere with an earlier one that succeeded.
*
*/
call_hooks('authenticate', $addon_auth);
if(! $addon_auth['authenticated']) {
// process login request
$r = q("SELECT * FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' )
AND `password` = '%s' AND `blocked` = 0 AND `verified` = 1 LIMIT 1",
dbesc(trim($_POST['openid_url'])),
dbesc(trim($_POST['openid_url'])),
dbesc($encrypted)
);
if(($r === false) || (! count($r))) {
notice( t('Login failed.') . EOL );
goaway($a->get_baseurl());
}
}
$_SESSION['uid'] = $r[0]['uid']; $_SESSION['uid'] = $r[0]['uid'];
$_SESSION['theme'] = $r[0]['theme']; $_SESSION['theme'] = $r[0]['theme'];
$_SESSION['authenticated'] = 1; $_SESSION['authenticated'] = 1;
@ -167,6 +188,8 @@ else {
intval($_SESSION['uid']) intval($_SESSION['uid'])
); );
call_hooks('logged_in', $a->user);
header('X-Account-Management-Status: active; name="' . $a->user['username'] . '"; id="' . $a->user['nickname'] .'"'); header('X-Account-Management-Status: active; name="' . $a->user['username'] . '"; id="' . $a->user['nickname'] .'"');
if(($a->module !== 'home') && isset($_SESSION['return_url'])) if(($a->module !== 'home') && isset($_SESSION['return_url']))
goaway($a->get_baseurl() . '/' . $_SESSION['return_url']); goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);

View File

@ -158,7 +158,12 @@ function get_feed_for(&$a, $dfrn_id, $owner_id, $last_update, $direction = 0) {
)); ));
call_hooks('atom_feed', $atom);
if(! count($items)) { if(! count($items)) {
call_hooks('atom_feed_end', $atom);
$atom .= '</feed>' . "\r\n"; $atom .= '</feed>' . "\r\n";
return $atom; return $atom;
} }
@ -177,7 +182,10 @@ function get_feed_for(&$a, $dfrn_id, $owner_id, $last_update, $direction = 0) {
$atom .= atom_entry($item,$type,null,$owner,true); $atom .= atom_entry($item,$type,null,$owner,true);
} }
call_hooks('atom_feed_end', $atom);
$atom .= '</feed>' . "\r\n"; $atom .= '</feed>' . "\r\n";
return $atom; return $atom;
} }
@ -491,6 +499,8 @@ function get_atom_elements($feed,$item) {
$res['target'] .= '</target>' . "\n"; $res['target'] .= '</target>' . "\n";
} }
// call_hooks('parse_atom', array('feed' => $feed, 'item' => $item, 'result' => $res));
return $res; return $res;
} }
@ -1231,6 +1241,9 @@ function atom_author($tag,$name,$uri,$h,$w,$photo) {
$o .= "<uri>$uri</uri>\r\n"; $o .= "<uri>$uri</uri>\r\n";
$o .= '<link rel="photo" type="image/jpeg" media:width="' . $w . '" media:height="' . $h . '" href="' . $photo . '" />' . "\r\n"; $o .= '<link rel="photo" type="image/jpeg" media:width="' . $w . '" media:height="' . $h . '" href="' . $photo . '" />' . "\r\n";
$o .= '<link rel="avatar" type="image/jpeg" media:width="' . $w . '" media:height="' . $h . '" href="' . $photo . '" />' . "\r\n"; $o .= '<link rel="avatar" type="image/jpeg" media:width="' . $w . '" media:height="' . $h . '" href="' . $photo . '" />' . "\r\n";
call_hooks('atom_author', $o);
$o .= "</$tag>\r\n"; $o .= "</$tag>\r\n";
return $o; return $o;
} }
@ -1287,6 +1300,8 @@ function atom_entry($item,$type,$author,$owner,$comment = false) {
if($mentioned) if($mentioned)
$o .= $mentioned; $o .= $mentioned;
call_hooks('atom_entry', $o);
$o .= '</entry>' . "\r\n"; $o .= '</entry>' . "\r\n";
return $o; return $o;

View File

@ -1,11 +1,14 @@
<?php <?php
require_once('include/items.php'); require_once('include/items.php');
require_once('include/auth.php'); require_once('include/auth.php');
function dfrn_poll_init(&$a) { function dfrn_poll_init(&$a) {
$dfrn_id = ((x($_GET,'dfrn_id')) ? $_GET['dfrn_id'] : ''); $dfrn_id = ((x($_GET,'dfrn_id')) ? $_GET['dfrn_id'] : '');
$type = ((x($_GET,'type')) ? $_GET['type'] : 'data'); $type = ((x($_GET,'type')) ? $_GET['type'] : 'data');
$last_update = ((x($_GET,'last_update')) ? $_GET['last_update'] : ''); $last_update = ((x($_GET,'last_update')) ? $_GET['last_update'] : '');

View File

@ -357,6 +357,9 @@ function register_content(&$a) {
$oidlabel = t("Your OpenID \x28optional\x29: "); $oidlabel = t("Your OpenID \x28optional\x29: ");
} }
$license = t('Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.');
$o = load_view_file("view/register.tpl"); $o = load_view_file("view/register.tpl");
$o = replace_macros($o, array( $o = replace_macros($o, array(
'$oidhtml' => $oidhtml, '$oidhtml' => $oidhtml,
@ -377,6 +380,7 @@ function register_content(&$a) {
'$username' => $username, '$username' => $username,
'$email' => $email, '$email' => $email,
'$nickname' => $nickname, '$nickname' => $nickname,
'$license' => $license,
'$sitename' => $a->get_hostname() '$sitename' => $a->get_hostname()
)); ));
return $o; return $o;

View File

@ -17,6 +17,9 @@ function settings_post(&$a) {
call_hooks('settings_post', $_POST); call_hooks('settings_post', $_POST);
if(($a->argc > 1) && ($a->argv[1] == 'addon'))
return;
if(count($a->user) && x($a->user,'uid') && $a->user['uid'] != local_user()) { if(count($a->user) && x($a->user,'uid') && $a->user['uid'] != local_user()) {
notice( t('Permission denied.') . EOL); notice( t('Permission denied.') . EOL);
return; return;
@ -182,6 +185,21 @@ function settings_content(&$a) {
return; return;
} }
if(($a->argc > 1) && ($a->argv[1] === 'addon')) {
$o .= '<h1>' . t('Plugin Settings') . '</h1>';
$o .= '<div id="account-settings-link"><a href="settings">' . t('Account Settings') . '</a></div>';
$o .= '<form action="settings/addon" method="post" >';
$r = q("SELECT * FROM `hook` WHERE `hook` = 'plugin_settings' ");
if(! count($r))
notice('No Plugin settings configured');
call_hooks('plugin_settings', $o);
$o .= '</form>';
return $o;
}
require_once('include/acl_selectors.php'); require_once('include/acl_selectors.php');
$p = q("SELECT * FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1", $p = q("SELECT * FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",

View File

@ -4,7 +4,6 @@ $a->strings['Page not found.' ] = 'Page not found.' ;
$a->strings['Permission denied'] = 'Permission denied'; $a->strings['Permission denied'] = 'Permission denied';
$a->strings['Permission denied.'] = 'Permission denied.'; $a->strings['Permission denied.'] = 'Permission denied.';
$a->strings['Nickname or Email address: '] = 'Nickname or Email address: '; $a->strings['Nickname or Email address: '] = 'Nickname or Email address: ';
$a->strings['Welcome to '] = 'Welcome to ';
$a->strings['Password: '] = 'Password: '; $a->strings['Password: '] = 'Password: ';
$a->strings['Login'] = 'Login'; $a->strings['Login'] = 'Login';
$a->strings['Nickname/Email/OpenID: '] = 'Nickname/Email/OpenID: '; $a->strings['Nickname/Email/OpenID: '] = 'Nickname/Email/OpenID: ';
@ -84,6 +83,7 @@ $a->strings['Remote site reported: '] = 'Remote site reported: ';
$a->strings["Temporary failure. Please wait and try again."] = "Temporary failure. Please wait and try again."; $a->strings["Temporary failure. Please wait and try again."] = "Temporary failure. Please wait and try again.";
$a->strings["Introduction failed or was revoked."] = "Introduction failed or was revoked."; $a->strings["Introduction failed or was revoked."] = "Introduction failed or was revoked.";
$a->strings['Unable to set contact photo.'] = 'Unable to set contact photo.'; $a->strings['Unable to set contact photo.'] = 'Unable to set contact photo.';
$a->strings['is now friends with'] = 'is now friends with';
$a->strings['No user record found for '] = 'No user record found for '; $a->strings['No user record found for '] = 'No user record found for ';
$a->strings['Our site encryption key is apparently messed up.'] = 'Our site encryption key is apparently messed up.'; $a->strings['Our site encryption key is apparently messed up.'] = 'Our site encryption key is apparently messed up.';
$a->strings['Empty site URL was provided or URL could not be decrypted by us.'] = 'Empty site URL was provided or URL could not be decrypted by us.'; $a->strings['Empty site URL was provided or URL could not be decrypted by us.'] = 'Empty site URL was provided or URL could not be decrypted by us.';
@ -108,6 +108,9 @@ $a->strings["not found at the given location."] = "not found at the given locati
$a->strings["Introduction complete."] = "Introduction complete."; $a->strings["Introduction complete."] = "Introduction complete.";
$a->strings['Unrecoverable protocol error.'] = 'Unrecoverable protocol error.'; $a->strings['Unrecoverable protocol error.'] = 'Unrecoverable protocol error.';
$a->strings['Profile unavailable.'] = 'Profile unavailable.'; $a->strings['Profile unavailable.'] = 'Profile unavailable.';
$a->strings[' has received too many connection requests today.'] = ' has received too many connection requests today.';
$a->strings['Spam protection measures have been invoked.'] = 'Spam protection measures have been invoked.';
$a->strings['Friends are advised to please try again in 24 hours.'] = 'Friends are advised to please try again in 24 hours.';
$a->strings["Invalid locator"] = "Invalid locator"; $a->strings["Invalid locator"] = "Invalid locator";
$a->strings["Unable to resolve your name at the provided location."] = "Unable to resolve your name at the provided location."; $a->strings["Unable to resolve your name at the provided location."] = "Unable to resolve your name at the provided location.";
$a->strings['You have already introduced yourself here.'] = 'You have already introduced yourself here.'; $a->strings['You have already introduced yourself here.'] = 'You have already introduced yourself here.';
@ -149,11 +152,12 @@ $a->strings['Membership list updated.'] = 'Membership list updated.';
$a->strings['Group removed.'] = 'Group removed.'; $a->strings['Group removed.'] = 'Group removed.';
$a->strings['Unable to remove group.'] = 'Unable to remove group.'; $a->strings['Unable to remove group.'] = 'Unable to remove group.';
$a->strings['Delete'] = 'Delete'; $a->strings['Delete'] = 'Delete';
$a->strings["Welcome to "] = "Welcome to ";
$a->strings['Could not create/connect to database.'] = 'Could not create/connect to database.'; $a->strings['Could not create/connect to database.'] = 'Could not create/connect to database.';
$a->strings['Connected to database.'] = 'Connected to database.'; $a->strings['Connected to database.'] = 'Connected to database.';
$a->strings['Database import succeeded.'] = 'Database import succeeded.'; $a->strings['Database import succeeded.'] = 'Database import succeeded.';
$a->strings['IMPORTANT: You will need to [manually] setup a scheduled task for the poller.'] = 'IMPORTANT: You will need to [manually] setup a scheduled task for the poller.'; $a->strings['IMPORTANT: You will need to [manually] setup a scheduled task for the poller.'] = 'IMPORTANT: You will need to [manually] setup a scheduled task for the poller.';
$a->strings['Please see the file INSTALL.'] = 'Please see the file INSTALL.'; $a->strings['Please see the file "INSTALL.txt".'] = 'Please see the file "INSTALL.txt".';
$a->strings['Database import failed.'] = 'Database import failed.'; $a->strings['Database import failed.'] = 'Database import failed.';
$a->strings['You may need to import the file "database.sql" manually using phpmyadmin or mysql.'] = 'You may need to import the file "database.sql" manually using phpmyadmin or mysql.'; $a->strings['You may need to import the file "database.sql" manually using phpmyadmin or mysql.'] = 'You may need to import the file "database.sql" manually using phpmyadmin or mysql.';
$a->strings['Welcome to Friendika.'] = 'Welcome to Friendika.'; $a->strings['Welcome to Friendika.'] = 'Welcome to Friendika.';
@ -163,16 +167,16 @@ $a->strings['This is required. Please adjust the configuration file .htconfig.ph
$a->strings['The command line version of PHP on your system does not have "register_argc_argv" enabled.'] = 'The command line version of PHP on your system does not have "register_argc_argv" enabled.'; $a->strings['The command line version of PHP on your system does not have "register_argc_argv" enabled.'] = 'The command line version of PHP on your system does not have "register_argc_argv" enabled.';
$a->strings['This is required for message delivery to work.'] = 'This is required for message delivery to work.'; $a->strings['This is required for message delivery to work.'] = 'This is required for message delivery to work.';
$a->strings['Error: the "openssl_pkey_new" function on this system is not able to generate encryption keys'] = 'Error: the "openssl_pkey_new" function on this system is not able to generate encryption keys'; $a->strings['Error: the "openssl_pkey_new" function on this system is not able to generate encryption keys'] = 'Error: the "openssl_pkey_new" function on this system is not able to generate encryption keys';
$a->strings['If running under Windows, please see "http://www.php.net/manual/en/openssl.installation.php".'] = 'If running under Windows, please see "http://www.php.net/manual/en/openssl.installation.php".';
$a->strings['Error: Apache webserver mod-rewrite module is required but not installed.'] = 'Error: Apache webserver mod-rewrite module is required but not installed.'; $a->strings['Error: Apache webserver mod-rewrite module is required but not installed.'] = 'Error: Apache webserver mod-rewrite module is required but not installed.';
$a->strings['Error: libCURL PHP module required but not installed.'] = 'Error: libCURL PHP module required but not installed.'; $a->strings['Error: libCURL PHP module required but not installed.'] = 'Error: libCURL PHP module required but not installed.';
$a->strings['Error: GD graphics PHP module with JPEG support required but not installed.'] = 'Error: GD graphics PHP module with JPEG support required but not installed.'; $a->strings['Error: GD graphics PHP module with JPEG support required but not installed.'] = 'Error: GD graphics PHP module with JPEG support required but not installed.';
$a->strings['Error: openssl PHP module required but not installed.'] = 'Error: openssl PHP module required but not installed.'; $a->strings['Error: openssl PHP module required but not installed.'] = 'Error: openssl PHP module required but not installed.';
$a->strings['Error: mysqli PHP module required but not installed.'] = 'Error: mysqli PHP module required but not installed.'; $a->strings['Error: mysqli PHP module required but not installed.'] = 'Error: mysqli PHP module required but not installed.';
$a->strings['Please see the file "INSTALL".'] = 'Please see the file "INSTALL".';
$a->strings['The web installer needs to be able to create a file called ".htconfig.php" in the top folder of your web server and it is unable to do so.'] = 'The web installer needs to be able to create a file called ".htconfig.php" in the top folder of your web server and it is unable to do so.'; $a->strings['The web installer needs to be able to create a file called ".htconfig.php" in the top folder of your web server and it is unable to do so.'] = 'The web installer needs to be able to create a file called ".htconfig.php" in the top folder of your web server and it is unable to do so.';
$a->strings['This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can.'] = 'This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can.'; $a->strings['This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can.'] = 'This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can.';
$a->strings['Please check with your site documentation or support people to see if this situation can be corrected.'] = 'Please check with your site documentation or support people to see if this situation can be corrected.'; $a->strings['Please check with your site documentation or support people to see if this situation can be corrected.'] = 'Please check with your site documentation or support people to see if this situation can be corrected.';
$a->strings['If not, you may be required to perform a manual installation. Please see the file "INSTALL" for instructions.'] = 'If not, you may be required to perform a manual installation. Please see the file "INSTALL" for instructions.'; $a->strings['If not, you may be required to perform a manual installation. Please see the file "INSTALL.txt" for instructions.'] = 'If not, you may be required to perform a manual installation. Please see the file "INSTALL.txt" for instructions.';
$a->strings['The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.'] = 'The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.'; $a->strings['The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.'] = 'The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.';
$a->strings['Errors encountered creating database tables.'] = 'Errors encountered creating database tables.'; $a->strings['Errors encountered creating database tables.'] = 'Errors encountered creating database tables.';
$a->strings[' : '] = ' : '; $a->strings[' : '] = ' : ';
@ -305,6 +309,7 @@ $a->strings['Your registration is pending approval by the site owner.'] = 'Your
$a->strings["You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'."; $a->strings["You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'.";
$a->strings['If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.'] = 'If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.'; $a->strings['If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.'] = 'If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.';
$a->strings["Your OpenID \x28optional\x29: "] = "Your OpenID \x28optional\x29: "; $a->strings["Your OpenID \x28optional\x29: "] = "Your OpenID \x28optional\x29: ";
$a->strings['Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.'] = 'Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.';
$a->strings['Registration'] = 'Registration'; $a->strings['Registration'] = 'Registration';
$a->strings['Your Full Name ' . "\x28" . 'e.g. Joe Smith' . "\x29" . ': '] = 'Your Full Name ' . "\x28" . 'e.g. Joe Smith' . "\x29" . ': '; $a->strings['Your Full Name ' . "\x28" . 'e.g. Joe Smith' . "\x29" . ': '] = 'Your Full Name ' . "\x28" . 'e.g. Joe Smith' . "\x29" . ': ';
$a->strings['Your Email Address: '] = 'Your Email Address: '; $a->strings['Your Email Address: '] = 'Your Email Address: ';
@ -323,6 +328,8 @@ $a->strings[' Please use a shorter name.'] = ' Please use a shorter name.';
$a->strings[' Name too short.'] = ' Name too short.'; $a->strings[' Name too short.'] = ' Name too short.';
$a->strings[' Not valid email.'] = ' Not valid email.'; $a->strings[' Not valid email.'] = ' Not valid email.';
$a->strings['Settings updated.'] = 'Settings updated.'; $a->strings['Settings updated.'] = 'Settings updated.';
$a->strings['Plugin Settings'] = 'Plugin Settings';
$a->strings['Account Settings'] = 'Account Settings';
$a->strings['OpenID: '] = 'OpenID: '; $a->strings['OpenID: '] = 'OpenID: ';
$a->strings["&nbsp;\x28Optional\x29 Allow this OpenID to login to this account."] = "&nbsp;\x28Optional\x29 Allow this OpenID to login to this account."; $a->strings["&nbsp;\x28Optional\x29 Allow this OpenID to login to this account."] = "&nbsp;\x28Optional\x29 Allow this OpenID to login to this account.";
$a->strings['Profile is <strong>not published</strong>.'] = 'Profile is <strong>not published</strong>.'; $a->strings['Profile is <strong>not published</strong>.'] = 'Profile is <strong>not published</strong>.';

View File

@ -1,5 +1,7 @@
<h1>Account Settings</h1> <h1>Account Settings</h1>
<div id="plugin-settings-link"><a href="settings/addon">Plugin Settings</a></div>
$nickname_block $nickname_block

View File

@ -1,5 +1,8 @@
<h1>Impostazioni account</h1> <h1>Impostazioni account</h1>
<div id="plugin-settings-link"><a href="settings/addon">Impostazioni Plugin</a></div>
$nickname_block $nickname_block

View File

@ -153,7 +153,7 @@ $a->strings['Could not create/connect to database.'] = 'Impossibile creare/colle
$a->strings['Connected to database.'] = 'Collegato al database.'; $a->strings['Connected to database.'] = 'Collegato al database.';
$a->strings['Database import succeeded.'] = 'Importazione database completata.'; $a->strings['Database import succeeded.'] = 'Importazione database completata.';
$a->strings['IMPORTANT: You will need to [manually] setup a scheduled task for the poller.'] = 'IMPORTANTE: Devi impostare manualmente un operazione pianificata per il poller'; $a->strings['IMPORTANT: You will need to [manually] setup a scheduled task for the poller.'] = 'IMPORTANTE: Devi impostare manualmente un operazione pianificata per il poller';
$a->strings['Please see the file INSTALL.'] = 'Guarda il file INSTALL.'; $a->strings['Please see the file "INSTALL.txt".'] = 'Guarda il file "INSTALL.txt".';
$a->strings['Database import failed.'] = 'Importazione database fallita.'; $a->strings['Database import failed.'] = 'Importazione database fallita.';
$a->strings['You may need to import the file "database.sql" manually using phpmyadmin or mysql.'] = 'Potresti dover importare il file "database.sql" manualmente con phpmyadmin o mysql'; $a->strings['You may need to import the file "database.sql" manually using phpmyadmin or mysql.'] = 'Potresti dover importare il file "database.sql" manualmente con phpmyadmin o mysql';
$a->strings['Welcome to Friendika.'] = 'Benvenuto su Friendika.'; $a->strings['Welcome to Friendika.'] = 'Benvenuto su Friendika.';
@ -168,11 +168,11 @@ $a->strings['Error: libCURL PHP module required but not installed.'] = 'Errore:
$a->strings['Error: GD graphics PHP module with JPEG support required but not installed.'] = 'Errore: Il modulo GD graphics di PHP con supporto a JPEG &egrave; richiesto ma non installato.'; $a->strings['Error: GD graphics PHP module with JPEG support required but not installed.'] = 'Errore: Il modulo GD graphics di PHP con supporto a JPEG &egrave; richiesto ma non installato.';
$a->strings['Error: openssl PHP module required but not installed.'] = 'Errore: il modulo openssl di PHP &egrave; richiesto ma non installato.'; $a->strings['Error: openssl PHP module required but not installed.'] = 'Errore: il modulo openssl di PHP &egrave; richiesto ma non installato.';
$a->strings['Error: mysqli PHP module required but not installed.'] = 'Errore: il modulo mysqli di PHP &egrave; richiesto ma non installato'; $a->strings['Error: mysqli PHP module required but not installed.'] = 'Errore: il modulo mysqli di PHP &egrave; richiesto ma non installato';
$a->strings['Please see the file "INSTALL".'] = 'Guarda il file "INSTALL".'; $a->strings['Please see the file "INSTALL.txt".'] = 'Guarda il file "INSTALL.txt".';
$a->strings['The web installer needs to be able to create a file called ".htconfig.php" in the top folder of your web server and it is unable to do so.'] = 'L\'installazione web deve poter creare un file chiamato ".htconfig.php" nella cartella principale del tuo web server ma non &egrave; in grado di farlo.'; $a->strings['The web installer needs to be able to create a file called ".htconfig.php" in the top folder of your web server and it is unable to do so.'] = 'L\'installazione web deve poter creare un file chiamato ".htconfig.php" nella cartella principale del tuo web server ma non &egrave; in grado di farlo.';
$a->strings['This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can.'] = 'Ci&oacute; &egrave; dovuto spesso a impostazioni di permessi, dato che il web server puo\' scrivere il file nella tua cartella, anche se tu puoi.'; $a->strings['This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can.'] = 'Ci&oacute; &egrave; dovuto spesso a impostazioni di permessi, dato che il web server puo\' scrivere il file nella tua cartella, anche se tu puoi.';
$a->strings['Please check with your site documentation or support people to see if this situation can be corrected.'] = 'Controlla la documentazione del tuo sito o con il personale di suporto se la situazione puo\' essere corretta.'; $a->strings['Please check with your site documentation or support people to see if this situation can be corrected.'] = 'Controlla la documentazione del tuo sito o con il personale di suporto se la situazione puo\' essere corretta.';
$a->strings['If not, you may be required to perform a manual installation. Please see the file "INSTALL" for instructions.'] = 'Altrimenti dovrai procedere con l\'installazione manuale. Guarda il file "INSTALL" per istuzioni'; $a->strings['If not, you may be required to perform a manual installation. Please see the file "INSTALL.txt" for instructions.'] = 'Altrimenti dovrai procedere con l\'installazione manuale. Guarda il file "INSTALL.txt" per istuzioni';
$a->strings['The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.'] = 'Il file di configurazione del database ".htconfig.php" non puo\' essere scritto. Usa il testo qui di seguito per creare un file di configurazione nella cartella principale del tuo sito.'; $a->strings['The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.'] = 'Il file di configurazione del database ".htconfig.php" non puo\' essere scritto. Usa il testo qui di seguito per creare un file di configurazione nella cartella principale del tuo sito.';
$a->strings['Errors encountered creating database tables.'] = 'Errori creando le tabelle nel database.'; $a->strings['Errors encountered creating database tables.'] = 'Errori creando le tabelle nel database.';
$a->strings[' : '] = ' : '; $a->strings[' : '] = ' : ';
@ -305,6 +305,7 @@ $a->strings['Your registration is pending approval by the site owner.'] = 'La tu
$a->strings["You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Puoi \x28opzionalmento\x29 riempire questa maschera via OpenID inserendo il tuo OpenID e cliccando 'Registra'."; $a->strings["You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Puoi \x28opzionalmento\x29 riempire questa maschera via OpenID inserendo il tuo OpenID e cliccando 'Registra'.";
$a->strings['If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.'] = 'Se non hai famigliarit&agrave; con OpenID, lascia quel campo in bianco e riempi il resto della maschera.'; $a->strings['If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.'] = 'Se non hai famigliarit&agrave; con OpenID, lascia quel campo in bianco e riempi il resto della maschera.';
$a->strings["Your OpenID \x28optional\x29: "] = "Il tuo OpenID \x28opzionale\x29: "; $a->strings["Your OpenID \x28optional\x29: "] = "Il tuo OpenID \x28opzionale\x29: ";
$a->strings['Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.'] = 'Contenuto in comune h coperto da licenza <a href="http://creativecommons.org/licenses/by/3.0/deed.it">Creative Commons Attribution 3.0</a>.';
$a->strings['Registration'] = 'Registrazione'; $a->strings['Registration'] = 'Registrazione';
$a->strings['Your Full Name ' . "\x28" . 'e.g. Joe Smith' . "\x29" . ': '] = 'Il tuo Nome Completo ' . "\x28" . 'p.e. Mario Rossi' . "\x29" . ': '; $a->strings['Your Full Name ' . "\x28" . 'e.g. Joe Smith' . "\x29" . ': '] = 'Il tuo Nome Completo ' . "\x28" . 'p.e. Mario Rossi' . "\x29" . ': ';
$a->strings['Your Email Address: '] = 'Il tuo Indirizzo Email: '; $a->strings['Your Email Address: '] = 'Il tuo Indirizzo Email: ';
@ -323,6 +324,8 @@ $a->strings[' Please use a shorter name.'] = ' Usa un nome pi&ugrave; corto.';
$a->strings[' Name too short.'] = ' Nome troppo corto.'; $a->strings[' Name too short.'] = ' Nome troppo corto.';
$a->strings[' Not valid email.'] = ' Email non valida.'; $a->strings[' Not valid email.'] = ' Email non valida.';
$a->strings['Settings updated.'] = 'Impostazioni aggiornate.'; $a->strings['Settings updated.'] = 'Impostazioni aggiornate.';
$a->strings['Plugin Settings'] = 'Impostazioni Plugin';
$a->strings['Account Settings'= = 'Impostazioni Account';
$a->strings['OpenID: '] = 'OpenID: '; $a->strings['OpenID: '] = 'OpenID: ';
$a->strings["&nbsp;\x28Optional\x29 Allow this OpenID to login to this account."] = "&nbsp;\x28Opzionale\x29 Permetti a questo OpenID di accedere a questo account."; $a->strings["&nbsp;\x28Optional\x29 Allow this OpenID to login to this account."] = "&nbsp;\x28Opzionale\x29 Permetti a questo OpenID di accedere a questo account.";
$a->strings['Profile is <strong>not published</strong>.'] = 'Il profilo <strong>non &egrave; pubblicato</strong>.'; $a->strings['Profile is <strong>not published</strong>.'] = 'Il profilo <strong>non &egrave; pubblicato</strong>.';

View File

@ -44,3 +44,6 @@
</div> </div>
<div id="register-submit-end" ></div> <div id="register-submit-end" ></div>
</form> </form>
<div class="cc-license">$license</div>

View File

@ -1946,4 +1946,14 @@ a.mail-list-link {
.clear { .clear {
clear: both; clear: both;
} }
.cc-license {
margin-top: 50px;
font-size: 70%;
}
#plugin-settings-link, #account-settings-link {
margin-bottom: 25px;
}