diff options
51 files changed, 175 insertions, 290 deletions
diff --git a/addon/calc/calc.php b/addon/calc/calc.php index fd6a11777..a095e3960 100644 --- a/addon/calc/calc.php +++ b/addon/calc/calc.php @@ -10,7 +10,7 @@ function calc_uninstall() { }
function calc_app_menu($a,&$b) {
- $b['app_menu'] .= '<a href="calc">Calculator</a><br />';
+ $b['app_menu'] .= '<div class="app-title"><a href="calc">Calculator</a></div>';
}
diff --git a/addon/facebook/facebook.css b/addon/facebook/facebook.css new file mode 100644 index 000000000..3df65706f --- /dev/null +++ b/addon/facebook/facebook.css @@ -0,0 +1,8 @@ + +#facebook-enable-wrapper { + margin-top: 20px; +} + +#facebook-disable-wrapper { + margin-top: 20px; +} diff --git a/addon/facebook/facebook.php b/addon/facebook/facebook.php index 119c2102e..876a9740b 100644 --- a/addon/facebook/facebook.php +++ b/addon/facebook/facebook.php @@ -7,10 +7,17 @@ * view a page on your site, then add it back to the list. This will reset * all of the plugin 'hooks'. * - * 1. register an API key from developer.facebook.com + * 1. register an API key for your site from developer.facebook.com * a. We'd be very happy if you include "Friendika" in the application name - * to increase name recognition. - * b. The url should be your site URL with a trailing slash + * to increase name recognition. The Friendika icons are also present + * in the images directory and may be uploaded as a Facebook app icon. + * Use images/ff-16.jpg for the Icon and images/ff-128.jpg for the Logo. + * b. The url should be your site URL with a trailing slash. + * You may use http://portal.friendika.com/privacy as the privacy policy + * URL unless your site has different requirements, and + * http://portal.friendika.com as the Terms of Service URL unless + * you have different requirements. (Friendika is a software application + * and does not require Terms of Service, though your installation of it might). * c. Set the following values in your .htconfig.php file * $a->config['facebook']['appid'] = 'xxxxxxxxxxx'; * $a->config['facebook']['appsecret'] = 'xxxxxxxxxxxxxxx'; @@ -107,14 +114,18 @@ function facebook_content(&$a) { return ''; } + $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' + . $a->get_baseurl() . '/addon/facebook/facebook.css' . '" media="all" />' . "\r\n"; + $o .= '<h3>' . t('Facebook Connect') . '</h3>'; - $o .= '<br />'; + $o .= '<div id="facebook-enable-wrapper">'; $o .= '<a href="https://www.facebook.com/dialog/oauth?client_id=' . $appid . '&redirect_uri=' - . $a->get_baseurl() . '/facebook/' . $a->user['nickname'] . '&scope=publish_stream,read_stream,offline_access">' . t('Install Facebook post connector') . '</a><br /><br />'; + . $a->get_baseurl() . '/facebook/' . $a->user['nickname'] . '&scope=publish_stream,read_stream,offline_access">' . t('Install Facebook post connector') . '</a>'; + $o .= '</div><div id="facebook-disable-wrapper">'; - $o .= '<a href="' . $a->get_baseurl() . '/facebook/remove' . '">' . t('Remove Facebook post connector') . '</a><br />'; + $o .= '<a href="' . $a->get_baseurl() . '/facebook/remove' . '">' . t('Remove Facebook post connector') . '</a></div>'; return $o; @@ -136,8 +147,10 @@ function facebook_uninstall() { function facebook_plugin_settings(&$a,&$b) { + $b .= '<div class="settings-block">'; $b .= '<h3>' . t('Facebook') . '</h3>'; $b .= '<a href="facebook">' . t('Facebook Connector Settings') . '</a><br />'; + $b .= '</div>'; } diff --git a/addon/poormancron/poormancron.php b/addon/poormancron/poormancron.php index c31d2772c..830c10ddf 100644 --- a/addon/poormancron/poormancron.php +++ b/addon/poormancron/poormancron.php @@ -27,8 +27,7 @@ function poormancron_hook($a,&$b) { // 300 secs, 5 mins if (!$lastupdate || ($now-$lastupdate)>300) { set_config('poormancron','lastupdate', $now); - $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php'); - proc_run($php_path,"include/poller.php"); + proc_run('php',"include/poller.php"); } } diff --git a/addon/randplace/randplace.php b/addon/randplace/randplace.php index d7ea65c9d..fa38de377 100644 --- a/addon/randplace/randplace.php +++ b/addon/randplace/randplace.php @@ -167,6 +167,7 @@ function randplace_settings(&$a,&$s) { /* Add some HTML to the existing form */ + $s .= '<div class="settings-block">'; $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>'; @@ -175,6 +176,6 @@ function randplace_settings(&$a,&$s) { /* 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></div>'; }
\ No newline at end of file diff --git a/addon/statusnet/statusnet.php b/addon/statusnet/statusnet.php index 7928003bc..545518622 100644 --- a/addon/statusnet/statusnet.php +++ b/addon/statusnet/statusnet.php @@ -53,6 +53,8 @@ function statusnet_install() { register_hook('plugin_settings', 'addon/statusnet/statusnet.php', 'statusnet_settings'); register_hook('plugin_settings_post', 'addon/statusnet/statusnet.php', 'statusnet_settings_post'); register_hook('post_local_end', 'addon/statusnet/statusnet.php', 'statusnet_post_hook'); + register_hook('jot_networks', 'addon/statusnet/statusnet.php', 'statusnet_jot_nets'); + logger("installed statusnet"); } @@ -61,8 +63,25 @@ function statusnet_uninstall() { unregister_hook('plugin_settings', 'addon/statusnet/statusnet.php', 'statusnet_settings'); unregister_hook('plugin_settings_post', 'addon/statusnet/statusnet.php', 'statusnet_settings_post'); unregister_hook('post_local_end', 'addon/statusnet/statusnet.php', 'statusnet_post_hook'); + unregister_hook('jot_networks', 'addon/statusnet/statusnet.php', 'statusnet_jot_nets'); +} + +function statusnet_jot_nets(&$a,&$b) { + if(! local_user()) + return; + + $statusnet_post = get_pconfig(local_user(),'statusnet','post'); + if(intval($statusnet_post) == 1) { + $statusnet_defpost = get_pconfig(local_user(),'statusnet','post_by_default'); + $selected = ((intval($statusnet_defpost == 1)) ? ' selected="selected" ' : ''); + $b .= '<div class="profile-jot-net"><input type="checkbox" name="statusnet_enable"' . $selected . 'value="1" /> ' + . t('Post to StatusNet') . '</div>'; + } } + + + function statusnet_settings_post ($a,$post) { if(! local_user()) return; @@ -123,7 +142,8 @@ function statusnet_settings(&$a,&$s) { $osecret = get_pconfig(local_user(), 'statusnet', 'oauthsecret' ); $enabled = get_pconfig(local_user(), 'statusnet', 'post'); $checked = (($enabled) ? ' checked="checked" ' : ''); - $s .= '<h3>'.t('StatusNet Posting Settings').'</h3>'; + $s .= '<div class="settings-block">'; + $s .= '<h3>'. t('StatusNet Posting Settings').'</h3>'; if ( (!$ckey) && (!$csecret) ) { /*** @@ -185,7 +205,7 @@ function statusnet_settings(&$a,&$s) { $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="submit" class="settings-submit" value="' . t('Submit') . '" /></div>'; } } - $s .= '</div><div class="clear"></div>'; + $s .= '</div><div class="clear"></div></div>'; } @@ -210,8 +230,9 @@ function statusnet_post_hook(&$a,&$b) { if($ckey && $csecret && $otoken && $osecret) { $statusnet_post = get_pconfig(local_user(),'statusnet','post'); + $statusnet_enable = (($statusnet_post && x($_POST,'statusnet_enable')) ? intval($_POST['statusnet_enable']) : 0); - if($statusnet_post) { + if($statusnet_enable && $statusnet_post) { require_once('include/bbcode.php'); $dent = new StatusNetOAuth($api,$ckey,$csecret,$otoken,$osecret); $max_char = $dent->get_maxlength(); // max. length for a dent @@ -241,6 +262,6 @@ function statusnet_post_hook(&$a,&$b) { $dent->post('statuses/update', array('status' => $msg)); } } - } + } } diff --git a/addon/tictac/tictac.php b/addon/tictac/tictac.php index 95678302c..f73937cdd 100644 --- a/addon/tictac/tictac.php +++ b/addon/tictac/tictac.php @@ -11,7 +11,7 @@ function tictac_uninstall() { } function tictac_app_menu($a,&$b) { - $b['app_menu'] .= '<a href="tictac">' . t('Three Dimensional Tic-Tac-Toe') . '</a><br />'; + $b['app_menu'] .= '<div class="app-title"><a href="tictac">' . t('Three Dimensional Tic-Tac-Toe') . '</a></div>'; } diff --git a/addon/twitter/twitter.php b/addon/twitter/twitter.php index 509297d4e..0fd891d20 100644 --- a/addon/twitter/twitter.php +++ b/addon/twitter/twitter.php @@ -41,7 +41,6 @@ function twitter_install() { register_hook('plugin_settings_post', 'addon/twitter/twitter.php', 'twitter_settings_post'); register_hook('post_local_end', 'addon/twitter/twitter.php', 'twitter_post_hook'); register_hook('jot_networks', 'addon/twitter/twitter.php', 'twitter_jot_nets'); - register_hook('post_local_start', 'addon/twitter/twitter.php', 'twitter_post_start'); logger("installed twitter"); } @@ -51,8 +50,6 @@ function twitter_uninstall() { unregister_hook('plugin_settings_post', 'addon/twitter/twitter.php', 'twitter_settings_post'); unregister_hook('post_local_end', 'addon/twitter/twitter.php', 'twitter_post_hook'); unregister_hook('jot_networks', 'addon/twitter/twitter.php', 'twitter_jot_nets'); - unregister_hook('post_local_start', 'addon/twitter/twitter.php', 'twitter_post_start'); - } function twitter_jot_nets(&$a,&$b) { @@ -70,19 +67,6 @@ function twitter_jot_nets(&$a,&$b) { } -function twitter_post_start(&$a,&$b) { - if(! local_user()) - return; - - if((x($b,'twitter_enable')) && (intval($b['twitter_enable']))) - set_pconfig(local_user(),'twitter','enable','1'); - else - del_pconfig(local_user(),'twitter','enable'); - - -} - - function twitter_settings_post ($a,$post) { if(! local_user()) return; @@ -134,6 +118,7 @@ function twitter_settings(&$a,&$s) { $osecret = get_pconfig(local_user(), 'twitter', 'oauthsecret' ); $enabled = get_pconfig(local_user(), 'twitter', 'post'); $checked = (($enabled) ? ' checked="checked" ' : ''); + $s .= '<div class="settings-block">'; $s .= '<h3>'. t('Twitter Posting Settings') .'</h3>'; if ( (!$ckey) && (!$csecret) ) { @@ -167,8 +152,8 @@ function twitter_settings(&$a,&$s) { $s .= '<input id="twitter-pin" type="text" name="twitter-pin" />'; $s .= '<input id="twitter-token" type="hidden" name="twitter-token" value="'.$token.'" />'; $s .= '<input id="twitter-token2" type="hidden" name="twitter-token2" value="'.$request_token['oauth_token_secret'].'" />'; - $s .= '</div><div class="clear"></div>'; - $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="submit" class="settings-submit" value="' . t('Submit') . '" /></div>'; + $s .= '</div><div class="clear"></div>'; + $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="submit" class="settings-submit" value="' . t('Submit') . '" /></div>'; } else { /*** * we have an OAuth key / secret pair for the user @@ -190,7 +175,7 @@ function twitter_settings(&$a,&$s) { $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="submit" class="settings-submit" value="' . t('Submit') . '" /></div>'; } } - $s .= '</div><div class="clear"></div>'; + $s .= '</div><div class="clear"></div></div>'; } @@ -213,11 +198,11 @@ function twitter_post_hook(&$a,&$b) { if($ckey && $csecret && $otoken && $osecret) { - $twitter_post = get_pconfig(local_user(),'twitter','post'); - $twitter_enable = intval(get_pconfig(local_user(),'twitter','enable')); + $twitter_post = intval(get_pconfig(local_user(),'twitter','post')); + $twitter_enable = (($twitter_post && x($_POST,'twitter_enable')) ? intval($_POST['twitter_enable']) : 0); if($twitter_post && $twitter_enable) { - require_once('addon/twitter/twitteroauth.php'); + require_once('library/twitteroauth.php'); require_once('include/bbcode.php'); $tweet = new TwitterOAuth($ckey,$csecret,$otoken,$osecret); $max_char = 140; // max. length for a tweet @@ -768,7 +768,12 @@ function escape_tags($string) { if(! function_exists('login')) { function login($register = false) { $o = ""; - $register_html = (($register) ? load_view_file("view/register-link.tpl") : ""); + $register_tpl = (($register) ? load_view_file("view/register-link.tpl") : ""); + + $register_html = replace_macros($register_tpl,array( + '$title' => t('Create a New Account'), + '$desc' => t('Register') + )); $noid = get_config('system','no_openid'); if($noid) { @@ -795,6 +800,7 @@ function login($register = false) { } $o = replace_macros($tpl,array( + '$logout' => t('Logout'), '$register_html' => $register_html, '$classname' => $classname, '$namelabel' => $namelabel, @@ -2434,6 +2440,9 @@ if(! function_exists('proc_run')) { function proc_run($cmd){ $args = func_get_args(); call_hooks("proc_run", $args); + + if(count($args) && $args[0] === 'php') + $args[0] = ((x($a->config,'php_path')) && (strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php'); foreach ($args as $arg){ $arg = escapeshellarg($arg); diff --git a/include/acl_selectors.php b/include/acl_selectors.php index 94f51a9ff..9467531d9 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -26,7 +26,7 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) { $selected = " selected=\"selected\" "; else $selected = ''; - $trimmed = substr($rr['name'],0,12); + $trimmed = mb_substr($rr['name'],0,12); $o .= "<option value=\"{$rr['id']}\" $selected title=\"{$rr['name']}\" >$trimmed</option>\r\n"; } @@ -89,7 +89,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p else $selected = ''; - $trimmed = substr($rr['name'],0,22); + $trimmed = mb_substr($rr['name'],0,22); $o .= "<option value=\"{$rr['id']}\" $selected title=\"{$rr['name']}|{$rr['url']}\" >$trimmed</option>\r\n"; } diff --git a/include/poller.php b/include/poller.php index 66df080a9..d54c88e05 100644 --- a/include/poller.php +++ b/include/poller.php @@ -27,8 +27,7 @@ function poller_run($argv, $argc){ // run queue delivery process in the background - $php_path = ((x($a->config,'php_path') && strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php'); - proc_run($php_path,"include/queue.php"); + proc_run('php',"include/queue.php"); // clear old cache q("DELETE FROM `cache` WHERE `updated`<'%s'", diff --git a/mod/contacts.php b/mod/contacts.php index 36f42f8e5..8e069b2bd 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -124,9 +124,7 @@ function contacts_content(&$a) { if($cmd === 'update') { // pull feed and consume it, which should subscribe to the hub. - - $php_path = ((x($a->config,'php_path') && strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php'); - proc_run($php_path,"include/poller.php","$contact_id"); + proc_run('php',"include/poller.php","$contact_id"); goaway($a->get_baseurl() . '/contacts/' . $contact_id); // NOTREACHED } diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php index 24e8bf106..1b42c13b8 100644 --- a/mod/dfrn_confirm.php +++ b/mod/dfrn_confirm.php @@ -435,11 +435,8 @@ function dfrn_confirm_post(&$a,$handsfree = null) { $arr['last-child'] = 1; $i = item_store($arr); - - $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php'); - - //proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"activity\" \"$i\" &", array(),$foo)); - proc_run($php_path,"include/notifier.php","activity","$i"); + if($i) + proc_run('php',"include/notifier.php","activity","$i"); } diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php index cd7b0cff0..010272739 100644 --- a/mod/dfrn_notify.php +++ b/mod/dfrn_notify.php @@ -369,9 +369,7 @@ function dfrn_notify_post(&$a) { if($posted_id && $parent) { - $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php'); - - proc_run($php_path,"include/notifier.php","comment-import","$posted_id"); + proc_run('php',"include/notifier.php","comment-import","$posted_id"); if((! $is_like) && ($importer['notify-flags'] & NOTIFY_COMMENT) && (! $importer['self'])) { require_once('bbcode.php'); diff --git a/mod/display.php b/mod/display.php index bdf6a6f97..7cefc42e6 100644 --- a/mod/display.php +++ b/mod/display.php @@ -234,7 +234,7 @@ function display_content(&$a) { } if(($item['contact-id'] == remote_user()) || ($item['uid'] == local_user())) - $drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id'])); + $drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete'))); else $drop = replace_macros(load_view_file('view/wall_fake_drop.tpl'), array('$id' => $item['id'])); @@ -258,7 +258,11 @@ function display_content(&$a) { $tmp_item = replace_macros($template,array( '$id' => $item['item_id'], - '$title' => t('View $name\'s profile'), + '$linktitle' => t('View $name\'s profile'), + '$olinktitle' => t('View $owner_name\'s profile'), + '$to' => t('to'), + '$wall' => t('Wall-to-Wall'), + '$vwall' => t('via Wall-To-Wall:'), '$profile_url' => $profile_link, '$name' => $profile_name, '$sparkle' => $sparkle, diff --git a/mod/follow.php b/mod/follow.php index 28441eae8..f3bd84669 100644 --- a/mod/follow.php +++ b/mod/follow.php @@ -253,9 +253,7 @@ function follow_post(&$a) { // pull feed and consume it, which should subscribe to the hub. - $php_path = ((x($a->config,'php_path') && strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php'); - //proc_close(proc_open("\"$php_path\" \"include/poller.php\" \"$contact_id\" &", array(), $foo)); - proc_run($php_path,"include/poller.php","$contact_id"); + proc_run('php',"include/poller.php","$contact_id"); // create a follow slap diff --git a/mod/item.php b/mod/item.php index 8c6b181c0..c2487435e 100644 --- a/mod/item.php +++ b/mod/item.php @@ -460,11 +460,7 @@ function item_post(&$a) { // NOTREACHED } - $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php'); - - logger('mod_item: notifier invoked: ' . "\"$php_path\" \"include/notifier.php\" \"$notify_type\" \"$post_id\" &"); - - proc_run($php_path, "include/notifier.php", $notify_type, "$post_id"); + proc_run('php', "include/notifier.php", $notify_type, "$post_id"); $datarray['id'] = $post_id; @@ -595,12 +591,10 @@ function item_content(&$a) { } } $drop_id = intval($item['id']); - $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php'); // send the notification upstream/downstream as the case may be - //proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"drop\" \"$drop_id\" &", array(), $foo)); - proc_run($php_path,"include/notifier.php","drop","$drop_id"); + proc_run('php',"include/notifier.php","drop","$drop_id"); goaway($a->get_baseurl() . '/' . $_SESSION['return_url']); //NOTREACHED diff --git a/mod/like.php b/mod/like.php index c78c1f030..3a8ca4b7d 100644 --- a/mod/like.php +++ b/mod/like.php @@ -101,9 +101,7 @@ function like_content(&$a) { intval($r[0]['id']) ); - $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php'); - //proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"like\" \"$post_id\" &", array(),$foo)); - proc_run($php_path,"include/notifier.php","like","$post_id"); + proc_run('php',"include/notifier.php","like","$post_id"); return; } @@ -173,11 +171,7 @@ EOT; ); } - - $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php'); - - //proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"like\" \"$post_id\" &", array(),$foo)); - proc_run($php_path,"include/notifier.php","like","$post_id"); + proc_run('php',"include/notifier.php","like","$post_id"); return; // NOTREACHED }
\ No newline at end of file diff --git a/mod/message.php b/mod/message.php index ef3be2c5e..466b0befa 100644 --- a/mod/message.php +++ b/mod/message.php @@ -96,16 +96,9 @@ function message_post(&$a) { } } } - - - - - - $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php'); if($post_id) { - //proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"mail\" \"$post_id\" &", array(),$foo)); - proc_run($php_path,"include/notifier.php","mail","$post_id"); + proc_run('php',"include/notifier.php","mail","$post_id"); notice( t('Message sent.') . EOL ); } else { diff --git a/mod/network.php b/mod/network.php index 79a2f2b38..68c9656e5 100644 --- a/mod/network.php +++ b/mod/network.php @@ -354,7 +354,7 @@ function network_content(&$a, $update = 0) { )); } - $drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id'])); + $drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete'))); @@ -412,7 +412,11 @@ function network_content(&$a, $update = 0) { $tmp_item = replace_macros($template,array( '$id' => $item['item_id'], - '$title' => t('View $name\'s profile'), + '$linktitle' => t('View $name\'s profile'), + '$olinktitle' => t('View $owner_name\'s profile'), + '$to' => t('to'), + '$wall' => t('Wall-to-Wall'), + '$vwall' => t('via Wall-To-Wall:'), '$profile_url' => $profile_link, '$name' => $profile_name, '$thumb' => $profile_avatar, diff --git a/mod/photos.php b/mod/photos.php index d4835ba5e..c1c6a4133 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -182,13 +182,11 @@ foreach($_FILES AS $key => $val) { ); $drop_id = intval($rr['id']); - $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php'); // send the notification upstream/downstream as the case may be if($rr['visible']) - //proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"drop\" \"$drop_id\" & ",array(),$foo)); - proc_run($php_path,"include/notifier.php","drop","$drop_id"); + proc_run('php',"include/notifier.php","drop","$drop_id"); } } } @@ -232,11 +230,9 @@ foreach($_FILES AS $key => $val) { $url = $a->get_baseurl(); $drop_id = intval($i[0]['id']); - $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php'); if($i[0]['visible']) - //proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"drop\" \"$drop_id\" & ", array(),$foo)); - proc_run($php_path,"include/notifier.php","drop","$drop_id"); + proc_run('php',"include/notifier.php","drop","$drop_id"); } } @@ -474,9 +470,8 @@ foreach($_FILES AS $key => $val) { $arr['target'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . '" />' . "\n" . '<link rel="preview" type="image/jpeg" href="' . $a->get_baseurl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.jpg' . '" />') . '</link></target>'; $item_id = item_store($arr); - $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php'); - //proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"tag\" \"$item_id\" & ",array(),$foo)); - proc_run($php_path,"include/notifier.php","tag","$item_id"); + if($item_id) + proc_run('php',"include/notifier.php","tag","$item_id"); } } @@ -1153,7 +1148,7 @@ function photos_content(&$a) { $drop = ''; if(($item['contact-id'] == remote_user()) || ($item['uid'] == local_user())) - $drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id'])); + $drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete'))); $o .= replace_macros($template,array( diff --git a/mod/profile.php b/mod/profile.php index 46d13298e..15a3a861f 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -339,7 +339,7 @@ function profile_content(&$a, $update = 0) { if(($item['contact-id'] == remote_user()) || ($item['uid'] == local_user())) $dropping = true; - $drop = replace_macros((($dropping)? $droptpl : $fakedrop), array('$id' => $item['id'])); + $drop = replace_macros((($dropping)? $droptpl : $fakedrop), array('$id' => $item['id'], '$delete' => t('Delete'))); $like = ((isset($alike[$item['id']])) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : ''); @@ -360,7 +360,7 @@ function profile_content(&$a, $update = 0) { $tmp_item = replace_macros($template,array( '$id' => $item['item_id'], - '$title' => t('View $name\'s profile'), + '$linktitle' => t('View $name\'s profile'), '$profile_url' => $profile_link, '$name' => $profile_name, '$thumb' => $profile_avatar, diff --git a/mod/profile_photo.php b/mod/profile_photo.php index 4f0d567f4..0f84a85c9 100644 --- a/mod/profile_photo.php +++ b/mod/profile_photo.php @@ -87,11 +87,9 @@ function profile_photo_post(&$a) { ); // Update global directory in background - $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php'); $url = $_SESSION['my_url']; if($url && strlen(get_config('system','directory_submit_url'))) - //proc_close(proc_open("\"$php_path\" \"include/directory.php\" \"$url\" &",array(),$foo)); - proc_run($php_path,"include/directory.php","$url"); + proc_run('php',"include/directory.php","$url"); } else notice( t('Unable to process image') . EOL); @@ -169,11 +167,9 @@ function profile_photo_content(&$a) { ); // Update global directory in background - $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php'); $url = $_SESSION['my_url']; if($url && strlen(get_config('system','directory_submit_url'))) - //proc_close(proc_open("\"$php_path\" \"include/directory.php\" \"$url\" &",array(),$foo)); - proc_run($php_path,"include/directory.php","$url"); + proc_run('php',"include/directory.php","$url"); goaway($a->get_baseurl() . '/profiles'); return; // NOTREACHED diff --git a/mod/profiles.php b/mod/profiles.php index d74219501..4e3f03799 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -200,11 +200,9 @@ function profiles_post(&$a) { if($is_default) { // Update global directory in background - $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php'); $url = $_SESSION['my_url']; if($url && strlen(get_config('system','directory_submit_url'))) - //proc_close(proc_open("\"$php_path\" \"include/directory.php\" \"$url\" &", array(),$foo)); - proc_run($php_path,"include/directory.php","$url"); + proc_run('php',"include/directory.php","$url"); } } } diff --git a/mod/register.php b/mod/register.php index d97b3e0cd..97038def0 100644 --- a/mod/register.php +++ b/mod/register.php @@ -291,6 +291,12 @@ function register_post(&$a) { } } + if($netpublish && $a->config['register_policy'] != REGISTER_APPROVE) { + $url = $a->get_baseurl() . "/profile/$nickname"; + proc_run('php',"include/directory.php","$url"); + } + + if( $a->config['register_policy'] == REGISTER_OPEN ) { $email_tpl = load_view_file("view/register_open_eml.tpl"); $email_tpl = replace_macros($email_tpl, array( @@ -348,13 +354,6 @@ function register_post(&$a) { } - if($netpublish && $a->config['register_policy'] != REGISTER_APPROVE) { - $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php'); - $url = $a->get_baseurl() . "/profile/$nickname"; - if($url && strlen(get_config('system','directory_submit_url'))) - proc_run($php_path,"include/directory.php","$url"); - - } return; }} diff --git a/mod/regmod.php b/mod/regmod.php index f662902d8..00cfa06e2 100644 --- a/mod/regmod.php +++ b/mod/regmod.php @@ -74,10 +74,9 @@ function regmod_content(&$a) { intval($user[0]['uid']) ); if(count($r) && $r[0]['net-publish']) { - $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php'); $url = $a->get_baseurl() . '/profile/' . $user[0]['nickname']; if($url && strlen(get_config('system','directory_submit_url'))) - proc_run($php_path,"include/directory.php","$url"); + proc_run('php',"include/directory.php","$url"); } $email_tpl = load_view_file("view/register_open_eml.tpl"); diff --git a/mod/settings.php b/mod/settings.php index dbbac8bde..ebe07612e 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -179,11 +179,9 @@ function settings_post(&$a) { if($old_visibility != $net_publish) { // Update global directory in background - $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php'); $url = $_SESSION['my_url']; if($url && strlen(get_config('system','directory_submit_url'))) - //proc_close(proc_open("\"$php_path\" \"include/directory.php\" \"$url\" &",array(),$foo)); - proc_run($php_path,"include/directory.php","$url"); + proc_run('php',"include/directory.php","$url"); } $_SESSION['theme'] = $theme; diff --git a/util/strings.php b/util/strings.php index 747d8ef48..f74f69584 100644 --- a/util/strings.php +++ b/util/strings.php @@ -3,6 +3,8 @@ $a->strings['Not Found'] = 'Not Found'; $a->strings['Page not found.' ] = 'Page not found.' ; $a->strings['Permission denied'] = 'Permission denied'; $a->strings['Permission denied.'] = 'Permission denied.'; +$a->strings['Create a New Account'] = 'Create a New Account'; +$a->strings['Register'] = 'Register'; $a->strings['Nickname or Email address: '] = 'Nickname or Email address: '; $a->strings['Password: '] = 'Password: '; $a->strings['Login'] = 'Login'; @@ -10,6 +12,7 @@ $a->strings['Nickname/Email/OpenID: '] = 'Nickname/Email/OpenID: '; $a->strings["Password \x28if not OpenID\x29: "] = "Password \x28if not OpenID\x29: "; $a->strings['Forgot your password?'] = 'Forgot your password?'; $a->strings['Password Reset'] = 'Password Reset'; +$a->strings['Logout'] = 'Logout'; $a->strings['prev'] = 'prev'; $a->strings['first'] = 'first'; $a->strings['last'] = 'last'; @@ -191,6 +194,10 @@ $a->strings['Item not found.'] = 'Item not found.'; $a->strings['Private Message'] = 'Private Message'; $a->strings['This is you'] = 'This is you'; $a->strings['View $name\'s profile'] = 'View $name\'s profile'; +$a->strings['View $owner_name\'s profile'] = 'View $owner_name\'s profile'; +$a->strings['to'] = 'to'; +$a->strings['Wall-to-Wall'] = 'Wall-to-Wall'; +$a->strings['via Wall-To-Wall:'] = 'via Wall-To-Wall:'; $a->strings['Item has been removed.'] = 'Item has been removed.'; $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['The profile address specified does not provide adequate information.'] = 'The profile address specified does not provide adequate information.'; @@ -361,7 +368,6 @@ $a->strings['Your Full Name ' . "\x28" . 'e.g. Joe Smith' . "\x29" . ': '] = 'Yo $a->strings['Your Email Address: '] = 'Your Email Address: '; $a->strings['Choose a profile nickname. This must begin with a text character. Your global profile locator will then be \'<strong>nickname@$sitename</strong>\'.'] = 'Choose a profile nickname. This must begin with a text character. Your global profile locator will then be \'<strong>nickname@$sitename</strong>\'.'; $a->strings['Choose a nickname: '] = 'Choose a nickname: '; -$a->strings['Register'] = 'Register'; $a->strings['Please login.'] = 'Please login.'; $a->strings['Registration revoked for '] = 'Registration revoked for '; $a->strings['Account approved.'] = 'Account approved.'; @@ -425,7 +431,6 @@ $a->strings[' ago'] = ' ago'; $a->strings['Create a new group'] = 'Create a new group'; $a->strings['Everybody'] = 'Everybody'; $a->strings['Birthday:'] = 'Birthday:'; -$a->strings['Logout'] = 'Logout'; $a->strings['Home'] = 'Home'; $a->strings['Apps'] = 'Apps'; $a->strings['Directory'] = 'Directory'; @@ -508,6 +513,8 @@ $a->strings['File has an invalid extension, it should be one of '] = 'File has a $a->strings['Upload was cancelled, or server error encountered'] = 'Upload was cancelled, or server error encountered'; $a->strings['Randplace Settings'] = 'Randplace Settings'; $a->strings['Enable Randplace Plugin'] = 'Enable Randplace Plugin'; +$a->strings['Post to StatusNet'] = 'Post to StatusNet'; +$a->strings['StatusNet Posting Settings'] = 'StatusNet Posting Settings'; $a->strings['No consumer key pair for StatusNet found. Register your Friendika Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendika installation at your favorited StatusNet installation.'] = 'No consumer key pair for StatusNet found. Register your Friendika Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendika installation at your favorited StatusNet installation.'; $a->strings['OAuth Consumer Key'] = 'OAuth Consumer Key'; $a->strings['OAuth Consumer Secret'] = 'OAuth Consumer Secret'; diff --git a/view/de/register-link.tpl b/view/de/register-link.tpl deleted file mode 100644 index cf9d7976d..000000000 --- a/view/de/register-link.tpl +++ /dev/null @@ -1 +0,0 @@ - <a href="register" name="Neuen Account anlegen" id="register-link" >Registrieren</a> diff --git a/view/de/strings.php b/view/de/strings.php index cc0319606..d17037f6d 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -175,7 +175,11 @@ $a->strings['Cancel'] = 'Abbrechen'; $a->strings['Global Directory'] = 'Weltweites Verzeichnis'; $a->strings['Private Message'] = 'Private Nachricht'; $a->strings['This is you'] = 'Das bist du'; -$a->strings['View $name\'s profile'] = 'Profile von $name'; +$a->strings['View $name\'s profile'] = 'Betrachte das Profil von $name'; +$a->strings['View $owner_name\'s profile'] = 'Betrachte das Profil von $owner_name'; +$a->strings['to'] = 'to'; +$a->strings['Wall-to-Wall'] = 'Wall-to-Wall'; +$a->strings['via Wall-To-Wall:'] = 'via Wall-To-Wall:'; $a->strings['Item has been removed.'] = 'Eintrag wurde entfernt.'; $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['The profile address specified does not provide adequate information.'] = 'Die angegebene Profiladresse liefert unzureichende Informationen.'; diff --git a/view/de/wall_item_drop.tpl b/view/de/wall_item_drop.tpl deleted file mode 100644 index 7b267f314..000000000 --- a/view/de/wall_item_drop.tpl +++ /dev/null @@ -1,4 +0,0 @@ -<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" ><a -href="item/drop/$id" onclick="return confirmDelete();" ><img -src="images/b_drophide.gif" alt="Löschen" title="Löschen" id="wall-item-delete-icon-$id" class="wall-item-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div> - <div class="wall-item-delete-end"></div> diff --git a/view/de/wallwall_item.tpl b/view/de/wallwall_item.tpl deleted file mode 100644 index b9a655582..000000000 --- a/view/de/wallwall_item.tpl +++ /dev/null @@ -1,41 +0,0 @@ -<div class="wall-item-outside-wrapper$indent wallwall" id="wall-item-outside-wrapper-$id" > - <div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" > - <span class="wall-item-info" id="wall-item-info-$id"> - <div class="wall-item-photo-wrapper" id="wall-item-ownerphoto-wrapper-$id" > - <a href="$owner_url" title="Gehe zum Profil von $owner_name" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$id"> - <img src="$owner_photo" class="wall-item-photo$osparkle" id="wall-item-ownerphoto-$id" height="80" width="80" alt="$owner_name" /></a> - </div> - <div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="Wall-To-Wall" /></div> - <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" > - <a href="$profile_url" title="Betrachte das Profil von $name" class="wall-item-photo-link" id="wall-item-photo-link-$id"> - <img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" height="80" width="80" alt="$name" /></a> - </div> - <div class="wall-item-wrapper" id="wall-item-wrapper-$id" > - $lock - <a href="$profile_url" title="Betrachte das Profil von $name" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a> to <a href="$owner_url" title="View $owner_name's profile" class="wall-item-name-link"><span class="wall-item-name$osparkle" id="wall-item-ownername-$id">$owner_name</span></a> via Wall-To-Wall:<br /> - <div class="wall-item-ago" id="wall-item-ago-$id">$ago</div> - <div class="wall-item-location" id="wall-item-location-$id">$location</div> - $vote - </div> - </span> - <div class="wall-item-content" id="wall-item-content-$id" > - <div class="wall-item-title" id="wall-item-title-$id">$title</div> - <div class="wall-item-title-end"></div> - <div class="wall-item-body" id="wall-item-body-$id" >$body</div> - </div> - <div class="wall-item-tools" id="wall-item-tools-$id"> - $plink - $drop - </div> - </div> - <div class="wall-item-wrapper-end"></div> - <div class="wall-item-like" id="wall-item-like-$id">$like</div> - <div class="wall-item-dislike" id="wall-item-dislike-$id">$dislike</div> - <div class="wall-item-comment-separator"></div> - <div class="wall-item-comment-wrapper" > - $comment - </div> -</div> - -<div class="wall-item-outside-wrapper-end$indent" ></div> - diff --git a/view/en/logout.tpl b/view/en/logout.tpl deleted file mode 100644 index 9a6c1d763..000000000 --- a/view/en/logout.tpl +++ /dev/null @@ -1,6 +0,0 @@ -<form action="" method="post" > -<div class="logout-wrapper"> -<input type="hidden" name="auth-params" value="logout" /> -<input type="submit" name="submit" id="logout-button" value="Logout" /> -</div> -</form> diff --git a/view/en/register-link.tpl b/view/en/register-link.tpl deleted file mode 100644 index 7f3fca4d6..000000000 --- a/view/en/register-link.tpl +++ /dev/null @@ -1 +0,0 @@ - <a href="register" name="Create a New Account" id="register-link" >Register</a> diff --git a/view/en/wall_item_drop.tpl b/view/en/wall_item_drop.tpl deleted file mode 100644 index 66777db15..000000000 --- a/view/en/wall_item_drop.tpl +++ /dev/null @@ -1,2 +0,0 @@ -<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" ><a href="item/drop/$id" onclick="return confirmDelete();" ><img src="images/b_drophide.gif" alt="Delete" title="Delete" id="wall-item-delete-icon-$id" class="wall-item-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div> - <div class="wall-item-delete-end"></div> diff --git a/view/fr/logout.tpl b/view/fr/logout.tpl deleted file mode 100644 index 9a6c1d763..000000000 --- a/view/fr/logout.tpl +++ /dev/null @@ -1,6 +0,0 @@ -<form action="" method="post" > -<div class="logout-wrapper"> -<input type="hidden" name="auth-params" value="logout" /> -<input type="submit" name="submit" id="logout-button" value="Logout" /> -</div> -</form> diff --git a/view/fr/register-link.tpl b/view/fr/register-link.tpl deleted file mode 100644 index 7f3fca4d6..000000000 --- a/view/fr/register-link.tpl +++ /dev/null @@ -1 +0,0 @@ - <a href="register" name="Create a New Account" id="register-link" >Register</a> diff --git a/view/fr/wall_item_drop.tpl b/view/fr/wall_item_drop.tpl deleted file mode 100644 index 66777db15..000000000 --- a/view/fr/wall_item_drop.tpl +++ /dev/null @@ -1,2 +0,0 @@ -<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" ><a href="item/drop/$id" onclick="return confirmDelete();" ><img src="images/b_drophide.gif" alt="Delete" title="Delete" id="wall-item-delete-icon-$id" class="wall-item-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div> - <div class="wall-item-delete-end"></div> diff --git a/view/fr/wallwall_item.tpl b/view/fr/wallwall_item.tpl deleted file mode 100644 index 02af17a64..000000000 --- a/view/fr/wallwall_item.tpl +++ /dev/null @@ -1,41 +0,0 @@ -<div class="wall-item-outside-wrapper$indent wallwall" id="wall-item-outside-wrapper-$id" > - <div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" > - <span class="wall-item-info" id="wall-item-info-$id"> - <div class="wall-item-photo-wrapper" id="wall-item-ownerphoto-wrapper-$id" > - <a href="$owner_url" title="View $owner_name's profile" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$id"> - <img src="$owner_photo" class="wall-item-photo$osparkle" id="wall-item-ownerphoto-$id" height="80" width="80" alt="$owner_name" /></a> - </div> - <div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="Wall-To-Wall" /></div> - <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" > - <a href="$profile_url" title="View $name's profile" class="wall-item-photo-link" id="wall-item-photo-link-$id"> - <img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" height="80" width="80" alt="$name" /></a> - </div> - <div class="wall-item-wrapper" id="wall-item-wrapper-$id" > - $lock - <a href="$profile_url" title="View $name's profile" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a> to <a href="$owner_url" title="View $owner_name's profile" class="wall-item-name-link"><span class="wall-item-name$osparkle" id="wall-item-ownername-$id">$owner_name</span></a> via Wall-To-Wall:<br /> - <div class="wall-item-ago" id="wall-item-ago-$id">$ago</div> - <div class="wall-item-location" id="wall-item-location-$id">$location</div> - $vote - </div> - </span> - <div class="wall-item-content" id="wall-item-content-$id" > - <div class="wall-item-title" id="wall-item-title-$id">$title</div> - <div class="wall-item-title-end"></div> - <div class="wall-item-body" id="wall-item-body-$id" >$body</div> - </div> - <div class="wall-item-tools" id="wall-item-tools-$id"> - $plink - $drop - </div> - </div> - <div class="wall-item-wrapper-end"></div> - <div class="wall-item-like" id="wall-item-like-$id">$like</div> - <div class="wall-item-dislike" id="wall-item-dislike-$id">$dislike</div> - <div class="wall-item-comment-separator"></div> - <div class="wall-item-comment-wrapper" > - $comment - </div> -</div> - -<div class="wall-item-outside-wrapper-end$indent" ></div> - diff --git a/view/it/logout.tpl b/view/it/logout.tpl deleted file mode 100644 index 0a6868e0a..000000000 --- a/view/it/logout.tpl +++ /dev/null @@ -1,6 +0,0 @@ -<form action="" method="post" > -<div class="logout-wrapper"> -<input type="hidden" name="auth-params" value="logout" /> -<input type="submit" name="submit" id="logout-button" value="Esci" /> -</div> -</form> diff --git a/view/it/register-link.tpl b/view/it/register-link.tpl deleted file mode 100644 index 67fc37b22..000000000 --- a/view/it/register-link.tpl +++ /dev/null @@ -1 +0,0 @@ - <a href="register" name="Crea un nuovo account" id="register-link" >Registrati</a> diff --git a/view/it/strings.php b/view/it/strings.php index 2b4a84d05..7f4b3eddd 100644 --- a/view/it/strings.php +++ b/view/it/strings.php @@ -140,6 +140,10 @@ $a->strings['Item not found.'] = 'Elemento non trovato.'; $a->strings['Private Message'] = 'Messaggio privato'; $a->strings['This is you'] = 'Questo sei tu'; $a->strings['View $name\'s profile'] = 'Guarda il profilo di $name'; +$a->strings['View $owner_name\'s profile'] = Guarda il profilo di $owner_name'; +$a->strings['to'] = 'a'; +$a->strings['Wall-to-Wall'] = 'Bacheca-A-Bacheca'; +$a->strings['via Wall-To-Wall:'] = 'via Bacheca-A-Bacheca'; $a->strings['Item has been removed.'] = 'L\'elemento è stato rimosso.'; $a->strings['The profile address specified does not provide adequate information.'] = 'L\'indirizzo del profilo specificato non fornisce adeguate informazioni'; $a->strings['Limited profile. This person will be unable to receive direct/personal notifications from you.'] = 'Profilo limitato. Questa persona non sara\' in grado di ricevere nofiche dirette/personali da te.'; diff --git a/view/it/wall_item_drop.tpl b/view/it/wall_item_drop.tpl deleted file mode 100644 index f4ef81c52..000000000 --- a/view/it/wall_item_drop.tpl +++ /dev/null @@ -1,9 +0,0 @@ -<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" > -<a href="item/drop/$id" onclick="return confirmDelete();" > -<img src="images/b_drophide.gif" alt="Cancella" title="Cancella" id="wall-item-delete-icon-$id" class="wall-item-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" > -</a> -</div> - - <div class="wall-item-delete-end"> -</div> - diff --git a/view/it/wallwall_item.tpl b/view/it/wallwall_item.tpl deleted file mode 100644 index bcb420748..000000000 --- a/view/it/wallwall_item.tpl +++ /dev/null @@ -1,41 +0,0 @@ -<div class="wall-item-outside-wrapper$indent wallwall" id="wall-item-outside-wrapper-$id" > - <div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" > - <span class="wall-item-info" id="wall-item-info-$id"> - <div class="wall-item-photo-wrapper" id="wall-item-ownerphoto-wrapper-$id" > - <a href="$owner_url" title="Guarda il profilo di $owner_name" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$id"> - <img src="$owner_photo" class="wall-item-photo$osparkle" id="wall-item-ownerphoto-$id" height="80" width="80" alt="$owner_name" /></a> - </div> - <div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="Bacheca-A-Bacheca" /></div> - <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" > - <a href="$profile_url" title="Guarda il profilo di $name" class="wall-item-photo-link" id="wall-item-photo-link-$id"> - <img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" height="80" width="80" alt="$name" /></a> - </div> - <div class="wall-item-wrapper" id="wall-item-wrapper-$id" > - $lock - <a href="$profile_url" title="Guarda il profilo di $name" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a> a <a href="$owner_url" title="Guarda il profilo di $owner_name" class="wall-item-name-link"><span class="wall-item-name$osparkle" id="wall-item-ownername-$id">$owner_name</span></a> via Bacheca-A-Bacheca:<br /> - <div class="wall-item-ago" id="wall-item-ago-$id">$ago</div> - <div class="wall-item-location" id="wall-item-location-$id">$location</div> - $vote - </div> - </span> - <div class="wall-item-content" id="wall-item-content-$id" > - <div class="wall-item-title" id="wall-item-title-$id">$title</div> - <div class="wall-item-title-end"></div> - <div class="wall-item-body" id="wall-item-body-$id" >$body</div> - </div> - <div class="wall-item-tools" id="wall-item-tools-$id"> - $plink - $drop - </div> - </div> - <div class="wall-item-wrapper-end"></div> - <div class="wall-item-like" id="wall-item-like-$id">$like</div> - <div class="wall-item-dislike" id="wall-item-dislike-$id">$dislike</div> - <div class="wall-item-comment-separator"></div> - <div class="wall-item-comment-wrapper" > - $comment - </div> -</div> - -<div class="wall-item-outside-wrapper-end$indent" ></div> - diff --git a/view/de/logout.tpl b/view/logout.tpl index 9a6c1d763..6a84a5bbc 100644 --- a/view/de/logout.tpl +++ b/view/logout.tpl @@ -1,6 +1,6 @@ <form action="" method="post" > <div class="logout-wrapper"> <input type="hidden" name="auth-params" value="logout" /> -<input type="submit" name="submit" id="logout-button" value="Logout" /> +<input type="submit" name="submit" id="logout-button" value="$logout" /> </div> </form> diff --git a/view/register-link.tpl b/view/register-link.tpl new file mode 100644 index 000000000..802c5f99f --- /dev/null +++ b/view/register-link.tpl @@ -0,0 +1 @@ + <a href="register" title = "$title" id="register-link" >$desc</a> diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index a820c381c..3877fb2ea 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -849,6 +849,10 @@ input#dfrn-url { float: left; } +.wallwall .wall-item-photo-end { + clear: both; +} + .wall-item-arrowphoto-wrapper { margin-top: 40px; margin-right: 20px; @@ -2025,3 +2029,14 @@ a.mail-list-link { .today { color: #FF0000; } + +.settings-block { + border: 1px solid #AAA; + margin: 10px; + padding: 10px; +} + +.app-title { + margin: 10px; +} + diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css index 145123aaf..7e8299eb5 100644 --- a/view/theme/loozah/style.css +++ b/view/theme/loozah/style.css @@ -2073,3 +2073,16 @@ a.mail-list-link { .today { color: #FF0000; } + + +.settings-block { + border: 1px solid #AAA; + margin: 10px; + padding: 10px; +} + + +.app-title { + margin: 10px; +} + diff --git a/view/wall_item.tpl b/view/wall_item.tpl index 7f5f3af26..1cad41118 100644 --- a/view/wall_item.tpl +++ b/view/wall_item.tpl @@ -2,13 +2,13 @@ <div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" > <span class="wall-item-info" id="wall-item-info-$id"> <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" > - <a href="$profile_url" title="$title" class="wall-item-photo-link" id="wall-item-photo-link-$id"> + <a href="$profile_url" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id"> <img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" height="80" width="80" alt="$name" /></a> </div> - + <div class="wall-item-photo-end"></div> <div class="wall-item-wrapper" id="wall-item-wrapper-$id" > $lock - <a href="$profile_url" title="$title" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a> + <a href="$profile_url" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a> <div class="wall-item-ago" id="wall-item-ago-$id">$ago</div> <div class="wall-item-location" id="wall-item-location-$id">$location</div> $vote diff --git a/view/wall_item_drop.tpl b/view/wall_item_drop.tpl new file mode 100644 index 000000000..9aa565f69 --- /dev/null +++ b/view/wall_item_drop.tpl @@ -0,0 +1,2 @@ +<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" ><a href="item/drop/$id" onclick="return confirmDelete();" ><img src="images/b_drophide.gif" alt="$delete" title="$delete" id="wall-item-delete-icon-$id" class="wall-item-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div> + <div class="wall-item-delete-end"></div> diff --git a/view/en/wallwall_item.tpl b/view/wallwall_item.tpl index 02af17a64..6e61ce4f0 100644 --- a/view/en/wallwall_item.tpl +++ b/view/wallwall_item.tpl @@ -2,17 +2,18 @@ <div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" > <span class="wall-item-info" id="wall-item-info-$id"> <div class="wall-item-photo-wrapper" id="wall-item-ownerphoto-wrapper-$id" > - <a href="$owner_url" title="View $owner_name's profile" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$id"> + <a href="$owner_url" title="$olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$id"> <img src="$owner_photo" class="wall-item-photo$osparkle" id="wall-item-ownerphoto-$id" height="80" width="80" alt="$owner_name" /></a> </div> - <div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="Wall-To-Wall" /></div> + <div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$wall" /></div> <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" > - <a href="$profile_url" title="View $name's profile" class="wall-item-photo-link" id="wall-item-photo-link-$id"> + <a href="$profile_url" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id"> <img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" height="80" width="80" alt="$name" /></a> </div> + <div class="wall-item-photo-end"></div> <div class="wall-item-wrapper" id="wall-item-wrapper-$id" > $lock - <a href="$profile_url" title="View $name's profile" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a> to <a href="$owner_url" title="View $owner_name's profile" class="wall-item-name-link"><span class="wall-item-name$osparkle" id="wall-item-ownername-$id">$owner_name</span></a> via Wall-To-Wall:<br /> + <a href="$profile_url" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a> $to <a href="$owner_url" title="$olinktitle" class="wall-item-name-link"><span class="wall-item-name$osparkle" id="wall-item-ownername-$id">$owner_name</span></a> $vwall<br /> <div class="wall-item-ago" id="wall-item-ago-$id">$ago</div> <div class="wall-item-location" id="wall-item-location-$id">$location</div> $vote |