Merge pull request #172 from MissAllSunday/general_wall

General wall
MissAllSunday · Mar 17, 2018 · 6906025 · 6906025
2 parents b1c0461 + ff13bce
commit 6906025
Show file tree

Hide file tree

Showing 47 changed files with 77 additions and 61 deletions.
diff --git a/README.txt b/README.txt
@@ -64,6 +64,10 @@ 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.13 March 17, 2018
+- Add admin setting for the general wall
+- Prevent loading status and activity from users on your ignored list.
+
 1.0.12 May 5, 2017
 - Concatenation on $txt strings
 - Add a "live from the support site" atom box

diff --git a/Sources/Breeze/Breeze.php b/Sources/Breeze/Breeze.php
@@ -4,9 +4,9 @@
  * Breeze
  *
  * @package Breeze mod
- * @version 1.0.12
+ * @version 1.0.13
  * @author Jessica González <suki@missallsunday.com>
- * @copyright Copyright (c) 2011 - 2017 Jessica González
+ * @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.12';
+	public static $version = '1.0.13';
 	public static $folder = '/Breeze/';
 	public static $txtpattern = 'Breeze_';
 	public static $permissions = array('deleteComments', 'deleteOwnComments', 'deleteProfileComments', 'deleteStatus', 'deleteOwnStatus', 'deleteProfileStatus', 'postStatus', 'postComments', 'canMention', 'beMentioned');
