local

Author: Sajaki

CHANGELOG.md

@@ -1,6 +1,11 @@
-
 ### Changelog
 
+
+- 2.2.8 (10/06/2018)
+  - [FIX] #82 RT FIX
+  - [FIX] make curl https compatible
+  - [FIX] #108 poll layout issue
+
 - 2.2.7 (25/02/2018) 
   - [NEW] #82 recent topics is now available on a special page http://url/app.php/rt
   - [CHG] now uses phpbb 3.2 language class

acp/recenttopics_info.php

@@ -23,7 +23,7 @@ class recenttopics_info
 	public function module()
 	{
 		return array(
-		'filename'    => '\paybas\recenttopics\recenttopics_module',
+		'filename'    => '\paybas\recenttopics\acp\recenttopics_module',
 		'title'        => 'RECENT_TOPICS',
 		'modes'        => array(
 		'recenttopics_config' => array('title' => 'RT_CONFIG', 'auth' => 'ext_paybas/recenttopics && acl_a_board', 'cat' => array('RECENT_TOPICS')),

acp/recenttopics_module.php

@@ -45,8 +45,7 @@ public function main($id, $mode)
 		$ext_meta_manager = $ext_manager->create_extension_metadata_manager('paybas/recenttopics', $phpbb_container->get('template'));
 		$meta_data  = $ext_meta_manager->get_metadata();
 		$ext_version  = $meta_data['version'];
-		$versionurl = $meta_data['extra']['version-check']['host'].$meta_data['extra']['version-check']['directory'].'/'.$meta_data['extra']['version-check']['filename'];
-		$latest_version  = $this->version_check($versionurl, $request->variable('versioncheck_force', false));
+		$latest_version  = $this->version_check($meta_data, $request->variable('versioncheck_force', false));
 
 		if ($request->is_set_post('submit'))
 		{
@@ -190,17 +189,30 @@ public function main($id, $mode)
 	 * @param  int  $ttl          Cache version information for $ttl seconds. Defaults to 86400 (24 hours).
 	 * @return bool
 	 */
-	public final function version_check($versionurl, $force_update = false, $ttl = 86400)
+	public final function version_check($meta_data, $force_update = false, $ttl = 86400)
 	{
-		global $user, $cache;
+		global $user, $cache, $phpbb_extension_manager, $path_helper;
+
+		$pemfile = '';
+		$versionurl = ($meta_data['extra']['version-check']['ssl'] == '1' ? 'https://': 'http://') .
+			$meta_data['extra']['version-check']['host'].$meta_data['extra']['version-check']['directory'].'/'.$meta_data['extra']['version-check']['filename'];
+		$ssl = $meta_data['extra']['version-check']['ssl'] == '1' ? true: false;
+		if ($ssl) {
+			//https://davidwalsh.name/php-ssl-curl-error
+			$pemfile = $phpbb_extension_manager->get_extension_path('paybas/recenttopics', true) . 'core/mozilla.pem';
+			if (!(file_exists($pemfile) && is_readable($pemfile)))
+			{
+				$ssl = false;
+			}
+		}
 
 		//get latest productversion from cache
 		$latest_version = $cache->get('recenttopics_versioncheck');
 
 		//if update is forced or cache expired then make the call to refresh latest productversion
 		if ($latest_version === false || $force_update)
 		{
-			$data = parent::curl($versionurl, false, false, false);
+			$data = parent::curl($versionurl, $ssl, $pemfile, false, false, false);
 			if (0 === count($data) )
 			{
 				$cache->destroy('recenttopics_versioncheck');

composer.json

@@ -3,8 +3,8 @@
     "type": "phpbb-extension",
     "description": "Recent topics Extension for phpBB3.2. Adds a list with a number of recent topics to the index.php",
     "homepage": "https://github.com/sajaki/RecentTopics",
-    "version": "2.2.7",
-    "time": "2018-02-04",
+    "version": "2.2.8",
+    "time": "2018-08-10",
     "license": "GPL-2.0",
     "authors": [
         {
@@ -36,7 +36,8 @@
         "version-check": {
             "host": "www.avathar.be",
             "directory": "/versioncheck",
-            "filename": "recenttopics22.json"
+            "filename": "recenttopics22.json",
+            "ssl": true
         }
     }
 }

config/services.yml

@@ -52,5 +52,6 @@ services:
             - '@template'
             - '@user'
             - '@language'
+            - '@dbal.conn'
         tags:
             - { name: event.listener }

core/admin.php

@@ -16,12 +16,13 @@ class admin
 	 * connects to remote site and gets xml or html using Curl
 	 *
 	 * @param      $url
+	 * @param      $ssl
 	 * @param bool $return_Server_Response_Header
 	 * @param bool $loud
 	 * @param bool $json
 	 * @return array
 	 */
-	public final function curl($url, $return_Server_Response_Header = false, $loud = true, $json = true)
+	public final function curl($url, $ssl = false, $pemfile, $return_Server_Response_Header = false, $loud = true, $json = true)
 	{
 		global $phpbb_container, $user;
 
@@ -47,19 +48,24 @@ public final function curl($url, $return_Server_Response_Header = false, $loud =
 			// set options
 			curl_setopt_array(
 				$curl, array(
-					CURLOPT_RETURNTRANSFER => 1,
-					CURLOPT_URL => $url,
-					CURLOPT_USERAGENT => 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:55.0) Gecko/20100101 Firefox/55.0', //override
-					CURLOPT_SSL_VERIFYHOST => false,
-					CURLOPT_SSL_VERIFYPEER => false,
-					CURLOPT_FOLLOWLOCATION, true,
+					CURLOPT_USERAGENT => 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.13; rv:61.0) Gecko/20100101 Firefox/61.0', //override
 					CURLOPT_TIMEOUT => 60,
 					CURLOPT_VERBOSE => true,
+					CURLOPT_URL => $url,
 					CURLOPT_HEADER => $return_Server_Response_Header,
-					CURLOPT_HEADER => false
+					CURLOPT_FOLLOWLOCATION, true,
+					CURLOPT_RETURNTRANSFER => true, //return web page
 				)
 			);
 
+			// set ssl options
+			if($ssl)
+			{
+				curl_setopt($curl, CURLOPT_SSL_VERIFYPEER,true);
+				curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, 2);
+				curl_setopt($curl, CURLOPT_CAINFO, $pemfile);
+			}
+
 			$response = curl_exec($curl);
 			$headers = curl_getinfo($curl);