deleted file mode 100644

@@ -1,114 +0,0 @@

-<?php

-

-declare(strict_types=1);

-

-/*

- * This file is part of Oveleon ContaoMemberExtension Bundle.

- *

- * @package     contao-member-extension-bundle

- * @license     MIT

- * @author      Sebastian Zoglowek     <https://github.com/zoglo>

- * @author      Daniele Sciannimanica  <https://github.com/doishub>

- * @author      Fabian Ekert           <https://github.com/eki89>

- * @copyright   Oveleon                <https://www.oveleon.de/>

- */

-

-namespace Oveleon\ContaoMemberExtensionBundle;

-

-use Contao\BackendTemplate;

-use Contao\Config;

-use Contao\CoreBundle\Exception\PageNotFoundException;

-use Contao\Environment;

-use Contao\FrontendTemplate;

-use Contao\Input;

-use Contao\MemberModel;

-use Contao\StringUtil;

-use Contao\System;

-

-/**

- * Class ModuleMemberList

- * 

- * @property string $ext_groups considered member groups

- * @property string $memberFields Fields to be displayed

- * @property string $memberReaderTpl Frontend reader template

- */

-class ModuleMemberReader extends ModuleMemberExtension

-{

-

-    /**

-     * Template

-     * @var string

-     */

-    protected $strTemplate = 'mod_memberReader';

-

-    /**

-     * Template

-     * @var string

-     */

-    protected $strMemberTemplate = 'memberExtension_reader_full';

-

-    /**

-     * Display a wildcard in the back end

-     *

-     * @return string

-     */

-    public function generate()

-    {

-        $container = System::getContainer();

-        $request = System::getContainer()->get('request_stack')->getCurrentRequest();

-

-        if ($request && $container->get('contao.routing.scope_matcher')->isBackendRequest($request))

-        {

-            $objTemplate = new BackendTemplate('be_wildcard');

-            $objTemplate->wildcard = '### ' . $GLOBALS['TL_LANG']['FMD']['memberList'][0] . ' ###';

-            $objTemplate->title = $this->headline;

-            $objTemplate->id = $this->id;

-            $objTemplate->link = $this->name;

-            $objTemplate->href = StringUtil::specialcharsUrl(System::getContainer()->get('router')->generate('contao_backend', ['do'=>'themes', 'table'=>'tl_module', 'act'=>'edit', 'id'=>$this->id]));

-

-            return $objTemplate->parse();

-        }

-

-        // Set the item from the auto_item parameter

-        if (!isset($_GET['items']) && isset($_GET['auto_item']) && Config::get('useAutoItem'))

-        {

-            Input::setGet('items', Input::get('auto_item'));

-        }

-

-        return parent::generate();

-    }

-

-    /**

-     * Generate the module

-     */

-    protected function compile()

-    {

-        $this->Template->referer = 'javascript:history.go(-1)';

-        $this->Template->back = $GLOBALS['TL_LANG']['MSC']['goBack'];

-

-        // Get the member

-        $objMember = MemberModel::findByIdOrAlias(Input::get('items'));

-

-        // The member does not exist and is not deactivated

-        if ($objMember === null || $objMember->disable)

-        {

-            throw new PageNotFoundException('Page not found: ' . Environment::get('uri'));

-        }

-

-        // Check for group intersection

-        $arrGroups = StringUtil::deserialize($this->ext_groups);

-        $memberGroups = StringUtil::deserialize($objMember->groups);

-

-        if (empty($arrGroups) || !\is_array($arrGroups) || !\count(array_intersect($arrGroups, $memberGroups)))

-        {

-            throw new PageNotFoundException('Page not found: ' . Environment::get('uri'));

-        }

-

-        $arrMemberFields = StringUtil::deserialize($this->memberFields, true);

-

-        $objTemplate = new FrontendTemplate($this->memberReaderTpl ?: $this->strMemberTemplate);

-        $objTemplate->setData($objMember->row());

-

-        $this->Template->member = $this->parseMemberTemplate($objMember, $objTemplate, $arrMemberFields, $this->imgSize);

-    }

-}

