A few more updates

emailpost.php

@@ -1,11 +1,15 @@
-#!/usr/local/bin/php -q
+#!/usr/bin/php -q
 <?php
 
 /**
  * Handles the replying and posting of messages by email
  *
- * Note the shebang #!/usr/local/bin/php -q needs to point to the installed
- * location of php, this is the typical location but yours may be different
+ * Note the shebang (#!) needs to point to the installed location of php on your
+ * system.  If you have shell access running "which php" should return the correct
+ * path to use.
+ *
+ * For example
+ * - Ubuntu and Debian would normally be #!/usr/bin/php -q
  *
  * @name      ElkArte Forum
  * @copyright ElkArte Forum contributors

emailtopic.php

@@ -1,11 +1,15 @@
-#!/usr/local/bin/php -q
+#!/usr/bin/php -q
 <?php
 
 /**
  * Handles the creating of new topics by email
  *
- * Note the shebang #!/usr/local/bin/php -q needs to point to the installed
- * location of php, this is the typical location but yours may be different.
+ * Note the shebang (#!) needs to point to the installed location of php on your
+ * system.  If you have shell access running "which php" should return the correct
+ * path to use.
+ *
+ * For example
+ * - Ubuntu and Debian would normally be #!/usr/bin/php -q
  *
  * @name      ElkArte Forum
  * @copyright ElkArte Forum contributors

sources/AbstractModel.php

@@ -30,12 +30,13 @@ abstract class AbstractModel
 
 	/**
 	 * The modSettings
-	 * @var array
+	 * @var object
 	 */
 	protected $_modSettings = array();
 
 	/**
 	 * Make "global" items available to the class
+	 *
 	 * @param object|null $db
 	 */
 	public function __construct($db = null)
@@ -62,6 +63,8 @@ protected function _loadModsettings($name = '', $default = null)
 			return $this->_modSettings->{$name};
 		}
 		else
+		{
 			return $default;
+		}
 	}
 }

sources/Action.controller.php

@@ -217,4 +217,4 @@ protected function _registerEvent($name, $method, $to_register)
 			$this->_events->register($name, array($name, array($class, $method, 0)));
 		}
 	}
-}
+}

sources/admin/AdminLog.controller.php

@@ -249,4 +249,4 @@ public function settings_search()
 	{
 		return $this->_settings();
 	}
-}
+}

sources/admin/BadBehavior.controller.php

@@ -202,7 +202,7 @@ protected function _setFilter()
 	/**
 	 * Performs the removal of one or multiple log entries
 	 *
-	 * @param mixed[] $filter - an array describing the current filter
+	 * @param array $filter - an array describing the current filter
 	 */
 	protected function _action_delete($filter)
 	{

sources/admin/ManageCalendarModule.controller.php

@@ -440,4 +440,4 @@ public function settings_search()
 	{
 		return $this->_settings();
 	}
-}
+}

sources/admin/ManageFeatures.controller.php

@@ -870,13 +870,17 @@ public function action_profile()
 
 							switch ((int) $rowData['placement'])
 							{
-								case 0: $placement .= 'standard';
-							    		break;
-								case 1: $placement .= 'withicons';
+								case 0:
+									$placement .= 'standard';
 									break;
-								case 2: $placement .= 'abovesignature';
+								case 1:
+									$placement .= 'withicons';
 									break;
-								case 3: $placement .= 'aboveicons';
+								case 2:
+									$placement .= 'abovesignature';
+									break;
+								case 3:
+									$placement .= 'aboveicons';
 									break;
 							}
 
@@ -1030,7 +1034,6 @@ public function action_profileedit()
 			$this->_req->post->field_name = $this->_req->getPost('field_name', 'Util::htmlspecialchars');
 			$this->_req->post->field_desc = $this->_req->getPost('field_desc', 'Util::htmlspecialchars');
 
-
 			$rows = isset($this->_req->post->rows) ? (int) $this->_req->post->rows : 4;
 			$cols = isset($this->_req->post->cols) ? (int) $this->_req->post->cols : 30;
 
@@ -1064,7 +1067,7 @@ public function action_profileedit()
 			{
 				case 'check':
 					$default = isset($this->_req->post->default_check) ? 1 : '';
-			    		break;
+			    	break;
 				case 'select':
 				case 'radio':
 					if (!empty($this->_req->post->select_option))
@@ -1096,7 +1099,8 @@ public function action_profileedit()
 						$field_options = substr($field_options, 0, -1);
 					}
 					break;
-				default: $default = isset($this->_req->post->default_value) ? $this->_req->post->default_value : '';
+				default:
+					$default = isset($this->_req->post->default_value) ? $this->_req->post->default_value : '';
 			}
 
 			// Text area by default has dimensions

sources/admin/ManageMaillist.controller.php

@@ -1907,4 +1907,4 @@ public function list_maillist_unapproved($start, $items_per_page, $sort = '', $i
 	{
 		return list_maillist_unapproved($id, $start, $items_per_page, $sort);
 	}
-}
+}

sources/admin/ManageMembers.controller.php

@@ -1334,4 +1334,4 @@ protected function _getGroups()
 
 		return $member_groups;
 	}
-}
+}

sources/admin/ManageNews.controller.php

