cleanup

Code/Access/AccessControl.php

@@ -164,6 +164,6 @@ class AccessControl
      */
     public function is_private()
     {
-        return (($this->allow_cid || $this->allow_gid || $this->deny_cid || $this->deny_gid) ? true : false);
+        return $this->allow_cid || $this->allow_gid || $this->deny_cid || $this->deny_gid;
     }
 }

Code/Access/PermissionLimits.php

@@ -77,7 +77,7 @@ class PermissionLimits
      *
      * @param int $channel_id
      * @param string $perm (optional)
-     * @return
+     * @return bool|int|array
      *   * \b false if no perm_limits set for this channel
      *   * \b int if $perm is set, return one of PERMS_* constants for this permission, default 0
      *   * \b array with all permission limits, if $perm is not set

Code/Access/PermissionRoles.php

@@ -18,7 +18,7 @@ class PermissionRoles
      *
      * This must match the version in Permissions.php before permission updates can run.
      *
-     * @return number
+     * @return int
      */
     public static function version()
     {

Code/Nomad/Receiver.php

@@ -23,6 +23,10 @@ class Receiver
     protected $prvkey;
     protected $rawdata;
     protected $sigdata;
+    /**
+     * @var array|mixed
+     */
+    private mixed $hub;
 
     public function __construct($handler, $localdata = null)
     {
@@ -74,7 +78,7 @@ class Receiver
         logger('received: ' . print_r($this->data, true), LOGGER_DATA);
 
         if ($this->data && is_array($this->data)) {
-            $this->encrypted = ((array_key_exists('encrypted', $this->data) && intval($this->data['encrypted'])) ? true : false);
+            $this->encrypted = array_key_exists('encrypted', $this->data) && intval($this->data['encrypted']);
 
             if ($this->encrypted && $this->prvkey) {
                 $uncrypted = Crypto::unencapsulate($this->data, $this->prvkey);

Code/Render/Theme.php

@@ -5,7 +5,6 @@ namespace Code\Render;
 use App;
 use Code\Lib\Infocon;
 use Code\Lib\Addon;
-use Code\Render\Theme;
 use Code\Lib\Yaml;
 
 
@@ -197,7 +196,7 @@ class Theme
             try {
                 file_put_contents("view/theme/$theme.yml",Yaml::encode($info));
             }
-            catch (Exception $e) {
+            catch (\Exception $e) {
             }
         }
     

boot.php

@@ -1240,7 +1240,7 @@ class App {
     *
     * @param string $name Template engine name
     *
-    * @return void Template Engine instance
+    * @return mixed
     */
     public static function template_engine($name = '') {
         if ($name !== '') {
@@ -1994,7 +1994,7 @@ function is_site_admin() {
             return true;
         }
         // the system channel is by definition an administrator
-        if (isset(App::$sys_channel) && array_key_exists('channel_id', App::$sys_channel) && intval(App::$sys_channel['channel_id']) === local_channel()) {
+        if (isset(App::$sys_channel) && is_array(App::$sys_channel) && array_key_exists('channel_id', (array) App::$sys_channel) && intval(App::$sys_channel['channel_id']) === local_channel()) {
             return true;
         }
     }

include/api_zot.php

@@ -125,7 +125,7 @@ function api_item_export_page($type)
     }
     $finish = datetime_convert(date_default_timezone_get(), 'UTC', (($_REQUEST['until']) ? $_REQUEST['until'] : 'now'));
 
-    json_return_and_die($Channel::export_items_page(api_user(), $start, $finish, $page, $records));
+    json_return_and_die(Channel::export_items_page(api_user(), $start, $finish, $page, $records));
 }
 
 

include/bbcode.php

@@ -692,9 +692,7 @@ function bb_ShareAttributes($match)
 
     $headline .= '<span>' . $fmt . '</span></div>';
 
-    $text = $headline . '<div class="reshared-content">' . trim($match[2]) . '</div></div>';
-
-    return $text;
+    return $headline . '<div class="reshared-content">' . trim($match[2]) . '</div></div>';
 }
 
 function bb_location($match)
@@ -1415,7 +1413,7 @@ function bbtopoll($s)
     $pl['poll_id'] = $match[1];
     $pl['poll_question'] = $match[2];
 
-    $match = '';
+    $match = [];
     if (preg_match_all("/\[poll\-answer=(.*?)\](.*?)\[\/poll\-answer\]/is", $s, $match, PREG_SET_ORDER)) {
         $pl['answer'] = [];
         foreach ($match as $m) {

include/connections.php

@@ -883,10 +883,7 @@ function vcard_query(&$r)
 
 function contact_profile_assign($current)
 {
-
-    $o = '';
-
-    $o .= "<select id=\"contact-profile-selector\" name=\"profile_assign\" class=\"form-control\"/>\r\n";
+    $o = "<select id=\"contact-profile-selector\" name=\"profile_assign\" class=\"form-control\"/>\r\n";
 
     $r = q(
         "SELECT profile_guid, profile_name FROM profile WHERE uid = %d",

include/datetime.php

@@ -550,7 +550,7 @@ function z_birthday($dob, $tz, $format = "Y-m-d H:i:s")
         $t_dob = strtotime($bd);
         $now = strtotime(datetime_convert($tz, $tz, 'now'));
         if ($t_dob < $now) {
-            $bd = $y + 1 . '-' . $tmp_dob . ' 00:00';
+            $bd = sprintf("%d-%s 00:00", intval($y) + 1, $tmp_dob);
         }
 
         $birthday = datetime_convert($tz, 'UTC', $bd, $format);

include/language.php

@@ -202,7 +202,7 @@ function load_translation_table($lang, $install = false)
  *
  * @param string $s string that should get translated
  * @param string $ctx (optional) context to appear in po file
- * @return translated string if exists, otherwise return $s
+ * @return string (translated string if exists, otherwise return $s)
  *
  */
 function t($s, $ctx = '')