X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Futil.php;h=0b5abfa4802224fece7bc0d3689446e1e6b97147;hb=3af566d1ecb5793324f7395ebec254848c47df09;hp=811c7cdb078edc0c3e28cc28816da58acff1b7e7;hpb=8c0c085c2de89c1ff7deeabd2b4e259f32a49ea0;p=quix0rs-gnu-social.git

diff --git a/lib/util.php b/lib/util.php
index 811c7cdb07..0b5abfa480 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -23,60 +23,15 @@
 
 function common_server_error($msg, $code=500)
 {
-    static $status = array(500 => 'Internal Server Error',
-                           501 => 'Not Implemented',
-                           502 => 'Bad Gateway',
-                           503 => 'Service Unavailable',
-                           504 => 'Gateway Timeout',
-                           505 => 'HTTP Version Not Supported');
-
-    if (!array_key_exists($code, $status)) {
-        $code = 500;
-    }
-
-    $status_string = $status[$code];
-
-    header('HTTP/1.1 '.$code.' '.$status_string);
-    header('Content-type: text/plain');
-
-    print $msg;
-    print "\n";
-    exit();
+    $err = new ServerErrorAction($msg, $code);
+    $err->showPage();
 }
 
 // Show a user error
 function common_user_error($msg, $code=400)
 {
-    static $status = array(400 => 'Bad Request',
-                           401 => 'Unauthorized',
-                           402 => 'Payment Required',
-                           403 => 'Forbidden',
-                           404 => 'Not Found',
-                           405 => 'Method Not Allowed',
-                           406 => 'Not Acceptable',
-                           407 => 'Proxy Authentication Required',
-                           408 => 'Request Timeout',
-                           409 => 'Conflict',
-                           410 => 'Gone',
-                           411 => 'Length Required',
-                           412 => 'Precondition Failed',
-                           413 => 'Request Entity Too Large',
-                           414 => 'Request-URI Too Long',
-                           415 => 'Unsupported Media Type',
-                           416 => 'Requested Range Not Satisfiable',
-                           417 => 'Expectation Failed');
-
-    if (!array_key_exists($code, $status)) {
-        $code = 400;
-    }
-
-    $status_string = $status[$code];
-
-    header('HTTP/1.1 '.$code.' '.$status_string);
-
-    common_show_header('Error');
-    common_element('div', array('class' => 'error'), $msg);
-    common_show_footer();
+    $err = new ClientErrorAction($msg, $code);
+    $err->showPage();
 }
 
 function common_init_locale($language=null)
@@ -424,6 +379,7 @@ function common_render_content($text, $notice)
     $r = preg_replace('/(^|\s+)@([A-Za-z0-9]{1,64})/e', "'\\1@'.common_at_link($id, '\\2')", $r);
     $r = preg_replace('/^T ([A-Z0-9]{1,64}) /e', "'T '.common_at_link($id, '\\1').' '", $r);
     $r = preg_replace('/(^|\s+)@#([A-Za-z0-9]{1,64})/e', "'\\1@#'.common_at_hash_link($id, '\\2')", $r);
+    $r = preg_replace('/(^|\s)!([A-Za-z0-9]{1,64})/e', "'\\1!'.common_group_link($id, '\\2')", $r);
     return $r;
 }
 
@@ -571,7 +527,7 @@ function common_tag_link($tag)
 {
     $canonical = common_canonical_tag($tag);
     $url = common_local_url('tag', array('tag' => $canonical));
-    return '<a href="' . htmlspecialchars($url) . '" rel="tag" class="hashlink">' . htmlspecialchars($tag) . '</a>';
+    return '<span class="tag"><a href="' . htmlspecialchars($url) . '" rel="tag">' . htmlspecialchars($tag) . '</a></span>';
 }
 
 function common_canonical_tag($tag)
@@ -589,7 +545,18 @@ function common_at_link($sender_id, $nickname)
     $sender = Profile::staticGet($sender_id);
     $recipient = common_relative_profile($sender, common_canonical_nickname($nickname));
     if ($recipient) {
-        return '<a href="'.htmlspecialchars($recipient->profileurl).'" class="atlink">'.$nickname.'</a>';
+        return '<span class="vcard"><a href="'.htmlspecialchars($recipient->profileurl).'" class="url"><span class="fn nickname">'.$nickname.'</span></a></span>';
+    } else {
+        return $nickname;
+    }
+}
+
+function common_group_link($sender_id, $nickname)
+{
+    $sender = Profile::staticGet($sender_id);
+    $group = User_group::staticGet('nickname', common_canonical_nickname($nickname));
+    if ($group && $sender->isMember($group)) {
+        return '<span class="vcard"><a href="'.htmlspecialchars($group->permalink()).'" class="url"><span class="fn nickname">'.$nickname.'</span></a></span>';
     } else {
         return $nickname;
     }
@@ -606,7 +573,7 @@ function common_at_hash_link($sender_id, $tag)
         $url = common_local_url('subscriptions',
                                 array('nickname' => $user->nickname,
                                       'tag' => $tag));
-        return '<a href="'.htmlspecialchars($url).'" class="atlink">'.$tag.'</a>';
+        return '<span class="tag"><a href="'.htmlspecialchars($url).'" rel="tag">'.$tag.'</a></span>';
     } else {
         return $tag;
     }