@@ -48,22 +48,23 @@ class ModuleMemberReader extends ModuleMemberExtension

     protected $strMemberTemplate = 'memberExtension_reader_full';

     /**

-     * Return a wildcard in the back end

+     * Display a wildcard in the back end

      *

      * @return string

      */

     public function generate()

     {

+        $container = System::getContainer();

         $request = System::getContainer()->get('request_stack')->getCurrentRequest();

-        if ($request && System::getContainer()->get('contao.routing.scope_matcher')->isBackendRequest($request))

+        if ($request && $container->get('contao.routing.scope_matcher')->isBackendRequest($request))

         {

             $objTemplate = new BackendTemplate('be_wildcard');

-            $objTemplate->wildcard = '### ' . mb_strtoupper($GLOBALS['TL_LANG']['FMD']['memberList'][0], 'UTF-8') . ' ###';

+            $objTemplate->wildcard = '### ' . $GLOBALS['TL_LANG']['FMD']['memberList'][0] . ' ###';

             $objTemplate->title = $this->headline;

             $objTemplate->id = $this->id;

             $objTemplate->link = $this->name;

-            $objTemplate->href = 'contao/main.php?do=themes&table=tl_module&act=edit&id=' . $this->id;

+            $objTemplate->href = StringUtil::specialcharsUrl(System::getContainer()->get('router')->generate('contao_backend', ['do'=>'themes', 'table'=>'tl_module', 'act'=>'edit', 'id'=>$this->id]));

             return $objTemplate->parse();

         }

@@ -35,38 +35,38 @@ use Contao\System;

 class ModuleMemberReader extends ModuleMemberExtension

 {

-	/**

-	 * Template

-	 * @var string

-	 */

-	protected $strTemplate = 'mod_memberReader';

-

-	/**

-	 * Template

-	 * @var string

-	 */

-	protected $strMemberTemplate = 'memberExtension_reader_full';

-

-	/**

-	 * Return a wildcard in the back end

-	 *

-	 * @return string

-	 */

-	public function generate()

-	{

+    /**

+     * Template

+     * @var string

+     */

+    protected $strTemplate = 'mod_memberReader';

+

+    /**

+     * Template

+     * @var string

+     */

+    protected $strMemberTemplate = 'memberExtension_reader_full';

+

+    /**

+     * Return a wildcard in the back end

+     *

+     * @return string

+     */

+    public function generate()

+    {

         $request = System::getContainer()->get('request_stack')->getCurrentRequest();

         if ($request && System::getContainer()->get('contao.routing.scope_matcher')->isBackendRequest($request))

         {

             $objTemplate = new BackendTemplate('be_wildcard');

-			$objTemplate->wildcard = '### ' . mb_strtoupper($GLOBALS['TL_LANG']['FMD']['memberList'][0], 'UTF-8') . ' ###';

-			$objTemplate->title = $this->headline;

-			$objTemplate->id = $this->id;

-			$objTemplate->link = $this->name;

-			$objTemplate->href = 'contao/main.php?do=themes&table=tl_module&act=edit&id=' . $this->id;

+            $objTemplate->wildcard = '### ' . mb_strtoupper($GLOBALS['TL_LANG']['FMD']['memberList'][0], 'UTF-8') . ' ###';

+            $objTemplate->title = $this->headline;

+            $objTemplate->id = $this->id;

+            $objTemplate->link = $this->name;

+            $objTemplate->href = 'contao/main.php?do=themes&table=tl_module&act=edit&id=' . $this->id;

-			return $objTemplate->parse();

-		}

+            return $objTemplate->parse();

+        }

         // Set the item from the auto_item parameter

         if (!isset($_GET['items']) && isset($_GET['auto_item']) && Config::get('useAutoItem'))

@@ -74,14 +74,14 @@ class ModuleMemberReader extends ModuleMemberExtension

             Input::setGet('items', Input::get('auto_item'));

         }

-		return parent::generate();

-	}

+        return parent::generate();

+    }

-	/**

-	 * Generate the module

-	 */

-	protected function compile()

-	{

+    /**

+     * Generate the module

+     */

+    protected function compile()

+    {

         $this->Template->referer = 'javascript:history.go(-1)';

         $this->Template->back = $GLOBALS['TL_LANG']['MSC']['goBack'];

@@ -109,5 +109,5 @@ class ModuleMemberReader extends ModuleMemberExtension

         $objTemplate->setData($objMember->row());

         $this->Template->member = $this->parseMemberTemplate($objMember, $objTemplate, $arrMemberFields, $this->imgSize);

-	}

+    }

 }

@@ -7,10 +7,10 @@ declare(strict_types=1);

  *

  * @package     contao-member-extension-bundle

  * @license     MIT

- * @author      Daniele Sciannimanica   <https://github.com/doishub>

- * @author      Fabian Ekert            <https://github.com/eki89>

- * @author      Sebastian Zoglowek      <https://github.com/zoglo>

