relocated "follow" url scraping code so it can be used elsewhere (contact repair...

[friendica.git] / mod / notifications.php

diff --git a/mod/notifications.php b/mod/notifications.php
index 93ca82bb0ccfb0d999096bd94db5f187090368c8..c3f8449ed5340a6148d21f15c039ef841bfc3c26 100644 (file)
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -65,12 +65,11 @@ function notifications_content(&$a) {
        else
                $sql_extra = " AND `ignore` = 0 ";
 
-
-       $tpl = load_view_file('view/intros-top.tpl');
-       $o .= replace_macros($tpl,array(
-               '$hide_url' => ((strlen($sql_extra)) ? 'notifications/all' : 'notifications' ),
-               '$hide_text' => ((strlen($sql_extra)) ? t('Show Ignored Requests') : t('Hide Ignored Requests'))
-       )); 
+       $o .= '<h1>' . t('Pending Friend/Connect Notifications') . '</h1>' . "\r\n";
+       
+       $o .= '<div id="notification-show-hide-wrapper" >';
+       $o .= '<a href="' . ((strlen($sql_extra)) ? 'notifications/all' : 'notifications' ) . '" id="notifications-show-hide-link" >'
+               . ((strlen($sql_extra)) ? t('Show Ignored Requests') : t('Hide Ignored Requests')) . '</a></div>' . "\r\n";
 
 
        $r = q("SELECT COUNT(*) AS `total` FROM `intro` 
@@ -141,24 +140,20 @@ function notifications_content(&$a) {
 
        if ($a->config['register_policy'] == REGISTER_APPROVE &&        
                $a->config['admin_email'] === $a->user['email']){
-               $o .= load_view_file('view/registrations-top.tpl');
+               $o .= '<h1>' . t('User registrations waiting for confirm') . '</h1>' . "\r\n";
                
                $r = q("SELECT `register`.*, `contact`.`name`, `user`.`email`
                                 FROM `register`
                                 LEFT JOIN `contact` ON `register`.`uid` = `contact`.`uid`
                                 LEFT JOIN `user` ON `register`.`uid` = `user`.`uid`;");
                if(($r !== false) && (count($r))) {
-                       $tpl = load_view_file("view/registrations.tpl");
+                       $o .= '<ul>';
                        foreach($r as $rr) {
-                               $o .= "<ul>";
-                               $o .= replace_macros($tpl, array(
-                                       '$fullname'     => $rr['name'],
-                                       '$email'                => $rr['email'],
-                                       '$approvelink'  => "regmod/allow/".$rr['hash'],
-                                       '$denylink'     => "regmod/deny/".$rr['hash'],
-                               ));
-                               $o .= "</ul>";
+                               $o .= '<li>' . sprintf('%s (%s) : ', $rr['name'],$rr['email']) 
+                                       . '<a href="regmod/allow/' . $rr['hash'] .'">' . t('Approve') 
+                                       . '</a> - <href="regmod/deny/' . $rr['hash'] . '">' . t('Deny') . '</a></li>' . "\r\n";
                        }
+                       $o .= "</ul>";
                }
                else
                        notice( t('No registrations.') . EOL);