@@ -770,6 +737,8 @@ function common_fancy_url($action, $args=null)
         return common_path('main/openid');
      case 'profilesettings':
         return common_path('settings/profile');
+     case 'passwordsettings':
+        return common_path('settings/password');
      case 'emailsettings':
         return common_path('settings/email');
      case 'openidsettings':
@@ -852,6 +821,8 @@ function common_fancy_url($action, $args=null)
         return common_path($path);
      case 'imsettings':
         return common_path('settings/im');
+     case 'avatarsettings':
+        return common_path('settings/avatar');
      case 'peoplesearch':
         return common_path('search/people' . (($args) ? ('?' . http_build_query($args)) : ''));
      case 'noticesearch':
@@ -861,13 +832,11 @@ function common_fancy_url($action, $args=null)
      case 'avatarbynickname':
         return common_path($args['nickname'].'/avatar/'.$args['size']);
      case 'tag':
-        if (isset($args['tag']) && $args['tag']) {
-            $path = 'tag/' . $args['tag'];
-            unset($args['tag']);
-        } else {
-            $path = 'tags';
-        }
+        $path = 'tag/' . $args['tag'];
+        unset($args['tag']);
         return common_path($path . (($args) ? ('?' . http_build_query($args)) : ''));
+     case 'publictagcloud':
+        return common_path('tags');
      case 'peopletag':
         $path = 'peopletag/' . $args['tag'];
         unset($args['tag']);
@@ -913,6 +882,26 @@ function common_fancy_url($action, $args=null)
         } else {
             return common_path('main/sup');
         }
+     case 'newgroup':
+        return common_path('group/new');
+     case 'showgroup':
+        return common_path('group/'.$args['nickname']);
+     case 'editgroup':
+        return common_path('group/'.$args['nickname'].'/edit');
+     case 'joingroup':
+        return common_path('group/'.$args['nickname'].'/join');
+     case 'leavegroup':
+        return common_path('group/'.$args['nickname'].'/leave');
+     case 'groupbyid':
+        return common_path('group/'.$args['id'].'/id');
+     case 'grouprss':
+        return common_path('group/'.$args['nickname'].'/rss');
+     case 'groupmembers':
+        return common_path('group/'.$args['nickname'].'/members');
+     case 'usergroups':
+        return common_path($args['nickname'].'/groups');
+     case 'groups':
+        return common_path('group');
      default:
         return common_simple_url($action, $args);
     }
@@ -1024,101 +1013,19 @@ function common_redirect($url, $code=307)
                            302 => "Found",
                            303 => "See Other",
                            307 => "Temporary Redirect");
+
     header("Status: ${code} $status[$code]");
     header("Location: $url");
 
-    common_start_xml('a',
-                     '-//W3C//DTD XHTML 1.0 Strict//EN',
-                     'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd');
-    common_element('a', array('href' => $url), $url);
-    common_end_xml();
+    $xo = new XMLOutputter();
+    $xo->startXML('a',
+                  '-//W3C//DTD XHTML 1.0 Strict//EN',
+                  'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd');
+    $xo->element('a', array('href' => $url), $url);
+    $xo->endXML();
     exit;
 }
 
-function common_save_replies($notice)
-{
-    // Alternative reply format
-    $tname = false;
-    if (preg_match('/^T ([A-Z0-9]{1,64}) /', $notice->content, $match)) {
-        $tname = $match[1];
-    }
-    // extract all @messages
-    $cnt = preg_match_all('/(?:^|\s)@([a-z0-9]{1,64})/', $notice->content, $match);
-
-    $names = array();
-
-    if ($cnt || $tname) {
-        // XXX: is there another way to make an array copy?
-        $names = ($tname) ? array_unique(array_merge(array(strtolower($tname)), $match[1])) : array_unique($match[1]);
-    }
-
-    $sender = Profile::staticGet($notice->profile_id);
-
-    $replied = array();
-
-    // store replied only for first @ (what user/notice what the reply directed,
-    // we assume first @ is it)
-
-    for ($i=0; $i<count($names); $i++) {
-        $nickname = $names[$i];
-        $recipient = common_relative_profile($sender, $nickname, $notice->created);
-        if (!$recipient) {
-            continue;
-        }
-        if ($i == 0 && ($recipient->id != $sender->id) && !$notice->reply_to) { // Don't save reply to self
-            $reply_for = $recipient;
-            $recipient_notice = $reply_for->getCurrentNotice();
-            if ($recipient_notice) {
-                $orig = clone($notice);
-                $notice->reply_to = $recipient_notice->id;
-                $notice->update($orig);
-            }
-        }
-        // Don't save replies from blocked profile to local user
-        $recipient_user = User::staticGet('id', $recipient->id);
-        if ($recipient_user && $recipient_user->hasBlocked($sender)) {
-            continue;
-        }
-        $reply = new Reply();
-        $reply->notice_id = $notice->id;
-        $reply->profile_id = $recipient->id;
-        $id = $reply->insert();
-        if (!$id) {
-            $last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
-            common_log(LOG_ERR, 'DB error inserting reply: ' . $last_error->message);
-            common_server_error(sprintf(_('DB error inserting reply: %s'), $last_error->message));
-            return;
-        } else {
-            $replied[$recipient->id] = 1;
-        }
-    }
-
-    // Hash format replies, too
-    $cnt = preg_match_all('/(?:^|\s)@#([a-z0-9]{1,64})/', $notice->content, $match);
-    if ($cnt) {
-        foreach ($match[1] as $tag) {
-            $tagged = Profile_tag::getTagged($sender->id, $tag);
-            foreach ($tagged as $t) {
-                if (!$replied[$t->id]) {
-                    // Don't save replies from blocked profile to local user
-                    $t_user = User::staticGet('id', $t->id);
-                    if ($t_user && $t_user->hasBlocked($sender)) {
-                        continue;
-                    }
-                    $reply = new Reply();
-                    $reply->notice_id = $notice->id;
-                    $reply->profile_id = $t->id;
-                    $id = $reply->insert();
-                    if (!$id) {
-                        common_log_db_error($reply, 'INSERT', __FILE__);
-                        return;
-                    }
-                }
-            }
-        }
-    }
-}
-
 function common_broadcast_notice($notice, $remote=false)
 {
 
@@ -1638,30 +1545,6 @@ function common_session_token()
     return $_SESSION['token'];
 }
 
