Merge branch 'master' of /var/www/mublog

Conflicts:

	actions/api.php
	actions/deletenotice.php
	actions/recoverpassword.php
	actions/remotesubscribe.php
	actions/tag.php
	actions/tagrss.php
	actions/twitapiaccount.php
	actions/twitapiusers.php
	classes/Notice.php
	classes/User.php
	lib/common.php
	lib/language.php
	lib/subs.php
	lib/twitterapi.php
	lib/util.php
	scripts/inbox_users.php
	scripts/update_translations.php

Merged development trunk into laconica head. woohoo!

1 files changed, 125 insertions, 114 deletions

diff --git a/lib/daemon.php b/lib/daemon.php
index 359a4343b..9c1ae50a0 100644
--- a/lib/daemon.php
+++ b/lib/daemon.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * Laconica - a distributed open-source microblogging tool
  * Copyright (C) 2008, Controlez-Vous, Inc.
  *
@@ -17,117 +17,128 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
-
-class Daemon {
-
-	function name() {
-		return NULL;
-	}
-	
-	function background() {
-		$pid = pcntl_fork();
-		if ($pid < 0) { # error
-			common_log(LOG_ERR, "Could not fork.");
-			return false;
-		} else if ($pid > 0) { # parent
-			common_log(LOG_INFO, "Successfully forked.");
-			exit(0);
-		} else { # child
-			return true;
-		}
-	}
-
-	function alreadyRunning() {
-
-		$pidfilename = $this->pidFilename();
-
-		if (!$pidfilename) {
-			return false;
-		}
-		
-		if (!file_exists($pidfilename)) {
-			return false;
-		}
-		$contents = file_get_contents($pidfilename);
-		if (posix_kill(trim($contents),0)) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-	
-	function writePidFile() {
-		$pidfilename = $this->pidFilename();
-		
-		if (!$pidfilename) {
-			return false;
-		}
-		
-	    return file_put_contents($pidfilename, posix_getpid() . "\n");
-	}
-
-	function clearPidFile() {
-		$pidfilename = $this->pidFilename();
-	        if (!$pidfilename) {
-		    return false;
-		}
-	        return unlink($pidfilename);
-	}
-	
-	function pidFilename() {
-		$piddir = common_config('daemon', 'piddir');
-		if (!$piddir) {
-			return NULL;
-		}
-		$name = $this->name();
-		if (!$name) {
-			return NULL;
-		}
-		return $piddir . '/' . $name . '.pid';
-	}
-
-	function changeUser() {
-
-		$username = common_config('daemon', 'user');
-		
-		if ($username) {
-			$user_info = posix_getpwnam($username);
-			if (!$user_info) {
-				common_log(LOG_WARNING, 'Ignoring unknown user for daemon: ' . $username);
-			} else {
-				common_log(LOG_INFO, "Setting user to " . $username);
-				posix_setuid($user_info['uid']);
-			}
-		}
-
-		$groupname = common_config('daemon', 'group');
-		
-		if ($groupname) {
-			$group_info = posix_getgrnam($groupname);
-			if (!$group_info) {
-				common_log(LOG_WARNING, 'Ignoring unknown group for daemon: ' . $groupname);
-			} else {
-				common_log(LOG_INFO, "Setting group to " . $groupname);
-				posix_setgid($group_info['gid']);
-			}
-		}
-	}
-	
-	function runOnce() {
-		if ($this->alreadyRunning()) {
-			common_log(LOG_INFO, $this->name() . ' already running. Exiting.');
-			exit(0);
-		}
-		if ($this->background()) {
-			$this->writePidFile();
-			$this->changeUser();
-			$this->run();
-			$this->clearPidFile();
-		}
-	}
-	
-	function run() {
-		return true;
-	}
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+class Daemon
+{
+    function name()
+    {
+        return null;
+    }
+
+    function background()
+    {
+        $pid = pcntl_fork();
+        if ($pid < 0) { // error
+            common_log(LOG_ERR, "Could not fork.");
+            return false;
+        } else if ($pid > 0) { // parent
+            common_log(LOG_INFO, "Successfully forked.");
+            exit(0);
+        } else { // child
+            return true;
+        }
+    }
+
+    function alreadyRunning()
+    {
+        $pidfilename = $this->pidFilename();
+
+        if (!$pidfilename) {
+            return false;
+        }
+
+        if (!file_exists($pidfilename)) {
+            return false;
+        }
+        $contents = file_get_contents($pidfilename);
+        if (posix_kill(trim($contents), 0)) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    function writePidFile()
+    {
+        $pidfilename = $this->pidFilename();
+
+        if (!$pidfilename) {
+            return false;
+        }
+
+        return file_put_contents($pidfilename, posix_getpid() . "\n");
+    }
+
+    function clearPidFile()
+    {
+        $pidfilename = $this->pidFilename();
+        if (!$pidfilename) {
+            return false;
+        }
+        return unlink($pidfilename);
+    }
+
+    function pidFilename()
+    {
+        $piddir = common_config('daemon', 'piddir');
+        if (!$piddir) {
+            return null;
+        }
+        $name = $this->name();
+        if (!$name) {
+            return null;
+        }
+        return $piddir . '/' . $name . '.pid';
+    }
+
+    function changeUser()
+    {
+        $username = common_config('daemon', 'user');
+
+        if ($username) {
+            $user_info = posix_getpwnam($username);
+            if (!$user_info) {
+                common_log(LOG_WARNING,
+                           'Ignoring unknown user for daemon: ' . $username);
+            } else {
+                common_log(LOG_INFO, "Setting user to " . $username);
+                posix_setuid($user_info['uid']);
+            }
+        }
+
+        $groupname = common_config('daemon', 'group');
+
+        if ($groupname) {
+            $group_info = posix_getgrnam($groupname);
+            if (!$group_info) {
+                common_log(LOG_WARNING,
+                           'Ignoring unknown group for daemon: ' . $groupname);
+            } else {
+                common_log(LOG_INFO, "Setting group to " . $groupname);
+                posix_setgid($group_info['gid']);
+            }
+        }
+    }
+
+    function runOnce()
+    {
+        if ($this->alreadyRunning()) {
+            common_log(LOG_INFO, $this->name() . ' already running. Exiting.');
+            exit(0);
+        }
+        if ($this->background()) {
+            $this->writePidFile();
+            $this->changeUser();
+            $this->run();
+            $this->clearPidFile();
+        }
+    }
+
+    function run()
+    {
+        return true;
+    }
 }