Merge pull request #177 from MissAllSunday/php7_comp

MissAllSunday · web-flow · commit e4e7dd1073c6 · 2018-08-26T16:53:53.000-05:00
Php7 comp
diff --git a/.gitignore b/.gitignore
@@ -38,3 +38,4 @@ Thumbs.db
 /nbproject/private/
 /nbproject/
 /.project
+/.idea
diff --git a/README.txt b/README.txt
@@ -64,6 +64,9 @@ Tested on PHP 5.3 and 5.4, Opera12, IE8 and whatever version Firefox was when I
 [size=12pt][color=purple]Changelog[/color][/size]
 
 [code]
+1.0.14 August  26, 2018
+- Add support for PHP 7.
+
 1.0.13 March 17, 2018
 - Add admin setting for the general wall
 - Prevent loading status and activity from users on your ignored list.
diff --git a/Sources/Breeze/Breeze.php b/Sources/Breeze/Breeze.php
@@ -4,7 +4,7 @@
  * Breeze
  *
  * @package Breeze mod
- * @version 1.0.13
+ * @version 1.0.14
  * @author Jessica González <suki@missallsunday.com>
  * @copyright Copyright (c) 2011 - 2018 Jessica González
  * @license //www.mozilla.org/MPL/MPL-1.1.html