-function common_nudge_response()
-{
-    common_element('p', array('id' => 'nudge_response'), _('Nudge sent!'));
-}
-
-// XXX: Refactor this code
-function common_profile_new_message_nudge ($cur, $profile)
-{
-    $user = User::staticGet('id', $profile->id);
-
-    if ($cur && $cur->id != $user->id && $cur->mutuallySubscribed($user)) {
-        common_element_start('li', array('id' => 'profile_send_a_new_message'));
-        common_element('a', array('href' => common_local_url('newmessage', array('to' => $user->id))),
-                       _('Send a message'));
-        common_element_end('li');
-
-        if ($user->email && $user->emailnotifynudge) {
-            common_element_start('li', array('id' => 'profile_nudge'));
-            common_nudge_form($user);
-            common_element_end('li');
-        }
-    }
-}
-
 function common_cache_key($extra)
 {
     return 'laconica:' . common_keyize(common_config('site', 'name')) . ':' . $extra;
@@ -1674,47 +1557,6 @@ function common_keyize($str)
     return $str;
 }
 
-function common_message_form($content, $user, $to)
-{
-
-    common_element_start('form', array('id' => 'message_form',
-                                       'method' => 'post',
-                                       'action' => common_local_url('newmessage')));
-
-    $mutual_users = $user->mutuallySubscribedUsers();
-
-    $mutual = array();
-
-    while ($mutual_users->fetch()) {
-        if ($mutual_users->id != $user->id) {
-            $mutual[$mutual_users->id] = $mutual_users->nickname;
-        }
-    }
-
-    $mutual_users->free();
-    unset($mutual_users);
-
-    common_dropdown('to', _('To'), $mutual, null, false, $to->id);
-
-    common_element_start('p');
-
-    common_element('textarea', array('id' => 'message_content',
-                                     'cols' => 60,
-                                     'rows' => 3,
-                                     'name' => 'content'),
-                   ($content) ? $content : '');
-
-    common_element('input', array('id' => 'message_send',
-                                  'name' => 'message_send',
-                                  'type' => 'submit',
-                                  'value' => _('Send')));
-
-    common_hidden('token', common_session_token());
-
-    common_element_end('p');
-    common_element_end('form');
-}
-
 function common_memcache()
 {
     static $cache = null;
@@ -1741,39 +1583,3 @@ function common_compatible_license($from, $to)
     // XXX: better compatibility check needed here!
     return ($from == $to);
 }
-
-/* These are almost identical, so we use a helper function */
-
-function common_block_form($profile, $args=null)
-{
-    common_blocking_form('block', _('Block'), $profile, $args);
-}
-
-function common_unblock_form($profile, $args=null)
-{
-    common_blocking_form('unblock', _('Unblock'), $profile, $args);
-}
-
-function common_blocking_form($type, $label, $profile, $args=null)
-{
-    common_element_start('form', array('id' => $type . '-' . $profile->id,
-                                       'method' => 'post',
-                                       'class' => $type,
-                                       'action' => common_local_url($type)));
-    common_hidden('token', common_session_token());
-    common_element('input', array('id' => $type . 'to-' . $profile->id,
-                                  'name' => $type . 'to',
-                                  'type' => 'hidden',
-                                  'value' => $profile->id));
-    common_element('input', array('type' => 'submit',
-                                  'class' => 'submit',
-                                  'name' => $type,
-                                  'value' => $label));
-    if ($args) {
-        foreach ($args as $k => $v) {
-            common_hidden('returnto-' . $k, $v);
-        }
-    }
-    common_element_end('form');
-    return;
-}