From 121200928245e0c38230c01066c1065ec14a8440 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 11 Dec 2017 05:57:51 +0000 Subject: [PATCH 1/3] Some small CSS fix --- pageheader/pageheader.css | 2 +- pledgie/pledgie.css | 2 +- yourls/yourls.css | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pageheader/pageheader.css b/pageheader/pageheader.css index 24608edb..8b3282fb 100644 --- a/pageheader/pageheader.css +++ b/pageheader/pageheader.css @@ -17,7 +17,7 @@ .pageheader { text-align: center; - width 100%; + width: 100%; margin-top: 25px; font-size: 20px; } diff --git a/pledgie/pledgie.css b/pledgie/pledgie.css index 9cb9896d..5195871c 100644 --- a/pledgie/pledgie.css +++ b/pledgie/pledgie.css @@ -22,7 +22,7 @@ .pledgie { text-align: center; - width 100%; + width: 100%; margin-top: 25px; font-size: 20px; } diff --git a/yourls/yourls.css b/yourls/yourls.css index cfd09c97..53743650 100644 --- a/yourls/yourls.css +++ b/yourls/yourls.css @@ -15,7 +15,7 @@ yourls-url { .yourls { text-align: left; - width 100%; + width: 100%; margin-top: 25px; font-size: 20px; } -- 2.43.0 From 9b0816713f8894df4dbeb787b294999ec243ade1 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 11 Dec 2017 08:12:47 +0000 Subject: [PATCH 2/3] Just some reformatting --- blogger/blogger.php | 196 ++++++++++++++++++++++---------------------- 1 file changed, 98 insertions(+), 98 deletions(-) diff --git a/blogger/blogger.php b/blogger/blogger.php index df79d195..093d9049 100644 --- a/blogger/blogger.php +++ b/blogger/blogger.php @@ -4,176 +4,176 @@ * Name: Blogger Post Connector * Description: Post to Blogger (or anything else which uses blogger XMLRPC API) * Version: 1.0 - * + * */ use Friendica\Core\PConfig; function blogger_install() { - register_hook('post_local', 'addon/blogger/blogger.php', 'blogger_post_local'); - register_hook('notifier_normal', 'addon/blogger/blogger.php', 'blogger_send'); - register_hook('jot_networks', 'addon/blogger/blogger.php', 'blogger_jot_nets'); - register_hook('connector_settings', 'addon/blogger/blogger.php', 'blogger_settings'); - register_hook('connector_settings_post', 'addon/blogger/blogger.php', 'blogger_settings_post'); - + register_hook('post_local', 'addon/blogger/blogger.php', 'blogger_post_local'); + register_hook('notifier_normal', 'addon/blogger/blogger.php', 'blogger_send'); + register_hook('jot_networks', 'addon/blogger/blogger.php', 'blogger_jot_nets'); + register_hook('connector_settings', 'addon/blogger/blogger.php', 'blogger_settings'); + register_hook('connector_settings_post', 'addon/blogger/blogger.php', 'blogger_settings_post'); } + function blogger_uninstall() { - unregister_hook('post_local', 'addon/blogger/blogger.php', 'blogger_post_local'); - unregister_hook('notifier_normal', 'addon/blogger/blogger.php', 'blogger_send'); - unregister_hook('jot_networks', 'addon/blogger/blogger.php', 'blogger_jot_nets'); - unregister_hook('connector_settings', 'addon/blogger/blogger.php', 'blogger_settings'); - unregister_hook('connector_settings_post', 'addon/blogger/blogger.php', 'blogger_settings_post'); + unregister_hook('post_local', 'addon/blogger/blogger.php', 'blogger_post_local'); + unregister_hook('notifier_normal', 'addon/blogger/blogger.php', 'blogger_send'); + unregister_hook('jot_networks', 'addon/blogger/blogger.php', 'blogger_jot_nets'); + unregister_hook('connector_settings', 'addon/blogger/blogger.php', 'blogger_settings'); + unregister_hook('connector_settings_post', 'addon/blogger/blogger.php', 'blogger_settings_post'); // obsolete - remove - unregister_hook('post_local_end', 'addon/blogger/blogger.php', 'blogger_send'); - unregister_hook('plugin_settings', 'addon/blogger/blogger.php', 'blogger_settings'); - unregister_hook('plugin_settings_post', 'addon/blogger/blogger.php', 'blogger_settings_post'); - + unregister_hook('post_local_end', 'addon/blogger/blogger.php', 'blogger_send'); + unregister_hook('plugin_settings', 'addon/blogger/blogger.php', 'blogger_settings'); + unregister_hook('plugin_settings_post', 'addon/blogger/blogger.php', 'blogger_settings_post'); } function blogger_jot_nets(&$a,&$b) { - if(! local_user()) - return; + if (!local_user()) { + return; + } - $bl_post = PConfig::get(local_user(),'blogger','post'); - if(intval($bl_post) == 1) { - $bl_defpost = PConfig::get(local_user(),'blogger','post_by_default'); - $selected = ((intval($bl_defpost) == 1) ? ' checked="checked" ' : ''); - $b .= '
' - . t('Post to blogger') . '
'; - } + $bl_post = PConfig::get(local_user(),'blogger','post'); + if (intval($bl_post) == 1) { + $bl_defpost = PConfig::get(local_user(),'blogger','post_by_default'); + $selected = ((intval($bl_defpost) == 1) ? ' checked="checked" ' : ''); + $b .= '
' + . t('Post to blogger') . '
'; + } } function blogger_settings(&$a,&$s) { - if(! local_user()) - return; + if (! local_user()) { + return; + } - /* Add our stylesheet to the page so we can make our settings look nice */ + /* Add our stylesheet to the page so we can make our settings look nice */ - $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; - /* Get the current state of our config variables */ + /* Get the current state of our config variables */ - $enabled = PConfig::get(local_user(),'blogger','post'); - $checked = (($enabled) ? ' checked="checked" ' : ''); - $css = (($enabled) ? '' : '-disabled'); + $enabled = PConfig::get(local_user(),'blogger','post'); + $checked = (($enabled) ? ' checked="checked" ' : ''); + $css = (($enabled) ? '' : '-disabled'); - $def_enabled = PConfig::get(local_user(),'blogger','post_by_default'); + $def_enabled = PConfig::get(local_user(),'blogger','post_by_default'); - $def_checked = (($def_enabled) ? ' checked="checked" ' : ''); + $def_checked = (($def_enabled) ? ' checked="checked" ' : ''); $bl_username = PConfig::get(local_user(), 'blogger', 'bl_username'); $bl_password = PConfig::get(local_user(), 'blogger', 'bl_password'); $bl_blog = PConfig::get(local_user(), 'blogger', 'bl_blog'); + /* Add some HTML to the existing form */ + $s .= ''; + $s .= '

'. t('Blogger Export').'

'; + $s .= ''; + $s .= ''; } function blogger_settings_post(&$a,&$b) { - - if(x($_POST,'blogger-submit')) { - + if (x($_POST,'blogger-submit')) { PConfig::set(local_user(),'blogger','post',intval($_POST['blogger'])); PConfig::set(local_user(),'blogger','post_by_default',intval($_POST['bl_bydefault'])); PConfig::set(local_user(),'blogger','bl_username',trim($_POST['bl_username'])); PConfig::set(local_user(),'blogger','bl_password',trim($_POST['bl_password'])); PConfig::set(local_user(),'blogger','bl_blog',trim($_POST['bl_blog'])); - } - } function blogger_post_local(&$a,&$b) { - // This can probably be changed to allow editing by pointing to a different API endpoint - if($b['edit']) + if ($b['edit']) { return; + } - if((! local_user()) || (local_user() != $b['uid'])) + if (!local_user() || (local_user() != $b['uid'])) { return; + } - if($b['private'] || $b['parent']) + if ($b['private'] || $b['parent']) { return; + } - $bl_post = intval(PConfig::get(local_user(),'blogger','post')); + $bl_post = intval(PConfig::get(local_user(),'blogger','post')); $bl_enable = (($bl_post && x($_REQUEST,'blogger_enable')) ? intval($_REQUEST['blogger_enable']) : 0); - if($b['api_source'] && intval(PConfig::get(local_user(),'blogger','post_by_default'))) + if ($b['api_source'] && intval(PConfig::get(local_user(),'blogger','post_by_default'))) { $bl_enable = 1; + } - if(! $bl_enable) - return; + if (!$bl_enable) { + return; + } - if(strlen($b['postopts'])) - $b['postopts'] .= ','; - $b['postopts'] .= 'blogger'; + if (strlen($b['postopts'])) { + $b['postopts'] .= ','; + } + + $b['postopts'] .= 'blogger'; } function blogger_send(&$a,&$b) { + if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) { + return; + } - if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) - return; - - if(! strstr($b['postopts'],'blogger')) - return; - - if($b['parent'] != $b['id']) - return; + if (! strstr($b['postopts'],'blogger')) { + return; + } + if ($b['parent'] != $b['id']) { + return; + } $bl_username = xmlify(PConfig::get($b['uid'],'blogger','bl_username')); $bl_password = xmlify(PConfig::get($b['uid'],'blogger','bl_password')); $bl_blog = PConfig::get($b['uid'],'blogger','bl_blog'); - if($bl_username && $bl_password && $bl_blog) { + if ($bl_username && $bl_password && $bl_blog) { require_once('include/bbcode.php'); @@ -199,10 +199,10 @@ EOT; logger('blogger: data: ' . $xml, LOGGER_DATA); - if($bl_blog !== 'test') + if ($bl_blog !== 'test') { $x = post_url($bl_blog,$xml); + } + logger('posted to blogger: ' . (($x) ? $x : ''), LOGGER_DEBUG); - } -} - +} \ No newline at end of file -- 2.43.0 From f834d1d145feda6606f95d3577d321bf5548fbb8 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Tue, 12 Dec 2017 21:17:46 -0500 Subject: [PATCH 3/3] Use Exceptions for User::create --- ldapauth/ldapauth.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ldapauth/ldapauth.php b/ldapauth/ldapauth.php index a0b270e3..63ccbe91 100644 --- a/ldapauth/ldapauth.php +++ b/ldapauth/ldapauth.php @@ -177,11 +177,12 @@ function ldap_autocreateaccount($ldap_autocreateaccount, $username, $password, $ if (empty($results)) { if (strlen($email) > 0 && strlen($name) > 0) { $arr = array('username' => $name, 'nickname' => $username, 'email' => $email, 'password' => $password, 'verified' => 1); - $result = User::create($arr); - if ($result['success']) { + + try { + User::create($arr); logger("ldapauth: account " . $username . " created"); - } else { - logger("ldapauth: account " . $username . " was not created ! : " . implode($result)); + } catch (Exception $ex) { + logger("ldapauth: account " . $username . " was not created ! : " . $ex->getMessage()); } } else { logger("ldapauth: unable to create account, no email or nickname found"); -- 2.43.0