@@ -277,7 +277,7 @@ public static function menu(&$menu_buttons)
 			array('wall' => array(
 				'title' => $tools->text('general_wall'),
 				'href' => $scripturl . '?action=wall',
-				'show' => ($tools->enable('master') && !$user_info['is_guest'] && !empty($userSettings['general_wall'])),
+				'show' => ($tools->enable('master') && !$user_info['is_guest'] && !empty($userSettings['general_wall']) && $tools->enable('enable_general_wall')),
 				'sub_buttons' => array(
 					'noti' => array(
 						'title' => $tools->text('user_notisettings_name'),

diff --git a/Sources/Breeze/BreezeAdmin.php b/Sources/Breeze/BreezeAdmin.php
@@ -6,7 +6,7 @@
  * @package Breeze mod
  * @version 1.0.11
  * @author Jessica González <suki@missallsunday.com>
- * @copyright Copyright (c) 2011 - 2017 Jessica González
+ * @copyright Copyright (c) 2011 - 2018 Jessica González
  * @license //www.mozilla.org/MPL/MPL-1.1.html
  */
 
@@ -91,6 +91,7 @@ function Breeze_Admin_Settings()
 	$config_vars = array(
 		array('title', Breeze::$txtpattern .'page_settings'),
 		array('check', Breeze::$txtpattern .'master', 'subtext' => $context['Breeze']['instance']->adminText('master_sub')),
+		array('check', Breeze::$txtpattern .'enable_general_wall', 'subtext' => $context['Breeze']['instance']->adminText('enable_general_wall_sub')),
 		array('check', Breeze::$txtpattern .'force_enable', 'subtext' => $context['Breeze']['instance']->adminText('force_enable_sub')),
 		array('check', Breeze::$txtpattern .'notifications', 'subtext' => $context['Breeze']['instance']->adminText('notifications_sub')),
 		array('text', Breeze::$txtpattern .'allowed_actions', 'size' => 60, 'subtext' => $context['Breeze']['instance']->adminText('allowed_actions_sub')),

diff --git a/Sources/Breeze/BreezeAjax.php b/Sources/Breeze/BreezeAjax.php
@@ -6,7 +6,7 @@
  * @package Breeze mod
  * @version 1.0.11
  * @author Jessica González <suki@missallsunday.com>
- * @copyright Copyright (c) 2011 - 2017 Jessica González
+ * @copyright Copyright (c) 2011 - 2018 Jessica González
  * @license //www.mozilla.org/MPL/MPL-1.1.html
  */
 

diff --git a/Sources/Breeze/BreezeContainer.php b/Sources/Breeze/BreezeContainer.php
@@ -6,7 +6,7 @@
  * @package Breeze mod
  * @version 1.0.11
  * @author Jessica González <suki@missallsunday.com>
- * @copyright Copyright (c) 2011 - 2017 Jessica González
+ * @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
@@ -6,7 +6,7 @@
  * @package Breeze mod
  * @version 1.0.11
  * @author Jessica González <suki@missallsunday.com>
- * @copyright Copyright (c) 2011 - 2017 Jessica González
+ * @copyright Copyright (c) 2011 - 2018 Jessica González
  * @license //www.mozilla.org/MPL/MPL-1.1.html
  */
 

diff --git a/Sources/Breeze/BreezeData.php b/Sources/Breeze/BreezeData.php
@@ -6,7 +6,7 @@
  * @package Breeze mod
  * @version 1.0.11
  * @author Jessica González <suki@missallsunday.com>
- * @copyright Copyright (c) 2011 - 2017 Jessica González
+ * @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
@@ -6,7 +6,7 @@
  * @package Breeze mod
  * @version 1.0.11
  * @author Jessica González <suki@missallsunday.com>
- * @copyright Copyright (c) 2011 - 2017 Jessica González
+ * @copyright Copyright (c) 2011 - 2018 Jessica González
  * @license //www.mozilla.org/MPL/MPL-1.1.html
  */
 

diff --git a/Sources/Breeze/BreezeDisplay.php b/Sources/Breeze/BreezeDisplay.php
@@ -6,7 +6,7 @@
  * @package Breeze mod
  * @version 1.0.11
  * @author Jessica González <suki@missallsunday.com>
- * @copyright Copyright (c) 2011 - 2017 Jessica González
+ * @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
@@ -6,7 +6,7 @@
  * @package Breeze mod
  * @version 1.0.11
  * @author Jessica González <suki@missallsunday.com>
- * @copyright Copyright (c) 2011 - 2017 Jessica González
+ * @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
@@ -6,7 +6,7 @@
  * @package Breeze mod
  * @version 1.0.11
  * @author Jessica González <suki@missallsunday.com>
- * @copyright Copyright (c) 2011 - 2017 Jessica González
+ * @copyright Copyright (c) 2011 - 2018 Jessica González
  * @license //www.mozilla.org/MPL/MPL-1.1.html
  */
 

diff --git a/Sources/Breeze/BreezeMention.php b/Sources/Breeze/BreezeMention.php
@@ -6,7 +6,7 @@
  * @package Breeze mod
  * @version 1.0.11
  * @author Jessica González <suki@missallsunday.com>
- * @copyright Copyright (c) 2011 - 2017 Jessica González
+ * @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
@@ -7,7 +7,7 @@
  * @package Breeze mod
  * @version 1.0.11
  * @author Jessica González <suki@missallsunday.com>
- * @copyright Copyright (c) 2011 - 2017 Jessica González
+ * @copyright Copyright (c) 2011 - 2018 Jessica González
  * @license //www.mozilla.org/MPL/MPL-1.1.html
  */
 

diff --git a/Sources/Breeze/BreezeParser.php b/Sources/Breeze/BreezeParser.php
@@ -6,7 +6,7 @@
  * @package Breeze mod
  * @version 1.0.11
  * @author Jessica González <suki@missallsunday.com>
- * @copyright Copyright (c) 2011 - 2017 Jessica González
+ * @copyright Copyright (c) 2011 - 2018 Jessica González
  * @license //www.mozilla.org/MPL/MPL-1.1.html
  */
 

diff --git a/Sources/Breeze/BreezeQuery.php b/Sources/Breeze/BreezeQuery.php
@@ -6,7 +6,7 @@
  * @package Breeze mod
  * @version 1.0.11
  * @author Jessica González <suki@missallsunday.com>
- * @copyright Copyright (c) 2011 - 2017 Jessica González
+ * @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
@@ -6,7 +6,7 @@
  * @package Breeze mod
  * @version 1.0.11
  * @author Jessica González <suki@missallsunday.com>
- * @copyright Copyright (c) 2011 - 2017 Jessica González
+ * @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
@@ -6,7 +6,7 @@
  * @package Breeze mod
  * @version 1.0.11
  * @author Jessica González <suki@missallsunday.com>
- * @copyright Copyright (c) 2011 - 2017 Jessica González
+ * @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
@@ -6,7 +6,7 @@
  * @package Breeze mod
  * @version 1.0.11
  * @author Jessica González <suki@missallsunday.com>
- * @copyright Copyright (c) 2011 - 2017 Jessica González
+ * @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
@@ -6,7 +6,7 @@
  * @package Breeze mod
  * @version 1.0.11
  * @author Jessica González <suki@missallsunday.com>
- * @copyright Copyright (c) 2011 - 2017 Jessica González
+ * @copyright Copyright (c) 2011 - 2018 Jessica González
  * @license //www.mozilla.org/MPL/MPL-1.1.html
  */
 
@@ -67,6 +67,10 @@ public function call()
 		if (!$this->_tools->enable('master'))
 			fatal_lang_error('Breeze_error_no_valid_action', false);
 
+		// The general wall needs to be enable
+		if (!$this->_tools->enable('enable_general_wall'))
+			fatal_lang_error('Breeze_error_no_valid_action', false);
+
 		// Guest aren't allowed, sorry.
 		is_not_guest($this->_tools->text('error_no_access'));
 
@@ -122,7 +126,7 @@ public function call()
 	}
 
 	/**
-	 * BreezeAjax::generalWall()
+	 * BreezeWall::generalWall()
 	 *
 	 * Shows the latest activity form your buddies.
 	 * @return
@@ -165,12 +169,19 @@ public function generalWall()
 		// Time to overheat the server!
 		if (!empty($this->userSettings['buddiesList']))
 		{
+			// Doesn't make much sense to have the same user as buddy and on their ignored list but meh...
+			if (!empty($this->userSettings['ignoredList']))
+				$buddies = array_diff($this->userSettings['buddiesList'], explode(',', $this->userSettings['ignoredList']));
+
+			else
+				$buddies = $this->userSettings['buddiesList'];
+
 			// Get the latest status
-			$status = $this->_query->getStatusByUser($this->userSettings['buddiesList'], $maxIndex, $currentPage);
+			$status = $this->_query->getStatusByUser($buddies, $maxIndex, $currentPage);
 			$context['Breeze']['status'] = $status['data'];
 
 			// Get the latest activity
-			$context['Breeze']['log'] = $this->log->getActivity($this->userSettings['buddiesList']);
+			$context['Breeze']['log'] = $this->log->getActivity($buddies);
 
 			// Load users data.
 			if (!empty($status['users']))

diff --git a/Themes/default/Breeze.template.php b/Themes/default/Breeze.template.php
@@ -6,7 +6,7 @@
  * @package Breeze mod
  * @version 1.0.11
  * @author Jessica González <suki@missallsunday.com>
- * @copyright Copyright (c) 2011 - 2017, Jessica González
+ * @copyright Copyright (c) 2011 - 2018, Jessica González
  * @license //www.mozilla.org/MPL/MPL-1.1.html
  */
 // User's wall.

diff --git a/Themes/default/BreezeAdmin.template.php b/Themes/default/BreezeAdmin.template.php
@@ -4,9 +4,9 @@
  * BreezeAdmin.template.php
  *
  * @package Breeze mod
- * @version 1.0.12
+ * @version 1.0.13
  * @author Jessica González <suki@missallsunday.com>
- * @copyright Copyright (c) 2011 - 2017, Jessica González
+ * @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
@@ -6,7 +6,7 @@
  * @package Breeze mod
  * @version 1.0.11
  * @author Jessica González <suki@missallsunday.com>
- * @copyright Copyright (c) 2011 - 2017, Jessica González
+ * @copyright Copyright (c) 2011 - 2018, Jessica González
  * @license //www.mozilla.org/MPL/MPL-1.1.html
  */
 

diff --git a/Themes/default/js/breeze.js b/Themes/default/js/breeze.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2011 - 2017 Jessica González
+ Copyright (c) 2011 - 2018 Jessica González
  @license //www.mozilla.org/MPL/MPL-1.1.html
 */
 

diff --git a/Themes/default/js/breezeLoadMore.js b/Themes/default/js/breezeLoadMore.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2011 - 2017 Jessica González
+ Copyright (c) 2011 - 2018 Jessica González
  @license //www.mozilla.org/MPL/MPL-1.1.html
 */
 

diff --git a/Themes/default/js/breezeMention.js b/Themes/default/js/breezeMention.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2011 - 2017 Jessica González
+ Copyright (c) 2011 - 2018 Jessica González
  @license //www.mozilla.org/MPL/MPL-1.1.html
 */
 

diff --git a/Themes/default/js/breezeNoti.js b/Themes/default/js/breezeNoti.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2011 - 2017 Jessica González
+ Copyright (c) 2011 - 2018 Jessica González
  @license //www.mozilla.org/MPL/MPL-1.1.html
 */
 

diff --git a/Themes/default/js/breezeTabs.js b/Themes/default/js/breezeTabs.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2011 - 2017 Jessica González
+ 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
@@ -6,7 +6,7 @@
  * @package Breeze mod
  * @version 1.0.11
  * @author Jessica Gonzalez <suki@missallsunday.com>
- * @copyright Copyright (c) 2011 - 2017 Jessica González
+ * @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
@@ -6,7 +6,7 @@
  * @package Breeze mod
  * @version 1.0.11
  * @author Jessica Gonzalez <suki@missallsunday.com>
- * @copyright Copyright (c) 2011 - 2017 Jessica Gonzalez
+ * @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
@@ -6,7 +6,7 @@
  * @package Breeze mod
  * @version 1.0.11
  * @author Jessica Gonzalez <suki@missallsunday.com>
- * @copyright Copyright (c) 2011 - 2017 Jessica Gonzalez
+ * @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
@@ -6,7 +6,7 @@
  * @package Breeze mod
  * @version 1.0.11
  * @author Jessica Gonzalez <suki@missallsunday.com>
- * @copyright Copyright (c) 2011 - 2017 Jessica Gonzalez
+ * @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
@@ -6,7 +6,7 @@
  * @package Breeze mod
  * @version 1.0.11
  * @author Jessica Gonzalez <suki@missallsunday.com>
- * @copyright Copyright (c) 2011 - 2017 Jessica Gonzalez
+ * @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
@@ -6,7 +6,7 @@
  * @package Breeze mod
  * @version 1.0.11
  * @author Jessica Gonzalez <suki@missallsunday.com>
- * @copyright Copyright (c) 2011 - 2017 Jessica Gonzalez
+ * @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
@@ -6,7 +6,7 @@
  * @package Breeze mod
  * @version 1.0.11
  * @author Jessica Gonzalez <suki@missallsunday.com>
- * @copyright Copyright (c) 2011 - 2017 Jessica Gonzalez
+ * @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
@@ -6,7 +6,7 @@
  * @package Breeze mod
  * @version 1.0.11
  * @author Jessica Gonzalez <suki@missallsunday.com>
- * @copyright Copyright (c) 2011 - 2017 Jessica Gonzalez
+ * @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
@@ -4,9 +4,9 @@
  * BreezeAdmin.english-utf8
  *
  * @package Breeze mod
- * @version 1.0.12
+ * @version 1.0.13
  * @author Jessica Gonzalez <suki@missallsunday.com>
- * @copyright Copyright (c) 2011 - 2017 Jessica Gonzalez
+ * @copyright Copyright (c) 2011 - 2018 Jessica Gonzalez
  * @license //www.mozilla.org/MPL/MPL-1.1.html
  */