Merge pull request #1028 from tugelbend/master

[friendica.git] / mod / suggest.php

diff --git a/mod/suggest.php b/mod/suggest.php
index 7a86d53a1dbccd533d2f505a24cd089c3dc70c85..a86b412b3235e7484d9a6fe9f92e412e84b64bb7 100644 (file)
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -9,10 +9,38 @@ function suggest_init(&$a) {
                return;
 
        if(x($_GET,'ignore') && intval($_GET['ignore'])) {
-               q("insert into gcign ( uid, gcid ) values ( %d, %d ) ",
-                       intval(local_user()),
-                       intval($_GET['ignore'])
-               );
+               // Check if we should do HTML-based delete confirmation
+               if($_REQUEST['confirm']) {
+                       // <form> can't take arguments in its "action" parameter
+                       // so add any arguments as hidden inputs
+                       $query = explode_querystring($a->query_string);
+                       $inputs = array();
+                       foreach($query['args'] as $arg) {
+                               if(strpos($arg, 'confirm=') === false) {
+                                       $arg_parts = explode('=', $arg);
+                                       $inputs[] = array('name' => $arg_parts[0], 'value' => $arg_parts[1]);
+                               }
+                       }
+
+                       $a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), array(
+                               '$method' => 'get',
+                               '$message' => t('Do you really want to delete this suggestion?'),
+                               '$extra_inputs' => $inputs,
+                               '$confirm' => t('Yes'),
+                               '$confirm_url' => $query['base'],
+                               '$confirm_name' => 'confirmed',
+                               '$cancel' => t('Cancel'),
+                       ));
+                       $a->error = 1; // Set $a->error so the other module functions don't execute
+                       return;
+               }
+               // Now check how the user responded to the confirmation query
+               if(!$_REQUEST['canceled']) {
+                       q("insert into gcign ( uid, gcid ) values ( %d, %d ) ",
+                               intval(local_user()),
+                               intval($_GET['ignore'])
+                       );
+               }
        }
 
 }
@@ -56,6 +84,7 @@ function suggest_content(&$a) {
                        '$name' => $rr['name'],
                        '$photo' => $rr['photo'],
                        '$ignlnk' => $a->get_baseurl() . '/suggest?ignore=' . $rr['id'],
+                       '$ignid' => $rr['id'],
                        '$conntxt' => t('Connect'),
                        '$connlnk' => $connlnk,
                        '$ignore' => t('Ignore/Hide')