Merge pull request #5 from AlekVolsk/master

обеспечение совместимости с J4

Author: zikkuratvk

jllike/jllike.php

@@ -76,11 +76,13 @@ public function onAfterRender()
 
     public function onContentPrepare($context, &$article, &$params, $page = 0)
     {
-        if(JFactory::getApplication()->isAdmin())
+        if(JFactory::getApplication()->isClient('administrator'))
         {
             return true;
         }
 
+        $input = JFactory::getApplication()->input;
+
         $allowContext = array(
             'com_content.article',
             'easyblog.blog',
@@ -107,7 +109,7 @@ public function onContentPrepare($context, &$article, &$params, $page = 0)
         $autoAdd = $this->params->get('autoAdd',0);
         $sharePos = (int)$this->params->get('shares_position', 1);
         $enableOpenGraph = $this->params->get('enable_opengraph',1);
-        $option = JRequest::getCmd('option');
+        $option = $input->get('option');
         $helper = PlgJLLikeHelper::getInstance($this->params);
 
         if (strpos($article->text, '{jllike}') === false && !$autoAdd)
@@ -120,7 +122,7 @@ public function onContentPrepare($context, &$article, &$params, $page = 0)
             $article->catid = '';
         }
 
-        $print = JRequest::getInt('print', 0);
+        $print = (int) $input->get('print', 0);
 
 		$root = JURI::getInstance()->toString(array('host'));
         $url = $this->protokol . $this->params->get('pathbase', '') . str_replace('www.', '', $root);
@@ -170,7 +172,9 @@ public function onContentPrepare($context, &$article, &$params, $page = 0)
                 }
 
 
-                include_once JPATH_ROOT.'/components/com_content/helpers/route.php';
+                if (version_compare(JVERSION, '3.12.0', '<')) {
+                    include_once JPATH_ROOT.'/components/com_content/helpers/route.php';
+                }
                 $link = $url . JRoute::_(ContentHelperRoute::getArticleRoute($article->slug, $article->catid));
 
                 $image = '';
@@ -207,7 +211,7 @@ public function onContentPrepare($context, &$article, &$params, $page = 0)
 
                 if ($context == 'com_content.article')
                 {
-                    $view = JRequest::getCmd('view');
+                    $view = $input->get('view');
                     if ($view == 'article')
                     {
                         if ($autoAdd == 1 || strpos($article->text, '{jllike}') == true)
@@ -266,7 +270,7 @@ public function onContentPrepare($context, &$article, &$params, $page = 0)
                 if (($context == 'easyblog.blog') && ($this->params->get('easyblogshow', 0) == 1))
                 {
 					$allow_in_category = $this->params->get('allow_in_category', 0);
-					$isCategory = (JRequest::getCmd('view', '') == 'entry') ? false : true;
+					$isCategory = ($input->get('view', '') == 'entry') ? false : true;
 
 					if(!$allow_in_category && $isCategory)
 					{
@@ -310,4 +314,4 @@ public function onContentPrepare($context, &$article, &$params, $page = 0)
                 break;
         }
     }
-}
+}

jllikeads/jllikeads.php

@@ -24,7 +24,7 @@ public function ADSonContentAfterDisplay($content)
         $plugin = & JPluginHelper::getPlugin('content', 'jllike');
         $plgParams = new JRegistry;
         $plgParams->loadString($plugin->params);
-        $view = JRequest::getCmd('view');
+        $view = JFactory::getApplication()->input->get('view');
         $ADSShow = $plgParams->get('adscontent', 0);
 
         if (!$ADSShow || $view != 'details')

jllikek2/jllike.php

@@ -86,7 +86,7 @@ private function enableShow()
         $layout = $input->getString('layout','');
         $task = $input->getString('task','');
 
-        if(!$app->isAdmin() && ($view == 'itemlist' || ($view == 'item' && ($layout == 'item' || !$layout))) && $task != 'edit' && $task != 'add')
+        if(!$app->isClient('administrator') && ($view == 'itemlist' || ($view == 'item' && ($layout == 'item' || !$layout))) && $task != 'edit' && $task != 'add')
 		{
             return true;
         }