- * @copyright   Oveleon                 <https://www.oveleon.de/>

+ * @author      Sebastian Zoglowek     <https://github.com/zoglo>

+ * @author      Daniele Sciannimanica  <https://github.com/doishub>

+ * @author      Fabian Ekert           <https://github.com/eki89>

+ * @copyright   Oveleon                <https://www.oveleon.de/>

  */

 namespace Oveleon\ContaoMemberExtensionBundle;

new file mode 100644

@@ -0,0 +1,113 @@

+<?php

+

+declare(strict_types=1);

+

+/*

+ * This file is part of Oveleon ContaoMemberExtension Bundle.

+ *

+ * @package     contao-member-extension-bundle

+ * @license     MIT

+ * @author      Daniele Sciannimanica   <https://github.com/doishub>

+ * @author      Fabian Ekert            <https://github.com/eki89>

+ * @author      Sebastian Zoglowek      <https://github.com/zoglo>

+ * @copyright   Oveleon                 <https://www.oveleon.de/>

+ */

+

+namespace Oveleon\ContaoMemberExtensionBundle;

+

+use Contao\BackendTemplate;

+use Contao\Config;

+use Contao\CoreBundle\Exception\PageNotFoundException;

+use Contao\Environment;

+use Contao\FrontendTemplate;

+use Contao\Input;

+use Contao\MemberModel;

+use Contao\StringUtil;

+use Contao\System;

+

+/**

+ * Class ModuleMemberList

+ * 

+ * @property string $ext_groups considered member groups

+ * @property string $memberFields Fields to be displayed

+ * @property string $memberReaderTpl Frontend reader template

+ */

+class ModuleMemberReader extends ModuleMemberExtension

+{

+

+	/**

+	 * Template

+	 * @var string

+	 */

+	protected $strTemplate = 'mod_memberReader';

+

+	/**

+	 * Template

+	 * @var string

+	 */

+	protected $strMemberTemplate = 'memberExtension_reader_full';

+

+	/**

+	 * Return a wildcard in the back end

+	 *

+	 * @return string

+	 */

+	public function generate()

+	{

+        $request = System::getContainer()->get('request_stack')->getCurrentRequest();

+

+        if ($request && System::getContainer()->get('contao.routing.scope_matcher')->isBackendRequest($request))

+        {

+            $objTemplate = new BackendTemplate('be_wildcard');

+			$objTemplate->wildcard = '### ' . mb_strtoupper($GLOBALS['TL_LANG']['FMD']['memberList'][0], 'UTF-8') . ' ###';

+			$objTemplate->title = $this->headline;

+			$objTemplate->id = $this->id;

+			$objTemplate->link = $this->name;

+			$objTemplate->href = 'contao/main.php?do=themes&table=tl_module&act=edit&id=' . $this->id;

+

+			return $objTemplate->parse();

+		}

+

+        // Set the item from the auto_item parameter

+        if (!isset($_GET['items']) && isset($_GET['auto_item']) && Config::get('useAutoItem'))

+        {

+            Input::setGet('items', Input::get('auto_item'));

+        }

+

+		return parent::generate();

+	}

+

+	/**

+	 * Generate the module

+	 */

+	protected function compile()

+	{

+        $this->Template->referer = 'javascript:history.go(-1)';

+        $this->Template->back = $GLOBALS['TL_LANG']['MSC']['goBack'];

+

+        // Get the member

+        $objMember = MemberModel::findByIdOrAlias(Input::get('items'));

+

+        // The member does not exist and is not deactivated

+        if ($objMember === null || $objMember->disable)

+        {

+            throw new PageNotFoundException('Page not found: ' . Environment::get('uri'));

+        }

+

+        // Check for group intersection

+        $arrGroups = StringUtil::deserialize($this->ext_groups);

+        $memberGroups = StringUtil::deserialize($objMember->groups);

+

+        if (empty($arrGroups) || !\is_array($arrGroups) || !\count(array_intersect($arrGroups, $memberGroups)))

+        {

+            throw new PageNotFoundException('Page not found: ' . Environment::get('uri'));

+        }

+

+        $arrMemberFields = StringUtil::deserialize($this->memberFields, true);

+

+        $objTemplate = new FrontendTemplate($this->memberReaderTpl ?: $this->strMemberTemplate);

+        $objTemplate->setData($objMember->row());

+

+        $this->Template->member = $this->parseMemberTemplate($objMember, $objTemplate, $arrMemberFields, $this->imgSize);

+	}

+}