many jabber queue management changes

[quix0rs-gnu-social.git] / lib / util.php

diff --git a/lib/util.php b/lib/util.php
index 0c1eed231397579e88d01dc1ad63d85d85ff2810..c6cdfbcb949ab0d447802ce55461f9b53cbd5fb3 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -132,6 +132,7 @@ function common_end_xml() {
 }
 
 function common_init_language() {
+       mb_internal_encoding('UTF-8');
        $language = common_language();
        # So we don't have to make people install the gettext locales
        putenv('LANGUAGE='.$language);
@@ -172,6 +173,8 @@ function common_show_header($pagetitle, $callable=NULL, $data=NULL, $headercall=
 
        # FIXME: correct language for interface
 
+       $language = common_language();
+       
        common_element_start('html', array('xmlns' => 'http://www.w3.org/1999/xhtml',
                                                                           'xml:lang' => $language,
                                                                           'lang' => $language));
@@ -492,6 +495,10 @@ function common_munge_password($password, $id) {
 
 # check if a username exists and has matching password
 function common_check_user($nickname, $password) {
+       # NEVER allow blank passwords, even if they match the DB
+       if (mb_strlen($password) == 0) {
+               return false;
+       }
        $user = User::staticGet('nickname', $nickname);
        if (is_null($user)) {
                return false;
@@ -987,6 +994,10 @@ function common_date_iso8601($dt) {
        return $d->format('c');
 }
 
+function common_sql_now() {
+       return strftime('%Y-%m-%d %H:%M:%S', time());
+}
+
 function common_redirect($url, $code=307) {
        static $status = array(301 => "Moved Permanently",
                                                   302 => "Found",
@@ -1059,16 +1070,19 @@ function common_broadcast_notice($notice, $remote=false) {
 # Stick the notice on the queue
 
 function common_enqueue_notice($notice) {
-       $qi = new Queue_item();
-       $qi->notice_id = $notice->id;
-       $qi->created = $notice->created;
+       foreach (array('jabber', 'omb', 'sms', 'public') as $transport) {
+               $qi = new Queue_item();
+               $qi->notice_id = $notice->id;
+               $qi->transport = $transport;
+               $qi->created = $notice->created;
         $result = $qi->insert();
-       if (!$result) {
-           $last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
-           common_log(LOG_ERR, 'DB error inserting queue item: ' . $last_error->message);
-           return false;
+               if (!$result) {
+                       $last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
+                       common_log(LOG_ERR, 'DB error inserting queue item: ' . $last_error->message);
+                       return false;
+               }
+               common_log(LOG_DEBUG, 'complete queueing notice ID = ' . $notice->id . ' for ' . $transport);
        }
-       common_log(LOG_DEBUG, 'complete queueing notice ID = ' . $notice->id);
        return $result;
 }
 
@@ -1078,7 +1092,7 @@ function common_dequeue_notice($notice) {
                 $result = $qi->delete();
                if (!$result) {
                    $last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
-                    common_log(LOG_ERROR, 'DB error deleting queue item: ' . $last_error->message);
+                    common_log(LOG_ERR, 'DB error deleting queue item: ' . $last_error->message);
                     return false;
                 }
                 common_log(LOG_DEBUG, 'complete dequeueing notice ID = ' . $notice->id);
@@ -1112,6 +1126,12 @@ function common_real_broadcast($notice, $remote=false) {
                        common_log(LOG_ERR, 'Error in sms broadcast for notice ' . $notice->id);
                }
        }
+       if ($success) {
+               $success = jabber_public_notice($notice);
+               if (!$success) {
+                       common_log(LOG_ERR, 'Error in public broadcast for notice ' . $notice->id);
+               }
+       }
        // XXX: broadcast notices to other IM
        return $success;
 }
@@ -1466,3 +1486,34 @@ function common_canonical_sms($sms) {
        preg_replace('/\D/', '', $sms);
        return $sms;
 }
+
+function common_error_handler($errno, $errstr, $errfile, $errline, $errcontext) {
+    switch ($errno) {
+     case E_USER_ERROR:
+               echo "ERROR: [$errno] $errstr ($errfile:$errline)\n";
+               echo "  Fatal error on line $errline in file $errfile";
+               echo ", PHP " . PHP_VERSION . " (" . PHP_OS . ")\n";
+               echo "Aborting...\n";
+               exit(1);
+               break;
+
+        case E_USER_WARNING:
+               echo "WARNING [$errno] $errstr ($errfile:$errline)\n";
+               break;
+
+     case E_USER_NOTICE:
+               echo "NOTICE [$errno] $errstr ($errfile:$errline)\n";
+               break;
+    }
+
+    /* Don't execute PHP internal error handler */
+    return true;
+}
+
+function common_session_token() {
+       common_ensure_session();
+       if (!array_key_exists('token', $_SESSION)) {
+               $_SESSION['token'] = common_good_rand(64);
+       }
+       return $_SESSION['token'];
+}