Merge pull request #3112 from Quix0r/rewrites/coding-convention

Coding convention applied - part 1

diff --cc include/discover_poco.php
Simple merge

diff --cc include/socgraph.php
index f43ad62d088c71a829bb0342ed18775145333cc7,4dedd33d398f22a600c2b1112580204236c963d0..b1390980e94dd14b79650d49b16025f55cadb3e3
--- 1/include/socgraph.php
--- 2/include/socgraph.php
+++ b/include/socgraph.php
@@@ -32,25 -27,16 +32,25 @@@ require_once("include/Photo.php")
   * pointing to the same global contact id.
   *
   */
 +function poco_load($cid, $uid = 0, $zcid = 0, $url = null) {
 +      // Call the function "poco_load_worker" via the worker
 +      proc_run(PRIORITY_LOW, "include/discover_poco.php", "poco_load", $cid, $uid, $zcid, base64_encode($url));
 +}
  
 -
 -
 -
 -function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
 -
 +/**
 + * @brief Fetch POCO data from the worker
 + *
 + * @param integer $cid Contact ID
 + * @param integer $uid User ID
 + * @param integer $zcid Global Contact ID
 + * @param integer $url POCO address that should be polled
 + *
 + */
 +function poco_load_worker($cid, $uid, $zcid, $url) {
        $a = get_app();
  
-       if($cid) {
-               if((! $url) || (! $uid)) {
+       if ($cid) {
+               if ((! $url) || (! $uid)) {
                        $r = q("select `poco`, `uid` from `contact` where `id` = %d limit 1",
                                intval($cid)
                        );