Merge bd255ac into 791d48f

XOOPS · Mar 31, 2022 · 46437ce · 46437ce
2 parents 791d48f + bd255ac
commit 46437ce
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/...seditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagebrowser.php b/...seditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagebrowser.php
@@ -431,7 +431,8 @@
         // get all categories
         $imagecategories = $imgcat_handler->getObjects();
         $catcount        = count($imagecategories);
-        $image_handler   = xoops_getHandler('image');
+        /** @var \XoopsImageHandler $image_handler */
+        $image_handler = xoops_getHandler('image');
         for ($i = 0; $i < $catcount; ++$i) {
             echo '<tr valign="top" align="left"><td class="head">';
             if (in_array($imagecategories[$i]->getVar('imgcat_id'), array_keys($catreadlist))) {

diff --git a/htdocs/index.php b/htdocs/index.php
@@ -64,7 +64,7 @@
     }
 
     chdir('modules/' . $xoopsConfig['startpage'] . '/');
-    xoops_loadLanguage('main', $xoopsModule->getVar('dirname', 'n'));
+    xoops_loadLanguage('main', (string)$xoopsModule->getVar('dirname', 'n'));
     $parsed = parse_url(XOOPS_URL);
     $url    = isset($parsed['scheme']) ? $parsed['scheme'] . '://' : 'http://';
     if (isset($parsed['host'])) {

diff --git a/htdocs/kernel/object.php b/htdocs/kernel/object.php
@@ -420,11 +420,11 @@ public function getValues($keys = null, $format = 's', $maxDepth = 1)
      * YOU SHOULD NOT USE ANY OF THE UNICODE TYPES, THEY WILL BE REMOVED
      *
      * @access public
-     * @param  string $key    key of the object's variable to be returned
-     * @param  string $format format to use for the output
+     * @param string      $key    key of the object's variable to be returned
+     * @param string|null $format format to use for the output
      * @return mixed  formatted value of the variable
      */
-    public function getVar($key, $format = 's')
+    public function getVar($key, $format = null)
     {
         $format = (null === $format) ? 's' : (string) $format;
         $ret = null;

diff --git a/htdocs/kernel/user.php b/htdocs/kernel/user.php
@@ -252,7 +252,7 @@ public function isActive()
     public function isOnline()
     {
         if (!isset($this->_isOnline)) {
-            /* @var XoopsOnlineHandler $online_handler */
+            /* @var XoopsOnlineHandler $onlinehandler */
             $onlinehandler   = xoops_getHandler('online');
             $this->_isOnline = ($onlinehandler->getCount(new Criteria('online_uid', $this->getVar('uid'))) > 0);// ? true : false;
         }

diff --git a/htdocs/modules/pm/admin/prune.php b/htdocs/modules/pm/admin/prune.php
@@ -23,6 +23,7 @@
 echo $indexAdmin->addNavigation(basename(__FILE__));
 
 $op         = isset($_REQUEST['op']) ? $_REQUEST['op'] : 'form';
+/** @var \PmMessageHandler $pm_handler */
 $pm_handler = xoops_getModuleHandler('message');
 
 switch ($op) {

diff --git a/htdocs/modules/pm/viewpmsg.php b/htdocs/modules/pm/viewpmsg.php
@@ -35,6 +35,7 @@
 }
 
 $start = Request::getInt('start', 0);
+/** @var \PmMessageHandler $pm_handler */
 $pm_handler = xoops_getModuleHandler('message');
 
 if (isset($_POST['delete_messages']) && (isset($_POST['msg_id']) || isset($_POST['msg_ids']))) {