@@ -37,7 +37,7 @@ function breeze_autoloader($class_name)
 class Breeze
 {
 	public static $name = 'Breeze';
-	public static $version = '1.0.13';
+	public static $version = '1.0.14';
 	public static $folder = '/Breeze/';
 	public static $txtpattern = 'Breeze_';
 	public static $permissions = array('deleteComments', 'deleteOwnComments', 'deleteProfileComments', 'deleteStatus', 'deleteOwnStatus', 'deleteProfileStatus', 'postStatus', 'postComments', 'canMention', 'beMentioned');
@@ -385,7 +385,7 @@ public static function newRegister($regOptions, $user_id)
 				'type' => 'register',
 				'time' => time(),
 				'viewed' => 3, // 3 is a special case to indicate that this is a log entry, cannot be seen or unseen
-				'content' => function() use ($regOptions, $scripturl, $text, $scripturl, $user_id)
+				'content' => function() use ($regOptions, $scripturl, $user_id)
 					{
 						return '<a href="'. $scripturl .'?action=profile;u='. $user_id . '">'. $regOptions['username'] .'</a> '. $tools->text('logRegister');
 					},
diff --git a/Sources/Breeze/BreezeAdmin.php b/Sources/Breeze/BreezeAdmin.php
@@ -4,7 +4,7 @@
  * BreezeAdmin
  *
  * @package Breeze mod
- * @version 1.0.11
+ * @version 1.0.14
  * @author Jessica González <suki@missallsunday.com>
  * @copyright Copyright (c) 2011 - 2018 Jessica González
  * @license //www.mozilla.org/MPL/MPL-1.1.html
diff --git a/Sources/Breeze/BreezeAjax.php b/Sources/Breeze/BreezeAjax.php
@@ -4,7 +4,7 @@
  * BreezeAjax
  *
  * @package Breeze mod
- * @version 1.0.11
+ * @version 1.0.14
  * @author Jessica González <suki@missallsunday.com>
  * @copyright Copyright (c) 2011 - 2018 Jessica González
  * @license //www.mozilla.org/MPL/MPL-1.1.html
@@ -103,7 +103,7 @@ public function call()
 		if (isset($call[$data->get('sa')]))
 		{
 			// This is somehow ugly but its faster.
-			$this->$call[$data->get('sa')]();
+			$this->{$call[$data->get('sa')]}();
 
 			// Send the response back to the browser
 			$this->returnResponse();
@@ -447,7 +447,7 @@ public function delete()
 				call_integration_hook('integrate_breeze_before_delete', array(&$type, &$id, &$profileOwner, &$poster));
 
 				// Do the query dance!
-				$this->_query->$typeCall($id, $profileOwner);
+				$this->_query->{$typeCall}($id, $profileOwner);
 
 				// Tell everyone what just happened here...
 				call_integration_hook('integrate_breeze_after_delete', array($type, $id, $profileOwner, $poster));
@@ -681,7 +681,7 @@ public function multiNoti()
 			$viewed = $do == 'read' ? 1 : 0;
 
 			// $set the "viewed" var
-			$this->_query->$call($idNoti, $user, $viewed);
+			$this->_query->{$call}($idNoti, $user, $viewed);
 
 			return $this->setResponse(array(
 				'type' => 'success',
@@ -733,7 +733,7 @@ protected function fetchStatus()
 		// Get the right call to the DB
 		$call = $comingFrom == 'profile' ? 'getStatusByProfile' : 'getStatusByUser';
 
-		$data = $this->_query->$call($fetch, $maxIndex, $start);
+		$data = $this->_query->{$call}($fetch, $maxIndex, $start);
 
 		if (!empty($data['data']))
 		{
diff --git a/Sources/Breeze/BreezeContainer.php b/Sources/Breeze/BreezeContainer.php
@@ -4,7 +4,7 @@
  * BreezeContainer
  *
  * @package Breeze mod
- * @version 1.0.11
+ * @version 1.0.14
  * @author Jessica González <suki@missallsunday.com>
  * @copyright Copyright (c) 2011 - 2018 Jessica González
  * @license //www.mozilla.org/MPL/MPL-1.1.html
diff --git a/Sources/Breeze/BreezeController.php b/Sources/Breeze/BreezeController.php
@@ -4,7 +4,7 @@
  * BreezeController
  *
  * @package Breeze mod
- * @version 1.0.11
+ * @version 1.0.14
  * @author Jessica González <suki@missallsunday.com>
  * @copyright Copyright (c) 2011 - 2018 Jessica González
  * @license //www.mozilla.org/MPL/MPL-1.1.html
@@ -83,6 +83,6 @@ protected function set()
 
 	public function get($var)
 	{
-		return $this->container->$var;
+		return $this->container->{$var};
 	}
 }
diff --git a/Sources/Breeze/BreezeData.php b/Sources/Breeze/BreezeData.php
@@ -4,7 +4,7 @@
  * BreezeData
  *
  * @package Breeze mod
- * @version 1.0.11
+ * @version 1.0.14
  * @author Jessica González <suki@missallsunday.com>
  * @copyright Copyright (c) 2011 - 2018 Jessica González
  * @license //www.mozilla.org/MPL/MPL-1.1.html
diff --git a/Sources/Breeze/BreezeDispatcher.php b/Sources/Breeze/BreezeDispatcher.php
@@ -4,7 +4,7 @@
  * BreezeDispatcher
  *
  * @package Breeze mod
- * @version 1.0.11
+ * @version 1.0.14
  * @author Jessica González <suki@missallsunday.com>
  * @copyright Copyright (c) 2011 - 2018 Jessica González
  * @license //www.mozilla.org/MPL/MPL-1.1.html
@@ -56,7 +56,7 @@ static function dispatch()
 			$object = new $controller($breezeController->get('tools'), $breezeController->get('display'),  $breezeController->get('parser'), $breezeController->get('query'), $breezeController->get('notifications'), $breezeController->get('mention'), $breezeController->get('log'));
 
 			// Lets call it
-			$object->$method();
+			$object->{$method}();
 		}
 
 		else
diff --git a/Sources/Breeze/BreezeDisplay.php b/Sources/Breeze/BreezeDisplay.php
@@ -4,7 +4,7 @@
  * BreezeDisplay
  *
  * @package Breeze mod
- * @version 1.0.11
+ * @version 1.0.14
  * @author Jessica González <suki@missallsunday.com>
  * @copyright Copyright (c) 2011 - 2018 Jessica González
  * @license //www.mozilla.org/MPL/MPL-1.1.html
diff --git a/Sources/Breeze/BreezeForm.php b/Sources/Breeze/BreezeForm.php
@@ -4,7 +4,7 @@
  * BreezeForm
  *
  * @package Breeze mod
- * @version 1.0.11
+ * @version 1.0.14
  * @author Jessica González <suki@missallsunday.com>
  * @copyright Copyright (c) 2011 - 2018 Jessica González
  * @license //www.mozilla.org/MPL/MPL-1.1.html
diff --git a/Sources/Breeze/BreezeLog.php b/Sources/Breeze/BreezeLog.php
@@ -4,7 +4,7 @@
  * BreezeLog
  *
  * @package Breeze mod
- * @version 1.0.11
+ * @version 1.0.14
  * @author Jessica González <suki@missallsunday.com>
  * @copyright Copyright (c) 2011 - 2018 Jessica González
  * @license //www.mozilla.org/MPL/MPL-1.1.html
@@ -55,7 +55,7 @@ public function getActivity($user)
 				if (in_array($entry['type'], get_class_methods(__CLASS__)))
 				{
 					$entry['content'] = json_decode($entry['content'], true);
-					$this->_result[$id]['content'] = $this->$entry['type']($entry);
+					$this->_result[$id]['content'] = $this->{$entry['type']}($entry);
 
 					// Got something?
 					if (empty($this->_result[$id]['content']))
diff --git a/Sources/Breeze/BreezeMention.php b/Sources/Breeze/BreezeMention.php
@@ -4,7 +4,7 @@
  * BreezeMention
  *
  * @package Breeze mod
- * @version 1.0.11
+ * @version 1.0.14
  * @author Jessica González <suki@missallsunday.com>
  * @copyright Copyright (c) 2011 - 2018 Jessica González
  * @license //www.mozilla.org/MPL/MPL-1.1.html
diff --git a/Sources/Breeze/BreezeNotifications.php b/Sources/Breeze/BreezeNotifications.php
@@ -5,7 +5,7 @@
  *
  * The purpose of this file is to fetch all notifications for X user
  * @package Breeze mod
- * @version 1.0.11
+ * @version 1.0.14
  * @author Jessica González <suki@missallsunday.com>
  * @copyright Copyright (c) 2011 - 2018 Jessica González
  * @license //www.mozilla.org/MPL/MPL-1.1.html
@@ -167,7 +167,7 @@ public function prepare($user, $all = false)
 		$call = 'getNotificationByReceiver'. (!empty($all) ? 'All' : '');
 
 		// Get all the notification for this user
-		$this->_all = $this->_query->$call($user);
+		$this->_all = $this->_query->{$call}($user);
 
 		// Load the users data.
 		$this->loadedUsers = $this->_query->loadMinimalData($this->_all['users']);
@@ -185,7 +185,7 @@ public function prepare($user, $all = false)
 					$call = 'do' . ucfirst($single['type']);
 
 					// Call the right method
-					$this->$call($single);
+					$this->{$call}($single);
 				}
 
 			// Let them know everything went better than expected!
diff --git a/Sources/Breeze/BreezeParser.php b/Sources/Breeze/BreezeParser.php
@@ -4,7 +4,7 @@
  * BreezeParser
  *
  * @package Breeze mod
- * @version 1.0.11
+ * @version 1.0.14
  * @author Jessica González <suki@missallsunday.com>
  * @copyright Copyright (c) 2011 - 2018 Jessica González
  * @license //www.mozilla.org/MPL/MPL-1.1.html
@@ -46,7 +46,7 @@ public function display($string)
 		call_integration_hook('integrate_breeze_before_parser', array(&$this->s));
 
 		foreach ($temp as $t)
-			$this->$t();
+			$this->{$t}();
 
 		// ...or after?
 		call_integration_hook('integrate_breeze_after_parser', array(&$this->s));
diff --git a/Sources/Breeze/BreezeQuery.php b/Sources/Breeze/BreezeQuery.php
@@ -4,7 +4,7 @@
  * BreezeQuery
  *
  * @package Breeze mod
- * @version 1.0.11
+ * @version 1.0.14
  * @author Jessica González <suki@missallsunday.com>
  * @copyright Copyright (c) 2011 - 2018 Jessica González
  * @license //www.mozilla.org/MPL/MPL-1.1.html
diff --git a/Sources/Breeze/BreezeTools.php b/Sources/Breeze/BreezeTools.php
@@ -4,7 +4,7 @@
  * BreezeTools
  *
  * @package Breeze mod
- * @version 1.0.11
+ * @version 1.0.14
  * @author Jessica González <suki@missallsunday.com>
  * @copyright Copyright (c) 2011 - 2018 Jessica González
  * @license //www.mozilla.org/MPL/MPL-1.1.html
diff --git a/Sources/Breeze/BreezeUser.php b/Sources/Breeze/BreezeUser.php
@@ -4,7 +4,7 @@
  * BreezeUser
  *
  * @package Breeze mod
- * @version 1.0.11
+ * @version 1.0.14
  * @author Jessica González <suki@missallsunday.com>
  * @copyright Copyright (c) 2011 - 2018 Jessica González
  * @license //www.mozilla.org/MPL/MPL-1.1.html
diff --git a/Sources/Breeze/BreezeUserInfo.php b/Sources/Breeze/BreezeUserInfo.php
@@ -4,7 +4,7 @@
  * BreezeUserInfo
  *
  * @package Breeze mod
- * @version 1.0.11
+ * @version 1.0.14
  * @author Jessica González <suki@missallsunday.com>
  * @copyright Copyright (c) 2011 - 2018 Jessica González
  * @license //www.mozilla.org/MPL/MPL-1.1.html
diff --git a/Sources/Breeze/BreezeWall.php b/Sources/Breeze/BreezeWall.php
@@ -4,7 +4,7 @@
  * BreezeWall
  *
  * @package Breeze mod
- * @version 1.0.11
+ * @version 1.0.14
  * @author Jessica González <suki@missallsunday.com>
  * @copyright Copyright (c) 2011 - 2018 Jessica González
  * @license //www.mozilla.org/MPL/MPL-1.1.html
@@ -114,12 +114,12 @@ public function call()
 			writeLog(true);
 
 			// This is somehow ugly but its faster.
-			$this->$call[$data->get('sa')]();
+			$this->{$call[$data->get('sa')]}();
 		}
 
 		// By default lets load the general wall
 		else
-			$this->$call['general']();
+			$this->{$call['general']}();
 
 		// We should see other people...
 		unset($call);
diff --git a/Themes/default/Breeze.template.php b/Themes/default/Breeze.template.php
@@ -4,7 +4,7 @@
  * Breeze.template.php
  *
  * @package Breeze mod
- * @version 1.0.11
+ * @version 1.0.14
  * @author Jessica González <suki@missallsunday.com>
  * @copyright Copyright (c) 2011 - 2018, Jessica González
  * @license //www.mozilla.org/MPL/MPL-1.1.html
diff --git a/Themes/default/BreezeAdmin.template.php b/Themes/default/BreezeAdmin.template.php
@@ -4,7 +4,7 @@
  * BreezeAdmin.template.php
  *
  * @package Breeze mod
- * @version 1.0.13
+ * @version 1.0.14
  * @author Jessica González <suki@missallsunday.com>
  * @copyright Copyright (c) 2011 - 2018, Jessica González
  * @license //www.mozilla.org/MPL/MPL-1.1.html
diff --git a/Themes/default/BreezeFunctions.template.php b/Themes/default/BreezeFunctions.template.php
@@ -4,7 +4,7 @@
  * BreezeFunctions.template.php
  *
  * @package Breeze mod
- * @version 1.0.11
+ * @version 1.0.14
  * @author Jessica González <suki@missallsunday.com>
  * @copyright Copyright (c) 2011 - 2018, Jessica González
  * @license //www.mozilla.org/MPL/MPL-1.1.html
diff --git a/Themes/default/languages/Breeze.english-utf8.php b/Themes/default/languages/Breeze.english-utf8.php
@@ -4,7 +4,7 @@
  * Breeze.english-utf8
  *
  * @package Breeze mod
- * @version 1.0.11
+ * @version 1.0.14
  * @author Jessica Gonzalez <suki@missallsunday.com>
  * @copyright Copyright (c) 2011 - 2018 Jessica González
  * @license //www.mozilla.org/MPL/MPL-1.1.html
diff --git a/Themes/default/languages/Breeze.english.php b/Themes/default/languages/Breeze.english.php
@@ -4,7 +4,7 @@
  * Breeze.english
  *
  * @package Breeze mod
- * @version 1.0.11
+ * @version 1.0.14
  * @author Jessica Gonzalez <suki@missallsunday.com>
  * @copyright Copyright (c) 2011 - 2018 Jessica Gonzalez
  * @license //www.mozilla.org/MPL/MPL-1.1.html
diff --git a/Themes/default/languages/Breeze.pt-br-utf8.php b/Themes/default/languages/Breeze.pt-br-utf8.php
@@ -4,7 +4,7 @@
  * Breeze.Portuguese_Brazilian-utf8
  *  PT-BR Translation by: FreitasA
  * @package Breeze mod
- * @version 1.0.11
+ * @version 1.0.14
  * @author Jessica Gonzalez <suki@missallsunday.com>
  * @copyright Copyright (c) 2011 - 2018 Jessica Gonzalez
  * @license //www.mozilla.org/MPL/MPL-1.1.html
diff --git a/Themes/default/languages/Breeze.pt-br.php b/Themes/default/languages/Breeze.pt-br.php
@@ -4,7 +4,7 @@
  * Breeze.Portuguese_Brazilian-utf8
  *  PT-BR Translation by: FreitasA
  * @package Breeze mod
- * @version 1.0.11
+ * @version 1.0.14
  * @author Jessica Gonzalez <suki@missallsunday.com>
  * @copyright Copyright (c) 2011 - 2018 Jessica Gonzalez
  * @license //www.mozilla.org/MPL/MPL-1.1.html
diff --git a/Themes/default/languages/Breeze.spanish_latin-utf8.php b/Themes/default/languages/Breeze.spanish_latin-utf8.php
@@ -4,7 +4,7 @@
  * Breeze.spanish_latin-utf8
  *
  * @package Breeze mod
- * @version 1.0.11
+ * @version 1.0.14
  * @author Jessica Gonzalez <suki@missallsunday.com>
  * @copyright Copyright (c) 2011 - 2018 Jessica Gonzalez
  * @license //www.mozilla.org/MPL/MPL-1.1.html
diff --git a/Themes/default/languages/Breeze.spanish_latin.php b/Themes/default/languages/Breeze.spanish_latin.php
@@ -4,7 +4,7 @@
  * Breeze.spanish_latin
  *
  * @package Breeze mod
- * @version 1.0.11
+ * @version 1.0.14
  * @author Jessica Gonzalez <suki@missallsunday.com>
  * @copyright Copyright (c) 2011 - 2018 Jessica Gonzalez
  * @license //www.mozilla.org/MPL/MPL-1.1.html
diff --git a/Themes/default/languages/Breeze.turkish-utf8.php b/Themes/default/languages/Breeze.turkish-utf8.php
@@ -4,7 +4,7 @@
  * Breeze.english
  *
  * @package Breeze mod
- * @version 1.0.11
+ * @version 1.0.14
  * @author Jessica Gonzalez <suki@missallsunday.com>
  * @copyright Copyright (c) 2011 - 2018 Jessica Gonzalez
  * @license //www.mozilla.org/MPL/MPL-1.1.html
diff --git a/Themes/default/languages/Breeze.turkish.php b/Themes/default/languages/Breeze.turkish.php
@@ -4,7 +4,7 @@
  * Breeze.english
  *
  * @package Breeze mod
- * @version 1.0.11
+ * @version 1.0.14
  * @author Jessica Gonzalez <suki@missallsunday.com>
  * @copyright Copyright (c) 2011 - 2018 Jessica Gonzalez
  * @license //www.mozilla.org/MPL/MPL-1.1.html
diff --git a/Themes/default/languages/BreezeAdmin.english-utf8.php b/Themes/default/languages/BreezeAdmin.english-utf8.php
diff --git a/Themes/default/languages/BreezeAdmin.english.php b/Themes/default/languages/BreezeAdmin.english.php
diff --git a/Themes/default/languages/BreezeAdmin.pt-br-utf8.php b/Themes/default/languages/BreezeAdmin.pt-br-utf8.php
diff --git a/Themes/default/languages/BreezeAdmin.pt-br.php b/Themes/default/languages/BreezeAdmin.pt-br.php
diff --git a/Themes/default/languages/BreezeAdmin.spanish_latin-utf8.php b/Themes/default/languages/BreezeAdmin.spanish_latin-utf8.php
diff --git a/Themes/default/languages/BreezeAdmin.spanish_latin.php b/Themes/default/languages/BreezeAdmin.spanish_latin.php
diff --git a/Themes/default/languages/BreezeAdmin.turkish-utf8.php b/Themes/default/languages/BreezeAdmin.turkish-utf8.php
diff --git a/Themes/default/languages/BreezeAdmin.turkish.php b/Themes/default/languages/BreezeAdmin.turkish.php
diff --git a/hooks.php b/hooks.php
diff --git a/install.php b/install.php
diff --git a/package-info.xml b/package-info.xml
diff --git a/remove.php b/remove.php

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`* BreezeAdmin`
`5`	`5`	`*`
`6`	`6`	`* @package Breeze mod`
`7`		`- * @version 1.0.11`
	`7`	`+ * @version 1.0.14`
`8`	`8`	`* @author Jessica González <suki@missallsunday.com>`
`9`	`9`	`* @copyright Copyright (c) 2011 - 2018 Jessica González`
`10`	`10`	`* @license //www.mozilla.org/MPL/MPL-1.1.html`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`* BreezeContainer`
`5`	`5`	`*`
`6`	`6`	`* @package Breeze mod`
`7`		`- * @version 1.0.11`
	`7`	`+ * @version 1.0.14`
`8`	`8`	`* @author Jessica González <suki@missallsunday.com>`
`9`	`9`	`* @copyright Copyright (c) 2011 - 2018 Jessica González`
`10`	`10`	`* @license //www.mozilla.org/MPL/MPL-1.1.html`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`* BreezeController`
`5`	`5`	`*`
`6`	`6`	`* @package Breeze mod`
`7`		`- * @version 1.0.11`
	`7`	`+ * @version 1.0.14`
`8`	`8`	`* @author Jessica González <suki@missallsunday.com>`
`9`	`9`	`* @copyright Copyright (c) 2011 - 2018 Jessica González`
`10`	`10`	`* @license //www.mozilla.org/MPL/MPL-1.1.html`
`@@ -83,6 +83,6 @@ protected function set()`
`83`	`83`
`84`	`84`	`public function get($var)`
`85`	`85`	`{`
`86`		`- return $this->container->$var;`
	`86`	`+ return $this->container->{$var};`
`87`	`87`	`}`
`88`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`* BreezeData`
`5`	`5`	`*`
`6`	`6`	`* @package Breeze mod`
`7`		`- * @version 1.0.11`
	`7`	`+ * @version 1.0.14`
`8`	`8`	`* @author Jessica González <suki@missallsunday.com>`
`9`	`9`	`* @copyright Copyright (c) 2011 - 2018 Jessica González`
`10`	`10`	`* @license //www.mozilla.org/MPL/MPL-1.1.html`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`* BreezeDisplay`
`5`	`5`	`*`
`6`	`6`	`* @package Breeze mod`
`7`		`- * @version 1.0.11`
	`7`	`+ * @version 1.0.14`
`8`	`8`	`* @author Jessica González <suki@missallsunday.com>`
`9`	`9`	`* @copyright Copyright (c) 2011 - 2018 Jessica González`
`10`	`10`	`* @license //www.mozilla.org/MPL/MPL-1.1.html`