@@ -960,4 +960,4 @@ public function settings_search()
 	{
 		return $this->_settings();
 	}
-}
+}

sources/admin/ManagePermissions.controller.php

@@ -1141,4 +1141,4 @@ public function action_postmod()
 
 		createToken('admin-mppm');
 	}
-}
+}

sources/admin/ManageSearch.controller.php

@@ -679,4 +679,4 @@ private function loadSearchAPIs()
 
 		return $apis;
 	}
-}
+}

sources/admin/ManageSecurity.controller.php

@@ -571,4 +571,4 @@ public function bbSettings_search()
 	{
 		return $this->_bbSettings();
 	}
-}
+}

sources/admin/ManageServer.controller.php

@@ -738,4 +738,4 @@ public function balancingSettings_search()
 	{
 		return $this->_balancingSettings();
 	}
-}
+}

sources/admin/ManageSmileys.controller.php

@@ -1762,4 +1762,4 @@ protected function clearSmileyCache()
 		Cache::instance()->remove('parsing_smileys');
 		Cache::instance()->remove('posting_smileys');
 	}
-}
+}

sources/admin/ManageThemes.controller.php

@@ -104,7 +104,10 @@ public function action_index()
 		global $txt, $context;
 
 		if (isset($this->_req->query->api))
-			return $this->action_index_api();
+		{
+			$this->action_index_api();
+			return;
+		}
 
 		// Load the important language files...
 		loadLanguage('ManageThemes');
@@ -121,7 +124,7 @@ public function action_index()
 			'options' => array($this, 'action_options', 'permission' => 'admin_forum'),
 			'install' => array($this, 'action_install', 'permission' => 'admin_forum'),
 			'remove' => array($this, 'action_remove', 'permission' => 'admin_forum'),
-			'pick' => array($this, 'action_pick'),  // @todo ugly having that in this controller
+			'pick' => array($this, 'action_pick'), // @todo ugly having that in this controller
 			'edit' => array($this, 'action_edit', 'permission' => 'admin_forum'),
 			'copy' => array($this, 'action_copy', 'permission' => 'admin_forum'),
 			'themelist' => array($this, 'action_themelist', 'permission' => 'admin_forum'),
@@ -201,17 +204,17 @@ public function action_index_api()
 		// Theme administration, removal, choice, or installation...
 		// Of all the actions we currently know only this
 		$subActions = array(
-		// 	'admin' => 'action_admin',
-		// 	'list' => 'action_list',
-		// 	'reset' => 'action_options',
-		// 	'options' => 'action_options',
-		// 	'install' => 'action_install',
+		// 'admin' => 'action_admin',
+		// 'list' => 'action_list',
+		// 'reset' => 'action_options',
+		// 'options' => 'action_options',
+		// 'install' => 'action_install',
 			'remove' => 'action_remove_api',
-		// 	'pick' => 'action_pick',
-		// 	'edit' => 'action_edit',
-		// 	'copy' => 'action_copy',
-		// 	'themelist' => 'action_themelist',
-		// 	'browse' => 'action_browse',
+		// 'pick' => 'action_pick',
+		// 'edit' => 'action_edit',
+		// 'copy' => 'action_copy',
+		// 'themelist' => 'action_themelist',
+		// 'browse' => 'action_browse',
 		);
 
 		// Follow the sa or just go to administration.
@@ -262,7 +265,7 @@ public function action_admin()
 				Errors::instance()->fatal_lang_error('themes_none_selectable', false);
 
 			if (!in_array($this->_req->post->options['theme_guests'], $this->_req->post->options['known_themes']))
-					Errors::instance()->fatal_lang_error('themes_default_selectable', false);
+				Errors::instance()->fatal_lang_error('themes_default_selectable', false);
 
 			// Commit the new settings.
 			updateSettings(array(
@@ -1612,7 +1615,7 @@ private function _action_edit_submit()
 		$is_css = substr($this->_req->post->filename, -4) == '.css';
 
 		// Check you up
-		if (checkSession('post', '', false) == '' && validateToken('admin-te-' . md5($selectedTheme . '-' . $this->_req->post->filename), 'post', false) == true)
+		if (checkSession('post', '', false) === '' && validateToken('admin-te-' . md5($selectedTheme . '-' . $this->_req->post->filename), 'post', false) === true)
 		{
 			// Consolidate the format in which we received the file contents
 			if (is_array($file))

sources/admin/PackageServers.controller.php

@@ -802,4 +802,4 @@ public function ftp_connect()
 			}
 		}
 	}
-}
+}

sources/admin/Packages.controller.php

@@ -29,7 +29,7 @@ class Packages_Controller extends Action_Controller
 {
 	/**
 	 * listing of files in a packages
-	 * @var string[]|boolean
+	 * @var array|boolean
 	 */
 	private $_extracted_files;
 
@@ -181,7 +181,7 @@ public function action_install()
 			redirectexit('action=admin;area=packages');
 
 		// What are we trying to do
-		$this->_filename = preg_replace('~[\.]+~', '.', $file);
+		$this->_filename = (string) preg_replace('~[\.]+~', '.', $file);
 		$this->_uninstalling = $this->_req->query->sa === 'uninstall';
 
 		// If we can't find the file, our install ends here