Merge remote-tracking branch 'friendica/master'

diff --git a/rememberoid/rememberoid.php b/rememberoid/rememberoid.php
new file mode 100644 (file)
index 0000000..36f42c3
--- /dev/null
+++ b/rememberoid/rememberoid.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Name: Remember OpenID Login
+ * Description: Autologin with last openid used
+ * Version: 1.0
+ * Author: Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
+ */
+ 
+
+function rememberoid_install(){ 
+       register_hook('init_1','addon/rememberoid/rememberoid.php','rememberoid_init'); 
+       register_hook('logging_out','addon/rememberoid/rememberoid.php','rememberoid_logout'); 
+       register_hook('login_hook','addon/rememberoid/rememberoid.php','rememberoid_form'); 
+}
+
+function rememberoid_uninstall(){ 
+       unregister_hook('init_1','addon/rememberoid/rememberoid.php','rememberoid_init'); 
+       unregister_hook('logging_out','addon/rememberoid/rememberoid.php','rememberoid_logout'); 
+       unregister_hook('login_hook','addon/rememberoid/rememberoid.php','rememberoid_form'); 
+}
+
+function rememberoid_init(&$a) {
+       if (x($_COOKIE, "remember_oid") && !x($_SESSION['openid']) && !x($_SESSION,'authenticated') && !x($_POST,'auth-params') && $a->module === 'home' ){
+               $_POST['openid_url'] = $_COOKIE["remember_oid"];
+               $_POST['auth-params'] = 1;
+       }
+       if (x($_POST,'auth-params') && $_POST['openid_url'] && $_POST['openid_url']!="" && $_POST['remember_oid']){
+               setcookie('remember_oid', $_POST['openid_url'],  time()+60*60*24*30, "/");
+       }
+}
+
+function rememberoid_logout(&$a) {
+       setcookie("rembember_oid", "", time()-3600);
+}
+
+function rememberoid_form(&$a, &$o){
+       $tpl = get_markup_template("field_checkbox.tpl");
+       $html = replace_macros($tpl, array(
+               '$field' => array('remember_oid', t("Autologin with this OpenId"), false,''),
+       ));
+       
+       $o = preg_replace("|<div *id=[\"']login_openid[\"']>|", "<div id='login_openid'>".$html, $o);
+
+}

diff --git a/widgets/widgets.php b/widgets/widgets.php
index 27cabfd698cdec6580ee39d9c99b2ff0d8699fbd..47a6e48a6fe6deea6903fb25b3d8f4244206112a 100755 (executable)
--- a/widgets/widgets.php
+++ b/widgets/widgets.php
@@ -19,7 +19,8 @@ function widgets_uninstall() {
 
 
 function widgets_settings_post(){
-       
+       if(! local_user())
+               return;
        if (isset($_POST['widgets-submit'])){
                del_pconfig(local_user(), 'widgets', 'key');