@@ -61,8 +61,7 @@ |
||
61 | 61 | $conn->bind('disconnect', function() use ($app) { |
62 | 62 | $app->connect(); |
63 | 63 | }); |
64 | - } |
|
65 | - else { |
|
64 | + } else { |
|
66 | 65 | Daemon::log('IRCBot: unable to connect ('.$this->config->url->value.')'); |
67 | 66 | } |
68 | 67 | }); |
@@ -41,8 +41,7 @@ |
||
41 | 41 | |
42 | 42 | if ($cmd === 'ping') { |
43 | 43 | $this->writeln('pong'); |
44 | - } |
|
45 | - elseif ( |
|
44 | + } elseif ( |
|
46 | 45 | ($cmd === 'exit') |
47 | 46 | || ($cmd === 'quit') |
48 | 47 | ) { |
@@ -57,8 +57,7 @@ |
||
57 | 57 | $conn->addEventHandler('disconnect', function() use ($app) { |
58 | 58 | $app->connect(); |
59 | 59 | }); |
60 | - } |
|
61 | - else { |
|
60 | + } else { |
|
62 | 61 | Daemon::log('Jabberbot: unable to connect ('.$this->config->url->value.')'); |
63 | 62 | } |
64 | 63 | }); |
@@ -42,8 +42,7 @@ |
||
42 | 42 | $req->wakeup(); |
43 | 43 | $event->finish(); |
44 | 44 | }, pow(10,6) * 1); |
45 | - } |
|
46 | - else { |
|
45 | + } else { |
|
47 | 46 | $req->out(':-('); |
48 | 47 | $req->wakeup(); |
49 | 48 | } |
@@ -14,13 +14,13 @@ discard block |
||
14 | 14 | * |
15 | 15 | * @return void |
16 | 16 | */ |
17 | - public function onReady() { |
|
17 | + public function onReady() { |
|
18 | 18 | |
19 | - // Adding listener |
|
20 | - // ComplexJob - STATE_WAITING |
|
21 | - $job = new ComplexJob(function($job) { |
|
22 | - // ComplexJob - STATE_DONE |
|
23 | - /*array ( |
|
19 | + // Adding listener |
|
20 | + // ComplexJob - STATE_WAITING |
|
21 | + $job = new ComplexJob(function($job) { |
|
22 | + // ComplexJob - STATE_DONE |
|
23 | + /*array ( |
|
24 | 24 | 'bar' => |
25 | 25 | array ( |
26 | 26 | 'job' => 'bar', |
@@ -44,62 +44,62 @@ discard block |
||
44 | 44 | 'line' => 94, |
45 | 45 | ), |
46 | 46 | )*/ |
47 | - Daemon::log($job->results); |
|
48 | - }); |
|
47 | + Daemon::log($job->results); |
|
48 | + }); |
|
49 | 49 | |
50 | - // Adding listener |
|
51 | - // ComplexJob - STATE_WAITING |
|
52 | - $job->addListener(function($job) { |
|
50 | + // Adding listener |
|
51 | + // ComplexJob - STATE_WAITING |
|
52 | + $job->addListener(function($job) { |
|
53 | 53 | // ComplexJob - STATE_DONE |
54 | - }); |
|
54 | + }); |
|
55 | 55 | |
56 | - // Incapsulate some property in job |
|
57 | - $job->appInstance = $this; |
|
56 | + // Incapsulate some property in job |
|
57 | + $job->appInstance = $this; |
|
58 | 58 | |
59 | - // Adding async job foo |
|
60 | - $job('foo', $this->foo(array('param' => 'value'))); |
|
59 | + // Adding async job foo |
|
60 | + $job('foo', $this->foo(array('param' => 'value'))); |
|
61 | 61 | |
62 | - // Adding with 1 sec delay |
|
63 | - Timer::add(function($event) use ($job) { |
|
62 | + // Adding with 1 sec delay |
|
63 | + Timer::add(function($event) use ($job) { |
|
64 | 64 | |
65 | - // Adding async job bar |
|
66 | - $job('bar', function($jobname, $job) { |
|
67 | - Timer::add(function($event) use($jobname, $job) { |
|
68 | - // Job done |
|
69 | - $job->setResult($jobname, array('job' => 'bar', 'success' => false, 'line' => __LINE__)); |
|
70 | - $event->finish(); |
|
71 | - }, 1e3 * 50); |
|
72 | - }); |
|
65 | + // Adding async job bar |
|
66 | + $job('bar', function($jobname, $job) { |
|
67 | + Timer::add(function($event) use($jobname, $job) { |
|
68 | + // Job done |
|
69 | + $job->setResult($jobname, array('job' => 'bar', 'success' => false, 'line' => __LINE__)); |
|
70 | + $event->finish(); |
|
71 | + }, 1e3 * 50); |
|
72 | + }); |
|
73 | 73 | |
74 | - // Adding async job baz. Equal $job('baz', $job->appInstance->baz()); |
|
75 | - $job->addJob('baz', $job->appInstance->baz()); |
|
74 | + // Adding async job baz. Equal $job('baz', $job->appInstance->baz()); |
|
75 | + $job->addJob('baz', $job->appInstance->baz()); |
|
76 | 76 | |
77 | - // Run jobs. All listeners will be called when the jobs done |
|
78 | - // ComplexJob - STATE_RUNNING |
|
79 | - $job(); |
|
77 | + // Run jobs. All listeners will be called when the jobs done |
|
78 | + // ComplexJob - STATE_RUNNING |
|
79 | + $job(); |
|
80 | 80 | |
81 | - $event->finish(); |
|
82 | - }, 1e6 * 1); |
|
81 | + $event->finish(); |
|
82 | + }, 1e6 * 1); |
|
83 | 83 | |
84 | - } |
|
84 | + } |
|
85 | 85 | |
86 | - final public function foo($arg) { |
|
87 | - return function($jobname, $job) use ($arg) { |
|
88 | - Timer::add(function($event) use($jobname, $job, $arg) { |
|
89 | - // Job done |
|
90 | - $job->setResult($jobname, array('job' => 'foo', 'success' => true, 'line' => __LINE__, 'arg' => $arg)); |
|
91 | - $event->finish(); |
|
92 | - }, 1e3 * 100); |
|
93 | - }; |
|
94 | - } |
|
86 | + final public function foo($arg) { |
|
87 | + return function($jobname, $job) use ($arg) { |
|
88 | + Timer::add(function($event) use($jobname, $job, $arg) { |
|
89 | + // Job done |
|
90 | + $job->setResult($jobname, array('job' => 'foo', 'success' => true, 'line' => __LINE__, 'arg' => $arg)); |
|
91 | + $event->finish(); |
|
92 | + }, 1e3 * 100); |
|
93 | + }; |
|
94 | + } |
|
95 | 95 | |
96 | - final public function baz() { |
|
97 | - return function($jobname, $job) { |
|
98 | - Timer::add(function($event) use($jobname, $job) { |
|
99 | - // Job done |
|
100 | - $job->setResult($jobname, array('job' => 'baz', 'success' => false, 'line' => __LINE__)); |
|
101 | - $event->finish(); |
|
102 | - }, 1e3 * 300); |
|
103 | - }; |
|
104 | - } |
|
96 | + final public function baz() { |
|
97 | + return function($jobname, $job) { |
|
98 | + Timer::add(function($event) use($jobname, $job) { |
|
99 | + // Job done |
|
100 | + $job->setResult($jobname, array('job' => 'baz', 'success' => false, 'line' => __LINE__)); |
|
101 | + $event->finish(); |
|
102 | + }, 1e3 * 300); |
|
103 | + }; |
|
104 | + } |
|
105 | 105 | } |
@@ -21,7 +21,7 @@ |
||
21 | 21 | * Called when new data received |
22 | 22 | * @param string New data |
23 | 23 | * @return void |
24 | - */ |
|
24 | + */ |
|
25 | 25 | public function stdin($buf) { |
26 | 26 | $this->buf .= $buf; |
27 | 27 |
@@ -38,15 +38,13 @@ |
||
38 | 38 | $this->result = ''; |
39 | 39 | $this->state = self::STATE_DATA; |
40 | 40 | break; |
41 | - } |
|
42 | - elseif ($e[0] == 'STAT') { |
|
41 | + } elseif ($e[0] == 'STAT') { |
|
43 | 42 | if ($this->result === NULL) { |
44 | 43 | $this->result = array(); |
45 | 44 | } |
46 | 45 | |
47 | 46 | $this->result[$e[1]] = $e[2]; |
48 | - } |
|
49 | - elseif ( |
|
47 | + } elseif ( |
|
50 | 48 | ($e[0] === 'STORED') |
51 | 49 | || ($e[0] === 'END') |
52 | 50 | || ($e[0] === 'DELETED') |
@@ -91,8 +91,7 @@ |
||
91 | 91 | if ($this->acquireOnGet) { |
92 | 92 | $free->detach($conn); |
93 | 93 | } |
94 | - } |
|
95 | - elseif ($storage->count() >= $this->maxConnPerServ) { |
|
94 | + } elseif ($storage->count() >= $this->maxConnPerServ) { |
|
96 | 95 | if (!isset($this->pending[$url])) { |
97 | 96 | $this->pending[$url] = new PriorityQueueCallbacks; |
98 | 97 | } |
@@ -101,14 +101,14 @@ discard block |
||
101 | 101 | } |
102 | 102 | |
103 | 103 | /** |
104 | - * |
|
105 | - * Add given contact to roster |
|
106 | - * |
|
107 | - * @param string $jid |
|
108 | - * @param string $subscription |
|
109 | - * @param string $name |
|
110 | - * @param array $groups |
|
111 | - */ |
|
104 | + * |
|
105 | + * Add given contact to roster |
|
106 | + * |
|
107 | + * @param string $jid |
|
108 | + * @param string $subscription |
|
109 | + * @param string $name |
|
110 | + * @param array $groups |
|
111 | + */ |
|
112 | 112 | public function _addContact($jid, $subscription, $name='', $groups=array()) { |
113 | 113 | $contact = array('jid' => $jid, 'subscription' => $subscription, 'name' => $name, 'groups' => $groups); |
114 | 114 | if ($this->isContact($jid)) { |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | * @param integer $priority |
149 | 149 | * @param string $show |
150 | 150 | * @param string $status |
151 | - */ |
|
151 | + */ |
|
152 | 152 | public function setPresence($presence, $priority, $show, $status) { |
153 | 153 | list($jid, $resource) = explode('/', $presence . '/'); |
154 | 154 | if ($show != 'unavailable') { |
@@ -282,8 +282,7 @@ discard block |
||
282 | 282 | if (posix_getuid() != 0) { |
283 | 283 | Daemon::log('You must have the root privileges to change root.'); |
284 | 284 | exit(0); |
285 | - } |
|
286 | - elseif (!chroot(Daemon::$config->chroot->value)) { |
|
285 | + } elseif (!chroot(Daemon::$config->chroot->value)) { |
|
287 | 286 | Daemon::log('Couldn\'t change root to \'' . Daemon::$config->chroot->value . '\'.'); |
288 | 287 | exit(0); |
289 | 288 | } |
@@ -293,8 +292,7 @@ discard block |
||
293 | 292 | if ($sg === FALSE) { |
294 | 293 | Daemon::log('Couldn\'t change group to \'' . Daemon::$config->group->value . '\'. You must replace config-variable \'group\' with existing group.'); |
295 | 294 | exit(0); |
296 | - } |
|
297 | - elseif ( |
|
295 | + } elseif ( |
|
298 | 296 | ($sg['gid'] != posix_getgid()) |
299 | 297 | && (!posix_setgid($sg['gid'])) |
300 | 298 | ) { |
@@ -307,8 +305,7 @@ discard block |
||
307 | 305 | if ($su === FALSE) { |
308 | 306 | Daemon::log('Couldn\'t change user to \'' . Daemon::$config->user->value . '\', user not found. You must replace config-variable \'user\' with existing username.'); |
309 | 307 | exit(0); |
310 | - } |
|
311 | - elseif ( |
|
308 | + } elseif ( |
|
312 | 309 | ($su['uid'] != posix_getuid()) |
313 | 310 | && (!posix_setuid($su['uid'])) |
314 | 311 | ) { |
@@ -476,8 +473,7 @@ discard block |
||
476 | 473 | } |
477 | 474 | if (!$self->reloadReady) { |
478 | 475 | $event->timeout(); |
479 | - } |
|
480 | - else { |
|
476 | + } else { |
|
481 | 477 | $self->eventBase->exit(); |
482 | 478 | } |
483 | 479 | }, 1e6, 'checkReloadReady'); |